From e090b19cad531dd46c56fc0fd8ed3cbb7f5645f4 Mon Sep 17 00:00:00 2001
From: Fong Lin <pflin@novell.com>
Date: Tue, 29 Sep 2009 11:50:59 +0800
Subject: [PATCH] update dev300-m58

---
 .tag                                               |     2 +-
 accessibility/source/helper/acc_factory.cxx        |    13 +-
 .../0004-cws-koheidatapilot03-accessibility.diff   |    31 +
 .../0005-cws-koheidatapilot03-offapi.diff          |    22 +
 applied_patches/0006-cws-koheidatapilot03-sc.diff  | 10450 +++
 applied_patches/0007-cws-koheidatapilot03-vcl.diff |   507 +
 .../0008-cws-koheidatapilot03-xmloff.diff          |    24 +
 .../0009-cws-koheicsvimport-filter.diff            |    26 +
 .../0010-cws-koheicsvimport-officecfg.diff         |   102 +
 applied_patches/0011-cws-koheicsvimport-sc.diff    |  2677 +
 applied_patches/0012-cws-kohei03-chart2.diff       |    99 +
 applied_patches/0013-cws-kohei03-sc.diff           |  3426 +
 applied_patches/0014-cws-calctabcolor-filter.diff  |   470 +
 applied_patches/0014-sc-dataform-sc.diff           |  1389 -
 .../0015-cws-calctabcolor-officecfg.diff           |    33 +
 applied_patches/0015-sc-dataform-officecfg.diff    |    17 -
 applied_patches/0016-cws-calctabcolor-oox.diff     |    75 +
 applied_patches/0016-sc-dataform-suppor-vba.diff   |    12 -
 applied_patches/0017-cws-calctabcolor-sc.diff      |  1881 +
 applied_patches/0018-cws-calctabcolor-svtools.diff |   214 +
 ...ed-configmgr.diff => 0019-speed-configmgr.diff} |     0
 ...ccel.diff => 0020-ok-cancel-btn-add-accel.diff} |     0
 ...idl-build.diff => 0021-makefile-idl-build.diff} |     0
 ...07-speed-pagein.diff => 0022-speed-pagein.diff} |     0
 ...aults.diff => 0023-testtool-more-defaults.diff} |     0
 ...ator.diff => 0024-plus-minus-sw-navigator.diff} |     0
 ...or2.diff => 0025-plus-minus-sw-navigator2.diff} |     0
 applied_patches/0025-quiet-build.diff              |  5110 --
 ...f => 0026-dbaccess-default-varchar-lenght.diff} |     0
 applied_patches/0026-quiet-build-more.diff         |   814 -
 ...0012-linkoo-type.diff => 0027-linkoo-type.diff} |     0
 ....diff => 0028-selection-crash-svx-svdmrkv.diff} |     0
 ...al-doublefree.diff => 0029-sal-doublefree.diff} |     0
 ...blem.diff => 0030-sw-graphic-save-problem.diff} |     0
 ...rn-speed.diff => 0031-sal-strintern-speed.diff} |     0
 ...-fix.diff => 0032-sal-strintern-speed-fix.diff} |     0
 .../{0021-fix-linkoo.diff => 0033-fix-linkoo.diff} |     0
 ...22-fix-gtk-a11y.diff => 0034-fix-gtk-a11y.diff} |     0
 ...=> 0035-fix-gtk-a11y-gail-version-warning.diff} |     0
 ...-linkoo-dev300.diff => 0036-linkoo-dev300.diff} |     0
 ...> 0037-writerfilter-qnametostr-NOOPTFILES.diff} |     0
 ... 0038-sc-cellsuno-avoid-early-destruction.diff} |     0
 ...stats.diff => 0039-speed-sal-fewer-lstats.diff} |     0
 ...-imp.diff => 0040-cjk-character-units-imp.diff} |     0
 ...size.diff => 0041-sw-default-cjk-fontsize.diff} |     0
 ...ts-ui.diff => 0042-cjk-character-units-ui.diff} |     0
 ...ic-add-missing-includes-after-cws-npower10.diff |    19 -
 ...aracter-units-rulers-sync-with-pggrid-fix.diff} |     0
 ...-fix.diff => 0044-cjk-character-units-fix.diff} |     0
 .../0044-vba-show-data-form-link-fix.diff          |    13 -
 ...ff => 0045-cjk-character-units-fix-376788.diff} |     0
 ...=> 0046-cjk-character-units-in-pggrid-fix.diff} |     0
 ...fice.diff => 0047-wpsimport-config_office.diff} |     0
 ...port-filter.diff => 0048-wpsimport-filter.diff} |     0
 ...psimport-scp2.diff => 0049-wpsimport-scp2.diff} |     0
 ...fect.diff => 0050-wpsimport-writerperfect.diff} |     0
 .../{0041-libwps.diff => 0051-libwps.diff}         |     0
 ...42-wps-registry.diff => 0052-wps-registry.diff} |     0
 .../{0045-libwpg.diff => 0053-libwpg.diff}         |     0
 ...0046-wpgimporter.diff => 0054-wpgimporter.diff} |     0
 ...k-gij-paths.diff => 0055-jvmfwk-gij-paths.diff} |     0
 ...f => 0056-buildfix-qadevOOo-java-encoding.diff} |     0
 .../{0049-debug-bits.diff => 0057-debug-bits.diff} |     0
 ...-gui-sw-scroll.diff => 0058-gui-sw-scroll.diff} |     0
 .../0058-vba-default-enable-calcmacros.diff        |    11 -
 .../0059-vba-ide-choose-macro-to-run.diff          |    32 -
 ...cl-menu-fixes.diff => 0059-vcl-menu-fixes.diff} |     0
 .../{0052-uses-vfs.diff => 0060-uses-vfs.diff}     |     0
 ...061-buildfix-x86-64-visibility-workaround.diff} |     0
 ...tensions.diff => 0062-redirect-extensions.diff} |     0
 .../{0055-libwpd.diff => 0063-libwpd.diff}         |     0
 ... 0064-writerperfect-nocondensedparagraphs.diff} |     0
 ...t.diff => 0065-offapi-typecheck-whitelist.diff} |     0
 ...-build-ant-1.6.diff => 0066-build-ant-1.6.diff} |     0
 ...fix-fmtargs.diff => 0067-buildfix-fmtargs.diff} |     0
 ...-nsplugin-path.diff => 0068-nsplugin-path.diff} |     0
 ...54573.diff => 0069-printing-bugfix-254573.diff} |     0
 ...s.diff => 0070-sd-toolbar-advanced-shapes.diff} |     0
 ... 0071-svx-shapes-default-word-wrap-enable.diff} |     0
 ... 0072-svx-honour-customshape-capabilities.diff} |     0
 ....diff => 0073-check-buttons-rendering-fix.diff} |     0
 ...ntconfig.diff => 0074-padmin-nofontconfig.diff} |     0
 ...izards-source-importwizard-filesmodul-xba.diff} |     0
 ...ff => 0076-automation-testtool-oobuildfix.diff} |     0
 ...g.diff => 0077-helpcontent2-auxiliary-cfg.diff} |     0
 ....diff => 0078-desktop-safer-user-dir-perm.diff} |     0
 ...esktop-application-octet-stream-mime-type.diff} |     0
 applied_patches/0079-new-SQLLEN.diff               |  1884 -
 ...es.diff => 0080-xmlsecurity-verify-usages.diff} |     0
 ...f => 0081-jvmfwk-modified-javavendors-xml.diff} |     0
 ...indcerts.diff => 0082-libxmlsec-findcerts.diff} |     0
 ...=> 0083-sfx2-check-existing-template-dirs.diff} |     0
 ...-kerning-fix.diff => 0084-vcl-kerning-fix.diff} |     0
 applied_patches/0085-new-SQLLEN.diff               |  1887 +
 .../{0080-jpegc.c.diff => 0086-jpegc.c.diff}       |     0
 ...7-save-doc-withembedded-doc-with-vba-crash.diff |    45 -
 ...iff => 0087-tools-urlobj-smb-scheme-patch.diff} |     0
 ...sc-sd.diff => 0088-samba-hyperlinks-sc-sd.diff} |     0
 ...est.diff => 0089-tools-qa-urlobj-unittest.diff} |     0
 applied_patches/0089-win32-invalid-names.diff      |    48 -
 ...on-fix.diff => 0090-svx-text-rotation-fix.diff} |     0
 ...ath.diff => 0091-sfx-check-real-help-path.diff} |     0
 ...s.diff => 0092-xmlhelp-work-with-symlinks.diff} |     0
 ...ths.diff => 0093-localize-pl-cygwin-paths.diff} |     0
 applied_patches/0094-win32-invalid-names.diff      |    50 +
 .../0095-forms-radio-button-group-names.diff       |   897 -
 applied_patches/0095-openldap-i105016.diff         |    45 +
 ...t-pixel.diff => 0096-customunittext-pixel.diff} |     0
 .../0096-xl-import-formradiobutton.diff            |   136 -
 ...rcent.diff => 0097-customunittext-percent.diff} |     0
 applied_patches/0097-dialog-groupname-persist.diff |   374 -
 .../{0092-i93000.diff => 0098-i93000.diff}         |     0
 ...-resize.diff => 0099-padmin-dialog-resize.diff} |     0
 ...ogs-resize.diff => 0100-sw-dialogs-resize.diff} |     0
 ... 0101-webdav-locking-from-ooo-build-2-4-1.diff} |     0
 ...ff => 0102-webdav-locking-local-temp-file.diff} |     0
 ...f => 0103-gnome-vfs-locking-config_office.diff} |     0
 ...ng-ucb.diff => 0104-gnome-vfs-locking-ucb.diff} |     0
 ...ate-init.diff => 0105-gnome-vfs-late-init.diff} |     0
 ...lash-rework.diff => 0106-unxsplash-rework.diff} |     0
 ...am.diff => 0107-hack-readd-GetStringParam.diff} |     0
 ...-pipe.diff => 0108-unxsplash-new-osl-pipe.diff} |     0
 ....diff => 0109-unxsplash-new-osl-pipe-slot.diff} |     0
 ...p.diff => 0110-unxsplash-finish-on-hangup.diff} |     0
 ...splash-rpath.diff => 0111-unxsplash-rpath.diff} |     0
 ...lash-3layer.diff => 0112-unxsplash-3layer.diff} |     0
 .../0113-csv-import-preserve-options-sc.diff       |   647 -
 ...mp-alias.diff => 0113-unxsplash-bmp-alias.diff} |     0
 ...0114-csv-import-preserve-options-officecfg.diff |    86 -
 ....diff => 0114-sw-html-insert-unknown-tags.diff} |     0
 applied_patches/0115-gcc4-visibility-sc.diff       |    19 -
 ...8-field-fix.diff => 0115-sw-ww8-field-fix.diff} |     0
 applied_patches/0118-sc-datapilot-autoformat.diff  |   755 +-
 applied_patches/0122-sc-dp-gridlayout.diff         |   616 +-
 applied_patches/0128-sc-natural-sort.diff          |  1208 +-
 ...ayer-units.diff => 0133-sc-drwlayer-units.diff} |     0
 .../0133-vba-sc-autoshapes-hyperlinks.diff         |   893 -
 ...diff => 0134-sc-overwrite-char-font-attrs.diff} |     0
 .../0135-calc-filter-by-date-strip-time.diff       |   498 +
 applied_patches/0139-sc-paste-on-enter.diff        |   503 +-
 .../0140-calc-multi-range-copy-paste.diff          |  2036 -
 ...ets.diff => 0140-sc-print-selected-sheets.diff} |     0
 ...c-print-lines.diff => 0141-sc-print-lines.diff} |     0
 applied_patches/0142-sc-biffdump.diff              |   127 -
 .../0142-sc-dbrange-dynamic-resize.diff            |   371 +
 ... => 0143-sc-cellbackground-over-gridlines.diff} |     0
 ...le.diff => 0144-sc-cellformat-icon-toggle.diff} |     0
 .../0144-sc-dbrange-dynamic-resize.diff            |   372 -
 ...> 0145-sc-fit-to-width-height-skip-breaks.diff} |     0
 ...ff => 0146-chart-skip-hidden-cells-sc-fix.diff} |     0
 ...diff => 0147-calc-filter-xml-free-context.diff} |     0
 ...ar-func.diff => 0148-calc-status-bar-func.diff} |     0
 .../0149-calc-dp-default-new-sheet.diff            |   121 +
 .../0149-chart-axis-multi-chart-types-chart2.diff  |   617 -
 ....diff => 0150-calc-menu-manual-page-break.diff} |     0
 .../0150-chart-axis-multi-chart-types-xmloff.diff  |    83 -
 applied_patches/0151-sc-sheet-gridline-toggle.diff |   324 +
 .../0152-calc-formula-variable-separators-sc.diff  |  1050 +
 .../0153-calc-dp-custom-names-offapi.diff          |    22 -
 ...0153-calc-formula-variable-separators-svx.diff} |     0
 applied_patches/0154-calc-dp-custom-names-sc.diff  |  2848 -
 ...alc-formula-variable-separators-officecfg.diff} |     0
 .../0155-calc-dp-custom-names-sc-win32-fix.diff    |   130 -
 ...rt.diff => 0155-chart-subtitle-xls-export.diff} |     0
 .../0156-calc-dp-custom-names-sc-group-fix.diff    |    19 -
 ...> 0156-calc-external-defined-names-enable.diff} |     0
 .../0157-calc-dp-default-new-sheet.diff            |   121 -
 ...> 0157-calc-xls-disable-adjust-row-height.diff} |     0
 ...f => 0158-calc-grammar-xls-english-offapi.diff} |     0
 ....diff => 0159-calc-grammar-xls-english-sc.diff} |     0
 applied_patches/0159-fix-biffdumper.diff           |   161 -
 .../0160-calc-find-replace-empty-cells-sc.diff     |   371 +
 .../0161-calc-find-replace-empty-cells-svx.diff    |   105 +
 .../0162-calc-enhanced-merge-cells-sc.diff         |  1115 +
 ... 0163-calc-enhanced-merge-cells-officecfg.diff} |     0
 ...on.diff => 0164-calc-filter-dbf-precision.diff} |     0
 ...-calc-autoinput-case-insensitive-matching.diff} |     0
 ...f => 0166-calc-jump-on-formula-ref-offapi.diff} |     0
 ...> 0167-calc-jump-on-formula-ref-officecfg.diff} |     0
 .../0168-calc-jump-on-formula-ref-sc.diff          |   616 +
 ...iff => 0169-calc-jump-on-formula-ref-sfx2.diff} |     0
 ...diff => 0170-calc-jump-on-formula-ref-vcl.diff} |     0
 .../0171-calc-ods-sheet-protection-sc.diff         |  1032 +
 ... => 0172-calc-ods-sheet-protection-xmloff.diff} |     0
 ...=> 0173-calc-ods-sheet-protection-svtools.diff} |     0
 .../0174-calc-selection-fixed-cursor.diff          |   904 +
 ...-view.diff => 0175-calc-cursor-split-view.diff} |     0
 .../0176-calc-autofilter-shrink-selection.diff     |    13 +
 .../0177-calc-xls-import-array-size.diff           |   289 +
 .../0178-calc-html-csv-import-force-text-cell.diff |   381 +
 .../0179-calc-find-replace-skip-filtered.diff      |   383 +
 ...-calc-getpivotdata-force-interpret-formula.diff |    44 +
 .../0181-calc-combo-listbox-export-fix.diff        |    13 +
 .../0182-calc-selection-protected-cells.diff       |   155 +
 ...imit.diff => 0183-calc-increase-row-limit.diff} |     0
 ... => 0184-calc-odf-export-autostyle-maxrow.diff} |     0
 ....diff => 0185-calc-perf-flat-segment-tree.diff} |     0
 .../0186-calc-perf-ods-import-properties.diff      |   159 +
 ...rt.diff => 0187-calc-row-limit-bad-ushort.diff} |     0
 .../0188-calc-perf-page-and-manual-breaks.diff     |  1646 +
 .../0189-calc-perf-table-hidden-flags.diff         |  3846 +
 ...ff => 0190-calc-ods-export-no-more-ushort.diff} |     0
 ...alc-perf-sort.diff => 0191-calc-perf-sort.diff} |     0
 .../0192-calc-perf-lazy-overlay-objects.diff       |   187 +
 .../0193-calc-perf-copy-table-flags.diff           |    97 +
 ... 0194-calc-perf-rowheight-no-progress-bar.diff} |     0
 ...cept.diff => 0195-speed-local-link-except.diff} |     0
 ...iff => 0196-speed-local-link-except-offuh.diff} |     0
 ...-local-link.diff => 0197-speed-local-link.diff} |     0
 ....diff => 0198-fpicker-kde-gcc4-visibility.diff} |     0
 ...-symbol.diff => 0199-gui-sw-insert-symbol.diff} |     0
 ...ring.diff => 0200-addrbk-datasrc-ordering.diff} |     0
 ...diff => 0201-svtools-default-new-document.diff} |     0
 ...omplete.diff => 0202-context-autocomplete.diff} |     0
 ...203-svtools-unsort-template-dialogentries.diff} |     0
 ...tdout.diff => 0204-desktop-cmdhelp-stdout.diff} |     0
 ...f => 0205-always-allow-save-document-sfx2.diff} |     0
 ...iff => 0206-always-allow-save-document-sc.diff} |     0
 ...oll-accel-sc.diff => 0207-scroll-accel-sc.diff} |     0
 ...l-accel-vcl.diff => 0208-scroll-accel-vcl.diff} |     0
 ...fx2.diff => 0209-min-password-length-sfx2.diff} |     0
 ...iff => 0210-document-password-change-sfx2.diff} |     0
 ...0211-sfx2-remove-check-update-on-fileload.diff} |     0
 ...0212-desktop-disable-startup-registration.diff} |     0
 .../{0178-go-oo-team.diff => 0213-go-oo-team.diff} |     0
 ...tionary.diff => 0214-corporate-dictionary.diff} |     0
 applied_patches/0214-session-management.diff       |   419 -
 ...ovell-palette.diff => 0215-novell-palette.diff} |     0
 ...16-solenv-really-use-unsinged-char-on-ppc.diff} |     0
 ...f => 0217-sc-default-delete-backspace-key.diff} |     0
 ...ion.diff => 0218-desktop-config-migration.diff} |     0
 ...84-help-support.diff => 0219-help-support.diff} |     0
 ...g-ooo3.diff => 0220-scp2-user-config-ooo3.diff} |     0
 ...t-psstream.diff => 0221-pushfont-psstream.diff} |     0
 ...diff => 0222-split-icons-search-usr-share.diff} |     0
 ...0223-novell-win32-agfa-monotype-fonts-m59.diff} |     0
 ...target.diff => 0224-build-java-target-m59.diff} |     0
 ...ff => 0225-solenv-installer-cleaner-paths.diff} |     0
 ...0226-solenv-installer-lang-filelist-names.diff} |     0
 ...diff => 0227-installer-get-path-correctly.diff} |     0
 ...ilt-stax.diff => 0228-build-prebuilt-stax.diff} |     0
 ...-ucb-neon-0.24.diff => 0229-ucb-neon-0.24.diff} |     0
 ...e.diff => 0230-dmake-space-in-envvar-name.diff} |     0
 applied_patches/0231-armeabi-softfp-buildfix.diff  |    47 +
 applied_patches/0231-buildfix-vba-as-extn.diff     |    10 -
 applied_patches/0232-db4.8.diff                    |    11 +
 ...ostset-add-ro.diff => 0233-postset-add-ro.diff} |     0
 ...overy-report.diff => 0234-recovery-report.diff} |     0
 ...rd.diff => 0235-default-no-startup-wizard.diff} |     0
 ...alog.diff => 0236-default-no-style-dialog.diff} |     0
 ...tion.diff => 0237-default-no-registration.diff} |     0
 ...diff => 0238-tango-prefer-over-industrial.diff} |     0
 ...diff => 0239-default-no-registration-menu.diff} |     0
 ...f => 0240-default-no-registration-menu-sd.diff} |     0
 ...aths.diff => 0241-scp2-3layer-nicer-paths.diff} |     0
 ...icker.diff => 0242-default-system-fpicker.diff} |     0
 ...t-aasize.diff => 0243-default-font-aasize.diff} |     0
 ...-font-size.diff => 0244-default-font-size.diff} |     0
 ...rt.diff => 0245-default-ms-filter-convert.diff} |     0
 ... 0246-writer-default-as-optimal-page-wrap.diff} |     0
 ...0210-vfs-kde-too.diff => 0247-vfs-kde-too.diff} |     0
 ...algrind-alloc.diff => 0248-valgrind-alloc.diff} |     0
 ....diff => 0249-default-openssl-no-idea-alg.diff} |     0
 ...rt.diff => 0250-odf-flatxml-import-export.diff} |     0
 applied_patches/0251-session-management.diff       |   419 +
 ...ff => 0252-office-cfg-common-template-dir.diff} |     0
 ...iff => 0253-sfx2-template-category-labels.diff} |     0
 ...irs.diff => 0254-scp2_add_additional_dirs.diff} |     0
 ...ication.diff => 0255-build-identification.diff} |     0
 ...nal.diff => 0256-installer-strip-optional.diff} |     0
 ...257-i18nutil-glibc-braindamage-workaround.diff} |     0
 ...ule-name.diff => 0258-sdk-gid-module-name.diff} |     0
 ...-orig.diff => 0259-psprint_config-no-orig.diff} |     0
 ...arnings.diff => 0260-stlport-gcc-warnings.diff} |     0
 ...-hash-style.diff => 0261-speed-hash-style.diff} |     0
 ...ink-as-needed.diff => 0262-link-as-needed.diff} |     0
 ....diff => 0263-svx-customshapes-NOOPTFILES.diff} |     0
 ...diff => 0264-warning-return-values-filter.diff} |     0
 ...ff => 0265-warning-return-values-registry.diff} |     0
 ...6-warning-uninitialized-variables-tools-2.diff} |     0
 ...ileno.diff => 0267-stlport-solaris-fileno.diff} |     0
 ....diff => 0268-system-python-ure-bootstrap.diff} |     0
 ...33-pyuno-ooodir.diff => 0269-pyuno-ooodir.diff} |     0
 applied_patches/0269-vba-attribute.diff            |    95 -
 applied_patches/0270-basic-prj-build_lst.diff      |     8 -
 ...-path.diff => 0270-system-python-uno-path.diff} |     0
 ...-crash-startup.diff => 0271-crash-startup.diff} |     0
 ...-takeover.diff => 0272-no-splash-takeover.diff} |     0
 ...fallback.diff => 0273-vcl-better-fallback.diff} |     0
 ...-hebrew-culmus.diff => 0274-hebrew-culmus.diff} |     0
 ...iff => 0275-psprint-postscript-page-setup.diff} |     0
 ....diff => 0276-vcl-bitmap2-negative-height.diff} |     0
 ...ltiple-window-resize-calls-when-maximised.diff} |     0
 ...cons.diff => 0278-gui-toolbox-large-icons.diff} |     0
 ...-w32.diff => 0279-tango-icons-default-w32.diff} |     0
 ....diff => 0280-about-build-ver-readability.diff} |     0
 ...n-build.diff => 0281-fpicker-common-build.diff} |     0
 ...-service.diff => 0282-fpicker-kde-service.diff} |     0
 ...de-dialog.diff => 0283-fpicker-kde-dialog.diff} |     0
 ...-kio.diff => 0284-fpicker-kde-partial-kio.diff} |     0
 ...name.diff => 0285-fpicker-kde-filter-name.diff} |     0
 ...de-resmgr.diff => 0286-fpicker-kde-resmgr.diff} |     0
 ...edia.diff => 0287-fpicker-kde-local-media.diff} |     0
 ...ia2.diff => 0288-fpicker-kde-local-media2.diff} |     0
 ...oo-wide.diff => 0289-fpicker-kde-too-wide.diff} |     0
 ...e.diff => 0290-fpicker-kde-dont-overwrite.diff} |     0
 applied_patches/0290-sc-hacky-handle-boolean.diff  |    53 -
 ...on-utf8.diff => 0291-fpicker-kde-non-utf8.diff} |     0
 applied_patches/0291-sc-vba-build-lst.diff         |    11 -
 ...-kde-modal.diff => 0292-fpicker-kde-modal.diff} |     0
 .../0292-svx-source-inc-fmundo-hxx.diff            |    16 -
 ...mon-scp2.diff => 0293-fpicker-common-scp2.diff} |     0
 .../0293-svx-source-form-fmscriptingenv-cxx.diff   |    19 -
 ...de-3layer.diff => 0294-fpicker-kde-3layer.diff} |     0
 applied_patches/0294-svx-source-form-makefile.diff |    18 -
 ...ads.diff => 0295-fpicker-kde-less-threads.diff} |     0
 .../0295-svx-source-form-fmundo-cxx.diff           |   127 -
 ...e.diff => 0296-default-evolution-database.diff} |     0
 applied_patches/0296-vbaevents-services-build.diff |    19 -
 ...g.diff => 0297-default-evo-column-mapping.diff} |     0
 applied_patches/0297-scp_vba_uno_service.diff      |    23 -
 ...s-evo2.diff => 0298-buildfix-evo1-vs-evo2.diff} |     0
 .../0298-vba-support-export-palette.diff           |    95 -
 ...ault-evo2-ab.diff => 0299-default-evo2-ab.diff} |     0
 .../0299-vba-get-nonfiltered-range-selection.diff  |   178 -
 ...mponent.diff => 0300-lwp-filter-component.diff} |     0
 .../0300-vba-allow-ranges-for-cell-functions.diff  |   223 -
 ...cws-ooo11lotusfilter-lwp-filter-component.diff} |     0
 applied_patches/0301-vba-error-object.diff         |   379 -
 ...f => 0302-cws-ooo11lotusfilter-lwp-filter.diff} |     0
 applied_patches/0302-sc-vba-autofill-support.diff  |    38 -
 ... => 0303-cws-ooo11lotusfilter-lwp-xfilter.diff} |     0
 .../0303-sc-source-ui-vba-makefile-mk.diff         |    14 -
 .../0304-sc-export-shape-macro-bindings.diff       |   260 -
 ...> 0304-warning-return-values-lotuswordpro.diff} |     0
 ...0305-cli_ure-source-bootstrap-assembly-cs.diff} |     0
 .../0305-sc-export-shape-hlink-bindings.diff       |   207 -
 ...ure-source-bootstrap-managed_bootstrap-cs.diff} |     0
 .../0306-sc-vbaimport-override-controlname.diff    |   190 -
 applied_patches/0307-api-application-caller.diff   |    63 -
 ...-cli_ure-source-bootstrap-native_glue-cxx.diff} |     0
 .../0308-default-autotext-and-form-name.diff       |   168 -
 .../{0274-mono-scp2.diff => 0308-mono-scp2.diff}   |     0
 ...0309-cli_ure-source-bootstrap-makefile-mk.diff} |     0
 applied_patches/0309-oovbaapi-disable-vba.diff     |    90 -
 ...o-bridge.diff => 0310-cli_ure-mono-bridge.diff} |     0
 .../0310-vba-fixup-singlerange-sheetref.diff       |    62 -
 .../{0277-mono-build.diff => 0311-mono-build.diff} |     0
 .../0311-vba-always-set-defaultprop.diff           |    15 -
 ...ld-mono-link.diff => 0312-build-mono-link.diff} |     0
 applied_patches/0312-vba-check-for-macro.diff      |   311 -
 ...d-keyfile.diff => 0313-mono-build-keyfile.diff} |     0
 .../0313-vba-support-properties-inmodules.diff     |   145 -
 .../0314-controls-with-images-import.diff          |   443 -
 ...-mono-climaker.diff => 0314-mono-climaker.diff} |     0
 .../0315-enhanced-form-userform-controls.diff      |  2031 -
 ...testtools.diff => 0315-mono-testtools-m59.diff} |     0
 applied_patches/0316-ObjectModule.diff             |  2061 -
 .../0316-buildfix-testtool-disabled.diff           |    35 +
 ...harp-win.diff => 0317-climaker-csharp-win.diff} |     0
 applied_patches/0317-vba-userform.diff             |   395 -
 ...d.diff => 0318-buildfix-climaker-disabled.diff} |     0
 applied_patches/0318-vba-compatible-mode-uno.diff  |   277 -
 ... => 0319-mono-bootstrap-config-and-policy.diff} |     0
 .../0319-vba-spinbutton-in-userform.diff           |   344 -
 ...-version.diff => 0320-mono-bridge-version.diff} |     0
 .../0320-vbaevents-services-sources.diff           |  2074 -
 ...ff => 0321-buildfix-use-climaker-in-unoil.diff} |     0
 .../0321-vba-workbook-worksheet-events.diff        |  2227 -
 ...ld-lst.diff => 0322-cli_ure-prj-build-lst.diff} |     0
 .../0322-vba-worksheet-calculate-event-fix.diff    |   141 -
 applied_patches/0323-basic-caller-support.diff     |   532 -
 ...-config.diff => 0323-mono-climaker-config.diff} |     0
 ...est.diff => 0324-mono-climaker-bridgetest.diff} |     0
 applied_patches/0324-vba-empty-comparison-fix.diff |    11 -
 applied_patches/0325-cws-vbasupportdev300.diff     | 91032 +++++++++++++++++++
 .../0325-vba-worksheet-enableselection.diff        |   116 -
 applied_patches/0326-vba-keyword-fix.diff          |   116 -
 .../0326-vba-reenable-rowsourcefixes.diff          |    13 +
 .../0327-userform-activex-identify.diff            |   209 -
 applied_patches/0327-vba-basic-not-fix.diff        |    17 +
 applied_patches/0328-cws-vbasupportdev300-wae.diff |   481 +
 .../0328-userform-possible-groupingtweak.diff      |    27 -
 applied_patches/0329-basic-ide-objectmodule.diff   |    41 -
 applied_patches/0329-vba-control-api-vis-fix.diff  |    26 +
 .../0330-basic-ide-module-object-name-combile.diff |    98 -
 applied_patches/0330-vba-fix-isempty.diff          |    34 +
 .../0331-vba-fix-ide-friendly-modulename.diff      |    41 -
 .../0331-vba-fix-wsfunction-booleanparam.diff      |    22 +
 .../0332-vba-basic-macrochoose-dialog.diff         |   831 -
 applied_patches/0332-vba-fix-errobj-errnum.diff    |    63 +
 ...sfx2-pre-and-postprocess-during-save-load.diff} |     0
 .../0333-vba-fix-basic-macro-organizer.diff        |    40 -
 applied_patches/0334-range-listBox-compare.diff    |    35 -
 ...> 0334-sfx2-pre-and-postprocess-crash-fix.diff} |     0
 .../0335-vba-userform-geometry-tweak.diff          |   394 -
 ... 0335-win32-installer-register-moox-types.diff} |     0
 .../0336-vba-allow-forms-resetvalue-binding.diff   |    15 -
 ...r.diff => 0336-writerfilter-module-writer.diff} |     0
 .../0337-fix-vba-NOT-trigger-update.diff           |    87 -
 ...rfilter-source-dmapper-domainmapper-debug.diff} |     0
 .../0338-buildfix-oox-depends-on-unotools.diff     |     8 +
 applied_patches/0338-vba-variant-fix.diff          |    13 -
 ...t.diff => 0339-oox-fix-placeholder-layout.diff} |     0
 .../0339-userform-image-import-fix.diff            |    48 -
 ...ply.diff => 0340-oox-fix-list-style-apply.diff} |     0
 .../0340-spinbutton-import-valuechange.diff        |    13 -
 ...t.diff => 0341-oox-pptx-import-fix-layout.diff} |     0
 applied_patches/0341-vba-noregrex-for-match.diff   |    34 -
 ... 0342-oox-pptx-import-fix-wipe-transition.diff} |     0
 applied_patches/0342-vba-null-not-treatment.diff   |    87 -
 ...-oox-pptx-import-fix-subtitle-placeholder.diff} |     0
 applied_patches/0343-vba-commandbar-fix.diff       |   654 -
 ...c-postgresql.diff => 0344-sdbc-postgresql.diff} |     0
 applied_patches/0344-vba-xls-formula-parser.diff   |    48 -
 ...st.diff => 0345-sdbc-postgresql-build-lst.diff} |     0
 .../0345-vba-fix-docmodule-import-crash.diff       |    22 -
 ...f => 0346-connectivity-workben-postgresql.diff} |     0
 applied_patches/0346-vba-servicemacros-rework.diff |   251 -
 ...ostgresql.diff => 0347-gcc-4.3-postgresql.diff} |     0
 applied_patches/0347-vba-interior-object-fix.diff  |    52 -
 .../0348-range-defaultmethod-i98476.diff           |    13 -
 ...iff => 0348-sdbc-postgresql-config_office.diff} |     0
 ...y.diff => 0349-kde4-buildfix-connectivity.diff} |     0
 applied_patches/0349-vba-excel-iserror-fix.diff    |   168 -
 ...ygen-icons.diff => 0350-kde4-oxygen-icons.diff} |     0
 .../0350-word-read-custom-toolbar-filter.diff      |  2494 -
 ....diff => 0351-kde4-fpicker-fix-toOUString.diff} |     0
 applied_patches/0351-vba-word-support.diff         | 30504 -------
 applied_patches/0352-kde4-configure2.diff          |    74 +
 applied_patches/0352-vba-templateobject.diff       |   579 -
 applied_patches/0353-kde4_fpicker_fixes.diff       |   204 +
 applied_patches/0353-vba-vpagebreak-object.diff    |   445 -
 ...s-sd.diff => 0354-transogl-transitions-sd.diff} |     0
 .../0354-vba-combobox-listindex-fix.diff           |    25 -
 ...ff => 0355-transogl-transitions-officecfg.diff} |     0
 applied_patches/0355-vba-fix-copysheet-toend.diff  |    51 -
 ...sh.diff => 0356-ooo67658.sfx2.reloadcrash.diff} |     0
 .../0356-vba-improve-toolbarapi-macro-search.diff  |    61 -
 .../0357-fix-doc-exit-basic-error-core.diff        |    13 -
 ...ff => 0357-oooXXXXX.vcl.x86_64.impressatk.diff} |     0
 ...sh.diff => 0358-ooo73201.sw.a11yloadcrash.diff} |     0
 applied_patches/0358-read-vba-dir-stream-fix.diff  |   885 -
 ....bodge.diff => 0359-ooo86080.unopkg.bodge.diff} |     0
 applied_patches/0359-vba-commandbar-enabled.diff   |    52 -
 ...f => 0360-oooXXXX.partial-revert-ooo95118.diff} |     0
 .../0360-vba-worksheet-change-event-fix.diff       |   148 -
 ...iff => 0361-ooo83878.unopkg.enablelinking.diff} |     0
 .../0361-vba-toolbar-menufilter-core-fix.diff      |    22 -
 ...er-avmedia.diff => 0362-gstreamer-avmedia.diff} |     0
 .../0362-word-read-builtinmenubar-filter.diff      |   442 -
 ...streamer-scp2.diff => 0363-gstreamer-scp2.diff} |     0
 applied_patches/0363-vba-fix-private-declare.diff  |    60 -
 ...fice.diff => 0364-gstreamer-config-office.diff} |     0
 ...4-vba-import-globaltemplate-customizations.diff |   231 -
 ...lideshow.diff => 0365-gstreamer-slideshow.diff} |     0
 applied_patches/0365-vba-basic-if-compare-fix.diff |    11 -
 ...amer-solenv.diff => 0366-gstreamer-solenv.diff} |     0
 applied_patches/0366-vba-basic-parallel-build.diff |    35 -
 ...f => 0367-gstreamer-svtools-content-types.diff} |     0
 .../0367-vba-oovbaapi-parallel-build.diff          |    23 -
 .../0368-basic-allow-objectforerror-symbol.diff    |    42 -
 ...diff => 0368-gstreamer-avmedia-file-types.diff} |     0
 ...-gstreamer-vcl.diff => 0369-gstreamer-vcl.diff} |     0
 .../0369-vba-fix-named-any-para-pass.diff          |    20 -
 ...> 0370-avmedia-source-gstreamer-ChangeLog.diff} |     0
 .../0370-vba-allow-arrays-in-usertypes.diff        |   112 -
 ...0371-avmedia-source-gstreamer-exports.dxp.diff} |     0
 ...71-vba-disable-toolbar+customizationimport.diff |    54 -
 ...72-avmedia-source-gstreamer-gstcommon.hxx.diff} |     0
 .../0372-vba-fix-IsEmpty-api-object.diff           |    33 -
 ...edia-source-gstreamer-gstframegrabber.cxx.diff} |     0
 .../0373-vba-fix-control-shape-geom-fix.diff       |   233 -
 ...edia-source-gstreamer-gstframegrabber.hxx.diff} |     0
 applied_patches/0374-basic-public-dim-fix.diff     |   115 -
 ...5-avmedia-source-gstreamer-gstmanager.cxx.diff} |     0
 .../0375-vba-fix-optionalparam-assigment.diff      |    13 -
 ...6-avmedia-source-gstreamer-gstmanager.hxx.diff} |     0
 .../0376-vba-reset-screenupdateing.diff            |    69 -
 ...77-avmedia-source-gstreamer-gstplayer.cxx.diff} |     0
 applied_patches/0377-vba-redim-array-fix.diff      |    92 -
 ...78-avmedia-source-gstreamer-gstplayer.hxx.diff} |     0
 applied_patches/0378-vba-fix-userform-init.diff    |    13 -
 ... 0379-avmedia-source-gstreamer-gstuno.cxx.diff} |     0
 .../0379-vba-fix-Range-Insert-CopyOrigin.diff      |    33 -
 ...80-avmedia-source-gstreamer-gstwindow.cxx.diff} |     0
 .../0380-calc-vba-volatile-user-func.diff          |   904 -
 ...81-avmedia-source-gstreamer-gstwindow.hxx.diff} |     0
 applied_patches/0381-vba-documentcontext.diff      |   101 -
 ...0382-avmedia-source-gstreamer-makefile.mk.diff} |     0
 .../0382-fix-read-disabled-toolbarimport.diff      |    62 -
 ...id.diff => 0383-letter-wizard-resource-id.diff} |     0
 applied_patches/0383-vba-word-support-part2.diff   | 23674 -----
 ...diff => 0384-gstreamer-avmedia-loopingetc.diff} |     0
 .../0384-vba-only-import-std-menutoolbar.diff      |    14 -
 ...sal-textenc.diff => 0385-size-sal-textenc.diff} |     0
 .../0385-vba-fix-workbook-resize-core.diff         |   234 -
 ...04-jvmfwk-gij32.diff => 0386-jvmfwk-gij32.diff} |     0
 .../0386-vba-fix-macromode-api-docopen.diff        |    27 -
 ...ort-filter.diff => 0387-svg-import-filter.diff} |     0
 applied_patches/0387-vba-fixup-macrosearch.diff    |  1581 -
 ....diff => 0388-svg-import-filter-gfxfilter.diff} |     0
 .../0388-vba-currentcomponent-rework.diff          |  1553 -
 ...x-fix.diff => 0389-svg-import-viewbox-fix.diff} |     0
 .../0389-vba-testclient-fix-project.diff           |    23 -
 ...-fix.diff => 0390-svg-import-painturi-fix.diff} |     0
 .../0390-vba-fix-checkbox-ole-access.diff          |    13 -
 ...import.diff => 0391-svg-import-textimport.diff} |     0
 applied_patches/0391-vba-fix-path-fullname.diff    |    32 -
 .../0392-fix-sheet-control-valueset.diff           |    72 -
 ...ix.diff => 0392-svg-import-convlength-fix.diff} |     0
 applied_patches/0393-svg-import-opacity-fix.diff   |   153 +
 .../0393-vba-fix-range-delete-shift.diff           |    42 -
 ...0511-speed-store.diff => 0394-speed-store.diff} |     0
 ...-vba-fix-worksheet-add-before-param-object.diff |    31 -
 .../0395-vba-fix-worksheet-add-activate.diff       |    15 -
 ...tern-brush.diff => 0395-wmf-pattern-brush.diff} |     0
 ...iff => 0396-toolkit-layout-gcc-4.3.2-hack.diff} |     0
 applied_patches/0396-vba-application-quit.diff     |   183 -
 ...97-layout-accessibility-dispose-only-once.diff} |     0
 applied_patches/0397-vba-commandbar-rework.diff    |  2079 -
 ...f => 0398-buildfix-toolkit-workben-layout.diff} |     0
 applied_patches/0398-vba-menubar-objects.diff      |  1732 -
 ...-build.diff => 0399-layout-parallel-build.diff} |     0
 applied_patches/0399-vba-fix-missing-codename.diff |   424 -
 ...0-autocorrect-accidental-caps-lock-offapi.diff} |     0
 applied_patches/0400-vba-zoom-per-sheet.diff       |   273 -
 ...utocorrect-accidental-caps-lock-officecfg.diff} |     0
 .../0401-vba-fallback-to-calling-doc-context.diff  |   735 -
 ... 0402-autocorrect-accidental-caps-lock-sc.diff} |     0
 .../0402-vba-cursor-pos-for-selected-maxrange.diff |    24 -
 ... 0403-autocorrect-accidental-caps-lock-sw.diff} |     0
 .../0403-vba-combobox-rowsource-fix.diff           |    13 -
 .../0404-autocorrect-accidental-caps-lock-svx.diff |   536 +
 .../0404-vba-workbook-auto-open-event.diff         |    67 -
 ...0405-autocorrect-accidental-caps-lock-vcl.diff} |     0
 applied_patches/0405-vba-buildin-toolbar-fix.diff  |    81 -
 applied_patches/0406-cws-cbosdo01.diff             |   385 +
 .../0406-vba-workbook-precisionasdisplayed.diff    |    60 -
 ...> 0407-statusbar-fancy-modified-status-sc.diff} |     0
 .../0407-uno-xmenu-getpopupMenu-fix.diff           |    48 -
 ...> 0408-statusbar-fancy-modified-status-sd.diff} |     0
 .../0408-vba-commandbarcontrol-enabled.diff        |   309 -
 ...0409-statusbar-fancy-modified-status-sfx2.diff} |     0
 .../0409-vba-commandbar-document-scope.diff        |   252 -
 ...-statusbar-fancy-modified-status-starmath.diff} |     0
 applied_patches/0410-vba-dim-as-contants-fix.diff  |   193 -
 ... 0411-statusbar-fancy-modified-status-svx.diff} |     0
 .../0411-vba-commandbar-toolbar-fix.diff           |    67 -
 ...> 0412-statusbar-fancy-modified-status-sw.diff} |     0
 applied_patches/0412-vba-automation-set-fix.diff   |    85 -
 .../0413-tool-menu-bar-improvements.diff           |  1014 -
 ...-basebmp.diff => 0413-unittesting-basebmp.diff} |     0
 ...-basegfx.diff => 0414-unittesting-basegfx.diff} |     0
 applied_patches/0414-vba-styles-add-fix.diff       |    34 -
 ...ting-basic.diff => 0415-unittesting-basic.diff} |     0
 applied_patches/0415-vba-financial-functions.diff  |   813 -
 ...esting-bean.diff => 0416-unittesting-bean.diff} |     0
 applied_patches/0416-vba-typename-fix.diff         |    94 -
 ...-bridges.diff => 0417-unittesting-bridges.diff} |     0
 ...ng-canvas.diff => 0418-unittesting-canvas.diff} |     0
 ...-cli_ure.diff => 0419-unittesting-cli_ure.diff} |     0
 ...emaker.diff => 0420-unittesting-codemaker.diff} |     0
 ...figmgr.diff => 0421-unittesting-configmgr.diff} |     0
 .../0422-buildfix-oox-depends-on-unotools.diff     |     8 -
 ...ity.diff => 0422-unittesting-connectivity.diff} |     0
 ...esting-cppu.diff => 0423-unittesting-cppu.diff} |     0
 ...elper.diff => 0424-unittesting-cppuhelper.diff} |     0
 ...baccess.diff => 0425-unittesting-dbaccess.diff} |     0
 ...-desktop.diff => 0426-unittesting-desktop.diff} |     0
 ...ng-dtrans.diff => 0427-unittesting-dtrans.diff} |     0
 .../0428-calc-formula-asian-phonetic.diff          |  2715 -
 ...dobj.diff => 0428-unittesting-embeddedobj.diff} |     0
 applied_patches/0429-sc-sheet-gridline-toggle.diff |   309 -
 ...sions.diff => 0429-unittesting-extensions.diff} |     0
 .../0430-calc-formula-variable-separators-sc.diff  |  1048 -
 ...ng-filter.diff => 0430-unittesting-filter.diff} |     0
 ...ting-forms.diff => 0431-unittesting-forms.diff} |     0
 ...-fpicker.diff => 0432-unittesting-fpicker.diff} |     0
 ...mework.diff => 0433-unittesting-framework.diff} |     0
 ...ng-chart2.diff => 0434-unittesting-chart2.diff} |     0
 ...esting-idlc.diff => 0435-unittesting-idlc.diff} |     0
 ...nittesting-io.diff => 0436-unittesting-io.diff} |     0
 ...er.diff => 0437-unittesting-javaunohelper.diff} |     0
 .../0438-calc-sheet-tab-color-officecfg.diff       |    24 -
 ...esting-jurt.diff => 0438-unittesting-jurt.diff} |     0
 .../0439-calc-find-replace-empty-cells-sc.diff     |   388 -
 ...access.diff => 0439-unittesting-jvmaccess.diff} |     0
 .../0440-calc-find-replace-empty-cells-svx.diff    |   105 -
 ...istic.diff => 0440-unittesting-linguistic.diff} |     0
 .../0441-calc-enhanced-merge-cells-sc.diff         |  1078 -
 ...ng-offapi.diff => 0441-unittesting-offapi.diff} |     0
 ...esting-o3tl.diff => 0442-unittesting-o3tl.diff} |     0
 ...-package.diff => 0443-unittesting-package.diff} |     0
 ...adevOOo.diff => 0444-unittesting-qadevOOo.diff} |     0
 .../0445-calc-html-import-custom-lang-filter.diff  |    26 -
 ...egistry.diff => 0445-unittesting-registry.diff} |     0
 .../0446-calc-html-import-custom-lang-sc.diff      |  1319 -
 ...-ridljar.diff => 0446-unittesting-ridljar.diff} |     0
 .../0447-calc-csv-import-custom-lang-sc.diff       |  1071 -
 ...ttesting-sal.diff => 0447-unittesting-sal.diff} |     0
 ...0448-calc-csv-import-custom-lang-officecfg.diff |    27 -
 ...helper.diff => 0448-unittesting-salhelper.diff} |     0
 applied_patches/0449-calc-dp-hide-list-menu.diff   |  2457 -
 ...-sandbox.diff => 0449-unittesting-sandbox.diff} |     0
 ...ttesting-sax.diff => 0450-unittesting-sax.diff} |     0
 ...nittesting-sc.diff => 0451-unittesting-sc.diff} |     0
 .../0452-calc-jump-on-formula-ref-sc.diff          |   617 -
 ...ipting.diff => 0452-unittesting-scripting.diff} |     0
 ...nittesting-sd.diff => 0453-unittesting-sd.diff} |     0
 ...esting-sfx2.diff => 0454-unittesting-sfx2.diff} |     0
 applied_patches/0455-calc-dp-custom-sort.diff      |  1439 -
 ...ting-shell.diff => 0455-unittesting-shell.diff} |     0
 .../0456-calc-ods-sheet-protection-sc.diff         |  1032 -
 ...deshow.diff => 0456-unittesting-slideshow.diff} |     0
 ...ttesting-sot.diff => 0457-unittesting-sot.diff} |     0
 ...tarmath.diff => 0458-unittesting-starmath.diff} |     0
 .../0459-calc-dp-custom-names-ods-sc.diff          |   818 -
 ...esting-stoc.diff => 0459-unittesting-stoc.diff} |     0
 .../0460-calc-dp-custom-names-ods-xmloff.diff      |    24 -
 ...ting-store.diff => 0460-unittesting-store.diff} |     0
 .../0461-calc-selection-fixed-cursor.diff          |   877 -
 ...-svtools.diff => 0461-unittesting-svtools.diff} |     0
 ...ttesting-svx.diff => 0462-unittesting-svx.diff} |     0
 .../0463-calc-autofilter-shrink-selection.diff     |   156 -
 ...nittesting-sw.diff => 0463-unittesting-sw.diff} |     0
 ...estshl2.diff => 0464-unittesting-testshl2.diff} |     0
 ...ttools.diff => 0465-unittesting-testtools.diff} |     0
 ...-toolkit.diff => 0466-unittesting-toolkit.diff} |     0
 ...ting-tools.diff => 0467-unittesting-tools.diff} |     0
 ...helper.diff => 0468-unittesting-ucbhelper.diff} |     0
 ...ttesting-ucb.diff => 0469-unittesting-ucb.diff} |     0
 ...ng-udkapi.diff => 0470-unittesting-udkapi.diff} |     0
 ...ttesting-vcl.diff => 0471-unittesting-vcl.diff} |     0
 ...ter.diff => 0472-unittesting-writerfilter.diff} |     0
 ...ng-xmerge.diff => 0473-unittesting-xmerge.diff} |     0
 ...-xmlhelp.diff => 0474-unittesting-xmlhelp.diff} |     0
 ...ng-xmloff.diff => 0475-unittesting-xmloff.diff} |     0
 ...script.diff => 0476-unittesting-xmlscript.diff} |     0
 ...rity.diff => 0477-unittesting-xmlsecurity.diff} |     0
 ...win32-odma.diff => 0478-novell-win32-odma.diff} |     0
 ... 0479-svx-sdrobjeditview-update-edit-area.diff} |     0
 ...unix.diff => 0480-goodies-eps-filter-unix.diff} |     0
 ...erer.diff => 0481-emf+-cppcanvas-renderer.diff} |     0
 ...fplus.diff => 0482-emf+-cppcanvas-emfplus.diff} |     0
 ...enderer.diff => 0483-emf+-offapi-renderer.diff} |     0
 ...+-vcl-bitmap.diff => 0484-emf+-vcl-bitmap.diff} |     0
 ...l-renderer.diff => 0485-emf+-vcl-renderer.diff} |     0
 ...02-emf+-svtools.diff => 0486-emf+-svtools.diff} |     0
 ...-renderer.diff => 0487-emf+-scp2-renderer.diff} |     0
 ...mf+-crash-fix.diff => 0488-emf+-crash-fix.diff} |     0
 ...ff => 0489-vcl-grey-alpha-unix-sal-bitmap.diff} |     0
 ...jects.diff => 0490-emf+-multipart-objects.diff} |     0
 ...iff => 0491-emf+-use-canvas-only-for-emf+.diff} |     0
 ...image.diff => 0492-emf+-embedded-mf-image.diff} |     0
 ...r.diff => 0493-vcl-pluggable-mtf-renderer.diff} |     0
 ...f => 0494-emf+-cppcanvas-input-validation.diff} |     0
 ...in-apps.diff => 0495-linkwarn-dlg-in-apps.diff} |     0
 ...0496-linkwarn-sfx2-disable-cb-persistency.diff} |     0
 ...ff => 0497-linkwarn-svtools-miscopts-bits.diff} |     0
 ...=> 0498-linkwarn-officecfg-disable-msgbox.diff} |     0
 ...dlg.diff => 0499-linkwarn-svx-warning-dlg.diff} |     0
 ...nks.diff => 0500-linkwarn-sd-no-dnd-links.diff} |     0
 ...=> 0501-fix-ppt-linespacing-import-export.diff} |     0
 ...rt-fix.diff => 0502-sw-section-import-fix.diff} |     0
 ...ng.diff => 0503-sw-allow-negative-spacing.diff} |     0
 applied_patches/0504-field-patch.diff              |  2696 +
 ...rols.diff => 0505-sw-import-html-controls.diff} |     0
 ... 0506-svx-hacky-htmlselect-control-import.diff} |     0
 ...lideshow-slideshowview-transformation-fix.diff} |     0
 ...ew-zoom-fix.diff => 0508-sd-view-zoom-fix.diff} |     0
 ...-show-fix.diff => 0509-sd-custom-show-fix.diff} |     0
 ...ist-to-size.diff => 0510-fit-list-to-size.diff} |     0
 ...-size-ui.diff => 0511-fit-list-to-size-ui.diff} |     0
 ...f => 0512-fit-list-to-size-style-defaults.diff} |     0
 applied_patches/0513-fit-list-to-size-popup.diff   |   288 +
 .../0514-fit-list-to-size-build-fix.diff           |    17 +
 ...-nested-positionned-tables-ww8-import-fix.diff} |     0
 ....diff => 0516-xmloff_dis26300_conformance.diff} |     0
 ....diff => 0517-lockfile-dont-do-dns-lookup.diff} |     0
 ...ymbols.diff => 0518-lockfile-less-symbols.diff} |     0
 ... 0519-internal-mesa-headers-config_office.diff} |     0
 ...f => 0520-internal-mesa-headers-slideshow.diff} |     0
 .../0521-autocorrect-accidental-caps-lock-svx.diff |   536 -
 ...a.diff => 0521-internal-mesa-headers-mesa.diff} |     0
 applied_patches/0522-ui-desktop-integration.diff   |   224 +
 ...-mk.diff => 0523-cairo-pixman-makefile-mk.diff} |     0
 ...e-mk.diff => 0524-cairo-cairo-makefile-mk.diff} |     0
 ...ure.diff => 0525-internal-cairo-configure.diff} |     0
 ...ixman-scp2-source-ooo-file_library_ooo_scp.diff |    24 +
 ...s.diff => 0527-cppcanvas-fix-roundcorners.diff} |     0
 ...diff => 0528-officecfg-bighandles-default.diff} |     0
 ...-cutblack.diff => 0529-slideshow-cutblack.diff} |     0
 ...ce-fix.diff => 0530-canvas-colorspace-fix.diff} |     0
 ...ound.diff => 0531-unoxml-boost-workaround.diff} |     0
 ...rce-filter-xml-xmltbli-uninitializedvalue.diff} |     0
 ...pdate-ole.diff => 0533-svtools-update-ole.diff} |     0
 ...-deliver.diff => 0534-jurt-jnilib-deliver.diff} |     0
 ...sing.diff => 0535-timely-canvas-disposing.diff} |     0
 ...cks.diff => 0536-instset-prefer-langpacks.diff} |     0
 ...diff => 0537-solenv-installer-unopkg-call.diff} |     0
 ...eams.diff => 0538-svx-debug-sdrolestreams.diff} |     0
 ...acks.diff => 0539-instset-macos-langpacks.diff} |     0
 ...ktrace.diff => 0540-sal-disable-backtrace.diff} |     0
 ...ing.diff => 0541-sw-invert-border-spacing.diff} |     0
 ...542-sw-collapse-empty-table-par-like-html.diff} |     0
 ...iff => 0543-canvas-directx-lostdevice-fix.diff} |     0
 ...267.diff => 0544-sw-table-join-fix-i99267.diff} |     0
 ...f => 0545-svtools-svrtf-token-ignore-case.diff} |     0
 ...lerators.diff => 0546-fix-sd-accelerators.diff} |     0
 ...f => 0547-sw-outline-numbering-broken-fix.diff} |     0
 ...sw-insert-pagebreak-in-numbered-paragraph.diff} |     0
 ...in32-tooltips.diff => 0549-win32-tooltips.diff} |     0
 applied_patches/0550-win32-cygwin-1.7.diff         |    61 +
 applied_patches/0551-win32-sdk7.diff               |    13 +
 applied_patches/0552-win32-dxsdk-200908.diff       |    18 +
 applied_patches/0553-win32-interix.diff            |    22 +
 ....diff => 0554-sfx2-privateprotectedpublic.diff} |     0
 ...ce-ole.diff => 0555-optional-outplace-ole.diff} |     0
 ... 0556-slideshow-configurable-paintoverlay.diff} |     0
 ....diff => 0557-vcl-permit-global-shortcuts.diff} |     0
 ...diff => 0558-sd-customanimation-defbutton.diff} |     0
 ...68-sd-ruler-fix.diff => 0559-sd-ruler-fix.diff} |     0
 ...vel.diff => 0560-sd-odf-relaxed-listlevel.diff} |     0
 ...n-ui-fix.diff => 0561-sd-animation-ui-fix.diff} |     0
 ...e-sound.diff => 0562-slideshow-mute-sound.diff} |     0
 .../{0672-base64.diff => 0563-base64.diff}         |     0
 ...hack.diff => 0564-sfx2-qstart-nocrashhack.diff} |     0
 ...wind.diff => 0565-slideshow-effect-rewind.diff} |     0
 ....diff => 0566-svx-ppt-tablerow-height-fix.diff} |     0
 ...ubject.diff => 0567-mail-document-subject.diff} |     0
 ...a-separate-lib-sd-build-lst-with-transogl.diff} |     0
 ...yout-fix.diff => 0569-pptx-gfx-layout-fix.diff} |     0
 ...sx-export-notes-avoid-dereferencing-0-svx.diff} |     0
 ...=> 0571-odf-converter-ignore-writerfilter.diff} |     0
 applied_patches/0572-external-apm-header.diff      |   246 +
 ...0692-wmf-mm-text.diff => 0573-wmf-mm-text.diff} |     0
 ...-wmf-mm-text-1.diff => 0574-wmf-mm-text-1.diff} |     0
 ...x.diff => 0575-sd-create-table-height-fix.diff} |     0
 ...toplay-fix.diff => 0576-pptx-autoplay-fix.diff} |     0
 ...ff => 0577-configmgr-validate-removedtree.diff} |     0
 ...h.diff => 0578-svx-fix-fit-to-frame-crash.diff} |     0
 ...h-fix.diff => 0579-svx-fontwork-crash-fix.diff} |     0
 ...ge.diff => 0580-svx-autoshape-cache-purge.diff} |     0
 ...diff => 0581-normalize-template-paths-fix.diff} |     0
 ...iff => 0582-edit-links-decode-unicode-uri.diff} |     0
 ...=> 0583-fontconfig-cache-pre-substitution.diff} |     0
 ...-uno-cppu.diff => 0584-link-with-uno-cppu.diff} |     0
 ...ox-pptx-import-fix-placeholder-text-style.diff} |     0
 applied_patches/0586-build-fix-linux.diff          |    19 +
 applied_patches/0587-emf+-driver-string.diff       |   208 +
 applied_patches/0588-sd-print-fix-pageoffset.diff  |    27 +
 .../0589-svx-ppt-import-fix-bullet-size.diff       |    12 +
 ...-binfilter-stl.diff => 0590-binfilter-stl.diff} |     0
 ...-needed-bf.diff => 0591-link-as-needed-bf.diff} |     0
 ... => 0592-binfilter-dont-extern-sRTF-sHTML.diff} |     0
 ...r.diff => 0593-fit-list-to-size-binfilter.diff} |     0
 ...se.diff => 0594-reportdesigner-no-license.diff} |     0
 ...e.diff => 0595-presenterscreen-no-license.diff} |     0
 ...=> 0596-presentation-minimizer-no-license.diff} |     0
 ...97-apache-commons-build-fix-invalid-chars.diff} |     0
 ...se.diff => 0598-wiki-publisher-no-license.diff} |     0
 ...license.diff => 0599-pdfimport-no-license.diff} |     0
 ...diff => 0600-build-java-target-extensions.diff} |     0
 ...s.diff => 0601-pdfimport-lax-restrictions.diff} |     0
 ...iff => 0602-slideshow-effect-rewind-sdext.diff} |     0
 applied_patches/0628-fit-list-to-size-popup.diff   |   288 -
 applied_patches/0636-ui-desktop-integration.diff   |   223 -
 ...681-calc-external-ref-modify-link-modified.diff |    12 -
 .../0682-calc-xls-hyperlink-single-quote-fix.diff  |    38 -
 .../0683-calc-external-ref-decode-unicode-uri.diff |    25 -
 .../0687-calc-perf-ods-import-properties.diff      |   158 -
 applied_patches/0698-basegfx-color-tools.diff      |   614 -
 applied_patches/0705-link-with-comphelper.diff     |    10 -
 .../0706-import-export-dialogmodel.diff            |    20 -
 applied_patches/0707-dtrans-aqua-dragrect-fix.diff |    12 -
 applied_patches/0709-build-fix.diff                |   140 -
 basctl/source/basicide/baside2.cxx                 |     2 +-
 basctl/source/basicide/basides2.cxx                |     8 +-
 basctl/source/basicide/bastype2.cxx                |    82 +-
 basctl/source/basicide/bastypes.cxx                |     2 +-
 basctl/source/basicide/moduldlg.cxx                |     8 +-
 basctl/source/basicide/scriptdocument.cxx          |     2 +-
 basegfx/inc/basegfx/color/bcolortools.hxx          |     2 +-
 basegfx/source/color/bcolortools.cxx               |     2 +-
 basegfx/source/color/makefile.mk                   |     2 +-
 basegfx/test/makefile.mk                           |     2 +-
 basic/inc/basic/sbobjmod.hxx                       |     1 +
 basic/inc/basic/sbstar.hxx                         |     2 +-
 basic/source/basmgr/basmgr.cxx                     |    16 +-
 basic/source/classes/eventatt.cxx                  |    10 +-
 basic/source/classes/sb.cxx                        |     2 +-
 basic/source/classes/sb.src                        |     2 +-
 basic/source/classes/sbunoobj.cxx                  |   209 +-
 basic/source/classes/sbxmod.cxx                    |   108 +-
 basic/source/comp/dim.cxx                          |     5 +-
 basic/source/comp/exprtree.cxx                     |    12 +-
 basic/source/runtime/methods.cxx                   |    16 +-
 basic/source/runtime/methods1.cxx                  |     2 +-
 basic/source/runtime/runtime.cxx                   |     7 +-
 basic/source/runtime/step0.cxx                     |    28 +-
 basic/source/runtime/step1.cxx                     |     4 +
 basic/source/runtime/step2.cxx                     |    10 +-
 basic/source/sbx/sbxvalue.cxx                      |     8 +-
 basic/source/uno/scriptcont.cxx                    |     4 +-
 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx  |    18 +-
 canvas/source/directx/dx_winstuff.hxx              |     7 +-
 chart2/source/model/template/AreaChartType.cxx     |   114 -
 chart2/source/model/template/AreaChartType.hxx     |    10 -
 .../model/template/AreaChartTypeTemplate.cxx       |     3 -
 .../source/model/template/BarChartTypeTemplate.cxx |     1 -
 chart2/source/model/template/ChartTypeTemplate.cxx |    43 -
 chart2/source/model/template/ChartTypeTemplate.hxx |     5 -
 chart2/source/model/template/ColumnChartType.cxx   |    20 +-
 .../model/template/ColumnLineChartTypeTemplate.cxx |     1 -
 chart2/source/model/template/LineChartType.cxx     |    20 +-
 .../model/template/LineChartTypeTemplate.cxx       |     1 -
 .../source/model/template/NetChartTypeTemplate.cxx |     1 -
 .../source/model/template/PieChartTypeTemplate.cxx |     1 -
 .../model/template/ScatterChartTypeTemplate.cxx    |     1 -
 .../model/template/StockChartTypeTemplate.cxx      |     1 -
 chart2/source/view/axes/ScaleAutomatism.cxx        |    16 -
 chart2/source/view/charttypes/AreaChart.cxx        |    38 +-
 chart2/source/view/charttypes/BarChart.cxx         |    13 -
 chart2/source/view/charttypes/PieChart.cxx         |    29 +-
 chart2/source/view/charttypes/PieChart.hxx         |     4 +-
 chart2/source/view/charttypes/VSeriesPlotter.cxx   |    34 -
 chart2/source/view/main/ChartView.cxx              |    10 +-
 cli_ure/version/version.txt                        |    24 +-
 comphelper/inc/comphelper/docpasswordhelper.hxx    |   212 +
 comphelper/inc/comphelper/docpasswordrequest.hxx   |    91 +
 comphelper/inc/comphelper/mediadescriptor.hxx      |    76 +-
 comphelper/inc/comphelper/servicedecl.hxx          |     4 +-
 comphelper/source/misc/docpasswordhelper.cxx       |   152 +
 comphelper/source/misc/docpasswordrequest.cxx      |   153 +
 comphelper/source/misc/makefile.mk                 |     2 +
 comphelper/source/misc/mediadescriptor.cxx         |    14 +-
 comphelper/source/misc/uieventslogger.cxx          |    14 +-
 config.guess                                       |     2 +-
 configure.in                                       |    38 +-
 connectivity/inc/connectivity/TTableHelper.hxx     |    45 +-
 connectivity/inc/connectivity/sdbcx/VKey.hxx       |     1 +
 connectivity/inc/connectivity/sdbcx/VView.hxx      |    17 +-
 connectivity/inc/connectivity/sqlnode.hxx          |     3 +-
 .../source/commontools/ConnectionWrapper.cxx       |     2 +-
 connectivity/source/commontools/DateConversion.cxx |    56 +-
 .../commontools/FDatabaseMetaDataResultSet.cxx     |     2 +-
 connectivity/source/commontools/TColumnsHelper.cxx |    73 +-
 .../source/commontools/TDatabaseMetaDataBase.cxx   |     4 +-
 connectivity/source/commontools/TIndexColumns.cxx  |     2 +-
 connectivity/source/commontools/TIndexes.cxx       |     4 +-
 connectivity/source/commontools/TKey.cxx           |    55 +-
 .../source/commontools/TPrivilegesResultSet.cxx    |     4 +-
 connectivity/source/commontools/TTableHelper.cxx   |   213 +-
 connectivity/source/commontools/dbconversion.cxx   |     4 +-
 connectivity/source/commontools/dbmetadata.cxx     |     3 +-
 connectivity/source/commontools/dbtools.cxx        |     5 +-
 connectivity/source/commontools/dbtools2.cxx       |    49 +-
 connectivity/source/commontools/parameters.cxx     |     2 +-
 connectivity/source/commontools/sqlerror.cxx       |     2 +-
 connectivity/source/cpool/ZConnectionPool.cxx      |     6 +-
 connectivity/source/cpool/ZPoolCollection.cxx      |     4 +-
 connectivity/source/cpool/ZPooledConnection.cxx    |     4 +-
 connectivity/source/drivers/adabas/BConnection.cxx |     5 +-
 connectivity/source/drivers/adabas/BDriver.cxx     |     2 +-
 .../source/drivers/adabas/BPreparedStatement.cxx   |     4 +-
 connectivity/source/drivers/adabas/BTables.cxx     |     2 +-
 connectivity/source/drivers/adabas/BViews.cxx      |     2 +-
 .../drivers/ado/ADatabaseMetaDataResultSet.cxx     |     2 +-
 connectivity/source/drivers/ado/ADriver.cxx        |    11 +-
 .../source/drivers/ado/APreparedStatement.cxx      |     4 +-
 connectivity/source/drivers/ado/AResultSet.cxx     |     4 +-
 connectivity/source/drivers/ado/Aservices.cxx      |     4 +-
 connectivity/source/drivers/dbase/DTable.cxx       |     2 +-
 connectivity/source/drivers/evoab2/NDriver.cxx     |     2 +-
 connectivity/source/drivers/evoab2/NResultSet.cxx  |     2 +-
 connectivity/source/drivers/evoab2/NStatement.cxx  |     4 +-
 connectivity/source/drivers/evoab2/NTables.cxx     |     2 +-
 connectivity/source/drivers/file/FCatalog.cxx      |     2 +-
 connectivity/source/drivers/file/FConnection.cxx   |     4 +-
 .../source/drivers/file/FPreparedStatement.cxx     |     4 +-
 connectivity/source/drivers/file/FResultSet.cxx    |    10 +-
 connectivity/source/drivers/file/FTables.cxx       |     2 +-
 connectivity/source/drivers/file/fcomp.cxx         |     2 +-
 connectivity/source/drivers/hsqldb/HStorageMap.cxx |     8 +-
 connectivity/source/drivers/hsqldb/HTables.cxx     |     2 +-
 connectivity/source/drivers/hsqldb/HViews.cxx      |     2 +-
 connectivity/source/drivers/jdbc/JDriver.cxx       |     2 +-
 connectivity/source/drivers/jdbc/ResultSet.cxx     |     2 +-
 connectivity/source/drivers/kab/KResultSet.cxx     |     4 +-
 connectivity/source/drivers/kab/KTables.cxx        |     2 +-
 .../source/drivers/macab/MacabResultSet.cxx        |     4 +-
 connectivity/source/drivers/macab/MacabTables.cxx  |     2 +-
 .../source/drivers/mozab/MPreparedStatement.cxx    |     2 +-
 connectivity/source/drivers/mozab/MResultSet.cxx   |     6 +-
 .../source/drivers/mozab/MResultSetMetaData.cxx    |     2 +-
 connectivity/source/drivers/mozab/MTables.cxx      |     2 +-
 connectivity/source/drivers/mysql/YTables.cxx      |     2 +-
 connectivity/source/drivers/mysql/YViews.cxx       |     2 +-
 .../source/drivers/odbcbase/OConnection.cxx        |    24 +-
 .../source/drivers/odbcbase/ODatabaseMetaData.cxx  |   176 +-
 .../odbcbase/ODatabaseMetaDataResultSet.cxx        |    13 +-
 .../source/drivers/odbcbase/OPreparedStatement.cxx |    22 +-
 .../source/drivers/odbcbase/OResultSet.cxx         |     6 +-
 .../source/drivers/odbcbase/OResultSetMetaData.cxx |    34 +-
 .../source/drivers/odbcbase/OStatement.cxx         |    12 +-
 connectivity/source/drivers/odbcbase/OTools.cxx    |    14 +-
 connectivity/source/inc/OSubComponent.hxx          |     2 +-
 .../source/inc/adabas/BPreparedStatement.hxx       |     2 +-
 connectivity/source/inc/calc/CConnection.hxx       |     2 +-
 connectivity/source/inc/odbc/OConnection.hxx       |     6 +-
 .../source/inc/odbc/ODatabaseMetaDataResultSet.hxx |     1 +
 .../source/inc/odbc/OPreparedStatement.hxx         |     6 +-
 .../source/inc/odbc/OResultSetMetaData.hxx         |     1 +
 connectivity/source/parse/sqlbison.y               |    36 +-
 connectivity/source/parse/sqliterator.cxx          |    15 +-
 connectivity/source/parse/sqlnode.cxx              |    18 +-
 connectivity/source/sdbcx/VCatalog.cxx             |     2 +-
 connectivity/source/sdbcx/VTable.cxx               |     9 +-
 connectivity/source/sdbcx/VView.cxx                |    13 +-
 cppcanvas/source/mtfrenderer/emfplus.cxx           |   148 +-
 dbaccess/qa/complex/dbaccess/makefile.mk           |     6 +-
 .../source/core/api/SingleSelectQueryComposer.cxx  |     8 +-
 dbaccess/source/core/api/resultcolumn.cxx          |    64 +-
 dbaccess/source/core/api/resultcolumn.hxx          |    15 +
 dbaccess/source/core/inc/PropertyForward.hxx       |     1 +
 dbaccess/source/core/misc/ContainerMediator.cxx    |     6 +-
 dbaccess/source/ui/inc/RelationController.hxx      |     8 +-
 dbaccess/source/ui/misc/DExport.cxx                |    21 +-
 .../ui/relationdesign/RelationController.cxx       |   355 +-
 .../source/ui/relationdesign/RelationTableView.cxx |     6 +-
 dbaccess/source/ui/tabledesign/TableController.cxx |    71 +-
 .../res/commandimagelist/lc_navigateback.png       |   Bin 0 -> 1042 bytes
 .../res/commandimagelist/lc_navigateforward.png    |   Bin 0 -> 1039 bytes
 .../res/commandimagelist/lch_navigateback.png      |   Bin 0 -> 336 bytes
 .../res/commandimagelist/lch_navigateforward.png   |   Bin 0 -> 323 bytes
 .../res/commandimagelist/sc_navigateback.png       |   Bin 0 -> 526 bytes
 .../res/commandimagelist/sc_navigateforward.png    |   Bin 0 -> 537 bytes
 .../res/commandimagelist/sch_navigateback.png      |   Bin 0 -> 310 bytes
 .../res/commandimagelist/sch_navigateforward.png   |   Bin 0 -> 320 bytes
 default_images/sc/res/popup_select_current.png     |   Bin 0 -> 373 bytes
 default_images/sc/res/popup_unselect_current.png   |   Bin 0 -> 324 bytes
 desktop/source/app/app.cxx                         |     5 +-
 desktop/source/app/checkinstall.cxx                |    86 +-
 dmake/make.c                                       |     5 +-
 dmake/tests/misc-13                                |     2 +-
 dmake/tests/misc-15                                |     2 +-
 dmake/tests/targets-28                             |     4 +-
 .../source/processor2d/vclmetafileprocessor2d.cxx  |     4 +-
 drawinglayer/source/processor2d/vclprocessor2d.cxx |     8 +-
 extensions/source/config/ldap/ldapaccess.cxx       |    92 +-
 extensions/source/config/ldap/ldapaccess.hxx       |    35 +-
 extensions/source/config/ldap/ldapuserprof.cxx     |     6 +-
 .../source/config/ldap/ldapuserprofilebe.cxx       |    29 +-
 extensions/source/config/ldap/makefile.mk          |     1 -
 extensions/source/config/ldap/wrapldapinclude.hxx  |     6 +
 extensions/source/ole/oleobjw.cxx                  |    63 +-
 extensions/source/ole/oleobjw.hxx                  |    11 +-
 extensions/source/plugin/aqua/macmgr.cxx           |    39 +-
 .../fragments/types/writer_MS_Word_2007_XML.xcu    |     2 +-
 .../types/writer_MS_Word_2007_XML_Template.xcu     |     2 +-
 filter/source/pdf/impdialog.src                    |     4 +-
 filter/source/pdf/pdfdialog.cxx                    |    35 +-
 filter/source/pdf/pdfdialog.hxx                    |    21 +-
 filter/source/svg/gfxtypes.hxx                     |     2 +
 filter/source/svg/svgreader.cxx                    |    38 +-
 .../source/xslt/export/spreadsheetml/formular.xsl  |     6 +-
 .../export/spreadsheetml/ooo2spreadsheetml.xsl     |   180 +-
 .../import/spreadsheetml/spreadsheetml2ooo.xsl     |   215 +
 forms/qa/makefile.mk                               |     9 +-
 forms/source/component/GroupManager.cxx            |     4 +-
 forms/source/component/RadioButton.cxx             |    74 +-
 forms/source/misc/InterfaceContainer.cxx           |     8 +-
 forms/source/xforms/xpathlib/xpathlib.cxx          |     2 +-
 formula/inc/formula/compiler.hrc                   |     3 +-
 formula/inc/formula/opcode.hxx                     |     1 -
 formula/source/core/api/FormulaCompiler.cxx        |    42 +-
 formula/source/core/resource/core_resource.src     |     6 -
 fpicker/source/unx/kde4/KDE4FPEntry.cxx            |     6 +-
 fpicker/source/unx/kde4/KDE4FilePicker.cxx         |    90 +-
 .../filepicker/VistaFilePickerEventHandler.cxx     |     4 +-
 .../filepicker/VistaFilePickerEventHandler.hxx     |     4 +
 .../win32/filepicker/VistaFilePickerImpl.cxx       |     6 +-
 .../win32/filepicker/VistaFilePickerImpl.hxx       |     4 +
 .../win32/folderpicker/workbench/Test_fops.cxx     |     6 +-
 .../win32/folderpicker/workbench/makefile.mk       |     2 +-
 fpicker/source/win32/misc/makefile.mk              |     3 +-
 framework/collector/cmduicollector.cxx             |    40 +-
 framework/collector/uicmdstohtml.cxx               |     4 +-
 framework/inc/classes/addonmenu.hxx                |     7 +-
 framework/inc/classes/bmkmenu.hxx                  |     4 +-
 framework/inc/classes/eventsconfiguration.hxx      |    39 -
 framework/inc/classes/eventsdocumenthandler.hxx    |   198 -
 framework/inc/classes/fwlresid.hxx                 |    49 +
 framework/inc/classes/imagesconfiguration.hxx      |   115 -
 framework/inc/classes/imagesdocumenthandler.hxx    |   215 -
 framework/inc/classes/imagewrapper.hxx             |    18 +-
 framework/inc/classes/menuconfiguration.hxx        |   126 -
 framework/inc/classes/menumanager.hxx              |    38 +-
 framework/inc/classes/statusbarconfiguration.hxx   |    48 -
 framework/inc/classes/statusbardocumenthandler.hxx |   190 -
 framework/inc/classes/toolboxconfiguration.hxx     |    96 -
 .../inc/classes/toolboxconfigurationdefines.hxx    |    80 -
 framework/inc/classes/toolboxdocumenthandler.hxx   |   217 -
 .../inc/classes/toolboxlayoutdocumenthandler.hxx   |   198 -
 .../inc/helper/dockingareadefaultacceptor.hxx      |    15 +-
 framework/inc/helper/mischelper.hxx                |    15 +-
 framework/inc/helper/ocomponentaccess.hxx          |    15 +-
 framework/inc/helper/ocomponentenumeration.hxx     |    16 +-
 framework/inc/helper/oframes.hxx                   |    15 +-
 framework/inc/helper/opluginframedispatcher.hxx    |    15 +-
 framework/inc/helper/popupmenucontrollerbase.hxx   |     8 +-
 .../inc/helper/uiconfigelementwrapperbase.hxx      |    10 +-
 .../interaction/preventduplicateinteraction.hxx    |     4 +-
 framework/inc/jobs/helponstartup.hxx               |    14 +-
 framework/inc/jobs/shelljob.hxx                    |    13 +-
 framework/inc/macros/debug/memorymeasure.hxx       |     2 +-
 framework/inc/macros/xserviceinfo.hxx              |    27 +-
 framework/inc/mediadescriptor.h                    |   160 +-
 framework/inc/services.h                           |    18 +-
 framework/inc/services/dispatchhelper.hxx          |    12 +-
 framework/inc/services/frameloaderfactory.hxx      |    12 +-
 .../inc/services/mediatypedetectionhelper.hxx      |    10 +-
 framework/inc/services/menudocumenthandler.hxx     |   317 -
 .../inc/services/popupmenucontrollerfactory.hxx    |    97 -
 framework/inc/services/saxnamespacefilter.hxx      |   119 -
 framework/inc/services/substitutepathvars.hxx      |    11 +-
 framework/inc/services/uriabbreviation.hxx         |    10 +-
 framework/inc/services/urltransformer.hxx          |    10 +-
 framework/inc/tabwin/tabwinfactory.hxx             |    11 +-
 framework/inc/uiconfiguration/imagemanager.hxx     |    62 +-
 .../inc/uiconfiguration/moduleimagemanager.hxx     |   115 +-
 .../moduleuiconfigurationmanager.hxx               |    92 +-
 .../inc/uiconfiguration/uicategorydescription.hxx  |    50 +-
 .../inc/uiconfiguration/uiconfigurationmanager.hxx |    81 +-
 .../uiconfiguration/windowstateconfiguration.hxx   |     9 +-
 .../inc/uielement/comboboxtoolbarcontroller.hxx    |     4 +-
 .../inc/uielement/complextoolbarcontroller.hxx     |     1 +
 framework/inc/uielement/controlmenucontroller.hxx  |     7 +-
 .../inc/uielement/dropdownboxtoolbarcontroller.hxx |     4 +-
 framework/inc/uielement/edittoolbarcontroller.hxx  |     4 +-
 framework/inc/uielement/fontmenucontroller.hxx     |    11 +-
 framework/inc/uielement/fontsizemenucontroller.hxx |    12 +-
 framework/inc/uielement/footermenucontroller.hxx   |   159 +-
 .../inc/uielement/generictoolbarcontroller.hxx     |    27 +-
 framework/inc/uielement/headermenucontroller.hxx   |    14 +-
 .../inc/uielement/imagebuttontoolbarcontroller.hxx |     3 -
 framework/inc/uielement/itemcontainer.hxx          |    10 +-
 .../inc/uielement/langselectionmenucontroller.hxx  |     9 +-
 .../uielement/langselectionstatusbarcontroller.hxx |     3 +-
 framework/inc/uielement/macrosmenucontroller.hxx   |    13 +-
 framework/inc/uielement/menubarmanager.hxx         |    21 +-
 framework/inc/uielement/menubarwrapper.hxx         |     7 +-
 framework/inc/uielement/newmenucontroller.hxx      |    11 +-
 framework/inc/uielement/objectmenucontroller.hxx   |    13 +-
 .../inc/uielement/recentfilesmenucontroller.hxx    |     8 +-
 .../inc/uielement/spinfieldtoolbarcontroller.hxx   |     4 +-
 framework/inc/uielement/statusbarmanager.hxx       |     4 +-
 framework/inc/uielement/statusbarwrapper.hxx       |     3 -
 .../uielement/statusindicatorinterfacewrapper.hxx  |    12 +-
 .../uielement/togglebuttontoolbarcontroller.hxx    |     2 +-
 framework/inc/uielement/toolbarmanager.hxx         |     9 +
 framework/inc/uielement/toolbarsmenucontroller.hxx |     4 -
 framework/inc/uielement/toolbarwrapper.hxx         |     9 +-
 framework/inc/uielement/uicommanddescription.hxx   |    22 +-
 framework/inc/uifactory/addonstoolboxfactory.hxx   |    12 +-
 framework/inc/uifactory/factoryconfiguration.hxx   |   127 +
 framework/inc/uifactory/menubarfactory.hxx         |    24 +-
 .../inc/uifactory/popupmenucontrollerfactory.hxx   |    38 +-
 .../inc/uifactory/statusbarcontrollerfactory.hxx   |    40 +-
 framework/inc/uifactory/statusbarfactory.hxx       |    26 +-
 .../inc/uifactory/toolbarcontrollerfactory.hxx     |    21 +-
 framework/inc/uifactory/toolboxfactory.hxx         |    25 +-
 .../inc/uifactory/uielementfactorymanager.hxx      |    75 +-
 .../inc/uifactory/windowcontentfactorymanager.hxx  |    21 +-
 framework/inc/xml/eventsdocumenthandler.hxx        |    20 +-
 framework/inc/xml/imagesdocumenthandler.hxx        |    15 +-
 framework/inc/xml/menuconfiguration.hxx            |     1 +
 framework/inc/xml/menudocumenthandler.hxx          |    17 +-
 framework/inc/xml/saxnamespacefilter.hxx           |    15 +-
 framework/inc/xml/statusbardocumenthandler.hxx     |    15 +-
 framework/inc/xml/toolboxdocumenthandler.hxx       |    15 +-
 framework/prj/d.lst                                |    11 +-
 framework/source/accelerators/acceleratorcache.cxx |     4 +-
 .../accelerators/acceleratorconfiguration.cxx      |   142 +-
 .../source/accelerators/acceleratorexecute.cxx     |    10 +-
 .../moduleacceleratorconfiguration.cxx             |     3 +
 framework/source/classes/addonmenu.cxx             |    15 +-
 framework/source/classes/addonsoptions.cxx         |     2 +-
 framework/source/classes/bmkmenu.cxx               |    23 +-
 framework/source/classes/framelistanalyzer.cxx     |     6 +-
 framework/source/classes/fwktabwindow.cxx          |    19 +-
 framework/source/classes/fwlresid.cxx              |    68 +
 framework/source/classes/imagewrapper.cxx          |    86 -
 framework/source/classes/makefile.mk               |     1 +
 framework/source/classes/menumanager.cxx           |   553 +-
 framework/source/classes/propertysethelper.cxx     |     3 +-
 framework/source/classes/protocolhandlercache.cxx  |    15 +-
 framework/source/classes/taskcreator.cxx           |     3 +-
 framework/source/dispatch/closedispatcher.cxx      |     5 +-
 framework/source/dispatch/interceptionhelper.cxx   |     4 +-
 framework/source/dispatch/menudispatcher.cxx       |     6 +-
 framework/source/dispatch/popupmenudispatcher.cxx  |     8 +-
 .../source/dispatch/windowcommanddispatch.cxx      |     1 +
 framework/source/helper/actiontriggerhelper.cxx    |     4 +-
 .../source/helper/dockingareadefaultacceptor.cxx   |    13 -
 framework/source/helper/mischelper.cxx             |    90 +-
 framework/source/helper/ocomponentaccess.cxx       |    15 -
 framework/source/helper/ocomponentenumeration.cxx  |    17 -
 framework/source/helper/oframes.cxx                |    19 -
 framework/source/helper/persistentwindowstate.cxx  |     5 +-
 .../source/helper/popupmenucontrollerbase.cxx      |    79 +-
 framework/source/helper/titlebarupdate.cxx         |     3 +-
 framework/source/helper/titlehelper.cxx            |    44 +-
 .../source/helper/uiconfigelementwrapperbase.cxx   |    61 +-
 framework/source/helper/uielementwrapperbase.cxx   |     1 +
 .../inc/accelerators/acceleratorconfiguration.hxx  |     6 +-
 framework/source/inc/dispatch/uieventloghelper.hxx |     3 +-
 framework/source/inc/pattern/frame.hxx             |     1 +
 framework/source/jobs/helponstartup.cxx            |    13 -
 framework/source/jobs/job.cxx                      |     3 +
 framework/source/jobs/jobdata.cxx                  |     9 +-
 framework/source/jobs/jobresult.cxx                |     2 +-
 framework/source/jobs/shelljob.cxx                 |    11 -
 framework/source/layoutmanager/layoutmanager.cxx   |   582 +-
 framework/source/loadenv/loadenv.cxx               |     4 +-
 framework/source/recording/dispatchrecorder.cxx    |     2 +-
 framework/source/register/registerservices.cxx     |   134 +-
 framework/source/register/registertemp.cxx         |    71 +-
 framework/source/services/autorecovery.cxx         |     8 +-
 framework/source/services/backingwindow.cxx        |    13 +-
 framework/source/services/desktop.cxx              |     1 +
 framework/source/services/dispatchhelper.cxx       |    14 -
 framework/source/services/frame.cxx                |    10 +-
 framework/source/services/license.cxx              |     7 +-
 .../source/services/mediatypedetectionhelper.cxx   |    18 +-
 framework/source/services/modulemanager.cxx        |     7 +-
 framework/source/services/pathsettings.cxx         |    10 +-
 framework/source/services/substitutepathvars.cxx   |    53 +-
 framework/source/services/uriabbreviation.cxx      |    13 -
 framework/source/services/urltransformer.cxx       |   178 +-
 framework/source/tabwin/tabwindow.cxx              |     2 +-
 framework/source/tabwin/tabwinfactory.cxx          |    13 -
 framework/source/threadhelp/transactionmanager.cxx |     2 +-
 .../source/uiconfiguration/graphicnameaccess.cxx   |     2 +-
 framework/source/uiconfiguration/imagemanager.cxx  |  1390 +-
 .../source/uiconfiguration/imagemanagerimpl.cxx    |  1466 +
 .../source/uiconfiguration/imagemanagerimpl.hxx    |   225 +
 framework/source/uiconfiguration/makefile.mk       |     2 +
 .../source/uiconfiguration/moduleimagemanager.cxx  |  1762 +-
 .../source/uiconfiguration/moduleuicfgsupplier.cxx |    76 +-
 .../moduleuiconfigurationmanager.cxx               |  1902 +-
 .../uiconfiguration/uicategorydescription.cxx      |   219 +-
 .../uiconfiguration/uiconfigurationmanager.cxx     |  1607 +-
 .../uiconfiguration/uiconfigurationmanagerimpl.cxx |  1713 +
 .../uiconfiguration/uiconfigurationmanagerimpl.hxx |   221 +
 .../uiconfiguration/windowstateconfiguration.cxx   |    19 +-
 .../source/uielement/addonstoolbarmanager.cxx      |    30 +-
 .../source/uielement/addonstoolbarwrapper.cxx      |     1 +
 .../source/uielement/buttontoolbarcontroller.cxx   |     2 +-
 .../source/uielement/comboboxtoolbarcontroller.cxx |    55 +-
 .../source/uielement/complextoolbarcontroller.cxx  |    19 +-
 framework/source/uielement/constitemcontainer.cxx  |    12 +-
 .../source/uielement/controlmenucontroller.cxx     |   146 +-
 .../uielement/dropdownboxtoolbarcontroller.cxx     |    55 +-
 .../source/uielement/edittoolbarcontroller.cxx     |    55 +-
 framework/source/uielement/fontmenucontroller.cxx  |   111 +-
 .../source/uielement/fontsizemenucontroller.cxx    |   107 +-
 .../source/uielement/footermenucontroller.cxx      |   446 +-
 .../source/uielement/generictoolbarcontroller.cxx  |    66 +
 .../source/uielement/headermenucontroller.cxx      |   124 +-
 .../uielement/imagebuttontoolbarcontroller.cxx     |     8 -
 framework/source/uielement/itemcontainer.cxx       |    37 +-
 .../uielement/langselectionmenucontroller.cxx      |   210 +-
 .../uielement/langselectionstatusbarcontroller.cxx |    20 +-
 .../uielement/logoimagestatusbarcontroller.cxx     |     4 +-
 .../uielement/logotextstatusbarcontroller.cxx      |     4 +-
 .../source/uielement/macrosmenucontroller.cxx      |   169 +-
 framework/source/uielement/menubarmanager.cxx      |   724 +-
 framework/source/uielement/menubarmerger.cxx       |     8 +-
 framework/source/uielement/menubarwrapper.cxx      |    91 +-
 framework/source/uielement/newmenucontroller.cxx   |   126 +-
 .../source/uielement/objectmenucontroller.cxx      |    89 +-
 .../source/uielement/recentfilesmenucontroller.cxx |    83 +-
 framework/source/uielement/rootitemcontainer.cxx   |     9 +-
 .../uielement/spinfieldtoolbarcontroller.cxx       |    63 +-
 framework/source/uielement/statusbarmanager.cxx    |   175 +-
 framework/source/uielement/statusbarwrapper.cxx    |    50 +-
 .../uielement/statusindicatorinterfacewrapper.cxx  |    16 +-
 .../uielement/togglebuttontoolbarcontroller.cxx    |    58 +-
 framework/source/uielement/toolbar.cxx             |     1 +
 framework/source/uielement/toolbarmanager.cxx      |   282 +-
 .../source/uielement/toolbarsmenucontroller.cxx    |    74 +-
 framework/source/uielement/toolbarwrapper.cxx      |    74 +-
 .../source/uielement/uicommanddescription.cxx      |   236 +-
 .../source/uifactory/addonstoolboxfactory.cxx      |    17 +-
 .../source/uifactory/factoryconfiguration.cxx      |   344 +
 framework/source/uifactory/makefile.mk             |     1 +
 framework/source/uifactory/menubarfactory.cxx      |   115 +-
 .../uifactory/popupmenucontrollerfactory.cxx       |   629 +-
 .../uifactory/statusbarcontrollerfactory.cxx       |   716 +-
 framework/source/uifactory/statusbarfactory.cxx    |   112 +-
 .../source/uifactory/toolbarcontrollerfactory.cxx  |   820 +-
 framework/source/uifactory/toolboxfactory.cxx      |   116 +-
 .../source/uifactory/uielementfactorymanager.cxx   |   230 +-
 .../uifactory/windowcontentfactorymanager.cxx      |   292 +-
 framework/source/xml/eventsconfiguration.cxx       |     9 +-
 framework/source/xml/eventsdocumenthandler.cxx     |    13 -
 framework/source/xml/imagesconfiguration.cxx       |     9 +-
 framework/source/xml/imagesdocumenthandler.cxx     |    13 -
 framework/source/xml/menuconfiguration.cxx         |     7 +-
 framework/source/xml/menudocumenthandler.cxx       |    27 +-
 framework/source/xml/saxnamespacefilter.cxx        |    16 +-
 framework/source/xml/statusbarconfiguration.cxx    |     5 +-
 framework/source/xml/statusbardocumenthandler.cxx  |    23 +-
 framework/source/xml/toolboxconfiguration.cxx      |     5 +-
 framework/source/xml/toolboxdocumenthandler.cxx    |    26 +-
 framework/util/makefile.mk                         |    66 +-
 hsqldb/makefile.mk                                 |     3 +-
 hsqldb/patches/accumulated_patches.patch           |    11 +
 i18npool/inc/defaultnumberingprovider.hxx          |     1 +
 .../defaultnumberingprovider.cxx                   |    11 +-
 idlc/source/idlcmain.cxx                           |     5 +
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx   |     2 +-
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx         |    18 +-
 moz/download/mozilla-source.txt                    |     7 +-
 moz/extractfiles.mk                                |     2 +-
 moz/makefile.mk                                    |    98 +-
 moz/zipped/makefile.mk                             |    22 +-
 offapi/com/sun/star/document/MediaDescriptor.idl   |    12 +-
 offapi/com/sun/star/document/PDFDialog.idl         |    67 +
 .../com/sun/star/document/XVbaMethodParameter.idl  |    68 +
 offapi/com/sun/star/document/makefile.mk           |     4 +-
 offapi/com/sun/star/text/XFormField.idl            |    15 +-
 offapi/com/sun/star/ui/ItemStyle.idl               |     1 +
 .../data/org/openoffice/Office/UI/CalcCommands.xcu |    12 +-
 officecfg/registry/data/org/openoffice/VCL.xcu     |    34 +-
 officecfg/registry/data/org/openoffice/VCL.xcu.bak |    34 +-
 oovbaapi/ooo/vba/Globals.idl                       |     0
 oovbaapi/ooo/vba/XGlobals.idl                      |     0
 oovbaapi/ooo/vba/msforms/XLabel.idl                |     1 +
 oovbaapi/ooo/vba/msforms/XListBox.idl              |     2 +-
 oox/inc/oox/core/binarycodec.hxx                   |    33 +-
 oox/inc/oox/core/binaryfilterbase.hxx              |     5 +-
 oox/inc/oox/core/filterbase.hxx                    |    30 +-
 oox/inc/oox/core/filterdetect.hxx                  |   168 +
 oox/inc/oox/core/xmlfilterbase.hxx                 |     9 +-
 oox/inc/oox/dump/dumperbase.hxx                    |    50 +-
 oox/inc/oox/xls/biffcodec.hxx                      |   111 +-
 oox/inc/oox/xls/biffhelper.hxx                     |     3 +
 oox/inc/oox/xls/viewsettings.hxx                   |     3 +
 oox/inc/oox/xls/workbooksettings.hxx               |    19 +
 oox/prj/build.lst                                  |     2 +-
 oox/prj/d.lst                                      |    23 +-
 oox/source/core/binarycodec.cxx                    |    25 +-
 oox/source/core/binaryfilterbase.cxx               |    17 +-
 oox/source/core/filterbase.cxx                     |   174 +-
 oox/source/core/filterdetect.cxx                   |   535 +-
 oox/source/core/makefile.mk                        |     4 +
 oox/source/core/xmlfilterbase.cxx                  |    53 +-
 .../drawingml/fillpropertiesgroupcontext.cxx       |    13 +-
 oox/source/dump/biffdumper.cxx                     |    84 +-
 oox/source/dump/biffdumper.ini                     |     5 +
 oox/source/dump/dumperbase.cxx                     |    55 +-
 oox/source/dump/pptxdumper.cxx                     |     4 +-
 oox/source/dump/xlsbdumper.cxx                     |    10 +-
 oox/source/token/properties.txt                    |     1 +
 oox/source/vml/vmlshape.cxx                        |     2 +-
 oox/source/xls/biffcodec.cxx                       |   289 +-
 oox/source/xls/viewsettings.cxx                    |     9 +
 oox/source/xls/workbookfragment.cxx                |    64 +-
 oox/source/xls/workbooksettings.cxx                |    45 +
 oox/source/xls/worksheetfragment.cxx               |     4 +-
 oox/source/xls/worksheetsettings.cxx               |    15 +-
 oox/util/makefile.mk                               |    14 +
 package/inc/ZipFile.hxx                            |    14 +-
 package/inc/ZipPackage.hxx                         |    17 +-
 package/inc/ZipPackageBuffer.hxx                   |     2 +-
 package/inc/zipfileaccess.hxx                      |     6 +-
 package/source/zipapi/XUnbufferedStream.cxx        |    13 +-
 package/source/zipapi/XUnbufferedStream.hxx        |    13 +-
 package/source/zipapi/ZipFile.cxx                  |    25 +-
 package/source/zippackage/ZipPackage.cxx           |   321 +-
 package/source/zippackage/ZipPackageStream.cxx     |    32 +-
 package/source/zippackage/ZipPackageStream.hxx     |     2 -
 package/source/zippackage/zipfileaccess.cxx        |    33 +-
 packimages/pack/makefile.mk                        |     2 +-
 qadevOOo/runner/base/java_fat.java                 |    29 +-
 qadevOOo/runner/graphical/IniFile.java             |     2 +-
 qadevOOo/runner/graphical/JPEGComparator.java      |    30 +-
 qadevOOo/runner/graphical/JPEGCreator.java         |   107 +-
 qadevOOo/runner/graphical/PixelCounter.java        |    58 +-
 qadevOOo/runner/helper/APIDescGetter.java          |    60 +-
 qadevOOo/runner/helper/OfficeProvider.java         |    20 +
 qadevOOo/runner/lib/MultiPropertyTest.java         |   331 +-
 qadevOOo/runner/lib/TestParameters.java            |     4 +-
 qadevOOo/runner/org/openoffice/Runner.java         |     2 +-
 qadevOOo/runner/util/DesktopTools.java             |     8 +-
 reportdesign/source/core/sdr/RptObject.cxx         |     2 +-
 reportdesign/source/ui/misc/UITools.cxx            |     4 +-
 .../source/ui/misc/statusbarcontroller.cxx         |     2 +
 sal/osl/all/makefile.mk                            |     6 +-
 sal/osl/all/readline.c                             |   311 -
 sal/osl/unx/file.cxx                               |  5091 +-
 sal/osl/unx/file_impl.hxx                          |    43 +-
 sal/osl/unx/file_misc.cxx                          |  1084 +
 sal/osl/unx/file_stat.cxx                          |   281 +-
 sal/osl/unx/file_url.cxx                           |   177 +-
 sal/osl/unx/file_url.h                             |    60 +-
 sal/osl/unx/file_volume.cxx                        |  1570 +
 sal/osl/unx/makefile.mk                            |    12 +-
 sal/osl/w32/MAKEFILE.MK                            |     8 +
 sal/osl/w32/file.cxx                               |  4900 +-
 sal/osl/w32/file_dirvol.cxx                        |  1774 +
 sal/osl/w32/file_error.c                           |   154 +
 sal/osl/w32/file_error.h                           |    54 +
 sal/osl/w32/file_url.cxx                           |  1019 +
 sal/osl/w32/file_url.h                             |    96 +
 sal/osl/w32/procimpl.cxx                           |     8 +-
 sal/osl/w32/tempfile.cxx                           |   279 +
 sal/workben/makefile.mk                            |    23 +-
 sal/workben/t_layer.c                              |   314 -
 sal/workben/t_readline.c                           |    58 +
 sal/workben/t_tls.c                                |   257 -
 sal/workben/t_zip.c                                |   183 -
 sax/source/expatwrap/sax_expat.cxx                 |    18 +-
 sax/source/expatwrap/saxwriter.cxx                 |    21 +
 sc/inc/AccessibleFilterMenu.hxx                    |   191 +
 sc/inc/AccessibleFilterMenuItem.hxx                |   124 +
 sc/inc/AccessibleFilterTopWindow.hxx               |   104 +
 sc/inc/AccessibleGlobal.hxx                        |    72 +
 sc/inc/ViewSettingsSequenceDefines.hxx             |     5 +-
 sc/inc/attrib.hxx                                  |     1 +
 sc/inc/cell.hxx                                    |   177 +-
 sc/inc/cellsuno.hxx                                |    10 +-
 sc/inc/chart2uno.hxx                               |     8 +
 sc/inc/chartlis.hxx                                |     2 +-
 sc/inc/clipparam.hxx                               |     1 +
 sc/inc/collect.hxx                                 |     3 +-
 sc/inc/column.hxx                                  |    17 +-
 sc/inc/datauno.hxx                                 |     2 +
 sc/inc/dbcolect.hxx                                |     3 +-
 sc/inc/detfunc.hxx                                 |     1 +
 sc/inc/dociter.hxx                                 |   100 +-
 sc/inc/document.hxx                                |   132 +-
 sc/inc/docuno.hxx                                  |     3 +
 sc/inc/dpcachetable.hxx                            |     1 +
 sc/inc/dpobject.hxx                                |    30 +-
 sc/inc/dpoutput.hxx                                |     6 +-
 sc/inc/dpoutputgeometry.hxx                        |     9 +-
 sc/inc/dpshttab.hxx                                |     1 +
 sc/inc/global.hxx                                  |    80 +-
 sc/inc/globstr.hrc                                 |    35 +-
 sc/inc/indexmap.hxx                                |    59 -
 sc/inc/miscuno.hxx                                 |    17 +
 sc/inc/olinetab.hxx                                |     5 +-
 sc/inc/optutil.hxx                                 |     6 +-
 sc/inc/phonetic.hxx                                |   107 -
 sc/inc/pivot.hxx                                   |    29 +-
 sc/inc/queryparam.hxx                              |   144 +
 sc/inc/rangenam.hxx                                |     2 -
 sc/inc/reftokenhelper.hxx                          |     8 +-
 sc/inc/sc.hrc                                      |    42 +-
 sc/inc/sc.hrc.patched                              |  1660 +
 sc/inc/scabstdlg.hxx                               |    18 +-
 sc/inc/scextopt.hxx                                |     2 +
 sc/inc/scfuncs.hrc                                 |     1 -
 sc/inc/sheetdata.hxx                               |   183 +
 sc/inc/sortparam.hxx                               |     2 +-
 sc/inc/stringutil.hxx                              |    35 +
 sc/inc/tabbgcolor.hxx                              |    46 +
 sc/inc/table.hxx                                   |   124 +-
 sc/inc/textuno.hxx                                 |    11 +
 sc/inc/unonames.hxx                                |     2 +
 sc/sdi/docsh.sdi                                   |     1 +
 sc/sdi/scalc.sdi                                   |    54 +-
 sc/sdi/tabvwsh.sdi                                 |     1 +
 sc/source/core/data/attarray.cxx                   |    12 +
 sc/source/core/data/autonamecache.cxx              |     3 +-
 sc/source/core/data/bcaslot.cxx                    |     2 +-
 sc/source/core/data/cell.cxx                       |   106 +-
 sc/source/core/data/cell2.cxx                      |    27 +-
 sc/source/core/data/clipparam.cxx                  |    15 +-
 sc/source/core/data/column.cxx                     |    18 -
 sc/source/core/data/column2.cxx                    |    11 +-
 sc/source/core/data/column3.cxx                    |    56 +-
 sc/source/core/data/conditio.cxx                   |    10 +-
 sc/source/core/data/dociter.cxx                    |   427 +-
 sc/source/core/data/docpool.cxx                    |     4 +-
 sc/source/core/data/documen2.cxx                   |    26 +-
 sc/source/core/data/documen3.cxx                   |    88 +-
 sc/source/core/data/documen7.cxx                   |     7 +
 sc/source/core/data/documen8.cxx                   |    54 +-
 sc/source/core/data/documen9.cxx                   |     4 +-
 sc/source/core/data/document.cxx                   |   470 +-
 sc/source/core/data/dpcachetable.cxx               |    31 +
 sc/source/core/data/dpgroup.cxx                    |     2 +-
 sc/source/core/data/dpobject.cxx                   |   183 +-
 sc/source/core/data/dpoutput.cxx                   |    31 +-
 sc/source/core/data/dpoutputgeometry.cxx           |    43 +-
 sc/source/core/data/dpsave.cxx                     |   120 +-
 sc/source/core/data/dptabdat.cxx                   |     4 +-
 sc/source/core/data/dptabsrc.cxx                   |     4 +-
 sc/source/core/data/drwlayer.cxx                   |    10 +-
 sc/source/core/data/fillinfo.cxx                   |    41 +-
 sc/source/core/data/global.cxx                     |    82 +-
 sc/source/core/data/global2.cxx                    |   293 +-
 sc/source/core/data/makefile.mk                    |     2 +-
 sc/source/core/data/olinetab.cxx                   |     8 +-
 sc/source/core/data/phonetic.cxx                   |    72 -
 sc/source/core/data/pivot2.cxx                     |    24 +-
 sc/source/core/data/poolhelp.cxx                   |    61 +-
 sc/source/core/data/sortparam.cxx                  |     9 +-
 sc/source/core/data/stlpool.cxx                    |    11 +-
 sc/source/core/data/stlsheet.cxx                   |    15 +-
 sc/source/core/data/table1.cxx                     |    63 +-
 sc/source/core/data/table2.cxx                     |   411 +-
 sc/source/core/data/table3.cxx                     |   328 +-
 sc/source/core/data/table5.cxx                     |   779 +-
 sc/source/core/data/table6.cxx                     |   217 +-
 sc/source/core/inc/doubleref.hxx                   |   194 +
 sc/source/core/inc/interpre.hxx                    |     8 +-
 sc/source/core/inc/poolhelp.hxx                    |    17 +-
 sc/source/core/tool/autoform.cxx                   |     6 +-
 sc/source/core/tool/callform.cxx                   |     4 +-
 sc/source/core/tool/chartarr.cxx                   |    76 +-
 sc/source/core/tool/collect.cxx                    |    19 +-
 sc/source/core/tool/compiler.cxx                   |    11 +-
 sc/source/core/tool/dbcolect.cxx                   |    11 +-
 sc/source/core/tool/detfunc.cxx                    |    16 +
 sc/source/core/tool/docoptio.cxx                   |     2 +-
 sc/source/core/tool/doubleref.cxx                  |   568 +
 sc/source/core/tool/indexmap.cxx                   |    80 -
 sc/source/core/tool/interpr1.cxx                   |   259 +-
 sc/source/core/tool/interpr2.cxx                   |    70 -
 sc/source/core/tool/interpr4.cxx                   |   356 +-
 sc/source/core/tool/interpr5.cxx                   |     2 +-
 sc/source/core/tool/makefile.mk                    |     5 +-
 sc/source/core/tool/optutil.cxx                    |     4 +-
 sc/source/core/tool/queryparam.cxx                 |   371 +
 sc/source/core/tool/rangelst.cxx                   |     4 +-
 sc/source/core/tool/rangenam.cxx                   |    28 +-
 sc/source/core/tool/stringutil.cxx                 |     9 +
 sc/source/core/tool/userlist.cxx                   |     4 +-
 sc/source/filter/excel/biffdump.cxx                |  9929 --
 sc/source/filter/excel/colrowst.cxx                |     3 +-
 sc/source/filter/excel/excel.cxx                   |    36 +-
 sc/source/filter/excel/excform.cxx                 |     7 +-
 sc/source/filter/excel/excform8.cxx                |    18 +-
 sc/source/filter/excel/excimp8.cxx                 |    10 +-
 sc/source/filter/excel/frmbase.cxx                 |     6 +
 sc/source/filter/excel/impop.cxx                   |    25 +-
 sc/source/filter/excel/makefile.mk                 |     2 +-
 sc/source/filter/excel/read.cxx                    |    10 +-
 sc/source/filter/excel/xeescher.cxx                |     2 +
 sc/source/filter/excel/xehelper.cxx                |    20 +-
 sc/source/filter/excel/xelink.cxx                  |     2 +-
 sc/source/filter/excel/xepage.cxx                  |    31 +-
 sc/source/filter/excel/xestream.cxx                |     2 +-
 sc/source/filter/excel/xestring.cxx                |    89 +-
 sc/source/filter/excel/xestyle.cxx                 |     1 +
 sc/source/filter/excel/xetable.cxx                 |     5 +-
 sc/source/filter/excel/xeview.cxx                  |    43 +
 sc/source/filter/excel/xichart.cxx                 |    63 +-
 sc/source/filter/excel/xicontent.cxx               |    67 +-
 sc/source/filter/excel/xiescher.cxx                |     6 +-
 sc/source/filter/excel/xiformula.cxx               |     4 +-
 sc/source/filter/excel/xihelper.cxx                |    16 +-
 sc/source/filter/excel/xiname.cxx                  |     8 +-
 sc/source/filter/excel/xipage.cxx                  |     4 +-
 sc/source/filter/excel/xipivot.cxx                 |    63 +-
 sc/source/filter/excel/xiroot.cxx                  |    12 -
 sc/source/filter/excel/xistream.cxx                |   176 +-
 sc/source/filter/excel/xistring.cxx                |    28 +-
 sc/source/filter/excel/xiview.cxx                  |    22 +
 sc/source/filter/excel/xlescher.cxx                |    15 +-
 sc/source/filter/excel/xlformula.cxx               |     4 +-
 sc/source/filter/excel/xlroot.cxx                  |     8 +
 sc/source/filter/excel/xlstream.cxx                |    52 -
 sc/source/filter/excel/xltoolbar.cxx               |    82 +-
 sc/source/filter/excel/xltoolbar.hxx               |    12 +-
 sc/source/filter/excel/xlview.cxx                  |     1 +
 sc/source/filter/ftools/fapihelper.cxx             |    53 +-
 sc/source/filter/html/htmlexp.cxx                  |    14 +-
 sc/source/filter/inc/excform.hxx                   |     6 +-
 sc/source/filter/inc/excimp8.hxx                   |     1 +
 sc/source/filter/inc/fapihelper.hxx                |     6 +-
 sc/source/filter/inc/fdumper.hxx                   |  1520 -
 sc/source/filter/inc/fdumperole.hxx                |   186 -
 sc/source/filter/inc/formel.hxx                    |    11 +-
 sc/source/filter/inc/imp_op.hxx                    |     2 +
 sc/source/filter/inc/xestream.hxx                  |     7 +-
 sc/source/filter/inc/xestring.hxx                  |    18 -
 sc/source/filter/inc/xestyle.hxx                   |     3 +-
 sc/source/filter/inc/xeview.hxx                    |    15 +
 sc/source/filter/inc/xichart.hxx                   |     9 +-
 sc/source/filter/inc/xiroot.hxx                    |     6 -
 sc/source/filter/inc/xistream.hxx                  |    65 +-
 sc/source/filter/inc/xistring.hxx                  |    11 -
 sc/source/filter/inc/xiview.hxx                    |     3 +-
 sc/source/filter/inc/xlcontent.hxx                 |     6 +-
 sc/source/filter/inc/xldumper.hxx                  |   683 -
 sc/source/filter/inc/xlroot.hxx                    |    10 +-
 sc/source/filter/inc/xlstream.hxx                  |    15 +-
 sc/source/filter/inc/xlstring.hxx                  |    63 +-
 sc/source/filter/inc/xlview.hxx                    |     8 +
 sc/source/filter/lotus/lotimpop.cxx                |     3 +-
 sc/source/filter/lotus/op.cxx                      |     4 +-
 sc/source/filter/rtf/eeimpars.cxx                  |    13 +-
 sc/source/filter/rtf/expbase.cxx                   |    13 +-
 sc/source/filter/starcalc/scflt.cxx                |    32 +-
 sc/source/filter/xcl97/XclImpChangeTrack.cxx       |     4 +-
 sc/source/filter/xml/XMLExportDataPilot.cxx        |     3 +-
 sc/source/filter/xml/XMLExportDataPilot.hxx        |     1 +
 sc/source/filter/xml/XMLExportIterator.cxx         |    73 +-
 sc/source/filter/xml/XMLExportIterator.hxx         |    10 +-
 sc/source/filter/xml/XMLStylesExportHelper.cxx     |     4 +-
 sc/source/filter/xml/XMLTableShapeImportHelper.cxx |    39 +-
 sc/source/filter/xml/XMLTableShapeImportHelper.hxx |     2 +
 sc/source/filter/xml/XMLTextPContext.cxx           |   109 +-
 sc/source/filter/xml/XMLTextPContext.hxx           |    13 -
 sc/source/filter/xml/makefile.mk                   |    53 +-
 sc/source/filter/xml/sheetdata.cxx                 |   275 +
 sc/source/filter/xml/xmlannoi.cxx                  |    10 +-
 sc/source/filter/xml/xmlannoi.hxx                  |    23 +-
 sc/source/filter/xml/xmlbodyi.cxx                  |    40 +-
 sc/source/filter/xml/xmlbodyi.hxx                  |     1 +
 sc/source/filter/xml/xmlcelli.cxx                  |   125 +-
 sc/source/filter/xml/xmlcelli.hxx                  |     8 -
 sc/source/filter/xml/xmlcoli.cxx                   |    12 +-
 sc/source/filter/xml/xmldpimp.cxx                  |    31 +-
 sc/source/filter/xml/xmldpimp.hxx                  |     3 +-
 sc/source/filter/xml/xmlexprt.cxx                  |   868 +-
 sc/source/filter/xml/xmlexprt.hxx                  |    31 +-
 sc/source/filter/xml/xmlimprt.cxx                  |   105 +-
 sc/source/filter/xml/xmlimprt.hxx                  |    28 +-
 sc/source/filter/xml/xmlrowi.cxx                   |    11 +
 sc/source/filter/xml/xmlrubyi.cxx                  |   207 -
 sc/source/filter/xml/xmlrubyi.hxx                  |   191 -
 sc/source/filter/xml/xmlstyle.cxx                  |     1 -
 sc/source/filter/xml/xmlstyli.cxx                  |   162 +-
 sc/source/filter/xml/xmlstyli.hxx                  |    83 +-
 sc/source/filter/xml/xmlsubti.cxx                  |    16 +-
 sc/source/filter/xml/xmltabi.cxx                   |    17 +
 sc/source/filter/xml/xmltabi.hxx                   |     1 +
 sc/source/filter/xml/xmlwrap.cxx                   |    63 +-
 sc/source/ui/Accessibility/AccessibleCellBase.cxx  |    10 +-
 .../ui/Accessibility/AccessibleContextBase.cxx     |     5 +
 .../ui/Accessibility/AccessibleFilterMenu.cxx      |   402 +
 .../ui/Accessibility/AccessibleFilterMenuItem.cxx  |   209 +
 .../ui/Accessibility/AccessibleFilterTopWindow.cxx |   137 +
 sc/source/ui/Accessibility/AccessibleGlobal.cxx    |    98 +
 sc/source/ui/Accessibility/makefile.mk             |     8 +
 sc/source/ui/app/inputhdl.cxx                      |     2 +-
 sc/source/ui/app/inputwin.cxx                      |     2 +-
 sc/source/ui/app/transobj.cxx                      |    15 +-
 sc/source/ui/attrdlg/scdlgfact.cxx                 |    53 +-
 sc/source/ui/attrdlg/scdlgfact.hxx                 |    23 +-
 sc/source/ui/cctrl/dpcontrol.cxx                   |   872 +-
 sc/source/ui/cctrl/dpcontrol.src                   |    35 +-
 sc/source/ui/dbgui/asciiopt.src                    |    12 +-
 sc/source/ui/dbgui/fieldwnd.cxx                    |    60 +-
 sc/source/ui/dbgui/filtdlg.cxx                     |    12 +-
 sc/source/ui/dbgui/foptmgr.cxx                     |     1 +
 sc/source/ui/dbgui/langchooser.cxx                 |   120 -
 sc/source/ui/dbgui/langchooser.src                 |   112 -
 sc/source/ui/dbgui/makefile.mk                     |     6 +-
 sc/source/ui/dbgui/pfiltdlg.cxx                    |     3 +-
 sc/source/ui/dbgui/pvfundlg.cxx                    |    44 +-
 sc/source/ui/dbgui/pvlaydlg.cxx                    |    56 +-
 sc/source/ui/dbgui/scuiasciiopt.cxx                |     2 +-
 sc/source/ui/dbgui/textimportoptions.cxx           |   120 +
 sc/source/ui/dbgui/textimportoptions.src           |   112 +
 sc/source/ui/docshell/arealink.cxx                 |     6 +-
 sc/source/ui/docshell/dbdocfun.cxx                 |    64 +-
 sc/source/ui/docshell/docfunc.cxx                  |   165 +-
 sc/source/ui/docshell/docsh.cxx                    |    43 +-
 sc/source/ui/docshell/docsh4.cxx                   |     7 +
 sc/source/ui/docshell/docsh5.cxx                   |     6 +-
 sc/source/ui/docshell/docsh8.cxx                   |   201 +-
 sc/source/ui/docshell/externalrefmgr.cxx           |     4 +-
 sc/source/ui/docshell/impex.cxx                    |    25 +-
 sc/source/ui/docshell/olinefun.cxx                 |     8 +-
 sc/source/ui/docshell/tablink.cxx                  |     2 +-
 sc/source/ui/drawfunc/futext3.cxx                  |     8 +
 sc/source/ui/inc/AccessibleContextBase.hxx         |     2 +
 sc/source/ui/inc/cellsh.hxx                        |     3 +-
 sc/source/ui/inc/dbfunc.hxx                        |     6 +-
 sc/source/ui/inc/docfunc.hxx                       |     5 +
 sc/source/ui/inc/docsh.hxx                         |     6 +
 sc/source/ui/inc/dpcontrol.hrc                     |     9 +-
 sc/source/ui/inc/dpcontrol.hxx                     |   183 +-
 sc/source/ui/inc/fieldwnd.hxx                      |    11 +-
 sc/source/ui/inc/filtdlg.hxx                       |     1 +
 sc/source/ui/inc/gridwin.hxx                       |    36 +-
 sc/source/ui/inc/hdrcont.hxx                       |     2 +-
 sc/source/ui/inc/langchooser.hxx                   |    76 -
 sc/source/ui/inc/miscdlgs.hrc                      |     6 +
 sc/source/ui/inc/pfiltdlg.hxx                      |     2 +-
 sc/source/ui/inc/tabbgcolordlg.hxx                 |    80 +
 .../inc/{langchooser.hrc => textimportoptions.hrc} |     0
 sc/source/ui/inc/textimportoptions.hxx             |    76 +
 sc/source/ui/inc/uiitems.hxx                       |     1 +
 sc/source/ui/inc/undodat.hxx                       |     1 +
 sc/source/ui/inc/undotab.hxx                       |    32 +
 sc/source/ui/inc/viewdata.hxx                      |    17 +-
 sc/source/ui/inc/viewfunc.hxx                      |     5 +
 sc/source/ui/inc/viewutil.hxx                      |     4 +-
 sc/source/ui/miscdlgs/acredlin.cxx                 |     2 +-
 sc/source/ui/miscdlgs/makefile.mk                  |     3 +-
 sc/source/ui/miscdlgs/solveroptions.cxx            |     2 +-
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx            |   197 +
 sc/source/ui/navipi/content.cxx                    |     6 +-
 sc/source/ui/src/globstr.src                       |     8 +
 sc/source/ui/src/miscdlgs.src                      |    90 +
 sc/source/ui/src/popup.src                         |   165 +-
 sc/source/ui/src/scfuncs.src                       |    27 -
 sc/source/ui/src/scstring.src                      |     8 +
 sc/source/ui/undo/undobase.cxx                     |     1 +
 sc/source/ui/undo/undoblk.cxx                      |    14 +-
 sc/source/ui/undo/undoblk3.cxx                     |     7 +-
 sc/source/ui/undo/undocell.cxx                     |     2 +
 sc/source/ui/undo/undodat.cxx                      |     7 +-
 sc/source/ui/undo/undotab.cxx                      |   111 +
 sc/source/ui/unoobj/cellsuno.cxx                   |   128 +-
 sc/source/ui/unoobj/chart2uno.cxx                  |    38 +-
 sc/source/ui/unoobj/dapiuno.cxx                    |    17 +-
 sc/source/ui/unoobj/docuno.cxx                     |    95 +-
 sc/source/ui/unoobj/filtuno.cxx                    |     4 +-
 sc/source/ui/unoobj/funcuno.cxx                    |     6 +-
 sc/source/ui/unoobj/miscuno.cxx                    |    37 +
 sc/source/ui/unoobj/textuno.cxx                    |    41 +
 sc/source/ui/unoobj/viewuno.cxx                    |     2 +-
 sc/source/ui/vba/helperdecl.hxx                    |     2 +-
 sc/source/ui/vba/makefile.mk                       |     2 +-
 sc/source/ui/vba/testvba/Logs/AutoFilter.log       |    20 +
 sc/source/ui/vba/testvba/Logs/CalcFont.log         |    17 +
 .../ui/vba/testvba/Logs/MiscOperatorTests.log      |    30 +
 sc/source/ui/vba/testvba/Logs/MiscRangeTests.log   |    45 +
 sc/source/ui/vba/testvba/Logs/PageBreaks.log       |    10 +
 sc/source/ui/vba/testvba/Logs/Ranges-2.log         |    68 +
 sc/source/ui/vba/testvba/Logs/Ranges-3.log         |     8 +
 sc/source/ui/vba/testvba/Logs/Ranges.log           |   280 +
 sc/source/ui/vba/testvba/Logs/Shapes.log           |    77 +
 sc/source/ui/vba/testvba/Logs/StrConv-test.log     |     9 +
 sc/source/ui/vba/testvba/Logs/Template.log         |    14 +
 sc/source/ui/vba/testvba/Logs/TestAddress.log      |    67 +
 .../ui/vba/testvba/Logs/TestCalc_Rangetest.log     |    60 +
 .../ui/vba/testvba/Logs/TestCalc_Rangetest2.log    |    65 +
 sc/source/ui/vba/testvba/Logs/TestIntersection.log |    26 +
 sc/source/ui/vba/testvba/Logs/TestUnion.log        |    17 +
 sc/source/ui/vba/testvba/Logs/VariantTest.log      |    47 +
 sc/source/ui/vba/testvba/Logs/Window.log           |    46 +
 sc/source/ui/vba/testvba/Logs/bytearraystring.log  |     8 +
 sc/source/ui/vba/testvba/Logs/dateserial.log       |     9 +
 sc/source/ui/vba/testvba/Logs/datevalue.log        |     8 +
 sc/source/ui/vba/testvba/Logs/format.log           |    36 +
 sc/source/ui/vba/testvba/Logs/pagesetup.log        |    77 +
 sc/source/ui/vba/testvba/Logs/partition.log        |    11 +
 sc/source/ui/vba/testvba/Logs/range-4.log          |    16 +
 sc/source/ui/vba/testvba/Logs/replace.log          |    14 +
 sc/source/ui/vba/testvba/Logs/stringplusdouble.log |    62 +
 sc/source/ui/vba/testvba/Logs/window2.log          |    41 +
 .../testvba/TestDocuments/logs/unix/CalcFont.log   |    17 +
 .../TestDocuments/logs/unix/MiscOperatorTests.log  |    30 +
 .../vba/testvba/TestDocuments/logs/unix/Ranges.log |    20 +-
 .../TestDocuments/logs/unix/TestAddress.log        |    11 +-
 .../TestDocuments/logs/unix/TestIntersection.log   |    26 +
 .../testvba/TestDocuments/logs/unix/TestUnion.log  |    17 +
 .../TestDocuments/logs/unix/VariantTest.log        |    47 +
 .../vba/testvba/TestDocuments/logs/unix/format.log |     4 +-
 .../testvba/TestDocuments/logs/unix/replace.log    |     4 +-
 .../testvba/TestDocuments/logs/unix/window2.log    |    24 +-
 sc/source/ui/vba/testvba/list1                     |    28 +
 sc/source/ui/vba/testvba/list2                     |    28 +
 sc/source/ui/vba/testvba/list3                     |    28 +
 sc/source/ui/vba/testvba/runTests.pl               |     2 +-
 sc/source/ui/vba/testvba/testrun.log               |   417 +
 sc/source/ui/vba/vbaapplication.cxx                |    52 +-
 sc/source/ui/vba/vbabutton.cxx                     |     0
 sc/source/ui/vba/vbabutton.hxx                     |     0
 sc/source/ui/vba/vbacheckbox.cxx                   |     0
 sc/source/ui/vba/vbacheckbox.hxx                   |     0
 sc/source/ui/vba/vbacollectionimpl.cxx             |     0
 sc/source/ui/vba/vbacollectionimpl.hxx             |     0
 sc/source/ui/vba/vbacolorformat.cxx                |     0
 sc/source/ui/vba/vbacolorformat.hxx                |     0
 sc/source/ui/vba/vbacombobox.cxx                   |     0
 sc/source/ui/vba/vbacombobox.hxx                   |     0
 sc/source/ui/vba/vbacommandbar.cxx                 |     0
 sc/source/ui/vba/vbacommandbar.hxx                 |     0
 sc/source/ui/vba/vbacommandbarcontrol.cxx          |     0
 sc/source/ui/vba/vbacommandbarcontrol.hxx          |     0
 sc/source/ui/vba/vbacommandbarcontrols.cxx         |     0
 sc/source/ui/vba/vbacommandbarcontrols.hxx         |     0
 sc/source/ui/vba/vbacommandbars.cxx                |     0
 sc/source/ui/vba/vbacommandbars.hxx                |     0
 sc/source/ui/vba/vbacomment.cxx                    |     9 +-
 sc/source/ui/vba/vbacontrol.hxx                    |     0
 sc/source/ui/vba/vbacontrols.cxx                   |     0
 sc/source/ui/vba/vbacontrols.hxx                   |     0
 sc/source/ui/vba/vbadialog.cxx                     |    80 +-
 sc/source/ui/vba/vbadialog.hxx                     |     5 +-
 sc/source/ui/vba/vbadialogs.cxx                    |     8 +
 sc/source/ui/vba/vbadialogs.hxx                    |     1 +
 sc/source/ui/vba/vbafillformat.cxx                 |     0
 sc/source/ui/vba/vbafillformat.hxx                 |     0
 sc/source/ui/vba/vbafont.cxx                       |     5 +-
 sc/source/ui/vba/vbaframe.cxx                      |     0
 sc/source/ui/vba/vbaframe.hxx                      |     0
 sc/source/ui/vba/vbaglobals.cxx                    |    12 +-
 sc/source/ui/vba/vbaglobals.hxx                    |     2 +-
 sc/source/ui/vba/vbahelper.hxx                     |     0
 sc/source/ui/vba/vbahelperinterface.hxx            |     0
 sc/source/ui/vba/vbaimage.cxx                      |     0
 sc/source/ui/vba/vbaimage.hxx                      |     0
 sc/source/ui/vba/vbainterior.cxx                   |    12 +-
 sc/source/ui/vba/vbalabel.cxx                      |     0
 sc/source/ui/vba/vbalabel.hxx                      |     0
 sc/source/ui/vba/vbalineformat.cxx                 |     0
 sc/source/ui/vba/vbalineformat.hxx                 |     0
 sc/source/ui/vba/vbalistbox.cxx                    |     0
 sc/source/ui/vba/vbalistbox.hxx                    |     0
 sc/source/ui/vba/vbalistcontrolhelper.cxx          |     0
 sc/source/ui/vba/vbalistcontrolhelper.hxx          |     0
 sc/source/ui/vba/vbamultipage.cxx                  |     0
 sc/source/ui/vba/vbamultipage.hxx                  |     0
 sc/source/ui/vba/vbapagebreaks.cxx                 |    23 +-
 sc/source/ui/vba/vbapages.cxx                      |     0
 sc/source/ui/vba/vbapages.hxx                      |     0
 sc/source/ui/vba/vbapagesetup.cxx                  |    12 +-
 sc/source/ui/vba/vbapictureformat.cxx              |     0
 sc/source/ui/vba/vbapictureformat.hxx              |     0
 sc/source/ui/vba/vbaprogressbar.cxx                |     0
 sc/source/ui/vba/vbaprogressbar.hxx                |     0
 sc/source/ui/vba/vbaradiobutton.cxx                |     0
 sc/source/ui/vba/vbaradiobutton.hxx                |     0
 sc/source/ui/vba/vbarange.cxx                      |    47 +-
 sc/source/ui/vba/vbarange.cxx.pathched             |  5441 ++
 sc/source/ui/vba/vbascrollbar.cxx                  |     0
 sc/source/ui/vba/vbascrollbar.hxx                  |     0
 sc/source/ui/vba/vbashape.cxx                      |     0
 sc/source/ui/vba/vbashape.hxx                      |     0
 sc/source/ui/vba/vbashaperange.cxx                 |     0
 sc/source/ui/vba/vbashaperange.hxx                 |     0
 sc/source/ui/vba/vbashapes.cxx                     |     0
 sc/source/ui/vba/vbashapes.hxx                     |     0
 sc/source/ui/vba/vbaspinbutton.cxx                 |     0
 sc/source/ui/vba/vbaspinbutton.hxx                 |     0
 sc/source/ui/vba/vbatextbox.cxx                    |     0
 sc/source/ui/vba/vbatextbox.hxx                    |     0
 sc/source/ui/vba/vbatogglebutton.cxx               |     0
 sc/source/ui/vba/vbatogglebutton.hxx               |     0
 sc/source/ui/vba/vbauserform.cxx                   |     0
 sc/source/ui/vba/vbauserform.hxx                   |     0
 sc/source/ui/vba/vbawindow.cxx                     |     2 +-
 sc/source/ui/vba/vbaworkbook.cxx                   |     4 +-
 sc/source/ui/vba/vbaworkbooks.cxx                  |    10 +-
 sc/source/ui/vba/vbaworksheet.cxx                  |    36 +-
 sc/source/ui/vba/vbaworksheets.cxx                 |     8 +-
 sc/source/ui/vba/vbawsfunction.cxx                 |    14 +-
 sc/source/ui/view/cellsh.cxx                       |     8 +-
 sc/source/ui/view/cellsh1.cxx                      |    13 +-
 sc/source/ui/view/cellsh2.cxx                      |    15 +-
 sc/source/ui/view/cellsh4.cxx                      |    24 +-
 sc/source/ui/view/colrowba.cxx                     |     6 +-
 sc/source/ui/view/dbfunc.cxx                       |     5 +-
 sc/source/ui/view/dbfunc3.cxx                      |    48 +-
 sc/source/ui/view/drawutil.cxx                     |    19 +-
 sc/source/ui/view/formatsh.cxx                     |     5 +
 sc/source/ui/view/gridwin.cxx                      |   322 +-
 sc/source/ui/view/gridwin2.cxx                     |   162 +-
 sc/source/ui/view/gridwin4.cxx                     |    42 +-
 sc/source/ui/view/hdrcont.cxx                      |    41 +-
 sc/source/ui/view/olinewin.cxx                     |     9 +-
 sc/source/ui/view/output.cxx                       |    52 +-
 sc/source/ui/view/output2.cxx                      |    37 +-
 sc/source/ui/view/pivotsh.cxx                      |    89 +-
 sc/source/ui/view/prevloc.cxx                      |    92 +-
 sc/source/ui/view/printfun.cxx                     |   142 +-
 sc/source/ui/view/scextopt.cxx                     |     3 +-
 sc/source/ui/view/select.cxx                       |     9 +-
 sc/source/ui/view/tabcont.cxx                      |    25 +-
 sc/source/ui/view/tabview.cxx                      |    34 +-
 sc/source/ui/view/tabview2.cxx                     |    25 +-
 sc/source/ui/view/tabview3.cxx                     |    23 +-
 sc/source/ui/view/tabvwsh4.cxx                     |     4 +-
 sc/source/ui/view/tabvwsha.cxx                     |    48 +-
 sc/source/ui/view/tabvwshb.cxx                     |     5 +-
 sc/source/ui/view/tabvwshf.cxx                     |   135 +
 sc/source/ui/view/viewdata.cxx                     |    83 +-
 sc/source/ui/view/viewfun2.cxx                     |    23 +
 sc/source/ui/view/viewfun3.cxx                     |    90 +-
 sc/source/ui/view/viewfun5.cxx                     |     9 +-
 sc/source/ui/view/viewfunc.cxx                     |    34 +-
 sc/source/ui/view/viewutil.cxx                     |    27 +-
 sc/uiconfig/scalc/menubar/menubar.xml              |     2 +
 sc/util/hidother.src                               |     1 -
 sc/util/makefile.mk                                |     4 +-
 scp2/source/ooo/file_library_ooo.scp               |    19 +-
 scripting/source/dlgprov/dlgprov.hxx               |     2 +-
 scripting/source/vbaevents/eventhelper.cxx         |   269 +-
 sd/source/ui/inc/EventMultiplexer.hxx              |     9 +-
 sd/source/ui/inc/taskpane/TitleBar.hxx             |     1 +
 sd/source/ui/inc/taskpane/TitledControl.hxx        |     2 +
 sd/source/ui/toolpanel/LayoutMenu.cxx              |    84 +-
 sd/source/ui/toolpanel/LayoutMenu.hxx              |    12 +
 sd/source/ui/toolpanel/TitleBar.cxx                |    24 +-
 sd/source/ui/toolpanel/TitledControl.cxx           |    26 +-
 .../controls/CurrentMasterPagesSelector.cxx        |     6 +-
 sd/source/ui/tools/EventMultiplexer.cxx            |    12 +-
 sd/source/ui/unoidl/unopback.cxx                   |     4 +-
 sd/source/ui/view/GraphicObjectBar.cxx             |     6 +-
 sd/source/ui/view/PrintManager.cxx                 |    17 +-
 sd/source/ui/view/drviews7.cxx                     |     3 +
 sfx2/inc/sfx2/filedlghelper.hxx                    |     3 +-
 sfx2/source/appl/appcfg.cxx                        |    13 +-
 sfx2/source/appl/appopen.cxx                       |   112 +-
 sfx2/source/dialog/filedlghelper.cxx               |   106 +-
 sfx2/source/doc/SfxDocumentMetaData.cxx            |   153 +-
 sfx2/source/doc/guisaveas.cxx                      |     6 +-
 sfx2/source/doc/objcont.cxx                        |    52 +-
 sfx2/source/doc/objxtor.cxx                        |    59 +-
 sfx2/source/doc/sfxbasemodel.cxx                   |    48 +
 sfx2/source/notify/eventsupplier.cxx               |     2 +-
 solenv/bin/build.pl                                |    37 +-
 solenv/bin/build_client.pl                         |    50 +-
 solenv/bin/checkdll.sh                             |     2 +-
 solenv/bin/deliver.pl                              |    15 +-
 solenv/bin/installoffice.pl                        |     2 +-
 solenv/bin/mhids.pl                                |     4 -
 solenv/bin/modules/installer/control.pm            |     7 +-
 solenv/bin/modules/installer/converter.pm          |    10 -
 solenv/bin/modules/installer/download.pm           |    12 +-
 solenv/bin/modules/installer/followme.pm           |     7 -
 solenv/bin/modules/installer/globals.pm            |    28 +-
 solenv/bin/modules/installer/parameter.pm          |     2 +-
 solenv/bin/modules/installer/servicesfile.pm       |    18 +-
 solenv/bin/modules/installer/systemactions.pm      |    55 +-
 solenv/bin/modules/installer/windows/msiglobal.pm  |    10 +-
 solenv/bin/modules/installer/windows/sign.pm       |    12 +-
 solenv/bin/modules/packager/globals.pm             |    15 +-
 solenv/bin/modules/par2script/globals.pm           |    18 +-
 solenv/bin/modules/par2script/parameter.pm         |     2 +-
 solenv/bin/modules/pre2par/globals.pm              |    18 +-
 solenv/bin/modules/pre2par/parameter.pm            |     2 +-
 solenv/config/sdev300.ini                          |    56 +-
 solenv/inc/_tg_app.mk                              |  1160 +-
 solenv/inc/_tg_def.mk                              |   500 +-
 solenv/inc/_tg_lib.mk                              |   500 +-
 solenv/inc/_tg_rslb.mk                             |   360 +-
 solenv/inc/_tg_scp.mk                              |   120 +-
 solenv/inc/_tg_sdi.mk                              |   240 +-
 solenv/inc/_tg_shl.mk                              |  2280 +-
 solenv/inc/_tg_srs.mk                              |  1310 +-
 solenv/inc/_tg_zip.mk                              |   600 +-
 solenv/inc/ant.mk                                  |    12 +-
 solenv/inc/antsettings.mk                          |    16 +-
 solenv/inc/cppunit.mk                              |     2 +-
 solenv/inc/extension_post.mk                       |    86 +-
 solenv/inc/extension_pre.mk                        |    14 +-
 solenv/inc/javaunittest.mk                         |    24 +-
 solenv/inc/libs.mk                                 |    14 +-
 solenv/inc/minor.mk                                |     6 +-
 solenv/inc/os2.mk                                  |     6 +-
 solenv/inc/os2gcci.mk                              |     4 +-
 solenv/inc/pkg_config.mk                           |     6 +-
 solenv/inc/pstrules.mk                             |    64 +-
 solenv/inc/rules.mk                                |   537 +-
 solenv/inc/set_wntx64.mk                           |   100 +-
 solenv/inc/settings.mk                             |   305 +-
 solenv/inc/startup/wnt/macros.mk                   |    36 -
 solenv/inc/target.mk                               |   539 +-
 solenv/inc/tg_app.mk                               |   116 +-
 solenv/inc/tg_compv.mk                             |    14 +-
 solenv/inc/tg_config.mk                            |    78 +-
 solenv/inc/tg_def.mk                               |    50 +-
 solenv/inc/tg_dep.mk                               |    55 +-
 solenv/inc/tg_ext.mk                               |   225 +-
 solenv/inc/tg_jar.mk                               |    10 +-
 solenv/inc/tg_java.mk                              |    20 +-
 solenv/inc/tg_javav.mk                             |    10 +-
 solenv/inc/tg_lib.mk                               |    50 +-
 solenv/inc/tg_merge.mk                             |    14 +-
 solenv/inc/tg_moz.mk                               |    26 +-
 solenv/inc/tg_obj.mk                               |    20 +-
 solenv/inc/tg_res.mk                               |     4 +-
 solenv/inc/tg_rslb.mk                              |    36 +-
 solenv/inc/tg_scp.mk                               |    12 +-
 solenv/inc/tg_sdi.mk                               |    24 +-
 solenv/inc/tg_shl.mk                               |   228 +-
 solenv/inc/tg_slo.mk                               |    20 +-
 solenv/inc/tg_srs.mk                               |    65 +-
 solenv/inc/tg_wntx64.mk                            |   154 +-
 solenv/inc/tg_yxx.mk                               |    40 +-
 solenv/inc/tg_zip.mk                               |    60 +-
 solenv/inc/unitools.mk                             |    87 +-
 solenv/inc/unx.mk                                  |     4 +-
 solenv/inc/unxbsdi.mk                              |     2 +-
 solenv/inc/unxbsdi2.mk                             |     2 +-
 solenv/inc/unxbsds.mk                              |     2 +-
 solenv/inc/unxfbsd.mk                              |     6 +-
 solenv/inc/unxlnga.mk                              |     6 +-
 solenv/inc/unxlngi4.mk                             |     4 +-
 solenv/inc/unxlngi6.mk                             |    10 +-
 solenv/inc/unxlngm68k.mk                           |     6 +-
 solenv/inc/unxlngmips.mk                           |     6 +-
 solenv/inc/unxlngp.mk                              |     2 +-
 solenv/inc/unxlngppc.mk                            |     2 +-
 solenv/inc/unxlngppc4.mk                           |     4 +-
 solenv/inc/unxlngr.mk                              |     6 +-
 solenv/inc/unxlngs.mk                              |     4 +-
 solenv/inc/unxlngs3904.mk                          |     6 +-
 solenv/inc/unxlngx6.mk                             |     6 +-
 solenv/inc/unxlnxi.mk                              |     2 +-
 solenv/inc/unxmacx.mk                              |    16 +-
 solenv/inc/unxsogi.mk                              |     2 +-
 solenv/inc/unxsogs.mk                              |     2 +-
 solenv/inc/unxsoli4.mk                             |     4 +-
 solenv/inc/unxsols4.mk                             |     4 +-
 solenv/inc/unxsolu4.mk                             |     4 +-
 solenv/inc/wnt.mk                                  |     4 -
 solenv/inc/wntgcci6.mk                             |    40 +-
 solenv/inc/wntmsci10.mk                            |    16 +-
 solenv/inc/wntmsci11.mk                            |    31 +-
 soltools/checkdll/checkdll.c                       |    14 +-
 store/source/lockbyte.cxx                          |     2 +-
 store/workben/makefile.mk                          |    11 +-
 svtools/inc/docmspasswdrequest.hxx                 |    72 -
 svtools/inc/docpasswdrequest.hxx                   |    71 -
 svtools/inc/svtools/filter.hxx                     |     7 +-
 svtools/inc/svtools/wmf.hxx                        |    25 +-
 svtools/inc/tabbar.hxx                             |     5 +
 svtools/source/config/fltrcfg.cxx                  |     5 +-
 svtools/source/control/tabbar.cxx                  |   110 +-
 svtools/source/dialogs/addresstemplate.cxx         |    25 +-
 svtools/source/filter.vcl/filter/filter.cxx        |    10 +-
 svtools/source/filter.vcl/wmf/winmtf.hxx           |     5 +-
 svtools/source/filter.vcl/wmf/winwmf.cxx           |    24 +-
 svtools/source/filter.vcl/wmf/wmf.cxx              |     4 +-
 svtools/source/filter.vcl/wmf/wmfwr.cxx            |    11 +-
 svtools/source/misc1/docmspasswdrequest.cxx        |   143 -
 svtools/source/misc1/docpasswdrequest.cxx          |   142 -
 svtools/source/misc1/makefile.mk                   |     4 +-
 svtools/source/syslocale/syslocale.cxx             |    22 +-
 svx/inc/svx/SmartTagMgr.hxx                        |     4 +-
 svx/inc/svx/dbcharsethelper.hxx                    |    69 +
 svx/inc/svx/dbtoolsclient.hxx                      |   238 +
 svx/inc/svx/msocximex.hxx                          |     2 +-
 svx/inc/svx/mstoolbar.hxx                          |    11 +-
 .../sdr/primitive2d/sdrcustomshapeprimitive2d.hxx  |     6 +-
 svx/inc/svx/svdetc.hxx                             |    10 +-
 svx/inc/svx/svxacorr.hxx                           |     4 +
 svx/inc/svx/swafopt.hxx                            |     1 +
 svx/inc/svx/tstpitem.hxx                           |    12 +-
 svx/inc/svxmsbas.hxx                               |     8 +-
 svx/prj/d.lst                                      |     2 +
 svx/source/cui/autocdlg.cxx                        |    15 +
 svx/source/cui/autocdlg.hrc                        |     1 +
 svx/source/cui/autocdlg.hxx                        |     2 +
 svx/source/cui/autocdlg.src                        |     6 +-
 svx/source/cui/cfg.cxx                             |     4 +-
 svx/source/cui/optgdlg.cxx                         |     4 +-
 svx/source/cui/webconninfo.cxx                     |    13 +-
 svx/source/customshapes/EnhancedCustomShape2d.cxx  |   245 +-
 svx/source/customshapes/EnhancedCustomShape2d.hxx  |     5 +-
 .../customshapes/EnhancedCustomShapeFontWork.cxx   |     4 +-
 svx/source/dialog/txencbox.cxx                     |     2 +-
 svx/source/editeng/acorrcfg.cxx                    |    21 +-
 svx/source/editeng/svxacorr.cxx                    |    50 +
 svx/source/fmcomp/gridctrl.cxx                     |    21 +-
 svx/source/form/datanavi.cxx                       |    28 +-
 svx/source/form/datanavi.src                       |     5 +-
 svx/source/form/dbcharsethelper.cxx                |     2 +-
 svx/source/form/dbtoolsclient.cxx                  |     2 +-
 svx/source/form/fmdocumentclassification.cxx       |     2 +-
 svx/source/form/fmpgeimp.cxx                       |     2 +-
 svx/source/form/fmscriptingenv.cxx                 |     2 +-
 svx/source/form/fmtools.cxx                        |     2 +-
 svx/source/form/fmundo.cxx                         |     6 +-
 svx/source/form/formcontrolfactory.cxx             |     2 +-
 svx/source/form/tabwin.cxx                         |     2 +-
 svx/source/inc/dbcharsethelper.hxx                 |    69 -
 svx/source/inc/dbtoolsclient.hxx                   |   238 -
 svx/source/inc/fmshimp.hxx                         |     2 +-
 svx/source/inc/sqlparserclient.hxx                 |     2 +-
 svx/source/inc/tabwin.hxx                          |     2 +-
 svx/source/inc/typeconversionclient.hxx            |     2 +-
 svx/source/items/algitem.cxx                       |   100 +-
 svx/source/items/numitem.cxx                       |    22 +-
 svx/source/items/paraitem.cxx                      |    13 +-
 svx/source/msfilter/msdffimp.cxx                   |    19 +-
 svx/source/msfilter/msocximex.cxx                  |   112 +-
 svx/source/msfilter/mstoolbar.cxx                  |   105 +-
 svx/source/msfilter/svxmsbas.cxx                   |    16 +-
 .../sdr/contact/viewcontactofsdrobjcustomshape.cxx |    14 +-
 svx/source/sdr/contact/viewcontactofunocontrol.cxx |     4 +-
 .../sdr/contact/viewobjectcontactofunocontrol.cxx  |    64 +-
 .../sdr/primitive2d/sdrcustomshapeprimitive2d.cxx  |    16 +-
 svx/source/smarttags/SmartTagMgr.cxx               |    18 +-
 svx/source/svdraw/svdedtv.cxx                      |     5 +
 svx/source/svdraw/svdetc.cxx                       |    28 +-
 svx/source/svdraw/svdfppt.cxx                      |    35 +-
 svx/source/svdraw/svdmrkv.cxx                      |     6 +
 svx/source/svdraw/svdotextdecomposition.cxx        |    73 +-
 svx/source/svrtf/rtfgrf.cxx                        |    11 +-
 svx/source/table/cell.cxx                          |    13 -
 svx/source/table/cellcursor.cxx                    |    17 +-
 svx/source/table/tablecontroller.cxx               |    41 +-
 svx/source/table/tablelayouter.cxx                 |     1 -
 svx/source/table/tablemodel.cxx                    |    14 +-
 sw/inc/IDocumentMarkAccess.hxx                     |     7 +
 sw/inc/IMark.hxx                                   |    23 +-
 sw/inc/bookmrk.hxx                                 |     4 +-
 sw/inc/breakit.hxx                                 |    19 +-
 sw/inc/calc.hxx                                    |     2 +-
 sw/inc/comcore.hrc                                 |     3 +-
 sw/inc/crsrsh.hxx                                  |     5 +-
 sw/inc/dbgoutsw.hxx                                |     4 +-
 sw/inc/doc.hxx                                     |    29 +-
 sw/inc/ecmaflds.hxx                                |    68 +
 sw/inc/editsh.hxx                                  |    10 +-
 sw/inc/hintids.hxx                                 |     6 +-
 sw/inc/pam.hxx                                     |     1 +
 sw/inc/printdata.hxx                               |     2 +-
 sw/inc/swcalwrp.hxx                                |     5 +-
 sw/inc/swtypes.hxx                                 |     1 -
 sw/inc/unoobj.hxx                                  |     9 +
 sw/source/core/access/accpara.cxx                  |    14 +-
 sw/source/core/access/accportions.cxx              |     6 +-
 sw/source/core/bastyp/breakit.cxx                  |    37 +-
 sw/source/core/bastyp/calc.cxx                     |    12 +-
 sw/source/core/bastyp/init.cxx                     |    28 +-
 sw/source/core/crsr/bookmrk.cxx                    |   126 +-
 sw/source/core/crsr/callnk.cxx                     |     6 +-
 sw/source/core/crsr/crossrefbookmark.cxx           |     2 +-
 sw/source/core/crsr/crstrvl.cxx                    |    11 +
 sw/source/core/crsr/findtxt.cxx                    |     2 +-
 sw/source/core/crsr/pam.cxx                        |    38 +-
 sw/source/core/crsr/swcrsr.cxx                     |    44 +-
 sw/source/core/doc/docbm.cxx                       |    60 +-
 sw/source/core/doc/docdde.cxx                      |   187 +-
 sw/source/core/doc/docdesc.cxx                     |     4 +-
 sw/source/core/doc/docedt.cxx                      |     4 +-
 sw/source/core/doc/docfmt.cxx                      |     8 +-
 sw/source/core/doc/docnum.cxx                      |    62 +-
 sw/source/core/doc/docruby.cxx                     |     6 +-
 sw/source/core/doc/doctxm.cxx                      |     2 +-
 sw/source/core/doc/poolfmt.cxx                     |    16 +-
 sw/source/core/docnode/ndcopy.cxx                  |   292 +-
 sw/source/core/docnode/node.cxx                    |     8 +-
 sw/source/core/edit/autofmt.cxx                    |     9 +-
 sw/source/core/edit/edattr.cxx                     |    16 +-
 sw/source/core/edit/edglbldc.cxx                   |     3 +-
 sw/source/core/edit/ednumber.cxx                   |     8 +-
 sw/source/core/edit/edtox.cxx                      |    22 +
 sw/source/core/fields/docufld.cxx                  |    10 +-
 sw/source/core/fields/fldbas.cxx                   |     2 +-
 sw/source/core/inc/GetMetricVal.hxx                |     2 +-
 sw/source/core/inc/MarkManager.hxx                 |    10 +
 sw/source/core/inc/bookmrk.hxx                     |    43 +-
 sw/source/core/inc/crossrefbookmark.hxx            |     6 +-
 sw/source/core/inc/frmtool.hxx                     |    17 +-
 sw/source/core/layout/flowfrm.cxx                  |    51 +-
 sw/source/core/layout/frmtool.cxx                  |    31 +-
 sw/source/core/text/guess.cxx                      |     6 +-
 sw/source/core/text/inftxt.cxx                     |    57 +-
 sw/source/core/text/itratr.cxx                     |     8 +-
 sw/source/core/text/itrcrsr.cxx                    |    24 +-
 sw/source/core/text/porfld.cxx                     |    14 +-
 sw/source/core/text/porlay.cxx                     |    26 +-
 sw/source/core/text/pormulti.cxx                   |     2 +-
 sw/source/core/text/portxt.cxx                     |   126 +-
 sw/source/core/text/redlnitr.cxx                   |     2 +-
 sw/source/core/text/txtdrop.cxx                    |     4 +-
 sw/source/core/text/txthyph.cxx                    |     4 +-
 sw/source/core/txtnode/fntcache.cxx                |     8 +-
 sw/source/core/txtnode/fntcap.cxx                  |    10 +-
 sw/source/core/txtnode/ndtxt.cxx                   |    10 +-
 sw/source/core/txtnode/txatritr.cxx                |    22 +-
 sw/source/core/txtnode/txtedt.cxx                  |    24 +-
 sw/source/core/undo/undo.src                       |     2 +-
 sw/source/core/unocore/unobkm.cxx                  |   104 +-
 sw/source/core/unocore/unoport.cxx                 |     5 +-
 sw/source/core/view/vprint.cxx                     |     3 +-
 sw/source/filter/html/htmlatr.cxx                  |     4 +-
 sw/source/filter/html/htmlfldw.cxx                 |     8 +-
 sw/source/filter/html/swhtml.cxx                   |    16 +-
 sw/source/filter/rtf/rtfatr.cxx                    |    12 +-
 sw/source/filter/rtf/rtffld.cxx                    |     4 +-
 sw/source/filter/ww8/writerwordglue.cxx            |    10 +-
 sw/source/filter/ww8/wrtw8esh.cxx                  |     4 +-
 sw/source/filter/ww8/wrtw8nds.cxx                  |   115 +-
 sw/source/filter/ww8/wrtww8.cxx                    |    59 +-
 sw/source/filter/ww8/wrtww8.hxx                    |     2 +
 sw/source/filter/ww8/ww8atr.cxx                    |    12 +-
 sw/source/filter/ww8/ww8par.cxx                    |    54 +-
 sw/source/filter/ww8/ww8par.hxx                    |    42 +-
 sw/source/filter/ww8/ww8par3.cxx                   |   179 +-
 sw/source/filter/ww8/ww8par5.cxx                   |   111 +-
 sw/source/filter/ww8/ww8toolbar.cxx                |   126 +-
 sw/source/filter/ww8/ww8toolbar.hxx                |    20 +-
 sw/source/ui/app/docstyle.cxx                      |     3 +-
 sw/source/ui/config/usrpref.cxx                    |     4 +-
 sw/source/ui/config/viewopt.cxx                    |     3 +-
 sw/source/ui/dialog/uiregionsw.cxx                 |     1 +
 sw/source/ui/docvw/edtwin.cxx                      |    39 +-
 sw/source/ui/fldui/fldmgr.cxx                      |     2 +-
 sw/source/ui/inc/view.hxx                          |     4 +-
 sw/source/ui/inc/wrtsh.hxx                         |     4 +
 sw/source/ui/misc/pgfnote.cxx                      |     3 +-
 sw/source/ui/shells/textsh.cxx                     |    11 +-
 sw/source/ui/shells/textsh1.cxx                    |    34 +-
 sw/source/ui/uiview/view.cxx                       |    64 +-
 sw/source/ui/uiview/viewling.cxx                   |   136 +
 sw/source/ui/uno/unomod.cxx                        |    42 +-
 sw/source/ui/uno/unotxdoc.cxx                      |    20 +-
 sw/source/ui/utlui/initui.cxx                      |     3 +-
 sw/source/ui/utlui/numfmtlb.cxx                    |     2 +-
 sw/source/ui/utlui/uitool.cxx                      |     3 +-
 sw/source/ui/utlui/utlui.src                       |     4 +
 sw/source/ui/vba/vbaautotextentry.cxx              |     2 +-
 sw/source/ui/vba/vbaborders.cxx                    |     2 +-
 sw/source/ui/vba/vbadialog.cxx                     |     2 +-
 sw/source/ui/vba/vbadocument.cxx                   |     3 +-
 sw/source/ui/vba/vbadocuments.cxx                  |     6 +-
 sw/source/ui/vba/vbafind.cxx                       |     6 +-
 sw/source/ui/vba/vbaheaderfooter.cxx               |     4 +-
 sw/source/ui/vba/vbaoptions.cxx                    |    26 +-
 sw/source/ui/vba/vbapagesetup.cxx                  |     2 +-
 sw/source/ui/vba/vbaparagraphformat.cxx            |     8 +-
 sw/source/ui/vba/vbarange.cxx                      |     2 +-
 sw/source/ui/vba/vbasection.cxx                    |     2 +-
 sw/source/ui/vba/vbaselection.cxx                  |     2 +-
 sw/source/ui/vba/vbastyles.cxx                     |     2 +-
 sw/source/ui/vba/vbatable.cxx                      |     2 +-
 sw/source/ui/vba/vbatables.cxx                     |     2 +-
 sw/source/ui/vba/vbatemplate.cxx                   |     3 +-
 sw/source/ui/wrtsh/wrtsh1.cxx                      |   100 +-
 sw/source/ui/wrtsh/wrtsh2.cxx                      |     7 +
 .../dbaccess/optional/includes/ctrl_Clipboard.inc  |    12 -
 .../optional/includes/wiz_DatabaseWizard.inc       |    24 +-
 testautomation/dbaccess/tools/dbcreatetools.inc    |     2 +-
 .../framework/optional/f_options_ooo.bas           |     1 +
 .../optional/includes/options_ooo_colors.inc       |   212 +-
 .../optional/includes/options_ooo_view.inc         |    16 +-
 .../optional/input/options/ooo_view_changed.ref    |     2 +-
 .../optional/input/options/ooo_view_defaults.ref   |     2 +-
 testautomation/framework/required/f_first.bas      |     4 +
 .../required/includes/standard_toolbar_3.inc       |   215 +-
 .../framework/required/input/mailmerge_data.odb    |   Bin 3527 -> 3524 bytes
 .../framework/tools/includes/options_tools.inc     |    54 +-
 .../tools/includes/optional/t_basic_ide_tools.inc  |     6 +-
 .../global/tools/includes/optional/t_docfuncs.inc  |   177 +-
 .../global/tools/includes/required/t_doc1.inc      |    29 +-
 .../global/tools/includes/required/t_filters.inc   |     2 +-
 .../global/tools/includes/required/t_tools1.inc    |    34 +-
 testautomation/global/win/edia_d_h.win             |     1 +
 testautomation/global/win/etab_e_g.win             |     2 +-
 .../graphics/optional/g_autocorrection.bas         |     1 -
 testautomation/graphics/optional/g_insert.bas      |     3 +-
 testautomation/graphics/optional/g_tables.bas      |     2 +-
 .../optional/includes/global/export_graphic_2.inc  |   101 +-
 .../graphics/optional/includes/global/g_insert.inc |     3 +-
 .../optional/includes/impress/i_pengine.inc        |     1 -
 .../optional/includes/impress/i_pengine2.inc       |     1 -
 .../optional/includes/impress/i_us_present.inc     |     3 +-
 .../required/includes/impress/i_opt_1_.inc         |     2 +-
 .../graphics/required/includes/impress/im_002_.inc |     8 +-
 .../graphics/required/includes/impress/im_003_.inc |   246 +-
 .../graphics/required/includes/impress/im_004_.inc |    16 +-
 .../graphics/required/includes/impress/im_005_.inc |    29 +-
 .../graphics/required/includes/impress/im_007_.inc |   730 +-
 .../graphics/required/includes/impress/im_011_.inc |   357 +-
 .../required/includes/c_upd_insertmenu.inc         |     2 +
 .../writer/optional/includes/fields/w_fields1.inc  |    28 +-
 .../writer/optional/includes/fields/w_fields2.inc  |    48 +-
 .../writer/optional/includes/fields/w_fields3.inc  |    68 +-
 .../writer/optional/includes/fields/w_fields4.inc  |    50 +-
 .../writer/optional/includes/fields/w_fields5.inc  |    52 +-
 .../writer/optional/includes/fields/w_fields6.inc  |    54 +-
 .../writer/optional/includes/fields/w_fields7.inc  |    12 +-
 .../includes/insertgraphic/w_insertgraphic5.inc    |     2 -
 .../optional/includes/loadsave/w_loadsave.inc      |    44 +-
 .../writer/optional/includes/option/wh_o_1.inc     |     2 +
 .../writer/optional/includes/option/wh_o_2.inc     |     1 +
 .../optional/includes/redlining/w_redlining1.inc   |     3 -
 .../writer/optional/includes/stylist/w_stylist.inc |  2041 +-
 .../optional/includes/textframes/w_textframes2.inc |    37 +-
 .../optional/includes/textframes/w_textframes3.inc |    61 +-
 testautomation/writer/optional/w_fields.bas        |     2 +-
 testautomation/writer/optional/w_textframes.bas    |     2 -
 testautomation/writer/required/includes/w_001_.inc |     6 +-
 .../writer/required/includes/w_005b_.inc           |     9 +-
 testautomation/writer/tools/includes/w_tool6.inc   |     1 -
 testautomation/writer/tools/includes/w_tools.inc   |    46 +-
 testtools/source/bridgetest/idl/makefile.mk        |     6 +
 .../cliversioning/version_libs/version_3_1_1.dll   |   Bin 0 -> 11776 bytes
 testtools/util/makefile.pmk                        |     2 +-
 toolkit/inc/toolkit/awt/vclxwindows.hxx            |     6 +
 toolkit/inc/toolkit/controls/dialogcontrol.hxx     |     2 +-
 toolkit/inc/toolkit/controls/unocontrols.hxx       |     2 +-
 toolkit/source/awt/vclxmenu.cxx                    |     4 +-
 toolkit/source/awt/vclxwindows.cxx                 |    40 +-
 toolkit/source/controls/dialogcontrol.cxx          |    28 +-
 .../com/sun/star/script/XAutomationInvocation.idl  |    51 +
 udkapi/com/sun/star/script/makefile.mk             |     1 +
 unoil/climaker/version.txt                         |     6 +-
 vbahelper/source/msforms/makefile.mk               |     2 +
 vbahelper/source/msforms/vbacontrol.cxx            |    24 +-
 vbahelper/source/msforms/vbaframe.cxx              |    11 +
 vbahelper/source/msforms/vbaframe.hxx              |     4 +
 vbahelper/source/msforms/vbalabel.cxx              |    15 +
 vbahelper/source/msforms/vbalabel.hxx              |     4 +
 vbahelper/source/msforms/vbalistbox.cxx            |    12 +-
 vbahelper/source/msforms/vbalistbox.hxx            |     4 +-
 vbahelper/source/msforms/vbatextbox.cxx            |     3 +-
 vbahelper/source/msforms/vbatogglebutton.cxx       |    21 +-
 vbahelper/source/vbahelper/vbafontbase.cxx         |     2 +-
 vbahelper/source/vbahelper/vbahelper.cxx           |     3 +-
 vbahelper/source/vbahelper/vbapictureformat.cxx    |     9 +-
 vbahelper/source/vbahelper/vbashapes.cxx           |     2 +-
 vcl/aqua/inc/salframe.h                            |    86 +-
 vcl/aqua/source/app/salinst.cxx                    |    14 +-
 vcl/aqua/source/gdi/salbmp.cxx                     |    24 +-
 vcl/aqua/source/window/salframe.cxx                |    23 +
 vcl/inc/vcl/bitmapex.hxx                           |     1 +
 vcl/inc/vcl/dialog.hxx                             |     4 +
 vcl/inc/vcl/menu.hxx                               |     2 +
 vcl/inc/vcl/popupmenuwindow.hxx                    |    50 +
 vcl/inc/vcl/settings.hxx                           |     5 +
 vcl/inc/vcl/toolbox.hxx                            |     3 +
 vcl/inc/vcl/vclevent.hxx                           |    18 +
 vcl/inc/vcl/window.h                               |     3 +-
 vcl/inc/vcl/window.hxx                             |     9 +-
 vcl/os2/source/window/salframe.cxx                 |     1 +
 vcl/prj/build.lst                                  |     2 +-
 vcl/prj/d.lst                                      |     1 +
 vcl/source/app/settings.cxx                        |     3 +
 vcl/source/app/vclevent.cxx                        |    14 +
 vcl/source/control/combobox.cxx                    |    15 +-
 vcl/source/gdi/bitmapex.cxx                        |    56 +
 vcl/source/gdi/outdev3.cxx                         |    91 +-
 vcl/source/gdi/pdfwriter_impl.cxx                  |    11 +-
 vcl/source/window/dialog.cxx                       |     7 +
 vcl/source/window/makefile.mk                      |     7 +-
 vcl/source/window/menu.cxx                         |    14 +-
 vcl/source/window/popupmenuwindow.cxx              |    82 +
 vcl/source/window/toolbox.cxx                      |   101 +-
 vcl/source/window/toolbox2.cxx                     |     2 +
 vcl/source/window/window.cxx                       |    29 +-
 vcl/unx/gtk/a11y/atkutil.cxx                       |    11 +-
 vcl/unx/gtk/a11y/atkwindow.cxx                     |    41 +-
 vcl/unx/gtk/a11y/atkwrapper.cxx                    |    54 +
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx           |    32 +-
 vcl/unx/kde/salnativewidgets-kde.cxx               |     1 +
 vcl/unx/kde4/KDEData.cxx                           |     2 +
 vcl/unx/kde4/KDESalFrame.cxx                       |     1 +
 vcl/unx/kde4/KDESalGraphics.cxx                    |   129 +-
 vcl/unx/source/app/sm.cxx                          |    47 +-
 vcl/unx/source/gdi/cdeint.cxx                      |     1 +
 vcl/unx/source/gdi/makefile.mk                     |     4 +-
 vcl/unx/source/gdi/salgdi.cxx                      |    83 +-
 vcl/unx/source/plugadapt/salplug.cxx               |     4 +-
 vcl/win/source/window/salframe.cxx                 |     1 +
 writerfilter/source/filter/ImportFilter.cxx        |    42 +-
 writerfilter/util/makefile.mk                      |     5 +-
 xmloff/inc/xmloff/ecmaflds.hxx                     |    68 +
 xmloff/inc/xmloff/nmspmap.hxx                      |     5 +
 xmloff/inc/xmloff/xmlaustp.hxx                     |     4 +
 xmloff/source/chart/SchXMLChartContext.cxx         |    51 -
 xmloff/source/draw/shapeexport2.cxx                |     2 +-
 xmloff/source/style/impastp3.cxx                   |    40 +
 xmloff/source/style/impastp4.cxx                   |    41 +
 xmloff/source/style/impastpl.hxx                   |     8 +
 xmloff/source/style/xmlaustp.cxx                   |     7 +
 xmloff/source/text/XMLTextMarkImportContext.cxx    |    47 +-
 xmloff/source/text/txtimp.cxx                      |    54 +-
 xmloff/source/text/txtparae.cxx                    |    29 +-
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |    14 +-
 xmlscript/util/makefile.mk                         |     2 +-
 xmlscript/util/makefile.mk.patched                 |    81 +
 .../xmlsec/nss/securityenvironment_nssimpl.cxx     |    11 +-
 2283 files changed, 192131 insertions(+), 187102 deletions(-)
 create mode 100644 applied_patches/0004-cws-koheidatapilot03-accessibility.diff
 create mode 100644 applied_patches/0005-cws-koheidatapilot03-offapi.diff
 create mode 100644 applied_patches/0006-cws-koheidatapilot03-sc.diff
 create mode 100644 applied_patches/0007-cws-koheidatapilot03-vcl.diff
 create mode 100644 applied_patches/0008-cws-koheidatapilot03-xmloff.diff
 create mode 100644 applied_patches/0009-cws-koheicsvimport-filter.diff
 create mode 100644 applied_patches/0010-cws-koheicsvimport-officecfg.diff
 create mode 100644 applied_patches/0011-cws-koheicsvimport-sc.diff
 create mode 100644 applied_patches/0012-cws-kohei03-chart2.diff
 create mode 100644 applied_patches/0013-cws-kohei03-sc.diff
 create mode 100644 applied_patches/0014-cws-calctabcolor-filter.diff
 delete mode 100644 applied_patches/0014-sc-dataform-sc.diff
 create mode 100644 applied_patches/0015-cws-calctabcolor-officecfg.diff
 delete mode 100644 applied_patches/0015-sc-dataform-officecfg.diff
 create mode 100644 applied_patches/0016-cws-calctabcolor-oox.diff
 delete mode 100644 applied_patches/0016-sc-dataform-suppor-vba.diff
 create mode 100644 applied_patches/0017-cws-calctabcolor-sc.diff
 create mode 100644 applied_patches/0018-cws-calctabcolor-svtools.diff
 rename applied_patches/{0004-speed-configmgr.diff => 0019-speed-configmgr.diff} (100%)
 rename applied_patches/{0005-ok-cancel-btn-add-accel.diff => 0020-ok-cancel-btn-add-accel.diff} (100%)
 rename applied_patches/{0006-makefile-idl-build.diff => 0021-makefile-idl-build.diff} (100%)
 rename applied_patches/{0007-speed-pagein.diff => 0022-speed-pagein.diff} (100%)
 rename applied_patches/{0008-testtool-more-defaults.diff => 0023-testtool-more-defaults.diff} (100%)
 rename applied_patches/{0009-plus-minus-sw-navigator.diff => 0024-plus-minus-sw-navigator.diff} (100%)
 rename applied_patches/{0010-plus-minus-sw-navigator2.diff => 0025-plus-minus-sw-navigator2.diff} (100%)
 delete mode 100644 applied_patches/0025-quiet-build.diff
 rename applied_patches/{0011-dbaccess-default-varchar-lenght.diff => 0026-dbaccess-default-varchar-lenght.diff} (100%)
 delete mode 100644 applied_patches/0026-quiet-build-more.diff
 rename applied_patches/{0012-linkoo-type.diff => 0027-linkoo-type.diff} (100%)
 rename applied_patches/{0013-selection-crash-svx-svdmrkv.diff => 0028-selection-crash-svx-svdmrkv.diff} (100%)
 rename applied_patches/{0017-sal-doublefree.diff => 0029-sal-doublefree.diff} (100%)
 rename applied_patches/{0018-sw-graphic-save-problem.diff => 0030-sw-graphic-save-problem.diff} (100%)
 rename applied_patches/{0019-sal-strintern-speed.diff => 0031-sal-strintern-speed.diff} (100%)
 rename applied_patches/{0020-sal-strintern-speed-fix.diff => 0032-sal-strintern-speed-fix.diff} (100%)
 rename applied_patches/{0021-fix-linkoo.diff => 0033-fix-linkoo.diff} (100%)
 rename applied_patches/{0022-fix-gtk-a11y.diff => 0034-fix-gtk-a11y.diff} (100%)
 rename applied_patches/{0023-fix-gtk-a11y-gail-version-warning.diff => 0035-fix-gtk-a11y-gail-version-warning.diff} (100%)
 rename applied_patches/{0024-linkoo-dev300.diff => 0036-linkoo-dev300.diff} (100%)
 rename applied_patches/{0027-writerfilter-qnametostr-NOOPTFILES.diff => 0037-writerfilter-qnametostr-NOOPTFILES.diff} (100%)
 rename applied_patches/{0028-sc-cellsuno-avoid-early-destruction.diff => 0038-sc-cellsuno-avoid-early-destruction.diff} (100%)
 rename applied_patches/{0029-speed-sal-fewer-lstats.diff => 0039-speed-sal-fewer-lstats.diff} (100%)
 rename applied_patches/{0030-cjk-character-units-imp.diff => 0040-cjk-character-units-imp.diff} (100%)
 rename applied_patches/{0031-sw-default-cjk-fontsize.diff => 0041-sw-default-cjk-fontsize.diff} (100%)
 rename applied_patches/{0032-cjk-character-units-ui.diff => 0042-cjk-character-units-ui.diff} (100%)
 delete mode 100644 applied_patches/0043-basic-add-missing-includes-after-cws-npower10.diff
 rename applied_patches/{0033-cjk-character-units-rulers-sync-with-pggrid-fix.diff => 0043-cjk-character-units-rulers-sync-with-pggrid-fix.diff} (100%)
 rename applied_patches/{0034-cjk-character-units-fix.diff => 0044-cjk-character-units-fix.diff} (100%)
 delete mode 100644 applied_patches/0044-vba-show-data-form-link-fix.diff
 rename applied_patches/{0035-cjk-character-units-fix-376788.diff => 0045-cjk-character-units-fix-376788.diff} (100%)
 rename applied_patches/{0036-cjk-character-units-in-pggrid-fix.diff => 0046-cjk-character-units-in-pggrid-fix.diff} (100%)
 rename applied_patches/{0037-wpsimport-config_office.diff => 0047-wpsimport-config_office.diff} (100%)
 rename applied_patches/{0038-wpsimport-filter.diff => 0048-wpsimport-filter.diff} (100%)
 rename applied_patches/{0039-wpsimport-scp2.diff => 0049-wpsimport-scp2.diff} (100%)
 rename applied_patches/{0040-wpsimport-writerperfect.diff => 0050-wpsimport-writerperfect.diff} (100%)
 rename applied_patches/{0041-libwps.diff => 0051-libwps.diff} (100%)
 rename applied_patches/{0042-wps-registry.diff => 0052-wps-registry.diff} (100%)
 rename applied_patches/{0045-libwpg.diff => 0053-libwpg.diff} (100%)
 rename applied_patches/{0046-wpgimporter.diff => 0054-wpgimporter.diff} (100%)
 rename applied_patches/{0047-jvmfwk-gij-paths.diff => 0055-jvmfwk-gij-paths.diff} (100%)
 rename applied_patches/{0048-buildfix-qadevOOo-java-encoding.diff => 0056-buildfix-qadevOOo-java-encoding.diff} (100%)
 rename applied_patches/{0049-debug-bits.diff => 0057-debug-bits.diff} (100%)
 rename applied_patches/{0050-gui-sw-scroll.diff => 0058-gui-sw-scroll.diff} (100%)
 delete mode 100644 applied_patches/0058-vba-default-enable-calcmacros.diff
 delete mode 100644 applied_patches/0059-vba-ide-choose-macro-to-run.diff
 rename applied_patches/{0051-vcl-menu-fixes.diff => 0059-vcl-menu-fixes.diff} (100%)
 rename applied_patches/{0052-uses-vfs.diff => 0060-uses-vfs.diff} (100%)
 rename applied_patches/{0053-buildfix-x86-64-visibility-workaround.diff => 0061-buildfix-x86-64-visibility-workaround.diff} (100%)
 rename applied_patches/{0054-redirect-extensions.diff => 0062-redirect-extensions.diff} (100%)
 rename applied_patches/{0055-libwpd.diff => 0063-libwpd.diff} (100%)
 rename applied_patches/{0056-writerperfect-nocondensedparagraphs.diff => 0064-writerperfect-nocondensedparagraphs.diff} (100%)
 rename applied_patches/{0057-offapi-typecheck-whitelist.diff => 0065-offapi-typecheck-whitelist.diff} (100%)
 rename applied_patches/{0060-build-ant-1.6.diff => 0066-build-ant-1.6.diff} (100%)
 rename applied_patches/{0061-buildfix-fmtargs.diff => 0067-buildfix-fmtargs.diff} (100%)
 rename applied_patches/{0062-nsplugin-path.diff => 0068-nsplugin-path.diff} (100%)
 rename applied_patches/{0063-printing-bugfix-254573.diff => 0069-printing-bugfix-254573.diff} (100%)
 rename applied_patches/{0064-sd-toolbar-advanced-shapes.diff => 0070-sd-toolbar-advanced-shapes.diff} (100%)
 rename applied_patches/{0065-svx-shapes-default-word-wrap-enable.diff => 0071-svx-shapes-default-word-wrap-enable.diff} (100%)
 rename applied_patches/{0066-svx-honour-customshape-capabilities.diff => 0072-svx-honour-customshape-capabilities.diff} (100%)
 rename applied_patches/{0067-check-buttons-rendering-fix.diff => 0073-check-buttons-rendering-fix.diff} (100%)
 rename applied_patches/{0068-padmin-nofontconfig.diff => 0074-padmin-nofontconfig.diff} (100%)
 rename applied_patches/{0069-wizards-source-importwizard-filesmodul-xba.diff => 0075-wizards-source-importwizard-filesmodul-xba.diff} (100%)
 rename applied_patches/{0070-automation-testtool-oobuildfix.diff => 0076-automation-testtool-oobuildfix.diff} (100%)
 rename applied_patches/{0071-helpcontent2-auxiliary-cfg.diff => 0077-helpcontent2-auxiliary-cfg.diff} (100%)
 rename applied_patches/{0072-desktop-safer-user-dir-perm.diff => 0078-desktop-safer-user-dir-perm.diff} (100%)
 rename applied_patches/{0073-desktop-application-octet-stream-mime-type.diff => 0079-desktop-application-octet-stream-mime-type.diff} (100%)
 delete mode 100644 applied_patches/0079-new-SQLLEN.diff
 rename applied_patches/{0074-xmlsecurity-verify-usages.diff => 0080-xmlsecurity-verify-usages.diff} (100%)
 rename applied_patches/{0075-jvmfwk-modified-javavendors-xml.diff => 0081-jvmfwk-modified-javavendors-xml.diff} (100%)
 rename applied_patches/{0076-libxmlsec-findcerts.diff => 0082-libxmlsec-findcerts.diff} (100%)
 rename applied_patches/{0077-sfx2-check-existing-template-dirs.diff => 0083-sfx2-check-existing-template-dirs.diff} (100%)
 rename applied_patches/{0078-vcl-kerning-fix.diff => 0084-vcl-kerning-fix.diff} (100%)
 create mode 100644 applied_patches/0085-new-SQLLEN.diff
 rename applied_patches/{0080-jpegc.c.diff => 0086-jpegc.c.diff} (100%)
 delete mode 100644 applied_patches/0087-save-doc-withembedded-doc-with-vba-crash.diff
 rename applied_patches/{0081-tools-urlobj-smb-scheme-patch.diff => 0087-tools-urlobj-smb-scheme-patch.diff} (100%)
 rename applied_patches/{0082-samba-hyperlinks-sc-sd.diff => 0088-samba-hyperlinks-sc-sd.diff} (100%)
 rename applied_patches/{0083-tools-qa-urlobj-unittest.diff => 0089-tools-qa-urlobj-unittest.diff} (100%)
 delete mode 100644 applied_patches/0089-win32-invalid-names.diff
 rename applied_patches/{0084-svx-text-rotation-fix.diff => 0090-svx-text-rotation-fix.diff} (100%)
 rename applied_patches/{0085-sfx-check-real-help-path.diff => 0091-sfx-check-real-help-path.diff} (100%)
 rename applied_patches/{0086-xmlhelp-work-with-symlinks.diff => 0092-xmlhelp-work-with-symlinks.diff} (100%)
 rename applied_patches/{0088-localize-pl-cygwin-paths.diff => 0093-localize-pl-cygwin-paths.diff} (100%)
 create mode 100644 applied_patches/0094-win32-invalid-names.diff
 delete mode 100644 applied_patches/0095-forms-radio-button-group-names.diff
 create mode 100644 applied_patches/0095-openldap-i105016.diff
 rename applied_patches/{0090-customunittext-pixel.diff => 0096-customunittext-pixel.diff} (100%)
 delete mode 100644 applied_patches/0096-xl-import-formradiobutton.diff
 rename applied_patches/{0091-customunittext-percent.diff => 0097-customunittext-percent.diff} (100%)
 delete mode 100644 applied_patches/0097-dialog-groupname-persist.diff
 rename applied_patches/{0092-i93000.diff => 0098-i93000.diff} (100%)
 rename applied_patches/{0093-padmin-dialog-resize.diff => 0099-padmin-dialog-resize.diff} (100%)
 rename applied_patches/{0094-sw-dialogs-resize.diff => 0100-sw-dialogs-resize.diff} (100%)
 rename applied_patches/{0098-webdav-locking-from-ooo-build-2-4-1.diff => 0101-webdav-locking-from-ooo-build-2-4-1.diff} (100%)
 rename applied_patches/{0099-webdav-locking-local-temp-file.diff => 0102-webdav-locking-local-temp-file.diff} (100%)
 rename applied_patches/{0100-gnome-vfs-locking-config_office.diff => 0103-gnome-vfs-locking-config_office.diff} (100%)
 rename applied_patches/{0101-gnome-vfs-locking-ucb.diff => 0104-gnome-vfs-locking-ucb.diff} (100%)
 rename applied_patches/{0102-gnome-vfs-late-init.diff => 0105-gnome-vfs-late-init.diff} (100%)
 rename applied_patches/{0103-unxsplash-rework.diff => 0106-unxsplash-rework.diff} (100%)
 rename applied_patches/{0104-hack-readd-GetStringParam.diff => 0107-hack-readd-GetStringParam.diff} (100%)
 rename applied_patches/{0105-unxsplash-new-osl-pipe.diff => 0108-unxsplash-new-osl-pipe.diff} (100%)
 rename applied_patches/{0106-unxsplash-new-osl-pipe-slot.diff => 0109-unxsplash-new-osl-pipe-slot.diff} (100%)
 rename applied_patches/{0107-unxsplash-finish-on-hangup.diff => 0110-unxsplash-finish-on-hangup.diff} (100%)
 rename applied_patches/{0108-unxsplash-rpath.diff => 0111-unxsplash-rpath.diff} (100%)
 rename applied_patches/{0109-unxsplash-3layer.diff => 0112-unxsplash-3layer.diff} (100%)
 delete mode 100644 applied_patches/0113-csv-import-preserve-options-sc.diff
 rename applied_patches/{0110-unxsplash-bmp-alias.diff => 0113-unxsplash-bmp-alias.diff} (100%)
 delete mode 100644 applied_patches/0114-csv-import-preserve-options-officecfg.diff
 rename applied_patches/{0111-sw-html-insert-unknown-tags.diff => 0114-sw-html-insert-unknown-tags.diff} (100%)
 delete mode 100644 applied_patches/0115-gcc4-visibility-sc.diff
 rename applied_patches/{0112-sw-ww8-field-fix.diff => 0115-sw-ww8-field-fix.diff} (100%)
 rewrite applied_patches/0118-sc-datapilot-autoformat.diff (79%)
 rewrite applied_patches/0122-sc-dp-gridlayout.diff (88%)
 rewrite applied_patches/0128-sc-natural-sort.diff (61%)
 rename applied_patches/{0134-sc-drwlayer-units.diff => 0133-sc-drwlayer-units.diff} (100%)
 delete mode 100644 applied_patches/0133-vba-sc-autoshapes-hyperlinks.diff
 rename applied_patches/{0135-sc-overwrite-char-font-attrs.diff => 0134-sc-overwrite-char-font-attrs.diff} (100%)
 create mode 100644 applied_patches/0135-calc-filter-by-date-strip-time.diff
 rewrite applied_patches/0139-sc-paste-on-enter.diff (80%)
 delete mode 100644 applied_patches/0140-calc-multi-range-copy-paste.diff
 rename applied_patches/{0141-sc-print-selected-sheets.diff => 0140-sc-print-selected-sheets.diff} (100%)
 rename applied_patches/{0143-sc-print-lines.diff => 0141-sc-print-lines.diff} (100%)
 delete mode 100644 applied_patches/0142-sc-biffdump.diff
 create mode 100644 applied_patches/0142-sc-dbrange-dynamic-resize.diff
 rename applied_patches/{0145-sc-cellbackground-over-gridlines.diff => 0143-sc-cellbackground-over-gridlines.diff} (100%)
 rename applied_patches/{0146-sc-cellformat-icon-toggle.diff => 0144-sc-cellformat-icon-toggle.diff} (100%)
 delete mode 100644 applied_patches/0144-sc-dbrange-dynamic-resize.diff
 rename applied_patches/{0147-sc-fit-to-width-height-skip-breaks.diff => 0145-sc-fit-to-width-height-skip-breaks.diff} (100%)
 rename applied_patches/{0148-chart-skip-hidden-cells-sc-fix.diff => 0146-chart-skip-hidden-cells-sc-fix.diff} (100%)
 rename applied_patches/{0151-calc-filter-xml-free-context.diff => 0147-calc-filter-xml-free-context.diff} (100%)
 rename applied_patches/{0152-calc-status-bar-func.diff => 0148-calc-status-bar-func.diff} (100%)
 create mode 100644 applied_patches/0149-calc-dp-default-new-sheet.diff
 delete mode 100644 applied_patches/0149-chart-axis-multi-chart-types-chart2.diff
 rename applied_patches/{0158-calc-menu-manual-page-break.diff => 0150-calc-menu-manual-page-break.diff} (100%)
 delete mode 100644 applied_patches/0150-chart-axis-multi-chart-types-xmloff.diff
 create mode 100644 applied_patches/0151-sc-sheet-gridline-toggle.diff
 create mode 100644 applied_patches/0152-calc-formula-variable-separators-sc.diff
 delete mode 100644 applied_patches/0153-calc-dp-custom-names-offapi.diff
 rename applied_patches/{0431-calc-formula-variable-separators-svx.diff => 0153-calc-formula-variable-separators-svx.diff} (100%)
 delete mode 100644 applied_patches/0154-calc-dp-custom-names-sc.diff
 rename applied_patches/{0432-calc-formula-variable-separators-officecfg.diff => 0154-calc-formula-variable-separators-officecfg.diff} (100%)
 delete mode 100644 applied_patches/0155-calc-dp-custom-names-sc-win32-fix.diff
 rename applied_patches/{0433-chart-subtitle-xls-export.diff => 0155-chart-subtitle-xls-export.diff} (100%)
 delete mode 100644 applied_patches/0156-calc-dp-custom-names-sc-group-fix.diff
 rename applied_patches/{0434-calc-external-defined-names-enable.diff => 0156-calc-external-defined-names-enable.diff} (100%)
 delete mode 100644 applied_patches/0157-calc-dp-default-new-sheet.diff
 rename applied_patches/{0435-calc-xls-disable-adjust-row-height.diff => 0157-calc-xls-disable-adjust-row-height.diff} (100%)
 rename applied_patches/{0436-calc-grammar-xls-english-offapi.diff => 0158-calc-grammar-xls-english-offapi.diff} (100%)
 rename applied_patches/{0437-calc-grammar-xls-english-sc.diff => 0159-calc-grammar-xls-english-sc.diff} (100%)
 delete mode 100644 applied_patches/0159-fix-biffdumper.diff
 create mode 100644 applied_patches/0160-calc-find-replace-empty-cells-sc.diff
 create mode 100644 applied_patches/0161-calc-find-replace-empty-cells-svx.diff
 create mode 100644 applied_patches/0162-calc-enhanced-merge-cells-sc.diff
 rename applied_patches/{0442-calc-enhanced-merge-cells-officecfg.diff => 0163-calc-enhanced-merge-cells-officecfg.diff} (100%)
 rename applied_patches/{0443-calc-filter-dbf-precision.diff => 0164-calc-filter-dbf-precision.diff} (100%)
 rename applied_patches/{0444-calc-autoinput-case-insensitive-matching.diff => 0165-calc-autoinput-case-insensitive-matching.diff} (100%)
 rename applied_patches/{0450-calc-jump-on-formula-ref-offapi.diff => 0166-calc-jump-on-formula-ref-offapi.diff} (100%)
 rename applied_patches/{0451-calc-jump-on-formula-ref-officecfg.diff => 0167-calc-jump-on-formula-ref-officecfg.diff} (100%)
 create mode 100644 applied_patches/0168-calc-jump-on-formula-ref-sc.diff
 rename applied_patches/{0453-calc-jump-on-formula-ref-sfx2.diff => 0169-calc-jump-on-formula-ref-sfx2.diff} (100%)
 rename applied_patches/{0454-calc-jump-on-formula-ref-vcl.diff => 0170-calc-jump-on-formula-ref-vcl.diff} (100%)
 create mode 100644 applied_patches/0171-calc-ods-sheet-protection-sc.diff
 rename applied_patches/{0457-calc-ods-sheet-protection-xmloff.diff => 0172-calc-ods-sheet-protection-xmloff.diff} (100%)
 rename applied_patches/{0458-calc-ods-sheet-protection-svtools.diff => 0173-calc-ods-sheet-protection-svtools.diff} (100%)
 create mode 100644 applied_patches/0174-calc-selection-fixed-cursor.diff
 rename applied_patches/{0462-calc-cursor-split-view.diff => 0175-calc-cursor-split-view.diff} (100%)
 create mode 100644 applied_patches/0176-calc-autofilter-shrink-selection.diff
 create mode 100644 applied_patches/0177-calc-xls-import-array-size.diff
 create mode 100644 applied_patches/0178-calc-html-csv-import-force-text-cell.diff
 create mode 100644 applied_patches/0179-calc-find-replace-skip-filtered.diff
 create mode 100644 applied_patches/0180-calc-getpivotdata-force-interpret-formula.diff
 create mode 100644 applied_patches/0181-calc-combo-listbox-export-fix.diff
 create mode 100644 applied_patches/0182-calc-selection-protected-cells.diff
 rename applied_patches/{0684-calc-increase-row-limit.diff => 0183-calc-increase-row-limit.diff} (100%)
 rename applied_patches/{0685-calc-odf-export-autostyle-maxrow.diff => 0184-calc-odf-export-autostyle-maxrow.diff} (100%)
 rename applied_patches/{0686-calc-perf-flat-segment-tree.diff => 0185-calc-perf-flat-segment-tree.diff} (100%)
 create mode 100644 applied_patches/0186-calc-perf-ods-import-properties.diff
 rename applied_patches/{0688-calc-row-limit-bad-ushort.diff => 0187-calc-row-limit-bad-ushort.diff} (100%)
 create mode 100644 applied_patches/0188-calc-perf-page-and-manual-breaks.diff
 create mode 100644 applied_patches/0189-calc-perf-table-hidden-flags.diff
 rename applied_patches/{0689-calc-ods-export-no-more-ushort.diff => 0190-calc-ods-export-no-more-ushort.diff} (100%)
 rename applied_patches/{0690-calc-perf-sort.diff => 0191-calc-perf-sort.diff} (100%)
 create mode 100644 applied_patches/0192-calc-perf-lazy-overlay-objects.diff
 create mode 100644 applied_patches/0193-calc-perf-copy-table-flags.diff
 rename applied_patches/{0691-calc-perf-rowheight-no-progress-bar.diff => 0194-calc-perf-rowheight-no-progress-bar.diff} (100%)
 rename applied_patches/{0160-speed-local-link-except.diff => 0195-speed-local-link-except.diff} (100%)
 rename applied_patches/{0161-speed-local-link-except-offuh.diff => 0196-speed-local-link-except-offuh.diff} (100%)
 rename applied_patches/{0162-speed-local-link.diff => 0197-speed-local-link.diff} (100%)
 rename applied_patches/{0163-fpicker-kde-gcc4-visibility.diff => 0198-fpicker-kde-gcc4-visibility.diff} (100%)
 rename applied_patches/{0164-gui-sw-insert-symbol.diff => 0199-gui-sw-insert-symbol.diff} (100%)
 rename applied_patches/{0165-addrbk-datasrc-ordering.diff => 0200-addrbk-datasrc-ordering.diff} (100%)
 rename applied_patches/{0166-svtools-default-new-document.diff => 0201-svtools-default-new-document.diff} (100%)
 rename applied_patches/{0167-context-autocomplete.diff => 0202-context-autocomplete.diff} (100%)
 rename applied_patches/{0168-svtools-unsort-template-dialogentries.diff => 0203-svtools-unsort-template-dialogentries.diff} (100%)
 rename applied_patches/{0169-desktop-cmdhelp-stdout.diff => 0204-desktop-cmdhelp-stdout.diff} (100%)
 rename applied_patches/{0170-always-allow-save-document-sfx2.diff => 0205-always-allow-save-document-sfx2.diff} (100%)
 rename applied_patches/{0171-always-allow-save-document-sc.diff => 0206-always-allow-save-document-sc.diff} (100%)
 rename applied_patches/{0172-scroll-accel-sc.diff => 0207-scroll-accel-sc.diff} (100%)
 rename applied_patches/{0173-scroll-accel-vcl.diff => 0208-scroll-accel-vcl.diff} (100%)
 rename applied_patches/{0174-min-password-length-sfx2.diff => 0209-min-password-length-sfx2.diff} (100%)
 rename applied_patches/{0175-document-password-change-sfx2.diff => 0210-document-password-change-sfx2.diff} (100%)
 rename applied_patches/{0176-sfx2-remove-check-update-on-fileload.diff => 0211-sfx2-remove-check-update-on-fileload.diff} (100%)
 rename applied_patches/{0177-desktop-disable-startup-registration.diff => 0212-desktop-disable-startup-registration.diff} (100%)
 rename applied_patches/{0178-go-oo-team.diff => 0213-go-oo-team.diff} (100%)
 rename applied_patches/{0179-corporate-dictionary.diff => 0214-corporate-dictionary.diff} (100%)
 delete mode 100644 applied_patches/0214-session-management.diff
 rename applied_patches/{0180-novell-palette.diff => 0215-novell-palette.diff} (100%)
 rename applied_patches/{0181-solenv-really-use-unsinged-char-on-ppc.diff => 0216-solenv-really-use-unsinged-char-on-ppc.diff} (100%)
 rename applied_patches/{0182-sc-default-delete-backspace-key.diff => 0217-sc-default-delete-backspace-key.diff} (100%)
 rename applied_patches/{0183-desktop-config-migration.diff => 0218-desktop-config-migration.diff} (100%)
 rename applied_patches/{0184-help-support.diff => 0219-help-support.diff} (100%)
 rename applied_patches/{0185-scp2-user-config-ooo3.diff => 0220-scp2-user-config-ooo3.diff} (100%)
 rename applied_patches/{0186-pushfont-psstream.diff => 0221-pushfont-psstream.diff} (100%)
 rename applied_patches/{0187-split-icons-search-usr-share.diff => 0222-split-icons-search-usr-share.diff} (100%)
 rename applied_patches/{0188-novell-win32-agfa-monotype-fonts.diff => 0223-novell-win32-agfa-monotype-fonts-m59.diff} (100%)
 rename applied_patches/{0189-build-java-target.diff => 0224-build-java-target-m59.diff} (100%)
 rename applied_patches/{0190-solenv-installer-cleaner-paths.diff => 0225-solenv-installer-cleaner-paths.diff} (100%)
 rename applied_patches/{0191-solenv-installer-lang-filelist-names.diff => 0226-solenv-installer-lang-filelist-names.diff} (100%)
 rename applied_patches/{0192-installer-get-path-correctly.diff => 0227-installer-get-path-correctly.diff} (100%)
 rename applied_patches/{0193-build-prebuilt-stax.diff => 0228-build-prebuilt-stax.diff} (100%)
 rename applied_patches/{0194-ucb-neon-0.24.diff => 0229-ucb-neon-0.24.diff} (100%)
 rename applied_patches/{0196-dmake-space-in-envvar-name.diff => 0230-dmake-space-in-envvar-name.diff} (100%)
 create mode 100644 applied_patches/0231-armeabi-softfp-buildfix.diff
 delete mode 100644 applied_patches/0231-buildfix-vba-as-extn.diff
 create mode 100644 applied_patches/0232-db4.8.diff
 rename applied_patches/{0195-postset-add-ro.diff => 0233-postset-add-ro.diff} (100%)
 rename applied_patches/{0197-recovery-report.diff => 0234-recovery-report.diff} (100%)
 rename applied_patches/{0198-default-no-startup-wizard.diff => 0235-default-no-startup-wizard.diff} (100%)
 rename applied_patches/{0199-default-no-style-dialog.diff => 0236-default-no-style-dialog.diff} (100%)
 rename applied_patches/{0200-default-no-registration.diff => 0237-default-no-registration.diff} (100%)
 rename applied_patches/{0201-tango-prefer-over-industrial.diff => 0238-tango-prefer-over-industrial.diff} (100%)
 rename applied_patches/{0202-default-no-registration-menu.diff => 0239-default-no-registration-menu.diff} (100%)
 rename applied_patches/{0203-default-no-registration-menu-sd.diff => 0240-default-no-registration-menu-sd.diff} (100%)
 rename applied_patches/{0204-scp2-3layer-nicer-paths.diff => 0241-scp2-3layer-nicer-paths.diff} (100%)
 rename applied_patches/{0205-default-system-fpicker.diff => 0242-default-system-fpicker.diff} (100%)
 rename applied_patches/{0206-default-font-aasize.diff => 0243-default-font-aasize.diff} (100%)
 rename applied_patches/{0207-default-font-size.diff => 0244-default-font-size.diff} (100%)
 rename applied_patches/{0208-default-ms-filter-convert.diff => 0245-default-ms-filter-convert.diff} (100%)
 rename applied_patches/{0209-writer-default-as-optimal-page-wrap.diff => 0246-writer-default-as-optimal-page-wrap.diff} (100%)
 rename applied_patches/{0210-vfs-kde-too.diff => 0247-vfs-kde-too.diff} (100%)
 rename applied_patches/{0211-valgrind-alloc.diff => 0248-valgrind-alloc.diff} (100%)
 rename applied_patches/{0212-default-openssl-no-idea-alg.diff => 0249-default-openssl-no-idea-alg.diff} (100%)
 rename applied_patches/{0213-odf-flatxml-import-export.diff => 0250-odf-flatxml-import-export.diff} (100%)
 create mode 100644 applied_patches/0251-session-management.diff
 rename applied_patches/{0215-office-cfg-common-template-dir.diff => 0252-office-cfg-common-template-dir.diff} (100%)
 rename applied_patches/{0216-sfx2-template-category-labels.diff => 0253-sfx2-template-category-labels.diff} (100%)
 rename applied_patches/{0217-scp2_add_additional_dirs.diff => 0254-scp2_add_additional_dirs.diff} (100%)
 rename applied_patches/{0218-build-identification.diff => 0255-build-identification.diff} (100%)
 rename applied_patches/{0219-installer-strip-optional.diff => 0256-installer-strip-optional.diff} (100%)
 rename applied_patches/{0220-i18nutil-glibc-braindamage-workaround.diff => 0257-i18nutil-glibc-braindamage-workaround.diff} (100%)
 rename applied_patches/{0221-sdk-gid-module-name.diff => 0258-sdk-gid-module-name.diff} (100%)
 rename applied_patches/{0222-psprint_config-no-orig.diff => 0259-psprint_config-no-orig.diff} (100%)
 rename applied_patches/{0223-stlport-gcc-warnings.diff => 0260-stlport-gcc-warnings.diff} (100%)
 rename applied_patches/{0224-speed-hash-style.diff => 0261-speed-hash-style.diff} (100%)
 rename applied_patches/{0225-link-as-needed.diff => 0262-link-as-needed.diff} (100%)
 rename applied_patches/{0226-svx-customshapes-NOOPTFILES.diff => 0263-svx-customshapes-NOOPTFILES.diff} (100%)
 rename applied_patches/{0227-warning-return-values-filter.diff => 0264-warning-return-values-filter.diff} (100%)
 rename applied_patches/{0228-warning-return-values-registry.diff => 0265-warning-return-values-registry.diff} (100%)
 rename applied_patches/{0229-warning-uninitialized-variables-tools-2.diff => 0266-warning-uninitialized-variables-tools-2.diff} (100%)
 rename applied_patches/{0230-stlport-solaris-fileno.diff => 0267-stlport-solaris-fileno.diff} (100%)
 rename applied_patches/{0232-system-python-ure-bootstrap.diff => 0268-system-python-ure-bootstrap.diff} (100%)
 rename applied_patches/{0233-pyuno-ooodir.diff => 0269-pyuno-ooodir.diff} (100%)
 delete mode 100644 applied_patches/0269-vba-attribute.diff
 delete mode 100644 applied_patches/0270-basic-prj-build_lst.diff
 rename applied_patches/{0234-system-python-uno-path.diff => 0270-system-python-uno-path.diff} (100%)
 rename applied_patches/{0235-crash-startup.diff => 0271-crash-startup.diff} (100%)
 rename applied_patches/{0236-no-splash-takeover.diff => 0272-no-splash-takeover.diff} (100%)
 rename applied_patches/{0237-vcl-better-fallback.diff => 0273-vcl-better-fallback.diff} (100%)
 rename applied_patches/{0238-hebrew-culmus.diff => 0274-hebrew-culmus.diff} (100%)
 rename applied_patches/{0239-psprint-postscript-page-setup.diff => 0275-psprint-postscript-page-setup.diff} (100%)
 rename applied_patches/{0240-vcl-bitmap2-negative-height.diff => 0276-vcl-bitmap2-negative-height.diff} (100%)
 rename applied_patches/{0241-prevent-multiple-window-resize-calls-when-maximised.diff => 0277-prevent-multiple-window-resize-calls-when-maximised.diff} (100%)
 rename applied_patches/{0242-gui-toolbox-large-icons.diff => 0278-gui-toolbox-large-icons.diff} (100%)
 rename applied_patches/{0243-tango-icons-default-w32.diff => 0279-tango-icons-default-w32.diff} (100%)
 rename applied_patches/{0244-about-build-ver-readability.diff => 0280-about-build-ver-readability.diff} (100%)
 rename applied_patches/{0245-fpicker-common-build.diff => 0281-fpicker-common-build.diff} (100%)
 rename applied_patches/{0246-fpicker-kde-service.diff => 0282-fpicker-kde-service.diff} (100%)
 rename applied_patches/{0247-fpicker-kde-dialog.diff => 0283-fpicker-kde-dialog.diff} (100%)
 rename applied_patches/{0248-fpicker-kde-partial-kio.diff => 0284-fpicker-kde-partial-kio.diff} (100%)
 rename applied_patches/{0249-fpicker-kde-filter-name.diff => 0285-fpicker-kde-filter-name.diff} (100%)
 rename applied_patches/{0250-fpicker-kde-resmgr.diff => 0286-fpicker-kde-resmgr.diff} (100%)
 rename applied_patches/{0251-fpicker-kde-local-media.diff => 0287-fpicker-kde-local-media.diff} (100%)
 rename applied_patches/{0252-fpicker-kde-local-media2.diff => 0288-fpicker-kde-local-media2.diff} (100%)
 rename applied_patches/{0253-fpicker-kde-too-wide.diff => 0289-fpicker-kde-too-wide.diff} (100%)
 rename applied_patches/{0254-fpicker-kde-dont-overwrite.diff => 0290-fpicker-kde-dont-overwrite.diff} (100%)
 delete mode 100644 applied_patches/0290-sc-hacky-handle-boolean.diff
 rename applied_patches/{0255-fpicker-kde-non-utf8.diff => 0291-fpicker-kde-non-utf8.diff} (100%)
 delete mode 100644 applied_patches/0291-sc-vba-build-lst.diff
 rename applied_patches/{0256-fpicker-kde-modal.diff => 0292-fpicker-kde-modal.diff} (100%)
 delete mode 100644 applied_patches/0292-svx-source-inc-fmundo-hxx.diff
 rename applied_patches/{0257-fpicker-common-scp2.diff => 0293-fpicker-common-scp2.diff} (100%)
 delete mode 100644 applied_patches/0293-svx-source-form-fmscriptingenv-cxx.diff
 rename applied_patches/{0258-fpicker-kde-3layer.diff => 0294-fpicker-kde-3layer.diff} (100%)
 delete mode 100644 applied_patches/0294-svx-source-form-makefile.diff
 rename applied_patches/{0259-fpicker-kde-less-threads.diff => 0295-fpicker-kde-less-threads.diff} (100%)
 delete mode 100644 applied_patches/0295-svx-source-form-fmundo-cxx.diff
 rename applied_patches/{0260-default-evolution-database.diff => 0296-default-evolution-database.diff} (100%)
 delete mode 100644 applied_patches/0296-vbaevents-services-build.diff
 rename applied_patches/{0261-default-evo-column-mapping.diff => 0297-default-evo-column-mapping.diff} (100%)
 delete mode 100644 applied_patches/0297-scp_vba_uno_service.diff
 rename applied_patches/{0262-buildfix-evo1-vs-evo2.diff => 0298-buildfix-evo1-vs-evo2.diff} (100%)
 delete mode 100644 applied_patches/0298-vba-support-export-palette.diff
 rename applied_patches/{0263-default-evo2-ab.diff => 0299-default-evo2-ab.diff} (100%)
 delete mode 100644 applied_patches/0299-vba-get-nonfiltered-range-selection.diff
 rename applied_patches/{0264-lwp-filter-component.diff => 0300-lwp-filter-component.diff} (100%)
 delete mode 100644 applied_patches/0300-vba-allow-ranges-for-cell-functions.diff
 rename applied_patches/{0265-cws-ooo11lotusfilter-lwp-filter-component.diff => 0301-cws-ooo11lotusfilter-lwp-filter-component.diff} (100%)
 delete mode 100644 applied_patches/0301-vba-error-object.diff
 rename applied_patches/{0266-cws-ooo11lotusfilter-lwp-filter.diff => 0302-cws-ooo11lotusfilter-lwp-filter.diff} (100%)
 delete mode 100644 applied_patches/0302-sc-vba-autofill-support.diff
 rename applied_patches/{0267-cws-ooo11lotusfilter-lwp-xfilter.diff => 0303-cws-ooo11lotusfilter-lwp-xfilter.diff} (100%)
 delete mode 100644 applied_patches/0303-sc-source-ui-vba-makefile-mk.diff
 delete mode 100644 applied_patches/0304-sc-export-shape-macro-bindings.diff
 rename applied_patches/{0268-warning-return-values-lotuswordpro.diff => 0304-warning-return-values-lotuswordpro.diff} (100%)
 rename applied_patches/{0271-cli_ure-source-bootstrap-assembly-cs.diff => 0305-cli_ure-source-bootstrap-assembly-cs.diff} (100%)
 delete mode 100644 applied_patches/0305-sc-export-shape-hlink-bindings.diff
 rename applied_patches/{0272-cli_ure-source-bootstrap-managed_bootstrap-cs.diff => 0306-cli_ure-source-bootstrap-managed_bootstrap-cs.diff} (100%)
 delete mode 100644 applied_patches/0306-sc-vbaimport-override-controlname.diff
 delete mode 100644 applied_patches/0307-api-application-caller.diff
 rename applied_patches/{0273-cli_ure-source-bootstrap-native_glue-cxx.diff => 0307-cli_ure-source-bootstrap-native_glue-cxx.diff} (100%)
 delete mode 100644 applied_patches/0308-default-autotext-and-form-name.diff
 rename applied_patches/{0274-mono-scp2.diff => 0308-mono-scp2.diff} (100%)
 rename applied_patches/{0275-cli_ure-source-bootstrap-makefile-mk.diff => 0309-cli_ure-source-bootstrap-makefile-mk.diff} (100%)
 delete mode 100644 applied_patches/0309-oovbaapi-disable-vba.diff
 rename applied_patches/{0276-cli_ure-mono-bridge.diff => 0310-cli_ure-mono-bridge.diff} (100%)
 delete mode 100644 applied_patches/0310-vba-fixup-singlerange-sheetref.diff
 rename applied_patches/{0277-mono-build.diff => 0311-mono-build.diff} (100%)
 delete mode 100644 applied_patches/0311-vba-always-set-defaultprop.diff
 rename applied_patches/{0278-build-mono-link.diff => 0312-build-mono-link.diff} (100%)
 delete mode 100644 applied_patches/0312-vba-check-for-macro.diff
 rename applied_patches/{0279-mono-build-keyfile.diff => 0313-mono-build-keyfile.diff} (100%)
 delete mode 100644 applied_patches/0313-vba-support-properties-inmodules.diff
 delete mode 100644 applied_patches/0314-controls-with-images-import.diff
 rename applied_patches/{0280-mono-climaker.diff => 0314-mono-climaker.diff} (100%)
 delete mode 100644 applied_patches/0315-enhanced-form-userform-controls.diff
 rename applied_patches/{0281-mono-testtools.diff => 0315-mono-testtools-m59.diff} (100%)
 delete mode 100644 applied_patches/0316-ObjectModule.diff
 create mode 100644 applied_patches/0316-buildfix-testtool-disabled.diff
 rename applied_patches/{0282-climaker-csharp-win.diff => 0317-climaker-csharp-win.diff} (100%)
 delete mode 100644 applied_patches/0317-vba-userform.diff
 rename applied_patches/{0283-buildfix-climaker-disabled.diff => 0318-buildfix-climaker-disabled.diff} (100%)
 delete mode 100644 applied_patches/0318-vba-compatible-mode-uno.diff
 rename applied_patches/{0284-mono-bootstrap-config-and-policy.diff => 0319-mono-bootstrap-config-and-policy.diff} (100%)
 delete mode 100644 applied_patches/0319-vba-spinbutton-in-userform.diff
 rename applied_patches/{0285-mono-bridge-version.diff => 0320-mono-bridge-version.diff} (100%)
 delete mode 100644 applied_patches/0320-vbaevents-services-sources.diff
 rename applied_patches/{0286-buildfix-use-climaker-in-unoil.diff => 0321-buildfix-use-climaker-in-unoil.diff} (100%)
 delete mode 100644 applied_patches/0321-vba-workbook-worksheet-events.diff
 rename applied_patches/{0287-cli_ure-prj-build-lst.diff => 0322-cli_ure-prj-build-lst.diff} (100%)
 delete mode 100644 applied_patches/0322-vba-worksheet-calculate-event-fix.diff
 delete mode 100644 applied_patches/0323-basic-caller-support.diff
 rename applied_patches/{0288-mono-climaker-config.diff => 0323-mono-climaker-config.diff} (100%)
 rename applied_patches/{0289-mono-climaker-bridgetest.diff => 0324-mono-climaker-bridgetest.diff} (100%)
 delete mode 100644 applied_patches/0324-vba-empty-comparison-fix.diff
 create mode 100644 applied_patches/0325-cws-vbasupportdev300.diff
 delete mode 100644 applied_patches/0325-vba-worksheet-enableselection.diff
 delete mode 100644 applied_patches/0326-vba-keyword-fix.diff
 create mode 100644 applied_patches/0326-vba-reenable-rowsourcefixes.diff
 delete mode 100644 applied_patches/0327-userform-activex-identify.diff
 create mode 100644 applied_patches/0327-vba-basic-not-fix.diff
 create mode 100644 applied_patches/0328-cws-vbasupportdev300-wae.diff
 delete mode 100644 applied_patches/0328-userform-possible-groupingtweak.diff
 delete mode 100644 applied_patches/0329-basic-ide-objectmodule.diff
 create mode 100644 applied_patches/0329-vba-control-api-vis-fix.diff
 delete mode 100644 applied_patches/0330-basic-ide-module-object-name-combile.diff
 create mode 100644 applied_patches/0330-vba-fix-isempty.diff
 delete mode 100644 applied_patches/0331-vba-fix-ide-friendly-modulename.diff
 create mode 100644 applied_patches/0331-vba-fix-wsfunction-booleanparam.diff
 delete mode 100644 applied_patches/0332-vba-basic-macrochoose-dialog.diff
 create mode 100644 applied_patches/0332-vba-fix-errobj-errnum.diff
 rename applied_patches/{0417-sfx2-pre-and-postprocess-during-save-load.diff => 0333-sfx2-pre-and-postprocess-during-save-load.diff} (100%)
 delete mode 100644 applied_patches/0333-vba-fix-basic-macro-organizer.diff
 delete mode 100644 applied_patches/0334-range-listBox-compare.diff
 rename applied_patches/{0418-sfx2-pre-and-postprocess-crash-fix.diff => 0334-sfx2-pre-and-postprocess-crash-fix.diff} (100%)
 delete mode 100644 applied_patches/0335-vba-userform-geometry-tweak.diff
 rename applied_patches/{0419-win32-installer-register-moox-types.diff => 0335-win32-installer-register-moox-types.diff} (100%)
 delete mode 100644 applied_patches/0336-vba-allow-forms-resetvalue-binding.diff
 rename applied_patches/{0420-writerfilter-module-writer.diff => 0336-writerfilter-module-writer.diff} (100%)
 delete mode 100644 applied_patches/0337-fix-vba-NOT-trigger-update.diff
 rename applied_patches/{0421-writerfilter-source-dmapper-domainmapper-debug.diff => 0337-writerfilter-source-dmapper-domainmapper-debug.diff} (100%)
 create mode 100644 applied_patches/0338-buildfix-oox-depends-on-unotools.diff
 delete mode 100644 applied_patches/0338-vba-variant-fix.diff
 rename applied_patches/{0423-oox-fix-placeholder-layout.diff => 0339-oox-fix-placeholder-layout.diff} (100%)
 delete mode 100644 applied_patches/0339-userform-image-import-fix.diff
 rename applied_patches/{0424-oox-fix-list-style-apply.diff => 0340-oox-fix-list-style-apply.diff} (100%)
 delete mode 100644 applied_patches/0340-spinbutton-import-valuechange.diff
 rename applied_patches/{0425-oox-pptx-import-fix-layout.diff => 0341-oox-pptx-import-fix-layout.diff} (100%)
 delete mode 100644 applied_patches/0341-vba-noregrex-for-match.diff
 rename applied_patches/{0426-oox-pptx-import-fix-wipe-transition.diff => 0342-oox-pptx-import-fix-wipe-transition.diff} (100%)
 delete mode 100644 applied_patches/0342-vba-null-not-treatment.diff
 rename applied_patches/{0427-oox-pptx-import-fix-subtitle-placeholder.diff => 0343-oox-pptx-import-fix-subtitle-placeholder.diff} (100%)
 delete mode 100644 applied_patches/0343-vba-commandbar-fix.diff
 rename applied_patches/{0464-sdbc-postgresql.diff => 0344-sdbc-postgresql.diff} (100%)
 delete mode 100644 applied_patches/0344-vba-xls-formula-parser.diff
 rename applied_patches/{0465-sdbc-postgresql-build-lst.diff => 0345-sdbc-postgresql-build-lst.diff} (100%)
 delete mode 100644 applied_patches/0345-vba-fix-docmodule-import-crash.diff
 rename applied_patches/{0466-connectivity-workben-postgresql.diff => 0346-connectivity-workben-postgresql.diff} (100%)
 delete mode 100644 applied_patches/0346-vba-servicemacros-rework.diff
 rename applied_patches/{0467-gcc-4.3-postgresql.diff => 0347-gcc-4.3-postgresql.diff} (100%)
 delete mode 100644 applied_patches/0347-vba-interior-object-fix.diff
 delete mode 100644 applied_patches/0348-range-defaultmethod-i98476.diff
 rename applied_patches/{0468-sdbc-postgresql-config_office.diff => 0348-sdbc-postgresql-config_office.diff} (100%)
 rename applied_patches/{0469-kde4-buildfix-connectivity.diff => 0349-kde4-buildfix-connectivity.diff} (100%)
 delete mode 100644 applied_patches/0349-vba-excel-iserror-fix.diff
 rename applied_patches/{0470-kde4-oxygen-icons.diff => 0350-kde4-oxygen-icons.diff} (100%)
 delete mode 100644 applied_patches/0350-word-read-custom-toolbar-filter.diff
 rename applied_patches/{0471-kde4-fpicker-fix-toOUString.diff => 0351-kde4-fpicker-fix-toOUString.diff} (100%)
 delete mode 100644 applied_patches/0351-vba-word-support.diff
 create mode 100644 applied_patches/0352-kde4-configure2.diff
 delete mode 100644 applied_patches/0352-vba-templateobject.diff
 create mode 100644 applied_patches/0353-kde4_fpicker_fixes.diff
 delete mode 100644 applied_patches/0353-vba-vpagebreak-object.diff
 rename applied_patches/{0472-transogl-transitions-sd.diff => 0354-transogl-transitions-sd.diff} (100%)
 delete mode 100644 applied_patches/0354-vba-combobox-listindex-fix.diff
 rename applied_patches/{0473-transogl-transitions-officecfg.diff => 0355-transogl-transitions-officecfg.diff} (100%)
 delete mode 100644 applied_patches/0355-vba-fix-copysheet-toend.diff
 rename applied_patches/{0474-ooo67658.sfx2.reloadcrash.diff => 0356-ooo67658.sfx2.reloadcrash.diff} (100%)
 delete mode 100644 applied_patches/0356-vba-improve-toolbarapi-macro-search.diff
 delete mode 100644 applied_patches/0357-fix-doc-exit-basic-error-core.diff
 rename applied_patches/{0475-oooXXXXX.vcl.x86_64.impressatk.diff => 0357-oooXXXXX.vcl.x86_64.impressatk.diff} (100%)
 rename applied_patches/{0476-ooo73201.sw.a11yloadcrash.diff => 0358-ooo73201.sw.a11yloadcrash.diff} (100%)
 delete mode 100644 applied_patches/0358-read-vba-dir-stream-fix.diff
 rename applied_patches/{0477-ooo86080.unopkg.bodge.diff => 0359-ooo86080.unopkg.bodge.diff} (100%)
 delete mode 100644 applied_patches/0359-vba-commandbar-enabled.diff
 rename applied_patches/{0478-oooXXXX.partial-revert-ooo95118.diff => 0360-oooXXXX.partial-revert-ooo95118.diff} (100%)
 delete mode 100644 applied_patches/0360-vba-worksheet-change-event-fix.diff
 rename applied_patches/{0479-ooo83878.unopkg.enablelinking.diff => 0361-ooo83878.unopkg.enablelinking.diff} (100%)
 delete mode 100644 applied_patches/0361-vba-toolbar-menufilter-core-fix.diff
 rename applied_patches/{0480-gstreamer-avmedia.diff => 0362-gstreamer-avmedia.diff} (100%)
 delete mode 100644 applied_patches/0362-word-read-builtinmenubar-filter.diff
 rename applied_patches/{0481-gstreamer-scp2.diff => 0363-gstreamer-scp2.diff} (100%)
 delete mode 100644 applied_patches/0363-vba-fix-private-declare.diff
 rename applied_patches/{0482-gstreamer-config-office.diff => 0364-gstreamer-config-office.diff} (100%)
 delete mode 100644 applied_patches/0364-vba-import-globaltemplate-customizations.diff
 rename applied_patches/{0483-gstreamer-slideshow.diff => 0365-gstreamer-slideshow.diff} (100%)
 delete mode 100644 applied_patches/0365-vba-basic-if-compare-fix.diff
 rename applied_patches/{0484-gstreamer-solenv.diff => 0366-gstreamer-solenv.diff} (100%)
 delete mode 100644 applied_patches/0366-vba-basic-parallel-build.diff
 rename applied_patches/{0485-gstreamer-svtools-content-types.diff => 0367-gstreamer-svtools-content-types.diff} (100%)
 delete mode 100644 applied_patches/0367-vba-oovbaapi-parallel-build.diff
 delete mode 100644 applied_patches/0368-basic-allow-objectforerror-symbol.diff
 rename applied_patches/{0486-gstreamer-avmedia-file-types.diff => 0368-gstreamer-avmedia-file-types.diff} (100%)
 rename applied_patches/{0487-gstreamer-vcl.diff => 0369-gstreamer-vcl.diff} (100%)
 delete mode 100644 applied_patches/0369-vba-fix-named-any-para-pass.diff
 rename applied_patches/{0488-avmedia-source-gstreamer-ChangeLog.diff => 0370-avmedia-source-gstreamer-ChangeLog.diff} (100%)
 delete mode 100644 applied_patches/0370-vba-allow-arrays-in-usertypes.diff
 rename applied_patches/{0489-avmedia-source-gstreamer-exports.dxp.diff => 0371-avmedia-source-gstreamer-exports.dxp.diff} (100%)
 delete mode 100644 applied_patches/0371-vba-disable-toolbar+customizationimport.diff
 rename applied_patches/{0490-avmedia-source-gstreamer-gstcommon.hxx.diff => 0372-avmedia-source-gstreamer-gstcommon.hxx.diff} (100%)
 delete mode 100644 applied_patches/0372-vba-fix-IsEmpty-api-object.diff
 rename applied_patches/{0491-avmedia-source-gstreamer-gstframegrabber.cxx.diff => 0373-avmedia-source-gstreamer-gstframegrabber.cxx.diff} (100%)
 delete mode 100644 applied_patches/0373-vba-fix-control-shape-geom-fix.diff
 rename applied_patches/{0492-avmedia-source-gstreamer-gstframegrabber.hxx.diff => 0374-avmedia-source-gstreamer-gstframegrabber.hxx.diff} (100%)
 delete mode 100644 applied_patches/0374-basic-public-dim-fix.diff
 rename applied_patches/{0493-avmedia-source-gstreamer-gstmanager.cxx.diff => 0375-avmedia-source-gstreamer-gstmanager.cxx.diff} (100%)
 delete mode 100644 applied_patches/0375-vba-fix-optionalparam-assigment.diff
 rename applied_patches/{0494-avmedia-source-gstreamer-gstmanager.hxx.diff => 0376-avmedia-source-gstreamer-gstmanager.hxx.diff} (100%)
 delete mode 100644 applied_patches/0376-vba-reset-screenupdateing.diff
 rename applied_patches/{0495-avmedia-source-gstreamer-gstplayer.cxx.diff => 0377-avmedia-source-gstreamer-gstplayer.cxx.diff} (100%)
 delete mode 100644 applied_patches/0377-vba-redim-array-fix.diff
 rename applied_patches/{0496-avmedia-source-gstreamer-gstplayer.hxx.diff => 0378-avmedia-source-gstreamer-gstplayer.hxx.diff} (100%)
 delete mode 100644 applied_patches/0378-vba-fix-userform-init.diff
 rename applied_patches/{0497-avmedia-source-gstreamer-gstuno.cxx.diff => 0379-avmedia-source-gstreamer-gstuno.cxx.diff} (100%)
 delete mode 100644 applied_patches/0379-vba-fix-Range-Insert-CopyOrigin.diff
 rename applied_patches/{0498-avmedia-source-gstreamer-gstwindow.cxx.diff => 0380-avmedia-source-gstreamer-gstwindow.cxx.diff} (100%)
 delete mode 100644 applied_patches/0380-calc-vba-volatile-user-func.diff
 rename applied_patches/{0499-avmedia-source-gstreamer-gstwindow.hxx.diff => 0381-avmedia-source-gstreamer-gstwindow.hxx.diff} (100%)
 delete mode 100644 applied_patches/0381-vba-documentcontext.diff
 rename applied_patches/{0500-avmedia-source-gstreamer-makefile.mk.diff => 0382-avmedia-source-gstreamer-makefile.mk.diff} (100%)
 delete mode 100644 applied_patches/0382-fix-read-disabled-toolbarimport.diff
 rename applied_patches/{0501-letter-wizard-resource-id.diff => 0383-letter-wizard-resource-id.diff} (100%)
 delete mode 100644 applied_patches/0383-vba-word-support-part2.diff
 rename applied_patches/{0502-gstreamer-avmedia-loopingetc.diff => 0384-gstreamer-avmedia-loopingetc.diff} (100%)
 delete mode 100644 applied_patches/0384-vba-only-import-std-menutoolbar.diff
 rename applied_patches/{0503-size-sal-textenc.diff => 0385-size-sal-textenc.diff} (100%)
 delete mode 100644 applied_patches/0385-vba-fix-workbook-resize-core.diff
 rename applied_patches/{0504-jvmfwk-gij32.diff => 0386-jvmfwk-gij32.diff} (100%)
 delete mode 100644 applied_patches/0386-vba-fix-macromode-api-docopen.diff
 rename applied_patches/{0505-svg-import-filter.diff => 0387-svg-import-filter.diff} (100%)
 delete mode 100644 applied_patches/0387-vba-fixup-macrosearch.diff
 rename applied_patches/{0506-svg-import-filter-gfxfilter.diff => 0388-svg-import-filter-gfxfilter.diff} (100%)
 delete mode 100644 applied_patches/0388-vba-currentcomponent-rework.diff
 rename applied_patches/{0507-svg-import-viewbox-fix.diff => 0389-svg-import-viewbox-fix.diff} (100%)
 delete mode 100644 applied_patches/0389-vba-testclient-fix-project.diff
 rename applied_patches/{0508-svg-import-painturi-fix.diff => 0390-svg-import-painturi-fix.diff} (100%)
 delete mode 100644 applied_patches/0390-vba-fix-checkbox-ole-access.diff
 rename applied_patches/{0509-svg-import-textimport.diff => 0391-svg-import-textimport.diff} (100%)
 delete mode 100644 applied_patches/0391-vba-fix-path-fullname.diff
 delete mode 100644 applied_patches/0392-fix-sheet-control-valueset.diff
 rename applied_patches/{0510-svg-import-convlength-fix.diff => 0392-svg-import-convlength-fix.diff} (100%)
 create mode 100644 applied_patches/0393-svg-import-opacity-fix.diff
 delete mode 100644 applied_patches/0393-vba-fix-range-delete-shift.diff
 rename applied_patches/{0511-speed-store.diff => 0394-speed-store.diff} (100%)
 delete mode 100644 applied_patches/0394-vba-fix-worksheet-add-before-param-object.diff
 delete mode 100644 applied_patches/0395-vba-fix-worksheet-add-activate.diff
 rename applied_patches/{0512-wmf-pattern-brush.diff => 0395-wmf-pattern-brush.diff} (100%)
 rename applied_patches/{0513-toolkit-layout-gcc-4.3.2-hack.diff => 0396-toolkit-layout-gcc-4.3.2-hack.diff} (100%)
 delete mode 100644 applied_patches/0396-vba-application-quit.diff
 rename applied_patches/{0514-layout-accessibility-dispose-only-once.diff => 0397-layout-accessibility-dispose-only-once.diff} (100%)
 delete mode 100644 applied_patches/0397-vba-commandbar-rework.diff
 rename applied_patches/{0515-buildfix-toolkit-workben-layout.diff => 0398-buildfix-toolkit-workben-layout.diff} (100%)
 delete mode 100644 applied_patches/0398-vba-menubar-objects.diff
 rename applied_patches/{0516-layout-parallel-build.diff => 0399-layout-parallel-build.diff} (100%)
 delete mode 100644 applied_patches/0399-vba-fix-missing-codename.diff
 rename applied_patches/{0517-autocorrect-accidental-caps-lock-offapi.diff => 0400-autocorrect-accidental-caps-lock-offapi.diff} (100%)
 delete mode 100644 applied_patches/0400-vba-zoom-per-sheet.diff
 rename applied_patches/{0518-autocorrect-accidental-caps-lock-officecfg.diff => 0401-autocorrect-accidental-caps-lock-officecfg.diff} (100%)
 delete mode 100644 applied_patches/0401-vba-fallback-to-calling-doc-context.diff
 rename applied_patches/{0519-autocorrect-accidental-caps-lock-sc.diff => 0402-autocorrect-accidental-caps-lock-sc.diff} (100%)
 delete mode 100644 applied_patches/0402-vba-cursor-pos-for-selected-maxrange.diff
 rename applied_patches/{0520-autocorrect-accidental-caps-lock-sw.diff => 0403-autocorrect-accidental-caps-lock-sw.diff} (100%)
 delete mode 100644 applied_patches/0403-vba-combobox-rowsource-fix.diff
 create mode 100644 applied_patches/0404-autocorrect-accidental-caps-lock-svx.diff
 delete mode 100644 applied_patches/0404-vba-workbook-auto-open-event.diff
 rename applied_patches/{0522-autocorrect-accidental-caps-lock-vcl.diff => 0405-autocorrect-accidental-caps-lock-vcl.diff} (100%)
 delete mode 100644 applied_patches/0405-vba-buildin-toolbar-fix.diff
 create mode 100644 applied_patches/0406-cws-cbosdo01.diff
 delete mode 100644 applied_patches/0406-vba-workbook-precisionasdisplayed.diff
 rename applied_patches/{0523-statusbar-fancy-modified-status-sc.diff => 0407-statusbar-fancy-modified-status-sc.diff} (100%)
 delete mode 100644 applied_patches/0407-uno-xmenu-getpopupMenu-fix.diff
 rename applied_patches/{0524-statusbar-fancy-modified-status-sd.diff => 0408-statusbar-fancy-modified-status-sd.diff} (100%)
 delete mode 100644 applied_patches/0408-vba-commandbarcontrol-enabled.diff
 rename applied_patches/{0525-statusbar-fancy-modified-status-sfx2.diff => 0409-statusbar-fancy-modified-status-sfx2.diff} (100%)
 delete mode 100644 applied_patches/0409-vba-commandbar-document-scope.diff
 rename applied_patches/{0526-statusbar-fancy-modified-status-starmath.diff => 0410-statusbar-fancy-modified-status-starmath.diff} (100%)
 delete mode 100644 applied_patches/0410-vba-dim-as-contants-fix.diff
 rename applied_patches/{0527-statusbar-fancy-modified-status-svx.diff => 0411-statusbar-fancy-modified-status-svx.diff} (100%)
 delete mode 100644 applied_patches/0411-vba-commandbar-toolbar-fix.diff
 rename applied_patches/{0528-statusbar-fancy-modified-status-sw.diff => 0412-statusbar-fancy-modified-status-sw.diff} (100%)
 delete mode 100644 applied_patches/0412-vba-automation-set-fix.diff
 delete mode 100644 applied_patches/0413-tool-menu-bar-improvements.diff
 rename applied_patches/{0529-unittesting-basebmp.diff => 0413-unittesting-basebmp.diff} (100%)
 rename applied_patches/{0530-unittesting-basegfx.diff => 0414-unittesting-basegfx.diff} (100%)
 delete mode 100644 applied_patches/0414-vba-styles-add-fix.diff
 rename applied_patches/{0531-unittesting-basic.diff => 0415-unittesting-basic.diff} (100%)
 delete mode 100644 applied_patches/0415-vba-financial-functions.diff
 rename applied_patches/{0532-unittesting-bean.diff => 0416-unittesting-bean.diff} (100%)
 delete mode 100644 applied_patches/0416-vba-typename-fix.diff
 rename applied_patches/{0533-unittesting-bridges.diff => 0417-unittesting-bridges.diff} (100%)
 rename applied_patches/{0534-unittesting-canvas.diff => 0418-unittesting-canvas.diff} (100%)
 rename applied_patches/{0535-unittesting-cli_ure.diff => 0419-unittesting-cli_ure.diff} (100%)
 rename applied_patches/{0536-unittesting-codemaker.diff => 0420-unittesting-codemaker.diff} (100%)
 rename applied_patches/{0537-unittesting-configmgr.diff => 0421-unittesting-configmgr.diff} (100%)
 delete mode 100644 applied_patches/0422-buildfix-oox-depends-on-unotools.diff
 rename applied_patches/{0538-unittesting-connectivity.diff => 0422-unittesting-connectivity.diff} (100%)
 rename applied_patches/{0539-unittesting-cppu.diff => 0423-unittesting-cppu.diff} (100%)
 rename applied_patches/{0540-unittesting-cppuhelper.diff => 0424-unittesting-cppuhelper.diff} (100%)
 rename applied_patches/{0541-unittesting-dbaccess.diff => 0425-unittesting-dbaccess.diff} (100%)
 rename applied_patches/{0542-unittesting-desktop.diff => 0426-unittesting-desktop.diff} (100%)
 rename applied_patches/{0543-unittesting-dtrans.diff => 0427-unittesting-dtrans.diff} (100%)
 delete mode 100644 applied_patches/0428-calc-formula-asian-phonetic.diff
 rename applied_patches/{0544-unittesting-embeddedobj.diff => 0428-unittesting-embeddedobj.diff} (100%)
 delete mode 100644 applied_patches/0429-sc-sheet-gridline-toggle.diff
 rename applied_patches/{0545-unittesting-extensions.diff => 0429-unittesting-extensions.diff} (100%)
 delete mode 100644 applied_patches/0430-calc-formula-variable-separators-sc.diff
 rename applied_patches/{0546-unittesting-filter.diff => 0430-unittesting-filter.diff} (100%)
 rename applied_patches/{0547-unittesting-forms.diff => 0431-unittesting-forms.diff} (100%)
 rename applied_patches/{0548-unittesting-fpicker.diff => 0432-unittesting-fpicker.diff} (100%)
 rename applied_patches/{0549-unittesting-framework.diff => 0433-unittesting-framework.diff} (100%)
 rename applied_patches/{0550-unittesting-chart2.diff => 0434-unittesting-chart2.diff} (100%)
 rename applied_patches/{0551-unittesting-idlc.diff => 0435-unittesting-idlc.diff} (100%)
 rename applied_patches/{0552-unittesting-io.diff => 0436-unittesting-io.diff} (100%)
 rename applied_patches/{0553-unittesting-javaunohelper.diff => 0437-unittesting-javaunohelper.diff} (100%)
 delete mode 100644 applied_patches/0438-calc-sheet-tab-color-officecfg.diff
 rename applied_patches/{0554-unittesting-jurt.diff => 0438-unittesting-jurt.diff} (100%)
 delete mode 100644 applied_patches/0439-calc-find-replace-empty-cells-sc.diff
 rename applied_patches/{0555-unittesting-jvmaccess.diff => 0439-unittesting-jvmaccess.diff} (100%)
 delete mode 100644 applied_patches/0440-calc-find-replace-empty-cells-svx.diff
 rename applied_patches/{0556-unittesting-linguistic.diff => 0440-unittesting-linguistic.diff} (100%)
 delete mode 100644 applied_patches/0441-calc-enhanced-merge-cells-sc.diff
 rename applied_patches/{0557-unittesting-offapi.diff => 0441-unittesting-offapi.diff} (100%)
 rename applied_patches/{0558-unittesting-o3tl.diff => 0442-unittesting-o3tl.diff} (100%)
 rename applied_patches/{0559-unittesting-package.diff => 0443-unittesting-package.diff} (100%)
 rename applied_patches/{0560-unittesting-qadevOOo.diff => 0444-unittesting-qadevOOo.diff} (100%)
 delete mode 100644 applied_patches/0445-calc-html-import-custom-lang-filter.diff
 rename applied_patches/{0561-unittesting-registry.diff => 0445-unittesting-registry.diff} (100%)
 delete mode 100644 applied_patches/0446-calc-html-import-custom-lang-sc.diff
 rename applied_patches/{0562-unittesting-ridljar.diff => 0446-unittesting-ridljar.diff} (100%)
 delete mode 100644 applied_patches/0447-calc-csv-import-custom-lang-sc.diff
 rename applied_patches/{0563-unittesting-sal.diff => 0447-unittesting-sal.diff} (100%)
 delete mode 100644 applied_patches/0448-calc-csv-import-custom-lang-officecfg.diff
 rename applied_patches/{0564-unittesting-salhelper.diff => 0448-unittesting-salhelper.diff} (100%)
 delete mode 100644 applied_patches/0449-calc-dp-hide-list-menu.diff
 rename applied_patches/{0565-unittesting-sandbox.diff => 0449-unittesting-sandbox.diff} (100%)
 rename applied_patches/{0566-unittesting-sax.diff => 0450-unittesting-sax.diff} (100%)
 rename applied_patches/{0567-unittesting-sc.diff => 0451-unittesting-sc.diff} (100%)
 delete mode 100644 applied_patches/0452-calc-jump-on-formula-ref-sc.diff
 rename applied_patches/{0568-unittesting-scripting.diff => 0452-unittesting-scripting.diff} (100%)
 rename applied_patches/{0569-unittesting-sd.diff => 0453-unittesting-sd.diff} (100%)
 rename applied_patches/{0570-unittesting-sfx2.diff => 0454-unittesting-sfx2.diff} (100%)
 delete mode 100644 applied_patches/0455-calc-dp-custom-sort.diff
 rename applied_patches/{0571-unittesting-shell.diff => 0455-unittesting-shell.diff} (100%)
 delete mode 100644 applied_patches/0456-calc-ods-sheet-protection-sc.diff
 rename applied_patches/{0572-unittesting-slideshow.diff => 0456-unittesting-slideshow.diff} (100%)
 rename applied_patches/{0573-unittesting-sot.diff => 0457-unittesting-sot.diff} (100%)
 rename applied_patches/{0574-unittesting-starmath.diff => 0458-unittesting-starmath.diff} (100%)
 delete mode 100644 applied_patches/0459-calc-dp-custom-names-ods-sc.diff
 rename applied_patches/{0575-unittesting-stoc.diff => 0459-unittesting-stoc.diff} (100%)
 delete mode 100644 applied_patches/0460-calc-dp-custom-names-ods-xmloff.diff
 rename applied_patches/{0576-unittesting-store.diff => 0460-unittesting-store.diff} (100%)
 delete mode 100644 applied_patches/0461-calc-selection-fixed-cursor.diff
 rename applied_patches/{0577-unittesting-svtools.diff => 0461-unittesting-svtools.diff} (100%)
 rename applied_patches/{0578-unittesting-svx.diff => 0462-unittesting-svx.diff} (100%)
 delete mode 100644 applied_patches/0463-calc-autofilter-shrink-selection.diff
 rename applied_patches/{0579-unittesting-sw.diff => 0463-unittesting-sw.diff} (100%)
 rename applied_patches/{0580-unittesting-testshl2.diff => 0464-unittesting-testshl2.diff} (100%)
 rename applied_patches/{0581-unittesting-testtools.diff => 0465-unittesting-testtools.diff} (100%)
 rename applied_patches/{0582-unittesting-toolkit.diff => 0466-unittesting-toolkit.diff} (100%)
 rename applied_patches/{0583-unittesting-tools.diff => 0467-unittesting-tools.diff} (100%)
 rename applied_patches/{0584-unittesting-ucbhelper.diff => 0468-unittesting-ucbhelper.diff} (100%)
 rename applied_patches/{0585-unittesting-ucb.diff => 0469-unittesting-ucb.diff} (100%)
 rename applied_patches/{0586-unittesting-udkapi.diff => 0470-unittesting-udkapi.diff} (100%)
 rename applied_patches/{0587-unittesting-vcl.diff => 0471-unittesting-vcl.diff} (100%)
 rename applied_patches/{0588-unittesting-writerfilter.diff => 0472-unittesting-writerfilter.diff} (100%)
 rename applied_patches/{0589-unittesting-xmerge.diff => 0473-unittesting-xmerge.diff} (100%)
 rename applied_patches/{0590-unittesting-xmlhelp.diff => 0474-unittesting-xmlhelp.diff} (100%)
 rename applied_patches/{0591-unittesting-xmloff.diff => 0475-unittesting-xmloff.diff} (100%)
 rename applied_patches/{0592-unittesting-xmlscript.diff => 0476-unittesting-xmlscript.diff} (100%)
 rename applied_patches/{0593-unittesting-xmlsecurity.diff => 0477-unittesting-xmlsecurity.diff} (100%)
 rename applied_patches/{0594-novell-win32-odma.diff => 0478-novell-win32-odma.diff} (100%)
 rename applied_patches/{0595-svx-sdrobjeditview-update-edit-area.diff => 0479-svx-sdrobjeditview-update-edit-area.diff} (100%)
 rename applied_patches/{0596-goodies-eps-filter-unix.diff => 0480-goodies-eps-filter-unix.diff} (100%)
 rename applied_patches/{0597-emf+-cppcanvas-renderer.diff => 0481-emf+-cppcanvas-renderer.diff} (100%)
 rename applied_patches/{0598-emf+-cppcanvas-emfplus.diff => 0482-emf+-cppcanvas-emfplus.diff} (100%)
 rename applied_patches/{0599-emf+-offapi-renderer.diff => 0483-emf+-offapi-renderer.diff} (100%)
 rename applied_patches/{0600-emf+-vcl-bitmap.diff => 0484-emf+-vcl-bitmap.diff} (100%)
 rename applied_patches/{0601-emf+-vcl-renderer.diff => 0485-emf+-vcl-renderer.diff} (100%)
 rename applied_patches/{0602-emf+-svtools.diff => 0486-emf+-svtools.diff} (100%)
 rename applied_patches/{0603-emf+-scp2-renderer.diff => 0487-emf+-scp2-renderer.diff} (100%)
 rename applied_patches/{0604-emf+-crash-fix.diff => 0488-emf+-crash-fix.diff} (100%)
 rename applied_patches/{0605-vcl-grey-alpha-unix-sal-bitmap.diff => 0489-vcl-grey-alpha-unix-sal-bitmap.diff} (100%)
 rename applied_patches/{0606-emf+-multipart-objects.diff => 0490-emf+-multipart-objects.diff} (100%)
 rename applied_patches/{0607-emf+-use-canvas-only-for-emf+.diff => 0491-emf+-use-canvas-only-for-emf+.diff} (100%)
 rename applied_patches/{0608-emf+-embedded-mf-image.diff => 0492-emf+-embedded-mf-image.diff} (100%)
 rename applied_patches/{0609-vcl-pluggable-mtf-renderer.diff => 0493-vcl-pluggable-mtf-renderer.diff} (100%)
 rename applied_patches/{0610-emf+-cppcanvas-input-validation.diff => 0494-emf+-cppcanvas-input-validation.diff} (100%)
 rename applied_patches/{0611-linkwarn-dlg-in-apps.diff => 0495-linkwarn-dlg-in-apps.diff} (100%)
 rename applied_patches/{0612-linkwarn-sfx2-disable-cb-persistency.diff => 0496-linkwarn-sfx2-disable-cb-persistency.diff} (100%)
 rename applied_patches/{0613-linkwarn-svtools-miscopts-bits.diff => 0497-linkwarn-svtools-miscopts-bits.diff} (100%)
 rename applied_patches/{0614-linkwarn-officecfg-disable-msgbox.diff => 0498-linkwarn-officecfg-disable-msgbox.diff} (100%)
 rename applied_patches/{0615-linkwarn-svx-warning-dlg.diff => 0499-linkwarn-svx-warning-dlg.diff} (100%)
 rename applied_patches/{0616-linkwarn-sd-no-dnd-links.diff => 0500-linkwarn-sd-no-dnd-links.diff} (100%)
 rename applied_patches/{0617-fix-ppt-linespacing-import-export.diff => 0501-fix-ppt-linespacing-import-export.diff} (100%)
 rename applied_patches/{0618-sw-section-import-fix.diff => 0502-sw-section-import-fix.diff} (100%)
 rename applied_patches/{0619-sw-allow-negative-spacing.diff => 0503-sw-allow-negative-spacing.diff} (100%)
 create mode 100644 applied_patches/0504-field-patch.diff
 rename applied_patches/{0620-sw-import-html-controls.diff => 0505-sw-import-html-controls.diff} (100%)
 rename applied_patches/{0621-svx-hacky-htmlselect-control-import.diff => 0506-svx-hacky-htmlselect-control-import.diff} (100%)
 rename applied_patches/{0622-sd-slideshow-slideshowview-transformation-fix.diff => 0507-sd-slideshow-slideshowview-transformation-fix.diff} (100%)
 rename applied_patches/{0623-sd-view-zoom-fix.diff => 0508-sd-view-zoom-fix.diff} (100%)
 rename applied_patches/{0624-sd-custom-show-fix.diff => 0509-sd-custom-show-fix.diff} (100%)
 rename applied_patches/{0625-fit-list-to-size.diff => 0510-fit-list-to-size.diff} (100%)
 rename applied_patches/{0626-fit-list-to-size-ui.diff => 0511-fit-list-to-size-ui.diff} (100%)
 rename applied_patches/{0627-fit-list-to-size-style-defaults.diff => 0512-fit-list-to-size-style-defaults.diff} (100%)
 create mode 100644 applied_patches/0513-fit-list-to-size-popup.diff
 create mode 100644 applied_patches/0514-fit-list-to-size-build-fix.diff
 rename applied_patches/{0629-sw-nested-positionned-tables-ww8-import-fix.diff => 0515-sw-nested-positionned-tables-ww8-import-fix.diff} (100%)
 rename applied_patches/{0630-xmloff_dis26300_conformance.diff => 0516-xmloff_dis26300_conformance.diff} (100%)
 rename applied_patches/{0631-lockfile-dont-do-dns-lookup.diff => 0517-lockfile-dont-do-dns-lookup.diff} (100%)
 rename applied_patches/{0632-lockfile-less-symbols.diff => 0518-lockfile-less-symbols.diff} (100%)
 rename applied_patches/{0633-internal-mesa-headers-config_office.diff => 0519-internal-mesa-headers-config_office.diff} (100%)
 rename applied_patches/{0634-internal-mesa-headers-slideshow.diff => 0520-internal-mesa-headers-slideshow.diff} (100%)
 delete mode 100644 applied_patches/0521-autocorrect-accidental-caps-lock-svx.diff
 rename applied_patches/{0635-internal-mesa-headers-mesa.diff => 0521-internal-mesa-headers-mesa.diff} (100%)
 create mode 100644 applied_patches/0522-ui-desktop-integration.diff
 rename applied_patches/{0637-cairo-pixman-makefile-mk.diff => 0523-cairo-pixman-makefile-mk.diff} (100%)
 rename applied_patches/{0638-cairo-cairo-makefile-mk.diff => 0524-cairo-cairo-makefile-mk.diff} (100%)
 rename applied_patches/{0639-internal-cairo-configure.diff => 0525-internal-cairo-configure.diff} (100%)
 create mode 100644 applied_patches/0526-package-pixman-scp2-source-ooo-file_library_ooo_scp.diff
 rename applied_patches/{0640-cppcanvas-fix-roundcorners.diff => 0527-cppcanvas-fix-roundcorners.diff} (100%)
 rename applied_patches/{0641-officecfg-bighandles-default.diff => 0528-officecfg-bighandles-default.diff} (100%)
 rename applied_patches/{0642-slideshow-cutblack.diff => 0529-slideshow-cutblack.diff} (100%)
 rename applied_patches/{0643-canvas-colorspace-fix.diff => 0530-canvas-colorspace-fix.diff} (100%)
 rename applied_patches/{0644-unoxml-boost-workaround.diff => 0531-unoxml-boost-workaround.diff} (100%)
 rename applied_patches/{0645-sw-source-filter-xml-xmltbli-uninitializedvalue.diff => 0532-sw-source-filter-xml-xmltbli-uninitializedvalue.diff} (100%)
 rename applied_patches/{0646-svtools-update-ole.diff => 0533-svtools-update-ole.diff} (100%)
 rename applied_patches/{0647-jurt-jnilib-deliver.diff => 0534-jurt-jnilib-deliver.diff} (100%)
 rename applied_patches/{0648-timely-canvas-disposing.diff => 0535-timely-canvas-disposing.diff} (100%)
 rename applied_patches/{0649-instset-prefer-langpacks.diff => 0536-instset-prefer-langpacks.diff} (100%)
 rename applied_patches/{0650-solenv-installer-unopkg-call.diff => 0537-solenv-installer-unopkg-call.diff} (100%)
 rename applied_patches/{0651-svx-debug-sdrolestreams.diff => 0538-svx-debug-sdrolestreams.diff} (100%)
 rename applied_patches/{0652-instset-macos-langpacks.diff => 0539-instset-macos-langpacks.diff} (100%)
 rename applied_patches/{0653-sal-disable-backtrace.diff => 0540-sal-disable-backtrace.diff} (100%)
 rename applied_patches/{0654-sw-invert-border-spacing.diff => 0541-sw-invert-border-spacing.diff} (100%)
 rename applied_patches/{0655-sw-collapse-empty-table-par-like-html.diff => 0542-sw-collapse-empty-table-par-like-html.diff} (100%)
 rename applied_patches/{0656-canvas-directx-lostdevice-fix.diff => 0543-canvas-directx-lostdevice-fix.diff} (100%)
 rename applied_patches/{0657-sw-table-join-fix-i99267.diff => 0544-sw-table-join-fix-i99267.diff} (100%)
 rename applied_patches/{0658-svtools-svrtf-token-ignore-case.diff => 0545-svtools-svrtf-token-ignore-case.diff} (100%)
 rename applied_patches/{0659-fix-sd-accelerators.diff => 0546-fix-sd-accelerators.diff} (100%)
 rename applied_patches/{0660-sw-outline-numbering-broken-fix.diff => 0547-sw-outline-numbering-broken-fix.diff} (100%)
 rename applied_patches/{0661-sw-insert-pagebreak-in-numbered-paragraph.diff => 0548-sw-insert-pagebreak-in-numbered-paragraph.diff} (100%)
 rename applied_patches/{0662-win32-tooltips.diff => 0549-win32-tooltips.diff} (100%)
 create mode 100644 applied_patches/0550-win32-cygwin-1.7.diff
 create mode 100644 applied_patches/0551-win32-sdk7.diff
 create mode 100644 applied_patches/0552-win32-dxsdk-200908.diff
 create mode 100644 applied_patches/0553-win32-interix.diff
 rename applied_patches/{0663-sfx2-privateprotectedpublic.diff => 0554-sfx2-privateprotectedpublic.diff} (100%)
 rename applied_patches/{0664-optional-outplace-ole.diff => 0555-optional-outplace-ole.diff} (100%)
 rename applied_patches/{0665-slideshow-configurable-paintoverlay.diff => 0556-slideshow-configurable-paintoverlay.diff} (100%)
 rename applied_patches/{0666-vcl-permit-global-shortcuts.diff => 0557-vcl-permit-global-shortcuts.diff} (100%)
 rename applied_patches/{0667-sd-customanimation-defbutton.diff => 0558-sd-customanimation-defbutton.diff} (100%)
 rename applied_patches/{0668-sd-ruler-fix.diff => 0559-sd-ruler-fix.diff} (100%)
 rename applied_patches/{0669-sd-odf-relaxed-listlevel.diff => 0560-sd-odf-relaxed-listlevel.diff} (100%)
 rename applied_patches/{0670-sd-animation-ui-fix.diff => 0561-sd-animation-ui-fix.diff} (100%)
 rename applied_patches/{0671-slideshow-mute-sound.diff => 0562-slideshow-mute-sound.diff} (100%)
 rename applied_patches/{0672-base64.diff => 0563-base64.diff} (100%)
 rename applied_patches/{0673-sfx2-qstart-nocrashhack.diff => 0564-sfx2-qstart-nocrashhack.diff} (100%)
 rename applied_patches/{0674-slideshow-effect-rewind.diff => 0565-slideshow-effect-rewind.diff} (100%)
 rename applied_patches/{0675-svx-ppt-tablerow-height-fix.diff => 0566-svx-ppt-tablerow-height-fix.diff} (100%)
 rename applied_patches/{0676-mail-document-subject.diff => 0567-mail-document-subject.diff} (100%)
 rename applied_patches/{0677-pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff => 0568-pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff} (100%)
 rename applied_patches/{0678-pptx-gfx-layout-fix.diff => 0569-pptx-gfx-layout-fix.diff} (100%)
 rename applied_patches/{0679-xlsx-export-notes-avoid-dereferencing-0-svx.diff => 0570-xlsx-export-notes-avoid-dereferencing-0-svx.diff} (100%)
 rename applied_patches/{0680-odf-converter-ignore-writerfilter.diff => 0571-odf-converter-ignore-writerfilter.diff} (100%)
 create mode 100644 applied_patches/0572-external-apm-header.diff
 rename applied_patches/{0692-wmf-mm-text.diff => 0573-wmf-mm-text.diff} (100%)
 rename applied_patches/{0693-wmf-mm-text-1.diff => 0574-wmf-mm-text-1.diff} (100%)
 rename applied_patches/{0694-sd-create-table-height-fix.diff => 0575-sd-create-table-height-fix.diff} (100%)
 rename applied_patches/{0695-pptx-autoplay-fix.diff => 0576-pptx-autoplay-fix.diff} (100%)
 rename applied_patches/{0696-configmgr-validate-removedtree.diff => 0577-configmgr-validate-removedtree.diff} (100%)
 rename applied_patches/{0697-svx-fix-fit-to-frame-crash.diff => 0578-svx-fix-fit-to-frame-crash.diff} (100%)
 rename applied_patches/{0699-svx-fontwork-crash-fix.diff => 0579-svx-fontwork-crash-fix.diff} (100%)
 rename applied_patches/{0700-svx-autoshape-cache-purge.diff => 0580-svx-autoshape-cache-purge.diff} (100%)
 rename applied_patches/{0701-normalize-template-paths-fix.diff => 0581-normalize-template-paths-fix.diff} (100%)
 rename applied_patches/{0702-edit-links-decode-unicode-uri.diff => 0582-edit-links-decode-unicode-uri.diff} (100%)
 rename applied_patches/{0703-fontconfig-cache-pre-substitution.diff => 0583-fontconfig-cache-pre-substitution.diff} (100%)
 rename applied_patches/{0704-link-with-uno-cppu.diff => 0584-link-with-uno-cppu.diff} (100%)
 rename applied_patches/{0708-oox-pptx-import-fix-placeholder-text-style.diff => 0585-oox-pptx-import-fix-placeholder-text-style.diff} (100%)
 create mode 100644 applied_patches/0586-build-fix-linux.diff
 create mode 100644 applied_patches/0587-emf+-driver-string.diff
 create mode 100644 applied_patches/0588-sd-print-fix-pageoffset.diff
 create mode 100644 applied_patches/0589-svx-ppt-import-fix-bullet-size.diff
 rename applied_patches/{0710-binfilter-stl.diff => 0590-binfilter-stl.diff} (100%)
 rename applied_patches/{0711-link-as-needed-bf.diff => 0591-link-as-needed-bf.diff} (100%)
 rename applied_patches/{0712-binfilter-dont-extern-sRTF-sHTML.diff => 0592-binfilter-dont-extern-sRTF-sHTML.diff} (100%)
 rename applied_patches/{0713-fit-list-to-size-binfilter.diff => 0593-fit-list-to-size-binfilter.diff} (100%)
 rename applied_patches/{0714-reportdesigner-no-license.diff => 0594-reportdesigner-no-license.diff} (100%)
 rename applied_patches/{0715-presenterscreen-no-license.diff => 0595-presenterscreen-no-license.diff} (100%)
 rename applied_patches/{0716-presentation-minimizer-no-license.diff => 0596-presentation-minimizer-no-license.diff} (100%)
 rename applied_patches/{0717-apache-commons-build-fix-invalid-chars.diff => 0597-apache-commons-build-fix-invalid-chars.diff} (100%)
 rename applied_patches/{0718-wiki-publisher-no-license.diff => 0598-wiki-publisher-no-license.diff} (100%)
 rename applied_patches/{0719-pdfimport-no-license.diff => 0599-pdfimport-no-license.diff} (100%)
 rename applied_patches/{0720-build-java-target-extensions.diff => 0600-build-java-target-extensions.diff} (100%)
 rename applied_patches/{0721-pdfimport-lax-restrictions.diff => 0601-pdfimport-lax-restrictions.diff} (100%)
 rename applied_patches/{0722-slideshow-effect-rewind-sdext.diff => 0602-slideshow-effect-rewind-sdext.diff} (100%)
 delete mode 100644 applied_patches/0628-fit-list-to-size-popup.diff
 delete mode 100644 applied_patches/0636-ui-desktop-integration.diff
 delete mode 100644 applied_patches/0681-calc-external-ref-modify-link-modified.diff
 delete mode 100644 applied_patches/0682-calc-xls-hyperlink-single-quote-fix.diff
 delete mode 100644 applied_patches/0683-calc-external-ref-decode-unicode-uri.diff
 delete mode 100644 applied_patches/0687-calc-perf-ods-import-properties.diff
 delete mode 100644 applied_patches/0698-basegfx-color-tools.diff
 delete mode 100644 applied_patches/0705-link-with-comphelper.diff
 delete mode 100644 applied_patches/0706-import-export-dialogmodel.diff
 delete mode 100644 applied_patches/0707-dtrans-aqua-dragrect-fix.diff
 delete mode 100644 applied_patches/0709-build-fix.diff
 create mode 100644 comphelper/inc/comphelper/docpasswordhelper.hxx
 create mode 100644 comphelper/inc/comphelper/docpasswordrequest.hxx
 create mode 100644 comphelper/source/misc/docpasswordhelper.cxx
 create mode 100644 comphelper/source/misc/docpasswordrequest.cxx
 create mode 100644 default_images/res/commandimagelist/lc_navigateback.png
 create mode 100644 default_images/res/commandimagelist/lc_navigateforward.png
 create mode 100644 default_images/res/commandimagelist/lch_navigateback.png
 create mode 100644 default_images/res/commandimagelist/lch_navigateforward.png
 create mode 100644 default_images/res/commandimagelist/sc_navigateback.png
 create mode 100644 default_images/res/commandimagelist/sc_navigateforward.png
 create mode 100644 default_images/res/commandimagelist/sch_navigateback.png
 create mode 100644 default_images/res/commandimagelist/sch_navigateforward.png
 create mode 100644 default_images/sc/res/popup_select_current.png
 create mode 100644 default_images/sc/res/popup_unselect_current.png
 delete mode 100644 framework/inc/classes/eventsconfiguration.hxx
 delete mode 100644 framework/inc/classes/eventsdocumenthandler.hxx
 create mode 100755 framework/inc/classes/fwlresid.hxx
 delete mode 100644 framework/inc/classes/imagesconfiguration.hxx
 delete mode 100644 framework/inc/classes/imagesdocumenthandler.hxx
 delete mode 100644 framework/inc/classes/menuconfiguration.hxx
 delete mode 100644 framework/inc/classes/statusbarconfiguration.hxx
 delete mode 100644 framework/inc/classes/statusbardocumenthandler.hxx
 delete mode 100755 framework/inc/classes/toolboxconfiguration.hxx
 delete mode 100644 framework/inc/classes/toolboxconfigurationdefines.hxx
 delete mode 100755 framework/inc/classes/toolboxdocumenthandler.hxx
 delete mode 100644 framework/inc/classes/toolboxlayoutdocumenthandler.hxx
 rewrite framework/inc/mediadescriptor.h (76%)
 delete mode 100644 framework/inc/services/menudocumenthandler.hxx
 delete mode 100644 framework/inc/services/popupmenucontrollerfactory.hxx
 delete mode 100644 framework/inc/services/saxnamespacefilter.hxx
 rewrite framework/inc/uielement/footermenucontroller.hxx (61%)
 create mode 100755 framework/inc/uifactory/factoryconfiguration.hxx
 create mode 100755 framework/source/classes/fwlresid.cxx
 rewrite framework/source/uiconfiguration/imagemanager.cxx (81%)
 create mode 100755 framework/source/uiconfiguration/imagemanagerimpl.cxx
 create mode 100755 framework/source/uiconfiguration/imagemanagerimpl.hxx
 rewrite framework/source/uiconfiguration/moduleimagemanager.cxx (87%)
 rewrite framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx (84%)
 rewrite framework/source/uiconfiguration/uiconfigurationmanager.cxx (81%)
 create mode 100755 framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
 create mode 100755 framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
 rewrite framework/source/uielement/footermenucontroller.cxx (71%)
 create mode 100755 framework/source/uifactory/factoryconfiguration.cxx
 rewrite framework/source/uifactory/popupmenucontrollerfactory.cxx (81%)
 rewrite framework/source/uifactory/statusbarcontrollerfactory.cxx (83%)
 rewrite framework/source/uifactory/toolbarcontrollerfactory.cxx (62%)
 create mode 100644 offapi/com/sun/star/document/PDFDialog.idl
 create mode 100644 offapi/com/sun/star/document/XVbaMethodParameter.idl
 create mode 100644 oovbaapi/ooo/vba/Globals.idl
 create mode 100644 oovbaapi/ooo/vba/XGlobals.idl
 create mode 100644 oox/inc/oox/core/filterdetect.hxx
 delete mode 100644 sal/osl/all/readline.c
 rewrite sal/osl/unx/file.cxx (87%)
 create mode 100644 sal/osl/unx/file_misc.cxx
 create mode 100644 sal/osl/unx/file_volume.cxx
 rewrite sal/osl/w32/file.cxx (91%)
 create mode 100644 sal/osl/w32/file_dirvol.cxx
 create mode 100644 sal/osl/w32/file_error.c
 create mode 100644 sal/osl/w32/file_error.h
 create mode 100644 sal/osl/w32/file_url.cxx
 create mode 100644 sal/osl/w32/file_url.h
 create mode 100644 sal/osl/w32/tempfile.cxx
 delete mode 100644 sal/workben/t_layer.c
 create mode 100644 sal/workben/t_readline.c
 delete mode 100644 sal/workben/t_tls.c
 delete mode 100644 sal/workben/t_zip.c
 create mode 100644 sc/inc/AccessibleFilterMenu.hxx
 create mode 100644 sc/inc/AccessibleFilterMenuItem.hxx
 create mode 100644 sc/inc/AccessibleFilterTopWindow.hxx
 create mode 100644 sc/inc/AccessibleGlobal.hxx
 delete mode 100644 sc/inc/indexmap.hxx
 delete mode 100644 sc/inc/phonetic.hxx
 create mode 100644 sc/inc/queryparam.hxx
 create mode 100644 sc/inc/sc.hrc.patched
 create mode 100644 sc/inc/sheetdata.hxx
 create mode 100644 sc/inc/tabbgcolor.hxx
 delete mode 100644 sc/source/core/data/phonetic.cxx
 create mode 100644 sc/source/core/inc/doubleref.hxx
 create mode 100644 sc/source/core/tool/doubleref.cxx
 delete mode 100644 sc/source/core/tool/indexmap.cxx
 create mode 100644 sc/source/core/tool/queryparam.cxx
 delete mode 100644 sc/source/filter/excel/biffdump.cxx
 delete mode 100644 sc/source/filter/excel/xlstream.cxx
 delete mode 100644 sc/source/filter/inc/fdumper.hxx
 delete mode 100644 sc/source/filter/inc/fdumperole.hxx
 delete mode 100644 sc/source/filter/inc/xldumper.hxx
 create mode 100644 sc/source/filter/xml/sheetdata.cxx
 delete mode 100644 sc/source/filter/xml/xmlrubyi.cxx
 delete mode 100644 sc/source/filter/xml/xmlrubyi.hxx
 create mode 100644 sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
 create mode 100644 sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
 create mode 100644 sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
 create mode 100644 sc/source/ui/Accessibility/AccessibleGlobal.cxx
 delete mode 100644 sc/source/ui/dbgui/langchooser.cxx
 delete mode 100644 sc/source/ui/dbgui/langchooser.src
 create mode 100644 sc/source/ui/dbgui/textimportoptions.cxx
 create mode 100644 sc/source/ui/dbgui/textimportoptions.src
 delete mode 100644 sc/source/ui/inc/langchooser.hxx
 create mode 100644 sc/source/ui/inc/tabbgcolordlg.hxx
 rename sc/source/ui/inc/{langchooser.hrc => textimportoptions.hrc} (100%)
 create mode 100644 sc/source/ui/inc/textimportoptions.hxx
 create mode 100644 sc/source/ui/miscdlgs/tabbgcolordlg.cxx
 create mode 100644 sc/source/ui/vba/testvba/Logs/AutoFilter.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/CalcFont.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/MiscOperatorTests.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/MiscRangeTests.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/PageBreaks.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/Ranges-2.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/Ranges-3.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/Ranges.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/Shapes.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/StrConv-test.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/Template.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/TestAddress.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest2.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/TestIntersection.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/TestUnion.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/VariantTest.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/Window.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/bytearraystring.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/dateserial.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/datevalue.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/format.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/pagesetup.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/partition.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/range-4.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/replace.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/stringplusdouble.log
 create mode 100644 sc/source/ui/vba/testvba/Logs/window2.log
 create mode 100644 sc/source/ui/vba/testvba/TestDocuments/logs/unix/CalcFont.log
 create mode 100644 sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log
 create mode 100644 sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestIntersection.log
 create mode 100644 sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestUnion.log
 create mode 100644 sc/source/ui/vba/testvba/TestDocuments/logs/unix/VariantTest.log
 create mode 100644 sc/source/ui/vba/testvba/list1
 create mode 100644 sc/source/ui/vba/testvba/list2
 create mode 100644 sc/source/ui/vba/testvba/list3
 create mode 100644 sc/source/ui/vba/testvba/testrun.log
 create mode 100644 sc/source/ui/vba/vbabutton.cxx
 create mode 100644 sc/source/ui/vba/vbabutton.hxx
 create mode 100644 sc/source/ui/vba/vbacheckbox.cxx
 create mode 100644 sc/source/ui/vba/vbacheckbox.hxx
 create mode 100644 sc/source/ui/vba/vbacollectionimpl.cxx
 create mode 100644 sc/source/ui/vba/vbacollectionimpl.hxx
 create mode 100644 sc/source/ui/vba/vbacolorformat.cxx
 create mode 100644 sc/source/ui/vba/vbacolorformat.hxx
 create mode 100644 sc/source/ui/vba/vbacombobox.cxx
 create mode 100644 sc/source/ui/vba/vbacombobox.hxx
 create mode 100644 sc/source/ui/vba/vbacommandbar.cxx
 create mode 100644 sc/source/ui/vba/vbacommandbar.hxx
 create mode 100644 sc/source/ui/vba/vbacommandbarcontrol.cxx
 create mode 100644 sc/source/ui/vba/vbacommandbarcontrol.hxx
 create mode 100644 sc/source/ui/vba/vbacommandbarcontrols.cxx
 create mode 100644 sc/source/ui/vba/vbacommandbarcontrols.hxx
 create mode 100644 sc/source/ui/vba/vbacommandbars.cxx
 create mode 100644 sc/source/ui/vba/vbacommandbars.hxx
 create mode 100644 sc/source/ui/vba/vbacontrol.hxx
 create mode 100644 sc/source/ui/vba/vbacontrols.cxx
 create mode 100644 sc/source/ui/vba/vbacontrols.hxx
 create mode 100644 sc/source/ui/vba/vbafillformat.cxx
 create mode 100644 sc/source/ui/vba/vbafillformat.hxx
 create mode 100644 sc/source/ui/vba/vbaframe.cxx
 create mode 100644 sc/source/ui/vba/vbaframe.hxx
 create mode 100644 sc/source/ui/vba/vbahelper.hxx
 create mode 100644 sc/source/ui/vba/vbahelperinterface.hxx
 create mode 100644 sc/source/ui/vba/vbaimage.cxx
 create mode 100644 sc/source/ui/vba/vbaimage.hxx
 create mode 100644 sc/source/ui/vba/vbalabel.cxx
 create mode 100644 sc/source/ui/vba/vbalabel.hxx
 create mode 100644 sc/source/ui/vba/vbalineformat.cxx
 create mode 100644 sc/source/ui/vba/vbalineformat.hxx
 create mode 100644 sc/source/ui/vba/vbalistbox.cxx
 create mode 100644 sc/source/ui/vba/vbalistbox.hxx
 create mode 100644 sc/source/ui/vba/vbalistcontrolhelper.cxx
 create mode 100644 sc/source/ui/vba/vbalistcontrolhelper.hxx
 create mode 100644 sc/source/ui/vba/vbamultipage.cxx
 create mode 100644 sc/source/ui/vba/vbamultipage.hxx
 create mode 100644 sc/source/ui/vba/vbapages.cxx
 create mode 100644 sc/source/ui/vba/vbapages.hxx
 create mode 100644 sc/source/ui/vba/vbapictureformat.cxx
 create mode 100644 sc/source/ui/vba/vbapictureformat.hxx
 create mode 100644 sc/source/ui/vba/vbaprogressbar.cxx
 create mode 100644 sc/source/ui/vba/vbaprogressbar.hxx
 create mode 100644 sc/source/ui/vba/vbaradiobutton.cxx
 create mode 100644 sc/source/ui/vba/vbaradiobutton.hxx
 create mode 100644 sc/source/ui/vba/vbarange.cxx.pathched
 create mode 100644 sc/source/ui/vba/vbascrollbar.cxx
 create mode 100644 sc/source/ui/vba/vbascrollbar.hxx
 create mode 100644 sc/source/ui/vba/vbashape.cxx
 create mode 100644 sc/source/ui/vba/vbashape.hxx
 create mode 100644 sc/source/ui/vba/vbashaperange.cxx
 create mode 100644 sc/source/ui/vba/vbashaperange.hxx
 create mode 100644 sc/source/ui/vba/vbashapes.cxx
 create mode 100644 sc/source/ui/vba/vbashapes.hxx
 create mode 100644 sc/source/ui/vba/vbaspinbutton.cxx
 create mode 100644 sc/source/ui/vba/vbaspinbutton.hxx
 create mode 100644 sc/source/ui/vba/vbatextbox.cxx
 create mode 100644 sc/source/ui/vba/vbatextbox.hxx
 create mode 100644 sc/source/ui/vba/vbatogglebutton.cxx
 create mode 100644 sc/source/ui/vba/vbatogglebutton.hxx
 create mode 100644 sc/source/ui/vba/vbauserform.cxx
 create mode 100644 sc/source/ui/vba/vbauserform.hxx
 rewrite solenv/inc/_tg_srs.mk (70%)
 delete mode 100644 svtools/inc/docmspasswdrequest.hxx
 delete mode 100644 svtools/inc/docpasswdrequest.hxx
 delete mode 100644 svtools/source/misc1/docmspasswdrequest.cxx
 delete mode 100644 svtools/source/misc1/docpasswdrequest.cxx
 create mode 100755 svx/inc/svx/dbcharsethelper.hxx
 create mode 100755 svx/inc/svx/dbtoolsclient.hxx
 delete mode 100644 svx/source/inc/dbcharsethelper.hxx
 delete mode 100644 svx/source/inc/dbtoolsclient.hxx
 create mode 100644 sw/inc/ecmaflds.hxx
 rewrite testautomation/framework/required/input/mailmerge_data.odb (71%)
 rewrite testautomation/graphics/required/includes/impress/im_011_.inc (78%)
 create mode 100644 testtools/source/cliversioning/version_libs/version_3_1_1.dll
 create mode 100644 udkapi/com/sun/star/script/XAutomationInvocation.idl
 create mode 100644 vcl/inc/vcl/popupmenuwindow.hxx
 create mode 100644 vcl/source/window/popupmenuwindow.cxx
 create mode 100644 xmloff/inc/xmloff/ecmaflds.hxx
 create mode 100644 xmlscript/util/makefile.mk.patched

diff --git a/.tag b/.tag
index 858e5d365..d5e574e72 100644
--- a/.tag
+++ b/.tag
@@ -1 +1 @@
-dev300-m57
+dev300-m58
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index aea02be9c..84c702a70 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -72,6 +72,7 @@
 #include <accessibility/extended/accessibleeditbrowseboxcell.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
+#include "vcl/popupmenuwindow.hxx"
 
 #include <floatingwindowaccessible.hxx>
 
@@ -376,7 +377,17 @@ inline bool hasFloatingChild(Window *pWindow)
             }
             else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) ) 
             {
-                xContext = new FloatingWindowAccessible( _pXWindow );
+                PopupMenuFloatingWindow* pChild = dynamic_cast<PopupMenuFloatingWindow*>(
+                    pWindow->GetAccessibleChildWindow(0));
+                if ( pChild && pChild->IsPopupMenu() )
+                {
+                    // Get the accessible context from the child window.
+                    Reference<XAccessible> xAccessible = pChild->CreateAccessible();
+                    if (xAccessible.is())
+                        xContext = xAccessible->getAccessibleContext();
+                }
+                else
+                    xContext = new FloatingWindowAccessible( _pXWindow );
             }            
             else if ( nType == WINDOW_HELPTEXTWINDOW )
             {
diff --git a/applied_patches/0004-cws-koheidatapilot03-accessibility.diff b/applied_patches/0004-cws-koheidatapilot03-accessibility.diff
new file mode 100644
index 000000000..5b41a8dc6
--- /dev/null
+++ b/applied_patches/0004-cws-koheidatapilot03-accessibility.diff
@@ -0,0 +1,31 @@
+diff --git accessibility/source/helper/acc_factory.cxx accessibility/source/helper/acc_factory.cxx
+index aea02be..84c702a 100644
+--- accessibility/source/helper/acc_factory.cxx
++++ accessibility/source/helper/acc_factory.cxx
+@@ -72,6 +72,7 @@
+ #include <accessibility/extended/accessibleeditbrowseboxcell.hxx>
+ #include <vcl/lstbox.hxx>
+ #include <vcl/combobox.hxx>
++#include "vcl/popupmenuwindow.hxx"
+ 
+ #include <floatingwindowaccessible.hxx>
+ 
+@@ -376,7 +377,17 @@ inline bool hasFloatingChild(Window *pWindow)
+             }
+             else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) ) 
+             {
+-                xContext = new FloatingWindowAccessible( _pXWindow );
++                PopupMenuFloatingWindow* pChild = dynamic_cast<PopupMenuFloatingWindow*>(
++                    pWindow->GetAccessibleChildWindow(0));
++                if ( pChild && pChild->IsPopupMenu() )
++                {
++                    // Get the accessible context from the child window.
++                    Reference<XAccessible> xAccessible = pChild->CreateAccessible();
++                    if (xAccessible.is())
++                        xContext = xAccessible->getAccessibleContext();
++                }
++                else
++                    xContext = new FloatingWindowAccessible( _pXWindow );
+             }            
+             else if ( nType == WINDOW_HELPTEXTWINDOW )
+             {
diff --git a/applied_patches/0005-cws-koheidatapilot03-offapi.diff b/applied_patches/0005-cws-koheidatapilot03-offapi.diff
new file mode 100644
index 000000000..3f06e0d72
--- /dev/null
+++ b/applied_patches/0005-cws-koheidatapilot03-offapi.diff
@@ -0,0 +1,22 @@
+diff --git offapi/com/sun/star/sheet/MemberResultFlags.idl offapi/com/sun/star/sheet/MemberResultFlags.idl
+index 6660b38..23ba7b0 100644
+--- offapi/com/sun/star/sheet/MemberResultFlags.idl
++++ offapi/com/sun/star/sheet/MemberResultFlags.idl
+@@ -59,6 +59,17 @@ published constants MemberResultFlags
+      */
+     const long CONTINUE = 4;
+ 
++    //-------------------------------------------------------------------------
++
++    /** The element contains a grand total. 
++     */
++    const long GRANDTOTAL = 8;
++
++    //-------------------------------------------------------------------------
++
++    /** The element is a numeric value.
++     */
++    const long NUMERIC = 16;
+ };
+ 
+ //=============================================================================
diff --git a/applied_patches/0006-cws-koheidatapilot03-sc.diff b/applied_patches/0006-cws-koheidatapilot03-sc.diff
new file mode 100644
index 000000000..2427c76b9
--- /dev/null
+++ b/applied_patches/0006-cws-koheidatapilot03-sc.diff
@@ -0,0 +1,10450 @@
+diff --git sc/inc/AccessibleFilterMenu.hxx sc/inc/AccessibleFilterMenu.hxx
+new file mode 100644
+index 0000000..2495b4c
+--- /dev/null
++++ sc/inc/AccessibleFilterMenu.hxx
+@@ -0,0 +1,191 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: AccessibleDataPilotControl.hxx,v $
++ * $Revision: 1.6 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_ACCESSIBLEFILTERMENU_HXX
++#define SC_ACCESSIBLEFILTERMENU_HXX
++
++#include "AccessibleContextBase.hxx"
++#include "cppuhelper/implbase1.hxx"
++
++#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
++#include <com/sun/star/accessibility/XAccessibleText.hpp>
++#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
++#include <com/sun/star/accessibility/TextSegment.hpp>
++
++#include <vector>
++
++namespace com { namespace sun { namespace star {
++    namespace accessibility {
++        struct AccessibleEventObject;
++    }
++}}}
++
++class ScDocument;
++class ScMenuFloatingWindow;
++
++typedef ::cppu::ImplHelper1< 
++        ::com::sun::star::accessibility::XAccessibleSelection > ScAccessibleFilterMenu_BASE;
++
++class ScAccessibleFilterMenu : 
++    public ScAccessibleContextBase, 
++    public ScAccessibleFilterMenu_BASE
++{
++public:
++    explicit ScAccessibleFilterMenu(
++        const ::com::sun::star::uno::Reference<
++            ::com::sun::star::accessibility::XAccessible>& rxParent,
++            ScMenuFloatingWindow* pWin, const ::rtl::OUString& rName, size_t nMenuPos, ScDocument* pDoc);
++    virtual ~ScAccessibleFilterMenu();
++
++	// XAccessibleComponent
++
++    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
++		SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint )
++		    throw (::com::sun::star::uno::RuntimeException);
++
++    virtual sal_Bool SAL_CALL isVisible()
++		throw (::com::sun::star::uno::RuntimeException);
++
++    virtual void SAL_CALL grabFocus()
++		throw (::com::sun::star::uno::RuntimeException);
++
++    virtual sal_Int32 SAL_CALL getForeground() 
++        throw (::com::sun::star::uno::RuntimeException);
++
++    virtual sal_Int32 SAL_CALL getBackground() 
++        throw (::com::sun::star::uno::RuntimeException);
++
++	// XAccessibleContext
++
++	virtual ::rtl::OUString SAL_CALL getAccessibleName()
++        throw (::com::sun::star::uno::RuntimeException);
++
++    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
++        throw (::com::sun::star::uno::RuntimeException);
++
++    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
++    	getAccessibleChild(sal_Int32 nIndex)
++            throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
++
++	virtual ::com::sun::star::uno::Reference< 
++        ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
++    	getAccessibleStateSet()
++            throw (::com::sun::star::uno::RuntimeException);
++
++	virtual ::rtl::OUString SAL_CALL getImplementationName()
++        throw (::com::sun::star::uno::RuntimeException);
++
++    // XAccessibleEventBroadcaster
++
++	virtual void SAL_CALL
++    	addEventListener(
++        	const ::com::sun::star::uno::Reference<
++                ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
++        throw (com::sun::star::uno::RuntimeException);
++
++    //	Remove an existing event listener.
++	virtual void SAL_CALL
++    	removeEventListener(
++			const ::com::sun::star::uno::Reference<
++                ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
++        throw (com::sun::star::uno::RuntimeException);
++
++    // XAccessibleSelection
++
++    virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex) 
++        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
++
++    virtual sal_Bool SAL_CALL isAccessibleChildSelected(sal_Int32 nChildIndex) 
++        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
++
++    virtual void SAL_CALL clearAccessibleSelection() 
++        throw (::com::sun::star::uno::RuntimeException);
++
++    virtual void SAL_CALL selectAllAccessibleChildren() 
++        throw (::com::sun::star::uno::RuntimeException);
++
++    virtual ::sal_Int32 SAL_CALL getSelectedAccessibleChildCount() 
++        throw (::com::sun::star::uno::RuntimeException);
++
++    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL 
++        getSelectedAccessibleChild(sal_Int32 nChildIndex) 
++            throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
++
++    virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex) 
++        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
++
++    // XInterface
++
++	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( 
++		::com::sun::star::uno::Type const & rType ) 
++		    throw (::com::sun::star::uno::RuntimeException);
++
++	virtual void SAL_CALL acquire() throw ();
++	virtual void SAL_CALL release() throw ();
++
++    // XTypeProvider
++
++    virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
++        throw (::com::sun::star::uno::RuntimeException);
++
++    // non-UNO methods
++
++    void appendMenuItem(const ::rtl::OUString& rName, bool bEnabled, size_t nMenuPos);
++    void setMenuPos(size_t nMenuPos);
++    void setEnabled(bool bEnabled);
++
++protected:
++
++    sal_Int32 getMenuItemCount() const;
++
++	virtual Rectangle GetBoundingBoxOnScreen() const
++		throw (::com::sun::star::uno::RuntimeException);
++
++	virtual Rectangle GetBoundingBox() const
++		throw (::com::sun::star::uno::RuntimeException);
++
++private:
++    bool isSelected() const;
++    bool isFocused() const;
++
++    void updateStates();
++
++private:
++    ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > maMenuItems;
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet;
++
++    size_t mnMenuPos;
++    ScMenuFloatingWindow* mpWindow;
++    ScDocument* mpDoc;
++
++    bool mbEnabled:1;
++};
++
++#endif
+diff --git sc/inc/AccessibleFilterMenuItem.hxx sc/inc/AccessibleFilterMenuItem.hxx
+new file mode 100644
+index 0000000..b9a3485
+--- /dev/null
++++ sc/inc/AccessibleFilterMenuItem.hxx
+@@ -0,0 +1,124 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: AccessibleDataPilotControl.hxx,v $
++ * $Revision: 1.6 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_ACCESSIBLEFILTERMENUITEM_HXX
++#define SC_ACCESSIBLEFILTERMENUITEM_HXX
++
++#include "AccessibleContextBase.hxx"
++#include "cppuhelper/implbase1.hxx"
++
++#include <com/sun/star/accessibility/XAccessibleAction.hpp>
++
++class ScMenuFloatingWindow;
++
++typedef ::cppu::ImplHelper1<
++    ::com::sun::star::accessibility::XAccessibleAction > ScAccessibleFilterMenuItem_BASE;
++
++class ScAccessibleFilterMenuItem : 
++    public ScAccessibleContextBase,
++    public ScAccessibleFilterMenuItem_BASE
++{
++public:
++    explicit ScAccessibleFilterMenuItem(
++        const ::com::sun::star::uno::Reference<
++            ::com::sun::star::accessibility::XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const ::rtl::OUString& rName, size_t nMenuPos);
++
++    virtual ~ScAccessibleFilterMenuItem();
++
++	// XAccessibleContext
++
++    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
++        throw (::com::sun::star::uno::RuntimeException);
++
++    virtual ::com::sun::star::uno::Reference< 
++        ::com::sun::star::accessibility::XAccessible > SAL_CALL
++    	getAccessibleChild(sal_Int32 nIndex)
++            throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
++
++	virtual ::com::sun::star::uno::Reference< 
++        ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
++    	getAccessibleStateSet()
++            throw (::com::sun::star::uno::RuntimeException);
++
++	virtual ::rtl::OUString SAL_CALL getImplementationName()
++        throw (::com::sun::star::uno::RuntimeException);
++
++    // XAccessibleAction
++
++    virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() 
++        throw (::com::sun::star::uno::RuntimeException);
++
++    virtual ::sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex) 
++        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
++
++    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex) 
++        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
++
++    virtual ::com::sun::star::uno::Reference< 
++        ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL 
++        getAccessibleActionKeyBinding(sal_Int32 nIndex) 
++            throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
++
++    // XInterface
++
++	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( 
++		::com::sun::star::uno::Type const & rType ) 
++		    throw (::com::sun::star::uno::RuntimeException);
++
++	virtual void SAL_CALL acquire() throw ();
++	virtual void SAL_CALL release() throw ();
++
++    // Non-UNO Methods
++
++    void setEnabled(bool bEnabled);
++
++protected:
++
++	virtual Rectangle GetBoundingBoxOnScreen() const
++		throw (::com::sun::star::uno::RuntimeException);
++
++	virtual Rectangle GetBoundingBox() const
++		throw (::com::sun::star::uno::RuntimeException);
++
++private:
++    bool isSelected() const;
++    bool isFocused() const;
++    void updateStateSet();
++
++private:
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet;
++
++    ScMenuFloatingWindow* mpWindow;
++    ::rtl::OUString maName;
++    size_t mnMenuPos;
++    bool mbEnabled;
++};
++
++#endif
+diff --git sc/inc/AccessibleFilterTopWindow.hxx sc/inc/AccessibleFilterTopWindow.hxx
+new file mode 100644
+index 0000000..c13c494
+--- /dev/null
++++ sc/inc/AccessibleFilterTopWindow.hxx
+@@ -0,0 +1,104 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: AccessibleDataPilotControl.hxx,v $
++ * $Revision: 1.6 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_ACCESSIBLEFILTERTOPWINDOW_HXX
++#define SC_ACCESSIBLEFILTERTOPWINDOW_HXX
++
++//#include "AccessibleContextBase.hxx"
++#include "AccessibleFilterMenu.hxx"
++#include "cppuhelper/implbase1.hxx"
++
++class ScDPFieldPopupWindow;
++class ScDocument;
++
++class ScAccessibleFilterTopWindow : public ScAccessibleFilterMenu
++{
++public:
++    ScAccessibleFilterTopWindow(
++        const ::com::sun::star::uno::Reference<
++            ::com::sun::star::accessibility::XAccessible>& rxParent,
++            ScDPFieldPopupWindow* pWin, const ::rtl::OUString& rName, ScDocument* pDoc);
++    virtual ~ScAccessibleFilterTopWindow();
++
++	// XAccessibleContext
++
++    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
++        throw (::com::sun::star::uno::RuntimeException);
++
++    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
++    	getAccessibleChild(sal_Int32 nIndex)
++            throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
++
++	virtual ::rtl::OUString SAL_CALL getImplementationName()
++        throw (::com::sun::star::uno::RuntimeException);
++
++    // Non-UNO Methods
++
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
++        getAccessibleChildMenu();
++
++    enum ChildControlType {
++        LISTBOX, TOGGLE_ALL, SINGLE_ON_BTN, SINGLE_OFF_BTN, OK_BTN, CANCEL_BTN
++    };
++    void setAccessibleChild(
++        const ::com::sun::star::uno::Reference< 
++            ::com::sun::star::accessibility::XAccessible >& rAccessible,
++        ChildControlType eType);
++
++private:
++    /** The top menu part */
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
++        mxAccMenu;
++
++    /** check list box for field member visibility */
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
++        mxAccListBox;
++
++    /** check box for toggling all field member's visibility. */
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
++        mxAccToggleAll;
++
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
++        mxAccSingleOnBtn;
++
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
++        mxAccSingleOffBtn;
++
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
++        mxAccOkBtn;
++
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
++        mxAccCancelBtn;
++
++    ScDPFieldPopupWindow* mpWindow;
++    ScDocument* mpDoc;
++};
++
++#endif
+diff --git sc/inc/AccessibleGlobal.hxx sc/inc/AccessibleGlobal.hxx
+new file mode 100644
+index 0000000..5e75bf4
+--- /dev/null
++++ sc/inc/AccessibleGlobal.hxx
+@@ -0,0 +1,72 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: AccessibleDataPilotControl.hxx,v $
++ * $Revision: 1.6 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_ACCESSIBLEGLOBAL_HXX
++#define SC_ACCESSIBLEGLOBAL_HXX
++
++#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
++#include "cppuhelper/implbase1.hxx"
++
++#include <set>
++
++/** 
++ * Generic XAccessibleStateSet implementation.
++ */
++class ScAccessibleStateSet : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleStateSet >
++{
++public:
++    ScAccessibleStateSet();
++    virtual ~ScAccessibleStateSet();
++
++    // XAccessibleStateSet
++
++    virtual ::sal_Bool SAL_CALL isEmpty() 
++        throw (::com::sun::star::uno::RuntimeException);
++
++    virtual ::sal_Bool SAL_CALL contains(sal_Int16 nState) 
++        throw (::com::sun::star::uno::RuntimeException);
++
++    virtual ::sal_Bool SAL_CALL containsAll(
++        const ::com::sun::star::uno::Sequence<sal_Int16>& aStateSet) 
++            throw (::com::sun::star::uno::RuntimeException);
++
++    virtual ::com::sun::star::uno::Sequence<sal_Int16> SAL_CALL getStates() 
++        throw (::com::sun::star::uno::RuntimeException);
++
++    // Non-UNO Methods
++
++    void insert(sal_Int16 nState);
++    void clear();
++
++private:
++    ::std::set<sal_Int16> maStates;
++};
++
++#endif
+diff --git sc/inc/attrib.hxx sc/inc/attrib.hxx
+index 72a4769..25caeb1 100644
+--- sc/inc/attrib.hxx
++++ sc/inc/attrib.hxx
+@@ -42,13 +42,16 @@
+ 
+                                         // Flags fuer durch Merge verdeckte Zellen
+                                         // und Control fuer Auto-Filter
+-#define SC_MF_HOR				1
+-#define SC_MF_VER				2
+-#define SC_MF_AUTO				4
+-#define SC_MF_BUTTON			8
+-#define SC_MF_SCENARIO			16
++#define SC_MF_HOR               0x0001
++#define SC_MF_VER               0x0002
++#define SC_MF_AUTO              0x0004  /// autofilter arrow
++#define SC_MF_BUTTON            0x0008  /// field button for datapilot
++#define SC_MF_SCENARIO          0x0010
++#define SC_MF_BUTTON_POPUP      0x0020  /// dp button with popup arrow
++#define SC_MF_HIDDEN_MEMBER     0x0040  /// dp field button with presence of hidden member 
++#define SC_MF_DP_TABLE          0x0080  /// dp table output
+ 
+-#define SC_MF_ALL				31
++#define SC_MF_ALL               0x00FF
+ 
+ 
+ class EditTextObject;
+@@ -103,6 +106,7 @@ public:
+ 
+     BOOL	HasAutoFilter() const		{ return ( GetValue() & SC_MF_AUTO ) != 0; }
+     BOOL	HasButton() const			{ return ( GetValue() & SC_MF_BUTTON ) != 0; }
++    bool    HasDPTable() const          { return ( GetValue() & SC_MF_DP_TABLE ) != 0; }
+ 
+     BOOL	IsScenario() const			{ return ( GetValue() & SC_MF_SCENARIO ) != 0; }
+ };
+diff --git sc/inc/column.hxx sc/inc/column.hxx
+index fd2473b..ec87323 100644
+--- sc/inc/column.hxx
++++ sc/inc/column.hxx
+@@ -162,7 +162,7 @@ public:
+     SCSIZE	    GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const;
+     BOOL		HasDataAt(SCROW nRow) const;
+     BOOL		HasVisibleDataAt(SCROW nRow) const;
+-//UNUSED2009-05 SCROW		GetFirstDataPos() const;
++    SCROW		GetFirstDataPos() const;
+     SCROW		GetLastDataPos() const;
+     SCROW		GetLastVisDataPos(BOOL bNotes) const;				// ohne Broadcaster
+     SCROW		GetFirstVisDataPos(BOOL bNotes) const;
+diff --git sc/inc/document.hxx sc/inc/document.hxx
+index f0f9189..14d606e 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -859,6 +859,8 @@ public:
+ 
+     USHORT			GetErrCode( const ScAddress& ) const;
+ 
++    bool            ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow) const;
++
+     void			GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
+                                     SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld );
+     SC_DLLPUBLIC BOOL			GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
+diff --git sc/inc/dpgroup.hxx sc/inc/dpgroup.hxx
+index f81ff66..07be632 100644
+--- sc/inc/dpgroup.hxx
++++ sc/inc/dpgroup.hxx
+@@ -33,6 +33,7 @@
+ 
+ #include <vector>
+ #include <hash_set>
++#include <boost/shared_ptr.hpp>
+ 
+ #include "dptabdat.hxx"
+ #include "scdllapi.h"
+@@ -182,7 +183,7 @@ class ScDPGroupTableData : public ScDPTableData
+ {
+     typedef ::std::hash_set< ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > StringHashSet;
+ 
+-    ScDPTableData*          pSourceData;
++    ::boost::shared_ptr<ScDPTableData> pSourceData;
+     long                    nSourceCount;
+     ScDPGroupDimensionVec   aGroups;
+     ScDPNumGroupDimension*  pNumGroups;     // array[nSourceCount]
+@@ -200,7 +201,7 @@ class ScDPGroupTableData : public ScDPTableData
+ 
+ public:
+                 // takes ownership of pSource
+-                ScDPGroupTableData( ScDPTableData* pSource, ScDocument* pDocument );
++                ScDPGroupTableData( const ::boost::shared_ptr<ScDPTableData>& pSource, ScDocument* pDocument );
+     virtual     ~ScDPGroupTableData();
+ 
+     void        AddGroupDimension( const ScDPGroupDimension& rGroup );
+diff --git sc/inc/dpobject.hxx sc/inc/dpobject.hxx
+index e968007..d7fbbfe 100644
+--- sc/inc/dpobject.hxx
++++ sc/inc/dpobject.hxx
+@@ -36,8 +36,11 @@
+ #include "address.hxx"
+ #include "collect.hxx"
+ #include "dpoutput.hxx"
++#include "pivot.hxx"
+ #include <com/sun/star/sheet/XDimensionsSupplier.hpp>
+ 
++#include <boost/shared_ptr.hpp>
++
+ //------------------------------------------------------------------
+ 
+ namespace com { namespace sun { namespace star { namespace sheet {
+@@ -64,6 +67,7 @@ class ScStrCollection;
+ class TypedScStrCollection;
+ struct PivotField;
+ class ScDPCacheTable;
++class ScDPTableData;
+ 
+ struct ScDPServiceDesc
+ {
+@@ -99,15 +103,19 @@ private:
+     ScSheetSourceDesc*		pSheetDesc;		//	for sheet data
+     ScImportSourceDesc* 	pImpDesc;		//	for database data
+     ScDPServiceDesc*		pServDesc;		//	for external service
++    ::boost::shared_ptr<ScDPTableData>  mpTableData;
+                                             // cached data
+     com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> xSource;
+     ScDPOutput*				pOutput;
+     BOOL					bSettingsChanged;
+     BOOL					bAlive;			// FALSE if only used to hold settings
++    sal_uInt16              mnAutoFormatIndex;
+     BOOL					bAllowMove;
+     long					nHeaderRows;	// page fields plus filter button
++    bool                    mbHeaderLayout;  // TRUE : grid, FALSE : standard
+ 
+ 
++    SC_DLLPRIVATE ScDPTableData*    GetTableData();
+     SC_DLLPRIVATE void				CreateObjects();
+     SC_DLLPRIVATE void				CreateOutput();
+ 
+@@ -135,6 +143,12 @@ public:
+     void				SetOutRange(const ScRange& rRange);
+     const ScRange&		GetOutRange() const		{ return aOutRange; }
+ 
++    void                SetAutoFormatIndex (const sal_uInt16 nIndex);
++    sal_uInt16          GetAutoFormatIndex() const; 
++
++    void                SetHeaderLayout(bool bUseGrid);
++    bool                GetHeaderLayout() const;
++
+     void				SetSheetDesc(const ScSheetSourceDesc& rDesc);
+     void				SetImportDesc(const ScImportSourceDesc& rDesc);
+     void				SetServiceData(const ScDPServiceDesc& rDesc);
+@@ -157,7 +171,14 @@ public:
+     void				SetTag(const String& rNew);
+     const String&		GetTag() const					{ return aTableTag; }
+ 
+-    BOOL				IsDimNameInUse( const String& rName ) const;
++    /** 
++     *  Data description cell displays the description of a data dimension if
++     *  and only if there is only one data dimension.  It's usually located at
++     *  the upper-left corner of the table output.
++     */
++    bool                IsDataDescriptionCell(const ScAddress& rPos);
++
++    bool                IsDimNameInUse(const ::rtl::OUString& rName) const;
+     String				GetDimName( long nDim, BOOL& rIsDataLayout );
+     BOOL                IsDuplicated( long nDim );
+     long                GetDimCount();
+@@ -190,16 +211,10 @@ public:
+     sal_Int32           GetUsedHierarchy( sal_Int32 nDim );
+ 
+     BOOL                GetMembersNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
+-    BOOL                GetMembers( sal_Int32 nDim,
+-                            com::sun::star::uno::Sequence< rtl::OUString >& rMembers,
+-                            com::sun::star::uno::Sequence< sal_Bool >* pVisible = 0,
+-                            com::sun::star::uno::Sequence< sal_Bool >* pShowDet = 0 );
+-
+     BOOL                GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
+-    BOOL                GetMembers( sal_Int32 nDim, sal_Int32 nHier,
+-                            com::sun::star::uno::Sequence< rtl::OUString >& rMembers,
+-                            com::sun::star::uno::Sequence< sal_Bool >* pVisible = 0,
+-                            com::sun::star::uno::Sequence< sal_Bool >* pShowDet = 0 );
++
++    bool                GetMemberNames( sal_Int32 nDim, ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames );
++    bool                GetMembers( sal_Int32 nDim, sal_Int32 nHier, ::std::vector<ScDPLabelData::Member>& rMembers );
+ 
+     void				UpdateReference( UpdateRefMode eUpdateRefMode,
+                                          const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+@@ -221,6 +236,8 @@ public:
+     // (button attribute must be present)
+     void				RefreshAfterLoad();
+ 
++    void                BuildAllDimensionMembers();
++
+     static BOOL			HasRegisteredSources();
+     static com::sun::star::uno::Sequence<rtl::OUString> GetRegisteredSources();
+     static com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier>
+@@ -291,6 +308,11 @@ public:
+ 
+     ScSimpleSharedString& GetSharedString();
+ 
++    void FreeTable(ScDPObject* pDPObj);
++    SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj);
++
++    bool        HasDPTable(SCCOL nCol, SCROW nRow, SCTAB nTab) const;
++
+     ScDPCacheCell* getCacheCellFromPool(const ScDPCacheCell& rCell);
+     void clearCacheCellPool();
+ };
+diff --git sc/inc/dpoutput.hxx sc/inc/dpoutput.hxx
+index 4a071de..c28f901 100644
+--- sc/inc/dpoutput.hxx
++++ sc/inc/dpoutput.hxx
+@@ -94,6 +94,7 @@ private:
+         com::sun::star::uno::Sequence<
+             com::sun::star::sheet::DataResult> > aData;
+     BOOL					bResultsError;
++    bool                    mbHasDataLayout;
+     String					aDataDescription;
+ 
+     // Number format related parameters
+@@ -109,6 +110,7 @@ private:
+     long					nColCount;
+     long					nRowCount;
+     long					nHeaderSize;
++    bool                    mbHeaderLayout;  // TRUE : grid, FALSE : standard
+     SCCOL					nTabStartCol;
+     SCROW					nTabStartRow;
+     SCCOL					nMemberStartCol;
+@@ -123,8 +125,8 @@ private:
+     void			HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
+                                 const com::sun::star::sheet::MemberResult& rData,
+                                 BOOL bColHeader, long nLevel );
+-    void			FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption,
+-                                BOOL bFrame = TRUE );
++    void            FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, 
++                               bool bInTable, bool bPopup, bool bHasHiddenMember );
+     void			CalcSizes();
+ 
+     /** Query which sub-area of the table the cell is in. See
+@@ -162,6 +164,9 @@ public:
+ 
+     void            GetMemberResultNames( ScStrCollection& rNames, long nDimension );
+ 
++    void            SetHeaderLayout(bool bUseGrid);
++    bool            GetHeaderLayout() const;
++
+     static void     GetDataDimensionNames( String& rSourceName, String& rGivenName,
+                                            const com::sun::star::uno::Reference<
+                                                com::sun::star::uno::XInterface>& xDim );
+diff --git sc/inc/dpoutputgeometry.hxx sc/inc/dpoutputgeometry.hxx
+new file mode 100644
+index 0000000..d423d18
+--- /dev/null
++++ sc/inc/dpoutputgeometry.hxx
+@@ -0,0 +1,80 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: xmldpimp.cxx,v $
++ * $Revision: 1.27.134.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_DPOUTPUTGEOMETRY_HXX
++#define SC_DPOUTPUTGEOMETRY_HXX
++
++#include "address.hxx"
++#include <vector>
++
++class ScAddress;
++
++class SC_DLLPUBLIC ScDPOutputGeometry
++{
++public:
++    enum FieldType { Column, Row, Page, Data, None };
++    enum ImportType { ODF, XLS };
++
++    ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter, ImportType eImportType);
++    ~ScDPOutputGeometry();
++
++    /** 
++     * @param nCount number of row fields, <b>excluding the data layout 
++     *               field if exists</b>.
++     */
++    void setRowFieldCount(sal_uInt32 nCount);
++    void setColumnFieldCount(sal_uInt32 nCount);
++    void setPageFieldCount(sal_uInt32 nCount);
++    void setDataFieldCount(sal_uInt32 nCount);
++
++    void getColumnFieldPositions(::std::vector<ScAddress>& rAddrs) const;
++    void getRowFieldPositions(::std::vector<ScAddress>& rAddrs) const;
++    void getPageFieldPositions(::std::vector<ScAddress>& rAddrs) const;
++
++    SCROW getRowFieldHeaderRow() const;
++
++    FieldType getFieldButtonType(const ScAddress& rPos) const;
++
++private:
++    ScDPOutputGeometry(); // disabled
++
++private:
++    ScRange     maOutRange;
++    sal_uInt32  mnRowFields;    /// number of row fields (data layout field NOT included!)
++    sal_uInt32  mnColumnFields;
++    sal_uInt32  mnPageFields;
++    sal_uInt32  mnDataFields;
++
++    ImportType  meImportType;
++
++    bool        mbShowFilter;
++};
++
++#endif
+diff --git sc/inc/dpsave.hxx sc/inc/dpsave.hxx
+index 11ed5d7..0f9c6fe 100644
+--- sc/inc/dpsave.hxx
++++ sc/inc/dpsave.hxx
+@@ -34,9 +34,11 @@
+ #include <tools/string.hxx>
+ #include <tools/list.hxx>
+ #include <com/sun/star/sheet/XDimensionsSupplier.hpp>
++#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+ #include "scdllapi.h"
+ #include <hash_map>
+ #include <list>
++#include <memory>
+ 
+ namespace com { namespace sun { namespace star { namespace sheet {
+     struct DataPilotFieldReference;
+@@ -46,6 +48,7 @@ namespace com { namespace sun { namespace star { namespace sheet {
+ } } } }
+ 
+ class ScDPDimensionSaveData;
++class ScDPTableData;
+ 
+ // --------------------------------------------------------------------
+ //
+@@ -57,6 +60,7 @@ class ScDPSaveMember
+ {
+ private:
+     String		aName;
++    ::std::auto_ptr<rtl::OUString> mpLayoutName; // custom name to be displayed in the table.
+     USHORT		nVisibleMode;
+     USHORT		nShowDetailsMode;
+ 
+@@ -77,18 +81,23 @@ public:
+ 
+     void                    SetName( const String& rNew );  // used if the source member was renamed (groups)
+ 
++    SC_DLLPUBLIC void                    SetLayoutName( const ::rtl::OUString& rName );
++    SC_DLLPUBLIC const ::rtl::OUString*  GetLayoutName() const;
++    void                    RemoveLayoutName();
++
+     void					WriteToSource( const com::sun::star::uno::Reference<
+                                             com::sun::star::uno::XInterface>& xMember,
+                                             sal_Int32 nPosition );
+ };
+ 
+ 
+-class ScDPSaveDimension
++class SC_DLLPUBLIC ScDPSaveDimension
+ {
+ private:
+     String		aName;
+-    String*		pLayoutName;		// alternative name for layout, not used (yet)
+     String*		pSelectedPage;
++    ::std::auto_ptr<rtl::OUString> mpLayoutName;
++    ::std::auto_ptr<rtl::OUString> mpSubtotalName;
+     BOOL		bIsDataLayout;
+     BOOL		bDupFlag;
+     USHORT		nOrientation;
+@@ -127,43 +136,52 @@ public:
+ 
+     void                    SetName( const String& rNew );  // used if the source dim was renamed (groups)
+ 
+-    SC_DLLPUBLIC void					SetOrientation(USHORT nNew);
+-    SC_DLLPUBLIC void					SetSubTotals(long nCount, const USHORT* pFuncs);
++    void					SetOrientation(USHORT nNew);
++    void					SetSubTotals(long nCount, const USHORT* pFuncs);
+     long                    GetSubTotalsCount() const { return nSubTotalCount; }
+     USHORT                  GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; }
+-    SC_DLLPUBLIC void					SetShowEmpty(BOOL bSet);
++    void					SetShowEmpty(BOOL bSet);
+     BOOL                    GetShowEmpty() const { return BOOL(nShowEmptyMode); }
+-    SC_DLLPUBLIC void					SetFunction(USHORT nNew);		// enum GeneralFunction
++    void					SetFunction(USHORT nNew);		// enum GeneralFunction
+     USHORT                  GetFunction() const { return nFunction; }
+     void					SetUsedHierarchy(long nNew);
+     long                    GetUsedHierarchy() const { return nUsedHierarchy; }
+-    SC_DLLPUBLIC void					SetLayoutName(const String* pName);
+-    SC_DLLPUBLIC const String&			GetLayoutName() const;
+-    SC_DLLPUBLIC BOOL					HasLayoutName() const;
++
++    void                    SetLayoutName(const ::rtl::OUString& rName);
++    const ::rtl::OUString*  GetLayoutName() const;
++    void                    RemoveLayoutName();
++    void                    SetSubtotalName(const ::rtl::OUString& rName);
++    const ::rtl::OUString*  GetSubtotalName() const;
++
++    bool                    IsMemberNameInUse(const ::rtl::OUString& rName) const;
+ 
+     const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const	{ return pReferenceValue; }
+-    SC_DLLPUBLIC void					SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
++    void					SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
+ 
+     const ::com::sun::star::sheet::DataPilotFieldSortInfo* GetSortInfo() const          { return pSortInfo; }
+-    SC_DLLPUBLIC void                    SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew);
++    void                    SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew);
+     const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* GetAutoShowInfo() const  { return pAutoShowInfo; }
+-    SC_DLLPUBLIC void                    SetAutoShowInfo(const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pNew);
++    void                    SetAutoShowInfo(const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pNew);
+     const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* GetLayoutInfo() const      { return pLayoutInfo; }
+-    SC_DLLPUBLIC void                    SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew);
++    void                    SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew);
+ 
+-    SC_DLLPUBLIC void					SetCurrentPage( const String* pPage );		// NULL = no selection (all)
+-    SC_DLLPUBLIC BOOL					HasCurrentPage() const;
+-    SC_DLLPUBLIC const String&			GetCurrentPage() const;
++    void					SetCurrentPage( const String* pPage );		// NULL = no selection (all)
++    BOOL					HasCurrentPage() const;
++    const String&			GetCurrentPage() const;
+ 
+     USHORT					GetOrientation() const	{ return nOrientation; }
+ 
+     ScDPSaveMember* 		GetExistingMemberByName(const String& rName);
+-    SC_DLLPUBLIC ScDPSaveMember*			GetMemberByName(const String& rName);
++    ScDPSaveMember*			GetMemberByName(const String& rName);
+ 
+     void                    SetMemberPosition( const String& rName, sal_Int32 nNewPos );
+ 
+     void					WriteToSource( const com::sun::star::uno::Reference<
+                                             com::sun::star::uno::XInterface>& xDim );
++
++    void                    UpdateMemberVisibility(const ::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rData);
++
++    bool                    HasInvisibleMember() const;
+ };
+ 
+ 
+@@ -179,6 +197,12 @@ private:
+     BOOL        bFilterButton;      // not passed to DataPilotSource
+     BOOL        bDrillDown;         // not passed to DataPilotSource
+ 
++    /** if true, all dimensions already have all of their member instances
++     *  created. */
++    bool        mbDimensionMembersBuilt; 
++
++    ::std::auto_ptr<rtl::OUString> mpGrandTotalName;
++
+ public:
+     SC_DLLPUBLIC						ScDPSaveData();
+                             ScDPSaveData(const ScDPSaveData& r);
+@@ -188,21 +212,26 @@ public:
+ 
+     BOOL		 			operator== ( const ScDPSaveData& r ) const;
+ 
++    SC_DLLPUBLIC void                    SetGrandTotalName(const ::rtl::OUString& rName);
++    SC_DLLPUBLIC const ::rtl::OUString*  GetGrandTotalName() const;
++
+     const List&				GetDimensions() const { return aDimList; }
+     void					AddDimension(ScDPSaveDimension* pDim) { aDimList.Insert(pDim, LIST_APPEND); }
+ 
+     ScDPSaveDimension*		GetDimensionByName(const String& rName);
+     SC_DLLPUBLIC ScDPSaveDimension*		GetDataLayoutDimension();
++    SC_DLLPUBLIC ScDPSaveDimension*      GetExistingDataLayoutDimension() const;
+ 
+     ScDPSaveDimension*		DuplicateDimension(const String& rName);
+     SC_DLLPUBLIC ScDPSaveDimension&      DuplicateDimension(const ScDPSaveDimension& rDim);
+ 
+-    SC_DLLPUBLIC ScDPSaveDimension*		GetExistingDimensionByName(const String& rName);
++    SC_DLLPUBLIC ScDPSaveDimension*		GetExistingDimensionByName(const String& rName) const;
+     SC_DLLPUBLIC ScDPSaveDimension*		GetNewDimensionByName(const String& rName);
+ 
+     void                    RemoveDimensionByName(const String& rName);
+ 
+     ScDPSaveDimension*      GetInnermostDimension(USHORT nOrientation);
++    ScDPSaveDimension*      GetFirstDimension(::com::sun::star::sheet::DataPilotFieldOrientation eOrientation);
+     long                    GetDataDimensionCount() const;
+ 
+ 
+@@ -229,6 +258,14 @@ public:
+     const ScDPDimensionSaveData* GetExistingDimensionData() const   { return pDimensionData; }
+     SC_DLLPUBLIC ScDPDimensionSaveData*  GetDimensionData();     // create if not there
+     void                    SetDimensionData( const ScDPDimensionSaveData* pNew );      // copied
++    void                    BuildAllDimensionMembers(ScDPTableData* pData);
++
++    /** 
++     * Check whether a dimension has one or more invisible members.
++     *
++     * @param rDimName dimension name
++     */
++    SC_DLLPUBLIC bool       HasInvisibleMember(const ::rtl::OUString& rDimName) const;
+ };
+ 
+ 
+diff --git sc/inc/dptabres.hxx sc/inc/dptabres.hxx
+index 0712cc9..4e05c19 100644
+--- sc/inc/dptabres.hxx
++++ sc/inc/dptabres.hxx
+@@ -41,6 +41,7 @@
+ #include <hash_map>
+ #include <hash_set>
+ #include <vector>
++#include <memory>
+ 
+ namespace com { namespace sun { namespace star { namespace sheet {
+     struct DataPilotFieldReference;
+@@ -262,7 +263,7 @@ public:
+ 
+     long				GetMeasureCount() const		{ return nMeasCount; }
+     ScSubTotalFunc		GetMeasureFunction(long nMeasure) const;
+-    String				GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc) const;
++    String              GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const;
+     String				GetMeasureDimensionName(long nMeasure) const;
+     const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const;
+     USHORT				GetMeasureRefOrient(long nMeasure) const;
+@@ -284,6 +285,8 @@ public:
+                                     const ScDPItemData& rBaseData, long nBaseIndex ) const;
+     BOOL                HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
+                                           const ScDPItemData& rSecondData, long nSecondIndex ) const;
++
++    const ScDPSource*   GetSource() const;
+ };
+ 
+ 
+diff --git sc/inc/dptabsrc.hxx sc/inc/dptabsrc.hxx
+index 670f314..deb0498 100644
+--- sc/inc/dptabsrc.hxx
++++ sc/inc/dptabsrc.hxx
+@@ -33,6 +33,7 @@
+ 
+ #include <vector>
+ #include <hash_map>
++#include <memory>
+ #include <tools/string.hxx>
+ #include <tools/list.hxx>
+ #include "global.hxx"		// enum ScSubTotalFunc
+@@ -108,7 +109,7 @@ class ScDPSource : public cppu::WeakImplHelper6<
+                             com::sun::star::lang::XServiceInfo >
+ {
+ private:
+-    ScDPTableData*			pData;				// data source
++	ScDPTableData*			pData;				// data source (ScDPObject manages its life time)
+     ScDPDimensions*			pDimensions;		// api objects
+                                                 // settings:
+     long					nColDims[SC_DAPI_MAXFIELDS];
+@@ -136,6 +137,8 @@ private:
+     List					aRowLevelList;
+     BOOL					bResultOverflow;
+ 
++    ::std::auto_ptr<rtl::OUString> mpGrandTotalName;
++
+     void					CreateRes_Impl();
+     void					FillMemberResults();
+     void					FillLevelList( USHORT nOrientation, List& rList );
+@@ -162,11 +165,15 @@ public:
+     ScDPTableData*			GetData()		{ return pData; }
+     const ScDPTableData*	GetData() const	{ return pData; }
+ 
++    void                    SetGrandTotalName(const ::rtl::OUString& rName);
++    const ::rtl::OUString*  GetGrandTotalName() const;
++
+     USHORT					GetOrientation(long nColumn);
+     void					SetOrientation(long nColumn, USHORT nNew);
+     long					GetPosition(long nColumn);
+ 
+     long					GetDataDimensionCount();
++    ScDPDimension*          GetDataDimension(long nIndex);
+     String					GetDataDimName(long nIndex);
+     BOOL					IsDataLayoutDimension(long nDim);
+     USHORT					GetDataLayoutOrientation();
+@@ -333,12 +340,15 @@ private:
+     long				nUsedHier;
+     USHORT				nFunction;			// enum GeneralFunction
+     String				aName;				// if empty, take from source
++    ::std::auto_ptr<rtl::OUString> mpLayoutName;
++    ::std::auto_ptr<rtl::OUString> mpSubtotalName;
+     long				nSourceDim;			// >=0 if dup'ed
+     ::com::sun::star::sheet::DataPilotFieldReference
+                         aReferenceValue;    // settings for "show data as" / "displayed value"
+     BOOL				bHasSelectedPage;
+     String				aSelectedPage;
+     ScDPItemData*		pSelectedData;		// internal, temporary, created from aSelectedPage
++    sal_Bool            mbHasHiddenMember;
+ 
+ public:
+                             ScDPDimension( ScDPSource* pSrc, long nD );
+@@ -350,6 +360,9 @@ public:
+     ScDPDimension*			CreateCloneObject();
+     ScDPHierarchies*		GetHierarchiesObject();
+ 
++    SC_DLLPUBLIC const ::rtl::OUString*  GetLayoutName() const;
++    const ::rtl::OUString*  GetSubtotalName() const;
++
+                             // XNamed
+     virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
+     virtual void SAL_CALL	setName( const ::rtl::OUString& aName )
+@@ -736,7 +749,7 @@ private:
+     long			nLev;
+ 
+     ScDPItemData	maData;
+-//	String			aCaption;			// visible name (changeable by user)
++    ::std::auto_ptr<rtl::OUString> mpLayoutName;
+ 
+     sal_Int32       nPosition;          // manual sorting
+     BOOL			bVisible;
+@@ -750,6 +763,7 @@ public:
+     BOOL					IsNamedItem( const ScDPItemData& r ) const;
+     String					GetNameStr() const;
+     void					FillItemData( ScDPItemData& rData ) const;
++    SC_DLLPUBLIC const ::rtl::OUString*  GetLayoutName() const;
+ 
+     sal_Int32               Compare( const ScDPMember& rOther ) const;      // visible order
+ 
+diff --git sc/inc/fillinfo.hxx sc/inc/fillinfo.hxx
+index a75f3c1..4d97133 100644
+--- sc/inc/fillinfo.hxx
++++ sc/inc/fillinfo.hxx
+@@ -99,6 +99,8 @@ struct CellInfo
+     BOOL                        bVOverlapped : 1;
+     BOOL                        bAutoFilter : 1;
+     BOOL                        bPushButton : 1;
++    bool                        bPopupButton: 1;
++    bool                        bFilterActive:1;
+ 
+     BOOL                        bPrinted : 1;               // bei Bedarf (Pagebreak-Modus)
+ 
+diff --git sc/inc/global.hxx sc/inc/global.hxx
+index 3e31be4..e207691 100644
+--- sc/inc/global.hxx
++++ sc/inc/global.hxx
+@@ -87,8 +87,6 @@ extern "C" {
+ #endif
+ 
+ //------------------------------------------------------------------------
+-struct LabelData;
+-//------------------------------------------------------------------------
+ 
+ //	die 1000 Namen des Calc...
+ //	Clipboard-Namen sind jetzt in so3/soapp.hxx
+diff --git sc/inc/miscuno.hxx sc/inc/miscuno.hxx
+index 3402f5a..7ce4c90 100644
+--- sc/inc/miscuno.hxx
++++ sc/inc/miscuno.hxx
+@@ -285,12 +285,29 @@ public:
+     static sal_Int32		GetEnumProperty( const com::sun::star::uno::Reference<
+                                                 com::sun::star::beans::XPropertySet>& xProp,
+                                             const ::rtl::OUString& rName, long nDefault );
++    static ::rtl::OUString  GetStringProperty(
++        const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xProp,
++        const ::rtl::OUString& rName, const ::rtl::OUString& rDefault );
+ 
+     static sal_Bool			GetBoolFromAny( const com::sun::star::uno::Any& aAny );
+     static sal_Int16		GetInt16FromAny( const com::sun::star::uno::Any& aAny );
+     static sal_Int32		GetInt32FromAny( const com::sun::star::uno::Any& aAny );
+     static sal_Int32		GetEnumFromAny( const com::sun::star::uno::Any& aAny );
+     static void				SetBoolInAny( com::sun::star::uno::Any& rAny, sal_Bool bValue );
++
++    static void             SetOptionalPropertyValue(
++        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rPropSet,
++        const sal_Char* pPropName, const ::com::sun::star::uno::Any& rVal );
++
++    template<typename ValueType>
++    static void             SetOptionalPropertyValue(
++        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rPropSet,
++        const sal_Char* pPropName, const ValueType& rVal )
++    {
++        ::com::sun::star::uno::Any any;
++        any <<= rVal;
++        SetOptionalPropertyValue(rPropSet, pPropName, any);
++    }
+ };
+ 
+ 
+diff --git sc/inc/pivot.hxx sc/inc/pivot.hxx
+index d1b0fb9..680da7d 100644
+--- sc/inc/pivot.hxx
++++ sc/inc/pivot.hxx
+@@ -53,6 +53,7 @@
+ #include "address.hxx"
+ 
+ #include <vector>
++#include <boost/shared_ptr.hpp>
+ 
+ class SubTotal;
+ #include "collect.hxx"
+@@ -69,7 +70,9 @@ class SvStream;
+ class ScDocument;
+ class ScUserListData;
+ class ScProgress;
+-struct LabelData;
++struct ScDPLabelData;
++
++typedef ::boost::shared_ptr<ScDPLabelData> ScDPLabelDataRef;
+ 
+ // -----------------------------------------------------------------------
+ 
+@@ -93,8 +96,7 @@ struct ScPivotParam
+     SCCOL           nCol;           // Cursor Position /
+     SCROW           nRow;           // bzw. Anfang des Zielbereiches
+     SCTAB           nTab;
+-    LabelData**     ppLabelArr;
+-    SCSIZE          nLabels;
++    ::std::vector<ScDPLabelDataRef> maLabelArray;
+     PivotField      aPageArr[PIVOT_MAXPAGEFIELD];
+     PivotField      aColArr[PIVOT_MAXFIELD];
+     PivotField      aRowArr[PIVOT_MAXFIELD];
+@@ -115,10 +117,8 @@ struct ScPivotParam
+     ScPivotParam&   operator=       ( const ScPivotParam& r );
+     BOOL            operator==      ( const ScPivotParam& r ) const;
+ //UNUSED2009-05 void            Clear           ();
+-    void            ClearLabelData  ();
+     void            ClearPivotArrays();
+-    void            SetLabelData    ( LabelData**   ppLabArr,
+-                                      SCSIZE        nLab );
++    void            SetLabelData    (const ::std::vector<ScDPLabelDataRef>& r);
+     void            SetPivotArrays  ( const PivotField* pPageArr,
+                                       const PivotField* pColArr,
+                                       const PivotField* pRowArr,
+@@ -136,24 +136,45 @@ typedef PivotField          PivotPageFieldArr[PIVOT_MAXPAGEFIELD];
+ 
+ //------------------------------------------------------------------------
+ 
+-struct LabelData
++struct ScDPLabelData
+ {
+-    String              maName;         /// Visible name of the dimension.
++    ::rtl::OUString     maName;         /// Original name of the dimension.
++    ::rtl::OUString     maLayoutName;   /// Layout name (display name)
+     SCsCOL              mnCol;
+     USHORT              mnFuncMask;     /// Page/Column/Row subtotal function.
+     sal_Int32           mnUsedHier;     /// Used hierarchy.
+     bool                mbShowAll;      /// true = Show all (also empty) results.
+     bool                mbIsValue;      /// true = Sum or count in data field.
+ 
++    struct Member
++    {
++        ::rtl::OUString maName;
++        ::rtl::OUString maLayoutName;
++        bool mbVisible;
++        bool mbShowDetails;
++
++        Member();
++
++        /** 
++         * return the name that should be displayed in the dp dialogs i.e. 
++         * when the layout name is present, use it, or else use the original 
++         * name. 
++         */ 
++        ::rtl::OUString SC_DLLPUBLIC getDisplayName() const;
++    };
++    ::std::vector<Member>                               maMembers;
+     ::com::sun::star::uno::Sequence< ::rtl::OUString >  maHiers;        /// Hierarchies.
+-    ::com::sun::star::uno::Sequence< ::rtl::OUString >  maMembers;      /// Members.
+-    ::com::sun::star::uno::Sequence< sal_Bool >         maVisible;      /// Visibility of members.
+-    ::com::sun::star::uno::Sequence< sal_Bool >         maShowDet;      /// Show details of members.
+     ::com::sun::star::sheet::DataPilotFieldSortInfo     maSortInfo;     /// Sorting info.
+     ::com::sun::star::sheet::DataPilotFieldLayoutInfo   maLayoutInfo;   /// Layout info.
+     ::com::sun::star::sheet::DataPilotFieldAutoShowInfo maShowInfo;     /// AutoShow info.
+ 
+-    explicit            LabelData( const String& rName, short nCol, bool bIsValue );
++    explicit            ScDPLabelData( const String& rName, short nCol, bool bIsValue );
++
++    /** 
++     * return the name that should be displayed in the dp dialogs i.e. when 
++     * the layout name is present, use it, or else use the original name.
++     */ 
++    ::rtl::OUString SC_DLLPUBLIC getDisplayName() const;
+ };
+ 
+ // ============================================================================
+@@ -171,7 +192,6 @@ struct ScDPFuncData
+ 
+ // ============================================================================
+ 
+-typedef LabelData ScDPLabelData;
+ typedef std::vector< ScDPLabelData > ScDPLabelDataVec;
+ typedef std::vector< String > ScDPNameVec;
+ 
+diff --git sc/inc/sc.hrc sc/inc/sc.hrc
+index e823b40..3e0a1f8 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -1444,6 +1444,8 @@
+ #define RID_IMG_H_DROP_URL		(BMP_START + 5)
+ #define RID_IMG_H_DROP_LINK		(BMP_START + 6)
+ #define RID_IMG_H_DROP_COPY		(BMP_START + 7)
++#define RID_IMG_SELECT_CURRENT   (BMP_START + 8)
++#define RID_IMG_UNSELECT_CURRENT (BMP_START + 9)
+ 
+ #define RID_SCPTR_PIVOTCOL      (BMP_START + 81)
+ #define RID_SCPTR_PIVOTROW      (BMP_START + 82)
+@@ -1635,8 +1637,9 @@
+ #define RID_SCDLG_DOCPROTECTION         (SC_DIALOGS_START + 149)
+ #define RID_SCDLG_RETYPEPASS            (SC_DIALOGS_START + 150)
+ #define RID_SCDLG_RETYPEPASS_INPUT      (SC_DIALOGS_START + 151)
++#define RID_POPUP_FILTER                (SC_DIALOGS_START + 152)
+ 
+-#define SC_DIALOGS_END          (SC_DIALOGS_START + 152)
++#define SC_DIALOGS_END                  (SC_DIALOGS_START + 153)
+ 
+ #ifndef STD_MASKCOLOR
+ #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
+diff --git sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx
+index 2e1a33d..de99888 100644
+--- sc/inc/scabstdlg.hxx
++++ sc/inc/scabstdlg.hxx
+@@ -243,7 +243,7 @@ class AbstractScDPSubtotalDlg : public VclAbstractDialog  //add for ScDPSubtotal
+ {
+ public:
+     virtual USHORT  GetFuncMask() const = 0;
+-    virtual void    FillLabelData( LabelData& rLabelData ) const = 0;
++    virtual void    FillLabelData( ScDPLabelData& rLabelData ) const = 0;
+ };
+ 
+ class AbstractScDPNumGroupDlg : public VclAbstractDialog
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index a33ebb9..715e119 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -291,6 +291,7 @@ public:
+                     }
+     ScBaseCell*	GetCell( SCCOL nCol, SCROW nRow ) const;
+ 
++    void        GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const;
+     void		GetLastDataPos(SCCOL& rCol, SCROW& rRow) const;
+ 
+     /** Returns the pointer to a cell note object at the passed cell address. */
+diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
+index c7ce536..faa463f 100644
+--- sc/inc/unonames.hxx
++++ sc/inc/unonames.hxx
+@@ -561,6 +561,10 @@
+ #define SC_UNO_ROWFIELDCOUNT        "RowFieldCount"
+ #define SC_UNO_COLUMNFIELDCOUNT     "ColumnFieldCount"
+ #define SC_UNO_DATAFIELDCOUNT       "DataFieldCount"
++#define SC_UNO_LAYOUTNAME           "LayoutName"
++#define SC_UNO_FIELD_SUBTOTALNAME   "FieldSubtotalName"
++#define SC_UNO_GRANDTOTAL_NAME      "GrandTotalName"
++#define SC_UNO_HAS_HIDDEN_MEMBER    "HasHiddenMember"
+ 
+ //  (preliminary:)
+ #define SC_UNO_REFVALUE				"ReferenceValue"
+diff --git sc/source/core/data/column2.cxx sc/source/core/data/column2.cxx
+index 067f074..9fc2ea5 100644
+--- sc/source/core/data/column2.cxx
++++ sc/source/core/data/column2.cxx
+@@ -1376,13 +1376,13 @@ SCSIZE ScColumn::GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirecti
+     return nLines;
+ }
+ 
+-//UNUSED2009-05 SCROW ScColumn::GetFirstDataPos() const
+-//UNUSED2009-05 {
+-//UNUSED2009-05     if (nCount)
+-//UNUSED2009-05         return pItems[0].nRow;
+-//UNUSED2009-05     else
+-//UNUSED2009-05         return 0;
+-//UNUSED2009-05 }
++SCROW ScColumn::GetFirstDataPos() const
++{
++    if (nCount)
++        return pItems[0].nRow;
++    else
++        return 0;
++}
+ 
+ SCROW ScColumn::GetLastDataPos() const
+ {
+diff --git sc/source/core/data/documen8.cxx sc/source/core/data/documen8.cxx
+index 19d6d94..448c339 100644
+--- sc/source/core/data/documen8.cxx
++++ sc/source/core/data/documen8.cxx
+@@ -96,6 +96,7 @@
+ #include "globstr.hrc"
+ #include "sc.hrc"
+ #include "charthelper.hxx"
++#include "dpobject.hxx"
+ 
+ #define GET_SCALEVALUE(set,id) 	((const SfxUInt16Item&)(set.Get( id ))).GetValue()
+ 
+@@ -713,8 +714,13 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
+     //	skip everything left of rSpellPos:
+     while ( pCell && nRow == rSpellPos.Row() && nCol < rSpellPos.Col() )
+         pCell = aIter.GetNext( nCol, nRow );
+-    while ( pCell )
++
++	for (; pCell; pCell = aIter.GetNext(nCol, nRow))
+     {
++        if (pDPCollection && pDPCollection->HasDPTable(nCol, nRow, nTab))
++            // Don't spell check within datapilot table.
++            continue;
++
+         CellType eType = pCell->GetCellType();
+         if ( eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT )
+         {
+@@ -799,8 +805,6 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
+ 
+         if ( ++nCellCount >= SPELL_MAXCELLS )			// seen enough cells?
+             break;
+-
+-        pCell = aIter.GetNext( nCol, nRow );
+     }
+ 
+     if ( pCell )
+diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
+index 39ff75e..efb9693 100644
+--- sc/source/core/data/document.cxx
++++ sc/source/core/data/document.cxx
+@@ -608,6 +608,32 @@ BOOL ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) cons
+     return FALSE;
+ }
+ 
++bool ScDocument::ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow) const
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++        return false;
++
++    SCCOL nCol1, nCol2;
++    SCROW nRow1, nRow2;
++    pTab[nTab]->GetFirstDataPos(nCol1, nRow1);
++    pTab[nTab]->GetLastDataPos(nCol2, nRow2);
++
++    if (nCol1 > nCol2 || nRow1 > nRow2)
++        // invalid range.
++        return false;
++
++    // Make sure the area only shrinks, and doesn't grow.
++    if (rStartCol < nCol1)
++        rStartCol = nCol1;
++    if (nCol2 < rEndCol)
++        rEndCol = nCol2;
++    if (rStartRow < nRow1)
++        rStartRow = nRow1;
++    if (nRow2 < rEndRow)
++        rEndRow = nRow2;
++
++    return true;  // success!
++}
+ 
+ //	zusammenhaengender Bereich
+ 
+diff --git sc/source/core/data/dpgroup.cxx sc/source/core/data/dpgroup.cxx
+index b4e3568..96ed464 100644
+--- sc/source/core/data/dpgroup.cxx
++++ sc/source/core/data/dpgroup.cxx
+@@ -70,6 +70,7 @@ using ::rtl::OUStringHash;
+ using ::std::vector;
+ using ::std::hash_set;
+ using ::std::hash_map;
++using ::boost::shared_ptr;
+ 
+ #define D_TIMEFACTOR              86400.0
+ 
+@@ -977,7 +978,7 @@ String lcl_GetNumGroupForValue( double fValue, const ScDPNumGroupInfo& rInfo, bo
+     return lcl_GetNumGroupName( fGroupStart, rInfo, bHasNonInteger, cDecSeparator, pFormatter );
+ }
+ 
+-ScDPGroupTableData::ScDPGroupTableData( ScDPTableData* pSource, ScDocument* pDocument ) :
++ScDPGroupTableData::ScDPGroupTableData( const shared_ptr<ScDPTableData>& pSource, ScDocument* pDocument ) :
+     ScDPTableData(pDocument),
+     pSourceData( pSource ),
+     pDoc( pDocument )
+@@ -992,7 +993,6 @@ ScDPGroupTableData::ScDPGroupTableData( ScDPTableData* pSource, ScDocument* pDoc
+ ScDPGroupTableData::~ScDPGroupTableData()
+ {
+     delete[] pNumGroups;
+-    delete pSourceData;
+ }
+ 
+ void ScDPGroupTableData::AddGroupDimension( const ScDPGroupDimension& rGroup )
+diff --git sc/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
+index ff15b82..ede7316 100644
+--- sc/source/core/data/dpobject.cxx
++++ sc/source/core/data/dpobject.cxx
+@@ -75,9 +75,11 @@
+ #include <svtools/zforlist.hxx>		// IsNumberFormat
+ 
+ #include <vector>
++#include <stdio.h>
+ 
+ using namespace com::sun::star;
+ using ::std::vector;
++using ::boost::shared_ptr;
+ using ::com::sun::star::uno::Sequence;
+ using ::com::sun::star::uno::Reference;
+ using ::com::sun::star::uno::UNO_QUERY;
+@@ -162,11 +164,14 @@ ScDPObject::ScDPObject( ScDocument* pD ) :
+     pSheetDesc( NULL ),
+     pImpDesc( NULL ),
+     pServDesc( NULL ),
++    mpTableData(static_cast<ScDPTableData*>(NULL)),
+     pOutput( NULL ),
+     bSettingsChanged( FALSE ),
+     bAlive( FALSE ),
++    mnAutoFormatIndex( 65535 ),
+     bAllowMove( FALSE ),
+-    nHeaderRows( 0 )
++	nHeaderRows( 0 ),
++    mbHeaderLayout(false)
+ {
+ }
+ 
+@@ -180,11 +185,14 @@ ScDPObject::ScDPObject(const ScDPObject& r) :
+     pSheetDesc( NULL ),
+     pImpDesc( NULL ),
+     pServDesc( NULL ),
++    mpTableData(static_cast<ScDPTableData*>(NULL)), 
+     pOutput( NULL ),
+     bSettingsChanged( FALSE ),
+     bAlive( FALSE ),
++    mnAutoFormatIndex( r.mnAutoFormatIndex ),
+     bAllowMove( FALSE ),
+-    nHeaderRows( r.nHeaderRows )
++	nHeaderRows( r.nHeaderRows ),
++    mbHeaderLayout( r.mbHeaderLayout )
+ {
+     if (r.pSaveData)
+         pSaveData = new ScDPSaveData(*r.pSaveData);
+@@ -232,6 +240,26 @@ void ScDPObject::SetSaveData(const ScDPSaveData& rData)
+     InvalidateData();		// re-init source from SaveData
+ }
+ 
++void ScDPObject::SetAutoFormatIndex(const sal_uInt16 nIndex)
++{
++    mnAutoFormatIndex = nIndex;
++}
++
++sal_uInt16 ScDPObject::GetAutoFormatIndex() const
++{
++    return mnAutoFormatIndex; 
++}
++
++void ScDPObject::SetHeaderLayout (bool bUseGrid)
++{
++    mbHeaderLayout = bUseGrid;
++}
++
++bool ScDPObject::GetHeaderLayout() const
++{
++    return mbHeaderLayout;
++}
++
+ void ScDPObject::SetOutRange(const ScRange& rRange)
+ {
+     aOutRange = rRange;
+@@ -325,6 +353,22 @@ void ScDPObject::SetTag(const String& rNew)
+     aTableTag = rNew;
+ }
+ 
++bool ScDPObject::IsDataDescriptionCell(const ScAddress& rPos)
++{
++    if (!pSaveData)
++        return false;
++
++    long nDataDimCount = pSaveData->GetDataDimensionCount();
++    if (nDataDimCount != 1)
++        // There has to be exactly one data dimension for the description to 
++        // appear at top-left corner.
++        return false;
++
++    CreateOutput();
++    ScRange aTabRange = pOutput->GetOutputRange(sheet::DataPilotOutputRangeType::TABLE);
++    return (rPos == aTabRange.aStart);
++}
++
+ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::GetSource()
+ {
+     CreateObjects();
+@@ -338,6 +382,7 @@ void ScDPObject::CreateOutput()
+     {
+         BOOL bFilterButton = IsSheetData() && pSaveData && pSaveData->GetFilterButton();
+         pOutput = new ScDPOutput( pDoc, xSource, aOutRange.aStart, bFilterButton );
++        pOutput->SetHeaderLayout ( mbHeaderLayout );
+ 
+         long nOldRows = nHeaderRows;
+         nHeaderRows = pOutput->GetHeaderRows();
+@@ -365,11 +410,43 @@ void ScDPObject::CreateOutput()
+     }
+ }
+ 
++ScDPTableData* ScDPObject::GetTableData()
++{
++    if (!mpTableData)
++    {
++        if ( pImpDesc )
++        {
++            // database data
++            mpTableData.reset(new ScDatabaseDPData(pDoc, *pImpDesc));
++        }
++        else
++        {
++            // cell data
++            if (!pSheetDesc)
++            {
++                DBG_ERROR("no source descriptor");
++                pSheetDesc = new ScSheetSourceDesc;     // dummy defaults
++            }
++            mpTableData.reset(new ScSheetDPData(pDoc, *pSheetDesc));
++        }
++
++        // grouping (for cell or database data)
++        if ( pSaveData && pSaveData->GetExistingDimensionData() )
++        {
++            shared_ptr<ScDPGroupTableData> pGroupData(new ScDPGroupTableData(mpTableData, pDoc));
++            pSaveData->GetExistingDimensionData()->WriteToData(*pGroupData);
++            mpTableData = pGroupData;
++        }
++    }
++
++    return mpTableData.get();
++}
++
+ void ScDPObject::CreateObjects()
+ {
+     // if groups are involved, create a new source with the ScDPGroupTableData
+     if ( bSettingsChanged && pSaveData && pSaveData->GetExistingDimensionData() )
+-        xSource = NULL;
++        InvalidateSource();
+ 
+     if (!xSource.is())
+     {
+@@ -387,33 +464,9 @@ void ScDPObject::CreateObjects()
+         if ( !xSource.is() )	// database or sheet data, or error in CreateSource
+         {
+             DBG_ASSERT( !pServDesc, "DPSource could not be created" );
+-
+-            ScDPTableData* pData = NULL;
+-            if ( pImpDesc )
+-            {
+-                // database data
+-                pData = new ScDatabaseDPData( pDoc, *pImpDesc );
+-            }
+-            else
+-            {
+-                // cell data
+-                if (!pSheetDesc)
+-                {
+-                    DBG_ERROR("no source descriptor");
+-                    pSheetDesc = new ScSheetSourceDesc;		// dummy defaults
+-                }
+-                pData = new ScSheetDPData( pDoc, *pSheetDesc );
+-            }
+-
+-            // grouping (for cell or database data)
+-            if ( pSaveData && pSaveData->GetExistingDimensionData() )
+-            {
+-                ScDPGroupTableData* pGroupData = new ScDPGroupTableData( pData, pDoc );
+-                pSaveData->GetExistingDimensionData()->WriteToData( *pGroupData );
+-                pData = pGroupData;
+-            }
+-
+-            xSource = new ScDPSource( pData );
++            ScDPTableData* pData = GetTableData();
++            ScDPSource* pSource = new ScDPSource( pData );
++            xSource = pSource;
+         }
+ 
+         if (pSaveData)
+@@ -450,6 +503,7 @@ void ScDPObject::InvalidateData()
+ void ScDPObject::InvalidateSource()
+ {
+     xSource = NULL;
++    mpTableData.reset();
+ }
+ 
+ ScRange ScDPObject::GetNewOutputRange( BOOL& rOverflow )
+@@ -484,6 +538,9 @@ void ScDPObject::Output( const ScAddress& rPos )
+ 
+     //	aOutRange is always the range that was last output to the document
+     aOutRange = pOutput->GetOutputRange();
++    const ScAddress& s = aOutRange.aStart;
++    const ScAddress& e = aOutRange.aEnd;
++    pDoc->ApplyFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
+ }
+ 
+ const ScRange ScDPObject::GetOutputRangeByType( sal_Int32 nType )
+@@ -533,6 +590,63 @@ void ScDPObject::RefreshAfterLoad()
+         nHeaderRows = 0;		// nothing found, no drop-down lists
+ }
+ 
++void ScDPObject::BuildAllDimensionMembers()
++{
++    if (!pSaveData)
++        return;
++    
++    pSaveData->BuildAllDimensionMembers(GetTableData());
++}
++
++bool ScDPObject::GetMemberNames( sal_Int32 nDim, Sequence<OUString>& rNames )
++{
++    vector<ScDPLabelData::Member> aMembers;
++    if (!GetMembers(nDim, GetUsedHierarchy(nDim), aMembers))
++        return false;
++
++    size_t n = aMembers.size();
++    rNames.realloc(n);
++    for (size_t i = 0; i < n; ++i)
++        rNames[i] = aMembers[i].maName;
++
++    return true;
++}
++
++bool ScDPObject::GetMembers( sal_Int32 nDim, sal_Int32 nHier, vector<ScDPLabelData::Member>& rMembers )
++{
++    Reference< container::XNameAccess > xMembersNA;
++    if (!GetMembersNA( nDim, nHier, xMembersNA ))
++        return false;
++
++    Reference<container::XIndexAccess> xMembersIA( new ScNameToIndexAccess(xMembersNA) );
++    sal_Int32 nCount = xMembersIA->getCount();
++    vector<ScDPLabelData::Member> aMembers;
++    aMembers.reserve(nCount);
++
++    for (sal_Int32 i = 0; i < nCount; ++i)
++    {
++        Reference<container::XNamed> xMember(xMembersIA->getByIndex(i), UNO_QUERY);
++        ScDPLabelData::Member aMem;
++
++        if (xMember.is())
++            aMem.maName = xMember->getName();
++
++        Reference<beans::XPropertySet> xMemProp(xMember, UNO_QUERY);
++        if (xMemProp.is())
++        {
++            aMem.mbVisible     = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString::createFromAscii(SC_UNO_ISVISIBL));
++            aMem.mbShowDetails = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString::createFromAscii(SC_UNO_SHOWDETA));
++
++            aMem.maLayoutName = ScUnoHelpFunctions::GetStringProperty(
++                xMemProp, OUString::createFromAscii(SC_UNO_LAYOUTNAME), OUString());
++        }
++
++        aMembers.push_back(aMem);
++    }
++    rMembers.swap(aMembers);
++    return true;
++}
++
+ void ScDPObject::UpdateReference( UpdateRefMode eUpdateRefMode,
+                                      const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ {
+@@ -655,23 +769,33 @@ void ScDPObject::GetDrillDownData(const ScAddress& rPos, Sequence< Sequence<Any>
+     rTableData = xDrillDownData->getDrillDownData(filters);
+ }
+ 
+-BOOL ScDPObject::IsDimNameInUse( const String& rName ) const
++bool ScDPObject::IsDimNameInUse(const OUString& rName) const
+ {
+-    if ( xSource.is() )
++    if (!xSource.is())
++        return false;
++
++    Reference<container::XNameAccess> xDims = xSource->getDimensions();
++    Sequence<OUString> aDimNames = xDims->getElementNames();
++    sal_Int32 n = aDimNames.getLength();
++    for (sal_Int32 i = 0; i < n; ++i)
+     {
+-        uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
+-        if ( xDimsName.is() )
++        const OUString& rDimName = aDimNames[i];
++        if (rDimName.equalsIgnoreAsciiCase(rName))
++            return true;
++
++        Reference<beans::XPropertySet> xPropSet(xDims->getByName(rDimName), UNO_QUERY);
++        if (!xPropSet.is())
++            continue;
++
++        Any any = xPropSet->getPropertyValue(OUString::createFromAscii(SC_UNO_LAYOUTNAME));
++        OUString aLayoutName;
++        if (any >>= aLayoutName)
+         {
+-            rtl::OUString aCompare( rName );
+-            uno::Sequence<rtl::OUString> aNames = xDimsName->getElementNames();
+-            long nCount = aNames.getLength();
+-            const rtl::OUString* pArr = aNames.getConstArray();
+-            for (long nPos=0; nPos<nCount; nPos++)
+-                if ( pArr[nPos] == aCompare )            //! ignore case
+-                    return TRUE;
++            if (aLayoutName.equalsIgnoreAsciiCase(rName))
++                return true;
+         }
+     }
+-    return FALSE;   // not found
++    return false;
+ }
+ 
+ String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout )
+@@ -1732,7 +1856,7 @@ BOOL ScDPObject::FillOldParam(ScPivotParam& rParam, BOOL bForFile) const
+     return TRUE;
+ }
+ 
+-void lcl_FillLabelData( LabelData& rData, const uno::Reference< beans::XPropertySet >& xDimProp )
++void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans::XPropertySet >& xDimProp )
+ {
+     uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDimProp, uno::UNO_QUERY );
+     if ( xDimProp.is() && xDimSupp.is() )
+@@ -1778,6 +1902,8 @@ void lcl_FillLabelData( LabelData& rData, const uno::Reference< beans::XProperty
+ 
+ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
+ {
++    rParam.maLabelArray.clear();
++
+     ((ScDPObject*)this)->CreateObjects();
+ 
+     uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
+@@ -1788,8 +1914,6 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
+     if (!nDimCount)
+         return FALSE;
+ 
+-    SCSIZE nOutCount = 0;
+-    LabelData** aLabelArr = new LabelData*[nDimCount];
+     for (long nDim=0; nDim < nDimCount; nDim++)
+     {
+         String aFieldName;
+@@ -1819,29 +1943,24 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
+             {
+             }
+ 
++            OUString aLayoutName = ScUnoHelpFunctions::GetStringProperty(
++                xDimProp, OUString::createFromAscii(SC_UNO_LAYOUTNAME), OUString());
++
+             if ( aFieldName.Len() && !bData && !bDuplicated )
+             {
+                 SCsCOL nCol = static_cast< SCsCOL >( nDim );           //! ???
+                 bool bIsValue = true;                               //! check
+ 
+-                aLabelArr[nOutCount] = new LabelData( aFieldName, nCol, bIsValue );
+-
+-                LabelData& rLabelData = *aLabelArr[nOutCount];
+-                GetHierarchies( nDim, rLabelData.maHiers );
+-                GetMembers( nDim, rLabelData.maMembers, &rLabelData.maVisible, &rLabelData.maShowDet );
+-                lcl_FillLabelData( rLabelData, xDimProp );
+-
+-                ++nOutCount;
++                ScDPLabelDataRef pNewLabel(new ScDPLabelData(aFieldName, nCol, bIsValue));
++                pNewLabel->maLayoutName = aLayoutName;
++                GetHierarchies(nDim, pNewLabel->maHiers);
++                GetMembers(nDim, GetUsedHierarchy(nDim), pNewLabel->maMembers);
++                lcl_FillLabelData(*pNewLabel, xDimProp);
++                rParam.maLabelArray.push_back(pNewLabel);
+             }
+         }
+     }
+ 
+-    rParam.SetLabelData( aLabelArr, nOutCount );
+-
+-    for (SCSIZE i=0; i<nOutCount; i++)
+-        delete aLabelArr[i];
+-    delete[] aLabelArr;
+-
+     return TRUE;
+ }
+ 
+@@ -1890,14 +2009,6 @@ BOOL ScDPObject::GetMembersNA( sal_Int32 nDim, uno::Reference< container::XNameA
+     return GetMembersNA( nDim, GetUsedHierarchy( nDim ), xMembers );
+ }
+ 
+-BOOL ScDPObject::GetMembers( sal_Int32 nDim,
+-        uno::Sequence< rtl::OUString >& rMembers,
+-        uno::Sequence< sal_Bool >* pVisible,
+-        uno::Sequence< sal_Bool >* pShowDet )
+-{
+-    return GetMembers( nDim, GetUsedHierarchy( nDim ), rMembers, pVisible, pShowDet );
+-}
+-
+ BOOL ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< container::XNameAccess >& xMembers )
+ {
+     BOOL bRet = FALSE;
+@@ -1933,55 +2044,6 @@ BOOL ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference<
+     return bRet;
+ }
+ 
+-BOOL ScDPObject::GetMembers( sal_Int32 nDim, sal_Int32 nHier,
+-        uno::Sequence< rtl::OUString >& rMembers,
+-        uno::Sequence< sal_Bool >* pVisible,
+-        uno::Sequence< sal_Bool >* pShowDet )
+-{
+-    BOOL bRet = FALSE;
+-    uno::Reference< container::XNameAccess > xMembersNA;
+-    if( GetMembersNA( nDim, nHier, xMembersNA ) )
+-    {
+-        uno::Reference< container::XIndexAccess > xMembersIA( new ScNameToIndexAccess( xMembersNA ) );
+-        sal_Int32 nCount = xMembersIA->getCount();
+-        rMembers.realloc( nCount );
+-        if( pVisible )
+-            pVisible->realloc( nCount );
+-        if( pShowDet )
+-            pShowDet->realloc( nCount );
+-
+-        rtl::OUString* pAry = rMembers.getArray();
+-        for( sal_Int32 nItem = 0; nItem < nCount; ++nItem )
+-        {
+-            uno::Reference< container::XNamed > xMember( xMembersIA->getByIndex( nItem ), uno::UNO_QUERY );
+-            if( xMember.is() )
+-                pAry[ nItem ] = xMember->getName();
+-            if( pVisible || pShowDet )
+-            {
+-                uno::Reference< beans::XPropertySet > xMemProp( xMember, uno::UNO_QUERY );
+-                if( pVisible )
+-                {
+-                    sal_Bool bVis = sal_True;
+-                    if( xMemProp.is() )
+-                        bVis = ScUnoHelpFunctions::GetBoolProperty( xMemProp,
+-                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ISVISIBL ) ) );
+-                    (*pVisible)[ nItem ] = bVis;
+-                }
+-                if( pShowDet )
+-                {
+-                    sal_Bool bShow = sal_True;
+-                    if( xMemProp.is() )
+-                        bShow = ScUnoHelpFunctions::GetBoolProperty( xMemProp,
+-                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWDETA ) ) );
+-                    (*pShowDet)[ nItem ] = bShow;
+-                }
+-            }
+-        }
+-        bRet = TRUE;
+-    }
+-    return bRet;
+-}
+-
+ //------------------------------------------------------------------------
+ //	convert old pivot tables into new datapilot tables
+ 
+@@ -2376,7 +2438,7 @@ void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const
+ 
+                 ScDPObject* pDestObj = new ScDPObject( *pSourceObj );
+                 pDestObj->SetAlive(TRUE);
+-                if ( !r.Insert(pDestObj) )
++                if ( !r.InsertNewTable(pDestObj) )
+                 {
+                     DBG_ERROR("cannot insert DPObject");
+                     DELETEZ( pDestObj );
+@@ -2411,6 +2473,39 @@ ScSimpleSharedString& ScDPCollection::GetSharedString()
+     return maSharedString;
+ }
+ 
++void ScDPCollection::FreeTable(ScDPObject* pDPObj)
++{
++    const ScRange& rOutRange = pDPObj->GetOutRange();
++    const ScAddress& s = rOutRange.aStart;
++    const ScAddress& e = rOutRange.aEnd;
++    pDoc->RemoveFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
++    Free(pDPObj);
++}
++
++bool ScDPCollection::InsertNewTable(ScDPObject* pDPObj)
++{
++    bool bSuccess = Insert(pDPObj);
++    if (bSuccess)
++    {
++        const ScRange& rOutRange = pDPObj->GetOutRange();
++        const ScAddress& s = rOutRange.aStart;
++        const ScAddress& e = rOutRange.aEnd;
++        pDoc->ApplyFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
++    }
++    return bSuccess;
++}
++
++bool ScDPCollection::HasDPTable(SCCOL nCol, SCROW nRow, SCTAB nTab) const
++{
++    const ScMergeFlagAttr* pMergeAttr = static_cast<const ScMergeFlagAttr*>(
++            pDoc->GetAttr(nCol, nRow, nTab, ATTR_MERGE_FLAG));
++
++    if (!pMergeAttr)
++        return false;
++
++    return pMergeAttr->HasDPTable();
++}
++
+ ScDPCacheCell* ScDPCollection::getCacheCellFromPool(const ScDPCacheCell& rCell)
+ {
+     ScDPCacheCell aCell(rCell);
+diff --git sc/source/core/data/dpoutput.cxx sc/source/core/data/dpoutput.cxx
+index 0699892..e472dbf 100644
+--- sc/source/core/data/dpoutput.cxx
++++ sc/source/core/data/dpoutput.cxx
+@@ -81,6 +81,7 @@
+ 
+ using namespace com::sun::star;
+ using ::std::vector;
++using ::com::sun::star::beans::XPropertySet;
+ using ::com::sun::star::uno::Sequence;
+ using ::com::sun::star::uno::UNO_QUERY;
+ using ::com::sun::star::uno::Reference;
+@@ -98,7 +99,6 @@ using ::rtl::OUString;
+ #define DP_PROP_ORIENTATION			"Orientation"
+ #define DP_PROP_POSITION			"Position"
+ #define DP_PROP_USEDHIERARCHY		"UsedHierarchy"
+-#define DP_PROP_DATADESCR			"DataDescription"
+ #define DP_PROP_ISDATALAYOUT		"IsDataLayoutDimension"
+ #define DP_PROP_NUMBERFORMAT		"NumberFormat"
+ #define DP_PROP_FILTER				"Filter"
+@@ -119,9 +119,15 @@ struct ScDPOutLevelData
+     long								nLevel;
+     long								nDimPos;
+     uno::Sequence<sheet::MemberResult>	aResult;
+-    String								aCaption;
+-
+-    ScDPOutLevelData() { nDim = nHier = nLevel = nDimPos = -1; }
++    String                              maName;   /// Name is the internal field name.
++    String                              aCaption; /// Caption is the name visible in the output table.
++    bool                                mbHasHiddenMember;
++
++	ScDPOutLevelData()
++    { 
++        nDim = nHier = nLevel = nDimPos = -1; 
++        mbHasHiddenMember = false;
++    }
+ 
+     BOOL operator<(const ScDPOutLevelData& r) const
+         { return nDimPos<r.nDimPos || ( nDimPos==r.nDimPos && nHier<r.nHier ) ||
+@@ -370,13 +376,15 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
+     aStartPos( rPos ),
+     bDoFilter( bFilter ),
+     bResultsError( FALSE ),
++    mbHasDataLayout(false),
+     pColNumFmt( NULL ),
+     pRowNumFmt( NULL ),
+     nColFmtCount( 0 ),
+     nRowFmtCount( 0 ),
+     nSingleNumFmt( 0 ),
+     bSizesValid( FALSE ),
+-    bSizeOverflow( FALSE )
++	bSizeOverflow( FALSE ),
++    mbHeaderLayout( false )
+ {
+     nTabStartCol = nMemberStartCol = nDataStartCol = nTabEndCol = 0;
+     nTabStartRow = nMemberStartRow = nDataStartRow = nTabEndRow = 0;
+@@ -413,6 +421,8 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
+                 BOOL bIsDataLayout = ScUnoHelpFunctions::GetBoolProperty(
+                                                 xDimProp,
+                                                 rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
++                bool bHasHiddenMember = ScUnoHelpFunctions::GetBoolProperty(
++                    xDimProp, OUString::createFromAscii(SC_UNO_HAS_HIDDEN_MEMBER));
+ 
+                 if ( eDimOrient != sheet::DataPilotFieldOrientation_HIDDEN )
+                 {
+@@ -443,7 +453,17 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
+                                     xLevel, uno::UNO_QUERY );
+                             if ( xLevNam.is() && xLevRes.is() )
+                             {
+-                                String aCaption = String(xLevNam->getName());	//! Caption...
++                                String aName = xLevNam->getName();
++                                OUString aCaption = aName; // Caption equals the field name by default.
++                                Reference<XPropertySet> xPropSet(xLevel, UNO_QUERY);
++                                if (xPropSet.is())
++                                {
++                                    Any any = xPropSet->getPropertyValue(
++                                        OUString::createFromAscii(SC_UNO_LAYOUTNAME));
++                                    any >>= aCaption;
++                                }
++
++                                bool bRowFieldHasMember = false;
+                                 switch ( eDimOrient )
+                                 {
+                                     case sheet::DataPilotFieldOrientation_COLUMN:
+@@ -452,7 +472,9 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
+                                         pColFields[nColFieldCount].nLevel  = nLev;
+                                         pColFields[nColFieldCount].nDimPos = nDimPos;
+                                         pColFields[nColFieldCount].aResult = xLevRes->getResults();
++                                        pColFields[nColFieldCount].maName  = aName;
+                                         pColFields[nColFieldCount].aCaption= aCaption;
++										pColFields[nColFieldCount].mbHasHiddenMember = bHasHiddenMember;
+                                         if (!lcl_MemberEmpty(pColFields[nColFieldCount].aResult))
+                                             ++nColFieldCount;
+                                         break;
+@@ -462,9 +484,14 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
+                                         pRowFields[nRowFieldCount].nLevel  = nLev;
+                                         pRowFields[nRowFieldCount].nDimPos = nDimPos;
+                                         pRowFields[nRowFieldCount].aResult = xLevRes->getResults();
++                                        pRowFields[nRowFieldCount].maName  = aName;
+                                         pRowFields[nRowFieldCount].aCaption= aCaption;
++										pRowFields[nRowFieldCount].mbHasHiddenMember = bHasHiddenMember;
+                                         if (!lcl_MemberEmpty(pRowFields[nRowFieldCount].aResult))
++                                        {    
+                                             ++nRowFieldCount;
++                                            bRowFieldHasMember = true;
++                                        }
+                                         break;
+                                     case sheet::DataPilotFieldOrientation_PAGE:
+                                         pPageFields[nPageFieldCount].nDim    = nDim;
+@@ -472,7 +499,9 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
+                                         pPageFields[nPageFieldCount].nLevel  = nLev;
+                                         pPageFields[nPageFieldCount].nDimPos = nDimPos;
+                                         pPageFields[nPageFieldCount].aResult = lcl_GetSelectedPageAsResult(xDimProp);
++                                        pPageFields[nPageFieldCount].maName  = aName;
+                                         pPageFields[nPageFieldCount].aCaption= aCaption;
++										pPageFields[nPageFieldCount].mbHasHiddenMember = bHasHiddenMember;
+                                         // no check on results for page fields
+                                         ++nPageFieldCount;
+                                         break;
+@@ -485,6 +514,9 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
+                                 // get number formats from data dimensions
+                                 if ( bIsDataLayout )
+                                 {
++                                    if (bRowFieldHasMember)
++                                        mbHasDataLayout = true;
++
+                                     DBG_ASSERT( nLevCount == 1, "data layout: multiple levels?" );
+                                     if ( eDimOrient == sheet::DataPilotFieldOrientation_COLUMN )
+                                         lcl_FillNumberFormats( pColNumFmt, nColFmtCount, xLevRes, xDims );
+@@ -528,7 +560,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
+         try
+         {
+             uno::Any aAny = xSrcProp->getPropertyValue(
+-                    rtl::OUString::createFromAscii(DP_PROP_DATADESCR) );
++					rtl::OUString::createFromAscii(SC_UNO_DATADESC) );
+             rtl::OUString aUStr;
+             aAny >>= aUStr;
+             aDataDescription = String( aUStr );
+@@ -605,9 +637,16 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
+                                 const sheet::MemberResult& rData, BOOL bColHeader, long nLevel )
+ {
+     long nFlags = rData.Flags;
++
++    rtl::OUStringBuffer aCaptionBuf;
++    if (!(nFlags & sheet::MemberResultFlags::NUMERIC))
++        // This caption is not a number.  Make sure it won't get parsed as one.
++        aCaptionBuf.append(sal_Unicode('\''));
++    aCaptionBuf.append(rData.Caption);
++
+     if ( nFlags & sheet::MemberResultFlags::HASMEMBER )
+     {
+-        pDoc->SetString( nCol, nRow, nTab, rData.Caption );
++        pDoc->SetString( nCol, nRow, nTab, aCaptionBuf.makeStringAndClear() );
+     }
+     else
+     {
+@@ -638,14 +677,20 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
+     }
+ }
+ 
+-void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, BOOL bFrame )
++void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, 
++                            bool bInTable, bool bPopup, bool bHasHiddenMember )
+ {
+     pDoc->SetString( nCol, nRow, nTab, rCaption );
+-    if (bFrame)
++    if (bInTable)
+         lcl_SetFrame( pDoc,nTab, nCol,nRow, nCol,nRow, 20 );
+ 
+     //	Button
+-    pDoc->ApplyAttr( nCol, nRow, nTab, ScMergeFlagAttr(SC_MF_BUTTON) );
++    sal_uInt16 nMergeFlag = SC_MF_BUTTON;
++    if (bPopup)
++        nMergeFlag |= SC_MF_BUTTON_POPUP;
++    if (bHasHiddenMember)
++        nMergeFlag |= SC_MF_HIDDEN_MEMBER;
++    pDoc->ApplyFlagsTab(nCol, nRow, nCol, nRow, nTab, nMergeFlag);
+ 
+     lcl_SetStyleById( pDoc,nTab, nCol,nRow, nCol,nRow, STR_PIVOT_STYLE_FIELDNAME );
+ }
+@@ -653,7 +698,7 @@ void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rC
+ void lcl_DoFilterButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
+ {
+     pDoc->SetString( nCol, nRow, nTab, ScGlobal::GetRscString(STR_CELL_FILTER) );
+-    pDoc->ApplyAttr( nCol, nRow, nTab, ScMergeFlagAttr(SC_MF_BUTTON) );
++    pDoc->ApplyFlagsTab(nCol, nRow, nCol, nRow, nTab, SC_MF_BUTTON);
+ }
+ 
+ void ScDPOutput::CalcSizes()
+@@ -666,7 +711,11 @@ void ScDPOutput::CalcSizes()
+         nRowCount = aData.getLength();
+         const uno::Sequence<sheet::DataResult>* pRowAry = aData.getConstArray();
+         nColCount = nRowCount ? ( pRowAry[0].getLength() ) : 0;
+-        nHeaderSize = 1;			// one row for field names
++
++        nHeaderSize = 1;
++        if (GetHeaderLayout() && nColFieldCount == 0)
++            // Insert an extra header row only when there is no column field.
++            nHeaderSize = 2;
+ 
+         //	calculate output positions and sizes
+ 
+@@ -775,7 +824,7 @@ void ScDPOutput::Output()
+         SCCOL nHdrCol = aStartPos.Col();
+         SCROW nHdrRow = aStartPos.Row() + nField + ( bDoFilter ? 1 : 0 );
+         // draw without frame for consistency with filter button:
+-        FieldCell( nHdrCol, nHdrRow, nTab, pPageFields[nField].aCaption, FALSE );
++        FieldCell( nHdrCol, nHdrRow, nTab, pPageFields[nField].aCaption, false, false, pPageFields[nField].mbHasHiddenMember );
+         SCCOL nFldCol = nHdrCol + 1;
+ 
+         String aPageValue;
+@@ -814,7 +863,7 @@ void ScDPOutput::Output()
+     for (nField=0; nField<nColFieldCount; nField++)
+     {
+         SCCOL nHdrCol = nDataStartCol + (SCCOL)nField;				//! check for overflow
+-        FieldCell( nHdrCol, nTabStartRow, nTab, pColFields[nField].aCaption );
++        FieldCell( nHdrCol, nTabStartRow, nTab, pColFields[nField].aCaption, true, true, pColFields[nField].mbHasHiddenMember );
+ 
+         SCROW nRowPos = nMemberStartRow + (SCROW)nField;				//! check for overflow
+         const uno::Sequence<sheet::MemberResult> rSequence = pColFields[nField].aResult;
+@@ -849,9 +898,12 @@ void ScDPOutput::Output()
+ 
+     for (nField=0; nField<nRowFieldCount; nField++)
+     {
++        bool bDataLayout = mbHasDataLayout && (nField == nRowFieldCount-1);
++
+         SCCOL nHdrCol = nTabStartCol + (SCCOL)nField;					//! check for overflow
+         SCROW nHdrRow = nDataStartRow - 1;
+-        FieldCell( nHdrCol, nHdrRow, nTab, pRowFields[nField].aCaption );
++        FieldCell( nHdrCol, nHdrRow, nTab, pRowFields[nField].aCaption, true, !bDataLayout, 
++                   pRowFields[nField].mbHasHiddenMember );
+ 
+         SCCOL nColPos = nMemberStartCol + (SCCOL)nField;				//! check for overflow
+         const uno::Sequence<sheet::MemberResult> rSequence = pRowFields[nField].aResult;
+@@ -993,6 +1045,16 @@ void ScDPOutput::GetMemberResultNames( ScStrCollection& rNames, long nDimension
+     }
+ }
+ 
++void ScDPOutput::SetHeaderLayout(bool bUseGrid)
++{
++    mbHeaderLayout = bUseGrid;
++    bSizesValid = false;
++}
++
++bool ScDPOutput::GetHeaderLayout() const
++{
++    return mbHeaderLayout;
++}
+ 
+ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionData& rPosData)
+ {
+@@ -1146,7 +1208,7 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>&
+     for (SCCOL nColField = 0; nColField < nColFieldCount && bFilterByCol; ++nColField)
+     {
+         sheet::DataPilotFieldFilter filter;
+-        filter.FieldName = pColFields[nColField].aCaption;
++        filter.FieldName = pColFields[nColField].maName;
+ 
+         const uno::Sequence<sheet::MemberResult> rSequence = pColFields[nColField].aResult;
+         const sheet::MemberResult* pArray = rSequence.getConstArray();
+@@ -1163,10 +1225,15 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>&
+     }
+ 
+     // row fields
++    bool bDataLayoutExists = (nDataFieldCount > 1);
+     for (SCROW nRowField = 0; nRowField < nRowFieldCount && bFilterByRow; ++nRowField)
+     {
++        if (bDataLayoutExists && nRowField == nRowFieldCount - 1)
++            // There is no sense including the data layout field for filtering.
++            continue;
++
+         sheet::DataPilotFieldFilter filter;
+-        filter.FieldName = pRowFields[nRowField].aCaption;
++        filter.FieldName = pRowFields[nRowField].maName;
+ 
+         const uno::Sequence<sheet::MemberResult> rSequence = pRowFields[nRowField].aResult;
+         const sheet::MemberResult* pArray = rSequence.getConstArray();
+@@ -1199,7 +1199,7 @@ bool lcl_IsNamedDataField( const ScDPGetPivotDataField& rTarget, const String& r
+ bool lcl_IsNamedCategoryField( const ScDPGetPivotDataField& rFilter, const ScDPOutLevelData& rField )
+ {
+     //! name from source instead of caption?
+-    return ScGlobal::GetpTransliteration()->isEqual( rFilter.maFieldName, rField.aCaption );
++    return ScGlobal::GetpTransliteration()->isEqual( rFilter.maFieldName, rField.maName );
+ }
+ 
+ bool lcl_IsCondition( const sheet::MemberResult& rResultEntry, const ScDPGetPivotDataField& rFilter )
+diff --git sc/source/core/data/dpoutputgeometry.cxx sc/source/core/data/dpoutputgeometry.cxx
+new file mode 100644
+index 0000000..999ab28
+--- /dev/null
++++ sc/source/core/data/dpoutputgeometry.cxx
+@@ -0,0 +1,217 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: xmldpimp.cxx,v $
++ * $Revision: 1.27.134.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_sc.hxx"
++
++
++
++// INCLUDE ---------------------------------------------------------------
++
++#include "dpoutputgeometry.hxx"
++#include "address.hxx"
++
++#include <vector>
++
++using ::std::vector;
++
++ScDPOutputGeometry::ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter, ImportType eImportType) :
++    maOutRange(rOutRange),
++    mnRowFields(0),
++    mnColumnFields(0),
++    mnPageFields(0),
++    mnDataFields(0),
++    meImportType(eImportType),
++    mbShowFilter(bShowFilter)
++{
++}
++
++ScDPOutputGeometry::~ScDPOutputGeometry()
++{
++}
++
++void ScDPOutputGeometry::setRowFieldCount(sal_uInt32 nCount)
++{
++    mnRowFields = nCount;
++}
++
++void ScDPOutputGeometry::setColumnFieldCount(sal_uInt32 nCount)
++{
++    mnColumnFields = nCount;
++}
++
++void ScDPOutputGeometry::setPageFieldCount(sal_uInt32 nCount)
++{
++    mnPageFields = nCount;
++}
++
++void ScDPOutputGeometry::setDataFieldCount(sal_uInt32 nCount)
++{
++    mnDataFields = nCount;
++}
++
++void ScDPOutputGeometry::getColumnFieldPositions(vector<ScAddress>& rAddrs) const
++{
++    vector<ScAddress> aAddrs;
++    if (!mnColumnFields)
++    {
++        rAddrs.swap(aAddrs);
++        return;
++    }
++
++    bool bDataLayout = mnDataFields > 1;
++
++    SCROW nCurRow = maOutRange.aStart.Row();
++
++    if (mnPageFields)
++    {
++        SCROW nRowStart = maOutRange.aStart.Row() + mbShowFilter;
++        SCROW nRowEnd   = nRowStart + static_cast<SCCOL>(mnPageFields-1);
++        nCurRow = nRowEnd + 2;
++    }
++    else if (mbShowFilter)
++        nCurRow += 2;
++
++    SCROW nRow = nCurRow;
++    SCTAB nTab = maOutRange.aStart.Tab();
++    SCCOL nColStart = maOutRange.aStart.Col() + mnRowFields + bDataLayout;
++    SCCOL nColEnd = nColStart + static_cast<SCCOL>(mnColumnFields-1);
++
++    for (SCCOL nCol = nColStart; nCol <= nColEnd; ++nCol)
++        aAddrs.push_back(ScAddress(nCol, nRow, nTab));
++    rAddrs.swap(aAddrs);
++}
++
++void ScDPOutputGeometry::getRowFieldPositions(vector<ScAddress>& rAddrs) const
++{
++    vector<ScAddress> aAddrs;
++    if (!mnRowFields)
++    {
++        rAddrs.swap(aAddrs);
++        return;
++    }
++
++    SCROW nRow = getRowFieldHeaderRow();
++    SCTAB nTab = maOutRange.aStart.Tab();
++    SCCOL nColStart = maOutRange.aStart.Col();
++    SCCOL nColEnd = nColStart + static_cast<SCCOL>(mnRowFields-1);
++
++    for (SCCOL nCol = nColStart; nCol <= nColEnd; ++nCol)
++        aAddrs.push_back(ScAddress(nCol, nRow, nTab));
++    rAddrs.swap(aAddrs);
++}
++
++void ScDPOutputGeometry::getPageFieldPositions(vector<ScAddress>& rAddrs) const
++{
++    vector<ScAddress> aAddrs;
++    if (!mnPageFields)
++    {
++        rAddrs.swap(aAddrs);
++        return;
++    }
++
++    SCTAB nTab = maOutRange.aStart.Tab();
++    SCCOL nCol = maOutRange.aStart.Col();
++
++    SCROW nRowStart = maOutRange.aStart.Row() + mbShowFilter;
++    SCROW nRowEnd   = nRowStart + static_cast<SCCOL>(mnPageFields-1);
++
++    for (SCROW nRow = nRowStart; nRow <= nRowEnd; ++nRow)
++        aAddrs.push_back(ScAddress(nCol, nRow, nTab));
++    rAddrs.swap(aAddrs);
++}
++
++SCROW ScDPOutputGeometry::getRowFieldHeaderRow() const
++{
++    SCROW nCurRow = maOutRange.aStart.Row();
++
++    if (mnPageFields)
++    {
++        SCROW nRowStart = maOutRange.aStart.Row() + mbShowFilter;
++        SCROW nRowEnd   = nRowStart + static_cast<SCCOL>(mnPageFields-1);
++        nCurRow = nRowEnd + 2;
++    }
++    else if (mbShowFilter)
++        nCurRow += 2;
++
++    if (mnColumnFields)
++        nCurRow += static_cast<SCROW>(mnColumnFields);
++    else if (mnRowFields)
++        ++nCurRow;
++
++    return nCurRow;
++}
++
++ScDPOutputGeometry::FieldType ScDPOutputGeometry::getFieldButtonType(const ScAddress& rPos) const
++{
++    // We will ignore the table position for now.
++
++    bool bExtraTitleRow = (mnColumnFields == 0 && meImportType == ScDPOutputGeometry::XLS);
++    bool bDataLayout = mnDataFields > 1;
++
++    SCROW nCurRow = maOutRange.aStart.Row();
++
++    if (mnPageFields)
++    {
++        SCCOL nCol = maOutRange.aStart.Col();
++        SCROW nRowStart = maOutRange.aStart.Row() + mbShowFilter;
++        SCROW nRowEnd   = nRowStart + static_cast<SCCOL>(mnPageFields-1);
++        if (rPos.Col() == nCol && nRowStart <= rPos.Row() && rPos.Row() <= nRowEnd)
++            return Page;
++
++        nCurRow = nRowEnd + 2;
++    }
++    else if (mbShowFilter)
++        nCurRow += 2;
++
++    if (mnColumnFields)
++    {
++        SCROW nRow = nCurRow;
++        SCCOL nColStart = maOutRange.aStart.Col() + mnRowFields + bDataLayout;
++        SCCOL nColEnd = nColStart + static_cast<SCCOL>(mnColumnFields-1);
++        if (rPos.Row() == nRow && nColStart <= rPos.Col() && rPos.Col() <= nColEnd)
++            return Column;
++
++        nCurRow += static_cast<SCROW>(mnColumnFields);
++    }
++
++    if (bExtraTitleRow)
++        ++nCurRow;
++
++    if (mnRowFields)
++    {
++        SCCOL nColStart = maOutRange.aStart.Col();
++        SCCOL nColEnd = nColStart + static_cast<SCCOL>(mnRowFields-1);
++        if (rPos.Row() == nCurRow && nColStart <= rPos.Col() && rPos.Col() <= nColEnd)
++            return Row;
++    }
++
++    return None;
++}
+diff --git sc/source/core/data/dpsave.cxx sc/source/core/data/dpsave.cxx
+index b7e04fc..3161155 100644
+--- sc/source/core/data/dpsave.cxx
++++ sc/source/core/data/dpsave.cxx
+@@ -58,7 +58,15 @@
+ #include <com/sun/star/container/XNamed.hpp>
+ #include <com/sun/star/util/XCloneable.hpp>
+ 
++#include <hash_map>
++
+ using namespace com::sun::star;
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::uno::Any;
++using ::rtl::OUString;
++using ::rtl::OUStringHash;
++using ::std::hash_map;
++using ::std::auto_ptr;
+ 
+ // -----------------------------------------------------------------------
+ 
+@@ -99,6 +107,7 @@ void lcl_SetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp,
+ 
+ ScDPSaveMember::ScDPSaveMember(const String& rName) :
+     aName( rName ),
++    mpLayoutName(NULL),
+     nVisibleMode( SC_DPSAVEMODE_DONTKNOW ),
+     nShowDetailsMode( SC_DPSAVEMODE_DONTKNOW )
+ {
+@@ -106,9 +115,12 @@ ScDPSaveMember::ScDPSaveMember(const String& rName) :
+ 
+ ScDPSaveMember::ScDPSaveMember(const ScDPSaveMember& r) :
+     aName( r.aName ),
++    mpLayoutName(NULL),
+     nVisibleMode( r.nVisibleMode ),
+     nShowDetailsMode( r.nShowDetailsMode )
+ {
++    if (r.mpLayoutName.get())
++        mpLayoutName.reset(new OUString(*r.mpLayoutName));
+ }
+ 
+ ScDPSaveMember::~ScDPSaveMember()
+@@ -153,12 +165,23 @@ void ScDPSaveMember::SetName( const String& rNew )
+     aName = rNew;
+ }
+ 
+-void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMember, sal_Int32 nPosition )
++void ScDPSaveMember::SetLayoutName( const OUString& rName )
+ {
+-    //	nothing to do?
+-    if ( nVisibleMode == SC_DPSAVEMODE_DONTKNOW && nShowDetailsMode == SC_DPSAVEMODE_DONTKNOW && nPosition < 0 )
+-        return;
++    mpLayoutName.reset(new OUString(rName));
++}
+ 
++const OUString* ScDPSaveMember::GetLayoutName() const
++{
++    return mpLayoutName.get();
++}
++
++void ScDPSaveMember::RemoveLayoutName()
++{
++    mpLayoutName.reset(NULL);
++}
++
++void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMember, sal_Int32 nPosition )
++{
+     uno::Reference<beans::XPropertySet> xMembProp( xMember, uno::UNO_QUERY );
+     DBG_ASSERT( xMembProp.is(), "no properties at member" );
+     if ( xMembProp.is() )
+@@ -173,17 +196,11 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
+             lcl_SetBoolProperty( xMembProp,
+                     rtl::OUString::createFromAscii(DP_PROP_SHOWDETAILS), (BOOL)nShowDetailsMode );
+ 
++        if (mpLayoutName.get())
++            ScUnoHelpFunctions::SetOptionalPropertyValue(xMembProp, SC_UNO_LAYOUTNAME, *mpLayoutName);
++
+         if ( nPosition >= 0 )
+-        {
+-            try
+-            {
+-                xMembProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_POSITION), uno::Any(nPosition) );
+-            }
+-            catch ( uno::Exception& )
+-            {
+-                // position is optional - exception must be ignored
+-            }
+-        }
++            ScUnoHelpFunctions::SetOptionalPropertyValue(xMembProp, DP_PROP_POSITION, nPosition);
+     }
+ }
+ 
+@@ -191,8 +208,9 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
+ 
+ ScDPSaveDimension::ScDPSaveDimension(const String& rName, BOOL bDataLayout) :
+     aName( rName ),
+-    pLayoutName( NULL ),
+     pSelectedPage( NULL ),
++	mpLayoutName(NULL),
++	mpSubtotalName(NULL),
+     bIsDataLayout( bDataLayout ),
+     bDupFlag( FALSE ),
+     nOrientation( sheet::DataPilotFieldOrientation_HIDDEN ),
+@@ -211,6 +229,8 @@ ScDPSaveDimension::ScDPSaveDimension(const String& rName, BOOL bDataLayout) :
+ 
+ ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
+     aName( r.aName ),
++	mpLayoutName(NULL),
++	mpSubtotalName(NULL),
+     bIsDataLayout( r.bIsDataLayout ),
+     bDupFlag( r.bDupFlag ),
+     nOrientation( r.nOrientation ),
+@@ -251,14 +271,14 @@ ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
+         pLayoutInfo = new sheet::DataPilotFieldLayoutInfo( *(r.pLayoutInfo) );
+     else
+         pLayoutInfo = NULL;
+-    if (r.pLayoutName)
+-        pLayoutName = new String( *(r.pLayoutName) );
+-    else
+-        pLayoutName = NULL;
+     if (r.pSelectedPage)
+         pSelectedPage = new String( *(r.pSelectedPage) );
+     else
+         pSelectedPage = NULL;
++	if (r.mpLayoutName.get())
++        mpLayoutName.reset(new OUString(*r.mpLayoutName));
++	if (r.mpSubtotalName.get())
++		mpSubtotalName.reset(new OUString(*r.mpSubtotalName));
+ }
+ 
+ ScDPSaveDimension::~ScDPSaveDimension()
+@@ -269,7 +289,6 @@ ScDPSaveDimension::~ScDPSaveDimension()
+     delete pSortInfo;
+     delete pAutoShowInfo;
+     delete pLayoutInfo;
+-    delete pLayoutName;
+     delete pSelectedPage;
+     delete [] pSubTotalFuncs;
+ }
+@@ -370,25 +389,45 @@ void ScDPSaveDimension::SetUsedHierarchy(long nNew)
+     nUsedHierarchy = nNew;
+ }
+ 
+-BOOL ScDPSaveDimension::HasLayoutName() const
++void ScDPSaveDimension::SetSubtotalName(const OUString& rName)
+ {
+-    return ( pLayoutName != NULL );
++	mpSubtotalName.reset(new OUString(rName));
+ }
+ 
+-void ScDPSaveDimension::SetLayoutName(const String* pName)
++const OUString* ScDPSaveDimension::GetSubtotalName() const
+ {
+-    delete pLayoutName;
+-    if (pName)
+-        pLayoutName = new String( *pName );
+-    else
+-        pLayoutName = NULL;
++	return mpSubtotalName.get();
++}
++
++bool ScDPSaveDimension::IsMemberNameInUse(const OUString& rName) const
++{
++    MemberList::const_iterator itr = maMemberList.begin(), itrEnd = maMemberList.end();
++    for (; itr != itrEnd; ++itr)
++    {
++        const ScDPSaveMember* pMem = *itr;
++        if (rName.equalsIgnoreAsciiCase(pMem->GetName()))
++            return true;
++
++        const OUString* pLayoutName = pMem->GetLayoutName();
++        if (pLayoutName && rName.equalsIgnoreAsciiCase(*pLayoutName))
++            return true;
++    }
++    return false;
++}
++
++void ScDPSaveDimension::SetLayoutName(const OUString& rName)
++{
++    mpLayoutName.reset(new OUString(rName));
+ }
+ 
+-const String& ScDPSaveDimension::GetLayoutName() const
++const OUString* ScDPSaveDimension::GetLayoutName() const
+ {
+-    if (pLayoutName)
+-        return *pLayoutName;
+-    return aName;
++	return mpLayoutName.get();
++}
++
++void ScDPSaveDimension::RemoveLayoutName()
++{
++    mpLayoutName.reset(NULL);
+ }
+ 
+ void ScDPSaveDimension::SetReferenceValue(const sheet::DataPilotFieldReference* pNew)
+@@ -520,15 +559,15 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
+             aFilter = uno::Sequence<sheet::TableFilterField>( &aField, 1 );
+         }
+         // else keep empty sequence
+-        try
+-        {
+-            aAny <<= aFilter;
+-            xDimProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_FILTER), aAny );
+-        }
+-        catch ( beans::UnknownPropertyException& )
+-        {
+-            // recent addition - allow source to not handle it (no error)
+-        }
++
++        ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, DP_PROP_FILTER, aFilter);
++        if (mpLayoutName.get())
++            ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_LAYOUTNAME, *mpLayoutName);
++
++        const OUString* pSubTotalName = GetSubtotalName();
++        if (pSubTotalName)
++            // Custom subtotal name, with '?' being replaced by the visible field name later.
++            ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_FIELD_SUBTOTALNAME, *pSubTotalName);
+     }
+ 
+     //	Level loop outside of maMemberList loop
+@@ -546,6 +585,8 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
+         nHierCount = xHiers->getCount();
+     }
+ 
++    sal_Bool bHasHiddenMember = false;
++
+     for (long nHier=0; nHier<nHierCount; nHier++)
+     {
+         uno::Reference<uno::XInterface> xHierarchy = ScUnoHelpFunctions::AnyToInterface( xHiers->getByIndex(nHier) );
+@@ -585,41 +626,13 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
+                         rtl::OUString::createFromAscii(DP_PROP_SHOWEMPTY), (BOOL)nShowEmptyMode );
+ 
+                 if ( pSortInfo )
+-                {
+-                    aAny <<= *pSortInfo;
+-                    try
+-                    {
+-                        xLevProp->setPropertyValue( rtl::OUString::createFromAscii(SC_UNO_SORTING), aAny );
+-                    }
+-                    catch ( beans::UnknownPropertyException& )
+-                    {
+-                        // recent addition - allow source to not handle it (no error)
+-                    }
+-                }
++                    ScUnoHelpFunctions::SetOptionalPropertyValue(xLevProp, SC_UNO_SORTING, *pSortInfo);
++
+                 if ( pAutoShowInfo )
+-                {
+-                    aAny <<= *pAutoShowInfo;
+-                    try
+-                    {
+-                        xLevProp->setPropertyValue( rtl::OUString::createFromAscii(SC_UNO_AUTOSHOW), aAny );
+-                    }
+-                    catch ( beans::UnknownPropertyException& )
+-                    {
+-                        // recent addition - allow source to not handle it (no error)
+-                    }
+-                }
++                    ScUnoHelpFunctions::SetOptionalPropertyValue(xLevProp, SC_UNO_AUTOSHOW, *pAutoShowInfo);
++
+                 if ( pLayoutInfo )
+-                {
+-                    aAny <<= *pLayoutInfo;
+-                    try
+-                    {
+-                        xLevProp->setPropertyValue( rtl::OUString::createFromAscii(SC_UNO_LAYOUT), aAny );
+-                    }
+-                    catch ( beans::UnknownPropertyException& )
+-                    {
+-                        // recent addition - allow source to not handle it (no error)
+-                    }
+-                }
++                    ScUnoHelpFunctions::SetOptionalPropertyValue(xLevProp, SC_UNO_LAYOUT, *pLayoutInfo);
+ 
+                 // exceptions are caught at ScDPSaveData::WriteToSource
+             }
+@@ -638,12 +651,15 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
+ 
+                         for (MemberList::const_iterator i=maMemberList.begin(); i != maMemberList.end() ; i++)
+                         {
+-                            rtl::OUString aMemberName = (*i)->GetName();
++                            ScDPSaveMember* pMember = *i;
++                            if (!pMember->GetIsVisible())
++                                bHasHiddenMember = true;
++                            rtl::OUString aMemberName = pMember->GetName();
+                             if ( xMembers->hasByName( aMemberName ) )
+                             {
+                                 uno::Reference<uno::XInterface> xMemberInt = ScUnoHelpFunctions::AnyToInterface(
+                                     xMembers->getByName( aMemberName ) );
+-                                (*i)->WriteToSource( xMemberInt, nPosition );
++								pMember->WriteToSource( xMemberInt, nPosition );
+ 
+                                 if ( nPosition >= 0 )
+                                     ++nPosition;            // increase if initialized
+@@ -655,6 +671,35 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
+             }
+         }
+     }
++
++    if (xDimProp.is())
++        ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_HAS_HIDDEN_MEMBER, bHasHiddenMember);
++}
++
++void ScDPSaveDimension::UpdateMemberVisibility(const hash_map<OUString, bool, OUStringHash>& rData)
++{
++    typedef hash_map<OUString, bool, OUStringHash> DataMap;
++    MemberList::iterator itrMem = maMemberList.begin(), itrMemEnd = maMemberList.end();
++    for (; itrMem != itrMemEnd; ++itrMem)
++    {
++        ScDPSaveMember* pMem = *itrMem;
++        const String& rMemName = pMem->GetName();
++        DataMap::const_iterator itr = rData.find(rMemName);
++        if (itr != rData.end())
++            pMem->SetIsVisible(itr->second);
++    }
++}
++
++bool ScDPSaveDimension::HasInvisibleMember() const
++{
++    MemberList::const_iterator itrMem = maMemberList.begin(), itrMemEnd = maMemberList.end();
++    for (; itrMem != itrMemEnd; ++itrMem)
++    {
++        const ScDPSaveMember* pMem = *itrMem;
++        if (!pMem->GetIsVisible())
++            return true;
++    }
++    return false;
+ }
+ 
+ // -----------------------------------------------------------------------
+@@ -666,7 +711,9 @@ ScDPSaveData::ScDPSaveData() :
+     nIgnoreEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
+     nRepeatEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
+     bFilterButton( TRUE ),
+-    bDrillDown( TRUE )
++    bDrillDown( TRUE ),
++    mbDimensionMembersBuilt(false),
++    mpGrandTotalName(NULL)
+ {
+ }
+ 
+@@ -676,7 +723,9 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) :
+     nIgnoreEmptyMode( r.nIgnoreEmptyMode ),
+     nRepeatEmptyMode( r.nRepeatEmptyMode ),
+     bFilterButton( r.bFilterButton ),
+-    bDrillDown( r.bDrillDown )
++    bDrillDown( r.bDrillDown ),
++    mbDimensionMembersBuilt(r.mbDimensionMembersBuilt),
++    mpGrandTotalName(NULL)
+ {
+     if ( r.pDimensionData )
+         pDimensionData = new ScDPDimensionSaveData( *r.pDimensionData );
+@@ -689,6 +738,9 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) :
+         ScDPSaveDimension* pNew = new ScDPSaveDimension( *(ScDPSaveDimension*)r.aDimList.GetObject(i) );
+         aDimList.Insert( pNew, LIST_APPEND );
+     }
++
++    if (r.mpGrandTotalName.get())
++        mpGrandTotalName.reset(new OUString(*r.mpGrandTotalName));
+ }
+ 
+ ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r )
+@@ -707,6 +759,7 @@ ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r )
+         nRepeatEmptyMode = r.nRepeatEmptyMode;
+         bFilterButton    = r.bFilterButton;
+         bDrillDown       = r.bDrillDown;
++        mbDimensionMembersBuilt = r.mbDimensionMembersBuilt;
+ 
+         //	remove old dimensions
+ 
+@@ -725,6 +778,9 @@ ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r )
+                 new ScDPSaveDimension( *(ScDPSaveDimension*)r.aDimList.GetObject(i) );
+             aDimList.Insert( pNew, LIST_APPEND );
+         }
++
++        if (r.mpGrandTotalName.get())
++            mpGrandTotalName.reset(new OUString(*r.mpGrandTotalName));
+     }
+     return *this;
+ }
+@@ -736,7 +792,8 @@ BOOL ScDPSaveData::operator== ( const ScDPSaveData& r ) const
+          nIgnoreEmptyMode != r.nIgnoreEmptyMode ||
+          nRepeatEmptyMode != r.nRepeatEmptyMode ||
+          bFilterButton    != r.bFilterButton    ||
+-         bDrillDown       != r.bDrillDown )
++         bDrillDown       != r.bDrillDown ||
++         mbDimensionMembersBuilt != r.mbDimensionMembersBuilt)
+         return FALSE;
+ 
+     if ( pDimensionData || r.pDimensionData )
+@@ -752,6 +809,16 @@ BOOL ScDPSaveData::operator== ( const ScDPSaveData& r ) const
+                 *(ScDPSaveDimension*)r.aDimList.GetObject(i) ) )
+             return FALSE;
+ 
++    if (mpGrandTotalName.get())
++    {
++        if (!r.mpGrandTotalName.get())
++            return false;
++        if (!mpGrandTotalName->equals(*r.mpGrandTotalName))
++            return false;
++    }
++    else if (r.mpGrandTotalName.get())
++        return false;
++
+     return TRUE;
+ }
+ 
+@@ -765,6 +832,16 @@ ScDPSaveData::~ScDPSaveData()
+     delete pDimensionData;
+ }
+ 
++void ScDPSaveData::SetGrandTotalName(const OUString& rName)
++{
++    mpGrandTotalName.reset(new OUString(rName));
++}
++
++const OUString* ScDPSaveData::GetGrandTotalName() const
++{
++    return mpGrandTotalName.get();
++}
++
+ ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const String& rName)
+ {
+     long nCount = aDimList.Count();
+@@ -779,7 +856,7 @@ ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const String& rName)
+     return pNew;
+ }
+ 
+-ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const String& rName)
++ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const String& rName) const
+ {
+     long nCount = aDimList.Count();
+     for (long i=0; i<nCount; i++)
+@@ -807,16 +884,25 @@ ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const String& rName)
+ 
+ ScDPSaveDimension* ScDPSaveData::GetDataLayoutDimension()
+ {
+-    ULONG nCount = aDimList.Count();
+-    for (ULONG i=0; i<nCount; i++)
++    ScDPSaveDimension* pDim = GetExistingDataLayoutDimension();
++    if (pDim)
++        return pDim;
++
++	ScDPSaveDimension* pNew = new ScDPSaveDimension( String(), TRUE );
++	aDimList.Insert( pNew, LIST_APPEND );
++	return pNew;
++}
++
++ScDPSaveDimension* ScDPSaveData::GetExistingDataLayoutDimension() const
++{
++    long nCount = aDimList.Count();
++    for (long i=0; i<nCount; i++)
+     {
+         ScDPSaveDimension* pDim = (ScDPSaveDimension*)aDimList.GetObject(i);
+         if ( pDim->IsDataLayout() )
+             return pDim;
+     }
+-    ScDPSaveDimension* pNew = new ScDPSaveDimension( String(), TRUE );
+-    aDimList.Insert( pNew, LIST_APPEND );
+-    return pNew;
++    return NULL;
+ }
+ 
+ ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const String& rName)
+@@ -870,6 +956,18 @@ ScDPSaveDimension* ScDPSaveData::GetInnermostDimension(USHORT nOrientation)
+     return pInner;      // the last matching one
+ }
+ 
++ScDPSaveDimension* ScDPSaveData::GetFirstDimension(sheet::DataPilotFieldOrientation eOrientation)
++{
++    long nCount = aDimList.Count();
++    for (long i = 0; i < nCount; ++i)
++    {
++        ScDPSaveDimension* pDim = static_cast<ScDPSaveDimension*>(aDimList.GetObject(i));
++        if (pDim->GetOrientation() == eOrientation && !pDim->IsDataLayout())
++            return pDim;
++    }
++    return NULL;
++}
++
+ long ScDPSaveData::GetDataDimensionCount() const
+ {
+     long nDataCount = 0;
+@@ -982,6 +1080,10 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
+         {
+             // no error
+         }
++
++        const OUString* pGrandTotalName = GetGrandTotalName();
++        if (pGrandTotalName)
++            ScUnoHelpFunctions::SetOptionalPropertyValue(xSourceProp, SC_UNO_GRANDTOTAL_NAME, *pGrandTotalName);
+     }
+ 
+     // exceptions in the other calls are errors
+@@ -1100,3 +1202,58 @@ void ScDPSaveData::SetDimensionData( const ScDPDimensionSaveData* pNew )
+         pDimensionData = NULL;
+ }
+ 
++void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
++{
++    if (mbDimensionMembersBuilt)
++        return;
++
++    // First, build a dimension name-to-index map.
++    typedef hash_map<OUString, long, ::rtl::OUStringHash> NameIndexMap;
++    NameIndexMap aMap;
++    long nColCount = pData->GetColumnCount();
++    for (long i = 0; i < nColCount; ++i)
++        aMap.insert( NameIndexMap::value_type(pData->getDimensionName(i), i));
++
++    NameIndexMap::const_iterator itrEnd = aMap.end();
++
++    sal_uInt32 n = aDimList.Count();
++    for (sal_uInt32 i = 0; i < n; ++i)
++    {
++        ScDPSaveDimension* pDim = static_cast<ScDPSaveDimension*>(aDimList.GetObject(i));
++        const String& rDimName = pDim->GetName();
++        if (!rDimName.Len())
++            // empty dimension name.  It must be data layout.
++            continue;
++
++        NameIndexMap::const_iterator itr = aMap.find(rDimName);
++        if (itr == itrEnd)
++            // dimension name not in the data.  This should never happen!
++            continue;
++
++        long nDimIndex = itr->second;
++        const TypedScStrCollection& rMembers = pData->GetColumnEntries(nDimIndex);
++        sal_uInt16 nMemberCount = rMembers.GetCount();
++        for (sal_uInt16 j = 0; j < nMemberCount; ++j)
++        {
++            const String& rMemName = rMembers[j]->GetString();
++            if (pDim->GetExistingMemberByName(rMemName))
++                // this member instance already exists.  nothing to do.
++                continue;
++
++            auto_ptr<ScDPSaveMember> pNewMember(new ScDPSaveMember(rMemName));
++            pNewMember->SetIsVisible(true);
++            pDim->AddMember(pNewMember.release());
++        }
++    }
++
++    mbDimensionMembersBuilt = true;
++}
++
++bool ScDPSaveData::HasInvisibleMember(const OUString& rDimName) const
++{
++    ScDPSaveDimension* pDim = GetExistingDimensionByName(rDimName);
++    if (!pDim)
++        return false;
++
++    return pDim->HasInvisibleMember();
++}
+diff --git sc/source/core/data/dptabres.cxx sc/source/core/data/dptabres.cxx
+index 675a0a5..0494bc6 100644
+--- sc/source/core/data/dptabres.cxx
++++ sc/source/core/data/dptabres.cxx
+@@ -67,6 +67,7 @@ using ::std::vector;
+ using ::std::pair;
+ using ::std::hash_map;
+ using ::com::sun::star::uno::Sequence;
++using ::rtl::OUString;
+ 
+ // -----------------------------------------------------------------------
+ 
+@@ -825,11 +826,11 @@ USHORT ScDPResultData::GetMeasureRefOrient(long nMeasure) const
+     return pMeasRefOrient[nMeasure];
+ }
+ 
+-String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc) const
++String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const
+ {
+     //	with bForce==TRUE, return function instead of "result" for single measure
+     //	with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc
+-
++    rbTotalResult = false;
+     if ( nMeasure < 0 || ( nMeasCount == 1 && !bForce && eForceFunc == SUBTOTAL_FUNC_NONE ) )
+     {
+         //	for user-specified subtotal function with all measures,
+@@ -837,12 +838,19 @@ String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFu
+         if ( eForceFunc != SUBTOTAL_FUNC_NONE )
+             return ScGlobal::GetRscString(nFuncStrIds[eForceFunc]);
+ 
++        rbTotalResult = true;
+         return ScGlobal::GetRscString(STR_TABLE_ERGEBNIS);
+     }
+     else
+     {
+         DBG_ASSERT( pMeasNames && nMeasure < nMeasCount, "bumm" );
+-
++        ScDPDimension* pDataDim = pSource->GetDataDimension(nMeasure);
++        if (pDataDim)
++        {
++            const OUString* pLayoutName = pDataDim->GetLayoutName();
++            if (pLayoutName)
++                return *pLayoutName;
++        }
+         String aRet;
+         ScSubTotalFunc eFunc = ( eForceFunc == SUBTOTAL_FUNC_NONE ) ?
+                                     GetMeasureFunction(nMeasure) : eForceFunc;
+@@ -896,6 +904,11 @@ BOOL ScDPResultData::HasCommonElement( const ScDPItemData& rFirstData, long nFir
+     return pSource->GetData()->HasCommonElement( rFirstData, nFirstIndex, rSecondData, nSecondIndex );
+ }
+ 
++const ScDPSource* ScDPResultData::GetSource() const
++{
++    return pSource;
++}
++
+ // -----------------------------------------------------------------------
+ 
+ 
+@@ -1172,6 +1185,33 @@ void ScDPResultMember::ProcessData( const vector<ScDPItemData>& aChildMembers, c
+     }
+ }
+ 
++/** 
++ * Parse subtotal string and replace all occurrences of '?' with the caption
++ * string.  Do ensure that escaped characters are not translated.
++ */ 
++static String lcl_parseSubtotalName(const String& rSubStr, const String& rCaption)
++{
++    String aNewStr;
++    xub_StrLen n = rSubStr.Len();
++    bool bEscaped = false;
++    for (xub_StrLen i = 0; i < n; ++i)
++    {
++        sal_Unicode c = rSubStr.GetChar(i);
++        if (!bEscaped && c == sal_Unicode('\\'))
++        {
++            bEscaped = true;
++            continue;
++        }
++
++        if (!bEscaped && c == sal_Unicode('?'))
++            aNewStr.Append(rCaption);
++        else
++            aNewStr.Append(c);
++        bEscaped = false;
++    }
++    return aNewStr;
++}
++
+ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pSequences,
+                                             long& rPos, long nMeasure, BOOL bRoot,
+                                             const String* pMemberName,
+@@ -1204,17 +1244,25 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
+     }
+ 
+     String aCaption = aName;
++    if (pMemberDesc)
++    {
++        const OUString* pLayoutName = pMemberDesc->GetLayoutName();
++        if (pLayoutName)
++        {
++            aCaption = *pLayoutName;
++            bIsNumeric = false; // layout name is always non-numeric.
++        }
++    }
++
+     if ( pMemberCaption )					// use pMemberCaption if != NULL
+         aCaption = *pMemberCaption;
+     if (!aCaption.Len())
+         aCaption = ScGlobal::GetRscString(STR_EMPTYDATA);
+ 
+-    if ( !bIsNumeric )
+-    {
+-        // add a "'" character so a string isn't parsed as value in the output cell
+-        //! have a separate bit in Flags (MemberResultFlags) instead?
+-        aCaption.Insert( (sal_Unicode) '\'', 0 );
+-    }
++    if (bIsNumeric)
++        pArray[rPos].Flags |= sheet::MemberResultFlags::NUMERIC;
++    else
++        pArray[rPos].Flags &= ~sheet::MemberResultFlags::NUMERIC;
+ 
+     if ( nSize && !bRoot )					// root is overwritten by first dimension
+     {
+@@ -1277,9 +1325,30 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
+                 if (bHasChild)
+                     eForce = lcl_GetForceFunc( pParentLevel, nUserPos );
+ 
+-                String aSubStr = aName;		//! caption?
++                bool bTotalResult = false;
++				String aSubStr = aCaption;
+                 aSubStr += ' ';
+-                aSubStr += pResultData->GetMeasureString(nMemberMeasure, FALSE, eForce);
++				aSubStr += pResultData->GetMeasureString(nMemberMeasure, FALSE, eForce, bTotalResult);
++
++                if (bTotalResult)
++                {
++                    if (pMemberDesc)
++                    {
++                        // single data field layout.
++                        const OUString* pSubtotalName = pParentDim->GetSubtotalName();
++                        if (pSubtotalName)
++                            aSubStr = lcl_parseSubtotalName(*pSubtotalName, aCaption);
++                        pArray[rPos].Flags &= ~sheet::MemberResultFlags::GRANDTOTAL;
++                    }
++                    else
++                    {
++                        // root member - subtotal (grand total?) for multi-data field layout.
++                        const rtl::OUString* pGrandTotalName = pResultData->GetSource()->GetGrandTotalName();
++                        if (pGrandTotalName)
++                            aSubStr = *pGrandTotalName;
++                        pArray[rPos].Flags |= sheet::MemberResultFlags::GRANDTOTAL;
++                    }
++                }
+ 
+                 pArray[rPos].Name    = rtl::OUString(aName);
+                 pArray[rPos].Caption = rtl::OUString(aSubStr);
+@@ -2796,8 +2865,9 @@ void ScDPResultDimension::FillMemberResults( uno::Sequence<sheet::MemberResult>*
+         //	in data layout dimension, use first member with different measures/names
+         if ( bIsDataLayout )
+         {
++            bool bTotalResult = false;
+             String aMbrName = pResultData->GetMeasureDimensionName( nSorted );
+-            String aMbrCapt = pResultData->GetMeasureString( nSorted, FALSE, SUBTOTAL_FUNC_NONE );
++			String aMbrCapt = pResultData->GetMeasureString( nSorted, FALSE, SUBTOTAL_FUNC_NONE, bTotalResult );
+             maMemberArray[0]->FillMemberResults( pSequences, nPos, nSorted, FALSE, &aMbrName, &aMbrCapt );
+         }
+         else if ( pMember->IsVisible() )
+diff --git sc/source/core/data/dptabsrc.cxx sc/source/core/data/dptabsrc.cxx
+index 3b5a6e0..1216202 100644
+--- sc/source/core/data/dptabsrc.cxx
++++ sc/source/core/data/dptabsrc.cxx
+@@ -85,6 +85,7 @@ using ::com::sun::star::uno::Reference;
+ using ::com::sun::star::uno::Sequence;
+ using ::com::sun::star::uno::Any;
+ using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo;
++using ::rtl::OUString;
+ 
+ // -----------------------------------------------------------------------
+ 
+@@ -141,15 +142,14 @@ ScDPSource::ScDPSource( ScDPTableData* pD ) :
+     pRowResRoot( NULL ),
+     pColResults( NULL ),
+     pRowResults( NULL ),
+-    bResultOverflow( FALSE )
++	bResultOverflow( FALSE ),
++    mpGrandTotalName(NULL)
+ {
+     pData->SetEmptyFlags( bIgnoreEmptyRows, bRepeatIfEmpty );
+ }
+ 
+ ScDPSource::~ScDPSource()
+ {
+-    delete pData;			// ScDPTableData is not ref-counted
+-
+     if (pDimensions)
+         pDimensions->release();		// ref-counted
+ 
+@@ -163,6 +163,16 @@ ScDPSource::~ScDPSource()
+     delete pResData;
+ }
+ 
++void ScDPSource::SetGrandTotalName(const ::rtl::OUString& rName)
++{
++    mpGrandTotalName.reset(new ::rtl::OUString(rName));
++}
++
++const ::rtl::OUString* ScDPSource::GetGrandTotalName() const
++{
++    return mpGrandTotalName.get();
++}
++
+ USHORT ScDPSource::GetOrientation(long nColumn)
+ {
+     long i;
+@@ -186,16 +196,21 @@ long ScDPSource::GetDataDimensionCount()
+     return nDataDimCount;
+ }
+ 
++ScDPDimension* ScDPSource::GetDataDimension(long nIndex)
++{
++    if (nIndex < 0 || nIndex >= nDataDimCount)
++        return NULL;
++
++    long nDimIndex = nDataDims[nIndex];
++    return GetDimensionsObject()->getByIndex(nDimIndex);
++}
++
+ String ScDPSource::GetDataDimName( long nIndex )
+ {
+     String aRet;
+-    if ( nIndex >= 0 && nIndex < nDataDimCount )
+-    {
+-        long nDimIndex = nDataDims[nIndex];
+-        ScDPDimension* pDim = GetDimensionsObject()->getByIndex(nDimIndex);
+-        if (pDim)
+-            aRet = String( pDim->getName() );
+-    }
++    ScDPDimension* pDim = GetDataDimension(nIndex);
++    if (pDim)
++        aRet = String(pDim->getName());
+     return aRet;
+ }
+ 
+@@ -488,7 +503,10 @@ String ScDPSource::getDataDescription()
+ 
+     String aRet;
+     if ( pResData->GetMeasureCount() == 1 )
+-        aRet = pResData->GetMeasureString( 0, TRUE, SUBTOTAL_FUNC_NONE );
++    {
++        bool bTotalResult = false;
++        aRet = pResData->GetMeasureString( 0, TRUE, SUBTOTAL_FUNC_NONE, bTotalResult );
++    }
+ 
+     //	empty for more than one measure
+ 
+@@ -1132,6 +1150,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
+                                                         throw(uno::RuntimeException)
+ {
+     ScUnoGuard aGuard;
++    using beans::PropertyAttribute::READONLY;
+ 
+     static SfxItemPropertyMapEntry aDPSourceMap_Impl[] =
+     {
+@@ -1140,6 +1159,10 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
+         {MAP_CHAR_LEN(SC_UNO_IGNOREEM),	0,	&getBooleanCppuType(),				0, 0 },		// for sheet data only
+         {MAP_CHAR_LEN(SC_UNO_REPEATIF),	0,	&getBooleanCppuType(),				0, 0 },		// for sheet data only
+         {MAP_CHAR_LEN(SC_UNO_ROWGRAND),	0,	&getBooleanCppuType(),				0, 0 },
++        {MAP_CHAR_LEN(SC_UNO_ROWFIELDCOUNT),    0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
++        {MAP_CHAR_LEN(SC_UNO_COLUMNFIELDCOUNT), 0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
++        {MAP_CHAR_LEN(SC_UNO_DATAFIELDCOUNT),   0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
++        {MAP_CHAR_LEN(SC_UNO_GRANDTOTAL_NAME),  0, &getCppuType(static_cast<OUString*>(0)), 0, 0 },
+         {0,0,0,0,0,0}
+     };
+     static uno::Reference<beans::XPropertySetInfo> aRef =
+@@ -1161,6 +1184,12 @@ void SAL_CALL ScDPSource::setPropertyValue( const rtl::OUString& aPropertyName,
+         setIgnoreEmptyRows( lcl_GetBoolFromAny( aValue ) );
+     else if ( aNameStr.EqualsAscii( SC_UNO_REPEATIF ) )
+         setRepeatIfEmpty( lcl_GetBoolFromAny( aValue ) );
++    else if (aNameStr.EqualsAscii(SC_UNO_GRANDTOTAL_NAME))
++    {
++        OUString aName;
++        if (aValue >>= aName)
++            mpGrandTotalName.reset(new OUString(aName));
++    }
+     else
+     {
+         DBG_ERROR("unknown property");
+@@ -1190,6 +1219,11 @@ uno::Any SAL_CALL ScDPSource::getPropertyValue( const rtl::OUString& aPropertyNa
+         aRet <<= static_cast<sal_Int32>(nColDimCount);
+     else if ( aNameStr.EqualsAscii( SC_UNO_DATAFIELDCOUNT ) )       // read-only
+         aRet <<= static_cast<sal_Int32>(nDataDimCount);
++    else if (aNameStr.EqualsAscii(SC_UNO_GRANDTOTAL_NAME))
++    {
++        if (mpGrandTotalName.get())
++            aRet <<= *mpGrandTotalName;
++    }
+     else
+     {
+         DBG_ERROR("unknown property");
+@@ -1337,9 +1371,12 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
+     pHierarchies( NULL ),
+     nUsedHier( 0 ),
+     nFunction( SUBTOTAL_FUNC_SUM ),		// sum is default
++    mpLayoutName(NULL),
++    mpSubtotalName(NULL),
+     nSourceDim( -1 ),
+     bHasSelectedPage( FALSE ),
+-    pSelectedData( NULL )
++	pSelectedData( NULL ),
++    mbHasHiddenMember(false)
+ {
+     //!	hold pSource
+ }
+@@ -1364,6 +1401,16 @@ ScDPHierarchies* ScDPDimension::GetHierarchiesObject()
+     return pHierarchies;
+ }
+ 
++const rtl::OUString* ScDPDimension::GetLayoutName() const
++{
++    return mpLayoutName.get();
++}
++
++const rtl::OUString* ScDPDimension::GetSubtotalName() const
++{
++    return mpSubtotalName.get();
++}
++
+ uno::Reference<container::XNameAccess> SAL_CALL ScDPDimension::getHierarchies()
+                                                     throw(uno::RuntimeException)
+ {
+@@ -1523,6 +1570,9 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
+         {MAP_CHAR_LEN(SC_UNO_POSITION),	0,	&getCppuType((sal_Int32*)0),				0, 0 },
+         {MAP_CHAR_LEN(SC_UNO_REFVALUE),	0,	&getCppuType((sheet::DataPilotFieldReference*)0), 0, 0 },
+         {MAP_CHAR_LEN(SC_UNO_USEDHIER),	0,	&getCppuType((sal_Int32*)0),				0, 0 },
++        {MAP_CHAR_LEN(SC_UNO_LAYOUTNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
++        {MAP_CHAR_LEN(SC_UNO_FIELD_SUBTOTALNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
++        {MAP_CHAR_LEN(SC_UNO_HAS_HIDDEN_MEMBER), 0, &getBooleanCppuType(), 0, 0 },
+         {0,0,0,0,0,0}
+     };
+     static uno::Reference<beans::XPropertySetInfo> aRef =
+@@ -1593,6 +1643,20 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
+         }
+         DELETEZ( pSelectedData );		// invalid after changing aSelectedPage
+     }
++    else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
++    {
++        OUString aTmpName;
++        if (aValue >>= aTmpName)
++            mpLayoutName.reset(new OUString(aTmpName));
++    }
++    else if (aNameStr.EqualsAscii(SC_UNO_FIELD_SUBTOTALNAME))
++    {
++        OUString aTmpName;
++        if (aValue >>= aTmpName)
++            mpSubtotalName.reset(new OUString(aTmpName));
++    }
++    else if (aNameStr.EqualsAscii(SC_UNO_HAS_HIDDEN_MEMBER))
++        aValue >>= mbHasHiddenMember;
+     else
+     {
+         DBG_ERROR("unknown property");
+@@ -1652,6 +1716,12 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert
+         else
+             aRet <<= uno::Sequence<sheet::TableFilterField>(0);
+     }
++    else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
++        aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString::createFromAscii("");
++    else if (aNameStr.EqualsAscii(SC_UNO_FIELD_SUBTOTALNAME))
++        aRet <<= mpSubtotalName.get() ? *mpSubtotalName : OUString::createFromAscii("");
++    else if (aNameStr.EqualsAscii(SC_UNO_HAS_HIDDEN_MEMBER))
++        aRet <<= mbHasHiddenMember;
+     else
+     {
+         DBG_ERROR("unknown property");
+@@ -2155,7 +2225,11 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
+             return aRet;
+     }
+ 
+-    return pSource->GetData()->getDimensionName( nSrcDim );		// (original) dimension name
++    ScDPDimension* pDim = pSource->GetDimensionsObject()->getByIndex(nSrcDim);
++    if (!pDim)
++        return rtl::OUString();
++
++    return pDim->getName();
+ }
+ 
+ void SAL_CALL ScDPLevel::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException)
+@@ -2258,6 +2332,20 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const rtl::OUString& aPropertyNam
+         aRet <<= aAutoShowInfo;
+     else if ( aNameStr.EqualsAscii( SC_UNO_LAYOUT ) )
+         aRet <<= aLayoutInfo;
++    else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
++    {
++        // read only property
++        long nSrcDim = pSource->GetSourceDim(nDim);
++        ScDPDimension* pDim = pSource->GetDimensionsObject()->getByIndex(nSrcDim);
++        if (!pDim)
++            return aRet;
++
++        const OUString* pLayoutName = pDim->GetLayoutName();
++        if (!pLayoutName)
++            return aRet;
++
++        aRet <<= *pLayoutName;
++    }
+     else
+     {
+         DBG_ERROR("unknown property");
+@@ -2550,6 +2638,7 @@ ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL,
+     nHier( nH ),
+     nLev( nL ),
+     maData( rN, fV, bHV ),
++    mpLayoutName(NULL),
+     nPosition( -1 ),
+     bVisible( TRUE ),
+     bShowDet( TRUE )
+@@ -2610,6 +2699,11 @@ void ScDPMember::FillItemData( ScDPItemData& rData ) const
+     rData = maData;
+ }
+ 
++const OUString* ScDPMember::GetLayoutName() const
++{
++    return mpLayoutName.get();
++}
++
+ String ScDPMember::GetNameStr() const
+ {
+     return maData.aString;
+@@ -2669,6 +2763,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo(
+         {MAP_CHAR_LEN(SC_UNO_ISVISIBL),	0,	&getBooleanCppuType(),				0, 0 },
+         {MAP_CHAR_LEN(SC_UNO_POSITION), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
+         {MAP_CHAR_LEN(SC_UNO_SHOWDETA),	0,	&getBooleanCppuType(),				0, 0 },
++        {MAP_CHAR_LEN(SC_UNO_LAYOUTNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
+         {0,0,0,0,0,0}
+     };
+     static uno::Reference<beans::XPropertySetInfo> aRef =
+@@ -2692,6 +2787,12 @@ void SAL_CALL ScDPMember::setPropertyValue( const rtl::OUString& aPropertyName,
+         if (aValue >>= nInt)
+             setPosition( nInt );
+     }
++    else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
++    {
++        rtl::OUString aName;
++        if (aValue >>= aName)
++            mpLayoutName.reset(new rtl::OUString(aName));
++    }
+     else
+     {
+         DBG_ERROR("unknown property");
+@@ -2711,6 +2812,8 @@ uno::Any SAL_CALL ScDPMember::getPropertyValue( const rtl::OUString& aPropertyNa
+         lcl_SetBoolInAny( aRet, getShowDetails() );
+     else if ( aNameStr.EqualsAscii( SC_UNO_POSITION ) )
+         aRet <<= (sal_Int32) getPosition();
++    else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
++        aRet <<= mpLayoutName.get() ? *mpLayoutName : rtl::OUString();
+     else
+     {
+         DBG_ERROR("unknown property");
+diff --git sc/source/core/data/fillinfo.cxx sc/source/core/data/fillinfo.cxx
+index 1de2385..54ffe10 100644
+--- sc/source/core/data/fillinfo.cxx
++++ sc/source/core/data/fillinfo.cxx
+@@ -332,6 +332,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
+             pInfo->bVOverlapped = FALSE;
+             pInfo->bAutoFilter	= FALSE;
+             pInfo->bPushButton	= FALSE;
++            pInfo->bPopupButton = false;
++            pInfo->bFilterActive = false;
+             pInfo->nRotateDir	= SC_ROTDIR_NONE;
+ 
+             pInfo->bPrinted		= FALSE;					//	view-intern
+@@ -458,6 +460,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
+                         BOOL bAutoFilter  = ((nOverlap & SC_MF_AUTO) != 0);
+                         BOOL bPushButton  = ((nOverlap & SC_MF_BUTTON) != 0);
+                         BOOL bScenario	  = ((nOverlap & SC_MF_SCENARIO) != 0);
++                        bool bPopupButton = ((nOverlap & SC_MF_BUTTON_POPUP) != 0);
++                        bool bFilterActive = ((nOverlap & SC_MF_HIDDEN_MEMBER) != 0);
+                         if (bMerged||bHOverlapped||bVOverlapped)
+                             bAnyMerged = TRUE;								// intern
+ 
+@@ -498,6 +502,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
+                                 pInfo->bVOverlapped	= bVOverlapped;
+                                 pInfo->bAutoFilter	= bAutoFilter;
+                                 pInfo->bPushButton	= bPushButton;
++                                pInfo->bPopupButton = bPopupButton;
++                                pInfo->bFilterActive = bFilterActive;
+                                 pInfo->pLinesAttr	= pLinesAttr;
+                                 pInfo->mpTLBRLine   = pTLBRLine;
+                                 pInfo->mpBLTRLine   = pBLTRLine;
+@@ -512,7 +518,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
+                                         nCurRow >= aEmbedRange.aStart.Row() &&
+                                         nCurRow <= aEmbedRange.aEnd.Row();
+ 
+-                                if (bPushButton || bScenario)
++								if (bScenario)
+                                 {
+                                     pInfo->pBackground = ScGlobal::GetButtonBrushItem();
+                                     pThisRowInfo->bEmptyBack = FALSE;
+diff --git sc/source/core/data/global2.cxx sc/source/core/data/global2.cxx
+index 925f34e..f71b842 100644
+--- sc/source/core/data/global2.cxx
++++ sc/source/core/data/global2.cxx
+@@ -56,6 +56,7 @@
+ #include "sc.hrc"
+ #include "globstr.hrc"
+ 
++using ::std::vector;
+ 
+ // -----------------------------------------------------------------------
+ 
+@@ -817,7 +818,6 @@ bool PivotField::operator==( const PivotField& r ) const
+ 
+ ScPivotParam::ScPivotParam()
+     :	nCol(0), nRow(0), nTab(0),
+-        ppLabelArr( NULL ), nLabels(0),
+         nPageCount(0), nColCount(0), nRowCount(0), nDataCount(0),
+         bIgnoreEmptyRows(FALSE), bDetectCategories(FALSE),
+         bMakeTotalCol(TRUE), bMakeTotalRow(TRUE)
+@@ -828,23 +828,22 @@ ScPivotParam::ScPivotParam()
+ 
+ ScPivotParam::ScPivotParam( const ScPivotParam& r )
+     :	nCol( r.nCol ), nRow( r.nRow ), nTab( r.nTab ),
+-        ppLabelArr( NULL ), nLabels(0),
+         nPageCount(0), nColCount(0), nRowCount(0), nDataCount(0),
+         bIgnoreEmptyRows(r.bIgnoreEmptyRows),
+         bDetectCategories(r.bDetectCategories),
+         bMakeTotalCol(r.bMakeTotalCol),
+         bMakeTotalRow(r.bMakeTotalRow)
+ {
+-    SetLabelData	( r.ppLabelArr, r.nLabels );
+     SetPivotArrays  ( r.aPageArr, r.aColArr, r.aRowArr, r.aDataArr,
+                       r.nPageCount, r.nColCount, r.nRowCount, r.nDataCount );
++
++    SetLabelData(r.maLabelArray);
+ }
+ 
+ //------------------------------------------------------------------------
+ 
+ __EXPORT ScPivotParam::~ScPivotParam()
+ {
+-    ClearLabelData();
+ }
+ 
+ //------------------------------------------------------------------------
+@@ -860,22 +859,6 @@ __EXPORT ScPivotParam::~ScPivotParam()
+ //UNUSED2009-05     ClearPivotArrays();
+ //UNUSED2009-05 }
+ 
+-//------------------------------------------------------------------------
+-
+-void __EXPORT ScPivotParam::ClearLabelData()
+-{
+-    if ( (nLabels > 0) && ppLabelArr )
+-    {
+-        for ( SCSIZE i=0; i<nLabels; i++ )
+-            delete ppLabelArr[i];
+-        delete [] ppLabelArr;
+-        ppLabelArr = NULL;
+-        nLabels = 0;
+-    }
+-}
+-
+-//------------------------------------------------------------------------
+-
+ void __EXPORT ScPivotParam::ClearPivotArrays()
+ {
+     memset( aPageArr, 0, PIVOT_MAXPAGEFIELD * sizeof(PivotField) );
+@@ -888,20 +871,17 @@ void __EXPORT ScPivotParam::ClearPivotArrays()
+     nDataCount = 0;
+ }
+ 
+-//------------------------------------------------------------------------
+-
+-void __EXPORT ScPivotParam::SetLabelData( LabelData**	pLabArr,
+-                                          SCSIZE		nLab )
++void ScPivotParam::SetLabelData(const vector<ScDPLabelDataRef>& r)
+ {
+-    ClearLabelData();
+-
+-    if ( (nLab > 0) && pLabArr )
++    vector<ScDPLabelDataRef> aNewArray;
++    aNewArray.reserve(r.size());
++    for (vector<ScDPLabelDataRef>::const_iterator itr = r.begin(), itrEnd = r.end();
++          itr != itrEnd; ++itr)
+     {
+-        nLabels = (nLab>MAX_LABELS) ? MAX_LABELS : nLab;
+-        ppLabelArr = new LabelData*[nLabels];
+-        for ( SCSIZE i=0; i<nLabels; i++ )
+-            ppLabelArr[i] = new LabelData( *(pLabArr[i]) );
++        ScDPLabelDataRef p(new ScDPLabelData(**itr));
++        aNewArray.push_back(p);
+     }
++    maLabelArray.swap(aNewArray);
+ }
+ 
+ //------------------------------------------------------------------------
+@@ -943,10 +923,9 @@ ScPivotParam& __EXPORT ScPivotParam::operator=( const ScPivotParam& r )
+     bMakeTotalCol	  = r.bMakeTotalCol;
+     bMakeTotalRow	  = r.bMakeTotalRow;
+ 
+-    SetLabelData	( r.ppLabelArr, r.nLabels );
+     SetPivotArrays  ( r.aPageArr, r.aColArr, r.aRowArr, r.aDataArr,
+                       r.nPageCount, r.nColCount, r.nRowCount, r.nDataCount );
+-
++    SetLabelData(r.maLabelArray);
+     return *this;
+ }
+ 
+@@ -961,7 +940,7 @@ BOOL __EXPORT ScPivotParam::operator==( const ScPivotParam& r ) const
+                  && (bDetectCategories == r.bDetectCategories)
+                  && (bMakeTotalCol == r.bMakeTotalCol)
+                  && (bMakeTotalRow == r.bMakeTotalRow)
+-                 && (nLabels 	== r.nLabels)
++                 && (maLabelArray.size() == r.maLabelArray.size())
+                  && (nPageCount == r.nPageCount)
+                  && (nColCount	== r.nColCount)
+                  && (nRowCount	== r.nRowCount)
+diff --git sc/source/core/data/makefile.mk sc/source/core/data/makefile.mk
+index 29618da..6a2898b 100644
+--- sc/source/core/data/makefile.mk
++++ sc/source/core/data/makefile.mk
+@@ -78,6 +78,7 @@ SLOFILES =  \
+         $(SLO)$/dpgroup.obj \
+     $(SLO)$/dpobject.obj \
+     $(SLO)$/dpoutput.obj \
++	$(SLO)$/dpoutputgeometry.obj \
+     $(SLO)$/dpsave.obj \
+     $(SLO)$/dpsdbtab.obj \
+     $(SLO)$/dpshttab.obj \
+@@ -140,6 +141,7 @@ EXCEPTIONSFILES= \
+     $(SLO)$/dpsdbtab.obj \
+     $(SLO)$/dpobject.obj \
+     $(SLO)$/dpoutput.obj \
++	$(SLO)$/dpoutputgeometry.obj \
+     $(SLO)$/dpsave.obj \
+     $(SLO)$/dbdocutl.obj \
+     $(SLO)$/dptabsrc.obj \
+diff --git sc/source/core/data/pivot2.cxx sc/source/core/data/pivot2.cxx
+index 70f48dc..7365e6d 100644
+--- sc/source/core/data/pivot2.cxx
++++ sc/source/core/data/pivot2.cxx
+@@ -61,11 +61,26 @@
+ #include "stlsheet.hxx"
+ 
+ using ::com::sun::star::sheet::DataPilotFieldReference;
++using ::rtl::OUString;
+ 
+ // STATIC DATA -----------------------------------------------------------
+ // ============================================================================
+ 
+-LabelData::LabelData( const String& rName, short nCol, bool bIsValue ) :
++ScDPLabelData::Member::Member() :
++    mbVisible(true),
++    mbShowDetails(true)
++{
++}
++
++OUString ScDPLabelData::Member::getDisplayName() const
++{
++    if (maLayoutName.getLength())
++        return maLayoutName;
++
++    return maName;
++}
++
++ScDPLabelData::ScDPLabelData( const String& rName, short nCol, bool bIsValue ) :
+     maName( rName ),
+     mnCol( nCol ),
+     mnFuncMask( PIVOT_FUNC_NONE ),
+@@ -76,6 +91,14 @@ LabelData::LabelData( const String& rName, short nCol, bool bIsValue ) :
+ {
+ }
+ 
++OUString ScDPLabelData::getDisplayName() const
++{
++    if (maLayoutName.getLength())
++        return maLayoutName;
++
++    return maName;
++}
++
+ // ============================================================================
+ 
+ ScDPFuncData::ScDPFuncData( short nCol, USHORT nFuncMask ) :
+diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
+index 464bf4c..eac760e 100644
+--- sc/source/core/data/table2.cxx
++++ sc/source/core/data/table2.cxx
+@@ -962,6 +962,14 @@ ScBaseCell* ScTable::GetCell( SCCOL nCol, SCROW nRow ) const
+     return NULL;
+ }
+ 
++void ScTable::GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const
++{
++    rCol = 0;
++    rRow = 0;
++    while (aCol[rCol].IsEmptyData() && rCol < MAXCOL)
++        ++rCol;
++    rRow = aCol[rCol].GetFirstDataPos();
++}
+ 
+ void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const
+ {
+diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
+index da460a2..6876c90 100644
+--- sc/source/filter/excel/read.cxx
++++ sc/source/filter/excel/read.cxx
+@@ -1146,6 +1146,7 @@ FltError ImportExcel8::Read( void )
+                     case EXC_ID_SXDI:           rPTableMgr.ReadSxdi( maStrm );      break;
+                     case EXC_ID_SXVDEX:         rPTableMgr.ReadSxvdex( maStrm );    break;
+                     case EXC_ID_SXEX:           rPTableMgr.ReadSxex( maStrm );      break;
++                    case EXC_ID_SXVIEWEX9:      rPTableMgr.ReadSxViewEx9( maStrm ); break;
+                 }
+             }
+             break;
+@@ -1180,6 +1181,9 @@ FltError ImportExcel8::Read( void )
+             eLastErr = SCWARN_IMPORT_ROW_OVERFLOW;
+         else if( rAddrConv.IsColTruncated() )
+             eLastErr = SCWARN_IMPORT_COLUMN_OVERFLOW;
++
++        if( GetBiff() == EXC_BIFF8 )                         
++            GetPivotTableManager().MaybeRefreshPivotTables();
+     }
+ 
+     return eLastErr;
+diff --git sc/source/filter/excel/xepivot.cxx sc/source/filter/excel/xepivot.cxx
+index d7bf0b3..e475661 100644
+--- sc/source/filter/excel/xepivot.cxx
++++ sc/source/filter/excel/xepivot.cxx
+@@ -67,6 +67,7 @@ using ::com::sun::star::sheet::DataPilotFieldSortInfo;
+ using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo;
+ using ::com::sun::star::sheet::DataPilotFieldLayoutInfo;
+ using ::com::sun::star::sheet::DataPilotFieldReference;
++using ::rtl::OUString;
+ 
+ using ::rtl::OString;
+ using ::rtl::OUString;
+@@ -972,6 +973,11 @@ void XclExpPTItem::SetPropertiesFromMember( const ScDPSaveMember& rSaveMem )
+ {
+     ::set_flag( maItemInfo.mnFlags, EXC_SXVI_HIDDEN, !rSaveMem.GetIsVisible() );
+     ::set_flag( maItemInfo.mnFlags, EXC_SXVI_HIDEDETAIL, !rSaveMem.GetShowDetails() );
++
++    // visible name
++    const OUString* pVisName = rSaveMem.GetLayoutName();
++    if (pVisName && !pVisName->equals(GetItemName()))
++        maItemInfo.SetVisName(*pVisName);
+ }
+ 
+ void XclExpPTItem::WriteBody( XclExpStream& rStrm )
+@@ -1029,6 +1035,31 @@ sal_uInt16 XclExpPTField::GetItemIndex( const String& rName, sal_uInt16 nDefault
+ 
+ // fill data --------------------------------------------------------------
+ 
++/** 
++ * Calc's subtotal names are escaped with backslashes ('\'), while Excel's 
++ * are not escaped at all. 
++ */
++static OUString lcl_convertCalcSubtotalName(const OUString& rName)
++{
++    OUStringBuffer aBuf;
++    const sal_Unicode* p = rName.getStr();
++    sal_Int32 n = rName.getLength();
++    bool bEscaped = false;
++    for (sal_Int32 i = 0; i < n; ++i)
++    {
++        const sal_Unicode c = p[i];
++        if (!bEscaped && c == sal_Unicode('\\'))
++        {
++            bEscaped = true;
++            continue;
++        }
++
++        aBuf.append(c);
++        bEscaped = false;
++    }
++    return aBuf.makeStringAndClear();
++}
++
+ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
+ {
+     // orientation
+@@ -1040,8 +1071,16 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
+     ::set_flag( maFieldExtInfo.mnFlags, EXC_SXVDEX_SHOWALL, rSaveDim.GetShowEmpty() );
+ 
+     // visible name
+-    if( rSaveDim.HasLayoutName() && (rSaveDim.GetLayoutName() != GetFieldName()) )
+-        maFieldInfo.SetVisName( rSaveDim.GetLayoutName() );
++    const OUString* pLayoutName = rSaveDim.GetLayoutName();
++    if (pLayoutName && !pLayoutName->equals(GetFieldName()))
++        maFieldInfo.SetVisName(*pLayoutName);
++
++    const rtl::OUString* pSubtotalName = rSaveDim.GetSubtotalName();
++    if (pSubtotalName)
++    {
++        OUString aSubName = lcl_convertCalcSubtotalName(*pSubtotalName);
++        maFieldExtInfo.mpFieldTotalName.reset(new rtl::OUString(aSubName));
++    }
+ 
+     // subtotals
+     XclPTSubtotalVec aSubtotals;
+@@ -1108,7 +1147,11 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim
+     rDataInfo.SetApiAggFunc( eFunc );
+ 
+     // visible name
+-    rDataInfo.SetVisName( lclGetDataFieldCaption( GetFieldName(), eFunc ) );
++    const rtl::OUString* pVisName = rSaveDim.GetLayoutName();
++    if (pVisName)
++        rDataInfo.SetVisName(*pVisName);
++    else
++        rDataInfo.SetVisName( lclGetDataFieldCaption( GetFieldName(), eFunc ) );
+ 
+     // result field reference
+     if( const DataPilotFieldReference* pFieldRef = rSaveDim.GetReferenceValue() )
+@@ -1217,9 +1260,10 @@ XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& r
+         // pivot table properties from DP object
+         mnOutScTab = rOutScRange.aStart.Tab();
+         maPTInfo.maTableName = rDPObj.GetName();
+-        maPTInfo.maDataName = ScGlobal::GetRscString( STR_PIVOT_DATA );
+         maPTInfo.mnCacheIdx = mrPCache.GetCacheIndex();
+ 
++        maPTViewEx9Info.Init( rDPObj );
++
+         if( const ScDPSaveData* pSaveData = rDPObj.GetSaveData() )
+         {
+             // additional properties from ScDPSaveData
+@@ -1299,6 +1343,10 @@ void XclExpPivotTable::Save( XclExpStream& rStrm )
+         WriteSxli( rStrm, maPTInfo.mnDataCols, maPTInfo.mnColFields );
+         // SXEX
+         WriteSxex( rStrm );
++        // QSISXTAG
++        WriteQsiSxTag( rStrm );
++        // SXVIEWEX9
++        WriteSxViewEx9( rStrm );
+     }
+ }
+ 
+@@ -1332,6 +1380,15 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData )
+     ::set_flag( maPTInfo.mnFlags, EXC_SXVIEW_COLGRAND, rSaveData.GetColumnGrand() );
+     ::set_flag( maPTExtInfo.mnFlags, EXC_SXEX_DRILLDOWN, rSaveData.GetDrillDown() );
+     mbFilterBtn = rSaveData.GetFilterButton();
++    const ScDPSaveDimension* pDim = rSaveData.GetExistingDataLayoutDimension();
++    if (!pDim)
++        return;
++
++    const rtl::OUString* pLayoutName = pDim->GetLayoutName();
++    if (pLayoutName)
++        maPTInfo.maDataName = *pLayoutName;
++    else
++        maPTInfo.maDataName = ScGlobal::GetRscString(STR_PIVOT_DATA);
+ }
+ 
+ void XclExpPivotTable::SetFieldPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
+@@ -1439,13 +1496,21 @@ void XclExpPivotTable::Finalize()
+     rnDataXclRow = rnXclRow1 + maPTInfo.mnColFields + 1;
+     if( maDataFields.empty() )
+         ++rnDataXclRow;
++
++    bool bExtraHeaderRow = (0 == maPTViewEx9Info.mnGridLayout && maPTInfo.mnColFields == 0);
++    if (bExtraHeaderRow)
++        // Insert an extra row only when there is no column field.
++        ++rnDataXclRow;
++
+     rnXclCol2 = ::std::max( rnXclCol2, rnDataXclCol );
+     rnXclRow2 = ::std::max( rnXclRow2, rnDataXclRow );
+     maPTInfo.mnDataCols = rnXclCol2 - rnDataXclCol + 1;
+     maPTInfo.mnDataRows = rnXclRow2 - rnDataXclRow + 1;
+ 
+     // first heading
+-    maPTInfo.mnFirstHeadRow = rnXclRow1 + 1;
++    maPTInfo.mnFirstHeadRow = rnXclRow1;
++    if (bExtraHeaderRow)
++        maPTInfo.mnFirstHeadRow += 2;
+ }
+ 
+ // records ----------------------------------------------------------------
+@@ -1525,6 +1590,72 @@ void XclExpPivotTable::WriteSxex( XclExpStream& rStrm ) const
+     rStrm.EndRecord();
+ }
+ 
++void XclExpPivotTable::WriteQsiSxTag( XclExpStream& rStrm ) const
++{
++    rStrm.StartRecord( 0x0802, 32 );
++
++    sal_uInt16 nRecordType = 0x0802;
++    sal_uInt16 nDummyFlags = 0x0000;
++    sal_uInt16 nTableType  = 1; // 0 = query table : 1 = pivot table
++
++    rStrm << nRecordType << nDummyFlags << nTableType;
++
++    // General flags
++    bool bEnableRefresh = true;
++    bool bPCacheInvalid = false;
++    bool bOlapPTReport  = false;
++
++    sal_uInt16 nFlags = 0x0000;
++    if (bEnableRefresh) nFlags |= 0x0001;
++    if (bPCacheInvalid) nFlags |= 0x0002;
++    if (bOlapPTReport)  nFlags |= 0x0004;
++    rStrm << nFlags;
++
++    // Feature-specific options.  The value differs depending on the table 
++    // type, but we assume the table type is always pivot table.
++    sal_uInt32 nOptions = 0x00000000;
++    bool bNoStencil = false;
++    bool bHideTotal = false;
++    bool bEmptyRows = false;
++    bool bEmptyCols = false;
++    if (bNoStencil) nOptions |= 0x00000001;
++    if (bHideTotal) nOptions |= 0x00000002;
++    if (bEmptyRows) nOptions |= 0x00000008;
++    if (bEmptyCols) nOptions |= 0x00000010;
++    rStrm << nOptions;
++
++    enum ExcelVersion
++    {
++        Excel2000 = 0,
++        ExcelXP   = 1,
++        Excel2003 = 2,
++        Excel2007 = 3
++    };
++    ExcelVersion eXclVer = Excel2000;
++    sal_uInt8 nOffsetBytes = 16;
++    rStrm << static_cast<sal_uInt8>(eXclVer)  // version table last refreshed
++          << static_cast<sal_uInt8>(eXclVer)  // minimum version to refresh
++          << nOffsetBytes
++          << static_cast<sal_uInt8>(eXclVer); // first version created
++
++    rStrm << XclExpString(maPTInfo.maTableName);
++    rStrm << static_cast<sal_uInt16>(0x0001); // no idea what this is for.
++
++    rStrm.EndRecord();
++}
++
++void XclExpPivotTable::WriteSxViewEx9( XclExpStream& rStrm ) const
++{
++    // Until we sync the autoformat ids only export if using grid header layout
++    // That could only have been set via xls import so far.
++    if ( 0 == maPTViewEx9Info.mnGridLayout )
++    {
++        rStrm.StartRecord( EXC_ID_SXVIEWEX9, 17 );
++        rStrm << maPTViewEx9Info;
++        rStrm.EndRecord();
++    }
++}
++
+ // ============================================================================
+ 
+ namespace {
+diff --git sc/source/filter/excel/xestring.cxx sc/source/filter/excel/xestring.cxx
+index eb36b4a..c210911 100644
+--- sc/source/filter/excel/xestring.cxx
++++ sc/source/filter/excel/xestring.cxx
+@@ -423,7 +423,8 @@ void XclExpString::WriteFormats( XclExpStream& rStrm, bool bWriteSize ) const
+ 
+ void XclExpString::Write( XclExpStream& rStrm ) const
+ {
+-    WriteHeader( rStrm );
++    if (!mbSkipHeader)
++        WriteHeader( rStrm );
+     WriteBuffer( rStrm );
+     if( IsWriteFormats() )      // only in BIFF8 included in string
+         WriteFormats( rStrm );
+@@ -589,6 +590,7 @@ void XclExpString::Init( sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMax
+     mbSmartFlags = bBiff8 && ::get_flag( nFlags, EXC_STR_SMARTFLAGS );
+     mbSkipFormats = ::get_flag( nFlags, EXC_STR_SEPARATEFORMATS );
+     mbWrapped = false;
++    mbSkipHeader = ::get_flag( nFlags, EXC_STR_NOHEADER );
+     mnMaxLen = nMaxLen;
+     SetStrLen( nCurrLen );
+ 
+diff --git sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx
+index acd371f..bae2192 100644
+--- sc/source/filter/excel/xipivot.cxx
++++ sc/source/filter/excel/xipivot.cxx
+@@ -48,7 +48,9 @@
+ #include "dpdimsave.hxx"
+ #include "dpobject.hxx"
+ #include "dpshttab.hxx"
++#include "dpoutputgeometry.hxx"
+ #include "scitems.hxx"
++#include "attrib.hxx"
+ 
+ #include "xltracer.hxx"
+ #include "xistream.hxx"
+@@ -60,13 +62,17 @@
+ #include "excform.hxx"
+ #include "xltable.hxx"
+ 
++#include <vector>
++
+ using ::rtl::OUString;
++using ::rtl::OUStringBuffer;
+ using ::com::sun::star::sheet::DataPilotFieldOrientation;
+ using ::com::sun::star::sheet::DataPilotFieldOrientation_DATA;
+ using ::com::sun::star::sheet::DataPilotFieldSortInfo;
+ using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo;
+ using ::com::sun::star::sheet::DataPilotFieldLayoutInfo;
+ using ::com::sun::star::sheet::DataPilotFieldReference;
++using ::std::vector;
+ 
+ // ============================================================================
+ // Pivot cache
+@@ -847,6 +853,11 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
+     }
+ }
+ 
++bool XclImpPivotCache::IsRefreshOnLoad() const
++{
++    return static_cast<bool>(maPCInfo.mnFlags & 0x0004);
++}
++
+ // ============================================================================
+ // Pivot table
+ // ============================================================================
+@@ -882,6 +893,8 @@ void XclImpPTItem::ConvertItem( ScDPSaveDimension& rSaveDim ) const
+         ScDPSaveMember& rMember = *rSaveDim.GetMemberByName( *pItemName );
+         rMember.SetIsVisible( !::get_flag( maItemInfo.mnFlags, EXC_SXVI_HIDDEN ) );
+         rMember.SetShowDetails( !::get_flag( maItemInfo.mnFlags, EXC_SXVI_HIDEDETAIL ) );
++        if (maItemInfo.HasVisName())
++            rMember.SetLayoutName(*maItemInfo.GetVisName());
+     }
+ }
+ 
+@@ -1022,6 +1035,28 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& rSaveData ) const
+ 
+ // private --------------------------------------------------------------------
+ 
++/** 
++ * Convert Excel-encoded subtotal name to a Calc-encoded one.  
++ */
++static OUString lcl_convertExcelSubtotalName(const OUString& rName)
++{
++    OUStringBuffer aBuf;
++    const sal_Unicode* p = rName.getStr();
++    sal_Int32 n = rName.getLength();
++    for (sal_Int32 i = 0; i < n; ++i)
++    {
++        const sal_Unicode c = p[i];
++        if (c == sal_Unicode('\\'))
++        {
++            aBuf.append(c);
++            aBuf.append(c);
++        }
++        else
++            aBuf.append(c);
++    }
++    return aBuf.makeStringAndClear();
++}
++
+ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) const
+ {
+     const String& rFieldName = GetFieldName();
+@@ -1043,7 +1078,7 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con
+     // visible name
+     if( const String* pVisName = maFieldInfo.GetVisName() )
+         if( pVisName->Len() > 0 )
+-            rSaveDim.SetLayoutName( pVisName );
++            rSaveDim.SetLayoutName( *pVisName );
+ 
+     // subtotal function(s)
+     XclPTSubtotalVec aSubtotalVec;
+@@ -1075,6 +1110,13 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con
+     // grouping info
+     pCacheField->ConvertGroupField( rSaveData, mrPTable.GetVisFieldNames() );
+ 
++    // custom subtotal name
++    if (maFieldExtInfo.mpFieldTotalName.get())
++    {
++        OUString aSubName = lcl_convertExcelSubtotalName(*maFieldExtInfo.mpFieldTotalName);
++        rSaveDim.SetSubtotalName(aSubName);
++    }
++
+     return &rSaveDim;
+ }
+ 
+@@ -1099,7 +1141,7 @@ void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const Xcl
+     // visible name
+     if( const String* pVisName = rDataInfo.GetVisName() )
+         if( pVisName->Len() > 0 )
+-            rSaveDim.SetLayoutName( pVisName );
++            rSaveDim.SetLayoutName( *pVisName );
+ 
+     // aggregation function
+     rSaveDim.SetFunction( static_cast< USHORT >( rDataInfo.GetApiAggFunc() ) );
+@@ -1134,7 +1176,8 @@ void XclImpPTField::ConvertItems( ScDPSaveDimension& rSaveDim ) const
+ 
+ XclImpPivotTable::XclImpPivotTable( const XclImpRoot& rRoot ) :
+     XclImpRoot( rRoot ),
+-    maDataOrientField( *this, EXC_SXIVD_DATA )
++    maDataOrientField( *this, EXC_SXIVD_DATA ),
++    mpDPObj(NULL)
+ {
+ }
+ 
+@@ -1296,6 +1339,11 @@ void XclImpPivotTable::ReadSxex( XclImpStream& rStrm )
+     rStrm >> maPTExtInfo;
+ }
+ 
++void XclImpPivotTable::ReadSxViewEx9( XclImpStream& rStrm )
++{
++    rStrm >> maPTViewEx9Info;
++}
++
+ // ----------------------------------------------------------------------------
+ 
+ void XclImpPivotTable::Convert()
+@@ -1331,6 +1379,10 @@ void XclImpPivotTable::Convert()
+         if( const XclImpPTField* pField = GetField( *aIt ) )
+             pField->ConvertPageField( aSaveData );
+ 
++    // We need to import hidden fields because hidden fields may contain
++    // special settings for subtotals (aggregation function, filters, custom
++    // name etc.) and members (hidden, custom name etc.).
++
+     // hidden fields
+     for( sal_uInt16 nField = 0, nCount = GetFieldCount(); nField < nCount; ++nField )
+         if( const XclImpPTField* pField = GetField( nField ) )
+@@ -1359,11 +1411,111 @@ void XclImpPivotTable::Convert()
+     // create the DataPilot
+     ScDPObject* pDPObj = new ScDPObject( GetDocPtr() );
+     pDPObj->SetName( maPTInfo.maTableName );
++    if (maPTInfo.maDataName.Len() > 0)
++        aSaveData.GetDataLayoutDimension()->SetLayoutName(maPTInfo.maDataName);
++
++    if (maPTViewEx9Info.maGrandTotalName.Len() > 0)
++        aSaveData.SetGrandTotalName(maPTViewEx9Info.maGrandTotalName);
++
+     pDPObj->SetSaveData( aSaveData );
+     pDPObj->SetSheetDesc( aDesc );
+     pDPObj->SetOutRange( aOutRange );
+     pDPObj->SetAlive( TRUE );
+-    GetDoc().GetDPCollection()->Insert( pDPObj );
++    pDPObj->SetHeaderLayout( maPTViewEx9Info.mnGridLayout == 0 );
++
++    GetDoc().GetDPCollection()->InsertNewTable(pDPObj);
++    mpDPObj = pDPObj;
++
++    ApplyMergeFlags(aOutRange, aSaveData);
++}
++
++void XclImpPivotTable::MaybeRefresh()
++{
++    if (mpDPObj && mxPCache->IsRefreshOnLoad())
++    {
++        // 'refresh table on load' flag is set.  Refresh the table now.  Some
++        // Excel files contain partial table output when this flag is set.
++        mpDPObj->Output(maOutScRange.aStart);
++    }
++}
++
++void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveData& rSaveData)
++{
++    // Apply merge flags for varoius datapilot controls.
++
++    ScDPOutputGeometry aGeometry(rOutRange, false, ScDPOutputGeometry::XLS);
++    aGeometry.setColumnFieldCount(maPTInfo.mnColFields);
++    aGeometry.setPageFieldCount(maPTInfo.mnPageFields);
++    aGeometry.setDataFieldCount(maPTInfo.mnDataFields);
++
++    // Excel includes data layout field in the row field count.  We need to 
++    // subtract it.
++    bool bDataLayout = maPTInfo.mnDataFields > 1;
++    aGeometry.setRowFieldCount(maPTInfo.mnRowFields - static_cast<sal_uInt32>(bDataLayout));
++
++    ScDocument& rDoc = GetDoc();
++
++    vector<ScAddress> aPageBtns;
++    aGeometry.getPageFieldPositions(aPageBtns);
++    vector<ScAddress>::const_iterator itr = aPageBtns.begin(), itrEnd = aPageBtns.end();
++    for (; itr != itrEnd; ++itr)
++    {
++        sal_uInt16 nMFlag = SC_MF_BUTTON;
++        String aName;
++        rDoc.GetString(itr->Col(), itr->Row(), itr->Tab(), aName);
++        if (rSaveData.HasInvisibleMember(aName))
++            nMFlag |= SC_MF_HIDDEN_MEMBER;
++
++        rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), nMFlag);
++        rDoc.ApplyFlagsTab(itr->Col()+1, itr->Row(), itr->Col()+1, itr->Row(), itr->Tab(), SC_MF_AUTO);
++    }
++
++    vector<ScAddress> aColBtns;
++    aGeometry.getColumnFieldPositions(aColBtns);
++    itr    = aColBtns.begin();
++    itrEnd = aColBtns.end();
++    for (; itr != itrEnd; ++itr)
++    {
++        sal_Int16 nMFlag = SC_MF_BUTTON | SC_MF_BUTTON_POPUP;
++        String aName;
++        rDoc.GetString(itr->Col(), itr->Row(), itr->Tab(), aName);
++        if (rSaveData.HasInvisibleMember(aName))
++            nMFlag |= SC_MF_HIDDEN_MEMBER;
++        rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), nMFlag);
++    }
++
++    vector<ScAddress> aRowBtns;
++    aGeometry.getRowFieldPositions(aRowBtns);
++    if (aRowBtns.empty())
++    {
++        if (bDataLayout)
++        {
++            // No row fields, but the data layout button exists.
++            SCROW nRow = aGeometry.getRowFieldHeaderRow();
++            SCCOL nCol = rOutRange.aStart.Col();
++            SCTAB nTab = rOutRange.aStart.Tab();
++            rDoc.ApplyFlagsTab(nCol, nRow, nCol, nRow, nTab, SC_MF_BUTTON);
++        }
++    }
++    else
++    {
++        itr    = aRowBtns.begin();
++        itrEnd = aRowBtns.end();
++        for (; itr != itrEnd; ++itr)
++        {
++            sal_Int16 nMFlag = SC_MF_BUTTON | SC_MF_BUTTON_POPUP;
++            String aName;
++            rDoc.GetString(itr->Col(), itr->Row(), itr->Tab(), aName);
++            if (rSaveData.HasInvisibleMember(aName))
++                nMFlag |= SC_MF_HIDDEN_MEMBER;
++            rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), nMFlag);
++        }
++        if (bDataLayout)
++        {
++            --itr; // move back to the last row field position.
++            rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), SC_MF_BUTTON);
++        }
++    }
+ }
+ 
+ // ============================================================================
+@@ -1458,6 +1610,12 @@ void XclImpPivotTableManager::ReadSxex( XclImpStream& rStrm )
+         maPTables.back()->ReadSxex( rStrm );
+ }
+ 
++void XclImpPivotTableManager::ReadSxViewEx9( XclImpStream& rStrm )
++{
++    if( !maPTables.empty() )
++        maPTables.back()->ReadSxViewEx9( rStrm );
++}
++
+ // ----------------------------------------------------------------------------
+ 
+ void XclImpPivotTableManager::ReadPivotCaches( XclImpStream& rStrm )
+@@ -1472,5 +1630,11 @@ void XclImpPivotTableManager::ConvertPivotTables()
+         (*aIt)->Convert();
+ }
+ 
++void XclImpPivotTableManager::MaybeRefreshPivotTables()
++{
++    for( XclImpPivotTableVec::iterator aIt = maPTables.begin(), aEnd = maPTables.end(); aIt != aEnd; ++aIt )
++        (*aIt)->MaybeRefresh();
++}
++
+ // ============================================================================
+ 
+diff --git sc/source/filter/excel/xlpivot.cxx sc/source/filter/excel/xlpivot.cxx
+index e3544b5..c915903 100644
+--- sc/source/filter/excel/xlpivot.cxx
++++ sc/source/filter/excel/xlpivot.cxx
+@@ -31,6 +31,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_sc.hxx"
+ #include "dpgroup.hxx"
++#include "dpsave.hxx"
+ #include "xestream.hxx"
+ #include "xistream.hxx"
+ #include "xestring.hxx"
+@@ -581,7 +582,9 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldInfo& rInfo )
+ XclPTFieldExtInfo::XclPTFieldExtInfo() :
+     mnFlags( EXC_SXVDEX_DEFAULTFLAGS ),
+     mnSortField( EXC_SXVDEX_SORT_OWN ),
+-    mnShowField( EXC_SXVDEX_SHOW_NONE )
++    mnShowField( EXC_SXVDEX_SHOW_NONE ),
++    mnNumFmt(0),
++    mpFieldTotalName(NULL)
+ {
+ }
+ 
+@@ -639,10 +642,19 @@ void XclPTFieldExtInfo::SetApiLayoutMode( sal_Int32 nLayoutMode )
+ 
+ XclImpStream& operator>>( XclImpStream& rStrm, XclPTFieldExtInfo& rInfo )
+ {
+-    return rStrm
+-        >> rInfo.mnFlags
+-        >> rInfo.mnSortField
+-        >> rInfo.mnShowField;
++    sal_uInt8 nNameLen = 0;
++    rStrm >> rInfo.mnFlags
++          >> rInfo.mnSortField
++          >> rInfo.mnShowField
++          >> rInfo.mnNumFmt
++          >> nNameLen;
++
++    rStrm.Ignore(10);
++    if (nNameLen != 0xFF)
++        // Custom field total name is used.  Pick it up.
++        rInfo.mpFieldTotalName.reset(new rtl::OUString(rStrm.ReadUniString(nNameLen, 0)));
++
++    return rStrm;
+ }
+ 
+ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldExtInfo& rInfo )
+@@ -650,9 +662,23 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldExtInfo& rInfo )
+     rStrm   << rInfo.mnFlags
+             << rInfo.mnSortField
+             << rInfo.mnShowField
+-            << EXC_SXVDEX_FORMAT_NONE
+-            << sal_uInt16( 0xFFFF );    // unknown
+-    rStrm.WriteZeroBytes( 8 );          // unknown
++            << EXC_SXVDEX_FORMAT_NONE;
++
++    if (rInfo.mpFieldTotalName.get() && rInfo.mpFieldTotalName->getLength() > 0)
++    {
++        rtl::OUString aFinalName = *rInfo.mpFieldTotalName;
++        if (aFinalName.getLength() >= 254)
++            aFinalName = aFinalName.copy(0, 254);
++        sal_uInt8 nNameLen = static_cast<sal_uInt8>(aFinalName.getLength());
++        rStrm << nNameLen;
++        rStrm.WriteZeroBytes(10);
++        rStrm << XclExpString(aFinalName, EXC_STR_NOHEADER);
++    }
++    else
++    {
++        rStrm << sal_uInt16(0xFFFF);
++        rStrm.WriteZeroBytes(8);
++    }
+     return rStrm;
+ }
+ 
+@@ -923,3 +949,86 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo )
+ 
+ // ============================================================================
+ 
++// Pivot table autoformat settings ============================================
++
++/**
++classic     : 10 08 00 00 00 00 00 00 20 00 00 00 01 00 00 00 00
++default     : 10 08 00 00 00 00 00 00 20 00 00 00 01 00 00 00 00
++report01    : 10 08 02 00 00 00 00 00 20 00 00 00 00 10 00 00 00
++report02    : 10 08 02 00 00 00 00 00 20 00 00 00 01 10 00 00 00
++report03    : 10 08 02 00 00 00 00 00 20 00 00 00 02 10 00 00 00
++report04    : 10 08 02 00 00 00 00 00 20 00 00 00 03 10 00 00 00
++report05    : 10 08 02 00 00 00 00 00 20 00 00 00 04 10 00 00 00
++report06    : 10 08 02 00 00 00 00 00 20 00 00 00 05 10 00 00 00
++report07    : 10 08 02 00 00 00 00 00 20 00 00 00 06 10 00 00 00
++report08    : 10 08 02 00 00 00 00 00 20 00 00 00 07 10 00 00 00
++report09    : 10 08 02 00 00 00 00 00 20 00 00 00 08 10 00 00 00
++report10    : 10 08 02 00 00 00 00 00 20 00 00 00 09 10 00 00 00
++table01     : 10 08 00 00 00 00 00 00 20 00 00 00 0a 10 00 00 00
++table02     : 10 08 00 00 00 00 00 00 20 00 00 00 0b 10 00 00 00
++table03     : 10 08 00 00 00 00 00 00 20 00 00 00 0c 10 00 00 00
++table04     : 10 08 00 00 00 00 00 00 20 00 00 00 0d 10 00 00 00
++table05     : 10 08 00 00 00 00 00 00 20 00 00 00 0e 10 00 00 00
++table06     : 10 08 00 00 00 00 00 00 20 00 00 00 0f 10 00 00 00
++table07     : 10 08 00 00 00 00 00 00 20 00 00 00 10 10 00 00 00
++table08     : 10 08 00 00 00 00 00 00 20 00 00 00 11 10 00 00 00
++table09     : 10 08 00 00 00 00 00 00 20 00 00 00 12 10 00 00 00
++table10     : 10 08 00 00 00 00 00 00 20 00 00 00 13 10 00 00 00
++none        : 10 08 00 00 00 00 00 00 20 00 00 00 15 10 00 00 00
++**/
++
++XclPTViewEx9Info::XclPTViewEx9Info() :
++    mbReport( 0 ),
++    mnAutoFormat( 0 ),
++    mnGridLayout( 0x10 )
++{
++}
++
++void XclPTViewEx9Info::Init( const ScDPObject& rDPObj )
++{
++    if( rDPObj.GetHeaderLayout() )
++    {
++        mbReport     = 0;
++        mnAutoFormat = 1;
++        mnGridLayout = 0;
++    }
++    else
++    {
++        // Report1 for now
++        // TODO : sync with autoformat indicies
++        mbReport     = 2;
++        mnAutoFormat = 1;
++        mnGridLayout = 0x10;
++    }
++
++    const ScDPSaveData* pData = rDPObj.GetSaveData();
++    if (pData)
++    {
++        const rtl::OUString* pGrandTotal = pData->GetGrandTotalName();
++        if (pGrandTotal)
++            maGrandTotalName = *pGrandTotal;
++    }
++}
++
++XclImpStream& operator>>( XclImpStream& rStrm, XclPTViewEx9Info& rInfo )
++{
++    rStrm.Ignore( 2 );
++    rStrm >> rInfo.mbReport;            /// 2 for report* fmts ?
++    rStrm.Ignore( 6 );
++    rStrm >> rInfo.mnAutoFormat >> rInfo.mnGridLayout;
++    rInfo.maGrandTotalName = rStrm.ReadUniString();
++    return rStrm;
++}
++
++XclExpStream& operator<<( XclExpStream& rStrm, const XclPTViewEx9Info& rInfo )
++{
++    return rStrm 
++        << EXC_PT_AUTOFMT_HEADER
++        << rInfo.mbReport
++        << EXC_PT_AUTOFMT_ZERO
++        << EXC_PT_AUTOFMT_FLAGS
++        << rInfo.mnAutoFormat
++        << rInfo.mnGridLayout
++        << XclExpString(rInfo.maGrandTotalName, EXC_STR_DEFAULT, EXC_PT_MAXSTRLEN);
++}
++
+diff --git sc/source/filter/inc/xepivot.hxx sc/source/filter/inc/xepivot.hxx
+index 32ba1a0..de9d284 100644
+--- sc/source/filter/inc/xepivot.hxx
++++ sc/source/filter/inc/xepivot.hxx
+@@ -413,6 +413,10 @@ private:
+     /** Writes the SXEX records containing additional pivot table info. */
+     void                WriteSxex( XclExpStream& rStrm ) const;
+ 
++    void                WriteQsiSxTag( XclExpStream& rStrm ) const;
++    /** Writes the SX_AUTOFORMAT records with the autoformat id and header layout */
++    void                WriteSxViewEx9( XclExpStream& rStrm ) const;
++
+     // ------------------------------------------------------------------------
+ private:
+     typedef XclExpRecordList< XclExpPTField >   XclExpPTFieldList;
+@@ -422,6 +426,7 @@ private:
+     const XclExpPivotCache& mrPCache;       /// The pivot cache this pivot table bases on.
+     XclPTInfo           maPTInfo;           /// Info about the pivot table (SXVIEW record).
+     XclPTExtInfo        maPTExtInfo;        /// Extended info about the pivot table (SXEX record).
++    XclPTViewEx9Info    maPTViewEx9Info;    /// The selected autoformat (SXVIEWEX9)
+     XclExpPTFieldList   maFieldList;        /// All fields in pivot cache order.
+     ScfUInt16Vec        maRowFields;        /// Row field indexes.
+     ScfUInt16Vec        maColFields;        /// Column field indexes.
+diff --git sc/source/filter/inc/xestring.hxx sc/source/filter/inc/xestring.hxx
+index f023a12..706b12c 100644
+--- sc/source/filter/inc/xestring.hxx
++++ sc/source/filter/inc/xestring.hxx
+@@ -323,6 +323,7 @@ private:
+     bool                mbSmartFlags;   /// true = omit flags on empty string; false = always write flags.
+     bool                mbSkipFormats;  /// true = skip formats on export; false = write complete formatted string.
+     bool                mbWrapped;      /// true = text contains several paragraphs.
++    bool                mbSkipHeader;   /// ture = skip length and flags when writing string bytes.
+ };
+ 
+ inline bool operator==( const XclExpString& rLeft, const XclExpString& rRight )
+diff --git sc/source/filter/inc/xipivot.hxx sc/source/filter/inc/xipivot.hxx
+index fffd4f0..d043a95 100644
+--- sc/source/filter/inc/xipivot.hxx
++++ sc/source/filter/inc/xipivot.hxx
+@@ -186,6 +186,8 @@ public:
+     /** Reads the entire pivot cache stream. Uses decrypter from passed stream. */
+     void                ReadPivotCacheStream( XclImpStream& rStrm );
+ 
++    bool                IsRefreshOnLoad() const;
++
+ private:
+     typedef ::std::vector< XclImpPCFieldRef > XclImpPCFieldVec;
+ 
+@@ -350,12 +352,19 @@ public:
+     void                ReadSxdi( XclImpStream& rStrm );
+     /** Reads an SXEX record containing additional settings for the pivot table. */
+     void                ReadSxex( XclImpStream& rStrm );
++    /** Reads an SXVIEWEX9 record that specifies the pivot tables
++     *  autoformat. */
++    void                ReadSxViewEx9( XclImpStream& rStrm );
+ 
+     // ------------------------------------------------------------------------
+ 
+     /** Inserts the pivot table into the Calc document. */
+     void                Convert();
+ 
++    void                MaybeRefresh();
++
++    void                ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveData& rSaveData);
++
+     // ------------------------------------------------------------------------
+ private:
+     typedef ::std::vector< XclImpPTFieldRef > XclImpPTFieldVec;
+@@ -364,6 +373,7 @@ private:
+ 
+     XclPTInfo           maPTInfo;           /// General info about the pivot table (SXVIEW record).
+     XclPTExtInfo        maPTExtInfo;        /// Extended info about the pivot table (SXEX record).
++    XclPTViewEx9Info    maPTViewEx9Info;     /// (SXVIEWEX9 record)
+     XclImpPTFieldVec    maFields;           /// Vector containing all fields.
+     XclImpPTFieldRef    mxCurrField;        /// Current field for importing additional info.
+     ScfStringVec        maVisFieldNames;    /// Vector containing all visible field names.
+@@ -374,6 +384,7 @@ private:
+     ScfUInt16Vec        maFiltDataFields;   /// Filtered data field indexes.
+     XclImpPTField       maDataOrientField;  /// Special data field orientation field.
+     ScRange             maOutScRange;       /// Output range in the Calc document.
++    ScDPObject*         mpDPObj;
+ };
+ 
+ typedef ScfRef< XclImpPivotTable > XclImpPivotTableRef;
+@@ -422,6 +433,9 @@ public:
+     void                ReadSxvi( XclImpStream& rStrm );
+     /** Reads an SXEX record containing additional settings for a pivot table. */
+     void                ReadSxex( XclImpStream& rStrm );
++    /** Reads an SXVIEWEX9 record that specifies the pivot tables
++     *  autoformat. */
++    void                ReadSxViewEx9( XclImpStream& rStrm );
+ 
+     // ------------------------------------------------------------------------
+ 
+@@ -430,6 +444,8 @@ public:
+     /** Inserts all pivot tables into the Calc document. */
+     void                ConvertPivotTables();
+ 
++    void                MaybeRefreshPivotTables();
++
+ private:
+     typedef ::std::vector< XclImpPivotCacheRef >    XclImpPivotCacheVec;
+     typedef ::std::vector< XclImpPivotTableRef >    XclImpPivotTableVec;
+diff --git sc/source/filter/inc/xlpivot.hxx sc/source/filter/inc/xlpivot.hxx
+index 380a64d..8b5bd4e 100644
+--- sc/source/filter/inc/xlpivot.hxx
++++ sc/source/filter/inc/xlpivot.hxx
+@@ -41,6 +41,9 @@
+ #include <tools/datetime.hxx>
+ #include "ftools.hxx"
+ #include "xladdress.hxx"
++#include "dpobject.hxx"
++
++#include <memory>
+ 
+ class XclImpStream;
+ class XclExpStream;
+@@ -73,6 +76,10 @@ const sal_uInt16 EXC_PT_MAXDATACOUNT        = 256;
+ // pivot table items
+ const sal_uInt16 EXC_PT_MAXITEMCOUNT        = 32500;
+ 
++const sal_uInt16 EXC_PT_AUTOFMT_HEADER      = 0x810;
++const sal_uInt16 EXC_PT_AUTOFMT_ZERO        = 0;
++const sal_uInt32 EXC_PT_AUTOFMT_FLAGS       = 0x20;
++
+ /** Data type of a pivot cache item. */
+ enum XclPCItemType
+ {
+@@ -396,6 +403,9 @@ const double EXC_SXDBEX_CREATION_DATE       = 51901.029652778;
+ const sal_uInt16 EXC_ID_SXFDBTYPE           = 0x01BB;
+ const sal_uInt16 EXC_SXFDBTYPE_DEFAULT      = 0x0000;
+ 
++// (0x0810) SXVIEWEX9 ---------------------------------------------------------
++const sal_uInt16 EXC_ID_SXVIEWEX9       = 0x0810;
++
+ // ============================================================================
+ // Pivot cache
+ // ============================================================================
+@@ -663,6 +673,8 @@ struct XclPTFieldExtInfo
+     sal_uInt32          mnFlags;        /// Several flags and number of items for AutoShow.
+     sal_uInt16          mnSortField;    /// Index to data field sorting bases on.
+     sal_uInt16          mnShowField;    /// Index to data field AutoShow bases on.
++    sal_uInt16          mnNumFmt;
++    ::std::auto_ptr<rtl::OUString> mpFieldTotalName;
+ 
+     explicit            XclPTFieldExtInfo();
+ 
+@@ -786,5 +798,23 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo );
+ 
+ // ============================================================================
+ 
++// Pivot table autoformat settings ==============================================
++
++/** Pivot table autoformat settings (SXVIEWEX9 record). */
++struct XclPTViewEx9Info
++{
++    sal_uInt32          mbReport;           /// 2 for report* fmts ?
++    sal_uInt8           mnAutoFormat;       /// AutoFormat ID
++    sal_uInt8           mnGridLayout;       /// 0 == gridlayout, 0x10 == modern
++    String              maGrandTotalName;
++
++    explicit            XclPTViewEx9Info();
++    void                Init( const ScDPObject& rDPObj );
++};
++
++XclImpStream& operator>>( XclImpStream& rStrm, XclPTViewEx9Info& rInfo );
++XclExpStream& operator<<( XclExpStream& rStrm, const XclPTViewEx9Info& rInfo );
++
++// ============================================================================
+ #endif
+ 
+diff --git sc/source/filter/inc/xlstring.hxx sc/source/filter/inc/xlstring.hxx
+index 626b11b..0a078a4 100644
+--- sc/source/filter/inc/xlstring.hxx
++++ sc/source/filter/inc/xlstring.hxx
+@@ -43,6 +43,7 @@ const XclStrFlags EXC_STR_FORCEUNICODE      = 0x0001;   /// Always use UCS-2 cha
+ const XclStrFlags EXC_STR_8BITLENGTH        = 0x0002;   /// 8-bit string length field (default: 16-bit).
+ const XclStrFlags EXC_STR_SMARTFLAGS        = 0x0004;   /// Omit flags on empty string (default: read/write always). BIFF8 only.
+ const XclStrFlags EXC_STR_SEPARATEFORMATS   = 0x0008;   /// Import: Keep old formats when reading unformatted string (default: clear formats); Export: Write unformatted string.
++const XclStrFlags EXC_STR_NOHEADER          = 0x0010;   /// Export: Don't write the length and flag fields.
+ 
+ // ----------------------------------------------------------------------------
+ 
+diff --git sc/source/filter/xml/XMLExportDataPilot.cxx sc/source/filter/xml/XMLExportDataPilot.cxx
+index a382a95..eeecd3b 100644
+--- sc/source/filter/xml/XMLExportDataPilot.cxx
++++ sc/source/filter/xml/XMLExportDataPilot.cxx
+@@ -68,6 +68,7 @@
+ 
+ using namespace com::sun::star;
+ using namespace xmloff::token;
++using ::rtl::OUString;
+ 
+ ScXMLExportDataPilot::ScXMLExportDataPilot(ScXMLExport& rTempExport)
+     : rExport(rTempExport),
+@@ -448,7 +449,10 @@ void ScXMLExportDataPilot::WriteLayoutInfo(ScDPSaveDimension* pDim)
+ 
+ void ScXMLExportDataPilot::WriteSubTotals(ScDPSaveDimension* pDim)
+ {
++    using sheet::GeneralFunction;
++
+     sal_Int32 nSubTotalCount = pDim->GetSubTotalsCount();
++    const OUString* pLayoutName = pDim->GetSubtotalName();
+     if (nSubTotalCount > 0)
+     {
+         SvXMLElementExport aElemSTs(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, sal_True, sal_True);
+@@ -456,8 +460,11 @@ void ScXMLExportDataPilot::WriteSubTotals(ScDPSaveDimension* pDim)
+         for (sal_Int32 nSubTotal = 0; nSubTotal < nSubTotalCount; nSubTotal++)
+         {
+             rtl::OUString sFunction;
+-            ScXMLConverter::GetStringFromFunction( sFunction, (sheet::GeneralFunction)pDim->GetSubTotalFunc(nSubTotal) );
++            GeneralFunction nFunc = static_cast<GeneralFunction>(pDim->GetSubTotalFunc(nSubTotal));
++			ScXMLConverter::GetStringFromFunction( sFunction, nFunc);
+             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sFunction);
++            if (pLayoutName && nFunc == sheet::GeneralFunction_AUTO)
++                rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, *pLayoutName);
+             SvXMLElementExport aElemST(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, sal_True, sal_True);
+         }
+     }
+@@ -473,6 +480,9 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim)
+         for (ScDPSaveDimension::MemberList::const_iterator i=rMembers.begin(); i != rMembers.end() ; i++)
+         {
+             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, rtl::OUString((*i)->GetName()));
++            const OUString* pLayoutName = (*i)->GetLayoutName();
++            if (pLayoutName)
++                rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, *pLayoutName);
+             rtl::OUStringBuffer sBuffer;
+             SvXMLUnitConverter::convertBool(sBuffer, (*i)->GetIsVisible());
+             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, sBuffer.makeStringAndClear());
+@@ -670,6 +680,10 @@ void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const
+ void ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDimensionSaveData* pDimData)
+ {
+     rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, rtl::OUString(pDim->GetName()));
++    const OUString* pLayoutName = pDim->GetLayoutName();
++    if (pLayoutName)
++        rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, *pLayoutName);
++
+     if (pDim->IsDataLayout())
+         rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_DATA_LAYOUT_FIELD, XML_TRUE);
+     rtl::OUString sValueStr;
+@@ -707,6 +721,15 @@ void ScXMLExportDataPilot::WriteDimensions(ScDPSaveData* pDPSave)
+     }
+ }
+ 
++void ScXMLExportDataPilot::WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient, bool bVisible, const OUString* pGrandTotal)
++{
++    rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, bVisible ? XML_TRUE : XML_FALSE);
++    rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORIENTATION, eOrient);
++    if (pGrandTotal)
++        rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, *pGrandTotal);
++    SvXMLElementExport aElemGrandTotal(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_GRAND_TOTAL, sal_True, sal_True);
++}
++
+ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreadsheetDocument>& /* xSpreadDoc */)
+ {
+     pDoc = rExport.GetDocument();
+@@ -775,6 +798,20 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads
+                         if (!pDPSave->GetDrillDown())
+                             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_FALSE);
+                         SvXMLElementExport aElemDP(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, sal_True, sal_True);
++
++                        // grand total elements.
++
++                        const OUString* pGrandTotalName = pDPSave->GetGrandTotalName();
++                        if (bRowGrand && bColumnGrand)
++                        {
++                            WriteGrandTotal(XML_BOTH, true, pGrandTotalName);
++                        }
++                        else
++                        {
++                            WriteGrandTotal(XML_ROW, bRowGrand, pGrandTotalName);
++                            WriteGrandTotal(XML_COLUMN, bColumnGrand, pGrandTotalName);
++                        }
++
+                         rExport.CheckAttrList();
+                         if ((*pDPs)[i]->IsSheetData())
+                         {
+diff --git sc/source/filter/xml/XMLExportDataPilot.hxx sc/source/filter/xml/XMLExportDataPilot.hxx
+index 87c5894..a3f6cf8 100644
+--- sc/source/filter/xml/XMLExportDataPilot.hxx
++++ sc/source/filter/xml/XMLExportDataPilot.hxx
+@@ -34,6 +34,7 @@
+ #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+ #include <rtl/ustring.hxx>
+ #include "global.hxx"
++#include "xmloff/xmltoken.hxx"
+ 
+ class ScXMLExport;
+ class ScDocument;
+@@ -69,6 +70,8 @@ class ScXMLExportDataPilot
+     void WriteDimension(ScDPSaveDimension* pDim, const ScDPDimensionSaveData* pDimData);
+     void WriteDimensions(ScDPSaveData* pDPSave);
+ 
++    void WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient, bool bVisible, const ::rtl::OUString* pGrandTotal);
++
+ public:
+     ScXMLExportDataPilot(ScXMLExport& rExport);
+     ~ScXMLExportDataPilot();
+diff --git sc/source/filter/xml/xmldpimp.cxx sc/source/filter/xml/xmldpimp.cxx
+index 470827b..070fbc2 100644
+--- sc/source/filter/xml/xmldpimp.cxx
++++ sc/source/filter/xml/xmldpimp.cxx
+@@ -48,6 +48,7 @@
+ #include "dpgroup.hxx"
+ #include "dpdimsave.hxx"
+ #include "rangeutl.hxx"
++#include "dpoutputgeometry.hxx"
+ 
+ #include <xmloff/xmltkmap.hxx>
+ #include <xmloff/nmspmap.hxx>
+@@ -65,6 +66,8 @@
+ 
+ using namespace com::sun::star;
+ using namespace xmloff::token;
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::xml::sax::XAttributeList;
+ using ::rtl::OUString;
+ 
+ //------------------------------------------------------------------
+@@ -113,6 +116,9 @@ void ScXMLDataPilotTablesContext::EndElement()
+ {
+ }
+ 
++ScXMLDataPilotTableContext::GrandTotalItem::GrandTotalItem() :
++    mbVisible(false) {}
++
+ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
+                                       USHORT nPrfx,
+                                       const ::rtl::OUString& rLName,
+@@ -126,6 +132,10 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
+     sDataPilotTableName(),
+     sApplicationData(),
+     sGrandTotal(GetXMLToken(XML_BOTH)),
++    mnRowFieldCount(0),
++    mnColFieldCount(0),
++    mnPageFieldCount(0),
++    mnDataFieldCount(0),
+     bIsNative(sal_True),
+     bIgnoreEmptyRows(sal_False),
+     bIdentifyCategories(sal_False),
+@@ -159,6 +169,19 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
+             case XML_TOK_DATA_PILOT_TABLE_ATTR_GRAND_TOTAL :
+             {
+                 sGrandTotal = sValue;
++                if (IsXMLToken(sValue, XML_BOTH))
++                {    
++                    maRowGrandTotal.mbVisible = true;
++                    maColGrandTotal.mbVisible = true;
++                }
++                else if (IsXMLToken(sValue, XML_ROW))
++                {    
++                    maRowGrandTotal.mbVisible = true;
++                }
++                else if (IsXMLToken(sValue, XML_COLUMN))
++                {    
++                    maColGrandTotal.mbVisible = true;
++                }
+             }
+             break;
+             case XML_TOK_DATA_PILOT_TABLE_ATTR_IGNORE_EMPTY_ROWS :
+@@ -238,6 +261,11 @@ SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( USHORT nPref
+             nSourceType = SERVICE;
+         }
+         break;
++        case XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL:
++        {
++            pContext = new ScXMLDataPilotGrandTotalContext(GetScImport(), nPrefix, rLName, xAttrList, this);
++        }
++        break;
+         case XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE :
+         {
+             pContext = new ScXMLSourceCellRangeContext(GetScImport(), nPrefix, rLName, xAttrList, this);
+@@ -256,7 +284,13 @@ SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( USHORT nPref
+ }
+ 
+ void ScXMLDataPilotTableContext::SetButtons()
+-{
++{    
++    ScDPOutputGeometry aGeometry(aTargetRangeAddress, bShowFilter, ScDPOutputGeometry::ODF);
++    aGeometry.setColumnFieldCount(mnColFieldCount);
++    aGeometry.setRowFieldCount(mnRowFieldCount);
++    aGeometry.setPageFieldCount(mnPageFieldCount);
++    aGeometry.setDataFieldCount(mnDataFieldCount);
++
+     OUString sAddress;
+     sal_Int32 nOffset = 0;
+     while( nOffset >= 0 )
+@@ -268,8 +302,21 @@ void ScXMLDataPilotTableContext::SetButtons()
+             sal_Int32 nAddrOffset(0);
+             if (pDoc && ScRangeStringConverter::GetAddressFromString( aScAddress, sAddress, pDoc, ::formula::FormulaGrammar::CONV_OOO, nAddrOffset ))
+             {
+-                ScMergeFlagAttr aAttr( SC_MF_BUTTON );
+-                pDoc->ApplyAttr( aScAddress.Col(), aScAddress.Row(), aScAddress.Tab(), aAttr );
++                ScDPOutputGeometry::FieldType eType = aGeometry.getFieldButtonType(aScAddress);
++
++                sal_Int16 nMFlag = SC_MF_BUTTON;
++                if (eType == ScDPOutputGeometry::Column || eType == ScDPOutputGeometry::Row)
++                    nMFlag |= SC_MF_BUTTON_POPUP;
++
++                // Use the cell's string value to see if this field contains a 
++                // hidden member.  Isn't there a better way?  GetString() is
++                // quite expensive...
++                String aCellStr;
++                pDoc->GetString(aScAddress.Col(), aScAddress.Row(), aScAddress.Tab(), aCellStr);
++                if (maHiddenMemberFields.count(aCellStr))
++                    nMFlag |= SC_MF_HIDDEN_MEMBER;
++
++                pDoc->ApplyFlagsTab(aScAddress.Col(), aScAddress.Row(), aScAddress.Col(), aScAddress.Row(), aScAddress.Tab(), nMFlag);
+             }
+         }
+     }
+@@ -278,7 +325,7 @@ void ScXMLDataPilotTableContext::SetButtons()
+         pDPObject->RefreshAfterLoad();
+ }
+ 
+-void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim)
++void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHasHiddenMember)
+ {
+     if (pDPSave)
+     {
+@@ -288,6 +335,38 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim)
+                 pDPSave->GetExistingDimensionByName(pDim->GetName()) )
+             pDim->SetDupFlag( TRUE );
+ 
++        if (!pDim->IsDataLayout())
++        {
++            switch (pDim->GetOrientation())
++            {
++                case sheet::DataPilotFieldOrientation_ROW:
++                    ++mnRowFieldCount;
++                break;
++                case sheet::DataPilotFieldOrientation_COLUMN:
++                    ++mnColFieldCount;
++                break;
++                case sheet::DataPilotFieldOrientation_PAGE:
++                    ++mnPageFieldCount;
++                break;
++                case sheet::DataPilotFieldOrientation_DATA:
++                    ++mnDataFieldCount;
++                break;
++                case sheet::DataPilotFieldOrientation_HIDDEN:
++                default:
++                    ;
++            }
++
++            if (bHasHiddenMember)
++            {
++                // the layout name takes priority over the original name, 
++                // since this data is used against cell values.
++                const OUString* pLayoutName = pDim->GetLayoutName();
++                if (pLayoutName)
++                    maHiddenMemberFields.insert(*pLayoutName);
++                else
++                    maHiddenMemberFields.insert(pDim->GetName());
++            }
++        }
+         pDPSave->AddDimension(pDim);
+     }
+ }
+@@ -362,26 +441,15 @@ void ScXMLDataPilotTableContext::EndElement()
+             }
+             break;
+         }
+-        if (IsXMLToken(sGrandTotal, XML_BOTH))
+-        {
+-            pDPSave->SetRowGrand(sal_True);
+-            pDPSave->SetColumnGrand(sal_True);
+-        }
+-        else if (IsXMLToken(sGrandTotal, XML_ROW))
+-        {
+-            pDPSave->SetRowGrand(sal_True);
+-            pDPSave->SetColumnGrand(sal_False);
+-        }
+-        else if (IsXMLToken(sGrandTotal, XML_COLUMN))
+-        {
+-            pDPSave->SetRowGrand(sal_False);
+-            pDPSave->SetColumnGrand(sal_True);
+-        }
+-        else
+-        {
+-            pDPSave->SetRowGrand(sal_False);
+-            pDPSave->SetColumnGrand(sal_False);
+-        }
++
++        pDPSave->SetRowGrand(maRowGrandTotal.mbVisible);
++        pDPSave->SetColumnGrand(maColGrandTotal.mbVisible);
++        if (maRowGrandTotal.maDisplayName.getLength())
++            // TODO: Right now, we only support one grand total name for both 
++            // column and row totals.  Take the value from the row total for
++            // now.
++            pDPSave->SetGrandTotalName(maRowGrandTotal.maDisplayName);
++
+         pDPSave->SetIgnoreEmptyRows(bIgnoreEmptyRows);
+         pDPSave->SetRepeatIfEmpty(bIdentifyCategories);
+         pDPSave->SetFilterButton(bShowFilter);
+@@ -393,12 +461,36 @@ void ScXMLDataPilotTableContext::EndElement()
+         {
+             ScDPCollection* pDPCollection = pDoc->GetDPCollection();
+             pDPObject->SetAlive(sal_True);
+-            pDPCollection->Insert(pDPObject);
++            pDPCollection->InsertNewTable(pDPObject);
+         }
+         SetButtons();
+     }
+ }
+ 
++void ScXMLDataPilotTableContext::SetGrandTotal(
++    XMLTokenEnum eOrientation, bool bVisible, const OUString& rDisplayName)
++{
++    switch (eOrientation)
++    {
++        case XML_BOTH:
++            maRowGrandTotal.mbVisible     = bVisible;
++            maRowGrandTotal.maDisplayName = rDisplayName;
++            maColGrandTotal.mbVisible     = bVisible;
++            maColGrandTotal.maDisplayName = rDisplayName;
++        break;
++        case XML_ROW:
++            maRowGrandTotal.mbVisible     = bVisible;
++            maRowGrandTotal.maDisplayName = rDisplayName;
++        break;
++        case XML_COLUMN:
++            maColGrandTotal.mbVisible     = bVisible;
++            maColGrandTotal.maDisplayName = rDisplayName;
++        break;
++        default:
++            ;
++    }
++}
++
+ ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport,
+                                       USHORT nPrfx,
+                                       const ::rtl::OUString& rLName,
+@@ -643,6 +735,80 @@ void ScXMLSourceServiceContext::EndElement()
+ {
+ }
+ 
++ScXMLImport& ScXMLDataPilotGrandTotalContext::GetScImport()
++{
++    return static_cast<ScXMLImport&>(GetImport());
++}
++
++ScXMLDataPilotGrandTotalContext::ScXMLDataPilotGrandTotalContext(
++    ScXMLImport& rImport, USHORT nPrefix, const OUString& rLName, const Reference<XAttributeList>& xAttrList,
++    ScXMLDataPilotTableContext* pTableContext ) :
++    SvXMLImportContext( rImport, nPrefix, rLName ),
++    mpTableContext(pTableContext),
++    meOrientation(NONE),
++    mbVisible(false)
++{
++    sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
++    const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotGrandTotalAttrTokenMap();
++    for (sal_Int16 i = 0; i < nAttrCount; ++i)
++    {
++        const OUString& rAttrName  = xAttrList->getNameByIndex(i);
++        const OUString& rAttrValue = xAttrList->getValueByIndex(i);
++
++        OUString aLocalName;
++        USHORT nLocalPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
++        switch (rAttrTokenMap.Get(nLocalPrefix, aLocalName))
++        {
++            case XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY:
++                mbVisible = IsXMLToken(rAttrValue, XML_TRUE);
++            break;
++            case XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_ORIENTATION:
++                if (IsXMLToken(rAttrValue, XML_BOTH))
++                    meOrientation = BOTH;
++                else if (IsXMLToken(rAttrValue, XML_ROW))
++                    meOrientation = ROW;
++                else if (IsXMLToken(rAttrValue, XML_COLUMN))
++                    meOrientation = COLUMN;
++            break;
++            case XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME:
++                maDisplayName = rAttrValue;
++            break;
++            default:
++                ;
++        }
++    }
++}
++
++ScXMLDataPilotGrandTotalContext::~ScXMLDataPilotGrandTotalContext()
++{
++}
++
++SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext( 
++    USHORT /*nPrefix*/, const ::rtl::OUString& /*rLocalName*/, const Reference<XAttributeList>& /*xAttrList*/ )
++{
++    return NULL;
++}
++
++void ScXMLDataPilotGrandTotalContext::EndElement()
++{
++    XMLTokenEnum eOrient = XML_NONE;
++    switch (meOrientation)
++    {
++        case BOTH:
++            eOrient = XML_BOTH;
++        break;
++        case ROW:
++            eOrient = XML_ROW;
++        break;
++        case COLUMN:
++            eOrient = XML_COLUMN;
++        break;
++        default:
++            ;
++    }
++    mpTableContext->SetGrandTotal(eOrient, mbVisible, maDisplayName);
++}
++
+ ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport,
+                                       USHORT nPrfx,
+                                       const ::rtl::OUString& rLName,
+@@ -723,10 +889,12 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport,
+     bIsGroupField(sal_False),
+     bDateValue(sal_False),
+     bAutoStart(sal_False),
+-    bAutoEnd(sal_False)
++    bAutoEnd(sal_False),
++    mbHasHiddenMember(false)
+ {
+     sal_Bool bHasName(sal_False);
+     sal_Bool bDataLayout(sal_False);
++    OUString aDisplayName;
+     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
+     const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotFieldAttrTokenMap();
+     for( sal_Int16 i=0; i < nAttrCount; ++i )
+@@ -745,6 +913,11 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport,
+                 bHasName = sal_True;
+             }
+             break;
++            case XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME:
++            {
++                aDisplayName = sValue;
++            }
++            break;
+             case XML_TOK_DATA_PILOT_FIELD_ATTR_IS_DATA_LAYOUT_FIELD :
+             {
+                 bDataLayout = IsXMLToken(sValue, XML_TRUE);
+@@ -774,7 +947,11 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport,
+         }
+     }
+     if (bHasName)
++    {    
+         pDim = new ScDPSaveDimension(String(sName), bDataLayout);
++        if (aDisplayName.getLength())
++            pDim->SetLayoutName(aDisplayName);
++    }
+ }
+ 
+ ScXMLDataPilotFieldContext::~ScXMLDataPilotFieldContext()
+@@ -808,6 +985,22 @@ SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( USHORT nPref
+     return pContext;
+ }
+ 
++void ScXMLDataPilotFieldContext::AddMember(ScDPSaveMember* pMember)
++{
++    if (pDim)
++        pDim->AddMember(pMember);
++
++    if (!pMember->GetIsVisible())
++        // This member is hidden.
++        mbHasHiddenMember = true;
++}
++
++void ScXMLDataPilotFieldContext::SetSubTotalName(const OUString& rName)
++{
++    if (pDim)
++        pDim->SetSubtotalName(rName);
++}
++
+ void ScXMLDataPilotFieldContext::AddGroup(const ::std::vector<rtl::OUString>& rMembers, const rtl::OUString& rName)
+ {
+     ScXMLDataPilotGroup aGroup;
+@@ -828,7 +1021,7 @@ void ScXMLDataPilotFieldContext::EndElement()
+             String sPage(sSelectedPage);
+             pDim->SetCurrentPage(&sPage);
+         }
+-        pDataPilotTable->AddDimension(pDim);
++		pDataPilotTable->AddDimension(pDim, mbHasHiddenMember);
+         if (bIsGroupField)
+         {            
+             ScDPNumGroupInfo aInfo;
+@@ -1199,6 +1392,8 @@ SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( USHORT n
+ void ScXMLDataPilotSubTotalsContext::EndElement()
+ {
+     pDataPilotField->SetSubTotals(pFunctions, nFunctionCount);
++    if (maDisplayName.getLength())
++        pDataPilotField->SetSubTotalName(maDisplayName);
+ }
+ 
+ void ScXMLDataPilotSubTotalsContext::AddFunction(sal_Int16 nFunction)
+@@ -1221,6 +1416,11 @@ void ScXMLDataPilotSubTotalsContext::AddFunction(sal_Int16 nFunction)
+     }
+ }
+ 
++void ScXMLDataPilotSubTotalsContext::SetDisplayName(const OUString& rName)
++{
++    maDisplayName = rName;
++}
++
+ ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImport,
+                                       USHORT nPrfx,
+                                       const ::rtl::OUString& rLName,
+@@ -1247,6 +1447,8 @@ ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImpo
+                 pDataPilotSubTotals->AddFunction( sal::static_int_cast<sal_Int16>(
+                                 ScXMLConverter::GetFunctionFromString( sValue ) ) );
+             }
++            case XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME:
++                pDataPilotSubTotals->SetDisplayName(sValue);
+             break;
+         }
+     }
+@@ -1344,6 +1546,10 @@ ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport,
+                 bHasName = sal_True;
+             }
+             break;
++            case XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME:
++            {
++                maDisplayName = sValue;
++            }
+             case XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY :
+             {
+                 bDisplay = IsXMLToken(sValue, XML_TRUE);
+@@ -1380,6 +1586,8 @@ void ScXMLDataPilotMemberContext::EndElement()
+     if (bHasName)   // #i53407# don't check sName, empty name is allowed
+     {
+         ScDPSaveMember* pMember = new ScDPSaveMember(String(sName));
++        if (maDisplayName.getLength())
++            pMember->SetLayoutName(maDisplayName);
+         pMember->SetIsVisible(bDisplay);
+         pMember->SetShowDetails(bDisplayDetails);
+         pDataPilotField->AddMember(pMember);
+diff --git sc/source/filter/xml/xmldpimp.hxx sc/source/filter/xml/xmldpimp.hxx
+index dfbba92..b4df6b1 100644
+--- sc/source/filter/xml/xmldpimp.hxx
++++ sc/source/filter/xml/xmldpimp.hxx
+@@ -41,6 +41,8 @@
+ #include "dpobject.hxx"
+ #include "dpsave.hxx"
+ 
++#include <hash_set>
++
+ class ScXMLImport;
+ class ScDPSaveNumGroupDimension;
+ class ScDPSaveGroupDimension;
+@@ -79,10 +81,21 @@ public:
+ 
+ class ScXMLDataPilotTableContext : public SvXMLImportContext
+ {
++    typedef ::std::hash_set< ::rtl::OUString, ::rtl::OUStringHash > StringSet;
++    StringSet       maHiddenMemberFields;
++
++    struct GrandTotalItem
++    {
++        ::rtl::OUString maDisplayName;
++        bool            mbVisible;
++        GrandTotalItem();
++    };
+     ScDocument*		pDoc;
+     ScDPObject*		pDPObject;
+     ScDPSaveData*	pDPSave;
+     ScDPDimensionSaveData* pDPDimSaveData;
++    GrandTotalItem  maRowGrandTotal;
++    GrandTotalItem  maColGrandTotal;
+     rtl::OUString	sDataPilotTableName;
+     rtl::OUString	sApplicationData;
+     rtl::OUString	sGrandTotal;
+@@ -100,6 +113,10 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext
+     ScAddress		aFilterOutputPosition;
+     ScQueryParam	aSourceQueryParam;
+     ScMySourceType	nSourceType;
++    sal_uInt32      mnRowFieldCount;
++    sal_uInt32      mnColFieldCount;
++    sal_uInt32      mnPageFieldCount;
++    sal_uInt32      mnDataFieldCount;
+     sal_Bool		bIsNative;
+     sal_Bool		bIgnoreEmptyRows;
+     sal_Bool		bIdentifyCategories;
+@@ -131,6 +148,7 @@ public:
+ 
+     virtual void EndElement();
+ 
++    void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const ::rtl::OUString& rDisplayName);
+     void SetDatabaseName(const rtl::OUString& sValue) { sDatabaseName = sValue; }
+     void SetSourceObject(const rtl::OUString& sValue) { sSourceObject = sValue; }
+     void SetNative(const sal_Bool bValue) { bIsNative = bValue; }
+@@ -147,7 +165,7 @@ public:
+     void SetFilterSourceRange(const ScRange& aValue) { aFilterSourceRange = aValue; }
+ //	void SetFilterIsCaseSensitive(const sal_Bool bValue) { aSourceQueryParam.bCaseSens = bValue; }
+ //	void SetFilterSkipDuplicates(const sal_Bool bValue) { aSourceQueryParam.bDuplicate = !bValue; }
+-    void AddDimension(ScDPSaveDimension* pDim);
++	void AddDimension(ScDPSaveDimension* pDim, bool bHasHiddenMember);
+     void AddGroupDim(const ScDPSaveNumGroupDimension& aNumGroupDim);
+     void AddGroupDim(const ScDPSaveGroupDimension& aGroupDim);
+     void SetButtons();
+@@ -253,6 +271,34 @@ public:
+     virtual void EndElement();
+ };
+ 
++class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext
++{
++    enum Orientation { COLUMN, ROW, BOTH, NONE };
++
++    ScXMLImport& GetScImport();
++
++    ScXMLDataPilotTableContext* mpTableContext;
++    ::rtl::OUString             maDisplayName;
++    Orientation                 meOrientation;
++    bool                        mbVisible;
++    
++public:
++    ScXMLDataPilotGrandTotalContext( 
++        ScXMLImport& rImport, USHORT nPrefix, const ::rtl::OUString& rLName,
++        const ::com::sun::star::uno::Reference< 
++            ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
++        ScXMLDataPilotTableContext* pTableContext );
++
++    virtual ~ScXMLDataPilotGrandTotalContext();
++
++    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
++                                     const ::rtl::OUString& rLocalName,
++                                     const ::com::sun::star::uno::Reference<
++                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
++
++    virtual void EndElement();
++};
++
+ class ScXMLSourceCellRangeContext : public SvXMLImportContext
+ {
+     ScXMLDataPilotTableContext*	pDataPilotTable;
+@@ -300,12 +346,13 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext
+     sal_Int32                   nGroupPart;
+     sal_Int16					nFunction;
+     sal_Int16					nOrientation;
+-    sal_Bool					bShowEmpty;
+-    sal_Bool                    bSelectedPage;
+-    sal_Bool                    bIsGroupField;
+-    sal_Bool                    bDateValue;
+-    sal_Bool                    bAutoStart;
+-    sal_Bool                    bAutoEnd;
++	sal_Bool					bShowEmpty:1;
++    sal_Bool                    bSelectedPage:1;
++    sal_Bool                    bIsGroupField:1;
++    sal_Bool                    bDateValue:1;
++    sal_Bool                    bAutoStart:1;
++    sal_Bool                    bAutoEnd:1;
++    bool                        mbHasHiddenMember:1;
+ 
+     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+@@ -329,7 +376,8 @@ public:
+ 
+     void SetShowEmpty(const sal_Bool bValue) { if (pDim) pDim->SetShowEmpty(bValue); }
+     void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); }
+-    void AddMember(ScDPSaveMember* pMember) { if (pDim) pDim->AddMember(pMember); }
++    void AddMember(ScDPSaveMember* pMember);
++    void SetSubTotalName(const ::rtl::OUString& rName);
+     void SetFieldReference(const com::sun::star::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); }
+     void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); }
+     void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); }
+@@ -453,6 +501,7 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext
+ 
+     sal_Int16	nFunctionCount;
+     sal_uInt16*	pFunctions;
++    ::rtl::OUString maDisplayName;
+ 
+     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+@@ -476,6 +525,7 @@ public:
+ 
+     virtual void EndElement();
+     void AddFunction(sal_Int16 nFunction);
++    void SetDisplayName(const ::rtl::OUString& rName);
+ };
+ 
+ class ScXMLDataPilotSubTotalContext : public SvXMLImportContext
+@@ -533,6 +583,7 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext
+     ScXMLDataPilotFieldContext*	pDataPilotField;
+ 
+     rtl::OUString sName;
++    rtl::OUString maDisplayName;
+     sal_Bool	bDisplay;
+     sal_Bool	bDisplayDetails;
+     sal_Bool    bHasName;
+diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
+index a45add1..7d9e882 100644
+--- sc/source/filter/xml/xmlimprt.cxx
++++ sc/source/filter/xml/xmlimprt.cxx
+@@ -1345,6 +1345,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableElemTokenMap()
+         {
+             { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL,	XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL		},
+             { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE,	XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE		},
++            { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GRAND_TOTAL,  XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL       },
+             { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY,	XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY		},
+             { XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE,			XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE	},
+             { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE,		XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE	},
+@@ -1378,6 +1379,24 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceServiceAttrTokenMap()
+     return *pDataPilotTableSourceServiceAttrTokenMap;
+ }
+ 
++const SvXMLTokenMap& ScXMLImport::GetDataPilotGrandTotalAttrTokenMap()
++{
++    if (!pDataPilotGrandTotalAttrTokenMap)
++    {
++        static __FAR_DATA SvXMLTokenMapEntry aDataPilotGrandTotalAttrTokenMap[] =
++        {
++            { XML_NAMESPACE_TABLE, XML_DISPLAY,      XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY      },
++            { XML_NAMESPACE_TABLE, XML_ORIENTATION,  XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_ORIENTATION  },
++            { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME },
++            XML_TOKEN_MAP_END
++        };
++
++        pDataPilotGrandTotalAttrTokenMap = new SvXMLTokenMap( aDataPilotGrandTotalAttrTokenMap );
++    }
++
++    return *pDataPilotGrandTotalAttrTokenMap;
++}
++
+ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeAttrTokenMap()
+ {
+     if( !pDataPilotTableSourceCellRangeAttrTokenMap )
+@@ -1417,6 +1436,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldAttrTokenMap()
+         static __FAR_DATA SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] =
+         {
+             { XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME,		XML_TOK_DATA_PILOT_FIELD_ATTR_SOURCE_FIELD_NAME		},
++            { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,            XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME          },
+             { XML_NAMESPACE_TABLE, XML_IS_DATA_LAYOUT_FIELD,	XML_TOK_DATA_PILOT_FIELD_ATTR_IS_DATA_LAYOUT_FIELD	},
+             { XML_NAMESPACE_TABLE, XML_FUNCTION,				XML_TOK_DATA_PILOT_FIELD_ATTR_FUNCTION				},
+             { XML_NAMESPACE_TABLE, XML_ORIENTATION,			    XML_TOK_DATA_PILOT_FIELD_ATTR_ORIENTATION			},
+@@ -1508,6 +1528,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalAttrTokenMap()
+         static __FAR_DATA SvXMLTokenMapEntry aDataPilotSubTotalAttrTokenMap[] =
+         {
+             { XML_NAMESPACE_TABLE, XML_FUNCTION,				XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION			},
++            { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,            XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME       },
+             XML_TOKEN_MAP_END
+         };
+ 
+@@ -1540,6 +1561,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMemberAttrTokenMap()
+         static __FAR_DATA SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] =
+         {
+             { XML_NAMESPACE_TABLE, XML_NAME,					XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME					},
++            { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,        XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME         },
+             { XML_NAMESPACE_TABLE, XML_DISPLAY,				XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY				},
+             { XML_NAMESPACE_TABLE, XML_SHOW_DETAILS,		XML_TOK_DATA_PILOT_MEMBER_ATTR_SHOW_DETAILS		},
+             XML_TOKEN_MAP_END
+@@ -1675,6 +1697,7 @@ ScXMLImport::ScXMLImport(
+     pDataPilotTableAttrTokenMap( 0 ),
+     pDataPilotTableElemTokenMap( 0 ),
+     pDataPilotTableSourceServiceAttrTokenMap( 0 ),
++    pDataPilotGrandTotalAttrTokenMap(NULL),
+     pDataPilotTableSourceCellRangeElemTokenMap( 0 ),
+     pDataPilotTableSourceCellRangeAttrTokenMap( 0 ),
+     pDataPilotFieldAttrTokenMap( 0 ),
+diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx
+index f9cdfe0..139acf5 100644
+--- sc/source/filter/xml/xmlimprt.hxx
++++ sc/source/filter/xml/xmlimprt.hxx
+@@ -489,6 +489,7 @@ enum ScXMLDataPilotTableElemTokens
+ {
+     XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL,
+     XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE,
++    XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL,
+     XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY,
+     XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE,
+     XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE,
+@@ -504,6 +505,13 @@ enum ScXMLDataPilotTableSourceServiceAttrTokens
+     XML_TOK_SOURCE_SERVICE_ATTR_PASSWORD
+ };
+ 
++enum ScXMLDataPilotGrandTotalAttrTokens
++{
++    XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY,
++    XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_ORIENTATION,
++    XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME
++};
++
+ enum ScXMLDataPilotTableSourceCellRangeElemTokens
+ {
+     XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER
+@@ -517,6 +525,7 @@ enum ScXMLDataPilotTableSourceCellRangeAttrTokens
+ enum ScXMLDataPilotFieldAttrTokens
+ {
+     XML_TOK_DATA_PILOT_FIELD_ATTR_SOURCE_FIELD_NAME,
++    XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME,
+     XML_TOK_DATA_PILOT_FIELD_ATTR_IS_DATA_LAYOUT_FIELD,
+     XML_TOK_DATA_PILOT_FIELD_ATTR_FUNCTION,
+     XML_TOK_DATA_PILOT_FIELD_ATTR_ORIENTATION,
+@@ -552,7 +561,8 @@ enum ScXMLDataPilotSubTotalsElemTokens
+ 
+ enum ScXMLDataPilotSubTotalAttrTokens
+ {
+-    XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION
++    XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION,
++    XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME
+ };
+ 
+ enum ScXMLDataPilotMembersElemTokens
+@@ -563,6 +573,7 @@ enum ScXMLDataPilotMembersElemTokens
+ enum ScXMLDataPilotMemberAttrTokens
+ {
+     XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME,
++    XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME,
+     XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY,
+     XML_TOK_DATA_PILOT_MEMBER_ATTR_SHOW_DETAILS
+ };
+@@ -723,6 +734,7 @@ class ScXMLImport: public SvXMLImport
+     SvXMLTokenMap 			*pDataPilotTableAttrTokenMap;
+     SvXMLTokenMap 			*pDataPilotTableElemTokenMap;
+     SvXMLTokenMap 			*pDataPilotTableSourceServiceAttrTokenMap;
++    SvXMLTokenMap           *pDataPilotGrandTotalAttrTokenMap;
+     SvXMLTokenMap 			*pDataPilotTableSourceCellRangeElemTokenMap;
+     SvXMLTokenMap 			*pDataPilotTableSourceCellRangeAttrTokenMap;
+     SvXMLTokenMap 			*pDataPilotFieldAttrTokenMap;
+@@ -886,6 +898,7 @@ public:
+     const SvXMLTokenMap& GetDataPilotTableAttrTokenMap();
+     const SvXMLTokenMap& GetDataPilotTableElemTokenMap();
+     const SvXMLTokenMap& GetDataPilotTableSourceServiceAttrTokenMap();
++    const SvXMLTokenMap& GetDataPilotGrandTotalAttrTokenMap();
+     const SvXMLTokenMap& GetDataPilotTableSourceCellRangeElemTokenMap();
+     const SvXMLTokenMap& GetDataPilotTableSourceCellRangeAttrTokenMap();
+     const SvXMLTokenMap& GetDataPilotFieldAttrTokenMap();
+diff --git sc/source/ui/Accessibility/AccessibleContextBase.cxx sc/source/ui/Accessibility/AccessibleContextBase.cxx
+index efde039..8978bfa 100644
+--- sc/source/ui/Accessibility/AccessibleContextBase.cxx
++++ sc/source/ui/Accessibility/AccessibleContextBase.cxx
+@@ -628,3 +628,8 @@ void ScAccessibleContextBase::IsObjectValid() const
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         throw lang::DisposedException();
+ }
++
++void ScAccessibleContextBase::SetRole(sal_Int16 nRole)
++{
++    maRole = nRole;
++}
+diff --git sc/source/ui/Accessibility/AccessibleFilterMenu.cxx sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+new file mode 100644
+index 0000000..8a76393
+--- /dev/null
++++ sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+@@ -0,0 +1,402 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: AccessibleDataPilotControl.hxx,v $
++ * $Revision: 1.6 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++
++#include "precompiled_sc.hxx"
++#include "AccessibleGlobal.hxx"
++#include "AccessibleFilterMenu.hxx"
++#include "AccessibleFilterMenuItem.hxx"
++#include "unoguard.hxx"
++#include "global.hxx"
++#include "document.hxx"
++#include "docpool.hxx"
++
++#include "tools/gen.hxx"
++#include "svx/unoedsrc.hxx"
++#include "svx/editdata.hxx"
++#include "svx/outliner.hxx"
++#include "svtools/itemset.hxx"
++#include "vcl/unohelp.hxx"
++#include "dpcontrol.hxx"
++
++#include <com/sun/star/accessibility/XAccessible.hpp>
++#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
++#include <com/sun/star/accessibility/AccessibleRole.hpp>
++#include <com/sun/star/accessibility/AccessibleEventId.hpp>
++#include <com/sun/star/accessibility/AccessibleStateType.hpp>
++
++using namespace ::com::sun::star;
++using namespace ::com::sun::star::accessibility;
++using namespace ::com::sun::star::accessibility::AccessibleStateType;
++
++using ::com::sun::star::uno::Any;
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::uno::Sequence;
++using ::com::sun::star::uno::UNO_QUERY;
++using ::com::sun::star::lang::IndexOutOfBoundsException;
++using ::com::sun::star::lang::IllegalArgumentException;
++using ::com::sun::star::uno::RuntimeException;
++using ::rtl::OUString;
++using ::std::for_each;
++using ::std::vector;
++
++// ============================================================================
++
++namespace {
++
++class AddRemoveEventListener : public ::std::unary_function<void, Reference<XAccessible> >
++{
++public:
++    explicit AddRemoveEventListener(const Reference<XAccessibleEventListener>& rListener, bool bAdd) : 
++        mxListener(rListener), mbAdd(bAdd) {}
++
++    void operator() (const Reference<XAccessible>& xAccessible) const
++    {
++        if (!xAccessible.is())
++            return;
++
++        Reference<XAccessibleEventBroadcaster> xBc(xAccessible, UNO_QUERY);
++        if (xBc.is())
++        {
++            if (mbAdd)
++                xBc->addEventListener(mxListener);
++            else
++                xBc->removeEventListener(mxListener);
++        }
++    }
++private:
++    Reference<XAccessibleEventListener> mxListener;
++    bool mbAdd;
++};
++
++}
++
++// ============================================================================
++
++ScAccessibleFilterMenu::ScAccessibleFilterMenu(const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos, ScDocument* pDoc) :
++    ScAccessibleContextBase(rxParent, AccessibleRole::MENU),
++    mnMenuPos(nMenuPos),
++    mpWindow(pWin),
++    mpDoc(pDoc),
++    mbEnabled(true)
++{
++    SetName(rName);
++}
++
++ScAccessibleFilterMenu::~ScAccessibleFilterMenu()
++{
++}
++
++// XAccessibleComponent
++
++Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleAtPoint( const ::com::sun::star::awt::Point& /*rPoint*/ )
++        throw (RuntimeException)
++{
++    return this;
++}
++
++sal_Bool ScAccessibleFilterMenu::isVisible() throw (RuntimeException)
++{
++    return mpWindow->IsVisible();
++}
++
++void ScAccessibleFilterMenu::grabFocus()
++    throw (RuntimeException)
++{
++}
++
++sal_Int32 ScAccessibleFilterMenu::getForeground() 
++    throw (RuntimeException)
++{
++    return 0;
++}
++
++sal_Int32 ScAccessibleFilterMenu::getBackground() 
++    throw (RuntimeException)
++{
++    return 0;
++}
++
++// XAccessibleContext
++
++OUString ScAccessibleFilterMenu::getAccessibleName() throw (RuntimeException)
++{
++    return ScAccessibleContextBase::getAccessibleName();
++}
++
++sal_Int32 ScAccessibleFilterMenu::getAccessibleChildCount() 
++    throw (RuntimeException)
++{
++    return getMenuItemCount();
++}
++
++Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nIndex) 
++    throw (RuntimeException, IndexOutOfBoundsException)
++{
++    if (maMenuItems.size() <= static_cast<size_t>(nIndex))
++        throw IndexOutOfBoundsException();
++
++    return maMenuItems[nIndex];
++}
++
++Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet() 
++    throw (RuntimeException)
++{
++    updateStates();
++    return mxStateSet;
++}
++
++OUString ScAccessibleFilterMenu::getImplementationName() 
++    throw (RuntimeException)
++{
++    return OUString::createFromAscii("ScAccessibleFilterMenu");
++}
++
++// XAccessibleEventBroadcaster
++
++void ScAccessibleFilterMenu::addEventListener(
++        const ::com::sun::star::uno::Reference<
++            ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
++    throw (com::sun::star::uno::RuntimeException)
++{
++    ScAccessibleContextBase::addEventListener(xListener);
++    for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, true));
++}
++
++void ScAccessibleFilterMenu::removeEventListener(
++        const ::com::sun::star::uno::Reference<
++            ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
++    throw (com::sun::star::uno::RuntimeException)
++{
++    ScAccessibleContextBase::removeEventListener(xListener);
++    for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, false));
++}
++
++// XAccessibleSelection
++
++void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex) 
++    throw (IndexOutOfBoundsException, RuntimeException)
++{
++    if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
++        throw IndexOutOfBoundsException();
++
++    mpWindow->setSelectedMenuItem(nChildIndex, false, true);
++}
++
++sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex) 
++    throw (IndexOutOfBoundsException, RuntimeException)
++{
++    if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
++        throw IndexOutOfBoundsException();
++
++    return mpWindow->isMenuItemSelected(static_cast<size_t>(nChildIndex));
++}
++
++void ScAccessibleFilterMenu::clearAccessibleSelection() throw (RuntimeException)
++{
++    mpWindow->clearSelectedMenuItem();
++}
++
++void ScAccessibleFilterMenu::selectAllAccessibleChildren() throw (RuntimeException)
++{
++    // not suported - this is a menu, you can't select all menu items.
++}
++
++sal_Int32 ScAccessibleFilterMenu::getSelectedAccessibleChildCount() throw (RuntimeException)
++{
++    // Since this is a menu, either one menu item is selected, or none at all.
++    return mpWindow->getSelectedMenuItem() == ScMenuFloatingWindow::MENU_NOT_SELECTED ? 0 : 1;
++}
++
++Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_Int32 nChildIndex) 
++    throw (IndexOutOfBoundsException, RuntimeException)
++{
++    if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
++        throw IndexOutOfBoundsException();
++
++    return maMenuItems[nChildIndex];
++}
++
++void ScAccessibleFilterMenu::deselectAccessibleChild(sal_Int32 nChildIndex) throw (IndexOutOfBoundsException, RuntimeException)
++{
++    if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
++        throw IndexOutOfBoundsException();
++
++    mpWindow->selectMenuItem(nChildIndex, false, false);
++}
++
++// XInterface
++
++uno::Any SAL_CALL ScAccessibleFilterMenu::queryInterface( uno::Type const & rType )
++	throw (RuntimeException)
++{
++	Any any = ScAccessibleContextBase::queryInterface(rType);
++    if (any.hasValue())
++        return any;
++
++    return ScAccessibleFilterMenu_BASE::queryInterface(rType);
++}
++
++void SAL_CALL ScAccessibleFilterMenu::acquire() throw ()
++{
++	ScAccessibleContextBase::acquire();
++}
++
++void SAL_CALL ScAccessibleFilterMenu::release() throw ()
++{
++	ScAccessibleContextBase::release();
++}
++
++// XTypeProvider
++
++Sequence<sal_Int8> ScAccessibleFilterMenu::getImplementationId() 
++    throw (RuntimeException)
++{
++    Sequence<sal_Int8> aId(16);
++    return aId;
++}
++
++Rectangle ScAccessibleFilterMenu::GetBoundingBoxOnScreen() const
++    throw (RuntimeException)
++{
++    if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED)
++        return Rectangle();
++    
++    // Menu object's bounding box is the bounding box of the menu item that 
++    // launches the menu, which belongs to the parent window.
++    ScMenuFloatingWindow* pParentWin = mpWindow->getParentMenuWindow();
++    if (!pParentWin)
++        return Rectangle();
++
++    if (!pParentWin->IsVisible())
++        return Rectangle();
++
++    Point aPos = pParentWin->OutputToAbsoluteScreenPixel(Point(0,0));
++    Point aMenuPos;
++    Size aMenuSize;
++    pParentWin->getMenuItemPosSize(mnMenuPos, aMenuPos, aMenuSize);
++    Rectangle aRect(aPos + aMenuPos, aMenuSize);
++    return aRect;
++}
++
++Rectangle ScAccessibleFilterMenu::GetBoundingBox() const
++    throw (RuntimeException)
++{
++    if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED)
++        return Rectangle();
++
++    // Menu object's bounding box is the bounding box of the menu item that 
++    // launches the menu, which belongs to the parent window.
++    ScMenuFloatingWindow* pParentWin = mpWindow->getParentMenuWindow();
++    if (!pParentWin)
++        return Rectangle();
++
++    if (!pParentWin->IsVisible())
++        return Rectangle();
++
++    Point aMenuPos;
++    Size aMenuSize;
++    pParentWin->getMenuItemPosSize(mnMenuPos, aMenuPos, aMenuSize);
++    Rectangle aRect(aMenuPos, aMenuSize);
++    return aRect;
++}
++
++void ScAccessibleFilterMenu::appendMenuItem(const OUString& rName, bool bEnabled, size_t nMenuPos)
++{
++    // Check weather this menu item is a sub menu or a regular menu item.
++    ScMenuFloatingWindow* pSubMenu = mpWindow->getSubMenuWindow(nMenuPos);
++    Reference<XAccessible> xAccessible;
++    if (pSubMenu)
++    {
++        xAccessible = pSubMenu->CreateAccessible();
++        ScAccessibleFilterMenu* p = 
++            static_cast<ScAccessibleFilterMenu*>(xAccessible.get());
++        p->setEnabled(bEnabled);
++        p->setMenuPos(nMenuPos);
++    }
++    else
++    {
++        xAccessible.set(new ScAccessibleFilterMenuItem(this, mpWindow, rName, nMenuPos));
++        ScAccessibleFilterMenuItem* p = 
++            static_cast<ScAccessibleFilterMenuItem*>(xAccessible.get());
++        p->setEnabled(bEnabled);
++    }
++    maMenuItems.push_back(xAccessible);
++}
++
++void ScAccessibleFilterMenu::setMenuPos(size_t nMenuPos)
++{
++    mnMenuPos = nMenuPos;
++}
++
++void ScAccessibleFilterMenu::setEnabled(bool bEnabled)
++{
++    mbEnabled = bEnabled;
++}
++
++sal_Int32 ScAccessibleFilterMenu::getMenuItemCount() const
++{
++    return maMenuItems.size();
++}
++
++bool ScAccessibleFilterMenu::isSelected() const
++{
++    // Check to see if any of the child menu items is selected.
++    return mpWindow->isMenuItemSelected(mnMenuPos);
++}
++
++bool ScAccessibleFilterMenu::isFocused() const
++{
++    return isSelected();
++}
++
++void ScAccessibleFilterMenu::updateStates()
++{
++    if (!mxStateSet.is())
++        mxStateSet.set(new ScAccessibleStateSet);
++
++    ScAccessibleStateSet* p = static_cast<ScAccessibleStateSet*>(
++        mxStateSet.get());
++
++    p->clear();
++
++    p->insert(ENABLED);
++    p->insert(FOCUSABLE);
++    p->insert(SELECTABLE);
++    p->insert(SENSITIVE);
++    p->insert(OPAQUE);
++
++    if (isFocused())
++        p->insert(FOCUSED);
++
++    if (isSelected())
++        p->insert(SELECTED);
++}
+diff --git sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
+new file mode 100644
+index 0000000..7216819
+--- /dev/null
++++ sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
+@@ -0,0 +1,209 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: AccessibleDataPilotControl.hxx,v $
++ * $Revision: 1.6 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++
++#include "precompiled_sc.hxx"
++#include "AccessibleGlobal.hxx"
++#include "AccessibleFilterMenuItem.hxx"
++#include "dpcontrol.hxx"
++
++#include <com/sun/star/accessibility/XAccessible.hpp>
++#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
++#include <com/sun/star/accessibility/AccessibleRole.hpp>
++#include <com/sun/star/accessibility/AccessibleEventId.hpp>
++#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
++#include <com/sun/star/accessibility/AccessibleStateType.hpp>
++#include <com/sun/star/accessibility/TextSegment.hpp>
++
++using namespace ::com::sun::star;
++using namespace ::com::sun::star::accessibility;
++using namespace ::com::sun::star::accessibility::AccessibleStateType;
++
++using ::com::sun::star::uno::Any;
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::uno::Sequence;
++using ::com::sun::star::uno::UNO_QUERY;
++using ::com::sun::star::lang::IndexOutOfBoundsException;
++using ::com::sun::star::uno::RuntimeException;
++using ::rtl::OUString;
++
++ScAccessibleFilterMenuItem::ScAccessibleFilterMenuItem(
++    const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) :
++    ScAccessibleContextBase(rxParent, AccessibleRole::MENU_ITEM),
++    mpWindow(pWin),
++    maName(rName),
++    mnMenuPos(nMenuPos),
++    mbEnabled(true)
++{
++    SetName(rName);
++}
++
++ScAccessibleFilterMenuItem::~ScAccessibleFilterMenuItem()
++{
++}
++
++sal_Int32 ScAccessibleFilterMenuItem::getAccessibleChildCount() 
++    throw (RuntimeException)
++{
++    return 0;
++}
++
++Reference<XAccessible> ScAccessibleFilterMenuItem::getAccessibleChild(sal_Int32 /*nIndex*/) 
++    throw (RuntimeException, IndexOutOfBoundsException)
++{
++    throw IndexOutOfBoundsException();
++    return Reference<XAccessible>();
++}
++
++Reference<XAccessibleStateSet> ScAccessibleFilterMenuItem::getAccessibleStateSet() 
++    throw (RuntimeException)
++{
++    updateStateSet();
++    return mxStateSet;
++}
++
++OUString ScAccessibleFilterMenuItem::getImplementationName() 
++    throw (RuntimeException)
++{
++    return OUString::createFromAscii("ScAccessibleFilterMenuItem");
++}
++
++// XAccessibleAction
++
++sal_Int32 ScAccessibleFilterMenuItem::getAccessibleActionCount() throw (RuntimeException)
++{
++    return 1;
++}
++
++sal_Bool ScAccessibleFilterMenuItem::doAccessibleAction(sal_Int32 /*nIndex*/) 
++    throw (IndexOutOfBoundsException, RuntimeException)
++{
++    mpWindow->executeMenuItem(mnMenuPos);
++    return true;
++}
++
++OUString ScAccessibleFilterMenuItem::getAccessibleActionDescription(sal_Int32 /*nIndex*/)
++    throw (IndexOutOfBoundsException, RuntimeException)
++{
++    return OUString::createFromAscii("click");
++}
++
++Reference<XAccessibleKeyBinding> ScAccessibleFilterMenuItem::getAccessibleActionKeyBinding(
++    sal_Int32 /*nIndex*/) throw (IndexOutOfBoundsException, RuntimeException)
++{
++    return Reference<XAccessibleKeyBinding>();
++}
++
++Any SAL_CALL ScAccessibleFilterMenuItem::queryInterface( uno::Type const & rType )
++	throw (RuntimeException)
++{
++	Any any = ScAccessibleContextBase::queryInterface(rType);
++    if (any.hasValue())
++        return any;
++
++    return ScAccessibleFilterMenuItem_BASE::queryInterface(rType);
++}
++
++void SAL_CALL ScAccessibleFilterMenuItem::acquire() throw ()
++{
++	ScAccessibleContextBase::acquire();
++}
++
++void SAL_CALL ScAccessibleFilterMenuItem::release() throw ()
++{
++	ScAccessibleContextBase::release();
++}
++
++bool ScAccessibleFilterMenuItem::isSelected() const
++{
++    return mpWindow->isMenuItemSelected(mnMenuPos);
++}
++
++bool ScAccessibleFilterMenuItem::isFocused() const
++{
++    return isSelected();
++}
++
++void ScAccessibleFilterMenuItem::setEnabled(bool bEnabled)
++{
++    mbEnabled = bEnabled;
++}
++
++Rectangle ScAccessibleFilterMenuItem::GetBoundingBoxOnScreen() const
++    throw (RuntimeException)
++{
++    if (!mpWindow->IsVisible())
++        return Rectangle();
++
++    Point aPos = mpWindow->OutputToAbsoluteScreenPixel(Point(0,0));
++    Point aMenuPos;
++    Size aMenuSize;
++    mpWindow->getMenuItemPosSize(mnMenuPos, aMenuPos, aMenuSize);
++    Rectangle aRect(aPos + aMenuPos, aMenuSize);
++    return aRect;
++}
++
++Rectangle ScAccessibleFilterMenuItem::GetBoundingBox() const
++    throw (RuntimeException)
++{
++    if (!mpWindow->IsVisible())
++        return Rectangle();
++
++    Point aMenuPos;
++    Size aMenuSize;
++    mpWindow->getMenuItemPosSize(mnMenuPos, aMenuPos, aMenuSize);
++    Rectangle aRect(aMenuPos, aMenuSize);
++    return aRect;
++}
++
++void ScAccessibleFilterMenuItem::updateStateSet()
++{
++    if (!mxStateSet.is())
++        mxStateSet.set(new ScAccessibleStateSet);
++
++    ScAccessibleStateSet* p = static_cast<ScAccessibleStateSet*>(
++        mxStateSet.get());
++
++    p->clear();
++
++    p->insert(ENABLED);
++    p->insert(FOCUSABLE);
++    p->insert(SELECTABLE);
++    p->insert(SENSITIVE);
++    p->insert(OPAQUE);
++
++    if (isFocused())
++        p->insert(FOCUSED);
++
++    if (isSelected())
++        p->insert(SELECTED);
++}
++
+diff --git sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
+new file mode 100644
+index 0000000..e9834f8
+--- /dev/null
++++ sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
+@@ -0,0 +1,137 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: AccessibleDataPilotControl.hxx,v $
++ * $Revision: 1.6 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++
++#include "precompiled_sc.hxx"
++#include "AccessibleFilterTopWindow.hxx"
++#include "AccessibleFilterMenu.hxx"
++#include "dpcontrol.hxx"
++
++#include <com/sun/star/accessibility/AccessibleRole.hpp>
++
++using namespace ::com::sun::star;
++using namespace ::com::sun::star::accessibility;
++using ::com::sun::star::lang::IndexOutOfBoundsException;
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::uno::RuntimeException;
++using ::rtl::OUString;
++
++ScAccessibleFilterTopWindow::ScAccessibleFilterTopWindow(
++    const Reference<XAccessible>& rxParent, ScDPFieldPopupWindow* pWin, const OUString& rName, ScDocument* pDoc) :
++    ScAccessibleFilterMenu(rxParent, pWin, rName, ScMenuFloatingWindow::MENU_NOT_SELECTED, pDoc),
++    mpWindow(pWin),
++    mpDoc(pDoc)
++{
++    SetName(rName);
++}
++
++ScAccessibleFilterTopWindow::~ScAccessibleFilterTopWindow()
++{
++}
++
++// XAccessibleContext
++
++sal_Int32 ScAccessibleFilterTopWindow::getAccessibleChildCount() throw (RuntimeException)
++{
++    sal_Int32 nMenuCount = getMenuItemCount();
++    return nMenuCount + 6;
++}
++
++Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild(
++    sal_Int32 nIndex) throw (RuntimeException, IndexOutOfBoundsException)
++{
++    if (nIndex >= getAccessibleChildCount())
++        throw IndexOutOfBoundsException();
++
++    sal_Int32 nMenuCount = getMenuItemCount();
++    if (nIndex < nMenuCount)
++        return ScAccessibleFilterMenu::getAccessibleChild(nIndex);
++    
++    nIndex -= nMenuCount;
++    switch (nIndex)
++    {
++        case 0:
++            return mxAccListBox;
++        case 1:
++            return mxAccToggleAll;
++        case 2:
++            return mxAccSingleOnBtn;
++        case 3:
++            return mxAccSingleOffBtn;
++        case 4:
++            return mxAccOkBtn;
++        case 5:
++            return mxAccCancelBtn;
++        default:
++            ;
++    }
++
++    return Reference<XAccessible>();
++}
++
++OUString ScAccessibleFilterTopWindow::getImplementationName() throw (RuntimeException)
++{
++    return OUString::createFromAscii("ScAccessibleFilterTopWindow");
++}
++
++Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChildMenu()
++{
++    if (!mxAccMenu.is())
++        mxAccMenu.set(new ScAccessibleFilterMenu(this, mpWindow, getAccessibleName(), ScMenuFloatingWindow::MENU_NOT_SELECTED, mpDoc));
++    return mxAccMenu;
++}
++
++void ScAccessibleFilterTopWindow::setAccessibleChild(
++    const Reference<XAccessible>& rAccessible, ChildControlType eType)
++{
++    switch (eType)
++    {
++        case LISTBOX:
++            mxAccListBox = rAccessible;
++        break;
++        case TOGGLE_ALL: 
++            mxAccToggleAll = rAccessible;
++        break;
++        case SINGLE_ON_BTN: 
++            mxAccSingleOnBtn = rAccessible;
++        break;
++        case SINGLE_OFF_BTN: 
++            mxAccSingleOffBtn = rAccessible;
++        break;
++        case OK_BTN: 
++            mxAccOkBtn = rAccessible;
++        break;
++        case CANCEL_BTN:
++            mxAccCancelBtn = rAccessible;
++        break;
++    }
++}
++
+diff --git sc/source/ui/Accessibility/AccessibleGlobal.cxx sc/source/ui/Accessibility/AccessibleGlobal.cxx
+new file mode 100644
+index 0000000..f37bd4b
+--- /dev/null
++++ sc/source/ui/Accessibility/AccessibleGlobal.cxx
+@@ -0,0 +1,98 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: AccessibleDataPilotControl.hxx,v $
++ * $Revision: 1.6 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++
++#include "precompiled_sc.hxx"
++#include "AccessibleGlobal.hxx"
++
++using ::com::sun::star::uno::RuntimeException;
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::uno::Sequence;
++using ::std::set;
++
++ScAccessibleStateSet::ScAccessibleStateSet()
++{
++}
++
++ScAccessibleStateSet::~ScAccessibleStateSet()
++{
++}
++
++// XAccessibleStateSet
++
++sal_Bool SAL_CALL ScAccessibleStateSet::isEmpty() throw (RuntimeException)
++{
++    return maStates.empty();
++}
++
++sal_Bool SAL_CALL ScAccessibleStateSet::contains(sal_Int16 nState) 
++    throw (RuntimeException)
++{
++    return maStates.count(nState) != 0;
++}
++
++sal_Bool SAL_CALL ScAccessibleStateSet::containsAll(
++    const Sequence<sal_Int16>& aStateSet) throw (RuntimeException)
++{
++    sal_Int32 n = aStateSet.getLength();
++    for (sal_Int32 i = 0; i < n; ++i)
++    {
++        if (!maStates.count(aStateSet[i]))
++            // This state is not set.
++            return false;
++    }
++    // All specified states are set.
++    return true;
++}
++
++Sequence<sal_Int16> SAL_CALL ScAccessibleStateSet::getStates() 
++    throw (RuntimeException)
++{
++    Sequence<sal_Int16> aSeq(0);
++    set<sal_Int16>::const_iterator itr = maStates.begin(), itrEnd = maStates.end();
++    for (size_t i = 0; itr != itrEnd; ++itr, ++i)
++    {
++        aSeq.realloc(i+1);
++        aSeq[i] = *itr;
++    }
++    return aSeq;
++}
++
++void ScAccessibleStateSet::insert(sal_Int16 nState)
++{
++    maStates.insert(nState);
++}
++
++void ScAccessibleStateSet::clear()
++{
++    maStates.clear();
++}
++
+diff --git sc/source/ui/Accessibility/makefile.mk sc/source/ui/Accessibility/makefile.mk
+index dfa5ac9..2942914 100644
+--- sc/source/ui/Accessibility/makefile.mk
++++ sc/source/ui/Accessibility/makefile.mk
+@@ -47,12 +47,16 @@ SLOFILES =  										\
+         $(SLO)$/AccessibleContextBase.obj			\
+         $(SLO)$/AccessibleTableBase.obj				\
+         $(SLO)$/AccessibleDocument.obj				\
++		$(SLO)$/AccessibleGlobal.obj				\
+         $(SLO)$/AccessibleSpreadsheet.obj			\
+         $(SLO)$/AccessibleCell.obj					\
+         $(SLO)$/AccessibilityHints.obj				\
+         $(SLO)$/AccessibleDocumentBase.obj			\
+         $(SLO)$/AccessibleCellBase.obj				\
+         $(SLO)$/AccessibleDocumentPagePreview.obj	\
++		$(SLO)$/AccessibleFilterMenu.obj	\
++		$(SLO)$/AccessibleFilterMenuItem.obj	\
++		$(SLO)$/AccessibleFilterTopWindow.obj	\
+         $(SLO)$/AccessiblePreviewTable.obj			\
+         $(SLO)$/AccessiblePreviewCell.obj			\
+         $(SLO)$/AccessiblePreviewHeaderCell.obj		\
+@@ -68,11 +72,15 @@ EXCEPTIONSFILES=									\
+         $(SLO)$/AccessibleContextBase.obj			\
+         $(SLO)$/AccessibleTableBase.obj				\
+         $(SLO)$/AccessibleDocument.obj				\
++		$(SLO)$/AccessibleGlobal.obj				\
+         $(SLO)$/AccessibleSpreadsheet.obj			\
+         $(SLO)$/AccessibleCell.obj					\
+         $(SLO)$/AccessibleDocumentBase.obj			\
+         $(SLO)$/AccessibleCellBase.obj				\
+         $(SLO)$/AccessibleDocumentPagePreview.obj	\
++		$(SLO)$/AccessibleFilterMenu.obj	\
++		$(SLO)$/AccessibleFilterMenuItem.obj	\
++		$(SLO)$/AccessibleFilterTopWindow.obj	\
+         $(SLO)$/AccessiblePreviewTable.obj			\
+         $(SLO)$/AccessiblePreviewCell.obj			\
+         $(SLO)$/AccessiblePreviewHeaderCell.obj		\
+diff --git sc/source/ui/cctrl/dpcontrol.cxx sc/source/ui/cctrl/dpcontrol.cxx
+new file mode 100644
+index 0000000..2f09c88
+--- /dev/null
++++ sc/source/ui/cctrl/dpcontrol.cxx
+@@ -0,0 +1,1419 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: document.hxx,v $
++ * $Revision: 1.115.36.9 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_sc.hxx"
++
++// INCLUDE ---------------------------------------------------------------
++
++#include "dpcontrol.hxx"
++#include "dpcontrol.hrc"
++
++#include "vcl/outdev.hxx"
++#include "vcl/settings.hxx"
++#include "vcl/wintypes.hxx"
++#include "vcl/decoview.hxx"
++#include "strload.hxx"
++#include "global.hxx"
++
++#include "AccessibleFilterMenu.hxx"
++#include "AccessibleFilterTopWindow.hxx"
++
++#include <com/sun/star/accessibility/XAccessible.hpp>
++#include <com/sun/star/accessibility/XAccessibleContext.hpp>
++
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::accessibility::XAccessible;
++using ::com::sun::star::accessibility::XAccessibleContext;
++using ::rtl::OUString;
++using ::rtl::OUStringHash;
++using ::std::vector;
++using ::std::hash_map;
++using ::std::auto_ptr;
++
++ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX, const Fraction* pZoomY) :
++    mpOutDev(pOutDev),
++    mpStyle(pStyle),
++    mbBaseButton(true),
++    mbPopupButton(false),
++    mbHasHiddenMember(false),
++    mbPopupPressed(false)
++{
++    if (pZoomX)
++        maZoomX = *pZoomX;
++    else
++        maZoomX = Fraction(1, 1);
++
++    if (pZoomY)
++        maZoomY = *pZoomY;
++    else
++        maZoomY = Fraction(1, 1);
++}
++
++ScDPFieldButton::~ScDPFieldButton()
++{
++}
++
++void ScDPFieldButton::setText(const OUString& rText)
++{
++    maText = rText;
++}
++
++void ScDPFieldButton::setBoundingBox(const Point& rPos, const Size& rSize)
++{
++    maPos = rPos;
++    maSize = rSize;
++}
++
++void ScDPFieldButton::setDrawBaseButton(bool b)
++{
++    mbBaseButton = b;
++}
++
++void ScDPFieldButton::setDrawPopupButton(bool b)
++{
++    mbPopupButton = b;
++}
++
++void ScDPFieldButton::setHasHiddenMember(bool b)
++{
++    mbHasHiddenMember = b;
++}
++
++void ScDPFieldButton::setPopupPressed(bool b)
++{
++    mbPopupPressed = b;
++}
++
++void ScDPFieldButton::draw()
++{
++    const long nMargin = 2;
++    bool bOldMapEnablaed = mpOutDev->IsMapModeEnabled();
++    mpOutDev->EnableMapMode(false);
++    
++    if (mbBaseButton)
++    {
++        // Background
++        Rectangle aRect(maPos, maSize);
++        mpOutDev->SetLineColor(mpStyle->GetFaceColor());
++        mpOutDev->SetFillColor(mpStyle->GetFaceColor());
++        mpOutDev->DrawRect(aRect);
++    
++        // Border lines
++        mpOutDev->SetLineColor(mpStyle->GetLightColor());
++        mpOutDev->DrawLine(Point(maPos), Point(maPos.X(), maPos.Y()+maSize.Height()-1));
++        mpOutDev->DrawLine(Point(maPos), Point(maPos.X()+maSize.Width()-1, maPos.Y()));
++    
++        mpOutDev->SetLineColor(mpStyle->GetShadowColor());
++        mpOutDev->DrawLine(Point(maPos.X(), maPos.Y()+maSize.Height()-1),
++                           Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
++        mpOutDev->DrawLine(Point(maPos.X()+maSize.Width()-1, maPos.Y()),
++                           Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
++    
++        // Field name.
++        Font aTextFont( mpStyle->GetLabelFont() );
++        double fFontHeight = 12.0;
++        fFontHeight *= static_cast<double>(maZoomY.GetNumerator()) / static_cast<double>(maZoomY.GetDenominator());
++        aTextFont.SetHeight(fFontHeight);
++        mpOutDev->SetFont(aTextFont);
++    
++        Point aTextPos = maPos;
++        long nTHeight = static_cast<long>(fFontHeight);
++        aTextPos.setX(maPos.getX() + nMargin);
++        aTextPos.setY(maPos.getY() + (maSize.Height()-nTHeight)/2);
++        mpOutDev->DrawText(aTextPos, maText);
++    }
++
++    if (mbPopupButton)
++        drawPopupButton();
++
++    mpOutDev->EnableMapMode(bOldMapEnablaed);
++}
++
++void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const
++{
++    long nW = maSize.getWidth()*0.5;
++    long nH = maSize.getHeight();
++    if (nW > 18) 
++        nW = 18;
++    if (nH > 18)
++        nH = 18;
++
++    rPos.setX(maPos.getX() + maSize.getWidth() - nW);
++    rPos.setY(maPos.getY() + maSize.getHeight() - nH);
++    rSize.setWidth(nW);
++    rSize.setHeight(nH);
++}
++
++bool ScDPFieldButton::isPopupButton() const
++{
++    return mbPopupButton;
++}
++
++void ScDPFieldButton::drawPopupButton()
++{
++    Point aPos;
++    Size aSize;
++    getPopupBoundingBox(aPos, aSize);
++
++    // Background & outer black border
++    mpOutDev->SetLineColor(COL_BLACK);
++    mpOutDev->SetFillColor(mpStyle->GetFaceColor());
++    mpOutDev->DrawRect(Rectangle(aPos, aSize));
++
++    if (!mbPopupPressed)
++    {    
++        // border lines
++        mpOutDev->SetLineColor(mpStyle->GetLightColor());
++        mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+1), Point(aPos.X()+1, aPos.Y()+aSize.Height()-2));
++        mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+1), Point(aPos.X()+aSize.Width()-2, aPos.Y()+1));
++    
++        mpOutDev->SetLineColor(mpStyle->GetShadowColor());
++        mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+aSize.Height()-2),
++                           Point(aPos.X()+aSize.Width()-2, aPos.Y()+aSize.Height()-2));
++        mpOutDev->DrawLine(Point(aPos.X()+aSize.Width()-2, aPos.Y()+1),
++                           Point(aPos.X()+aSize.Width()-2, aPos.Y()+aSize.Height()-2));
++    }
++
++    // the arrowhead
++    Color aArrowColor = mbHasHiddenMember ? mpStyle->GetHighlightLinkColor() : mpStyle->GetButtonTextColor();
++    mpOutDev->SetLineColor(aArrowColor);
++    mpOutDev->SetFillColor(aArrowColor);
++    Point aCenter(aPos.X() + (aSize.Width() >> 1), aPos.Y() + (aSize.Height() >> 1));
++    Point aPos1, aPos2;
++    aPos1.X() = aCenter.X() - 4;
++    aPos2.X() = aCenter.X() + 4;
++    aPos1.Y() = aCenter.Y() - 3;
++    aPos2.Y() = aCenter.Y() - 3;
++
++    if (mbPopupPressed)
++    {
++        aPos1.X() += 1;
++        aPos2.X() += 1;
++        aPos1.Y() += 1;
++        aPos2.Y() += 1;
++    }
++
++    do
++    {
++        ++aPos1.X();
++        --aPos2.X();
++        ++aPos1.Y();
++        ++aPos2.Y();
++        mpOutDev->DrawLine(aPos1, aPos2);
++    }
++    while (aPos1 != aPos2);
++
++    if (mbHasHiddenMember)
++    {
++        // tiny little box to display in presence of hidden member(s).
++        Point aBoxPos(aPos.X() + aSize.Width() - 5, aPos.Y() + aSize.Height() - 5);
++        if (mbPopupPressed)
++        {
++            aBoxPos.X() += 1;
++            aBoxPos.Y() += 1;
++        }
++        Size aBoxSize(3, 3);
++        mpOutDev->DrawRect(Rectangle(aBoxPos, aBoxSize));
++    }
++}
++
++// ============================================================================
++
++ScMenuFloatingWindow::MenuItemData::MenuItemData() :
++    mbEnabled(true),
++    mpAction(static_cast<ScDPFieldPopupWindow::Action*>(NULL)),
++    mpSubMenuWin(static_cast<ScMenuFloatingWindow*>(NULL))
++{
++}
++
++// ----------------------------------------------------------------------------
++
++ScMenuFloatingWindow::SubMenuItemData::SubMenuItemData(ScMenuFloatingWindow* pParent) :
++    mpSubMenu(NULL),
++    mnMenuPos(MENU_NOT_SELECTED),
++    mpParent(pParent)
++{
++    maTimer.SetTimeoutHdl( LINK(this, ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) );
++    maTimer.SetTimeout(mpParent->GetSettings().GetMouseSettings().GetMenuDelay());
++}
++
++void ScMenuFloatingWindow::SubMenuItemData::reset()
++{
++    mpSubMenu = NULL;
++    mnMenuPos = MENU_NOT_SELECTED;
++    maTimer.Stop();
++}
++
++IMPL_LINK( ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, void*, EMPTYARG )
++{
++    mpParent->handleMenuTimeout(this);
++    return 0;
++}
++
++// ----------------------------------------------------------------------------
++
++size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999;
++
++ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, USHORT nMenuStackLevel) :
++    PopupMenuFloatingWindow(pParent),
++    maOpenTimer(this),
++    maCloseTimer(this),
++    maName(OUString::createFromAscii("ScMenuFloatingWindow")),
++    mnSelectedMenu(MENU_NOT_SELECTED),
++    mnClickedMenu(MENU_NOT_SELECTED),
++    mpDoc(pDoc),
++    mpParentMenu(dynamic_cast<ScMenuFloatingWindow*>(pParent)),
++    mpActiveSubMenu(NULL)
++{
++    SetMenuStackLevel(nMenuStackLevel);
++
++    // TODO: How do we get the right font to use here ?
++    const sal_uInt16 nPopupFontHeight = 12;
++    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
++    maLabelFont = rStyle.GetLabelFont();
++    maLabelFont.SetHeight(nPopupFontHeight);
++    SetFont(maLabelFont);
++
++    SetText(OUString::createFromAscii("ScMenuFloatingWindow"));
++    SetPopupModeEndHdl( LINK(this, ScMenuFloatingWindow, PopupEndHdl) );
++}
++
++ScMenuFloatingWindow::~ScMenuFloatingWindow()
++{
++    EndPopupMode();
++}
++
++void ScMenuFloatingWindow::MouseMove(const MouseEvent& rMEvt)
++{
++    const Point& rPos = rMEvt.GetPosPixel();
++    size_t nSelectedMenu = getEnclosingMenuItem(rPos);
++    setSelectedMenuItem(nSelectedMenu, true, false);
++
++    Window::MouseMove(rMEvt);
++}
++
++void ScMenuFloatingWindow::MouseButtonDown(const MouseEvent& rMEvt)
++{
++    const Point& rPos = rMEvt.GetPosPixel();
++    mnClickedMenu = getEnclosingMenuItem(rPos);
++    Window::MouseButtonDown(rMEvt);
++}
++
++void ScMenuFloatingWindow::MouseButtonUp(const MouseEvent& rMEvt)
++{
++    executeMenuItem(mnClickedMenu);
++    mnClickedMenu = MENU_NOT_SELECTED;
++    Window::MouseButtonUp(rMEvt);
++}
++
++void ScMenuFloatingWindow::KeyInput(const KeyEvent& rKEvt)
++{
++    const KeyCode& rKeyCode = rKEvt.GetKeyCode();
++    bool bHandled = true;
++    size_t nSelectedMenu = mnSelectedMenu;
++    size_t nLastMenuPos = maMenuItems.size() - 1;
++    switch (rKeyCode.GetCode())
++    {
++        case KEY_UP:
++            if (nSelectedMenu == MENU_NOT_SELECTED || nSelectedMenu == 0)
++                nSelectedMenu = nLastMenuPos;
++            else
++                --nSelectedMenu;
++            setSelectedMenuItem(nSelectedMenu, false, false);
++        break;
++        case KEY_DOWN:
++            if (nSelectedMenu == MENU_NOT_SELECTED || nSelectedMenu == nLastMenuPos)
++                nSelectedMenu = 0;
++            else
++                ++nSelectedMenu;
++            setSelectedMenuItem(nSelectedMenu, false, false);
++        break;
++        case KEY_LEFT:
++            if (mpParentMenu)
++                mpParentMenu->endSubMenu(this);
++        break;
++        case KEY_RIGHT:
++        {
++            if (mnSelectedMenu >= maMenuItems.size() || mnSelectedMenu == MENU_NOT_SELECTED)
++                break;
++
++            const MenuItemData& rMenu = maMenuItems[mnSelectedMenu];
++            if (!rMenu.mbEnabled || !rMenu.mpSubMenuWin)
++                break;
++
++            maOpenTimer.mnMenuPos = mnSelectedMenu;
++            maOpenTimer.mpSubMenu = rMenu.mpSubMenuWin.get();
++            launchSubMenu(true);
++        }
++        break;
++        case KEY_RETURN:
++            if (nSelectedMenu != MENU_NOT_SELECTED)
++                executeMenuItem(nSelectedMenu);
++        break;
++        default:
++            bHandled = false;
++    }
++
++    if (!bHandled)
++        Window::KeyInput(rKEvt);
++}
++
++void ScMenuFloatingWindow::Paint(const Rectangle& /*rRect*/)
++{
++    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
++    Color aBackColor = rStyle.GetMenuColor();
++    Color aBorderColor = rStyle.GetShadowColor();
++
++    Rectangle aCtrlRect(Point(0, 0), GetOutputSizePixel());
++
++    // Window background
++    bool bNativeDrawn = true;
++    if (IsNativeControlSupported(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL))
++    {
++        SetClipRegion();
++        bNativeDrawn = DrawNativeControl(
++            CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, Region(aCtrlRect), CTRL_STATE_ENABLED,
++            ImplControlValue(), OUString());
++    }
++    else
++        bNativeDrawn = false;
++
++    if (!bNativeDrawn)
++    {
++        SetFillColor(aBackColor);
++        SetLineColor(aBorderColor);
++        DrawRect(aCtrlRect);
++    }
++
++    // Menu items
++    SetTextColor(rStyle.GetMenuTextColor());
++    drawAllMenuItems();
++}
++
++Reference<XAccessible> ScMenuFloatingWindow::CreateAccessible()
++{
++    if (!mxAccessible.is())
++    {    
++        Reference<XAccessible> xAccParent = mpParentMenu ? 
++            mpParentMenu->GetAccessible() : GetAccessibleParentWindow()->GetAccessible();
++
++        mxAccessible.set(new ScAccessibleFilterMenu(xAccParent, this, maName, 999, getDoc()));
++        ScAccessibleFilterMenu* p = static_cast<ScAccessibleFilterMenu*>(
++            mxAccessible.get());
++        
++        vector<MenuItemData>::const_iterator itr, itrBeg = maMenuItems.begin(), itrEnd = maMenuItems.end();
++        for (itr = itrBeg; itr != itrEnd; ++itr)
++        {
++            size_t nPos = ::std::distance(itrBeg, itr);
++            p->appendMenuItem(itr->maText, itr->mbEnabled, nPos);
++        }
++    }
++
++    return mxAccessible;
++}
++
++void ScMenuFloatingWindow::addMenuItem(const OUString& rText, bool bEnabled, Action* pAction)
++{
++    MenuItemData aItem;
++    aItem.maText = rText;
++    aItem.mbEnabled = bEnabled;
++    aItem.mpAction.reset(pAction);
++    maMenuItems.push_back(aItem);
++}
++
++ScMenuFloatingWindow* ScMenuFloatingWindow::addSubMenuItem(const OUString& rText, bool bEnabled)
++{
++    MenuItemData aItem;
++    aItem.maText = rText;
++    aItem.mbEnabled = bEnabled;
++    aItem.mpSubMenuWin.reset(new ScMenuFloatingWindow(this, mpDoc, GetMenuStackLevel()+1));
++    aItem.mpSubMenuWin->setName(rText);
++    maMenuItems.push_back(aItem);
++    return aItem.mpSubMenuWin.get();
++}
++
++void ScMenuFloatingWindow::drawMenuItem(size_t nPos)
++{
++    if (nPos >= maMenuItems.size())
++        return;
++
++    Point aPos;
++    Size aSize;
++    getMenuItemPosSize(nPos, aPos, aSize);
++
++    DecorationView aDecoView(this);
++    long nXOffset = 5;
++    long nYOffset = (aSize.Height() - maLabelFont.GetHeight())/2;
++    DrawCtrlText(Point(aPos.X()+nXOffset, aPos.Y() + nYOffset), maMenuItems[nPos].maText, 0, STRING_LEN,
++                 maMenuItems[nPos].mbEnabled ? TEXT_DRAW_MNEMONIC : TEXT_DRAW_DISABLE);
++
++    if (maMenuItems[nPos].mpSubMenuWin)
++    {
++        long nFontHeight = maLabelFont.GetHeight();
++        Point aMarkerPos = aPos;
++        aMarkerPos.Y() += aSize.Height()/2 - nFontHeight/4 + 1;
++        aMarkerPos.X() += aSize.Width() - nFontHeight + nFontHeight/4;
++        Size aMarkerSize(nFontHeight/2, nFontHeight/2);
++        aDecoView.DrawSymbol(Rectangle(aMarkerPos, aMarkerSize),
++                             SYMBOL_SPIN_RIGHT, GetTextColor(), 0);
++    }
++}
++
++void ScMenuFloatingWindow::drawAllMenuItems()
++{
++    size_t n = maMenuItems.size();
++    for (size_t i = 0; i < n; ++i)
++        highlightMenuItem(i, i == mnSelectedMenu);    
++}
++
++const Font& ScMenuFloatingWindow::getLabelFont() const
++{
++    return maLabelFont;
++}
++
++void ScMenuFloatingWindow::executeMenuItem(size_t nPos)
++{
++    if (nPos >= maMenuItems.size())
++        return;
++
++    if (!maMenuItems[nPos].mpAction)
++        // no action is defined.
++        return;
++
++    maMenuItems[nPos].mpAction->execute();
++    terminateAllPopupMenus();
++}
++
++void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, bool bEnsureSubMenu)
++{
++    if (mnSelectedMenu == nPos)
++        // nothing to do.
++        return;
++
++    if (bEnsureSubMenu)
++    {
++        // Dismiss any child popup menu windows.
++        if (mnSelectedMenu < maMenuItems.size() && 
++            maMenuItems[mnSelectedMenu].mpSubMenuWin && 
++            maMenuItems[mnSelectedMenu].mpSubMenuWin->IsVisible())
++        {    
++            maMenuItems[mnSelectedMenu].mpSubMenuWin->ensureSubMenuNotVisible();
++        }
++
++        // The popup is not visible, yet a menu item is selected.  The request
++        // most likely comes from the accessible object.  Make sure this
++        // window, as well as all its parent windows are visible.
++        if (!IsVisible() && mpParentMenu)
++            mpParentMenu->ensureSubMenuVisible(this);
++    }
++
++    selectMenuItem(mnSelectedMenu, false, bSubMenuTimer);
++    selectMenuItem(nPos, true, bSubMenuTimer);
++    mnSelectedMenu = nPos;
++
++    fireMenuHighlightedEvent();
++}
++
++size_t ScMenuFloatingWindow::getSelectedMenuItem() const
++{
++    return mnSelectedMenu;
++}
++
++void ScMenuFloatingWindow::handleMenuTimeout(SubMenuItemData* pTimer)
++{
++    if (pTimer == &maOpenTimer)
++    {
++        // Close any open submenu immediately.
++        if (maCloseTimer.mpSubMenu)
++        {
++            maCloseTimer.mpSubMenu->EndPopupMode();
++            maCloseTimer.mpSubMenu = NULL;
++            maCloseTimer.maTimer.Stop();
++        }
++
++        launchSubMenu(false);
++    }
++    else if (pTimer == &maCloseTimer)
++    {
++        // end submenu.
++        if (maCloseTimer.mpSubMenu)
++        {
++            maOpenTimer.mpSubMenu = NULL;
++
++            maCloseTimer.mpSubMenu->EndPopupMode();
++            maCloseTimer.mpSubMenu = NULL;
++
++            highlightMenuItem(maOpenTimer.mnMenuPos, false);
++            maOpenTimer.mnMenuPos = MENU_NOT_SELECTED;
++        }
++    }
++}
++
++void ScMenuFloatingWindow::queueLaunchSubMenu(size_t nPos, ScMenuFloatingWindow* pMenu)
++{
++    if (!pMenu)
++        return;
++
++    // Set the submenu on launch queue.
++    if (maOpenTimer.mpSubMenu)
++    {
++        if (maOpenTimer.mpSubMenu == pMenu)
++        {
++            if (pMenu == maCloseTimer.mpSubMenu)
++                maCloseTimer.reset();
++            return;
++        }
++
++        // new submenu is being requested.
++        queueCloseSubMenu();
++    }
++
++    maOpenTimer.mpSubMenu = pMenu;
++    maOpenTimer.mnMenuPos = nPos;
++    maOpenTimer.maTimer.Start();
++}
++
++void ScMenuFloatingWindow::queueCloseSubMenu()
++{
++    if (!maOpenTimer.mpSubMenu)
++        // There is no submenu to close.
++        return;
++
++    // Stop any submenu on queue for opening.
++    maOpenTimer.maTimer.Stop();
++
++    maCloseTimer.mpSubMenu = maOpenTimer.mpSubMenu;
++    maCloseTimer.mnMenuPos = maOpenTimer.mnMenuPos;
++    maCloseTimer.maTimer.Start();
++}
++
++void ScMenuFloatingWindow::launchSubMenu(bool bSetMenuPos)
++{
++    Point aPos;
++    Size aSize;
++    getMenuItemPosSize(maOpenTimer.mnMenuPos, aPos, aSize);
++    ScMenuFloatingWindow* pSubMenu = maOpenTimer.mpSubMenu;
++
++    if (!pSubMenu)
++        return;
++
++    sal_uInt32 nOldFlags = GetPopupModeFlags();
++    SetPopupModeFlags(nOldFlags | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE);
++    pSubMenu->resizeToFitMenuItems(); // set the size before launching the popup to get it positioned correctly.
++    pSubMenu->StartPopupMode(
++        Rectangle(aPos,aSize), (FLOATWIN_POPUPMODE_RIGHT | FLOATWIN_POPUPMODE_GRABFOCUS));
++    pSubMenu->AddPopupModeWindow(this);
++    if (bSetMenuPos)
++        pSubMenu->setSelectedMenuItem(0, false, false); // select menu item after the popup becomes fully visible.
++    SetPopupModeFlags(nOldFlags);
++}
++
++void ScMenuFloatingWindow::endSubMenu(ScMenuFloatingWindow* pSubMenu)
++{
++    if (!pSubMenu)
++        return;
++
++    pSubMenu->EndPopupMode();
++    maOpenTimer.reset();
++
++    size_t nMenuPos = getSubMenuPos(pSubMenu);
++    if (nMenuPos != MENU_NOT_SELECTED)
++    {    
++        highlightMenuItem(nMenuPos, true);
++        mnSelectedMenu = nMenuPos;
++        fireMenuHighlightedEvent();
++    }
++}
++
++void ScMenuFloatingWindow::fillMenuItemsToAccessible(ScAccessibleFilterMenu* pAccMenu) const
++{
++    vector<MenuItemData>::const_iterator itr, itrBeg = maMenuItems.begin(), itrEnd = maMenuItems.end();
++    for (itr = itrBeg; itr != itrEnd; ++itr)
++    {
++        size_t nPos = ::std::distance(itrBeg, itr);
++        pAccMenu->appendMenuItem(itr->maText, itr->mbEnabled, nPos);
++    }
++}
++
++ScDocument* ScMenuFloatingWindow::getDoc()
++{
++    return mpDoc;
++}
++
++void ScMenuFloatingWindow::resizeToFitMenuItems()
++{
++    if (maMenuItems.empty())
++        return;
++
++    vector<MenuItemData>::const_iterator itr = maMenuItems.begin(), itrEnd = maMenuItems.end();
++    long nTextWidth = 0;
++    for (; itr != itrEnd; ++itr)
++        nTextWidth = ::std::max(GetTextWidth(itr->maText), nTextWidth);
++
++    size_t nLastPos = maMenuItems.size()-1;
++    Point aPos;
++    Size aSize;
++    getMenuItemPosSize(nLastPos, aPos, aSize);
++    aPos.X() += nTextWidth + 15;
++    aPos.Y() += aSize.Height() + 5;
++    SetOutputSizePixel(Size(aPos.X(), aPos.Y()));
++}
++
++void ScMenuFloatingWindow::selectMenuItem(size_t nPos, bool bSelected, bool bSubMenuTimer)
++{
++    if (nPos >= maMenuItems.size() || nPos == MENU_NOT_SELECTED)
++    {
++        queueCloseSubMenu();
++        return;
++    }
++
++    if (!maMenuItems[nPos].mbEnabled)
++    {    
++        queueCloseSubMenu();
++        return;
++    }
++
++    highlightMenuItem(nPos, bSelected);
++
++    if (bSelected)
++    {
++        if (mpParentMenu)
++            mpParentMenu->setSubMenuFocused(this);
++
++        if (bSubMenuTimer)
++        {
++            if (maMenuItems[nPos].mpSubMenuWin)
++            {
++                ScMenuFloatingWindow* pSubMenu = maMenuItems[nPos].mpSubMenuWin.get();
++                queueLaunchSubMenu(nPos, pSubMenu);
++            }
++            else
++                queueCloseSubMenu();
++        }
++    }
++}
++
++void ScMenuFloatingWindow::clearSelectedMenuItem()
++{
++    selectMenuItem(mnSelectedMenu, false, false);
++    mnSelectedMenu = MENU_NOT_SELECTED;
++}
++
++ScMenuFloatingWindow* ScMenuFloatingWindow::getSubMenuWindow(size_t nPos) const
++{
++    if (maMenuItems.size() <= nPos)
++        return NULL;
++
++    return maMenuItems[nPos].mpSubMenuWin.get();
++}
++
++size_t ScMenuFloatingWindow::getMenuItemCount() const
++{
++    return maMenuItems.size();
++}
++
++OUString ScMenuFloatingWindow::getMenuItemName(size_t nPos) const
++{
++    if (maMenuItems.size() <= nPos)
++        return ScGlobal::GetEmptyString();
++
++    return maMenuItems[nPos].maText;
++}
++
++bool ScMenuFloatingWindow::isMenuItemEnabled(size_t nPos) const
++{
++    if (maMenuItems.size() <= nPos)
++        return false;
++
++    return maMenuItems[nPos].mbEnabled;
++}
++
++bool ScMenuFloatingWindow::isMenuItemSelected(size_t nPos) const
++{
++    return nPos == mnSelectedMenu;
++}
++
++void ScMenuFloatingWindow::setName(const OUString& rName)
++{
++    maName = rName;
++}
++
++const OUString& ScMenuFloatingWindow::getName() const
++{
++    return maName;
++}
++
++void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected)
++{
++    if (nPos == MENU_NOT_SELECTED)
++        return;
++
++    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
++    Color aBackColor = rStyle.GetMenuColor();
++    SetFillColor(aBackColor);
++    SetLineColor(aBackColor);
++
++    Point aPos;
++    Size aSize;
++    getMenuItemPosSize(nPos, aPos, aSize);
++    Region aRegion(Rectangle(aPos,aSize));
++
++    if (IsNativeControlSupported(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL))
++    {
++        Push(PUSH_CLIPREGION);
++        IntersectClipRegion(Rectangle(aPos, aSize));
++        Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel()); 
++        DrawNativeControl(
++            CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, Region(aCtrlRect), CTRL_STATE_ENABLED,
++            ImplControlValue(), OUString());
++
++        Pop();
++    }
++
++    bool bNativeDrawn = true;
++    if (IsNativeControlSupported(CTRL_MENU_POPUP, PART_MENU_ITEM))
++    {
++        ControlState nState = bSelected ? CTRL_STATE_SELECTED : 0;
++        if (maMenuItems[nPos].mbEnabled)
++            nState |= CTRL_STATE_ENABLED;
++        bNativeDrawn = DrawNativeControl(
++            CTRL_MENU_POPUP, PART_MENU_ITEM, aRegion, nState, ImplControlValue(), OUString());
++    }
++    else
++        bNativeDrawn = false;
++
++    if (!bNativeDrawn)
++    {
++        if (bSelected)
++        {
++            aBackColor = rStyle.GetMenuHighlightColor();
++            SetFillColor(aBackColor);
++            SetLineColor(aBackColor);
++        }
++        DrawRect(Rectangle(aPos,aSize));
++    }
++
++    Color aTextColor = bSelected ? rStyle.GetMenuHighlightTextColor() : rStyle.GetMenuTextColor();
++    SetTextColor(aTextColor);
++    drawMenuItem(nPos);
++}
++
++void ScMenuFloatingWindow::getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const
++{
++    const sal_uInt16 nLeftMargin = 5;
++    const sal_uInt16 nTopMargin = 5;
++    const sal_uInt16 nMenuItemHeight = maLabelFont.GetHeight()*1.8;
++
++    Size aWndSize = GetSizePixel();
++
++    Point aPos1(nLeftMargin, nTopMargin);
++    Size aSize1(aWndSize.Width() - nLeftMargin*2, nMenuItemHeight);
++
++    rPos = aPos1;
++    rPos.Y() += aSize1.Height()*nPos;
++    rSize = aSize1;
++}
++
++ScMenuFloatingWindow* ScMenuFloatingWindow::getParentMenuWindow() const
++{
++    return mpParentMenu;
++}
++
++size_t ScMenuFloatingWindow::getEnclosingMenuItem(const Point& rPos) const
++{
++    size_t n = maMenuItems.size();
++    for (size_t i = 0; i < n; ++i)
++    {
++        Point aPos;
++        Size aSize;
++        getMenuItemPosSize(i, aPos, aSize);
++        Rectangle aRect(aPos, aSize);
++        if (aRect.IsInside(rPos))
++            return i;
++    }
++    return MENU_NOT_SELECTED;
++}
++
++size_t ScMenuFloatingWindow::getSubMenuPos(ScMenuFloatingWindow* pSubMenu)
++{
++    size_t n = maMenuItems.size();
++    for (size_t i = 0; i < n; ++i)
++    {
++        if (maMenuItems[i].mpSubMenuWin.get() == pSubMenu)
++            return i;
++    }
++    return MENU_NOT_SELECTED;
++}
++
++void ScMenuFloatingWindow::fireMenuHighlightedEvent()
++{
++    if (mnSelectedMenu == MENU_NOT_SELECTED)
++        return;
++
++    if (!mxAccessible.is())
++        return;
++
++    Reference<XAccessibleContext> xAccCxt = mxAccessible->getAccessibleContext();
++    if (!xAccCxt.is())
++        return;
++
++    Reference<XAccessible> xAccMenu = xAccCxt->getAccessibleChild(mnSelectedMenu);
++    if (!xAccMenu.is())
++        return;
++
++    VclAccessibleEvent aEvent(VCLEVENT_MENU_HIGHLIGHT, xAccMenu);
++    FireVclEvent(&aEvent);
++}
++
++void ScMenuFloatingWindow::setSubMenuFocused(ScMenuFloatingWindow* pSubMenu)
++{
++    maCloseTimer.reset();
++    size_t nMenuPos = getSubMenuPos(pSubMenu);
++    if (mnSelectedMenu != nMenuPos)
++    {
++        highlightMenuItem(nMenuPos, true);
++        mnSelectedMenu = nMenuPos;
++    }
++}
++
++void ScMenuFloatingWindow::ensureSubMenuVisible(ScMenuFloatingWindow* pSubMenu)
++{
++    if (mpParentMenu)
++        mpParentMenu->ensureSubMenuVisible(this);
++
++    if (pSubMenu->IsVisible())
++        return;
++
++    // Find the menu position of the submenu.
++    size_t nMenuPos = getSubMenuPos(pSubMenu);
++    if (nMenuPos != MENU_NOT_SELECTED)
++    {
++        setSelectedMenuItem(nMenuPos, false, false);
++
++        Point aPos;
++        Size aSize;
++        getMenuItemPosSize(nMenuPos, aPos, aSize);
++
++        sal_uInt32 nOldFlags = GetPopupModeFlags();
++        SetPopupModeFlags(nOldFlags | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE);
++        pSubMenu->resizeToFitMenuItems(); // set the size before launching the popup to get it positioned correctly.
++        pSubMenu->StartPopupMode(
++            Rectangle(aPos,aSize), (FLOATWIN_POPUPMODE_RIGHT | FLOATWIN_POPUPMODE_GRABFOCUS));
++        pSubMenu->AddPopupModeWindow(this);
++        SetPopupModeFlags(nOldFlags);
++    }
++}
++
++void ScMenuFloatingWindow::ensureSubMenuNotVisible()
++{
++    if (mnSelectedMenu <= maMenuItems.size() && 
++        maMenuItems[mnSelectedMenu].mpSubMenuWin && 
++        maMenuItems[mnSelectedMenu].mpSubMenuWin->IsVisible())
++    {    
++        maMenuItems[mnSelectedMenu].mpSubMenuWin->ensureSubMenuNotVisible();
++    }
++
++    EndPopupMode();
++}
++
++void ScMenuFloatingWindow::terminateAllPopupMenus()
++{
++    EndPopupMode();
++    if (mpParentMenu)
++        mpParentMenu->terminateAllPopupMenus();
++}
++
++IMPL_LINK( ScMenuFloatingWindow, PopupEndHdl, void*, EMPTYARG )
++{
++    clearSelectedMenuItem();
++    return 0;
++}
++
++// ============================================================================
++
++ScDPFieldPopupWindow::Member::Member() :
++    mbVisible(true)
++{
++}
++
++// ----------------------------------------------------------------------------
++
++ScDPFieldPopupWindow::CancelButton::CancelButton(ScDPFieldPopupWindow* pParent) :
++    ::CancelButton(pParent), mpParent(pParent) {}
++
++void ScDPFieldPopupWindow::CancelButton::Click()
++{
++    mpParent->EndPopupMode();
++    ::CancelButton::Click();
++}
++
++// ----------------------------------------------------------------------------
++
++ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc) :
++    ScMenuFloatingWindow(pParent, pDoc),
++    maChecks(this, 0),
++    maChkToggleAll(this, 0),
++    maBtnSelectSingle  (this, 0), 
++    maBtnUnselectSingle(this, 0), 
++    maBtnOk(this),
++    maBtnCancel(this),
++    mnCurTabStop(0),
++    mpExtendedData(NULL),
++    mpOKAction(NULL),
++    maWndSize(160, 330),
++    mePrevToggleAllState(STATE_DONTKNOW)
++{
++    maTabStopCtrls.reserve(7);
++    maTabStopCtrls.push_back(this);
++    maTabStopCtrls.push_back(&maChecks);
++    maTabStopCtrls.push_back(&maChkToggleAll);
++    maTabStopCtrls.push_back(&maBtnSelectSingle);
++    maTabStopCtrls.push_back(&maBtnUnselectSingle);
++    maTabStopCtrls.push_back(&maBtnOk);
++    maTabStopCtrls.push_back(&maBtnCancel);
++
++    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
++
++    Point aPos;
++    Size aSize;
++    getSectionPosSize(aPos, aSize, WHOLE);
++    SetOutputSizePixel(aSize);
++    Size aOutSize = GetOutputSizePixel();
++
++    getSectionPosSize(aPos, aSize, BTN_OK);
++    maBtnOk.SetPosSizePixel(aPos, aSize);
++    maBtnOk.SetFont(getLabelFont());
++    maBtnOk.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
++    maBtnOk.Show();
++
++    getSectionPosSize(aPos, aSize, BTN_CANCEL);
++    maBtnCancel.SetPosSizePixel(aPos, aSize);
++    maBtnCancel.SetFont(getLabelFont());
++    maBtnCancel.Show();
++
++    getSectionPosSize(aPos, aSize, LISTBOX_AREA_INNER);
++    maChecks.SetPosSizePixel(aPos, aSize);
++    maChecks.SetFont(getLabelFont());
++    maChecks.SetCheckButtonHdl( LINK(this, ScDPFieldPopupWindow, CheckHdl) );
++    maChecks.Show();
++
++    getSectionPosSize(aPos, aSize, CHECK_TOGGLE_ALL);
++    maChkToggleAll.SetPosSizePixel(aPos, aSize);
++    maChkToggleAll.SetFont(getLabelFont());
++    maChkToggleAll.SetText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_TOGGLE_ALL).GetString());
++    maChkToggleAll.SetControlBackground(rStyle.GetMenuColor());
++    maChkToggleAll.SetClickHdl( LINK(this, ScDPFieldPopupWindow, TriStateHdl) );
++    maChkToggleAll.Show();
++
++    getSectionPosSize(aPos, aSize, BTN_SINGLE_SELECT);
++    maBtnSelectSingle.SetPosSizePixel(aPos, aSize);
++    maBtnSelectSingle.SetQuickHelpText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_SELECT_CURRENT).GetString());
++    maBtnSelectSingle.SetModeImage(Image(ScResId(RID_IMG_SELECT_CURRENT)), BMP_COLOR_NORMAL);
++    maBtnSelectSingle.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
++    maBtnSelectSingle.Show();
++
++    getSectionPosSize(aPos, aSize, BTN_SINGLE_UNSELECT);
++    maBtnUnselectSingle.SetPosSizePixel(aPos, aSize);
++    maBtnUnselectSingle.SetQuickHelpText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_UNSELECT_CURRENT).GetString());
++    maBtnUnselectSingle.SetModeImage(Image(ScResId(RID_IMG_UNSELECT_CURRENT)), BMP_COLOR_NORMAL);
++    maBtnUnselectSingle.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
++    maBtnUnselectSingle.Show();
++}
++
++ScDPFieldPopupWindow::~ScDPFieldPopupWindow()
++{
++}
++
++void ScDPFieldPopupWindow::getSectionPosSize(Point& rPos, Size& rSize, SectionType eType) const
++{
++    // constant parameters.
++    const sal_uInt16 nListBoxMargin = 5;            // horizontal distance from the side of the dialog to the listbox border.
++    const sal_uInt16 nListBoxInnerPadding = 5;
++    const sal_uInt16 nTopMargin = 5;
++    const sal_uInt16 nMenuHeight = 60;
++    const sal_uInt16 nSingleItemBtnAreaHeight = 32; // height of the middle area below the list box where the single-action buttons are.
++    const sal_uInt16 nBottomBtnAreaHeight = 50;     // height of the bottom area where the OK and Cancel buttons are.
++    const sal_uInt16 nBtnWidth = 60;
++    const sal_uInt16 nLabelHeight = getLabelFont().GetHeight();
++    const sal_uInt16 nBtnHeight = nLabelHeight*2;
++    const sal_uInt16 nBottomMargin = 10;
++    const sal_uInt16 nMenuListMargin = 20;
++
++    // parameters calculated from constants.
++    const sal_uInt16 nListBoxWidth = maWndSize.Width() - nListBoxMargin*2;
++    const sal_uInt16 nListBoxHeight = maWndSize.Height() - nTopMargin - nMenuHeight - 
++        nMenuListMargin - nSingleItemBtnAreaHeight - nBottomBtnAreaHeight;
++
++    const sal_uInt16 nSingleBtnAreaY = nTopMargin + nMenuHeight + nListBoxHeight + nMenuListMargin - 1;
++
++    switch (eType)
++    {
++        case WHOLE:
++        {
++            rPos  = Point(0, 0);
++            rSize = maWndSize;
++        }
++        break;
++        case LISTBOX_AREA_OUTER:
++        {
++            rPos = Point(nListBoxMargin, nTopMargin + nMenuHeight + nMenuListMargin);
++            rSize = Size(nListBoxWidth, nListBoxHeight);
++        }
++        break;
++        case LISTBOX_AREA_INNER:
++        {
++            rPos = Point(nListBoxMargin, nTopMargin + nMenuHeight + nMenuListMargin);
++            rPos.X() += nListBoxInnerPadding;
++            rPos.Y() += nListBoxInnerPadding;
++
++            rSize = Size(nListBoxWidth, nListBoxHeight);
++            rSize.Width()  -= nListBoxInnerPadding*2;
++            rSize.Height() -= nListBoxInnerPadding*2;
++        }
++        break;
++        case SINGLE_BTN_AREA:
++        {
++            rPos = Point(nListBoxMargin, nSingleBtnAreaY);
++            rSize = Size(nListBoxWidth, nSingleItemBtnAreaHeight);
++        }
++        break;
++        case CHECK_TOGGLE_ALL:
++        {
++            long h = nLabelHeight*3/2; // check box height is heuristically 150% of the text height.
++            rPos = Point(nListBoxMargin, nSingleBtnAreaY);
++            rPos.X() += 5;
++            rPos.Y() += (nSingleItemBtnAreaHeight - h)/2;
++            rSize = Size(70, h);
++        }
++        break;
++        case BTN_SINGLE_SELECT:
++        {
++            long h = 26;
++            rPos = Point(nListBoxMargin, nSingleBtnAreaY);
++            rPos.X() += 75;
++            rPos.Y() += (nSingleItemBtnAreaHeight - h)/2;
++            rSize = Size(h, h);
++        }
++        break;
++        case BTN_SINGLE_UNSELECT:
++        {
++            long h = 26;
++            rPos = Point(nListBoxMargin, nSingleBtnAreaY);
++            rPos.X() += 75 + h + 10;
++            rPos.Y() += (nSingleItemBtnAreaHeight - h)/2;
++            rSize = Size(h, h);
++        }
++        break;
++        case BTN_OK:
++        {
++            long x = (maWndSize.Width() - nBtnWidth*2)/3;
++            long y = maWndSize.Height() - nBottomMargin - nBtnHeight;
++            rPos = Point(x, y);
++            rSize = Size(nBtnWidth, nBtnHeight);
++        }
++        break;
++        case BTN_CANCEL:
++        {
++            long x = (maWndSize.Width() - nBtnWidth*2)/3*2 + nBtnWidth;
++            long y = maWndSize.Height() - nBottomMargin - nBtnHeight;
++            rPos = Point(x, y);
++            rSize = Size(nBtnWidth, nBtnHeight);
++        }
++        break;
++        default:
++            ;
++    }
++}
++
++void ScDPFieldPopupWindow::setAllMemberState(bool bSet)
++{
++    size_t n = maMembers.size();
++    for (size_t i = 0; i < n; ++i)
++        maChecks.CheckEntryPos(i, bSet);
++}
++
++void ScDPFieldPopupWindow::selectCurrentMemberOnly(bool bSet)
++{
++    setAllMemberState(!bSet);
++    sal_uInt16 nSelected = maChecks.GetSelectEntryPos();
++    maChecks.CheckEntryPos(nSelected, bSet);
++}
++
++void ScDPFieldPopupWindow::cycleFocus(bool bReverse)
++{
++    maTabStopCtrls[mnCurTabStop]->SetFakeFocus(false);
++    maTabStopCtrls[mnCurTabStop]->LoseFocus();
++    if (mnCurTabStop == 0)
++        clearSelectedMenuItem();
++
++    if (bReverse)
++    {
++        if (mnCurTabStop > 0)
++            --mnCurTabStop;
++        else
++            mnCurTabStop = maTabStopCtrls.size() - 1;
++    }
++    else
++    {
++        ++mnCurTabStop;
++        if (mnCurTabStop >= maTabStopCtrls.size())
++            mnCurTabStop = 0;
++    }
++    maTabStopCtrls[mnCurTabStop]->SetFakeFocus(true);
++    maTabStopCtrls[mnCurTabStop]->GrabFocus();
++}
++
++IMPL_LINK( ScDPFieldPopupWindow, ButtonHdl, Button*, pBtn )
++{
++    if (pBtn == &maBtnOk)
++        close(true);
++    else if (pBtn == &maBtnSelectSingle)
++    {    
++        selectCurrentMemberOnly(true);
++        CheckHdl(&maChecks);
++    }
++    else if (pBtn == &maBtnUnselectSingle)
++    {    
++        selectCurrentMemberOnly(false);
++        CheckHdl(&maChecks);
++    }
++    return 0;
++}
++
++IMPL_LINK( ScDPFieldPopupWindow, TriStateHdl, TriStateBox*, EMPTYARG )
++{
++    switch (mePrevToggleAllState)
++    {
++        case STATE_NOCHECK:
++            maChkToggleAll.SetState(STATE_CHECK);
++            setAllMemberState(true);
++        break;
++        case STATE_CHECK:
++            maChkToggleAll.SetState(STATE_NOCHECK);
++            setAllMemberState(false);
++        break;
++        case STATE_DONTKNOW:
++        default:
++            maChkToggleAll.SetState(STATE_CHECK);
++            setAllMemberState(true);
++        break;
++    }
++
++    mePrevToggleAllState = maChkToggleAll.GetState();
++    return 0;
++}
++
++IMPL_LINK( ScDPFieldPopupWindow, CheckHdl, SvTreeListBox*, pChecks )
++{
++    if (pChecks != &maChecks)
++        return 0;
++
++    size_t nNumChecked = maChecks.GetCheckedEntryCount();
++    if (nNumChecked == maMembers.size())
++        // all members visible
++        maChkToggleAll.SetState(STATE_CHECK);
++    else if (nNumChecked == 0)
++        // no members visible
++        maChkToggleAll.SetState(STATE_NOCHECK);
++    else
++        maChkToggleAll.SetState(STATE_DONTKNOW);
++
++    mePrevToggleAllState = maChkToggleAll.GetState();
++    return 0;
++}
++
++void ScDPFieldPopupWindow::MouseMove(const MouseEvent& rMEvt)
++{
++    ScMenuFloatingWindow::MouseMove(rMEvt);
++
++    size_t nSelectedMenu = getSelectedMenuItem();
++    if (nSelectedMenu == MENU_NOT_SELECTED)
++        queueCloseSubMenu();
++}
++
++long ScDPFieldPopupWindow::Notify(NotifyEvent& rNEvt)
++{
++    switch (rNEvt.GetType())
++    {
++        case EVENT_KEYUP:
++        {
++            const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
++            const KeyCode& rCode = pKeyEvent->GetKeyCode();
++            bool bShift = rCode.IsShift();
++            if (rCode.GetCode() == KEY_TAB)
++            {
++                cycleFocus(bShift);
++                return true;
++            }
++        }
++        break;
++    }
++    return ScMenuFloatingWindow::Notify(rNEvt);
++}
++
++void ScDPFieldPopupWindow::Paint(const Rectangle& rRect)
++{
++    ScMenuFloatingWindow::Paint(rRect);
++
++    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
++    Color aMemberBackColor = rStyle.GetFieldColor();
++    Color aBorderColor = rStyle.GetShadowColor();
++
++    Point aPos;
++    Size aSize;
++    getSectionPosSize(aPos, aSize, LISTBOX_AREA_OUTER);
++
++    // Member list box background
++    SetFillColor(aMemberBackColor);
++    SetLineColor(aBorderColor);
++    DrawRect(Rectangle(aPos,aSize));
++
++    // Single-action button box
++    getSectionPosSize(aPos, aSize, SINGLE_BTN_AREA);
++    SetFillColor(rStyle.GetMenuColor());
++    DrawRect(Rectangle(aPos,aSize));
++}
++
++Window* ScDPFieldPopupWindow::GetPreferredKeyInputWindow()
++{
++    return maTabStopCtrls[mnCurTabStop];
++}
++
++Reference<XAccessible> ScDPFieldPopupWindow::CreateAccessible()
++{
++    if (!mxAccessible.is())
++    {    
++        mxAccessible.set(new ScAccessibleFilterTopWindow(
++            GetAccessibleParentWindow()->GetAccessible(), this, getName(), getDoc()));
++        ScAccessibleFilterTopWindow* pAccTop = static_cast<ScAccessibleFilterTopWindow*>(mxAccessible.get());
++        fillMenuItemsToAccessible(pAccTop);
++
++        pAccTop->setAccessibleChild(
++            maChecks.CreateAccessible(), ScAccessibleFilterTopWindow::LISTBOX);
++        pAccTop->setAccessibleChild(
++            maChkToggleAll.CreateAccessible(), ScAccessibleFilterTopWindow::TOGGLE_ALL);
++        pAccTop->setAccessibleChild(
++            maBtnSelectSingle.CreateAccessible(), ScAccessibleFilterTopWindow::SINGLE_ON_BTN);
++        pAccTop->setAccessibleChild(
++            maBtnUnselectSingle.CreateAccessible(), ScAccessibleFilterTopWindow::SINGLE_OFF_BTN);
++        pAccTop->setAccessibleChild(
++            maBtnOk.CreateAccessible(), ScAccessibleFilterTopWindow::OK_BTN);
++        pAccTop->setAccessibleChild(
++            maBtnCancel.CreateAccessible(), ScAccessibleFilterTopWindow::CANCEL_BTN);
++    }
++
++    return mxAccessible;
++}
++
++void ScDPFieldPopupWindow::setMemberSize(size_t n)
++{
++    maMembers.reserve(n);
++}
++
++void ScDPFieldPopupWindow::addMember(const OUString& rName, bool bVisible)
++{
++    Member aMember;
++    aMember.maName = rName;
++    aMember.mbVisible = bVisible;
++    maMembers.push_back(aMember);
++}
++
++void ScDPFieldPopupWindow::initMembers()
++{
++    size_t n = maMembers.size();
++    size_t nVisMemCount = 0;
++    for (size_t i = 0; i < n; ++i)
++    {
++        maChecks.InsertEntry(maMembers[i].maName);
++        maChecks.CheckEntryPos(i, maMembers[i].mbVisible);
++        if (maMembers[i].mbVisible)
++            ++nVisMemCount;
++    }
++    if (nVisMemCount == n)
++    {    
++        // all members visible
++        maChkToggleAll.SetState(STATE_CHECK);
++        mePrevToggleAllState = STATE_CHECK;
++    }
++    else if (nVisMemCount == 0)
++    {    
++        // no members visible
++        maChkToggleAll.SetState(STATE_NOCHECK);
++        mePrevToggleAllState = STATE_NOCHECK;
++    }
++    else
++    {    
++        maChkToggleAll.SetState(STATE_DONTKNOW);
++        mePrevToggleAllState = STATE_DONTKNOW;
++    }
++}
++
++const Size& ScDPFieldPopupWindow::getWindowSize() const
++{
++    return maWndSize;
++}
++
++void ScDPFieldPopupWindow::getResult(hash_map<OUString, bool, OUStringHash>& rResult)
++{
++    typedef hash_map<OUString, bool, OUStringHash> ResultMap;
++    ResultMap aResult;
++    size_t n = maMembers.size();
++    for (size_t i = 0; i < n; ++i)
++    {
++        bool bState = maChecks.IsChecked(i);
++        aResult.insert(ResultMap::value_type(maMembers[i].maName, bState));
++    }
++    rResult.swap(aResult);
++}
++
++void ScDPFieldPopupWindow::close(bool bOK)
++{
++    if (bOK && mpOKAction.get())
++        mpOKAction->execute();
++
++    EndPopupMode();
++}
++
++void ScDPFieldPopupWindow::setExtendedData(ExtendedData* p)
++{
++    mpExtendedData.reset(p);
++}
++
++ScDPFieldPopupWindow::ExtendedData* ScDPFieldPopupWindow::getExtendedData()
++{
++    return mpExtendedData.get();
++}
++
++void ScDPFieldPopupWindow::setOKAction(Action* p)
++{
++    mpOKAction.reset(p);
++}
++
+diff --git sc/source/ui/cctrl/dpcontrol.src sc/source/ui/cctrl/dpcontrol.src
+new file mode 100644
+index 0000000..31cbb62
+--- /dev/null
++++ sc/source/ui/cctrl/dpcontrol.src
+@@ -0,0 +1,82 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: globstr.src,v $
++ * $Revision: 1.74.96.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#include "dpcontrol.hrc"
++
++Resource RID_POPUP_FILTER
++{
++    String STR_MENU_SORT_ASC
++    {
++        Text [ en-US ] = "Sort Ascending" ;
++    };
++
++    String STR_MENU_SORT_DESC
++    {
++        Text [ en-US ] = "Sort Descending" ;
++    };
++
++    String STR_MENU_SORT_CUSTOM
++    {
++        Text [ en-US ] = "Custom Sort" ;
++    };
++
++    String STR_BTN_TOGGLE_ALL
++    {
++        Text [ en-US ] = "All" ;
++    };
++
++    String STR_BTN_SELECT_CURRENT
++    {
++        Text [ en-US ] = "Show only the current item." ;
++    };
++
++    String STR_BTN_UNSELECT_CURRENT
++    {
++        Text [ en-US ] = "Hide only the current item." ;
++    };
++};
++
++Image RID_IMG_SELECT_CURRENT
++{
++    ImageBitmap = Bitmap
++    {
++        File = "popup_select_current.png";
++    };
++    MaskColor = STD_MASKCOLOR;
++};
++
++Image RID_IMG_UNSELECT_CURRENT
++{
++    ImageBitmap = Bitmap
++    {
++        File = "popup_unselect_current.png";
++    };
++    MaskColor = STD_MASKCOLOR;
++};
+diff --git sc/source/ui/cctrl/makefile.mk sc/source/ui/cctrl/makefile.mk
+index e7b96af..43ff4bd 100644
+--- sc/source/ui/cctrl/makefile.mk
++++ sc/source/ui/cctrl/makefile.mk
+@@ -45,22 +45,30 @@ LIBTARGET=NO
+ # --- Files --------------------------------------------------------
+ 
+ EXCEPTIONSFILES= \
+-    $(SLO)$/tbzoomsliderctrl.obj
++    $(SLO)$/tbzoomsliderctrl.obj \
++    $(SLO)$/dpcontrol.obj
+ 
+ SLOFILES =	\
+         $(SLO)$/popmenu.obj		\
+         $(SLO)$/tbinsert.obj	\
+         $(SLO)$/cbuttonw.obj	\
++		$(SLO)$/dpcontrol.obj	\
+         $(SLO)$/editfield.obj	\
+         $(EXCEPTIONSFILES)
+ 
++SRS1NAME=$(TARGET)
++SRC1FILES = \
++	dpcontrol.src
++
+ LIB1TARGET=$(SLB)$/$(TARGET).lib
+ LIB1OBJFILES= \
+         $(SLO)$/popmenu.obj		\
+         $(SLO)$/tbinsert.obj	\
+         $(SLO)$/cbuttonw.obj	\
++		$(SLO)$/dpcontrol.obj	\
+         $(SLO)$/tbzoomsliderctrl.obj
+ 
++
+ # --- Tagets -------------------------------------------------------
+ 
+ .INCLUDE :  target.mk
+diff --git sc/source/ui/dbgui/pvfundlg.cxx sc/source/ui/dbgui/pvfundlg.cxx
+index 08a5e03..ec140d8 100644
+--- sc/source/ui/dbgui/pvfundlg.cxx
++++ sc/source/ui/dbgui/pvfundlg.cxx
+@@ -48,12 +48,15 @@
+ #include "pvfundlg.hrc"
+ #include "globstr.hrc"
+ 
++#include <vector>
++
+ // ============================================================================
+ 
+ using namespace ::com::sun::star::sheet;
+ 
+ using ::rtl::OUString;
+ using ::com::sun::star::uno::Sequence;
++using ::std::vector;
+ 
+ // ============================================================================
+ 
+@@ -86,6 +89,25 @@ bool lclFillListBox( ListBoxType& rLBox, const Sequence< OUString >& rStrings, U
+     return bEmpty;
+ }
+ 
++template< typename ListBoxType >
++bool lclFillListBox( ListBoxType& rLBox, const vector<ScDPLabelData::Member>& rMembers, USHORT nEmptyPos = LISTBOX_APPEND )
++{
++    bool bEmpty = false;
++    vector<ScDPLabelData::Member>::const_iterator itr = rMembers.begin(), itrEnd = rMembers.end();
++    for (; itr != itrEnd; ++itr)
++    {
++        OUString aName = itr->getDisplayName();
++        if (aName.getLength())
++            rLBox.InsertEntry(aName);
++        else
++        {
++            rLBox.InsertEntry(ScGlobal::GetRscString(STR_EMPTYDATA), nEmptyPos);
++            bEmpty = true;
++        }
++    }
++    return bEmpty;
++}
++
+ /** Searches for a listbox entry, starts search at specified position. */
+ USHORT lclFindListBoxEntry( const ListBox& rLBox, const String& rEntry, USHORT nStartPos )
+ {
+@@ -253,7 +275,7 @@ void ScDPFunctionDlg::Init( const ScDPLabelData& rLabelData, const ScDPFuncData&
+     maLbFunc.SetSelection( nFuncMask );
+ 
+     // field name
+-    maFtName.SetText( rLabelData.maName );
++    maFtName.SetText(rLabelData.getDisplayName());
+ 
+     // "More button" controls
+     maBtnMore.AddWindow( &maFlDisplay );
+@@ -271,7 +293,7 @@ void ScDPFunctionDlg::Init( const ScDPLabelData& rLabelData, const ScDPFuncData&
+ 
+     // base field list box
+     for( ScDPLabelDataVec::const_iterator aIt = mrLabelVec.begin(), aEnd = mrLabelVec.end(); aIt != aEnd; ++aIt )
+-        maLbBaseField.InsertEntry( aIt->maName );
++        maLbBaseField.InsertEntry(aIt->getDisplayName());
+ 
+     // base item list box
+     maLbBaseItem.SetSeparatorPos( SC_BASEITEM_USER_POS - 1 );
+@@ -414,8 +436,6 @@ void ScDPSubtotalDlg::FillLabelData( ScDPLabelData& rLabelData ) const
+     rLabelData.mnUsedHier = maLabelData.mnUsedHier;
+     rLabelData.mbShowAll = maCbShowAll.IsChecked();
+     rLabelData.maMembers = maLabelData.maMembers;
+-    rLabelData.maVisible = maLabelData.maVisible;
+-    rLabelData.maShowDet = maLabelData.maShowDet;
+     rLabelData.maSortInfo = maLabelData.maSortInfo;
+     rLabelData.maLayoutInfo = maLabelData.maLayoutInfo;
+     rLabelData.maShowInfo = maLabelData.maShowInfo;
+@@ -424,7 +444,7 @@ void ScDPSubtotalDlg::FillLabelData( ScDPLabelData& rLabelData ) const
+ void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScDPFuncData& rFuncData )
+ {
+     // field name
+-    maFtName.SetText( rLabelData.maName );
++    maFtName.SetText(rLabelData.getDisplayName());
+ 
+     // radio buttons
+     maRbNone.SetClickHdl( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
+@@ -547,9 +567,8 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const
+ 
+     rLabelData.maMembers = maLabelData.maMembers;
+     ULONG nVisCount = maLbHide.GetEntryCount();
+-    rLabelData.maVisible.realloc( nVisCount );
+     for( USHORT nPos = 0; nPos < nVisCount; ++nPos )
+-        rLabelData.maVisible[ nPos ] = !maLbHide.IsChecked( nPos );
++        rLabelData.maMembers[nPos].mbVisible = !maLbHide.IsChecked(nPos);
+ 
+     // *** HIERARCHY ***
+ 
+@@ -563,7 +582,8 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayou
+     sal_Int32 nSortMode = maLabelData.maSortInfo.Mode;
+ 
+     // sort fields list box
+-    maLbSortBy.InsertEntry( maLabelData.maName );
++    maLbSortBy.InsertEntry(maLabelData.getDisplayName());
++
+     for( ScDPNameVec::const_iterator aIt = rDataFields.begin(), aEnd = rDataFields.end(); aIt != aEnd; ++aIt )
+     {
+         maLbSortBy.InsertEntry( *aIt );
+@@ -656,8 +676,9 @@ void ScDPSubtotalOptDlg::InitHideListBox()
+ {
+     maLbHide.Clear();
+     lclFillListBox( maLbHide, maLabelData.maMembers );
+-    for( sal_Int32 nVisIdx = 0, nVisSize = maLabelData.maVisible.getLength(); nVisIdx < nVisSize; ++nVisIdx )
+-        maLbHide.CheckEntryPos( static_cast< USHORT >( nVisIdx ), !maLabelData.maVisible[ nVisIdx ] );
++    size_t n = maLabelData.maMembers.size();
++    for (size_t i = 0; i < n; ++i)
++        maLbHide.CheckEntryPos(static_cast<USHORT>(i), !maLabelData.maMembers[i].mbVisible);
+     bool bEnable = maLbHide.GetEntryCount() > 0;
+     maFlHide.Enable( bEnable );
+     maLbHide.Enable( bEnable );
+@@ -690,8 +711,7 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox )
+ {
+     if( pLBox == &maLbHierarchy )
+     {
+-        mrDPObj.GetMembers( maLabelData.mnCol, maLbHierarchy.GetSelectEntryPos(),
+-            maLabelData.maMembers, &maLabelData.maVisible, &maLabelData.maShowDet );
++        mrDPObj.GetMembers(maLabelData.mnCol, maLbHierarchy.GetSelectEntryPos(), maLabelData.maMembers);
+         InitHideListBox();
+     }
+     return 0;
+@@ -705,7 +725,9 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHOR
+     maLbDims        ( this, ScResId( LB_DIMS ) ),
+     maBtnOk         ( this, ScResId( BTN_OK ) ),
+     maBtnCancel     ( this, ScResId( BTN_CANCEL ) ),
+-    maBtnHelp       ( this, ScResId( BTN_HELP ) )
++    maBtnHelp       ( this, ScResId( BTN_HELP ) ),
++
++    mrDPObj(rDPObj)
+ {
+     FreeResource();
+ 
+@@ -719,7 +741,13 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHOR
+         {
+             const ScDPSaveDimension* pDimension = pSaveData ? pSaveData->GetExistingDimensionByName(aName) : 0;
+             if ( !pDimension || (pDimension->GetOrientation() != nOrient) )
++            {
++                const OUString* pLayoutName = pDimension->GetLayoutName();
++                if (pLayoutName)
++                    aName = *pLayoutName;
+                 maLbDims.InsertEntry( aName );
++                maNameIndexMap.insert(DimNameIndexMap::value_type(aName, nDim));
++            }
+         }
+     }
+     if( maLbDims.GetEntryCount() )
+@@ -735,7 +763,17 @@ short ScDPShowDetailDlg::Execute()
+ 
+ String ScDPShowDetailDlg::GetDimensionName() const
+ {
+-    return maLbDims.GetSelectEntry();
++    // Look up the internal dimension name which may be different from the 
++    // displayed field name.
++    String aSelectedName = maLbDims.GetSelectEntry();
++    DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName);
++    if (itr == maNameIndexMap.end())
++        // This should never happen!
++        return aSelectedName;
++
++    long nDim = itr->second;
++    BOOL bIsDataLayout = false;
++    return mrDPObj.GetDimName(nDim, bIsDataLayout);
+ }
+ 
+ IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox*, pLBox )
+diff --git sc/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
+index 21b2706..7392386 100644
+--- sc/source/ui/dbgui/pvlaydlg.cxx
++++ sc/source/ui/dbgui/pvlaydlg.cxx
+@@ -63,6 +63,8 @@
+ #include "sc.hrc" //CHINA001
+ #include "scabstdlg.hxx" //CHINA001
+ using namespace com::sun::star;
++using ::rtl::OUString;
++using ::std::vector;
+ 
+ //----------------------------------------------------------------------------
+ 
+@@ -378,24 +380,23 @@ void ScDPLayoutDlg::StateChanged( StateChangedType nStateChange )
+ 
+ //----------------------------------------------------------------------------
+ 
+-void ScDPLayoutDlg::InitWndSelect( LabelData** ppLabelArr, long nLabels )
++void ScDPLayoutDlg::InitWndSelect( const vector<ScDPLabelDataRef>& rLabels )
+ {
+-    if ( ppLabelArr )
++    size_t nLabelCount = rLabels.size();
++    if (nLabelCount > MAX_LABELS)
++        nLabelCount = MAX_LABELS;
++    size_t nLast = (nLabelCount > PAGE_SIZE) ? (PAGE_SIZE - 1) : (nLabelCount - 1);
++
++    aLabelDataArr.clear();
++    aLabelDataArr.reserve( nLabelCount );
++    for ( size_t i=0; i < nLabelCount; i++ )
+     {
+-        size_t nLabelCount = static_cast< size_t >( (nLabels > MAX_LABELS) ? MAX_LABELS : nLabels );
+-        size_t nLast = (nLabelCount > PAGE_SIZE) ? (PAGE_SIZE - 1) : (nLabelCount - 1);
++        aLabelDataArr.push_back(*rLabels[i]);
+ 
+-        aLabelDataArr.clear();
+-        aLabelDataArr.reserve( nLabelCount );
+-        for ( size_t i=0; i < nLabelCount; i++ )
++        if ( i <= nLast )
+         {
+-            aLabelDataArr.push_back( *ppLabelArr[i] );
+-
+-            if ( i <= nLast )
+-            {
+-                aWndSelect.AddField( aLabelDataArr[i].maName, i );
+-                aSelectArr[i].reset( new ScDPFuncData( aLabelDataArr[i].mnCol, aLabelDataArr[i].mnFuncMask ) );
+-            }
++            aWndSelect.AddField(aLabelDataArr[i].getDisplayName(), i);
++            aSelectArr[i].reset( new ScDPFuncData( aLabelDataArr[i].mnCol, aLabelDataArr[i].mnFuncMask ) );
+         }
+     }
+ }
+@@ -493,18 +494,19 @@ void ScDPLayoutDlg::InitFocus()
+ 
+ void ScDPLayoutDlg::InitFields()
+ {
+-    InitWndSelect( thePivotData.ppLabelArr, static_cast<long>(thePivotData.nLabels) );
++    InitWndSelect(thePivotData.maLabelArray);
+     InitWnd( thePivotData.aPageArr, static_cast<long>(thePivotData.nPageCount), TYPE_PAGE );
+     InitWnd( thePivotData.aColArr,  static_cast<long>(thePivotData.nColCount),  TYPE_COL );
+     InitWnd( thePivotData.aRowArr,  static_cast<long>(thePivotData.nRowCount),  TYPE_ROW );
+     InitWnd( thePivotData.aDataArr, static_cast<long>(thePivotData.nDataCount), TYPE_DATA );
+ 
++    size_t nLabels = thePivotData.maLabelArray.size();
+     aSlider.SetPageSize( PAGE_SIZE );
+     aSlider.SetVisibleSize( PAGE_SIZE );
+     aSlider.SetLineSize( LINE_SIZE );
+-    aSlider.SetRange( Range( 0, static_cast<long>(((thePivotData.nLabels+LINE_SIZE-1)/LINE_SIZE)*LINE_SIZE) ) );
++    aSlider.SetRange( Range( 0, static_cast<long>(((nLabels+LINE_SIZE-1)/LINE_SIZE)*LINE_SIZE) ) );
+ 
+-    if ( thePivotData.nLabels > PAGE_SIZE )
++    if ( nLabels > PAGE_SIZE )
+     {
+         aSlider.SetEndScrollHdl( LINK( this, ScDPLayoutDlg, ScrollHdl ) );
+         aSlider.Show();
+@@ -594,7 +596,7 @@ void ScDPLayoutDlg::AddField( size_t nFromIndex, ScDPFieldType eToType, const Po
+ 
+         if ( !bDataArr )
+         {
+-            if ( toWnd->AddField( rData.maName,
++            if ( toWnd->AddField( rData.getDisplayName(),
+                                   DlgPos2WndPos( rAtPos, *toWnd ),
+                                   nAddedAt ) )
+             {
+@@ -605,9 +607,9 @@ void ScDPLayoutDlg::AddField( size_t nFromIndex, ScDPFieldType eToType, const Po
+         else
+         {
+             USHORT nMask = fData.mnFuncMask;
+-            String aStr( GetFuncString( nMask, rData.mbIsValue ) );
+-
+-            aStr += rData.maName;
++            OUString aStr = GetFuncString( nMask, rData.mbIsValue );
++            
++            aStr += rData.getDisplayName();
+ 
+             if ( toWnd->AddField( aStr,
+                                   DlgPos2WndPos( rAtPos, *toWnd ),
+@@ -1215,7 +1217,7 @@ String ScDPLayoutDlg::GetLabelString( SCsCOL nCol )
+     ScDPLabelData* pData = GetLabelData( nCol );
+     DBG_ASSERT( pData, "LabelData not found" );
+     if (pData)
+-        return pData->maName;
++        return pData->getDisplayName();
+     return String();
+ }
+ 
+@@ -1491,6 +1493,8 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
+                                     nPageCount,    nColCount,    nRowCount,    nDataCount );
+         if ( bFit )
+         {
++            ScDPSaveData* pOldSaveData = xDlgDPObject->GetSaveData();
++
+             ScRange aOutRange( aAdrDest );		// bToNewTable is passed separately
+ 
+             ScDPSaveData aSaveData;
+@@ -1522,31 +1526,63 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
+                     pDim->SetSortInfo( &aIt->maSortInfo );
+                     pDim->SetLayoutInfo( &aIt->maLayoutInfo );
+                     pDim->SetAutoShowInfo( &aIt->maShowInfo );
++                    ScDPSaveDimension* pOldDim = NULL;
++                    if (pOldSaveData)
++                    {
++                        // Transfer the existing layout names to new dimension instance.
++                        pOldDim = pOldSaveData->GetExistingDimensionByName(aIt->maName);
++                        if (pOldDim)
++                        {
++                            const OUString* pLayoutName = pOldDim->GetLayoutName();
++                            if (pLayoutName)
++                                pDim->SetLayoutName(*pLayoutName);
++
++                            const OUString* pSubtotalName = pOldDim->GetSubtotalName();
++                            if (pSubtotalName)
++                                pDim->SetSubtotalName(*pSubtotalName);
++                        }
++                    }
+ 
+                     bool bManualSort = ( aIt->maSortInfo.Mode == sheet::DataPilotFieldSortMode::MANUAL );
+ 
+                     // visibility of members
+-                    if( const rtl::OUString* pItem = aIt->maMembers.getConstArray() )
++                    for (vector<ScDPLabelData::Member>::const_iterator itr = aIt->maMembers.begin(), itrEnd = aIt->maMembers.end();
++                          itr != itrEnd; ++itr)
+                     {
+-                        sal_Int32 nIdx = 0;
+-                        sal_Int32 nVisSize = aIt->maVisible.getLength();
+-                        sal_Int32 nShowSize = aIt->maShowDet.getLength();
+-                        for( const rtl::OUString* pEnd = pItem + aIt->maMembers.getLength(); pItem != pEnd; ++pItem, ++nIdx )
++                        ScDPSaveMember* pMember = pDim->GetMemberByName(itr->maName);
++
++                        // #i40054# create/access members only if flags are not default
++                        // (or in manual sorting mode - to keep the order)
++                        if (bManualSort || !itr->mbVisible || !itr->mbShowDetails)
++                        {
++                            pMember->SetIsVisible(itr->mbVisible);
++                            pMember->SetShowDetails(itr->mbShowDetails);
++                        }
++                        if (pOldDim)
+                         {
+-                            // #i40054# create/access members only if flags are not default
+-                            // (or in manual sorting mode - to keep the order)
+-                            bool bIsVisible = (nIdx >= nVisSize) || aIt->maVisible[ nIdx ];
+-                            bool bShowDetails = (nIdx >= nShowSize) || aIt->maShowDet[ nIdx ];
+-                            if( bManualSort || !bIsVisible || !bShowDetails )
++                            // Transfer the existing layout name.
++                            ScDPSaveMember* pOldMember = pOldDim->GetMemberByName(itr->maName);
++                            if (pOldMember)
+                             {
+-                                ScDPSaveMember* pMember = pDim->GetMemberByName( *pItem );
+-                                pMember->SetIsVisible( bIsVisible );
+-                                pMember->SetShowDetails( bShowDetails );
++                                const OUString* pLayoutName = pOldMember->GetLayoutName();
++                                if (pLayoutName)
++                                    pMember->SetLayoutName(*pLayoutName);
+                             }
+                         }
+                     }
+                 }
+             }
++            ScDPSaveDimension* pDim = aSaveData.GetDataLayoutDimension();
++            if (pDim && pOldSaveData)
++            {
++                ScDPSaveDimension* pOldDim = pOldSaveData->GetDataLayoutDimension();
++                if (pOldDim)
++                {
++                    const OUString* pLayoutName = pOldDim->GetLayoutName();
++                    if (pLayoutName)
++                        pDim->SetLayoutName(*pLayoutName);
++                }
++            }
+ 
+             USHORT nWhichPivot = SC_MOD()->GetPool().GetWhich( SID_PIVOT_TABLE );
+             ScPivotItem aOutItem( nWhichPivot, &aSaveData, &aOutRange, bToNewTable );
+@@ -1720,7 +1756,7 @@ IMPL_LINK( ScDPLayoutDlg, ScrollHdl, ScrollBar *, EMPTYARG )
+     for ( i=0; i<nFields; i++ )
+     {
+         const ScDPLabelData& rData = aLabelDataArr[nOffset+i];
+-        aWndSelect.AddField( rData.maName, i );
++        aWndSelect.AddField(rData.getDisplayName(), i);
+         aSelectArr[i].reset( new ScDPFuncData( rData.mnCol, rData.mnFuncMask ) );
+     }
+     for ( ; i<aSelectArr.size(); i++ )
+diff --git sc/source/ui/docshell/dbdocfun.cxx sc/source/ui/docshell/dbdocfun.cxx
+index 0fc36d7..8ee336e 100644
+--- sc/source/ui/docshell/dbdocfun.cxx
++++ sc/source/ui/docshell/dbdocfun.cxx
+@@ -1234,7 +1234,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
+                                   aRange.aEnd.Col(),   aRange.aEnd.Row(),
+                                   nTab, SC_MF_AUTO );
+ 
+-            pDoc->GetDPCollection()->Free( pOldObj );	// object is deleted here
++            pDoc->GetDPCollection()->FreeTable( pOldObj );  // object is deleted here
+ 
+             rDocShell.PostPaintGridAll();	//! only necessary parts
+             rDocShell.PostPaint( aRange.aStart.Col(), aRange.aStart.Row(), nTab,
+@@ -1278,7 +1278,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
+ 
+                 pDestObj = new ScDPObject( *pNewObj );
+                 pDestObj->SetAlive(TRUE);
+-                if ( !pDoc->GetDPCollection()->Insert(pDestObj) )
++                if ( !pDoc->GetDPCollection()->InsertNewTable(pDestObj) )
+                 {
+                     DBG_ERROR("cannot insert DPObject");
+                     DELETEZ( pDestObj );
+diff --git sc/source/ui/inc/AccessibleContextBase.hxx sc/source/ui/inc/AccessibleContextBase.hxx
+index 5cb0723..fdc378a 100644
+--- sc/source/ui/inc/AccessibleContextBase.hxx
++++ sc/source/ui/inc/AccessibleContextBase.hxx
+@@ -319,6 +319,8 @@ protected:
+     /// Use this method to set initial Description without notification
+     void SetDescription(const rtl::OUString& rDesc) { msDescription = rDesc; }
+ 
++    void SetRole(sal_Int16 nRole);
++
+     ///	Reference to the parent object.
+     ::com::sun::star::uno::Reference<
+          ::com::sun::star::accessibility::XAccessible> mxParent;
+diff --git sc/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
+index fcdb170..bb43553 100644
+--- sc/source/ui/inc/dbfunc.hxx
++++ sc/source/ui/inc/dbfunc.hxx
+@@ -80,7 +80,7 @@ public:
+     void			GotoDBArea( const String& rDBName );
+ 
+                     // DB-Bereich vom Cursor
+-    ScDBData* 		GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE );
++	ScDBData* 		GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE, bool bShrinkToData = false );
+ 
+     void			NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList );
+ 
+@@ -99,6 +99,7 @@ public:
+     void            UngroupDataPilot();
+     void            DataPilotInput( const ScAddress& rPos, const String& rString );
+ 
++    bool            DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16* pUserListId = NULL );
+     BOOL            DataPilotMove( const ScRange& rSource, const ScAddress& rDest );
+ 
+     BOOL            HasSelectionForDrillDown( USHORT& rOrientation );
+diff --git sc/source/ui/inc/dpcontrol.hrc sc/source/ui/inc/dpcontrol.hrc
+new file mode 100644
+index 0000000..6d21b56
+--- /dev/null
++++ sc/source/ui/inc/dpcontrol.hrc
+@@ -0,0 +1,43 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: protectiondlg.hrc,v $
++ * $Revision: 1.1.2.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef __DPCONTROL_HRC__
++#define __DPCONTROL_HRC__
++
++#include <sc.hrc>
++
++#define STR_MENU_SORT_ASC           1
++#define STR_MENU_SORT_DESC          2
++#define STR_MENU_SORT_CUSTOM        3
++#define STR_BTN_TOGGLE_ALL          4
++#define STR_BTN_SELECT_CURRENT      5
++#define STR_BTN_UNSELECT_CURRENT    6
++
++#endif
+diff --git sc/source/ui/inc/dpcontrol.hxx sc/source/ui/inc/dpcontrol.hxx
+new file mode 100644
+index 0000000..2380d5d
+--- /dev/null
++++ sc/source/ui/inc/dpcontrol.hxx
+@@ -0,0 +1,366 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: document.hxx,v $
++ * $Revision: 1.115.36.9 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_DPCONTROL_HXX
++#define SC_DPCONTROL_HXX
++
++#include "rtl/ustring.hxx"
++#include "tools/gen.hxx"
++#include "tools/fract.hxx"
++#include "vcl/popupmenuwindow.hxx"
++#include "vcl/button.hxx"
++#include "vcl/scrbar.hxx"
++#include "vcl/timer.hxx"
++#include "svx/checklbx.hxx"
++
++#include <boost/shared_ptr.hpp>
++#include <memory>
++#include <hash_map>
++
++namespace com { namespace sun { namespace star {
++
++    namespace accessibility {
++        class XAccessible;
++    }
++
++}}}
++
++class OutputDevice;
++class Point;
++class Size;
++class StyleSettings;
++class Window;
++class ScDocument;
++class ScAccessibleFilterMenu;
++
++/** 
++ * This class takes care of physically drawing field button controls inside 
++ * data pilot tables. 
++ */
++class ScDPFieldButton
++{
++public:
++    ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX = NULL, const Fraction* pZoomY = NULL);
++    ~ScDPFieldButton();
++
++    void setText(const ::rtl::OUString& rText);
++    void setBoundingBox(const Point& rPos, const Size& rSize);
++    void setDrawBaseButton(bool b);
++    void setDrawPopupButton(bool b);
++    void setHasHiddenMember(bool b);
++    void setPopupPressed(bool b);
++    void draw();
++
++    void getPopupBoundingBox(Point& rPos, Size& rSize) const;
++    bool isPopupButton() const;
++
++private:
++    void drawPopupButton();
++
++private:
++    Point                   maPos;
++    Size                    maSize;
++    ::rtl::OUString         maText;
++    Fraction                maZoomX;
++    Fraction                maZoomY;
++    OutputDevice*           mpOutDev;
++    const StyleSettings*    mpStyle;
++    bool                    mbBaseButton;
++    bool                    mbPopupButton;
++    bool                    mbHasHiddenMember;
++    bool                    mbPopupPressed;
++};
++
++// ============================================================================
++
++class ScMenuFloatingWindow : public PopupMenuFloatingWindow
++{
++public:
++    static size_t MENU_NOT_SELECTED;
++    /** 
++     * Action to perform when an event takes place.  Create a sub-class of 
++     * this to implement the desired action. 
++     */
++    class Action
++    {
++    public:
++        virtual void execute() = 0;
++    };
++
++    explicit ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, USHORT nMenuStackLevel = 0);
++    virtual ~ScMenuFloatingWindow();
++
++    virtual void MouseMove(const MouseEvent& rMEvt);
++    virtual void MouseButtonDown(const MouseEvent& rMEvt);
++    virtual void MouseButtonUp(const MouseEvent& rMEvt);
++    virtual void KeyInput(const KeyEvent& rKEvt);
++    virtual void Paint(const Rectangle& rRect);
++    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
++
++    void addMenuItem(const ::rtl::OUString& rText, bool bEnabled, Action* pAction);
++    ScMenuFloatingWindow* addSubMenuItem(const ::rtl::OUString& rText, bool bEnabled);
++    void setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, bool bEnsureSubMenu);
++    void selectMenuItem(size_t nPos, bool bSelected, bool bSubMenuTimer);
++    void clearSelectedMenuItem();
++    ScMenuFloatingWindow* getSubMenuWindow(size_t nPos) const;
++    size_t getMenuItemCount() const;
++    ::rtl::OUString getMenuItemName(size_t nPos) const;
++    bool isMenuItemEnabled(size_t nPos) const;
++    bool isMenuItemSelected(size_t nPos) const;
++    size_t getSelectedMenuItem() const;
++
++    void setName(const ::rtl::OUString& rName);
++    const ::rtl::OUString& getName() const;
++
++    void executeMenuItem(size_t nPos);
++    void getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const;
++    ScMenuFloatingWindow* getParentMenuWindow() const;
++
++protected:
++
++    void drawMenuItem(size_t nPos);
++    void drawAllMenuItems();
++    const Font& getLabelFont() const;
++
++    void queueLaunchSubMenu(size_t nPos, ScMenuFloatingWindow* pMenu);
++    void queueCloseSubMenu();
++    void launchSubMenu(bool bSetMenuPos);
++    void endSubMenu(ScMenuFloatingWindow* pSubMenu);
++
++    void fillMenuItemsToAccessible(ScAccessibleFilterMenu* pAccMenu) const;
++
++    ScDocument* getDoc();
++
++protected:
++    ::com::sun::star::uno::Reference<
++        ::com::sun::star::accessibility::XAccessible > mxAccessible;
++
++private:
++    struct SubMenuItemData;
++    void handleMenuTimeout(SubMenuItemData* pTimer);
++
++    void resizeToFitMenuItems();
++    void highlightMenuItem(size_t nPos, bool bSelected);
++
++    size_t getEnclosingMenuItem(const Point& rPos) const;
++    size_t getSubMenuPos(ScMenuFloatingWindow* pSubMenu);
++
++    /** 
++     * Fire a menu highlight event since the accessibility framework needs 
++     * this to track focus on menu items. 
++     */
++    void fireMenuHighlightedEvent();  
++
++    /** 
++     * Make sure that the specified submenu is permanently up, the submenu 
++     * close timer is not active, and the correct menu item associated with 
++     * the submenu is highlighted.
++     */
++    void setSubMenuFocused(ScMenuFloatingWindow* pSubMenu);
++
++    /** 
++     * When a menu item of an invisible submenu is selected, we need to make 
++     * sure that all its parent menu(s) are visible, with the right menu item 
++     * highlighted in each of the parents.  Calling this method ensures it. 
++     */
++    void ensureSubMenuVisible(ScMenuFloatingWindow* pSubMenu);
++
++    /** 
++     * Dismiss any visible child submenus when a menu item of a parent menu is 
++     * selected.
++     */
++    void ensureSubMenuNotVisible();
++
++    /** 
++     * Dismiss all visible popup menus and set focus back to the application 
++     * window.  This method is called e.g. when a menu action is fired.
++     */
++    void terminateAllPopupMenus();
++
++    DECL_LINK( PopupEndHdl, void* );
++
++private:
++
++    struct MenuItemData
++    {
++        ::rtl::OUString maText;
++        bool            mbEnabled;
++
++        ::boost::shared_ptr<Action> mpAction;
++        ::boost::shared_ptr<ScMenuFloatingWindow> mpSubMenuWin;
++
++        MenuItemData();
++    };
++
++    ::std::vector<MenuItemData>         maMenuItems;
++
++    struct SubMenuItemData
++    {
++        Timer                   maTimer;
++        ScMenuFloatingWindow*   mpSubMenu;
++        size_t                  mnMenuPos;
++
++        DECL_LINK( TimeoutHdl, void* );
++
++        SubMenuItemData(ScMenuFloatingWindow* pParent);
++        void reset();
++
++    private:
++        ScMenuFloatingWindow* mpParent;
++    };
++    SubMenuItemData   maOpenTimer;
++    SubMenuItemData   maCloseTimer;
++
++    Font    maLabelFont;
++
++    // Name of this menu window, taken from the menu item of the parent window
++    // that launches it (if this is a sub menu).  If this is a top-level menu
++    // window, then this name can be anything.
++    ::rtl::OUString maName;
++
++    size_t  mnSelectedMenu;
++    size_t  mnClickedMenu;
++
++    ScDocument* mpDoc;
++
++    ScMenuFloatingWindow* mpParentMenu;
++    ScMenuFloatingWindow* mpActiveSubMenu;
++};
++
++// ============================================================================
++
++/** 
++ * This class implements a popup window for field button, for quick access 
++ * of hide-item list, and possibly more stuff related to field options. 
++ */
++class ScDPFieldPopupWindow : public ScMenuFloatingWindow
++{
++public:
++    /** 
++     * Extended data that the client code may need to store.  Create a 
++     * sub-class of this and store data there. 
++     */ 
++    struct ExtendedData {};
++
++    explicit ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc);
++    virtual ~ScDPFieldPopupWindow();
++
++    virtual void MouseMove(const MouseEvent& rMEvt);
++    virtual long Notify(NotifyEvent& rNEvt);
++    virtual void Paint(const Rectangle& rRect);
++    virtual Window* GetPreferredKeyInputWindow();
++    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
++
++    void setMemberSize(size_t n);
++    void addMember(const ::rtl::OUString& rName, bool bVisible);
++    void initMembers();
++
++    const Size& getWindowSize() const;
++
++    void getResult(::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rResult);
++    void close(bool bOK);
++
++    /** 
++     * Set auxiliary data that the client code might need.  Note that this 
++     * popup window class manages its life time; no explicit deletion of the 
++     * instance is needed in the client code.
++     */
++    void setExtendedData(ExtendedData* p);
++
++    /** 
++     * Get the store auxiliary data, or NULL if no such data is stored.
++     */
++    ExtendedData* getExtendedData();
++
++    void setOKAction(Action* p);
++
++private:
++    struct Member
++    {
++        ::rtl::OUString maName;
++        bool            mbVisible;
++
++        Member();
++    };
++
++    class CancelButton : public ::CancelButton
++    {
++    public:
++        CancelButton(ScDPFieldPopupWindow* pParent);
++
++        virtual void Click();
++
++    private:
++        ScDPFieldPopupWindow* mpParent;
++    };
++
++    enum SectionType {
++        WHOLE,                // entire window
++        LISTBOX_AREA_OUTER,   // box enclosing the check box items.
++        LISTBOX_AREA_INNER,   // box enclosing the check box items.
++        SINGLE_BTN_AREA,      // box enclosing the single-action buttons.
++        CHECK_TOGGLE_ALL,     // check box for toggling all items.
++        BTN_SINGLE_SELECT,
++        BTN_SINGLE_UNSELECT,
++        BTN_OK,               // OK button
++        BTN_CANCEL,           // Cancel button
++    };
++    void getSectionPosSize(Point& rPos, Size& rSize, SectionType eType) const;
++
++    void setAllMemberState(bool bSet);
++    void selectCurrentMemberOnly(bool bSet);
++    void cycleFocus(bool bReverse = false);
++
++    DECL_LINK( ButtonHdl, Button* );
++    DECL_LINK( TriStateHdl, TriStateBox* );
++    DECL_LINK( CheckHdl, SvTreeListBox* );
++
++private:
++    SvxCheckListBox maChecks;
++
++    TriStateBox     maChkToggleAll;
++    ImageButton     maBtnSelectSingle;
++    ImageButton     maBtnUnselectSingle;
++
++    OKButton        maBtnOk;
++    CancelButton    maBtnCancel;
++
++    ::std::vector<Window*>          maTabStopCtrls;
++    size_t                          mnCurTabStop;
++
++    ::std::vector<Member>           maMembers;
++    ::std::auto_ptr<ExtendedData>   mpExtendedData;
++    ::std::auto_ptr<Action>         mpOKAction;
++
++    const Size      maWndSize;  /// hard-coded window size.
++    TriState mePrevToggleAllState;
++};
++
++#endif
+diff --git sc/source/ui/inc/gridwin.hxx sc/source/ui/inc/gridwin.hxx
+index 914ae51..4013e1a 100644
+--- sc/source/ui/inc/gridwin.hxx
++++ sc/source/ui/inc/gridwin.hxx
+@@ -37,15 +37,19 @@
+ #include "viewdata.hxx"
+ #include "cbutton.hxx"
+ #include <svx/sdr/overlay/overlayobject.hxx>
++#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+ #include <basegfx/matrix/b2dhommatrix.hxx>
+ 
+ #include <vector>
++#include <memory>
+ 
+ // ---------------------------------------------------------------------------
+ 
+ struct ScTableInfo;
+ class ScViewSelectionEngine;
+ class ScDPObject;
++class ScDPFieldPopupWindow;
++class ScDPFieldButton;
+ class ScOutputData;
+ class ScFilterListBox;
+ class AutoFilterPopup;
+@@ -121,6 +125,8 @@ private:
+ 
+     ScFilterListBox*		pFilterBox;
+     FloatingWindow*			pFilterFloat;
++    ::std::auto_ptr<ScDPFieldPopupWindow> mpDPFieldPopup;
++    ::std::auto_ptr<ScDPFieldButton>      mpFilterButton;
+ 
+     USHORT					nCursorHideCount;
+ 
+@@ -187,12 +193,23 @@ private:
+     BOOL			TestMouse( const MouseEvent& rMEvt, BOOL bAction );
+ 
+     BOOL			DoPageFieldSelection( SCCOL nCol, SCROW nRow );
++    bool            DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt );
+     void			DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt );
+ 
+     void			DPMouseMove( const MouseEvent& rMEvt );
+     void			DPMouseButtonUp( const MouseEvent& rMEvt );
+     void			DPTestMouse( const MouseEvent& rMEvt, BOOL bMove );
+ 
++    /** 
++     * Check if the mouse click is on a field popup button. 
++     *  
++     * @return bool true if the field popup menu has been launched and no 
++     *         further mouse event handling is necessary, false otherwise.
++     */
++    bool            DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, ScDPObject* pDPObj);
++    void            DPLaunchFieldPopupMenu(
++        const Point& rScrPos, const Size& rScrSize, const ScAddress& rPos, ScDPObject* pDPObj);
++
+     void			RFMouseMove( const MouseEvent& rMEvt, BOOL bUp );
+ 
+     void			PagebreakMove( const MouseEvent& rMEvt, BOOL bUp );
+@@ -315,9 +332,11 @@ public:
+ 
+     void			DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect );
+     void			DoScenarioMenue( const ScRange& rScenRange );
+-    void			DoPageFieldMenue( SCCOL nCol, SCROW nRow );
+ 
+-    BOOL            HasPageFieldData( SCCOL nCol, SCROW nRow ) const;
++    void            LaunchPageFieldMenu( SCCOL nCol, SCROW nRow );
++    void            LaunchDPFieldMenu( SCCOL nCol, SCROW nRow );
++
++    ::com::sun::star::sheet::DataPilotFieldOrientation GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const;
+ 
+     void			DrawButtons( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
+                                     ScTableInfo& rTabInfo, OutputDevice* pContentDev );
+@@ -357,6 +376,8 @@ public:
+ 
+     void			CheckNeedsRepaint();
+ 
++    void            UpdateDPFromFieldPopupMenu();
++
+     // #114409#
+     void CursorChanged();
+     void DrawLayerCreated();
+diff --git sc/source/ui/inc/pvfundlg.hxx sc/source/ui/inc/pvfundlg.hxx
+index 804f162..1707cd6 100644
+--- sc/source/ui/inc/pvfundlg.hxx
++++ sc/source/ui/inc/pvfundlg.hxx
+@@ -55,6 +55,8 @@
+ #include <sfx2/itemconnect.hxx>
+ #include "pivot.hxx"
+ 
++#include <hash_map>
++
+ // ============================================================================
+ 
+ typedef sfx::ListBoxWrapper< sal_Int32 > ScDPListBoxWrapper;
+@@ -217,6 +219,11 @@ public:
+ 
+     virtual short       Execute();
+ 
++    /** 
++     * @return String internal name of the selected field.  Note that this may 
++     *         be different from the name displayed in the dialog if the field
++     *         has a layout name.
++     */
+     String              GetDimensionName() const;
+ 
+ private:
+@@ -228,6 +235,10 @@ private:
+     OKButton            maBtnOk;
+     CancelButton        maBtnCancel;
+     HelpButton          maBtnHelp;
++
++    typedef ::std::hash_map<String, long, ScStringHashCode> DimNameIndexMap;
++    DimNameIndexMap     maNameIndexMap;
++    ScDPObject&         mrDPObj;
+ };
+ 
+ // ============================================================================
+diff --git sc/source/ui/inc/pvlaydlg.hxx sc/source/ui/inc/pvlaydlg.hxx
+index f94a7ed..2f7e628 100644
+--- sc/source/ui/inc/pvlaydlg.hxx
++++ sc/source/ui/inc/pvlaydlg.hxx
+@@ -193,7 +193,7 @@ private:
+ private:
+     ScDPFieldWindow&        GetFieldWindow  ( ScDPFieldType eType );
+     void                    Init            ();
+-    void                    InitWndSelect   ( LabelData** ppLabelArr, long nLabels );
++    void                    InitWndSelect   ( const ::std::vector<ScDPLabelDataRef>& rLabels );
+     void                    InitWnd         ( PivotField* pArr, long nCount, ScDPFieldType eType );
+     void                    InitFocus       ();
+     void                    InitFields      ();
+diff --git sc/source/ui/undo/undodat.cxx sc/source/ui/undo/undodat.cxx
+index 73ebf38..f4fb524 100644
+--- sc/source/ui/undo/undodat.cxx
++++ sc/source/ui/undo/undodat.cxx
+@@ -1879,7 +1879,7 @@ void __EXPORT ScUndoDataPilot::Undo()
+             else
+             {
+                 //	delete inserted object
+-                pDoc->GetDPCollection()->Free(pDocObj);
++                pDoc->GetDPCollection()->FreeTable(pDocObj);
+             }
+         }
+     }
+@@ -1889,7 +1889,7 @@ void __EXPORT ScUndoDataPilot::Undo()
+ 
+         ScDPObject* pDestObj = new ScDPObject( *pOldDPObject );
+         pDestObj->SetAlive(TRUE);
+-        if ( !pDoc->GetDPCollection()->Insert(pDestObj) )
++		if ( !pDoc->GetDPCollection()->InsertNewTable(pDestObj) )
+         {
+             DBG_ERROR("cannot insert DPObject");
+             DELETEZ( pDestObj );
+diff --git sc/source/ui/unoobj/dapiuno.cxx sc/source/ui/unoobj/dapiuno.cxx
+index a4ec67a..2039ea0 100644
+--- sc/source/ui/unoobj/dapiuno.cxx
++++ sc/source/ui/unoobj/dapiuno.cxx
+@@ -1626,8 +1626,13 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException)
+         if( pDim->IsDataLayout() )
+             aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) );
+         else
+-            aName = pDim->GetLayoutName();
+-    }
++        {                                                            
++            const rtl::OUString* pLayoutName = pDim->GetLayoutName();
++            if (pLayoutName)                                         
++                aName = *pLayoutName;                                 
++            else                                                     
++                aName = pDim->GetName();                              
++        }                                                                }
+     return aName;
+ }
+ 
+@@ -1639,7 +1644,7 @@ void SAL_CALL ScDataPilotFieldObj::setName( const OUString& rName ) throw(Runtim
+     if( pDim && !pDim->IsDataLayout() )
+     {
+         String aName( rName );
+-        pDim->SetLayoutName( &aName );
++        pDim->SetLayoutName(aName);
+         SetDPObject( pDPObj );
+     }
+ }
+@@ -3069,7 +3074,7 @@ Sequence<OUString> SAL_CALL ScDataPilotItemsObj::getElementNames()
+     ScUnoGuard aGuard;
+     Sequence< OUString > aSeq;
+     if( ScDPObject* pDPObj = GetDPObject() )
+-        pDPObj->GetMembers( lcl_GetObjectIndex( pDPObj, maFieldId ), aSeq );
++        pDPObj->GetMemberNames( lcl_GetObjectIndex( pDPObj, maFieldId ), aSeq );
+     return aSeq;
+ }
+ 
+diff --git sc/source/ui/unoobj/miscuno.cxx sc/source/ui/unoobj/miscuno.cxx
+index 0f6a291..0c9122a 100644
+--- sc/source/ui/unoobj/miscuno.cxx
++++ sc/source/ui/unoobj/miscuno.cxx
+@@ -39,6 +39,9 @@
+ #include "unoguard.hxx"
+ 
+ using namespace com::sun::star;
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::uno::Any;
++using ::rtl::OUString;
+ 
+ //------------------------------------------------------------------------
+ 
+@@ -137,6 +140,26 @@ sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XProp
+     return nRet;
+ }
+ 
++// static
++OUString ScUnoHelpFunctions::GetStringProperty(
++    const Reference<beans::XPropertySet>& xProp, const OUString& rName, const OUString& rDefault )
++{
++    OUString aRet = rDefault;
++    if (!xProp.is())
++        return aRet;
++
++    try
++    {
++        Any any = xProp->getPropertyValue(rName);
++        any >>= aRet;
++    }
++    catch (const uno::Exception&)
++    {
++    }
++
++    return aRet;
++}
++
+ //	static
+ sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny )
+ {
+@@ -180,6 +203,20 @@ void ScUnoHelpFunctions::SetBoolInAny( uno::Any& rAny, sal_Bool bValue )
+     rAny.setValue( &bValue, getBooleanCppuType() );
+ }
+ 
++//  static
++void ScUnoHelpFunctions::SetOptionalPropertyValue( 
++    Reference<beans::XPropertySet>& rPropSet, const sal_Char* pPropName, const Any& rVal )
++{
++    try
++    {
++        rPropSet->setPropertyValue(OUString::createFromAscii(pPropName), rVal);
++    }
++    catch (const beans::UnknownPropertyException&)
++    {
++        // ignored - not supported.
++    }
++}
++
+ //------------------------------------------------------------------------
+ 
+ ScIndexEnumeration::ScIndexEnumeration(const uno::Reference<container::XIndexAccess>& rInd,
+diff --git sc/source/ui/view/cellsh2.cxx sc/source/ui/view/cellsh2.cxx
+index d07feb0..90c6883 100644
+--- sc/source/ui/view/cellsh2.cxx
++++ sc/source/ui/view/cellsh2.cxx
+@@ -764,7 +764,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
+                 {
+                     //	select database range or data
+                     pTabViewShell->GetDBData( TRUE, SC_DB_OLD );
+-                    const ScMarkData& rMark = GetViewData()->GetMarkData();
++                    ScMarkData& rMark = GetViewData()->GetMarkData();
+                     if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
+                         pTabViewShell->MarkDataArea( FALSE );
+ 
+@@ -830,6 +830,19 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
+                             ScMarkType eType = GetViewData()->GetSimpleArea(aRange);
+                             if ( (eType & SC_MARK_SIMPLE) == SC_MARK_SIMPLE )
+                             {
++                                // Shrink the range to the data area.
++                                SCCOL nStartCol = aRange.aStart.Col(), nEndCol = aRange.aEnd.Col();
++                                SCROW nStartRow = aRange.aStart.Row(), nEndRow = aRange.aEnd.Row();
++                                if (pDoc->ShrinkToDataArea(aRange.aStart.Tab(), nStartCol, nStartRow, nEndCol, nEndRow))
++                                {
++                                    aRange.aStart.SetCol(nStartCol);
++                                    aRange.aStart.SetRow(nStartRow);
++                                    aRange.aEnd.SetCol(nEndCol);
++                                    aRange.aEnd.SetRow(nEndRow);
++                                    rMark.SetMarkArea(aRange);
++                                    pTabViewShell->MarkRange(aRange);
++                                }
++
+                                 BOOL bOK = TRUE;
+                                 if ( pDoc->HasSubTotalCells( aRange ) )
+                                 {
+diff --git sc/source/ui/view/dbfunc.cxx sc/source/ui/view/dbfunc.cxx
+index b372240..05dce54 100644
+--- sc/source/ui/view/dbfunc.cxx
++++ sc/source/ui/view/dbfunc.cxx
+@@ -107,14 +107,30 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
+ 
+ //	aktuellen Datenbereich fuer Sortieren / Filtern suchen
+ 
+-ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode )
++ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, bool bShrinkToData )
+ {
+     ScDocShell* pDocSh = GetViewData()->GetDocShell();
+     ScDBData* pData = NULL;
+     ScRange aRange;
+     ScMarkType eMarkType = GetViewData()->GetSimpleArea(aRange);
+     if ( eMarkType == SC_MARK_SIMPLE || eMarkType == SC_MARK_SIMPLE_FILTERED )
++    {
++        if (bShrinkToData)
++        {
++            // Shrink the range to only include data area.
++            ScDocument* pDoc = pDocSh->GetDocument();
++            SCCOL nCol1 = aRange.aStart.Col(), nCol2 = aRange.aEnd.Col();
++            SCROW nRow1 = aRange.aStart.Row(), nRow2 = aRange.aEnd.Row();
++            if (pDoc->ShrinkToDataArea(aRange.aStart.Tab(), nCol1, nRow1, nCol2, nRow2))
++            {
++                aRange.aStart.SetCol(nCol1);
++                aRange.aEnd.SetCol(nCol2);
++                aRange.aStart.SetRow(nRow1);
++                aRange.aEnd.SetRow(nRow2);
++            }
++        }
+         pData = pDocSh->GetDBData( aRange, eMode, FALSE );
++    }
+     else if ( eMode != SC_DB_OLD )
+         pData = pDocSh->GetDBData(
+                     ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(),
+diff --git sc/source/ui/view/dbfunc3.cxx sc/source/ui/view/dbfunc3.cxx
+index 4b50b5b..86fc703 100644
+--- sc/source/ui/view/dbfunc3.cxx
++++ sc/source/ui/view/dbfunc3.cxx
+@@ -44,19 +44,17 @@
+ #include <vcl/waitobj.hxx>
+ #include <svtools/zforlist.hxx>
+ #include <sfx2/app.hxx>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
++#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
++#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
+ #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+ #include <com/sun/star/sheet/DataPilotFieldSortMode.hpp>
+-#include <com/sun/star/sheet/MemberResultFlags.hpp>
+-
+-#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+ #include <com/sun/star/sheet/DataPilotTableHeaderData.hpp>
++#include <com/sun/star/sheet/GeneralFunction.hpp>
+ #include <com/sun/star/sheet/MemberResultFlags.hpp>
+-#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
+-#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
+-#include <com/sun/star/sheet/XDrillDownDataSupplier.hpp>
+ #include <com/sun/star/sheet/XDimensionsSupplier.hpp>
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-#include <com/sun/star/container/XNameAccess.hpp>
++#include <com/sun/star/sheet/XDrillDownDataSupplier.hpp>
+ 
+ #include "global.hxx"
+ #include "globstr.hrc"
+@@ -81,9 +79,13 @@
+ #include "patattr.hxx"
+ #include "unonames.hxx"
+ #include "cell.hxx"
++#include "userlist.hxx"
+ 
+ #include <hash_set>
++#include <hash_map>
+ #include <memory>
++#include <list>
++#include <vector>
+ 
+ using namespace com::sun::star;
+ using ::com::sun::star::uno::Any;
+@@ -91,7 +93,16 @@ using ::com::sun::star::uno::Sequence;
+ using ::com::sun::star::uno::Reference;
+ using ::com::sun::star::uno::UNO_QUERY;
+ using ::com::sun::star::beans::XPropertySet;
++using ::com::sun::star::container::XNameAccess;
++using ::com::sun::star::sheet::XDimensionsSupplier;
++using ::rtl::OUString;
++using ::rtl::OUStringHash;
++using ::rtl::OUStringBuffer;
+ using ::std::auto_ptr;
++using ::std::list;
++using ::std::vector;
++using ::std::hash_map;
++using ::std::hash_set;
+ 
+ // STATIC DATA -----------------------------------------------------------
+ 
+@@ -1351,123 +1362,323 @@ void ScDBFunc::UngroupDataPilot()
+     }
+ }
+ 
++static OUString lcl_replaceMemberNameInSubtotal(const OUString& rSubtotal, const OUString& rMemberName)
++{
++    sal_Int32 n = rSubtotal.getLength();
++    const sal_Unicode* p = rSubtotal.getStr();
++    OUStringBuffer aBuf, aWordBuf;
++    for (sal_Int32 i = 0; i < n; ++i)
++    {
++        sal_Unicode c = p[i];
++        if (c == sal_Unicode(' '))
++        {
++            OUString aWord = aWordBuf.makeStringAndClear();
++            if (aWord.equals(rMemberName))
++                aBuf.append(sal_Unicode('?'));
++            else
++                aBuf.append(aWord);
++            aBuf.append(c);
++        }
++        else if (c == sal_Unicode('\\'))
++        {
++            // Escape a backslash character.
++            aWordBuf.append(c);
++            aWordBuf.append(c);
++        }
++        else if (c == sal_Unicode('?'))
++        {
++            // A literal '?' must be escaped with a backslash ('\');
++            aWordBuf.append(sal_Unicode('\\'));
++            aWordBuf.append(c);
++        }
++        else
++            aWordBuf.append(c);
++    }
++
++    if (aWordBuf.getLength() > 0)
++    {
++        OUString aWord = aWordBuf.makeStringAndClear();
++        if (aWord.equals(rMemberName))
++            aBuf.append(sal_Unicode('?'));
++        else
++            aBuf.append(aWord);
++    }
++
++    return aBuf.makeStringAndClear();
++}
++
+ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
+ {
++    using namespace ::com::sun::star::sheet;
++
+     String aNewName( rString );
+ 
+     ScDocument* pDoc = GetViewData()->GetDocument();
+     ScDPObject* pDPObj = pDoc->GetDPAtCursor( rPos.Col(), rPos.Row(), rPos.Tab() );
+-    if ( pDPObj )
++    if (!pDPObj)
++        return;
++
++    String aOldText;
++    pDoc->GetString( rPos.Col(), rPos.Row(), rPos.Tab(), aOldText );
++
++    if ( aOldText == rString )
+     {
+-        String aOldText;
+-        pDoc->GetString( rPos.Col(), rPos.Row(), rPos.Tab(), aOldText );
++        // nothing to do: silently exit
++        return;
++    }
++
++    USHORT nErrorId = 0;
+ 
+-        if ( aOldText == rString )
++    pDPObj->BuildAllDimensionMembers();
++    ScDPSaveData aData( *pDPObj->GetSaveData() );
++    BOOL bChange = FALSE;
++
++    USHORT nOrient = DataPilotFieldOrientation_HIDDEN;
++    long nField = pDPObj->GetHeaderDim( rPos, nOrient );
++    if ( nField >= 0 )
++    {
++        // changing a field title
++        if ( aData.GetExistingDimensionData() )
+         {
+-            // nothing to do: silently exit
+-            return;
+-        }
++            // only group dimensions can be renamed
+ 
+-        USHORT nErrorId = 0;
++            ScDPDimensionSaveData* pDimData = aData.GetDimensionData();
++            ScDPSaveGroupDimension* pGroupDim = pDimData->GetNamedGroupDimAcc( aOldText );
++            if ( pGroupDim )
++            {
++                // valid name: not empty, no existing dimension (group or other)
++                if ( rString.Len() && !pDPObj->IsDimNameInUse(rString) )
++                {
++                    pGroupDim->Rename( aNewName );
+ 
+-        ScDPSaveData aData( *pDPObj->GetSaveData() );
+-        BOOL bChange = FALSE;
++                    // also rename in SaveData to preserve the field settings
++                    ScDPSaveDimension* pSaveDim = aData.GetDimensionByName( aOldText );
++                    pSaveDim->SetName( aNewName );
+ 
+-        USHORT nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
+-        long nField = pDPObj->GetHeaderDim( rPos, nOrient );
+-        if ( nField >= 0 )
++                    bChange = TRUE;
++                }
++                else
++                    nErrorId = STR_INVALIDNAME;
++            }
++        }
++        else if (nOrient == DataPilotFieldOrientation_COLUMN || nOrient == DataPilotFieldOrientation_ROW)
++        {
++            BOOL bDataLayout = false;
++            String aDimName = pDPObj->GetDimName(nField, bDataLayout);
++            ScDPSaveDimension* pDim = bDataLayout ? aData.GetDataLayoutDimension() : aData.GetDimensionByName(aDimName);
++            if (pDim)
++            {
++                if (rString.Len())
++                {
++                    if (rString.EqualsIgnoreCaseAscii(aDimName))
++                    {    
++                        pDim->RemoveLayoutName();
++                        bChange = true;
++                    }
++                    else if (!pDPObj->IsDimNameInUse(rString))
++                    {
++                        pDim->SetLayoutName(rString);
++                        bChange = true;
++                    }
++                    else
++                        nErrorId = STR_INVALIDNAME;
++                }
++                else
++                    nErrorId = STR_INVALIDNAME;
++            }
++        }
++    }
++    else if (pDPObj->IsDataDescriptionCell(rPos))
++    {
++        // There is only one data dimension.
++        ScDPSaveDimension* pDim = aData.GetFirstDimension(sheet::DataPilotFieldOrientation_DATA);
++        if (pDim)
+         {
+-            // changing a field title
++            if (rString.Len())
++            {
++                if (rString.EqualsIgnoreCaseAscii(pDim->GetName()))
++                {
++                    pDim->RemoveLayoutName();
++                    bChange = true;
++                }
++                else if (!pDPObj->IsDimNameInUse(rString))
++                {
++                    pDim->SetLayoutName(rString);
++                    bChange = true;
++                }
++                else
++                    nErrorId = STR_INVALIDNAME;
++            }
++            else
++                nErrorId = STR_INVALIDNAME;
++        }
++    }
++    else
++    {
++        // This is not a field header.
++        sheet::DataPilotTableHeaderData aPosData;
++        pDPObj->GetHeaderPositionData(rPos, aPosData);
+ 
+-            if ( aData.GetExistingDimensionData() )
++        if ( (aPosData.Flags & MemberResultFlags::HASMEMBER) && aOldText.Len() )
++        {
++            if ( aData.GetExistingDimensionData() && !(aPosData.Flags & MemberResultFlags::SUBTOTAL))
+             {
+-                // only group dimensions can be renamed
++                BOOL bIsDataLayout;
++                String aDimName = pDPObj->GetDimName( aPosData.Dimension, bIsDataLayout );
+ 
+                 ScDPDimensionSaveData* pDimData = aData.GetDimensionData();
+-                ScDPSaveGroupDimension* pGroupDim = pDimData->GetNamedGroupDimAcc( aOldText );
++                ScDPSaveGroupDimension* pGroupDim = pDimData->GetNamedGroupDimAcc( aDimName );
+                 if ( pGroupDim )
+                 {
+-                    // valid name: not empty, no existing dimension (group or other)
+-                    if ( aNewName.Len() && !pDPObj->IsDimNameInUse( aNewName ) )
++                    // valid name: not empty, no existing group in this dimension
++                    //! ignore case?
++                    if ( aNewName.Len() && !pGroupDim->GetNamedGroup( aNewName ) )
+                     {
+-                        pGroupDim->Rename( aNewName );
++                        ScDPSaveGroupItem* pGroup = pGroupDim->GetNamedGroupAcc( aOldText );
++                        if ( pGroup )
++                            pGroup->Rename( aNewName );     // rename the existing group
++                        else
++                        {
++                            // create a new group to replace the automatic group
++                            ScDPSaveGroupItem aGroup( aNewName );
++                            aGroup.AddElement( aOldText );
++                            pGroupDim->AddGroupItem( aGroup );
++                        }
+ 
+-                        // also rename in SaveData to preserve the field settings
+-                        ScDPSaveDimension* pSaveDim = aData.GetDimensionByName( aOldText );
+-                        pSaveDim->SetName( aNewName );
++                        // in both cases also adjust savedata, to preserve member settings (show details)
++                        ScDPSaveDimension* pSaveDim = aData.GetDimensionByName( aDimName );
++                        ScDPSaveMember* pSaveMember = pSaveDim->GetExistingMemberByName( aOldText );
++                        if ( pSaveMember )
++                            pSaveMember->SetName( aNewName );
+ 
+                         bChange = TRUE;
+                     }
+                     else
+                         nErrorId = STR_INVALIDNAME;
+-                }
++                 }
+             }
+-        }
+-        else
+-        {
+-            // renaming a group (item)?
+-            // allow only on the item name itself - not on empty cells, not on subtotals
+-
+-            sheet::DataPilotTableHeaderData aPosData;
+-            pDPObj->GetHeaderPositionData(rPos, aPosData);
+-            if ( ( aPosData.Flags & sheet::MemberResultFlags::HASMEMBER ) &&
+-                 ! ( aPosData.Flags & sheet::MemberResultFlags::SUBTOTAL ) &&
+-                 aOldText.Len() )
++            else if ((aPosData.Flags & MemberResultFlags::GRANDTOTAL))
+             {
+-                if ( aData.GetExistingDimensionData() )
++                aData.SetGrandTotalName(rString);
++                bChange = true;
++            }
++            else if (aPosData.Dimension >= 0 && aPosData.MemberName.getLength() > 0)
++            {
++                BOOL bDataLayout = false;
++                String aDimName = pDPObj->GetDimName(static_cast<long>(aPosData.Dimension), bDataLayout);
++                if (bDataLayout)
+                 {
+-                    BOOL bIsDataLayout;
+-                    String aDimName = pDPObj->GetDimName( aPosData.Dimension, bIsDataLayout );
++                    // data dimension
++                    do
++                    {
++                        if ((aPosData.Flags & MemberResultFlags::SUBTOTAL))
++                            break;
++
++                        ScDPSaveDimension* pDim = aData.GetDimensionByName(aPosData.MemberName);
++                        if (!pDim)
++                            break;
+ 
+-                    ScDPDimensionSaveData* pDimData = aData.GetDimensionData();
+-                    ScDPSaveGroupDimension* pGroupDim = pDimData->GetNamedGroupDimAcc( aDimName );
+-                    if ( pGroupDim )
++                        if (!rString.Len())
++                        {
++                            nErrorId = STR_INVALIDNAME;
++                            break;
++                        }
++
++                        if (aPosData.MemberName.equalsIgnoreAsciiCase(rString))
++                        {
++                            pDim->RemoveLayoutName();
++                            bChange = true;
++                        }
++                        else if (!pDPObj->IsDimNameInUse(rString))
++                        {
++                            pDim->SetLayoutName(rString);
++                            bChange = true;
++                        }
++                        else
++                            nErrorId = STR_INVALIDNAME;
++                    }
++                    while (false);
++                }
++                else
++                {
++                    // field member
++                    do
+                     {
+-                        // valid name: not empty, no existing group in this dimension
+-                        //! ignore case?
+-                        if ( aNewName.Len() && !pGroupDim->GetNamedGroup( aNewName ) )
++                        ScDPSaveDimension* pDim = aData.GetDimensionByName(aDimName);
++                        if (!pDim)
++                            break;
++
++                        ScDPSaveMember* pMem = pDim->GetExistingMemberByName(aPosData.MemberName);
++                        if (!pMem)
++                            break;
++
++                        if ((aPosData.Flags & MemberResultFlags::SUBTOTAL))
+                         {
+-                            ScDPSaveGroupItem* pGroup = pGroupDim->GetNamedGroupAcc( aOldText );
+-                            if ( pGroup )
+-                                pGroup->Rename( aNewName );     // rename the existing group
+-                            else
+-                            {
+-                                // create a new group to replace the automatic group
+-                                ScDPSaveGroupItem aGroup( aNewName );
+-                                aGroup.AddElement( aOldText );
+-                                pGroupDim->AddGroupItem( aGroup );
+-                            }
++                            // Change subtotal only when the table has one data dimension.
++                            if (aData.GetDataDimensionCount() > 1)
++                                break;
+ 
+-                            // in both cases also adjust savedata, to preserve member settings (show details)
+-                            ScDPSaveDimension* pSaveDim = aData.GetDimensionByName( aDimName );
+-                            ScDPSaveMember* pSaveMember = pSaveDim->GetExistingMemberByName( aOldText );
+-                            if ( pSaveMember )
+-                                pSaveMember->SetName( aNewName );
++                            // display name for subtotal is allowed only if the subtotal type is 'Automatic'.
++                            if (pDim->GetSubTotalsCount() != 1)
++                                break;
+ 
+-                            bChange = TRUE;
++                            if (pDim->GetSubTotalFunc(0) != sheet::GeneralFunction_AUTO)
++                                break;
++
++                            const OUString* pLayoutName = pMem->GetLayoutName();
++                            String aMemberName;
++                            if (pLayoutName)
++                                aMemberName = *pLayoutName;
++                            else
++                                aMemberName = aPosData.MemberName;
++
++                            String aNew = lcl_replaceMemberNameInSubtotal(rString, aMemberName);
++                            pDim->SetSubtotalName(aNew);
++                            bChange = true;
+                         }
+                         else
+-                            nErrorId = STR_INVALIDNAME;
++                        {
++                            // Check to make sure the member name isn't
++                            // already used.
++                            if (rString.Len())
++                            {
++                                if (rString.EqualsIgnoreCaseAscii(pMem->GetName()))
++                                {
++                                    pMem->RemoveLayoutName();
++                                    bChange = true;
++                                }
++                                else if (!pDim->IsMemberNameInUse(rString))
++                                {
++                                    pMem->SetLayoutName(rString);
++                                    bChange = true;
++                                }
++                                else
++                                    nErrorId = STR_INVALIDNAME;
++                            }
++                            else
++                                nErrorId = STR_INVALIDNAME;
++                        }
+                     }
++                    while (false);
+                 }
+             }
+         }
++    }
+ 
+-        if ( bChange )
+-        {
+-            // apply changes
+-            ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
+-            ScDPObject* pNewObj = new ScDPObject( *pDPObj );
+-            pNewObj->SetSaveData( aData );
+-            aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+-            delete pNewObj;
+-        }
+-        else
+-        {
+-            if ( !nErrorId )
+-                nErrorId = STR_ERR_DATAPILOT_INPUT;
+-            ErrorMessage( nErrorId );
+-        }
++    if ( bChange )
++    {
++        // apply changes
++        ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
++        ScDPObject* pNewObj = new ScDPObject( *pDPObj );
++        pNewObj->SetSaveData( aData );
++        aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
++        delete pNewObj;
++    }
++    else
++    {
++        if ( !nErrorId )
++            nErrorId = STR_ERR_DATAPILOT_INPUT;
++        ErrorMessage( nErrorId );
+     }
+ }
+ 
+@@ -1484,6 +1695,134 @@ void lcl_MoveToEnd( ScDPSaveDimension& rDim, const String& rItemName )
+     // puts it to the end of the list even if it was in the list before.
+ }
+ 
++bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16* pUserListId )
++{
++    ScDocument* pDoc = GetViewData()->GetDocument();
++    ScDPObject* pDPObj = pDoc->GetDPAtCursor(rPos.Col(), rPos.Row(), rPos.Tab());
++    if (!pDPObj)
++        return false;
++
++    // We need to run this to get all members later.
++    pDPObj->BuildAllDimensionMembers();
++
++    USHORT nOrientation;
++    long nDimIndex = pDPObj->GetHeaderDim(rPos, nOrientation);
++    if (nDimIndex < 0)
++        // Invalid dimension index.  Bail out.
++        return false;
++
++    BOOL bDataLayout;
++    ScDPSaveData* pSaveData = pDPObj->GetSaveData();
++    if (!pSaveData)
++        return false;
++
++    ScDPSaveData aNewSaveData(*pSaveData);
++    String aDimName = pDPObj->GetDimName(nDimIndex, bDataLayout);
++    ScDPSaveDimension* pSaveDim = aNewSaveData.GetDimensionByName(aDimName);
++    if (!pSaveDim)
++        return false;
++
++    typedef ScDPSaveDimension::MemberList MemList;
++    const MemList& rDimMembers = pSaveDim->GetMembers();
++    list<OUString> aMembers;
++    hash_set<OUString, ::rtl::OUStringHash> aMemberSet;
++    size_t nMemberCount = 0;
++    for (MemList::const_iterator itr = rDimMembers.begin(), itrEnd = rDimMembers.end();
++          itr != itrEnd; ++itr)
++    {
++        ScDPSaveMember* pMem = *itr;
++        aMembers.push_back(pMem->GetName());
++        aMemberSet.insert(pMem->GetName());
++        ++nMemberCount;
++    }
++
++    // Sort the member list in ascending order.
++    aMembers.sort();
++
++    // Collect and rank those custom sort strings that also exist in the member name list.
++
++    typedef hash_map<OUString, sal_uInt16, OUStringHash> UserSortMap;
++    UserSortMap aSubStrs;
++    sal_uInt16 nSubCount = 0;
++    if (pUserListId)
++    {
++        ScUserList* pUserList = ScGlobal::GetUserList();
++        if (!pUserList)
++            return false;
++    
++        {
++            sal_uInt16 n = pUserList->GetCount();
++            if (!n || *pUserListId >= n)
++                return false;
++        }
++        
++        ScUserListData* pData = static_cast<ScUserListData*>((*pUserList)[*pUserListId]);
++        if (pData)
++        {
++            sal_uInt16 n = pData->GetSubCount();
++            for (sal_uInt16 i = 0; i < n; ++i)
++            {
++                OUString aSub = pData->GetSubStr(i);
++                if (!aMemberSet.count(aSub))
++                    // This string doesn't exist in the member name set.  Don't add this.
++                    continue;
++
++                aSubStrs.insert(UserSortMap::value_type(aSub, nSubCount++));
++            }
++        }
++    }
++
++    // Rank all members.
++
++    vector<OUString> aRankedNames(nMemberCount);
++    sal_uInt16 nCurStrId = 0;
++    for (list<OUString>::const_iterator itr = aMembers.begin(), itrEnd = aMembers.end(); 
++          itr != itrEnd; ++itr)
++    {
++        OUString aName = *itr;
++        sal_uInt16 nRank = 0;
++        UserSortMap::const_iterator itrSub = aSubStrs.find(aName);
++        if (itrSub == aSubStrs.end())
++            nRank = nSubCount + nCurStrId++;
++        else
++            nRank = itrSub->second;
++
++        if (!bAscending)
++            nRank = nMemberCount - nRank - 1;
++
++        aRankedNames[nRank] = aName;
++    }
++
++    // Re-order ScDPSaveMember instances with the new ranks.
++
++    for (vector<OUString>::const_iterator itr = aRankedNames.begin(), itrEnd = aRankedNames.end();
++          itr != itrEnd; ++itr)
++    {
++        const ScDPSaveMember* pOldMem = pSaveDim->GetExistingMemberByName(*itr);
++        if (!pOldMem)
++            // All members are supposed to be present.
++            continue;
++
++        ScDPSaveMember* pNewMem = new ScDPSaveMember(*pOldMem);
++        pSaveDim->AddMember(pNewMem);
++    }
++
++    // Set the sorting mode to manual for now.  We may introduce a new sorting
++    // mode later on.
++
++    sheet::DataPilotFieldSortInfo aSortInfo;
++    aSortInfo.Mode = sheet::DataPilotFieldSortMode::MANUAL;
++    pSaveDim->SetSortInfo(&aSortInfo);
++
++    // Update the datapilot with the newly sorted field members.
++
++    auto_ptr<ScDPObject> pNewObj(new ScDPObject(*pDPObj));
++    pNewObj->SetSaveData(aNewSaveData);
++    ScDBDocFunc aFunc(*GetViewData()->GetDocShell());
++
++    return aFunc.DataPilotUpdate(pDPObj, pNewObj.get(), true, false);
++}
++
+ BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
+ {
+     BOOL bRet = FALSE;
+@@ -1529,7 +1868,7 @@ BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
+ 
+                 // get all member names in source order
+                 uno::Sequence<rtl::OUString> aMemberNames;
+-                pDPObj->GetMembers( aDestData.Dimension, aMemberNames );
++                pDPObj->GetMemberNames( aDestData.Dimension, aMemberNames );
+ 
+                 bool bInserted = false;
+ 
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index 2b65eb8..42b22a6 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -121,6 +121,7 @@
+ #include "validat.hxx"
+ #include "tabprotection.hxx"
+ #include "postit.hxx"
++#include "dpcontrol.hxx"
+ 
+ #include "drawview.hxx"
+ #include <svx/sdrpagewindow.hxx>
+@@ -369,6 +370,8 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic
+             pNoteMarker( NULL ),
+             pFilterBox( NULL ),
+             pFilterFloat( NULL ),
++            mpDPFieldPopup(NULL),
++            mpFilterButton(NULL), 
+             nCursorHideCount( 0 ),
+             bMarking( FALSE ),
+             nButtonDown( 0 ),
+@@ -445,14 +448,26 @@ void __EXPORT ScGridWindow::Resize( const Size& )
+ 
+ void ScGridWindow::ClickExtern()
+ {
+-    // #i81298# don't delete the filter box when called from its select handler
+-    // (possible through row header size update)
+-    // #i84277# when initializing the filter box, a Basic error can deactivate the view
+-    if ( pFilterBox && ( pFilterBox->IsInSelect() || pFilterBox->IsInInit() ) )
+-        return;
++    do
++    {
++        // #i81298# don't delete the filter box when called from its select handler
++        // (possible through row header size update)
++        // #i84277# when initializing the filter box, a Basic error can deactivate the view
++        if ( pFilterBox && ( pFilterBox->IsInSelect() || pFilterBox->IsInInit() ) )
++        {
++            break;
++        }
++    
++        DELETEZ(pFilterBox);
++        DELETEZ(pFilterFloat);
++    }
++    while (false);
+ 
+-    DELETEZ(pFilterBox);
+-    DELETEZ(pFilterFloat);
++    if (mpDPFieldPopup.get())
++    {
++        mpDPFieldPopup->close(false);
++        mpDPFieldPopup.reset();
++    }
+ }
+ 
+ IMPL_LINK( ScGridWindow, PopupModeEndHdl, FloatingWindow*, EMPTYARG )
+@@ -507,7 +522,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelecti
+     }
+ }
+ 
+-void ScGridWindow::DoPageFieldMenue( SCCOL nCol, SCROW nRow )
++void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
+ {
+     //!	merge position/size handling with DoAutoFilterMenue
+ 
+@@ -658,6 +673,22 @@ void ScGridWindow::DoPageFieldMenue( SCCOL nCol, SCROW nRow )
+     CaptureMouse();
+ }
+ 
++void ScGridWindow::LaunchDPFieldMenu( SCCOL nCol, SCROW nRow )
++{
++    SCTAB nTab = pViewData->GetTabNo();
++    ScDPObject* pDPObj = pViewData->GetDocument()->GetDPAtCursor(nCol, nRow, nTab);
++    if (!pDPObj)
++        return;
++
++    // Get the geometry of the cell.
++    Point aScrPos = pViewData->GetScrPos(nCol, nRow, eWhich);
++    long nSizeX, nSizeY;
++    pViewData->GetMergeSizePixel(nCol, nRow, nSizeX, nSizeY);
++    Size aScrSize(nSizeX-1, nSizeY-1);
++
++    DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize, ScAddress(nCol, nRow, nTab), pDPObj);
++}
++
+ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
+ {
+     delete pFilterBox;
+@@ -1619,52 +1650,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
+                                     pDoc->GetAttr( nPosX, nPosY, nTab, ATTR_MERGE_FLAG );
+         if (pAttr->HasAutoFilter())
+         {
+-            Point	aScrPos  = pViewData->GetScrPos(nPosX,nPosY,eWhich);
+-            long	nSizeX;
+-            long	nSizeY;
+-            Point	aDiffPix = aPos;
+-
+-            aDiffPix -= aScrPos;
+-            BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+-            if ( bLayoutRTL )
+-                aDiffPix.X() = -aDiffPix.X();
+-
+-            pViewData->GetMergeSizePixel( nPosX, nPosY, nSizeX, nSizeY );
+-
+-            //	Breite des Buttons ist nicht von der Zellhoehe abhaengig
+-            Size aButSize = aComboButton.GetSizePixel();
+-            long nButWidth  = Min( aButSize.Width(),  nSizeX );
+-            long nButHeight = Min( aButSize.Height(), nSizeY );
+-
+-            if ( aDiffPix.X() >= nSizeX - nButWidth &&
+-                 aDiffPix.Y() >= nSizeY - nButHeight )
+-            {
+-                if ( DoPageFieldSelection( nPosX, nPosY ) )
+-                    return;
+-
+-                BOOL  bFilterActive = IsAutoFilterActive( nPosX, nPosY,
+-                                                          pViewData->GetTabNo() );
+-
+-                aComboButton.SetOptSizePixel();
+-                DrawComboButton( aScrPos, nSizeX, nSizeY, bFilterActive, TRUE );
+-
+-#if 0
+-                if (   bWasFilterBox
+-                    && (SCsCOL)nOldColFBox == nPosX
+-                    && (SCsROW)nOldRowFBox == nPosY )
+-                {
+-                    // Verhindern, dass an gleicher Stelle eine
+-                    // FilterBox geoeffnet wird, wenn diese gerade
+-                    // geloescht wurde
+-
+-                    nMouseStatus = SC_GM_FILTER; // fuer ButtonDraw im MouseButtonUp();
+-                    return;
+-                }
+-#endif
+-                DoAutoFilterMenue( nPosX, nPosY, FALSE );
+-
++            if (DoAutoFilterButton(nPosX, nPosY, rMEvt))
+                 return;
+-            }
+         }
+         if (pAttr->HasButton())
+         {
+@@ -1794,11 +1781,17 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
+     {
+         if ( pFilterBox && pFilterBox->GetMode() == SC_FILTERBOX_FILTER )
+         {
+-            BOOL  bFilterActive = IsAutoFilterActive( pFilterBox->GetCol(), pFilterBox->GetRow(),
+-                pViewData->GetTabNo() );
+-            HideCursor();
+-            aComboButton.Draw( bFilterActive );
+-            ShowCursor();
++            if (mpFilterButton.get())
++            {
++                bool bFilterActive = IsAutoFilterActive(
++                    pFilterBox->GetCol(), pFilterBox->GetRow(), pViewData->GetTabNo() );
++
++                mpFilterButton->setHasHiddenMember(bFilterActive);
++                mpFilterButton->setPopupPressed(false);
++                HideCursor();
++                mpFilterButton->draw();
++                ShowCursor();
++            }
+         }
+         nMouseStatus = SC_GM_NONE;
+         ReleaseMouse();
+@@ -2218,9 +2211,14 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
+             nMouseStatus = SC_GM_NONE;
+             if ( pFilterBox->GetMode() == SC_FILTERBOX_FILTER )
+             {
+-                HideCursor();
+-                aComboButton.Draw( FALSE );
+-                ShowCursor();
++                if (mpFilterButton.get())
++                {
++                    mpFilterButton->setHasHiddenMember(false);
++                    mpFilterButton->setPopupPressed(false);
++                    HideCursor();
++                    mpFilterButton->draw();
++                    ShowCursor();
++                }
+             }
+             ReleaseMouse();
+             pFilterBox->MouseButtonDown( MouseEvent( aRelPos, 1, MOUSE_SIMPLECLICK, MOUSE_LEFT ) );
+diff --git sc/source/ui/view/gridwin2.cxx sc/source/ui/view/gridwin2.cxx
+index 7c59936..f5386d2 100644
+--- sc/source/ui/view/gridwin2.cxx
++++ sc/source/ui/view/gridwin2.cxx
+@@ -55,48 +55,124 @@
+ #include "dpoutput.hxx"		// ScDPPositionData
+ #include "dpshttab.hxx"
+ #include "dbdocfun.hxx"
++#include "dpcontrol.hxx"
++#include "dpcontrol.hrc"
++#include "strload.hxx"
++#include "userlist.hxx"
+ 
+ #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+ #include "scabstdlg.hxx" //CHINA001
+-using namespace com::sun::star;
+ 
++#include <vector>
++#include <hash_map>
++
++using namespace com::sun::star;
++using ::com::sun::star::sheet::DataPilotFieldOrientation;
++using ::std::vector;
++using ::std::auto_ptr;
++using ::std::hash_map;
++using ::rtl::OUString;
++using ::rtl::OUStringHash;
+ 
+ // STATIC DATA -----------------------------------------------------------
+ 
+ // -----------------------------------------------------------------------
+ 
+-BOOL ScGridWindow::HasPageFieldData( SCCOL nCol, SCROW nRow ) const
++DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const
+ {
++    using namespace ::com::sun::star::sheet;
++
+     ScDocument* pDoc = pViewData->GetDocument();
+     SCTAB nTab = pViewData->GetTabNo();
+-    ScDPObject*	pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab);
+-    if ( pDPObj && nCol > 0 )
++    ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab);
++    if (!pDPObj)
++        return DataPilotFieldOrientation_HIDDEN;
++
++    USHORT nOrient = DataPilotFieldOrientation_HIDDEN;
++
++    // Check for page field first.
++    if (nCol > 0)
+     {
+         // look for the dimension header left of the drop-down arrow
+-        USHORT nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
+         long nField = pDPObj->GetHeaderDim( ScAddress( nCol-1, nRow, nTab ), nOrient );
+-        if ( nField >= 0 && nOrient == sheet::DataPilotFieldOrientation_PAGE )
++        if ( nField >= 0 && nOrient == DataPilotFieldOrientation_PAGE )
+         {
+             BOOL bIsDataLayout = FALSE;
+             String aFieldName = pDPObj->GetDimName( nField, bIsDataLayout );
+             if ( aFieldName.Len() && !bIsDataLayout )
+-                return TRUE;
++                return DataPilotFieldOrientation_PAGE;
+         }
+     }
+-    return FALSE;
++
++    nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
++
++    // Now, check for row/column field.
++    long nField = pDPObj->GetHeaderDim(ScAddress(nCol, nRow, nTab), nOrient);
++    if (nField >= 0 && (nOrient == DataPilotFieldOrientation_COLUMN || nOrient == DataPilotFieldOrientation_ROW) )
++    {
++        BOOL bIsDataLayout = FALSE;
++        String aFieldName = pDPObj->GetDimName(nField, bIsDataLayout);
++        if (aFieldName.Len() && !bIsDataLayout)
++            return static_cast<DataPilotFieldOrientation>(nOrient);
++    }
++
++    return DataPilotFieldOrientation_HIDDEN;
+ }
+ 
+ // private method for mouse button handling
+ BOOL ScGridWindow::DoPageFieldSelection( SCCOL nCol, SCROW nRow )
+ {
+-    if ( HasPageFieldData( nCol, nRow ) )
++    if (GetDPFieldOrientation( nCol, nRow ) == sheet::DataPilotFieldOrientation_PAGE)
+     {
+-        DoPageFieldMenue( nCol, nRow );
++        LaunchPageFieldMenu( nCol, nRow );
+         return TRUE;
+     }
+     return FALSE;
+ }
+ 
++bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt )
++{
++    ScDocument* pDoc = pViewData->GetDocument();
++    SCTAB nTab = pViewData->GetTabNo();
++    Point aScrPos  = pViewData->GetScrPos(nCol, nRow, eWhich);
++    Point aDiffPix = rMEvt.GetPosPixel();
++
++    aDiffPix -= aScrPos;
++    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
++    if ( bLayoutRTL )
++        aDiffPix.X() = -aDiffPix.X();
++
++    long nSizeX, nSizeY;
++    pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
++    Size aScrSize(nSizeX-1, nSizeY-1);
++
++    // Check if the mouse cursor is clicking on the popup arrow box.
++    mpFilterButton.reset(new ScDPFieldButton(this, &GetSettings().GetStyleSettings(), &pViewData->GetZoomX(), &pViewData->GetZoomY()));
++    mpFilterButton->setBoundingBox(aScrPos, aScrSize);
++    Point aPopupPos;
++    Size aPopupSize;
++    mpFilterButton->getPopupBoundingBox(aPopupPos, aPopupSize);
++    Rectangle aRec(aPopupPos, aPopupSize);
++    if (aRec.IsInside(rMEvt.GetPosPixel()))
++    {
++        if ( DoPageFieldSelection( nCol, nRow ) )
++            return true;
++
++        bool bFilterActive = IsAutoFilterActive(nCol, nRow, nTab);
++        mpFilterButton->setHasHiddenMember(bFilterActive);
++        mpFilterButton->setDrawBaseButton(false);
++        mpFilterButton->setDrawPopupButton(true);
++        mpFilterButton->setPopupPressed(true);
++        HideCursor();
++        mpFilterButton->draw();
++        ShowCursor();
++        DoAutoFilterMenue(nCol, nRow, false);
++        return true;
++    }
++
++    return false;
++}
++
+ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt )
+ {
+     ScDocument* pDoc = pViewData->GetDocument();
+@@ -114,6 +190,15 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
+             bDPMouse   = TRUE;
+             nDPField   = nField;
+             pDragDPObj = pDPObj;
++
++            if (DPTestFieldPopupArrow(rMEvt, aPos, pDPObj))
++            {    
++                // field name pop up menu has been launched.  Don't activate 
++                // field move.
++                bDPMouse = false;
++                return;
++            }
++
+             DPTestMouse( rMEvt, TRUE );
+             StartTracking();
+         }
+@@ -282,6 +367,223 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
+         pViewData->GetView()->ResetTimer();
+ }
+ 
++bool ScGridWindow::DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, ScDPObject* pDPObj)
++{
++    // Get the geometry of the cell.
++    Point aScrPos = pViewData->GetScrPos(rPos.Col(), rPos.Row(), eWhich);
++    long nSizeX, nSizeY;
++    pViewData->GetMergeSizePixel(rPos.Col(), rPos.Row(), nSizeX, nSizeY);
++    Size aScrSize(nSizeX-1, nSizeY-1);
++
++    // Check if the mouse cursor is clicking on the popup arrow box.
++    ScDPFieldButton aBtn(this, &GetSettings().GetStyleSettings());
++    aBtn.setBoundingBox(aScrPos, aScrSize);
++    Point aPopupPos;
++    Size aPopupSize;
++    aBtn.getPopupBoundingBox(aPopupPos, aPopupSize);
++    Rectangle aRec(aPopupPos, aPopupSize);
++    if (aRec.IsInside(rMEvt.GetPosPixel()))
++    {
++        // Mouse cursor inside the popup arrow box.  Launch the field menu.
++        DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize, rPos, pDPObj);
++        return true;
++    }
++
++    return false;
++}
++
++namespace {
++
++struct DPFieldPopupData : public ScDPFieldPopupWindow::ExtendedData
++{
++    ScPivotParam    maDPParam;
++    ScDPObject*     mpDPObj;
++    long            mnDim;
++};
++
++class DPFieldPopupOKAction : public ScMenuFloatingWindow::Action
++{
++public:
++    explicit DPFieldPopupOKAction(ScGridWindow* p) : 
++        mpGridWindow(p) {}
++
++    virtual void execute()
++    {
++        mpGridWindow->UpdateDPFromFieldPopupMenu();
++    }
++private:
++    ScGridWindow* mpGridWindow;
++};
++
++class PopupSortAction : public ScMenuFloatingWindow::Action
++{
++public:
++    enum SortType { ASCENDING, DESCENDING, CUSTOM };
++
++    explicit PopupSortAction(const ScAddress& rPos, SortType eType, sal_uInt16 nUserListIndex, ScTabViewShell* pViewShell) :
++        maPos(rPos), meType(eType), mnUserListIndex(nUserListIndex), mpViewShell(pViewShell) {}
++
++    virtual void execute()
++    {
++        switch (meType)
++        {
++            case ASCENDING:
++                mpViewShell->DataPilotSort(maPos, true);
++            break;
++            case DESCENDING:
++                mpViewShell->DataPilotSort(maPos, false);
++            break;
++            case CUSTOM:
++                mpViewShell->DataPilotSort(maPos, true, &mnUserListIndex);
++            break;
++            default:
++                ;
++        }
++    }
++
++private:
++    ScAddress       maPos;
++    SortType        meType;
++    sal_uInt16      mnUserListIndex;
++    ScTabViewShell* mpViewShell;
++};
++
++}
++
++void ScGridWindow::DPLaunchFieldPopupMenu(
++    const Point& rScrPos, const Size& rScrSize, const ScAddress& rPos, ScDPObject* pDPObj)
++{
++    // We need to get the list of field members.
++    auto_ptr<DPFieldPopupData> pDPData(new DPFieldPopupData);
++    pDPObj->FillLabelData(pDPData->maDPParam);
++    pDPData->mpDPObj = pDPObj;
++
++    USHORT nOrient;
++    pDPData->mnDim = pDPObj->GetHeaderDim(rPos, nOrient);
++
++    if (pDPData->maDPParam.maLabelArray.size() <= static_cast<size_t>(pDPData->mnDim))
++        // out-of-bound dimension ID.  This should never happen!
++        return;
++
++    const ScDPLabelData& rLabelData = *pDPData->maDPParam.maLabelArray[pDPData->mnDim];
++
++    mpDPFieldPopup.reset(new ScDPFieldPopupWindow(this, pViewData->GetDocument()));
++    mpDPFieldPopup->setName(OUString::createFromAscii("DataPilot field member popup"));
++    mpDPFieldPopup->setExtendedData(pDPData.release());
++    mpDPFieldPopup->setOKAction(new DPFieldPopupOKAction(this));
++    {
++        // Populate field members.
++        size_t n = rLabelData.maMembers.size();
++        mpDPFieldPopup->setMemberSize(n);
++        for (size_t i = 0; i < n; ++i)
++        {
++            const ScDPLabelData::Member& rMem = rLabelData.maMembers[i];
++            mpDPFieldPopup->addMember(rMem.getDisplayName(), rMem.mbVisible);
++        }
++        mpDPFieldPopup->initMembers();
++    }
++
++    vector<OUString> aUserSortNames;
++    ScUserList* pUserList = ScGlobal::GetUserList();
++    if (pUserList)
++    {
++        sal_uInt16 n = pUserList->GetCount();
++        aUserSortNames.reserve(n);
++        for (sal_uInt16 i = 0; i < n; ++i)
++        {
++            ScUserListData* pData = static_cast<ScUserListData*>((*pUserList)[i]);
++            aUserSortNames.push_back(pData->GetString());
++        }
++    }
++
++    // Populate the menus.
++    ScTabViewShell* pViewShell = pViewData->GetViewShell();
++    mpDPFieldPopup->addMenuItem(
++        ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_ASC).GetString(), true, 
++        new PopupSortAction(rPos, PopupSortAction::ASCENDING, 0, pViewShell));
++    mpDPFieldPopup->addMenuItem(
++        ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_DESC).GetString(), true,
++        new PopupSortAction(rPos, PopupSortAction::DESCENDING, 0, pViewShell));
++    ScMenuFloatingWindow* pSubMenu = mpDPFieldPopup->addSubMenuItem(
++        ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_CUSTOM).GetString(), !aUserSortNames.empty());
++
++    if (pSubMenu && !aUserSortNames.empty())
++    {
++        size_t n = aUserSortNames.size();
++        for (size_t i = 0; i < n; ++i)
++        {    
++            pSubMenu->addMenuItem(
++                aUserSortNames[i], true, 
++                new PopupSortAction(rPos, PopupSortAction::CUSTOM, i, pViewShell));
++        }
++    }
++
++    Rectangle aCellRect(rScrPos, rScrSize);
++    const Size& rPopupSize = mpDPFieldPopup->getWindowSize();
++    if (rScrSize.getWidth() > rPopupSize.getWidth())
++    {
++        // If the cell width is larger than the popup window width, launch it 
++        // right-aligned with the cell.
++        long nXOffset = rScrSize.getWidth() - rPopupSize.getWidth();
++        aCellRect.SetPos(Point(rScrPos.X() + nXOffset, rScrPos.Y()));
++    }
++    mpDPFieldPopup->SetPopupModeEndHdl( LINK(this, ScGridWindow, PopupModeEndHdl) );
++    mpDPFieldPopup->StartPopupMode(aCellRect, (FLOATWIN_POPUPMODE_DOWN | FLOATWIN_POPUPMODE_GRABFOCUS));
++}
++
++void ScGridWindow::UpdateDPFromFieldPopupMenu()
++{
++    typedef hash_map<OUString, OUString, OUStringHash> MemNameMapType;
++    typedef hash_map<OUString, bool, OUStringHash> MemVisibilityType;
++
++    if (!mpDPFieldPopup.get())
++        return;
++
++    DPFieldPopupData* pDPData = static_cast<DPFieldPopupData*>(mpDPFieldPopup->getExtendedData());
++    if (!pDPData)
++        return;
++
++    ScDPObject* pDPObj = pDPData->mpDPObj;
++    ScDPObject aNewDPObj(*pDPObj);
++    aNewDPObj.BuildAllDimensionMembers();
++    ScDPSaveData* pSaveData = aNewDPObj.GetSaveData();
++
++    BOOL bIsDataLayout;
++    String aDimName = pDPObj->GetDimName(pDPData->mnDim, bIsDataLayout);
++    ScDPSaveDimension* pDim = pSaveData->GetDimensionByName(aDimName);
++    if (!pDim)
++        return;
++
++    // Build a map of layout names to original names.
++    const ScDPLabelData& rLabelData = *pDPData->maDPParam.maLabelArray[pDPData->mnDim];
++    MemNameMapType aMemNameMap;
++    for (vector<ScDPLabelData::Member>::const_iterator itr = rLabelData.maMembers.begin(), itrEnd = rLabelData.maMembers.end();
++           itr != itrEnd; ++itr)
++        aMemNameMap.insert(MemNameMapType::value_type(itr->maLayoutName, itr->maName));
++
++    // The raw result may contain a mixture of layout names and original names.
++    MemVisibilityType aRawResult;
++    mpDPFieldPopup->getResult(aRawResult);
++
++    MemVisibilityType aResult;
++    for (MemVisibilityType::const_iterator itr = aRawResult.begin(), itrEnd = aRawResult.end(); itr != itrEnd; ++itr)
++    {
++        MemNameMapType::const_iterator itrNameMap = aMemNameMap.find(itr->first);
++        if (itrNameMap == aMemNameMap.end())
++            // This is an original member name.  Use it as-is.
++            aResult.insert(MemVisibilityType::value_type(itr->first, itr->second));
++        else
++        {
++            // This is a layout name.  Get the original member name and use it.
++            aResult.insert(MemVisibilityType::value_type(itrNameMap->second, itr->second));
++        }
++    }
++    pDim->UpdateMemberVisibility(aResult);
++
++    ScDBDocFunc aFunc(*pViewData->GetDocShell());
++    aFunc.DataPilotUpdate(pDPObj, &aNewDPObj, true, false);
++}
++
+ void ScGridWindow::DPMouseMove( const MouseEvent& rMEvt )
+ {
+     DPTestMouse( rMEvt, TRUE );
+diff --git sc/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx
+index 76d6e02..1cd54a2 100644
+--- sc/source/ui/view/gridwin4.cxx
++++ sc/source/ui/view/gridwin4.cxx
+@@ -73,6 +73,7 @@
+ #include "editutil.hxx"
+ #include "inputopt.hxx"
+ #include "fillinfo.hxx"
++#include "dpcontrol.hxx"
+ #include "sc.hrc"
+ #include <vcl/virdev.hxx>
+ 
+@@ -1203,6 +1204,8 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
+ {
+     aComboButton.SetOutputDevice( pContentDev );
+ 
++    ScDPFieldButton aCellBtn(pContentDev, &GetSettings().GetStyleSettings(), &pViewData->GetZoomX(), &pViewData->GetZoomY());
++
+     SCCOL nCol;
+     SCROW nRow;
+     SCSIZE nArrY;
+@@ -1284,14 +1287,14 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
+                     bool bArrowState = bSimpleQuery && bColumnFound;
+                     long	nSizeX;
+                     long	nSizeY;
+-
+                     pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
+-                    aComboButton.SetOptSizePixel();
+-                    DrawComboButton( pViewData->GetScrPos( nCol, nRow, eWhich ),
+-                                     nSizeX, nSizeY, bArrowState );
++					Point aScrPos = pViewData->GetScrPos( nCol, nRow, eWhich );
+ 
+-                    aComboButton.SetPosPixel( aOldPos );	// alten Zustand
+-                    aComboButton.SetSizePixel( aOldSize );	// fuer MouseUp/Down
++                    aCellBtn.setBoundingBox(aScrPos, Size(nSizeX-1, nSizeY-1));
++                    aCellBtn.setDrawBaseButton(false);
++                    aCellBtn.setDrawPopupButton(true);
++                    aCellBtn.setHasHiddenMember(bArrowState);
++                    aCellBtn.draw();
+                 }
+             }
+         }
+@@ -1318,13 +1321,14 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
+                         nPosX -= nSizeX - 2;
+                     }
+ 
+-                    pContentDev->SetLineColor( GetSettings().GetStyleSettings().GetLightColor() );
+-                    pContentDev->DrawLine( Point(nPosX,nPosY), Point(nPosX,nPosY+nSizeY-1) );
+-                    pContentDev->DrawLine( Point(nPosX,nPosY), Point(nPosX+nSizeX-1,nPosY) );
+-                    pContentDev->SetLineColor( GetSettings().GetStyleSettings().GetDarkShadowColor() );
+-                    pContentDev->DrawLine( Point(nPosX,nPosY+nSizeY-1), Point(nPosX+nSizeX-1,nPosY+nSizeY-1) );
+-                    pContentDev->DrawLine( Point(nPosX+nSizeX-1,nPosY), Point(nPosX+nSizeX-1,nPosY+nSizeY-1) );
+-                    pContentDev->SetLineColor( COL_BLACK );
++                    String aStr;
++                    pDoc->GetString(nCol, nRow, nTab, aStr);
++                    aCellBtn.setText(aStr);
++                    aCellBtn.setBoundingBox(Point(nPosX, nPosY), Size(nSizeX-1, nSizeY-1));
++                    aCellBtn.setDrawBaseButton(true);
++                    aCellBtn.setDrawPopupButton(pInfo->bPopupButton);
++                    aCellBtn.setHasHiddenMember(pInfo->bFilterActive);
++                    aCellBtn.draw();
+                 }
+             }
+         }
+diff --git sc/source/ui/view/tabview.cxx sc/source/ui/view/tabview.cxx
+index 917d7ff..925a2b7 100644
+--- sc/source/ui/view/tabview.cxx
++++ sc/source/ui/view/tabview.cxx
+@@ -200,6 +200,8 @@
+ #include "AccessibilityHints.hxx"
+ #include "appoptio.hxx"
+ 
++#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
++
+ #include <string>
+ #include <algorithm>
+ 
+@@ -212,6 +214,8 @@
+ //	fuer Rad-Maus
+ #define SC_DELTA_ZOOM	10
+ 
++using namespace ::com::sun::star;
++
+ // STATIC DATA -----------------------------------------------------------
+ 
+ 
+@@ -2476,7 +2480,7 @@ sal_Bool ScTabView::HasPageFieldDataAtCursor() const
+     SCCOL nCol = aViewData.GetCurX();
+     SCROW nRow = aViewData.GetCurY();
+     if (pWin)
+-        return pWin->HasPageFieldData( nCol, nRow );
++        return pWin->GetDPFieldOrientation( nCol, nRow ) == sheet::DataPilotFieldOrientation_PAGE;
+ 
+     return sal_False;
+ }
+@@ -2486,15 +2490,23 @@ void ScTabView::StartDataSelect()
+     ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()];
+     SCCOL nCol = aViewData.GetCurX();
+     SCROW nRow = aViewData.GetCurY();
+-    if (pWin)
+-    {
+-        //  #i36598# If the cursor is on a page field's data cell,
+-        //  no meaningful input is possible anyway, so this function
+-        //  can be used to select a page field entry.
+ 
+-        if ( pWin->HasPageFieldData( nCol, nRow ) )
+-            pWin->DoPageFieldMenue( nCol, nRow );
+-        else
++    if (!pWin)
++        return;
++
++    switch (pWin->GetDPFieldOrientation(nCol, nRow))
++    {
++        case sheet::DataPilotFieldOrientation_PAGE:
++            //  #i36598# If the cursor is on a page field's data cell,
++            //  no meaningful input is possible anyway, so this function
++            //  can be used to select a page field entry.
++            pWin->LaunchPageFieldMenu( nCol, nRow );
++        break;
++        case sheet::DataPilotFieldOrientation_COLUMN:
++        case sheet::DataPilotFieldOrientation_ROW:
++            pWin->LaunchDPFieldMenu( nCol, nRow );
++        break;
++        default:
+             pWin->DoAutoFilterMenue( nCol, nRow, TRUE );
+     }
+ }
+diff --git sc/util/makefile.mk sc/util/makefile.mk
+index 4fdc5ac..2b56e37 100644
+--- sc/util/makefile.mk
++++ sc/util/makefile.mk
+@@ -58,6 +58,7 @@ RESLIB1LIST=\
+     $(SRS)$/formdlgs.srs \
+     $(SRS)$/pagedlg.srs	\
+     $(SRS)$/navipi.srs	\
++	$(SRS)$/cctrl.srs	\
+     $(SOLARCOMMONRESDIR)$/sfx.srs
+ 
+ RESLIB1NAME=sc
diff --git a/applied_patches/0007-cws-koheidatapilot03-vcl.diff b/applied_patches/0007-cws-koheidatapilot03-vcl.diff
new file mode 100644
index 000000000..7e225554e
--- /dev/null
+++ b/applied_patches/0007-cws-koheidatapilot03-vcl.diff
@@ -0,0 +1,507 @@
+diff --git vcl/inc/vcl/popupmenuwindow.hxx vcl/inc/vcl/popupmenuwindow.hxx
+new file mode 100644
+index 0000000..ef31da0
+--- /dev/null
++++ vcl/inc/vcl/popupmenuwindow.hxx
+@@ -0,0 +1,50 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: floatwin.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef __POPUPMENUWINDOW_HXX__
++#define __POPUPMENUWINDOW_HXX__
++
++#include "vcl/floatwin.hxx"
++
++class VCL_DLLPUBLIC PopupMenuFloatingWindow : public FloatingWindow
++{
++private:
++    struct ImplData;
++    ImplData* mpImplData;
++public:
++    PopupMenuFloatingWindow( Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) );
++    ~PopupMenuFloatingWindow();
++
++    sal_uInt16      GetMenuStackLevel() const;
++    void            SetMenuStackLevel( sal_uInt16 nLevel );
++    bool            IsPopupMenu() const;
++};
++
++#endif
+diff --git vcl/inc/vcl/vclevent.hxx vcl/inc/vcl/vclevent.hxx
+index 8d84666..59163ca 100644
+--- vcl/inc/vcl/vclevent.hxx
++++ vcl/inc/vcl/vclevent.hxx
+@@ -35,11 +35,19 @@
+ #include <tools/rtti.hxx>
+ #include <vcl/dllapi.h>
+ 
++#include <com/sun/star/uno/Reference.hxx>
++
+ #include <list>
+ 
+ class Window;
+ class Menu;
+ 
++namespace com { namespace sun { namespace star {
++    namespace accessibility {
++        class XAccessible;
++    }
++}}}
++
+ #define VCLEVENT_OBJECT_DYING                  1
+ 
+ // VclWindowEvent:
+@@ -239,6 +247,16 @@ public:
+     USHORT GetItemPos() const { return mnPos; }
+ };
+ 
++class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent
++{
++public:
++    VclAccessibleEvent( ULONG n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible );
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const;
++
++private:
++    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible;
++};
++
+ class VCL_DLLPUBLIC VclEventListeners : public std::list<Link>
+ {
+ public:
+diff --git vcl/inc/vcl/window.h vcl/inc/vcl/window.h
+index b81aed8..0e25330 100644
+--- vcl/inc/vcl/window.h
++++ vcl/inc/vcl/window.h
+@@ -358,7 +358,8 @@ public:
+                         mbToolbarFloatingWindow:1,
+                         mbCallHandlersDuringInputDisabled:1,
+                         mbDisableAccessibleLabelForRelation:1,
+-                        mbDisableAccessibleLabeledByRelation:1;
++                        mbDisableAccessibleLabeledByRelation:1,
++                        mbFakeFocusSet:1;
+ 
+     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
+ };
+diff --git vcl/inc/vcl/window.hxx vcl/inc/vcl/window.hxx
+index d927ab0..945f1c5 100644
+--- vcl/inc/vcl/window.hxx
++++ vcl/inc/vcl/window.hxx
+@@ -582,7 +582,7 @@ protected:
+ 
+             void        ImplCallEventListeners( ULONG nEvent, void* pData = NULL );
+             void        CallEventListeners( ULONG nEvent, void* pData = NULL );
+-
++            void        FireVclEvent( VclSimpleEvent* pEvent );
+ 
+     // FIXME: this is a hack to workaround missing layout functionality
+     SAL_DLLPRIVATE void ImplAdjustNWFSizes();
+@@ -899,6 +899,13 @@ public:
+     USHORT              GetGetFocusFlags() const;
+     void				GrabFocusToDocument();
+ 
++    /** 
++     * Set this when you need to act as if the window has focus even if it 
++     * doesn't.  This is necessary for implementing tab stops inside floating
++     * windows, but floating windows don't get focus from the system.
++     */
++    void                SetFakeFocus( bool bFocus );
++
+     BOOL                IsCompoundControl() const;
+     BOOL                HasCompoundControlFocus() const;
+ 
+diff --git vcl/prj/d.lst vcl/prj/d.lst
+index d9c14f4..7ac2c74 100644
+--- vcl/prj/d.lst
++++ vcl/prj/d.lst
+@@ -84,6 +84,7 @@ mkdir: %_DEST%\inc%_EXT%\vcl\plug\vcl
+ ..\inc\vcl\octree.hxx %_DEST%\inc%_EXT%\vcl\octree.hxx
+ ..\inc\vcl\outdev.hxx %_DEST%\inc%_EXT%\vcl\outdev.hxx
+ ..\inc\vcl\pointr.hxx %_DEST%\inc%_EXT%\vcl\pointr.hxx
++..\inc\vcl\popupmenuwindow.hxx %_DEST%\inc%_EXT%\vcl\popupmenuwindow.hxx
+ ..\inc\vcl\print.hxx %_DEST%\inc%_EXT%\vcl\print.hxx
+ ..\inc\vcl\prndlg.hxx %_DEST%\inc%_EXT%\vcl\prndlg.hxx
+ ..\inc\vcl\prntypes.hxx %_DEST%\inc%_EXT%\vcl\prntypes.hxx
+diff --git vcl/source/app/vclevent.cxx vcl/source/app/vclevent.cxx
+index 75ef1ea..fef22ff 100644
+--- vcl/source/app/vclevent.cxx
++++ vcl/source/app/vclevent.cxx
+@@ -34,10 +34,24 @@
+ #include "vcl/vclevent.hxx"
+ #include "vcl/svdata.hxx"
+ 
++#include <com/sun/star/accessibility/XAccessible.hpp>
++
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::accessibility::XAccessible;
++
+ TYPEINIT0(VclSimpleEvent);
+ TYPEINIT1(VclWindowEvent, VclSimpleEvent);
+ TYPEINIT1(VclMenuEvent, VclSimpleEvent);
+ 
++VclAccessibleEvent::VclAccessibleEvent( ULONG n, const Reference<XAccessible>& rxAccessible ) :
++    VclSimpleEvent(n),
++    mxAccessible(rxAccessible) {}
++
++Reference<XAccessible> VclAccessibleEvent::GetAccessible() const
++{
++    return mxAccessible;
++}
++
+ void VclEventListeners::Call( VclSimpleEvent* pEvent ) const
+ {
+     // Copy the list, because this can be destroyed when calling a Link...
+diff --git vcl/source/window/makefile.mk vcl/source/window/makefile.mk
+index 169cf44..d17ea6c 100644
+--- vcl/source/window/makefile.mk
++++ vcl/source/window/makefile.mk
+@@ -69,6 +69,7 @@ SLOFILES= \
+             $(SLO)$/mnemonic.obj	\
+             $(SLO)$/mnemonicengine.obj  \
+             $(SLO)$/msgbox.obj		\
++			$(SLO)$/popupmenuwindow.obj		\
+             $(SLO)$/scrwnd.obj		\
+             $(SLO)$/seleng.obj		\
+             $(SLO)$/split.obj		\
+diff --git vcl/source/window/popupmenuwindow.cxx vcl/source/window/popupmenuwindow.cxx
+new file mode 100644
+index 0000000..869f52b
+--- /dev/null
++++ vcl/source/window/popupmenuwindow.cxx
+@@ -0,0 +1,82 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: floatwin.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_vcl.hxx"
++
++#include "vcl/popupmenuwindow.hxx"
++
++#include <limits>
++
++struct PopupMenuFloatingWindow::ImplData
++{
++    sal_uInt16      mnMenuStackLevel;  // Store the stack level of a popup menu.  0 = top-level menu.
++
++    ImplData();
++    ~ImplData();
++};
++
++PopupMenuFloatingWindow::ImplData::ImplData() :
++    mnMenuStackLevel( ::std::numeric_limits<sal_uInt16>::max() )
++{
++}
++
++PopupMenuFloatingWindow::ImplData::~ImplData()
++{
++}
++
++// ============================================================================
++
++PopupMenuFloatingWindow::PopupMenuFloatingWindow( Window* pParent, WinBits nStyle ) :
++    FloatingWindow(pParent, nStyle),
++    mpImplData(new ImplData)
++{
++}
++
++PopupMenuFloatingWindow::~PopupMenuFloatingWindow()
++{
++    delete mpImplData;
++}
++
++sal_uInt16 PopupMenuFloatingWindow::GetMenuStackLevel() const
++{
++    return mpImplData->mnMenuStackLevel;
++}
++
++void PopupMenuFloatingWindow::SetMenuStackLevel( sal_uInt16 nLevel )
++{
++    mpImplData->mnMenuStackLevel = nLevel;
++}
++
++bool PopupMenuFloatingWindow::IsPopupMenu() const
++{
++    return mpImplData->mnMenuStackLevel != ::std::numeric_limits<sal_uInt16>::max();
++}
++
+diff --git vcl/source/window/window.cxx vcl/source/window/window.cxx
+index 2b14764..4ff4999 100644
+--- vcl/source/window/window.cxx
++++ vcl/source/window/window.cxx
+@@ -690,6 +690,7 @@ void Window::ImplInitWindowData( WindowType nType )
+     mpWindowImpl->mbCallHandlersDuringInputDisabled = FALSE; // TRUE: call event handlers even if input is disabled
+     mpWindowImpl->mbDisableAccessibleLabelForRelation = FALSE; // TRUE: do not set LabelFor relation on accessible objects
+     mpWindowImpl->mbDisableAccessibleLabeledByRelation = FALSE; // TRUE: do not set LabeledBy relation on accessible objects
++    mpWindowImpl->mbFakeFocusSet = FALSE; // TRUE: pretend as if the window has focus.
+ 
+     mbEnableRTL         = Application::GetSettings().GetLayoutRTL();         // TRUE: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
+ }
+@@ -3901,6 +3902,20 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
+     }
+ }
+ 
++static bool IsWindowFocused(const WindowImpl& rWinImpl)
++{
++    if (rWinImpl.mpSysObj)
++        return true;
++
++    if (rWinImpl.mpFrameData->mbHasFocus)
++        return true;
++
++    if (rWinImpl.mbFakeFocusSet)
++        return true;
++
++    return false;
++}
++
+ // -----------------------------------------------------------------------
+ void Window::ImplGrabFocus( USHORT nFlags )
+ {
+@@ -3972,9 +3987,7 @@ void Window::ImplGrabFocus( USHORT nFlags )
+         pFrame = pFrame->mpWindowImpl->mpFrameData->mpNextFrame;
+     }
+ 
+-    BOOL bHasFocus = TRUE;
+-        if ( !mpWindowImpl->mpSysObj && !mpWindowImpl->mpFrameData->mbHasFocus )
+-            bHasFocus = FALSE;
++    bool bHasFocus = IsWindowFocused(*mpWindowImpl);
+ 
+     BOOL bMustNotGrabFocus = FALSE;
+     // #100242#, check parent hierarchy if some floater prohibits grab focus
+@@ -5367,6 +5380,11 @@ void Window::CallEventListeners( ULONG nEvent, void* pData )
+     }
+ }
+ 
++void Window::FireVclEvent( VclSimpleEvent* pEvent )
++{
++    ImplGetSVData()->mpApp->ImplCallEventListeners(pEvent);
++}
++
+ // -----------------------------------------------------------------------
+ 
+ void Window::AddEventListener( const Link& rEventListener )
+@@ -7742,6 +7760,11 @@ void Window::GrabFocusToDocument()
+     }
+ }
+ 
++void Window::SetFakeFocus( bool bFocus )
++{
++    ImplGetWindowImpl()->mbFakeFocusSet = bFocus;
++}
++
+ // -----------------------------------------------------------------------
+ 
+ BOOL Window::HasChildPathFocus( BOOL bSystemWindow ) const
+diff --git vcl/unx/gtk/a11y/atkutil.cxx vcl/unx/gtk/a11y/atkutil.cxx
+index 5206c8c..be6f95e 100644
+--- vcl/unx/gtk/a11y/atkutil.cxx
++++ vcl/unx/gtk/a11y/atkutil.cxx
+@@ -659,7 +659,16 @@ long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
+             static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
+  */
+     case VCLEVENT_MENU_HIGHLIGHT:
+-        handle_menu_highlighted(static_cast< ::VclMenuEvent const * >(pEvent));
++        if (const VclMenuEvent* pMenuEvent = dynamic_cast<const VclMenuEvent*>(pEvent))
++        {
++            handle_menu_highlighted(pMenuEvent);
++        }
++        else if (const VclAccessibleEvent* pAccEvent = dynamic_cast<const VclAccessibleEvent*>(pEvent))
++        {
++            uno::Reference< accessibility::XAccessible > xAccessible = pAccEvent->GetAccessible();
++            if (xAccessible.is())
++                atk_wrapper_focus_tracker_notify_when_idle(xAccessible);
++        }
+         break;
+ 
+     case VCLEVENT_TOOLBOX_HIGHLIGHT:
+diff --git vcl/unx/gtk/a11y/atkwindow.cxx vcl/unx/gtk/a11y/atkwindow.cxx
+index e98a809..23ba24c 100644
+--- vcl/unx/gtk/a11y/atkwindow.cxx
++++ vcl/unx/gtk/a11y/atkwindow.cxx
+@@ -33,6 +33,7 @@
+  
+ #include <plugins/gtk/gtkframe.hxx>
+ #include <vcl/window.hxx>
++#include "vcl/popupmenuwindow.hxx"
+ 
+ #include "atkwindow.hxx"
+ #include "atkwrapper.hxx"
+@@ -108,6 +109,17 @@ init_from_window( AtkObject *accessible, Window *pWindow )
+                     pChild->SetAccessibleRole( AccessibleRole::LABEL );
+                     accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
+                 }
++                else if ( pWindow->GetType() == WINDOW_BORDERWINDOW && pChild->GetType() == WINDOW_FLOATINGWINDOW )
++                {
++                    PopupMenuFloatingWindow* p = dynamic_cast<PopupMenuFloatingWindow*>(pChild);
++                    if (p && p->IsPopupMenu() && p->GetMenuStackLevel() == 0)
++                    {
++                        // This is a top-level menu popup.  Register it.
++                        role = ATK_ROLE_POPUP_MENU;
++                        pChild->SetAccessibleRole( AccessibleRole::POPUP_MENU );
++                        accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
++                    }
++                }
+             }
+             break;
+         }
+@@ -136,6 +148,23 @@ ooo_window_wrapper_real_focus_gtk (GtkWidget *, GdkEventFocus *)
+                                           
+ /*****************************************************************************/
+ 
++static bool
++isChildPopupMenu(Window* pWindow)
++{
++    Window* pChild = pWindow->GetAccessibleChildWindow(0);
++    if (!pChild)
++        return false;
++
++    if (WINDOW_FLOATINGWINDOW != pChild->GetType())
++        return false;
++
++    PopupMenuFloatingWindow* p = dynamic_cast<PopupMenuFloatingWindow*>(pChild);
++    if (!p)
++        return false;
++
++    return p->IsPopupMenu();
++}
++
+ static void
+ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data)
+ {
+@@ -157,8 +186,16 @@ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data)
+              */
+             if( WINDOW_BORDERWINDOW == pWindow->GetType() )
+             {
+-                ooo_wrapper_registry_add( xAccessible, obj );
+-                g_object_set_data( G_OBJECT(obj), "ooo:atk-wrapper-key", xAccessible.get() );
++                if ( isChildPopupMenu(pWindow) )
++                {
++                    AtkObject *child = atk_object_wrapper_new( xAccessible, obj );
++                    ooo_wrapper_registry_add( xAccessible, child );
++                }
++                else
++                {
++                    ooo_wrapper_registry_add( xAccessible, obj );
++                    g_object_set_data( G_OBJECT(obj), "ooo:atk-wrapper-key", xAccessible.get() );
++                }
+             }
+             else
+             {
+diff --git vcl/unx/gtk/a11y/atkwrapper.cxx vcl/unx/gtk/a11y/atkwrapper.cxx
+index 599f283..ac508bd 100644
+--- vcl/unx/gtk/a11y/atkwrapper.cxx
++++ vcl/unx/gtk/a11y/atkwrapper.cxx
+@@ -514,6 +514,60 @@ wrapper_ref_relation_set( AtkObject *atk_obj )
+ 
+ /*****************************************************************************/
+ 
++#if 0
++struct {
++    sal_Int16       value;
++    const sal_Char* name;
++} aStateTypeTable[] = {
++    { accessibility::AccessibleStateType::INVALID, "INVALID" }, 
++    { accessibility::AccessibleStateType::ACTIVE, "ACTIVE" }, 
++    { accessibility::AccessibleStateType::ARMED, "ARMED" }, 
++    { accessibility::AccessibleStateType::BUSY, "BUSY" }, 
++    { accessibility::AccessibleStateType::CHECKED, "CHECKED" }, 
++    { accessibility::AccessibleStateType::DEFUNC, "DEFUNC" }, 
++    { accessibility::AccessibleStateType::EDITABLE, "EDITABLE" }, 
++    { accessibility::AccessibleStateType::ENABLED, "ENABLED" }, 
++    { accessibility::AccessibleStateType::EXPANDABLE, "EXPANDABLE" }, 
++    { accessibility::AccessibleStateType::EXPANDED, "EXPANDED" }, 
++    { accessibility::AccessibleStateType::FOCUSABLE, "FOCUSABLE" }, 
++    { accessibility::AccessibleStateType::FOCUSED, "FOCUSED" }, 
++    { accessibility::AccessibleStateType::HORIZONTAL, "HORIZONTAL" }, 
++    { accessibility::AccessibleStateType::ICONIFIED, "ICONIFIED" }, 
++    { accessibility::AccessibleStateType::INDETERMINATE, "INDETERMINATE" }, 
++    { accessibility::AccessibleStateType::MANAGES_DESCENDANTS, "MANAGES_DESCENDANTS" }, 
++    { accessibility::AccessibleStateType::MODAL, "MODAL" }, 
++    { accessibility::AccessibleStateType::MULTI_LINE, "MULTI_LINE" }, 
++    { accessibility::AccessibleStateType::MULTI_SELECTABLE, "MULTI_SELECTABLE" }, 
++    { accessibility::AccessibleStateType::OPAQUE, "OPAQUE" }, 
++    { accessibility::AccessibleStateType::PRESSED, "PRESSED" }, 
++    { accessibility::AccessibleStateType::RESIZABLE, "RESIZABLE" }, 
++    { accessibility::AccessibleStateType::SELECTABLE, "SELECTABLE" }, 
++    { accessibility::AccessibleStateType::SELECTED, "SELECTED" }, 
++    { accessibility::AccessibleStateType::SENSITIVE, "SENSITIVE" }, 
++    { accessibility::AccessibleStateType::SHOWING, "SHOWING" }, 
++    { accessibility::AccessibleStateType::SINGLE_LINE, "SINGLE_LINE" }, 
++    { accessibility::AccessibleStateType::STALE, "STALE" }, 
++    { accessibility::AccessibleStateType::TRANSIENT, "TRANSIENT" }, 
++    { accessibility::AccessibleStateType::VERTICAL, "VERTICAL" }, 
++    { accessibility::AccessibleStateType::VISIBLE, "VISIBLE" }
++};
++
++static void printStates(const uno::Sequence<sal_Int16>& rStates)
++{
++    sal_Int32 n = rStates.getLength();
++    size_t nTypes = sizeof(aStateTypeTable)/sizeof(aStateTypeTable[0]);
++    for (sal_Int32 i = 0; i < n; ++i)
++    {
++        for (size_t j = 0; j < nTypes; ++j)
++        {
++            if (aStateTypeTable[j].value == rStates[i])
++                printf("%s ", aStateTypeTable[j].name);
++        }
++    }
++    printf("\n");
++}
++#endif
++
+ static AtkStateSet *
+ wrapper_ref_state_set( AtkObject *atk_obj )
+ {
diff --git a/applied_patches/0008-cws-koheidatapilot03-xmloff.diff b/applied_patches/0008-cws-koheidatapilot03-xmloff.diff
new file mode 100644
index 000000000..af2b5a1ed
--- /dev/null
+++ b/applied_patches/0008-cws-koheidatapilot03-xmloff.diff
@@ -0,0 +1,24 @@
+diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
+index 0010b61..a1ac269 100644
+--- xmloff/inc/xmloff/xmltoken.hxx
++++ xmloff/inc/xmloff/xmltoken.hxx
+@@ -516,6 +516,7 @@ namespace xmloff { namespace token {
+         XML_DATA_LABEL_SYMBOL,
+         XML_DATA_LABEL_TEXT,
+         XML_DATA_PILOT_FIELD,
++        XML_DATA_PILOT_GRAND_TOTAL,
+         XML_DATA_PILOT_LEVEL,
+         XML_DATA_PILOT_MEMBER,
+         XML_DATA_PILOT_MEMBERS,
+diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
+index 70319b4..e1357c3 100644
+--- xmloff/source/core/xmltoken.cxx
++++ xmloff/source/core/xmltoken.cxx
+@@ -524,6 +524,7 @@ namespace xmloff { namespace token {
+         TOKEN( "data-label-symbol",               XML_DATA_LABEL_SYMBOL ),
+         TOKEN( "data-label-text",                 XML_DATA_LABEL_TEXT ),
+         TOKEN( "data-pilot-field",                XML_DATA_PILOT_FIELD ),
++        TOKEN( "data-pilot-grand-total",          XML_DATA_PILOT_GRAND_TOTAL ),
+         TOKEN( "data-pilot-level",                XML_DATA_PILOT_LEVEL ),
+         TOKEN( "data-pilot-member",               XML_DATA_PILOT_MEMBER ),
+         TOKEN( "data-pilot-members",              XML_DATA_PILOT_MEMBERS ),
diff --git a/applied_patches/0009-cws-koheicsvimport-filter.diff b/applied_patches/0009-cws-koheicsvimport-filter.diff
new file mode 100644
index 000000000..ea495eea2
--- /dev/null
+++ b/applied_patches/0009-cws-koheicsvimport-filter.diff
@@ -0,0 +1,26 @@
+diff --git filter/source/config/fragments/filters/HTML__StarCalc_.xcu filter/source/config/fragments/filters/HTML__StarCalc_.xcu
+index f691055..876f989 100644
+--- filter/source/config/fragments/filters/HTML__StarCalc_.xcu
++++ filter/source/config/fragments/filters/HTML__StarCalc_.xcu
+@@ -1,6 +1,6 @@
+     <node oor:name="HTML (StarCalc)" oor:op="replace">
+-        <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN</value></prop>
+-        <prop oor:name="UIComponent"/>
++		<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN USEOPTIONS</value></prop>
++		<prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop>
+         <prop oor:name="FilterService"/>
+         <prop oor:name="UserData"><value></value></prop>
+         <prop oor:name="FileFormatVersion"><value>0</value></prop>
+diff --git filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
+index 1a3aa01..9f6735e 100644
+--- filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
++++ filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
+@@ -1,6 +1,6 @@
+     <node oor:name="calc_HTML_WebQuery" oor:op="replace">
+-        <prop oor:name="Flags"><value>IMPORT ALIEN</value></prop>
+-        <prop oor:name="UIComponent"/>
++		<prop oor:name="Flags"><value>IMPORT ALIEN USEOPTIONS</value></prop>
++		<prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop>
+         <prop oor:name="FilterService"/>
+         <prop oor:name="UserData"><value></value></prop>
+         <prop oor:name="FileFormatVersion"><value>0</value></prop>
diff --git a/applied_patches/0010-cws-koheicsvimport-officecfg.diff b/applied_patches/0010-cws-koheicsvimport-officecfg.diff
new file mode 100644
index 000000000..9bf0b52fe
--- /dev/null
+++ b/applied_patches/0010-cws-koheicsvimport-officecfg.diff
@@ -0,0 +1,102 @@
+diff --git officecfg/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+index fd7c52e..ff5a13c 100644
+--- officecfg/registry/schema/org/openoffice/Office/Calc.xcs
++++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+@@ -1019,6 +1019,97 @@
+ 				<value>NULL</value>
+ 			</prop>
+ 		</group>
++        <group oor:name="Dialogs">
++            <info>
++                <desc>Contains the dialogs settings.</desc>
++            </info>
++            <group oor:name="CSVImport">
++                <info>
++                    <desc>Contains setting for Text CSV Import</desc>
++                </info>
++                <prop oor:name="MergeDelimiters" oor:type="xs:boolean">
++                    <info>
++                        <author>muthusuba</author>
++                        <desc>Merge Delimiter check box status</desc>
++                        <label>MergeDelimiters</label>
++                    </info>
++                    <value>false</value>
++                </prop>
++                <prop oor:name="QuotedFieldAsText" oor:type="xs:boolean">
++                    <info>
++                        <author>kyoshida</author>
++                        <desc>If true, quoted field is always imported as text 
++                            with no exception.</desc>
++                        <label>QuotedFieldAsText</label>
++                    </info>
++                    <value>true</value>
++                </prop>
++                <prop oor:name="DetectSpecialNumbers" oor:type="xs:boolean">
++                    <info>
++                        <author>kyoshida</author>
++                        <desc>If true, Calc tries to detect special number format, such as date and scientific notation.</desc>
++                        <label>DetectSpecialNumbers</label>
++                    </info>
++                    <value>false</value>
++                </prop>
++                <prop oor:name="Language" oor:type="xs:int">
++                    <info>
++                        <author>kyoshida</author>
++                        <desc>Language to use for CSV import.  This determines how the numbers are parsed.</desc>
++                        <label>Language</label>
++                    </info>
++                    <value>0</value>
++                </prop>
++                <prop oor:name="Separators" oor:type="xs:string">
++                    <info>
++                        <author>muthusuba</author>
++                        <desc>List of Separators - as a String</desc>
++                        <label>Separators</label>
++                    </info>
++                    <value>;    </value>
++                </prop>
++                <prop oor:name="TextSeparators" oor:type="xs:string">
++                    <info>
++                        <author>muthusuba</author>
++                        <desc>Text Separators</desc>
++                        <label>TextSeparators</label>
++                    </info>
++                    <value>"</value>
++                </prop>
++                <prop oor:name="FixedWidth" oor:type="xs:boolean">
++                    <info>
++                        <author>muthusuba</author>
++                        <desc>Fixed width</desc>
++                        <label>FixedWidth</label>
++                    </info>
++                    <value>false</value>
++                </prop>
++                <prop oor:name="FromRow" oor:type="xs:int">
++                    <info>
++                        <author>muthusuba</author>
++                        <desc>From Row</desc>
++                        <label>FromRow</label>
++                    </info>
++                    <value>1</value>
++                </prop>
++                <prop oor:name="CharSet" oor:type="xs:int">
++                    <info>
++                        <author>muthusuba</author>
++                        <desc>Char Set</desc>
++                        <label>CharSet</label>
++                    </info>
++                    <value>-1</value>
++                </prop>
++                <prop oor:name="FixedWidthList" oor:type="xs:string">
++                    <info>
++                        <author>muthusuba</author>
++                        <desc>Fixed Width List of separators</desc>
++                        <label>FixedWidthList</label>
++                    </info>
++                    <value></value>
++                </prop>
++            </group>
++        </group>
+ 		<group oor:name="Calculate">
+ 			<info>
+ 				<desc>Contains settings that affect cell calculation.</desc>
diff --git a/applied_patches/0011-cws-koheicsvimport-sc.diff b/applied_patches/0011-cws-koheicsvimport-sc.diff
new file mode 100644
index 000000000..e6e0bcf77
--- /dev/null
+++ b/applied_patches/0011-cws-koheicsvimport-sc.diff
@@ -0,0 +1,2677 @@
+diff --git sc/inc/column.hxx sc/inc/column.hxx
+index ec87323..9854109 100644
+--- sc/inc/column.hxx
++++ sc/inc/column.hxx
+@@ -239,7 +239,9 @@ public:
+ 
+                 //	TRUE = Zahlformat gesetzt
+     BOOL		SetString( SCROW nRow, SCTAB nTab, const String& rString,
+-                           formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO );
++						   formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO,
++                           SvNumberFormatter* pFormatter = NULL,
++                           bool bDetectNumberFormat = true );
+     void		SetValue( SCROW nRow, const double& rVal);
+     void		SetError( SCROW nRow, const USHORT nError);
+ 
+diff --git sc/inc/document.hxx sc/inc/document.hxx
+index 14d606e..e41d15c 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -716,7 +716,9 @@ public:
+     SC_DLLPUBLIC void			PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell,
+                             ULONG nFormatIndex, BOOL bForceTab = FALSE);
+                     //	return TRUE = Zahlformat gesetzt
+-    SC_DLLPUBLIC BOOL           SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString );
++    SC_DLLPUBLIC BOOL           SetString(
++        SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
++        SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
+     SC_DLLPUBLIC void           SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal );
+     void 			SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError);
+ 
+diff --git sc/inc/filter.hxx sc/inc/filter.hxx
+index 4e72620..bcb15f1 100644
+--- sc/inc/filter.hxx
++++ sc/inc/filter.hxx
+@@ -42,6 +42,7 @@ class SvStream;
+ class ScAddress;
+ class ScDocument;
+ class ScRange;
++class SvNumberFormatter;
+ 
+ // Return-Werte Im-/Exportfilter	(ULONG)
+ 
+@@ -92,7 +93,9 @@ class ScEEAbsImport {
+     virtual ~ScEEAbsImport() {}
+     virtual ULONG   Read( SvStream& rStream, const String& rBaseURL ) = 0;
+     virtual ScRange GetRange() = 0;
+-    virtual void    WriteToDocument( BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0 ) = 0;
++    virtual void    WriteToDocument( 
++        BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, 
++        SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
+ };
+ 
+ class ScFormatFilterPlugin {
+@@ -109,7 +112,8 @@ class ScFormatFilterPlugin {
+     virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos,
+                  const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
+     virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange ) = 0;
+-    virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE ) = 0;
++    virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, 
++                                   BOOL bCalcWidthHeight = TRUE, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
+ 
+     // various import helpers
+     virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) = 0;
+diff --git sc/inc/optutil.hxx sc/inc/optutil.hxx
+index ae7e8f5..73b29d6 100644
+--- sc/inc/optutil.hxx
++++ sc/inc/optutil.hxx
+@@ -33,6 +33,7 @@
+ 
+ #include <unotools/configitem.hxx>
+ #include <tools/link.hxx>
++#include "scdllapi.h"
+ 
+ 
+ class ScOptionsUtil
+@@ -44,13 +45,13 @@ public:
+ 
+ //	ConfigItem for classes that use items from several sub trees
+ 
+-class ScLinkConfigItem : public utl::ConfigItem
++class SC_DLLPUBLIC ScLinkConfigItem : public utl::ConfigItem
+ {
+     Link	aCommitLink;
+ 
+ public:
+-            ScLinkConfigItem( const rtl::OUString rSubTree );
+-            ScLinkConfigItem( const rtl::OUString rSubTree, sal_Int16 nMode );
++            ScLinkConfigItem( const rtl::OUString& rSubTree );
++            ScLinkConfigItem( const rtl::OUString& rSubTree, sal_Int16 nMode );
+     void	SetCommitLink( const Link& rLink );
+ 
+     virtual void	Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames );
+diff --git sc/inc/sc.hrc sc/inc/sc.hrc
+index 3e0a1f8..d67b625 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -1638,8 +1638,9 @@
+ #define RID_SCDLG_RETYPEPASS            (SC_DIALOGS_START + 150)
+ #define RID_SCDLG_RETYPEPASS_INPUT      (SC_DIALOGS_START + 151)
+ #define RID_POPUP_FILTER                (SC_DIALOGS_START + 152)
++#define RID_SCDLG_TEXT_IMPORT_OPTIONS   (SC_DIALOGS_START + 153)
+ 
+-#define SC_DIALOGS_END                  (SC_DIALOGS_START + 153)
++#define SC_DIALOGS_END                  (SC_DIALOGS_START + 154)
+ 
+ #ifndef STD_MASKCOLOR
+ #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
+diff --git sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx
+index de99888..f5a40ee 100644
+--- sc/inc/scabstdlg.hxx
++++ sc/inc/scabstdlg.hxx
+@@ -41,6 +41,7 @@
+ #include "sc.hrc"
+ #include "global.hxx"
+ #include "pivot.hxx"
++#include "i18npool/lang.h"
+ 
+ #include <tabvwsh.hxx>
+ 
+@@ -297,6 +298,14 @@ class AbstractScImportOptionsDlg : public VclAbstractDialog  //add for ScImportO
+ public:
+     virtual void GetImportOptions( ScImportOptions& rOptions ) const = 0;
+ };
++
++class AbstractScTextImportOptionsDlg : public VclAbstractDialog //add for ScLangChooserDlg
++{
++public:
++    virtual LanguageType GetLanguageType() const = 0;
++    virtual bool IsDateConversionSet() const = 0;
++};
++
+ //-------Scabstract fractory ---------------------------
+ class ScAbstractDialogFactory
+ {
+@@ -307,6 +316,8 @@ public:
+                                                                     SvStream* pInStream, int nId,
+                                                                     sal_Unicode cSep = '\t') = 0;
+ 
++    virtual     AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId ) = 0;
++
+     virtual		AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window*					pParent, //add for ScAutoFormatDlg
+                                                                 ScAutoFormat*				pAutoFormat,
+                                                                 const ScAutoFormatData*    pSelFormatData,
+diff --git sc/inc/stringutil.hxx sc/inc/stringutil.hxx
+new file mode 100644
+index 0000000..4ca8629
+--- /dev/null
++++ sc/inc/stringutil.hxx
+@@ -0,0 +1,56 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: table.hxx,v $
++ * $Revision: 1.35 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_STRINGUTIL_HXX
++#define SC_STRINGUTIL_HXX
++
++#include "rtl/ustring.hxx"
++
++class ScStringUtil
++{
++public:
++    /** 
++     * Check if a given string is a simple decimal number (e.g. 12.345). We 
++     * don't do any elaborate parsing here; we only check for the simplest 
++     * case of decimal number format. 
++     *
++     * @param rStr string to parse
++     * @param dsep decimal separator
++     * @param gsep group separator (aka thousands separator)
++     * @param rVal value of successfully parsed number
++     * 
++     * @return true if the string is a valid number, false otherwise.
++     */
++    static bool parseSimpleNumber(
++        const ::rtl::OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal);
++};
++
++
++#endif
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index 715e119..f8d8609 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -260,7 +260,8 @@ public:
+     void		PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell );
+     void		PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell);
+                 //	TRUE = Zahlformat gesetzt
+-    BOOL		SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString );
++	BOOL		SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
++                           SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
+     void		SetValue( SCCOL nCol, SCROW nRow, const double& rVal );
+     void 		SetError( SCCOL nCol, SCROW nRow, USHORT nError);
+ 
+diff --git sc/source/core/data/column3.cxx sc/source/core/data/column3.cxx
+index b2c954a..242c5c0 100644
+--- sc/source/core/data/column3.cxx
++++ sc/source/core/data/column3.cxx
+@@ -54,6 +54,13 @@
+ #include "markdata.hxx"
+ #include "detfunc.hxx"			// fuer Notizen bei DeleteRange
+ #include "postit.hxx"
++#include "stringutil.hxx"
++
++#include <com/sun/star/i18n/LocaleDataItem.hpp>
++
++using ::com::sun::star::i18n::LocaleDataItem;
++using ::rtl::OUString;
++using ::rtl::OUStringBuffer;
+ 
+ // Err527 Workaround
+ extern const ScFormulaCell* pLastFormulaTreeTop;	// in cellform.cxx
+@@ -1244,7 +1251,8 @@ void ScColumn::StartListeningInArea( SCROW nRow1, SCROW nRow2 )
+ 
+ //	TRUE = Zahlformat gesetzt
+ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+-                          formula::FormulaGrammar::AddressConvention eConv )
++                          formula::FormulaGrammar::AddressConvention eConv,
++                          SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
+ {
+     BOOL bNumFmtSet = FALSE;
+     if (VALIDROW(nRow))
+@@ -1256,7 +1264,8 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+             double nVal;
+             sal_uInt32 nIndex, nOldIndex = 0;
+             sal_Unicode cFirstChar;
+-            SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
++            if (!pFormatter)
++                pFormatter = pDocument->GetFormatTable();
+             SfxObjectShell* pDocSh = pDocument->GetDocumentShell();
+             if ( pDocSh )
+                 bIsLoading = pDocSh->IsLoading();
+@@ -1323,46 +1332,78 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+                     if ( !bIsText )
+                         nIndex = nOldIndex = pFormatter->GetStandardIndex();
+                 }
+-                if ( !bIsText &&
+-                        pFormatter->IsNumberFormat(rString, nIndex, nVal) )
+-                {												// Zahl
+-                    pNewCell = new ScValueCell( nVal );
+-                    if ( nIndex != nOldIndex)
++
++                do
++                {
++                    if (bIsText)
++                        break;
++
++                    if (bDetectNumberFormat)
+                     {
+-                        // #i22345# New behavior: Apply the detected number format only if
+-                        // the old one was the default number, date, time or boolean format.
+-                        // Exception: If the new format is boolean, always apply it.
++                        if (!pFormatter->IsNumberFormat(rString, nIndex, nVal))
++                            break;
+ 
+-                        BOOL bOverwrite = FALSE;
+-                        const SvNumberformat* pOldFormat = pFormatter->GetEntry( nOldIndex );
+-                        if ( pOldFormat )
++                        pNewCell = new ScValueCell( nVal );
++                        if ( nIndex != nOldIndex)
+                         {
+-                            short nOldType = pOldFormat->GetType() & ~NUMBERFORMAT_DEFINED;
+-                            if ( nOldType == NUMBERFORMAT_NUMBER || nOldType == NUMBERFORMAT_DATE ||
+-                                 nOldType == NUMBERFORMAT_TIME || nOldType == NUMBERFORMAT_LOGICAL )
++                            // #i22345# New behavior: Apply the detected number format only if
++                            // the old one was the default number, date, time or boolean format.
++                            // Exception: If the new format is boolean, always apply it.
++
++                            BOOL bOverwrite = FALSE;
++                            const SvNumberformat* pOldFormat = pFormatter->GetEntry( nOldIndex );
++                            if ( pOldFormat )
+                             {
+-                                if ( nOldIndex == pFormatter->GetStandardFormat(
+-                                                    nOldType, pOldFormat->GetLanguage() ) )
++                                short nOldType = pOldFormat->GetType() & ~NUMBERFORMAT_DEFINED;
++                                if ( nOldType == NUMBERFORMAT_NUMBER || nOldType == NUMBERFORMAT_DATE ||
++                                     nOldType == NUMBERFORMAT_TIME || nOldType == NUMBERFORMAT_LOGICAL )
+                                 {
+-                                    bOverwrite = TRUE;      // default of these types can be overwritten
++                                    if ( nOldIndex == pFormatter->GetStandardFormat(
++                                                        nOldType, pOldFormat->GetLanguage() ) )
++                                    {
++                                        bOverwrite = TRUE;      // default of these types can be overwritten
++                                    }
+                                 }
+                             }
+-                        }
+-                        if ( !bOverwrite && pFormatter->GetType( nIndex ) == NUMBERFORMAT_LOGICAL )
+-                        {
+-                            bOverwrite = TRUE;              // overwrite anything if boolean was detected
+-                        }
++                            if ( !bOverwrite && pFormatter->GetType( nIndex ) == NUMBERFORMAT_LOGICAL )
++                            {
++                                bOverwrite = TRUE;              // overwrite anything if boolean was detected
++                            }
+ 
+-                        if ( bOverwrite )
+-                        {
+-                            ApplyAttr( nRow, SfxUInt32Item( ATTR_VALUE_FORMAT,
+-                                (UINT32) nIndex) );
+-                            bNumFmtSet = TRUE;
++                            if ( bOverwrite )
++                            {
++                                ApplyAttr( nRow, SfxUInt32Item( ATTR_VALUE_FORMAT,
++                                    (UINT32) nIndex) );
++                                bNumFmtSet = TRUE;
++                            }
+                         }
+                     }
++                    else
++                    {
++                        // Only check if the string is a regular number.
++                        const LocaleDataWrapper* pLocale = pFormatter->GetLocaleData();
++                        if (!pLocale)
++                            break;
++                        
++                        LocaleDataItem aLocaleItem = pLocale->getLocaleItem();
++                        const OUString& rDecSep = aLocaleItem.decimalSeparator;
++                        const OUString& rGroupSep = aLocaleItem.thousandSeparator;
++                        if (rDecSep.getLength() != 1 || rGroupSep.getLength() != 1)
++                            break;
++
++                        sal_Unicode dsep = rDecSep.getStr()[0];
++                        sal_Unicode gsep = rGroupSep.getStr()[0];
++
++                        if (!ScStringUtil::parseSimpleNumber(rString, dsep, gsep, nVal))
++                            break;
++
++                        pNewCell = new ScValueCell(nVal);
++                    }
+                 }
+-                else											// Text
+-                    pNewCell = new ScStringCell( rString );
++                while (false);
++
++                if (!pNewCell)
++                    pNewCell = new ScStringCell(rString);
+             }
+         }
+ 
+diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
+index efb9693..6d6b8d1 100644
+--- sc/source/core/data/document.cxx
++++ sc/source/core/data/document.cxx
+@@ -2359,10 +2359,11 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT
+ }
+ 
+ 
+-BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString )
++BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
++                            SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
+ {
+-    if ( ValidTab(nTab) && pTab[nTab] )
+-        return pTab[nTab]->SetString( nCol, nRow, nTab, rString );
++	if ( ValidTab(nTab) && pTab[nTab] )
++		return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pFormatter, bDetectNumberFormat );
+     else
+         return FALSE;
+ }
+diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
+index eac760e..29412c2 100644
+--- sc/source/core/data/table2.cxx
++++ sc/source/core/data/table2.cxx
+@@ -846,10 +846,12 @@ void ScTable::PutCell( const ScAddress& rPos, ScBaseCell* pCell )
+ //UNUSED2009-05 }
+ 
+ 
+-BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString )
++BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString, 
++                         SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
+ {
+     if (ValidColRow(nCol,nRow))
+-        return aCol[nCol].SetString( nRow, nTabP, rString );
++        return aCol[nCol].SetString( 
++            nRow, nTabP, rString, pDocument->GetAddressConvention(), pFormatter, bDetectNumberFormat );
+     else
+         return FALSE;
+ }
+diff --git sc/source/core/tool/makefile.mk sc/source/core/tool/makefile.mk
+index ac0aa23..0128310 100644
+--- sc/source/core/tool/makefile.mk
++++ sc/source/core/tool/makefile.mk
+@@ -108,6 +108,7 @@ SLOFILES =  \
+         $(SLO)$/refupdat.obj \
+         $(SLO)$/scmatrix.obj \
+         $(SLO)$/sctictac.obj \
++		$(SLO)$/stringutil.obj \
+         $(SLO)$/subtotal.obj \
+         $(SLO)$/token.obj \
+         $(SLO)$/unitconv.obj \
+@@ -132,6 +133,7 @@ EXCEPTIONSFILES= \
+         $(SLO)$/lookupcache.obj \
+         $(SLO)$/prnsave.obj \
+         $(SLO)$/reftokenhelper.obj \
++		$(SLO)$/stringutil.obj \
+         $(SLO)$/token.obj
+ 
+ # [kh] POWERPC compiler problem
+diff --git sc/source/core/tool/optutil.cxx sc/source/core/tool/optutil.cxx
+index 69e720c..1ee7d04 100644
+--- sc/source/core/tool/optutil.cxx
++++ sc/source/core/tool/optutil.cxx
+@@ -54,12 +54,12 @@ BOOL ScOptionsUtil::IsMetricSystem()
+ 
+ //------------------------------------------------------------------
+ 
+-ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString rSubTree ) :
++ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString& rSubTree ) :
+     ConfigItem( rSubTree )
+ {
+ }
+ 
+-ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString rSubTree, sal_Int16 nMode ) :
++ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString& rSubTree, sal_Int16 nMode ) :
+     ConfigItem( rSubTree, nMode )
+ {
+ }
+diff --git sc/source/core/tool/stringutil.cxx sc/source/core/tool/stringutil.cxx
+new file mode 100644
+index 0000000..ae6247f
+--- /dev/null
++++ sc/source/core/tool/stringutil.cxx
+@@ -0,0 +1,131 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: table.hxx,v $
++ * $Revision: 1.35 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_sc.hxx"
++
++// System - Includes -----------------------------------------------------
++
++#include "stringutil.hxx"
++#include "rtl/ustrbuf.hxx"
++#include "rtl/math.hxx"
++
++using ::rtl::OUString;
++using ::rtl::OUStringBuffer;
++
++bool ScStringUtil::parseSimpleNumber(
++    const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal)
++{
++    if (gsep == 0x00A0)
++        // unicode space to ascii space
++        gsep = 0x0020;
++
++    OUStringBuffer aBuf;
++    sal_Int32 n = rStr.getLength();
++    const sal_Unicode* p = rStr.getStr();
++    sal_Int32 nPosDSep = -1, nPosGSep = -1;
++    sal_uInt32 nDigitCount = 0;
++
++    for (sal_Int32 i = 0; i < n; ++i)
++    {
++        sal_Unicode c = p[i];
++        if (c == 0x00A0)
++            // unicode space to ascii space
++            c = 0x0020;
++
++        if (sal_Unicode('0') <= c && c <= sal_Unicode('9'))
++        {
++            // this is a digit.
++            aBuf.append(c);
++            ++nDigitCount;
++        }
++        else if (c == dsep)
++        {
++            // this is a decimal separator.
++
++            if (nPosDSep >= 0)
++                // a second decimal separator -> not a valid number.
++                return false;
++
++            if (nPosGSep >= 0 && i - nPosGSep != 4)
++                // the number has a group separator and the decimal sep is not
++                // positioned correctly.
++                return false;
++
++            nPosDSep = i;
++            nPosGSep = -1;
++            aBuf.append(c);
++            nDigitCount = 0;
++        }
++        else if (c == gsep)
++        {
++            // this is a group (thousand) separator.
++
++            if (i == 0)
++                // not allowed as the first character.
++                return false;
++
++            if (nPosDSep >= 0)
++                // not allowed after the decimal separator.
++                return false;
++
++            if (nPosGSep >= 0 && nDigitCount != 3)
++                // must be exactly 3 digits since the last group separator.
++                return false;
++
++            nPosGSep = i;
++            nDigitCount = 0;
++        }
++        else if (c == sal_Unicode('-') || c == sal_Unicode('+'))
++        {
++            // A sign must be the first character if it's given.
++            if (i == 0)
++                aBuf.append(c);
++            else
++                return false;
++        }
++        else
++            return false;
++    }
++
++    // finished parsing the number.
++
++    if (nPosGSep >= 0 && nDigitCount != 3)
++        // must be exactly 3 digits since the last group separator.
++        return false;
++
++    rtl_math_ConversionStatus eStatus = rtl_math_ConversionStatus_Ok;
++    sal_Int32 nParseEnd = 0;
++    rVal = ::rtl::math::stringToDouble(aBuf.makeStringAndClear(), dsep, gsep, &eStatus, &nParseEnd);
++    if (eStatus != rtl_math_ConversionStatus_Ok)
++        return false;
++
++    return true;
++}
+diff --git sc/source/filter/html/htmlimp.cxx sc/source/filter/html/htmlimp.cxx
+index 0ae9d9a..a0a0af1 100644
+--- sc/source/filter/html/htmlimp.cxx
++++ sc/source/filter/html/htmlimp.cxx
+@@ -63,13 +63,14 @@
+ //------------------------------------------------------------------------
+ 
+ FltError ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const String& rBaseURL, ScDocument *pDoc,
+-        ScRange& rRange, double nOutputFactor, BOOL bCalcWidthHeight )
++		ScRange& rRange, double nOutputFactor, BOOL bCalcWidthHeight, SvNumberFormatter* pFormatter,
++        bool bConvertDate )
+ {
+     ScHTMLImport aImp( pDoc, rBaseURL, rRange, bCalcWidthHeight );
+     FltError nErr = (FltError) aImp.Read( rStream, rBaseURL );
+     ScRange aR = aImp.GetRange();
+     rRange.aEnd = aR.aEnd;
+-    aImp.WriteToDocument( TRUE, nOutputFactor );
++	aImp.WriteToDocument( TRUE, nOutputFactor, pFormatter, bConvertDate );
+     return nErr;
+ }
+ 
+@@ -137,9 +138,10 @@ void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const String& rName, const
+         delete pRangeData;
+ }
+ 
+-void ScHTMLImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor )
++void ScHTMLImport::WriteToDocument( 
++    BOOL bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate )
+ {
+-    ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor );
++	ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor, pFormatter, bConvertDate );
+ 
+     const ScHTMLParser* pParser = GetParser();
+     const ScHTMLTable* pGlobTable = pParser->GetGlobalTable();
+diff --git sc/source/filter/inc/eeimport.hxx sc/source/filter/inc/eeimport.hxx
+index fef4486..32d7d0a 100644
+--- sc/source/filter/inc/eeimport.hxx
++++ sc/source/filter/inc/eeimport.hxx
+@@ -63,7 +63,9 @@ public:
+     virtual ULONG    Read( SvStream& rStream, const String& rBaseURL );
+     virtual ScRange  GetRange() { return maRange; }
+     virtual void     WriteToDocument( BOOL bSizeColsRows = FALSE,
+-                                      double nOutputFactor = 1.0 );
++                                      double nOutputFactor = 1.0,
++                                      SvNumberFormatter* pFormatter = NULL,
++                                      bool bConvertDate = true );
+ };
+ 
+ #endif
+diff --git sc/source/filter/inc/ftools.hxx sc/source/filter/inc/ftools.hxx
+index 7e71708..5c05b27 100644
+--- sc/source/filter/inc/ftools.hxx
++++ sc/source/filter/inc/ftools.hxx
+@@ -522,7 +522,9 @@ class ScFormatFilterPluginImpl : public ScFormatFilterPlugin {
+     virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos,
+                  const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL );
+     virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange );
+-    virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE );
++    virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, 
++                                   double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE, 
++                                   SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true );
+ 
+     virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange );
+     virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, BOOL bCalcWidthHeight );
+diff --git sc/source/filter/inc/htmlimp.hxx sc/source/filter/inc/htmlimp.hxx
+index 9314458..a20e044 100644
+--- sc/source/filter/inc/htmlimp.hxx
++++ sc/source/filter/inc/htmlimp.hxx
+@@ -45,7 +45,8 @@ public:
+     virtual ~ScHTMLImport();
+     const ScHTMLParser* GetParser() const { return (ScHTMLParser*)mpParser; }
+ 
+-    virtual void		WriteToDocument( BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0 );
++	virtual void		WriteToDocument( BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, 
++                                         SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true );
+ 
+     static String		GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName );
+ };
+diff --git sc/source/filter/rtf/eeimpars.cxx sc/source/filter/rtf/eeimpars.cxx
+index 872b0a5..e78e371 100644
+--- sc/source/filter/rtf/eeimpars.cxx
++++ sc/source/filter/rtf/eeimpars.cxx
+@@ -129,7 +129,7 @@ ULONG ScEEImport::Read( SvStream& rStream, const String& rBaseURL )
+ }
+ 
+ 
+-void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor )
++void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate )
+ {
+     ScProgress* pProgress = new ScProgress( mpDoc->GetDocumentShell(),
+         ScGlobal::GetRscString( STR_LOAD_DOC ), mpParser->Count() );
+@@ -150,7 +150,8 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor )
+     nLastMergedRow = SCROW_MAX;
+     BOOL bHasGraphics = FALSE;
+     ScEEParseEntry* pE;
+-    SvNumberFormatter* pFormatter = mpDoc->GetFormatTable();
++    if (!pFormatter)
++        pFormatter = mpDoc->GetFormatTable();
+     bool bNumbersEnglishUS = (pFormatter->GetLanguage() != LANGUAGE_ENGLISH_US);
+     if (bNumbersEnglishUS)
+     {
+@@ -335,7 +336,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor )
+                 else if ( !pE->aSel.HasRange() )
+                 {
+                     // maybe ALT text of IMG or similar
+-                    mpDoc->SetString( nCol, nRow, nTab, pE->aAltText );
++                    mpDoc->SetString( nCol, nRow, nTab, pE->aAltText, pFormatter );
+                     // wenn SelRange komplett leer kann nachfolgender Text im gleichen Absatz liegen!
+                 }
+                 else
+@@ -380,7 +381,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor )
+                     if (bNumbersEnglishUS && !bEnUsRecognized)
+                         mpDoc->PutCell( nCol, nRow, nTab, new ScStringCell( aStr));
+                     else
+-                        mpDoc->SetString( nCol, nRow, nTab, aStr );
++                        mpDoc->SetString( nCol, nRow, nTab, aStr, pFormatter, bConvertDate );
+                 }
+             }
+             else
+diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx
+index 219a657..e7a109b 100644
+--- sc/source/ui/attrdlg/scdlgfact.cxx
++++ sc/source/ui/attrdlg/scdlgfact.cxx
+@@ -74,6 +74,7 @@
+ #include "validate.hxx" //add for ScValidationDlg
+ #include "validate.hrc" //add for ScValidationDlg
+ #include "sortdlg.hxx" //add for ScSortDlg
++#include "textimportoptions.hxx"
+ #include "opredlin.hxx" //add for  ScRedlineOptionsTabPage
+ #include "tpcalc.hxx" //add for ScTpCalcOptions
+ #include "tpprint.hxx" //add for ScTpPrintOptions
+@@ -119,6 +120,7 @@ IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl); //add for ScNewScenarioDlg
+ IMPL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl); //add for ScShowTabDlg
+ IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl); //add for ScStringInputDlg
+ IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl); //add for ScImportOptionsDlg
++IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
+ IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
+ 
+ // AbstractTabDialog_Impl begin
+@@ -624,6 +626,20 @@ void AbstractScImportOptionsDlg_Impl::GetImportOptions( ScImportOptions& rOption
+     pDlg->GetImportOptions(rOptions);
+ }
+ // add for AbstractScImportOptionsDlg_Impl end
++
++//add for AbstractScLangChooserDlg_Impl begin
++LanguageType AbstractScTextImportOptionsDlg_Impl::GetLanguageType() const
++{
++    return pDlg->getLanguageType();
++}
++
++bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
++{
++    return pDlg->isDateConversionSet();
++}
++
++//add for AbstractScLangChooserDlg_Impl end
++
+ // =========================Factories  for createdialog ===================
+ 
+ //add for ScImportAsciiDlg begin
+@@ -646,6 +662,21 @@ AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg
+ }
+ // ScImportAsciiDlg end
+ 
++AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg( Window* pParent, int nId )
++{
++    ScTextImportOptionsDlg* pDlg = NULL;
++    switch (nId)
++    {
++        case RID_SCDLG_TEXT_IMPORT_OPTIONS:
++            pDlg = new ScTextImportOptionsDlg(pParent);
++        break;
++        default:
++            ;
++    }
++
++    return pDlg ? new AbstractScTextImportOptionsDlg_Impl(pDlg) : NULL;
++}
++
+ //add for ScAutoFormatDlg begin
+ 
+ AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window*					pParent, //add for ScAutoFormatDlg
+diff --git sc/source/ui/attrdlg/scdlgfact.hxx sc/source/ui/attrdlg/scdlgfact.hxx
+index 6891530..933ae07 100644
+--- sc/source/ui/attrdlg/scdlgfact.hxx
++++ sc/source/ui/attrdlg/scdlgfact.hxx
+@@ -65,6 +65,7 @@ class ScStringInputDlg;
+ class ScImportOptionsDlg;
+ class SfxTabDialog;
+ class ScSortWarningDlg;
++class ScTextImportOptionsDlg;
+ 
+ #define DECL_ABSTDLG_BASE(Class,DialogClass)		\
+     DialogClass* 		pDlg;                   	\
+@@ -350,6 +351,13 @@ class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg  //add
+     virtual void GetImportOptions( ScImportOptions& rOptions ) const;
+ };
+ 
++class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDlg
++{
++    DECL_ABSTDLG_BASE( AbstractScTextImportOptionsDlg_Impl, ScTextImportOptionsDlg)
++    virtual LanguageType GetLanguageType() const;
++    virtual bool IsDateConversionSet() const;
++};
++
+ //add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
+ class AbstractTabDialog_Impl : public SfxAbstractTabDialog
+ {
+@@ -391,6 +399,8 @@ public:
+                                                                     SvStream* pInStream, int nId,
+                                                                     sal_Unicode cSep = '\t');
+ 
++    virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId );
++
+     virtual		AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window*					pParent, //add for ScAutoFormatDlg
+                                                                 ScAutoFormat*				pAutoFormat,
+                                                                 const ScAutoFormatData*    pSelFormatData,
+diff --git sc/source/ui/dbgui/asciiopt.cxx sc/source/ui/dbgui/asciiopt.cxx
+index 8b385c2..6b26dee 100644
+--- sc/source/ui/dbgui/asciiopt.cxx
++++ sc/source/ui/dbgui/asciiopt.cxx
+@@ -56,8 +56,11 @@ ScAsciiOptions::ScAsciiOptions() :
+     bFixedLen		( FALSE ),
+     aFieldSeps		( ';' ),
+     bMergeFieldSeps	( FALSE ),
++    bQuotedFieldAsText(false),
++    bDetectSpecialNumber(false),
+     cTextSep		( cDefaultTextSep ),
+     eCharSet		( gsl_getSystemTextEncoding() ),
++    eLang           ( LANGUAGE_SYSTEM ),
+     bCharSetSystem	( FALSE ),
+     nStartRow		( 1 ),
+     nInfoCount		( 0 ),
+@@ -71,8 +74,11 @@ ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) :
+     bFixedLen		( rOpt.bFixedLen ),
+     aFieldSeps		( rOpt.aFieldSeps ),
+     bMergeFieldSeps	( rOpt.bMergeFieldSeps ),
++    bQuotedFieldAsText(rOpt.bQuotedFieldAsText),
++    bDetectSpecialNumber(rOpt.bDetectSpecialNumber),
+     cTextSep		( rOpt.cTextSep ),
+     eCharSet		( rOpt.eCharSet ),
++    eLang           ( rOpt.eLang ),
+     bCharSetSystem	( rOpt.bCharSetSystem ),
+     nStartRow		( rOpt.nStartRow ),
+     nInfoCount		( rOpt.nInfoCount )
+@@ -155,6 +161,7 @@ ScAsciiOptions&	ScAsciiOptions::operator=( const ScAsciiOptions& rCpy )
+     bFixedLen		= rCpy.bFixedLen;
+     aFieldSeps		= rCpy.aFieldSeps;
+     bMergeFieldSeps	= rCpy.bMergeFieldSeps;
++    bQuotedFieldAsText = rCpy.bQuotedFieldAsText;
+     cTextSep		= rCpy.cTextSep;
+     eCharSet		= rCpy.eCharSet;
+     bCharSetSystem	= rCpy.bCharSetSystem;
+@@ -169,6 +176,7 @@ BOOL ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
+     if ( bFixedLen		 == rCmp.bFixedLen &&
+          aFieldSeps		 == rCmp.aFieldSeps &&
+          bMergeFieldSeps == rCmp.bMergeFieldSeps &&
++         bQuotedFieldAsText == rCmp.bQuotedFieldAsText &&
+          cTextSep		 == rCmp.cTextSep &&
+          eCharSet		 == rCmp.eCharSet &&
+          bCharSetSystem  == rCmp.bCharSetSystem &&
+@@ -248,13 +256,20 @@ void ScAsciiOptions::ReadFromString( const String& rString )
+         eCharSet = ScGlobal::GetCharsetValue( aToken );
+     }
+ 
++    // Language
++    if (nCount >= 4)
++    {    
++        aToken = rString.GetToken(3, ',');
++        eLang = static_cast<LanguageType>(aToken.ToInt32());
++    }
++
+         //
+         //	Startzeile
+         //
+ 
+-    if ( nCount >= 4 )
++    if ( nCount >= 5 )
+     {
+-        aToken = rString.GetToken(3,',');
++        aToken = rString.GetToken(4,',');
+         nStartRow = aToken.ToInt32();
+     }
+ 
+@@ -262,12 +277,12 @@ void ScAsciiOptions::ReadFromString( const String& rString )
+         //	Spalten-Infos
+         //
+ 
+-    if ( nCount >= 5 )
++    if ( nCount >= 6 )
+     {
+         delete[] pColStart;
+         delete[] pColFormat;
+ 
+-        aToken = rString.GetToken(4,',');
++        aToken = rString.GetToken(5,',');
+         nSub = aToken.GetTokenCount('/');
+         nInfoCount = nSub / 2;
+         if (nInfoCount)
+@@ -286,6 +301,20 @@ void ScAsciiOptions::ReadFromString( const String& rString )
+             pColFormat = NULL;
+         }
+     }
++
++    // Import quoted field as text.
++    if (nCount >= 7)
++    {
++        aToken = rString.GetToken(6, ',');
++        bQuotedFieldAsText = aToken.EqualsAscii("true") ? true : false;
++    }
++
++    // Detect special nubmers.
++    if (nCount >= 8)
++    {
++        aToken = rString.GetToken(7, ',');
++        bDetectSpecialNumber = aToken.EqualsAscii("true") ? true : false;
++    }
+ }
+ 
+ 
+@@ -336,6 +365,10 @@ String ScAsciiOptions::WriteToString() const
+         aOutStr += ScGlobal::GetCharsetString( eCharSet );
+     aOutStr += ',';					// Token-Ende
+ 
++    // Language
++    aOutStr += String::CreateFromInt32(eLang);
++    aOutStr += ',';
++
+         //
+         //	Startzeile
+         //
+@@ -357,6 +390,15 @@ String ScAsciiOptions::WriteToString() const
+         aOutStr += String::CreateFromInt32(pColFormat[nInfo]);
+     }
+ 
++    aOutStr += ',';
++
++    // Import quoted field as text.
++    aOutStr += String::CreateFromAscii(bQuotedFieldAsText ? "true" : "false");
++    aOutStr += ',';
++
++    // Detect special nubmers.
++    aOutStr += String::CreateFromAscii(bDetectSpecialNumber ? "true" : "false");
++
+     return aOutStr;
+ }
+ 
+diff --git sc/source/ui/dbgui/asciiopt.hrc sc/source/ui/dbgui/asciiopt.hrc
+index 2dcfe00..6fde4ee 100644
+--- sc/source/ui/dbgui/asciiopt.hrc
++++ sc/source/ui/dbgui/asciiopt.hrc
+@@ -29,31 +29,46 @@
+  ************************************************************************/
+ #include "sc.hrc"
+ //#define RID_SCDLG_ASCII 256
+-#define RB_SEPARATED 1
+-#define RB_FIXED 2
+-#define FT_CHARSET 3
+-#define LB_CHARSET 4
+-#define FL_SEPOPT 5
+-#define FT_FIELDSEP 6
+-#define CB_FIELDSEP 7
+-#define FT_TEXTSEP 8
+-#define CB_TEXTSEP 9
+-#define FL_FIELDOPT 10
+-#define FT_TYPE 12
+-#define FT_PREVIEW 13
+-#define LB_TYPE1 23
+-#define FL_WIDTH 30
+-#define BTN_OK 31
+-#define BTN_CANCEL 32
+-#define BTN_HELP 33
+-#define CTR_TABLEBOX 41
+-#define CKB_TAB 51
+-#define CKB_SPACE 52
+-#define CKB_SEMICOLON 53
+-#define CKB_COMMA 54
+-#define CKB_OTHER 55
+-#define ED_OTHER 56
+-#define FT_AT_ROW 59
+-#define NF_AT_ROW 60
+-#define CB_ASONCE 90
+-#define STR_TEXTTOCOLUMNS 100
++#define BTN_OK                      1 
++#define BTN_CANCEL                  2 
++#define BTN_HELP                    3 
++
++#define FL_FIELDOPT                 4 
++#define FT_CHARSET                  5 
++#define LB_CHARSET                  6 
++#define FT_CUSTOMLANG               7 
++#define LB_CUSTOMLANG               8 
++#define FT_AT_ROW                   9 
++#define NF_AT_ROW                   10
++
++#define FL_SEPOPT                   11
++#define RB_FIXED                    12
++#define RB_SEPARATED                13
++#define CKB_TAB                     14
++#define CKB_COMMA                   15
++#define CKB_OTHER                   16
++#define ED_OTHER                    17
++#define CKB_SEMICOLON               18
++#define CKB_SPACE                   19
++#define CB_ASONCE                   20
++#define CB_TEXTSEP                  21
++#define FT_TEXTSEP                  22
++
++#define FL_OTHER_OPTIONS            23
++#define CB_QUOTED_AS_TEXT           24
++#define CB_DETECT_SPECIAL_NUMBER    25
++
++#define FL_WIDTH                    26
++#define FT_TYPE                     27
++#define LB_TYPE1                    28
++#define CTR_TABLEBOX                29
++#define STR_TEXTTOCOLUMNS           30
++                                    
++                                    
++                                    
++                                    
++                                    
++                                    
++                                    
++                                    
++                                    
+diff --git sc/source/ui/dbgui/asciiopt.src sc/source/ui/dbgui/asciiopt.src
+index a01e819..2d8a7f9 100644
+--- sc/source/ui/dbgui/asciiopt.src
++++ sc/source/ui/dbgui/asciiopt.src
+@@ -34,55 +34,44 @@ ModalDialog RID_SCDLG_ASCII
+ {
+     OutputSize = TRUE ;
+     SVLook = TRUE ;
+-    Size = MAP_APPFONT ( 320 , 247 ) ;
++    Size = MAP_APPFONT ( 320 , 305 ) ;
+     Text [ en-US ] = "Text Import" ;
+     Moveable = TRUE ;
+-    FixedLine FL_WIDTH
+-    {
+-        Pos = MAP_APPFONT ( 6 , 132 ) ;
+-        Size = MAP_APPFONT ( 252 , 8 ) ;
+-        Text [ en-US ] = "Fields" ;
+-    };
+-    FixedText FT_TYPE
++
++    OKButton BTN_OK
+     {
+-        Pos = MAP_APPFONT ( 12 , 145 ) ;
+-        Size = MAP_APPFONT ( 60 , 8 ) ;
+-        Text [ en-US ] = "Column t~ype";
++        Pos = MAP_APPFONT ( 264 , 6 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
++		TabStop = TRUE ;
++        DefButton = TRUE ;
+     };
+-    ListBox LB_TYPE1
++    CancelButton BTN_CANCEL
+     {
+-        Pos = MAP_APPFONT ( 76 , 143 ) ;
+-        Size = MAP_APPFONT ( 60 , 68 ) ;
++        Pos = MAP_APPFONT ( 264 , 23 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
+         TabStop = TRUE ;
+-        DropDown = TRUE ;
+     };
+-    FixedLine FL_SEPOPT
+-    {
+-        Pos = MAP_APPFONT ( 6 , 48 ) ;
+-        Size = MAP_APPFONT ( 252 , 8 ) ;
+-        Text [ en-US ] = "Separator options" ;
+-    };
+-    RadioButton RB_FIXED
++    HelpButton BTN_HELP
+     {
+-        Pos = MAP_APPFONT ( 12 , 59 ) ;
+-        Size = MAP_APPFONT ( 243 , 10 ) ;
+-        Text [ en-US ] = "~Fixed width" ;
++        Pos = MAP_APPFONT ( 264 , 43 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
+         TabStop = TRUE ;
+     };
+-    RadioButton RB_SEPARATED
++
++    FixedLine FL_FIELDOPT
+     {
+-        Pos = MAP_APPFONT ( 12 , 73 ) ;
+-        Size = MAP_APPFONT ( 243 , 10 ) ;
+-        Text [ en-US ] = "~Separated by" ;
+-        TabStop = TRUE ;
+-        Check = TRUE ;
++        Pos = MAP_APPFONT ( 6 , 3 ) ;
++        Size = MAP_APPFONT ( 252 , 8 ) ;
++        Text [ en-US ] = "Import" ;
+     };
++
+     FixedText FT_CHARSET
+     {
+         Pos = MAP_APPFONT ( 12 , 16 ) ;
+         Size = MAP_APPFONT ( 60 , 8 ) ;
+         Text [ en-US ] = "Ch~aracter set" ;
+     };
++
+     ListBox LB_CHARSET
+     {
+         Pos = MAP_APPFONT ( 76 , 14 ) ;
+@@ -91,75 +80,81 @@ ModalDialog RID_SCDLG_ASCII
+         DropDown = TRUE ;
+         Sort = TRUE;
+     };
+-    FixedLine FL_FIELDOPT
+-    {
+-        Pos = MAP_APPFONT ( 6 , 3 ) ;
+-        Size = MAP_APPFONT ( 252 , 8 ) ;
+-        Text [ en-US ] = "Import" ;
+-    };
+-    FixedText FT_TEXTSEP
++
++    FixedText FT_CUSTOMLANG
+     {
+-        Pos = MAP_APPFONT ( 156 , 114 ) ;
++        Pos = MAP_APPFONT ( 12 , 32 ) ;
+         Size = MAP_APPFONT ( 60 , 8 ) ;
+-        Text [ en-US ] = "Te~xt delimiter" ;
++        Text [ en-US ] = "Language" ;
+     };
+-    ComboBox CB_TEXTSEP
++
++    ListBox LB_CUSTOMLANG
+     {
+-        Pos = MAP_APPFONT ( 218 , 112 ) ;
+-        Size = MAP_APPFONT ( 37 , 94 ) ;
++        Pos = MAP_APPFONT ( 76 , 30 ) ;
++        Size = MAP_APPFONT ( 130 , 61 ) ;
+         TabStop = TRUE ;
+         DropDown = TRUE ;
++        Sort = TRUE;
+     };
+-    OKButton BTN_OK
++
++    FixedText FT_AT_ROW
+     {
+-        Pos = MAP_APPFONT ( 264 , 6 ) ;
+-        Size = MAP_APPFONT ( 50 , 14 ) ;
++        Pos = MAP_APPFONT ( 12 , 48 ) ;
++        Size = MAP_APPFONT ( 60 , 8 ) ;
++        Text [ en-US ] = "From ro~w" ;
++	};
++
++    NumericField NF_AT_ROW
++	{
++        Border = TRUE ;
++        SVLook = TRUE ;
++        Pos = MAP_APPFONT ( 76 , 46 ) ;
++        Size = MAP_APPFONT ( 30 , 12 ) ;
+         TabStop = TRUE ;
+-        DefButton = TRUE ;
++        Spin = TRUE ;
++        Repeat = TRUE ;
++        Minimum = 1 ;
+     };
+-    CancelButton BTN_CANCEL
++
++    FixedLine FL_SEPOPT
+     {
+-        Pos = MAP_APPFONT ( 264 , 23 ) ;
+-        Size = MAP_APPFONT ( 50 , 14 ) ;
++        Pos = MAP_APPFONT ( 6 , 63 ) ;
++        Size = MAP_APPFONT ( 252 , 8 ) ;
++        Text [ en-US ] = "Separator options" ;
++	};
++    RadioButton RB_FIXED
++	{
++        Pos = MAP_APPFONT ( 12 , 75 ) ;
++        Size = MAP_APPFONT ( 243 , 10 ) ;
++        Text [ en-US ] = "~Fixed width" ;
+         TabStop = TRUE ;
+     };
+-    HelpButton BTN_HELP
++    RadioButton RB_SEPARATED
+     {
+-        Pos = MAP_APPFONT ( 264 , 43 ) ;
+-        Size = MAP_APPFONT ( 50 , 14 ) ;
++        Pos = MAP_APPFONT ( 12 , 89 ) ;
++        Size = MAP_APPFONT ( 243 , 10 ) ;
++        Text [ en-US ] = "~Separated by" ;
+         TabStop = TRUE ;
++        Check = TRUE ;
+     };
++
+     CheckBox CKB_TAB
+     {
+-        Pos = MAP_APPFONT ( 20 , 86 ) ;
++        Pos = MAP_APPFONT ( 20 , 102 ) ;
+         Size = MAP_APPFONT ( 68 , 10 ) ;
+         TabStop = TRUE ;
+         Text [ en-US ] = "~Tab" ;
+     };
+-    CheckBox CKB_SEMICOLON
+-    {
+-        Pos = MAP_APPFONT ( 20 , 99 ) ;
+-        Size = MAP_APPFONT ( 68 , 10 ) ;
+-        TabStop = TRUE ;
+-        Text [ en-US ] = "S~emicolon" ;
+-    };
+     CheckBox CKB_COMMA
+     {
+-        Pos = MAP_APPFONT ( 92 , 86 ) ;
++        Pos = MAP_APPFONT ( 92 , 102 ) ;
+         Size = MAP_APPFONT ( 68 , 10 ) ;
+         TabStop = TRUE ;
+         Text [ en-US ] = "~Comma" ;
+     };
+-    CheckBox CKB_SPACE
+-    {
+-        Pos = MAP_APPFONT ( 92 , 99 ) ;
+-        Size = MAP_APPFONT ( 68 , 10 ) ;
+-        TabStop = TRUE ;
+-        Text [ en-US ] = "S~pace" ;
+-    };
+     CheckBox CKB_OTHER
+     {
+-        Pos = MAP_APPFONT ( 164 , 86 ) ;
++        Pos = MAP_APPFONT ( 164 , 102 ) ;
+         Size = MAP_APPFONT ( 50 , 10 ) ;
+         TabStop = TRUE ;
+         Text [ en-US ] = "~Other" ;
+@@ -167,43 +162,100 @@ ModalDialog RID_SCDLG_ASCII
+     Edit ED_OTHER
+     {
+         Border = TRUE ;
+-        Pos = MAP_APPFONT ( 218 , 84 ) ;
++        Pos = MAP_APPFONT ( 218 , 100 ) ;
+         Size = MAP_APPFONT ( 37 , 12 ) ;
+         TabStop = TRUE ;
+         MaxTextLength = 10 ;
+     };
+-    FixedText FT_AT_ROW
++
++    CheckBox CKB_SEMICOLON
+     {
+-        Pos = MAP_APPFONT ( 12 , 32 ) ;
++        Pos = MAP_APPFONT ( 20 , 115 ) ;
++        Size = MAP_APPFONT ( 68 , 10 ) ;
++		TabStop = TRUE ;
++        Text [ en-US ] = "S~emicolon" ;
++    };
++    CheckBox CKB_SPACE
++    {
++        Pos = MAP_APPFONT ( 92 , 115 ) ;
++        Size = MAP_APPFONT ( 68 , 10 ) ;
++        TabStop = TRUE ;
++        Text [ en-US ] = "S~pace" ;
++    };
++
++    CheckBox CB_ASONCE
++    {
++        Pos = MAP_APPFONT ( 20 , 130 ) ;
++        Size = MAP_APPFONT ( 130 , 10 ) ;
++        TabStop = TRUE ;
++        Text [ en-US ] = "Merge ~delimiters" ;
++    };
++
++    ComboBox CB_TEXTSEP
++    {
++        Pos = MAP_APPFONT ( 218 , 128 ) ;
++        Size = MAP_APPFONT ( 37 , 94 ) ;
++        TabStop = TRUE ;
++        DropDown = TRUE ;
++    };
++    FixedText FT_TEXTSEP
++    {
++        Pos = MAP_APPFONT ( 156 , 130 ) ;
+         Size = MAP_APPFONT ( 60 , 8 ) ;
+-        Text [ en-US ] = "From ro~w" ;
++        Text [ en-US ] = "Te~xt delimiter" ;
+     };
+-    NumericField NF_AT_ROW
++
++    FixedLine FL_OTHER_OPTIONS
+     {
+-        Border = TRUE ;
+-        SVLook = TRUE ;
+-        Pos = MAP_APPFONT ( 76 , 30 ) ;
+-        Size = MAP_APPFONT ( 30 , 12 ) ;
++        Pos = MAP_APPFONT ( 6 , 146 ) ;
++        Size = MAP_APPFONT ( 252 , 8 ) ;
++        Text [ en-US ] = "Other options" ;
++    };
++
++    CheckBox CB_QUOTED_AS_TEXT
++    {
++        Pos = MAP_APPFONT ( 20 , 158 ) ;
++        Size = MAP_APPFONT ( 130 , 10 ) ;
+         TabStop = TRUE ;
+-        Spin = TRUE ;
+-        Repeat = TRUE ;
+-        Minimum = 1 ;
++        Text [ en-US ] = "~Quoted field as text" ;
++    };
++
++    CheckBox CB_DETECT_SPECIAL_NUMBER
++    {
++        Pos = MAP_APPFONT ( 20 , 171 ) ;
++        Size = MAP_APPFONT ( 130 , 10 ) ;
++        TabStop = TRUE ;
++        Text [ en-US ] = "Detect special numbers" ;
++    };
++
++    FixedLine FL_WIDTH
++    {
++        Pos = MAP_APPFONT ( 6 , 187 ) ;
++        Size = MAP_APPFONT ( 252 , 8 ) ;
++        Text [ en-US ] = "Fields" ;
++    };
++    FixedText FT_TYPE
++    {
++        Pos = MAP_APPFONT ( 12 , 200 ) ;
++        Size = MAP_APPFONT ( 60 , 8 ) ;
++        Text [ en-US ] = "Column t~ype";
++    };
++    ListBox LB_TYPE1
++    {
++        Pos = MAP_APPFONT ( 76 , 198 ) ;
++        Size = MAP_APPFONT ( 60 , 68 ) ;
++        TabStop = TRUE ;
++        DropDown = TRUE ;
+     };
+     Control CTR_TABLEBOX
+     {
+         HelpId = HID_SC_ASCII_TABCTR ;
+         Border = TRUE ;
+         DialogControl = TRUE ;
+-        Pos = MAP_APPFONT ( 12 , 159 ) ;
++        Pos = MAP_APPFONT ( 12 , 216 ) ;
+         Size = MAP_APPFONT ( 243 , 82 ) ;
+     };
+-    CheckBox CB_ASONCE
+-    {
+-        Pos = MAP_APPFONT ( 20 , 114 ) ;
+-        Size = MAP_APPFONT ( 130 , 10 ) ;
+-        TabStop = TRUE ;
+-        Text [ en-US ] = "Merge ~delimiters" ;
+-    };
++
+     String STR_TEXTTOCOLUMNS
+     {
+         Text [ en-US ] = "Text to Columns" ;
+diff --git sc/source/ui/dbgui/csvgrid.cxx sc/source/ui/dbgui/csvgrid.cxx
+index ddbfb44..5725645 100644
+--- sc/source/ui/dbgui/csvgrid.cxx
++++ sc/source/ui/dbgui/csvgrid.cxx
+@@ -737,7 +737,8 @@ void ScCsvGrid::ImplSetTextLineSep(
+     while( *pChar && (nColIx < sal::static_int_cast<sal_uInt32>(CSV_MAXCOLCOUNT)) )
+     {
+         // scan for next cell text
+-        pChar = ScImportExport::ScanNextFieldFromString( pChar, aCellText, cTextSep, pSepChars, bMergeSep );
++        bool bIsQuoted = false;
++        pChar = ScImportExport::ScanNextFieldFromString( pChar, aCellText, cTextSep, pSepChars, bMergeSep, bIsQuoted );
+ 
+         // update column width
+         sal_Int32 nWidth = Max( CSV_MINCOLWIDTH, aCellText.Len() + sal_Int32( 1 ) );
+diff --git sc/source/ui/dbgui/csvruler.cxx sc/source/ui/dbgui/csvruler.cxx
+index 5437f9b..7cd060d 100644
+--- sc/source/ui/dbgui/csvruler.cxx
++++ sc/source/ui/dbgui/csvruler.cxx
+@@ -37,8 +37,76 @@
+ #include "AccessibleCsvControl.hxx"
+ 
+ 
++#include <optutil.hxx>
++#include <com/sun/star/uno/Any.hxx>
++#include <com/sun/star/uno/Sequence.hxx>
++#include "miscuno.hxx"
++
++using namespace rtl;
++using namespace com::sun::star::uno;
++
++
++
++// ============================================================================
++#define SEP_PATH            "Office.Calc/Dialogs/CSVImport"
++#define FIXED_WIDTH_LIST    "FixedWidthList"
++
++
+ // ============================================================================
+ 
++static void load_FixedWidthList(ScCsvSplits &aSplits)
++{
++    String sSplits;
++    OUString sFixedWidthLists;
++
++    Sequence<Any>aValues;
++    const Any *pProperties;
++    Sequence<OUString> aNames(1);
++    OUString* pNames = aNames.getArray();
++    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
++
++    pNames[0] = OUString::createFromAscii( FIXED_WIDTH_LIST );
++    aValues = aItem.GetProperties( aNames );
++    pProperties = aValues.getConstArray();
++
++    if( pProperties[0].hasValue() )
++    {
++        aSplits.Clear();
++        pProperties[0] >>= sFixedWidthLists;
++
++        sSplits = String( sFixedWidthLists );
++
++        // String ends with a semi-colon so there is no 'int' after the last one.
++        for(int i=0;i<sSplits.GetTokenCount()-1;i++ )
++            aSplits.Insert( sSplits.GetToken(i).ToInt32() );
++    }
++}
++static void save_FixedWidthList(ScCsvSplits aSplits)
++{
++    String sSplits;
++    // Create a semi-colon separated string to save the splits
++    sal_uInt32 n = aSplits.Count();
++    for (sal_uInt32 i = 0; i < n; ++i)
++    {
++        sSplits.Append( String::CreateFromInt32( aSplits[i] ) );
++        sSplits.Append((char)';');
++    }
++
++    OUString sFixedWidthLists = OUString( sSplits );
++    Sequence<Any> aValues;
++    Any *pProperties;
++    Sequence<OUString> aNames(1);
++    OUString* pNames = aNames.getArray();
++    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
++
++    pNames[0] = OUString::createFromAscii( FIXED_WIDTH_LIST );
++    aValues = aItem.GetProperties( aNames );
++    pProperties = aValues.getArray();
++    pProperties[0] <<= sFixedWidthLists;
++
++    aItem.PutProperties(aNames, aValues);
++}
++
+ ScCsvRuler::ScCsvRuler( ScCsvControl& rParent ) :
+     ScCsvControl( rParent ),
+     mnPosCursorLast( 1 )
+@@ -48,6 +116,13 @@ ScCsvRuler::ScCsvRuler( ScCsvControl& rParent ) :
+     InitSizeData();
+     maBackgrDev.SetFont( GetFont() );
+     maRulerDev.SetFont( GetFont() );
++
++    load_FixedWidthList( maSplits );
++}
++
++ScCsvRuler::~ScCsvRuler()
++{
++    save_FixedWidthList( maSplits );
+ }
+ 
+ 
+diff --git sc/source/ui/dbgui/makefile.mk sc/source/ui/dbgui/makefile.mk
+index 5d71655..130e0a3 100644
+--- sc/source/ui/dbgui/makefile.mk
++++ sc/source/ui/dbgui/makefile.mk
+@@ -53,6 +53,7 @@ SLOFILES =	\
+     $(SLO)$/pfiltdlg.obj	\
+     $(SLO)$/dbnamdlg.obj	\
+     $(SLO)$/expftext.obj	\
++    $(SLO)$/textimportoptions.obj \
+     $(SLO)$/subtdlg.obj		\
+     $(SLO)$/tpsubt.obj		\
+     $(SLO)$/fieldwnd.obj	\
+@@ -85,6 +86,7 @@ EXCEPTIONSFILES= \
+ 
+ SRS1NAME=$(TARGET)
+ SRC1FILES =  \
++	textimportoptions.src		\
+         pivot.src		\
+         pvfundlg.src	\
+         dpgroupdlg.src	\
+@@ -114,7 +116,8 @@ LIB1OBJFILES =  \
+     $(SLO)$/csvruler.obj	\
+     $(SLO)$/csvgrid.obj		\
+     $(SLO)$/csvtablebox.obj	\
+-    $(SLO)$/asciiopt.obj
++    $(SLO)$/asciiopt.obj \
++    $(SLO)$/textimportoptions.obj
+ 
+ # --- Tagets -------------------------------------------------------
+ 
+diff --git sc/source/ui/dbgui/scuiasciiopt.cxx sc/source/ui/dbgui/scuiasciiopt.cxx
+index dc4a05f..c2a75b2 100644
+--- sc/source/ui/dbgui/scuiasciiopt.cxx
++++ sc/source/ui/dbgui/scuiasciiopt.cxx
+@@ -44,6 +44,12 @@
+ // ause
+ #include "editutil.hxx"
+ 
++#include <optutil.hxx>
++#include <com/sun/star/uno/Any.hxx>
++#include <com/sun/star/uno/Sequence.hxx>
++#include "miscuno.hxx"
++
++
+ //! TODO make dynamic
+ #ifdef WIN
+ const SCSIZE ASCIIDLG_MAXROWS                = 10000;
+@@ -51,6 +57,22 @@ const SCSIZE ASCIIDLG_MAXROWS                = 10000;
+ const SCSIZE ASCIIDLG_MAXROWS                = MAXROWCOUNT;
+ #endif
+ 
++
++using namespace rtl;
++using namespace com::sun::star::uno;
++
++// Defines - CSV Import Preserve Options
++#define FIXED_WIDTH         "FixedWidth"
++#define FROM_ROW            "FromRow"
++#define CHAR_SET            "CharSet"
++#define SEPARATORS          "Separators"
++#define TEXT_SEPARATORS     "TextSeparators"
++#define MERGE_DELIMITERS    "MergeDelimiters"
++#define QUOTED_AS_TEXT      "QuotedFieldAsText"
++#define DETECT_SPECIAL_NUM  "DetectSpecialNumbers"
++#define LANGUAGE            "Language"
++#define SEP_PATH            "Office.Calc/Dialogs/CSVImport"
++
+ // ============================================================================
+ 
+ void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect )
+@@ -98,11 +120,96 @@ sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList )
+     return c;
+ }
+ 
++static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparators, 
++                             bool &bMergeDelimiters, bool& bQuotedAsText, bool& bDetectSpecialNum, 
++                             bool &bFixedWidth, sal_Int32 &nFromRow, sal_Int32 &nCharSet,
++                             sal_Int32& nLanguage )
++{
++    Sequence<Any>aValues;
++    const Any *pProperties;
++    Sequence<OUString> aNames(9);
++    OUString* pNames = aNames.getArray();
++    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
++
++    pNames[0] = OUString::createFromAscii( MERGE_DELIMITERS );
++    pNames[1] = OUString::createFromAscii( SEPARATORS );
++    pNames[2] = OUString::createFromAscii( TEXT_SEPARATORS );
++    pNames[3] = OUString::createFromAscii( FIXED_WIDTH );
++    pNames[4] = OUString::createFromAscii( FROM_ROW );
++    pNames[5] = OUString::createFromAscii( CHAR_SET );
++    pNames[6] = OUString::createFromAscii( QUOTED_AS_TEXT );
++    pNames[7] = OUString::createFromAscii( DETECT_SPECIAL_NUM );
++    pNames[8] = OUString::createFromAscii( LANGUAGE );
++    aValues = aItem.GetProperties( aNames );
++    pProperties = aValues.getConstArray();
++    if( pProperties[1].hasValue() )
++        pProperties[1] >>= sFieldSeparators;
++
++    if( pProperties[2].hasValue() )
++        pProperties[2] >>= sTextSeparators;
++
++    if( pProperties[0].hasValue() )
++        bMergeDelimiters = ScUnoHelpFunctions::GetBoolFromAny( pProperties[0] );
++
++    if( pProperties[3].hasValue() )
++        bFixedWidth = ScUnoHelpFunctions::GetBoolFromAny( pProperties[3] );
++
++    if( pProperties[4].hasValue() )
++        pProperties[4] >>= nFromRow;
++
++    if( pProperties[5].hasValue() )
++        pProperties[5] >>= nCharSet;
++ 
++    if ( pProperties[6].hasValue() )
++        pProperties[6] >>= bQuotedAsText;
++
++    if ( pProperties[7].hasValue() )
++        pProperties[7] >>= bDetectSpecialNum;
++
++    if ( pProperties[8].hasValue() )
++        pProperties[8] >>= nLanguage;
++}
++
++static void save_Separators( 
++    String maSeparators, String maTxtSep, bool bMergeDelimiters, bool bQuotedAsText,
++    bool bDetectSpecialNum, bool bFixedWidth, sal_Int32 nFromRow, sal_Int32 nCharSet, sal_Int32 nLanguage )
++{
++    OUString sFieldSeparators = OUString( maSeparators );
++    OUString sTextSeparators = OUString( maTxtSep );
++    Sequence<Any> aValues;
++    Any *pProperties;
++    Sequence<OUString> aNames(9);
++    OUString* pNames = aNames.getArray();
++    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
++
++    pNames[0] = OUString::createFromAscii( MERGE_DELIMITERS );
++    pNames[1] = OUString::createFromAscii( SEPARATORS );
++    pNames[2] = OUString::createFromAscii( TEXT_SEPARATORS );
++    pNames[3] = OUString::createFromAscii( FIXED_WIDTH );
++    pNames[4] = OUString::createFromAscii( FROM_ROW );
++    pNames[5] = OUString::createFromAscii( CHAR_SET );
++    pNames[6] = OUString::createFromAscii( QUOTED_AS_TEXT );
++    pNames[7] = OUString::createFromAscii( DETECT_SPECIAL_NUM );
++    pNames[8] = OUString::createFromAscii( LANGUAGE );
++    aValues = aItem.GetProperties( aNames );
++    pProperties = aValues.getArray();
++    pProperties[1] <<= sFieldSeparators;
++    pProperties[2] <<= sTextSeparators;
++    ScUnoHelpFunctions::SetBoolInAny( pProperties[0], bMergeDelimiters );
++    ScUnoHelpFunctions::SetBoolInAny( pProperties[3], bFixedWidth );
++    pProperties[4] <<= nFromRow;
++    pProperties[5] <<= nCharSet;
++    pProperties[6] <<= static_cast<sal_Bool>(bQuotedAsText);
++    pProperties[7] <<= static_cast<sal_Bool>(bDetectSpecialNum);
++    pProperties[8] <<= nLanguage;
++
++    aItem.PutProperties(aNames, aValues);
++}
+ 
+ // ----------------------------------------------------------------------------
+ 
+ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
+-                                    SvStream* pInStream, sal_Unicode cSep ) :
++                                    SvStream* pInStream, sal_Unicode /*cSep*/ ) :
+         ModalDialog	( pParent, ScResId( RID_SCDLG_ASCII ) ),
+         mpDatStream  ( pInStream ),
+         mnStreamPos( pInStream ? pInStream->Tell() : 0 ),
+@@ -113,6 +220,8 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
+         aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ),
+         aFtCharSet	( this, ScResId( FT_CHARSET ) ),
+         aLbCharSet	( this, ScResId( LB_CHARSET ) ),
++        aFtCustomLang( this, ScResId( FT_CUSTOMLANG ) ),
++        aLbCustomLang( this, ScResId( LB_CUSTOMLANG ) ), 
+ 
+         aFtRow		( this, ScResId( FT_AT_ROW	) ),
+         aNfRow		( this,	ScResId( NF_AT_ROW	) ),
+@@ -128,6 +237,10 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
+         aCkbOther	( this, ScResId( CKB_OTHER ) ),
+         aEdOther	( this, ScResId( ED_OTHER ) ),
+         aCkbAsOnce	( this, ScResId( CB_ASONCE) ),
++        aFlOtherOpt ( this, ScResId( FL_OTHER_OPTIONS ) ), 
++
++        aCkbQuotedAsText( this, ScResId(CB_QUOTED_AS_TEXT) ),
++        aCkbDetectNumber( this, ScResId(CB_DETECT_SPECIAL_NUMBER) ),
+         aFtTextSep	( this, ScResId( FT_TEXTSEP ) ),
+         aCbTextSep	( this, ScResId( CB_TEXTSEP ) ),
+ 
+@@ -146,14 +259,15 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
+         aFldSepList	( ScResId( SCSTR_FIELDSEP ) ),
+         aTextSepList( ScResId( SCSTR_TEXTSEP ) ),
+         mcTextSep   ( ScAsciiOptions::cDefaultTextSep ),
+-        maStrTextToColumns( ScResId( STR_TEXTTOCOLUMNS ) )
++        maStrTextToColumns( ScResId( STR_TEXTTOCOLUMNS ) ),
++        mbFileImport(true)
+ {
+     FreeResource();
++    mbFileImport = aDatName.Len() > 0;
+ 
+     String aName = GetText();
+     // aDatName is empty if invoked during paste from clipboard.
+-    BOOL bClipboard = (aDatName.Len() == 0);
+-    if (!bClipboard)
++    if (mbFileImport)
+     {
+         aName.AppendAscii(RTL_CONSTASCII_STRINGPARAM(" - ["));
+         aName += aDatName;
+@@ -161,20 +275,55 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
+     }
+     SetText( aName );
+ 
+-    switch(cSep)
++
++    OUString sFieldSeparators;
++    OUString sTextSeparators;
++    bool bMergeDelimiters = false;
++    bool bFixedWidth = false;
++    bool bQuotedFieldAsText = true;
++    bool bDetectSpecialNum = false;
++    sal_Int32 nFromRow = 1;
++    sal_Int32 nCharSet = -1;
++    sal_Int32 nLanguage = 0;
++    if (mbFileImport)
++        // load separators only when importing csv files.
++        load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters, 
++                         bQuotedFieldAsText, bDetectSpecialNum, bFixedWidth, nFromRow, nCharSet, nLanguage);
++    maFieldSeparators = String(sFieldSeparators);
++
++    if( bMergeDelimiters )
++        aCkbAsOnce.Check();
++    if (bQuotedFieldAsText)
++        aCkbQuotedAsText.Check();
++    if (bDetectSpecialNum)
++        aCkbDetectNumber.Check();
++    if( bFixedWidth )
++        aRbFixed.Check();
++    if( nFromRow != 1 )
++        aNfRow.SetValue( nFromRow );
++
++    ByteString bString(maFieldSeparators,RTL_TEXTENCODING_MS_1252);
++    const sal_Char *aSep = bString.GetBuffer();
++    int len = maFieldSeparators.Len();
++    for (int i = 0; i < len; ++i)
+     {
+-        case '\t':  aCkbTab.Check();        break;
+-        case ';':   aCkbSemicolon.Check();  break;
+-        case ',':   aCkbComma.Check();      break;
+-        case ' ':   aCkbSpace.Check();      break;
+-        default:
+-            aCkbOther.Check();
+-            aEdOther.SetText( cSep );
++        switch( aSep[i] )
++        {
++            case '\t':  aCkbTab.Check();        break;
++            case ';':   aCkbSemicolon.Check();  break;
++            case ',':   aCkbComma.Check();      break;
++            case ' ':   aCkbSpace.Check();      break;
++            default:
++                aCkbOther.Check();
++                aEdOther.SetText( aEdOther.GetText() + OUString( aSep[i] ) );
++        }
+     }
++    
++    // Get Separators from the dialog
+     maFieldSeparators = GetSeparators();
+ 
+     // Clipboard is always Unicode, else detect.
+-    BOOL bPreselectUnicode = bClipboard;
++    bool bPreselectUnicode = !mbFileImport;
+     // Sniff for Unicode / not
+     if( !bPreselectUnicode && mpDatStream )
+     {
+@@ -210,6 +359,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
+ 
+     // *** Separator characters ***
+     lcl_FillCombo( aCbTextSep, aTextSepList, mcTextSep );
++    aCbTextSep.SetText( sTextSeparators );
+ 
+     Link aSeparatorHdl =LINK( this, ScImportAsciiDlg, SeparatorHdl );
+     aCbTextSep.SetSelectHdl( aSeparatorHdl );
+@@ -218,6 +368,8 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
+     aCkbSemicolon.SetClickHdl( aSeparatorHdl );
+     aCkbComma.SetClickHdl( aSeparatorHdl );
+     aCkbAsOnce.SetClickHdl( aSeparatorHdl );
++    aCkbQuotedAsText.SetClickHdl( aSeparatorHdl );
++    aCkbDetectNumber.SetClickHdl( aSeparatorHdl );
+     aCkbSpace.SetClickHdl( aSeparatorHdl );
+     aCkbOther.SetClickHdl( aSeparatorHdl );
+     aEdOther.SetModifyHdl( aSeparatorHdl );
+@@ -230,9 +382,18 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
+     aLbCharSet.InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, aCharSetUser );
+     aLbCharSet.SelectTextEncoding( bPreselectUnicode ?
+         RTL_TEXTENCODING_UNICODE : gsl_getSystemTextEncoding() );
++
++    if( nCharSet >= 0 )
++        aLbCharSet.SelectEntryPos( nCharSet );
++
+     SetSelectedCharSet();
+     aLbCharSet.SetSelectHdl( LINK( this, ScImportAsciiDlg, CharSetHdl ) );
+ 
++    aLbCustomLang.SetLanguageList(
++        LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, false, false);
++    aLbCustomLang.InsertLanguage(LANGUAGE_SYSTEM);
++    aLbCustomLang.SelectLanguage(static_cast<LanguageType>(nLanguage), true);
++
+     // *** column type ListBox ***
+     xub_StrLen nCount = aColumnUser.GetTokenCount();
+     for (xub_StrLen i=0; i<nCount; i++)
+@@ -261,6 +422,11 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
+ 
+ ScImportAsciiDlg::~ScImportAsciiDlg()
+ {
++    if (mbFileImport)
++        save_Separators( maFieldSeparators, aCbTextSep.GetText(), aCkbAsOnce.IsChecked(), 
++                         aCkbQuotedAsText.IsChecked(), aCkbDetectNumber.IsChecked(), 
++                         aRbFixed.IsChecked(), aNfRow.GetValue(), aLbCharSet.GetSelectEntryPos(),
++                         static_cast<sal_Int32>(aLbCustomLang.GetSelectLanguage()) );
+     delete[] mpRowPosArray;
+ }
+ 
+@@ -339,6 +505,7 @@ void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt )
+ {
+     rOpt.SetCharSet( meCharSet );
+     rOpt.SetCharSetSystem( mbCharSetSystem );
++    rOpt.SetLanguage(aLbCustomLang.GetSelectLanguage());
+     rOpt.SetFixedLen( aRbFixed.IsChecked() );
+     rOpt.SetStartRow( (long)aNfRow.GetValue() );
+     maTableBox.FillColumnData( rOpt );
+@@ -348,6 +515,9 @@ void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt )
+         rOpt.SetMergeSeps( aCkbAsOnce.IsChecked() );
+         rOpt.SetTextSep( lcl_CharFromCombo( aCbTextSep, aTextSepList ) );
+     }
++
++    rOpt.SetQuotedAsText(aCkbQuotedAsText.IsChecked());
++    rOpt.SetDetectSpecialNumber(aCkbDetectNumber.IsChecked());
+ }
+ 
+ void ScImportAsciiDlg::SetTextToColumnsMode()
+@@ -355,8 +525,19 @@ void ScImportAsciiDlg::SetTextToColumnsMode()
+     SetText( maStrTextToColumns );
+     aFtCharSet.Disable();
+     aLbCharSet.Disable();
++    aFtCustomLang.Disable();
++    aLbCustomLang.SelectLanguage(LANGUAGE_SYSTEM);
++    aLbCustomLang.Disable();
+     aFtRow.Disable();
+     aNfRow.Disable();
++
++    // Quoted field as text option is not used for text-to-columns mode.
++    aCkbQuotedAsText.Check(false);
++    aCkbQuotedAsText.Disable();
++
++    // Always detect special numbers for text-to-columns mode.
++    aCkbDetectNumber.Check();
++    aCkbDetectNumber.Disable();
+ }
+ 
+ void ScImportAsciiDlg::SetSelectedCharSet()
+diff --git sc/source/ui/dbgui/textimportoptions.cxx sc/source/ui/dbgui/textimportoptions.cxx
+new file mode 100644
+index 0000000..a59b42a
+--- /dev/null
++++ sc/source/ui/dbgui/textimportoptions.cxx
+@@ -0,0 +1,120 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: langbox.hxx,v $
++ * $Revision: 1.4.242.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_sc.hxx"
++
++#undef SC_DLLIMPLEMENTATION
++
++//------------------------------------------------------------------------
++
++#include "textimportoptions.hxx"
++#include "textimportoptions.hrc"
++
++#include "scresid.hxx"
++#include "vcl/window.hxx"
++#include "vcl/msgbox.hxx"
++#include "vcl/svapp.hxx"
++
++ScTextImportOptionsDlg::ScTextImportOptionsDlg(Window* pParent) :
++    ModalDialog(pParent, ScResId(RID_SCDLG_TEXT_IMPORT_OPTIONS)),
++
++    maBtnOk(this, ScResId(BTN_OK)),
++    maBtnCancel(this, ScResId(BTN_CANCEL)),
++    maBtnHelp(this, ScResId(BTN_HELP)),
++    maFlChooseLang(this, ScResId(FL_CHOOSE_LANG)),
++    maRbAutomatic(this, ScResId(RB_AUTOMATIC)), 
++    maRbCustom(this, ScResId(RB_CUSTOM)),
++    maLbCustomLang(this, ScResId(LB_CUSTOM_LANG)),
++    maFlOption(this, ScResId(FL_OPTION)),
++    maBtnConvertDate(this, ScResId(BTN_CONVERT_DATE))
++{
++    init();
++}
++
++ScTextImportOptionsDlg::~ScTextImportOptionsDlg()
++{
++}
++
++short ScTextImportOptionsDlg::Execute()
++{
++    return ModalDialog::Execute();
++}
++
++LanguageType ScTextImportOptionsDlg::getLanguageType() const
++{
++    if (maRbAutomatic.IsChecked())
++        return LANGUAGE_SYSTEM;
++
++    return maLbCustomLang.GetSelectLanguage();
++}
++
++bool ScTextImportOptionsDlg::isDateConversionSet() const
++{
++    return maBtnConvertDate.IsChecked();
++}
++
++void ScTextImportOptionsDlg::init()
++{
++    Link aLink = LINK( this, ScTextImportOptionsDlg, OKHdl );
++    maBtnOk.SetClickHdl(aLink);
++    aLink = LINK( this, ScTextImportOptionsDlg, RadioHdl );
++    maRbAutomatic.SetClickHdl(aLink);
++    maRbCustom.SetClickHdl(aLink);
++
++    maRbAutomatic.Check(true);
++
++    maLbCustomLang.SetLanguageList(
++        LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, false, false);
++
++    LanguageType eLang = Application::GetSettings().GetLanguage();
++    maLbCustomLang.SelectLanguage(eLang);
++    maLbCustomLang.Disable();
++}
++
++IMPL_LINK( ScTextImportOptionsDlg, OKHdl, OKButton*, EMPTYARG )
++{
++    EndDialog(RET_OK);
++    return 0;
++}
++
++IMPL_LINK( ScTextImportOptionsDlg, RadioHdl, RadioButton*, pBtn )
++{
++    if (pBtn == &maRbAutomatic)
++    {
++        maLbCustomLang.Disable();
++    }
++    else if (pBtn == &maRbCustom)
++    {
++        maLbCustomLang.Enable();
++    }
++    return 0;
++}
++
+diff --git sc/source/ui/dbgui/textimportoptions.src sc/source/ui/dbgui/textimportoptions.src
+new file mode 100644
+index 0000000..4a4d158
+--- /dev/null
++++ sc/source/ui/dbgui/textimportoptions.src
+@@ -0,0 +1,112 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: retypepassdlg.src,v $
++ * $Revision: 1.1.2.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#include "textimportoptions.hrc"
++
++ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
++{
++    Text [ en-US ] = "Import Options" ;
++    Size = MAP_APPFONT ( 190 , 101 ) ;
++    Moveable = TRUE ;
++    Closeable = TRUE ;
++    OutputSize = TRUE ;
++
++    OKButton BTN_OK
++    {
++        Pos = MAP_APPFONT ( 135, 6 ) ;
++        Size = MAP_APPFONT ( 50, 14 ) ;
++        DefButton = TRUE ;
++    };
++
++    CancelButton BTN_CANCEL
++    {
++        Pos = MAP_APPFONT ( 135, 23 ) ;
++        Size = MAP_APPFONT ( 50, 14 ) ;
++    };
++
++    HelpButton BTN_HELP
++    {
++        Pos = MAP_APPFONT ( 135, 43 ) ;
++        Size = MAP_APPFONT ( 50, 14 ) ;
++    };
++
++    FixedLine FL_CHOOSE_LANG
++    {
++        Pos = MAP_APPFONT( 6, 3 ) ;
++        Size = MAP_APPFONT( 125, 14 ) ;
++
++        Text [ en-US ] = "Select the language to use for import" ; 
++    };
++
++    RadioButton RB_AUTOMATIC
++    {
++        Pos = MAP_APPFONT( 12, 20 ) ;
++        Size = MAP_APPFONT( 50, 10 ) ;
++        TabStop = TRUE ;
++
++        Text [ en-US ] = "Automatic" ; 
++    };
++
++    RadioButton RB_CUSTOM
++    {
++        Pos = MAP_APPFONT( 12, 34 ) ;
++        Size = MAP_APPFONT( 50, 10 ) ;
++        TabStop = TRUE ;
++
++        Text [ en-US ] = "Custom" ; 
++    };
++
++    ListBox LB_CUSTOM_LANG
++    {
++        Pos = MAP_APPFONT( 20, 50 ) ;
++        Size = MAP_APPFONT( 100, 55 ) ;
++        TabStop = TRUE ;
++        DropDown = TRUE ;
++        Sort = TRUE ;
++    };
++
++    FixedLine FL_OPTION
++    {
++	Pos = MAP_APPFONT( 6, 70 );
++	Size = MAP_APPFONT( 125, 14 );
++
++	Text [ en-US ] = "Options" ;
++    };
++
++    CheckBox BTN_CONVERT_DATE
++    {
++    	Pos = MAP_APPFONT( 12, 86 );
++	Size = MAP_APPFONT( 125, 10 );
++	TabStop = TRUE ;
++
++	Text [ en-US ] = "Detect special numbers (such as dates)." ;
++    };
++};
++
+diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
+index 8cb9ad8..8335542 100644
+--- sc/source/ui/docshell/docsh.cxx
++++ sc/source/ui/docshell/docsh.cxx
+@@ -129,6 +129,8 @@
+ #include <comphelper/processfactory.hxx>
+ 
+ using namespace com::sun::star;
++using ::rtl::OUString;
++using ::rtl::OUStringBuffer;
+ 
+ // STATIC DATA -----------------------------------------------------------
+ 
+@@ -794,6 +796,34 @@ BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
+     return bRet;
+ }
+ 
++static void lcl_parseHtmlFilterOption(const OUString& rOption, LanguageType& rLang, bool& rDateConvert)
++{
++    OUStringBuffer aBuf;
++    OUString aTokens[2];
++    sal_Int32 n = rOption.getLength();
++    const sal_Unicode* p = rOption.getStr();
++    sal_Int32 nTokenId = 0;
++    for (sal_Int32 i = 0; i < n; ++i)
++    {
++        const sal_Unicode c = p[i];
++        if (c == sal_Unicode(' '))
++        {
++            if (aBuf.getLength())
++                aTokens[nTokenId++] = aBuf.makeStringAndClear();
++        }
++        else
++            aBuf.append(c);
++
++        if (nTokenId >= 2)
++            break;
++    }
++
++    if (aBuf.getLength())
++        aTokens[nTokenId] = aBuf.makeStringAndClear();
++
++    rLang = static_cast<LanguageType>(aTokens[0].toInt32());
++    rDateConvert = static_cast<bool>(aTokens[1].toInt32());
++}
+ 
+ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
+ {
+@@ -1167,12 +1197,24 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
+                 SvStream* pInStream = rMedium.GetInStream();
+                 if (pInStream)
+                 {
++                    LanguageType eLang = LANGUAGE_SYSTEM;
++                    bool bDateConvert = false;
++                    SfxItemSet*	 pSet = rMedium.GetItemSet();
++                    const SfxPoolItem* pItem;
++                    if ( pSet && SFX_ITEM_SET ==
++                         pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
++                    {
++                        String aFilterOption = (static_cast<const SfxStringItem*>(pItem))->GetValue();
++                        lcl_parseHtmlFilterOption(aFilterOption, eLang, bDateConvert);
++                    }
++
+                     pInStream->Seek( 0 );
+                     ScRange aRange;
+                     // HTML macht eigenes ColWidth/RowHeight
+                     CalcOutputFactor();
++                    SvNumberFormatter aNumFormatter(aDocument.GetServiceManager(), eLang);
+                     eError = ScFormatFilter::Get().ScImportHTML( *pInStream, rMedium.GetBaseURL(), &aDocument, aRange,
+-                                            GetOutputFactor(), !bWebQuery );
++											GetOutputFactor(), !bWebQuery, &aNumFormatter, bDateConvert );
+                     if (eError != eERR_OK)
+                     {
+                         if (!GetError())
+@@ -2149,6 +2191,11 @@ String ScDocShell::GetOwnFilterName()			// static
+     return String::CreateFromAscii(pFilterSc50);
+ }
+ 
++String ScDocShell::GetHtmlFilterName()
++{
++    return String::CreateFromAscii(pFilterHtml);
++}
++
+ String ScDocShell::GetWebQueryFilterName()		// static
+ {
+     return String::CreateFromAscii(pFilterHtmlWebQ);
+diff --git sc/source/ui/docshell/impex.cxx sc/source/ui/docshell/impex.cxx
+index 0590de5..08dfcfb 100644
+--- sc/source/ui/docshell/impex.cxx
++++ sc/source/ui/docshell/impex.cxx
+@@ -905,12 +905,11 @@ BOOL ScImportExport::Text2Doc( SvStream& rStrm )
+         //
+ 
+ 
+-bool lcl_PutString( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
+-                    const String& rStr, BYTE nColFormat,
+-                    ::utl::TransliterationWrapper& rTransliteration,
+-                    CalendarWrapper& rCalendar,
+-                    ::utl::TransliterationWrapper* pSecondTransliteration,
+-                    CalendarWrapper* pSecondCalendar )
++static bool lcl_PutString( 
++    ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rStr, BYTE nColFormat,
++    SvNumberFormatter* pFormatter, bool bDetectNumFormat,
++    ::utl::TransliterationWrapper& rTransliteration, CalendarWrapper& rCalendar,
++    ::utl::TransliterationWrapper* pSecondTransliteration, CalendarWrapper* pSecondCalendar )
+ {
+     bool bMultiLine = false;
+     if ( nColFormat == SC_COL_SKIP || !rStr.Len() || !ValidCol(nCol) || !ValidRow(nRow) )
+@@ -926,10 +925,10 @@ bool lcl_PutString( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
+     {
+         //!	SetString mit Extra-Flag ???
+ 
+-        SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+-        sal_uInt32 nEnglish = pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
++        SvNumberFormatter* pDocFormatter = pDoc->GetFormatTable();
++        sal_uInt32 nEnglish = pDocFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
+         double fVal;
+-        if ( pFormatter->IsNumberFormat( rStr, nEnglish, fVal ) )
++        if ( pDocFormatter->IsNumberFormat( rStr, nEnglish, fVal ) )
+         {
+             //	Zahlformat wird nicht auf englisch gesetzt
+             pDoc->SetValue( nCol, nRow, nTab, fVal );
+@@ -1065,9 +1064,9 @@ bool lcl_PutString( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
+                 }
+             }
+ 
+-            SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
++            SvNumberFormatter* pDocFormatter = pDoc->GetFormatTable();
+             if ( nYear < 100 )
+-                nYear = pFormatter->ExpandTwoDigitYear( nYear );
++                nYear = pDocFormatter->ExpandTwoDigitYear( nYear );
+ 
+             CalendarWrapper* pCalendar = (bSecondCal ? pSecondCalendar : &rCalendar);
+             sal_Int16 nNumMonths = pCalendar->getNumberOfMonthsInYear();
+@@ -1103,7 +1102,7 @@ bool lcl_PutString( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
+                 pCalendar->setValue( i18n::CalendarFieldIndex::MILLISECOND, nMilli );
+                 if ( pCalendar->isValid() )
+                 {
+-                    double fDiff = DateTime(*pFormatter->GetNullDate()) -
++                    double fDiff = DateTime(*pDocFormatter->GetNullDate()) -
+                         pCalendar->getEpochStart();
+                     // #i14974# must use getLocalDateTime to get the same
+                     // date values as set above
+@@ -1115,10 +1114,10 @@ bool lcl_PutString( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
+                     LanguageType eDocLang = eLatin;     //! which language for date formats?
+ 
+                     short nType = (nFound > 3 ? NUMBERFORMAT_DATETIME : NUMBERFORMAT_DATE);
+-                    ULONG nFormat = pFormatter->GetStandardFormat( nType, eDocLang );
++                    ULONG nFormat = pDocFormatter->GetStandardFormat( nType, eDocLang );
+                     // maybe there is a special format including seconds or milliseconds
+                     if (nFound > 5)
+-                        nFormat = pFormatter->GetStandardFormat( fDays, nFormat, nType, eDocLang);
++                        nFormat = pDocFormatter->GetStandardFormat( fDays, nFormat, nType, eDocLang);
+ 
+                     pDoc->PutCell( nCol, nRow, nTab, new ScValueCell(fDays), nFormat, FALSE );
+ 
+@@ -1130,7 +1129,7 @@ bool lcl_PutString( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
+ 
+     // Standard or date not determined -> SetString / EditCell
+     if( rStr.Search( _LF ) == STRING_NOTFOUND )
+-        pDoc->SetString( nCol, nRow, nTab, rStr );
++        pDoc->SetString( nCol, nRow, nTab, rStr, pFormatter, bDetectNumFormat );
+     else 
+     {
+         bMultiLine = true;
+@@ -1140,7 +1139,7 @@ bool lcl_PutString( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
+ }
+ 
+ 
+-String lcl_GetFixed( const String& rLine, xub_StrLen nStart, xub_StrLen nNext )
++String lcl_GetFixed( const String& rLine, xub_StrLen nStart, xub_StrLen nNext, bool& rbIsQuoted )
+ {
+     xub_StrLen nLen = rLine.Len();
+     if (nNext > nLen)
+@@ -1154,7 +1153,11 @@ String lcl_GetFixed( const String& rLine, xub_StrLen nStart, xub_StrLen nNext )
+     while ( nSpace > nStart && pStr[nSpace-1] == ' ' )
+         --nSpace;
+ 
+-    return rLine.Copy( nStart, nSpace-nStart );
++    rbIsQuoted = (pStr[nStart] == sal_Unicode('"') && pStr[nSpace-1] == sal_Unicode('"'));
++    if (rbIsQuoted)
++        return rLine.Copy(nStart+1, nSpace-nStart-2);
++    else
++        return rLine.Copy(nStart, nSpace-nStart);
+ }
+ 
+ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
+@@ -1187,9 +1190,9 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
+     const BYTE* pColFormat  = pExtOptions->GetColFormat();
+     long nSkipLines	= pExtOptions->GetStartRow();
+ 
+-    LanguageType eLatin, eCjk, eCtl;
+-    pDoc->GetLanguage( eLatin, eCjk, eCtl );
+-    LanguageType eDocLang = eLatin;					//! which language for date formats?
++    LanguageType eDocLang = pExtOptions->GetLanguage();
++    SvNumberFormatter aNumFormatter(pDoc->GetServiceManager(), eDocLang);
++    bool bDetectNumFormat = pExtOptions->IsDetectSpecialNumber();
+ 
+     // For date recognition
+     ::utl::TransliterationWrapper aTransliteration(
+@@ -1231,6 +1234,8 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
+     // survives the toggle of bDetermineRange down at the end of the do{} loop.
+     bool bRangeIsDetermined = bDetermineRange;
+ 
++    bool bQuotedAsText = pExtOptions && pExtOptions->IsQuotedAsText();
++
+     ULONG nOriginalStreamPos = rStrm.Tell();
+  
+     do
+@@ -1252,7 +1257,8 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
+                 // SC_COL_SKIP.
+                 for ( i=0; i<nInfoCount && nCol <= MAXCOL+1; i++ )
+                 {
+-                    if ( pColFormat[i] != SC_COL_SKIP )		// sonst auch nCol nicht hochzaehlen
++                    BYTE nFmt = pColFormat[i];
++                    if (nFmt != SC_COL_SKIP)        // sonst auch nCol nicht hochzaehlen
+                     {
+                         if (nCol > MAXCOL)
+                             bOverflow = TRUE;       // display warning on import
+@@ -1260,11 +1266,15 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
+                         {
+                             xub_StrLen nStart = pColStart[i];
+                             xub_StrLen nNext = ( i+1 < nInfoCount ) ? pColStart[i+1] : nLineLen;
+-                            aCell = lcl_GetFixed( aLine, nStart, nNext );
+-                            bMultiLine |= lcl_PutString( pDoc, nCol, nRow,
+-                                    nTab, aCell, pColFormat[i],
+-                                    aTransliteration, aCalendar,
+-                                    pEnglishTransliteration, pEnglishCalendar);
++                            bool bIsQuoted = false;
++                            aCell = lcl_GetFixed( aLine, nStart, nNext, bIsQuoted );
++                            if (bIsQuoted && bQuotedAsText)
++                                nFmt = SC_COL_TEXT;
++
++                            bMultiLine |= lcl_PutString( 
++                                pDoc, nCol, nRow, nTab, aCell, nFmt,
++                                &aNumFormatter, bDetectNumFormat, aTransliteration, aCalendar,
++                                pEnglishTransliteration, pEnglishCalendar);
+                         }
+                         ++nCol;
+                     }
+@@ -1281,7 +1291,8 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
+                 // SC_COL_SKIP.
+                 while (*p && nCol <= MAXCOL+1)
+                 {
+-                    p = ScImportExport::ScanNextFieldFromString( p, aCell, cStr, pSeps, bMerge );
++                    bool bIsQuoted = false;
++                    p = ScImportExport::ScanNextFieldFromString( p, aCell, cStr, pSeps, bMerge, bIsQuoted );
+ 
+                     BYTE nFmt = SC_COL_STANDARD;
+                     for ( i=nInfoStart; i<nInfoCount; i++ )
+@@ -1298,10 +1309,15 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
+                         if (nCol > MAXCOL)
+                             bOverflow = TRUE;       // display warning on import
+                         else if (!bDetermineRange)
+-                            bMultiLine |= lcl_PutString( pDoc, nCol, nRow,
+-                                    nTab, aCell, nFmt, aTransliteration,
+-                                    aCalendar, pEnglishTransliteration,
+-                                    pEnglishCalendar);
++                        {
++                            if (bIsQuoted && bQuotedAsText)
++                                nFmt = SC_COL_TEXT;
++
++                            bMultiLine |= lcl_PutString( 
++                                pDoc, nCol, nRow, nTab, aCell, nFmt, 
++                                &aNumFormatter, bDetectNumFormat, aTransliteration,
++                                aCalendar, pEnglishTransliteration, pEnglishCalendar);
++                        }
+                         ++nCol;
+                     }
+ 
+@@ -1375,11 +1391,13 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
+ 
+ // static
+ const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p,
+-        String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, BOOL bMergeSeps )
++		String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool& rbIsQuoted )
+ {
++    rbIsQuoted = false;
+     rField.Erase();
+     if ( *p == cStr )			// String in Anfuehrungszeichen
+     {
++        rbIsQuoted = true;
+         const sal_Unicode* p1;
+         p1 = p = lcl_ScanString( p, rField, cStr, DQM_ESCAPE );
+         while ( *p && !ScGlobal::UnicodeStrChr( pSeps, *p ) )
+@@ -2038,7 +2056,7 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin {
+     virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress&,
+                  const CharSet, UINT32 ) RETURN_ERROR
+     virtual FltError ScImportRTF( SvStream&, const String&, ScDocument*, ScRange& ) RETURN_ERROR
+-    virtual FltError ScImportHTML( SvStream&, const String&, ScDocument*, ScRange&, double, BOOL ) RETURN_ERROR
++    virtual FltError ScImportHTML( SvStream&, const String&, ScDocument*, ScRange&, double, BOOL, SvNumberFormatter*, bool ) RETURN_ERROR
+ 
+     virtual ScEEAbsImport *CreateRTFImport( ScDocument*, const ScRange& ) { return NULL; }
+     virtual ScEEAbsImport *CreateHTMLImport( ScDocument*, const String&, const ScRange&, BOOL ) { return NULL; }
+diff --git sc/source/ui/inc/asciiopt.hxx sc/source/ui/inc/asciiopt.hxx
+index ec601a9..d3f9ba4 100644
+--- sc/source/ui/inc/asciiopt.hxx
++++ sc/source/ui/inc/asciiopt.hxx
+@@ -55,7 +55,7 @@
+ #include <tools/stream.hxx>
+ #include <svx/txencbox.hxx>
+ #include "csvtablebox.hxx"
+-
++#include "i18npool/lang.h"
+ 
+ // ============================================================================
+ 
+@@ -65,8 +65,11 @@ private:
+     BOOL		bFixedLen;
+     String		aFieldSeps;
+     BOOL		bMergeFieldSeps;
++    bool        bQuotedFieldAsText;
++    bool        bDetectSpecialNumber;
+     sal_Unicode	cTextSep;
+     CharSet		eCharSet;
++    LanguageType eLang;
+     BOOL		bCharSetSystem;
+     long		nStartRow;
+     USHORT		nInfoCount;
+@@ -93,20 +96,26 @@ public:
+     BOOL				GetCharSetSystem() const	{ return bCharSetSystem; }
+     const String&		GetFieldSeps() const	{ return aFieldSeps; }
+     BOOL				IsMergeSeps() const		{ return bMergeFieldSeps; }
++    bool                IsQuotedAsText() const  { return bQuotedFieldAsText; }
++    bool                IsDetectSpecialNumber() const { return bDetectSpecialNumber; }
+     sal_Unicode			GetTextSep() const		{ return cTextSep; }
+     BOOL				IsFixedLen() const		{ return bFixedLen; }
+     USHORT				GetInfoCount() const	{ return nInfoCount; }
+     const xub_StrLen*	GetColStart() const		{ return pColStart; }
+     const BYTE*			GetColFormat() const	{ return pColFormat; }
+     long				GetStartRow() const		{ return nStartRow; }
++    LanguageType        GetLanguage() const     { return eLang; }
+ 
+     void	SetCharSet( CharSet eNew )			{ eCharSet = eNew; }
+     void	SetCharSetSystem( BOOL bSet )		{ bCharSetSystem = bSet; }
+     void	SetFixedLen( BOOL bSet )			{ bFixedLen = bSet; }
+     void	SetFieldSeps( const String& rStr )	{ aFieldSeps = rStr; }
+     void	SetMergeSeps( BOOL bSet )			{ bMergeFieldSeps = bSet; }
++    void    SetQuotedAsText(bool bSet)          { bQuotedFieldAsText = bSet; }
++    void    SetDetectSpecialNumber(bool bSet)   { bDetectSpecialNumber = bSet; }
+     void	SetTextSep( sal_Unicode c )			{ cTextSep = c; }
+     void	SetStartRow( long nRow)				{ nStartRow= nRow; }
++    void    SetLanguage(LanguageType e)         { eLang = e; }
+ 
+     void	SetColInfo( USHORT nCount, const xub_StrLen* pStart, const BYTE* pFormat );
+     void    SetColumnInfo( const ScCsvExpDataVec& rDataVec );
+diff --git sc/source/ui/inc/csvruler.hxx sc/source/ui/inc/csvruler.hxx
+index c251831..cd67708 100644
+--- sc/source/ui/inc/csvruler.hxx
++++ sc/source/ui/inc/csvruler.hxx
+@@ -71,6 +71,7 @@ private:
+     // ------------------------------------------------------------------------
+ public:
+     explicit                    ScCsvRuler( ScCsvControl& rParent );
++                                ~ScCsvRuler();
+ 
+     // common ruler handling --------------------------------------------------
+ public:
+diff --git sc/source/ui/inc/docsh.hxx sc/source/ui/inc/docsh.hxx
+index 8aa9efe..07d372b 100644
+--- sc/source/ui/inc/docsh.hxx
++++ sc/source/ui/inc/docsh.hxx
+@@ -398,6 +398,7 @@ public:
+ 
+     static ScDocShell* GetShellByNum( USHORT nDocNo );
+     static String	GetOwnFilterName();
++        static String   GetHtmlFilterName();
+     static String	GetWebQueryFilterName();
+     static String	GetAsciiFilterName();
+     static String	GetLotusFilterName();
+diff --git sc/source/ui/inc/impex.hxx sc/source/ui/inc/impex.hxx
+index 3abab58..5ef0f1f 100644
+--- sc/source/ui/inc/impex.hxx
++++ sc/source/ui/inc/impex.hxx
+@@ -110,7 +110,7 @@ public:
+ 
+     static BOOL  IsFormatSupported( ULONG nFormat );
+     static const sal_Unicode* ScanNextFieldFromString( const sal_Unicode* p,
+-            String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, BOOL bMergeSeps );
++			String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool& rbIsQuoted );
+     static	void	WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero = FALSE );
+     static	void	WriteUnicodeOrByteEndl( SvStream& rStrm );
+     static	inline	BOOL	IsEndianSwap( const SvStream& rStrm );
+diff --git sc/source/ui/inc/scuiasciiopt.hxx sc/source/ui/inc/scuiasciiopt.hxx
+index 643fb3b..4515a86 100644
+--- sc/source/ui/inc/scuiasciiopt.hxx
++++ sc/source/ui/inc/scuiasciiopt.hxx
+@@ -35,6 +35,8 @@
+ 
+ 
+ #include "asciiopt.hxx"
++#include "svx/langbox.hxx"
++
+ // ============================================================================
+ 
+ class ScImportAsciiDlg : public ModalDialog
+@@ -49,6 +51,8 @@ class ScImportAsciiDlg : public ModalDialog
+     FixedLine                   aFlFieldOpt;
+     FixedText                   aFtCharSet;
+     SvxTextEncodingBox          aLbCharSet;
++    FixedText                   aFtCustomLang;
++    SvxLanguageBox              aLbCustomLang;
+ 
+     FixedText                   aFtRow;
+     NumericField                aNfRow;
+@@ -64,6 +68,12 @@ class ScImportAsciiDlg : public ModalDialog
+     CheckBox                    aCkbOther;
+     Edit                        aEdOther;
+     CheckBox                    aCkbAsOnce;
++
++    FixedLine                   aFlOtherOpt;
++
++    CheckBox                    aCkbQuotedAsText;
++    CheckBox                    aCkbDetectNumber;
++
+     FixedText                   aFtTextSep;
+     ComboBox                    aCbTextSep;
+ 
+@@ -87,6 +97,7 @@ class ScImportAsciiDlg : public ModalDialog
+ 
+     CharSet                     meCharSet;          /// Selected char set.
+     bool                        mbCharSetSystem;    /// Is System char set selected?
++    bool                        mbFileImport;       /// Is this dialog involked for csv file import ?
+ 
+ public:
+                                 ScImportAsciiDlg(
+diff --git sc/source/ui/inc/textimportoptions.hrc sc/source/ui/inc/textimportoptions.hrc
+new file mode 100644
+index 0000000..eb981c1
+--- /dev/null
++++ sc/source/ui/inc/textimportoptions.hrc
+@@ -0,0 +1,42 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: retypepassdlg.src,v $
++ * $Revision: 1.1.2.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#include <sc.hrc>
++
++#define BTN_OK                   1
++#define BTN_CANCEL               2
++#define BTN_HELP                 3
++
++#define FL_CHOOSE_LANG           4
++#define RB_AUTOMATIC             5
++#define RB_CUSTOM                6
++#define LB_CUSTOM_LANG           7
++#define FL_OPTION                8
++#define BTN_CONVERT_DATE         9
+diff --git sc/source/ui/inc/textimportoptions.hxx sc/source/ui/inc/textimportoptions.hxx
+new file mode 100644
+index 0000000..8ef489a
+--- /dev/null
++++ sc/source/ui/inc/textimportoptions.hxx
+@@ -0,0 +1,76 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: langbox.hxx,v $
++ * $Revision: 1.4.242.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_UI_IMPORTOPTIONS_HXX
++#define SC_UI_IMPORTOPTIONS_HXX
++
++#include "vcl/dialog.hxx"
++#include "vcl/button.hxx"
++#include "vcl/fixed.hxx"
++#include "i18npool/lang.h"
++#include "svx/langbox.hxx"
++
++class ScTextImportOptionsDlg : public ModalDialog
++{
++public:
++    ScTextImportOptionsDlg(Window* pParent);
++    virtual ~ScTextImportOptionsDlg();
++
++    virtual short Execute();
++
++    LanguageType getLanguageType() const;
++    bool isDateConversionSet() const;
++
++private:
++    void init();
++
++private:
++    OKButton        maBtnOk;
++    CancelButton    maBtnCancel;
++    HelpButton      maBtnHelp;
++
++    FixedLine       maFlChooseLang;
++
++    RadioButton     maRbAutomatic;
++    RadioButton     maRbCustom;
++
++    SvxLanguageBox  maLbCustomLang;
++
++    FixedLine       maFlOption;
++
++    CheckBox        maBtnConvertDate;
++
++    DECL_LINK( OKHdl, OKButton* );
++
++    DECL_LINK( RadioHdl, RadioButton* );
++};
++
++
++#endif
+diff --git sc/source/ui/unoobj/filtuno.cxx sc/source/ui/unoobj/filtuno.cxx
+index 8b93ff9..02d2f9d 100644
+--- sc/source/ui/unoobj/filtuno.cxx
++++ sc/source/ui/unoobj/filtuno.cxx
+@@ -51,7 +51,12 @@
+ 
+ #include "sc.hrc" //CHINA001
+ #include "scabstdlg.hxx" //CHINA001
++#include "i18npool/lang.h"
++
++#include <memory>
++
+ using namespace ::com::sun::star;
++using ::rtl::OUStringBuffer;
+ 
+ //------------------------------------------------------------------------
+ 
+@@ -146,6 +151,10 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
+     sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
+ 
+     String aFilterString( aFilterName );
++
++    ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
++    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
++
+     if ( !bExport && aFilterString == ScDocShell::GetAsciiFilterName() )
+     {
+         //	ascii import is special...
+@@ -164,8 +173,6 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
+             pInStream = utl::UcbStreamHelper::CreateStream( xInputStream );
+ 
+         //CHINA001 ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( NULL, aPrivDatName, pInStream, cAsciiDel );
+-        ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
+-        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+         AbstractScImportAsciiDlg* pDlg = pFact->CreateScImportAsciiDlg( NULL, aPrivDatName, pInStream, RID_SCDLG_ASCII, cAsciiDel);
+         DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+         if ( pDlg->Execute() == RET_OK )
+@@ -178,6 +185,24 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
+         delete pDlg;
+         delete pInStream;
+     }
++    else if ( aFilterString == ScDocShell::GetWebQueryFilterName() || aFilterString == ScDocShell::GetHtmlFilterName() )
++    {
++        // HTML import.
++        ::std::auto_ptr<AbstractScTextImportOptionsDlg> pDlg(
++            pFact->CreateScTextImportOptionsDlg(NULL, RID_SCDLG_TEXT_IMPORT_OPTIONS));
++
++        if (pDlg->Execute() == RET_OK)
++        {
++            LanguageType eLang = pDlg->GetLanguageType();
++            OUStringBuffer aBuf;
++
++            aBuf.append(String::CreateFromInt32(static_cast<sal_Int32>(eLang)));
++            aBuf.append(sal_Unicode(' '));
++            aBuf.append(pDlg->IsDateConversionSet() ? sal_Unicode('1') : sal_Unicode('0'));
++            aFilterOptions = aBuf.makeStringAndClear();
++            nRet = ui::dialogs::ExecutableDialogResults::OK;
++        }
++    }
+     else
+     {
+         sal_Bool bMultiByte = sal_True;
+@@ -249,8 +274,6 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
+ //CHINA001		&aOptions, &aTitle, bMultiByte, bDBEnc,
+ //CHINA001		!bExport );
+ //CHINA001 
+-        ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
+-        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ 
+         AbstractScImportOptionsDlg* pDlg = pFact->CreateScImportOptionsDlg( NULL, RID_SCDLG_IMPORTOPT,
+                                                                             bAscii, &aOptions, &aTitle, bMultiByte, bDBEnc,
+diff --git sc/util/makefile.mk sc/util/makefile.mk
+index 2b56e37..214e210 100644
+--- sc/util/makefile.mk
++++ sc/util/makefile.mk
+@@ -283,6 +283,7 @@ LIB8OBJFILES = \
+         $(SLO)$/dapidata.obj	\
+         $(SLO)$/crdlg.obj			\
+         $(SLO)$/scuiasciiopt.obj	\
++		$(SLO)$/textimportoptions.obj	\
+         $(SLO)$/scuiautofmt.obj	\
+         $(SLO)$/dpgroupdlg.obj	\
+         $(SLO)$/editfield.obj
diff --git a/applied_patches/0012-cws-kohei03-chart2.diff b/applied_patches/0012-cws-kohei03-chart2.diff
new file mode 100644
index 000000000..119afcce7
--- /dev/null
+++ b/applied_patches/0012-cws-kohei03-chart2.diff
@@ -0,0 +1,99 @@
+diff --git chart2/source/view/charttypes/PieChart.cxx chart2/source/view/charttypes/PieChart.cxx
+index 80f856e..3596d17 100644
+--- chart2/source/view/charttypes/PieChart.cxx
++++ chart2/source/view/charttypes/PieChart.cxx
+@@ -129,6 +129,8 @@ PieChart::PieChart( const uno::Reference<XChartType>& xChartTypeModel
+         , m_pPosHelper( new PiePositionHelper( NormalAxis_Z, (m_nDimension==3)?0.0:90.0 ) )
+         , m_bUseRings(false)
+ {
++    ::rtl::math::setNan(&m_fMaxOffset);
++
+     PlotterBase::m_pPosHelper = m_pPosHelper;
+     VSeriesPlotter::m_pMainPosHelper = m_pPosHelper;
+     m_pPosHelper->m_fRadiusOffset = 0.0;
+@@ -248,27 +250,31 @@ double PieChart::getMinimumX()
+ {
+     return 0.5;
+ }
+-double PieChart::getMaxOffset() const
++double PieChart::getMaxOffset()
+ {
+-    double fRet = 0.0;
++    if (!::rtl::math::isNan(m_fMaxOffset))
++        // Value already cached.  Use it.
++        return m_fMaxOffset;
++
++    m_fMaxOffset = 0.0;
+     if( m_aZSlots.size()<=0 )
+-        return fRet;
++        return m_fMaxOffset;
+     if( m_aZSlots[0].size()<=0 )
+-        return fRet;
++        return m_fMaxOffset;
+ 
+     const ::std::vector< VDataSeries* >& rSeriesList( m_aZSlots[0][0].m_aSeriesVector );
+     if( rSeriesList.size()<=0 )
+-        return fRet;
++        return m_fMaxOffset;
+ 
+     VDataSeries* pSeries = rSeriesList[0];
+     uno::Reference< beans::XPropertySet > xSeriesProp( pSeries->getPropertiesOfSeries() );
+     if( !xSeriesProp.is() )
+-        return fRet;
++        return m_fMaxOffset;
+ 
+     double fExplodePercentage=0.0;
+     xSeriesProp->getPropertyValue( C2U( "Offset" )) >>= fExplodePercentage;
+-    if(fExplodePercentage>fRet)
+-        fRet=fExplodePercentage;
++    if(fExplodePercentage>m_fMaxOffset)
++        m_fMaxOffset=fExplodePercentage;
+ 
+     uno::Sequence< sal_Int32 > aAttributedDataPointIndexList;
+     if( xSeriesProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList )
+@@ -280,12 +286,12 @@ double PieChart::getMaxOffset() const
+             {
+                 fExplodePercentage=0.0;
+                 xPointProp->getPropertyValue( C2U( "Offset" )) >>= fExplodePercentage;
+-                if(fExplodePercentage>fRet)
+-                    fRet=fExplodePercentage;
++                if(fExplodePercentage>m_fMaxOffset)
++                    m_fMaxOffset=fExplodePercentage;
+             }
+         }
+     }
+-    return fRet;
++    return m_fMaxOffset;
+ }
+ double PieChart::getMaximumX()
+ {
+@@ -357,6 +363,7 @@ void PieChart::createShapes()
+         nExplodeableSlot = m_aZSlots[0].size()-1;
+ 
+     m_aLabelInfoList.clear();
++    ::rtl::math::setNan(&m_fMaxOffset);
+ 
+ //=============================================================================
+     for( double fSlotX=0; aXSlotIter != aXSlotEnd && (m_bUseRings||fSlotX<0.5 ); aXSlotIter++, fSlotX+=1.0 )
+diff --git chart2/source/view/charttypes/PieChart.hxx chart2/source/view/charttypes/PieChart.hxx
+index e32a9e8..6447515 100644
+--- chart2/source/view/charttypes/PieChart.hxx
++++ chart2/source/view/charttypes/PieChart.hxx
+@@ -105,7 +105,7 @@ private: //methods
+                         , double fLogicZ, double fDepth, double fExplodePercentage
+                         , tPropertyNameValueMap* pOverWritePropertiesMap );
+ 
+-    double              getMaxOffset() const;
++    double              getMaxOffset();
+     bool                detectLabelOverlapsAndMove(const ::com::sun::star::awt::Size& rPageSize);//returns true when there might be more to do
+     void                resetLabelPositionsToPreviousState();
+ struct PieLabelInfo;
+@@ -137,6 +137,8 @@ private: //member
+     };
+ 
+     ::std::vector< PieLabelInfo > m_aLabelInfoList;
++
++    double m_fMaxOffset;    /// cached max offset value (init'ed to NaN)
+ };
+ //.............................................................................
+ } //namespace chart
diff --git a/applied_patches/0013-cws-kohei03-sc.diff b/applied_patches/0013-cws-kohei03-sc.diff
new file mode 100644
index 000000000..bbd5526ff
--- /dev/null
+++ b/applied_patches/0013-cws-kohei03-sc.diff
@@ -0,0 +1,3426 @@
+diff --git sc/inc/chart2uno.hxx sc/inc/chart2uno.hxx
+index 93afe64..46b7ff0 100644
+--- sc/inc/chart2uno.hxx
++++ sc/inc/chart2uno.hxx
+@@ -533,6 +533,14 @@ private:
+     };
+ 
+     ::std::list<Item>           m_aDataArray;
++
++    /** 
++     * Cached data for getData.  We may also need to cache data for the 
++     * numerical and textural data series if they turn out to be bottlenecks 
++     * under certain scenarios.
++     */ 
++    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aMixedDataCache;
++
+     ::com::sun::star::uno::Sequence<sal_Int32>  m_aHiddenValues;
+ 
+     // properties
+diff --git sc/inc/chartlis.hxx sc/inc/chartlis.hxx
+index a8a97d3..51ac644 100644
+--- sc/inc/chartlis.hxx
++++ sc/inc/chartlis.hxx
+@@ -49,7 +49,7 @@ class ScChartUnoData;
+ #include <com/sun/star/chart/XChartData.hpp>
+ #include <com/sun/star/chart/XChartDataChangeEventListener.hpp>
+ 
+-class ScChartListener : public StrData, public SvtListener
++class SC_DLLPUBLIC ScChartListener : public StrData, public SvtListener
+ {
+ public:
+     class ExternalRefListener : public ScExternalRefManager::LinkListener
+diff --git sc/inc/column.hxx sc/inc/column.hxx
+index e4c7ed4..983ca1f 100644
+--- sc/inc/column.hxx
++++ sc/inc/column.hxx
+@@ -114,7 +114,7 @@ private:
+ friend class ScDocument;					// fuer FillInfo
+ friend class ScDocumentIterator;
+ friend class ScValueIterator;
+-friend class ScQueryValueIterator;
++friend class ScDBQueryDataIterator;
+ friend class ScColumnIterator;
+ friend class ScQueryCellIterator;
+ friend class ScMarkedDataIter;
+diff --git sc/inc/datauno.hxx sc/inc/datauno.hxx
+index 3103875..44e0336 100644
+--- sc/inc/datauno.hxx
++++ sc/inc/datauno.hxx
+@@ -32,6 +32,8 @@
+ #define SC_DATAUNO_HXX
+ 
+ #include "global.hxx"
++#include "queryparam.hxx"
++
+ #include <svtools/itemprop.hxx>
+ #include <svtools/lstner.hxx>
+ #include <com/sun/star/sheet/TableFilterField.hpp>
+diff --git sc/inc/dociter.hxx sc/inc/dociter.hxx
+index d5d4235..350c611 100644
+--- sc/inc/dociter.hxx
++++ sc/inc/dociter.hxx
+@@ -35,6 +35,9 @@
+ #include <tools/solar.h>
+ #include "global.hxx"
+ #include "scdllapi.h"
++#include "queryparam.hxx"
++
++#include <memory>
+ 
+ class ScDocument;
+ class ScBaseCell;
+@@ -127,34 +130,91 @@ public:
+                     }
+ };
+ 
+-class ScQueryValueIterator            // alle Zahlenwerte in einem Bereich durchgehen
++// ============================================================================
++
++class ScDBQueryDataIterator
+ {
++public:
++    struct Value
++    {
++        ::rtl::OUString maString;
++        double          mfValue;
++        sal_uInt16      mnError;
++        bool            mbIsNumber;
++
++        Value();
++    };
++
+ private:
+-    ScQueryParam	aParam;
+-    ScDocument*		pDoc;
+-    const ScAttrArray*	pAttrArray;
+-    ULONG			nNumFormat;		// fuer CalcAsShown
+-    ULONG			nNumFmtIndex;
+-    SCCOL 			nCol;
+-    SCROW			nRow;
+-    SCSIZE			nColRow;
+-    SCROW			nAttrEndRow;
+-    SCTAB			nTab;
+-    short			nNumFmtType;
+-    BOOL			bCalcAsShown;
++    class DataAccess
++    {
++    public:
++        DataAccess(const ScDBQueryDataIterator* pParent);
++        virtual ~DataAccess() = 0;
++        virtual bool getCurrent(Value& rValue) = 0;
++        virtual bool getFirst(Value& rValue) = 0;
++        virtual bool getNext(Value& rValue) = 0;
++    protected:
++        const ScDBQueryDataIterator* mpParent;
++    };
++
++    class DataAccessInternal : public DataAccess
++    {
++    public:
++        DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc);
++        virtual ~DataAccessInternal();
++        virtual bool getCurrent(Value& rValue);
++        virtual bool getFirst(Value& rValue);
++        virtual bool getNext(Value& rValue);
++
++    private:
++        ScDBQueryParamInternal* mpParam;
++        ScDocument*         mpDoc;
++        const ScAttrArray*  pAttrArray;
++        ULONG               nNumFormat;     // for CalcAsShown
++        ULONG               nNumFmtIndex;
++        SCCOL               nCol;
++        SCROW               nRow;
++        SCSIZE              nColRow;
++        SCROW               nAttrEndRow;
++        SCTAB               nTab;
++        short               nNumFmtType;
++        bool                bCalcAsShown;
++    };
++
++    class DataAccessMatrix : public DataAccess
++    {
++    public:
++        DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam);
++        virtual ~DataAccessMatrix();
++        virtual bool getCurrent(Value& rValue);
++        virtual bool getFirst(Value& rValue);
++        virtual bool getNext(Value& rValue);
++
++    private:
++        bool isValidQuery(SCROW mnRow, const ScMatrix& rMat) const;
++
++        ScDBQueryParamMatrix* mpParam;
++        SCROW mnCurRow;
++        SCROW mnRows;
++        SCCOL mnCols;
++    };
++
++    ::std::auto_ptr<ScDBQueryParamBase> mpParam;
++    ::std::auto_ptr<DataAccess>         mpData;
++
++    bool            GetThis(Value& rValue);
+ 
+-    BOOL			GetThis(double& rValue, USHORT& rErr);
+ public:
+-                    ScQueryValueIterator(ScDocument* pDocument, SCTAB nTable,
+-                                         const ScQueryParam& aParam);
++                    ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam);
+     /// Does NOT reset rValue if no value found!
+-    BOOL			GetFirst(double& rValue, USHORT& rErr);
++    bool            GetFirst(Value& rValue);
+     /// Does NOT reset rValue if no value found!
+-    BOOL			GetNext(double& rValue, USHORT& rErr);
+-    void			GetCurNumFmtInfo( short& nType, ULONG& nIndex )
+-                        { nType = nNumFmtType; nIndex = nNumFmtIndex; }
++    bool            GetNext(Value& rValue);
+ };
+ 
++// ============================================================================
++
+ class ScCellIterator            // alle Zellen in einem Bereich durchgehen
+ {								// bei SubTotal aber keine ausgeblendeten und
+ private:						// SubTotalZeilen
+diff --git sc/inc/document.hxx sc/inc/document.hxx
+index 240765d..d01ee71 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -227,7 +227,7 @@ class ScDocument
+ {
+ friend class ScDocumentIterator;
+ friend class ScValueIterator;
+-friend class ScQueryValueIterator;
++friend class ScDBQueryDataIterator;
+ friend class ScCellIterator;
+ friend class ScQueryCellIterator;
+ friend class ScHorizontalCellIterator;
+diff --git sc/inc/dpcachetable.hxx sc/inc/dpcachetable.hxx
+index 7a60535..0a22fb0 100644
+--- sc/inc/dpcachetable.hxx
++++ sc/inc/dpcachetable.hxx
+@@ -60,6 +60,7 @@ class ScDPDimension;
+ class ScDPCollection;
+ struct ScDPCacheCell;
+ struct ScDPItemData;
++struct ScQueryParam;
+ class Date;
+ 
+ // ----------------------------------------------------------------------------
+diff --git sc/inc/dpshttab.hxx sc/inc/dpshttab.hxx
+index ede4933..8483ca2 100644
+--- sc/inc/dpshttab.hxx
++++ sc/inc/dpshttab.hxx
+@@ -35,6 +35,7 @@
+ #include "global.hxx"
+ #include "address.hxx"
+ #include "scdllapi.h"
++#include "queryparam.hxx"
+ 
+ #include <vector>
+ 
+diff --git sc/inc/global.hxx sc/inc/global.hxx
+index 57a6ff1..b401cb9 100644
+--- sc/inc/global.hxx
++++ sc/inc/global.hxx
+@@ -817,47 +817,6 @@ struct ScQueryEntry
+     BOOL			operator==( const ScQueryEntry& r ) const;
+ };
+ 
+-struct SC_DLLPUBLIC ScQueryParam
+-{
+-    SCCOL			nCol1;
+-    SCROW			nRow1;
+-    SCCOL			nCol2;
+-    SCROW			nRow2;
+-    SCTAB			nTab;
+-    BOOL			bHasHeader;
+-    BOOL			bByRow;
+-    BOOL			bInplace;
+-    BOOL			bCaseSens;
+-    BOOL			bRegExp;
+-    BOOL            bMixedComparison;   // whether numbers are smaller than strings
+-    BOOL			bDuplicate;
+-    BOOL			bDestPers;			// nicht gespeichert
+-    SCTAB			nDestTab;
+-    SCCOL			nDestCol;
+-    SCROW			nDestRow;
+-
+-private:
+-    SCSIZE			nEntryCount;
+-    ScQueryEntry*	pEntries;
+-
+-public:
+-    ScQueryParam();
+-    ScQueryParam( const ScQueryParam& r );
+-    ~ScQueryParam();
+-
+-    SCSIZE          GetEntryCount() const           { return nEntryCount; }
+-    ScQueryEntry&   GetEntry(SCSIZE n) const        { return pEntries[n]; }
+-    void            Resize(SCSIZE nNew);
+-
+-    ScQueryParam&   operator=   ( const ScQueryParam& r );
+-    BOOL            operator==  ( const ScQueryParam& rOther ) const;
+-    void            Clear       ();
+-    void            DeleteQuery( SCSIZE nPos );
+-
+-    void            MoveToDest();
+-    void            FillInExcelSyntax(String& aCellStr, SCSIZE nIndex);
+-};
+-
+ // -----------------------------------------------------------------------
+ 
+ struct SC_DLLPUBLIC ScSubTotalParam
+diff --git sc/inc/queryparam.hxx sc/inc/queryparam.hxx
+new file mode 100644
+index 0000000..bc50237
+--- /dev/null
++++ sc/inc/queryparam.hxx
+@@ -0,0 +1,142 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: interpre.hxx,v $
++ * $Revision: 1.35.44.2 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_QUERYPARAM_HXX
++#define SC_QUERYPARAM_HXX
++
++#include "global.hxx"
++#include "scmatrix.hxx"
++
++#include <vector>
++
++struct ScDBQueryParamInternal;
++
++struct ScQueryParamBase
++{
++    bool            bHasHeader;
++    bool            bByRow;
++    bool            bInplace;
++    bool            bCaseSens;
++    bool            bRegExp;
++    bool            bDuplicate;
++    bool            bMixedComparison;   // whether numbers are smaller than strings
++
++    virtual ~ScQueryParamBase();
++
++    SC_DLLPUBLIC SCSIZE GetEntryCount() const;
++    SC_DLLPUBLIC ScQueryEntry& GetEntry(SCSIZE n) const;
++    void Resize(SCSIZE nNew);
++    SC_DLLPUBLIC void DeleteQuery( SCSIZE nPos );
++    void FillInExcelSyntax(String& aCellStr, SCSIZE nIndex);
++
++protected:
++    ScQueryParamBase();
++    ScQueryParamBase(const ScQueryParamBase& r);
++
++    mutable ::std::vector<ScQueryEntry>  maEntries;
++};
++
++// ============================================================================
++
++struct ScQueryParamTable
++{
++    SCCOL           nCol1;
++    SCROW           nRow1;
++    SCCOL           nCol2;
++    SCROW           nRow2;
++    SCTAB           nTab;
++
++    ScQueryParamTable();
++    ScQueryParamTable(const ScQueryParamTable& r);
++    virtual ~ScQueryParamTable();
++};
++
++// ============================================================================
++
++struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamTable
++{
++    BOOL            bDestPers;          // nicht gespeichert
++    SCTAB           nDestTab;
++    SCCOL           nDestCol;
++    SCROW           nDestRow;
++
++    ScQueryParam();
++    ScQueryParam( const ScQueryParam& r );
++    ScQueryParam( const ScDBQueryParamInternal& r );
++    virtual ~ScQueryParam();
++
++    ScQueryParam&   operator=   ( const ScQueryParam& r );
++    BOOL            operator==  ( const ScQueryParam& rOther ) const;
++    void            Clear();
++    void            ClearDestParams();
++    void            MoveToDest();
++};
++
++// ============================================================================
++
++struct ScDBQueryParamBase : public ScQueryParamBase
++{
++    enum DataType { INTERNAL, MATRIX };
++
++    SCCOL   mnField;    /// the field in which the values are processed during iteration.
++    bool    mbSkipString;
++
++    DataType        GetType() const;
++
++    virtual ~ScDBQueryParamBase();
++
++protected:
++    ScDBQueryParamBase(DataType eType);
++
++private:
++    ScDBQueryParamBase();
++
++    DataType        meType;
++};
++
++// ============================================================================
++
++struct ScDBQueryParamInternal : public ScDBQueryParamBase, public ScQueryParamTable
++{
++    ScDBQueryParamInternal();
++    virtual ~ScDBQueryParamInternal();
++};
++
++// ============================================================================
++
++struct ScDBQueryParamMatrix : public ScDBQueryParamBase
++{
++    ScMatrixRef mpMatrix;
++
++    ScDBQueryParamMatrix();
++    virtual ~ScDBQueryParamMatrix();
++};
++
++#endif
+diff --git sc/inc/reftokenhelper.hxx sc/inc/reftokenhelper.hxx
+index d7b335f..99a5998 100644
+--- sc/inc/reftokenhelper.hxx
++++ sc/inc/reftokenhelper.hxx
+@@ -70,12 +70,12 @@ public:
+ 
+     static void getTokensFromRangeList(::std::vector<ScSharedTokenRef>& pTokens, const ScRangeList& rRanges);
+ 
+-    static bool isRef(const ScSharedTokenRef& pToken);
+-    static bool isExternalRef(const ScSharedTokenRef& pToken);
++    static bool SC_DLLPUBLIC isRef(const ScSharedTokenRef& pToken);
++    static bool SC_DLLPUBLIC isExternalRef(const ScSharedTokenRef& pToken);
+ 
+-    static bool intersects(const ::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
++    static bool SC_DLLPUBLIC intersects(const ::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
+ 
+-    static void join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
++    static void SC_DLLPUBLIC join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
+ 
+     static bool getDoubleRefDataFromToken(ScComplexRefData& rData, const ScSharedTokenRef& pToken);
+ };
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index 8194e25..589d73f 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -161,7 +161,7 @@ private:
+ friend class ScDocument;					// fuer FillInfo
+ friend class ScDocumentIterator;
+ friend class ScValueIterator;
+-friend class ScQueryValueIterator;
++friend class ScDBQueryDataIterator;
+ friend class ScCellIterator;
+ friend class ScQueryCellIterator;
+ friend class ScHorizontalCellIterator;
+diff --git sc/source/core/data/autonamecache.cxx sc/source/core/data/autonamecache.cxx
+index ea41e3e..329e7f4 100644
+--- sc/source/core/data/autonamecache.cxx
++++ sc/source/core/data/autonamecache.cxx
+@@ -40,6 +40,7 @@
+ #include "autonamecache.hxx"
+ #include "dociter.hxx"
+ #include "cell.hxx"
++#include "queryparam.hxx"
+ 
+ // -----------------------------------------------------------------------
+ 
+diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx
+index 2ae9972..09da3d6 100644
+--- sc/source/core/data/cell.cxx
++++ sc/source/core/data/cell.cxx
+@@ -1851,8 +1851,7 @@ void ScFormulaCell::SetDirty()
+ 
+ void ScFormulaCell::SetDirtyAfterLoad()
+ {
+-    bDirty = TRUE;
+-    if ( !pDocument->GetHardRecalcState() )
++    if ( bDirty && !pDocument->GetHardRecalcState() )
+         pDocument->PutInFormulaTree( this );
+ }
+ 
+diff --git sc/source/core/data/dociter.cxx sc/source/core/data/dociter.cxx
+index f7f836e..031b70a 100644
+--- sc/source/core/data/dociter.cxx
++++ sc/source/core/data/dociter.cxx
+@@ -47,9 +47,23 @@
+ #include "docoptio.hxx"
+ #include "cellform.hxx"
+ 
++#include <vector>
++
++using ::rtl::math::approxEqual;
++using ::std::vector;
++using ::rtl::OUString;
+ 
+ // STATIC DATA -----------------------------------------------------------
+ 
++namespace {
++
++void lcl_toUpper(OUString& rStr)
++{
++    rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, rStr.getLength());
++}
++
++}
++
+ ScDocumentIterator::ScDocumentIterator( ScDocument* pDocument,
+                             SCTAB nStartTable, SCTAB nEndTable ) :
+     pDoc( pDocument ),
+@@ -482,83 +496,85 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
+ }
+ */
+ 
+-//------------------------------------------------------------------------
+-//------------------------------------------------------------------------
++// ============================================================================
+ 
+-ScQueryValueIterator::ScQueryValueIterator(ScDocument* pDocument, SCTAB nTable, const ScQueryParam& rParam) :
+-    aParam (rParam),
+-    pDoc( pDocument ),
+-    nNumFmtIndex(0),
+-    nTab( nTable),
+-    nNumFmtType( NUMBERFORMAT_UNDEFINED ),
+-    bCalcAsShown( pDocument->GetDocOptions().IsCalcAsShown() )
++ScDBQueryDataIterator::DataAccess::DataAccess(const ScDBQueryDataIterator* pParent) :
++    mpParent(pParent)
+ {
+-    nCol = aParam.nCol1;
+-    nRow = aParam.nRow1;
++}
++
++ScDBQueryDataIterator::DataAccess::~DataAccess()
++{
++}
++
++// ----------------------------------------------------------------------------
++
++ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc) :
++    DataAccess(pParent), 
++    mpParam(pParam),
++    mpDoc(pDoc)
++{
++    nCol = mpParam->mnField;
++    nRow = mpParam->nRow1;
++    nTab = mpParam->nTab;
++
+     nColRow = 0;					// wird bei GetFirst initialisiert
+     SCSIZE i;
+-    SCSIZE nCount = aParam.GetEntryCount();
+-    for (i=0; (i<nCount) && (aParam.GetEntry(i).bDoQuery); i++)
++	SCSIZE nCount = mpParam->GetEntryCount();
++	for (i=0; (i<nCount) && (mpParam->GetEntry(i).bDoQuery); i++)
+     {
+-        ScQueryEntry& rEntry = aParam.GetEntry(i);
++		ScQueryEntry& rEntry = mpParam->GetEntry(i);
+         sal_uInt32 nIndex = 0;
+         rEntry.bQueryByString =
+-                !(pDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal));
++				!(mpDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal));
+     }
+     nNumFormat = 0;					// werden bei GetNumberFormat initialisiert
+     pAttrArray = 0;
+     nAttrEndRow = 0;
+ }
+ 
+-BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr)
++ScDBQueryDataIterator::DataAccessInternal::~DataAccessInternal()
+ {
+-    ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol];
+-    SCCOLROW nFirstQueryField = aParam.GetEntry(0).nField;
++}
++
++bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue)
++{
++	ScColumn* pCol = &(mpDoc->pTab[nTab])->aCol[nCol];
++    SCCOLROW nFirstQueryField = mpParam->GetEntry(0).nField;
+     for ( ;; )
+     {
+-        if ( nRow > aParam.nRow2 )
++        if (nRow > mpParam->nRow2)
+         {
+-            nRow = aParam.nRow1;
+-            if (aParam.bHasHeader)
+-                nRow++;
+-            do
+-            {
+-                nCol++;
+-                if ( nCol > aParam.nCol2 )
+-                {
+-                    // rValue = 0.0;    // do not change caller's value!
+-                    rErr = 0;
+-                    return FALSE;				// Ende und Aus
+-                }
+-                pCol = &(pDoc->pTab[nTab])->aCol[nCol];
+-            } while ( pCol->nCount == 0 );
+-            pCol->Search( nRow, nColRow );
++            // Bottom of the range reached.  Bail out.
++            rValue.mnError = 0;
++            return false;
+         }
+ 
+         while ( (nColRow < pCol->nCount) && (pCol->pItems[nColRow].nRow < nRow) )
+             nColRow++;
+ 
+-        if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= aParam.nRow2 )
++		if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= mpParam->nRow2 )
+         {
+             nRow = pCol->pItems[nColRow].nRow;
+             ScBaseCell* pCell = pCol->pItems[nColRow].pCell;
+-            if ( (pDoc->pTab[nTab])->ValidQuery( nRow, aParam, NULL,
++            if ( (mpDoc->pTab[nTab])->ValidQuery( nRow, *mpParam, NULL,
+                     (nCol == static_cast<SCCOL>(nFirstQueryField) ? pCell : NULL) ) )
+             {
+                 switch (pCell->GetCellType())
+                 {
+                     case CELLTYPE_VALUE:
+                         {
+-                            rValue = ((ScValueCell*)pCell)->GetValue();
++                            rValue.mfValue = ((ScValueCell*)pCell)->GetValue();
++                            rValue.mbIsNumber = true;
+                             if ( bCalcAsShown )
+                             {
+                                 lcl_IterGetNumberFormat( nNumFormat, pAttrArray,
+-                                    nAttrEndRow, pCol->pAttrArray, nRow, pDoc );
+-                                rValue = pDoc->RoundValueAsShown( rValue, nNumFormat );
++									nAttrEndRow, pCol->pAttrArray, nRow, mpDoc );
++                                rValue.mfValue = mpDoc->RoundValueAsShown( rValue.mfValue, nNumFormat );
+                             }
+                             nNumFmtType = NUMBERFORMAT_NUMBER;
+                             nNumFmtIndex = 0;
+-                            rErr = 0;
++                            rValue.mnError = 0;
+                             return TRUE;		// gefunden
+                         }
+ //                        break;
+@@ -566,17 +582,31 @@ BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr)
+                         {
+                             if (((ScFormulaCell*)pCell)->IsValue())
+                             {
+-                                rValue = ((ScFormulaCell*)pCell)->GetValue();
+-                                pDoc->GetNumberFormatInfo( nNumFmtType,
++                                rValue.mfValue = ((ScFormulaCell*)pCell)->GetValue();
++                                rValue.mbIsNumber = true;
++                                mpDoc->GetNumberFormatInfo( nNumFmtType,
+                                     nNumFmtIndex, ScAddress( nCol, nRow, nTab ),
+                                     pCell );
+-                                rErr = ((ScFormulaCell*)pCell)->GetErrCode();
++                                rValue.mnError = ((ScFormulaCell*)pCell)->GetErrCode();
+                                 return TRUE;	// gefunden
+                             }
+                             else
+                                 nRow++;
+                         }
+                         break;
++                    case CELLTYPE_STRING:
++                    case CELLTYPE_EDIT:
++                        if (mpParam->mbSkipString)
++                            ++nRow;
++                        else
++                        {
++                            rValue.maString = pCell->GetStringData();
++                            rValue.mfValue = 0.0;
++                            rValue.mnError = 0;
++                            rValue.mbIsNumber = false;
++                            return true;
++                        }
++                        break;
+                     default:
+                         nRow++;
+                         break;
+@@ -586,30 +616,309 @@ BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr)
+                 nRow++;
+         }
+         else
+-            nRow = aParam.nRow2 + 1; // Naechste Spalte
++			nRow = mpParam->nRow2 + 1; // Naechste Spalte
+     }
+-//    return FALSE;
++    return false;
+ }
+ 
+-BOOL ScQueryValueIterator::GetFirst(double& rValue, USHORT& rErr)
++bool ScDBQueryDataIterator::DataAccessInternal::getFirst(Value& rValue)
+ {
+-    nCol = aParam.nCol1;
+-    nRow = aParam.nRow1;
+-    if (aParam.bHasHeader)
++    if (mpParam->bHasHeader)
+         nRow++;
+-//	nColRow = 0;
+-    ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol];
++//  nColRow = 0;
++    ScColumn* pCol = &(mpDoc->pTab[nTab])->aCol[nCol];
+     pCol->Search( nRow, nColRow );
+-    return GetThis(rValue, rErr);
++    return getCurrent(rValue);
+ }
+ 
+-BOOL ScQueryValueIterator::GetNext(double& rValue, USHORT& rErr)
++bool ScDBQueryDataIterator::DataAccessInternal::getNext(Value& rValue)
+ {
+     ++nRow;
+-    return GetThis(rValue, rErr);
++    return getCurrent(rValue);
+ }
+ 
+-//-------------------------------------------------------------------------------
++// ----------------------------------------------------------------------------
++
++ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam) :
++    DataAccess(pParent),
++    mpParam(pParam)
++{
++    SCSIZE nC, nR;
++    mpParam->mpMatrix->GetDimensions(nC, nR);
++    mnRows = static_cast<SCROW>(nR);
++    mnCols = static_cast<SCCOL>(nC);
++}
++
++ScDBQueryDataIterator::DataAccessMatrix::~DataAccessMatrix()
++{
++}
++
++bool ScDBQueryDataIterator::DataAccessMatrix::getCurrent(Value& rValue)
++{
++    // Starting from row == mnCurRow, get the first row that satisfies all the
++    // query parameters.
++    for ( ;mnCurRow < mnRows; ++mnCurRow)
++    {
++        const ScMatrix& rMat = *mpParam->mpMatrix;
++        if (rMat.IsEmpty(mpParam->mnField, mnCurRow))
++            // Don't take empty values into account.
++            continue;
++
++        bool bIsStrVal = rMat.IsString(mpParam->mnField, mnCurRow);
++        if (bIsStrVal && mpParam->mbSkipString)
++            continue;
++
++        if (isValidQuery(mnCurRow, rMat))
++        {
++            rValue.maString = rMat.GetString(mpParam->mnField, mnCurRow);
++            rValue.mfValue = rMat.GetDouble(mpParam->mnField, mnCurRow);
++            rValue.mbIsNumber = !bIsStrVal;
++            rValue.mnError = 0;
++            return true;
++        }
++    }
++    return false;
++}
++
++bool ScDBQueryDataIterator::DataAccessMatrix::getFirst(Value& rValue)
++{
++    mnCurRow = mpParam->bHasHeader ? 1 : 0;
++    return getCurrent(rValue);
++}
++
++bool ScDBQueryDataIterator::DataAccessMatrix::getNext(Value& rValue)
++{
++    ++mnCurRow;
++    return getCurrent(rValue);
++}
++
++namespace {
++
++bool lcl_isQueryByValue(const ScQueryEntry& rEntry, const ScMatrix& rMat, SCSIZE nCol, SCSIZE nRow)
++{
++    if (rEntry.bQueryByString)
++        return false;
++
++    if (!rMat.IsValueOrEmpty(nCol, nRow))
++        return false;
++
++    return true;
++}
++
++bool lcl_isQueryByString(const ScQueryEntry& rEntry, const ScMatrix& rMat, SCSIZE nCol, SCSIZE nRow)
++{
++    switch (rEntry.eOp)
++    {
++        case SC_EQUAL:
++        case SC_NOT_EQUAL:
++        case SC_CONTAINS:
++        case SC_DOES_NOT_CONTAIN:
++        case SC_BEGINS_WITH:
++        case SC_ENDS_WITH:
++        case SC_DOES_NOT_BEGIN_WITH:
++        case SC_DOES_NOT_END_WITH:
++            return true;
++        default:
++            ;
++    }
++
++    if (rEntry.bQueryByString && rMat.IsString(nCol, nRow))
++        return true;
++
++    return false;
++}
++
++}
++
++bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScMatrix& rMat) const
++{
++    SCSIZE nEntryCount = mpParam->GetEntryCount();
++    vector<bool> aResults;
++    aResults.reserve(nEntryCount);
++
++    const CollatorWrapper& rCollator = 
++        mpParam->bCaseSens ? *ScGlobal::GetCaseCollator() : *ScGlobal::GetCollator();
++
++    for (SCSIZE i = 0; i < nEntryCount; ++i)
++    {
++        const ScQueryEntry& rEntry = mpParam->GetEntry(i);
++        if (!rEntry.bDoQuery)
++            continue;
++
++        switch (rEntry.eOp)
++        {
++            case SC_EQUAL:
++            case SC_LESS:
++            case SC_GREATER:
++            case SC_LESS_EQUAL:
++            case SC_GREATER_EQUAL:
++            case SC_NOT_EQUAL:
++                break;
++            default:
++                // Only the above operators are supported.
++                continue;
++        }
++
++        bool bValid = false;
++
++        SCSIZE nField = static_cast<SCSIZE>(rEntry.nField);
++        if (lcl_isQueryByValue(rEntry, rMat, nField, nRow))
++        {
++            // By value
++            double fMatVal = rMat.GetDouble(nField, nRow);
++            bool bEqual = approxEqual(fMatVal, rEntry.nVal);
++            switch (rEntry.eOp)
++            {
++                case SC_EQUAL:
++                    bValid = bEqual;
++                break;
++                case SC_LESS:
++                    bValid = (fMatVal < rEntry.nVal) && !bEqual;
++                break;
++                case SC_GREATER:
++                    bValid = (fMatVal > rEntry.nVal) && !bEqual;
++                break;
++                case SC_LESS_EQUAL:
++                    bValid = (fMatVal < rEntry.nVal) || bEqual;
++                break;
++                case SC_GREATER_EQUAL:
++                    bValid = (fMatVal > rEntry.nVal) || bEqual;
++                break;
++                case SC_NOT_EQUAL:
++                    bValid = !bEqual;
++                break;
++                default:
++                    ;
++            }
++        }
++        else if (lcl_isQueryByString(rEntry, rMat, nField, nRow))
++        {
++            // By string
++            do
++            {
++                if (!rEntry.pStr)
++                    break;
++
++                // Equality check first.
++
++                OUString aMatStr = rMat.GetString(nField, nRow);
++                lcl_toUpper(aMatStr);
++                OUString aQueryStr = *rEntry.pStr;
++                lcl_toUpper(aQueryStr);
++                bool bDone = false;
++                switch (rEntry.eOp)
++                {
++                    case SC_EQUAL:
++                        bValid = aMatStr.equals(aQueryStr);
++                        bDone = true;
++                    break;
++                    case SC_NOT_EQUAL:
++                        bValid = !aMatStr.equals(aQueryStr);
++                        bDone = true;
++                    break;
++                    default:
++                        ;
++                }
++
++                if (bDone)
++                    break;
++
++                // Unequality check using collator.
++
++                sal_Int32 nCompare = rCollator.compareString(aMatStr, aQueryStr);
++                switch (rEntry.eOp)
++                {
++                    case SC_LESS :
++                        bValid = (nCompare < 0);
++                    break;
++                    case SC_GREATER :
++                        bValid = (nCompare > 0);
++                    break;
++                    case SC_LESS_EQUAL :
++                        bValid = (nCompare <= 0);
++                    break;
++                    case SC_GREATER_EQUAL :
++                        bValid = (nCompare >= 0);
++                    break;
++                    default:
++                        ;
++                }
++            }
++            while (false);
++        }
++        else if (mpParam->bMixedComparison)
++        {
++            // Not used at the moment.
++        }
++
++        if (aResults.empty())
++            // First query entry.
++            aResults.push_back(bValid);
++        else if (rEntry.eConnect == SC_AND)
++        {
++            // For AND op, tuck the result into the last result value.
++            size_t n = aResults.size();    
++            aResults[n-1] = aResults[n-1] && bValid;
++        }
++        else
++            // For OR op, store its own result.
++            aResults.push_back(bValid);
++    }
++
++    // Row is valid as long as there is at least one result being true.
++    vector<bool>::const_iterator itr = aResults.begin(), itrEnd = aResults.end();
++    for (; itr != itrEnd; ++itr)
++        if (*itr)
++            return true;
++
++    return false;
++}
++
++// ----------------------------------------------------------------------------
++
++ScDBQueryDataIterator::Value::Value() :
++    mnError(0), mbIsNumber(true)
++{
++    ::rtl::math::setNan(&mfValue);
++}
++
++// ----------------------------------------------------------------------------
++
++ScDBQueryDataIterator::ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam) :
++    mpParam (pParam)
++{
++    switch (mpParam->GetType())
++    {
++        case ScDBQueryParamBase::INTERNAL:
++        {
++            ScDBQueryParamInternal* p = static_cast<ScDBQueryParamInternal*>(pParam);
++            mpData.reset(new DataAccessInternal(this, p, pDocument));
++        }
++        break;
++        case ScDBQueryParamBase::MATRIX:
++        {
++            ScDBQueryParamMatrix* p = static_cast<ScDBQueryParamMatrix*>(pParam);
++            mpData.reset(new DataAccessMatrix(this, p));
++        }
++    }
++}
++
++bool ScDBQueryDataIterator::GetThis(Value& rValue)
++{
++    return mpData->getCurrent(rValue);
++}
++
++bool ScDBQueryDataIterator::GetFirst(Value& rValue)
++{
++    return mpData->getFirst(rValue);
++}
++
++bool ScDBQueryDataIterator::GetNext(Value& rValue)
++{
++    return mpData->getNext(rValue);
++}
++
++// ============================================================================
+ 
+ ScCellIterator::ScCellIterator( ScDocument* pDocument,
+                                 SCCOL nSCol, SCROW nSRow, SCTAB nSTab,
+diff --git sc/source/core/data/dpcachetable.cxx sc/source/core/data/dpcachetable.cxx
+index 015c651..fd81c26 100644
+--- sc/source/core/data/dpcachetable.cxx
++++ sc/source/core/data/dpcachetable.cxx
+@@ -38,6 +38,7 @@
+ #include "dptabdat.hxx"
+ #include "dptabsrc.hxx"
+ #include "dpobject.hxx"
++#include "queryparam.hxx"
+ 
+ #include <com/sun/star/i18n/LocaleDataItem.hpp>
+ #include <com/sun/star/sdbc/DataType.hpp>
+diff --git sc/source/core/data/global2.cxx sc/source/core/data/global2.cxx
+index f71b842..181c634 100644
+--- sc/source/core/data/global2.cxx
++++ sc/source/core/data/global2.cxx
+@@ -243,238 +243,6 @@ utl::TextSearch* ScQueryEntry::GetSearchTextPtr( BOOL bCaseSens )
+ }
+ 
+ //------------------------------------------------------------------------
+-
+-ScQueryParam::ScQueryParam()
+-{
+-    nEntryCount = 0;
+-    Clear();
+-}
+-
+-//------------------------------------------------------------------------
+-
+-ScQueryParam::ScQueryParam( const ScQueryParam& r ) :
+-        nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nTab(r.nTab),
+-        bHasHeader(r.bHasHeader), bByRow(r.bByRow), bInplace(r.bInplace), bCaseSens(r.bCaseSens),
+-        bRegExp(r.bRegExp), bMixedComparison(r.bMixedComparison),
+-        bDuplicate(r.bDuplicate), bDestPers(r.bDestPers),
+-        nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow)
+-{
+-    nEntryCount = 0;
+-
+-    Resize( r.nEntryCount );
+-    for (USHORT i=0; i<nEntryCount; i++)
+-        pEntries[i] = r.pEntries[i];
+-}
+-
+-//------------------------------------------------------------------------
+-
+-ScQueryParam::~ScQueryParam()
+-{
+-    delete[] pEntries;
+-}
+-
+-//------------------------------------------------------------------------
+-
+-void ScQueryParam::Clear()
+-{
+-    nCol1=nCol2=nDestCol = 0;
+-    nRow1=nRow2=nDestRow = 0;
+-    nDestTab = 0;
+-    nTab = SCTAB_MAX;
+-    bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE;
+-    bInplace = bByRow = bDuplicate = bDestPers = TRUE;
+-
+-    Resize( MAXQUERY );
+-    for (USHORT i=0; i<MAXQUERY; i++)
+-        pEntries[i].Clear();
+-}
+-
+-//------------------------------------------------------------------------
+-
+-ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
+-{
+-    nCol1		= r.nCol1;
+-    nRow1		= r.nRow1;
+-    nCol2		= r.nCol2;
+-    nRow2		= r.nRow2;
+-    nTab		= r.nTab;
+-    nDestTab	= r.nDestTab;
+-    nDestCol	= r.nDestCol;
+-    nDestRow	= r.nDestRow;
+-    bHasHeader	= r.bHasHeader;
+-    bInplace	= r.bInplace;
+-    bCaseSens	= r.bCaseSens;
+-    bRegExp		= r.bRegExp;
+-    bMixedComparison = r.bMixedComparison;
+-    bDuplicate	= r.bDuplicate;
+-    bByRow		= r.bByRow;
+-    bDestPers	= r.bDestPers;
+-
+-    Resize( r.nEntryCount );
+-    for (USHORT i=0; i<nEntryCount; i++)
+-        pEntries[i] = r.pEntries[i];
+-
+-    return *this;
+-}
+-
+-//------------------------------------------------------------------------
+-
+-BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
+-{
+-    BOOL bEqual = FALSE;
+-
+-    // Anzahl der Queries gleich?
+-    USHORT nUsed 	  = 0;
+-    USHORT nOtherUsed = 0;
+-    while ( nUsed<nEntryCount && pEntries[nUsed].bDoQuery ) ++nUsed;
+-    while ( nOtherUsed<rOther.nEntryCount && rOther.pEntries[nOtherUsed].bDoQuery )
+-        ++nOtherUsed;
+-
+-    if (   (nUsed 		== nOtherUsed)
+-        && (nCol1		== rOther.nCol1)
+-        && (nRow1		== rOther.nRow1)
+-        && (nCol2		== rOther.nCol2)
+-        && (nRow2		== rOther.nRow2)
+-        && (nTab 		== rOther.nTab)
+-        && (bHasHeader	== rOther.bHasHeader)
+-        && (bByRow		== rOther.bByRow)
+-        && (bInplace	== rOther.bInplace)
+-        && (bCaseSens	== rOther.bCaseSens)
+-        && (bRegExp		== rOther.bRegExp)
+-        && (bMixedComparison == rOther.bMixedComparison)
+-        && (bDuplicate	== rOther.bDuplicate)
+-        && (bDestPers   == rOther.bDestPers)
+-        && (nDestTab	== rOther.nDestTab)
+-        && (nDestCol	== rOther.nDestCol)
+-        && (nDestRow	== rOther.nDestRow) )
+-    {
+-        bEqual = TRUE;
+-        for ( USHORT i=0; i<nUsed && bEqual; i++ )
+-            bEqual = pEntries[i] == rOther.pEntries[i];
+-    }
+-    return bEqual;
+-}
+-
+-//------------------------------------------------------------------------
+-
+-void ScQueryParam::DeleteQuery( SCSIZE nPos )
+-{
+-    if (nPos<nEntryCount)
+-    {
+-        for (SCSIZE i=nPos; i+1<nEntryCount; i++)
+-            pEntries[i] = pEntries[i+1];
+-
+-        pEntries[nEntryCount-1].Clear();
+-    }
+-    else
+-    {
+-        DBG_ERROR("Falscher Parameter bei ScQueryParam::DeleteQuery");
+-    }
+-}
+-
+-//------------------------------------------------------------------------
+-
+-void ScQueryParam::Resize(SCSIZE nNew)
+-{
+-    if ( nNew < MAXQUERY )
+-        nNew = MAXQUERY;				// nie weniger als MAXQUERY
+-
+-    ScQueryEntry* pNewEntries = NULL;
+-    if ( nNew )
+-        pNewEntries = new ScQueryEntry[nNew];
+-
+-    SCSIZE nCopy = Min( nEntryCount, nNew );
+-    for (SCSIZE i=0; i<nCopy; i++)
+-        pNewEntries[i] = pEntries[i];
+-
+-    if ( nEntryCount )
+-        delete[] pEntries;
+-    nEntryCount = nNew;
+-    pEntries = pNewEntries;
+-}
+-
+-//------------------------------------------------------------------------
+-
+-void ScQueryParam::MoveToDest()
+-{
+-    if (!bInplace)
+-    {
+-        SCsCOL nDifX = ((SCsCOL) nDestCol) - ((SCsCOL) nCol1);
+-        SCsROW nDifY = ((SCsROW) nDestRow) - ((SCsROW) nRow1);
+-        SCsTAB nDifZ = ((SCsTAB) nDestTab) - ((SCsTAB) nTab);
+-
+-        nCol1 = sal::static_int_cast<SCCOL>( nCol1 + nDifX );
+-        nRow1 = sal::static_int_cast<SCROW>( nRow1 + nDifY );
+-        nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );
+-        nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );
+-        nTab  = sal::static_int_cast<SCTAB>( nTab  + nDifZ );
+-        for (USHORT i=0; i<nEntryCount; i++)
+-            pEntries[i].nField += nDifX;
+-
+-        bInplace = TRUE;
+-    }
+-    else
+-    {
+-        DBG_ERROR("MoveToDest, bInplace == TRUE");
+-    }
+-}
+-
+-//------------------------------------------------------------------------
+-
+-void ScQueryParam::FillInExcelSyntax(String& aCellStr, SCSIZE nIndex)
+-{
+-    if (aCellStr.Len() > 0)
+-    {
+-        if ( nIndex >= nEntryCount )
+-            Resize( nIndex+1 );
+-
+-        ScQueryEntry& rEntry = pEntries[nIndex];
+-
+-        rEntry.bDoQuery = TRUE;
+-        // Operatoren herausfiltern
+-        if (aCellStr.GetChar(0) == '<')
+-        {
+-            if (aCellStr.GetChar(1) == '>')
+-            {
+-                *rEntry.pStr = aCellStr.Copy(2);
+-                rEntry.eOp   = SC_NOT_EQUAL;
+-            }
+-            else if (aCellStr.GetChar(1) == '=')
+-            {
+-                *rEntry.pStr = aCellStr.Copy(2);
+-                rEntry.eOp   = SC_LESS_EQUAL;
+-            }
+-            else
+-            {
+-                *rEntry.pStr = aCellStr.Copy(1);
+-                rEntry.eOp   = SC_LESS;
+-            }
+-        }
+-        else if (aCellStr.GetChar(0) == '>')
+-        {
+-            if (aCellStr.GetChar(1) == '=')
+-            {
+-                *rEntry.pStr = aCellStr.Copy(2);
+-                rEntry.eOp   = SC_GREATER_EQUAL;
+-            }
+-            else
+-            {
+-                *rEntry.pStr = aCellStr.Copy(1);
+-                rEntry.eOp   = SC_GREATER;
+-            }
+-        }
+-        else
+-        {
+-            if (aCellStr.GetChar(0) == '=')
+-                *rEntry.pStr = aCellStr.Copy(1);
+-            else
+-                *rEntry.pStr = aCellStr;
+-            rEntry.eOp = SC_EQUAL;
+-        }
+-    }
+-}
+-
+-//------------------------------------------------------------------------
+ // struct ScSubTotalParam:
+ 
+ ScSubTotalParam::ScSubTotalParam()
+diff --git sc/source/core/data/sortparam.cxx sc/source/core/data/sortparam.cxx
+index 9531c71..dfab465 100644
+--- sc/source/core/data/sortparam.cxx
++++ sc/source/core/data/sortparam.cxx
+@@ -36,6 +36,7 @@
+ #include "sortparam.hxx"
+ #include "global.hxx"
+ #include "address.hxx"
++#include "queryparam.hxx"
+ #include <tools/debug.hxx>
+ 
+ 
+diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx
+index ca196ea..2d8f0d3 100644
+--- sc/source/core/data/table3.cxx
++++ sc/source/core/data/table3.cxx
+@@ -60,6 +60,7 @@
+ #include "progress.hxx"
+ #include "cellform.hxx"
+ #include "postit.hxx"
++#include "queryparam.hxx"
+ 
+ #include <vector>
+ 
+diff --git sc/source/core/inc/doubleref.hxx sc/source/core/inc/doubleref.hxx
+new file mode 100644
+index 0000000..0aa577b
+--- /dev/null
++++ sc/source/core/inc/doubleref.hxx
+@@ -0,0 +1,194 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: interpre.hxx,v $
++ * $Revision: 1.35.44.2 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_DOUBLEREF_HXX
++#define SC_DOUBLEREF_HXX
++
++#include "address.hxx"
++#include "scmatrix.hxx"
++
++class ScDocument;
++class ScBaseCell;
++class ScDBQueryParamBase;
++class ScQueryParamBase;
++
++// ============================================================================
++
++/** 
++ * Base class for abstracting range data backends for database functions. 
++ */
++class ScDBRangeBase
++{
++public:
++    enum RefType { INTERNAL, EXTERNAL };
++
++    virtual ~ScDBRangeBase() = 0;
++
++    RefType getType() const;
++    bool fillQueryEntries(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef) const;
++
++    virtual SCCOL getColSize() const = 0;
++    virtual SCROW getRowSize() const = 0;
++    virtual SCSIZE getVisibleDataCellCount() const = 0;
++
++    /** 
++     * Get a string value of a specified cell position.  Note that the 
++     * position of the upper left cell of the range is always (0, 0) even if 
++     * the reference type is of internal range.
++     *
++     * @param nCol column position (0 to column size-1)
++     * @param nRow row position (0 to row size-1)
++     */
++    virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const = 0;
++
++    virtual SCCOL getFirstFieldColumn() const = 0;
++
++    /** 
++     * Get a <i>0-based</i> column index that corresponds with the passed field
++     * index.  Note that the field index passed as the 1st parameter is 
++     * <i>1-based.</i> 
++     *
++     * @param nIndex 1-based field index.
++     * 
++     * @return 0-based column index
++     */
++    virtual SCCOL findFieldColumn(SCCOL nIndex) const = 0;
++    virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const = 0;
++    virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const = 0;
++    virtual bool isRangeEqual(const ScRange& rRange) const = 0;
++
++protected:
++    ScDBRangeBase(ScDocument* pDoc, RefType eType);
++    ScDocument* getDoc() const;
++
++    /** 
++     * Populate query options that are always the same for all database 
++     * queries.
++     */
++    static void fillQueryOptions(ScQueryParamBase* pParam);
++
++private:
++    ScDBRangeBase(); // disabled
++
++    ScDocument* mpDoc;
++    RefType meType;
++};
++
++// ============================================================================
++
++class ScDBInternalRange : public ScDBRangeBase
++{
++public:
++    explicit ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange);
++    virtual ~ScDBInternalRange();
++
++    const ScRange& getRange() const;
++
++    virtual SCCOL getColSize() const;
++    virtual SCROW getRowSize() const;
++    virtual SCSIZE getVisibleDataCellCount() const;
++
++    /** 
++     * Get a string value of a specified cell position.  Note that the 
++     * position of the upper left cell of the range is always (0, 0) even if 
++     * the reference type is of internal range.
++     *
++     * @param nCol column position (0 to column size-1)
++     * @param nRow row position (0 to row size-1)
++     */
++    virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const;
++
++    virtual SCCOL getFirstFieldColumn() const;
++    /** 
++     * Get a <i>0-based</i> column index that corresponds with the passed field
++     * index.  Note that the field index passed as the 1st parameter is 
++     * <i>1-based.</i> 
++     *
++     * @param nIndex 1-based field index.
++     * 
++     * @return 0-based column index
++     */
++    virtual SCCOL findFieldColumn(SCCOL nIndex) const;
++    virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const;
++    virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const;
++    virtual bool isRangeEqual(const ScRange& rRange) const;
++
++private:
++    sal_uInt16 getCellString(::rtl::OUString& rStr, ScBaseCell* pCell) const;
++
++private:
++    ScRange maRange;
++};
++
++// ============================================================================
++
++class ScDBExternalRange : public ScDBRangeBase
++{
++public:
++    explicit ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat);
++    virtual ~ScDBExternalRange();
++
++    virtual SCCOL getColSize() const;
++    virtual SCROW getRowSize() const;
++    virtual SCSIZE getVisibleDataCellCount() const;
++
++    /** 
++     * Get a string value of a specified cell position.  Note that the 
++     * position of the upper left cell of the range is always (0, 0) even if 
++     * the reference type is of internal range.
++     *
++     * @param nCol column position (0 to column size-1)
++     * @param nRow row position (0 to row size-1)
++     */
++    virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const;
++
++    virtual SCCOL getFirstFieldColumn() const;
++
++    /** 
++     * Get a <i>0-based</i> column index that corresponds with the passed field
++     * index.  Note that the field index passed as the 1st parameter is 
++     * <i>1-based.</i> 
++     *
++     * @param nIndex 1-based field index.
++     * 
++     * @return 0-based column index
++     */
++    virtual SCCOL findFieldColumn(SCCOL nIndex) const;
++    virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const;
++    virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const;
++    virtual bool isRangeEqual(const ScRange& rRange) const;
++
++private:
++    const ScMatrixRef mpMatrix;
++    SCCOL mnCols;
++    SCROW mnRows;
++};
++
++#endif
+diff --git sc/source/core/inc/interpre.hxx sc/source/core/inc/interpre.hxx
+index ca21e19..e385a9c 100644
+--- sc/source/core/inc/interpre.hxx
++++ sc/source/core/inc/interpre.hxx
+@@ -53,7 +53,10 @@ class SbxVariable;
+ class ScBaseCell;
+ class ScFormulaCell;
+ class SvNumberFormatter;
++class ScDBRangeBase;
+ struct MatrixDoubleOp;
++struct ScQueryParam;
++struct ScDBQueryParamBase;
+ 
+ struct ScCompare
+ {
+@@ -301,6 +304,7 @@ void DoubleRefToVars( const ScToken* p,
+         SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
+         SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
+         BOOL bDontCheckForTableOp = FALSE );
++ScDBRangeBase* PopDoubleRef();
+ void PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
+                           SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
+                           BOOL bDontCheckForTableOp = FALSE );
+@@ -488,7 +492,7 @@ void ScSubTotal();
+ // compatibility). If this was the case then rMissingField is set to TRUE upon
+ // return. If rMissingField==FALSE upon call all "missing cases" are considered
+ // to be an error.
+-BOOL GetDBParams( SCTAB& rTab, ScQueryParam& rParam, BOOL& rMissingField );
++ScDBQueryParamBase* GetDBParams( BOOL& rMissingField );
+ 
+ void DBIterator( ScIterFunc );
+ void ScDBSum();
+diff --git sc/source/core/tool/dbcolect.cxx sc/source/core/tool/dbcolect.cxx
+index e1e3870..a47a669 100644
+--- sc/source/core/tool/dbcolect.cxx
++++ sc/source/core/tool/dbcolect.cxx
+@@ -40,6 +40,7 @@
+ #include "refupdat.hxx"
+ #include "rechead.hxx"
+ #include "document.hxx"
++#include "queryparam.hxx"
+ #include "globstr.hrc"
+ 
+ 
+diff --git sc/source/core/tool/doubleref.cxx sc/source/core/tool/doubleref.cxx
+new file mode 100644
+index 0000000..bb67aad
+--- /dev/null
++++ sc/source/core/tool/doubleref.cxx
+@@ -0,0 +1,568 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: interpre.hxx,v $
++ * $Revision: 1.35.44.2 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_sc.hxx"
++
++// INCLUDE ---------------------------------------------------------------
++
++#include "doubleref.hxx"
++#include "cell.hxx"
++#include "global.hxx"
++#include "document.hxx"
++#include "queryparam.hxx"
++#include "globstr.hrc"
++
++#include <memory>
++#include <vector>
++
++using ::rtl::OUString;
++using ::std::auto_ptr;
++using ::std::vector;
++
++namespace {
++
++void lcl_toUpper(OUString& rStr)
++{
++    rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, rStr.getLength());
++}
++
++bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)
++{
++    // A valid StarQuery must be at least 4 columns wide. To be precise it
++    // should be exactly 4 columns ...
++    // Additionally, if this wasn't checked, a formula pointing to a valid 1-3
++    // column Excel style query range immediately left to itself would result
++    // in a circular reference when the field name or operator or value (first
++    // to third query range column) is obtained (#i58354#). Furthermore, if the
++    // range wasn't sufficiently specified data changes wouldn't flag formula
++    // cells for recalculation.
++
++    if (pQueryRef->getColSize() < 4)
++        return false;
++
++    BOOL bValid;
++    BOOL bFound;
++    OUString aCellStr;
++    SCSIZE nIndex = 0;
++    SCROW nRow = 0;
++    SCROW nRows = pDBRef->getRowSize();
++    SCSIZE nNewEntries = static_cast<SCSIZE>(nRows);
++    pParam->Resize(nNewEntries);
++
++    do
++    {
++        ScQueryEntry& rEntry = pParam->GetEntry(nIndex);
++
++        bValid = FALSE;
++
++        if (nIndex > 0)
++        {
++            // For all entries after the first one, check the and/or connector in the first column.
++            aCellStr = pQueryRef->getString(0, nRow);
++            lcl_toUpper(aCellStr);
++            if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_UND)) )
++            {
++                rEntry.eConnect = SC_AND;
++                bValid = TRUE;
++            }
++            else if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_ODER)) )
++            {
++                rEntry.eConnect = SC_OR;
++                bValid = TRUE;
++            }
++        }
++
++        if ((nIndex < 1) || bValid)
++        {
++            // field name in the 2nd column.
++            bFound = FALSE;
++            aCellStr = pQueryRef->getString(1, nRow);
++            SCCOL nField = pDBRef->findFieldColumn(aCellStr); // TODO: must be case insensitive comparison.
++            if (ValidCol(nField))
++            {
++                rEntry.nField = nField;
++                bValid = true;
++            }
++            else
++                bValid = false;
++        }
++        
++        if (bValid)
++        {
++            // equality, non-equality operator in the 3rd column.
++            bFound = FALSE;
++            aCellStr = pQueryRef->getString(2, nRow);
++            lcl_toUpper(aCellStr);
++            const sal_Unicode* p = aCellStr.getStr();
++            if (p[0] == sal_Unicode('<'))
++            {
++                if (p[1] == sal_Unicode('>'))
++                    rEntry.eOp = SC_NOT_EQUAL;
++                else if (p[1] == sal_Unicode('='))
++                    rEntry.eOp = SC_LESS_EQUAL;
++                else
++                    rEntry.eOp = SC_LESS;
++            }
++            else if (p[0] == sal_Unicode('>'))
++            {
++                if (p[1] == sal_Unicode('='))
++                    rEntry.eOp = SC_GREATER_EQUAL;
++                else
++                    rEntry.eOp = SC_GREATER;
++            }
++            else if (p[0] == sal_Unicode('='))
++                rEntry.eOp = SC_EQUAL;
++
++        }
++        
++        if (bValid)
++        {
++            // Finally, the right-hand-side value in the 4th column.
++            *rEntry.pStr = pQueryRef->getString(3, nRow);
++            rEntry.bDoQuery = TRUE;
++        }
++        nIndex++;
++        nRow++;
++    }
++    while (bValid && (nRow < nRows) /* && (nIndex < MAXQUERY) */ );
++    return bValid;
++}
++
++bool lcl_createExcelQuery(
++    ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)
++{
++    bool bValid = true;
++    SCCOL nCols = pQueryRef->getColSize();
++    SCROW nRows = pQueryRef->getRowSize();
++    vector<SCCOL> aFields(nCols);
++    SCCOL nCol = 0;
++    while (bValid && (nCol < nCols))
++    {
++        OUString aQueryStr = pQueryRef->getString(nCol, 0);
++        SCCOL nField = pDBRef->findFieldColumn(aQueryStr);
++        if (ValidCol(nField))
++            aFields[nCol] = nField;
++        else
++            bValid = false;
++        ++nCol;
++    }
++
++    if (bValid)
++    {
++//      ULONG nVisible = 0;
++//      for ( nCol=nCol1; nCol<=nCol2; nCol++ )
++//          nVisible += aCol[nCol].VisibleCount( nRow1+1, nRow2 );
++
++        // Count the number of visible cells (excluding the header row).  Each
++        // visible cell corresponds with a single query.
++        SCSIZE nVisible = pQueryRef->getVisibleDataCellCount();
++        if ( nVisible > SCSIZE_MAX / sizeof(void*) )
++        {
++            DBG_ERROR("zu viele Filterkritierien");
++            nVisible = 0;
++        }
++
++        SCSIZE nNewEntries = nVisible;
++        pParam->Resize( nNewEntries );
++
++        SCSIZE nIndex = 0;
++        SCROW nRow = 1;
++        String aCellStr;
++        while (nRow < nRows)
++        {
++            nCol = 0;
++            while (nCol < nCols)
++            {
++                aCellStr = pQueryRef->getString(nCol, nRow);
++                ScGlobal::pCharClass->toUpper( aCellStr );
++                if (aCellStr.Len() > 0)
++                {
++                    if (nIndex < nNewEntries)
++                    {
++                        pParam->GetEntry(nIndex).nField = aFields[nCol];
++                        pParam->FillInExcelSyntax(aCellStr, nIndex);
++                        nIndex++;
++                        if (nIndex < nNewEntries)
++                            pParam->GetEntry(nIndex).eConnect = SC_AND;
++                    }
++                    else
++                        bValid = FALSE;
++                }
++                nCol++;
++            }
++            nRow++;
++            if (nIndex < nNewEntries)
++                pParam->GetEntry(nIndex).eConnect = SC_OR;
++        }
++    }
++    return bValid;
++}
++
++bool lcl_fillQueryEntries(
++    ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)
++{
++    SCSIZE nCount = pParam->GetEntryCount();
++    for (SCSIZE i = 0; i < nCount; ++i)
++        pParam->GetEntry(i).Clear();
++
++    // Standard QueryTabelle
++    bool bValid = lcl_createStarQuery(pParam, pDBRef, pQueryRef);
++    // Excel QueryTabelle
++    if (!bValid)
++        bValid = lcl_createExcelQuery(pParam, pDBRef, pQueryRef);
++
++    nCount = pParam->GetEntryCount();
++    if (bValid)
++    {
++        //  bQueryByString muss gesetzt sein
++        for (SCSIZE i = 0; i < nCount; ++i)
++            pParam->GetEntry(i).bQueryByString = true;
++    }
++    else
++    {
++        //  nix
++        for (SCSIZE i = 0; i < nCount; ++i)
++            pParam->GetEntry(i).Clear();
++    }
++    return bValid;
++}
++
++}
++
++// ============================================================================
++
++ScDBRangeBase::ScDBRangeBase(ScDocument* pDoc, RefType eType) : 
++    mpDoc(pDoc), meType(eType)
++{
++}
++
++ScDBRangeBase::~ScDBRangeBase()
++{
++}
++
++ScDBRangeBase::RefType ScDBRangeBase::getType() const
++{
++    return meType;
++}
++
++bool ScDBRangeBase::fillQueryEntries(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef) const
++{
++    if (!pDBRef)
++        return false;
++
++    return lcl_fillQueryEntries(pParam, pDBRef, this);
++}
++
++void ScDBRangeBase::fillQueryOptions(ScQueryParamBase* pParam)
++{
++    pParam->bHasHeader = true;
++    pParam->bByRow = true;
++    pParam->bInplace = true;
++    pParam->bCaseSens = false;
++    pParam->bRegExp = false;
++    pParam->bDuplicate = true;
++    pParam->bMixedComparison = false;
++}
++
++ScDocument* ScDBRangeBase::getDoc() const
++{
++    return mpDoc;
++}
++
++// ============================================================================
++
++ScDBInternalRange::ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange) :
++    ScDBRangeBase(pDoc, INTERNAL), maRange(rRange)
++{
++}
++
++ScDBInternalRange::~ScDBInternalRange()
++{
++}
++
++const ScRange& ScDBInternalRange::getRange() const
++{
++    return maRange;
++}
++
++SCCOL ScDBInternalRange::getColSize() const
++{
++    return maRange.aEnd.Col() - maRange.aStart.Col() + 1;
++}
++
++SCROW ScDBInternalRange::getRowSize() const
++{
++    return maRange.aEnd.Row() - maRange.aStart.Row() + 1;
++}
++
++SCSIZE ScDBInternalRange::getVisibleDataCellCount() const
++{
++    SCCOL nCols = getColSize();
++    SCROW nRows = getRowSize();
++    if (nRows <= 1)
++        return 0;
++
++    return (nRows-1)*nCols;
++}
++
++OUString ScDBInternalRange::getString(SCCOL nCol, SCROW nRow) const
++{
++    String aStr;
++    const ScAddress& s = maRange.aStart;
++    getDoc()->GetString(s.Col() + nCol, s.Row() + nRow, maRange.aStart.Tab(), aStr);
++    return aStr;
++}
++
++SCCOL ScDBInternalRange::getFirstFieldColumn() const
++{
++    return getRange().aStart.Col();
++}
++
++SCCOL ScDBInternalRange::findFieldColumn(SCCOL nIndex) const
++{
++    const ScRange& rRange = getRange();
++    const ScAddress& s = rRange.aStart;
++    const ScAddress& e = rRange.aEnd;
++
++    SCCOL nDBCol1 = s.Col();
++    SCCOL nDBCol2 = e.Col();
++
++    if ( nIndex <= 0 || nIndex > (nDBCol2 - nDBCol1 + 1) )
++        return nDBCol1;
++
++    return Min(nDBCol2, static_cast<SCCOL>(nDBCol1 + nIndex - 1));
++}
++
++sal_uInt16 ScDBInternalRange::getCellString(OUString& rStr, ScBaseCell* pCell) const
++{
++    sal_uInt16 nErr = 0;
++    String aStr;
++    if (pCell)
++    {
++        SvNumberFormatter* pFormatter = getDoc()->GetFormatTable();
++        switch (pCell->GetCellType())
++        {
++            case CELLTYPE_STRING:
++                ((ScStringCell*) pCell)->GetString(aStr);
++            break;
++            case CELLTYPE_EDIT:
++                ((ScEditCell*) pCell)->GetString(aStr);
++            break;
++            case CELLTYPE_FORMULA:
++            {
++                ScFormulaCell* pFCell = (ScFormulaCell*) pCell;
++                nErr = pFCell->GetErrCode();
++                if (pFCell->IsValue())
++                {
++                    double fVal = pFCell->GetValue();
++                    ULONG nIndex = pFormatter->GetStandardFormat(
++                                        NUMBERFORMAT_NUMBER,
++                                        ScGlobal::eLnge);
++                    pFormatter->GetInputLineString(fVal, nIndex, aStr);
++                }
++                else
++                    pFCell->GetString(aStr);
++            }
++            break;
++            case CELLTYPE_VALUE:
++            {
++                double fVal = ((ScValueCell*) pCell)->GetValue();
++                ULONG nIndex = pFormatter->GetStandardFormat(
++                                        NUMBERFORMAT_NUMBER,
++                                        ScGlobal::eLnge);
++                pFormatter->GetInputLineString(fVal, nIndex, aStr);
++            }
++            break;
++            default:
++                ;
++        }
++    }
++    rStr = aStr;
++    return nErr;
++}
++
++SCCOL ScDBInternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr) const
++{
++    const ScAddress& s = maRange.aStart;
++    const ScAddress& e = maRange.aEnd;
++    OUString aUpper = rStr;
++    lcl_toUpper(aUpper);
++
++    SCCOL nDBCol1 = s.Col();
++    SCROW nDBRow1 = s.Row();
++    SCTAB nDBTab1 = s.Tab();
++    SCCOL nDBCol2 = e.Col();
++
++    SCCOL   nField = nDBCol1;
++    BOOL    bFound = TRUE;
++
++    bFound = FALSE;
++    OUString aCellStr;
++    ScAddress aLook( nDBCol1, nDBRow1, nDBTab1 );
++    while (!bFound && (aLook.Col() <= nDBCol2))
++    {
++        ScBaseCell* pCell = getDoc()->GetCell( aLook );
++        sal_uInt16 nErr = getCellString( aCellStr, pCell );
++        if (pErr)
++            *pErr = nErr;
++        lcl_toUpper(aCellStr);
++        bFound = ScGlobal::GetpTransliteration()->isEqual(aCellStr, aUpper);
++        if (!bFound)
++            aLook.IncCol();
++    }
++    nField = aLook.Col();
++
++    return bFound ? nField : -1;
++}
++
++ScDBQueryParamBase* ScDBInternalRange::createQueryParam(const ScDBRangeBase* pQueryRef) const
++{
++    auto_ptr<ScDBQueryParamInternal> pParam(new ScDBQueryParamInternal);
++
++    // Set the database range first.
++    const ScAddress& s = maRange.aStart;
++    const ScAddress& e = maRange.aEnd;
++    pParam->nCol1 = s.Col();
++    pParam->nRow1 = s.Row();
++    pParam->nCol2 = e.Col();
++    pParam->nRow2 = e.Row();
++    pParam->nTab  = s.Tab();
++
++    fillQueryOptions(pParam.get());
++
++    // Now construct the query entries from the query range.
++    if (!pQueryRef->fillQueryEntries(pParam.get(), this))
++        return NULL;
++
++    return pParam.release();
++}
++
++bool ScDBInternalRange::isRangeEqual(const ScRange& rRange) const
++{
++    return maRange == rRange;
++}
++
++// ============================================================================
++
++ScDBExternalRange::ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat) :
++    ScDBRangeBase(pDoc, EXTERNAL), mpMatrix(pMat)
++{
++    SCSIZE nC, nR;
++    mpMatrix->GetDimensions(nC, nR);
++    mnCols = nC;
++    mnRows = nR;
++}
++
++ScDBExternalRange::~ScDBExternalRange()
++{
++}
++
++SCCOL ScDBExternalRange::getColSize() const
++{
++    return mnCols;
++}
++
++SCROW ScDBExternalRange::getRowSize() const
++{
++    return mnRows;
++}
++
++SCSIZE ScDBExternalRange::getVisibleDataCellCount() const
++{
++    SCCOL nCols = getColSize();
++    SCROW nRows = getRowSize();
++    if (nRows <= 1)
++        return 0;
++
++    return (nRows-1)*nCols;
++}
++
++OUString ScDBExternalRange::getString(SCCOL nCol, SCROW nRow) const
++{
++    if (nCol >= mnCols || nRow >= mnRows)
++        return OUString();
++
++    return mpMatrix->GetString(nCol, nRow);
++}
++
++SCCOL ScDBExternalRange::getFirstFieldColumn() const
++{
++    return 0;
++}
++
++SCCOL ScDBExternalRange::findFieldColumn(SCCOL nIndex) const
++{
++    if (nIndex < 1)
++        // 1st field
++        return 0;
++
++    if (nIndex > mnCols)
++        // last field
++        return mnCols - 1;
++
++    return nIndex - 1;
++}
++
++SCCOL ScDBExternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr) const
++{
++    if (pErr)
++        pErr = 0;
++
++    OUString aUpper = rStr;
++    lcl_toUpper(aUpper);
++    for (SCCOL i = 0; i < mnCols; ++i)
++    {
++        OUString aUpperVal = mpMatrix->GetString(i, 0);
++        lcl_toUpper(aUpperVal);
++        if (aUpper.equals(aUpperVal))
++            return i;
++    }
++    return -1;
++}
++
++ScDBQueryParamBase* ScDBExternalRange::createQueryParam(const ScDBRangeBase* pQueryRef) const
++{
++    auto_ptr<ScDBQueryParamMatrix> pParam(new ScDBQueryParamMatrix);
++    pParam->mpMatrix = mpMatrix;
++    fillQueryOptions(pParam.get());
++
++    // Now construct the query entries from the query range.
++    if (!pQueryRef->fillQueryEntries(pParam.get(), this))
++        return NULL;
++
++    return pParam.release();
++}
++
++bool ScDBExternalRange::isRangeEqual(const ScRange& /*rRange*/) const
++{
++    return false;
++}
++
+diff --git sc/source/core/tool/interpr1.cxx sc/source/core/tool/interpr1.cxx
+index 29a6884..eff5ea3 100644
+--- sc/source/core/tool/interpr1.cxx
++++ sc/source/core/tool/interpr1.cxx
+@@ -67,11 +67,14 @@
+ #include <string.h>
+ #include <math.h>
+ #include <vector>
++#include <memory>
+ #include "cellkeytranslator.hxx"
+ #include "lookupcache.hxx"
+ #include "rangenam.hxx"
+ #include "compiler.hxx"
+ #include "externalrefmgr.hxx"
++#include "doubleref.hxx"
++#include "queryparam.hxx"
+ 
+ #define SC_DOUBLE_MAXVALUE  1.7e307
+ 
+@@ -82,6 +85,8 @@ ScTokenStack* ScInterpreter::pGlobalStack = NULL;
+ BOOL ScInterpreter::bGlobalStackInUse = FALSE;
+ 
+ using namespace formula;
++using ::std::auto_ptr;
++
+ //-----------------------------------------------------------------------------
+ // Funktionen
+ //-----------------------------------------------------------------------------
+@@ -5619,11 +5624,9 @@ void ScInterpreter::ScSubTotal()
+ #endif
+ 
+ 
+-BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam,
+-        BOOL& rMissingField )
++ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
+ {
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::GetDBParams" );
+-    BOOL bRet = FALSE;
+     BOOL bAllowMissingField = FALSE;
+     if ( rMissingField )
+     {
+@@ -5632,14 +5635,10 @@ BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam,
+     }
+     if ( GetByte() == 3 )
+     {
+-
+-        SCCOL nQCol1;
+-        SCROW nQRow1;
+-        SCTAB nQTab1;
+-        SCCOL nQCol2;
+-        SCROW nQRow2;
+-        SCTAB nQTab2;
+-        PopDoubleRef(nQCol1, nQRow1, nQTab1, nQCol2, nQRow2, nQTab2);
++        // First, get the query criteria range.
++        ::std::auto_ptr<ScDBRangeBase> pQueryRef( PopDoubleRef() );
++        if (!pQueryRef.get())
++            return NULL;
+ 
+         BOOL    bByVal = TRUE;
+         double  nVal = 0.0;
+@@ -5695,116 +5694,85 @@ BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam,
+                 SetError( errIllegalParameter );
+         }
+ 
+-        SCCOL nDBCol1;
+-        SCROW nDBRow1;
+-        SCTAB nDBTab1;
+-        SCCOL nDBCol2;
+-        SCROW nDBRow2;
+-        SCTAB nDBTab2;
+-        PopDoubleRef(nDBCol1, nDBRow1, nDBTab1, nDBCol2, nDBRow2, nDBTab2);
++        auto_ptr<ScDBRangeBase> pDBRef( PopDoubleRef() );
+ 
+-        if ( nGlobalError == 0 && bRangeFake )
++        if (nGlobalError || !pDBRef.get())
++            return NULL;
++
++        if ( bRangeFake )
+         {
+             // range parameter must match entire database range
+-            if ( aMissingRange == ScRange( nDBCol1, nDBRow1, nDBTab1, nDBCol2,
+-                        nDBRow2, nDBTab2) )
++            if (pDBRef->isRangeEqual(aMissingRange))
+                 rMissingField = TRUE;
+             else
+                 SetError( errIllegalParameter );
+         }
+-        
+-        if (nGlobalError == 0)
++
++        if (nGlobalError)
++            return NULL;
++
++        SCCOL nField = pDBRef->getFirstFieldColumn();
++        if (rMissingField)
++            ; // special case
++        else if (bByVal)
++            nField = pDBRef->findFieldColumn(static_cast<SCCOL>(nVal));
++        else
+         {
+-            SCCOL   nField = nDBCol1;
+-            BOOL    bFound = TRUE;
++            sal_uInt16 nErr = 0;    
++            nField = pDBRef->findFieldColumn(aStr, &nErr);
++            SetError(nErr);
++        }
++
++        if (!ValidCol(nField))
++            return NULL;
++
++        auto_ptr<ScDBQueryParamBase> pParam( pDBRef->createQueryParam(pQueryRef.get()) );
++
++        if (pParam.get())
++        {
++            // An allowed missing field parameter sets the result field
++            // to any of the query fields, just to be able to return
++            // some cell from the iterator.        
+             if ( rMissingField )
+-                ;   // special case
+-            else if ( bByVal )
+-            {
+-                if ( nVal <= 0 || nVal > (nDBCol2 - nDBCol1 + 1) )
+-                    bFound = FALSE;
+-                else
+-                    nField = Min(nDBCol2, (SCCOL)(nDBCol1 + (SCCOL)nVal - 1));
+-            }
+-            else
++                nField = static_cast<SCCOL>(pParam->GetEntry(0).nField);
++            pParam->mnField = nField;
++
++            SCSIZE nCount = pParam->GetEntryCount();
++            for ( SCSIZE i=0; i < nCount; i++ )
+             {
+-                bFound = FALSE;
+-                String aCellStr;
+-                ScAddress aLook( nDBCol1, nDBRow1, nDBTab1 );
+-                while (!bFound && (aLook.Col() <= nDBCol2))
+-                {
+-                    ScBaseCell* pCell = GetCell( aLook );
+-                    GetCellString( aCellStr, pCell );
+-                    bFound = ScGlobal::GetpTransliteration()->isEqual( aCellStr, aStr );
+-                    if (!bFound)
+-                        aLook.IncCol();
+-                }
+-                nField = aLook.Col();
+-            }
+-            if (bFound)
+-            {
+-                rParam.nCol1 = nDBCol1;
+-                rParam.nRow1 = nDBRow1;
+-                rParam.nCol2 = nDBCol2;
+-                rParam.nRow2 = nDBRow2;
+-                rParam.nTab  = nDBTab1;
+-                rParam.bHasHeader = TRUE;
+-                rParam.bByRow = TRUE;
+-                rParam.bInplace = TRUE;
+-                rParam.bCaseSens = FALSE;
+-                rParam.bRegExp = FALSE;
+-                rParam.bDuplicate = TRUE;
+-                if (pDok->CreateQueryParam(nQCol1, nQRow1, nQCol2, nQRow2, nQTab1, rParam))
+-                {
+-                    // An allowed missing field parameter sets the result field
+-                    // to any of the query fields, just to be able to return
+-                    // some cell from the iterator.
+-                    if ( rMissingField )
+-                        nField = static_cast<SCCOL>(rParam.GetEntry(0).nField);
+-
+-                    rParam.nCol1 = nField;
+-                    rParam.nCol2 = nField;
+-                    rTab = nDBTab1;
+-                    bRet = TRUE;
+-                    SCSIZE nCount = rParam.GetEntryCount();
+-                    for ( SCSIZE i=0; i < nCount; i++ )
+-                    {
+-                        ScQueryEntry& rEntry = rParam.GetEntry(i);
+-                        if ( rEntry.bDoQuery )
+-                        {
+-                            sal_uInt32 nIndex = 0;
+-                            rEntry.bQueryByString = !pFormatter->IsNumberFormat(
+-                                *rEntry.pStr, nIndex, rEntry.nVal );
+-                            if ( rEntry.bQueryByString && !rParam.bRegExp )
+-                                rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
+-                        }
+-                        else
+-                            break;  // for
+-                    }
++                ScQueryEntry& rEntry = pParam->GetEntry(i);
++                if ( rEntry.bDoQuery )
++                {
++                    sal_uInt32 nIndex = 0;
++                    rEntry.bQueryByString = !pFormatter->IsNumberFormat(
++                        *rEntry.pStr, nIndex, rEntry.nVal );
++                    if ( rEntry.bQueryByString && !pParam->bRegExp )
++                        pParam->bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
+                 }
++                else
++                    break;  // for
+             }
++            return pParam.release();
+         }
+     }
+-    return bRet;
++    return false;
+ }
+ 
+ 
+ void ScInterpreter::DBIterator( ScIterFunc eFunc )
+ {
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::DBIterator" );
+-    SCTAB nTab1;
+     double nErg = 0.0;
+     double fMem = 0.0;
+     BOOL bNull = TRUE;
+     ULONG nCount = 0;
+-    ScQueryParam aQueryParam;
+     BOOL bMissingField = FALSE;
+-    if ( GetDBParams( nTab1, aQueryParam, bMissingField) )
++    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
++    if (pQueryParam.get())
+     {
+-        double nVal;
+-        USHORT nErr;
+-        ScQueryValueIterator aValIter(pDok, nTab1, aQueryParam);
+-        if ( aValIter.GetFirst(nVal, nErr) && !nErr )
++        ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());
++        ScDBQueryDataIterator::Value aValue;
++        if ( aValIter.GetFirst(aValue) && !aValue.mnError )
+         {
+             switch( eFunc )
+             {
+@@ -5820,24 +5788,24 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc )
+                 {
+                     case ifAVERAGE:
+                     case ifSUM:
+-                        if ( bNull && nVal != 0.0 )
++                        if ( bNull && aValue.mfValue != 0.0 )
+                         {
+                             bNull = FALSE;
+-                            fMem = nVal;
++                            fMem = aValue.mfValue;
+                         }
+                         else
+-                            nErg += nVal;
++                            nErg += aValue.mfValue;
+                         break;
+-                    case ifSUMSQ:   nErg += nVal * nVal; break;
+-                    case ifPRODUCT: nErg *= nVal; break;
+-                    case ifMAX:     if( nVal > nErg ) nErg = nVal; break;
+-                    case ifMIN:     if( nVal < nErg ) nErg = nVal; break;
++                    case ifSUMSQ:   nErg += aValue.mfValue * aValue.mfValue; break;
++                    case ifPRODUCT: nErg *= aValue.mfValue; break;
++                    case ifMAX:     if( aValue.mfValue > nErg ) nErg = aValue.mfValue; break;
++                    case ifMIN:     if( aValue.mfValue < nErg ) nErg = aValue.mfValue; break;
+                     default: ; // nothing
+                 }
+             }
+-            while ( aValIter.GetNext(nVal, nErr) && !nErr );
++            while ( aValIter.GetNext(aValue) && !aValue.mnError );
+         }
+-        SetError(nErr);
++        SetError(aValue.mnError);
+     }
+     else
+         SetError( errIllegalParameter);
+@@ -5862,13 +5830,12 @@ void ScInterpreter::ScDBSum()
+ void ScInterpreter::ScDBCount()
+ {
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScDBCount" );
+-    SCTAB nTab;
+-    ScQueryParam aQueryParam;
+     BOOL bMissingField = TRUE;
+-    if ( GetDBParams( nTab, aQueryParam, bMissingField) )
++    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
++    if (pQueryParam.get())
+     {
+         ULONG nCount = 0;
+-        if ( bMissingField )
++        if ( bMissingField && pQueryParam->GetType() == ScDBQueryParamBase::INTERNAL )
+         {   // count all matching records
+             // TODO: currently the QueryIterators only return cell pointers of
+             // existing cells, so if a query matches an empty cell there's
+@@ -5878,7 +5845,9 @@ void ScInterpreter::ScDBCount()
+             // have to live with it until we reimplement the iterators to also
+             // return empty cells, which would mean to adapt all callers of
+             // iterators.
+-            ScQueryCellIterator aCellIter( pDok, nTab, aQueryParam);
++            ScDBQueryParamInternal* p = static_cast<ScDBQueryParamInternal*>(pQueryParam.get());
++            SCTAB nTab = p->nTab;
++            ScQueryCellIterator aCellIter( pDok, nTab, *p);
+             if ( aCellIter.GetFirst() )
+             {
+                 do
+@@ -5889,17 +5858,17 @@ void ScInterpreter::ScDBCount()
+         }
+         else
+         {   // count only matching records with a value in the "result" field
+-            double nVal;
+-            USHORT nErr = 0;
+-            ScQueryValueIterator aValIter( pDok, nTab, aQueryParam);
+-            if ( aValIter.GetFirst( nVal, nErr) && !nErr )
++            ScDBQueryDataIterator aValIter( pDok, pQueryParam.release());
++            ScDBQueryDataIterator::Value aValue;
++            if ( aValIter.GetFirst(aValue) && !aValue.mnError )
+             {
+                 do
+                 {
+                     nCount++;
+-                } while ( aValIter.GetNext( nVal, nErr) && !nErr );
++                } 
++                while ( aValIter.GetNext(aValue) && !aValue.mnError );
+             }
+-            SetError( nErr );
++            SetError(aValue.mnError);
+         }
+         PushDouble( nCount );
+     }
+@@ -5911,21 +5880,24 @@ void ScInterpreter::ScDBCount()
+ void ScInterpreter::ScDBCount2()
+ {
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScDBCount2" );
+-    SCTAB nTab;
+-    ScQueryParam aQueryParam;
+     BOOL bMissingField = TRUE;
+-    if (GetDBParams( nTab, aQueryParam, bMissingField))
++    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
++    if (pQueryParam.get())
+     {
+         ULONG nCount = 0;
+-        ScQueryCellIterator aCellIter(pDok, nTab, aQueryParam);
+-        if ( aCellIter.GetFirst() )
++        pQueryParam->mbSkipString = false;
++        ScDBQueryDataIterator aValIter( pDok, pQueryParam.release());
++        ScDBQueryDataIterator::Value aValue;
++        if ( aValIter.GetFirst(aValue) && !aValue.mnError )
+         {
+             do
+             {
+                 nCount++;
+-            } while ( aCellIter.GetNext() );
++            } 
++            while ( aValIter.GetNext(aValue) && !aValue.mnError );
+         }
+-        PushDouble(nCount);
++        SetError(aValue.mnError);
++        PushDouble( nCount );
+     }
+     else
+         PushIllegalParameter();
+@@ -5969,25 +5941,23 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount )
+ 
+     rValCount = 0.0;
+     double fSum    = 0.0;
+-    SCTAB nTab;
+-    ScQueryParam aQueryParam;
+     BOOL bMissingField = FALSE;
+-    if (GetDBParams( nTab, aQueryParam, bMissingField))
++    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
++    if (pQueryParam.get())
+     {
+-        double fVal;
+-        USHORT nErr;
+-        ScQueryValueIterator aValIter(pDok, nTab, aQueryParam);
+-        if (aValIter.GetFirst(fVal, nErr) && !nErr)
++        ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());
++        ScDBQueryDataIterator::Value aValue;
++        if (aValIter.GetFirst(aValue) && !aValue.mnError)
+         {
+             do
+             {
+                 rValCount++;
+-                values.push_back(fVal);
+-                fSum += fVal;
++                values.push_back(aValue.mfValue);
++                fSum += aValue.mfValue;
+             }
+-            while ((nErr == 0) && aValIter.GetNext(fVal, nErr));
++            while ((aValue.mnError == 0) && aValIter.GetNext(aValue));
+         }
+-        SetError(nErr);
++        SetError(aValue.mnError);
+     }
+     else
+         SetError( errIllegalParameter);
+diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
+index cf8dc7e..a301200 100644
+--- sc/source/core/tool/interpr4.cxx
++++ sc/source/core/tool/interpr4.cxx
+@@ -68,15 +68,18 @@
+ #include "jumpmatrix.hxx"
+ #include "parclass.hxx"
+ #include "externalrefmgr.hxx"
++#include "doubleref.hxx"
+ 
+ #include <math.h>
+ #include <float.h>
+ #include <map>
+ #include <algorithm>
+ #include <functional>
++#include <memory>
+ 
+ using namespace com::sun::star;
+ using namespace formula;
++using ::std::auto_ptr;
+ 
+ #define ADDIN_MAXSTRLEN 256
+ 
+@@ -1021,6 +1024,44 @@ void ScInterpreter::DoubleRefToVars( const ScToken* p,
+     }
+ }
+ 
++ScDBRangeBase* ScInterpreter::PopDoubleRef()
++{
++    if (!sp)
++    {    
++        SetError(errUnknownStackVariable);
++        return NULL;
++    }
++
++    --sp;
++    FormulaToken* p = pStack[sp];
++    switch (p->GetType())
++    {
++        case svError:
++            nGlobalError = p->GetError();
++        break;
++        case svDoubleRef:
++        {
++            SCCOL nCol1, nCol2;
++            SCROW nRow1, nRow2;
++            SCTAB nTab1, nTab2;
++            DoubleRefToVars(static_cast<ScToken*>(p), 
++                            nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, false);
++            
++            return new ScDBInternalRange(pDok,
++                ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2));
++        }
++        break;
++        case svMatrix:
++        {
++            ScMatrixRef pMat = static_cast<ScToken*>(p)->GetMatrix();
++            return new ScDBExternalRange(pDok, pMat);
++        }
++        break;
++        default:
++            SetError( errIllegalParameter);
++    }
++    return NULL;
++}
+ 
+ void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
+                                  SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
+@@ -1860,78 +1901,37 @@ ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix( double& rDouble,
+ void ScInterpreter::ScDBGet()
+ {
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScDBGet" );
+-    SCTAB nTab;
+-    ScQueryParam aQueryParam;
+     BOOL bMissingField = FALSE;
+-    if (GetDBParams( nTab, aQueryParam, bMissingField))
++    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
++    if (!pQueryParam.get())
+     {
+-        ScBaseCell* pCell;
+-        ScQueryCellIterator aCellIter(pDok, nTab, aQueryParam);
+-        if ( (pCell = aCellIter.GetFirst()) != NULL )
+-        {
+-            if (aCellIter.GetNext())
+-                PushIllegalArgument();
+-            else
+-            {
+-                switch (pCell->GetCellType())
+-                {
+-                    case CELLTYPE_VALUE:
+-                    {
+-                        double rValue = ((ScValueCell*)pCell)->GetValue();
+-                        if ( bCalcAsShown )
+-                        {
+-                            ULONG nFormat;
+-                            nFormat = aCellIter.GetNumberFormat();
+-                            rValue = pDok->RoundValueAsShown( rValue, nFormat );
+-                        }
+-                        PushDouble(rValue);
+-                    }
+-                    break;
+-                    case CELLTYPE_STRING:
+-                    {
+-                        String rString;
+-                        ((ScStringCell*)pCell)->GetString(rString);
+-                        PushString(rString);
+-                    }
+-                    break;
+-                    case CELLTYPE_EDIT:
+-                    {
+-                        String rString;
+-                        ((ScEditCell*)pCell)->GetString(rString);
+-                        PushString(rString);
+-                    }
+-                    break;
+-                    case CELLTYPE_FORMULA:
+-                    {
+-                        USHORT rErr = ((ScFormulaCell*)pCell)->GetErrCode();
+-                        if (rErr)
+-                            PushError(rErr);
+-                        else if (((ScFormulaCell*)pCell)->IsValue())
+-                        {
+-                            double rValue = ((ScFormulaCell*)pCell)->GetValue();
+-                            PushDouble(rValue);
+-                        }
+-                        else
+-                        {
+-                            String rString;
+-                            ((ScFormulaCell*)pCell)->GetString(rString);
+-                            PushString(rString);
+-                        }
+-                    }
+-                    break;
+-                    case CELLTYPE_NONE:
+-                    case CELLTYPE_NOTE:
+-                    default:
+-                        PushIllegalArgument();
+-                    break;
+-                }
+-            }
+-        }
+-        else
+-            PushNoValue();
++        // Failed to create query param.
++        PushIllegalParameter();
++        return;
++    }
++
++    pQueryParam->mbSkipString = false;
++    ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());
++    ScDBQueryDataIterator::Value aValue;
++    if (!aValIter.GetFirst(aValue) || aValue.mnError)
++    {
++        // No match found.
++        PushNoValue();
++        return;
++    }
++
++    ScDBQueryDataIterator::Value aValNext;
++    if (aValIter.GetNext(aValNext) && !aValNext.mnError)
++    {
++        // There should be only one unique match.
++        PushIllegalArgument();
++        return;
+     }
++
++    if (aValue.mbIsNumber)
++        PushDouble(aValue.mfValue);
+     else
+-        PushIllegalParameter();
++        PushString(aValue.maString);
+ }
+ 
+ 
+diff --git sc/source/core/tool/makefile.mk sc/source/core/tool/makefile.mk
+index b0f8f03..041d2c8 100644
+--- sc/source/core/tool/makefile.mk
++++ sc/source/core/tool/makefile.mk
+@@ -76,6 +76,7 @@ SLOFILES =  \
+         $(SLO)$/detdata.obj  \
+         $(SLO)$/detfunc.obj  \
+         $(SLO)$/docoptio.obj \
++		$(SLO)$/doubleref.obj \
+         $(SLO)$/editutil.obj \
+         $(SLO)$/filtopt.obj \
+         $(SLO)$/formulaparserpool.obj \
+@@ -95,6 +96,7 @@ SLOFILES =  \
+         $(SLO)$/printopt.obj \
+         $(SLO)$/prnsave.obj \
+         $(SLO)$/progress.obj \
++		$(SLO)$/queryparam.obj \
+         $(SLO)$/rangelst.obj \
+         $(SLO)$/rangenam.obj \
+         $(SLO)$/rangeseq.obj \
+@@ -123,6 +125,7 @@ EXCEPTIONSFILES= \
+         $(SLO)$/chartlock.obj \
+         $(SLO)$/chgtrack.obj \
+         $(SLO)$/compiler.obj \
++		$(SLO)$/doubleref.obj \
+         $(SLO)$/formulaparserpool.obj \
+         $(SLO)$/interpr1.obj \
+         $(SLO)$/interpr2.obj \
+@@ -131,6 +134,7 @@ EXCEPTIONSFILES= \
+         $(SLO)$/interpr5.obj \
+         $(SLO)$/lookupcache.obj \
+         $(SLO)$/prnsave.obj \
++		$(SLO)$/queryparam.obj \
+         $(SLO)$/reftokenhelper.obj \
+ 		$(SLO)$/stringutil.obj \
+         $(SLO)$/token.obj
+diff --git sc/source/core/tool/queryparam.cxx sc/source/core/tool/queryparam.cxx
+new file mode 100644
+index 0000000..d9d477d
+--- /dev/null
++++ sc/source/core/tool/queryparam.cxx
+@@ -0,0 +1,361 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: interpr4.cxx,v $
++ * $Revision: 1.57.92.5 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_sc.hxx"
++
++// INCLUDE ---------------------------------------------------------------
++
++#include "queryparam.hxx"
++
++using ::std::vector;
++
++// ============================================================================
++
++ScQueryParamBase::ScQueryParamBase()
++{
++    Resize( MAXQUERY );
++    for (USHORT i=0; i<MAXQUERY; i++)
++        maEntries[i].Clear();
++}
++
++ScQueryParamBase::ScQueryParamBase(const ScQueryParamBase& r) :
++    bHasHeader(r.bHasHeader), bByRow(r.bByRow), bInplace(r.bInplace), bCaseSens(r.bCaseSens),
++    bRegExp(r.bRegExp), bDuplicate(r.bDuplicate), bMixedComparison(r.bMixedComparison),
++    maEntries(r.maEntries)
++{
++}
++
++ScQueryParamBase::~ScQueryParamBase()
++{
++}
++
++SCSIZE ScQueryParamBase::GetEntryCount() const
++{
++    return maEntries.size();
++}
++
++ScQueryEntry& ScQueryParamBase::GetEntry(SCSIZE n) const
++{
++    return maEntries[n];
++}
++
++void ScQueryParamBase::Resize(SCSIZE nNew)
++{
++    if ( nNew < MAXQUERY )
++        nNew = MAXQUERY;                // nie weniger als MAXQUERY
++
++    vector<ScQueryEntry> aNewEntries(nNew);
++    SCSIZE nCopy = ::std::min(maEntries.size(), nNew);
++    for (SCSIZE i=0; i<nCopy; i++)
++        aNewEntries[i] = maEntries[i];
++
++    maEntries.swap(aNewEntries);
++}
++
++void ScQueryParamBase::DeleteQuery( SCSIZE nPos )
++{
++    if (nPos >= maEntries.size())
++        return;
++
++    size_t n = maEntries.size();
++    vector<ScQueryEntry> aNewEntries;
++    aNewEntries.reserve(n-1);
++    for (size_t i = 0; i < n; ++i)
++        if (i != nPos)
++            aNewEntries.push_back(maEntries[i]);
++
++    maEntries.swap(aNewEntries);
++}
++
++void ScQueryParamBase::FillInExcelSyntax(String& aCellStr, SCSIZE nIndex)
++{
++    if (aCellStr.Len() > 0)
++    {
++        if ( nIndex >= maEntries.size() )
++            Resize( nIndex+1 );
++
++        ScQueryEntry& rEntry = GetEntry(nIndex);
++
++        rEntry.bDoQuery = TRUE;
++        // Operatoren herausfiltern
++        if (aCellStr.GetChar(0) == '<')
++        {
++            if (aCellStr.GetChar(1) == '>')
++            {
++                *rEntry.pStr = aCellStr.Copy(2);
++                rEntry.eOp   = SC_NOT_EQUAL;
++            }
++            else if (aCellStr.GetChar(1) == '=')
++            {
++                *rEntry.pStr = aCellStr.Copy(2);
++                rEntry.eOp   = SC_LESS_EQUAL;
++            }
++            else
++            {
++                *rEntry.pStr = aCellStr.Copy(1);
++                rEntry.eOp   = SC_LESS;
++            }
++        }
++        else if (aCellStr.GetChar(0) == '>')
++        {
++            if (aCellStr.GetChar(1) == '=')
++            {
++                *rEntry.pStr = aCellStr.Copy(2);
++                rEntry.eOp   = SC_GREATER_EQUAL;
++            }
++            else
++            {
++                *rEntry.pStr = aCellStr.Copy(1);
++                rEntry.eOp   = SC_GREATER;
++            }
++        }
++        else
++        {
++            if (aCellStr.GetChar(0) == '=')
++                *rEntry.pStr = aCellStr.Copy(1);
++            else
++                *rEntry.pStr = aCellStr;
++            rEntry.eOp = SC_EQUAL;
++        }
++    }
++}
++
++// ============================================================================
++
++ScQueryParamTable::ScQueryParamTable()
++{
++}
++
++ScQueryParamTable::ScQueryParamTable(const ScQueryParamTable& r) :
++    nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nTab(r.nTab)
++{
++}
++
++ScQueryParamTable::~ScQueryParamTable()
++{
++}
++
++// ============================================================================
++
++ScQueryParam::ScQueryParam() : 
++    ScQueryParamBase(),
++    ScQueryParamTable()
++{
++    Clear();
++}
++
++//------------------------------------------------------------------------
++
++ScQueryParam::ScQueryParam( const ScQueryParam& r ) :
++    ScQueryParamBase(r),
++    ScQueryParamTable(r),
++    bDestPers(r.bDestPers), nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow)
++{
++}
++
++ScQueryParam::ScQueryParam( const ScDBQueryParamInternal& r ) :
++    ScQueryParamBase(r),
++    ScQueryParamTable(r),
++    bDestPers(true),
++    nDestTab(0),
++    nDestCol(0),
++    nDestRow(0)
++{
++}
++    
++
++//------------------------------------------------------------------------
++
++ScQueryParam::~ScQueryParam()
++{
++}
++
++//------------------------------------------------------------------------
++
++void ScQueryParam::Clear()
++{
++    nCol1=nCol2 = 0;
++    nRow1=nRow2 = 0;
++    nTab = SCTAB_MAX;
++    bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE;
++    bInplace = bByRow = bDuplicate = TRUE;
++
++    Resize( MAXQUERY );
++    for (USHORT i=0; i<MAXQUERY; i++)
++        maEntries[i].Clear();
++
++    ClearDestParams();
++}
++
++void ScQueryParam::ClearDestParams()
++{
++    bDestPers = true;
++    nDestTab = 0;
++    nDestCol = 0;
++    nDestRow = 0;
++}
++
++//------------------------------------------------------------------------
++
++ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
++{
++    nCol1       = r.nCol1;
++    nRow1       = r.nRow1;
++    nCol2       = r.nCol2;
++    nRow2       = r.nRow2;
++    nTab        = r.nTab;
++    nDestTab    = r.nDestTab;
++    nDestCol    = r.nDestCol;
++    nDestRow    = r.nDestRow;
++    bHasHeader  = r.bHasHeader;
++    bInplace    = r.bInplace;
++    bCaseSens   = r.bCaseSens;
++    bRegExp     = r.bRegExp;
++    bMixedComparison = r.bMixedComparison;
++    bDuplicate  = r.bDuplicate;
++    bByRow      = r.bByRow;
++    bDestPers   = r.bDestPers;
++
++    maEntries = r.maEntries;
++
++    return *this;
++}
++
++//------------------------------------------------------------------------
++
++BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
++{
++    BOOL bEqual = FALSE;
++
++    // Anzahl der Queries gleich?
++    SCSIZE nUsed      = 0;
++    SCSIZE nOtherUsed = 0;
++    SCSIZE nEntryCount = GetEntryCount();
++    SCSIZE nOtherEntryCount = rOther.GetEntryCount();
++
++    while ( nUsed<nEntryCount && maEntries[nUsed].bDoQuery ) ++nUsed;
++    while ( nOtherUsed<nOtherEntryCount && rOther.maEntries[nOtherUsed].bDoQuery )
++        ++nOtherUsed;
++
++    if (   (nUsed       == nOtherUsed)
++        && (nCol1       == rOther.nCol1)
++        && (nRow1       == rOther.nRow1)
++        && (nCol2       == rOther.nCol2)
++        && (nRow2       == rOther.nRow2)
++        && (nTab        == rOther.nTab)
++        && (bHasHeader  == rOther.bHasHeader)
++        && (bByRow      == rOther.bByRow)
++        && (bInplace    == rOther.bInplace)
++        && (bCaseSens   == rOther.bCaseSens)
++        && (bRegExp     == rOther.bRegExp)
++        && (bMixedComparison == rOther.bMixedComparison)
++        && (bDuplicate  == rOther.bDuplicate)
++        && (bDestPers   == rOther.bDestPers)
++        && (nDestTab    == rOther.nDestTab)
++        && (nDestCol    == rOther.nDestCol)
++        && (nDestRow    == rOther.nDestRow) )
++    {
++        bEqual = TRUE;
++        for ( SCSIZE i=0; i<nUsed && bEqual; i++ )
++            bEqual = maEntries[i] == rOther.maEntries[i];
++    }
++    return bEqual;
++}
++
++//------------------------------------------------------------------------
++
++void ScQueryParam::MoveToDest()
++{
++    if (!bInplace)
++    {
++        SCsCOL nDifX = ((SCsCOL) nDestCol) - ((SCsCOL) nCol1);
++        SCsROW nDifY = ((SCsROW) nDestRow) - ((SCsROW) nRow1);
++        SCsTAB nDifZ = ((SCsTAB) nDestTab) - ((SCsTAB) nTab);
++
++        nCol1 = sal::static_int_cast<SCCOL>( nCol1 + nDifX );
++        nRow1 = sal::static_int_cast<SCROW>( nRow1 + nDifY );
++        nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );
++        nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );
++        nTab  = sal::static_int_cast<SCTAB>( nTab  + nDifZ );
++        size_t n = maEntries.size();
++        for (size_t i=0; i<n; i++)
++            maEntries[i].nField += nDifX;
++
++        bInplace = TRUE;
++    }
++    else
++    {
++        DBG_ERROR("MoveToDest, bInplace == TRUE");
++    }
++}
++
++// ============================================================================
++
++ScDBQueryParamBase::ScDBQueryParamBase(DataType eType) :
++    ScQueryParamBase(),
++    mnField(-1),
++    mbSkipString(true),
++    meType(eType)
++{
++}
++
++ScDBQueryParamBase::~ScDBQueryParamBase()
++{
++}
++
++ScDBQueryParamBase::DataType ScDBQueryParamBase::GetType() const
++{
++    return meType;
++}
++
++// ============================================================================
++
++ScDBQueryParamInternal::ScDBQueryParamInternal() :
++    ScDBQueryParamBase(ScDBQueryParamBase::INTERNAL),
++    ScQueryParamTable()
++{
++}
++
++ScDBQueryParamInternal::~ScDBQueryParamInternal()
++{
++}
++
++// ============================================================================
++
++ScDBQueryParamMatrix::ScDBQueryParamMatrix() :
++    ScDBQueryParamBase(ScDBQueryParamBase::MATRIX)
++{
++}
++
++ScDBQueryParamMatrix::~ScDBQueryParamMatrix()
++{
++}
++
+diff --git sc/source/filter/excel/colrowst.cxx sc/source/filter/excel/colrowst.cxx
+index 174ab20..199dad8 100644
+--- sc/source/filter/excel/colrowst.cxx
++++ sc/source/filter/excel/colrowst.cxx
+@@ -43,6 +43,7 @@
+ #include "xltable.hxx"
+ #include "xistream.hxx"
+ #include "xistyle.hxx"
++#include "queryparam.hxx"
+ 
+ // for filter manager
+ #include "excimp8.hxx"
+diff --git sc/source/filter/excel/xichart.cxx sc/source/filter/excel/xichart.cxx
+index 2d920b0..69ead7f 100644
+--- sc/source/filter/excel/xichart.cxx
++++ sc/source/filter/excel/xichart.cxx
+@@ -34,6 +34,7 @@
+ #include "xichart.hxx"
+ 
+ #include <algorithm>
++#include <memory>
+ 
+ #include <com/sun/star/frame/XModel.hpp>
+ #include <com/sun/star/drawing/Direction3D.hpp>
+@@ -72,6 +73,8 @@
+ #include "tokenarray.hxx"
+ #include "token.hxx"
+ #include "compiler.hxx"
++#include "reftokenhelper.hxx"
++#include "chartlis.hxx"
+ #include "fprogressbar.hxx"
+ #include "xltracer.hxx"
+ #include "xistream.hxx"
+@@ -123,6 +126,8 @@ using ::com::sun::star::chart2::data::XDataSequence;
+ using ::formula::FormulaToken;
+ using ::formula::StackVar;
+ 
++using ::std::vector;
++
+ // Helpers ====================================================================
+ 
+ namespace {
+@@ -791,6 +796,22 @@ Sequence< Reference< XFormattedString > > XclImpChSourceLink::CreateStringSequen
+     return ScfApiHelper::VectorToSequence( aStringVec );
+ }
+ 
++void XclImpChSourceLink::FillSourceLink(vector<ScSharedTokenRef>& rTokens) const
++{
++    if (!mxTokenArray.is())
++        // no links to fill.
++        return;
++
++    mxTokenArray->Reset();
++    for (FormulaToken* p = mxTokenArray->First(); p; p = mxTokenArray->Next())
++    {
++        ScSharedTokenRef pToken(static_cast<ScToken*>(p->Clone()));
++        if (ScRefTokenHelper::isRef(pToken))
++            // This is a reference token.  Store it.
++            ScRefTokenHelper::join(rTokens, pToken);
++    }
++}
++
+ // Text =======================================================================
+ 
+ XclImpChFontBase::~XclImpChFontBase()
+@@ -1837,6 +1858,14 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
+     return xDataSeries;
+ }
+ 
++void XclImpChSeries::FillAllSourceLinks(vector<ScSharedTokenRef>& rTokens) const
++{
++    mxValueLink->FillSourceLink(rTokens);
++    mxCategLink->FillSourceLink(rTokens);
++    mxTitleLink->FillSourceLink(rTokens);
++    mxBubbleLink->FillSourceLink(rTokens);
++}
++
+ void XclImpChSeries::ReadChSourceLink( XclImpStream& rStrm )
+ {
+     XclImpChSourceLinkRef xSrcLink( new XclImpChSourceLink( GetChRoot() ) );
+@@ -3481,7 +3510,7 @@ XclImpChTextRef XclImpChChart::GetDefaultText( XclChTextType eTextType ) const
+     return maDefTexts.get( nDefTextId );
+ }
+ 
+-void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressBar& rProgress ) const
++void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressBar& rProgress, const OUString& rObjName ) const
+ {
+     // initialize conversion (locks the model to suppress any internal updates)
+     InitConversion( xChartDoc );
+@@ -3524,6 +3553,28 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressB
+ 
+     // unlock the model
+     FinishConversion( rProgress );
++
++    ScDocument* pDoc = &GetRoot().GetDoc();
++    ScChartListenerCollection* pChartCollection = pDoc->GetChartListenerCollection();
++    if (pChartCollection)
++    {
++        // Now, start listening to this chart.
++        ::std::auto_ptr< vector<ScSharedTokenRef> > pRefTokens(new vector<ScSharedTokenRef>);
++        for (XclImpChSeriesVec::const_iterator itr = maSeries.begin(), itrEnd = maSeries.end(); itr != itrEnd; ++itr)
++        {
++            const XclImpChSeriesRef& rSeries = *itr;
++            rSeries->FillAllSourceLinks(*pRefTokens);
++        }
++        if (!pRefTokens->empty())
++        {
++            ::std::auto_ptr<ScChartListener> pListener(
++                new ScChartListener(rObjName, pDoc, pRefTokens.release()));
++            pListener->SetDirty(true);
++            pListener->StartListeningTo();
++            pChartCollection->Insert(pListener.release());
++
++        }
++    }
+ }
+ 
+ void XclImpChChart::ReadChSeries( XclImpStream& rStrm )
+@@ -3749,11 +3800,11 @@ sal_Size XclImpChart::GetProgressSize() const
+     return mxChartData.is() ? mxChartData->GetProgressSize() : 0;
+ }
+ 
+-void XclImpChart::Convert( Reference< XModel > xModel, ScfProgressBar& rProgress ) const
++void XclImpChart::Convert( Reference< XModel > xModel, ScfProgressBar& rProgress, const OUString& rObjName ) const
+ {
+     Reference< XChartDocument > xChartDoc( xModel, UNO_QUERY );
+     if( mxChartData.is() && xChartDoc.is() )
+-        mxChartData->Convert( xChartDoc, rProgress );
++        mxChartData->Convert( xChartDoc, rProgress, rObjName );
+ }
+ 
+ void XclImpChart::ReadChChart( XclImpStream& rStrm )
+diff --git sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx
+index 599b33f..48406eb 100644
+--- sc/source/filter/excel/xiescher.cxx
++++ sc/source/filter/excel/xiescher.cxx
+@@ -1579,7 +1579,7 @@ SdrObject* XclImpChartObj::DoCreateSdrObj( const Rectangle& rAnchorRect, ScfProg
+         if( svt::EmbeddedObjectRef::TryRunningState( xEmbObj ) )
+         {
+             Reference< XModel > xModel( xEmbObj->getComponent(), UNO_QUERY );
+-            mxChart->Convert( xModel, rProgress );
++            mxChart->Convert( xModel, rProgress, aEmbObjName );
+ 
+             Reference< XEmbedPersist > xPers( xEmbObj, UNO_QUERY );
+             if( xPers.is() )
+diff --git sc/source/filter/inc/excimp8.hxx sc/source/filter/inc/excimp8.hxx
+index fadad41..43e630d 100644
+--- sc/source/filter/inc/excimp8.hxx
++++ sc/source/filter/inc/excimp8.hxx
+@@ -37,6 +37,7 @@
+ #include "excscen.hxx"
+ #include "excdefs.hxx"
+ #include "ftools.hxx"
++#include "queryparam.hxx"
+ 
+ class SotStorage;
+ 
+diff --git sc/source/filter/inc/xichart.hxx sc/source/filter/inc/xichart.hxx
+index 1798242..e923ee1 100644
+--- sc/source/filter/inc/xichart.hxx
++++ sc/source/filter/inc/xichart.hxx
+@@ -39,6 +39,7 @@
+ #include <svtools/itemset.hxx>
+ 
+ #include "rangelst.hxx"
++#include "token.hxx"
+ #include "xlchart.hxx"
+ #include "xlstyle.hxx"
+ #include "xistring.hxx"
+@@ -403,6 +404,8 @@ public:
+     XFormattedStringSeq CreateStringSequence( const XclImpChRoot& rRoot,
+                             sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const;
+ 
++    void                FillSourceLink(::std::vector<ScSharedTokenRef>& rTokens) const;
++
+ private:
+     XclChSourceLink     maData;             /// Contents of the CHSOURCELINK record.
+     XclImpStringRef     mxString;           /// Text data (CHSTRING record).
+@@ -811,6 +814,8 @@ public:
+     /** Creates a data series object with initialized source links. */
+     XDataSeriesRef      CreateDataSeries() const;
+ 
++    void                FillAllSourceLinks(::std::vector<ScSharedTokenRef>& rTokens) const;
++
+ private:
+     /** Reads a CHSOURCELINK record. */
+     void                ReadChSourceLink( XclImpStream& rStrm );
+@@ -1353,7 +1358,7 @@ public:
+     inline sal_Size     GetProgressSize() const { return 2 * EXC_CHART_PROGRESS_SIZE; }
+ 
+     /** Converts and writes all properties to the passed chart. */
+-    void                Convert( XChartDocRef xChartDoc, ScfProgressBar& rProgress ) const;
++    void                Convert( XChartDocRef xChartDoc, ScfProgressBar& rProgress, const ::rtl::OUString& rObjName ) const;
+ 
+ private:
+     /** Reads a CHSERIES group (data series source and formatting). */
+@@ -1421,7 +1426,7 @@ public:
+     inline bool         IsPivotChart() const { return mbIsPivotChart; }
+ 
+     /** Creates the chart object in the passed component. */
+-    void                Convert( XModelRef xModel, ScfProgressBar& rProgress ) const;
++    void                Convert( XModelRef xModel, ScfProgressBar& rProgress, const ::rtl::OUString& rObjName ) const;
+ 
+ private:
+     /** Reads the CHCHART group (entire chart data). */
+diff --git sc/source/filter/xml/XMLExportDataPilot.hxx sc/source/filter/xml/XMLExportDataPilot.hxx
+index a3f6cf8..46a2bb0 100644
+--- sc/source/filter/xml/XMLExportDataPilot.hxx
++++ sc/source/filter/xml/XMLExportDataPilot.hxx
+@@ -44,6 +44,7 @@ class ScDPDimensionSaveData;
+ class ScDPSaveGroupDimension;
+ class ScDPSaveNumGroupDimension;
+ struct ScDPNumGroupInfo;
++struct ScQueryParam;
+ 
+ class ScXMLExportDataPilot
+ {
+diff --git sc/source/filter/xml/xmldpimp.hxx sc/source/filter/xml/xmldpimp.hxx
+index b4df6b1..705dbac 100644
+--- sc/source/filter/xml/xmldpimp.hxx
++++ sc/source/filter/xml/xmldpimp.hxx
+@@ -40,6 +40,7 @@
+ #include "global.hxx"
+ #include "dpobject.hxx"
+ #include "dpsave.hxx"
++#include "queryparam.hxx"
+ 
+ #include <hash_set>
+ 
+diff --git sc/source/ui/dbgui/foptmgr.cxx sc/source/ui/dbgui/foptmgr.cxx
+index ee5f039..a425836 100644
+--- sc/source/ui/dbgui/foptmgr.cxx
++++ sc/source/ui/dbgui/foptmgr.cxx
+@@ -45,6 +45,7 @@
+ #include "dbcolect.hxx"
+ #include "viewdata.hxx"
+ #include "document.hxx"
++#include "queryparam.hxx"
+ 
+ #define _FOPTMGR_CXX
+ #include "foptmgr.hxx"
+diff --git sc/source/ui/docshell/externalrefmgr.cxx sc/source/ui/docshell/externalrefmgr.cxx
+index 1f77d2c..f1587bc 100644
+--- sc/source/ui/docshell/externalrefmgr.cxx
++++ sc/source/ui/docshell/externalrefmgr.cxx
+@@ -1045,8 +1045,11 @@ void ScExternalRefLink::DataChanged(const String& /*rMimeType*/, const Any& /*rV
+     else
+     {
+         // The source document has changed.
++        ScDocShell* pDocShell = ScDocShell::GetViewData()->GetDocShell();
++        ScDocShellModificator aMod(*pDocShell);
+         pMgr->switchSrcFile(mnFileId, aFile);
+         maFilterName = aFilter;
++        aMod.SetDocumentModified();
+     }
+ }
+ 
+diff --git sc/source/ui/inc/pfiltdlg.hxx sc/source/ui/inc/pfiltdlg.hxx
+index a9ba0d1..b383173 100644
+--- sc/source/ui/inc/pfiltdlg.hxx
++++ sc/source/ui/inc/pfiltdlg.hxx
+@@ -53,8 +53,8 @@
+ #ifndef _COMBOBOX_HXX //autogen
+ #include <vcl/combobox.hxx>
+ #endif
+-#include "global.hxx" // -> ScQueryParam
+ #include "address.hxx"
++#include "queryparam.hxx"
+ 
+ //------------------------------------------------------------------
+ 
+diff --git sc/source/ui/inc/uiitems.hxx sc/source/ui/inc/uiitems.hxx
+index 6581436..4cd4e58 100644
+--- sc/source/ui/inc/uiitems.hxx
++++ sc/source/ui/inc/uiitems.hxx
+@@ -34,6 +34,7 @@
+ #include "scdllapi.h"
+ #include "conditio.hxx"
+ #include "sortparam.hxx"
++#include "queryparam.hxx"
+ #include "paramisc.hxx"
+ #include <svtools/poolitem.hxx>
+ 
+diff --git sc/source/ui/inc/undodat.hxx sc/source/ui/inc/undodat.hxx
+index fb42d81..ad46cb7 100644
+--- sc/source/ui/inc/undodat.hxx
++++ sc/source/ui/inc/undodat.hxx
+@@ -36,6 +36,7 @@
+ #include "rangelst.hxx"		// ScRangeListRef
+ #include "markdata.hxx"
+ #include "sortparam.hxx"
++#include "queryparam.hxx"
+ #include "pivot.hxx"
+ 
+ class ScDocShell;
+diff --git sc/source/ui/undo/undobase.cxx sc/source/ui/undo/undobase.cxx
+index f20abdb..8b59f80 100644
+--- sc/source/ui/undo/undobase.cxx
++++ sc/source/ui/undo/undobase.cxx
+@@ -45,6 +45,7 @@
+ #include "undodraw.hxx"
+ #include "dbcolect.hxx"
+ #include "attrib.hxx"
++#include "queryparam.hxx"
+ #include "globstr.hrc"
+ 
+ // STATIC DATA -----------------------------------------------------------
+diff --git sc/source/ui/unoobj/chart2uno.cxx sc/source/ui/unoobj/chart2uno.cxx
+index 6e8ae0a..877e244 100644
+--- sc/source/ui/unoobj/chart2uno.cxx
++++ sc/source/ui/unoobj/chart2uno.cxx
+@@ -2919,6 +2919,9 @@ void ScChart2DataSequence::BuildDataCache()
+     ::std::list<sal_Int32>::const_iterator itr = aHiddenValues.begin(), itrEnd = aHiddenValues.end();
+     for (;itr != itrEnd; ++itr, ++pArr)
+         *pArr = *itr;
++
++    // Clear the data series cache when the array is re-built.
++    m_aMixedDataCache.realloc(0);
+ }
+ 
+ void ScChart2DataSequence::RebuildDataCache()
+@@ -3111,7 +3114,6 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
+             if ( m_bGotDataChangedHint && m_pDocument )
+             {        
+                 m_aDataArray.clear();
+-                m_aDataArray.clear();
+                 lang::EventObject aEvent;
+                 aEvent.Source.set((cppu::OWeakObject*)this);
+ 
+@@ -3286,19 +3288,24 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData()
+         throw uno::RuntimeException();
+ 
+     BuildDataCache();
+-    sal_Int32 nCount = m_aDataArray.size();
+-    uno::Sequence<uno::Any> aSeq(nCount);
+-    uno::Any* pArr = aSeq.getArray();
+-    ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end();
+-    for (; itr != itrEnd; ++itr, ++pArr)
++
++    if (!m_aMixedDataCache.getLength())
+     {
+-        if (itr->mbIsValue)
+-            *pArr <<= itr->mfValue;
+-        else
+-            *pArr <<= itr->maString;
+-    }
++        // Build a cache for the 1st time...
+ 
+-    return aSeq;
++        sal_Int32 nCount = m_aDataArray.size();
++        m_aMixedDataCache.realloc(nCount);
++        uno::Any* pArr = m_aMixedDataCache.getArray();
++        ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end();
++        for (; itr != itrEnd; ++itr, ++pArr)
++        {
++            if (itr->mbIsValue)
++                *pArr <<= itr->mfValue;
++            else
++                *pArr <<= itr->maString;
++        }
++    }
++    return m_aMixedDataCache;
+ }
+ 
+ // XNumericalDataSequence --------------------------------------------------
+diff --git sc/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx
+index 1cd54a2..5428aa1 100644
+--- sc/source/ui/view/gridwin4.cxx
++++ sc/source/ui/view/gridwin4.cxx
+@@ -74,6 +74,7 @@
+ #include "inputopt.hxx"
+ #include "fillinfo.hxx"
+ #include "dpcontrol.hxx"
++#include "queryparam.hxx"
+ #include "sc.hrc"
+ #include <vcl/virdev.hxx>
+ 
diff --git a/applied_patches/0014-cws-calctabcolor-filter.diff b/applied_patches/0014-cws-calctabcolor-filter.diff
new file mode 100644
index 000000000..f4f31eb40
--- /dev/null
+++ b/applied_patches/0014-cws-calctabcolor-filter.diff
@@ -0,0 +1,470 @@
+diff --git filter/source/xslt/export/spreadsheetml/formular.xsl filter/source/xslt/export/spreadsheetml/formular.xsl
+index 859ef29..a6fe96a 100644
+--- filter/source/xslt/export/spreadsheetml/formular.xsl
++++ filter/source/xslt/export/spreadsheetml/formular.xsl
+@@ -381,7 +381,7 @@
+ 					</xsl:when>
+ 					<xsl:otherwise>
+ 						<xsl:value-of select="$earlierCandidate" />
+-						<xsl:variable name="parameterCandidate">
++						<xsl:variable name="parameterCandidate2">
+ 							<xsl:variable name="formularAfterCandidate" select="substring-after($expressionSuffix, $earlierCandidate)" />
+ 							<xsl:variable name="parameterTillBracket" select="concat(substring-before($formularAfterCandidate,')'),')')" />
+ 							<xsl:variable name="parameterTillComma" select="substring-before(substring-after($expressionSuffix, $parameterTillBracket),',')" />
+@@ -405,8 +405,8 @@
+ 						<xsl:call-template name="getParameter">
+ 							<xsl:with-param name="closingBracketCount" select="$closingBracketCount" />
+ 							<xsl:with-param name="openingBracketCount" select="$openingBracketCount" />
+-							<xsl:with-param name="parameterCandidate" select="$parameterCandidate" />
+-							<xsl:with-param name="earlierCandidate" select="$parameterCandidate" />
++							<xsl:with-param name="parameterCandidate" select="$parameterCandidate2" />
++							<xsl:with-param name="earlierCandidate" select="$parameterCandidate2" />
+ 							<xsl:with-param name="expressionSuffix" select="$expressionSuffix" />
+ 						</xsl:call-template>
+ 					</xsl:otherwise>
+diff --git filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl
+index e91fff2..c63600c 100644
+--- filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl
++++ filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl
+@@ -145,6 +145,17 @@
+ 						<RGB><xsl:value-of select="." /></RGB>
+ 					</Color>
+ 					</xsl:for-each>
++                    <xsl:for-each select="key('config', 'TabColor')[not(.=preceding::config:config-item)]">
++                    <xsl:sort select="." />
++                    <Color>
++                        <Index><xsl:value-of select="56 - position()" /></Index>
++                        <RGB>
++                            <xsl:call-template name="colordecimal2rgb">
++                                <xsl:with-param name="colordecimal" select="."/>
++                            </xsl:call-template>
++                        </RGB>
++                    </Color>
++                    </xsl:for-each>
+ 				</Colors>
+ 			</OfficeDocumentSettings>
+ 			<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+@@ -175,6 +186,160 @@
+ 		</Workbook>
+ 	</xsl:template>
+ 
++    <xsl:template name="colordecimal2rgb">
++        <xsl:param name="colordecimal"/>
++        <xsl:choose>
++            <xsl:when test="$colordecimal &lt;= 16777215 and $colordecimal &gt;= 65536">
++                <xsl:variable name="redValue" select="floor(($colordecimal) div 65536)"/>
++                <xsl:variable name="greenValue" select="floor(($colordecimal - ($redValue*65536)) div 256)"/>
++                <xsl:variable name="blueValue" select="$colordecimal - ($redValue*65536) - ($greenValue*256)"/>
++                <xsl:call-template name="dec_rgb2Hex">
++                    <xsl:with-param name="decRedValue" select="$redValue"/>
++                    <xsl:with-param name="decGreenValue" select="$greenValue"/>
++                    <xsl:with-param name="decBlueValue" select="$blueValue"/>
++                </xsl:call-template>
++            </xsl:when>
++            <xsl:when test="$colordecimal &lt;= 65535 and $colordecimal &gt;= 256">
++                <xsl:variable name="redValue" select="0"/>
++                <xsl:variable name="greenValue" select="$colordecimal div 256"/>
++                <xsl:variable name="blueValue" select="$colordecimal - ($greenValue*256)"/>
++                <xsl:call-template name="dec_rgb2Hex">
++                    <xsl:with-param name="decRedValue" select="$redValue"/>
++                    <xsl:with-param name="decGreenValue" select="$greenValue"/>
++                    <xsl:with-param name="decBlueValue" select="$blueValue"/>
++                </xsl:call-template>
++            </xsl:when>
++            <xsl:when test="$colordecimal &lt;= 255 and $colordecimal &gt;= 0">
++                <xsl:variable name="redValue" select="0"/>
++                <xsl:variable name="greenValue" select="0"/>
++                <xsl:variable name="blueValue" select="$colordecimal"/>
++                <xsl:call-template name="dec_rgb2Hex">
++                    <xsl:with-param name="decRedValue" select="$redValue"/>
++                    <xsl:with-param name="decGreenValue" select="$greenValue"/>
++                    <xsl:with-param name="decBlueValue" select="$blueValue"/>
++                </xsl:call-template>
++            </xsl:when>
++            <xsl:otherwise/>
++        </xsl:choose>
++    </xsl:template>
++    <xsl:template name="dec_rgb2Hex">
++        <xsl:param name="decRedValue"/>
++        <xsl:param name="decGreenValue"/>
++        <xsl:param name="decBlueValue"/>
++        <xsl:variable name="hexRedValue">
++            <xsl:variable name="tmpHexRedValue">
++                <xsl:call-template name="decimal2hex">
++                    <xsl:with-param name="dec-number" select="$decRedValue"/>
++                    <xsl:with-param name="last-value" select="'H'"/>
++                </xsl:call-template>
++            </xsl:variable>
++            <xsl:choose>
++                <xsl:when test="string-length($tmpHexRedValue) = 1">
++                    <xsl:value-of select="concat('0',$tmpHexRedValue)"/>
++                </xsl:when>
++                <xsl:otherwise>
++                    <xsl:value-of select="$tmpHexRedValue"/>
++                </xsl:otherwise>
++            </xsl:choose>
++        </xsl:variable>
++        <xsl:variable name="hexGreenValue">
++            <xsl:variable name="tmpHexGreenValue">
++                <xsl:call-template name="decimal2hex">
++                    <xsl:with-param name="dec-number" select="$decGreenValue"/>
++                    <xsl:with-param name="last-value" select="'H'"/>
++                </xsl:call-template>
++            </xsl:variable>
++            <xsl:choose>
++                <xsl:when test="string-length($tmpHexGreenValue) = 1">
++                    <xsl:value-of select="concat('0',$tmpHexGreenValue)"/>
++                </xsl:when>
++                <xsl:otherwise>
++                    <xsl:value-of select="$tmpHexGreenValue"/>
++                </xsl:otherwise>
++            </xsl:choose>
++        </xsl:variable>
++        <xsl:variable name="hexBlueValue">
++            <xsl:variable name="tmpHexBlueValue">
++                <xsl:call-template name="decimal2hex">
++                    <xsl:with-param name="dec-number" select="$decBlueValue"/>
++                    <xsl:with-param name="last-value" select="'H'"/>
++                </xsl:call-template>
++            </xsl:variable>
++            <xsl:choose>
++                <xsl:when test="string-length($tmpHexBlueValue) = 1">
++                    <xsl:value-of select="concat('0',$tmpHexBlueValue)"/>
++                </xsl:when>
++                <xsl:otherwise>
++                    <xsl:value-of select="$tmpHexBlueValue"/>
++                </xsl:otherwise>
++            </xsl:choose>
++        </xsl:variable>
++        <xsl:value-of select="concat('#',$hexRedValue,$hexGreenValue,$hexBlueValue)"/>
++    </xsl:template>
++    <xsl:template name="decimal2hex">
++        <!-- transforms a decimal number to a hex number,only for two-bit hex(less than 256 in decimal) currently -->
++        <xsl:param name="dec-number"/>
++        <xsl:param name="last-value"/>
++        <xsl:variable name="current-value">
++            <xsl:call-template name="decNumber2hex">
++                <xsl:with-param name="dec-value">
++                    <xsl:if test="$dec-number &gt; 15">
++                        <xsl:value-of select="floor($dec-number div 16)"/>
++                    </xsl:if>
++                    <xsl:if test="$dec-number &lt; 16">
++                        <xsl:value-of select="$dec-number"/>
++                    </xsl:if>
++                </xsl:with-param>
++            </xsl:call-template>
++        </xsl:variable>
++        <xsl:if test="$dec-number &gt; 15">
++            <xsl:call-template name="decimal2hex">
++                <xsl:with-param name="dec-number" select="$dec-number mod 16"/>
++                <xsl:with-param name="last-value" select="concat($last-value,$current-value)"/>
++            </xsl:call-template>
++        </xsl:if>
++        <xsl:if test="$dec-number &lt; 16">
++            <xsl:value-of select="substring-after(concat($last-value,$current-value),'H')"/>
++        </xsl:if>
++    </xsl:template>
++
++    <xsl:template name="decNumber2hex">
++        <!-- return a hex number for a decimal character -->
++        <xsl:param name="dec-value"/>
++        <xsl:choose>
++            <xsl:when test="$dec-value = 10">
++                <xsl:value-of select="'A'"/>
++            </xsl:when>
++            <xsl:when test="$dec-value = 11">
++                <xsl:value-of select="'B'"/>
++            </xsl:when>
++            <xsl:when test="$dec-value = 12">
++                <xsl:value-of select="'C'"/>
++            </xsl:when>
++            <xsl:when test="$dec-value = 13">
++                <xsl:value-of select="'D'"/>
++            </xsl:when>
++            <xsl:when test="$dec-value = 14">
++                <xsl:value-of select="'E'"/>
++            </xsl:when>
++            <xsl:when test="$dec-value = 15">
++                <xsl:value-of select="'F'"/>
++            </xsl:when>
++            <xsl:otherwise>
++                <xsl:value-of select="$dec-value"/>
++            </xsl:otherwise>
++        </xsl:choose>
++    </xsl:template>
++    <xsl:template name="GetTabColorIndex">
++        <xsl:param name="SheetColor"/>
++        <xsl:for-each select="key('config', 'TabColor')[not(.=preceding::config:config-item)]">
++        <xsl:sort select="." />
++            <xsl:variable name="tmpColor" select="."/>
++            <xsl:if test=". = $SheetColor" >
++                <xsl:value-of select="56 - position()"/>
++            </xsl:if>
++        </xsl:for-each>
++    </xsl:template>
+ 	<xsl:template match="office:body">
+ 		<!-- office:body table:table children are spreadsheets -->
+ 		<xsl:apply-templates />
+@@ -187,8 +352,11 @@
+ 	<!-- office:body table:table children are spreadsheets -->
+ 	<xsl:template match="office:spreadsheet/table:table">
+ 		<xsl:element name="ss:Worksheet">
+-			<xsl:attribute name="ss:Name">
++			<xsl:variable name="TableName">
+ 				<xsl:value-of select="@table:name" />
++			</xsl:variable>
++			<xsl:attribute name="ss:Name">
++				<xsl:value-of select="$TableName" />
+ 			</xsl:attribute>
+ 			<xsl:call-template name="table:table" />
+ 			<xsl:element name="x:WorksheetOptions">
+@@ -204,6 +372,16 @@
+ 				<xsl:if test="key('config', 'ShowZeroValues') = 'false'">
+ 						<xsl:element name="x:DoNotDisplayZeros" />
+ 				</xsl:if>
++                <xsl:if test="/*/office:settings/config:config-item-set/config:config-item-map-indexed/config:config-item-map-entry/config:config-item-map-named/config:config-item-map-entry[@config:name=$TableName]/config:config-item[@config:name='TabColor']">
++                    <xsl:element name="x:TabColorIndex">
++                        <xsl:variable name="TabColorIndex">
++                            <xsl:call-template name="GetTabColorIndex">
++                                <xsl:with-param name="SheetColor" select="/*/office:settings/config:config-item-set/config:config-item-map-indexed/config:config-item-map-entry/config:config-item-map-named/config:config-item-map-entry[@config:name=$TableName]/config:config-item[@config:name='TabColor']"/>
++                            </xsl:call-template>
++                        </xsl:variable>
++                        <xsl:value-of select="$TabColorIndex"/>
++                    </xsl:element>
++                </xsl:if>
+ 			</xsl:element>
+ 		</xsl:element>
+ 	</xsl:template>
+diff --git filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+index a1576db..6fcae4a 100644
+--- filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
++++ filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+@@ -385,6 +385,16 @@
+ 										</xsl:otherwise>
+ 									</xsl:choose>
+ 									<xsl:copy-of select="$sharedConfiguration"/>
++                                    <xsl:if test="x:WorksheetOptions/x:TabColorIndex">
++                                        <config:config-item config:name="TabColor" config:type="int">
++                                            <xsl:variable name="temp-value">
++                                                <xsl:call-template name="colorindex2decimal">
++                                                    <xsl:with-param name="colorindex" select="x:WorksheetOptions/x:TabColorIndex"/>
++                                                </xsl:call-template>
++                                            </xsl:variable>
++                                            <xsl:value-of select="$temp-value"/>
++                                        </config:config-item>
++                                    </xsl:if>
+ 								</config:config-item-map-entry>
+ 							</xsl:for-each>
+ 						</config:config-item-map-named>
+@@ -4641,6 +4651,211 @@
+ 		</xsl:variable>
+ 		<xsl:value-of select="concat('#',$R-value,$G-value,$B-value)"/>
+ 	</xsl:template>
++    <xsl:template name="colorindex2decimal">
++        <xsl:param name="colorindex"/>
++        <xsl:variable name="colorIndexLookup">
++            <xsl:value-of select="$colorindex - 8"/>
++        </xsl:variable>
++        <xsl:variable name="tempColorValue">
++            <xsl:choose>
++                <!-- Grab the color from the custom color index if it exists... -->
++                <xsl:when test="/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:Index=$colorIndexLookup">
++                    <xsl:value-of select="substring-after(normalize-space(/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:RGB[/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:Index=$colorIndexLookup]), '#')"/>
++                </xsl:when >
++                <xsl:otherwise>
++                    <xsl:choose>
++                        <xsl:when test="$colorindex=8">
++                            <xsl:value-of select="'000000'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=9">
++                            <xsl:value-of select="'FFFFFF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=10">
++                            <xsl:value-of select="'FF0000'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=11">
++                            <xsl:value-of select="'00FF00'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=12">
++                            <xsl:value-of select="'0000FF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=13">
++                            <xsl:value-of select="'FFFF00'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=14">
++                            <xsl:value-of select="'FF00FF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=15">
++                            <xsl:value-of select="'00FFFF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=16">
++                            <xsl:value-of select="'800000'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=17">
++                            <xsl:value-of select="'008000'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=18">
++                            <xsl:value-of select="'000080'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=19">
++                            <xsl:value-of select="'808000'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=20">
++                            <xsl:value-of select="'800080'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=21">
++                            <xsl:value-of select="'008080'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=22">
++                            <xsl:value-of select="'C0C0C0'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=23">
++                            <xsl:value-of select="'808080'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=24">
++                            <xsl:value-of select="'9999FF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=25">
++                            <xsl:value-of select="'993366'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=26">
++                            <xsl:value-of select="'FFFFCC'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=27">
++                            <xsl:value-of select="'CCFFFF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=28">
++                            <xsl:value-of select="'660066'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=29">
++                            <xsl:value-of select="'FF8080'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=30">
++                            <xsl:value-of select="'0066CC'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=31">
++                            <xsl:value-of select="'CCCCFF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=32">
++                            <xsl:value-of select="'000080'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=33">
++                            <xsl:value-of select="'FF00FF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=34">
++                            <xsl:value-of select="'FFFF00'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=35">
++                            <xsl:value-of select="'00FFFF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=36">
++                            <xsl:value-of select="'800080'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=37">
++                            <xsl:value-of select="'800000'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=38">
++                            <xsl:value-of select="'008080'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=39">
++                            <xsl:value-of select="'0000FF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=40">
++                            <xsl:value-of select="'00CCFF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=41">
++                            <xsl:value-of select="'CCFFFF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=42">
++                            <xsl:value-of select="'CCFFCC'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=43">
++                            <xsl:value-of select="'FFFF99'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=44">
++                            <xsl:value-of select="'99CCFF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=45">
++                            <xsl:value-of select="'FF99CC'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=46">
++                            <xsl:value-of select="'CC99FF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=47">
++                            <xsl:value-of select="'FFCC99'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=48">
++                            <xsl:value-of select="'3366FF'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=49">
++                            <xsl:value-of select="'33CCCC'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=50">
++                            <xsl:value-of select="'99CC00'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=51">
++                            <xsl:value-of select="'FFCC00'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=52">
++                            <xsl:value-of select="'FF9900'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=53">
++                            <xsl:value-of select="'FF6600'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=54">
++                            <xsl:value-of select="'666699'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=55">
++                            <xsl:value-of select="'969696'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=56">
++                            <xsl:value-of select="'003366'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=57">
++                            <xsl:value-of select="'339966'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=58">
++                            <xsl:value-of select="'003300'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=59">
++                            <xsl:value-of select="'333300'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=60">
++                            <xsl:value-of select="'993300'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=61">
++                            <xsl:value-of select="'993366'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=62">
++                            <xsl:value-of select="'333399'"/>
++                        </xsl:when>
++                        <xsl:when test="$colorindex=63">
++                            <xsl:value-of select="'333333'"/>
++                        </xsl:when>
++                        <xsl:otherwise>
++                            <xsl:value-of select="'NOTFOUND'"/>
++                        </xsl:otherwise>
++                    </xsl:choose>
++                </xsl:otherwise>
++            </xsl:choose>
++        </xsl:variable>
++        <xsl:variable name="tempColorDecimal">
++            <xsl:choose>
++                    <xsl:when test="not($tempColorValue = 'NOTFOUND')">
++                        <xsl:call-template name="hex2decimal">
++                            <xsl:with-param name="hex-number" select="$tempColorValue"/>
++                            <xsl:with-param name="index" select="1"/>
++                            <xsl:with-param name="str-length" select="6"/>
++                            <xsl:with-param name="last-value" select="0"/>
++                        </xsl:call-template>
++                    </xsl:when>
++                    <xsl:otherwise>
++                        <xsl:value-of select="4294967295"/>
++                    </xsl:otherwise>
++            </xsl:choose>
++        </xsl:variable>
++        <xsl:value-of select="$tempColorDecimal"/>
++    </xsl:template>
+ 	<xsl:template name="hex2decimal">
+ 		<!-- transforms a hex number to a decimal number.parses the string from left to right -->
+ 		<xsl:param name="hex-number"/>
diff --git a/applied_patches/0014-sc-dataform-sc.diff b/applied_patches/0014-sc-dataform-sc.diff
deleted file mode 100644
index b904b1c1f..000000000
--- a/applied_patches/0014-sc-dataform-sc.diff
+++ /dev/null
@@ -1,1389 +0,0 @@
---- sc/inc/document.hxx
-+++ sc/inc/document.hxx
-@@ -880,7 +880,7 @@ public:
- 							   SCROW nStartRow, SCSIZE nSize,
-                                ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL,
-                                const ScMarkData* pTabMark = NULL );
--	void			DeleteRow( const ScRange& rRange,
-+	SC_DLLPUBLIC void	DeleteRow( const ScRange& rRange,
- 							   ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
- 	BOOL			InsertCol( SCROW nStartRow, SCTAB nStartTab,
- 							   SCROW nEndRow,   SCTAB nEndTab,
-diff --git sc/inc/sc.hrc sc/inc/sc.hrc
-index 3bcc4f3..7c62d8d 100644
---- sc/inc/sc.hrc
-+++ sc/inc/sc.hrc
-@@ -1647,6 +1647,11 @@
- 
- #define SC_OOO_BUILD_START          (SC_DIALOGS_END)
- 
-+// Data Form
-+#define SID_DATAFORM_NEW            (SC_OOO_BUILD_START + 1) // message
-+#define SID_DATA_FORM               (SC_OOO_BUILD_START + 2) // menu (in Data menu)
-+#define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 3) // dialog
-+
- #endif
- 
- 
-diff --git sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx
-index 3403c2d..dfdf0ba 100644
---- sc/inc/scabstdlg.hxx
-+++ sc/inc/scabstdlg.hxx
-@@ -42,6 +42,8 @@
- #include "global.hxx"
- #include "pivot.hxx"
- 
-+#include <tabvwsh.hxx>
-+
- class ScAsciiOptions;
- class ScAutoFormat;
- class ScAutoFormatData;
-@@ -111,6 +113,12 @@ public:
- 	virtual DelCellCmd GetDelCellCmd() const = 0;
- };
- 
-+//for dataform
-+class AbstractScDataFormDlg : public VclAbstractDialog  //add for ScDeleteCellDlg
-+{
-+
-+};
-+
- class AbstractScDeleteContentsDlg: public VclAbstractDialog  //add for ScDeleteContentsDlg
- {
- public:
-@@ -324,6 +332,9 @@ public:
- 
- 	virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, BOOL bDisallowCellMove = FALSE ) = 0 ; //add for ScDeleteCellDlg
- 
-+	//for dataform
-+	virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell*      pTabViewShell ) = 0 ; //add for ScDataFormDlg
-+
- 	virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
- 																 USHORT  nCheckDefaults = 0 ) = 0;
- 	virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window*		pParent, //add for ScFillSeriesDlg
-diff --git sc/sdi/cellsh.sdi sc/sdi/cellsh.sdi
-index 5e99223..baec475 100644
---- sc/sdi/cellsh.sdi
-+++ sc/sdi/cellsh.sdi
-@@ -60,6 +60,7 @@ interface CellSelection
- 	SID_SBA_BRW_INSERT		[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
- 	SID_SELECT_DB			[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
- 	SID_SORT				[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
-+	SID_DATA_FORM			[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
- 	FID_FILTER_OK			[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
- 	SID_AUTO_FILTER			[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
- 	SID_AUTOFILTER_HIDE		[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
-diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
-index 2ff50a0..ecc0921 100644
---- sc/sdi/scalc.sdi
-+++ sc/sdi/scalc.sdi
-@@ -1601,6 +1601,31 @@ SfxVoidItem DataSort SID_SORT
- ]
- 
- //--------------------------------------------------------------------------
-+SfxVoidItem DataForm SID_DATA_FORM
-+()
-+[
-+	/* flags: */
-+	AutoUpdate = FALSE,
-+	Cachable = Cachable,
-+	FastCall = FALSE,
-+	HasCoreId = FALSE,
-+	HasDialog = TRUE,
-+	ReadOnlyDoc = TRUE,
-+	Toggle = FALSE,
-+	Container = FALSE,
-+	RecordAbsolute = FALSE,
-+	RecordPerSet;
-+	Synchron;
-+
-+	/* config: */
-+	AccelConfig = TRUE,
-+	MenuConfig = TRUE,
-+	StatusBarConfig = FALSE,
-+	ToolBoxConfig = FALSE,
-+	GroupId = GID_DATA;
-+]
-+
-+//--------------------------------------------------------------------------
- SfxVoidItem DataSubTotals SID_SUBTOTALS
- ()
- [
-diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx
-index aeb4786..de9b284 100644
---- sc/source/ui/attrdlg/scdlgfact.cxx
-+++ sc/source/ui/attrdlg/scdlgfact.cxx
-@@ -76,6 +76,8 @@
- #include "tpstat.hxx" //add for ScDocStatPage
- #include "tpusrlst.hxx" //add for ScTpUserLists
- #include "tpview.hxx" //add for ScTpContentOptions
-+//for dataform
-+#include "datafdlg.hxx" //add for ScDataFormDlg
- 
- // ause
- #include "editutil.hxx"
-@@ -88,6 +90,8 @@ IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl); //add for ScDataPilotDat
- IMPL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl); //add for ScDataPilotSourceTypeDlg
- IMPL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl); //add for ScDataPilotServiceDlg
- IMPL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl); //add for ScDeleteCellDlg
-+//for dataform
-+IMPL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl); //add for ScDataFormDlg
- IMPL_ABSTDLG_BASE(AbstractScDeleteContentsDlg_Impl); //add for ScDeleteContentsDlg
- IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl); //add for ScFillSeriesDlg
- IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl); //add for ScGroupDlg
-@@ -761,6 +765,26 @@ AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( Wi
- 
- //add for ScDeleteCellDlg  end
- 
-+//add for ScDataFormDlg begin
-+AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell*	pTabViewShell )
-+{
-+	ScDataFormDlg * pDlg=NULL;
-+	switch ( nId )
-+	{
-+		case RID_SCDLG_DATAFORM :
-+			pDlg = new ScDataFormDlg( pParent, pTabViewShell);
-+			break;
-+		default:
-+			break;
-+	}
-+
-+	if ( pDlg )
-+		return new AbstractScDataFormDlg_Impl( pDlg );
-+	return 0;
-+}
-+
-+//add for ScDataFormDlg  end
-+
- //add for ScDeleteContentsDlg begin
- AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
- 																 USHORT  nCheckDefaults )
-diff --git sc/source/ui/attrdlg/scdlgfact.hxx sc/source/ui/attrdlg/scdlgfact.hxx
-index 463898c..526a1ec 100644
---- sc/source/ui/attrdlg/scdlgfact.hxx
-+++ sc/source/ui/attrdlg/scdlgfact.hxx
-@@ -40,6 +40,7 @@ class ScDataPilotDatabaseDlg;
- class ScDataPilotSourceTypeDlg;
- class ScDataPilotServiceDlg;
- class ScDeleteCellDlg;
-+class ScDataFormDlg;
- class ScDeleteContentsDlg;
- class ScFillSeriesDlg;
- class ScGroupDlg;
-@@ -163,6 +164,12 @@ class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg  //add for S
- 	virtual DelCellCmd GetDelCellCmd() const;
- };
- 
-+//for dataform
-+class AbstractScDataFormDlg_Impl : public AbstractScDataFormDlg  //add for ScDataFormDlg
-+{
-+	DECL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl,ScDataFormDlg);
-+};
-+
- class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg  //add for ScDeleteContentsDlg
- {
- 	DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg)
-@@ -391,6 +398,9 @@ public:
- 	virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId,
- 															BOOL bDisallowCellMove = FALSE ); //add for ScDeleteCellDlg
- 
-+	//for dataform
-+	virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell*      pTabViewShell); //add for ScDeleteCellDlg
-+
- 	virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
- 																 USHORT  nCheckDefaults = 0 );
- 
-diff --git sc/source/ui/inc/datafdlg.hrc sc/source/ui/inc/datafdlg.hrc
-new file mode 100644
-index 0000000..8fa8999
---- /dev/null
-+++ sc/source/ui/inc/datafdlg.hrc
-@@ -0,0 +1,49 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: datafdlg.hrc,v $
-+ *
-+ *  $Revision: 1.00 $
-+ *
-+ *  last change: $Author: rt $ $Date: 2005/09/08 21:37:12 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "sc.hrc"	// -> RID_SCDLG_DATAFORM
-+
-+//dataform
-+#define BTN_DATAFORM_NEW          1001
-+#define BTN_DATAFORM_DELETE       1002
-+#define BTN_DATAFORM_RESTORE      1003
-+#define BTN_DATAFORM_LAST         1004
-+#define BTN_DATAFORM_NEXT         1005
-+#define BTN_DATAFORM_CLOSE        1007
-+#define WND_DATAFORM_SCROLLBAR    1008
-+#define LAB_DATAFORM_RECORDNO     1009
-+
-+#define FT_DATAFORM_FIXEDTEXT1    2001
-+#define ED_DATAFORM_EDIT1         2002
-\ No newline at end of file
-diff --git sc/source/ui/inc/datafdlg.hxx sc/source/ui/inc/datafdlg.hxx
-new file mode 100644
-index 0000000..3e6d8e3
---- /dev/null
-+++ sc/source/ui/inc/datafdlg.hxx
-@@ -0,0 +1,121 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: datafdlg.hxx,v $
-+ *
-+ *  $Revision: 1.00 $
-+ *
-+ *  last change: $Author: rt $ $Date: 2005/09/08 21:20:35 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef SC_DATAFDLG_HXX
-+#define SC_DATAFDLG_HXX
-+
-+
-+#ifndef _SV_DIALOG_HXX //autogen
-+#include <vcl/dialog.hxx>
-+#endif
-+
-+#ifndef _SV_BUTTON_HXX //autogen
-+#include <vcl/imagebtn.hxx>
-+#endif
-+
-+#ifndef _SV_FIXED_HXX //autogen
-+#include <vcl/fixed.hxx>
-+#endif
-+
-+
-+#include "global.hxx"
-+
-+#include <tabvwsh.hxx>
-+#include <sfx2/bindings.hxx>
-+#include <sfx2/dispatch.hxx>
-+
-+#define MAX_DATAFORM_COLS   256
-+#define MAX_DATAFORM_ROWS   32000
-+#define CTRL_HEIGHT         22
-+#define FIXED_WIDTH         60
-+#define EDIT_WIDTH          140 
-+#define FIXED_LEFT          12
-+#define EDIT_LEFT           78
-+#define LINE_HEIGHT         30
-+
-+//zhangyun
-+class ScDataFormDlg : public ModalDialog
-+{
-+private:
-+
-+    PushButton      aBtnNew;
-+    PushButton      aBtnDelete;
-+    PushButton      aBtnRestore;
-+    PushButton      aBtnLast;
-+    PushButton      aBtnNext;
-+    PushButton      aBtnClose;
-+    ScrollBar       aSlider;
-+    FixedText       aFixedText;
-+    //FixedText       aFixedText1;
-+    //Edit            aEdit1;
-+    
-+    ScTabViewShell* pTabViewShell;
-+    ScDocument*     pDoc;
-+    sal_uInt16      aColLength;
-+    SCROW           aCurrentRow;
-+    SCCOL           nStartCol;
-+    SCCOL           nEndCol;
-+    SCROW           nStartRow;
-+    SCROW           nEndRow;
-+    SCTAB           nTab;
-+    BOOL            bNoSelection;
-+    
-+    FixedText** pFixedTexts;
-+    Edit** pEdits;
-+
-+public:
-+    ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShell);
-+    ~ScDataFormDlg();
-+    
-+    void FillCtrls(SCROW nCurrentRow);
-+private:
-+
-+    void SetButtonState();
-+
-+    // Handler:
-+    DECL_LINK( Impl_NewHdl,     PushButton*    );
-+    DECL_LINK( Impl_LastHdl,    PushButton*    );
-+    DECL_LINK( Impl_NextHdl,    PushButton*    );
-+    
-+    DECL_LINK( Impl_RestoreHdl, PushButton*    );
-+    DECL_LINK( Impl_DeleteHdl,  PushButton*    );
-+    DECL_LINK( Impl_CloseHdl,   PushButton*    );
-+    
-+    DECL_LINK( Impl_ScrollHdl,  ScrollBar*    );
-+    DECL_LINK( Impl_DataModifyHdl,  Edit*    );
-+};
-+#endif // SC_DATAFDLG_HXX
-+
-+
-diff --git sc/source/ui/inc/undodat.hxx sc/source/ui/inc/undodat.hxx
-index 3b65ba1..3487442 100644
---- sc/source/ui/inc/undodat.hxx
-+++ sc/source/ui/inc/undodat.hxx
-@@ -530,7 +530,43 @@ private:
- 	void				Init();
- };
- 
-+// amelia
-+class ScUndoDataForm: public ScBlockUndo
-+{
-+public:
-+					TYPEINFO();
-+					ScUndoDataForm( ScDocShell* pNewDocShell,
-+								SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
-+								SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-+								const ScMarkData& rMark,
-+								ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
-+								USHORT nNewFlags,
-+								ScRefUndoData* pRefData, void* pFill1, void* pFill2, void* pFill3,
-+								BOOL bRedoIsFilled = TRUE
-+								 );
-+	virtual		~ScUndoDataForm();
-+
-+	virtual	void	Undo();
-+	virtual	void	Redo();
-+	virtual void	Repeat(SfxRepeatTarget& rTarget);
-+	virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
-+
-+	virtual String	GetComment() const;
- 
-+private:
-+	ScMarkData		aMarkData;
-+	ScDocument*		pUndoDoc;
-+	ScDocument*		pRedoDoc;
-+	USHORT			nFlags;
-+	ScRefUndoData*		pRefUndoData;
-+	ScRefUndoData*		pRefRedoData;
-+	ULONG			nStartChangeAction;
-+	ULONG			nEndChangeAction;
-+	BOOL			bRedoFilled;
-+
-+	void			DoChange( const BOOL bUndo );
-+	void			SetChangeTrack();
-+};
- 
- 
- #endif
-diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
-index acaea7e..0c1fa9e 100644
---- sc/source/ui/inc/viewfunc.hxx
-+++ sc/source/ui/inc/viewfunc.hxx
-@@ -328,6 +328,13 @@ public:
- 	void			ForgetFormatArea()		{ bFormatValid = FALSE; }
- 	BOOL			SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL );
- 
-+        // Amelia Wang
-+        SC_DLLPUBLIC void                   DataFormPutData( SCROW nCurrentRow ,
-+                                                             SCROW nStartRow , SCCOL nStartCol ,
-+                                                             SCROW nEndRow , SCCOL nEndCol ,
-+                                                             Edit** pEdits ,
-+                                                             sal_uInt16 aColLength );
-+
- 												// interne Hilfsfunktionen
- protected:
- 	void			UpdateLineAttrs( SvxBorderLine&		  rLine,
-diff --git sc/source/ui/miscdlgs/datafdlg.cxx sc/source/ui/miscdlgs/datafdlg.cxx
-new file mode 100644
-index 0000000..2249c57
---- /dev/null
-+++ sc/source/ui/miscdlgs/datafdlg.cxx
-@@ -0,0 +1,422 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: datafdlg.cxx,v $
-+ *
-+ *  $Revision: 1.00 $
-+ *
-+ *  last change: $Author: kz $ $Date: 2006/07/21 14:04:33 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_sc.hxx"
-+
-+#undef SC_DLLIMPLEMENTATION
-+
-+//------------------------------------------------------------------
-+
-+#include "datafdlg.hxx"
-+#include "scresid.hxx"
-+#include "datafdlg.hrc"
-+#include "viewdata.hxx"
-+//#include "document.hxx"
-+#include "docsh.hxx"
-+#include "refundo.hxx"
-+#include "undodat.hxx"
-+
-+#define HDL(hdl)            LINK( this, ScDataFormDlg, hdl )
-+
-+//zhangyun
-+ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell*  pTabViewShellOri) :
-+    ModalDialog     ( pParent, ScResId( RID_SCDLG_DATAFORM ) ),
-+    //
-+    aBtnNew          ( this, ScResId( BTN_DATAFORM_NEW ) ),
-+    aBtnDelete          ( this, ScResId( BTN_DATAFORM_DELETE ) ),
-+    aBtnRestore          ( this, ScResId( BTN_DATAFORM_RESTORE ) ),
-+    aBtnLast          ( this, ScResId( BTN_DATAFORM_LAST ) ),
-+    aBtnNext          ( this, ScResId( BTN_DATAFORM_NEXT ) ),
-+    aBtnClose          ( this, ScResId( BTN_DATAFORM_CLOSE ) ),
-+    aSlider         ( this, ScResId( WND_DATAFORM_SCROLLBAR ) ),
-+    aFixedText          ( this, ScResId( LAB_DATAFORM_RECORDNO ) )
-+{
-+    pTabViewShell = pTabViewShellOri;
-+    FreeResource();
-+    //read header form current document, and add new controls
-+    DBG_ASSERT( pTabViewShell, "pTabViewShell is NULL! :-/" );
-+    ScViewData* pViewData = pTabViewShell->GetViewData();
-+    
-+    pDoc = pViewData->GetDocument();
-+    if (pDoc)
-+    {
-+        ScRange aRange;
-+        pViewData->GetSimpleArea( aRange );
-+        ScAddress aStart = aRange.aStart;
-+        ScAddress aEnd = aRange.aEnd;
-+        
-+        nStartCol = aStart.Col();
-+        nEndCol = aEnd.Col();
-+        nStartRow   = aStart.Row();
-+        nEndRow = aEnd.Row();
-+        
-+        nTab = pViewData->GetTabNo();
-+        //if there is no selection
-+        if ((nStartCol == nEndCol) && (nStartRow == nEndRow))
-+            bNoSelection = TRUE;
-+        
-+        if (bNoSelection)
-+        {
-+            //find last not blank cell in row
-+            for (int i=1;i<=MAX_DATAFORM_COLS;i++)
-+            {
-+                String  aColName;
-+                nEndCol++;
-+                pDoc->GetString( nEndCol, nStartRow, nTab, aColName );
-+                int nColWidth = pDoc->GetColWidth( nEndCol, nTab );
-+                if ( aColName.Len() == 0 && nColWidth)
-+                {
-+                    nEndCol--;
-+                    break;
-+                }
-+            }
-+            
-+            //find first not blank cell in row
-+            for (int i=1;i<=MAX_DATAFORM_COLS;i++)
-+            {
-+                String  aColName;
-+                if (nStartCol <= 0)
-+                    break;
-+                nStartCol--;
-+
-+                pDoc->GetString( nStartCol, nStartRow, nTab, aColName );
-+                int nColWidth = pDoc->GetColWidth( nEndCol, nTab );
-+                if ( aColName.Len() == 0 && nColWidth)
-+                {
-+                    nStartCol++;
-+                    break;
-+                }
-+            }
-+            
-+            //skip leading hide column
-+            for (int i=1;i<=MAX_DATAFORM_COLS;i++)
-+            {
-+                String  aColName;
-+                int nColWidth = pDoc->GetColWidth( nStartCol, nTab );
-+                if (nColWidth)
-+                    break;
-+                nStartCol++;
-+            }
-+
-+            if (nEndCol < nStartCol)
-+                nEndCol = nStartCol;
-+                
-+            //find last not blank cell in row
-+            for (int i=1;i<=MAX_DATAFORM_ROWS;i++)
-+            {
-+                String  aColName;
-+                nEndRow++;
-+                pDoc->GetString( nStartCol, nEndRow, nTab, aColName );
-+                if ( aColName.Len() == 0 )
-+                {
-+                    nEndRow--;
-+                    break;
-+                }
-+            }
-+            
-+            //find first not blank cell in row
-+            for (int i=1;i<=MAX_DATAFORM_ROWS;i++)
-+            {
-+                String  aColName;
-+                if (nStartRow <= 0)
-+                    break;
-+                nStartRow--;
-+
-+                pDoc->GetString( nStartCol, nStartRow, nTab, aColName );
-+                if ( aColName.Len() == 0 )
-+                {
-+                    nStartRow++;
-+                    break;
-+                }
-+            }
-+
-+            if (nEndRow < nStartRow)
-+                nEndRow = nStartRow;
-+        }
-+        
-+        aCurrentRow = nStartRow + 1;
-+        
-+        String  aFieldName;
-+
-+        int nTop = 12;
-+
-+        Size    nFixedSize(FIXED_WIDTH, CTRL_HEIGHT );
-+        Size    nEditSize(EDIT_WIDTH, CTRL_HEIGHT );
-+        
-+        //pFtArray = new FixedText(this);
-+        aColLength = nEndCol - nStartCol + 1;
-+        
-+        //new the controls
-+        pFixedTexts = new FixedText*[aColLength];
-+        pEdits = new Edit*[aColLength];
-+        
-+        for(sal_uInt16 nIndex = 0; nIndex < aColLength; nIndex++)
-+        {
-+            pDoc->GetString( nIndex + nStartCol, nStartRow, nTab, aFieldName );
-+            int nColWidth = pDoc->GetColWidth( nIndex + nStartCol, nTab );
-+            if (nColWidth)
-+            {
-+                pFixedTexts[nIndex] = new FixedText(this);
-+                pEdits[nIndex] = new Edit(this, WB_BORDER);
-+        
-+                pFixedTexts[nIndex]->SetSizePixel(nFixedSize);
-+                pEdits[nIndex]->SetSizePixel(nEditSize);
-+                pFixedTexts[nIndex]->SetPosPixel(Point(FIXED_LEFT, nTop));
-+                pEdits[nIndex]->SetPosPixel(Point(EDIT_LEFT, nTop));
-+                //pFixedTexts[nIndex]->SetText(String::CreateFromAscii("W4W-Filter Nr. "));
-+                pFixedTexts[nIndex]->SetText(aFieldName);
-+                pFixedTexts[nIndex]->Show();
-+                pEdits[nIndex]->Show();
-+                
-+                nTop += LINE_HEIGHT;
-+            }
-+            else
-+            {
-+                pFixedTexts[nIndex] = NULL;
-+                pEdits[nIndex] = NULL;
-+            }
-+        pEdits[nIndex]->SetModifyHdl( HDL(Impl_DataModifyHdl) );
-+        }
-+        
-+        Size nDialogSize = this->GetSizePixel();
-+        if (nTop > nDialogSize.Height())
-+        {
-+            nDialogSize.setHeight(nTop);
-+            this->SetSizePixel(nDialogSize);
-+        }
-+        Size nScrollSize = aSlider.GetSizePixel();
-+        nScrollSize.setHeight(nDialogSize.Height()-20);
-+        aSlider.SetSizePixel(nScrollSize);
-+    }
-+    
-+    FillCtrls(aCurrentRow);
-+    
-+    aSlider.SetPageSize( 10 );
-+    aSlider.SetVisibleSize( 1 );
-+    aSlider.SetLineSize( 1 );
-+    aSlider.SetRange( Range( 0, nEndRow - nStartRow + 1) );
-+    aSlider.Show();
-+    
-+    aBtnNew.SetClickHdl     ( HDL(Impl_NewHdl)    );
-+    aBtnLast.SetClickHdl    ( HDL(Impl_LastHdl)    );
-+    aBtnNext.SetClickHdl    ( HDL(Impl_NextHdl)    );
-+    
-+    aBtnRestore.SetClickHdl     ( HDL(Impl_RestoreHdl)    );
-+    aBtnDelete.SetClickHdl  ( HDL(Impl_DeleteHdl)    );
-+    aBtnClose.SetClickHdl   ( HDL(Impl_CloseHdl)    );
-+    
-+    aSlider.SetEndScrollHdl( HDL( Impl_ScrollHdl ) );
-+
-+    SetButtonState();
-+
-+    //end
-+    //FreeResource();
-+}
-+
-+ScDataFormDlg::~ScDataFormDlg()
-+{
-+    for(sal_uInt16 i = 0; i < aColLength; i++)
-+    {
-+        if (pEdits[i])
-+            delete pEdits[i];
-+        if (pFixedTexts[i])
-+            delete pFixedTexts[i];
-+    }
-+    if (pEdits)
-+        delete pEdits;
-+    if (pFixedTexts)
-+        delete pFixedTexts;
-+}
-+
-+void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
-+{
-+    //ScViewData*   pViewData = pTabViewShell->GetViewData();
-+    
-+    //pDoc = pViewData->GetDocument();
-+    String  aFieldName;
-+    int nRecordNum = nEndRow - nStartRow;
-+    for(sal_uInt16 i = 0; i < aColLength; i++)
-+    {
-+        if (pEdits[i])
-+        {
-+            if (aCurrentRow<=nEndRow)
-+            {
-+                pDoc->GetString( i + nStartCol, aCurrentRow, nTab, aFieldName );
-+                pEdits[i]->SetText(aFieldName);
-+            }
-+            else
-+                pEdits[i]->SetText(String());
-+        }
-+    }
-+    char sRecordStr[256];
-+    if (aCurrentRow<=nEndRow)
-+        aFixedText.SetText(String::CreateFromAscii(sRecordStr));
-+    else
-+        aFixedText.SetText(String::CreateFromAscii("New Record"));
-+        
-+    aSlider.SetThumbPos(aCurrentRow-nStartRow-1);
-+}
-+
-+IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit*, pEdit)
-+{
-+    if ( pEdit->IsModified() )
-+        aBtnRestore.Enable( TRUE );
-+    return 0;
-+}
-+
-+IMPL_LINK( ScDataFormDlg, Impl_NewHdl, PushButton*, EMPTYARG )
-+{
-+    ScViewData* pViewData = pTabViewShell->GetViewData();
-+    ScDocShell* pDocSh = pViewData->GetDocShell();
-+    if ( pDoc )
-+    {
-+        sal_Bool bHasData = sal_False;
-+        for(sal_uInt16 i = 0; i < aColLength; i++)
-+            if (pEdits[i])
-+                if ( pEdits[i]->GetText().Len() != 0 )
-+                {
-+                    bHasData = sal_True;
-+                    break;
-+                }
-+
-+        if ( bHasData )
-+        {
-+            pTabViewShell->DataFormPutData( aCurrentRow , nStartRow , nStartCol , nEndRow , nEndCol , pEdits , aColLength );
-+            aCurrentRow++;
-+            if (aCurrentRow >= nEndRow + 2)
-+            {
-+                    nEndRow ++ ;
-+                    aSlider.SetRange( Range( 0, nEndRow - nStartRow + 1) );
-+            }
-+            SetButtonState();
-+            FillCtrls(aCurrentRow);
-+            pDocSh->SetDocumentModified();
-+            pDocSh->PostPaintGridAll();
-+            }
-+    }
-+    return 0;
-+}
-+
-+IMPL_LINK( ScDataFormDlg, Impl_LastHdl, PushButton*, EMPTYARG )
-+{   
-+    if (pDoc)
-+    {
-+        if ( aCurrentRow > nStartRow +1 )
-+            aCurrentRow--;
-+
-+        SetButtonState();
-+        FillCtrls(aCurrentRow);
-+    }
-+    return 0;
-+}
-+
-+IMPL_LINK( ScDataFormDlg, Impl_NextHdl, PushButton*, EMPTYARG )
-+{   
-+    if (pDoc)
-+    {
-+        if ( aCurrentRow <= nEndRow)
-+            aCurrentRow++;
-+
-+        SetButtonState();
-+        FillCtrls(aCurrentRow);
-+    }
-+    return 0;
-+}
-+
-+IMPL_LINK( ScDataFormDlg, Impl_RestoreHdl, PushButton*, EMPTYARG )
-+{   
-+    if (pDoc)
-+    {
-+        FillCtrls(aCurrentRow);
-+    }
-+    return 0;
-+}
-+
-+IMPL_LINK( ScDataFormDlg, Impl_DeleteHdl, PushButton*, EMPTYARG )
-+{   
-+    ScViewData* pViewData = pTabViewShell->GetViewData();
-+    ScDocShell* pDocSh = pViewData->GetDocShell();
-+    if (pDoc)
-+    {
-+        ScRange aRange(nStartCol, aCurrentRow, nTab, nEndCol, aCurrentRow, nTab);
-+        pDoc->DeleteRow(aRange);
-+        nEndRow--;
-+        
-+        SetButtonState();
-+        pDocSh->GetUndoManager()->Clear();
-+
-+        FillCtrls(aCurrentRow);
-+        pDocSh->SetDocumentModified();
-+        pDocSh->PostPaintGridAll();
-+    }
-+    return 0;
-+}
-+
-+IMPL_LINK( ScDataFormDlg, Impl_CloseHdl, PushButton*, EMPTYARG )
-+{   
-+    EndDialog( );
-+    return 0;
-+}
-+
-+IMPL_LINK( ScDataFormDlg, Impl_ScrollHdl, ScrollBar*, EMPTYARG )
-+{   
-+    long nOffset = aSlider.GetThumbPos();
-+    aCurrentRow = nStartRow + nOffset + 1;
-+    SetButtonState();
-+    FillCtrls(aCurrentRow);
-+    return 0;
-+}
-+
-+void ScDataFormDlg::SetButtonState()
-+{
-+    if ( aCurrentRow > nEndRow )
-+    {
-+        aBtnDelete.Enable( FALSE );
-+        aBtnLast.Enable( TRUE );
-+        aBtnNext.Enable( FALSE );
-+    }
-+    else
-+    {
-+        aBtnDelete.Enable( TRUE );
-+        aBtnNext.Enable( TRUE );
-+    }
-+    if ( 1 == aCurrentRow )
-+        aBtnLast.Enable( FALSE );
-+
-+    aBtnRestore.Enable( FALSE );
-+    if ( pEdits )
-+        pEdits[0]->GrabFocus();
-+}
-diff --git sc/source/ui/miscdlgs/makefile.mk sc/source/ui/miscdlgs/makefile.mk
-index 90f3afe..3569ccf 100644
---- sc/source/ui/miscdlgs/makefile.mk
-+++ sc/source/ui/miscdlgs/makefile.mk
-@@ -45,6 +45,7 @@ LIBTARGET=no
- # --- Files --------------------------------------------------------
- 
- SLOFILES =  \
-+	$(SLO)$/datafdlg.obj		\
- 	$(SLO)$/delcldlg.obj		\
- 	$(SLO)$/inscldlg.obj		\
- 	$(SLO)$/delcodlg.obj		\
-diff --git sc/source/ui/src/datafdlg.src sc/source/ui/src/datafdlg.src
-new file mode 100644
-index 0000000..535ec66
---- /dev/null
-+++ sc/source/ui/src/datafdlg.src
-@@ -0,0 +1,108 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: datafdlg.src,v $
-+ *
-+ *  $Revision: 1.00 $
-+ *
-+ *  last change: $Author: hr $ $Date: 2005/09/23 15:07:30 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "datafdlg.hrc"
-+
-+//zhangyun, dataform
-+ModalDialog RID_SCDLG_DATAFORM
-+{
-+    OutputSize = TRUE ;
-+    SVLook = TRUE ;
-+    Size = MAP_APPFONT ( 191 , 180 ) ;
-+    Text [ en-US ] = "Data Form" ;
-+    Moveable = TRUE ;
-+    Closeable = TRUE ;
-+    FixedText LAB_DATAFORM_RECORDNO
-+    {
-+        Pos = MAP_APPFONT ( 136 , 6 ) ;
-+        Size = MAP_APPFONT ( 50 , 12 ) ;
-+        Text [ en-US ] = "/" ;
-+    };
-+    PushButton BTN_DATAFORM_NEW
-+    {
-+        Pos = MAP_APPFONT ( 135 , 23 ) ;
-+        Size = MAP_APPFONT ( 50 , 14 ) ;
-+        TabStop = TRUE ;
-+        DefButton = TRUE ;
-+        Text [ en-US ] = "New" ;
-+    };
-+    PushButton BTN_DATAFORM_DELETE
-+    {
-+        Pos = MAP_APPFONT ( 135 , 40 ) ;
-+        Size = MAP_APPFONT ( 50 , 14 ) ;
-+        TabStop = TRUE ;
-+        Text [ en-US ] = "Delete" ;
-+    };
-+    PushButton BTN_DATAFORM_RESTORE
-+    {
-+        Pos = MAP_APPFONT ( 135 , 57 ) ;
-+        Size = MAP_APPFONT ( 50 , 14 ) ;
-+        TabStop = TRUE ;
-+        Text [ en-US ] = "Restore" ;
-+    };
-+    PushButton BTN_DATAFORM_LAST
-+    {
-+        Pos = MAP_APPFONT ( 135 , 82 ) ;
-+        Size = MAP_APPFONT ( 50 , 14 ) ;
-+        TabStop = TRUE ;
-+        Text [ en-US ] = "Last Record" ;
-+    };
-+    PushButton BTN_DATAFORM_NEXT
-+    {
-+        Pos = MAP_APPFONT ( 135 , 99 ) ;
-+        Size = MAP_APPFONT ( 50 , 14 ) ;
-+        TabStop = TRUE ;
-+        Text [ en-US ] = "Next Record" ;
-+    };
-+    PushButton BTN_DATAFORM_CLOSE
-+    {
-+        Pos = MAP_APPFONT ( 135 , 116 ) ;
-+        Size = MAP_APPFONT ( 50 , 14 ) ;
-+        TabStop = TRUE ;
-+        Text [ en-US ] = "Close" ;
-+    };
-+    ScrollBar WND_DATAFORM_SCROLLBAR
-+    {
-+        Pos = MAP_APPFONT ( 124 , 6 ) ;
-+        Size = MAP_APPFONT ( 8 , 135 ) ;
-+        HScroll = FALSE ;
-+        TabStop = FALSE ;
-+    };
-+};
-+//end
-+
-+
-+
-+
-diff --git sc/source/ui/src/makefile.mk sc/source/ui/src/makefile.mk
-index af0e906..8f33ac9 100644
---- sc/source/ui/src/makefile.mk
-+++ sc/source/ui/src/makefile.mk
-@@ -57,6 +57,7 @@ SRC1FILES = \
- 	dbnamdlg.src \
- 	subtdlg.src  \
- 	miscdlgs.src \
-+	datafdlg.src \
- 	autofmt.src  \
- 	solvrdlg.src \
-     optsolver.src \
-diff --git sc/source/ui/undo/undodat.cxx sc/source/ui/undo/undodat.cxx
-index 4ea4a0a..9aea0eb 100644
---- sc/source/ui/undo/undodat.cxx
-+++ sc/source/ui/undo/undodat.cxx
-@@ -58,6 +58,8 @@
- #include "dpobject.hxx"
- #include "attrib.hxx"
- #include "sc.hrc"
-+#include "chgtrack.hxx"  // Amelia Wang
-+#include "refundo.hxx"  // Amelia Wang
- 
- // -----------------------------------------------------------------------
- 
-@@ -74,6 +74,7 @@ TYPEINIT1(ScUndoRepeatDB,           ScSi
- TYPEINIT1(ScUndoDataPilot,          ScSimpleUndo);
- TYPEINIT1(ScUndoConsolidate,        ScSimpleUndo);
- TYPEINIT1(ScUndoChartData,          ScSimpleUndo);
-+TYPEINIT1(ScUndoDataForm,           SfxUndoAction);    // amelia
- 
- // -----------------------------------------------------------------------
- 
-@@ -2182,8 +2185,210 @@ BOOL __EXPORT ScUndoChartData::CanRepeat(SfxRepeatTarget& /* rTarget */) const
- 	return FALSE;
- }
- 
-+// Amelia Wang
-+ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell,
-+                                SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
-+                                SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-+                                const ScMarkData& rMark,
-+                                ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
-+                                USHORT nNewFlags,
-+                                ScRefUndoData* pRefData,
-+                                void* /*pFill1*/, void* /*pFill2*/, void* /*pFill3*/,
-+                                BOOL bRedoIsFilled ) :
-+        ScBlockUndo( pNewDocShell, ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), SC_UNDO_SIMPLE ),
-+        aMarkData( rMark ),
-+        pUndoDoc( pNewUndoDoc ),
-+        pRedoDoc( pNewRedoDoc ),
-+        nFlags( nNewFlags ),
-+        pRefUndoData( pRefData ),
-+        pRefRedoData( NULL ),
-+        bRedoFilled( bRedoIsFilled )
-+{
-+        //      pFill1,pFill2,pFill3 are there so the ctor calls for simple paste (without cutting)
-+        //      don't have to be changed and branched for 641.
-+        //      They can be removed later.
-+
-+        if ( !aMarkData.IsMarked() )                            // no cell marked:
-+                aMarkData.SetMarkArea( aBlockRange );   //  mark paste block
- 
-+        if ( pRefUndoData )
-+                pRefUndoData->DeleteUnchanged( pDocShell->GetDocument() );
- 
-+        SetChangeTrack();
-+}
- 
-+ScUndoDataForm::~ScUndoDataForm()
-+{
-+        delete pUndoDoc;
-+        delete pRedoDoc;
-+        delete pRefUndoData;
-+        delete pRefRedoData;
-+}
- 
-+String ScUndoDataForm::GetComment() const
-+{
-+        return ScGlobal::GetRscString( STR_UNDO_PASTE ); 
-+}
-+
-+void ScUndoDataForm::SetChangeTrack()
-+{
-+        ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack();
-+        if ( pChangeTrack && (nFlags & IDF_CONTENTS) )
-+                pChangeTrack->AppendContentRange( aBlockRange, pUndoDoc,
-+                        nStartChangeAction, nEndChangeAction, SC_CACM_PASTE );
-+        else
-+                nStartChangeAction = nEndChangeAction = 0;
-+}
-+
-+
-+void ScUndoDataForm::Undo()
-+{
-+        BeginUndo();
-+        DoChange( TRUE );
-+        ShowTable( aBlockRange );
-+        EndUndo();
-+        SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
-+}
-+
-+void ScUndoDataForm::Redo()
-+{
-+        BeginRedo();
-+        ScDocument* pDoc = pDocShell->GetDocument();
-+        EnableDrawAdjust( pDoc, FALSE );                                //! include in ScBlockUndo?
-+        DoChange( FALSE );
-+        EnableDrawAdjust( pDoc, TRUE );                                 //! include in ScBlockUndo?
-+        EndRedo();
-+        SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
-+}
-+
-+void ScUndoDataForm::Repeat(SfxRepeatTarget& /*rTarget*/)
-+{
-+}
- 
-+BOOL ScUndoDataForm::CanRepeat(SfxRepeatTarget& rTarget) const
-+{
-+        return (rTarget.ISA(ScTabViewTarget));
-+}
-+
-+void ScUndoDataForm::DoChange( const BOOL bUndo )
-+{
-+    ScDocument* pDoc = pDocShell->GetDocument();
-+
-+    //      RefUndoData for redo is created before first undo
-+    //      (with DeleteUnchanged after the DoUndo call)
-+    BOOL bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData );
-+    if ( bCreateRedoData )
-+            pRefRedoData = new ScRefUndoData( pDoc );
-+
-+    ScRefUndoData* pWorkRefData = bUndo ? pRefUndoData : pRefRedoData;
-+
-+    //      fuer Undo immer alle oder keine Inhalte sichern
-+    USHORT nUndoFlags = IDF_NONE;
-+    if (nFlags & IDF_CONTENTS)
-+            nUndoFlags |= IDF_CONTENTS;
-+    if (nFlags & IDF_ATTRIB)
-+            nUndoFlags |= IDF_ATTRIB;
-+
-+    BOOL bPaintAll = FALSE;
-+
-+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-+
-+    // marking is in ScBlockUndo...
-+    //ScUndoUtil::MarkSimpleBlock( pDocShell, aBlockRange );
-+
-+    SCTAB nTabCount = pDoc->GetTableCount();
-+    if ( bUndo && !bRedoFilled )
-+    {
-+        if (!pRedoDoc)
-+        {
-+            BOOL bColInfo = ( aBlockRange.aStart.Row()==0 && aBlockRange.aEnd.Row()==MAXROW );
-+            BOOL bRowInfo = ( aBlockRange.aStart.Col()==0 && aBlockRange.aEnd.Col()==MAXCOL );
-+
-+            pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
-+            pRedoDoc->InitUndoSelected( pDoc, aMarkData, bColInfo, bRowInfo );
-+        }
-+        //  read "redo" data from the document in the first undo
-+            //  all sheets - CopyToDocument skips those that don't exist in pRedoDoc
-+        ScRange aCopyRange = aBlockRange;
-+        aCopyRange.aStart.SetTab(0);
-+        aCopyRange.aEnd.SetTab(nTabCount-1);
-+        pDoc->CopyToDocument( aCopyRange, 1, FALSE, pRedoDoc );
-+        bRedoFilled = TRUE;
-+    }
-+
-+    USHORT nExtFlags = 0;
-+    pDocShell->UpdatePaintExt( nExtFlags, aBlockRange );
-+
-+    for ( sal_uInt16 i=0; i <= ( aBlockRange.aEnd.Col() - aBlockRange.aStart.Col() ); i++ )
-+    {
-+        String aOldString;
-+        pUndoDoc->GetString( aBlockRange.aStart.Col()+i , aBlockRange.aStart.Row() , aBlockRange.aStart.Tab() , aOldString );
-+        pDoc->SetString( aBlockRange.aStart.Col()+i , aBlockRange.aStart.Row() , aBlockRange.aStart.Tab() , aOldString );
-+    }
-+
-+    //ScRange aTabSelectRange = aBlockRange;
-+
-+    if (pWorkRefData)
-+    {
-+        pWorkRefData->DoUndo( pDoc, TRUE );             // TRUE = bSetChartRangeLists for SetChartListenerCollection
-+        if ( pDoc->RefreshAutoFilter( 0,0, MAXCOL,MAXROW, aBlockRange.aStart.Tab() ) )
-+            bPaintAll = TRUE;
-+    }
-+
-+    if ( bCreateRedoData && pRefRedoData )
-+            pRefRedoData->DeleteUnchanged( pDoc );
-+    
-+    if ( bUndo )
-+    {
-+        ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
-+        if ( pChangeTrack )
-+            pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
-+    }
-+    else
-+        SetChangeTrack();
-+
-+    ScRange aDrawRange( aBlockRange );
-+    pDoc->ExtendMerge( aDrawRange, TRUE );      // only needed for single sheet (text/rtf etc.)
-+    USHORT nPaint = PAINT_GRID;
-+    if (bPaintAll)
-+    {
-+        aDrawRange.aStart.SetCol(0);
-+        aDrawRange.aStart.SetRow(0);
-+        aDrawRange.aEnd.SetCol(MAXCOL);
-+        aDrawRange.aEnd.SetRow(MAXROW);
-+        nPaint |= PAINT_TOP | PAINT_LEFT;
-+/*A*/   if (pViewShell)
-+            pViewShell->AdjustBlockHeight(FALSE);
-+    }
-+    else
-+    {
-+        if ( aBlockRange.aStart.Row() == 0 && aBlockRange.aEnd.Row() == MAXROW )        // ganze Spalte
-+        {
-+            nPaint |= PAINT_TOP;
-+            aDrawRange.aEnd.SetCol(MAXCOL);
-+        }
-+        if ( aBlockRange.aStart.Col() == 0 && aBlockRange.aEnd.Col() == MAXCOL )        // ganze Zeile
-+        {
-+            nPaint |= PAINT_LEFT;
-+            aDrawRange.aEnd.SetRow(MAXROW);
-+        }
-+/*A*/   if ((pViewShell) && pViewShell->AdjustBlockHeight(FALSE))
-+        {
-+            aDrawRange.aStart.SetCol(0);
-+            aDrawRange.aStart.SetRow(0);
-+            aDrawRange.aEnd.SetCol(MAXCOL);
-+            aDrawRange.aEnd.SetRow(MAXROW);
-+            nPaint |= PAINT_LEFT;
-+        }
-+        pDocShell->UpdatePaintExt( nExtFlags, aDrawRange );
-+    }
-+
-+    if ( !bUndo )                               //      draw redo after updating row heights
-+        RedoSdrUndoAction( pDrawUndo );                 //!     include in ScBlockUndo?
-+
-+    pDocShell->PostPaint( aDrawRange, nPaint, nExtFlags );
-+
-+    pDocShell->PostDataChanged();
-+    if (pViewShell)
-+        pViewShell->CellContentChanged();
-+}
-diff --git sc/source/ui/view/cellsh2.cxx sc/source/ui/view/cellsh2.cxx
-index 7dee7cc..231e71e 100644
---- sc/source/ui/view/cellsh2.cxx
-+++ sc/source/ui/view/cellsh2.cxx
-@@ -265,6 +265,20 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
- 			}
- 			break;
- 
-+		case SID_DATA_FORM:
-+			{
-+				ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-+	            DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
-+
-+	            AbstractScDataFormDlg* pDlg = pFact->CreateScDataFormDlg( pTabViewShell->GetDialogParent(),RID_SCDLG_DATAFORM, pTabViewShell);
-+	            DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
-+
-+	            pDlg->Execute();
-+	            
-+				rReq.Done();
-+			}
-+			break;
-+			
- 		case SID_SUBTOTALS:
- 			{
- 				const SfxItemSet* pArgs = rReq.GetArgs();
-diff --git sc/source/ui/view/viewfun3.cxx sc/source/ui/view/viewfun3.cxx
-index 1cb5400..9c2ef97 100644
---- sc/source/ui/view/viewfun3.cxx
-+++ sc/source/ui/view/viewfun3.cxx
-@@ -208,6 +208,7 @@
- #include "transobj.hxx"
- #include "drwtrans.hxx"
- #include "docuno.hxx"
-+#include "undodat.hxx"   // Amelia Wang
- 
- using namespace com::sun::star;
- 
-@@ -1414,6 +1415,85 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B
- 	return TRUE;
- }
- 
-+void ScViewFunc::DataFormPutData( SCROW nCurrentRow ,
-+                                  SCROW nStartRow , SCCOL nStartCol ,
-+                                  SCROW nEndRow , SCCOL nEndCol ,
-+                                  Edit** pEdits ,
-+                                  sal_uInt16 aColLength )
-+{
-+    ScDocument* pDoc = GetViewData()->GetDocument();
-+    ScDocShell* pDocSh = GetViewData()->GetDocShell();
-+    ScMarkData& rMark = GetViewData()->GetMarkData();
-+    ScDocShellModificator aModificator( *pDocSh );
-+    SfxUndoManager* pUndoMgr = pDocSh->GetUndoManager();
-+    if ( pDoc )
-+    {
-+        const BOOL bRecord( pDoc->IsUndoEnabled());
-+        ScDocument* pUndoDoc = NULL;
-+        ScDocument* pRedoDoc = NULL;
-+        ScDocument* pRefUndoDoc = NULL;
-+        ScRefUndoData* pUndoData = NULL;
-+        SCTAB nTab = GetViewData()->GetTabNo();
-+        SCTAB nStartTab = nTab;
-+        SCTAB nEndTab = nTab;
-+        
-+        {
-+                ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
-+                if ( pChangeTrack )
-+                        pChangeTrack->ResetLastCut();   // kein CutMode mehr
-+        }
-+        ScRange aUserRange( nStartCol, nCurrentRow, nStartTab, nEndCol, nCurrentRow, nEndTab );
-+        BOOL bColInfo = ( nStartRow==0 && nEndRow==MAXROW );
-+        BOOL bRowInfo = ( nStartCol==0 && nEndCol==MAXCOL );
-+        SCCOL nUndoEndCol = nStartCol+aColLength-1;
-+        SCROW nUndoEndRow = nCurrentRow;
-+        USHORT nUndoFlags = IDF_NONE;
-+
-+        if ( bRecord )
-+        {
-+            pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-+            pUndoDoc->InitUndoSelected( pDoc , rMark , bColInfo , bRowInfo );
-+            pDoc->CopyToDocument( aUserRange , 1 , FALSE , pUndoDoc );
-+        }
-+        USHORT nExtFlags = 0;
-+        pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab , nEndCol, nEndRow, nEndTab ); // content before the change
-+        //rMark.SetMarkArea( aUserRange );
-+        pDoc->BeginDrawUndo();
-+        
-+        for(sal_uInt16 i = 0; i < aColLength; i++)
-+        {
-+            if (pEdits[i])
-+            {
-+                String  aFieldName=pEdits[i]->GetText();
-+                pDoc->SetString( nStartCol + i, nCurrentRow, nTab, aFieldName );
-+            }
-+        }
-+        //pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, rMark, TRUE );    // Refresh
-+        pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nCurrentRow, nStartTab, nEndCol, nCurrentRow, nEndTab );  // content after the change
-+        SfxUndoAction* pUndo = new ScUndoDataForm( pDocSh,
-+                                                                nStartCol, nCurrentRow, nStartTab,
-+                                                                nUndoEndCol, nUndoEndRow, nEndTab, rMark,
-+                                                                pUndoDoc, pRedoDoc, nUndoFlags,
-+                                                                pUndoData, NULL, NULL, NULL,
-+                                                                FALSE );           // FALSE = Redo data not yet copied
-+        pUndoMgr->AddUndoAction( new ScUndoWrapper( pUndo ), TRUE );
-+        
-+        USHORT nPaint = PAINT_GRID;
-+        if (bColInfo)
-+        {
-+                nPaint |= PAINT_TOP;
-+                nUndoEndCol = MAXCOL;                           // nur zum Zeichnen !
-+        }
-+        if (bRowInfo)
-+        {
-+                nPaint |= PAINT_LEFT;
-+                nUndoEndRow = MAXROW;                           // nur zum Zeichnen !
-+        }
- 
-+        pDocSh->PostPaint( nStartCol, nCurrentRow, nStartTab,
-+                                                nUndoEndCol, nUndoEndRow, nEndTab, nPaint, nExtFlags );
-+        pDocSh->UpdateOle(GetViewData());
-+    }
-+}
- 
- 
-diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
-index 938f00b..06dfc6f 100644
---- sc/uiconfig/scalc/menubar/menubar.xml
-+++ sc/uiconfig/scalc/menubar/menubar.xml
-@@ -391,6 +391,7 @@
- 					<menu:menuitem menu:id=".uno:DataFilterHideAutoFilter"/>
- 				</menu:menupopup>
- 			</menu:menu>
-+			<menu:menuitem menu:id=".uno:DataForm"/>
- 			<menu:menuitem menu:id=".uno:DataSubTotals"/>
- 			<menu:menuitem menu:id=".uno:Validation"/>
- 			<menu:menuseparator/>
-diff --git sc/util/makefile.mk sc/util/makefile.mk
-index a051bb8..9d2706a 100644
---- sc/util/makefile.mk
-+++ sc/util/makefile.mk
-@@ -273,6 +273,7 @@ LIB8OBJFILES = \
- 		$(SLO)$/filldlg.obj			\
- 		$(SLO)$/delcodlg.obj		\
- 		$(SLO)$/delcldlg.obj		\
-+		$(SLO)$/datafdlg.obj		\
- 		$(SLO)$/dapitype.obj	\
- 		$(SLO)$/dapidata.obj	\
- 		$(SLO)$/crdlg.obj			\
diff --git a/applied_patches/0015-cws-calctabcolor-officecfg.diff b/applied_patches/0015-cws-calctabcolor-officecfg.diff
new file mode 100644
index 000000000..e080188c8
--- /dev/null
+++ b/applied_patches/0015-cws-calctabcolor-officecfg.diff
@@ -0,0 +1,33 @@
+diff --git officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+index 991ea9a..3ae5ca8 100644
+--- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
++++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+@@ -1243,12 +1243,25 @@
+             </node>
+             <node oor:name=".uno:Name" oor:op="replace">
+                 <prop oor:name="Label" oor:type="xs:string">
+-                    <value xml:lang="en-US">Rename Sheet</value>
++					<value xml:lang="en-US">Rename Sheet</value>
++				</prop>
++			</node>
++            <node oor:name=".uno:SetTabBgColor" oor:op="replace">
++                <prop oor:name="Label" oor:type="xs:string">
++                    <value xml:lang="en-US">~Tab Color...</value>
++                </prop>
++                <prop oor:name="ContextLabel" oor:type="xs:string">
++                    <value xml:lang="en-US">~Tab Color...</value>
+                 </prop>
+             </node>
+-            <node oor:name=".uno:Move" oor:op="replace">
++            <node oor:name=".uno:TabBgColor" oor:op="replace">
+                 <prop oor:name="Label" oor:type="xs:string">
+-                    <value xml:lang="en-US">~Move/Copy Sheet...</value>
++                    <value xml:lang="en-US">Tab Color</value>
++                </prop>
++            </node>
++			<node oor:name=".uno:Move" oor:op="replace">
++				<prop oor:name="Label" oor:type="xs:string">
++					<value xml:lang="en-US">~Move/Copy Sheet...</value>
+                 </prop>
+                 <prop oor:name="ContextLabel" oor:type="xs:string">
+                     <value xml:lang="en-US">~Move/Copy...</value>
diff --git a/applied_patches/0015-sc-dataform-officecfg.diff b/applied_patches/0015-sc-dataform-officecfg.diff
deleted file mode 100644
index 5871b409a..000000000
--- a/applied_patches/0015-sc-dataform-officecfg.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-index 653fa4a..52242f3 100644
---- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-+++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-@@ -1184,6 +1184,12 @@
- 					<value xml:lang="en-US">~Remove Filter</value>
- 				</prop>
- 			</node>
-+                        <node oor:name=".uno:DataForm" oor:op="replace">
-+                                <prop oor:name="Label" oor:type="xs:string">
-+                                        <value xml:lang="de">D~atenForm...</value>
-+                                        <value xml:lang="en-US">D~ataForm...</value>
-+                                </prop>
-+                        </node>
- 			<node oor:name=".uno:DataSubTotals" oor:op="replace">
- 				<prop oor:name="Label" oor:type="xs:string">
- 					<value xml:lang="en-US">Sub~totals...</value>
diff --git a/applied_patches/0016-cws-calctabcolor-oox.diff b/applied_patches/0016-cws-calctabcolor-oox.diff
new file mode 100644
index 000000000..9e37e2187
--- /dev/null
+++ b/applied_patches/0016-cws-calctabcolor-oox.diff
@@ -0,0 +1,75 @@
+diff --git oox/inc/oox/xls/viewsettings.hxx oox/inc/oox/xls/viewsettings.hxx
+index fceb1bc..f1160a1 100644
+--- oox/inc/oox/xls/viewsettings.hxx
++++ oox/inc/oox/xls/viewsettings.hxx
+@@ -83,6 +83,7 @@ struct SheetViewModel
+     bool                mbShowZeros;                    /// True = show zero value zells.
+     bool                mbShowOutline;                  /// True = show outlines.
+     bool                mbZoomToFit;                    /// True = zoom chart sheet to fit window.
++    Color               maTabColor;                     /// Sheet tab color. (TODO: Move to sheet settings later.)
+ 
+     explicit            SheetViewModel();
+ 
+@@ -112,6 +113,8 @@ public:
+ 
+     /** Imports the sheetView element containing sheet view settings. */
+     void                importSheetView( const AttributeList& rAttribs );
++    /** Imports the tabcolor element containing tab color settings. */
++    void                importTabColor( const AttributeList& rAttribs );
+     /** Imports the pane element containing sheet pane settings. */
+     void                importPane( const AttributeList& rAttribs );
+     /** Imports the selection element containing selection settings for a pane. */
+diff --git oox/source/token/properties.txt oox/source/token/properties.txt
+index 958a9ac..89a65cd 100644
+--- oox/source/token/properties.txt
++++ oox/source/token/properties.txt
+@@ -355,6 +355,7 @@ Suffix
+ SwapXAndYAxis
+ Symbol
+ SymbolColor
++TabColor
+ TableBorder
+ TableLayout
+ TableSelected
+diff --git oox/source/xls/viewsettings.cxx oox/source/xls/viewsettings.cxx
+index caeacaf..ce8c009 100644
+--- oox/source/xls/viewsettings.cxx
++++ oox/source/xls/viewsettings.cxx
+@@ -245,6 +245,12 @@ void SheetViewSettings::importSheetView( const AttributeList& rAttribs )
+     rModel.mbShowOutline     = rAttribs.getBool( XML_showOutlineSymbols, true );
+ }
+ 
++void SheetViewSettings::importTabColor( const AttributeList& rAttribs )
++{
++    SheetViewModel& rModel = maSheetViews.empty() ? *createSheetView() : *maSheetViews.back();
++    rModel.maTabColor.importColor( rAttribs );
++}
++
+ void SheetViewSettings::importPane( const AttributeList& rAttribs )
+ {
+     OSL_ENSURE( !maSheetViews.empty(), "SheetViewSettings::importPane - missing sheet view model" );
+@@ -589,6 +595,9 @@ void SheetViewSettings::finalizeImport()
+     aPropMap[ PROP_ShowZeroValues ]               <<= xModel->mbShowZeros;
+     aPropMap[ PROP_IsOutlineSymbolsSet ]          <<= xModel->mbShowOutline;
+ 
++    if (!xModel->maTabColor.isAuto())
++        aPropMap[ PROP_TabColor ] <<= static_cast< sal_Int32 >(xModel->maTabColor.getColor(*this));
++
+     // store sheet view settings in global view settings object
+     getViewSettings().setSheetViewSettings( getSheetIndex(), xModel, Any( aPropMap.makePropertyValueSequence() ) );
+ }
+diff --git oox/source/xls/worksheetfragment.cxx oox/source/xls/worksheetfragment.cxx
+index 4b75411..d2bed72 100644
+--- oox/source/xls/worksheetfragment.cxx
++++ oox/source/xls/worksheetfragment.cxx
+@@ -297,7 +297,9 @@ ContextHandlerRef OoxWorksheetFragment::onCreateContext( sal_Int32 nElement, con
+         case XLS_TOKEN( sheetPr ):
+             switch( nElement )
+             {
+-                case XLS_TOKEN( tabColor ):         getWorksheetSettings().importTabColor( rAttribs );              break;
++// TODO: Treat tab color as a sheet setting later.
++//              case XLS_TOKEN( tabColor ):         getWorksheetSettings().importTabColor( rAttribs );              break;
++                case XLS_TOKEN( tabColor ):         getSheetViewSettings().importTabColor( rAttribs );              break;
+                 case XLS_TOKEN( outlinePr ):        getWorksheetSettings().importOutlinePr( rAttribs );             break;
+                 case XLS_TOKEN( pageSetUpPr ):      importPageSetUpPr( rAttribs );                                  break;
+             }
diff --git a/applied_patches/0016-sc-dataform-suppor-vba.diff b/applied_patches/0016-sc-dataform-suppor-vba.diff
deleted file mode 100644
index 9a5f2fa69..000000000
--- a/applied_patches/0016-sc-dataform-suppor-vba.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx
---- sc/inc/scabstdlg.hxx	2007-09-18 15:45:23.000000000 +0800
-+++ sc/inc/scabstdlg.hxx	2007-09-18 15:43:57.000000000 +0800
-@@ -310,7 +310,7 @@
- class ScAbstractDialogFactory
- {
- public:
--	static ScAbstractDialogFactory* 	Create();
-+	SC_DLLPUBLIC static ScAbstractDialogFactory* 	Create();
- 
- 	virtual 	AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg
- 																	SvStream* pInStream, int nId,
diff --git a/applied_patches/0017-cws-calctabcolor-sc.diff b/applied_patches/0017-cws-calctabcolor-sc.diff
new file mode 100644
index 000000000..11c4a2f8c
--- /dev/null
+++ b/applied_patches/0017-cws-calctabcolor-sc.diff
@@ -0,0 +1,1881 @@
+diff --git sc/inc/ViewSettingsSequenceDefines.hxx sc/inc/ViewSettingsSequenceDefines.hxx
+index 63671c5..c720413 100644
+--- sc/inc/ViewSettingsSequenceDefines.hxx
++++ sc/inc/ViewSettingsSequenceDefines.hxx
+@@ -64,7 +64,7 @@
+ // this are the defines for the position of the settings in the
+ // TableViewSettingsSequence
+ 
+-#define SC_TABLE_VIEWSETTINGS_COUNT         14
++#define SC_TABLE_VIEWSETTINGS_COUNT         15
+ 
+ #define SC_CURSOR_X							0
+ #define SC_CURSOR_Y							1
+@@ -80,6 +80,7 @@
+ #define SC_TABLE_ZOOM_TYPE                  11
+ #define SC_TABLE_ZOOM_VALUE                 12
+ #define SC_TABLE_PAGE_VIEW_ZOOM_VALUE       13
++#define SC_TABLE_TAB_BG_COLOR               14
+ 
+ #define SC_CURSORPOSITIONX					"CursorPositionX"
+ #define SC_CURSORPOSITIONY					"CursorPositionY"
+diff --git sc/inc/globstr.hrc sc/inc/globstr.hrc
+index 1db4648..5c0f48e 100644
+--- sc/inc/globstr.hrc
++++ sc/inc/globstr.hrc
+@@ -573,7 +573,10 @@
+ #define STR_STYLE_FAMILY_CELL       433
+ #define STR_STYLE_FAMILY_PAGE       434
+ 
+-#define STR_COUNT                   435
++#define STR_UNDO_SET_TAB_BG_COLOR       435
++#define STR_UNDO_SET_MULTI_TAB_BG_COLOR 436
++
++#define STR_COUNT                   437
+ 
+ #endif
+ 
+diff --git sc/inc/sc.hrc sc/inc/sc.hrc
+index c9bd929..76f0343 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -833,8 +833,10 @@
+ #define FID_TAB_INDEX			(TAB_POPUP_START+6)
+ #define FID_TAB_RTL				(TAB_POPUP_START+7)
+ #define FID_TAB_DESELECTALL     (TAB_POPUP_START+8)
++#define FID_TAB_MENU_SET_TAB_BG_COLOR (TAB_POPUP_START + 9)
++#define FID_TAB_SET_TAB_BG_COLOR      (TAB_POPUP_START + 10)
+ 
+-#define TAB_POPUP_END			(DATA_MENU_END + 20)
++#define TAB_POPUP_END			(TAB_POPUP_START + 20)
+ 
+ #define OBJBAR_FORMAT_START		(TAB_POPUP_END)
+ #define SID_ALIGNLEFT			(OBJBAR_FORMAT_START+6)
+@@ -1430,7 +1432,10 @@
+ 
+ #define RID_SCSTR_ONCLICK       (STR_START + 402)
+ 
+-#define STR_END                 RID_SCSTR_ONCLICK
++#define SCSTR_SET_TAB_BG_COLOR  (STR_START + 403)
++#define SCSTR_NO_TAB_BG_COLOR   (STR_START + 404)
++
++#define STR_END                 (SCSTR_NO_TAB_BG_COLOR)
+ 
+ #define BMP_START				(STR_END)
+ 
+@@ -1639,8 +1644,9 @@
+ #define RID_SCDLG_RETYPEPASS_INPUT      (SC_DIALOGS_START + 151)
+ #define RID_POPUP_FILTER                (SC_DIALOGS_START + 152)
+ #define RID_SCDLG_TEXT_IMPORT_OPTIONS   (SC_DIALOGS_START + 153)
++#define RID_SCDLG_TAB_BG_COLOR          (SC_DIALOGS_START + 154)
+ 
+-#define SC_DIALOGS_END                  (SC_DIALOGS_START + 154)
++#define SC_DIALOGS_END                  (SC_DIALOGS_START + 155)
+ 
+ #ifndef STD_MASKCOLOR
+ #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
+diff --git sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx
+index 1de5302..81f190b 100644
+--- sc/inc/scabstdlg.hxx
++++ sc/inc/scabstdlg.hxx
+@@ -285,6 +285,12 @@ public:
+     virtual void GetInputString( String& rString ) const = 0;
+ };
+ 
++class AbstractScTabBgColorDlg : public VclAbstractDialog  //add for ScTabBgColorDlg
++{
++public:
++    virtual void GetSelectedColor( Color& rColor ) const = 0;
++};
++
+ class AbstractScImportOptionsDlg : public VclAbstractDialog  //add for ScImportOptionsDlg
+ {
+ public:
+@@ -434,6 +440,14 @@ public:
+                                                                 const String& rDefault,
+                                                                 ULONG nHelpId ,
+                                                                 int nId ) = 0;
++
++    virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg (  Window* pParent, //add for ScTabBgColorDlg
++                                                                const String& rTitle, //Dialog Title
++                                                                const String& rTabBgColorNoColorText, //Label for no tab color
++                                                                const Color& rDefaultColor, //Currently selected Color
++                                                                ULONG nHelpId ,
++                                                                int nId ) = 0;
++
+     virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* 				pParent, //add for ScImportOptionsDlg
+                                                                     int nId,
+                                                                     BOOL                    bAscii = TRUE,
+diff --git sc/inc/scextopt.hxx sc/inc/scextopt.hxx
+index d9e654e..0e3866e 100644
+--- sc/inc/scextopt.hxx
++++ sc/inc/scextopt.hxx
+@@ -80,6 +80,8 @@ struct ScExtTabSettings
+     bool                mbSelected;         /// true = Sheet is selected.
+     bool                mbFrozenPanes;      /// true = Frozen panes; false = Normal splits.
+     bool                mbPageMode;         /// true = Pagebreak mode; false = Normal view mode.
++    Color               maTabBgColor;       /// Tab Bg Color
++    bool                IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO) ? TRUE : FALSE; };
+ 
+     explicit            ScExtTabSettings();
+ };
+diff --git sc/inc/tabbgcolor.hxx sc/inc/tabbgcolor.hxx
+new file mode 100644
+index 0000000..83b694a
+--- /dev/null
++++ sc/inc/tabbgcolor.hxx
+@@ -0,0 +1,46 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: tabbgcolor.hxx,v $
++ * $Revision: 1.00 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_TABBGCOLOR_HXX
++#define SC_TABBGCOLOR_HXX
++
++#include <tools/color.hxx>
++#include <tools/list.hxx>
++
++struct ScUndoSetTabBgColorInfo
++{
++public:
++    SCTAB nTabId;
++    Color aOldTabBgColor;
++    Color aNewTabBgColor;
++    BOOL IsDefaultOldTabBgColor() const {return aOldTabBgColor == Color( COL_AUTO ) ? TRUE : FALSE ;};
++    BOOL IsDefaultNewTabBgColor() const {return aOldTabBgColor == Color( COL_AUTO ) ? TRUE : FALSE ;};
++};
++DECLARE_LIST( ScUndoSetTabBgColorInfoList, ScUndoSetTabBgColorInfo* )
++#endif
+diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
+index faa463f..589fa37 100644
+--- sc/inc/unonames.hxx
++++ sc/inc/unonames.hxx
+@@ -529,6 +529,8 @@
+ #define SC_UNO_ZOOMTYPE             "ZoomType"
+ #define SC_UNO_ZOOMVALUE            "ZoomValue"
+ #define SC_UNO_UPDTEMPL             "UpdateFromTemplate"
++#define SC_UNO_TABCOLOR             "TabColor"
++ 
+ /*Stampit enable/disable print cancel */
+ #define SC_UNO_ALLOWPRINTJOBCANCEL  "AllowPrintJobCancel"
+ 
+diff --git sc/sdi/docsh.sdi sc/sdi/docsh.sdi
+index 67803b5..4a773ab 100644
+--- sc/sdi/docsh.sdi
++++ sc/sdi/docsh.sdi
+@@ -63,6 +63,7 @@ interface TableSelection
+     FID_DELETE_TABLE	[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+     FID_TAB_RENAME		[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+     FID_TAB_RTL			[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
++    FID_TAB_SET_TAB_BG_COLOR    [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+ 
+     SID_TABLE_ACTIVATE	[ ExecMethod = Execute; ]
+ }
+diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
+index 9a1678d..2d0e476 100644
+--- sc/sdi/scalc.sdi
++++ sc/sdi/scalc.sdi
+@@ -7824,3 +7824,56 @@ SfxVoidItem ShareDocument SID_SHARE_DOC
+     ToolBoxConfig = FALSE,
+     GroupId = GID_OPTIONS;
+ ]
++
++//--------------------------------------------------------------------------
++SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR
++
++[
++    // flags: 
++    AutoUpdate = FALSE,
++    Cachable = Cachable,
++    FastCall = FALSE,
++    HasCoreId = FALSE,
++    HasDialog = TRUE,
++    ReadOnlyDoc = TRUE,
++    Toggle = FALSE,
++    Container = FALSE,
++    RecordAbsolute = FALSE,
++    RecordPerSet;
++    Synchron;
++
++    Readonly = FALSE,
++
++    // config: 
++    AccelConfig = TRUE,
++    MenuConfig = TRUE,
++    StatusBarConfig = FALSE,
++    ToolBoxConfig = FALSE,
++    GroupId = GID_FORMAT;
++]
++
++//--------------------------------------------------------------------------
++SfxVoidItem SetTabBgColor FID_TAB_MENU_SET_TAB_BG_COLOR
++(SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR)
++[
++    /* flags: */
++    AutoUpdate = FALSE,
++    Cachable = Cachable,
++    FastCall = FALSE,
++    HasCoreId = FALSE,
++    HasDialog = TRUE,
++    ReadOnlyDoc = TRUE,
++    Toggle = FALSE,
++    Container = FALSE,
++    RecordAbsolute = FALSE,
++    RecordPerSet;
++    Synchron;
++
++    /* config: */
++    AccelConfig = TRUE,
++    MenuConfig = TRUE,
++    StatusBarConfig = FALSE,
++    ToolBoxConfig = FALSE,
++    GroupId = GID_FORMAT;
++]
++
+diff --git sc/sdi/tabvwsh.sdi sc/sdi/tabvwsh.sdi
+index 624cb09..44855a2 100644
+--- sc/sdi/tabvwsh.sdi
++++ sc/sdi/tabvwsh.sdi
+@@ -61,6 +61,7 @@ interface Tables
+     FID_TABLE_HIDE	[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+     FID_TABLE_SHOW	[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+         SID_SELECT_TABLES       [ ExecMethod = Execute; StateMethod = GetState; ]
++    FID_TAB_MENU_SET_TAB_BG_COLOR   [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+ }
+ 
+  // ===========================================================================
+diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
+index a93f993..e8c2d89 100644
+--- sc/source/filter/excel/read.cxx
++++ sc/source/filter/excel/read.cxx
+@@ -1152,6 +1152,9 @@ FltError ImportExcel8::Read( void )
+                     case EXC_ID_SXVDEX:         rPTableMgr.ReadSxvdex( maStrm );    break;
+                     case EXC_ID_SXEX:           rPTableMgr.ReadSxex( maStrm );      break;
+                     case EXC_ID_SXVIEWEX9:      rPTableMgr.ReadSxViewEx9( maStrm ); break;
++
++                    // 0x0862 (SHEETEXT)
++                    case EXC_ID_SHEETEXT:       rTabViewSett.ReadTabBgColor( maStrm, rPal );    break;
+                 }
+             }
+             break;
+diff --git sc/source/filter/excel/xestyle.cxx sc/source/filter/excel/xestyle.cxx
+index d93eec3..de32a64 100644
+--- sc/source/filter/excel/xestyle.cxx
++++ sc/source/filter/excel/xestyle.cxx
+@@ -77,6 +77,7 @@ sal_uInt32 lclGetWeighting( XclExpColorType eType )
+         case EXC_COLOR_CELLTEXT:
+         case EXC_COLOR_CHARTTEXT:
+         case EXC_COLOR_CTRLTEXT:    return 10;
++        case EXC_COLOR_TABBG:
+         case EXC_COLOR_CELLAREA:    return 20;
+         case EXC_COLOR_GRID:        return 50;
+         default:    DBG_ERRORFILE( "lclGetWeighting - unknown color type" );
+diff --git sc/source/filter/excel/xeview.cxx sc/source/filter/excel/xeview.cxx
+index da4af8c..81c5b9a 100644
+--- sc/source/filter/excel/xeview.cxx
++++ sc/source/filter/excel/xeview.cxx
+@@ -259,6 +259,35 @@ void XclExpSelection::WriteBody( XclExpStream& rStrm )
+     maSelData.maXclSelection.Write( rStrm, false );
+ }
+ 
++// ----------------------------------------------------------------------------
++
++XclExpTabBgColor::XclExpTabBgColor( const XclTabViewData& rTabViewData ) :
++    XclExpRecord( EXC_ID_SHEETEXT, 18 ),
++    mrTabViewData( rTabViewData )
++{
++}
++//TODO Fix savexml...
++/*void XclExpTabBgColor::SaveXml( XclExpXmlStream& rStrm )
++{
++}*/
++
++void XclExpTabBgColor::WriteBody( XclExpStream& rStrm )
++{
++    if ( mrTabViewData.IsDefaultTabBgColor() )
++        return;
++    sal_uInt16 rt = 0x0862; //rt
++    sal_uInt16 grbitFrt = 0x0000; //grbit must be set to 0
++    sal_uInt32 unused = 0x00000000; //Use twice...
++    sal_uInt32 cb = 0x00000014; // Record Size, may be larger in future...
++    sal_uInt16 reserved = 0x0000; //trailing bits are 0
++    sal_uInt16 TabBgColorIndex;
++    XclExpPalette& rPal = rStrm.GetRoot().GetPalette();
++    TabBgColorIndex = rPal.GetColorIndex(mrTabViewData.mnTabBgColorId);
++    if (TabBgColorIndex < 8 || TabBgColorIndex > 63 ) // only numbers 8 - 63 are valid numbers
++        TabBgColorIndex = 127; //Excel specs: 127 makes excel ignore tab color information.
++    rStrm << rt << grbitFrt << unused << unused << cb << TabBgColorIndex << reserved;
++}
++
+ // Sheet view settings ========================================================
+ 
+ namespace {
+@@ -368,6 +397,14 @@ XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nSc
+         maData.mnNormalZoom     = lclGetXclZoom( rTabSett.mnNormalZoom, EXC_WIN2_NORMALZOOM_DEF );
+         maData.mnPageZoom       = lclGetXclZoom( rTabSett.mnPageZoom, EXC_WIN2_PAGEZOOM_DEF );
+         maData.mnCurrentZoom    = maData.mbPageMode ? maData.mnPageZoom : maData.mnNormalZoom;
++
++        // Tab Bg Color
++        if ( GetBiff() == EXC_BIFF8 && !rTabSett.IsDefaultTabBgColor() )
++        {
++            XclExpPalette& rPal = GetPalette();
++            maData.maTabBgColor = rTabSett.maTabBgColor;
++            maData.mnTabBgColorId = rPal.InsertColor(maData.maTabBgColor, EXC_COLOR_TABBG, EXC_COLOR_NOTABBG );
++        }
+     }
+ }
+ 
+@@ -380,6 +417,7 @@ void XclExpTabViewSettings::Save( XclExpStream& rStrm )
+     WriteSelection( rStrm, EXC_PANE_TOPRIGHT );
+     WriteSelection( rStrm, EXC_PANE_BOTTOMLEFT );
+     WriteSelection( rStrm, EXC_PANE_BOTTOMRIGHT );
++    WriteTabBgColor( rStrm );
+ }
+ 
+ static void lcl_WriteSelection( XclExpXmlStream& rStrm, const XclTabViewData& rData, sal_uInt8 nPane )
+@@ -494,5 +532,10 @@ void XclExpTabViewSettings::WriteSelection( XclExpStream& rStrm, sal_uInt8 nPane
+         XclExpSelection( maData, nPane ).Save( rStrm );
+ }
+ 
++void XclExpTabViewSettings::WriteTabBgColor( XclExpStream& rStrm ) const
++{
++    if ( !maData.IsDefaultTabBgColor() )
++        XclExpTabBgColor( maData ).Save( rStrm );
++}
+ // ============================================================================
+ 
+diff --git sc/source/filter/excel/xichart.cxx sc/source/filter/excel/xichart.cxx
+index 69ead7f..41ec801 100644
+--- sc/source/filter/excel/xichart.cxx
++++ sc/source/filter/excel/xichart.cxx
+@@ -3765,6 +3765,12 @@ void XclImpChart::ReadChartSubStream( XclImpStream& rStrm )
+ 
+             case EXC_ID_WINDOW2:        rTabViewSett.ReadWindow2( rStrm, true );break;
+             case EXC_ID_SCL:            rTabViewSett.ReadScl( rStrm );          break;
++            case EXC_ID_SHEETEXT: //0x0862
++            {
++                XclImpPalette& rPal = GetPalette();
++                rTabViewSett.ReadTabBgColor( rStrm,  rPal);
++            }
++            break;
+         }
+ 
+         switch( rStrm.GetRecId() )
+diff --git sc/source/filter/excel/xiview.cxx sc/source/filter/excel/xiview.cxx
+index a871bdd..fbd72d0 100644
+--- sc/source/filter/excel/xiview.cxx
++++ sc/source/filter/excel/xiview.cxx
+@@ -109,6 +109,24 @@ void XclImpTabViewSettings::Initialize()
+     maData.SetDefaults();
+ }
+ 
++void XclImpTabViewSettings::ReadTabBgColor( XclImpStream& rStrm, XclImpPalette& rPal )
++{
++    DBG_ASSERT_BIFF( GetBiff() >= EXC_BIFF8 );
++    if( GetBiff() < EXC_BIFF8 )
++        return;
++
++    sal_uInt8 ColorIndex;
++    Color TabBgColor;
++
++    rStrm.Ignore( 16 );
++    ColorIndex = rStrm.ReaduInt8() & EXC_SHEETEXT_TABCOLOR; //0x7F
++    if ( ColorIndex >= 8 && ColorIndex <= 63 ) //only accept valid index values
++    {
++        TabBgColor = rPal.GetColor( ColorIndex );
++        maData.maTabBgColor = TabBgColor;
++    }
++}
++
+ void XclImpTabViewSettings::ReadWindow2( XclImpStream& rStrm, bool bChart )
+ {
+     if( GetBiff() == EXC_BIFF2 )
+@@ -279,6 +297,10 @@ void XclImpTabViewSettings::Finalize()
+         aViewOpt.SetOption( VOPT_OUTLINER, maData.mbShowOutline );
+         rDoc.SetViewOptions( aViewOpt );
+     }
++
++    // *** set tab bg color
++    if ( !maData.IsDefaultTabBgColor() )
++        rTabSett.maTabBgColor = maData.maTabBgColor;
+ }
+ 
+ // ============================================================================
+diff --git sc/source/filter/excel/xlview.cxx sc/source/filter/excel/xlview.cxx
+index 080075b..8580d7a 100644
+--- sc/source/filter/excel/xlview.cxx
++++ sc/source/filter/excel/xlview.cxx
+@@ -79,6 +79,7 @@ void XclTabViewData::SetDefaults()
+     mbDefGridColor = true;
+     mbShowFormulas = false;
+     mbShowGrid = mbShowHeadings = mbShowZeros = mbShowOutline = true;
++    maTabBgColor.SetColor( COL_AUTO );
+ }
+ 
+ bool XclTabViewData::IsSplit() const
+diff --git sc/source/filter/inc/xestyle.hxx sc/source/filter/inc/xestyle.hxx
+index 8485bb1..9508c8b 100644
+--- sc/source/filter/inc/xestyle.hxx
++++ sc/source/filter/inc/xestyle.hxx
+@@ -61,7 +61,8 @@ enum XclExpColorType
+     EXC_COLOR_CHARTLINE,        /// Line in a chart.
+     EXC_COLOR_CHARTAREA,        /// Area in a chart.
+     EXC_COLOR_CTRLTEXT,         /// Text color in a form control.
+-    EXC_COLOR_GRID              /// Spreadsheet grid color.
++    EXC_COLOR_GRID,              /// Spreadsheet grid color.
++    EXC_COLOR_TABBG             /// Spreadsheet tab bg color.
+ };
+ 
+ // ----------------------------------------------------------------------------
+diff --git sc/source/filter/inc/xeview.hxx sc/source/filter/inc/xeview.hxx
+index 4d8b10d..5c54ecd 100644
+--- sc/source/filter/inc/xeview.hxx
++++ sc/source/filter/inc/xeview.hxx
+@@ -134,6 +134,20 @@ private:
+     sal_uInt8           mnPane;             /// Pane identifier of this selection.
+ };
+ 
++class XclExpTabBgColor : public XclExpRecord
++{
++public:
++    explicit            XclExpTabBgColor( const XclTabViewData& rTabViewData );
++
++    /* virtual void        SaveXml( XclExpXmlStream& rStrm ); TODO Fix XML Saving Stream */
++private:
++    /** Writes the contents of the SHEETEXT record. */
++    virtual void        WriteBody( XclExpStream& rStrm );
++
++private:
++    const XclTabViewData&  mrTabViewData;             /// view settings data of current sheet.
++};
++
+ // View settings ==============================================================
+ 
+ /** Contains all view settings records for a single sheet. */
+@@ -156,6 +170,7 @@ private:
+     void                WriteScl( XclExpStream& rStrm ) const;
+     void                WritePane( XclExpStream& rStrm ) const;
+     void                WriteSelection( XclExpStream& rStrm, sal_uInt8 nPane ) const;
++    void                WriteTabBgColor( XclExpStream& rStrm ) const;
+ 
+ private:
+     XclTabViewData      maData;             /// All view settings for a sheet.
+diff --git sc/source/filter/inc/xiview.hxx sc/source/filter/inc/xiview.hxx
+index f0b393e..a54c67b 100644
+--- sc/source/filter/inc/xiview.hxx
++++ sc/source/filter/inc/xiview.hxx
+@@ -83,7 +83,8 @@ public:
+     void                ReadPane( XclImpStream& rStrm );
+     /** Reads a SELECTION record. */
+     void                ReadSelection( XclImpStream& rStrm );
+-
++    /** Reads a SHEETEXT record (Tab Color). */
++    void                ReadTabBgColor( XclImpStream& rStrm, XclImpPalette& rPal );
+     /** Sets the view settings at the current sheet or the extended sheet options object. */
+     void                Finalize();
+ 
+diff --git sc/source/filter/inc/xlview.hxx sc/source/filter/inc/xlview.hxx
+index 4a3798e..3070c28 100644
+--- sc/source/filter/inc/xlview.hxx
++++ sc/source/filter/inc/xlview.hxx
+@@ -89,6 +89,11 @@ const sal_uInt8 EXC_PANE_TOPLEFT            = 3;        /// Single, top, left, o
+ 
+ const sal_uInt16 EXC_ID_SCL                 = 0x00A0;
+ 
++// (0x0862) SHEETEXT ----------------------------------------------------------
++
++const sal_uInt16 EXC_ID_SHEETEXT            = 0x0862; 	/// header id for sheetext
++const sal_uInt8 EXC_SHEETEXT_TABCOLOR       = 0x7F; 	/// mask for tab color
++const sal_uInt16 EXC_COLOR_NOTABBG          = 0x7F;     /// Excel ignores Tab color when set to this value...
+ // Structs ====================================================================
+ 
+ /** Contains all view settings for the entire document. */
+@@ -149,6 +154,9 @@ struct XclTabViewData
+     bool                mbShowHeadings;     /// true = Show column/row headings.
+     bool                mbShowZeros;        /// true = Show zero value zells.
+     bool                mbShowOutline;      /// true = Show outlines.
++    Color               maTabBgColor;       /// Tab Color default = (COL_AUTO )
++    bool                IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO) ? TRUE : FALSE; };
++    sal_uInt32          mnTabBgColorId;         /// pallette color id
+ 
+     explicit            XclTabViewData();
+                         ~XclTabViewData();
+diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx
+index 7cf83db..c896365 100644
+--- sc/source/ui/attrdlg/scdlgfact.cxx
++++ sc/source/ui/attrdlg/scdlgfact.cxx
+@@ -65,6 +65,7 @@
+ #include "scendlg.hxx" //add for ScNewScenarioDlg
+ #include "shtabdlg.hxx" //add for ScShowTabDlg
+ #include "strindlg.hxx" //add for ScStringInputDlg
++#include "tabbgcolordlg.hxx"//add for ScTabBgColorDlg
+ #include "scuiimoptdlg.hxx" //add for ScImportOptionsDlg
+ #include "attrdlg.hxx" //add for ScAttrDlg
+ #include "hfedtdlg.hxx" //add for ScHFEditDlg
+@@ -115,6 +116,7 @@ IMPL_ABSTDLG_BASE(AbstractScDPShowDetailDlg_Impl); //add for ScDPShowDetailDlg
+ IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl); //add for ScNewScenarioDlg
+ IMPL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl); //add for ScShowTabDlg
+ IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl); //add for ScStringInputDlg
++IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl); //add for ScTabBgColorDlg
+ IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl); //add for ScImportOptionsDlg
+ IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
+ IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
+@@ -616,6 +618,14 @@ void AbstractScStringInputDlg_Impl::GetInputString( String& rString ) const  //a
+ }
+ //add for AbstractScStringInputDlg_Impl end
+ 
++//add for AbstractScTabBgColorDlg_Impl begin
++void AbstractScTabBgColorDlg_Impl::GetSelectedColor( Color& rColor ) const  //add for ScTabBgColorDlg
++{
++    pDlg->GetSelectedColor( rColor );
++}
++//add for AbstractScTabBgColorDlg_Impl end
++
++
+ //add for AbstractScImportOptionsDlg_Impl begin
+ void AbstractScImportOptionsDlg_Impl::GetImportOptions( ScImportOptions& rOptions ) const  //add for ScImportOptionsDlg
+ {
+@@ -1291,6 +1301,31 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window
+ }
+  //add for ScStringInputDlg end
+ 
++//add for ScTabBgColorDlg begin
++AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg (
++                                                            Window* pParent,
++                                                            const String& rTitle,
++                                                            const String& rTabBgColorNoColorText,
++                                                            const Color& rDefaultColor,
++                                                            ULONG nHelpId ,
++                                                            int nId )
++{
++ScTabBgColorDlg * pDlg=NULL;
++switch ( nId )
++{
++    case RID_SCDLG_TAB_BG_COLOR :
++        pDlg = new ScTabBgColorDlg( pParent, rTitle, rTabBgColorNoColorText, rDefaultColor, nHelpId );
++        break;
++    default:
++        break;
++}
++
++if ( pDlg )
++    return new AbstractScTabBgColorDlg_Impl( pDlg );
++return 0;
++}
++//add for ScTabBgColorDlg end
++
+ //add for ScImportOptionsDlg begin
+ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* 				pParent,
+                                                                     int nId,
+diff --git sc/source/ui/attrdlg/scdlgfact.hxx sc/source/ui/attrdlg/scdlgfact.hxx
+index 6fef61d..059cc8e 100644
+--- sc/source/ui/attrdlg/scdlgfact.hxx
++++ sc/source/ui/attrdlg/scdlgfact.hxx
+@@ -61,6 +61,7 @@ class ScDPShowDetailDlg;
+ class ScNewScenarioDlg;
+ class ScShowTabDlg;
+ class ScStringInputDlg;
++class ScTabBgColorDlg;
+ class ScImportOptionsDlg;
+ class SfxTabDialog;
+ class ScSortWarningDlg;
+@@ -338,6 +339,12 @@ class AbstractScStringInputDlg_Impl :  public AbstractScStringInputDlg  //add fo
+     virtual void GetInputString( String& rString ) const;
+ };
+ 
++class AbstractScTabBgColorDlg_Impl :  public AbstractScTabBgColorDlg  //add for ScTabBgColorDlg
++{
++    DECL_ABSTDLG_BASE( AbstractScTabBgColorDlg_Impl, ScTabBgColorDlg )
++    virtual void GetSelectedColor( Color& rColor ) const;
++};
++
+ class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg  //add for ScImportOptionsDlg
+ {
+     DECL_ABSTDLG_BASE( AbstractScImportOptionsDlg_Impl, ScImportOptionsDlg)
+@@ -521,6 +528,14 @@ public:
+                                                                 const String& rDefault,
+                                                                 ULONG nHelpId ,
+                                                                 int nId );
++
++    virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg (  Window* pParent, //add for ScStringInputDlg
++                                                                const String& rTitle, //Dialog Title
++                                                                const String& rTabBgColorNoColorText, //Label for no tab color
++                                                                const Color& rDefaultColor, //Currently selected Color
++                                                                ULONG nHelpId ,
++                                                                int nId );
++
+     virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* 				pParent, //add for ScImportOptionsDlg
+                                                                     int nId,
+                                                                     BOOL                    bAscii = TRUE,
+diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
+index 9b8b4f7..0467a11 100644
+--- sc/source/ui/docshell/docfunc.cxx
++++ sc/source/ui/docshell/docfunc.cxx
+@@ -2855,6 +2855,104 @@ BOOL ScDocFunc::RenameTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL
+     return bSuccess;
+ }
+ 
++BOOL ScDocFunc::SetTabBgColor( SCTAB nTab, const Color& rColor, BOOL bRecord, BOOL bApi )
++{
++
++    ScDocument* pDoc = rDocShell.GetDocument();
++    if (bRecord && !pDoc->IsUndoEnabled())
++        bRecord = FALSE;
++    if ( !pDoc->IsDocEditable() || pDoc->IsTabProtected(nTab) )
++    {
++        if (!bApi)
++            rDocShell.ErrorMessage(STR_PROTECTIONERR); //TODO Check to see what this string is...
++        return FALSE;
++    }
++
++    ScViewData* pViewData = rDocShell.GetViewData();
++
++    Color aOldTabBgColor;
++    aOldTabBgColor = pViewData->GetTabBgColor(nTab);
++
++    BOOL bSuccess = FALSE;
++    pViewData->SetTabBgColor(rColor, nTab);
++    if ( pViewData->GetTabBgColor( nTab ) == rColor)
++        bSuccess = TRUE;
++    if (bSuccess)
++    {
++        if (bRecord)
++        {
++            rDocShell.GetUndoManager()->AddUndoAction(
++                new ScUndoSetTabBgColor( &rDocShell, nTab, aOldTabBgColor, rColor));
++        }
++        rDocShell.PostPaintExtras();
++        ScDocShellModificator aModificator( rDocShell );
++        aModificator.SetDocumentModified();
++        SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
++
++        bSuccess = TRUE;
++    }
++    return bSuccess;
++}
++
++BOOL ScDocFunc::SetTabBgColor( ScUndoSetTabBgColorInfoList* rUndoSetTabBgColorInfoList, BOOL bRecord, BOOL bApi )
++{
++    ScDocument* pDoc = rDocShell.GetDocument();
++    if (bRecord && !pDoc->IsUndoEnabled())
++        bRecord = FALSE;
++    if ( !pDoc->IsDocEditable() )
++    {
++        if (!bApi)
++            rDocShell.ErrorMessage(STR_PROTECTIONERR); //TODO Get a better String Error...
++        return FALSE;
++    }
++
++    ScViewData* pViewData = rDocShell.GetViewData();
++    USHORT nTab;
++    Color aNewTabBgColor;
++    ScUndoSetTabBgColorInfo* rUndoSetTabBgColorInfo;
++    BOOL bSuccess = TRUE;
++    USHORT nTabProtectCount = 0;
++    for ( USHORT i=0; i < rUndoSetTabBgColorInfoList->Count(); i++ )
++    {
++        rUndoSetTabBgColorInfo = rUndoSetTabBgColorInfoList->GetObject(i);
++        nTab = rUndoSetTabBgColorInfo->nTabId;
++        if ( !pDoc->IsTabProtected(nTab) )
++        {
++            aNewTabBgColor = rUndoSetTabBgColorInfo->aNewTabBgColor;
++            rUndoSetTabBgColorInfo->aOldTabBgColor = pViewData->GetTabBgColor(nTab);
++            pViewData->SetTabBgColor(aNewTabBgColor, nTab);
++            if ( pViewData->GetTabBgColor( nTab ) != aNewTabBgColor)
++            {
++                bSuccess = FALSE;
++                break;
++            }
++        }
++        else
++        {
++            nTabProtectCount++;
++        }
++    }
++    if ( nTabProtectCount == rUndoSetTabBgColorInfoList->Count() )
++    {
++        if (!bApi)
++            rDocShell.ErrorMessage(STR_PROTECTIONERR); //TODO Get a better String Error...
++        return FALSE;
++    }
++    if (bSuccess)
++    {
++        if (bRecord)
++        {
++            rDocShell.GetUndoManager()->AddUndoAction(
++                new ScUndoSetTabBgColor( &rDocShell, rUndoSetTabBgColorInfoList));
++        }
++        rDocShell.PostPaintExtras();
++        ScDocShellModificator aModificator( rDocShell );
++        aModificator.SetDocumentModified();
++        SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
++    }
++    return bSuccess;
++}
++
+ //------------------------------------------------------------------------
+ 
+ //!	SetWidthOrHeight - noch doppelt zu ViewFunc !!!!!!
+diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx
+index b02cf98..49a242a 100644
+--- sc/source/ui/inc/docfunc.hxx
++++ sc/source/ui/inc/docfunc.hxx
+@@ -34,6 +34,7 @@
+ #include <tools/link.hxx>
+ #include "global.hxx"
+ #include "formula/grammar.hxx"
++#include "tabbgcolor.hxx"
+ 
+ class ScEditEngineDefaulter;
+ class SdrUndoAction;
+@@ -120,6 +121,10 @@ public:
+     BOOL			RenameTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi );
+     BOOL			DeleteTable( SCTAB nTab, BOOL bRecord, BOOL bApi );
+ 
++    BOOL            SetTabBgColor( SCTAB nTab, const Color& rColor, BOOL bRecord, BOOL bApi );
++    BOOL            SetTabBgColor( ScUndoSetTabBgColorInfoList* rUndoSetTabBgColorInfoList,
++                                    BOOL bRecord, BOOL bApi );
++
+     BOOL			SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi );
+ 
+     BOOL			SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL bApi );
+diff --git sc/source/ui/inc/miscdlgs.hrc sc/source/ui/inc/miscdlgs.hrc
+index 154d310..97cd0ca 100644
+--- sc/source/ui/inc/miscdlgs.hrc
++++ sc/source/ui/inc/miscdlgs.hrc
+@@ -184,3 +184,9 @@
+ #define BTN_GROUP_ROWS	3
+ #define STR_GROUP		1
+ #define STR_UNGROUP		2
++
++// Tab Bg Color
++#define TAB_BG_COLOR_CT_BORDER 1
++#define TAB_BG_COLOR_SET_BGDCOLOR 2
++#define TAB_BG_COLOR_GB_BGDCOLOR 3
++
+diff --git sc/source/ui/inc/tabbgcolordlg.hxx sc/source/ui/inc/tabbgcolordlg.hxx
+new file mode 100644
+index 0000000..235a06e
+--- /dev/null
++++ sc/source/ui/inc/tabbgcolordlg.hxx
+@@ -0,0 +1,80 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: tabbgcolordlg.hxx,v $
++ * $Revision: 1.0 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_TABBGCOLORDLG_HXX
++#define SC_TABBGCOLORDLG_HXX
++
++#include <vcl/dialog.hxx>
++#include <vcl/fixed.hxx>
++#include <vcl/imagebtn.hxx>
++#include <svtools/valueset.hxx>
++
++//------------------------------------------------------------------------
++
++class ScTabBgColorDlg : public ModalDialog
++{
++public:
++        ScTabBgColorDlg(    Window* pParent,
++                            const String& rTitle,
++                            const String& rTabBgColorNoColorText,
++                            const Color& rDefaultColor,
++                            ULONG nHelpId );
++        ~ScTabBgColorDlg();
++
++        void GetSelectedColor( Color& rColor ) const;
++        //void SelectColor( const Color& rColor2 ) const;
++private:
++    class ScTabBgColorValueSet : public ValueSet
++    {
++
++    public:
++            ScTabBgColorValueSet(Control* pParent, const ResId& rResId, ScTabBgColorDlg* pTabBgColorDlg);
++
++            virtual void KeyInput( const KeyEvent& rKEvt );
++    private:
++        ScTabBgColorDlg* aTabBgColorDlg;
++    };
++        Control                 aBorderWin;
++        ScTabBgColorValueSet    aTabBgColorSet;
++        FixedLine               aTabBgColorBox;
++        OKButton                aBtnOk;
++        CancelButton            aBtnCancel;
++        HelpButton              aBtnHelp;
++        Color                   aTabBgColor;
++        const String            aTabBgColorNoColorText;
++        ULONG                   aHelpId;
++
++        void            FillColorValueSets_Impl();
++
++        DECL_LINK( TabBgColorDblClickHdl_Impl, ValueSet* );
++        DECL_LINK( TabBgColorOKHdl_Impl, OKButton* pBtn );
++};
++
++#endif // SC_TABBGCOLORDLG_HXX
+diff --git sc/source/ui/inc/undotab.hxx sc/source/ui/inc/undotab.hxx
+index 7f18fdb..a0e954b 100644
+--- sc/source/ui/inc/undotab.hxx
++++ sc/source/ui/inc/undotab.hxx
+@@ -35,6 +35,7 @@
+ #include "markdata.hxx"
+ #include "formula/grammar.hxx"
+ #include <tools/color.hxx>
++#include "tabbgcolor.hxx"
+ 
+ #ifndef _SVSTDARR_SHORTS
+ 
+@@ -226,6 +227,37 @@ private:
+     void DoChange() const;
+ };
+ 
++class ScUndoSetTabBgColor: public ScSimpleUndo
++{
++public:
++                    TYPEINFO();
++                    ScUndoSetTabBgColor(
++                            ScDocShell* pNewDocShell,
++                            SCTAB nT,
++                            const Color& aOTabBgColor,
++                            const Color& aNTabBgColor);
++                    ScUndoSetTabBgColor(
++                            ScDocShell* pNewDocShell,
++                            ScUndoSetTabBgColorInfoList* pUndoSetTabBgColorInfoList);
++    virtual         ~ScUndoSetTabBgColor();
++
++    virtual void    Undo();
++    virtual void    Redo();
++    virtual void    Repeat(SfxRepeatTarget& rTarget);
++    virtual BOOL    CanRepeat(SfxRepeatTarget& rTarget) const;
++
++virtual String	GetComment() const;
++
++private:
++    SCTAB   nTab;
++    Color   aOldTabBgColor;
++    Color   aNewTabBgColor;
++    ScUndoSetTabBgColorInfoList* aUndoSetTabBgColorInfoList;
++    BOOL    bIsMultipleUndo;
++
++    void DoChange( SCTAB nTab, const Color& rTabBgColor ) const;
++    void DoChange( BOOL bUndoType ) const;
++};
+ 
+ class ScUndoMakeScenario: public ScSimpleUndo
+ {
+diff --git sc/source/ui/inc/viewdata.hxx sc/source/ui/inc/viewdata.hxx
+index 024eac3..72fa6e5 100644
+--- sc/source/ui/inc/viewdata.hxx
++++ sc/source/ui/inc/viewdata.hxx
+@@ -144,6 +144,9 @@ private:
+ 
+     BOOL			bOldCurValid;				// "virtuelle" Cursorpos. bei zusammengefassten
+ 
++    Color           aTabBgColor;
++    BOOL            IsDefaultTabBgColor() const {return aTabBgColor == Color( COL_AUTO ) ? TRUE : FALSE ;};
++
+                     ScViewDataTable();
+                     ~ScViewDataTable();
+ 
+@@ -276,6 +279,10 @@ public:
+     void			CopyTab( SCTAB nSrcTab, SCTAB nDestTab );
+     void			MoveTab( SCTAB nSrcTab, SCTAB nDestTab );
+ 
++    void            SetTabBgColor( Color rTabBgColor, SCTAB nTab );
++    BOOL            IsDefaultTabBgColor( SCTAB nTab ) const;
++    Color           GetTabBgColor( SCTAB nTab ) const;
++
+     SCTAB			GetRefTabNo() const 					{ return nRefTabNo; }
+     void			SetRefTabNo( SCTAB nNewTab )			{ nRefTabNo = nNewTab; }
+ 
+diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
+index 3d703da..8e41aea 100644
+--- sc/source/ui/inc/viewfunc.hxx
++++ sc/source/ui/inc/viewfunc.hxx
+@@ -32,6 +32,8 @@
+ 
+ #include "tabview.hxx"
+ 
++#include "tabbgcolor.hxx"
++
+ #ifndef _SVSTDARR_SHORTS
+ #define _SVSTDARR_SHORTS
+ #include <svtools/svstdarr.hxx>
+@@ -276,6 +278,9 @@ public:
+                                     SCTAB nCount, const SCTAB* pSrcTabs,
+                                     BOOL bLink,SCTAB nTab);
+ 
++    BOOL            SetTabBgColor( const Color& rColor, SCTAB nTabNr );
++    BOOL            SetTabBgColor( ScUndoSetTabBgColorInfoList* rUndoSetTabBgColorInfoList );
++
+     void			InsertTableLink( const String& rFile,
+                                         const String& rFilter, const String& rOptions,
+                                         const String& rTabName );
+diff --git sc/source/ui/miscdlgs/makefile.mk sc/source/ui/miscdlgs/makefile.mk
+index 66e1f33..a1ad212 100644
+--- sc/source/ui/miscdlgs/makefile.mk
++++ sc/source/ui/miscdlgs/makefile.mk
+@@ -50,6 +50,7 @@ SLOFILES =  \
+     $(SLO)$/delcodlg.obj		\
+     $(SLO)$/inscodlg.obj		\
+     $(SLO)$/strindlg.obj		\
++    $(SLO)$/tabbgcolordlg.obj   \
+     $(SLO)$/mtrindlg.obj		\
+     $(SLO)$/lbseldlg.obj		\
+     $(SLO)$/filldlg.obj			\
+diff --git sc/source/ui/miscdlgs/tabbgcolordlg.cxx sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+new file mode 100644
+index 0000000..8e9987e
+--- /dev/null
++++ sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+@@ -0,0 +1,197 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: tabbgcolordlg.cxx,v $
++ * $Revision: 1.0 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_sc.hxx"
++
++#undef SC_DLLIMPLEMENTATION
++
++//------------------------------------------------------------------
++
++#include <tools/debug.hxx>
++#include <tools/color.hxx>
++#include <sfx2/objsh.hxx>
++#include <svx/xtable.hxx>
++#include <svx/drawitem.hxx>
++#include <svtools/pathoptions.hxx>
++#include <tools/resid.hxx>
++#include "tabbgcolordlg.hxx"
++#include "scresid.hxx"
++#include "miscdlgs.hrc"
++#include <svx/svxitems.hrc>
++
++//==================================================================
++
++#define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl)
++
++__EXPORT ScTabBgColorDlg::ScTabBgColorDlg( Window*         pParent,
++                                    const String&   rTitle,
++                                    const String&   rTabBgColorNoColorText,
++                                    const Color&    rDefaultColor,
++                                    ULONG nHelpId ) :
++    ModalDialog    ( pParent, ScResId( RID_SCDLG_TAB_BG_COLOR ) ),
++    aBorderWin              ( this, ScResId( TAB_BG_COLOR_CT_BORDER ) ),
++    aTabBgColorSet          ( &aBorderWin, ScResId( TAB_BG_COLOR_SET_BGDCOLOR ), this ),
++    aTabBgColorBox          ( this, ScResId( TAB_BG_COLOR_GB_BGDCOLOR ) ),
++    aBtnOk                  ( this, ScResId( BTN_OK ) ),
++    aBtnCancel              ( this, ScResId( BTN_CANCEL ) ),
++    aBtnHelp                ( this, ScResId( BTN_HELP ) ),
++    aTabBgColorNoColorText  ( rTabBgColorNoColorText ),
++    aTabBgColor             ( rDefaultColor ),
++    aHelpId                 ( nHelpId )
++
++{
++    SetHelpId( nHelpId );
++    this->SetText( rTitle );
++    this->SetStyle(GetStyle() | WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL | WB_SYSTEMWINDOW | WB_STANDALONE | WB_HIDE);
++    //TODO: Assign Help ID's to all controls...
++    aTabBgColorBox.SetText(rTitle);
++    FillColorValueSets_Impl();
++    aTabBgColorSet.SetDoubleClickHdl( HDL(TabBgColorDblClickHdl_Impl) );
++    aBtnOk.SetClickHdl( HDL(TabBgColorOKHdl_Impl) );
++    FreeResource();
++}
++
++//------------------------------------------------------------------------
++
++void ScTabBgColorDlg::GetSelectedColor( Color& rColor ) const
++{
++    rColor = this->aTabBgColor;
++}
++
++__EXPORT ScTabBgColorDlg::~ScTabBgColorDlg()
++{
++}
++
++void ScTabBgColorDlg::FillColorValueSets_Impl()
++{
++    SfxObjectShell* pDocSh = SfxObjectShell::Current();
++    const SfxPoolItem* pItem = NULL;
++    XColorTable* pColorTable = NULL;
++    const Size aSize15x15 = Size( 15, 15 );
++    const Size aSize10x10 = Size( 10, 10 );
++    const Size aSize5x5 = Size( 5, 5 );
++    USHORT nSelectedItem = 0;
++    FASTBOOL bOwn = FALSE;
++
++    DBG_ASSERT( pDocSh, "DocShell not found!" );
++
++    if ( pDocSh && ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) )
++        pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable();
++    if ( !pColorTable )
++    {
++        bOwn = TRUE;
++        pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
++    }
++    if ( pColorTable )
++    {
++        short i = 0;
++        long nCount = pColorTable->Count();
++        XColorEntry* pEntry = NULL;
++        Color aColWhite( COL_WHITE );
++        String aStrWhite( ScResId( RID_SVXITEMS_COLOR_WHITE ) );
++        WinBits nBits = ( aTabBgColorSet.GetStyle() | WB_NAMEFIELD | WB_ITEMBORDER | WB_NONEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT | WB_NOPOINTERFOCUS);
++        aTabBgColorSet.SetText( aTabBgColorNoColorText );
++        aTabBgColorSet.SetStyle( nBits );
++        for ( i = 0; i < nCount; i++ )
++        {
++            pEntry = pColorTable->GetColor(i);
++            aTabBgColorSet.InsertItem( i + 1, pEntry->GetColor(), pEntry->GetName() );
++            if (pEntry->GetColor() == aTabBgColor)
++                nSelectedItem = (i + 1);
++        }
++
++        while ( i < 80 )
++        {
++            aTabBgColorSet.InsertItem( i + 1, aColWhite, aStrWhite );
++            i++;
++        }
++
++        if ( nCount > 80 )
++        {
++            aTabBgColorSet.SetStyle( nBits | WB_VSCROLL );
++        }
++    }
++    aTabBgColorSet.SetColCount( 10 );
++    aTabBgColorSet.SetLineCount( 10 );
++    aTabBgColorSet.CalcWindowSizePixel( aSize15x15 );
++    aTabBgColorSet.Format();
++    aTabBgColorSet.SelectItem(nSelectedItem);
++    aTabBgColorSet.Resize();
++    if ( bOwn )
++        delete pColorTable;
++}
++
++IMPL_LINK( ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, EMPTYARG )
++/*
++    Handler, called when color selection is changed
++*/
++{
++    USHORT nItemId = aTabBgColorSet.GetSelectItemId();
++    Color aColor = nItemId ? ( aTabBgColorSet.GetItemColor( nItemId ) ) : Color( COL_AUTO );
++    aTabBgColor = aColor;
++    EndDialog( TRUE );
++    return 0;
++}
++
++IMPL_LINK( ScTabBgColorDlg, TabBgColorOKHdl_Impl, OKButton*, EMPTYARG )
++{
++
++//    Handler, called when the OK button is pushed
++
++    USHORT nItemId = aTabBgColorSet.GetSelectItemId();
++    Color aColor = nItemId ? ( aTabBgColorSet.GetItemColor( nItemId ) ) : Color( COL_AUTO );
++    aTabBgColor = aColor;
++    EndDialog( TRUE );
++    return 0;
++}
++
++__EXPORT ScTabBgColorDlg::ScTabBgColorValueSet::ScTabBgColorValueSet( Control* pParent, const ResId& rResId, ScTabBgColorDlg* pTabBgColorDlg ) :
++    ValueSet(pParent, rResId)
++{
++    aTabBgColorDlg = pTabBgColorDlg;
++}
++
++void ScTabBgColorDlg::ScTabBgColorValueSet::KeyInput( const KeyEvent& rKEvt )
++{
++    switch ( rKEvt.GetKeyCode().GetCode() )
++    {
++        case KEY_SPACE:
++        case KEY_RETURN:
++        {
++            USHORT nItemId = GetSelectItemId();
++            const Color& aColor = nItemId ? ( GetItemColor( nItemId ) ) : Color( COL_AUTO );
++            aTabBgColorDlg->aTabBgColor = aColor;
++            aTabBgColorDlg->EndDialog(TRUE);
++        }
++        break;
++    }
++    ValueSet::KeyInput(rKEvt);
++}
+diff --git sc/source/ui/src/globstr.src sc/source/ui/src/globstr.src
+index c5b8cfd..2ae00ca 100644
+--- sc/source/ui/src/globstr.src
++++ sc/source/ui/src/globstr.src
+@@ -1130,6 +1130,14 @@ Resource RID_GLOBSTR
+     {
+         Text [ en-US ] = "Rename Sheet" ;
+     };
++    String STR_UNDO_SET_TAB_BG_COLOR
++    {
++        Text [ en-US ] = "Color Tab" ;
++    };
++    String STR_UNDO_SET_MULTI_TAB_BG_COLOR
++    {
++        Text [ en-US ] = "Color Tabs" ;
++    };
+     String STR_UNDO_MOVE_TAB
+     {
+         Text [ en-US ] = "Move Sheets" ;
+diff --git sc/source/ui/src/miscdlgs.src sc/source/ui/src/miscdlgs.src
+index da8cb03..ef2a8ac 100644
+--- sc/source/ui/src/miscdlgs.src
++++ sc/source/ui/src/miscdlgs.src
+@@ -546,6 +546,96 @@ ModalDialog RID_SCDLG_STRINPUT
+         Size = MAP_APPFONT ( 110 , 8 ) ;
+     };
+ };
++ModalDialog RID_SCDLG_TAB_BG_COLOR
++{
++    OutputSize = TRUE ;
++    SVLook = TRUE ;
++    Size = MAP_APPFONT ( 118 , 167 ) ;
++    Moveable = TRUE ;
++    Closeable = TRUE ;
++    Control TAB_BG_COLOR_CT_BORDER
++    {
++        Border = TRUE ;
++        Pos = MAP_APPFONT ( 1 , 1 ) ; //12, 32
++        Size = MAP_APPFONT ( 116+2 , 145+2 ) ;
++        DialogControl = TRUE;
++    };
++    Control TAB_BG_COLOR_SET_BGDCOLOR
++    {
++        // * HelpId = HID_BACKGROUND_CTL_BGDCOLORSET ;
++        Hide = FALSE ;
++        Pos = MAP_APPFONT ( 0 , 0 ) ;
++        Size = MAP_APPFONT ( 116 , 145 ) ;
++        TabStop = TRUE ;
++    };
++    CancelButton BTN_CANCEL
++    {
++        Pos = MAP_APPFONT ( 82 , 151 ) ;
++        Size = MAP_APPFONT ( 35 , 14 ) ;
++        TabStop = TRUE ;
++        DefButton = FALSE ;
++    };
++    OKButton BTN_OK
++    {
++        Pos = MAP_APPFONT ( 45 , 151 ) ;
++        Size = MAP_APPFONT ( 35 , 14 ) ;
++        TabStop = TRUE ;
++        DefButton = TRUE ;
++    };
++    HelpButton BTN_HELP
++    {
++        Pos = MAP_APPFONT ( 2 , 151 ) ;
++        Size = MAP_APPFONT ( 35 , 14 ) ;
++        TabStop = TRUE ;
++        DefButton = FALSE ;
++    };
++};
++/*
++ModalDialog RID_SCDLG_TAB_BG_COLOR
++{
++    OutputSize = TRUE ;
++    SVLook = TRUE ;
++    Size = MAP_APPFONT ( 180 , 150 ) ;
++    Moveable = TRUE ;
++    Closeable = TRUE ;
++    Control TAB_BG_COLOR_CT_BORDER
++    {
++        Border = TRUE ;
++        Pos = MAP_APPFONT ( 1 , 1 ) ; //12, 32
++        Size = MAP_APPFONT ( 116+2 , 145+2 ) ;
++        DialogControl = TRUE;
++    };
++    Control TAB_BG_COLOR_SET_BGDCOLOR
++    {
++        // * HelpId = HID_BACKGROUND_CTL_BGDCOLORSET ;
++        Hide = FALSE ;
++        Pos = MAP_APPFONT ( 0 , 0 ) ;
++        Size = MAP_APPFONT ( 116 , 145 ) ;
++        TabStop = TRUE ;
++    };
++    OKButton BTN_OK
++    {
++        Pos = MAP_APPFONT ( 125 , 50 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
++        TabStop = TRUE ;
++        DefButton = TRUE ;
++    };
++    CancelButton BTN_CANCEL
++    {
++        Pos = MAP_APPFONT ( 125 , 67 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
++        TabStop = TRUE ;
++        DefButton = FALSE ;
++    };
++    HelpButton BTN_HELP
++    {
++        Pos = MAP_APPFONT ( 125 , 84 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
++        TabStop = TRUE ;
++        DefButton = FALSE ;
++    };
++};
++*/
+ /*
+ ModalDialog RID_SCDLG_MTRINPUT
+ {
+diff --git sc/source/ui/src/popup.src sc/source/ui/src/popup.src
+index 05d10b9..5f19299 100644
+--- sc/source/ui/src/popup.src
++++ sc/source/ui/src/popup.src
+@@ -193,6 +193,15 @@ Menu RID_POPUP_TAB
+             HelpId = FID_TAB_RTL ;
+             Text [ en-US ] = "S~heet Right-To-Left" ;
+         };
++        //------------------------------
++        MenuItem { Separator = TRUE ; };
++        //------------------------------
++        MenuItem
++        {
++            Identifier = FID_TAB_MENU_SET_TAB_BG_COLOR ;
++            HelpId = FID_TAB_MENU_SET_TAB_BG_COLOR ;
++            Text [ en-US ] = "~Tab Color..." ;
++        };
+     };
+ };
+ 
+diff --git sc/source/ui/src/scstring.src sc/source/ui/src/scstring.src
+index c50a304..6fb17a3 100644
+--- sc/source/ui/src/scstring.src
++++ sc/source/ui/src/scstring.src
+@@ -283,6 +283,14 @@ String SCSTR_RENAMETAB
+ {
+     Text [ en-US ] = "Rename Sheet" ;
+ };
++String SCSTR_SET_TAB_BG_COLOR
++{
++    Text [ en-US ] = "Tab Color" ;
++};
++String SCSTR_NO_TAB_BG_COLOR
++{
++    Text [ en-US ] = "Default" ;
++};
+ String SCSTR_RENAMEOBJECT
+ {
+     Text [ en-US ] = "Name Object";
+diff --git sc/source/ui/undo/undotab.cxx sc/source/ui/undo/undotab.cxx
+index 5650376..0e56405 100644
+--- sc/source/ui/undo/undotab.cxx
++++ sc/source/ui/undo/undotab.cxx
+@@ -70,6 +70,9 @@
+ #include "drwlayer.hxx"
+ #include "scresid.hxx"
+ 
++// for set tab bg color
++#include "viewdata.hxx"
++
+ extern BOOL bDrawIsInUndo;			//! irgendwo als Member !!!
+ 
+ using namespace com::sun::star;
+@@ -93,6 +96,7 @@ TYPEINIT1(ScUndoScenarioFlags,	SfxUndoAction);
+ TYPEINIT1(ScUndoRenameObject,	SfxUndoAction);
+ TYPEINIT1(ScUndoLayoutRTL,		SfxUndoAction);
+ //UNUSED2009-05 TYPEINIT1(ScUndoSetGrammar,		SfxUndoAction);
++TYPEINIT1(ScUndoSetTabBgColor,  SfxUndoAction);
+ 
+ 
+ // -----------------------------------------------------------------------
+@@ -779,6 +783,113 @@ BOOL ScUndoCopyTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+     return FALSE;
+ }
+ 
++//---------------------------------------------------------------------------------
++//
++//      Tab Bg Color
++//
++
++ScUndoSetTabBgColor::ScUndoSetTabBgColor( ScDocShell* pNewDocShell,
++                                        SCTAB nT,
++                                        const Color& aOTabBgColor,
++                                        const Color& aNTabBgColor) :
++    ScSimpleUndo( pNewDocShell ),
++    nTab 	 ( nT ),
++    bIsMultipleUndo ( FALSE ),
++    aUndoSetTabBgColorInfoList ( NULL )
++{
++    aOldTabBgColor = aOTabBgColor;
++    aNewTabBgColor = aNTabBgColor;
++}
++
++ScUndoSetTabBgColor::ScUndoSetTabBgColor( ScDocShell* pNewDocShell,
++                                        ScUndoSetTabBgColorInfoList* pUndoSetTabBgColorInfoList) :
++    ScSimpleUndo( pNewDocShell ),
++    bIsMultipleUndo ( TRUE )
++{
++    aUndoSetTabBgColorInfoList = pUndoSetTabBgColorInfoList;
++}
++
++__EXPORT ScUndoSetTabBgColor::~ScUndoSetTabBgColor()
++{
++}
++
++String __EXPORT ScUndoSetTabBgColor::GetComment() const
++{
++    if (bIsMultipleUndo && aUndoSetTabBgColorInfoList && aUndoSetTabBgColorInfoList->Count() > 1)
++        return ScGlobal::GetRscString( STR_UNDO_SET_MULTI_TAB_BG_COLOR );
++    return ScGlobal::GetRscString( STR_UNDO_SET_TAB_BG_COLOR );
++}
++
++void ScUndoSetTabBgColor::DoChange( SCTAB nTabP, const Color& rTabBgColor ) const
++{
++    if (bIsMultipleUndo)
++        return;
++    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
++    if (pViewShell)
++    {
++        ScViewData* pViewData = pViewShell->GetViewData();
++        if (pViewData)
++        {
++            pViewData->SetTabBgColor( rTabBgColor, nTabP );
++            pDocShell->PostPaintExtras();
++            pDocShell->PostDataChanged();
++            SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
++            pViewShell->UpdateInputHandler();
++        }
++    }
++}
++
++void ScUndoSetTabBgColor::DoChange(BOOL bUndoType) const
++{
++    if (!bIsMultipleUndo)
++        return;
++    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
++    if (pViewShell)
++    {
++        ScViewData* pViewData = pViewShell->GetViewData();
++        if (pViewData)
++        {
++            ScUndoSetTabBgColorInfo* aUndoSetTabBgColorInfo=NULL;
++            for (USHORT i=0; i < aUndoSetTabBgColorInfoList->Count(); i++)
++            {
++                aUndoSetTabBgColorInfo = aUndoSetTabBgColorInfoList->GetObject(i);
++                pViewData->SetTabBgColor( 
++                    bUndoType ? aUndoSetTabBgColorInfo->aOldTabBgColor : aUndoSetTabBgColorInfo->aNewTabBgColor,
++                    aUndoSetTabBgColorInfo->nTabId);
++            }
++            pDocShell->PostPaintExtras();
++            pDocShell->PostDataChanged();
++            SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
++            pViewShell->UpdateInputHandler();
++        }
++    }
++}
++
++void __EXPORT ScUndoSetTabBgColor::Undo()
++{
++    if ( bIsMultipleUndo )
++        DoChange(TRUE);
++    else
++        DoChange(nTab, aOldTabBgColor);
++}
++
++void __EXPORT ScUndoSetTabBgColor::Redo()
++{
++    if ( bIsMultipleUndo )
++        DoChange(FALSE);
++    else
++        DoChange(nTab, aNewTabBgColor);
++}
++
++void __EXPORT ScUndoSetTabBgColor::Repeat(SfxRepeatTarget& /* rTarget */)
++{
++	//	No Repeat
++}
++
++BOOL __EXPORT ScUndoSetTabBgColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const
++{
++    return FALSE;
++}
+ 
+ // -----------------------------------------------------------------------
+ //
+diff --git sc/source/ui/view/scextopt.cxx sc/source/ui/view/scextopt.cxx
+index 586f934..fd28d95 100644
+--- sc/source/ui/view/scextopt.cxx
++++ sc/source/ui/view/scextopt.cxx
+@@ -61,7 +61,8 @@ ScExtTabSettings::ScExtTabSettings() :
+     mnPageZoom( 0 ),
+     mbSelected( false ),
+     mbFrozenPanes( false ),
+-    mbPageMode( false )
++    mbPageMode( false ),
++    maTabBgColor( COL_AUTO)
+ {
+ }
+ 
+diff --git sc/source/ui/view/tabcont.cxx sc/source/ui/view/tabcont.cxx
+index 1040c10..ec447b1 100644
+--- sc/source/ui/view/tabcont.cxx
++++ sc/source/ui/view/tabcont.cxx
+@@ -69,6 +69,7 @@ ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) :
+     ScDocument* pDoc = pViewData->GetDocument();
+ 
+     String aString;
++    Color aTabBgColor;
+     SCTAB nCount = pDoc->GetTableCount();
+     for (SCTAB i=0; i<nCount; i++)
+     {
+@@ -80,6 +81,12 @@ ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) :
+                     InsertPage( static_cast<sal_uInt16>(i)+1, aString, TPB_SPECIAL );
+                 else
+                     InsertPage( static_cast<sal_uInt16>(i)+1, aString );
++                if ( !pViewData->IsDefaultTabBgColor(i) )
++                {
++                    aTabBgColor = pViewData->GetTabBgColor(i);
++                    /*SetTabBgColor(static_cast<sal_uInt16>(i)+1, aTabBgColor, pViewData->IsDefaultTabBgColor(i) );*/
++                    SetTabBgColor( static_cast<sal_uInt16>(i)+1, aTabBgColor );
++                }
+             }
+         }
+     }
+@@ -265,6 +272,7 @@ void ScTabControl::Select()
+     rBind.Invalidate( FID_DELETE_TABLE );
+     rBind.Invalidate( FID_TABLE_SHOW );
+     rBind.Invalidate( FID_TABLE_HIDE );
++    rBind.Invalidate( FID_TAB_SET_TAB_BG_COLOR );
+ 
+         //	SetReference nur wenn der Konsolidieren-Dialog offen ist
+         //	(fuer Referenzen ueber mehrere Tabellen)
+@@ -291,16 +299,22 @@ void ScTabControl::UpdateStatus()
+     SCTAB i;
+     String aString;
+     SCTAB nMaxCnt = Max( nCount, static_cast<SCTAB>(GetMaxId()) );
++    Color aTabBgColor;
+ 
+     BOOL bModified = FALSE;										// Tabellen-Namen
+     for (i=0; i<nMaxCnt && !bModified; i++)
+     {
+         if (pDoc->IsVisible(i))
++        {
+             pDoc->GetName(i,aString);
++            aTabBgColor = pViewData->GetTabBgColor(i);
++        }
+         else
++        {
+             aString.Erase();
++        }
+ 
+-        if (GetPageText(static_cast<sal_uInt16>(i)+1) != aString)
++        if ( (GetPageText(static_cast<sal_uInt16>(i)+1) != aString) || (GetTabBgColor(static_cast<sal_uInt16>(i)+1) != aTabBgColor) )
+             bModified = TRUE;
+     }
+ 
+@@ -317,6 +331,11 @@ void ScTabControl::UpdateStatus()
+                         InsertPage( static_cast<sal_uInt16>(i)+1, aString, TPB_SPECIAL );
+                     else
+                         InsertPage( static_cast<sal_uInt16>(i)+1, aString );
++                    if ( !pViewData->IsDefaultTabBgColor(i) )
++                    {
++                        aTabBgColor = pViewData->GetTabBgColor(i);
++                        SetTabBgColor( static_cast<sal_uInt16>(i)+1, aTabBgColor );
++                    }
+                 }
+             }
+         }
+diff --git sc/source/ui/view/tabvwshf.cxx sc/source/ui/view/tabvwshf.cxx
+index ee49744..c65b62a 100644
+--- sc/source/ui/view/tabvwshf.cxx
++++ sc/source/ui/view/tabvwshf.cxx
+@@ -58,6 +58,10 @@
+ 
+ #include "scabstdlg.hxx" //CHINA001
+ 
++#include "tabbgcolor.hxx" //DBW
++#include "tabbgcolordlg.hxx" //DBW
++#include <svx/colritem.hxx> //DBW
++
+ #define IS_AVAILABLE(WhichId,ppItem) \
+     (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
+ 
+@@ -686,6 +690,120 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
+             }
+             break;
+ 
++        case FID_TAB_SET_TAB_BG_COLOR:
++        case FID_TAB_MENU_SET_TAB_BG_COLOR:
++            {
++                if ( nSlot == FID_TAB_MENU_SET_TAB_BG_COLOR )
++                    nSlot = FID_TAB_SET_TAB_BG_COLOR;
++
++                SCTAB nTabNr = pViewData->GetTabNo();
++                ScMarkData& rMark = pViewData->GetMarkData();
++                SCTAB nTabSelCount = rMark.GetSelectCount();
++
++                ScUndoSetTabBgColorInfo*     aTabBgColorUndoInfo=NULL;
++                ScUndoSetTabBgColorInfoList* aTabBgColorUndoInfoList =NULL;
++
++                if ( !pDoc->IsDocEditable() )
++                    break;
++
++                if ( pDoc->IsTabProtected( nTabNr ) ) // ||nTabSelCount > 1
++                    break;
++
++                if( pReqArgs != NULL )
++                {
++                    BOOL                bDone = FALSE;
++                    const SfxPoolItem*  pItem;
++                    Color               aColor;
++                    if( IS_AVAILABLE( FN_PARAM_1, &pItem ) )
++                        nTabNr = ((const SfxUInt16Item*)pItem)->GetValue();
++
++                    if( IS_AVAILABLE( nSlot, &pItem ) )
++                        aColor = ((const SvxColorItem*)pItem)->GetValue();
++
++                    if ( nTabSelCount > 1 )
++                    {
++                        aTabBgColorUndoInfoList = new ScUndoSetTabBgColorInfoList();
++                        for (SCTAB nTab=0; nTab<nTabCount; nTab++)
++                        {
++                            if ( rMark.GetTableSelect(nTab) && !pDoc->IsTabProtected(nTab) )
++                            {
++                                aTabBgColorUndoInfo = new ScUndoSetTabBgColorInfo();
++                                aTabBgColorUndoInfo->nTabId = nTab;
++                                aTabBgColorUndoInfo->aNewTabBgColor = aColor;
++                                aTabBgColorUndoInfoList->Insert(aTabBgColorUndoInfo);
++                            }
++                        }
++                        bDone = SetTabBgColor( aTabBgColorUndoInfoList );
++                    }
++                    else
++                    {
++                        bDone = SetTabBgColor( aColor, nCurrentTab ); //ScViewFunc.SetTabBgColor
++                    }
++                    if( bDone )
++                    {
++                        rReq.Done( *pReqArgs );
++                    }
++                }
++                else
++                {
++                    USHORT      nRet    = RET_OK; /// temp
++                    BOOL        bDone   = FALSE; /// temp
++                    Color       aTabBgColor;
++                    Color       aNewTabBgColor;
++
++                    aTabBgColor = pViewData->GetTabBgColor( nCurrentTab );
++                    ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
++                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
++                    AbstractScTabBgColorDlg* pDlg = pFact->CreateScTabBgColorDlg(
++                                                                GetDialogParent(),
++                                                                String(ScResId(SCSTR_SET_TAB_BG_COLOR)),
++                                                                String(ScResId(SCSTR_NO_TAB_BG_COLOR)),
++                                                                aTabBgColor,
++                                                                nSlot,RID_SCDLG_TAB_BG_COLOR);
++                    while ( !bDone && nRet == RET_OK )
++                    {
++                        nRet = pDlg->Execute();
++                        if( nRet == RET_OK )
++                        {
++                            Color aSelectedColor;
++                            pDlg->GetSelectedColor(aSelectedColor);
++                            aTabBgColorUndoInfoList = new ScUndoSetTabBgColorInfoList();
++                            if ( nTabSelCount > 1 )
++                            {
++                                for  (SCTAB nTab=0; nTab<nTabCount; nTab++)
++                                {
++                                    if ( rMark.GetTableSelect(nTab) && !pDoc->IsTabProtected(nTab) )
++                                    {
++                                        aTabBgColorUndoInfo = new ScUndoSetTabBgColorInfo();
++                                        aTabBgColorUndoInfo->nTabId = nTab;
++                                        aTabBgColorUndoInfo->aNewTabBgColor = aSelectedColor;
++                                        aTabBgColorUndoInfoList->Insert(aTabBgColorUndoInfo);
++                                    }
++                                }
++                                bDone = SetTabBgColor( aTabBgColorUndoInfoList );
++                            }
++                            else
++                            {
++                                bDone = SetTabBgColor( aSelectedColor, nCurrentTab ); //ScViewFunc.SetTabBgColor
++                            }
++                            if ( bDone )
++                            {
++                                rReq.AppendItem( SvxColorItem( aTabBgColor, nSlot ) );
++                                rReq.Done();
++                            }
++                            else
++                            {
++                                if( rReq.IsAPI() )
++                                {
++                                    StarBASIC::Error( SbERR_SETPROP_FAILED );
++                                }
++                            }
++                        }
++                    }
++                    delete( pDlg );
++                }
++            }
++            break;
+         default:
+             DBG_ERROR("Unbekannte Message bei ViewShell");
+             break;
+@@ -804,6 +922,23 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
+                         rSet.Put( SfxBoolItem( nWhich, pDoc->IsLayoutRTL( nTab ) ) );
+                 }
+                 break;
++
++            case FID_TAB_MENU_SET_TAB_BG_COLOR:
++                {
++                    if ( !pDoc->IsDocEditable()
++                        || ( pDocShell && pDocShell->IsDocShared() )
++                        || pDoc->IsTabProtected(nTab) )
++                        rSet.DisableItem( nWhich );
++                }
++                break;
++
++            case FID_TAB_SET_TAB_BG_COLOR:
++                {
++                    Color aColor;
++                    aColor = pViewData->GetTabBgColor( nTab );
++                    rSet.Put( SvxColorItem( aColor, nWhich ) );
++                }
++                break;
+         }
+         nWhich = aIter.NextWhich();
+     }
+diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
+index fbb1306..d10a48d 100644
+--- sc/source/ui/view/viewdata.cxx
++++ sc/source/ui/view/viewdata.cxx
+@@ -104,7 +104,8 @@ ScViewDataTable::ScViewDataTable() :
+                 nFixPosY( 0 ),
+                 nCurX( 0 ),
+                 nCurY( 0 ),
+-                bOldCurValid( FALSE )
++                bOldCurValid( FALSE ),
++                aTabBgColor( Color(COL_AUTO) )
+ {
+     nPosX[0]=nPosX[1]=0;
+     nPosY[0]=nPosY[1]=0;
+@@ -164,6 +165,11 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>
+         pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE));
+         pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue;
+ 
++        if ( !IsDefaultTabBgColor() )
++        {
++            pSettings[SC_TABLE_TAB_BG_COLOR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_TABCOLOR));
++            pSettings[SC_TABLE_TAB_BG_COLOR].Value <<= static_cast<sal_Int32>(aTabBgColor.GetColor());
++        }
+ //        pSettings[SC_TABLE_SELECTED].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_TABLESELECTED));
+ //        pSettings[SC_TABLE_SELECTED].Value <<= bool(rViewData.GetMarkData().GetTableSelect( nTab ));
+     }
+@@ -276,6 +282,13 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV
+             aSettings[i].Value >>= bSelected;
+             rViewData.GetMarkData().SelectTable( nTab, bSelected );
+         }
++        else if (sName.compareToAscii(SC_UNO_TABCOLOR) == 0)
++        {
++            sal_Int32 nColor = COL_AUTO;
++            aSettings[i].Value >>= nColor;
++            if (nColor != COL_AUTO)
++                aTabBgColor.SetColor(static_cast<ColorData>(nColor));
++        }
+     }
+     if (eHSplitMode == SC_SPLIT_FIX)
+         nFixPosX = SanitizeCol( static_cast<SCCOL>( bHasHSplitInTwips ? nTempPosHTw : nTempPosH ));
+@@ -579,6 +592,36 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
+     aMarkData.InsertTab( nInsTab );			// ggf. angepasst
+ }
+ 
++void ScViewData::SetTabBgColor( Color rTabBgColor, SCTAB nTab )
++{
++    if ( rTabBgColor != Color(COL_AUTO) )
++    {
++        if ( !pTabData[nTab] )
++            CreateTabData( nTab );
++        pTabData[nTab]->aTabBgColor = rTabBgColor;
++    }
++    else
++    {
++        if ( pTabData[nTab] )
++            pTabData[nTab]->aTabBgColor = Color( COL_AUTO );
++    }
++}
++
++Color ScViewData::GetTabBgColor( SCTAB nTab ) const
++{
++    if ( !pTabData[nTab] )
++        return Color(COL_AUTO);
++    return pTabData[nTab]->aTabBgColor;
++}
++
++BOOL ScViewData::IsDefaultTabBgColor( SCTAB nTab ) const
++{
++    if ( !pTabData[nTab] )
++        return true;
++    BOOL bResult = pTabData[nTab]->aTabBgColor==Color( COL_AUTO ) ? TRUE : FALSE;
++    return bResult;
++}
++
+ //UNUSED2008-05  void ScViewData::UpdateOle( ScSplitPos /* eWhich */ )
+ //UNUSED2008-05  {
+ //UNUSED2008-05      GetDocShell()->UpdateOle(this);
+@@ -2444,6 +2487,9 @@ void ScViewData::WriteExtOptions( ScExtDocOptions& rDocOpt ) const
+             rTabSett.mbPageMode = bPagebreak;
+             rTabSett.mnNormalZoom = static_cast< long >( pViewTab->aZoomY * Fraction( 100.0 ) );
+             rTabSett.mnPageZoom = static_cast< long >( pViewTab->aPageZoomY * Fraction( 100.0 ) );
++
++            // Tab Bg Color
++            rTabSett.maTabBgColor = pViewTab->aTabBgColor;
+         }
+     }
+ }
+@@ -2598,6 +2644,10 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions& rDocOpt )
+                     update map modes that are needed to draw text correctly. */
+                 SetPagebreakMode( rTabSett.mbPageMode );
+             }
++
++            // Tab Bg Color
++            if( !rTabSett.IsDefaultTabBgColor() )
++                rViewTab.aTabBgColor = rTabSett.maTabBgColor;
+         }
+     }
+ 
+diff --git sc/source/ui/view/viewfun2.cxx sc/source/ui/view/viewfun2.cxx
+index 681f51c..14d58f7 100644
+--- sc/source/ui/view/viewfun2.cxx
++++ sc/source/ui/view/viewfun2.cxx
+@@ -89,6 +89,7 @@
+ #include "funcdesc.hxx"
+ #include "docuno.hxx"
+ 
++#include "tabbgcolor.hxx" //DBW
+ 
+ // STATIC DATA ---------------------------------------------------------------
+ 
+@@ -2276,6 +2277,28 @@ BOOL ScViewFunc::RenameTable( const String& rName, SCTAB nTab )
+ 
+ //----------------------------------------------------------------------------
+ 
++BOOL ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab )
++{
++    BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( nTab, rColor, TRUE, FALSE );
++    if (bSuccess)
++    {
++        GetViewData()->GetViewShell()->UpdateInputHandler();
++    }
++    return bSuccess;
++}
++
++BOOL ScViewFunc::SetTabBgColor( ScUndoSetTabBgColorInfoList* rUndoSetTabBgColorInfoList )
++{
++    BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( rUndoSetTabBgColorInfoList, TRUE, FALSE );
++    if (bSuccess)
++    {
++        GetViewData()->GetViewShell()->UpdateInputHandler();
++    }
++    return bSuccess;
++}
++
++//----------------------------------------------------------------------------
++
+ void ScViewFunc::InsertAreaLink( const String& rFile,
+                                     const String& rFilter, const String& rOptions,
+                                     const String& rSource, ULONG nRefresh )
+diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
+index ab3f121..eed3a97 100644
+--- sc/uiconfig/scalc/menubar/menubar.xml
++++ sc/uiconfig/scalc/menubar/menubar.xml
+@@ -214,6 +214,8 @@
+                     <menu:menuitem menu:id=".uno:Hide"/>
+                     <menu:menuitem menu:id=".uno:Show"/>
+                     <menu:menuitem menu:id=".uno:SheetRightToLeft"/>
++                    <menu:menuseparator/>
++                    <menu:menuitem menu:id=".uno:SetTabBgColor"/>
+                 </menu:menupopup>
+             </menu:menu>
+             <menu:menuitem menu:id=".uno:ToggleMergeCells"/>
+diff --git sc/util/makefile.mk sc/util/makefile.mk
+index db377e5..f4e7973 100644
+--- sc/util/makefile.mk
++++ sc/util/makefile.mk
+@@ -260,6 +260,7 @@ LIB8OBJFILES = \
+         $(SLO)$/attrdlg.obj	\
+         $(SLO)$/scuiimoptdlg.obj	\
+         $(SLO)$/strindlg.obj		\
++        $(SLO)$/tabbgcolordlg.obj   \
+         $(SLO)$/shtabdlg.obj		\
+         $(SLO)$/scendlg.obj		\
+         $(SLO)$/pvfundlg.obj	\
diff --git a/applied_patches/0018-cws-calctabcolor-svtools.diff b/applied_patches/0018-cws-calctabcolor-svtools.diff
new file mode 100644
index 000000000..19fd0210d
--- /dev/null
+++ b/applied_patches/0018-cws-calctabcolor-svtools.diff
@@ -0,0 +1,214 @@
+diff --git svtools/inc/tabbar.hxx svtools/inc/tabbar.hxx
+index eed845a..6e0a51c 100644
+--- svtools/inc/tabbar.hxx
++++ svtools/inc/tabbar.hxx
+@@ -430,6 +430,11 @@ public:
+                                 USHORT nPos = TABBAR_APPEND );
+     void            RemovePage( USHORT nPageId );
+     void            MovePage( USHORT nPageId, USHORT nNewPos );
++
++    Color           GetTabBgColor( USHORT nPageId ) const;
++    void            SetTabBgColor( USHORT nPageId, const Color& aTabBgColor );
++    BOOL            IsDefaultTabBgColor( USHORT nPageId );
++
+     void            Clear();
+ 
+     void            EnablePage( USHORT nPageId, BOOL bEnable = TRUE );
+diff --git svtools/source/control/tabbar.cxx svtools/source/control/tabbar.cxx
+index ed1abbe..bfa6825 100644
+--- svtools/source/control/tabbar.cxx
++++ svtools/source/control/tabbar.cxx
+@@ -65,6 +65,10 @@ struct ImplTabBarItem
+     BOOL            mbShort;
+     BOOL            mbSelect;
+     BOOL            mbEnable;
++    Color           maTabBgColor;
++    bool            IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO) ? TRUE : FALSE; };
++    Color           maTabTextColor;
++    bool            IsDefaultTabTextColor() const { return maTabTextColor == Color(COL_AUTO) ? TRUE : FALSE; };
+ 
+                     ImplTabBarItem( USHORT nItemId, const XubString& rText,
+                                     TabBarPageBits nPageBits ) :
+@@ -77,6 +81,8 @@ struct ImplTabBarItem
+                         mbShort  = FALSE;
+                         mbSelect = FALSE;
+                         mbEnable = TRUE;
++                        maTabBgColor = Color( COL_AUTO );
++                        maTabTextColor = Color( COL_AUTO );
+                     }
+ };
+ 
+@@ -1049,7 +1055,8 @@ void TabBar::Paint( const Rectangle& )
+     // Font selektieren
+     Font aFont = GetFont();
+     Font aLightFont = aFont;
+-    aLightFont.SetWeight( WEIGHT_LIGHT );
++    //aLightFont.SetWeight( WEIGHT_LIGHT ); //TODO Make font weight light on custom color only?
++    aLightFont.SetWeight( WEIGHT_NORMAL );
+ 
+     // #i36013# exclude push buttons from painting area
+     Rectangle aClipRect( Point( mnOffX, 0 ), Point( mnLastOffX, GetOutputHeightPixel() - 1 ) );
+@@ -1123,15 +1130,23 @@ void TabBar::Paint( const Rectangle& )
+                     SetFont( aLightFont );
+ 
+                 // Je nach Status die richtige FillInBrush setzen
++                // Set the correct FillInBrush depending upon status
+                 if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) )
+                 {
++                    // Currently selected Tab
+                     SetFillColor( aSelectColor );
+                     SetTextColor( aSelectTextColor );
+                 }
+                 else
+                 {
+-                    SetFillColor( aFaceColor );
+-                    SetTextColor( aFaceTextColor );
++                    if ( !pItem->IsDefaultTabBgColor() )
++                    {
++                        SetFillColor( pItem->maTabBgColor );
++                        SetTextColor( pItem->maTabTextColor );
++                    } else {
++                        SetFillColor( aFaceColor );
++                        SetTextColor( aFaceTextColor );
++                    }
+                 }
+ 
+                 // Muss Font Kursiv geschaltet werden
+@@ -1163,21 +1178,38 @@ void TabBar::Paint( const Rectangle& )
+                 long    nTextHeight = GetTextHeight();
+                 Point   aTxtPos( aRect.Left()+(aRectSize.Width()-nTextWidth)/2,
+                                  (aRectSize.Height()-nTextHeight)/2 );
+-                if ( !pItem->mbEnable )
+-                    DrawCtrlText( aTxtPos, aText, 0, STRING_LEN, (TEXT_DRAW_DISABLE | TEXT_DRAW_MNEMONIC) );
+-                else
+-                    DrawText( aTxtPos, aText );
+-
++                if ( pItem->IsDefaultTabBgColor() || (!pItem->mbSelect) )
++                {
++                     if ( !pItem->mbEnable )
++                         DrawCtrlText( aTxtPos, aText, 0, STRING_LEN, (TEXT_DRAW_DISABLE | TEXT_DRAW_MNEMONIC) );
++                    else
++                         DrawText( aTxtPos, aText );
++                }
+                 // Jetzt im Inhalt den 3D-Effekt ausgeben
+                 aPos0.X()++;
+                 aPos1.X()++;
+                 aPos2.X()--;
+                 aPos3.X()--;
+-                SetLineColor( rStyleSettings.GetLightColor() );
++
++                // If this is the current tab, draw the left inner shadow the default color, 
++                // otherwise make it the same as the custom background color
++                if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) {
++                    SetLineColor( rStyleSettings.GetLightColor() );
++                } else {
++                    if ( !pItem->IsDefaultTabBgColor() )
++                    {
++                        SetLineColor( pItem->maTabBgColor );
++                    } else {
++                        SetLineColor( rStyleSettings.GetLightColor() );
++                    }
++                }
++                // Draw the left side of the tab
+                 DrawLine( aPos0, aPos1 );
+ 
+                 if ( !pItem->mbSelect && (pItem->mnId != mnCurPageId) )
+                 {
++                    // Draw the top inner shadow
++                    // ToDo: Change from this static color to tab custom bg color
+                     DrawLine( Point( aPos0.X(), aPos0.Y()+1 ),
+                                 Point( aPos3.X(), aPos3.Y()+1 ) );
+                 }
+@@ -1187,8 +1219,27 @@ void TabBar::Paint( const Rectangle& )
+                 aPos1.X()--;
+                 aPos1.Y()--;
+                 aPos2.Y()--;
++                if ( !pItem->IsDefaultTabBgColor() && ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) )
++                {
++                    SetLineColor( pItem->maTabBgColor );
++                    DrawLine( Point(aPos1.X()-1, aPos1.Y()-1), Point(aPos2.X(), aPos2.Y()-1) );
++                }
+                 DrawLine( aPos1, aPos2 );
+ 
++                // draw a small 2px sliver of the original background color at the bottom of the selected tab
++                     
++                if ( !pItem->IsDefaultTabBgColor() )
++                {
++                    if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) {
++                        SetLineColor( pItem->maTabBgColor );
++                        DrawLine( Point(aPos1.X()-1, aPos1.Y()-1), Point(aPos2.X(), aPos2.Y()-1) );
++                        if ( !pItem->mbEnable )
++                            DrawCtrlText( aTxtPos, aText, 0, STRING_LEN, (TEXT_DRAW_DISABLE | TEXT_DRAW_MNEMONIC) );
++                        else
++                            DrawText( aTxtPos, aText );
++                    }
++                }
++
+                 // Da etwas uebermalt werden konnte, muessen wir die Polygon-
+                 // umrandung nocheinmal ausgeben
+                 SetLineColor( rStyleSettings.GetDarkShadowColor() );
+@@ -1565,6 +1616,42 @@ void TabBar::InsertPage( USHORT nPageId, const XubString& rText,
+ 
+ // -----------------------------------------------------------------------
+ 
++Color TabBar::GetTabBgColor( USHORT nPageId ) const
++{
++    USHORT nPos = GetPagePos( nPageId );
++
++    if ( nPos != TABBAR_PAGE_NOTFOUND )
++        return mpItemList->GetObject( nPos )->maTabBgColor;
++    else
++        return Color( COL_AUTO );
++}
++
++void TabBar::SetTabBgColor( USHORT nPageId, const Color& aTabBgColor )
++{
++    USHORT nPos = GetPagePos( nPageId );
++    ImplTabBarItem* pItem;
++    if ( nPos != TABBAR_PAGE_NOTFOUND )
++    {
++        pItem = mpItemList->GetObject( nPos );
++        // TODO: Need to take the text color specification out of this code!
++        if ( aTabBgColor != Color( COL_AUTO )  )
++        {
++            pItem->maTabBgColor = aTabBgColor;
++            if ( aTabBgColor.GetLuminance() <= 128 ) //Do not use aTabBgColor.IsDark(), because that threshold is way too low...
++                pItem->maTabTextColor = Color( COL_WHITE );
++            else
++                pItem->maTabTextColor = Color( COL_BLACK );
++        }
++        else
++        {
++            pItem->maTabBgColor = Color( COL_AUTO );
++            pItem->maTabTextColor = Color( COL_AUTO );
++        }
++    }
++}
++
++// -----------------------------------------------------------------------
++
+ void TabBar::RemovePage( USHORT nPageId )
+ {
+     USHORT nPos = GetPagePos( nPageId );
+@@ -2486,9 +2573,12 @@ USHORT TabBar::ShowDropPos( const Point& rPos )
+             nX--;
+         else
+             nX++;
++        if ( !pItem->IsDefaultTabBgColor() && !pItem->mbSelect)
++            SetLineColor( pItem->maTabTextColor );
+         DrawLine( Point( nX, nY ), Point( nX, nY ) );
+         DrawLine( Point( nX+1, nY-1 ), Point( nX+1, nY+1 ) );
+         DrawLine( Point( nX+2, nY-2 ), Point( nX+2, nY+2 ) );
++        SetLineColor( aBlackColor );
+     }
+     if ( (mnDropPos > 0) && (mnDropPos < nItemCount+1) )
+     {
+@@ -2496,6 +2586,8 @@ USHORT TabBar::ShowDropPos( const Point& rPos )
+         nX = pItem->maRect.Right()-TABBAR_OFFSET_X;
+         if ( mnDropPos == nCurPos )
+             nX++;
++        if ( !pItem->IsDefaultTabBgColor() && !pItem->mbSelect)
++            SetLineColor( pItem->maTabTextColor );
+         DrawLine( Point( nX, nY ), Point( nX, nY ) );
+         DrawLine( Point( nX-1, nY-1 ), Point( nX-1, nY+1 ) );
+         DrawLine( Point( nX-2, nY-2 ), Point( nX-2, nY+2 ) );
diff --git a/applied_patches/0004-speed-configmgr.diff b/applied_patches/0019-speed-configmgr.diff
similarity index 100%
rename from applied_patches/0004-speed-configmgr.diff
rename to applied_patches/0019-speed-configmgr.diff
diff --git a/applied_patches/0005-ok-cancel-btn-add-accel.diff b/applied_patches/0020-ok-cancel-btn-add-accel.diff
similarity index 100%
rename from applied_patches/0005-ok-cancel-btn-add-accel.diff
rename to applied_patches/0020-ok-cancel-btn-add-accel.diff
diff --git a/applied_patches/0006-makefile-idl-build.diff b/applied_patches/0021-makefile-idl-build.diff
similarity index 100%
rename from applied_patches/0006-makefile-idl-build.diff
rename to applied_patches/0021-makefile-idl-build.diff
diff --git a/applied_patches/0007-speed-pagein.diff b/applied_patches/0022-speed-pagein.diff
similarity index 100%
rename from applied_patches/0007-speed-pagein.diff
rename to applied_patches/0022-speed-pagein.diff
diff --git a/applied_patches/0008-testtool-more-defaults.diff b/applied_patches/0023-testtool-more-defaults.diff
similarity index 100%
rename from applied_patches/0008-testtool-more-defaults.diff
rename to applied_patches/0023-testtool-more-defaults.diff
diff --git a/applied_patches/0009-plus-minus-sw-navigator.diff b/applied_patches/0024-plus-minus-sw-navigator.diff
similarity index 100%
rename from applied_patches/0009-plus-minus-sw-navigator.diff
rename to applied_patches/0024-plus-minus-sw-navigator.diff
diff --git a/applied_patches/0010-plus-minus-sw-navigator2.diff b/applied_patches/0025-plus-minus-sw-navigator2.diff
similarity index 100%
rename from applied_patches/0010-plus-minus-sw-navigator2.diff
rename to applied_patches/0025-plus-minus-sw-navigator2.diff
diff --git a/applied_patches/0025-quiet-build.diff b/applied_patches/0025-quiet-build.diff
deleted file mode 100644
index 3e58715cf..000000000
--- a/applied_patches/0025-quiet-build.diff
+++ /dev/null
@@ -1,5110 +0,0 @@
-Collected build silencing/build logging patches
-
-From: Thorsten Behrens <thb@openoffice.org>
-
-
----
-
- solenv/bin/build.pl            |   18 +-
- solenv/inc/_tg_app.mk          |   40 ++--
- solenv/inc/_tg_def.mk          |   80 +++++--
- solenv/inc/_tg_lib.mk          |   60 ++++-
- solenv/inc/_tg_rslb.mk         |  140 +++++++-----
- solenv/inc/_tg_scp.mk          |   40 +++-
- solenv/inc/_tg_sdi.mk          |   80 +++++--
- solenv/inc/_tg_shl.mk          |  440 ++++++++++++++++++++++++---------------
- solenv/inc/_tg_srs.mk          |  450 +++++++++++++++++++++++++++++-----------
- solenv/inc/_tg_zip.mk          |   40 +++-
- solenv/inc/ant.mk              |    2 
- solenv/inc/pstrules.mk         |   10 -
- solenv/inc/rules.mk            |  242 +++++++++++++---------
- solenv/inc/settings.mk         |    6 +
- solenv/inc/target.mk           |   41 +++-
- solenv/inc/tg_app.mk           |    4 
- solenv/inc/tg_def.mk           |    8 +
- solenv/inc/tg_dep.mk           |    6 +
- solenv/inc/tg_java.mk          |    4 
- solenv/inc/tg_lib.mk           |    6 -
- solenv/inc/tg_obj.mk           |   12 +
- solenv/inc/tg_res.mk           |    4 
- solenv/inc/tg_rslb.mk          |   14 +
- solenv/inc/tg_scp.mk           |    4 
- solenv/inc/tg_sdi.mk           |    8 +
- solenv/inc/tg_shl.mk           |   42 ++--
- solenv/inc/tg_slo.mk           |   12 +
- solenv/inc/tg_srs.mk           |   45 +++-
- solenv/inc/tg_yxx.mk           |    8 +
- solenv/inc/tg_zip.mk           |    4 
- vcl/source/window/makefile.mk  |    6 -
- vcl/unx/source/gdi/makefile.mk |    6 -
- 32 files changed, 1259 insertions(+), 623 deletions(-)
-
-
-diff --git solenv/bin/build.pl solenv/bin/build.pl
-index 58a4065..d21bd62 100755
---- solenv/bin/build.pl
-+++ solenv/bin/build.pl
-@@ -54,6 +54,10 @@
-         require GenInfoParser; import GenInfoParser;
-         require IO::Handle; import IO::Handle;
-     };
-+    my $verbose_mode = 0;
-+    if (defined $ENV{verbose} || defined $ENV{VERBOSE}) {
-+        $verbose_mode = ($ENV{verbose} =~ /^t\S*$/i);
-+    }
-     my $enable_multiprocessing = 1;
-     my $cygwin = 0;
-     $cygwin++ if ($^O eq 'cygwin');
-@@ -494,7 +498,7 @@ sub dmake_dir {
-             print "$dmake\n";
-             print $check_error_string;
-         } else {
--            print "$BuildDir\n";
-+            print "\nEntering $BuildDir\n";
-         };
-         RemoveFromDependencies($BuildDir, \%LocalDepsHash) if (!$child);
-         return if ($cmd_file || $show);
-@@ -1354,6 +1358,9 @@ sub get_options {
-     # Default build modes(for OpenOffice.org)
-     $ENV{BUILD_TYPE} = 'OOo EXT' if (!defined $ENV{BUILD_TYPE});
-     @ARGV = @dmake_args;
-+	foreach $arg (@dmake_args) {
-+        $arg =~ /^verbose=(\S+)$/i and $verbose_mode = ($1 =~ /^t\S*$/i);
-+	}
- };
- 
- sub get_dmake_args {
-@@ -1522,7 +1530,7 @@ sub clear_from_child {
-     $running_children{$folders_hashes{$child_nick}}--;
-     delete $processes_hash{$pid};
-     $only_dependent = 0;
--    print 'Running processes: ' . children_number() . "\n";
-+    $verbose_mode && print 'Running processes: ' . children_number() . "\n";
- };
- 
- #
-@@ -1628,7 +1636,7 @@ sub start_child {
-     select $oldfh;
-     $processes_hash{$pid} = $job_dir;
-     $children_running = children_number();
--    print 'Running processes: ', $children_running, "\n";
-+    $verbose_mode && print 'Running processes: ', $children_running, "\n";
-     $maximal_processes = $children_running if ($children_running > $maximal_processes);
-     $folders_hashes{$job_dir} = $dependencies_hash;
-     $running_children{$dependencies_hash}++;
-@@ -3097,7 +3105,7 @@ sub run_server {
-             delete $clients_times{$pid};
-             clear_from_child($pid);
-             delete $clients_jobs{$pid};
--            print 'Running processes: ', children_number(), "\n";
-+            $verbose_mode && print 'Running processes: ', children_number(), "\n";
-             # Actually, next 3 strings are only for even distribution 
-             # of clients if there are more than one build server running
-     	    print $new_socket_obj 'No job';
-@@ -3122,7 +3130,7 @@ sub run_server {
-             $clients_jobs{$pid} = $job_string;
-             $clients_times{$pid} = time;
-             $children_running = children_number();
--            print 'Running processes: ', $children_running, "\n";
-+            $verbose_mode && print 'Running processes: ', $children_running, "\n";
-             $maximal_processes = $children_running if ($children_running > $maximal_processes);
-         } else {
-     	    print $new_socket_obj 'No job';
-diff --git solenv/inc/_tg_app.mk solenv/inc/_tg_app.mk
-index f2008dc..aec72bb 100644
---- solenv/inc/_tg_app.mk
-+++ solenv/inc/_tg_app.mk
-@@ -86,7 +86,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
- 	$(APP1IMP_ORD) \
- 	$(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	@echo unx
-@@ -110,7 +110,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         app $(APP1RPATH) $@
- .IF "$(TARGETTYPE)"=="GUI"
--	@echo "Making: $@.app"
-+	@echo "Making:   " $(@:f).app
- 	@macosx-create-bundle $@
- .ENDIF		# "$(TARGETTYPE)"=="GUI"
- .ELSE		# "$(OS)"=="MACOSX"
-@@ -370,7 +370,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
- 	$(APP2IMP_ORD) \
- 	$(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	@echo unx
-@@ -394,7 +394,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         app $(APP2RPATH) $@
- .IF "$(TARGETTYPE)"=="GUI"
--	@echo "Making: $@.app"
-+	@echo "Making:   " $(@:f).app
- 	@macosx-create-bundle $@
- .ENDIF		# "$(TARGETTYPE)"=="GUI"
- .ELSE		# "$(OS)"=="MACOSX"
-@@ -654,7 +654,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
- 	$(APP3IMP_ORD) \
- 	$(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	@echo unx
-@@ -678,7 +678,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         app $(APP3RPATH) $@
- .IF "$(TARGETTYPE)"=="GUI"
--	@echo "Making: $@.app"
-+	@echo "Making:   " $(@:f).app
- 	@macosx-create-bundle $@
- .ENDIF		# "$(TARGETTYPE)"=="GUI"
- .ELSE		# "$(OS)"=="MACOSX"
-@@ -938,7 +938,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
- 	$(APP4IMP_ORD) \
- 	$(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	@echo unx
-@@ -962,7 +962,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         app $(APP4RPATH) $@
- .IF "$(TARGETTYPE)"=="GUI"
--	@echo "Making: $@.app"
-+	@echo "Making:   " $(@:f).app
- 	@macosx-create-bundle $@
- .ENDIF		# "$(TARGETTYPE)"=="GUI"
- .ELSE		# "$(OS)"=="MACOSX"
-@@ -1222,7 +1222,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
- 	$(APP5IMP_ORD) \
- 	$(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	@echo unx
-@@ -1246,7 +1246,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         app $(APP5RPATH) $@
- .IF "$(TARGETTYPE)"=="GUI"
--	@echo "Making: $@.app"
-+	@echo "Making:   " $(@:f).app
- 	@macosx-create-bundle $@
- .ENDIF		# "$(TARGETTYPE)"=="GUI"
- .ELSE		# "$(OS)"=="MACOSX"
-@@ -1506,7 +1506,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
- 	$(APP6IMP_ORD) \
- 	$(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	@echo unx
-@@ -1530,7 +1530,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         app $(APP6RPATH) $@
- .IF "$(TARGETTYPE)"=="GUI"
--	@echo "Making: $@.app"
-+	@echo "Making:   " $(@:f).app
- 	@macosx-create-bundle $@
- .ENDIF		# "$(TARGETTYPE)"=="GUI"
- .ELSE		# "$(OS)"=="MACOSX"
-@@ -1790,7 +1790,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
- 	$(APP7IMP_ORD) \
- 	$(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	@echo unx
-@@ -1814,7 +1814,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         app $(APP7RPATH) $@
- .IF "$(TARGETTYPE)"=="GUI"
--	@echo "Making: $@.app"
-+	@echo "Making:   " $(@:f).app
- 	@macosx-create-bundle $@
- .ENDIF		# "$(TARGETTYPE)"=="GUI"
- .ELSE		# "$(OS)"=="MACOSX"
-@@ -2074,7 +2074,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
- 	$(APP8IMP_ORD) \
- 	$(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	@echo unx
-@@ -2098,7 +2098,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         app $(APP8RPATH) $@
- .IF "$(TARGETTYPE)"=="GUI"
--	@echo "Making: $@.app"
-+	@echo "Making:   " $(@:f).app
- 	@macosx-create-bundle $@
- .ENDIF		# "$(TARGETTYPE)"=="GUI"
- .ELSE		# "$(OS)"=="MACOSX"
-@@ -2358,7 +2358,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
- 	$(APP9IMP_ORD) \
- 	$(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	@echo unx
-@@ -2382,7 +2382,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         app $(APP9RPATH) $@
- .IF "$(TARGETTYPE)"=="GUI"
--	@echo "Making: $@.app"
-+	@echo "Making:   " $(@:f).app
- 	@macosx-create-bundle $@
- .ENDIF		# "$(TARGETTYPE)"=="GUI"
- .ELSE		# "$(OS)"=="MACOSX"
-@@ -2642,7 +2642,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
- 	$(APP10IMP_ORD) \
- 	$(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	@echo unx
-@@ -2666,7 +2666,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         app $(APP10RPATH) $@
- .IF "$(TARGETTYPE)"=="GUI"
--	@echo "Making: $@.app"
-+	@echo "Making:   " $(@:f).app
- 	@macosx-create-bundle $@
- .ENDIF		# "$(TARGETTYPE)"=="GUI"
- .ELSE		# "$(OS)"=="MACOSX"
-diff --git solenv/inc/_tg_def.mk solenv/inc/_tg_def.mk
-index 7f2e0f2..9d8416b 100644
---- solenv/inc/_tg_def.mk
-+++ solenv/inc/_tg_def.mk
-@@ -68,8 +68,10 @@ $(DEF1TARGETN) : \
- $(DEF1TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(EMQ)"$(SHL1TARGETN:f)$(EMQ)" 								 >$@.tmpfile
- .IF "$(COM)"!="GCC"
- 	@echo HEAPSIZE	  0 											>>$@.tmpfile
-@@ -184,8 +186,10 @@ $(DEF1TARGETN) : \
- $(DEF1TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@+-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(SHL1TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
- 	@echo DATA MULTIPLE	 >>$@.tmpfile
- 	@echo DESCRIPTION	'StarView 3.00 $(DEF1DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-@@ -352,8 +356,10 @@ $(DEF2TARGETN) : \
- $(DEF2TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" 								 >$@.tmpfile
- .IF "$(COM)"!="GCC"
- 	@echo HEAPSIZE	  0 											>>$@.tmpfile
-@@ -468,8 +474,10 @@ $(DEF2TARGETN) : \
- $(DEF2TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@+-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(SHL2TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
- 	@echo DATA MULTIPLE	 >>$@.tmpfile
- 	@echo DESCRIPTION	'StarView 3.00 $(DEF2DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-@@ -636,8 +644,10 @@ $(DEF3TARGETN) : \
- $(DEF3TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(EMQ)"$(SHL3TARGETN:f)$(EMQ)" 								 >$@.tmpfile
- .IF "$(COM)"!="GCC"
- 	@echo HEAPSIZE	  0 											>>$@.tmpfile
-@@ -752,8 +762,10 @@ $(DEF3TARGETN) : \
- $(DEF3TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@+-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(SHL3TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
- 	@echo DATA MULTIPLE	 >>$@.tmpfile
- 	@echo DESCRIPTION	'StarView 3.00 $(DEF3DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-@@ -920,8 +932,10 @@ $(DEF4TARGETN) : \
- $(DEF4TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(EMQ)"$(SHL4TARGETN:f)$(EMQ)" 								 >$@.tmpfile
- .IF "$(COM)"!="GCC"
- 	@echo HEAPSIZE	  0 											>>$@.tmpfile
-@@ -1036,8 +1050,10 @@ $(DEF4TARGETN) : \
- $(DEF4TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@+-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(SHL4TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
- 	@echo DATA MULTIPLE	 >>$@.tmpfile
- 	@echo DESCRIPTION	'StarView 3.00 $(DEF4DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-@@ -1204,8 +1220,10 @@ $(DEF5TARGETN) : \
- $(DEF5TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(EMQ)"$(SHL5TARGETN:f)$(EMQ)" 								 >$@.tmpfile
- .IF "$(COM)"!="GCC"
- 	@echo HEAPSIZE	  0 											>>$@.tmpfile
-@@ -1320,8 +1338,10 @@ $(DEF5TARGETN) : \
- $(DEF5TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@+-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(SHL5TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
- 	@echo DATA MULTIPLE	 >>$@.tmpfile
- 	@echo DESCRIPTION	'StarView 3.00 $(DEF5DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-@@ -1488,8 +1508,10 @@ $(DEF6TARGETN) : \
- $(DEF6TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(EMQ)"$(SHL6TARGETN:f)$(EMQ)" 								 >$@.tmpfile
- .IF "$(COM)"!="GCC"
- 	@echo HEAPSIZE	  0 											>>$@.tmpfile
-@@ -1604,8 +1626,10 @@ $(DEF6TARGETN) : \
- $(DEF6TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@+-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(SHL6TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
- 	@echo DATA MULTIPLE	 >>$@.tmpfile
- 	@echo DESCRIPTION	'StarView 3.00 $(DEF6DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-@@ -1772,8 +1796,10 @@ $(DEF7TARGETN) : \
- $(DEF7TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(EMQ)"$(SHL7TARGETN:f)$(EMQ)" 								 >$@.tmpfile
- .IF "$(COM)"!="GCC"
- 	@echo HEAPSIZE	  0 											>>$@.tmpfile
-@@ -1888,8 +1914,10 @@ $(DEF7TARGETN) : \
- $(DEF7TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@+-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(SHL7TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
- 	@echo DATA MULTIPLE	 >>$@.tmpfile
- 	@echo DESCRIPTION	'StarView 3.00 $(DEF7DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-@@ -2056,8 +2084,10 @@ $(DEF8TARGETN) : \
- $(DEF8TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(EMQ)"$(SHL8TARGETN:f)$(EMQ)" 								 >$@.tmpfile
- .IF "$(COM)"!="GCC"
- 	@echo HEAPSIZE	  0 											>>$@.tmpfile
-@@ -2172,8 +2202,10 @@ $(DEF8TARGETN) : \
- $(DEF8TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@+-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(SHL8TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
- 	@echo DATA MULTIPLE	 >>$@.tmpfile
- 	@echo DESCRIPTION	'StarView 3.00 $(DEF8DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-@@ -2340,8 +2372,10 @@ $(DEF9TARGETN) : \
- $(DEF9TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(EMQ)"$(SHL9TARGETN:f)$(EMQ)" 								 >$@.tmpfile
- .IF "$(COM)"!="GCC"
- 	@echo HEAPSIZE	  0 											>>$@.tmpfile
-@@ -2456,8 +2490,10 @@ $(DEF9TARGETN) : \
- $(DEF9TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@+-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(SHL9TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
- 	@echo DATA MULTIPLE	 >>$@.tmpfile
- 	@echo DESCRIPTION	'StarView 3.00 $(DEF9DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-@@ -2624,8 +2660,10 @@ $(DEF10TARGETN) : \
- $(DEF10TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(EMQ)"$(SHL10TARGETN:f)$(EMQ)" 								 >$@.tmpfile
- .IF "$(COM)"!="GCC"
- 	@echo HEAPSIZE	  0 											>>$@.tmpfile
-@@ -2740,8 +2778,10 @@ $(DEF10TARGETN) : \
- $(DEF10TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@+-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(SHL10TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
- 	@echo DATA MULTIPLE	 >>$@.tmpfile
- 	@echo DESCRIPTION	'StarView 3.00 $(DEF10DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-diff --git solenv/inc/_tg_lib.mk solenv/inc/_tg_lib.mk
-index b481a6d..103e283 100644
---- solenv/inc/_tg_lib.mk
-+++ solenv/inc/_tg_lib.mk
-@@ -4,7 +4,7 @@
- .IF "$(LIB1ARCHIV)" != ""
- 
- $(LIB1ARCHIV) :	$(LIB1TARGET)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd
-@@ -40,10 +40,12 @@ $(LIB1ARCHIV) :	$(LIB1TARGET)
- $(LIB1TARGET) :	$(LIB1FILES) \
- 						$(LIB1OBJFILES) \
- 						$(LIB1DEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo using: $(LIB1FILES)
- 	@echo using: $(LIB1TARGET)
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@echo $(LIB1OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-@@ -97,7 +99,7 @@ $(LIB1TARGET) :	$(LIB1FILES) \
- .IF "$(LIB2ARCHIV)" != ""
- 
- $(LIB2ARCHIV) :	$(LIB2TARGET)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd
-@@ -133,10 +135,12 @@ $(LIB2ARCHIV) :	$(LIB2TARGET)
- $(LIB2TARGET) :	$(LIB2FILES) \
- 						$(LIB2OBJFILES) \
- 						$(LIB2DEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo using: $(LIB2FILES)
- 	@echo using: $(LIB2TARGET)
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@echo $(LIB2OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-@@ -190,7 +194,7 @@ $(LIB2TARGET) :	$(LIB2FILES) \
- .IF "$(LIB3ARCHIV)" != ""
- 
- $(LIB3ARCHIV) :	$(LIB3TARGET)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd
-@@ -226,10 +230,12 @@ $(LIB3ARCHIV) :	$(LIB3TARGET)
- $(LIB3TARGET) :	$(LIB3FILES) \
- 						$(LIB3OBJFILES) \
- 						$(LIB3DEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo using: $(LIB3FILES)
- 	@echo using: $(LIB3TARGET)
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@echo $(LIB3OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-@@ -283,7 +289,7 @@ $(LIB3TARGET) :	$(LIB3FILES) \
- .IF "$(LIB4ARCHIV)" != ""
- 
- $(LIB4ARCHIV) :	$(LIB4TARGET)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd
-@@ -319,10 +325,12 @@ $(LIB4ARCHIV) :	$(LIB4TARGET)
- $(LIB4TARGET) :	$(LIB4FILES) \
- 						$(LIB4OBJFILES) \
- 						$(LIB4DEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo using: $(LIB4FILES)
- 	@echo using: $(LIB4TARGET)
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@echo $(LIB4OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-@@ -376,7 +384,7 @@ $(LIB4TARGET) :	$(LIB4FILES) \
- .IF "$(LIB5ARCHIV)" != ""
- 
- $(LIB5ARCHIV) :	$(LIB5TARGET)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd
-@@ -412,10 +420,12 @@ $(LIB5ARCHIV) :	$(LIB5TARGET)
- $(LIB5TARGET) :	$(LIB5FILES) \
- 						$(LIB5OBJFILES) \
- 						$(LIB5DEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo using: $(LIB5FILES)
- 	@echo using: $(LIB5TARGET)
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@echo $(LIB5OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-@@ -469,7 +479,7 @@ $(LIB5TARGET) :	$(LIB5FILES) \
- .IF "$(LIB6ARCHIV)" != ""
- 
- $(LIB6ARCHIV) :	$(LIB6TARGET)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd
-@@ -505,10 +515,12 @@ $(LIB6ARCHIV) :	$(LIB6TARGET)
- $(LIB6TARGET) :	$(LIB6FILES) \
- 						$(LIB6OBJFILES) \
- 						$(LIB6DEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo using: $(LIB6FILES)
- 	@echo using: $(LIB6TARGET)
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@echo $(LIB6OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-@@ -562,7 +574,7 @@ $(LIB6TARGET) :	$(LIB6FILES) \
- .IF "$(LIB7ARCHIV)" != ""
- 
- $(LIB7ARCHIV) :	$(LIB7TARGET)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd
-@@ -598,10 +610,12 @@ $(LIB7ARCHIV) :	$(LIB7TARGET)
- $(LIB7TARGET) :	$(LIB7FILES) \
- 						$(LIB7OBJFILES) \
- 						$(LIB7DEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo using: $(LIB7FILES)
- 	@echo using: $(LIB7TARGET)
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@echo $(LIB7OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-@@ -655,7 +669,7 @@ $(LIB7TARGET) :	$(LIB7FILES) \
- .IF "$(LIB8ARCHIV)" != ""
- 
- $(LIB8ARCHIV) :	$(LIB8TARGET)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd
-@@ -691,10 +705,12 @@ $(LIB8ARCHIV) :	$(LIB8TARGET)
- $(LIB8TARGET) :	$(LIB8FILES) \
- 						$(LIB8OBJFILES) \
- 						$(LIB8DEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo using: $(LIB8FILES)
- 	@echo using: $(LIB8TARGET)
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@echo $(LIB8OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-@@ -748,7 +764,7 @@ $(LIB8TARGET) :	$(LIB8FILES) \
- .IF "$(LIB9ARCHIV)" != ""
- 
- $(LIB9ARCHIV) :	$(LIB9TARGET)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd
-@@ -784,10 +800,12 @@ $(LIB9ARCHIV) :	$(LIB9TARGET)
- $(LIB9TARGET) :	$(LIB9FILES) \
- 						$(LIB9OBJFILES) \
- 						$(LIB9DEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo using: $(LIB9FILES)
- 	@echo using: $(LIB9TARGET)
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@echo $(LIB9OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-@@ -841,7 +859,7 @@ $(LIB9TARGET) :	$(LIB9FILES) \
- .IF "$(LIB10ARCHIV)" != ""
- 
- $(LIB10ARCHIV) :	$(LIB10TARGET)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd
-@@ -877,10 +895,12 @@ $(LIB10ARCHIV) :	$(LIB10TARGET)
- $(LIB10TARGET) :	$(LIB10FILES) \
- 						$(LIB10OBJFILES) \
- 						$(LIB10DEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo using: $(LIB10FILES)
- 	@echo using: $(LIB10TARGET)
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@echo $(LIB10OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-diff --git solenv/inc/_tg_rslb.mk solenv/inc/_tg_rslb.mk
-index 9f92278..4719f90 100644
---- solenv/inc/_tg_rslb.mk
-+++ solenv/inc/_tg_rslb.mk
-@@ -8,11 +8,13 @@ HIDRES1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB1NAME)_res
- #HACK cut off the dirty srs files which are included from solver
- RESLIB1HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB1SRSFILES)))
- $(HIDRES1PARTICLE): $(RESLIB1HIDFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
--	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- # need to strip since solaris cannot handle tab-only whitespace here
--    $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- 	@$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDRES1PARTICLE)
-@@ -25,7 +27,7 @@ $(RSC_MULTI1) : \
- 		$(RESLIB1BMPS)
-     @echo using rsc multi-res feature
- .IF "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -40,7 +42,7 @@ $(RSC_MULTI1) : \
- 	$(RSC1HEADER) $(RESLIB1SRSFILES) \
- 	) > $(NULLDEV)
- .ELSE			# "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -59,7 +61,7 @@ $(RSC_MULTI1) : \
- $(RESLIB1TARGETN): \
- 		$(RESLIB1SRSFILES) \
- 		$(RESLIB1BMPS)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(common_build_reslib)"!=""
-     @@-$(RM) $(RSC_MULTI1)
-@@ -86,11 +88,13 @@ HIDRES2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB2NAME)_res
- #HACK cut off the dirty srs files which are included from solver
- RESLIB2HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB2SRSFILES)))
- $(HIDRES2PARTICLE): $(RESLIB2HIDFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
--	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- # need to strip since solaris cannot handle tab-only whitespace here
--    $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- 	@$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDRES2PARTICLE)
-@@ -103,7 +107,7 @@ $(RSC_MULTI2) : \
- 		$(RESLIB2BMPS)
-     @echo using rsc multi-res feature
- .IF "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -118,7 +122,7 @@ $(RSC_MULTI2) : \
- 	$(RSC2HEADER) $(RESLIB2SRSFILES) \
- 	) > $(NULLDEV)
- .ELSE			# "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -137,7 +141,7 @@ $(RSC_MULTI2) : \
- $(RESLIB2TARGETN): \
- 		$(RESLIB2SRSFILES) \
- 		$(RESLIB2BMPS)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(common_build_reslib)"!=""
-     @@-$(RM) $(RSC_MULTI2)
-@@ -164,11 +168,13 @@ HIDRES3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB3NAME)_res
- #HACK cut off the dirty srs files which are included from solver
- RESLIB3HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB3SRSFILES)))
- $(HIDRES3PARTICLE): $(RESLIB3HIDFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
--	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- # need to strip since solaris cannot handle tab-only whitespace here
--    $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- 	@$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDRES3PARTICLE)
-@@ -181,7 +187,7 @@ $(RSC_MULTI3) : \
- 		$(RESLIB3BMPS)
-     @echo using rsc multi-res feature
- .IF "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -196,7 +202,7 @@ $(RSC_MULTI3) : \
- 	$(RSC3HEADER) $(RESLIB3SRSFILES) \
- 	) > $(NULLDEV)
- .ELSE			# "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -215,7 +221,7 @@ $(RSC_MULTI3) : \
- $(RESLIB3TARGETN): \
- 		$(RESLIB3SRSFILES) \
- 		$(RESLIB3BMPS)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(common_build_reslib)"!=""
-     @@-$(RM) $(RSC_MULTI3)
-@@ -242,11 +248,13 @@ HIDRES4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB4NAME)_res
- #HACK cut off the dirty srs files which are included from solver
- RESLIB4HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB4SRSFILES)))
- $(HIDRES4PARTICLE): $(RESLIB4HIDFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
--	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- # need to strip since solaris cannot handle tab-only whitespace here
--    $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- 	@$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDRES4PARTICLE)
-@@ -259,7 +267,7 @@ $(RSC_MULTI4) : \
- 		$(RESLIB4BMPS)
-     @echo using rsc multi-res feature
- .IF "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -274,7 +282,7 @@ $(RSC_MULTI4) : \
- 	$(RSC4HEADER) $(RESLIB4SRSFILES) \
- 	) > $(NULLDEV)
- .ELSE			# "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -293,7 +301,7 @@ $(RSC_MULTI4) : \
- $(RESLIB4TARGETN): \
- 		$(RESLIB4SRSFILES) \
- 		$(RESLIB4BMPS)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(common_build_reslib)"!=""
-     @@-$(RM) $(RSC_MULTI4)
-@@ -320,11 +328,13 @@ HIDRES5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB5NAME)_res
- #HACK cut off the dirty srs files which are included from solver
- RESLIB5HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB5SRSFILES)))
- $(HIDRES5PARTICLE): $(RESLIB5HIDFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
--	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- # need to strip since solaris cannot handle tab-only whitespace here
--    $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- 	@$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDRES5PARTICLE)
-@@ -337,7 +347,7 @@ $(RSC_MULTI5) : \
- 		$(RESLIB5BMPS)
-     @echo using rsc multi-res feature
- .IF "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -352,7 +362,7 @@ $(RSC_MULTI5) : \
- 	$(RSC5HEADER) $(RESLIB5SRSFILES) \
- 	) > $(NULLDEV)
- .ELSE			# "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -371,7 +381,7 @@ $(RSC_MULTI5) : \
- $(RESLIB5TARGETN): \
- 		$(RESLIB5SRSFILES) \
- 		$(RESLIB5BMPS)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(common_build_reslib)"!=""
-     @@-$(RM) $(RSC_MULTI5)
-@@ -398,11 +408,13 @@ HIDRES6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB6NAME)_res
- #HACK cut off the dirty srs files which are included from solver
- RESLIB6HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB6SRSFILES)))
- $(HIDRES6PARTICLE): $(RESLIB6HIDFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
--	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- # need to strip since solaris cannot handle tab-only whitespace here
--    $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- 	@$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDRES6PARTICLE)
-@@ -415,7 +427,7 @@ $(RSC_MULTI6) : \
- 		$(RESLIB6BMPS)
-     @echo using rsc multi-res feature
- .IF "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -430,7 +442,7 @@ $(RSC_MULTI6) : \
- 	$(RSC6HEADER) $(RESLIB6SRSFILES) \
- 	) > $(NULLDEV)
- .ELSE			# "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -449,7 +461,7 @@ $(RSC_MULTI6) : \
- $(RESLIB6TARGETN): \
- 		$(RESLIB6SRSFILES) \
- 		$(RESLIB6BMPS)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(common_build_reslib)"!=""
-     @@-$(RM) $(RSC_MULTI6)
-@@ -476,11 +488,13 @@ HIDRES7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB7NAME)_res
- #HACK cut off the dirty srs files which are included from solver
- RESLIB7HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB7SRSFILES)))
- $(HIDRES7PARTICLE): $(RESLIB7HIDFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
--	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- # need to strip since solaris cannot handle tab-only whitespace here
--    $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- 	@$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDRES7PARTICLE)
-@@ -493,7 +507,7 @@ $(RSC_MULTI7) : \
- 		$(RESLIB7BMPS)
-     @echo using rsc multi-res feature
- .IF "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -508,7 +522,7 @@ $(RSC_MULTI7) : \
- 	$(RSC7HEADER) $(RESLIB7SRSFILES) \
- 	) > $(NULLDEV)
- .ELSE			# "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -527,7 +541,7 @@ $(RSC_MULTI7) : \
- $(RESLIB7TARGETN): \
- 		$(RESLIB7SRSFILES) \
- 		$(RESLIB7BMPS)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(common_build_reslib)"!=""
-     @@-$(RM) $(RSC_MULTI7)
-@@ -554,11 +568,13 @@ HIDRES8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB8NAME)_res
- #HACK cut off the dirty srs files which are included from solver
- RESLIB8HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB8SRSFILES)))
- $(HIDRES8PARTICLE): $(RESLIB8HIDFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
--	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- # need to strip since solaris cannot handle tab-only whitespace here
--    $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- 	@$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDRES8PARTICLE)
-@@ -571,7 +587,7 @@ $(RSC_MULTI8) : \
- 		$(RESLIB8BMPS)
-     @echo using rsc multi-res feature
- .IF "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -586,7 +602,7 @@ $(RSC_MULTI8) : \
- 	$(RSC8HEADER) $(RESLIB8SRSFILES) \
- 	) > $(NULLDEV)
- .ELSE			# "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -605,7 +621,7 @@ $(RSC_MULTI8) : \
- $(RESLIB8TARGETN): \
- 		$(RESLIB8SRSFILES) \
- 		$(RESLIB8BMPS)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(common_build_reslib)"!=""
-     @@-$(RM) $(RSC_MULTI8)
-@@ -632,11 +648,13 @@ HIDRES9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB9NAME)_res
- #HACK cut off the dirty srs files which are included from solver
- RESLIB9HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB9SRSFILES)))
- $(HIDRES9PARTICLE): $(RESLIB9HIDFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
--	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- # need to strip since solaris cannot handle tab-only whitespace here
--    $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- 	@$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDRES9PARTICLE)
-@@ -649,7 +667,7 @@ $(RSC_MULTI9) : \
- 		$(RESLIB9BMPS)
-     @echo using rsc multi-res feature
- .IF "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -664,7 +682,7 @@ $(RSC_MULTI9) : \
- 	$(RSC9HEADER) $(RESLIB9SRSFILES) \
- 	) > $(NULLDEV)
- .ELSE			# "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -683,7 +701,7 @@ $(RSC_MULTI9) : \
- $(RESLIB9TARGETN): \
- 		$(RESLIB9SRSFILES) \
- 		$(RESLIB9BMPS)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(common_build_reslib)"!=""
-     @@-$(RM) $(RSC_MULTI9)
-@@ -710,11 +728,13 @@ HIDRES10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB10NAME)_r
- #HACK cut off the dirty srs files which are included from solver
- RESLIB10HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB10SRSFILES)))
- $(HIDRES10PARTICLE): $(RESLIB10HIDFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
--	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- # need to strip since solaris cannot handle tab-only whitespace here
--    $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- 	@$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDRES10PARTICLE)
-@@ -727,7 +747,7 @@ $(RSC_MULTI10) : \
- 		$(RESLIB10BMPS)
-     @echo using rsc multi-res feature
- .IF "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -742,7 +762,7 @@ $(RSC_MULTI10) : \
- 	$(RSC10HEADER) $(RESLIB10SRSFILES) \
- 	) > $(NULLDEV)
- .ELSE			# "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -761,7 +781,7 @@ $(RSC_MULTI10) : \
- $(RESLIB10TARGETN): \
- 		$(RESLIB10SRSFILES) \
- 		$(RESLIB10BMPS)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(common_build_reslib)"!=""
-     @@-$(RM) $(RSC_MULTI10)
-diff --git solenv/inc/_tg_scp.mk solenv/inc/_tg_scp.mk
-index 55dec30..eecbb8a 100644
---- solenv/inc/_tg_scp.mk
-+++ solenv/inc/_tg_scp.mk
-@@ -10,8 +10,10 @@ $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
- LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
- 
- $(SCP1TARGETN): $(LOCALSCP1FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(MKDIRHIER) $(BIN)$/$(SCP1LINK_PRODUCT_TYPE)
- 	$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP1FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
- .ENDIF
-@@ -29,8 +31,10 @@ $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
- LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
- 
- $(SCP2TARGETN): $(LOCALSCP2FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(MKDIRHIER) $(BIN)$/$(SCP2LINK_PRODUCT_TYPE)
- 	$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP2FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
- .ENDIF
-@@ -48,8 +52,10 @@ $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
- LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
- 
- $(SCP3TARGETN): $(LOCALSCP3FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(MKDIRHIER) $(BIN)$/$(SCP3LINK_PRODUCT_TYPE)
- 	$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP3FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
- .ENDIF
-@@ -67,8 +73,10 @@ $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
- LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
- 
- $(SCP4TARGETN): $(LOCALSCP4FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(MKDIRHIER) $(BIN)$/$(SCP4LINK_PRODUCT_TYPE)
- 	$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP4FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
- .ENDIF
-@@ -86,8 +94,10 @@ $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
- LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
- 
- $(SCP5TARGETN): $(LOCALSCP5FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(MKDIRHIER) $(BIN)$/$(SCP5LINK_PRODUCT_TYPE)
- 	$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP5FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
- .ENDIF
-@@ -105,8 +115,10 @@ $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
- LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
- 
- $(SCP6TARGETN): $(LOCALSCP6FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(MKDIRHIER) $(BIN)$/$(SCP6LINK_PRODUCT_TYPE)
- 	$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP6FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
- .ENDIF
-@@ -124,8 +136,10 @@ $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
- LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
- 
- $(SCP7TARGETN): $(LOCALSCP7FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(MKDIRHIER) $(BIN)$/$(SCP7LINK_PRODUCT_TYPE)
- 	$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP7FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
- .ENDIF
-@@ -143,8 +157,10 @@ $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
- LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
- 
- $(SCP8TARGETN): $(LOCALSCP8FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(MKDIRHIER) $(BIN)$/$(SCP8LINK_PRODUCT_TYPE)
- 	$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP8FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
- .ENDIF
-@@ -162,8 +178,10 @@ $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
- LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
- 
- $(SCP9TARGETN): $(LOCALSCP9FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(MKDIRHIER) $(BIN)$/$(SCP9LINK_PRODUCT_TYPE)
- 	$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP9FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
- .ENDIF
-@@ -181,8 +199,10 @@ $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
- LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
- 
- $(SCP10TARGETN): $(LOCALSCP10FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(MKDIRHIER) $(BIN)$/$(SCP10LINK_PRODUCT_TYPE)
- 	$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP10FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
- .ENDIF
-diff --git solenv/inc/_tg_sdi.mk solenv/inc/_tg_sdi.mk
-index 238dc76..7eb1323 100644
---- solenv/inc/_tg_sdi.mk
-+++ solenv/inc/_tg_sdi.mk
-@@ -2,8 +2,10 @@
- 
- .IF "$(HIDSID1PARTICLE)"!=""
- $(HIDSID1PARTICLE): $(SDI1TARGET)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@.$(ROUT).tmp $@
- .IF "$(USE_SHELL)"=="4nt"
- 	@$(TYPE) $(MISC)$/$(SDI1NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-@@ -16,8 +18,10 @@ $(HIDSID1PARTICLE): $(SDI1TARGET)
- 
- .IF "$(SDI1TARGET)"!=""
- $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@
- 	$(SVIDL) @$(mktmp \
- 	-fs$(INCCOMX)$/$(SDI1NAME).hxx	\
-@@ -34,8 +38,10 @@ $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
- 
- .IF "$(HIDSID2PARTICLE)"!=""
- $(HIDSID2PARTICLE): $(SDI2TARGET)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@.$(ROUT).tmp $@
- .IF "$(USE_SHELL)"=="4nt"
- 	@$(TYPE) $(MISC)$/$(SDI2NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-@@ -48,8 +54,10 @@ $(HIDSID2PARTICLE): $(SDI2TARGET)
- 
- .IF "$(SDI2TARGET)"!=""
- $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@
- 	$(SVIDL) @$(mktmp \
- 	-fs$(INCCOMX)$/$(SDI2NAME).hxx	\
-@@ -66,8 +74,10 @@ $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
- 
- .IF "$(HIDSID3PARTICLE)"!=""
- $(HIDSID3PARTICLE): $(SDI3TARGET)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@.$(ROUT).tmp $@
- .IF "$(USE_SHELL)"=="4nt"
- 	@$(TYPE) $(MISC)$/$(SDI3NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-@@ -80,8 +90,10 @@ $(HIDSID3PARTICLE): $(SDI3TARGET)
- 
- .IF "$(SDI3TARGET)"!=""
- $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@
- 	$(SVIDL) @$(mktmp \
- 	-fs$(INCCOMX)$/$(SDI3NAME).hxx	\
-@@ -98,8 +110,10 @@ $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
- 
- .IF "$(HIDSID4PARTICLE)"!=""
- $(HIDSID4PARTICLE): $(SDI4TARGET)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@.$(ROUT).tmp $@
- .IF "$(USE_SHELL)"=="4nt"
- 	@$(TYPE) $(MISC)$/$(SDI4NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-@@ -112,8 +126,10 @@ $(HIDSID4PARTICLE): $(SDI4TARGET)
- 
- .IF "$(SDI4TARGET)"!=""
- $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@
- 	$(SVIDL) @$(mktmp \
- 	-fs$(INCCOMX)$/$(SDI4NAME).hxx	\
-@@ -130,8 +146,10 @@ $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
- 
- .IF "$(HIDSID5PARTICLE)"!=""
- $(HIDSID5PARTICLE): $(SDI5TARGET)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@.$(ROUT).tmp $@
- .IF "$(USE_SHELL)"=="4nt"
- 	@$(TYPE) $(MISC)$/$(SDI5NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-@@ -144,8 +162,10 @@ $(HIDSID5PARTICLE): $(SDI5TARGET)
- 
- .IF "$(SDI5TARGET)"!=""
- $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@
- 	$(SVIDL) @$(mktmp \
- 	-fs$(INCCOMX)$/$(SDI5NAME).hxx	\
-@@ -162,8 +182,10 @@ $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
- 
- .IF "$(HIDSID6PARTICLE)"!=""
- $(HIDSID6PARTICLE): $(SDI6TARGET)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@.$(ROUT).tmp $@
- .IF "$(USE_SHELL)"=="4nt"
- 	@$(TYPE) $(MISC)$/$(SDI6NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-@@ -176,8 +198,10 @@ $(HIDSID6PARTICLE): $(SDI6TARGET)
- 
- .IF "$(SDI6TARGET)"!=""
- $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@
- 	$(SVIDL) @$(mktmp \
- 	-fs$(INCCOMX)$/$(SDI6NAME).hxx	\
-@@ -194,8 +218,10 @@ $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
- 
- .IF "$(HIDSID7PARTICLE)"!=""
- $(HIDSID7PARTICLE): $(SDI7TARGET)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@.$(ROUT).tmp $@
- .IF "$(USE_SHELL)"=="4nt"
- 	@$(TYPE) $(MISC)$/$(SDI7NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-@@ -208,8 +234,10 @@ $(HIDSID7PARTICLE): $(SDI7TARGET)
- 
- .IF "$(SDI7TARGET)"!=""
- $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@
- 	$(SVIDL) @$(mktmp \
- 	-fs$(INCCOMX)$/$(SDI7NAME).hxx	\
-@@ -226,8 +254,10 @@ $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
- 
- .IF "$(HIDSID8PARTICLE)"!=""
- $(HIDSID8PARTICLE): $(SDI8TARGET)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@.$(ROUT).tmp $@
- .IF "$(USE_SHELL)"=="4nt"
- 	@$(TYPE) $(MISC)$/$(SDI8NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-@@ -240,8 +270,10 @@ $(HIDSID8PARTICLE): $(SDI8TARGET)
- 
- .IF "$(SDI8TARGET)"!=""
- $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@
- 	$(SVIDL) @$(mktmp \
- 	-fs$(INCCOMX)$/$(SDI8NAME).hxx	\
-@@ -258,8 +290,10 @@ $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
- 
- .IF "$(HIDSID9PARTICLE)"!=""
- $(HIDSID9PARTICLE): $(SDI9TARGET)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@.$(ROUT).tmp $@
- .IF "$(USE_SHELL)"=="4nt"
- 	@$(TYPE) $(MISC)$/$(SDI9NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-@@ -272,8 +306,10 @@ $(HIDSID9PARTICLE): $(SDI9TARGET)
- 
- .IF "$(SDI9TARGET)"!=""
- $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@
- 	$(SVIDL) @$(mktmp \
- 	-fs$(INCCOMX)$/$(SDI9NAME).hxx	\
-@@ -290,8 +326,10 @@ $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
- 
- .IF "$(HIDSID10PARTICLE)"!=""
- $(HIDSID10PARTICLE): $(SDI10TARGET)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@.$(ROUT).tmp $@
- .IF "$(USE_SHELL)"=="4nt"
- 	@$(TYPE) $(MISC)$/$(SDI10NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-@@ -304,8 +342,10 @@ $(HIDSID10PARTICLE): $(SDI10TARGET)
- 
- .IF "$(SDI10TARGET)"!=""
- $(SDI10TARGET): $(SVSDI10DEPEND) $(SDI10NAME).sdi
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@
- 	$(SVIDL) @$(mktmp \
- 	-fs$(INCCOMX)$/$(SDI10NAME).hxx	\
-diff --git solenv/inc/_tg_shl.mk solenv/inc/_tg_shl.mk
-index fbab56a..a9f08dc 100644
---- solenv/inc/_tg_shl.mk
-+++ solenv/inc/_tg_shl.mk
-@@ -46,7 +46,7 @@ SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(
- .ENDIF          # "$(GUI)" == "UNX"
- $(MISC)$/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL1VERSIONOBJ:b).h
- #    $(COPY) $(SOLARENV)$/src$/version.c $@
--	$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@
-+	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@
- 
- .INIT : $(SHL1VERSIONOBJDEP)
- .ENDIF			# "$(VERSIONOBJ)"!=""
-@@ -108,16 +108,20 @@ $(USE_SHL1VERSIONMAP): \
- .ENDIF
- .ENDIF			# "$(SHL1OBJS)!"=""
- 	@$(TYPE) /dev/null $(SHL1LIBS:s/.lib/.dump/) >> $@.dump
--	$(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL1INTERFACE) -f $(SHL1FILTERFILE) -m $@
-+	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL1INTERFACE) -f $(SHL1FILTERFILE) -m $@
- 
- .ELSE			# "$(SHL1FILTERFILE)"!=""
- USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap
- $(USE_SHL1VERSIONMAP) :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo -----------------------------
- 	@echo SHL1FILTERFILE not set!
- 	@echo -----------------------------
- 	@$(TOUCH) $@
- 	@echo dummy file to keep the dependencies for later use.
-+.ELSE
-+	@$(TOUCH) $@
-+.ENDIF
- #	force_dmake_to_error
- .ENDIF			# "$(SHL1FILTERFILE)"!=""
- .ELSE			# "$(USE_SHL1VERSIONMAP)"!=""
-@@ -144,11 +148,11 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP)
- # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
- # happens if somebody will change it in the future
- .IF "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
- .ELIF "$(COMNAME)"=="sunpro5"
--	tr -d "\015" < $(SHL1VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL1VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
- .ELSE           # "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL1VERSIONMAP) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL1VERSIONMAP) > $@
- .ENDIF          # "$(COMID)"=="gcc3"
- 	@chmod a+w $@
- # Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -254,8 +258,10 @@ $(SHL1TARGETN) : \
- 					$(SHL1DEPN) \
- 					$(SHL1IMP_ORD) \
- 					$(SHL1LINKLIST)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $(SHL1TARGETN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(SHL1DEFAULTRES)"!=""
- 	@@-$(RM) $(MISC)$/$(SHL1DEFAULTRES:b).rc
-@@ -432,7 +438,7 @@ $(SHL1TARGETN) : \
- 	@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         shl $(SHL1RPATH) $@
--	@echo "Making: $@.jnilib"
-+	@echo "Making:   " $(@:f).jnilib
- 	@macosx-create-bundle $@
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL1NOCHECK)"==""
-@@ -442,22 +448,24 @@ $(SHL1TARGETN) : \
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
--	$(SHL1VERSIONOBJ) -o $@ \
--	`cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
-+		$(SHL1VERSIONOBJ) -o $@ \
-+		`cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-+		$(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
-+.ENDIF
- 	@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL1NOCHECK)"==""
--	-$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
--	$(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
--	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-+	$(QUIET_BUILD) -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-+	$(QUIET_BUILD) $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
- .ENDIF				# "$(SHL1NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
- .IF "$(UNIXVERSIONNAMES)"!=""
--	$(RM) $(LB)$/$(SHL1TARGETN:b)
--	cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b)
-+	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL1TARGETN:b)
-+	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
- 	@ls -l $@
- .ENDIF			# "$(GUI)" == "UNX"
-@@ -586,7 +594,7 @@ SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(
- .ENDIF          # "$(GUI)" == "UNX"
- $(MISC)$/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL2VERSIONOBJ:b).h
- #    $(COPY) $(SOLARENV)$/src$/version.c $@
--	$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@
-+	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@
- 
- .INIT : $(SHL2VERSIONOBJDEP)
- .ENDIF			# "$(VERSIONOBJ)"!=""
-@@ -648,16 +656,20 @@ $(USE_SHL2VERSIONMAP): \
- .ENDIF
- .ENDIF			# "$(SHL2OBJS)!"=""
- 	@$(TYPE) /dev/null $(SHL2LIBS:s/.lib/.dump/) >> $@.dump
--	$(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL2INTERFACE) -f $(SHL2FILTERFILE) -m $@
-+	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL2INTERFACE) -f $(SHL2FILTERFILE) -m $@
- 
- .ELSE			# "$(SHL2FILTERFILE)"!=""
- USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap
- $(USE_SHL2VERSIONMAP) :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo -----------------------------
- 	@echo SHL2FILTERFILE not set!
- 	@echo -----------------------------
- 	@$(TOUCH) $@
- 	@echo dummy file to keep the dependencies for later use.
-+.ELSE
-+	@$(TOUCH) $@
-+.ENDIF
- #	force_dmake_to_error
- .ENDIF			# "$(SHL2FILTERFILE)"!=""
- .ELSE			# "$(USE_SHL2VERSIONMAP)"!=""
-@@ -684,11 +696,11 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP)
- # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
- # happens if somebody will change it in the future
- .IF "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
- .ELIF "$(COMNAME)"=="sunpro5"
--	tr -d "\015" < $(SHL2VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL2VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
- .ELSE           # "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL2VERSIONMAP) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL2VERSIONMAP) > $@
- .ENDIF          # "$(COMID)"=="gcc3"
- 	@chmod a+w $@
- # Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -794,8 +806,10 @@ $(SHL2TARGETN) : \
- 					$(SHL2DEPN) \
- 					$(SHL2IMP_ORD) \
- 					$(SHL2LINKLIST)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $(SHL2TARGETN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(SHL2DEFAULTRES)"!=""
- 	@@-$(RM) $(MISC)$/$(SHL2DEFAULTRES:b).rc
-@@ -972,7 +986,7 @@ $(SHL2TARGETN) : \
- 	@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         shl $(SHL2RPATH) $@
--	@echo "Making: $@.jnilib"
-+	@echo "Making:   " $(@:f).jnilib
- 	@macosx-create-bundle $@
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL2NOCHECK)"==""
-@@ -982,22 +996,24 @@ $(SHL2TARGETN) : \
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
--	$(SHL2VERSIONOBJ) -o $@ \
--	`cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
-+		$(SHL2VERSIONOBJ) -o $@ \
-+		`cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-+		$(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
-+.ENDIF
- 	@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL2NOCHECK)"==""
--	-$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
--	$(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
--	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-+	$(QUIET_BUILD) -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-+	$(QUIET_BUILD) $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
- .ENDIF				# "$(SHL2NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
- .IF "$(UNIXVERSIONNAMES)"!=""
--	$(RM) $(LB)$/$(SHL2TARGETN:b)
--	cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b)
-+	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL2TARGETN:b)
-+	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
- 	@ls -l $@
- .ENDIF			# "$(GUI)" == "UNX"
-@@ -1126,7 +1142,7 @@ SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(
- .ENDIF          # "$(GUI)" == "UNX"
- $(MISC)$/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL3VERSIONOBJ:b).h
- #    $(COPY) $(SOLARENV)$/src$/version.c $@
--	$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@
-+	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@
- 
- .INIT : $(SHL3VERSIONOBJDEP)
- .ENDIF			# "$(VERSIONOBJ)"!=""
-@@ -1188,16 +1204,20 @@ $(USE_SHL3VERSIONMAP): \
- .ENDIF
- .ENDIF			# "$(SHL3OBJS)!"=""
- 	@$(TYPE) /dev/null $(SHL3LIBS:s/.lib/.dump/) >> $@.dump
--	$(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL3INTERFACE) -f $(SHL3FILTERFILE) -m $@
-+	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL3INTERFACE) -f $(SHL3FILTERFILE) -m $@
- 
- .ELSE			# "$(SHL3FILTERFILE)"!=""
- USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap
- $(USE_SHL3VERSIONMAP) :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo -----------------------------
- 	@echo SHL3FILTERFILE not set!
- 	@echo -----------------------------
- 	@$(TOUCH) $@
- 	@echo dummy file to keep the dependencies for later use.
-+.ELSE
-+	@$(TOUCH) $@
-+.ENDIF
- #	force_dmake_to_error
- .ENDIF			# "$(SHL3FILTERFILE)"!=""
- .ELSE			# "$(USE_SHL3VERSIONMAP)"!=""
-@@ -1224,11 +1244,11 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP)
- # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
- # happens if somebody will change it in the future
- .IF "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
- .ELIF "$(COMNAME)"=="sunpro5"
--	tr -d "\015" < $(SHL3VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL3VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
- .ELSE           # "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL3VERSIONMAP) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL3VERSIONMAP) > $@
- .ENDIF          # "$(COMID)"=="gcc3"
- 	@chmod a+w $@
- # Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -1334,8 +1354,10 @@ $(SHL3TARGETN) : \
- 					$(SHL3DEPN) \
- 					$(SHL3IMP_ORD) \
- 					$(SHL3LINKLIST)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $(SHL3TARGETN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(SHL3DEFAULTRES)"!=""
- 	@@-$(RM) $(MISC)$/$(SHL3DEFAULTRES:b).rc
-@@ -1512,7 +1534,7 @@ $(SHL3TARGETN) : \
- 	@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         shl $(SHL3RPATH) $@
--	@echo "Making: $@.jnilib"
-+	@echo "Making:   " $(@:f).jnilib
- 	@macosx-create-bundle $@
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL3NOCHECK)"==""
-@@ -1522,22 +1544,24 @@ $(SHL3TARGETN) : \
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
--	$(SHL3VERSIONOBJ) -o $@ \
--	`cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
-+		$(SHL3VERSIONOBJ) -o $@ \
-+		`cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-+		$(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
-+.ENDIF
- 	@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL3NOCHECK)"==""
--	-$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
--	$(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
--	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-+	$(QUIET_BUILD) -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-+	$(QUIET_BUILD) $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
- .ENDIF				# "$(SHL3NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
- .IF "$(UNIXVERSIONNAMES)"!=""
--	$(RM) $(LB)$/$(SHL3TARGETN:b)
--	cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b)
-+	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL3TARGETN:b)
-+	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
- 	@ls -l $@
- .ENDIF			# "$(GUI)" == "UNX"
-@@ -1666,7 +1690,7 @@ SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(
- .ENDIF          # "$(GUI)" == "UNX"
- $(MISC)$/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL4VERSIONOBJ:b).h
- #    $(COPY) $(SOLARENV)$/src$/version.c $@
--	$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@
-+	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@
- 
- .INIT : $(SHL4VERSIONOBJDEP)
- .ENDIF			# "$(VERSIONOBJ)"!=""
-@@ -1728,16 +1752,20 @@ $(USE_SHL4VERSIONMAP): \
- .ENDIF
- .ENDIF			# "$(SHL4OBJS)!"=""
- 	@$(TYPE) /dev/null $(SHL4LIBS:s/.lib/.dump/) >> $@.dump
--	$(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL4INTERFACE) -f $(SHL4FILTERFILE) -m $@
-+	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL4INTERFACE) -f $(SHL4FILTERFILE) -m $@
- 
- .ELSE			# "$(SHL4FILTERFILE)"!=""
- USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap
- $(USE_SHL4VERSIONMAP) :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo -----------------------------
- 	@echo SHL4FILTERFILE not set!
- 	@echo -----------------------------
- 	@$(TOUCH) $@
- 	@echo dummy file to keep the dependencies for later use.
-+.ELSE
-+	@$(TOUCH) $@
-+.ENDIF
- #	force_dmake_to_error
- .ENDIF			# "$(SHL4FILTERFILE)"!=""
- .ELSE			# "$(USE_SHL4VERSIONMAP)"!=""
-@@ -1764,11 +1792,11 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP)
- # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
- # happens if somebody will change it in the future
- .IF "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
- .ELIF "$(COMNAME)"=="sunpro5"
--	tr -d "\015" < $(SHL4VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL4VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
- .ELSE           # "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL4VERSIONMAP) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL4VERSIONMAP) > $@
- .ENDIF          # "$(COMID)"=="gcc3"
- 	@chmod a+w $@
- # Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -1874,8 +1902,10 @@ $(SHL4TARGETN) : \
- 					$(SHL4DEPN) \
- 					$(SHL4IMP_ORD) \
- 					$(SHL4LINKLIST)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $(SHL4TARGETN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(SHL4DEFAULTRES)"!=""
- 	@@-$(RM) $(MISC)$/$(SHL4DEFAULTRES:b).rc
-@@ -2052,7 +2082,7 @@ $(SHL4TARGETN) : \
- 	@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         shl $(SHL4RPATH) $@
--	@echo "Making: $@.jnilib"
-+	@echo "Making:   " $(@:f).jnilib
- 	@macosx-create-bundle $@
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL4NOCHECK)"==""
-@@ -2062,22 +2092,24 @@ $(SHL4TARGETN) : \
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
--	$(SHL4VERSIONOBJ) -o $@ \
--	`cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
-+		$(SHL4VERSIONOBJ) -o $@ \
-+		`cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-+		$(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
-+.ENDIF
- 	@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL4NOCHECK)"==""
--	-$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
--	$(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
--	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-+	$(QUIET_BUILD) -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-+	$(QUIET_BUILD) $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
- .ENDIF				# "$(SHL4NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
- .IF "$(UNIXVERSIONNAMES)"!=""
--	$(RM) $(LB)$/$(SHL4TARGETN:b)
--	cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b)
-+	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL4TARGETN:b)
-+	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
- 	@ls -l $@
- .ENDIF			# "$(GUI)" == "UNX"
-@@ -2206,7 +2238,7 @@ SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(
- .ENDIF          # "$(GUI)" == "UNX"
- $(MISC)$/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL5VERSIONOBJ:b).h
- #    $(COPY) $(SOLARENV)$/src$/version.c $@
--	$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@
-+	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@
- 
- .INIT : $(SHL5VERSIONOBJDEP)
- .ENDIF			# "$(VERSIONOBJ)"!=""
-@@ -2268,16 +2300,20 @@ $(USE_SHL5VERSIONMAP): \
- .ENDIF
- .ENDIF			# "$(SHL5OBJS)!"=""
- 	@$(TYPE) /dev/null $(SHL5LIBS:s/.lib/.dump/) >> $@.dump
--	$(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL5INTERFACE) -f $(SHL5FILTERFILE) -m $@
-+	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL5INTERFACE) -f $(SHL5FILTERFILE) -m $@
- 
- .ELSE			# "$(SHL5FILTERFILE)"!=""
- USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap
- $(USE_SHL5VERSIONMAP) :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo -----------------------------
- 	@echo SHL5FILTERFILE not set!
- 	@echo -----------------------------
- 	@$(TOUCH) $@
- 	@echo dummy file to keep the dependencies for later use.
-+.ELSE
-+	@$(TOUCH) $@
-+.ENDIF
- #	force_dmake_to_error
- .ENDIF			# "$(SHL5FILTERFILE)"!=""
- .ELSE			# "$(USE_SHL5VERSIONMAP)"!=""
-@@ -2304,11 +2340,11 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP)
- # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
- # happens if somebody will change it in the future
- .IF "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
- .ELIF "$(COMNAME)"=="sunpro5"
--	tr -d "\015" < $(SHL5VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL5VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
- .ELSE           # "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL5VERSIONMAP) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL5VERSIONMAP) > $@
- .ENDIF          # "$(COMID)"=="gcc3"
- 	@chmod a+w $@
- # Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -2414,8 +2450,10 @@ $(SHL5TARGETN) : \
- 					$(SHL5DEPN) \
- 					$(SHL5IMP_ORD) \
- 					$(SHL5LINKLIST)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $(SHL5TARGETN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(SHL5DEFAULTRES)"!=""
- 	@@-$(RM) $(MISC)$/$(SHL5DEFAULTRES:b).rc
-@@ -2592,7 +2630,7 @@ $(SHL5TARGETN) : \
- 	@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         shl $(SHL5RPATH) $@
--	@echo "Making: $@.jnilib"
-+	@echo "Making:   " $(@:f).jnilib
- 	@macosx-create-bundle $@
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL5NOCHECK)"==""
-@@ -2602,22 +2640,24 @@ $(SHL5TARGETN) : \
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
--	$(SHL5VERSIONOBJ) -o $@ \
--	`cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
-+		$(SHL5VERSIONOBJ) -o $@ \
-+		`cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-+		$(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
-+.ENDIF
- 	@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL5NOCHECK)"==""
--	-$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
--	$(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
--	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-+	$(QUIET_BUILD) -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-+	$(QUIET_BUILD) $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
- .ENDIF				# "$(SHL5NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
- .IF "$(UNIXVERSIONNAMES)"!=""
--	$(RM) $(LB)$/$(SHL5TARGETN:b)
--	cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b)
-+	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL5TARGETN:b)
-+	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
- 	@ls -l $@
- .ENDIF			# "$(GUI)" == "UNX"
-@@ -2746,7 +2786,7 @@ SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(
- .ENDIF          # "$(GUI)" == "UNX"
- $(MISC)$/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL6VERSIONOBJ:b).h
- #    $(COPY) $(SOLARENV)$/src$/version.c $@
--	$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@
-+	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@
- 
- .INIT : $(SHL6VERSIONOBJDEP)
- .ENDIF			# "$(VERSIONOBJ)"!=""
-@@ -2808,16 +2848,20 @@ $(USE_SHL6VERSIONMAP): \
- .ENDIF
- .ENDIF			# "$(SHL6OBJS)!"=""
- 	@$(TYPE) /dev/null $(SHL6LIBS:s/.lib/.dump/) >> $@.dump
--	$(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL6INTERFACE) -f $(SHL6FILTERFILE) -m $@
-+	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL6INTERFACE) -f $(SHL6FILTERFILE) -m $@
- 
- .ELSE			# "$(SHL6FILTERFILE)"!=""
- USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap
- $(USE_SHL6VERSIONMAP) :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo -----------------------------
- 	@echo SHL6FILTERFILE not set!
- 	@echo -----------------------------
- 	@$(TOUCH) $@
- 	@echo dummy file to keep the dependencies for later use.
-+.ELSE
-+	@$(TOUCH) $@
-+.ENDIF
- #	force_dmake_to_error
- .ENDIF			# "$(SHL6FILTERFILE)"!=""
- .ELSE			# "$(USE_SHL6VERSIONMAP)"!=""
-@@ -2844,11 +2888,11 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP)
- # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
- # happens if somebody will change it in the future
- .IF "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
- .ELIF "$(COMNAME)"=="sunpro5"
--	tr -d "\015" < $(SHL6VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL6VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
- .ELSE           # "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL6VERSIONMAP) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL6VERSIONMAP) > $@
- .ENDIF          # "$(COMID)"=="gcc3"
- 	@chmod a+w $@
- # Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -2954,8 +2998,10 @@ $(SHL6TARGETN) : \
- 					$(SHL6DEPN) \
- 					$(SHL6IMP_ORD) \
- 					$(SHL6LINKLIST)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $(SHL6TARGETN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(SHL6DEFAULTRES)"!=""
- 	@@-$(RM) $(MISC)$/$(SHL6DEFAULTRES:b).rc
-@@ -3132,7 +3178,7 @@ $(SHL6TARGETN) : \
- 	@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         shl $(SHL6RPATH) $@
--	@echo "Making: $@.jnilib"
-+	@echo "Making:   " $(@:f).jnilib
- 	@macosx-create-bundle $@
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL6NOCHECK)"==""
-@@ -3142,22 +3188,24 @@ $(SHL6TARGETN) : \
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
--	$(SHL6VERSIONOBJ) -o $@ \
--	`cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
-+		$(SHL6VERSIONOBJ) -o $@ \
-+		`cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-+		$(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
-+.ENDIF
- 	@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL6NOCHECK)"==""
--	-$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
--	$(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
--	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-+	$(QUIET_BUILD) -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-+	$(QUIET_BUILD) $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
- .ENDIF				# "$(SHL6NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
- .IF "$(UNIXVERSIONNAMES)"!=""
--	$(RM) $(LB)$/$(SHL6TARGETN:b)
--	cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b)
-+	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL6TARGETN:b)
-+	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
- 	@ls -l $@
- .ENDIF			# "$(GUI)" == "UNX"
-@@ -3286,7 +3334,7 @@ SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(
- .ENDIF          # "$(GUI)" == "UNX"
- $(MISC)$/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL7VERSIONOBJ:b).h
- #    $(COPY) $(SOLARENV)$/src$/version.c $@
--	$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@
-+	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@
- 
- .INIT : $(SHL7VERSIONOBJDEP)
- .ENDIF			# "$(VERSIONOBJ)"!=""
-@@ -3348,16 +3396,20 @@ $(USE_SHL7VERSIONMAP): \
- .ENDIF
- .ENDIF			# "$(SHL7OBJS)!"=""
- 	@$(TYPE) /dev/null $(SHL7LIBS:s/.lib/.dump/) >> $@.dump
--	$(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL7INTERFACE) -f $(SHL7FILTERFILE) -m $@
-+	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL7INTERFACE) -f $(SHL7FILTERFILE) -m $@
- 
- .ELSE			# "$(SHL7FILTERFILE)"!=""
- USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap
- $(USE_SHL7VERSIONMAP) :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo -----------------------------
- 	@echo SHL7FILTERFILE not set!
- 	@echo -----------------------------
- 	@$(TOUCH) $@
- 	@echo dummy file to keep the dependencies for later use.
-+.ELSE
-+	@$(TOUCH) $@
-+.ENDIF
- #	force_dmake_to_error
- .ENDIF			# "$(SHL7FILTERFILE)"!=""
- .ELSE			# "$(USE_SHL7VERSIONMAP)"!=""
-@@ -3384,11 +3436,11 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP)
- # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
- # happens if somebody will change it in the future
- .IF "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
- .ELIF "$(COMNAME)"=="sunpro5"
--	tr -d "\015" < $(SHL7VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL7VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
- .ELSE           # "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL7VERSIONMAP) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL7VERSIONMAP) > $@
- .ENDIF          # "$(COMID)"=="gcc3"
- 	@chmod a+w $@
- # Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -3494,8 +3546,10 @@ $(SHL7TARGETN) : \
- 					$(SHL7DEPN) \
- 					$(SHL7IMP_ORD) \
- 					$(SHL7LINKLIST)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $(SHL7TARGETN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(SHL7DEFAULTRES)"!=""
- 	@@-$(RM) $(MISC)$/$(SHL7DEFAULTRES:b).rc
-@@ -3672,7 +3726,7 @@ $(SHL7TARGETN) : \
- 	@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         shl $(SHL7RPATH) $@
--	@echo "Making: $@.jnilib"
-+	@echo "Making:   " $(@:f).jnilib
- 	@macosx-create-bundle $@
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL7NOCHECK)"==""
-@@ -3682,22 +3736,24 @@ $(SHL7TARGETN) : \
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
--	$(SHL7VERSIONOBJ) -o $@ \
--	`cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
-+		$(SHL7VERSIONOBJ) -o $@ \
-+		`cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-+		$(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
-+.ENDIF
- 	@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL7NOCHECK)"==""
--	-$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
--	$(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
--	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-+	$(QUIET_BUILD) -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-+	$(QUIET_BUILD) $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
- .ENDIF				# "$(SHL7NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
- .IF "$(UNIXVERSIONNAMES)"!=""
--	$(RM) $(LB)$/$(SHL7TARGETN:b)
--	cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b)
-+	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL7TARGETN:b)
-+	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
- 	@ls -l $@
- .ENDIF			# "$(GUI)" == "UNX"
-@@ -3826,7 +3882,7 @@ SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(
- .ENDIF          # "$(GUI)" == "UNX"
- $(MISC)$/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL8VERSIONOBJ:b).h
- #    $(COPY) $(SOLARENV)$/src$/version.c $@
--	$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@
-+	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@
- 
- .INIT : $(SHL8VERSIONOBJDEP)
- .ENDIF			# "$(VERSIONOBJ)"!=""
-@@ -3888,16 +3944,20 @@ $(USE_SHL8VERSIONMAP): \
- .ENDIF
- .ENDIF			# "$(SHL8OBJS)!"=""
- 	@$(TYPE) /dev/null $(SHL8LIBS:s/.lib/.dump/) >> $@.dump
--	$(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL8INTERFACE) -f $(SHL8FILTERFILE) -m $@
-+	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL8INTERFACE) -f $(SHL8FILTERFILE) -m $@
- 
- .ELSE			# "$(SHL8FILTERFILE)"!=""
- USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap
- $(USE_SHL8VERSIONMAP) :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo -----------------------------
- 	@echo SHL8FILTERFILE not set!
- 	@echo -----------------------------
- 	@$(TOUCH) $@
- 	@echo dummy file to keep the dependencies for later use.
-+.ELSE
-+	@$(TOUCH) $@
-+.ENDIF
- #	force_dmake_to_error
- .ENDIF			# "$(SHL8FILTERFILE)"!=""
- .ELSE			# "$(USE_SHL8VERSIONMAP)"!=""
-@@ -3924,11 +3984,11 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP)
- # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
- # happens if somebody will change it in the future
- .IF "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
- .ELIF "$(COMNAME)"=="sunpro5"
--	tr -d "\015" < $(SHL8VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL8VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
- .ELSE           # "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL8VERSIONMAP) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL8VERSIONMAP) > $@
- .ENDIF          # "$(COMID)"=="gcc3"
- 	@chmod a+w $@
- # Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -4034,8 +4094,10 @@ $(SHL8TARGETN) : \
- 					$(SHL8DEPN) \
- 					$(SHL8IMP_ORD) \
- 					$(SHL8LINKLIST)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $(SHL8TARGETN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(SHL8DEFAULTRES)"!=""
- 	@@-$(RM) $(MISC)$/$(SHL8DEFAULTRES:b).rc
-@@ -4212,7 +4274,7 @@ $(SHL8TARGETN) : \
- 	@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         shl $(SHL8RPATH) $@
--	@echo "Making: $@.jnilib"
-+	@echo "Making:   " $(@:f).jnilib
- 	@macosx-create-bundle $@
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL8NOCHECK)"==""
-@@ -4222,22 +4284,24 @@ $(SHL8TARGETN) : \
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
--	$(SHL8VERSIONOBJ) -o $@ \
--	`cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
-+		$(SHL8VERSIONOBJ) -o $@ \
-+		`cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-+		$(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
-+.ENDIF
- 	@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL8NOCHECK)"==""
--	-$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
--	$(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
--	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-+	$(QUIET_BUILD) -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-+	$(QUIET_BUILD) $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
- .ENDIF				# "$(SHL8NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
- .IF "$(UNIXVERSIONNAMES)"!=""
--	$(RM) $(LB)$/$(SHL8TARGETN:b)
--	cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b)
-+	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL8TARGETN:b)
-+	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
- 	@ls -l $@
- .ENDIF			# "$(GUI)" == "UNX"
-@@ -4366,7 +4430,7 @@ SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(
- .ENDIF          # "$(GUI)" == "UNX"
- $(MISC)$/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL9VERSIONOBJ:b).h
- #    $(COPY) $(SOLARENV)$/src$/version.c $@
--	$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@
-+	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@
- 
- .INIT : $(SHL9VERSIONOBJDEP)
- .ENDIF			# "$(VERSIONOBJ)"!=""
-@@ -4428,16 +4492,20 @@ $(USE_SHL9VERSIONMAP): \
- .ENDIF
- .ENDIF			# "$(SHL9OBJS)!"=""
- 	@$(TYPE) /dev/null $(SHL9LIBS:s/.lib/.dump/) >> $@.dump
--	$(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL9INTERFACE) -f $(SHL9FILTERFILE) -m $@
-+	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL9INTERFACE) -f $(SHL9FILTERFILE) -m $@
- 
- .ELSE			# "$(SHL9FILTERFILE)"!=""
- USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap
- $(USE_SHL9VERSIONMAP) :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo -----------------------------
- 	@echo SHL9FILTERFILE not set!
- 	@echo -----------------------------
- 	@$(TOUCH) $@
- 	@echo dummy file to keep the dependencies for later use.
-+.ELSE
-+	@$(TOUCH) $@
-+.ENDIF
- #	force_dmake_to_error
- .ENDIF			# "$(SHL9FILTERFILE)"!=""
- .ELSE			# "$(USE_SHL9VERSIONMAP)"!=""
-@@ -4464,11 +4532,11 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP)
- # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
- # happens if somebody will change it in the future
- .IF "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
- .ELIF "$(COMNAME)"=="sunpro5"
--	tr -d "\015" < $(SHL9VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL9VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
- .ELSE           # "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL9VERSIONMAP) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL9VERSIONMAP) > $@
- .ENDIF          # "$(COMID)"=="gcc3"
- 	@chmod a+w $@
- # Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -4574,8 +4642,10 @@ $(SHL9TARGETN) : \
- 					$(SHL9DEPN) \
- 					$(SHL9IMP_ORD) \
- 					$(SHL9LINKLIST)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $(SHL9TARGETN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(SHL9DEFAULTRES)"!=""
- 	@@-$(RM) $(MISC)$/$(SHL9DEFAULTRES:b).rc
-@@ -4752,7 +4822,7 @@ $(SHL9TARGETN) : \
- 	@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         shl $(SHL9RPATH) $@
--	@echo "Making: $@.jnilib"
-+	@echo "Making:   " $(@:f).jnilib
- 	@macosx-create-bundle $@
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL9NOCHECK)"==""
-@@ -4762,22 +4832,24 @@ $(SHL9TARGETN) : \
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
--	$(SHL9VERSIONOBJ) -o $@ \
--	`cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
-+		$(SHL9VERSIONOBJ) -o $@ \
-+		`cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-+		$(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
-+.ENDIF
- 	@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL9NOCHECK)"==""
--	-$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
--	$(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
--	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-+	$(QUIET_BUILD) -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-+	$(QUIET_BUILD) $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
- .ENDIF				# "$(SHL9NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
- .IF "$(UNIXVERSIONNAMES)"!=""
--	$(RM) $(LB)$/$(SHL9TARGETN:b)
--	cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b)
-+	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL9TARGETN:b)
-+	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
- 	@ls -l $@
- .ENDIF			# "$(GUI)" == "UNX"
-@@ -4906,7 +4978,7 @@ SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}
- .ENDIF          # "$(GUI)" == "UNX"
- $(MISC)$/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL10VERSIONOBJ:b).h
- #    $(COPY) $(SOLARENV)$/src$/version.c $@
--	$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@
-+	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@
- 
- .INIT : $(SHL10VERSIONOBJDEP)
- .ENDIF			# "$(VERSIONOBJ)"!=""
-@@ -4968,16 +5040,20 @@ $(USE_SHL10VERSIONMAP): \
- .ENDIF
- .ENDIF			# "$(SHL10OBJS)!"=""
- 	@$(TYPE) /dev/null $(SHL10LIBS:s/.lib/.dump/) >> $@.dump
--	$(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL10INTERFACE) -f $(SHL10FILTERFILE) -m $@
-+	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL10INTERFACE) -f $(SHL10FILTERFILE) -m $@
- 
- .ELSE			# "$(SHL10FILTERFILE)"!=""
- USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap
- $(USE_SHL10VERSIONMAP) :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo -----------------------------
- 	@echo SHL10FILTERFILE not set!
- 	@echo -----------------------------
- 	@$(TOUCH) $@
- 	@echo dummy file to keep the dependencies for later use.
-+.ELSE
-+	@$(TOUCH) $@
-+.ENDIF
- #	force_dmake_to_error
- .ENDIF			# "$(SHL10FILTERFILE)"!=""
- .ELSE			# "$(USE_SHL10VERSIONMAP)"!=""
-@@ -5004,11 +5080,11 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP)
- # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
- # happens if somebody will change it in the future
- .IF "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
- .ELIF "$(COMNAME)"=="sunpro5"
--	tr -d "\015" < $(SHL10VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL10VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
- .ELSE           # "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL10VERSIONMAP) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL10VERSIONMAP) > $@
- .ENDIF          # "$(COMID)"=="gcc3"
- 	@chmod a+w $@
- # Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -5114,8 +5190,10 @@ $(SHL10TARGETN) : \
- 					$(SHL10DEPN) \
- 					$(SHL10IMP_ORD) \
- 					$(SHL10LINKLIST)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $(SHL10TARGETN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(SHL10DEFAULTRES)"!=""
- 	@@-$(RM) $(MISC)$/$(SHL10DEFAULTRES:b).rc
-@@ -5292,7 +5370,7 @@ $(SHL10TARGETN) : \
- 	@+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         shl $(SHL10RPATH) $@
--	@echo "Making: $@.jnilib"
-+	@echo "Making:   " $(@:f).jnilib
- 	@macosx-create-bundle $@
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL10NOCHECK)"==""
-@@ -5302,22 +5380,24 @@ $(SHL10TARGETN) : \
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
--	$(SHL10VERSIONOBJ) -o $@ \
--	`cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
-+		$(SHL10VERSIONOBJ) -o $@ \
-+		`cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-+		$(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
-+.ENDIF
- 	@+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL10NOCHECK)"==""
--	-$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
--	$(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
--	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-+	$(QUIET_BUILD) -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-+	$(QUIET_BUILD) $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
- .ENDIF				# "$(SHL10NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
- .IF "$(UNIXVERSIONNAMES)"!=""
--	$(RM) $(LB)$/$(SHL10TARGETN:b)
--	cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b)
-+	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL10TARGETN:b)
-+	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
- 	@ls -l $@
- .ENDIF			# "$(GUI)" == "UNX"
-@@ -5421,8 +5501,10 @@ $(SHL1IMPLIBN):	\
- $(SHL1IMPLIBN):	\
- 					$(SHL1LIBS)
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------1
--	@echo Making: $(SHL1IMPLIBN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(COM)"=="GCC"
- 	@echo no ImportLibs on mingw
-@@ -5476,8 +5558,10 @@ $(SHL2IMPLIBN):	\
- $(SHL2IMPLIBN):	\
- 					$(SHL2LIBS)
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------1
--	@echo Making: $(SHL2IMPLIBN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(COM)"=="GCC"
- 	@echo no ImportLibs on mingw
-@@ -5531,8 +5615,10 @@ $(SHL3IMPLIBN):	\
- $(SHL3IMPLIBN):	\
- 					$(SHL3LIBS)
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------1
--	@echo Making: $(SHL3IMPLIBN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(COM)"=="GCC"
- 	@echo no ImportLibs on mingw
-@@ -5586,8 +5672,10 @@ $(SHL4IMPLIBN):	\
- $(SHL4IMPLIBN):	\
- 					$(SHL4LIBS)
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------1
--	@echo Making: $(SHL4IMPLIBN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(COM)"=="GCC"
- 	@echo no ImportLibs on mingw
-@@ -5641,8 +5729,10 @@ $(SHL5IMPLIBN):	\
- $(SHL5IMPLIBN):	\
- 					$(SHL5LIBS)
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------1
--	@echo Making: $(SHL5IMPLIBN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(COM)"=="GCC"
- 	@echo no ImportLibs on mingw
-@@ -5696,8 +5786,10 @@ $(SHL6IMPLIBN):	\
- $(SHL6IMPLIBN):	\
- 					$(SHL6LIBS)
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------1
--	@echo Making: $(SHL6IMPLIBN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(COM)"=="GCC"
- 	@echo no ImportLibs on mingw
-@@ -5751,8 +5843,10 @@ $(SHL7IMPLIBN):	\
- $(SHL7IMPLIBN):	\
- 					$(SHL7LIBS)
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------1
--	@echo Making: $(SHL7IMPLIBN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(COM)"=="GCC"
- 	@echo no ImportLibs on mingw
-@@ -5806,8 +5900,10 @@ $(SHL8IMPLIBN):	\
- $(SHL8IMPLIBN):	\
- 					$(SHL8LIBS)
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------1
--	@echo Making: $(SHL8IMPLIBN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(COM)"=="GCC"
- 	@echo no ImportLibs on mingw
-@@ -5861,8 +5957,10 @@ $(SHL9IMPLIBN):	\
- $(SHL9IMPLIBN):	\
- 					$(SHL9LIBS)
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------1
--	@echo Making: $(SHL9IMPLIBN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(COM)"=="GCC"
- 	@echo no ImportLibs on mingw
-@@ -5916,8 +6014,10 @@ $(SHL10IMPLIBN):	\
- $(SHL10IMPLIBN):	\
- 					$(SHL10LIBS)
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------1
--	@echo Making: $(SHL10IMPLIBN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(COM)"=="GCC"
- 	@echo no ImportLibs on mingw
-diff --git solenv/inc/_tg_srs.mk solenv/inc/_tg_srs.mk
-index 756d3b7..acccc72 100644
---- solenv/inc/_tg_srs.mk
-+++ solenv/inc/_tg_srs.mk
-@@ -5,10 +5,12 @@
- HID1FILES=$(foreach,i,$(SRC1FILES:f) $(SRS)$/$(i:s/.src/.hid/))
- HIDSRS1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS1NAME)_srs.hid
- $(HIDSRS1PARTICLE) : $(HID1FILES)
-+.IF "$(QUIET_BUILD)"==""
-     @echo ------------------------------
--    @echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @-$(RM) $@
--    $(TYPE) $(mktmp  $(subst,$/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-     @$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDSRS1PARTICLE)
-@@ -16,38 +18,57 @@ ALLTAR : $(HIDSRS1PARTICLE)
- $(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST)
- 
- $(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr
--	$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
-+	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
- 
- .IF "$(WITH_LANG)"!=""
- 
- $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
--	-$(MKDIR) $(@:d)
--    -$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
-+	@-$(MKDIR) $(@:d)
-+    @-$(RM) $@
- 	-$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
- 	$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
--    $(RENAME) $@.$(INPATH) $@
--    -$(RM) $@.$(INPATH)
-+.ELSE
-+	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-+    @-$(RM) $@
-+	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-+.ENDIF
-+    @$(RENAME) $@.$(INPATH) $@
-+    @-$(RM) $@.$(INPATH)
- 
- $(SRS)$/$(SRS1NAME).srs: $(LOCALIZE_ME_DEST)
- 
- $(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i)
- .ELSE			# "$(WITH_LANG)"!=""
- $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES)
- .ENDIF			# "$(WITH_LANG)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+.IF "$(QUIET_BUILD)"==""
- 	$(RSC) -presponse @$(mktmp \
- 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
- 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
- 		-fp=$@.$(INPATH) \
- 		$< \
- 	)
--	-$(RM) $@
--	$(RENAME) $@.$(INPATH) $@
--	-$(RM) $@.$(INPATH)
-+.ELSE
-+	@ $(RSC) -presponse @$(mktmp \
-+		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-+		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-+		-fp=$@.$(INPATH) \
-+		$< \
-+	) $(PIPEERROR) cat - > /dev/null
-+.ENDIF
-+	@-$(RM) $@
-+	@$(RENAME) $@.$(INPATH) $@
-+	@-$(RM) $@.$(INPATH)
- 
- .ENDIF          # "$(SRS1NAME)"!=""
- 
-@@ -54,10 +75,12 @@ $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES)
- HID2FILES=$(foreach,i,$(SRC2FILES:f) $(SRS)$/$(i:s/.src/.hid/))
- HIDSRS2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS2NAME)_srs.hid
- $(HIDSRS2PARTICLE) : $(HID2FILES)
-+.IF "$(QUIET_BUILD)"==""
-     @echo ------------------------------
--    @echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @-$(RM) $@
--    $(TYPE) $(mktmp  $(subst,$/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-     @$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDSRS2PARTICLE)
-@@ -65,38 +88,57 @@ ALLTAR : $(HIDSRS2PARTICLE)
- $(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST)
- 
- $(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr
--	$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
-+	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
- 
- .IF "$(WITH_LANG)"!=""
- 
- $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
--	-$(MKDIR) $(@:d)
--    -$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
-+	@-$(MKDIR) $(@:d)
-+    @-$(RM) $@
- 	-$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
- 	$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
--    $(RENAME) $@.$(INPATH) $@
--    -$(RM) $@.$(INPATH)
-+.ELSE
-+	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-+    @-$(RM) $@
-+	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-+.ENDIF
-+    @$(RENAME) $@.$(INPATH) $@
-+    @-$(RM) $@.$(INPATH)
- 
- $(SRS)$/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST)
- 
- $(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i)
- .ELSE			# "$(WITH_LANG)"!=""
- $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES)
- .ENDIF			# "$(WITH_LANG)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+.IF "$(QUIET_BUILD)"==""
- 	$(RSC) -presponse @$(mktmp \
- 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
- 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
- 		-fp=$@.$(INPATH) \
- 		$< \
- 	)
--	-$(RM) $@
--	$(RENAME) $@.$(INPATH) $@
--	-$(RM) $@.$(INPATH)
-+.ELSE
-+	@ $(RSC) -presponse @$(mktmp \
-+		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-+		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-+		-fp=$@.$(INPATH) \
-+		$< \
-+	) $(PIPEERROR) cat - > /dev/null
-+.ENDIF
-+	@-$(RM) $@
-+	@$(RENAME) $@.$(INPATH) $@
-+	@-$(RM) $@.$(INPATH)
- 
- .ENDIF          # "$(SRS2NAME)"!=""
- 
-@@ -103,10 +145,12 @@ $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES)
- HID3FILES=$(foreach,i,$(SRC3FILES:f) $(SRS)$/$(i:s/.src/.hid/))
- HIDSRS3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS3NAME)_srs.hid
- $(HIDSRS3PARTICLE) : $(HID3FILES)
-+.IF "$(QUIET_BUILD)"==""
-     @echo ------------------------------
--    @echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @-$(RM) $@
--    $(TYPE) $(mktmp  $(subst,$/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-     @$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDSRS3PARTICLE)
-@@ -114,38 +158,57 @@ ALLTAR : $(HIDSRS3PARTICLE)
- $(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST)
- 
- $(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr
--	$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
-+	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
- 
- .IF "$(WITH_LANG)"!=""
- 
- $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
--	-$(MKDIR) $(@:d)
--    -$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
-+	@-$(MKDIR) $(@:d)
-+    @-$(RM) $@
- 	-$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
- 	$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
--    $(RENAME) $@.$(INPATH) $@
--    -$(RM) $@.$(INPATH)
-+.ELSE
-+	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-+    @-$(RM) $@
-+	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-+.ENDIF
-+    @$(RENAME) $@.$(INPATH) $@
-+    @-$(RM) $@.$(INPATH)
- 
- $(SRS)$/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST)
- 
- $(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i)
- .ELSE			# "$(WITH_LANG)"!=""
- $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES)
- .ENDIF			# "$(WITH_LANG)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+.IF "$(QUIET_BUILD)"==""
- 	$(RSC) -presponse @$(mktmp \
- 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
- 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
- 		-fp=$@.$(INPATH) \
- 		$< \
- 	)
--	-$(RM) $@
--	$(RENAME) $@.$(INPATH) $@
--	-$(RM) $@.$(INPATH)
-+.ELSE
-+	@ $(RSC) -presponse @$(mktmp \
-+		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-+		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-+		-fp=$@.$(INPATH) \
-+		$< \
-+	) $(PIPEERROR) cat - > /dev/null
-+.ENDIF
-+	@-$(RM) $@
-+	@$(RENAME) $@.$(INPATH) $@
-+	@-$(RM) $@.$(INPATH)
- 
- .ENDIF          # "$(SRS3NAME)"!=""
- 
-@@ -152,10 +215,12 @@ $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES)
- HID4FILES=$(foreach,i,$(SRC4FILES:f) $(SRS)$/$(i:s/.src/.hid/))
- HIDSRS4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS4NAME)_srs.hid
- $(HIDSRS4PARTICLE) : $(HID4FILES)
-+.IF "$(QUIET_BUILD)"==""
-     @echo ------------------------------
--    @echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @-$(RM) $@
--    $(TYPE) $(mktmp  $(subst,$/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-     @$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDSRS4PARTICLE)
-@@ -163,38 +228,57 @@ ALLTAR : $(HIDSRS4PARTICLE)
- $(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST)
- 
- $(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr
--	$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
-+	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
- 
- .IF "$(WITH_LANG)"!=""
- 
- $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
--	-$(MKDIR) $(@:d)
--    -$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
-+	@-$(MKDIR) $(@:d)
-+    @-$(RM) $@
- 	-$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
- 	$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
--    $(RENAME) $@.$(INPATH) $@
--    -$(RM) $@.$(INPATH)
-+.ELSE
-+	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-+    @-$(RM) $@
-+	@ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-+.ENDIF
-+    @$(RENAME) $@.$(INPATH) $@
-+    @-$(RM) $@.$(INPATH)
- 
- $(SRS)$/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST)
- 
- $(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i)
- .ELSE			# "$(WITH_LANG)"!=""
- $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES)
- .ENDIF			# "$(WITH_LANG)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+.IF "$(QUIET_BUILD)"==""
- 	$(RSC) -presponse @$(mktmp \
- 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
- 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
- 		-fp=$@.$(INPATH) \
- 		$< \
- 	)
--	-$(RM) $@
--	$(RENAME) $@.$(INPATH) $@
--	-$(RM) $@.$(INPATH)
-+.ELSE
-+	@ $(RSC) -presponse @$(mktmp \
-+		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-+		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-+		-fp=$@.$(INPATH) \
-+		$< \
-+	) $(PIPEERROR) cat - > /dev/null
-+.ENDIF
-+	@-$(RM) $@
-+	@$(RENAME) $@.$(INPATH) $@
-+	@-$(RM) $@.$(INPATH)
- 
- .ENDIF          # "$(SRS4NAME)"!=""
- 
-@@ -201,10 +285,12 @@ $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES)
- HID5FILES=$(foreach,i,$(SRC5FILES:f) $(SRS)$/$(i:s/.src/.hid/))
- HIDSRS5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS5NAME)_srs.hid
- $(HIDSRS5PARTICLE) : $(HID5FILES)
-+.IF "$(QUIET_BUILD)"==""
-     @echo ------------------------------
--    @echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @-$(RM) $@
--    $(TYPE) $(mktmp  $(subst,$/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-     @$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDSRS5PARTICLE)
-@@ -212,38 +298,57 @@ ALLTAR : $(HIDSRS5PARTICLE)
- $(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST)
- 
- $(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr
--	$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
-+	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
- 
- .IF "$(WITH_LANG)"!=""
- 
- $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
--	-$(MKDIR) $(@:d)
--    -$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
-+	@-$(MKDIR) $(@:d)
-+    @-$(RM) $@
- 	-$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
- 	$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
--    $(RENAME) $@.$(INPATH) $@
--    -$(RM) $@.$(INPATH)
-+.ELSE
-+	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-+    @-$(RM) $@
-+	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-+.ENDIF
-+    @$(RENAME) $@.$(INPATH) $@
-+    @-$(RM) $@.$(INPATH)
- 
- $(SRS)$/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST)
- 
- $(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i)
- .ELSE			# "$(WITH_LANG)"!=""
- $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES)
- .ENDIF			# "$(WITH_LANG)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+.IF "$(QUIET_BUILD)"==""
- 	$(RSC) -presponse @$(mktmp \
- 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
- 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
- 		-fp=$@.$(INPATH) \
- 		$< \
- 	)
--	-$(RM) $@
--	$(RENAME) $@.$(INPATH) $@
--	-$(RM) $@.$(INPATH)
-+.ELSE
-+	@ $(RSC) -presponse @$(mktmp \
-+		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-+		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-+		-fp=$@.$(INPATH) \
-+		$< \
-+	) $(PIPEERROR) cat - > /dev/null
-+.ENDIF
-+	@-$(RM) $@
-+	@$(RENAME) $@.$(INPATH) $@
-+	@-$(RM) $@.$(INPATH)
- 
- .ENDIF          # "$(SRS5NAME)"!=""
- 
-@@ -250,10 +355,12 @@ $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES)
- HID6FILES=$(foreach,i,$(SRC6FILES:f) $(SRS)$/$(i:s/.src/.hid/))
- HIDSRS6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS6NAME)_srs.hid
- $(HIDSRS6PARTICLE) : $(HID6FILES)
-+.IF "$(QUIET_BUILD)"==""
-     @echo ------------------------------
--    @echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @-$(RM) $@
--    $(TYPE) $(mktmp  $(subst,$/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-     @$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDSRS6PARTICLE)
-@@ -261,38 +368,57 @@ ALLTAR : $(HIDSRS6PARTICLE)
- $(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST)
- 
- $(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr
--	$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
-+	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
- 
- .IF "$(WITH_LANG)"!=""
- 
- $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
--	-$(MKDIR) $(@:d)
--    -$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
-+	@-$(MKDIR) $(@:d)
-+    @-$(RM) $@
- 	-$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
- 	$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
--    $(RENAME) $@.$(INPATH) $@
--    -$(RM) $@.$(INPATH)
-+.ELSE
-+	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-+    @-$(RM) $@
-+	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-+.ENDIF
-+    @$(RENAME) $@.$(INPATH) $@
-+    @-$(RM) $@.$(INPATH)
- 
- $(SRS)$/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST)
- 
- $(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i)
- .ELSE			# "$(WITH_LANG)"!=""
- $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES)
- .ENDIF			# "$(WITH_LANG)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+.IF "$(QUIET_BUILD)"==""
- 	$(RSC) -presponse @$(mktmp \
- 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
- 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
- 		-fp=$@.$(INPATH) \
- 		$< \
- 	)
--	-$(RM) $@
--	$(RENAME) $@.$(INPATH) $@
--	-$(RM) $@.$(INPATH)
-+.ELSE
-+	@ $(RSC) -presponse @$(mktmp \
-+		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-+		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-+		-fp=$@.$(INPATH) \
-+		$< \
-+	) $(PIPEERROR) cat - > /dev/null
-+.ENDIF
-+	@-$(RM) $@
-+	@$(RENAME) $@.$(INPATH) $@
-+	@-$(RM) $@.$(INPATH)
- 
- .ENDIF          # "$(SRS6NAME)"!=""
- 
-@@ -299,10 +425,12 @@ $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES)
- HID7FILES=$(foreach,i,$(SRC7FILES:f) $(SRS)$/$(i:s/.src/.hid/))
- HIDSRS7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS7NAME)_srs.hid
- $(HIDSRS7PARTICLE) : $(HID7FILES)
-+.IF "$(QUIET_BUILD)"==""
-     @echo ------------------------------
--    @echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @-$(RM) $@
--    $(TYPE) $(mktmp  $(subst,$/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-     @$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDSRS7PARTICLE)
-@@ -310,38 +438,57 @@ ALLTAR : $(HIDSRS7PARTICLE)
- $(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST)
- 
- $(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr
--	$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
-+	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
- 
- .IF "$(WITH_LANG)"!=""
- 
- $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
--	-$(MKDIR) $(@:d)
--    -$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
-+	@-$(MKDIR) $(@:d)
-+    @-$(RM) $@
- 	-$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
- 	$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
--    $(RENAME) $@.$(INPATH) $@
--    -$(RM) $@.$(INPATH)
-+.ELSE
-+	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-+    @-$(RM) $@
-+	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-+.ENDIF
-+    @$(RENAME) $@.$(INPATH) $@
-+    @-$(RM) $@.$(INPATH)
- 
- $(SRS)$/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST)
- 
- $(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i)
- .ELSE			# "$(WITH_LANG)"!=""
- $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES)
- .ENDIF			# "$(WITH_LANG)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+.IF "$(QUIET_BUILD)"==""
- 	$(RSC) -presponse @$(mktmp \
- 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
- 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
- 		-fp=$@.$(INPATH) \
- 		$< \
- 	)
--	-$(RM) $@
--	$(RENAME) $@.$(INPATH) $@
--	-$(RM) $@.$(INPATH)
-+.ELSE
-+	@ $(RSC) -presponse @$(mktmp \
-+		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-+		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-+		-fp=$@.$(INPATH) \
-+		$< \
-+	) $(PIPEERROR) cat - > /dev/null
-+.ENDIF
-+	@-$(RM) $@
-+	@$(RENAME) $@.$(INPATH) $@
-+	@-$(RM) $@.$(INPATH)
- 
- .ENDIF          # "$(SRS7NAME)"!=""
- 
-@@ -348,10 +495,12 @@ $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES)
- HID8FILES=$(foreach,i,$(SRC8FILES:f) $(SRS)$/$(i:s/.src/.hid/))
- HIDSRS8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS8NAME)_srs.hid
- $(HIDSRS8PARTICLE) : $(HID8FILES)
-+.IF "$(QUIET_BUILD)"==""
-     @echo ------------------------------
--    @echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @-$(RM) $@
--    $(TYPE) $(mktmp  $(subst,$/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-     @$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDSRS8PARTICLE)
-@@ -359,38 +508,57 @@ ALLTAR : $(HIDSRS8PARTICLE)
- $(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST)
- 
- $(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr
--	$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
-+	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
- 
- .IF "$(WITH_LANG)"!=""
- 
- $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
--	-$(MKDIR) $(@:d)
--    -$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
-+	@-$(MKDIR) $(@:d)
-+    @-$(RM) $@
- 	-$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
- 	$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
--    $(RENAME) $@.$(INPATH) $@
--    -$(RM) $@.$(INPATH)
-+.ELSE
-+	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-+    @-$(RM) $@
-+	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-+.ENDIF
-+    @$(RENAME) $@.$(INPATH) $@
-+    @-$(RM) $@.$(INPATH)
- 
- $(SRS)$/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST)
- 
- $(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i)
- .ELSE			# "$(WITH_LANG)"!=""
- $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES)
- .ENDIF			# "$(WITH_LANG)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+.IF "$(QUIET_BUILD)"==""
- 	$(RSC) -presponse @$(mktmp \
- 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
- 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
- 		-fp=$@.$(INPATH) \
- 		$< \
- 	)
--	-$(RM) $@
--	$(RENAME) $@.$(INPATH) $@
--	-$(RM) $@.$(INPATH)
-+.ELSE
-+	@ $(RSC) -presponse @$(mktmp \
-+		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-+		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-+		-fp=$@.$(INPATH) \
-+		$< \
-+	) $(PIPEERROR) cat - > /dev/null
-+.ENDIF
-+	@-$(RM) $@
-+	@$(RENAME) $@.$(INPATH) $@
-+	@-$(RM) $@.$(INPATH)
- 
- .ENDIF          # "$(SRS8NAME)"!=""
- 
-@@ -397,10 +565,12 @@ $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES)
- HID9FILES=$(foreach,i,$(SRC9FILES:f) $(SRS)$/$(i:s/.src/.hid/))
- HIDSRS9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS9NAME)_srs.hid
- $(HIDSRS9PARTICLE) : $(HID9FILES)
-+.IF "$(QUIET_BUILD)"==""
-     @echo ------------------------------
--    @echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @-$(RM) $@
--    $(TYPE) $(mktmp  $(subst,$/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-     @$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDSRS9PARTICLE)
-@@ -408,38 +578,57 @@ ALLTAR : $(HIDSRS9PARTICLE)
- $(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST)
- 
- $(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr
--	$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
-+	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
- 
- .IF "$(WITH_LANG)"!=""
- 
- $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
--	-$(MKDIR) $(@:d)
--    -$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
-+	@-$(MKDIR) $(@:d)
-+    @-$(RM) $@
- 	-$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
- 	$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
--    $(RENAME) $@.$(INPATH) $@
--    -$(RM) $@.$(INPATH)
-+.ELSE
-+	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-+    @-$(RM) $@
-+	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-+.ENDIF
-+    @$(RENAME) $@.$(INPATH) $@
-+    @-$(RM) $@.$(INPATH)
- 
- $(SRS)$/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST)
- 
- $(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i)
- .ELSE			# "$(WITH_LANG)"!=""
- $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES)
- .ENDIF			# "$(WITH_LANG)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+.IF "$(QUIET_BUILD)"==""
- 	$(RSC) -presponse @$(mktmp \
- 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
- 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
- 		-fp=$@.$(INPATH) \
- 		$< \
- 	)
--	-$(RM) $@
--	$(RENAME) $@.$(INPATH) $@
--	-$(RM) $@.$(INPATH)
-+.ELSE
-+	@ $(RSC) -presponse @$(mktmp \
-+		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-+		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-+		-fp=$@.$(INPATH) \
-+		$< \
-+	) $(PIPEERROR) cat - > /dev/null
-+.ENDIF
-+	@-$(RM) $@
-+	@$(RENAME) $@.$(INPATH) $@
-+	@-$(RM) $@.$(INPATH)
- 
- .ENDIF          # "$(SRS9NAME)"!=""
- 
-@@ -446,10 +635,12 @@ $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES)
- HID10FILES=$(foreach,i,$(SRC10FILES:f) $(SRS)$/$(i:s/.src/.hid/))
- HIDSRS10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS10NAME)_srs.hid
- $(HIDSRS10PARTICLE) : $(HID10FILES)
-+.IF "$(QUIET_BUILD)"==""
-     @echo ------------------------------
--    @echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @-$(RM) $@
--    $(TYPE) $(mktmp  $(subst,$/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-     @$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDSRS10PARTICLE)
-@@ -457,38 +648,57 @@ ALLTAR : $(HIDSRS10PARTICLE)
- $(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST)
- 
- $(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr
--	$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
-+	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
- 
- .IF "$(WITH_LANG)"!=""
- 
- $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
--	-$(MKDIR) $(@:d)
--    -$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
-+	@-$(MKDIR) $(@:d)
-+    @-$(RM) $@
- 	-$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
- 	$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
--    $(RENAME) $@.$(INPATH) $@
--    -$(RM) $@.$(INPATH)
-+.ELSE
-+	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-+    @-$(RM) $@
-+	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-+.ENDIF
-+    @$(RENAME) $@.$(INPATH) $@
-+    @-$(RM) $@.$(INPATH)
- 
- $(SRS)$/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST)
- 
- $(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i)
- .ELSE			# "$(WITH_LANG)"!=""
- $(SRS)$/$(SRS10NAME).srs: $(SRC10FILES)
- .ENDIF			# "$(WITH_LANG)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+.IF "$(QUIET_BUILD)"==""
- 	$(RSC) -presponse @$(mktmp \
- 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
- 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
- 		-fp=$@.$(INPATH) \
- 		$< \
- 	)
--	-$(RM) $@
--	$(RENAME) $@.$(INPATH) $@
--	-$(RM) $@.$(INPATH)
-+.ELSE
-+	@ $(RSC) -presponse @$(mktmp \
-+		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-+		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-+		-fp=$@.$(INPATH) \
-+		$< \
-+	) $(PIPEERROR) cat - > /dev/null
-+.ENDIF
-+	@-$(RM) $@
-+	@$(RENAME) $@.$(INPATH) $@
-+	@-$(RM) $@.$(INPATH)
- 
- .ENDIF          # "$(SRS10NAME)"!=""
- 
-diff --git solenv/inc/_tg_zip.mk solenv/inc/_tg_zip.mk
-index 7b9a2d9..624ca95 100644
---- solenv/inc/_tg_zip.mk
-+++ solenv/inc/_tg_zip.mk
-@@ -86,8 +86,10 @@ $(ZIP1DEPFILE) :
- 
- 
- $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
- 	@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
- 	@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-@@ -206,8 +208,10 @@ $(ZIP2DEPFILE) :
- 
- 
- $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
- 	@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
- 	@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-@@ -326,8 +330,10 @@ $(ZIP3DEPFILE) :
- 
- 
- $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
- 	@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
- 	@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-@@ -446,8 +452,10 @@ $(ZIP4DEPFILE) :
- 
- 
- $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
- 	@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
- 	@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-@@ -566,8 +574,10 @@ $(ZIP5DEPFILE) :
- 
- 
- $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
- 	@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
- 	@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-@@ -686,8 +696,10 @@ $(ZIP6DEPFILE) :
- 
- 
- $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
- 	@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
- 	@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-@@ -806,8 +818,10 @@ $(ZIP7DEPFILE) :
- 
- 
- $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
- 	@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
- 	@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-@@ -926,8 +940,10 @@ $(ZIP8DEPFILE) :
- 
- 
- $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
- 	@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
- 	@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-@@ -1046,8 +1062,10 @@ $(ZIP9DEPFILE) :
- 
- 
- $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
- 	@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
- 	@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-@@ -1166,8 +1184,10 @@ $(ZIP10DEPFILE) :
- 
- 
- $(ZIP10TARGETN) : delzip $(ZIP10DEPS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
- 	@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
- 	@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-diff --git solenv/inc/ant.mk solenv/inc/ant.mk
-index 901dd5e..6bd4db8 100644
---- solenv/inc/ant.mk
-+++ solenv/inc/ant.mk
-@@ -58,7 +58,7 @@ CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA
- # --- TARGETS -----------------------------------------------------
- 
- $(CLASSDIR)$/solar.properties : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg $(SOLARENV)$/inc/ant.properties
--	@echo Making: $@
-+	@echo "Making:   " $@
- 	@echo solar.build=$(BUILD) > $@
- 	@echo solar.rscversion=$(USQ)$(RSCVERSION)$(USQ) >> $@
- 	@echo solar.rscrevision=$(USQ)$(RSCREVISION)$(USQ) >> $@
-diff --git solenv/inc/pstrules.mk solenv/inc/pstrules.mk
-index cb1d370..bae70ea 100644
---- solenv/inc/pstrules.mk
-+++ solenv/inc/pstrules.mk
-@@ -38,7 +38,7 @@
- 
- $(OBJ)$/$(SECOND_BUILD)_%.obj : %.cxx
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $@
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
- 	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
-@@ -53,7 +53,7 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.cxx
- 
- $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $@
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
- 	$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
-@@ -82,7 +82,7 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c
- 
- $(SLO)$/$(SECOND_BUILD)_%.obj : %.cxx
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $@
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
- 	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
-@@ -101,7 +101,7 @@ $(SLO)$/$(SECOND_BUILD)_%.obj : %.cxx
- 
- $(SLO)$/$(SECOND_BUILD)_%.obj :  %.c
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $@
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
- 	$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
-@@ -141,7 +141,7 @@ LANGFILEEXT=jlf
- 
- $(PAR)$/%.par :
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $@
- 	@@-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}
- .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
- 	$(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
-diff --git solenv/inc/rules.mk solenv/inc/rules.mk
-index 26ebe9f..5a385f3 100644
---- solenv/inc/rules.mk
-+++ solenv/inc/rules.mk
-@@ -32,17 +32,19 @@
- MKFILENAME:=RULES.MK
- 
- $(OBJ)$/%.obj : %.cxx
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
-+.ENDIF
- 	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
-+	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
- .IF "$(noadjust)"==""   
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF          # "$(noadjust)"==""   
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ELSE
- 	@@-$(RM) $@
- .IF "$(COM)"=="GCC"
-@@ -52,20 +54,22 @@ $(OBJ)$/%.obj : %.cxx
- .ENDIF
- .ENDIF
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- 
- $(OBJ)$/%.obj : %.cpp
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
-+.ENDIF
- 	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
-+	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ELSE
- 	@@-$(RM) $@
- .IF "$(COM)"=="GCC"
-@@ -75,20 +79,22 @@ $(OBJ)$/%.obj : %.cpp
- .ENDIF
- .ENDIF
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- 
- $(OBJ)$/%.obj : %.cc
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
-+.ENDIF
- 	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cc
-+	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cc
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ELSE
- 	@@$(RM) $@
- .IF "$(COM)"=="GCC"
-@@ -162,7 +168,9 @@ $(SLO)$/precompiled_ex.% .PHONY:
- .ENDIF			# "$(ENABLE_PCH)"!=""
- 
- $(SLO)$/%.obj : %.cxx
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
-+.ENDIF
- 	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
- # just a helper var	
-@@ -181,11 +189,11 @@ $(SLO)$/%.obj : %.cxx
- 	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E  $(CFLAGSINCXX)$(PWD)$/$*.cxx
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT)
-+	$(QUIET_BUILD) $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT)
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(CAPTURE_COMMAND)"==""
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ENDIF
- .ELSE			# "$(GUI)"=="UNX"
- 	@@-$(RM) $@
-@@ -197,23 +205,25 @@ $(SLO)$/%.obj : %.cxx
- .ENDIF			# "$(GUI)"=="UNX"
- .IF "$(nodep)"==""
- # fixme: write to file
--	$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- 
- $(SLO)$/%.obj : %.cpp
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
- 	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(PWD)$/$*.cpp
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
-+	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ENDIF
- .ELSE
- 	@@-$(RM) $@
-@@ -224,23 +234,25 @@ $(SLO)$/%.obj : %.cpp
- .ENDIF
- .ENDIF
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- 
- $(SLO)$/%.obj : $(MISC)$/%.cxx
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
- 	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
-+	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ENDIF
- .ELSE
- .IF "$(COM)"=="GCC"
-@@ -250,41 +262,45 @@ $(SLO)$/%.obj : $(MISC)$/%.cxx
- .ENDIF
- .ENDIF
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $@ ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $@ ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- 
- $(SLO)$/%.obj : $(MISC)$/%.cc
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
- 	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)$/$*.cc
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cc
-+	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cc
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ENDIF
- .ELSE
- 	$(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cc )
- .ENDIF
- 
- $(OBJ)$/%.obj : $(MISC)$/%.cxx
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
- 	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
-+	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ENDIF
- .ELSE
- .IF "$(COM)"=="GCC"
-@@ -294,25 +310,27 @@ $(OBJ)$/%.obj : $(MISC)$/%.cxx
- .ENDIF
- .ENDIF
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- 
- $(OBJ)$/%.obj : %.c
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(GUI)"=="UNX"
- .IF "$(TEST)"!=""
- 	$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
-+	$(QUIET_BUILD) $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
- .IF "$(noadjust)"==""   
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF			# "$(noadjust)"==""   
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ENDIF
- .ELSE
- .IF "$(COM)"=="GCC"
-@@ -323,20 +341,22 @@ $(OBJ)$/%.obj : %.c
- .ENDIF
- .ENDIF
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- 
- $(OBJ)$/%.obj : $(MISC)$/%.c
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.c
-+	$(QUIET_BUILD) $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.c
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ELSE
- 	@@-$(RM) $@
- .IF "$(COM)"=="GCC"
-@@ -346,20 +366,22 @@ $(OBJ)$/%.obj : $(MISC)$/%.c
- .ENDIF
- .ENDIF
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- 
- $(SLO)$/%.obj : $(MISC)$/%.c
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.c
-+	$(QUIET_BUILD) $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.c
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ELSE
- 	@@-$(RM) $@
- .IF "$(COM)"=="GCC"
-@@ -369,22 +391,26 @@ $(SLO)$/%.obj : $(MISC)$/%.c
- .ENDIF
- .ENDIF
- .IF "$(nodep)"==""
--	$(TYPE) $(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) 
--	$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
-+.IF "$(QUIET_BUILD)"==""
-+	$(QUIET_BUILD) $(TYPE) $(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) 
-+.ENDIF
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
- # avoid _version objects (see tg_shl.mk) - quite hacky...
- 	@noop $(!eq,$@,$(@:s/_version.obj/.obj/) $(NULL) $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)))
- .ENDIF			# "$(nodep)"==""
- 
- $(SLO)$/%.obj : %.c
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(GUI)"=="UNX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
-+	$(QUIET_BUILD) $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
- .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
- .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ELSE
- 	@@-$(RM) $@
- .IF "$(COM)"=="GCC"
-@@ -394,21 +420,23 @@ $(SLO)$/%.obj : %.c
- .ENDIF
- .ENDIF
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- 
- # Objective-C files
- $(OBJ)$/%.obj : %.m
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(OS)"=="MACOSX"
- .IF "$(TEST)"!=""
- 	$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.m
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.m
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.m
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@echo "No recipe for compiling Objective-C files is available for this platform"
-@@ -416,36 +444,42 @@ $(OBJ)$/%.obj : %.m
- 
- # Objective-C files
- $(OBJ)$/%.obj : $(MISC)$/%.m
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
- .IF "$(OS)"=="MACOSX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.m
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.m
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ELSE			# "$(OS)"=="MACOSX"
- 	@echo "No recipe for compiling Objective-C files is available for this platform"
- .ENDIF		"$(OS)"=="MACOSX"
- 
- # Objective-C files
- $(SLO)$/%.obj : $(MISC)$/%.m
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
- .IF "$(OS)"=="MACOSX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.m
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.m
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ELSE			# "$(OS)"=="MACOSX"
- 	@echo "No recipe for compiling Objective-C files is available for this platform"
- .ENDIF		"$(OS)"=="MACOSX"
- 
- # Objective-C files
- $(SLO)$/%.obj : %.m
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(OS)"=="MACOSX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.m
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.m
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ELSE			# "$(OS)"=="MACOSX"
- 	@echo "No recipe for compiling Objective-C files is available for this platform"
- .ENDIF		"$(OS)"=="MACOSX"
-@@ -457,18 +491,20 @@ not_existing$/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<)
- 
- # Objective-C++ files
- $(OBJ)$/%.obj : %.mm
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(OS)"=="MACOSX"
- .IF "$(TEST)"!=""
- 	$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm
- .ELSE
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .ENDIF
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- .ELSE			# "$(OS)"=="MACOSX"
-@@ -477,14 +513,16 @@ $(OBJ)$/%.obj : %.mm
- 
- # Objective-C++ files
- $(OBJ)$/%.obj : $(MISC)$/%.mm
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
- .IF "$(OS)"=="MACOSX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.mm
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.mm
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- .ELSE			# "$(OS)"=="MACOSX"
-@@ -493,14 +531,16 @@ $(OBJ)$/%.obj : $(MISC)$/%.mm
- 
- # Objective-C++ files
- $(SLO)$/%.obj : $(MISC)$/%.mm
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
- .IF "$(OS)"=="MACOSX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.mm
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.mm
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- .ELSE			# "$(OS)"=="MACOSX"
-@@ -509,14 +549,16 @@ $(SLO)$/%.obj : $(MISC)$/%.mm
- 
- # Objective-C++ files
- $(SLO)$/%.obj : %.mm
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(OS)"=="MACOSX"
- 	@$(RM) $@ $(@:s/.obj/.o/)
--	$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.mm
--	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-+	$(QUIET_BUILD) $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.mm
-+	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
- .IF "$(nodep)"==""
--	$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
-+	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
- 	@noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
- .ENDIF			# "$(nodep)"==""
- .ELSE			# "$(OS)"=="MACOSX"
-@@ -524,7 +566,7 @@ $(SLO)$/%.obj : %.mm
- .ENDIF			# "$(OS)"=="MACOSX"
- 
- $(MISC)$/%.dpslo :
--	@echo making .dpslo
-+	@echo "Making:    library dependencies for" $(TARGET).lib
- 	@@$(RM) $@
- 	@@-$(CDD) $(MISC) && $(!null,$(all_local_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_slo:b:+".dpcc") s_$(i)) > $(@:f)
- 	@@-$(CDD) $(MISC) && $(!null,$(all_misc_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_slo:b:+".dpcc") s_$(i)) >> $(@:f)
-@@ -532,7 +574,7 @@ $(MISC)$/%.dpslo :
- 	@$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_slo:b:+".dpcc":^"s_") $(all_misc_slo:b:+".dpcc":^"s_")) >> $@
- 
- $(MISC)$/%.dpobj :
--	@echo making .dpobj
-+	@echo "Making:    library dependencies for" $(TARGET).lib
- 	@@$(RM) $@
- 	@@-$(CDD) $(MISC) && $(!null,$(all_local_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_obj:b:+".dpcc") o_$(i)) > $(@:f)
- 	@@-$(CDD) $(MISC) && $(!null,$(all_misc_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_obj:b:+".dpcc") o_$(i)) >> $(@:f)
-@@ -619,34 +661,42 @@ $(MISC)$/%.dprc :
- 	@echo $@ : $(RES)$/$(*:b).res  >> $@
- 
- $(MISC)$/%.dpr :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------ 
-+.ELSE
-+	@echo > /dev/null
-+.ENDIF
- .IF "$(nodep)"==""
--	@echo Making: $@
-+	@echo "Making:    resource file dependencies for" $(DEPSRSFILES)
-     @@-$(RM) $@
--	dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES)
--	-$(TYPE) $(MISC)$/$(TARGET).*.dprr >> $@
-+	$(QUIET_BUILD) dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES)
-+	@-$(TYPE) $(MISC)$/$(TARGET).*.dprr >> $@
- .ENDIF			# "$(nodep)"==""
- 
- $(MISC)$/%.dpz :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
-+.ELSE
-+	@echo > /dev/null
-+.ENDIF
- .IF "$(nodep)"==""
--	@echo Making: $@
-+	@echo "Making:    zip file dependencies for" $(ZIPDEPFILES)
-     @@-$(RM) $@
- # line too long on 4nt
- .IF "$(USE_SHELL)"!="4nt" || "$(GUI)"=="OS2"
-     dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true $(ZIPDEPFILES)
- .ELSE			# "$(USE_SHELL)"!="4nt"
--    $(TYPE) $(mktmp $(ZIPDEPFILES:s/\/\\/)) | $(XARGS) dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true
-+    $(QUIET_BUILD) $(TYPE) $(mktmp $(ZIPDEPFILES:s/\/\\/)) | $(XARGS) dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true
- .ENDIF			# "$(USE_SHELL)"!="4nt"
--	$(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" | grep -v "\.svn" >> $@
--	echo zipdep_langs=$(alllangiso) >> $@
-+	@$(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" | grep -v "\.svn" >> $@
-+	@echo zipdep_langs=$(alllangiso) >> $@
- 	@@-$(RM) $(ZIPDEPFILES)
- .ENDIF			# "$(nodep)"==""
- 
- # Dependencies fuer java - Files
- 
- $(MISC)$/%.dpj :
--	@echo Making dpj...
-+	@echo "Making:    java dependencies for" $(JAVACLASSFILES)
- .IF "$(nodep)"!=""
- .IF "$(GUI)"=="UNX"
- 	@echo > $@
-@@ -663,15 +713,17 @@ $(MISC)$/%.dpj :
- .ENDIF			# "$(nodep)"==""
- 
- $(SLO)$/%.obj : %.asm
-+.IF "$(QUIET_BUILD)"==""
- 	   @echo ------------------------------
--	   @echo Making: $@
-+.ENDIF
-+	   @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(COM)"=="GCC"
- .IF "$(ASM)"=="ml"
--	   $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm
-+	   $(QUIET_BUILD) $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm
- 	   @@-$(RM) $*.err
- .ELSE			# "$(ASM)"=="ml"
- 		@@-$(RM) $@
--		$(ASM) $(AFLAGS) $*.asm,$(SLO)$/$*.obj;
-+		$(QUIET_BUILD) $(ASM) $(AFLAGS) $*.asm,$(SLO)$/$*.obj;
- .ENDIF			# "$(ASM)"=="ml"
- .ELSE
- .IF "$(COM)"=="WTC"
-@@ -691,15 +743,17 @@ $(SLO)$/%.obj : %.asm
- .ENDIF
- 
- $(OBJ)$/%.obj : %.asm
-+.IF "$(QUIET_BUILD)"==""
- 	   @echo ------------------------------
--	   @echo Making: $@
-+.ENDIF
-+	   @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
- .IF "$(COM)"=="GCC"
- .IF "$(ASM)"=="ml"
--	   $(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)$/$*.obj $*.asm
-+	   $(QUIET_BUILD) $(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)$/$*.obj $*.asm
- 	   @@-$(RM) $*.err
- .ELSE			# "$(ASM)"=="ml"
- 		@@-$(RM) $@
--		$(ASM) $(AFLAGS) $*.asm,$(OBJ)$/$*.obj;
-+		$(QUIET_BUILD) $(ASM) $(AFLAGS) $*.asm,$(OBJ)$/$*.obj;
- .ENDIF			# "$(ASM)"=="ml"
- .ELSE
- .IF "$(COM)"=="MSC"
-@@ -721,9 +775,11 @@ $(OUT)$/ucrdoc$/$(IDLPACKAGE)$/%.urd : %.idl
- 
- # generate hid files
- $(SRS)$/%.hid : %.src
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making hid $@
--	$(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)$/bin$/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
-+.ENDIF
-+	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(*:f).src
-+	$(QUIET_BUILD) $(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)$/bin$/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
- 
- # make *.xml descriptions available in $(MISC)
- $(MISC)$/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml
-diff --git solenv/inc/settings.mk solenv/inc/settings.mk
-index 5daf506..50e38a0 100644
---- solenv/inc/settings.mk
-+++ solenv/inc/settings.mk
-@@ -311,6 +311,12 @@ PROFILE=
- DBGUTIL=
- dbgutil=
- 
-+.IF "$(VERBOSE)"=="" && "$(verbose)"==""
-+QUIET_BUILD*=@
-+.ELSE
-+QUIET_BUILD*=
-+.ENDIF
-+
- # ===========================================================================
- # unter NT werden Variablennamen an untergeordnete makefiles UPPERCASE
- # weitergereicht, aber case significant ausgewertet!
-diff --git solenv/inc/target.mk solenv/inc/target.mk
-index 01633b7..635da62 100644
---- solenv/inc/target.mk
-+++ solenv/inc/target.mk
-@@ -1292,7 +1292,7 @@ $(UNOUCRTARGET) : $(UNOUCRHEADER)
- # keep that one to rebuild single misses
- $(UNOUCRHEADER):
- 	@noop
--	
-+
- $(UNOUCRTARGET) : $(UNOUCRDEP)
- .IF "$(XML2MK_FILES)"!=""
- 	@@-$(RM) $(foreach,i,$(XML2MK_FILES) $(MISC)$/$(i).mk)
-@@ -1382,7 +1382,7 @@ $(HXXCOPYTARGET):	$(HXXCOPYFILES)
- 
- .IF "$(UNIXTEXT)"!=""
- $(UNIXTEXT) : $(UNIXTEXT:f)
--	@echo Making $@
-+	@echo "Making:   " $@
- 	@@-$(RM) -f $@
- 	@tr -d "\015" < $(@:f) > $@
- 
-@@ -1538,10 +1538,12 @@ $(MISC)$/$(TARGET)_%.done : %.xrb
- 
- .IF "$(COMMONPRJHIDOTHERTARGET)"!=""
- $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
-+.IF "$(QUIET_BUILD)"==""
-         @echo ------------------------------
--        @echo Making: $@
-+.ENDIF
-+		@echo "Making:   " $@
-         @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
--        $(TYPE) $(PRJHIDOTHERTARGET) > $@.$(ROUT).tmp 
-+        $(QUIET_BUILD) $(TYPE) $(PRJHIDOTHERTARGET) > $@.$(ROUT).tmp 
- 	    @$(RENAME) $@.$(ROUT).tmp $@
- .ENDIF	    
- 
-@@ -1686,7 +1688,10 @@ ZIPDEPPHONY=.PHONY
- .ENDIF
- 
- last_target:
--	@echo -------------
-+.IF "$(QUIET_BUILD)"==""
-+	@echo ------------- 
-+.ENDIF
-+	$(NULL)
- 
- $(MISC)$/$(TARGET)genjava.mk: 	$(IDLFILES)
- 
-@@ -1709,16 +1714,24 @@ $(TARGETDPJ) : $(JAVAFILES) $(JAVATARGET)
- .IF "$(NOOPT_FLAG)" == ""
- 
- $(NOOPTTARGET):
-+.IF "$(QUIET_BUILD)"==""
- 	@echo --- NOOPTFILES ---
-+.ENDIF
- 	@dmake $(MFLAGS) $(MAKEFILE) nopt=true $(NOOPTFILES) NOOPT_FLAG=TRUE $(CALLMACROS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo --- NOOPTFILES OVER ---
-+.ENDIF
- 
- $(NOOPTFILES):
-+.IF "$(QUIET_BUILD)"==""
- 	@echo --- NOOPT ---
-+.ENDIF
- 	@dmake $(MFLAGS) $(MAKEFILE) nopt=true NOOPT_FLAG=TRUE $(CALLMACROS) $@
-+.IF "$(QUIET_BUILD)"==""
- 	@echo --- NOOPT OVER ---
- .ENDIF
- .ENDIF
-+.ENDIF
- 
- 
- # ----------------------------------
-@@ -1729,14 +1742,22 @@ $(NOOPTFILES):
- .IF "$(EXCEPTIONSNOOPT_FLAG)" == ""
- 
- $(EXCEPTIONSNOOPTTARGET):
-+.IF "$(QUIET_BUILD)"==""
- 	@echo --- EXCEPTIONSNOOPTFILES ---
-+.ENDIF
- 	@dmake $(MFLAGS) $(MAKEFILE) ENABLE_EXCEPTIONS=true $(EXCEPTIONSNOOPTFILES) EXCEPTIONSNOOPT_FLAG=TRUE nopt=true $(CALLMACROS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo --- EXCEPTIONSNOOPTFILES OVER ---
-+.ENDIF
- 
- $(EXCEPTIONSNOOPTFILES):
-+.IF "$(QUIET_BUILD)"==""
- 	@echo --- EXCEPTIONSNOOPT ---
-+.ENDIF
- 	@dmake $(MFLAGS) $(MAKEFILE) ENABLE_EXCEPTIONS=true EXCEPTIONSNOOPT_FLAG=TRUE nopt=true $(CALLMACROS) $@
-+.IF "$(QUIET_BUILD)"==""
- 	@echo --- EXCEPTIONSNOOPT OVER ---
-+.ENDIF
- 
- 
- .ENDIF
-@@ -1946,10 +1967,14 @@ ZIPALLTARGET: \
- 		$(ZIP9TARGETN)
- .ELSE
- ZIPALLTARGET:
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ---
-+.ENDIF
- 	@echo nothing to zip for activated languages!
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ---
- .ENDIF
-+.ENDIF
- 
- 
- #temporary workaround for non-existing delzip in extras
-@@ -1998,10 +2023,12 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
- 
- #new hid.lst trigger with GEN_HID2=TRUE
- $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst .PHONY :
--	@echo Making $@ :
-+	@echo "Making:   " $@
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ---------------
-+.ENDIF
- 	@echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp
--	$(TYPE) $(SOLARCOMMONBINDIR)$/hid$/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp 
-+	$(QUIET_BUILD) $(TYPE) $(SOLARCOMMONBINDIR)$/hid$/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp 
- 	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- 	@-$(RENAME) $@.$(ROUT).tmp $@
- 	@-mkdir $(@:d)hid
-diff --git solenv/inc/tg_app.mk solenv/inc/tg_app.mk
-index 02a0014..386d147 100644
---- solenv/inc/tg_app.mk
-+++ solenv/inc/tg_app.mk
-@@ -119,7 +119,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
- 	$(APP$(TNR)IMP_ORD) \
- 	$(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
- 	@echo ------------------------------
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- 	@echo unx
-@@ -143,7 +143,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         app $(APP$(TNR)RPATH) $@
- .IF "$(TARGETTYPE)"=="GUI"
--	@echo "Making: $@.app"
-+	@echo "Making:   " $(@:f).app
- 	@macosx-create-bundle $@
- .ENDIF		# "$(TARGETTYPE)"=="GUI"
- .ELSE		# "$(OS)"=="MACOSX"
-diff --git solenv/inc/tg_def.mk solenv/inc/tg_def.mk
-index fc687ff..3efe3e9 100644
---- solenv/inc/tg_def.mk
-+++ solenv/inc/tg_def.mk
-@@ -101,8 +101,10 @@ $(DEF$(TNR)TARGETN) : \
- $(DEF$(TNR)TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(EMQ)"$(SHL$(TNR)TARGETN:f)$(EMQ)" 								 >$@.tmpfile
- .IF "$(COM)"!="GCC"
- 	@echo HEAPSIZE	  0 											>>$@.tmpfile
-@@ -217,8 +219,10 @@ $(DEF$(TNR)TARGETN) : \
- $(DEF$(TNR)TARGETN) .PHONY :
- .ENDIF			# "$(link_always)"==""
- 	@+-$(RM) $@.tmpfile
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making Module-Definitionfile : $@
-+.ENDIF
-+	@echo "Making:    module definition file" $(@:f)
- 	@echo LIBRARY	  $(SHL$(TNR)TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
- 	@echo DATA MULTIPLE	 >>$@.tmpfile
- 	@echo DESCRIPTION	'StarView 3.00 $(DEF$(TNR)DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
-diff --git solenv/inc/tg_dep.mk solenv/inc/tg_dep.mk
-index c30103f..d966234 100644
---- solenv/inc/tg_dep.mk
-+++ solenv/inc/tg_dep.mk
-@@ -66,9 +66,11 @@ ALLDEP .PHONY:
- .ENDIF			# "$(USE_SHELL)"=="4nt"
- .ENDIF			# "$(GROUPSHELL:b)"=="4dos"
- .ENDIF			# "$(DEPFILES)" != ""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ---
- 	@echo      $(PWD) - Old dependency files removed or updated
- 	@echo ---
-+.ENDIF
- 
- 
- ALLDPC: \
-@@ -108,13 +110,17 @@ ALLDPC: \
- 
- 
- ALLDPC:
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
- 	@echo No Dependencies
-+.ENDIF
- 	@echo $(EMQ)# > $(MISC)$/$(TARGET).dpc
- 
- ALLDEP:
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
- 	@echo No Dependencies
-+.ENDIF
- 
- .ENDIF
- 
-diff --git solenv/inc/tg_java.mk solenv/inc/tg_java.mk
-index c1beb30..fed22e2 100644
---- solenv/inc/tg_java.mk
-+++ solenv/inc/tg_java.mk
-@@ -34,8 +34,10 @@
- $(CLASSDIR)$/com$/sun$/star$/upd$/$(VERSIONINFOFILE)_updversion.class .PHONY: $(MISC)$/java$/com$/sun$/star$/upd$/$(VERSIONINFOFILE)_updversion.java 
- 
- $(MISC)$/java$/com$/sun$/star$/upd$/$(VERSIONINFOFILE)_updversion.java .PHONY:
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(MKDIRHIER) $(MISC)$/java$/com$/sun$/star$/upd
- .IF "$(GUI)"=="UNX"
- 	@echo package com.sun.star.upd\; > $@
-diff --git solenv/inc/tg_lib.mk solenv/inc/tg_lib.mk
-index ceb6d51..bc02f97 100644
---- solenv/inc/tg_lib.mk
-+++ solenv/inc/tg_lib.mk
-@@ -37,7 +37,7 @@
- .IF "$(LIB$(TNR)ARCHIV)" != ""
- 
- $(LIB$(TNR)ARCHIV) :	$(LIB$(TNR)TARGET)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
-@@ -73,10 +73,12 @@ $(LIB$(TNR)ARCHIV) :	$(LIB$(TNR)TARGET)
- $(LIB$(TNR)TARGET) :	$(LIB$(TNR)FILES) \
- 						$(LIB$(TNR)OBJFILES) \
- 						$(LIB$(TNR)DEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo using: $(LIB$(TNR)FILES)
- 	@echo using: $(LIB$(TNR)TARGET)
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $@
- .IF "$(GUI)"=="UNX"
- 	@echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-diff --git solenv/inc/tg_obj.mk solenv/inc/tg_obj.mk
-index beb5574..28e24aa 100644
---- solenv/inc/tg_obj.mk
-+++ solenv/inc/tg_obj.mk
-@@ -33,8 +33,10 @@ MKFILENAME:=TG_OBJ.MK
- 
- .IF "$(OBJTARGET)"!=""
- $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="OS2"
- .IF "$(LIBTARGET)"!="NO"
- 	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-@@ -53,7 +55,7 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
- .ENDIF			# "$(COM)"=="GCC"
- .ENDIF			# "$(GUI)"=="WNT"
- .IF "$(GUI)"=="UNX"
--	echo $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 > $@
-+	$(QUIET_BUILD) echo $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 > $@
- .IF "$(OS)"=="MACOSX"
- 	@-nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
- .ELSE
-@@ -66,8 +68,10 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
- .IF "$(SECOND_BUILD)"!=""
- .IF "$($(SECOND_BUILD)OBJTARGET)"!=""
- $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="OS2"
- .IF "$(LIBTARGET)"!="NO"
- 	@-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-@@ -87,7 +91,7 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
- .ENDIF
- .ENDIF			# "$(GUI)"=="WNT"
- .IF "$(GUI)"=="UNX"
--	echo $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 >> $@
-+	$(QUIET_BUILD) echo $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 >> $@
- .ENDIF			# "$(GUI)"=="UNX"
- .ENDIF			# "$($(SECOND_BUILD)OBJTARGET)"!=""
- .ENDIF			# "$(SECOND_BUILD)"!=""
-diff --git solenv/inc/tg_res.mk solenv/inc/tg_res.mk
-index ef8e682..827c99c 100644
---- solenv/inc/tg_res.mk
-+++ solenv/inc/tg_res.mk
-@@ -33,8 +33,10 @@
- .IF "$(RCTARGET)"!=""
- $(RCTARGET): $(RCFILES) 		\
- 			 $(RCDEPN)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(CCNUMVER)" > "001300000000"
- .IF "$(MFC_INCLUDE)"!=""
- 	$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) -I$(MFC_INCLUDE) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
-diff --git solenv/inc/tg_rslb.mk solenv/inc/tg_rslb.mk
-index b30a3f2..09390ca 100644
---- solenv/inc/tg_rslb.mk
-+++ solenv/inc/tg_rslb.mk
-@@ -40,11 +40,13 @@ HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB$(TNR
- #HACK cut off the dirty srs files which are included from solver
- RESLIB$(TNR)HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB$(TNR)SRSFILES)))
- $(HIDRES$(TNR)PARTICLE): $(RESLIB$(TNR)HIDFILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
--	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- # need to strip since solaris cannot handle tab-only whitespace here
--    $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- 	@$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDRES$(TNR)PARTICLE)
-@@ -57,7 +59,7 @@ $(RSC_MULTI$(TNR)) : \
- 		$(RESLIB$(TNR)BMPS)
-     @echo using rsc multi-res feature
- .IF "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -72,7 +74,7 @@ $(RSC_MULTI$(TNR)) : \
- 	$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
- 	) > $(NULLDEV)
- .ELSE			# "$(common_build_reslib)"!=""
--	$(RSC) -presponse @$(mktmp \
-+	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
- 	-r -p \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-@@ -91,7 +93,7 @@ $(RSC_MULTI$(TNR)) : \
- $(RESLIB$(TNR)TARGETN): \
- 		$(RESLIB$(TNR)SRSFILES) \
- 		$(RESLIB$(TNR)BMPS)
--	@echo Making: $@
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX"
- .IF "$(common_build_reslib)"!=""
-     @@-$(RM) $(RSC_MULTI$(TNR))
-diff --git solenv/inc/tg_scp.mk solenv/inc/tg_scp.mk
-index e709205..20a2f37 100644
---- solenv/inc/tg_scp.mk
-+++ solenv/inc/tg_scp.mk
-@@ -43,8 +43,10 @@ $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
- LOCALSCP$(TNR)FILES=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
- 
- $(SCP$(TNR)TARGETN): $(LOCALSCP$(TNR)FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(MKDIRHIER) $(BIN)$/$(SCP$(TNR)LINK_PRODUCT_TYPE)
- 	$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP$(TNR)FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
- .ENDIF
-diff --git solenv/inc/tg_sdi.mk solenv/inc/tg_sdi.mk
-index 1cd1564..0788b96 100644
---- solenv/inc/tg_sdi.mk
-+++ solenv/inc/tg_sdi.mk
-@@ -35,8 +35,10 @@
- 
- .IF "$(HIDSID$(TNR)PARTICLE)"!=""
- $(HIDSID$(TNR)PARTICLE): $(SDI$(TNR)TARGET)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@.$(ROUT).tmp $@
- .IF "$(USE_SHELL)"=="4nt"
- 	@$(TYPE) $(MISC)$/$(SDI$(TNR)NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-@@ -49,8 +51,10 @@ $(HIDSID$(TNR)PARTICLE): $(SDI$(TNR)TARGET)
- 
- .IF "$(SDI$(TNR)TARGET)"!=""
- $(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND) $(SDI$(TNR)NAME).sdi
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@-$(RM) $@
- 	$(SVIDL) @$(mktmp \
- 	-fs$(INCCOMX)$/$(SDI$(TNR)NAME).hxx	\
-diff --git solenv/inc/tg_shl.mk solenv/inc/tg_shl.mk
-index fb8457d..489ba05 100644
---- solenv/inc/tg_shl.mk
-+++ solenv/inc/tg_shl.mk
-@@ -79,7 +79,7 @@ SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)T
- .ENDIF          # "$(GUI)" == "UNX"
- $(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL$(TNR)VERSIONOBJ:b).h
- #    $(COPY) $(SOLARENV)$/src$/version.c $@
--	$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@
-+	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@
- 
- .INIT : $(SHL$(TNR)VERSIONOBJDEP)
- .ENDIF			# "$(VERSIONOBJ)"!=""
-@@ -141,16 +141,20 @@ $(USE_SHL$(TNR)VERSIONMAP): \
- .ENDIF
- .ENDIF			# "$(SHL$(TNR)OBJS)!"=""
- 	@$(TYPE) /dev/null $(SHL$(TNR)LIBS:s/.lib/.dump/) >> $@.dump
--	$(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL$(TNR)INTERFACE) -f $(SHL$(TNR)FILTERFILE) -m $@
-+	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL$(TNR)INTERFACE) -f $(SHL$(TNR)FILTERFILE) -m $@
- 
- .ELSE			# "$(SHL$(TNR)FILTERFILE)"!=""
- USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)TARGET).vmap
- $(USE_SHL$(TNR)VERSIONMAP) :
-+.IF "$(QUIET_BUILD)"==""
- 	@echo -----------------------------
- 	@echo SHL$(TNR)FILTERFILE not set!
- 	@echo -----------------------------
- 	@$(TOUCH) $@
- 	@echo dummy file to keep the dependencies for later use.
-+.ELSE
-+	@$(TOUCH) $@
-+.ENDIF
- #	force_dmake_to_error
- .ENDIF			# "$(SHL$(TNR)FILTERFILE)"!=""
- .ELSE			# "$(USE_SHL$(TNR)VERSIONMAP)"!=""
-@@ -177,11 +181,11 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
- # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
- # happens if somebody will change it in the future
- .IF "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
- .ELIF "$(COMNAME)"=="sunpro5"
--	tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
- .ELSE           # "$(COMID)"=="gcc3"
--	tr -d "\015" < $(SHL$(TNR)VERSIONMAP) > $@
-+	$(QUIET_BUILD) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) > $@
- .ENDIF          # "$(COMID)"=="gcc3"
- 	@chmod a+w $@
- # Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -287,8 +291,10 @@ $(SHL$(TNR)TARGETN) : \
- 					$(SHL$(TNR)DEPN) \
- 					$(SHL$(TNR)IMP_ORD) \
- 					$(SHL$(TNR)LINKLIST)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $(SHL$(TNR)TARGETN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(SHL$(TNR)DEFAULTRES)"!=""
- 	@@-$(RM) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-@@ -465,7 +471,7 @@ $(SHL$(TNR)TARGETN) : \
- 	@+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-     @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
-         shl $(SHL$(TNR)RPATH) $@
--	@echo "Making: $@.jnilib"
-+	@echo "Making:   " $(@:f).jnilib
- 	@macosx-create-bundle $@
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL$(TNR)NOCHECK)"==""
-@@ -475,22 +481,24 @@ $(SHL$(TNR)TARGETN) : \
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
- 	@echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)SONAME) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
--	$(SHL$(TNR)VERSIONOBJ) -o $@ \
--	`cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-+		$(SHL$(TNR)VERSIONOBJ) -o $@ \
-+		`cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-+		$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
- .IF "$(UPDATER)"=="YES"
- .IF "$(SHL$(TNR)NOCHECK)"==""
--	-$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
--	$(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
--	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-+	$(QUIET_BUILD) -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-+	$(QUIET_BUILD) $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
- .ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
- .IF "$(UNIXVERSIONNAMES)"!=""
--	$(RM) $(LB)$/$(SHL$(TNR)TARGETN:b)
--	cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b)
-+	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL$(TNR)TARGETN:b)
-+	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
- 	@ls -l $@
- .ENDIF			# "$(GUI)" == "UNX"
-@@ -601,8 +609,10 @@ $(SHL$(TNR)IMPLIBN):	\
- $(SHL$(TNR)IMPLIBN):	\
- 					$(SHL$(TNR)LIBS)
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------1
--	@echo Making: $(SHL$(TNR)IMPLIBN)
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)" == "WNT"
- .IF "$(COM)"=="GCC"
- 	@echo no ImportLibs on mingw
-diff --git solenv/inc/tg_slo.mk solenv/inc/tg_slo.mk
-index 42a7ba5..8cb7e48 100644
---- solenv/inc/tg_slo.mk
-+++ solenv/inc/tg_slo.mk
-@@ -38,8 +38,10 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
- 	@echo $(SLOTARGET)
- 	@echo $(&:+"\n")
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- #	@$(RM) $@
- .IF "$(GUI)"=="WNT"
- .IF "$(COM)"=="GCC"
-@@ -60,7 +62,7 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
- .ENDIF			# "$(GUI)"=="OS2"
- 
- .IF "$(GUI)"=="UNX"
--	echo $(foreach,i,$(SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) | xargs -n1 > $@
-+	$(QUIET_BUILD) echo $(foreach,i,$(SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) | xargs -n1 > $@
- .IF "$(OS)"=="MACOSX"
- 	@-nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
- .ELSE
-@@ -76,8 +78,10 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES)
- 	@echo $(REAL_$(SECOND_BUILD)SLOTARGET)
- 	@echo $(&:+"\n")
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="WNT"
- .IF "$(COM)"=="GCC"
- 	+$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i)) | xargs -n1 > $@
-@@ -98,7 +102,7 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES)
- .ENDIF			# "$(GUI)"=="WNT"
- 
- .IF "$(GUI)"=="UNX"
--	echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) | xargs -n1 > $@
-+	$(QUIET_BUILD) echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) | xargs -n1 > $@
- .ENDIF			# "$(GUI)"=="UNX"
- .ENDIF			# "$($(SECOND_BUILD)SLOTARGET)"!=""
- .ENDIF			# "$(SECOND_BUILD)"!=""
-diff --git solenv/inc/tg_srs.mk solenv/inc/tg_srs.mk
-index 57dd6c1..dc686d4 100644
---- solenv/inc/tg_srs.mk
-+++ solenv/inc/tg_srs.mk
-@@ -37,10 +37,12 @@
- HID$(TNR)FILES=$(foreach,i,$(SRC$(TNR)FILES:f) $(SRS)$/$(i:s/.src/.hid/))
- HIDSRS$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS$(TNR)NAME)_srs.hid
- $(HIDSRS$(TNR)PARTICLE) : $(HID$(TNR)FILES)
-+.IF "$(QUIET_BUILD)"==""
-     @echo ------------------------------
--    @echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @-$(RM) $@
--    $(TYPE) $(mktmp  $(subst,$/,/ $(HID$(TNR)FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-+    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID$(TNR)FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-     @$(RENAME) $@.$(ROUT).tmp $@
- 
- ALLTAR : $(HIDSRS$(TNR)PARTICLE)
-@@ -48,40 +50,59 @@ ALLTAR : $(HIDSRS$(TNR)PARTICLE)
- .ENDIF # "$(BUILDHIDS)"!=""
- 
- $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
- 
- $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr
--	$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
-+	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
- 
- .IF "$(WITH_LANG)"!=""
- 
- $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
--	-$(MKDIR) $(@:d)
--    -$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
-+	@-$(MKDIR) $(@:d)
-+    @-$(RM) $@
- 	-$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
- 	$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
--    $(RENAME) $@.$(INPATH) $@
--    -$(RM) $@.$(INPATH)
-+.ELSE
-+	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-+    @-$(RM) $@
-+	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-+.ENDIF
-+    @$(RENAME) $@.$(INPATH) $@
-+    @-$(RM) $@.$(INPATH)
- 
- $(SRS)$/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST)
- 
- $(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i)
- .ELSE			# "$(WITH_LANG)"!=""
- $(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
- .ENDIF			# "$(WITH_LANG)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-+.IF "$(QUIET_BUILD)"==""
- 	$(RSC) -presponse @$(mktmp \
- 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
- 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
- 		-fp=$@.$(INPATH) \
- 		$< \
- 	)
--	-$(RM) $@
--	$(RENAME) $@.$(INPATH) $@
--	-$(RM) $@.$(INPATH)
-+.ELSE
-+	@ $(RSC) -presponse @$(mktmp \
-+		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-+		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-+		-fp=$@.$(INPATH) \
-+		$< \
-+	) $(PIPEERROR) cat - > /dev/null
-+.ENDIF
-+	@-$(RM) $@
-+	@$(RENAME) $@.$(INPATH) $@
-+	@-$(RM) $@.$(INPATH)
- 
- .ENDIF          # "$(SRS$(TNR)NAME)"!=""
- 
-diff --git solenv/inc/tg_yxx.mk solenv/inc/tg_yxx.mk
-index f228a3d..0031914 100644
---- solenv/inc/tg_yxx.mk
-+++ solenv/inc/tg_yxx.mk
-@@ -31,8 +31,10 @@
- 
- 
- $(MISC)$/%.cxx : %.y
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt"
- 	tr -d "\015" < $< > $(MISC)$/stripped_$<
- .ELSE
-@@ -46,8 +48,10 @@ $(MISC)$/%.cxx : %.y
- 	$(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV)
- 
- $(INCCOM)$/yy%.cxx : %.y
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
- .IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt"
- 	tr -d "\015" < $< > $(MISC)$/stripped_$<
- .ELSE
-diff --git solenv/inc/tg_zip.mk solenv/inc/tg_zip.mk
-index 8561c6b..bc3cd5d 100644
---- solenv/inc/tg_zip.mk
-+++ solenv/inc/tg_zip.mk
-@@ -118,8 +118,10 @@ $(ZIP$(TNR)DEPFILE) :
- 
- 
- $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS)
-+.IF "$(QUIET_BUILD)"==""
- 	@echo ------------------------------
--	@echo Making: $@
-+.ENDIF
-+	@echo "Making:   " $(@:f)
-     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
- 	@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
- 	@echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-diff --git vcl/source/window/makefile.mk vcl/source/window/makefile.mk
-index 2893863..2a78933 100644
---- vcl/source/window/makefile.mk
-+++ vcl/source/window/makefile.mk
-@@ -96,10 +96,10 @@ SLOFILES= \
- 
- $(INCCOM)$/cuilib.hxx: makefile.mk
- .IF "$(GUI)"=="UNX"
--    $(RM) $@
--    echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+    @$(RM) $@
-+    @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ELSE
--    echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
-+    @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
- .ENDIF
- 
- $(SLO)$/abstdlg.obj : $(INCCOM)$/cuilib.hxx
-diff --git vcl/unx/source/gdi/makefile.mk vcl/unx/source/gdi/makefile.mk
-index 4f2f640..ba1323e 100644
---- vcl/unx/source/gdi/makefile.mk
-+++ vcl/unx/source/gdi/makefile.mk
-@@ -109,9 +109,9 @@ ALLTAR : $(MACOSXRC)
- XSALSETLIBNAME=$(DLLPRE)spa$(DLLPOSTFIX)$(DLLPOST)
- 
- $(INCCOM)$/rtsname.hxx:
--	rm -f $(INCCOM)$/rtsname.hxx ; \
--	echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx
-+	@rm -f $(INCCOM)$/rtsname.hxx ; \
-+		echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx
- 
- $(SLO)$/salpimpl.obj : $(INCCOM)$/rtsname.hxx
- $(SLO)$/salprnpsp.obj : $(INCCOM)$/rtsname.hxx
- 
diff --git a/applied_patches/0011-dbaccess-default-varchar-lenght.diff b/applied_patches/0026-dbaccess-default-varchar-lenght.diff
similarity index 100%
rename from applied_patches/0011-dbaccess-default-varchar-lenght.diff
rename to applied_patches/0026-dbaccess-default-varchar-lenght.diff
diff --git a/applied_patches/0026-quiet-build-more.diff b/applied_patches/0026-quiet-build-more.diff
deleted file mode 100644
index 41913895f..000000000
--- a/applied_patches/0026-quiet-build-more.diff
+++ /dev/null
@@ -1,814 +0,0 @@
-More quiet build stuff
-
-From: Thorsten Behrens <thb@openoffice.org>
-
-
----
-
- dmake/make.c                 |    5 ++-
- dmake/tests/misc-13          |    2 +
- dmake/tests/misc-15          |    2 +
- dmake/tests/targets-28       |    4 +-
- solenv/bin/checkdll.sh       |    2 +
- solenv/inc/_tg_lib.mk        |   60 ++++++++++++++++++++++++++++++++
- solenv/inc/_tg_shl.mk        |   80 +++++++++++++++++++++++++++++++++++++-----
- solenv/inc/tg_lib.mk         |    6 +++
- solenv/inc/tg_shl.mk         |    8 ++++
- soltools/checkdll/checkdll.c |   16 ++++++--
- 10 files changed, 162 insertions(+), 23 deletions(-)
-
-
-diff --git dmake/make.c dmake/make.c
-index 4f120a6..7ad8fd1 100644
---- dmake/make.c
-+++ dmake/make.c
-@@ -251,8 +251,9 @@ Make_targets()/*
- 
-    for( lp = Targets->ce_prq; lp != NIL(LINK); lp = lp->cl_next ) {
-       CELLPTR tgt = lp->cl_prq;
--      if( !(tgt->ce_attr & A_UPDATED) )
--	 printf( "`%s' is up to date\n", tgt->CE_NAME );
-+      if( !(tgt->ce_attr & A_UPDATED) 
-+          && (Verbose & V_MAKE) )
-+          printf( "`%s' is up to date\n", tgt->CE_NAME );
-    }
- 
-    DB_RETURN( 0 );
-diff --git dmake/tests/misc-13 dmake/tests/misc-13
-index a2381a8..7493e74 100755
---- dmake/tests/misc-13
-+++ dmake/tests/misc-13
-@@ -38,7 +38,7 @@ TeSt.target :
- 
- EOT
- 
--output=`eval ${DMAKEPROG} -r -f $file1`
-+output=`eval ${DMAKEPROG} -vm -r -f $file1`
- result=$?
- 
- if echo "$output" | grep -v ".target' is up to date"  > /dev/null 2>&1 ; then
-diff --git dmake/tests/misc-15 dmake/tests/misc-15
-index 1c52324..a213c2d 100755
---- dmake/tests/misc-15
-+++ dmake/tests/misc-15
-@@ -37,7 +37,7 @@ MYTARGET:=\$(PWD)/target.abc
- 
- EOT
- 
--output=`eval ${DMAKEPROG} -r -f $file1`
-+output=`eval ${DMAKEPROG} -vm -r -f $file1`
- result=$?
- 
- if echo "$output" | grep "target.abc' is up to date"  > /dev/null 2>&1 ; then
-diff --git dmake/tests/targets-28 dmake/tests/targets-28
-index da202b0..0943eb6 100755
---- dmake/tests/targets-28
-+++ dmake/tests/targets-28
-@@ -112,10 +112,10 @@ sleep 1
- 
- # This tests that aa.x is not build as the dependency chain is intact with
- # the virtual target aa.y having the same time stamp as aa.z.
--output3=`eval ${DMAKEPROG} -rf $file1 2>&1`
-+output3=`eval ${DMAKEPROG} -vm -rf $file1 2>&1`
- result3=$?
- 
--if test $result3 = 0 -a "$output3" = "\`aa.x' is up to date" ; then
-+if test $result3 = 0 && echo "$output3" | grep "aa.x' is up to date"  > /dev/null 2>&1 ; then
-   echo "Subtest 3: OK"
-   result3=0
- else
-diff --git solenv/bin/checkdll.sh solenv/bin/checkdll.sh
-index 776b580..0218df6 100755
---- solenv/bin/checkdll.sh
-+++ solenv/bin/checkdll.sh
-@@ -77,7 +77,7 @@ if [ -x $checkdll ]; then
-         export LD_LIBRARY_PATH;;
-     esac
- 
--    $checkdll "$*"
-+    $checkdll "$@"
-     if [ $? -ne 0 ]; then exit 1 ; fi
- 
-     for parameter in $*; do
-diff --git solenv/inc/_tg_lib.mk solenv/inc/_tg_lib.mk
-index 103e283..258378c 100644
---- solenv/inc/_tg_lib.mk
-+++ solenv/inc/_tg_lib.mk
-@@ -21,14 +21,18 @@ $(LIB1ARCHIV) :	$(LIB1TARGET)
- .IF "$(OS)" == "MACOSX"
-  	@echo  ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB1ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB1ARCHIV:b).cmd
- .ELSE			# "$(GUI)"=="UNX"
- .IF "$(GUI)$(COM)"=="WNTGCC"
- 	@+-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd
- 	@+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB1ARCHIV:b).cmd
- 	@+echo  ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB1ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB1ARCHIV:b).cmd
- .ELSE
- 	@echo just a dummy > $@
-@@ -86,7 +90,9 @@ $(LIB1TARGET) :	$(LIB1FILES) \
- .ENDIF          # "$(LIB1FILES)"!=""    
- .ELSE			# "$(GUI)"=="WNT"
- 	@-$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
- 	echo $(LIBMGR) r $@ $(LIB1OBJFILES)
-+.ENDIF
- 	$(LIBMGR) r $@ $(LIB1OBJFILES) $(LIB1FILES) bla.lib
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF          # "$(GUI)"=="UNX"
-@@ -116,14 +122,18 @@ $(LIB2ARCHIV) :	$(LIB2TARGET)
- .IF "$(OS)" == "MACOSX"
-  	@echo  ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB2ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB2ARCHIV:b).cmd
- .ELSE			# "$(GUI)"=="UNX"
- .IF "$(GUI)$(COM)"=="WNTGCC"
- 	@+-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd
- 	@+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB2ARCHIV:b).cmd
- 	@+echo  ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB2ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB2ARCHIV:b).cmd
- .ELSE
- 	@echo just a dummy > $@
-@@ -181,7 +191,9 @@ $(LIB2TARGET) :	$(LIB2FILES) \
- .ENDIF          # "$(LIB2FILES)"!=""    
- .ELSE			# "$(GUI)"=="WNT"
- 	@-$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
- 	echo $(LIBMGR) r $@ $(LIB2OBJFILES)
-+.ENDIF
- 	$(LIBMGR) r $@ $(LIB2OBJFILES) $(LIB2FILES) bla.lib
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF          # "$(GUI)"=="UNX"
-@@ -211,14 +223,18 @@ $(LIB3ARCHIV) :	$(LIB3TARGET)
- .IF "$(OS)" == "MACOSX"
-  	@echo  ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB3ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB3ARCHIV:b).cmd
- .ELSE			# "$(GUI)"=="UNX"
- .IF "$(GUI)$(COM)"=="WNTGCC"
- 	@+-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd
- 	@+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB3ARCHIV:b).cmd
- 	@+echo  ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB3ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB3ARCHIV:b).cmd
- .ELSE
- 	@echo just a dummy > $@
-@@ -276,7 +292,9 @@ $(LIB3TARGET) :	$(LIB3FILES) \
- .ENDIF          # "$(LIB3FILES)"!=""    
- .ELSE			# "$(GUI)"=="WNT"
- 	@-$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
- 	echo $(LIBMGR) r $@ $(LIB3OBJFILES)
-+.ENDIF
- 	$(LIBMGR) r $@ $(LIB3OBJFILES) $(LIB3FILES) bla.lib
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF          # "$(GUI)"=="UNX"
-@@ -306,14 +324,18 @@ $(LIB4ARCHIV) :	$(LIB4TARGET)
- .IF "$(OS)" == "MACOSX"
-  	@echo  ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB4ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB4ARCHIV:b).cmd
- .ELSE			# "$(GUI)"=="UNX"
- .IF "$(GUI)$(COM)"=="WNTGCC"
- 	@+-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd
- 	@+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB4ARCHIV:b).cmd
- 	@+echo  ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB4ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB4ARCHIV:b).cmd
- .ELSE
- 	@echo just a dummy > $@
-@@ -371,7 +393,9 @@ $(LIB4TARGET) :	$(LIB4FILES) \
- .ENDIF          # "$(LIB4FILES)"!=""    
- .ELSE			# "$(GUI)"=="WNT"
- 	@-$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
- 	echo $(LIBMGR) r $@ $(LIB4OBJFILES)
-+.ENDIF
- 	$(LIBMGR) r $@ $(LIB4OBJFILES) $(LIB4FILES) bla.lib
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF          # "$(GUI)"=="UNX"
-@@ -401,14 +425,18 @@ $(LIB5ARCHIV) :	$(LIB5TARGET)
- .IF "$(OS)" == "MACOSX"
-  	@echo  ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB5ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB5ARCHIV:b).cmd
- .ELSE			# "$(GUI)"=="UNX"
- .IF "$(GUI)$(COM)"=="WNTGCC"
- 	@+-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd
- 	@+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB5ARCHIV:b).cmd
- 	@+echo  ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB5ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB5ARCHIV:b).cmd
- .ELSE
- 	@echo just a dummy > $@
-@@ -466,7 +494,9 @@ $(LIB5TARGET) :	$(LIB5FILES) \
- .ENDIF          # "$(LIB5FILES)"!=""    
- .ELSE			# "$(GUI)"=="WNT"
- 	@-$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
- 	echo $(LIBMGR) r $@ $(LIB5OBJFILES)
-+.ENDIF
- 	$(LIBMGR) r $@ $(LIB5OBJFILES) $(LIB5FILES) bla.lib
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF          # "$(GUI)"=="UNX"
-@@ -496,14 +526,18 @@ $(LIB6ARCHIV) :	$(LIB6TARGET)
- .IF "$(OS)" == "MACOSX"
-  	@echo  ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB6ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB6ARCHIV:b).cmd
- .ELSE			# "$(GUI)"=="UNX"
- .IF "$(GUI)$(COM)"=="WNTGCC"
- 	@+-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd
- 	@+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB6ARCHIV:b).cmd
- 	@+echo  ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB6ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB6ARCHIV:b).cmd
- .ELSE
- 	@echo just a dummy > $@
-@@ -561,7 +595,9 @@ $(LIB6TARGET) :	$(LIB6FILES) \
- .ENDIF          # "$(LIB6FILES)"!=""    
- .ELSE			# "$(GUI)"=="WNT"
- 	@-$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
- 	echo $(LIBMGR) r $@ $(LIB6OBJFILES)
-+.ENDIF
- 	$(LIBMGR) r $@ $(LIB6OBJFILES) $(LIB6FILES) bla.lib
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF          # "$(GUI)"=="UNX"
-@@ -591,14 +627,18 @@ $(LIB7ARCHIV) :	$(LIB7TARGET)
- .IF "$(OS)" == "MACOSX"
-  	@echo  ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB7ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB7ARCHIV:b).cmd
- .ELSE			# "$(GUI)"=="UNX"
- .IF "$(GUI)$(COM)"=="WNTGCC"
- 	@+-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd
- 	@+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB7ARCHIV:b).cmd
- 	@+echo  ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB7ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB7ARCHIV:b).cmd
- .ELSE
- 	@echo just a dummy > $@
-@@ -656,7 +696,9 @@ $(LIB7TARGET) :	$(LIB7FILES) \
- .ENDIF          # "$(LIB7FILES)"!=""    
- .ELSE			# "$(GUI)"=="WNT"
- 	@-$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
- 	echo $(LIBMGR) r $@ $(LIB7OBJFILES)
-+.ENDIF
- 	$(LIBMGR) r $@ $(LIB7OBJFILES) $(LIB7FILES) bla.lib
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF          # "$(GUI)"=="UNX"
-@@ -686,14 +728,18 @@ $(LIB8ARCHIV) :	$(LIB8TARGET)
- .IF "$(OS)" == "MACOSX"
-  	@echo  ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB8ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB8ARCHIV:b).cmd
- .ELSE			# "$(GUI)"=="UNX"
- .IF "$(GUI)$(COM)"=="WNTGCC"
- 	@+-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd
- 	@+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB8ARCHIV:b).cmd
- 	@+echo  ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB8ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB8ARCHIV:b).cmd
- .ELSE
- 	@echo just a dummy > $@
-@@ -751,7 +797,9 @@ $(LIB8TARGET) :	$(LIB8FILES) \
- .ENDIF          # "$(LIB8FILES)"!=""    
- .ELSE			# "$(GUI)"=="WNT"
- 	@-$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
- 	echo $(LIBMGR) r $@ $(LIB8OBJFILES)
-+.ENDIF
- 	$(LIBMGR) r $@ $(LIB8OBJFILES) $(LIB8FILES) bla.lib
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF          # "$(GUI)"=="UNX"
-@@ -781,14 +829,18 @@ $(LIB9ARCHIV) :	$(LIB9TARGET)
- .IF "$(OS)" == "MACOSX"
-  	@echo  ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB9ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB9ARCHIV:b).cmd
- .ELSE			# "$(GUI)"=="UNX"
- .IF "$(GUI)$(COM)"=="WNTGCC"
- 	@+-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd
- 	@+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB9ARCHIV:b).cmd
- 	@+echo  ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB9ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB9ARCHIV:b).cmd
- .ELSE
- 	@echo just a dummy > $@
-@@ -846,7 +898,9 @@ $(LIB9TARGET) :	$(LIB9FILES) \
- .ENDIF          # "$(LIB9FILES)"!=""    
- .ELSE			# "$(GUI)"=="WNT"
- 	@-$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
- 	echo $(LIBMGR) r $@ $(LIB9OBJFILES)
-+.ENDIF
- 	$(LIBMGR) r $@ $(LIB9OBJFILES) $(LIB9FILES) bla.lib
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF          # "$(GUI)"=="UNX"
-@@ -876,14 +930,18 @@ $(LIB10ARCHIV) :	$(LIB10TARGET)
- .IF "$(OS)" == "MACOSX"
-  	@echo  ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB10ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB10ARCHIV:b).cmd
- .ELSE			# "$(GUI)"=="UNX"
- .IF "$(GUI)$(COM)"=="WNTGCC"
- 	@+-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd
- 	@+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB10ARCHIV:b).cmd
- 	@+echo  ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB10ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB10ARCHIV:b).cmd
- .ELSE
- 	@echo just a dummy > $@
-@@ -941,7 +999,9 @@ $(LIB10TARGET) :	$(LIB10FILES) \
- .ENDIF          # "$(LIB10FILES)"!=""    
- .ELSE			# "$(GUI)"=="WNT"
- 	@-$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
- 	echo $(LIBMGR) r $@ $(LIB10OBJFILES)
-+.ENDIF
- 	$(LIBMGR) r $@ $(LIB10OBJFILES) $(LIB10FILES) bla.lib
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF          # "$(GUI)"=="UNX"
-diff --git solenv/inc/_tg_shl.mk solenv/inc/_tg_shl.mk
-index a9f08dc..19afa21 100644
---- solenv/inc/_tg_shl.mk
-+++ solenv/inc/_tg_shl.mk
-@@ -459,7 +459,11 @@ $(SHL1TARGETN) : \
- .IF "$(SHL1NOCHECK)"==""
- 	$(QUIET_BUILD) -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
- 	$(QUIET_BUILD) $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
--	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-+.IF "$(QUIET_BUILD)"==""
-+	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-+.ELSE
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) -- -s $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-+.ENDIF
- .ENDIF				# "$(SHL1NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
-@@ -467,7 +471,9 @@ $(SHL1TARGETN) : \
- 	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL1TARGETN:b)
- 	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@ls -l $@
-+.ENDIF
- .ENDIF			# "$(GUI)" == "UNX"
- 
- .IF "$(GUI)" == "OS2"
-@@ -1007,7 +1013,11 @@ $(SHL2TARGETN) : \
- .IF "$(SHL2NOCHECK)"==""
- 	$(QUIET_BUILD) -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
- 	$(QUIET_BUILD) $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
--	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-+.IF "$(QUIET_BUILD)"==""
-+	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-+.ELSE
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) -- -s $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-+.ENDIF
- .ENDIF				# "$(SHL2NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
-@@ -1015,7 +1025,9 @@ $(SHL2TARGETN) : \
- 	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL2TARGETN:b)
- 	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@ls -l $@
-+.ENDIF
- .ENDIF			# "$(GUI)" == "UNX"
- 
- .IF "$(GUI)" == "OS2"
-@@ -1555,7 +1567,11 @@ $(SHL3TARGETN) : \
- .IF "$(SHL3NOCHECK)"==""
- 	$(QUIET_BUILD) -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
- 	$(QUIET_BUILD) $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
--	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-+.IF "$(QUIET_BUILD)"==""
-+	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-+.ELSE
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) -- -s $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-+.ENDIF
- .ENDIF				# "$(SHL3NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
-@@ -1563,7 +1579,9 @@ $(SHL3TARGETN) : \
- 	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL3TARGETN:b)
- 	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@ls -l $@
-+.ENDIF
- .ENDIF			# "$(GUI)" == "UNX"
- 
- .IF "$(GUI)" == "OS2"
-@@ -2103,7 +2121,11 @@ $(SHL4TARGETN) : \
- .IF "$(SHL4NOCHECK)"==""
- 	$(QUIET_BUILD) -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
- 	$(QUIET_BUILD) $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
--	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-+.IF "$(QUIET_BUILD)"==""
-+	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-+.ELSE
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) -- -s $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-+.ENDIF
- .ENDIF				# "$(SHL4NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
-@@ -2111,7 +2133,9 @@ $(SHL4TARGETN) : \
- 	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL4TARGETN:b)
- 	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@ls -l $@
-+.ENDIF
- .ENDIF			# "$(GUI)" == "UNX"
- 
- .IF "$(GUI)" == "OS2"
-@@ -2651,7 +2675,11 @@ $(SHL5TARGETN) : \
- .IF "$(SHL5NOCHECK)"==""
- 	$(QUIET_BUILD) -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
- 	$(QUIET_BUILD) $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
--	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-+.IF "$(QUIET_BUILD)"==""
-+	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-+.ELSE
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) -- -s $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-+.ENDIF
- .ENDIF				# "$(SHL5NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
-@@ -2659,7 +2687,9 @@ $(SHL5TARGETN) : \
- 	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL5TARGETN:b)
- 	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@ls -l $@
-+.ENDIF
- .ENDIF			# "$(GUI)" == "UNX"
- 
- .IF "$(GUI)" == "OS2"
-@@ -3199,7 +3229,11 @@ $(SHL6TARGETN) : \
- .IF "$(SHL6NOCHECK)"==""
- 	$(QUIET_BUILD) -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
- 	$(QUIET_BUILD) $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
--	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-+.IF "$(QUIET_BUILD)"==""
-+	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-+.ELSE
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) -- -s $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-+.ENDIF
- .ENDIF				# "$(SHL6NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
-@@ -3207,7 +3241,9 @@ $(SHL6TARGETN) : \
- 	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL6TARGETN:b)
- 	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@ls -l $@
-+.ENDIF
- .ENDIF			# "$(GUI)" == "UNX"
- 
- .IF "$(GUI)" == "OS2"
-@@ -3747,7 +3783,11 @@ $(SHL7TARGETN) : \
- .IF "$(SHL7NOCHECK)"==""
- 	$(QUIET_BUILD) -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
- 	$(QUIET_BUILD) $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
--	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-+.IF "$(QUIET_BUILD)"==""
-+	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-+.ELSE
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) -- -s $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-+.ENDIF
- .ENDIF				# "$(SHL7NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
-@@ -3755,7 +3795,9 @@ $(SHL7TARGETN) : \
- 	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL7TARGETN:b)
- 	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@ls -l $@
-+.ENDIF
- .ENDIF			# "$(GUI)" == "UNX"
- 
- .IF "$(GUI)" == "OS2"
-@@ -4295,7 +4337,11 @@ $(SHL8TARGETN) : \
- .IF "$(SHL8NOCHECK)"==""
- 	$(QUIET_BUILD) -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
- 	$(QUIET_BUILD) $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
--	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-+.IF "$(QUIET_BUILD)"==""
-+	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-+.ELSE
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) -- -s $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-+.ENDIF
- .ENDIF				# "$(SHL8NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
-@@ -4303,7 +4349,9 @@ $(SHL8TARGETN) : \
- 	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL8TARGETN:b)
- 	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@ls -l $@
-+.ENDIF
- .ENDIF			# "$(GUI)" == "UNX"
- 
- .IF "$(GUI)" == "OS2"
-@@ -4843,7 +4891,11 @@ $(SHL9TARGETN) : \
- .IF "$(SHL9NOCHECK)"==""
- 	$(QUIET_BUILD) -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
- 	$(QUIET_BUILD) $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
--	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-+.IF "$(QUIET_BUILD)"==""
-+	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-+.ELSE
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) -- -s $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-+.ENDIF
- .ENDIF				# "$(SHL9NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
-@@ -4851,7 +4903,9 @@ $(SHL9TARGETN) : \
- 	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL9TARGETN:b)
- 	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@ls -l $@
-+.ENDIF
- .ENDIF			# "$(GUI)" == "UNX"
- 
- .IF "$(GUI)" == "OS2"
-@@ -5391,7 +5445,11 @@ $(SHL10TARGETN) : \
- .IF "$(SHL10NOCHECK)"==""
- 	$(QUIET_BUILD) -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
- 	$(QUIET_BUILD) $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
--	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-+.IF "$(QUIET_BUILD)"==""
-+	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-+.ELSE
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) -- -s $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-+.ENDIF
- .ENDIF				# "$(SHL10NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
-@@ -5399,7 +5457,9 @@ $(SHL10TARGETN) : \
- 	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL10TARGETN:b)
- 	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@ls -l $@
-+.ENDIF
- .ENDIF			# "$(GUI)" == "UNX"
- 
- .IF "$(GUI)" == "OS2"
-diff --git solenv/inc/tg_lib.mk solenv/inc/tg_lib.mk
-index bc02f97..064f1a0 100644
---- solenv/inc/tg_lib.mk
-+++ solenv/inc/tg_lib.mk
-@@ -54,14 +54,18 @@ $(LIB$(TNR)ARCHIV) :	$(LIB$(TNR)TARGET)
- .IF "$(OS)" == "MACOSX"
-  	@echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
- .ENDIF
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
- .ELSE			# "$(GUI)"=="UNX"
- .IF "$(GUI)$(COM)"=="WNTGCC"
- 	@+-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
- 	@+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
- 	@+echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
-+.IF "$(QUIET_BUILD)"==""
- 	@cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
-+.ENDIF
- 	@+source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
- .ELSE
- 	@echo just a dummy > $@
-@@ -119,7 +123,9 @@ $(LIB$(TNR)TARGET) :	$(LIB$(TNR)FILES) \
- .ENDIF          # "$(LIB$(TNR)FILES)"!=""    
- .ELSE			# "$(GUI)"=="WNT"
- 	@-$(RM) $@
-+.IF "$(QUIET_BUILD)"==""
- 	echo $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES)
-+.ENDIF
- 	$(LIBMGR) r $@ $(LIB$(TNR)OBJFILES) $(LIB$(TNR)FILES) bla.lib
- .ENDIF          # "$(GUI)"=="WNT"
- .ENDIF          # "$(GUI)"=="UNX"
-diff --git solenv/inc/tg_shl.mk solenv/inc/tg_shl.mk
-index 489ba05..98b2040 100644
---- solenv/inc/tg_shl.mk
-+++ solenv/inc/tg_shl.mk
-@@ -492,7 +492,11 @@ $(SHL$(TNR)TARGETN) : \
- .IF "$(SHL$(TNR)NOCHECK)"==""
- 	$(QUIET_BUILD) -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
- 	$(QUIET_BUILD) $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
--	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-+.IF "$(QUIET_BUILD)"==""
-+	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-+.ELSE
-+	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) -- -s $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-+.ENDIF
- .ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
- .ENDIF			# "$(UPDATER)"=="YES"
- .ENDIF			# "$(OS)"=="MACOSX"
-@@ -500,7 +504,9 @@ $(SHL$(TNR)TARGETN) : \
- 	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL$(TNR)TARGETN:b)
- 	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b)
- .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-+.IF "$(QUIET_BUILD)"==""
- 	@ls -l $@
-+.ENDIF
- .ENDIF			# "$(GUI)" == "UNX"
- 
- .IF "$(GUI)" == "OS2"
-diff --git soltools/checkdll/checkdll.c soltools/checkdll/checkdll.c
-index 44c554b..10164d1 100644
---- soltools/checkdll/checkdll.c
-+++ soltools/checkdll/checkdll.c
-@@ -47,33 +47,39 @@ static const char *psymbol		= "GetVersionInfo";
- 
- void usage()
- {
--	fprintf(stderr, "usage: %s <dllname>\n", pprog_name);
-+	fprintf(stderr, "usage: %s [-s] <dllname>\n", pprog_name);
- 	return;
- }
- 
- int main(int argc, char *argv[])
- {
- 	int 	rc;
-+    int     silent=0;
- 	void	*phandle;	
- 	char 	*(*pfun)(void);
- 
--	if ( argc < 2 || argc > 3) {
-+	if ( argc < 2 || argc > 4) {
- 		usage();
- 		return 1;
- 	}
- 
-+    if ( !strcmp(argv[1],"-s") ) {
-+        silent = 1;
-+        ++argv, --argc;
-+    }
-+
- 	if ( (rc = access( argv[1], R_OK )) == -1 ) {
- 		fprintf(stderr, "%s: ERROR: %s: %s\n",
--				pprog_name, argv[1], strerror(errno));
-+                pprog_name, argv[1], strerror(errno));
- 		return 2;
- 	}
- 
--	printf("Checking DLL %s ...", argv[1]);
-+	if (!silent) printf("Checking DLL %s ...", argv[1]);
- 	fflush(stdout);
- 
- 	if ( (phandle = dlopen(argv[1], RTLD_NOW)) != NULL ) {
- 		if  ( (pfun = (char *(*)(void))dlsym(phandle, psymbol)) != NULL ) {
--			printf(": ok\n");
-+			if (!silent) printf(": ok\n");
- 		}
- 		else
- 		{
-diff --git idlc/source/idlcmain.cxx idlc/source/idlcmain.cxx
-index 792cd59..f56b945 100644
---- idlc/source/idlcmain.cxx
-+++ idlc/source/idlcmain.cxx
-@@ -132,11 +132,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-             options.getProgramName().getStr(),
-             sal::static_int_cast< long >(nErrors), 
-             options.prepareVersion().getStr());
--    } else
--    {
--        fprintf(stdout, "%s: returned successful%s",
--            options.getProgramName().getStr(),
--            options.prepareVersion().getStr());
-     }
-     return nErrors;
- }
-diff --git solenv/bin/deliver.pl solenv/bin/deliver.pl
-index bfd947e..afc5fd2 100755
---- solenv/bin/deliver.pl
-+++ solenv/bin/deliver.pl
-@@ -399,7 +399,7 @@ sub parse_options
- {
-     my $arg;
-     my $dontdeletecommon = 0;
--    $opt_silent = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE');
-+    $opt_silent = 1 if ( !defined $ENV{VERBOSE} || (defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE'));
-     $opt_verbose = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'TRUE');
-     while ( $arg = shift @ARGV ) {
-         $arg =~ /^-force$/      and $opt_force  = 1  and next;
-diff --git solenv/inc/target.mk solenv/inc/target.mk
-index 635da62..75b4802 100644
---- solenv/inc/target.mk
-+++ solenv/inc/target.mk
-@@ -1395,38 +1395,38 @@ $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE)
- 
- makedoc:
- 		@@-mkdir $(OUT)$/ucrdoc
--		$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))		
-+		$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))		
- #		-$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P..$/$(PRJNAME)$/$(IDLPACKAGE) -OH$(PRJ)$/..$/unodoc $(DOCIDLFILES) $(IDLFILES)
- 
- .IF "$(LOCALDBTARGET)"!=""
- $(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES)
--	$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
--	-$(RM) $@
--	$(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
-+	$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
-+	@-$(RM) $@
-+	$(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
- .ENDIF
- 
- .IF "$(LOCALDOCDBTARGET)"!=""
- $(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES)
--	$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
--	-$(RM) $@
--	$(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
-+	$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
-+	@-$(RM) $@
-+	$(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
- .ENDIF
- 
- .IF "$(UNOIDLDBTARGET)"!=""
- $(UNOIDLDBTARGET) : $(UNOIDLDBFILES) $(UNOIDLDBREGS)
--	-$(RM) $@
--	$(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
-+	@-$(RM) $@
-+	$(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
- .IF "$(LOCALREGDB)"!=""
--	$(REGMERGE) $(LOCALREGDB) / $@
-+	$(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
- .ENDIF
- .ENDIF			# "$(UNOIDLDBTARGET)"!=""
- 
- .IF "$(UNOIDLDBDOCTARGET)"!=""
- $(UNOIDLDBDOCTARGET) : $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS)
--	-$(RM) $@
--	$(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
-+	@-$(RM) $@
-+	$(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
- .IF "$(LOCALREGDB)"!=""
--	$(REGMERGE) $(LOCALREGDB) / $@
-+	$(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
- .ENDIF
- .ENDIF			# "$(UNOIDLDBDOCTARGET)"!=""
- 
diff --git a/applied_patches/0012-linkoo-type.diff b/applied_patches/0027-linkoo-type.diff
similarity index 100%
rename from applied_patches/0012-linkoo-type.diff
rename to applied_patches/0027-linkoo-type.diff
diff --git a/applied_patches/0013-selection-crash-svx-svdmrkv.diff b/applied_patches/0028-selection-crash-svx-svdmrkv.diff
similarity index 100%
rename from applied_patches/0013-selection-crash-svx-svdmrkv.diff
rename to applied_patches/0028-selection-crash-svx-svdmrkv.diff
diff --git a/applied_patches/0017-sal-doublefree.diff b/applied_patches/0029-sal-doublefree.diff
similarity index 100%
rename from applied_patches/0017-sal-doublefree.diff
rename to applied_patches/0029-sal-doublefree.diff
diff --git a/applied_patches/0018-sw-graphic-save-problem.diff b/applied_patches/0030-sw-graphic-save-problem.diff
similarity index 100%
rename from applied_patches/0018-sw-graphic-save-problem.diff
rename to applied_patches/0030-sw-graphic-save-problem.diff
diff --git a/applied_patches/0019-sal-strintern-speed.diff b/applied_patches/0031-sal-strintern-speed.diff
similarity index 100%
rename from applied_patches/0019-sal-strintern-speed.diff
rename to applied_patches/0031-sal-strintern-speed.diff
diff --git a/applied_patches/0020-sal-strintern-speed-fix.diff b/applied_patches/0032-sal-strintern-speed-fix.diff
similarity index 100%
rename from applied_patches/0020-sal-strintern-speed-fix.diff
rename to applied_patches/0032-sal-strintern-speed-fix.diff
diff --git a/applied_patches/0021-fix-linkoo.diff b/applied_patches/0033-fix-linkoo.diff
similarity index 100%
rename from applied_patches/0021-fix-linkoo.diff
rename to applied_patches/0033-fix-linkoo.diff
diff --git a/applied_patches/0022-fix-gtk-a11y.diff b/applied_patches/0034-fix-gtk-a11y.diff
similarity index 100%
rename from applied_patches/0022-fix-gtk-a11y.diff
rename to applied_patches/0034-fix-gtk-a11y.diff
diff --git a/applied_patches/0023-fix-gtk-a11y-gail-version-warning.diff b/applied_patches/0035-fix-gtk-a11y-gail-version-warning.diff
similarity index 100%
rename from applied_patches/0023-fix-gtk-a11y-gail-version-warning.diff
rename to applied_patches/0035-fix-gtk-a11y-gail-version-warning.diff
diff --git a/applied_patches/0024-linkoo-dev300.diff b/applied_patches/0036-linkoo-dev300.diff
similarity index 100%
rename from applied_patches/0024-linkoo-dev300.diff
rename to applied_patches/0036-linkoo-dev300.diff
diff --git a/applied_patches/0027-writerfilter-qnametostr-NOOPTFILES.diff b/applied_patches/0037-writerfilter-qnametostr-NOOPTFILES.diff
similarity index 100%
rename from applied_patches/0027-writerfilter-qnametostr-NOOPTFILES.diff
rename to applied_patches/0037-writerfilter-qnametostr-NOOPTFILES.diff
diff --git a/applied_patches/0028-sc-cellsuno-avoid-early-destruction.diff b/applied_patches/0038-sc-cellsuno-avoid-early-destruction.diff
similarity index 100%
rename from applied_patches/0028-sc-cellsuno-avoid-early-destruction.diff
rename to applied_patches/0038-sc-cellsuno-avoid-early-destruction.diff
diff --git a/applied_patches/0029-speed-sal-fewer-lstats.diff b/applied_patches/0039-speed-sal-fewer-lstats.diff
similarity index 100%
rename from applied_patches/0029-speed-sal-fewer-lstats.diff
rename to applied_patches/0039-speed-sal-fewer-lstats.diff
diff --git a/applied_patches/0030-cjk-character-units-imp.diff b/applied_patches/0040-cjk-character-units-imp.diff
similarity index 100%
rename from applied_patches/0030-cjk-character-units-imp.diff
rename to applied_patches/0040-cjk-character-units-imp.diff
diff --git a/applied_patches/0031-sw-default-cjk-fontsize.diff b/applied_patches/0041-sw-default-cjk-fontsize.diff
similarity index 100%
rename from applied_patches/0031-sw-default-cjk-fontsize.diff
rename to applied_patches/0041-sw-default-cjk-fontsize.diff
diff --git a/applied_patches/0032-cjk-character-units-ui.diff b/applied_patches/0042-cjk-character-units-ui.diff
similarity index 100%
rename from applied_patches/0032-cjk-character-units-ui.diff
rename to applied_patches/0042-cjk-character-units-ui.diff
diff --git a/applied_patches/0043-basic-add-missing-includes-after-cws-npower10.diff b/applied_patches/0043-basic-add-missing-includes-after-cws-npower10.diff
deleted file mode 100644
index 55d7a318d..000000000
--- a/applied_patches/0043-basic-add-missing-includes-after-cws-npower10.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- basic/source/runtime/methods.cxx.ark	2008-07-11 12:16:19.216882727 +0200
-+++ basic/source/runtime/methods.cxx	2008-07-11 13:22:14.260948113 +0200
-@@ -51,6 +51,7 @@
- #include <unotools/ucbstreamhelper.hxx>
- #include <tools/wldcrd.hxx>
- #include <i18npool/lang.h>
-+#include <rtl/string.hxx>
- 
- #include "runtime.hxx"
- #include "sbunoobj.hxx"
-@@ -123,6 +124,8 @@ using namespace com::sun::star::io;
- #include <io.h>
- #endif
- 
-+using namespace rtl;
-+
- static void FilterWhiteSpace( String& rStr )
- {
- 	rStr.EraseAllChars( ' ' );
diff --git a/applied_patches/0033-cjk-character-units-rulers-sync-with-pggrid-fix.diff b/applied_patches/0043-cjk-character-units-rulers-sync-with-pggrid-fix.diff
similarity index 100%
rename from applied_patches/0033-cjk-character-units-rulers-sync-with-pggrid-fix.diff
rename to applied_patches/0043-cjk-character-units-rulers-sync-with-pggrid-fix.diff
diff --git a/applied_patches/0034-cjk-character-units-fix.diff b/applied_patches/0044-cjk-character-units-fix.diff
similarity index 100%
rename from applied_patches/0034-cjk-character-units-fix.diff
rename to applied_patches/0044-cjk-character-units-fix.diff
diff --git a/applied_patches/0044-vba-show-data-form-link-fix.diff b/applied_patches/0044-vba-show-data-form-link-fix.diff
deleted file mode 100644
index 9dd75a9fb..000000000
--- a/applied_patches/0044-vba-show-data-form-link-fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git sc/source/ui/inc/tabvwsh.hxx sc/source/ui/inc/tabvwsh.hxx
-index 7ce1670..d8966e2 100644
---- sc/source/ui/inc/tabvwsh.hxx
-+++ sc/source/ui/inc/tabvwsh.hxx
-@@ -251,7 +251,7 @@ public:
- 
- 	virtual			~ScTabViewShell();
- 
--	Window*			GetDialogParent();
-+	SC_DLLPUBLIC Window* GetDialogParent();
- 
-     bool            IsRefInputMode() const;
- 	void			ExecuteInputDirect();
diff --git a/applied_patches/0035-cjk-character-units-fix-376788.diff b/applied_patches/0045-cjk-character-units-fix-376788.diff
similarity index 100%
rename from applied_patches/0035-cjk-character-units-fix-376788.diff
rename to applied_patches/0045-cjk-character-units-fix-376788.diff
diff --git a/applied_patches/0036-cjk-character-units-in-pggrid-fix.diff b/applied_patches/0046-cjk-character-units-in-pggrid-fix.diff
similarity index 100%
rename from applied_patches/0036-cjk-character-units-in-pggrid-fix.diff
rename to applied_patches/0046-cjk-character-units-in-pggrid-fix.diff
diff --git a/applied_patches/0037-wpsimport-config_office.diff b/applied_patches/0047-wpsimport-config_office.diff
similarity index 100%
rename from applied_patches/0037-wpsimport-config_office.diff
rename to applied_patches/0047-wpsimport-config_office.diff
diff --git a/applied_patches/0038-wpsimport-filter.diff b/applied_patches/0048-wpsimport-filter.diff
similarity index 100%
rename from applied_patches/0038-wpsimport-filter.diff
rename to applied_patches/0048-wpsimport-filter.diff
diff --git a/applied_patches/0039-wpsimport-scp2.diff b/applied_patches/0049-wpsimport-scp2.diff
similarity index 100%
rename from applied_patches/0039-wpsimport-scp2.diff
rename to applied_patches/0049-wpsimport-scp2.diff
diff --git a/applied_patches/0040-wpsimport-writerperfect.diff b/applied_patches/0050-wpsimport-writerperfect.diff
similarity index 100%
rename from applied_patches/0040-wpsimport-writerperfect.diff
rename to applied_patches/0050-wpsimport-writerperfect.diff
diff --git a/applied_patches/0041-libwps.diff b/applied_patches/0051-libwps.diff
similarity index 100%
rename from applied_patches/0041-libwps.diff
rename to applied_patches/0051-libwps.diff
diff --git a/applied_patches/0042-wps-registry.diff b/applied_patches/0052-wps-registry.diff
similarity index 100%
rename from applied_patches/0042-wps-registry.diff
rename to applied_patches/0052-wps-registry.diff
diff --git a/applied_patches/0045-libwpg.diff b/applied_patches/0053-libwpg.diff
similarity index 100%
rename from applied_patches/0045-libwpg.diff
rename to applied_patches/0053-libwpg.diff
diff --git a/applied_patches/0046-wpgimporter.diff b/applied_patches/0054-wpgimporter.diff
similarity index 100%
rename from applied_patches/0046-wpgimporter.diff
rename to applied_patches/0054-wpgimporter.diff
diff --git a/applied_patches/0047-jvmfwk-gij-paths.diff b/applied_patches/0055-jvmfwk-gij-paths.diff
similarity index 100%
rename from applied_patches/0047-jvmfwk-gij-paths.diff
rename to applied_patches/0055-jvmfwk-gij-paths.diff
diff --git a/applied_patches/0048-buildfix-qadevOOo-java-encoding.diff b/applied_patches/0056-buildfix-qadevOOo-java-encoding.diff
similarity index 100%
rename from applied_patches/0048-buildfix-qadevOOo-java-encoding.diff
rename to applied_patches/0056-buildfix-qadevOOo-java-encoding.diff
diff --git a/applied_patches/0049-debug-bits.diff b/applied_patches/0057-debug-bits.diff
similarity index 100%
rename from applied_patches/0049-debug-bits.diff
rename to applied_patches/0057-debug-bits.diff
diff --git a/applied_patches/0050-gui-sw-scroll.diff b/applied_patches/0058-gui-sw-scroll.diff
similarity index 100%
rename from applied_patches/0050-gui-sw-scroll.diff
rename to applied_patches/0058-gui-sw-scroll.diff
diff --git a/applied_patches/0058-vba-default-enable-calcmacros.diff b/applied_patches/0058-vba-default-enable-calcmacros.diff
deleted file mode 100644
index ac3ab4998..000000000
--- a/applied_patches/0058-vba-default-enable-calcmacros.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- officecfg/registry/schema/org/openoffice/Office/Calc.xcs	2008-05-29 23:19:11.000000000 +0100
-+++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs	2008-05-30 15:24:26.000000000 +0100
-@@ -1313,7 +1313,7 @@
-               <desc>Indicates whether VBA macros are imported without comments to be executable.</desc>
-               <label>Executable code</label>
-             </info>
--            <value>false</value>
-+            <value>true</value>
-           </prop>
-           <prop oor:name="Save" oor:type="xs:boolean">
- 						<!-- OldPath: Filter/MS_Office/Basic/Excel -->
diff --git a/applied_patches/0059-vba-ide-choose-macro-to-run.diff b/applied_patches/0059-vba-ide-choose-macro-to-run.diff
deleted file mode 100644
index 6559585d3..000000000
--- a/applied_patches/0059-vba-ide-choose-macro-to-run.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- basctl/source/basicide/baside2.cxx.old	2009-04-02 10:56:36.000000000 +0000
-+++ basctl/source/basicide/baside2.cxx	2009-04-06 16:41:44.000000000 +0000
-@@ -331,6 +331,8 @@ BOOL ModulWindow::BasicExecute()
- 			DBG_ASSERT( xModule.Is(), "Kein Modul!" );
- 			AddStatus( BASWIN_RUNNINGBASIC );
- 			USHORT nStart, nEnd, nCurMethodStart = 0;
-+			TextSelection aSel = GetEditView()->GetSelection();
-+			nCurMethodStart = ( aSel.GetStart().GetPara() + 1 );
- 			SbMethod* pMethod = 0;
- 			// erstes Macro, sonst blind "Main" (ExtSearch?)
- 			for ( USHORT nMacro = 0; nMacro < xModule->GetMethods()->Count(); nMacro++ )
-@@ -338,16 +340,16 @@ BOOL ModulWindow::BasicExecute()
- 				SbMethod* pM = (SbMethod*)xModule->GetMethods()->Get( nMacro );
- 				DBG_ASSERT( pM, "Method?" );
- 				pM->GetLineRange( nStart, nEnd );
--				if ( !pMethod || ( nStart < nCurMethodStart ) )
-+				if (  nCurMethodStart >= nStart && nCurMethodStart <= nEnd ) 
- 				{
- 					pMethod = pM;
--					nCurMethodStart = nStart;
-+					break;
- 				}
- 			}
- 			if ( !pMethod )
--				pMethod = (SbMethod*)xModule->Find( String( RTL_CONSTASCII_USTRINGPARAM( "Main" ) ), SbxCLASS_METHOD );
-+				return ( BasicIDE::ChooseMacro( uno::Reference< frame::XModel >(), FALSE, rtl::OUString() ).getLength() > 0 ) ? TRUE : FALSE;
- 
--			if ( pMethod )
-+			else
- 			{
- 				pMethod->SetDebugFlags( aStatus.nBasicFlags );
- 				BasicDLL::SetDebugMode( TRUE );
diff --git a/applied_patches/0051-vcl-menu-fixes.diff b/applied_patches/0059-vcl-menu-fixes.diff
similarity index 100%
rename from applied_patches/0051-vcl-menu-fixes.diff
rename to applied_patches/0059-vcl-menu-fixes.diff
diff --git a/applied_patches/0052-uses-vfs.diff b/applied_patches/0060-uses-vfs.diff
similarity index 100%
rename from applied_patches/0052-uses-vfs.diff
rename to applied_patches/0060-uses-vfs.diff
diff --git a/applied_patches/0053-buildfix-x86-64-visibility-workaround.diff b/applied_patches/0061-buildfix-x86-64-visibility-workaround.diff
similarity index 100%
rename from applied_patches/0053-buildfix-x86-64-visibility-workaround.diff
rename to applied_patches/0061-buildfix-x86-64-visibility-workaround.diff
diff --git a/applied_patches/0054-redirect-extensions.diff b/applied_patches/0062-redirect-extensions.diff
similarity index 100%
rename from applied_patches/0054-redirect-extensions.diff
rename to applied_patches/0062-redirect-extensions.diff
diff --git a/applied_patches/0055-libwpd.diff b/applied_patches/0063-libwpd.diff
similarity index 100%
rename from applied_patches/0055-libwpd.diff
rename to applied_patches/0063-libwpd.diff
diff --git a/applied_patches/0056-writerperfect-nocondensedparagraphs.diff b/applied_patches/0064-writerperfect-nocondensedparagraphs.diff
similarity index 100%
rename from applied_patches/0056-writerperfect-nocondensedparagraphs.diff
rename to applied_patches/0064-writerperfect-nocondensedparagraphs.diff
diff --git a/applied_patches/0057-offapi-typecheck-whitelist.diff b/applied_patches/0065-offapi-typecheck-whitelist.diff
similarity index 100%
rename from applied_patches/0057-offapi-typecheck-whitelist.diff
rename to applied_patches/0065-offapi-typecheck-whitelist.diff
diff --git a/applied_patches/0060-build-ant-1.6.diff b/applied_patches/0066-build-ant-1.6.diff
similarity index 100%
rename from applied_patches/0060-build-ant-1.6.diff
rename to applied_patches/0066-build-ant-1.6.diff
diff --git a/applied_patches/0061-buildfix-fmtargs.diff b/applied_patches/0067-buildfix-fmtargs.diff
similarity index 100%
rename from applied_patches/0061-buildfix-fmtargs.diff
rename to applied_patches/0067-buildfix-fmtargs.diff
diff --git a/applied_patches/0062-nsplugin-path.diff b/applied_patches/0068-nsplugin-path.diff
similarity index 100%
rename from applied_patches/0062-nsplugin-path.diff
rename to applied_patches/0068-nsplugin-path.diff
diff --git a/applied_patches/0063-printing-bugfix-254573.diff b/applied_patches/0069-printing-bugfix-254573.diff
similarity index 100%
rename from applied_patches/0063-printing-bugfix-254573.diff
rename to applied_patches/0069-printing-bugfix-254573.diff
diff --git a/applied_patches/0064-sd-toolbar-advanced-shapes.diff b/applied_patches/0070-sd-toolbar-advanced-shapes.diff
similarity index 100%
rename from applied_patches/0064-sd-toolbar-advanced-shapes.diff
rename to applied_patches/0070-sd-toolbar-advanced-shapes.diff
diff --git a/applied_patches/0065-svx-shapes-default-word-wrap-enable.diff b/applied_patches/0071-svx-shapes-default-word-wrap-enable.diff
similarity index 100%
rename from applied_patches/0065-svx-shapes-default-word-wrap-enable.diff
rename to applied_patches/0071-svx-shapes-default-word-wrap-enable.diff
diff --git a/applied_patches/0066-svx-honour-customshape-capabilities.diff b/applied_patches/0072-svx-honour-customshape-capabilities.diff
similarity index 100%
rename from applied_patches/0066-svx-honour-customshape-capabilities.diff
rename to applied_patches/0072-svx-honour-customshape-capabilities.diff
diff --git a/applied_patches/0067-check-buttons-rendering-fix.diff b/applied_patches/0073-check-buttons-rendering-fix.diff
similarity index 100%
rename from applied_patches/0067-check-buttons-rendering-fix.diff
rename to applied_patches/0073-check-buttons-rendering-fix.diff
diff --git a/applied_patches/0068-padmin-nofontconfig.diff b/applied_patches/0074-padmin-nofontconfig.diff
similarity index 100%
rename from applied_patches/0068-padmin-nofontconfig.diff
rename to applied_patches/0074-padmin-nofontconfig.diff
diff --git a/applied_patches/0069-wizards-source-importwizard-filesmodul-xba.diff b/applied_patches/0075-wizards-source-importwizard-filesmodul-xba.diff
similarity index 100%
rename from applied_patches/0069-wizards-source-importwizard-filesmodul-xba.diff
rename to applied_patches/0075-wizards-source-importwizard-filesmodul-xba.diff
diff --git a/applied_patches/0070-automation-testtool-oobuildfix.diff b/applied_patches/0076-automation-testtool-oobuildfix.diff
similarity index 100%
rename from applied_patches/0070-automation-testtool-oobuildfix.diff
rename to applied_patches/0076-automation-testtool-oobuildfix.diff
diff --git a/applied_patches/0071-helpcontent2-auxiliary-cfg.diff b/applied_patches/0077-helpcontent2-auxiliary-cfg.diff
similarity index 100%
rename from applied_patches/0071-helpcontent2-auxiliary-cfg.diff
rename to applied_patches/0077-helpcontent2-auxiliary-cfg.diff
diff --git a/applied_patches/0072-desktop-safer-user-dir-perm.diff b/applied_patches/0078-desktop-safer-user-dir-perm.diff
similarity index 100%
rename from applied_patches/0072-desktop-safer-user-dir-perm.diff
rename to applied_patches/0078-desktop-safer-user-dir-perm.diff
diff --git a/applied_patches/0073-desktop-application-octet-stream-mime-type.diff b/applied_patches/0079-desktop-application-octet-stream-mime-type.diff
similarity index 100%
rename from applied_patches/0073-desktop-application-octet-stream-mime-type.diff
rename to applied_patches/0079-desktop-application-octet-stream-mime-type.diff
diff --git a/applied_patches/0079-new-SQLLEN.diff b/applied_patches/0079-new-SQLLEN.diff
deleted file mode 100644
index 12f74afc3..000000000
--- a/applied_patches/0079-new-SQLLEN.diff
+++ /dev/null
@@ -1,1884 +0,0 @@
-Index: connectivity/source/inc/odbc/OResultSet.hxx
-===================================================================
---- connectivity/source/inc/odbc/OResultSet.hxx	(revision 274960)
-+++ connectivity/source/inc/odbc/OResultSet.hxx	(working copy)
-@@ -128,7 +128,7 @@
- 			typedef ::std::vector<ORowSetValue>			TDataRow;
- 
- 			TVoidVector									m_aBindVector;
--			::std::vector<sal_Int32>					m_aLengthVector;
-+			::std::vector<SQLLEN>						m_aLengthVector;
-             ::std::map<sal_Int32,SWORD>					m_aODBCColumnTypes;
- 			::com::sun::star::uno::Sequence<sal_Int8>	m_aBookmark;
- 
-Index: connectivity/source/inc/odbc/OResultSetMetaData.hxx
-===================================================================
---- connectivity/source/inc/odbc/OResultSetMetaData.hxx	(revision 274960)
-+++ connectivity/source/inc/odbc/OResultSetMetaData.hxx	(working copy)
-@@ -80,13 +80,13 @@
- 			virtual ~OResultSetMetaData();
- 
- 
--            static  SWORD getNumColAttrib(OConnection* _pConnection
-+            static SQLLEN getNumColAttrib(OConnection* _pConnection
-                                               ,SQLHANDLE _aStatementHandle
-                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
-                                               ,sal_Int32 _column
-                                               ,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- 
--            static SWORD getColumnODBCType(OConnection* _pConnection
-+            static SQLSMALLINT getColumnODBCType(OConnection* _pConnection
-                                               ,SQLHANDLE _aStatementHandle
-                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
-                                               ,sal_Int32 column)
-Index: connectivity/source/inc/odbc/OTools.hxx
-===================================================================
---- connectivity/source/inc/odbc/OTools.hxx	(revision 274960)
-+++ connectivity/source/inc/odbc/OTools.hxx	(working copy)
-@@ -197,7 +197,7 @@
- 			static ::rtl::OUString getStringValue(	OConnection* _pConnection,	
- 													SQLHANDLE _aStatementHandle,
- 													sal_Int32 columnIndex,
--													SWORD  _fSqlType,
-+													SQLSMALLINT _fSqlType,
- 													sal_Bool &_bWasNull,
- 													const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
- 													rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-@@ -205,7 +205,7 @@
- 			static  ::com::sun::star::uno::Sequence<sal_Int8> getBytesValue(OConnection* _pConnection,	
- 																			SQLHANDLE _aStatementHandle,
- 																			sal_Int32 columnIndex,
--																			SWORD  _fSqlType,
-+																			SQLSMALLINT _fSqlType,
- 																			sal_Bool &_bWasNull,
- 																			const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- 			static void getValue(	OConnection* _pConnection,	
-@@ -215,7 +215,7 @@
- 									sal_Bool &_bWasNull,
- 									const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
- 									void* _pValue,
--									SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-+									SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- 
- 			/** 
- 				bindData copies the from pValue to pData
-@@ -229,10 +229,10 @@
- 			static void bindData(	SQLSMALLINT _nOdbcType,
- 									sal_Bool _bUseWChar,
- 									sal_Int8 *&_pData,
--									SQLINTEGER*& pLen,
-+									SQLLEN*& pLen,
- 									const void* _pValue,
- 									rtl_TextEncoding _nTextEncoding,
--									SQLUINTEGER& _nColumnSize);
-+									SQLULEN& _nColumnSize);
- 
- 			static void bindParameter(	OConnection* _pConnection,	
- 										SQLHANDLE _hStmt,
-@@ -254,7 +254,7 @@
- 									SQLSMALLINT _nMaxLen,
- 									const void* _pValue,
- 									void*		_pData,
--									SQLINTEGER *pLen,
-+									SQLLEN *pLen,
- 									const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
- 									rtl_TextEncoding _nTextEncoding,
- 									sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-Index: connectivity/source/inc/odbc/OStatement.hxx
-===================================================================
---- connectivity/source/inc/odbc/OStatement.hxx	(revision 274960)
-+++ connectivity/source/inc/odbc/OStatement.hxx	(working copy)
-@@ -130,7 +130,7 @@
- 			*/
- 			virtual OResultSet* createResulSet();
- 
--            sal_Int32 getRowCount () throw( ::com::sun::star::sdbc::SQLException);
-+            SQLLEN getRowCount () throw( ::com::sun::star::sdbc::SQLException);
- 
- 
- 			void disposeResultSet();
-Index: connectivity/source/inc/odbc/OFunctions.hxx
-===================================================================
---- connectivity/source/inc/odbc/OFunctions.hxx	(revision 274960)
-+++ connectivity/source/inc/odbc/OFunctions.hxx	(working copy)
-@@ -187,7 +187,7 @@
- 													SQLSMALLINT *		StringLengthPtr,
- 													SQLSMALLINT *		TypePtr,
- 													SQLSMALLINT *		SubTypePtr,
--													SQLINTEGER *		LengthPtr,
-+													SQLLEN *			LengthPtr,
- 													SQLSMALLINT *		PrecisionPtr,
- 													SQLSMALLINT *		ScalePtr,
- 													SQLSMALLINT *		NullablePtr);
-@@ -203,8 +203,8 @@
- 													SQLSMALLINT			Precision,
- 													SQLSMALLINT			Scale,
- 													SQLPOINTER			DataPtr,
--													SQLINTEGER *		StringLengthPtr,
--													SQLINTEGER *		IndicatorPtr);
-+													SQLLEN *			StringLengthPtr,
-+													SQLLEN *			IndicatorPtr);
- 
- 	#define N3SQLSetDescRec(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSetDescRec)getOdbcFunction(ODBC3SQLSetDescRec))(a,b,c,d,e,f,g,h,i,j)
- 	*/
-@@ -221,11 +221,11 @@
- 													SQLSMALLINT			InputOutputType,
- 													SQLSMALLINT			ValueType,
- 													SQLSMALLINT			ParameterType,
--													SQLUINTEGER			ColumnSize,
-+													SQLULEN				ColumnSize,
- 													SQLSMALLINT			DecimalDigits,
- 													SQLPOINTER			ParameterValuePtr,
--													SQLINTEGER			BufferLength,
--													SQLINTEGER *		StrLen_or_IndPtr);
-+													SQLLEN				BufferLength,
-+													SQLLEN *			StrLen_or_IndPtr);
- 
- 	#define N3SQLBindParameter(a,b,c,d,e,f,g,h,i,j) (*(T3SQLBindParameter)getOdbcFunction(ODBC3SQLBindParameter))(a,b,c,d,e,f,g,h,i,j)
- 
-@@ -266,7 +266,7 @@
- 	typedef SQLRETURN (SQL_API  *T3SQLDescribeParam) (SQLHSTMT			StatementHandle,
- 													SQLUSMALLINT		ParameterNumber,
- 													SQLSMALLINT *		DataTypePtr,
--													SQLUINTEGER *		ParameterSizePtr,
-+													SQLULEN *			ParameterSizePtr,
- 													SQLSMALLINT *		DecimalDigitsPtr,
- 													SQLSMALLINT *		NullablePtr);
- 
-@@ -284,13 +284,13 @@
- 
- 	typedef SQLRETURN  (SQL_API  *T3SQLPutData) (		SQLHSTMT			StatementHandle,
- 													SQLPOINTER			DataPtr,
--													SQLINTEGER			StrLen_or_Ind);
-+													SQLLEN				StrLen_or_Ind);
- 
- 	#define N3SQLPutData(a,b,c) (*(T3SQLPutData)getOdbcFunction(ODBC3SQLPutData))(a,b,c)
- 
- 	// Retrieving results and information about results
- 	typedef SQLRETURN  (SQL_API  *T3SQLRowCount) (	SQLHSTMT			StatementHandle,
--													SQLINTEGER *		RowCountPtr);
-+													SQLLEN *			RowCountPtr);
- 
- 	#define N3SQLRowCount(a,b) (*(T3SQLRowCount)getOdbcFunction(ODBC3SQLRowCount))(a,b)
- 
-@@ -300,12 +300,12 @@
- 	#define N3SQLNumResultCols(a,b) (*(T3SQLNumResultCols)getOdbcFunction(ODBC3SQLNumResultCols))(a,b)
- 
- 	typedef SQLRETURN  (SQL_API  *T3SQLDescribeCol) (	SQLHSTMT			StatementHandle,
--													SQLSMALLINT			ColumnNumber,
-+													SQLUSMALLINT		ColumnNumber,
- 													SQLCHAR *			ColumnName,
- 													SQLSMALLINT			BufferLength,
- 													SQLSMALLINT *		NameLengthPtr,
- 													SQLSMALLINT *		DataTypePtr,
--													SQLUINTEGER *		ColumnSizePtr,
-+													SQLULEN *			ColumnSizePtr,
- 													SQLSMALLINT *		DecimalDigitsPtr,
- 													SQLSMALLINT *		NullablePtr);
- 
-@@ -317,7 +317,7 @@
- 													SQLPOINTER			CharacterAttributePtr,
- 													SQLSMALLINT			BufferLength,
- 													SQLSMALLINT *		StringLengthPtr,
--													SQLPOINTER			NumericAttributePtr);
-+													SQLLEN *			NumericAttributePtr);
- 
- 	#define N3SQLColAttribute(a,b,c,d,e,f,g) (*(T3SQLColAttribute)getOdbcFunction(ODBC3SQLColAttribute))(a,b,c,d,e,f,g)
- 
-@@ -325,8 +325,8 @@
- 													SQLUSMALLINT		ColumnNumber,
- 													SQLSMALLINT			TargetType,
- 													SQLPOINTER			TargetValuePtr,
--													SQLINTEGER			BufferLength,
--													SQLINTEGER *		StrLen_or_IndPtr);
-+													SQLLEN				BufferLength,
-+													SQLLEN *			StrLen_or_IndPtr);
- 
- 	#define N3SQLBindCol(a,b,c,d,e,f) (*(T3SQLBindCol)getOdbcFunction(ODBC3SQLBindCol))(a,b,c,d,e,f)
- 
-@@ -336,7 +336,7 @@
- 
- 	typedef SQLRETURN  (SQL_API  *T3SQLFetchScroll) (	SQLHSTMT			StatementHandle,
- 													SQLSMALLINT			FetchOrientation,
--													SQLINTEGER			FetchOffset);
-+													SQLLEN				FetchOffset);
- 
- 	#define N3SQLFetchScroll(a,b,c) (*(T3SQLFetchScroll)getOdbcFunction(ODBC3SQLFetchScroll))(a,b,c)
- 
-@@ -344,20 +344,20 @@
- 													SQLUSMALLINT		ColumnNumber,
- 													SQLSMALLINT			TargetType,
- 													SQLPOINTER			TargetValuePtr,
--													SQLINTEGER			BufferLength,
--													SQLINTEGER *		StrLen_or_IndPtr);
-+													SQLLEN				BufferLength,
-+													SQLLEN *			StrLen_or_IndPtr);
- 
- 	#define N3SQLGetData(a,b,c,d,e,f) (*(T3SQLGetData)getOdbcFunction(ODBC3SQLGetData))(a,b,c,d,e,f)
- 
- 	typedef SQLRETURN  (SQL_API  *T3SQLSetPos) (		SQLHSTMT			StatementHandle,
--													SQLUSMALLINT		RowNumber,
-+													SQLSETPOSIROW		RowNumber,
- 													SQLUSMALLINT		Operation,
- 													SQLUSMALLINT		LockType);
- 
- 	#define N3SQLSetPos(a,b,c,d) (*(T3SQLSetPos)getOdbcFunction(ODBC3SQLSetPos))(a,b,c,d)
- 
- 	typedef SQLRETURN  (SQL_API  *T3SQLBulkOperations) (	SQLHSTMT		StatementHandle,
--														SQLUSMALLINT	Operation);
-+														SQLSMALLINT	Operation);
- 
- 	#define N3SQLBulkOperations(a,b) (*(T3SQLBulkOperations)getOdbcFunction(ODBC3SQLBulkOperations))(a,b)
- 
-@@ -461,15 +461,15 @@
- 	#define N3SQLProcedures(a,b,c,d,e,f,g) (*(T3SQLProcedures)getOdbcFunction(ODBC3SQLProcedures))(a,b,c,d,e,f,g)
- 
- 	typedef SQLRETURN  (SQL_API  *T3SQLSpecialColumns) (SQLHSTMT			StatementHandle,
--													SQLSMALLINT			IdentifierType,
-+													SQLUSMALLINT		IdentifierType,
- 													SQLCHAR *			CatalogName,
- 													SQLSMALLINT			NameLength1,
- 													SQLCHAR *			SchemaName,
- 													SQLSMALLINT			NameLength2,
- 													SQLCHAR *			TableName,
- 													SQLSMALLINT			NameLength3,
--													SQLSMALLINT			Scope,
--													SQLSMALLINT			Nullable);
-+													SQLUSMALLINT		Scope,
-+													SQLUSMALLINT		Nullable);
- 
- 	#define N3SQLSpecialColumns(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSpecialColumns)getOdbcFunction(ODBC3SQLSpecialColumns))(a,b,c,d,e,f,g,h,i,j)
- 
-Index: connectivity/source/drivers/odbcbase/OConnection.cxx
-===================================================================
---- connectivity/source/drivers/odbcbase/OConnection.cxx	(revision 274960)
-+++ connectivity/source/drivers/odbcbase/OConnection.cxx	(working copy)
-@@ -108,7 +108,7 @@
- 	SQLRETURN nSQLRETURN = 0;
- 	SDB_ODBC_CHAR szConnStrOut[4096];
- 	SDB_ODBC_CHAR szConnStrIn[2048];
--	SWORD cbConnStrOut;
-+	SQLSMALLINT cbConnStrOut;
- 	memset(szConnStrOut,'\0',4096);
- 	memset(szConnStrIn,'\0',2048);
- 	::rtl::OString aConStr(::rtl::OUStringToOString(aConnectStr,getTextEncoding()));
-Index: connectivity/source/drivers/odbcbase/OTools.cxx
-===================================================================
---- connectivity/source/drivers/odbcbase/OTools.cxx	(revision 274960)
-+++ connectivity/source/drivers/odbcbase/OTools.cxx	(working copy)
-@@ -56,16 +56,16 @@
- 						sal_Bool &_bWasNull,
- 						const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
- 						void* _pValue,
--						SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
-+						SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
- {
-     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::getValue" );
--	SQLINTEGER pcbValue = SQL_NULL_DATA;
-+	SQLLEN pcbValue = SQL_NULL_DATA;
- 	OTools::ThrowException(_pConnection,
- 							(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
- 										(SQLUSMALLINT)columnIndex,
- 										_nType,
- 										_pValue,
--										(SQLINTEGER)_rSize,
-+										_nSize,
- 										&pcbValue),
- 							_aStatementHandle,SQL_HANDLE_STMT,_xInterface,sal_False);
- 	_bWasNull = pcbValue == SQL_NULL_DATA;
-@@ -86,12 +86,12 @@
- {
-     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindParameter" );
- 	SQLRETURN nRetcode;
--	SWORD   fSqlType;
--	SWORD   fCType;
--	SDWORD  nMaxLen = 0;
-+	SQLSMALLINT fSqlType;
-+	SQLSMALLINT fCType;
-+	SQLLEN  nMaxLen = 0;
- 	//	void*&   pData   = pDataBuffer;
--	SQLINTEGER* pLen    = (SQLINTEGER*)pLenBuffer;
--	SQLUINTEGER nColumnSize=0;
-+	SQLLEN* pLen    = (SQLLEN*)pLenBuffer;
-+	SQLULEN nColumnSize=0;
- 	SQLSMALLINT	nDecimalDigits=0;
- 
- 	OTools::getBindTypes(_bUseWChar,_bUseOldTimeDate,_nODBCtype,fCType,fSqlType);
-@@ -123,10 +123,10 @@
- void OTools::bindData(	SQLSMALLINT _nOdbcType,
- 						sal_Bool _bUseWChar,
- 						sal_Int8 *&_pData,
--						SQLINTEGER*& pLen,
-+						SQLLEN*& pLen,
- 						const void* _pValue,
- 						rtl_TextEncoding _nTextEncoding,
--						SQLUINTEGER& _nColumnSize)
-+						SQLULEN& _nColumnSize)
- {
-     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindData" );
- 	_nColumnSize = 0;
-@@ -222,7 +222,7 @@
- 			{
- 				sal_Int32 nLen = 0;
-                 nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
--				*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
-+				*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
- 			}
- 			break;
- 		case SQL_LONGVARCHAR:
-@@ -235,21 +235,21 @@
- 				::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding));
- 				nLen = aString.getLength();
- 			}
--			*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
-+			*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
- 		}   break;
- 		case SQL_DATE:
- 			*(DATE_STRUCT*)_pData = *(DATE_STRUCT*)_pValue;
--			*pLen = (SDWORD)sizeof(DATE_STRUCT);
-+			*pLen = (SQLLEN)sizeof(DATE_STRUCT);
- 			_nColumnSize = 10;
- 			break;
- 		case SQL_TIME:
- 			*(TIME_STRUCT*)_pData = *(TIME_STRUCT*)_pValue;
--			*pLen = (SDWORD)sizeof(TIME_STRUCT);
-+			*pLen = (SQLLEN)sizeof(TIME_STRUCT);
- 			_nColumnSize = 8;
- 			break;
- 		case SQL_TIMESTAMP:
- 			*(TIMESTAMP_STRUCT*)_pData = *(TIMESTAMP_STRUCT*)_pValue;
--			*pLen = (SDWORD)sizeof(TIMESTAMP_STRUCT);
-+			*pLen = (SQLLEN)sizeof(TIMESTAMP_STRUCT);
- 			_nColumnSize = 19;
- 			break;
- 	}
-@@ -262,7 +262,7 @@
- 						SQLSMALLINT _nMaxLen,
- 						const void* _pValue,
- 						void* _pData,
--						SQLINTEGER *pLen,
-+						SQLLEN *pLen,
- 						const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
- 						rtl_TextEncoding _nTextEncoding,
- 						sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
-@@ -271,7 +271,7 @@
- 	SQLRETURN nRetcode;
- 	SQLSMALLINT   fSqlType;
- 	SQLSMALLINT   fCType;
--	SQLSMALLINT   nMaxLen = _nMaxLen;
-+	SQLLEN nMaxLen = _nMaxLen;
- 
- 	OTools::getBindTypes(	sal_False,
- 							_bUseOldTimeDate,
-@@ -375,7 +375,7 @@
- 					_pData = (void*)(columnIndex);
- 					sal_Int32 nLen = 0;
-                     nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
--					*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
-+					*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
- 				}
- 					break;
- 				case SQL_LONGVARCHAR:
-@@ -383,7 +383,7 @@
- 					_pData = (void*)(columnIndex);
- 					sal_Int32 nLen = 0;
- 					nLen = ((::rtl::OUString*)_pValue)->getLength();
--					*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
-+					*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
- 				}   break;
- 				case SQL_DATE:
- 					*pLen = sizeof(DATE_STRUCT);
-@@ -446,10 +446,10 @@
-     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::ThrowException" );
- 
- 	SDB_ODBC_CHAR szSqlState[5];
--	SDWORD pfNativeError;
-+	SQLINTEGER pfNativeError;
- 	SDB_ODBC_CHAR szErrorMessage[SQL_MAX_MESSAGE_LENGTH];
- 	szErrorMessage[0] = '\0';
--	SWORD pcbErrorMsg = 0;
-+	SQLSMALLINT pcbErrorMsg = 0;
- 
- 	// Informationen zur letzten Operation:
- 	// wenn hstmt != SQL_NULL_HSTMT ist (Benutzung von SetStatus in SdbCursor, SdbTable, ...),
-@@ -478,7 +478,7 @@
- Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
- 										 SQLHANDLE _aStatementHandle,
- 										 sal_Int32 columnIndex,
--										 SWORD  _fSqlType,
-+										 SQLSMALLINT _fSqlType,
- 										 sal_Bool &_bWasNull,
- 										 const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
- {
-@@ -486,14 +486,14 @@
- 	char aCharArray[2048];
- 	// Erstmal versuchen, die Daten mit dem kleinen Puffer
- 	// abzuholen:
--	SQLINTEGER nMaxLen = sizeof aCharArray - 1;
-+	SQLLEN nMaxLen = sizeof aCharArray - 1;
- 	//	GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
--	SQLINTEGER pcbValue = 0;
-+	SQLLEN pcbValue = 0;
- 	OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
- 										(SQLUSMALLINT)columnIndex,
- 										_fSqlType,
- 										(SQLPOINTER)aCharArray,
--										(SQLINTEGER)nMaxLen,
-+										nMaxLen,
- 										&pcbValue),
- 							_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
- 
-@@ -540,7 +540,7 @@
- ::rtl::OUString OTools::getStringValue(OConnection* _pConnection,
- 									   SQLHANDLE _aStatementHandle,
- 									   sal_Int32 columnIndex,
--									   SWORD  _fSqlType,
-+									   SQLSMALLINT _fSqlType,
- 									   sal_Bool &_bWasNull,
- 									   const Reference< XInterface >& _xInterface,
- 									   rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException)
-@@ -555,15 +555,15 @@
- 		{
- 			sal_Unicode waCharArray[2048];
- 			// read the unicode data
--			sal_Int32 nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
-+			SQLLEN nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
- 			//	GETDATA(SQL_C_WCHAR, waCharArray, nMaxLen + sizeof(sal_Unicode));
- 
--			SQLINTEGER pcbValue=0;
-+			SQLLEN pcbValue=0;
- 			OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
- 												(SQLUSMALLINT)columnIndex,
- 												SQL_C_WCHAR,
- 												&waCharArray,
--												(SQLINTEGER)nMaxLen*sizeof(sal_Unicode),
-+												(SQLLEN)nMaxLen*sizeof(sal_Unicode),
- 												&pcbValue),
- 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
- 			_bWasNull = pcbValue == SQL_NULL_DATA;
-@@ -571,7 +571,7 @@
- 				return ::rtl::OUString();
- 			// Bei Fehler bricht der GETDATA-Makro mit return ab,
- 			// bei NULL mit break!
--			SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
-+			SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
- 			waCharArray[nLen] = 0;
- 			aData = ::rtl::OUString(waCharArray);
- 
-@@ -595,7 +595,7 @@
- 												(SQLUSMALLINT)columnIndex,
- 												SQL_C_WCHAR,
- 												&waCharArray,
--												(SQLINTEGER)nLen+1,
-+												(SQLLEN)nLen+1,
- 												&pcbValue),
- 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
- 				nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
-@@ -610,21 +610,21 @@
- 			char aCharArray[2048];
- 			// Erstmal versuchen, die Daten mit dem kleinen Puffer
- 			// abzuholen:
--			SDWORD nMaxLen = sizeof aCharArray - 1;
-+			SQLLEN nMaxLen = sizeof aCharArray - 1;
- 			//	GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
--			SQLINTEGER pcbValue = 0;
-+			SQLLEN pcbValue = 0;
- 			OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
- 												(SQLUSMALLINT)columnIndex,
- 												SQL_C_CHAR,
- 												&aCharArray,
--												(SQLINTEGER)nMaxLen,
-+												nMaxLen,
- 												&pcbValue),
- 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
- 			_bWasNull = pcbValue == SQL_NULL_DATA;
- 			if(_bWasNull)
- 				return ::rtl::OUString();
- 
--			SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
-+			SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
- 			aCharArray[nLen] = 0;
- 			if ( ((pcbValue == SQL_NO_TOTAL) || pcbValue > nMaxLen) && aCharArray[nLen-1] == 0 && nLen > 0 )
- 				--nLen;
-Index: connectivity/source/drivers/odbcbase/OStatement.cxx
-===================================================================
---- connectivity/source/drivers/odbcbase/OStatement.cxx	(revision 274960)
-+++ connectivity/source/drivers/odbcbase/OStatement.cxx	(working copy)
-@@ -250,13 +250,13 @@
-     m_xResultSet = Reference< XResultSet >();
- }
- //--------------------------------------------------------------------
--sal_Int32 OStatement_Base::getRowCount () throw( SQLException)
-+SQLLEN OStatement_Base::getRowCount () throw( SQLException)
- {
- 	::osl::MutexGuard aGuard( m_aMutex );
- 	checkDisposed(OStatement_BASE::rBHelper.bDisposed);
- 
- 
--	sal_Int32	numRows = 0;
-+	SQLLEN numRows = 0;
- 
- 	try {
- 		THROW_SQL(N3SQLRowCount(m_aStatementHandle,&numRows));
-@@ -523,7 +523,9 @@
- 		SQLRETURN nError = N3SQLMoreResults(m_aStatementHandle);
- 		if(nError == SQL_SUCCESS)
- 		{
--			N3SQLRowCount(m_aStatementHandle,&pArray[j]);
-+			SQLLEN nRowCount=0;
-+			N3SQLRowCount(m_aStatementHandle,&nRowCount);
-+			pArray[j] = nRowCount;
- 		}
- 	}
- 	return aRet;
-Index: connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
-===================================================================
---- connectivity/source/drivers/odbcbase/OPreparedStatement.cxx	(revision 274960)
-+++ connectivity/source/drivers/odbcbase/OPreparedStatement.cxx	(working copy)
-@@ -446,11 +446,11 @@
- 	checkParameterIndex(parameterIndex);
- 
- 	sal_Int8* lenBuf = getLengthBuf (parameterIndex);
--	*(SDWORD*)lenBuf = SQL_NULL_DATA;
-+	*(SQLLEN*)lenBuf = SQL_NULL_DATA;
- 
- 
--	SQLINTEGER	prec = 0;
--	SQLUINTEGER nColumnSize = 0;
-+	SQLLEN prec = 0;
-+	SQLULEN nColumnSize = 0;
- 	if (sqlType == SQL_CHAR || sqlType == SQL_VARCHAR || sqlType == SQL_LONGVARCHAR)
- 	{
- 		prec = 1;
-@@ -476,7 +476,7 @@
- 											nDecimalDigits,
- 											NULL,
- 											prec,
--											(SDWORD*)lenBuf
-+											(SQLLEN*)lenBuf
- 											);
- 	OTools::ThrowException(m_pConnection,nReturn,m_aStatementHandle,SQL_HANDLE_STMT,*this);
- }
-@@ -861,7 +861,7 @@
- 
-     // Bind the parameter with SQL_LEN_DATA_AT_EXEC
- 	SQLSMALLINT   Ctype = SQL_C_CHAR;
--	SDWORD	atExec = SQL_LEN_DATA_AT_EXEC (length);
-+	SQLLEN	atExec = SQL_LEN_DATA_AT_EXEC (length);
- 	memcpy (dataBuf, &ParameterIndex, sizeof(ParameterIndex));
- 	memcpy (lenBuf, &atExec, sizeof (atExec));
- 
-@@ -872,14 +872,14 @@
- 	OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
- 	N3SQLBindParameter(m_aStatementHandle,
- 						(SQLUSMALLINT)ParameterIndex,
--						(SQLSMALLINT)SQL_PARAM_INPUT,
-+						(SQLUSMALLINT)SQL_PARAM_INPUT,
- 						Ctype,
- 						(SQLSMALLINT)SQLtype,
--						(SQLUINTEGER)length,
-+						(SQLULEN)length,
- 						0,
- 						dataBuf,
- 						sizeof(ParameterIndex),
--						(SDWORD*)lenBuf);
-+						(SQLLEN*)lenBuf);
- 
- 	// Save the input stream
- 	boundParams[ParameterIndex - 1].setInputStream (x, length);
-Index: connectivity/source/drivers/odbcbase/OResultSet.cxx
-===================================================================
---- connectivity/source/drivers/odbcbase/OResultSet.cxx	(revision 274960)
-+++ connectivity/source/drivers/odbcbase/OResultSet.cxx	(working copy)
-@@ -843,8 +843,8 @@
- 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- 
- 
--	SQLSMALLINT nMaxLen = 20;
--	SQLINTEGER nRealLen = 0;
-+	SQLLEN nMaxLen = 20;
-+	SQLLEN nRealLen = 0;
- 	Sequence<sal_Int8> aBookmark(nMaxLen);
- 
- 	SQLRETURN nRet = N3SQLBindCol(m_aStatementHandle,
-@@ -925,7 +925,7 @@
-     sal_Bool bPositionByBookmark = ( NULL != getOdbcFunction( ODBC3SQLBulkOperations ) );
- 	if ( bPositionByBookmark )
- 	{
--		SQLINTEGER nRealLen = 0;
-+		SQLLEN nRealLen = 0;
- 		nRet = N3SQLBindCol(m_aStatementHandle,
- 							0,
- 							SQL_C_VARBOOKMARK,
-Index: connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
-===================================================================
---- connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx	(revision 274960)
-+++ connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx	(working copy)
-@@ -86,13 +86,13 @@
- 	return  sValue;
- }
- // -------------------------------------------------------------------------
--SWORD OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
-+SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
-                                               ,SQLHANDLE _aStatementHandle
-                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
-                                               ,sal_Int32 _column
-                                               ,sal_Int32 _ident) throw(SQLException, RuntimeException)
- {
--	SWORD nValue=0;
-+	SQLLEN nValue=0;
- 	OTools::ThrowException(_pConnection,(*(T3SQLColAttribute)_pConnection->getOdbcFunction(ODBC3SQLColAttribute))(_aStatementHandle,
- 										 (SQLUSMALLINT)_column,
- 										 (SQLUSMALLINT)_ident,
-@@ -117,13 +117,13 @@
- 	return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE);
- }
- // -------------------------------------------------------------------------
--SWORD OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
-+SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
-                                               ,SQLHANDLE _aStatementHandle
-                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
-                                               ,sal_Int32 column)
-                                                throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
- {
--    SWORD nType = 0;
-+    SQLSMALLINT nType = 0;
-     try
- 	{
- 		nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE);
-Index: unixODBC/inc/sql.h
-===================================================================
---- unixODBC/inc/sql.h	(revision 274960)
-+++ unixODBC/inc/sql.h	(working copy)
-@@ -7,6 +7,7 @@
- #ifndef __SQL_H
- #define __SQL_H
- 
-+
- /****************************
-  * default to 3.51 declare something else before here and you get a whole new ball of wax
-  ***************************/
-@@ -14,7 +15,9 @@
- #define ODBCVER 0x0351
- #endif
- 
-+#ifndef __SQLTYPES_H
- #include "sqltypes.h"
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -270,6 +273,7 @@
- #define SQL_NULL_HSTMT      0
- #if (ODBCVER >= 0x0300)
- #define SQL_NULL_HDESC      0
-+#define SQL_NULL_DESC       0
- #endif
- 
- /* null handle used in place of parent handle when allocating HENV */
-@@ -562,254 +566,257 @@
- #define SQL_NC_HIGH                         0
- #define SQL_NC_LOW                          1
- 
--SQLRETURN   SQLAllocConnect(SQLHENV EnvironmentHandle,
--           SQLHDBC *ConnectionHandle);
-+    SQLRETURN  SQL_API SQLAllocConnect(SQLHENV EnvironmentHandle,
-+                                       SQLHDBC *ConnectionHandle);
- 
--SQLRETURN   SQLAllocEnv(SQLHENV *EnvironmentHandle);
-+    SQLRETURN  SQL_API SQLAllocEnv(SQLHENV *EnvironmentHandle);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLAllocHandle(SQLSMALLINT HandleType,
--           SQLHANDLE InputHandle, SQLHANDLE *OutputHandle);
-+    SQLRETURN  SQL_API SQLAllocHandle(SQLSMALLINT HandleType,
-+                                      SQLHANDLE InputHandle, SQLHANDLE *OutputHandle);
- #endif
- 
--SQLRETURN   SQLAllocStmt(SQLHDBC ConnectionHandle,
--           SQLHSTMT *StatementHandle);
-+    SQLRETURN  SQL_API SQLAllocStmt(SQLHDBC ConnectionHandle,
-+                                    SQLHSTMT *StatementHandle);
- 
--SQLRETURN   SQLBindCol(SQLHSTMT StatementHandle,
--		   SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
--		   SQLPOINTER TargetValue, SQLINTEGER BufferLength,
--	   	   SQLINTEGER *StrLen_or_Ind);
-+    SQLRETURN  SQL_API SQLBindCol(SQLHSTMT StatementHandle,
-+                                  SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
-+                                  SQLPOINTER TargetValue, SQLLEN BufferLength,
-+                                  SQLLEN *StrLen_or_Ind);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLBindParam(SQLHSTMT StatementHandle,
--           SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
--           SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision,
--           SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
--           SQLINTEGER *StrLen_or_Ind);
-+    SQLRETURN  SQL_API SQLBindParam(SQLHSTMT StatementHandle,
-+                                    SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
-+                                    SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
-+                                    SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
-+                                    SQLLEN *StrLen_or_Ind);
- #endif
- 
--SQLRETURN   SQLCancel(SQLHSTMT StatementHandle);
-+    SQLRETURN  SQL_API SQLCancel(SQLHSTMT StatementHandle);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLCloseCursor(SQLHSTMT StatementHandle);
-+    SQLRETURN  SQL_API SQLCloseCursor(SQLHSTMT StatementHandle);
- 
--SQLRETURN   SQLColAttribute (SQLHSTMT StatementHandle,
--           SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
--           SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
--           SQLSMALLINT *StringLength, SQLPOINTER NumericAttribute);
-+    SQLRETURN  SQL_API SQLColAttribute(SQLHSTMT StatementHandle,
-+                                        SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
-+                                        SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
-+                                        SQLSMALLINT *StringLength, SQLLEN *NumericAttribute 
-+										/* spec says (SQLPOINTER) not (SQLEN*) - PAH */ );
-+										/* Ms now say SQLLEN* http://msdn.microsoft.com/library/en-us/odbc/htm/dasdkodbcoverview_64bit.asp - NG */
-+										
- #endif
- 
- 
--SQLRETURN   SQLColumns(SQLHSTMT StatementHandle,
--           SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
--           SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
--           SQLCHAR *TableName, SQLSMALLINT NameLength3,
--           SQLCHAR *ColumnName, SQLSMALLINT NameLength4);
-+    SQLRETURN  SQL_API SQLColumns(SQLHSTMT StatementHandle,
-+                                  SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-+                                  SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-+                                  SQLCHAR *TableName, SQLSMALLINT NameLength3,
-+                                  SQLCHAR *ColumnName, SQLSMALLINT NameLength4);
- 
- 
--SQLRETURN   SQLConnect(SQLHDBC ConnectionHandle,
--           SQLCHAR *ServerName, SQLSMALLINT NameLength1,
--           SQLCHAR *UserName, SQLSMALLINT NameLength2,
--           SQLCHAR *Authentication, SQLSMALLINT NameLength3);
-+    SQLRETURN  SQL_API SQLConnect(SQLHDBC ConnectionHandle,
-+                                  SQLCHAR *ServerName, SQLSMALLINT NameLength1,
-+                                  SQLCHAR *UserName, SQLSMALLINT NameLength2,
-+                                  SQLCHAR *Authentication, SQLSMALLINT NameLength3);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLCopyDesc(SQLHDESC SourceDescHandle,
--           SQLHDESC TargetDescHandle);
-+    SQLRETURN  SQL_API SQLCopyDesc(SQLHDESC SourceDescHandle,
-+                                   SQLHDESC TargetDescHandle);
- #endif
- 
--SQLRETURN   SQLDataSources(SQLHENV EnvironmentHandle,
--           SQLUSMALLINT Direction, SQLCHAR *ServerName,
--           SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1,
--           SQLCHAR *Description, SQLSMALLINT BufferLength2,
--           SQLSMALLINT *NameLength2);
-+    SQLRETURN  SQL_API SQLDataSources(SQLHENV EnvironmentHandle,
-+                                      SQLUSMALLINT Direction, SQLCHAR *ServerName,
-+                                      SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1,
-+                                      SQLCHAR *Description, SQLSMALLINT BufferLength2,
-+                                      SQLSMALLINT *NameLength2);
- 
--SQLRETURN   SQLDescribeCol(SQLHSTMT StatementHandle,
--           SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName,
--           SQLSMALLINT BufferLength, SQLSMALLINT *NameLength,
--           SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize,
--           SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable);
-+    SQLRETURN  SQL_API SQLDescribeCol(SQLHSTMT StatementHandle,
-+                                      SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName,
-+                                      SQLSMALLINT BufferLength, SQLSMALLINT *NameLength,
-+                                      SQLSMALLINT *DataType, SQLULEN *ColumnSize,
-+                                      SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable);
- 
--SQLRETURN   SQLDisconnect(SQLHDBC ConnectionHandle);
-+    SQLRETURN  SQL_API SQLDisconnect(SQLHDBC ConnectionHandle);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle,
--           SQLSMALLINT CompletionType);
-+    SQLRETURN  SQL_API SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle,
-+                                  SQLSMALLINT CompletionType);
- #endif
- 
--SQLRETURN   SQLError(SQLHENV EnvironmentHandle,
--           SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle,
--           SQLCHAR *Sqlstate, SQLINTEGER *NativeError,
--           SQLCHAR *MessageText, SQLSMALLINT BufferLength,
--           SQLSMALLINT *TextLength);
-+    SQLRETURN  SQL_API SQLError(SQLHENV EnvironmentHandle,
-+                                SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle,
-+                                SQLCHAR *Sqlstate, SQLINTEGER *NativeError,
-+                                SQLCHAR *MessageText, SQLSMALLINT BufferLength,
-+                                SQLSMALLINT *TextLength);
- 
--SQLRETURN   SQLExecDirect(SQLHSTMT StatementHandle,
--           SQLCHAR *StatementText, SQLINTEGER TextLength);
-+    SQLRETURN  SQL_API SQLExecDirect(SQLHSTMT StatementHandle,
-+                                     SQLCHAR *StatementText, SQLINTEGER TextLength);
- 
--SQLRETURN   SQLExecute(SQLHSTMT StatementHandle);
-+    SQLRETURN  SQL_API SQLExecute(SQLHSTMT StatementHandle);
- 
--SQLRETURN   SQLFetch(SQLHSTMT StatementHandle);
-+    SQLRETURN  SQL_API SQLFetch(SQLHSTMT StatementHandle);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLFetchScroll(SQLHSTMT StatementHandle,
--           SQLSMALLINT FetchOrientation, SQLINTEGER FetchOffset);
-+    SQLRETURN  SQL_API SQLFetchScroll(SQLHSTMT StatementHandle,
-+                                      SQLSMALLINT FetchOrientation, SQLLEN FetchOffset);
- #endif
- 
--SQLRETURN   SQLFreeConnect(SQLHDBC ConnectionHandle);
-+    SQLRETURN  SQL_API SQLFreeConnect(SQLHDBC ConnectionHandle);
- 
--SQLRETURN   SQLFreeEnv(SQLHENV EnvironmentHandle);
-+    SQLRETURN  SQL_API SQLFreeEnv(SQLHENV EnvironmentHandle);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle);
-+    SQLRETURN  SQL_API SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle);
- #endif
- 
--SQLRETURN   SQLFreeStmt(SQLHSTMT StatementHandle,
--           SQLUSMALLINT Option);
-+    SQLRETURN  SQL_API SQLFreeStmt(SQLHSTMT StatementHandle,
-+                                   SQLUSMALLINT Option);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLGetConnectAttr(SQLHDBC ConnectionHandle,
--           SQLINTEGER Attribute, SQLPOINTER Value,
--           SQLINTEGER BufferLength, SQLINTEGER *StringLength);
-+    SQLRETURN  SQL_API SQLGetConnectAttr(SQLHDBC ConnectionHandle,
-+                                         SQLINTEGER Attribute, SQLPOINTER Value,
-+                                         SQLINTEGER BufferLength, SQLINTEGER *StringLength);
- #endif
- 
--SQLRETURN   SQLGetConnectOption(SQLHDBC ConnectionHandle,
--           SQLUSMALLINT Option, SQLPOINTER Value);
-+    SQLRETURN  SQL_API SQLGetConnectOption(SQLHDBC ConnectionHandle,
-+                                           SQLUSMALLINT Option, SQLPOINTER Value);
- 
--SQLRETURN   SQLGetCursorName(SQLHSTMT StatementHandle,
--           SQLCHAR *CursorName, SQLSMALLINT BufferLength,
--           SQLSMALLINT *NameLength);
-+    SQLRETURN  SQL_API SQLGetCursorName(SQLHSTMT StatementHandle,
-+                                        SQLCHAR *CursorName, SQLSMALLINT BufferLength,
-+                                        SQLSMALLINT *NameLength);
- 
--SQLRETURN   SQLGetData(SQLHSTMT StatementHandle,
--           SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
--           SQLPOINTER TargetValue, SQLINTEGER BufferLength,
--           SQLINTEGER *StrLen_or_Ind);
-+    SQLRETURN  SQL_API SQLGetData(SQLHSTMT StatementHandle,
-+                                  SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
-+                                  SQLPOINTER TargetValue, SQLLEN BufferLength,
-+                                  SQLLEN *StrLen_or_Ind);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLGetDescField(SQLHDESC DescriptorHandle,
--           SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
--           SQLPOINTER Value, SQLINTEGER BufferLength,
--           SQLINTEGER *StringLength);
-+    SQLRETURN   SQLGetDescField(SQLHDESC DescriptorHandle,
-+                                SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
-+                                SQLPOINTER Value, SQLINTEGER BufferLength,
-+                                SQLINTEGER *StringLength);
- 
--SQLRETURN   SQLGetDescRec(SQLHDESC DescriptorHandle,
--           SQLSMALLINT RecNumber, SQLCHAR *Name,
--           SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
--           SQLSMALLINT *Type, SQLSMALLINT *SubType,
--           SQLINTEGER *Length, SQLSMALLINT *Precision,
--           SQLSMALLINT *Scale, SQLSMALLINT *Nullable);
-+    SQLRETURN  SQL_API SQLGetDescRec(SQLHDESC DescriptorHandle,
-+                                     SQLSMALLINT RecNumber, SQLCHAR *Name,
-+                                     SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
-+                                     SQLSMALLINT *Type, SQLSMALLINT *SubType,
-+                                     SQLLEN *Length, SQLSMALLINT *Precision,
-+                                     SQLSMALLINT *Scale, SQLSMALLINT *Nullable);
- 
--SQLRETURN   SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
--           SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier,
--           SQLPOINTER DiagInfo, SQLSMALLINT BufferLength,
--           SQLSMALLINT *StringLength);
-+    SQLRETURN  SQL_API SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
-+                                       SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier,
-+                                       SQLPOINTER DiagInfo, SQLSMALLINT BufferLength,
-+                                       SQLSMALLINT *StringLength);
- 
--SQLRETURN   SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle,
--           SQLSMALLINT RecNumber, SQLCHAR *Sqlstate,
--           SQLINTEGER *NativeError, SQLCHAR *MessageText,
--           SQLSMALLINT BufferLength, SQLSMALLINT *TextLength);
-+    SQLRETURN  SQL_API SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle,
-+                                     SQLSMALLINT RecNumber, SQLCHAR *Sqlstate,
-+                                     SQLINTEGER *NativeError, SQLCHAR *MessageText,
-+                                     SQLSMALLINT BufferLength, SQLSMALLINT *TextLength);
- 
--SQLRETURN   SQLGetEnvAttr(SQLHENV EnvironmentHandle,
--           SQLINTEGER Attribute, SQLPOINTER Value,
--           SQLINTEGER BufferLength, SQLINTEGER *StringLength);
-+    SQLRETURN  SQL_API SQLGetEnvAttr(SQLHENV EnvironmentHandle,
-+                                     SQLINTEGER Attribute, SQLPOINTER Value,
-+                                     SQLINTEGER BufferLength, SQLINTEGER *StringLength);
- #endif  /* ODBCVER >= 0x0300 */
- 
--SQLRETURN   SQLGetFunctions(SQLHDBC ConnectionHandle,
--           SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported);
-+    SQLRETURN  SQL_API SQLGetFunctions(SQLHDBC ConnectionHandle,
-+                                       SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported);
- 
--SQLRETURN   SQLGetInfo(SQLHDBC ConnectionHandle,
--           SQLUSMALLINT InfoType, SQLPOINTER InfoValue,
--           SQLSMALLINT BufferLength, SQLSMALLINT *StringLength);
-+    SQLRETURN  SQL_API SQLGetInfo(SQLHDBC ConnectionHandle,
-+                                  SQLUSMALLINT InfoType, SQLPOINTER InfoValue,
-+                                  SQLSMALLINT BufferLength, SQLSMALLINT *StringLength);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLGetStmtAttr(SQLHSTMT StatementHandle,
--           SQLINTEGER Attribute, SQLPOINTER Value,
--           SQLINTEGER BufferLength, SQLINTEGER *StringLength);
-+    SQLRETURN  SQL_API SQLGetStmtAttr(SQLHSTMT StatementHandle,
-+                                      SQLINTEGER Attribute, SQLPOINTER Value,
-+                                      SQLINTEGER BufferLength, SQLINTEGER *StringLength);
- #endif  /* ODBCVER >= 0x0300 */
- 
--SQLRETURN   SQLGetStmtOption(SQLHSTMT StatementHandle,
--           SQLUSMALLINT Option, SQLPOINTER Value);
-+    SQLRETURN  SQL_API SQLGetStmtOption(SQLHSTMT StatementHandle,
-+                                        SQLUSMALLINT Option, SQLPOINTER Value);
- 
--SQLRETURN   SQLGetTypeInfo(SQLHSTMT StatementHandle,
--           SQLSMALLINT DataType);
-+    SQLRETURN  SQL_API SQLGetTypeInfo(SQLHSTMT StatementHandle,
-+                                      SQLSMALLINT DataType);
- 
--SQLRETURN   SQLNumResultCols(SQLHSTMT StatementHandle,
--           SQLSMALLINT *ColumnCount);
-+    SQLRETURN  SQL_API SQLNumResultCols(SQLHSTMT StatementHandle,
-+                                        SQLSMALLINT *ColumnCount);
- 
--SQLRETURN   SQLParamData(SQLHSTMT StatementHandle,
--           SQLPOINTER *Value);
-+    SQLRETURN  SQL_API SQLParamData(SQLHSTMT StatementHandle,
-+                                    SQLPOINTER *Value);
- 
--SQLRETURN   SQLPrepare(SQLHSTMT StatementHandle,
--           SQLCHAR *StatementText, SQLINTEGER TextLength);
-+    SQLRETURN  SQL_API SQLPrepare(SQLHSTMT StatementHandle,
-+                                  SQLCHAR *StatementText, SQLINTEGER TextLength);
- 
--SQLRETURN   SQLPutData(SQLHSTMT StatementHandle,
--           SQLPOINTER Data, SQLINTEGER StrLen_or_Ind);
-+    SQLRETURN  SQL_API SQLPutData(SQLHSTMT StatementHandle,
-+                                  SQLPOINTER Data, SQLLEN StrLen_or_Ind);
- 
--SQLRETURN   SQLRowCount(SQLHSTMT StatementHandle,
--	   SQLINTEGER *RowCount);
-+    SQLRETURN  SQL_API SQLRowCount(SQLHSTMT StatementHandle,
-+                                   SQLLEN *RowCount);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLSetConnectAttr(SQLHDBC ConnectionHandle,
--           SQLINTEGER Attribute, SQLPOINTER Value,
--           SQLINTEGER StringLength);
-+    SQLRETURN  SQL_API SQLSetConnectAttr(SQLHDBC ConnectionHandle,
-+                                         SQLINTEGER Attribute, SQLPOINTER Value,
-+                                         SQLINTEGER StringLength);
- #endif /* ODBCVER >= 0x0300 */
- 
--SQLRETURN   SQLSetConnectOption(SQLHDBC ConnectionHandle,
--           SQLUSMALLINT Option, SQLUINTEGER Value);
-+    SQLRETURN  SQL_API SQLSetConnectOption(SQLHDBC ConnectionHandle,
-+                                           SQLUSMALLINT Option, SQLULEN Value);
- 
--SQLRETURN   SQLSetCursorName(SQLHSTMT StatementHandle,
--           SQLCHAR *CursorName, SQLSMALLINT NameLength);
-+    SQLRETURN  SQL_API SQLSetCursorName(SQLHSTMT StatementHandle,
-+                                        SQLCHAR *CursorName, SQLSMALLINT NameLength);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLSetDescField(SQLHDESC DescriptorHandle,
--           SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
--           SQLPOINTER Value, SQLINTEGER BufferLength);
-+    SQLRETURN  SQL_API SQLSetDescField(SQLHDESC DescriptorHandle,
-+                                       SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
-+                                       SQLPOINTER Value, SQLINTEGER BufferLength);
- 
--SQLRETURN   SQLSetDescRec(SQLHDESC DescriptorHandle,
--           SQLSMALLINT RecNumber, SQLSMALLINT Type,
--           SQLSMALLINT SubType, SQLINTEGER Length,
--           SQLSMALLINT Precision, SQLSMALLINT Scale,
--           SQLPOINTER Data, SQLINTEGER *StringLength,
--           SQLINTEGER *Indicator);
-+    SQLRETURN  SQL_API SQLSetDescRec(SQLHDESC DescriptorHandle,
-+                                     SQLSMALLINT RecNumber, SQLSMALLINT Type,
-+                                     SQLSMALLINT SubType, SQLLEN Length,
-+                                     SQLSMALLINT Precision, SQLSMALLINT Scale,
-+                                     SQLPOINTER Data, SQLLEN *StringLength,
-+                                     SQLLEN *Indicator);
- 
--SQLRETURN   SQLSetEnvAttr(SQLHENV EnvironmentHandle,
--           SQLINTEGER Attribute, SQLPOINTER Value,
--           SQLINTEGER StringLength);
-+    SQLRETURN  SQL_API SQLSetEnvAttr(SQLHENV EnvironmentHandle,
-+                                     SQLINTEGER Attribute, SQLPOINTER Value,
-+                                     SQLINTEGER StringLength);
- #endif /* ODBCVER >= 0x0300 */
- 
--SQLRETURN   SQLSetParam(SQLHSTMT StatementHandle,
--           SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
--           SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision,
--           SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
--           SQLINTEGER *StrLen_or_Ind);
-+    SQLRETURN  SQL_API SQLSetParam(SQLHSTMT StatementHandle,
-+                                   SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
-+                                   SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
-+                                   SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
-+                                   SQLLEN *StrLen_or_Ind);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN   SQLSetStmtAttr(SQLHSTMT StatementHandle,
--           SQLINTEGER Attribute, SQLPOINTER Value,
--           SQLINTEGER StringLength);
-+    SQLRETURN  SQL_API SQLSetStmtAttr(SQLHSTMT StatementHandle,
-+                                      SQLINTEGER Attribute, SQLPOINTER Value,
-+                                      SQLINTEGER StringLength);
- #endif
- 
--SQLRETURN   SQLSetStmtOption(SQLHSTMT StatementHandle,
--           SQLUSMALLINT Option, SQLUINTEGER Value);
-+    SQLRETURN  SQL_API SQLSetStmtOption(SQLHSTMT StatementHandle,
-+                                        SQLUSMALLINT Option, SQLULEN Value);
- 
--SQLRETURN   SQLSpecialColumns(SQLHSTMT StatementHandle,
--           SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName,
--           SQLSMALLINT NameLength1, SQLCHAR *SchemaName,
--           SQLSMALLINT NameLength2, SQLCHAR *TableName,
--           SQLSMALLINT NameLength3, SQLUSMALLINT Scope,
--           SQLUSMALLINT Nullable);
-+    SQLRETURN  SQL_API SQLSpecialColumns(SQLHSTMT StatementHandle,
-+                                         SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName,
-+                                         SQLSMALLINT NameLength1, SQLCHAR *SchemaName,
-+                                         SQLSMALLINT NameLength2, SQLCHAR *TableName,
-+                                         SQLSMALLINT NameLength3, SQLUSMALLINT Scope,
-+                                         SQLUSMALLINT Nullable);
- 
--SQLRETURN   SQLStatistics(SQLHSTMT StatementHandle,
--           SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
--           SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
--           SQLCHAR *TableName, SQLSMALLINT NameLength3,
--           SQLUSMALLINT Unique, SQLUSMALLINT Reserved);
-+    SQLRETURN  SQL_API SQLStatistics(SQLHSTMT StatementHandle,
-+                                     SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-+                                     SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-+                                     SQLCHAR *TableName, SQLSMALLINT NameLength3,
-+                                     SQLUSMALLINT Unique, SQLUSMALLINT Reserved);
- 
--SQLRETURN   SQLTables(SQLHSTMT StatementHandle,
--           SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
--           SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
--           SQLCHAR *TableName, SQLSMALLINT NameLength3,
--           SQLCHAR *TableType, SQLSMALLINT NameLength4);
-+    SQLRETURN   SQL_API SQLTables(SQLHSTMT StatementHandle,
-+                                  SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-+                                  SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-+                                  SQLCHAR *TableName, SQLSMALLINT NameLength3,
-+                                  SQLCHAR *TableType, SQLSMALLINT NameLength4);
- 
--SQLRETURN   SQLTransact(SQLHENV EnvironmentHandle,
--           SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType);
-+    SQLRETURN  SQL_API SQLTransact(SQLHENV EnvironmentHandle,
-+                                   SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType);
- 
- #ifdef __cplusplus
- }
-Index: unixODBC/inc/sqlext.h
-===================================================================
---- unixODBC/inc/sqlext.h	(revision 274960)
-+++ unixODBC/inc/sqlext.h	(working copy)
-@@ -39,7 +39,9 @@
- 
- /* END - unixODBC ONLY */
- 
-+#ifndef __SQL_H
- #include "sql.h"
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {                         /* Assume C declarations for C++ */
-@@ -47,8 +49,8 @@
- 
- /* generally useful constants */
- #define SQL_SPEC_MAJOR     3     	/* Major version of specification  */
--#define SQL_SPEC_MINOR	   51     	/* Minor version of specification  */
--#define SQL_SPEC_STRING   "03.51"	/* String constant for version */
-+#define SQL_SPEC_MINOR	   52     	/* Minor version of specification  */
-+#define SQL_SPEC_STRING   "03.52"	/* String constant for version */
- 
- #define SQL_SQLSTATE_SIZE	5	/* size of SQLSTATE */
- #define SQL_MAX_DSN_LENGTH	32	/* maximum data source name size */
-@@ -72,6 +74,11 @@
- #define SQL_ATTR_ODBC_VERSION				200
- #define SQL_ATTR_CONNECTION_POOLING			201
- #define SQL_ATTR_CP_MATCH					202
-+
-+/* unixODBC additions */
-+#define SQL_ATTR_UNIXODBC_SYSPATH           65001
-+#define SQL_ATTR_UNIXODBC_VERSION           65002
-+#define SQL_ATTR_UNIXODBC_ENVATTR           65003
- #endif  /* ODBCVER >= 0x0300 */
- 
- #if (ODBCVER >= 0x0300)
-@@ -127,6 +134,8 @@
- 
- #define SQL_ATTR_CONNECTION_DEAD	1209	/* GetConnectAttr only */
- 
-+#define SQL_ATTR_DRIVER_THREADING	1028	/* Driver threading level */
-+
- #if (ODBCVER >= 0x0351)
- /*	ODBC Driver Manager sets this connection attribute to a unicode driver
- 	(which supports SQLConnectW) when the application is an ANSI application
-@@ -170,7 +179,7 @@
- #define SQL_OPT_TRACE_OFF               0UL
- #define SQL_OPT_TRACE_ON                1UL
- #define SQL_OPT_TRACE_DEFAULT           SQL_OPT_TRACE_OFF
--#define SQL_OPT_TRACE_FILE_DEFAULT      "\\SQL.LOG"
-+#define SQL_OPT_TRACE_FILE_DEFAULT      "/tmp/SQL.LOG"
- 
- /* SQL_ODBC_CURSORS options */
- #define SQL_CUR_USE_IF_NEEDED           0UL
-@@ -516,7 +525,12 @@
- #define SQL_C_ULONG      (SQL_C_LONG+SQL_UNSIGNED_OFFSET)  /* UNSIGNED INTEGER*/
- #define SQL_C_USHORT     (SQL_C_SHORT+SQL_UNSIGNED_OFFSET) /* UNSIGNED SMALLINT*/
- #define SQL_C_UTINYINT   (SQL_TINYINT+SQL_UNSIGNED_OFFSET) /* UNSIGNED TINYINT*/
-+
-+#if (ODBCVER >= 0x0300) && (SIZEOF_LONG_INT == 8) && !defined(BUILD_LEGACY_64_BIT_MODE)
-+#define SQL_C_BOOKMARK   SQL_C_UBIGINT                     /* BOOKMARK        */
-+#else
- #define SQL_C_BOOKMARK   SQL_C_ULONG                       /* BOOKMARK        */
-+#endif
- 
- #if (ODBCVER >= 0x0350)
- #define SQL_C_GUID	SQL_GUID
-@@ -751,6 +765,7 @@
- #define SQL_CONVERT_VARBINARY               69
- #define SQL_CONVERT_VARCHAR                 70
- #define SQL_CONVERT_LONGVARBINARY           71
-+#define SQL_CONVERT_GUID           			173
- #define SQL_ODBC_SQL_OPT_IEF                73		/* SQL_INTEGRITY */
- #define SQL_CORRELATION_NAME                74
- #define SQL_NON_NULLABLE_COLUMNS            75
-@@ -780,7 +795,9 @@
- #define SQL_QUALIFIER_LOCATION              114
- 
- #if (ODBCVER >= 0x0201 && ODBCVER < 0x0300)
-+#ifndef SQL_OJ_CAPABILITIES
- #define SQL_OJ_CAPABILITIES         65003  /* Temp value until ODBC 3.0 */
-+#endif
- #endif  /* ODBCVER >= 0x0201 && ODBCVER < 0x0300 */
- 
- /*----------------------------------------------*/
-@@ -927,6 +944,7 @@
- #define	SQL_CVT_WCHAR						0x00200000L
- #define	SQL_CVT_WLONGVARCHAR				0x00400000L
- #define	SQL_CVT_WVARCHAR					0x00800000L
-+#define	SQL_CVT_GUID						0x01000000L
- 
- #endif  /* ODBCVER >= 0x0300 */
- 
-@@ -1199,7 +1217,7 @@
- #define SQL_FILE_NOT_SUPPORTED              0x0000
- #define SQL_FILE_TABLE                      0x0001
- #define SQL_FILE_QUALIFIER                  0x0002
--#define SQL_FILE_CATALOG					SQL_FILE_QUALIFIER	// ODBC 3.0
-+#define SQL_FILE_CATALOG					SQL_FILE_QUALIFIER	/* ODBC 3.0 */
- 
- 
- /* SQL_GETDATA_EXTENSIONS values */
-@@ -1688,7 +1706,7 @@
- #define SQL_DRIVER_PROMPT               2
- #define SQL_DRIVER_COMPLETE_REQUIRED    3
- 
--SQLRETURN  SQLDriverConnect(
-+SQLRETURN SQL_API SQLDriverConnect(
-     SQLHDBC            hdbc,
-     SQLHWND            hwnd,
-     SQLCHAR 		  *szConnStrIn,
-@@ -1762,8 +1780,7 @@
- #define SQL_PT_FUNCTION                  2
- 
- /*      This define is too large for RC */
--#define SQL_ODBC_KEYWORDS "ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"
--/*
-+#define SQL_ODBC_KEYWORDS "ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"\
- "ASC,ASSERTION,AT,AUTHORIZATION,AVG,"\
- "BEGIN,BETWEEN,BIT,BIT_LENGTH,BOTH,BY,CASCADE,CASCADED,CASE,CAST,CATALOG,"\
- "CHAR,CHAR_LENGTH,CHARACTER,CHARACTER_LENGTH,CHECK,CLOSE,COALESCE,"\
-@@ -1794,9 +1811,8 @@
- "UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\
- "VALUE,VALUES,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,WRITE,"\
- "YEAR,ZONE"
--*/
- 
--SQLRETURN  SQLBrowseConnect(
-+SQLRETURN SQL_API SQLBrowseConnect(
-     SQLHDBC            hdbc,
-     SQLCHAR 		  *szConnStrIn,
-     SQLSMALLINT        cbConnStrIn,
-@@ -1805,21 +1821,21 @@
-     SQLSMALLINT       *pcbConnStrOut);
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN	SQLBulkOperations(
-+SQLRETURN	SQL_API SQLBulkOperations(
- 	SQLHSTMT			StatementHandle,
- 	SQLSMALLINT			Operation);
- #endif  /* ODBCVER >= 0x0300 */
- 
--SQLRETURN  SQLColAttributes(
-+SQLRETURN SQL_API SQLColAttributes(
-     SQLHSTMT           hstmt,
-     SQLUSMALLINT       icol,
-     SQLUSMALLINT       fDescType,
-     SQLPOINTER         rgbDesc,
-     SQLSMALLINT        cbDescMax,
-     SQLSMALLINT 	  *pcbDesc,
--    SQLINTEGER 		  *pfDesc);
-+    SQLLEN 		      *pfDesc);
- 
--SQLRETURN  SQLColumnPrivileges(
-+SQLRETURN SQL_API SQLColumnPrivileges(
-     SQLHSTMT           hstmt,
-     SQLCHAR 		  *szCatalogName,
-     SQLSMALLINT        cbCatalogName,
-@@ -1830,22 +1846,22 @@
-     SQLCHAR 		  *szColumnName,
-     SQLSMALLINT        cbColumnName);
- 
--SQLRETURN  SQLDescribeParam(
-+SQLRETURN SQL_API SQLDescribeParam(
-     SQLHSTMT           hstmt,
-     SQLUSMALLINT       ipar,
-     SQLSMALLINT 	  *pfSqlType,
--    SQLUINTEGER 	  *pcbParamDef,
-+    SQLULEN 	      *pcbParamDef,
-     SQLSMALLINT 	  *pibScale,
-     SQLSMALLINT 	  *pfNullable);
- 
--SQLRETURN  SQLExtendedFetch(
-+SQLRETURN SQL_API SQLExtendedFetch(
-     SQLHSTMT           hstmt,
-     SQLUSMALLINT       fFetchType,
--    SQLINTEGER         irow,
--    SQLUINTEGER 	  *pcrow,
--    SQLUSMALLINT 	  *rgfRowStatus);
-+    SQLLEN             irow,
-+    SQLULEN 	  	   *pcrow,
-+    SQLUSMALLINT 	   *rgfRowStatus);
- 
--SQLRETURN  SQLForeignKeys(
-+SQLRETURN SQL_API SQLForeignKeys(
-     SQLHSTMT           hstmt,
-     SQLCHAR 		  *szPkCatalogName,
-     SQLSMALLINT        cbPkCatalogName,
-@@ -1860,10 +1876,10 @@
-     SQLCHAR 		  *szFkTableName,
-     SQLSMALLINT        cbFkTableName);
- 
--SQLRETURN  SQLMoreResults(
-+SQLRETURN SQL_API SQLMoreResults(
-     SQLHSTMT           hstmt);
- 
--SQLRETURN  SQLNativeSql(
-+SQLRETURN SQL_API SQLNativeSql(
-     SQLHDBC            hdbc,
-     SQLCHAR 		  *szSqlStrIn,
-     SQLINTEGER         cbSqlStrIn,
-@@ -1871,16 +1887,16 @@
-     SQLINTEGER         cbSqlStrMax,
-     SQLINTEGER 		  *pcbSqlStr);
- 
--SQLRETURN  SQLNumParams(
-+SQLRETURN SQL_API SQLNumParams(
-     SQLHSTMT           hstmt,
-     SQLSMALLINT 	  *pcpar);
- 
--SQLRETURN  SQLParamOptions(
-+SQLRETURN SQL_API SQLParamOptions(
-     SQLHSTMT           hstmt,
--    SQLUINTEGER        crow,
--    SQLUINTEGER 	  *pirow);
-+    SQLULEN        	   crow,
-+    SQLULEN 	  	   *pirow);
- 
--SQLRETURN  SQLPrimaryKeys(
-+SQLRETURN SQL_API SQLPrimaryKeys(
-     SQLHSTMT           hstmt,
-     SQLCHAR 		  *szCatalogName,
-     SQLSMALLINT        cbCatalogName,
-@@ -1889,7 +1905,7 @@
-     SQLCHAR 		  *szTableName,
-     SQLSMALLINT        cbTableName);
- 
--SQLRETURN  SQLProcedureColumns(
-+SQLRETURN SQL_API SQLProcedureColumns(
-     SQLHSTMT           hstmt,
-     SQLCHAR 		  *szCatalogName,
-     SQLSMALLINT        cbCatalogName,
-@@ -1900,7 +1916,7 @@
-     SQLCHAR 		  *szColumnName,
-     SQLSMALLINT        cbColumnName);
- 
--SQLRETURN  SQLProcedures(
-+SQLRETURN SQL_API SQLProcedures(
-     SQLHSTMT           hstmt,
-     SQLCHAR 		  *szCatalogName,
-     SQLSMALLINT        cbCatalogName,
-@@ -1909,13 +1925,13 @@
-     SQLCHAR 		  *szProcName,
-     SQLSMALLINT        cbProcName);
- 
--SQLRETURN  SQLSetPos(
-+SQLRETURN SQL_API SQLSetPos(
-     SQLHSTMT           hstmt,
--    SQLUSMALLINT       irow,
-+    SQLSETPOSIROW      irow,
-     SQLUSMALLINT       fOption,
-     SQLUSMALLINT       fLock);
- 
--SQLRETURN  SQLTablePrivileges(
-+SQLRETURN SQL_API SQLTablePrivileges(
-     SQLHSTMT           hstmt,
-     SQLCHAR 		  *szCatalogName,
-     SQLSMALLINT        cbCatalogName,
-@@ -1924,7 +1940,7 @@
-     SQLCHAR 		  *szTableName,
-     SQLSMALLINT        cbTableName);
- 
--SQLRETURN  SQLDrivers(
-+SQLRETURN SQL_API SQLDrivers(
-     SQLHENV            henv,
-     SQLUSMALLINT       fDirection,
-     SQLCHAR 		  *szDriverDesc,
-@@ -1934,17 +1950,17 @@
-     SQLSMALLINT        cbDrvrAttrMax,
-     SQLSMALLINT 	  *pcbDrvrAttr);
- 
--SQLRETURN  SQLBindParameter(
-+SQLRETURN SQL_API SQLBindParameter(
-     SQLHSTMT           hstmt,
-     SQLUSMALLINT       ipar,
-     SQLSMALLINT        fParamType,
-     SQLSMALLINT        fCType,
-     SQLSMALLINT        fSqlType,
--    SQLUINTEGER        cbColDef,
-+    SQLULEN            cbColDef,
-     SQLSMALLINT        ibScale,
-     SQLPOINTER         rgbValue,
--    SQLINTEGER         cbValueMax,
--    SQLINTEGER 		  *pcbValue);
-+    SQLLEN             cbValueMax,
-+    SQLLEN 		      *pcbValue);
- 
- /*---------------------------------------------------------*/
- /* SQLAllocHandleStd is implemented to make SQLAllocHandle */
-@@ -1972,7 +1988,7 @@
- #endif /* ODBC_STD */
- 
- #if (ODBCVER >= 0x0300)
--SQLRETURN  SQLAllocHandleStd(
-+SQLRETURN SQL_API SQLAllocHandleStd(
- 	SQLSMALLINT		fHandleType,
- 	SQLHANDLE		hInput,
- 	SQLHANDLE	   *phOutput);
-@@ -1999,21 +2015,57 @@
- #define SQL_SCROLL_STATIC               (-3L) /*-SQL_CURSOR_STATIC */
- 
- /*      Deprecated functions from prior versions of ODBC */
--SQLRETURN  SQLSetScrollOptions(    /*      Use SQLSetStmtOptions */
-+SQLRETURN SQL_API SQLSetScrollOptions(    /*      Use SQLSetStmtOptions */
-     SQLHSTMT           hstmt,
-     SQLUSMALLINT       fConcurrency,
--    SQLINTEGER         crowKeyset,
-+    SQLLEN             crowKeyset,
-     SQLUSMALLINT       crowRowset);
- 
--/* Tracing section */
-+/*!
-+ * \defgroup    Tracing.
-+ *
-+ *              unixODBC implements a slight variation of the tracing mechanism used 
-+ *              on MS platforms. The unixODBC method loses the ability to produce trace
-+ *              output for invalid handles but gains the following;
-+ *
-+ *              - better concurrency 
-+ *              - allows tracing to be turned on/off and configured at finer granularity
-+ *              - hopefully; better performance
-+ *
-+ *              unixODBC provides a cross-platform helper library called 'trace' and an
-+ *              example/default trace plugin called 'odbctrac'. Those writing an ODBC 
-+ *              driver can use the 'trace' helper library (a static library). Those wanting
-+ *              to create custom trace output can implement a different version of the
-+ *              'odbctrac' plugin.
-+ *
-+ *              The text file driver (odbctxt) included with unixODBC is an example of a 
-+ *              driver using the 'trace' helper library.
-+ *
-+ *              The 'trace' library and the example plugin 'odbctrac' are designed to be 
-+ *              portable on all platforms where unixODBC is available and on MS platforms.
-+ *              This will allow drivers using 'trace' and 'odbctrac' plugin to equilly 
-+ *              portable. On MS platforms - this compliments traditional tracing (mostly
-+ *              just used by the Driver Manager).
-+ *
-+ * \sa          trace
-+ *              odbctxt
-+ *              odbctrac
-+ */
-+/*@{*/
-+#define	TRACE_VERSION 1000                                  /*!< Version of trace API                               */
-+#ifdef UNICODE
-+RETCODE TraceOpenLogFile(SQLPOINTER,LPWSTR,LPWSTR,DWORD); 	/*!< open a trace log file				                */
-+#else
-+RETCODE TraceOpenLogFile(SQLPOINTER,LPSTR,LPSTR,DWORD); 	/*!< open a trace log file				                */
-+#endif
-+RETCODE TraceCloseLogFile(SQLPOINTER);					    /*!< Request to close a trace log		                */
-+SQLRETURN TraceReturn(SQLPOINTER,SQLRETURN);                /*!< Call to produce trace output upon function return. */
-+#ifdef __cplusplus
-+DWORD	 TraceVersion();							        /*!< Returns trace API version			                */
-+#else
-+DWORD	 TraceVersion(VOID);							    /*!< Returns trace API version			                */
-+#endif
- 
--#define		TRACE_VERSION	1000		/* Version of trace API */
--
--RETCODE	 TraceOpenLogFile(LPWSTR,LPWSTR,DWORD); 	/* open a trace log file				*/
--RETCODE	 TraceCloseLogFile();					/* Request to close a trace log			*/
--VOID	 TraceReturn(RETCODE,RETCODE);			/* Processes trace after FN is called	*/
--DWORD	 TraceVersion();							/* Returns trace API version			*/
--
- /* Functions for Visual Studio Analyzer*/
- /* to turn on/off tracing or VS events, call TraceVSControl by setting or clearing the following bits  */
- #define TRACE_ON			0x00000001L
-@@ -2028,7 +2080,11 @@
- #define ODBC_VS_FLAG_STOP		0x00000008L	/* Stop firing visual studio analyzer events */
- 
- typedef struct tagODBC_VS_ARGS {
-+#ifdef GUID_DEFINED
- 	const GUID	*pguidEvent;	/* the GUID for event */
-+#else
-+	const void	*pguidEvent;	/* the GUID for event */
-+#endif
- 	DWORD	dwFlags;		/* flags for the call */
- 	union {
- 		WCHAR	*wszArg;	
-@@ -2042,10 +2098,25 @@
- } ODBC_VS_ARGS, *PODBC_VS_ARGS;
- 
- VOID	FireVSDebugEvent(PODBC_VS_ARGS);
-+/*@}*/
- 
--
- #ifdef __cplusplus
- }
- #endif
- 
-+/*
-+ * connection pooling retry times
-+ */
-+
-+BOOL ODBCSetTryWaitValue ( DWORD dwValue );
-+#ifdef __cplusplus
-+DWORD ODBCGetTryWaitValue ( );
-+#else
-+DWORD ODBCGetTryWaitValue ( VOID );
- #endif
-+
-+#ifndef __SQLUCODE_H
-+#include "sqlucode.h"
-+#endif
-+
-+#endif
-Index: unixODBC/inc/sqltypes.h
-===================================================================
---- unixODBC/inc/sqltypes.h	(revision 274960)
-+++ unixODBC/inc/sqltypes.h	(working copy)
-@@ -26,48 +26,111 @@
- #define ODBCVER	0x0351
- #endif
- 
-+/*
-+ * if thi sis set, then use a 4 byte unicode definition, insteead of the 2 bye that MS use
-+ */
-+
-+#ifdef SQL_WCHART_CONVERT  
-+/* 
-+ * Use this if you want to use the C/C++ portable definition of  a wide char, wchar_t
-+ *  Microsoft hardcoded a definition of  unsigned short which may not be compatible with
-+ *  your platform specific wide char definition.
-+ */
-+#include <wchar.h>
-+#endif
-+
-+#include <sal/types.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
--#ifndef SIZEOF_LONG
--# if defined(__alpha__) || defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__sparcv9) || defined(__LP64__)
--# define SIZEOF_LONG        8
--#else
--# define SIZEOF_LONG        4
-+#ifndef SIZEOF_LONG_INT
-+# define SIZEOF_LONG_INT SAL_TYPES_SIZEOFLONG
- #endif
-+#ifndef ODBCINT64
-+# define ODBCINT64 sal_Int64
- #endif
-+#ifndef UODBCINT64
-+# define UODBCINT64 sal_uInt64
-+#endif
- 
-+/*
-+ * this is defined by configure, but will not be on a normal application build
-+ * the install creates a unixodbc_conf.h file that contains the current build settings
-+ */
-+
-+#ifndef SIZEOF_LONG_INT
-+#include <unixodbc_conf.h>
-+#endif
-+
-+#ifndef SIZEOF_LONG_INT
-+#error "Needs to know how big a long int is to continue!!!"
-+#endif
-+
- /****************************
-  * These make up for having no windows.h
-  ***************************/
-+#ifndef ALLREADY_HAVE_WINDOWS_TYPE
-+
- #define FAR
- #define CALLBACK
-+#ifdef __OS2__
-+#define SQL_API _System
-+#else
- #define SQL_API
-+#endif
- #define	BOOL				int
- typedef void*				HWND;
--#ifndef CHAR
--typedef char*				GUID;
-+typedef char				CHAR;
-+#ifdef UNICODE
-+
-+/* 
-+ * NOTE: The Microsoft unicode define is only for apps that want to use TCHARs and 
-+ *  be able to compile for both unicode and non-unicode with the same source.
-+ *  This is not recommanded for linux applications and is not supported
-+ * 	by the standard linux string header files.
-+ */
-+#ifdef SQL_WCHART_CONVERT
-+typedef wchar_t             TCHAR;
-+#else
-+typedef signed short        TCHAR;
- #endif
--#define GUID_DEFINED
--typedef char				CHAR;
-+
-+#else
-+typedef char				TCHAR;
-+#endif
-+
- #ifndef DONT_TD_VOID
- typedef void				VOID;
- #endif
-+
- typedef unsigned short		WORD;
--#if SIZEOF_LONG == 4
--	typedef unsigned long		DWORD;
-+#if (SIZEOF_LONG_INT == 4)
-+typedef unsigned long		DWORD;
- #else
--	typedef unsigned int		DWORD;
-+typedef unsigned int		DWORD;
- #endif
- typedef unsigned char		BYTE;
-+
-+#ifdef SQL_WCHART_CONVERT
-+typedef wchar_t             WCHAR;
-+#else
- typedef unsigned short 		WCHAR;
--typedef WCHAR* 		        LPWSTR;
-+#endif
-+
-+typedef WCHAR* 	            LPWSTR;
- typedef const char*         LPCSTR;
-+typedef const WCHAR*        LPCWSTR;
-+typedef TCHAR*              LPTSTR;
- typedef char*               LPSTR;
- typedef DWORD*           	LPDWORD;
- 
-+typedef void*               HINSTANCE;
- 
-+#endif
-+
-+
- /****************************
-  * standard SQL* data types. use these as much as possible when using ODBC calls/vars
-  ***************************/
-@@ -80,11 +143,61 @@
- typedef double          SQLFLOAT;
- #endif
- 
--#if SIZEOF_LONG == 4
--	typedef long	SQLINTEGER;
-+/*
-+ * can't use a long it fails on 64 platforms
-+ */
-+
-+/*
-+ * Hopefully by now it should be safe to assume most drivers know about SQLLEN now
-+ * and the defaukt is now sizeof( SQLLEN ) = 8 on 64 bit platforms
-+ * 
-+ */
-+
-+#if (SIZEOF_LONG_INT == 8)
-+#ifdef BUILD_LEGACY_64_BIT_MODE
-+typedef int             SQLINTEGER;
-+typedef unsigned int    SQLUINTEGER;
-+#define SQLLEN          SQLINTEGER
-+#define SQLULEN         SQLUINTEGER
-+#define SQLSETPOSIROW   SQLUSMALLINT
-+/* 
-+ * These are not supprted on 64bit ODBC according to MS, removed, so use at your peril
-+ *
-+ typedef SQLULEN         SQLROWCOUNT;
-+ typedef SQLULEN         SQLROWSETSIZE;
-+ typedef SQLULEN         SQLTRANSID;
-+ typedef SQLLEN          SQLROWOFFSET;
-+*/
- #else
--	typedef int	SQLINTEGER;
-+typedef int             SQLINTEGER;
-+typedef unsigned int    SQLUINTEGER;
-+typedef long            SQLLEN;
-+typedef unsigned long   SQLULEN;
-+typedef unsigned long   SQLSETPOSIROW;
-+/* 
-+ * These are not supprted on 64bit ODBC according to MS, removed, so use at your peril
-+ *
-+ typedef SQLULEN 		SQLTRANSID;
-+ typedef SQLULEN 		SQLROWCOUNT;
-+ typedef SQLUINTEGER 	SQLROWSETSIZE;
-+ typedef SQLLEN 		SQLROWOFFSET;
-+ */
-+typedef SQLULEN         SQLROWCOUNT;
-+typedef SQLULEN         SQLROWSETSIZE;
-+typedef SQLULEN         SQLTRANSID;
-+typedef SQLLEN          SQLROWOFFSET;
- #endif
-+#else
-+typedef long            SQLINTEGER;
-+typedef unsigned long   SQLUINTEGER;
-+#define SQLLEN          SQLINTEGER
-+#define SQLULEN         SQLUINTEGER
-+#define SQLSETPOSIROW   SQLUSMALLINT
-+typedef SQLULEN         SQLROWCOUNT;
-+typedef SQLULEN         SQLROWSETSIZE;
-+typedef SQLULEN         SQLTRANSID;
-+typedef SQLLEN          SQLROWOFFSET;
-+#endif
- 
- #if (ODBCVER >= 0x0300)
- typedef unsigned char   SQLNUMERIC;
-@@ -107,39 +220,58 @@
- 
- typedef SQLSMALLINT     SQLRETURN;
- 
--/* typedef void * 			SQLHANDLE; */
--
--typedef SQLINTEGER		SQLHANDLE;
- #if (ODBCVER >= 0x0300)
--
-+typedef void * 			        SQLHANDLE; 
- typedef SQLHANDLE               SQLHENV;
- typedef SQLHANDLE               SQLHDBC;
- typedef SQLHANDLE               SQLHSTMT;
- typedef SQLHANDLE               SQLHDESC;
-+#else
-+typedef void *                  SQLHENV;
-+typedef void *                  SQLHDBC;
-+typedef void *                  SQLHSTMT;
-+/*
-+ * some things like PHP won't build without this
-+ */
-+typedef void * 			        SQLHANDLE; 
-+#endif
- 
-+/****************************
-+ * These are cast into the actual struct that is being passed around. The
-+ * DriverManager knows what its structs look like and the Driver knows about its
-+ * structs... the app knows nothing about them... just void*
-+ * These are deprecated in favour of SQLHENV, SQLHDBC, SQLHSTMT
-+ ***************************/
-+
-+#if (ODBCVER >= 0x0300)
-+typedef SQLHANDLE          		HENV;
-+typedef SQLHANDLE          		HDBC;
-+typedef SQLHANDLE          		HSTMT;
- #else
--typedef SQLINTEGER              SQLHENV;
--typedef SQLINTEGER              SQLHDBC;
--typedef SQLINTEGER              SQLHSTMT;
-+typedef void *          	    HENV;
-+typedef void *          	    HDBC;
-+typedef void *          	    HSTMT;
- #endif
- 
- 
- /****************************
-  * more basic data types to augment what windows.h provides
-  ***************************/
-+#ifndef ALLREADY_HAVE_WINDOWS_TYPE
-+
- typedef unsigned char           UCHAR;
- typedef signed char             SCHAR;
- typedef SCHAR                   SQLSCHAR;
--#if SIZEOF_LONG == 4
--	typedef long int		SDWORD;
--	typedef unsigned long int	UDWORD;
-+#if (SIZEOF_LONG_INT == 4)
-+typedef long int                SDWORD;
-+typedef unsigned long int       UDWORD;
- #else
--	typedef signed int	SDWORD;
--	typedef unsigned int	UDWORD;
-+typedef int                     SDWORD;
-+typedef unsigned int            UDWORD;
- #endif
- typedef signed short int        SWORD;
- typedef unsigned short int      UWORD;
--typedef UDWORD                  SQLUINTEGER;
-+typedef unsigned int            UINT;
- typedef signed long             SLONG;
- typedef signed short            SSHORT;
- typedef unsigned long           ULONG;
-@@ -151,20 +283,7 @@
- typedef signed short            RETCODE;
- typedef void*                   SQLHWND;
- 
--/****************************
-- * These are cast into the actual struct that is being passed around. The
-- * DriverManager knows what its structs look like and the Driver knows about its
-- * structs... the app knows nothing about them... just void*
-- * These are deprecated in favour of SQLHENV, SQLHDBC, SQLHSTMT
-- ***************************/
--/*
--typedef void*              		HENV;
--typedef void*              		HDBC;
--typedef void*              		HSTMT;
--*/
--typedef SQLHANDLE          		HENV;
--typedef SQLHANDLE          		HDBC;
--typedef SQLHANDLE          		HSTMT;
-+#endif
- 
- /****************************
-  * standard structs for working with date/times
-@@ -263,12 +382,41 @@
- /****************************
-  *
-  ***************************/
--#if (ODBCVER >= 0x0300)
--#define ODBCINT64	long
-+#ifndef ODBCINT64
-+# if (ODBCVER >= 0x0300)
-+# if (SIZEOF_LONG_INT == 8)
-+#   define ODBCINT64	    long
-+#   define UODBCINT64	unsigned long
-+# else
-+#  ifdef HAVE_LONG_LONG
-+#   define ODBCINT64	    long long
-+#   define UODBCINT64	unsigned long long
-+#  else
-+/*
-+ * may fail in some cases, but what else can we do ?
-+ */
-+struct __bigint_struct
-+{
-+    int             hiword;
-+    unsigned int    loword;
-+};
-+struct __bigint_struct_u
-+{
-+    unsigned int    hiword;
-+    unsigned int    loword;
-+};
-+#   define ODBCINT64	    struct __bigint_struct
-+#   define UODBCINT64	struct __bigint_struct_u
-+#  endif
-+# endif
-+#endif
-+#endif
-+
- #ifdef ODBCINT64
- typedef ODBCINT64	SQLBIGINT;
--typedef unsigned ODBCINT64	SQLUBIGINT;
- #endif
-+#ifdef UODBCINT64
-+typedef UODBCINT64	SQLUBIGINT;
- #endif
- 
- 
-@@ -288,6 +436,7 @@
- 
- #if (ODBCVER >= 0x0350)
- #ifdef GUID_DEFINED
-+#ifndef ALLREADY_HAVE_WINDOWS_TYPE
- typedef GUID	SQLGUID;
- #else
- typedef struct  tagSQLGUID
-@@ -298,18 +447,21 @@
-     BYTE Data4[ 8 ];
- } SQLGUID;
- #endif
-+#else
-+typedef struct  tagSQLGUID
-+{
-+    DWORD Data1;
-+    WORD Data2;
-+    WORD Data3;
-+    BYTE Data4[ 8 ];
-+} SQLGUID;
- #endif
-+#endif
- 
-+typedef SQLULEN         BOOKMARK;
- 
--typedef unsigned long int       BOOKMARK;
-+typedef  WCHAR         SQLWCHAR;
- 
--
--#ifdef _WCHAR_T_DEFINED
--typedef wchar_t SQLWCHAR;
--#else
--typedef unsigned short SQLWCHAR;
--#endif
--
- #ifdef UNICODE
- typedef SQLWCHAR        SQLTCHAR;
- #else
-@@ -321,3 +473,6 @@
- #endif
- 
- #endif
-+
-+
-+
diff --git a/applied_patches/0074-xmlsecurity-verify-usages.diff b/applied_patches/0080-xmlsecurity-verify-usages.diff
similarity index 100%
rename from applied_patches/0074-xmlsecurity-verify-usages.diff
rename to applied_patches/0080-xmlsecurity-verify-usages.diff
diff --git a/applied_patches/0075-jvmfwk-modified-javavendors-xml.diff b/applied_patches/0081-jvmfwk-modified-javavendors-xml.diff
similarity index 100%
rename from applied_patches/0075-jvmfwk-modified-javavendors-xml.diff
rename to applied_patches/0081-jvmfwk-modified-javavendors-xml.diff
diff --git a/applied_patches/0076-libxmlsec-findcerts.diff b/applied_patches/0082-libxmlsec-findcerts.diff
similarity index 100%
rename from applied_patches/0076-libxmlsec-findcerts.diff
rename to applied_patches/0082-libxmlsec-findcerts.diff
diff --git a/applied_patches/0077-sfx2-check-existing-template-dirs.diff b/applied_patches/0083-sfx2-check-existing-template-dirs.diff
similarity index 100%
rename from applied_patches/0077-sfx2-check-existing-template-dirs.diff
rename to applied_patches/0083-sfx2-check-existing-template-dirs.diff
diff --git a/applied_patches/0078-vcl-kerning-fix.diff b/applied_patches/0084-vcl-kerning-fix.diff
similarity index 100%
rename from applied_patches/0078-vcl-kerning-fix.diff
rename to applied_patches/0084-vcl-kerning-fix.diff
diff --git a/applied_patches/0085-new-SQLLEN.diff b/applied_patches/0085-new-SQLLEN.diff
new file mode 100644
index 000000000..75d790032
--- /dev/null
+++ b/applied_patches/0085-new-SQLLEN.diff
@@ -0,0 +1,1887 @@
+Index: connectivity/source/inc/odbc/OResultSet.hxx
+===================================================================
+--- connectivity/source/inc/odbc/OResultSet.hxx	(revision 274960)
++++ connectivity/source/inc/odbc/OResultSet.hxx	(working copy)
+@@ -128,7 +128,7 @@
+ 			typedef ::std::vector<ORowSetValue>			TDataRow;
+ 
+ 			TVoidVector									m_aBindVector;
+-			::std::vector<sal_Int32>					m_aLengthVector;
++			::std::vector<SQLLEN>						m_aLengthVector;
+             ::std::map<sal_Int32,SWORD>					m_aODBCColumnTypes;
+ 			::com::sun::star::uno::Sequence<sal_Int8>	m_aBookmark;
+ 
+Index: connectivity/source/inc/odbc/OResultSetMetaData.hxx
+===================================================================
+--- connectivity/source/inc/odbc/OResultSetMetaData.hxx	(revision 274960)
++++ connectivity/source/inc/odbc/OResultSetMetaData.hxx	(working copy)
+@@ -80,13 +80,13 @@
+ 			virtual ~OResultSetMetaData();
+ 
+ 
+-            static  SWORD getNumColAttrib(OConnection* _pConnection
++            static SQLLEN getNumColAttrib(OConnection* _pConnection
+                                               ,SQLHANDLE _aStatementHandle
+                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
+                                               ,sal_Int32 _column
+                                               ,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ 
+-            static SWORD getColumnODBCType(OConnection* _pConnection
++            static SQLSMALLINT getColumnODBCType(OConnection* _pConnection
+                                               ,SQLHANDLE _aStatementHandle
+                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
+                                               ,sal_Int32 column)
+Index: connectivity/source/inc/odbc/OTools.hxx
+===================================================================
+--- connectivity/source/inc/odbc/OTools.hxx	(revision 274960)
++++ connectivity/source/inc/odbc/OTools.hxx	(working copy)
+@@ -197,7 +197,7 @@
+ 			static ::rtl::OUString getStringValue(	OConnection* _pConnection,	
+ 													SQLHANDLE _aStatementHandle,
+ 													sal_Int32 columnIndex,
+-													SWORD  _fSqlType,
++													SQLSMALLINT _fSqlType,
+ 													sal_Bool &_bWasNull,
+ 													const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
+ 													rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+@@ -205,7 +205,7 @@
+ 			static  ::com::sun::star::uno::Sequence<sal_Int8> getBytesValue(OConnection* _pConnection,	
+ 																			SQLHANDLE _aStatementHandle,
+ 																			sal_Int32 columnIndex,
+-																			SWORD  _fSqlType,
++																			SQLSMALLINT _fSqlType,
+ 																			sal_Bool &_bWasNull,
+ 																			const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ 			static void getValue(	OConnection* _pConnection,	
+@@ -215,7 +215,7 @@
+ 									sal_Bool &_bWasNull,
+ 									const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
+ 									void* _pValue,
+-									SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
++									SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ 
+ 			/** 
+ 				bindData copies the from pValue to pData
+@@ -229,10 +229,10 @@
+ 			static void bindData(	SQLSMALLINT _nOdbcType,
+ 									sal_Bool _bUseWChar,
+ 									sal_Int8 *&_pData,
+-									SQLINTEGER*& pLen,
++									SQLLEN*& pLen,
+ 									const void* _pValue,
+ 									rtl_TextEncoding _nTextEncoding,
+-									SQLUINTEGER& _nColumnSize);
++									SQLULEN& _nColumnSize);
+ 
+ 			static void bindParameter(	OConnection* _pConnection,	
+ 										SQLHANDLE _hStmt,
+@@ -254,7 +254,7 @@
+ 									SQLSMALLINT _nMaxLen,
+ 									const void* _pValue,
+ 									void*		_pData,
+-									SQLINTEGER *pLen,
++									SQLLEN *pLen,
+ 									const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
+ 									rtl_TextEncoding _nTextEncoding,
+ 									sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+Index: connectivity/source/inc/odbc/OStatement.hxx
+===================================================================
+--- connectivity/source/inc/odbc/OStatement.hxx	(revision 274960)
++++ connectivity/source/inc/odbc/OStatement.hxx	(working copy)
+@@ -130,7 +130,7 @@
+ 			*/
+ 			virtual OResultSet* createResulSet();
+ 
+-            sal_Int32 getRowCount () throw( ::com::sun::star::sdbc::SQLException);
++            SQLLEN getRowCount () throw( ::com::sun::star::sdbc::SQLException);
+ 
+ 
+ 			void disposeResultSet();
+Index: connectivity/source/inc/odbc/OFunctions.hxx
+===================================================================
+--- connectivity/source/inc/odbc/OFunctions.hxx	(revision 274960)
++++ connectivity/source/inc/odbc/OFunctions.hxx	(working copy)
+@@ -187,7 +187,7 @@
+ 													SQLSMALLINT *		StringLengthPtr,
+ 													SQLSMALLINT *		TypePtr,
+ 													SQLSMALLINT *		SubTypePtr,
+-													SQLINTEGER *		LengthPtr,
++													SQLLEN *			LengthPtr,
+ 													SQLSMALLINT *		PrecisionPtr,
+ 													SQLSMALLINT *		ScalePtr,
+ 													SQLSMALLINT *		NullablePtr);
+@@ -203,8 +203,8 @@
+ 													SQLSMALLINT			Precision,
+ 													SQLSMALLINT			Scale,
+ 													SQLPOINTER			DataPtr,
+-													SQLINTEGER *		StringLengthPtr,
+-													SQLINTEGER *		IndicatorPtr);
++													SQLLEN *			StringLengthPtr,
++													SQLLEN *			IndicatorPtr);
+ 
+ 	#define N3SQLSetDescRec(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSetDescRec)getOdbcFunction(ODBC3SQLSetDescRec))(a,b,c,d,e,f,g,h,i,j)
+ 	*/
+@@ -221,11 +221,11 @@
+ 													SQLSMALLINT			InputOutputType,
+ 													SQLSMALLINT			ValueType,
+ 													SQLSMALLINT			ParameterType,
+-													SQLUINTEGER			ColumnSize,
++													SQLULEN				ColumnSize,
+ 													SQLSMALLINT			DecimalDigits,
+ 													SQLPOINTER			ParameterValuePtr,
+-													SQLINTEGER			BufferLength,
+-													SQLINTEGER *		StrLen_or_IndPtr);
++													SQLLEN				BufferLength,
++													SQLLEN *			StrLen_or_IndPtr);
+ 
+ 	#define N3SQLBindParameter(a,b,c,d,e,f,g,h,i,j) (*(T3SQLBindParameter)getOdbcFunction(ODBC3SQLBindParameter))(a,b,c,d,e,f,g,h,i,j)
+ 
+@@ -266,7 +266,7 @@
+ 	typedef SQLRETURN (SQL_API  *T3SQLDescribeParam) (SQLHSTMT			StatementHandle,
+ 													SQLUSMALLINT		ParameterNumber,
+ 													SQLSMALLINT *		DataTypePtr,
+-													SQLUINTEGER *		ParameterSizePtr,
++													SQLULEN *			ParameterSizePtr,
+ 													SQLSMALLINT *		DecimalDigitsPtr,
+ 													SQLSMALLINT *		NullablePtr);
+ 
+@@ -284,13 +284,13 @@
+ 
+ 	typedef SQLRETURN  (SQL_API  *T3SQLPutData) (		SQLHSTMT			StatementHandle,
+ 													SQLPOINTER			DataPtr,
+-													SQLINTEGER			StrLen_or_Ind);
++													SQLLEN				StrLen_or_Ind);
+ 
+ 	#define N3SQLPutData(a,b,c) (*(T3SQLPutData)getOdbcFunction(ODBC3SQLPutData))(a,b,c)
+ 
+ 	// Retrieving results and information about results
+ 	typedef SQLRETURN  (SQL_API  *T3SQLRowCount) (	SQLHSTMT			StatementHandle,
+-													SQLINTEGER *		RowCountPtr);
++													SQLLEN *			RowCountPtr);
+ 
+ 	#define N3SQLRowCount(a,b) (*(T3SQLRowCount)getOdbcFunction(ODBC3SQLRowCount))(a,b)
+ 
+@@ -300,12 +300,12 @@
+ 	#define N3SQLNumResultCols(a,b) (*(T3SQLNumResultCols)getOdbcFunction(ODBC3SQLNumResultCols))(a,b)
+ 
+ 	typedef SQLRETURN  (SQL_API  *T3SQLDescribeCol) (	SQLHSTMT			StatementHandle,
+-													SQLSMALLINT			ColumnNumber,
++													SQLUSMALLINT		ColumnNumber,
+ 													SQLCHAR *			ColumnName,
+ 													SQLSMALLINT			BufferLength,
+ 													SQLSMALLINT *		NameLengthPtr,
+ 													SQLSMALLINT *		DataTypePtr,
+-													SQLUINTEGER *		ColumnSizePtr,
++													SQLULEN *			ColumnSizePtr,
+ 													SQLSMALLINT *		DecimalDigitsPtr,
+ 													SQLSMALLINT *		NullablePtr);
+ 
+@@ -317,7 +317,7 @@
+ 													SQLPOINTER			CharacterAttributePtr,
+ 													SQLSMALLINT			BufferLength,
+ 													SQLSMALLINT *		StringLengthPtr,
+-													SQLPOINTER			NumericAttributePtr);
++													SQLLEN *			NumericAttributePtr);
+ 
+ 	#define N3SQLColAttribute(a,b,c,d,e,f,g) (*(T3SQLColAttribute)getOdbcFunction(ODBC3SQLColAttribute))(a,b,c,d,e,f,g)
+ 
+@@ -325,8 +325,8 @@
+ 													SQLUSMALLINT		ColumnNumber,
+ 													SQLSMALLINT			TargetType,
+ 													SQLPOINTER			TargetValuePtr,
+-													SQLINTEGER			BufferLength,
+-													SQLINTEGER *		StrLen_or_IndPtr);
++													SQLLEN				BufferLength,
++													SQLLEN *			StrLen_or_IndPtr);
+ 
+ 	#define N3SQLBindCol(a,b,c,d,e,f) (*(T3SQLBindCol)getOdbcFunction(ODBC3SQLBindCol))(a,b,c,d,e,f)
+ 
+@@ -336,7 +336,7 @@
+ 
+ 	typedef SQLRETURN  (SQL_API  *T3SQLFetchScroll) (	SQLHSTMT			StatementHandle,
+ 													SQLSMALLINT			FetchOrientation,
+-													SQLINTEGER			FetchOffset);
++													SQLLEN				FetchOffset);
+ 
+ 	#define N3SQLFetchScroll(a,b,c) (*(T3SQLFetchScroll)getOdbcFunction(ODBC3SQLFetchScroll))(a,b,c)
+ 
+@@ -344,20 +344,20 @@
+ 													SQLUSMALLINT		ColumnNumber,
+ 													SQLSMALLINT			TargetType,
+ 													SQLPOINTER			TargetValuePtr,
+-													SQLINTEGER			BufferLength,
+-													SQLINTEGER *		StrLen_or_IndPtr);
++													SQLLEN				BufferLength,
++													SQLLEN *			StrLen_or_IndPtr);
+ 
+ 	#define N3SQLGetData(a,b,c,d,e,f) (*(T3SQLGetData)getOdbcFunction(ODBC3SQLGetData))(a,b,c,d,e,f)
+ 
+ 	typedef SQLRETURN  (SQL_API  *T3SQLSetPos) (		SQLHSTMT			StatementHandle,
+-													SQLUSMALLINT		RowNumber,
++													SQLSETPOSIROW		RowNumber,
+ 													SQLUSMALLINT		Operation,
+ 													SQLUSMALLINT		LockType);
+ 
+ 	#define N3SQLSetPos(a,b,c,d) (*(T3SQLSetPos)getOdbcFunction(ODBC3SQLSetPos))(a,b,c,d)
+ 
+ 	typedef SQLRETURN  (SQL_API  *T3SQLBulkOperations) (	SQLHSTMT		StatementHandle,
+-														SQLUSMALLINT	Operation);
++														SQLSMALLINT	Operation);
+ 
+ 	#define N3SQLBulkOperations(a,b) (*(T3SQLBulkOperations)getOdbcFunction(ODBC3SQLBulkOperations))(a,b)
+ 
+@@ -461,15 +461,15 @@
+ 	#define N3SQLProcedures(a,b,c,d,e,f,g) (*(T3SQLProcedures)getOdbcFunction(ODBC3SQLProcedures))(a,b,c,d,e,f,g)
+ 
+ 	typedef SQLRETURN  (SQL_API  *T3SQLSpecialColumns) (SQLHSTMT			StatementHandle,
+-													SQLSMALLINT			IdentifierType,
++													SQLUSMALLINT		IdentifierType,
+ 													SQLCHAR *			CatalogName,
+ 													SQLSMALLINT			NameLength1,
+ 													SQLCHAR *			SchemaName,
+ 													SQLSMALLINT			NameLength2,
+ 													SQLCHAR *			TableName,
+ 													SQLSMALLINT			NameLength3,
+-													SQLSMALLINT			Scope,
+-													SQLSMALLINT			Nullable);
++													SQLUSMALLINT		Scope,
++													SQLUSMALLINT		Nullable);
+ 
+ 	#define N3SQLSpecialColumns(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSpecialColumns)getOdbcFunction(ODBC3SQLSpecialColumns))(a,b,c,d,e,f,g,h,i,j)
+ 
+Index: connectivity/source/drivers/odbcbase/OConnection.cxx
+===================================================================
+--- connectivity/source/drivers/odbcbase/OConnection.cxx	(revision 274960)
++++ connectivity/source/drivers/odbcbase/OConnection.cxx	(working copy)
+@@ -108,7 +108,7 @@
+ 	SQLRETURN nSQLRETURN = 0;
+ 	SDB_ODBC_CHAR szConnStrOut[4096];
+ 	SDB_ODBC_CHAR szConnStrIn[2048];
+-	SWORD cbConnStrOut;
++	SQLSMALLINT cbConnStrOut;
+ 	memset(szConnStrOut,'\0',4096);
+ 	memset(szConnStrIn,'\0',2048);
+ 	::rtl::OString aConStr(::rtl::OUStringToOString(aConnectStr,getTextEncoding()));
+Index: connectivity/source/drivers/odbcbase/OTools.cxx
+===================================================================
+--- connectivity/source/drivers/odbcbase/OTools.cxx	(revision 274960)
++++ connectivity/source/drivers/odbcbase/OTools.cxx	(working copy)
+@@ -56,16 +56,16 @@
+ 						sal_Bool &_bWasNull,
+ 						const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
+ 						void* _pValue,
+-						SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
++						SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+ {
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::getValue" );
+-	SQLINTEGER pcbValue = SQL_NULL_DATA;
++	SQLLEN pcbValue = SQL_NULL_DATA;
+ 	OTools::ThrowException(_pConnection,
+ 							(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
+ 										(SQLUSMALLINT)columnIndex,
+ 										_nType,
+ 										_pValue,
+-										(SQLINTEGER)_rSize,
++										_nSize,
+ 										&pcbValue),
+ 							_aStatementHandle,SQL_HANDLE_STMT,_xInterface,sal_False);
+ 	_bWasNull = pcbValue == SQL_NULL_DATA;
+@@ -86,12 +86,12 @@
+ {
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindParameter" );
+ 	SQLRETURN nRetcode;
+-	SWORD   fSqlType;
+-	SWORD   fCType;
+-	SDWORD  nMaxLen = 0;
++	SQLSMALLINT fSqlType;
++	SQLSMALLINT fCType;
++	SQLLEN  nMaxLen = 0;
+ 	//	void*&   pData   = pDataBuffer;
+-	SQLINTEGER* pLen    = (SQLINTEGER*)pLenBuffer;
+-	SQLUINTEGER nColumnSize=0;
++	SQLLEN* pLen    = (SQLLEN*)pLenBuffer;
++	SQLULEN nColumnSize=0;
+ 	SQLSMALLINT	nDecimalDigits=0;
+ 
+ 	OTools::getBindTypes(_bUseWChar,_bUseOldTimeDate,_nODBCtype,fCType,fSqlType);
+@@ -123,10 +123,10 @@
+ void OTools::bindData(	SQLSMALLINT _nOdbcType,
+ 						sal_Bool _bUseWChar,
+ 						sal_Int8 *&_pData,
+-						SQLINTEGER*& pLen,
++						SQLLEN*& pLen,
+ 						const void* _pValue,
+ 						rtl_TextEncoding _nTextEncoding,
+-						SQLUINTEGER& _nColumnSize)
++						SQLULEN& _nColumnSize)
+ {
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindData" );
+ 	_nColumnSize = 0;
+@@ -222,7 +222,7 @@
+ 			{
+ 				sal_Int32 nLen = 0;
+                 nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
+-				*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
++				*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
+ 			}
+ 			break;
+ 		case SQL_LONGVARCHAR:
+@@ -235,21 +235,21 @@
+ 				::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding));
+ 				nLen = aString.getLength();
+ 			}
+-			*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
++			*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
+ 		}   break;
+ 		case SQL_DATE:
+ 			*(DATE_STRUCT*)_pData = *(DATE_STRUCT*)_pValue;
+-			*pLen = (SDWORD)sizeof(DATE_STRUCT);
++			*pLen = (SQLLEN)sizeof(DATE_STRUCT);
+ 			_nColumnSize = 10;
+ 			break;
+ 		case SQL_TIME:
+ 			*(TIME_STRUCT*)_pData = *(TIME_STRUCT*)_pValue;
+-			*pLen = (SDWORD)sizeof(TIME_STRUCT);
++			*pLen = (SQLLEN)sizeof(TIME_STRUCT);
+ 			_nColumnSize = 8;
+ 			break;
+ 		case SQL_TIMESTAMP:
+ 			*(TIMESTAMP_STRUCT*)_pData = *(TIMESTAMP_STRUCT*)_pValue;
+-			*pLen = (SDWORD)sizeof(TIMESTAMP_STRUCT);
++			*pLen = (SQLLEN)sizeof(TIMESTAMP_STRUCT);
+ 			_nColumnSize = 19;
+ 			break;
+ 	}
+@@ -262,7 +262,7 @@
+ 						SQLSMALLINT _nMaxLen,
+ 						const void* _pValue,
+ 						void* _pData,
+-						SQLINTEGER *pLen,
++						SQLLEN *pLen,
+ 						const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
+ 						rtl_TextEncoding _nTextEncoding,
+ 						sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+@@ -271,7 +271,7 @@
+ 	SQLRETURN nRetcode;
+ 	SQLSMALLINT   fSqlType;
+ 	SQLSMALLINT   fCType;
+-	SQLSMALLINT   nMaxLen = _nMaxLen;
++	SQLLEN nMaxLen = _nMaxLen;
+ 
+ 	OTools::getBindTypes(	sal_False,
+ 							_bUseOldTimeDate,
+@@ -375,7 +375,7 @@
+ 					_pData = (void*)(columnIndex);
+ 					sal_Int32 nLen = 0;
+                     nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
+-					*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
++					*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
+ 				}
+ 					break;
+ 				case SQL_LONGVARCHAR:
+@@ -383,7 +383,7 @@
+ 					_pData = (void*)(columnIndex);
+ 					sal_Int32 nLen = 0;
+ 					nLen = ((::rtl::OUString*)_pValue)->getLength();
+-					*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
++					*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
+ 				}   break;
+ 				case SQL_DATE:
+ 					*pLen = sizeof(DATE_STRUCT);
+@@ -446,10 +446,10 @@
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::ThrowException" );
+ 
+ 	SDB_ODBC_CHAR szSqlState[5];
+-	SDWORD pfNativeError;
++	SQLINTEGER pfNativeError;
+ 	SDB_ODBC_CHAR szErrorMessage[SQL_MAX_MESSAGE_LENGTH];
+ 	szErrorMessage[0] = '\0';
+-	SWORD pcbErrorMsg = 0;
++	SQLSMALLINT pcbErrorMsg = 0;
+ 
+ 	// Informationen zur letzten Operation:
+ 	// wenn hstmt != SQL_NULL_HSTMT ist (Benutzung von SetStatus in SdbCursor, SdbTable, ...),
+@@ -478,7 +478,7 @@
+ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
+ 										 SQLHANDLE _aStatementHandle,
+ 										 sal_Int32 columnIndex,
+-										 SWORD  _fSqlType,
++										 SQLSMALLINT _fSqlType,
+ 										 sal_Bool &_bWasNull,
+ 										 const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
+ {
+@@ -486,14 +486,14 @@
+ 	char aCharArray[2048];
+ 	// Erstmal versuchen, die Daten mit dem kleinen Puffer
+ 	// abzuholen:
+-	SQLINTEGER nMaxLen = sizeof aCharArray - 1;
++	SQLLEN nMaxLen = sizeof aCharArray - 1;
+ 	//	GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
+-	SQLINTEGER pcbValue = 0;
++	SQLLEN pcbValue = 0;
+ 	OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
+ 										(SQLUSMALLINT)columnIndex,
+ 										_fSqlType,
+ 										(SQLPOINTER)aCharArray,
+-										(SQLINTEGER)nMaxLen,
++										nMaxLen,
+ 										&pcbValue),
+ 							_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
+ 
+@@ -540,7 +540,7 @@
+ ::rtl::OUString OTools::getStringValue(OConnection* _pConnection,
+ 									   SQLHANDLE _aStatementHandle,
+ 									   sal_Int32 columnIndex,
+-									   SWORD  _fSqlType,
++									   SQLSMALLINT _fSqlType,
+ 									   sal_Bool &_bWasNull,
+ 									   const Reference< XInterface >& _xInterface,
+ 									   rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException)
+@@ -555,15 +555,15 @@
+ 		{
+ 			sal_Unicode waCharArray[2048];
+ 			// read the unicode data
+-			sal_Int32 nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
++			SQLLEN nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
+ 			//	GETDATA(SQL_C_WCHAR, waCharArray, nMaxLen + sizeof(sal_Unicode));
+ 
+-			SQLINTEGER pcbValue=0;
++			SQLLEN pcbValue=0;
+ 			OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
+ 												(SQLUSMALLINT)columnIndex,
+ 												SQL_C_WCHAR,
+ 												&waCharArray,
+-												(SQLINTEGER)nMaxLen*sizeof(sal_Unicode),
++												(SQLLEN)nMaxLen*sizeof(sal_Unicode),
+ 												&pcbValue),
+ 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
+ 			_bWasNull = pcbValue == SQL_NULL_DATA;
+@@ -571,9 +571,9 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
+                 return ::rtl::OUString();
+             // Bei Fehler bricht der GETDATA-Makro mit return ab,
+             // bei NULL mit break!
+-            SQLINTEGER nRealSize = 0;
++            SQLLEN nRealSize = 0;
+             if ( pcbValue > -1 )
+                 nRealSize = pcbValue / sizeof(sal_Unicode);
+-            SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(nRealSize, nMaxLen) : (nMaxLen-1);
++            SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(nRealSize, nMaxLen) : (nMaxLen-1);
+             waCharArray[nLen] = 0;
+             aData.append(waCharArray,nLen);
+@@ -595,7 +595,7 @@
+ 												(SQLUSMALLINT)columnIndex,
+ 												SQL_C_WCHAR,
+ 												&waCharArray,
+-												(SQLINTEGER)nLen+1,
++												(SQLLEN)nLen+1,
+ 												&pcbValue),
+ 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
+ 				nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
+@@ -610,21 +610,21 @@
+ 			char aCharArray[2048];
+ 			// Erstmal versuchen, die Daten mit dem kleinen Puffer
+ 			// abzuholen:
+-			SDWORD nMaxLen = sizeof aCharArray - 1;
++			SQLLEN nMaxLen = sizeof aCharArray - 1;
+ 			//	GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
+-			SQLINTEGER pcbValue = 0;
++			SQLLEN pcbValue = 0;
+ 			OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
+ 												(SQLUSMALLINT)columnIndex,
+ 												SQL_C_CHAR,
+ 												&aCharArray,
+-												(SQLINTEGER)nMaxLen,
++												nMaxLen,
+ 												&pcbValue),
+ 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
+ 			_bWasNull = pcbValue == SQL_NULL_DATA;
+ 			if(_bWasNull)
+ 				return ::rtl::OUString();
+ 
+-			SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
++			SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
+ 			aCharArray[nLen] = 0;
+ 			if ( ((pcbValue == SQL_NO_TOTAL) || pcbValue > nMaxLen) && aCharArray[nLen-1] == 0 && nLen > 0 )
+ 				--nLen;
+Index: connectivity/source/drivers/odbcbase/OStatement.cxx
+===================================================================
+--- connectivity/source/drivers/odbcbase/OStatement.cxx	(revision 274960)
++++ connectivity/source/drivers/odbcbase/OStatement.cxx	(working copy)
+@@ -250,13 +250,13 @@
+     m_xResultSet = Reference< XResultSet >();
+ }
+ //--------------------------------------------------------------------
+-sal_Int32 OStatement_Base::getRowCount () throw( SQLException)
++SQLLEN OStatement_Base::getRowCount () throw( SQLException)
+ {
+ 	::osl::MutexGuard aGuard( m_aMutex );
+ 	checkDisposed(OStatement_BASE::rBHelper.bDisposed);
+ 
+ 
+-	sal_Int32	numRows = 0;
++	SQLLEN numRows = 0;
+ 
+ 	try {
+ 		THROW_SQL(N3SQLRowCount(m_aStatementHandle,&numRows));
+@@ -523,7 +523,9 @@
+ 		SQLRETURN nError = N3SQLMoreResults(m_aStatementHandle);
+ 		if(nError == SQL_SUCCESS)
+ 		{
+-			N3SQLRowCount(m_aStatementHandle,&pArray[j]);
++			SQLLEN nRowCount=0;
++			N3SQLRowCount(m_aStatementHandle,&nRowCount);
++			pArray[j] = nRowCount;
+ 		}
+ 	}
+ 	return aRet;
+Index: connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+===================================================================
+--- connectivity/source/drivers/odbcbase/OPreparedStatement.cxx	(revision 274960)
++++ connectivity/source/drivers/odbcbase/OPreparedStatement.cxx	(working copy)
+@@ -446,11 +446,11 @@
+ 	checkParameterIndex(parameterIndex);
+ 
+ 	sal_Int8* lenBuf = getLengthBuf (parameterIndex);
+-	*(SDWORD*)lenBuf = SQL_NULL_DATA;
++	*(SQLLEN*)lenBuf = SQL_NULL_DATA;
+ 
+ 
+-	SQLINTEGER	prec = 0;
+-	SQLUINTEGER nColumnSize = 0;
++	SQLLEN prec = 0;
++	SQLULEN nColumnSize = 0;
+ 	if (sqlType == SQL_CHAR || sqlType == SQL_VARCHAR || sqlType == SQL_LONGVARCHAR)
+ 	{
+ 		prec = 1;
+@@ -476,7 +476,7 @@
+ 											nDecimalDigits,
+ 											NULL,
+ 											prec,
+-											(SDWORD*)lenBuf
++											(SQLLEN*)lenBuf
+ 											);
+ 	OTools::ThrowException(m_pConnection,nReturn,m_aStatementHandle,SQL_HANDLE_STMT,*this);
+ }
+@@ -861,7 +861,7 @@
+ 
+     // Bind the parameter with SQL_LEN_DATA_AT_EXEC
+ 	SQLSMALLINT   Ctype = SQL_C_CHAR;
+-	SDWORD	atExec = SQL_LEN_DATA_AT_EXEC (length);
++	SQLLEN	atExec = SQL_LEN_DATA_AT_EXEC (length);
+ 	memcpy (dataBuf, &ParameterIndex, sizeof(ParameterIndex));
+ 	memcpy (lenBuf, &atExec, sizeof (atExec));
+ 
+@@ -872,14 +872,14 @@
+ 	OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
+ 	N3SQLBindParameter(m_aStatementHandle,
+ 						(SQLUSMALLINT)ParameterIndex,
+-						(SQLSMALLINT)SQL_PARAM_INPUT,
++						(SQLUSMALLINT)SQL_PARAM_INPUT,
+ 						Ctype,
+ 						(SQLSMALLINT)SQLtype,
+-						(SQLUINTEGER)length,
++						(SQLULEN)length,
+ 						0,
+ 						dataBuf,
+ 						sizeof(ParameterIndex),
+-						(SDWORD*)lenBuf);
++						(SQLLEN*)lenBuf);
+ 
+ 	// Save the input stream
+ 	boundParams[ParameterIndex - 1].setInputStream (x, length);
+Index: connectivity/source/drivers/odbcbase/OResultSet.cxx
+===================================================================
+--- connectivity/source/drivers/odbcbase/OResultSet.cxx	(revision 274960)
++++ connectivity/source/drivers/odbcbase/OResultSet.cxx	(working copy)
+@@ -843,8 +843,8 @@
+ 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ 
+ 
+-	SQLSMALLINT nMaxLen = 20;
+-	SQLINTEGER nRealLen = 0;
++	SQLLEN nMaxLen = 20;
++	SQLLEN nRealLen = 0;
+ 	Sequence<sal_Int8> aBookmark(nMaxLen);
+ 
+ 	SQLRETURN nRet = N3SQLBindCol(m_aStatementHandle,
+@@ -925,7 +925,7 @@
+     sal_Bool bPositionByBookmark = ( NULL != getOdbcFunction( ODBC3SQLBulkOperations ) );
+ 	if ( bPositionByBookmark )
+ 	{
+-		SQLINTEGER nRealLen = 0;
++		SQLLEN nRealLen = 0;
+ 		nRet = N3SQLBindCol(m_aStatementHandle,
+ 							0,
+ 							SQL_C_VARBOOKMARK,
+Index: connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
+===================================================================
+--- connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx	(revision 274960)
++++ connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx	(working copy)
+@@ -86,13 +86,13 @@
+ 	return  sValue;
+ }
+ // -------------------------------------------------------------------------
+-SWORD OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
++SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
+                                               ,SQLHANDLE _aStatementHandle
+                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
+                                               ,sal_Int32 _column
+                                               ,sal_Int32 _ident) throw(SQLException, RuntimeException)
+ {
+-	SWORD nValue=0;
++	SQLLEN nValue=0;
+ 	OTools::ThrowException(_pConnection,(*(T3SQLColAttribute)_pConnection->getOdbcFunction(ODBC3SQLColAttribute))(_aStatementHandle,
+ 										 (SQLUSMALLINT)_column,
+ 										 (SQLUSMALLINT)_ident,
+@@ -117,13 +117,13 @@
+ 	return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE);
+ }
+ // -------------------------------------------------------------------------
+-SWORD OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
++SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
+                                               ,SQLHANDLE _aStatementHandle
+                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
+                                               ,sal_Int32 column)
+                                                throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+ {
+-    SWORD nType = 0;
++    SQLSMALLINT nType = 0;
+     try
+ 	{
+ 		nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE);
+Index: unixODBC/inc/sql.h
+===================================================================
+--- unixODBC/inc/sql.h	(revision 274960)
++++ unixODBC/inc/sql.h	(working copy)
+@@ -7,6 +7,7 @@
+ #ifndef __SQL_H
+ #define __SQL_H
+ 
++
+ /****************************
+  * default to 3.51 declare something else before here and you get a whole new ball of wax
+  ***************************/
+@@ -14,7 +15,9 @@
+ #define ODBCVER 0x0351
+ #endif
+ 
++#ifndef __SQLTYPES_H
+ #include "sqltypes.h"
++#endif
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -270,6 +273,7 @@
+ #define SQL_NULL_HSTMT      0
+ #if (ODBCVER >= 0x0300)
+ #define SQL_NULL_HDESC      0
++#define SQL_NULL_DESC       0
+ #endif
+ 
+ /* null handle used in place of parent handle when allocating HENV */
+@@ -562,254 +566,257 @@
+ #define SQL_NC_HIGH                         0
+ #define SQL_NC_LOW                          1
+ 
+-SQLRETURN   SQLAllocConnect(SQLHENV EnvironmentHandle,
+-           SQLHDBC *ConnectionHandle);
++    SQLRETURN  SQL_API SQLAllocConnect(SQLHENV EnvironmentHandle,
++                                       SQLHDBC *ConnectionHandle);
+ 
+-SQLRETURN   SQLAllocEnv(SQLHENV *EnvironmentHandle);
++    SQLRETURN  SQL_API SQLAllocEnv(SQLHENV *EnvironmentHandle);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLAllocHandle(SQLSMALLINT HandleType,
+-           SQLHANDLE InputHandle, SQLHANDLE *OutputHandle);
++    SQLRETURN  SQL_API SQLAllocHandle(SQLSMALLINT HandleType,
++                                      SQLHANDLE InputHandle, SQLHANDLE *OutputHandle);
+ #endif
+ 
+-SQLRETURN   SQLAllocStmt(SQLHDBC ConnectionHandle,
+-           SQLHSTMT *StatementHandle);
++    SQLRETURN  SQL_API SQLAllocStmt(SQLHDBC ConnectionHandle,
++                                    SQLHSTMT *StatementHandle);
+ 
+-SQLRETURN   SQLBindCol(SQLHSTMT StatementHandle,
+-		   SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
+-		   SQLPOINTER TargetValue, SQLINTEGER BufferLength,
+-	   	   SQLINTEGER *StrLen_or_Ind);
++    SQLRETURN  SQL_API SQLBindCol(SQLHSTMT StatementHandle,
++                                  SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
++                                  SQLPOINTER TargetValue, SQLLEN BufferLength,
++                                  SQLLEN *StrLen_or_Ind);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLBindParam(SQLHSTMT StatementHandle,
+-           SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
+-           SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision,
+-           SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
+-           SQLINTEGER *StrLen_or_Ind);
++    SQLRETURN  SQL_API SQLBindParam(SQLHSTMT StatementHandle,
++                                    SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
++                                    SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
++                                    SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
++                                    SQLLEN *StrLen_or_Ind);
+ #endif
+ 
+-SQLRETURN   SQLCancel(SQLHSTMT StatementHandle);
++    SQLRETURN  SQL_API SQLCancel(SQLHSTMT StatementHandle);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLCloseCursor(SQLHSTMT StatementHandle);
++    SQLRETURN  SQL_API SQLCloseCursor(SQLHSTMT StatementHandle);
+ 
+-SQLRETURN   SQLColAttribute (SQLHSTMT StatementHandle,
+-           SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
+-           SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
+-           SQLSMALLINT *StringLength, SQLPOINTER NumericAttribute);
++    SQLRETURN  SQL_API SQLColAttribute(SQLHSTMT StatementHandle,
++                                        SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
++                                        SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
++                                        SQLSMALLINT *StringLength, SQLLEN *NumericAttribute 
++										/* spec says (SQLPOINTER) not (SQLEN*) - PAH */ );
++										/* Ms now say SQLLEN* http://msdn.microsoft.com/library/en-us/odbc/htm/dasdkodbcoverview_64bit.asp - NG */
++										
+ #endif
+ 
+ 
+-SQLRETURN   SQLColumns(SQLHSTMT StatementHandle,
+-           SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
+-           SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
+-           SQLCHAR *TableName, SQLSMALLINT NameLength3,
+-           SQLCHAR *ColumnName, SQLSMALLINT NameLength4);
++    SQLRETURN  SQL_API SQLColumns(SQLHSTMT StatementHandle,
++                                  SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
++                                  SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
++                                  SQLCHAR *TableName, SQLSMALLINT NameLength3,
++                                  SQLCHAR *ColumnName, SQLSMALLINT NameLength4);
+ 
+ 
+-SQLRETURN   SQLConnect(SQLHDBC ConnectionHandle,
+-           SQLCHAR *ServerName, SQLSMALLINT NameLength1,
+-           SQLCHAR *UserName, SQLSMALLINT NameLength2,
+-           SQLCHAR *Authentication, SQLSMALLINT NameLength3);
++    SQLRETURN  SQL_API SQLConnect(SQLHDBC ConnectionHandle,
++                                  SQLCHAR *ServerName, SQLSMALLINT NameLength1,
++                                  SQLCHAR *UserName, SQLSMALLINT NameLength2,
++                                  SQLCHAR *Authentication, SQLSMALLINT NameLength3);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLCopyDesc(SQLHDESC SourceDescHandle,
+-           SQLHDESC TargetDescHandle);
++    SQLRETURN  SQL_API SQLCopyDesc(SQLHDESC SourceDescHandle,
++                                   SQLHDESC TargetDescHandle);
+ #endif
+ 
+-SQLRETURN   SQLDataSources(SQLHENV EnvironmentHandle,
+-           SQLUSMALLINT Direction, SQLCHAR *ServerName,
+-           SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1,
+-           SQLCHAR *Description, SQLSMALLINT BufferLength2,
+-           SQLSMALLINT *NameLength2);
++    SQLRETURN  SQL_API SQLDataSources(SQLHENV EnvironmentHandle,
++                                      SQLUSMALLINT Direction, SQLCHAR *ServerName,
++                                      SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1,
++                                      SQLCHAR *Description, SQLSMALLINT BufferLength2,
++                                      SQLSMALLINT *NameLength2);
+ 
+-SQLRETURN   SQLDescribeCol(SQLHSTMT StatementHandle,
+-           SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName,
+-           SQLSMALLINT BufferLength, SQLSMALLINT *NameLength,
+-           SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize,
+-           SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable);
++    SQLRETURN  SQL_API SQLDescribeCol(SQLHSTMT StatementHandle,
++                                      SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName,
++                                      SQLSMALLINT BufferLength, SQLSMALLINT *NameLength,
++                                      SQLSMALLINT *DataType, SQLULEN *ColumnSize,
++                                      SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable);
+ 
+-SQLRETURN   SQLDisconnect(SQLHDBC ConnectionHandle);
++    SQLRETURN  SQL_API SQLDisconnect(SQLHDBC ConnectionHandle);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle,
+-           SQLSMALLINT CompletionType);
++    SQLRETURN  SQL_API SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle,
++                                  SQLSMALLINT CompletionType);
+ #endif
+ 
+-SQLRETURN   SQLError(SQLHENV EnvironmentHandle,
+-           SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle,
+-           SQLCHAR *Sqlstate, SQLINTEGER *NativeError,
+-           SQLCHAR *MessageText, SQLSMALLINT BufferLength,
+-           SQLSMALLINT *TextLength);
++    SQLRETURN  SQL_API SQLError(SQLHENV EnvironmentHandle,
++                                SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle,
++                                SQLCHAR *Sqlstate, SQLINTEGER *NativeError,
++                                SQLCHAR *MessageText, SQLSMALLINT BufferLength,
++                                SQLSMALLINT *TextLength);
+ 
+-SQLRETURN   SQLExecDirect(SQLHSTMT StatementHandle,
+-           SQLCHAR *StatementText, SQLINTEGER TextLength);
++    SQLRETURN  SQL_API SQLExecDirect(SQLHSTMT StatementHandle,
++                                     SQLCHAR *StatementText, SQLINTEGER TextLength);
+ 
+-SQLRETURN   SQLExecute(SQLHSTMT StatementHandle);
++    SQLRETURN  SQL_API SQLExecute(SQLHSTMT StatementHandle);
+ 
+-SQLRETURN   SQLFetch(SQLHSTMT StatementHandle);
++    SQLRETURN  SQL_API SQLFetch(SQLHSTMT StatementHandle);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLFetchScroll(SQLHSTMT StatementHandle,
+-           SQLSMALLINT FetchOrientation, SQLINTEGER FetchOffset);
++    SQLRETURN  SQL_API SQLFetchScroll(SQLHSTMT StatementHandle,
++                                      SQLSMALLINT FetchOrientation, SQLLEN FetchOffset);
+ #endif
+ 
+-SQLRETURN   SQLFreeConnect(SQLHDBC ConnectionHandle);
++    SQLRETURN  SQL_API SQLFreeConnect(SQLHDBC ConnectionHandle);
+ 
+-SQLRETURN   SQLFreeEnv(SQLHENV EnvironmentHandle);
++    SQLRETURN  SQL_API SQLFreeEnv(SQLHENV EnvironmentHandle);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle);
++    SQLRETURN  SQL_API SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle);
+ #endif
+ 
+-SQLRETURN   SQLFreeStmt(SQLHSTMT StatementHandle,
+-           SQLUSMALLINT Option);
++    SQLRETURN  SQL_API SQLFreeStmt(SQLHSTMT StatementHandle,
++                                   SQLUSMALLINT Option);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLGetConnectAttr(SQLHDBC ConnectionHandle,
+-           SQLINTEGER Attribute, SQLPOINTER Value,
+-           SQLINTEGER BufferLength, SQLINTEGER *StringLength);
++    SQLRETURN  SQL_API SQLGetConnectAttr(SQLHDBC ConnectionHandle,
++                                         SQLINTEGER Attribute, SQLPOINTER Value,
++                                         SQLINTEGER BufferLength, SQLINTEGER *StringLength);
+ #endif
+ 
+-SQLRETURN   SQLGetConnectOption(SQLHDBC ConnectionHandle,
+-           SQLUSMALLINT Option, SQLPOINTER Value);
++    SQLRETURN  SQL_API SQLGetConnectOption(SQLHDBC ConnectionHandle,
++                                           SQLUSMALLINT Option, SQLPOINTER Value);
+ 
+-SQLRETURN   SQLGetCursorName(SQLHSTMT StatementHandle,
+-           SQLCHAR *CursorName, SQLSMALLINT BufferLength,
+-           SQLSMALLINT *NameLength);
++    SQLRETURN  SQL_API SQLGetCursorName(SQLHSTMT StatementHandle,
++                                        SQLCHAR *CursorName, SQLSMALLINT BufferLength,
++                                        SQLSMALLINT *NameLength);
+ 
+-SQLRETURN   SQLGetData(SQLHSTMT StatementHandle,
+-           SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
+-           SQLPOINTER TargetValue, SQLINTEGER BufferLength,
+-           SQLINTEGER *StrLen_or_Ind);
++    SQLRETURN  SQL_API SQLGetData(SQLHSTMT StatementHandle,
++                                  SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
++                                  SQLPOINTER TargetValue, SQLLEN BufferLength,
++                                  SQLLEN *StrLen_or_Ind);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLGetDescField(SQLHDESC DescriptorHandle,
+-           SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
+-           SQLPOINTER Value, SQLINTEGER BufferLength,
+-           SQLINTEGER *StringLength);
++    SQLRETURN   SQLGetDescField(SQLHDESC DescriptorHandle,
++                                SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
++                                SQLPOINTER Value, SQLINTEGER BufferLength,
++                                SQLINTEGER *StringLength);
+ 
+-SQLRETURN   SQLGetDescRec(SQLHDESC DescriptorHandle,
+-           SQLSMALLINT RecNumber, SQLCHAR *Name,
+-           SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
+-           SQLSMALLINT *Type, SQLSMALLINT *SubType,
+-           SQLINTEGER *Length, SQLSMALLINT *Precision,
+-           SQLSMALLINT *Scale, SQLSMALLINT *Nullable);
++    SQLRETURN  SQL_API SQLGetDescRec(SQLHDESC DescriptorHandle,
++                                     SQLSMALLINT RecNumber, SQLCHAR *Name,
++                                     SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
++                                     SQLSMALLINT *Type, SQLSMALLINT *SubType,
++                                     SQLLEN *Length, SQLSMALLINT *Precision,
++                                     SQLSMALLINT *Scale, SQLSMALLINT *Nullable);
+ 
+-SQLRETURN   SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
+-           SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier,
+-           SQLPOINTER DiagInfo, SQLSMALLINT BufferLength,
+-           SQLSMALLINT *StringLength);
++    SQLRETURN  SQL_API SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
++                                       SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier,
++                                       SQLPOINTER DiagInfo, SQLSMALLINT BufferLength,
++                                       SQLSMALLINT *StringLength);
+ 
+-SQLRETURN   SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle,
+-           SQLSMALLINT RecNumber, SQLCHAR *Sqlstate,
+-           SQLINTEGER *NativeError, SQLCHAR *MessageText,
+-           SQLSMALLINT BufferLength, SQLSMALLINT *TextLength);
++    SQLRETURN  SQL_API SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle,
++                                     SQLSMALLINT RecNumber, SQLCHAR *Sqlstate,
++                                     SQLINTEGER *NativeError, SQLCHAR *MessageText,
++                                     SQLSMALLINT BufferLength, SQLSMALLINT *TextLength);
+ 
+-SQLRETURN   SQLGetEnvAttr(SQLHENV EnvironmentHandle,
+-           SQLINTEGER Attribute, SQLPOINTER Value,
+-           SQLINTEGER BufferLength, SQLINTEGER *StringLength);
++    SQLRETURN  SQL_API SQLGetEnvAttr(SQLHENV EnvironmentHandle,
++                                     SQLINTEGER Attribute, SQLPOINTER Value,
++                                     SQLINTEGER BufferLength, SQLINTEGER *StringLength);
+ #endif  /* ODBCVER >= 0x0300 */
+ 
+-SQLRETURN   SQLGetFunctions(SQLHDBC ConnectionHandle,
+-           SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported);
++    SQLRETURN  SQL_API SQLGetFunctions(SQLHDBC ConnectionHandle,
++                                       SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported);
+ 
+-SQLRETURN   SQLGetInfo(SQLHDBC ConnectionHandle,
+-           SQLUSMALLINT InfoType, SQLPOINTER InfoValue,
+-           SQLSMALLINT BufferLength, SQLSMALLINT *StringLength);
++    SQLRETURN  SQL_API SQLGetInfo(SQLHDBC ConnectionHandle,
++                                  SQLUSMALLINT InfoType, SQLPOINTER InfoValue,
++                                  SQLSMALLINT BufferLength, SQLSMALLINT *StringLength);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLGetStmtAttr(SQLHSTMT StatementHandle,
+-           SQLINTEGER Attribute, SQLPOINTER Value,
+-           SQLINTEGER BufferLength, SQLINTEGER *StringLength);
++    SQLRETURN  SQL_API SQLGetStmtAttr(SQLHSTMT StatementHandle,
++                                      SQLINTEGER Attribute, SQLPOINTER Value,
++                                      SQLINTEGER BufferLength, SQLINTEGER *StringLength);
+ #endif  /* ODBCVER >= 0x0300 */
+ 
+-SQLRETURN   SQLGetStmtOption(SQLHSTMT StatementHandle,
+-           SQLUSMALLINT Option, SQLPOINTER Value);
++    SQLRETURN  SQL_API SQLGetStmtOption(SQLHSTMT StatementHandle,
++                                        SQLUSMALLINT Option, SQLPOINTER Value);
+ 
+-SQLRETURN   SQLGetTypeInfo(SQLHSTMT StatementHandle,
+-           SQLSMALLINT DataType);
++    SQLRETURN  SQL_API SQLGetTypeInfo(SQLHSTMT StatementHandle,
++                                      SQLSMALLINT DataType);
+ 
+-SQLRETURN   SQLNumResultCols(SQLHSTMT StatementHandle,
+-           SQLSMALLINT *ColumnCount);
++    SQLRETURN  SQL_API SQLNumResultCols(SQLHSTMT StatementHandle,
++                                        SQLSMALLINT *ColumnCount);
+ 
+-SQLRETURN   SQLParamData(SQLHSTMT StatementHandle,
+-           SQLPOINTER *Value);
++    SQLRETURN  SQL_API SQLParamData(SQLHSTMT StatementHandle,
++                                    SQLPOINTER *Value);
+ 
+-SQLRETURN   SQLPrepare(SQLHSTMT StatementHandle,
+-           SQLCHAR *StatementText, SQLINTEGER TextLength);
++    SQLRETURN  SQL_API SQLPrepare(SQLHSTMT StatementHandle,
++                                  SQLCHAR *StatementText, SQLINTEGER TextLength);
+ 
+-SQLRETURN   SQLPutData(SQLHSTMT StatementHandle,
+-           SQLPOINTER Data, SQLINTEGER StrLen_or_Ind);
++    SQLRETURN  SQL_API SQLPutData(SQLHSTMT StatementHandle,
++                                  SQLPOINTER Data, SQLLEN StrLen_or_Ind);
+ 
+-SQLRETURN   SQLRowCount(SQLHSTMT StatementHandle,
+-	   SQLINTEGER *RowCount);
++    SQLRETURN  SQL_API SQLRowCount(SQLHSTMT StatementHandle,
++                                   SQLLEN *RowCount);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLSetConnectAttr(SQLHDBC ConnectionHandle,
+-           SQLINTEGER Attribute, SQLPOINTER Value,
+-           SQLINTEGER StringLength);
++    SQLRETURN  SQL_API SQLSetConnectAttr(SQLHDBC ConnectionHandle,
++                                         SQLINTEGER Attribute, SQLPOINTER Value,
++                                         SQLINTEGER StringLength);
+ #endif /* ODBCVER >= 0x0300 */
+ 
+-SQLRETURN   SQLSetConnectOption(SQLHDBC ConnectionHandle,
+-           SQLUSMALLINT Option, SQLUINTEGER Value);
++    SQLRETURN  SQL_API SQLSetConnectOption(SQLHDBC ConnectionHandle,
++                                           SQLUSMALLINT Option, SQLULEN Value);
+ 
+-SQLRETURN   SQLSetCursorName(SQLHSTMT StatementHandle,
+-           SQLCHAR *CursorName, SQLSMALLINT NameLength);
++    SQLRETURN  SQL_API SQLSetCursorName(SQLHSTMT StatementHandle,
++                                        SQLCHAR *CursorName, SQLSMALLINT NameLength);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLSetDescField(SQLHDESC DescriptorHandle,
+-           SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
+-           SQLPOINTER Value, SQLINTEGER BufferLength);
++    SQLRETURN  SQL_API SQLSetDescField(SQLHDESC DescriptorHandle,
++                                       SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
++                                       SQLPOINTER Value, SQLINTEGER BufferLength);
+ 
+-SQLRETURN   SQLSetDescRec(SQLHDESC DescriptorHandle,
+-           SQLSMALLINT RecNumber, SQLSMALLINT Type,
+-           SQLSMALLINT SubType, SQLINTEGER Length,
+-           SQLSMALLINT Precision, SQLSMALLINT Scale,
+-           SQLPOINTER Data, SQLINTEGER *StringLength,
+-           SQLINTEGER *Indicator);
++    SQLRETURN  SQL_API SQLSetDescRec(SQLHDESC DescriptorHandle,
++                                     SQLSMALLINT RecNumber, SQLSMALLINT Type,
++                                     SQLSMALLINT SubType, SQLLEN Length,
++                                     SQLSMALLINT Precision, SQLSMALLINT Scale,
++                                     SQLPOINTER Data, SQLLEN *StringLength,
++                                     SQLLEN *Indicator);
+ 
+-SQLRETURN   SQLSetEnvAttr(SQLHENV EnvironmentHandle,
+-           SQLINTEGER Attribute, SQLPOINTER Value,
+-           SQLINTEGER StringLength);
++    SQLRETURN  SQL_API SQLSetEnvAttr(SQLHENV EnvironmentHandle,
++                                     SQLINTEGER Attribute, SQLPOINTER Value,
++                                     SQLINTEGER StringLength);
+ #endif /* ODBCVER >= 0x0300 */
+ 
+-SQLRETURN   SQLSetParam(SQLHSTMT StatementHandle,
+-           SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
+-           SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision,
+-           SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
+-           SQLINTEGER *StrLen_or_Ind);
++    SQLRETURN  SQL_API SQLSetParam(SQLHSTMT StatementHandle,
++                                   SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
++                                   SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
++                                   SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
++                                   SQLLEN *StrLen_or_Ind);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN   SQLSetStmtAttr(SQLHSTMT StatementHandle,
+-           SQLINTEGER Attribute, SQLPOINTER Value,
+-           SQLINTEGER StringLength);
++    SQLRETURN  SQL_API SQLSetStmtAttr(SQLHSTMT StatementHandle,
++                                      SQLINTEGER Attribute, SQLPOINTER Value,
++                                      SQLINTEGER StringLength);
+ #endif
+ 
+-SQLRETURN   SQLSetStmtOption(SQLHSTMT StatementHandle,
+-           SQLUSMALLINT Option, SQLUINTEGER Value);
++    SQLRETURN  SQL_API SQLSetStmtOption(SQLHSTMT StatementHandle,
++                                        SQLUSMALLINT Option, SQLULEN Value);
+ 
+-SQLRETURN   SQLSpecialColumns(SQLHSTMT StatementHandle,
+-           SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName,
+-           SQLSMALLINT NameLength1, SQLCHAR *SchemaName,
+-           SQLSMALLINT NameLength2, SQLCHAR *TableName,
+-           SQLSMALLINT NameLength3, SQLUSMALLINT Scope,
+-           SQLUSMALLINT Nullable);
++    SQLRETURN  SQL_API SQLSpecialColumns(SQLHSTMT StatementHandle,
++                                         SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName,
++                                         SQLSMALLINT NameLength1, SQLCHAR *SchemaName,
++                                         SQLSMALLINT NameLength2, SQLCHAR *TableName,
++                                         SQLSMALLINT NameLength3, SQLUSMALLINT Scope,
++                                         SQLUSMALLINT Nullable);
+ 
+-SQLRETURN   SQLStatistics(SQLHSTMT StatementHandle,
+-           SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
+-           SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
+-           SQLCHAR *TableName, SQLSMALLINT NameLength3,
+-           SQLUSMALLINT Unique, SQLUSMALLINT Reserved);
++    SQLRETURN  SQL_API SQLStatistics(SQLHSTMT StatementHandle,
++                                     SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
++                                     SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
++                                     SQLCHAR *TableName, SQLSMALLINT NameLength3,
++                                     SQLUSMALLINT Unique, SQLUSMALLINT Reserved);
+ 
+-SQLRETURN   SQLTables(SQLHSTMT StatementHandle,
+-           SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
+-           SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
+-           SQLCHAR *TableName, SQLSMALLINT NameLength3,
+-           SQLCHAR *TableType, SQLSMALLINT NameLength4);
++    SQLRETURN   SQL_API SQLTables(SQLHSTMT StatementHandle,
++                                  SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
++                                  SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
++                                  SQLCHAR *TableName, SQLSMALLINT NameLength3,
++                                  SQLCHAR *TableType, SQLSMALLINT NameLength4);
+ 
+-SQLRETURN   SQLTransact(SQLHENV EnvironmentHandle,
+-           SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType);
++    SQLRETURN  SQL_API SQLTransact(SQLHENV EnvironmentHandle,
++                                   SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType);
+ 
+ #ifdef __cplusplus
+ }
+Index: unixODBC/inc/sqlext.h
+===================================================================
+--- unixODBC/inc/sqlext.h	(revision 274960)
++++ unixODBC/inc/sqlext.h	(working copy)
+@@ -39,7 +39,9 @@
+ 
+ /* END - unixODBC ONLY */
+ 
++#ifndef __SQL_H
+ #include "sql.h"
++#endif
+ 
+ #ifdef __cplusplus
+ extern "C" {                         /* Assume C declarations for C++ */
+@@ -47,8 +49,8 @@
+ 
+ /* generally useful constants */
+ #define SQL_SPEC_MAJOR     3     	/* Major version of specification  */
+-#define SQL_SPEC_MINOR	   51     	/* Minor version of specification  */
+-#define SQL_SPEC_STRING   "03.51"	/* String constant for version */
++#define SQL_SPEC_MINOR	   52     	/* Minor version of specification  */
++#define SQL_SPEC_STRING   "03.52"	/* String constant for version */
+ 
+ #define SQL_SQLSTATE_SIZE	5	/* size of SQLSTATE */
+ #define SQL_MAX_DSN_LENGTH	32	/* maximum data source name size */
+@@ -72,6 +74,11 @@
+ #define SQL_ATTR_ODBC_VERSION				200
+ #define SQL_ATTR_CONNECTION_POOLING			201
+ #define SQL_ATTR_CP_MATCH					202
++
++/* unixODBC additions */
++#define SQL_ATTR_UNIXODBC_SYSPATH           65001
++#define SQL_ATTR_UNIXODBC_VERSION           65002
++#define SQL_ATTR_UNIXODBC_ENVATTR           65003
+ #endif  /* ODBCVER >= 0x0300 */
+ 
+ #if (ODBCVER >= 0x0300)
+@@ -127,6 +134,8 @@
+ 
+ #define SQL_ATTR_CONNECTION_DEAD	1209	/* GetConnectAttr only */
+ 
++#define SQL_ATTR_DRIVER_THREADING	1028	/* Driver threading level */
++
+ #if (ODBCVER >= 0x0351)
+ /*	ODBC Driver Manager sets this connection attribute to a unicode driver
+ 	(which supports SQLConnectW) when the application is an ANSI application
+@@ -170,7 +179,7 @@
+ #define SQL_OPT_TRACE_OFF               0UL
+ #define SQL_OPT_TRACE_ON                1UL
+ #define SQL_OPT_TRACE_DEFAULT           SQL_OPT_TRACE_OFF
+-#define SQL_OPT_TRACE_FILE_DEFAULT      "\\SQL.LOG"
++#define SQL_OPT_TRACE_FILE_DEFAULT      "/tmp/SQL.LOG"
+ 
+ /* SQL_ODBC_CURSORS options */
+ #define SQL_CUR_USE_IF_NEEDED           0UL
+@@ -516,7 +525,12 @@
+ #define SQL_C_ULONG      (SQL_C_LONG+SQL_UNSIGNED_OFFSET)  /* UNSIGNED INTEGER*/
+ #define SQL_C_USHORT     (SQL_C_SHORT+SQL_UNSIGNED_OFFSET) /* UNSIGNED SMALLINT*/
+ #define SQL_C_UTINYINT   (SQL_TINYINT+SQL_UNSIGNED_OFFSET) /* UNSIGNED TINYINT*/
++
++#if (ODBCVER >= 0x0300) && (SIZEOF_LONG_INT == 8) && !defined(BUILD_LEGACY_64_BIT_MODE)
++#define SQL_C_BOOKMARK   SQL_C_UBIGINT                     /* BOOKMARK        */
++#else
+ #define SQL_C_BOOKMARK   SQL_C_ULONG                       /* BOOKMARK        */
++#endif
+ 
+ #if (ODBCVER >= 0x0350)
+ #define SQL_C_GUID	SQL_GUID
+@@ -751,6 +765,7 @@
+ #define SQL_CONVERT_VARBINARY               69
+ #define SQL_CONVERT_VARCHAR                 70
+ #define SQL_CONVERT_LONGVARBINARY           71
++#define SQL_CONVERT_GUID           			173
+ #define SQL_ODBC_SQL_OPT_IEF                73		/* SQL_INTEGRITY */
+ #define SQL_CORRELATION_NAME                74
+ #define SQL_NON_NULLABLE_COLUMNS            75
+@@ -780,7 +795,9 @@
+ #define SQL_QUALIFIER_LOCATION              114
+ 
+ #if (ODBCVER >= 0x0201 && ODBCVER < 0x0300)
++#ifndef SQL_OJ_CAPABILITIES
+ #define SQL_OJ_CAPABILITIES         65003  /* Temp value until ODBC 3.0 */
++#endif
+ #endif  /* ODBCVER >= 0x0201 && ODBCVER < 0x0300 */
+ 
+ /*----------------------------------------------*/
+@@ -927,6 +944,7 @@
+ #define	SQL_CVT_WCHAR						0x00200000L
+ #define	SQL_CVT_WLONGVARCHAR				0x00400000L
+ #define	SQL_CVT_WVARCHAR					0x00800000L
++#define	SQL_CVT_GUID						0x01000000L
+ 
+ #endif  /* ODBCVER >= 0x0300 */
+ 
+@@ -1199,7 +1217,7 @@
+ #define SQL_FILE_NOT_SUPPORTED              0x0000
+ #define SQL_FILE_TABLE                      0x0001
+ #define SQL_FILE_QUALIFIER                  0x0002
+-#define SQL_FILE_CATALOG					SQL_FILE_QUALIFIER	// ODBC 3.0
++#define SQL_FILE_CATALOG					SQL_FILE_QUALIFIER	/* ODBC 3.0 */
+ 
+ 
+ /* SQL_GETDATA_EXTENSIONS values */
+@@ -1688,7 +1706,7 @@
+ #define SQL_DRIVER_PROMPT               2
+ #define SQL_DRIVER_COMPLETE_REQUIRED    3
+ 
+-SQLRETURN  SQLDriverConnect(
++SQLRETURN SQL_API SQLDriverConnect(
+     SQLHDBC            hdbc,
+     SQLHWND            hwnd,
+     SQLCHAR 		  *szConnStrIn,
+@@ -1762,8 +1780,7 @@
+ #define SQL_PT_FUNCTION                  2
+ 
+ /*      This define is too large for RC */
+-#define SQL_ODBC_KEYWORDS "ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"
+-/*
++#define SQL_ODBC_KEYWORDS "ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"\
+ "ASC,ASSERTION,AT,AUTHORIZATION,AVG,"\
+ "BEGIN,BETWEEN,BIT,BIT_LENGTH,BOTH,BY,CASCADE,CASCADED,CASE,CAST,CATALOG,"\
+ "CHAR,CHAR_LENGTH,CHARACTER,CHARACTER_LENGTH,CHECK,CLOSE,COALESCE,"\
+@@ -1794,9 +1811,8 @@
+ "UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\
+ "VALUE,VALUES,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,WRITE,"\
+ "YEAR,ZONE"
+-*/
+ 
+-SQLRETURN  SQLBrowseConnect(
++SQLRETURN SQL_API SQLBrowseConnect(
+     SQLHDBC            hdbc,
+     SQLCHAR 		  *szConnStrIn,
+     SQLSMALLINT        cbConnStrIn,
+@@ -1805,21 +1821,21 @@
+     SQLSMALLINT       *pcbConnStrOut);
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN	SQLBulkOperations(
++SQLRETURN	SQL_API SQLBulkOperations(
+ 	SQLHSTMT			StatementHandle,
+ 	SQLSMALLINT			Operation);
+ #endif  /* ODBCVER >= 0x0300 */
+ 
+-SQLRETURN  SQLColAttributes(
++SQLRETURN SQL_API SQLColAttributes(
+     SQLHSTMT           hstmt,
+     SQLUSMALLINT       icol,
+     SQLUSMALLINT       fDescType,
+     SQLPOINTER         rgbDesc,
+     SQLSMALLINT        cbDescMax,
+     SQLSMALLINT 	  *pcbDesc,
+-    SQLINTEGER 		  *pfDesc);
++    SQLLEN 		      *pfDesc);
+ 
+-SQLRETURN  SQLColumnPrivileges(
++SQLRETURN SQL_API SQLColumnPrivileges(
+     SQLHSTMT           hstmt,
+     SQLCHAR 		  *szCatalogName,
+     SQLSMALLINT        cbCatalogName,
+@@ -1830,22 +1846,22 @@
+     SQLCHAR 		  *szColumnName,
+     SQLSMALLINT        cbColumnName);
+ 
+-SQLRETURN  SQLDescribeParam(
++SQLRETURN SQL_API SQLDescribeParam(
+     SQLHSTMT           hstmt,
+     SQLUSMALLINT       ipar,
+     SQLSMALLINT 	  *pfSqlType,
+-    SQLUINTEGER 	  *pcbParamDef,
++    SQLULEN 	      *pcbParamDef,
+     SQLSMALLINT 	  *pibScale,
+     SQLSMALLINT 	  *pfNullable);
+ 
+-SQLRETURN  SQLExtendedFetch(
++SQLRETURN SQL_API SQLExtendedFetch(
+     SQLHSTMT           hstmt,
+     SQLUSMALLINT       fFetchType,
+-    SQLINTEGER         irow,
+-    SQLUINTEGER 	  *pcrow,
+-    SQLUSMALLINT 	  *rgfRowStatus);
++    SQLLEN             irow,
++    SQLULEN 	  	   *pcrow,
++    SQLUSMALLINT 	   *rgfRowStatus);
+ 
+-SQLRETURN  SQLForeignKeys(
++SQLRETURN SQL_API SQLForeignKeys(
+     SQLHSTMT           hstmt,
+     SQLCHAR 		  *szPkCatalogName,
+     SQLSMALLINT        cbPkCatalogName,
+@@ -1860,10 +1876,10 @@
+     SQLCHAR 		  *szFkTableName,
+     SQLSMALLINT        cbFkTableName);
+ 
+-SQLRETURN  SQLMoreResults(
++SQLRETURN SQL_API SQLMoreResults(
+     SQLHSTMT           hstmt);
+ 
+-SQLRETURN  SQLNativeSql(
++SQLRETURN SQL_API SQLNativeSql(
+     SQLHDBC            hdbc,
+     SQLCHAR 		  *szSqlStrIn,
+     SQLINTEGER         cbSqlStrIn,
+@@ -1871,16 +1887,16 @@
+     SQLINTEGER         cbSqlStrMax,
+     SQLINTEGER 		  *pcbSqlStr);
+ 
+-SQLRETURN  SQLNumParams(
++SQLRETURN SQL_API SQLNumParams(
+     SQLHSTMT           hstmt,
+     SQLSMALLINT 	  *pcpar);
+ 
+-SQLRETURN  SQLParamOptions(
++SQLRETURN SQL_API SQLParamOptions(
+     SQLHSTMT           hstmt,
+-    SQLUINTEGER        crow,
+-    SQLUINTEGER 	  *pirow);
++    SQLULEN        	   crow,
++    SQLULEN 	  	   *pirow);
+ 
+-SQLRETURN  SQLPrimaryKeys(
++SQLRETURN SQL_API SQLPrimaryKeys(
+     SQLHSTMT           hstmt,
+     SQLCHAR 		  *szCatalogName,
+     SQLSMALLINT        cbCatalogName,
+@@ -1889,7 +1905,7 @@
+     SQLCHAR 		  *szTableName,
+     SQLSMALLINT        cbTableName);
+ 
+-SQLRETURN  SQLProcedureColumns(
++SQLRETURN SQL_API SQLProcedureColumns(
+     SQLHSTMT           hstmt,
+     SQLCHAR 		  *szCatalogName,
+     SQLSMALLINT        cbCatalogName,
+@@ -1900,7 +1916,7 @@
+     SQLCHAR 		  *szColumnName,
+     SQLSMALLINT        cbColumnName);
+ 
+-SQLRETURN  SQLProcedures(
++SQLRETURN SQL_API SQLProcedures(
+     SQLHSTMT           hstmt,
+     SQLCHAR 		  *szCatalogName,
+     SQLSMALLINT        cbCatalogName,
+@@ -1909,13 +1925,13 @@
+     SQLCHAR 		  *szProcName,
+     SQLSMALLINT        cbProcName);
+ 
+-SQLRETURN  SQLSetPos(
++SQLRETURN SQL_API SQLSetPos(
+     SQLHSTMT           hstmt,
+-    SQLUSMALLINT       irow,
++    SQLSETPOSIROW      irow,
+     SQLUSMALLINT       fOption,
+     SQLUSMALLINT       fLock);
+ 
+-SQLRETURN  SQLTablePrivileges(
++SQLRETURN SQL_API SQLTablePrivileges(
+     SQLHSTMT           hstmt,
+     SQLCHAR 		  *szCatalogName,
+     SQLSMALLINT        cbCatalogName,
+@@ -1924,7 +1940,7 @@
+     SQLCHAR 		  *szTableName,
+     SQLSMALLINT        cbTableName);
+ 
+-SQLRETURN  SQLDrivers(
++SQLRETURN SQL_API SQLDrivers(
+     SQLHENV            henv,
+     SQLUSMALLINT       fDirection,
+     SQLCHAR 		  *szDriverDesc,
+@@ -1934,17 +1950,17 @@
+     SQLSMALLINT        cbDrvrAttrMax,
+     SQLSMALLINT 	  *pcbDrvrAttr);
+ 
+-SQLRETURN  SQLBindParameter(
++SQLRETURN SQL_API SQLBindParameter(
+     SQLHSTMT           hstmt,
+     SQLUSMALLINT       ipar,
+     SQLSMALLINT        fParamType,
+     SQLSMALLINT        fCType,
+     SQLSMALLINT        fSqlType,
+-    SQLUINTEGER        cbColDef,
++    SQLULEN            cbColDef,
+     SQLSMALLINT        ibScale,
+     SQLPOINTER         rgbValue,
+-    SQLINTEGER         cbValueMax,
+-    SQLINTEGER 		  *pcbValue);
++    SQLLEN             cbValueMax,
++    SQLLEN 		      *pcbValue);
+ 
+ /*---------------------------------------------------------*/
+ /* SQLAllocHandleStd is implemented to make SQLAllocHandle */
+@@ -1972,7 +1988,7 @@
+ #endif /* ODBC_STD */
+ 
+ #if (ODBCVER >= 0x0300)
+-SQLRETURN  SQLAllocHandleStd(
++SQLRETURN SQL_API SQLAllocHandleStd(
+ 	SQLSMALLINT		fHandleType,
+ 	SQLHANDLE		hInput,
+ 	SQLHANDLE	   *phOutput);
+@@ -1999,21 +2015,57 @@
+ #define SQL_SCROLL_STATIC               (-3L) /*-SQL_CURSOR_STATIC */
+ 
+ /*      Deprecated functions from prior versions of ODBC */
+-SQLRETURN  SQLSetScrollOptions(    /*      Use SQLSetStmtOptions */
++SQLRETURN SQL_API SQLSetScrollOptions(    /*      Use SQLSetStmtOptions */
+     SQLHSTMT           hstmt,
+     SQLUSMALLINT       fConcurrency,
+-    SQLINTEGER         crowKeyset,
++    SQLLEN             crowKeyset,
+     SQLUSMALLINT       crowRowset);
+ 
+-/* Tracing section */
++/*!
++ * \defgroup    Tracing.
++ *
++ *              unixODBC implements a slight variation of the tracing mechanism used 
++ *              on MS platforms. The unixODBC method loses the ability to produce trace
++ *              output for invalid handles but gains the following;
++ *
++ *              - better concurrency 
++ *              - allows tracing to be turned on/off and configured at finer granularity
++ *              - hopefully; better performance
++ *
++ *              unixODBC provides a cross-platform helper library called 'trace' and an
++ *              example/default trace plugin called 'odbctrac'. Those writing an ODBC 
++ *              driver can use the 'trace' helper library (a static library). Those wanting
++ *              to create custom trace output can implement a different version of the
++ *              'odbctrac' plugin.
++ *
++ *              The text file driver (odbctxt) included with unixODBC is an example of a 
++ *              driver using the 'trace' helper library.
++ *
++ *              The 'trace' library and the example plugin 'odbctrac' are designed to be 
++ *              portable on all platforms where unixODBC is available and on MS platforms.
++ *              This will allow drivers using 'trace' and 'odbctrac' plugin to equilly 
++ *              portable. On MS platforms - this compliments traditional tracing (mostly
++ *              just used by the Driver Manager).
++ *
++ * \sa          trace
++ *              odbctxt
++ *              odbctrac
++ */
++/*@{*/
++#define	TRACE_VERSION 1000                                  /*!< Version of trace API                               */
++#ifdef UNICODE
++RETCODE TraceOpenLogFile(SQLPOINTER,LPWSTR,LPWSTR,DWORD); 	/*!< open a trace log file				                */
++#else
++RETCODE TraceOpenLogFile(SQLPOINTER,LPSTR,LPSTR,DWORD); 	/*!< open a trace log file				                */
++#endif
++RETCODE TraceCloseLogFile(SQLPOINTER);					    /*!< Request to close a trace log		                */
++SQLRETURN TraceReturn(SQLPOINTER,SQLRETURN);                /*!< Call to produce trace output upon function return. */
++#ifdef __cplusplus
++DWORD	 TraceVersion();							        /*!< Returns trace API version			                */
++#else
++DWORD	 TraceVersion(VOID);							    /*!< Returns trace API version			                */
++#endif
+ 
+-#define		TRACE_VERSION	1000		/* Version of trace API */
+-
+-RETCODE	 TraceOpenLogFile(LPWSTR,LPWSTR,DWORD); 	/* open a trace log file				*/
+-RETCODE	 TraceCloseLogFile();					/* Request to close a trace log			*/
+-VOID	 TraceReturn(RETCODE,RETCODE);			/* Processes trace after FN is called	*/
+-DWORD	 TraceVersion();							/* Returns trace API version			*/
+-
+ /* Functions for Visual Studio Analyzer*/
+ /* to turn on/off tracing or VS events, call TraceVSControl by setting or clearing the following bits  */
+ #define TRACE_ON			0x00000001L
+@@ -2028,7 +2080,11 @@
+ #define ODBC_VS_FLAG_STOP		0x00000008L	/* Stop firing visual studio analyzer events */
+ 
+ typedef struct tagODBC_VS_ARGS {
++#ifdef GUID_DEFINED
+ 	const GUID	*pguidEvent;	/* the GUID for event */
++#else
++	const void	*pguidEvent;	/* the GUID for event */
++#endif
+ 	DWORD	dwFlags;		/* flags for the call */
+ 	union {
+ 		WCHAR	*wszArg;	
+@@ -2042,10 +2098,25 @@
+ } ODBC_VS_ARGS, *PODBC_VS_ARGS;
+ 
+ VOID	FireVSDebugEvent(PODBC_VS_ARGS);
++/*@}*/
+ 
+-
+ #ifdef __cplusplus
+ }
+ #endif
+ 
++/*
++ * connection pooling retry times
++ */
++
++BOOL ODBCSetTryWaitValue ( DWORD dwValue );
++#ifdef __cplusplus
++DWORD ODBCGetTryWaitValue ( );
++#else
++DWORD ODBCGetTryWaitValue ( VOID );
+ #endif
++
++#ifndef __SQLUCODE_H
++#include "sqlucode.h"
++#endif
++
++#endif
+Index: unixODBC/inc/sqltypes.h
+===================================================================
+--- unixODBC/inc/sqltypes.h	(revision 274960)
++++ unixODBC/inc/sqltypes.h	(working copy)
+@@ -26,48 +26,111 @@
+ #define ODBCVER	0x0351
+ #endif
+ 
++/*
++ * if thi sis set, then use a 4 byte unicode definition, insteead of the 2 bye that MS use
++ */
++
++#ifdef SQL_WCHART_CONVERT  
++/* 
++ * Use this if you want to use the C/C++ portable definition of  a wide char, wchar_t
++ *  Microsoft hardcoded a definition of  unsigned short which may not be compatible with
++ *  your platform specific wide char definition.
++ */
++#include <wchar.h>
++#endif
++
++#include <sal/types.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-#ifndef SIZEOF_LONG
+-# if defined(__alpha__) || defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__sparcv9) || defined(__LP64__)
+-# define SIZEOF_LONG        8
+-#else
+-# define SIZEOF_LONG        4
++#ifndef SIZEOF_LONG_INT
++# define SIZEOF_LONG_INT SAL_TYPES_SIZEOFLONG
+ #endif
++#ifndef ODBCINT64
++# define ODBCINT64 sal_Int64
+ #endif
++#ifndef UODBCINT64
++# define UODBCINT64 sal_uInt64
++#endif
+ 
++/*
++ * this is defined by configure, but will not be on a normal application build
++ * the install creates a unixodbc_conf.h file that contains the current build settings
++ */
++
++#ifndef SIZEOF_LONG_INT
++#include <unixodbc_conf.h>
++#endif
++
++#ifndef SIZEOF_LONG_INT
++#error "Needs to know how big a long int is to continue!!!"
++#endif
++
+ /****************************
+  * These make up for having no windows.h
+  ***************************/
++#ifndef ALLREADY_HAVE_WINDOWS_TYPE
++
+ #define FAR
+ #define CALLBACK
++#ifdef __OS2__
++#define SQL_API _System
++#else
+ #define SQL_API
++#endif
+ #define	BOOL				int
+ typedef void*				HWND;
+-#ifndef CHAR
+-typedef char*				GUID;
++typedef char				CHAR;
++#ifdef UNICODE
++
++/* 
++ * NOTE: The Microsoft unicode define is only for apps that want to use TCHARs and 
++ *  be able to compile for both unicode and non-unicode with the same source.
++ *  This is not recommanded for linux applications and is not supported
++ * 	by the standard linux string header files.
++ */
++#ifdef SQL_WCHART_CONVERT
++typedef wchar_t             TCHAR;
++#else
++typedef signed short        TCHAR;
+ #endif
+-#define GUID_DEFINED
+-typedef char				CHAR;
++
++#else
++typedef char				TCHAR;
++#endif
++
+ #ifndef DONT_TD_VOID
+ typedef void				VOID;
+ #endif
++
+ typedef unsigned short		WORD;
+-#if SIZEOF_LONG == 4
+-	typedef unsigned long		DWORD;
++#if (SIZEOF_LONG_INT == 4)
++typedef unsigned long		DWORD;
+ #else
+-	typedef unsigned int		DWORD;
++typedef unsigned int		DWORD;
+ #endif
+ typedef unsigned char		BYTE;
++
++#ifdef SQL_WCHART_CONVERT
++typedef wchar_t             WCHAR;
++#else
+ typedef unsigned short 		WCHAR;
+-typedef WCHAR* 		        LPWSTR;
++#endif
++
++typedef WCHAR* 	            LPWSTR;
+ typedef const char*         LPCSTR;
++typedef const WCHAR*        LPCWSTR;
++typedef TCHAR*              LPTSTR;
+ typedef char*               LPSTR;
+ typedef DWORD*           	LPDWORD;
+ 
++typedef void*               HINSTANCE;
+ 
++#endif
++
++
+ /****************************
+  * standard SQL* data types. use these as much as possible when using ODBC calls/vars
+  ***************************/
+@@ -80,11 +143,61 @@
+ typedef double          SQLFLOAT;
+ #endif
+ 
+-#if SIZEOF_LONG == 4
+-	typedef long	SQLINTEGER;
++/*
++ * can't use a long it fails on 64 platforms
++ */
++
++/*
++ * Hopefully by now it should be safe to assume most drivers know about SQLLEN now
++ * and the defaukt is now sizeof( SQLLEN ) = 8 on 64 bit platforms
++ * 
++ */
++
++#if (SIZEOF_LONG_INT == 8)
++#ifdef BUILD_LEGACY_64_BIT_MODE
++typedef int             SQLINTEGER;
++typedef unsigned int    SQLUINTEGER;
++#define SQLLEN          SQLINTEGER
++#define SQLULEN         SQLUINTEGER
++#define SQLSETPOSIROW   SQLUSMALLINT
++/* 
++ * These are not supprted on 64bit ODBC according to MS, removed, so use at your peril
++ *
++ typedef SQLULEN         SQLROWCOUNT;
++ typedef SQLULEN         SQLROWSETSIZE;
++ typedef SQLULEN         SQLTRANSID;
++ typedef SQLLEN          SQLROWOFFSET;
++*/
+ #else
+-	typedef int	SQLINTEGER;
++typedef int             SQLINTEGER;
++typedef unsigned int    SQLUINTEGER;
++typedef long            SQLLEN;
++typedef unsigned long   SQLULEN;
++typedef unsigned long   SQLSETPOSIROW;
++/* 
++ * These are not supprted on 64bit ODBC according to MS, removed, so use at your peril
++ *
++ typedef SQLULEN 		SQLTRANSID;
++ typedef SQLULEN 		SQLROWCOUNT;
++ typedef SQLUINTEGER 	SQLROWSETSIZE;
++ typedef SQLLEN 		SQLROWOFFSET;
++ */
++typedef SQLULEN         SQLROWCOUNT;
++typedef SQLULEN         SQLROWSETSIZE;
++typedef SQLULEN         SQLTRANSID;
++typedef SQLLEN          SQLROWOFFSET;
+ #endif
++#else
++typedef long            SQLINTEGER;
++typedef unsigned long   SQLUINTEGER;
++#define SQLLEN          SQLINTEGER
++#define SQLULEN         SQLUINTEGER
++#define SQLSETPOSIROW   SQLUSMALLINT
++typedef SQLULEN         SQLROWCOUNT;
++typedef SQLULEN         SQLROWSETSIZE;
++typedef SQLULEN         SQLTRANSID;
++typedef SQLLEN          SQLROWOFFSET;
++#endif
+ 
+ #if (ODBCVER >= 0x0300)
+ typedef unsigned char   SQLNUMERIC;
+@@ -107,39 +220,58 @@
+ 
+ typedef SQLSMALLINT     SQLRETURN;
+ 
+-/* typedef void * 			SQLHANDLE; */
+-
+-typedef SQLINTEGER		SQLHANDLE;
+ #if (ODBCVER >= 0x0300)
+-
++typedef void * 			        SQLHANDLE; 
+ typedef SQLHANDLE               SQLHENV;
+ typedef SQLHANDLE               SQLHDBC;
+ typedef SQLHANDLE               SQLHSTMT;
+ typedef SQLHANDLE               SQLHDESC;
++#else
++typedef void *                  SQLHENV;
++typedef void *                  SQLHDBC;
++typedef void *                  SQLHSTMT;
++/*
++ * some things like PHP won't build without this
++ */
++typedef void * 			        SQLHANDLE; 
++#endif
+ 
++/****************************
++ * These are cast into the actual struct that is being passed around. The
++ * DriverManager knows what its structs look like and the Driver knows about its
++ * structs... the app knows nothing about them... just void*
++ * These are deprecated in favour of SQLHENV, SQLHDBC, SQLHSTMT
++ ***************************/
++
++#if (ODBCVER >= 0x0300)
++typedef SQLHANDLE          		HENV;
++typedef SQLHANDLE          		HDBC;
++typedef SQLHANDLE          		HSTMT;
+ #else
+-typedef SQLINTEGER              SQLHENV;
+-typedef SQLINTEGER              SQLHDBC;
+-typedef SQLINTEGER              SQLHSTMT;
++typedef void *          	    HENV;
++typedef void *          	    HDBC;
++typedef void *          	    HSTMT;
+ #endif
+ 
+ 
+ /****************************
+  * more basic data types to augment what windows.h provides
+  ***************************/
++#ifndef ALLREADY_HAVE_WINDOWS_TYPE
++
+ typedef unsigned char           UCHAR;
+ typedef signed char             SCHAR;
+ typedef SCHAR                   SQLSCHAR;
+-#if SIZEOF_LONG == 4
+-	typedef long int		SDWORD;
+-	typedef unsigned long int	UDWORD;
++#if (SIZEOF_LONG_INT == 4)
++typedef long int                SDWORD;
++typedef unsigned long int       UDWORD;
+ #else
+-	typedef signed int	SDWORD;
+-	typedef unsigned int	UDWORD;
++typedef int                     SDWORD;
++typedef unsigned int            UDWORD;
+ #endif
+ typedef signed short int        SWORD;
+ typedef unsigned short int      UWORD;
+-typedef UDWORD                  SQLUINTEGER;
++typedef unsigned int            UINT;
+ typedef signed long             SLONG;
+ typedef signed short            SSHORT;
+ typedef unsigned long           ULONG;
+@@ -151,20 +283,7 @@
+ typedef signed short            RETCODE;
+ typedef void*                   SQLHWND;
+ 
+-/****************************
+- * These are cast into the actual struct that is being passed around. The
+- * DriverManager knows what its structs look like and the Driver knows about its
+- * structs... the app knows nothing about them... just void*
+- * These are deprecated in favour of SQLHENV, SQLHDBC, SQLHSTMT
+- ***************************/
+-/*
+-typedef void*              		HENV;
+-typedef void*              		HDBC;
+-typedef void*              		HSTMT;
+-*/
+-typedef SQLHANDLE          		HENV;
+-typedef SQLHANDLE          		HDBC;
+-typedef SQLHANDLE          		HSTMT;
++#endif
+ 
+ /****************************
+  * standard structs for working with date/times
+@@ -263,12 +382,41 @@
+ /****************************
+  *
+  ***************************/
+-#if (ODBCVER >= 0x0300)
+-#define ODBCINT64	long
++#ifndef ODBCINT64
++# if (ODBCVER >= 0x0300)
++# if (SIZEOF_LONG_INT == 8)
++#   define ODBCINT64	    long
++#   define UODBCINT64	unsigned long
++# else
++#  ifdef HAVE_LONG_LONG
++#   define ODBCINT64	    long long
++#   define UODBCINT64	unsigned long long
++#  else
++/*
++ * may fail in some cases, but what else can we do ?
++ */
++struct __bigint_struct
++{
++    int             hiword;
++    unsigned int    loword;
++};
++struct __bigint_struct_u
++{
++    unsigned int    hiword;
++    unsigned int    loword;
++};
++#   define ODBCINT64	    struct __bigint_struct
++#   define UODBCINT64	struct __bigint_struct_u
++#  endif
++# endif
++#endif
++#endif
++
+ #ifdef ODBCINT64
+ typedef ODBCINT64	SQLBIGINT;
+-typedef unsigned ODBCINT64	SQLUBIGINT;
+ #endif
++#ifdef UODBCINT64
++typedef UODBCINT64	SQLUBIGINT;
+ #endif
+ 
+ 
+@@ -288,6 +436,7 @@
+ 
+ #if (ODBCVER >= 0x0350)
+ #ifdef GUID_DEFINED
++#ifndef ALLREADY_HAVE_WINDOWS_TYPE
+ typedef GUID	SQLGUID;
+ #else
+ typedef struct  tagSQLGUID
+@@ -298,18 +447,21 @@
+     BYTE Data4[ 8 ];
+ } SQLGUID;
+ #endif
++#else
++typedef struct  tagSQLGUID
++{
++    DWORD Data1;
++    WORD Data2;
++    WORD Data3;
++    BYTE Data4[ 8 ];
++} SQLGUID;
+ #endif
++#endif
+ 
++typedef SQLULEN         BOOKMARK;
+ 
+-typedef unsigned long int       BOOKMARK;
++typedef  WCHAR         SQLWCHAR;
+ 
+-
+-#ifdef _WCHAR_T_DEFINED
+-typedef wchar_t SQLWCHAR;
+-#else
+-typedef unsigned short SQLWCHAR;
+-#endif
+-
+ #ifdef UNICODE
+ typedef SQLWCHAR        SQLTCHAR;
+ #else
+@@ -321,3 +473,6 @@
+ #endif
+ 
+ #endif
++
++
++
diff --git a/applied_patches/0080-jpegc.c.diff b/applied_patches/0086-jpegc.c.diff
similarity index 100%
rename from applied_patches/0080-jpegc.c.diff
rename to applied_patches/0086-jpegc.c.diff
diff --git a/applied_patches/0087-save-doc-withembedded-doc-with-vba-crash.diff b/applied_patches/0087-save-doc-withembedded-doc-with-vba-crash.diff
deleted file mode 100644
index 4a66f01f8..000000000
--- a/applied_patches/0087-save-doc-withembedded-doc-with-vba-crash.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: sw/source/ui/app/docsh.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/app/docsh.cxx,v
-retrieving revision 1.71.24.1
-diff -u -p -r1.71.24.1 docsh.cxx
---- sw/source/ui/app/docsh.cxx	17 Aug 2007 07:10:07 -0000	1.71.24.1
-+++ sw/source/ui/app/docsh.cxx	14 Nov 2007 12:12:36 -0000
-@@ -642,16 +642,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& 
-             xDocSh->DoClose();
- 		}
- 
--        if( pDoc->ContainsMSVBasic() )
--        {
--            //TODO/MBA: it looks as that this code can be removed!
--            //SvxImportMSVBasic aTmp( *this, pIo->GetStorage() );
--            //aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr );
--            if( SvtFilterOptions::Get()->IsLoadWordBasicStorage() )
--                nVBWarning = SvxImportMSVBasic::
--                                GetSaveWarningOfMSVBAStorage( *this );
--            pDoc->SetContainsMSVBasic( FALSE );
--        }
- 
- 		// TabellenBox Edit beenden!
- 		if( pWrtShell )
-Index: svx/source/msfilter/msoleexp.cxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/msfilter/msoleexp.cxx,v
-retrieving revision 1.20
-diff -u -p -r1.20 msoleexp.cxx
---- svx/source/msfilter/msoleexp.cxx	27 Jun 2007 18:35:44 -0000	1.20
-+++ svx/source/msfilter/msoleexp.cxx	14 Nov 2007 12:19:05 -0000
-@@ -272,7 +272,12 @@ void SvxMSExportOLEObjects::ExportOLEObj
-         aSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
-         aSeq[1].Value <<= ::rtl::OUString( pExpFilter->GetName() );
-         uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY );
--        xStor->storeToURL( ::rtl::OUString::createFromAscii( "private:stream" ), aSeq );
-+        try
-+        {
-+            xStor->storeToURL( ::rtl::OUString::createFromAscii( "private:stream" ), aSeq );
-+        }
-+        catch( uno::Exception& ) {} // #TODO really handle exceptions - interactionalhandler etc. ? 
-+        
-         SotStorageRef xOLEStor = new SotStorage( pStream, TRUE );
-         xOLEStor->CopyTo( &rDestStg );
-         rDestStg.Commit();
diff --git a/applied_patches/0081-tools-urlobj-smb-scheme-patch.diff b/applied_patches/0087-tools-urlobj-smb-scheme-patch.diff
similarity index 100%
rename from applied_patches/0081-tools-urlobj-smb-scheme-patch.diff
rename to applied_patches/0087-tools-urlobj-smb-scheme-patch.diff
diff --git a/applied_patches/0082-samba-hyperlinks-sc-sd.diff b/applied_patches/0088-samba-hyperlinks-sc-sd.diff
similarity index 100%
rename from applied_patches/0082-samba-hyperlinks-sc-sd.diff
rename to applied_patches/0088-samba-hyperlinks-sc-sd.diff
diff --git a/applied_patches/0083-tools-qa-urlobj-unittest.diff b/applied_patches/0089-tools-qa-urlobj-unittest.diff
similarity index 100%
rename from applied_patches/0083-tools-qa-urlobj-unittest.diff
rename to applied_patches/0089-tools-qa-urlobj-unittest.diff
diff --git a/applied_patches/0089-win32-invalid-names.diff b/applied_patches/0089-win32-invalid-names.diff
deleted file mode 100644
index 4ce8840bd..000000000
--- a/applied_patches/0089-win32-invalid-names.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- sal/osl/w32/file.cxx	2006-12-01 17:56:16.000000000 +0000
-+++ sal/osl/w32/file.cxx	2007-06-08 10:30:26.828125000 +0000
-@@ -175,6 +175,7 @@ using namespace osl;
- #define VALIDATEPATH_ALLOW_ELLIPSE			0x0002
- #define VALIDATEPATH_ALLOW_RELATIVE			0x0004
- #define VALIDATEPATH_ALLOW_UNC				0x0008
-+#define VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD 0x0010
- 
- #define WSTR_SYSTEM_ROOT_PATH				L"\\\\.\\"
- 
-@@ -1108,9 +1109,10 @@ namespace /* private */
- 			    case '.':
- 				    if ( dwFlags & VALIDATEPATH_ALLOW_ELLIPSE )
- 				    {
--					    if ( 1 == lpCurrent - lpComponent )
-+					    if ( (dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD) ||
-+							 1 == lpCurrent - lpComponent )
- 					    {
--						    /* Current directory is O.K. */
-+						    /* Either do allow periods anywhere, or current directory */
- 						    lpComponentEnd = lpCurrent;
- 						    break;
- 					    }
-@@ -1123,8 +1125,13 @@ namespace /* private */
- 				    }
- 			    case 0:
- 			    case ' ':
--				    lpComponentEnd = lpCurrent - 1;
--				    fValid = FALSE;
-+					if ( dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD )
-+						lpComponentEnd = lpCurrent;
-+					else
-+					{
-+						lpComponentEnd = lpCurrent - 1;
-+						fValid = FALSE;
-+					}
- 				    break;
- 			    default:
- 				    lpComponentEnd = lpCurrent;
-@@ -1365,7 +1372,7 @@ namespace /* private */
-                 lpComponent = lpszPath + i;
-             }
- 
--		    fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags );
-+		    fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags | VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD);
- 
- 		    if ( fValid && lpComponent )
- 		    {
diff --git a/applied_patches/0084-svx-text-rotation-fix.diff b/applied_patches/0090-svx-text-rotation-fix.diff
similarity index 100%
rename from applied_patches/0084-svx-text-rotation-fix.diff
rename to applied_patches/0090-svx-text-rotation-fix.diff
diff --git a/applied_patches/0085-sfx-check-real-help-path.diff b/applied_patches/0091-sfx-check-real-help-path.diff
similarity index 100%
rename from applied_patches/0085-sfx-check-real-help-path.diff
rename to applied_patches/0091-sfx-check-real-help-path.diff
diff --git a/applied_patches/0086-xmlhelp-work-with-symlinks.diff b/applied_patches/0092-xmlhelp-work-with-symlinks.diff
similarity index 100%
rename from applied_patches/0086-xmlhelp-work-with-symlinks.diff
rename to applied_patches/0092-xmlhelp-work-with-symlinks.diff
diff --git a/applied_patches/0088-localize-pl-cygwin-paths.diff b/applied_patches/0093-localize-pl-cygwin-paths.diff
similarity index 100%
rename from applied_patches/0088-localize-pl-cygwin-paths.diff
rename to applied_patches/0093-localize-pl-cygwin-paths.diff
diff --git a/applied_patches/0094-win32-invalid-names.diff b/applied_patches/0094-win32-invalid-names.diff
new file mode 100644
index 000000000..019d4baca
--- /dev/null
+++ b/applied_patches/0094-win32-invalid-names.diff
@@ -0,0 +1,50 @@
+--- sal/osl/w32/file_url.h
++++ sal/osl/w32/file_url.h
+@@ -175,6 +175,7 @@
+ #define VALIDATEPATH_ALLOW_ELLIPSE			0x0002
+ #define VALIDATEPATH_ALLOW_RELATIVE			0x0004
+ #define VALIDATEPATH_ALLOW_UNC				0x0008
++#define VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD 0x0010
+ 
+ DWORD IsValidFilePath (
+     rtl_uString *  path,
+--- sal/osl/w32/file_url.cxx
++++ sal/osl/w32/file_url.cxx
+@@ -1108,9 +1109,10 @@
+ 			    case '.':
+ 				    if ( dwFlags & VALIDATEPATH_ALLOW_ELLIPSE )
+ 				    {
+-					    if ( 1 == lpCurrent - lpComponent )
++					    if ( (dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD) ||
++							 1 == lpCurrent - lpComponent )
+ 					    {
+-						    /* Current directory is O.K. */
++						    /* Either do allow periods anywhere, or current directory */
+ 						    lpComponentEnd = lpCurrent;
+ 						    break;
+ 					    }
+@@ -1123,8 +1125,13 @@ namespace /* private */
+ 				    }
+ 			    case 0:
+ 			    case ' ':
+-				    lpComponentEnd = lpCurrent - 1;
+-				    fValid = FALSE;
++					if ( dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD )
++						lpComponentEnd = lpCurrent;
++					else
++					{
++						lpComponentEnd = lpCurrent - 1;
++						fValid = FALSE;
++					}
+ 				    break;
+ 			    default:
+ 				    lpComponentEnd = lpCurrent;
+@@ -1365,7 +1372,7 @@ namespace /* private */
+                 lpComponent = lpszPath + i;
+             }
+ 
+-		    fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags );
++		    fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags | VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD);
+ 
+ 		    if ( fValid && lpComponent )
+ 		    {
diff --git a/applied_patches/0095-forms-radio-button-group-names.diff b/applied_patches/0095-forms-radio-button-group-names.diff
deleted file mode 100644
index 7e46cdfb7..000000000
--- a/applied_patches/0095-forms-radio-button-group-names.diff
+++ /dev/null
@@ -1,897 +0,0 @@
-diff --git extensions/inc/extensio.hrc extensions/inc/extensio.hrc
-index fe70aa3..c3dbd20 100644
---- extensions/inc/extensio.hrc
-+++ extensions/inc/extensio.hrc
-@@ -458,9 +458,10 @@
- #define HID_PROP_NOLABEL                        (HID_FORMS_START + 340)
- #define HID_PROP_WRITING_MODE                   (HID_FORMS_START + 341)
- #define HID_PROP_ANCHOR_TYPE                    (HID_FORMS_START + 343)
-+#define HID_PROP_GROUP_NAME                     (HID_FORMS_START + 344)
-     // please adjust HID_LAST_FORMS_ID if you add new ids here!
- 
--#define HID_LAST_FORMS_ID   HID_PROP_ANCHOR_TYPE
-+#define HID_LAST_FORMS_ID   HID_PROP_GROUP_NAME
- 
- #if HID_LAST_FORMS_ID > HID_FORMS_END
-     #error id overflow
-diff --git extensions/source/propctrlr/formmetadata.cxx extensions/source/propctrlr/formmetadata.cxx
-index ae07c9a..1fe7db6 100644
---- extensions/source/propctrlr/formmetadata.cxx
-+++ extensions/source/propctrlr/formmetadata.cxx
-@@ -143,6 +143,7 @@ namespace pcr
-         DEF_INFO_3( LABEL,             LABEL,              LABEL,             FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
-         DEF_INFO_2( CONTROLLABEL,      LABELCONTROL,       CONTROLLABEL,      FORM_VISIBLE, COMPOSEABLE ),
-         DEF_INFO_3( WRITING_MODE,      WRITING_MODE,       WRITING_MODE,      FORM_VISIBLE, ENUM, COMPOSEABLE ),
-+        DEF_INFO_3( GROUP_NAME,        GROUP_NAME,         GROUP_NAME,        FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
-         DEF_INFO_2( TEXT,              TEXT,               TEXT,              DIALOG_VISIBLE, COMPOSEABLE ),
-         DEF_INFO_3( MAXTEXTLEN,        MAXTEXTLEN,         MAXTEXTLEN,        FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
-         DEF_INFO_3( EDITMASK,          EDITMASK,           EDITMASK,          FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
-diff --git extensions/source/propctrlr/formmetadata.hxx extensions/source/propctrlr/formmetadata.hxx
-index 8ebacf4..ba9174f 100644
---- extensions/source/propctrlr/formmetadata.hxx
-+++ extensions/source/propctrlr/formmetadata.hxx
-@@ -166,6 +166,7 @@ namespace pcr
- 	#define PROPERTY_ID_ALLOWADDITIONS		 20
- 	#define PROPERTY_ID_ALLOWEDITS			 21
- 	#define PROPERTY_ID_ALLOWDELETIONS		 22
-+	#define PROPERTY_ID_GROUP_NAME    		 23
- 	#define PROPERTY_ID_NAVIGATION			 24
- 	#define PROPERTY_ID_CYCLE				 25
- 	#define PROPERTY_ID_HIDDEN_VALUE		 26
-diff --git extensions/source/propctrlr/formres.src extensions/source/propctrlr/formres.src
-index a52afa2..21a1288 100644
---- extensions/source/propctrlr/formres.src
-+++ extensions/source/propctrlr/formres.src
-@@ -230,6 +230,10 @@ String RID_STR_NAME
- {
- 	Text [ en-US ] = "Name" ;
- };
-+String RID_STR_GROUP_NAME
-+{
-+	Text [ en-US ] = "Group name" ;
-+};
- String RID_STR_TABINDEX
- {
- 	Text [ en-US ] = "Tab order" ;
-diff --git extensions/source/propctrlr/formresid.hrc extensions/source/propctrlr/formresid.hrc
-index a889086..aed2207 100644
---- extensions/source/propctrlr/formresid.hrc
-+++ extensions/source/propctrlr/formresid.hrc
-@@ -150,6 +150,7 @@
- #define RID_STR_CURSOR_TYPE					( RID_FORMBROWSER_START + 121 )
- #define RID_STR_ENABLE_VISIBLE					( RID_FORMBROWSER_START + 122 )
- #define RID_STR_WHEEL_BEHAVIOR              ( RID_FORMBROWSER_START + 123 )
-+#define RID_STR_GROUP_NAME                  ( RID_FORMBROWSER_START + 124 )
-     // FREE
-     // FREE
-     // FREE
-diff --git extensions/source/propctrlr/formstrings.hxx extensions/source/propctrlr/formstrings.hxx
-index 606184e..fad672d 100644
---- extensions/source/propctrlr/formstrings.hxx
-+++ extensions/source/propctrlr/formstrings.hxx
-@@ -50,6 +50,7 @@ namespace pcr
- 	PCR_CONSTASCII_STRING( PROPERTY_TABINDEX,				"TabIndex");
- 	PCR_CONSTASCII_STRING( PROPERTY_TAG,					"Tag");
- 	PCR_CONSTASCII_STRING( PROPERTY_NAME,					"Name");
-+	PCR_CONSTASCII_STRING( PROPERTY_GROUP_NAME,             "GroupName");
- 	PCR_CONSTASCII_STRING( PROPERTY_VALUE,					"Value");
- 	PCR_CONSTASCII_STRING( PROPERTY_TEXT,					"Text");
- 	PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION,				"NavigationBarMode");
---- extensions/util/hidother.src
-+++ extensions/util/hidother.src
-@@ -307,6 +307,7 @@ hidspecial HID_CHECK_FOR_UPD_DESCRIPTION        { HelpId = HID_CHECK_FOR_UPD_DES
- hidspecial HID_PROP_FONT                        { HelpId = HID_PROP_FONT; }
- hidspecial HID_PROP_FORMATKEY                   { HelpId = HID_PROP_FORMATKEY; }
- hidspecial HID_PROP_GROUPBOX                    { HelpId = HID_PROP_GROUPBOX; }
-+hidspecial HID_PROP_GROUP_NAME                  { HelpId = HID_PROP_GROUP_NAME; }
- hidspecial HID_PROP_HEIGHT                      { HelpId = HID_PROP_HEIGHT; }
- hidspecial HID_PROP_HELPTEXT                    { HelpId = HID_PROP_HELPTEXT; }
- hidspecial HID_PROP_HELPURL                     { HelpId = HID_PROP_HELPURL; }
-diff --git forms/source/component/GroupManager.cxx forms/source/component/GroupManager.cxx
-index d831a82..f5a9ecb 100644
---- forms/source/component/GroupManager.cxx
-+++ forms/source/component/GroupManager.cxx
-@@ -127,14 +127,13 @@ OGroupComp::OGroupComp(const Reference<XPropertySet>& rxSet, sal_Int32 nInsertPo
-     ,m_xControlModel(rxSet,UNO_QUERY)
-     ,m_nPos( nInsertPos )
-     ,m_nTabIndex(0)
-+    ,m_aName( OGroupManager::GetGroupName( rxSet ) )
- {
- 	if (m_xComponent.is())
- 	{
- 		if (hasProperty( PROPERTY_TABINDEX, m_xComponent ) )
- 			// Indices kleiner 0 werden wie 0 behandelt
- 			m_nTabIndex = Max(getINT16(m_xComponent->getPropertyValue( PROPERTY_TABINDEX )) , sal_Int16(0));
--
--		m_xComponent->getPropertyValue( PROPERTY_NAME ) >>= m_aName;
- 	}
- }
- 
-@@ -321,7 +320,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
- 		aFind->second.RemoveComponent( _xSet );
- 
- 		// Wenn Anzahl der Gruppenelemente == 1 ist, Gruppe deaktivieren
--		if ( aFind->second.Count() == 1 )
-+		sal_Int32 nCount = aFind->second.Count();
-+		if ( nCount == 1 || nCount == 0 )
- 		{
- 			OActiveGroups::iterator aActiveFind = ::std::find(
-                 m_aActiveGroupMap.begin(),
-@@ -332,7 +332,7 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
-             {
-                 // the group is active. Deactivate it if the remaining component
-                 // is *no* radio button
--                if ( !isRadioButton( aFind->second.GetObject( 0 ) ) )
-+                if ( nCount == 0 || !isRadioButton( aFind->second.GetObject( 0 ) ) )
- 				    m_aActiveGroupMap.erase( aActiveFind );
-             }
- 		}
-@@ -341,6 +341,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
- 
- 	// Bei Component als PropertyChangeListener abmelden
- 	_xSet->removePropertyChangeListener( PROPERTY_NAME, this );
-+	if (hasProperty(PROPERTY_GROUP_NAME, _xSet))
-+		_xSet->removePropertyChangeListener( PROPERTY_GROUP_NAME, this );
- 	if (hasProperty(PROPERTY_TABINDEX, _xSet))
- 		_xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this );
- }
-@@ -351,10 +353,23 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro
- 
- 	// Component aus Gruppe entfernen
- 	::rtl::OUString		sGroupName;
--	if (evt.PropertyName == PROPERTY_NAME)
-+	if (hasProperty( PROPERTY_GROUP_NAME, xSet ))
-+		xSet->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName;
-+	if (evt.PropertyName == PROPERTY_NAME) {
-+		if (sGroupName.getLength() > 0)
-+			return; // group hasn't changed; ignore this name change.
-+		// no GroupName; use Name as GroupNme
-+		evt.OldValue >>= sGroupName;
-+	}
-+	else if (evt.PropertyName == PROPERTY_GROUP_NAME) {
- 		evt.OldValue >>= sGroupName;
-+		if (sGroupName.getLength() == 0) {
-+			// No prior GroupName; fallback to Nme
-+			xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
-+		}
-+	}
- 	else
--		xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
-+		sGroupName = GetGroupName( xSet );
- 
- 	removeFromGroupMap(sGroupName,xSet);
- 
-@@ -437,8 +452,7 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
- 	m_pCompGroup->InsertComponent( xSet );
- 
- 	// Component in Gruppe aufnehmen
--	::rtl::OUString sGroupName;
--	xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
-+	::rtl::OUString sGroupName( GetGroupName( xSet ) );
- 
- 	OGroupArr::iterator aFind = m_aGroupArr.find(sGroupName);
- 
-@@ -476,6 +490,8 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
- 
- 	// Bei Component als PropertyChangeListener anmelden
- 	xSet->addPropertyChangeListener( PROPERTY_NAME, this );
-+	if (hasProperty(PROPERTY_GROUP_NAME, xSet))
-+		xSet->addPropertyChangeListener( PROPERTY_GROUP_NAME, this );
- 
-     // Tabindex muss nicht jeder unterstuetzen
- 	if (hasProperty(PROPERTY_TABINDEX, xSet))
-@@ -492,12 +508,26 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet )
- 		return;
- 
- 	// Component aus Gruppe entfernen
--	::rtl::OUString		sGroupName;
--	xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
-+	::rtl::OUString		sGroupName( GetGroupName( xSet ) );
- 
- 	removeFromGroupMap(sGroupName,xSet);
- }
- 
-+::rtl::OUString OGroupManager::GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent )
-+{
-+    if (!xComponent.is())
-+        return ::rtl::OUString();
-+    ::rtl::OUString sGroupName;
-+    if (hasProperty( PROPERTY_GROUP_NAME, xComponent )) {
-+        xComponent->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName;
-+        if (sGroupName.getLength() == 0)
-+            xComponent->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
-+    }
-+    else
-+        xComponent->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
-+    return sGroupName;
-+}
-+
- //.........................................................................
- }	// namespace frm
- //.........................................................................
-diff --git forms/source/component/GroupManager.hxx forms/source/component/GroupManager.hxx
-index bc5a059..b139998 100644
---- forms/source/component/GroupManager.hxx
-+++ forms/source/component/GroupManager.hxx
-@@ -220,6 +220,8 @@ public:
- 	void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, ::rtl::OUString& Name);
- 	void getGroupByName(const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup);
- 	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > getControlModels();
-+
-+	static ::rtl::OUString GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent );
- };
- 
- 
-diff --git forms/source/component/RadioButton.cxx forms/source/component/RadioButton.cxx
-index b77979b..d9674c5 100644
---- forms/source/component/RadioButton.cxx
-+++ forms/source/component/RadioButton.cxx
-@@ -31,6 +31,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_forms.hxx"
- #include "RadioButton.hxx"
-+#include "GroupManager.hxx"
- #include "property.hxx"
- #ifndef _FRM_PROPERTY_HRC_
- #include "property.hrc"
-@@ -122,6 +123,7 @@ ORadioButtonModel::ORadioButtonModel(const Reference<XMultiServiceFactory>& _rxF
- 	m_nClassId = FormComponentType::RADIOBUTTON;
- 	m_aLabelServiceName = FRM_SUN_COMPONENT_GROUPBOX;
-     initValueProperty( PROPERTY_STATE, PROPERTY_ID_STATE );
-+	startAggregatePropertyListening( PROPERTY_GROUP_NAME );
- }
- 
- //------------------------------------------------------------------
-@@ -169,7 +171,11 @@ StringSequence SAL_CALL	ORadioButtonModel::getSupportedServiceNames() throw(Runt
- void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, const Any& rValue)
- {
- 	// mein Name
--	::rtl::OUString sMyName(m_aName);
-+    ::rtl::OUString sMyGroup;
-+    if (hasProperty(PROPERTY_GROUP_NAME, this))
-+        this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sMyGroup;
-+    if (sMyGroup.getLength() == 0)
-+        sMyGroup = m_aName;
- 
- 	// meine Siblings durchiterieren
- 	Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
-@@ -177,8 +183,9 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons
- 	{
- 		Reference<XPropertySet> xMyProps;
- 		query_interface(static_cast<XWeak*>(this), xMyProps);
--		::rtl::OUString	sCurrentName;
--		for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i)
-+		::rtl::OUString	sCurrentGroup;
-+		sal_Int32 nNumSiblings = xIndexAccess->getCount();
-+		for (sal_Int32 i=0; i<nNumSiblings; ++i)
- 		{
- 			Reference<XPropertySet>	xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
- 			if (!xSiblingProperties.is())
-@@ -195,8 +202,8 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons
- 				continue;
- 
- 			// das 'zur selben Gruppe gehoeren' wird am Namen festgemacht
--			xSiblingProperties->getPropertyValue(PROPERTY_NAME) >>= sCurrentName;
--			if (sCurrentName == sMyName)
-+			sCurrentGroup = OGroupManager::GetGroupName( xSiblingProperties );
-+			if (sCurrentGroup == sMyGroup)
- 				xSiblingProperties->setPropertyValue(rPropName, rValue);
- 		}
- 	}
-@@ -223,40 +230,7 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
- 	// die andere Richtung : wenn sich mein Name aendert ...
- 	if (nHandle == PROPERTY_ID_NAME)
- 	{
--		// ... muss ich testen, ob ich Siblings mit dem selben Namen habe, damit ich deren ControlSource uebernehmen kann
--		Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
--		if (xIndexAccess.is())
--		{
--			::rtl::OUString			sName;
--			::rtl::OUString			sControlSource;
--
--			Reference<XPropertySet> xMyProps;
--			query_interface(static_cast<XWeak*>(this), xMyProps);
--			for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i)
--			{
--				Reference<XPropertySet>	xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
--				if (!xSiblingProperties.is())
--					continue;
--
--				if (xMyProps == xSiblingProperties)
--					// nur wenn ich nicht mich selber gefunden habe
--					continue;
--
--				sal_Int16 nType = 0;
--				xSiblingProperties->getPropertyValue(PROPERTY_CLASSID) >>= nType;
--				if (nType != FormComponentType::RADIOBUTTON)
--					// nur Radio-Buttons
--					continue;
--
--				xSiblingProperties->getPropertyValue(PROPERTY_NAME) >>= sName;
--				// Control, das zur gleichen Gruppe gehoert ?
--				if (rValue == sName)
--				{
--					setPropertyValue(PROPERTY_CONTROLSOURCE, xSiblingProperties->getPropertyValue(PROPERTY_CONTROLSOURCE));
--					break;
--				}
--			}
--		}
-+        setControlSource();
- 	}
- 
- 	if (nHandle == PROPERTY_ID_DEFAULTCHECKED)
-@@ -274,6 +248,52 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
- 	}
- }
- 
-+void ORadioButtonModel::setControlSource()
-+{
-+    Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
-+    if (xIndexAccess.is())
-+    {
-+        ::rtl::OUString sName, sGroupName;
-+
-+        if (hasProperty(PROPERTY_GROUP_NAME, this))
-+            this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sGroupName;
-+        this->getPropertyValue(PROPERTY_NAME) >>= sName;
-+
-+        Reference<XPropertySet> xMyProps;
-+        query_interface(static_cast<XWeak*>(this), xMyProps);
-+        for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i)
-+        {
-+            Reference<XPropertySet>	xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
-+            if (!xSiblingProperties.is())
-+                continue;
-+
-+            if (xMyProps == xSiblingProperties)
-+                // nur wenn ich nicht mich selber gefunden habe
-+                continue;
-+
-+            sal_Int16 nType = 0;
-+            xSiblingProperties->getPropertyValue(PROPERTY_CLASSID) >>= nType;
-+            if (nType != FormComponentType::RADIOBUTTON)
-+                // nur Radio-Buttons
-+                continue;
-+
-+            ::rtl::OUString sSiblingName, sSiblingGroupName;
-+            if (hasProperty(PROPERTY_GROUP_NAME, xSiblingProperties))
-+                xSiblingProperties->getPropertyValue(PROPERTY_GROUP_NAME) >>= sSiblingGroupName;
-+            xSiblingProperties->getPropertyValue(PROPERTY_NAME) >>= sSiblingName;
-+
-+            if ((sGroupName.getLength() == 0 && sSiblingGroupName.getLength() == 0 &&   // (no group name
-+                 sName == sSiblingName) ||                                              //  names match) or
-+                (sGroupName.getLength() != 0 && sSiblingGroupName.getLength() != 0 &&   // (have group name
-+                 sGroupName == sSiblingGroupName))                                      //  they match)
-+            {
-+                setPropertyValue(PROPERTY_CONTROLSOURCE, xSiblingProperties->getPropertyValue(PROPERTY_CONTROLSOURCE));
-+                break;
-+            }
-+        }
-+    }
-+}
-+
- //------------------------------------------------------------------------------
- void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const
- {
-@@ -363,6 +383,13 @@ void ORadioButtonModel::_propertyChanged(const PropertyChangeEvent& _rEvent) thr
- 			SetSiblingPropsTo( PROPERTY_STATE, aZero );
- 		}
- 	}
-+    else if ( _rEvent.PropertyName.equals( PROPERTY_GROUP_NAME ) )
-+    {
-+        setControlSource();
-+        // Can't call OReferenceValueComponent::_propertyChanged(), as it
-+        // doesn't know what to do with the GroupName property.
-+        return;
-+    }
- 
-     OReferenceValueComponent::_propertyChanged( _rEvent );
- }
-diff --git forms/source/component/RadioButton.hxx forms/source/component/RadioButton.hxx
-index c193f8a..e1a7e7e 100644
---- forms/source/component/RadioButton.hxx
-+++ forms/source/component/RadioButton.hxx
-@@ -87,6 +87,8 @@ private:
-             our mutex is aquired exactly once
-     */
-     void    setNewAggregateState( const ::com::sun::star::uno::Any& _rValue );
-+
-+    void setControlSource();
- };
- 
- //==================================================================
-diff --git forms/source/inc/frm_strings.hxx forms/source/inc/frm_strings.hxx
-index 864160f..4b2efb9 100644
---- forms/source/inc/frm_strings.hxx
-+++ forms/source/inc/frm_strings.hxx
-@@ -100,6 +100,7 @@ namespace frm
-     FORMS_CONSTASCII_STRING( PROPERTY_TABINDEX,                 "TabIndex" );
-     FORMS_CONSTASCII_STRING( PROPERTY_TAG,                      "Tag" );
-     FORMS_CONSTASCII_STRING( PROPERTY_NAME,                     "Name" );
-+    FORMS_CONSTASCII_STRING( PROPERTY_GROUP_NAME,               "GroupName" );
-     FORMS_CONSTASCII_STRING( PROPERTY_CLASSID,                  "ClassId" );
-     FORMS_CONSTASCII_STRING( PROPERTY_FETCHSIZE,                "FetchSize" );
-     FORMS_CONSTASCII_STRING( PROPERTY_VALUE,                    "Value" );
-diff --git forms/source/inc/property.hrc forms/source/inc/property.hrc
-index d5e2476..20bdaf7 100644
---- forms/source/inc/property.hrc
-+++ forms/source/inc/property.hrc
-@@ -63,7 +63,7 @@ namespace frm
- #define PROPERTY_ID_INPUT_REQUIRED      (PROPERTY_ID_START + 19)
- #define PROPERTY_ID_WRITING_MODE        (PROPERTY_ID_START + 20)
- #define PROPERTY_ID_CONTEXT_WRITING_MODE    (PROPERTY_ID_START + 21)
--    // free
-+#define PROPERTY_ID_GROUP_NAME          (PROPERTY_ID_START + 22)
-     // free
-     // free
-     // free
-diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index fab7d46..37b720b 100644
---- svx/source/msfilter/msocximex.cxx
-+++ svx/source/msfilter/msocximex.cxx
-@@ -1709,6 +1709,12 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
-     aTmp <<= ::com::sun::star::style::VerticalAlignment_MIDDLE;
-     rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp );
- 
-+    if ( pGroupName )
-+    {
-+        aTmp <<= lclCreateOUString( pGroupName, nGroupNameLen );
-+        rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
-+    }
-+
- 	aFontData.Import(rPropSet);
- 	return sal_True;
- }
-diff --git toolkit/inc/toolkit/controls/dialogcontrol.hxx toolkit/inc/toolkit/controls/dialogcontrol.hxx
-index 1e65e6f..1301975 100644
---- toolkit/inc/toolkit/controls/dialogcontrol.hxx
-+++ toolkit/inc/toolkit/controls/dialogcontrol.hxx
-@@ -51,6 +51,7 @@
- #include <cppuhelper/propshlp.hxx>
- #include <cppuhelper/basemutex.hxx>
- #include <list>
-+#include <map>
- 
- //	----------------------------------------------------
- //	class UnoControlDialogModel
-@@ -182,6 +183,14 @@ protected:
- 	void implNotifyTabModelChange( const ::rtl::OUString& _rAccessor );
- 
- 	void implUpdateGroupStructure();
-+private:
-+    void AddRadioButtonToGroup (
-+            const ::com::sun::star::uno::Reference< XControlModel >& rControlModel,
-+            const ::rtl::OUString& rPropertyName,
-+            ::std::map< ::rtl::OUString, ModelGroup >& pNamedGroups,
-+            ModelGroup*& rpCurrentGroup );
-+    void AddRadioButtonGroup (
-+            ::std::map< ::rtl::OUString, ModelGroup >& pNamedGroups );
- };
- 
- //	----------------------------------------------------
---- toolkit/inc/toolkit/helper/property.hxx
-+++ toolkit/inc/toolkit/helper/property.hxx
-@@ -192,6 +192,7 @@ namespace rtl {
- #define BASEPROPERTY_GRID_COLUMNMODEL               143
- #define BASEPROPERTY_GRID_SELECTIONMODE             144
- #define BASEPROPERTY_ENABLEVISIBLE                  145  // sal_Bool
-+#define BASEPROPERTY_GROUPNAME                      146  // ::rtl::OUString
- 
- 
- // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
-diff --git toolkit/source/awt/vclxwindows.cxx toolkit/source/awt/vclxwindows.cxx
-index bfa828b..206280b 100644
---- toolkit/source/awt/vclxwindows.cxx
-+++ toolkit/source/awt/vclxwindows.cxx
-@@ -1105,6 +1105,7 @@ void VCLXRadioButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
-                      BASEPROPERTY_VERTICALALIGN,
-                      BASEPROPERTY_WRITING_MODE,
-                      BASEPROPERTY_CONTEXT_WRITING_MODE,
-+                     BASEPROPERTY_GROUPNAME,
-                      0);
-     VCLXImageConsumer::ImplGetPropertyIds( rIds );
- }
-diff --git toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/dialogcontrol.cxx
-index 0aebfb8..3fd5723 100644
---- toolkit/source/controls/dialogcontrol.cxx
-+++ toolkit/source/controls/dialogcontrol.cxx
-@@ -142,6 +142,18 @@ namespace
-         return xGraphic;
-     }
- 
-+    static ::rtl::OUString lcl_GetStringProperty( const ::rtl::OUString& sProperty, const Reference< XPropertySet >& xSet )
-+    {
-+        ::rtl::OUString sValue;
-+        Reference< XPropertySetInfo > xPSI;
-+        if (xSet.is() && (xPSI = xSet->getPropertySetInfo()).is() && 
-+                xPSI->hasPropertyByName( sProperty ) )
-+        {
-+            xSet->getPropertyValue( sProperty ) >>= sValue;
-+        }
-+        return sValue;
-+    }
-+
- }
- 
- // ----------------------------------------------------------------------------
-@@ -897,6 +909,63 @@ void UnoControlDialogModel::implNotifyTabModelChange( const ::rtl::OUString& _rA
- 	}
- }
- 
-+// ----------------------------------------------------------------------------
-+void UnoControlDialogModel::AddRadioButtonGroup ( 
-+        ::std::map< ::rtl::OUString, ModelGroup >& rNamedGroups )
-+{
-+    if ( rNamedGroups.size() == 0 )
-+        return;
-+
-+    size_t nGroups = maGroups.size();
-+    maGroups.reserve( nGroups + rNamedGroups.size() );
-+    ::std::map< ::rtl::OUString, ModelGroup >::const_iterator i = rNamedGroups.begin(), e = rNamedGroups.end();
-+    for( ; i != e; ++i)
-+    {
-+            maGroups.push_back( i->second );
-+    }
-+
-+    rNamedGroups.clear();
-+}
-+
-+void UnoControlDialogModel::AddRadioButtonToGroup ( 
-+        const Reference< XControlModel >& rControlModel,
-+        const ::rtl::OUString& rPropertyName,
-+        ::std::map< ::rtl::OUString, ModelGroup >& rNamedGroups,
-+        ModelGroup*& rpCurrentGroup )
-+{
-+    Reference< XPropertySet > xCurProps( rControlModel, UNO_QUERY );
-+    ::rtl::OUString sGroup = lcl_GetStringProperty( rPropertyName, xCurProps );
-+    const sal_Int32 nControlModelStep = lcl_getDialogStep( rControlModel );
-+
-+    if ( sGroup.getLength() == 0 )
-+    {
-+        // Create a new group if:
-+        if ( maGroups.size() == 0 ||                // no groups
-+                rpCurrentGroup == NULL ||           // previous group was closed
-+                (nControlModelStep != 0 &&          // control step matches current group
-+                 maGroups.back().size() > 0 &&      //  (group 0 == display everywhere)
-+                 nControlModelStep != lcl_getDialogStep( maGroups.back().back() ) ) )
-+        {
-+            size_t nGroups = maGroups.size();
-+            maGroups.resize( nGroups + 1 );
-+        }
-+        rpCurrentGroup = &maGroups.back();
-+    }
-+    else
-+    {
-+        // Different steps get different sets of named groups
-+        if ( rNamedGroups.size() > 0 &&
-+                rNamedGroups.begin()->second.size() > 0 )
-+        {
-+            const sal_Int32 nPrevStep = lcl_getDialogStep( rNamedGroups.begin()->second.front() );
-+            if ( nControlModelStep != nPrevStep )
-+                AddRadioButtonGroup( rNamedGroups );
-+        }
-+
-+        rpCurrentGroup = &rNamedGroups[ sGroup ];
-+    }
-+    rpCurrentGroup->push_back( rControlModel );
-+}
- 
- // ----------------------------------------------------------------------------
- void UnoControlDialogModel::implUpdateGroupStructure()
-@@ -921,10 +990,13 @@ void UnoControlDialogModel::implUpdateGroupStructure()
- 
- 	GroupingMachineState eState = eLookingForGroup;		// the current state of our machine
- 	Reference< XServiceInfo > xModelSI;					// for checking for a radion button
--	AllGroups::iterator aCurrentGroup = maGroups.end();	// the group which we're currently building
--	sal_Int32	nCurrentGroupStep = -1;					// the step which all controls of the current group belong to
-+	ModelGroup* aCurrentGroup = NULL;                   // the group which we're currently building
- 	sal_Bool	bIsRadioButton;							// is it a radio button?
- 
-+    const ::rtl::OUString GROUP_NAME( RTL_CONSTASCII_USTRINGPARAM( "GroupName" ) );
-+
-+    ::std::map< ::rtl::OUString, ModelGroup > aNamedGroups;
-+
- #if OSL_DEBUG_LEVEL > 1
- 	::std::vector< ::rtl::OUString > aCurrentGroupLabels;
- #endif
-@@ -945,14 +1017,8 @@ void UnoControlDialogModel::implUpdateGroupStructure()
- 				// the current model is a radio button
- 				// -> we found the beginning of a new group
- 				// create the place for this group
--				size_t nGroups = maGroups.size();
--				maGroups.resize( nGroups + 1 );
--				aCurrentGroup = maGroups.begin() + nGroups;
--				// and add the (only, til now) member
--				aCurrentGroup->push_back( *pControlModels );
--
--				// get the step which all controls of this group now have to belong to
--				nCurrentGroupStep = lcl_getDialogStep( *pControlModels );
-+                AddRadioButtonToGroup( *pControlModels, GROUP_NAME, aNamedGroups, aCurrentGroup );
-+
- 				// new state: looking for further members
- 				eState = eExpandingGroup;
- 
-@@ -970,7 +1036,7 @@ void UnoControlDialogModel::implUpdateGroupStructure()
- 			{
- 				if ( !bIsRadioButton )
- 				{	// no radio button -> the group is done
--					aCurrentGroup = maGroups.end();
-+					aCurrentGroup = NULL;
- 					eState = eLookingForGroup;
- #if OSL_DEBUG_LEVEL > 1
- 					aCurrentGroupLabels.clear();
-@@ -978,48 +1044,9 @@ void UnoControlDialogModel::implUpdateGroupStructure()
- 					continue;
- 				}
- 
--				// it is a radio button - is it on the proper page?
--				const sal_Int32 nThisModelStep = lcl_getDialogStep( *pControlModels );
--				if	(	( nThisModelStep == nCurrentGroupStep )	// the current button is on the same dialog page
--					||	( 0 == nThisModelStep )					// the current button appears on all pages
--					)
--				{
--					// -> it belongs to the same group
--					aCurrentGroup->push_back( *pControlModels );
--					// state still is eExpandingGroup - we're looking for further elements
--					eState = eExpandingGroup;
-+                AddRadioButtonToGroup( *pControlModels, GROUP_NAME, aNamedGroups, aCurrentGroup );
- 
- #if OSL_DEBUG_LEVEL > 1
--					Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
--					::rtl::OUString sLabel;
--					if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
--						xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
--					aCurrentGroupLabels.push_back( sLabel );
--#endif
--					continue;
--				}
--
--				// it's a radio button, but on a different page
--				// -> we open a new group for it
--
--				// close the old group
--				aCurrentGroup = maGroups.end();
--#if OSL_DEBUG_LEVEL > 1
--				aCurrentGroupLabels.clear();
--#endif
--
--				// open a new group
--				size_t nGroups = maGroups.size();
--				maGroups.resize( nGroups + 1 );
--				aCurrentGroup = maGroups.begin() + nGroups;
--				// and add the (only, til now) member
--				aCurrentGroup->push_back( *pControlModels );
--
--				nCurrentGroupStep = nThisModelStep;
--
--				// state is the same: we still are looking for further elements of the current group
--				eState = eExpandingGroup;
--#if OSL_DEBUG_LEVEL > 1
- 				Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
- 				::rtl::OUString sLabel;
- 				if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
-@@ -1031,6 +1058,7 @@ void UnoControlDialogModel::implUpdateGroupStructure()
- 		}
- 	}
- 
-+    AddRadioButtonGroup( aNamedGroups );
- 	mbGroupsUpToDate = sal_True;
- }
- 
-diff --git toolkit/source/controls/unocontrolmodel.cxx toolkit/source/controls/unocontrolmodel.cxx
-index 33e7b7b..453be84 100644
---- toolkit/source/controls/unocontrolmodel.cxx
-+++ toolkit/source/controls/unocontrolmodel.cxx
-@@ -348,6 +348,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
-             case BASEPROPERTY_ENABLEVISIBLE:
-             case BASEPROPERTY_DECORATION:           aDefault <<= (sal_Bool) sal_True; break;
- 
-+            case BASEPROPERTY_GROUPNAME:
-             case BASEPROPERTY_HELPTEXT:
-             case BASEPROPERTY_HELPURL:
- 	        case BASEPROPERTY_IMAGEURL:
-diff --git toolkit/source/helper/property.cxx toolkit/source/helper/property.cxx
-index 0a26448..13102ff 100644
---- toolkit/source/helper/property.cxx
-+++ toolkit/source/helper/property.cxx
-@@ -180,6 +180,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
-             DECL_PROP_3     ( "FormatsSupplier",        FORMATSSUPPLIER,    Reference< ::com::sun::star::util::XNumberFormatsSupplier >, BOUND, MAYBEVOID, TRANSIENT ),
- 
-             DECL_PROP_2     ( "Graphic",                GRAPHIC,            Reference< ::com::sun::star::graphic::XGraphic >, BOUND, TRANSIENT ),
-+            DECL_PROP_2     ( "GroupName",              GROUPNAME,          ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
-             DECL_PROP_2     ( "HelpText",               HELPTEXT,           ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
-             DECL_PROP_2     ( "HelpURL",                HELPURL,            ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
-             DECL_PROP_2     ( "HideInactiveSelection",  HIDEINACTIVESELECTION, bool,            BOUND, MAYBEDEFAULT ),
-diff --git xmloff/inc/xmlnmspe.hxx xmloff/inc/xmlnmspe.hxx
-index 060a5a5..88516fe 100644
---- xmloff/inc/xmlnmspe.hxx
-+++ xmloff/inc/xmlnmspe.hxx
-@@ -95,6 +95,7 @@ XML_OLD_NAMESPACE( META,	6U )
- 
- // experimental namespaces
- XML_NAMESPACE( FIELD,			100U )
-+XML_NAMESPACE( FORMX,           101U )      // form interop extensions
- 
- 
- #endif	//  _XMLOFF_XMLNMSPE_HXX
-diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
-index 11116de..e710a61 100644
---- xmloff/inc/xmloff/xmltoken.hxx
-+++ xmloff/inc/xmloff/xmltoken.hxx
-@@ -142,6 +142,10 @@ namespace xmloff { namespace token {
-         XML_NP_GRDDL,
-         XML_N_GRDDL,
- 
-+        // jonp: 2008-09-24 Excel Interop
-+        XML_NP_FORMX,
-+        XML_N_FORMX,
-+
-         // units
-         XML_UNIT_MM,
-         XML_UNIT_M,
-diff --git xmloff/source/core/xmlexp.cxx xmloff/source/core/xmlexp.cxx
-index 694df43..1dc010d 100644
---- xmloff/source/core/xmlexp.cxx
-+++ xmloff/source/core/xmlexp.cxx
-@@ -314,6 +314,7 @@ void SvXMLExport::_InitCtor()
- 		mpNamespaceMap->Add( GetXMLToken(XML_NP_XSD), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD );
- 		mpNamespaceMap->Add( GetXMLToken(XML_NP_XSI), GetXMLToken(XML_N_XSI), XML_NAMESPACE_XSI );
- 		mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
-+		mpNamespaceMap->Add( GetXMLToken(XML_NP_FORMX), GetXMLToken(XML_N_FORMX), XML_NAMESPACE_FORMX );
- 	}
-     // RDFa: needed for content and header/footer styles
-     if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
-diff --git xmloff/source/core/xmlimp.cxx xmloff/source/core/xmlimp.cxx
-index e3b116c..a827e5b 100644
---- xmloff/source/core/xmlimp.cxx
-+++ xmloff/source/core/xmlimp.cxx
-@@ -108,6 +108,7 @@ sal_Char __READONLY_DATA sXML_np__script[] = "_script";
- sal_Char __READONLY_DATA sXML_np__config[] = "_config";
- sal_Char __READONLY_DATA sXML_np__db[] = "_db";
- sal_Char __READONLY_DATA sXML_np__xforms[] = "_xforms";
-+sal_Char __READONLY_DATA sXML_np__formx[] = "_formx";
- sal_Char __READONLY_DATA sXML_np__xsd[] = "_xsd";
- sal_Char __READONLY_DATA sXML_np__xsi[] = "_xsi";
- sal_Char __READONLY_DATA sXML_np__field[] = "_field";
-@@ -283,6 +284,9 @@ void SvXMLImport::_InitCtor()
-         mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xforms) ),
-                             GetXMLToken(XML_N_XFORMS_1_0),
-                             XML_NAMESPACE_XFORMS );
-+        mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__formx) ),
-+                            GetXMLToken( XML_N_FORMX ),
-+                            XML_NAMESPACE_FORMX );
-         mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xsd) ),
-                             GetXMLToken(XML_N_XSD),
-                             XML_NAMESPACE_XSD );
-diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
-index 8d66db2..24faf3d 100644
---- xmloff/source/core/xmltoken.cxx
-+++ xmloff/source/core/xmltoken.cxx
-@@ -150,6 +150,10 @@ namespace xmloff { namespace token {
-         TOKEN( "grddl",                                 XML_NP_GRDDL ),
-         TOKEN( "http://www.w3.org/2003/g/data-view#",   XML_N_GRDDL ),
- 
-+        // jonp: 2008-09-24 Excel Interop
-+        TOKEN( "formx",                           XML_NP_FORMX ),
-+        TOKEN( "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0", XML_N_FORMX ),
-+
-         // units
-         TOKEN( "mm",                              XML_UNIT_MM ),
-         TOKEN( "m",                               XML_UNIT_M ),
-diff --git xmloff/source/forms/elementexport.cxx xmloff/source/forms/elementexport.cxx
-index 357b434..cb859fb 100644
---- xmloff/source/forms/elementexport.cxx
-+++ xmloff/source/forms/elementexport.cxx
-@@ -1113,6 +1113,39 @@ namespace xmloff
- 		}
- 
- 		// ----------------------------------
-+		// the string properties
-+		{
-+			static sal_Int32 nStringPropertyAttributeIds[] =
-+			{	// attribute flags
-+				SCA_GROUP_NAME
-+			};
-+			static const ::rtl::OUString* pStringPropertyNames[] =
-+			{	// property names
-+				&PROPERTY_GROUP_NAME
-+			};
-+
-+			sal_Int32 nIdCount = sizeof( nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
-+		#if OSL_DEBUG_LEVEL > 0
-+			sal_Int32 nNameCount = sizeof( pStringPropertyNames ) / sizeof( pStringPropertyNames[0] );
-+			OSL_ENSURE( ( nIdCount == nNameCount ),
-+				"OControlExport::exportSpecialAttributes: somebody tampered with the maps (2)!" );
-+		#endif
-+			for ( i = 0; i < nIdCount; ++i )
-+				if ( nStringPropertyAttributeIds[i] & m_nIncludeSpecial )
-+				{
-+					exportStringPropertyAttribute(
-+						OAttributeMetaData::getSpecialAttributeNamespace( nStringPropertyAttributeIds[i] ),
-+						OAttributeMetaData::getSpecialAttributeName( nStringPropertyAttributeIds[i] ),
-+						*( pStringPropertyNames[i] )
-+					);
-+			#if OSL_DEBUG_LEVEL > 0
-+				//  reset the bit for later checking
-+				m_nIncludeSpecial = m_nIncludeSpecial & ~nStringPropertyAttributeIds[i];
-+			#endif
-+				}
-+		}
-+
-+		// ----------------------------------
- 		if ((SCA_MIN_VALUE | SCA_MAX_VALUE) & m_nIncludeSpecial)
- 		{
- 			// need to export the min value and the max value as attributes
-@@ -1570,6 +1603,8 @@ namespace xmloff
- 				}
-                 if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_IMAGE_POSITION ) )
-                     m_nIncludeSpecial |= SCA_IMAGE_POSITION;
-+                if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_GROUP_NAME ) )
-+                    m_nIncludeSpecial |= SCA_GROUP_NAME;
- 				m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED;
- 				m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
- 				break;
-diff --git xmloff/source/forms/formattributes.cxx xmloff/source/forms/formattributes.cxx
-index 4314711..5df31ed 100644
---- xmloff/source/forms/formattributes.cxx
-+++ xmloff/source/forms/formattributes.cxx
-@@ -195,6 +195,7 @@ namespace xmloff
- 			case SCA_MAX_VALUE:				return "max-value";
- 			case SCA_MIN_VALUE:				return "min-value";
- 			case SCA_VALIDATION:			return "validation";
-+            case SCA_GROUP_NAME:            return "group-name";
- 			case SCA_MULTI_LINE:			return "multi-line";
- 			case SCA_AUTOMATIC_COMPLETION:	return "auto-complete";
- 			case SCA_MULTIPLE: 				return "multiple";
-@@ -215,9 +216,12 @@ namespace xmloff
- 	}
- 
- 	//---------------------------------------------------------------------
--	sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 /*_nId*/)
-+	sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 _nId)
- 	{
--		// nothing special here
-+        switch( _nId )
-+        {
-+            case SCA_GROUP_NAME:            return XML_NAMESPACE_FORMX;
-+        }
- 		return XML_NAMESPACE_FORM;
- 	}
- 
-diff --git xmloff/source/forms/formattributes.hxx xmloff/source/forms/formattributes.hxx
-index 50bad1b..ef6e7eb 100644
---- xmloff/source/forms/formattributes.hxx
-+++ xmloff/source/forms/formattributes.hxx
-@@ -126,6 +126,7 @@ namespace xmloff
- 	#define SCA_MAX_VALUE				0x00000002
- 	#define SCA_MIN_VALUE				0x00000004
- 	#define SCA_VALIDATION				0x00000008
-+    #define SCA_GROUP_NAME              0x00000010
- 	#define SCA_MULTI_LINE				0x00000020
- 	#define SCA_AUTOMATIC_COMPLETION	0x00000080
- 	#define SCA_MULTIPLE				0x00000100
-diff --git xmloff/source/forms/layerimport.cxx xmloff/source/forms/layerimport.cxx
-index 4381ddd..cf73233 100644
---- xmloff/source/forms/layerimport.cxx
-+++ xmloff/source/forms/layerimport.cxx
-@@ -97,6 +97,8 @@ namespace xmloff
- 		m_aAttributeMetaData.addStringProperty(
- 			OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), PROPERTY_NAME);
- 		m_aAttributeMetaData.addStringProperty(
-+			OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), PROPERTY_GROUP_NAME);
-+		m_aAttributeMetaData.addStringProperty(
- 			OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), PROPERTY_IMAGEURL);
- 		m_aAttributeMetaData.addStringProperty(
- 			OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), PROPERTY_LABEL);
-diff --git xmloff/source/forms/strings.hxx xmloff/source/forms/strings.hxx
-index 5b992ef..b067c7b 100644
---- xmloff/source/forms/strings.hxx
-+++ xmloff/source/forms/strings.hxx
-@@ -207,6 +207,7 @@ namespace xmloff
-     XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION,     "ImagePosition");
-     XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_ALIGN,        "ImageAlign");
-     XMLFORM_CONSTASCII_STRING( PROPERTY_SCALE_IMAGE,        "ScaleImage");
-+    XMLFORM_CONSTASCII_STRING( PROPERTY_GROUP_NAME,         "GroupName");
- 
-     XMLFORM_CONSTASCII_STRING( PROPERTY_BOUND_CELL,		    "BoundCell");
-     XMLFORM_CONSTASCII_STRING( PROPERTY_LIST_CELL_RANGE,    "CellRange");
diff --git a/applied_patches/0095-openldap-i105016.diff b/applied_patches/0095-openldap-i105016.diff
new file mode 100644
index 000000000..b899fab41
--- /dev/null
+++ b/applied_patches/0095-openldap-i105016.diff
@@ -0,0 +1,45 @@
+Index: extensions/source/config/ldap/wrapldapinclude.hxx
+===================================================================
+--- extensions/source/config/ldap/wrapldapinclude.hxx	(revision 276155)
++++ extensions/source/config/ldap/wrapldapinclude.hxx	(working copy)
+@@ -35,6 +35,12 @@
+ 
+ #ifdef WITH_OPENLDAP
+ #include <ldap.h>
++#ifndef LDAP_API
++#    define LDAP_API(rt) rt
++#endif
++#ifndef LDAP_CALL
++#    define LDAP_CALL
++#endif
+ #else
+ #ifndef LDAP_INCLUDED
+ #define LDAP_INCLUDED
+Index: extensions/source/config/ldap/ldapaccess.cxx
+===================================================================
+--- extensions/source/config/ldap/ldapaccess.cxx	(revision 276155)
++++ extensions/source/config/ldap/ldapaccess.cxx	(working copy)
+@@ -315,14 +315,17 @@
+     if ( !s_Ldap_Module )
+     {
+ #if defined(WIN) || defined(WNT)
+-        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("nsldap32v50.dll"));
++#       define LIBLDAP "nsldap32v50.dll"
+ #else
+-#ifdef WITH_OPENLDAP
+-        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap.so"));
+-#else
+-        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap50.so"));
++#   ifdef WITH_OPENLDAP
++#       define xstr(s) str(s)
++#       define str(s) #s
++#       define LIBLDAP "libldap-" xstr(LDAP_VENDOR_VERSION_MAJOR) "." xstr(LDAP_VENDOR_VERSION_MINOR) ".so." xstr(LDAP_VENDOR_VERSION_MAJOR)
++#   else
++#       define LIBLDAP "libldap50.so"
++#   endif
+ #endif
+-#endif
++        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP));
+ 
+ 		// load the dbtools library
+ 		s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);
diff --git a/applied_patches/0090-customunittext-pixel.diff b/applied_patches/0096-customunittext-pixel.diff
similarity index 100%
rename from applied_patches/0090-customunittext-pixel.diff
rename to applied_patches/0096-customunittext-pixel.diff
diff --git a/applied_patches/0096-xl-import-formradiobutton.diff b/applied_patches/0096-xl-import-formradiobutton.diff
deleted file mode 100644
index 0ce913222..000000000
--- a/applied_patches/0096-xl-import-formradiobutton.diff
+++ /dev/null
@@ -1,136 +0,0 @@
-diff --git sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx
-index b19de94..1df3f38 100644
---- sc/source/filter/excel/xiescher.cxx
-+++ sc/source/filter/excel/xiescher.cxx
-@@ -1709,22 +1709,15 @@ SdrObject* XclImpControlHelper::CreateSdrObjectFromShape(
-     return xSdrObj.release();
- }
- 
--void XclImpControlHelper::ProcessControl( const XclImpDrawObjBase& rDrawObj ) const
-+void XclImpControlHelper::ApplySheetLinkProps() const
- {
-+
-     Reference< XControlModel > xCtrlModel = XclControlHelper::GetControlModel( mxShape );
-     if( !xCtrlModel.is() )
-         return;
--
-     ScfPropertySet aPropSet( xCtrlModel );
- 
--    // #118053# #i51348# set object name at control model
--    aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rDrawObj.GetObjName() );
--
--    // control visible and printable?
--    aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() );
--    aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), rDrawObj.IsPrintable() );
--
--    // sheet links
-+   // sheet links
-     if( SfxObjectShell* pDocShell = mrRoot.GetDocShell() )
-     {
-         Reference< XMultiServiceFactory > xFactory( pDocShell->GetModel(), UNO_QUERY );
-@@ -1787,7 +1780,26 @@ void XclImpControlHelper::ProcessControl( const XclImpDrawObjBase& rDrawObj ) co
-             }
-         }
-     }
-+}
-+
-+void XclImpControlHelper::ProcessControl( const XclImpDrawObjBase& rDrawObj ) const
-+{
-+    Reference< XControlModel > xCtrlModel = XclControlHelper::GetControlModel( mxShape );
-+    if( !xCtrlModel.is() )
-+        return;
-+
-+    ApplySheetLinkProps();
-+
-+    ScfPropertySet aPropSet( xCtrlModel );
-+
-+    // #118053# #i51348# set object name at control model
-+    aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rDrawObj.GetObjName() );
-+
-+    // control visible and printable?
-+    aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() );
-+    aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), rDrawObj.IsPrintable() );
- 
-+ 
-     // virtual call for type specific processing
-     DoProcessControl( aPropSet );
- }
-@@ -2118,6 +2130,45 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const
- {
-     XclImpCheckBoxObj::DoProcessControl( rPropSet );
-     // TODO: grouping
-+    XclImpOptionButtonObj* pTbxObj = dynamic_cast< XclImpOptionButtonObj* >( GetObjectManager().FindDrawObj( XclObjId( GetScTab(), mnNextInGroup ) ).get() );
-+    if ( ( pTbxObj && pTbxObj->mnFirstInGroup ) )
-+    {
-+        // Group has terminated
-+        // traverse each RadioButton in group and 
-+        //     a) apply the groupname 
-+        //     b) propagate the linked cell from the lead radiobutton
-+        //     c) apply the correct Ref value
-+        XclImpOptionButtonObj* pLeader = pTbxObj;
-+ ;
-+        sal_Int32 nRefVal = 1;
-+        OSL_TRACE( "0x%x start group ", pLeader->GetObjId().mnObjId );
-+        do 
-+        {
-+           
-+            Reference< XControlModel > xCtrlModel = XclControlHelper::GetControlModel( pTbxObj->mxShape );
-+            if ( xCtrlModel.is() )
-+            {
-+                ScfPropertySet aProps( xCtrlModel );
-+                rtl::OUString sGroupName = rtl::OUString::valueOf( static_cast< sal_Int32 >( pLeader->GetDffShapeId() ) );
-+
-+                aProps.SetStringProperty( CREATE_OUSTRING( "GroupName" ), sGroupName );
-+                aProps.SetStringProperty( CREATE_OUSTRING( "RefValue" ), rtl::OUString::valueOf( nRefVal++ ) );
-+                if ( pLeader->HasCellLink() && !pTbxObj->HasCellLink() )
-+                {
-+                    // propagate cell link info
-+                    pTbxObj->mxCellLink.reset( new ScAddress( *pLeader->mxCellLink.get() ) );                
-+                    pTbxObj->ApplySheetLinkProps();
-+                }
-+                pTbxObj = dynamic_cast< XclImpOptionButtonObj* >( GetObjectManager().FindDrawObj( XclObjId( GetScTab(), pTbxObj->mnNextInGroup ) ).get() );
-+            }
-+            else
-+                pTbxObj = NULL;
-+        } while ( pTbxObj && !( pTbxObj->mnFirstInGroup == 1 ) );
-+    }
-+    else
-+    {
-+        // not the leader? try and find it
-+    }
- }
- 
- OUString XclImpOptionButtonObj::DoGetServiceName() const
-diff --git sc/source/filter/inc/xiescher.hxx sc/source/filter/inc/xiescher.hxx
-index 2296996..3e59515 100644
---- sc/source/filter/inc/xiescher.hxx
-+++ sc/source/filter/inc/xiescher.hxx
-@@ -498,6 +498,10 @@ protected:
-     /** Derived classes will set additional properties for the current form control. */
-     virtual void        DoProcessControl( ScfPropertySet& rPropSet ) const;
- 
-+    void ApplySheetLinkProps() const;
-+    mutable ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
-+                        mxShape;        /// The UNO wrapper of the control shape.
-+    ScfRef< ScAddress > mxCellLink;     /// Linked cell in the Calc document.
- private:
-     /** Reads a list of cell ranges from a formula at the current stream position. */
-     void                ReadRangeList( ScRangeList& rScRanges, XclImpStream& rStrm );
-@@ -506,9 +510,6 @@ private:
- 
- private:
-     const XclImpRoot&   mrRoot;         /// Not derived from XclImpRoot to allow multiple inheritance.
--    mutable ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
--                        mxShape;        /// The UNO wrapper of the control shape.
--    ScfRef< ScAddress > mxCellLink;     /// Linked cell in the Calc document.
-     ScfRef< ScRange >   mxSrcRange;     /// Source data range in the Calc document.
-     XclCtrlBindMode     meBindMode;     /// Value binding mode.
- };
-@@ -610,6 +611,7 @@ protected:
-     virtual XclTbxEventType DoGetEventType() const;
- 
- protected:
-+    void ApplyGrouping( XclImpOptionButtonObj& rLeader, sal_Int32 nRefVal );
-     sal_uInt16          mnNextInGroup;      /// Next option button in a group.
-     sal_uInt16          mnFirstInGroup;     /// 1 = Button is the first in a group.
- };
diff --git a/applied_patches/0091-customunittext-percent.diff b/applied_patches/0097-customunittext-percent.diff
similarity index 100%
rename from applied_patches/0091-customunittext-percent.diff
rename to applied_patches/0097-customunittext-percent.diff
diff --git a/applied_patches/0097-dialog-groupname-persist.diff b/applied_patches/0097-dialog-groupname-persist.diff
deleted file mode 100644
index 1ba641cde..000000000
--- a/applied_patches/0097-dialog-groupname-persist.diff
+++ /dev/null
@@ -1,374 +0,0 @@
-diff --git svx/inc/svx/msocximex.hxx svx/inc/svx/msocximex.hxx
-index 2d0827f..733304d 100644
---- svx/inc/svx/msocximex.hxx
-+++ svx/inc/svx/msocximex.hxx
-@@ -289,6 +289,7 @@ public:
-         sal_uInt16 mnTabPos;
- 	UniString sName;
- 	UniString msToolTip;
-+	UniString msParentName;
- 	OCX_FontData aFontData;
-         SfxObjectShell *pDocSh;
- protected:
-@@ -506,54 +507,8 @@ typedef std::vector<OCX_Control*>::iterator CtrlIterator;
- typedef std::vector<OCX_Control*>::const_iterator CtrlIteratorConst;
- typedef std::vector<OCX_Control*>  CtrlList;
- 
--
--
--class RBGroup
--{
--    public:
--    RBGroup():mRBGroupPos(0){}
--    RBGroup(sal_uInt16& groupPos ):mRBGroupPos(groupPos){}
--    sal_Int16 tabPos() const { return mRBGroupPos; }
--    std::vector<OCX_Control*>::size_type numControls()
--    { return mpControls.size(); }
--    std::vector<OCX_Control*>& controls() { return mpControls; }
--
--    void add(OCX_Control* pRB);
--    private:
--    sal_uInt16 mRBGroupPos;
--    std::vector<OCX_Control*> mpControls;
--};
--
--typedef ::std::hash_map < ::rtl::OUString, RBGroup*, ::rtl::OUStringHash,
--    ::std::equal_to< ::rtl::OUString > > RBGroupHash;
--typedef std::vector<RBGroup*>::iterator GroupIterator;
--
- class OCX_OptionButton;
- 
--class RBGroupManager
--{
--public:
--    RBGroupManager( String& defaultName );
--    ~RBGroupManager();
--
--    CtrlList insertGroupsIntoControlList( const CtrlList& sourceList );
--    void addRadioButton( OCX_OptionButton* pRButton );
--private:
--
--    void addSeperator( std::vector< OCX_Control* >& dest );
--    void copyList( std::vector< OCX_Control* >& src,
--                  std::vector< OCX_Control* >& dest,
--                  bool addGroupSeperator );
--
--    RBGroupHash rbGroups;
--    String mSDefaultName;
--    std::vector< RBGroup* > groupList;
--    sal_uInt16 numRadioButtons;
--};
--
--
--
--
- class OCX_ContainerControl : public OCX_Control
- {
- public:
-@@ -593,7 +548,6 @@ protected:
-             OCX_Control* pParent = NULL );
-         rtl::OUString createSubStreamName( const sal_uInt32& subStorageID );
- 
--        RBGroupManager rbGroupMgr;
-         com::sun::star::uno::Reference<
-                 com::sun::star::container::XNameContainer > mxParent;
- 	std::vector<OCX_Control*> mpControls;
-diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index 2aba883..617caf8 100644
---- svx/source/msfilter/msocximex.cxx
-+++ svx/source/msfilter/msocximex.cxx
-@@ -825,176 +825,6 @@ class ContainerRecordReaderFac
- 
- // ============================================================================
- 
--void RBGroup::add(OCX_Control* pRB)
--{
--    // The tab index for the group is calculated as
--    // the lowest tab index found in the list of RadioButtons
--    if ( pRB->mnTabPos < mRBGroupPos )
--    {
--        mRBGroupPos = pRB->mnTabPos;
--        CtrlIterator aEnd = mpControls.end();
--        for (CtrlIterator aIter = mpControls.begin(); aIter != aEnd; ++ aIter )
--        {
--            (*aIter)->mnTabPos = mRBGroupPos;
--        }
--    }
--    mpControls.push_back( pRB );
--}
--
--struct SortGroupByTabPos
--{
--    bool operator()( const RBGroup* a, const RBGroup* b )
--    {
--        return a->tabPos() < b->tabPos();
--    }
--};
--
--RBGroupManager::RBGroupManager( String& defaultName ):mSDefaultName( defaultName ),
--    numRadioButtons(0)
--{
--    groupList.reserve( 8 ); // reserve far more than we expect
--}
--
--RBGroupManager::~RBGroupManager()
--{
--    for ( GroupIterator gIter=groupList.begin(); gIter!=groupList.end(); ++gIter )
--    {
--        delete( *gIter );
--    }
--}
--
--// Loose description of the method below ( I sure there is a better way to do
--// this )
--// In order to "fake" MS grouping behavior for OptionButtons the OptionButtons
--// in the same group need to have consecutive tab indices ( regardless of the
--// imported tab indices of the RadioButtons ). Additionally if two
--// groups of OptionButtons end up having all consecutive indices they
--// will be treated as a single group by OpenOffice. In this case
--// a dummy seperator control needs to be inserted between the groups.
--//
--// This method returns a new list "destinationList" containing the controls
--// passed in "sourceList" and the OptionButtons contained in the various
--// Groups maintained by this  class.
--// Controls are ordered in the destination list by tab index.
--// Each RadioButtonGroup has a tab index associated with it.
--// ( Tab index of a RadioGroup is determined as the tab index of the
--// OptionButton control with the lowest tab index in the group )
--
--
--void RBGroupManager::addRadioButton( OCX_OptionButton* pRButton )
--{
--    if ( pRButton )
--    {
--        OUString groupName = mSDefaultName;
--        if ( pRButton->nGroupNameLen )
--        {
--            groupName =
--                lclCreateOUString(pRButton->pGroupName,
--                    pRButton->nGroupNameLen);
--        }
--        ++numRadioButtons;
--        RBGroupHash::iterator iter = rbGroups.find( groupName );
--        if ( iter != rbGroups.end() )
--        {
--            iter->second->controls().push_back( pRButton );
--        }
--        else
--        {
--            RBGroup* newGroup = new RBGroup(pRButton->mnTabPos);
--            newGroup->controls().push_back( pRButton );
--            rbGroups[ groupName ] = newGroup;
--            groupList.push_back( newGroup );
--        }
--
--    }
--}
--
--CtrlList RBGroupManager::insertGroupsIntoControlList( const CtrlList& sourceList )
--{
--    ::std::sort( groupList.begin(), groupList.end(), SortGroupByTabPos() );
--    std::vector<OCX_Control*> destinationList;
--    if ( groupList.size() )
--    {
--        destinationList.reserve( sourceList.size() + numRadioButtons );
--
--        GroupIterator groupEnd = groupList.end();
--        CtrlIteratorConst sourceEnd = sourceList.end();
--
--        size_t prevGroupListSize = 0;
--
--        CtrlIteratorConst containees = sourceList.begin();
--        GroupIterator groupIter=groupList.begin();
--        while ( containees != sourceEnd ||
--                groupIter != groupEnd )
--        {
--            bool addGroupSeperator = false;
--            if ( containees != sourceEnd )
--            {
--                if ( groupIter != groupEnd )
--                {
--                    sal_Int16 groupTabPos = (*groupIter)->tabPos();
--                    if ( (*containees)->mnTabPos >= groupTabPos )
--                    {
--                       if ( !(destinationList.size() >=  prevGroupListSize ))
--                        {
--                            addGroupSeperator = true;
--                        }
--                        copyList( (*groupIter)->controls(), destinationList, addGroupSeperator );
--                        ++groupIter;
--
--                        prevGroupListSize = destinationList.size();
--                    }
--                }
--                destinationList.push_back(*containees);
--                ++containees;
--            }
--            else
--            {
--               if ( groupIter != groupEnd )
--               {
--                    if ( !(destinationList.size() >  prevGroupListSize ))
--                    {
--                        addGroupSeperator = true;
--                    }
--                    copyList( (*groupIter)->controls(), destinationList, addGroupSeperator );
--                    ++groupIter;
--                    prevGroupListSize = destinationList.size();
--                }
--            }
--        }
--    }
--    else
--    {
--        destinationList = sourceList;
--    }
--    return destinationList;
--
--}
--
--
--void RBGroupManager::addSeperator( std::vector< OCX_Control* >& dest )
--{
--    OCX_Control* seperator = new OCX_CommandButton;
--    seperator->SetInDialog(true);
--    seperator->sName = C2S("GroupSeperator");
--    dest.push_back( seperator );
--}
--
--void RBGroupManager::copyList( std::vector< OCX_Control* >& src,
--    std::vector< OCX_Control* >& dest,
--    bool addGroupSeperator )
--{
--    if ( addGroupSeperator )
--    {
--        addSeperator( dest );
--    }
--
--    for ( CtrlIterator rbIter = src.begin(); rbIter != src.end(); ++rbIter )
--    {
--        dest.push_back( *rbIter );
--    }
--}
--
- class OCX_UserFormLabel : public OCX_Label
- {
- public:
-@@ -1698,6 +1528,36 @@ sal_Bool OCX_OptionButton::Import(com::s
- 		aTmp <<= nTmp;
- 		rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
- 	}
-+    // If this is a dialog control then we need to  set a groupname *always*
-+    rtl::OUString sGroupName = lclCreateOUString( pGroupName, nGroupNameLen );
-+    if ( GetInDialog() ) // Userform/Dialog
-+    {
-+        // By default groupnames are not set in Excel, it's not unusual to have
-+        // a number of groups of radiobuttons located inside frame ( or other container
-+        // controls ) where there is *no* specific groupname set for the radiobuttons.
-+        // But... there is implicit grouping for radio buttons in seperate containers
-+        // e.g. radio buttons in a frame are by default in the same group.
-+        // Unfortunately in openoffice there are no containers below the dialog itself :-(
-+        // To ensure correct grouping for imported radiobuttons either with no groupname
-+        // or identical groupnames that are in separate containers we *must* ensure
-+        // that a suitable groupname is applied. 
-+        // Because controlNames are unique even across different containers we can use the
-+        // controls container (e.g. parent) name as a prefix for a group name
-+	rtl::OUString sParentName = msParentName;
-+        sGroupName = sParentName.concat( C2U( ":" ) ).concat( sGroupName );
-+    }
-+    if ( sGroupName.getLength() > 0 )
-+    {
-+	OSL_TRACE("RadioButton %s has groupname %s", 
-+		rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr(),  rtl::OUStringToOString( sGroupName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+        try
-+        {
-+            rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
-+        }
-+        catch( uno::Exception& )
-+        {
-+        }
-+    }
- 
- 	if (pCaption)
- 	{
-@@ -3416,7 +3276,7 @@ OCX_ContainerControl::OCX_ContainerContr
-             const ::rtl::OUString& sN,
-             const uno::Reference< container::XNameContainer >  &rParent,
-             OCX_Control* pParent ) :
--                OCX_Control(sN, pParent), rbGroupMgr( sName ), mxParent(rParent), nNoRecords(0), nTotalLen(0), containerType( STDCONTAINER )
-+                OCX_Control(sN, pParent), mxParent(rParent), nNoRecords(0), nTotalLen(0), containerType( STDCONTAINER )
- {
- 
-     mContainerStorage = parent->OpenSotStorage(storageName,
-@@ -3627,6 +3487,7 @@ void OCX_ContainerControl::ProcessContro
-             // applied to all containees
-             pControl->mnStep = mnStep;
-         }
-+        pControl->msParentName = sName;
- 
-         // #117490# DR: container records provide size of substream, use it here...
- 
-@@ -3637,17 +3498,7 @@ void OCX_ContainerControl::ProcessContro
-         // set stream to position behind substream of this control
-         oStream->Seek( nStrmPos + rec.nSubStreamLen );
- 
--        //need to fake grouping behaviour for radio ( option ) buttons
--        if ( rec.nTypeIdent == OPTIONBUTTON )
--        {
--            OCX_OptionButton* pRButton =
--                static_cast< OCX_OptionButton*>(pControl);
--            rbGroupMgr.addRadioButton( pRButton );
--        }
--        else
--        {
--            mpControls.push_back( pControl );
--        }
-+        mpControls.push_back( pControl );
-     }
- }
- 
-@@ -3670,7 +3521,6 @@ sal_Bool OCX_ContainerControl::Read(SvSt
-     // this ensures that the default tab index created by Star/Open office
-     // reflects the "flattened" ms tab order.
-     ::std::sort( mpControls.begin(), mpControls.end(), SortOrderByTabPos() );
--    mpControls = rbGroupMgr.insertGroupsIntoControlList( mpControls );
- 	return true;
- }
- 
-diff --git xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
-index f864d51..4f87c16 100644
---- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
-+++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
-@@ -458,6 +458,8 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles, Reference<
-                            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) );
-     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
-                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) );
-+    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
-+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":group-name") ) );
- 
-     sal_Int16 nState = 0;
-     if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ) ) >>= nState)
-diff --git xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
-index 9db354d..92c1a09 100644
---- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
-+++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
-@@ -1634,6 +1634,9 @@ void TitledBoxElement::endElement()
-         ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
-                                    OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ),
-                                    xAttributes );
-+        ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
-+                                  OUString( RTL_CONSTASCII_USTRINGPARAM("group-name") ),
-+                                  xAttributes );
- 		
- 		sal_Int16 nVal = 0;
- 		sal_Bool bChecked = sal_False;
-@@ -1775,6 +1778,9 @@ void RadioGroupElement::endElement()
-         ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
-                                    OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ),
-                                    xAttributes );
-+        ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
-+                                  OUString( RTL_CONSTASCII_USTRINGPARAM("group-name") ),
-+                                  xAttributes );
- 		sal_Int16 nVal = 0;
- 		sal_Bool bChecked = sal_False;
- 		if (getBoolAttr( &bChecked,
diff --git a/applied_patches/0092-i93000.diff b/applied_patches/0098-i93000.diff
similarity index 100%
rename from applied_patches/0092-i93000.diff
rename to applied_patches/0098-i93000.diff
diff --git a/applied_patches/0093-padmin-dialog-resize.diff b/applied_patches/0099-padmin-dialog-resize.diff
similarity index 100%
rename from applied_patches/0093-padmin-dialog-resize.diff
rename to applied_patches/0099-padmin-dialog-resize.diff
diff --git a/applied_patches/0094-sw-dialogs-resize.diff b/applied_patches/0100-sw-dialogs-resize.diff
similarity index 100%
rename from applied_patches/0094-sw-dialogs-resize.diff
rename to applied_patches/0100-sw-dialogs-resize.diff
diff --git a/applied_patches/0098-webdav-locking-from-ooo-build-2-4-1.diff b/applied_patches/0101-webdav-locking-from-ooo-build-2-4-1.diff
similarity index 100%
rename from applied_patches/0098-webdav-locking-from-ooo-build-2-4-1.diff
rename to applied_patches/0101-webdav-locking-from-ooo-build-2-4-1.diff
diff --git a/applied_patches/0099-webdav-locking-local-temp-file.diff b/applied_patches/0102-webdav-locking-local-temp-file.diff
similarity index 100%
rename from applied_patches/0099-webdav-locking-local-temp-file.diff
rename to applied_patches/0102-webdav-locking-local-temp-file.diff
diff --git a/applied_patches/0100-gnome-vfs-locking-config_office.diff b/applied_patches/0103-gnome-vfs-locking-config_office.diff
similarity index 100%
rename from applied_patches/0100-gnome-vfs-locking-config_office.diff
rename to applied_patches/0103-gnome-vfs-locking-config_office.diff
diff --git a/applied_patches/0101-gnome-vfs-locking-ucb.diff b/applied_patches/0104-gnome-vfs-locking-ucb.diff
similarity index 100%
rename from applied_patches/0101-gnome-vfs-locking-ucb.diff
rename to applied_patches/0104-gnome-vfs-locking-ucb.diff
diff --git a/applied_patches/0102-gnome-vfs-late-init.diff b/applied_patches/0105-gnome-vfs-late-init.diff
similarity index 100%
rename from applied_patches/0102-gnome-vfs-late-init.diff
rename to applied_patches/0105-gnome-vfs-late-init.diff
diff --git a/applied_patches/0103-unxsplash-rework.diff b/applied_patches/0106-unxsplash-rework.diff
similarity index 100%
rename from applied_patches/0103-unxsplash-rework.diff
rename to applied_patches/0106-unxsplash-rework.diff
diff --git a/applied_patches/0104-hack-readd-GetStringParam.diff b/applied_patches/0107-hack-readd-GetStringParam.diff
similarity index 100%
rename from applied_patches/0104-hack-readd-GetStringParam.diff
rename to applied_patches/0107-hack-readd-GetStringParam.diff
diff --git a/applied_patches/0105-unxsplash-new-osl-pipe.diff b/applied_patches/0108-unxsplash-new-osl-pipe.diff
similarity index 100%
rename from applied_patches/0105-unxsplash-new-osl-pipe.diff
rename to applied_patches/0108-unxsplash-new-osl-pipe.diff
diff --git a/applied_patches/0106-unxsplash-new-osl-pipe-slot.diff b/applied_patches/0109-unxsplash-new-osl-pipe-slot.diff
similarity index 100%
rename from applied_patches/0106-unxsplash-new-osl-pipe-slot.diff
rename to applied_patches/0109-unxsplash-new-osl-pipe-slot.diff
diff --git a/applied_patches/0107-unxsplash-finish-on-hangup.diff b/applied_patches/0110-unxsplash-finish-on-hangup.diff
similarity index 100%
rename from applied_patches/0107-unxsplash-finish-on-hangup.diff
rename to applied_patches/0110-unxsplash-finish-on-hangup.diff
diff --git a/applied_patches/0108-unxsplash-rpath.diff b/applied_patches/0111-unxsplash-rpath.diff
similarity index 100%
rename from applied_patches/0108-unxsplash-rpath.diff
rename to applied_patches/0111-unxsplash-rpath.diff
diff --git a/applied_patches/0109-unxsplash-3layer.diff b/applied_patches/0112-unxsplash-3layer.diff
similarity index 100%
rename from applied_patches/0109-unxsplash-3layer.diff
rename to applied_patches/0112-unxsplash-3layer.diff
diff --git a/applied_patches/0113-csv-import-preserve-options-sc.diff b/applied_patches/0113-csv-import-preserve-options-sc.diff
deleted file mode 100644
index 05709916a..000000000
--- a/applied_patches/0113-csv-import-preserve-options-sc.diff
+++ /dev/null
@@ -1,647 +0,0 @@
-diff --git sc/source/ui/dbgui/asciiopt.cxx sc/source/ui/dbgui/asciiopt.cxx
-index bf6521e..df25128 100644
---- sc/source/ui/dbgui/asciiopt.cxx
-+++ sc/source/ui/dbgui/asciiopt.cxx
-@@ -56,6 +56,7 @@ ScAsciiOptions::ScAsciiOptions() :
- 	bFixedLen		( FALSE ),
- 	aFieldSeps		( ';' ),
- 	bMergeFieldSeps	( FALSE ),
-+    bQuotedFieldAsText(false),
- 	cTextSep		( cDefaultTextSep ),
- 	eCharSet		( gsl_getSystemTextEncoding() ),
- 	bCharSetSystem	( FALSE ),
-@@ -71,6 +72,7 @@ ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) :
- 	bFixedLen		( rOpt.bFixedLen ),
- 	aFieldSeps		( rOpt.aFieldSeps ),
- 	bMergeFieldSeps	( rOpt.bMergeFieldSeps ),
-+    bQuotedFieldAsText(rOpt.bQuotedFieldAsText),
- 	cTextSep		( rOpt.cTextSep ),
- 	eCharSet		( rOpt.eCharSet ),
- 	bCharSetSystem	( rOpt.bCharSetSystem ),
-@@ -155,6 +157,7 @@ ScAsciiOptions&	ScAsciiOptions::operator=( const ScAsciiOptions& rCpy )
- 	bFixedLen		= rCpy.bFixedLen;
- 	aFieldSeps		= rCpy.aFieldSeps;
- 	bMergeFieldSeps	= rCpy.bMergeFieldSeps;
-+    bQuotedFieldAsText = rCpy.bQuotedFieldAsText;
- 	cTextSep		= rCpy.cTextSep;
- 	eCharSet		= rCpy.eCharSet;
- 	bCharSetSystem	= rCpy.bCharSetSystem;
-@@ -169,6 +172,7 @@ BOOL ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
- 	if ( bFixedLen		 == rCmp.bFixedLen &&
- 		 aFieldSeps		 == rCmp.aFieldSeps &&
- 		 bMergeFieldSeps == rCmp.bMergeFieldSeps &&
-+         bQuotedFieldAsText == rCmp.bQuotedFieldAsText &&
- 		 cTextSep		 == rCmp.cTextSep &&
- 		 eCharSet		 == rCmp.eCharSet &&
- 		 bCharSetSystem  == rCmp.bCharSetSystem &&
-@@ -286,6 +290,13 @@ void ScAsciiOptions::ReadFromString( const String& rString )
- 			pColFormat = NULL;
- 		}
- 	}
-+
-+    // Import quoted field as text.
-+    if (nCount >= 6)
-+    {
-+        aToken = rString.GetToken(5, ',');
-+        bQuotedFieldAsText = aToken.EqualsAscii("true") ? true : false;
-+    }
- }
- 
- 
-@@ -357,6 +368,11 @@ String ScAsciiOptions::WriteToString() const
- 		aOutStr += String::CreateFromInt32(pColFormat[nInfo]);
- 	}
- 
-+    aOutStr += ',';
-+
-+    // Import quoted field as text.
-+    aOutStr += String::CreateFromAscii(bQuotedFieldAsText ? "true" : "false");
-+
- 	return aOutStr;
- }
- 
-diff --git sc/source/ui/dbgui/asciiopt.hrc sc/source/ui/dbgui/asciiopt.hrc
-index 2dcfe00..60c8500 100644
---- sc/source/ui/dbgui/asciiopt.hrc
-+++ sc/source/ui/dbgui/asciiopt.hrc
-@@ -56,4 +56,5 @@
- #define FT_AT_ROW 59
- #define NF_AT_ROW 60
- #define CB_ASONCE 90
-+#define CB_QUOTED_AS_TEXT 91
- #define STR_TEXTTOCOLUMNS 100
-diff --git sc/source/ui/dbgui/asciiopt.src sc/source/ui/dbgui/asciiopt.src
-index e6cc493..da10a39 100644
---- sc/source/ui/dbgui/asciiopt.src
-+++ sc/source/ui/dbgui/asciiopt.src
-@@ -34,24 +34,24 @@ ModalDialog RID_SCDLG_ASCII
- {
- 	OutputSize = TRUE ;
- 	SVLook = TRUE ;
--    Size = MAP_APPFONT ( 320 , 247 ) ;
-+    Size = MAP_APPFONT ( 320 , 264 ) ;
- 	Text [ en-US ] = "Text Import" ;
- 	Moveable = TRUE ;
-     FixedLine FL_WIDTH
- 	{
--        Pos = MAP_APPFONT ( 6 , 132 ) ;
-+        Pos = MAP_APPFONT ( 6 , 147 ) ;
-         Size = MAP_APPFONT ( 252 , 8 ) ;
- 		Text [ en-US ] = "Fields" ;
- 	};
- 	FixedText FT_TYPE
- 	{
--        Pos = MAP_APPFONT ( 12 , 145 ) ;
-+        Pos = MAP_APPFONT ( 12 , 160 ) ;
-         Size = MAP_APPFONT ( 60 , 8 ) ;
- 		Text [ en-US ] = "Column t~ype";
- 	};
- 	ListBox LB_TYPE1
- 	{
--        Pos = MAP_APPFONT ( 76 , 143 ) ;
-+        Pos = MAP_APPFONT ( 76 , 158 ) ;
-         Size = MAP_APPFONT ( 60 , 68 ) ;
- 		TabStop = TRUE ;
- 		DropDown = TRUE ;
-@@ -194,7 +194,7 @@ ModalDialog RID_SCDLG_ASCII
- 		HelpId = HID_SC_ASCII_TABCTR ;
- 		Border = TRUE ;
-         DialogControl = TRUE ;
--        Pos = MAP_APPFONT ( 12 , 159 ) ;
-+        Pos = MAP_APPFONT ( 12 , 176 ) ;
-         Size = MAP_APPFONT ( 243 , 82 ) ;
- 	};
- 	CheckBox CB_ASONCE
-@@ -204,6 +204,13 @@ ModalDialog RID_SCDLG_ASCII
- 		TabStop = TRUE ;
- 		Text [ en-US ] = "Merge ~delimiters" ;
- 	};
-+    CheckBox CB_QUOTED_AS_TEXT
-+    {
-+        Pos = MAP_APPFONT ( 20 , 129 ) ;
-+        Size = MAP_APPFONT ( 130 , 10 ) ;
-+        TabStop = TRUE ;
-+        Text [ en-US ] = "~Quoted field as text" ;
-+    };
-     String STR_TEXTTOCOLUMNS
-     {
-         Text [ en-US ] = "Text to Columns" ;
-diff --git sc/source/ui/dbgui/csvgrid.cxx sc/source/ui/dbgui/csvgrid.cxx
-index ddbfb44..5725645 100644
---- sc/source/ui/dbgui/csvgrid.cxx
-+++ sc/source/ui/dbgui/csvgrid.cxx
-@@ -737,7 +737,8 @@ void ScCsvGrid::ImplSetTextLineSep(
-     while( *pChar && (nColIx < sal::static_int_cast<sal_uInt32>(CSV_MAXCOLCOUNT)) )
-     {
-         // scan for next cell text
--        pChar = ScImportExport::ScanNextFieldFromString( pChar, aCellText, cTextSep, pSepChars, bMergeSep );
-+        bool bIsQuoted = false;
-+        pChar = ScImportExport::ScanNextFieldFromString( pChar, aCellText, cTextSep, pSepChars, bMergeSep, bIsQuoted );
- 
-         // update column width
-         sal_Int32 nWidth = Max( CSV_MINCOLWIDTH, aCellText.Len() + sal_Int32( 1 ) );
-diff --git sc/source/ui/dbgui/csvruler.cxx sc/source/ui/dbgui/csvruler.cxx
-index 5437f9b..b42ebaf 100644
---- sc/source/ui/dbgui/csvruler.cxx
-+++ sc/source/ui/dbgui/csvruler.cxx
-@@ -37,8 +37,76 @@
- #include "AccessibleCsvControl.hxx"
- 
- 
-+#include <optutil.hxx>
-+#include <com/sun/star/uno/Any.hxx>
-+#include <com/sun/star/uno/Sequence.hxx>
-+#include "miscuno.hxx"
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+
-+
-+// ============================================================================
-+#define SEP_PATH            "Office.Calc/Dialogs/CSVImport"
-+#define FIXED_WIDTH_LIST    "FixedWidthList"
-+
-+
- // ============================================================================
- 
-+static void load_FixedWidthList(ScCsvSplits &aSplits)
-+{
-+    String sSplits;
-+    OUString sFixedWidthLists;
-+
-+    Sequence<Any>aValues;
-+    const Any *pProperties;
-+    Sequence<OUString> aNames(1);
-+    OUString* pNames = aNames.getArray();
-+    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
-+
-+    pNames[0] = OUString::createFromAscii( FIXED_WIDTH_LIST );
-+    aValues = aItem.GetProperties( aNames );
-+    pProperties = aValues.getConstArray();
-+
-+    if( pProperties[0].hasValue() )
-+    {
-+        aSplits.Clear();
-+        pProperties[0] >>= sFixedWidthLists;
-+
-+        sSplits = String( sFixedWidthLists );
-+
-+        // String ends with a semi-colon so there is no 'int' after the last one.
-+        for(int i=0;i<sSplits.GetTokenCount()-1;i++ )
-+            aSplits.Insert( sSplits.GetToken(i).ToInt32() );
-+    }
-+}
-+static void save_FixedWidthList(ScCsvSplits aSplits)
-+{
-+    String sSplits;
-+    // Create a semi-colon separated string to save the splits
-+    sal_uInt32 n = aSplits.Count();
-+    for (sal_uInt32 i = 0; i < n; ++i)
-+    {
-+        sSplits.Append( String::CreateFromInt32( aSplits[i] ) );
-+        sSplits.Append((char)';');
-+    }
-+
-+    OUString sFixedWidthLists = OUString( sSplits );
-+    Sequence<Any> aValues;
-+    Any *pProperties;
-+    Sequence<OUString> aNames(1);
-+    OUString* pNames = aNames.getArray();
-+    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
-+
-+    pNames[0] = OUString::createFromAscii( FIXED_WIDTH_LIST );
-+    aValues = aItem.GetProperties( aNames );
-+    pProperties = aValues.getArray();
-+    pProperties[0] <<= sFixedWidthLists;
-+
-+    aItem.PutProperties(aNames, aValues);
-+}
-+
- ScCsvRuler::ScCsvRuler( ScCsvControl& rParent ) :
-     ScCsvControl( rParent ),
-     mnPosCursorLast( 1 )
-@@ -48,6 +116,13 @@ ScCsvRuler::ScCsvRuler( ScCsvControl& rParent ) :
-     InitSizeData();
-     maBackgrDev.SetFont( GetFont() );
-     maRulerDev.SetFont( GetFont() );
-+
-+    load_FixedWidthList( maSplits );
-+}
-+
-+ScCsvRuler::~ScCsvRuler()
-+{
-+    save_FixedWidthList( maSplits );
- }
- 
- 
-diff --git sc/source/ui/dbgui/scuiasciiopt.cxx sc/source/ui/dbgui/scuiasciiopt.cxx
-index 2c31e08..a10e8fb 100644
---- sc/source/ui/dbgui/scuiasciiopt.cxx
-+++ sc/source/ui/dbgui/scuiasciiopt.cxx
-@@ -44,6 +44,12 @@
- // ause
- #include "editutil.hxx"
- 
-+#include <optutil.hxx>
-+#include <com/sun/star/uno/Any.hxx>
-+#include <com/sun/star/uno/Sequence.hxx>
-+#include "miscuno.hxx"
-+
-+
- //! TODO make dynamic
- #ifdef WIN
- const SCSIZE ASCIIDLG_MAXROWS                = 10000;
-@@ -51,6 +57,20 @@ const SCSIZE ASCIIDLG_MAXROWS                = 10000;
- const SCSIZE ASCIIDLG_MAXROWS                = MAXROWCOUNT;
- #endif
- 
-+
-+using namespace rtl;
-+using namespace com::sun::star::uno;
-+
-+// Defines - CSV Import Preserve Options
-+#define FIXED_WIDTH         "FixedWidth"
-+#define FROM_ROW            "FromRow"
-+#define CHAR_SET            "CharSet"
-+#define SEPARATORS          "Separators"
-+#define TEXT_SEPARATORS     "TextSeparators"
-+#define MERGE_DELIMITERS    "MergeDelimiters"
-+#define QUOTED_AS_TEXT      "QuotedFieldAsText"
-+#define SEP_PATH            "Office.Calc/Dialogs/CSVImport"
-+
- // ============================================================================
- 
- void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect )
-@@ -98,11 +118,82 @@ sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList )
- 	return c;
- }
- 
-+static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparators, 
-+                             bool &bMergeDelimiters, bool& bQuotedAsText, bool &bFixedWidth, 
-+                             sal_Int32 &nFromRow, sal_Int32 &nCharSet )
-+{
-+    Sequence<Any>aValues;
-+    const Any *pProperties;
-+    Sequence<OUString> aNames(7);
-+    OUString* pNames = aNames.getArray();
-+    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
-+
-+    pNames[0] = OUString::createFromAscii( MERGE_DELIMITERS );
-+    pNames[1] = OUString::createFromAscii( SEPARATORS );
-+    pNames[2] = OUString::createFromAscii( TEXT_SEPARATORS );
-+    pNames[3] = OUString::createFromAscii( FIXED_WIDTH );
-+    pNames[4] = OUString::createFromAscii( FROM_ROW );
-+    pNames[5] = OUString::createFromAscii( CHAR_SET );
-+    pNames[6] = OUString::createFromAscii( QUOTED_AS_TEXT );
-+    aValues = aItem.GetProperties( aNames );
-+    pProperties = aValues.getConstArray();
-+    if( pProperties[1].hasValue() )
-+        pProperties[1] >>= sFieldSeparators;
-+
-+    if( pProperties[2].hasValue() )
-+        pProperties[2] >>= sTextSeparators;
-+
-+    if( pProperties[0].hasValue() )
-+        bMergeDelimiters = ScUnoHelpFunctions::GetBoolFromAny( pProperties[0] );
-+
-+    if( pProperties[3].hasValue() )
-+        bFixedWidth = ScUnoHelpFunctions::GetBoolFromAny( pProperties[3] );
-+
-+    if( pProperties[4].hasValue() )
-+        pProperties[4] >>= nFromRow;
-+
-+    if( pProperties[5].hasValue() )
-+        pProperties[5] >>= nCharSet;
-+ 
-+    if ( pProperties[6].hasValue() )
-+        pProperties[6] >>= bQuotedAsText;
-+}
-+
-+static void save_Separators( String maSeparators, String maTxtSep, bool bMergeDelimiters, bool bQuotedAsText,
-+                             bool bFixedWidth, sal_Int32 nFromRow, sal_Int32 nCharSet )
-+{
-+    OUString sFieldSeparators = OUString( maSeparators );
-+    OUString sTextSeparators = OUString( maTxtSep );
-+    Sequence<Any> aValues;
-+    Any *pProperties;
-+    Sequence<OUString> aNames(7);
-+    OUString* pNames = aNames.getArray();
-+    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
-+
-+    pNames[0] = OUString::createFromAscii( MERGE_DELIMITERS );
-+    pNames[1] = OUString::createFromAscii( SEPARATORS );
-+    pNames[2] = OUString::createFromAscii( TEXT_SEPARATORS );
-+    pNames[3] = OUString::createFromAscii( FIXED_WIDTH );
-+    pNames[4] = OUString::createFromAscii( FROM_ROW );
-+    pNames[5] = OUString::createFromAscii( CHAR_SET );
-+    pNames[6] = OUString::createFromAscii( QUOTED_AS_TEXT );
-+    aValues = aItem.GetProperties( aNames );
-+    pProperties = aValues.getArray();
-+    pProperties[1] <<= sFieldSeparators;
-+    pProperties[2] <<= sTextSeparators;
-+    ScUnoHelpFunctions::SetBoolInAny( pProperties[0], bMergeDelimiters );
-+    ScUnoHelpFunctions::SetBoolInAny( pProperties[3], bFixedWidth );
-+    pProperties[4] <<= nFromRow;
-+    pProperties[5] <<= nCharSet;
-+    pProperties[6] <<= static_cast<sal_Bool>(bQuotedAsText);
-+
-+    aItem.PutProperties(aNames, aValues);
-+}
- 
- // ----------------------------------------------------------------------------
- 
- ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
--									SvStream* pInStream, sal_Unicode cSep ) :
-+                                    SvStream* pInStream, sal_Unicode /*cSep*/ ) :
- 		ModalDialog	( pParent, ScResId( RID_SCDLG_ASCII ) ),
-         mpDatStream  ( pInStream ),
-         mnStreamPos( pInStream ? pInStream->Tell() : 0 ),
-@@ -128,6 +215,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
- 		aCkbOther	( this, ScResId( CKB_OTHER ) ),
- 		aEdOther	( this, ScResId( ED_OTHER ) ),
- 		aCkbAsOnce	( this, ScResId( CB_ASONCE) ),
-+        aCkbQuotedAsText( this, ScResId(CB_QUOTED_AS_TEXT) ),
- 		aFtTextSep	( this, ScResId( FT_TEXTSEP ) ),
- 		aCbTextSep	( this, ScResId( CB_TEXTSEP ) ),
- 
-@@ -146,14 +234,15 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
- 		aFldSepList	( ScResId( SCSTR_FIELDSEP ) ),
- 		aTextSepList( ScResId( SCSTR_TEXTSEP ) ),
-         mcTextSep   ( ScAsciiOptions::cDefaultTextSep ),
--        maStrTextToColumns( ScResId( STR_TEXTTOCOLUMNS ) )
-+        maStrTextToColumns( ScResId( STR_TEXTTOCOLUMNS ) ),
-+        mbFileImport(true)
- {
- 	FreeResource();
-+    mbFileImport = aDatName.Len() > 0;
- 
- 	String aName = GetText();
-     // aDatName is empty if invoked during paste from clipboard.
--    BOOL bClipboard = (aDatName.Len() == 0);
--    if (!bClipboard)
-+    if (mbFileImport)
-     {
-         aName.AppendAscii(RTL_CONSTASCII_STRINGPARAM(" - ["));
-         aName += aDatName;
-@@ -161,20 +250,51 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
-     }
- 	SetText( aName );
- 
--	switch(cSep)
-+
-+    OUString sFieldSeparators;
-+    OUString sTextSeparators;
-+    bool bMergeDelimiters = false;
-+    bool bFixedWidth = false;
-+    bool bQuotedFieldAsText = true;
-+    sal_Int32 nFromRow = 1;
-+    sal_Int32 nCharSet = -1;
-+    if (mbFileImport)
-+        // load separators only when importing csv files.
-+        load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters, 
-+                         bQuotedFieldAsText, bFixedWidth, nFromRow, nCharSet);
-+    maFieldSeparators = String(sFieldSeparators);
-+
-+    if( bMergeDelimiters )
-+        aCkbAsOnce.Check();
-+    if (bQuotedFieldAsText)
-+        aCkbQuotedAsText.Check();
-+    if( bFixedWidth )
-+        aRbFixed.Check();
-+    if( nFromRow != 1 )
-+        aNfRow.SetValue( nFromRow );
-+
-+    ByteString bString(maFieldSeparators,RTL_TEXTENCODING_MS_1252);
-+    const sal_Char *aSep = bString.GetBuffer();
-+    int len = maFieldSeparators.Len();
-+    for (int i = 0; i < len; ++i)
-     {
--        case '\t':  aCkbTab.Check();        break;
--        case ';':   aCkbSemicolon.Check();  break;
--        case ',':   aCkbComma.Check();      break;
--        case ' ':   aCkbSpace.Check();      break;
--        default:
--            aCkbOther.Check();
--            aEdOther.SetText( cSep );
-+        switch( aSep[i] )
-+        {
-+            case '\t':  aCkbTab.Check();        break;
-+            case ';':   aCkbSemicolon.Check();  break;
-+            case ',':   aCkbComma.Check();      break;
-+            case ' ':   aCkbSpace.Check();      break;
-+            default:
-+                aCkbOther.Check();
-+                aEdOther.SetText( aEdOther.GetText() + OUString( aSep[i] ) );
-+        }
-     }
-+    
-+    // Get Separators from the dialog
-     maFieldSeparators = GetSeparators();
- 
-     // Clipboard is always Unicode, else detect.
--	BOOL bPreselectUnicode = bClipboard;
-+    bool bPreselectUnicode = !mbFileImport;
- 	// Sniff for Unicode / not
-     if( !bPreselectUnicode && mpDatStream )
- 	{
-@@ -210,6 +330,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
- 
-     // *** Separator characters ***
-     lcl_FillCombo( aCbTextSep, aTextSepList, mcTextSep );
-+    aCbTextSep.SetText( sTextSeparators );
- 
-     Link aSeparatorHdl =LINK( this, ScImportAsciiDlg, SeparatorHdl );
-     aCbTextSep.SetSelectHdl( aSeparatorHdl );
-@@ -218,6 +339,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
-     aCkbSemicolon.SetClickHdl( aSeparatorHdl );
-     aCkbComma.SetClickHdl( aSeparatorHdl );
-     aCkbAsOnce.SetClickHdl( aSeparatorHdl );
-+    aCkbQuotedAsText.SetClickHdl( aSeparatorHdl );
-     aCkbSpace.SetClickHdl( aSeparatorHdl );
-     aCkbOther.SetClickHdl( aSeparatorHdl );
-     aEdOther.SetModifyHdl( aSeparatorHdl );
-@@ -230,6 +352,10 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
- 	aLbCharSet.InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, aCharSetUser );
- 	aLbCharSet.SelectTextEncoding( bPreselectUnicode ?
- 		RTL_TEXTENCODING_UNICODE : gsl_getSystemTextEncoding() );
-+
-+    if( nCharSet >= 0 )
-+        aLbCharSet.SelectEntryPos( nCharSet );
-+
-     SetSelectedCharSet();
- 	aLbCharSet.SetSelectHdl( LINK( this, ScImportAsciiDlg, CharSetHdl ) );
- 
-@@ -261,6 +387,10 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
- 
- ScImportAsciiDlg::~ScImportAsciiDlg()
- {
-+    if (mbFileImport)
-+        save_Separators( maFieldSeparators, aCbTextSep.GetText(), aCkbAsOnce.IsChecked(), 
-+                         aCkbQuotedAsText.IsChecked(), aRbFixed.IsChecked(), 
-+                         aNfRow.GetValue(), aLbCharSet.GetSelectEntryPos());
- 	delete[] mpRowPosArray;
- }
- 
-@@ -346,6 +476,7 @@ void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt )
-     {
-         rOpt.SetFieldSeps( GetSeparators() );
-         rOpt.SetMergeSeps( aCkbAsOnce.IsChecked() );
-+        rOpt.SetQuotedAsText(aCkbQuotedAsText.IsChecked());
-         rOpt.SetTextSep( lcl_CharFromCombo( aCbTextSep, aTextSepList ) );
-     }
- }
-@@ -357,6 +488,10 @@ void ScImportAsciiDlg::SetTextToColumnsMode()
-     aLbCharSet.Disable();
-     aFtRow.Disable();
-     aNfRow.Disable();
-+
-+    // Quoted field as text option is not used for text to columns mode.
-+    aCkbQuotedAsText.Check(false);
-+    aCkbQuotedAsText.Disable();
- }
- 
- void ScImportAsciiDlg::SetSelectedCharSet()
-@@ -393,6 +528,7 @@ void ScImportAsciiDlg::SetupSeparatorCtrls()
-     aCkbOther.Enable( bEnable );
-     aEdOther.Enable( bEnable );
-     aCkbAsOnce.Enable( bEnable );
-+    aCkbQuotedAsText.Enable( bEnable );
-     aFtTextSep.Enable( bEnable );
-     aCbTextSep.Enable( bEnable );
- }
-diff --git sc/source/ui/docshell/impex.cxx sc/source/ui/docshell/impex.cxx
-index 344dcae..d2cb0cd 100644
---- sc/source/ui/docshell/impex.cxx
-+++ sc/source/ui/docshell/impex.cxx
-@@ -792,12 +792,10 @@ BOOL ScImportExport::Text2Doc( SvStream& rStrm )
- 		//
- 
- 
--bool lcl_PutString( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
--					const String& rStr, BYTE nColFormat,
--                    ::utl::TransliterationWrapper& rTransliteration,
--					CalendarWrapper& rCalendar,
--                    ::utl::TransliterationWrapper* pSecondTransliteration,
--					CalendarWrapper* pSecondCalendar )
-+static bool lcl_PutString( 
-+    ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rStr, BYTE nColFormat,
-+    ::utl::TransliterationWrapper& rTransliteration, CalendarWrapper& rCalendar,
-+    ::utl::TransliterationWrapper* pSecondTransliteration, CalendarWrapper* pSecondCalendar )
- {
-     bool bMultiLine = false;
- 	if ( nColFormat == SC_COL_SKIP || !rStr.Len() || !ValidCol(nCol) || !ValidRow(nRow) )
-@@ -1168,7 +1166,8 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
-                 // SC_COL_SKIP.
-                 while (*p && nCol <= MAXCOL+1)
-                 {
--                    p = ScImportExport::ScanNextFieldFromString( p, aCell, cStr, pSeps, bMerge );
-+                    bool bIsQuoted = false;
-+                    p = ScImportExport::ScanNextFieldFromString( p, aCell, cStr, pSeps, bMerge, bIsQuoted );
- 
-                     BYTE nFmt = SC_COL_STANDARD;
-                     for ( i=nInfoStart; i<nInfoCount; i++ )
-@@ -1185,10 +1184,15 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
-                         if (nCol > MAXCOL)
-                             bOverflow = TRUE;       // display warning on import
-                         else if (!bDetermineRange)
-+                        {
-+                            if (bIsQuoted && pExtOptions && pExtOptions->IsQuotedAsText())
-+                                nFmt = SC_COL_TEXT;
-+
-                             bMultiLine |= lcl_PutString( pDoc, nCol, nRow,
-                                     nTab, aCell, nFmt, aTransliteration,
-                                     aCalendar, pEnglishTransliteration,
-                                     pEnglishCalendar);
-+                        }
-                         ++nCol;
-                     }
- 
-@@ -1262,11 +1266,13 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
- 
- // static
- const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p,
--		String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, BOOL bMergeSeps )
-+		String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool& rbIsQuoted )
- {
-+    rbIsQuoted = false;
- 	rField.Erase();
- 	if ( *p == cStr )			// String in Anfuehrungszeichen
- 	{
-+        rbIsQuoted = true;
-         const sal_Unicode* p1;
- 		p1 = p = lcl_ScanString( p, rField, cStr, DQM_ESCAPE );
- 		while ( *p && !ScGlobal::UnicodeStrChr( pSeps, *p ) )
-diff --git sc/source/ui/inc/asciiopt.hxx sc/source/ui/inc/asciiopt.hxx
-index 1d12606..394f2dc 100644
---- sc/source/ui/inc/asciiopt.hxx
-+++ sc/source/ui/inc/asciiopt.hxx
-@@ -65,6 +65,7 @@ private:
- 	BOOL		bFixedLen;
- 	String		aFieldSeps;
- 	BOOL		bMergeFieldSeps;
-+    bool        bQuotedFieldAsText;
- 	sal_Unicode	cTextSep;
- 	CharSet		eCharSet;
- 	BOOL		bCharSetSystem;
-@@ -93,6 +94,7 @@ public:
- 	BOOL				GetCharSetSystem() const	{ return bCharSetSystem; }
- 	const String&		GetFieldSeps() const	{ return aFieldSeps; }
- 	BOOL				IsMergeSeps() const		{ return bMergeFieldSeps; }
-+    bool                IsQuotedAsText() const  { return bQuotedFieldAsText; }
- 	sal_Unicode			GetTextSep() const		{ return cTextSep; }
- 	BOOL				IsFixedLen() const		{ return bFixedLen; }
- 	USHORT				GetInfoCount() const	{ return nInfoCount; }
-@@ -105,6 +107,7 @@ public:
- 	void	SetFixedLen( BOOL bSet )			{ bFixedLen = bSet; }
- 	void	SetFieldSeps( const String& rStr )	{ aFieldSeps = rStr; }
- 	void	SetMergeSeps( BOOL bSet )			{ bMergeFieldSeps = bSet; }
-+    void    SetQuotedAsText(bool bSet)          { bQuotedFieldAsText = bSet; }
- 	void	SetTextSep( sal_Unicode c )			{ cTextSep = c; }
- 	void	SetStartRow( long nRow)				{ nStartRow= nRow; }
- 
-diff --git sc/source/ui/inc/csvruler.hxx sc/source/ui/inc/csvruler.hxx
-index c251831..cd67708 100644
---- sc/source/ui/inc/csvruler.hxx
-+++ sc/source/ui/inc/csvruler.hxx
-@@ -71,6 +71,7 @@ private:
-     // ------------------------------------------------------------------------
- public:
-     explicit                    ScCsvRuler( ScCsvControl& rParent );
-+                                ~ScCsvRuler();
- 
-     // common ruler handling --------------------------------------------------
- public:
-diff --git sc/source/ui/inc/impex.hxx sc/source/ui/inc/impex.hxx
-index 515063a..aaddeeb 100644
---- sc/source/ui/inc/impex.hxx
-+++ sc/source/ui/inc/impex.hxx
-@@ -98,7 +98,7 @@ public:
- 
- 	static BOOL  IsFormatSupported( ULONG nFormat );
- 	static const sal_Unicode* ScanNextFieldFromString( const sal_Unicode* p,
--			String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, BOOL bMergeSeps );
-+			String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool& rbIsQuoted );
- 	static	void	WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero = FALSE );
- 	static	void	WriteUnicodeOrByteEndl( SvStream& rStrm );
- 	static	inline	BOOL	IsEndianSwap( const SvStream& rStrm );
-diff --git sc/source/ui/inc/scuiasciiopt.hxx sc/source/ui/inc/scuiasciiopt.hxx
-index 6712193..45c3e71 100644
---- sc/source/ui/inc/scuiasciiopt.hxx
-+++ sc/source/ui/inc/scuiasciiopt.hxx
-@@ -64,6 +64,7 @@ class ScImportAsciiDlg : public ModalDialog
-     CheckBox                    aCkbOther;
-     Edit                        aEdOther;
-     CheckBox                    aCkbAsOnce;
-+    CheckBox                    aCkbQuotedAsText;
-     FixedText                   aFtTextSep;
-     ComboBox                    aCbTextSep;
- 
-@@ -87,6 +88,7 @@ class ScImportAsciiDlg : public ModalDialog
- 
-     CharSet                     meCharSet;          /// Selected char set.
-     bool                        mbCharSetSystem;    /// Is System char set selected?
-+    bool                        mbFileImport;       /// Is this dialog involked for csv file import ?
- 
- public:
-                                 ScImportAsciiDlg(
diff --git a/applied_patches/0110-unxsplash-bmp-alias.diff b/applied_patches/0113-unxsplash-bmp-alias.diff
similarity index 100%
rename from applied_patches/0110-unxsplash-bmp-alias.diff
rename to applied_patches/0113-unxsplash-bmp-alias.diff
diff --git a/applied_patches/0114-csv-import-preserve-options-officecfg.diff b/applied_patches/0114-csv-import-preserve-options-officecfg.diff
deleted file mode 100644
index b271f2728..000000000
--- a/applied_patches/0114-csv-import-preserve-options-officecfg.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git officecfg/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-index 3c3fe6b..09e5c52 100644
---- officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-@@ -1019,6 +1019,81 @@
- 				<value>NULL</value>
- 			</prop>
- 		</group>
-+        <group oor:name="Dialogs">
-+            <info>
-+                <desc>Contains the dialogs settings.</desc>
-+            </info>
-+            <group oor:name="CSVImport">
-+                <info>
-+                    <desc>Contains setting for Text CSV Import</desc>
-+                </info>
-+                <prop oor:name="MergeDelimiters" oor:type="xs:boolean">
-+                    <info>
-+                        <author>muthusuba</author>
-+                        <desc>Merge Delimiter check box status</desc>
-+                        <label>MergeDelimiters</label>
-+                    </info>
-+                    <value>false</value>
-+                </prop>
-+                <prop oor:name="QuotedFieldAsText" oor:type="xs:boolean">
-+                    <info>
-+                        <author>kyoshida</author>
-+                        <desc>If true, quoted field is always imported as text 
-+                            with no exception.</desc>
-+                        <label>QuotedFieldAsText</label>
-+                    </info>
-+                    <value>true</value>
-+                </prop>
-+                <prop oor:name="Separators" oor:type="xs:string">
-+                    <info>
-+                        <author>muthusuba</author>
-+                        <desc>List of Separators - as a String</desc>
-+                        <label>Separators</label>
-+                    </info>
-+                    <value>;    </value>
-+                </prop>
-+                <prop oor:name="TextSeparators" oor:type="xs:string">
-+                    <info>
-+                        <author>muthusuba</author>
-+                        <desc>Text Separators</desc>
-+                        <label>TextSeparators</label>
-+                    </info>
-+                    <value>"</value>
-+                </prop>
-+                <prop oor:name="FixedWidth" oor:type="xs:boolean">
-+                    <info>
-+                        <author>muthusuba</author>
-+                        <desc>Fixed width</desc>
-+                        <label>FixedWidth</label>
-+                    </info>
-+                    <value>false</value>
-+                </prop>
-+                <prop oor:name="FromRow" oor:type="xs:int">
-+                    <info>
-+                        <author>muthusuba</author>
-+                        <desc>From Row</desc>
-+                        <label>FromRow</label>
-+                    </info>
-+                    <value>1</value>
-+                </prop>
-+                <prop oor:name="CharSet" oor:type="xs:int">
-+                    <info>
-+                        <author>muthusuba</author>
-+                        <desc>Char Set</desc>
-+                        <label>CharSet</label>
-+                    </info>
-+                    <value>-1</value>
-+                </prop>
-+                <prop oor:name="FixedWidthList" oor:type="xs:string">
-+                    <info>
-+                        <author>muthusuba</author>
-+                        <desc>Fixed Width List of separators</desc>
-+                        <label>FixedWidthList</label>
-+                    </info>
-+                    <value></value>
-+                </prop>
-+            </group>
-+        </group>
- 		<group oor:name="Calculate">
- 			<info>
- 				<desc>Contains settings that affect cell calculation.</desc>
diff --git a/applied_patches/0111-sw-html-insert-unknown-tags.diff b/applied_patches/0114-sw-html-insert-unknown-tags.diff
similarity index 100%
rename from applied_patches/0111-sw-html-insert-unknown-tags.diff
rename to applied_patches/0114-sw-html-insert-unknown-tags.diff
diff --git a/applied_patches/0115-gcc4-visibility-sc.diff b/applied_patches/0115-gcc4-visibility-sc.diff
deleted file mode 100644
index 4c183512d..000000000
--- a/applied_patches/0115-gcc4-visibility-sc.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- sc/inc/optutil.hxx.old	2000-11-02 20:08:15.000000000 +0100
-+++ sc/inc/optutil.hxx	2005-08-02 19:32:54.000000000 +0200
-@@ -70,6 +70,7 @@
- #include <unotools/configitem.hxx>
- #include <tools/link.hxx>
- 
-+#include "scdllapi.h"
- 
- class ScOptionsUtil
- {
-@@ -80,7 +84,7 @@
- 
- //	ConfigItem for classes that use items from several sub trees
- 
--class ScLinkConfigItem : public utl::ConfigItem
-+class SC_DLLPUBLIC ScLinkConfigItem : public utl::ConfigItem
- {
- 	Link	aCommitLink;
- 
diff --git a/applied_patches/0112-sw-ww8-field-fix.diff b/applied_patches/0115-sw-ww8-field-fix.diff
similarity index 100%
rename from applied_patches/0112-sw-ww8-field-fix.diff
rename to applied_patches/0115-sw-ww8-field-fix.diff
diff --git a/applied_patches/0118-sc-datapilot-autoformat.diff b/applied_patches/0118-sc-datapilot-autoformat.diff
dissimilarity index 79%
index 7ad5ddba2..2610b2e96 100644
--- a/applied_patches/0118-sc-datapilot-autoformat.diff
+++ b/applied_patches/0118-sc-datapilot-autoformat.diff
@@ -1,399 +1,356 @@
---- sc/inc/dpobject.hxx
-+++ sc/inc/dpobject.hxx
-@@ -106,6 +106,7 @@ private:
- 	ScDPOutput*				pOutput;
- 	BOOL					bSettingsChanged;
- 	BOOL					bAlive;			// FALSE if only used to hold settings
-+	USHORT                                  nAutoFormatIndex;
- 	BOOL					bAllowMove;
- 	long					nHeaderRows;	// page fields plus filter button
- 
-@@ -137,6 +138,9 @@ public:
- 	void				SetOutRange(const ScRange& rRange);
- 	const ScRange&		GetOutRange() const		{ return aOutRange; }
- 
-+	void 			SetAutoFormatIndex (const USHORT nIndex);
-+	USHORT			GetAutoFormatIndex ()	{ if (this == NULL) return 65535; else return nAutoFormatIndex; }
-+
- 	void				SetSheetDesc(const ScSheetSourceDesc& rDesc);
- 	void				SetImportDesc(const ScImportSourceDesc& rDesc);
- 	void				SetServiceData(const ScDPServiceDesc& rDesc);
---- sc/inc/sc.hrc.old	2009-04-06 16:41:39.000000000 +0000
-+++ sc/inc/sc.hrc	2009-04-06 16:41:48.000000000 +0000
-@@ -1652,6 +1652,9 @@
- #define SID_DATA_FORM               (SC_OOO_BUILD_START + 2) // menu (in Data menu)
- #define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 3) // dialog
- 
-+// Autoformat for DataPilot
-+#define SID_PIVOT_AFMT              (SC_OOO_BUILD_START + 4)
-+
- #endif 
- 
- 
---- sc/sdi/pivotsh.sdi.old	2009-04-02 10:44:54.000000000 +0000
-+++ sc/sdi/pivotsh.sdi	2009-04-06 16:41:48.000000000 +0000
-@@ -34,6 +34,7 @@ interface Pivot
- 	SID_PIVOT_RECALC	[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
- 	SID_PIVOT_KILL		[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
-         SID_DP_FILTER           [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
-+	SID_PIVOT_AFMT		[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
- }
- 
- shell ScPivotShell
---- sc/sdi/scalc.sdi.old	2009-04-06 16:41:39.000000000 +0000
-+++ sc/sdi/scalc.sdi	2009-04-06 16:41:48.000000000 +0000
-@@ -1900,6 +1900,31 @@ SfxVoidItem DeletePivotTable SID_PIVOT_K
- 	GroupId = GID_DATA;
- ]
- 
-+SfxVoidItem AutoFormatPivotTable SID_PIVOT_AFMT
-+()
-+[
-+        /* flags: */
-+        AutoUpdate = FALSE,
-+        Cachable = Cachable,
-+        FastCall = FALSE,
-+        HasCoreId = FALSE,
-+        HasDialog = FALSE,
-+        ReadOnlyDoc = TRUE,
-+        Toggle = FALSE,
-+        Container = FALSE,
-+        RecordAbsolute = FALSE,
-+        RecordPerSet;
-+        Synchron;
-+                                                                                                                             
-+        /* config: */
-+        AccelConfig = FALSE,
-+        MenuConfig = TRUE,
-+        StatusBarConfig = FALSE,
-+        ToolBoxConfig = FALSE,
-+        GroupId = GID_DATA;
-+]
-+
-+
- //--------------------------------------------------------------------------
- SfxVoidItem DeletePrintArea SID_DELETE_PRINTAREA
- ()
---- sc/source/core/data/dpobject.cxx
-+++ sc/source/core/data/dpobject.cxx
-@@ -165,6 +165,7 @@ ScDPObject::ScDPObject( ScDocument* pD ) :
- 	pOutput( NULL ),
- 	bSettingsChanged( FALSE ),
- 	bAlive( FALSE ),
-+    nAutoFormatIndex( 65535 ),
- 	bAllowMove( FALSE ),
- 	nHeaderRows( 0 )
- {
-@@ -178,6 +179,7 @@ ScDPObject::ScDPObject(const ScDPObject&
- 	pOutput( NULL ),
- 	bSettingsChanged( FALSE ),
- 	bAlive( FALSE ),
-+	nAutoFormatIndex( r.nAutoFormatIndex ),
- 	bAllowMove( FALSE ),
- 	nHeaderRows( r.nHeaderRows )
- {
-@@ -234,6 +236,11 @@ void ScDPObject::SetSaveData(const ScDPS
- 	InvalidateData();		// re-init source from SaveData
- }
- 
-+void ScDPObject::SetAutoFormatIndex(const USHORT nIndex)
-+{
-+	nAutoFormatIndex	= nIndex;
-+}
-+
- void ScDPObject::SetOutRange(const ScRange& rRange)
- {
- 	aOutRange = rRange;
---- sc/source/ui/docshell/dbdocfun.cxx.old	2009-04-02 10:45:27.000000000 +0000
-+++ sc/source/ui/docshell/dbdocfun.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -1390,6 +1390,35 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPO
- 	delete pNewUndoDoc;
- 	delete pUndoDPObj;
- 
-+	if (const_cast<ScDPObject *>(pNewObj)->GetAutoFormatIndex() != 65535)
-+	{
-+		ScViewData* pViewData = rDocShell.GetViewData();
-+		rDocShell.GetViewData()->GetViewShell()->GetDBData( TRUE, SC_DB_OLD );
-+		const ScMarkData& rMark1 = pViewData->GetMarkData();
-+		SCCOL nStartCol;
-+		SCROW nStartRow;
-+		SCTAB nStartTab;
-+		SCCOL nEndCol;
-+		SCROW nEndRow;
-+		SCTAB nEndTab;
-+
-+		rDocShell.GetViewData()->GetSimpleArea( nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab );
-+		ScRange Outrange = pNewObj->GetOutRange();
-+		if (( (Outrange.aStart.Col() <= nStartCol) && (nStartCol <= Outrange.aEnd.Col() )&& (nStartTab == Outrange.aStart.Tab()))
-+			&& ( (Outrange.aStart.Row() <= nStartRow) && (nStartRow <= Outrange.aEnd.Row() )) )
-+			{
-+		
-+			if ( !rMark1.IsMarked() && !rMark1.IsMultiMarked() )
-+				rDocShell.GetViewData()->GetViewShell()->MarkDataArea( TRUE );
-+			//FIXME: Autoformat even when clicked from a non-dp cell.
-+			pViewData->MoveNextRow();		
-+			rDocShell.GetViewData()->GetViewShell()->AutoFormat( const_cast<ScDPObject *>(pNewObj)->GetAutoFormatIndex());
-+			rDocShell.GetViewData()->GetViewShell()->AutoFormatPivotTable( const_cast<ScDPObject *>(pNewObj), const_cast<ScDPObject *>(pNewObj)->GetAutoFormatIndex() );		
-+			pViewData->MovePrevRow();
-+			}
-+	}
-+
-+
- 	if (bDone)
- 		aModificator.SetDocumentModified();
- 
---- sc/source/ui/inc/dbfunc.hxx.old	2009-04-02 10:45:37.000000000 +0000
-+++ sc/source/ui/inc/dbfunc.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -90,6 +90,8 @@ public:
-                                     const ScDPObject& rSource, BOOL bApi = FALSE );
- 	void			DeletePivotTable();
- 	void			RecalcPivotTable();
-+        void                    AutoFormatPivotTable(USHORT nIndex);
-+        void            	AutoFormatPivotTable(ScDPObject*        pDPObj, USHORT nIndex);
- 
-     BOOL            HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rParts );
-     BOOL            HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo );
---- sc/source/ui/inc/viewdata.hxx.old	2009-04-02 10:45:37.000000000 +0000
-+++ sc/source/ui/inc/viewdata.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -331,6 +331,10 @@ public:
- 
- 	ScMarkType      GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab,
- 									SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const;
-+
-+    void            MoveNextRow();
-+    void            MovePrevRow();
-+
- 	ScMarkType      GetSimpleArea( ScRange& rRange ) const;
-                     /// May modify rNewMark using MarkToSimple().
-     ScMarkType      GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const;
---- sc/source/ui/miscdlgs/makefile.mk
-+++ sc/source/ui/miscdlgs/makefile.mk
-@@ -117,7 +117,9 @@ LIB1OBJFILES =  \
- 	$(SLO)$/conflictsdlg.obj    \
- 	$(SLO)$/sharedocdlg.obj \
- 	$(SLO)$/protectiondlg.obj \
--	$(SLO)$/retypepassdlg.obj
-+	$(SLO)$/retypepassdlg.obj \
-+	$(SLO)$/scuiautofmt.obj			\
-+	$(SLO)$/strindlg.obj            
- 
- EXCEPTIONSFILES = \
-     $(SLO)$/acredlin.obj        \
---- sc/source/ui/src/popup.src.old	2009-04-02 10:45:23.000000000 +0000
-+++ sc/source/ui/src/popup.src	2009-04-06 16:41:48.000000000 +0000
-@@ -206,6 +206,84 @@ Menu RID_POPUP_PIVOT
- 			Text [ en-US ] = "~Start..." ;
- 		};
- 		MenuItem
-+                {
-+                        Identifier = SID_PIVOT_AFMT ;
-+                        HelpId = SID_PIVOT_AFMT ;
-+			Text [ en-US ] = "~AutoFormat..." ; 
-+                        Text [ de ] = "A~utoFormat" ;
-+			Text [ af ] = "OutoFormateer..." ;
-+			Text [ ar ] = "تنسيق تلقائي..." ;
-+			Text [ as-IN ] = "স্বয়ংক্ৰিয় ফৰমেট ..." ;
-+			Text [ be-BY ] = "Аўта-фармат..." ;
-+			Text [ bg ] = "Автоформат..." ;
-+			Text [ br ] = "EmVentrezhañ..." ;
-+			Text [ bs ] = "AutoFormat..." ;
-+			Text [ ca ] = "Formatació automàtica..." ;
-+			Text [ cs ] = "Automatický formát..." ;
-+			Text [ cy ] = "AwtoFformat..." ;
-+			Text [ da ] = "Autoformat..." ;
-+			Text [ el ] = "Αυτόματη μορφοποίηση..." ;
-+			Text [ en-GB ] = "AutoFormat..." ;
-+			Text [ en-ZA ] = "AutoFormat..." ;
-+			Text [ eo ] = "Aŭtomate Formati..." ;
-+			Text [ es ] = "Formateado automático..." ;
-+			Text [ et ] = "Automaatvormindus..." ;
-+			Text [ fa ] = "قالب‌بندی خودکار..." ;
-+			Text [ fi ] = "Automaattinen muotoilu..." ;
-+			Text [ fr ] = "AutoFormat..." ;
-+			Text [ ga ] = "UathFhormáidigh..." ;
-+			Text [ gu ] = "આપોઆપબંધારણ..." ;
-+			Text [ gu-IN ] = "આપોઆપબંધારણ..." ;
-+			Text [ hi-IN ] = "स्वचालित ढंग से रचना..." ;
-+			Text [ hr ] = "SamoOblikovanje..." ;
-+			Text [ hu ] = "Automatikus formázás..." ;
-+			Text [ it ] = "Formattazione automatica..." ;
-+			Text [ ja ] = "オートフォーマット..." ;
-+			Text [ ka ] = "ავტო-ფორმატირება..." ;
-+			Text [ km ] = "ទ្រង់ទ្រាយ​ស្វ័យប្រវត្តិ..." ;
-+			Text [ ko ] = "자동 서식..." ;
-+			Text [ ku ] = "TeşekirinaBixweber..." ;
-+			Text [ lt ] = "Automatinis formatavimas..." ;
-+			Text [ mk ] = "Автоматско форматирање..." ;
-+			Text [ ml-IN ] = "സ്വയം രൂപപ്പെടുത്തുക..." ;
-+			Text [ mr-IN ] = "स्वंयचलित रचना..." ;
-+			Text [ nb ] = "Autoformatering..." ;
-+			Text [ nl ] = "AutoOpmaak..." ;
-+			Text [ nn ] = "Autoformatering..." ;
-+			Text [ nr ] = "Fometha ngokuzenzakalela..." ;
-+			Text [ ns ] = "Fomate ye e Itiragalelago..." ;
-+			Text [ or-IN ] = "ସ୍ବଯଂଚାଳିତଫର୍ମାଟ..." ;
-+			Text [ pa-IN ] = "ਸਵੈ-ਫਾਰਮਿਟ..." ;
-+			Text [ pl ] = "Autoformatowanie..." ;
-+			Text [ pt ] = "Formatação automática..." ;
-+			Text [ pt-BR ] = "AutoFormatar..." ;
-+			Text [ ru ] = "Автоформат..." ;
-+			Text [ rw ] = "Nyamwihamiterere..." ;
-+			Text [ sh-YU ] = "Automatsko formatiranje..." ;
-+			Text [ sk ] = "Automatický formát..." ;
-+			Text [ sl ] = "Samooblikovanje..." ;
-+			Text [ sr-CS ] = "Аутоматско форматирање..." ;
-+			Text [ ss ] = "Kutifomethekela..." ;
-+			Text [ st ] = "Fomate e iketsahallang..." ;
-+			Text [ sv ] = "Autoformat..." ;
-+			Text [ sw-TZ ] = "AutoFormat..." ;
-+			Text [ ta ] = "தானியக்க வடிவம்..." ;
-+			Text [ ta-IN ] = "தானியக்க வடிவம்..." ;
-+			Text [ te-IN ] = "స్వయంరూపలావణ్యం..." ;
-+			Text [ tg ] = "Автоформат..." ;
-+			Text [ th ] = "AutoFormat..." ;
-+			Text [ tr ] = "Otomatik Biçimlendirme..." ;
-+			Text [ ts ] = "Fomati yo tiendlekela hi yoxe..." ;
-+			Text [ uk ] = "Автоформат..." ;
-+			Text [ ur-IN ] = "خودکارطریقہ..." ;
-+			Text [ ve ] = "OthoFomathi..." ;
-+			Text [ vi ] = "Tự định dạng..." ;
-+			Text [ xh ] = "Ulungiselelo Oluzenzekelayo..." ;
-+			Text [ zh-CN ] = "自动格式..." ;
-+			Text [ zh-TW ] = "自動格式..." ;
-+			Text [ zu ] = "Isakhiwo esizenzekelayo..." ;
-+		};
-+		MenuItem
- 		{
- 			Identifier = SID_PIVOT_RECALC ;
- 			HelpId = SID_PIVOT_RECALC ;
---- sc/source/ui/view/dbfunc3.cxx.old	2009-04-02 10:45:40.000000000 +0000
-+++ sc/source/ui/view/dbfunc3.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -1976,7 +1976,28 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
- 	else		// "Keine Operationen auszufuehren"
- 		ErrorMessage(STR_MSSG_REPEATDB_0);
- }
-+void ScDBFunc::AutoFormatPivotTable(USHORT nIndex)
-+{
-+	ScDocument* pDoc	= GetViewData()->GetDocument();
- 
-+	//	old pivot not used any more
-+
-+	ScDPObject*	pDPObj	= pDoc->GetDPAtCursor( GetViewData()->GetCurX(),
-+												  GetViewData()->GetCurY(),
-+												  GetViewData()->GetTabNo() );
-+	if ( pDPObj )
-+	{
-+		pDPObj->SetAutoFormatIndex(nIndex);
-+	}
-+	else
-+		ErrorMessage(STR_PIVOT_NOTFOUND);
-+
-+}
-+
-+void ScDBFunc::AutoFormatPivotTable(ScDPObject*	pDPObj, USHORT nIndex)
-+{
-+	pDPObj->SetAutoFormatIndex(nIndex);
-+}
- 
- 
- 
---- sc/source/ui/view/pivotsh.cxx.old	2009-04-02 10:45:40.000000000 +0000
-+++ sc/source/ui/view/pivotsh.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -56,6 +56,12 @@
- #include "uiitems.hxx"
- //CHINA001 #include "pfiltdlg.hxx"
- #include "scabstdlg.hxx" //CHINA001
-+
-+#include "autoform.hxx"
-+#include "scuiautofmt.hxx"
-+#include "editable.hxx"
-+
-+
- //------------------------------------------------------------------------
- 
- #define ScPivotShell
-@@ -99,13 +105,56 @@ void ScPivotShell::Execute( SfxRequest&
- {
- 	switch ( rReq.GetSlot() )
- 	{
--		case SID_PIVOT_RECALC:
--			pViewShell->RecalcPivotTable();
--			break;
-+		case SID_PIVOT_AFMT:
-+			{
-+			ScViewData* pViewData = pViewShell->GetViewData();
-+
-+			pViewShell->GetDBData( TRUE, SC_DB_OLD );
-+			const ScMarkData& rMark1 = pViewData->GetMarkData();
-+			if ( !rMark1.IsMarked() && !rMark1.IsMultiMarked() )
-+				pViewShell->MarkDataArea( TRUE );
-+			
-+			Window* pDlgParent = pViewShell->GetDialogParent();
-+			
-+			pViewData->MoveNextRow();
-+				
-+			ScGlobal::ClearAutoFormat();
-+			ScAutoFormatData* pNewEntry = pViewShell->CreateAutoFormatData();
-+			ScAutoFormatDlg*  pDlg		= new ScAutoFormatDlg(
-+													pDlgParent,
-+													ScGlobal::GetAutoFormat(),
-+				                                                               pNewEntry,
-+                            				                                   pViewShell->GetViewData()->GetDocument() );
-+
-+			if ( pDlg->Execute() == RET_OK )
-+			{
-+				ScEditableTester aTester( pViewShell );
-+				if ( !aTester.IsEditable() )
-+				{
-+					pViewShell->ErrorMessage(aTester.GetMessageId());
-+				}
-+				else
-+				{
-+					/* AutoFormat and Store the index */
-+					pViewShell->AutoFormat( pDlg->GetIndex() );
-+					pViewShell->AutoFormatPivotTable( pDlg->GetIndex() );
-+				}
-+			}
-+			delete pDlg;
-+			delete pNewEntry;
- 
-+
-+			//pViewShell->DeletePivotTable();
-+			//pViewShell->RecalcPivotTable();
-+			break;
-+			}
- 		case SID_PIVOT_KILL:
- 			pViewShell->DeletePivotTable();
- 			break;
-+		case SID_PIVOT_RECALC:
-+			//pViewShell->DeletePivotTable();
-+			pViewShell->RecalcPivotTable();
-+			break;
- 
-         case SID_DP_FILTER:
-         {
---- sc/source/ui/view/viewdata.cxx.old	2009-04-02 10:45:40.000000000 +0000
-+++ sc/source/ui/view/viewdata.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -670,6 +670,22 @@ void ScViewData::RefreshZoom()
- 	aLogicMode.SetScaleY( GetZoomY() );
- }
- 
-+void ScViewData::MoveNextRow()
-+{
-+      ScRange aMarkRange;
-+      aMarkData.GetMarkArea(aMarkRange);
-+      aMarkRange.aStart.Set(aMarkRange.aStart.Col(), aMarkRange.aStart.Row() +1, aMarkRange.aStart.Tab());
-+      aMarkData.SetMarkArea(aMarkRange);
-+}
-+
-+void ScViewData::MovePrevRow()
-+{
-+      ScRange aMarkRange;
-+      aMarkData.GetMarkArea(aMarkRange);
-+      aMarkRange.aStart.Set(aMarkRange.aStart.Col(), aMarkRange.aStart.Row() -1, aMarkRange.aStart.Tab());
-+      aMarkData.SetMarkArea(aMarkRange);
-+}
-+
- void ScViewData::SetPagebreakMode( BOOL bSet )
- {
- 	bPagebreak = bSet;
+diff --git sc/inc/sc.hrc sc/inc/sc.hrc
+index d67b625..33d0240 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -1664,6 +1664,9 @@
+ #define SID_DATA_FORM               (SC_OOO_BUILD_START + 2) // menu (in Data menu)
+ #define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 3) // dialog
+ 
+-#endif
++// Autoformat for DataPilot
++#define SID_PIVOT_AFMT              (SC_OOO_BUILD_START + 4)
++
++#endif 
+ 
+ 
+diff --git sc/sdi/pivotsh.sdi sc/sdi/pivotsh.sdi
+index ddbb49c..94821e5 100644
+--- sc/sdi/pivotsh.sdi
++++ sc/sdi/pivotsh.sdi
+@@ -34,6 +34,7 @@ interface Pivot
+     SID_PIVOT_RECALC	[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
+     SID_PIVOT_KILL		[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
+         SID_DP_FILTER           [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
++	SID_PIVOT_AFMT		[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
+ }
+ 
+ shell ScPivotShell
+diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
+index 39380f8..ad21670 100644
+--- sc/sdi/scalc.sdi
++++ sc/sdi/scalc.sdi
+@@ -1900,6 +1900,30 @@ SfxVoidItem DeletePivotTable SID_PIVOT_KILL
+     GroupId = GID_DATA;
+ ]
+ 
++SfxVoidItem AutoFormatPivotTable SID_PIVOT_AFMT
++()
++[
++        /* flags: */
++        AutoUpdate = FALSE,
++        Cachable = Cachable,
++        FastCall = FALSE,
++        HasCoreId = FALSE,
++        HasDialog = FALSE,
++        ReadOnlyDoc = TRUE,
++        Toggle = FALSE,
++        Container = FALSE,
++        RecordAbsolute = FALSE,
++        RecordPerSet;
++        Synchron;
++                                                                                                                             
++        /* config: */
++        AccelConfig = FALSE,
++        MenuConfig = TRUE,
++        StatusBarConfig = FALSE,
++        ToolBoxConfig = FALSE,
++        GroupId = GID_DATA;
++]
++
+ //--------------------------------------------------------------------------
+ SfxVoidItem DeletePrintArea SID_DELETE_PRINTAREA
+ ()
+diff --git sc/source/ui/docshell/dbdocfun.cxx sc/source/ui/docshell/dbdocfun.cxx
+index 8ee336e..d525da1 100644
+--- sc/source/ui/docshell/dbdocfun.cxx
++++ sc/source/ui/docshell/dbdocfun.cxx
+@@ -1405,6 +1405,36 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
+     delete pNewUndoDoc;
+     delete pUndoDPObj;
+ 
++    if (const_cast<ScDPObject *>(pNewObj)->GetAutoFormatIndex() != 65535)
++    {
++        ScViewData* pViewData = rDocShell.GetViewData();
++        ScTabViewShell* pViewShell = pViewData->GetViewShell();
++        pViewShell->GetDBData( TRUE, SC_DB_OLD );
++        const ScMarkData& rMark1 = pViewData->GetMarkData();
++        SCCOL nStartCol;
++        SCROW nStartRow;
++        SCTAB nStartTab;
++        SCCOL nEndCol;
++        SCROW nEndRow;
++        SCTAB nEndTab;
++
++        rDocShell.GetViewData()->GetSimpleArea( nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab );
++        ScRange Outrange = pNewObj->GetOutRange();
++        if (( (Outrange.aStart.Col() <= nStartCol) && (nStartCol <= Outrange.aEnd.Col() )&& (nStartTab == Outrange.aStart.Tab()))
++            && ( (Outrange.aStart.Row() <= nStartRow) && (nStartRow <= Outrange.aEnd.Row() )) )
++        {
++        
++            if ( !rMark1.IsMarked() && !rMark1.IsMultiMarked() )
++                pViewShell->MarkDataArea( TRUE );
++            //FIXME: Autoformat even when clicked from a non-dp cell.
++            pViewData->MoveNextRow();
++            sal_uInt16 nAutoFmtIndex = pNewObj->GetAutoFormatIndex();
++            pViewShell->AutoFormat(nAutoFmtIndex);
++            pViewShell->AutoFormatPivotTable(const_cast<ScDPObject*>(pNewObj), nAutoFmtIndex);
++            pViewData->MovePrevRow();
++        }
++    }
++
+     if (bDone)
+         aModificator.SetDocumentModified();
+ 
+diff --git sc/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
+index bb43553..91834e1 100644
+--- sc/source/ui/inc/dbfunc.hxx
++++ sc/source/ui/inc/dbfunc.hxx
+@@ -90,6 +90,8 @@ public:
+                                     const ScDPObject& rSource, BOOL bApi = FALSE );
+     void			DeletePivotTable();
+     void			RecalcPivotTable();
++    void            AutoFormatPivotTable(USHORT nIndex);
++    void            AutoFormatPivotTable(ScDPObject* pDPObj, USHORT nIndex);
+ 
+     BOOL            HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rParts );
+     BOOL            HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo );
+diff --git sc/source/ui/inc/viewdata.hxx sc/source/ui/inc/viewdata.hxx
+index 024eac3..6f0d986 100644
+--- sc/source/ui/inc/viewdata.hxx
++++ sc/source/ui/inc/viewdata.hxx
+@@ -332,6 +332,10 @@ public:
+     ScMarkType      GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab,
+                                     SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const;
+     ScMarkType      GetSimpleArea( ScRange& rRange ) const;
++
++    void            MoveNextRow();
++    void            MovePrevRow();
++
+                     /// May modify rNewMark using MarkToSimple().
+     ScMarkType      GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const;
+     void			GetMultiArea( ScRangeListRef& rRange ) const;
+diff --git sc/source/ui/miscdlgs/makefile.mk sc/source/ui/miscdlgs/makefile.mk
+index 12b2d2f..df75a88 100644
+--- sc/source/ui/miscdlgs/makefile.mk
++++ sc/source/ui/miscdlgs/makefile.mk
+@@ -126,6 +124,8 @@ LIB1OBJFILES =  \
+     $(SLO)$/warnbox.obj         \
+     $(SLO)$/conflictsdlg.obj    \
+     $(SLO)$/sharedocdlg.obj \
++    $(SLO)$/scuiautofmt.obj     \
++    $(SLO)$/strindlg.obj		\
+     $(SLO)$/protectiondlg.obj \
+     $(SLO)$/retypepassdlg.obj
+ 
+diff --git sc/source/ui/src/popup.src sc/source/ui/src/popup.src
+index 05d10b9..4e19349 100644
+--- sc/source/ui/src/popup.src
++++ sc/source/ui/src/popup.src
+@@ -213,6 +213,84 @@ Menu RID_POPUP_PIVOT
+         };
+         MenuItem
+         {
++            Identifier = SID_PIVOT_AFMT ;
++            HelpId = SID_PIVOT_AFMT ;
++            Text [ en-US ] = "~AutoFormat..." ; 
++            Text [ de ] = "A~utoFormat" ;
++            Text [ af ] = "OutoFormateer..." ;
++            Text [ ar ] = "تنسيق تلقائي..." ;
++            Text [ as-IN ] = "স্বয়ংক্ৰিয় ফৰমেট ..." ;
++            Text [ be-BY ] = "Аўта-фармат..." ;
++            Text [ bg ] = "Автоформат..." ;
++            Text [ br ] = "EmVentrezhañ..." ;
++            Text [ bs ] = "AutoFormat..." ;
++            Text [ ca ] = "Formatació automàtica..." ;
++            Text [ cs ] = "Automatický formát..." ;
++            Text [ cy ] = "AwtoFformat..." ;
++            Text [ da ] = "Autoformat..." ;
++            Text [ el ] = "Αυτόματη μορφοποίηση..." ;
++            Text [ en-GB ] = "AutoFormat..." ;
++            Text [ en-ZA ] = "AutoFormat..." ;
++            Text [ eo ] = "Aŭtomate Formati..." ;
++            Text [ es ] = "Formateado automático..." ;
++            Text [ et ] = "Automaatvormindus..." ;
++            Text [ fa ] = "قالب‌بندی خودکار..." ;
++            Text [ fi ] = "Automaattinen muotoilu..." ;
++            Text [ fr ] = "AutoFormat..." ;
++            Text [ ga ] = "UathFhormáidigh..." ;
++            Text [ gu ] = "આપોઆપબંધારણ..." ;
++            Text [ gu-IN ] = "આપોઆપબંધારણ..." ;
++            Text [ hi-IN ] = "स्वचालित ढंग से रचना..." ;
++            Text [ hr ] = "SamoOblikovanje..." ;
++            Text [ hu ] = "Automatikus formázás..." ;
++            Text [ it ] = "Formattazione automatica..." ;
++            Text [ ja ] = "オートフォーマット..." ;
++            Text [ ka ] = "ავტო-ფორმატირება..." ;
++            Text [ km ] = "ទ្រង់ទ្រាយ​ស្វ័យប្រវត្តិ..." ;
++            Text [ ko ] = "자동 서식..." ;
++            Text [ ku ] = "TeşekirinaBixweber..." ;
++            Text [ lt ] = "Automatinis formatavimas..." ;
++            Text [ mk ] = "Автоматско форматирање..." ;
++            Text [ ml-IN ] = "സ്വയം രൂപപ്പെടുത്തുക..." ;
++            Text [ mr-IN ] = "स्वंयचलित रचना..." ;
++            Text [ nb ] = "Autoformatering..." ;
++            Text [ nl ] = "AutoOpmaak..." ;
++            Text [ nn ] = "Autoformatering..." ;
++            Text [ nr ] = "Fometha ngokuzenzakalela..." ;
++            Text [ ns ] = "Fomate ye e Itiragalelago..." ;
++            Text [ or-IN ] = "ସ୍ବଯଂଚାଳିତଫର୍ମାଟ..." ;
++            Text [ pa-IN ] = "ਸਵੈ-ਫਾਰਮਿਟ..." ;
++            Text [ pl ] = "Autoformatowanie..." ;
++            Text [ pt ] = "Formatação automática..." ;
++            Text [ pt-BR ] = "AutoFormatar..." ;
++            Text [ ru ] = "Автоформат..." ;
++            Text [ rw ] = "Nyamwihamiterere..." ;
++            Text [ sh-YU ] = "Automatsko formatiranje..." ;
++            Text [ sk ] = "Automatický formát..." ;
++            Text [ sl ] = "Samooblikovanje..." ;
++            Text [ sr-CS ] = "Аутоматско форматирање..." ;
++            Text [ ss ] = "Kutifomethekela..." ;
++            Text [ st ] = "Fomate e iketsahallang..." ;
++            Text [ sv ] = "Autoformat..." ;
++            Text [ sw-TZ ] = "AutoFormat..." ;
++            Text [ ta ] = "தானியக்க வடிவம்..." ;
++            Text [ ta-IN ] = "தானியக்க வடிவம்..." ;
++            Text [ te-IN ] = "స్వయంరూపలావణ్యం..." ;
++            Text [ tg ] = "Автоформат..." ;
++            Text [ th ] = "AutoFormat..." ;
++            Text [ tr ] = "Otomatik Biçimlendirme..." ;
++            Text [ ts ] = "Fomati yo tiendlekela hi yoxe..." ;
++            Text [ uk ] = "Автоформат..." ;
++            Text [ ur-IN ] = "خودکارطریقہ..." ;
++            Text [ ve ] = "OthoFomathi..." ;
++            Text [ vi ] = "Tự định dạng..." ;
++            Text [ xh ] = "Ulungiselelo Oluzenzekelayo..." ;
++            Text [ zh-CN ] = "自动格式..." ;
++            Text [ zh-TW ] = "自動格式..." ;
++            Text [ zu ] = "Isakhiwo esizenzekelayo..." ;
++        };
++        MenuItem
++        {
+             Identifier = SID_PIVOT_RECALC ;
+             HelpId = SID_PIVOT_RECALC ;
+             Text [ en-US ] = "~Refresh" ;
+diff --git sc/source/ui/view/dbfunc3.cxx sc/source/ui/view/dbfunc3.cxx
+index 86fc703..1e5ff2c 100644
+--- sc/source/ui/view/dbfunc3.cxx
++++ sc/source/ui/view/dbfunc3.cxx
+@@ -2296,6 +2296,28 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
+         ErrorMessage(STR_MSSG_REPEATDB_0);
+ }
+ 
++void ScDBFunc::AutoFormatPivotTable(USHORT nIndex)
++{
++    ScDocument* pDoc    = GetViewData()->GetDocument();
++
++    //  old pivot not used any more
++
++    ScDPObject* pDPObj  = pDoc->GetDPAtCursor(
++        GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
++
++    if ( pDPObj )
++    {
++        pDPObj->SetAutoFormatIndex(nIndex);
++    }
++    else
++        ErrorMessage(STR_PIVOT_NOTFOUND);
++
++}
++
++void ScDBFunc::AutoFormatPivotTable(ScDPObject*	pDPObj, USHORT nIndex)
++{
++    pDPObj->SetAutoFormatIndex(nIndex);
++}
+ 
+ 
+ 
+diff --git sc/source/ui/view/pivotsh.cxx sc/source/ui/view/pivotsh.cxx
+index 5af6f2e..cd33bde 100644
+--- sc/source/ui/view/pivotsh.cxx
++++ sc/source/ui/view/pivotsh.cxx
+@@ -56,6 +56,12 @@
+ #include "uiitems.hxx"
+ //CHINA001 #include "pfiltdlg.hxx"
+ #include "scabstdlg.hxx" //CHINA001
++
++#include "autoform.hxx"
++#include "scuiautofmt.hxx"
++#include "editable.hxx"
++
++
+ //------------------------------------------------------------------------
+ 
+ #define ScPivotShell
+@@ -102,7 +108,45 @@ void ScPivotShell::Execute( SfxRequest& rReq )
+         case SID_PIVOT_RECALC:
+             pViewShell->RecalcPivotTable();
+             break;
++        case SID_PIVOT_AFMT:
++        {
++            ScViewData* pViewData = pViewShell->GetViewData();
++
++            pViewShell->GetDBData( TRUE, SC_DB_OLD );
++            const ScMarkData& rMark1 = pViewData->GetMarkData();
++            if ( !rMark1.IsMarked() && !rMark1.IsMultiMarked() )
++                pViewShell->MarkDataArea( TRUE );
++            
++            Window* pDlgParent = pViewShell->GetDialogParent();
++            
++            pViewData->MoveNextRow();
++                
++            ScGlobal::ClearAutoFormat();
++            ScAutoFormatData* pNewEntry = pViewShell->CreateAutoFormatData();
++            ScAutoFormatDlg*  pDlg = new ScAutoFormatDlg(
++                pDlgParent, ScGlobal::GetAutoFormat(), pNewEntry, pViewData->GetDocument() );
++
++            if ( pDlg->Execute() == RET_OK )
++            {
++                ScEditableTester aTester( pViewShell );
++                if ( !aTester.IsEditable() )
++                {
++                    pViewShell->ErrorMessage(aTester.GetMessageId());
++                }
++                else
++                {
++                    /* AutoFormat and Store the index */
++                    pViewShell->AutoFormat( pDlg->GetIndex() );
++                    pViewShell->AutoFormatPivotTable( pDlg->GetIndex() );
++                }
++            }
++            delete pDlg;
++            delete pNewEntry;
+ 
++            //pViewShell->DeletePivotTable();
++            //pViewShell->RecalcPivotTable();
++        }
++        break;
+         case SID_PIVOT_KILL:
+             pViewShell->DeletePivotTable();
+             break;
+diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
+index fbb1306..df48982 100644
+--- sc/source/ui/view/viewdata.cxx
++++ sc/source/ui/view/viewdata.cxx
+@@ -670,6 +670,22 @@ void ScViewData::RefreshZoom()
+     aLogicMode.SetScaleY( GetZoomY() );
+ }
+ 
++void ScViewData::MoveNextRow()
++{
++      ScRange aMarkRange;
++      aMarkData.GetMarkArea(aMarkRange);
++      aMarkRange.aStart.Set(aMarkRange.aStart.Col(), aMarkRange.aStart.Row() +1, aMarkRange.aStart.Tab());
++      aMarkData.SetMarkArea(aMarkRange);
++}
++
++void ScViewData::MovePrevRow()
++{
++      ScRange aMarkRange;
++      aMarkData.GetMarkArea(aMarkRange);
++      aMarkRange.aStart.Set(aMarkRange.aStart.Col(), aMarkRange.aStart.Row() -1, aMarkRange.aStart.Tab());
++      aMarkData.SetMarkArea(aMarkRange);
++}
++
+ void ScViewData::SetPagebreakMode( BOOL bSet )
+ {
+     bPagebreak = bSet;
diff --git a/applied_patches/0122-sc-dp-gridlayout.diff b/applied_patches/0122-sc-dp-gridlayout.diff
dissimilarity index 88%
index 76a35d8b3..a5968c7c9 100644
--- a/applied_patches/0122-sc-dp-gridlayout.diff
+++ b/applied_patches/0122-sc-dp-gridlayout.diff
@@ -1,506 +1,110 @@
---- sc/inc/dpobject.hxx
-+++ sc/inc/dpobject.hxx
-@@ -110,6 +110,7 @@ private:
- 	USHORT                                  nAutoFormatIndex;
- 	BOOL					bAllowMove;
- 	long					nHeaderRows;	// page fields plus filter button
-+    bool                    bHeaderLayout;  // TRUE : grid, FALSE : standard
- 
- 
- 	SC_DLLPRIVATE void				CreateObjects();
-@@ -141,6 +142,9 @@ public:
- 	void 			SetAutoFormatIndex (const USHORT nIndex);
- 	USHORT			GetAutoFormatIndex ()	{ if (this == NULL) return 65535; else return nAutoFormatIndex; }
- 
-+    void                SetHeaderLayout (bool bUseGrid);
-+    bool                GetHeaderLayout ()  const { return bHeaderLayout; }
-+
- 	void				SetSheetDesc(const ScSheetSourceDesc& rDesc);
- 	void				SetImportDesc(const ScImportSourceDesc& rDesc);
- 	void				SetServiceData(const ScDPServiceDesc& rDesc);
---- sc/inc/dpoutput.hxx.old	2009-04-02 10:45:43.000000000 +0000
-+++ sc/inc/dpoutput.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -109,6 +109,7 @@ private:
- 	long					nColCount;
- 	long					nRowCount;
- 	long					nHeaderSize;
-+    bool                    bHeaderLayout;  // TRUE : grid, FALSE : standard
- 	SCCOL					nTabStartCol;
- 	SCROW					nTabStartRow;
- 	SCCOL					nMemberStartCol;
-@@ -162,6 +163,9 @@ public:
- 
-     void            GetMemberResultNames( ScStrCollection& rNames, long nDimension );
- 
-+    void            SetHeaderLayout (bool bUseGrid);
-+    bool            GetHeaderLayout () const    { return bHeaderLayout; }
-+
-     static void     GetDataDimensionNames( String& rSourceName, String& rGivenName,
-                                            const com::sun::star::uno::Reference<
-                                                com::sun::star::uno::XInterface>& xDim );
---- sc/source/core/data/dpobject.cxx
-+++ sc/source/core/data/dpobject.cxx
-@@ -168,7 +168,8 @@ ScDPObject::ScDPObject( ScDocument* pD )
- 	bAlive( FALSE ),
-     nAutoFormatIndex( 65535 ),
- 	bAllowMove( FALSE ),
--	nHeaderRows( 0 )
-+	nHeaderRows( 0 ),
-+    bHeaderLayout( false )
- {
- }
- 
-@@ -188,7 +189,8 @@ ScDPObject::ScDPObject(const ScDPObject&
- 	bAlive( FALSE ),
- 	nAutoFormatIndex( r.nAutoFormatIndex ),
- 	bAllowMove( FALSE ),
--	nHeaderRows( r.nHeaderRows )
-+	nHeaderRows( r.nHeaderRows ),
-+    bHeaderLayout( r.bHeaderLayout )
- {
- 	if (r.pSaveData)
- 		pSaveData = new ScDPSaveData(*r.pSaveData);
-@@ -241,6 +243,11 @@ void ScDPObject::SetAutoFormatIndex(cons
- 	nAutoFormatIndex	= nIndex;
- }
- 
-+void ScDPObject::SetHeaderLayout (bool bUseGrid)
-+{
-+    bHeaderLayout = bUseGrid;
-+}
-+
- void ScDPObject::SetOutRange(const ScRange& rRange)
- {
- 	aOutRange = rRange;
-@@ -348,6 +355,7 @@ void ScDPObject::CreateOutput()
- 	{
-         BOOL bFilterButton = IsSheetData() && pSaveData && pSaveData->GetFilterButton();
-         pOutput = new ScDPOutput( pDoc, xSource, aOutRange.aStart, bFilterButton );
-+        pOutput->SetHeaderLayout ( bHeaderLayout );
- 
- 		long nOldRows = nHeaderRows;
- 		nHeaderRows = pOutput->GetHeaderRows();
---- sc/source/core/data/dpoutput.cxx.old	2009-04-02 10:45:01.000000000 +0000
-+++ sc/source/core/data/dpoutput.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -376,7 +376,8 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 	nRowFmtCount( 0 ),
-     nSingleNumFmt( 0 ),
- 	bSizesValid( FALSE ),
--	bSizeOverflow( FALSE )
-+	bSizeOverflow( FALSE ),
-+    bHeaderLayout( false )
- {
- 	nTabStartCol = nMemberStartCol = nDataStartCol = nTabEndCol = 0;
- 	nTabStartRow = nMemberStartRow = nDataStartRow = nTabEndRow = 0;
-@@ -666,7 +667,11 @@ void ScDPOutput::CalcSizes()
- 		nRowCount = aData.getLength();
- 		const uno::Sequence<sheet::DataResult>* pRowAry = aData.getConstArray();
- 		nColCount = nRowCount ? ( pRowAry[0].getLength() ) : 0;
--		nHeaderSize = 1;			// one row for field names
-+
-+        nHeaderSize = 1;
-+        if (GetHeaderLayout() && nColFieldCount == 0)
-+            // Insert an extra header row only when there is no column field.
-+            nHeaderSize = 2;
- 
- 		//	calculate output positions and sizes
- 
-@@ -1185,6 +1190,12 @@ bool ScDPOutput::GetDataResultPositionDa
-     return true;
- }
- 
-+void ScDPOutput::SetHeaderLayout (bool bLayout)
-+{
-+    bHeaderLayout = bLayout;
-+    bSizesValid = FALSE;
-+}
-+
- //
- //  helper functions for ScDPOutput::GetPivotData
- //
---- sc/source/filter/excel/read.cxx.old	2009-04-02 10:44:55.000000000 +0000
-+++ sc/source/filter/excel/read.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -1152,6 +1152,7 @@ FltError ImportExcel8::Read( void )
-                     case EXC_ID_SXDI:           rPTableMgr.ReadSxdi( maStrm );      break;
-                     case EXC_ID_SXVDEX:         rPTableMgr.ReadSxvdex( maStrm );    break;
-                     case EXC_ID_SXEX:           rPTableMgr.ReadSxex( maStrm );      break;
-+                    case EXC_ID_SXVIEWEX9:      rPTableMgr.ReadSxViewEx9( maStrm ); break;
-                 }
- 			}
-             break;
---- sc/source/filter/excel/xepivot.cxx.old	2009-04-02 10:44:55.000000000 +0000
-+++ sc/source/filter/excel/xepivot.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -1220,6 +1220,8 @@ XclExpPivotTable::XclExpPivotTable( cons
-         maPTInfo.maDataName = ScGlobal::GetRscString( STR_PIVOT_DATA );
-         maPTInfo.mnCacheIdx = mrPCache.GetCacheIndex();
- 
-+        maPTAutoFormat.Init( rDPObj );
-+
-         if( const ScDPSaveData* pSaveData = rDPObj.GetSaveData() )
-         {
-             // additional properties from ScDPSaveData
-@@ -1299,6 +1301,8 @@ void XclExpPivotTable::Save( XclExpStrea
-         WriteSxli( rStrm, maPTInfo.mnDataCols, maPTInfo.mnColFields );
-         // SXEX
-         WriteSxex( rStrm );
-+        // SX_AUTOFORMAT
-+        WriteSxAutoformat( rStrm );
-     }
- }
- 
-@@ -1439,6 +1443,8 @@ void XclExpPivotTable::Finalize()
-     rnDataXclRow = rnXclRow1 + maPTInfo.mnColFields + 1;
-     if( maDataFields.empty() )
-         ++rnDataXclRow;
-+    if( 0 == maPTAutoFormat.mnGridLayout )
-+        ++rnDataXclRow;
-     rnXclCol2 = ::std::max( rnXclCol2, rnDataXclCol );
-     rnXclRow2 = ::std::max( rnXclRow2, rnDataXclRow );
-     maPTInfo.mnDataCols = rnXclCol2 - rnDataXclCol + 1;
-@@ -1446,6 +1452,8 @@ void XclExpPivotTable::Finalize()
- 
-     // first heading
-     maPTInfo.mnFirstHeadRow = rnXclRow1 + 1;
-+    if( 0 == maPTAutoFormat.mnGridLayout )
-+        maPTInfo.mnFirstHeadRow++;
- }
- 
- // records ----------------------------------------------------------------
-@@ -1521,6 +1529,18 @@ void XclExpPivotTable::WriteSxex( XclExp
-     rStrm.EndRecord();
- }
- 
-+void XclExpPivotTable::WriteSxAutoformat( XclExpStream& rStrm ) const
-+{
-+    // Until we sync the autoformat ids only export if using grid header layout
-+    // That could only have been set via xls import so far.
-+    if ( 0 == maPTAutoFormat.mnGridLayout )
-+    {
-+        rStrm.StartRecord( EXC_ID_SXVIEWEX9, 17 );
-+        rStrm << maPTAutoFormat;
-+        rStrm.EndRecord();
-+    }
-+}
-+
- // ============================================================================
- 
- namespace {
---- sc/source/filter/excel/xipivot.cxx.old	2009-04-02 10:44:55.000000000 +0000
-+++ sc/source/filter/excel/xipivot.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -1296,6 +1296,11 @@ void XclImpPivotTable::ReadSxex( XclImpS
-     rStrm >> maPTExtInfo;
- }
- 
-+void XclImpPivotTable::ReadSxViewEx9( XclImpStream& rStrm )
-+{
-+    rStrm >> maPTAutoFormat;
-+}
-+
- // ----------------------------------------------------------------------------
- 
- void XclImpPivotTable::Convert()
-@@ -1363,6 +1368,7 @@ void XclImpPivotTable::Convert()
-     pDPObj->SetSheetDesc( aDesc );
-     pDPObj->SetOutRange( aOutRange );
-     pDPObj->SetAlive( TRUE );
-+    pDPObj->SetHeaderLayout( maPTAutoFormat.mnGridLayout == 0 );
-     GetDoc().GetDPCollection()->Insert( pDPObj );
- }
- 
-@@ -1458,6 +1464,12 @@ void XclImpPivotTableManager::ReadSxex(
-         maPTables.back()->ReadSxex( rStrm );
- }
- 
-+void XclImpPivotTableManager::ReadSxViewEx9( XclImpStream& rStrm )
-+{
-+    if( !maPTables.empty() )
-+        maPTables.back()->ReadSxViewEx9( rStrm );
-+}
-+
- // ----------------------------------------------------------------------------
- 
- void XclImpPivotTableManager::ReadPivotCaches( XclImpStream& rStrm )
-@@ -1473,4 +1485,85 @@ void XclImpPivotTableManager::ConvertPiv
- }
- 
- // ============================================================================
-+
-+// Pivot table autoformat settings ============================================
-+
-+/**
-+classic     : 10 08 00 00 00 00 00 00 20 00 00 00 01 00 00 00 00
-+default     : 10 08 00 00 00 00 00 00 20 00 00 00 01 00 00 00 00
-+report01    : 10 08 02 00 00 00 00 00 20 00 00 00 00 10 00 00 00
-+report02    : 10 08 02 00 00 00 00 00 20 00 00 00 01 10 00 00 00
-+report03    : 10 08 02 00 00 00 00 00 20 00 00 00 02 10 00 00 00
-+report04    : 10 08 02 00 00 00 00 00 20 00 00 00 03 10 00 00 00
-+report05    : 10 08 02 00 00 00 00 00 20 00 00 00 04 10 00 00 00
-+report06    : 10 08 02 00 00 00 00 00 20 00 00 00 05 10 00 00 00
-+report07    : 10 08 02 00 00 00 00 00 20 00 00 00 06 10 00 00 00
-+report08    : 10 08 02 00 00 00 00 00 20 00 00 00 07 10 00 00 00
-+report09    : 10 08 02 00 00 00 00 00 20 00 00 00 08 10 00 00 00
-+report10    : 10 08 02 00 00 00 00 00 20 00 00 00 09 10 00 00 00
-+table01     : 10 08 00 00 00 00 00 00 20 00 00 00 0a 10 00 00 00
-+table02     : 10 08 00 00 00 00 00 00 20 00 00 00 0b 10 00 00 00
-+table03     : 10 08 00 00 00 00 00 00 20 00 00 00 0c 10 00 00 00
-+table04     : 10 08 00 00 00 00 00 00 20 00 00 00 0d 10 00 00 00
-+table05     : 10 08 00 00 00 00 00 00 20 00 00 00 0e 10 00 00 00
-+table06     : 10 08 00 00 00 00 00 00 20 00 00 00 0f 10 00 00 00
-+table07     : 10 08 00 00 00 00 00 00 20 00 00 00 10 10 00 00 00
-+table08     : 10 08 00 00 00 00 00 00 20 00 00 00 11 10 00 00 00
-+table09     : 10 08 00 00 00 00 00 00 20 00 00 00 12 10 00 00 00
-+table10     : 10 08 00 00 00 00 00 00 20 00 00 00 13 10 00 00 00
-+none        : 10 08 00 00 00 00 00 00 20 00 00 00 15 10 00 00 00
-+**/
-+
-+XclPTAutoFormat::XclPTAutoFormat() :
-+    mbReport( 0 ),
-+    mnAutoFormat( 0 ),
-+    mnGridLayout( 0x10 )
-+{
-+}
-+
-+void XclPTAutoFormat::Init( const ScDPObject& rDPObj )
-+{
-+    if( rDPObj.GetHeaderLayout() )
-+    {
-+        mbReport     = 0;
-+        mnAutoFormat = 1;
-+        mnGridLayout = 0;
-+    }
-+    else
-+    {
-+        // Report1 for now
-+        // TODO : sync with autoformat indicies
-+        mbReport     = 2;
-+        mnAutoFormat = 1;
-+        mnGridLayout = 0x10;
-+    }
-+}
-+
-+XclImpStream& operator>>( XclImpStream& rStrm, XclPTAutoFormat& rInfo )
-+{
-+    rStrm.Ignore( 2 );
-+    rStrm >> rInfo.mbReport;            /// 2 for report* fmts ?
-+    rStrm.Ignore( 6 );
-+    sal_uInt8 nDummy;
-+    return rStrm
-+        >> rInfo.mnAutoFormat
-+        >> rInfo.mnGridLayout 
-+        >> nDummy >> nDummy >> nDummy;
-+}
-+
-+XclExpStream& operator<<( XclExpStream& rStrm, const XclPTAutoFormat& rInfo )
-+{
-+    return rStrm
-+        << EXC_PT_AUTOFMT_HEADER
-+        << rInfo.mbReport
-+        << EXC_PT_AUTOFMT_ZERO
-+        << EXC_PT_AUTOFMT_FLAGS
-+        << rInfo.mnAutoFormat
-+        << rInfo.mnGridLayout
-+        << static_cast<sal_uInt8>(0x00)
-+        << static_cast<sal_uInt8>(0x00)
-+        << static_cast<sal_uInt8>(0x00);
-+}
-+
-+// ============================================================================
- 
---- sc/source/filter/inc/xepivot.hxx.old	2009-04-02 10:44:58.000000000 +0000
-+++ sc/source/filter/inc/xepivot.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -412,6 +412,8 @@ private:
-     void                WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sal_uInt16 nIndexCount ) const;
-     /** Writes the SXEX records containing additional pivot table info. */
-     void                WriteSxex( XclExpStream& rStrm ) const;
-+    /** Writes the SX_AUTOFORMAT records with the autoformat id and header layout */
-+    void                WriteSxAutoformat( XclExpStream& rStrm ) const;
- 
-     // ------------------------------------------------------------------------
- private:
-@@ -422,6 +424,7 @@ private:
-     const XclExpPivotCache& mrPCache;       /// The pivot cache this pivot table bases on.
-     XclPTInfo           maPTInfo;           /// Info about the pivot table (SXVIEW record).
-     XclPTExtInfo        maPTExtInfo;        /// Extended info about the pivot table (SXEX record).
-+    XclPTAutoFormat     maPTAutoFormat;     /// The selected autoformat (SXVIEWEX9)
-     XclExpPTFieldList   maFieldList;        /// All fields in pivot cache order.
-     ScfUInt16Vec        maRowFields;        /// Row field indexes.
-     ScfUInt16Vec        maColFields;        /// Column field indexes.
---- sc/source/filter/inc/xipivot.hxx.old	2009-04-02 10:44:58.000000000 +0000
-+++ sc/source/filter/inc/xipivot.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -350,6 +350,9 @@ public:
-     void                ReadSxdi( XclImpStream& rStrm );
-     /** Reads an SXEX record containing additional settings for the pivot table. */
-     void                ReadSxex( XclImpStream& rStrm );
-+    /** Reads an SXVIEWEX9 record that specifies the pivot tables
-+     *  autoformat. */
-+    void                ReadSxViewEx9( XclImpStream& rStrm );
- 
-     // ------------------------------------------------------------------------
- 
-@@ -364,6 +367,7 @@ private:
- 
-     XclPTInfo           maPTInfo;           /// General info about the pivot table (SXVIEW record).
-     XclPTExtInfo        maPTExtInfo;        /// Extended info about the pivot table (SXEX record).
-+    XclPTAutoFormat     maPTAutoFormat;     /// The selected autoformat (SX_AUTOFORMAT)
-     XclImpPTFieldVec    maFields;           /// Vector containing all fields.
-     XclImpPTFieldRef    mxCurrField;        /// Current field for importing additional info.
-     ScfStringVec        maVisFieldNames;    /// Vector containing all visible field names.
-@@ -422,6 +426,9 @@ public:
-     void                ReadSxvi( XclImpStream& rStrm );
-     /** Reads an SXEX record containing additional settings for a pivot table. */
-     void                ReadSxex( XclImpStream& rStrm );
-+    /** Reads an SXVIEWEX9 record that specifies the pivot tables
-+     *  autoformat. */
-+    void                ReadSxViewEx9( XclImpStream& rStrm );
- 
-     // ------------------------------------------------------------------------
- 
---- sc/source/filter/inc/xlpivot.hxx.old	2009-04-02 10:44:58.000000000 +0000
-+++ sc/source/filter/inc/xlpivot.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -41,6 +41,7 @@
- #include <tools/datetime.hxx>
- #include "ftools.hxx"
- #include "xladdress.hxx"
-+#include "dpobject.hxx"
- 
- class XclImpStream;
- class XclExpStream;
-@@ -73,6 +74,10 @@ const sal_uInt16 EXC_PT_MAXDATACOUNT
- // pivot table items
- const sal_uInt16 EXC_PT_MAXITEMCOUNT        = 32500;
- 
-+const sal_uInt16 EXC_PT_AUTOFMT_HEADER      = 0x810;
-+const sal_uInt16 EXC_PT_AUTOFMT_ZERO        = 0;
-+const sal_uInt32 EXC_PT_AUTOFMT_FLAGS       = 0x20;
-+
- /** Data type of a pivot cache item. */
- enum XclPCItemType
- {
-@@ -396,6 +401,9 @@ const double EXC_SXDBEX_CREATION_DATE
- const sal_uInt16 EXC_ID_SXFDBTYPE           = 0x01BB;
- const sal_uInt16 EXC_SXFDBTYPE_DEFAULT      = 0x0000;
- 
-+// (0x0810) SXVIEWEX9 ---------------------------------------------------------
-+const sal_uInt16 EXC_ID_SXVIEWEX9       = 0x0810;
-+
- // ============================================================================
- // Pivot cache
- // ============================================================================
-@@ -786,5 +794,22 @@ XclExpStream& operator<<( XclExpStream&
- 
- // ============================================================================
- 
-+// Pivot table autoformat settings ==============================================
-+
-+/** Pivot table autoformat settings (SX_AUTOFORMAT record). */
-+struct XclPTAutoFormat
-+{
-+    sal_uInt32          mbReport;           /// 2 for report* fmts ?
-+    sal_uInt8           mnAutoFormat;       /// AutoFormat ID
-+    sal_uInt8           mnGridLayout;       /// 0 == gridlayout, 0x10 == modern
-+
-+    explicit            XclPTAutoFormat();
-+    void                Init( const ScDPObject& rDPObj );
-+};
-+
-+XclImpStream& operator>>( XclImpStream& rStrm, XclPTAutoFormat& rInfo );
-+XclExpStream& operator<<( XclExpStream& rStrm, const XclPTAutoFormat& rInfo );
-+
-+// ============================================================================
- #endif
- 
---- sc/source/filter/xml/XMLExportDataPilot.cxx.old	2009-04-06 16:41:48.000000000 +0000
-+++ sc/source/filter/xml/XMLExportDataPilot.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -781,6 +781,8 @@ void ScXMLExportDataPilot::WriteDataPilo
-                             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON, XML_FALSE);
-                         if (!pDPSave->GetDrillDown())
-                             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_FALSE);
-+                        if ((*pDPs)[i]->GetHeaderLayout ())
-+                            rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT, XML_TRUE);
- 						SvXMLElementExport aElemDP(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, sal_True, sal_True);
- 						rExport.CheckAttrList();
- 						if ((*pDPs)[i]->IsSheetData())
---- sc/source/filter/xml/xmldpimp.cxx.old	2009-04-02 10:44:57.000000000 +0000
-+++ sc/source/filter/xml/xmldpimp.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -132,7 +132,8 @@ ScXMLDataPilotTableContext::ScXMLDataPil
- 	bTargetRangeAddress(sal_False),
- 	bSourceCellRange(sal_False),
-     bShowFilter(sal_True),
--    bDrillDown(sal_True)
-+    bDrillDown(sal_True),
-+    bHeaderGridLayout(sal_False)
- {
- 	sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
- 	const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableAttrTokenMap();
-@@ -192,6 +193,11 @@ ScXMLDataPilotTableContext::ScXMLDataPil
-                 bDrillDown = IsXMLToken(sValue, XML_TRUE);
-             }
-             break;
-+            case XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT :
-+            {
-+                bHeaderGridLayout = IsXMLToken(sValue, XML_TRUE);
-+            }
-+            break;
- 		}
- 	}
- 
-@@ -313,6 +319,7 @@ void ScXMLDataPilotTableContext::EndElem
- 		pDPObject->SetName(sDataPilotTableName);
- 		pDPObject->SetTag(sApplicationData);
- 		pDPObject->SetOutRange(aTargetRangeAddress);
-+        pDPObject->SetHeaderLayout(bHeaderGridLayout);
- 		switch (nSourceType)
- 		{
- 			case SQL :
---- sc/source/filter/xml/xmldpimp.hxx.old	2009-04-02 10:44:57.000000000 +0000
-+++ sc/source/filter/xml/xmldpimp.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -111,6 +111,7 @@ class ScXMLDataPilotTableContext : publi
- 	sal_Bool		bSourceCellRange;
-     sal_Bool        bShowFilter;
-     sal_Bool        bDrillDown;
-+    sal_Bool        bHeaderGridLayout;
- 
- 	const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- 	ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
---- sc/source/filter/xml/xmlimprt.cxx.old	2009-04-02 10:44:57.000000000 +0000
-+++ sc/source/filter/xml/xmlimprt.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -1327,6 +1327,7 @@ const SvXMLTokenMap& ScXMLImport::GetDat
-             { XML_NAMESPACE_TABLE, XML_BUTTONS,				    XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS				},
-             { XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON,	    XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON	},
-             { XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN			},
-+    { XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT,      XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT    },
-             XML_TOKEN_MAP_END
-         };
- 
---- sc/source/filter/xml/xmlimprt.hxx.old	2009-04-02 10:44:57.000000000 +0000
-+++ sc/source/filter/xml/xmlimprt.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -482,7 +482,8 @@ enum ScXMLDataPilotTableAttrTokens
- 	XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS,
- 	XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS,
-     XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON,
--    XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN
-+    XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN,
-+    XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT
- };
- 
- enum ScXMLDataPilotTableElemTokens
---- xmloff/inc/xmloff/xmltoken.hxx.old	2009-04-06 16:41:48.000000000 +0000
-+++ xmloff/inc/xmloff/xmltoken.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -2508,6 +2508,7 @@ namespace xmloff { namespace token {
- 
-         XML_SHOW_FILTER_BUTTON,
-         XML_DRILL_DOWN_ON_DOUBLE_CLICK,
-+        XML_HEADER_GRID_LAYOUT,
-         XML_GROUPED_BY,
-         XML_DAYS,
-         XML_MONTHS,
---- xmloff/source/core/xmltoken.cxx.old	2009-04-06 16:41:48.000000000 +0000
-+++ xmloff/source/core/xmltoken.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -2513,6 +2513,7 @@ namespace xmloff { namespace token {
- 
-         TOKEN( "show-filter-button",                   XML_SHOW_FILTER_BUTTON ),
-         TOKEN( "drill-down-on-double-click",           XML_DRILL_DOWN_ON_DOUBLE_CLICK ),
-+        TOKEN( "header-grid-layout",                   XML_HEADER_GRID_LAYOUT ),
-         TOKEN( "grouped-by",                           XML_GROUPED_BY ),
-         TOKEN( "days",                                 XML_DAYS ),
-         TOKEN( "months",                               XML_MONTHS ),
+diff --git sc/source/filter/xml/XMLExportDataPilot.cxx sc/source/filter/xml/XMLExportDataPilot.cxx
+index eeecd3b..135a6d1 100644
+--- sc/source/filter/xml/XMLExportDataPilot.cxx
++++ sc/source/filter/xml/XMLExportDataPilot.cxx
+@@ -797,6 +797,9 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads
+                             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON, XML_FALSE);
+                         if (!pDPSave->GetDrillDown())
+                             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_FALSE);
++                        if ((*pDPs)[i]->GetHeaderLayout())
++                            rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT, XML_TRUE);
++
+                         SvXMLElementExport aElemDP(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, sal_True, sal_True);
+ 
+                         // grand total elements.
+diff --git sc/source/filter/xml/xmldpimp.cxx sc/source/filter/xml/xmldpimp.cxx
+index 070fbc2..0d4d467 100644
+--- sc/source/filter/xml/xmldpimp.cxx
++++ sc/source/filter/xml/xmldpimp.cxx
+@@ -142,7 +142,8 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
+     bTargetRangeAddress(sal_False),
+     bSourceCellRange(sal_False),
+     bShowFilter(sal_True),
+-    bDrillDown(sal_True)
++    bDrillDown(sal_True),
++    bHeaderGridLayout(sal_False)
+ {
+     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
+     const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableAttrTokenMap();
+@@ -215,6 +216,11 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
+                 bDrillDown = IsXMLToken(sValue, XML_TRUE);
+             }
+             break;
++            case XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT :
++            {
++                bHeaderGridLayout = IsXMLToken(sValue, XML_TRUE);
++            }
++            break;
+         }
+     }
+ 
+@@ -392,6 +398,7 @@ void ScXMLDataPilotTableContext::EndElement()
+         pDPObject->SetName(sDataPilotTableName);
+         pDPObject->SetTag(sApplicationData);
+         pDPObject->SetOutRange(aTargetRangeAddress);
++        pDPObject->SetHeaderLayout(bHeaderGridLayout);
+         switch (nSourceType)
+         {
+             case SQL :
+diff --git sc/source/filter/xml/xmldpimp.hxx sc/source/filter/xml/xmldpimp.hxx
+index b4df6b1..0f604a4 100644
+--- sc/source/filter/xml/xmldpimp.hxx
++++ sc/source/filter/xml/xmldpimp.hxx
+@@ -128,6 +128,7 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext
+     sal_Bool		bSourceCellRange;
+     sal_Bool        bShowFilter;
+     sal_Bool        bDrillDown;
++    sal_Bool        bHeaderGridLayout;
+ 
+     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
+index 7d9e882..bc43180 100644
+--- sc/source/filter/xml/xmlimprt.cxx
++++ sc/source/filter/xml/xmlimprt.cxx
+@@ -1328,6 +1328,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableAttrTokenMap()
+             { XML_NAMESPACE_TABLE, XML_BUTTONS,				    XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS				},
+             { XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON,	    XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON	},
+             { XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN			},
++    { XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT,      XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT    },
+             XML_TOKEN_MAP_END
+         };
+ 
+diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx
+index 139acf5..1e18bd8 100644
+--- sc/source/filter/xml/xmlimprt.hxx
++++ sc/source/filter/xml/xmlimprt.hxx
+@@ -482,7 +482,8 @@ enum ScXMLDataPilotTableAttrTokens
+     XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS,
+     XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS,
+     XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON,
+-    XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN
++    XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN,
++    XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT
+ };
+ 
+ enum ScXMLDataPilotTableElemTokens
+diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
+index dacfd53..741a120 100644
+--- xmloff/inc/xmloff/xmltoken.hxx
++++ xmloff/inc/xmloff/xmltoken.hxx
+@@ -2507,6 +2507,7 @@ namespace xmloff { namespace token {
+ 
+         XML_SHOW_FILTER_BUTTON,
+         XML_DRILL_DOWN_ON_DOUBLE_CLICK,
++        XML_HEADER_GRID_LAYOUT,
+         XML_GROUPED_BY,
+         XML_DAYS,
+         XML_MONTHS,
+diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
+index 0aea4f9..a4a43bb 100644
+--- xmloff/source/core/xmltoken.cxx
++++ xmloff/source/core/xmltoken.cxx
+@@ -2512,6 +2512,7 @@ namespace xmloff { namespace token {
+ 
+         TOKEN( "show-filter-button",                   XML_SHOW_FILTER_BUTTON ),
+         TOKEN( "drill-down-on-double-click",           XML_DRILL_DOWN_ON_DOUBLE_CLICK ),
++        TOKEN( "header-grid-layout",                   XML_HEADER_GRID_LAYOUT ),
+         TOKEN( "grouped-by",                           XML_GROUPED_BY ),
+         TOKEN( "days",                                 XML_DAYS ),
+         TOKEN( "months",                               XML_MONTHS ),
diff --git a/applied_patches/0128-sc-natural-sort.diff b/applied_patches/0128-sc-natural-sort.diff
dissimilarity index 61%
index 78c1caa76..de2fe8933 100644
--- a/applied_patches/0128-sc-natural-sort.diff
+++ b/applied_patches/0128-sc-natural-sort.diff
@@ -1,597 +1,611 @@
---- sc/inc/dbcolect.hxx.old	2009-04-02 10:45:43.000000000 +0000
-+++ sc/inc/dbcolect.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -65,6 +65,7 @@ private:
- 	BOOL			bStripData;
- 	// SortParam
- 	BOOL			bSortCaseSens;
-+	BOOL			bSortNaturalSort;
- 	BOOL			bIncludePattern;
- 	BOOL			bSortInplace;
- 	BOOL			bSortUserDef;
---- sc/inc/global.hxx.old	2009-04-06 16:41:48.000000000 +0000
-+++ sc/inc/global.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -828,6 +828,7 @@ struct SC_DLLPUBLIC ScQueryParam
- 	BOOL			bByRow;
- 	BOOL			bInplace;
- 	BOOL			bCaseSens;
-+	BOOL			bNaturalSort;
- 	BOOL			bRegExp;
-     BOOL            bMixedComparison;   // whether numbers are smaller than strings
- 	BOOL			bDuplicate;
---- sc/inc/sc.hrc.old	2009-04-06 16:41:48.000000000 +0000
-+++ sc/inc/sc.hrc	2009-04-06 16:41:48.000000000 +0000
-@@ -1126,6 +1126,7 @@
- #define SID_SORT_CASESENS		(SC_PARAM_START+2)
- #define SID_SORT_ATTRIBS		(SC_PARAM_START+3)
- #define SID_SORT_USERDEF		(SC_PARAM_START+4)
-+#define SID_SORT_NATURALSORT	(SC_PARAM_START+5)
- 
- // Resourcen -------------------------------------------------------------
- 
---- sc/inc/sortparam.hxx.old	2009-04-02 10:45:43.000000000 +0000
-+++ sc/inc/sortparam.hxx	2009-04-06 16:41:48.000000000 +0000
-@@ -52,6 +52,7 @@ struct SC_DLLPUBLIC ScSortParam
- 	BOOL		bHasHeader;
- 	BOOL		bByRow;
- 	BOOL		bCaseSens;
-+	BOOL		bNaturalSort;
- 	BOOL		bUserDef;
- 	USHORT		nUserIndex;
- 	BOOL		bIncludePattern;
---- sc/sdi/scalc.sdi.old	2009-04-06 16:41:48.000000000 +0000
-+++ sc/sdi/scalc.sdi	2009-04-06 16:41:48.000000000 +0000
-@@ -1577,7 +1577,7 @@ SfxVoidItem DataSelect SID_DATA_SELECT
- 
- //--------------------------------------------------------------------------
- SfxVoidItem DataSort SID_SORT
--(SfxBoolItem ByRows SID_SORT_BYROW,SfxBoolItem HasHeader SID_SORT_HASHEADER,SfxBoolItem CaseSensitive SID_SORT_CASESENS,SfxBoolItem IncludeAttribs SID_SORT_ATTRIBS,SfxUInt16Item UserDefIndex SID_SORT_USERDEF,SfxInt32Item Col1 FN_PARAM_1,SfxBoolItem Ascending1 FN_PARAM_2,SfxInt32Item Col2 FN_PARAM_3,SfxBoolItem Ascending2 FN_PARAM_4,SfxInt32Item Col3 FN_PARAM_5,SfxBoolItem Ascending3 FN_PARAM_6)
-+(SfxBoolItem ByRows SID_SORT_BYROW,SfxBoolItem HasHeader SID_SORT_HASHEADER,SfxBoolItem CaseSensitive SID_SORT_CASESENS,SfxBoolItem NaturalSort SID_SORT_NATURALSORT,SfxBoolItem IncludeAttribs SID_SORT_ATTRIBS,SfxUInt16Item UserDefIndex SID_SORT_USERDEF,SfxInt32Item Col1 FN_PARAM_1,SfxBoolItem Ascending1 FN_PARAM_2,SfxInt32Item Col2 FN_PARAM_3,SfxBoolItem Ascending2 FN_PARAM_4,SfxInt32Item Col3 FN_PARAM_5,SfxBoolItem Ascending3 FN_PARAM_6)
- [
- 	/* flags: */
- 	AutoUpdate = FALSE,
---- sc/source/core/data/sortparam.cxx.old	2009-04-02 10:45:01.000000000 +0000
-+++ sc/source/core/data/sortparam.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -50,7 +50,7 @@ ScSortParam::ScSortParam()
- 
- ScSortParam::ScSortParam( const ScSortParam& r ) :
- 		nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),
--		bHasHeader(r.bHasHeader),bByRow(r.bByRow),bCaseSens(r.bCaseSens),
-+		bHasHeader(r.bHasHeader),bByRow(r.bByRow),bCaseSens(r.bCaseSens),bNaturalSort(r.bNaturalSort),
- 		bUserDef(r.bUserDef),nUserIndex(r.nUserIndex),bIncludePattern(r.bIncludePattern),
- 		bInplace(r.bInplace),
- 		nDestTab(r.nDestTab),nDestCol(r.nDestCol),nDestRow(r.nDestRow),
-@@ -73,7 +73,7 @@ void ScSortParam::Clear()
- 	nCompatHeader = 2;
- 	nDestTab = 0;
- 	nUserIndex = 0;
--	bHasHeader=bCaseSens=bUserDef = FALSE;
-+	bHasHeader=bCaseSens=bUserDef=bNaturalSort = FALSE;
- 	bByRow=bIncludePattern=bInplace	= TRUE;
- 	aCollatorLocale = ::com::sun::star::lang::Locale();
- 	aCollatorAlgorithm.Erase();
-@@ -96,6 +96,7 @@ ScSortParam& ScSortParam::operator=( con
- 	nRow2			= r.nRow2;
- 	bHasHeader		= r.bHasHeader;
- 	bCaseSens		= r.bCaseSens;
-+	bNaturalSort	= r.bNaturalSort;
- 	bByRow			= r.bByRow;
- 	bUserDef		= r.bUserDef;
- 	nUserIndex		= r.nUserIndex;
-@@ -137,6 +138,7 @@ BOOL ScSortParam::operator==( const ScSo
- 		&& (bHasHeader		== rOther.bHasHeader)
- 		&& (bByRow			== rOther.bByRow)
- 		&& (bCaseSens		== rOther.bCaseSens)
-+		&& (bNaturalSort	== rOther.bNaturalSort)
- 		&& (bUserDef		== rOther.bUserDef)
- 		&& (nUserIndex		== rOther.nUserIndex)
- 		&& (bIncludePattern == rOther.bIncludePattern)
---- sc/source/core/data/table3.cxx.old	2009-04-06 16:41:48.000000000 +0000
-+++ sc/source/core/data/table3.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -64,6 +64,143 @@
- 
- #include <vector>
- 
-+using namespace ::com::sun::star;
-+
-+namespace naturalsort {
-+
-+using namespace ::com::sun::star::i18n;
-+
-+/** Splits a given string into three parts: the prefix, number string, and 
-+	the suffix.
-+
-+	@param sWhole
-+	Original string to be split into pieces
-+
-+	@param sPrefix
-+	Prefix string that consists of the part before the first number token
-+
-+	@param sSuffix
-+	String after the last number token.  This may still contain number strings.
-+
-+	@param fNum
-+	Number converted from the middle number string
-+
-+	@return Returns TRUE if a numeral element is found in a given string, or 
-+	FALSE if no numeral element is found.
-+*/
-+BOOL SplitString( const rtl::OUString &sWhole, 
-+	rtl::OUString &sPrefix, rtl::OUString &sSuffix, double &fNum )
-+{
-+	i18n::LocaleDataItem aLocaleItem = ScGlobal::pLocaleData->getLocaleItem();
-+
-+	// Get prefix element
-+	rtl::OUString sEmpty, sUser = rtl::OUString::createFromAscii( "-" );
-+	ParseResult aPRPre = ScGlobal::pCharClass->parsePredefinedToken( 
-+		KParseType::IDENTNAME, sWhole, 0, 
-+		KParseTokens::ANY_LETTER, sUser, KParseTokens::ANY_LETTER, sUser );
-+	sPrefix = sWhole.copy( 0, aPRPre.EndPos );
-+	
-+	// Return FALSE if no numeral element is found
-+	if ( aPRPre.EndPos == sWhole.getLength() )
-+		return FALSE;
-+	
-+	// Get numeral element
-+	sUser = aLocaleItem.decimalSeparator;
-+	ParseResult aPRNum = ScGlobal::pCharClass->parsePredefinedToken(
-+		KParseType::ANY_NUMBER, sWhole, aPRPre.EndPos, 
-+		KParseTokens::ANY_NUMBER, sEmpty, KParseTokens::ANY_NUMBER, sUser );
-+	
-+	if ( aPRNum.EndPos == aPRPre.EndPos )
-+		return FALSE;
-+	
-+	fNum = aPRNum.Value;
-+	sSuffix = sWhole.copy( aPRNum.EndPos );
-+	
-+	return TRUE;
-+}
-+
-+/** Naturally compares two given strings.
-+
-+	This is the main function that should be called externally.  It returns 
-+	either 1, 0, or -1 depending on the comparison result of given two strings.
-+
-+	@param sInput1
-+	Input string 1
-+
-+	@param sInput2
-+	Input string 2
-+
-+	@param bCaseSens
-+	Boolean value for case sensitivity
-+
-+	@param pData
-+	Pointer to user defined sort list
-+
-+	@param pCW
-+	Pointer to collator wrapper for normal string comparison
-+	
-+	@return Returnes 1 if sInput1 is greater, 0 if sInput1 == sInput2, and -1 if 
-+	sInput2 is greater.
-+*/
-+short Compare( const String &sInput1, const String &sInput2, 
-+			   const BOOL bCaseSens, const ScUserListData* pData, const CollatorWrapper *pCW )
-+{   
-+	rtl::OUString sStr1( sInput1 ), sStr2( sInput2 ), sPre1, sSuf1, sPre2, sSuf2;
-+
-+	do
-+	{
-+		double nNum1, nNum2;
-+		BOOL bNumFound1 = SplitString( sStr1, sPre1, sSuf1, nNum1 );
-+		BOOL bNumFound2 = SplitString( sStr2, sPre2, sSuf2, nNum2 );
-+
-+		short nPreRes; // Prefix comparison result
-+		if ( pData )
-+		{
-+			if ( bCaseSens )
-+			{
-+				if ( !bNumFound1 || !bNumFound2 )
-+					return static_cast<short>(pData->Compare( sStr1, sStr2 ));
-+				else
-+					nPreRes = pData->Compare( sPre1, sPre2 );
-+			}
-+			else
-+			{
-+				if ( !bNumFound1 || !bNumFound2 )
-+					return static_cast<short>(pData->ICompare( sStr1, sStr2 ));
-+				else
-+					nPreRes = pData->ICompare( sPre1, sPre2 );
-+			}
-+		} 
-+		else
-+		{
-+			if ( !bNumFound1 || !bNumFound2 )
-+				return static_cast<short>(pCW->compareString( sStr1, sStr2 ));
-+			else
-+				nPreRes = static_cast<short>(pCW->compareString( sPre1, sPre2 ));
-+		}
-+		
-+		// Prefix strings differ.  Return immediately.
-+		if ( nPreRes != 0 ) return nPreRes;
-+			
-+		if ( nNum1 != nNum2 )
-+		{
-+			if ( nNum1 < nNum2 ) return -1;
-+			return static_cast<short>( nNum1 > nNum2 );
-+		}
-+
-+		// The prefix and the first numerical elements are equal, but the suffix
-+		// strings may still differ.  Stay in the loop.
-+
-+		sStr1 = sSuf1;
-+		sStr2 = sSuf2;
-+
-+	} while ( true );
-+
-+	return 0;
-+}
-+
-+}
-+
- // STATIC DATA -----------------------------------------------------------
- 
- const USHORT nMaxSorts = 3;		// maximale Anzahl Sortierkriterien in aSortParam
-@@ -285,25 +422,40 @@ short ScTable::CompareCell( USHORT nSort
- 					((ScStringCell*)pCell2)->GetString(aStr2);
- 				else
- 					GetString(nCell2Col, nCell2Row, aStr2);
--				BOOL bUserDef = aSortParam.bUserDef;
-+
-+				BOOL bUserDef     = aSortParam.bUserDef;		// custom sort order
-+				BOOL bNaturalSort = aSortParam.bNaturalSort;	// natural sort
-+				BOOL bCaseSens    = aSortParam.bCaseSens;		// case sensitivity
-+				
- 				if (bUserDef)
- 				{
- 					ScUserListData* pData =
--						(ScUserListData*)(ScGlobal::GetUserList()->At(
--						aSortParam.nUserIndex));
-+						static_cast<ScUserListData*>( (ScGlobal::GetUserList()->At(
-+						aSortParam.nUserIndex)) );
-+						
- 					if (pData)
- 					{
--						if ( aSortParam.bCaseSens )
--                            nRes = sal::static_int_cast<short>( pData->Compare(aStr1, aStr2) );
-+						if ( bNaturalSort )
-+							nRes = naturalsort::Compare( aStr1, aStr2, bCaseSens, pData, pSortCollator );
- 						else
--                            nRes = sal::static_int_cast<short>( pData->ICompare(aStr1, aStr2) );
-+						{
-+							if ( bCaseSens )
-+								nRes = sal::static_int_cast<short>( pData->Compare(aStr1, aStr2) );
-+							else
-+								nRes = sal::static_int_cast<short>( pData->ICompare(aStr1, aStr2) );
-+						}
- 					}
- 					else
- 						bUserDef = FALSE;
- 
- 				}
- 				if (!bUserDef)
--					nRes = (short) pSortCollator->compareString( aStr1, aStr2 );
-+				{
-+					if ( bNaturalSort )
-+						nRes = naturalsort::Compare( aStr1, aStr2, bCaseSens, NULL, pSortCollator );
-+					else
-+						nRes = static_cast<short>( pSortCollator->compareString( aStr1, aStr2 ) );
-+				}
- 			}
- 			else if ( bStr1 )				// String <-> Zahl
- 				nRes = 1;					// Zahl vorne
---- sc/source/core/tool/dbcolect.cxx.old	2009-04-02 10:45:03.000000000 +0000
-+++ sc/source/core/tool/dbcolect.cxx	2009-04-06 16:41:48.000000000 +0000
-@@ -104,6 +104,7 @@ ScDBData::ScDBData( const ScDBData& rDat
- 	bKeepFmt			(rData.bKeepFmt),
- 	bStripData			(rData.bStripData),
- 	bSortCaseSens   	(rData.bSortCaseSens),
-+	bSortNaturalSort	(rData.bSortNaturalSort),
- 	bIncludePattern 	(rData.bIncludePattern),
- 	bSortInplace		(rData.bSortInplace),
- 	bSortUserDef		(rData.bSortUserDef),
-@@ -197,6 +198,7 @@ ScDBData& ScDBData::operator= (const ScD
- 	bKeepFmt			= rData.bKeepFmt;
- 	bStripData			= rData.bStripData;
- 	bSortCaseSens   	= rData.bSortCaseSens;
-+	bSortNaturalSort	= rData.bSortNaturalSort;
- 	bIncludePattern 	= rData.bIncludePattern;
- 	bSortInplace		= rData.bSortInplace;
- 	nSortDestTab		= rData.nSortDestTab;
-@@ -448,6 +450,7 @@ void ScDBData::GetSortParam( ScSortParam
- 	rSortParam.bByRow = bByRow;
- 	rSortParam.bHasHeader = bHasHeader;
- 	rSortParam.bCaseSens = bSortCaseSens;
-+	rSortParam.bNaturalSort = bSortNaturalSort;
- 	rSortParam.bInplace = bSortInplace;
- 	rSortParam.nDestTab = nSortDestTab;
- 	rSortParam.nDestCol = nSortDestCol;
-@@ -468,6 +471,7 @@ void ScDBData::GetSortParam( ScSortParam
- void ScDBData::SetSortParam( const ScSortParam& rSortParam )
- {
- 	bSortCaseSens = rSortParam.bCaseSens;
-+	bSortNaturalSort = rSortParam.bNaturalSort;
- 	bIncludePattern = rSortParam.bIncludePattern;
- 	bSortInplace = rSortParam.bInplace;
- 	nSortDestTab = rSortParam.nDestTab;
---- sc/source/ui/dbgui/tpsort.cxx
-+++ sc/source/ui/dbgui/tpsort.cxx
-@@ -555,6 +555,7 @@ ScTabPageSortOptions::ScTabPageSortOptio
- 		aBtnHeader		( this, ScResId( BTN_LABEL ) ),
- 		aBtnFormats 	( this, ScResId( BTN_FORMATS ) ),
- 		aBtnCopyResult	( this, ScResId( BTN_COPYRESULT ) ),
-+		aBtnNaturalSort	( this, ScResId( BTN_NATURALSORT ) ),
- 		aLbOutPos		( this, ScResId( LB_OUTAREA ) ),
- 		aEdOutPos		( this, ScResId( ED_OUTAREA ) ),
- 		aBtnSortUser	( this, ScResId( BTN_SORT_USER ) ),
-@@ -566,7 +567,7 @@ ScTabPageSortOptions::ScTabPageSortOptio
- 		aLineDirection	( this, ScResId( FL_DIRECTION ) ),
- 		aBtnTopDown 	( this, ScResId( BTN_TOP_DOWN ) ),
- 		aBtnLeftRight	( this, ScResId( BTN_LEFT_RIGHT ) ),
--		aFtAreaLabel	( this, ScResId( FT_AREA_LABEL ) ),
-+// 		aFtAreaLabel	( this, ScResId( FT_AREA_LABEL ) ),
- //		aFtArea 		( this, ScResId( FT_AREA ) ),
- 		//
- #if ENABLE_LAYOUT_EXPERIMENTAL
-@@ -605,8 +606,8 @@ __EXPORT ScTabPageSortOptions::~ScTabPag
- 
- void ScTabPageSortOptions::Init()
- {
--	aStrAreaLabel = aFtAreaLabel.GetText();
--	aStrAreaLabel.Append( (sal_Unicode) ' ' );
-+// 	aStrAreaLabel = aFtAreaLabel.GetText();
-+// 	aStrAreaLabel.Append( (sal_Unicode) ' ' );
- 
- 	//	CollatorRessource has user-visible names for sort algorithms
- 	pColRes = new CollatorRessource();
-@@ -685,8 +686,8 @@ void ScTabPageSortOptions::Init()
- 		theArea += ')';
- 
- 		//aFtArea.SetText( theArea );
--		theArea.Insert( aStrAreaLabel, 0 );
--		aFtAreaLabel.SetText( theArea );
-+		//theArea.Insert( aStrAreaLabel, 0 );
-+		//aFtAreaLabel.SetText( theArea );
- 
- 		aBtnHeader.SetText( aStrColLabel );
- 	}
-@@ -732,9 +733,10 @@ void __EXPORT ScTabPageSortOptions::Rese
- 		aLbSortUser.SelectEntryPos( 0 );
- 	}
- 
--	aBtnCase.Check		( rSortData.bCaseSens );
--	aBtnFormats.Check	( rSortData.bIncludePattern );
--	aBtnHeader.Check	( rSortData.bHasHeader );
-+	aBtnCase.Check			( rSortData.bCaseSens );
-+	aBtnFormats.Check		( rSortData.bIncludePattern );
-+	aBtnHeader.Check		( rSortData.bHasHeader );
-+	aBtnNaturalSort.Check	( rSortData.bNaturalSort );
- 
- 	if ( rSortData.bByRow )
- 	{
-@@ -800,6 +802,7 @@ BOOL __EXPORT ScTabPageSortOptions::Fill
- 	theSortData.bByRow			= aBtnTopDown.IsChecked();
- 	theSortData.bHasHeader		= aBtnHeader.IsChecked();
- 	theSortData.bCaseSens		= aBtnCase.IsChecked();
-+	theSortData.bNaturalSort	= aBtnNaturalSort.IsChecked();
- 	theSortData.bIncludePattern = aBtnFormats.IsChecked();
- 	theSortData.bInplace		= !aBtnCopyResult.IsChecked();
- 	theSortData.nDestCol		= theOutPos.Col();
---- sc/source/ui/inc/sortdlg.hrc
-+++ sc/source/ui/inc/sortdlg.hrc
-@@ -64,7 +64,7 @@
- #define LB_SORT_USER		2
- #define LB_OUTAREA			3
- #define ED_OUTAREA          4
--#define FT_AREA_LABEL       5
-+//#define FT_AREA_LABEL       5
- //#define FT_AREA             6
- #define BTN_SORT_USER       7
- #define BTN_CASESENSITIVE   8
-@@ -79,6 +79,7 @@
- #define LB_LANGUAGE         17
- #define FT_ALGORITHM        18
- #define LB_ALGORITHM        19
-+#define	BTN_NATURALSORT		20
- 
- //#define RID_SCDLG_SORT_WARNING
- #define FT_TEXT             1
---- sc/source/ui/inc/tpsort.hxx
-+++ sc/source/ui/inc/tpsort.hxx
-@@ -53,7 +53,7 @@ class ScSortDlg;
- struct ScSortParam;
- 
- //========================================================================
--// Kriterien
-+// Kriterien (Sort Criteria)
- 
- class ScTabPageSortFields : public SfxTabPage
- {
-@@ -125,7 +125,7 @@ private:
- };
- 
- //========================================================================
--// Sortieroptionen:
-+// Sortieroptionen (Sort Options)
- 
- class ScDocument;
- class ScRangeData;
-@@ -158,6 +158,7 @@ private:
-     CheckBox            aBtnCase;
-     CheckBox            aBtnHeader;
-     CheckBox            aBtnFormats;
-+	CheckBox			aBtnNaturalSort;
- 
-     CheckBox            aBtnCopyResult;
-     ListBox             aLbOutPos;
-@@ -175,7 +176,7 @@ private:
-     RadioButton         aBtnTopDown;
-     RadioButton         aBtnLeftRight;
- 
--    FixedText           aFtAreaLabel;
-+//     FixedText           aFtAreaLabel;
- //  FixedInfo           aFtArea;
-     LocalizedString aStrRowLabel;
-     LocalizedString aStrColLabel;
---- sc/source/ui/src/sortdlg.src.old	2009-04-02 10:45:23.000000000 +0000
-+++ sc/source/ui/src/sortdlg.src	2009-04-06 16:41:48.000000000 +0000
-@@ -154,9 +154,20 @@ TabPage RID_SCPAGE_SORT_OPTIONS
- 		Text [ en-US ] = "Include ~formats" ;
- 		TabStop = TRUE ;
- 	};
-+	CheckBox BTN_NATURALSORT
-+	{
-+		Pos = MAP_APPFONT ( 12 , 48 ) ;
-+		Size = MAP_APPFONT ( 242 , 10 ) ;
-+		Text [ de ] = "Enable ~natural sort" ;
-+		Text [ en-US ] = "Enable ~natural sort" ;
-+		Text [ cs ] = "Aktivovat přirozené třídění" ;
-+       Text [ sk ] = "Aktivovať prirodzené triedenie" ;
-+		TabStop = TRUE ;
-+		Text [ x-comment ] = " " ;
-+	};
- 	CheckBox BTN_COPYRESULT
- 	{
--        Pos = MAP_APPFONT ( 12 , 48 ) ;
-+        Pos = MAP_APPFONT ( 12 , 62 ) ;
-         Size = MAP_APPFONT ( 242 , 10 ) ;
- 		Text [ en-US ] = "~Copy sort results to:" ;
- 		TabStop = TRUE ;
-@@ -164,7 +175,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS
- 	ListBox LB_OUTAREA
- 	{
- 		Border = TRUE ;
--        Pos = MAP_APPFONT ( 20 , 59 ) ;
-+        Pos = MAP_APPFONT ( 20 , 73 ) ;
-         Size = MAP_APPFONT ( 93 , 90 ) ;
- 		TabStop = TRUE ;
- 		DropDown = TRUE ;
-@@ -173,13 +184,13 @@ TabPage RID_SCPAGE_SORT_OPTIONS
- 	{
- 		Disable = TRUE ;
- 		Border = TRUE ;
--        Pos = MAP_APPFONT ( 119 , 59 ) ;
-+        Pos = MAP_APPFONT ( 119 , 73 ) ;
-         Size = MAP_APPFONT ( 132 , 12 ) ;
- 		TabStop = TRUE ;
- 	};
- 	CheckBox BTN_SORT_USER
- 	{
--        Pos = MAP_APPFONT ( 12 , 75 ) ;
-+        Pos = MAP_APPFONT ( 12 , 89 ) ;
-         Size = MAP_APPFONT ( 242 , 10 ) ;
- 		Text [ en-US ] = "Custom sort ~order" ;
- 		TabStop = TRUE ;
-@@ -188,21 +199,21 @@ TabPage RID_SCPAGE_SORT_OPTIONS
- 	{
- 		Disable = TRUE ;
- 		Border = TRUE ;
--        Pos = MAP_APPFONT ( 20 , 86 ) ;
-+        Pos = MAP_APPFONT ( 20 , 100 ) ;
-         Size = MAP_APPFONT ( 231 , 90 ) ;
- 		TabStop = TRUE ;
- 		DropDown = TRUE ;
- 	};
-     FixedText FT_LANGUAGE
- 	{
--        Pos = MAP_APPFONT ( 12 , 104 ) ;
-+        Pos = MAP_APPFONT ( 12 , 118 ) ;
-         Size = MAP_APPFONT ( 101 , 8 ) ;
- 		Text [ en-US ] = "~Language";
- 	};
- 	ListBox LB_LANGUAGE
- 	{
- 		Border = TRUE ;
--        Pos = MAP_APPFONT ( 12 , 115 ) ;
-+        Pos = MAP_APPFONT ( 12 , 129 ) ;
-         Size = MAP_APPFONT ( 101 , 90 ) ;
- 		TabStop = TRUE ;
- 		DropDown = TRUE ;
-@@ -210,44 +221,46 @@ TabPage RID_SCPAGE_SORT_OPTIONS
- 	};
-     FixedText FT_ALGORITHM
- 	{
--        Pos = MAP_APPFONT ( 119 , 104 ) ;
-+        Pos = MAP_APPFONT ( 119 , 118 ) ;
-         Size = MAP_APPFONT ( 132 , 8 ) ;
- 		Text [ en-US ] = "O~ptions";
- 	};
- 	ListBox LB_ALGORITHM
- 	{
- 		Border = TRUE ;
--        Pos = MAP_APPFONT ( 119 , 115 ) ;
-+        Pos = MAP_APPFONT ( 119 , 129 ) ;
-         Size = MAP_APPFONT ( 132 , 90 ) ;
- 		TabStop = TRUE ;
- 		DropDown = TRUE ;
- 	};
- 	FixedLine FL_DIRECTION
- 	{
--        Pos = MAP_APPFONT ( 6 , 133 ) ;
-+        Pos = MAP_APPFONT ( 6 , 147 ) ;
-         Size = MAP_APPFONT ( 248 , 8 ) ;
- 		Text [ en-US ] = "Direction" ;
- 	};
- 	RadioButton BTN_TOP_DOWN
- 	{
--        Pos = MAP_APPFONT ( 12 , 144 ) ;
-+        Pos = MAP_APPFONT ( 12 , 158 ) ;
-         Size = MAP_APPFONT ( 242 , 10 ) ;
- 		Text [ en-US ] = "~Top to bottom (sort rows)" ;
- 		TabStop = TRUE ;
- 	};
- 	RadioButton BTN_LEFT_RIGHT
- 	{
--        Pos = MAP_APPFONT ( 12 , 158 ) ;
-+        Pos = MAP_APPFONT ( 12 , 172 ) ;
-         Size = MAP_APPFONT ( 242 , 10 ) ;
- 		Text [ en-US ] = "L~eft to right (sort columns)" ;
- 		TabStop = TRUE ;
- 	};
-+/*
- 	FixedText FT_AREA_LABEL
- 	{
-         Pos = MAP_APPFONT ( 6 , 171 ) ;
-         Size = MAP_APPFONT ( 248 , 8 ) ;
- 		Text [ en-US ] = "Data area:" ;
- 	};
-+*/
- };
- TabDialog RID_SCDLG_SORT
- {
---- sc/source/ui/view/cellsh2.cxx
-+++ sc/source/ui/view/cellsh2.cxx
-@@ -366,6 +366,7 @@ void ScCellShell::ExecuteDB( SfxRequest&
-                     aSortParam.bHasHeader		= bHasHeader;
-                     aSortParam.bByRow			= TRUE;
-                     aSortParam.bCaseSens		= FALSE;
-+                    aSortParam.bNaturalSort		= FALSE;
-                     aSortParam.bIncludePattern	= TRUE;
-                     aSortParam.bInplace 		= TRUE;
-                     aSortParam.bDoSort[0]		= TRUE;
-@@ -401,6 +402,8 @@ void ScCellShell::ExecuteDB( SfxRequest&
- 						aSortParam.bHasHeader = ((const SfxBoolItem*)pItem)->GetValue();
- 					if ( pArgs->GetItemState( SID_SORT_CASESENS, TRUE, &pItem ) == SFX_ITEM_SET )
- 						aSortParam.bCaseSens = ((const SfxBoolItem*)pItem)->GetValue();
-+					if ( pArgs->GetItemState( SID_SORT_NATURALSORT, TRUE, &pItem ) == SFX_ITEM_SET )
-+						aSortParam.bNaturalSort = ((const SfxBoolItem*)pItem)->GetValue();
- 					if ( pArgs->GetItemState( SID_SORT_ATTRIBS, TRUE, &pItem ) == SFX_ITEM_SET )
- 						aSortParam.bIncludePattern = ((const SfxBoolItem*)pItem)->GetValue();
- 					if ( pArgs->GetItemState( SID_SORT_USERDEF, TRUE, &pItem ) == SFX_ITEM_SET )
-@@ -454,7 +457,7 @@ void ScCellShell::ExecuteDB( SfxRequest&
- 
- 					pDlg = pFact->CreateScSortDlg( pTabViewShell->GetDialogParent(),  &aArgSet, RID_SCDLG_SORT );
- 					DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
--					pDlg->SetCurPageId(1);
-+					pDlg->SetCurPageId(1);	// 1=sort field tab  2=sort options tab
- 
- 					if ( pDlg->Execute() == RET_OK )
- 					{
-@@ -473,6 +476,8 @@ void ScCellShell::ExecuteDB( SfxRequest&
- 												rOutParam.bHasHeader ) );
- 							rReq.AppendItem( SfxBoolItem( SID_SORT_CASESENS,
- 												rOutParam.bCaseSens ) );
-+							rReq.AppendItem( SfxBoolItem( SID_SORT_NATURALSORT,
-+												rOutParam.bNaturalSort ) );
- 							rReq.AppendItem( SfxBoolItem( SID_SORT_ATTRIBS,
- 												rOutParam.bIncludePattern ) );
- 							USHORT nUser = rOutParam.bUserDef ? ( rOutParam.nUserIndex + 1 ) : 0;
+diff --git sc/inc/dbcolect.hxx sc/inc/dbcolect.hxx
+index 543904e..48d314e 100644
+--- sc/inc/dbcolect.hxx
++++ sc/inc/dbcolect.hxx
+@@ -63,6 +63,7 @@ private:
+     BOOL			bStripData;
+     // SortParam
+     BOOL			bSortCaseSens;
++    BOOL			bSortNaturalSort;
+     BOOL			bIncludePattern;
+     BOOL			bSortInplace;
+     BOOL			bSortUserDef;
+diff --git sc/inc/sc.hrc sc/inc/sc.hrc
+index 33d0240..85621ce 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -1127,6 +1127,7 @@
+ #define SID_SORT_CASESENS		(SC_PARAM_START+2)
+ #define SID_SORT_ATTRIBS		(SC_PARAM_START+3)
+ #define SID_SORT_USERDEF		(SC_PARAM_START+4)
++#define SID_SORT_NATURALSORT	(SC_PARAM_START+5)
+ 
+ // Resourcen -------------------------------------------------------------
+ 
+diff --git sc/inc/sortparam.hxx sc/inc/sortparam.hxx
+index 7ef0a80..bc0f863 100644
+--- sc/inc/sortparam.hxx
++++ sc/inc/sortparam.hxx
+@@ -52,6 +52,7 @@ struct SC_DLLPUBLIC ScSortParam
+     BOOL		bHasHeader;
+     BOOL		bByRow;
+     BOOL		bCaseSens;
++    BOOL		bNaturalSort;
+     BOOL		bUserDef;
+     USHORT		nUserIndex;
+     BOOL		bIncludePattern;
+diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
+index ad21670..0687d1f 100644
+--- sc/sdi/scalc.sdi
++++ sc/sdi/scalc.sdi
+@@ -1577,7 +1577,7 @@ SfxVoidItem DataSelect SID_DATA_SELECT
+ 
+ //--------------------------------------------------------------------------
+ SfxVoidItem DataSort SID_SORT
+-(SfxBoolItem ByRows SID_SORT_BYROW,SfxBoolItem HasHeader SID_SORT_HASHEADER,SfxBoolItem CaseSensitive SID_SORT_CASESENS,SfxBoolItem IncludeAttribs SID_SORT_ATTRIBS,SfxUInt16Item UserDefIndex SID_SORT_USERDEF,SfxInt32Item Col1 FN_PARAM_1,SfxBoolItem Ascending1 FN_PARAM_2,SfxInt32Item Col2 FN_PARAM_3,SfxBoolItem Ascending2 FN_PARAM_4,SfxInt32Item Col3 FN_PARAM_5,SfxBoolItem Ascending3 FN_PARAM_6)
++(SfxBoolItem ByRows SID_SORT_BYROW,SfxBoolItem HasHeader SID_SORT_HASHEADER,SfxBoolItem CaseSensitive SID_SORT_CASESENS,SfxBoolItem NaturalSort SID_SORT_NATURALSORT,SfxBoolItem IncludeAttribs SID_SORT_ATTRIBS,SfxUInt16Item UserDefIndex SID_SORT_USERDEF,SfxInt32Item Col1 FN_PARAM_1,SfxBoolItem Ascending1 FN_PARAM_2,SfxInt32Item Col2 FN_PARAM_3,SfxBoolItem Ascending2 FN_PARAM_4,SfxInt32Item Col3 FN_PARAM_5,SfxBoolItem Ascending3 FN_PARAM_6)
+ [
+     /* flags: */
+     AutoUpdate = FALSE,
+diff --git sc/source/core/data/sortparam.cxx sc/source/core/data/sortparam.cxx
+index dfab465..332772e 100644
+--- sc/source/core/data/sortparam.cxx
++++ sc/source/core/data/sortparam.cxx
+@@ -51,7 +51,7 @@ ScSortParam::ScSortParam()
+ 
+ ScSortParam::ScSortParam( const ScSortParam& r ) :
+         nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),
+-        bHasHeader(r.bHasHeader),bByRow(r.bByRow),bCaseSens(r.bCaseSens),
++        bHasHeader(r.bHasHeader),bByRow(r.bByRow),bCaseSens(r.bCaseSens),bNaturalSort(r.bNaturalSort),
+         bUserDef(r.bUserDef),nUserIndex(r.nUserIndex),bIncludePattern(r.bIncludePattern),
+         bInplace(r.bInplace),
+         nDestTab(r.nDestTab),nDestCol(r.nDestCol),nDestRow(r.nDestRow),
+@@ -74,7 +74,7 @@ void ScSortParam::Clear()
+     nCompatHeader = 2;
+     nDestTab = 0;
+     nUserIndex = 0;
+-    bHasHeader=bCaseSens=bUserDef = FALSE;
++    bHasHeader=bCaseSens=bUserDef=bNaturalSort = FALSE;
+     bByRow=bIncludePattern=bInplace	= TRUE;
+     aCollatorLocale = ::com::sun::star::lang::Locale();
+     aCollatorAlgorithm.Erase();
+@@ -97,6 +97,7 @@ ScSortParam& ScSortParam::operator=( const ScSortParam& r )
+     nRow2			= r.nRow2;
+     bHasHeader		= r.bHasHeader;
+     bCaseSens		= r.bCaseSens;
++    bNaturalSort	= r.bNaturalSort;
+     bByRow			= r.bByRow;
+     bUserDef		= r.bUserDef;
+     nUserIndex		= r.nUserIndex;
+@@ -138,6 +139,7 @@ BOOL ScSortParam::operator==( const ScSortParam& rOther ) const
+         && (bHasHeader		== rOther.bHasHeader)
+         && (bByRow			== rOther.bByRow)
+         && (bCaseSens		== rOther.bCaseSens)
++        && (bNaturalSort	== rOther.bNaturalSort)
+         && (bUserDef		== rOther.bUserDef)
+         && (nUserIndex		== rOther.nUserIndex)
+         && (bIncludePattern == rOther.bIncludePattern)
+diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx
+index 2d8f0d3..390f6b1 100644
+--- sc/source/core/data/table3.cxx
++++ sc/source/core/data/table3.cxx
+@@ -64,6 +64,143 @@
+ 
+ #include <vector>
+ 
++using namespace ::com::sun::star;
++
++namespace naturalsort {
++
++using namespace ::com::sun::star::i18n;
++
++/** Splits a given string into three parts: the prefix, number string, and 
++    the suffix.
++
++    @param sWhole
++    Original string to be split into pieces
++
++    @param sPrefix
++    Prefix string that consists of the part before the first number token
++
++    @param sSuffix
++    String after the last number token.  This may still contain number strings.
++
++    @param fNum
++    Number converted from the middle number string
++
++    @return Returns TRUE if a numeral element is found in a given string, or 
++    FALSE if no numeral element is found.
++*/
++bool SplitString( const rtl::OUString &sWhole, 
++    rtl::OUString &sPrefix, rtl::OUString &sSuffix, double &fNum )
++{
++    i18n::LocaleDataItem aLocaleItem = ScGlobal::pLocaleData->getLocaleItem();
++
++    // Get prefix element
++    rtl::OUString sEmpty, sUser = rtl::OUString::createFromAscii( "-" );
++    ParseResult aPRPre = ScGlobal::pCharClass->parsePredefinedToken( 
++        KParseType::IDENTNAME, sWhole, 0, 
++        KParseTokens::ANY_LETTER, sUser, KParseTokens::ANY_LETTER, sUser );
++    sPrefix = sWhole.copy( 0, aPRPre.EndPos );
++    
++    // Return FALSE if no numeral element is found
++    if ( aPRPre.EndPos == sWhole.getLength() )
++        return false;
++    
++    // Get numeral element
++    sUser = aLocaleItem.decimalSeparator;
++    ParseResult aPRNum = ScGlobal::pCharClass->parsePredefinedToken(
++        KParseType::ANY_NUMBER, sWhole, aPRPre.EndPos, 
++        KParseTokens::ANY_NUMBER, sEmpty, KParseTokens::ANY_NUMBER, sUser );
++    
++    if ( aPRNum.EndPos == aPRPre.EndPos )
++        return false;
++    
++    fNum = aPRNum.Value;
++    sSuffix = sWhole.copy( aPRNum.EndPos );
++    
++    return true;
++}
++
++/** Naturally compares two given strings.
++
++    This is the main function that should be called externally.  It returns 
++    either 1, 0, or -1 depending on the comparison result of given two strings.
++
++    @param sInput1
++    Input string 1
++
++    @param sInput2
++    Input string 2
++
++    @param bCaseSens
++    Boolean value for case sensitivity
++
++    @param pData
++    Pointer to user defined sort list
++
++    @param pCW
++    Pointer to collator wrapper for normal string comparison
++    
++    @return Returnes 1 if sInput1 is greater, 0 if sInput1 == sInput2, and -1 if 
++    sInput2 is greater.
++*/
++short Compare( const String &sInput1, const String &sInput2, 
++               const BOOL bCaseSens, const ScUserListData* pData, const CollatorWrapper *pCW )
++{   
++    rtl::OUString sStr1( sInput1 ), sStr2( sInput2 ), sPre1, sSuf1, sPre2, sSuf2;
++
++    do
++    {
++        double nNum1, nNum2;
++        BOOL bNumFound1 = SplitString( sStr1, sPre1, sSuf1, nNum1 );
++        BOOL bNumFound2 = SplitString( sStr2, sPre2, sSuf2, nNum2 );
++
++        short nPreRes; // Prefix comparison result
++        if ( pData )
++        {
++            if ( bCaseSens )
++            {
++                if ( !bNumFound1 || !bNumFound2 )
++                    return static_cast<short>(pData->Compare( sStr1, sStr2 ));
++                else
++                    nPreRes = pData->Compare( sPre1, sPre2 );
++            }
++            else
++            {
++                if ( !bNumFound1 || !bNumFound2 )
++                    return static_cast<short>(pData->ICompare( sStr1, sStr2 ));
++                else
++                    nPreRes = pData->ICompare( sPre1, sPre2 );
++            }
++        } 
++        else
++        {
++            if ( !bNumFound1 || !bNumFound2 )
++                return static_cast<short>(pCW->compareString( sStr1, sStr2 ));
++            else
++                nPreRes = static_cast<short>(pCW->compareString( sPre1, sPre2 ));
++        }
++        
++        // Prefix strings differ.  Return immediately.
++        if ( nPreRes != 0 ) return nPreRes;
++            
++        if ( nNum1 != nNum2 )
++        {
++            if ( nNum1 < nNum2 ) return -1;
++            return static_cast<short>( nNum1 > nNum2 );
++        }
++
++        // The prefix and the first numerical elements are equal, but the suffix
++        // strings may still differ.  Stay in the loop.
++
++        sStr1 = sSuf1;
++        sStr2 = sSuf2;
++
++    } while (true);
++
++    return 0;
++}
++
++}
++
+ // STATIC DATA -----------------------------------------------------------
+ 
+ const USHORT nMaxSorts = 3;		// maximale Anzahl Sortierkriterien in aSortParam
+@@ -285,25 +422,40 @@ short ScTable::CompareCell( USHORT nSort,
+                     ((ScStringCell*)pCell2)->GetString(aStr2);
+                 else
+                     GetString(nCell2Col, nCell2Row, aStr2);
+-                BOOL bUserDef = aSortParam.bUserDef;
++
++				BOOL bUserDef     = aSortParam.bUserDef;		// custom sort order
++				BOOL bNaturalSort = aSortParam.bNaturalSort;	// natural sort
++				BOOL bCaseSens    = aSortParam.bCaseSens;		// case sensitivity
++				
+                 if (bUserDef)
+                 {
+                     ScUserListData* pData =
+-                        (ScUserListData*)(ScGlobal::GetUserList()->At(
+-                        aSortParam.nUserIndex));
++						static_cast<ScUserListData*>( (ScGlobal::GetUserList()->At(
++						aSortParam.nUserIndex)) );
++						
+                     if (pData)
+                     {
+-                        if ( aSortParam.bCaseSens )
+-                            nRes = sal::static_int_cast<short>( pData->Compare(aStr1, aStr2) );
++                        if ( bNaturalSort )
++                            nRes = naturalsort::Compare( aStr1, aStr2, bCaseSens, pData, pSortCollator );
+                         else
+-                            nRes = sal::static_int_cast<short>( pData->ICompare(aStr1, aStr2) );
++                        {
++                            if ( bCaseSens )
++                                nRes = sal::static_int_cast<short>( pData->Compare(aStr1, aStr2) );
++                            else
++                                nRes = sal::static_int_cast<short>( pData->ICompare(aStr1, aStr2) );
++                        }
+                     }
+                     else
+                         bUserDef = FALSE;
+ 
+                 }
+                 if (!bUserDef)
+-                    nRes = (short) pSortCollator->compareString( aStr1, aStr2 );
++				{
++                    if ( bNaturalSort )
++                        nRes = naturalsort::Compare( aStr1, aStr2, bCaseSens, NULL, pSortCollator );
++                    else
++                        nRes = static_cast<short>( pSortCollator->compareString( aStr1, aStr2 ) );
++				}
+             }
+             else if ( bStr1 )				// String <-> Zahl
+                 nRes = 1;					// Zahl vorne
+diff --git sc/source/core/tool/dbcolect.cxx sc/source/core/tool/dbcolect.cxx
+index a47a669..22642f4 100644
+--- sc/source/core/tool/dbcolect.cxx
++++ sc/source/core/tool/dbcolect.cxx
+@@ -105,6 +105,7 @@ ScDBData::ScDBData( const ScDBData& rData ) :
+     bKeepFmt			(rData.bKeepFmt),
+     bStripData			(rData.bStripData),
+     bSortCaseSens   	(rData.bSortCaseSens),
++	bSortNaturalSort	(rData.bSortNaturalSort),
+     bIncludePattern 	(rData.bIncludePattern),
+     bSortInplace		(rData.bSortInplace),
+     bSortUserDef		(rData.bSortUserDef),
+@@ -198,6 +199,7 @@ ScDBData& ScDBData::operator= (const ScDBData& rData)
+     bKeepFmt			= rData.bKeepFmt;
+     bStripData			= rData.bStripData;
+     bSortCaseSens   	= rData.bSortCaseSens;
++	bSortNaturalSort	= rData.bSortNaturalSort;
+     bIncludePattern 	= rData.bIncludePattern;
+     bSortInplace		= rData.bSortInplace;
+     nSortDestTab		= rData.nSortDestTab;
+@@ -449,6 +451,7 @@ void ScDBData::GetSortParam( ScSortParam& rSortParam ) const
+     rSortParam.bByRow = bByRow;
+     rSortParam.bHasHeader = bHasHeader;
+     rSortParam.bCaseSens = bSortCaseSens;
++	rSortParam.bNaturalSort = bSortNaturalSort;
+     rSortParam.bInplace = bSortInplace;
+     rSortParam.nDestTab = nSortDestTab;
+     rSortParam.nDestCol = nSortDestCol;
+@@ -469,6 +472,7 @@ void ScDBData::GetSortParam( ScSortParam& rSortParam ) const
+ void ScDBData::SetSortParam( const ScSortParam& rSortParam )
+ {
+     bSortCaseSens = rSortParam.bCaseSens;
++	bSortNaturalSort = rSortParam.bNaturalSort;
+     bIncludePattern = rSortParam.bIncludePattern;
+     bSortInplace = rSortParam.bInplace;
+     nSortDestTab = rSortParam.nDestTab;
+diff --git sc/source/ui/dbgui/tpsort.cxx sc/source/ui/dbgui/tpsort.cxx
+index 5219593..d06627a 100644
+--- sc/source/ui/dbgui/tpsort.cxx
++++ sc/source/ui/dbgui/tpsort.cxx
+@@ -567,6 +567,7 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* 			pParent,
+         aBtnHeader		( this, ScResId( BTN_LABEL ) ),
+         aBtnFormats 	( this, ScResId( BTN_FORMATS ) ),
+         aBtnCopyResult	( this, ScResId( BTN_COPYRESULT ) ),
++		aBtnNaturalSort	( this, ScResId( BTN_NATURALSORT ) ),
+         aLbOutPos		( this, ScResId( LB_OUTAREA ) ),
+         aEdOutPos		( this, ScResId( ED_OUTAREA ) ),
+         aBtnSortUser	( this, ScResId( BTN_SORT_USER ) ),
+@@ -578,7 +579,7 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* 			pParent,
+         aLineDirection	( this, ScResId( FL_DIRECTION ) ),
+         aBtnTopDown 	( this, ScResId( BTN_TOP_DOWN ) ),
+         aBtnLeftRight	( this, ScResId( BTN_LEFT_RIGHT ) ),
+-        aFtAreaLabel	( this, ScResId( FT_AREA_LABEL ) ),
++// 		aFtAreaLabel	( this, ScResId( FT_AREA_LABEL ) ),
+ //		aFtArea 		( this, ScResId( FT_AREA ) ),
+         //
+ #if ENABLE_LAYOUT_EXPERIMENTAL
+@@ -622,8 +623,8 @@ __EXPORT ScTabPageSortOptions::~ScTabPageSortOptions()
+ 
+ void ScTabPageSortOptions::Init()
+ {
+-    aStrAreaLabel = aFtAreaLabel.GetText();
+-    aStrAreaLabel.Append( (sal_Unicode) ' ' );
++// 	aStrAreaLabel = aFtAreaLabel.GetText();
++// 	aStrAreaLabel.Append( (sal_Unicode) ' ' );
+ 
+     //	CollatorRessource has user-visible names for sort algorithms
+     pColRes = new CollatorRessource();
+@@ -702,8 +703,8 @@ void ScTabPageSortOptions::Init()
+         theArea += ')';
+ 
+         //aFtArea.SetText( theArea );
+-        theArea.Insert( aStrAreaLabel, 0 );
+-        aFtAreaLabel.SetText( theArea );
++		//theArea.Insert( aStrAreaLabel, 0 );
++		//aFtAreaLabel.SetText( theArea );
+ 
+         aBtnHeader.SetText( aStrColLabel );
+     }
+@@ -752,9 +753,10 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
+         aLbSortUser.SelectEntryPos( 0 );
+     }
+ 
+-    aBtnCase.Check		( rSortData.bCaseSens );
+-    aBtnFormats.Check	( rSortData.bIncludePattern );
+-    aBtnHeader.Check	( rSortData.bHasHeader );
++	aBtnCase.Check			( rSortData.bCaseSens );
++	aBtnFormats.Check		( rSortData.bIncludePattern );
++	aBtnHeader.Check		( rSortData.bHasHeader );
++	aBtnNaturalSort.Check	( rSortData.bNaturalSort );
+ 
+     if ( rSortData.bByRow )
+     {
+@@ -820,6 +822,7 @@ BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
+     theSortData.bByRow			= aBtnTopDown.IsChecked();
+     theSortData.bHasHeader		= aBtnHeader.IsChecked();
+     theSortData.bCaseSens		= aBtnCase.IsChecked();
++	theSortData.bNaturalSort	= aBtnNaturalSort.IsChecked();
+     theSortData.bIncludePattern = aBtnFormats.IsChecked();
+     theSortData.bInplace		= !aBtnCopyResult.IsChecked();
+     theSortData.nDestCol		= theOutPos.Col();
+diff --git sc/source/ui/inc/sortdlg.hrc sc/source/ui/inc/sortdlg.hrc
+index f67927c..8d08628 100644
+--- sc/source/ui/inc/sortdlg.hrc
++++ sc/source/ui/inc/sortdlg.hrc
+@@ -66,7 +66,7 @@
+ #define LB_SORT_USER		2
+ #define LB_OUTAREA			3
+ #define ED_OUTAREA          4
+-#define FT_AREA_LABEL       5
++//#define FT_AREA_LABEL       5
+ //#define FT_AREA             6
+ #define BTN_SORT_USER       7
+ #define BTN_CASESENSITIVE   8
+@@ -81,6 +81,7 @@
+ #define LB_LANGUAGE         17
+ #define FT_ALGORITHM        18
+ #define LB_ALGORITHM        19
++#define	BTN_NATURALSORT		20
+ 
+ //#define RID_SCDLG_SORT_WARNING
+ #define FT_TEXT             1
+diff --git sc/source/ui/inc/tpsort.hxx sc/source/ui/inc/tpsort.hxx
+index 5cb61ae..89573fa 100644
+--- sc/source/ui/inc/tpsort.hxx
++++ sc/source/ui/inc/tpsort.hxx
+@@ -53,7 +53,7 @@ class ScSortDlg;
+ struct ScSortParam;
+ 
+ //========================================================================
+-// Kriterien
++// Kriterien (Sort Criteria)
+ 
+ class ScTabPageSortFields : public SfxTabPage
+ {
+@@ -125,7 +125,7 @@ private:
+ };
+ 
+ //========================================================================
+-// Sortieroptionen:
++// Sortieroptionen (Sort Options)
+ 
+ class ScDocument;
+ class ScRangeData;
+@@ -167,6 +167,7 @@ private:
+     CheckBox            aBtnCase;
+     CheckBox            aBtnHeader;
+     CheckBox            aBtnFormats;
++	CheckBox			aBtnNaturalSort;
+ 
+     CheckBox            aBtnCopyResult;
+     ListBox             aLbOutPos;
+@@ -184,7 +185,7 @@ private:
+     RadioButton         aBtnTopDown;
+     RadioButton         aBtnLeftRight;
+ 
+-    FixedText           aFtAreaLabel;
++//     FixedText           aFtAreaLabel;
+ //  FixedInfo           aFtArea;
+     LocalizedString aStrRowLabel;
+     LocalizedString aStrColLabel;
+diff --git sc/source/ui/src/sortdlg.src sc/source/ui/src/sortdlg.src
+index a068f0e..edb8b1e 100644
+--- sc/source/ui/src/sortdlg.src
++++ sc/source/ui/src/sortdlg.src
+@@ -154,9 +154,20 @@ TabPage RID_SCPAGE_SORT_OPTIONS
+         Text [ en-US ] = "Include ~formats" ;
+         TabStop = TRUE ;
+     };
++	CheckBox BTN_NATURALSORT
++	{
++		Pos = MAP_APPFONT ( 12 , 48 ) ;
++		Size = MAP_APPFONT ( 242 , 10 ) ;
++		Text [ de ] = "Enable ~natural sort" ;
++		Text [ en-US ] = "Enable ~natural sort" ;
++		Text [ cs ] = "Aktivovat přirozené třídění" ;
++       Text [ sk ] = "Aktivovať prirodzené triedenie" ;
++		TabStop = TRUE ;
++		Text [ x-comment ] = " " ;
++	};
+     CheckBox BTN_COPYRESULT
+     {
+-        Pos = MAP_APPFONT ( 12 , 48 ) ;
++        Pos = MAP_APPFONT ( 12 , 62 ) ;
+         Size = MAP_APPFONT ( 242 , 10 ) ;
+         Text [ en-US ] = "~Copy sort results to:" ;
+         TabStop = TRUE ;
+@@ -164,7 +175,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS
+     ListBox LB_OUTAREA
+     {
+         Border = TRUE ;
+-        Pos = MAP_APPFONT ( 20 , 59 ) ;
++        Pos = MAP_APPFONT ( 20 , 73 ) ;
+         Size = MAP_APPFONT ( 93 , 90 ) ;
+         TabStop = TRUE ;
+         DropDown = TRUE ;
+@@ -173,13 +184,13 @@ TabPage RID_SCPAGE_SORT_OPTIONS
+     {
+         Disable = TRUE ;
+         Border = TRUE ;
+-        Pos = MAP_APPFONT ( 119 , 59 ) ;
++        Pos = MAP_APPFONT ( 119 , 73 ) ;
+         Size = MAP_APPFONT ( 132 , 12 ) ;
+         TabStop = TRUE ;
+     };
+     CheckBox BTN_SORT_USER
+     {
+-        Pos = MAP_APPFONT ( 12 , 75 ) ;
++        Pos = MAP_APPFONT ( 12 , 89 ) ;
+         Size = MAP_APPFONT ( 242 , 10 ) ;
+         Text [ en-US ] = "Custom sort ~order" ;
+         TabStop = TRUE ;
+@@ -188,21 +199,21 @@ TabPage RID_SCPAGE_SORT_OPTIONS
+     {
+         Disable = TRUE ;
+         Border = TRUE ;
+-        Pos = MAP_APPFONT ( 20 , 86 ) ;
++        Pos = MAP_APPFONT ( 20 , 100 ) ;
+         Size = MAP_APPFONT ( 231 , 90 ) ;
+         TabStop = TRUE ;
+         DropDown = TRUE ;
+     };
+     FixedText FT_LANGUAGE
+     {
+-        Pos = MAP_APPFONT ( 12 , 104 ) ;
++        Pos = MAP_APPFONT ( 12 , 118 ) ;
+         Size = MAP_APPFONT ( 101 , 8 ) ;
+         Text [ en-US ] = "~Language";
+     };
+     ListBox LB_LANGUAGE
+     {
+         Border = TRUE ;
+-        Pos = MAP_APPFONT ( 12 , 115 ) ;
++        Pos = MAP_APPFONT ( 12 , 129 ) ;
+         Size = MAP_APPFONT ( 101 , 90 ) ;
+         TabStop = TRUE ;
+         DropDown = TRUE ;
+@@ -210,44 +221,46 @@ TabPage RID_SCPAGE_SORT_OPTIONS
+     };
+     FixedText FT_ALGORITHM
+     {
+-        Pos = MAP_APPFONT ( 119 , 104 ) ;
++        Pos = MAP_APPFONT ( 119 , 118 ) ;
+         Size = MAP_APPFONT ( 132 , 8 ) ;
+         Text [ en-US ] = "O~ptions";
+     };
+     ListBox LB_ALGORITHM
+     {
+         Border = TRUE ;
+-        Pos = MAP_APPFONT ( 119 , 115 ) ;
++        Pos = MAP_APPFONT ( 119 , 129 ) ;
+         Size = MAP_APPFONT ( 132 , 90 ) ;
+         TabStop = TRUE ;
+         DropDown = TRUE ;
+     };
+     FixedLine FL_DIRECTION
+     {
+-        Pos = MAP_APPFONT ( 6 , 133 ) ;
++        Pos = MAP_APPFONT ( 6 , 147 ) ;
+         Size = MAP_APPFONT ( 248 , 8 ) ;
+         Text [ en-US ] = "Direction" ;
+     };
+     RadioButton BTN_TOP_DOWN
+     {
+-        Pos = MAP_APPFONT ( 12 , 144 ) ;
++        Pos = MAP_APPFONT ( 12 , 158 ) ;
+         Size = MAP_APPFONT ( 242 , 10 ) ;
+         Text [ en-US ] = "~Top to bottom (sort rows)" ;
+         TabStop = TRUE ;
+     };
+     RadioButton BTN_LEFT_RIGHT
+     {
+-        Pos = MAP_APPFONT ( 12 , 158 ) ;
++        Pos = MAP_APPFONT ( 12 , 172 ) ;
+         Size = MAP_APPFONT ( 242 , 10 ) ;
+         Text [ en-US ] = "L~eft to right (sort columns)" ;
+         TabStop = TRUE ;
+     };
++/*
+     FixedText FT_AREA_LABEL
+     {
+         Pos = MAP_APPFONT ( 6 , 171 ) ;
+         Size = MAP_APPFONT ( 248 , 8 ) ;
+         Text [ en-US ] = "Data area:" ;
+     };
++*/
+ };
+ TabDialog RID_SCDLG_SORT
+ {
+diff --git sc/source/ui/view/cellsh2.cxx sc/source/ui/view/cellsh2.cxx
+index 90c6883..a54ea74 100644
+--- sc/source/ui/view/cellsh2.cxx
++++ sc/source/ui/view/cellsh2.cxx
+@@ -443,6 +443,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
+                     aSortParam.bHasHeader		= bHasHeader;
+                     aSortParam.bByRow			= TRUE;
+                     aSortParam.bCaseSens		= FALSE;
++                    aSortParam.bNaturalSort		= FALSE;
+                     aSortParam.bIncludePattern	= TRUE;
+                     aSortParam.bInplace 		= TRUE;
+                     aSortParam.bDoSort[0]		= TRUE;
+@@ -494,6 +495,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
+                             aSortParam.bHasHeader = ((const SfxBoolItem*)pItem)->GetValue();
+                         if ( pArgs->GetItemState( SID_SORT_CASESENS, TRUE, &pItem ) == SFX_ITEM_SET )
+                             aSortParam.bCaseSens = ((const SfxBoolItem*)pItem)->GetValue();
++					if ( pArgs->GetItemState( SID_SORT_NATURALSORT, TRUE, &pItem ) == SFX_ITEM_SET )
++						aSortParam.bNaturalSort = ((const SfxBoolItem*)pItem)->GetValue();
+                         if ( pArgs->GetItemState( SID_SORT_ATTRIBS, TRUE, &pItem ) == SFX_ITEM_SET )
+                             aSortParam.bIncludePattern = ((const SfxBoolItem*)pItem)->GetValue();
+                         if ( pArgs->GetItemState( SID_SORT_USERDEF, TRUE, &pItem ) == SFX_ITEM_SET )
+@@ -557,7 +560,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
+ 
+                         pDlg = pFact->CreateScSortDlg( pTabViewShell->GetDialogParent(),  &aArgSet, RID_SCDLG_SORT );
+                         DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+-                        pDlg->SetCurPageId(1);
++					pDlg->SetCurPageId(1);	// 1=sort field tab  2=sort options tab
+ 
+                         if ( pDlg->Execute() == RET_OK )
+                         {
+@@ -576,6 +579,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
+                                     rOutParam.bHasHeader ) );
+                                 rReq.AppendItem( SfxBoolItem( SID_SORT_CASESENS,
+                                     rOutParam.bCaseSens ) );
++							rReq.AppendItem( SfxBoolItem( SID_SORT_NATURALSORT,
++												rOutParam.bNaturalSort ) );
+                                 rReq.AppendItem( SfxBoolItem( SID_SORT_ATTRIBS,
+                                     rOutParam.bIncludePattern ) );
+                                 USHORT nUser = rOutParam.bUserDef ? ( rOutParam.nUserIndex + 1 ) : 0;
diff --git a/applied_patches/0134-sc-drwlayer-units.diff b/applied_patches/0133-sc-drwlayer-units.diff
similarity index 100%
rename from applied_patches/0134-sc-drwlayer-units.diff
rename to applied_patches/0133-sc-drwlayer-units.diff
diff --git a/applied_patches/0133-vba-sc-autoshapes-hyperlinks.diff b/applied_patches/0133-vba-sc-autoshapes-hyperlinks.diff
deleted file mode 100644
index 34e87b351..000000000
--- a/applied_patches/0133-vba-sc-autoshapes-hyperlinks.diff
+++ /dev/null
@@ -1,893 +0,0 @@
-diff --git offapi/com/sun/star/drawing/Shape.idl offapi/com/sun/star/drawing/Shape.idl
-index 536ab62..bc5a70f 100644
---- offapi/com/sun/star/drawing/Shape.idl
-+++ offapi/com/sun/star/drawing/Shape.idl
-@@ -195,6 +195,10 @@ published service Shape
- 		the z-order.
- 	*/
- 	[optional, property] long NavigationOrder;
-+
-+	/** this property lets you get and set a hyperlink for this shape.
-+	 */
-+	[optional, property] string Hyperlink;
- };
- 
- //=============================================================================
-diff --git sc/inc/sc.hrc sc/inc/sc.hrc
-index be881a4..152289f 100644
---- sc/inc/sc.hrc
-+++ sc/inc/sc.hrc
-@@ -593,11 +593,9 @@
- // #i59082# assign macro to shape
- #define SID_ASSIGNMACRO                 (SC_VIEW_START + 95)
- 
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
- // #i66550# hyperlinks in shapes
- #define SID_DRAW_HLINK_EDIT             (SC_VIEW_START + 96)
- #define SID_DRAW_HLINK_DELETE           (SC_VIEW_START + 97)
--#endif
- 
- // "Zoom / Synchronize sheets" in options dialog
- #define SID_SC_OPT_SYNCZOOM             (SC_VIEW_START + 98)
-diff --git sc/inc/shapeuno.hxx sc/inc/shapeuno.hxx
-index a628d28..10833bf 100644
---- sc/inc/shapeuno.hxx
-+++ sc/inc/shapeuno.hxx
-@@ -53,6 +53,7 @@ namespace com { namespace sun { namespace star {
- class SdrObject;
- struct SvEventDescription;
- class ShapeUnoEventAccessImpl;
-+class  ScMacroInfo;
- 
- //------------------------------------------------------------------------
- 
-@@ -68,6 +69,7 @@ class ScShapeObj : public ::cppu::OWeakObject,
- 					public ::com::sun::star::document::XEventsSupplier
- {
- private:
-+friend  ScMacroInfo* lcl_getShapeHyperMacroInfo( ScShapeObj* pShape, BOOL bCreate );
- 	::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > mxShapeAgg;
-     // cached pointers to avoid repeated queryAggregation calls:
-     ::com::sun::star::beans::XPropertySet*                                  pShapePropertySet;
-diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
-index 7d331e1..b2c45ac 100644
---- sc/inc/unonames.hxx
-+++ sc/inc/unonames.hxx
-@@ -182,6 +182,8 @@
- #define SC_UNONAME_ANCHOR           "Anchor"
- #define SC_UNONAME_HORIPOS          "HoriOrientPosition"
- #define SC_UNONAME_VERTPOS          "VertOrientPosition"
-+//     #i66550 HLINK_FOR_SHAPES
-+#define SC_UNONAME_HYPERLINK        "Hyperlink" 
- 
- //	other cell properties
- #define SC_UNONAME_CHCOLHDR			"ChartColumnAsLabel"
-diff --git sc/inc/userdat.hxx sc/inc/userdat.hxx
-index cba05d0..3099b87 100644
---- sc/inc/userdat.hxx
-+++ sc/inc/userdat.hxx
-@@ -101,16 +101,12 @@ public:
-     void            SetMacro( const rtl::OUString& rMacro ) { maMacro = rMacro; }
-     const rtl::OUString& GetMacro() const { return maMacro; }
- 
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-     void            SetHlink( const rtl::OUString& rHlink ) { maHlink = rHlink; }
-     const rtl::OUString& GetHlink() const { return maHlink; }
--#endif
- 
- private:
-     rtl::OUString   maMacro;
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-     rtl::OUString   maHlink;
--#endif
- };
- 
- //-------------------------------------------------------------------------
-diff --git sc/sdi/drawsh.sdi sc/sdi/drawsh.sdi
-index b52250e..3c860f9 100644
---- sc/sdi/drawsh.sdi
-+++ sc/sdi/drawsh.sdi
-@@ -229,9 +229,9 @@ interface TableDraw
-     SID_FONTWORK_CHARACTER_SPACING_DIALOG	[ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ]
- 
- // ISSUE66550_HLINK_FOR_SHAPES
--//    SID_DRAW_HLINK_EDIT             [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
--//    SID_DRAW_HLINK_DELETE           [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
--//    SID_OPEN_HYPERLINK              [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
-+    SID_DRAW_HLINK_EDIT             [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
-+    SID_DRAW_HLINK_DELETE           [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
-+    SID_OPEN_HYPERLINK              [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
- }
- 
- 
-diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
-index cca4416..9bf0630 100644
---- sc/sdi/scalc.sdi
-+++ sc/sdi/scalc.sdi
-@@ -6397,55 +6397,55 @@ SfxVoidItem StandardFonts SID_STANDARD_FONTS
- 
- //--------------------------------------------------------------------------
- // ISSUE66550_HLINK_FOR_SHAPES
--//SfxVoidItem EditShapeHyperlink SID_DRAW_HLINK_EDIT
--//()
--//[
--//   /* flags: */
--//   AutoUpdate = FALSE,
--//   Cachable = Cachable,
--//   FastCall = TRUE,
--//   HasCoreId = FALSE,
--//   HasDialog = TRUE,
--//   ReadOnlyDoc = TRUE,
--//   Toggle = FALSE,
--//   Container = FALSE,
--//   RecordAbsolute = FALSE,
--//   RecordPerSet;
--//   Synchron;
--//
-+SfxVoidItem EditShapeHyperlink SID_DRAW_HLINK_EDIT
-+()
-+[
-+   /* flags: */
-+   AutoUpdate = FALSE,
-+   Cachable = Cachable,
-+   FastCall = TRUE,
-+   HasCoreId = FALSE,
-+   HasDialog = TRUE,
-+   ReadOnlyDoc = TRUE,
-+   Toggle = FALSE,
-+   Container = FALSE,
-+   RecordAbsolute = FALSE,
-+   RecordPerSet;
-+   Synchron;
-+
- //   /* config: */
--//   AccelConfig = TRUE,
--//   MenuConfig = FALSE,
--//   StatusBarConfig = FALSE,
--//   ToolBoxConfig = FALSE,
--//   GroupId = GID_DRAWING;
--//]
-+   AccelConfig = TRUE,
-+   MenuConfig = FALSE,
-+   StatusBarConfig = FALSE,
-+   ToolBoxConfig = FALSE,
-+   GroupId = GID_DRAWING;
-+]
- 
- //--------------------------------------------------------------------------
- // ISSUE66550_HLINK_FOR_SHAPES
--//SfxVoidItem DeleteShapeHyperlink SID_DRAW_HLINK_DELETE
--//()
--//[
--//   /* flags: */
--//   AutoUpdate = TRUE,
--//   Cachable = Cachable,
--//   FastCall = TRUE,
--//   HasCoreId = FALSE,
--//   HasDialog = FALSE,
--//   ReadOnlyDoc = TRUE,
--//   Toggle = FALSE,
--//   Container = FALSE,
--//   RecordAbsolute = FALSE,
--//   RecordPerSet;
--//   Synchron;
--//
--//   /* config: */
--//   AccelConfig = TRUE,
--//   MenuConfig = FALSE,
--//   StatusBarConfig = FALSE,
--//   ToolBoxConfig = FALSE,
--//   GroupId = GID_DRAWING;
--//]
-+SfxVoidItem DeleteShapeHyperlink SID_DRAW_HLINK_DELETE
-+()
-+[
-+   /* flags: */
-+   AutoUpdate = TRUE,
-+   Cachable = Cachable,
-+   FastCall = TRUE,
-+   HasCoreId = FALSE,
-+   HasDialog = FALSE,
-+   ReadOnlyDoc = TRUE,
-+   Toggle = FALSE,
-+   Container = FALSE,
-+   RecordAbsolute = FALSE,
-+   RecordPerSet;
-+   Synchron;
-+
-+   /* config: */
-+   AccelConfig = TRUE,
-+   MenuConfig = FALSE,
-+   StatusBarConfig = FALSE,
-+   ToolBoxConfig = FALSE,
-+   GroupId = GID_DRAWING;
-+]
- 
- //--------------------------------------------------------------------------
- SfxVoidItem StandardTextAttributes SID_TEXT_STANDARD
-diff --git sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx
-index 4d6fddf..7b8f936 100644
---- sc/source/filter/excel/xiescher.cxx.old	2009-04-03 20:33:34.000000000 +0200
-+++ sc/source/filter/excel/xiescher.cxx	2009-04-03 20:40:50.000000000 +0200
-@@ -483,8 +483,8 @@ void XclImpDrawObjBase::ProcessSdrObject
-     }
- 
-     // macro and hyperlink
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--    if( mbSimpleMacro && ((maMacroName.Len() > 0) || (maHyperlink.getLength() > 0)) )
-+    if( mbSimpleMacro && ((maMacroName.Len() > 0) ||
-+ (maHyperlink.Len() > 0)) )
-     {
-         if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, TRUE ) )
-         {
-@@ -492,11 +492,6 @@ void XclImpDrawObjBase::ProcessSdrObject
-             pInfo->SetHlink( maHyperlink );
-         }
-     }
--#else
--    if( mbSimpleMacro && (maMacroName.Len() > 0) )
--        if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, TRUE ) )
--            pInfo->SetMacro( XclControlHelper::GetScMacroName( maMacroName ) );
--#endif
- 
-     // call virtual function for object type specific processing
-     DoProcessSdrObj( rSdrObj );
-diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
-index 495b35a..b06fbdd 100644
---- sc/source/filter/xml/xmlexprt.cxx
-+++ sc/source/filter/xml/xmlexprt.cxx
-@@ -2514,7 +2514,34 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
- 		}
- 	}
- 	if (!bIsChart)
-+	{
-+		// #i66550 HLINK_FOR_SHAPES
-+		rtl::OUString sHlink;
-+		uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
-+		if ( xProps.is() )
-+			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink;
-+
-+		std::auto_ptr< SvXMLElementExport > pDrawA;
-+		// enlose shapes with <draw:a> element only if sHlink contains something
-+		if ( sHlink.getLength() > 0 )
-+		{
-+			// need to get delete the attributes that are pre-loaded
-+			// for the shape export ( otherwise they will become 	
-+			// attributes of the draw:a element ) This *shouldn't* 
-+			// affect performance adversely as there are only a 
-+			// couple of attributes involved
-+			uno::Reference< xml::sax::XAttributeList > xSaveAttribs( new  SvXMLAttributeList( GetAttrList() ) );
-+			ClearAttrList();
-+			// Add Hlink	
-+			AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
-+			AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sHlink);
-+			pDrawA.reset( new SvXMLElementExport( *this, XML_NAMESPACE_DRAW, XML_A, sal_False, sal_False ) );
-+			// Attribute list has been cleared by previous operation
-+			// re-add pre-loaded attributes
-+			AddAttributeList( xSaveAttribs );
-+		}
- 		GetShapeExport()->exportShape(xShape, SEF_DEFAULT, pPoint);
-+	}
- 	IncrementProgressBar(sal_False);
- }
- 
-diff --git sc/source/ui/drawfunc/drawsh.cxx sc/source/ui/drawfunc/drawsh.cxx
-index 39c3d76..c657abf 100644
---- sc/source/ui/drawfunc/drawsh.cxx
-+++ sc/source/ui/drawfunc/drawsh.cxx
-@@ -210,7 +210,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
- 			ExecuteTextAttrDlg( rReq );
- 			break;
- 
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-         case SID_DRAW_HLINK_EDIT:
-             if ( pSingleSelectedObj )
-                 pViewData->GetDispatcher().Execute( SID_HYPERLINK_DIALOG );
-@@ -238,7 +237,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
-                     ScGlobal::OpenURL( pInfo->GetHlink(), String::EmptyString() );
-             }
-             break;
--#endif
- 
- 		case SID_ATTR_TRANSFORM:
- 			{
-@@ -490,7 +488,6 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT /* nTabPage */ )
- 	delete( pDlg );
- }
- 
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
- void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk )
- {
-     if ( pObj )
-@@ -500,5 +497,4 @@ void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk
-         lcl_setModified( GetObjectShell() );
-     }
- }
--#endif
- 
-diff --git sc/source/ui/drawfunc/drawsh2.cxx sc/source/ui/drawfunc/drawsh2.cxx
-index bd6f2a1..27bfc44 100644
---- sc/source/ui/drawfunc/drawsh2.cxx
-+++ sc/source/ui/drawfunc/drawsh2.cxx
-@@ -199,24 +199,20 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )		// Funktionen disablen
- 	BOOL bCanRename = FALSE;
-     if ( nMarkCount > 1 )
-     {
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-         // no hypelink options for a selected group
-         rSet.DisableItem( SID_DRAW_HLINK_EDIT );
-         rSet.DisableItem( SID_DRAW_HLINK_DELETE );
-         rSet.DisableItem( SID_OPEN_HYPERLINK );
--#endif
-     }
-     else if ( nMarkCount == 1 )
- 	{
-         SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-         ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
-         if ( !pInfo || (pInfo->GetHlink().getLength() == 0) )
-         {
-             rSet.DisableItem( SID_DRAW_HLINK_DELETE );
-             rSet.DisableItem( SID_OPEN_HYPERLINK );
-         }
--#endif
-         SdrLayerID nLayerID = pObj->GetLayer();
-         if ( nLayerID != SC_LAYER_INTERN )
-             bCanRename = TRUE;                          // #i51351# anything except internal objects can be renamed
-diff --git sc/source/ui/drawfunc/drawsh5.cxx sc/source/ui/drawfunc/drawsh5.cxx
-index 16e20a9..4fd06bf 100644
---- sc/source/ui/drawfunc/drawsh5.cxx
-+++ sc/source/ui/drawfunc/drawsh5.cxx
-@@ -95,14 +95,12 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet )             //  Hyperlink
-     if ( nMarkCount == 1 )              // URL-Button markiert ?
-     {
-         SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-         ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
-         if ( pInfo && (pInfo->GetHlink().getLength() > 0) )
-         {
-             aHLinkItem.SetURL( pInfo->GetHlink() );
-             aHLinkItem.SetInsertMode(HLINK_FIELD);
-         }
--#endif
-         SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObj);
-         if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor())
-         {
-@@ -245,13 +243,11 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
-                                     bDone = TRUE;
-                                 }
-                             }
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-                             else
-                             {
-                                 SetHlinkForObject( pObj, rURL );
-                                 bDone = TRUE;
-                             }
--#endif
-                         }
-                     }
- 
-diff --git sc/source/ui/drawfunc/fudraw.cxx sc/source/ui/drawfunc/fudraw.cxx
-index 5c0460f..d060c2f 100644
---- sc/source/ui/drawfunc/fudraw.cxx
-+++ sc/source/ui/drawfunc/fudraw.cxx
-@@ -891,11 +891,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
- 			SdrObjMacroHitRec aHitRec;	//! muss da noch irgendwas gesetzt werden ????
- 			pViewShell->SetActivePointer( pObj->GetMacroPointer(aHitRec) );
- 		}
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-         else if ( !bAlt && pInfo && ((pInfo->GetMacro().getLength() > 0) || (pInfo->GetHlink().getLength() > 0)) )
--#else
--        else if ( !bAlt && pInfo && (pInfo->GetMacro().getLength() > 0) )
--#endif
- 			pWindow->SetPointer( Pointer( POINTER_REFHAND ) );
- 		else if ( IsDetectiveHit( aPnt ) )
- 			pViewShell->SetActivePointer( Pointer( POINTER_DETECTIVE ) );
-diff --git sc/source/ui/drawfunc/fusel.cxx sc/source/ui/drawfunc/fusel.cxx
-index 41c3e60..57bb6ba 100644
---- sc/source/ui/drawfunc/fusel.cxx
-+++ sc/source/ui/drawfunc/fusel.cxx
-@@ -205,7 +205,6 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
-                    }
- 
-                    ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, TRUE );
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-                    // For interoperability favour links over macros if both are defined
-                    if ( pInfo->GetHlink().getLength() > 0 )
-                    {
-@@ -213,9 +212,6 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
-                        sURL = pInfo->GetHlink();
-                    }
-                    else if ( pInfo->GetMacro().getLength() > 0 )
--#else
--                   if ( pInfo->GetMacro().getLength() > 0 )
--#endif
-                    {
-                        SfxObjectShell* pObjSh = SfxObjectShell::Current();
-                        if ( pObjSh && SfxApplication::IsXScriptURL( pInfo->GetMacro() ) )
-diff --git sc/source/ui/drawfunc/objdraw.src sc/source/ui/drawfunc/objdraw.src
-index 53d70c1..a1986b1 100644
---- sc/source/ui/drawfunc/objdraw.src
-+++ sc/source/ui/drawfunc/objdraw.src
-@@ -185,7 +185,6 @@
-         ITEM_FORMAT_PARA_DLG\
-     };
- 
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
- #define MN_EDITLNK \
-     MenuItem\
-     {\
-@@ -201,7 +200,6 @@
-         HelpID = SID_DRAW_HLINK_DELETE ; \
-         Text [ en-US ] = "~Remove Hyperlink" ; \
- 	};
--#endif
- 
- #define MN_DRWTXTATTR \
-     MenuItem\
-@@ -1294,14 +1292,12 @@ Menu RID_POPUP_DRAW
- 		MenuItem { Separator = TRUE ; };
- 		 //------------------------------
- 		ITEM_GROUP_MENU
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
- 		 //------------------------------
- 		MenuItem { Separator = TRUE ; };
- 		 //------------------------------
- 		MN_EDITLNK
- 		MN_DELLNK
-         MenuItem { ITEM_OPEN_HYPERLINK };
--#endif
- 	};
- };
- 
-@@ -1371,14 +1367,12 @@ Menu RID_POPUP_GRAPHIC
- 		MenuItem { Separator = TRUE ; };
- 		 //------------------------------
- 		ITEM_GROUP_MENU
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
- 		 //------------------------------
- 		MenuItem { Separator = TRUE ; };
- 		 //------------------------------
- 		MN_EDITLNK
- 		MN_DELLNK
-         MenuItem { ITEM_OPEN_HYPERLINK };
--#endif
- 	};
- };
- 
-diff --git sc/source/ui/inc/drawsh.hxx sc/source/ui/inc/drawsh.hxx
-index 20b150f..9435ec8 100644
---- sc/source/ui/inc/drawsh.hxx
-+++ sc/source/ui/inc/drawsh.hxx
-@@ -47,9 +47,7 @@ class ScDrawShell : public SfxShell
- 
-     DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* );
- 
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-     void SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk );
--#endif
- 
- protected:
- 	ScViewData*	GetViewData()	{ return pViewData; }
-diff --git sc/source/ui/unoobj/shapeuno.cxx sc/source/ui/unoobj/shapeuno.cxx
-index 151acf8..1d8a944 100644
---- sc/source/ui/unoobj/shapeuno.cxx
-+++ sc/source/ui/unoobj/shapeuno.cxx
-@@ -72,6 +72,8 @@ const SfxItemPropertyMap* lcl_GetShapeMap()
-         {MAP_CHAR_LEN(SC_UNONAME_HORIPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
- 		{MAP_CHAR_LEN(SC_UNONAME_IMAGEMAP),	0, &getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 },
- 		{MAP_CHAR_LEN(SC_UNONAME_VERTPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
-+		// #i66550 HLINK_FOR_SHAPES
-+		{MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), 0, &getCppuType((rtl::OUString*)0), 0, 0 },
-         {0,0,0,0,0,0}
- 	};
- 	return aShapeMap_Impl;
-@@ -86,6 +88,14 @@ const SvEventDescription* ScShapeObj::GetSupportedMacroItems()
- 	};
- 	return aMacroDescriptionsImpl;
- }
-+// #i66550 HLINK_FOR_SHAPES
-+ScMacroInfo* lcl_getShapeHyperMacroInfo( ScShapeObj* pShape, BOOL bCreate = FALSE )
-+{
-+        if( pShape )
-+            if( SdrObject* pObj = pShape->GetSdrObject() )
-+                return ScDrawLayer::GetMacroInfo( pObj, bCreate );
-+        return 0;
-+}
- 
- //------------------------------------------------------------------------
- 
-@@ -627,6 +637,13 @@ void SAL_CALL ScShapeObj::setPropertyValue(
-             }
-         }
-     }
-+	else if  ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) )
-+	{
-+                rtl::OUString sHlink;
-+        	ScMacroInfo* pInfo = lcl_getShapeHyperMacroInfo(this, TRUE);
-+        	if ( ( aValue >>= sHlink ) && pInfo )
-+			pInfo->SetHlink( sHlink );
-+	}
- 	else
- 	{
-         GetShapePropertySet();
-@@ -808,6 +825,13 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa
-             }
-         }
-     }
-+	else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) )
-+	{
-+		rtl::OUString sHlink;
-+		if ( ScMacroInfo* pInfo = lcl_getShapeHyperMacroInfo(this) )
-+			sHlink = pInfo->GetHlink();
-+		aAny <<= sHlink;
-+	}
- 	else
- 	{
-         GetShapePropertySet();
-@@ -1320,11 +1344,6 @@ SdrObject* ScShapeObj::GetSdrObject() const throw()
- }
- 
- #define SC_EVENTACC_ONCLICK     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) )
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--#define SC_EVENTACC_ONACTION    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnAction" ) )
--#define SC_EVENTACC_URL         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) )
--#define SC_EVENTACC_ACTION      ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Action" ) )
--#endif
- #define SC_EVENTACC_SCRIPT      ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Script" ) )
- #define SC_EVENTACC_EVENTTYPE   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) )
- 
-@@ -1336,10 +1355,7 @@ private:
- 
-     ScMacroInfo* getInfo( BOOL bCreate = FALSE )
- 	{
--        if( mpShape )
--            if( SdrObject* pObj = mpShape->GetSdrObject() )
--                return ScDrawLayer::GetMacroInfo( pObj, bCreate );
--        return 0;
-+		return lcl_getShapeHyperMacroInfo( mpShape, bCreate );
- 	}
- 
- public:
-@@ -1365,11 +1381,7 @@ public:
- 				isEventType = true;
- 				continue;
- 			}
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--            if ( isEventType && ((pProperties->Name == SC_EVENTACC_SCRIPT) || (pProperties->Name == SC_EVENTACC_URL)) )
--#else
-             if ( isEventType && (pProperties->Name == SC_EVENTACC_SCRIPT) )
--#endif
- 			{
-                 rtl::OUString sValue;
-                 if ( pProperties->Value >>= sValue )
-@@ -1380,10 +1392,8 @@ public:
-                         break;
-                     if ( pProperties->Name == SC_EVENTACC_SCRIPT )
-                         pInfo->SetMacro( sValue );
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-                     else
-                         pInfo->SetHlink( sValue );
--#endif
-                 }
- 			}
- 		}
-@@ -1406,19 +1416,6 @@ public:
-                 aProperties[ 1 ].Value <<= pInfo->GetMacro();
-             }
-         }
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--        else if( aName == SC_EVENTACC_ONACTION )
--        {
--            if ( pInfo && (pInfo->GetHlink().getLength() > 0) )
--            {
--                aProperties.realloc( 2 );
--                aProperties[ 0 ].Name = SC_EVENTACC_EVENTTYPE;
--                aProperties[ 0 ].Value <<= SC_EVENTACC_ACTION;
--                aProperties[ 1 ].Name = SC_EVENTACC_URL;
--                aProperties[ 1 ].Value <<= pInfo->GetHlink();
--            }
--        }
--#endif
-         else
-         {
-             throw container::NoSuchElementException();
-@@ -1429,25 +1426,14 @@ public:
- 
-     virtual uno::Sequence< rtl::OUString > SAL_CALL getElementNames() throw(uno::RuntimeException)
- 	{
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--        uno::Sequence< rtl::OUString > aSeq( 2 );
--#else
-         uno::Sequence< rtl::OUString > aSeq( 1 );
--#endif
-         aSeq[ 0 ] = SC_EVENTACC_ONCLICK;
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--        aSeq[ 1 ] = SC_EVENTACC_ONACTION;
--#endif
-         return aSeq;
- 	}
- 
- 	virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException)
- 	{
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--        return (aName == SC_EVENTACC_ONCLICK) || (aName == SC_EVENTACC_ONACTION);
--#else
-         return aName == SC_EVENTACC_ONCLICK;
--#endif
- 	}
- 
- 	// XElementAccess
-diff --git sc/source/ui/view/gridwin5.cxx sc/source/ui/view/gridwin5.cxx
-index 81ef0df..57797eb 100644
---- sc/source/ui/view/gridwin5.cxx
-+++ sc/source/ui/view/gridwin5.cxx
-@@ -345,14 +345,12 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
-                                     if ( pDrView->PickObj(aMDPos, pHit, pPV, SDRSEARCH_DEEP ) )
-                                         pObj = pHit;
-                             }
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
-                             ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
-                             if ( pInfo && (pInfo->GetHlink().getLength() > 0) )
-                             {
-                                 aPixRect = LogicToPixel(aVEvt.pObj->GetLogicRect());
-                                 aHelpText = pInfo->GetHlink();
-                             }
--#endif
-                         }
-                     }
-                 }
-diff --git xmloff/inc/xmloff/shapeexport.hxx xmloff/inc/xmloff/shapeexport.hxx
-index bb3b369..bc331e8 100644
---- xmloff/inc/xmloff/shapeexport.hxx
-+++ xmloff/inc/xmloff/shapeexport.hxx
-@@ -197,11 +197,6 @@ private:
- 	const rtl::OUString							msStartShape;
- 	const rtl::OUString							msEndShape;
- 	const rtl::OUString							msOnClick;
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--	const rtl::OUString							msOnAction;
--	const rtl::OUString							msAction;
--	const rtl::OUString							msURL;
--#endif
- 	const rtl::OUString							msEventType;
- 	const rtl::OUString							msPresentation;
- 	const rtl::OUString							msMacroName;
-diff --git xmloff/source/draw/eventimp.cxx xmloff/source/draw/eventimp.cxx
-index 54c0683..57c8dee 100644
---- xmloff/source/draw/eventimp.cxx
-+++ xmloff/source/draw/eventimp.cxx
-@@ -104,9 +104,6 @@ public:
- 
- 	sal_Bool mbValid;
- 	sal_Bool mbScript;
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--    sal_Bool mbActionEvent;
--#endif
- 	ClickAction meClickAction;
- 	XMLEffect meEffect;
- 	XMLEffectDirection meDirection;
-@@ -118,9 +115,6 @@ public:
- 	OUString msMacroName;
- 	OUString msBookmark;
- 	OUString msLanguage;
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--    OUString msHyperURL;
--#endif
- };
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -179,18 +173,11 @@ TYPEINIT1( SdXMLEventContext, SvXMLImportContext );
- 
- SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,  sal_uInt16 nPrfx, const OUString& rLocalName,  const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape )
- :	SvXMLImportContext(rImp, nPrfx, rLocalName),
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--    mxShape( rxShape ), mbScript( sal_False ), mbActionEvent( sal_False ), meClickAction( ClickAction_NONE ),
--#else
-     mxShape( rxShape ), mbScript( sal_False ), meClickAction( ClickAction_NONE ),
--#endif
- 	meEffect( EK_none ), meDirection( ED_none ), mnStartScale( 100 ),
- 	meSpeed( AnimationSpeed_MEDIUM ), mnVerb(0), mbPlayFull( sal_False )
- {
-     static const OUString sXMLClickName( RTL_CONSTASCII_USTRINGPARAM( "click" ) );
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--    static const OUString sXMLActionName( RTL_CONSTASCII_USTRINGPARAM( "action" ) );
--#endif
- 
-     if( nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_EVENT_LISTENER ) )
- 	{
-@@ -261,12 +248,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,  sal_uInt16 nPrfx, cons
- 				sEventName = sValue;
- 				sal_uInt16 nScriptPrefix =
- 					GetImport().GetNamespaceMap().GetKeyByAttrName( sValue, &sEventName );
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--                mbValid = XML_NAMESPACE_DOM == nScriptPrefix && ( sEventName == sXMLClickName || sEventName == sXMLActionName );
--                mbActionEvent = mbValid && (sEventName == sXMLActionName);
--#else
-                 mbValid = XML_NAMESPACE_DOM == nScriptPrefix && sEventName == sXMLClickName;
--#endif
- 			}
- 			else if( IsXMLToken( aAttrLocalName, XML_LANGUAGE ) )
- 			{
-@@ -295,12 +277,6 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,  sal_uInt16 nPrfx, cons
- 				{
- 					msMacroName = sValue;
- 				}
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--                else if ( mbActionEvent )
--                {
--                    msHyperURL = sValue;
--                }
--#endif
- 				else
- 				{
- 					const rtl::OUString &rTmp =
-@@ -346,26 +322,6 @@ void SdXMLEventContext::EndElement()
-         OUString sAPIEventName;
-         uno::Sequence< beans::PropertyValue > aProperties;
- 
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--        if( mbActionEvent )
--        {
--            sAPIEventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "OnAction" ) );
--            aProperties.realloc( 2 );
--            beans::PropertyValue* pProperty = aProperties.getArray();
--
--            pProperty->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) );
--            pProperty->Handle = -1;
--            pProperty->Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "Action" ) );
--            pProperty->State = beans::PropertyState_DIRECT_VALUE;
--            ++pProperty;
--            pProperty->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
--            pProperty->Handle = -1;
--            pProperty->Value <<= msHyperURL;
--            pProperty->State = beans::PropertyState_DIRECT_VALUE;
--        }
--        else
--#endif
--        {
-             sAPIEventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) );
- 
-             if( mbScript )
-@@ -550,8 +506,6 @@ void SdXMLEventContext::EndElement()
-                     break;
-                 }
-             }
--        }
--
-         xEvents->replaceByName( sAPIEventName, uno::Any( aProperties ) );
- 
-     } while(0);
-diff --git xmloff/source/draw/shapeexport.cxx xmloff/source/draw/shapeexport.cxx
-index 4691d72..0bfa0cb 100644
---- xmloff/source/draw/shapeexport.cxx
-+++ xmloff/source/draw/shapeexport.cxx
-@@ -87,11 +87,6 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
- 	msStartShape( RTL_CONSTASCII_USTRINGPARAM("StartShape") ),
- 	msEndShape( RTL_CONSTASCII_USTRINGPARAM("EndShape") ),
- 	msOnClick( RTL_CONSTASCII_USTRINGPARAM("OnClick") ),
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--	msOnAction( RTL_CONSTASCII_USTRINGPARAM("OnAction") ),
--	msAction( RTL_CONSTASCII_USTRINGPARAM("Action") ),
--	msURL( RTL_CONSTASCII_USTRINGPARAM("URL") ),
--#endif
- 	msEventType( RTL_CONSTASCII_USTRINGPARAM("EventType") ),
- 	msPresentation( RTL_CONSTASCII_USTRINGPARAM("Presentation") ),
- 	msMacroName( RTL_CONSTASCII_USTRINGPARAM("MacroName") ),
-diff --git xmloff/source/draw/shapeexport2.cxx xmloff/source/draw/shapeexport2.cxx
-index c3594a6..d7005be 100644
---- xmloff/source/draw/shapeexport2.cxx
-+++ xmloff/source/draw/shapeexport2.cxx
-@@ -296,9 +296,6 @@ const sal_Int32 FOUND_CLICKEVENTTYPE    = 0x00000080;
- const sal_Int32 FOUND_MACRO             = 0x00000100;
- const sal_Int32 FOUND_LIBRARY           = 0x00000200;
- const sal_Int32 FOUND_ACTIONEVENTTYPE   = 0x00000400;
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--const sal_Int32 FOUND_URL               = 0x00000800;
--#endif
- 
- } // namespace
- 
-@@ -388,33 +385,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
-         }
-     }
- 
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--    // extract properties from "OnAction" event -------------------------------
--
--    OUString aActionEventType;
--    OUString aHyperURL;
--
--    uno::Sequence< beans::PropertyValue > aActionProperties;
--    if( xEvents->hasByName( msOnAction ) && (xEvents->getByName( msOnAction ) >>= aActionProperties) )
--    {
--        const beans::PropertyValue* pProperty = aActionProperties.getConstArray();
--        const beans::PropertyValue* pPropertyEnd = pProperty + aActionProperties.getLength();
--        for( ; pProperty != pPropertyEnd; ++pProperty )
--        {
--            if( ( ( nFound & FOUND_ACTIONEVENTTYPE ) == 0 ) && pProperty->Name == msEventType )
--            {
--                if( pProperty->Value >>= aActionEventType )
--                    nFound |= FOUND_ACTIONEVENTTYPE;
--            }
--            else if( ( ( nFound & FOUND_URL ) == 0 ) && ( pProperty->Name == msURL  ) )
--            {
--                if( pProperty->Value >>= aHyperURL )
--                    nFound |= FOUND_URL;
--            }
--        }
--    }
--#endif
--
-     // create the XML elements
- 
-     if( aClickEventType == msPresentation )
-@@ -566,15 +536,9 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
-             SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
-         }
-     }
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--    else if( aClickEventType == msScript || aActionEventType == msAction )
--    {
--        if( nFound & ( FOUND_MACRO | FOUND_URL ) )
--#else
-     else if( aClickEventType == msScript )
-     {
-         if( nFound & FOUND_MACRO )
--#endif
-         {
-             SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
-             if ( nFound & FOUND_MACRO )
-@@ -589,18 +553,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
- 
-                 SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
-             }
--#ifdef ISSUE66550_HLINK_FOR_SHAPES
--            if ( nFound & FOUND_URL )
--            {
--                OUString aEventQName(
--                    mrExport.GetNamespaceMap().GetQNameByKey(
--                            XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "action" ) ) ) );
--                mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
--                mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aHyperURL );
--
--                SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, sal_True, sal_True);
--            }
--#endif
-         }
-     }
- }
-diff --git xmloff/source/draw/ximpshap.cxx xmloff/source/draw/ximpshap.cxx
-index 5d1d0da..c461d59 100644
---- xmloff/source/draw/ximpshap.cxx
-+++ xmloff/source/draw/ximpshap.cxx
-@@ -375,6 +375,11 @@ void SdXMLShapeContext::EndElement()
- 
- 	if( msHyperlink.getLength() != 0 ) try
- 	{
-+		uno::Reference< beans::XPropertySet > xProp( mxShape, uno::UNO_QUERY );
-+
-+		rtl::OUString sLink( RTL_CONSTASCII_USTRINGPARAM( "Hyperlink" ) );
-+		if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName( sLink ) )
-+			xProp->setPropertyValue( sLink, uno::Any( msHyperlink ) );
-         Reference< XEventsSupplier > xEventsSupplier( mxShape, UNO_QUERY_THROW );
-         Reference< XNameReplace > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW );
- 
-@@ -3230,9 +3235,16 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( USHORT nPrefix,
- 
- 	if( !mxImplContext.Is() )
- 	{
--		pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
-+
-+		SvXMLShapeContext* pShapeContext= GetImport().GetShapeImport()->CreateFrameChildContext(
- 						GetImport(), nPrefix, rLocalName, xAttrList, mxShapes, mxAttrList );
- 
-+		pContext = pShapeContext;
-+
-+		// propagate the hyperlink to child context
-+		if ( msHyperlink.getLength() > 0 )
-+			pShapeContext->setHyperlink( msHyperlink );
-+ 
- 		mxImplContext = pContext;
- 		mbSupportsReplacement = IsXMLToken( rLocalName, XML_OBJECT ) ||
- 								IsXMLToken( rLocalName, XML_OBJECT_OLE );
diff --git a/applied_patches/0135-sc-overwrite-char-font-attrs.diff b/applied_patches/0134-sc-overwrite-char-font-attrs.diff
similarity index 100%
rename from applied_patches/0135-sc-overwrite-char-font-attrs.diff
rename to applied_patches/0134-sc-overwrite-char-font-attrs.diff
diff --git a/applied_patches/0135-calc-filter-by-date-strip-time.diff b/applied_patches/0135-calc-filter-by-date-strip-time.diff
new file mode 100644
index 000000000..53fc5b3db
--- /dev/null
+++ b/applied_patches/0135-calc-filter-by-date-strip-time.diff
@@ -0,0 +1,498 @@
+diff --git sc/inc/column.hxx sc/inc/column.hxx
+index 47417c3..11f2955 100644
+--- sc/inc/column.hxx
++++ sc/inc/column.hxx
+@@ -379,7 +379,7 @@ public:
+                 /// Including current, may return -1
+     SCsROW		GetNextUnprotected( SCROW nRow, BOOL bUp ) const;
+ 
+-    void		GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings);
++    void		GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates);
+     BOOL		GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit);
+ 
+ //UNUSED2008-05  SCROW		NoteCount( SCROW nMaxRow = MAXROW ) const;
+diff --git sc/inc/dbcolect.hxx sc/inc/dbcolect.hxx
+index 1346b12..edd5a09 100644
+--- sc/inc/dbcolect.hxx
++++ sc/inc/dbcolect.hxx
+@@ -88,6 +88,7 @@ private:
+     SCCOLROW		nQueryField[MAXQUERY];
+     ScQueryOp		eQueryOp[MAXQUERY];
+     BOOL			bQueryByString[MAXQUERY];
++    bool            bQueryByDate[MAXQUERY];
+     String*			pQueryStr[MAXQUERY];
+     double			nQueryVal[MAXQUERY];
+     ScQueryConnect  eQueryConnect[MAXQUERY];
+diff --git sc/inc/document.hxx sc/inc/document.hxx
+index 06b3fbe..ddb87fa 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -1379,9 +1379,9 @@ public:
+     void 			GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr);
+ 
+     BOOL			GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
+-                                TypedScStrCollection& rStrings, bool bFilter = false );
++                                bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates);
+     SC_DLLPUBLIC BOOL			GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow,
+-                                SCTAB nTab, TypedScStrCollection& rStrings );
++                                SCTAB nTab, TypedScStrCollection& rStrings, bool& rHasDates );
+     BOOL			GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
+                                 TypedScStrCollection& rStrings, BOOL bLimit = FALSE );
+     BOOL			GetFormulaEntries( TypedScStrCollection& rStrings );
+diff --git sc/inc/global.hxx sc/inc/global.hxx
+index cc2e078..de5be83 100644
+--- sc/inc/global.hxx
++++ sc/inc/global.hxx
+@@ -791,6 +791,7 @@ struct ScQueryEntry
+ {
+     BOOL			bDoQuery;
+     BOOL			bQueryByString;
++    bool            bQueryByDate;
+     SCCOLROW		nField;
+     ScQueryOp		eOp;
+     ScQueryConnect  eConnect;
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index 597baf3..d623a9c 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -638,8 +638,8 @@ public:
+     SCSIZE		Query(ScQueryParam& rQueryParam, BOOL bKeepSub);
+     BOOL		CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
+ 
+-    void		GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings);
+-    void        GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings );
++    void        GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings, bool& rHasDates);
++    void        GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings, bool& rHasDates );
+     BOOL		GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit);
+ 
+     BOOL		HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
+diff --git sc/source/core/data/column3.cxx sc/source/core/data/column3.cxx
+index 242c5c0..560801d 100644
+--- sc/source/core/data/column3.cxx
++++ sc/source/core/data/column3.cxx
+@@ -1470,8 +1470,9 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+ }
+ 
+ 
+-void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings)
++void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates)
+ {
++    bool bHasDates = false;
+     SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
+     String aString;
+     SCROW nRow = 0;
+@@ -1507,6 +1508,18 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec
+                     nValue = 0.0;
+             }
+ 
++            if (pFormatter)
++            {
++                short nType = pFormatter->GetType(nFormat);
++                if ((nType & NUMBERFORMAT_DATE) && !(nType & NUMBERFORMAT_TIME))
++                {    
++                    // special case for date values.  Disregard the time
++                    // element if the number format is of date type.
++                    nValue = ::rtl::math::approxFloor(nValue);
++                    bHasDates = true;
++                }
++            }
++
+             pData = new TypedStrData( aString, nValue, SC_STRTYPE_VALUE );
+         }
+ #if 0 // DR
+@@ -1525,6 +1538,8 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec
+ 
+         ++nIndex;
+     }
++
++    rHasDates = bHasDates;
+ }
+ 
+ //
+diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
+index a0b524f..68e4383 100644
+--- sc/source/core/data/documen3.cxx
++++ sc/source/core/data/documen3.cxx
+@@ -1255,7 +1255,8 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
+ //	GetFilterEntries - Eintraege fuer AutoFilter-Listbox
+ //
+ 
+-BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScStrCollection& rStrings, bool bFilter )
++BOOL ScDocument::GetFilterEntries(
++    SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates)
+ {
+     if ( ValidTab(nTab) && pTab[nTab] && pDBCollection )
+     {
+@@ -1292,11 +1293,11 @@ BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScSt
+ 
+             if ( bFilter )
+             {
+-                pTab[nTab]->GetFilteredFilterEntries( nCol, nStartRow, nEndRow, aParam, rStrings );
++                pTab[nTab]->GetFilteredFilterEntries( nCol, nStartRow, nEndRow, aParam, rStrings, rHasDates );
+             }
+             else
+             {
+-                pTab[nTab]->GetFilterEntries( nCol, nStartRow, nEndRow, rStrings );
++                pTab[nTab]->GetFilterEntries( nCol, nStartRow, nEndRow, rStrings, rHasDates );
+             }
+ 
+             return TRUE;
+@@ -1311,11 +1312,11 @@ BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScSt
+ //
+ 
+ BOOL ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow,
+-                                        SCTAB nTab, TypedScStrCollection& rStrings )
++                                        SCTAB nTab, TypedScStrCollection& rStrings, bool& rHasDates )
+ {
+     if ( ValidTab(nTab) && pTab[nTab] )
+     {
+-        pTab[nTab]->GetFilterEntries( nCol, nStartRow, nEndRow, rStrings );
++        pTab[nTab]->GetFilterEntries( nCol, nStartRow, nEndRow, rStrings, rHasDates );
+         return TRUE;
+     }
+ 
+diff --git sc/source/core/data/global2.cxx sc/source/core/data/global2.cxx
+index f71b842..c9b2e3e 100644
+--- sc/source/core/data/global2.cxx
++++ sc/source/core/data/global2.cxx
+@@ -145,30 +145,32 @@ BOOL ScImportParam::operator==( const ScImportParam& rOther ) const
+ //------------------------------------------------------------------------
+ // struct ScQueryParam:
+ 
+-ScQueryEntry::ScQueryEntry()
++ScQueryEntry::ScQueryEntry() :
++    bDoQuery(FALSE),
++    bQueryByString(FALSE),
++    bQueryByDate(false),
++    nField(0),
++    eOp(SC_EQUAL),
++    eConnect(SC_AND),
++    pStr(new String),
++    nVal(0.0),
++    pSearchParam(NULL),
++    pSearchText(NULL)
++{
++}
++
++ScQueryEntry::ScQueryEntry(const ScQueryEntry& r) :
++    bDoQuery(r.bDoQuery),
++    bQueryByString(r.bQueryByString),
++    bQueryByDate(r.bQueryByDate),
++    nField(r.nField),
++    eOp(r.eOp),
++    eConnect(r.eConnect),
++    pStr(new String(*r.pStr)),
++    nVal(r.nVal),
++    pSearchParam(NULL),
++    pSearchText(NULL)
+ {
+-    bDoQuery		= FALSE;
+-    bQueryByString	= FALSE;
+-    eOp				= SC_EQUAL;
+-    eConnect		= SC_AND;
+-    nField			= 0;
+-    nVal			= 0.0;
+-    pStr			= new String;
+-    pSearchParam	= NULL;
+-    pSearchText		= NULL;
+-}
+-
+-ScQueryEntry::ScQueryEntry(const ScQueryEntry& r)
+-{
+-    bDoQuery		= r.bDoQuery;
+-    bQueryByString	= r.bQueryByString;
+-    eOp				= r.eOp;
+-    eConnect		= r.eConnect;
+-    nField			= r.nField;
+-    nVal			= r.nVal;
+-    pStr			= new String(*r.pStr);
+-    pSearchParam	= NULL;
+-    pSearchText		= NULL;
+ }
+ 
+ ScQueryEntry::~ScQueryEntry()
+@@ -185,6 +187,7 @@ ScQueryEntry& ScQueryEntry::operator=( const ScQueryEntry& r )
+ {
+     bDoQuery		= r.bDoQuery;
+     bQueryByString	= r.bQueryByString;
++    bQueryByDate    = r.bQueryByDate;
+     eOp				= r.eOp;
+     eConnect		= r.eConnect;
+     nField			= r.nField;
+@@ -205,6 +208,7 @@ void ScQueryEntry::Clear()
+ {
+     bDoQuery		= FALSE;
+     bQueryByString	= FALSE;
++    bQueryByDate    = false;
+     eOp				= SC_EQUAL;
+     eConnect		= SC_AND;
+     nField			= 0;
+@@ -223,6 +227,7 @@ BOOL ScQueryEntry::operator==( const ScQueryEntry& r ) const
+ {
+     return bDoQuery			== r.bDoQuery
+         && bQueryByString	== r.bQueryByString
++        && bQueryByDate     == r.bQueryByDate
+         && eOp				== r.eOp
+         && eConnect			== r.eConnect
+         && nField			== r.nField
+diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx
+index 7dffb3d..7067799 100644
+--- sc/source/core/data/table3.cxx
++++ sc/source/core/data/table3.cxx
+@@ -60,7 +60,8 @@
+ #include "progress.hxx"
+ #include "cellform.hxx"
+ #include "postit.hxx"
+ #include "queryparam.hxx"
++#include "svtools/zformat.hxx"
+ 
+ #include <vector>
+ 
+@@ -1143,6 +1144,20 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
+             }
+             else
+                 nCellVal = GetValue( static_cast<SCCOL>(rEntry.nField), nRow );
++
++            if (rEntry.bQueryByDate)
++            {
++                sal_uInt32 nNumFmt = GetNumberFormat(static_cast<SCCOL>(rEntry.nField), nRow);
++                const SvNumberformat* pEntry = pDocument->GetFormatTable()->GetEntry(nNumFmt);
++                if (pEntry)
++                {
++                    short nNumFmtType = pEntry->GetType();
++                    if ((nNumFmtType & NUMBERFORMAT_DATE) && !(nNumFmtType & NUMBERFORMAT_TIME))
++                        // The format is of date type.  Strip off the time element.
++                        nCellVal = ::rtl::math::approxFloor(nCellVal);
++                }
++            }
++
+             switch (rEntry.eOp)
+             {
+                 case SC_EQUAL :
+@@ -1930,12 +1945,13 @@ BOOL ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL /* nEndCol *
+     return TRUE;
+ }
+ 
+-void ScTable::GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings)
++void ScTable::GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings, bool& rHasDates)
+ {
+-    aCol[nCol].GetFilterEntries( nRow1, nRow2, rStrings );
++    aCol[nCol].GetFilterEntries( nRow1, nRow2, rStrings, rHasDates );
+ }
+ 
+-void ScTable::GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings )
++void ScTable::GetFilteredFilterEntries(
++    SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings, bool& rHasDates )
+ {
+     // remove the entry for this column from the query parameter
+     ScQueryParam aParam( rParam );
+@@ -1953,15 +1969,18 @@ void ScTable::GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, co
+ 
+     BOOL* pSpecial = new BOOL[nEntryCount];
+     lcl_PrepareQuery( pDocument, this, aParam, pSpecial );
+-
++    bool bHasDates = false;
+     for ( SCROW j = nRow1; j <= nRow2; ++j )
+     {
+         if ( ValidQuery( j, aParam, pSpecial ) )
+         {
+-            aCol[nCol].GetFilterEntries( j, j, rStrings );
++            bool bThisHasDates = false;
++            aCol[nCol].GetFilterEntries( j, j, rStrings, bThisHasDates );
++            bHasDates |= bThisHasDates;
+         }
+     }
+ 
++    rHasDates = bHasDates;
+     delete[] pSpecial;
+ }
+ 
+diff --git sc/source/core/tool/dbcolect.cxx sc/source/core/tool/dbcolect.cxx
+index 162fcbd..9ed2645 100644
+--- sc/source/core/tool/dbcolect.cxx
++++ sc/source/core/tool/dbcolect.cxx
+@@ -158,6 +158,7 @@ ScDBData::ScDBData( const ScDBData& rData ) :
+         nQueryField[i]		= rData.nQueryField[i];
+         eQueryOp[i]			= rData.eQueryOp[i];
+         bQueryByString[i]	= rData.bQueryByString[i];
++        bQueryByDate[i]     = rData.bQueryByDate[i];
+         pQueryStr[i]		= new String( *(rData.pQueryStr[i]) );
+         nQueryVal[i]		= rData.nQueryVal[i];
+         eQueryConnect[i]	= rData.eQueryConnect[i];
+@@ -248,6 +249,7 @@ ScDBData& ScDBData::operator= (const ScDBData& rData)
+         nQueryField[i]		= rData.nQueryField[i];
+         eQueryOp[i]			= rData.eQueryOp[i];
+         bQueryByString[i]	= rData.bQueryByString[i];
++        bQueryByDate[i]     = rData.bQueryByDate[i];
+         *pQueryStr[i]		= *rData.pQueryStr[i];
+         nQueryVal[i]		= rData.nQueryVal[i];
+         eQueryConnect[i]	= rData.eQueryConnect[i];
+@@ -518,6 +520,7 @@ void ScDBData::GetQueryParam( ScQueryParam& rQueryParam ) const
+         rEntry.nField = nQueryField[i];
+         rEntry.eOp = eQueryOp[i];
+         rEntry.bQueryByString = bQueryByString[i];
++        rEntry.bQueryByDate = bQueryByDate[i];
+         *rEntry.pStr = *pQueryStr[i];
+         rEntry.nVal = nQueryVal[i];
+         rEntry.eConnect = eQueryConnect[i];
+@@ -549,6 +552,7 @@ void ScDBData::SetQueryParam(const ScQueryParam& rQueryParam)
+         nQueryField[i] = rEntry.nField;
+         eQueryOp[i] = rEntry.eOp;
+         bQueryByString[i] = rEntry.bQueryByString;
++        bQueryByDate[i] = rEntry.bQueryByDate;
+         *pQueryStr[i] = *rEntry.pStr;
+         nQueryVal[i] = rEntry.nVal;
+         eQueryConnect[i] = rEntry.eConnect;
+diff --git sc/source/ui/dbgui/filtdlg.cxx sc/source/ui/dbgui/filtdlg.cxx
+index 4a2d4d4..4f56adb 100644
+--- sc/source/ui/dbgui/filtdlg.cxx
++++ sc/source/ui/dbgui/filtdlg.cxx
+@@ -451,24 +451,27 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
+             SCCOL nColumn = theQueryData.nCol1 + static_cast<SCCOL>(nFieldSelPos) - 1;
+             if (!pEntryLists[nColumn])
+             {
++                USHORT nOffset = GetSliderPos();
+                 SCTAB nTab		 = nSrcTab;
+                 SCROW nFirstRow = theQueryData.nRow1;
+                 SCROW nLastRow	 = theQueryData.nRow2;
++                mbHasDates[nOffset+nList-1] = false;
+ 
+                 //	erstmal ohne die erste Zeile
+ 
+                 pEntryLists[nColumn] = new TypedScStrCollection( 128, 128 );
+                 pEntryLists[nColumn]->SetCaseSensitive( aBtnCase.IsChecked() );
+                 pDoc->GetFilterEntriesArea( nColumn, nFirstRow+1, nLastRow,
+-                                            nTab, *pEntryLists[nColumn] );
++                                            nTab, *pEntryLists[nColumn], mbHasDates[nOffset+nList-1] );
+ 
+                 //	Eintrag fuer die erste Zeile
+                 //!	Eintrag (pHdrEntry) ohne Collection erzeugen?
+ 
+                 nHeaderPos[nColumn] = USHRT_MAX;
+                 TypedScStrCollection aHdrColl( 1, 1 );
++                bool bDummy = false;
+                 pDoc->GetFilterEntriesArea( nColumn, nFirstRow, nFirstRow,
+-                                            nTab, aHdrColl );
++                                            nTab, aHdrColl, bDummy );
+                 TypedStrData* pHdrEntry = aHdrColl[0];
+                 if ( pHdrEntry )
+                 {
+@@ -1064,7 +1067,8 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
+                 static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0);
+            
+             ScQueryOp eOp  = (ScQueryOp)pLbCond->GetSelectEntryPos();
+-           rEntry.eOp	  = eOp;
++            rEntry.eOp	   = eOp;
++            rEntry.bQueryByDate = mbHasDates[nQE];
+ 
+         }
+     }		
+diff --git sc/source/ui/dbgui/pfiltdlg.cxx sc/source/ui/dbgui/pfiltdlg.cxx
+index 35bfc35..42c2c26 100644
+--- sc/source/ui/dbgui/pfiltdlg.cxx
++++ sc/source/ui/dbgui/pfiltdlg.cxx
+@@ -352,11 +352,12 @@ void ScPivotFilterDlg::UpdateValueList( USHORT nList )
+                 SCROW	nFirstRow	= theQueryData.nRow1;
+                 SCROW	nLastRow	= theQueryData.nRow2;
+                 nFirstRow++;
++                bool bHasDates = false;
+ 
+                 pEntryLists[nColumn] = new TypedScStrCollection( 128, 128 );
+                 pEntryLists[nColumn]->SetCaseSensitive( aBtnCase.IsChecked() );
+                 pDoc->GetFilterEntriesArea( nColumn, nFirstRow, nLastRow,
+-                                            nTab, *pEntryLists[nColumn] );
++                                            nTab, *pEntryLists[nColumn], bHasDates );
+             }
+ 
+             TypedScStrCollection* pColl = pEntryLists[nColumn];
+diff --git sc/source/ui/inc/filtdlg.hxx sc/source/ui/inc/filtdlg.hxx
+index c418e82..7409b5a 100644
+--- sc/source/ui/inc/filtdlg.hxx
++++ sc/source/ui/inc/filtdlg.hxx
+@@ -167,6 +167,7 @@ private:
+     ListBox*			aFieldLbArr[4];
+     ListBox*			aCondLbArr[4];
+     ListBox*			aConnLbArr[4];
++    bool                mbHasDates[MAXQUERY];
+     BOOL                bRefreshExceptQuery[MAXQUERY];
+     USHORT				nFieldCount;
+     BOOL				bRefInputMode;
+diff --git sc/source/ui/inc/gridwin.hxx sc/source/ui/inc/gridwin.hxx
+index 4013e1a..aae0353 100644
+--- sc/source/ui/inc/gridwin.hxx
++++ sc/source/ui/inc/gridwin.hxx
+@@ -218,7 +218,7 @@ private:
+ 
+     BOOL 			IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab );
+     void			ExecFilter( ULONG nSel, SCCOL nCol, SCROW nRow,
+-                                const String& aValue );
++                                const String& aValue, bool bCheckForDates );
+     void			FilterSelect( ULONG nSel );
+ 
+     void			ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr );
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index b547e2c..6fc33d5 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -170,6 +170,7 @@ private:
+     BOOL			bInit;
+     BOOL			bCancelled;
+     BOOL            bInSelect;
++    bool            mbListHasDates;
+     ULONG			nSel;
+     ScFilterBoxMode	eMode;
+ 
+@@ -193,6 +194,8 @@ public:
+     BOOL            IsInInit() const        { return bInit; }
+     void			SetCancelled()			{ bCancelled = TRUE; }
+     BOOL            IsInSelect() const      { return bInSelect; }
++    void            SetListHasDates(bool b) { mbListHasDates = b; }
++    bool            HasDates() const        { return mbListHasDates; }
+ };
+ 
+ //-------------------------------------------------------------------
+@@ -208,6 +211,7 @@ ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid,
+     bInit( TRUE ),
+     bCancelled( FALSE ),
+     bInSelect( FALSE ),
++    mbListHasDates(false),
+     nSel( 0 ),
+     eMode( eNewMode )
+ {
+@@ -912,7 +916,9 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
+         pFilterBox->SetSeparatorPos( nDefCount - 1 );
+ 
+         //	get list entries
+-        pDoc->GetFilterEntries( nCol, nRow, nTab, aStrings, true );
++        bool bHasDates = false;
++        pDoc->GetFilterEntries( nCol, nRow, nTab, true, aStrings, bHasDates);
++        pFilterBox->SetListHasDates(bHasDates);
+ 
+         //	check widths of numerical entries (string entries are not included)
+         //	so all numbers are completely visible
+@@ -1122,7 +1128,7 @@ void ScGridWindow::FilterSelect( ULONG nSel )
+             ExecDataSelect( nCol, nRow, aString );
+             break;
+         case SC_FILTERBOX_FILTER:
+-            ExecFilter( nSel, nCol, nRow, aString );
++            ExecFilter( nSel, nCol, nRow, aString, pFilterBox->HasDates() );
+             break;
+         case SC_FILTERBOX_SCENARIO:
+             pViewData->GetView()->UseScenario( aString );
+@@ -1155,7 +1161,7 @@ void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr )
+ 
+ void ScGridWindow::ExecFilter( ULONG nSel,
+                                SCCOL nCol, SCROW nRow,
+-                               const String& aValue )
++                               const String& aValue, bool bCheckForDates )
+ {
+     SCTAB nTab = pViewData->GetTabNo();
+     ScDocument* pDoc = pViewData->GetDocument();
+@@ -1227,6 +1233,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
+                     rNewEntry.bDoQuery		 = TRUE;
+                     rNewEntry.bQueryByString = TRUE;
+                     rNewEntry.nField		 = nCol;
++                    rNewEntry.bQueryByDate   = bCheckForDates;
+                     if ( nSel == SC_AUTOFILTER_TOP10 )
+                     {
+                         rNewEntry.eOp	= SC_TOPVAL;
diff --git a/applied_patches/0139-sc-paste-on-enter.diff b/applied_patches/0139-sc-paste-on-enter.diff
dissimilarity index 80%
index 6b3bb2493..295a7fdb7 100644
--- a/applied_patches/0139-sc-paste-on-enter.diff
+++ b/applied_patches/0139-sc-paste-on-enter.diff
@@ -1,314 +1,189 @@
-Index: sc/source/ui/inc/cellsh.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/inc/cellsh.hxx,v
-retrieving revision 1.9
-diff -u -p -r1.9 cellsh.hxx
---- sc/source/ui/inc/cellsh.hxx	10 Apr 2008 22:43:12 -0000	1.9
-+++ sc/source/ui/inc/cellsh.hxx	1 May 2008 20:04:42 -0000
-@@ -42,6 +42,7 @@ class SvxClipboardFmtItem;
- class TransferableDataHelper;
- class TransferableClipboardListener;
- class AbstractScLinkedAreaDlg;
-+class ScTabViewShell;
- 
- struct CellShell_Impl
- {
-@@ -102,6 +103,7 @@ public:
- 	void		ExecutePageSel( SfxRequest& rReq );
- 	void		ExecuteMove( SfxRequest& rReq );
- 	void		GetStateCursor( SfxItemSet& rSet );
-+	static void PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, BOOL bShowDialog );
- };
- 
- #endif
-Index: sc/source/ui/inc/viewdata.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/inc/viewdata.hxx,v
-retrieving revision 1.24
-diff -u -p -r1.24 viewdata.hxx
---- sc/source/ui/inc/viewdata.hxx	18 Apr 2008 11:36:48 -0000	1.24
-+++ sc/source/ui/inc/viewdata.hxx	1 May 2008 20:04:42 -0000
-@@ -89,6 +89,13 @@ enum ScMarkType
- #endif
- };
- 
-+enum ScPasteFlags
-+{
-+    SC_PASTE_NONE   = 0,    // No flags specified
-+    SC_PASTE_MODE   = 1,    // Enable paste-mode
-+    SC_PASTE_BORDER = 2,    // Show a border around the source cells
-+};
-+
- class ScDocShell;
- class ScDocument;
- class ScDBFunc;
-@@ -210,6 +219,8 @@ private:
- 	SCCOL				nTabStartCol;				// fuer Enter nach Tab
- 	ScRange				aDelRange;					// fuer AutoFill-Loeschen
- 
-+	ScPasteFlags        nPasteFlags;
-+
-     ScSplitPos          eEditActivePart;            // the part that was active when edit mode was started
- 	BOOL				bEditActive[4];				// aktiv?
- 	BOOL				bActive;					// aktives Fenster ?
-@@ -295,6 +306,8 @@ public:
- 	SCCOL			GetFixPosX() const						{ return pThisTab->nFixPosX; }
- 	SCROW			GetFixPosY() const						{ return pThisTab->nFixPosY; }
- 	BOOL			IsPagebreakMode() const					{ return bPagebreak; }
-+	BOOL			IsPasteMode() const                     { return nPasteFlags & SC_PASTE_MODE; }
-+	BOOL			ShowPasteSource() const                 { return nPasteFlags & SC_PASTE_BORDER; }
- 
- 	void			SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX );
- 	void			SetPosY( ScVSplitPos eWhich, SCROW nNewPosY );
-@@ -309,6 +322,7 @@ public:
- 	void			SetFixPosX( SCCOL nPos )						{ pThisTab->nFixPosX = nPos; }
- 	void			SetFixPosY( SCROW nPos )						{ pThisTab->nFixPosY = nPos; }
- 	void			SetPagebreakMode( BOOL bSet );
-+	void			SetPasteMode ( ScPasteFlags nFlags )            { nPasteFlags = nFlags; }
- 
-     void            SetZoomType( SvxZoomType eNew, BOOL bAll );
-     void            SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
-Index: sc/source/ui/view/cellsh1.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/cellsh1.cxx,v
-retrieving revision 1.51
-diff -u -p -r1.51 cellsh1.cxx
---- sc/source/ui/view/cellsh1.cxx	18 Apr 2008 11:40:55 -0000	1.51
-+++ sc/source/ui/view/cellsh1.cxx	1 May 2008 20:04:42 -0000
-@@ -1168,6 +1178,8 @@ void ScCellShell::ExecuteEdit( SfxReques
- 				WaitObject aWait( GetViewData()->GetDialogParent() );
- 				pTabViewShell->CopyToClip( NULL, FALSE, FALSE, TRUE );
- 				rReq.Done();
-+				GetViewData()->SetPasteMode( (ScPasteFlags) (SC_PASTE_MODE | SC_PASTE_BORDER) );
-+				pTabViewShell->ShowCursor();
- 			}
- 			break;
- 
-@@ -1176,46 +1188,15 @@ void ScCellShell::ExecuteEdit( SfxReques
- 				WaitObject aWait( GetViewData()->GetDialogParent() );
- 				pTabViewShell->CutToClip( NULL, TRUE );
- 				rReq.Done();
-+				GetViewData()->SetPasteMode( SC_PASTE_MODE );
- 			}
- 			break;
- 
- 		case SID_PASTE:
- 			{
--                Window* pWin = GetViewData()->GetActiveWin();
--                ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
--                ScDocument* pThisDoc = GetViewData()->GetDocument();
--                ScDPObject* pDPObj = pThisDoc->GetDPAtCursor( GetViewData()->GetCurX(),
--                                     GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
--                if ( pOwnClip && pDPObj )
--                {
--                    // paste from Calc into DataPilot table: sort (similar to drag & drop)
--
--                    ScDocument* pClipDoc = pOwnClip->GetDocument();
--                    SCTAB nSourceTab = pOwnClip->GetVisibleTab();
--
--                    SCCOL nClipStartX;
--                    SCROW nClipStartY;
--                    SCCOL nClipEndX;
--                    SCROW nClipEndY;
--                    pClipDoc->GetClipStart( nClipStartX, nClipStartY );
--                    pClipDoc->GetClipArea( nClipEndX, nClipEndY, TRUE );
--                    nClipEndX = nClipEndX + nClipStartX;
--                    nClipEndY = nClipEndY + nClipStartY;   // GetClipArea returns the difference
--
--                    ScRange aSource( nClipStartX, nClipStartY, nSourceTab, nClipEndX, nClipEndY, nSourceTab );
--                    BOOL bDone = pTabViewShell->DataPilotMove( aSource, GetViewData()->GetCurPos() );
--                    if ( !bDone )
--                        pTabViewShell->ErrorMessage( STR_ERR_DATAPILOT_INPUT );
--                }
--                else
--                {
--                    // normal paste
--                    WaitObject aWait( GetViewData()->GetDialogParent() );
--                    pTabViewShell->PasteFromSystem();
--                }
-+				PasteFromClipboard ( GetViewData(), pTabViewShell, TRUE );
- 				rReq.Done();
- 			}
--			pTabViewShell->CellContentChanged();		// => PasteFromSystem() ???
- 			break;
- 
- 		case SID_CLIPBOARD_FORMAT_ITEMS:
-@@ -2264,3 +2245,47 @@ IMPL_LINK( ScCellShell, DialogClosed, Ab
-     return 0;
- }
- 
-+void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, BOOL bShowDialog )
-+{
-+    Window* pWin = pViewData->GetActiveWin();
-+    ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
-+    ScDocument* pThisDoc = pViewData->GetDocument();
-+    ScDPObject* pDPObj = pThisDoc->GetDPAtCursor( pViewData->GetCurX(),
-+                         pViewData->GetCurY(), pViewData->GetTabNo() );
-+    if ( pOwnClip && pDPObj )
-+    {
-+        // paste from Calc into DataPilot table: sort (similar to drag & drop)
-+
-+        ScDocument* pClipDoc = pOwnClip->GetDocument();
-+        SCTAB nSourceTab = pOwnClip->GetVisibleTab();
-+
-+        SCCOL nClipStartX;
-+        SCROW nClipStartY;
-+        SCCOL nClipEndX;
-+        SCROW nClipEndY;
-+        pClipDoc->GetClipStart( nClipStartX, nClipStartY );
-+        pClipDoc->GetClipArea( nClipEndX, nClipEndY, TRUE );
-+        nClipEndX = nClipEndX + nClipStartX;
-+        nClipEndY = nClipEndY + nClipStartY;   // GetClipArea returns the difference
-+
-+        ScRange aSource( nClipStartX, nClipStartY, nSourceTab, nClipEndX, nClipEndY, nSourceTab );
-+        BOOL bDone = pTabViewShell->DataPilotMove( aSource, pViewData->GetCurPos() );
-+        if ( !bDone )
-+            pTabViewShell->ErrorMessage( STR_ERR_DATAPILOT_INPUT );
-+    }
-+    else
-+    {
-+        // normal paste
-+        WaitObject aWait( pViewData->GetDialogParent() );
-+        if (!pOwnClip)
-+            pTabViewShell->PasteFromSystem();
-+        else
-+        {
-+            pTabViewShell->PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
-+                    PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
-+                    bShowDialog );		// allow warning dialog
-+        }
-+    }
-+    pTabViewShell->CellContentChanged();		// => PasteFromSystem() ???
-+}
-+
-Index: sc/source/ui/view/viewdata.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/viewdata.cxx,v
-retrieving revision 1.65
-diff -u -p -r1.65 viewdata.cxx
---- sc/source/ui/view/viewdata.cxx	18 Apr 2008 12:01:29 -0000	1.65
-+++ sc/source/ui/view/viewdata.cxx	1 May 2008 20:04:43 -0000
-@@ -306,6 +306,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh )
- 		eRefType	( SC_REFTYPE_NONE ),
- 		nTabNo		( 0 ),
- 		nRefTabNo	( 0 ),
-+        nPasteFlags ( SC_PASTE_NONE ),
-         eEditActivePart( SC_SPLIT_BOTTOMLEFT ),
- 		bActive		( TRUE ),					//! wie initialisieren?
- 		bIsRefMode	( FALSE ),
-@@ -441,6 +450,7 @@ void ScViewData::InitFrom( const ScViewD
- //UNUSED2008-05      aDefPageZoomX = pRef->aDefPageZoomX;
- //UNUSED2008-05      aDefPageZoomY = pRef->aDefPageZoomY;
- //UNUSED2008-05  	bPagebreak	= pRef->bPagebreak;
-+//UNUSED2008-05 	nPasteFlags = pRef->nPasteFlags;
- //UNUSED2008-05  	aLogicMode	= pRef->aLogicMode;
- //UNUSED2008-05  
- //UNUSED2008-05  	SetGridMode		( pRef->IsGridMode() );
---- sc/source/ui/view/gridwin.cxx
-+++ sc/source/ui/view/gridwin.cxx
-@@ -118,6 +118,7 @@
- #include "userdat.hxx"
- #include "drwlayer.hxx"
- #include "attrib.hxx"
-+#include "cellsh.hxx"
- #include "validat.hxx"
- #include "tabprotection.hxx"
- #include "postit.hxx"
-@@ -2934,12 +2935,30 @@ void ScGridWindow::SelectForContextMenu(
-     }
- }
- 
-+static void ClearSingleSelection( ScViewData* pViewData )
-+{
-+    SCCOL nX;
-+    SCROW nY;
-+    ScTransferObj* pTransObj = ScTransferObj::GetOwnClipboard( 
-+        pViewData->GetActiveWin() );
-+    if (!pTransObj)
-+        return;
-+
-+    ScDocument* pClipDoc = pTransObj->GetDocument();
-+    pClipDoc->GetClipArea( nX, nY, TRUE );
-+    if (nX == 0 && nY == 0)
-+    {
-+        ScTabView* pView = pViewData->GetView();
-+        pView->Unmark();
-+    }
-+}
-+
- void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
- {
-     // #96965# Cursor control for ref input dialog
-+    const KeyCode& rKeyCode = rKEvt.GetKeyCode();
-     if( SC_MOD()->IsRefDialogOpen() )
-     {
--        const KeyCode& rKeyCode = rKEvt.GetKeyCode();
-         if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )
-         {
-             SC_MOD()->EndReference();
-@@ -2954,9 +2973,35 @@ void __EXPORT ScGridWindow::KeyInput(con
-             return;
-         }
-     }
-+	else if( rKeyCode.GetCode() == KEY_RETURN && pViewData->IsPasteMode() )
-+	{
-+		ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
-+
-+		ScCellShell::PasteFromClipboard( pViewData, pTabViewShell, FALSE );
-+		ClearSingleSelection( pViewData );
-+
-+		uno::Reference<datatransfer::clipboard::XClipboard> xSystemClipboard = 
-+			TransferableHelper::GetSystemClipboard();
-+		if (xSystemClipboard.is())
-+		{
-+			xSystemClipboard->setContents(
-+					uno::Reference<datatransfer::XTransferable>(),
-+					uno::Reference<datatransfer::clipboard::XClipboardOwner>());
-+		}
-+
-+		// hide the border around the copy source
-+		pViewData->SetPasteMode( SC_PASTE_NONE );
-+		UpdateCursorOverlay();
-+		return;
-+	}
- 	// wenn semi-Modeless-SfxChildWindow-Dialog oben, keine KeyInputs:
-     else if( !pViewData->IsAnyFillMode() )
- 	{
-+		if (rKeyCode.GetCode() == KEY_ESCAPE)
-+		{
-+			pViewData->SetPasteMode( SC_PASTE_NONE );
-+			UpdateCursorOverlay();
-+		}
- 		//	query for existing note marker before calling ViewShell's keyboard handling
- 		//	which may remove the marker
- 		BOOL bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() );
-Index: sc/source/ui/app/inputhdl.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/app/inputhdl.cxx,v
-retrieving revision 1.77
-diff -u -p -r1.77 inputhdl.cxx
---- sc/source/ui/app/inputhdl.cxx	10 Apr 2008 21:45:27 -0000	1.77
-+++ sc/source/ui/app/inputhdl.cxx	1 May 2008 20:04:44 -0000
-@@ -1699,6 +1699,7 @@ IMPL_LINK( ScInputHandler, ModifyHdl, vo
- 
- BOOL ScInputHandler::DataChanging( sal_Unicode cTyped, BOOL bFromCommand )		// return TRUE = new view created
- {
-+	pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE );
- 	bInOwnChange = TRUE;				// disable ModifyHdl (reset in DataChanged)
- 
- 	if ( eMode == SC_INPUT_NONE )
-Index: sc/source/ui/view/viewfunc.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/viewfunc.cxx,v
-retrieving revision 1.44
-diff -u -p -r1.44 viewfunc.cxx
---- sc/source/ui/view/viewfunc.cxx	18 Apr 2008 11:50:48 -0000	1.44
-+++ sc/source/ui/view/viewfunc.cxx	1 May 2008 20:04:44 -0000
-@@ -1785,6 +1799,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows
- 
- void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
- {
-+	GetViewData()->SetPasteMode( SC_PASTE_NONE );
- 	// nur wegen Matrix nicht editierbar? Attribute trotzdem ok
- 	BOOL bOnlyNotBecauseOfMatrix;
- 	BOOL bEditable = SelectionEditable( &bOnlyNotBecauseOfMatrix );
+diff --git sc/source/ui/app/inputhdl.cxx sc/source/ui/app/inputhdl.cxx
+index 98aac39..6ac26bc 100644
+--- sc/source/ui/app/inputhdl.cxx
++++ sc/source/ui/app/inputhdl.cxx
+@@ -2055,6 +2055,7 @@ IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG )
+ 
+ BOOL ScInputHandler::DataChanging( sal_Unicode cTyped, BOOL bFromCommand )		// return TRUE = new view created
+ {
++    pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE );
+     bInOwnChange = TRUE;				// disable ModifyHdl (reset in DataChanged)
+ 
+     if ( eMode == SC_INPUT_NONE )
+diff --git sc/source/ui/inc/viewdata.hxx sc/source/ui/inc/viewdata.hxx
+index 6f0d986..19583a8 100644
+--- sc/source/ui/inc/viewdata.hxx
++++ sc/source/ui/inc/viewdata.hxx
+@@ -89,6 +89,13 @@ enum ScMarkType
+ #endif
+ };
+ 
++enum ScPasteFlags
++{
++    SC_PASTE_NONE   = 0,    // No flags specified
++    SC_PASTE_MODE   = 1,    // Enable paste-mode
++    SC_PASTE_BORDER = 2,    // Show a border around the source cells
++};
++
+ class ScDocShell;
+ class ScDocument;
+ class ScDBFunc;
+@@ -210,6 +217,8 @@ private:
+     SCCOL				nTabStartCol;				// fuer Enter nach Tab
+     ScRange				aDelRange;					// fuer AutoFill-Loeschen
+ 
++    ScPasteFlags        nPasteFlags;
++
+     ScSplitPos          eEditActivePart;            // the part that was active when edit mode was started
+     BOOL				bEditActive[4];				// aktiv?
+     BOOL				bActive;					// aktives Fenster ?
+@@ -295,6 +304,8 @@ public:
+     SCCOL			GetFixPosX() const						{ return pThisTab->nFixPosX; }
+     SCROW			GetFixPosY() const						{ return pThisTab->nFixPosY; }
+     BOOL			IsPagebreakMode() const					{ return bPagebreak; }
++    BOOL            IsPasteMode() const                     { return nPasteFlags & SC_PASTE_MODE; }
++    BOOL            ShowPasteSource() const                 { return nPasteFlags & SC_PASTE_BORDER; }
+ 
+     void			SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX );
+     void			SetPosY( ScVSplitPos eWhich, SCROW nNewPosY );
+@@ -309,6 +320,7 @@ public:
+     void			SetFixPosX( SCCOL nPos )						{ pThisTab->nFixPosX = nPos; }
+     void			SetFixPosY( SCROW nPos )						{ pThisTab->nFixPosY = nPos; }
+     void			SetPagebreakMode( BOOL bSet );
++    void            SetPasteMode ( ScPasteFlags nFlags )            { nPasteFlags = nFlags; }
+ 
+     void            SetZoomType( SvxZoomType eNew, BOOL bAll );
+     void            SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
+diff --git sc/source/ui/view/cellsh1.cxx sc/source/ui/view/cellsh1.cxx
+index ba66243..0cd4007 100644
+--- sc/source/ui/view/cellsh1.cxx
++++ sc/source/ui/view/cellsh1.cxx
+@@ -1170,6 +1170,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
+                 WaitObject aWait( GetViewData()->GetDialogParent() );
+                 pTabViewShell->CopyToClip( NULL, FALSE, FALSE, TRUE );
+                 rReq.Done();
++                GetViewData()->SetPasteMode( (ScPasteFlags) (SC_PASTE_MODE | SC_PASTE_BORDER) );
++                pTabViewShell->ShowCursor();
+             }
+             break;
+ 
+@@ -1178,6 +1180,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
+                 WaitObject aWait( GetViewData()->GetDialogParent() );
+                 pTabViewShell->CutToClip( NULL, TRUE );
+                 rReq.Done();
++                GetViewData()->SetPasteMode( SC_PASTE_MODE );
+             }
+             break;
+ 
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index 6fc33d5..6e0280a 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -118,6 +118,7 @@
+ #include "userdat.hxx"
+ #include "drwlayer.hxx"
+ #include "attrib.hxx"
++#include "cellsh.hxx"
+ #include "validat.hxx"
+ #include "tabprotection.hxx"
+ #include "postit.hxx"
+@@ -2969,12 +2970,30 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel )
+     }
+ }
+ 
++static void ClearSingleSelection( ScViewData* pViewData )
++{
++    SCCOL nX;
++    SCROW nY;
++    ScTransferObj* pTransObj = ScTransferObj::GetOwnClipboard( 
++        pViewData->GetActiveWin() );
++    if (!pTransObj)
++        return;
++
++    ScDocument* pClipDoc = pTransObj->GetDocument();
++    pClipDoc->GetClipArea( nX, nY, TRUE );
++    if (nX == 0 && nY == 0)
++    {
++        ScTabView* pView = pViewData->GetView();
++        pView->Unmark();
++    }
++}
++
+ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
+ {
+     // #96965# Cursor control for ref input dialog
++    const KeyCode& rKeyCode = rKEvt.GetKeyCode();
+     if( SC_MOD()->IsRefDialogOpen() )
+     {
+-        const KeyCode& rKeyCode = rKEvt.GetKeyCode();
+         if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )
+         {
+             SC_MOD()->EndReference();
+@@ -2989,9 +3008,35 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
+             return;
+         }
+     }
++    else if( rKeyCode.GetCode() == KEY_RETURN && pViewData->IsPasteMode() )
++    {
++        ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
++
++        ScCellShell::PasteFromClipboard( pViewData, pTabViewShell, FALSE );
++        ClearSingleSelection( pViewData );
++
++        uno::Reference<datatransfer::clipboard::XClipboard> xSystemClipboard = 
++            TransferableHelper::GetSystemClipboard();
++        if (xSystemClipboard.is())
++        {
++            xSystemClipboard->setContents(
++                    uno::Reference<datatransfer::XTransferable>(),
++                    uno::Reference<datatransfer::clipboard::XClipboardOwner>());
++        }
++
++        // hide the border around the copy source
++        pViewData->SetPasteMode( SC_PASTE_NONE );
++        UpdateCursorOverlay();
++        return;
++    }
+     // wenn semi-Modeless-SfxChildWindow-Dialog oben, keine KeyInputs:
+     else if( !pViewData->IsAnyFillMode() )
+     {
++        if (rKeyCode.GetCode() == KEY_ESCAPE)
++        {
++            pViewData->SetPasteMode( SC_PASTE_NONE );
++            UpdateCursorOverlay();
++        }
+         //	query for existing note marker before calling ViewShell's keyboard handling
+         //	which may remove the marker
+         BOOL bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() );
+diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
+index df48982..e75b864 100644
+--- sc/source/ui/view/viewdata.cxx
++++ sc/source/ui/view/viewdata.cxx
+@@ -306,6 +306,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh )
+         eRefType	( SC_REFTYPE_NONE ),
+         nTabNo		( 0 ),
+         nRefTabNo	( 0 ),
++        nPasteFlags ( SC_PASTE_NONE ),
+         eEditActivePart( SC_SPLIT_BOTTOMLEFT ),
+         bActive		( TRUE ),					//! wie initialisieren?
+         bIsRefMode	( FALSE ),
+@@ -432,6 +433,7 @@ void ScViewData::InitData( ScDocument* pDocument )
+ //UNUSED2008-05      aDefPageZoomX = pRef->aDefPageZoomX;
+ //UNUSED2008-05      aDefPageZoomY = pRef->aDefPageZoomY;
+ //UNUSED2008-05      bPagebreak  = pRef->bPagebreak;
++//UNUSED2008-05 	nPasteFlags = pRef->nPasteFlags;
+ //UNUSED2008-05      aLogicMode  = pRef->aLogicMode;
+ //UNUSED2008-05  
+ //UNUSED2008-05      SetGridMode     ( pRef->IsGridMode() );
+diff --git sc/source/ui/view/viewfunc.cxx sc/source/ui/view/viewfunc.cxx
+index 8155a80..61670e7 100644
+--- sc/source/ui/view/viewfunc.cxx
++++ sc/source/ui/view/viewfunc.cxx
+@@ -1910,6 +1910,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
+ 
+ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
+ {
++    GetViewData()->SetPasteMode( SC_PASTE_NONE );
+     // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
+     BOOL bOnlyNotBecauseOfMatrix;
+     BOOL bEditable = SelectionEditable( &bOnlyNotBecauseOfMatrix );
diff --git a/applied_patches/0140-calc-multi-range-copy-paste.diff b/applied_patches/0140-calc-multi-range-copy-paste.diff
deleted file mode 100644
index c17efcf41..000000000
--- a/applied_patches/0140-calc-multi-range-copy-paste.diff
+++ /dev/null
@@ -1,2036 +0,0 @@
-diff --git sc/inc/cell.hxx sc/inc/cell.hxx
-index 5454907..b460a31 100644
---- sc/inc/cell.hxx
-+++ sc/inc/cell.hxx
-@@ -40,6 +40,7 @@
- #include <tools/mempool.hxx>
- #include <svtools/listener.hxx>
- #include "global.hxx"
-+#include "rangenam.hxx"
- #include "formula/grammar.hxx"
- #include "tokenarray.hxx"
- #include "formularesult.hxx"
-@@ -462,6 +463,7 @@ public:
-     BOOL			IsRangeNameInUse(USHORT nIndex) const;
-     void            FindRangeNamesInUse(std::set<USHORT>& rIndexes) const;
-     void 			ReplaceRangeNamesInUse( const ScIndexMap& rMap );
-+	void 			ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap );
-     BOOL			IsSubTotal() const 						{ return bSubTotal; }
-     BOOL			IsChanged() const  						{ return bChanged; }
-     void			ResetChanged()							{ bChanged = FALSE; }
-diff --git sc/inc/clipparam.hxx sc/inc/clipparam.hxx
-new file mode 100644
-index 0000000..1a46f4c
---- /dev/null
-+++ sc/inc/clipparam.hxx
-@@ -0,0 +1,90 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: document.hxx,v $
-+ * $Revision: 1.115.36.9 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SC_CLIPPARAM_HXX
-+#define SC_CLIPPARAM_HXX
-+
-+#include "rangelst.hxx"
-+#include "rangenam.hxx"
-+
-+#include <vector>
-+
-+/** 
-+ * This struct stores general clipboard parameters associated with a 
-+ * ScDocument instance created in clipboard mode.
-+ */
-+struct ScClipParam
-+{
-+    enum Direction { Unspecified, Column, Row };
-+
-+    ScRangeList maRanges;
-+    Direction   meDirection;
-+    bool        mbCutMode;
-+
-+    ScClipParam();
-+    explicit ScClipParam(const ScClipParam& r);
-+
-+    bool isMultiRange() const;
-+
-+    /** 
-+     * Get the column size of a pasted range.  Note that when the range is
-+     * non-contiguous, we first compress all individual ranges into a single 
-+     * range, and the size of that compressed range is returned.
-+     */
-+    SCCOL getPasteColSize();
-+
-+    /** 
-+     * Same as the above method, but returns the row size of the compressed 
-+     * range. 
-+     */
-+    SCROW getPasteRowSize();
-+
-+    /** 
-+     * Return a single range that encompasses all individual ranges.
-+     */
-+    ScRange getWholeRange() const;
-+
-+    void transpose();
-+};
-+
-+// ============================================================================
-+
-+struct ScClipRangeNameData
-+{
-+    ScRangeData::IndexMap       maRangeMap;
-+    ::std::vector<ScRangeData*> mpRangeNames;
-+    bool                        mbReplace;
-+
-+    ScClipRangeNameData();
-+    ~ScClipRangeNameData();
-+    void insert(sal_uInt16 nOldIndex, sal_uInt16 nNewIndex);
-+};
-+
-+#endif
-diff --git sc/inc/column.hxx sc/inc/column.hxx
-index 64ac9a0..5b17512 100644
---- sc/inc/column.hxx
-+++ sc/inc/column.hxx
-@@ -35,6 +35,7 @@
- #include "global.hxx"
- #include "compressedarray.hxx"
- #include "address.hxx"
-+#include "rangenam.hxx"
- #include <tools/solar.h>
- 
- #include <set>
-@@ -301,6 +302,7 @@ public:
-     BOOL		IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const;
-     void        FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<USHORT>& rIndexes) const;
-     void 		ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScIndexMap& rMap );
-+	void 		ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap );
- 
-     const SfxPoolItem*		GetAttr( SCROW nRow, USHORT nWhich ) const;
-     const ScPatternAttr*	GetPattern( SCROW nRow ) const;
---- sc/inc/document.hxx
-+++ sc/inc/document.hxx
-@@ -138,6 +138,8 @@ class ScAutoNameCache;
- class ScTemporaryChartLock;
- class ScLookupCache;
- struct ScLookupCacheMapImpl;
-+struct ScClipParam;
-+struct ScClipRangeNameData;
- class SfxUndoManager;
- class ScFormulaParserPool;
- 
-@@ -286,6 +288,7 @@ private:
-     ScFieldEditEngine*	pCacheFieldEditEngine;
- 
-     ::std::auto_ptr<ScDocProtection> pDocProtection;
-+    ::std::auto_ptr<ScClipParam>     mpClipParam;
- 
-     ::std::auto_ptr<ScExternalRefManager> pExternalRefMgr;
-     String              aDocName;                       // opt: Dokumentname
-@@ -307,7 +310,6 @@ private:
- 
-     sal_uInt32          nRangeOverflowType;             // used in (xml) loading for overflow warnings
- 
--    ScRange				aClipRange;
-     ScRange				aEmbedRange;
-     ScAddress			aCurTextWidthCalcPos;
-     ScAddress			aOnlineSpellPos;				// within whole document
-@@ -357,7 +359,6 @@ private:
-     BOOL				bForcedFormulaPending;
-     BOOL				bCalculatingFormulaTree;
-     BOOL				bIsClip;
--    BOOL				bCutMode;
-     BOOL				bIsUndo;
-     BOOL				bIsVisible;						// set from view ctor
- 
-@@ -957,6 +958,9 @@ public:
-                                 BOOL bKeepScenarioFlags = FALSE,
-                                 BOOL bIncludeObjects = FALSE,
-                                 BOOL bCloneNoteCaptions = TRUE);
-+    void            CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc, 
-+                               const ScMarkData* pMarks = NULL, bool bKeepScenarioFlags = false,
-+                               bool bIncludeObjects = false, bool bCloneNoteCaptions = true);
-     void			CopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                 SCTAB nTab, ScDocument* pClipDoc = NULL);
-     void 			CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-@@ -984,6 +988,12 @@ public:
-                                     BOOL bSkipAttrForEmpty = FALSE,
-                                     const ScRangeList * pDestRanges = NULL );
- 
-+    void            CopyMultiRangeFromClip(const ScAddress& rDestPos, const ScMarkData& rMark, 
-+                                           sal_uInt16 nInsFlag, ScDocument* pClipDoc, 
-+                                           bool bResetCut = true, bool bAsLink = false,
-+                                           bool bIncludeFiltered = true,
-+                                           bool bSkipAttrForEmpty = false);
-+
-     void			GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered);
-     void			GetClipStart(SCCOL& nClipX, SCROW& nClipY);
- 
-@@ -993,6 +1003,9 @@ public:
- 
-     SC_DLLPUBLIC void			TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsLink );
- 
-+    ScClipParam&    GetClipParam();
-+    void            SetClipParam(const ScClipParam& rParam);
-+
-     void			MixDocument( const ScRange& rRange, USHORT nFunction, BOOL bSkipEmpty,
-                                     ScDocument* pSrcDoc );
- 
-@@ -1692,6 +1705,23 @@ public:
- 
- private: // CLOOK-Impl-Methoden
- 
-+    /** 
-+     * Use this class as a locale variable to merge number formatter from 
-+     * another document, and set NULL pointer to pFormatExchangeList when 
-+     * done.
-+     */
-+    class NumFmtMergeHandler
-+    {
-+    public:
-+        explicit NumFmtMergeHandler(ScDocument* pDoc, ScDocument* pSrcDoc);
-+        ~NumFmtMergeHandler();
-+
-+    private:
-+        ScDocument* mpDoc;
-+    };
-+
-+    void    MergeNumberFormatter(ScDocument* pSrcDoc);
-+
-     void	ImplCreateOptions(); // bei Gelegenheit auf on-demand umstellen?
-     void	ImplDeleteOptions();
- 
-@@ -1713,6 +1743,12 @@ private: // CLOOK-Impl-Methoden
-     void	UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
-                              const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
- 
-+    void    CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClipRange, const ScMarkData* pMarks, bool bAllTabs);
-+    void    CopyRangeNamesFromClip(ScDocument* pClipDoc, ScClipRangeNameData& rRangeNames);
-+    void    UpdateRangeNamesInFormulas(
-+        ScClipRangeNameData& rRangeNames, const ScRangeList& rDestRanges, const ScMarkData& rMark,
-+        SCCOL nXw, SCROW nYw);
-+
-     BOOL	HasPartOfMerged( const ScRange& rRange );
- 
-     std::map< SCTAB, ScSortParam > mSheetSortParams;
-diff --git sc/inc/rangenam.hxx sc/inc/rangenam.hxx
-index 8231cbd..ece1609 100644
---- sc/inc/rangenam.hxx
-+++ sc/inc/rangenam.hxx
-@@ -37,6 +37,8 @@
- #include "formula/grammar.hxx"
- #include "scdllapi.h"
- 
-+#include <map>
-+
- //------------------------------------------------------------------------
- 
- class ScDocument;
-@@ -84,6 +86,8 @@ private:
-     friend class ScRangeName;
-     ScRangeData( USHORT nIndex );
- public:
-+    typedef ::std::map<sal_uInt16, sal_uInt16> IndexMap;
-+
-     SC_DLLPUBLIC				ScRangeData( ScDocument* pDoc,
-                                  const String& rName,
-                                  const String& rSymbol,
-@@ -150,6 +154,7 @@ public:
-     void			ValidateTabRefs();
- 
-     void			ReplaceRangeNamesInUse( const ScIndexMap& rMap );
-+    void            ReplaceRangeNamesInUse( const IndexMap& rMap );
- 
-     static void		MakeValidName( String& rName );
-     SC_DLLPUBLIC static BOOL		IsNameValid( const String& rName, ScDocument* pDoc );
-diff --git sc/inc/table.hxx sc/inc/table.hxx
-index 734ad3c..b32bb64 100644
---- sc/inc/table.hxx
-+++ sc/inc/table.hxx
-@@ -292,6 +292,8 @@ public:
-     void		DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nDelFlag);
-     void		CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTable,
-                             BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions);
-+    void        CopyToClip(const ScRangeList& rRanges, ScTable* pTable, 
-+                           bool bKeepScenarioFlags, bool bCloneNoteCaptions);
-     void		CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy,
-                                 USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScTable* pTable);
-     void		StartListeningInArea( SCCOL nCol1, SCROW nRow1,
-@@ -406,6 +408,8 @@ public:
-                                  std::set<USHORT>& rIndexes) const;
-     void 		ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                       const ScIndexMap& rMap );
-+	void 		ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-+									  const ScRangeData::IndexMap& rMap );
-     void		Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                         ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
-                         double nStepValue, double nMaxValue);
-diff --git sc/source/core/data/cell2.cxx sc/source/core/data/cell2.cxx
-index 7e29ed7..c0c17ce 100644
---- sc/source/core/data/cell2.cxx
-+++ sc/source/core/data/cell2.cxx
-@@ -1318,6 +1318,26 @@ void ScFormulaCell::ReplaceRangeNamesInUse( const ScIndexMap& rMap )
-         CompileTokenArray();
- }
- 
-+void ScFormulaCell::ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap )
-+{
-+    for( FormulaToken* p = pCode->First(); p; p = pCode->Next() )
-+    {
-+        if( p->GetOpCode() == ocName )
-+        {
-+            sal_uInt16 nIndex = p->GetIndex();
-+            ScRangeData::IndexMap::const_iterator itr = rMap.find(nIndex);
-+            sal_uInt16 nNewIndex = itr == rMap.end() ? nIndex : nNewIndex;
-+            if ( nIndex != nNewIndex )
-+            {
-+                p->SetIndex( nNewIndex );
-+                bCompile = TRUE;
-+            }
-+        }
-+    }
-+    if( bCompile )
-+        CompileTokenArray();
-+}
-+
- void ScFormulaCell::CompileDBFormula()
- {
-     for( FormulaToken* p = pCode->First(); p; p = pCode->Next() )
-diff --git sc/source/core/data/clipparam.cxx sc/source/core/data/clipparam.cxx
-new file mode 100644
-index 0000000..564b04d
---- /dev/null
-+++ sc/source/core/data/clipparam.cxx
-@@ -0,0 +1,200 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: document.cxx,v $
-+ * $Revision: 1.90.36.8 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_sc.hxx"
-+
-+// INCLUDE ---------------------------------------------------------------
-+
-+#include "clipparam.hxx"
-+
-+using ::std::vector;
-+
-+ScClipParam::ScClipParam() :
-+    meDirection(Unspecified),
-+    mbCutMode(false)
-+{
-+}
-+
-+ScClipParam::ScClipParam(const ScClipParam& r) :
-+    maRanges(r.maRanges),
-+    meDirection(r.meDirection),
-+    mbCutMode(r.mbCutMode)
-+{
-+}
-+
-+bool ScClipParam::isMultiRange() const
-+{
-+    return maRanges.Count() > 1;
-+}
-+
-+SCCOL ScClipParam::getPasteColSize()
-+{
-+    if (!maRanges.Count())
-+        return 0;
-+
-+    switch (meDirection)
-+    {
-+        case ScClipParam::Column:
-+        {
-+            SCCOL nColSize = 0;
-+            for (ScRangePtr p = maRanges.First(); p; p = maRanges.Next())
-+                nColSize += p->aEnd.Col() - p->aStart.Col() + 1;
-+            return nColSize;
-+        }
-+        break;
-+        case ScClipParam::Row:
-+        {
-+            // We assume that all ranges have identical column size.
-+            const ScRange& rRange = *maRanges.First();
-+            return rRange.aEnd.Col() - rRange.aStart.Col() + 1;
-+        }
-+        break;
-+        case ScClipParam::Unspecified:
-+        default:
-+            ;
-+    }
-+    return 0;
-+}
-+
-+SCROW ScClipParam::getPasteRowSize()
-+{
-+    if (!maRanges.Count())
-+        return 0;
-+
-+    switch (meDirection)
-+    {
-+        case ScClipParam::Column:
-+        {
-+            // We assume that all ranges have identical row size.
-+            const ScRange& rRange = *maRanges.First();
-+            return rRange.aEnd.Row() - rRange.aStart.Row() + 1;
-+        }
-+        break;
-+        case ScClipParam::Row:
-+        {
-+            SCROW nRowSize = 0;
-+            for (ScRangePtr p = maRanges.First(); p; p = maRanges.Next())
-+                nRowSize += p->aEnd.Row() - p->aStart.Row() + 1;
-+            return nRowSize;
-+        }
-+        break;
-+        case ScClipParam::Unspecified:
-+        default:
-+            ;
-+    }
-+    return 0;
-+}
-+
-+ScRange ScClipParam::getWholeRange() const
-+{
-+    ScRange aWhole;
-+    bool bFirst = true;
-+    ScRangeList aRanges = maRanges;
-+    for (ScRange* p = aRanges.First(); p; p = aRanges.Next())
-+    {
-+        if (bFirst)
-+        {    
-+            aWhole = *p;
-+            bFirst = false;
-+            continue;
-+        }
-+
-+        if (aWhole.aStart.Col() > p->aStart.Col())
-+            aWhole.aStart.SetCol(p->aStart.Col());
-+
-+        if (aWhole.aStart.Row() > p->aStart.Row())
-+            aWhole.aStart.SetRow(p->aStart.Row());
-+
-+        if (aWhole.aEnd.Col() < p->aEnd.Col())
-+            aWhole.aEnd.SetCol(p->aEnd.Col());
-+
-+        if (aWhole.aEnd.Row() < p->aEnd.Row())
-+            aWhole.aEnd.SetRow(p->aEnd.Row());
-+    }
-+    return aWhole;
-+}
-+
-+void ScClipParam::transpose()
-+{
-+    switch (meDirection)
-+    {
-+        case Column: 
-+            meDirection = ScClipParam::Row;
-+        break;
-+        case Row:
-+            meDirection = ScClipParam::Column;
-+        break;
-+        case Unspecified:
-+        default:
-+            ;
-+    }
-+
-+    ScRangeList aNewRanges;
-+    if (maRanges.Count())
-+    {
-+        ScRange* p = maRanges.First();
-+        SCCOL nColOrigin = p->aStart.Col();
-+        SCROW nRowOrigin = p->aStart.Row();
-+        for (; p; p = maRanges.Next())
-+        {
-+            SCCOL nColDelta = p->aStart.Col() - nColOrigin;
-+            SCROW nRowDelta = p->aStart.Row() - nRowOrigin;
-+            SCCOL nCol1 = 0;
-+            SCCOL nCol2 = static_cast<SCCOL>(p->aEnd.Row() - p->aStart.Row());
-+            SCROW nRow1 = 0;
-+            SCROW nRow2 = static_cast<SCROW>(p->aEnd.Col() - p->aStart.Col());
-+            nCol1 += static_cast<SCCOL>(nRowDelta);
-+            nCol2 += static_cast<SCCOL>(nRowDelta);
-+            nRow1 += static_cast<SCROW>(nColDelta);
-+            nRow2 += static_cast<SCROW>(nColDelta);
-+            ScRange aNew(nCol1, nRow1, p->aStart.Tab(), nCol2, nRow2, p->aStart.Tab());
-+            aNewRanges.Append(aNew);
-+        }
-+    }
-+    maRanges = aNewRanges;
-+}
-+
-+// ============================================================================
-+
-+ScClipRangeNameData::ScClipRangeNameData() :
-+    mbReplace(false)
-+{
-+}
-+
-+ScClipRangeNameData::~ScClipRangeNameData()
-+{
-+}
-+
-+void ScClipRangeNameData::insert(sal_uInt16 nOldIndex, sal_uInt16 nNewIndex)
-+{
-+    maRangeMap.insert(
-+        ScRangeData::IndexMap::value_type(nOldIndex, nNewIndex));
-+}
-diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx
-index 721a66f..555c3e8 100644
---- sc/source/core/data/column.cxx
-+++ sc/source/core/data/column.cxx
-@@ -1884,6 +1884,23 @@ void ScColumn::ReplaceRangeNamesInUse(SCROW nRow1, SCROW nRow2,
-         }
- }
- 
-+void ScColumn::ReplaceRangeNamesInUse(SCROW nRow1, SCROW nRow2,
-+                                     const ScRangeData::IndexMap& rMap )
-+{
-+    if (pItems)
-+        for (SCSIZE i = 0; i < nCount; i++)
-+        {
-+            if ((pItems[i].nRow >= nRow1) &&
-+                (pItems[i].nRow <= nRow2) &&
-+                (pItems[i].pCell->GetCellType() == CELLTYPE_FORMULA))
-+            {
-+                SCROW nRow = pItems[i].nRow;
-+                ((ScFormulaCell*)pItems[i].pCell)->ReplaceRangeNamesInUse( rMap );
-+                if ( nRow != pItems[i].nRow )
-+                    Search( nRow, i );      // Listener geloescht/eingefuegt?
-+            }
-+        }
-+}
- 
- void ScColumn::SetDirtyVar()
- {
---- sc/source/core/data/documen2.cxx
-+++ sc/source/core/data/documen2.cxx
-@@ -95,6 +95,7 @@
- #include "lookupcache.hxx"
- #include "externalrefmgr.hxx"
- #include "tabprotection.hxx"
-+#include "clipparam.hxx"
- #include "formulaparserpool.hxx"
- 
- // pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
-@@ -153,6 +154,7 @@ ScDocument::ScDocument( ScDocumentMode	eMode,
- 		pScriptTypeData( NULL ),
-         pCacheFieldEditEngine( NULL ),
-         pDocProtection( NULL ),
-+        mpClipParam( NULL ),
- 		pViewOptions( NULL ),
- 		pDocOptions( NULL ),
- 		pExtDocOptions( NULL ),
-@@ -181,7 +183,6 @@ ScDocument::ScDocument( ScDocumentMode	eMode,
-         bForcedFormulaPending( FALSE ),
-         bCalculatingFormulaTree( FALSE ),
-         bIsClip( eMode == SCDOCMODE_CLIP ),
--        bCutMode( FALSE ),
-         bIsUndo( eMode == SCDOCMODE_UNDO ),
-         bIsVisible( FALSE ),
-         bIsEmbedded( FALSE ),
-@@ -978,23 +979,18 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
-             bOldAutoCalcSrc = pSrcDoc->GetAutoCalc();
-             pSrcDoc->SetAutoCalc( TRUE );	// falls was berechnet werden muss
-         }
--        SvNumberFormatter* pThisFormatter = xPoolHelper->GetFormTable();
--        SvNumberFormatter* pOtherFormatter = pSrcDoc->xPoolHelper->GetFormTable();
--        if (pOtherFormatter && pOtherFormatter != pThisFormatter)
-+
-         {
--            SvNumberFormatterIndexTable* pExchangeList =
--                     pThisFormatter->MergeFormatter(*(pOtherFormatter));
--            if (pExchangeList->Count() > 0)
--                pFormatExchangeList = pExchangeList;
--        }
--        nDestPos = Min(nDestPos, (SCTAB)(GetTableCount() - 1));
--        {   // scope for bulk broadcast
--            ScBulkBroadcast aBulkBroadcast( pBASM);
--            pSrcDoc->pTab[nSrcPos]->CopyToTable(0, 0, MAXCOL, MAXROW,
--                    ( bResultsOnly ? IDF_ALL & ~IDF_FORMULA : IDF_ALL),
--                    FALSE, pTab[nDestPos] );
-+            NumFmtMergeHandler aNumFmtMergeHdl(this, pSrcDoc);
-+
-+            nDestPos = Min(nDestPos, (SCTAB)(GetTableCount() - 1));
-+            {   // scope for bulk broadcast
-+                ScBulkBroadcast aBulkBroadcast( pBASM);
-+                pSrcDoc->pTab[nSrcPos]->CopyToTable(0, 0, MAXCOL, MAXROW,
-+                        ( bResultsOnly ? IDF_ALL & ~IDF_FORMULA : IDF_ALL),
-+                        FALSE, pTab[nDestPos] );
-+            }
-         }
--        pFormatExchangeList = NULL;
-         pTab[nDestPos]->SetTabNo(nDestPos);
- 
-         if ( !bResultsOnly )
---- sc/source/core/data/documen3.cxx
-+++ sc/source/core/data/documen3.cxx
-@@ -79,6 +79,7 @@
- #include "listenercalls.hxx"
- #include "svtools/PasswordHelper.hxx"
- #include "tabprotection.hxx"
-+#include "clipparam.hxx"
- #include "formulaparserpool.hxx"
- 
- #include <memory>
-@@ -890,7 +891,7 @@ void ScDocument::UpdateReference( UpdateRefMode eUpdateRefMode,
-         {
-             ScDocument* pClipDoc = SC_MOD()->GetClipDoc();
-             if (pClipDoc)
--                pClipDoc->bCutMode = FALSE;
-+				pClipDoc->GetClipParam().mbCutMode = false;
-         }
-     }
- }
-@@ -900,7 +901,10 @@ void ScDocument::UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDo
- {
-     DBG_ASSERT(pClipDoc->bIsClip, "UpdateTranspose: kein Clip");
- 
--    ScRange aSource = pClipDoc->aClipRange;			// Tab wird noch angepasst
-+    ScRange aSource;
-+    ScClipParam& rClipParam = GetClipParam();
-+    if (rClipParam.maRanges.Count())
-+        aSource = *rClipParam.maRanges.First();
-     ScAddress aDest = rDestPos;
- 
-     SCTAB nClipTab = 0;
-diff --git sc/source/core/data/documen8.cxx sc/source/core/data/documen8.cxx
-index 2e617d7..8cd34a1 100644
---- sc/source/core/data/documen8.cxx
-+++ sc/source/core/data/documen8.cxx
-@@ -318,20 +318,8 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet,
- void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc )
- {
-     // #b5017505# number format exchange list has to be handled here, too
--
--    SvNumberFormatter* pThisFormatter = xPoolHelper->GetFormTable();
--    SvNumberFormatter* pOtherFormatter = pSrcDoc->xPoolHelper->GetFormTable();
--    if (pOtherFormatter && pOtherFormatter != pThisFormatter)
--    {
--        SvNumberFormatterIndexTable* pExchangeList =
--                pThisFormatter->MergeFormatter(*(pOtherFormatter));
--        if (pExchangeList->Count() > 0)
--            pFormatExchangeList = pExchangeList;
--    }
--
-+    NumFmtMergeHandler aNumFmtMergeHdl(this, pSrcDoc);
-     xPoolHelper->GetStylePool()->CopyStdStylesFrom( pSrcDoc->xPoolHelper->GetStylePool() );
--
--    pFormatExchangeList = NULL;
- }
- 
- //------------------------------------------------------------------------
-diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index 4366571..e477781 100644
---- sc/source/core/data/document.cxx
-+++ sc/source/core/data/document.cxx
-@@ -94,6 +94,9 @@
- #include "postit.hxx"
- #include "externalrefmgr.hxx"
- #include "tabprotection.hxx"
-+#include "clipparam.hxx"
-+
-+#include <map>
- 
- namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
- 
-@@ -1214,7 +1217,7 @@ void ScDocument::AddUndoTab( SCTAB nTab1, SCTAB nTab2, BOOL bColInfo, BOOL bRowI
- void ScDocument::SetCutMode( BOOL bVal )
- {
-     if (bIsClip)
--        bCutMode = bVal;
-+        GetClipParam().mbCutMode = bVal;
-     else
-     {
-         DBG_ERROR("SetCutMode without bIsClip");
-@@ -1225,7 +1228,7 @@ void ScDocument::SetCutMode( BOOL bVal )
- BOOL ScDocument::IsCutMode()
- {
-     if (bIsClip)
--        return bCutMode;
-+		return GetClipParam().mbCutMode;
-     else
-     {
-         DBG_ERROR("IsCutMode ohne bIsClip");
-@@ -1356,33 +1359,16 @@ void ScDocument::CopyToClip(SCCOL nCol1, SCROW nRow1,
-             pClipDoc = SC_MOD()->GetClipDoc();
-         }
- 
-+        ScRange aClipRange(nCol1, nRow1, 0, nCol2, nRow2, 0);
-+        ScClipParam& rClipParam = pClipDoc->GetClipParam();
-+        rClipParam.maRanges.RemoveAll();
-+        rClipParam.maRanges.Append(aClipRange);
-         pClipDoc->aDocName = aDocName;
--        pClipDoc->aClipRange = ScRange( nCol1,nRow1,0, nCol2,nRow2,0 );
-         pClipDoc->ResetClip( this, pMarks );
--        USHORT i;
--        SCTAB j;
- 
--        std::set<USHORT> aUsedNames;        // indexes of named ranges that are used in the copied cells
--        for (j = 0; j <= MAXTAB; j++)
--            if (pTab[j] && pClipDoc->pTab[j])
--                if ( bAllTabs || !pMarks || pMarks->GetTableSelect(j) )
--                    pTab[j]->FindRangeNamesInUse( nCol1, nRow1, nCol2, nRow2, aUsedNames );
-+        CopyRangeNamesToClip(pClipDoc, aClipRange, pMarks, bAllTabs);
- 
--        pClipDoc->pRangeName->FreeAll();
--        for (i = 0; i < pRangeName->GetCount(); i++)		//! DB-Bereiche Pivot-Bereiche auch !!!
--        {
--            USHORT nIndex = ((ScRangeData*)((*pRangeName)[i]))->GetIndex();
--            bool bInUse = ( aUsedNames.find(nIndex) != aUsedNames.end() );
--            if (bInUse)
--            {
--                ScRangeData* pData = new ScRangeData(*((*pRangeName)[i]));
--                if (!pClipDoc->pRangeName->Insert(pData))
--                    delete pData;
--                else
--                    pData->SetIndex(nIndex);
--            }
--        }
--        for (j = 0; j <= MAXTAB; j++)
-+		for (SCTAB j = 0; j <= MAXTAB; j++)
-             if (pTab[j] && pClipDoc->pTab[j])
-                 if ( bAllTabs || !pMarks || pMarks->GetTableSelect(j) )
-                 {
-@@ -1397,10 +1383,53 @@ void ScDocument::CopyToClip(SCCOL nCol1, SCROW nRow1,
-                     }
-                 }
- 
--        pClipDoc->bCutMode = bCut;
-+		pClipDoc->GetClipParam().mbCutMode = bCut;
-     }
- }
- 
-+void ScDocument::CopyToClip(const ScClipParam& rClipParam, 
-+                            ScDocument* pClipDoc, const ScMarkData* pMarks,
-+                            bool bKeepScenarioFlags, bool bIncludeObjects, bool bCloneNoteCaptions)
-+{
-+    if (bIsClip)
-+        return;
-+
-+    if (!pClipDoc)
-+    {
-+        DBG_ERROR("CopyToClip: no ClipDoc");
-+        pClipDoc = SC_MOD()->GetClipDoc();
-+    }
-+
-+    pClipDoc->aDocName = aDocName;
-+    pClipDoc->SetClipParam(rClipParam);
-+    pClipDoc->ResetClip(this, pMarks);
-+
-+    ScRange aClipRange = rClipParam.getWholeRange();
-+    CopyRangeNamesToClip(pClipDoc, aClipRange, pMarks, false);
-+
-+    for (SCTAB i = 0; i <= MAXTAB; ++i)
-+    {
-+        if (!pTab[i] || !pClipDoc->pTab[i])
-+            continue;
-+
-+        if (pMarks && !pMarks->GetTableSelect(i))
-+            continue;
-+
-+        pTab[i]->CopyToClip(rClipParam.maRanges, pClipDoc->pTab[i], bKeepScenarioFlags, bCloneNoteCaptions);
-+
-+        if (pDrawLayer && bIncludeObjects)
-+        {
-+            //	also copy drawing objects
-+            const ScRange aRange = rClipParam.getWholeRange();
-+            Rectangle aObjRect = GetMMRect(
-+                aRange.aStart.Col(), aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row(), i);
-+            pDrawLayer->CopyToClip(pClipDoc, i, aObjRect);
-+        }
-+    }
-+
-+    // Make sure to mark overlapped cells.
-+    pClipDoc->ExtendMerge(aClipRange, true);
-+}
- 
- void ScDocument::CopyTabToClip(SCCOL nCol1, SCROW nRow1,
-                                 SCCOL nCol2, SCROW nRow2,
-@@ -1416,14 +1445,16 @@ void ScDocument::CopyTabToClip(SCCOL nCol1, SCROW nRow1,
-             pClipDoc = SC_MOD()->GetClipDoc();
-         }
- 
-+        ScClipParam& rClipParam = pClipDoc->GetClipParam();
-         pClipDoc->aDocName = aDocName;
--        pClipDoc->aClipRange = ScRange( nCol1,nRow1,0, nCol2,nRow2,0 );
-+        rClipParam.maRanges.RemoveAll();
-+        rClipParam.maRanges.Append(ScRange(nCol1, nRow1, 0, nCol2, nRow2, 0));
-         pClipDoc->ResetClip( this, nTab );
- 
-         if (pTab[nTab] && pClipDoc->pTab[nTab])
-             pTab[nTab]->CopyToClip(nCol1, nRow1, nCol2, nRow2, pClipDoc->pTab[nTab], FALSE, TRUE);
- 
--        pClipDoc->bCutMode = FALSE;
-+        pClipDoc->GetClipParam().mbCutMode = false;
-     }
- }
- 
-@@ -1453,6 +1484,7 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL
- 
-         //	Daten
- 
-+    ScRange aClipRange = GetClipParam().getWholeRange();
-     if ( ValidRow(aClipRange.aEnd.Row()-aClipRange.aStart.Row()) )
-     {
-         for (SCTAB i=0; i<=MAXTAB; i++)
-@@ -1481,10 +1513,8 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL
-                 }
-             }
- 
--        pTransClip->aClipRange = ScRange( 0, 0, aClipRange.aStart.Tab(),
--                static_cast<SCCOL>(aClipRange.aEnd.Row() - aClipRange.aStart.Row()),
--                static_cast<SCROW>(aClipRange.aEnd.Col() - aClipRange.aStart.Col()),
--                                    aClipRange.aEnd.Tab() );
-+        pTransClip->SetClipParam(GetClipParam());
-+        pTransClip->GetClipParam().transpose();
-     }
-     else
-     {
-@@ -1493,9 +1523,184 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL
- 
-         //	Dies passiert erst beim Einfuegen...
- 
--    bCutMode = FALSE;
-+    GetClipParam().mbCutMode = false;
-+}
-+
-+void ScDocument::CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClipRange, const ScMarkData* pMarks, bool bAllTabs)
-+{
-+    std::set<USHORT> aUsedNames;        // indexes of named ranges that are used in the copied cells
-+    for (SCTAB i = 0; i <= MAXTAB; ++i)
-+        if (pTab[i] && pClipDoc->pTab[i])
-+            if ( bAllTabs || !pMarks || pMarks->GetTableSelect(i) )
-+                pTab[i]->FindRangeNamesInUse(
-+                    rClipRange.aStart.Col(), rClipRange.aStart.Row(), 
-+                    rClipRange.aEnd.Col(), rClipRange.aEnd.Row(), aUsedNames);
-+
-+    pClipDoc->pRangeName->FreeAll();
-+    for (USHORT i = 0; i < pRangeName->GetCount(); i++)        //! DB-Bereiche Pivot-Bereiche auch !!!
-+    {
-+        USHORT nIndex = ((ScRangeData*)((*pRangeName)[i]))->GetIndex();
-+        bool bInUse = ( aUsedNames.find(nIndex) != aUsedNames.end() );
-+        if (bInUse)
-+        {
-+            ScRangeData* pData = new ScRangeData(*((*pRangeName)[i]));
-+            if (!pClipDoc->pRangeName->Insert(pData))
-+                delete pData;
-+            else
-+                pData->SetIndex(nIndex);
-+        }
-+    }
-+}
-+
-+ScDocument::NumFmtMergeHandler::NumFmtMergeHandler(ScDocument* pDoc, ScDocument* pSrcDoc) :
-+        mpDoc(pDoc)
-+{
-+    mpDoc->MergeNumberFormatter(pSrcDoc);
-+}
-+
-+ScDocument::NumFmtMergeHandler::~NumFmtMergeHandler()
-+{
-+    mpDoc->pFormatExchangeList = NULL;
-+}
-+
-+void ScDocument::MergeNumberFormatter(ScDocument* pSrcDoc)
-+{
-+    SvNumberFormatter* pThisFormatter = xPoolHelper->GetFormTable();
-+    SvNumberFormatter* pOtherFormatter = pSrcDoc->xPoolHelper->GetFormTable();
-+    if (pOtherFormatter && pOtherFormatter != pThisFormatter)
-+    {
-+        SvNumberFormatterIndexTable* pExchangeList =
-+                 pThisFormatter->MergeFormatter(*(pOtherFormatter));
-+        if (pExchangeList->Count() > 0)
-+            pFormatExchangeList = pExchangeList;
-+    }
-+}
-+
-+void ScDocument::CopyRangeNamesFromClip(ScDocument* pClipDoc, ScClipRangeNameData& rRangeNames)
-+{
-+    sal_uInt16 nClipRangeNameCount = pClipDoc->pRangeName->GetCount();
-+    ScClipRangeNameData aClipRangeNames;
-+
-+    // array containing range names which might need update of indices
-+    aClipRangeNames.mpRangeNames.resize(nClipRangeNameCount, NULL);
-+
-+    for (sal_uInt16 i = 0; i < nClipRangeNameCount; ++i)        //! DB-Bereiche Pivot-Bereiche auch
-+    {
-+        /*  Copy only if the name doesn't exist in this document.
-+            If it exists we use the already existing name instead,
-+            another possibility could be to create new names if
-+            documents differ.
-+            A proper solution would ask the user how to proceed.
-+            The adjustment of the indices in the formulas is done later.
-+        */
-+        ScRangeData* pClipRangeData = (*pClipDoc->pRangeName)[i];
-+        USHORT k;
-+        if ( pRangeName->SearchName( pClipRangeData->GetName(), k ) )
-+        {
-+            aClipRangeNames.mpRangeNames[i] = NULL;  // range name not inserted
-+            USHORT nOldIndex = pClipRangeData->GetIndex();
-+            USHORT nNewIndex = ((*pRangeName)[k])->GetIndex();
-+            aClipRangeNames.insert(nOldIndex, nNewIndex);
-+            if ( !aClipRangeNames.mbReplace )
-+                aClipRangeNames.mbReplace = ( nOldIndex != nNewIndex );
-+        }
-+        else
-+        {
-+            ScRangeData* pData = new ScRangeData( *pClipRangeData );
-+            pData->SetDocument(this);
-+            if ( pRangeName->FindIndex( pData->GetIndex() ) )
-+                pData->SetIndex(0);     // need new index, done in Insert
-+            if ( pRangeName->Insert( pData ) )
-+            {
-+                aClipRangeNames.mpRangeNames[i] = pData;
-+                USHORT nOldIndex = pClipRangeData->GetIndex();
-+                USHORT nNewIndex = pData->GetIndex();
-+                aClipRangeNames.insert(nOldIndex, nNewIndex);
-+                if ( !aClipRangeNames.mbReplace )
-+                    aClipRangeNames.mbReplace = ( nOldIndex != nNewIndex );
-+            }
-+            else
-+            {   // must be an overflow
-+                delete pData;
-+                aClipRangeNames.mpRangeNames[i] = NULL;
-+                aClipRangeNames.insert(pClipRangeData->GetIndex(), 0);
-+                aClipRangeNames.mbReplace = true;
-+            }
-+        }
-+    }
-+    rRangeNames = aClipRangeNames;
-+}
-+
-+void ScDocument::UpdateRangeNamesInFormulas(
-+    ScClipRangeNameData& rRangeNames, const ScRangeList& rDestRanges, const ScMarkData& rMark,
-+    SCCOL nXw, SCROW nYw)
-+{
-+    // nXw and nYw are the extra width and height of the destination range
-+    // extended due to presence of merged cell(s).
-+
-+    if (!rRangeNames.mbReplace)
-+        return;
-+
-+    // first update all inserted named formulas if they contain other
-+    // range names and used indices changed
-+    sal_uInt16 nRangeNameCount = rRangeNames.mpRangeNames.size();
-+    for (sal_uInt16 i = 0; i < nRangeNameCount; ++i)        //! DB-Bereiche Pivot-Bereiche auch
-+    {
-+        if ( rRangeNames.mpRangeNames[i] )
-+            rRangeNames.mpRangeNames[i]->ReplaceRangeNamesInUse(rRangeNames.maRangeMap);
-+    }
-+    // then update the formulas, they might need just the updated range names
-+    for (ULONG nRange = 0; nRange < rDestRanges.Count(); ++nRange)
-+    {
-+        const ScRange* pRange = rDestRanges.GetObject( nRange);
-+        SCCOL nCol1 = pRange->aStart.Col();
-+        SCROW nRow1 = pRange->aStart.Row();
-+        SCCOL nCol2 = pRange->aEnd.Col();
-+        SCROW nRow2 = pRange->aEnd.Row();
-+
-+        SCCOL nC1 = nCol1;
-+        SCROW nR1 = nRow1;
-+        SCCOL nC2 = nC1 + nXw;
-+        if (nC2 > nCol2)
-+            nC2 = nCol2;
-+        SCROW nR2 = nR1 + nYw;
-+        if (nR2 > nRow2)
-+            nR2 = nRow2;
-+        do
-+        {
-+            do
-+            {
-+                for (SCTAB k = 0; k <= MAXTAB; k++)
-+                {
-+                    if ( pTab[k] && rMark.GetTableSelect(k) )
-+                        pTab[k]->ReplaceRangeNamesInUse(nC1, nR1,
-+                            nC2, nR2, rRangeNames.maRangeMap);
-+                }
-+                nC1 = nC2 + 1;
-+                nC2 = Min((SCCOL)(nC1 + nXw), nCol2);
-+            } while (nC1 <= nCol2);
-+            nC1 = nCol1;
-+            nC2 = nC1 + nXw;
-+            if (nC2 > nCol2)
-+                nC2 = nCol2;
-+            nR1 = nR2 + 1;
-+            nR2 = Min((SCROW)(nR1 + nYw), nRow2);
-+        } while (nR1 <= nRow2);
-+    }
-+}
-+
-+ScClipParam& ScDocument::GetClipParam()
-+{
-+    if (!mpClipParam.get())
-+        mpClipParam.reset(new ScClipParam);
-+
-+    return *mpClipParam;
- }
- 
-+void ScDocument::SetClipParam(const ScClipParam& rParam)
-+{
-+    mpClipParam.reset(new ScClipParam(rParam));
-+}
- 
- BOOL ScDocument::IsClipboardSource() const
- {
-@@ -1595,7 +1800,7 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW nRow1,
-                         && ppClipTab[nClipTab + nFollow + 1] )
-                     ++nFollow;
- 
--                if ( pCBFCP->pClipDoc->bCutMode )
-+                if ( pCBFCP->pClipDoc->GetClipParam().mbCutMode )
-                 {
-                     BOOL bOldInserting = IsInsertingFromOtherDoc();
-                     SetInsertingFromOtherDoc( TRUE);
-@@ -1637,7 +1842,9 @@ void ScDocument::CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1,
-         pCBFCP->pClipDoc->GetRowFlagsArray( nFlagTab);
- 
-     SCROW nSourceRow = rClipStartRow;
--    SCROW nSourceEnd = pCBFCP->pClipDoc->aClipRange.aEnd.Row();
-+	SCROW nSourceEnd = 0;
-+    if (pCBFCP->pClipDoc->GetClipParam().maRanges.Count())
-+        nSourceEnd = pCBFCP->pClipDoc->GetClipParam().maRanges.First()->aEnd.Row();
-     SCROW nDestRow = nRow1;
- 
-     while ( nSourceRow <= nSourceEnd && nDestRow <= nRow2 )
-@@ -1683,67 +1890,11 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
-             BOOL bOldAutoCalc = GetAutoCalc();
-             SetAutoCalc( FALSE );	// avoid multiple recalculations
- 
--            SvNumberFormatter* pThisFormatter = xPoolHelper->GetFormTable();
--            SvNumberFormatter* pOtherFormatter = pClipDoc->xPoolHelper->GetFormTable();
--            if (pOtherFormatter && pOtherFormatter != pThisFormatter)
--            {
--                SvNumberFormatterIndexTable* pExchangeList =
--                         pThisFormatter->MergeFormatter(*(pOtherFormatter));
--                if (pExchangeList->Count() > 0)
--                    pFormatExchangeList = pExchangeList;
--            }
-+            NumFmtMergeHandler aNumFmtMergeHdl(this, pClipDoc);
- 
--            USHORT nClipRangeNames = pClipDoc->pRangeName->GetCount();
--            // array containing range names which might need update of indices
--            ScRangeData** pClipRangeNames = nClipRangeNames ? new ScRangeData* [nClipRangeNames] : NULL;
--            // the index mapping thereof
--            ScIndexMap aClipRangeMap( nClipRangeNames );
--            BOOL bRangeNameReplace = FALSE;
-+            ScClipRangeNameData aClipRangeNames;
-+            CopyRangeNamesFromClip(pClipDoc, aClipRangeNames);
- 
--            for (USHORT i = 0; i < nClipRangeNames; i++)		//! DB-Bereiche Pivot-Bereiche auch
--            {
--                /*	Copy only if the name doesn't exist in this document.
--                    If it exists we use the already existing name instead,
--                    another possibility could be to create new names if
--                    documents differ.
--                    A proper solution would ask the user how to proceed.
--                    The adjustment of the indices in the formulas is done later.
--                */
--                ScRangeData* pClipRangeData = (*pClipDoc->pRangeName)[i];
--                USHORT k;
--                if ( pRangeName->SearchName( pClipRangeData->GetName(), k ) )
--                {
--                    pClipRangeNames[i] = NULL;	// range name not inserted
--                    USHORT nOldIndex = pClipRangeData->GetIndex();
--                    USHORT nNewIndex = ((*pRangeName)[k])->GetIndex();
--                    aClipRangeMap.SetPair( i, nOldIndex, nNewIndex );
--                    if ( !bRangeNameReplace )
--                        bRangeNameReplace = ( nOldIndex != nNewIndex );
--                }
--                else
--                {
--                    ScRangeData* pData = new ScRangeData( *pClipRangeData );
--                    pData->SetDocument(this);
--                    if ( pRangeName->FindIndex( pData->GetIndex() ) )
--                        pData->SetIndex(0);		// need new index, done in Insert
--                    if ( pRangeName->Insert( pData ) )
--                    {
--                        pClipRangeNames[i] = pData;
--                        USHORT nOldIndex = pClipRangeData->GetIndex();
--                        USHORT nNewIndex = pData->GetIndex();
--                        aClipRangeMap.SetPair( i, nOldIndex, nNewIndex );
--                        if ( !bRangeNameReplace )
--                            bRangeNameReplace = ( nOldIndex != nNewIndex );
--                    }
--                    else
--                    {	// must be an overflow
--                        delete pData;
--                        pClipRangeNames[i] = NULL;
--                        aClipRangeMap.SetPair( i, pClipRangeData->GetIndex(), 0 );
--                        bRangeNameReplace = TRUE;
--                    }
--                }
--            }
-             SCCOL nAllCol1 = rDestRange.aStart.Col();
-             SCROW nAllRow1 = rDestRange.aStart.Row();
-             SCCOL nAllCol2 = rDestRange.aEnd.Col();
-@@ -1751,17 +1902,18 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
- 
-             SCCOL nXw = 0;
-             SCROW nYw = 0;
-+            ScRange aClipRange = pClipDoc->GetClipParam().getWholeRange();
-             for (SCTAB nTab = 0; nTab <= MAXTAB; nTab++)    // find largest merge overlap
-                 if (pClipDoc->pTab[nTab])                   // all sheets of the clipboard content
-                 {
--                    SCCOL nThisEndX = pClipDoc->aClipRange.aEnd.Col();
--                    SCROW nThisEndY = pClipDoc->aClipRange.aEnd.Row();
--                    pClipDoc->ExtendMerge( pClipDoc->aClipRange.aStart.Col(),
--                                            pClipDoc->aClipRange.aStart.Row(),
-+                    SCCOL nThisEndX = aClipRange.aEnd.Col();
-+                    SCROW nThisEndY = aClipRange.aEnd.Row();
-+                    pClipDoc->ExtendMerge( aClipRange.aStart.Col(),
-+                                            aClipRange.aStart.Row(),
-                                             nThisEndX, nThisEndY, nTab );
-                     // only extra value from ExtendMerge
--                    nThisEndX = sal::static_int_cast<SCCOL>( nThisEndX - pClipDoc->aClipRange.aEnd.Col() );
--                    nThisEndY = sal::static_int_cast<SCROW>( nThisEndY - pClipDoc->aClipRange.aEnd.Row() );
-+                    nThisEndX = sal::static_int_cast<SCCOL>( nThisEndX - aClipRange.aEnd.Col() );
-+                    nThisEndY = sal::static_int_cast<SCROW>( nThisEndY - aClipRange.aEnd.Row() );
-                     if ( nThisEndX > nXw )
-                         nXw = nThisEndX;
-                     if ( nThisEndY > nYw )
-@@ -1820,10 +1972,10 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
-             if (bDoDouble)
-                 ScColumn::bDoubleAlloc = TRUE;
- 
--            SCCOL nClipStartCol = pClipDoc->aClipRange.aStart.Col();
--            SCROW nClipStartRow = pClipDoc->aClipRange.aStart.Row();
-+            SCCOL nClipStartCol = aClipRange.aStart.Col();
-+            SCROW nClipStartRow = aClipRange.aStart.Row();
-             // WaE: commented because unused:   SCCOL nClipEndCol = pClipDoc->aClipRange.aEnd.Col();
--            SCROW nClipEndRow = pClipDoc->aClipRange.aEnd.Row();
-+            SCROW nClipEndRow = aClipRange.aEnd.Row();
-             for (ULONG nRange = 0; nRange < pDestRanges->Count(); ++nRange)
-             {
-                 const ScRange* pRange = pDestRanges->GetObject( nRange);
-@@ -1874,7 +2026,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
-                         nC2 = Min((SCCOL)(nC1 + nXw), nCol2);
-                     } while (nC1 <= nCol2);
-                     if (nClipStartRow > nClipEndRow)
--                        nClipStartRow = pClipDoc->aClipRange.aStart.Row();
-+                        nClipStartRow = aClipRange.aStart.Row();
-                     nC1 = nCol1;
-                     nC2 = nC1 + nXw;
-                     if (nC2 > nCol2)
-@@ -1891,75 +2043,120 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
-                     pTab[k]->DecRecalcLevel();
- 
-             bInsertingFromOtherDoc = FALSE;
--            pFormatExchangeList = NULL;
--            if ( bRangeNameReplace )
--            {
--                // first update all inserted named formulas if they contain other
--                // range names and used indices changed
--                for (USHORT i = 0; i < nClipRangeNames; i++)		//! DB-Bereiche Pivot-Bereiche auch
--                {
--                    if ( pClipRangeNames[i] )
--                        pClipRangeNames[i]->ReplaceRangeNamesInUse( aClipRangeMap );
--                }
--                // then update the formulas, they might need the just updated range names
--                for (ULONG nRange = 0; nRange < pDestRanges->Count(); ++nRange)
--                {
--                    const ScRange* pRange = pDestRanges->GetObject( nRange);
--                    SCCOL nCol1 = pRange->aStart.Col();
--                    SCROW nRow1 = pRange->aStart.Row();
--                    SCCOL nCol2 = pRange->aEnd.Col();
--                    SCROW nRow2 = pRange->aEnd.Row();
--
--                    SCCOL nC1 = nCol1;
--                    SCROW nR1 = nRow1;
--                    SCCOL nC2 = nC1 + nXw;
--                    if (nC2 > nCol2)
--                        nC2 = nCol2;
--                    SCROW nR2 = nR1 + nYw;
--                    if (nR2 > nRow2)
--                        nR2 = nRow2;
--                    do
--                    {
--                        do
--                        {
--                            for (SCTAB k = 0; k <= MAXTAB; k++)
--                            {
--                                if ( pTab[k] && rMark.GetTableSelect(k) )
--                                    pTab[k]->ReplaceRangeNamesInUse(nC1, nR1,
--                                        nC2, nR2, aClipRangeMap );
--                            }
--                            nC1 = nC2 + 1;
--                            nC2 = Min((SCCOL)(nC1 + nXw), nCol2);
--                        } while (nC1 <= nCol2);
--                        nC1 = nCol1;
--                        nC2 = nC1 + nXw;
--                        if (nC2 > nCol2)
--                            nC2 = nCol2;
--                        nR1 = nR2 + 1;
--                        nR2 = Min((SCROW)(nR1 + nYw), nRow2);
--                    } while (nR1 <= nRow2);
--                }
--            }
--            if ( pClipRangeNames )
--                delete [] pClipRangeNames;
-+
-+            UpdateRangeNamesInFormulas(aClipRangeNames, *pDestRanges, rMark, nXw, nYw);
-+
-             // Listener aufbauen nachdem alles inserted wurde
-             StartListeningFromClip( nAllCol1, nAllRow1, nAllCol2, nAllRow2, rMark, nInsFlag );
-             // nachdem alle Listener aufgebaut wurden, kann gebroadcastet werden
-             BroadcastFromClip( nAllCol1, nAllRow1, nAllCol2, nAllRow2, rMark, nInsFlag );
-             if (bResetCut)
--                pClipDoc->bCutMode = FALSE;
-+                pClipDoc->GetClipParam().mbCutMode = false;
-             SetAutoCalc( bOldAutoCalc );
-         }
-     }
- }
- 
-+void ScDocument::CopyMultiRangeFromClip(
-+    const ScAddress& rDestPos, const ScMarkData& rMark, sal_uInt16 nInsFlag, ScDocument* pClipDoc,
-+    bool bResetCut, bool bAsLink, bool /*bIncludeFiltered*/, bool bSkipAttrForEmpty)
-+{
-+    if (bIsClip)
-+        return;
-+
-+    if (!pClipDoc->bIsClip || !pClipDoc->GetTableCount())
-+        // There is nothing in the clip doc to copy.
-+        return;
-+
-+    BOOL bOldAutoCalc = GetAutoCalc();
-+    SetAutoCalc( FALSE );   // avoid multiple recalculations
-+
-+    NumFmtMergeHandler aNumFmtMergeHdl(this, pClipDoc);
-+
-+    ScClipRangeNameData aClipRangeNames;
-+    CopyRangeNamesFromClip(pClipDoc, aClipRangeNames);
-+
-+    SCCOL nCol1 = rDestPos.Col();
-+    SCROW nRow1 = rDestPos.Row();
-+    ScClipParam& rClipParam = pClipDoc->GetClipParam();
-+
-+    ScCopyBlockFromClipParams aCBFCP;
-+    aCBFCP.pRefUndoDoc = NULL;
-+    aCBFCP.pClipDoc = pClipDoc;
-+    aCBFCP.nInsFlag = nInsFlag;
-+    aCBFCP.bAsLink  = bAsLink;
-+    aCBFCP.bSkipAttrForEmpty = bSkipAttrForEmpty;
-+    aCBFCP.nTabStart = MAXTAB;
-+    aCBFCP.nTabEnd = 0;
-+
-+    SCCOL nCols = rClipParam.getPasteColSize();
-+    SCROW nRows = rClipParam.getPasteRowSize();
-+    for (SCTAB j = 0; j <= MAXTAB; ++j)
-+    {    
-+        if (pTab[j] && rMark.GetTableSelect(j))
-+        {
-+            if ( j < aCBFCP.nTabStart )
-+                aCBFCP.nTabStart = j;
-+            aCBFCP.nTabEnd = j;
-+            pTab[j]->IncRecalcLevel();
-+        }
-+    }
-+
-+    bInsertingFromOtherDoc = TRUE;  // kein Broadcast/Listener aufbauen bei Insert
-+
-+    if (!bSkipAttrForEmpty)
-+    {
-+        sal_uInt16 nDelFlag = IDF_CONTENTS;
-+        DeleteArea(nCol1, nRow1, nCol1+nCols-1, nRow1+nRows-1, rMark, nDelFlag);
-+    }
-+
-+    for (ScRange* p = rClipParam.maRanges.First(); p; p = rClipParam.maRanges.Next())
-+    {
-+        SCsCOL nDx = static_cast<SCsCOL>(nCol1 - p->aStart.Col());
-+        SCsROW nDy = static_cast<SCsROW>(nRow1 - p->aStart.Row());
-+        SCCOL nCol2 = nCol1 + p->aEnd.Col() - p->aStart.Col();
-+        SCROW nRow2 = nRow1 + p->aEnd.Row() - p->aStart.Row();
-+    
-+        CopyBlockFromClip(nCol1, nRow1, nCol2, nRow2, rMark, nDx, nDy, &aCBFCP);
-+
-+        if (rClipParam.meDirection == ScClipParam::Column)
-+            nCol1 += p->aEnd.Col() - p->aStart.Col() + 1;
-+        if (rClipParam.meDirection == ScClipParam::Row)
-+            nRow1 += p->aEnd.Row() - p->aStart.Row() + 1;
-+    }
-+
-+    for (SCTAB i = 0; i <= MAXTAB; i++)
-+        if (pTab[i] && rMark.GetTableSelect(i))
-+            pTab[i]->DecRecalcLevel();
-+
-+    bInsertingFromOtherDoc = FALSE;
-+
-+    ScRange aDestRange(rDestPos.Col(), rDestPos.Row(), rDestPos.Tab(), 
-+                       rDestPos.Col()+nCols-1, rDestPos.Row()+nRows-1, rDestPos.Tab());
-+    ScRangeList aRanges;
-+    aRanges.Append(aDestRange);
-+    UpdateRangeNamesInFormulas(aClipRangeNames, aRanges, rMark, nCols-1, nRows-1);
-+
-+    // Listener aufbauen nachdem alles inserted wurde
-+    StartListeningFromClip(aDestRange.aStart.Col(), aDestRange.aStart.Row(), 
-+                           aDestRange.aEnd.Col(), aDestRange.aEnd.Row(), rMark, nInsFlag );
-+    // nachdem alle Listener aufgebaut wurden, kann gebroadcastet werden
-+    BroadcastFromClip(aDestRange.aStart.Col(), aDestRange.aStart.Row(), 
-+                      aDestRange.aEnd.Col(), aDestRange.aEnd.Row(), rMark, nInsFlag );
-+
-+    if (bResetCut)
-+        pClipDoc->GetClipParam().mbCutMode = false;
-+    SetAutoCalc( bOldAutoCalc );
-+}
- 
- void ScDocument::SetClipArea( const ScRange& rArea, BOOL bCut )
- {
-     if (bIsClip)
-     {
--        aClipRange = rArea;
--        bCutMode = bCut;
-+        ScClipParam& rClipParam = GetClipParam();
-+        rClipParam.maRanges.RemoveAll();
-+        rClipParam.maRanges.Append(rArea);
-+        rClipParam.mbCutMode = bCut;
-     }
-     else
-     {
-@@ -1970,33 +2167,53 @@ void ScDocument::SetClipArea( const ScRange& rArea, BOOL bCut )
- 
- void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered)
- {
--    if (bIsClip)
--    {
--        nClipX = aClipRange.aEnd.Col() - aClipRange.aStart.Col();
-+    if (!bIsClip)
-+    {    
-+        DBG_ERROR("GetClipArea: kein Clip");
-+        return;
-+    }
- 
--        if ( bIncludeFiltered )
--            nClipY = aClipRange.aEnd.Row() - aClipRange.aStart.Row();
--        else
--        {
--            //	count non-filtered rows
--            //	count on first used table in clipboard
--            SCTAB nCountTab = 0;
--            while ( nCountTab < MAXTAB && !pTab[nCountTab] )
--                ++nCountTab;
--
--            SCROW nResult = GetRowFlagsArray( nCountTab).CountForCondition(
--                    aClipRange.aStart.Row(), aClipRange.aEnd.Row(),
--                    CR_FILTERED, 0);
--
--            if ( nResult > 0 )
--                nClipY = nResult - 1;
--            else
--                nClipY = 0;					// always return at least 1 row
--        }
-+    ScRangeList& rClipRanges = GetClipParam().maRanges;
-+    if (!rClipRanges.Count())
-+        // No clip range.  Bail out.
-+        return;
-+
-+    ScRangePtr p = rClipRanges.First();
-+    SCCOL nStartCol = p->aStart.Col();
-+    SCCOL nEndCol   = p->aEnd.Col();
-+    SCROW nStartRow = p->aStart.Row();
-+    SCROW nEndRow   = p->aEnd.Row();
-+    for (p = rClipRanges.Next(); p; p = rClipRanges.Next())
-+    {
-+        if (p->aStart.Col() < nStartCol)
-+            nStartCol = p->aStart.Col();
-+        if (p->aStart.Row() < nStartRow)
-+            nStartRow = p->aStart.Row();
-+        if (p->aEnd.Col() > nEndCol)
-+            nEndCol = p->aEnd.Col();
-+        if (p->aEnd.Row() < nEndRow)
-+            nEndRow = p->aEnd.Row();
-     }
-+
-+    nClipX = nEndCol - nStartCol;
-+
-+    if ( bIncludeFiltered )
-+        nClipY = nEndRow - nStartRow;
-     else
-     {
--        DBG_ERROR("GetClipArea: kein Clip");
-+        //	count non-filtered rows
-+        //	count on first used table in clipboard
-+        SCTAB nCountTab = 0;
-+        while ( nCountTab < MAXTAB && !pTab[nCountTab] )
-+            ++nCountTab;
-+
-+        SCROW nResult = GetRowFlagsArray( nCountTab).CountForCondition(
-+                nStartRow, nEndRow, CR_FILTERED, 0);
-+
-+        if ( nResult > 0 )
-+            nClipY = nResult - 1;
-+        else
-+            nClipY = 0;					// always return at least 1 row
-     }
- }
- 
-@@ -2005,8 +2222,12 @@ void ScDocument::GetClipStart(SCCOL& nClipX, SCROW& nClipY)
- {
-     if (bIsClip)
-     {
--        nClipX = aClipRange.aStart.Col();
--        nClipY = aClipRange.aStart.Row();
-+        ScRangeList& rClipRanges = GetClipParam().maRanges;
-+        if (rClipRanges.Count())
-+        {
-+            nClipX = rClipRanges.First()->aStart.Col();
-+            nClipY = rClipRanges.First()->aStart.Row();
-+        }
-     }
-     else
-     {
-@@ -2022,8 +2243,12 @@ BOOL ScDocument::HasClipFilteredRows()
-     while ( nCountTab < MAXTAB && !pTab[nCountTab] )
-         ++nCountTab;
- 
--    return GetRowFlagsArray( nCountTab).HasCondition( aClipRange.aStart.Row(),
--            aClipRange.aEnd.Row(), CR_FILTERED, CR_FILTERED);
-+    ScRangeList& rClipRanges = GetClipParam().maRanges;
-+    if (!rClipRanges.Count())
-+        return false;
-+
-+    return GetRowFlagsArray( nCountTab).HasCondition( rClipRanges.First()->aStart.Row(),
-+            rClipRanges.First()->aEnd.Row(), CR_FILTERED, CR_FILTERED);
- }
- 
- 
-diff --git sc/source/core/data/makefile.mk sc/source/core/data/makefile.mk
-index 9dfc108..8440ee8 100644
---- sc/source/core/data/makefile.mk
-+++ sc/source/core/data/makefile.mk
-@@ -56,6 +56,7 @@ SLOFILES =  \
-     $(SLO)$/bcaslot.obj \
-     $(SLO)$/cell.obj \
-     $(SLO)$/cell2.obj \
-+        $(SLO)$/clipparam.obj \
-     $(SLO)$/column.obj \
-     $(SLO)$/column2.obj \
-     $(SLO)$/column3.obj \
-diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx
-index 460abe1..3b2d3c5 100644
---- sc/source/core/data/table1.cxx
-+++ sc/source/core/data/table1.cxx
-@@ -1303,6 +1303,16 @@ void ScTable::ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1,
-     }
- }
- 
-+void ScTable::ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1,
-+                                    SCCOL nCol2, SCROW nRow2,
-+                                    const ScRangeData::IndexMap& rMap )
-+{
-+    for (SCCOL i = nCol1; i <= nCol2 && (ValidCol(i)); i++)
-+    {
-+        aCol[i].ReplaceRangeNamesInUse( nRow1, nRow2, rMap );
-+    }
-+}
-+
- void ScTable::ExtendPrintArea( OutputDevice* pDev,
-                     SCCOL /* nStartCol */, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow )
- {
-diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index eec97e2..0ef9cbb 100644
---- sc/source/core/data/table2.cxx
-+++ sc/source/core/data/table2.cxx
-@@ -367,6 +367,16 @@ void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-     }
- }
- 
-+void ScTable::CopyToClip(const ScRangeList& rRanges, ScTable* pTable, 
-+                         bool bKeepScenarioFlags, bool bCloneNoteCaptions)
-+{
-+    ScRangeList aRanges(rRanges);
-+    for (ScRangePtr p = aRanges.First(); p; p = aRanges.Next())
-+    {
-+        CopyToClip(p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(), 
-+                   pTable, bKeepScenarioFlags, bCloneNoteCaptions);
-+    }
-+}
- 
- void ScTable::CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                             SCsCOL nDx, SCsROW nDy, USHORT nInsFlag,
-diff --git sc/source/core/tool/rangenam.cxx sc/source/core/tool/rangenam.cxx
-index 6029663..d30a3d5 100644
---- sc/source/core/tool/rangenam.cxx
-+++ sc/source/core/tool/rangenam.cxx
-@@ -585,6 +585,31 @@ void ScRangeData::ReplaceRangeNamesInUse( const ScIndexMap& rMap )
-     }
- }
- 
-+void ScRangeData::ReplaceRangeNamesInUse( const IndexMap& rMap )
-+{
-+    bool bCompile = false;
-+    for ( FormulaToken* p = pCode->First(); p; p = pCode->Next() )
-+    {
-+        if ( p->GetOpCode() == ocName )
-+        {
-+            const sal_uInt16 nOldIndex = p->GetIndex();
-+            IndexMap::const_iterator itr = rMap.find(nOldIndex);
-+            const sal_uInt16 nNewIndex = itr == rMap.end() ? nOldIndex : itr->second;
-+            if ( nOldIndex != nNewIndex )
-+            {
-+                p->SetIndex( nNewIndex );
-+                bCompile = true;
-+            }
-+        }
-+    }
-+    if ( bCompile )
-+    {
-+        ScCompiler aComp( pDoc, aPos, *pCode);
-+        aComp.SetGrammar(pDoc->GetGrammar());
-+        aComp.CompileTokenArray();
-+    }
-+}
-+
- 
- void ScRangeData::ValidateTabRefs()
- {
-diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
-index 17ad51a..f727fb4 100644
---- sc/source/ui/inc/viewfunc.hxx
-+++ sc/source/ui/inc/viewfunc.hxx
-@@ -354,6 +354,11 @@ private:
-     void			PasteRTF( SCCOL nCol, SCROW nStartRow,
-                                 const ::com::sun::star::uno::Reference<
-                                         ::com::sun::star::datatransfer::XTransferable >& rxTransferable );
-+    bool            PasteMultiRangesFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction,
-+                                              bool bSkipEmpty, bool bTranspos, bool bAsLink, bool bAllowDialogs,
-+                                              InsCellCmd eMoveMode, sal_uInt16 nCondFlags, sal_uInt16 nUndoFlags );
-+    void            PostPasteFromClip(const ScRange& rPasteRange, const ScMarkData& rMark);
-+
-     USHORT			GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula );
- 
-     void			StartFormatArea();
-diff --git sc/source/ui/view/cellsh.cxx sc/source/ui/view/cellsh.cxx
-index ddfa8e9..e782dd2 100644
---- sc/source/ui/view/cellsh.cxx
-+++ sc/source/ui/view/cellsh.cxx
-@@ -206,7 +206,6 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
-                 break;
- 
-             case SID_COPY:						// Kopieren
--                bDisable = (!bSimpleArea && eMarkType != SC_MARK_SIMPLE_FILTERED);
-                 // nur wegen Matrix nicht editierbar? Matrix nicht zerreissen
-                 //! schlaegt nicht zu, wenn geschuetzt UND Matrix, aber damit
-                 //! muss man leben.. wird in Copy-Routine abgefangen, sonst
---- sc/source/ui/view/cellsh1.cxx
-+++ sc/source/ui/view/cellsh1.cxx
-@@ -104,6 +104,7 @@
- #include "dpsave.hxx"
- #include "dpgroup.hxx"      // for ScDPNumGroupInfo
- #include "spellparam.hxx"
-+#include "clipparam.hxx"
- #include "postit.hxx"
- 
- #include "globstr.hrc"
-@@ -2243,7 +2244,13 @@ void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTa
-             pTabViewShell->PasteFromSystem();
-         else
-         {
--            pTabViewShell->PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
-+            ScDocument* pClipDoc = pOwnClip->GetDocument();
-+            sal_uInt16 nFlags = IDF_ALL;
-+            if (pClipDoc->GetClipParam().isMultiRange())
-+                // For multi-range paste, we paste values by default.
-+                nFlags &= ~IDF_FORMULA;
-+
-+            pTabViewShell->PasteFromClip( nFlags, pClipDoc,
-                     PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
-                     bShowDialog );		// allow warning dialog
-         }
-diff --git sc/source/ui/view/tabvwsh4.cxx sc/source/ui/view/tabvwsh4.cxx
-index 4d3dfc1..0e76555 100644
---- sc/source/ui/view/tabvwsh4.cxx
-+++ sc/source/ui/view/tabvwsh4.cxx
-@@ -1506,7 +1506,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
-         //	#51889# Spezialfall: Copy/Cut bei Mehrfachselektion -> Fehlermeldung
-         //	(Slot ist disabled, SfxViewShell::KeyInput wuerde also kommentarlos verschluckt)
-         KeyFuncType eFunc = aCode.GetFunction();
--        if ( eFunc == KEYFUNC_COPY || eFunc == KEYFUNC_CUT )
-+		if ( eFunc == KEYFUNC_CUT )
-         {
-             ScRange aDummy;
-             ScMarkType eMarkType = GetViewData()->GetSimpleArea( aDummy );
-diff --git sc/source/ui/view/viewfun3.cxx sc/source/ui/view/viewfun3.cxx
-index 0a97b2a..31fca76 100644
---- sc/source/ui/view/viewfun3.cxx
-+++ sc/source/ui/view/viewfun3.cxx
-@@ -210,6 +210,7 @@
- #include "drwtrans.hxx"
- #include "docuno.hxx"
- #include "undodat.hxx"   // Amelia Wang
-+#include "clipparam.hxx"
- 
- using namespace com::sun::star;
- 
-@@ -310,10 +311,10 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
- 
-     ScRange aRange;
-     ScMarkType eMarkType = GetViewData()->GetSimpleArea( aRange );
-+    ScDocument* pDoc = GetViewData()->GetDocument();
-+    ScMarkData& rMark = GetViewData()->GetMarkData();
-     if ( eMarkType == SC_MARK_SIMPLE || eMarkType == SC_MARK_SIMPLE_FILTERED )
-     {
--        ScDocument* pDoc = GetViewData()->GetDocument();
--        ScMarkData& rMark = GetViewData()->GetMarkData();
-         if ( !pDoc->HasSelectedBlockMatrixFragment(
-                         aRange.aStart.Col(), aRange.aStart.Row(),
-                         aRange.aEnd.Col(),   aRange.aEnd.Row(),
-@@ -380,6 +381,122 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
-                 ErrorMessage(STR_MATRIXFRAGMENTERR);
-         }
-     }
-+    else if (eMarkType == SC_MARK_MULTI)
-+    {
-+        bool bSuccess = false;
-+        ScClipParam aClipParam;
-+        aClipParam.mbCutMode = false;
-+        rMark.FillRangeListWithMarks(&aClipParam.maRanges, false);
-+
-+        do
-+        {
-+            if (bCut)
-+                // We con't support cutting of multi-selections.
-+                break;
-+
-+            if (pClipDoc)
-+                // TODO: What's this for?
-+                break;
-+
-+            ::std::auto_ptr<ScDocument> pDocClip(new ScDocument(SCDOCMODE_CLIP));
-+
-+            // Check for geometrical feasibility of the ranges.
-+            bool bValidRanges = true;
-+            ScRangePtr p = aClipParam.maRanges.First();
-+            SCCOL nPrevColDelta = 0;
-+            SCROW nPrevRowDelta = 0;
-+            SCCOL nPrevCol = p->aStart.Col();
-+            SCROW nPrevRow = p->aStart.Row();
-+            SCCOL nPrevColSize = p->aEnd.Col() - p->aStart.Col() + 1;
-+            SCROW nPrevRowSize = p->aEnd.Row() - p->aStart.Row() + 1;
-+            for (p = aClipParam.maRanges.Next(); p; p = aClipParam.maRanges.Next())
-+            {
-+                if (pDoc->HasSelectedBlockMatrixFragment(
-+                    p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(), rMark))
-+                {    
-+                    bValidRanges = false;
-+                    break;
-+                }
-+
-+                SCCOL nColDelta = p->aStart.Col() - nPrevCol;
-+                SCROW nRowDelta = p->aStart.Row() - nPrevRow;
-+
-+                if ((nColDelta && nRowDelta) || (nPrevColDelta && nRowDelta) || (nPrevRowDelta && nColDelta))
-+                {
-+                    bValidRanges = false;
-+                    break;
-+                }
-+
-+                if (aClipParam.meDirection == ScClipParam::Unspecified)
-+                {
-+                    if (nColDelta)
-+                        aClipParam.meDirection = ScClipParam::Column;
-+                    if (nRowDelta)
-+                        aClipParam.meDirection = ScClipParam::Row;
-+                }
-+   
-+                SCCOL nColSize = p->aEnd.Col() - p->aStart.Col() + 1;
-+                SCROW nRowSize = p->aEnd.Row() - p->aStart.Row() + 1;
-+
-+                if (aClipParam.meDirection == ScClipParam::Column && nRowSize != nPrevRowSize)
-+                {
-+                    // column-oriented ranges must have identical row size.
-+                    bValidRanges = false;
-+                    break;
-+                }
-+                if (aClipParam.meDirection == ScClipParam::Row && nColSize != nPrevColSize)
-+                {
-+                    // likewise, row-oriented ranges must have identical 
-+                    // column size.
-+                    bValidRanges = false;
-+                    break;
-+                }
-+
-+                nPrevCol = p->aStart.Col();
-+                nPrevRow = p->aStart.Row();
-+                nPrevColDelta = nColDelta;
-+                nPrevRowDelta = nRowDelta;
-+                nPrevColSize  = nColSize;
-+                nPrevRowSize  = nRowSize;
-+            }
-+            if (!bValidRanges)
-+                break;
-+
-+            pDoc->CopyToClip(aClipParam, pDocClip.get(), &rMark, false, bIncludeObjects);
-+
-+            ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
-+            if ( pChangeTrack )
-+                pChangeTrack->ResetLastCut();	// kein CutMode mehr
-+
-+			{
-+				ScDocShell* pDocSh = GetViewData()->GetDocShell();
-+				TransferableObjectDescriptor aObjDesc;
-+				pDocSh->FillTransferableObjectDescriptor( aObjDesc );
-+				aObjDesc.maDisplayName = pDocSh->GetMedium()->GetURLObject().GetURLNoPass();
-+				// maSize is set in ScTransferObj ctor
-+
-+				ScTransferObj* pTransferObj = new ScTransferObj( pDocClip.release(), aObjDesc );
-+				uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj );
-+
-+				if ( ScGlobal::pDrawClipDocShellRef )
-+				{
-+                    SfxObjectShellRef aPersistRef( &(*ScGlobal::pDrawClipDocShellRef) );
-+					pTransferObj->SetDrawPersist( aPersistRef );	// keep persist for ole objects alive
-+				}
-+
-+				pTransferObj->CopyToClipboard( GetActiveWin() );	// system clipboard
-+				SC_MOD()->SetClipObject( pTransferObj, NULL );		// internal clipboard
-+			}
-+
-+            bSuccess = true;
-+        }
-+        while (false);
-+
-+        if (!bSuccess && !bApi)
-+            ErrorMessage(STR_NOMULTISELECT);
-+
-+        bDone = bSuccess;
-+    }
-     else
-     {
-         if (!bApi)
-@@ -743,6 +860,52 @@ BOOL lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
- 
- //	internes Paste
- 
-+namespace {
-+
-+class CursorSwitcher
-+{
-+public:
-+    CursorSwitcher(ScViewFunc* pViewFunc) :
-+        mpViewFunc(pViewFunc)
-+    {
-+        mpViewFunc->HideCursor();
-+    }
-+
-+    ~CursorSwitcher()
-+    {
-+        mpViewFunc->ShowCursor();
-+    }
-+private:
-+    ScViewFunc* mpViewFunc;
-+};
-+
-+bool lcl_checkDestRangeForOverwrite(const ScRange& rDestRange, const ScDocument* pDoc, const ScMarkData& rMark, Window* pParentWnd)
-+{
-+    bool bIsEmpty = true;
-+    SCTAB nTabCount = pDoc->GetTableCount();
-+    for (SCTAB nTab=0; nTab < nTabCount && bIsEmpty; ++nTab)
-+    {
-+        if (!rMark.GetTableSelect(nTab))
-+            continue;
-+
-+        bIsEmpty = pDoc->IsBlockEmpty(nTab, rDestRange.aStart.Col(), rDestRange.aStart.Row(),
-+                                      rDestRange.aEnd.Col(), rDestRange.aEnd.Row());
-+    }
-+
-+    if (!bIsEmpty)
-+    {
-+        ScReplaceWarnBox aBox(pParentWnd);
-+        if (aBox.Execute() != RET_YES)
-+        {
-+            //	changing the configuration is within the ScReplaceWarnBox
-+            return false;
-+        }
-+    }
-+    return true;
-+}
-+
-+}
-+
- BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
-                                     USHORT nFunction, BOOL bSkipEmpty,
-                                     BOOL bTranspose, BOOL bAsLink,
-@@ -768,6 +931,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
-     // do not copy note captions into undo document
-     nUndoFlags |= IDF_NOCAPTIONS;
- 
-+    ScClipParam& rClipParam = pClipDoc->GetClipParam();
-+    if (rClipParam.isMultiRange())
-+        return PasteMultiRangesFromClip(
-+            nFlags, pClipDoc, nFunction, bSkipEmpty, bTranspose, bAsLink, bAllowDialogs,
-+            eMoveMode, nContFlags, nUndoFlags);
-+
-     BOOL bCutMode = pClipDoc->IsCutMode();		// if transposing, take from original clipdoc
-     BOOL bIncludeFiltered = bCutMode;
- 
-@@ -996,23 +1165,8 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
-                                 SC_MOD()->GetInputOptions().GetReplaceCellsWarn();
-         if ( bAskIfNotEmpty )
-         {
--            BOOL bIsEmpty = TRUE;
--            SCTAB nTabCount = pDoc->GetTableCount();
--            for (SCTAB nTab=0; nTab<nTabCount && bIsEmpty; nTab++)
--                if ( aFilteredMark.GetTableSelect(nTab) &&
--                        !pDoc->IsBlockEmpty( nTab, aUserRange.aStart.Col(), aUserRange.aStart.Row(),
--                                                   aUserRange.aEnd.Col(), aUserRange.aEnd.Row() ) )
--                    bIsEmpty = FALSE;
--
--            if ( !bIsEmpty )
--            {
--                ScReplaceWarnBox aBox( GetViewData()->GetDialogParent() );
--                if ( aBox.Execute() != RET_YES )
--                {
--                    //	changing the configuration is within the ScReplaceWarnBox
--                    return FALSE;
--                }
--            }
-+            if (!lcl_checkDestRangeForOverwrite(aUserRange, pDoc, aFilteredMark, GetViewData()->GetDialogParent()))
-+                return false;
-         }
-     }
- 
-@@ -1281,7 +1435,171 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
-     // AdjustBlockHeight has already been called above
- 
-     aModificator.SetDocumentModified();
--    pDocSh->UpdateOle(GetViewData());
-+    PostPasteFromClip(aUserRange, rMark);
-+	return TRUE;
-+}
-+
-+bool ScViewFunc::PasteMultiRangesFromClip(
-+    sal_uInt16 nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction,
-+    bool bSkipEmpty, bool bTranspose, bool bAsLink, bool bAllowDialogs, 
-+    InsCellCmd eMoveMode, sal_uInt16 /*nContFlags*/, sal_uInt16 nUndoFlags)
-+{
-+    ScViewData& rViewData = *GetViewData();
-+    ScDocument* pDoc = rViewData.GetDocument();
-+    ScDocShell* pDocSh = rViewData.GetDocShell();
-+    ScMarkData aMark(rViewData.GetMarkData());
-+    const ScAddress& rCurPos = rViewData.GetCurPos();
-+    ScClipParam& rClipParam = pClipDoc->GetClipParam();
-+    SCCOL nColSize = rClipParam.getPasteColSize();
-+    SCROW nRowSize = rClipParam.getPasteRowSize();
-+
-+    if (bTranspose)
-+    {
-+        if (static_cast<SCROW>(rCurPos.Col()) + nRowSize-1 > static_cast<SCROW>(MAXCOL))
-+        {
-+            ErrorMessage(STR_PASTE_FULL);
-+            return false;
-+        }
-+
-+        ::std::auto_ptr<ScDocument> pTransClip(new ScDocument(SCDOCMODE_CLIP));
-+        pClipDoc->TransposeClip(pTransClip.get(), nFlags, bAsLink);
-+        pClipDoc = pTransClip.release();
-+        SCCOL nTempColSize = nColSize;
-+        nColSize = static_cast<SCCOL>(nRowSize);
-+        nRowSize = static_cast<SCROW>(nTempColSize);
-+    }
-+
-+    if (!ValidCol(rCurPos.Col()+nColSize-1) || !ValidRow(rCurPos.Row()+nRowSize-1))
-+    {
-+        ErrorMessage(STR_PASTE_FULL);
-+        return false;
-+    }
-+
-+    // Determine the first and last selected sheet numbers.
-+    SCTAB nTab1 = aMark.GetFirstSelected();
-+    SCTAB nTab2 = nTab1;
-+    for (SCTAB i = nTab1+1; i <= MAXTAB; ++i)
-+        if (aMark.GetTableSelect(i))
-+            nTab2 = i;
-+
-+    ScDocShellModificator aModificator(*pDocSh);
-+
-+    // For multi-selection paste, we don't support cell duplication for larger
-+    // destination range.  In case the destination is marked, we reset it to
-+    // the clip size.
-+    ScRange aMarkedRange(rCurPos.Col(), rCurPos.Row(), nTab1, 
-+                         rCurPos.Col()+nColSize-1, rCurPos.Row()+nRowSize-1, nTab2);
-+
-+    bool bAskIfNotEmpty = 
-+        bAllowDialogs && (nFlags & IDF_CONTENTS) && 
-+        nFunction == PASTE_NOFUNC && SC_MOD()->GetInputOptions().GetReplaceCellsWarn();
-+
-+    if (bAskIfNotEmpty)
-+    {
-+        if (!lcl_checkDestRangeForOverwrite(aMarkedRange, pDoc, aMark, rViewData.GetDialogParent()))
-+            return false;
-+    }
-+
-+    aMark.SetMarkArea(aMarkedRange);
-+    MarkRange(aMarkedRange);
-+
-+    bool bInsertCells = (eMoveMode != INS_NONE);
-+    if (bInsertCells)
-+    {
-+        if (!InsertCells(eMoveMode, pDoc->IsUndoEnabled(), true))
-+            return false;
-+    }
-+
-+    ::std::auto_ptr<ScDocument> pUndoDoc;
-+    if (pDoc->IsUndoEnabled())
-+    {
-+        pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO));
-+        pUndoDoc->InitUndoSelected(pDoc, aMark, false, false);
-+        pDoc->CopyToDocument(aMarkedRange, IDF_ALL, false, pUndoDoc.get(), &aMark, true);
-+    }
-+
-+    ::std::auto_ptr<ScDocument> pMixDoc;
-+    if ( bSkipEmpty || nFunction )
-+    {
-+        if ( nFlags & IDF_CONTENTS )
-+        {
-+            pMixDoc.reset(new ScDocument(SCDOCMODE_UNDO));
-+            pMixDoc->InitUndoSelected(pDoc, aMark, false, false);
-+            pDoc->CopyToDocument(aMarkedRange, IDF_CONTENTS, false, pMixDoc.get(), &aMark, true);
-+        }
-+    }
-+
-+    /*  Make draw layer and start drawing undo.
-+        - Needed before AdjustBlockHeight to track moved drawing objects.
-+        - Needed before pDoc->CopyFromClip to track inserted note caption objects.
-+     */
-+	if (nFlags & IDF_OBJECTS)
-+		pDocSh->MakeDrawLayer();
-+	if (pDoc->IsUndoEnabled())
-+		pDoc->BeginDrawUndo();
-+
-+    CursorSwitcher aCursorSwitch(this);
-+    sal_uInt16 nNoObjFlags = nFlags & ~IDF_OBJECTS;
-+    pDoc->CopyMultiRangeFromClip(rCurPos, aMark, nNoObjFlags, pClipDoc, 
-+                                 true, bAsLink, false, bSkipEmpty);
-+
-+    if (pMixDoc.get())          
-+        pDoc->MixDocument(aMarkedRange, nFunction, bSkipEmpty, pMixDoc.get());
-+
-+    AdjustBlockHeight();            // update row heights before pasting objects
-+
-+    if (nFlags & IDF_OBJECTS)
-+    {
-+        //  Paste the drawing objects after the row heights have been updated.
-+        pDoc->CopyMultiRangeFromClip(rCurPos, aMark, IDF_OBJECTS, pClipDoc, 
-+                                     true, false, false, true);
-+    }
-+
-+    pDocSh->PostPaint(rCurPos.Col(), rCurPos.Row(), rCurPos.Tab(), 
-+                      rCurPos.Col()+nColSize-1, rCurPos.Row()+nRowSize-1, rCurPos.Tab(), 
-+                      PAINT_GRID);
-+
-+    if (pDoc->IsUndoEnabled())
-+    {
-+        SfxUndoManager* pUndoMgr = pDocSh->GetUndoManager();
-+        String aUndo = ScGlobal::GetRscString(
-+            pClipDoc->IsCutMode() ? STR_UNDO_CUT : STR_UNDO_COPY);
-+        pUndoMgr->EnterListAction(aUndo, aUndo);
-+
-+        ScUndoPasteOptions aOptions;            // store options for repeat
-+        aOptions.nFunction  = nFunction;
-+        aOptions.bSkipEmpty = bSkipEmpty;
-+        aOptions.bTranspose = bTranspose;
-+        aOptions.bAsLink    = bAsLink;
-+        aOptions.eMoveMode  = eMoveMode;
-+
-+        ScUndoPaste* pUndo = new ScUndoPaste(pDocSh, 
-+            aMarkedRange.aStart.Col(), 
-+            aMarkedRange.aStart.Row(), 
-+            aMarkedRange.aStart.Tab(), 
-+            aMarkedRange.aEnd.Col(), 
-+            aMarkedRange.aEnd.Row(), 
-+            aMarkedRange.aEnd.Tab(), 
-+            aMark, pUndoDoc.release(), NULL, nFlags|nUndoFlags, NULL, NULL, NULL, NULL, false, &aOptions);
-+
-+        if (bInsertCells)
-+            pUndoMgr->AddUndoAction(new ScUndoWrapper(pUndo), true);
-+        else
-+            pUndoMgr->AddUndoAction(pUndo, false);
-+
-+        pUndoMgr->LeaveListAction();
-+    }
-+    aModificator.SetDocumentModified();
-+    PostPasteFromClip(aMarkedRange, aMark);
-+    return true;
-+}
-+
-+void ScViewFunc::PostPasteFromClip(const ScRange& rPasteRange, const ScMarkData& rMark)
-+{
-+    ScViewData* pViewData = GetViewData();
-+    ScDocShell* pDocSh = pViewData->GetDocShell();
-+    ScDocument* pDoc = pViewData->GetDocument();
-+    pDocSh->UpdateOle(pViewData);
- 
-     SelectionChanged();
- 
-@@ -1295,7 +1613,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
-         {
-             if ( rMark.GetTableSelect( i ) )
-             {
--                ScRange aChangeRange( aUserRange );
-+                ScRange aChangeRange(rPasteRange);
-                 aChangeRange.aStart.SetTab( i );
-                 aChangeRange.aEnd.SetTab( i );
-                 aChangeRanges.Append( aChangeRange );
-@@ -1303,8 +1621,6 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
-         }
-         pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges );
-     }
--
--    return TRUE;
- }
- 
- 
diff --git a/applied_patches/0141-sc-print-selected-sheets.diff b/applied_patches/0140-sc-print-selected-sheets.diff
similarity index 100%
rename from applied_patches/0141-sc-print-selected-sheets.diff
rename to applied_patches/0140-sc-print-selected-sheets.diff
diff --git a/applied_patches/0143-sc-print-lines.diff b/applied_patches/0141-sc-print-lines.diff
similarity index 100%
rename from applied_patches/0143-sc-print-lines.diff
rename to applied_patches/0141-sc-print-lines.diff
diff --git a/applied_patches/0142-sc-biffdump.diff b/applied_patches/0142-sc-biffdump.diff
deleted file mode 100644
index 7636210ba..000000000
--- a/applied_patches/0142-sc-biffdump.diff
+++ /dev/null
@@ -1,127 +0,0 @@
-Index: sc/source/filter/excel/biffdump.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/biffdump.cxx,v
-retrieving revision 1.89
-diff -u -p -r1.89 biffdump.cxx
---- sc/source/filter/excel/biffdump.cxx	3 Jul 2007 15:50:04 -0000	1.89
-+++ sc/source/filter/excel/biffdump.cxx	1 Oct 2007 20:00:49 -0000
-@@ -140,6 +140,16 @@ inline void lclAppendDec( ByteString& rS
-     rStr.Append( ByteString::CreateFromInt32( nData ) );
- }
- 
-+inline void lclAppendDec( ByteString& rStr, sal_uInt64 nData )
-+{
-+    rStr.Append( ByteString::CreateFromInt64( nData ) );
-+}
-+
-+inline void lclAppendDec( ByteString& rStr, sal_Int64 nData )
-+{
-+    rStr.Append( ByteString::CreateFromInt64( nData ) );
-+}
-+
- inline void lclAppendDec( ByteString& rStr, float fData )
- {
-     rStr.Append( ByteString( ::rtl::math::doubleToString( fData, rtl_math_StringFormat_G, 15, '.', true ) ) );
-@@ -189,6 +199,17 @@ inline void lclAppendHex( ByteString& rS
-     lclAppendHex( rStr, static_cast< sal_uInt32 >( nData ), bPrefix );
- }
- 
-+void lclAppendHex( ByteString& rStr, sal_uInt64 nData, bool bPrefix = true )
-+{
-+    lclAppendHex( rStr, static_cast< sal_uInt32 >( nData >> 32 ), bPrefix );
-+    lclAppendHex( rStr, static_cast< sal_uInt32 >( nData ), false );
-+}
-+
-+inline void lclAppendHex( ByteString& rStr, sal_Int64 nData, bool bPrefix = true )
-+{
-+    lclAppendHex( rStr, static_cast< sal_uInt64 >( nData ), bPrefix );
-+}
-+
- inline void lclAppendHex( ByteString& rStr, double fData, bool bPrefix = true )
- {
-     const sal_uInt32* pnData = reinterpret_cast< const sal_uInt32* >( &fData );
-@@ -298,6 +319,34 @@ static void __AddHex( ByteString& r, INT
- }
- 
- 
-+static void __AddHex( ByteString& r, UINT64 nVal )
-+{
-+	r += __pHexPrefix;
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 60 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 56 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 52 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 48 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 44 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 40 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 36 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 32 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 28 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 24 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 20 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 16 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 12 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 8 ) );
-+	__AddHexNibble( r, ( UINT8 ) ( nVal >> 4 ) );
-+	__AddHexNibble( r, ( UINT8 ) nVal );
-+}
-+
-+
-+static void __AddHex( ByteString& r, INT64 nVal )
-+{
-+	__AddHex( r, (UINT64) nVal );
-+}
-+
-+
- static void __AddPureBinNibble( ByteString& r, UINT8 nVal )
- {
- 	nVal <<= 4;
-@@ -339,6 +388,14 @@ static void __AddPureBin( ByteString& r,
- }
- 
- 
-+inline static void __AddDec( ByteString& r, UINT64 n )
-+{
-+    // FIXME: need "%llu" for ILP32 platforms, "%lu" for LP64 platforms,
-+    // and I have no idea for Win32.
-+    __AddDec( r, static_cast<UINT32>(n) );
-+}
-+
-+
- inline static void __AddDec( ByteString& r, UINT32 n )
- {
- 	sal_Char	p[ 32 ];
-@@ -367,6 +424,14 @@ inline static void __AddDec( ByteString&
- }
- 
- 
-+inline static void __AddDec( ByteString& r, INT64 n )
-+{
-+    // FIXME: need "%lld" for ILP32 platforms, "%ld" for LP64 platforms,
-+    // and I have no idea for Win32.
-+    __AddDec( r, static_cast<INT32>(n) );
-+}
-+
-+
- inline static void __AddDec( ByteString& r, INT16 n )
- {
- 	__AddDec( r, ( INT32 ) n );
-@@ -1063,8 +1128,8 @@ UINT16 Biff8RecDumper::DumpXF( XclImpStr
-     ADDTEXT( "diag-line=" );        __AddDec( t, nTmp );
-     ::extract_value( nTmp, nBorder2, 14, 7 );
-     ADDTEXT( " color=" );           __AddDec( t, nTmp );
--    ADDTEXT( "   diag-tl-to-br=" ); lcl_AddOnOff( t, ::get_flag( nBorder1, 0x40000000UL ) );
--    ADDTEXT( "   diag-bl-to-tr=" ); lcl_AddOnOff( t, ::get_flag( nBorder1, 0x80000000UL ) );
-+    ADDTEXT( "   diag-tl-to-br=" ); lcl_AddOnOff( t, ::get_flag( nBorder1, static_cast< sal_Size >( 0x40000000U ) ) );
-+    ADDTEXT( "   diag-bl-to-tr=" ); lcl_AddOnOff( t, ::get_flag( nBorder1, static_cast< sal_Size >( 0x80000000U ) ) );
-     PRINT();
-     LINESTART();
-     ::extract_value( nTmp, nBorder2, 26, 6 );
-@@ -9820,7 +9885,7 @@ BOOL Biff8RecDumper::Dump( XclImpStream&
-             SvFileStream aBook( String::CreateFromAscii( aBookOutName.GetBuffer() ), STREAM_WRITE|STREAM_SHARE_DENYWRITE|STREAM_TRUNC );
-             if( aBook.IsOpen() )
-             {
--                const sal_uInt32 nBufLen = 0xFFFF;
-+                const sal_Size nBufLen = 0xFFFF;
-                 sal_uInt8 pBuffer[ nBufLen ];
-                 r.StoreGlobalPosition();
-                 while( r.StartNextRecord() )
diff --git a/applied_patches/0142-sc-dbrange-dynamic-resize.diff b/applied_patches/0142-sc-dbrange-dynamic-resize.diff
new file mode 100644
index 000000000..3236a7464
--- /dev/null
+++ b/applied_patches/0142-sc-dbrange-dynamic-resize.diff
@@ -0,0 +1,371 @@
+diff --git sc/inc/dbcolect.hxx sc/inc/dbcolect.hxx
+index eea9076..00ea53b 100644
+--- sc/inc/dbcolect.hxx
++++ sc/inc/dbcolect.hxx
+@@ -94,6 +94,7 @@ private:
+     ScQueryConnect  eQueryConnect[MAXQUERY];
+     BOOL			bIsAdvanced;		// TRUE if created by advanced filter
+     ScRange			aAdvSource;			// source range
++    SCROW           nDynamicEndRow;
+     // SubTotalParam
+     BOOL			bSubRemoveOnly;
+     BOOL			bSubReplace;
+@@ -141,9 +142,10 @@ public:
+             const String& GetName() const				{ return aName; }
+             void		GetName(String& rName) const	{ rName = aName; }
+             void		SetName(const String& rName)	{ aName = rName; }
+-            void		GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2) const;
+-            SC_DLLPUBLIC void		GetArea(ScRange& rRange) const;
++			void		GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2, bool bUseDynamicRange = false) const;
++			SC_DLLPUBLIC void		GetArea(ScRange& rRange, bool bUseDynamicRange = false) const;
+             void		SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
++            void        SetDynamicEndRow(SCROW nRow);
+             void		MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
+             BOOL		IsByRow() const 				{ return bByRow; }
+             void		SetByRow(BOOL bByR) 			{ bByRow = bByR; }
+diff --git sc/inc/document.hxx sc/inc/document.hxx
+index a92545f..daeb91e 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -873,7 +873,7 @@ public:
+     bool            ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow) const;
+ 
+     void			GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
+-                                    SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld );
++                                 SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld ) const;
+     SC_DLLPUBLIC BOOL			GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
+     SC_DLLPUBLIC BOOL			GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
+     SC_DLLPUBLIC BOOL			GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
+@@ -1392,6 +1392,9 @@ public:
+                                         SCTAB nTab, ScQueryParam& rQueryParam );
+     void 			GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr);
+ 
++    /** Update the dynamic end row position of a current data area. */
++    void            UpdateDynamicEndRow(ScDBData& rDBData) const;
++
+     BOOL			GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
+                                 bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates);
+     SC_DLLPUBLIC BOOL			GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow,
+diff --git sc/inc/queryparam.hxx sc/inc/queryparam.hxx
+index bc50237..01ddffb 100644
+--- sc/inc/queryparam.hxx
++++ sc/inc/queryparam.hxx
+@@ -86,6 +86,8 @@ struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamT
+     SCTAB           nDestTab;
+     SCCOL           nDestCol;
+     SCROW           nDestRow;
++    SCROW           nDynamicEndRow;
++    bool            bUseDynamicRange;
+ 
+     ScQueryParam();
+     ScQueryParam( const ScQueryParam& r );
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index 3659381..89f505e 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -379,7 +379,7 @@ public:
+                         SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow );
+ 
+     void		GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
+-                                BOOL bIncludeOld );
++                             BOOL bIncludeOld ) const;
+ 
+     SCSIZE	    GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
+                                         SCCOL nEndCol, SCROW nEndRow, ScDirection eDir );
+diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
+index caeb5b1..396d54c 100644
+--- sc/source/core/data/documen3.cxx
++++ sc/source/core/data/documen3.cxx
+@@ -1255,6 +1255,18 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
+     //return FALSE;
+ }
+ 
++void ScDocument::UpdateDynamicEndRow(ScDBData& rDBData) const
++{
++    SCCOL nCol1, nCol2;
++    SCROW nRow1, nRow2;
++    SCTAB nTab;
++    rDBData.GetArea(nTab, nCol1, nRow1, nCol2, nRow2);
++    SCCOL nCol1a = nCol1, nCol2a = nCol2;
++    SCROW nRow1a = nRow1, nRow2a = nRow2;
++    GetDataArea(nTab, nCol1a, nRow1a, nCol2a, nRow2a, false);
++    rDBData.SetDynamicEndRow(nRow2a);
++}
++
+ //
+ //	GetFilterEntries - Eintraege fuer AutoFilter-Listbox
+ //
+@@ -1267,6 +1279,7 @@ BOOL ScDocument::GetFilterEntries(
+         ScDBData* pDBData = pDBCollection->GetDBAtCursor(nCol, nRow, nTab, FALSE);	//!??
+         if (pDBData)
+         {
++            UpdateDynamicEndRow(*pDBData);
+             SCTAB nAreaTab;
+             SCCOL nStartCol;
+             SCROW nStartRow;
+@@ -1278,6 +1291,7 @@ BOOL ScDocument::GetFilterEntries(
+ 
+             ScQueryParam aParam;
+             pDBData->GetQueryParam( aParam );
++            nEndRow = aParam.nDynamicEndRow;
+             rStrings.SetCaseSensitive( aParam.bCaseSens );
+ 
+             // return all filter entries, if a filter condition is connected with a boolean OR
+diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
+index 3d61f28..187199f 100644
+--- sc/source/core/data/document.cxx
++++ sc/source/core/data/document.cxx
+@@ -663,7 +663,7 @@ bool ScDocument::ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow
+ //	zusammenhaengender Bereich
+ 
+ void ScDocument::GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
+-                                SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld )
++                              SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld ) const
+ {
+     if (VALIDTAB(nTab))
+         if (pTab[nTab])
+diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx
+index 15db733..10b8cda 100644
+--- sc/source/core/data/table1.cxx
++++ sc/source/core/data/table1.cxx
+@@ -680,7 +680,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
+ }
+ 
+ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
+-                            BOOL bIncludeOld )
++                           BOOL bIncludeOld ) const
+ {
+     BOOL bLeft       = FALSE;
+     BOOL bRight  = FALSE;
+diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx
+index 986755a..2ecc8c1 100644
+--- sc/source/core/data/table3.cxx
++++ sc/source/core/data/table3.cxx
+@@ -1617,6 +1617,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
+     BOOL* pSpecial = new BOOL[nEntryCount];
+     lcl_PrepareQuery( pDocument, this, aParam, pSpecial );
+ 
++    SCROW nEndRow = aParam.bUseDynamicRange ? aParam.nDynamicEndRow : aParam.nRow2;
+     if (!aParam.bInplace)
+     {
+         nOutRow = aParam.nDestRow + nHeader;
+@@ -1625,7 +1626,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
+                             aParam.nDestCol, aParam.nDestRow, aParam.nDestTab );
+     }
+ 
+-    for (SCROW j=aParam.nRow1 + nHeader; j<=aParam.nRow2; j++)
++    for (SCROW j=aParam.nRow1 + nHeader; j<=nEndRow; j++)
+     {
+         BOOL bResult;									// Filterergebnis
+         BOOL bValid = ValidQuery(j, aParam, pSpecial);
+diff --git sc/source/core/tool/dbcolect.cxx sc/source/core/tool/dbcolect.cxx
+index 4f0e755..5fae4bd 100644
+--- sc/source/core/tool/dbcolect.cxx
++++ sc/source/core/tool/dbcolect.cxx
+@@ -381,18 +381,20 @@ String ScDBData::GetOperations() const
+     return aVal;
+ }
+ 
+-void ScDBData::GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2) const
++void ScDBData::GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2, 
++                       bool bUseDynamicRange) const
+ {
+     rTab  = nTable;
+     rCol1 = nStartCol;
+     rRow1 = nStartRow;
+     rCol2 = nEndCol;
+-    rRow2 = nEndRow;
++    rRow2 = bUseDynamicRange ? nDynamicEndRow : nEndRow;
+ }
+ 
+-void ScDBData::GetArea(ScRange& rRange) const
++void ScDBData::GetArea(ScRange& rRange, bool bUseDynamicRange) const
+ {
+-    rRange = ScRange( nStartCol,nStartRow,nTable, nEndCol,nEndRow,nTable );
++    SCROW nNewEndRow = bUseDynamicRange ? nDynamicEndRow : nEndRow;
++    rRange = ScRange( nStartCol, nStartRow, nTable, nEndCol, nNewEndRow, nTable );
+ }
+ 
+ void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2)
+@@ -404,6 +406,11 @@ void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
+     nEndRow   = nRow2;
+ }
+ 
++void ScDBData::SetDynamicEndRow(SCROW nRow)
++{
++    nDynamicEndRow = nRow;
++}
++
+ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2)
+ {
+     USHORT i;
+@@ -511,6 +518,7 @@ void ScDBData::GetQueryParam( ScQueryParam& rQueryParam ) const
+     rQueryParam.nDestTab = nQueryDestTab;
+     rQueryParam.nDestCol = nQueryDestCol;
+     rQueryParam.nDestRow = nQueryDestRow;
++    rQueryParam.nDynamicEndRow = nDynamicEndRow;
+ 
+     rQueryParam.Resize( MAXQUERY );
+     for (SCSIZE i=0; i<MAXQUERY; i++)
+diff --git sc/source/core/tool/queryparam.cxx sc/source/core/tool/queryparam.cxx
+index d9d477d..0593534 100644
+--- sc/source/core/tool/queryparam.cxx
++++ sc/source/core/tool/queryparam.cxx
+@@ -177,7 +177,8 @@ ScQueryParam::ScQueryParam() :
+ ScQueryParam::ScQueryParam( const ScQueryParam& r ) :
+     ScQueryParamBase(r),
+     ScQueryParamTable(r),
+-    bDestPers(r.bDestPers), nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow)
++    bDestPers(r.bDestPers), nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow),
++    nDynamicEndRow(r.nDynamicEndRow), bUseDynamicRange(r.bUseDynamicRange)
+ {
+ }
+ 
+@@ -187,7 +188,9 @@ ScQueryParam::ScQueryParam( const ScDBQueryParamInternal& r ) :
+     bDestPers(true),
+     nDestTab(0),
+     nDestCol(0),
+-    nDestRow(0)
++    nDestRow(0),
++    nDynamicEndRow(0),
++    bUseDynamicRange(false)
+ {
+ }
+     
+@@ -221,6 +224,8 @@ void ScQueryParam::ClearDestParams()
+     nDestTab = 0;
+     nDestCol = 0;
+     nDestRow = 0;
++    nDynamicEndRow = 0;
++    bUseDynamicRange = false;
+ }
+ 
+ //------------------------------------------------------------------------
+@@ -243,6 +248,8 @@ ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
+     bDuplicate  = r.bDuplicate;
+     bByRow      = r.bByRow;
+     bDestPers   = r.bDestPers;
++    nDynamicEndRow = r.nDynamicEndRow;
++    bUseDynamicRange = r.bUseDynamicRange;
+ 
+     maEntries = r.maEntries;
+ 
+@@ -281,7 +288,9 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
+         && (bDestPers   == rOther.bDestPers)
+         && (nDestTab    == rOther.nDestTab)
+         && (nDestCol    == rOther.nDestCol)
+-        && (nDestRow    == rOther.nDestRow) )
++        && (nDestRow    == rOther.nDestRow)
++        && (nDynamicEndRow == rOther.nDynamicEndRow)
++        && (bUseDynamicRange == rOther.bUseDynamicRange) )
+     {
+         bEqual = TRUE;
+         for ( SCSIZE i=0; i<nUsed && bEqual; i++ )
+@@ -305,6 +314,7 @@ void ScQueryParam::MoveToDest()
+         nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );
+         nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );
+         nTab  = sal::static_int_cast<SCTAB>( nTab  + nDifZ );
++        nDynamicEndRow = sal::static_int_cast<SCROW>( nDynamicEndRow + nDifY );
+         size_t n = maEntries.size();
+         for (size_t i=0; i<n; i++)
+             maEntries[i].nField += nDifX;
+diff --git sc/source/ui/dbgui/filtdlg.cxx sc/source/ui/dbgui/filtdlg.cxx
+index 4f56adb..51fe845 100644
+--- sc/source/ui/dbgui/filtdlg.cxx
++++ sc/source/ui/dbgui/filtdlg.cxx
+@@ -454,7 +454,7 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
+                 USHORT nOffset = GetSliderPos();
+                 SCTAB nTab		 = nSrcTab;
+                 SCROW nFirstRow = theQueryData.nRow1;
+-                SCROW nLastRow	 = theQueryData.nRow2;
++                SCROW nLastRow   = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2;
+                 mbHasDates[nOffset+nList-1] = false;
+ 
+                 //	erstmal ohne die erste Zeile
+diff --git sc/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
+index 91834e1..097202b 100644
+--- sc/source/ui/inc/dbfunc.hxx
++++ sc/source/ui/inc/dbfunc.hxx
+@@ -80,7 +80,7 @@ public:
+     void			GotoDBArea( const String& rDBName );
+ 
+                     // DB-Bereich vom Cursor
+-	ScDBData* 		GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE, bool bShrinkToData = false );
++	ScDBData* 		GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE, bool bShrinkToData = false, bool bExpandRows = false );
+ 
+     void			NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList );
+ 
+diff --git sc/source/ui/view/dbfunc.cxx sc/source/ui/view/dbfunc.cxx
+index 05dce54..e78581a 100644
+--- sc/source/ui/view/dbfunc.cxx
++++ sc/source/ui/view/dbfunc.cxx
+@@ -107,7 +107,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
+ 
+ //	aktuellen Datenbereich fuer Sortieren / Filtern suchen
+ 
+-ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, bool bShrinkToData )
++ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, bool bShrinkToData, bool bExpandRows )
+ {
+     ScDocShell* pDocSh = GetViewData()->GetDocShell();
+     ScDBData* pData = NULL;
+@@ -136,11 +136,20 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, bool bShrinkToData
+                     ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(),
+                              GetViewData()->GetTabNo() ),
+                     eMode, FALSE );
++    if (!pData)
++        return NULL;
+ 
+-    if ( pData && bMark )
++    if (bExpandRows)
++    {
++        // Dynamically expand rows to include any new data rows that are
++        // immediately below the original range.
++        GetViewData()->GetDocument()->UpdateDynamicEndRow(*pData);
++    }
++
++    if (bMark)
+     {
+         ScRange aFound;
+-        pData->GetArea(aFound);
++        pData->GetArea(aFound, bExpandRows);
+         MarkRange( aFound, FALSE );
+     }
+     return pData;
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index 6e0280a..57f1996 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -1276,6 +1276,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
+                     pViewData->GetViewShell()->UpdateInputHandler();
+                 }
+ 
++                aParam.bUseDynamicRange = true;
+                 pViewData->GetView()->Query( aParam, NULL, TRUE );
+                 pDBData->SetQueryParam( aParam );							// speichern
+             }
+diff --git sc/source/ui/view/tabvwshc.cxx sc/source/ui/view/tabvwshc.cxx
+index 968984d..499c2a0 100644
+--- sc/source/ui/view/tabvwshc.cxx
++++ sc/source/ui/view/tabvwshc.cxx
+@@ -178,8 +178,9 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
+                                      SCITEM_QUERYDATA,
+                                      SCITEM_QUERYDATA );
+ 
+-            ScDBData* pDBData = GetDBData();
++            ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, true);
+             pDBData->GetQueryParam( aQueryParam );
++            aQueryParam.bUseDynamicRange = true;
+ 
+             ScQueryItem aItem( SCITEM_QUERYDATA, GetViewData(), &aQueryParam );
+             ScRange aAdvSource;
+@@ -203,8 +204,9 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
+                                      SCITEM_QUERYDATA,
+                                      SCITEM_QUERYDATA );
+ 
+-            ScDBData* pDBData = GetDBData();
++            ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, true);
+             pDBData->GetQueryParam( aQueryParam );
++            aQueryParam.bUseDynamicRange = true;
+ 
+             aArgSet.Put( ScQueryItem( SCITEM_QUERYDATA,
+                                       GetViewData(),
diff --git a/applied_patches/0145-sc-cellbackground-over-gridlines.diff b/applied_patches/0143-sc-cellbackground-over-gridlines.diff
similarity index 100%
rename from applied_patches/0145-sc-cellbackground-over-gridlines.diff
rename to applied_patches/0143-sc-cellbackground-over-gridlines.diff
diff --git a/applied_patches/0146-sc-cellformat-icon-toggle.diff b/applied_patches/0144-sc-cellformat-icon-toggle.diff
similarity index 100%
rename from applied_patches/0146-sc-cellformat-icon-toggle.diff
rename to applied_patches/0144-sc-cellformat-icon-toggle.diff
diff --git a/applied_patches/0144-sc-dbrange-dynamic-resize.diff b/applied_patches/0144-sc-dbrange-dynamic-resize.diff
deleted file mode 100644
index bf74d4e9b..000000000
--- a/applied_patches/0144-sc-dbrange-dynamic-resize.diff
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git sc/inc/dbcolect.hxx sc/inc/dbcolect.hxx
-index 73b4c3e..021a1e0 100644
---- sc/inc/dbcolect.hxx
-+++ sc/inc/dbcolect.hxx
-@@ -96,6 +96,7 @@ private:
-     ScQueryConnect  eQueryConnect[MAXQUERY];
-     BOOL			bIsAdvanced;		// TRUE if created by advanced filter
-     ScRange			aAdvSource;			// source range
-+    SCROW           nDynamicEndRow;
-     // SubTotalParam
-     BOOL			bSubRemoveOnly;
-     BOOL			bSubReplace;
-@@ -143,9 +144,10 @@ public:
-             const String& GetName() const				{ return aName; }
-             void		GetName(String& rName) const	{ rName = aName; }
-             void		SetName(const String& rName)	{ aName = rName; }
--			void		GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2) const;
--			SC_DLLPUBLIC void		GetArea(ScRange& rRange) const;
-+			void		GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2, bool bUseDynamicRange = false) const;
-+			SC_DLLPUBLIC void		GetArea(ScRange& rRange, bool bUseDynamicRange = false) const;
-             void		SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
-+            void        SetDynamicEndRow(SCROW nRow);
-             void		MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
-             BOOL		IsByRow() const 				{ return bByRow; }
-             void		SetByRow(BOOL bByR) 			{ bByRow = bByR; }
-diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 3675b1b..14c1ddc 100644
---- sc/inc/document.hxx
-+++ sc/inc/document.hxx
-@@ -858,7 +858,7 @@ public:
-     USHORT			GetErrCode( const ScAddress& ) const;
- 
-     void			GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
--									SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld );
-+									SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld ) const;
-     SC_DLLPUBLIC BOOL			GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
-     SC_DLLPUBLIC BOOL			GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
-     SC_DLLPUBLIC BOOL			GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
-@@ -1377,6 +1377,9 @@ public:
-                                         SCTAB nTab, ScQueryParam& rQueryParam );
-     void 			GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr);
- 
-+    /** Update the dynamic end row position of a current data area. */
-+    void            UpdateDynamicEndRow(ScDBData& rDBData) const;
-+
-     BOOL			GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
-                                 bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates);
-     SC_DLLPUBLIC BOOL			GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow,
-diff --git sc/inc/global.hxx sc/inc/global.hxx
-index 4892a3e..05fbc13 100644
---- sc/inc/global.hxx
-+++ sc/inc/global.hxx
-@@ -837,6 +837,8 @@ struct SC_DLLPUBLIC ScQueryParam
-     SCTAB			nDestTab;
-     SCCOL			nDestCol;
-     SCROW			nDestRow;
-+    SCROW           nDynamicEndRow;
-+    bool            bUseDynamicRange;
- 
- private:
-     SCSIZE			nEntryCount;
-diff --git sc/inc/table.hxx sc/inc/table.hxx
-index 2b4017b..d754363 100644
---- sc/inc/table.hxx
-+++ sc/inc/table.hxx
-@@ -347,11 +347,10 @@ public:
-                         SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow );
- 
-     void		GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
--								BOOL bIncludeOld );
-+								BOOL bIncludeOld ) const;
- 
-     SCSIZE	    GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
-                                         SCCOL nEndCol, SCROW nEndRow, ScDirection eDir );
--
-     void		FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY );
-     void		GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
-                                 BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark );
---- sc/source/core/data/documen3.cxx
-+++ sc/source/core/data/documen3.cxx
-@@ -1290,14 +1290,24 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
- 	//if (VALIDTAB(nTab))
- 	//	if (pTab[nTab])
- 	//		return pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow );
--
- 	//return FALSE;
- }
- 
-+void ScDocument::UpdateDynamicEndRow(ScDBData& rDBData) const
-+{
-+    SCCOL nCol1, nCol2;
-+    SCROW nRow1, nRow2;
-+    SCTAB nTab;
-+    rDBData.GetArea(nTab, nCol1, nRow1, nCol2, nRow2);
-+    SCCOL nCol1a = nCol1, nCol2a = nCol2;
-+    SCROW nRow1a = nRow1, nRow2a = nRow2;
-+    GetDataArea(nTab, nCol1a, nRow1a, nCol2a, nRow2a, false);
-+    rDBData.SetDynamicEndRow(nRow2a);
-+}
-+
- //
- //	GetFilterEntries - Eintraege fuer AutoFilter-Listbox
- //
--
- BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScStrCollection& rStrings, bool bFilter )
- {
- 	if ( ValidTab(nTab) && pTab[nTab] && pDBCollection )
-@@ -1306,6 +1316,7 @@ BOOL ScDocument::GetFilterEntries(
-         ScDBData* pDBData = pDBCollection->GetDBAtCursor(nCol, nRow, nTab, FALSE);	//!??
-         if (pDBData)
-         {
-+            UpdateDynamicEndRow(*pDBData);
-             SCTAB nAreaTab;
-             SCCOL nStartCol;
-             SCROW nStartRow;
-@@ -1317,6 +1328,7 @@ BOOL ScDocument::GetFilterEntries(
- 
-             ScQueryParam aParam;
-             pDBData->GetQueryParam( aParam );
-+            nEndRow = aParam.nDynamicEndRow;
-             rStrings.SetCaseSensitive( aParam.bCaseSens );
- 
-             // return all filter entries, if a filter condition is connected with a boolean OR
-diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index d08a3c0..f43ec20 100644
---- sc/source/core/data/document.cxx
-+++ sc/source/core/data/document.cxx
-@@ -601,7 +601,7 @@ BOOL ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) cons
- //	zusammenhaengender Bereich
- 
- void ScDocument::GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
--								SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld )
-+								SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld ) const
- {
-     if (VALIDTAB(nTab))
-         if (pTab[nTab])
-diff --git sc/source/core/data/global2.cxx sc/source/core/data/global2.cxx
-index 3b0d0f6..43740e8 100644
---- sc/source/core/data/global2.cxx
-+++ sc/source/core/data/global2.cxx
-@@ -261,7 +261,8 @@ ScQueryParam::ScQueryParam( const ScQueryParam& r ) :
-         bHasHeader(r.bHasHeader), bByRow(r.bByRow), bInplace(r.bInplace), bCaseSens(r.bCaseSens),
-         bRegExp(r.bRegExp), bMixedComparison(r.bMixedComparison),
-         bDuplicate(r.bDuplicate), bDestPers(r.bDestPers),
--		nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow)
-+		nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow),
-+        nDynamicEndRow(r.nDynamicEndRow), bUseDynamicRange(r.bUseDynamicRange)
- {
-     nEntryCount = 0;
- 
-@@ -287,6 +288,8 @@ void ScQueryParam::Clear()
-     nTab = SCTAB_MAX;
-     bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE;
-     bInplace = bByRow = bDuplicate = bDestPers = TRUE;
-+    nDynamicEndRow = 0;
-+    bUseDynamicRange = false;
- 
-     Resize( MAXQUERY );
-     for (USHORT i=0; i<MAXQUERY; i++)
-@@ -313,6 +316,8 @@ ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
-     bDuplicate	= r.bDuplicate;
-     bByRow		= r.bByRow;
-     bDestPers	= r.bDestPers;
-+    nDynamicEndRow = r.nDynamicEndRow;
-+    bUseDynamicRange = r.bUseDynamicRange;
- 
-     Resize( r.nEntryCount );
-     for (USHORT i=0; i<nEntryCount; i++)
-@@ -350,7 +355,9 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
-         && (bDestPers   == rOther.bDestPers)
-         && (nDestTab	== rOther.nDestTab)
-         && (nDestCol	== rOther.nDestCol)
--		&& (nDestRow	== rOther.nDestRow) )
-+		&& (nDestRow	== rOther.nDestRow)
-+        && (nDynamicEndRow == rOther.nDynamicEndRow)
-+        && (bUseDynamicRange == rOther.bUseDynamicRange) )
-     {
-         bEqual = TRUE;
-         for ( USHORT i=0; i<nUsed && bEqual; i++ )
-@@ -412,6 +419,7 @@ void ScQueryParam::MoveToDest()
-         nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );
-         nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );
-         nTab  = sal::static_int_cast<SCTAB>( nTab  + nDifZ );
-+        nDynamicEndRow = sal::static_int_cast<SCROW>( nDynamicEndRow + nDifY );
-         for (USHORT i=0; i<nEntryCount; i++)
-             pEntries[i].nField += nDifX;
- 
-diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx
-index fa6efb6..e0c3ff2 100644
---- sc/source/core/data/table1.cxx
-+++ sc/source/core/data/table1.cxx
-@@ -664,7 +664,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
- }
- 
- void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
--							BOOL bIncludeOld )
-+							BOOL bIncludeOld ) const
- {
-     BOOL bLeft       = FALSE;
-     BOOL bRight  = FALSE;
-diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx
-index fc5a6da..6f41234 100644
---- sc/source/core/data/table3.cxx
-+++ sc/source/core/data/table3.cxx
-@@ -1574,6 +1574,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
-     BOOL* pSpecial = new BOOL[nEntryCount];
-     lcl_PrepareQuery( pDocument, this, aParam, pSpecial );
- 
-+    SCROW nEndRow = aParam.bUseDynamicRange ? aParam.nDynamicEndRow : aParam.nRow2;
-     if (!aParam.bInplace)
-     {
-         nOutRow = aParam.nDestRow + nHeader;
-@@ -1582,7 +1583,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
-                             aParam.nDestCol, aParam.nDestRow, aParam.nDestTab );
-     }
- 
--	for (SCROW j=aParam.nRow1 + nHeader; j<=aParam.nRow2; j++)
-+	for (SCROW j=aParam.nRow1 + nHeader; j<=nEndRow; j++)
-     {
-         BOOL bResult;									// Filterergebnis
-         BOOL bValid = ValidQuery(j, aParam, pSpecial);
-diff --git sc/source/core/tool/dbcolect.cxx sc/source/core/tool/dbcolect.cxx
-index 1304c49..2627d87 100644
---- sc/source/core/tool/dbcolect.cxx
-+++ sc/source/core/tool/dbcolect.cxx
-@@ -380,18 +380,20 @@ String ScDBData::GetOperations() const
-     return aVal;
- }
- 
--void ScDBData::GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2) const
-+void ScDBData::GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2, 
-+                       bool bUseDynamicRange) const
- {
-     rTab  = nTable;
-     rCol1 = nStartCol;
-     rRow1 = nStartRow;
-     rCol2 = nEndCol;
--	rRow2 = nEndRow;
-+	rRow2 = bUseDynamicRange ? nDynamicEndRow : nEndRow;
- }
- 
--void ScDBData::GetArea(ScRange& rRange) const
-+void ScDBData::GetArea(ScRange& rRange, bool bUseDynamicRange) const
- {
--	rRange = ScRange( nStartCol,nStartRow,nTable, nEndCol,nEndRow,nTable );
-+    SCROW nNewEndRow = bUseDynamicRange ? nDynamicEndRow : nEndRow;
-+	rRange = ScRange( nStartCol, nStartRow, nTable, nEndCol, nNewEndRow, nTable );
- }
- 
- void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2)
-@@ -403,6 +405,11 @@ void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
-     nEndRow   = nRow2;
- }
- 
-+void ScDBData::SetDynamicEndRow(SCROW nRow)
-+{
-+    nDynamicEndRow = nRow;
-+}
-+
- void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2)
- {
-     USHORT i;
-@@ -510,6 +517,7 @@ void ScDBData::GetQueryParam( ScQueryParam& rQueryParam ) const
-     rQueryParam.nDestTab = nQueryDestTab;
-     rQueryParam.nDestCol = nQueryDestCol;
-     rQueryParam.nDestRow = nQueryDestRow;
-+    rQueryParam.nDynamicEndRow = nDynamicEndRow;
- 
-     rQueryParam.Resize( MAXQUERY );
-     for (SCSIZE i=0; i<MAXQUERY; i++)
---- sc/source/ui/dbgui/filtdlg.cxx
-+++ sc/source/ui/dbgui/filtdlg.cxx
-@@ -390,7 +390,8 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
- 			{
- 				SCTAB nTab		 = nSrcTab;
- 				SCROW nFirstRow = theQueryData.nRow1;
--				SCROW nLastRow	 = theQueryData.nRow2;
-+				SCROW nLastRow	 = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2;
-+				SCROW nLastRow	 = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2;
- 
- 				//	erstmal ohne die erste Zeile
- 
-diff --git sc/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
-index 814fc5f..f5e9ae4 100644
---- sc/source/ui/inc/dbfunc.hxx
-+++ sc/source/ui/inc/dbfunc.hxx
-@@ -80,7 +80,7 @@ public:
-     void			GotoDBArea( const String& rDBName );
- 
-                     // DB-Bereich vom Cursor
--	ScDBData* 		GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE );
-+    ScDBData* 		GetDBData( bool bMarkArea = true, ScGetDBMode eMode = SC_DB_MAKE, bool bExpandRows = false );
- 
-     void			NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList );
- 
-diff --git sc/source/ui/view/dbfunc.cxx sc/source/ui/view/dbfunc.cxx
-index ed25c8e..9a96e42 100644
---- sc/source/ui/view/dbfunc.cxx
-+++ sc/source/ui/view/dbfunc.cxx
-@@ -105,9 +105,10 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
-     }
- }
- 
-+
- //	aktuellen Datenbereich fuer Sortieren / Filtern suchen
- 
--ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode )
-+ScDBData* ScDBFunc::GetDBData( bool bMark, ScGetDBMode eMode, bool bExpandRows )
- {
-     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-     ScDBData* pData = NULL;
-@@ -119,11 +120,20 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode )
-                     ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(),
-                              GetViewData()->GetTabNo() ),
-                     eMode, FALSE );
-+    if (!pData)
-+        return NULL;
-+
-+    if (bExpandRows)
-+    {
-+        // Dynamically expand rows to include any new data rows that are
-+        // immediately below the original range.
-+        GetViewData()->GetDocument()->UpdateDynamicEndRow(*pData);
-+    }
- 
--	if ( pData && bMark )
-+    if (bMark)
-     {
-         ScRange aFound;
--		pData->GetArea(aFound);
-+		pData->GetArea(aFound, bExpandRows);
-         MarkRange( aFound, FALSE );
-     }
-     return pData;
-diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
-index 439f98d..b56189d 100644
---- sc/source/ui/view/gridwin.cxx
-+++ sc/source/ui/view/gridwin.cxx
-@@ -1198,6 +1198,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
-                     pViewData->GetViewShell()->UpdateInputHandler();
-                 }
- 
-+                aParam.bUseDynamicRange = true;
-                 pViewData->GetView()->Query( aParam, NULL, TRUE );
-                 pDBData->SetQueryParam( aParam );							// speichern
-             }
-diff --git sc/source/ui/view/tabvwshc.cxx sc/source/ui/view/tabvwshc.cxx
-index 5e61e4e..0312ded 100644
---- sc/source/ui/view/tabvwshc.cxx
-+++ sc/source/ui/view/tabvwshc.cxx
-@@ -178,8 +178,9 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
-                                      SCITEM_QUERYDATA,
-                                      SCITEM_QUERYDATA );
- 
--			ScDBData* pDBData = GetDBData();
-+            ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, true);
-             pDBData->GetQueryParam( aQueryParam );
-+            aQueryParam.bUseDynamicRange = true;
- 
-             ScQueryItem aItem( SCITEM_QUERYDATA, GetViewData(), &aQueryParam );
-             ScRange aAdvSource;
-@@ -203,8 +204,9 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
-                                      SCITEM_QUERYDATA,
-                                      SCITEM_QUERYDATA );
- 
--			ScDBData* pDBData = GetDBData();
-+            ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, true);
-             pDBData->GetQueryParam( aQueryParam );
-+            aQueryParam.bUseDynamicRange = true;
- 
-             aArgSet.Put( ScQueryItem( SCITEM_QUERYDATA,
-                                       GetViewData(),
diff --git a/applied_patches/0147-sc-fit-to-width-height-skip-breaks.diff b/applied_patches/0145-sc-fit-to-width-height-skip-breaks.diff
similarity index 100%
rename from applied_patches/0147-sc-fit-to-width-height-skip-breaks.diff
rename to applied_patches/0145-sc-fit-to-width-height-skip-breaks.diff
diff --git a/applied_patches/0148-chart-skip-hidden-cells-sc-fix.diff b/applied_patches/0146-chart-skip-hidden-cells-sc-fix.diff
similarity index 100%
rename from applied_patches/0148-chart-skip-hidden-cells-sc-fix.diff
rename to applied_patches/0146-chart-skip-hidden-cells-sc-fix.diff
diff --git a/applied_patches/0151-calc-filter-xml-free-context.diff b/applied_patches/0147-calc-filter-xml-free-context.diff
similarity index 100%
rename from applied_patches/0151-calc-filter-xml-free-context.diff
rename to applied_patches/0147-calc-filter-xml-free-context.diff
diff --git a/applied_patches/0152-calc-status-bar-func.diff b/applied_patches/0148-calc-status-bar-func.diff
similarity index 100%
rename from applied_patches/0152-calc-status-bar-func.diff
rename to applied_patches/0148-calc-status-bar-func.diff
diff --git a/applied_patches/0149-calc-dp-default-new-sheet.diff b/applied_patches/0149-calc-dp-default-new-sheet.diff
new file mode 100644
index 000000000..205432522
--- /dev/null
+++ b/applied_patches/0149-calc-dp-default-new-sheet.diff
@@ -0,0 +1,121 @@
+diff --git sc/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
+index 99897a0..4dee615 100644
+--- sc/source/ui/dbgui/pvlaydlg.cxx
++++ sc/source/ui/dbgui/pvlaydlg.cxx
+@@ -107,7 +107,7 @@ PointerStyle lclGetPointerForField( ScDPFieldType eType )
+ //----------------------------------------------------------------------------
+ 
+ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
+-                                    const ScDPObject& rDPObject )
++                                    const ScDPObject& rDPObject, bool bNewOutput )
+ 	:	ScAnyRefDlg	( pB, pCW, pParent, RID_SCDLG_PIVOT_LAYOUT ),
+         aFlLayout       ( this, ScResId( FL_LAYOUT ) ),
+         aFtPage         ( this, ScResId( FT_PAGE ) ),
+@@ -167,7 +167,7 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
+     xDlgDPObject->FillOldParam( thePivotData, FALSE );
+     xDlgDPObject->FillLabelData( thePivotData );
+ 
+-	Init();
++	Init(bNewOutput);
+ 	FreeResource();
+ }
+ 
+@@ -202,7 +202,7 @@ ScDPFieldWindow& ScDPLayoutDlg::GetFieldWindow( ScDPFieldType eType )
+     return aWndSelect;
+ }
+ 
+-void __EXPORT ScDPLayoutDlg::Init()
++void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput)
+ {
+ 	DBG_ASSERT( pViewData && pDoc,
+ 				"Ctor-Initialisierung fehlgeschlagen!" );
+@@ -302,21 +302,33 @@ void __EXPORT ScDPLayoutDlg::Init()
+ 			}
+ 		}
+ 	}
++    
++    if (bNewOutput)
++    {
++        // Output to a new sheet by default for a brand-new output.
++        aLbOutPos.SelectEntryPos(1);
++        aEdOutPos.Disable();
++        aRbOutPos.Disable();
++    }
++    else
++    {
++        // Modifying an existing dp output.
+ 
+-	if ( thePivotData.nTab != MAXTAB+1 )
+-	{
+-		String aStr;
+-		ScAddress( thePivotData.nCol,
+-				   thePivotData.nRow,
+-				   thePivotData.nTab ).Format( aStr, STD_FORMAT, pDoc, pDoc->GetAddressConvention() );
+-		aEdOutPos.SetText( aStr );
+-		EdModifyHdl(0);
+-	}
+-	else
+-	{
+-		aLbOutPos.SelectEntryPos( aLbOutPos.GetEntryCount()-1 );
+-		SelAreaHdl(NULL);
+-	}
++        if ( thePivotData.nTab != MAXTAB+1 )
++        {
++            String aStr;
++            ScAddress( thePivotData.nCol,
++                       thePivotData.nRow,
++                       thePivotData.nTab ).Format( aStr, STD_FORMAT, pDoc, pDoc->GetAddressConvention() );
++            aEdOutPos.SetText( aStr );
++            EdModifyHdl(0);
++        }
++        else
++        {
++            aLbOutPos.SelectEntryPos( aLbOutPos.GetEntryCount()-1 );
++            SelAreaHdl(NULL);
++        }
++    }
+ 
+ 	aBtnIgnEmptyRows.Check( thePivotData.bIgnoreEmptyRows );
+ 	aBtnDetectCat   .Check( thePivotData.bDetectCategories );
+diff --git sc/source/ui/inc/pvlaydlg.hxx sc/source/ui/inc/pvlaydlg.hxx
+index ceebdb7..a3e08cb 100644
+--- sc/source/ui/inc/pvlaydlg.hxx
++++ sc/source/ui/inc/pvlaydlg.hxx
+@@ -89,7 +89,8 @@ public:
+                                 SfxBindings* pB,
+                                 SfxChildWindow* pCW,
+                                 Window* pParent,
+-                                const ScDPObject& rDPObject );
++                                const ScDPObject& rDPObject,
++                                bool bNewOutput );
+     virtual                 ~ScDPLayoutDlg();
+ 
+     virtual void            SetReference( const ScRange& rRef, ScDocument* pDoc );
+@@ -190,7 +191,7 @@ private:
+ 
+ private:
+     ScDPFieldWindow&        GetFieldWindow  ( ScDPFieldType eType );
+-    void                    Init            ();
++    void                    Init            (bool bNewOutput);
+     void                    InitWndSelect   ( const ::std::vector<ScDPLabelDataRef>& rLabels );
+     void                    InitWnd         ( PivotField* pArr, long nCount, ScDPFieldType eType );
+     void                    InitFocus       ();
+diff --git sc/source/ui/view/tabvwshc.cxx sc/source/ui/view/tabvwshc.cxx
+index aa38b7a..b20876f 100644
+--- sc/source/ui/view/tabvwshc.cxx
++++ sc/source/ui/view/tabvwshc.cxx
+@@ -255,8 +255,13 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
+ 
+             if( pDialogDPObject )
+             {
++                // Check for an existing datapilot output.
++                ScViewData* pViewData = GetViewData();
++                ScDPObject* pObj = GetViewData()->GetDocument()->GetDPAtCursor(
++                    pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo());
++
+                 GetViewData()->SetRefTabNo( GetViewData()->GetTabNo() );
+-                pResult = new ScDPLayoutDlg( pB, pCW, pParent, *pDialogDPObject );
++                pResult = new ScDPLayoutDlg( pB, pCW, pParent, *pDialogDPObject, pObj == NULL);
+             }
+ 		}
+ 		break;
diff --git a/applied_patches/0149-chart-axis-multi-chart-types-chart2.diff b/applied_patches/0149-chart-axis-multi-chart-types-chart2.diff
deleted file mode 100644
index 8ccd9cf78..000000000
--- a/applied_patches/0149-chart-axis-multi-chart-types-chart2.diff
+++ /dev/null
@@ -1,617 +0,0 @@
-diff --git chart2/source/model/template/AreaChartType.cxx chart2/source/model/template/AreaChartType.cxx
-index db529a7..3a562f0 100644
---- chart2/source/model/template/AreaChartType.cxx
-+++ chart2/source/model/template/AreaChartType.cxx
-@@ -33,8 +33,72 @@
- #include "AreaChartType.hxx"
- #include "macros.hxx"
- #include "servicenames_charttypes.hxx"
-+#include "PropertyHelper.hxx"
-+#include "ContainerHelper.hxx"
-+
-+#include <com/sun/star/beans/PropertyAttribute.hpp>
- 
- using namespace ::com::sun::star;
-+using ::com::sun::star::beans::Property;
-+using ::com::sun::star::uno::Sequence;
-+
-+namespace
-+{
-+
-+enum
-+{
-+    PROP_AREACHARTTYPE_STACKED,
-+    PROP_AREACHARTTYPE_PERCENT
-+};
-+
-+void lcl_AddPropertiesToVector(
-+    ::std::vector< Property > & rOutProperties )
-+{
-+    rOutProperties.push_back(
-+        Property( C2U( "Stacked" ),
-+                  PROP_AREACHARTTYPE_STACKED,
-+                  ::getBooleanCppuType(),
-+                  beans::PropertyAttribute::BOUND
-+                  | beans::PropertyAttribute::MAYBEDEFAULT ));
-+    rOutProperties.push_back(
-+        Property( C2U( "Percent" ),
-+                  PROP_AREACHARTTYPE_PERCENT,
-+                  ::getBooleanCppuType(),
-+                  beans::PropertyAttribute::BOUND
-+                  | beans::PropertyAttribute::MAYBEDEFAULT ));
-+}
-+
-+void lcl_AddDefaultsToMap(
-+    ::chart::tPropertyValueMap & rOutMap )
-+{
-+    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AREACHARTTYPE_STACKED, false );
-+    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AREACHARTTYPE_PERCENT, false );
-+}
-+
-+const Sequence< Property > & lcl_GetPropertySequence()
-+{
-+    static Sequence< Property > aPropSeq;
-+
-+    // /--
-+    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-+    if( 0 == aPropSeq.getLength() )
-+    {
-+        // get properties
-+        ::std::vector< ::com::sun::star::beans::Property > aProperties;
-+        lcl_AddPropertiesToVector( aProperties );
-+
-+        // and sort them for access via bsearch
-+        ::std::sort( aProperties.begin(), aProperties.end(),
-+                     ::chart::PropertyNameLess() );
-+
-+        // transfer result to static Sequence
-+        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
-+    }
-+
-+    return aPropSeq;
-+}
-+
-+} // anonymous namespace
- 
- namespace chart
- {
-@@ -65,6 +129,56 @@ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone()
-     return CHART2_SERVICE_NAME_CHARTTYPE_AREA;
- }
- 
-+// ____ OPropertySet ____
-+uno::Any AreaChartType::GetDefaultValue( sal_Int32 nHandle ) const
-+    throw(beans::UnknownPropertyException)
-+{
-+    static tPropertyValueMap aStaticDefaults;
-+
-+    // /--
-+    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-+    if( 0 == aStaticDefaults.size() )
-+    {
-+        // initialize defaults
-+        lcl_AddDefaultsToMap( aStaticDefaults );
-+    }
-+
-+    tPropertyValueMap::const_iterator aFound(
-+        aStaticDefaults.find( nHandle ));
-+
-+    if( aFound == aStaticDefaults.end())
-+        return uno::Any();
-+
-+    return (*aFound).second;
-+    // \--
-+}
-+
-+::cppu::IPropertyArrayHelper & SAL_CALL AreaChartType::getInfoHelper()
-+{
-+    static ::cppu::OPropertyArrayHelper aArrayHelper( lcl_GetPropertySequence(),
-+                                                      /* bSorted = */ sal_True );
-+
-+    return aArrayHelper;
-+}
-+
-+// ____ XPropertySet ____
-+uno::Reference< beans::XPropertySetInfo > SAL_CALL AreaChartType::getPropertySetInfo()
-+    throw (uno::RuntimeException)
-+{
-+    static uno::Reference< beans::XPropertySetInfo > xInfo;
-+
-+    // /--
-+    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-+    if( !xInfo.is())
-+    {
-+        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-+            getInfoHelper());
-+    }
-+
-+    return xInfo;
-+    // \--
-+}
-+
- uno::Sequence< ::rtl::OUString > AreaChartType::getSupportedServiceNames_Static()
- {
-     uno::Sequence< ::rtl::OUString > aServices( 2 );
-diff --git chart2/source/model/template/AreaChartType.hxx chart2/source/model/template/AreaChartType.hxx
-index 6b619b2..778f936 100644
---- chart2/source/model/template/AreaChartType.hxx
-+++ chart2/source/model/template/AreaChartType.hxx
-@@ -56,6 +56,16 @@ protected:
-     virtual ::rtl::OUString SAL_CALL getChartType()
-         throw (::com::sun::star::uno::RuntimeException);
- 
-+    // ____ OPropertySet ____
-+    virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-+        throw(::com::sun::star::beans::UnknownPropertyException);
-+    virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-+
-+    // ____ XPropertySet ____
-+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
-+        getPropertySetInfo()
-+        throw (::com::sun::star::uno::RuntimeException);
-+
-     // ____ XCloneable ____
-     virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
-         throw (::com::sun::star::uno::RuntimeException);
-diff --git chart2/source/model/template/AreaChartTypeTemplate.cxx chart2/source/model/template/AreaChartTypeTemplate.cxx
-index 98874ef..f7d24a5 100644
---- chart2/source/model/template/AreaChartTypeTemplate.cxx
-+++ chart2/source/model/template/AreaChartTypeTemplate.cxx
-@@ -48,6 +48,8 @@ using ::com::sun::star::beans::Property;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::Any;
-+using ::com::sun::star::uno::UNO_QUERY;
-+using ::com::sun::star::uno::UNO_QUERY_THROW;
- using ::osl::MutexGuard;
- 
- namespace
-@@ -275,6 +277,7 @@ Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForN
- {
-     Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
-     ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult );    
-+    setStackModePropertiesToChartType(xResult);
-     return xResult;
- }
- 
-diff --git chart2/source/model/template/BarChartTypeTemplate.cxx chart2/source/model/template/BarChartTypeTemplate.cxx
-index e6382d5..0e5904d 100644
---- chart2/source/model/template/BarChartTypeTemplate.cxx
-+++ chart2/source/model/template/BarChartTypeTemplate.cxx
-@@ -221,6 +221,7 @@ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNe
- {
-     Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
-     ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult );    
-+    setStackModePropertiesToChartType(xResult);
-     return xResult;
- }
- 
-diff --git chart2/source/model/template/ChartTypeTemplate.cxx chart2/source/model/template/ChartTypeTemplate.cxx
-index 3e9be6e..2b7aa35 100644
---- chart2/source/model/template/ChartTypeTemplate.cxx
-+++ chart2/source/model/template/ChartTypeTemplate.cxx
-@@ -63,6 +63,7 @@ using ::rtl::OUString;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::Any;
-+using ::com::sun::star::uno::UNO_QUERY;
- 
- // ======================================================================
- 
-@@ -968,6 +969,48 @@ void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem(
-         comphelper::copyProperties( xSource, xDestination );
- }
- 
-+void ChartTypeTemplate::setStackModePropertiesToChartType(const Reference<XChartType>& xChartType)
-+{
-+    Reference<beans::XPropertySet> xPropSet(xChartType, UNO_QUERY);
-+    if (!xPropSet.is())
-+        return;
-+
-+    bool bStacked = false;
-+    bool bPercent = false;
-+    switch (getStackMode(0))
-+    {
-+        case StackMode_Y_STACKED:
-+            bStacked = true;
-+        break;
-+        case StackMode_Y_STACKED_PERCENT:
-+            bStacked = true;
-+            bPercent = true;
-+        break;
-+        case StackMode_Z_STACKED:
-+        break;
-+        default:
-+            ;
-+    }
-+
-+    try
-+    {
-+        xPropSet->setPropertyValue(
-+            C2U("Stacked"), uno::makeAny(static_cast<sal_Bool>(bStacked)));
-+    }
-+    catch (const beans::UnknownPropertyException&)
-+    {
-+    }
-+
-+    try
-+    {
-+        xPropSet->setPropertyValue(
-+            C2U("Percent"), uno::makeAny(static_cast<sal_Bool>(bPercent)));
-+    }
-+    catch (const beans::UnknownPropertyException&) 
-+    {
-+    }
-+}
-+
- // ________
- 
- Sequence< OUString > ChartTypeTemplate::getSupportedServiceNames_Static()
-diff --git chart2/source/model/template/ChartTypeTemplate.hxx chart2/source/model/template/ChartTypeTemplate.hxx
-index 47633ad..57d78d4 100644
---- chart2/source/model/template/ChartTypeTemplate.hxx
-+++ chart2/source/model/template/ChartTypeTemplate.hxx
-@@ -272,6 +272,11 @@ protected:
-                     const ::com::sun::star::uno::Reference<
-                           ::com::sun::star::chart2::XChartType > & xNewChartType );
- 
-+    void setStackModePropertiesToChartType(
-+        const ::com::sun::star::uno::Reference<
-+            ::com::sun::star::chart2::XChartType>& xChartType );
-+
-+
- protected:
-     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
-         m_xContext;
-diff --git chart2/source/model/template/ColumnChartType.cxx chart2/source/model/template/ColumnChartType.cxx
-index ed5aea8..a326aa4 100644
---- chart2/source/model/template/ColumnChartType.cxx
-+++ chart2/source/model/template/ColumnChartType.cxx
-@@ -49,7 +49,9 @@ namespace
- enum
- {
-     PROP_BARCHARTTYPE_OVERLAP_SEQUENCE,
--    PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE
-+    PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE,
-+    PROP_BARCHARTTYPE_STACKED,
-+    PROP_BARCHARTTYPE_PERCENT
- };
- 
- void lcl_AddPropertiesToVector(
-@@ -68,6 +70,19 @@ void lcl_AddPropertiesToVector(
-                   ::getCppuType( reinterpret_cast< const Sequence< sal_Int32 > * >(0)),
-                   beans::PropertyAttribute::BOUND
-                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-+
-+    rOutProperties.push_back(
-+        Property( C2U( "Stacked" ),
-+                  PROP_BARCHARTTYPE_STACKED,
-+                  ::getBooleanCppuType(),
-+                  beans::PropertyAttribute::BOUND
-+                  | beans::PropertyAttribute::MAYBEDEFAULT ));
-+    rOutProperties.push_back(
-+        Property( C2U( "Percent" ),
-+                  PROP_BARCHARTTYPE_PERCENT,
-+                  ::getBooleanCppuType(),
-+                  beans::PropertyAttribute::BOUND
-+                  | beans::PropertyAttribute::MAYBEDEFAULT ));
- }
- 
- void lcl_AddDefaultsToMap(
-@@ -80,6 +95,9 @@ void lcl_AddDefaultsToMap(
- 
-     aSeq[0] = aSeq[1] = 100;
-     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE, aSeq );
-+
-+    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_STACKED, false );
-+    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_PERCENT, false );
- }
- 
- const Sequence< Property > & lcl_GetPropertySequence()
-diff --git chart2/source/model/template/ColumnLineChartTypeTemplate.cxx chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
-index 54e7ea8..4d92176 100644
---- chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
-+++ chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
-@@ -410,6 +410,7 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew
-         ASSERT_EXCEPTION( ex );
-     }
- 
-+    setStackModePropertiesToChartType(xResult);
-     return xResult;
- }
- 
-diff --git chart2/source/model/template/LineChartType.cxx chart2/source/model/template/LineChartType.cxx
-index 05f6b43..274abb0 100644
---- chart2/source/model/template/LineChartType.cxx
-+++ chart2/source/model/template/LineChartType.cxx
-@@ -54,7 +54,9 @@ enum
- {
-     PROP_LINECHARTTYPE_CURVE_STYLE,
-     PROP_LINECHARTTYPE_CURVE_RESOLUTION,
--    PROP_LINECHARTTYPE_SPLINE_ORDER
-+    PROP_LINECHARTTYPE_SPLINE_ORDER,
-+    PROP_LINECHARTTYPE_STACKED,
-+    PROP_LINECHARTTYPE_PERCENT
- };
- 
- void lcl_AddPropertiesToVector(
-@@ -79,6 +81,19 @@ void lcl_AddPropertiesToVector(
-                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
-                   beans::PropertyAttribute::BOUND
-                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-+
-+    rOutProperties.push_back(
-+        Property( C2U( "Stacked" ),
-+                  PROP_LINECHARTTYPE_STACKED,
-+                  ::getBooleanCppuType(),
-+                  beans::PropertyAttribute::BOUND
-+                  | beans::PropertyAttribute::MAYBEDEFAULT ));
-+    rOutProperties.push_back(
-+        Property( C2U( "Percent" ),
-+                  PROP_LINECHARTTYPE_PERCENT,
-+                  ::getBooleanCppuType(),
-+                  beans::PropertyAttribute::BOUND
-+                  | beans::PropertyAttribute::MAYBEDEFAULT ));
- }
- 
- void lcl_AddDefaultsToMap(
-@@ -90,6 +105,9 @@ void lcl_AddDefaultsToMap(
-     // todo: check whether order 3 means polygons of order 3 or 2. (see
-     // http://www.people.nnov.ru/fractal/Splines/Basis.htm )
-     ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_SPLINE_ORDER, 3 );
-+
-+    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_STACKED, false );
-+    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_PERCENT, false );
- }
- 
- const Sequence< Property > & lcl_GetPropertySequence()
-diff --git chart2/source/model/template/LineChartTypeTemplate.cxx chart2/source/model/template/LineChartTypeTemplate.cxx
-index 746920a..eb08a53 100644
---- chart2/source/model/template/LineChartTypeTemplate.cxx
-+++ chart2/source/model/template/LineChartTypeTemplate.cxx
-@@ -348,6 +348,7 @@ Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForN
-         ASSERT_EXCEPTION( ex );
-     }
- 
-+    setStackModePropertiesToChartType(xResult);
-     return xResult;
- }
- 
-diff --git chart2/source/model/template/NetChartTypeTemplate.cxx chart2/source/model/template/NetChartTypeTemplate.cxx
-index ea85c9c..f13db16 100644
---- chart2/source/model/template/NetChartTypeTemplate.cxx
-+++ chart2/source/model/template/NetChartTypeTemplate.cxx
-@@ -183,6 +183,7 @@ Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNe
- {
-     Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
-     ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult );    
-+    setStackModePropertiesToChartType(xResult);
-     return xResult;
- }
- 
-diff --git chart2/source/model/template/PieChartTypeTemplate.cxx chart2/source/model/template/PieChartTypeTemplate.cxx
-index 8df8ce9..dbce73d 100644
---- chart2/source/model/template/PieChartTypeTemplate.cxx
-+++ chart2/source/model/template/PieChartTypeTemplate.cxx
-@@ -475,6 +475,7 @@ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNe
-         ASSERT_EXCEPTION( ex );
-     }
- 
-+    setStackModePropertiesToChartType(xResult);
-     return xResult;
- }
- 
-diff --git chart2/source/model/template/ScatterChartTypeTemplate.cxx chart2/source/model/template/ScatterChartTypeTemplate.cxx
-index 2b67f37..62d0a77 100644
---- chart2/source/model/template/ScatterChartTypeTemplate.cxx
-+++ chart2/source/model/template/ScatterChartTypeTemplate.cxx
-@@ -387,6 +387,7 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF
-         ASSERT_EXCEPTION( ex );
-     }
- 
-+    setStackModePropertiesToChartType(xResult);
-     return xResult;
- }
- 
-diff --git chart2/source/model/template/StockChartTypeTemplate.cxx chart2/source/model/template/StockChartTypeTemplate.cxx
-index 43cc054..0d090a5 100644
---- chart2/source/model/template/StockChartTypeTemplate.cxx
-+++ chart2/source/model/template/StockChartTypeTemplate.cxx
-@@ -528,6 +528,7 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie
-         ASSERT_EXCEPTION( ex );
-     }
- 
-+    setStackModePropertiesToChartType(xResult);
-     return xResult;
- }
- 
-diff --git chart2/source/view/axes/ScaleAutomatism.cxx chart2/source/view/axes/ScaleAutomatism.cxx
-index 3e412c4..c151ce0 100644
---- chart2/source/view/axes/ScaleAutomatism.cxx
-+++ chart2/source/view/axes/ScaleAutomatism.cxx
-@@ -132,7 +132,15 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
-     if( bAutoMinimum )
-     {
-         if( m_aSourceScale.AxisType==AxisType::PERCENT )
-+        {
-             rExplicitScale.Minimum = 0.0;
-+            if (!::rtl::math::isNan(m_fValueMinimum))
-+            {
-+                double fMin = m_fValueMinimum / 100.0;
-+                if (rExplicitScale.Minimum > fMin)
-+                    rExplicitScale.Minimum = fMin;
-+            }
-+        }
-         else if( ::rtl::math::isNan( m_fValueMinimum ) )
-             rExplicitScale.Minimum = 0.0;   //@todo get Minimum from scaling or from plotter????
-         else
-@@ -143,7 +151,15 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
-     if( bAutoMaximum )
-     {
-         if( m_aSourceScale.AxisType==AxisType::PERCENT )
-+        {
-             rExplicitScale.Maximum = 1.0;
-+            if (!::rtl::math::isNan(m_fValueMaximum))
-+            {
-+                double fMax = m_fValueMaximum / 100.0;
-+                if (rExplicitScale.Maximum < fMax)
-+                    rExplicitScale.Maximum = fMax;
-+            }
-+        }
-         else if( ::rtl::math::isNan( m_fValueMaximum ) )
-             rExplicitScale.Maximum = 10.0;  //@todo get Maximum from scaling or from plotter????
-         else
-diff --git chart2/source/view/charttypes/AreaChart.cxx chart2/source/view/charttypes/AreaChart.cxx
-index 1ed2c6d..0ab9969 100644
---- chart2/source/view/charttypes/AreaChart.cxx
-+++ chart2/source/view/charttypes/AreaChart.cxx
-@@ -600,6 +600,19 @@ struct FormerPoint
- 
- void AreaChart::createShapes()
- {
-+    sal_Bool bPercent = sal_False;
-+    uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-+    if (xPropSet.is())
-+    {
-+        try
-+        {
-+            xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-+        }
-+        catch (const beans::UnknownPropertyException&)
-+        {
-+        }
-+    }
-+
-     if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
-         return;
- 
-@@ -753,9 +766,30 @@ void AreaChart::createShapes()
-                     if( m_nDimension==3 && m_bArea && pSeriesList->size()!=1 )
-                         fLogicY = fabs( fLogicY );
- 
--                    if( pPosHelper->isPercentY() && !::rtl::math::approxEqual( aLogicYSumMap[nAttachedAxisIndex], 0.0 ) )
-+                    if (bPercent)
-+                    {     
-+                        // This data series is percent-stacked.
-+
-+                        if (::rtl::math::approxEqual(aLogicYSumMap[nAttachedAxisIndex], 0.0))
-+                            fLogicY = 0.0;
-+                        else
-+                            fLogicY = fabs( fLogicY )/aLogicYSumMap[nAttachedAxisIndex];
-+
-+                        if (!pPosHelper->isPercentY())
-+                        {    
-+                            // When the axis itself is not percent-stacked,
-+                            // their internal range value is 0 - 100.  So we
-+                            // need to adjust the data point values
-+                            // accordingly.
-+                            fLogicY *= 100.0;
-+                        }
-+                    }
-+                    else if (pPosHelper->isPercentY())
-                     {
--                        fLogicY = fabs( fLogicY )/aLogicYSumMap[nAttachedAxisIndex];
-+                        // The data series is not percent-stacked, but the
-+                        // axis itself is.  In this case, the axis' internal
-+                        // range is 0 to 1.  Adjust the data point values.
-+                        fLogicY /= 100.0;
-                     }
- 
-                     if(    ::rtl::math::isNan(fLogicX) || ::rtl::math::isInf(fLogicX)
-diff --git chart2/source/view/charttypes/BarChart.cxx chart2/source/view/charttypes/BarChart.cxx
-index 88d2461..feadf90 100644
---- chart2/source/view/charttypes/BarChart.cxx
-+++ chart2/source/view/charttypes/BarChart.cxx
-@@ -456,6 +456,19 @@ void BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
- 
- void BarChart::createShapes()
- {
-+    uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-+    sal_Bool bPercent = sal_False;
-+    if (xPropSet.is())
-+    {
-+        try
-+        {
-+            xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-+        }
-+        catch (const beans::UnknownPropertyException&)
-+        {
-+        }
-+    }
-+
-     if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
-         return;
- 
-diff --git chart2/source/view/charttypes/VSeriesPlotter.cxx chart2/source/view/charttypes/VSeriesPlotter.cxx
-index 159866c..fe790b9 100644
---- chart2/source/view/charttypes/VSeriesPlotter.cxx
-+++ chart2/source/view/charttypes/VSeriesPlotter.cxx
-@@ -1154,6 +1154,23 @@ double VSeriesPlotter::getMaximumX()
- 
- double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex )
- {
-+    sal_Bool bPercent = sal_False;
-+    uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-+    if (xPropSet.is())
-+    {
-+        try
-+        {
-+            xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-+        }
-+        catch (const beans::UnknownPropertyException&)
-+        {
-+        }
-+    }
-+
-+    if (bPercent)
-+        // This plotter is percent-stacked.
-+        return 0.0;
-+
-     if( !m_bCategoryXAxis )
-     {
-         double fMinY, fMaxY;
-@@ -1188,6 +1205,23 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s
- 
- double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex )
- {
-+    sal_Bool bPercent = sal_False;
-+    uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-+    if (xPropSet.is())
-+    {
-+        try
-+        {
-+            xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-+        }
-+        catch (const beans::UnknownPropertyException&)
-+        {
-+        }
-+    }
-+
-+    if (bPercent)
-+        // This plotter is percent-stacked.
-+        return 100.0;
-+
-     if( !m_bCategoryXAxis )
-     {
-         double fMinY, fMaxY;
-diff --git chart2/source/view/main/ChartView.cxx chart2/source/view/main/ChartView.cxx
-index 0357b26..639b4ec 100644
---- chart2/source/view/main/ChartView.cxx
-+++ chart2/source/view/main/ChartView.cxx
-@@ -1735,7 +1735,15 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForAxis(
-                     if( nDimensionIndex == 0 )
-                         aRoleToMatch = C2U("values-x");
-                     Sequence< Reference< XChartType > > aChartTypes( xCTCnt->getChartTypes());
--                    for( sal_Int32 nCTIdx=0; nCTIdx<aChartTypes.getLength(); ++nCTIdx )
-+                    sal_Int32 nCTCount = aChartTypes.getLength();
-+                    if (nCTCount > 0)
-+                        // When multiple chart types share the same axis, always 
-+                        // use the first chart type for automatic detection of
-+                        // desired number format.  This is in line with the
-+                        // fact that the axis type is also determined from the
-+                        // first chart type alone.
-+                        nCTCount = 1;
-+                    for( sal_Int32 nCTIdx=0; nCTIdx<nCTCount; ++nCTIdx )
-                     {
-                         if( nDimensionIndex != 0 )
-                             aRoleToMatch = aChartTypes[nCTIdx]->getRoleOfSequenceForSeriesLabel();
diff --git a/applied_patches/0158-calc-menu-manual-page-break.diff b/applied_patches/0150-calc-menu-manual-page-break.diff
similarity index 100%
rename from applied_patches/0158-calc-menu-manual-page-break.diff
rename to applied_patches/0150-calc-menu-manual-page-break.diff
diff --git a/applied_patches/0150-chart-axis-multi-chart-types-xmloff.diff b/applied_patches/0150-chart-axis-multi-chart-types-xmloff.diff
deleted file mode 100644
index 524a8bfd9..000000000
--- a/applied_patches/0150-chart-axis-multi-chart-types-xmloff.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git xmloff/source/chart/SchXMLChartContext.cxx xmloff/source/chart/SchXMLChartContext.cxx
-index 510d366..3824e67 100644
---- xmloff/source/chart/SchXMLChartContext.cxx
-+++ xmloff/source/chart/SchXMLChartContext.cxx
-@@ -71,13 +71,17 @@
- #include <com/sun/star/chart2/data/XDataSink.hpp>
- #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
- #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
-+#include <com/sun/star/chart2/XCoordinateSystem.hpp>
- #include <com/sun/star/chart2/XChartTypeContainer.hpp>
-+#include <com/sun/star/chart2/XChartType.hpp>
- #include <com/sun/star/chart2/XTitled.hpp>
- 
- using namespace com::sun::star;
- using namespace ::xmloff::token;
- using ::rtl::OUString;
- using com::sun::star::uno::Reference;
-+using ::com::sun::star::uno::Sequence;
-+using ::com::sun::star::uno::UNO_QUERY;
- using namespace ::SchXMLTools;
- 
- namespace
-@@ -706,6 +710,48 @@ void SchXMLChartContext::ChangeDiagramAccordingToTemplate(
-     xTemplate->changeDiagramData( xNewDia, xDataSource, aArgs );
- }
- 
-+static void lcl_setStackTypeToAllChartTypes(
-+    const Reference<chart2::XDiagram>& rDiagram, const uno::Any& rStacked, const uno::Any& rPercent)
-+{
-+    Reference<chart2::XCoordinateSystemContainer> xCoordContainer(rDiagram, uno::UNO_QUERY);
-+    if (!xCoordContainer.is())
-+        return;
-+
-+    Sequence< Reference<chart2::XCoordinateSystem> > xCoords = xCoordContainer->getCoordinateSystems();
-+
-+    sal_Int32 n = xCoords.getLength();
-+    if (!n)
-+        return;
-+
-+    for (sal_Int32 i = 0; i < n; ++i)
-+    {
-+        Reference<chart2::XChartTypeContainer> xChartTypeContainer(xCoords[i], UNO_QUERY);
-+        if (!xChartTypeContainer.is())
-+            continue;
-+
-+        Sequence< Reference<chart2::XChartType> > xChartTypes = xChartTypeContainer->getChartTypes();
-+        sal_Int32 nChartTypeCount = xChartTypes.getLength();
-+        for (sal_Int32 j = 0; j < nChartTypeCount; ++j)
-+        {
-+            Reference<beans::XPropertySet> xProp(xChartTypes[j], UNO_QUERY);
-+            if (!xProp.is())
-+                continue;
-+
-+            try
-+            {
-+                if (rStacked.hasValue())
-+                    xProp->setPropertyValue(OUString::createFromAscii("Stacked"), rStacked);
-+                if (rPercent.hasValue())
-+                    xProp->setPropertyValue(OUString::createFromAscii("Percent"), rPercent);
-+            }
-+            catch (const beans::UnknownPropertyException&)
-+            {
-+                // fail silently.
-+            }
-+        }
-+    }
-+}
-+
- void SchXMLChartContext::EndElement()
- {
- 	uno::Reference< chart::XChartDocument > xDoc = mrImportHelper.GetChartDocument();
-@@ -869,6 +915,11 @@ void SchXMLChartContext::EndElement()
-                 , SchXMLSeriesHelper::getDataSeriesIndexMapFromDiagram(xNewDiagram) );
-         }
- 
-+        // For now, set the diagram's stack-related properties to all included 
-+        // chart types until we support chart types of mixed stack states.
-+        lcl_setStackTypeToAllChartTypes(
-+            xNewDoc->getFirstDiagram(), maSeriesDefaultsAndStyles.maStackedDefault, maSeriesDefaultsAndStyles.maPercentDefault);
-+
-         SchXMLSeries2Context::initSeriesPropertySets( maSeriesDefaultsAndStyles, uno::Reference< frame::XModel >(xDoc, uno::UNO_QUERY ) );
- 
-         //set defaults from diagram to the new series:
diff --git a/applied_patches/0151-sc-sheet-gridline-toggle.diff b/applied_patches/0151-sc-sheet-gridline-toggle.diff
new file mode 100644
index 000000000..c690a8d89
--- /dev/null
+++ b/applied_patches/0151-sc-sheet-gridline-toggle.diff
@@ -0,0 +1,324 @@
+diff --git officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+index d77187c..ab59975 100644
+--- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
++++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+@@ -1483,6 +1483,14 @@
+                     <value xml:lang="en-US">S~hare Document...</value>
+                 </prop>
+             </node>
++            <node oor:name=".uno:ToggleSheetGrid" oor:op="replace">
++                <prop oor:name="Label" oor:type="xs:string">
++                    <value xml:lang="en-US">Toggle Grid Lines for Current Sheet</value>
++                </prop>
++                <prop oor:name="Properties" oor:type="xs:int">
++                    <value>1</value>
++                </prop>
++            </node>
+         </node>
+         <node oor:name="Popups">
+             <node oor:name=".uno:AuditMenu" oor:op="replace">
+diff --git sc/inc/ViewSettingsSequenceDefines.hxx sc/inc/ViewSettingsSequenceDefines.hxx
+index c720413..1143d9f 100644
+--- sc/inc/ViewSettingsSequenceDefines.hxx
++++ sc/inc/ViewSettingsSequenceDefines.hxx
+@@ -64,7 +64,7 @@
+ // this are the defines for the position of the settings in the
+ // TableViewSettingsSequence
+ 
+-#define SC_TABLE_VIEWSETTINGS_COUNT         15
++#define SC_TABLE_VIEWSETTINGS_COUNT         16
+ 
+ #define SC_CURSOR_X							0
+ #define SC_CURSOR_Y							1
+@@ -81,6 +81,7 @@
+ #define SC_TABLE_ZOOM_VALUE                 12
+ #define SC_TABLE_PAGE_VIEW_ZOOM_VALUE       13
+ #define SC_TABLE_TAB_BG_COLOR               14
++#define SC_TABLE_SHOWGRID                   15
+ 
+ #define SC_CURSORPOSITIONX					"CursorPositionX"
+ #define SC_CURSORPOSITIONY					"CursorPositionY"
+diff --git sc/inc/sc.hrc sc/inc/sc.hrc
+index d7e1983..f7d4695 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -1672,6 +1672,9 @@
+ // Autoformat for DataPilot
+ #define SID_PIVOT_AFMT              (SC_OOO_BUILD_START + 4)
+ 
++// Toggle sheet grid
++#define FID_TAB_TOGGLE_GRID         (SC_OOO_BUILD_START + 5)
++
+ #endif 
+ 
+ 
+diff --git sc/inc/scextopt.hxx sc/inc/scextopt.hxx
+index 0e3866e..206ff20 100644
+--- sc/inc/scextopt.hxx
++++ sc/inc/scextopt.hxx
+@@ -80,6 +80,7 @@ struct ScExtTabSettings
+     bool                mbSelected;         /// true = Sheet is selected.
+     bool                mbFrozenPanes;      /// true = Frozen panes; false = Normal splits.
+     bool                mbPageMode;         /// true = Pagebreak mode; false = Normal view mode.
++    bool                mbShowGrid;         /// Whether or not to display gridlines.
+     Color               maTabBgColor;       /// Tab Bg Color
+     bool                IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO) ? TRUE : FALSE; };
+ 
+diff --git sc/sdi/docsh.sdi sc/sdi/docsh.sdi
+index 4a773ab..e780e11 100644
+--- sc/sdi/docsh.sdi
++++ sc/sdi/docsh.sdi
+@@ -64,6 +64,7 @@ interface TableSelection
+     FID_TAB_RENAME		[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+     FID_TAB_RTL			[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+     FID_TAB_SET_TAB_BG_COLOR    [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
++    FID_TAB_TOGGLE_GRID [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+ 
+     SID_TABLE_ACTIVATE	[ ExecMethod = Execute; ]
+ }
+diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
+index 11874e5..471ab26 100644
+--- sc/sdi/scalc.sdi
++++ sc/sdi/scalc.sdi
+@@ -7875,6 +7875,33 @@ SfxVoidItem ShareDocument SID_SHARE_DOC
+ ]
+ 
+ //--------------------------------------------------------------------------
++SfxBoolItem ToggleSheetGrid FID_TAB_TOGGLE_GRID
++
++[
++    /* flags: */
++    AutoUpdate = FALSE,
++    Cachable = Cachable,
++    FastCall = FALSE,
++    HasCoreId = FALSE,
++    HasDialog = FALSE,
++    ReadOnlyDoc = TRUE,
++    Toggle = FALSE,
++    Container = FALSE,
++    RecordAbsolute = FALSE,
++    RecordPerSet;
++    Synchron;
++    
++    /* config: */
++    AccelConfig = TRUE,
++    MenuConfig = TRUE,
++    StatusBarConfig = FALSE,
++    ToolBoxConfig = TRUE,
++    GroupId = GID_FORMAT;
++]
++
++
++
++//--------------------------------------------------------------------------
+ SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR
+ 
+ [
+diff --git sc/source/filter/excel/xeview.cxx sc/source/filter/excel/xeview.cxx
+index 81c5b9a..d15634b 100644
+--- sc/source/filter/excel/xeview.cxx
++++ sc/source/filter/excel/xeview.cxx
+@@ -316,7 +316,6 @@ XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nSc
+ 
+     const ScViewOptions& rViewOpt = GetDoc().GetViewOptions();
+     maData.mbShowFormulas   = rViewOpt.GetOption( VOPT_FORMULAS );
+-    maData.mbShowGrid       = rViewOpt.GetOption( VOPT_GRID );
+     maData.mbShowHeadings   = rViewOpt.GetOption( VOPT_HEADER );
+     maData.mbShowZeros      = rViewOpt.GetOption( VOPT_NULLVALS );
+     maData.mbShowOutline    = rViewOpt.GetOption( VOPT_OUTLINER );
+@@ -391,6 +390,7 @@ XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nSc
+             else
+                 maData.maGridColor = rGridColor;
+         }
++        maData.mbShowGrid       = rTabSett.mbShowGrid;
+ 
+         // view mode and zoom
+         maData.mbPageMode       = (GetBiff() == EXC_BIFF8) && rTabSett.mbPageMode;
+diff --git sc/source/filter/excel/xiview.cxx sc/source/filter/excel/xiview.cxx
+index fbd72d0..ce76483 100644
+--- sc/source/filter/excel/xiview.cxx
++++ sc/source/filter/excel/xiview.cxx
+@@ -277,6 +277,9 @@ void XclImpTabViewSettings::Finalize()
+     else
+         rTabSett.maGridColor = maData.maGridColor;
+ 
++    // show grid option
++    rTabSett.mbShowGrid      = maData.mbShowGrid;
++
+     // view mode and zoom
+     if( maData.mnCurrentZoom != 0 )
+         (maData.mbPageMode ? maData.mnPageZoom : maData.mnNormalZoom) = maData.mnCurrentZoom;
+@@ -291,7 +294,6 @@ void XclImpTabViewSettings::Finalize()
+         // set Excel sheet settings globally at Calc document, take settings from displayed sheet
+         ScViewOptions aViewOpt( rDoc.GetViewOptions() );
+         aViewOpt.SetOption( VOPT_FORMULAS, maData.mbShowFormulas );
+-        aViewOpt.SetOption( VOPT_GRID,     maData.mbShowGrid );
+         aViewOpt.SetOption( VOPT_HEADER,   maData.mbShowHeadings );
+         aViewOpt.SetOption( VOPT_NULLVALS, maData.mbShowZeros );
+         aViewOpt.SetOption( VOPT_OUTLINER, maData.mbShowOutline );
+diff --git sc/source/ui/inc/viewdata.hxx sc/source/ui/inc/viewdata.hxx
+index c66083f..c77088e 100644
+--- sc/source/ui/inc/viewdata.hxx
++++ sc/source/ui/inc/viewdata.hxx
+@@ -149,6 +149,8 @@ private:
+     SCCOL			nPosX[2];
+     SCROW			nPosY[2];
+ 
++    bool            bShowGrid;                  // per-sheet show grid-lines option.
++
+     BOOL			bOldCurValid;				// "virtuelle" Cursorpos. bei zusammengefassten
+ 
+     Color           aTabBgColor;
+@@ -339,6 +341,9 @@ public:
+     const Fraction&	GetZoomX() const        { return bPagebreak ? pThisTab->aPageZoomX : pThisTab->aZoomX; }
+     const Fraction&	GetZoomY() const        { return bPagebreak ? pThisTab->aPageZoomY : pThisTab->aZoomY; }
+ 
++    void            SetShowGrid( bool bShow );
++    bool            GetShowGrid() const { return pThisTab->bShowGrid; }
++
+     const MapMode&	GetLogicMode( ScSplitPos eWhich );
+     const MapMode&	GetLogicMode();						// Offset 0
+ 
+diff --git sc/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx
+index 10db2f6..8a9d867 100644
+--- sc/source/ui/view/gridwin4.cxx
++++ sc/source/ui/view/gridwin4.cxx
+@@ -573,7 +573,8 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
+     aOutputData.SetEditObject( GetEditObject() );
+     aOutputData.SetViewShell( pViewData->GetViewShell() );
+ 
+-    BOOL bGrid = rOpts.GetOption( VOPT_GRID );
++    BOOL bGrid = rOpts.GetOption( VOPT_GRID ) && pViewData->GetShowGrid();
++
+     BOOL bPage = rOpts.GetOption( VOPT_PAGEBREAKS );
+ 
+     if ( eMode == SC_UPDATE_CHANGED )
+diff --git sc/source/ui/view/scextopt.cxx sc/source/ui/view/scextopt.cxx
+index fd28d95..8ca5fc2 100644
+--- sc/source/ui/view/scextopt.cxx
++++ sc/source/ui/view/scextopt.cxx
+@@ -62,6 +62,7 @@ ScExtTabSettings::ScExtTabSettings() :
+     mbSelected( false ),
+     mbFrozenPanes( false ),
+     mbPageMode( false ),
++    mbShowGrid( true ),
+     maTabBgColor( COL_AUTO)
+ {
+ }
+diff --git sc/source/ui/view/tabvwshf.cxx sc/source/ui/view/tabvwshf.cxx
+index c65b62a..971e646 100644
+--- sc/source/ui/view/tabvwshf.cxx
++++ sc/source/ui/view/tabvwshf.cxx
+@@ -37,6 +37,8 @@
+ 
+ #include "scitems.hxx"
+ #include <sfx2/request.hxx>
++#include <sfx2/bindings.hxx>
++#include <sfx2/viewfrm.hxx>
+ #include <basic/sbstar.hxx>
+ #include <layout/layout.hxx>
+ #include <svtools/languageoptions.hxx>
+@@ -690,6 +692,17 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
+             }
+             break;
+ 
++        case FID_TAB_TOGGLE_GRID:
++            {
++                bool bShowGrid = pViewData->GetShowGrid();
++                pViewData->SetShowGrid(!bShowGrid);
++                SfxBindings& rBindings = GetViewFrame()->GetBindings();
++                rBindings.Invalidate( FID_TAB_TOGGLE_GRID );
++                PaintGrid();
++                rReq.Done();
++            }
++            break;
++
+         case FID_TAB_SET_TAB_BG_COLOR:
+         case FID_TAB_MENU_SET_TAB_BG_COLOR:
+             {
+@@ -939,6 +952,10 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
+                     rSet.Put( SvxColorItem( aColor, nWhich ) );
+                 }
+                 break;
++
++            case FID_TAB_TOGGLE_GRID:
++                rSet.Put( SfxBoolItem(nWhich, pViewData->GetShowGrid()) );
++                break;
+         }
+         nWhich = aIter.NextWhich();
+     }
+diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
+index 23e0e59..8f458db 100644
+--- sc/source/ui/view/viewdata.cxx
++++ sc/source/ui/view/viewdata.cxx
+@@ -104,6 +104,7 @@ ScViewDataTable::ScViewDataTable() :
+                 nFixPosY( 0 ),
+                 nCurX( 0 ),
+                 nCurY( 0 ),
++                bShowGrid( true ),
+                 bOldCurValid( FALSE ),
+                 aTabBgColor( Color(COL_AUTO) )
+ {
+@@ -165,6 +166,10 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>
+         pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE));
+         pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue;
+ 
++        pSettings[SC_TABLE_SHOWGRID].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID));
++        pSettings[SC_TABLE_SHOWGRID].Value <<= static_cast<sal_Bool>(bShowGrid);
++
++
+         if ( !IsDefaultTabBgColor() )
+         {
+             pSettings[SC_TABLE_TAB_BG_COLOR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_TABCOLOR));
+@@ -276,6 +281,10 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV
+             aPageZoomX = aPageZoomY = aZoom;
+             rHasZoom = true;
+         }
++        else if (sName.compareToAscii(SC_UNO_SHOWGRID) == 0)
++        {
++            aSettings[i].Value >>= bShowGrid;
++        }
+         else if (sName.compareToAscii(SC_TABLESELECTED) == 0)
+         {
+             bool bSelected = false;
+@@ -704,6 +713,12 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAl
+     RefreshZoom();
+ }
+ 
++void ScViewData::SetShowGrid( bool bShow )
++{
++    CreateSelectedTabData();
++    pTabData[nTabNo]->bShowGrid = bShow;
++}
++
+ void ScViewData::RefreshZoom()
+ {
+     // recalculate zoom-dependent values (only for current sheet)
+@@ -2500,6 +2515,7 @@ void ScViewData::WriteExtOptions( ScExtDocOptions& rDocOpt ) const
+                 if( rGridColor.GetColor() != SC_STD_GRIDCOLOR )
+                     rTabSett.maGridColor = rGridColor;
+             }
++            rTabSett.mbShowGrid = pViewTab->bShowGrid;
+ 
+             // view mode and zoom
+             rTabSett.mbPageMode = bPagebreak;
+@@ -2635,6 +2651,8 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions& rDocOpt )
+             if( rTabSett.mnPageZoom )
+                 rViewTab.aPageZoomX = rViewTab.aPageZoomY = Fraction( rTabSett.mnPageZoom, 100L );
+ 
++            rViewTab.bShowGrid = rTabSett.mbShowGrid;
++
+             // get some settings from displayed Excel sheet, set at Calc document
+             if( nTab == GetTabNo() )
+             {
+diff --git sc/uiconfig/scalc/toolbar/formatobjectbar.xml sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+index 49c31d7..773befc 100644
+--- sc/uiconfig/scalc/toolbar/formatobjectbar.xml
++++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+@@ -50,4 +50,6 @@
+  <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:26268"  toolbar:visible="false" />
+  <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:26236"  toolbar:visible="false" />
+  <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:26237"  toolbar:visible="false" />
++ <toolbar:toolbarseparator/>
++ <toolbar:toolbaritem xlink:href=".uno:ToggleSheetGrid" toolbar:helpid="helpid:26238"  toolbar:visible="true" />
+ </toolbar:toolbar>
diff --git a/applied_patches/0152-calc-formula-variable-separators-sc.diff b/applied_patches/0152-calc-formula-variable-separators-sc.diff
new file mode 100644
index 000000000..3a0e051e5
--- /dev/null
+++ b/applied_patches/0152-calc-formula-variable-separators-sc.diff
@@ -0,0 +1,1050 @@
+diff --git formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/FormulaCompiler.hxx
+index 7da03fd..6df4898 100644
+--- formula/inc/formula/FormulaCompiler.hxx
++++ formula/inc/formula/FormulaCompiler.hxx
+@@ -237,6 +237,8 @@ public:
+         including an address reference convention. */
+     inline  FormulaGrammar::Grammar   GetGrammar() const { return meGrammar; }
+ 
++    static void UpdateSeparatorsNative( const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep );
++
+ protected:
+     virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const;
+     virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const;
+diff --git formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/FormulaCompiler.cxx
+index d031c9a..5834e9e 100644
+--- formula/source/core/api/FormulaCompiler.cxx
++++ formula/source/core/api/FormulaCompiler.cxx
+@@ -1681,6 +1681,17 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String &
+         rBuffer.append(sal_Unicode('"'));
+     }
+ }
++
++void FormulaCompiler::UpdateSeparatorsNative( 
++    const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep )
++{
++    NonConstOpCodeMapPtr xSymbolsNative;
++    lcl_fillNativeSymbols(xSymbolsNative);
++    xSymbolsNative->putOpCode(rSep, ocSep);
++    xSymbolsNative->putOpCode(rArrayColSep, ocArrayColSep);
++    xSymbolsNative->putOpCode(rArrayRowSep, ocArrayRowSep);
++}
++
+ // -----------------------------------------------------------------------------
+ OpCode FormulaCompiler::NextToken()
+ {
+diff --git sc/inc/docoptio.hxx sc/inc/docoptio.hxx
+index 51a6405..bbd92e8 100644
+--- sc/inc/docoptio.hxx
++++ sc/inc/docoptio.hxx
+@@ -36,6 +36,8 @@
+ #include "scdllapi.h"
+ #include "optutil.hxx"
+ 
++#include "formula/grammar.hxx"
++
+ class SC_DLLPUBLIC ScDocOptions
+ {
+ 	double fIterEps;				// Epsilon-Wert dazu
+@@ -53,6 +55,11 @@ class SC_DLLPUBLIC ScDocOptions
+ 	BOOL   bDoAutoSpell;			// Auto-Spelling
+ 	BOOL   bLookUpColRowNames;		// Spalten-/Zeilenbeschriftungen automagisch suchen
+     BOOL   bFormulaRegexEnabled;    // regular expressions in formulas enabled
++    ::formula::FormulaGrammar::Grammar eFormulaGrammar;  // formula grammar used to switch different formula syntax
++
++    ::rtl::OUString aFormulaSepArg;
++    ::rtl::OUString aFormulaSepArrayRow;
++    ::rtl::OUString aFormulaSepArrayCol;
+ 
+ public:
+ 				ScDocOptions();
+@@ -99,6 +106,20 @@ public:
+ 
+     void    SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; }
+     BOOL    IsFormulaRegexEnabled() const       { return bFormulaRegexEnabled; }
++
++    void SetFormulaSyntax( ::formula::FormulaGrammar::Grammar eGram ) { eFormulaGrammar = eGram; }
++    ::formula::FormulaGrammar::Grammar GetFormulaSyntax() const { return eFormulaGrammar; }
++
++    void SetFormulaSepArg(const ::rtl::OUString& rSep) { aFormulaSepArg = rSep; }
++    ::rtl::OUString GetFormulaSepArg() const { return aFormulaSepArg; }
++
++    void SetFormulaSepArrayRow(const ::rtl::OUString& rSep) { aFormulaSepArrayRow = rSep; }
++    ::rtl::OUString GetFormulaSepArrayRow() const { return aFormulaSepArrayRow; }
++
++    void SetFormulaSepArrayCol(const ::rtl::OUString& rSep) { aFormulaSepArrayCol = rSep; }
++    ::rtl::OUString GetFormulaSepArrayCol() const { return aFormulaSepArrayCol; }
++
++    const LocaleDataWrapper& GetLocaleDataWrapper() const;
+ };
+ 
+ 
+@@ -119,6 +140,10 @@ inline void ScDocOptions::CopyTo(ScDocOptions& rOpt)
+ 	rOpt.bDoAutoSpell			= bDoAutoSpell;
+ 	rOpt.bLookUpColRowNames		= bLookUpColRowNames;
+     rOpt.bFormulaRegexEnabled   = bFormulaRegexEnabled;
++    rOpt.eFormulaGrammar        = eFormulaGrammar;
++    rOpt.aFormulaSepArg         = aFormulaSepArg;
++    rOpt.aFormulaSepArrayRow    = aFormulaSepArrayRow;
++    rOpt.aFormulaSepArrayCol    = aFormulaSepArrayCol;
+ }
+ 
+ inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
+@@ -138,6 +163,10 @@ inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
+ 	bDoAutoSpell		= rCpy.bDoAutoSpell;
+ 	bLookUpColRowNames	= rCpy.bLookUpColRowNames;
+     bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled;
++    eFormulaGrammar     = rCpy.eFormulaGrammar;
++    aFormulaSepArg      = rCpy.aFormulaSepArg;
++    aFormulaSepArrayRow = rCpy.aFormulaSepArrayRow;
++    aFormulaSepArrayCol = rCpy.aFormulaSepArrayCol;
+ 
+ 	return *this;
+ }
+@@ -160,6 +189,10 @@ inline int ScDocOptions::operator==( const ScDocOptions& rOpt ) const
+ 			&&	rOpt.bDoAutoSpell			== bDoAutoSpell
+ 			&&	rOpt.bLookUpColRowNames		== bLookUpColRowNames
+             &&  rOpt.bFormulaRegexEnabled   == bFormulaRegexEnabled
++            &&  rOpt.eFormulaGrammar        == eFormulaGrammar
++            &&  rOpt.aFormulaSepArg         == aFormulaSepArg
++            &&  rOpt.aFormulaSepArrayRow    == aFormulaSepArrayRow
++            &&  rOpt.aFormulaSepArrayCol    == aFormulaSepArrayCol
+ 			);
+ }
+ 
+@@ -199,12 +232,15 @@ private:
+ class ScDocCfg : public ScDocOptions
+ {
+ 	ScLinkConfigItem	aCalcItem;
++    ScLinkConfigItem    aFormulaItem;
+ 	ScLinkConfigItem	aLayoutItem;
+ 
+ 	DECL_LINK( CalcCommitHdl, void* );
++    DECL_LINK( FormulaCommitHdl, void* );
+ 	DECL_LINK( LayoutCommitHdl, void* );
+ 
+ 	com::sun::star::uno::Sequence<rtl::OUString> GetCalcPropertyNames();
++	com::sun::star::uno::Sequence<rtl::OUString> GetFormulaPropertyNames();
+ 	com::sun::star::uno::Sequence<rtl::OUString> GetLayoutPropertyNames();
+ 
+ public:
+diff --git sc/inc/sc.hrc sc/inc/sc.hrc
+index 7301766..2eba0d8 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -1660,5 +1660,9 @@
+ // Autoformat for DataPilot
+ #define SID_PIVOT_AFMT              (SC_OOO_BUILD_START + 4)
+ 
++// Formula options page
++#define RID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 5)
++#define HID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 6)
++
+ #endif
+ 
+diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
+index ec6c46c..27f9d36 100644
+--- sc/source/core/data/documen3.cxx
++++ sc/source/core/data/documen3.cxx
+@@ -54,6 +54,7 @@
+ #include "rangelst.hxx"
+ #include "chartarr.hxx"
+ #include "chartlock.hxx"
++#include "compiler.hxx"
+ #include "refupdat.hxx"
+ #include "docoptio.hxx"
+ #include "viewopti.hxx"
+@@ -1771,7 +1772,13 @@ void ScDocument::SetDocOptions( const ScDocOptions& rOpt )
+     *pDocOptions = rOpt;
+     rOpt.GetDate( d,m,y );
+ 
+     xPoolHelper->SetFormTableOpt(rOpt);
++
++    SetGrammar( rOpt.GetFormulaSyntax() );
++
++    // Update the separators.
++    ScCompiler::UpdateSeparatorsNative(
++        rOpt.GetFormulaSepArg(), rOpt.GetFormulaSepArrayCol(), rOpt.GetFormulaSepArrayRow());
+ }
+ 
+ const ScViewOptions& ScDocument::GetViewOptions() const
+diff --git sc/source/core/tool/docoptio.cxx sc/source/core/tool/docoptio.cxx
+index ffbb2d9..4338af6 100644
+--- sc/source/core/tool/docoptio.cxx
++++ sc/source/core/tool/docoptio.cxx
+@@ -38,6 +38,8 @@
+ 
+ #include <com/sun/star/uno/Any.hxx>
+ #include <com/sun/star/uno/Sequence.hxx>
++#include <com/sun/star/lang/Locale.hpp>
++#include <com/sun/star/i18n/LocaleDataItem.hpp>
+ 
+ #include "cfgids.hxx"
+ #include "docoptio.hxx"
+@@ -45,10 +47,13 @@
+ #include "scresid.hxx"
+ #include "sc.hrc"
+ #include "miscuno.hxx"
++#include "global.hxx"
+ 
+ using namespace utl;
+ using namespace rtl;
+ using namespace com::sun::star::uno;
++using ::com::sun::star::lang::Locale;
++using ::com::sun::star::i18n::LocaleDataItem;
+ 
+ //------------------------------------------------------------------------
+ 
+@@ -100,7 +105,11 @@ ScDocOptions::ScDocOptions( const ScDocOptions& rCpy )
+ 			bMatchWholeCell( rCpy.bMatchWholeCell ),
+ 			bDoAutoSpell( rCpy.bDoAutoSpell ),
+             bLookUpColRowNames( rCpy.bLookUpColRowNames ),
+-            bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled )
++            bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled ),
++            eFormulaGrammar( rCpy.eFormulaGrammar ),
++            aFormulaSepArg( rCpy.aFormulaSepArg ),
++            aFormulaSepArrayRow( rCpy.aFormulaSepArrayRow ),
++            aFormulaSepArrayCol( rCpy.aFormulaSepArrayCol )
+ {
+ }
+ 
+@@ -129,6 +138,67 @@ void ScDocOptions::ResetDocOptions()
+ 	bDoAutoSpell		= FALSE;
+ 	bLookUpColRowNames	= TRUE;
+     bFormulaRegexEnabled= TRUE;
++    eFormulaGrammar     = ::formula::FormulaGrammar::GRAM_NATIVE;
++
++    do
++    {
++        const Locale& rLocale = *ScGlobal::GetLocale();
++        const OUString& rLang = rLocale.Language;
++        if (rLang.equalsAscii("ru"))
++            // Don't do automatic guess for these languages, and fall back to 
++            // the old separator set.
++            break;
++
++        const LocaleDataWrapper& rLocaleData = GetLocaleDataWrapper();
++        const OUString& rDecSep  = rLocaleData.getNumDecimalSep();
++        const OUString& rListSep = rLocaleData.getListSep();
++
++        if (!rDecSep.getLength() || !rListSep.getLength())
++            // Something is wrong.  Stick with the default separators.
++            break;
++
++        sal_Unicode cDecSep  = rDecSep.getStr()[0];
++        sal_Unicode cListSep = rListSep.getStr()[0];
++        
++        // Excel by default uses system's list separator as the parameter
++        // separator, which in English locales is a comma.  However, OOo's list
++        // separator value is set to ';' for all English locales.  Because of this
++        // discrepancy, we will hardcode the separator value here, for now.
++        if (cDecSep == sal_Unicode('.'))
++            cListSep = sal_Unicode(',');
++
++        // Special case for de_CH locale.
++        if (rLocale.Language.equalsAsciiL("de", 2) && rLocale.Country.equalsAsciiL("CH", 2))
++            cListSep = sal_Unicode(';');
++
++        // by default, the parameter separator equals the locale-specific
++        // list separator.
++        aFormulaSepArg = OUString(cListSep);
++
++        if (cDecSep == cListSep && cDecSep != sal_Unicode(';'))
++            // if the decimal and list separators are equal, set the
++            // parameter separator to be ';', unless they are both
++            // semicolon in which case don't change the decimal separator.
++            aFormulaSepArg = OUString::createFromAscii(";");
++
++        aFormulaSepArrayCol = OUString::createFromAscii(",");
++        if (cDecSep == sal_Unicode(','))
++            aFormulaSepArrayCol = OUString::createFromAscii(".");
++        aFormulaSepArrayRow = OUString::createFromAscii(";");
++
++        return;
++    }
++    while (false);
++
++    // Defaults to the old separator values.
++    aFormulaSepArg      = OUString::createFromAscii(";");
++    aFormulaSepArrayCol = OUString::createFromAscii(";");
++    aFormulaSepArrayRow = OUString::createFromAscii("|");
++}
++
++const LocaleDataWrapper& ScDocOptions::GetLocaleDataWrapper() const
++{
++    return *ScGlobal::pLocaleData;
+ }
+ 
+ //========================================================================
+@@ -206,6 +276,13 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clone( SfxItemPool * ) const
+ #define SCCALCOPT_REGEX             11
+ #define SCCALCOPT_COUNT             12
+ 
++#define CFGPATH_FORMULA     "Office.Calc/Formula"
++#define SCFORMULAOPT_GRAMMAR           0
++#define SCFORMULAOPT_SEP_ARG           1
++#define SCFORMULAOPT_SEP_ARRAY_ROW     2
++#define SCFORMULAOPT_SEP_ARRAY_COL     3
++#define SCFORMULAOPT_COUNT             4
++
+ #define CFGPATH_DOCLAYOUT	"Office.Calc/Layout/Other"
+ 
+ #define SCDOCLAYOUTOPT_TABSTOP		0
+@@ -227,7 +304,7 @@ Sequence<OUString> ScDocCfg::GetCalcPropertyNames()
+ 		"Other/Precision",					// SCCALCOPT_PRECISION
+ 		"Other/SearchCriteria",				// SCCALCOPT_SEARCHCRIT
+         "Other/FindLabel",                  // SCCALCOPT_FINDLABEL
+-        "Other/RegularExpressions"          // SCCALCOPT_REGEX
++        "Other/RegularExpressions",         // SCCALCOPT_REGEX
+ 	};
+ 	Sequence<OUString> aNames(SCCALCOPT_COUNT);
+ 	OUString* pNames = aNames.getArray();
+@@ -237,6 +314,23 @@ Sequence<OUString> ScDocCfg::GetCalcPropertyNames()
+ 	return aNames;
+ }
+ 
++Sequence<OUString> ScDocCfg::GetFormulaPropertyNames()
++{
++	static const char* aPropNames[] =
++	{
++        "Syntax/Grammar",             // SCFORMULAOPT_GRAMMAR       
++        "Syntax/SeparatorArg",        // SCFORMULAOPT_SEP_ARG      
++        "Syntax/SeparatorArrayRow",   // SCFORMULAOPT_SEP_ARRAY_ROW
++        "Syntax/SeparatorArrayCol",   // SCFORMULAOPT_SEP_ARRAY_COL
++	};
++	Sequence<OUString> aNames(SCFORMULAOPT_COUNT);
++	OUString* pNames = aNames.getArray();
++	for (int i = 0; i < SCFORMULAOPT_COUNT; ++i)
++		pNames[i] = OUString::createFromAscii(aPropNames[i]);
++
++	return aNames;
++}
++
+ Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
+ {
+ 	static const char* aPropNames[] =
+@@ -257,6 +351,7 @@ Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
+ 
+ ScDocCfg::ScDocCfg() :
+ 	aCalcItem( OUString::createFromAscii( CFGPATH_CALC ) ),
++    aFormulaItem(OUString::createFromAscii(CFGPATH_FORMULA)),
+ 	aLayoutItem( OUString::createFromAscii( CFGPATH_DOCLAYOUT ) )
+ {
+ 	sal_Int32 nIntVal = 0;
+@@ -328,6 +423,69 @@ ScDocCfg::ScDocCfg() :
+ 
+ 	SetDate( nDateDay, nDateMonth, nDateYear );
+ 
++    aNames = GetFormulaPropertyNames();
++    aValues = aFormulaItem.GetProperties(aNames);
++    aFormulaItem.EnableNotification(aNames);
++    pValues = aValues.getConstArray();
++    if (aValues.getLength() == aNames.getLength())
++    {
++        for (int nProp = 0; nProp < aNames.getLength(); ++nProp)
++        {
++            switch (nProp)
++            {
++                case SCFORMULAOPT_GRAMMAR:
++                {
++                    ::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
++
++                    do
++                    {
++                        if (!(pValues[nProp] >>= nIntVal))
++                            // extractino failed.
++                            break;
++
++                        switch (nIntVal)
++                        {
++                            case 0: // Calc A1
++                                eGram = ::formula::FormulaGrammar::GRAM_NATIVE;
++                            break;
++                            case 1: // Excel A1
++                                eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1;
++                            break;
++                            case 2: // Excel R1C1
++                                eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1;
++                            break;
++                        }
++                    }
++                    while (false);
++                    SetFormulaSyntax(eGram);
++                }
++                break;
++                case SCFORMULAOPT_SEP_ARG:
++                {
++                    OUString aSep;
++                    if ((pValues[nProp] >>= aSep) && aSep.getLength())
++                        SetFormulaSepArg(aSep);
++                }
++                break;
++                case SCFORMULAOPT_SEP_ARRAY_ROW:
++                {
++                    OUString aSep;
++                    if ((pValues[nProp] >>= aSep) && aSep.getLength())
++                        SetFormulaSepArrayRow(aSep);
++                }
++                break;
++                case SCFORMULAOPT_SEP_ARRAY_COL:
++                {
++                    OUString aSep;
++                    if ((pValues[nProp] >>= aSep) && aSep.getLength())
++                        SetFormulaSepArrayCol(aSep);
++                }
++                break;
++            }
++        }
++    }
++    aFormulaItem.SetCommitLink( LINK(this, ScDocCfg, FormulaCommitHdl) );
++
+ 	aNames = GetLayoutPropertyNames();
+ 	aValues = aLayoutItem.GetProperties(aNames);
+ 	aLayoutItem.EnableNotification(aNames);
+@@ -410,6 +568,43 @@ IMPL_LINK( ScDocCfg, CalcCommitHdl, void *, EMPTYARG )
+ 	return 0;
+ }
+ 
++IMPL_LINK( ScDocCfg, FormulaCommitHdl, void *, EMPTYARG )
++{
++    Sequence<OUString> aNames = GetFormulaPropertyNames();
++    Sequence<Any> aValues(aNames.getLength());
++    Any* pValues = aValues.getArray();
++
++    for (int nProp = 0; nProp < aNames.getLength(); ++nProp)
++    {
++        switch (nProp)
++        {
++            case SCFORMULAOPT_GRAMMAR :
++            {
++                sal_Int32 nVal = 0;
++                switch (GetFormulaSyntax())
++                {
++                    case ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1:    nVal = 1; break;
++                    case ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1:  nVal = 2; break;
++                }
++                pValues[nProp] <<= nVal;
++            }
++            break;
++            case SCFORMULAOPT_SEP_ARG:
++                pValues[nProp] <<= GetFormulaSepArg();
++            break;
++            case SCFORMULAOPT_SEP_ARRAY_ROW:
++                pValues[nProp] <<= GetFormulaSepArrayRow();
++            break;
++            case SCFORMULAOPT_SEP_ARRAY_COL:
++                pValues[nProp] <<= GetFormulaSepArrayCol();
++            break;
++        }
++    }
++    aFormulaItem.PutProperties(aNames, aValues);
++
++    return 0;
++}
++
+ IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG )
+ {
+ 	Sequence<OUString> aNames = GetLayoutPropertyNames();
+@@ -439,6 +634,7 @@ void ScDocCfg::SetOptions( const ScDocOptions& rNew )
+ 	*(ScDocOptions*)this = rNew;
+ 
+ 	aCalcItem.SetModified();
++    aFormulaItem.SetModified();
+ 	aLayoutItem.SetModified();
+ }
+ 
+diff --git sc/source/ui/app/scmod.cxx sc/source/ui/app/scmod.cxx
+index bc0a91f..2362c23 100644
+--- sc/source/ui/app/scmod.cxx
++++ sc/source/ui/app/scmod.cxx
+@@ -2134,6 +2134,13 @@ SfxTabPage*	 ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem
+ 														pRet = (*ScTpCalcOptionsCreate)(pParent, rSet);
+ 								}
+ 								break;
++        case SID_SC_TP_FORMULA:
++        {
++            ::CreateTabPage ScTpFormulaOptionsCreate = pFact->GetTabPageCreatorFunc (RID_SCPAGE_FORMULA);
++            if (ScTpFormulaOptionsCreate)
++                pRet = (*ScTpFormulaOptionsCreate)(pParent, rSet);
++        }
++        break;
+ 		case SID_SC_TP_CHANGES:
+ 								{			//CHINA001 pRet = ScRedlineOptionsTabPage::Create(pParent, rSet);
+ 											::CreateTabPage ScRedlineOptionsTabPageCreate =	pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE );
+diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx
+index de9b284..7e6e248 100644
+--- sc/source/ui/attrdlg/scdlgfact.cxx
++++ sc/source/ui/attrdlg/scdlgfact.cxx
+@@ -76,6 +76,7 @@
+ #include "tpstat.hxx" //add for ScDocStatPage
+ #include "tpusrlst.hxx" //add for ScTpUserLists
+ #include "tpview.hxx" //add for ScTpContentOptions
++#include "tpformula.hxx"
+ 
+ // ause
+ 
+@@ -1432,6 +1433,8 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
+ 		case	RID_SCPAGE_CALC :
+ 			return ScTpCalcOptions::Create;
+             //break;
++        case RID_SCPAGE_FORMULA:
++            return ScTpFormulaOptions::Create;
+ 		case	RID_SCPAGE_PRINT :
+ 			return ScTpPrintOptions::Create;
+             //break;
+diff --git sc/source/ui/inc/optdlg.hrc sc/source/ui/inc/optdlg.hrc
+index e834a11..aaeb33d 100644
+--- sc/source/ui/inc/optdlg.hrc
++++ sc/source/ui/inc/optdlg.hrc
+@@ -52,6 +52,7 @@
+ #define TP_LAYOUT           12
+ #define TP_INPUT            13
+ #define TP_CHANGES			14
++#define TP_FORMULA          15
+ 
+ // TP_CALC:
+ #define BTN_ITERATE			1
+@@ -192,3 +193,16 @@
+ #define CB_TEXTFMT		78
+ #define CB_REPLWARN     79
+ 
++
++// TP_FORMULA
++#define FL_FORMULA_OPTIONS        80
++#define FT_FORMULA_SYNTAX         81
++#define LB_FORMULA_SYNTAX         82
++#define FL_FORMULA_SEPS           83
++#define FT_FORMULA_SEP_ARG        84
++#define ED_FORMULA_SEP_ARG        85
++#define FT_FORMULA_SEP_ARRAY_R    86
++#define ED_FORMULA_SEP_ARRAY_R    87
++#define FT_FORMULA_SEP_ARRAY_C    88
++#define ED_FORMULA_SEP_ARRAY_C    89
++#define BTN_FORMULA_SEP_RESET     90
+diff --git sc/source/ui/inc/tpformula.hxx sc/source/ui/inc/tpformula.hxx
+new file mode 100644
+index 0000000..054655e
+--- /dev/null
++++ sc/source/ui/inc/tpformula.hxx
+@@ -0,0 +1,96 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: tpcalc.hxx,v $
++ * $Revision: 1.9 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_TPFORMULA_HXX
++#define SC_TPFORMULA_HXX
++
++#include <sfx2/tabdlg.hxx>
++#include <vcl/fixed.hxx>
++#include <vcl/lstbox.hxx>
++#include <vcl/edit.hxx>
++#include <vcl/button.hxx>
++
++#include <memory>
++
++class ScDocOptions;
++class SfxItemSet;
++class Window;
++
++class ScTpFormulaOptions : public SfxTabPage
++{
++public:
++    static  SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet);
++
++//  static  USHORT*     GetRanges();
++    virtual BOOL FillItemSet(SfxItemSet& rCoreSet);
++    virtual void Reset( const SfxItemSet& rCoreSet );
++    virtual int DeactivatePage(SfxItemSet* pSet = NULL);
++
++private:
++    explicit ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreSet);
++    virtual ~ScTpFormulaOptions();
++
++    void Init();
++    void ResetSeparators();
++    void OnFocusSeparatorInput(Edit* pEdit);
++
++    bool IsValidSeparator(const ::rtl::OUString& rSep) const;
++    bool IsValidSeparatorSet() const;
++
++    DECL_LINK( ButtonHdl, PushButton* );
++    DECL_LINK( SepModifyHdl, Edit* );
++    DECL_LINK( SepEditOnFocusHdl, Edit* );
++
++private:
++    FixedLine maFlFormulaOpt;
++    FixedText maFtFormulaSyntax;
++    ListBox   maLbFormulaSyntax;
++
++    FixedLine  maFlFormulaSeps;
++    FixedText  maFtSepFuncArg;  
++    Edit       maEdSepFuncArg;
++    FixedText  maFtSepArrayCol;
++    Edit       maEdSepArrayCol;
++    FixedText  maFtSepArrayRow;
++    Edit       maEdSepArrayRow;
++    PushButton maBtnSepReset;
++
++    ::std::auto_ptr<ScDocOptions> mpOldOptions;
++    ::std::auto_ptr<ScDocOptions> mpNewOptions;
++
++    /** Stores old separator value of currently focused separator edit box.
++        This value is used to revert undesired value change. */
++    ::rtl::OUString maOldSepValue;
++
++    sal_Unicode mnDecSep;
++};
++
++
++#endif
+diff --git sc/source/ui/optdlg/makefile.mk sc/source/ui/optdlg/makefile.mk
+index e8a6d20..cb43db7 100644
+--- sc/source/ui/optdlg/makefile.mk
++++ sc/source/ui/optdlg/makefile.mk
+@@ -47,6 +47,7 @@ CXXFILES = \
+         tpusrlst.cxx    \
+         tpview.cxx      \
+         tpcalc.cxx      \
++        tpformula.cxx   \
+         tpprint.cxx     \
+         opredlin.cxx
+ 
+@@ -54,6 +55,7 @@ SLOFILES =  \
+         $(SLO)$/tpusrlst.obj \
+         $(SLO)$/tpview.obj   \
+         $(SLO)$/tpcalc.obj	\
++        $(SLO)$/tpformula.obj	\
+         $(SLO)$/tpprint.obj	\
+         $(SLO)$/opredlin.obj
+ 
+diff --git sc/source/ui/optdlg/tpformula.cxx sc/source/ui/optdlg/tpformula.cxx
+new file mode 100644
+index 0000000..a27d5a7
+--- /dev/null
++++ sc/source/ui/optdlg/tpformula.cxx
+@@ -0,0 +1,289 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: tpcalc.hxx,v $
++ * $Revision: 1.9 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_sc.hxx"
++
++#undef SC_DLLIMPLEMENTATION
++
++
++
++//------------------------------------------------------------------
++
++#include "tpformula.hxx"
++#include "optdlg.hrc"
++#include "scresid.hxx"
++#include "formula/grammar.hxx"
++#include "docoptio.hxx"
++#include "global.hxx"
++
++#include <unotools/localedatawrapper.hxx>
++
++#include <com/sun/star/lang/Locale.hpp>
++#include <com/sun/star/i18n/LocaleDataItem.hpp>
++
++using ::rtl::OUString;
++using ::com::sun::star::lang::Locale;
++using ::com::sun::star::i18n::LocaleDataItem;
++
++ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreAttrs) :
++    SfxTabPage(pParent, ScResId(RID_SCPAGE_FORMULA), rCoreAttrs),
++
++    maFlFormulaOpt(this, ScResId(FL_FORMULA_OPTIONS)),
++    maFtFormulaSyntax(this, ScResId(FT_FORMULA_SYNTAX)),
++    maLbFormulaSyntax(this, ScResId(LB_FORMULA_SYNTAX)),
++    maFlFormulaSeps(this, ScResId(FL_FORMULA_SEPS)),
++    maFtSepFuncArg(this, ScResId(FT_FORMULA_SEP_ARG)),
++    maEdSepFuncArg(this, ScResId(ED_FORMULA_SEP_ARG)),
++    maFtSepArrayCol(this, ScResId(FT_FORMULA_SEP_ARRAY_C)),
++    maEdSepArrayCol(this, ScResId(ED_FORMULA_SEP_ARRAY_C)),
++    maFtSepArrayRow(this, ScResId(FT_FORMULA_SEP_ARRAY_R)),
++    maEdSepArrayRow(this, ScResId(ED_FORMULA_SEP_ARRAY_R)),
++    maBtnSepReset(this, ScResId(BTN_FORMULA_SEP_RESET)),
++
++    mpOldOptions(NULL),
++    mpNewOptions(NULL),
++    mnDecSep(0)
++{
++    FreeResource();
++
++    const ScTpCalcItem& rItem = static_cast<const ScTpCalcItem&>(
++        rCoreAttrs.Get(GetWhich(SID_SCDOCOPTIONS)));
++    mpOldOptions.reset(new ScDocOptions(rItem.GetDocOptions()));
++    mpNewOptions.reset(new ScDocOptions(rItem.GetDocOptions()));
++
++    Init();
++}
++
++ScTpFormulaOptions::~ScTpFormulaOptions()
++{
++}
++
++void ScTpFormulaOptions::Init()
++{
++    Link aLink = LINK( this, ScTpFormulaOptions, ButtonHdl );
++    maBtnSepReset.SetClickHdl(aLink);
++
++    aLink = LINK( this, ScTpFormulaOptions, SepModifyHdl );
++    maEdSepFuncArg.SetModifyHdl(aLink);
++    maEdSepArrayCol.SetModifyHdl(aLink);
++    maEdSepArrayRow.SetModifyHdl(aLink);
++
++    aLink = LINK( this, ScTpFormulaOptions, SepEditOnFocusHdl );
++    maEdSepFuncArg.SetGetFocusHdl(aLink);
++    maEdSepArrayCol.SetGetFocusHdl(aLink);
++    maEdSepArrayRow.SetGetFocusHdl(aLink);
++
++    // Get the decimal separator for current locale.
++    String aSep = mpOldOptions->GetLocaleDataWrapper().getNumDecimalSep();
++    mnDecSep = aSep.Len() ? aSep.GetChar(0) : sal_Unicode('.');
++}
++
++void ScTpFormulaOptions::ResetSeparators()
++{
++    ScDocOptions aOpt;
++    maEdSepFuncArg.SetText(aOpt.GetFormulaSepArg());
++    maEdSepArrayCol.SetText(aOpt.GetFormulaSepArrayCol());
++    maEdSepArrayRow.SetText(aOpt.GetFormulaSepArrayRow());
++}
++
++void ScTpFormulaOptions::OnFocusSeparatorInput(Edit* pEdit)
++{
++    if (!pEdit)
++        return;
++
++    // Make sure the entire text is selected.
++    xub_StrLen nLen = pEdit->GetText().Len();
++    Selection aSel(0, nLen);
++    pEdit->SetSelection(aSel);
++    maOldSepValue = pEdit->GetText();
++}
++
++bool ScTpFormulaOptions::IsValidSeparator(const OUString& rSep) const
++{
++    if (rSep.getLength() != 1)
++        // Must be one-character long.
++        return false;
++
++    if (rSep.compareToAscii("a") >= 0 && rSep.compareToAscii("z") <= 0)
++        return false;
++
++    if (rSep.compareToAscii("A") >= 0 && rSep.compareToAscii("Z") <= 0)
++        return false;
++
++    sal_Unicode c = rSep.getStr()[0];
++    switch (c)
++    {
++        case '+':
++        case '-':
++        case '/':
++        case '*':
++        case '<':
++        case '>':
++        case '[':
++        case ']':
++        case '(':
++        case ')':
++        case '"':
++        case '\'':
++            // Disallowed characters.  Anything else we want to disallow ?
++            return false;
++    }
++
++    if (c == mnDecSep)
++        // decimal separator is not allowed.
++        return false;
++
++    return true;
++}
++
++bool ScTpFormulaOptions::IsValidSeparatorSet() const
++{
++    // Make sure the column and row separators are different.
++    String aColStr = maEdSepArrayCol.GetText();
++    String aRowStr = maEdSepArrayRow.GetText();
++    if (aColStr == aRowStr)
++        return false;
++
++    return true;
++}
++
++IMPL_LINK( ScTpFormulaOptions, ButtonHdl, PushButton*, pBtn )
++{
++    if (pBtn == &maBtnSepReset)
++        ResetSeparators();
++
++    return 0;
++}
++
++IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, Edit*, pEdit )
++{
++    if (!pEdit)
++        return 0;
++
++    String aStr = pEdit->GetText();
++    if (aStr.Len() > 1)
++    {
++        // In case the string is more than one character long, only grab the 
++        // first character.
++        aStr = aStr.Copy(0, 1);
++        pEdit->SetText(aStr);
++    }
++
++    if ((!IsValidSeparator(aStr) || !IsValidSeparatorSet()) && maOldSepValue.getLength())
++        // Invalid separator.  Restore the old value.
++        pEdit->SetText(maOldSepValue);
++
++    OnFocusSeparatorInput(pEdit);
++    return 0;
++}
++
++IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Edit*, pEdit )
++{
++    OnFocusSeparatorInput(pEdit);
++    return 0;
++}
++
++// static
++SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreSet)
++{
++    return new ScTpFormulaOptions(pParent, rCoreSet);
++}
++
++BOOL ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet)
++{
++    ::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
++    switch (maLbFormulaSyntax.GetSelectEntryPos())
++    {
++        case 0:
++            eGram = ::formula::FormulaGrammar::GRAM_NATIVE;
++        break;
++        case 1:
++            eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1;
++        break;
++        case 2:
++            eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1;
++        break;
++    }
++
++    mpNewOptions->SetFormulaSyntax(eGram);
++
++    mpNewOptions->SetFormulaSepArg(maEdSepFuncArg.GetText());
++    mpNewOptions->SetFormulaSepArrayCol(maEdSepArrayCol.GetText());
++    mpNewOptions->SetFormulaSepArrayRow(maEdSepArrayRow.GetText());
++
++    if (*mpNewOptions != *mpOldOptions)
++    {
++        rCoreSet.Put(ScTpCalcItem(GetWhich(SID_SCDOCOPTIONS), *mpNewOptions));
++        return true;
++    }
++    else 
++        return false;
++}
++
++void ScTpFormulaOptions::Reset(const SfxItemSet& /*rCoreSet*/)
++{
++    ::formula::FormulaGrammar::Grammar eGram = mpNewOptions->GetFormulaSyntax();
++    switch (eGram)
++    {
++        case ::formula::FormulaGrammar::GRAM_NATIVE:
++            maLbFormulaSyntax.SelectEntryPos(0);
++        break;
++        case ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1:
++            maLbFormulaSyntax.SelectEntryPos(1);
++        break;
++        case ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1:
++            maLbFormulaSyntax.SelectEntryPos(2);
++        break;
++        default:
++            maLbFormulaSyntax.SelectEntryPos(0);
++    }
++    
++    OUString aSep = mpNewOptions->GetFormulaSepArg();
++    OUString aSepArrayRow = mpNewOptions->GetFormulaSepArrayRow();
++    OUString aSepArrayCol = mpNewOptions->GetFormulaSepArrayCol();
++
++    if (aSep.getLength() == 1 && aSepArrayRow.getLength() == 1 && aSepArrayCol.getLength() == 1)
++    {
++        // Each separator must be one character long.
++        maEdSepFuncArg.SetText(aSep);
++        maEdSepArrayCol.SetText(aSepArrayCol);
++        maEdSepArrayRow.SetText(aSepArrayRow);
++    }
++    else
++        ResetSeparators();    
++}
++
++int ScTpFormulaOptions::DeactivatePage(SfxItemSet* /*pSet*/)
++{
++    // What's this method for ?
++    return KEEP_PAGE;
++}
++
+diff --git sc/source/ui/src/optdlg.src sc/source/ui/src/optdlg.src
+index 82a1161..2ea00b8 100644
+--- sc/source/ui/src/optdlg.src
++++ sc/source/ui/src/optdlg.src
+@@ -176,6 +176,105 @@ TabPage RID_SCPAGE_CALC
+ /*                                                                        */
+ /**************************************************************************/
+ 
++TabPage RID_SCPAGE_FORMULA
++{
++    HelpId = HID_SCPAGE_FORMULA ;
++    SVLook = TRUE ;
++    Hide = TRUE ;
++    Pos = MAP_APPFONT ( 0 , 0 ) ;
++    Size = MAP_APPFONT ( 260 , 185 ) ;
++
++    FixedLine FL_FORMULA_OPTIONS
++    {
++        Pos = MAP_APPFONT ( 6 , 3 ) ;
++        Size = MAP_APPFONT ( 248 , 8 ) ;
++        Text [ en-US ] = "Formula options";
++    };
++
++    FixedText FT_FORMULA_SYNTAX
++    {
++        Pos = MAP_APPFONT ( 21, 16 ) ;
++        Size = MAP_APPFONT ( 80, 8 ) ;
++        Text [ en-US ] = "Formula ~syntax" ;
++    };
++
++    ListBox LB_FORMULA_SYNTAX
++    {
++        Border = TRUE ;
++        Pos = MAP_APPFONT ( 85, 14 ) ;
++        Size = MAP_APPFONT ( 60, 46 ) ;
++        DropDown = TRUE ;
++        StringList [ en-US ] =
++        {
++            < "Calc A1" ; Default ; > ;
++            < "Excel A1" ; Default ; > ;
++            < "Excel R1C1" ; Default ; > ;
++        };
++    };
++
++    FixedLine FL_FORMULA_SEPS
++    {
++        Pos = MAP_APPFONT ( 6 , 32 ) ;
++        Size = MAP_APPFONT ( 248 , 8 ) ;
++        Text [ en-US ] = "Separators";
++    };
++
++    FixedText FT_FORMULA_SEP_ARG
++    {
++        Pos = MAP_APPFONT ( 21, 45 );
++        Size = MAP_APPFONT ( 40, 8 );
++        Text [ en-US ] = "~Function";
++    };
++
++    Edit ED_FORMULA_SEP_ARG
++    {
++        Border = TRUE;
++        Pos = MAP_APPFONT ( 65, 43 );
++        Size = MAP_APPFONT ( 10, 12 );
++    };
++
++    FixedText FT_FORMULA_SEP_ARRAY_C
++    {
++        Pos = MAP_APPFONT ( 21, 63 );
++        Size = MAP_APPFONT ( 40, 8 );
++        Text [ en-US ] = "Array co~lumn";
++    };
++
++    Edit ED_FORMULA_SEP_ARRAY_C
++    {
++        Border = TRUE;
++        Pos = MAP_APPFONT ( 65, 61 );
++        Size = MAP_APPFONT ( 10, 12 );
++    };
++
++    FixedText FT_FORMULA_SEP_ARRAY_R
++    {
++        Pos = MAP_APPFONT ( 21, 81 );
++        Size = MAP_APPFONT ( 40, 8 );
++        Text [ en-US ] = "Array ~row";
++    };
++
++    Edit ED_FORMULA_SEP_ARRAY_R
++    {
++        Border = TRUE;
++        Pos = MAP_APPFONT ( 65, 79 );
++        Size = MAP_APPFONT ( 10, 12 );
++    };
++
++    PushButton BTN_FORMULA_SEP_RESET
++    {
++        Pos = MAP_APPFONT ( 21, 99 );
++        Size = MAP_APPFONT ( 40, 14 );
++        Text [ en-US ] = "Rese~t";
++    };
++};
++
++/**************************************************************************/
++/*                                                                        */
++/*                                                                        */
++/*                                                                        */
++/**************************************************************************/
++
+ TabPage RID_SCPAGE_USERLISTS
+ {
+ 	HelpId = HID_SCPAGE_USERLISTS ;
diff --git a/applied_patches/0153-calc-dp-custom-names-offapi.diff b/applied_patches/0153-calc-dp-custom-names-offapi.diff
deleted file mode 100644
index 8525f8b3e..000000000
--- a/applied_patches/0153-calc-dp-custom-names-offapi.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git offapi/com/sun/star/sheet/MemberResultFlags.idl offapi/com/sun/star/sheet/MemberResultFlags.idl
-index 788673c..943e9ac 100644
---- offapi/com/sun/star/sheet/MemberResultFlags.idl
-+++ offapi/com/sun/star/sheet/MemberResultFlags.idl
-@@ -59,6 +59,17 @@ published constants MemberResultFlags
- 	 */
- 	const long CONTINUE = 4;
- 
-+    //-------------------------------------------------------------------------
-+
-+    /** The element contains a grand total. 
-+     */
-+    const long GRANDTOTAL = 8;
-+
-+    //-------------------------------------------------------------------------
-+
-+    /** The element is a numeric value.
-+     */
-+    const long NUMERIC = 16;
- };
- 
- //=============================================================================
diff --git a/applied_patches/0431-calc-formula-variable-separators-svx.diff b/applied_patches/0153-calc-formula-variable-separators-svx.diff
similarity index 100%
rename from applied_patches/0431-calc-formula-variable-separators-svx.diff
rename to applied_patches/0153-calc-formula-variable-separators-svx.diff
diff --git a/applied_patches/0154-calc-dp-custom-names-sc.diff b/applied_patches/0154-calc-dp-custom-names-sc.diff
deleted file mode 100644
index 2036b1230..000000000
--- a/applied_patches/0154-calc-dp-custom-names-sc.diff
+++ /dev/null
@@ -1,2848 +0,0 @@
-diff --git sc/inc/dpobject.hxx sc/inc/dpobject.hxx
-index 2eff673..854e1da 100644
---- sc/inc/dpobject.hxx
-+++ sc/inc/dpobject.hxx
-@@ -38,6 +38,8 @@
- #include "dpoutput.hxx"
- #include <com/sun/star/sheet/XDimensionsSupplier.hpp>
- 
-+#include <memory>
-+
- //------------------------------------------------------------------
- 
- namespace com { namespace sun { namespace star { namespace sheet {
-@@ -66,6 +68,7 @@ class ScStrCollection;
- class TypedScStrCollection;
- struct PivotField;
- class ScDPCacheTable;
-+class ScDPTableData;
- 
- struct ScDPServiceDesc
- {
-@@ -101,6 +104,7 @@ private:
- 	ScSheetSourceDesc*		pSheetDesc;		//	for sheet data
- 	ScImportSourceDesc* 	pImpDesc;		//	for database data
- 	ScDPServiceDesc*		pServDesc;		//	for external service
-+    ::std::auto_ptr<ScDPTableData>  mpTableData;
- 											// cached data
- 	com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> xSource;
- 	ScDPOutput*				pOutput;
-@@ -113,6 +117,7 @@ private:
-     bool                    bHeaderLayout;  // TRUE : grid, FALSE : standard
- 
- 
-+    SC_DLLPRIVATE ScDPTableData*    GetTableData();
- 	SC_DLLPRIVATE void				CreateObjects();
- 	SC_DLLPRIVATE void				CreateOutput();
- 
-@@ -167,7 +172,14 @@ public:
- 	void				SetTag(const String& rNew);
- 	const String&		GetTag() const					{ return aTableTag; }
- 
--	BOOL				IsDimNameInUse( const String& rName ) const;
-+    /** 
-+     *  Data description cell displays the description of a data dimension if
-+     *  and only if there is only one data dimension.  It's usually located at
-+     *  the upper-left corner of the table output.
-+     */
-+    bool                IsDataDescriptionCell(const ScAddress& rPos);
-+
-+    bool                IsDimNameInUse(const ::rtl::OUString& rName) const;
- 	String				GetDimName( long nDim, BOOL& rIsDataLayout );
-     BOOL                IsDuplicated( long nDim );
-     long                GetDimCount();
-@@ -231,6 +245,8 @@ public:
- 	// (button attribute must be present)
- 	void				RefreshAfterLoad();
- 
-+    void                BuildAllDimensionMembers();
-+
- 	static BOOL			HasRegisteredSources();
- 	static com::sun::star::uno::Sequence<rtl::OUString> GetRegisteredSources();
- 	static com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier>
---- sc/inc/dpsave.hxx
-+++ sc/inc/dpsave.hxx
-@@ -34,9 +34,11 @@
- #include <tools/string.hxx>
- #include <tools/list.hxx>
- #include <com/sun/star/sheet/XDimensionsSupplier.hpp>
-+#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
- #include "scdllapi.h"
- #include <hash_map>
- #include <list>
-+#include <memory>
- 
- namespace com { namespace sun { namespace star { namespace sheet {
-     struct DataPilotFieldReference;
-@@ -46,6 +48,7 @@ namespace com { namespace sun { namespace star { namespace sheet {
- } } } }
- 
- class ScDPDimensionSaveData;
-+class ScDPTableData;
- 
- // --------------------------------------------------------------------
- //
-@@ -57,6 +60,7 @@ class ScDPSaveMember
- {
- private:
- 	String		aName;
-+    ::std::auto_ptr<rtl::OUString> mpLayoutName; // custom name to be displayed in the table.
- 	USHORT		nVisibleMode;
- 	USHORT		nShowDetailsMode;
- 
-@@ -77,18 +81,23 @@ public:
- 
-     void                    SetName( const String& rNew );  // used if the source member was renamed (groups)
- 
-+    SC_DLLPUBLIC void                    SetLayoutName( const ::rtl::OUString& rName );
-+    SC_DLLPUBLIC const ::rtl::OUString*  GetLayoutName() const;
-+    void                    RemoveLayoutName();
-+
- 	void					WriteToSource( const com::sun::star::uno::Reference<
-                                             com::sun::star::uno::XInterface>& xMember,
-                                             sal_Int32 nPosition );
- };
- 
- 
--class ScDPSaveDimension
-+class SC_DLLPUBLIC ScDPSaveDimension
- {
- private:
- 	String		aName;
--	String*		pLayoutName;		// alternative name for layout, not used (yet)
- 	String*		pSelectedPage;
-+    ::std::auto_ptr<rtl::OUString> mpLayoutName;
-+    ::std::auto_ptr<rtl::OUString> mpSubtotalName;
- 	BOOL		bIsDataLayout;
- 	BOOL		bDupFlag;
- 	USHORT		nOrientation;
-@@ -127,38 +136,43 @@ public:
- 
-     void                    SetName( const String& rNew );  // used if the source dim was renamed (groups)
- 
--    SC_DLLPUBLIC void					SetOrientation(USHORT nNew);
-+    void					SetOrientation(USHORT nNew);
--    SC_DLLPUBLIC void					SetSubTotals(long nCount, const USHORT* pFuncs);
-+    void					SetSubTotals(long nCount, const USHORT* pFuncs);
-     long                    GetSubTotalsCount() const { return nSubTotalCount; }
-     USHORT                  GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; }
--    SC_DLLPUBLIC void					SetShowEmpty(BOOL bSet);
-+    void					SetShowEmpty(BOOL bSet);
-     BOOL                    GetShowEmpty() const { return BOOL(nShowEmptyMode); }
--    SC_DLLPUBLIC void					SetFunction(USHORT nNew);		// enum GeneralFunction
-+    void					SetFunction(USHORT nNew);		// enum GeneralFunction
-     USHORT                  GetFunction() const { return nFunction; }
-     void					SetUsedHierarchy(long nNew);
-     long                    GetUsedHierarchy() const { return nUsedHierarchy; }
--    SC_DLLPUBLIC void					SetLayoutName(const String* pName);
--    SC_DLLPUBLIC const String&			GetLayoutName() const;
--    SC_DLLPUBLIC BOOL					HasLayoutName() const;
-+
-+    void                    SetLayoutName(const ::rtl::OUString& rName);
-+    const ::rtl::OUString*  GetLayoutName() const;
-+    void                    RemoveLayoutName();
-+    void                    SetSubtotalName(const ::rtl::OUString& rName);
-+    const ::rtl::OUString*  GetSubtotalName() const;
-+
-+    bool                    IsMemberNameInUse(const ::rtl::OUString& rName) const;
- 
-     const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const	{ return pReferenceValue; }
--    SC_DLLPUBLIC void					SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
-+    void					SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
- 
-     const ::com::sun::star::sheet::DataPilotFieldSortInfo* GetSortInfo() const          { return pSortInfo; }
--    SC_DLLPUBLIC void                    SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew);
-+    void                    SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew);
-     const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* GetAutoShowInfo() const  { return pAutoShowInfo; }
--    SC_DLLPUBLIC void                    SetAutoShowInfo(const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pNew);
-+    void                    SetAutoShowInfo(const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pNew);
-     const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* GetLayoutInfo() const      { return pLayoutInfo; }
--    SC_DLLPUBLIC void                    SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew);
-+    void                    SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew);
- 
--    SC_DLLPUBLIC void					SetCurrentPage( const String* pPage );		// NULL = no selection (all)
--    SC_DLLPUBLIC BOOL					HasCurrentPage() const;
--    SC_DLLPUBLIC const String&			GetCurrentPage() const;
-+    void					SetCurrentPage( const String* pPage );		// NULL = no selection (all)
-+    BOOL					HasCurrentPage() const;
-+    const String&			GetCurrentPage() const;
- 
-     USHORT					GetOrientation() const	{ return nOrientation; }
- 
-     ScDPSaveMember* 		GetExistingMemberByName(const String& rName);
--    SC_DLLPUBLIC ScDPSaveMember*			GetMemberByName(const String& rName);
-+    ScDPSaveMember*			GetMemberByName(const String& rName);
- 
-     void                    SetMemberPosition( const String& rName, sal_Int32 nNewPos );
- 
-@@ -180,6 +194,12 @@ private:
-     BOOL        bFilterButton;      // not passed to DataPilotSource
-     BOOL        bDrillDown;         // not passed to DataPilotSource
- 
-+    /** if true, all dimensions already have all of their member instances
-+     *  created. */
-+    bool        mbDimensionMembersBuilt; 
-+
-+    ::std::auto_ptr<rtl::OUString> mpGrandTotalName;
-+
- public:
-     SC_DLLPUBLIC						ScDPSaveData();
- 							ScDPSaveData(const ScDPSaveData& r);
-@@ -189,11 +209,15 @@ public:
- 
- 	BOOL		 			operator== ( const ScDPSaveData& r ) const;
- 
-+    SC_DLLPUBLIC void                    SetGrandTotalName(const ::rtl::OUString& rName);
-+    SC_DLLPUBLIC const ::rtl::OUString*  GetGrandTotalName() const;
-+
- 	const List&				GetDimensions() const { return aDimList; }
- 	void					AddDimension(ScDPSaveDimension* pDim) { aDimList.Insert(pDim, LIST_APPEND); }
- 
- 	ScDPSaveDimension*		GetDimensionByName(const String& rName);
-     SC_DLLPUBLIC ScDPSaveDimension*		GetDataLayoutDimension();
-+    SC_DLLPUBLIC ScDPSaveDimension*      GetExistingDataLayoutDimension() const;
- 
- 	ScDPSaveDimension*		DuplicateDimension(const String& rName);
-     SC_DLLPUBLIC ScDPSaveDimension&      DuplicateDimension(const ScDPSaveDimension& rDim);
-@@ -204,6 +228,7 @@ public:
-     void                    RemoveDimensionByName(const String& rName);
- 
-     ScDPSaveDimension*      GetInnermostDimension(USHORT nOrientation);
-+    ScDPSaveDimension*      GetFirstDimension(::com::sun::star::sheet::DataPilotFieldOrientation eOrientation);
-     long                    GetDataDimensionCount() const;
- 
- 
-@@ -230,6 +255,7 @@ public:
-     const ScDPDimensionSaveData* GetExistingDimensionData() const   { return pDimensionData; }
-     SC_DLLPUBLIC ScDPDimensionSaveData*  GetDimensionData();     // create if not there
-     void                    SetDimensionData( const ScDPDimensionSaveData* pNew );      // copied
-+    void                    BuildAllDimensionMembers(ScDPTableData* pData);
- };
- 
- 
-diff --git sc/inc/dptabres.hxx sc/inc/dptabres.hxx
-index 3fb5ef8..60ad93e 100644
---- sc/inc/dptabres.hxx
-+++ sc/inc/dptabres.hxx
-@@ -41,6 +41,7 @@
- #include <hash_map>
- #include <hash_set>
- #include <vector>
-+#include <memory>
- 
- namespace com { namespace sun { namespace star { namespace sheet {
-     struct DataPilotFieldReference;
-@@ -262,7 +263,7 @@ public:
- 
- 	long				GetMeasureCount() const		{ return nMeasCount; }
- 	ScSubTotalFunc		GetMeasureFunction(long nMeasure) const;
--	String				GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc) const;
-+    String              GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const;
- 	String				GetMeasureDimensionName(long nMeasure) const;
- 	const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const;
- 	USHORT				GetMeasureRefOrient(long nMeasure) const;
-@@ -284,6 +285,8 @@ public:
-                                     const ScDPItemData& rBaseData, long nBaseIndex ) const;
-     BOOL                HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
-                                           const ScDPItemData& rSecondData, long nSecondIndex ) const;
-+
-+    const ScDPSource*   GetSource() const;
- };
- 
- 
-diff --git sc/inc/dptabsrc.hxx sc/inc/dptabsrc.hxx
-index f7ae03b..9d6e8e4 100644
---- sc/inc/dptabsrc.hxx
-+++ sc/inc/dptabsrc.hxx
-@@ -33,6 +33,7 @@
- 
- #include <vector>
- #include <hash_map>
-+#include <memory>
- #include <tools/string.hxx>
- #include <tools/list.hxx>
- #include "global.hxx"		// enum ScSubTotalFunc
-@@ -108,7 +109,7 @@ class ScDPSource : public cppu::WeakImplHelper6<
- 							com::sun::star::lang::XServiceInfo >
- {
- private:
--	ScDPTableData*			pData;				// data source
-+	ScDPTableData*			pData;				// data source (ScDPObject manages its life time)
- 	ScDPDimensions*			pDimensions;		// api objects
- 												// settings:
- 	long					nColDims[SC_DAPI_MAXFIELDS];
-@@ -136,6 +137,8 @@ private:
- 	List					aRowLevelList;
- 	BOOL					bResultOverflow;
- 
-+    ::std::auto_ptr<rtl::OUString> mpGrandTotalName;
-+
- 	void					CreateRes_Impl();
- 	void					FillMemberResults();
- 	void					FillLevelList( USHORT nOrientation, List& rList );
-@@ -162,11 +165,15 @@ public:
- 	ScDPTableData*			GetData()		{ return pData; }
- 	const ScDPTableData*	GetData() const	{ return pData; }
- 
-+    void                    SetGrandTotalName(const ::rtl::OUString& rName);
-+    const ::rtl::OUString*  GetGrandTotalName() const;
-+
- 	USHORT					GetOrientation(long nColumn);
- 	void					SetOrientation(long nColumn, USHORT nNew);
- 	long					GetPosition(long nColumn);
- 
- 	long					GetDataDimensionCount();
-+    ScDPDimension*          GetDataDimension(long nIndex);
- 	String					GetDataDimName(long nIndex);
- 	BOOL					IsDataLayoutDimension(long nDim);
- 	USHORT					GetDataLayoutOrientation();
-@@ -333,6 +340,8 @@ private:
- 	long				nUsedHier;
- 	USHORT				nFunction;			// enum GeneralFunction
- 	String				aName;				// if empty, take from source
-+    ::std::auto_ptr<rtl::OUString> mpLayoutName;
-+    ::std::auto_ptr<rtl::OUString> mpSubtotalName;
- 	long				nSourceDim;			// >=0 if dup'ed
-     ::com::sun::star::sheet::DataPilotFieldReference
-                         aReferenceValue;    // settings for "show data as" / "displayed value"
-@@ -350,6 +359,9 @@ public:
- 	ScDPDimension*			CreateCloneObject();
- 	ScDPHierarchies*		GetHierarchiesObject();
- 
-+    SC_DLLPUBLIC const ::rtl::OUString*  GetLayoutName() const;
-+    const ::rtl::OUString*  GetSubtotalName() const;
-+
- 							// XNamed
- 	virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
- 	virtual void SAL_CALL	setName( const ::rtl::OUString& aName )
-@@ -736,7 +748,7 @@ private:
- 	long			nLev;
- 
- 	ScDPItemData	maData;
--//	String			aCaption;			// visible name (changeable by user)
-+    ::std::auto_ptr<rtl::OUString> mpLayoutName;
- 
-     sal_Int32       nPosition;          // manual sorting
- 	BOOL			bVisible;
-@@ -750,6 +762,7 @@ public:
- 	BOOL					IsNamedItem( const ScDPItemData& r ) const;
- 	String					GetNameStr() const;
- 	void					FillItemData( ScDPItemData& rData ) const;
-+    SC_DLLPUBLIC const ::rtl::OUString*  GetLayoutName() const;
- 
-     sal_Int32               Compare( const ScDPMember& rOther ) const;      // visible order
- 
-diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
-index abfcf3a..6afb1a3 100644
---- sc/inc/unonames.hxx
-+++ sc/inc/unonames.hxx
-@@ -563,6 +563,9 @@
- #define SC_UNO_ROWFIELDCOUNT        "RowFieldCount"
- #define SC_UNO_COLUMNFIELDCOUNT     "ColumnFieldCount"
- #define SC_UNO_DATAFIELDCOUNT       "DataFieldCount"
-+#define SC_UNO_LAYOUTNAME           "LayoutName"
-+#define SC_UNO_FIELD_SUBTOTALNAME   "FieldSubtotalName"
-+#define SC_UNO_GRANDTOTAL_NAME      "GrandTotalName"
- 
- //  (preliminary:)
- #define SC_UNO_REFVALUE				"ReferenceValue"
-diff --git sc/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
-index d7c9a6c..afa90e9 100644
---- sc/source/core/data/dpobject.cxx
-+++ sc/source/core/data/dpobject.cxx
-@@ -78,6 +78,7 @@
- 
- using namespace com::sun::star;
- using ::std::vector;
-+using ::std::auto_ptr;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::UNO_QUERY;
-@@ -162,6 +163,7 @@ ScDPObject::ScDPObject( ScDocument* pD ) :
- 	pSheetDesc( NULL ),
- 	pImpDesc( NULL ),
- 	pServDesc( NULL ),
-+    mpTableData(NULL),
- 	pOutput( NULL ),
- 	nAutoFormatIndex( 65535 ),
- 	bSettingsChanged( FALSE ),
-@@ -184,6 +186,7 @@ ScDPObject::ScDPObject(const ScDPObject& r) :
- 	pSheetDesc( NULL ),
- 	pImpDesc( NULL ),
- 	pServDesc( NULL ),
-+    mpTableData(NULL), 
- 	pOutput( NULL ),
- 	bSettingsChanged( FALSE ),
- 	bAlive( FALSE ),
-@@ -342,6 +345,22 @@ void ScDPObject::SetTag(const String& rNew)
- 	aTableTag = rNew;
- }
- 
-+bool ScDPObject::IsDataDescriptionCell(const ScAddress& rPos)
-+{
-+    if (!pSaveData)
-+        return false;
-+
-+    long nDataDimCount = pSaveData->GetDataDimensionCount();
-+    if (nDataDimCount != 1)
-+        // There has to be exactly one data dimension for the description to 
-+        // appear at top-left corner.
-+        return false;
-+
-+    CreateOutput();
-+    ScRange aTabRange = pOutput->GetOutputRange(sheet::DataPilotOutputRangeType::TABLE);
-+    return (rPos == aTabRange.aStart);
-+}
-+
- uno::Reference<sheet::XDimensionsSupplier> ScDPObject::GetSource()
- {
- 	CreateObjects();
-@@ -384,6 +412,38 @@ void ScDPObject::CreateOutput()
- 	}
- }
- 
-+ScDPTableData* ScDPObject::GetTableData()
-+{
-+    if (!mpTableData.get())
-+    {
-+        if ( pImpDesc )
-+        {
-+            // database data
-+            mpTableData.reset(new ScDatabaseDPData(pDoc, *pImpDesc));
-+        }
-+        else
-+        {
-+            // cell data
-+            if (!pSheetDesc)
-+            {
-+                DBG_ERROR("no source descriptor");
-+                pSheetDesc = new ScSheetSourceDesc;     // dummy defaults
-+            }
-+            mpTableData.reset(new ScSheetDPData(pDoc, *pSheetDesc));
-+        }
-+
-+        // grouping (for cell or database data)
-+        if ( pSaveData && pSaveData->GetExistingDimensionData() )
-+        {
-+            auto_ptr<ScDPGroupTableData> pGroupData(new ScDPGroupTableData(mpTableData.release(), pDoc));
-+            pSaveData->GetExistingDimensionData()->WriteToData(*pGroupData);
-+            mpTableData = pGroupData;
-+        }
-+    }
-+
-+    return mpTableData.get();
-+}
-+
- void ScDPObject::CreateObjects()
- {
-     // if groups are involved, create a new source with the ScDPGroupTableData
-@@ -406,33 +466,9 @@ void ScDPObject::CreateObjects()
- 		if ( !xSource.is() )	// database or sheet data, or error in CreateSource
- 		{
- 			DBG_ASSERT( !pServDesc, "DPSource could not be created" );
--
--			ScDPTableData* pData = NULL;
--			if ( pImpDesc )
--			{
--			    // database data
--                pData = new ScDatabaseDPData( pDoc, *pImpDesc );
--			}
--			else
--			{
--			    // cell data
--    			if (!pSheetDesc)
--    			{
--    				DBG_ERROR("no source descriptor");
--    				pSheetDesc = new ScSheetSourceDesc;		// dummy defaults
--    			}
--    			pData = new ScSheetDPData( pDoc, *pSheetDesc );
--			}
--
--			// grouping (for cell or database data)
--			if ( pSaveData && pSaveData->GetExistingDimensionData() )
--			{
--			    ScDPGroupTableData* pGroupData = new ScDPGroupTableData( pData, pDoc );
--			    pSaveData->GetExistingDimensionData()->WriteToData( *pGroupData );
--			    pData = pGroupData;
--			}
--
--			xSource = new ScDPSource( pData );
-+            ScDPTableData* pData = GetTableData();
-+            ScDPSource* pSource = new ScDPSource( pData );
-+            xSource = pSource;
- 		}
- 
- 		if (pSaveData)
-@@ -554,6 +590,14 @@ void ScDPObject::RefreshAfterLoad()
- 	bInfoValid = TRUE;
- }
- 
-+void ScDPObject::BuildAllDimensionMembers()
-+{
-+    if (!pSaveData)
-+        return;
-+    
-+    pSaveData->BuildAllDimensionMembers(GetTableData());
-+}
-+
- void ScDPObject::UpdateReference( UpdateRefMode eUpdateRefMode,
- 									 const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
- {
-@@ -676,23 +720,33 @@ void ScDPObject::GetDrillDownData(const ScAddress& rPos, Sequence< Sequence<Any>
-     rTableData = xDrillDownData->getDrillDownData(filters);
- }
- 
--BOOL ScDPObject::IsDimNameInUse( const String& rName ) const
-+bool ScDPObject::IsDimNameInUse(const OUString& rName) const
- {
--	if ( xSource.is() )
--	{
--		uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
--		if ( xDimsName.is() )
--		{
--            rtl::OUString aCompare( rName );
--            uno::Sequence<rtl::OUString> aNames = xDimsName->getElementNames();
--            long nCount = aNames.getLength();
--            const rtl::OUString* pArr = aNames.getConstArray();
--            for (long nPos=0; nPos<nCount; nPos++)
--                if ( pArr[nPos] == aCompare )            //! ignore case
--                    return TRUE;
--		}
--	}
--	return FALSE;   // not found
-+    if (!xSource.is())
-+        return false;
-+
-+    Reference<container::XNameAccess> xDims = xSource->getDimensions();
-+    Sequence<OUString> aDimNames = xDims->getElementNames();
-+    sal_Int32 n = aDimNames.getLength();
-+    for (sal_Int32 i = 0; i < n; ++i)
-+    {
-+        const OUString& rDimName = aDimNames[i];
-+        if (rDimName.equalsIgnoreAsciiCase(rName))
-+            return true;
-+
-+        Reference<beans::XPropertySet> xPropSet(xDims->getByName(rDimName), UNO_QUERY);
-+        if (!xPropSet.is())
-+            continue;
-+
-+        Any any = xPropSet->getPropertyValue(OUString::createFromAscii(SC_UNO_LAYOUTNAME));
-+        OUString aLayoutName;
-+        if (any >>= aLayoutName)
-+        {
-+            if (aLayoutName.equalsIgnoreAsciiCase(rName))
-+                return true;
-+        }
-+    }
-+    return false;
- }
- 
- String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout )
-diff --git sc/source/core/data/dpoutput.cxx sc/source/core/data/dpoutput.cxx
-index a411c80..de9c898 100644
---- sc/source/core/data/dpoutput.cxx
-+++ sc/source/core/data/dpoutput.cxx
-@@ -81,6 +81,7 @@
- 
- using namespace com::sun::star;
- using ::std::vector;
-+using ::com::sun::star::beans::XPropertySet;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::uno::Reference;
-@@ -98,7 +99,6 @@ using ::rtl::OUString;
- #define DP_PROP_ORIENTATION			"Orientation"
- #define DP_PROP_POSITION			"Position"
- #define DP_PROP_USEDHIERARCHY		"UsedHierarchy"
--#define DP_PROP_DATADESCR			"DataDescription"
- #define DP_PROP_ISDATALAYOUT		"IsDataLayoutDimension"
- #define DP_PROP_NUMBERFORMAT		"NumberFormat"
- #define DP_PROP_FILTER				"Filter"
-@@ -119,7 +119,8 @@ struct ScDPOutLevelData
- 	long								nLevel;
- 	long								nDimPos;
- 	uno::Sequence<sheet::MemberResult>	aResult;
--	String								aCaption;
-+    String                              maName;   /// Name is the internal field name.
-+    String                              aCaption; /// Caption is the name visible in the output table.
- 
- 	ScDPOutLevelData() { nDim = nHier = nLevel = nDimPos = -1; }
- 
-@@ -444,7 +445,15 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 									xLevel, uno::UNO_QUERY );
- 							if ( xLevNam.is() && xLevRes.is() )
- 							{
--								String aCaption = String(xLevNam->getName());	//! Caption...
-+                                String aName = xLevNam->getName();
-+                                OUString aCaption = aName; // Caption equals the field name by default.
-+                                Reference<XPropertySet> xPropSet(xLevel, UNO_QUERY);
-+                                if (xPropSet.is())
-+                                {
-+                                    Any any = xPropSet->getPropertyValue(
-+                                        OUString::createFromAscii(SC_UNO_LAYOUTNAME));
-+                                    any >>= aCaption;
-+                                }
- 								switch ( eDimOrient )
- 								{
- 									case sheet::DataPilotFieldOrientation_COLUMN:
-@@ -453,6 +462,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 										pColFields[nColFieldCount].nLevel  = nLev;
- 										pColFields[nColFieldCount].nDimPos = nDimPos;
- 										pColFields[nColFieldCount].aResult = xLevRes->getResults();
-+                                        pColFields[nColFieldCount].maName  = aName;
- 										pColFields[nColFieldCount].aCaption= aCaption;
- 										if (!lcl_MemberEmpty(pColFields[nColFieldCount].aResult))
- 											++nColFieldCount;
-@@ -463,6 +473,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 										pRowFields[nRowFieldCount].nLevel  = nLev;
- 										pRowFields[nRowFieldCount].nDimPos = nDimPos;
- 										pRowFields[nRowFieldCount].aResult = xLevRes->getResults();
-+                                        pRowFields[nRowFieldCount].maName  = aName;
- 										pRowFields[nRowFieldCount].aCaption= aCaption;
- 										if (!lcl_MemberEmpty(pRowFields[nRowFieldCount].aResult))
- 											++nRowFieldCount;
-@@ -473,6 +484,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 										pPageFields[nPageFieldCount].nLevel  = nLev;
- 										pPageFields[nPageFieldCount].nDimPos = nDimPos;
- 										pPageFields[nPageFieldCount].aResult = lcl_GetSelectedPageAsResult(xDimProp);
-+                                        pPageFields[nPageFieldCount].maName  = aName;
- 										pPageFields[nPageFieldCount].aCaption= aCaption;
- 										// no check on results for page fields
- 										++nPageFieldCount;
-@@ -529,7 +541,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 		try
- 		{
- 			uno::Any aAny = xSrcProp->getPropertyValue(
--					rtl::OUString::createFromAscii(DP_PROP_DATADESCR) );
-+					rtl::OUString::createFromAscii(SC_UNO_DATADESC) );
- 			rtl::OUString aUStr;
- 			aAny >>= aUStr;
- 			aDataDescription = String( aUStr );
-@@ -606,9 +618,16 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
- 								const sheet::MemberResult& rData, BOOL bColHeader, long nLevel )
- {
- 	long nFlags = rData.Flags;
-+
-+    rtl::OUStringBuffer aCaptionBuf;
-+    if (!(nFlags & sheet::MemberResultFlags::NUMERIC))
-+        // This caption is not a number.  Make sure it won't get parsed as one.
-+        aCaptionBuf.append(sal_Unicode('\''));
-+    aCaptionBuf.append(rData.Caption);
-+
- 	if ( nFlags & sheet::MemberResultFlags::HASMEMBER )
- 	{
--		pDoc->SetString( nCol, nRow, nTab, rData.Caption );
-+        pDoc->SetString( nCol, nRow, nTab, aCaptionBuf.makeStringAndClear() );
- 	}
- 	else
- 	{
-@@ -1151,7 +1170,7 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>&
-     for (SCCOL nColField = 0; nColField < nColFieldCount && bFilterByCol; ++nColField)
-     {
-         sheet::DataPilotFieldFilter filter;
--        filter.FieldName = pColFields[nColField].aCaption;
-+        filter.FieldName = pColFields[nColField].maName;
- 
-         const uno::Sequence<sheet::MemberResult> rSequence = pColFields[nColField].aResult;
-         const sheet::MemberResult* pArray = rSequence.getConstArray();
-@@ -1168,10 +1187,15 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>&
-     }
- 
-     // row fields
-+    bool bDataLayoutExists = (nDataFieldCount > 1);
-     for (SCROW nRowField = 0; nRowField < nRowFieldCount && bFilterByRow; ++nRowField)
-     {
-+        if (bDataLayoutExists && nRowField == nRowFieldCount - 1)
-+            // There is no sense including the data layout field for filtering.
-+            continue;
-+
-         sheet::DataPilotFieldFilter filter;
--        filter.FieldName = pRowFields[nRowField].aCaption;
-+        filter.FieldName = pRowFields[nRowField].maName;
- 
-         const uno::Sequence<sheet::MemberResult> rSequence = pRowFields[nRowField].aResult;
-         const sheet::MemberResult* pArray = rSequence.getConstArray();
-@@ -1209,8 +1233,7 @@ bool lcl_IsNamedDataField( const ScDPGetPivotDataField& rTarget, const String& r
- 
- bool lcl_IsNamedCategoryField( const ScDPGetPivotDataField& rFilter, const ScDPOutLevelData& rField )
- {
--    //! name from source instead of caption?
--    return ScGlobal::pTransliteration->isEqual( rFilter.maFieldName, rField.aCaption );
-+    return ScGlobal::pTransliteration->isEqual( rFilter.maFieldName, rField.maName );
- }
- 
- bool lcl_IsCondition( const sheet::MemberResult& rResultEntry, const ScDPGetPivotDataField& rFilter )
---- sc/source/core/data/dpsave.cxx
-+++ sc/source/core/data/dpsave.cxx
-@@ -58,7 +58,12 @@
- #include <com/sun/star/container/XNamed.hpp>
- #include <com/sun/star/util/XCloneable.hpp>
- 
-+#include <hash_map>
-+
- using namespace com::sun::star;
-+using ::rtl::OUString;
-+using ::std::hash_map;
-+using ::std::auto_ptr;
- 
- // -----------------------------------------------------------------------
- 
-@@ -113,6 +118,7 @@ void lcl_SkipExtra( SvStream& rStream )
- 
- ScDPSaveMember::ScDPSaveMember(const String& rName) :
- 	aName( rName ),
-+    mpLayoutName(NULL),
- 	nVisibleMode( SC_DPSAVEMODE_DONTKNOW ),
- 	nShowDetailsMode( SC_DPSAVEMODE_DONTKNOW )
- {
-@@ -120,9 +126,12 @@ ScDPSaveMember::ScDPSaveMember(const String& rName) :
- 
- ScDPSaveMember::ScDPSaveMember(const ScDPSaveMember& r) :
- 	aName( r.aName ),
-+    mpLayoutName(NULL),
- 	nVisibleMode( r.nVisibleMode ),
- 	nShowDetailsMode( r.nShowDetailsMode )
- {
-+    if (r.mpLayoutName.get())
-+        mpLayoutName.reset(new OUString(*r.mpLayoutName));
- }
- 
- ScDPSaveMember::~ScDPSaveMember()
-@@ -167,6 +176,21 @@ void ScDPSaveMember::SetName( const String& rNew )
-     aName = rNew;
- }
- 
-+void ScDPSaveMember::SetLayoutName( const OUString& rName )
-+{
-+    mpLayoutName.reset(new OUString(rName));
-+}
-+
-+const OUString* ScDPSaveMember::GetLayoutName() const
-+{
-+    return mpLayoutName.get();
-+}
-+
-+void ScDPSaveMember::RemoveLayoutName()
-+{
-+    mpLayoutName.reset(NULL);
-+}
-+
- void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMember, sal_Int32 nPosition )
- {
- 	//	nothing to do?
-@@ -187,6 +211,18 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
- 			lcl_SetBoolProperty( xMembProp,
- 					rtl::OUString::createFromAscii(DP_PROP_SHOWDETAILS), (BOOL)nShowDetailsMode );
- 
-+        if (mpLayoutName.get())
-+        {
-+            try
-+            {
-+                uno::Any any;
-+                any <<= rtl::OUString(*mpLayoutName);
-+                xMembProp->setPropertyValue(rtl::OUString::createFromAscii(SC_UNO_LAYOUTNAME), any);
-+            }
-+            catch (uno::Exception&)
-+            {
-+            }
-+        }
-         if ( nPosition >= 0 )
-         {
-             try
-@@ -205,8 +241,9 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
- 
- ScDPSaveDimension::ScDPSaveDimension(const String& rName, BOOL bDataLayout) :
- 	aName( rName ),
--	pLayoutName( NULL ),
- 	pSelectedPage( NULL ),
-+	mpLayoutName(NULL),
-+	mpSubtotalName(NULL),
- 	bIsDataLayout( bDataLayout ),
- 	bDupFlag( FALSE ),
- 	nOrientation( sheet::DataPilotFieldOrientation_HIDDEN ),
-@@ -225,6 +262,8 @@ ScDPSaveDimension::ScDPSaveDimension(const String& rName, BOOL bDataLayout) :
- 
- ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
- 	aName( r.aName ),
-+	mpLayoutName(NULL),
-+	mpSubtotalName(NULL),
- 	bIsDataLayout( r.bIsDataLayout ),
- 	bDupFlag( r.bDupFlag ),
- 	nOrientation( r.nOrientation ),
-@@ -265,14 +304,14 @@ ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
-         pLayoutInfo = new sheet::DataPilotFieldLayoutInfo( *(r.pLayoutInfo) );
-     else
-         pLayoutInfo = NULL;
--	if (r.pLayoutName)
--		pLayoutName = new String( *(r.pLayoutName) );
--	else
--		pLayoutName = NULL;
- 	if (r.pSelectedPage)
- 		pSelectedPage = new String( *(r.pSelectedPage) );
- 	else
- 		pSelectedPage = NULL;
-+	if (r.mpLayoutName.get())
-+        mpLayoutName.reset(new OUString(*r.mpLayoutName));
-+	if (r.mpSubtotalName.get())
-+		mpSubtotalName.reset(new OUString(*r.mpSubtotalName));
- }
- 
- ScDPSaveDimension::~ScDPSaveDimension()
-@@ -283,7 +322,6 @@ ScDPSaveDimension::~ScDPSaveDimension()
-     delete pSortInfo;
-     delete pAutoShowInfo;
-     delete pLayoutInfo;
--	delete pLayoutName;
- 	delete pSelectedPage;
-     delete [] pSubTotalFuncs;
- }
-@@ -395,25 +433,45 @@ void ScDPSaveDimension::SetUsedHierarchy(long nNew)
- 	nUsedHierarchy = nNew;
- }
- 
--BOOL ScDPSaveDimension::HasLayoutName() const
-+void ScDPSaveDimension::SetSubtotalName(const OUString& rName)
- {
--	return ( pLayoutName != NULL );
-+	mpSubtotalName.reset(new OUString(rName));
- }
- 
--void ScDPSaveDimension::SetLayoutName(const String* pName)
-+const OUString* ScDPSaveDimension::GetSubtotalName() const
- {
--	delete pLayoutName;
--	if (pName)
--		pLayoutName = new String( *pName );
--	else
--		pLayoutName = NULL;
-+	return mpSubtotalName.get();
- }
- 
--const String& ScDPSaveDimension::GetLayoutName() const
-+bool ScDPSaveDimension::IsMemberNameInUse(const OUString& rName) const
- {
--	if (pLayoutName)
--		return *pLayoutName;
--	return aName;
-+    MemberList::const_iterator itr = maMemberList.begin(), itrEnd = maMemberList.end();
-+    for (; itr != itrEnd; ++itr)
-+    {
-+        const ScDPSaveMember* pMem = *itr;
-+        if (rName.equalsIgnoreAsciiCase(pMem->GetName()))
-+            return true;
-+
-+        const OUString* pLayoutName = pMem->GetLayoutName();
-+        if (pLayoutName && rName.equalsIgnoreAsciiCase(*pLayoutName))
-+            return true;
-+    }
-+    return false;
-+}
-+
-+void ScDPSaveDimension::SetLayoutName(const OUString& rName)
-+{
-+    mpLayoutName.reset(new OUString(rName));
-+}
-+
-+const OUString* ScDPSaveDimension::GetLayoutName() const
-+{
-+	return mpLayoutName.get();
-+}
-+
-+void ScDPSaveDimension::RemoveLayoutName()
-+{
-+    mpLayoutName.reset(NULL);
- }
- 
- void ScDPSaveDimension::SetReferenceValue(const sheet::DataPilotFieldReference* pNew)
-@@ -549,6 +607,19 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
- 		{
- 			aAny <<= aFilter;
- 			xDimProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_FILTER), aAny );
-+            if (mpLayoutName.get())
-+            {
-+                aAny <<= *mpLayoutName;
-+                xDimProp->setPropertyValue(rtl::OUString::createFromAscii(SC_UNO_LAYOUTNAME), aAny);
-+            }
-+
-+            const OUString* pSubTotalName = GetSubtotalName();
-+            if (pSubTotalName)
-+            {
-+                // Custom subtotal name, with '?' being replaced by the visible field name later.
-+                aAny <<= *pSubTotalName;
-+                xDimProp->setPropertyValue(OUString::createFromAscii(SC_UNO_FIELD_SUBTOTALNAME), aAny);
-+            }
- 		}
- 		catch ( beans::UnknownPropertyException& )
- 		{
-@@ -691,7 +762,9 @@ ScDPSaveData::ScDPSaveData() :
- 	nIgnoreEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
-     nRepeatEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
-     bFilterButton( TRUE ),
--    bDrillDown( TRUE )
-+    bDrillDown( TRUE ),
-+    mbDimensionMembersBuilt(false),
-+    mpGrandTotalName(NULL)
- {
- }
- 
-@@ -701,7 +774,9 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) :
- 	nIgnoreEmptyMode( r.nIgnoreEmptyMode ),
- 	nRepeatEmptyMode( r.nRepeatEmptyMode ),
-     bFilterButton( r.bFilterButton ),
--    bDrillDown( r.bDrillDown )
-+    bDrillDown( r.bDrillDown ),
-+    mbDimensionMembersBuilt(r.mbDimensionMembersBuilt),
-+    mpGrandTotalName(NULL)
- {
-     if ( r.pDimensionData )
-         pDimensionData = new ScDPDimensionSaveData( *r.pDimensionData );
-@@ -714,6 +789,9 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) :
- 		ScDPSaveDimension* pNew = new ScDPSaveDimension( *(ScDPSaveDimension*)r.aDimList.GetObject(i) );
- 		aDimList.Insert( pNew, LIST_APPEND );
- 	}
-+
-+    if (r.mpGrandTotalName.get())
-+        mpGrandTotalName.reset(new OUString(*r.mpGrandTotalName));
- }
- 
- ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r )
-@@ -732,6 +810,7 @@ ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r )
- 		nRepeatEmptyMode = r.nRepeatEmptyMode;
-         bFilterButton    = r.bFilterButton;
-         bDrillDown       = r.bDrillDown;
-+        mbDimensionMembersBuilt = r.mbDimensionMembersBuilt;
- 
- 		//	remove old dimensions
- 
-@@ -750,6 +829,9 @@ ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r )
- 				new ScDPSaveDimension( *(ScDPSaveDimension*)r.aDimList.GetObject(i) );
- 			aDimList.Insert( pNew, LIST_APPEND );
- 		}
-+
-+        if (r.mpGrandTotalName.get())
-+            mpGrandTotalName.reset(new OUString(*r.mpGrandTotalName));
- 	}
- 	return *this;
- }
-@@ -761,7 +843,8 @@ BOOL ScDPSaveData::operator== ( const ScDPSaveData& r ) const
- 		 nIgnoreEmptyMode != r.nIgnoreEmptyMode ||
- 		 nRepeatEmptyMode != r.nRepeatEmptyMode ||
-          bFilterButton    != r.bFilterButton    ||
--         bDrillDown       != r.bDrillDown )
-+         bDrillDown       != r.bDrillDown ||
-+         mbDimensionMembersBuilt != r.mbDimensionMembersBuilt)
- 		return FALSE;
- 
-     if ( pDimensionData || r.pDimensionData )
-@@ -777,6 +860,16 @@ BOOL ScDPSaveData::operator== ( const ScDPSaveData& r ) const
- 				*(ScDPSaveDimension*)r.aDimList.GetObject(i) ) )
- 			return FALSE;
- 
-+    if (mpGrandTotalName.get())
-+    {
-+        if (!r.mpGrandTotalName.get())
-+            return false;
-+        if (!mpGrandTotalName->equals(*r.mpGrandTotalName))
-+            return false;
-+    }
-+    else if (r.mpGrandTotalName.get())
-+        return false;
-+
- 	return TRUE;
- }
- 
-@@ -790,6 +883,16 @@ ScDPSaveData::~ScDPSaveData()
-     delete pDimensionData;
- }
- 
-+void ScDPSaveData::SetGrandTotalName(const OUString& rName)
-+{
-+    mpGrandTotalName.reset(new OUString(rName));
-+}
-+
-+const OUString* ScDPSaveData::GetGrandTotalName() const
-+{
-+    return mpGrandTotalName.get();
-+}
-+
- ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const String& rName)
- {
- 	long nCount = aDimList.Count();
-@@ -832,6 +935,17 @@ ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const String& rName)
- 
- ScDPSaveDimension* ScDPSaveData::GetDataLayoutDimension()
- {
-+    ScDPSaveDimension* pDim = GetExistingDataLayoutDimension();
-+    if (pDim)
-+        return pDim;
-+
-+	ScDPSaveDimension* pNew = new ScDPSaveDimension( String(), TRUE );
-+	aDimList.Insert( pNew, LIST_APPEND );
-+	return pNew;
-+}
-+
-+ScDPSaveDimension* ScDPSaveData::GetExistingDataLayoutDimension() const
-+{
-     ULONG nCount = aDimList.Count();
-     for (ULONG i=0; i<nCount; i++)
- 	{
-@@ -839,9 +953,7 @@ ScDPSaveDimension* ScDPSaveData::GetDataLayoutDimension()
- 		if ( pDim->IsDataLayout() )
- 			return pDim;
- 	}
--	ScDPSaveDimension* pNew = new ScDPSaveDimension( String(), TRUE );
--	aDimList.Insert( pNew, LIST_APPEND );
--	return pNew;
-+    return NULL;
- }
- 
- ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const String& rName)
-@@ -895,6 +1007,18 @@ ScDPSaveDimension* ScDPSaveData::GetInnermostDimension(USHORT nOrientation)
-     return pInner;      // the last matching one
- }
- 
-+ScDPSaveDimension* ScDPSaveData::GetFirstDimension(sheet::DataPilotFieldOrientation eOrientation)
-+{
-+    long nCount = aDimList.Count();
-+    for (long i = 0; i < nCount; ++i)
-+    {
-+        ScDPSaveDimension* pDim = static_cast<ScDPSaveDimension*>(aDimList.GetObject(i));
-+        if (pDim->GetOrientation() == eOrientation && !pDim->IsDataLayout())
-+            return pDim;
-+    }
-+    return NULL;
-+}
-+
- long ScDPSaveData::GetDataDimensionCount() const
- {
-     long nDataCount = 0;
-@@ -1002,6 +1126,14 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
- 			if ( nRepeatEmptyMode != SC_DPSAVEMODE_DONTKNOW )
- 				lcl_SetBoolProperty( xSourceProp,
- 					rtl::OUString::createFromAscii(DP_PROP_REPEATIFEMPTY), (BOOL)nRepeatEmptyMode );
-+
-+            const OUString* pGrandTotalName = GetGrandTotalName();
-+            if (pGrandTotalName)
-+            {
-+                uno::Any any;
-+                any <<= *pGrandTotalName;
-+                xSourceProp->setPropertyValue(OUString::createFromAscii(SC_UNO_GRANDTOTAL_NAME), any);
-+            }
- 		}
- 		catch(uno::Exception&)
- 		{
-@@ -1125,3 +1257,50 @@ void ScDPSaveData::SetDimensionData( const ScDPDimensionSaveData* pNew )
-         pDimensionData = NULL;
- }
- 
-+void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
-+{
-+    if (mbDimensionMembersBuilt)
-+        return;
-+
-+    // First, build a dimension name-to-index map.
-+    typedef hash_map<OUString, long, ::rtl::OUStringHash> NameIndexMap;
-+    NameIndexMap aMap;
-+    long nColCount = pData->GetColumnCount();
-+    for (long i = 0; i < nColCount; ++i)
-+        aMap.insert( NameIndexMap::value_type(pData->getDimensionName(i), i));
-+
-+    NameIndexMap::const_iterator itrEnd = aMap.end();
-+
-+    sal_uInt32 n = aDimList.Count();
-+    for (sal_uInt32 i = 0; i < n; ++i)
-+    {
-+        ScDPSaveDimension* pDim = static_cast<ScDPSaveDimension*>(aDimList.GetObject(i));
-+        const String& rDimName = pDim->GetName();
-+        if (!rDimName.Len())
-+            // empty dimension name.  It must be data layout.
-+            continue;
-+
-+        NameIndexMap::const_iterator itr = aMap.find(rDimName);
-+        if (itr == itrEnd)
-+            // dimension name not in the data.  This should never happen!
-+            continue;
-+
-+        long nDimIndex = itr->second;
-+        const TypedScStrCollection& rMembers = pData->GetColumnEntries(nDimIndex);
-+        sal_uInt16 nMemberCount = rMembers.GetCount();
-+        for (sal_uInt16 j = 0; j < nMemberCount; ++j)
-+        {
-+            const String& rMemName = rMembers[j]->GetString();
-+            if (pDim->GetExistingMemberByName(rMemName))
-+                // this member instance already exists.  nothing to do.
-+                continue;
-+
-+            auto_ptr<ScDPSaveMember> pNewMember(new ScDPSaveMember(rMemName));
-+            pNewMember->SetIsVisible(true);
-+            pDim->AddMember(pNewMember.release());
-+        }
-+    }
-+
-+    mbDimensionMembersBuilt = true;
-+}
-+
-diff --git sc/source/core/data/dptabres.cxx sc/source/core/data/dptabres.cxx
-index d8f6454..e53ecb9 100644
---- sc/source/core/data/dptabres.cxx
-+++ sc/source/core/data/dptabres.cxx
-@@ -67,6 +67,7 @@ using ::std::vector;
- using ::std::pair;
- using ::std::hash_map;
- using ::com::sun::star::uno::Sequence;
-+using ::rtl::OUString;
- 
- // -----------------------------------------------------------------------
- 
-@@ -825,11 +826,11 @@ USHORT ScDPResultData::GetMeasureRefOrient(long nMeasure) const
-     return pMeasRefOrient[nMeasure];
- }
- 
--String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc) const
-+String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const
- {
- 	//	with bForce==TRUE, return function instead of "result" for single measure
- 	//	with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc
--
-+    rbTotalResult = false;
- 	if ( nMeasure < 0 || ( nMeasCount == 1 && !bForce && eForceFunc == SUBTOTAL_FUNC_NONE ) )
- 	{
- 		//	for user-specified subtotal function with all measures,
-@@ -837,12 +838,19 @@ String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFu
- 		if ( eForceFunc != SUBTOTAL_FUNC_NONE )
- 			return ScGlobal::GetRscString(nFuncStrIds[eForceFunc]);
- 
-+        rbTotalResult = true;
- 		return ScGlobal::GetRscString(STR_TABLE_ERGEBNIS);
- 	}
- 	else
- 	{
- 		DBG_ASSERT( pMeasNames && nMeasure < nMeasCount, "bumm" );
--
-+        ScDPDimension* pDataDim = pSource->GetDataDimension(nMeasure);
-+        if (pDataDim)
-+        {
-+            const OUString* pLayoutName = pDataDim->GetLayoutName();
-+            if (pLayoutName)
-+                return *pLayoutName;
-+        }
- 		String aRet;
- 		ScSubTotalFunc eFunc = ( eForceFunc == SUBTOTAL_FUNC_NONE ) ?
- 									GetMeasureFunction(nMeasure) : eForceFunc;
-@@ -896,6 +904,11 @@ BOOL ScDPResultData::HasCommonElement( const ScDPItemData& rFirstData, long nFir
-     return pSource->GetData()->HasCommonElement( rFirstData, nFirstIndex, rSecondData, nSecondIndex );
- }
- 
-+const ScDPSource* ScDPResultData::GetSource() const
-+{
-+    return pSource;
-+}
-+
- // -----------------------------------------------------------------------
- 
- 
-@@ -1172,6 +1185,25 @@ void ScDPResultMember::ProcessData( const vector<ScDPItemData>& aChildMembers, c
-     }
- }
- 
-+/** 
-+ * Parse subtotal string and replace all occurrences of '?' with the 
-+ * caption string. 
-+ */ 
-+static String lcl_parseSubtotalName(const String& rSubStr, const String& rCaption)
-+{
-+    String aNewStr;
-+    xub_StrLen n = rSubStr.Len();
-+    for (xub_StrLen i = 0; i < n; ++i)
-+    {
-+        sal_Unicode c = rSubStr.GetChar(i);
-+        if (c == sal_Unicode('?'))
-+            aNewStr.Append(rCaption);
-+        else
-+            aNewStr.Append(c);
-+    }
-+    return aNewStr;
-+}
-+
- void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pSequences,
- 											long& rPos, long nMeasure, BOOL bRoot,
- 											const String* pMemberName,
-@@ -1204,17 +1236,25 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
-     }
- 
- 	String aCaption = aName;
-+    if (pMemberDesc)
-+    {
-+        const OUString* pLayoutName = pMemberDesc->GetLayoutName();
-+        if (pLayoutName)
-+        {
-+            aCaption = *pLayoutName;
-+            bIsNumeric = false; // layout name is always non-numeric.
-+        }
-+    }
-+
- 	if ( pMemberCaption )					// use pMemberCaption if != NULL
- 		aCaption = *pMemberCaption;
- 	if (!aCaption.Len())
- 		aCaption = ScGlobal::GetRscString(STR_EMPTYDATA);
- 
--    if ( !bIsNumeric )
--    {
--        // add a "'" character so a string isn't parsed as value in the output cell
--        //! have a separate bit in Flags (MemberResultFlags) instead?
--        aCaption.Insert( (sal_Unicode) '\'', 0 );
--    }
-+    if (bIsNumeric)
-+        pArray[rPos].Flags |= sheet::MemberResultFlags::NUMERIC;
-+    else
-+        pArray[rPos].Flags &= ~sheet::MemberResultFlags::NUMERIC;
- 
- 	if ( nSize && !bRoot )					// root is overwritten by first dimension
- 	{
-@@ -1277,9 +1317,30 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
- 				if (bHasChild)
- 					eForce = lcl_GetForceFunc( pParentLevel, nUserPos );
- 
--				String aSubStr = aName;		//! caption?
-+                bool bTotalResult = false;
-+				String aSubStr = aCaption;
- 				aSubStr += ' ';
--				aSubStr += pResultData->GetMeasureString(nMemberMeasure, FALSE, eForce);
-+				aSubStr += pResultData->GetMeasureString(nMemberMeasure, FALSE, eForce, bTotalResult);
-+
-+                if (bTotalResult)
-+                {
-+                    if (pMemberDesc)
-+                    {
-+                        // single data field layout.
-+                        const OUString* pSubtotalName = pParentDim->GetSubtotalName();
-+                        if (pSubtotalName)
-+                            aSubStr = lcl_parseSubtotalName(*pSubtotalName, aCaption);
-+                        pArray[rPos].Flags &= ~sheet::MemberResultFlags::GRANDTOTAL;
-+                    }
-+                    else
-+                    {
-+                        // root member - subtotal (grand total?) for multi-data field layout.
-+                        const rtl::OUString* pGrandTotalName = pResultData->GetSource()->GetGrandTotalName();
-+                        if (pGrandTotalName)
-+                            aSubStr = *pGrandTotalName;
-+                        pArray[rPos].Flags |= sheet::MemberResultFlags::GRANDTOTAL;
-+                    }
-+                }
- 
- 				pArray[rPos].Name    = rtl::OUString(aName);
- 				pArray[rPos].Caption = rtl::OUString(aSubStr);
-@@ -2796,8 +2857,9 @@ void ScDPResultDimension::FillMemberResults( uno::Sequence<sheet::MemberResult>*
- 		//	in data layout dimension, use first member with different measures/names
- 		if ( bIsDataLayout )
- 		{
-+            bool bTotalResult = false;
- 			String aMbrName = pResultData->GetMeasureDimensionName( nSorted );
--			String aMbrCapt = pResultData->GetMeasureString( nSorted, FALSE, SUBTOTAL_FUNC_NONE );
-+			String aMbrCapt = pResultData->GetMeasureString( nSorted, FALSE, SUBTOTAL_FUNC_NONE, bTotalResult );
- 			maMemberArray[0]->FillMemberResults( pSequences, nPos, nSorted, FALSE, &aMbrName, &aMbrCapt );
- 		}
- 		else if ( pMember->IsVisible() )
---- sc/source/core/data/dptabsrc.cxx
-+++ sc/source/core/data/dptabsrc.cxx
-@@ -85,6 +85,7 @@ using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Any;
- using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo;
-+using ::rtl::OUString;
- 
- // -----------------------------------------------------------------------
- 
-@@ -141,15 +142,14 @@ ScDPSource::ScDPSource( ScDPTableData* pD ) :
- 	pRowResRoot( NULL ),
- 	pColResults( NULL ),
- 	pRowResults( NULL ),
--	bResultOverflow( FALSE )
-+	bResultOverflow( FALSE ),
-+    mpGrandTotalName(NULL)
- {
- 	pData->SetEmptyFlags( bIgnoreEmptyRows, bRepeatIfEmpty );
- }
- 
- ScDPSource::~ScDPSource()
- {
--	delete pData;			// ScDPTableData is not ref-counted
--
- 	if (pDimensions)
- 		pDimensions->release();		// ref-counted
- 
-@@ -163,6 +163,16 @@ ScDPSource::~ScDPSource()
- 	delete pResData;
- }
- 
-+void ScDPSource::SetGrandTotalName(const ::rtl::OUString& rName)
-+{
-+    mpGrandTotalName.reset(new ::rtl::OUString(rName));
-+}
-+
-+const ::rtl::OUString* ScDPSource::GetGrandTotalName() const
-+{
-+    return mpGrandTotalName.get();
-+}
-+
- USHORT ScDPSource::GetOrientation(long nColumn)
- {
- 	long i;
-@@ -186,16 +196,21 @@ long ScDPSource::GetDataDimensionCount()
- 	return nDataDimCount;
- }
- 
-+ScDPDimension* ScDPSource::GetDataDimension(long nIndex)
-+{
-+    if (nIndex < 0 || nIndex >= nDataDimCount)
-+        return NULL;
-+
-+    long nDimIndex = nDataDims[nIndex];
-+    return GetDimensionsObject()->getByIndex(nDimIndex);
-+}
-+
- String ScDPSource::GetDataDimName( long nIndex )
- {
- 	String aRet;
--	if ( nIndex >= 0 && nIndex < nDataDimCount )
--	{
--		long nDimIndex = nDataDims[nIndex];
--		ScDPDimension* pDim = GetDimensionsObject()->getByIndex(nDimIndex);
--		if (pDim)
--			aRet = String( pDim->getName() );
--	}
-+    ScDPDimension* pDim = GetDataDimension(nIndex);
-+    if (pDim)
-+        aRet = String(pDim->getName());
- 	return aRet;
- }
- 
-@@ -484,7 +499,10 @@ String ScDPSource::getDataDescription()
- 
- 	String aRet;
- 	if ( pResData->GetMeasureCount() == 1 )
--		aRet = pResData->GetMeasureString( 0, TRUE, SUBTOTAL_FUNC_NONE );
-+    {
-+        bool bTotalResult = false;
-+        aRet = pResData->GetMeasureString( 0, TRUE, SUBTOTAL_FUNC_NONE, bTotalResult );
-+    }
- 
- 	//	empty for more than one measure
- 
-@@ -1128,6 +1146,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
- 														throw(uno::RuntimeException)
- {
- 	ScUnoGuard aGuard;
-+    using beans::PropertyAttribute::READONLY;
- 
-     static SfxItemPropertyMapEntry aDPSourceMap_Impl[] =
- 	{
-@@ -1136,6 +1155,10 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
- 		{MAP_CHAR_LEN(SC_UNO_IGNOREEM),	0,	&getBooleanCppuType(),				0, 0 },		// for sheet data only
- 		{MAP_CHAR_LEN(SC_UNO_REPEATIF),	0,	&getBooleanCppuType(),				0, 0 },		// for sheet data only
- 		{MAP_CHAR_LEN(SC_UNO_ROWGRAND),	0,	&getBooleanCppuType(),				0, 0 },
-+        {MAP_CHAR_LEN(SC_UNO_ROWFIELDCOUNT),    0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
-+        {MAP_CHAR_LEN(SC_UNO_COLUMNFIELDCOUNT), 0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
-+        {MAP_CHAR_LEN(SC_UNO_DATAFIELDCOUNT),   0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
-+        {MAP_CHAR_LEN(SC_UNO_GRANDTOTAL_NAME),  0, &getCppuType(static_cast<OUString*>(0)), 0, 0 },
-         {0,0,0,0,0,0}
- 	};
- 	static uno::Reference<beans::XPropertySetInfo> aRef =
-@@ -1157,6 +1180,12 @@ void SAL_CALL ScDPSource::setPropertyValue( const rtl::OUString& aPropertyName,
- 		setIgnoreEmptyRows( lcl_GetBoolFromAny( aValue ) );
- 	else if ( aNameStr.EqualsAscii( SC_UNO_REPEATIF ) )
- 		setRepeatIfEmpty( lcl_GetBoolFromAny( aValue ) );
-+    else if (aNameStr.EqualsAscii(SC_UNO_GRANDTOTAL_NAME))
-+    {
-+        OUString aName;
-+        if (aValue >>= aName)
-+            mpGrandTotalName.reset(new OUString(aName));
-+    }
- 	else
- 	{
- 		DBG_ERROR("unknown property");
-@@ -1186,6 +1215,11 @@ uno::Any SAL_CALL ScDPSource::getPropertyValue( const rtl::OUString& aPropertyNa
-         aRet <<= static_cast<sal_Int32>(nColDimCount);
-     else if ( aNameStr.EqualsAscii( SC_UNO_DATAFIELDCOUNT ) )       // read-only
-         aRet <<= static_cast<sal_Int32>(nDataDimCount);
-+    else if (aNameStr.EqualsAscii(SC_UNO_GRANDTOTAL_NAME))
-+    {
-+        if (mpGrandTotalName.get())
-+            aRet <<= *mpGrandTotalName;
-+    }
- 	else
- 	{
- 		DBG_ERROR("unknown property");
-@@ -1333,6 +1367,8 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
- 	pHierarchies( NULL ),
- 	nUsedHier( 0 ),
- 	nFunction( SUBTOTAL_FUNC_SUM ),		// sum is default
-+    mpLayoutName(NULL),
-+    mpSubtotalName(NULL),
- 	nSourceDim( -1 ),
- 	bHasSelectedPage( FALSE ),
- 	pSelectedData( NULL )
-@@ -1360,6 +1396,16 @@ ScDPHierarchies* ScDPDimension::GetHierarchiesObject()
- 	return pHierarchies;
- }
- 
-+const rtl::OUString* ScDPDimension::GetLayoutName() const
-+{
-+    return mpLayoutName.get();
-+}
-+
-+const rtl::OUString* ScDPDimension::GetSubtotalName() const
-+{
-+    return mpSubtotalName.get();
-+}
-+
- uno::Reference<container::XNameAccess> SAL_CALL ScDPDimension::getHierarchies()
- 													throw(uno::RuntimeException)
- {
-@@ -1519,6 +1565,8 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
- 		{MAP_CHAR_LEN(SC_UNO_POSITION),	0,	&getCppuType((sal_Int32*)0),				0, 0 },
- 		{MAP_CHAR_LEN(SC_UNO_REFVALUE),	0,	&getCppuType((sheet::DataPilotFieldReference*)0), 0, 0 },
- 		{MAP_CHAR_LEN(SC_UNO_USEDHIER),	0,	&getCppuType((sal_Int32*)0),				0, 0 },
-+        {MAP_CHAR_LEN(SC_UNO_LAYOUTNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
-+        {MAP_CHAR_LEN(SC_UNO_FIELD_SUBTOTALNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
-         {0,0,0,0,0,0}
- 	};
- 	static uno::Reference<beans::XPropertySetInfo> aRef =
-@@ -1589,6 +1637,18 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
- 		}
- 		DELETEZ( pSelectedData );		// invalid after changing aSelectedPage
- 	}
-+    else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
-+    {
-+        OUString aTmpName;
-+        if (aValue >>= aTmpName)
-+            mpLayoutName.reset(new OUString(aTmpName));
-+    }
-+    else if (aNameStr.EqualsAscii(SC_UNO_FIELD_SUBTOTALNAME))
-+    {
-+        OUString aTmpName;
-+        if (aValue >>= aTmpName)
-+            mpSubtotalName.reset(new OUString(aTmpName));
-+    }
- 	else
- 	{
- 		DBG_ERROR("unknown property");
-@@ -1648,6 +1708,10 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert
- 		else
- 			aRet <<= uno::Sequence<sheet::TableFilterField>(0);
- 	}
-+    else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
-+        aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString::createFromAscii("");
-+    else if (aNameStr.EqualsAscii(SC_UNO_FIELD_SUBTOTALNAME))
-+        aRet <<= mpSubtotalName.get() ? *mpSubtotalName : OUString::createFromAscii("");
- 	else
- 	{
- 		DBG_ERROR("unknown property");
-@@ -2148,7 +2212,11 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
- 			return aRet;
- 	}
- 
--	return pSource->GetData()->getDimensionName( nSrcDim );		// (original) dimension name
-+    ScDPDimension* pDim = pSource->GetDimensionsObject()->getByIndex(nSrcDim);
-+    if (!pDim)
-+        return rtl::OUString();
-+
-+    return pDim->getName();
- }
- 
- void SAL_CALL ScDPLevel::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException)
-@@ -2251,6 +2319,20 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const rtl::OUString& aPropertyNam
- 	    aRet <<= aAutoShowInfo;
- 	else if ( aNameStr.EqualsAscii( SC_UNO_LAYOUT ) )
- 	    aRet <<= aLayoutInfo;
-+    else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
-+    {
-+        // read only property
-+        long nSrcDim = pSource->GetSourceDim(nDim);
-+        ScDPDimension* pDim = pSource->GetDimensionsObject()->getByIndex(nSrcDim);
-+        if (!pDim)
-+            return aRet;
-+
-+        const OUString* pLayoutName = pDim->GetLayoutName();
-+        if (!pLayoutName)
-+            return aRet;
-+
-+        aRet <<= *pLayoutName;
-+    }
- 	else
- 	{
- 		DBG_ERROR("unknown property");
-@@ -2543,6 +2625,7 @@ ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL,
- 	nHier( nH ),
- 	nLev( nL ),
- 	maData( rN, fV, bHV ),
-+    mpLayoutName(NULL),
-     nPosition( -1 ),
- 	bVisible( TRUE ),
- 	bShowDet( TRUE )
-@@ -2603,6 +2686,11 @@ void ScDPMember::FillItemData( ScDPItemData& rData ) const
- 	rData = maData;
- }
- 
-+const OUString* ScDPMember::GetLayoutName() const
-+{
-+    return mpLayoutName.get();
-+}
-+
- String ScDPMember::GetNameStr() const
- {
- 	return maData.aString;
-@@ -2662,6 +2750,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo(
- 		{MAP_CHAR_LEN(SC_UNO_ISVISIBL),	0,	&getBooleanCppuType(),				0, 0 },
-         {MAP_CHAR_LEN(SC_UNO_POSITION), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
- 		{MAP_CHAR_LEN(SC_UNO_SHOWDETA),	0,	&getBooleanCppuType(),				0, 0 },
-+        {MAP_CHAR_LEN(SC_UNO_LAYOUTNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
-         {0,0,0,0,0,0}
- 	};
- 	static uno::Reference<beans::XPropertySetInfo> aRef =
-@@ -2685,6 +2774,12 @@ void SAL_CALL ScDPMember::setPropertyValue( const rtl::OUString& aPropertyName,
-         if (aValue >>= nInt)
-             setPosition( nInt );
- 	}
-+    else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
-+    {
-+        rtl::OUString aName;
-+        if (aValue >>= aName)
-+            mpLayoutName.reset(new rtl::OUString(aName));
-+    }
- 	else
- 	{
- 		DBG_ERROR("unknown property");
-@@ -2704,6 +2799,8 @@ uno::Any SAL_CALL ScDPMember::getPropertyValue( const rtl::OUString& aPropertyNa
- 		lcl_SetBoolInAny( aRet, getShowDetails() );
-     else if ( aNameStr.EqualsAscii( SC_UNO_POSITION ) )
-         aRet <<= (sal_Int32) getPosition();
-+    else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
-+        aRet <<= mpLayoutName.get() ? *mpLayoutName : rtl::OUString();
- 	else
- 	{
- 		DBG_ERROR("unknown property");
-diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
-index 6b486ca..aa2b377 100644
---- sc/source/filter/excel/read.cxx
-+++ sc/source/filter/excel/read.cxx
-@@ -1199,6 +1199,9 @@ FltError ImportExcel8::Read( void )
-             eLastErr = SCWARN_IMPORT_ROW_OVERFLOW;
-         else if( rAddrConv.IsColTruncated() )
-             eLastErr = SCWARN_IMPORT_COLUMN_OVERFLOW;
-+
-+        if( GetBiff() == EXC_BIFF8 )                         
-+            GetPivotTableManager().MaybeRefreshPivotTables();
-     }
- 
- 	return eLastErr;
-diff --git sc/source/filter/excel/xepivot.cxx sc/source/filter/excel/xepivot.cxx
-index 2e7d2aa..0d43d06 100644
---- sc/source/filter/excel/xepivot.cxx
-+++ sc/source/filter/excel/xepivot.cxx
-@@ -67,6 +67,7 @@ using ::com::sun::star::sheet::DataPilotFieldSortInfo;
- using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo;
- using ::com::sun::star::sheet::DataPilotFieldLayoutInfo;
- using ::com::sun::star::sheet::DataPilotFieldReference;
-+using ::rtl::OUString;
- 
- using ::rtl::OString;
- using ::rtl::OUString;
-@@ -972,6 +973,11 @@ void XclExpPTItem::SetPropertiesFromMember( const ScDPSaveMember& rSaveMem )
- {
-     ::set_flag( maItemInfo.mnFlags, EXC_SXVI_HIDDEN, !rSaveMem.GetIsVisible() );
-     ::set_flag( maItemInfo.mnFlags, EXC_SXVI_HIDEDETAIL, !rSaveMem.GetShowDetails() );
-+
-+    // visible name
-+    const OUString* pVisName = rSaveMem.GetLayoutName();
-+    if (pVisName && !pVisName->equals(GetItemName()))
-+        maItemInfo.SetVisName(*pVisName);
- }
- 
- void XclExpPTItem::WriteBody( XclExpStream& rStrm )
-@@ -1040,8 +1046,13 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
-     ::set_flag( maFieldExtInfo.mnFlags, EXC_SXVDEX_SHOWALL, rSaveDim.GetShowEmpty() );
- 
-     // visible name
--    if( rSaveDim.HasLayoutName() && (rSaveDim.GetLayoutName() != GetFieldName()) )
--        maFieldInfo.SetVisName( rSaveDim.GetLayoutName() );
-+    const OUString* pLayoutName = rSaveDim.GetLayoutName();
-+    if (pLayoutName && !pLayoutName->equals(GetFieldName()))
-+        maFieldInfo.SetVisName(*pLayoutName);
-+
-+    const rtl::OUString* pSubtotalName = rSaveDim.GetSubtotalName();
-+    if (pSubtotalName)
-+        maFieldExtInfo.mpFieldTotalName.reset(new rtl::OUString(*pSubtotalName));
- 
-     // subtotals
-     XclPTSubtotalVec aSubtotals;
-@@ -1108,7 +1119,11 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim
-     rDataInfo.SetApiAggFunc( eFunc );
- 
-     // visible name
--    rDataInfo.SetVisName( lclGetDataFieldCaption( GetFieldName(), eFunc ) );
-+    const rtl::OUString* pVisName = rSaveDim.GetLayoutName();
-+    if (pVisName)
-+        rDataInfo.SetVisName(*pVisName);
-+    else
-+        rDataInfo.SetVisName( lclGetDataFieldCaption( GetFieldName(), eFunc ) );
- 
-     // result field reference
-     if( const DataPilotFieldReference* pFieldRef = rSaveDim.GetReferenceValue() )
-@@ -1217,10 +1232,9 @@ XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& r
-         // pivot table properties from DP object
-         mnOutScTab = rOutScRange.aStart.Tab();
-         maPTInfo.maTableName = rDPObj.GetName();
--        maPTInfo.maDataName = ScGlobal::GetRscString( STR_PIVOT_DATA );
-         maPTInfo.mnCacheIdx = mrPCache.GetCacheIndex();
- 
--        maPTAutoFormat.Init( rDPObj );
-+        maPTViewEx9Info.Init( rDPObj );
- 
-         if( const ScDPSaveData* pSaveData = rDPObj.GetSaveData() )
-         {
-@@ -1301,8 +1315,10 @@ void XclExpPivotTable::Save( XclExpStream& rStrm )
-         WriteSxli( rStrm, maPTInfo.mnDataCols, maPTInfo.mnColFields );
-         // SXEX
-         WriteSxex( rStrm );
--        // SX_AUTOFORMAT
--        WriteSxAutoformat( rStrm );
-+        // QSISXTAG
-+        WriteQsiSxTag( rStrm );
-+        // SXVIEWEX9
-+        WriteSxViewEx9( rStrm );
-     }
- }
- 
-@@ -1336,6 +1352,15 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData )
-     ::set_flag( maPTInfo.mnFlags, EXC_SXVIEW_COLGRAND, rSaveData.GetColumnGrand() );
-     ::set_flag( maPTExtInfo.mnFlags, EXC_SXEX_DRILLDOWN, rSaveData.GetDrillDown() );
-     mbFilterBtn = rSaveData.GetFilterButton();
-+    const ScDPSaveDimension* pDim = rSaveData.GetExistingDataLayoutDimension();
-+    if (!pDim)
-+        return;
-+
-+    const rtl::OUString* pLayoutName = pDim->GetLayoutName();
-+    if (pLayoutName)
-+        maPTInfo.maDataName = *pLayoutName;
-+    else
-+        maPTInfo.maDataName = ScGlobal::GetRscString(STR_PIVOT_DATA);
- }
- 
- void XclExpPivotTable::SetFieldPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
-@@ -1443,17 +1468,21 @@ void XclExpPivotTable::Finalize()
-     rnDataXclRow = rnXclRow1 + maPTInfo.mnColFields + 1;
-     if( maDataFields.empty() )
-         ++rnDataXclRow;
--    if( 0 == maPTAutoFormat.mnGridLayout )
-+
-+    bool bExtraHeaderRow = (0 == maPTViewEx9Info.mnGridLayout && maPTInfo.mnColFields == 0);
-+    if (bExtraHeaderRow)
-+        // Insert an extra row only when there is no column field.
-         ++rnDataXclRow;
-+
-     rnXclCol2 = ::std::max( rnXclCol2, rnDataXclCol );
-     rnXclRow2 = ::std::max( rnXclRow2, rnDataXclRow );
-     maPTInfo.mnDataCols = rnXclCol2 - rnDataXclCol + 1;
-     maPTInfo.mnDataRows = rnXclRow2 - rnDataXclRow + 1;
- 
-     // first heading
--    maPTInfo.mnFirstHeadRow = rnXclRow1 + 1;
--    if( 0 == maPTAutoFormat.mnGridLayout )
--        maPTInfo.mnFirstHeadRow++;
-+    maPTInfo.mnFirstHeadRow = rnXclRow1;
-+    if (bExtraHeaderRow)
-+        maPTInfo.mnFirstHeadRow += 2;
- }
- 
- // records ----------------------------------------------------------------
-@@ -1529,14 +1558,68 @@ void XclExpPivotTable::WriteSxex( XclExpStream& rStrm ) const
-     rStrm.EndRecord();
- }
- 
--void XclExpPivotTable::WriteSxAutoformat( XclExpStream& rStrm ) const
-+void XclExpPivotTable::WriteQsiSxTag( XclExpStream& rStrm ) const
-+{
-+    rStrm.StartRecord( 0x0802, 32 );
-+
-+    sal_uInt16 nRecordType = 0x0802;
-+    sal_uInt16 nDummyFlags = 0x0000;
-+    sal_uInt16 nTableType  = 1; // 0 = query table : 1 = pivot table
-+
-+    rStrm << nRecordType << nDummyFlags << nTableType;
-+
-+    // General flags
-+    bool bEnableRefresh = true;
-+    bool bPCacheInvalid = false;
-+    bool bOlapPTReport  = false;
-+
-+    sal_uInt16 nFlags = 0x0000;
-+    if (bEnableRefresh) nFlags |= 0x0001;
-+    if (bPCacheInvalid) nFlags |= 0x0002;
-+    if (bOlapPTReport)  nFlags |= 0x0004;
-+    rStrm << nFlags;
-+
-+    // Feature-specific options.  The value differs depending on the table 
-+    // type, but we assume the table type is always pivot table.
-+    sal_uInt32 nOptions = 0x00000000;
-+    bool bNoStencil = false;
-+    bool bHideTotal = false;
-+    bool bEmptyRows = false;
-+    bool bEmptyCols = false;
-+    if (bNoStencil) nOptions |= 0x00000001;
-+    if (bHideTotal) nOptions |= 0x00000002;
-+    if (bEmptyRows) nOptions |= 0x00000008;
-+    if (bEmptyCols) nOptions |= 0x00000010;
-+    rStrm << nOptions;
-+
-+    enum ExcelVersion
-+    {
-+        Excel2000 = 0,
-+        ExcelXP   = 1,
-+        Excel2003 = 2,
-+        Excel2007 = 3
-+    };
-+    ExcelVersion eXclVer = Excel2000;
-+    sal_uInt8 nOffsetBytes = 16;
-+    rStrm << static_cast<sal_uInt8>(eXclVer)  // version table last refreshed
-+          << static_cast<sal_uInt8>(eXclVer)  // minimum version to refresh
-+          << nOffsetBytes
-+          << static_cast<sal_uInt8>(eXclVer); // first version created
-+
-+    rStrm << XclExpString(maPTInfo.maTableName);
-+    rStrm << static_cast<sal_uInt16>(0x0001); // no idea what this is for.
-+
-+    rStrm.EndRecord();
-+}
-+
-+void XclExpPivotTable::WriteSxViewEx9( XclExpStream& rStrm ) const
- {
-     // Until we sync the autoformat ids only export if using grid header layout
-     // That could only have been set via xls import so far.
--    if ( 0 == maPTAutoFormat.mnGridLayout )
-+    if ( 0 == maPTViewEx9Info.mnGridLayout )
-     {
-         rStrm.StartRecord( EXC_ID_SXVIEWEX9, 17 );
--        rStrm << maPTAutoFormat;
-+        rStrm << maPTViewEx9Info;
-         rStrm.EndRecord();
-     }
- }
-diff --git sc/source/filter/excel/xestring.cxx sc/source/filter/excel/xestring.cxx
-index e65c6bc..afcd334 100644
---- sc/source/filter/excel/xestring.cxx
-+++ sc/source/filter/excel/xestring.cxx
-@@ -489,7 +489,8 @@ void XclExpString::WritePhoneticSettings( XclExpStream& rStrm ) const
- 
- void XclExpString::Write( XclExpStream& rStrm ) const
- {
--    WriteHeader( rStrm );
-+    if (!mbSkipHeader)
-+        WriteHeader( rStrm );
-     WriteBuffer( rStrm );
-     if( IsWriteFormats() )      // only in BIFF8 included in string
-         WriteFormats( rStrm );
-@@ -662,6 +663,7 @@ void XclExpString::Init( sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMax
-     mbSmartFlags = bBiff8 && ::get_flag( nFlags, EXC_STR_SMARTFLAGS );
-     mbSkipFormats = ::get_flag( nFlags, EXC_STR_SEPARATEFORMATS );
-     mbWrapped = false;
-+    mbSkipHeader = ::get_flag( nFlags, EXC_STR_NOHEADER );
-     mnMaxLen = nMaxLen;
-     SetStrLen( nCurrLen );
- 
-diff --git sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx
-index f0d8c4c..cc449b9 100644
---- sc/source/filter/excel/xipivot.cxx
-+++ sc/source/filter/excel/xipivot.cxx
-@@ -847,6 +847,11 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
-     }
- }
- 
-+bool XclImpPivotCache::IsRefreshOnLoad() const
-+{
-+    return static_cast<bool>(maPCInfo.mnFlags & 0x0004);
-+}
-+
- // ============================================================================
- // Pivot table
- // ============================================================================
-@@ -882,6 +887,8 @@ void XclImpPTItem::ConvertItem( ScDPSaveDimension& rSaveDim ) const
-         ScDPSaveMember& rMember = *rSaveDim.GetMemberByName( *pItemName );
-         rMember.SetIsVisible( !::get_flag( maItemInfo.mnFlags, EXC_SXVI_HIDDEN ) );
-         rMember.SetShowDetails( !::get_flag( maItemInfo.mnFlags, EXC_SXVI_HIDEDETAIL ) );
-+        if (maItemInfo.HasVisName())
-+            rMember.SetLayoutName(*maItemInfo.GetVisName());
-     }
- }
- 
-@@ -1043,7 +1050,7 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con
-     // visible name
-     if( const String* pVisName = maFieldInfo.GetVisName() )
-         if( pVisName->Len() > 0 )
--            rSaveDim.SetLayoutName( pVisName );
-+            rSaveDim.SetLayoutName( *pVisName );
- 
-     // subtotal function(s)
-     XclPTSubtotalVec aSubtotalVec;
-@@ -1075,6 +1082,10 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con
-     // grouping info
-     pCacheField->ConvertGroupField( rSaveData, mrPTable.GetVisFieldNames() );
- 
-+    // custom subtotal name
-+    if (maFieldExtInfo.mpFieldTotalName.get())
-+        rSaveDim.SetSubtotalName(*maFieldExtInfo.mpFieldTotalName);
-+
-     return &rSaveDim;
- }
- 
-@@ -1099,7 +1110,7 @@ void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const Xcl
-     // visible name
-     if( const String* pVisName = rDataInfo.GetVisName() )
-         if( pVisName->Len() > 0 )
--            rSaveDim.SetLayoutName( pVisName );
-+            rSaveDim.SetLayoutName( *pVisName );
- 
-     // aggregation function
-     rSaveDim.SetFunction( static_cast< USHORT >( rDataInfo.GetApiAggFunc() ) );
-@@ -1134,7 +1145,8 @@ void XclImpPTField::ConvertItems( ScDPSaveDimension& rSaveDim ) const
- 
- XclImpPivotTable::XclImpPivotTable( const XclImpRoot& rRoot ) :
-     XclImpRoot( rRoot ),
--    maDataOrientField( *this, EXC_SXIVD_DATA )
-+    maDataOrientField( *this, EXC_SXIVD_DATA ),
-+    mpDPObj(NULL)
- {
- }
- 
-@@ -1298,7 +1310,7 @@ void XclImpPivotTable::ReadSxex( XclImpStream& rStrm )
- 
- void XclImpPivotTable::ReadSxViewEx9( XclImpStream& rStrm )
- {
--    rStrm >> maPTAutoFormat;
-+    rStrm >> maPTViewEx9Info;
- }
- 
- // ----------------------------------------------------------------------------
-@@ -1336,11 +1348,14 @@ void XclImpPivotTable::Convert()
-         if( const XclImpPTField* pField = GetField( *aIt ) )
-             pField->ConvertPageField( aSaveData );
- 
-+#if 0 // Why do we do this ???
-+
-     // hidden fields
-     for( sal_uInt16 nField = 0, nCount = GetFieldCount(); nField < nCount; ++nField )
-         if( const XclImpPTField* pField = GetField( nField ) )
-             if( (pField->GetAxes() & EXC_SXVD_AXIS_ROWCOLPAGE) == 0 )
-                 pField->ConvertHiddenField( aSaveData );
-+#endif
- 
-     // data fields
-     for( aIt = maFiltDataFields.begin(), aEnd = maFiltDataFields.end(); aIt != aEnd; ++aIt )
-@@ -1364,12 +1379,30 @@ void XclImpPivotTable::Convert()
-     // create the DataPilot
-     ScDPObject* pDPObj = new ScDPObject( GetDocPtr() );
-     pDPObj->SetName( maPTInfo.maTableName );
-+    if (maPTInfo.maDataName.Len() > 0)
-+        aSaveData.GetDataLayoutDimension()->SetLayoutName(maPTInfo.maDataName);
-+
-+    if (maPTViewEx9Info.maGrandTotalName.Len() > 0)
-+        aSaveData.SetGrandTotalName(maPTViewEx9Info.maGrandTotalName);
-+
-     pDPObj->SetSaveData( aSaveData );
-     pDPObj->SetSheetDesc( aDesc );
-     pDPObj->SetOutRange( aOutRange );
-     pDPObj->SetAlive( TRUE );
--    pDPObj->SetHeaderLayout( maPTAutoFormat.mnGridLayout == 0 );
-+    pDPObj->SetHeaderLayout( maPTViewEx9Info.mnGridLayout == 0 );
-+
-     GetDoc().GetDPCollection()->Insert( pDPObj );
-+    mpDPObj = pDPObj;
-+}
-+
-+void XclImpPivotTable::MaybeRefresh()
-+{
-+    if (mpDPObj && mxPCache->IsRefreshOnLoad())
-+    {
-+        // 'refresh table on load' flag is set.  Refresh the table now.  Some
-+        // Excel files contain partial table output when this flag is set.
-+        mpDPObj->Output();
-+    }
- }
- 
- // ============================================================================
-@@ -1484,85 +1517,10 @@ void XclImpPivotTableManager::ConvertPivotTables()
-         (*aIt)->Convert();
- }
- 
--// ============================================================================
--
--// Pivot table autoformat settings ============================================
--
--/**
--classic     : 10 08 00 00 00 00 00 00 20 00 00 00 01 00 00 00 00
--default     : 10 08 00 00 00 00 00 00 20 00 00 00 01 00 00 00 00
--report01    : 10 08 02 00 00 00 00 00 20 00 00 00 00 10 00 00 00
--report02    : 10 08 02 00 00 00 00 00 20 00 00 00 01 10 00 00 00
--report03    : 10 08 02 00 00 00 00 00 20 00 00 00 02 10 00 00 00
--report04    : 10 08 02 00 00 00 00 00 20 00 00 00 03 10 00 00 00
--report05    : 10 08 02 00 00 00 00 00 20 00 00 00 04 10 00 00 00
--report06    : 10 08 02 00 00 00 00 00 20 00 00 00 05 10 00 00 00
--report07    : 10 08 02 00 00 00 00 00 20 00 00 00 06 10 00 00 00
--report08    : 10 08 02 00 00 00 00 00 20 00 00 00 07 10 00 00 00
--report09    : 10 08 02 00 00 00 00 00 20 00 00 00 08 10 00 00 00
--report10    : 10 08 02 00 00 00 00 00 20 00 00 00 09 10 00 00 00
--table01     : 10 08 00 00 00 00 00 00 20 00 00 00 0a 10 00 00 00
--table02     : 10 08 00 00 00 00 00 00 20 00 00 00 0b 10 00 00 00
--table03     : 10 08 00 00 00 00 00 00 20 00 00 00 0c 10 00 00 00
--table04     : 10 08 00 00 00 00 00 00 20 00 00 00 0d 10 00 00 00
--table05     : 10 08 00 00 00 00 00 00 20 00 00 00 0e 10 00 00 00
--table06     : 10 08 00 00 00 00 00 00 20 00 00 00 0f 10 00 00 00
--table07     : 10 08 00 00 00 00 00 00 20 00 00 00 10 10 00 00 00
--table08     : 10 08 00 00 00 00 00 00 20 00 00 00 11 10 00 00 00
--table09     : 10 08 00 00 00 00 00 00 20 00 00 00 12 10 00 00 00
--table10     : 10 08 00 00 00 00 00 00 20 00 00 00 13 10 00 00 00
--none        : 10 08 00 00 00 00 00 00 20 00 00 00 15 10 00 00 00
--**/
--
--XclPTAutoFormat::XclPTAutoFormat() :
--    mbReport( 0 ),
--    mnAutoFormat( 0 ),
--    mnGridLayout( 0x10 )
--{
--}
--
--void XclPTAutoFormat::Init( const ScDPObject& rDPObj )
--{
--    if( rDPObj.GetHeaderLayout() )
--    {
--        mbReport     = 0;
--        mnAutoFormat = 1;
--        mnGridLayout = 0;
--    }
--    else
--    {
--        // Report1 for now
--        // TODO : sync with autoformat indicies
--        mbReport     = 2;
--        mnAutoFormat = 1;
--        mnGridLayout = 0x10;
--    }
--}
--
--XclImpStream& operator>>( XclImpStream& rStrm, XclPTAutoFormat& rInfo )
--{
--    rStrm.Ignore( 2 );
--    rStrm >> rInfo.mbReport;            /// 2 for report* fmts ?
--    rStrm.Ignore( 6 );
--    sal_uInt8 nDummy;
--    return rStrm
--        >> rInfo.mnAutoFormat
--        >> rInfo.mnGridLayout 
--        >> nDummy >> nDummy >> nDummy;
--}
--
--XclExpStream& operator<<( XclExpStream& rStrm, const XclPTAutoFormat& rInfo )
-+void XclImpPivotTableManager::MaybeRefreshPivotTables()
- {
--    return rStrm
--        << EXC_PT_AUTOFMT_HEADER
--        << rInfo.mbReport
--        << EXC_PT_AUTOFMT_ZERO
--        << EXC_PT_AUTOFMT_FLAGS
--        << rInfo.mnAutoFormat
--        << rInfo.mnGridLayout
--        << static_cast<sal_uInt8>(0x00)
--        << static_cast<sal_uInt8>(0x00)
--        << static_cast<sal_uInt8>(0x00);
-+    for( XclImpPivotTableVec::iterator aIt = maPTables.begin(), aEnd = maPTables.end(); aIt != aEnd; ++aIt )
-+        (*aIt)->MaybeRefresh();
- }
- 
- // ============================================================================
-diff --git sc/source/filter/excel/xlpivot.cxx sc/source/filter/excel/xlpivot.cxx
-index e3544b5..c915903 100644
---- sc/source/filter/excel/xlpivot.cxx
-+++ sc/source/filter/excel/xlpivot.cxx
-@@ -31,6 +31,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
- #include "dpgroup.hxx"
-+#include "dpsave.hxx"
- #include "xestream.hxx"
- #include "xistream.hxx"
- #include "xestring.hxx"
-@@ -581,7 +582,9 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldInfo& rInfo )
- XclPTFieldExtInfo::XclPTFieldExtInfo() :
-     mnFlags( EXC_SXVDEX_DEFAULTFLAGS ),
-     mnSortField( EXC_SXVDEX_SORT_OWN ),
--    mnShowField( EXC_SXVDEX_SHOW_NONE )
-+    mnShowField( EXC_SXVDEX_SHOW_NONE ),
-+    mnNumFmt(0),
-+    mpFieldTotalName(NULL)
- {
- }
- 
-@@ -639,10 +642,19 @@ void XclPTFieldExtInfo::SetApiLayoutMode( sal_Int32 nLayoutMode )
- 
- XclImpStream& operator>>( XclImpStream& rStrm, XclPTFieldExtInfo& rInfo )
- {
--    return rStrm
--        >> rInfo.mnFlags
--        >> rInfo.mnSortField
--        >> rInfo.mnShowField;
-+    sal_uInt8 nNameLen = 0;
-+    rStrm >> rInfo.mnFlags
-+          >> rInfo.mnSortField
-+          >> rInfo.mnShowField
-+          >> rInfo.mnNumFmt
-+          >> nNameLen;
-+
-+    rStrm.Ignore(10);
-+    if (nNameLen != 0xFF)
-+        // Custom field total name is used.  Pick it up.
-+        rInfo.mpFieldTotalName.reset(new rtl::OUString(rStrm.ReadUniString(nNameLen, 0)));
-+
-+    return rStrm;
- }
- 
- XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldExtInfo& rInfo )
-@@ -650,9 +662,23 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldExtInfo& rInfo )
-     rStrm   << rInfo.mnFlags
-             << rInfo.mnSortField
-             << rInfo.mnShowField
--            << EXC_SXVDEX_FORMAT_NONE
--            << sal_uInt16( 0xFFFF );    // unknown
--    rStrm.WriteZeroBytes( 8 );          // unknown
-+            << EXC_SXVDEX_FORMAT_NONE;
-+
-+    if (rInfo.mpFieldTotalName.get() && rInfo.mpFieldTotalName->getLength() > 0)
-+    {
-+        rtl::OUString aFinalName = *rInfo.mpFieldTotalName;
-+        if (aFinalName.getLength() >= 254)
-+            aFinalName = aFinalName.copy(0, 254);
-+        sal_uInt8 nNameLen = static_cast<sal_uInt8>(aFinalName.getLength());
-+        rStrm << nNameLen;
-+        rStrm.WriteZeroBytes(10);
-+        rStrm << XclExpString(aFinalName, EXC_STR_NOHEADER);
-+    }
-+    else
-+    {
-+        rStrm << sal_uInt16(0xFFFF);
-+        rStrm.WriteZeroBytes(8);
-+    }
-     return rStrm;
- }
- 
-@@ -923,3 +949,86 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo )
- 
- // ============================================================================
- 
-+// Pivot table autoformat settings ============================================
-+
-+/**
-+classic     : 10 08 00 00 00 00 00 00 20 00 00 00 01 00 00 00 00
-+default     : 10 08 00 00 00 00 00 00 20 00 00 00 01 00 00 00 00
-+report01    : 10 08 02 00 00 00 00 00 20 00 00 00 00 10 00 00 00
-+report02    : 10 08 02 00 00 00 00 00 20 00 00 00 01 10 00 00 00
-+report03    : 10 08 02 00 00 00 00 00 20 00 00 00 02 10 00 00 00
-+report04    : 10 08 02 00 00 00 00 00 20 00 00 00 03 10 00 00 00
-+report05    : 10 08 02 00 00 00 00 00 20 00 00 00 04 10 00 00 00
-+report06    : 10 08 02 00 00 00 00 00 20 00 00 00 05 10 00 00 00
-+report07    : 10 08 02 00 00 00 00 00 20 00 00 00 06 10 00 00 00
-+report08    : 10 08 02 00 00 00 00 00 20 00 00 00 07 10 00 00 00
-+report09    : 10 08 02 00 00 00 00 00 20 00 00 00 08 10 00 00 00
-+report10    : 10 08 02 00 00 00 00 00 20 00 00 00 09 10 00 00 00
-+table01     : 10 08 00 00 00 00 00 00 20 00 00 00 0a 10 00 00 00
-+table02     : 10 08 00 00 00 00 00 00 20 00 00 00 0b 10 00 00 00
-+table03     : 10 08 00 00 00 00 00 00 20 00 00 00 0c 10 00 00 00
-+table04     : 10 08 00 00 00 00 00 00 20 00 00 00 0d 10 00 00 00
-+table05     : 10 08 00 00 00 00 00 00 20 00 00 00 0e 10 00 00 00
-+table06     : 10 08 00 00 00 00 00 00 20 00 00 00 0f 10 00 00 00
-+table07     : 10 08 00 00 00 00 00 00 20 00 00 00 10 10 00 00 00
-+table08     : 10 08 00 00 00 00 00 00 20 00 00 00 11 10 00 00 00
-+table09     : 10 08 00 00 00 00 00 00 20 00 00 00 12 10 00 00 00
-+table10     : 10 08 00 00 00 00 00 00 20 00 00 00 13 10 00 00 00
-+none        : 10 08 00 00 00 00 00 00 20 00 00 00 15 10 00 00 00
-+**/
-+
-+XclPTViewEx9Info::XclPTViewEx9Info() :
-+    mbReport( 0 ),
-+    mnAutoFormat( 0 ),
-+    mnGridLayout( 0x10 )
-+{
-+}
-+
-+void XclPTViewEx9Info::Init( const ScDPObject& rDPObj )
-+{
-+    if( rDPObj.GetHeaderLayout() )
-+    {
-+        mbReport     = 0;
-+        mnAutoFormat = 1;
-+        mnGridLayout = 0;
-+    }
-+    else
-+    {
-+        // Report1 for now
-+        // TODO : sync with autoformat indicies
-+        mbReport     = 2;
-+        mnAutoFormat = 1;
-+        mnGridLayout = 0x10;
-+    }
-+
-+    const ScDPSaveData* pData = rDPObj.GetSaveData();
-+    if (pData)
-+    {
-+        const rtl::OUString* pGrandTotal = pData->GetGrandTotalName();
-+        if (pGrandTotal)
-+            maGrandTotalName = *pGrandTotal;
-+    }
-+}
-+
-+XclImpStream& operator>>( XclImpStream& rStrm, XclPTViewEx9Info& rInfo )
-+{
-+    rStrm.Ignore( 2 );
-+    rStrm >> rInfo.mbReport;            /// 2 for report* fmts ?
-+    rStrm.Ignore( 6 );
-+    rStrm >> rInfo.mnAutoFormat >> rInfo.mnGridLayout;
-+    rInfo.maGrandTotalName = rStrm.ReadUniString();
-+    return rStrm;
-+}
-+
-+XclExpStream& operator<<( XclExpStream& rStrm, const XclPTViewEx9Info& rInfo )
-+{
-+    return rStrm 
-+        << EXC_PT_AUTOFMT_HEADER
-+        << rInfo.mbReport
-+        << EXC_PT_AUTOFMT_ZERO
-+        << EXC_PT_AUTOFMT_FLAGS
-+        << rInfo.mnAutoFormat
-+        << rInfo.mnGridLayout
-+        << XclExpString(rInfo.maGrandTotalName, EXC_STR_DEFAULT, EXC_PT_MAXSTRLEN);
-+}
-+
-diff --git sc/source/filter/inc/xepivot.hxx sc/source/filter/inc/xepivot.hxx
-index 2de57fa..2078003 100644
---- sc/source/filter/inc/xepivot.hxx
-+++ sc/source/filter/inc/xepivot.hxx
-@@ -412,8 +412,10 @@ private:
-     void                WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sal_uInt16 nIndexCount ) const;
-     /** Writes the SXEX records containing additional pivot table info. */
-     void                WriteSxex( XclExpStream& rStrm ) const;
-+
-+    void                WriteQsiSxTag( XclExpStream& rStrm ) const;
-     /** Writes the SX_AUTOFORMAT records with the autoformat id and header layout */
--    void                WriteSxAutoformat( XclExpStream& rStrm ) const;
-+    void                WriteSxViewEx9( XclExpStream& rStrm ) const;
- 
-     // ------------------------------------------------------------------------
- private:
-@@ -424,7 +426,7 @@ private:
-     const XclExpPivotCache& mrPCache;       /// The pivot cache this pivot table bases on.
-     XclPTInfo           maPTInfo;           /// Info about the pivot table (SXVIEW record).
-     XclPTExtInfo        maPTExtInfo;        /// Extended info about the pivot table (SXEX record).
--    XclPTAutoFormat     maPTAutoFormat;     /// The selected autoformat (SXVIEWEX9)
-+    XclPTViewEx9Info    maPTViewEx9Info;    /// The selected autoformat (SXVIEWEX9)
-     XclExpPTFieldList   maFieldList;        /// All fields in pivot cache order.
-     ScfUInt16Vec        maRowFields;        /// Row field indexes.
-     ScfUInt16Vec        maColFields;        /// Column field indexes.
-diff --git sc/source/filter/inc/xestring.hxx sc/source/filter/inc/xestring.hxx
-index a7443cb..8851736 100644
---- sc/source/filter/inc/xestring.hxx
-+++ sc/source/filter/inc/xestring.hxx
-@@ -341,6 +341,7 @@ private:
-     bool                mbSmartFlags;   /// true = omit flags on empty string; false = always write flags.
-     bool                mbSkipFormats;  /// true = skip formats on export; false = write complete formatted string.
-     bool                mbWrapped;      /// true = text contains several paragraphs.
-+    bool                mbSkipHeader;   /// ture = skip length and flags when writing string bytes.
- };
- 
- inline bool operator==( const XclExpString& rLeft, const XclExpString& rRight )
-diff --git sc/source/filter/inc/xipivot.hxx sc/source/filter/inc/xipivot.hxx
-index 365ea53..813963c 100644
---- sc/source/filter/inc/xipivot.hxx
-+++ sc/source/filter/inc/xipivot.hxx
-@@ -186,6 +186,8 @@ public:
-     /** Reads the entire pivot cache stream. Uses decrypter from passed stream. */
-     void                ReadPivotCacheStream( XclImpStream& rStrm );
- 
-+    bool                IsRefreshOnLoad() const;
-+
- private:
-     typedef ::std::vector< XclImpPCFieldRef > XclImpPCFieldVec;
- 
-@@ -359,6 +361,8 @@ public:
-     /** Inserts the pivot table into the Calc document. */
-     void                Convert();
- 
-+    void                MaybeRefresh();
-+
-     // ------------------------------------------------------------------------
- private:
-     typedef ::std::vector< XclImpPTFieldRef > XclImpPTFieldVec;
-@@ -367,7 +371,7 @@ private:
- 
-     XclPTInfo           maPTInfo;           /// General info about the pivot table (SXVIEW record).
-     XclPTExtInfo        maPTExtInfo;        /// Extended info about the pivot table (SXEX record).
--    XclPTAutoFormat     maPTAutoFormat;     /// The selected autoformat (SX_AUTOFORMAT)
-+    XclPTViewEx9Info    maPTViewEx9Info;     /// (SXVIEWEX9 record)
-     XclImpPTFieldVec    maFields;           /// Vector containing all fields.
-     XclImpPTFieldRef    mxCurrField;        /// Current field for importing additional info.
-     ScfStringVec        maVisFieldNames;    /// Vector containing all visible field names.
-@@ -378,6 +382,7 @@ private:
-     ScfUInt16Vec        maFiltDataFields;   /// Filtered data field indexes.
-     XclImpPTField       maDataOrientField;  /// Special data field orientation field.
-     ScRange             maOutScRange;       /// Output range in the Calc document.
-+    ScDPObject*         mpDPObj;
- };
- 
- typedef ScfRef< XclImpPivotTable > XclImpPivotTableRef;
-@@ -437,6 +442,8 @@ public:
-     /** Inserts all pivot tables into the Calc document. */
-     void                ConvertPivotTables();
- 
-+    void                MaybeRefreshPivotTables();
-+
- private:
-     typedef ::std::vector< XclImpPivotCacheRef >    XclImpPivotCacheVec;
-     typedef ::std::vector< XclImpPivotTableRef >    XclImpPivotTableVec;
-diff --git sc/source/filter/inc/xlpivot.hxx sc/source/filter/inc/xlpivot.hxx
-index 5b88882..8b5bd4e 100644
---- sc/source/filter/inc/xlpivot.hxx
-+++ sc/source/filter/inc/xlpivot.hxx
-@@ -43,6 +43,8 @@
- #include "xladdress.hxx"
- #include "dpobject.hxx"
- 
-+#include <memory>
-+
- class XclImpStream;
- class XclExpStream;
- 
-@@ -671,6 +673,8 @@ struct XclPTFieldExtInfo
-     sal_uInt32          mnFlags;        /// Several flags and number of items for AutoShow.
-     sal_uInt16          mnSortField;    /// Index to data field sorting bases on.
-     sal_uInt16          mnShowField;    /// Index to data field AutoShow bases on.
-+    sal_uInt16          mnNumFmt;
-+    ::std::auto_ptr<rtl::OUString> mpFieldTotalName;
- 
-     explicit            XclPTFieldExtInfo();
- 
-@@ -796,19 +800,20 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo );
- 
- // Pivot table autoformat settings ==============================================
- 
--/** Pivot table autoformat settings (SX_AUTOFORMAT record). */
--struct XclPTAutoFormat
-+/** Pivot table autoformat settings (SXVIEWEX9 record). */
-+struct XclPTViewEx9Info
- {
-     sal_uInt32          mbReport;           /// 2 for report* fmts ?
-     sal_uInt8           mnAutoFormat;       /// AutoFormat ID
-     sal_uInt8           mnGridLayout;       /// 0 == gridlayout, 0x10 == modern
-+    String              maGrandTotalName;
- 
--    explicit            XclPTAutoFormat();
-+    explicit            XclPTViewEx9Info();
-     void                Init( const ScDPObject& rDPObj );
- };
- 
--XclImpStream& operator>>( XclImpStream& rStrm, XclPTAutoFormat& rInfo );
--XclExpStream& operator<<( XclExpStream& rStrm, const XclPTAutoFormat& rInfo );
-+XclImpStream& operator>>( XclImpStream& rStrm, XclPTViewEx9Info& rInfo );
-+XclExpStream& operator<<( XclExpStream& rStrm, const XclPTViewEx9Info& rInfo );
- 
- // ============================================================================
- #endif
-diff --git sc/source/filter/inc/xlstring.hxx sc/source/filter/inc/xlstring.hxx
-index 0b30049..89f8275 100644
---- sc/source/filter/inc/xlstring.hxx
-+++ sc/source/filter/inc/xlstring.hxx
-@@ -43,6 +43,7 @@ const XclStrFlags EXC_STR_FORCEUNICODE      = 0x0001;   /// Always use UCS-2 cha
- const XclStrFlags EXC_STR_8BITLENGTH        = 0x0002;   /// 8-bit string length field (default: 16-bit).
- const XclStrFlags EXC_STR_SMARTFLAGS        = 0x0004;   /// Omit flags on empty string (default: read/write always). BIFF8 only.
- const XclStrFlags EXC_STR_SEPARATEFORMATS   = 0x0008;   /// Import: Keep old formats when reading unformatted string (default: clear formats); Export: Write unformatted string.
-+const XclStrFlags EXC_STR_NOHEADER          = 0x0010;   /// Export: Don't write the length and flag fields.
- 
- // ----------------------------------------------------------------------------
- 
-diff --git sc/source/ui/dbgui/pvfundlg.cxx sc/source/ui/dbgui/pvfundlg.cxx
-index 6dc4551..880a14b 100644
---- sc/source/ui/dbgui/pvfundlg.cxx
-+++ sc/source/ui/dbgui/pvfundlg.cxx
-@@ -705,7 +705,9 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHOR
-     maLbDims        ( this, ScResId( LB_DIMS ) ),
-     maBtnOk         ( this, ScResId( BTN_OK ) ),
-     maBtnCancel     ( this, ScResId( BTN_CANCEL ) ),
--    maBtnHelp       ( this, ScResId( BTN_HELP ) )
-+    maBtnHelp       ( this, ScResId( BTN_HELP ) ),
-+
-+    mrDPObj(rDPObj)
- {
-     FreeResource();
- 
-@@ -719,7 +721,13 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHOR
-         {
-             const ScDPSaveDimension* pDimension = pSaveData ? pSaveData->GetExistingDimensionByName(aName) : 0;
-             if ( !pDimension || (pDimension->GetOrientation() != nOrient) )
-+            {
-+                const OUString* pLayoutName = pDimension->GetLayoutName();
-+                if (pLayoutName)
-+                    aName = *pLayoutName;
-                 maLbDims.InsertEntry( aName );
-+                maNameIndexMap.insert(DimNameIndexMap::value_type(aName, nDim));
-+            }
-         }
-     }
-     if( maLbDims.GetEntryCount() )
-@@ -735,7 +743,17 @@ short ScDPShowDetailDlg::Execute()
- 
- String ScDPShowDetailDlg::GetDimensionName() const
- {
--    return maLbDims.GetSelectEntry();
-+    // Look up the internal dimension name which may be different from the 
-+    // displayed field name.
-+    String aSelectedName = maLbDims.GetSelectEntry();
-+    DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName);
-+    if (itr == maNameIndexMap.end())
-+        // This should never happen!
-+        return aSelectedName;
-+
-+    long nDim = itr->second;
-+    BOOL bIsDataLayout = false;
-+    return mrDPObj.GetDimName(nDim, bIsDataLayout);
- }
- 
- IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox*, pLBox )
-diff --git sc/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
-index bedf6c3..4dee615 100644
---- sc/source/ui/dbgui/pvlaydlg.cxx
-+++ sc/source/ui/dbgui/pvlaydlg.cxx
-@@ -63,6 +63,7 @@
- #include "sc.hrc" //CHINA001
- #include "scabstdlg.hxx" //CHINA001
- using namespace com::sun::star;
-+using ::rtl::OUString;
- 
- //----------------------------------------------------------------------------
- 
-@@ -1506,6 +1507,8 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
-                                     nPageCount,    nColCount,    nRowCount,    nDataCount );
-         if ( bFit )
- 		{
-+            ScDPSaveData* pOldSaveData = xDlgDPObject->GetSaveData();
-+
- 			ScRange aOutRange( aAdrDest );		// bToNewTable is passed separately
- 
- 			ScDPSaveData aSaveData;
-@@ -1537,6 +1540,22 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
-                     pDim->SetSortInfo( &aIt->maSortInfo );
-                     pDim->SetLayoutInfo( &aIt->maLayoutInfo );
-                     pDim->SetAutoShowInfo( &aIt->maShowInfo );
-+                    ScDPSaveDimension* pOldDim = NULL;
-+                    if (pOldSaveData)
-+                    {
-+                        // Transfer the existing layout names to new dimension instance.
-+                        pOldDim = pOldSaveData->GetExistingDimensionByName(aIt->maName);
-+                        if (pOldDim)
-+                        {
-+                            const OUString* pLayoutName = pOldDim->GetLayoutName();
-+                            if (pLayoutName)
-+                                pDim->SetLayoutName(*pLayoutName);
-+
-+                            const OUString* pSubtotalName = pOldDim->GetSubtotalName();
-+                            if (pSubtotalName)
-+                                pDim->SetSubtotalName(*pSubtotalName);
-+                        }
-+                    }
- 
-                     bool bManualSort = ( aIt->maSortInfo.Mode == sheet::DataPilotFieldSortMode::MANUAL );
- 
-@@ -1557,11 +1576,33 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
-                                 ScDPSaveMember* pMember = pDim->GetMemberByName( *pItem );
-                                 pMember->SetIsVisible( bIsVisible );
-                                 pMember->SetShowDetails( bShowDetails );
-+                                if (pOldDim)
-+                                {
-+                                    // Transfer the existing layout name.
-+                                    ScDPSaveMember* pOldMember = pOldDim->GetMemberByName(*pItem);
-+                                    if (pOldMember)
-+                                    {
-+                                        const OUString* pLayoutName = pOldMember->GetLayoutName();
-+                                        if (pLayoutName)
-+                                            pMember->SetLayoutName(*pLayoutName);
-+                                    }
-+                                }
-                             }
-                         }
-                     }
-                 }
-             }
-+            ScDPSaveDimension* pDim = aSaveData.GetDataLayoutDimension();
-+            if (pDim && pOldSaveData)
-+            {
-+                ScDPSaveDimension* pOldDim = pOldSaveData->GetDataLayoutDimension();
-+                if (pOldDim)
-+                {
-+                    const OUString* pLayoutName = pOldDim->GetLayoutName();
-+                    if (pLayoutName)
-+                        pDim->SetLayoutName(*pLayoutName);
-+                }
-+            }
- 
- 			USHORT nWhichPivot = SC_MOD()->GetPool().GetWhich( SID_PIVOT_TABLE );
- 			ScPivotItem aOutItem( nWhichPivot, &aSaveData, &aOutRange, bToNewTable );
-diff --git sc/source/ui/inc/pvfundlg.hxx sc/source/ui/inc/pvfundlg.hxx
-index 804f162..1707cd6 100644
---- sc/source/ui/inc/pvfundlg.hxx
-+++ sc/source/ui/inc/pvfundlg.hxx
-@@ -55,6 +55,8 @@
- #include <sfx2/itemconnect.hxx>
- #include "pivot.hxx"
- 
-+#include <hash_map>
-+
- // ============================================================================
- 
- typedef sfx::ListBoxWrapper< sal_Int32 > ScDPListBoxWrapper;
-@@ -217,6 +219,11 @@ public:
- 
-     virtual short       Execute();
- 
-+    /** 
-+     * @return String internal name of the selected field.  Note that this may 
-+     *         be different from the name displayed in the dialog if the field
-+     *         has a layout name.
-+     */
-     String              GetDimensionName() const;
- 
- private:
-@@ -228,6 +235,10 @@ private:
-     OKButton            maBtnOk;
-     CancelButton        maBtnCancel;
-     HelpButton          maBtnHelp;
-+
-+    typedef ::std::hash_map<String, long, ScStringHashCode> DimNameIndexMap;
-+    DimNameIndexMap     maNameIndexMap;
-+    ScDPObject&         mrDPObj;
- };
- 
- // ============================================================================
---- sc/source/ui/unoobj/dapiuno.cxx
-+++ sc/source/ui/unoobj/dapiuno.cxx
-@@ -1605,6 +1605,10 @@ rtl::OUString SAL_CALL ScDataPilotFieldObj::getName() throw(uno::RuntimeExceptio
-         if( pDim->IsDataLayout() )
-             aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) );
-         else
--            aName = pDim->GetLayoutName();
-+            {
-+                aName = pDim->GetLayoutName();
-+                if (!aName)
-+                    aName = pDim->GetName();
-+            }
-     }
-     return aName;
-@@ -1625,7 +1631,7 @@ void SAL_CALL ScDataPilotFieldObj::setName( const rtl::OUString& aNewName )
-     if( pDim && !pDim->IsDataLayout() )
-     {
-         String aName( rName );
--        pDim->SetLayoutName( &aName );
-+        pDim->SetLayoutName( aName );
-         SetDPObject( pDPObj );
-     }
- }
-diff --git sc/source/ui/view/dbfunc3.cxx sc/source/ui/view/dbfunc3.cxx
-index 3e5a627..df92a5e 100644
---- sc/source/ui/view/dbfunc3.cxx
-+++ sc/source/ui/view/dbfunc3.cxx
-@@ -91,6 +91,10 @@ using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::beans::XPropertySet;
-+using ::com::sun::star::container::XNameAccess;
-+using ::com::sun::star::sheet::XDimensionsSupplier;
-+using ::rtl::OUString;
-+using ::rtl::OUStringBuffer;
- using ::std::auto_ptr;
- 
- // STATIC DATA -----------------------------------------------------------
-@@ -1377,123 +1381,304 @@ void ScDBFunc::UngroupDataPilot()
-     }
- }
- 
-+OUString lcl_replaceMemberNameInSubtotal(const OUString& rSubtotal, const OUString& rMemberName)
-+{
-+    sal_Int32 n = rSubtotal.getLength();
-+    const sal_Unicode* p = rSubtotal.getStr();
-+    OUStringBuffer aBuf, aWordBuf;
-+    for (sal_Int32 i = 0; i < n; ++i)
-+    {
-+        sal_Unicode c = p[i];
-+        if (c == sal_Unicode(' '))
-+        {
-+            OUString aWord = aWordBuf.makeStringAndClear();
-+            if (aWord.equals(rMemberName))
-+                aBuf.append(sal_Unicode('?'));
-+            else
-+                aBuf.append(aWord);
-+            aBuf.append(c);
-+        }
-+        else
-+            aWordBuf.append(c);
-+    }
-+
-+    if (aWordBuf.getLength() > 0)
-+    {
-+        OUString aWord = aWordBuf.makeStringAndClear();
-+        if (aWord.equals(rMemberName))
-+            aBuf.append(sal_Unicode('?'));
-+        else
-+            aBuf.append(aWord);
-+    }
-+
-+    return aBuf.makeStringAndClear();
-+}
-+
- void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
- {
-+    using namespace ::com::sun::star::sheet;
-+
-     String aNewName( rString );
- 
-     ScDocument* pDoc = GetViewData()->GetDocument();
-     ScDPObject* pDPObj = pDoc->GetDPAtCursor( rPos.Col(), rPos.Row(), rPos.Tab() );
--    if ( pDPObj )
-+    if (!pDPObj)
-+        return;
-+
-+    String aOldText;
-+    pDoc->GetString( rPos.Col(), rPos.Row(), rPos.Tab(), aOldText );
-+
-+    if ( aOldText == rString )
-     {
--        String aOldText;
--        pDoc->GetString( rPos.Col(), rPos.Row(), rPos.Tab(), aOldText );
-+        // nothing to do: silently exit
-+        return;
-+    }
- 
--        if ( aOldText == rString )
-+    USHORT nErrorId = 0;
-+
-+    pDPObj->BuildAllDimensionMembers();
-+    ScDPSaveData aData( *pDPObj->GetSaveData() );
-+    BOOL bChange = FALSE;
-+
-+    USHORT nOrient = DataPilotFieldOrientation_HIDDEN;
-+    long nField = pDPObj->GetHeaderDim( rPos, nOrient );
-+    if ( nField >= 0 )
-+    {
-+        // changing a field title
-+        if ( aData.GetExistingDimensionData() )
-         {
--            // nothing to do: silently exit
--            return;
--        }
-+            // only group dimensions can be renamed
- 
--        USHORT nErrorId = 0;
-+            ScDPDimensionSaveData* pDimData = aData.GetDimensionData();
-+            ScDPSaveGroupDimension* pGroupDim = pDimData->GetNamedGroupDimAcc( aOldText );
-+            if ( pGroupDim )
-+            {
-+                // valid name: not empty, no existing dimension (group or other)
-+                if ( rString.Len() && !pDPObj->IsDimNameInUse(rString) )
-+                {
-+                    pGroupDim->Rename( aNewName );
- 
--        ScDPSaveData aData( *pDPObj->GetSaveData() );
--        BOOL bChange = FALSE;
-+                    // also rename in SaveData to preserve the field settings
-+                    ScDPSaveDimension* pSaveDim = aData.GetDimensionByName( aOldText );
-+                    pSaveDim->SetName( aNewName );
- 
--        USHORT nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
--        long nField = pDPObj->GetHeaderDim( rPos, nOrient );
--        if ( nField >= 0 )
-+                    bChange = TRUE;
-+                }
-+                else
-+                    nErrorId = STR_INVALIDNAME;
-+            }
-+        }
-+        else if (nOrient == DataPilotFieldOrientation_COLUMN || nOrient == DataPilotFieldOrientation_ROW)
-         {
--            // changing a field title
-+            BOOL bDataLayout = false;
-+            String aDimName = pDPObj->GetDimName(nField, bDataLayout);
-+            ScDPSaveDimension* pDim = bDataLayout ? aData.GetDataLayoutDimension() : aData.GetDimensionByName(aDimName);
-+            if (pDim)
-+            {
-+                if (rString.Len())
-+                {
-+                    if (rString.EqualsIgnoreCaseAscii(aDimName))
-+                    {    
-+                        pDim->RemoveLayoutName();
-+                        bChange = true;
-+                    }
-+                    else if (!pDPObj->IsDimNameInUse(rString))
-+                    {
-+                        pDim->SetLayoutName(rString);
-+                        bChange = true;
-+                    }
-+                    else
-+                        nErrorId = STR_INVALIDNAME;
-+                }
-+                else
-+                    nErrorId = STR_INVALIDNAME;
-+            }
-+        }
-+    }
-+    else if (pDPObj->IsDataDescriptionCell(rPos))
-+    {
-+        // There is only one data dimension.
-+        ScDPSaveDimension* pDim = aData.GetFirstDimension(sheet::DataPilotFieldOrientation_DATA);
-+        if (pDim)
-+        {
-+            if (rString.Len())
-+            {
-+                if (rString.EqualsIgnoreCaseAscii(pDim->GetName()))
-+                {
-+                    pDim->RemoveLayoutName();
-+                    bChange = true;
-+                }
-+                else if (!pDPObj->IsDimNameInUse(rString))
-+                {
-+                    pDim->SetLayoutName(rString);
-+                    bChange = true;
-+                }
-+                else
-+                    nErrorId = STR_INVALIDNAME;
-+            }
-+            else
-+                nErrorId = STR_INVALIDNAME;
-+        }
-+    }
-+    else
-+    {
-+        // This is not a field header.
-+        sheet::DataPilotTableHeaderData aPosData;
-+        pDPObj->GetHeaderPositionData(rPos, aPosData);
- 
--            if ( aData.GetExistingDimensionData() )
-+        if ( (aPosData.Flags & MemberResultFlags::HASMEMBER) && aOldText.Len() )
-+        {
-+            if ( aData.GetExistingDimensionData() && !(aPosData.Flags & MemberResultFlags::SUBTOTAL))
-             {
--                // only group dimensions can be renamed
-+                BOOL bIsDataLayout;
-+                String aDimName = pDPObj->GetDimName( aPosData.Dimension, bIsDataLayout );
- 
-                 ScDPDimensionSaveData* pDimData = aData.GetDimensionData();
--                ScDPSaveGroupDimension* pGroupDim = pDimData->GetNamedGroupDimAcc( aOldText );
-+                ScDPSaveGroupDimension* pGroupDim = pDimData->GetNamedGroupDimAcc( aDimName );
-                 if ( pGroupDim )
-                 {
--                    // valid name: not empty, no existing dimension (group or other)
--                    if ( aNewName.Len() && !pDPObj->IsDimNameInUse( aNewName ) )
-+                    // valid name: not empty, no existing group in this dimension
-+                    //! ignore case?
-+                    if ( aNewName.Len() && !pGroupDim->GetNamedGroup( aNewName ) )
-                     {
--                        pGroupDim->Rename( aNewName );
-+                        ScDPSaveGroupItem* pGroup = pGroupDim->GetNamedGroupAcc( aOldText );
-+                        if ( pGroup )
-+                            pGroup->Rename( aNewName );     // rename the existing group
-+                        else
-+                        {
-+                            // create a new group to replace the automatic group
-+                            ScDPSaveGroupItem aGroup( aNewName );
-+                            aGroup.AddElement( aOldText );
-+                            pGroupDim->AddGroupItem( aGroup );
-+                        }
- 
--                        // also rename in SaveData to preserve the field settings
--                        ScDPSaveDimension* pSaveDim = aData.GetDimensionByName( aOldText );
--                        pSaveDim->SetName( aNewName );
-+                        // in both cases also adjust savedata, to preserve member settings (show details)
-+                        ScDPSaveDimension* pSaveDim = aData.GetDimensionByName( aDimName );
-+                        ScDPSaveMember* pSaveMember = pSaveDim->GetExistingMemberByName( aOldText );
-+                        if ( pSaveMember )
-+                            pSaveMember->SetName( aNewName );
- 
-                         bChange = TRUE;
-                     }
-                     else
-                         nErrorId = STR_INVALIDNAME;
--                }
-+                 }
-             }
--        }
--        else
--        {
--            // renaming a group (item)?
--            // allow only on the item name itself - not on empty cells, not on subtotals
--
--            sheet::DataPilotTableHeaderData aPosData;
--            pDPObj->GetHeaderPositionData(rPos, aPosData);
--            if ( ( aPosData.Flags & sheet::MemberResultFlags::HASMEMBER ) &&
--                 ! ( aPosData.Flags & sheet::MemberResultFlags::SUBTOTAL ) &&
--                 aOldText.Len() )
-+            else if ((aPosData.Flags & MemberResultFlags::GRANDTOTAL))
-             {
--                if ( aData.GetExistingDimensionData() )
-+                aData.SetGrandTotalName(rString);
-+                bChange = true;
-+            }
-+            else if (aPosData.Dimension >= 0 && aPosData.MemberName.getLength() > 0)
-+            {
-+                BOOL bDataLayout = false;
-+                String aDimName = pDPObj->GetDimName(static_cast<long>(aPosData.Dimension), bDataLayout);
-+                if (bDataLayout)
-                 {
--                    BOOL bIsDataLayout;
--                    String aDimName = pDPObj->GetDimName( aPosData.Dimension, bIsDataLayout );
-+                    // data dimension
-+                    do
-+                    {
-+                        if ((aPosData.Flags & MemberResultFlags::SUBTOTAL))
-+                            break;
-+
-+                        ScDPSaveDimension* pDim = aData.GetDimensionByName(aPosData.MemberName);
-+                        if (!pDim)
-+                            break;
- 
--                    ScDPDimensionSaveData* pDimData = aData.GetDimensionData();
--                    ScDPSaveGroupDimension* pGroupDim = pDimData->GetNamedGroupDimAcc( aDimName );
--                    if ( pGroupDim )
-+                        if (!rString.Len())
-+                        {
-+                            nErrorId = STR_INVALIDNAME;
-+                            break;
-+                        }
-+
-+                        if (aPosData.MemberName.equalsIgnoreAsciiCase(rString))
-+                        {
-+                            pDim->RemoveLayoutName();
-+                            bChange = true;
-+                        }
-+                        else if (!pDPObj->IsDimNameInUse(rString))
-+                        {
-+                            pDim->SetLayoutName(rString);
-+                            bChange = true;
-+                        }
-+                        else
-+                            nErrorId = STR_INVALIDNAME;
-+                    }
-+                    while (false);
-+                }
-+                else
-+                {
-+                    // field member
-+                    do
-                     {
--                        // valid name: not empty, no existing group in this dimension
--                        //! ignore case?
--                        if ( aNewName.Len() && !pGroupDim->GetNamedGroup( aNewName ) )
-+                        ScDPSaveDimension* pDim = aData.GetDimensionByName(aDimName);
-+                        if (!pDim)
-+                            break;
-+
-+                        ScDPSaveMember* pMem = pDim->GetExistingMemberByName(aPosData.MemberName);
-+                        if (!pMem)
-+                            break;
-+
-+                        if ((aPosData.Flags & MemberResultFlags::SUBTOTAL))
-                         {
--                            ScDPSaveGroupItem* pGroup = pGroupDim->GetNamedGroupAcc( aOldText );
--                            if ( pGroup )
--                                pGroup->Rename( aNewName );     // rename the existing group
-+                            // Change subtotal only when the table has one data dimension.
-+                            if (aData.GetDataDimensionCount() > 1)
-+                                break;
-+
-+                            const OUString* pLayoutName = pMem->GetLayoutName();
-+                            String aMemberName;
-+                            if (pLayoutName)
-+                                aMemberName = *pLayoutName;
-                             else
--                            {
--                                // create a new group to replace the automatic group
--                                ScDPSaveGroupItem aGroup( aNewName );
--                                aGroup.AddElement( aOldText );
--                                pGroupDim->AddGroupItem( aGroup );
--                            }
-+                                aMemberName = aPosData.MemberName;
- 
--                            // in both cases also adjust savedata, to preserve member settings (show details)
--                            ScDPSaveDimension* pSaveDim = aData.GetDimensionByName( aDimName );
--                            ScDPSaveMember* pSaveMember = pSaveDim->GetExistingMemberByName( aOldText );
--                            if ( pSaveMember )
--                                pSaveMember->SetName( aNewName );
--
--                            bChange = TRUE;
-+                            String aNew = lcl_replaceMemberNameInSubtotal(rString, aMemberName);
-+                            pDim->SetSubtotalName(aNew);
-+                            bChange = true;
-                         }
-                         else
--                            nErrorId = STR_INVALIDNAME;
-+                        {
-+                            // Check to make sure the member name isn't
-+                            // already used.
-+                            if (rString.Len())
-+                            {
-+                                if (rString.EqualsIgnoreCaseAscii(pMem->GetName()))
-+                                {
-+                                    pMem->RemoveLayoutName();
-+                                    bChange = true;
-+                                }
-+                                else if (!pDim->IsMemberNameInUse(rString))
-+                                {
-+                                    pMem->SetLayoutName(rString);
-+                                    bChange = true;
-+                                }
-+                                else
-+                                    nErrorId = STR_INVALIDNAME;
-+                            }
-+                            else
-+                                nErrorId = STR_INVALIDNAME;
-+                        }
-                     }
-+                    while (false);
-                 }
-             }
-         }
-+    }
- 
--        if ( bChange )
--        {
--            // apply changes
--            ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
--            ScDPObject* pNewObj = new ScDPObject( *pDPObj );
--            pNewObj->SetSaveData( aData );
--            aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
--            delete pNewObj;
--        }
--        else
--        {
--            if ( !nErrorId )
--                nErrorId = STR_ERR_DATAPILOT_INPUT;
--            ErrorMessage( nErrorId );
--        }
-+    if ( bChange )
-+    {
-+        // apply changes
-+        ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
-+        ScDPObject* pNewObj = new ScDPObject( *pDPObj );
-+        pNewObj->SetSaveData( aData );
-+        aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
-+        delete pNewObj;
-+    }
-+    else
-+    {
-+        if ( !nErrorId )
-+            nErrorId = STR_ERR_DATAPILOT_INPUT;
-+        ErrorMessage( nErrorId );
-     }
- }
- 
diff --git a/applied_patches/0432-calc-formula-variable-separators-officecfg.diff b/applied_patches/0154-calc-formula-variable-separators-officecfg.diff
similarity index 100%
rename from applied_patches/0432-calc-formula-variable-separators-officecfg.diff
rename to applied_patches/0154-calc-formula-variable-separators-officecfg.diff
diff --git a/applied_patches/0155-calc-dp-custom-names-sc-win32-fix.diff b/applied_patches/0155-calc-dp-custom-names-sc-win32-fix.diff
deleted file mode 100644
index 5953bf6c4..000000000
--- a/applied_patches/0155-calc-dp-custom-names-sc-win32-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git sc/inc/dpgroup.hxx sc/inc/dpgroup.hxx
-index 0aab7c8..e98a248 100644
---- sc/inc/dpgroup.hxx
-+++ sc/inc/dpgroup.hxx
-@@ -33,6 +33,7 @@
- 
- #include <vector>
- #include <hash_set>
-+#include <boost/shared_ptr.hpp>
- 
- #include "dptabdat.hxx"
- #include "scdllapi.h"
-@@ -183,7 +183,7 @@ class ScDPGroupTableData : public ScDPTableData
- {
-     typedef ::std::hash_set< ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > StringHashSet;
- 
--    ScDPTableData*          pSourceData;
-+    ::boost::shared_ptr<ScDPTableData> pSourceData;
-     long                    nSourceCount;
-     ScDPGroupDimensionVec   aGroups;
-     ScDPNumGroupDimension*  pNumGroups;     // array[nSourceCount]
-@@ -201,7 +201,7 @@ class ScDPGroupTableData : public ScDPTableData
- 
- public:
-                 // takes ownership of pSource
--                ScDPGroupTableData( ScDPTableData* pSource, ScDocument* pDocument );
-+                ScDPGroupTableData( const ::boost::shared_ptr<ScDPTableData>& pSource, ScDocument* pDocument );
-     virtual     ~ScDPGroupTableData();
- 
-     void        AddGroupDimension( const ScDPGroupDimension& rGroup );
-diff --git sc/inc/dpobject.hxx sc/inc/dpobject.hxx
-index 854e1da..503c531 100644
---- sc/inc/dpobject.hxx
-+++ sc/inc/dpobject.hxx
-@@ -38,7 +38,7 @@
- #include "dpoutput.hxx"
- #include <com/sun/star/sheet/XDimensionsSupplier.hpp>
- 
--#include <memory>
-+#include <boost/shared_ptr.hpp>
- 
- //------------------------------------------------------------------
- 
-@@ -104,7 +104,7 @@ private:
- 	ScSheetSourceDesc*		pSheetDesc;		//	for sheet data
- 	ScImportSourceDesc* 	pImpDesc;		//	for database data
- 	ScDPServiceDesc*		pServDesc;		//	for external service
--    ::std::auto_ptr<ScDPTableData>  mpTableData;
-+    ::boost::shared_ptr<ScDPTableData>  mpTableData;
- 											// cached data
- 	com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> xSource;
- 	ScDPOutput*				pOutput;
-diff --git sc/source/core/data/dpgroup.cxx sc/source/core/data/dpgroup.cxx
-index 8b4bb57..cbb03ba 100644
---- sc/source/core/data/dpgroup.cxx
-+++ sc/source/core/data/dpgroup.cxx
-@@ -70,6 +70,7 @@ using ::rtl::OUStringHash;
- using ::std::vector;
- using ::std::hash_set;
- using ::std::hash_map;
-+using ::boost::shared_ptr;
- 
- #define D_TIMEFACTOR              86400.0
- 
-@@ -978,7 +978,7 @@ String lcl_GetNumGroupForValue( double fValue, const ScDPNumGroupInfo& rInfo, bo
-     return lcl_GetNumGroupName( fGroupStart, rInfo, bHasNonInteger, cDecSeparator, pFormatter );
- }
- 
--ScDPGroupTableData::ScDPGroupTableData( ScDPTableData* pSource, ScDocument* pDocument ) :
-+ScDPGroupTableData::ScDPGroupTableData( const shared_ptr<ScDPTableData>& pSource, ScDocument* pDocument ) :
-     ScDPTableData(pDocument),
-     pSourceData( pSource ),
-     pDoc( pDocument )
-@@ -993,7 +993,6 @@ ScDPGroupTableData::ScDPGroupTableData( ScDPTableData* pSource, ScDocument* pDoc
- ScDPGroupTableData::~ScDPGroupTableData()
- {
-     delete[] pNumGroups;
--    delete pSourceData;
- }
- 
- void ScDPGroupTableData::AddGroupDimension( const ScDPGroupDimension& rGroup )
-diff --git sc/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
-index 7e977f0..cd4dcd1 100644
---- sc/source/core/data/dpobject.cxx
-+++ sc/source/core/data/dpobject.cxx
-@@ -78,7 +78,7 @@
- 
- using namespace com::sun::star;
- using ::std::vector;
--using ::std::auto_ptr;
-+using ::boost::shared_ptr;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::UNO_QUERY;
-@@ -163,7 +163,7 @@ ScDPObject::ScDPObject( ScDocument* pD ) :
- 	pSheetDesc( NULL ),
- 	pImpDesc( NULL ),
- 	pServDesc( NULL ),
--    mpTableData(NULL),
-+    mpTableData(static_cast<ScDPTableData*>(NULL)),
- 	pOutput( NULL ),
- 	nAutoFormatIndex( 65535 ),
- 	bSettingsChanged( FALSE ),
-@@ -186,7 +186,7 @@ ScDPObject::ScDPObject(const ScDPObject& r) :
- 	pSheetDesc( NULL ),
- 	pImpDesc( NULL ),
- 	pServDesc( NULL ),
--    mpTableData(NULL), 
-+    mpTableData(static_cast<ScDPTableData*>(NULL)), 
- 	pOutput( NULL ),
- 	bSettingsChanged( FALSE ),
- 	bAlive( FALSE ),
-@@ -414,7 +414,7 @@ void ScDPObject::CreateOutput()
- 
- ScDPTableData* ScDPObject::GetTableData()
- {
--    if (!mpTableData.get())
-+    if (!mpTableData)
-     {
-         if ( pImpDesc )
-         {
-@@ -435,7 +435,7 @@ ScDPTableData* ScDPObject::GetTableData()
-         // grouping (for cell or database data)
-         if ( pSaveData && pSaveData->GetExistingDimensionData() )
-         {
--            auto_ptr<ScDPGroupTableData> pGroupData(new ScDPGroupTableData(mpTableData.release(), pDoc));
-+            shared_ptr<ScDPGroupTableData> pGroupData(new ScDPGroupTableData(mpTableData, pDoc));
-             pSaveData->GetExistingDimensionData()->WriteToData(*pGroupData);
-             mpTableData = pGroupData;
-         }
diff --git a/applied_patches/0433-chart-subtitle-xls-export.diff b/applied_patches/0155-chart-subtitle-xls-export.diff
similarity index 100%
rename from applied_patches/0433-chart-subtitle-xls-export.diff
rename to applied_patches/0155-chart-subtitle-xls-export.diff
diff --git a/applied_patches/0156-calc-dp-custom-names-sc-group-fix.diff b/applied_patches/0156-calc-dp-custom-names-sc-group-fix.diff
deleted file mode 100644
index 892f66cd8..000000000
--- a/applied_patches/0156-calc-dp-custom-names-sc-group-fix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- sc/source/core/data/dpobject.cxx
-+++ sc/source/core/data/dpobject.cxx
-@@ -448,7 +448,7 @@ void ScDPObject::CreateObjects()
- {
-     // if groups are involved, create a new source with the ScDPGroupTableData
-     if ( bSettingsChanged && pSaveData && pSaveData->GetExistingDimensionData() )
--        xSource = NULL;
-+        InvalidateSource();
- 
- 	if (!xSource.is())
- 	{
-@@ -501,6 +501,7 @@ void ScDPObject::InvalidateSource()
- void ScDPObject::InvalidateSource()
- {
- 	xSource = NULL;
-+	mpTableData.reset();
- }
- 
- ScRange ScDPObject::GetNewOutputRange( BOOL& rOverflow )
diff --git a/applied_patches/0434-calc-external-defined-names-enable.diff b/applied_patches/0156-calc-external-defined-names-enable.diff
similarity index 100%
rename from applied_patches/0434-calc-external-defined-names-enable.diff
rename to applied_patches/0156-calc-external-defined-names-enable.diff
diff --git a/applied_patches/0157-calc-dp-default-new-sheet.diff b/applied_patches/0157-calc-dp-default-new-sheet.diff
deleted file mode 100644
index d099e530e..000000000
--- a/applied_patches/0157-calc-dp-default-new-sheet.diff
+++ /dev/null
@@ -1,121 +0,0 @@
-diff --git sc/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
-index 99897a0..4dee615 100644
---- sc/source/ui/dbgui/pvlaydlg.cxx
-+++ sc/source/ui/dbgui/pvlaydlg.cxx
-@@ -107,7 +107,7 @@ PointerStyle lclGetPointerForField( ScDPFieldType eType )
- //----------------------------------------------------------------------------
- 
- ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
--                                    const ScDPObject& rDPObject )
-+                                    const ScDPObject& rDPObject, bool bNewOutput )
- 	:	ScAnyRefDlg	( pB, pCW, pParent, RID_SCDLG_PIVOT_LAYOUT ),
-         aFlLayout       ( this, ScResId( FL_LAYOUT ) ),
-         aFtPage         ( this, ScResId( FT_PAGE ) ),
-@@ -167,7 +167,7 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
-     xDlgDPObject->FillOldParam( thePivotData, FALSE );
-     xDlgDPObject->FillLabelData( thePivotData );
- 
--	Init();
-+	Init(bNewOutput);
- 	FreeResource();
- }
- 
-@@ -202,7 +202,7 @@ ScDPFieldWindow& ScDPLayoutDlg::GetFieldWindow( ScDPFieldType eType )
-     return aWndSelect;
- }
- 
--void __EXPORT ScDPLayoutDlg::Init()
-+void __EXPORT ScDPLayoutDlg::Init(bool bNewOutput)
- {
- 	DBG_ASSERT( pViewData && pDoc,
- 				"Ctor-Initialisierung fehlgeschlagen!" );
-@@ -302,21 +302,33 @@ void __EXPORT ScDPLayoutDlg::Init()
- 			}
- 		}
- 	}
-+    
-+    if (bNewOutput)
-+    {
-+        // Output to a new sheet by default for a brand-new output.
-+        aLbOutPos.SelectEntryPos(1);
-+        aEdOutPos.Disable();
-+        aRbOutPos.Disable();
-+    }
-+    else
-+    {
-+        // Modifying an existing dp output.
- 
--	if ( thePivotData.nTab != MAXTAB+1 )
--	{
--		String aStr;
--		ScAddress( thePivotData.nCol,
--				   thePivotData.nRow,
--				   thePivotData.nTab ).Format( aStr, STD_FORMAT, pDoc, pDoc->GetAddressConvention() );
--		aEdOutPos.SetText( aStr );
--		EdModifyHdl(0);
--	}
--	else
--	{
--		aLbOutPos.SelectEntryPos( aLbOutPos.GetEntryCount()-1 );
--		SelAreaHdl(NULL);
--	}
-+        if ( thePivotData.nTab != MAXTAB+1 )
-+        {
-+            String aStr;
-+            ScAddress( thePivotData.nCol,
-+                       thePivotData.nRow,
-+                       thePivotData.nTab ).Format( aStr, STD_FORMAT, pDoc, pDoc->GetAddressConvention() );
-+            aEdOutPos.SetText( aStr );
-+            EdModifyHdl(0);
-+        }
-+        else
-+        {
-+            aLbOutPos.SelectEntryPos( aLbOutPos.GetEntryCount()-1 );
-+            SelAreaHdl(NULL);
-+        }
-+    }
- 
- 	aBtnIgnEmptyRows.Check( thePivotData.bIgnoreEmptyRows );
- 	aBtnDetectCat   .Check( thePivotData.bDetectCategories );
-diff --git sc/source/ui/inc/pvlaydlg.hxx sc/source/ui/inc/pvlaydlg.hxx
-index ceebdb7..a3e08cb 100644
---- sc/source/ui/inc/pvlaydlg.hxx
-+++ sc/source/ui/inc/pvlaydlg.hxx
-@@ -89,7 +89,8 @@ public:
-                                 SfxBindings* pB,
-                                 SfxChildWindow* pCW,
-                                 Window* pParent,
--                                const ScDPObject& rDPObject );
-+                                const ScDPObject& rDPObject,
-+                                bool bNewOutput );
-     virtual                 ~ScDPLayoutDlg();
- 
-     virtual void            SetReference( const ScRange& rRef, ScDocument* pDoc );
-@@ -190,7 +191,7 @@ private:
- 
- private:
-     ScDPFieldWindow&        GetFieldWindow  ( ScDPFieldType eType );
--    void                    Init            ();
-+    void                    Init            (bool bNewOutput);
-     void                    InitWndSelect   ( LabelData** ppLabelArr, long nLabels );
-     void                    InitWnd         ( PivotField* pArr, long nCount, ScDPFieldType eType );
-     void                    InitFocus       ();
-diff --git sc/source/ui/view/tabvwshc.cxx sc/source/ui/view/tabvwshc.cxx
-index aa38b7a..b20876f 100644
---- sc/source/ui/view/tabvwshc.cxx
-+++ sc/source/ui/view/tabvwshc.cxx
-@@ -255,8 +255,13 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
- 
-             if( pDialogDPObject )
-             {
-+                // Check for an existing datapilot output.
-+                ScViewData* pViewData = GetViewData();
-+                ScDPObject* pObj = GetViewData()->GetDocument()->GetDPAtCursor(
-+                    pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo());
-+
-                 GetViewData()->SetRefTabNo( GetViewData()->GetTabNo() );
--                pResult = new ScDPLayoutDlg( pB, pCW, pParent, *pDialogDPObject );
-+                pResult = new ScDPLayoutDlg( pB, pCW, pParent, *pDialogDPObject, pObj == NULL);
-             }
- 		}
- 		break;
diff --git a/applied_patches/0435-calc-xls-disable-adjust-row-height.diff b/applied_patches/0157-calc-xls-disable-adjust-row-height.diff
similarity index 100%
rename from applied_patches/0435-calc-xls-disable-adjust-row-height.diff
rename to applied_patches/0157-calc-xls-disable-adjust-row-height.diff
diff --git a/applied_patches/0436-calc-grammar-xls-english-offapi.diff b/applied_patches/0158-calc-grammar-xls-english-offapi.diff
similarity index 100%
rename from applied_patches/0436-calc-grammar-xls-english-offapi.diff
rename to applied_patches/0158-calc-grammar-xls-english-offapi.diff
diff --git a/applied_patches/0437-calc-grammar-xls-english-sc.diff b/applied_patches/0159-calc-grammar-xls-english-sc.diff
similarity index 100%
rename from applied_patches/0437-calc-grammar-xls-english-sc.diff
rename to applied_patches/0159-calc-grammar-xls-english-sc.diff
diff --git a/applied_patches/0159-fix-biffdumper.diff b/applied_patches/0159-fix-biffdumper.diff
deleted file mode 100644
index 25bc8efed..000000000
--- a/applied_patches/0159-fix-biffdumper.diff
+++ /dev/null
@@ -1,161 +0,0 @@
-Index: sc/source/filter/inc/xistream.hxx
-===================================================================
---- sc/source/filter/inc/xistream.hxx	(revision 264332)
-+++ sc/source/filter/inc/xistream.hxx	(working copy)
-@@ -310,8 +310,7 @@
-     /** Seeks to last position from user position stack.
-         @descr  This position will be removed from the stack. */
-     void                PopPosition();
--//UNUSED2008-05  /** Removes last position from user position stack, but does not seek to it. */
--//UNUSED2008-05  void                RejectPosition();
-+    void                RejectPosition();
- 
-     /** Stores current position. This position keeps valid in all records. */
-     void                StoreGlobalPosition();
-Index: sc/source/filter/excel/xistream.cxx
-===================================================================
---- sc/source/filter/excel/xistream.cxx	(revision 264332)
-+++ sc/source/filter/excel/xistream.cxx	(working copy)
-@@ -468,12 +468,12 @@
-     }
- }
- 
--//UNUSED2008-05  void XclImpStream::RejectPosition()
--//UNUSED2008-05  {
--//UNUSED2008-05      DBG_ASSERT( !maPosStack.empty(), "XclImpStream::RejectPosition - stack empty" );
--//UNUSED2008-05      if( !maPosStack.empty() )
--//UNUSED2008-05          maPosStack.pop_back();
--//UNUSED2008-05  }
-+void XclImpStream::RejectPosition()
-+{
-+    DBG_ASSERT( !maPosStack.empty(), "XclImpStream::RejectPosition - stack empty" );
-+    if( !maPosStack.empty() )
-+        maPosStack.pop_back();
-+}
- 
- void XclImpStream::StoreGlobalPosition()
- {
-Index: sc/source/filter/excel/biffdump.cxx
-===================================================================
---- sc/source/filter/excel/biffdump.cxx	(revision 264332)
-+++ sc/source/filter/excel/biffdump.cxx	(working copy)
-@@ -918,7 +918,7 @@
- 
-     // XF type/parent
-     LINESTART();
--    ::extract_value( nTmp, nTypeProt, 4, 12 );
-+    nTmp = ::extract_value<sal_uInt16, sal_uInt16>( nTypeProt, 4, 12 );
-     ADDTEXT( "index=#" );           __AddDec( t, nXFCount++ );
-     ADDTEXT( "   type=" );          lcl_AddFlag( t, bCell, "cell", "style" );
-     ADDTEXT( "   parent-xf=#" );    __AddDec( t, nTmp );
-@@ -926,7 +926,7 @@
- 
-     // attribute used flags
-     LINESTART();
--    ::extract_value( __nFlags, nMiscAttrib, 10, 6 );
-+    __nFlags = ::extract_value<sal_uInt16, sal_uInt16>( nMiscAttrib, 10, 6 );
-     if( !bCell ) __nFlags ^= 0x3F;  // in style XFs a 0 means used
-     ADDTEXT( "used " ); STARTFLAG();
-     ADDFLAG( EXC_XF_DIFF_VALFMT, "numfmt" );
-@@ -947,7 +947,7 @@
- 
-     // alignment
-     LINESTART();
--    ::extract_value( nTmp, nAlign, 0, 3 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nAlign, 0, 3 );
-     ADDTEXT( "hor-align=" );        __AddDec( t, nTmp );
-     ADDTEXT( " (" );
-     switch( nTmp )
-@@ -962,7 +962,7 @@
-         case EXC_XF_HOR_DISTRIB:    ADDTEXT( "distrib" );   break;
-         default:                    ADDTEXT( "!unknown!" );
-     };
--    ::extract_value( nTmp, nAlign, 4, 3 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nAlign, 4, 3 );
-     ADDTEXT( ")   ver-align=" );    __AddDec( t, nTmp );
-     ADDTEXT( " (" );
-     switch( nTmp )
-@@ -978,7 +978,7 @@
-     PRINT();
- 
-     LINESTART();
--    ::extract_value( nTmp, nAlign, 8, 8 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nAlign, 8, 8 );
-     ADDTEXT( "rotation=" );         __AddDec( t, nTmp );
-     ADDTEXT( " (" );
-     if( nTmp < 91 )
-@@ -989,10 +989,10 @@
-         { ADDTEXT( "stacked" ); }
-     else
-         { ADDTEXT( "!unknown!" ); }
--    ::extract_value( nTmp, nMiscAttrib, 0, 4 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nMiscAttrib, 0, 4 );
-     ADDTEXT( ")   indent=" );       __AddDec( t, nTmp );
-     ADDTEXT( "   shrink=" );        lcl_AddOnOff( t, ::get_flag( nMiscAttrib, EXC_XF8_SHRINK ) );
--    ::extract_value( nTmp, nMiscAttrib, 6, 2 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nMiscAttrib, 6, 2 );
-     ADDTEXT( "   text-dir=" );      __AddDec( t, nTmp );
-     ADDTEXT( " (" );
-     switch( nTmp )
-@@ -1007,39 +1007,39 @@
- 
-     // border/area
-     LINESTART();
--    ::extract_value( nTmp, nBorder1, 0, 4 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 0, 4 );
-     ADDTEXT( "left-line=" );        __AddDec( t, nTmp );
--    ::extract_value( nTmp, nBorder1, 16, 7 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 16, 7 );
-     ADDTEXT( " color=" );           __AddDec( t, nTmp );
--    ::extract_value( nTmp, nBorder1, 4, 4 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 4, 4 );
-     ADDTEXT( "   right-line =" );   __AddDec( t, nTmp );
--    ::extract_value( nTmp, nBorder1, 23, 7 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 23, 7 );
-     ADDTEXT( " color=" );           __AddDec( t, nTmp );
-     PRINT();
-     LINESTART();
--    ::extract_value( nTmp, nBorder1, 8, 4 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 8, 4 );
-     ADDTEXT( "top-line =" );        __AddDec( t, nTmp );
--    ::extract_value( nTmp, nBorder2, 0, 7 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder2, 0, 7 );
-     ADDTEXT( " color=" );           __AddDec( t, nTmp );
--    ::extract_value( nTmp, nBorder1, 12, 4 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 12, 4 );
-     ADDTEXT( "   bottom-line=" );   __AddDec( t, nTmp );
--    ::extract_value( nTmp, nBorder2, 7, 7 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder2, 7, 7 );
-     ADDTEXT( " color=" );           __AddDec( t, nTmp );
-     PRINT();
-     LINESTART();
--    ::extract_value( nTmp, nBorder2, 21, 4 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder2, 21, 4 );
-     ADDTEXT( "diag-line=" );        __AddDec( t, nTmp );
--    ::extract_value( nTmp, nBorder2, 14, 7 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder2, 14, 7 );
-     ADDTEXT( " color=" );           __AddDec( t, nTmp );
-     ADDTEXT( "   diag-tl-to-br=" ); lcl_AddOnOff( t, ::get_flag( nBorder1, static_cast< sal_Size >( 0x40000000U ) ) );
-     ADDTEXT( "   diag-bl-to-tr=" ); lcl_AddOnOff( t, ::get_flag( nBorder1, static_cast< sal_Size >( 0x80000000U ) ) );
-     PRINT();
-     LINESTART();
--    ::extract_value( nTmp, nBorder2, 26, 6 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder2, 26, 6 );
-     ADDTEXT( "area-pattern=" );     __AddDec( t, nTmp );
--    ::extract_value( nTmp, nArea, 0, 7 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nArea, 0, 7 );
-     ADDTEXT( "   fore-color=" );    __AddDec( t, nTmp );
--    ::extract_value( nTmp, nArea, 7, 7 );
-+    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nArea, 7, 7 );
-     ADDTEXT( "   back-color=" );    __AddDec( t, nTmp );
-     PRINT();
- 
-@@ -7478,7 +7478,7 @@
- #define EXC_CTRLDUMP_PLAIN_STARTFLAG( text )                EXC_CTRLDUMP_PLAIN_STARTOPTFLAG( text, true, 0 )
- #define EXC_CTRLDUMP_STARTFLAG( text )                      EXC_CTRLDUMP_STARTOPTFLAG( text, true, 0 )
- #define EXC_CTRLDUMP_ADDFLAG( flag, text )                  { if( nFlags & (flag) ) t.Append( " " text ); }
--#define EXC_CTRLDUMP_ADDFLAGVALUE( start, width, text )     { sal_uInt32 nValue; ::extract_value( nValue, nFlags, start, width ); t.Append( " " text "=" ); lclAppendDec( t, nValue ); }
-+#define EXC_CTRLDUMP_ADDFLAGVALUE( start, width, text )     { sal_uInt32 nValue = ::extract_value<sal_uInt32,sal_uInt32>( nFlags, start, width ); t.Append( " " text "=" ); lclAppendDec( t, nValue ); }
- #define EXC_CTRLDUMP_ENDFLAG( reserved )                    { if( nFlags & (reserved) ) { t.Append( " ?" ); lclAppendHex( t, static_cast< sal_uInt32 >( nFlags & (reserved) ) ); } EXC_CTRLDUMP_PRINT(); }
- // read coordinates
- #define EXC_CTRLDUMP_COORD2( text ) { EXC_CTRLDUMP_ALIGN_INSTRM( 4 ); EXC_CTRLDUMP_DEC2( text "-x" ); EXC_CTRLDUMP_DEC2( text "-y" ); }
diff --git a/applied_patches/0160-calc-find-replace-empty-cells-sc.diff b/applied_patches/0160-calc-find-replace-empty-cells-sc.diff
new file mode 100644
index 000000000..f78ad8b0b
--- /dev/null
+++ b/applied_patches/0160-calc-find-replace-empty-cells-sc.diff
@@ -0,0 +1,371 @@
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index 3c62a56..0c45c64 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -702,6 +702,16 @@ private:
+     BOOL		SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark);
+     BOOL		ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+                                 ScDocument* pUndoDoc);
++    bool        SearchAndReplaceEmptyCells(
++                    const SvxSearchItem& rSearchItem,
++                    SCCOL& rCol, SCROW& rRow, ScMarkData& rMark,
++                    String& rUndoStr, ScDocument* pUndoDoc);
++    bool        SearchRangeForEmptyCell(const ScRange& rRange,
++                    const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, 
++                    String& rUndoStr, ScDocument* pUndoDoc);
++    bool        SearchRangeForAllEmptyCells(const ScRange& rRange, 
++                    const SvxSearchItem& rSearchItem, ScMarkData& rMark,
++                    String& rUndoStr, ScDocument* pUndoDoc);
+ 
+                                 // benutzen globalen SortParam:
+     BOOL		IsSorted(SCCOLROW nStart, SCCOLROW nEnd);
+diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx
+index cb9dd4a..5b94923 100644
+--- sc/source/core/data/column.cxx
++++ sc/source/core/data/column.cxx
+@@ -1373,7 +1373,24 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarke
+                     CloneCell( i, nFlags, *rColumn.pDocument, aDestPos );
+ 
+                 if (pNew)
+-                    rColumn.Insert(pItems[i].nRow, pNew);
++                {
++                    // Special case to allow removing of cell instances.  A 
++                    // string cell with empty content is used to indicate an
++                    // empty cell.
++                    if (pNew->GetCellType() == CELLTYPE_STRING)
++                    {
++                        String aStr;
++                        static_cast<ScStringCell*>(pNew)->GetString(aStr);
++                        if (aStr.Len() == 0)
++                            // A string cell with empty string.  Delete the cell itself.
++                            rColumn.Delete(pItems[i].nRow);
++                        else
++                            // non-empty string cell
++                            rColumn.Insert(pItems[i].nRow, pNew);
++                    }
++                    else
++                        rColumn.Insert(pItems[i].nRow, pNew);
++                }
+             }
+         }
+     }
+diff --git sc/source/core/data/table6.cxx sc/source/core/data/table6.cxx
+index 994596d..8d5ec0f 100644
+--- sc/source/core/data/table6.cxx
++++ sc/source/core/data/table6.cxx
+@@ -52,6 +52,8 @@
+ //--------------------------------------------------------------------------
+ 
+ 
++using ::com::sun::star::util::SearchOptions;
++
+ BOOL lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& rVal )
+ {
+     //	TRUE = more than 1 paragraph
+@@ -660,6 +662,12 @@ BOOL ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem,
+             com::sun::star::util::SearchOptions aSearchOptions = rSearchItem.GetSearchOptions();
+             aSearchOptions.Locale = *ScGlobal::pLocale;
+ 
++            if (!aSearchOptions.searchString.getLength())
++            {
++                // Search for empty cells.
++                return SearchAndReplaceEmptyCells(rSearchItem, rCol, rRow, rMark, rUndoStr, pUndoDoc);
++            }
++
+             //	#107259# reflect UseAsianOptions flag in SearchOptions
+             //	(use only ignore case and width if asian options are disabled).
+             //	This is also done in SvxSearchDialog CommandHdl, but not in API object.
+@@ -686,6 +694,274 @@ BOOL ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem,
+     return bFound;
+ }
+ 
++bool ScTable::SearchAndReplaceEmptyCells(
++    const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark,
++    String& rUndoStr, ScDocument* pUndoDoc)
++{
++    SCCOL nColStart, nColEnd;
++    SCROW nRowStart, nRowEnd;
++    GetFirstDataPos(nColStart, nRowStart);
++    GetLastDataPos(nColEnd, nRowEnd);
++
++    ScRangeList aRanges;
++    aRanges.Append(ScRange(nColStart, nRowStart, nTab, nColEnd, nRowEnd, nTab));
++
++    if (rSearchItem.GetSelection())
++    {
++        // current selection only.
++        if (!rMark.IsMarked() && !rMark.IsMultiMarked())
++            // There is no selection.  Bail out.
++            return false;
++
++        ScRangeList aMarkedRanges, aNewRanges;
++        rMark.FillRangeListWithMarks(&aMarkedRanges, true);
++        for (ScRangePtr p = aMarkedRanges.First(); p; p = aMarkedRanges.Next())
++        {
++            if (p->aStart.Col() > nColEnd || p->aStart.Row() > nRowEnd)
++                // This range is outside the data area.  Skip it.
++                continue;
++
++            // Shrink the range into data area only.
++            if (p->aStart.Col() < nColStart)
++                p->aStart.SetCol(rCol);
++            if (p->aStart.Row() < nRowStart)
++                p->aStart.SetRow(rRow);
++
++            if (p->aEnd.Col() > nColEnd)
++                p->aEnd.SetCol(nColEnd);
++            if (p->aEnd.Row() > nRowEnd)
++                p->aEnd.SetRow(nRowEnd);
++            
++            aNewRanges.Append(*p);
++        }
++        aRanges = aNewRanges;
++    }
++
++    sal_uInt16 nCommand = rSearchItem.GetCommand();
++    if (nCommand == SVX_SEARCHCMD_FIND || nCommand == SVX_SEARCHCMD_REPLACE)
++    {
++        if (rSearchItem.GetBackward())
++        {
++            for (ScRangePtr p = aRanges.Last(); p; p = aRanges.Prev())
++            {
++                if (SearchRangeForEmptyCell(*p, rSearchItem, rCol, rRow, rUndoStr, pUndoDoc))
++                    return true;
++            }
++        }
++        else
++        {
++            for (ScRangePtr p = aRanges.First(); p; p = aRanges.Next())
++            {
++                if (SearchRangeForEmptyCell(*p, rSearchItem, rCol, rRow, rUndoStr, pUndoDoc))
++                    return true;
++            }
++        }
++    }
++    else if (nCommand == SVX_SEARCHCMD_FIND_ALL || nCommand == SVX_SEARCHCMD_REPLACE_ALL)
++    {
++        bool bFound = false;
++        ScMarkData aNewMark(rMark);
++        aNewMark.ResetMark();
++        for (ScRangePtr p = aRanges.First(); p; p = aRanges.Next())
++            bFound |= SearchRangeForAllEmptyCells(*p, rSearchItem, aNewMark, rUndoStr, pUndoDoc);
++        rMark = aNewMark;
++        return bFound;
++    }
++    return false;
++}
++
++bool ScTable::SearchRangeForEmptyCell(
++    const ScRange& rRange, const SvxSearchItem& rSearchItem, 
++    SCCOL& rCol, SCROW& rRow, String& rUndoStr, ScDocument* /*pUndoDoc*/)
++{
++    sal_uInt16 nCmd = rSearchItem.GetCommand();
++    if (rSearchItem.GetBackward())
++    {
++        // backward search
++        if (rSearchItem.GetRowDirection())
++        {
++            // row direction.
++            SCROW nBeginRow = rRange.aEnd.Row() > rRow ? rRow : rRange.aEnd.Row();
++            for (SCROW nRow = nBeginRow; nRow >= rRange.aStart.Row(); --nRow)
++            {
++                SCCOL nBeginCol = rRange.aEnd.Col();
++                if (nRow == rRow && nBeginCol >= rCol)
++                    // always start from one cell before the cursor.
++                    nBeginCol = rCol - (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
++
++                for (SCCOL nCol = nBeginCol; nCol >= rRange.aStart.Col(); --nCol)
++                {
++                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
++                    if (!pCell)
++                    {
++                        // empty cell found.
++                        rCol = nCol;
++                        rRow = nRow;
++                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
++                            rSearchItem.GetReplaceString().Len())
++                        {
++                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
++                            rUndoStr = String();
++                        }
++                        return true;
++                    }
++                }
++            }
++        }
++        else
++        {
++            // column direction.
++            SCCOL nBeginCol = rRange.aEnd.Col() > rCol ? rCol : rRange.aEnd.Col();
++            for (SCCOL nCol = nBeginCol; nCol >= rRange.aStart.Col(); --nCol)
++            {
++                SCROW nBeginRow = rRange.aEnd.Row();
++                if (nCol == rCol && nBeginRow >= rRow)
++                    // always start from one cell before the cursor.
++                    nBeginRow = rRow - (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
++                for (SCROW nRow = nBeginRow; nRow >= rRange.aStart.Row(); --nRow)
++                {   
++                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
++                    if (!pCell)
++                    {
++                        // empty cell found.
++                        rCol = nCol;
++                        rRow = nRow;
++                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
++                            rSearchItem.GetReplaceString().Len())
++                        {
++                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
++                            rUndoStr = String();
++                        }
++                        return true;
++                    }
++                }
++            }
++        }
++    }
++    else
++    {
++        // forward search
++        if (rSearchItem.GetRowDirection())
++        {
++            // row direction.
++            SCROW nBeginRow = rRange.aStart.Row() < rRow ? rRow : rRange.aStart.Row();
++            for (SCROW nRow = nBeginRow; nRow <= rRange.aEnd.Row(); ++nRow)
++            {
++                SCCOL nBeginCol = rRange.aStart.Col();
++                if (nRow == rRow && nBeginCol <= rCol)
++                    // always start from one cell past the cursor.
++                    nBeginCol = rCol + (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
++                for (SCCOL nCol = nBeginCol; nCol <= rRange.aEnd.Col(); ++nCol)
++                {
++                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
++                    if (!pCell)
++                    {
++                        // empty cell found.
++                        rCol = nCol;
++                        rRow = nRow;
++                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
++                            rSearchItem.GetReplaceString().Len())
++                        {
++                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
++                            rUndoStr = String();
++                        }
++                        return true;
++                    }
++                }
++            }
++        }
++        else
++        {
++            // column direction.
++            SCCOL nBeginCol = rRange.aStart.Col() < rCol ? rCol : rRange.aStart.Col();
++            for (SCCOL nCol = nBeginCol; nCol <= rRange.aEnd.Col(); ++nCol)
++            {
++                SCROW nBeginRow = rRange.aStart.Row();
++                if (nCol == rCol && nBeginRow <= rRow)
++                    // always start from one cell past the cursor.
++                    nBeginRow = rRow + (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
++                for (SCROW nRow = nBeginRow; nRow <= rRange.aEnd.Row(); ++nRow)
++                {   
++                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
++                    if (!pCell)
++                    {
++                        // empty cell found.
++                        rCol = nCol;
++                        rRow = nRow;
++                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
++                            rSearchItem.GetReplaceString().Len())
++                        {
++                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
++                            rUndoStr = String();
++                        }
++                        return true;
++                    }
++                }
++            }
++        }
++    }
++    return false;
++}
++
++bool ScTable::SearchRangeForAllEmptyCells(
++    const ScRange& rRange, const SvxSearchItem& rSearchItem, ScMarkData& rMark,
++    String& rUndoStr, ScDocument* pUndoDoc)
++{
++    bool bFound = false;
++    bool bReplace = (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL) &&
++                    (rSearchItem.GetReplaceString().Len() > 0);
++
++    for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
++    {
++        if (aCol[nCol].IsEmptyData())
++        {
++            // The entire column is empty.  Add the whole column and move on.
++            rMark.SetMultiMarkArea(
++                ScRange(nCol, rRange.aStart.Row(), nTab, nCol, rRange.aEnd.Row(), nTab));
++            bFound = true;
++
++            if (bReplace)
++            {
++                const String& rNewStr = rSearchItem.GetReplaceString();
++                for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
++                {    
++                    aCol[nCol].Insert(nRow, new ScStringCell(rNewStr));
++                    if (pUndoDoc)
++                        // TODO: I'm using a string cell with empty content to 
++                        // trigger deletion of cell instance on undo.  Maybe I
++                        // should create a new cell type for this?
++                        pUndoDoc->PutCell(nCol, nRow, nTab, new ScStringCell(String()));
++                }
++                rUndoStr = String();
++            }
++            continue;
++        }
++
++        for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
++        {
++            ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
++            if (!pCell)
++            {    
++                // empty cell found
++                rMark.SetMultiMarkArea(ScRange(nCol, nRow, nTab));
++                bFound = true;
++
++                if (bReplace)
++                {    
++                    aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
++                    if (pUndoDoc)
++                        // TODO: I'm using a string cell with empty content to 
++                        // trigger deletion of cell instance on undo.  Maybe I
++                        // should create a new cell type for this?
++                        pUndoDoc->PutCell(nCol, nRow, nTab, new ScStringCell(String()));
++                }
++            }
++        }
++    }
++    return bFound;
++}
++
++
+ 
+ 
+ 
+diff --git sc/source/ui/view/tabvwsha.cxx sc/source/ui/view/tabvwsha.cxx
+index c64698b..a7fd06d 100644
+--- sc/source/ui/view/tabvwsha.cxx
++++ sc/source/ui/view/tabvwsha.cxx
+@@ -224,8 +224,13 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
+                 break;
+ 
+             case SID_SEARCH_ITEM:
+-                rSet.Put( ScGlobal::GetSearchItem() );
++            {
++                SvxSearchItem aItem(ScGlobal::GetSearchItem()); // make a copy.
++                // Search on current selection if a range is marked.
++                aItem.SetSelection(rMark.IsMarked());
++                rSet.Put(aItem);
+                 break;
++            }
+ 
+             case SID_SEARCH_OPTIONS:
+                 {
diff --git a/applied_patches/0161-calc-find-replace-empty-cells-svx.diff b/applied_patches/0161-calc-find-replace-empty-cells-svx.diff
new file mode 100644
index 000000000..0c7f92ddb
--- /dev/null
+++ b/applied_patches/0161-calc-find-replace-empty-cells-svx.diff
@@ -0,0 +1,105 @@
+diff --git svx/inc/srchdlg.hxx svx/inc/srchdlg.hxx
+index 1df6e3d..97a343e 100644
+--- svx/inc/srchdlg.hxx
++++ svx/inc/srchdlg.hxx
+@@ -177,6 +177,8 @@ public:
+ 
+     INT32			GetTransliterationFlags() const;
+ 
++    void            SetSaveToModule(bool b);
++    
+ private:
+     FixedText       aSearchText;
+     ComboBox        aSearchLB;
+diff --git svx/source/dialog/srchdlg.cxx svx/source/dialog/srchdlg.cxx
+index 670264a..5981347 100644
+--- svx/source/dialog/srchdlg.cxx
++++ svx/source/dialog/srchdlg.cxx
+@@ -701,6 +701,11 @@ INT32 SvxSearchDialog::GetTransliterationFlags() const
+     return nTransliterationFlags;
+ }
+ 
++void SvxSearchDialog::SetSaveToModule(bool b)
++{
++    pImpl->bSaveToModule = b;
++}
++
+ // -----------------------------------------------------------------------
+ 
+ void SvxSearchDialog::ApplyTransliterationFlags_Impl( INT32 nSettings )
+@@ -956,9 +961,36 @@ void SvxSearchDialog::CalculateDelta_Impl()
+ 
+ // -----------------------------------------------------------------------
+ 
++namespace {
++
++class ToggleSaveToModule
++{
++public:
++    ToggleSaveToModule(SvxSearchDialog& rDialog, bool bValue) :
++        mrDialog(rDialog), mbValue(bValue)
++    {
++        mrDialog.SetSaveToModule(mbValue);
++    }
++
++    ~ToggleSaveToModule()
++    {
++        mrDialog.SetSaveToModule(!mbValue);
++    }
++private:
++    SvxSearchDialog& mrDialog;
++    bool mbValue;
++};
++
++}
++
+ void SvxSearchDialog::Init_Impl( int bSearchPattern )
+ {
+     DBG_ASSERT( pSearchItem, "SearchItem == 0" );
++
++    // We don't want to save any intermediate state to the module while the 
++    // dialog is being initialized.
++    ToggleSaveToModule aNoModuleSave(*this, false);
++
+     bWriter = ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_WRITER );
+ 
+     pImpl->bMultiLineEdit = FALSE;
+@@ -1106,10 +1138,8 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
+         aSimilarityBox.Check( pSearchItem->IsLevenshtein() );
+     bSet = TRUE;
+ 
+-    pImpl->bSaveToModule = FALSE;
+     FlagHdl_Impl( &aSimilarityBox );
+     FlagHdl_Impl( &aJapOptionsCB );
+-    pImpl->bSaveToModule = TRUE;
+ 
+     FASTBOOL bDisableSearch = FALSE;
+     SfxViewShell* pViewShell = SfxViewShell::Current();
+@@ -1638,16 +1668,23 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd )
+     else
+         bSet = FALSE;
+ 
++    // Calc allows searching for empty cells.
++    bool bAllowEmptySearch = (pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC);
++
+     if ( pEd == &aSearchLB || pEd == &aReplaceLB )
+     {
+-        xub_StrLen nLBTxtLen = aSearchLB.GetText().Len(), nTxtLen;
++		xub_StrLen nSrchTxtLen = aSearchLB.GetText().Len();
++        xub_StrLen nReplTxtLen = 0;
++        if (bAllowEmptySearch)
++            nReplTxtLen = aReplaceLB.GetText().Len();
++        xub_StrLen nAttrTxtLen = 0;
+ 
+         if ( !pImpl->bMultiLineEdit )
+-           nTxtLen = aSearchAttrText.GetText().Len();
++		   nAttrTxtLen = aSearchAttrText.GetText().Len();
+         else
+-            nTxtLen = pImpl->aSearchFormats.GetText().Len();
++			nAttrTxtLen = pImpl->aSearchFormats.GetText().Len();
+ 
+-        if ( nLBTxtLen || nTxtLen )
++		if (nSrchTxtLen || nReplTxtLen || nAttrTxtLen)
+         {
+             EnableControl_Impl( &aSearchBtn );
+             EnableControl_Impl( &aReplaceBtn );
diff --git a/applied_patches/0162-calc-enhanced-merge-cells-sc.diff b/applied_patches/0162-calc-enhanced-merge-cells-sc.diff
new file mode 100644
index 000000000..3320a3be3
--- /dev/null
+++ b/applied_patches/0162-calc-enhanced-merge-cells-sc.diff
@@ -0,0 +1,1115 @@
+diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
+index 123a716..fde95e5 100644
+--- sc/source/ui/docshell/docfunc.cxx
++++ sc/source/ui/docshell/docfunc.cxx
+@@ -67,6 +67,7 @@
+ #include "attrib.hxx"
+ #include "autoform.hxx"
+ #include "cell.hxx"
++#include "cellmergeoption.hxx"
+ #include "detdata.hxx"
+ #include "detfunc.hxx"
+ #include "docpool.hxx"
+@@ -101,6 +102,7 @@
+ #include "tabprotection.hxx"
+ 
+ #include <memory>
++#include <set>
+ 
+ using namespace com::sun::star;
+ using ::com::sun::star::uno::Sequence;
+@@ -1693,7 +1693,11 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
+                     default:
+                         break;
+                 }
+-                MergeCells(aRange, FALSE, TRUE, TRUE);
++                ScCellMergeOption aMergeOption(
++                    aRange.aStart.Col(), aRange.aStart.Row(), 
++                    aRange.aEnd.Col(), aRange.aEnd.Row() );
++                aMergeOption.maTabs.insert(aRange.aStart.Tab());
++                MergeCells(aMergeOption, FALSE, TRUE, TRUE);
+             }
+             qIncreaseRange.pop_back();
+         }
+@@ -1742,7 +1746,10 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
+             while( !qIncreaseRange.empty() )
+             {
+                 ScRange aRange = qIncreaseRange.back();
+-                MergeCells(aRange, FALSE, TRUE, TRUE);
++                 ScCellMergeOption aMergeOption(
++                    aRange.aStart.Col(), aRange.aStart.Row(), 
++                    aRange.aEnd.Col(), aRange.aEnd.Row() );               
++                MergeCells(aMergeOption, FALSE, TRUE, TRUE);
+                 qIncreaseRange.pop_back();
+             }
+ 
+@@ -2180,7 +2187,10 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
+ 
+         if( !pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED | HASATTR_MERGED ) )
+         {
+-            MergeCells( aRange, FALSE, TRUE, TRUE );
++            ScCellMergeOption aMergeOption(
++                aRange.aStart.Col(), aRange.aStart.Row(), 
++                aRange.aEnd.Col(), aRange.aEnd.Row() ); 
++            MergeCells( aMergeOption, FALSE, TRUE, TRUE );
+         }
+         qDecreaseRange.pop_back();
+     }
+@@ -3974,86 +3976,110 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
+ 
+ //------------------------------------------------------------------------
+ 
+-BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord, BOOL bApi )
++BOOL ScDocFunc::MergeCells( const ScCellMergeOption& rOption, BOOL bContents, BOOL bRecord, BOOL bApi )
+ {
++    using ::std::set;
++
+ 	ScDocShellModificator aModificator( rDocShell );
+ 
+-	ScDocument* pDoc = rDocShell.GetDocument();
+-	SCCOL nStartCol = rRange.aStart.Col();
+-	SCROW nStartRow = rRange.aStart.Row();
+-	SCCOL nEndCol = rRange.aEnd.Col();
+-	SCROW nEndRow = rRange.aEnd.Row();
+-	SCTAB nTab = rRange.aStart.Tab();
++    SCCOL nStartCol = rOption.mnStartCol;
++    SCROW nStartRow = rOption.mnStartRow;
++    SCCOL nEndCol = rOption.mnEndCol;
++    SCROW nEndRow = rOption.mnEndRow;
++    if ((nStartCol == nEndCol && nStartRow == nEndRow) || rOption.maTabs.empty())
++    {
++        // Nothing to do.  Bail out quick.
++        return TRUE;
++    }
++
++    ScDocument* pDoc = rDocShell.GetDocument();
++    set<SCTAB>::const_iterator itrBeg = rOption.maTabs.begin(), itrEnd = rOption.maTabs.end();
++    SCTAB nTab1 = *itrBeg, nTab2 = *rOption.maTabs.rbegin();
+ 
+ 	if (bRecord && !pDoc->IsUndoEnabled())
+ 		bRecord = FALSE;
+ 
+-	ScEditableTester aTester( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow );
+-	if (!aTester.IsEditable())
+-	{
+-		if (!bApi)
+-			rDocShell.ErrorMessage(aTester.GetMessageId());
+-		return FALSE;
+-	}
++    for (set<SCTAB>::const_iterator itr = itrBeg; itr != itrEnd; ++itr)
++    {
++        ScEditableTester aTester( pDoc, *itr, nStartCol, nStartRow, nEndCol, nEndRow );
++        if (!aTester.IsEditable())
++        {
++            if (!bApi)
++                rDocShell.ErrorMessage(aTester.GetMessageId());
++            return FALSE;
++        }
+ 
+-	if ( nStartCol == nEndCol && nStartRow == nEndRow )
+-	{
+-		// nichts zu tun
+-		return TRUE;
+-	}
++        if ( pDoc->HasAttrib( nStartCol, nStartRow, *itr, nEndCol, nEndRow, *itr,
++                                HASATTR_MERGED | HASATTR_OVERLAPPED ) )
++        {
++            // "Zusammenfassen nicht verschachteln !"
++            if (!bApi)
++                rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0);
++            return FALSE;
++        }
++    }
+ 
+-	if ( pDoc->HasAttrib( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab,
+-							HASATTR_MERGED | HASATTR_OVERLAPPED ) )
+-	{
+-		// "Zusammenfassen nicht verschachteln !"
+-		if (!bApi)
+-			rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0);
+-		return FALSE;
+-	}
++    ScDocument* pUndoDoc = NULL;
++    bool bNeedContentsUndo = false;
++    for (set<SCTAB>::const_iterator itr = itrBeg; itr != itrEnd; ++itr)
++    {
++        SCTAB nTab = *itr;
++        bool bNeedContents = bContents &&
++                ( !pDoc->IsBlockEmpty( nTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) ||
++                  !pDoc->IsBlockEmpty( nTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) );
++    
++        if (bRecord)
++        {
++            // test if the range contains other notes which also implies that we need an undo document
++            bool bHasNotes = false;
++            for( ScAddress aPos( nStartCol, nStartRow, nTab ); !bHasNotes && (aPos.Col() <= nEndCol); aPos.IncCol() )
++                for( aPos.SetRow( nStartRow ); !bHasNotes && (aPos.Row() <= nEndRow); aPos.IncRow() )
++                    bHasNotes = ((aPos.Col() != nStartCol) || (aPos.Row() != nStartRow)) && (pDoc->GetNote( aPos ) != 0);
+ 
+-	BOOL bNeedContents = bContents &&
+-			( !pDoc->IsBlockEmpty( nTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) ||
+-			  !pDoc->IsBlockEmpty( nTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) );
++            if (bNeedContents || bHasNotes || rOption.mbCenter)
++            {
++                if (!pUndoDoc)
++                {
++                    pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
++                    pUndoDoc->InitUndo(pDoc, nTab1, nTab2);
++                }
++                // note captions are collected by drawing undo
++                pDoc->CopyToDocument( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab,
++                                      IDF_ALL|IDF_NOCAPTIONS, FALSE, pUndoDoc );
++            }
++            if( bHasNotes )
++                pDoc->BeginDrawUndo();
++        }
+ 
+-    ScDocument* pUndoDoc = 0;
+-	if (bRecord)
+-	{
+-        // test if the range contains other notes which also implies that we need an undo document
+-        bool bHasNotes = false;
+-        for( ScAddress aPos( nStartCol, nStartRow, nTab ); !bHasNotes && (aPos.Col() <= nEndCol); aPos.IncCol() )
+-            for( aPos.SetRow( nStartRow ); !bHasNotes && (aPos.Row() <= nEndRow); aPos.IncRow() )
+-                bHasNotes = ((aPos.Col() != nStartCol) || (aPos.Row() != nStartRow)) && (pDoc->GetNote( aPos ) != 0);
++        if (bNeedContents)
++            pDoc->DoMergeContents( nTab, nStartCol,nStartRow, nEndCol,nEndRow );
++        pDoc->DoMerge( nTab, nStartCol,nStartRow, nEndCol,nEndRow );
++	
++        if (rOption.mbCenter)
++        {
++            pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) );
++            pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER, ATTR_VER_JUSTIFY ) );
++        }
+ 
+-		if (bNeedContents || bHasNotes)
+-		{
+-			pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
+-			pUndoDoc->InitUndo( pDoc, nTab, nTab );
+-            // note captions are collected by drawing undo
+-			pDoc->CopyToDocument( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab,
+-                                    IDF_ALL|IDF_NOCAPTIONS, FALSE, pUndoDoc );
+-		}
+-        if( bHasNotes )
+-            pDoc->BeginDrawUndo();
+-	}
++        if ( !AdjustRowHeight( ScRange( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab ) ) )
++            rDocShell.PostPaint( nStartCol, nStartRow, nTab,
++                                 nEndCol, nEndRow, nTab, PAINT_GRID );
++        if (bNeedContents || rOption.mbCenter)
++        {    
++            ScRange aRange(nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab);
++            pDoc->SetDirty(aRange);
++        }
+ 
+-	if (bNeedContents)
+-		pDoc->DoMergeContents( nTab, nStartCol,nStartRow, nEndCol,nEndRow );
+-	pDoc->DoMerge( nTab, nStartCol,nStartRow, nEndCol,nEndRow );
++        bNeedContentsUndo |= bNeedContents;
++    }
+ 
+-    if( bRecord )
++    if (pUndoDoc)
+     {
+-        SdrUndoGroup* pDrawUndo = pDoc->GetDrawLayer() ? pDoc->GetDrawLayer()->GetCalcUndo() : 0;
++        SdrUndoGroup* pDrawUndo = pDoc->GetDrawLayer() ? pDoc->GetDrawLayer()->GetCalcUndo() : NULL;
+         rDocShell.GetUndoManager()->AddUndoAction(
+-            new ScUndoMerge( &rDocShell,
+-                            nStartCol, nStartRow, nTab,
+-                            nEndCol, nEndRow, nTab, bNeedContents, pUndoDoc, pDrawUndo ) );
++            new ScUndoMerge(&rDocShell, rOption, bNeedContentsUndo, pUndoDoc, pDrawUndo) );
+     }
+ 
+-	if ( !AdjustRowHeight( ScRange( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab ) ) )
+-		rDocShell.PostPaint( nStartCol, nStartRow, nTab,
+-											nEndCol, nEndRow, nTab, PAINT_GRID );
+-	if (bNeedContents)
+-		pDoc->SetDirty( rRange );
+ 	aModificator.SetDocumentModified();
+ 
+ 	SfxBindings* pBindings = rDocShell.GetViewBindings();
+@@ -4069,49 +4095,81 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
+ 
+ BOOL ScDocFunc::UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi )
+ {
+-	ScDocShellModificator aModificator( rDocShell );
++    ScCellMergeOption aOption(rRange.aStart.Col(), rRange.aStart.Row(), rRange.aEnd.Col(), rRange.aEnd.Row());
++    SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
++    for (SCTAB i = nTab1; i <= nTab2; ++i)
++        aOption.maTabs.insert(i);
+ 
++    return UnmergeCells(aOption, bRecord, bApi);
++}
++
++bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BOOL bApi )
++{
++    using ::std::set;
++
++    if (rOption.maTabs.empty())
++        // Nothing to unmerge.
++        return true;
++
++	ScDocShellModificator aModificator( rDocShell );
+ 	ScDocument* pDoc = rDocShell.GetDocument();
+-	SCTAB nTab = rRange.aStart.Tab();
+ 
+ 	if (bRecord && !pDoc->IsUndoEnabled())
+ 		bRecord = FALSE;
+ 
+-	if ( pDoc->HasAttrib( rRange, HASATTR_MERGED ) )
+-	{
+-		ScRange aExtended = rRange;
+-		pDoc->ExtendMerge( aExtended );
+-		ScRange aRefresh = aExtended;
+-		pDoc->ExtendOverlapped( aRefresh );
++    ScDocument* pUndoDoc = NULL;
++    bool bBeep = false;
++    for (set<SCTAB>::const_iterator itr = rOption.maTabs.begin(), itrEnd = rOption.maTabs.end();
++          itr != itrEnd; ++itr)
++    {
++        SCTAB nTab = *itr;
++        ScRange aRange = rOption.getSingleRange(nTab);
++        if ( !pDoc->HasAttrib(aRange, HASATTR_MERGED) )
++        {
++            bBeep = true;
++            continue;
++        }
+ 
+-		if (bRecord)
+-		{
+-			ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
+-			pUndoDoc->InitUndo( pDoc, nTab, nTab );
+-			pDoc->CopyToDocument( aExtended, IDF_ATTRIB, FALSE, pUndoDoc );
+-			rDocShell.GetUndoManager()->AddUndoAction(
+-				new ScUndoRemoveMerge( &rDocShell, rRange, pUndoDoc ) );
+-		}
++        ScRange aExtended = aRange;
++        pDoc->ExtendMerge(aExtended);
++        ScRange aRefresh = aExtended;
++        pDoc->ExtendOverlapped(aRefresh);
+ 
+-		const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE );
+-		ScPatternAttr aPattern( pDoc->GetPool() );
+-		aPattern.GetItemSet().Put( rDefAttr );
+-		pDoc->ApplyPatternAreaTab( rRange.aStart.Col(), rRange.aStart.Row(),
+-									rRange.aEnd.Col(), rRange.aEnd.Row(), nTab,
+-									aPattern );
++        if (bRecord)
++        {
++            if (!pUndoDoc)
++            {
++                pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
++                pUndoDoc->InitUndo(pDoc, *rOption.maTabs.begin(), *rOption.maTabs.rbegin());
++            }
++            pDoc->CopyToDocument(aExtended, IDF_ATTRIB, FALSE, pUndoDoc);
++        }
+ 
+-		pDoc->RemoveFlagsTab( aExtended.aStart.Col(), aExtended.aStart.Row(),
+-								aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab,
+-								SC_MF_HOR | SC_MF_VER );
++        const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE );
++        ScPatternAttr aPattern( pDoc->GetPool() );
++        aPattern.GetItemSet().Put( rDefAttr );
++        pDoc->ApplyPatternAreaTab( aRange.aStart.Col(), aRange.aStart.Row(),
++                                   aRange.aEnd.Col(), aRange.aEnd.Row(), nTab,
++                                   aPattern );
+ 
+-		pDoc->ExtendMerge( aRefresh, TRUE, FALSE );
++        pDoc->RemoveFlagsTab( aExtended.aStart.Col(), aExtended.aStart.Row(),
++                              aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab,
++                              SC_MF_HOR | SC_MF_VER );
+ 
+-		if ( !AdjustRowHeight( aExtended ) )
+-			rDocShell.PostPaint( aExtended, PAINT_GRID );
+-		aModificator.SetDocumentModified();
+-	}
+-	else if (!bApi)
+-		Sound::Beep();		//! FALSE zurueck???
++        pDoc->ExtendMerge( aRefresh, TRUE, FALSE );
++
++        if ( !AdjustRowHeight( aExtended ) )
++            rDocShell.PostPaint( aExtended, PAINT_GRID );
++    }
++    if (bBeep && !bApi)
++        Sound::Beep();
++
++    if (bRecord)
++    {
++        rDocShell.GetUndoManager()->AddUndoAction(
++            new ScUndoRemoveMerge( &rDocShell, rOption, pUndoDoc ) );
++    }
++    aModificator.SetDocumentModified();
+ 
+ 	return TRUE;
+ }
+diff --git sc/source/ui/inc/cellmergeoption.hxx sc/source/ui/inc/cellmergeoption.hxx
+new file mode 100644
+index 0000000..2e2dff2
+--- /dev/null
++++ sc/source/ui/inc/cellmergeoption.hxx
+@@ -0,0 +1,60 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: docfunc.hxx,v $
++ * $Revision: 1.18.30.2 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_CELLMERGEOPTION_HXX
++#define SC_CELLMERGEOPTION_HXX
++
++#include "address.hxx"
++
++#include <set>
++
++class ScRange;
++
++struct ScCellMergeOption
++{
++    ::std::set<SCTAB> maTabs;
++    SCCOL mnStartCol;
++    SCROW mnStartRow;
++    SCCOL mnEndCol;
++    SCROW mnEndRow;
++    bool mbCenter;
++
++    explicit ScCellMergeOption();
++    explicit ScCellMergeOption(SCCOL nStartCol, SCROW nStartRow, 
++                               SCCOL nEndCol, SCROW nEndRow, 
++                               bool bCenter = false);
++    explicit ScCellMergeOption(const ScCellMergeOption& r);
++
++    ScRange getSingleRange(SCTAB nTab) const;
++    ScRange getFirstSingleRange() const;
++};
++
++
++#endif
+diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx
+index 8490bab..9976230 100644
+--- sc/source/ui/inc/docfunc.hxx
++++ sc/source/ui/inc/docfunc.hxx
+@@ -49,6 +49,7 @@ class ScBaseCell;
+ class ScTokenArray;
+ struct ScTabOpParam;
+ class ScTableProtection;
++struct ScCellMergeOption;
+ 
+ // ---------------------------------------------------------------------------
+ 
+@@ -172,9 +173,10 @@ public:
+ 
+ 	BOOL			ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, BOOL bApi );
+ 
+-	BOOL			MergeCells( const ScRange& rRange, BOOL bContents,
++	BOOL			MergeCells( const ScCellMergeOption& rOption, BOOL bContents,
+ 								BOOL bRecord, BOOL bApi );
+-	BOOL			UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi );
++ 	BOOL			UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi );
++	bool			UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BOOL bApi );
+ 
+     BOOL            SetNewRangeNames( ScRangeName* pNewRanges, BOOL bApi );     // takes ownership of pNewRanges
+ 	BOOL			ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi );
+diff --git sc/source/ui/inc/undoblk.hxx sc/source/ui/inc/undoblk.hxx
+index 31932fd..2320502 100644
+--- sc/source/ui/inc/undoblk.hxx
++++ sc/source/ui/inc/undoblk.hxx
+@@ -34,6 +34,7 @@
+ #include "markdata.hxx"
+ #include "viewutil.hxx"
+ #include "spellparam.hxx"
++#include "cellmergeoption.hxx"
+ 
+ #include "cell.hxx"
+ 
+@@ -454,10 +455,8 @@ class ScUndoMerge: public ScSimpleUndo
+ {
+ public:
+ 					TYPEINFO();
+-					ScUndoMerge( ScDocShell* pNewDocShell,
+-								 SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
+-								 SCCOL nEndX,   SCROW nEndY,   SCTAB nEndZ,
+-                                 bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo );
++                    ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption,
++                                 bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo);
+ 	virtual 		~ScUndoMerge();
+ 
+ 	virtual void	Undo();
+@@ -468,7 +467,7 @@ public:
+ 	virtual String	GetComment() const;
+ 
+ private:
+-    ScRange         maRange;
++    ScCellMergeOption maOption;
+     bool            mbMergeContents;        // Merge contents in Redo().
+     ScDocument*		mpUndoDoc;              // wenn Daten zusammengefasst
+     SdrUndoAction*  mpDrawUndo;
+@@ -920,7 +919,7 @@ class ScUndoRemoveMerge: public ScBlockUndo
+ public:
+ 					TYPEINFO();
+ 					ScUndoRemoveMerge( ScDocShell* pNewDocShell,
+-									   const ScRange& rArea,
++									   const ScCellMergeOption& rOption,
+ 									   ScDocument* pNewUndoDoc );
+ 	virtual 		~ScUndoRemoveMerge();
+ 
+@@ -932,6 +931,9 @@ public:
+ 	virtual String	GetComment() const;
+ 
+ private:
++    void            SetCurTab();
++
++    ScCellMergeOption maOption;
+ 	ScDocument*		pUndoDoc;
+ };
+ 
+diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
+index 1f5102e..051a705 100644
+--- sc/source/ui/inc/viewfunc.hxx
++++ sc/source/ui/inc/viewfunc.hxx
+@@ -242,7 +242,7 @@ public:
+ 	BOOL			TestMergeCells();
+ 	BOOL			TestRemoveMerge();
+ 
+-	BOOL			MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE );
++	BOOL			MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE, BOOL bCenter = FALSE );
+ 	BOOL			RemoveMerge( BOOL bRecord = TRUE );
+ 
+ 	void			FillSimple( FillDir eDir, BOOL bRecord = TRUE );
+diff --git sc/source/ui/undo/undoblk.cxx sc/source/ui/undo/undoblk.cxx
+index 5b3e219..fe2c7bc 100644
+--- sc/source/ui/undo/undoblk.cxx
++++ sc/source/ui/undo/undoblk.cxx
+@@ -66,6 +66,7 @@
+ #include "undoolk.hxx"
+ #include "sc.hrc"
+ 
++#include <set>
+ 
+ // STATIC DATA -----------------------------------------------------------
+ 
+@@ -2066,8 +2067,9 @@ BOOL __EXPORT ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const
+ //
+ 
+ ScUndoRemoveMerge::ScUndoRemoveMerge( ScDocShell* pNewDocShell,
+-									   const ScRange& rArea, ScDocument* pNewUndoDoc ) :
+-	ScBlockUndo( pNewDocShell, rArea, SC_UNDO_SIMPLE ),
++                                      const ScCellMergeOption& rOption, ScDocument* pNewUndoDoc ) :
++	ScBlockUndo( pNewDocShell, rOption.getFirstSingleRange(), SC_UNDO_SIMPLE ),
++    maOption(rOption),
+ 	pUndoDoc( pNewUndoDoc )
+ {
+ }
+@@ -2084,66 +2086,78 @@ String __EXPORT ScUndoRemoveMerge::GetComment() const
+ 
+ void __EXPORT ScUndoRemoveMerge::Undo()
+ {
+-	BeginUndo();
+-
+-	ScDocument* pDoc = pDocShell->GetDocument();
++    using ::std::set;
+ 
+-	ScRange aExtended = aBlockRange;
+-	pUndoDoc->ExtendMerge( aExtended );
++    SetCurTab();
++    BeginUndo();
+ 
+-	pDoc->DeleteAreaTab( aExtended, IDF_ATTRIB );
+-	pUndoDoc->CopyToDocument( aExtended, IDF_ATTRIB, FALSE, pDoc );
++    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+ 
+-	BOOL bDidPaint = FALSE;
+-	ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+-	if ( pViewShell )
+-	{
+-		pViewShell->SetTabNo( aExtended.aStart.Tab() );
+-		bDidPaint = pViewShell->AdjustRowHeight( aExtended.aStart.Row(), aExtended.aEnd.Row() );
+-	}
+-	if (!bDidPaint)
+-		ScUndoUtil::PaintMore( pDocShell, aExtended );
++	ScDocument* pDoc = pDocShell->GetDocument();
++    for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end();
++          itr != itrEnd; ++itr)
++    {
++        // There is no need to extend merge area because it's already been extended.
++        ScRange aRange = maOption.getSingleRange(*itr);    
++        pDoc->DeleteAreaTab(aRange, IDF_ATTRIB);
++        pUndoDoc->CopyToDocument(aRange, IDF_ATTRIB, FALSE, pDoc);
++    
++        bool bDidPaint = false;
++        if ( pViewShell )
++        {
++            pViewShell->SetTabNo(*itr);
++            bDidPaint = pViewShell->AdjustRowHeight(maOption.mnStartRow, maOption.mnEndRow);
++        }
++        if (!bDidPaint)
++            ScUndoUtil::PaintMore(pDocShell, aRange);
++    }
+ 
+ 	EndUndo();
+ }
+ 
+ void __EXPORT ScUndoRemoveMerge::Redo()
+ {
++    using ::std::set;
++
++    SetCurTab();
+ 	BeginRedo();
+ 
+-	SCTAB nTab = aBlockRange.aStart.Tab();
+ 	ScDocument* pDoc = pDocShell->GetDocument();
+-	ScRange aExtended = aBlockRange;
+-	pDoc->ExtendMerge( aExtended );
+-	ScRange aRefresh = aExtended;
+-	pDoc->ExtendOverlapped( aRefresh );
+-
+-	//	ausfuehren
+-
+-	const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE );
+-	ScPatternAttr aPattern( pDoc->GetPool() );
+-	aPattern.GetItemSet().Put( rDefAttr );
+-	pDoc->ApplyPatternAreaTab( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
+-								aBlockRange.aEnd.Col(), aBlockRange.aEnd.Row(), nTab,
+-								aPattern );
+-
+-	pDoc->RemoveFlagsTab( aExtended.aStart.Col(), aExtended.aStart.Row(),
+-							aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab,
+-							SC_MF_HOR | SC_MF_VER );
+-
+-	pDoc->ExtendMerge( aRefresh, TRUE, FALSE );
+-
+-	//	Paint
++    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+ 
+-	BOOL bDidPaint = FALSE;
+-	ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+-	if ( pViewShell )
+-	{
+-		pViewShell->SetTabNo( aExtended.aStart.Tab() );
+-		bDidPaint = pViewShell->AdjustRowHeight( aExtended.aStart.Row(), aExtended.aEnd.Row() );
+-	}
+-	if (!bDidPaint)
+-		ScUndoUtil::PaintMore( pDocShell, aExtended );
++    for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end();
++          itr != itrEnd; ++itr)
++    {
++        SCTAB nTab = *itr;
++        // There is no need to extend merge area because it's already been extended.
++        ScRange aRange = maOption.getSingleRange(nTab);
++    
++        //	ausfuehren
++    
++        const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE );
++        ScPatternAttr aPattern( pDoc->GetPool() );
++        aPattern.GetItemSet().Put( rDefAttr );
++        pDoc->ApplyPatternAreaTab( maOption.mnStartCol, maOption.mnStartRow,
++                                   maOption.mnEndCol, maOption.mnEndRow, nTab,
++                                   aPattern );
++    
++        pDoc->RemoveFlagsTab( maOption.mnStartCol, maOption.mnStartRow,
++                              maOption.mnEndCol, maOption.mnEndRow, nTab,
++                              SC_MF_HOR | SC_MF_VER );
++    
++        pDoc->ExtendMerge(aRange, TRUE, FALSE);
++
++        //	Paint
++
++        BOOL bDidPaint = FALSE;
++        if ( pViewShell )
++        {
++            pViewShell->SetTabNo(nTab);
++            bDidPaint = pViewShell->AdjustRowHeight(maOption.mnStartRow, maOption.mnEndRow);
++        }
++        if (!bDidPaint)
++            ScUndoUtil::PaintMore(pDocShell, aRange);
++    }
+ 
+ 	EndRedo();
+ }
+@@ -2159,6 +2173,13 @@ BOOL __EXPORT ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const
+ 	return (rTarget.ISA(ScTabViewTarget));
+ }
+ 
++void ScUndoRemoveMerge::SetCurTab()
++{
++    SCTAB nCurTab = pDocShell->GetCurTab();
++    aBlockRange.aStart.SetTab(nCurTab);
++    aBlockRange.aEnd.SetTab(nCurTab);
++}
++
+ // -----------------------------------------------------------------------
+ //
+ //		nur Umrandung setzen, per ScRangeList (StarOne)
+diff --git sc/source/ui/undo/undoblk3.cxx sc/source/ui/undo/undoblk3.cxx
+index 5521813..f3f006c 100644
+--- sc/source/ui/undo/undoblk3.cxx
++++ sc/source/ui/undo/undoblk3.cxx
+@@ -34,6 +34,7 @@
+ // INCLUDE -------------------------------------------------------------------
+ 
+ #include "scitems.hxx"
++#include <svx/algitem.hxx>
+ #include <svx/boxitem.hxx>
+ #include <svx/srchitem.hxx>
+ #include <svx/linkmgr.hxx>
+@@ -814,14 +815,12 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
+ 
+ //----------------------------------------------------------------------------
+ 
+-ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell,
+-							SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
+-							SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
+-                            bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo )
++ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption,
++                          bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo )
+ 		//
+ 	:	ScSimpleUndo( pNewDocShell ),
+ 		//
+-		maRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
++        maOption(rOption),
+         mbMergeContents( bMergeContents ),
+         mpUndoDoc( pUndoDoc ),
+         mpDrawUndo( pDrawUndo )
+@@ -850,51 +849,77 @@ String ScUndoMerge::GetComment() const
+ 
+ void ScUndoMerge::DoChange( bool bUndo ) const
+ {
+-	ScDocument* pDoc = pDocShell->GetDocument();
++    using ::std::set;
+ 
+-	ScUndoUtil::MarkSimpleBlock( pDocShell, maRange );
++    if (maOption.maTabs.empty())
++        // Nothing to do.
++        return;
+ 
+-	if (bUndo)
+-        // remove merge (contents are copied back below from undo document)
+-		pDoc->RemoveMerge( maRange.aStart.Col(), maRange.aStart.Row(), maRange.aStart.Tab() );
+-	else
+-        // repeat merge, but do not remove note captions (will be done by drawing redo below)
+-/*!*/	pDoc->DoMerge( maRange.aStart.Tab(),
+-					   maRange.aStart.Col(), maRange.aStart.Row(),
+-                       maRange.aEnd.Col(),   maRange.aEnd.Row(), false );
++    ScDocument* pDoc = pDocShell->GetDocument();
++    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+ 
+-    // undo -> copy back deleted contents
+-	if (bUndo && mpUndoDoc)
+-    {
+-        pDoc->DeleteAreaTab( maRange, IDF_CONTENTS|IDF_NOCAPTIONS );
+-        mpUndoDoc->CopyToDocument( maRange, IDF_ALL|IDF_NOCAPTIONS, FALSE, pDoc );
+-    }
++    ScRange aCurRange = maOption.getSingleRange(pDocShell->GetCurTab());                          
++    ScUndoUtil::MarkSimpleBlock(pDocShell, aCurRange);                                            
++                                                                                                  
++    for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end();
++          itr != itrEnd; ++itr)                                                                   
++    {                                                                                             
++        SCTAB nTab = *itr;                                                                        
++        ScRange aRange = maOption.getSingleRange(nTab);                                           
+ 
+-    // redo -> merge contents again
+-    else if (!bUndo && mbMergeContents)
+-    {
+-/*!*/   pDoc->DoMergeContents( maRange.aStart.Tab(),
+-							   maRange.aStart.Col(), maRange.aStart.Row(),
+-							   maRange.aEnd.Col(),   maRange.aEnd.Row()   );
++        if (bUndo)
++            // remove merge (contents are copied back below from undo document)
++            pDoc->RemoveMerge( aRange.aStart.Col(), aRange.aStart.Row(), aRange.aStart.Tab() );
++        else
++        {    
++            // repeat merge, but do not remove note captions (will be done by drawing redo below)
++            pDoc->DoMerge( aRange.aStart.Tab(),
++                           aRange.aStart.Col(), aRange.aStart.Row(),
++                           aRange.aEnd.Col(),   aRange.aEnd.Row(), false );
++    
++            if (maOption.mbCenter)
++            {
++                pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
++                                 aRange.aStart.Tab(),
++                                 SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) );
++                pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
++                                 aRange.aStart.Tab(),
++                                 SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER, ATTR_VER_JUSTIFY ) );
++            }
++        }
++    
++        // undo -> copy back deleted contents
++        if (bUndo && mpUndoDoc)
++        {
++            pDoc->DeleteAreaTab( aRange, IDF_CONTENTS|IDF_NOCAPTIONS );
++            mpUndoDoc->CopyToDocument( aRange, IDF_ALL|IDF_NOCAPTIONS, FALSE, pDoc );
++        }
++    
++        // redo -> merge contents again
++        else if (!bUndo && mbMergeContents)
++        {
++            pDoc->DoMergeContents( aRange.aStart.Tab(),
++                                   aRange.aStart.Col(), aRange.aStart.Row(),
++                                   aRange.aEnd.Col(), aRange.aEnd.Row() );
++        }
++    
++        if (bUndo)
++            DoSdrUndoAction( mpDrawUndo, pDoc );
++        else
++            RedoSdrUndoAction( mpDrawUndo );
++    
++        bool bDidPaint = false;
++        if ( pViewShell )
++        {
++            pViewShell->SetTabNo(nTab);
++            bDidPaint = pViewShell->AdjustRowHeight(maOption.mnStartRow, maOption.mnEndRow);
++        }
++    
++        if (!bDidPaint)
++            ScUndoUtil::PaintMore(pDocShell, aRange);
+     }
+ 
+-    if (bUndo)
+-        DoSdrUndoAction( mpDrawUndo, pDoc );
+-    else
+-        RedoSdrUndoAction( mpDrawUndo );
+-
+-	BOOL bDidPaint = FALSE;
+-	ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+-	if ( pViewShell )
+-	{
+-		pViewShell->SetTabNo( maRange.aStart.Tab() );
+-		bDidPaint = pViewShell->AdjustRowHeight( maRange.aStart.Row(), maRange.aEnd.Row() );
+-	}
+-
+-	if (!bDidPaint)
+-		ScUndoUtil::PaintMore( pDocShell, maRange );
+-
+-	ShowTable( maRange );
++	ShowTable(aCurRange);
+ }
+ 
+ 
+diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx
+index c2eb810..d4cfb42 100644
+--- sc/source/ui/unoobj/cellsuno.cxx
++++ sc/source/ui/unoobj/cellsuno.cxx
+@@ -71,6 +71,7 @@
+ #include <com/sun/star/text/WritingMode2.hpp>
+ 
+ #include "autoform.hxx"
++#include "cellmergeoption.hxx"
+ #include "cellsuno.hxx"
+ #include "cursuno.hxx"
+ #include "textuno.hxx"
+@@ -5404,10 +5405,14 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti
+ 	if ( pDocSh )
+ 	{
+ 		ScDocFunc aFunc(*pDocSh);
++        ScCellMergeOption aMergeOption(
++            aRange.aStart.Col(), aRange.aStart.Row(), 
++            aRange.aEnd.Col(), aRange.aEnd.Row(), false);
++        aMergeOption.maTabs.insert(aRange.aStart.Tab());
+ 		if ( bMerge )
+-			aFunc.MergeCells( aRange, FALSE, TRUE, TRUE );
++			aFunc.MergeCells( aMergeOption, FALSE, TRUE, TRUE );
+ 		else
+-			aFunc.UnmergeCells( aRange, TRUE, TRUE );
++			aFunc.UnmergeCells( aMergeOption, TRUE, TRUE );
+ 
+ 		//!	Fehler abfangen?
+ 	}
+diff --git sc/source/ui/view/cellmergeoption.cxx sc/source/ui/view/cellmergeoption.cxx
+new file mode 100644
+index 0000000..ed6b8cb
+--- /dev/null
++++ sc/source/ui/view/cellmergeoption.cxx
+@@ -0,0 +1,74 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: docfunc.hxx,v $
++ * $Revision: 1.18.30.2 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#include "cellmergeoption.hxx"
++#include "address.hxx"
++
++ScCellMergeOption::ScCellMergeOption() :
++    mnStartCol(0),
++    mnStartRow(0),
++    mnEndCol(0),
++    mnEndRow(0),
++    mbCenter(false)
++{
++}
++
++ScCellMergeOption::ScCellMergeOption(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bCenter) :
++    mnStartCol(nStartCol),
++    mnStartRow(nStartRow),
++    mnEndCol(nEndCol),
++    mnEndRow(nEndRow),
++    mbCenter(bCenter)
++{
++}
++
++ScCellMergeOption::ScCellMergeOption(const ScCellMergeOption& r) :
++    maTabs(r.maTabs),
++    mnStartCol(r.mnStartCol),
++    mnStartRow(r.mnStartRow),
++    mnEndCol(r.mnEndCol),
++    mnEndRow(r.mnEndRow),
++    mbCenter(r.mbCenter)
++{
++}
++
++ScRange ScCellMergeOption::getSingleRange(SCTAB nTab) const
++{
++    return ScRange(mnStartCol, mnStartRow, nTab, mnEndCol, mnEndRow, nTab);
++}
++
++ScRange ScCellMergeOption::getFirstSingleRange() const
++{
++    SCTAB nTab = 0;
++    if (!maTabs.empty())
++        nTab = *maTabs.begin();
++
++    return getSingleRange(nTab);
++}
+diff --git sc/source/ui/view/cellsh3.cxx sc/source/ui/view/cellsh3.cxx
+index 57309e3..c689fa1 100644
+--- sc/source/ui/view/cellsh3.cxx
++++ sc/source/ui/view/cellsh3.cxx
+@@ -772,6 +772,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
+             {
+                 // test whether to merge or to split
+                 bool bMerge = false;
++                BOOL bCenter = FALSE;
+                 switch( nSlot )
+                 {
+                     case FID_MERGE_ON:
+@@ -782,6 +783,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
+                     break;
+                     case FID_MERGE_TOGGLE:
+                     {
++                        bCenter = TRUE;
+                         SfxPoolItem* pItem = 0;
+                         if( rBindings.QueryState( nSlot, pItem ) >= SFX_ITEM_DEFAULT )
+                             bMerge = !static_cast< SfxBoolItem* >( pItem )->GetValue();
+@@ -802,7 +804,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
+                         bMoveContents = ((const SfxBoolItem*)pItem)->GetValue();
+                     }
+ 
+-                    if (pTabViewShell->MergeCells( bApi, bMoveContents ))
++                    if (pTabViewShell->MergeCells( bApi, bMoveContents, TRUE, bCenter ))
+                     {
+                         if (!bApi && bMoveContents)             // "ja" im Dialog geklickt
+                             rReq.AppendItem( SfxBoolItem( nSlot, bMoveContents ) );
+diff --git sc/source/ui/view/makefile.mk sc/source/ui/view/makefile.mk
+index 48395f3..46b8122 100644
+--- sc/source/ui/view/makefile.mk
++++ sc/source/ui/view/makefile.mk
+@@ -100,6 +100,7 @@ SLOFILES =  \
+         $(SLO)$/output3.obj \
+         $(SLO)$/gridmerg.obj \
+         $(SLO)$/invmerge.obj \
++        $(SLO)$/cellmergeoption.obj \
+         $(SLO)$/select.obj \
+         $(SLO)$/olinewin.obj \
+         $(SLO)$/hintwin.obj \
+diff --git sc/source/ui/view/viewfun2.cxx sc/source/ui/view/viewfun2.cxx
+index c563b9a..d6fd25d 100644
+--- sc/source/ui/view/viewfun2.cxx
++++ sc/source/ui/view/viewfun2.cxx
+@@ -70,6 +70,7 @@ using namespace com::sun::star;
+ #include "attrib.hxx"
+ #include "autoform.hxx"
+ #include "cell.hxx"					// EnterAutoSum
++#include "cellmergeoption.hxx"
+ #include "compiler.hxx"
+ #include "docfunc.hxx"
+ #include "docpool.hxx"
+@@ -1087,7 +1088,7 @@ BOOL ScViewFunc::TestMergeCells()			// Vorab-Test (fuer Menue)
+ 
+ //----------------------------------------------------------------------------
+ 
+-BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
++BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord, BOOL bCenter )
+ {
+ 	//	Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc),
+ 	//	damit dann nicht die Inhalte-QueryBox kommt
+@@ -1130,10 +1131,26 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
+ 		return FALSE;
+ 	}
+ 
++    // Check for the contents of all selected tables.
++    bool bAskDialog = false;
++    SCTAB nTabCount = pDoc->GetTableCount();
++    ScCellMergeOption aMergeOption(nStartCol, nStartRow, nEndCol, nEndRow, bCenter);
++    for (SCTAB i = 0; i < nTabCount; ++i)
++    {
++        if (!rMark.GetTableSelect(i))
++            // this table is not selected.
++            continue;
++
++        aMergeOption.maTabs.insert(i);
++
++        if (!pDoc->IsBlockEmpty(i, nStartCol, nStartRow+1, nStartCol, nEndRow) ||
++            !pDoc->IsBlockEmpty(i, nStartCol+1, nStartRow, nEndCol, nEndRow))
++            bAskDialog = true;
++    }
++
+ 	BOOL bOk = TRUE;
+ 
+-	if ( !pDoc->IsBlockEmpty( nStartTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) ||
+-		 !pDoc->IsBlockEmpty( nStartTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) )
++    if (bAskDialog)
+ 	{
+ 		if (!bApi)
+ 		{
+@@ -1153,7 +1170,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
+ 	if (bOk)
+ 	{
+ 		HideCursor();
+-		bOk = pDocSh->GetDocFunc().MergeCells( aMarkRange, rDoContents, bRecord, bApi );
++		bOk = pDocSh->GetDocFunc().MergeCells( aMergeOption, rDoContents, bRecord, bApi );
+ 		ShowCursor();
+ 
+ 		if (bOk)
+@@ -1189,6 +1206,32 @@ BOOL ScViewFunc::TestRemoveMerge()
+ 
+ //----------------------------------------------------------------------------
+ 
++static bool lcl_extendMergeRange(ScCellMergeOption& rOption, const ScRange& rRange)
++{
++    bool bExtended = false;
++    if (rOption.mnStartCol > rRange.aStart.Col())
++    {    
++        rOption.mnStartCol = rRange.aStart.Col();
++        bExtended = true;
++    }
++    if (rOption.mnStartRow > rRange.aStart.Row())
++    {    
++        rOption.mnStartRow = rRange.aStart.Row();
++        bExtended = true;
++    }
++    if (rOption.mnEndCol < rRange.aEnd.Col())
++    {    
++        rOption.mnEndCol = rRange.aEnd.Col();
++        bExtended = true;
++    }
++    if (rOption.mnEndRow < rRange.aEnd.Row())
++    {    
++        rOption.mnEndRow = rRange.aEnd.Row();
++        bExtended = true;
++    }
++    return bExtended;
++}
++
+ BOOL ScViewFunc::RemoveMerge( BOOL bRecord )
+ {
+ 	ScRange aRange;
+@@ -1200,12 +1243,39 @@ BOOL ScViewFunc::RemoveMerge( BOOL bRecord )
+     }
+ 	else if (GetViewData()->GetSimpleArea( aRange ) == SC_MARK_SIMPLE)
+ 	{
++        ScDocument* pDoc = GetViewData()->GetDocument();
+         ScRange aExtended( aRange );
+-        GetViewData()->GetDocument()->ExtendMerge( aExtended );
++        pDoc->ExtendMerge( aExtended );
+ 		ScDocShell* pDocSh = GetViewData()->GetDocShell();
++        const ScMarkData& rMark = GetViewData()->GetMarkData();
++        SCTAB nTabCount = pDoc->GetTableCount();
++        ScCellMergeOption aOption(aRange.aStart.Col(), aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row());
++        bool bExtended = false;
++        do
++        {
++            bExtended = false;
++            for (SCTAB i = 0; i < nTabCount; ++i)
++            {
++                if (!rMark.GetTableSelect(i))
++                    // This table is not selected.
++                    continue;
++    
++                aOption.maTabs.insert(i);
++                aExtended.aStart.SetTab(i);
++                aExtended.aEnd.SetTab(i);
++                pDoc->ExtendMerge(aExtended);
++                pDoc->ExtendOverlapped(aExtended);
++    
++                // Expand the current range to be inclusive of all merged
++                // areas on all sheets.
++                bExtended = lcl_extendMergeRange(aOption, aExtended);
++            }
++        }
++        while (bExtended);
+ 
+ 		HideCursor();
+-		BOOL bOk = pDocSh->GetDocFunc().UnmergeCells( aRange, bRecord, FALSE );
++		BOOL bOk = pDocSh->GetDocFunc().UnmergeCells(aOption, bRecord, FALSE );
++        aExtended = aOption.getFirstSingleRange();
+         MarkRange( aExtended );
+ 		ShowCursor();
+ 
+diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
+index 118fac7..322d448 100644
+--- sc/uiconfig/scalc/menubar/menubar.xml
++++ sc/uiconfig/scalc/menubar/menubar.xml
+@@ -218,7 +218,13 @@
+                     <menu:menuitem menu:id=".uno:SetTabBgColor"/>
+                 </menu:menupopup>
+             </menu:menu>
+-            <menu:menuitem menu:id=".uno:ToggleMergeCells"/>
++            <menu:menu menu:id=".uno:MergeCellsMenu">
++                <menu:menupopup>
++                    <menu:menuitem menu:id=".uno:ToggleMergeCells"/>
++                    <menu:menuitem menu:id=".uno:MergeCells"/>
++                    <menu:menuitem menu:id=".uno:SplitCell"/>
++                </menu:menupopup>
++            </menu:menu>
+             <menu:menuseparator/>
+             <menu:menuitem menu:id=".uno:PageFormatDialog"/>
+             <menu:menu menu:id=".uno:PrintRangesMenu">
diff --git a/applied_patches/0442-calc-enhanced-merge-cells-officecfg.diff b/applied_patches/0163-calc-enhanced-merge-cells-officecfg.diff
similarity index 100%
rename from applied_patches/0442-calc-enhanced-merge-cells-officecfg.diff
rename to applied_patches/0163-calc-enhanced-merge-cells-officecfg.diff
diff --git a/applied_patches/0443-calc-filter-dbf-precision.diff b/applied_patches/0164-calc-filter-dbf-precision.diff
similarity index 100%
rename from applied_patches/0443-calc-filter-dbf-precision.diff
rename to applied_patches/0164-calc-filter-dbf-precision.diff
diff --git a/applied_patches/0444-calc-autoinput-case-insensitive-matching.diff b/applied_patches/0165-calc-autoinput-case-insensitive-matching.diff
similarity index 100%
rename from applied_patches/0444-calc-autoinput-case-insensitive-matching.diff
rename to applied_patches/0165-calc-autoinput-case-insensitive-matching.diff
diff --git a/applied_patches/0450-calc-jump-on-formula-ref-offapi.diff b/applied_patches/0166-calc-jump-on-formula-ref-offapi.diff
similarity index 100%
rename from applied_patches/0450-calc-jump-on-formula-ref-offapi.diff
rename to applied_patches/0166-calc-jump-on-formula-ref-offapi.diff
diff --git a/applied_patches/0451-calc-jump-on-formula-ref-officecfg.diff b/applied_patches/0167-calc-jump-on-formula-ref-officecfg.diff
similarity index 100%
rename from applied_patches/0451-calc-jump-on-formula-ref-officecfg.diff
rename to applied_patches/0167-calc-jump-on-formula-ref-officecfg.diff
diff --git a/applied_patches/0168-calc-jump-on-formula-ref-sc.diff b/applied_patches/0168-calc-jump-on-formula-ref-sc.diff
new file mode 100644
index 000000000..ce24a0a92
--- /dev/null
+++ b/applied_patches/0168-calc-jump-on-formula-ref-sc.diff
@@ -0,0 +1,616 @@
+diff --git sc/inc/cell.hxx sc/inc/cell.hxx
+index 5ec1281..4c1afdb 100644
+--- sc/inc/cell.hxx
++++ sc/inc/cell.hxx
+@@ -662,6 +662,7 @@ private:
+ public:
+                 ScDetectiveRefIter( ScFormulaCell* pCell );
+     BOOL		GetNextRef( ScRange& rRange );
++    ScToken*    GetNextRefToken();
+ };
+ 
+ // ============================================================================
+diff --git sc/inc/detfunc.hxx sc/inc/detfunc.hxx
+index 49a7938..c38150d 100644
+--- sc/inc/detfunc.hxx
++++ sc/inc/detfunc.hxx
+@@ -35,6 +35,9 @@
+ #include <tools/gen.hxx>
+ #include <tools/color.hxx>
+ #include "scdllapi.h"
++#include "token.hxx"
++
++#include <vector>
+ 
+ class SdrObject;
+ class SdrPage;
+@@ -46,6 +49,7 @@ class ScDetectiveData;
+ class ScDocument;
+ class ScAddress;
+ class ScRange;
++class ScRangeList;
+ 
+ #define SC_DET_MAXCIRCLE	1000
+ 
+@@ -146,6 +150,9 @@ public:
+ 
+     BOOL		MarkInvalid(BOOL& rOverflow);
+ 
++    void        GetAllPreds(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ::std::vector<ScSharedTokenRef>& rRefTokens);
++    void        GetAllSuccs(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ::std::vector<ScSharedTokenRef>& rRefTokens);
++
+     static void UpdateAllComments( ScDocument& rDoc );        // on all tables
+     void		UpdateAllArrowColors();		// on all tables
+ 
+diff --git sc/inc/reftokenhelper.hxx sc/inc/reftokenhelper.hxx
+index d7b335f..44619ab 100644
+--- sc/inc/reftokenhelper.hxx
++++ sc/inc/reftokenhelper.hxx
+@@ -78,6 +78,9 @@ public:
+     static void join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
+ 
+     static bool getDoubleRefDataFromToken(ScComplexRefData& rData, const ScSharedTokenRef& pToken);
++
++    static ScSharedTokenRef createRefToken(const ScAddress& rAddr);
++    static ScSharedTokenRef createRefToken(const ScRange& rRange);
+ };
+ 
+ #endif
+diff --git sc/inc/sc.hrc sc/inc/sc.hrc
+index bd688c8..340416b 100644
+--- sc/inc/sc.hrc
++++ sc/inc/sc.hrc
+@@ -900,6 +900,9 @@
+ #define SID_DETECTIVE_REFRESH   (DETECTIVE_START+14)
+ #define SID_DETECTIVE_AUTO      (DETECTIVE_START+15)
+ 
++#define SID_DETECTIVE_MARK_PRED (DETECTIVE_START+16)
++#define SID_DETECTIVE_MARK_SUCC (DETECTIVE_START+17)
++
+ #define DETECTIVE_END			(DETECTIVE_START+20)
+ 
+ #define SID_API_SLOTS			(DETECTIVE_END)
+diff --git sc/sdi/cellsh.sdi sc/sdi/cellsh.sdi
+index 05ab23c..b22589b 100644
+--- sc/sdi/cellsh.sdi
++++ sc/sdi/cellsh.sdi
+@@ -113,6 +113,8 @@ interface CellSelection
+     SID_DETECTIVE_ADD_ERR	[ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
+     SID_DETECTIVE_INVALID	[ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
+     SID_DETECTIVE_REFRESH	[ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
++	SID_DETECTIVE_MARK_PRED	[ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
++	SID_DETECTIVE_MARK_SUCC	[ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
+     FID_INS_ROW				[ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
+     FID_INS_COLUMN			[ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
+     FID_INS_CELLSDOWN		[ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
+diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
+index 66c0a09..f8eddc2 100644
+--- sc/sdi/scalc.sdi
++++ sc/sdi/scalc.sdi
+@@ -7899,4 +7899,53 @@ SfxBoolItem ToggleSheetGrid FID_TAB_TOGGLE_GRID
+     GroupId = GID_FORMAT;
+ ]
+ 
++//--------------------------------------------------------------------------
++SfxVoidItem MarkPrecedents SID_DETECTIVE_MARK_PRED
++()
++[
++    /* flags: */
++    AutoUpdate = FALSE,
++    Cachable = Cachable,
++    FastCall = FALSE,
++    HasCoreId = FALSE,
++    HasDialog = FALSE,
++    ReadOnlyDoc = TRUE,
++    Toggle = FALSE,
++    Container = FALSE,
++    RecordAbsolute = FALSE,
++    RecordPerSet;
++    Synchron;
++    
++    /* config: */
++    AccelConfig = TRUE,
++    MenuConfig = TRUE,
++    StatusBarConfig = FALSE,
++    ToolBoxConfig = FALSE,
++    GroupId = GID_OPTIONS;
++]
++
++//--------------------------------------------------------------------------
++SfxVoidItem MarkDependents SID_DETECTIVE_MARK_SUCC
++()
++[
++    /* flags: */
++    AutoUpdate = FALSE,
++    Cachable = Cachable,
++    FastCall = FALSE,
++    HasCoreId = FALSE,
++    HasDialog = FALSE,
++    ReadOnlyDoc = TRUE,
++    Toggle = FALSE,
++    Container = FALSE,
++    RecordAbsolute = FALSE,
++    RecordPerSet;
++    Synchron;
++    
++    /* config: */
++    AccelConfig = TRUE,
++    MenuConfig = TRUE,
++    StatusBarConfig = FALSE,
++    ToolBoxConfig = FALSE,
++    GroupId = GID_OPTIONS;
++]
+ 
+diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx
+index 1c3035c..4d5773d 100644
+--- sc/source/core/data/cell.cxx
++++ sc/source/core/data/cell.cxx
+@@ -1954,7 +1954,7 @@ BOOL lcl_ScDetectiveRefIter_SkipRef( ScToken* p )
+     if ( rRef1.IsColDeleted() || rRef1.IsRowDeleted() || rRef1.IsTabDeleted()
+             || !rRef1.Valid() )
+         return TRUE;
+-    if ( p->GetType() == svDoubleRef )
++	if ( p->GetType() == svDoubleRef || p->GetType() == svExternalDoubleRef )
+     {
+         ScSingleRefData& rRef2 = p->GetDoubleRef().Ref2;
+         if ( rRef2.IsColDeleted() || rRef2.IsRowDeleted() || rRef2.IsTabDeleted()
+@@ -1967,7 +1967,20 @@ BOOL lcl_ScDetectiveRefIter_SkipRef( ScToken* p )
+ BOOL ScDetectiveRefIter::GetNextRef( ScRange& rRange )
+ {
+     BOOL bRet = FALSE;
++    ScToken* p = GetNextRefToken();
++    if( p )
++    {
++        SingleDoubleRefProvider aProv( *p );
++        rRange.aStart.Set( aProv.Ref1.nCol, aProv.Ref1.nRow, aProv.Ref1.nTab );
++        rRange.aEnd.Set( aProv.Ref2.nCol, aProv.Ref2.nRow, aProv.Ref2.nTab );
++        bRet = TRUE;
++    }
+ 
++    return bRet;
++}
++
++ScToken* ScDetectiveRefIter::GetNextRefToken()
++{
+     ScToken* p = static_cast<ScToken*>(pCode->GetNextReferenceRPN());
+     if (p)
+         p->CalcAbsIfRel( aPos );
+@@ -1978,16 +1991,7 @@ BOOL ScDetectiveRefIter::GetNextRef( ScRange& rRange )
+         if (p)
+             p->CalcAbsIfRel( aPos );
+     }
+-
+-    if( p )
+-    {
+-        SingleDoubleRefProvider aProv( *p );
+-        rRange.aStart.Set( aProv.Ref1.nCol, aProv.Ref1.nRow, aProv.Ref1.nTab );
+-        rRange.aEnd.Set( aProv.Ref2.nCol, aProv.Ref2.nRow, aProv.Ref2.nTab );
+-        bRet = TRUE;
+-    }
+-
+-    return bRet;
++    return p;
+ }
+ 
+ // ============================================================================
+diff --git sc/source/core/tool/detfunc.cxx sc/source/core/tool/detfunc.cxx
+index 7680bda..99e0e71 100644
+--- sc/source/core/tool/detfunc.cxx
++++ sc/source/core/tool/detfunc.cxx
+@@ -80,6 +80,12 @@
+ #include "attrib.hxx"
+ #include "scmod.hxx"
+ #include "postit.hxx"
++#include "rangelst.hxx"
++#include "reftokenhelper.hxx"
++
++#include <vector>
++
++using ::std::vector;
+ 
+ //------------------------------------------------------------------------
+ 
+@@ -1407,6 +1413,52 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow)
+     return ( bDeleted || nInsCount != 0 );
+ }
+ 
++void ScDetectiveFunc::GetAllPreds(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
++                                  vector<ScSharedTokenRef>& rRefTokens)
++{
++    ScCellIterator aCellIter(pDoc, nCol1, nRow1, nTab, nCol2, nRow2, nTab);
++    for (ScBaseCell* pCell = aCellIter.GetFirst(); pCell; pCell = aCellIter.GetNext())
++    {
++        if (pCell->GetCellType() != CELLTYPE_FORMULA)
++            continue;
++
++        ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
++        ScDetectiveRefIter aRefIter(pFCell);
++        for (ScToken* p = aRefIter.GetNextRefToken(); p; p = aRefIter.GetNextRefToken())
++        {
++            ScSharedTokenRef pRef(static_cast<ScToken*>(p->Clone()));
++            ScRefTokenHelper::join(rRefTokens, pRef);
++        }
++    }
++}
++
++void ScDetectiveFunc::GetAllSuccs(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, 
++                                  vector<ScSharedTokenRef>& rRefTokens)
++{
++    vector<ScSharedTokenRef> aSrcRange;
++    aSrcRange.push_back(
++        ScRefTokenHelper::createRefToken(ScRange(nCol1, nRow1, nTab, nCol2, nRow2, nTab)));
++
++    ScCellIterator aCellIter(pDoc, 0, 0, nTab, MAXCOL, MAXROW, nTab);
++    for (ScBaseCell* pCell = aCellIter.GetFirst(); pCell; pCell = aCellIter.GetNext())
++    {
++        if (pCell->GetCellType() != CELLTYPE_FORMULA)
++            continue;
++
++        ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
++        ScDetectiveRefIter aRefIter(pFCell);
++        for (ScToken* p = aRefIter.GetNextRefToken(); p; p = aRefIter.GetNextRefToken())
++        {
++            ScSharedTokenRef pRef(static_cast<ScToken*>(p->Clone()));
++            if (ScRefTokenHelper::intersects(aSrcRange, pRef))
++            {
++                pRef = ScRefTokenHelper::createRefToken(aCellIter.GetPos());
++                ScRefTokenHelper::join(rRefTokens, pRef);
++            }
++        }
++    }
++}
++
+ void ScDetectiveFunc::UpdateAllComments( ScDocument& rDoc )
+ {
+     //	for all caption objects, update attributes and SpecialTextBoxShadow flag
+diff --git sc/source/core/tool/reftokenhelper.cxx sc/source/core/tool/reftokenhelper.cxx
+index ed196e0..635df6e 100644
+--- sc/source/core/tool/reftokenhelper.cxx
++++ sc/source/core/tool/reftokenhelper.cxx
+@@ -475,3 +475,19 @@ bool ScRefTokenHelper::getDoubleRefDataFromToken(ScComplexRefData& rData, const
+     }
+     return true;
+ }
++
++ScSharedTokenRef ScRefTokenHelper::createRefToken(const ScAddress& rAddr)
++{
++    ScSingleRefData aRefData;
++    aRefData.InitAddress(rAddr);
++    ScSharedTokenRef pRef(new ScSingleRefToken(aRefData));
++    return pRef;
++}
++
++ScSharedTokenRef ScRefTokenHelper::createRefToken(const ScRange& rRange)
++{
++    ScComplexRefData aRefData;
++    aRefData.InitRange(rRange);
++    ScSharedTokenRef pRef(new ScDoubleRefToken(aRefData));
++    return pRef;
++}
+diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
+index f55b697..a289649 100644
+--- sc/source/ui/docshell/docfunc.cxx
++++ sc/source/ui/docshell/docfunc.cxx
+@@ -102,6 +102,7 @@
+ 
+ using namespace com::sun::star;
+ using ::com::sun::star::uno::Sequence;
++using ::std::vector;
+ 
+ // STATIC DATA -----------------------------------------------------------
+ 
+@@ -524,6 +525,44 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic )
+     return bDone;
+ }
+ 
++static void lcl_collectAllPredOrSuccRanges(
++    const ScRangeList& rSrcRanges, vector<ScSharedTokenRef>& rRefTokens, ScDocShell& rDocShell,
++    bool bPred)
++{
++    ScDocument* pDoc = rDocShell.GetDocument();
++    vector<ScSharedTokenRef> aRefTokens;
++    ScRangeList aSrcRanges(rSrcRanges);
++    ScRange* p = aSrcRanges.First();
++    if (!p)
++        return;
++    ScDetectiveFunc aDetFunc(pDoc, p->aStart.Tab());
++    ScRangeList aDestRanges;
++    for (; p; p = aSrcRanges.Next())
++    {
++        if (bPred)
++        {    
++            aDetFunc.GetAllPreds(
++                p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(), aRefTokens);
++        }
++        else
++        {    
++            aDetFunc.GetAllSuccs(
++                p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(), aRefTokens);
++        }
++    }
++    rRefTokens.swap(aRefTokens);
++}
++
++void ScDocFunc::DetectiveCollectAllPreds(const ScRangeList& rSrcRanges, vector<ScSharedTokenRef>& rRefTokens)
++{
++    lcl_collectAllPredOrSuccRanges(rSrcRanges, rRefTokens, rDocShell, true);
++}
++
++void ScDocFunc::DetectiveCollectAllSuccs(const ScRangeList& rSrcRanges, vector<ScSharedTokenRef>& rRefTokens)
++{
++    lcl_collectAllPredOrSuccRanges(rSrcRanges, rRefTokens, rDocShell, false);
++}
++
+ //------------------------------------------------------------------------
+ 
+ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
+diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx
+index 6a1bf00..302b07d 100644
+--- sc/source/ui/inc/docfunc.hxx
++++ sc/source/ui/inc/docfunc.hxx
+@@ -34,7 +34,10 @@
+ #include <tools/link.hxx>
+ #include "global.hxx"
+ #include "formula/grammar.hxx"
+ #include "tabbgcolor.hxx"
++#include "token.hxx"
++
++#include <vector>
+ 
+ class ScEditEngineDefaulter;
+ class SdrUndoAction;
+@@ -42,6 +45,7 @@ class ScDocShell;
+ class ScMarkData;
+ class ScPatternAttr;
+ class ScRange;
++class ScRangeList;
+ class ScRangeName;
+ class ScBaseCell;
+ class ScTokenArray;
+@@ -77,6 +81,8 @@ public:
+     BOOL			DetectiveMarkInvalid(SCTAB nTab);
+     BOOL			DetectiveDelAll(SCTAB nTab);
+     BOOL			DetectiveRefresh(BOOL bAutomatic = FALSE);
++    void            DetectiveCollectAllPreds(const ScRangeList& rSrcRanges, ::std::vector<ScSharedTokenRef>& rRefTokens);
++    void            DetectiveCollectAllSuccs(const ScRangeList& rSrcRanges, ::std::vector<ScSharedTokenRef>& rRefTokens);
+ 
+     BOOL			DeleteContents( const ScMarkData& rMark, USHORT nFlags,
+                                     BOOL bRecord, BOOL bApi );
+diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
+index 7bf556d..7bd9a26 100644
+--- sc/source/ui/inc/viewfunc.hxx
++++ sc/source/ui/inc/viewfunc.hxx
+@@ -326,6 +326,8 @@ public:
+     void			DetectiveMarkInvalid();
+     void			DetectiveDelAll();
+     void			DetectiveRefresh();
++    void            DetectiveMarkPred();
++    void            DetectiveMarkSucc();
+ 
+     void			ShowNote( bool bShow = true );
+     inline void		HideNote() { ShowNote( false ); }
+@@ -366,6 +368,8 @@ private:
+     BOOL			TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged );
+     void			DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
+                                         BOOL bAttrChanged, BOOL bAddUndo );
++
++    void            MarkAndJumpToRanges(const ScRangeList& rRanges);
+ };
+ 
+ 
+diff --git sc/source/ui/view/cellsh1.cxx sc/source/ui/view/cellsh1.cxx
+index 0cd4007..d6fdb75 100644
+--- sc/source/ui/view/cellsh1.cxx
++++ sc/source/ui/view/cellsh1.cxx
+@@ -1584,6 +1584,13 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
+             rReq.Done();
+             break;
+ 
++        case SID_DETECTIVE_MARK_PRED:
++            pTabViewShell->DetectiveMarkPred();
++            break;
++        case SID_DETECTIVE_MARK_SUCC:
++            pTabViewShell->DetectiveMarkSucc();
++            break;
++
+         case SID_SPELL_DIALOG:
+ //           pTabViewShell->DoSpellingChecker();
+             {
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index 57f1996..2b2ec31 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -3078,6 +3078,17 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
+                 ShowNoteMarker( pViewData->GetCurX(), pViewData->GetCurY(), TRUE );
+             return;
+         }
++        if (aCode.GetCode() == KEY_BRACKETLEFT && aCode.GetModifier() == KEY_MOD1)
++        {
++            pViewSh->DetectiveMarkPred();
++            return;
++        }
++        if (aCode.GetCode() == KEY_BRACKETRIGHT && aCode.GetModifier() == KEY_MOD1)
++        {
++            pViewSh->DetectiveMarkSucc();
++            return;
++        }
++        
+     }
+ 
+     Window::KeyInput(rKEvt);
+diff --git sc/source/ui/view/tabvwsh3.cxx sc/source/ui/view/tabvwsh3.cxx
+index e106539..eb4c908 100644
+--- sc/source/ui/view/tabvwsh3.cxx
++++ sc/source/ui/view/tabvwsh3.cxx
+@@ -407,13 +407,15 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
+                     {
+                         pViewData->ResetOldCursor();
+                         SetCursor( nCol, nRow );
+-                        AlignToCursor( nCol, nRow, SC_FOLLOW_JUMP );
+                         rBindings.Invalidate( SID_CURRENTCELL );
+                         rBindings.Update( nSlot );
+ 
+                         if (!rReq.IsAPI())
+                             rReq.Done();
+                     }
++                    // align to cursor even if the cursor position hasn't changed, 
++                    // because the cursor may be set outside the visible area.
++                    AlignToCursor( nCol, nRow, SC_FOLLOW_JUMP );
+ 
+                     rReq.SetReturnValue( SfxStringItem( SID_CURRENTCELL, aAddress ) );
+                 }
+diff --git sc/source/ui/view/viewfun6.cxx sc/source/ui/view/viewfun6.cxx
+index 43b3db1..e686cfc 100644
+--- sc/source/ui/view/viewfun6.cxx
++++ sc/source/ui/view/viewfun6.cxx
+@@ -50,6 +50,13 @@
+ #include "globstr.hrc"
+ #include "sc.hrc"
+ #include "fusel.hxx"
++#include "reftokenhelper.hxx"
++#include "externalrefmgr.hxx"
++
++#include <vector>
++
++using ::rtl::OUStringBuffer;
++using ::std::vector;
+ 
+ //==================================================================
+ 
+@@ -140,6 +147,136 @@ void ScViewFunc::DetectiveRefresh()
+     RecalcPPT();
+ }
+ 
++static void lcl_jumpToRange(const ScRange& rRange, ScViewData* pView, ScDocument* pDoc)
++{
++    String aAddrText;
++    rRange.Format(aAddrText, SCR_ABS_3D, pDoc);
++    SfxStringItem aPosItem(SID_CURRENTCELL, aAddrText);
++    SfxBoolItem aUnmarkItem(FN_PARAM_1, TRUE);        // remove existing selection
++    pView->GetDispatcher().Execute(
++        SID_CURRENTCELL, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
++        &aPosItem, &aUnmarkItem, 0L);
++}
++
++void ScViewFunc::MarkAndJumpToRanges(const ScRangeList& rRanges)
++{
++    ScViewData* pView = GetViewData();
++    ScDocShell* pDocSh = pView->GetDocShell();
++
++    ScRangeList aRanges(rRanges);
++    ScRange* p = aRanges.First();
++    ScRangeList aRangesToMark;
++    ScAddress aCurPos = pView->GetCurPos();
++    for (; p; p = aRanges.Next())
++    {
++        // Collect only those ranges that are on the same sheet as the current
++        // cursor.
++
++        if (p->aStart.Tab() == aCurPos.Tab())
++            aRangesToMark.Append(*p);
++    }
++
++    if (!aRangesToMark.Count())
++        return;
++
++    // Jump to the first range of all precedent ranges.
++    p = aRangesToMark.First();
++    lcl_jumpToRange(*p, pView, pDocSh->GetDocument());
++
++    for (; p; p = aRangesToMark.Next())
++        MarkRange(*p, false, true);
++}
++
++void ScViewFunc::DetectiveMarkPred()
++{
++    ScViewData* pView = GetViewData();
++    ScDocShell* pDocSh = pView->GetDocShell();
++    ScDocument* pDoc = pDocSh->GetDocument();
++    ScMarkData& rMarkData = pView->GetMarkData();
++    ScAddress aCurPos = pView->GetCurPos();
++    ScRangeList aRanges;
++    if (rMarkData.IsMarked() || rMarkData.IsMultiMarked())
++        rMarkData.FillRangeListWithMarks(&aRanges, false);
++    else
++        aRanges.Append(aCurPos);
++
++    vector<ScSharedTokenRef> aRefTokens;
++    pDocSh->GetDocFunc().DetectiveCollectAllPreds(aRanges, aRefTokens);
++
++    if (aRefTokens.empty())
++        // No precedents found.  Nothing to do.
++        return;
++
++    ScSharedTokenRef p = aRefTokens.front();
++    if (ScRefTokenHelper::isExternalRef(p))
++    {
++        // This is external.  Open the external document if available, and 
++        // jump to the destination.
++
++        sal_uInt16 nFileId = p->GetIndex();
++        ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
++        const String* pPath = pRefMgr->getExternalFileName(nFileId);
++
++        ScRange aRange;
++        if (pPath && ScRefTokenHelper::getRangeFromToken(aRange, p, true))
++        {
++            const String& rTabName = p->GetString();
++            OUStringBuffer aBuf;
++            aBuf.append(*pPath);
++            aBuf.append(sal_Unicode('#'));
++            aBuf.append(rTabName);
++            aBuf.append(sal_Unicode('.'));
++
++            String aRangeStr;
++            aRange.Format(aRangeStr, SCA_VALID); 
++            aBuf.append(aRangeStr);
++
++            ScGlobal::OpenURL(aBuf.makeStringAndClear(), String());
++        }
++        return;
++    }
++    else
++    {
++        ScRange aRange;
++        ScRefTokenHelper::getRangeFromToken(aRange, p, false);
++        if (aRange.aStart.Tab() != aCurPos.Tab())
++        {
++            // The first precedent range is on a different sheet.  Jump to it 
++            // immediately and forget the rest.
++            lcl_jumpToRange(aRange, pView, pDoc);
++            return;
++        }
++    }
++
++    ScRangeList aDestRanges;
++    ScRefTokenHelper::getRangeListFromTokens(aDestRanges, aRefTokens);
++    MarkAndJumpToRanges(aDestRanges);
++}
++
++void ScViewFunc::DetectiveMarkSucc()
++{
++    ScViewData* pView = GetViewData();
++    ScDocShell* pDocSh = pView->GetDocShell();
++    ScMarkData& rMarkData = pView->GetMarkData();
++    ScAddress aCurPos = pView->GetCurPos();
++    ScRangeList aRanges;
++    if (rMarkData.IsMarked() || rMarkData.IsMultiMarked())
++        rMarkData.FillRangeListWithMarks(&aRanges, false);
++    else
++        aRanges.Append(aCurPos);
++
++    vector<ScSharedTokenRef> aRefTokens;
++    pDocSh->GetDocFunc().DetectiveCollectAllSuccs(aRanges, aRefTokens);
++
++    if (aRefTokens.empty())
++        // No dependants found.  Nothing to do.
++        return;
++
++    ScRangeList aDestRanges;
++    ScRefTokenHelper::getRangeListFromTokens(aDestRanges, aRefTokens);
++    MarkAndJumpToRanges(aDestRanges);
++}
++
+ //---------------------------------------------------------------------------
+ 
+ void ScViewFunc::ShowNote( bool bShow )
diff --git a/applied_patches/0453-calc-jump-on-formula-ref-sfx2.diff b/applied_patches/0169-calc-jump-on-formula-ref-sfx2.diff
similarity index 100%
rename from applied_patches/0453-calc-jump-on-formula-ref-sfx2.diff
rename to applied_patches/0169-calc-jump-on-formula-ref-sfx2.diff
diff --git a/applied_patches/0454-calc-jump-on-formula-ref-vcl.diff b/applied_patches/0170-calc-jump-on-formula-ref-vcl.diff
similarity index 100%
rename from applied_patches/0454-calc-jump-on-formula-ref-vcl.diff
rename to applied_patches/0170-calc-jump-on-formula-ref-vcl.diff
diff --git a/applied_patches/0171-calc-ods-sheet-protection-sc.diff b/applied_patches/0171-calc-ods-sheet-protection-sc.diff
new file mode 100644
index 000000000..9c5b21b60
--- /dev/null
+++ b/applied_patches/0171-calc-ods-sheet-protection-sc.diff
@@ -0,0 +1,1032 @@
+diff --git sc/inc/tabprotection.hxx sc/inc/tabprotection.hxx
+index 99fec7b..b986070 100644
+--- sc/inc/tabprotection.hxx
++++ sc/inc/tabprotection.hxx
+@@ -35,7 +35,6 @@
+ #include <com/sun/star/uno/Sequence.hxx>
+ 
+ #include "global.hxx"
+-#include <vector>
+ #include <boost/shared_ptr.hpp>
+ 
+ #define ENABLE_SHEET_PROTECTION 1
+@@ -45,8 +44,9 @@ class ScTableProtectionImpl;
+ 
+ enum ScPasswordHash
+ {
+-    PASSHASH_OOO = 0,
+-    PASSHASH_XL
++    PASSHASH_SHA1 = 0,
++    PASSHASH_XL,
++    PASSHASH_UNSPECIFIED
+ };
+ 
+ class ScPassHashHelper
+@@ -56,7 +56,11 @@ public:
+         least one hash that needs to be regenerated, it returns true.  If all
+         hash values are compatible with the specified hash type, then it
+         returns false. */
+-    static bool needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash);
++    static bool needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED);
++
++    static ::rtl::OUString getHashURI(ScPasswordHash eHash);
++
++    static ScPasswordHash getHashTypeFromURI(const ::rtl::OUString& rURI);
+ 
+ private:
+     ScPassHashHelper();
+@@ -75,11 +79,13 @@ public:
+     virtual void setProtected(bool bProtected) = 0;
+ 
+     virtual bool isPasswordEmpty() const = 0;
+-    virtual bool hasPasswordHash(ScPasswordHash eHash) const = 0;
++    virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const = 0;
+     virtual void setPassword(const String& aPassText) = 0;
+-    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(ScPasswordHash eHash) const = 0;
+-    virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
+-                                 ScPasswordHash eHash = PASSHASH_OOO) = 0;
++    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(
++        ScPasswordHash eHash, ScPasswordHash eHas2 = PASSHASH_UNSPECIFIED) const = 0;
++    virtual void setPasswordHash(
++        const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
++        ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) = 0;
+     virtual bool verifyPassword(const String& aPassText) const = 0;
+ };
+ 
+@@ -105,11 +111,13 @@ public:
+     virtual void setProtected(bool bProtected);
+             
+     virtual bool isPasswordEmpty() const;
+-    virtual bool hasPasswordHash(ScPasswordHash eHash) const;
++    virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
+     virtual void setPassword(const String& aPassText);
+-    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(ScPasswordHash eHash) const;
+-    virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
+-                                 ScPasswordHash eHash = PASSHASH_OOO);
++    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(
++        ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
++    virtual void setPasswordHash(
++        const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
++        ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED);
+     virtual bool verifyPassword(const String& aPassText) const;
+     
+     bool isOptionEnabled(Option eOption) const;
+@@ -162,11 +170,13 @@ public:
+     virtual void setProtected(bool bProtected);
+             
+     virtual bool isPasswordEmpty() const;
+-    virtual bool hasPasswordHash(ScPasswordHash eHash) const;
++    virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
+     virtual void setPassword(const String& aPassText);
+-    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(ScPasswordHash eHash) const;
+-    virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
+-                                 ScPasswordHash eHash = PASSHASH_OOO);
++    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(
++        ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
++    virtual void setPasswordHash(
++        const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
++        ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED);
+     virtual bool verifyPassword(const String& aPassText) const;
+     
+     bool isOptionEnabled(Option eOption) const;
+diff --git sc/source/core/data/tabprotection.cxx sc/source/core/data/tabprotection.cxx
+index 2e51a33..463e6a8 100644
+--- sc/source/core/data/tabprotection.cxx
++++ sc/source/core/data/tabprotection.cxx
+@@ -38,20 +38,27 @@
+ #include "svtools/PasswordHelper.hxx"
+ #include "document.hxx"
+ 
++#include <vector>
++
+ #define DEBUG_TAB_PROTECTION 0
+ 
++#define URI_SHA1 "http://www.w3.org/2000/09/xmldsig#sha1"
++#define URI_XLS_LEGACY "http://docs.oasis-open.org/office/ns/table/legacy-hash-excel"
++
+ using namespace ::com::sun::star;
+ using ::com::sun::star::uno::Sequence;
+ using ::rtl::OUString;
++using ::rtl::OUStringBuffer;
++using ::std::vector;
+ 
+ // ============================================================================
+ 
+-bool ScPassHashHelper::needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash)
++bool ScPassHashHelper::needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash1, ScPasswordHash eHash2)
+ {
+     if (rDoc.IsDocProtected())
+     {
+         const ScDocProtection* p = rDoc.GetDocProtection();
+-        if (!p->isPasswordEmpty() && !p->hasPasswordHash(eHash))
++        if (!p->isPasswordEmpty() && !p->hasPasswordHash(eHash1, eHash2))
+             return true;
+     }
+ 
+@@ -63,13 +70,37 @@ bool ScPassHashHelper::needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash
+             // Sheet not protected.  Skip it.
+             continue;
+ 
+-        if (!p->isPasswordEmpty() && !p->hasPasswordHash(eHash))
++        if (!p->isPasswordEmpty() && !p->hasPasswordHash(eHash1, eHash2))
+             return true;
+     }
+ 
+     return false;
+ }
+ 
++OUString ScPassHashHelper::getHashURI(ScPasswordHash eHash)
++{
++    switch (eHash)
++    {
++        case PASSHASH_SHA1:
++            return OUString::createFromAscii(URI_SHA1);
++        case PASSHASH_XL:
++            return OUString::createFromAscii(URI_XLS_LEGACY);
++        case PASSHASH_UNSPECIFIED:
++        default:
++            ;
++    }
++    return OUString();
++}
++
++ScPasswordHash ScPassHashHelper::getHashTypeFromURI(const OUString& rURI)
++{
++    if (rURI.equalsAscii(URI_SHA1))
++        return PASSHASH_SHA1;
++    else if (rURI.equalsAscii(URI_XLS_LEGACY))
++        return PASSHASH_XL;
++    return PASSHASH_UNSPECIFIED;
++}
++
+ // ============================================================================
+ 
+ ScPassHashProtectable::~ScPassHashProtectable()
+@@ -115,7 +146,8 @@ static Sequence<sal_Int8> lcl_getXLHash(const String& aPassText)
+ class ScTableProtectionImpl
+ {
+ public:
+-    static ::com::sun::star::uno::Sequence<sal_Int8> hashPassword(const String& aPassText, ScPasswordHash eHash = PASSHASH_OOO);
++    static Sequence<sal_Int8> hashPassword(const String& aPassText, ScPasswordHash eHash = PASSHASH_SHA1);
++    static Sequence<sal_Int8> hashPassword(const Sequence<sal_Int8>& rPassHash, ScPasswordHash eHash = PASSHASH_SHA1);
+ 
+     explicit ScTableProtectionImpl(SCSIZE nOptSize);
+     explicit ScTableProtectionImpl(const ScTableProtectionImpl& r);
+@@ -125,10 +157,13 @@ public:
+     void setProtected(bool bProtected);
+ 
+     bool isPasswordEmpty() const;
+-    bool hasPasswordHash(ScPasswordHash eHash) const;
++    bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
+     void setPassword(const String& aPassText);
+-    ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(ScPasswordHash eHash) const;
+-    void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash = PASSHASH_OOO);
++    ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(
++        ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
++    void setPasswordHash(
++        const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
++        ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED);
+     bool verifyPassword(const String& aPassText) const;
+     
+     bool isOptionEnabled(SCSIZE nOptId) const;
+@@ -140,7 +175,8 @@ private:
+     ::std::vector<bool> maOptions;
+     bool mbEmptyPass;
+     bool mbProtected;
+-    ScPasswordHash meHash;
++    ScPasswordHash meHash1;
++    ScPasswordHash meHash2;
+ };
+ 
+ Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(const String& aPassText, ScPasswordHash eHash)
+@@ -151,19 +187,44 @@ Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(const String& aPassText,
+         case PASSHASH_XL:
+             aHash = lcl_getXLHash(aPassText);
+         break;
+-        case PASSHASH_OOO:
+-        default:            
++        case PASSHASH_SHA1:
+             SvPasswordHelper::GetHashPassword(aHash, aPassText);
+         break;
++        default:
++            ;
+     }
+     return aHash;
+ }
+ 
++Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(
++    const Sequence<sal_Int8>& rPassHash, ScPasswordHash eHash)
++{
++    if (!rPassHash.getLength() || eHash == PASSHASH_UNSPECIFIED)
++        return rPassHash;
++
++    // TODO: Right now, we only support double-hash by SHA1.
++    if (eHash == PASSHASH_SHA1)
++    {
++        vector<sal_Char> aChars;
++        sal_Int32 n = rPassHash.getLength();
++        aChars.reserve(n);
++        for (sal_Int32 i = 0; i < n; ++i)
++            aChars.push_back(static_cast<sal_Char>(rPassHash[i]));
++
++        Sequence<sal_Int8> aNewHash;
++        SvPasswordHelper::GetHashPassword(aNewHash, &aChars[0], aChars.size());
++        return aNewHash;
++    }
++
++    return rPassHash;
++}
++
+ ScTableProtectionImpl::ScTableProtectionImpl(SCSIZE nOptSize) :
+     maOptions(nOptSize),
+     mbEmptyPass(true),
+     mbProtected(false),
+-    meHash(PASSHASH_OOO)
++    meHash1(PASSHASH_SHA1),
++    meHash2(PASSHASH_UNSPECIFIED)
+ {
+ }
+ 
+@@ -173,7 +234,8 @@ ScTableProtectionImpl::ScTableProtectionImpl(const ScTableProtectionImpl& r) :
+     maOptions(r.maOptions),
+     mbEmptyPass(r.mbEmptyPass),
+     mbProtected(r.mbProtected),
+-    meHash(r.meHash)
++    meHash1(r.meHash1),
++    meHash2(r.meHash2)
+ {
+ }
+ 
+@@ -217,7 +279,7 @@ bool ScTableProtectionImpl::isPasswordEmpty() const
+     return mbEmptyPass;
+ }
+ 
+-bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash) const
++bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const
+ {
+     if (mbEmptyPass)
+         return true;
+@@ -225,35 +287,65 @@ bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash) const
+     if (maPassText.Len())
+         return true;
+ 
+-    if (meHash == eHash)
+-        return true;
++    if (meHash1 == eHash)
++    {
++        if (meHash2 == PASSHASH_UNSPECIFIED)
++            // single hash.
++            return true;
++
++        return meHash2 == eHash2;
++    }
+ 
+     return false;
+ }
+ 
+-Sequence<sal_Int8> ScTableProtectionImpl::getPasswordHash(ScPasswordHash eHash) const
++Sequence<sal_Int8> ScTableProtectionImpl::getPasswordHash(
++    ScPasswordHash eHash, ScPasswordHash eHash2) const
+ {
++    Sequence<sal_Int8> aPassHash;
++
+     if (mbEmptyPass)
+         // Flaged as empty.
+-        return Sequence<sal_Int8>();
++        return aPassHash;
+ 
+     if (maPassText.Len())
++    {    
+         // Cleartext password exists.  Hash it.
+-        return hashPassword(maPassText, eHash);
++        aPassHash = hashPassword(maPassText, eHash);
++        if (eHash2 != PASSHASH_UNSPECIFIED)
++            // Double-hash it.
++            aPassHash = hashPassword(aPassHash, eHash2);
+ 
+-    if (meHash == eHash)
+-        // Stored hash exists.
+-        return maPassHash;
++        return aPassHash;
++    }
++    else
++    {
++        // No clear text password.  Check if we have a hash value of the right hash type.
++        if (meHash1 == eHash)
++        {
++            aPassHash = maPassHash;
++
++            if (meHash2 == eHash2)
++                // Matching double-hash requested.
++                return aPassHash;
++            else if (meHash2 == PASSHASH_UNSPECIFIED)
++                // primary hashing type match.  Double hash it by the requested 
++                // double-hash type.
++                return hashPassword(aPassHash, eHash2);
++        }
++    }
+ 
+-    // Failed to find a matching hash.
++    // failed.
+     return Sequence<sal_Int8>();
+ }
+ 
+-void ScTableProtectionImpl::setPasswordHash(const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash)
++void ScTableProtectionImpl::setPasswordHash(
++    const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash, ScPasswordHash eHash2)
+ {
+     sal_Int32 nLen = aPassword.getLength();
+     mbEmptyPass = nLen <= 0 ? true : false;
+-    meHash = eHash;
++    meHash1 = eHash;
++    meHash2 = eHash2;
+     maPassHash = aPassword;
+ 
+ #if DEBUG_TAB_PROTECTION
+@@ -277,7 +369,8 @@ bool ScTableProtectionImpl::verifyPassword(const String& aPassText) const
+         // Clear text password exists, and this one takes precedence.
+         return aPassText.Equals(maPassText);
+ 
+-    Sequence<sal_Int8> aHash = hashPassword(aPassText, meHash);
++    Sequence<sal_Int8> aHash = hashPassword(aPassText, meHash1);
++    aHash = hashPassword(aHash, meHash2);
+ 
+ #if DEBUG_TAB_PROTECTION    
+     fprintf(stdout, "ScTableProtectionImpl::verifyPassword: hash = ");
+@@ -353,9 +446,9 @@ bool ScDocProtection::isPasswordEmpty() const
+     return mpImpl->isPasswordEmpty();
+ }
+ 
+-bool ScDocProtection::hasPasswordHash(ScPasswordHash eHash) const
++bool ScDocProtection::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const
+ {
+-    return mpImpl->hasPasswordHash(eHash);
++    return mpImpl->hasPasswordHash(eHash, eHash2);
+ }
+ 
+ void ScDocProtection::setPassword(const String& aPassText)
+@@ -363,14 +456,15 @@ void ScDocProtection::setPassword(const String& aPassText)
+     mpImpl->setPassword(aPassText);
+ }
+ 
+-uno::Sequence<sal_Int8> ScDocProtection::getPasswordHash(ScPasswordHash eHash) const
++uno::Sequence<sal_Int8> ScDocProtection::getPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const
+ {
+-    return mpImpl->getPasswordHash(eHash);
++    return mpImpl->getPasswordHash(eHash, eHash2);
+ }
+ 
+-void ScDocProtection::setPasswordHash(const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash)
++void ScDocProtection::setPasswordHash(
++    const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash, ScPasswordHash eHash2)
+ {
+-    mpImpl->setPasswordHash(aPassword, eHash);
++    mpImpl->setPasswordHash(aPassword, eHash, eHash2);
+ }
+ 
+ bool ScDocProtection::verifyPassword(const String& aPassText) const
+@@ -428,9 +522,9 @@ bool ScTableProtection::isPasswordEmpty() const
+     return mpImpl->isPasswordEmpty();
+ }
+ 
+-bool ScTableProtection::hasPasswordHash(ScPasswordHash eHash) const
++bool ScTableProtection::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const
+ {
+-    return mpImpl->hasPasswordHash(eHash);
++    return mpImpl->hasPasswordHash(eHash, eHash2);
+ }
+ 
+ void ScTableProtection::setPassword(const String& aPassText)
+@@ -438,14 +532,15 @@ void ScTableProtection::setPassword(const String& aPassText)
+     mpImpl->setPassword(aPassText);
+ }
+ 
+-Sequence<sal_Int8> ScTableProtection::getPasswordHash(ScPasswordHash eHash) const
++Sequence<sal_Int8> ScTableProtection::getPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const
+ {
+-    return mpImpl->getPasswordHash(eHash);
++    return mpImpl->getPasswordHash(eHash, eHash2);
+ }
+ 
+-void ScTableProtection::setPasswordHash(const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash)
++void ScTableProtection::setPasswordHash(
++    const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash, ScPasswordHash eHash2)
+ {
+-    mpImpl->setPasswordHash(aPassword, eHash);
++    mpImpl->setPasswordHash(aPassword, eHash, eHash2);
+ }
+ 
+ bool ScTableProtection::verifyPassword(const String& aPassText) const
+diff --git sc/source/filter/xml/xmlbodyi.cxx sc/source/filter/xml/xmlbodyi.cxx
+index fa993ef..c118998 100644
+--- sc/source/filter/xml/xmlbodyi.cxx
++++ sc/source/filter/xml/xmlbodyi.cxx
+@@ -77,6 +77,8 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
+ 											  const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
+ 	SvXMLImportContext( rImport, nPrfx, rLName ),
+ 	sPassword(),
++    meHash1(PASSHASH_SHA1),
++    meHash2(PASSHASH_UNSPECIFIED),
+ 	bProtected(sal_False),
+     bHadCalculationSettings(sal_False),
+ 	pChangeTrackingImportHelper(NULL)
+@@ -122,6 +124,10 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
+ 				bProtected = IsXMLToken(sValue, XML_TRUE);
+ 			else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY))
+ 				sPassword = sValue;
++            else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY_DIGEST_ALGORITHM))
++                meHash1 = ScPassHashHelper::getHashTypeFromURI(sValue);
++            else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2))
++                meHash2 = ScPassHashHelper::getHashTypeFromURI(sValue);
+ 		}
+ 	}
+ }
+@@ -291,7 +297,7 @@ void ScXMLBodyContext::EndElement()
+ 			if (sPassword.getLength())
+             {
+ 				SvXMLUnitConverter::decodeBase64(aPass, sPassword);
+-                pProtection->setPasswordHash(aPass, PASSHASH_OOO);
++                pProtection->setPasswordHash(aPass, meHash1, meHash2);
+             }
+ 
+             pDoc->SetDocProtection(pProtection.get());
+diff --git sc/source/filter/xml/xmlbodyi.hxx sc/source/filter/xml/xmlbodyi.hxx
+index 483741e..69d5407 100644
+--- sc/source/filter/xml/xmlbodyi.hxx
++++ sc/source/filter/xml/xmlbodyi.hxx
+@@ -34,12 +34,16 @@
+ #include <xmloff/xmlictxt.hxx>
+ #include <xmloff/xmlimp.hxx>
+ 
++#include "tabprotection.hxx"
++
+ class ScXMLImport;
+ class ScXMLChangeTrackingImportHelper;
+ 
+ class ScXMLBodyContext : public SvXMLImportContext
+ {
+ 	rtl::OUString	sPassword;
++    ScPasswordHash  meHash1;
++    ScPasswordHash  meHash2;
+ 	sal_Bool		bProtected;
+     sal_Bool        bHadCalculationSettings;
+ 
+diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
+index 3658d78..089f12d 100644
+--- sc/source/filter/xml/xmlexprt.cxx
++++ sc/source/filter/xml/xmlexprt.cxx
+@@ -1441,12 +1441,36 @@ void ScXMLExport::SetBodyAttributes()
+ 		AddAttribute(XML_NAMESPACE_TABLE, XML_STRUCTURE_PROTECTED, XML_TRUE);
+ 		rtl::OUStringBuffer aBuffer;
+         uno::Sequence<sal_Int8> aPassHash;
++        ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED;
+         const ScDocProtection* p = pDoc->GetDocProtection();
+         if (p)
+-            aPassHash = p->getPasswordHash(PASSHASH_OOO);
++        {
++            if (p->hasPasswordHash(PASSHASH_SHA1))
++            {    
++                aPassHash = p->getPasswordHash(PASSHASH_SHA1);
++                eHashUsed = PASSHASH_SHA1;
++            }
++            else if (p->hasPasswordHash(PASSHASH_XL, PASSHASH_SHA1))
++            {    
++                aPassHash = p->getPasswordHash(PASSHASH_XL, PASSHASH_SHA1);
++                eHashUsed = PASSHASH_XL;
++            }
++        }
+ 		SvXMLUnitConverter::encodeBase64(aBuffer, aPassHash);
+ 		if (aBuffer.getLength())
++        {    
+ 			AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
++            if (eHashUsed == PASSHASH_XL)
++            {
++                AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, 
++                             ScPassHashHelper::getHashURI(PASSHASH_XL));
++                AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
++                             ScPassHashHelper::getHashURI(PASSHASH_SHA1));
++            }
++            else if (eHashUsed == PASSHASH_SHA1)
++                AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, 
++                             ScPassHashHelper::getHashURI(PASSHASH_SHA1));
++        }
+ 	}
+ }
+ 
+@@ -1513,18 +1537,46 @@ void ScXMLExport::_ExportContent()
+                     AddAttribute(sAttrName, sOUTableName);
+                     AddAttribute(sAttrStyleName, aTableStyles[nTable]);
+                     uno::Reference<util::XProtectable> xProtectable (xTable, uno::UNO_QUERY);
++                    ScTableProtection* pProtect = NULL;
+                     if (xProtectable.is() && xProtectable->isProtected())
+                     {
+                         AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TRUE);
+-                        rtl::OUStringBuffer aBuffer;
+                         if (pDoc)
+                         {
+-                            ScTableProtection* pProtect = pDoc->GetTabProtection(static_cast<SCTAB>(nTable));
++                            pProtect = pDoc->GetTabProtection(static_cast<SCTAB>(nTable));
+                             if (pProtect)
+-                                SvXMLUnitConverter::encodeBase64(aBuffer, pProtect->getPasswordHash(PASSHASH_OOO));
++                            {    
++                                rtl::OUStringBuffer aBuffer;
++                                ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED;
++                                if (pProtect->hasPasswordHash(PASSHASH_SHA1))
++                                {    
++                                    SvXMLUnitConverter::encodeBase64(aBuffer, pProtect->getPasswordHash(PASSHASH_SHA1));
++                                    eHashUsed = PASSHASH_SHA1;
++                                }
++                                else if (pProtect->hasPasswordHash(PASSHASH_XL, PASSHASH_SHA1))
++                                {
++                                    // Double-hash this by SHA1 on top of the legacy xls hash.
++                                    uno::Sequence<sal_Int8> aHash = pProtect->getPasswordHash(PASSHASH_XL, PASSHASH_SHA1);
++                                    SvXMLUnitConverter::encodeBase64(aBuffer, aHash);
++                                    eHashUsed = PASSHASH_XL;
++                                }
++                                if (aBuffer.getLength())
++                                {    
++                                    AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
++                                    if (eHashUsed == PASSHASH_XL)
++                                    {
++                                        AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, 
++                                                     ScPassHashHelper::getHashURI(PASSHASH_XL));
++                                        AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
++                                                     ScPassHashHelper::getHashURI(PASSHASH_SHA1));
++                                    }
++                                    else if (eHashUsed == PASSHASH_SHA1)
++                                        AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, 
++                                                     ScPassHashHelper::getHashURI(PASSHASH_SHA1));
++
++                                }
++                            }
+                         }
+-                        if (aBuffer.getLength())
+-                            AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
+                     }
+                     rtl::OUString sPrintRanges;
+                     table::CellRangeAddress aColumnHeaderRange;
+@@ -1535,6 +1587,20 @@ void ScXMLExport::_ExportContent()
+                     else if (!pDoc->IsPrintEntireSheet(static_cast<SCTAB>(nTable)))
+                         AddAttribute( XML_NAMESPACE_TABLE, XML_PRINT, XML_FALSE);
+                     SvXMLElementExport aElemT(*this, sElemTab, sal_True, sal_True);
++                    
++                    if (pProtect && pProtect->isProtected())
++                    {
++                        if (pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS))
++                            AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS, XML_TRUE);
++                        if (pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS))
++                            AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS, XML_TRUE);
++
++                        rtl::OUString aElemName = GetNamespaceMap().GetQNameByKey(
++                            XML_NAMESPACE_TABLE, GetXMLToken(XML_TABLE_PROTECTION));
++
++                        SvXMLElementExport aElemProtected(*this, aElemName, true, true);
++                    }
++
+                     CheckAttrList();
+                     WriteTableSource();
+                     WriteScenario();
+diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
+index 4517591..728373e 100644
+--- sc/source/filter/xml/xmlimprt.cxx
++++ sc/source/filter/xml/xmlimprt.cxx
+@@ -637,6 +637,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
+             { XML_NAMESPACE_TABLE,	XML_TABLE_HEADER_COLUMNS,		XML_TOK_TABLE_HEADER_COLS	},
+             { XML_NAMESPACE_TABLE,	XML_TABLE_COLUMNS,				XML_TOK_TABLE_COLS			},
+             { XML_NAMESPACE_TABLE,	XML_TABLE_COLUMN,				XML_TOK_TABLE_COL			},
++            { XML_NAMESPACE_TABLE,  XML_TABLE_PROTECTION,           XML_TOK_TABLE_PROTECTION    },
+             { XML_NAMESPACE_TABLE,	XML_TABLE_ROW_GROUP,			XML_TOK_TABLE_ROW_GROUP		},
+             { XML_NAMESPACE_TABLE,	XML_TABLE_HEADER_ROWS,			XML_TOK_TABLE_HEADER_ROWS	},
+             { XML_NAMESPACE_TABLE,	XML_TABLE_ROWS, 				XML_TOK_TABLE_ROWS			},
+@@ -654,6 +655,22 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
+     return *pTableElemTokenMap;
+ }
+ 
++const SvXMLTokenMap& ScXMLImport::GetTableProtectionAttrTokenMap()
++{
++    if (!pTableProtectionElemTokenMap)
++    {
++        static __FAR_DATA SvXMLTokenMapEntry aTableProtectionTokenMap[] =
++        {
++            { XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS,      XML_TOK_TABLE_SELECT_PROTECTED_CELLS    },
++            { XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS,    XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS  },
++            XML_TOKEN_MAP_END
++        };
++        pTableProtectionElemTokenMap = new SvXMLTokenMap(aTableProtectionTokenMap);
++    }
++
++    return *pTableProtectionElemTokenMap;
++}
++
+ const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap()
+ {
+     if( !pTableRowsElemTokenMap )
+@@ -700,9 +717,11 @@ const SvXMLTokenMap& ScXMLImport::GetTableAttrTokenMap()
+         {
+             { XML_NAMESPACE_TABLE, XML_NAME,						XML_TOK_TABLE_NAME				},
+             { XML_NAMESPACE_TABLE, XML_STYLE_NAME,					XML_TOK_TABLE_STYLE_NAME		},
+-            { XML_NAMESPACE_TABLE, XML_PROTECTED,					XML_TOK_TABLE_PROTECTION		},
++            { XML_NAMESPACE_TABLE, XML_PROTECTED,                   XML_TOK_TABLE_PROTECTED         },
+             { XML_NAMESPACE_TABLE, XML_PRINT_RANGES,				XML_TOK_TABLE_PRINT_RANGES		},
+             { XML_NAMESPACE_TABLE, XML_PROTECTION_KEY,				XML_TOK_TABLE_PASSWORD			},
++            { XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, XML_TOK_TABLE_PASSHASH      },
++            { XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2, XML_TOK_TABLE_PASSHASH_2  },
+             { XML_NAMESPACE_TABLE, XML_PRINT,               		XML_TOK_TABLE_PRINT             },
+             XML_TOKEN_MAP_END
+         };
+@@ -1685,6 +1704,7 @@ ScXMLImport::ScXMLImport(
+ 	pLabelRangesElemTokenMap( 0 ),
+ 	pLabelRangeAttrTokenMap( 0 ),
+ 	pTableElemTokenMap( 0 ),
++    pTableProtectionElemTokenMap(NULL),
+ 	pTableRowsElemTokenMap( 0 ),
+ 	pTableColsElemTokenMap( 0 ),
+ 	pTableScenarioAttrTokenMap( 0 ),
+@@ -1811,6 +1831,7 @@ ScXMLImport::~ScXMLImport() throw()
+     delete pLabelRangesElemTokenMap;
+     delete pLabelRangeAttrTokenMap;
+     delete pTableElemTokenMap;
++    delete pTableProtectionElemTokenMap;
+     delete pTableRowsElemTokenMap;
+     delete pTableColsElemTokenMap;
+     delete pTableAttrTokenMap;
+diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx
+index 093846a..8ff4178 100644
+--- sc/source/filter/xml/xmlimprt.hxx
++++ sc/source/filter/xml/xmlimprt.hxx
+@@ -172,6 +172,7 @@ enum ScXMLTableTokens
+ 	XML_TOK_TABLE_COL,
+ 	XML_TOK_TABLE_ROW_GROUP,
+ 	XML_TOK_TABLE_HEADER_ROWS,
++    XML_TOK_TABLE_PROTECTION,
+ 	XML_TOK_TABLE_ROWS,
+ 	XML_TOK_TABLE_ROW,
+ 	XML_TOK_TABLE_SOURCE,
+@@ -180,6 +181,12 @@ enum ScXMLTableTokens
+ 	XML_TOK_TABLE_FORMS
+ };
+ 
++enum ScXMLTokenProtectionTokens
++{
++    XML_TOK_TABLE_SELECT_PROTECTED_CELLS,
++    XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS
++};
++
+ enum ScXMLTableRowsTokens
+ {
+ 	XML_TOK_TABLE_ROWS_ROW_GROUP,
+@@ -200,9 +207,11 @@ enum ScXMLTableAttrTokens
+ {
+ 	XML_TOK_TABLE_NAME,
+ 	XML_TOK_TABLE_STYLE_NAME,
+-	XML_TOK_TABLE_PROTECTION,
++	XML_TOK_TABLE_PROTECTED,
+ 	XML_TOK_TABLE_PRINT_RANGES,
+ 	XML_TOK_TABLE_PASSWORD,
++	XML_TOK_TABLE_PASSHASH,
++	XML_TOK_TABLE_PASSHASH_2,
+     XML_TOK_TABLE_PRINT
+ };
+ 
+@@ -699,6 +708,7 @@ class ScXMLImport: public SvXMLImport
+ 	SvXMLTokenMap			*pLabelRangesElemTokenMap;
+ 	SvXMLTokenMap			*pLabelRangeAttrTokenMap;
+ 	SvXMLTokenMap			*pTableElemTokenMap;
++    SvXMLTokenMap           *pTableProtectionElemTokenMap;
+ 	SvXMLTokenMap			*pTableRowsElemTokenMap;
+ 	SvXMLTokenMap			*pTableColsElemTokenMap;
+ 	SvXMLTokenMap			*pTableScenarioAttrTokenMap;
+@@ -865,6 +875,7 @@ public:
+ 	const SvXMLTokenMap& GetLabelRangesElemTokenMap();
+ 	const SvXMLTokenMap& GetLabelRangeAttrTokenMap();
+ 	const SvXMLTokenMap& GetTableElemTokenMap();
++    const SvXMLTokenMap& GetTableProtectionAttrTokenMap();
+ 	const SvXMLTokenMap& GetTableRowsElemTokenMap();
+ 	const SvXMLTokenMap& GetTableColsElemTokenMap();
+ 	const SvXMLTokenMap& GetTableAttrTokenMap();
+diff --git sc/source/filter/xml/xmlsubti.cxx sc/source/filter/xml/xmlsubti.cxx
+index 72ddec3..3a001e9 100644
+--- sc/source/filter/xml/xmlsubti.cxx
++++ sc/source/filter/xml/xmlsubti.cxx
+@@ -148,6 +148,15 @@ void ScMyTableData::SetChangedCols(const sal_Int32 nValue)
+ 
+ /*******************************************************************************************************************************/
+ 
++ScXMLTabProtectionData::ScXMLTabProtectionData() :
++    meHash1(PASSHASH_SHA1), 
++    meHash2(PASSHASH_UNSPECIFIED),
++    mbProtected(false), 
++    mbSelectProtectedCells(true), 
++    mbSelectUnprotectedCells(true)
++{
++}
++
+ ScMyTables::ScMyTables(ScXMLImport& rTempImport)
+ 	: rImport(rTempImport),
+ 	aResizeShapes(rTempImport),
+@@ -173,7 +182,7 @@ ScMyTables::~ScMyTables()
+ }
+ 
+ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName,
+-						const sal_Bool bTempProtection, const rtl::OUString& sTempPassword)
++                          const ScXMLTabProtectionData& rProtectData)
+ {
+ 	if (rImport.GetModel().is())
+ 	{
+@@ -189,8 +198,7 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString&
+ 		}
+         ++nCurrentSheet;
+ 
+-		bProtection = bTempProtection;
+-		sPassword = sTempPassword;
++        maProtectionData = rProtectData;
+ 		uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( rImport.GetModel(), uno::UNO_QUERY );
+ 		if ( xSpreadDoc.is() )
+ 		{
+@@ -617,13 +625,16 @@ void ScMyTables::DeleteTable()
+         aMatrixRangeList.clear();
+     }
+ 
+-	if (rImport.GetDocument() && bProtection)
++	if (rImport.GetDocument() && maProtectionData.mbProtected)
+ 	{
+-		uno::Sequence<sal_Int8> aPass;
+-		SvXMLUnitConverter::decodeBase64(aPass, sPassword);
++		uno::Sequence<sal_Int8> aHash;
++		SvXMLUnitConverter::decodeBase64(aHash, maProtectionData.maPassword);
++
+         auto_ptr<ScTableProtection> pProtect(new ScTableProtection);
+-        pProtect->setProtected(bProtection);
+-        pProtect->setPasswordHash(aPass, PASSHASH_OOO);
++        pProtect->setProtected(maProtectionData.mbProtected);
++        pProtect->setPasswordHash(aHash, maProtectionData.meHash1, maProtectionData.meHash2);
++        pProtect->setOption(ScTableProtection::SELECT_LOCKED_CELLS,   maProtectionData.mbSelectProtectedCells);
++        pProtect->setOption(ScTableProtection::SELECT_UNLOCKED_CELLS, maProtectionData.mbSelectUnprotectedCells);
+         rImport.GetDocument()->SetTabProtection(static_cast<SCTAB>(nCurrentSheet), pProtect.get());
+ 	}
+ 
+diff --git sc/source/filter/xml/xmlsubti.hxx sc/source/filter/xml/xmlsubti.hxx
+index 23dc5db..349b395 100644
+--- sc/source/filter/xml/xmlsubti.hxx
++++ sc/source/filter/xml/xmlsubti.hxx
+@@ -43,6 +43,7 @@
+ #include <list>
+ #include "XMLTableShapeResizer.hxx"
+ #include "formula/grammar.hxx"
++#include "tabprotection.hxx"
+ 
+ class ScXMLImport;
+ 
+@@ -107,6 +108,18 @@ struct ScMatrixRange
+     }
+ };
+ 
++struct ScXMLTabProtectionData
++{
++    ::rtl::OUString maPassword;
++    ScPasswordHash  meHash1;
++    ScPasswordHash  meHash2;
++    bool            mbProtected;
++    bool            mbSelectProtectedCells;
++    bool            mbSelectUnprotectedCells;
++
++    ScXMLTabProtectionData();
++};
++
+ class ScMyTables
+ {
+ private:
+@@ -121,8 +134,8 @@ private:
+ 	::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage;
+ 	::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes;
+ 	rtl::OUString						sCurrentSheetName;
+-	rtl::OUString						sPassword;
+ 	std::vector<ScMyTableData*>			aTableVec;
++    ScXMLTabProtectionData              maProtectionData;
+     ScMyMatrixRangeList                 aMatrixRangeList;
+ 	com::sun::star::table::CellAddress	aRealCellPos;
+ 	sal_Int32							nCurrentColStylePos;
+@@ -130,7 +143,6 @@ private:
+ 	sal_Int16							nCurrentXShapes;
+ 	sal_Int32							nTableCount;
+ 	sal_Int32							nCurrentSheet;
+-	sal_Bool							bProtection;
+ 
+ 	sal_Bool 							IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange,
+ 												const sal_Int32 nCol, const sal_Int32 nRow,
+@@ -145,7 +157,7 @@ public:
+ 										ScMyTables(ScXMLImport& rImport);
+ 										~ScMyTables();
+ 	void   								NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName,
+-												const sal_Bool bProtection, const rtl::OUString& sPassword);
++                                                 const ScXMLTabProtectionData& rProtectData);
+ 	void								AddRow();
+ 	void								SetRowStyle(const rtl::OUString& rCellStyleName);
+ 	void								AddColumn(sal_Bool bIsCovered);
+@@ -156,6 +168,7 @@ public:
+ 	com::sun::star::table::CellAddress	GetRealCellPos();
+ 	void								AddColCount(sal_Int32 nTempColCount);
+ 	void								AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName);
++    ScXMLTabProtectionData&             GetCurrentProtectionData() { return maProtectionData; }
+ 	rtl::OUString						GetCurrentSheetName() const { return sCurrentSheetName; }
+ 	sal_Int32							GetCurrentSheet() const { return nCurrentSheet; }
+ 	sal_Int32							GetCurrentColumn() const { return aTableVec[nTableCount - 1]->GetColCount(); }
+diff --git sc/source/filter/xml/xmltabi.cxx sc/source/filter/xml/xmltabi.cxx
+index fc09927..5229085 100644
+--- sc/source/filter/xml/xmltabi.cxx
++++ sc/source/filter/xml/xmltabi.cxx
+@@ -64,6 +64,9 @@
+ 
+ using namespace com::sun::star;
+ using namespace xmloff::token;
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::xml::sax::XAttributeList;
++using ::rtl::OUString;
+ 
+ /** 
+  * Determine whether this table is an external reference cache from its 
+@@ -152,10 +155,9 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
+ {
+ 	if (!bTempIsSubTable)
+ 	{
+-		sal_Bool bProtection(sal_False);
++        ScXMLTabProtectionData aProtectData;
+ 		rtl::OUString sName;
+ 		rtl::OUString sStyleName;
+-		rtl::OUString sPassword;
+ 		sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
+ 		const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableAttrTokenMap();
+ 		for( sal_Int16 i=0; i < nAttrCount; ++i )
+@@ -174,15 +176,21 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
+ 				case XML_TOK_TABLE_STYLE_NAME:
+ 						sStyleName = sValue;
+ 					break;
+-				case XML_TOK_TABLE_PROTECTION:
+-						bProtection = IsXMLToken(sValue, XML_TRUE);
+-					break;
++				case XML_TOK_TABLE_PROTECTED:
++                    aProtectData.mbProtected = IsXMLToken(sValue, XML_TRUE);
++                break;
+ 				case XML_TOK_TABLE_PRINT_RANGES:
+ 						sPrintRanges = sValue;
+ 					break;
+ 				case XML_TOK_TABLE_PASSWORD:
+-						sPassword = sValue;
+-					break;
++                    aProtectData.maPassword = sValue;
++                break;
++                case XML_TOK_TABLE_PASSHASH:
++                    aProtectData.meHash1 = ScPassHashHelper::getHashTypeFromURI(sValue);
++                break;
++                case XML_TOK_TABLE_PASSHASH_2:
++                    aProtectData.meHash2 = ScPassHashHelper::getHashTypeFromURI(sValue);
++                break;
+                 case XML_TOK_TABLE_PRINT:
+                     {
+                         if (IsXMLToken(sValue, XML_FALSE))
+@@ -209,7 +217,7 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
+         else
+         {
+             // This is a regular table.
+-            GetScImport().GetTables().NewSheet(sName, sStyleName, bProtection, sPassword);
++            GetScImport().GetTables().NewSheet(sName, sStyleName, aProtectData);
+         }
+ 	}
+ 	else
+@@ -271,6 +279,9 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( USHORT nPrefix,
+ 			pContext = new ScXMLTableColContext( GetScImport(), nPrefix,
+ 													  rLName, xAttrList );
+ 		break;
++    case XML_TOK_TABLE_PROTECTION:
++        pContext = new ScXMLTableProtectionContext( GetScImport(), nPrefix, rLName, xAttrList );
++        break;
+ 	case XML_TOK_TABLE_ROW_GROUP:
+ 		pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix,
+ 												   rLName, xAttrList,
+@@ -384,3 +395,61 @@ void ScXMLTableContext::EndElement()
+ 	GetScImport().UnlockSolarMutex();
+ }
+ 
++// ============================================================================
++
++ScXMLImport& ScXMLTableProtectionContext::GetScImport()
++{
++    return static_cast<ScXMLImport&>(GetImport());
++}
++
++ScXMLTableProtectionContext::ScXMLTableProtectionContext(
++    ScXMLImport& rImport, USHORT nPrefix, const OUString& rLName, 
++    const Reference<XAttributeList>& xAttrList ) :
++    SvXMLImportContext( rImport, nPrefix, rLName )
++{
++    const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableProtectionAttrTokenMap();
++    bool bSelectProtectedCells = false;
++    bool bSelectUnprotectedCells = false;
++
++    sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
++
++    for (sal_Int16 i = 0; i < nAttrCount; ++i)
++    {
++        const OUString& aAttrName = xAttrList->getNameByIndex(i);
++        const OUString aValue = xAttrList->getValueByIndex(i);
++
++        OUString aLocalName;
++        USHORT nLocalPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
++            aAttrName, &aLocalName);
++    
++        switch (rAttrTokenMap.Get(nLocalPrefix, aLocalName))
++        {
++            case XML_TOK_TABLE_SELECT_PROTECTED_CELLS:
++                bSelectProtectedCells = IsXMLToken(aValue, XML_TRUE);
++            break;
++            case XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS:
++                bSelectUnprotectedCells = IsXMLToken(aValue, XML_TRUE);
++            break;
++            default:
++                ;
++        }
++    }
++
++    ScXMLTabProtectionData& rProtectData = GetScImport().GetTables().GetCurrentProtectionData();
++    rProtectData.mbSelectProtectedCells   = bSelectProtectedCells;
++    rProtectData.mbSelectUnprotectedCells = bSelectUnprotectedCells;
++}
++
++ScXMLTableProtectionContext::~ScXMLTableProtectionContext()
++{
++}
++
++SvXMLImportContext* ScXMLTableProtectionContext::CreateChildContext(
++    USHORT /*nPrefix*/, const OUString& /*rLocalName*/, const Reference<XAttributeList>& /*xAttrList*/ )
++{
++    return NULL;
++}
++
++void ScXMLTableProtectionContext::EndElement()
++{
++}
+diff --git sc/source/filter/xml/xmltabi.hxx sc/source/filter/xml/xmltabi.hxx
+index 7fc6031..bd3482c 100644
+--- sc/source/filter/xml/xmltabi.hxx
++++ sc/source/filter/xml/xmltabi.hxx
+@@ -77,4 +77,26 @@ public:
+ 	virtual void EndElement();
+ };
+ 
++// ============================================================================
++
++class ScXMLTableProtectionContext : public SvXMLImportContext
++{
++    ScXMLImport& GetScImport();
++
++public:
++    ScXMLTableProtectionContext( ScXMLImport& rImport, USHORT nPrefix,
++                        const ::rtl::OUString& rLName,
++                        const ::com::sun::star::uno::Reference<
++                                 ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
++
++    virtual ~ScXMLTableProtectionContext();
++
++    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
++                                     const ::rtl::OUString& rLocalName,
++                                     const ::com::sun::star::uno::Reference<
++                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
++
++    virtual void EndElement();
++};
++
+ #endif
+diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
+index 04825b9..9caaf5f 100644
+--- sc/source/ui/docshell/docsh.cxx
++++ sc/source/ui/docshell/docsh.cxx
+@@ -1440,9 +1440,14 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
+ 
+ #if ENABLE_SHEET_PROTECTION
+     ScTabViewShell* pViewShell = GetBestViewShell();
+-    if (pViewShell && ScPassHashHelper::needsPassHashRegen(aDocument, PASSHASH_OOO))
++    bool bNeedsRehash = ScPassHashHelper::needsPassHashRegen(aDocument, PASSHASH_SHA1);
++    if (bNeedsRehash)
++        // legacy xls hash double-hashed by SHA1 is also supported.
++        bNeedsRehash = ScPassHashHelper::needsPassHashRegen(aDocument, PASSHASH_XL, PASSHASH_SHA1);
++
++    if (pViewShell && bNeedsRehash)
+     {
+-        if (!pViewShell->ExecuteRetypePassDlg(PASSHASH_OOO))
++        if (!pViewShell->ExecuteRetypePassDlg(PASSHASH_SHA1))
+             // password re-type cancelled.  Don't save the document.
+             return false;
+     }
+diff --git sc/source/ui/miscdlgs/retypepassdlg.cxx sc/source/ui/miscdlgs/retypepassdlg.cxx
+index 7786115..899ae0d 100644
+--- sc/source/ui/miscdlgs/retypepassdlg.cxx
++++ sc/source/ui/miscdlgs/retypepassdlg.cxx
+@@ -77,7 +77,7 @@ ScRetypePassDlg::ScRetypePassDlg(Window* pParent) :
+ 
+     mpDocItem(static_cast<ScDocProtection*>(NULL)),
+     mnCurScrollPos(0),
+-    meDesiredHash(PASSHASH_OOO)
++    meDesiredHash(PASSHASH_SHA1)
+ {
+     Init();
+ }
diff --git a/applied_patches/0457-calc-ods-sheet-protection-xmloff.diff b/applied_patches/0172-calc-ods-sheet-protection-xmloff.diff
similarity index 100%
rename from applied_patches/0457-calc-ods-sheet-protection-xmloff.diff
rename to applied_patches/0172-calc-ods-sheet-protection-xmloff.diff
diff --git a/applied_patches/0458-calc-ods-sheet-protection-svtools.diff b/applied_patches/0173-calc-ods-sheet-protection-svtools.diff
similarity index 100%
rename from applied_patches/0458-calc-ods-sheet-protection-svtools.diff
rename to applied_patches/0173-calc-ods-sheet-protection-svtools.diff
diff --git a/applied_patches/0174-calc-selection-fixed-cursor.diff b/applied_patches/0174-calc-selection-fixed-cursor.diff
new file mode 100644
index 000000000..ba41ec1e3
--- /dev/null
+++ b/applied_patches/0174-calc-selection-fixed-cursor.diff
@@ -0,0 +1,904 @@
+diff --git sc/inc/document.hxx sc/inc/document.hxx
+index 96b6809..cc91c1a 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -824,6 +824,7 @@ public:
+                                                 ScRange* pLastRange = NULL,
+                                                 Rectangle* pLastMM = NULL ) const;
+ 
++    void            SkipOverlapped( SCCOL& rCol, SCROW& rRow, SCTAB nTab ) const;
+     BOOL			IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
+     BOOL			IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
+ 
+diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
+index de89b1b..8ba6dfa 100644
+--- sc/source/core/data/document.cxx
++++ sc/source/core/data/document.cxx
+@@ -4534,6 +4534,13 @@ BOOL ScDocument::RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow,
+     return bChange;
+ }
+ 
++void ScDocument::SkipOverlapped( SCCOL& rCol, SCROW& rRow, SCTAB nTab ) const
++{
++    while (IsHorOverlapped(rCol, rRow, nTab))
++        --rCol;
++    while (IsVerOverlapped(rCol, rRow, nTab))
++        --rRow;
++}
+ 
+ BOOL ScDocument::IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
+ {
+diff --git sc/source/ui/inc/cellsh.hxx sc/source/ui/inc/cellsh.hxx
+index 97f6d0d..a42a336 100644
+--- sc/source/ui/inc/cellsh.hxx
++++ sc/source/ui/inc/cellsh.hxx
+@@ -37,6 +37,7 @@
+ #include <svx/svdmark.hxx>
+ #include <tools/link.hxx>
+ #include "formatsh.hxx"
++#include "address.hxx"
+ 
+ class SvxClipboardFmtItem;
+ class TransferableDataHelper;
+diff --git sc/source/ui/inc/tabview.hxx sc/source/ui/inc/tabview.hxx
+index 437b95b..804fbff 100644
+--- sc/source/ui/inc/tabview.hxx
++++ sc/source/ui/inc/tabview.hxx
+@@ -179,7 +179,6 @@ private:
+     BOOL				bInActivatePart;
+     BOOL				bInZoomUpdate;
+     BOOL				bMoveIsShift;
+-    BOOL				bNewStartIfMarking;
+ 
+     BOOL                bOldSelection;          // old style (inverting) of selection
+ 
+@@ -203,6 +202,10 @@ private:
+     static void		SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL );
+     static long		GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL );
+ 
++    void            GetPageMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, SCsCOL& rPageX, SCsROW& rPageY);
++    void            GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, 
++                                           SCsCOL& rAreaX, SCsROW& rAreaY, ScFollowMode& rMode);
++
+ protected:
+     void			UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL,
+                                         const SCROW* pPosY = NULL );
+@@ -391,8 +394,6 @@ public:
+ 
+     void			FindNextUnprot( BOOL bShift, BOOL bInSelection = TRUE );
+ 
+-    void			SetNewStartIfMarking();
+-
+     void            SetTabNo( SCTAB nTab, BOOL bNew = FALSE, BOOL bExtendSelection = FALSE );
+     void            SelectNextTab( short nDir, BOOL bExtendSelection = FALSE );
+ 
+@@ -483,6 +484,10 @@ public:
+ 
+     BOOL			IsBlockMode() const		{ return bIsBlockMode; }
+ 
++    void            ExpandBlock(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode);
++    void            ExpandBlockPage(SCsCOL nMovX, SCsROW nMovY);
++    void            ExpandBlockArea(SCsCOL nMovX, SCsROW nMovY);
++
+     void			MarkColumns();
+     void			MarkRows();
+     void			MarkDataArea( BOOL bIncludeCursor = TRUE );
+diff --git sc/source/ui/view/cellsh4.cxx sc/source/ui/view/cellsh4.cxx
+index 4cb00fb..3f80397 100644
+--- sc/source/ui/view/cellsh4.cxx
++++ sc/source/ui/view/cellsh4.cxx
+@@ -52,6 +52,7 @@
+ #include "document.hxx"
+ #include "sc.hrc"
+ 
++#include "vcl/svapp.hxx"
+ 
+ //------------------------------------------------------------------
+ 
+@@ -88,10 +88,56 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
+         {
+             // ADD mode: keep the selection, start a new block when marking with shift again
+             bKeep = TRUE;
+-            pTabViewShell->SetNewStartIfMarking();
+         }
+     }
+ 
++    if (bSel)
++    {
++        switch (nSlotId)
++        {
++            case SID_CURSORDOWN:
++                rReq.SetSlot(SID_CURSORDOWN_SEL);
++            break;
++            case SID_CURSORUP:
++                rReq.SetSlot(SID_CURSORUP_SEL);
++            break;
++            case SID_CURSORRIGHT:
++                rReq.SetSlot(SID_CURSORRIGHT_SEL);
++            break;
++            case SID_CURSORLEFT:
++                rReq.SetSlot(SID_CURSORLEFT_SEL);
++            break;
++            case SID_CURSORPAGEDOWN:
++                rReq.SetSlot(SID_CURSORPAGEDOWN_SEL);
++            break;
++            case SID_CURSORPAGEUP:
++                rReq.SetSlot(SID_CURSORPAGEUP_SEL);
++            break;
++            case SID_CURSORPAGERIGHT:
++                rReq.SetSlot(SID_CURSORPAGERIGHT_SEL);
++            break;
++            case SID_CURSORPAGELEFT:
++                rReq.SetSlot(SID_CURSORPAGELEFT_SEL);
++            break;
++            case SID_CURSORBLKDOWN:
++                rReq.SetSlot(SID_CURSORBLKDOWN_SEL);
++            break;
++            case SID_CURSORBLKUP:
++                rReq.SetSlot(SID_CURSORBLKUP_SEL);
++            break;
++            case SID_CURSORBLKRIGHT:
++                rReq.SetSlot(SID_CURSORBLKRIGHT_SEL);
++            break;
++            case SID_CURSORBLKLEFT:
++                rReq.SetSlot(SID_CURSORBLKLEFT_SEL);
++            break;
++            default:
++                ;
++        }
++        ExecuteCursorSel(rReq);
++        return;
++    }
++
+     SCsCOLROW nRTLSign = 1;
+     if ( pData->GetDocument()->IsLayoutRTL( pData->GetTabNo() ) )
+     {
+@@ -172,38 +218,61 @@ void ScCellShell::GetStateCursor( SfxItemSet& /* rSet */ )
+ 
+ void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
+ {
+-    const SfxItemSet*	pReqArgs = rReq.GetArgs();
+-    USHORT				nSlotId  = rReq.GetSlot();
+-    short				nRepeat = 1;
+-
+-    if ( pReqArgs != NULL )
+-    {
+-        const	SfxPoolItem* pItem;
+-        if( IS_AVAILABLE( FN_PARAM_1, &pItem ) )
+-            nRepeat = ((const SfxInt16Item*)pItem)->GetValue();
+-    }
++    sal_uInt16 nSlotId  = rReq.GetSlot();
++    ScTabViewShell* pViewShell = GetViewData()->GetViewShell();
++    ScInputHandler* pInputHdl = pViewShell->GetInputHandler();
++    pViewShell->HideAllCursors();
++    if (pInputHdl && pInputHdl->IsInputMode())
++    {
++        // the current cell is in edit mode.  Commit the text before moving on.
++        pViewShell->ExecuteInputDirect();
++    }
+ 
+-    switch ( nSlotId )
++    // Horizontal direction depends on whether or not the UI language is RTL.
++    SCsCOL nMovX = Application::GetSettings().GetLayoutRTL() ? -1 : 1;
++
++    switch (nSlotId)
+     {
+-        case SID_CURSORDOWN_SEL:		rReq.SetSlot( SID_CURSORDOWN );  break;
+-        case SID_CURSORBLKDOWN_SEL:		rReq.SetSlot( SID_CURSORBLKDOWN );  break;
+-        case SID_CURSORUP_SEL:			rReq.SetSlot( SID_CURSORUP );  break;
+-        case SID_CURSORBLKUP_SEL:		rReq.SetSlot( SID_CURSORBLKUP );  break;
+-        case SID_CURSORLEFT_SEL:		rReq.SetSlot( SID_CURSORLEFT );  break;
+-        case SID_CURSORBLKLEFT_SEL:		rReq.SetSlot( SID_CURSORBLKLEFT );  break;
+-        case SID_CURSORRIGHT_SEL:		rReq.SetSlot( SID_CURSORRIGHT );  break;
+-        case SID_CURSORBLKRIGHT_SEL:	rReq.SetSlot( SID_CURSORBLKRIGHT );  break;
+-        case SID_CURSORPAGEDOWN_SEL:	rReq.SetSlot( SID_CURSORPAGEDOWN );  break;
+-        case SID_CURSORPAGEUP_SEL:		rReq.SetSlot( SID_CURSORPAGEUP );  break;
+-        case SID_CURSORPAGERIGHT_SEL:	rReq.SetSlot( SID_CURSORPAGERIGHT_ );  break;
+-        case SID_CURSORPAGELEFT_SEL:	rReq.SetSlot( SID_CURSORPAGELEFT_ );  break;
++        case SID_CURSORDOWN_SEL:
++            pViewShell->ExpandBlock(0, 1, SC_FOLLOW_LINE);
++        break;
++        case SID_CURSORUP_SEL:
++            pViewShell->ExpandBlock(0, -1, SC_FOLLOW_LINE);
++        break;
++        case SID_CURSORRIGHT_SEL:
++            pViewShell->ExpandBlock(nMovX, 0, SC_FOLLOW_LINE);
++        break;
++        case SID_CURSORLEFT_SEL:
++            pViewShell->ExpandBlock(-nMovX, 0, SC_FOLLOW_LINE);
++        break;
++        case SID_CURSORPAGEUP_SEL:
++            pViewShell->ExpandBlockPage(0, -1);
++        break;
++        case SID_CURSORPAGEDOWN_SEL:
++            pViewShell->ExpandBlockPage(0, 1);
++        break;
++        case SID_CURSORPAGERIGHT_SEL:
++            pViewShell->ExpandBlockPage(nMovX, 0);
++        break;
++        case SID_CURSORPAGELEFT_SEL:
++            pViewShell->ExpandBlockPage(-nMovX, 0);
++        break;
++        case SID_CURSORBLKDOWN_SEL:
++            pViewShell->ExpandBlockArea(0, 1);
++        break;
++        case SID_CURSORBLKUP_SEL:
++            pViewShell->ExpandBlockArea(0, -1);
++        break;
++        case SID_CURSORBLKRIGHT_SEL:
++            pViewShell->ExpandBlockArea(nMovX, 0);
++        break;
++        case SID_CURSORBLKLEFT_SEL:
++            pViewShell->ExpandBlockArea(-nMovX, 0);
++        break;
+         default:
+-            DBG_ERROR("Unbekannte Message bei ViewShell (CursorSel)");
+-            return;
++            ;
+     }
+-    rReq.AppendItem( SfxInt16Item(FN_PARAM_1, nRepeat ) );
+-    rReq.AppendItem( SfxBoolItem(FN_PARAM_2, TRUE) );
+-    ExecuteSlot( rReq, GetInterface() );
++    pViewShell->ShowAllCursors();
+ }
+ 
+ void ScCellShell::ExecuteMove( SfxRequest& rReq )
+@@ -348,7 +406,6 @@ void ScCellShell::ExecutePage( SfxRequest& rReq )
+         {
+             // ADD mode: keep the selection, start a new block when marking with shift again
+             bKeep = TRUE;
+-            pTabViewShell->SetNewStartIfMarking();
+         }
+     }
+ 
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index ad12e86..b5bb7c6 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -2200,8 +2200,12 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
+             }
+ 
+             SfxStringItem aPosItem( SID_CURRENTCELL, aAddr );
++            // We don't want to align to the cursor position because if the 
++            // cell cursor isn't visible after making selection, it would jump
++            // back to the origin of the selection where the cell cursor is.
++            SfxBoolItem aAlignCursorItem( FN_PARAM_2, false );
+             pDisp->Execute( SID_CURRENTCELL, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+-                                        &aPosItem, (void*)0L );
++                                        &aPosItem, &aAlignCursorItem, (void*)0L );
+ 
+             pViewData->GetView()->InvalidateAttribs();
+         }
+@@ -3960,7 +3960,10 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
+                 if ( bDone )
+                 {
+                     pView->MarkRange( aDest, FALSE, FALSE );
+-                    pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
++
++                    SCCOL nDCol = pViewData->GetCurX() - aSource.aStart.Col();
++                    SCROW nDRow = pViewData->GetCurY() - aSource.aStart.Row();
++                    pView->SetCursor( aDest.aStart.Col() + nDCol, aDest.aStart.Row() + nDRow );
+                 }
+ 
+                 pDocSh->GetUndoManager()->LeaveListAction();
+@@ -4068,7 +4071,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
+                     pView->EnterMatrix( aFormula );
+ 
+                     pView->MarkRange( aDest, FALSE, FALSE );
+-                    pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
++                    pView->SetCursor( aDest.aStart.Col(), aDest.aStart.Row() );
+                 }
+ 
+                 pDocSh->GetUndoManager()->LeaveListAction();
+@@ -4102,7 +4105,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
+                 if ( bDone )
+                 {
+                     pView->MarkRange( aDest, FALSE, FALSE );
+-                    pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
++                    pView->SetCursor( aDest.aStart.Col(), aDest.aStart.Row() );
+                 }
+             }
+ 
+diff --git sc/source/ui/view/select.cxx sc/source/ui/view/select.cxx
+index d41fe45..e983ca9 100644
+--- sc/source/ui/view/select.cxx
++++ sc/source/ui/view/select.cxx
+@@ -667,7 +667,10 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
+                 }
+             }
+             if (bStarted)
++                // If the selection is already started, don't set the cursor.
+                 pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab, FALSE, FALSE, TRUE );
++            else
++                pView->SetCursor( (SCCOL) nPosX, (SCROW) nPosY );
+         }
+         else
+         {
+@@ -703,9 +706,9 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
+                 
+                 bStarted = TRUE;
+             }
++            pView->SetCursor( (SCCOL) nPosX, (SCROW) nPosY );
+         }
+ 
+-        pView->SetCursor( (SCCOL) nPosX, (SCROW) nPosY );
+         pViewData->SetRefStart( nPosX, nPosY, nTab );
+         if (bHideCur)
+             pView->ShowAllCursors();
+diff --git sc/source/ui/view/tabview.cxx sc/source/ui/view/tabview.cxx
+index dacaee8..5274b50 100644
+--- sc/source/ui/view/tabview.cxx
++++ sc/source/ui/view/tabview.cxx
+@@ -384,7 +384,6 @@ BOOL lcl_HasRowOutline( const ScViewData& rViewData )
+             bInActivatePart( FALSE ),										\
+             bInZoomUpdate( FALSE ),											\
+-             bMoveIsShift( FALSE ),											\
+-            bNewStartIfMarking( FALSE )
++             bMoveIsShift( FALSE )
+ 
+ 
+ ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) :
+diff --git sc/source/ui/view/tabview2.cxx sc/source/ui/view/tabview2.cxx
+index bd9515c..bd744e4 100644
+--- sc/source/ui/view/tabview2.cxx
++++ sc/source/ui/view/tabview2.cxx
+@@ -62,6 +62,7 @@
+ #include "waitoff.hxx"
+ #include "globstr.hrc"
+ #include "scmod.hxx"
++#include "tabprotection.hxx"
+ 
+ #define SC_BLOCKMODE_NONE		0
+ #define SC_BLOCKMODE_NORMAL		1
+@@ -178,16 +179,9 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
+         InvertBlockMark( nBlockStartX,nBlockStartY,nBlockEndX,nBlockEndY );
+ #endif
+         UpdateSelectionOverlay();
+-
+-        bNewStartIfMarking = FALSE;		// use only once
+     }
+ }
+ 
+-void ScTabView::SetNewStartIfMarking()
+-{
+-    bNewStartIfMarking = TRUE;
+-}
+-
+ void ScTabView::DoneBlockMode( BOOL bContinue )            // Default FALSE
+ {
+     //	Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird,
+@@ -414,6 +408,305 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
+         aHdrFunc.SetAnchorFlag( FALSE );
+ }
+ 
++void ScTabView::GetPageMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, SCsCOL& rPageX, SCsROW& rPageY)
++{
++    SCCOL nCurX;
++    SCROW nCurY;
++    aViewData.GetMoveCursor( nCurX,nCurY );
++
++    ScSplitPos eWhich = aViewData.GetActivePart();
++    ScHSplitPos eWhichX = WhichH( eWhich );
++    ScVSplitPos eWhichY = WhichV( eWhich );
++
++    SCsCOL nPageX;
++    SCsROW nPageY;
++    if (nMovX >= 0)
++        nPageX = ((SCsCOL) aViewData.CellsAtX( nCurX, 1, eWhichX )) * nMovX;
++    else
++        nPageX = ((SCsCOL) aViewData.CellsAtX( nCurX, -1, eWhichX )) * nMovX;
++
++    if (nMovY >= 0)
++        nPageY = ((SCsROW) aViewData.CellsAtY( nCurY, 1, eWhichY )) * nMovY;
++    else
++        nPageY = ((SCsROW) aViewData.CellsAtY( nCurY, -1, eWhichY )) * nMovY;
++
++    if (nMovX != 0 && nPageX == 0) nPageX = (nMovX>0) ? 1 : -1;
++    if (nMovY != 0 && nPageY == 0) nPageY = (nMovY>0) ? 1 : -1;
++
++    rPageX = nPageX;
++    rPageY = nPageY;
++}
++
++void ScTabView::GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, 
++                                       SCsCOL& rAreaX, SCsROW& rAreaY, ScFollowMode& rMode)
++{
++    SCCOL nNewX = -1;
++    SCROW nNewY = -1;
++    SCCOL nCurX = -1;
++    SCROW nCurY = -1;
++
++    if (aViewData.IsRefMode())
++    {
++        nNewX = aViewData.GetRefEndX();
++        nNewY = aViewData.GetRefEndY();
++    }
++    else if (IsBlockMode())
++    {
++        nNewX = nBlockEndX;
++        nNewY = nBlockEndY;
++    }
++    else
++    {
++        nNewX = nCurX = aViewData.GetCurX();
++        nNewY = nCurY = aViewData.GetCurY();
++    }
++
++    ScDocument* pDoc = aViewData.GetDocument();
++    SCTAB nTab = aViewData.GetTabNo();
++
++    //  FindAreaPos kennt nur -1 oder 1 als Richtung
++
++    SCsCOLROW i;
++    if ( nMovX > 0 )
++        for ( i=0; i<nMovX; i++ )
++            pDoc->FindAreaPos( nNewX, nNewY, nTab,  1,  0 );
++    if ( nMovX < 0 )
++        for ( i=0; i<-nMovX; i++ )
++            pDoc->FindAreaPos( nNewX, nNewY, nTab, -1,  0 );
++    if ( nMovY > 0 )
++        for ( i=0; i<nMovY; i++ )
++            pDoc->FindAreaPos( nNewX, nNewY, nTab,  0,  1 );
++    if ( nMovY < 0 )
++        for ( i=0; i<-nMovY; i++ )
++            pDoc->FindAreaPos( nNewX, nNewY, nTab,  0, -1 );
++
++    if (eMode==SC_FOLLOW_JUMP)                  // unten/rechts nicht zuviel grau anzeigen
++    {
++        if (nMovX != 0 && nNewX == MAXCOL)
++            eMode = SC_FOLLOW_LINE;
++        if (nMovY != 0 && nNewY == MAXROW)
++            eMode = SC_FOLLOW_LINE;
++    }
++
++    if (aViewData.IsRefMode())
++    {
++        rAreaX = nNewX - aViewData.GetRefEndX();
++        rAreaY = nNewY - aViewData.GetRefEndY();
++    }
++    else if (IsBlockMode())
++    {
++        rAreaX = nNewX - nBlockEndX;
++        rAreaY = nNewY - nBlockEndY;
++    }
++    else
++    {
++        rAreaX = nNewX - nCurX;
++        rAreaY = nNewY - nCurY;
++    }
++    rMode = eMode;
++}
++
++namespace {
++
++bool lcl_isCellQualified(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, bool bSelectLocked, bool bSelectUnlocked)
++{
++    bool bCellProtected = pDoc->HasAttrib(
++        nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_PROTECTED);
++
++    if (bCellProtected && !bSelectLocked)
++        return false;
++
++    if (!bCellProtected && !bSelectUnlocked)
++        return false;
++
++    return true;
++}
++
++void lcl_moveCursorByProtRule(
++    SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, SCTAB nTab, ScDocument* pDoc)
++{
++    bool bSelectLocked = true;
++    bool bSelectUnlocked = true;
++    ScTableProtection* pTabProtection = pDoc->GetTabProtection(nTab);
++    if (pTabProtection && pTabProtection->isProtected())
++    {
++        bSelectLocked   = pTabProtection->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS);
++        bSelectUnlocked = pTabProtection->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);
++    }
++
++    if (nMovX > 0)
++    {
++        if (rCol < MAXCOL)
++        {
++            for (SCCOL i = 0; i < nMovX; ++i)
++            {
++                if (!lcl_isCellQualified(pDoc, rCol+1, rRow, nTab, bSelectLocked, bSelectUnlocked))
++                    break;
++                ++rCol;
++            }
++        }
++    }
++    else if (nMovX < 0)
++    {
++        if (rCol > 0)
++        {
++            nMovX = -nMovX;
++            for (SCCOL i = 0; i < nMovX; ++i)
++            {
++                if (!lcl_isCellQualified(pDoc, rCol-1, rRow, nTab, bSelectLocked, bSelectUnlocked))
++                    break;
++                --rCol;
++            }
++        }
++    }
++
++    if (nMovY > 0)
++    {
++        if (rRow < MAXROW)
++        {
++            for (SCROW i = 0; i < nMovY; ++i)
++            {
++                if (!lcl_isCellQualified(pDoc, rCol, rRow+1, nTab, bSelectLocked, bSelectUnlocked))
++                    break;
++                ++rRow;
++            }
++        }
++    }
++    else if (nMovY < 0)
++    {
++        if (rRow > 0)
++        {
++            nMovY = -nMovY;
++            for (SCROW i = 0; i < nMovY; ++i)
++            {
++                if (!lcl_isCellQualified(pDoc, rCol, rRow-1, nTab, bSelectLocked, bSelectUnlocked))
++                    break;
++                --rRow;
++            }
++        }
++    }
++}
++
++}
++
++void ScTabView::ExpandBlock(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode)
++{
++    if (!nMovX && !nMovY)
++        // Nothing to do.  Bail out.
++        return;
++
++    ScTabViewShell* pViewShell = aViewData.GetViewShell();
++    bool bRefInputMode = pViewShell && pViewShell->IsRefInputMode();
++    if (bRefInputMode && !aViewData.IsRefMode())
++        // initialize formula reference mode if it hasn't already.
++        InitRefMode(aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo(), SC_REFTYPE_REF);
++
++    ScDocument* pDoc = aViewData.GetDocument();
++
++    if (aViewData.IsRefMode())
++    {
++        // formula reference mode
++
++        SCCOL nNewX = aViewData.GetRefEndX();
++        SCROW nNewY = aViewData.GetRefEndY();
++        SCTAB nRefTab = aViewData.GetRefEndZ();
++
++        bool bSelectLocked = true;
++        bool bSelectUnlocked = true;
++        ScTableProtection* pTabProtection = pDoc->GetTabProtection(nRefTab);
++        if (pTabProtection && pTabProtection->isProtected())
++        {
++            bSelectLocked   = pTabProtection->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS);
++            bSelectUnlocked = pTabProtection->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);
++        }
++
++        lcl_moveCursorByProtRule(nNewX, nNewY, nMovX, nMovY, nRefTab, pDoc);
++
++        if (nMovX)
++        {
++            SCCOL nTempX = nNewX;
++            while (pDoc->IsHorOverlapped(nTempX, nNewY, nRefTab))
++            {
++                if (nMovX > 0)
++                    ++nTempX;
++                else
++                    --nTempX;
++            }
++            if (lcl_isCellQualified(pDoc, nTempX, nNewY, nRefTab, bSelectLocked, bSelectUnlocked))
++                nNewX = nTempX;
++        }
++
++        if (nMovY)
++        {
++            SCROW nTempY = nNewY;
++            while (pDoc->IsVerOverlapped(nNewX, nTempY, nRefTab))
++            {
++                if (nMovY > 0)
++                    ++nTempY;
++                else
++                    --nTempY;
++            }
++            if (lcl_isCellQualified(pDoc, nNewX, nTempY, nRefTab, bSelectLocked, bSelectUnlocked))
++                nNewY = nTempY;
++        }
++
++        pDoc->SkipOverlapped(nNewX, nNewY, nRefTab);
++        UpdateRef(nNewX, nNewY, nRefTab);
++        AlignToCursor(nNewX, nNewY, eMode);
++    }
++    else
++    {
++        // normal selection mode
++
++        SCTAB nTab = aViewData.GetTabNo();
++
++        if (!IsBlockMode())
++            InitBlockMode(aViewData.GetCurX(), aViewData.GetCurY(), nTab, true);
++
++        lcl_moveCursorByProtRule(nBlockEndX, nBlockEndY, nMovX, nMovY, nTab, pDoc);
++    
++        if (nBlockEndX < 0)
++            nBlockEndX = 0;
++        else if (nBlockEndX > MAXCOL) 
++            nBlockEndX = MAXCOL;
++    
++        if (nBlockEndY < 0)
++            nBlockEndY = 0;
++        else if (nBlockEndY > MAXROW)
++            nBlockEndY = MAXROW;
++    
++        pDoc->SkipOverlapped(nBlockEndX, nBlockEndY, nTab);
++        MarkCursor(nBlockEndX, nBlockEndY, nTab, false, false, true);
++
++        // Check if the entire row(s) or column(s) are selected.
++        ScSplitPos eActive = aViewData.GetActivePart();
++        bool bRowSelected = (nBlockStartX == 0 && nBlockEndX == MAXCOL);
++        bool bColSelected = (nBlockStartY == 0 && nBlockEndY == MAXROW);
++        SCsCOL nAlignX = bRowSelected ? aViewData.GetPosX(WhichH(eActive)) : nBlockEndX;
++        SCsROW nAlignY = bColSelected ? aViewData.GetPosY(WhichV(eActive)) : nBlockEndY;
++        AlignToCursor(nAlignX, nAlignY, eMode);
++
++        UpdateAutoFillMark();
++    }
++}
++
++void ScTabView::ExpandBlockPage(SCsCOL nMovX, SCsROW nMovY)
++{
++    SCsCOL nPageX;
++    SCsROW nPageY;
++    GetPageMoveEndPosition(nMovX, nMovY, nPageX, nPageY);
++    ExpandBlock(nPageX, nPageY, SC_FOLLOW_FIX);
++}
++
++void ScTabView::ExpandBlockArea(SCsCOL nMovX, SCsROW nMovY)
++{
++    SCsCOL nAreaX;
++    SCsROW nAreaY;
++    ScFollowMode eMode;
++    GetAreaMoveEndPosition(nMovX, nMovY, SC_FOLLOW_JUMP, nAreaX, nAreaY, eMode);
++    ExpandBlock(nAreaX, nAreaY, eMode);
++}
++
+ void ScTabView::UpdateSelectionOverlay()
+ {
+     for (USHORT i=0; i<4; i++)
+diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
+index 1b4879c..da85e44 100644
+--- sc/source/ui/view/tabview3.cxx
++++ sc/source/ui/view/tabview3.cxx
+@@ -125,10 +125,7 @@ void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl )
+ {
+     ScDocument* pDoc = aViewData.GetDocument();
+     SCTAB nTab = aViewData.GetTabNo();
+-    while (pDoc->IsHorOverlapped( nPosX, nPosY, nTab ))		//! ViewData !!!
+-        --nPosX;
+-    while (pDoc->IsVerOverlapped( nPosX, nPosY, nTab ))
+-        --nPosY;
++	pDoc->SkipOverlapped(nPosX, nPosY, nTab);
+ 
+     BOOL bRefMode = SC_MOD()->IsFormulaMode();
+ 
+@@ -921,22 +918,36 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
+ 
+     HideAllCursors();
+ 
+-    if ( bShift && bNewStartIfMarking && IsBlockMode() )
+-    {
+-        //	used for ADD selection mode: start a new block from the cursor position
+-        DoneBlockMode( TRUE );
+-        InitBlockMode( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo(), TRUE );
+-    }
+-
+         //	aktiven Teil umschalten jetzt in AlignToCursor
+ 
+     AlignToCursor( nCurX, nCurY, eMode );
+     //!		auf OS/2: SC_FOLLOW_JUMP statt SC_FOLLOW_LINE, um Nachlaufen zu verhindern ???
+ 
+     if (bKeepSel)
++    {    
+         SetCursor( nCurX, nCurY );		// Markierung stehenlassen
++
++        // If the cursor is in existing selection, it's a cursor movement by 
++        // ENTER or TAB.  If not, then it's a new selection during ADD
++        // selection mode.
++
++        const ScMarkData& rMark = aViewData.GetMarkData();
++        ScRangeList aSelList;
++        rMark.FillRangeListWithMarks(&aSelList, false);
++        if (!aSelList.In(ScRange(nCurX, nCurY, aViewData.GetTabNo())))
++            // Cursor not in existing selection.  Start a new selection.
++            DoneBlockMode(true);
++    }
+     else
+     {
++        if (!bShift)
++        {
++            // Remove all marked data on cursor movement unless the Shift is locked.
++            ScMarkData aData(aViewData.GetMarkData());
++            aData.ResetMark();
++            SetMarkData(aData);
++        }
++
+         BOOL bSame = ( nCurX == aViewData.GetCurX() && nCurY == aViewData.GetCurY() );
+         bMoveIsShift = bShift;
+         pSelEngine->CursorPosChanging( bShift, bControl );
+@@ -1080,68 +1091,18 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+ 
+ void ScTabView::MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel )
+ {
+-    SCCOL nCurX;
+-    SCROW nCurY;
+-    aViewData.GetMoveCursor( nCurX,nCurY );
+-
+-    ScSplitPos eWhich = aViewData.GetActivePart();
+-    ScHSplitPos eWhichX = WhichH( eWhich );
+-    ScVSplitPos eWhichY = WhichV( eWhich );
+-
+     SCsCOL nPageX;
+     SCsROW nPageY;
+-    if (nMovX >= 0)
+-        nPageX = ((SCsCOL) aViewData.CellsAtX( nCurX, 1, eWhichX )) * nMovX;
+-    else
+-        nPageX = ((SCsCOL) aViewData.CellsAtX( nCurX, -1, eWhichX )) * nMovX;
+-
+-    if (nMovY >= 0)
+-        nPageY = ((SCsROW) aViewData.CellsAtY( nCurY, 1, eWhichY )) * nMovY;
+-    else
+-        nPageY = ((SCsROW) aViewData.CellsAtY( nCurY, -1, eWhichY )) * nMovY;
+-
+-    if (nMovX != 0 && nPageX == 0) nPageX = (nMovX>0) ? 1 : -1;
+-    if (nMovY != 0 && nPageY == 0) nPageY = (nMovY>0) ? 1 : -1;
+-
++    GetPageMoveEndPosition(nMovX, nMovY, nPageX, nPageY);
+     MoveCursorRel( nPageX, nPageY, eMode, bShift, bKeepSel );
+ }
+ 
+ void ScTabView::MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel )
+ {
+-    SCCOL nCurX;
+-    SCROW nCurY;
+-    aViewData.GetMoveCursor( nCurX,nCurY );
+-    SCCOL nNewX = nCurX;
+-    SCROW nNewY = nCurY;
+-
+-    ScDocument* pDoc = aViewData.GetDocument();
+-    SCTAB nTab = aViewData.GetTabNo();
+-
+-    //	FindAreaPos kennt nur -1 oder 1 als Richtung
+-
+-    SCsCOLROW i;
+-    if ( nMovX > 0 )
+-        for ( i=0; i<nMovX; i++ )
+-            pDoc->FindAreaPos( nNewX, nNewY, nTab,  1,  0 );
+-    if ( nMovX < 0 )
+-        for ( i=0; i<-nMovX; i++ )
+-            pDoc->FindAreaPos( nNewX, nNewY, nTab, -1,  0 );
+-    if ( nMovY > 0 )
+-        for ( i=0; i<nMovY; i++ )
+-            pDoc->FindAreaPos( nNewX, nNewY, nTab,  0,  1 );
+-    if ( nMovY < 0 )
+-        for ( i=0; i<-nMovY; i++ )
+-            pDoc->FindAreaPos( nNewX, nNewY, nTab,  0, -1 );
+-
+-    if (eMode==SC_FOLLOW_JUMP)					// unten/rechts nicht zuviel grau anzeigen
+-    {
+-        if (nMovX != 0 && nNewX == MAXCOL)
+-            eMode = SC_FOLLOW_LINE;
+-        if (nMovY != 0 && nNewY == MAXROW)
+-            eMode = SC_FOLLOW_LINE;
+-    }
+-
+-    MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, eMode, bShift, bKeepSel );
++    SCsCOL nNewX;
++    SCsROW nNewY;
++    GetAreaMoveEndPosition(nMovX, nMovY, eMode, nNewX, nNewY, eMode);
++    MoveCursorRel(nNewX, nNewY, eMode, bShift, bKeepSel);
+ }
+ 
+ void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel )
+@@ -1206,14 +1167,8 @@ void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode
+     else if (nMovY>0)
+         nNewY=nPosY+nAddY;
+ 
+-//	aViewData.ResetOldCursor();
+     aViewData.SetOldCursor( nNewX,nNewY );
+-
+-    while (pDoc->IsHorOverlapped( nNewX, nNewY, nTab ))
+-        --nNewX;
+-    while (pDoc->IsVerOverlapped( nNewX, nNewY, nTab ))
+-        --nNewY;
+-
++	pDoc->SkipOverlapped(nNewX, nNewY, nTab);
+     MoveCursorAbs( nNewX, nNewY, eMode, bShift, FALSE, TRUE );
+ }
+ 
+@@ -1497,11 +1452,7 @@ void ScTabView::MarkRange( const ScRange& rRange, BOOL bSetCursor, BOOL bContinu
+         SCCOL nPosX = rRange.aStart.Col();
+         SCROW nPosY = rRange.aStart.Row();
+         ScDocument* pDoc = aViewData.GetDocument();
+-
+-        while (pDoc->IsHorOverlapped( nPosX, nPosY, nTab ))		//! ViewData !!!
+-            --nPosX;
+-        while (pDoc->IsVerOverlapped( nPosX, nPosY, nTab ))
+-            --nPosY;
++		pDoc->SkipOverlapped(nPosX, nPosY, nTab);
+ 
+         aViewData.ResetOldCursor();
+         SetCursor( nPosX, nPosY );
+diff --git sc/source/ui/view/tabvwsh3.cxx sc/source/ui/view/tabvwsh3.cxx
+index caea267..74505f4 100644
+--- sc/source/ui/view/tabvwsh3.cxx
++++ sc/source/ui/view/tabvwsh3.cxx
+@@ -276,6 +276,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
+                 if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET )
+                     bUnmark = ((const SfxBoolItem*)pItem)->GetValue();
+ 
++                bool bAlignToCursor = true;
++                if (pReqArgs->GetItemState(FN_PARAM_2, true, &pItem) == SFX_ITEM_SET)
++                    bAlignToCursor = static_cast<const SfxBoolItem*>(pItem)->GetValue();
++
+                 if ( nSlot == SID_JUMPTOMARK )
+                 {
+                     //	#106586# URL has to be decoded for escaped characters (%20)
+@@ -396,10 +396,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
+                     // und Cursor setzen
+ 
+                     // zusammengefasste Zellen beruecksichtigen:
+-                    while ( pDoc->IsHorOverlapped( nCol, nRow, nTab ) )		//! ViewData !!!
+-                        --nCol;
+-                    while ( pDoc->IsVerOverlapped( nCol, nRow, nTab ) )
+-                        --nRow;
++                    pDoc->SkipOverlapped(nCol, nRow, nTab);
+ 
+                     //	Navigator-Aufrufe sind nicht API!!!
+ 
+@@ -417,9 +421,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
+                         if (!rReq.IsAPI())
+                             rReq.Done();
+                     }
+-                    // align to cursor even if the cursor position hasn't changed, 
+-                    // because the cursor may be set outside the visible area.
+-                    AlignToCursor( nCol, nRow, SC_FOLLOW_JUMP );
++
++                    if (bAlignToCursor)
++                    {
++                        // align to cursor even if the cursor position hasn't changed, 
++                        // because the cursor may be set outside the visible area.
++                        AlignToCursor( nCol, nRow, SC_FOLLOW_JUMP );
++                    }
+ 
+                     rReq.SetReturnValue( SfxStringItem( SID_CURRENTCELL, aAddress ) );
+                 }
+diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
+index f69ab24..66c07c4 100644
+--- sc/source/ui/view/viewdata.cxx
++++ sc/source/ui/view/viewdata.cxx
+@@ -1891,12 +1891,11 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
+     {
+         //!	public Methode um Position anzupassen
+ 
+-        BOOL bHOver = FALSE;
+-        while (pDoc->IsHorOverlapped( rPosX, rPosY, nTabNo ))
+-            { --rPosX; bHOver=TRUE; }
+-        BOOL bVOver = FALSE;
+-        while (pDoc->IsVerOverlapped( rPosX, rPosY, nTabNo ))
+-            { --rPosY; bVOver=TRUE; }
++        SCCOL nOrigX = rPosX;
++        SCROW nOrigY = rPosY;
++        pDoc->SkipOverlapped(rPosX, rPosY, nTabNo);
++        bool bHOver = (nOrigX != rPosX);
++        bool bVOver = (nOrigY != rPosY);
+ 
+         if ( bRepair && ( bHOver || bVOver ) )
+         {
diff --git a/applied_patches/0462-calc-cursor-split-view.diff b/applied_patches/0175-calc-cursor-split-view.diff
similarity index 100%
rename from applied_patches/0462-calc-cursor-split-view.diff
rename to applied_patches/0175-calc-cursor-split-view.diff
diff --git a/applied_patches/0176-calc-autofilter-shrink-selection.diff b/applied_patches/0176-calc-autofilter-shrink-selection.diff
new file mode 100644
index 000000000..a4c6df7aa
--- /dev/null
+++ b/applied_patches/0176-calc-autofilter-shrink-selection.diff
@@ -0,0 +1,13 @@
+diff --git sc/source/ui/view/dbfunc.cxx sc/source/ui/view/dbfunc.cxx
+index fa05fa6..326e611 100644
+--- sc/source/ui/view/dbfunc.cxx
++++ sc/source/ui/view/dbfunc.cxx
+@@ -302,7 +302,7 @@ void ScDBFunc::ToggleAutoFilter()
+ 
+     ScQueryParam	aParam;
+     ScDocument*		pDoc	= GetViewData()->GetDocument();
+-    ScDBData*		pDBData = GetDBData( FALSE );
++    ScDBData*		pDBData = GetDBData(false, SC_DB_MAKE, false, true);
+ 
+     pDBData->SetByRow( TRUE );				//! Undo, vorher abfragen ??
+     pDBData->GetQueryParam( aParam );
diff --git a/applied_patches/0177-calc-xls-import-array-size.diff b/applied_patches/0177-calc-xls-import-array-size.diff
new file mode 100644
index 000000000..444415c68
--- /dev/null
+++ b/applied_patches/0177-calc-xls-import-array-size.diff
@@ -0,0 +1,289 @@
+diff --git sc/source/filter/excel/excform.cxx sc/source/filter/excel/excform.cxx
+index e412270..e71c60e 100644
+--- sc/source/filter/excel/excform.cxx
++++ sc/source/filter/excel/excform.cxx
+@@ -136,7 +136,7 @@ void ImportExcel::Formula( const XclAddress& rXclPos,
+             bConvert = TRUE;
+ 
+         if( bConvert )
+-            eErr = pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
++            eErr = pFormConv->Convert( pErgebnis, maStrm, nFormLen, ExcelToSc::ConvertParam(), FT_CellFormula);
+ 
+         ScFormulaCell*		pZelle = NULL;
+ 
+@@ -201,7 +201,8 @@ void ExcelToSc::GetDummy( const ScTokenArray*& pErgebnis )
+ // if bAllowArrays is false stream seeks to first byte after <nFormulaLen>
+ // otherwise it will seek to the first byte after the additional content (eg
+ // inline arrays) following <nFormulaLen>
+-ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT )
++ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, sal_Size nFormulaLen, 
++                            const ConvertParam& rParam, const FORMULA_TYPE eFT )
+ {
+     RootData&       rR = GetOldRoot();
+     BYTE			nOp, nLen, nByte;
+@@ -472,7 +473,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
+             case 0x20: // Array Constant						[317 268]
+                 aIn >> nByte >> nUINT16;
+                 aIn.Ignore( (meBiff == EXC_BIFF2) ? 3 : 4 );
+-                if( bAllowArrays )
++                if( rParam.mbAllowArrays )
+                 {
+                     SCSIZE nC = nByte ? nByte : 256;
+                     SCSIZE nR = nUINT16;
+diff --git sc/source/filter/excel/excform8.cxx sc/source/filter/excel/excform8.cxx
+index 4edef1a..63fe148 100644
+--- sc/source/filter/excel/excform8.cxx
++++ sc/source/filter/excel/excform8.cxx
+@@ -97,7 +97,8 @@ bool ExcelToSc8::Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLas
+ 
+ // if bAllowArrays is false stream seeks to first byte after <nFormulaLen>
+ // otherwise it will seek to the first byte past additional content after <nFormulaLen>
+-ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT )
++ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, sal_Size nFormulaLen, 
++                             const ConvertParam& rParam, const FORMULA_TYPE eFT )
+ {
+     BYTE					nOp, nLen, nByte;
+     UINT16                  nUINT16;
+@@ -393,12 +394,17 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
+             case 0x20: // Array Constant						[317 268]
+                 aIn >> nByte >> nUINT16;
+                 aIn.Ignore( 4 );
+-                if( bAllowArrays )
++                if (rParam.mbAllowArrays)
+                 {
+-                    SCSIZE nC = nByte + 1;
+-                    SCSIZE nR = nUINT16 + 1;
+-
+-                    aStack << aPool.StoreMatrix( nC, nR );
++                    SCSIZE nC = rParam.mnArrayColSize;
++                    SCSIZE nR = rParam.mnArrayRowSize;
++                    if (!nC || !nR)
++                    {
++                        // Stored array size is invalid.  Get that from the formula.
++                        nC = nByte + 1;
++                        nR = nUINT16 + 1;
++                    }
++                    aStack << aPool.StoreMatrix(nC, nR);
+                     aExtensions.push_back( EXTENSION_ARRAY );
+                 }
+                 else
+diff --git sc/source/filter/excel/frmbase.cxx sc/source/filter/excel/frmbase.cxx
+index 42f9037..a808a96 100644
+--- sc/source/filter/excel/frmbase.cxx
++++ sc/source/filter/excel/frmbase.cxx
+@@ -258,6 +258,12 @@ void ExcelConverterBase::Reset()
+     aEingPos.Set( 0, 0, 0 );
+ }
+ 
++ExcelConverterBase::ConvertParam::ConvertParam() :
++    mbAllowArrays(true),
++    mnArrayColSize(0),
++    mnArrayRowSize(0)
++{
++}
+ 
+ 
+ 
+diff --git sc/source/filter/excel/impop.cxx sc/source/filter/excel/impop.cxx
+index b936e00..c8f397a 100644
+--- sc/source/filter/excel/impop.cxx
++++ sc/source/filter/excel/impop.cxx
+@@ -498,7 +498,9 @@ void ImportExcel::Array25( void )
+ 
+         pFormConv->Reset( ScAddress( static_cast<SCCOL>(nFirstCol),
+                     static_cast<SCROW>(nFirstRow), GetCurrScTab() ) );
+-        pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
++        ExcelConverterBase::ConvertParam aParam;
++        aParam.mbAllowArrays = true;
++        pFormConv->Convert( pErgebnis, maStrm, nFormLen, aParam, FT_CellFormula);
+ 
+         DBG_ASSERT( pErgebnis, "*ImportExcel::Array25(): ScTokenArray ist NULL!" );
+ 
+@@ -797,7 +799,9 @@ void ImportExcel::Shrfmla( void )
+     const ScTokenArray*	pErgebnis;
+ 
+     pFormConv->Reset();
+-    pFormConv->Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula );
++    ExcelConverterBase::ConvertParam aParam;
++    aParam.mbAllowArrays = true;
++    pFormConv->Convert( pErgebnis, maStrm, nLenExpr, aParam, FT_SharedFormula );
+ 
+ 
+     DBG_ASSERT( pErgebnis, "+ImportExcel::Shrfmla(): ScTokenArray ist NULL!" );
+@@ -969,10 +973,14 @@ void ImportExcel::Array34( void )
+     {
+         // jetzt steht Lesemarke auf Formel, Laenge in nFormLen
+         const ScTokenArray*	pErgebnis;
++        ExcelConverterBase::ConvertParam aParam;
++        aParam.mbAllowArrays = true;
++        aParam.mnArrayColSize = nLastCol - nFirstCol + 1;
++        aParam.mnArrayRowSize = nLastRow - nFirstRow + 1;
+ 
+         pFormConv->Reset( ScAddress( static_cast<SCCOL>(nFirstCol),
+                     static_cast<SCROW>(nFirstRow), GetCurrScTab() ) );
+-        pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
++        pFormConv->Convert( pErgebnis, maStrm, nFormLen, aParam, FT_CellFormula);
+ 
+         DBG_ASSERT( pErgebnis, "+ImportExcel::Array34(): ScTokenArray ist NULL!" );
+ 
+diff --git sc/source/filter/excel/xicontent.cxx sc/source/filter/excel/xicontent.cxx
+index 24c1999..0ae264d 100644
+--- sc/source/filter/excel/xicontent.cxx
++++ sc/source/filter/excel/xicontent.cxx
+@@ -597,12 +597,15 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
+     const ScAddress& rPos = maRanges.GetObject( 0 )->aStart;    // assured above that maRanges is not empty
+     ExcelToSc& rFmlaConv = GetOldFmlaConverter();
+ 
++    ExcelConverterBase::ConvertParam aParam;
++    aParam.mbAllowArrays = false;
++
+     ::std::auto_ptr< ScTokenArray > xTokArr1;
+     if( nFmlaSize1 > 0 )
+     {
+         const ScTokenArray* pTokArr = 0;
+         rFmlaConv.Reset( rPos );
+-        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize1, false, FT_RangeName );
++        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize1, aParam, FT_RangeName );
+         // formula converter owns pTokArr -> create a copy of the token array
+         if( pTokArr )
+             xTokArr1.reset( pTokArr->Clone() );
+@@ -613,7 +616,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
+     {
+         const ScTokenArray* pTokArr = 0;
+         rFmlaConv.Reset( rPos );
+-        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize2, false, FT_RangeName );
++        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize2, aParam, FT_RangeName );
+         // formula converter owns pTokArr -> create a copy of the token array
+         if( pTokArr )
+             pTokArr2.reset( pTokArr->Clone() );
+@@ -721,6 +724,9 @@ void XclImpValidation::ReadDV( XclImpStream& rStrm )
+     String aErrorMessage(  rStrm.ReadUniString() );
+     rStrm.SetNulSubstChar();    // back to default
+ 
++    ExcelConverterBase::ConvertParam aParam;
++    aParam.mbAllowArrays = false;
++
+     // formula(s)
+     if( rStrm.GetRecLeft() > 8 )
+     {
+@@ -736,7 +742,7 @@ void XclImpValidation::ReadDV( XclImpStream& rStrm )
+         {
+             const ScTokenArray* pTokArr = 0;
+             rFmlaConv.Reset();
+-            rFmlaConv.Convert( pTokArr, rStrm, nLen, false, FT_RangeName );
++            rFmlaConv.Convert( pTokArr, rStrm, nLen, aParam, FT_RangeName );
+             // formula converter owns pTokArr -> create a copy of the token array
+             if( pTokArr )
+                 xTokArr1.reset( pTokArr->Clone() );
+@@ -751,7 +757,7 @@ void XclImpValidation::ReadDV( XclImpStream& rStrm )
+         {
+             const ScTokenArray* pTokArr = 0;
+             rFmlaConv.Reset();
+-            rFmlaConv.Convert( pTokArr, rStrm, nLen, false, FT_RangeName );
++            rFmlaConv.Convert( pTokArr, rStrm, nLen, aParam, FT_RangeName );
+             // formula converter owns pTokArr -> create a copy of the token array
+             if( pTokArr )
+                 xTokArr2.reset( pTokArr->Clone() );
+diff --git sc/source/filter/excel/xiformula.cxx sc/source/filter/excel/xiformula.cxx
+index 240358e..41ace53 100644
+--- sc/source/filter/excel/xiformula.cxx
++++ sc/source/filter/excel/xiformula.cxx
+@@ -97,7 +97,9 @@ const ScTokenArray* XclImpFmlaCompImpl::CreateFormula(
+     aFmlaStrm.StartNextRecord();
+     const ScTokenArray* pArray = NULL;
+     GetOldFmlaConverter().Reset();
+-    GetOldFmlaConverter().Convert(pArray, aFmlaStrm, aFmlaStrm.GetRecSize(), true);
++    ExcelToSc::ConvertParam aParam;
++    aParam.mbAllowArrays = true;
++    GetOldFmlaConverter().Convert(pArray, aFmlaStrm, aFmlaStrm.GetRecSize(), aParam);
+     return pArray;
+ }
+ 
+diff --git sc/source/filter/excel/xiname.cxx sc/source/filter/excel/xiname.cxx
+index 72f4701..0ad70d5 100644
+--- sc/source/filter/excel/xiname.cxx
++++ sc/source/filter/excel/xiname.cxx
+@@ -180,7 +180,9 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
+         // --- name formula ---
+         // JEG : double check this.  It is clearly false for normal names
+         //  but some of the builtins (sheettitle?) might be able to handle arrays
+-        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize, false, FT_RangeName );
++        ExcelConverterBase::ConvertParam aParam;
++        aParam.mbAllowArrays = false;
++        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize, aParam, FT_RangeName );
+ 
+         // --- auto or advanced filter ---
+         if( (GetBiff() == EXC_BIFF8) && pTokArr && bBuiltIn )
+@@ -208,7 +210,9 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
+     else if( nFmlaSize > 0 )
+     {
+         // regular defined name
+-        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize, true, FT_RangeName );
++        ExcelConverterBase::ConvertParam aParam;
++        aParam.mbAllowArrays = true;
++        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize, aParam, FT_RangeName );
+     }
+ 
+     // 4) *** create a defined name in the Calc document *** ------------------
+diff --git sc/source/filter/inc/excform.hxx sc/source/filter/inc/excform.hxx
+index e80d67c..790174b 100644
+--- sc/source/filter/inc/excform.hxx
++++ sc/source/filter/inc/excform.hxx
+@@ -62,7 +62,8 @@ public:
+                         ExcelToSc( const XclImpRoot& rRoot );
+     virtual				~ExcelToSc();
+     virtual ConvErr     Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen,
+-                                 bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula );
++                                 const ConvertParam& rParam,
++                                 const FORMULA_TYPE eFT = FT_CellFormula );
+ 
+     virtual ConvErr     Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula );
+ 
+@@ -138,7 +139,8 @@ public:
+                         ExcelToSc8( const XclImpRoot& rRoot );
+     virtual				~ExcelToSc8();
+ 
+-    virtual ConvErr     Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula );
++    virtual ConvErr     Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, 
++                                 const ConvertParam& rParam, const FORMULA_TYPE eFT = FT_CellFormula );
+ 
+     virtual ConvErr     Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula );
+ 
+diff --git sc/source/filter/inc/formel.hxx sc/source/filter/inc/formel.hxx
+index 5d3f196..58aa2f4 100644
+--- sc/source/filter/inc/formel.hxx
++++ sc/source/filter/inc/formel.hxx
+@@ -214,8 +214,17 @@ public:
+     void	 			Reset();
+     void                Reset( const ScAddress& rEingPos );
+ 
++    struct ConvertParam
++    {
++        bool    mbAllowArrays;
++        SCSIZE  mnArrayColSize;
++        SCSIZE  mnArrayRowSize;
++
++        ConvertParam();
++    };
++
+     virtual ConvErr     Convert( const ScTokenArray*& rpErg, XclImpStream& rStrm, sal_Size nFormulaLen,
+-                                 bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) = 0;
++                                 const ConvertParam& rParam, const FORMULA_TYPE eFT = FT_CellFormula ) = 0;
+     virtual ConvErr     Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab,
+                                     const FORMULA_TYPE eFT = FT_CellFormula ) = 0;
+ };
+diff --git sc/source/filter/xcl97/XclImpChangeTrack.cxx sc/source/filter/xcl97/XclImpChangeTrack.cxx
+index 0b6b3e3..c20c8ac 100644
+--- sc/source/filter/xcl97/XclImpChangeTrack.cxx
++++ sc/source/filter/xcl97/XclImpChangeTrack.cxx
+@@ -210,7 +210,9 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray*& rpTokenArray, const ScAddres
+     // read the formula, 3D tab refs from extended data
+     const ScTokenArray* pArray = NULL;
+     aFmlConv.Reset( rPosition );
+-    BOOL bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK);	// JEG : Check This
++    ExcelConverterBase::ConvertParam aParam;
++    aParam.mbAllowArrays = false;
++    BOOL bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, aParam, FT_CellFormula) == ConvOK);	// JEG : Check This
+     rpTokenArray = (bOK && pArray) ? new ScTokenArray( *pArray ) : NULL;
+     pStrm->Ignore( 1 );
+ }
diff --git a/applied_patches/0178-calc-html-csv-import-force-text-cell.diff b/applied_patches/0178-calc-html-csv-import-force-text-cell.diff
new file mode 100644
index 000000000..88d28fdb2
--- /dev/null
+++ b/applied_patches/0178-calc-html-csv-import-force-text-cell.diff
@@ -0,0 +1,381 @@
+diff --git sc/inc/column.hxx sc/inc/column.hxx
+index 606602c..a39a958 100644
+--- sc/inc/column.hxx
++++ sc/inc/column.hxx
+@@ -72,6 +72,7 @@ struct ScFunctionData;
+ struct ScFunctionData;
+ struct ScLineFlags;
+ struct ScMergePatternState;
++struct ScSetStringParam;
+ 
+ #define COLUMN_DELTA	4
+ 
+@@ -244,8 +245,7 @@ public:
+                 //	TRUE = Zahlformat gesetzt
+     BOOL		SetString( SCROW nRow, SCTAB nTab, const String& rString,
+ 						   formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO,
+-                           SvNumberFormatter* pFormatter = NULL,
+-                           bool bDetectNumberFormat = true );
++                           ScSetStringParam* pParam = NULL );
+     void		SetValue( SCROW nRow, const double& rVal);
+     void		SetError( SCROW nRow, const USHORT nError);
+ 
+diff --git sc/inc/document.hxx sc/inc/document.hxx
+index 862682c..8d28d82 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -142,6 +142,7 @@ class ScLookupCache;
+ struct ScLookupCacheMapImpl;
+ struct ScClipParam;
+ struct ScClipRangeNameData;
++struct ScSetStringParam;
+ 
+ namespace com { namespace sun { namespace star {
+     namespace lang {
+@@ -736,8 +737,7 @@ public:
+                             ULONG nFormatIndex, BOOL bForceTab = FALSE);
+                     //	return TRUE = Zahlformat gesetzt
+     SC_DLLPUBLIC BOOL           SetString(
+-        SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
+-        SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
++        SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, ScSetStringParam* pParam = NULL );
+     SC_DLLPUBLIC void           SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal );
+     void 			SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError);
+ 
+diff --git sc/inc/stringutil.hxx sc/inc/stringutil.hxx
+index 4ca8629..fd2d7c3 100644
+--- sc/inc/stringutil.hxx
++++ sc/inc/stringutil.hxx
+@@ -32,6 +32,41 @@
+ #define SC_STRINGUTIL_HXX
+ 
+ #include "rtl/ustring.hxx"
++#include "scdllapi.h"
++
++class SvNumberFormatter;
++
++/** 
++ * Store parameters used in the ScDocument::SetString() method.  Various 
++ * options for string-setting operation are specified herein. 
++ */
++struct SC_DLLPUBLIC ScSetStringParam
++{
++    /** 
++     * Stores the pointer to the number formatter instance to be used during 
++     * number format detection.  The caller must manage the life cycle of the 
++     * instance. 
++     */
++    SvNumberFormatter* mpNumFormatter;
++
++    /** 
++     * When true, we try to detect special number format (dates etc) from the 
++     * input string, when false, we only try to detect a basic decimal number 
++     * format. 
++     */
++    bool mbDetectNumberFormat;
++
++    /** 
++     * When true, set the format of the cell to Text when a string cell is 
++     * requested for a number input.  We may want to do this during text file 
++     * import (csv, html etc). 
++     */
++    bool mbSetTextCellFormat; 
++
++    ScSetStringParam();
++};
++
++// ============================================================================
+ 
+ class ScStringUtil
+ {
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index 43163c4..7f8d968 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -85,7 +85,7 @@ struct ScLineFlags;
+ struct ScFunctionData;
+ struct ScLineFlags;
+ class CollatorWrapper;
+-
++struct ScSetStringParam;
+ 
+ class ScTable
+ {
+@@ -274,7 +274,7 @@ public:
+     void		PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell);
+                 //	TRUE = Zahlformat gesetzt
+ 	BOOL		SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
+-                           SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
++                           ScSetStringParam* pParam = NULL );
+     void		SetValue( SCCOL nCol, SCROW nRow, const double& rVal );
+     void 		SetError( SCCOL nCol, SCROW nRow, USHORT nError);
+ 
+diff --git sc/source/core/data/column3.cxx sc/source/core/data/column3.cxx
+index 56e7c1a..a37a53e 100644
+--- sc/source/core/data/column3.cxx
++++ sc/source/core/data/column3.cxx
+@@ -55,6 +55,7 @@
+ #include "detfunc.hxx"			// fuer Notizen bei DeleteRange
+ #include "postit.hxx"
+ #include "stringutil.hxx"
++#include "docpool.hxx"
+ 
+ #include <com/sun/star/i18n/LocaleDataItem.hpp>
+ 
+@@ -1263,7 +1264,7 @@ void ScColumn::StartListeningInArea( SCROW nRow1, SCROW nRow2 )
+ //	TRUE = Zahlformat gesetzt
+ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+                           formula::FormulaGrammar::AddressConvention eConv,
+-                          SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
++                          ScSetStringParam* pParam )
+ {
+     BOOL bNumFmtSet = FALSE;
+     if (VALIDROW(nRow))
+@@ -1272,11 +1273,15 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+         BOOL bIsLoading = FALSE;
+         if (rString.Len() > 0)
+         {
++            ScSetStringParam aParam;
++            if (pParam)
++                aParam = *pParam;
++
+             double nVal;
+             sal_uInt32 nIndex, nOldIndex = 0;
+             sal_Unicode cFirstChar;
+-            if (!pFormatter)
+-                pFormatter = pDocument->GetFormatTable();
++            if (!aParam.mpNumFormatter)
++                aParam.mpNumFormatter = pDocument->GetFormatTable();
+             SfxObjectShell* pDocSh = pDocument->GetDocumentShell();
+             if ( pDocSh )
+                 bIsLoading = pDocSh->IsLoading();
+@@ -1285,7 +1290,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+             {
+                 nIndex = nOldIndex = GetNumberFormat( nRow );
+                 if ( rString.Len() > 1
+-                        && pFormatter->GetType(nIndex) != NUMBERFORMAT_TEXT )
++                        && aParam.mpNumFormatter->GetType(nIndex) != NUMBERFORMAT_TEXT )
+                     cFirstChar = rString.GetChar(0);
+                 else
+                     cFirstChar = 0;								// Text
+@@ -1341,7 +1346,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+                     }
+                     // nIndex fuer IsNumberFormat vorbelegen
+                     if ( !bIsText )
+-                        nIndex = nOldIndex = pFormatter->GetStandardIndex();
++                        nIndex = nOldIndex = aParam.mpNumFormatter->GetStandardIndex();
+                 }
+ 
+                 do
+@@ -1349,9 +1354,9 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+                     if (bIsText)
+                         break;
+ 
+-                    if (bDetectNumberFormat)
++                    if (aParam.mbDetectNumberFormat)
+                     {
+-                        if (!pFormatter->IsNumberFormat(rString, nIndex, nVal))
++                        if (!aParam.mpNumFormatter->IsNumberFormat(rString, nIndex, nVal))
+                             break;
+ 
+                         pNewCell = new ScValueCell( nVal );
+@@ -1362,21 +1367,21 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+                             // Exception: If the new format is boolean, always apply it.
+ 
+                             BOOL bOverwrite = FALSE;
+-                            const SvNumberformat* pOldFormat = pFormatter->GetEntry( nOldIndex );
++                            const SvNumberformat* pOldFormat = aParam.mpNumFormatter->GetEntry( nOldIndex );
+                             if ( pOldFormat )
+                             {
+                                 short nOldType = pOldFormat->GetType() & ~NUMBERFORMAT_DEFINED;
+                                 if ( nOldType == NUMBERFORMAT_NUMBER || nOldType == NUMBERFORMAT_DATE ||
+                                      nOldType == NUMBERFORMAT_TIME || nOldType == NUMBERFORMAT_LOGICAL )
+                                 {
+-                                    if ( nOldIndex == pFormatter->GetStandardFormat(
++                                    if ( nOldIndex == aParam.mpNumFormatter->GetStandardFormat(
+                                                         nOldType, pOldFormat->GetLanguage() ) )
+                                     {
+                                         bOverwrite = TRUE;      // default of these types can be overwritten
+                                     }
+                                 }
+                             }
+-                            if ( !bOverwrite && pFormatter->GetType( nIndex ) == NUMBERFORMAT_LOGICAL )
++                            if ( !bOverwrite && aParam.mpNumFormatter->GetType( nIndex ) == NUMBERFORMAT_LOGICAL )
+                             {
+                                 bOverwrite = TRUE;              // overwrite anything if boolean was detected
+                             }
+@@ -1392,7 +1397,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+                     else
+                     {
+                         // Only check if the string is a regular number.
+-                        const LocaleDataWrapper* pLocale = pFormatter->GetLocaleData();
++                        const LocaleDataWrapper* pLocale = aParam.mpNumFormatter->GetLocaleData();
+                         if (!pLocale)
+                             break;
+                         
+@@ -1414,7 +1419,19 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+                 while (false);
+ 
+                 if (!pNewCell)
++                {
++                    if (aParam.mbSetTextCellFormat && aParam.mpNumFormatter->IsNumberFormat(rString, nIndex, nVal))
++                    {
++                        // Set the cell format type to Text.
++                        sal_uInt32 nFormat = aParam.mpNumFormatter->GetStandardFormat(NUMBERFORMAT_TEXT);
++                        ScPatternAttr aNewAttrs(pDocument->GetPool());
++                        SfxItemSet& rSet = aNewAttrs.GetItemSet();
++                        rSet.Put( SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat) );
++                        ApplyPattern(nRow, aNewAttrs);
++                    }
++                        
+                     pNewCell = new ScStringCell(rString);
++                }
+             }
+         }
+ 
+diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
+index 3c50c24..56f2158 100644
+--- sc/source/core/data/document.cxx
++++ sc/source/core/data/document.cxx
+@@ -2512,10 +2512,10 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT
+ 
+ 
+ BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
+-                            SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
++                            ScSetStringParam* pParam )
+ {
+     if ( ValidTab(nTab) && pTab[nTab] )
+-		return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pFormatter, bDetectNumberFormat );
++		return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pParam );
+     else
+         return FALSE;
+ }
+diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
+index 9505877..6a373e9 100644
+--- sc/source/core/data/table2.cxx
++++ sc/source/core/data/table2.cxx
+@@ -904,11 +904,11 @@ void ScTable::PutCell( const ScAddress& rPos, ULONG nFormatIndex, ScBaseCell* pC
+ 
+ 
+ BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString, 
+-                         SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
++                         ScSetStringParam* pParam )
+ {
+     if (ValidColRow(nCol,nRow))
+         return aCol[nCol].SetString( 
+-            nRow, nTabP, rString, pDocument->GetAddressConvention(), pFormatter, bDetectNumberFormat );
++            nRow, nTabP, rString, pDocument->GetAddressConvention(), pParam );
+     else
+         return FALSE;
+ }
+diff --git sc/source/core/tool/stringutil.cxx sc/source/core/tool/stringutil.cxx
+index ae6247f..d5e09a6 100644
+--- sc/source/core/tool/stringutil.cxx
++++ sc/source/core/tool/stringutil.cxx
+@@ -40,6 +40,15 @@
+ using ::rtl::OUString;
+ using ::rtl::OUStringBuffer;
+ 
++ScSetStringParam::ScSetStringParam() :
++    mpNumFormatter(NULL),
++    mbDetectNumberFormat(true),
++    mbSetTextCellFormat(false)
++{
++}
++
++// ============================================================================-
++
+ bool ScStringUtil::parseSimpleNumber(
+     const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal)
+ {
+diff --git sc/source/filter/rtf/eeimpars.cxx sc/source/filter/rtf/eeimpars.cxx
+index e78e371..b25ad37 100644
+--- sc/source/filter/rtf/eeimpars.cxx
++++ sc/source/filter/rtf/eeimpars.cxx
+@@ -69,6 +69,7 @@
+ #include "drwlayer.hxx"
+ #include "rangenam.hxx"
+ #include "progress.hxx"
++#include "stringutil.hxx"
+ 
+ #include "globstr.hrc"
+ 
+@@ -331,12 +332,17 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
+             // Daten eintragen
+             if (bSimple)
+             {
++                ScSetStringParam aParam;
++                aParam.mpNumFormatter = pFormatter;
++                aParam.mbDetectNumberFormat = true;
++                aParam.mbSetTextCellFormat = true;
++
+                 if ( aValStr.Len() )
+                     mpDoc->SetValue( nCol, nRow, nTab, fVal );
+                 else if ( !pE->aSel.HasRange() )
+                 {
+                     // maybe ALT text of IMG or similar
+-                    mpDoc->SetString( nCol, nRow, nTab, pE->aAltText, pFormatter );
++                    mpDoc->SetString( nCol, nRow, nTab, pE->aAltText, &aParam );
+                     // wenn SelRange komplett leer kann nachfolgender Text im gleichen Absatz liegen!
+                 }
+                 else
+@@ -381,7 +387,10 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
+                     if (bNumbersEnglishUS && !bEnUsRecognized)
+                         mpDoc->PutCell( nCol, nRow, nTab, new ScStringCell( aStr));
+                     else
+-                        mpDoc->SetString( nCol, nRow, nTab, aStr, pFormatter, bConvertDate );
++                    {
++                        aParam.mbDetectNumberFormat = bConvertDate;    
++                        mpDoc->SetString( nCol, nRow, nTab, aStr, &aParam );
++                    }
+                 }
+             }
+             else
+diff --git sc/source/ui/docshell/impex.cxx sc/source/ui/docshell/impex.cxx
+index d388887..573443d 100644
+--- sc/source/ui/docshell/impex.cxx
++++ sc/source/ui/docshell/impex.cxx
+@@ -85,6 +85,9 @@ class StarBASIC;
+ 
+ // ause
+ #include "editutil.hxx"
++#include "patattr.hxx"
++#include "docpool.hxx"
++#include "stringutil.hxx"
+ 
+ #include "globstr.hrc"
+ #include <vcl/msgbox.hxx>
+@@ -804,6 +807,18 @@ static bool lcl_PutString(
+ 
+     if ( nColFormat == SC_COL_TEXT )
+     {
++        double fDummy;
++        sal_uInt32 nIndex;
++        if (pFormatter->IsNumberFormat(rStr, nIndex, fDummy))
++        {
++            // Set the format of this cell to Text.
++            sal_uInt32 nFormat = pFormatter->GetStandardFormat(NUMBERFORMAT_TEXT);
++            ScPatternAttr aNewAttrs(pDoc->GetPool());
++            SfxItemSet& rSet = aNewAttrs.GetItemSet();
++            rSet.Put( SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat) );
++            pDoc->ApplyPattern(nCol, nRow, nTab, aNewAttrs);
++
++        }
+         pDoc->PutCell( nCol, nRow, nTab, ScBaseCell::CreateTextCell( rStr, pDoc ) );
+         return bMultiLine;
+     }
+@@ -1016,7 +1031,13 @@ static bool lcl_PutString(
+ 
+     // Standard or date not determined -> SetString / EditCell
+     if( rStr.Search( _LF ) == STRING_NOTFOUND )
+-        pDoc->SetString( nCol, nRow, nTab, rStr, pFormatter, bDetectNumFormat );
++    {
++        ScSetStringParam aParam;
++        aParam.mpNumFormatter = pFormatter;
++        aParam.mbDetectNumberFormat = bDetectNumFormat;
++        aParam.mbSetTextCellFormat = true;    
++        pDoc->SetString( nCol, nRow, nTab, rStr, &aParam );
++    }
+     else 
+     {
+         bMultiLine = true;
diff --git a/applied_patches/0179-calc-find-replace-skip-filtered.diff b/applied_patches/0179-calc-find-replace-skip-filtered.diff
new file mode 100644
index 000000000..5bde7bc57
--- /dev/null
+++ b/applied_patches/0179-calc-find-replace-skip-filtered.diff
@@ -0,0 +1,383 @@
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index 62207fb..192ca18 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -826,6 +826,8 @@ private:
+     // also invalidates script type, broadcasts for "calc as shown"
+     void        InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo,
+                                      BOOL bNumFormatChanged, BOOL bBroadcast );
++
++    void        SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bForward);
+ };
+ 
+ 
+diff --git sc/source/core/data/table6.cxx sc/source/core/data/table6.cxx
+index 272e049..be44ff1 100644
+--- sc/source/core/data/table6.cxx
++++ sc/source/core/data/table6.cxx
+@@ -251,6 +251,42 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
+     return bFound;
+ }
+ 
++void ScTable::SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bForward)
++{
++    if (bForward)
++    {
++        // forward search
++
++        if (rRow <= rLastNonFilteredRow)
++            return;
++    
++        SCROW nLastRow = rRow;
++        if (RowFiltered(rRow, NULL, &nLastRow))
++            // move to the first non-filtered row.
++            rRow = nLastRow + 1;
++        else
++            // record the last non-filtered row to avoid checking 
++            // the filtered state for each and every row.
++            rLastNonFilteredRow = nLastRow;
++    }
++    else
++    {
++        // backward search
++
++        if (rRow >= rLastNonFilteredRow)
++            return;
++    
++        SCROW nFirstRow = rRow;
++        if (RowFiltered(rRow, &nFirstRow, NULL))
++            // move to the first non-filtered row.
++            rRow = nFirstRow - 1;
++        else
++            // record the last non-filtered row to avoid checking 
++            // the filtered state for each and every row.
++            rLastNonFilteredRow = nFirstRow;
++    }
++}
++
+ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+                         const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc)
+ {
+@@ -264,6 +300,7 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+     GetLastDataPos(nLastCol, nLastRow);
+     if (!bAll && rSearchItem.GetBackward())
+     {
++        SCROW nLastNonFilteredRow = MAXROW + 1;
+         nCol = Min(nCol, (SCCOL)(nLastCol + 1));
+         nRow = Min(nRow, (SCROW)(nLastRow + 1));
+         if (rSearchItem.GetRowDirection())
+@@ -271,6 +308,8 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+             nCol--;
+             while (!bFound && ((SCsROW)nRow >= 0))
+             {
++                SkipFilteredRows(nRow, nLastNonFilteredRow, false);
++
+                 while (!bFound && ((SCsCOL)nCol >= 0))
+                 {
+                     bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
+@@ -302,6 +341,8 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+             {
+                 while (!bFound && ((SCsROW)nRow >= 0))
+                 {
++                    SkipFilteredRows(nRow, nLastNonFilteredRow, false);
++
+                     bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
+                     if (!bFound)
+                     {
+@@ -311,8 +352,10 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+                 }
+                 if (!bFound)
+                 {
++                    // Not found in this column.  Move to the next column.
+                     BOOL bIsEmpty;
+                     nRow = nLastRow;
++                    nLastNonFilteredRow = MAXROW + 1;
+                     do
+                     {
+                         nCol--;
+@@ -328,11 +371,14 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+     }
+     else
+     {
++        SCROW nLastNonFilteredRow = -1;
+         if (!bAll && rSearchItem.GetRowDirection())
+         {
+             nCol++;
+             while (!bFound && (nRow <= nLastRow))
+             {
++                SkipFilteredRows(nRow, nLastNonFilteredRow, true);
++
+                 while (!bFound && (nCol <= nLastCol))
+                 {
+                     bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
+@@ -356,6 +402,8 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+             {
+                 while (!bFound && (nRow <= nLastRow))
+                 {
++                    SkipFilteredRows(nRow, nLastNonFilteredRow, true);
++
+                     bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
+                     if (!bFound)
+                     {
+@@ -365,7 +413,9 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+                 }
+                 if (!bFound)
+                 {
++                    // Not found in this column.  Move to the next column.
+                     nRow = 0;
++                    nLastNonFilteredRow = -1;
+                     nCol++;
+                     while ((nCol <= nLastCol) && aCol[nCol].IsEmptyData()) nCol++;
+                 }
+@@ -770,6 +820,30 @@ bool ScTable::SearchAndReplaceEmptyCells(
+     return false;
+ }
+ 
++namespace {
++
++bool lcl_maybeReplaceCellString(
++    ScColumn& rColObj, SCCOL& rCol, SCROW& rRow, String& rUndoStr, SCCOL nCol, SCROW nRow, const SvxSearchItem& rSearchItem)
++{
++    ScBaseCell* pCell = rColObj.GetCell(nRow);
++    if (!pCell || pCell->GetCellType() == CELLTYPE_NOTE)
++    {
++        // empty cell found.
++        rCol = nCol;
++        rRow = nRow;
++        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
++            rSearchItem.GetReplaceString().Len())
++        {
++            rColObj.Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
++            rUndoStr = String();
++        }
++        return true;
++    }
++    return false;
++}
++
++}
++
+ bool ScTable::SearchRangeForEmptyCell(
+     const ScRange& rRange, const SvxSearchItem& rSearchItem, 
+     SCCOL& rCol, SCROW& rRow, String& rUndoStr, ScDocument* /*pUndoDoc*/)
+@@ -781,9 +855,14 @@ bool ScTable::SearchRangeForEmptyCell(
+         if (rSearchItem.GetRowDirection())
+         {
+             // row direction.
++            SCROW nLastNonFilteredRow = MAXROW + 1;
+             SCROW nBeginRow = rRange.aEnd.Row() > rRow ? rRow : rRange.aEnd.Row();
+             for (SCROW nRow = nBeginRow; nRow >= rRange.aStart.Row(); --nRow)
+             {
++                SkipFilteredRows(nRow, nLastNonFilteredRow, false);
++                if (nRow < rRange.aStart.Row())
++                    break;
++
+                 SCCOL nBeginCol = rRange.aEnd.Col();
+                 if (nRow == rRow && nBeginCol >= rCol)
+                     // always start from one cell before the cursor.
+@@ -791,20 +870,8 @@ bool ScTable::SearchRangeForEmptyCell(
+ 
+                 for (SCCOL nCol = nBeginCol; nCol >= rRange.aStart.Col(); --nCol)
+                 {
+-                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
+-                    if (!pCell)
+-                    {
+-                        // empty cell found.
+-                        rCol = nCol;
+-                        rRow = nRow;
+-                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
+-                            rSearchItem.GetReplaceString().Len())
+-                        {
+-                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
+-                            rUndoStr = String();
+-                        }
++                    if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
+                         return true;
+-                    }
+                 }
+             }
+         }
+@@ -814,26 +881,19 @@ bool ScTable::SearchRangeForEmptyCell(
+             SCCOL nBeginCol = rRange.aEnd.Col() > rCol ? rCol : rRange.aEnd.Col();
+             for (SCCOL nCol = nBeginCol; nCol >= rRange.aStart.Col(); --nCol)
+             {
++                SCROW nLastNonFilteredRow = MAXROW + 1;
+                 SCROW nBeginRow = rRange.aEnd.Row();
+                 if (nCol == rCol && nBeginRow >= rRow)
+                     // always start from one cell before the cursor.
+                     nBeginRow = rRow - (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
+                 for (SCROW nRow = nBeginRow; nRow >= rRange.aStart.Row(); --nRow)
+                 {   
+-                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
+-                    if (!pCell)
+-                    {
+-                        // empty cell found.
+-                        rCol = nCol;
+-                        rRow = nRow;
+-                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
+-                            rSearchItem.GetReplaceString().Len())
+-                        {
+-                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
+-                            rUndoStr = String();
+-                        }
++                    SkipFilteredRows(nRow, nLastNonFilteredRow, false);
++                    if (nRow < rRange.aStart.Row())
++                        break;
++
++                    if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
+                         return true;
+-                    }
+                 }
+             }
+         }
+@@ -844,29 +904,22 @@ bool ScTable::SearchRangeForEmptyCell(
+         if (rSearchItem.GetRowDirection())
+         {
+             // row direction.
++            SCROW nLastNonFilteredRow = -1;
+             SCROW nBeginRow = rRange.aStart.Row() < rRow ? rRow : rRange.aStart.Row();
+             for (SCROW nRow = nBeginRow; nRow <= rRange.aEnd.Row(); ++nRow)
+             {
++                SkipFilteredRows(nRow, nLastNonFilteredRow, true);
++                if (nRow > rRange.aEnd.Row())
++                    break;
++
+                 SCCOL nBeginCol = rRange.aStart.Col();
+                 if (nRow == rRow && nBeginCol <= rCol)
+                     // always start from one cell past the cursor.
+                     nBeginCol = rCol + (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
+                 for (SCCOL nCol = nBeginCol; nCol <= rRange.aEnd.Col(); ++nCol)
+                 {
+-                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
+-                    if (!pCell)
+-                    {
+-                        // empty cell found.
+-                        rCol = nCol;
+-                        rRow = nRow;
+-                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
+-                            rSearchItem.GetReplaceString().Len())
+-                        {
+-                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
+-                            rUndoStr = String();
+-                        }
++                    if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
+                         return true;
+-                    }
+                 }
+             }
+         }
+@@ -876,26 +929,19 @@ bool ScTable::SearchRangeForEmptyCell(
+             SCCOL nBeginCol = rRange.aStart.Col() < rCol ? rCol : rRange.aStart.Col();
+             for (SCCOL nCol = nBeginCol; nCol <= rRange.aEnd.Col(); ++nCol)
+             {
++                SCROW nLastNonFilteredRow = -1;
+                 SCROW nBeginRow = rRange.aStart.Row();
+                 if (nCol == rCol && nBeginRow <= rRow)
+                     // always start from one cell past the cursor.
+                     nBeginRow = rRow + (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
+                 for (SCROW nRow = nBeginRow; nRow <= rRange.aEnd.Row(); ++nRow)
+                 {   
+-                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
+-                    if (!pCell)
+-                    {
+-                        // empty cell found.
+-                        rCol = nCol;
+-                        rRow = nRow;
+-                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
+-                            rSearchItem.GetReplaceString().Len())
+-                        {
+-                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
+-                            rUndoStr = String();
+-                        }
++                    SkipFilteredRows(nRow, nLastNonFilteredRow, true);
++                    if (nRow > rRange.aEnd.Row())
++                        break;
++
++                    if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
+                         return true;
+-                    }
+                 }
+             }
+         }
+@@ -913,32 +959,44 @@ bool ScTable::SearchRangeForAllEmptyCells(
+ 
+     for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
+     {
++        SCROW nLastNonFilteredRow = -1;
+         if (aCol[nCol].IsEmptyData())
+         {
+-            // The entire column is empty.  Add the whole column and move on.
+-            rMark.SetMultiMarkArea(
+-                ScRange(nCol, rRange.aStart.Row(), nTab, nCol, rRange.aEnd.Row(), nTab));
+-            bFound = true;
+-
+-            if (bReplace)
++            // The entire column is empty.
++            for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
+             {
+-                const String& rNewStr = rSearchItem.GetReplaceString();
+-                for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
++                SCROW nLastRow;
++                if (!RowFiltered(nRow, NULL, &nLastRow))
+                 {    
+-                    aCol[nCol].Insert(nRow, new ScStringCell(rNewStr));
+-                    if (pUndoDoc)
+-                        // TODO: I'm using a string cell with empty content to 
+-                        // trigger deletion of cell instance on undo.  Maybe I
+-                        // should create a new cell type for this?
+-                        pUndoDoc->PutCell(nCol, nRow, nTab, new ScStringCell(String()));
++                    rMark.SetMultiMarkArea(ScRange(nCol, nRow, nTab, nCol, nLastRow, nTab));
++                    if (bReplace)
++                    {
++                        const String& rNewStr = rSearchItem.GetReplaceString();
++                        for (SCROW i = nRow; i <= nLastRow; ++i)
++                        {    
++                            aCol[nCol].Insert(i, new ScStringCell(rNewStr));
++                            if (pUndoDoc)
++                                // TODO: I'm using a string cell with empty content to 
++                                // trigger deletion of cell instance on undo.  Maybe I
++                                // should create a new cell type for this?
++                                pUndoDoc->PutCell(nCol, i, nTab, new ScStringCell(String()));
++                        }
++                        rUndoStr = String();
++                    }
+                 }
+-                rUndoStr = String();
++
++                nRow = nLastRow; // move to the last filtered row.
+             }
++            bFound = true;
+             continue;
+         }
+ 
+         for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
+         {
++            SkipFilteredRows(nRow, nLastNonFilteredRow, true);
++            if (nRow > rRange.aEnd.Row())
++                break;
++
+             ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
+             if (!pCell)
+             {    
+@@ -956,6 +1014,21 @@ bool ScTable::SearchRangeForAllEmptyCells(
+                         pUndoDoc->PutCell(nCol, nRow, nTab, new ScStringCell(String()));
+                 }
+             }
++            else if (pCell->GetCellType() == CELLTYPE_NOTE)
++            {
++                rMark.SetMultiMarkArea(ScRange(nCol, nRow, nTab));
++                bFound = true;
++
++                if (bReplace)
++                {    
++                    if (pUndoDoc)
++                    {
++                        ScAddress aCellPos(nCol, nRow, nTab);
++                        pUndoDoc->PutCell(nCol, nRow, nTab, pCell->CloneWithNote(aCellPos, *pUndoDoc, aCellPos));
++                    }
++                    aCol[nCol].SetString(nRow, nTab, rSearchItem.GetReplaceString());
++                }
++            }
+         }
+     }
+     return bFound;
diff --git a/applied_patches/0180-calc-getpivotdata-force-interpret-formula.diff b/applied_patches/0180-calc-getpivotdata-force-interpret-formula.diff
new file mode 100644
index 000000000..5464780b4
--- /dev/null
+++ b/applied_patches/0180-calc-getpivotdata-force-interpret-formula.diff
@@ -0,0 +1,44 @@
+diff --git sc/source/core/data/dpcachetable.cxx sc/source/core/data/dpcachetable.cxx
+index a27c16d..5cb60ad 100644
+--- sc/source/core/data/dpcachetable.cxx
++++ sc/source/core/data/dpcachetable.cxx
+@@ -209,9 +209,39 @@ sal_Int32 ScDPCacheTable::getColSize() const
+     return maTable.empty() ? 0 : maTable[0].size();
+ }
+ 
++namespace {
++
++/** 
++ * While the macro interpret level is incremented, the formula cells are 
++ * (semi-)guaranteed to be interpreted. 
++ */ 
++class MacroInterpretIncrementer
++{
++public:
++    MacroInterpretIncrementer(ScDocument* pDoc) :
++        mpDoc(pDoc)
++    {
++        mpDoc->IncMacroInterpretLevel();
++    }
++    ~MacroInterpretIncrementer()
++    {
++        mpDoc->DecMacroInterpretLevel();
++    }
++private:
++    ScDocument* mpDoc;
++};
++
++}
++
+ void ScDPCacheTable::fillTable(ScDocument* pDoc, const ScRange& rRange, const ScQueryParam& rQuery, BOOL* pSpecial,
+                                bool bIgnoreEmptyRows)
+ {
++    // Make sure the formula cells within the data range are interpreted 
++    // during this call, for this method may be called from the interpretation
++    // of GETPIVOTDATA, which disables nested formula interpretation without
++    // an increased macro level.
++    MacroInterpretIncrementer aMacroInc(pDoc);
++
+     SCTAB nTab = rRange.aStart.Tab();
+     SCCOL nStartCol = rRange.aStart.Col();
+     SCROW nStartRow = rRange.aStart.Row();
diff --git a/applied_patches/0181-calc-combo-listbox-export-fix.diff b/applied_patches/0181-calc-combo-listbox-export-fix.diff
new file mode 100644
index 000000000..11b1e5df9
--- /dev/null
+++ b/applied_patches/0181-calc-combo-listbox-export-fix.diff
@@ -0,0 +1,13 @@
+diff --git sc/source/filter/excel/xeescher.cxx sc/source/filter/excel/xeescher.cxx
+index 98eb5b7..78a0d2a 100644
+--- sc/source/filter/excel/xeescher.cxx
++++ sc/source/filter/excel/xeescher.cxx
+@@ -696,6 +696,8 @@ void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
+             else if( mnObjType == EXC_OBJTYPE_DROPDOWN )
+             {
+                 rStrm << sal_uInt16( 0 ) << mnLineCount;
++                // dxMin & zero length str
++                rStrm << sal_uInt16( 0 ) << sal_uInt16( 0 );
+             }
+ 
+             rStrm.EndRecord();
diff --git a/applied_patches/0182-calc-selection-protected-cells.diff b/applied_patches/0182-calc-selection-protected-cells.diff
new file mode 100644
index 000000000..fa7a882e3
--- /dev/null
+++ b/applied_patches/0182-calc-selection-protected-cells.diff
@@ -0,0 +1,155 @@
+diff --git sc/source/ui/inc/gridwin.hxx sc/source/ui/inc/gridwin.hxx
+index 3ab93fd..29cd088 100644
+--- sc/source/ui/inc/gridwin.hxx
++++ sc/source/ui/inc/gridwin.hxx
+@@ -345,7 +345,7 @@ private:
+ 
+     void			PasteSelection( const Point& rPosPixel );
+ 
+-    void			SelectForContextMenu( const Point& rPosPixel );
++    void			SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, SCsROW nCellY );
+ 
+     void            GetSelectionRects( ::std::vector< Rectangle >& rPixelRects );
+     struct RectangleConverter {
+diff --git sc/source/ui/inc/hdrcont.hxx sc/source/ui/inc/hdrcont.hxx
+index 20cc822..497140f 100644
+--- sc/source/ui/inc/hdrcont.hxx
++++ sc/source/ui/inc/hdrcont.hxx
+@@ -80,7 +80,7 @@ private:
+ 
+     long			GetScrPos( SCCOLROW nEntryNo );
+     SCCOLROW		GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder );
+-
++    bool            IsSelectionAllowed(SCCOLROW nPos) const;
+     void			ShowDragHelp();
+ 
+     void			DoPaint( SCCOLROW nStart, SCCOLROW nEnd );
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index adb2f20..1079b9d 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -2753,9 +2753,32 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
+ 
+         if ( bMouse )
+         {
++            SCsCOL nCellX = -1;
++            SCsROW nCellY = -1;
++            pViewData->GetPosFromPixel(aPosPixel.X(), aPosPixel.Y(), eWhich, nCellX, nCellY);
++            ScDocument* pDoc = pViewData->GetDocument();
++            SCTAB nTab = pViewData->GetTabNo();
++            const ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
++            bool bSelectAllowed = true;
++            if ( pProtect && pProtect->isProtected() )
++            {
++                // This sheet is protected.  Check if a context menu is allowed on this cell.
++                bool bCellProtected = pDoc->HasAttrib(nCellX, nCellY, nTab, nCellX, nCellY, nTab, HASATTR_PROTECTED);
++                bool bSelProtected   = pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS);
++                bool bSelUnprotected = pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);
++
++                if (bCellProtected)
++                    bSelectAllowed = bSelProtected;
++                else
++                    bSelectAllowed = bSelUnprotected;
++            }
++            if (!bSelectAllowed)
++                // Selecting this cell is not allowed, neither is context menu.
++                return;
++
+             //	#i18735# First select the item under the mouse pointer.
+             //	This can change the selection, and the view state (edit mode, etc).
+-            SelectForContextMenu( aPosPixel );
++            SelectForContextMenu( aPosPixel, nCellX, nCellY );
+         }
+ 
+         BOOL bDone = FALSE;
+@@ -2850,15 +2873,12 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
+     }
+ }
+ 
+-void ScGridWindow::SelectForContextMenu( const Point& rPosPixel )
++void ScGridWindow::SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, SCsROW nCellY )
+ {
+     //  #i18735# if the click was outside of the current selection,
+     //  the cursor is moved or an object at the click position selected.
+     //  (see SwEditWin::SelectMenuPosition in Writer)
+ 
+-    SCsCOL nCellX;
+-    SCsROW nCellY;
+-    pViewData->GetPosFromPixel( rPosPixel.X(), rPosPixel.Y(), eWhich, nCellX, nCellY );
+     ScTabView* pView = pViewData->GetView();
+     ScDrawView* pDrawView = pView->GetScDrawView();
+ 
+diff --git sc/source/ui/view/hdrcont.cxx sc/source/ui/view/hdrcont.cxx
+index 89e871c..5cfe8f8 100644
+--- sc/source/ui/view/hdrcont.cxx
++++ sc/source/ui/view/hdrcont.cxx
+@@ -47,6 +47,7 @@
+ #include "scmod.hxx"		// Optionen
+ #include "inputopt.hxx"		// Optionen
+ #include "gridmerg.hxx"
++#include "document.hxx"
+ 
+ // -----------------------------------------------------------------------
+ 
+@@ -655,6 +656,39 @@ SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder )
+     return nHitNo;
+ }
+ 
++bool ScHeaderControl::IsSelectionAllowed(SCCOLROW nPos) const
++{
++    ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>(SfxViewShell::Current());
++    if (!pViewSh)
++        return false;
++
++    ScViewData* pViewData = pViewSh->GetViewData();
++    USHORT nTab = pViewData->GetTabNo();
++    ScDocument* pDoc = pViewData->GetDocument();
++    const ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
++    bool bSelectAllowed = true;
++    if ( pProtect && pProtect->isProtected() )
++    {
++        // This sheet is protected.  Check if a context menu is allowed on this cell.
++        bool bCellsProtected = false;
++        if (bVertical)
++            // row header
++            bCellsProtected = pDoc->HasAttrib(0, nPos, nTab, MAXCOL, nPos, nTab, HASATTR_PROTECTED);
++        else
++            // column header
++            bCellsProtected = pDoc->HasAttrib(nPos, 0, nTab, nPos, MAXROW, nTab, HASATTR_PROTECTED);
++
++        bool bSelProtected   = pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS);
++        bool bSelUnprotected = pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);
++
++        if (bCellsProtected)
++            bSelectAllowed = bSelProtected;
++        else
++            bSelectAllowed = bSelUnprotected;
++    }
++    return bSelectAllowed;
++}
++
+ void __EXPORT ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
+ {
+     if (IsDisabled())
+@@ -665,6 +699,8 @@ void __EXPORT ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
+ 
+     BOOL bFound;
+     SCCOLROW nHitNo = GetMousePos( rMEvt, bFound );
++    if (!IsSelectionAllowed(nHitNo))
++        return;
+ 
+     if ( bFound && rMEvt.IsLeft() && ResizeAllowed() )
+     {
+@@ -848,8 +884,11 @@ void __EXPORT ScHeaderControl::Command( const CommandEvent& rCEvt )
+                 MouseEvent aMEvt( rCEvt.GetMousePosPixel() );
+                 BOOL bBorder;
+                 SCCOLROW nPos = GetMousePos( aMEvt, bBorder );
+-                USHORT nTab = pViewData->GetTabNo();
++                if (!IsSelectionAllowed(nPos))
++                    // Selecting this cell is not allowed, neither is context menu.
++                    return;
+ 
++                SCTAB nTab = pViewData->GetTabNo();
+                 ScRange aNewRange;
+                 if ( bVertical )
+                     aNewRange = ScRange( 0, sal::static_int_cast<SCROW>(nPos), nTab,
diff --git a/applied_patches/0684-calc-increase-row-limit.diff b/applied_patches/0183-calc-increase-row-limit.diff
similarity index 100%
rename from applied_patches/0684-calc-increase-row-limit.diff
rename to applied_patches/0183-calc-increase-row-limit.diff
diff --git a/applied_patches/0685-calc-odf-export-autostyle-maxrow.diff b/applied_patches/0184-calc-odf-export-autostyle-maxrow.diff
similarity index 100%
rename from applied_patches/0685-calc-odf-export-autostyle-maxrow.diff
rename to applied_patches/0184-calc-odf-export-autostyle-maxrow.diff
diff --git a/applied_patches/0686-calc-perf-flat-segment-tree.diff b/applied_patches/0185-calc-perf-flat-segment-tree.diff
similarity index 100%
rename from applied_patches/0686-calc-perf-flat-segment-tree.diff
rename to applied_patches/0185-calc-perf-flat-segment-tree.diff
diff --git a/applied_patches/0186-calc-perf-ods-import-properties.diff b/applied_patches/0186-calc-perf-ods-import-properties.diff
new file mode 100644
index 000000000..c5332c1df
--- /dev/null
+++ b/applied_patches/0186-calc-perf-ods-import-properties.diff
@@ -0,0 +1,159 @@
+diff --git sc/inc/attarray.hxx sc/inc/attarray.hxx
+index 2a8c515..82ea003 100644
+--- sc/inc/attarray.hxx
++++ sc/inc/attarray.hxx
+@@ -39,6 +39,7 @@ class ScEditDataArray;
+ class ScMarkArray;
+ class ScPatternAttr;
+ class ScStyleSheet;
++class ScFlatBoolRowSegments;
+ 
+ class Rectangle;
+ class SfxItemPoolCache;
+@@ -162,7 +163,7 @@ public:
+ 								BOOL bRefresh, BOOL bAttrs );
+ 	BOOL	RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow );
+ 
+-	void	FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset );
++	void	FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
+ 	BOOL	IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
+ 
+ 	void	DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow);
+diff --git sc/inc/column.hxx sc/inc/column.hxx
+index babda9e..0f9586e 100644
+--- sc/inc/column.hxx
++++ sc/inc/column.hxx
+@@ -71,8 +71,8 @@ class ScPostIt;
+ struct ScFunctionData;
+ struct ScLineFlags;
+ struct ScMergePatternState;
+ struct ScSetStringParam;
+-
++class ScFlatBoolRowSegments;
+ 
+ #define COLUMN_DELTA	4
+ 
+@@ -341,7 +341,7 @@ public:
+ 	const ScStyleSheet*	GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const;
+ 	const ScStyleSheet*	GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const;
+ 
+-	void		FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset );
++	void		FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
+ 	BOOL		IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
+ 
+                 /// May return -1 if not found
+diff --git sc/source/core/data/attarray.cxx sc/source/core/data/attarray.cxx
+index c02d595..a5f3607 100644
+--- sc/source/core/data/attarray.cxx
++++ sc/source/core/data/attarray.cxx
+@@ -57,6 +57,7 @@
+ #include "rechead.hxx"
+ #include "globstr.hrc"
+ #include "cell.hxx"
++#include "segmenttree.hxx"
+ 
+ #undef DBG_INVALIDATE
+ #define DBGOUTPUT(s) \
+@@ -1749,8 +1750,7 @@ SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, BOOL bUp ) const
+ 	return nRet;
+ }
+ 
+-
+-void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset )
++void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset )
+ {
+ 	SCROW nStart = 0;
+ 	SCSIZE nPos = 0;
+@@ -1762,7 +1762,7 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pU
+ //			for (SCROW nRow = nStart; nRow <= nEnd; nRow++)
+ //				pUsed[nRow] = TRUE;
+ 
+-			memset( &pUsed[nStart], TRUE, nEnd-nStart+1 );
++			rUsedRows.setTrue(nStart, nEnd);
+ 
+ 			if (bReset)
+ 			{
+diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx
+index 39061a7..374606a 100644
+--- sc/source/core/data/column.cxx
++++ sc/source/core/data/column.cxx
+@@ -620,13 +620,11 @@ const ScStyleSheet*	ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRo
+ 	return bEqual ? pStyle : NULL;
+ }
+ 
+-
+-void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset )
++void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset )
+ {
+-	pAttrArray->FindStyleSheet( pStyleSheet, pUsed, bReset );
++	pAttrArray->FindStyleSheet( pStyleSheet, rUsedRows, bReset );
+ }
+ 
+-
+ BOOL ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const
+ {
+ 	return pAttrArray->IsStyleSheetUsed( rStyle, bGatherAllStyles );
+diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
+index 8cb6f7a..5a78469 100644
+--- sc/source/core/data/table2.cxx
++++ sc/source/core/data/table2.cxx
+@@ -60,6 +60,7 @@
+ #include "bcaslot.hxx"
+ #include "postit.hxx"
+ #include "globstr.hrc"
++#include "segmenttree.hxx"
+ 
+ #include <math.h>
+ 
+@@ -1830,36 +1831,24 @@ void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRem
+ 								double nPPTX, double nPPTY,
+ 								const Fraction& rZoomX, const Fraction& rZoomY )
+ {
+-	BOOL* pUsed = new BOOL[MAXROWCOUNT];
+-    memset( pUsed, 0, sizeof(BOOL) * (MAXROWCOUNT) );
++    ScFlatBoolRowSegments aUsedRows;
++    for (SCCOL i = 0; i <= MAXCOL; ++i)
++        aCol[i].FindStyleSheet(pStyleSheet, aUsedRows, bRemoved);
+ 
+-	SCCOL nCol;
+-	for (nCol=0; nCol<=MAXCOL; nCol++)
+-		aCol[nCol].FindStyleSheet( pStyleSheet, pUsed, bRemoved );
++    SCROW nRow = 0;
++    while (nRow <= MAXROW)
++    {
++        ScFlatBoolRowSegments::RangeData aData;
++        if (!aUsedRows.getRangeData(nRow, aData))
++            // search failed!
++            return;
+ 
+-	BOOL bFound = FALSE;
+-	SCROW nStart = 0, nEnd = 0;
+-	for (SCROW i=0; i<=MAXROW; i++)
+-	{
+-		if (pUsed[i])
+-		{
+-			if (!bFound)
+-			{
+-				nStart = i;
+-				bFound = TRUE;
+-			}
+-			nEnd = i;
+-		}
+-		else if (bFound)
+-		{
+-			SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE );
+-			bFound = FALSE;
+-		}
+-	}
+-	if (bFound)
+-		SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE );
++        SCROW nEndRow = aData.mnRow2;
++        if (aData.mbValue)
++			SetOptimalHeight(nRow, nEndRow, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE);
+ 
+-	delete[] pUsed;
++        nRow = nEndRow + 1;
++    }
+ }
+ 
+ 
diff --git a/applied_patches/0688-calc-row-limit-bad-ushort.diff b/applied_patches/0187-calc-row-limit-bad-ushort.diff
similarity index 100%
rename from applied_patches/0688-calc-row-limit-bad-ushort.diff
rename to applied_patches/0187-calc-row-limit-bad-ushort.diff
diff --git a/applied_patches/0188-calc-perf-page-and-manual-breaks.diff b/applied_patches/0188-calc-perf-page-and-manual-breaks.diff
new file mode 100644
index 000000000..c22680b5c
--- /dev/null
+++ b/applied_patches/0188-calc-perf-page-and-manual-breaks.diff
@@ -0,0 +1,1646 @@
+diff --git sc/inc/document.hxx sc/inc/document.hxx
+index 986bde8..c3e15ea 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -47,6 +47,7 @@
+ 
+ #include <memory>
+ #include <map>
++#include <set>
+ 
+ class KeyEvent;
+ class OutputDevice;
+@@ -156,6 +157,9 @@ namespace com { namespace sun { namespace star {
+     namespace embed {
+         class XEmbeddedObject;
+     }
++    namespace sheet {
++        struct TablePageBreakData;
++    }
+ } } }
+ 
+ namespace com { namespace sun { namespace star { namespace document {
+@@ -1296,6 +1300,24 @@ public:
+     SC_DLLPUBLIC const ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArray( SCTAB nTab ) const;
+     SC_DLLPUBLIC       ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArrayModifiable( SCTAB nTab );
+ 
++    SC_DLLPUBLIC void           GetAllRowBreaks(::std::set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const;
++    SC_DLLPUBLIC void           GetAllColBreaks(::std::set<SCCOL>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const;
++    SC_DLLPUBLIC ScBreakType    HasRowBreak(SCROW nRow, SCTAB nTab) const;
++    SC_DLLPUBLIC ScBreakType    HasColBreak(SCCOL nCol, SCTAB nTab) const;
++    SC_DLLPUBLIC void           SetRowBreak(SCROW nRow, SCTAB nTab, bool bPage, bool bManual);
++    SC_DLLPUBLIC void           SetColBreak(SCCOL nCol, SCTAB nTab, bool bPage, bool bManual);
++    void                        RemoveRowBreak(SCROW nRow, SCTAB nTab, bool bPage, bool bManual);
++    void                        RemoveColBreak(SCCOL nCol, SCTAB nTab, bool bPage, bool bManual);
++    ::com::sun::star::uno::Sequence<
++        ::com::sun::star::sheet::TablePageBreakData> GetRowBreakData(SCTAB nTab) const;
++
++    /** 
++     * Write all column row flags to table's flag data, because not all column 
++     * row attributes are stored in the flag data members.  This is necessary 
++     * for ods export. 
++     */
++    void                        SyncColRowFlags();
++
+                     /// @return  the index of the last row with any set flags (auto-pagebreak is ignored).
+ 	SC_DLLPUBLIC SCROW			GetLastFlaggedRow( SCTAB nTab ) const;
+ 
+@@ -1335,6 +1357,7 @@ public:
+ 	Size			GetPageSize( SCTAB nTab ) const;
+ 	void			SetPageSize( SCTAB nTab, const Size& rSize );
+ 	void			SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow );
++    void            InvalidatePageBreaks(SCTAB nTab);
+ 	void			UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL );
+ 	void			RemoveManualBreaks( SCTAB nTab );
+ 	BOOL			HasManualBreaks( SCTAB nTab ) const;
+diff --git sc/inc/global.hxx sc/inc/global.hxx
+index b2d6e50..61d748d 100644
+--- sc/inc/global.hxx
++++ sc/inc/global.hxx
+@@ -213,13 +213,16 @@ const SCSIZE PIVOT_MAXPAGEFIELD = 10;
+ 									// FILTERED und MANUALSIZE nur fuer Zeilen moeglich
+ const BYTE   CR_HIDDEN      = 1;
+ //const BYTE CR_MARKED      = 2;
+-const BYTE   CR_PAGEBREAK   = 4;
++//const BYTE CR_PAGEBREAK   = 4;
+ const BYTE   CR_MANUALBREAK = 8;
+ const BYTE   CR_FILTERED    = 16;
+ const BYTE   CR_MANUALSIZE  = 32;
++const BYTE   CR_ALL         = (CR_HIDDEN | CR_MANUALBREAK | CR_FILTERED | CR_MANUALSIZE);
+ 
+-//	was davon kommt in die Datei:
+-#define CR_SAVEMASK		( ~CR_PAGEBREAK )
++typedef BYTE ScBreakType;
++const ScBreakType BREAK_NONE   = 0;
++const ScBreakType BREAK_PAGE   = 1;
++const ScBreakType BREAK_MANUAL = 2;
+ 
+ // Insert-/Delete-Flags
+ const USHORT IDF_NONE       = 0x0000;
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index ea24628..bfc4bf2 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -40,12 +40,19 @@
+ #include "compressedarray.hxx"
+ 
+ #include <memory>
++#include <set>
+ 
+ namespace utl {
+ 	class SearchParam;
+ 	class TextSearch;
+ }
+ 
++namespace com { namespace sun { namespace star {
++    namespace sheet {
++        struct TablePageBreakData;
++    }
++} } }
++
+ class SfxItemSet;
+ class SfxStyleSheetBase;
+ class SvxBoxInfoItem;
+@@ -115,6 +122,11 @@ private:
+ 	BYTE*			pColFlags;
+ 	ScBitMaskCompressedArray< SCROW, BYTE>*     pRowFlags;
+ 
++    ::std::set<SCROW>                      maRowPageBreaks;
++    ::std::set<SCROW>                      maRowManualBreaks;
++    ::std::set<SCCOL>                      maColPageBreaks;
++    ::std::set<SCCOL>                      maColManualBreaks;
++
+ 	ScOutlineTable*	pOutlineTable;
+ 
+ 	SCCOL			nTableAreaX;
+@@ -150,6 +162,7 @@ private:
+ 	Color			aScenarioColor;
+ 	USHORT			nScenarioFlags;
+ 	BOOL			bActiveScenario;
++    bool            mbPageBreaksValid;
+ 
+ friend class ScDocument;					// fuer FillInfo
+ friend class ScDocumentIterator;
+@@ -337,7 +350,8 @@ public:
+ 
+ 	void		CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const;
+ 
+-	void		InvalidateTableArea()						{ bTableAreaValid = FALSE; }
++    void        InvalidateTableArea();
++    void        InvalidatePageBreaks();
+ 
+ 	BOOL		GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const;			// FALSE = leer
+ 	BOOL		GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const;
+@@ -598,6 +612,21 @@ public:
+ 	void		RemoveManualBreaks();
+ 	BOOL		HasManualBreaks() const;
+ 
++    void        GetAllRowBreaks(::std::set<SCROW>& rBreaks, bool bPage, bool bManual) const;
++    void        GetAllColBreaks(::std::set<SCCOL>& rBreaks, bool bPage, bool bManual) const;
++    bool        HasRowPageBreak(SCROW nRow) const;
++    bool        HasColPageBreak(SCCOL nCol) const;
++    bool        HasRowManualBreak(SCROW nRow) const;
++    bool        HasColManualBreak(SCCOL nCol) const;
++    void        RemoveRowPageBreaks(SCROW nStartRow, SCROW nEndRow);
++    void        RemoveRowBreak(SCROW nRow, bool bPage, bool bManual);
++    void        RemoveColBreak(SCCOL nCol, bool bPage, bool bManual);
++    void        SetRowBreak(SCROW nRow, bool bPage, bool bManual);
++    void        SetColBreak(SCCOL nCol, bool bPage, bool bManual);
++    ::com::sun::star::uno::Sequence<
++        ::com::sun::star::sheet::TablePageBreakData> GetRowBreakData() const;
++    void        SyncColRowFlags();
++
+ 	void		StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
+ 	void		ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
+ 
+diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
+index 13c9e66..98001ef 100644
+--- sc/source/core/data/document.cxx
++++ sc/source/core/data/document.cxx
+@@ -54,6 +54,7 @@
+ #include <tools/tenccvt.hxx>
+ 
+ #include <com/sun/star/text/WritingMode2.hpp>
++#include <com/sun/star/sheet/TablePageBreakData.hpp>
+ 
+ #include "document.hxx"
+ #include "table.hxx"
+@@ -103,6 +104,9 @@
+ using namespace ::com::sun::star;
+ 
+ namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
++using ::com::sun::star::uno::Sequence;
++using ::com::sun::star::sheet::TablePageBreakData;
++using ::std::set;
+ 
+ struct ScDefaultAttr
+ {
+@@ -3189,6 +3193,102 @@ const ScBitMaskCompressedArray< SCROW, BYTE> & ScDocument::GetRowFlagsArray(
+ 	return *pFlags;
+ }
+ 
++void ScDocument::GetAllRowBreaks(set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++        return;
++
++    pTab[nTab]->GetAllRowBreaks(rBreaks, bPage, bManual);
++}
++
++void ScDocument::GetAllColBreaks(set<SCCOL>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++        return;
++
++    pTab[nTab]->GetAllColBreaks(rBreaks, bPage, bManual);
++}
++
++ScBreakType ScDocument::HasRowBreak(SCROW nRow, SCTAB nTab) const
++{
++    ScBreakType nType = BREAK_NONE;
++    if (!ValidTab(nTab) || !pTab[nTab] || !ValidRow(nRow))
++        return nType;
++
++    if (pTab[nTab]->HasRowPageBreak(nRow))
++        nType |= BREAK_PAGE;
++
++    if (pTab[nTab]->HasRowManualBreak(nRow))
++        nType |= BREAK_MANUAL;
++
++    return nType;
++}
++
++ScBreakType ScDocument::HasColBreak(SCCOL nCol, SCTAB nTab) const
++{
++    ScBreakType nType = BREAK_NONE;
++    if (!ValidTab(nTab) || !pTab[nTab] || !ValidCol(nCol))
++        return nType;
++
++    if (pTab[nTab]->HasColPageBreak(nCol))
++        nType |= BREAK_PAGE;
++
++    if (pTab[nTab]->HasColManualBreak(nCol))
++        nType |= BREAK_MANUAL;
++
++    return nType;
++}
++
++void ScDocument::SetRowBreak(SCROW nRow, SCTAB nTab, bool bPage, bool bManual)
++{
++    if (!ValidTab(nTab) || !pTab[nTab] || !ValidRow(nRow))
++        return;
++
++    pTab[nTab]->SetRowBreak(nRow, bPage, bManual);
++}
++
++void ScDocument::SetColBreak(SCCOL nCol, SCTAB nTab, bool bPage, bool bManual)
++{
++    if (!ValidTab(nTab) || !pTab[nTab] || !ValidCol(nCol))
++        return;
++
++    pTab[nTab]->SetColBreak(nCol, bPage, bManual);
++}
++
++void ScDocument::RemoveRowBreak(SCROW nRow, SCTAB nTab, bool bPage, bool bManual)
++{
++    if (!ValidTab(nTab) || !pTab[nTab] || !ValidRow(nRow))
++        return;
++
++    pTab[nTab]->RemoveRowBreak(nRow, bPage, bManual);
++}
++
++void ScDocument::RemoveColBreak(SCCOL nCol, SCTAB nTab, bool bPage, bool bManual)
++{
++    if (!ValidTab(nTab) || !pTab[nTab] || !ValidCol(nCol))
++        return;
++
++    pTab[nTab]->RemoveColBreak(nCol, bPage, bManual);
++}
++
++Sequence<TablePageBreakData> ScDocument::GetRowBreakData(SCTAB nTab) const
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++        return Sequence<TablePageBreakData>();
++
++    return pTab[nTab]->GetRowBreakData();
++}
++
++void ScDocument::SyncColRowFlags()
++{
++    for (SCTAB i = 0; i <= nMaxTableNumber; ++i)
++    {
++        if (!ValidTab(i) || !pTab[i])
++            continue;
++
++        pTab[i]->SyncColRowFlags();
++    }
++}
+ 
+ SCROW ScDocument::GetLastFlaggedRow( SCTAB nTab ) const
+ {
+@@ -4569,6 +4669,11 @@ void ScDocument::SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCRO
+ 		pTab[nTab]->SetRepeatArea( nStartCol, nEndCol, nStartRow, nEndRow );
+ }
+ 
++void ScDocument::InvalidatePageBreaks(SCTAB nTab)
++{
++    if (ValidTab(nTab) && pTab[nTab])
++        pTab[nTab]->InvalidatePageBreaks();
++}
+ 
+ void ScDocument::UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea )
+ {
+diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx
+index ddd1bbb..51c3e5e 100644
+--- sc/source/core/data/table1.cxx
++++ sc/source/core/data/table1.cxx
+@@ -155,7 +155,8 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
+ 	pScenarioRanges( NULL ),
+ 	aScenarioColor( COL_LIGHTGRAY ),
+ 	nScenarioFlags( 0 ),
+-	bActiveScenario( FALSE )
++	bActiveScenario( FALSE ),
++    mbPageBreaksValid(false)
+ {
+ 
+ 	if (bColInfo)
+--- sc/source/core/data/table2.cxx
++++ sc/source/core/data/table2.cxx
+@@ -137,6 +137,8 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
+ 		aCol[j].InsertRow( nStartRow, nSize );
+ 	if( !--nRecalcLvl )
+ 		SetDrawPageSize();
++
++    InvalidatePageBreaks();
+ }
+ 
+ 
+@@ -164,6 +166,8 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
+     }
+ 	if( !--nRecalcLvl )
+ 		SetDrawPageSize();
++
++    InvalidatePageBreaks();
+ }
+ 
+ 
+@@ -230,6 +234,8 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
+ 	}
+ 	if( !--nRecalcLvl )
+ 		SetDrawPageSize();
++
++    InvalidatePageBreaks();
+ }
+ 
+ 
+@@ -272,6 +278,8 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
+ 	}
+ 	if( !--nRecalcLvl )
+ 		SetDrawPageSize();
++
++    InvalidatePageBreaks();
+ }
+ 
+ 
+@@ -638,29 +646,39 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+ 				if (bWidth)
+ 					for (SCCOL i=nCol1; i<=nCol2; i++)
+ 					{
+-						BOOL bChange = pCharts &&
+-							( pDestTab->pColFlags[i] & CR_HIDDEN ) != ( pColFlags[i] & CR_HIDDEN );
++						bool bHiddenChange = ( pDestTab->pColFlags[i] & CR_HIDDEN ) != ( pColFlags[i] & CR_HIDDEN );
++						bool bChange = bHiddenChange || (pDestTab->pColWidth[i] != pColWidth[i]);
+ 						pDestTab->pColWidth[i] = pColWidth[i];
+ 						pDestTab->pColFlags[i] = pColFlags[i];
+ 						//!	Aenderungen zusammenfassen?
+-						if (bChange)
++						if (bHiddenChange && pCharts) 
+ 							pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab ));
++
++						if (bChange)
++							pDestTab->InvalidatePageBreaks();
+ 					}
+ 
+ 				if (bHeight)
+ 				{
++					bool bChange = pDestTab->pRowHeight->SumValues(nRow1, nRow2) != pRowHeight->SumValues(nRow1, nRow2);
++
++					if (bChange)
++						pDestTab->InvalidatePageBreaks();
++
+ 					pDestTab->pRowHeight->CopyFrom( *pRowHeight, nRow1, nRow2);
+ 					for (SCROW i=nRow1; i<=nRow2; i++)
+ 					{
+ 						// TODO: might need some performance improvement, block
+ 						// operations instead of single GetValue()/SetValue() calls.
+ 						BYTE nThisRowFlags = pRowFlags->GetValue(i);
+-						BOOL bChange = pCharts &&
+-							( pDestTab->pRowFlags->GetValue(i) & CR_HIDDEN ) != ( nThisRowFlags & CR_HIDDEN );
++						bool bHiddenChange = ( pDestTab->pRowFlags->GetValue(i) & CR_HIDDEN ) != ( nThisRowFlags & CR_HIDDEN );
+ 						pDestTab->pRowFlags->SetValue( i, nThisRowFlags );
+ 						//!	Aenderungen zusammenfassen?
+-						if (bChange)
++						if (bHiddenChange && pCharts)
+ 							pCharts->SetRangeDirty(ScRange( 0, i, nTab, MAXCOL, i, nTab ));
++
++						if (bHiddenChange)
++							pDestTab->InvalidatePageBreaks();
+ 					}
+ 				}
+ 				pDestTab->DecRecalcLevel();
+@@ -711,6 +729,16 @@ void ScTable::CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const
+ 		aCol[i].CopyUpdated( pPosTab->aCol[i], pDestTab->aCol[i] );
+ }
+ 
++void ScTable::InvalidateTableArea()
++{
++    bTableAreaValid = FALSE;
++}
++
++void ScTable::InvalidatePageBreaks()
++{
++    mbPageBreaksValid = false;
++}
++
+ void ScTable::CopyScenarioTo( ScTable* pDestTab ) const
+ {
+ 	DBG_ASSERT( bScenario, "bScenario == FALSE" );
+@@ -1931,6 +1959,8 @@ void ScTable::SetColWidth( SCCOL nCol, USHORT nNewWidth )
+ 			pColWidth[nCol] = nNewWidth;
+ 			if( !--nRecalcLvl )
+ 				SetDrawPageSize();
++
++            InvalidatePageBreaks();
+ 		}
+ 	}
+ 	else
+@@ -1960,6 +1990,8 @@ void ScTable::SetRowHeight( SCROW nRow, USHORT nNewHeight )
+ 			pRowHeight->SetValue( nRow, nNewHeight);
+ 			if( !--nRecalcLvl )
+ 				SetDrawPageSize();
++
++            InvalidatePageBreaks();
+ 		}
+ 	}
+ 	else
+@@ -2041,6 +2073,9 @@ BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeig
+ 		}
+ 		if( !--nRecalcLvl )
+ 			SetDrawPageSize();
++
++        if (bChanged)
++            InvalidatePageBreaks();
+ 	}
+ 	else
+ 	{
+@@ -2280,6 +2315,8 @@ void ScTable::ShowRow(SCROW nRow, BOOL bShow)
+ 			ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
+ 			if ( pCharts )
+ 				pCharts->SetRangeDirty(ScRange( 0, nRow, nTab, MAXCOL, nRow, nTab ));
++
++            InvalidatePageBreaks();
+ 		}
+ 	}
+ 	else
+@@ -2324,6 +2361,8 @@ void ScTable::DBShowRow(SCROW nRow, BOOL bShow)
+ 
+ 			if (pOutlineTable)
+ 				UpdateOutlineRow( nRow, nRow, bShow );
++
++            InvalidatePageBreaks();
+ 		}
+ 	}
+ 	else
+@@ -2421,6 +2460,8 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
+ 			ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
+ 			if ( pCharts )
+ 				pCharts->SetRangeDirty(ScRange( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab ));
++
++            InvalidatePageBreaks();
+ 		}
+ 
+ 		nStartRow = nEndRow + 1;
+@@ -2496,7 +2537,7 @@ SCROW ScTable::GetLastFlaggedRow() const
+ 	if ( !pRowFlags )
+ 		return 0;
+ 
+-    SCROW nLastFound = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
++    SCROW nLastFound = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(CR_ALL) );
+ 	return ValidRow(nLastFound) ? nLastFound : 0;
+ }
+ 
+@@ -2508,7 +2549,7 @@ SCCOL ScTable::GetLastChangedCol() const
+ 
+ 	SCCOL nLastFound = 0;
+ 	for (SCCOL nCol = 1; nCol <= MAXCOL; nCol++)
+-		if ((pColFlags[nCol] & ~CR_PAGEBREAK) || (pColWidth[nCol] != STD_COL_WIDTH))
++        if ((pColFlags[nCol] & CR_ALL) || (pColWidth[nCol] != STD_COL_WIDTH))
+ 			nLastFound = nCol;
+ 
+ 	return nLastFound;
+@@ -2520,7 +2561,7 @@ SCROW ScTable::GetLastChangedRow() const
+ 	if ( !pRowFlags )
+ 		return 0;
+ 
+-    SCROW nLastFlags = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
++    SCROW nLastFlags = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(CR_ALL) );
+     if (!ValidRow(nLastFlags))
+         nLastFlags = 0;
+ 
+diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx
+index 5fca4bc..95f68fc 100644
+--- sc/source/core/data/table3.cxx
++++ sc/source/core/data/table3.cxx
+@@ -771,7 +771,7 @@ void ScTable::RemoveSubTotals( ScSubTotalParam& rParam )
+ 			if ( pCell->GetCellType() == CELLTYPE_FORMULA )
+ 				if (((ScFormulaCell*)pCell)->IsSubTotal())
+ 				{
+-					SetRowFlags(nRow+1,GetRowFlags(nRow+1)&(~CR_MANUALBREAK));
++                    RemoveRowBreak(nRow+1, false, true);
+ 					pDocument->DeleteRow( 0,nTab, MAXCOL,nTab, nRow, 1 );
+ 					--nEndRow;
+ 					aIter = ScColumnIterator( &aCol[nCol],nRow,nEndRow );
+@@ -939,9 +939,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
+ 					bBlockVis = FALSE;
+                     if ( rParam.bPagebreak && nRow < MAXROW &&
+                             aRowEntry.nSubStartRow != nStartRow && nLevel == 0)
+-                        SetRowFlags( aRowEntry.nSubStartRow,
+-                                GetRowFlags(aRowEntry.nSubStartRow) |
+-                                CR_MANUALBREAK);
++                        SetRowBreak(aRowEntry.nSubStartRow, false, true);
+ 
+ 					if (bSpaceLeft)
+ 					{
+diff --git sc/source/core/data/table5.cxx sc/source/core/data/table5.cxx
+index 3bb433c..618fe75 100644
+--- sc/source/core/data/table5.cxx
++++ sc/source/core/data/table5.cxx
+@@ -53,8 +53,13 @@
+ #include "brdcst.hxx"
+ #include "tabprotection.hxx"
+ #include "globstr.hrc"
++#include <com/sun/star/sheet/TablePageBreakData.hpp>
++
++#include <algorithm>
+ 
+ using ::com::sun::star::uno::Sequence;
++using ::com::sun::star::sheet::TablePageBreakData;
++using ::std::set;
+ 
+ // STATIC DATA -----------------------------------------------------------
+ 
+@@ -68,6 +73,9 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+ 	if ( !pUserArea && !bPageSizeValid )
+ 		return;
+ 
++    if (mbPageBreaksValid)
++        return;
++
+ 	SfxStyleSheetBase* pStyle = pDocument->GetStyleSheetPool()->
+ 									Find( aPageStyle, SFX_STYLE_FAMILY_PAGE );
+ 	if ( !pStyle )
+@@ -79,7 +87,6 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+ 	const SfxPoolItem* pItem;
+ 
+ 	SCCOL nX;
+-	SCROW nY;
+ 	SCCOL nStartCol = 0;
+ 	SCROW nStartRow = 0;
+ 	SCCOL nEndCol = MAXCOL;
+@@ -99,8 +106,9 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+ 			//	bei mehreren Bereichen nichts anzeigen:
+ 
+ 			for (nX=0; nX<MAXCOL; nX++)
+-				pColFlags[nX] &= ~CR_PAGEBREAK;
+-            pRowFlags->AndValue( 0, MAXROW-1, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
++                RemoveColBreak(nX, true, false);
++
++            RemoveRowPageBreaks(0, MAXROW-1);
+ 
+ 			return;
+ 		}
+@@ -144,13 +152,13 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+ 		//	Anfang: Breaks loeschen
+ 
+ 	for (nX=0; nX<nStartCol; nX++)
+-		pColFlags[nX] &= ~CR_PAGEBREAK;
+-    pRowFlags->AndValue( 0, nStartRow-1, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
++        RemoveColBreak(nX, true, false);
++    RemoveRowPageBreaks(0, nStartRow-1);
+ 
+ 	if (nStartCol > 0)
+-		pColFlags[nStartCol] |= CR_PAGEBREAK;			//! AREABREAK
++        SetColBreak(nStartCol, true, false);  // AREABREAK
+ 	if (nStartRow > 0)
+-		pRowFlags->OrValue( nStartRow, CR_PAGEBREAK);			//! AREABREAK
++        SetRowBreak(nStartRow, true, false);  // AREABREAK
+ 
+ 		//	Mittelteil: Breaks verteilen
+ 
+@@ -161,14 +169,15 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+ 	{
+ 		BOOL bStartOfPage = FALSE;
+ 		long nThisX = ( pColFlags[nX] & CR_HIDDEN ) ? 0 : pColWidth[nX];
+-		if ( (nSizeX+nThisX > nPageSizeX) || ((pColFlags[nX] & CR_MANUALBREAK) && !bSkipBreaks) )
++        bool bManualBreak = HasColManualBreak(nX);
++        if ( (nSizeX+nThisX > nPageSizeX) || (bManualBreak && !bSkipBreaks) )
+ 		{
+-			pColFlags[nX] |= CR_PAGEBREAK;
++            SetColBreak(nX, true, false);
+ 			nSizeX = 0;
+ 			bStartOfPage = TRUE;
+ 		}
+ 		else if (nX != nStartCol)
+-			pColFlags[nX] &= ~CR_PAGEBREAK;
++            RemoveColBreak(nX, true, false);
+ 		else
+ 			bStartOfPage = TRUE;
+ 
+@@ -178,7 +187,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+ 			for (SCCOL i=nRepeatStartX; i<=nRepeatEndX; i++)
+ 				nPageSizeX -= ( pColFlags[i] & CR_HIDDEN ) ? 0 : pColWidth[i];
+ 			while (nX<=nRepeatEndX)
+-				pColFlags[++nX] &= ~CR_PAGEBREAK;
++                RemoveColBreak(++nX, true, false);
+ 			bColFound = TRUE;
+ 		}
+ 
+@@ -186,23 +195,21 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+ 	}
+ 
+     // Remove all page breaks in range.
+-    pRowFlags->AndValue( nStartRow+1, nEndRow, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
++    RemoveRowPageBreaks(nStartRow+1, nEndRow);
++
+     // And set new page breaks.
+ 	BOOL bRepeatRow = ( nRepeatStartY != SCROW_REPEAT_NONE );
+ 	BOOL bRowFound = FALSE;
+ 	long nSizeY = 0;
+-    ScCompressedArrayIterator< SCROW, BYTE> aFlagsIter( *pRowFlags, nStartRow, nEndRow);
+-    ScCompressedArrayIterator< SCROW, USHORT> aHeightIter( *pRowHeight, nStartRow, nEndRow);
+-    for ( ; aFlagsIter; ++aFlagsIter, ++aHeightIter)
+-	{
+-        nY = aFlagsIter.GetPos();
++    for (SCROW nY = nStartRow; nY <= nEndRow; ++nY)
++    {
+ 		BOOL bStartOfPage = FALSE;
+-        BYTE nFlags = *aFlagsIter;
+-		long nThisY = (nFlags & CR_HIDDEN) ? 0 : *aHeightIter;
+-		if ( (nSizeY+nThisY > nPageSizeY) || ((nFlags & CR_MANUALBREAK) && !bSkipBreaks) )
++        BYTE nFlags = pRowFlags->GetValue(nY);
++        long nThisY = (nFlags & CR_HIDDEN) ? 0 : pRowHeight->GetValue(nY);
++        bool bManualBreak = HasRowManualBreak(nY);
++		if ( (nSizeY+nThisY > nPageSizeY) || (bManualBreak && !bSkipBreaks) )
+ 		{
+-			pRowFlags->SetValue( nY, nFlags | CR_PAGEBREAK);
+-            aFlagsIter.Resync( nY);
++            SetRowBreak(nY, true, false);
+ 			nSizeY = 0;
+ 			bStartOfPage = TRUE;
+ 		}
+@@ -222,12 +229,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+ #endif
+             nPageSizeY -= nHeights;
+             if (nY <= nRepeatEndY)
+-            {
+-                pRowFlags->AndValue( nY, nRepeatEndY, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
+-                nY = nRepeatEndY + 1;
+-                aFlagsIter.Resync( nY);
+-                aHeightIter.Resync( nY);
+-            }
++                RemoveRowPageBreaks(nY, nRepeatEndY);
+ 			bRowFound = TRUE;
+ 		}
+ 
+@@ -238,46 +240,214 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+ 
+ 	if (nEndCol < MAXCOL)
+ 	{
+-		pColFlags[nEndCol+1] |= CR_PAGEBREAK;			//! AREABREAK
++        SetColBreak(nEndCol+1, true, false);  // AREABREAK
+ 		for (nX=nEndCol+2; nX<=MAXCOL; nX++)
+-			pColFlags[nX] &= ~CR_PAGEBREAK;
++            RemoveColBreak(nX, true, false);
+ 	}
+ 	if (nEndRow < MAXROW)
+ 	{
+-		pRowFlags->OrValue( nEndRow+1, CR_PAGEBREAK);			//! AREABREAK
++        SetRowBreak(nEndRow+1, true, false);  // AREABREAK
+ 		if (nEndRow+2 <= MAXROW)
+-            pRowFlags->AndValue( nEndRow+2, MAXROW, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
++            RemoveRowPageBreaks(nEndRow+2, MAXROW);
+ 	}
++    mbPageBreaksValid = true;
+ }
+ 
+ void ScTable::RemoveManualBreaks()
+ {
+-	if (pColFlags)
+-		for (SCCOL nCol = 0; nCol <= MAXCOL; nCol++)
+-			pColFlags[nCol] &= ~CR_MANUALBREAK;
+-
+-	if (pRowFlags)
+-        pRowFlags->AndValue( 0, MAXROW, sal::static_int_cast<BYTE>(~CR_MANUALBREAK) );
++    maRowManualBreaks.clear();
++    maColManualBreaks.clear();
++    InvalidatePageBreaks();
+ }
+ 
+ BOOL ScTable::HasManualBreaks() const
+ {
+-	if (pColFlags)
+-		for (SCCOL nCol = 0; nCol <= MAXCOL; nCol++)
+-			if ( pColFlags[nCol] & CR_MANUALBREAK )
+-				return TRUE;
++    return !maRowManualBreaks.empty() || !maColManualBreaks.empty();
++}
++
++void ScTable::GetAllRowBreaks(set<SCROW>& rBreaks, bool bPage, bool bManual) const
++{
++    if (bPage)
++        rBreaks = maRowPageBreaks;
++
++    if (bManual)
++    {
++        using namespace std;    
++        copy(maRowManualBreaks.begin(), maRowManualBreaks.end(), inserter(rBreaks, rBreaks.begin()));
++    }
++}
++
++void ScTable::GetAllColBreaks(set<SCCOL>& rBreaks, bool bPage, bool bManual) const
++{
++    if (bPage)
++        rBreaks = maColPageBreaks;
++
++    if (bManual)
++    {
++        using namespace std;
++        copy(maColManualBreaks.begin(), maColManualBreaks.end(), inserter(rBreaks, rBreaks.begin()));
++    }
++}
++
++bool ScTable::HasRowPageBreak(SCROW nRow) const
++{
++    if (!ValidRow(nRow))
++        return false;
++
++    return maRowPageBreaks.count(nRow) > 0;
++}
+ 
+-	if (pRowFlags)
+-        if (ValidRow( pRowFlags->GetLastAnyBitAccess( 0, CR_MANUALBREAK)))
+-            return TRUE;
++bool ScTable::HasColPageBreak(SCCOL nCol) const
++{
++    if (!ValidCol(nCol))
++        return false;
+ 
+-	return FALSE;
++    return maColPageBreaks.count(nCol) > 0;
++}
++
++bool ScTable::HasRowManualBreak(SCROW nRow) const
++{
++    if (!ValidRow(nRow))
++        return false;
++
++    return maRowManualBreaks.count(nRow) > 0;
++}
++
++bool ScTable::HasColManualBreak(SCCOL nCol) const
++{
++    if (!ValidCol(nCol))
++        return false;
++
++    return (maColManualBreaks.count(nCol) > 0);
++}
++
++void ScTable::RemoveRowPageBreaks(SCROW nStartRow, SCROW nEndRow)
++{
++    using namespace std;
++
++    if (!ValidRow(nStartRow) || !ValidRow(nEndRow))
++        return;
++
++    set<SCROW>::iterator low  = maRowPageBreaks.lower_bound(nStartRow);
++    set<SCROW>::iterator high = maRowPageBreaks.upper_bound(nEndRow);
++    maRowPageBreaks.erase(low, high);
++}
++
++void ScTable::RemoveRowBreak(SCROW nRow, bool bPage, bool bManual)
++{
++    if (!ValidRow(nRow))
++        return;
++
++    if (bPage)
++        maRowPageBreaks.erase(nRow);
++
++    if (bManual)
++    {    
++        maRowManualBreaks.erase(nRow);
++        InvalidatePageBreaks();
++    }
++}
++
++void ScTable::RemoveColBreak(SCCOL nCol, bool bPage, bool bManual)
++{
++    if (!ValidCol(nCol))
++        return;
++
++    if (bPage)
++        maColPageBreaks.erase(nCol);
++
++    if (bManual)
++    {    
++        maColManualBreaks.erase(nCol);
++        InvalidatePageBreaks();
++    }
++}
++
++void ScTable::SetRowBreak(SCROW nRow, bool bPage, bool bManual)
++{
++    if (!ValidRow(nRow))
++        return;
++
++    if (bPage)
++        maRowPageBreaks.insert(nRow);
++
++    if (bManual)
++    {    
++        maRowManualBreaks.insert(nRow);
++        InvalidatePageBreaks();
++    }
++}
++
++void ScTable::SetColBreak(SCCOL nCol, bool bPage, bool bManual)
++{
++    if (!ValidCol(nCol))
++        return;
++
++    if (bPage)
++        maColPageBreaks.insert(nCol);
++
++    if (bManual)
++    {    
++        maColManualBreaks.insert(nCol);
++        InvalidatePageBreaks();
++    }
++}
++
++Sequence<TablePageBreakData> ScTable::GetRowBreakData() const
++{
++    using ::std::copy;
++    using ::std::inserter;
++
++    set<SCROW> aRowBreaks = maRowPageBreaks;
++    copy(maRowManualBreaks.begin(), maRowManualBreaks.end(), inserter(aRowBreaks, aRowBreaks.begin()));
++
++    set<SCROW>::const_iterator itr = aRowBreaks.begin(), itrEnd = aRowBreaks.end();
++    Sequence<TablePageBreakData> aSeq(aRowBreaks.size());
++
++    for (sal_Int32 i = 0; itr != itrEnd; ++itr, ++i)
++    {
++        SCROW nRow = *itr;
++        TablePageBreakData aData;
++        aData.Position = nRow;
++        aData.ManualBreak = HasRowManualBreak(nRow);
++        aSeq[i] = aData;
++    }
++
++    return aSeq;
++}
++
++void ScTable::SyncColRowFlags()
++{
++    using ::sal::static_int_cast;
++
++    // For now, we only need to sync the manual breaks.
++
++    pRowFlags->AndValue(0, MAXROW, static_int_cast<BYTE>(~CR_MANUALBREAK));
++    for (SCCOL i = 0; i <= MAXCOL; ++i)
++        pColFlags[i] &= static_int_cast<BYTE>(~CR_MANUALBREAK);
++
++    if (!maRowManualBreaks.empty())
++    {
++        for (set<SCROW>::const_iterator itr = maRowManualBreaks.begin(), itrEnd = maRowManualBreaks.end();
++              itr != itrEnd; ++itr)
++            pRowFlags->OrValue(*itr, static_int_cast<BYTE>(CR_MANUALBREAK));
++    }
++
++    if (!maColManualBreaks.empty())
++    {
++        for (set<SCCOL>::const_iterator itr = maColManualBreaks.begin(), itrEnd = maColManualBreaks.end();
++              itr != itrEnd; ++itr)
++            pColFlags[*itr] |= CR_MANUALBREAK;
++    }
+ }
+ 
+ void ScTable::SetPageSize( const Size& rSize )
+ {
+ 	if ( rSize.Width() != 0 && rSize.Height() != 0 )
+ 	{
++        if (aPageSizeTwips != rSize)
++            InvalidatePageBreaks();
++
+ 		bPageSizeValid = TRUE;
+ 		aPageSizeTwips = rSize;
+ 	}
+diff --git sc/source/filter/excel/xepage.cxx sc/source/filter/excel/xepage.cxx
+index 52aa775..f99b732 100644
+--- sc/source/filter/excel/xepage.cxx
++++ sc/source/filter/excel/xepage.cxx
+@@ -48,9 +48,14 @@
+ #include "xehelper.hxx"
+ #include "xeescher.hxx"
+ 
++#include <set>
++#include <limits>
++
+ #include <oox/core/tokens.hxx>
+ 
+ using ::rtl::OString;
++using ::std::set;
++using ::std::numeric_limits;
+ 
+ // Page settings records ======================================================
+ 
+@@ -302,17 +307,23 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& rRoot ) :
+ 
+     // *** page breaks ***
+ 
+-    ScCompressedArrayIterator< SCROW, BYTE> aIter( rDoc.GetRowFlagsArray( nScTab), 1, GetMaxPos().Row());
+-    do
++    set<SCROW> aRowBreaks;
++    rDoc.GetAllRowBreaks(aRowBreaks, nScTab, false, true);
++
++    SCROW nMaxRow = numeric_limits<sal_uInt16>::max();
++    for (set<SCROW>::const_iterator itr = aRowBreaks.begin(), itrEnd = aRowBreaks.end(); itr != itrEnd; ++itr)
+     {
+-        if (*aIter & CR_MANUALBREAK)
+-            for (SCROW j=aIter.GetRangeStart(); j<=aIter.GetRangeEnd(); ++j)
+-                maData.maHorPageBreaks.push_back( static_cast< sal_uInt16 >( j ) );
+-    } while (aIter.NextRange());
+-
+-    for( SCCOL nScCol = 1, nScMaxCol = GetMaxPos().Col(); nScCol <= nScMaxCol; ++nScCol )
+-        if( rDoc.GetColFlags( nScCol, nScTab ) & CR_MANUALBREAK )
+-            maData.maVerPageBreaks.push_back( static_cast< sal_uInt16 >( nScCol ) );
++        SCROW nRow = *itr;
++        if (nRow > nMaxRow)
++            break;
++        
++        maData.maHorPageBreaks.push_back(nRow);
++    }
++
++    set<SCCOL> aColBreaks;
++    rDoc.GetAllColBreaks(aColBreaks, nScTab, false, true);
++    for (set<SCCOL>::const_iterator itr = aColBreaks.begin(), itrEnd = aColBreaks.end(); itr != itrEnd; ++itr)
++        maData.maVerPageBreaks.push_back(*itr);
+ }
+ 
+ static void lcl_WriteHeaderFooter( XclExpXmlStream& rStrm )
+diff --git sc/source/filter/excel/xipage.cxx sc/source/filter/excel/xipage.cxx
+index 2a52521..cb1aba2 100644
+--- sc/source/filter/excel/xipage.cxx
++++ sc/source/filter/excel/xipage.cxx
+@@ -378,14 +378,14 @@ void XclImpPageSettings::Finalize()
+     {
+         SCROW nScRow = static_cast< SCROW >( *aIt );
+         if( nScRow <= MAXROW )
+-            rDoc.SetRowFlags( nScRow, nScTab, rDoc.GetRowFlags( nScRow, nScTab ) | CR_MANUALBREAK );
++            rDoc.SetRowBreak(nScRow, nScTab, false, true);
+     }
+ 
+     for( aIt = maData.maVerPageBreaks.begin(), aEnd = maData.maVerPageBreaks.end(); aIt != aEnd; ++aIt )
+     {
+         SCCOL nScCol = static_cast< SCCOL >( *aIt );
+         if( nScCol <= MAXCOL )
+-            rDoc.SetColFlags( nScCol, nScTab, rDoc.GetColFlags( nScCol, nScTab ) | CR_MANUALBREAK );
++            rDoc.SetColBreak(nScCol, nScTab, false, true);
+     }
+ }
+ 
+diff --git sc/source/filter/starcalc/scflt.cxx sc/source/filter/starcalc/scflt.cxx
+index 444ed23..371ef48 100644
+--- sc/source/filter/starcalc/scflt.cxx
++++ sc/source/filter/starcalc/scflt.cxx
+@@ -1552,13 +1552,15 @@ void Sc10Import::LoadTables()
+ 			if (DataValue != 0)
+ 			{
+ 				BYTE nFlags = 0;
+-				if ((DataValue & crfSoftBreak) == crfSoftBreak)
+-					nFlags |= CR_PAGEBREAK;
+-				if ((DataValue & crfHardBreak) == crfHardBreak)
+-					nFlags |= CR_MANUALBREAK;
++				bool bPageBreak   = ((DataValue & crfSoftBreak) == crfSoftBreak);
++				bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak);
+ 				if ((DataValue & crfHidden) == crfHidden)
+ 					nFlags |= CR_HIDDEN;
+-				for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++) pDoc->SetColFlags(k, static_cast<SCTAB> (TabNo), nFlags);
++				for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++) 
++                {    
++                    pDoc->SetColFlags(k, static_cast<SCTAB> (TabNo), nFlags);
++                    pDoc->SetColBreak(k, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak);
++                }
+ 			}
+ 			DataStart = DataEnd + 1;
+ 		}
+@@ -1602,13 +1604,15 @@ void Sc10Import::LoadTables()
+ 			if (DataValue != 0)
+ 			{
+ 				BYTE nFlags = 0;
+-				if ((DataValue & crfSoftBreak) == crfSoftBreak)
+-					nFlags |= CR_PAGEBREAK;
+-				if ((DataValue & crfHardBreak) == crfHardBreak)
+-					nFlags |= CR_MANUALBREAK;
++				bool bPageBreak   = ((DataValue & crfSoftBreak) == crfSoftBreak);
++				bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak);
+ 				if ((DataValue & crfHidden) == crfHidden)
+ 					nFlags |= CR_HIDDEN;
+-				for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++) pDoc->SetRowFlags(l, static_cast<SCTAB> (TabNo), nFlags);
++                for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++) 
++                {    
++                    pDoc->SetRowFlags(l, static_cast<SCTAB> (TabNo), nFlags);
++                    pDoc->SetRowBreak(l, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak);
++                }
+ 			}
+ 			DataStart = DataEnd + 1;
+ 		}
+diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
+index 089f12d..4dd19a1 100644
+--- sc/source/filter/xml/xmlexprt.cxx
++++ sc/source/filter/xml/xmlexprt.cxx
+@@ -1947,6 +1947,7 @@ void ScXMLExport::_ExportAutoStyles()
+ 						    {
+ 							    if (pDoc)
+ 							    {
++                                    pDoc->SyncColRowFlags();
+ 								    uno::Reference<table::XTableColumns> xTableColumns(xColumnRowRange->getColumns());
+ 								    if (xTableColumns.is())
+ 								    {
+diff --git sc/source/ui/docshell/dbdocfun.cxx sc/source/ui/docshell/dbdocfun.cxx
+index 9e2a647..0e670d8 100644
+--- sc/source/ui/docshell/dbdocfun.cxx
++++ sc/source/ui/docshell/dbdocfun.cxx
+@@ -938,7 +938,10 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
+ 	}
+ 
+ 	if (!bCopy)
++    {
++        pDoc->InvalidatePageBreaks(nTab);    
+ 		pDoc->UpdatePageBreaks( nTab );
++    }
+ 
+     // #i23299# because of Subtotal functions, the whole rows must be set dirty
+ 	ScRange aDirtyRange( 0 , aLocalParam.nRow1, nDestTab,
+diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
+index 0d98486..1477025 100644
+--- sc/source/ui/docshell/docfunc.cxx
++++ sc/source/ui/docshell/docfunc.cxx
+@@ -3033,20 +3033,22 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
+ 	if (nPos == 0)
+ 		return FALSE;					// erste Spalte / Zeile
+ 
+-    BYTE nFlags = bColumn ? pDoc->GetColFlags( static_cast<SCCOL>(nPos), nTab )
+-        : pDoc->GetRowFlags( static_cast<SCROW>(nPos), nTab );
+-	if (nFlags & CR_MANUALBREAK)
+-		return TRUE;					// Umbruch schon gesetzt
++    ScBreakType nBreak = bColumn ? 
++        pDoc->HasColBreak(static_cast<SCCOL>(nPos), nTab) : 
++        pDoc->HasRowBreak(static_cast<SCROW>(nPos), nTab);
++    if (nBreak & BREAK_MANUAL)
++        return true;
+ 
+ 	if (bRecord)
+ 		rDocShell.GetUndoManager()->AddUndoAction(
+ 			new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, TRUE ) );
+ 
+-	nFlags |= CR_MANUALBREAK;
+-	if (bColumn)
+-		pDoc->SetColFlags( static_cast<SCCOL>(nPos), nTab, nFlags );
+-	else
+-		pDoc->SetRowFlags( static_cast<SCROW>(nPos), nTab, nFlags );
++    if (bColumn)
++        pDoc->SetColBreak(static_cast<SCCOL>(nPos), nTab, false, true);
++    else
++        pDoc->SetRowBreak(static_cast<SCROW>(nPos), nTab, false, true);
++
++    pDoc->InvalidatePageBreaks(nTab);
+ 	pDoc->UpdatePageBreaks( nTab );
+ 
+ 	if (bColumn)
+@@ -3089,20 +3091,25 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
+ 
+     SCCOLROW nPos = bColumn ? static_cast<SCCOLROW>(rPos.Col()) :
+         static_cast<SCCOLROW>(rPos.Row());
+-    BYTE nFlags = bColumn ? pDoc->GetColFlags( static_cast<SCCOL>(nPos), nTab )
+-        : pDoc->GetRowFlags( static_cast<SCROW>(nPos), nTab );
+-	if ((nFlags & CR_MANUALBREAK)==0)
+-		return FALSE;							// kein Umbruch gesetzt
++
++    ScBreakType nBreak;
++    if (bColumn)
++        nBreak = pDoc->HasColBreak(static_cast<SCCOL>(nPos), nTab);
++    else
++        nBreak = pDoc->HasRowBreak(static_cast<SCROW>(nPos), nTab);
++    if ((nBreak & BREAK_MANUAL) == 0)
++        // There is no manual break.
++        return false;
+ 
+ 	if (bRecord)
+ 		rDocShell.GetUndoManager()->AddUndoAction(
+ 			new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, FALSE ) );
+ 
+-	nFlags &= ~CR_MANUALBREAK;
+-	if (bColumn)
+-		pDoc->SetColFlags( static_cast<SCCOL>(nPos), nTab, nFlags );
+-	else
+-		pDoc->SetRowFlags( static_cast<SCROW>(nPos), nTab, nFlags );
++    if (bColumn)
++        pDoc->RemoveColBreak(static_cast<SCCOL>(nPos), nTab, false, true);
++    else
++        pDoc->RemoveRowBreak(static_cast<SCROW>(nPos), nTab, false, true);
++
+ 	pDoc->UpdatePageBreaks( nTab );
+ 
+ 	if (bColumn)
+diff --git sc/source/ui/docshell/olinefun.cxx sc/source/ui/docshell/olinefun.cxx
+index ed5fb52..37023e2 100644
+--- sc/source/ui/docshell/olinefun.cxx
++++ sc/source/ui/docshell/olinefun.cxx
+@@ -692,6 +692,7 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
+ 
+ 	pArray->SetVisibleBelow( nLevel, nEntry, TRUE, TRUE );
+ 
++    pDoc->InvalidatePageBreaks(nTab);
+ 	pDoc->UpdatePageBreaks( nTab );
+ 
+ 	if (bPaint)
+@@ -757,6 +758,7 @@ BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
+ 
+ 	pArray->SetVisibleBelow( nLevel, nEntry, FALSE );
+ 
++    pDoc->InvalidatePageBreaks(nTab);
+ 	pDoc->UpdatePageBreaks( nTab );
+ 
+ 	if (bPaint)
+diff --git sc/source/ui/undo/undocell.cxx sc/source/ui/undo/undocell.cxx
+index 52c8bc0..9237578 100644
+--- sc/source/ui/undo/undocell.cxx
++++ sc/source/ui/undo/undocell.cxx
+@@ -587,6 +587,8 @@ void ScUndoPageBreak::DoChange( BOOL bInsertP ) const
+ 			pViewShell->InsertPageBreak(bColumn, FALSE);
+ 		else
+ 			pViewShell->DeletePageBreak(bColumn, FALSE);
++
++        pDocShell->GetDocument()->InvalidatePageBreaks(nTab);
+ 	}
+ }
+ 
+diff --git sc/source/ui/undo/undodat.cxx sc/source/ui/undo/undodat.cxx
+index 36bb424..7420660 100644
+--- sc/source/ui/undo/undodat.cxx
++++ sc/source/ui/undo/undodat.cxx
+@@ -1032,7 +1032,10 @@ void __EXPORT ScUndoQuery::Undo()
+ 		pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), TRUE );
+ 
+ 	if (!bCopy)
++    {
++        pDoc->InvalidatePageBreaks(nTab);    
+ 		pDoc->UpdatePageBreaks( nTab );
++    }
+ 
+     ScRange aDirtyRange( 0 , aQueryParam.nRow1, nTab,
+         MAXCOL, aQueryParam.nRow2, nTab );
+--- sc/source/ui/unoobj/cellsuno.cxx
++++ sc/source/ui/unoobj/cellsuno.cxx
+@@ -7150,7 +7150,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage
+ 		SCCOL nCount = 0;
+ 		SCCOL nCol;
+ 		for (nCol=0; nCol<=MAXCOL; nCol++)
+-			if (pDoc->GetColFlags( nCol, nTab ) & ( CR_PAGEBREAK | CR_MANUALBREAK ))
++            if (pDoc->HasColBreak(nCol, nTab))
+ 				++nCount;
+ 
+ 		sheet::TablePageBreakData aData;
+@@ -7159,11 +7159,11 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage
+ 		USHORT nPos = 0;
+ 		for (nCol=0; nCol<=MAXCOL; nCol++)
+ 		{
+-			BYTE nFlags = pDoc->GetColFlags( nCol, nTab );
+-			if (nFlags & ( CR_PAGEBREAK | CR_MANUALBREAK ))
++            ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab);
++            if (nBreak)
+ 			{
+ 				aData.Position	  = nCol;
+-				aData.ManualBreak = ( nFlags & CR_MANUALBREAK ) != 0;
++                aData.ManualBreak = (nBreak & BREAK_MANUAL);
+ 				pAry[nPos] = aData;
+ 				++nPos;
+ 			}
+@@ -7192,33 +7192,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBre
+ 			ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab );
+ 			aPrintFunc.UpdatePages();
+ 		}
+-
+-        SCROW nCount = pDoc->GetRowFlagsArray( nTab).CountForAnyBitCondition(
+-                0, MAXROW, (CR_PAGEBREAK | CR_MANUALBREAK));
+-
+-		uno::Sequence<sheet::TablePageBreakData> aSeq(nCount);
+-        if (nCount)
+-        {
+-            sheet::TablePageBreakData aData;
+-            sheet::TablePageBreakData* pAry = aSeq.getArray();
+-            size_t nPos = 0;
+-            ScCompressedArrayIterator< SCROW, BYTE> aIter( pDoc->GetRowFlagsArray( nTab), 0, MAXROW);
+-            do
+-            {
+-                BYTE nFlags = *aIter;
+-                if (nFlags & ( CR_PAGEBREAK | CR_MANUALBREAK ))
+-                {
+-                    for (SCROW nRow = aIter.GetRangeStart(); nRow <= aIter.GetRangeEnd(); ++nRow)
+-                    {
+-                        aData.Position	  = nRow;
+-                        aData.ManualBreak = ( nFlags & CR_MANUALBREAK ) != 0;
+-                        pAry[nPos] = aData;
+-                        ++nPos;
+-                    }
+-                }
+-            } while (aIter.NextRange());
+-        }
+-		return aSeq;
++        return pDoc->GetRowBreakData(nTab);
+ 	}
+ 	return uno::Sequence<sheet::TablePageBreakData>(0);
+ }
+@@ -8987,13 +8961,13 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ 		}
+         else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE )
+ 		{
+-			BOOL bBreak = ( 0 != (pDoc->GetColFlags( nCol, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) );
+-			ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak );
++            ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab);
++            ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak );
+ 		}
+         else if ( pEntry->nWID == SC_WID_UNO_MANPAGE )
+ 		{
+-			BOOL bBreak = ( 0 != (pDoc->GetColFlags( nCol, nTab ) & (CR_MANUALBREAK)) );
+-			ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak );
++            ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab);
++            ScUnoHelpFunctions::SetBoolInAny(rAny, (nBreak & BREAK_MANUAL));
+ 		}
+ 		else
+             ScCellRangeObj::GetOnePropertyValue(pEntry, rAny);
+@@ -9151,13 +9125,13 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ 		}
+         else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE )
+ 		{
+-			BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nRow, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) );
+-			ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak );
++            ScBreakType nBreak = pDoc->HasRowBreak(nRow, nTab);
++            ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak );
+ 		}
+         else if ( pEntry->nWID == SC_WID_UNO_MANPAGE )
+ 		{
+-			BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nRow, nTab ) & (CR_MANUALBREAK)) );
+-			ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak );
++            ScBreakType nBreak = (pDoc->HasRowBreak(nRow, nTab) & BREAK_MANUAL);
++            ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak );
+ 		}
+ 		else
+             ScCellRangeObj::GetOnePropertyValue(pEntry, rAny);
+diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx
+index f14ab4a..f2f1eb5 100644
+--- sc/source/ui/unoobj/docuno.cxx
++++ sc/source/ui/unoobj/docuno.cxx
+@@ -2685,13 +2685,13 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPro
+ 	}
+ 	else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) )
+ 	{
+-		BOOL bBreak = ( 0 != (pDoc->GetColFlags( nStartCol, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) );
+-		ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak );
++        ScBreakType nBreak = pDoc->HasColBreak(nStartCol, nTab);
++        ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak );
+ 	}
+ 	else if ( aNameString.EqualsAscii( SC_UNONAME_MANPAGE ) )
+ 	{
+-		BOOL bBreak = ( 0 != (pDoc->GetColFlags( nStartCol, nTab ) & (CR_MANUALBREAK)) );
+-		ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak );
++        ScBreakType nBreak = pDoc->HasColBreak(nStartCol, nTab);
++        ScUnoHelpFunctions::SetBoolInAny( aAny, (nBreak & BREAK_MANUAL) );
+ 	}
+ 
+ 	return aAny;
+@@ -2939,13 +2939,13 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aProper
+ 	}
+ 	else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) )
+ 	{
+-		BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nStartRow, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) );
+-		ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak );
++        ScBreakType nBreak = pDoc->HasRowBreak(nStartRow, nTab);
++        ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak );
+ 	}
+ 	else if ( aNameString.EqualsAscii( SC_UNONAME_MANPAGE ) )
+ 	{
+-		BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nStartRow, nTab ) & (CR_MANUALBREAK)) );
+-		ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak );
++        ScBreakType nBreak = pDoc->HasRowBreak(nStartRow, nTab);
++        ScUnoHelpFunctions::SetBoolInAny( aAny, (nBreak & BREAK_MANUAL) );
+ 	}
+     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLBACK ) || aNameString.EqualsAscii( SC_UNONAME_CELLTRAN ) )
+     {
+diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
+index 634443a..986c376 100644
+--- sc/source/ui/vba/vbarange.cxx
++++ sc/source/ui/vba/vbarange.cxx
+@@ -3719,16 +3719,16 @@ ScVbaRange::getPageBreak() throw (uno::RuntimeException)
+ 		{
+ 	        ScDocument* pDoc =  getDocumentFromRange( mxRange );
+ 	        
+-			BYTE nFlag = 0;
++            ScBreakType nBreak = BREAK_NONE;
+ 			if ( !bColumn )
+-			    nFlag = pDoc -> GetRowFlags(thisAddress.StartRow, thisAddress.Sheet);
++                nBreak = pDoc->HasRowBreak(thisAddress.StartRow, thisAddress.Sheet);
+ 			else
+-			    nFlag = pDoc -> GetColFlags(static_cast<SCCOL>(thisAddress.StartColumn), thisAddress.Sheet);
++                nBreak = pDoc->HasColBreak(thisAddress.StartColumn, thisAddress.Sheet);
+ 			    
+-			if ( nFlag & CR_PAGEBREAK)
++            if (nBreak & BREAK_PAGE)
+ 			    nPageBreak = excel::XlPageBreak::xlPageBreakAutomatic;
+ 			    
+-			if ( nFlag & CR_MANUALBREAK)
++            if (nBreak & BREAK_MANUAL)
+ 			    nPageBreak = excel::XlPageBreak::xlPageBreakManual;
+ 		}		
+ 	}
+diff --git sc/source/ui/view/cellsh.cxx sc/source/ui/view/cellsh.cxx
+index 3c047da..f228c30 100644
+--- sc/source/ui/view/cellsh.cxx
++++ sc/source/ui/view/cellsh.cxx
+@@ -717,22 +717,22 @@ void ScCellShell::GetState(SfxItemSet &rSet)
+                 break;
+ 
+ 			case FID_INS_ROWBRK:
+-				if ( nPosY==0 || (pDoc->GetRowFlags(nPosY,nTab) & CR_MANUALBREAK) )
++                if ( nPosY==0 || (pDoc->HasRowBreak(nPosY, nTab) & BREAK_MANUAL) )
+ 					rSet.DisableItem( nWhich );
+ 				break;
+ 
+ 			case FID_INS_COLBRK:
+-				if ( nPosX==0 || (pDoc->GetColFlags(nPosX,nTab) & CR_MANUALBREAK) )
++                if ( nPosX==0 || (pDoc->HasColBreak(nPosX, nTab) & BREAK_MANUAL) )
+ 					rSet.DisableItem( nWhich );
+ 				break;
+ 
+ 			case FID_DEL_ROWBRK:
+-				if ( nPosY==0 || (pDoc->GetRowFlags(nPosY,nTab) & CR_MANUALBREAK)==0 )
++                if ( nPosY==0 || (pDoc->HasRowBreak(nPosY, nTab) & BREAK_MANUAL) == 0 )
+ 					rSet.DisableItem( nWhich );
+ 				break;
+ 
+ 			case FID_DEL_COLBRK:
+-				if ( nPosX==0 || (pDoc->GetColFlags(nPosX,nTab) & CR_MANUALBREAK)==0 )
++                if ( nPosX==0 || (pDoc->HasColBreak(nPosX, nTab) & BREAK_MANUAL) == 0 )
+ 					rSet.DisableItem( nWhich );
+ 				break;
+ 
+diff --git sc/source/ui/view/gridwin2.cxx sc/source/ui/view/gridwin2.cxx
+index 72a6606..4434440 100644
+--- sc/source/ui/view/gridwin2.cxx
++++ sc/source/ui/view/gridwin2.cxx
+@@ -1278,7 +1278,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
+ 				BOOL bGrow = !bHide && nNew > nPagebreakBreak;
+ 				if ( bColumn )
+ 				{
+-					if ( pDoc->GetColFlags( static_cast<SCCOL>(nPagebreakBreak), nTab ) & CR_MANUALBREAK )
++                    if (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakBreak), nTab) & BREAK_MANUAL)
+ 					{
+ 						ScAddress aOldAddr( static_cast<SCCOL>(nPagebreakBreak), nPosY, nTab );
+ 						pViewFunc->DeletePageBreak( TRUE, TRUE, &aOldAddr, FALSE );
+@@ -1291,8 +1291,8 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
+ 					if ( bGrow )
+ 					{
+ 						//	vorigen Break auf hart, und Skalierung aendern
+-						if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() &&
+-								!(pDoc->GetColFlags( static_cast<SCCOL>(nPagebreakPrev), nTab ) & CR_MANUALBREAK) )
++                        bool bManualBreak = (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakPrev), nTab) & BREAK_MANUAL);
++                        if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() && !bManualBreak )
+ 						{
+ 							ScAddress aPrev( static_cast<SCCOL>(nPagebreakPrev), nPosY, nTab );
+ 							pViewFunc->InsertPageBreak( TRUE, TRUE, &aPrev, FALSE );
+@@ -1305,7 +1305,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
+ 				}
+ 				else
+ 				{
+-					if ( pDoc->GetRowFlags( nPagebreakBreak, nTab ) & CR_MANUALBREAK )
++                    if (pDoc->HasRowBreak(nPagebreakBreak, nTab) & BREAK_MANUAL)
+ 					{
+ 						ScAddress aOldAddr( nPosX, nPagebreakBreak, nTab );
+ 						pViewFunc->DeletePageBreak( FALSE, TRUE, &aOldAddr, FALSE );
+@@ -1318,8 +1318,8 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
+ 					if ( bGrow )
+ 					{
+ 						//	vorigen Break auf hart, und Skalierung aendern
+-						if ( nPagebreakPrev > aPagebreakSource.aStart.Row() &&
+-								!(pDoc->GetRowFlags( nPagebreakPrev, nTab ) & CR_MANUALBREAK) )
++                        bool bManualBreak = (pDoc->HasRowBreak(nPagebreakPrev, nTab) & BREAK_MANUAL);
++                        if ( nPagebreakPrev > aPagebreakSource.aStart.Row() && !bManualBreak )
+ 						{
+ 							ScAddress aPrev( nPosX, nPagebreakPrev, nTab );
+ 							pViewFunc->InsertPageBreak( FALSE, TRUE, &aPrev, FALSE );
+diff --git sc/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx
+index 0e0742a..2e88791 100644
+--- sc/source/ui/view/gridwin4.cxx
++++ sc/source/ui/view/gridwin4.cxx
+@@ -1090,7 +1090,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
+ 					if ( nBreak >= nX1 && nBreak <= nX2+1 )
+ 					{
+ 						//! hidden suchen
+-						if ( pDoc->GetColFlags( nBreak, nTab ) & CR_MANUALBREAK )
++                        if (pDoc->HasColBreak(nBreak, nTab) & BREAK_MANUAL)
+ 							pContentDev->SetFillColor( aManual );
+ 						else
+ 							pContentDev->SetFillColor( aAutomatic );
+@@ -1109,7 +1109,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
+ 					if ( nBreak >= nY1 && nBreak <= nY2+1 )
+ 					{
+ 						//! hidden suchen
+-						if ( pDoc->GetRowFlags( nBreak, nTab ) & CR_MANUALBREAK )
++                        if (pDoc->HasRowBreak(nBreak, nTab) & BREAK_MANUAL)
+ 							pContentDev->SetFillColor( aManual );
+ 						else
+ 							pContentDev->SetFillColor( aAutomatic );
+diff --git sc/source/ui/view/output.cxx sc/source/ui/view/output.cxx
+index f320558..1585791 100644
+--- sc/source/ui/view/output.cxx
++++ sc/source/ui/view/output.cxx
+@@ -325,8 +325,9 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
+ 	long nPosX;
+ 	long nPosY;
+ 	SCSIZE nArrY;
+-	BYTE nOldFlags = 0;
+-	BYTE nFlags;
++    ScBreakType nBreak    = BREAK_NONE;
++    ScBreakType nBreakOld = BREAK_NONE;
++
+ 	BOOL bSingle;
+ 	Color aPageColor;
+ 	Color aManualColor;
+@@ -381,27 +382,27 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
+ 			if ( bPage )
+ 			{
+ 				//	Seitenumbrueche auch in ausgeblendeten suchen
+-				nFlags = 0;
+ 				SCCOL nCol = nXplus1;
+ 				while (nCol <= MAXCOL)
+ 				{
+ 					BYTE nDocFl = pDoc->GetColFlags( nCol, nTab );
+-					nFlags = nDocFl & ( CR_PAGEBREAK | CR_MANUALBREAK );
+-					if ( nFlags || !(nDocFl & CR_HIDDEN) )
++                    nBreak = pDoc->HasColBreak(nCol, nTab);
++
++                    if ( nBreak || !(nDocFl & CR_HIDDEN) )
+ 						break;
+ 					++nCol;
+ 				}
+ 
+-				if (nFlags != nOldFlags)
++                if (nBreak != nBreakOld)
+ 				{
+ 					aGrid.Flush();
+-					pDev->SetLineColor( (nFlags & CR_MANUALBREAK) ? aManualColor :
+-									 (nFlags) ? aPageColor : aGridColor );
+-					nOldFlags = nFlags;
++                    pDev->SetLineColor( (nBreak & BREAK_MANUAL) ? aManualColor :
++                                        nBreak ? aPageColor : aGridColor );
++                    nBreakOld = nBreak;
+ 				}
+ 			}
+ 
+-			BOOL bDraw = bGrid || nOldFlags;	// einfaches Gitter nur wenn eingestellt
++			BOOL bDraw = bGrid || nBreakOld;	// einfaches Gitter nur wenn eingestellt
+ 
+ 			//!	Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
+ 			//!	Umbruch mitten in den Wiederholungsspalten liegt.
+@@ -412,7 +413,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
+ 			{
+ 				if ( nX == MAXCOL )
+ 					bDraw = FALSE;
+-				else if (pDoc->GetColFlags(nXplus1,nTab) & ( CR_PAGEBREAK | CR_MANUALBREAK ))
++                else if (pDoc->HasColBreak(nXplus1, nTab))
+ 					bDraw = FALSE;
+ 			}
+ #endif
+@@ -503,28 +504,24 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
+ 		{
+ 			if ( bPage )
+ 			{
+-				//	Seitenumbrueche auch in ausgeblendeten suchen
+-				nFlags = 0;
+-                ScCompressedArrayIterator< SCROW, BYTE > aIter(
+-                        pDoc->GetRowFlagsArray( nTab), nYplus1, MAXROW);
+-                do
++                for (SCROW i = nYplus1; i <= MAXROW; ++i)
+                 {
+-					BYTE nDocFl = *aIter;
+-					nFlags = nDocFl & ( CR_PAGEBREAK | CR_MANUALBREAK );
+-					if ( nFlags || !(nDocFl & CR_HIDDEN) )
+-						break;
+-                } while (aIter.NextRange());
++                    nBreak = pDoc->HasRowBreak(i, nTab);
++                    bool bHidden = (pDoc->GetRowFlags(i, nTab) & CR_HIDDEN);
++                    if (nBreak || !bHidden)
++                        break;
++                }
+ 
+-				if (nFlags != nOldFlags)
++                if (nBreakOld != nBreak)
+ 				{
+ 					aGrid.Flush();
+-					pDev->SetLineColor( (nFlags & CR_MANUALBREAK) ? aManualColor :
+-									 (nFlags) ? aPageColor : aGridColor );
+-					nOldFlags = nFlags;
++					pDev->SetLineColor( (nBreak & BREAK_MANUAL) ? aManualColor :
++                                        (nBreak) ? aPageColor : aGridColor );
++                    nBreakOld = nBreak;
+ 				}
+ 			}
+ 
+-			BOOL bDraw = bGrid || nOldFlags;	// einfaches Gitter nur wenn eingestellt
++			BOOL bDraw = bGrid || nBreakOld;	// einfaches Gitter nur wenn eingestellt
+ 
+ 			//!	Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
+ 			//!	Umbruch mitten in den Wiederholungszeilen liegt.
+@@ -535,7 +532,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
+ 			{
+ 				if ( nY == MAXROW )
+ 					bDraw = FALSE;
+-				else if (pDoc->GetRowFlags(nYplus1,nTab) & ( CR_PAGEBREAK | CR_MANUALBREAK ))
++                else if (pDoc->HasRowBreak(nYplus1, nTab))
+ 					bDraw = FALSE;
+ 			}
+ #endif
+diff --git sc/source/ui/view/printfun.cxx sc/source/ui/view/printfun.cxx
+index 020821d..2ddaa99 100644
+--- sc/source/ui/view/printfun.cxx
++++ sc/source/ui/view/printfun.cxx
+@@ -2874,30 +2874,84 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo )						// Zoom berechnen
+ 	if (aTableParam.bScalePageNum)
+ 	{
+ 		nZoom = 100;
+-		BOOL bFound = FALSE;
+ 		USHORT nPagesToFit = aTableParam.nScalePageNum;
+-		while (!bFound)
+-		{
+-			CalcPages();
+-			if ( nPagesX * nPagesY <= nPagesToFit || nZoom <= ZOOM_MIN )
+-				bFound = TRUE;
+-			else
+-				--nZoom;
+-		}
++
++        sal_uInt16 nLastFitZoom = 0, nLastNonFitZoom = 0;
++        while (true)
++        {
++            if (nZoom <= ZOOM_MIN)
++                break;
++
++            CalcPages();
++            bool bFitsPage = (nPagesX * nPagesY <= nPagesToFit);
++
++            if (bFitsPage)
++            {
++                if (nZoom == 100)
++                    // If it fits at 100 %, it's good enough for me.
++                    break;
++                
++                nLastFitZoom = nZoom;
++                nZoom = (nLastNonFitZoom + nZoom) / 2;
++
++                if (nLastFitZoom == nZoom)
++                    // It converged.  Use this zoom level.
++                    break;
++            }
++            else
++            {
++                if (nZoom - nLastFitZoom <= 1)
++                {
++                    nZoom = nLastFitZoom;
++                    CalcPages();
++                    break;
++                }
++
++                nLastNonFitZoom = nZoom;
++                nZoom = (nLastFitZoom + nZoom) / 2;
++            }
++        }
+ 	}
+     else if (aTableParam.bScaleTo)
+     {
+         nZoom = 100;
+-        BOOL bFound = FALSE;
+         USHORT nW = aTableParam.nScaleWidth;
+         USHORT nH = aTableParam.nScaleHeight;
+-        while (!bFound)
++
++        sal_uInt16 nLastFitZoom = 0, nLastNonFitZoom = 0;
++        while (true)
+         {
++            if (nZoom <= ZOOM_MIN)
++                break;
++
+             CalcPages();
+-            if ( ((!nW || (nPagesX <= nW)) && (!nH || (nPagesY <= nH))) || (nZoom <= ZOOM_MIN) )
+-                bFound = TRUE;
++            bool bFitsPage = ((!nW || (nPagesX <= nW)) && (!nH || (nPagesY <= nH)));
++
++            if (bFitsPage)
++            {
++                if (nZoom == 100)
++                    // If it fits at 100 %, it's good enough for me.
++                    break;
++                
++                nLastFitZoom = nZoom;
++                nZoom = (nLastNonFitZoom + nZoom) / 2;
++
++                if (nLastFitZoom == nZoom)
++                    // It converged.  Use this zoom level.
++                    break;
++            }
+             else
+-                --nZoom;
++            {
++                if (nZoom - nLastFitZoom <= 1)
++                {
++                    nZoom = nLastFitZoom;
++                    CalcPages();
++                    break;
++                }
++
++                nLastNonFitZoom = nZoom;
++                nZoom = (nLastFitZoom + nZoom) / 2;
++            }
+         }
+     }
+ 	else if (aTableParam.bScaleAll)
+@@ -3021,7 +3075,8 @@ void ScPrintFunc::CalcPages()				// berechnet aPageRect und Seiten aus nZoom
+ 	for (SCCOL i=nStartCol; i<=nEndCol; i++)
+ 	{
+ 		BYTE nFlags = pDoc->GetColFlags(i,nPrintTab);
+-		if ( i>nStartCol && bVisCol && (nFlags & CR_PAGEBREAK) )
++        bool bPageBreak = (pDoc->HasColBreak(i, nPrintTab) & BREAK_PAGE);
++        if ( i>nStartCol && bVisCol && bPageBreak )
+ 		{
+ 			pPageEndX[nPagesX] = i-1;
+ 			++nPagesX;
+@@ -3046,7 +3101,8 @@ void ScPrintFunc::CalcPages()				// berechnet aPageRect und Seiten aus nZoom
+         SCROW nRangeEnd = aIter.GetRangeEnd();
+         for (SCROW j=aIter.GetRangeStart(); j<=nRangeEnd; ++j)
+         {
+-            if ( j>nStartRow && bVisRow && (nFlags & CR_PAGEBREAK) )
++            bool bPageBreak = (pDoc->HasRowBreak(j, nPrintTab) & BREAK_PAGE);
++            if ( j>nStartRow && bVisRow && bPageBreak )
+             {
+                 pPageEndY[nTotalY] = j-1;
+                 ++nTotalY;
diff --git a/applied_patches/0189-calc-perf-table-hidden-flags.diff b/applied_patches/0189-calc-perf-table-hidden-flags.diff
new file mode 100644
index 000000000..df109a0ef
--- /dev/null
+++ b/applied_patches/0189-calc-perf-table-hidden-flags.diff
@@ -0,0 +1,3846 @@
+diff --git sc/inc/column.hxx sc/inc/column.hxx
+index 3aa524f..1d7cd5f 100644
+--- sc/inc/column.hxx
++++ sc/inc/column.hxx
+@@ -213,10 +213,10 @@ public:
+                 //	UpdateSelectionFunction: Mehrfachselektion
+     void		UpdateSelectionFunction( const ScMarkData& rMark,
+                                     ScFunctionData& rData,
+-                                    const ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags,
++                                    ScFlatBoolRowSegments& rHiddenRows,
+                                     BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
+     void		UpdateAreaFunction( ScFunctionData& rData,
+-                                    const ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags,
++                                    ScFlatBoolRowSegments& rHiddenRows,
+                                     SCROW nStartRow, SCROW nEndRow );
+ 
+     void		CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
+diff --git sc/inc/document.hxx sc/inc/document.hxx
+index 6fef3aa..9ef314f 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -420,16 +420,11 @@ private:
+ 
+     sal_Int16           mnNamedRangesLockCount;
+ 
+-    inline BOOL 		RowHidden( SCROW nRow, SCTAB nTab );		// FillInfo
+-
+ public:
+     SC_DLLPUBLIC ULONG			GetCellCount() const;		// alle Zellen
+     ULONG			GetWeightedCount() const;	// Formeln und Edit staerker gewichtet
+     ULONG			GetCodeCount() const;		// RPN-Code in Formeln
+     DECL_LINK( GetUserDefinedColor, USHORT * );
+-    BOOL        RowFiltered( SCROW nRow, SCTAB nTab ) const;    // FillInfo
+-    BOOL        ColFiltered( SCCOL nCol, SCTAB nTab ) const;    // FillInfo
+-                                                                // Numberformatter
+ 
+ public:
+     SC_DLLPUBLIC 				ScDocument( ScDocumentMode eMode = SCDOCMODE_DOCUMENT,
+@@ -1247,7 +1242,6 @@ public:
+                         SCTAB nTab, double fScale ) const;
+     SC_DLLPUBLIC inline USHORT	FastGetRowHeight( SCROW nRow, SCTAB nTab ) const;
+     inline SCROW	FastGetRowForHeight( SCTAB nTab, ULONG nHeight ) const;
+-    inline SCROW    FastGetFirstNonHiddenRow( SCROW nStartRow, SCTAB nTab ) const;
+                     /** No check for flags whether row is hidden, height value
+                         is returned unconditionally. */
+     inline USHORT   FastGetOriginalRowHeight( SCROW nRow, SCTAB nTab ) const;
+@@ -1299,6 +1293,26 @@ public:
+     ::com::sun::star::uno::Sequence<
+         ::com::sun::star::sheet::TablePageBreakData> GetRowBreakData(SCTAB nTab) const;
+ 
++    SC_DLLPUBLIC bool           RowHidden(SCROW nRow, SCTAB nTab, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL);
++    SC_DLLPUBLIC bool           RowHidden(SCROW nRow, SCTAB nTab, SCROW& rLastRow);
++    SC_DLLPUBLIC bool           HasHiddenRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
++    SC_DLLPUBLIC bool           ColHidden(SCCOL nCol, SCTAB nTab, SCCOL& rLastCol);
++    SC_DLLPUBLIC bool           ColHidden(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL);
++    SC_DLLPUBLIC void           SetRowHidden(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bHidden);
++    SC_DLLPUBLIC void           SetColHidden(SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bHidden);
++    SC_DLLPUBLIC SCROW          FirstVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
++    SC_DLLPUBLIC SCROW          LastVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
++    SCROW                       CountVisibleRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
++
++    bool                        RowFiltered(SCROW nRow, SCTAB nTab, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL);
++    bool                        HasFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
++    bool                        ColFiltered(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL);
++    SC_DLLPUBLIC void           SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bFiltered);
++    SC_DLLPUBLIC void           SetColFiltered(SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bFiltered);
++    SCROW                       FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
++    SCROW                       LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
++    SCROW                       CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
++
+     /** 
+      * Write all column row flags to table's flag data, because not all column 
+      * row attributes are stored in the flag data members.  This is necessary 
+@@ -1327,8 +1341,6 @@ public:
+     BOOL			GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault);
+     BOOL			GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault);
+ 
+-    BOOL			IsFiltered( SCROW nRow, SCTAB nTab ) const;
+-
+     BOOL			UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow );
+     BOOL			UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bShow );
+ 
+@@ -1807,58 +1819,24 @@ inline void ScDocument::SetSortParam( ScSortParam& rParam, SCTAB nTab )
+ inline ULONG ScDocument::FastGetScaledRowHeight( SCROW nStartRow, SCROW nEndRow,
+         SCTAB nTab, double fScale ) const
+ {
+-    return pTab[nTab]->pRowFlags->SumScaledCoupledArrayForCondition( nStartRow,
+-            nEndRow, CR_HIDDEN, 0, *(pTab[nTab]->pRowHeight), fScale);
++    ULONG nHeight = FastGetRowHeight(nStartRow, nEndRow, nTab);
++    return nHeight * fScale;
+ }
+ 
+ inline USHORT ScDocument::FastGetRowHeight( SCROW nRow, SCTAB nTab ) const
+ {
+-    return ( pTab[nTab]->pRowFlags->GetValue(nRow) & CR_HIDDEN ) ? 0 :
+-        pTab[nTab]->pRowHeight->GetValue(nRow);
++    return pTab[nTab]->GetRowHeight(nRow);
+ }
+ 
+ inline SCROW ScDocument::FastGetRowForHeight( SCTAB nTab, ULONG nHeight ) const
+ {
+-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
+-            *(pTab[nTab]->pRowFlags), 0, MAXROW, CR_HIDDEN, 0,
+-            *(pTab[nTab]->pRowHeight));
+-    ULONG nSum = 0;
+-    for ( ; aIter; aIter.NextRange() )
+-    {
+-        ULONG nNew = *aIter * (aIter.GetRangeEnd() - aIter.GetRangeStart() + 1);
+-        if (nSum + nNew > nHeight)
+-        {
+-            for ( ; aIter && nSum <= nHeight; ++aIter )
+-            {
+-                nSum += *aIter;
+-            }
+-            return aIter.GetPos();
+-        }
+-        nSum += nNew;
+-    }
+-    return aIter.GetPos();
+-}
+-
+-inline SCROW ScDocument::FastGetFirstNonHiddenRow( SCROW nStartRow, SCTAB nTab) const
+-{
+-    return pTab[nTab]->pRowFlags->GetFirstForCondition( nStartRow, MAXROW,
+-            CR_HIDDEN, 0);
++    return pTab[nTab]->GetRowForHeight(nHeight);
+ }
+ 
+ inline USHORT ScDocument::FastGetOriginalRowHeight( SCROW nRow, SCTAB nTab ) const
+ {
+     return pTab[nTab]->pRowHeight->GetValue(nRow);
+ }
+-
+-inline BOOL ScDocument::ColFiltered( SCCOL nCol, SCTAB nTab ) const
+-{
+-    return ( pTab[nTab]->pColFlags[nCol] & CR_FILTERED) != 0;
+-}
+-
+-inline BOOL ScDocument::RowFiltered( SCROW nRow, SCTAB nTab ) const
+-{
+-    return pTab[nTab]->IsFiltered(nRow);
+-}
+  
+ #endif
+ 
+diff --git sc/inc/olinetab.hxx sc/inc/olinetab.hxx
+index 456d223..a71519b 100644
+--- sc/inc/olinetab.hxx
++++ sc/inc/olinetab.hxx
+@@ -39,6 +39,7 @@
+ #define SC_OL_MAXDEPTH		7
+ 
+ class SvStream;
++class ScTable;
+ 
+ 
+ class ScOutlineEntry : public ScDataObject
+@@ -126,9 +127,7 @@ public:
+     void					InsertSpace( SCCOLROW nStartPos, SCSIZE nSize );
+     BOOL					DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize );
+ 
+-    BOOL					ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos,
+-                                BOOL bShow,
+-                                const ScBitMaskCompressedArray< SCCOLROW, BYTE>& rHiddenFlags );
++    bool                    ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos, bool bShow, ScTable& rTable, bool bCol );
+ 
+     void					RemoveAll();
+ };
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index 6045438..0ace618 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -43,6 +43,7 @@
+ 
+ #include <memory>
+ #include <set>
++#include <boost/shared_ptr.hpp>
+ 
+ namespace utl {
+     class SearchParam;
+@@ -83,7 +84,9 @@ struct RowInfo;
+ struct ScFunctionData;
+ struct ScLineFlags;
+ class CollatorWrapper;
+ struct ScSetStringParam;
++class ScFlatBoolRowSegments;
++class ScFlatBoolColSegments;
+ 
+ class ScTable
+ {
+@@ -125,6 +128,10 @@ private:
+ 
+     BYTE*			pColFlags;
+     ScBitMaskCompressedArray< SCROW, BYTE>*     pRowFlags;
++    ::boost::shared_ptr<ScFlatBoolColSegments>  mpHiddenCols;
++    ::boost::shared_ptr<ScFlatBoolRowSegments>  mpHiddenRows;
++    ::boost::shared_ptr<ScFlatBoolColSegments>  mpFilteredCols;
++    ::boost::shared_ptr<ScFlatBoolRowSegments>  mpFilteredRows;
+ 
+     ::std::set<SCROW>                      maRowPageBreaks;
+     ::std::set<SCROW>                      maRowManualBreaks;
+@@ -471,7 +478,7 @@ public:
+                                 SCCOL& rCol, SCROW& rRow, ScMarkData& rMark,
+                                 String& rUndoStr, ScDocument* pUndoDoc);
+ 
+-    void		FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ) const;
++	void		FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 );
+ 
+     void		GetBorderLines( SCCOL nCol, SCROW nRow,
+                                 const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop,
+@@ -593,19 +600,29 @@ public:
+                         // nPPT fuer Test auf Veraenderung
+     void		SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual );
+ 
+-    USHORT		GetColWidth( SCCOL nCol ) const;
+-    USHORT		GetRowHeight( SCROW nRow ) const;
+-    ULONG		GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const;
+-    ULONG		GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const;
+-    ULONG		GetColOffset( SCCOL nCol ) const;
+-    ULONG		GetRowOffset( SCROW nRow ) const;
++	USHORT		GetColWidth( SCCOL nCol );
++    SC_DLLPUBLIC USHORT GetRowHeight( SCROW nRow );
++	ULONG		GetRowHeight( SCROW nStartRow, SCROW nEndRow );
++	ULONG		GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale );
++	ULONG		GetColOffset( SCCOL nCol );
++	ULONG		GetRowOffset( SCROW nRow );
++
++    /** 
++     * Get the last row such that the height of row 0 to the end row is as 
++     * high as possible without exceeding the specified height value.
++     *
++     * @param nHeight maximum desired height
++     * 
++     * @return SCROW last row of the range within specified height.
++     */
++    SCROW       GetRowForHeight(ULONG nHeight);
+ 
+     USHORT		GetOriginalWidth( SCCOL nCol ) const;
+     USHORT		GetOriginalHeight( SCROW nRow ) const;
+ 
+-    USHORT		GetCommonWidth( SCCOL nEndCol ) const;
++	USHORT		GetCommonWidth( SCCOL nEndCol );
+ 
+-    SCROW		GetHiddenRowCount( SCROW nRow ) const;
++	SCROW		GetHiddenRowCount( SCROW nRow );
+ 
+     void		ShowCol(SCCOL nCol, BOOL bShow);
+     void		ShowRow(SCROW nRow, BOOL bShow);
+@@ -626,8 +643,6 @@ public:
+                 /// @return  the index of the last changed row (flags and row height, auto pagebreak is ignored).
+     SCROW      GetLastChangedRow() const;
+ 
+-    BOOL		IsFiltered(SCROW nRow) const;
+-
+     BYTE		GetColFlags( SCCOL nCol ) const;
+     BYTE		GetRowFlags( SCROW nRow ) const;
+ 
+@@ -656,6 +671,34 @@ public:
+     void        SetColBreak(SCCOL nCol, bool bPage, bool bManual);
+     ::com::sun::star::uno::Sequence<
+         ::com::sun::star::sheet::TablePageBreakData> GetRowBreakData() const;
++
++    bool        RowHidden(SCROW nRow, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL);
++    bool        RowHidden(SCROW nRow, SCROW& rLastRow);
++    bool        HasHiddenRows(SCROW nStartRow, SCROW nEndRow);
++    bool        ColHidden(SCCOL nCol, SCCOL& rLastCol);
++    bool        ColHidden(SCCOL nCol, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL);
++    void        SetRowHidden(SCROW nStartRow, SCROW nEndRow, bool bHidden);
++    void        SetColHidden(SCCOL nStartCol, SCCOL nEndCol, bool bHidden);
++    void        CopyColHidden(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol);
++    void        CopyRowHidden(ScTable& rTable, SCROW nStartRow, SCROW nEndRow);
++    SCROW       FirstVisibleRow(SCROW nStartRow, SCROW nEndRow);
++    SCROW       LastVisibleRow(SCROW nStartRow, SCROW nEndRow);
++    SCROW       CountVisibleRows(SCROW nStartRow, SCROW nEndRow);
++    sal_uInt32  GetTotalRowHeight(SCROW nStartRow, SCROW nEndRow);
++
++    SCCOLROW    LastHiddenColRow(SCCOLROW nPos, bool bCol);
++
++    bool        RowFiltered(SCROW nRow, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL);
++    bool        ColFiltered(SCCOL nCol, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL);
++    bool        HasFilteredRows(SCROW nStartRow, SCROW nEndRow);
++    void        CopyColFiltered(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol);
++    void        CopyRowFiltered(ScTable& rTable, SCROW nStartRow, SCROW nEndRow);
++    void        SetRowFiltered(SCROW nStartRow, SCROW nEndRow, bool bFiltered);
++    void        SetColFiltered(SCCOL nStartCol, SCCOL nEndCol, bool bFiltered);
++    SCROW       FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow);
++    SCROW       LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow);
++    SCROW       CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow);
++
+     void        SyncColRowFlags();
+ 
+     void		StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
+@@ -786,7 +829,7 @@ private:
+ 
+     SCSIZE		FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2,
+                             SCCOL nCol, SCROW nAttrRow1, SCROW nAttrRow2, SCSIZE nArrY,
+-                            const ScPatternAttr* pPattern, const SfxItemSet* pCondSet ) const;
++							const ScPatternAttr* pPattern, const SfxItemSet* pCondSet );
+ 
+     // idle calculation of OutputDevice text width for cell
+     // also invalidates script type, broadcasts for "calc as shown"
+diff --git sc/source/core/data/column2.cxx sc/source/core/data/column2.cxx
+index 2291859..c97fbda 100644
+--- sc/source/core/data/column2.cxx
++++ sc/source/core/data/column2.cxx
+@@ -69,6 +69,7 @@
+ #include "compiler.hxx"			// ScTokenArray GetCodeLen
+ #include "dbcolect.hxx"
+ #include "fillinfo.hxx"
++#include "segmenttree.hxx"
+ 
+ #include <math.h>
+ 
+@@ -1785,7 +1786,7 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
+ //	Mehrfachselektion:
+ void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark,
+                                         ScFunctionData& rData,
+-                                        const ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags,
++										ScFlatBoolRowSegments& rHiddenRows,
+                                         BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow )
+ {
+     SCSIZE nIndex;
+@@ -1793,7 +1794,8 @@ void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark,
+     while (aDataIter.Next( nIndex ))
+     {
+         SCROW nRow = pItems[nIndex].nRow;
+-        if ( !pRowFlags || !( pRowFlags->GetValue(nRow) & CR_HIDDEN ) )
++		bool bRowHidden = rHiddenRows.getValue(nRow);
++		if ( !bRowHidden )
+             if ( !bDoExclude || nRow < nExStartRow || nRow > nExEndRow )
+                 lcl_UpdateSubTotal( rData, pItems[nIndex].pCell );
+     }
+@@ -1801,7 +1803,7 @@ void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark,
+ 
+ //	bei bNoMarked die Mehrfachselektion weglassen
+ void ScColumn::UpdateAreaFunction( ScFunctionData& rData,
+-                                    const ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags,
++								   ScFlatBoolRowSegments& rHiddenRows,
+                                     SCROW nStartRow, SCROW nEndRow )
+ {
+     SCSIZE nIndex;
+@@ -1809,7 +1811,8 @@ void ScColumn::UpdateAreaFunction( ScFunctionData& rData,
+     while ( nIndex<nCount && pItems[nIndex].nRow<=nEndRow )
+     {
+         SCROW nRow = pItems[nIndex].nRow;
+-        if ( !pRowFlags || !( pRowFlags->GetValue(nRow) & CR_HIDDEN ) )
++		bool bRowHidden = rHiddenRows.getValue(nRow);
++		if ( !bRowHidden )
+             lcl_UpdateSubTotal( rData, pItems[nIndex].pCell );
+         ++nIndex;
+     }
+diff --git sc/source/core/data/dociter.cxx sc/source/core/data/dociter.cxx
+index 911d473..055c64f 100644
+--- sc/source/core/data/dociter.cxx
++++ sc/source/core/data/dociter.cxx
+@@ -334,7 +334,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr)
+         if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= nEndRow )
+         {
+             nRow = pCol->pItems[nColRow].nRow + 1;
+-            if ( !bSubTotal || !pDoc->pTab[nTab]->IsFiltered( nRow-1 ) )
++			if ( !bSubTotal || !pDoc->pTab[nTab]->RowFiltered( nRow-1 ) )
+             {
+                 ScBaseCell* pCell = pCol->pItems[nColRow].pCell;
+                 ++nColRow;
+@@ -725,7 +725,7 @@ ScBaseCell* ScCellIterator::GetThis()
+         if ( nColRow < pCol->nCount	&& pCol->pItems[nColRow].nRow <= nEndRow )
+         {
+             nRow = pCol->pItems[nColRow].nRow;
+-            if ( !bSubTotal || !pDoc->pTab[nTab]->IsFiltered( nRow ) )
++			if ( !bSubTotal || !pDoc->pTab[nTab]->RowFiltered( nRow ) )
+             {
+                 ScBaseCell* pCell = pCol->pItems[nColRow].pCell;
+ 
+diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
+index 17ae763..4cff6f3 100644
+--- sc/source/core/data/documen3.cxx
++++ sc/source/core/data/documen3.cxx
+@@ -1123,15 +1123,6 @@ BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem,
+     return bFound;
+ }
+ 
+-BOOL ScDocument::IsFiltered( SCROW nRow, SCTAB nTab ) const
+-{
+-    if (VALIDTAB(nTab))
+-        if (pTab[nTab])
+-            return pTab[nTab]->IsFiltered( nRow );
+-    DBG_ERROR("Falsche Tabellennummer");
+-    return 0;
+-}
+-
+ //	Outline anpassen
+ 
+ BOOL ScDocument::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow )
+@@ -1558,46 +1549,43 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect )
+     nTwips = (long) (aPosRect.Top() / HMM_PER_TWIPS);
+ 
+     SCROW nY1 = 0;
+-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
+-            *(pTable->GetRowFlagsArray()), nY1, MAXROW, CR_HIDDEN, 0,
+-            *(pTable->GetRowHeightArray()));
+     bEnd = FALSE;
+-    while (!bEnd && aIter)
++    for (SCROW i = nY1; i <= MAXROW && !bEnd; ++i)
+     {
+-        nY1 = aIter.GetPos();
+-        nAdd = (long) *aIter;
++        if (pTable->RowHidden(i))
++            continue;
++
++        nY1 = i;
++        nAdd = static_cast<long>(pTable->GetRowHeight(i));
+         if (nSize+nAdd <= nTwips+1 && nY1<MAXROW)
+         {
+             nSize += nAdd;
+             ++nY1;
+-            ++aIter;
+         }
+         else
+             bEnd = TRUE;
+     }
+-    if (!aIter)
+-        nY1 = aIter.GetIterEnd();   // all hidden down to the bottom
++    if (!bEnd)
++        nY1 = MAXROW;   // all hidden down to the bottom
+ 
+     nTwips = (long) (aPosRect.Bottom() / HMM_PER_TWIPS);
+ 
+     SCROW nY2 = nY1;
+-    aIter.NewLimits( nY2, MAXROW);
+     bEnd = FALSE;
+-    while (!bEnd && aIter)
++    for (SCROW i = nY2; i <= MAXROW && !bEnd; ++i)
+     {
+-        nY2 = aIter.GetPos();
+-        nAdd = (long) *aIter;
++        nY2 = i;
++        nAdd = static_cast<long>(pTable->GetRowHeight(i));
+         if (nSize+nAdd < nTwips && nY2<MAXROW)
+         {
+             nSize += nAdd;
+             ++nY2;
+-            ++aIter;
+         }
+         else
+             bEnd = TRUE;
+     }
+-    if (!aIter)
+-        nY2 = aIter.GetIterEnd();   // all hidden down to the bottom
++    if (!bEnd)
++        nY2 = MAXROW;   // all hidden down to the bottom
+ 
+     return ScRange( nX1,nY1,nTab, nX2,nY2,nTab );
+ }
+@@ -1635,24 +1623,33 @@ void lcl_SnapVer( ScTable* pTable, long& rVal, SCROW& rStartRow )
+     SCROW nRow = 0;
+     long nTwips = (long) (rVal / HMM_PER_TWIPS);
+     long nSnap = 0;
+-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
+-            *(pTable->GetRowFlagsArray()), nRow, MAXROW, CR_HIDDEN, 0,
+-            *(pTable->GetRowHeightArray()));
+-    while ( aIter )
++
++    bool bFound = false;
++    for (SCROW i = nRow; i <= MAXROW; ++i)
+     {
+-        nRow = aIter.GetPos();
+-        long nAdd = *aIter;
++        SCROW nLastRow;
++        if (pTable->RowHidden(i, NULL, &nLastRow))
++        {
++            i = nLastRow;    
++            continue;
++        }
++
++        nRow = i;
++		long nAdd = pTable->GetRowHeight(i);
+         if ( nSnap + nAdd/2 < nTwips || nRow < rStartRow )
+         {
+             nSnap += nAdd;
+             ++nRow;
+-            ++aIter;
+         }
+         else
++        {
++            bFound = true;    
+             break;
++        }
+     }
+-    if (!aIter)
++    if (!bFound)
+         nRow = MAXROW;  // all hidden down to the bottom
++
+     rVal = (long) ( nSnap * HMM_PER_TWIPS );
+     rStartRow = nRow;
+ }
+diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
+index 8151aec..9374c35 100644
+--- sc/source/core/data/document.cxx
++++ sc/source/core/data/document.cxx
+@@ -97,6 +97,7 @@
+ #include "clipparam.hxx"
+ 
+ #include <map>
++#include <limits>
+ 
+ namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
+ using ::com::sun::star::uno::Sequence;
+@@ -1951,9 +1952,6 @@ void ScDocument::CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1,
+     while ( nFlagTab < MAXTAB && !ppClipTab[nFlagTab] )
+         ++nFlagTab;
+ 
+-    const ScBitMaskCompressedArray< SCROW, BYTE> & rSourceFlags =
+-        pCBFCP->pClipDoc->GetRowFlagsArray( nFlagTab);
+-
+     SCROW nSourceRow = rClipStartRow;
+ 	SCROW nSourceEnd = 0;
+     if (pCBFCP->pClipDoc->GetClipParam().maRanges.Count())
+@@ -1963,12 +1961,15 @@ void ScDocument::CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1,
+     while ( nSourceRow <= nSourceEnd && nDestRow <= nRow2 )
+     {
+         // skip filtered rows
+-        nSourceRow = rSourceFlags.GetFirstForCondition( nSourceRow, nSourceEnd, CR_FILTERED, 0);
++        nSourceRow = pCBFCP->pClipDoc->FirstNonFilteredRow(nSourceRow, nSourceEnd, nFlagTab);
+ 
+         if ( nSourceRow <= nSourceEnd )
+         {
+             // look for more non-filtered rows following
+-            SCROW nFollow = rSourceFlags.GetBitStateEnd( nSourceRow, CR_FILTERED, 0) - nSourceRow;
++            SCROW nLastRow = nSourceRow;
++            pCBFCP->pClipDoc->RowFiltered(nSourceRow, nFlagTab, NULL, &nLastRow);
++            SCROW nFollow = nLastRow - nSourceRow;
++
+             if (nFollow > nSourceEnd - nSourceRow)
+                 nFollow = nSourceEnd - nSourceRow;
+             if (nFollow > nRow2 - nDestRow)
+@@ -2376,8 +2377,7 @@ void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered
+         while ( nCountTab < MAXTAB && !pTab[nCountTab] )
+             ++nCountTab;
+ 
+-        SCROW nResult = GetRowFlagsArray( nCountTab).CountForCondition(
+-                nStartRow, nEndRow, CR_FILTERED, 0);
++        SCROW nResult = CountNonFilteredRows(nStartRow, nEndRow, nCountTab);
+ 
+         if ( nResult > 0 )
+             nClipY = nResult - 1;
+@@ -2416,8 +2416,13 @@ BOOL ScDocument::HasClipFilteredRows()
+     if (!rClipRanges.Count())
+         return false;
+ 
+-    return GetRowFlagsArray( nCountTab).HasCondition( rClipRanges.First()->aStart.Row(),
+-            rClipRanges.First()->aEnd.Row(), CR_FILTERED, CR_FILTERED);
++    for (ScRange* p = rClipRanges.First(); p; p = rClipRanges.Next())
++    {
++        bool bAnswer = pTab[nCountTab]->HasFilteredRows(p->aStart.Row(), p->aEnd.Row());
++        if (bAnswer)
++            return true;
++    }
++    return false;
+ }
+ 
+ 
+@@ -3118,8 +3123,7 @@ ULONG ScDocument::GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) con
+ ULONG ScDocument::FastGetRowHeight( SCROW nStartRow, SCROW nEndRow,
+         SCTAB nTab ) const
+ {
+-    return pTab[nTab]->pRowFlags->SumCoupledArrayForCondition( nStartRow,
+-            nEndRow, CR_HIDDEN, 0, *(pTab[nTab]->pRowHeight));
++	return GetRowHeight(nStartRow, nEndRow, nTab);
+ }
+ 
+ ULONG ScDocument::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow,
+@@ -3431,6 +3435,163 @@ Sequence<TablePageBreakData> ScDocument::GetRowBreakData(SCTAB nTab) const
+     return pTab[nTab]->GetRowBreakData();
+ }
+ 
++bool ScDocument::RowHidden(SCROW nRow, SCTAB nTab, SCROW* pFirstRow, SCROW* pLastRow)
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++		return false;
++
++	return pTab[nTab]->RowHidden(nRow, pFirstRow, pLastRow);
++}
++
++bool ScDocument::RowHidden(SCROW nRow, SCTAB nTab, SCROW& rLastRow)
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++	{
++		rLastRow = nRow;	
++		return false;
++	}
++
++	return pTab[nTab]->RowHidden(nRow, rLastRow);
++}
++
++
++bool ScDocument::HasHiddenRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++		return false;
++
++	return pTab[nTab]->HasHiddenRows(nStartRow, nEndRow);
++}
++
++bool ScDocument::ColHidden(SCCOL nCol, SCTAB nTab, SCCOL& rLastCol)
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++	{
++		rLastCol = nCol;	
++		return false;
++	}
++
++	return pTab[nTab]->ColHidden(nCol, rLastCol);
++}
++
++bool ScDocument::ColHidden(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol, SCCOL* pLastCol)
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++	{
++        if (pFirstCol)
++            *pFirstCol = nCol;
++        if (pLastCol)
++            *pLastCol = nCol;
++		return false;
++	}
++
++	return pTab[nTab]->ColHidden(nCol, pFirstCol, pLastCol);
++}
++
++void ScDocument::SetRowHidden(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bHidden)
++{
++	if (!ValidTab(nTab) || !pTab[nTab])
++		return;
++
++	pTab[nTab]->SetRowHidden(nStartRow, nEndRow, bHidden);
++}
++
++void ScDocument::SetColHidden(SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bHidden)
++{
++	if (!ValidTab(nTab) || !pTab[nTab])
++		return;
++
++	pTab[nTab]->SetColHidden(nStartCol, nEndCol, bHidden);
++}
++
++SCROW ScDocument::FirstVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
++{
++	if (!ValidTab(nTab) || !pTab[nTab])
++		return ::std::numeric_limits<SCROW>::max();;
++
++    return pTab[nTab]->FirstVisibleRow(nStartRow, nEndRow);
++}
++
++SCROW ScDocument::LastVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
++{
++	if (!ValidTab(nTab) || !pTab[nTab])
++		return ::std::numeric_limits<SCROW>::max();;
++
++    return pTab[nTab]->LastVisibleRow(nStartRow, nEndRow);
++}
++
++SCROW ScDocument::CountVisibleRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
++{
++	if (!ValidTab(nTab) || !pTab[nTab])
++        return 0;
++
++    return pTab[nTab]->CountVisibleRows(nStartRow, nEndRow);
++}
++
++bool ScDocument::RowFiltered(SCROW nRow, SCTAB nTab, SCROW* pFirstRow, SCROW* pLastRow)
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++		return false;
++
++	return pTab[nTab]->RowFiltered(nRow, pFirstRow, pLastRow);
++}
++
++bool ScDocument::HasFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++		return false;
++
++	return pTab[nTab]->HasFilteredRows(nStartRow, nEndRow);
++}
++
++bool ScDocument::ColFiltered(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol, SCCOL* pLastCol)
++{
++    if (!ValidTab(nTab) || !pTab[nTab])
++		return false;
++
++	return pTab[nTab]->ColFiltered(nCol, pFirstCol, pLastCol);
++}
++
++void ScDocument::SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bFiltered)
++{
++	if (!ValidTab(nTab) || !pTab[nTab])
++		return;
++
++	pTab[nTab]->SetRowFiltered(nStartRow, nEndRow, bFiltered);
++}
++
++void ScDocument::SetColFiltered(SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bFiltered)
++{
++	if (!ValidTab(nTab) || !pTab[nTab])
++		return;
++
++	pTab[nTab]->SetColFiltered(nStartCol, nEndCol, bFiltered);
++}
++
++SCROW ScDocument::FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
++{
++	if (!ValidTab(nTab) || !pTab[nTab])
++		return ::std::numeric_limits<SCROW>::max();;
++
++    return pTab[nTab]->FirstNonFilteredRow(nStartRow, nEndRow);
++}
++
++SCROW ScDocument::LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
++{
++	if (!ValidTab(nTab) || !pTab[nTab])
++		return ::std::numeric_limits<SCROW>::max();;
++
++    return pTab[nTab]->LastNonFilteredRow(nStartRow, nEndRow);
++}
++
++SCROW ScDocument::CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
++{
++	if (!ValidTab(nTab) || !pTab[nTab])
++        return 0;
++
++    return pTab[nTab]->CountNonFilteredRows(nStartRow, nEndRow);
++}
++
+ void ScDocument::SyncColRowFlags()
+ {
+     for (SCTAB i = 0; i <= nMaxTableNumber; ++i)
+diff --git sc/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
+index 94708e1..03c48f5 100644
+--- sc/source/core/data/drwlayer.cxx
++++ sc/source/core/data/drwlayer.cxx
+@@ -610,12 +610,14 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b
+     {
+         //!	nicht mehrere Undos fuer ein Objekt erzeugen (hinteres kann dann weggelassen werden)
+ 
++        SCCOL nLastCol;
++        SCROW nLastRow;
+         if( bValid1 )
+         {
+             Point aPos( pDoc->GetColOffset( nCol1, nTab1 ), pDoc->GetRowOffset( nRow1, nTab1 ) );
+-            if( (pDoc->GetColFlags( nCol1, nTab1 ) & CR_HIDDEN) == 0 )
++            if (!pDoc->ColHidden(nCol1, nTab1, nLastCol))
+                 aPos.X() += pDoc->GetColWidth( nCol1, nTab1 ) / 4;
+-            if( (pDoc->GetRowFlags( nRow1, nTab1 ) & CR_HIDDEN) == 0 )
++            if (!pDoc->RowHidden(nRow1, nTab1, nLastRow))
+                 aPos.Y() += pDoc->GetRowHeight( nRow1, nTab1 ) / 2;
+             TwipsToMM( aPos.X() );
+             TwipsToMM( aPos.Y() );
+@@ -647,9 +649,9 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b
+         if( bValid2 )
+         {
+             Point aPos( pDoc->GetColOffset( nCol2, nTab2 ), pDoc->GetRowOffset( nRow2, nTab2 ) );
+-            if( (pDoc->GetColFlags( nCol2, nTab2 ) & CR_HIDDEN) == 0 )
++            if (!pDoc->ColHidden(nCol2, nTab2, nLastCol))
+                 aPos.X() += pDoc->GetColWidth( nCol2, nTab2 ) / 4;
+-            if( (pDoc->GetRowFlags( nRow2, nTab2 ) & CR_HIDDEN) == 0 )
++            if (!pDoc->RowHidden(nRow2, nTab2, nLastRow))
+                 aPos.Y() += pDoc->GetRowHeight( nRow2, nTab2 ) / 2;
+             TwipsToMM( aPos.X() );
+             TwipsToMM( aPos.Y() );
+diff --git sc/source/core/data/fillinfo.cxx sc/source/core/data/fillinfo.cxx
+index 54ffe10..e875167 100644
+--- sc/source/core/data/fillinfo.cxx
++++ sc/source/core/data/fillinfo.cxx
+@@ -55,7 +55,6 @@
+ #include "conditio.hxx"
+ #include "stlpool.hxx"
+ 
+-
+ // -----------------------------------------------------------------------
+ 
+ const USHORT ROWINFO_MAX = 1024;
+@@ -100,11 +99,13 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
+     rStartY = nY;
+     BOOL bHOver = pInfo->bHOverlapped;
+     BOOL bVOver = pInfo->bVOverlapped;
++    SCCOL nLastCol;
++    SCROW nLastRow;
+ 
+     while (bHOver)				// nY konstant
+     {
+         --rStartX;
+-        if (rStartX >= (SCsCOL) nX1 && (pDoc->GetColFlags(rStartX,nTab) & CR_HIDDEN) == 0)
++        if (rStartX >= (SCsCOL) nX1 && !pDoc->ColHidden(rStartX, nTab, nLastCol))
+         {
+             bHOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bHOverlapped;
+             bVOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bVOverlapped;
+@@ -126,8 +127,8 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
+             --nArrY;						// lokale Kopie !
+ 
+         if (rStartX >= (SCsCOL) nX1 && rStartY >= (SCsROW) nY1 &&
+-            (pDoc->GetColFlags(rStartX,nTab) & CR_HIDDEN) == 0 &&
+-            (pDoc->GetRowFlags(rStartY,nTab) & CR_HIDDEN) == 0 &&
++            !pDoc->ColHidden(rStartX, nTab, nLastCol) &&
++            !pDoc->RowHidden(rStartY, nTab, nLastRow) &&
+             (SCsROW) pRowInfo[nArrY].nRowNo == rStartY)
+         {
+             bHOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bHOverlapped;
+@@ -144,8 +145,8 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
+ 
+     const ScMergeAttr* pMerge;
+     if (rStartX >= (SCsCOL) nX1 && rStartY >= (SCsROW) nY1 &&
+-        (pDoc->GetColFlags(rStartX,nTab) & CR_HIDDEN) == 0 &&
+-        (pDoc->GetRowFlags(rStartY,nTab) & CR_HIDDEN) == 0 &&
++        !pDoc->ColHidden(rStartX, nTab, nLastCol) &&
++        !pDoc->RowHidden(rStartY, nTab, nLastRow) &&
+         (SCsROW) pRowInfo[nArrY].nRowNo == rStartY)
+     {
+         pMerge = (const ScMergeAttr*) &pRowInfo[nArrY].pCellInfo[rStartX+1].pPatternAttr->
+@@ -158,12 +159,6 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
+     rEndY = rStartY + pMerge->GetRowMerge() - 1;
+ }
+ 
+-inline BOOL ScDocument::RowHidden( SCROW nRow, SCTAB nTab )
+-{
+-    return ( pTab[nTab]->pRowFlags->GetValue(nRow) & CR_HIDDEN ) != 0;
+-}
+-
+-
+ #define CELLINFO(x,y) pRowInfo[nArrY+y].pCellInfo[nArrX+x]
+ 
+ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
+@@ -359,7 +354,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
+         nX = nArrX-1;
+         if ( ValidCol(nX) )
+         {
+-            if ( (GetColFlags(nX,nTab) & CR_HIDDEN) == 0 )			// Spalte nicht versteckt
++            if (!ColHidden(nX, nTab))
+             {
+                 USHORT nThisWidth = (USHORT) (GetColWidth( nX, nTab ) * nScaleX);
+                 if (!nThisWidth)
+@@ -379,7 +374,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
+             // #i58049#, #i57939# Hidden columns must be skipped here, or their attributes
+             // will disturb the output
+ 
+-            if ( (GetColFlags(nX,nTab) & CR_HIDDEN) == 0 )          // column not hidden
++            // TODO: Optimize this loop.
++            if (!ColHidden(nX, nTab))
+             {
+                 USHORT nThisWidth = (USHORT) (GetColWidth( nX, nTab ) * nScaleX);
+                 if (!nThisWidth)
+@@ -484,7 +480,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
+ 
+                         do
+                         {
+-                            if ( nArrY==0 || !RowHidden( nCurRow,nTab ) )
++#define NEW_METHOD 1
++#if NEW_METHOD
++                            SCROW nLastHiddenRow = -1;
++                            bool bRowHidden = RowHidden(nCurRow, nTab, nLastHiddenRow);
++#else
++                            bool bRowHidden = RowHidden(nCurRow, nTab);
++#endif
++							if ( nArrY==0 || !bRowHidden )
+                             {
+                                 RowInfo* pThisRowInfo = &pRowInfo[nArrY];
+                                 if (pBackground != pDefBackground)			// Spalten-HG == Standard ?
+@@ -554,6 +557,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
+ 
+                                 ++nArrY;
+                             }
++#if NEW_METHOD
++                            else if (bRowHidden && nLastHiddenRow >= 0)
++                            {
++                                nCurRow = nLastHiddenRow;
++                                if (nCurRow > nThisRow)
++                                    nCurRow = nThisRow;
++                            }
++#endif
+                             ++nCurRow;
+                         }
+                         while (nCurRow <= nThisRow && nCurRow <= nYExtra);
+diff --git sc/source/core/data/olinetab.cxx sc/source/core/data/olinetab.cxx
+index a30065e..cc4f7f6 100644
+--- sc/source/core/data/olinetab.cxx
++++ sc/source/core/data/olinetab.cxx
+@@ -44,6 +44,7 @@
+ #include "global.hxx"
+ #include "rechead.hxx"
+ #include "address.hxx"
++#include "table.hxx"
+ 
+ //------------------------------------------------------------------------
+ 
+@@ -640,8 +641,7 @@ BOOL ScOutlineArray::DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize )
+     return bNeedSave;
+ }
+ 
+-BOOL ScOutlineArray::ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos,
+-        BOOL bShow, const ScBitMaskCompressedArray< SCCOLROW, BYTE>& rHiddenFlags )
++bool ScOutlineArray::ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos, bool bShow, ScTable& rTable, bool bCol )
+ {
+     BOOL bModified = FALSE;
+     ScSubOutlineIterator aIter( this );
+@@ -657,9 +657,7 @@ BOOL ScOutlineArray::ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos,
+             {
+                 //	#i12341# hide if all columns/rows are hidden, show if at least one
+                 //	is visible
+-
+-                SCCOLROW nEnd = rHiddenFlags.GetBitStateEnd( nEntryStart,
+-                        CR_HIDDEN, CR_HIDDEN);
++                SCCOLROW nEnd = rTable.LastHiddenColRow(nEntryStart, bCol);
+                 BOOL bAllHidden = (nEntryEnd <= nEnd && nEnd <
+                         ::std::numeric_limits<SCCOLROW>::max());
+ 
+diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx
+index 6a672e8..862508b 100644
+--- sc/source/core/data/table1.cxx
++++ sc/source/core/data/table1.cxx
+@@ -115,6 +115,7 @@
+ #include "hints.hxx"		// fuer Paint-Broadcast
+ #include "prnsave.hxx"
+ #include "tabprotection.hxx"
++#include "segmenttree.hxx"
+ 
+ // STATIC DATA -----------------------------------------------------------
+ 
+@@ -138,6 +139,10 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
+     pRowHeight( NULL ),
+     pColFlags( NULL ),
+     pRowFlags( NULL ),
++    mpHiddenCols(new ScFlatBoolColSegments),
++    mpHiddenRows(new ScFlatBoolRowSegments),
++    mpFilteredCols(new ScFlatBoolColSegments),
++    mpFilteredRows(new ScFlatBoolRowSegments),
+     pOutlineTable( NULL ),
+     bTableAreaValid( FALSE ),
+     bVisible( TRUE ),
+@@ -888,9 +893,10 @@ BOOL ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
+         //	auf der naechsten Zelle landet, auch wenn die geschuetzt/nicht markiert ist.
+         //!	per Extra-Parameter steuern, nur fuer Cursor-Bewegung ???
+ 
+-        if ( pRowFlags && ( pRowFlags->GetValue(nRow) & CR_HIDDEN ) )
++        if (RowHidden(nRow))
+             return FALSE;
+-        if ( pColFlags && ( pColFlags[nCol] & CR_HIDDEN ) )
++
++        if (ColHidden(nCol))
+             return FALSE;
+     }
+ 
+@@ -917,8 +923,8 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
+     {
+         BOOL bUp = ( nMovY < 0 );
+         nRow = rMark.GetNextMarked( nCol, nRow, bUp );
+-        while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
+-                pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
++        while ( VALIDROW(nRow) && 
++                (RowHidden(nRow) || pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
+         {
+             //	#53697# ausgeblendete ueberspringen (s.o.)
+             nRow += nMovY;
+@@ -928,7 +934,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
+         while ( nRow < 0 || nRow > MAXROW )
+         {
+             nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) );
+-            while ( VALIDCOL(nCol) && pColFlags && (pColFlags[nCol] & CR_HIDDEN) )
++			while ( VALIDCOL(nCol) && ColHidden(nCol) )
+                 nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) );   //	#53697# skip hidden rows (see above)
+             if (nCol < 0)
+             {
+@@ -947,8 +953,8 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
+             else if (nRow > MAXROW)
+                 nRow = 0;
+             nRow = rMark.GetNextMarked( nCol, nRow, bUp );
+-            while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
+-                    pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
++            while ( VALIDROW(nRow) && 
++                    (RowHidden(nRow) || pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
+             {
+                 //	#53697# ausgeblendete ueberspringen (s.o.)
+                 nRow += nMovY;
+@@ -1336,19 +1342,14 @@ void ScTable::ExtendPrintArea( OutputDevice* pDev,
+ 
+     SCSIZE nIndex;
+     SCCOL nPrintCol = rEndCol;
+-    SCSIZE nRowFlagsIndex;
+-    SCROW nRowFlagsEndRow;
+-    BYTE nRowFlag = pRowFlags->GetValue( nStartRow, nRowFlagsIndex, nRowFlagsEndRow);
+     for (SCROW nRow = nStartRow; nRow<=nEndRow; nRow++)
+     {
+-        if (nRow > nRowFlagsEndRow)
+-            nRowFlag = pRowFlags->GetNextValue( nRowFlagsIndex, nRowFlagsEndRow);
+-        if ( ( nRowFlag & CR_HIDDEN ) == 0 )
++		if (!RowHidden(nRow))
+         {
+             SCCOL nDataCol = rEndCol;
+             while (nDataCol > 0 && ( bEmpty[nDataCol] || !aCol[nDataCol].Search(nRow,nIndex) ) )
+                 --nDataCol;
+-            if ( ( pColFlags[nDataCol] & CR_HIDDEN ) == 0 )
++            if (!ColHidden(nDataCol))
+             {
+                 ScBaseCell* pCell = aCol[nDataCol].GetCell(nRow);
+                 if (pCell)
+diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
+index 972ec16..889510f 100644
+--- sc/source/core/data/table2.cxx
++++ sc/source/core/data/table2.cxx
+@@ -132,6 +132,9 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
+         }
+         if (pOutlineTable)
+             pOutlineTable->InsertRow( nStartRow, nSize );
++
++        mpFilteredRows->insertSegment(nStartRow, nSize, true);
++        mpHiddenRows->insertSegment(nStartRow, nSize, true);
+     }
+ 
+     for (SCCOL j=nStartCol; j<=nEndCol; j++)
+@@ -159,6 +162,9 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
+             if (pOutlineTable->DeleteRow( nStartRow, nSize ))
+                 if (pUndoOutline)
+                     *pUndoOutline = TRUE;
++
++        mpFilteredRows->removeSegment(nStartRow, nStartRow+nSize);
++        mpHiddenRows->removeSegment(nStartRow, nStartRow+nSize);
+     }
+ 
+     {   // scope for bulk broadcast
+@@ -205,6 +211,9 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
+         }
+         if (pOutlineTable)
+             pOutlineTable->InsertCol( nStartCol, nSize );
++
++        mpHiddenCols->insertSegment(nStartCol, nSize, true);
++        mpFilteredCols->insertSegment(nStartCol, nSize, true);
+     }
+ 
+ 
+@@ -260,6 +269,9 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
+             if (pOutlineTable->DeleteCol( nStartCol, nSize ))
+                 if (pUndoOutline)
+                     *pUndoOutline = TRUE;
++
++        mpHiddenCols->removeSegment(nStartCol, nStartCol+nSize);
++        mpFilteredCols->removeSegment(nStartCol, nStartCol+nSize);
+     }
+ 
+ 
+@@ -357,20 +369,21 @@ void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+         //	copy widths/heights, and only "hidden", "filtered" and "manual" flags
+         //	also for all preceding columns/rows, to have valid positions for drawing objects
+ 
+-        if (pColFlags && pTable->pColFlags && pColWidth && pTable->pColWidth)
++		if (pColWidth && pTable->pColWidth)
+             for (i=0; i<=nCol2; i++)
+-            {
+-                pTable->pColFlags[i] = pColFlags[i] & CR_HIDDEN;
+                 pTable->pColWidth[i] = pColWidth[i];
+-            }
++
++        pTable->CopyColHidden(*this, 0, nCol2);
++        pTable->CopyColFiltered(*this, 0, nCol2);
+ 
+         if (pRowFlags && pTable->pRowFlags && pRowHeight && pTable->pRowHeight)
+         {
+-            pTable->pRowFlags->CopyFromAnded( *pRowFlags, 0, nRow2,
+-                    (CR_HIDDEN | CR_FILTERED | CR_MANUALSIZE));
++            pTable->pRowFlags->CopyFromAnded( *pRowFlags, 0, nRow2, CR_MANUALSIZE);
+             pTable->pRowHeight->CopyFrom( *pRowHeight, 0, nRow2);
+         }
+ 
++        pTable->CopyRowHidden(*this, 0, nRow2);
++        pTable->CopyRowFiltered(*this, 0, nRow2);
+ 
+         //	ggf. Formeln durch Werte ersetzen
+ 
+@@ -660,10 +673,12 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+                 if (bWidth)
+                     for (SCCOL i=nCol1; i<=nCol2; i++)
+                     {
+-						bool bHiddenChange = ( pDestTab->pColFlags[i] & CR_HIDDEN ) != ( pColFlags[i] & CR_HIDDEN );
++                    bool bThisHidden = ColHidden(i);
++                    bool bHiddenChange = (pDestTab->ColHidden(i) != bThisHidden);
+ 						bool bChange = bHiddenChange || (pDestTab->pColWidth[i] != pColWidth[i]);
+                         pDestTab->pColWidth[i] = pColWidth[i];
+                         pDestTab->pColFlags[i] = pColFlags[i];
++                    pDestTab->SetColHidden(i, i, bThisHidden);
+                         //!	Aenderungen zusammenfassen?
+ 						if (bHiddenChange && pCharts) 
+                             pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab ));
+@@ -685,8 +700,10 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+                         // TODO: might need some performance improvement, block
+                         // operations instead of single GetValue()/SetValue() calls.
+                         BYTE nThisRowFlags = pRowFlags->GetValue(i);
+-						bool bHiddenChange = ( pDestTab->pRowFlags->GetValue(i) & CR_HIDDEN ) != ( nThisRowFlags & CR_HIDDEN );
++                    bool bThisHidden = RowHidden(i);
++                    bool bHiddenChange = (pDestTab->RowHidden(i) != bThisHidden);
+                         pDestTab->pRowFlags->SetValue( i, nThisRowFlags );
++                    pDestTab->SetRowHidden(i, i, bThisHidden);
+                         //!	Aenderungen zusammenfassen?
+ 						if (bHiddenChange && pCharts)
+                             pCharts->SetRangeDirty(ScRange( 0, i, nTab, MAXCOL, i, nTab ));
+@@ -1299,7 +1316,7 @@ BOOL ScTable::IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+ 
+ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2,
+                             SCCOL nCol, SCROW nAttrRow1, SCROW nAttrRow2, SCSIZE nArrY,
+-                            const ScPatternAttr* pPattern, const SfxItemSet* pCondSet ) const
++							const ScPatternAttr* pPattern, const SfxItemSet* pCondSet )
+ {
+     //	Rueckgabe = neues nArrY
+ 
+@@ -1332,7 +1349,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
+ 
+             for ( SCROW nRow = nAttrRow1; nRow <= nAttrRow2; nRow++ )
+             {
+-                if ( !(pRowFlags->GetValue(nRow) & CR_HIDDEN) )
++                if (!RowHidden(nRow))
+                 {
+                     BOOL bHitOne = TRUE;
+                     if ( nCol > nX2+1 )
+@@ -1366,7 +1383,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
+     return nArrY;
+ }
+ 
+-void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ) const
++void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 )
+ {
+     if ( !pColWidth || !pRowHeight || !pColFlags || !pRowFlags )
+     {
+@@ -1381,7 +1398,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC
+ 
+     for (SCCOL nCol=0; nCol<=MAXCOL; nCol++)
+     {
+-        if ( !(pColFlags[nCol] & CR_HIDDEN) )
++        if (!ColHidden(nCol))
+         {
+             SCSIZE nArrY = 0;
+             ScDocAttrIterator aIter( pDocument, nTab, nCol, nY1, nCol, nY2 );
+@@ -2160,13 +2177,13 @@ void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual )
+ }
+ 
+ 
+-USHORT ScTable::GetColWidth( SCCOL nCol ) const
++USHORT ScTable::GetColWidth( SCCOL nCol )
+ {
+     DBG_ASSERT(VALIDCOL(nCol),"Falsche Spaltennummer");
+ 
+     if (VALIDCOL(nCol) && pColFlags && pColWidth)
+     {
+-        if ( pColFlags[nCol] & CR_HIDDEN )
++        if (ColHidden(nCol))
+             return 0;
+         else
+             return pColWidth[nCol];
+@@ -2187,7 +2204,7 @@ USHORT ScTable::GetOriginalWidth( SCCOL nCol ) const		// immer die eingestellte
+ }
+ 
+ 
+-USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) const
++USHORT ScTable::GetCommonWidth( SCCOL nEndCol )
+ {
+     //	get the width that is used in the largest continuous column range (up to nEndCol)
+ 
+@@ -2199,24 +2216,24 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) const
+ 
+     USHORT nMaxWidth = 0;
+     USHORT nMaxCount = 0;
+-    USHORT nRangeStart = 0;
++	SCCOL nRangeStart = 0;
+     while ( nRangeStart <= nEndCol )
+     {
+         //	skip hidden columns
+-        while ( nRangeStart <= nEndCol && (pColFlags[nRangeStart] & CR_HIDDEN) )
++		while ( nRangeStart <= nEndCol && ColHidden(nRangeStart) )
+             ++nRangeStart;
+         if ( nRangeStart <= nEndCol )
+         {
+             USHORT nThisCount = 0;
+             USHORT nThisWidth = pColWidth[nRangeStart];
+-            USHORT nRangeEnd = nRangeStart;
++			SCCOL nRangeEnd = nRangeStart;
+             while ( nRangeEnd <= nEndCol && pColWidth[nRangeEnd] == nThisWidth )
+             {
+                 ++nThisCount;
+                 ++nRangeEnd;
+ 
+                 //	skip hidden columns
+-                while ( nRangeEnd <= nEndCol && (pColFlags[nRangeEnd] & CR_HIDDEN) )
++				while ( nRangeEnd <= nEndCol && ColHidden(nRangeEnd) )
+                     ++nRangeEnd;
+             }
+ 
+@@ -2234,13 +2251,13 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) const
+ }
+ 
+ 
+-USHORT ScTable::GetRowHeight( SCROW nRow ) const
++USHORT ScTable::GetRowHeight( SCROW nRow )
+ {
+     DBG_ASSERT(VALIDROW(nRow),"Falsche Zeilennummer");
+ 
+-    if (VALIDROW(nRow) && pRowFlags && pRowHeight)
++	if (VALIDROW(nRow) && pRowHeight)
+     {
+-        if ( pRowFlags->GetValue(nRow) & CR_HIDDEN )
++        if (RowHidden(nRow))
+             return 0;
+         else
+             return pRowHeight->GetValue(nRow);
+@@ -2250,28 +2267,53 @@ USHORT ScTable::GetRowHeight( SCROW nRow ) const
+ }
+ 
+ 
+-ULONG ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const
++ULONG ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow )
+ {
+     DBG_ASSERT(VALIDROW(nStartRow) && VALIDROW(nEndRow),"Falsche Zeilennummer");
+ 
+-    if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowFlags && pRowHeight)
++	if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowHeight)
+     {
+-        return pRowFlags->SumCoupledArrayForCondition( nStartRow, nEndRow,
+-                CR_HIDDEN, 0, *pRowHeight);
++        ULONG nHeight = 0;
++        SCROW nRow = nStartRow;
++        while (nRow <= nEndRow)
++        {
++            SCROW nLastRow = -1;
++            if (!RowHidden(nRow, nLastRow))
++            {
++                if (nLastRow > nEndRow)
++                    nLastRow = nEndRow;
++                nHeight += pRowFlags->SumCoupledArrayForCondition(nRow, nLastRow, 0, 0, *pRowHeight);
++            }
++            nRow = nLastRow + 1;
++        }
++        return nHeight;
+     }
+     else
+         return (ULONG) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight);
+ }
+ 
+ 
+-ULONG ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const
++ULONG ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale )
+ {
+     DBG_ASSERT(VALIDROW(nStartRow) && VALIDROW(nEndRow),"Falsche Zeilennummer");
+ 
+-    if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowFlags && pRowHeight)
++	if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowHeight)
+     {
+-        return pRowFlags->SumScaledCoupledArrayForCondition( nStartRow,
+-                nEndRow, CR_HIDDEN, 0, *pRowHeight, fScale);
++        ULONG nHeight = 0;
++        SCROW nRow = nStartRow;
++        while (nRow <= nEndRow)
++        {
++            SCROW nLastRow = -1;
++            if (!RowHidden(nRow, nLastRow))
++            {
++                if (nLastRow > nEndRow)
++                    nLastRow = nEndRow;
++                nHeight += pRowFlags->SumScaledCoupledArrayForCondition(
++                    nRow, nLastRow, 0, 0, *pRowHeight, fScale);
++            }
++            nRow = nLastRow + 1;
++        }
++        return nHeight;
+     }
+     else
+         return (ULONG) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight * fScale);
+@@ -2292,18 +2334,16 @@ USHORT ScTable::GetOriginalHeight( SCROW nRow ) const		// non-0 even if hidden
+ //	Spalten-/Zeilen-Flags
+ 
+ 
+-SCROW ScTable::GetHiddenRowCount( SCROW nRow ) const
++SCROW ScTable::GetHiddenRowCount( SCROW nRow )
+ {
+-    SCROW nEndRow = nRow;
+-    if ( pRowFlags )
+-    {
+-        nEndRow = pRowFlags->GetBitStateEnd( nRow, CR_HIDDEN, CR_HIDDEN);
+-        if (ValidRow(nEndRow))
+-            ++nEndRow;
+-        else
+-            nEndRow = nRow;
+-    }
+-    return nEndRow - nRow;
++    if (!ValidRow(nRow))
++        return 0;
++
++    SCROW nLastRow = -1;
++    if (!RowHidden(nRow, nLastRow) || !ValidRow(nLastRow))
++        return 0;
++
++    return nLastRow - nRow + 1;
+ }
+ 
+ 
+@@ -2311,9 +2351,9 @@ SCROW ScTable::GetHiddenRowCount( SCROW nRow ) const
+ 
+ void ScTable::ShowCol(SCCOL nCol, BOOL bShow)
+ {
+-    if (VALIDCOL(nCol) && pColFlags)
++	if (VALIDCOL(nCol))
+     {
+-        BOOL bWasVis = ( pColFlags[nCol] & CR_HIDDEN ) == 0;
++        bool bWasVis = !ColHidden(nCol);
+         if (bWasVis != bShow)
+         {
+             nRecalcLvl++;
+@@ -2327,10 +2367,8 @@ void ScTable::ShowCol(SCCOL nCol, BOOL bShow)
+                     pDrawLayer->WidthChanged( nTab, nCol, -(long) pColWidth[nCol] );
+             }
+ 
+-            if (bShow)
+-                pColFlags[nCol] &= ~CR_HIDDEN;
+-            else
+-                pColFlags[nCol] |= CR_HIDDEN;
++            SetColHidden(nCol, nCol, !bShow);
++
+             if( !--nRecalcLvl )
+                 SetDrawPageSize();
+ 
+@@ -2350,8 +2388,7 @@ void ScTable::ShowRow(SCROW nRow, BOOL bShow)
+ {
+     if (VALIDROW(nRow) && pRowFlags)
+     {
+-        BYTE nFlags = pRowFlags->GetValue(nRow);
+-        BOOL bWasVis = ( nFlags & CR_HIDDEN ) == 0;
++        bool bWasVis = !RowHidden(nRow);
+         if (bWasVis != bShow)
+         {
+             nRecalcLvl++;
+@@ -2365,10 +2402,10 @@ void ScTable::ShowRow(SCROW nRow, BOOL bShow)
+                     pDrawLayer->HeightChanged( nTab, nRow, -(long) pRowHeight->GetValue(nRow) );
+             }
+ 
++            SetRowHidden(nRow, nRow, !bShow);
+             if (bShow)
+-                pRowFlags->SetValue( nRow, nFlags & ~(CR_HIDDEN | CR_FILTERED));
+-            else
+-                pRowFlags->SetValue( nRow, nFlags | CR_HIDDEN);
++                SetRowFiltered(nRow, nRow, false);
++
+             if( !--nRecalcLvl )
+                 SetDrawPageSize();
+ 
+@@ -2390,8 +2427,7 @@ void ScTable::DBShowRow(SCROW nRow, BOOL bShow)
+ {
+     if (VALIDROW(nRow) && pRowFlags)
+     {
+-        BYTE nFlags = pRowFlags->GetValue(nRow);
+-        BOOL bWasVis = ( nFlags & CR_HIDDEN ) == 0;
++        bool bWasVis = !RowHidden(nRow);
+         nRecalcLvl++;
+         InitializeNoteCaptions();
+         if (bWasVis != bShow)
+@@ -2407,10 +2443,10 @@ void ScTable::DBShowRow(SCROW nRow, BOOL bShow)
+         }
+ 
+         //	Filter-Flag immer setzen, auch wenn Hidden unveraendert
+-        if (bShow)
+-            pRowFlags->SetValue( nRow, nFlags & ~(CR_HIDDEN | CR_FILTERED));
+-        else
+-            pRowFlags->SetValue( nRow, nFlags | (CR_HIDDEN | CR_FILTERED));
++
++        SetRowHidden(nRow, nRow, !bShow);
++        SetRowFiltered(nRow, nRow, !bShow);
++
+         if( !--nRecalcLvl )
+             SetDrawPageSize();
+ 
+@@ -2440,12 +2476,11 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
+     InitializeNoteCaptions();
+     while (nStartRow <= nRow2)
+     {
+-        BYTE nOldFlag = pRowFlags->GetValue(nStartRow) & CR_HIDDEN;
+-        SCROW nEndRow = pRowFlags->GetBitStateEnd( nStartRow, CR_HIDDEN, nOldFlag);
++        SCROW nEndRow = -1;
++        bool bWasVis = !RowHidden(nStartRow, nEndRow);
+         if (nEndRow > nRow2)
+             nEndRow = nRow2;
+ 
+-        BOOL bWasVis = ( nOldFlag == 0 );
+         BOOL bChanged = ( bWasVis != bShow );
+         if ( bChanged )
+         {
+@@ -2460,10 +2495,8 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
+             }
+         }
+ 
+-        if (bShow)
+-            pRowFlags->AndValue( nStartRow, nEndRow, sal::static_int_cast<BYTE>(~(CR_HIDDEN | CR_FILTERED)) );
+-        else
+-            pRowFlags->OrValue( nStartRow, nEndRow, (CR_HIDDEN | CR_FILTERED));
++        SetRowHidden(nStartRow, nEndRow, !bShow);
++        SetRowFiltered(nStartRow, nEndRow, !bShow);
+ 
+         if ( bChanged )
+         {
+@@ -2493,12 +2526,11 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
+     InitializeNoteCaptions();
+     while (nStartRow <= nRow2)
+     {
+-        BYTE nOldFlag = pRowFlags->GetValue(nStartRow) & CR_HIDDEN;
+-        SCROW nEndRow = pRowFlags->GetBitStateEnd( nStartRow, CR_HIDDEN, nOldFlag);
++        SCROW nEndRow = -1;
++        bool bWasVis = !RowHidden(nStartRow, nEndRow);
+         if (nEndRow > nRow2)
+             nEndRow = nRow2;
+ 
+-        BOOL bWasVis = ( nOldFlag == 0 );
+         BOOL bChanged = ( bWasVis != bShow );
+         if ( bChanged )
+         {
+@@ -2513,10 +2545,9 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
+             }
+         }
+ 
++        SetRowHidden(nStartRow, nEndRow, !bShow);
+         if (bShow)
+-            pRowFlags->AndValue( nStartRow, nEndRow, sal::static_int_cast<BYTE>(~(CR_HIDDEN | CR_FILTERED)) );
+-        else
+-            pRowFlags->OrValue( nStartRow, nEndRow, CR_HIDDEN);
++            SetRowFiltered(nStartRow, nEndRow, false);
+ 
+         if ( bChanged )
+         {
+@@ -2534,16 +2565,6 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
+ }
+ 
+ 
+-BOOL ScTable::IsFiltered(SCROW nRow) const
+-{
+-    if (VALIDROW(nRow) && pRowFlags)
+-        return ( pRowFlags->GetValue(nRow) & CR_FILTERED ) != 0;
+-
+-    DBG_ERROR("Falsche Zeilennummer oder keine Flags");
+-    return FALSE;
+-}
+-
+-
+ void ScTable::SetColFlags( SCCOL nCol, BYTE nNewFlags )
+ {
+     if (VALIDCOL(nCol) && pColFlags)
+@@ -2641,7 +2662,7 @@ BOOL ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow )
+     if (pOutlineTable && pColFlags)
+     {
+         ScBitMaskCompressedArray< SCCOLROW, BYTE> aArray( MAXCOL, pColFlags, MAXCOLCOUNT);
+-        return pOutlineTable->GetColArray()->ManualAction( nStartCol, nEndCol, bShow, aArray );
++		return pOutlineTable->GetColArray()->ManualAction( nStartCol, nEndCol, bShow, *this, true );
+     }
+     else
+         return FALSE;
+@@ -2651,7 +2672,7 @@ BOOL ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow )
+ BOOL ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow )
+ {
+     if (pOutlineTable && pRowFlags)
+-        return pOutlineTable->GetRowArray()->ManualAction( nStartRow, nEndRow, bShow, *pRowFlags );
++		return pOutlineTable->GetRowArray()->ManualAction( nStartRow, nEndRow, bShow, *this, false );
+     else
+         return FALSE;
+ }
+@@ -2659,54 +2680,58 @@ BOOL ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow )
+ 
+ void ScTable::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
+ {
+-    if (pColFlags)
+-    {
+-        while ( rX1>0 ? (pColFlags[rX1-1] & CR_HIDDEN) : FALSE )
+-            --rX1;
+-        while ( rX2<MAXCOL ? (pColFlags[rX2+1] & CR_HIDDEN) : FALSE )
+-            ++rX2;
+-    }
+-    if (pRowFlags)
++    // Column-wise expansion
++
++    while (rX1 > 0 && ColHidden(rX1-1))
++        --rX1;
++
++    while (rX2 < MAXCOL && ColHidden(rX2+1))
++        ++rX2;
++
++    // Row-wise expansion
++
++    if (rY1 > 0)
+     {
+-        if (rY1 > 0)
++        ScFlatBoolRowSegments::RangeData aData;
++        if (mpHiddenRows->getRangeData(rY1-1, aData) && aData.mbValue)
+         {
+-            SCROW nStartRow = pRowFlags->GetBitStateStart( rY1-1, CR_HIDDEN, CR_HIDDEN);
++            SCROW nStartRow = aData.mnRow1;
+             if (ValidRow(nStartRow))
+                 rY1 = nStartRow;
+         }
+-        if (rY2 < MAXROW)
+-        {
+-            SCROW nEndRow = pRowFlags->GetBitStateEnd( rY2+1, CR_HIDDEN, CR_HIDDEN);
+-            if (ValidRow(nEndRow))
+-                rY2 = nEndRow;
+-        }
++    }
++    if (rY2 < MAXROW)
++    {
++        SCROW nEndRow = -1;
++        if (RowHidden(rY2+1, nEndRow) && ValidRow(nEndRow))
++            rY2 = nEndRow;
+     }
+ }
+ 
+ 
+ void ScTable::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
+ {
+-    if (pColFlags)
+-    {
+-        while ( rX2>rX1 && (pColFlags[rX2] & CR_HIDDEN) )
+-            --rX2;
+-        while ( rX2>rX1 && (pColFlags[rX1] & CR_HIDDEN) )
+-            ++rX1;
+-    }
+-    if (pRowFlags)
++    while ( rX2>rX1 && ColHidden(rX2) )
++        --rX2;
++    while ( rX2>rX1 && ColHidden(rX1) )
++        ++rX1;
++
++    if (rY1 < rY2)
+     {
+-        if (rY1 < rY2)
++        ScFlatBoolRowSegments::RangeData aData;
++        if (mpHiddenRows->getRangeData(rY2, aData) && aData.mbValue)
+         {
+-            SCROW nStartRow = pRowFlags->GetBitStateStart( rY2, CR_HIDDEN, CR_HIDDEN);
++            SCROW nStartRow = aData.mnRow1;
+             if (ValidRow(nStartRow) && nStartRow >= rY1)
+                 rY2 = nStartRow;
+         }
+-        if (rY1 < rY2)
+-        {
+-            SCROW nEndRow = pRowFlags->GetBitStateEnd( rY1, CR_HIDDEN, CR_HIDDEN);
+-            if (ValidRow(nEndRow) && nEndRow <= rY2)
+-                rY1 = nEndRow;
+-        }
++    }
++
++    if (rY1 < rY2)
++    {
++        SCROW nEndRow = -1;
++        if (RowHidden(rY1, nEndRow) && ValidRow(nEndRow) && nEndRow <= rY2)
++            rY1 = nEndRow;
+     }
+ }
+ 
+@@ -2868,16 +2893,16 @@ BOOL ScTable::RefVisible(ScFormulaCell* pCell)
+ 
+     if (pCell->HasOneReference(aRef))
+     {
+-        if (aRef.aStart.Col()==aRef.aEnd.Col() && aRef.aStart.Tab()==aRef.aEnd.Tab() && pRowFlags)
++		if (aRef.aStart.Col()==aRef.aEnd.Col() && aRef.aStart.Tab()==aRef.aEnd.Tab())
+         {
+-            // while ((value & CR_FILTERED) == CR_FILTERED)
+-            // most times will be faster than
+-            // while ((value & CR_FILTERED) == 0)
+-            SCROW nEndRow = pRowFlags->GetBitStateEnd( aRef.aStart.Row(),
+-                    CR_FILTERED, CR_FILTERED);
++            SCROW nEndRow;
++            if (!RowFiltered(aRef.aStart.Row(), NULL, &nEndRow))
++                // row not filtered.
++                nEndRow = ::std::numeric_limits<SCROW>::max();
++
+             if (!ValidRow(nEndRow) || nEndRow < aRef.aEnd.Row())
+                 return TRUE;    // at least partly visible
+-            return FALSE;       // completely unvisible
++            return FALSE;       // completely invisible
+         }
+     }
+ 
+@@ -2914,7 +2939,7 @@ void ScTable::SetDrawPageSize()
+ }
+ 
+ 
+-ULONG ScTable::GetRowOffset( SCROW nRow ) const
++ULONG ScTable::GetRowOffset( SCROW nRow )
+ {
+     ULONG n = 0;
+     if ( pRowFlags && pRowHeight )
+@@ -2924,8 +2949,7 @@ ULONG ScTable::GetRowOffset( SCROW nRow ) const
+         else if (nRow == 1)
+             return GetRowHeight(0);
+ 
+-        n = pRowFlags->SumCoupledArrayForCondition( 0, nRow-1, CR_HIDDEN, 0,
+-                *pRowHeight);
++        n = GetTotalRowHeight(0, nRow-1);
+ #ifdef DBG_UTIL
+         if (n == ::std::numeric_limits<unsigned long>::max())
+             DBG_ERRORFILE("ScTable::GetRowOffset: row heights overflow");
+@@ -2938,18 +2962,42 @@ ULONG ScTable::GetRowOffset( SCROW nRow ) const
+     return n;
+ }
+ 
++SCROW ScTable::GetRowForHeight(ULONG nHeight)
++{
++    sal_uInt32 nSum = 0;
++
++    ScFlatBoolRowSegments::RangeData aData;
++    for (SCROW nRow = 0; nRow <= MAXROW; ++nRow)
++    {
++        if (!mpHiddenRows->getRangeData(nRow, aData))
++            break;
++
++        if (aData.mbValue)
++        {
++            nRow = aData.mnRow2;
++            continue;
++        }
++
++        sal_uInt32 nNew = pRowHeight->GetValue(nRow);
++        nSum += nNew;
++        if (nSum > nHeight)
++        {
++            return nRow < MAXROW ? nRow + 1 : MAXROW;
++        }
++    }
++    return -1;
++}
++
+ 
+-ULONG ScTable::GetColOffset( SCCOL nCol ) const
++ULONG ScTable::GetColOffset( SCCOL nCol )
+ {
+     ULONG n = 0;
+-    if ( pColFlags && pColWidth )
++	if ( pColWidth )
+     {
+         SCCOL i;
+-        BYTE* pFlags = pColFlags;
+-        USHORT* pWidth = pColWidth;
+-        for( i = 0; i < nCol; i++, pFlags++, pWidth++ )
+-            if( !( *pFlags & CR_HIDDEN ) )
+-                n += *pWidth;
++		for( i = 0; i < nCol; i++ )
++            if (!ColHidden(i))
++				n += pColWidth[i];
+     }
+     else
+     {
+diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx
+index 4d3b4de..cbf417b 100644
+--- sc/source/core/data/table3.cxx
++++ sc/source/core/data/table3.cxx
+@@ -603,14 +603,17 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
+             }
+         }
+     }
+-    if (bGlobalKeepQuery && pRowFlags)
++	if (bGlobalKeepQuery)
+     {
+-        BYTE nRow1Flags = pRowFlags->GetValue(nRow1);
+-        BYTE nRow2Flags = pRowFlags->GetValue(nRow2);
+-        BYTE nFlags1 = nRow1Flags & ( CR_HIDDEN | CR_FILTERED );
+-        BYTE nFlags2 = nRow2Flags & ( CR_HIDDEN | CR_FILTERED );
+-        pRowFlags->SetValue( nRow1, (nRow1Flags & ~( CR_HIDDEN | CR_FILTERED )) | nFlags2);
+-        pRowFlags->SetValue( nRow2, (nRow2Flags & ~( CR_HIDDEN | CR_FILTERED )) | nFlags1);
++        bool bRow1Hidden = RowHidden(nRow1);
++        bool bRow2Hidden = RowHidden(nRow2);
++        SetRowHidden(nRow1, nRow1, bRow2Hidden);
++        SetRowHidden(nRow2, nRow2, bRow1Hidden);
++
++        bool bRow1Filtered = RowFiltered(nRow1);
++        bool bRow2Filtered = RowFiltered(nRow2);
++        SetRowFiltered(nRow1, nRow1, bRow2Filtered);
++        SetRowFiltered(nRow2, nRow2, bRow1Filtered);
+     }
+ }
+ 
+@@ -991,13 +994,6 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
+                         SetString( nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, nTab, aOutString );
+                         ApplyStyle( nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, *pStyle );
+ 
+-/*						if (rParam.bPagebreak && nRow < MAXROW)
+-                        {
+-                            BYTE nFlags = GetRowFlags( nRow+1 );
+-                            nFlags |= CR_MANUALBREAK;
+-                            SetRowFlags( nRow+1, nFlags );
+-                        }
+-*/
+                         ++nRow;
+                         ++nEndRow;
+                         aRowEntry.nSubStartRow = nRow;
+@@ -1011,11 +1007,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
+                         }
+                     }
+                 }
+-                if (!pRowFlags)
+-                    bBlockVis = TRUE;
+-                else
+-                    if ( (pRowFlags->GetValue(nRow) & CR_FILTERED) == 0 )
+-                        bBlockVis = TRUE;
++                bBlockVis = !RowFiltered(nRow);
+             }
+         }
+         else
+@@ -2051,8 +2043,8 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData,
+     SCCOL nCol;
+     if ( rMark.IsMultiMarked() )
+         for (nCol=0; nCol<=MAXCOL && !rData.bError; nCol++)
+-            if ( !pColFlags || !( pColFlags[nCol] & CR_HIDDEN ) )
+-                aCol[nCol].UpdateSelectionFunction( rMark, rData, pRowFlags,
++			if ( !pColFlags || !ColHidden(nCol) )
++				aCol[nCol].UpdateSelectionFunction( rMark, rData, *mpHiddenRows,
+                                                     bSingle && ( nCol >= nStartCol && nCol <= nEndCol ),
+                                                     nStartRow, nEndRow );
+ 
+@@ -2060,8 +2052,8 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData,
+ 
+     if ( bSingle && !rMark.IsMarkNegative() )
+         for (nCol=nStartCol; nCol<=nEndCol && !rData.bError; nCol++)
+-            if ( !pColFlags || !( pColFlags[nCol] & CR_HIDDEN ) )
+-                aCol[nCol].UpdateAreaFunction( rData, pRowFlags, nStartRow, nEndRow );
++			if ( !pColFlags || !ColHidden(nCol) )
++				aCol[nCol].UpdateAreaFunction( rData, *mpHiddenRows, nStartRow, nEndRow );
+ }
+ 
+ void ScTable::FindConditionalFormat( ULONG nKey, ScRangeList& rList )
+diff --git sc/source/core/data/table5.cxx sc/source/core/data/table5.cxx
+index 48f7110..7e7cab9 100644
+--- sc/source/core/data/table5.cxx
++++ sc/source/core/data/table5.cxx
+@@ -53,9 +53,11 @@
+ #include "brdcst.hxx"
+ #include "tabprotection.hxx"
+ #include "globstr.hrc"
++#include "segmenttree.hxx"
+ #include <com/sun/star/sheet/TablePageBreakData.hpp>
+ 
+ #include <algorithm>
++#include <limits>
+ 
+ using ::com::sun::star::uno::Sequence;
+ using ::com::sun::star::sheet::TablePageBreakData;
+@@ -168,7 +170,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+     for (nX=nStartCol; nX<=nEndCol; nX++)
+     {
+         BOOL bStartOfPage = FALSE;
+-        long nThisX = ( pColFlags[nX] & CR_HIDDEN ) ? 0 : pColWidth[nX];
++		long nThisX = ColHidden(nX) ? 0 : pColWidth[nX];
+         bool bManualBreak = HasColManualBreak(nX);
+         if ( (nSizeX+nThisX > nPageSizeX) || (bManualBreak && !bSkipBreaks) )
+         {
+@@ -185,7 +187,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+         {
+             // subtract size of repeat columns from page size
+             for (SCCOL i=nRepeatStartX; i<=nRepeatEndX; i++)
+-                nPageSizeX -= ( pColFlags[i] & CR_HIDDEN ) ? 0 : pColWidth[i];
++				nPageSizeX -= ColHidden(i) ? 0 : pColWidth[i];
+             while (nX<=nRepeatEndX)
+                 RemoveColBreak(++nX, true, false);
+             bColFound = TRUE;
+@@ -204,8 +206,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+     for (SCROW nY = nStartRow; nY <= nEndRow; ++nY)
+     {
+         BOOL bStartOfPage = FALSE;
+-        BYTE nFlags = pRowFlags->GetValue(nY);
+-        long nThisY = (nFlags & CR_HIDDEN) ? 0 : pRowHeight->GetValue(nY);
++        long nThisY = RowHidden(nY) ? 0 : pRowHeight->GetValue(nY);
+         bool bManualBreak = HasRowManualBreak(nY);
+ 		if ( (nSizeY+nThisY > nPageSizeY) || (bManualBreak && !bSkipBreaks) )
+         {
+@@ -221,8 +222,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+         if ( bStartOfPage && bRepeatRow && nY>nRepeatStartY && !bRowFound )
+         {
+             // subtract size of repeat rows from page size
+-            unsigned long nHeights = pRowFlags->SumCoupledArrayForCondition(
+-                    nRepeatStartY, nRepeatEndY, CR_HIDDEN, 0, *pRowHeight);
++            unsigned long nHeights = GetTotalRowHeight(nRepeatStartY, nRepeatEndY);
+ #ifdef DBG_UTIL
+             if (nHeights == ::std::numeric_limits<unsigned long>::max())
+                 DBG_ERRORFILE("ScTable::UpdatePageBreaks: row heights overflow");
+@@ -416,12 +416,516 @@ Sequence<TablePageBreakData> ScTable::GetRowBreakData() const
+     return aSeq;
+ }
+ 
+-void ScTable::SyncColRowFlags()
++bool ScTable::RowHidden(SCROW nRow, SCROW* pFirstRow, SCROW* pLastRow)
++{
++    if (!ValidRow(nRow))
++        return true;
++
++    ScFlatBoolRowSegments::RangeData aData;
++    if (!mpHiddenRows->getRangeData(nRow, aData))
++        // search failed.
++        return true;
++
++    if (pFirstRow)
++        *pFirstRow = aData.mnRow1;
++    if (pLastRow)
++        *pLastRow = aData.mnRow2;
++
++    return aData.mbValue;
++}
++
++
++bool ScTable::RowHidden(SCROW nRow, SCROW& rLastRow)
++{
++    rLastRow = nRow;    
++    if (!ValidRow(nRow))
++        return true;
++
++    ScFlatBoolRowSegments::RangeData aData;
++    if (!mpHiddenRows->getRangeData(nRow, aData))
++        // search failed.
++        return true;
++
++    rLastRow = aData.mnRow2;
++    return aData.mbValue;
++}
++
++bool ScTable::HasHiddenRows(SCROW nStartRow, SCROW nEndRow)
++{
++    SCROW nRow = nStartRow;
++    while (nRow <= nEndRow)
++    {
++        SCROW nLastRow = -1;
++        bool bHidden = RowHidden(nRow, nLastRow);
++        if (bHidden)
++            return true;
++
++        nRow = nLastRow + 1;
++    }
++    return false;
++}
++
++bool ScTable::ColHidden(SCCOL nCol, SCCOL& rLastCol)
++{
++    rLastCol = nCol;    
++    if (!ValidCol(nCol))
++        return true;
++
++    ScFlatBoolColSegments::RangeData aData;
++    if (!mpHiddenCols->getRangeData(nCol, aData))
++        return true;
++
++    rLastCol = aData.mnCol2;
++    return aData.mbValue;
++}
++
++bool ScTable::ColHidden(SCCOL nCol, SCCOL* pFirstCol, SCCOL* pLastCol)
++{
++    if (!ValidCol(nCol))
++        return true;
++
++    ScFlatBoolColSegments::RangeData aData;
++    if (!mpHiddenCols->getRangeData(nCol, aData))
++        return true;
++
++    if (pFirstCol)
++        *pFirstCol = aData.mnCol1;
++    if (pLastCol)
++        *pLastCol = aData.mnCol2;
++
++    return aData.mbValue;
++}
++
++void ScTable::SetRowHidden(SCROW nStartRow, SCROW nEndRow, bool bHidden)
++{
++    if (bHidden)
++        mpHiddenRows->setTrue(nStartRow, nEndRow);
++    else
++        mpHiddenRows->setFalse(nStartRow, nEndRow);
++
++#if 0
++    // Remove this once the refactoring is complete.
++    if (bHidden)
++        pRowFlags->OrValue(nStartRow, nEndRow, CR_HIDDEN);
++    else
++        pRowFlags->AndValue(nStartRow, nEndRow, ~CR_HIDDEN);
++#endif
++}
++
++void ScTable::SetColHidden(SCCOL nStartCol, SCCOL nEndCol, bool bHidden)
++{
++    if (bHidden)
++        mpHiddenCols->setTrue(nStartCol, nEndCol);
++    else
++        mpHiddenCols->setFalse(nStartCol, nEndCol);
++#if 0
++    for (SCCOL nCol = nStartCol; nCol <= nEndCol; ++nCol)
++    {
++        if (bHidden)
++            pColFlags[nCol] |= CR_HIDDEN;
++        else
++            pColFlags[nCol] &= ~CR_HIDDEN;
++    }
++#endif
++}
++
++void ScTable::CopyColHidden(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol)
++{
++    SCCOL nCol = nStartCol;
++    while (nCol <= nEndCol)
++    {
++        SCCOL nLastCol;
++        bool bHidden = rTable.ColHidden(nCol, NULL, &nLastCol);
++        if (nLastCol > nEndCol)
++            nLastCol = nEndCol;
++
++        SetColHidden(nCol, nLastCol, bHidden);
++        nCol = nLastCol + 1;
++    }
++}
++
++void ScTable::CopyRowHidden(ScTable& rTable, SCROW nStartRow, SCROW nEndRow)
++{
++    SCROW nRow = nStartRow;
++    while (nRow <= nEndRow)
++    {
++        SCROW nLastRow = -1;
++        bool bHidden = rTable.RowHidden(nRow, nLastRow);
++        if (nLastRow > nEndRow)
++            nLastRow = nEndRow;
++        SetRowHidden(nRow, nLastRow, bHidden);
++        nRow = nLastRow + 1;
++    }
++}
++
++SCROW ScTable::FirstVisibleRow(SCROW nStartRow, SCROW nEndRow)
++{
++    SCROW nRow = nStartRow;
++    ScFlatBoolRowSegments::RangeData aData;
++    while (nRow <= nEndRow)
++    {
++        if (!ValidRow(nRow))
++            break;
++
++        if (!mpHiddenRows->getRangeData(nRow, aData))
++            // failed to get range data.
++            break;
++
++        if (!aData.mbValue)
++            // visible row found
++            return nRow;
++
++        nRow = aData.mnRow2 + 1;
++    }
++
++    return ::std::numeric_limits<SCROW>::max();
++}
++
++SCROW ScTable::LastVisibleRow(SCROW nStartRow, SCROW nEndRow)
++{
++    SCROW nRow = nEndRow;
++    ScFlatBoolRowSegments::RangeData aData;
++    while (nRow >= nStartRow)
++    {
++        if (!ValidRow(nRow))
++            break;
++
++        if (!mpHiddenRows->getRangeData(nRow, aData))
++            // failed to get range data.
++            break;
++
++        if (!aData.mbValue)
++            // visible row found
++            return nRow;
++
++        nRow = aData.mnRow1 - 1;
++    }
++
++    return ::std::numeric_limits<SCROW>::max();
++}
++
++SCROW ScTable::CountVisibleRows(SCROW nStartRow, SCROW nEndRow)
++{
++    SCROW nCount = 0;
++    SCROW nRow = nStartRow;
++    ScFlatBoolRowSegments::RangeData aData;
++    while (nRow <= nEndRow)
++    {
++        if (!mpHiddenRows->getRangeData(nRow, aData))
++            break;
++
++        if (aData.mnRow2 > nEndRow)
++            aData.mnRow2 = nEndRow;
++
++        if (!aData.mbValue)
++            nCount += aData.mnRow2 - nRow + 1;
++
++        nRow = aData.mnRow2 + 1;
++    }
++    return nCount;
++}
++
++sal_uInt32 ScTable::GetTotalRowHeight(SCROW nStartRow, SCROW nEndRow)
++{
++    sal_uInt32 nHeight = 0;
++    SCROW nRow = nStartRow;
++    ScFlatBoolRowSegments::RangeData aData;
++    while (nRow <= nEndRow)
++    {
++        if (!mpHiddenRows->getRangeData(nRow, aData))
++            break;
++
++        if (aData.mnRow2 > nEndRow)
++            aData.mnRow2 = nEndRow;
++
++        if (!aData.mbValue)
++            // visible row range.
++            nHeight += pRowHeight->SumValues(nRow, aData.mnRow2);
++
++        nRow = aData.mnRow2 + 1;
++    }
++
++    return nHeight;
++}
++
++SCCOLROW ScTable::LastHiddenColRow(SCCOLROW nPos, bool bCol)
++{
++    if (bCol)
++    {
++        SCCOL nCol = static_cast<SCCOL>(nPos);
++        if (ColHidden(nCol))
++        {
++            for (SCCOL i = nCol+1; i <= MAXCOL; ++i)
++            {
++                if (!ColHidden(nCol))
++                    return nCol - 1;
++            }
++        }
++    }
++    else
++    {
++        SCROW nRow = static_cast<SCROW>(nPos);
++        SCROW nLastRow;
++        if (RowHidden(nRow, NULL, &nLastRow))
++            return static_cast<SCCOLROW>(nLastRow);
++    }
++    return ::std::numeric_limits<SCCOLROW>::max();
++}
++
++bool ScTable::RowFiltered(SCROW nRow, SCROW* pFirstRow, SCROW* pLastRow)
++{
++#if 1
++    if (!ValidRow(nRow))
++        return false;
++
++    ScFlatBoolRowSegments::RangeData aData;
++    if (!mpFilteredRows->getRangeData(nRow, aData))
++        // search failed.
++        return false;
++
++    if (pFirstRow)
++        *pFirstRow = aData.mnRow1;
++    if (pLastRow)
++        *pLastRow = aData.mnRow2;
++
++    return aData.mbValue;
++#else
++    if (pFirstRow)
++        *pFirstRow = nRow;
++    if (pLastRow)
++        *pLastRow = nRow;
++    return (pRowFlags->GetValue(nRow) & CR_FILTERED) == CR_FILTERED;
++#endif
++}
++
++bool ScTable::ColFiltered(SCCOL nCol, SCCOL* pFirstCol, SCCOL* pLastCol)
++{
++#if 1
++    if (!ValidCol(nCol))
++        return false;
++
++    ScFlatBoolColSegments::RangeData aData;
++    if (!mpFilteredCols->getRangeData(nCol, aData))
++        // search failed.
++        return false;
++
++    if (pFirstCol)
++        *pFirstCol = aData.mnCol1;
++    if (pLastCol)
++        *pLastCol = aData.mnCol2;
++
++    return aData.mbValue;
++#else
++    if (pFirstCol)
++        *pFirstCol = nCol;
++    if (pLastCol)
++        *pLastCol = nCol;
++    return (pColFlags[nCol] & CR_FILTERED) == CR_FILTERED;
++#endif
++}
++
++bool ScTable::HasFilteredRows(SCROW nStartRow, SCROW nEndRow)
++{
++    SCROW nRow = nStartRow;
++    while (nRow <= nEndRow)
++    {
++        SCROW nLastRow = nRow;
++        bool bFiltered = RowFiltered(nRow, NULL, &nLastRow);
++        if (bFiltered)
++            return true;
++
++        nRow = nLastRow + 1;
++    }
++    return false;
++}
++
++void ScTable::CopyColFiltered(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol)
++{
++    SCCOL nCol = nStartCol;
++    while (nCol <= nEndCol)
++    {
++        SCCOL nLastCol;
++        bool bFiltered = rTable.ColFiltered(nCol, NULL, &nLastCol);
++        if (nLastCol > nEndCol)
++            nLastCol = nEndCol;
++
++        SetColFiltered(nCol, nLastCol, bFiltered);
++        nCol = nLastCol + 1;
++    }
++}
++
++void ScTable::CopyRowFiltered(ScTable& rTable, SCROW nStartRow, SCROW nEndRow)
++{
++    SCROW nRow = nStartRow;
++    while (nRow <= nEndRow)
++    {
++        SCROW nLastRow = -1;
++        bool bFiltered = rTable.RowFiltered(nRow, NULL, &nLastRow);
++        if (nLastRow > nEndRow)
++            nLastRow = nEndRow;
++        SetRowFiltered(nRow, nLastRow, bFiltered);
++        nRow = nLastRow + 1;
++    }
++}
++
++void ScTable::SetRowFiltered(SCROW nStartRow, SCROW nEndRow, bool bFiltered)
++{
++    if (bFiltered)
++        mpFilteredRows->setTrue(nStartRow, nEndRow);
++    else
++        mpFilteredRows->setFalse(nStartRow, nEndRow);
++
++#if 0
++    // Remove this once the refactoring is complete.
++    if (bFiltered)
++        pRowFlags->OrValue(nStartRow, nEndRow, CR_FILTERED);
++    else
++        pRowFlags->AndValue(nStartRow, nEndRow, ~CR_FILTERED);
++#endif
++}
++
++void ScTable::SetColFiltered(SCCOL nStartCol, SCCOL nEndCol, bool bFiltered)
++{
++    if (bFiltered)
++        mpFilteredCols->setTrue(nStartCol, nEndCol);
++    else
++        mpFilteredCols->setFalse(nStartCol, nEndCol);
++
++#if 0
++    // Remove this once the refactoring is complete.
++    for (SCCOL nCol = nStartCol; nCol <= nEndCol; ++nCol)
++    {
++        if (bFiltered)
++            pColFlags[nCol] |= CR_FILTERED;
++        else
++            pColFlags[nCol] &= ~CR_FILTERED;
++    }
++#endif
++}
++
++SCROW ScTable::FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow)
++{
++    SCROW nRow = nStartRow;
++    ScFlatBoolRowSegments::RangeData aData;
++    while (nRow <= nEndRow)
++    {
++        if (!ValidRow(nRow))
++            break;
++
++        if (!mpFilteredRows->getRangeData(nRow, aData))
++            // failed to get range data.
++            break;
++
++        if (!aData.mbValue)
++            // non-filtered row found
++            return nRow;
++
++        nRow = aData.mnRow2 + 1;
++    }
++
++    return ::std::numeric_limits<SCROW>::max();
++}
++
++SCROW ScTable::LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow)
++{
++    SCROW nRow = nEndRow;
++    ScFlatBoolRowSegments::RangeData aData;
++    while (nRow >= nStartRow)
++    {
++        if (!ValidRow(nRow))
++            break;
++
++        if (!mpFilteredRows->getRangeData(nRow, aData))
++            // failed to get range data.
++            break;
++
++        if (!aData.mbValue)
++            // non-filtered row found
++            return nRow;
++
++        nRow = aData.mnRow1 - 1;
++    }
++
++    return ::std::numeric_limits<SCROW>::max();
++}
++
++SCROW ScTable::CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow)
++{
++    SCROW nCount = 0;
++    SCROW nRow = nStartRow;
++    ScFlatBoolRowSegments::RangeData aData;
++    while (nRow <= nEndRow)
++    {
++        if (!mpFilteredRows->getRangeData(nRow, aData))
++            break;
++
++        if (aData.mnRow2 > nEndRow)
++            aData.mnRow2 = nEndRow;
++
++        if (!aData.mbValue)
++            nCount += aData.mnRow2 - nRow + 1;
++
++        nRow = aData.mnRow2 + 1;
++    }
++    return nCount;
++}
++
++namespace {
++
++void lcl_syncFlags(ScFlatBoolColSegments& rColSegments, ScFlatBoolRowSegments& rRowSegments,
++    BYTE* pColFlags, ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags, const BYTE nFlagMask)
+ {
+     using ::sal::static_int_cast;
+ 
+-    // For now, we only need to sync the manual breaks.
++    pRowFlags->AndValue(0, MAXROW, static_int_cast<BYTE>(~nFlagMask));
++    for (SCCOL i = 0; i <= MAXCOL; ++i)
++        pColFlags[i] &= static_int_cast<BYTE>(~nFlagMask);
+ 
++    {
++        // row hidden flags.
++
++        SCROW nRow = 0;
++        ScFlatBoolRowSegments::RangeData aData;
++        while (nRow <= MAXROW)
++        {
++            if (!rRowSegments.getRangeData(nRow, aData))
++                break;
++
++            if (aData.mbValue)
++                pRowFlags->OrValue(nRow, aData.mnRow2, static_int_cast<BYTE>(nFlagMask));
++
++            nRow = aData.mnRow2 + 1;
++        }
++    }
++
++    {
++        // column hidden flags.
++
++        SCCOL nCol = 0;
++        ScFlatBoolColSegments::RangeData aData;
++        while (nCol <= MAXCOL)
++        {
++            if (!rColSegments.getRangeData(nCol, aData))
++                break;
++
++            if (aData.mbValue)
++            {
++                for (SCCOL i = nCol; i <= aData.mnCol2; ++i)
++                    pColFlags[i] |= nFlagMask;
++            }
++
++            nCol = aData.mnCol2 + 1;
++        }
++    }
++}
++
++}
++
++void ScTable::SyncColRowFlags()
++{
++    using ::sal::static_int_cast;
++
++    // Manual breaks.
+     pRowFlags->AndValue(0, MAXROW, static_int_cast<BYTE>(~CR_MANUALBREAK));
+     for (SCCOL i = 0; i <= MAXCOL; ++i)
+         pColFlags[i] &= static_int_cast<BYTE>(~CR_MANUALBREAK);
+@@ -439,6 +943,10 @@ void ScTable::SyncColRowFlags()
+               itr != itrEnd; ++itr)
+             pColFlags[*itr] |= CR_MANUALBREAK;
+     }
++
++    // Hidden flags.
++    lcl_syncFlags(*mpHiddenCols, *mpHiddenRows, pColFlags, pRowFlags, CR_HIDDEN);
++    lcl_syncFlags(*mpFilteredCols, *mpFilteredRows, pColFlags, pRowFlags, CR_FILTERED);
+ }
+ 
+ void ScTable::SetPageSize( const Size& rSize )
+diff --git sc/source/core/tool/chartarr.cxx sc/source/core/tool/chartarr.cxx
+index 5445a9d..5951957 100644
+--- sc/source/core/tool/chartarr.cxx
++++ sc/source/core/tool/chartarr.cxx
+@@ -47,6 +47,9 @@
+ #include "cell.hxx"
+ #include "docoptio.hxx"
+ 
++#include <vector>
++
++using ::std::vector;
+ 
+ // -----------------------------------------------------------------------
+ 
+@@ -166,11 +169,17 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
+ 
+     SCCOL nStrCol = nCol1;		// fuer Beschriftung merken
+     SCROW nStrRow = nRow1;
+-    // Beschriftungen auch nach HiddenCols finden
+-    while ( (pDocument->GetColFlags( nCol1, nTab1) & CR_HIDDEN) != 0 )
+-        nCol1++;
+-    nRow1 = pDocument->GetRowFlagsArray( nTab1).GetFirstForCondition( nRow1,
+-            nRow2, CR_HIDDEN, 0);
++	// Skip hidden columns.
++	// TODO: make use of last column value once implemented.
++	SCCOL nLastCol = -1;
++	while (pDocument->ColHidden(nCol1, nTab1, nLastCol))
++		++nCol1;
++
++	// Skip hidden rows.
++	SCROW nLastRow = -1;
++	if (pDocument->RowHidden(nRow1, nTab1, nLastRow))
++		nRow1 = nLastRow + 1;
++
+     // falls alles hidden ist, bleibt die Beschriftung am Anfang
+     if ( nCol1 <= nCol2 )
+     {
+@@ -184,17 +193,33 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
+     }
+ 
+     SCSIZE nTotalCols = ( nCol1 <= nCol2 ? nCol2 - nCol1 + 1 : 0 );
+-    SCCOL* pCols = new SCCOL[nTotalCols > 0 ? nTotalCols : 1];
+-    SCSIZE nColCount = 0;
++	vector<SCCOL> aCols;
++	aCols.reserve(nTotalCols);
+     for (SCSIZE i=0; i<nTotalCols; i++)
+-        if ((pDocument->GetColFlags(sal::static_int_cast<SCCOL>(nCol1+i),nTab1)&CR_HIDDEN)==0)
+-            pCols[nColCount++] = sal::static_int_cast<SCCOL>(nCol1+i);
++	{
++		SCCOL nThisCol = sal::static_int_cast<SCCOL>(nCol1+i);
++		if (!pDocument->ColHidden(nThisCol, nTab1, nLastCol))
++			aCols.push_back(nThisCol);
++	}
++	SCSIZE nColCount = aCols.size();
+ 
+     SCSIZE nTotalRows = ( nRow1 <= nRow2 ? nRow2 - nRow1 + 1 : 0 );
+-    SCROW* pRows = new SCROW[nTotalRows > 0 ? nTotalRows : 1];
+-    SCSIZE nRowCount = (nTotalRows ?
+-            pDocument->GetRowFlagsArray( nTab1).FillArrayForCondition( nRow1,
+-                nRow2, CR_HIDDEN, 0, pRows, nTotalRows) : 0);
++	vector<SCROW> aRows;
++	aRows.reserve(nTotalRows);
++	if (nRow1 <= nRow2)
++	{
++		// Get all visible rows between nRow1 and nRow2.
++		SCROW nThisRow = nRow1;
++		while (nThisRow <= nRow2)
++		{
++			if (pDocument->RowHidden(nThisRow, nTab1, nLastRow))
++				nThisRow = nLastRow;
++			else
++				aRows.push_back(nThisRow);
++			++nThisRow;
++		}
++	}
++	SCSIZE nRowCount = aRows.size();
+ 
+     // May happen at least with more than 32k rows.
+     if (nColCount > SHRT_MAX || nRowCount > SHRT_MAX)
+@@ -208,13 +233,13 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
+     {
+         bValidData = FALSE;
+         nColCount = 1;
+-        pCols[0] = nStrCol;
++		aCols.push_back(nStrCol);
+     }
+     if ( !nRowCount )
+     {
+         bValidData = FALSE;
+         nRowCount = 1;
+-        pRows[0] = nStrRow;
++		aRows.push_back(nStrRow);
+     }
+ 
+         //
+@@ -237,7 +262,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
+                 {
+                     double nVal = DBL_MIN;		// Hack fuer Chart, um leere Zellen zu erkennen
+ 
+-                    pDocument->GetCell( pCols[nCol], pRows[nRow], nTab1, pCell );
++					pDocument->GetCell( aCols[nCol], aRows[nRow], nTab1, pCell );
+                     if (pCell)
+                     {
+                         CellType eType = pCell->GetCellType();
+@@ -247,8 +272,8 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
+                             if ( bCalcAsShown && nVal != 0.0 )
+                             {
+                                 sal_uInt32 nFormat;
+-                                pDocument->GetNumberFormat( pCols[nCol],
+-                                    pRows[nRow], nTab1, nFormat );
++								pDocument->GetNumberFormat( aCols[nCol],
++									aRows[nRow], nTab1, nFormat );
+                                 nVal = pDocument->RoundValueAsShown( nVal, nFormat );
+                             }
+                         }
+@@ -280,13 +305,13 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
+         {
+             String aString, aColStr;
+             if (HasColHeaders())
+-                pDocument->GetString( pCols[nCol], nStrRow, nTab1, aString );
++				pDocument->GetString( aCols[nCol], nStrRow, nTab1, aString );
+             if ( !aString.Len() )
+             {
+                 aString = ScGlobal::GetRscString(STR_COLUMN);
+                 aString += ' ';
+ //                aString += String::CreateFromInt32( pCols[nCol]+1 );
+-                ScAddress aPos( pCols[ nCol ], 0, 0 );
++                ScAddress aPos( aCols[ nCol ], 0, 0 );
+                 aPos.Format( aColStr, SCA_VALID_COL, NULL );
+                 aString += aColStr;
+             }
+@@ -306,14 +331,14 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
+             String aString;
+             if (HasRowHeaders())
+             {
+-                ScAddress aAddr( nStrCol, pRows[nRow], nTab1 );
+-                pDocument->GetString( nStrCol, pRows[nRow], nTab1, aString );
++				ScAddress aAddr( nStrCol, aRows[nRow], nTab1 );
++				pDocument->GetString( nStrCol, aRows[nRow], nTab1, aString );
+             }
+             if ( !aString.Len() )
+             {
+                 aString = ScGlobal::GetRscString(STR_ROW);
+                 aString += ' ';
+-                aString += String::CreateFromInt32( pRows[nRow]+1 );
++				aString += String::CreateFromInt32( aRows[nRow]+1 );
+             }
+             pMemChart->SetRowText( static_cast<short>(nRow), aString);
+ 
+@@ -349,11 +374,6 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
+ //        SetExtraStrings( *pMemChart );
+     }
+ 
+-        //	Aufraeumen
+-
+-    delete[] pRows;
+-    delete[] pCols;
+-
+     return pMemChart;
+ }
+ 
+diff --git sc/source/filter/excel/colrowst.cxx sc/source/filter/excel/colrowst.cxx
+index 174ab20..45d3c9e 100644
+--- sc/source/filter/excel/colrowst.cxx
++++ sc/source/filter/excel/colrowst.cxx
+@@ -309,7 +309,7 @@ void XclImpColRowSettings::ConvertHiddenFlags( SCTAB nScTab )
+             rDoc.ShowRow( nScRow, nScTab, FALSE );
+             // #i38093# rows hidden by filter need extra flag
+             if( (nFirstFilterScRow <= nScRow) && (nScRow <= nLastFilterScRow) )
+-                rDoc.SetRowFlags( nScRow, nScTab, rDoc.GetRowFlags( nScRow, nScTab ) | CR_FILTERED );
++                rDoc.SetRowFiltered(nScRow, nScRow, nScTab, true);
+         }
+     }
+ 
+diff --git sc/source/filter/excel/xetable.cxx sc/source/filter/excel/xetable.cxx
+index 2aef64c..2816daf 100644
+--- sc/source/filter/excel/xetable.cxx
++++ sc/source/filter/excel/xetable.cxx
+@@ -1604,8 +1604,7 @@ XclExpColinfo::XclExpColinfo( const XclExpRoot& rRoot,
+     mnWidth = XclTools::GetXclColumnWidth( nScWidth, GetCharWidth() );
+ 
+     // column flags
+-    BYTE nScColFlags = rDoc.GetColFlags( nScCol, nScTab );
+-    ::set_flag( mnFlags, EXC_COLINFO_HIDDEN, (nScColFlags & CR_HIDDEN) != 0 );
++    ::set_flag( mnFlags, EXC_COLINFO_HIDDEN, rDoc.ColHidden(nScCol, nScTab) );
+ 
+     // outline data
+     rOutlineBfr.Update( nScCol );
+@@ -1830,7 +1829,7 @@ XclExpRow::XclExpRow( const XclExpRoot& rRoot, sal_uInt16 nXclRow,
+ 
+     BYTE nRowFlags = GetDoc().GetRowFlags( nScRow, nScTab );
+     bool bUserHeight = ::get_flag< BYTE >( nRowFlags, CR_MANUALSIZE );
+-    bool bHidden = ::get_flag< BYTE >( nRowFlags, CR_HIDDEN );
++    bool bHidden = GetDoc().RowHidden(nScRow, nScTab);
+     ::set_flag( mnFlags, EXC_ROW_UNSYNCED, bUserHeight );
+     ::set_flag( mnFlags, EXC_ROW_HIDDEN, bHidden );
+ 
+diff --git sc/source/filter/excel/xlescher.cxx sc/source/filter/excel/xlescher.cxx
+index bea2ed1..98312a2 100644
+--- sc/source/filter/excel/xlescher.cxx
++++ sc/source/filter/excel/xlescher.cxx
+@@ -136,21 +136,20 @@ void lclGetRowFromY(
+     // rnStartH in conjunction with nXclStartRow is used as buffer for previously calculated height
+     long nTwipsY = static_cast< long >( nY / fScale + 0.5 );
+     long nRowH = 0;
+-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
+-            rDoc.GetRowFlagsArray( nScTab), static_cast<SCROW>(nXclStartRow),
+-            MAXROW, CR_HIDDEN, 0, rDoc.GetRowHeightArray( nScTab));
+-    for ( ; aIter; ++aIter )
++    bool bFound = false;
++    for (SCROW nRow = static_cast<SCROW>(nXclStartRow); nRow <= MAXROW; ++nRow)
+     {
+-        nRowH = *aIter;
++        nRowH = rDoc.GetRowHeight(nRow, nScTab);
+         if( rnStartH + nRowH > nTwipsY )
+         {
+-            rnXclRow = static_cast< sal_uInt16 >( aIter.GetPos() );
++            rnXclRow = static_cast< sal_uInt16 >(nRow);
++            bFound = true;
+             break;
+         }
+         rnStartH += nRowH;
+     }
+-    if (!aIter)
+-        rnXclRow = static_cast< sal_uInt16 >( aIter.GetIterEnd() );  // down to the bottom..
++    if (!bFound)
++        rnXclRow = static_cast<sal_uInt16>(MAXROW);
+     rnOffset = static_cast< sal_uInt16 >( nRowH ? ((nTwipsY - rnStartH) * 256.0 / nRowH + 0.5) : 0 );
+ }
+ 
+diff --git sc/source/filter/html/htmlexp.cxx sc/source/filter/html/htmlexp.cxx
+index ecb2b2a..9698b9d 100644
+--- sc/source/filter/html/htmlexp.cxx
++++ sc/source/filter/html/htmlexp.cxx
+@@ -749,7 +749,7 @@ void ScHTMLExport::WriteTables()
+         SCCOL nCol;
+         for ( nCol=nStartCol; nCol<=nEndCol; nCol++ )
+         {
+-            if ( !(pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN) )
++			if ( !pDoc->ColHidden(nCol, nTab) )
+                 ++nColCnt;
+         }
+         (((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_cols) += '=') += ByteString::CreateFromInt32( nColCnt );
+@@ -770,7 +770,7 @@ void ScHTMLExport::WriteTables()
+         aByteStr += '=';
+         for ( nCol=nStartCol; nCol<=nEndCol; nCol++ )
+         {
+-            if ( pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN )
++			if ( pDoc->ColHidden(nCol, nTab) )
+                 continue;	// for
+ 
+             aByteStrOut  = aByteStr;
+@@ -785,14 +785,12 @@ void ScHTMLExport::WriteTables()
+         // At least old (3.x, 4.x?) Netscape doesn't follow <TABLE COLS=n> and
+         // <COL WIDTH=x> specified, but needs a width at every column.
+         bTableDataWidth = TRUE;     // widths in first row
+-        bool bHasHiddenRows = pDoc->GetRowFlagsArray( nTab).HasCondition(
+-                nStartRow, nEndRow, CR_HIDDEN, CR_HIDDEN);
++		bool bHasHiddenRows = pDoc->HasHiddenRows(nStartRow, nEndRow, nTab);
+         for ( SCROW nRow=nStartRow; nRow<=nEndRow; nRow++ )
+         {
+-            if ( bHasHiddenRows && (pDoc->GetRowFlags( nRow, nTab ) & CR_HIDDEN) )
++			if ( bHasHiddenRows && pDoc->RowHidden(nRow, nTab) )
+             {
+-                nRow = pDoc->GetRowFlagsArray( nTab).GetFirstForCondition(
+-                        nRow+1, nEndRow, CR_HIDDEN, 0);
++                nRow = pDoc->FirstVisibleRow(nRow+1, nEndRow, nTab);
+                 --nRow;
+                 continue;	// for
+             }
+@@ -801,7 +799,7 @@ void ScHTMLExport::WriteTables()
+             bTableDataHeight = TRUE;  // height at every first cell of each row
+             for ( SCCOL nCol2=nStartCol; nCol2<=nEndCol; nCol2++ )
+             {
+-                if ( pDoc->GetColFlags( nCol2, nTab ) & CR_HIDDEN )
++				if ( pDoc->ColHidden(nCol2, nTab) )
+                     continue;	// for
+ 
+                 if ( nCol2 == nEndCol )
+diff --git sc/source/filter/lotus/lotimpop.cxx sc/source/filter/lotus/lotimpop.cxx
+index 17a48cb..8d887b0 100644
+--- sc/source/filter/lotus/lotimpop.cxx
++++ sc/source/filter/lotus/lotimpop.cxx
+@@ -183,8 +183,7 @@ void ImportLotus::Hiddencolumn( UINT16 nRecLen )
+         {
+             Read( nCol );
+ 
+-            pD->SetColFlags( static_cast<SCCOL> (nCol), static_cast<SCTAB> (nLTab), pD->GetColFlags( static_cast<SCCOL> (nCol), static_cast<SCTAB> (nLTab) ) | CR_HIDDEN );
+-
++            pD->SetColHidden(static_cast<SCCOL>(nCol), static_cast<SCCOL>(nCol), static_cast<SCTAB>(nLTab), true);
+             nCnt--;
+         }
+     }
+diff --git sc/source/filter/lotus/op.cxx sc/source/filter/lotus/op.cxx
+index 028993b..eb7d043 100644
+--- sc/source/filter/lotus/op.cxx
++++ sc/source/filter/lotus/op.cxx
+@@ -229,7 +229,7 @@ void OP_ColumnWidth( SvStream& r, UINT16 /*n*/ )
+         nBreite = ( UINT16 ) ( TWIPS_PER_CHAR * nWidthSpaces );
+     else
+     {
+-        pDoc->SetColFlags( static_cast<SCCOL> (nCol), 0, pDoc->GetColFlags( static_cast<SCCOL> (nCol), 0 ) | CR_HIDDEN );
++        pDoc->SetColHidden(static_cast<SCCOL>(nCol), static_cast<SCCOL>(nCol), 0, true);
+         nBreite = nDefWidth;
+     }
+ 
+@@ -338,7 +338,7 @@ void OP_HiddenCols( SvStream& r, UINT16 /*n*/ )
+         {
+             if( nAkt & 0x01 )   // unterstes Bit gesetzt?
+                 // -> Hidden Col
+-                pDoc->SetColFlags( nCount, 0, pDoc->GetColFlags( nCount, 0 ) | CR_HIDDEN );
++                pDoc->SetColHidden(nCount, nCount, 0, true);
+ 
+             nCount++;
+             nAkt = nAkt / 2;    // der Naechste bitte...
+diff --git sc/source/filter/rtf/expbase.cxx sc/source/filter/rtf/expbase.cxx
+index 2c2cf22..98aef5e 100644
+--- sc/source/filter/rtf/expbase.cxx
++++ sc/source/filter/rtf/expbase.cxx
+@@ -78,16 +78,13 @@ BOOL ScExportBase::GetDataArea( SCTAB nTab, SCCOL& nStartCol,
+ BOOL ScExportBase::TrimDataArea( SCTAB nTab, SCCOL& nStartCol,
+             SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const
+ {
+-    while ( nStartCol <= nEndCol &&
+-            pDoc->GetColFlags( nStartCol, nTab ) & CR_HIDDEN )
++    SCCOL nLastCol;
++	while ( nStartCol <= nEndCol && pDoc->ColHidden(nStartCol, nTab, nLastCol))
+         ++nStartCol;
+-    while ( nStartCol <= nEndCol &&
+-            pDoc->GetColFlags( nEndCol, nTab ) & CR_HIDDEN )
++	while ( nStartCol <= nEndCol && pDoc->ColHidden(nEndCol, nTab, nLastCol))
+         --nEndCol;
+-    nStartRow = pDoc->GetRowFlagsArray( nTab).GetFirstForCondition( nStartRow,
+-            nEndRow, CR_HIDDEN, 0);
+-    nEndRow = pDoc->GetRowFlagsArray( nTab).GetLastForCondition( nStartRow,
+-            nEndRow, CR_HIDDEN, 0);
++    nStartRow = pDoc->FirstVisibleRow(nStartRow, nEndRow, nTab);
++    nEndRow = pDoc->LastVisibleRow(nStartRow, nEndRow, nTab);
+     return nStartCol <= nEndCol && nStartRow <= nEndRow && nEndRow !=
+         ::std::numeric_limits<SCROW>::max();
+ }
+diff --git sc/source/filter/starcalc/scflt.cxx sc/source/filter/starcalc/scflt.cxx
+index 8c98903..a456235 100644
+--- sc/source/filter/starcalc/scflt.cxx
++++ sc/source/filter/starcalc/scflt.cxx
+@@ -1551,14 +1551,12 @@ void Sc10Import::LoadTables()
+             rStream >> DataValue;
+             if (DataValue != 0)
+             {
+-                BYTE nFlags = 0;
+ 				bool bPageBreak   = ((DataValue & crfSoftBreak) == crfSoftBreak);
+ 				bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak);
+-                if ((DataValue & crfHidden) == crfHidden)
+-                    nFlags |= CR_HIDDEN;
++				bool bHidden = ((DataValue & crfHidden) == crfHidden);
+ 				for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++) 
+-                {    
+-                    pDoc->SetColFlags(k, static_cast<SCTAB> (TabNo), nFlags);
++                {
++					pDoc->SetColHidden(k, k, static_cast<SCTAB>(TabNo), bHidden);
+                     pDoc->SetColBreak(k, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak);
+                 }
+             }
+@@ -1603,14 +1601,12 @@ void Sc10Import::LoadTables()
+             rStream >> DataValue;
+             if (DataValue != 0)
+             {
+-                BYTE nFlags = 0;
+ 				bool bPageBreak   = ((DataValue & crfSoftBreak) == crfSoftBreak);
+ 				bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak);
+-                if ((DataValue & crfHidden) == crfHidden)
+-                    nFlags |= CR_HIDDEN;
++                bool bHidden      = ((DataValue & crfHidden) == crfHidden);
+                 for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++) 
+                 {    
+-                    pDoc->SetRowFlags(l, static_cast<SCTAB> (TabNo), nFlags);
++                    pDoc->SetRowHidden(l, l, static_cast<SCTAB> (TabNo), bHidden);
+                     pDoc->SetRowBreak(l, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak);
+                 }
+             }
+diff --git sc/source/ui/Accessibility/AccessibleCellBase.cxx sc/source/ui/Accessibility/AccessibleCellBase.cxx
+index d112ea0..046b4ce 100644
+--- sc/source/ui/Accessibility/AccessibleCellBase.cxx
++++ sc/source/ui/Accessibility/AccessibleCellBase.cxx
+@@ -95,10 +95,12 @@ sal_Bool SAL_CALL ScAccessibleCellBase::isVisible(  )
+     sal_Bool bVisible(sal_True);
+     if (mpDoc)
+     {
+-        BYTE nColFlags = mpDoc->GetColFlags(maCellAddress.Col(), maCellAddress.Tab());
+-        BYTE nRowFlags = mpDoc->GetRowFlags(maCellAddress.Row(), maCellAddress.Tab());
+-        if (((nColFlags & CR_HIDDEN) == CR_HIDDEN) || ((nColFlags & CR_FILTERED) == CR_FILTERED) ||
+-            ((nRowFlags & CR_HIDDEN) == CR_HIDDEN) || ((nRowFlags & CR_FILTERED) == CR_FILTERED))
++        bool bColHidden = mpDoc->ColHidden(maCellAddress.Col(), maCellAddress.Tab());
++        bool bRowHidden = mpDoc->RowHidden(maCellAddress.Row(), maCellAddress.Tab());
++        bool bColFiltered = mpDoc->ColFiltered(maCellAddress.Col(), maCellAddress.Tab());
++        bool bRowFiltered = mpDoc->RowFiltered(maCellAddress.Row(), maCellAddress.Tab());
++
++        if (bColHidden || bColFiltered || bRowHidden || bRowFiltered)
+             bVisible = sal_False;
+     }
+     return bVisible;
+diff --git sc/source/ui/app/inputwin.cxx sc/source/ui/app/inputwin.cxx
+index 80625f0..754e110 100644
+--- sc/source/ui/app/inputwin.cxx
++++ sc/source/ui/app/inputwin.cxx
+@@ -294,7 +294,7 @@ sal_Bool ScInputWindow::UseSubTotal(ScRangeList* pRangeList) const
+                     SCROW nRow(pRange->aStart.Row());
+                     while (!bSubTotal && nRow <= nRowEnd)
+                     {
+-                        if (pDoc->IsFiltered(nRow, nTab))
++                        if (pDoc->RowFiltered(nRow, nTab))
+                             bSubTotal = sal_True;
+                         else
+                             ++nRow;
+diff --git sc/source/ui/app/transobj.cxx sc/source/ui/app/transobj.cxx
+index b35d177..87f888c 100644
+--- sc/source/ui/app/transobj.cxx
++++ sc/source/ui/app/transobj.cxx
+@@ -605,25 +605,24 @@ void ScTransferObj::InitDocShell()
+         //	widths / heights
+         //	(must be copied before CopyFromClip, for drawing objects)
+ 
+-        SCCOL nCol;
++		SCCOL nCol, nLastCol;
+         SCROW nRow;
+         SCTAB nSrcTab = aBlock.aStart.Tab();
+         pDestDoc->SetLayoutRTL(0, pDoc->IsLayoutRTL(nSrcTab));
+         for (nCol=nStartX; nCol<=nEndX; nCol++)
+-            if ( pDoc->GetColFlags( nCol, nSrcTab ) & CR_HIDDEN )
++			if ( pDoc->ColHidden(nCol, nSrcTab, nLastCol) )
+                 pDestDoc->ShowCol( nCol, 0, FALSE );
+             else
+                 pDestDoc->SetColWidth( nCol, 0, pDoc->GetColWidth( nCol, nSrcTab ) );
+ 
+         ScBitMaskCompressedArray< SCROW, BYTE> & rDestRowFlags =
+             pDestDoc->GetRowFlagsArrayModifiable(0);
+-        ScCompressedArrayIterator< SCROW, BYTE> aIter( pDoc->GetRowFlagsArray(
+-                    nSrcTab), nStartY, nEndY);
+-        for ( ; aIter; ++aIter )
++
++		for (SCROW nRow = nStartY; nRow <= nEndY; ++nRow)
+         {
+-            nRow = aIter.GetPos();
+-            BYTE nSourceFlags = *aIter;
+-            if ( nSourceFlags & CR_HIDDEN )
++            BYTE nSourceFlags = pDoc->GetRowFlags(nRow, nSrcTab);
++            SCROW nLastRow = -1;
++            if ( pDoc->RowHidden(nRow, nSrcTab, nLastRow) )
+                 pDestDoc->ShowRow( nRow, 0, FALSE );
+             else
+             {
+diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
+index bb7cdef..6dbec45 100644
+--- sc/source/ui/docshell/docfunc.cxx
++++ sc/source/ui/docshell/docfunc.cxx
+@@ -2980,7 +2980,9 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
+                     for (SCROW nRow=nStartNo; nRow<=nEndNo; nRow++)
+                     {
+                         BYTE nOld = pDoc->GetRowFlags(nRow,nTab);
+-                        if ( (nOld & CR_HIDDEN) == 0 && ( nOld & CR_MANUALSIZE ) )
++						SCROW nLastRow = -1;
++						bool bHidden = pDoc->RowHidden(nRow, nTab, nLastRow);
++						if ( !bHidden && ( nOld & CR_MANUALSIZE ) )
+                             pDoc->SetRowFlags( nRow, nTab, nOld & ~CR_MANUALSIZE );
+                     }
+                 }
+@@ -3015,8 +3017,8 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
+         {
+             for (SCCOL nCol=static_cast<SCCOL>(nStartNo); nCol<=static_cast<SCCOL>(nEndNo); nCol++)
+             {
+-                if ( eMode != SC_SIZE_VISOPT ||
+-                     (pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN) == 0 )
++                SCCOL nLastCol = -1;
++                if ( eMode != SC_SIZE_VISOPT || !pDoc->ColHidden(nCol, nTab, nLastCol) )
+                 {
+                     USHORT nThisSize = nSizeTwips;
+ 
+diff --git sc/source/ui/docshell/impex.cxx sc/source/ui/docshell/impex.cxx
+index 08dfcfb..6df6637 100644
+--- sc/source/ui/docshell/impex.cxx
++++ sc/source/ui/docshell/impex.cxx
+@@ -1444,7 +1444,7 @@ BOOL ScImportExport::Doc2Text( SvStream& rStrm )
+ 
+     for (nRow = nStartRow; nRow <= nEndRow; nRow++)
+     {
+-        if (bIncludeFiltered || !pDoc->IsFiltered( nRow, aRange.aStart.Tab() ))
++		if (bIncludeFiltered || !pDoc->RowFiltered( nRow, aRange.aStart.Tab() ))
+         {
+             for (nCol = nStartCol; nCol <= nEndCol; nCol++)
+             {
+diff --git sc/source/ui/docshell/olinefun.cxx sc/source/ui/docshell/olinefun.cxx
+index 01b4f9a..fd120a8 100644
+--- sc/source/ui/docshell/olinefun.cxx
++++ sc/source/ui/docshell/olinefun.cxx
+@@ -411,7 +411,7 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
+             if ( bColumns )
+                 pDoc->ShowCol( static_cast<SCCOL>(i), nTab, bShow );
+             else
+-                if ( !bShow || !pDoc->IsFiltered( i,nTab ) )
++				if ( !bShow || !pDoc->RowFiltered( i,nTab ) )
+                     pDoc->ShowRow( i, nTab, bShow );
+         }
+     }
+@@ -509,7 +509,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord,
+             }
+         }
+         for ( i=nMin; i<=nMax; i++ )
+-            if ( !pDoc->IsFiltered( i,nTab ) )				// weggefilterte nicht einblenden
++			if ( !pDoc->RowFiltered( i,nTab ) )				// weggefilterte nicht einblenden
+                 pDoc->ShowRow( i, nTab, TRUE );
+ 
+         pDoc->UpdatePageBreaks( nTab );
+@@ -669,7 +669,7 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
+         if ( bColumns )
+             pDoc->ShowCol( static_cast<SCCOL>(i), nTab, TRUE );
+         else
+-            if ( !pDoc->IsFiltered( i,nTab ) )				// weggefilterte nicht einblenden
++			if ( !pDoc->RowFiltered( i,nTab ) )				// weggefilterte nicht einblenden
+                 pDoc->ShowRow( i, nTab, TRUE );
+     }
+ 
+diff --git sc/source/ui/inc/viewutil.hxx sc/source/ui/inc/viewutil.hxx
+index 55f0039..18b4d68 100644
+--- sc/source/ui/inc/viewutil.hxx
++++ sc/source/ui/inc/viewutil.hxx
+@@ -71,10 +71,10 @@ public:
+ 
+     static sal_Int32 GetTransliterationType( USHORT nSlotID );
+ 
+-    static bool HasFiltered( const ScRange& rRange, const ScDocument* pDoc );
++    static bool HasFiltered( const ScRange& rRange, ScDocument* pDoc );
+     /** Fit a range to cover nRows number of unfiltered rows.
+         @return <TRUE/> if the resulting range covers nRows unfiltered rows. */
+-    static bool FitToUnfilteredRows( ScRange & rRange, const ScDocument * pDoc, size_t nRows );
++    static bool FitToUnfilteredRows( ScRange & rRange, ScDocument * pDoc, size_t nRows );
+     static void UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc );
+ 
+     static void HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USHORT nSlotId );
+diff --git sc/source/ui/undo/undoblk.cxx sc/source/ui/undo/undoblk.cxx
+index f92adea..002aa14 100644
+--- sc/source/ui/undo/undoblk.cxx
++++ sc/source/ui/undo/undoblk.cxx
+@@ -1152,10 +1152,10 @@ ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
+     BOOL bIncludeFiltered = bCut;
+     if ( !bIncludeFiltered )
+     {
+-        //	manually find number of non-filtered rows
+-        SCROW nPastedCount = pDocShell->GetDocument()->GetRowFlagsArray(
+-                aSrcRange.aStart.Tab()).CountForCondition(
+-                aSrcRange.aStart.Row(), aSrcRange.aEnd.Row(), CR_FILTERED, 0);
++        // find number of non-filtered rows
++        SCROW nPastedCount = pDocShell->GetDocument()->CountNonFilteredRows(
++            aSrcRange.aStart.Row(), aSrcRange.aEnd.Row(), aSrcRange.aStart.Tab());
++
+         if ( nPastedCount == 0 )
+             nPastedCount = 1;
+         aDestEnd.SetRow( aNewDestPos.Row() + nPastedCount - 1 );
+diff --git sc/source/ui/undo/undoblk3.cxx sc/source/ui/undo/undoblk3.cxx
+index c6dba05..cb6f62c 100644
+--- sc/source/ui/undo/undoblk3.cxx
++++ sc/source/ui/undo/undoblk3.cxx
+@@ -1082,17 +1082,20 @@ void __EXPORT ScUndoAutoFormat::Redo()
+             aDestMark.MarkToMulti();
+ 
+             // wie SC_SIZE_VISOPT
++            SCROW nLastRow = -1;
+             for (SCROW nRow=nStartY; nRow<=nEndY; nRow++)
+             {
+                 BYTE nOld = pDoc->GetRowFlags(nRow,nTab);
+-                if ( (nOld & CR_HIDDEN) == 0 && ( nOld & CR_MANUALSIZE ) )
++                bool bHidden = pDoc->RowHidden(nRow, nTab, nLastRow);
++				if ( !bHidden && ( nOld & CR_MANUALSIZE ) )
+                     pDoc->SetRowFlags( nRow, nTab, nOld & ~CR_MANUALSIZE );
+             }
+             pDoc->SetOptimalHeight( nStartY, nEndY, nTab, 0, &aVirtDev,
+                                         nPPTX, nPPTY, aZoomX, aZoomY, FALSE );
+ 
++            SCCOL nLastCol = -1;
+             for (SCCOL nCol=nStartX; nCol<=nEndX; nCol++)
+-                if ((pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN) == 0)
++                if (!pDoc->ColHidden(nCol, nTab, nLastCol))
+                 {
+                     USHORT nThisSize = STD_EXTRA_WIDTH + pDoc->GetOptimalColWidth( nCol, nTab,
+                                                 &aVirtDev, nPPTX, nPPTY, aZoomX, aZoomY, bFormula,
+diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx
+index 520a788..37eb67c 100644
+--- sc/source/ui/unoobj/cellsuno.cxx
++++ sc/source/ui/unoobj/cellsuno.cxx
+@@ -3379,18 +3379,25 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleC
+         ScMarkData aMarkData(*GetMarkData());
+ 
+         ScDocument* pDoc = pDocShell->GetDocument();
+-        for (SCCOL nCol=0; nCol<=MAXCOL; nCol++)
+-            if (pDoc->GetColFlags(nCol,nTab) & CR_HIDDEN)
+-                aMarkData.SetMultiMarkArea( ScRange( nCol,0,nTab, nCol,MAXROW,nTab ), FALSE );
+-
+-        //!	nur bis zur letzten selektierten Zeile testen?
+-        ScCompressedArrayIterator< SCROW, BYTE> aIter( pDoc->GetRowFlagsArray( nTab), 0, MAXROW);
+-        do
+-        {
+-            if (*aIter & CR_HIDDEN)
+-                aMarkData.SetMultiMarkArea( ScRange( 0, aIter.GetRangeStart(),
+-                            nTab, MAXCOL, aIter.GetRangeEnd(), nTab ), FALSE );
+-        } while (aIter.NextRange());
++		SCCOL nCol = 0, nLastCol;
++		while (nCol <= MAXCOL)
++		{
++			if (pDoc->ColHidden(nCol, nTab, nLastCol))
++				// hidden columns.  Unselect them.
++				aMarkData.SetMultiMarkArea(ScRange(nCol, 0, nTab, nLastCol, MAXROW, nTab), false);
++
++			nCol = nLastCol + 1;
++		}
++
++		SCROW nRow = 0, nLastRow;
++		while (nRow <= MAXROW)
++		{
++			if (pDoc->RowHidden(nRow, nTab, nLastRow))
++				// These rows are hidden.  Unselect them.
++				aMarkData.SetMultiMarkArea(ScRange(0, nRow, nTab, MAXCOL, nLastRow, nTab), false);
++
++			nRow = nLastRow + 1;
++		}
+ 
+         ScRangeList aNewRanges;
+         aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE );
+@@ -8882,8 +8889,9 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
+         }
+         else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
+         {
+-            BOOL bVis = !(pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN);
+-            ScUnoHelpFunctions::SetBoolInAny( rAny, bVis );
++			SCCOL nDummy;
++			bool bHidden = pDoc->ColHidden(nCol, nTab, nDummy);
++			ScUnoHelpFunctions::SetBoolInAny( rAny, !bHidden );
+         }
+         else if ( pEntry->nWID == SC_WID_UNO_OWIDTH )
+         {
+@@ -8985,12 +8993,7 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
+ //			ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
+ //			aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE );
+             //	SC_SIZE_DIRECT mit Groesse 0 blendet aus
+-            BYTE nFlags = pDoc->GetRowFlags(nRow, nTab);
+-            if (bFil)
+-                nFlags |= CR_FILTERED;
+-            else
+-                nFlags &= ~CR_FILTERED;
+-            pDoc->SetRowFlags(nRow, nTab, nFlags);
++            pDoc->SetRowFiltered(nRow, nRow, nTab, bFil);
+         }
+         else if ( pEntry->nWID == SC_WID_UNO_OHEIGHT )
+         {
+@@ -9042,12 +9045,13 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
+         }
+         else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
+         {
+-            BOOL bVis = !(pDoc->GetRowFlags( nRow, nTab ) & CR_HIDDEN);
+-            ScUnoHelpFunctions::SetBoolInAny( rAny, bVis );
++            SCROW nDummy;
++            bool bHidden = pDoc->RowHidden(nRow, nTab, nDummy);
++            ScUnoHelpFunctions::SetBoolInAny( rAny, !bHidden );
+         }
+         else if ( pEntry->nWID == SC_WID_UNO_CELLFILT )
+         {
+-            BOOL bVis = ((pDoc->GetRowFlags( nRow, nTab ) & CR_FILTERED) != 0);
++            bool bVis = pDoc->RowFiltered(nRow, nTab);
+             ScUnoHelpFunctions::SetBoolInAny( rAny, bVis );
+         }
+         else if ( pEntry->nWID == SC_WID_UNO_OHEIGHT )
+diff --git sc/source/ui/unoobj/chart2uno.cxx sc/source/ui/unoobj/chart2uno.cxx
+index 7c1cfc6..174d213 100644
+--- sc/source/ui/unoobj/chart2uno.cxx
++++ sc/source/ui/unoobj/chart2uno.cxx
+@@ -2840,14 +2840,17 @@ void ScChart2DataSequence::BuildDataCache()
+             if (!ScRefTokenHelper::getRangeFromToken(aRange, *itr))
+                 continue;
+ 
++            SCCOL nLastCol = -1;
++            SCROW nLastRow = -1;
+             for (SCTAB nTab = aRange.aStart.Tab(); nTab <= aRange.aEnd.Tab(); ++nTab)
+             {
+                 for (SCCOL nCol = aRange.aStart.Col(); nCol <= aRange.aEnd.Col(); ++nCol)
+                 {
+                     for (SCROW nRow = aRange.aStart.Row(); nRow <= aRange.aEnd.Row(); ++nRow)
+                     {
+-                        bool bColHidden = (m_pDocument->GetColFlags(nCol, nTab) & CR_HIDDEN);
+-                        bool bRowHidden = (m_pDocument->GetRowFlags(nRow, nTab) & CR_HIDDEN);
++                        bool bColHidden = m_pDocument->ColHidden(nCol, nTab, nLastCol);
++                        bool bRowHidden = m_pDocument->RowHidden(nRow, nTab, nLastRow);
++
+                         if (bColHidden || bRowHidden)
+                         {
+                             // hidden cell
+diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx
+index 5c4113b..5b4a50b 100644
+--- sc/source/ui/unoobj/docuno.cxx
++++ sc/source/ui/unoobj/docuno.cxx
+@@ -2613,7 +2613,8 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPro
+     }
+     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) )
+     {
+-        BOOL bVis = !(pDoc->GetColFlags( nStartCol, nTab ) & CR_HIDDEN);
++        SCCOL nLastCol;
++        bool bVis = !pDoc->ColHidden(nStartCol, nTab, nLastCol);
+         ScUnoHelpFunctions::SetBoolInAny( aAny, bVis );
+     }
+     else if ( aNameString.EqualsAscii( SC_UNONAME_OWIDTH ) )
+@@ -2821,9 +2822,9 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
+     {
+         //!	undo etc.
+         if (ScUnoHelpFunctions::GetBoolFromAny( aValue ))
+-            pDoc->GetRowFlagsArrayModifiable( nTab).OrValue( nStartRow, nEndRow, CR_FILTERED);
++            pDoc->SetRowFiltered(nStartRow, nEndRow, nTab, true);
+         else
+-            pDoc->GetRowFlagsArrayModifiable( nTab).AndValue( nStartRow, nEndRow, sal::static_int_cast<BYTE>(~CR_FILTERED) );
++            pDoc->SetRowFiltered(nStartRow, nEndRow, nTab, false);
+     }
+     else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE) || aNameString.EqualsAscii( SC_UNONAME_MANPAGE) )
+     {
+@@ -2871,12 +2872,13 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aProper
+     }
+     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) )
+     {
+-        BOOL bVis = !(pDoc->GetRowFlags( nStartRow, nTab ) & CR_HIDDEN);
++        SCROW nLastRow;
++        bool bVis = !pDoc->RowHidden(nStartRow, nTab, nLastRow);
+         ScUnoHelpFunctions::SetBoolInAny( aAny, bVis );
+     }
+     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLFILT ) )
+     {
+-        BOOL bVis = ((pDoc->GetRowFlags( nStartRow, nTab ) & CR_FILTERED) != 0);
++        bool bVis = pDoc->RowFiltered(nStartRow, nTab);
+         ScUnoHelpFunctions::SetBoolInAny( aAny, bVis );
+     }
+     else if ( aNameString.EqualsAscii( SC_UNONAME_OHEIGHT ) )
+diff --git sc/source/ui/view/colrowba.cxx sc/source/ui/view/colrowba.cxx
+index ecd0a37..e7613c1 100644
+--- sc/source/ui/view/colrowba.cxx
++++ sc/source/ui/view/colrowba.cxx
+@@ -101,7 +101,8 @@ USHORT ScColBar::GetEntrySize( SCCOLROW nEntryNo )
+ {
+     ScDocument* pDoc = pViewData->GetDocument();
+     SCTAB nTab = pViewData->GetTabNo();
+-    if ( pDoc->GetColFlags( static_cast<SCCOL>(nEntryNo), nTab ) & CR_HIDDEN )
++	SCCOL nLastCol = -1;
++	if (pDoc->ColHidden(static_cast<SCCOL>(nEntryNo), nTab, nLastCol))
+         return 0;
+     else
+         return (USHORT) ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(nEntryNo), nTab ), pViewData->GetPPTX() );
+@@ -267,7 +268,8 @@ USHORT ScRowBar::GetEntrySize( SCCOLROW nEntryNo )
+ {
+     ScDocument* pDoc = pViewData->GetDocument();
+     SCTAB nTab = pViewData->GetTabNo();
+-    if ( pDoc->GetRowFlags( nEntryNo, nTab ) & CR_HIDDEN )
++	SCROW nLastRow = -1;
++	if (pDoc->RowHidden(nEntryNo, nTab, nLastRow))
+         return 0;
+     else
+         return (USHORT) ScViewData::ToPixel( pDoc->GetOriginalHeight( nEntryNo,
+diff --git sc/source/ui/view/drawutil.cxx sc/source/ui/view/drawutil.cxx
+index 48b03b5..ddb2f06 100644
+--- sc/source/ui/view/drawutil.cxx
++++ sc/source/ui/view/drawutil.cxx
+@@ -69,14 +69,19 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab,
+         nTwipsX += (long) nWidth;
+         nPixelX += ScViewData::ToPixel( nWidth, nPPTX );
+     }
+-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
+-            pDoc->GetRowFlagsArray( nTab), nStartRow, nEndRow-1, CR_HIDDEN, 0,
+-            pDoc->GetRowHeightArray( nTab));
+-    for ( ; aIter; ++aIter )
++
++    for (SCROW nRow = nStartRow; nRow <= nEndRow-1; ++nRow)
+     {
+-        USHORT nHeight = *aIter;
+-        nTwipsY += (long) nHeight;
+-        nPixelY += ScViewData::ToPixel( nHeight, nPPTY );
++        SCROW nLastRow = nRow;
++        if (pDoc->RowHidden(nRow, nTab, NULL, &nLastRow))
++        {    
++            nRow = nLastRow;
++            continue;
++        }
++
++        USHORT nHeight = pDoc->GetRowHeight(nRow, nTab);
++        nTwipsY += static_cast<long>(nHeight);
++        nPixelY += ScViewData::ToPixel(nHeight, nPPTY);
+     }
+ 
+     MapMode aHMMMode( MAP_100TH_MM, Point(), rZoomX, rZoomY );
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index ac4d80f..e591f86 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -4601,18 +4601,17 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges
+     SCROW nTmp;
+ 
+     ScDocument* pDoc = pDocSh->GetDocument();
+-    while ( nCol1 > 0 && ( pDoc->GetColFlags( nCol1, nTab1 ) & CR_HIDDEN ) )
++    while ( nCol1 > 0 && pDoc->ColHidden(nCol1, nTab1) )
+     {
+         --nCol1;
+         bHiddenEdge = TRUE;
+     }
+-    while ( nCol2 < MAXCOL && ( pDoc->GetColFlags( nCol2, nTab1 ) & CR_HIDDEN ) )
++    while ( nCol2 < MAXCOL && pDoc->ColHidden(nCol2, nTab1) )
+     {
+         ++nCol2;
+         bHiddenEdge = TRUE;
+     }
+-    nTmp = pDoc->GetRowFlagsArray( nTab1).GetLastForCondition( 0, nRow1,
+-            CR_HIDDEN, 0);
++    nTmp = pDoc->FirstVisibleRow(0, nRow1, nTab1);
+     if (!ValidRow(nTmp))
+         nTmp = 0;
+     if (nTmp < nRow1)
+@@ -4620,8 +4619,7 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges
+         nRow1 = nTmp;
+         bHiddenEdge = TRUE;
+     }
+-    nTmp = pDoc->GetRowFlagsArray( nTab1).GetFirstForCondition( nRow2, MAXROW,
+-            CR_HIDDEN, 0);
++    nTmp = pDoc->FirstVisibleRow(nRow2, MAXROW, nTab1);
+     if (!ValidRow(nTmp))
+         nTmp = MAXROW;
+     if (nTmp > nRow2)
+diff --git sc/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx
+index 4dfc08f..23edc22 100644
+--- sc/source/ui/view/gridwin4.cxx
++++ sc/source/ui/view/gridwin4.cxx
+@@ -1378,7 +1378,7 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos )
+     const ScMergeAttr* pMerge = static_cast<const ScMergeAttr*>(pDoc->GetAttr( nCol,nRow,nTab, ATTR_MERGE ));
+     if ( pMerge->GetColMerge() > 1 )
+         nNextCol = nCol + pMerge->GetColMerge();    // next cell after the merged area
+-    while ( nNextCol <= MAXCOL && (pDoc->GetColFlags( nNextCol, nTab ) & CR_HIDDEN) )
++    while ( nNextCol <= MAXCOL && pDoc->ColHidden(nNextCol, nTab) )
+         ++nNextCol;
+     BOOL bNextCell = ( nNextCol <= MAXCOL );
+     if ( bNextCell )
+@@ -1581,7 +1581,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
+                         if ( pMergeFlag->IsVerOverlapped() && ( bDoHidden || bFirstRow ) )
+                         {
+                             while ( pMergeFlag->IsVerOverlapped() && nThisY > 0 &&
+-                                        ( (pDoc->GetRowFlags( nThisY-1, nTab ) & CR_HIDDEN) || bFirstRow ) )
++                                    (pDoc->RowHidden(nThisY-1, nTab) || bFirstRow) )
+                             {
+                                 --nThisY;
+                                 pPattern = pDoc->GetPattern( nX, nThisY, nTab );
+@@ -1768,7 +1768,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
+                         if ( pMergeFlag->IsVerOverlapped() && ( bDoHidden || bFirstRow ) )
+                         {
+                             while ( pMergeFlag->IsVerOverlapped() && nThisY > 0 &&
+-                                        ( (pDoc->GetRowFlags( nThisY-1, nTab ) & CR_HIDDEN) || bFirstRow ) )
++                                    (pDoc->RowHidden(nThisY-1, nTab) || bFirstRow) )
+                             {
+                                 --nThisY;
+                                 pPattern = pDoc->GetPattern( nX, nThisY, nTab );
+diff --git sc/source/ui/view/olinewin.cxx sc/source/ui/view/olinewin.cxx
+index fa00785..82d66d1 100644
+--- sc/source/ui/view/olinewin.cxx
++++ sc/source/ui/view/olinewin.cxx
+@@ -186,16 +186,15 @@ const ScOutlineEntry* ScOutlineWindow::GetOutlineEntry( size_t nLevel, size_t nE
+ 
+ bool ScOutlineWindow::IsHidden( SCCOLROW nColRowIndex ) const
+ {
+-    sal_uInt8 nFlags = mbHoriz ?
+-        GetDoc().GetColFlags( static_cast<SCCOL>(nColRowIndex), GetTab() ) :
+-        GetDoc().GetRowFlags( static_cast<SCROW>(nColRowIndex), GetTab() );
+-    return (nFlags & CR_HIDDEN) != 0;
++    return mbHoriz ? 
++        GetDoc().ColHidden(static_cast<SCCOL>(nColRowIndex), GetTab()) : 
++        GetDoc().RowHidden(static_cast<SCROW>(nColRowIndex), GetTab());
+ }
+ 
+ bool ScOutlineWindow::IsFiltered( SCCOLROW nColRowIndex ) const
+ {
+     // columns cannot be filtered
+-    return !mbHoriz && GetDoc().IsFiltered( static_cast<SCROW>(nColRowIndex), GetTab() );
++    return !mbHoriz && GetDoc().RowFiltered( static_cast<SCROW>(nColRowIndex), GetTab() );
+ }
+ 
+ bool ScOutlineWindow::IsFirstVisible( SCCOLROW nColRowIndex ) const
+diff --git sc/source/ui/view/output.cxx sc/source/ui/view/output.cxx
+index 9a27bb8..989ea07 100644
+--- sc/source/ui/view/output.cxx
++++ sc/source/ui/view/output.cxx
+@@ -387,8 +387,9 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
+                 {
+                     BYTE nDocFl = pDoc->GetColFlags( nCol, nTab );
+                     nBreak = pDoc->HasColBreak(nCol, nTab);
++                    bool bHidden = pDoc->ColHidden(nCol, nTab);
+ 
+-                    if ( nBreak || !(nDocFl & CR_HIDDEN) )
++                    if ( nBreak || !bHidden )
+                         break;
+                     ++nCol;
+                 }
+@@ -507,7 +508,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
+                 for (SCROW i = nYplus1; i <= MAXROW; ++i)
+                 {
+                     nBreak = pDoc->HasRowBreak(i, nTab);
+-                    bool bHidden = (pDoc->GetRowFlags(i, nTab) & CR_HIDDEN);
++                    bool bHidden = pDoc->RowHidden(i, nTab);
+                     if (nBreak || !bHidden)
+                         break;
+                 }
+@@ -654,7 +655,7 @@ void ScOutputData::FindRotated()
+                 const ScPatternAttr* pPattern = pInfo->pPatternAttr;
+                 const SfxItemSet* pCondSet = pInfo->pConditionSet;
+ 
+-                if ( !pPattern && (pDoc->GetColFlags(nX,nTab) & CR_HIDDEN) == 0 )
++                if ( !pPattern && !pDoc->ColHidden(nX, nTab) )
+                 {
+                     pPattern = pDoc->GetPattern( nX, nY, nTab );
+                     pCondSet = pDoc->GetCondResult( nX, nY, nTab );
+diff --git sc/source/ui/view/output2.cxx sc/source/ui/view/output2.cxx
+index dec757a..3867c17 100644
+--- sc/source/ui/view/output2.cxx
++++ sc/source/ui/view/output2.cxx
+@@ -697,7 +697,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
+     while (bHOver)				// nY konstant
+     {
+         --rOverX;
+-        bHidden = ( (pDoc->GetColFlags(rOverX,nTab) & CR_HIDDEN) != 0 );
++        bHidden = pDoc->ColHidden(rOverX, nTab);
+         if ( !bDoMerge && !bHidden )
+             return FALSE;
+ 
+@@ -721,7 +721,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
+     while (bVOver)
+     {
+         --rOverY;
+-        bHidden = ( (pDoc->GetRowFlags(rOverY,nTab) & CR_HIDDEN) != 0 );
++        bHidden = pDoc->RowHidden(rOverY, nTab);
+         if ( !bDoMerge && !bHidden )
+             return FALSE;
+ 
+@@ -729,8 +729,8 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
+             --nArrY;						// lokale Kopie !
+ 
+         if (rOverX >= nX1 && rOverY >= nY1 &&
+-            (pDoc->GetColFlags(rOverX,nTab) & CR_HIDDEN) == 0 &&
+-            (pDoc->GetRowFlags(rOverY,nTab) & CR_HIDDEN) == 0 &&
++            !pDoc->ColHidden(rOverX, nTab) &&
++            !pDoc->RowHidden(rOverY, nTab) &&
+             pRowInfo[nArrY].nRowNo == rOverY)
+         {
+ //			rVirtPosY -= pRowInfo[nArrY].nHeight;
+@@ -2014,7 +2014,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
+                     if (bDoCell)
+                     {
+                         if ( nCellY == nY && nCellX >= nX1 && nCellX <= nX2 &&
+-                             (pDoc->GetColFlags(nCellX,nTab) & CR_HIDDEN) == 0 )
++                             !pDoc->ColHidden(nCellX, nTab) )
+                         {
+                             CellInfo& rCellInfo = pThisRowInfo->pCellInfo[nCellX+1];
+                             pPattern = rCellInfo.pPatternAttr;
+diff --git sc/source/ui/view/prevloc.cxx sc/source/ui/view/prevloc.cxx
+index 54f7376..fb65955 100644
+--- sc/source/ui/view/prevloc.cxx
++++ sc/source/ui/view/prevloc.cxx
+@@ -602,11 +602,11 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
+         ++nColCount;
+     if ( bHasRepCols )
+         for ( nCol=nRepeatColStart; nCol<=nRepeatColEnd; nCol++ )
+-            if ( ( pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN ) == 0 )
++            if (!pDoc->ColHidden(nCol, nTab))
+                 ++nColCount;
+     if ( bHasMainCols )
+         for ( nCol=nMainColStart; nCol<=nMainColEnd; nCol++ )
+-            if ( ( pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN ) == 0 )
++            if (!pDoc->ColHidden(nCol, nTab))
+                 ++nColCount;
+ 
+     if ( nColCount > 0 )
+@@ -623,7 +623,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
+         {
+             long nPosX = 0;
+             for ( nCol=nRepeatColStart; nCol<=nRepeatColEnd; nCol++ )
+-                if ( ( pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN ) == 0 )
++                if (!pDoc->ColHidden(nCol, nTab))
+                 {
+                     USHORT nDocW = pDoc->GetColWidth( nCol, nTab );
+                     long nNextX = nPosX + (long) (nDocW * nScaleX);
+@@ -642,7 +642,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
+         {
+             long nPosX = 0;
+             for ( nCol=nMainColStart; nCol<=nMainColEnd; nCol++ )
+-                if ( ( pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN ) == 0 )
++                if (!pDoc->ColHidden(nCol, nTab))
+                 {
+                     USHORT nDocW = pDoc->GetColWidth( nCol, nTab );
+                     long nNextX = nPosX + (long) (nDocW * nScaleX);
+@@ -670,11 +670,9 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
+     if ( bHasHeaderRow )
+         ++nRowCount;
+     if ( bHasRepRows )
+-        nRowCount += pDoc->GetRowFlagsArray( nTab).CountForCondition(
+-                nRepeatRowStart, nRepeatRowEnd, CR_HIDDEN, 0);
++        nRowCount += pDoc->CountVisibleRows(nRepeatRowStart, nRepeatRowEnd, nTab);
+     if ( bHasMainRows )
+-        nRowCount += pDoc->GetRowFlagsArray( nTab).CountForCondition(
+-                nMainRowStart, nMainRowEnd, CR_HIDDEN, 0);
++        nRowCount += pDoc->CountVisibleRows(nMainRowStart, nMainRowEnd, nTab);
+ 
+     if ( nRowCount > 0 )
+     {
+@@ -689,58 +687,44 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
+         if ( bHasRepRows )
+         {
+             long nPosY = 0;
+-            ScCompressedArrayIterator< SCROW, BYTE> aIter(
+-                    pDoc->GetRowFlagsArray( nTab), nRepeatRowStart,
+-                    nRepeatRowEnd);
+-            do
++            for (SCROW nRow = nRepeatRowStart; nRow <= nRepeatRowEnd; ++nRow)
+             {
+-                if ((*aIter & CR_HIDDEN) == 0)
+-                {
+-                    SCROW nRangeEnd = aIter.GetRangeEnd();
+-                    for (SCROW nRow=aIter.GetRangeStart(); nRow<=nRangeEnd; ++nRow)
+-                    {
+-                        USHORT nDocH = pDoc->FastGetOriginalRowHeight( nRow, nTab );
+-                        long nNextY = nPosY + (long) (nDocH * nScaleY);
+-
+-                        long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height();
+-                        long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1;
+-                        pRowInfo[nRowPos].Set( FALSE, nRow,
+-                                aRepeatRect.Top() + nPixelStart,
+-                                aRepeatRect.Top() + nPixelEnd );
+-
+-                        nPosY = nNextY;
+-                        ++nRowPos;
+-                    }
+-                }
+-            } while (aIter.NextRange());
++                if (pDoc->RowHidden(nRow, nTab))
++                    continue;
++
++                USHORT nDocH = pDoc->FastGetOriginalRowHeight( nRow, nTab );
++                long nNextY = nPosY + (long) (nDocH * nScaleY);
++
++                long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height();
++                long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1;
++                pRowInfo[nRowPos].Set( FALSE, nRow,
++                        aRepeatRect.Top() + nPixelStart,
++                        aRepeatRect.Top() + nPixelEnd );
++
++                nPosY = nNextY;
++                ++nRowPos;
++            }
+         }
+         if ( bHasMainRows )
+         {
+             long nPosY = 0;
+-            ScCompressedArrayIterator< SCROW, BYTE> aIter(
+-                    pDoc->GetRowFlagsArray( nTab), nMainRowStart,
+-                    nMainRowEnd);
+-            do
++            for (SCROW nRow = nMainRowStart; nRow <= nMainRowEnd; ++nRow)
+             {
+-                if ((*aIter & CR_HIDDEN) == 0)
+-                {
+-                    SCROW nRangeEnd = aIter.GetRangeEnd();
+-                    for (SCROW nRow=aIter.GetRangeStart(); nRow<=nRangeEnd; ++nRow)
+-                    {
+-                        USHORT nDocH = pDoc->FastGetOriginalRowHeight( nRow, nTab );
+-                        long nNextY = nPosY + (long) (nDocH * nScaleY);
+-
+-                        long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height();
+-                        long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1;
+-                        pRowInfo[nRowPos].Set( FALSE, nRow,
+-                                aMainRect.Top() + nPixelStart,
+-                                aMainRect.Top() + nPixelEnd );
+-
+-                        nPosY = nNextY;
+-                        ++nRowPos;
+-                    }
+-                }
+-            } while (aIter.NextRange());
++                if (pDoc->RowHidden(nRow, nTab))
++                    continue;
++
++                USHORT nDocH = pDoc->FastGetOriginalRowHeight( nRow, nTab );
++                long nNextY = nPosY + (long) (nDocH * nScaleY);
++
++                long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height();
++                long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1;
++                pRowInfo[nRowPos].Set( FALSE, nRow,
++                        aMainRect.Top() + nPixelStart,
++                        aMainRect.Top() + nPixelEnd );
++
++                nPosY = nNextY;
++                ++nRowPos;
++            }
+         }
+         rInfo.SetRowInfo( nRowCount, pRowInfo );
+     }
+diff --git sc/source/ui/view/printfun.cxx sc/source/ui/view/printfun.cxx
+index 7c9e431..982c02e 100644
+--- sc/source/ui/view/printfun.cxx
++++ sc/source/ui/view/printfun.cxx
+@@ -3073,9 +3073,10 @@ void ScPrintFunc::CalcPages()				// berechnet aPageRect und Seiten aus nZoom
+     nTotalY = 0;
+ 
+     BOOL bVisCol = FALSE;
++	SCCOL nLastCol = -1;
+     for (SCCOL i=nStartCol; i<=nEndCol; i++)
+     {
+-        BYTE nFlags = pDoc->GetColFlags(i,nPrintTab);
++		bool bHidden = pDoc->ColHidden(i, nPrintTab, nLastCol);
+         bool bPageBreak = (pDoc->HasColBreak(i, nPrintTab) & BREAK_PAGE);
+         if ( i>nStartCol && bVisCol && bPageBreak )
+         {
+@@ -3083,7 +3084,7 @@ void ScPrintFunc::CalcPages()				// berechnet aPageRect und Seiten aus nZoom
+             ++nPagesX;
+             bVisCol = FALSE;
+         }
+-        if (!(nFlags & CR_HIDDEN))
++		if (!bHidden)
+             bVisCol = TRUE;
+     }
+     if (bVisCol)	// auch am Ende keine leeren Seiten
+@@ -3094,38 +3095,35 @@ void ScPrintFunc::CalcPages()				// berechnet aPageRect und Seiten aus nZoom
+ 
+     BOOL bVisRow = FALSE;
+     SCROW nPageStartRow = nStartRow;
+-    ScCompressedArrayIterator< SCROW, BYTE> aIter( pDoc->GetRowFlagsArray(
+-                nPrintTab), nStartRow, nEndRow);
+-    do
+-    {
+-        BYTE nFlags = *aIter;
+-        SCROW nRangeEnd = aIter.GetRangeEnd();
+-        for (SCROW j=aIter.GetRangeStart(); j<=nRangeEnd; ++j)
+-        {
+-            bool bPageBreak = (pDoc->HasRowBreak(j, nPrintTab) & BREAK_PAGE);
+-            if ( j>nStartRow && bVisRow && bPageBreak )
+-            {
+-                pPageEndY[nTotalY] = j-1;
+-                ++nTotalY;
+-
+-                if ( !aTableParam.bSkipEmpty ||
+-                        !pDoc->IsPrintEmpty( nPrintTab, nStartCol, nPageStartRow, nEndCol, j-1 ) )
+-                {
+-                    pPageRows[nPagesY].SetStartRow( nPageStartRow );
+-                    pPageRows[nPagesY].SetEndRow( j-1 );
+-                    pPageRows[nPagesY].SetPagesX( nPagesX );
+-                    if (aTableParam.bSkipEmpty)
+-                        lcl_SetHidden( pDoc, nPrintTab, pPageRows[nPagesY], nStartCol, pPageEndX );
+-                    ++nPagesY;
+-                }
+-
+-                nPageStartRow = j;
+-                bVisRow = FALSE;
+-            }
+-            if (!(nFlags & CR_HIDDEN))
+-                bVisRow = TRUE;
+-        }
+-    } while (aIter.NextRange());
++	for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
++	{
++		bool bPageBreak = (pDoc->HasRowBreak(nRow, nPrintTab) & BREAK_PAGE);
++		if (nRow > nStartRow && bVisRow && bPageBreak )
++		{
++			pPageEndY[nTotalY] = nRow-1;
++			++nTotalY;
++
++			if ( !aTableParam.bSkipEmpty ||
++					!pDoc->IsPrintEmpty( nPrintTab, nStartCol, nPageStartRow, nEndCol, nRow-1 ) )
++			{
++				pPageRows[nPagesY].SetStartRow( nPageStartRow );
++				pPageRows[nPagesY].SetEndRow( nRow-1 );
++				pPageRows[nPagesY].SetPagesX( nPagesX );
++				if (aTableParam.bSkipEmpty)
++					lcl_SetHidden( pDoc, nPrintTab, pPageRows[nPagesY], nStartCol, pPageEndX );
++				++nPagesY;
++			}
++
++			nPageStartRow = nRow;
++			bVisRow = FALSE;
++		}
++		SCROW nLastRow = -1;
++		if (!pDoc->RowHidden(nRow, nPrintTab, nLastRow))
++			bVisRow = TRUE;
++		else
++			// skip all hidden rows.
++			nRow = nLastRow;
++	}
+ 
+     if (bVisRow)
+     {
+diff --git sc/source/ui/view/select.cxx sc/source/ui/view/select.cxx
+index 8ab9801..4ac0b68 100644
+--- sc/source/ui/view/select.cxx
++++ sc/source/ui/view/select.cxx
+@@ -278,12 +278,12 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO
+         ScDocument* pDoc = pViewData->GetDocument();
+         SCTAB nTab = pViewData->GetTabNo();
+         if ( bLeft && !bRightScroll )
+-            do --nPosX; while ( nPosX>=0 && ( pDoc->GetColFlags( nPosX, nTab ) & CR_HIDDEN ) );
++			do --nPosX; while ( nPosX>=0 && pDoc->ColHidden( nPosX, nTab ) );
+         if ( bTop && !bBottomScroll )
+         {
+             if (--nPosY >= 0)
+             {
+-                pDoc->GetRowFlagsArray( nTab).GetLastForCondition( 0, nPosY, CR_HIDDEN, 0);
++                nPosY = pDoc->LastVisibleRow(0, nPosY, nTab);
+                 if (!ValidRow(nPosY))
+                     nPosY = -1;
+             }
+@@ -479,7 +479,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
+             {
+                 //	#94321# in SetCursorAtPoint hidden columns are skipped.
+                 //	They must be skipped here too, or the result will always be the first hidden column.
+-                do ++nPosX; while ( nPosX<nStartX && ( pDoc->GetColFlags( nPosX, nTab ) & CR_HIDDEN ) );
++				do ++nPosX; while ( nPosX<nStartX && pDoc->ColHidden(nPosX, nTab) );
+                 for (SCCOL i=nPosX; i<nStartX; i++)
+                     nSizeX += pDoc->GetColWidth( i, nTab );
+             }
+@@ -494,8 +494,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
+                 //	They must be skipped here too, or the result will always be the first hidden row.
+                 if (++nPosY < nStartY)
+                 {
+-                    nPosY = pDoc->GetRowFlagsArray( nTab).GetFirstForCondition(
+-                            nPosY, nStartY-1, CR_HIDDEN, 0);
++                    nPosY = pDoc->FirstVisibleRow(nPosY, nStartY-1, nTab);
+                     if (!ValidRow(nPosY))
+                         nPosY = nStartY;
+                 }
+diff --git sc/source/ui/view/tabview.cxx sc/source/ui/view/tabview.cxx
+index f39dd17..eb6908b 100644
+--- sc/source/ui/view/tabview.cxx
++++ sc/source/ui/view/tabview.cxx
+@@ -1441,7 +1441,7 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars )
+     SCsCOL nDir = ( nDeltaX > 0 ) ? 1 : -1;
+     ScDocument* pDoc = aViewData.GetDocument();
+     SCTAB nTab = aViewData.GetTabNo();
+-    while ( ( pDoc->GetColFlags( nNewX, nTab ) & CR_HIDDEN ) &&
++    while ( pDoc->ColHidden(nNewX, nTab) &&
+             nNewX+nDir >= 0 && nNewX+nDir <= MAXCOL )
+         nNewX = sal::static_int_cast<SCsCOL>( nNewX + nDir );
+ 
+@@ -1530,7 +1530,7 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars )
+     SCsROW nDir = ( nDeltaY > 0 ) ? 1 : -1;
+     ScDocument* pDoc = aViewData.GetDocument();
+     SCTAB nTab = aViewData.GetTabNo();
+-    while ( ( pDoc->GetRowFlags( nNewY, nTab ) & CR_HIDDEN ) &&
++    while ( pDoc->RowHidden(nNewY, nTab) &&
+             nNewY+nDir >= 0 && nNewY+nDir <= MAXROW )
+         nNewY += nDir;
+ 
+diff --git sc/source/ui/view/tabview2.cxx sc/source/ui/view/tabview2.cxx
+index 687f936..02a2710 100644
+--- sc/source/ui/view/tabview2.cxx
++++ sc/source/ui/view/tabview2.cxx
+@@ -928,13 +928,13 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
+     }
+ 
+     long nBlockY = 0;
+-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
+-            pDoc->GetRowFlagsArray( nTab), 0, nFixPosY-1, CR_HIDDEN, 0,
+-            pDoc->GetRowHeightArray( nTab));
+-    for ( ; aIter; ++aIter)
++    for (SCROW nRow = 0; nRow <= nFixPosY-1; ++nRow)
+     {
++        if (pDoc->RowHidden(nRow, nTab))
++            continue;
++
+         //	for frozen panes, add both parts
+-        USHORT nRowTwips = *aIter;
++        USHORT nRowTwips = pDoc->GetRowHeight(nRow, nTab);
+         if (nRowTwips)
+         {
+             nBlockY += (long)(nRowTwips * fScaleY);
+@@ -942,10 +942,9 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
+                 return FALSE;
+         }
+     }
+-    aIter.NewLimits( nStartRow, nEndRow);
+-    for ( ; aIter; ++aIter)
++    for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
+     {
+-        USHORT nRowTwips = *aIter;
++        USHORT nRowTwips = pDoc->GetRowHeight(nRow, nTab);
+         if (nRowTwips)
+         {
+             nBlockY += (long)(nRowTwips * fScaleY);
+diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
+index 5493de4..5317d0a 100644
+--- sc/source/ui/view/tabview3.cxx
++++ sc/source/ui/view/tabview3.cxx
+@@ -993,8 +993,8 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+         BOOL bHFlip = FALSE;
+         do
+         {
+-            BYTE nColFlags = pDoc->GetColFlags( nCurX, nTab );
+-            bSkipCell = (nColFlags & CR_HIDDEN) || pDoc->IsHorOverlapped( nCurX, nCurY, nTab );
++			SCCOL nLastCol = -1;
++            bSkipCell = pDoc->ColHidden(nCurX, nTab, nLastCol) || pDoc->IsHorOverlapped( nCurX, nCurY, nTab );
+             if (bSkipProtected && !bSkipCell)
+                 bSkipCell = pDoc->HasAttrib(nCurX, nCurY, nTab, nCurX, nCurY, nTab, HASATTR_PROTECTED);
+             if (bSkipUnprotected && !bSkipCell)
+@@ -1035,8 +1035,8 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+         BOOL bVFlip = FALSE;
+         do
+         {
+-            BYTE nRowFlags = pDoc->GetRowFlags( nCurY, nTab );
+-            bSkipCell = (nRowFlags & CR_HIDDEN) || pDoc->IsVerOverlapped( nCurX, nCurY, nTab );
++			SCROW nLastRow = -1;
++            bSkipCell = pDoc->RowHidden(nCurY, nTab, nLastRow) || pDoc->IsVerOverlapped( nCurX, nCurY, nTab );
+             if (bSkipProtected && !bSkipCell)
+                 bSkipCell = pDoc->HasAttrib(nCurX, nCurY, nTab, nCurX, nCurY, nTab, HASATTR_PROTECTED);
+             if (bSkipUnprotected && !bSkipCell)
+@@ -2058,17 +2058,18 @@ void ScTabView::PaintRangeFinder( long nNumber )
+                             BOOL bHiddenEdge = FALSE;
+                             SCROW nTmp;
+                             ScDocument* pDoc = aViewData.GetDocument();
+-                            while ( nCol1 > 0 && ( pDoc->GetColFlags( nCol1, nTab ) & CR_HIDDEN ) )
++							SCCOL nLastCol = -1;
++							while ( nCol1 > 0 && pDoc->ColHidden(nCol1, nTab, nLastCol) )
+                             {
+                                 --nCol1;
+                                 bHiddenEdge = TRUE;
+                             }
+-                            while ( nCol2 < MAXCOL && ( pDoc->GetColFlags( nCol2, nTab ) & CR_HIDDEN ) )
++							while ( nCol2 < MAXCOL && pDoc->ColHidden(nCol2, nTab, nLastCol) )
+                             {
+                                 ++nCol2;
+                                 bHiddenEdge = TRUE;
+                             }
+-                            nTmp = pDoc->GetRowFlagsArray( nTab).GetLastForCondition( 0, nRow1, CR_HIDDEN, 0);
++                            nTmp = pDoc->LastVisibleRow(0, nRow1, nTab);
+                             if (!ValidRow(nTmp))
+                                 nTmp = 0;
+                             if (nTmp < nRow1)
+@@ -2076,7 +2077,7 @@ void ScTabView::PaintRangeFinder( long nNumber )
+                                 nRow1 = nTmp;
+                                 bHiddenEdge = TRUE;
+                             }
+-                            nTmp = pDoc->GetRowFlagsArray( nTab).GetFirstForCondition( nRow2, MAXROW, CR_HIDDEN, 0);
++                            nTmp = pDoc->FirstVisibleRow(nRow2, MAXROW, nTab);
+                             if (!ValidRow(nTmp))
+                                 nTmp = MAXROW;
+                             if (nTmp > nRow2)
+diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
+index 344f5b6..2ca5d83 100644
+--- sc/source/ui/view/viewdata.cxx
++++ sc/source/ui/view/viewdata.cxx
+@@ -1560,7 +1560,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
+                 else if ( nY < MAXROW )
+                 {
+                     // skip multiple hidden rows (forward only for now)
+-                    SCROW nNext = pDoc->FastGetFirstNonHiddenRow( nY + 1, nTabNo );
++                    SCROW nNext = pDoc->FirstVisibleRow(nY + 1, MAXROW, nTabNo);
+                     if ( nNext > MAXROW )
+                         nY = MAXROW;
+                     else
+@@ -1672,7 +1672,7 @@ SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHO
+             else if ( nDir == 1 && nRowNo < MAXROW )
+             {
+                 // skip multiple hidden rows (forward only for now)
+-                SCROW nNext = pDoc->FastGetFirstNonHiddenRow( nRowNo + 1, nTabNo );
++                SCROW nNext = pDoc->FirstVisibleRow(nRowNo + 1, MAXROW, nTabNo);
+                 if ( nNext > MAXROW )
+                 {
+                     // same behavior as without the optimization: set bOut with nY=MAXROW+1
+@@ -1735,11 +1735,19 @@ BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& r
+         for (SCCOL i=0; i<nCountX; i++)
+             nOutWidth += ToPixel( pDoc->GetColWidth(nX+i,nTabNo), nPPTX );
+         SCROW nCountY = pMerge->GetRowMerge();
+-        ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
+-                pDoc->GetRowFlagsArray( nTabNo), nY, nY+nCountY-1, CR_HIDDEN,
+-                0, pDoc->GetRowHeightArray( nTabNo));
+-        for ( ; aIter; ++aIter )
+-            nOutHeight += ToPixel( *aIter, nPPTY );
++
++        for (SCROW nRow = nY; nRow <= nY+nCountY-1; ++nRow)
++        {
++            SCROW nLastRow = nRow;
++            if (pDoc->RowHidden(nRow, nTabNo, NULL, &nLastRow))
++            {    
++                nRow = nLastRow;
++                continue;
++            }
++
++            USHORT nHeight = pDoc->GetRowHeight(nRow, nTabNo);
++            nOutHeight += ToPixel(nHeight, nPPTY);
++        }
+ 
+         rSizeXPix = nOutWidth;
+         rSizeYPix = nOutHeight;
+diff --git sc/source/ui/view/viewfun3.cxx sc/source/ui/view/viewfun3.cxx
+index d0d565a..af68b6b 100644
+--- sc/source/ui/view/viewfun3.cxx
++++ sc/source/ui/view/viewfun3.cxx
+@@ -1727,10 +1727,10 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
+         BOOL bIncludeFiltered = bCut;
+         if ( !bIncludeFiltered )
+         {
+-            //	manually find number of non-filtered rows
+-            SCROW nPastedCount = pDocSh->GetDocument()->GetRowFlagsArray(
+-                    rSource.aStart.Tab()).CountForCondition(
+-                    rSource.aStart.Row(), rSource.aEnd.Row(), CR_FILTERED, 0);
++			// find number of non-filtered rows
++            SCROW nPastedCount = pDocSh->GetDocument()->CountNonFilteredRows(
++                rSource.aStart.Row(), rSource.aEnd.Row(), rSource.aStart.Tab());
++
+             if ( nPastedCount == 0 )
+                 nPastedCount = 1;
+             aDestEnd.SetRow( rDestPos.Row() + nPastedCount - 1 );
+diff --git sc/source/ui/view/viewfunc.cxx sc/source/ui/view/viewfunc.cxx
+index 61670e7..96132fc 100644
+--- sc/source/ui/view/viewfunc.cxx
++++ sc/source/ui/view/viewfunc.cxx
+@@ -2215,28 +2215,19 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
+                         {
+                             //	fuer alle eingeblendeten CR_MANUALSIZE loeschen,
+                             //	dann SetOptimalHeight mit bShrink = FALSE
+-                            ScCompressedArrayIterator< SCROW, BYTE> aIter(
+-                                    pDoc->GetRowFlagsArray( nTab), nStartNo,
+-                                    nEndNo);
+-                            do
++                            for (SCROW nRow = nStartNo; nRow <= nEndNo; ++nRow)
+                             {
+-                                BYTE nOld = *aIter;
+-                                if ( (nOld & CR_HIDDEN) == 0 && ( nOld & CR_MANUALSIZE ) )
++                                SCROW nLastRow = nRow;
++                                if (pDoc->RowHidden(nRow, nTab, NULL, &nLastRow))
+                                 {
+-                                    SCROW nRangeEnd = aIter.GetRangeEnd();
+-                                    pDoc->SetRowFlags( aIter.GetRangeStart(),
+-                                            nRangeEnd, nTab,
+-                                            nOld & ~CR_MANUALSIZE);
+-                                    aIter.Resync( nRangeEnd);
+-                                    // Range may be extended due to merges and
+-                                    // now aIter.GetRangeEnd() may point behind
+-                                    // the previous row, but all flags of this
+-                                    // range have the CR_MANUALSIZE bit
+-                                    // removed, so it is safe to continue with
+-                                    // the next range, not necessary to catch
+-                                    // up with the remaining rows.
++                                    nRow = nLastRow;
++                                    continue;
+                                 }
+-                            } while (aIter.NextRange());
++
++                                BYTE nOld = pDoc->GetRowFlags(nRow, nTab);
++                                if (nOld & CR_MANUALSIZE)
++                                    pDoc->SetRowFlags(nRow, nTab, nOld & ~CR_MANUALSIZE);
++                            }
+                         }
+ 
+                         double nPPTX = GetViewData()->GetPPTX();
+@@ -2278,8 +2269,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
+                 {
+                     for (SCCOL nCol=static_cast<SCCOL>(nStartNo); nCol<=static_cast<SCCOL>(nEndNo); nCol++)
+                     {
+-                        if ( eMode != SC_SIZE_VISOPT ||
+-                             (pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN) == 0 )
++						if ( eMode != SC_SIZE_VISOPT || !pDoc->ColHidden(nCol, nTab) )
+                         {
+                             USHORT nThisSize = nSizeTwips;
+ 
+diff --git sc/source/ui/view/viewutil.cxx sc/source/ui/view/viewutil.cxx
+index 964695c..4215562 100644
+--- sc/source/ui/view/viewutil.cxx
++++ sc/source/ui/view/viewutil.cxx
+@@ -264,20 +264,19 @@ void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc )
+     for (SCTAB nTab=0; nTab<nTabCount; nTab++)
+         if ( rMark.GetTableSelect(nTab ) )
+         {
+-            ScCompressedArrayIterator<SCROW, BYTE> aIter(pDoc->GetRowFlagsArray(nTab), nStartRow, nEndRow);
+-            do
++            for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
+             {
+-                if (*aIter & CR_FILTERED)
++                SCROW nLastRow = nRow;
++                if (pDoc->RowFiltered(nRow, nTab, NULL, &nLastRow))
+                 {
+                     // use nStartCol/nEndCol, so the multi mark area isn't extended to all columns
+                     // (visible in repaint for indentation)
+-
+-                    rMark.SetMultiMarkArea( ScRange( nStartCol, aIter.GetRangeStart(), nTab,
+-                                                     nEndCol, aIter.GetRangeEnd(), nTab ), FALSE );
++                    rMark.SetMultiMarkArea(
++                        ScRange(nStartCol, nRow, nTab, nEndCol, nLastRow, nTab), false);
+                     bChanged = true;
++                    nRow = nLastRow;
+                 }
+             }
+-            while (aIter.NextRange());
+         }
+ 
+     if ( bChanged && !rMark.HasAnyMultiMarks() )
+@@ -288,13 +287,19 @@ void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc )
+ 
+ 
+ // static
+-bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, const ScDocument * pDoc, size_t nRows )
++bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, ScDocument * pDoc, size_t nRows )
+ {
+     SCTAB nTab = rRange.aStart.Tab();
+     bool bOneTabOnly = (nTab == rRange.aEnd.Tab());
+     // Always fit the range on its first sheet.
+     DBG_ASSERT( bOneTabOnly, "ScViewUtil::ExtendToUnfilteredRows: works only on one sheet");
+     SCROW nStartRow = rRange.aStart.Row();
++#if 1
++    SCROW nLastRow = pDoc->LastNonFilteredRow(nStartRow, MAXROW, nTab);
++    if (ValidRow(nLastRow))
++        rRange.aEnd.SetRow(nLastRow);
++    SCROW nCount = pDoc->CountNonFilteredRows(nStartRow, MAXROW, nTab);
++#else
+     // FillArrayForCondition() usually is the fastest to determine such a set
+     // in one pass, even if the array isn't used but the last element.
+     SCROW* pArr = new SCROW[nRows];
+@@ -303,19 +308,19 @@ bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, const ScDocument * pDoc,
+     if (nCount)
+         rRange.aEnd.SetRow( pArr[nCount-1]);
+     delete [] pArr;
++#endif
+     return nCount == nRows && bOneTabOnly;
+ }
+ 
+ 
+ // static
+-bool ScViewUtil::HasFiltered( const ScRange& rRange, const ScDocument* pDoc )
++bool ScViewUtil::HasFiltered( const ScRange& rRange, ScDocument* pDoc )
+ {
+     SCROW nStartRow = rRange.aStart.Row();
+     SCROW nEndRow = rRange.aEnd.Row();
+     for (SCTAB nTab=rRange.aStart.Tab(); nTab<=rRange.aEnd.Tab(); nTab++)
+     {
+-        if ( pDoc->GetRowFlagsArray( nTab).HasCondition( nStartRow, nEndRow,
+-                CR_FILTERED, CR_FILTERED ) )
++        if (pDoc->HasFilteredRows(nStartRow, nEndRow, nTab))
+             return true;
+     }
+ 
diff --git a/applied_patches/0689-calc-ods-export-no-more-ushort.diff b/applied_patches/0190-calc-ods-export-no-more-ushort.diff
similarity index 100%
rename from applied_patches/0689-calc-ods-export-no-more-ushort.diff
rename to applied_patches/0190-calc-ods-export-no-more-ushort.diff
diff --git a/applied_patches/0690-calc-perf-sort.diff b/applied_patches/0191-calc-perf-sort.diff
similarity index 100%
rename from applied_patches/0690-calc-perf-sort.diff
rename to applied_patches/0191-calc-perf-sort.diff
diff --git a/applied_patches/0192-calc-perf-lazy-overlay-objects.diff b/applied_patches/0192-calc-perf-lazy-overlay-objects.diff
new file mode 100644
index 000000000..dca94549b
--- /dev/null
+++ b/applied_patches/0192-calc-perf-lazy-overlay-objects.diff
@@ -0,0 +1,187 @@
+diff --git sc/source/ui/inc/gridwin.hxx sc/source/ui/inc/gridwin.hxx
+index aae0353..7b9bac5 100644
+--- sc/source/ui/inc/gridwin.hxx
++++ sc/source/ui/inc/gridwin.hxx
+@@ -42,6 +42,7 @@
+ 
+ #include <vector>
+ #include <memory>
++#include <boost/shared_ptr.hpp>
+ 
+ // ---------------------------------------------------------------------------
+ 
+@@ -115,6 +116,25 @@ private:
+     ::sdr::overlay::OverlayObjectList*              mpOOHeader;
+     ::sdr::overlay::OverlayObjectList*              mpOOShrink;
+ 
++    ::boost::shared_ptr<Rectangle> mpAutoFillRect;
++
++    /** 
++     * Stores current visible column and row ranges, used to avoid expensive 
++     * operations on objects that are outside visible area. 
++     */
++    struct VisibleRange
++    {
++        SCCOL mnCol1;
++        SCCOL mnCol2;
++        SCROW mnRow1;
++        SCROW mnRow2;
++
++        VisibleRange();
++
++        bool isInside(SCCOL nCol, SCROW nRow) const;
++    };
++    VisibleRange maVisibleRange;
++
+ private:
+     ScViewData*				pViewData;
+     ScSplitPos				eWhich;
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index e591f86..9754ccd 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -159,7 +159,19 @@ extern USHORT nScFillModeMouseModifier;				// global.cxx
+ 
+ #define SC_FILTERLISTBOX_LINES	12
+ 
+-//==================================================================
++// ============================================================================
++
++ScGridWindow::VisibleRange::VisibleRange() :
++    mnCol1(0), mnCol2(MAXCOL), mnRow1(0), mnRow2(MAXROW)
++{
++}
++
++bool ScGridWindow::VisibleRange::isInside(SCCOL nCol, SCROW nRow) const
++{
++    return mnCol1 <= nCol && nCol <= mnCol2 && mnRow1 <= nRow && nRow <= mnRow2;
++}
++
++// ============================================================================
+ 
+ class ScFilterListBox : public ListBox
+ {
+@@ -372,6 +384,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic
+             mpOODragRect( NULL ),
+             mpOOHeader( NULL ),
+             mpOOShrink( NULL ),
++            mpAutoFillRect(static_cast<Rectangle*>(NULL)),
+             pViewData( pData ),
+             eWhich( eWhichPos ),
+             pNoteMarker( NULL ),
+@@ -1352,30 +1365,17 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction )
+         ScRange aMarkRange;
+         if (pViewData->GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE)
+         {
+-            if ( aMarkRange.aStart.Tab() == pViewData->GetTabNo() )
++            if (aMarkRange.aStart.Tab() == pViewData->GetTabNo() && mpAutoFillRect)
+             {
+-                //	Block-Ende wie in DrawAutoFillMark
+-                SCCOL nX = aMarkRange.aEnd.Col();
+-                SCROW nY = aMarkRange.aEnd.Row();
+-
+-                Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
+-                long nSizeXPix;
+-                long nSizeYPix;
+-                pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix );
+-                aFillPos.X() += nSizeXPix * nLayoutSign;
+-                aFillPos.Y() += nSizeYPix;
+-                if ( bLayoutRTL )
+-                    aFillPos.X() -= 1;
+-
+                 Point aMousePos = rMEvt.GetPosPixel();
+-                //	Abfrage hier passend zu DrawAutoFillMark
+-                //	(ein Pixel mehr als markiert)
+-                if ( aMousePos.X() >= aFillPos.X()-3 && aMousePos.X() <= aFillPos.X()+4 &&
+-                     aMousePos.Y() >= aFillPos.Y()-3 && aMousePos.Y() <= aFillPos.Y()+4 )
++                if (mpAutoFillRect->IsInside(aMousePos))
+                 {
+-                    SetPointer( Pointer( POINTER_CROSS ) );		//! dickeres Kreuz ?
++                    SetPointer( Pointer( POINTER_CROSS ) );     //! dickeres Kreuz ?
+                     if (bAction)
+                     {
++                        SCCOL nX = aMarkRange.aEnd.Col();
++                        SCROW nY = aMarkRange.aEnd.Row();
++
+                         if ( lcl_IsEditableMatrix( pViewData->GetDocument(), aMarkRange ) )
+                             pViewData->SetDragMode(
+                                 aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), nX, nY, SC_FILL_MATRIX );
+@@ -5189,6 +5189,9 @@ void ScGridWindow::UpdateCursorOverlay()
+     SCCOL nX = pViewData->GetCurX();
+     SCROW nY = pViewData->GetCurY();
+ 
++    if (!maVisibleRange.isInside(nX, nY))
++        return;
++
+     //  don't show the cursor in overlapped cells
+ 
+     ScDocument* pDoc = pViewData->GetDocument();
+@@ -5359,6 +5362,7 @@ void ScGridWindow::UpdateSelectionOverlay()
+ void ScGridWindow::DeleteAutoFillOverlay()
+ {
+     DELETEZ( mpOOAutoFill );
++    mpAutoFillRect.reset();
+ }
+ 
+ void ScGridWindow::UpdateAutoFillOverlay()
+@@ -5379,6 +5383,11 @@ void ScGridWindow::UpdateAutoFillOverlay()
+     {
+         SCCOL nX = aAutoMarkPos.Col();
+         SCROW nY = aAutoMarkPos.Row();
++
++        if (!maVisibleRange.isInside(nX, nY))
++            // Autofill mark is not visible.  Bail out.
++            return;
++
+         SCTAB nTab = pViewData->GetTabNo();
+         ScDocument* pDoc = pViewData->GetDocument();
+         BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+@@ -5394,7 +5403,7 @@ void ScGridWindow::UpdateAutoFillOverlay()
+ 
+         aFillPos.Y() += nSizeYPix;
+         aFillPos.Y() -= 2;
+-        Rectangle aFillRect( aFillPos, Size(6,6) );
++        mpAutoFillRect.reset(new Rectangle(aFillPos, Size(6, 6)));
+     
+         // #i70788# get the OverlayManager safely
+         ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager();
+@@ -5407,7 +5416,7 @@ void ScGridWindow::UpdateAutoFillOverlay()
+                 aHandleColor = SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor;
+             std::vector< basegfx::B2DRange > aRanges;
+             const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
+-            basegfx::B2DRange aRB(aFillRect.Left(), aFillRect.Top(), aFillRect.Right() + 1, aFillRect.Bottom() + 1);
++            basegfx::B2DRange aRB(mpAutoFillRect->Left(), mpAutoFillRect->Top(), mpAutoFillRect->Right() + 1, mpAutoFillRect->Bottom() + 1);
+             
+             aRB.transform(aTransform);
+             aRanges.push_back(aRB);
+@@ -5422,10 +5431,10 @@ void ScGridWindow::UpdateAutoFillOverlay()
+             mpOOAutoFill = new ::sdr::overlay::OverlayObjectList;
+             mpOOAutoFill->append(*pOverlay);
+         }
+-    }
+ 
+-    if ( aOldMode != aDrawMode )
+-        SetMapMode( aOldMode );
++        if ( aOldMode != aDrawMode )
++            SetMapMode( aOldMode );
++    }
+ }
+ 
+ void ScGridWindow::DeleteDragRectOverlay()
+diff --git sc/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx
+index 23edc22..8e456d2 100644
+--- sc/source/ui/view/gridwin4.cxx
++++ sc/source/ui/view/gridwin4.cxx
+@@ -451,6 +451,12 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
+     SCROW nYBottom = nPosY + pViewData->VisibleCellsY(eVWhich);
+     if (nYBottom > MAXROW) nYBottom = MAXROW;
+ 
++    // Store the current visible range.
++    maVisibleRange.mnCol1 = nPosX;
++    maVisibleRange.mnCol2 = nXRight;
++    maVisibleRange.mnRow1 = nPosY;
++    maVisibleRange.mnRow2 = nYBottom;
++
+     if (nX1 > nXRight || nY1 > nYBottom)
+         return;											// unsichtbar
+     if (nX2 > nXRight) nX2 = nXRight;
diff --git a/applied_patches/0193-calc-perf-copy-table-flags.diff b/applied_patches/0193-calc-perf-copy-table-flags.diff
new file mode 100644
index 000000000..40b728c7c
--- /dev/null
+++ b/applied_patches/0193-calc-perf-copy-table-flags.diff
@@ -0,0 +1,97 @@
+diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
+index 889510f..0857312 100644
+--- sc/source/core/data/table2.cxx
++++ sc/source/core/data/table2.cxx
+@@ -663,6 +663,8 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+             //	Charts muessen beim Ein-/Ausblenden angepasst werden
+             ScChartListenerCollection* pCharts = pDestTab->pDocument->GetChartListenerCollection();
+ 
++            bool bFlagChange = false;
++
+             BOOL bWidth  = (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth);
+             BOOL bHeight = (nCol1==0 && nCol2==MAXCOL && pRowHeight && pDestTab->pRowHeight);
+ 
+@@ -673,18 +675,18 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+                 if (bWidth)
+                     for (SCCOL i=nCol1; i<=nCol2; i++)
+                     {
+-                    bool bThisHidden = ColHidden(i);
+-                    bool bHiddenChange = (pDestTab->ColHidden(i) != bThisHidden);
++                        bool bThisHidden = ColHidden(i);
++                        bool bHiddenChange = (pDestTab->ColHidden(i) != bThisHidden);
+ 						bool bChange = bHiddenChange || (pDestTab->pColWidth[i] != pColWidth[i]);
+                         pDestTab->pColWidth[i] = pColWidth[i];
+                         pDestTab->pColFlags[i] = pColFlags[i];
+-                    pDestTab->SetColHidden(i, i, bThisHidden);
++                        pDestTab->SetColHidden(i, i, bThisHidden);
+                         //!	Aenderungen zusammenfassen?
+ 						if (bHiddenChange && pCharts) 
+                             pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab ));
+ 
+ 						if (bChange)
+-							pDestTab->InvalidatePageBreaks();
++                            bFlagChange = true;
+                     }
+ 
+                 if (bHeight)
+@@ -692,28 +694,45 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+ 					bool bChange = pDestTab->pRowHeight->SumValues(nRow1, nRow2) != pRowHeight->SumValues(nRow1, nRow2);
+ 
+ 					if (bChange)
+-						pDestTab->InvalidatePageBreaks();
++                        bFlagChange = true;
+ 
+                     pDestTab->pRowHeight->CopyFrom( *pRowHeight, nRow1, nRow2);
+-                    for (SCROW i=nRow1; i<=nRow2; i++)
+-                    {
+-                        // TODO: might need some performance improvement, block
+-                        // operations instead of single GetValue()/SetValue() calls.
+-                        BYTE nThisRowFlags = pRowFlags->GetValue(i);
+-                    bool bThisHidden = RowHidden(i);
+-                    bool bHiddenChange = (pDestTab->RowHidden(i) != bThisHidden);
+-                        pDestTab->pRowFlags->SetValue( i, nThisRowFlags );
+-                    pDestTab->SetRowHidden(i, i, bThisHidden);
+-                        //!	Aenderungen zusammenfassen?
+-						if (bHiddenChange && pCharts)
+-                            pCharts->SetRangeDirty(ScRange( 0, i, nTab, MAXCOL, i, nTab ));
++                    pDestTab->pRowFlags->CopyFrom(*pRowFlags, nRow1, nRow2);
+ 
+-						if (bHiddenChange)
+-							pDestTab->InvalidatePageBreaks();
++                    for (SCROW i = nRow1; i <= nRow2; ++i)
++                    {
++                        SCROW nThisLastRow, nDestLastRow;
++                        bool bThisHidden = RowHidden(i, nThisLastRow);
++                        bool bDestHidden = pDestTab->RowHidden(i, nDestLastRow);
++    
++                        // If the segment sizes differ, we take the shorter segment of the two.
++                        SCROW nLastRow = ::std::min(nThisLastRow, nDestLastRow);
++                        if (nLastRow >= nRow2)
++                            // the last row shouldn't exceed the upper bound the caller specified.
++                            nLastRow = nRow2;
++    
++                        pDestTab->SetRowHidden(i, nLastRow, bThisHidden);
++
++                        bool bThisHiddenChange = (bThisHidden != bDestHidden);
++                        if (bThisHiddenChange && pCharts)
++                        {
++                            // Hidden flags differ.
++                            pCharts->SetRangeDirty(ScRange(0, i, nTab, MAXCOL, nLastRow, nTab));
++                        }
++    
++                        if (bThisHiddenChange)
++                            bFlagChange = true;
++    
++                        // Jump to the last row of the identical flag segment.
++                        i = nLastRow;
+                     }
+                 }
+                 pDestTab->DecRecalcLevel();
+             }
++
++            if (bFlagChange)
++                pDestTab->InvalidatePageBreaks();
++
+             pDestTab->SetOutlineTable( pOutlineTable );		// auch nur wenn bColRowFlags
+         }
+     }
diff --git a/applied_patches/0691-calc-perf-rowheight-no-progress-bar.diff b/applied_patches/0194-calc-perf-rowheight-no-progress-bar.diff
similarity index 100%
rename from applied_patches/0691-calc-perf-rowheight-no-progress-bar.diff
rename to applied_patches/0194-calc-perf-rowheight-no-progress-bar.diff
diff --git a/applied_patches/0160-speed-local-link-except.diff b/applied_patches/0195-speed-local-link-except.diff
similarity index 100%
rename from applied_patches/0160-speed-local-link-except.diff
rename to applied_patches/0195-speed-local-link-except.diff
diff --git a/applied_patches/0161-speed-local-link-except-offuh.diff b/applied_patches/0196-speed-local-link-except-offuh.diff
similarity index 100%
rename from applied_patches/0161-speed-local-link-except-offuh.diff
rename to applied_patches/0196-speed-local-link-except-offuh.diff
diff --git a/applied_patches/0162-speed-local-link.diff b/applied_patches/0197-speed-local-link.diff
similarity index 100%
rename from applied_patches/0162-speed-local-link.diff
rename to applied_patches/0197-speed-local-link.diff
diff --git a/applied_patches/0163-fpicker-kde-gcc4-visibility.diff b/applied_patches/0198-fpicker-kde-gcc4-visibility.diff
similarity index 100%
rename from applied_patches/0163-fpicker-kde-gcc4-visibility.diff
rename to applied_patches/0198-fpicker-kde-gcc4-visibility.diff
diff --git a/applied_patches/0164-gui-sw-insert-symbol.diff b/applied_patches/0199-gui-sw-insert-symbol.diff
similarity index 100%
rename from applied_patches/0164-gui-sw-insert-symbol.diff
rename to applied_patches/0199-gui-sw-insert-symbol.diff
diff --git a/applied_patches/0165-addrbk-datasrc-ordering.diff b/applied_patches/0200-addrbk-datasrc-ordering.diff
similarity index 100%
rename from applied_patches/0165-addrbk-datasrc-ordering.diff
rename to applied_patches/0200-addrbk-datasrc-ordering.diff
diff --git a/applied_patches/0166-svtools-default-new-document.diff b/applied_patches/0201-svtools-default-new-document.diff
similarity index 100%
rename from applied_patches/0166-svtools-default-new-document.diff
rename to applied_patches/0201-svtools-default-new-document.diff
diff --git a/applied_patches/0167-context-autocomplete.diff b/applied_patches/0202-context-autocomplete.diff
similarity index 100%
rename from applied_patches/0167-context-autocomplete.diff
rename to applied_patches/0202-context-autocomplete.diff
diff --git a/applied_patches/0168-svtools-unsort-template-dialogentries.diff b/applied_patches/0203-svtools-unsort-template-dialogentries.diff
similarity index 100%
rename from applied_patches/0168-svtools-unsort-template-dialogentries.diff
rename to applied_patches/0203-svtools-unsort-template-dialogentries.diff
diff --git a/applied_patches/0169-desktop-cmdhelp-stdout.diff b/applied_patches/0204-desktop-cmdhelp-stdout.diff
similarity index 100%
rename from applied_patches/0169-desktop-cmdhelp-stdout.diff
rename to applied_patches/0204-desktop-cmdhelp-stdout.diff
diff --git a/applied_patches/0170-always-allow-save-document-sfx2.diff b/applied_patches/0205-always-allow-save-document-sfx2.diff
similarity index 100%
rename from applied_patches/0170-always-allow-save-document-sfx2.diff
rename to applied_patches/0205-always-allow-save-document-sfx2.diff
diff --git a/applied_patches/0171-always-allow-save-document-sc.diff b/applied_patches/0206-always-allow-save-document-sc.diff
similarity index 100%
rename from applied_patches/0171-always-allow-save-document-sc.diff
rename to applied_patches/0206-always-allow-save-document-sc.diff
diff --git a/applied_patches/0172-scroll-accel-sc.diff b/applied_patches/0207-scroll-accel-sc.diff
similarity index 100%
rename from applied_patches/0172-scroll-accel-sc.diff
rename to applied_patches/0207-scroll-accel-sc.diff
diff --git a/applied_patches/0173-scroll-accel-vcl.diff b/applied_patches/0208-scroll-accel-vcl.diff
similarity index 100%
rename from applied_patches/0173-scroll-accel-vcl.diff
rename to applied_patches/0208-scroll-accel-vcl.diff
diff --git a/applied_patches/0174-min-password-length-sfx2.diff b/applied_patches/0209-min-password-length-sfx2.diff
similarity index 100%
rename from applied_patches/0174-min-password-length-sfx2.diff
rename to applied_patches/0209-min-password-length-sfx2.diff
diff --git a/applied_patches/0175-document-password-change-sfx2.diff b/applied_patches/0210-document-password-change-sfx2.diff
similarity index 100%
rename from applied_patches/0175-document-password-change-sfx2.diff
rename to applied_patches/0210-document-password-change-sfx2.diff
diff --git a/applied_patches/0176-sfx2-remove-check-update-on-fileload.diff b/applied_patches/0211-sfx2-remove-check-update-on-fileload.diff
similarity index 100%
rename from applied_patches/0176-sfx2-remove-check-update-on-fileload.diff
rename to applied_patches/0211-sfx2-remove-check-update-on-fileload.diff
diff --git a/applied_patches/0177-desktop-disable-startup-registration.diff b/applied_patches/0212-desktop-disable-startup-registration.diff
similarity index 100%
rename from applied_patches/0177-desktop-disable-startup-registration.diff
rename to applied_patches/0212-desktop-disable-startup-registration.diff
diff --git a/applied_patches/0178-go-oo-team.diff b/applied_patches/0213-go-oo-team.diff
similarity index 100%
rename from applied_patches/0178-go-oo-team.diff
rename to applied_patches/0213-go-oo-team.diff
diff --git a/applied_patches/0179-corporate-dictionary.diff b/applied_patches/0214-corporate-dictionary.diff
similarity index 100%
rename from applied_patches/0179-corporate-dictionary.diff
rename to applied_patches/0214-corporate-dictionary.diff
diff --git a/applied_patches/0214-session-management.diff b/applied_patches/0214-session-management.diff
deleted file mode 100644
index 63ab35c30..000000000
--- a/applied_patches/0214-session-management.diff
+++ /dev/null
@@ -1,419 +0,0 @@
-diff -rup vcl/inc/salsession.hxx vcl/inc/salsession.hxx
---- vcl/inc/vcl/salsession.hxx	2005-09-09 13:22:55.000000000 +0200
-+++ vcl/inc/vcl/salsession.hxx	2006-02-20 17:10:26.000000000 +0100
-@@ -109,11 +109,9 @@ public:
-     // query the session manager for a user interaction slot
-     virtual void queryInteraction() = 0;
-     // signal the session manager that we're done with user interaction
--    virtual void interactionDone() = 0;
-+    virtual void interactionDone( bool bCancelShutdown ) = 0;
-     // signal that we're done saving
-     virtual void saveDone() = 0;
--    // try to cancel the sutdown in progress
--    virtual bool cancelShutdown() = 0;
- };
- 
- #endif
-diff -rup vcl/source/app/session.cxx vcl/source/app/session.cxx
---- vcl/source/app/session.cxx	2005-09-09 13:41:36.000000000 +0200
-+++ vcl/source/app/session.cxx	2006-02-20 17:10:19.000000000 +0100
-@@ -126,9 +126,8 @@ public:
-     virtual void SAL_CALL addSessionManagerListener( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException );
-     virtual void SAL_CALL removeSessionManagerListener( const Reference< XSessionManagerListener>& xListener ) throw( RuntimeException );
-     virtual void SAL_CALL queryInteraction( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException );
--    virtual void SAL_CALL interactionDone( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException );
-+    virtual void SAL_CALL interactionDone( const Reference< XSessionManagerListener >& xListener, sal_Bool bCancelShutdown ) throw( RuntimeException );
-     virtual void SAL_CALL saveDone( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException );
--    virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException );
- };
- 
- VCLSession* VCLSession::pOneInstance = NULL;
-@@ -208,7 +207,7 @@ void VCLSession::callInteractionGranted(
-         if( aListeners.empty() )
-         {
-             if( m_pSession )
--                m_pSession->interactionDone();
-+                m_pSession->interactionDone( false );
-             return;
-         }
-     }
-@@ -310,7 +309,7 @@ void SAL_CALL VCLSession::queryInteracti
-     }
- }
- 
--void SAL_CALL VCLSession::interactionDone( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException )
-+void SAL_CALL VCLSession::interactionDone( const Reference< XSessionManagerListener >& xListener, sal_Bool bCancelShutdown ) throw( RuntimeException )
- {
-     osl::MutexGuard aGuard( m_aMutex );
-     int nRequested = 0, nDone = 0;
-@@ -329,7 +328,7 @@ void SAL_CALL VCLSession::interactionDon
-     {
-         m_bInteractionDone = true;
-         if( m_pSession )
--            m_pSession->interactionDone();
-+            m_pSession->interactionDone( bCancelShutdown );
-     }
- }
- 
-@@ -354,11 +353,6 @@ void SAL_CALL VCLSession::saveDone( cons
-     }
- }
- 
--sal_Bool SAL_CALL VCLSession::cancelShutdown() throw( RuntimeException )
--{
--    return m_pSession ? (sal_Bool)m_pSession->cancelShutdown() : sal_False;
--}
--
- // service implementation
- 
- OUString SAL_CALL vcl_session_getImplementationName()
-diff -rup vcl/unx/inc/sm.hxx vcl/unx/inc/sm.hxx
---- vcl/unx/inc/sm.hxx	2006-03-14 12:28:47.000000000 +0100
-+++ vcl/unx/inc/sm.hxx	2006-02-20 17:37:18.000000000 +0100
-@@ -44,7 +44,8 @@ class SessionManagerClient
- {
- 	static SmcConn			aSmcConnection;
- 	static ByteString		aClientID;
--    static bool			bDocSaveDone;
-+    static bool			    bDocSaveDone;
-+	static bool             bSaveDoneSent;
- 
- 	static void SaveYourselfProc(		SmcConn connection,
- 										SmPointer client_data,
-@@ -73,8 +74,8 @@ public:
- 
-     static bool checkDocumentsSaved();
-     static bool queryInteraction();
--    static void saveDone();
--    static void interactionDone();
-+    static void saveDone( bool bSuccess = true );
-+    static void interactionDone( bool bCancelShutdown = false );
- 
- 	static String getExecName();
- 	static VCL_DLLPUBLIC const ByteString&  getSessionID();
-@@ -89,9 +90,8 @@ public:
-     virtual ~IceSalSession();
-     
-     virtual void queryInteraction();
--    virtual void interactionDone();
-+    virtual void interactionDone( bool bCancelShutdown );
-     virtual void saveDone();
--    virtual bool cancelShutdown();
- 
-     static void handleOldX11SaveYourself( SalFrame* pFrame );
- };
-Only in vcl/unx/inc: sm.hxx.~1.9.~
-diff -rup vcl/unx/source/app/sm.cxx vcl/unx/source/app/sm.cxx
---- vcl/unx/source/app/sm.cxx	2006-03-14 12:28:47.000000000 +0100
-+++ vcl/unx/source/app/sm.cxx	2006-02-20 17:44:23.000000000 +0100
-@@ -129,9 +129,9 @@ void IceSalSession::queryInteraction()
-     }
- }
- 
--void IceSalSession::interactionDone()
-+void IceSalSession::interactionDone( bool bCancelShutdown )
- {
--    SessionManagerClient::interactionDone();
-+    SessionManagerClient::interactionDone( bCancelShutdown );
- }
- 
- void IceSalSession::saveDone()
-@@ -144,11 +144,6 @@ void IceSalSession::saveDone()
-     }
- }
- 
--bool IceSalSession::cancelShutdown()
--{
--    return false;
--}
--
- void IceSalSession::handleOldX11SaveYourself( SalFrame* pFrame )
- {
-     // do this only once
-@@ -201,6 +196,7 @@ int					ICEConnectionObserver::nWakeupFi
- // HACK
- bool SessionManagerClient::bDocSaveDone = false;
- 
-+bool SessionManagerClient::bSaveDoneSent = false;
- 
- static SmProp*	pSmProps = NULL;
- static SmProp**	ppSmProps = NULL;
-@@ -269,12 +265,18 @@ bool SessionManagerClient::checkDocument
-     return bDocSaveDone;
- }
- 
-+struct SaveYourselfArgs {
-+	bool bShutdown;
-+	bool bFast;
-+	int nInteractionStyle;
-+} aSaveYourselfArg;
-+
- IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
- {
-     SMprintf( "posting save documents event shutdown = %s\n", (pThis!=0) ? "true" : "false" );
-     if( pOneInstance )
-     {
--        SalSessionSaveRequestEvent aEvent( pThis != 0, false );
-+        SalSessionSaveRequestEvent aEvent( aSaveYourselfArg.bShutdown, aSaveYourselfArg.nInteractionStyle == SmInteractStyleAny && !aSaveYourselfArg.bFast );
-         pOneInstance->CallCallback( &aEvent );        
-     }
-     else
-@@ -286,12 +288,13 @@ IMPL_STATIC_LINK( SessionManagerClient, 
- IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, InteractionHdl, void*, EMPTYARG )
- {
-     SMprintf( "interaction link\n" );
--    if( pOneInstance )
-+ 
-+	if( pOneInstance )
-     {
-         SalSessionInteractionEvent aEvent( true );
-         pOneInstance->CallCallback( &aEvent );
-     }
--    
-+
-     return 0;
- }
- 
-@@ -304,6 +307,9 @@ IMPL_STATIC_LINK( SessionManagerClient, 
-         pOneInstance->CallCallback( &aEvent );
-     }
-     
-+ 	if( !bSaveDoneSent )
-+ 		saveDone( false );
-+
-     return 0;
- }
- 
-@@ -317,7 +317,7 @@ void SessionManagerClient::SaveYourselfP
- 	int save_type,
- 	Bool shutdown,
- 	int interact_style,
--	Bool
-+	Bool fast
- 	)
- {
-     SMprintf( "Session: save yourself, save_type = %s, shutdown = %s, interact_style = %s, fast = %s\n",
-@@ -324,8 +330,9 @@ void SessionManagerClient::SaveYourselfP
-               interact_style == SmInteractStyleNone ? "SmInteractStyleNone" :
-               ( interact_style == SmInteractStyleErrors ? "SmInteractStyleErrors" :
-                 ( interact_style == SmInteractStyleAny ? "SmInteractStyleAny" : "<unknown>" ) ),
--              false ? "true" : "false"
-+              fast ? "true" : "false"
-               );
-+	bSaveDoneSent = false;
- 	BuildSmPropertyList();
- #ifdef USE_SM_EXTENSION
-     bDocSaveDone = false;
-@@ -340,7 +347,12 @@ void SessionManagerClient::SaveYourselfP
-         SessionManagerClient::saveDone();
-         return;
-     }
--    Application::PostUserEvent( STATIC_LINK( (void*)(shutdown ? 0xffffffff : 0x0), SessionManagerClient, SaveYourselfHdl ) );
-+
-+	aSaveYourselfArg.bShutdown = shutdown;
-+	aSaveYourselfArg.nInteractionStyle = interact_style;
-+	aSaveYourselfArg.bFast = fast;
-+	Application::PostUserEvent( STATIC_LINK( NULL, SessionManagerClient, SaveYourselfHdl ) );
-+
-     SMprintf( "waiting for save yourself event to be processed\n" );
- #endif
- }
-@@ -393,20 +405,21 @@ void SessionManagerClient::InteractProc(
-         Application::PostUserEvent( STATIC_LINK( NULL, SessionManagerClient, InteractionHdl ) );
- }
- 
--void SessionManagerClient::saveDone()
-+void SessionManagerClient::saveDone( bool bSuccess )
- {
-     if( aSmcConnection )
-     {
-         ICEConnectionObserver::lock();
--        SmcSetProperties( aSmcConnection, nSmProps, ppSmProps );
--        SmcSaveYourselfDone( aSmcConnection, True );
-+		if( bSuccess )
-+			SmcSetProperties( aSmcConnection, nSmProps, ppSmProps );
-+        SmcSaveYourselfDone( aSmcConnection, bSuccess );
-         SMprintf( "sent SaveYourselfDone\n" );
--        bDocSaveDone = true;
-+        bDocSaveDone = bSuccess;
-+		bSaveDoneSent = true;
-         ICEConnectionObserver::unlock();
-     }
- }
- 
--
- void SessionManagerClient::open()
- {
- 	static SmcCallbacks aCallbacks;
-@@ -505,12 +518,12 @@ bool SessionManagerClient::queryInteract
-     return bRet;
- }
- 
--void SessionManagerClient::interactionDone()
-+void SessionManagerClient::interactionDone( bool bCancelShutdown )
- {
-     if( aSmcConnection )
-     {
-         ICEConnectionObserver::lock();
--        SmcInteractDone( aSmcConnection, False );
-+        SmcInteractDone( aSmcConnection, bCancelShutdown );
-         ICEConnectionObserver::unlock();
-     }
- }
-diff -rup offapi/com/sun/star/frame/XSessionManagerClient.idl offapi/com/sun/star/frame/XSessionManagerClient.idl
---- offapi/com/sun/star/frame/XSessionManagerClient.idl	2005-09-08 03:25:36.000000000 +0200
-+++ offapi/com/sun/star/frame/XSessionManagerClient.idl	2006-02-20 17:09:58.000000000 +0100
-@@ -88,7 +88,7 @@ module com {  module sun {  module star 
- 
-         @see XSessionManagerListener
-         */
--        [oneway] void interactionDone( [in] XSessionManagerListener xListener );
-+        [oneway] void interactionDone( [in] XSessionManagerListener xListener, [in] boolean bCancelShutdown );
- 
-         /** saveDone signals that a listener has processed a save request
- 
-@@ -98,14 +98,6 @@ module com {  module sun {  module star 
-         @see XSessionManagerListener
-         */
-         [oneway] void saveDone( [in] XSessionManagerListener xListener );
--
--        /** Call cancelShutdown to try to cancel a desktop shutdown in progress
--
--        @returns
--        <TRUE/> if shutdown was canceled,
--        <FALSE/> else.
--        */
--        boolean cancelShutdown();
-     };
- 
- }; }; }; };
-diff -rup framework-m188/inc/services/sessionlistener.hxx framework/inc/services/sessionlistener.hxx
---- framework-m188/inc/services/sessionlistener.hxx	2006-10-31 13:13:27.000000000 +0100
-+++ framework/inc/services/sessionlistener.hxx	2006-10-31 18:14:09.000000000 +0100
-@@ -161,6 +161,10 @@ class SessionListener :   // interfaces
- 
-         css::uno::Reference< css::frame::XSessionManagerClient > m_rSessionManager;
- 
-+        void _requestInteraction();
-+        void _finishInteraction( sal_Bool bCancelShutdown );
-+        void _saveAutorecovery( sal_Bool bSessionSave );
-+
-         // restore handling
-         sal_Bool m_bRestored;
-  
-diff -rup framework-m188/source/services/sessionlistener.cxx framework/source/services/sessionlistener.cxx
---- framework-m188/source/services/sessionlistener.cxx	2006-10-31 13:13:29.000000000 +0100
-+++ framework/source/services/sessionlistener.cxx	2006-11-01 13:08:26.000000000 +0100
-@@ -249,38 +249,50 @@ sal_Bool SAL_CALL SessionListener::doRes
-     return m_bRestored;
- }
- 
-+void SessionListener::_saveAutorecovery( sal_Bool bSessionSave )
-+{
-+	sal_Bool bDispatched = sal_False;
-+	ResetableGuard aGuard(m_aLock);    
-+	try 
-+		{
-+                        // ON session save
-+			// xd create SERVICENAME_AUTORECOVERY -> XDispatch
-+			// xd->dispatch("vnd.sun.star.autorecovery:/doSessionSave, async=true
-+			// on stop event m_rSessionManager->saveDone(this);
-+                        // ON autosave ( bSessionSave == false)
-+			// xd->dispatch("vnd.sun.star.autorecovery:/doAutoSave, async=false
-+
-+			css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
-+			css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
-+			URL aURL;
-+			aURL.Complete = OUString::createFromAscii(bSessionSave
-+                                                                  ? "vnd.sun.star.autorecovery:/doSessionSave"
-+                                                                  : "vnd.sun.star.autorecovery:/doAutoSave");
-+			xURLTransformer->parseStrict(aURL);
-+                        if( bSessionSave )
-+                            xDispatch->addStatusListener(this, aURL);
-+			Sequence< PropertyValue > args(1);
-+			args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(bSessionSave),PropertyState_DIRECT_VALUE);
-+			xDispatch->dispatch(aURL, args);
-+			bDispatched = sal_True;
-+			// on stop event set call m_rSessionManager->saveDone(this);            
-+		} catch (com::sun::star::uno::Exception& e) {
-+			OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
-+			OSL_ENSURE(sal_False, aMsg.getStr());
-+			// save failed, but tell manager to go on if we havent yet dispatched the request
-+			if (m_rSessionManager.is() && !bDispatched && bSessionSave)
-+				m_rSessionManager->saveDone(this);
-+		}
-+}
- 
--void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelable*/ )
-+void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool bCancelable )
-     throw (RuntimeException)
- {
-     if (bShutdown)
-     {
--        sal_Bool bDispatched = sal_False;
--        ResetableGuard aGuard(m_aLock);    
--        try 
--        {
--            // xd create SERVICENAME_AUTORECOVERY -> XDispatch
--            // xd->dispatch("vnd.sun.star.autorecovery:/doSessionSave, async=true
--            // on stop event m_rSessionManager->saveDone(this);
--
--            css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
--            css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
--            URL aURL;
--            aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionSave");
--            xURLTransformer->parseStrict(aURL);
--            xDispatch->addStatusListener(this, aURL);
--            Sequence< PropertyValue > args(1);
--            args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(sal_True),PropertyState_DIRECT_VALUE);
--            xDispatch->dispatch(aURL, args);
--            bDispatched = sal_True;
--            // on stop event set call m_rSessionManager->saveDone(this);            
--        } catch (com::sun::star::uno::Exception& e) {
--            OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
--            OSL_ENSURE(sal_False, aMsg.getStr());
--            // save failed, but tell manager to go on if we havent yet dispatched the request
--            if (m_rSessionManager.is() && !bDispatched)
--                m_rSessionManager->saveDone(this);
--        }
-+        _saveAutorecovery( !bCancelable );
-+        if (bCancelable)
-+            _requestInteraction();
-     }
-     // we don't have anything to do so tell the session manager we're done
-     else if( m_rSessionManager.is() )
-@@ -289,12 +301,32 @@ void SAL_CALL SessionListener::doSave( s
- 
-    
- 
--void SAL_CALL SessionListener::approveInteraction( sal_Bool /*bInteractionGranted*/ )
-+void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted )
-     throw (RuntimeException)
--{}
-+{
-+	if( bInteractionGranted ) {
-+		bool bExit = GetpApp()->QueryExit();
-+
-+		if( m_rSessionManager.is() )
-+			m_rSessionManager->saveDone( this );
-+    
-+		_finishInteraction( !bExit );
-+	} else
-+		_saveAutorecovery( sal_True );
-+}
- 
- void SessionListener::shutdownCanceled()
-     throw (RuntimeException)
- {}
- 
-+void SessionListener::_requestInteraction()
-+{
-+    m_rSessionManager->queryInteraction(Reference<XSessionManagerListener>(this));
-+}
-+  
-+void SessionListener::_finishInteraction( sal_Bool bCancelShutdown )
-+{
-+    m_rSessionManager->interactionDone(Reference< XSessionManagerListener >(this), bCancelShutdown );
-+}
-+
- }
diff --git a/applied_patches/0180-novell-palette.diff b/applied_patches/0215-novell-palette.diff
similarity index 100%
rename from applied_patches/0180-novell-palette.diff
rename to applied_patches/0215-novell-palette.diff
diff --git a/applied_patches/0181-solenv-really-use-unsinged-char-on-ppc.diff b/applied_patches/0216-solenv-really-use-unsinged-char-on-ppc.diff
similarity index 100%
rename from applied_patches/0181-solenv-really-use-unsinged-char-on-ppc.diff
rename to applied_patches/0216-solenv-really-use-unsinged-char-on-ppc.diff
diff --git a/applied_patches/0182-sc-default-delete-backspace-key.diff b/applied_patches/0217-sc-default-delete-backspace-key.diff
similarity index 100%
rename from applied_patches/0182-sc-default-delete-backspace-key.diff
rename to applied_patches/0217-sc-default-delete-backspace-key.diff
diff --git a/applied_patches/0183-desktop-config-migration.diff b/applied_patches/0218-desktop-config-migration.diff
similarity index 100%
rename from applied_patches/0183-desktop-config-migration.diff
rename to applied_patches/0218-desktop-config-migration.diff
diff --git a/applied_patches/0184-help-support.diff b/applied_patches/0219-help-support.diff
similarity index 100%
rename from applied_patches/0184-help-support.diff
rename to applied_patches/0219-help-support.diff
diff --git a/applied_patches/0185-scp2-user-config-ooo3.diff b/applied_patches/0220-scp2-user-config-ooo3.diff
similarity index 100%
rename from applied_patches/0185-scp2-user-config-ooo3.diff
rename to applied_patches/0220-scp2-user-config-ooo3.diff
diff --git a/applied_patches/0186-pushfont-psstream.diff b/applied_patches/0221-pushfont-psstream.diff
similarity index 100%
rename from applied_patches/0186-pushfont-psstream.diff
rename to applied_patches/0221-pushfont-psstream.diff
diff --git a/applied_patches/0187-split-icons-search-usr-share.diff b/applied_patches/0222-split-icons-search-usr-share.diff
similarity index 100%
rename from applied_patches/0187-split-icons-search-usr-share.diff
rename to applied_patches/0222-split-icons-search-usr-share.diff
diff --git a/applied_patches/0188-novell-win32-agfa-monotype-fonts.diff b/applied_patches/0223-novell-win32-agfa-monotype-fonts-m59.diff
similarity index 100%
rename from applied_patches/0188-novell-win32-agfa-monotype-fonts.diff
rename to applied_patches/0223-novell-win32-agfa-monotype-fonts-m59.diff
diff --git a/applied_patches/0189-build-java-target.diff b/applied_patches/0224-build-java-target-m59.diff
similarity index 100%
rename from applied_patches/0189-build-java-target.diff
rename to applied_patches/0224-build-java-target-m59.diff
diff --git a/applied_patches/0190-solenv-installer-cleaner-paths.diff b/applied_patches/0225-solenv-installer-cleaner-paths.diff
similarity index 100%
rename from applied_patches/0190-solenv-installer-cleaner-paths.diff
rename to applied_patches/0225-solenv-installer-cleaner-paths.diff
diff --git a/applied_patches/0191-solenv-installer-lang-filelist-names.diff b/applied_patches/0226-solenv-installer-lang-filelist-names.diff
similarity index 100%
rename from applied_patches/0191-solenv-installer-lang-filelist-names.diff
rename to applied_patches/0226-solenv-installer-lang-filelist-names.diff
diff --git a/applied_patches/0192-installer-get-path-correctly.diff b/applied_patches/0227-installer-get-path-correctly.diff
similarity index 100%
rename from applied_patches/0192-installer-get-path-correctly.diff
rename to applied_patches/0227-installer-get-path-correctly.diff
diff --git a/applied_patches/0193-build-prebuilt-stax.diff b/applied_patches/0228-build-prebuilt-stax.diff
similarity index 100%
rename from applied_patches/0193-build-prebuilt-stax.diff
rename to applied_patches/0228-build-prebuilt-stax.diff
diff --git a/applied_patches/0194-ucb-neon-0.24.diff b/applied_patches/0229-ucb-neon-0.24.diff
similarity index 100%
rename from applied_patches/0194-ucb-neon-0.24.diff
rename to applied_patches/0229-ucb-neon-0.24.diff
diff --git a/applied_patches/0196-dmake-space-in-envvar-name.diff b/applied_patches/0230-dmake-space-in-envvar-name.diff
similarity index 100%
rename from applied_patches/0196-dmake-space-in-envvar-name.diff
rename to applied_patches/0230-dmake-space-in-envvar-name.diff
diff --git a/applied_patches/0231-armeabi-softfp-buildfix.diff b/applied_patches/0231-armeabi-softfp-buildfix.diff
new file mode 100644
index 000000000..5ba5cdbea
--- /dev/null
+++ b/applied_patches/0231-armeabi-softfp-buildfix.diff
@@ -0,0 +1,47 @@
+--- bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx.old	2008-04-11 10:27:28.000000000 +0000
++++ bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx	2009-09-23 12:45:41.000000000 +0000
+@@ -45,7 +45,17 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#if defined(__ARM_EABI__) && !defined(__SOFTFP__)
++/* 
++ * Based on http://gcc.gnu.org/PR41443
++ * References to __SOFTFP__ are incorrect for EABI; the __SOFTFP__ code
++ * should be used for *soft-float ABI* whether or not VFP is enabled,
++ * and __SOFTFP__ does specifically mean soft-float not soft-float ABI.
++ *
++ * Changing the conditionals to __SOFTFP__ || __ARM_EABI__ then 
++ * -mfloat-abi=softfp should work.  -mfloat-abi=hard won't; that would
++ * need both a new macro to identify the hard-VFP ABI.
++ */
++#if !defined(__ARM_EABI__) && (!defined(__SOFTFP__)
+ #error Not Implemented
+ 
+ /*
+@@ -103,7 +113,7 @@
+ 
+ void MapReturn(long r0, long r1, typelib_TypeClass eReturnType, void *pRegisterReturn)
+ {
+-#ifndef __SOFTFP__
++#if !defined(__ARM_EABI__) && !defined(__SOFTFP__)
+     register float fret asm("f0");
+     register double dret asm("f0");
+ #endif
+@@ -128,14 +138,14 @@
+             *(unsigned char*)pRegisterReturn = (unsigned char)r0;
+             break;
+         case typelib_TypeClass_FLOAT:
+-#ifdef __SOFTFP__
++#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+             ((long*)pRegisterReturn)[0] = r0;
+ #else
+             *(float*)pRegisterReturn = fret;
+ #endif
+ 	    break;
+         case typelib_TypeClass_DOUBLE:
+-#ifdef __SOFTFP__
++#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+             ((long*)pRegisterReturn)[1] = r1;
+             ((long*)pRegisterReturn)[0] = r0;
+ #else
diff --git a/applied_patches/0231-buildfix-vba-as-extn.diff b/applied_patches/0231-buildfix-vba-as-extn.diff
deleted file mode 100644
index bff04eb0c..000000000
--- a/applied_patches/0231-buildfix-vba-as-extn.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- sc/util/makefile.mk.orig	2008-03-11 18:36:44.000000000 +0100
-+++ sc/util/makefile.mk	2008-03-11 18:36:54.000000000 +0100
-@@ -300,6 +300,7 @@
- 
- .INCLUDE :  target.mk
- 
-+COMP=
- .IF "$(VBA_EXTENSION)"=="YES"
-     COMP=build_extn
- .ENDIF
diff --git a/applied_patches/0232-db4.8.diff b/applied_patches/0232-db4.8.diff
new file mode 100644
index 000000000..5ae3eb6f9
--- /dev/null
+++ b/applied_patches/0232-db4.8.diff
@@ -0,0 +1,11 @@
+--- configure.in-old	2009-09-28 20:35:05.000000000 +0200
++++ configure.in	2009-09-28 20:32:40.000000000 +0200
+@@ -3907,7 +3907,7 @@
+         ], []
+     )
+     AC_MSG_CHECKING([whether db is at least 4.1])
+-    for v in `seq 1 7`; do
++    for v in `seq 1 8`; do
+        AC_TRY_RUN([
+ #include <db.h>
+ 
diff --git a/applied_patches/0195-postset-add-ro.diff b/applied_patches/0233-postset-add-ro.diff
similarity index 100%
rename from applied_patches/0195-postset-add-ro.diff
rename to applied_patches/0233-postset-add-ro.diff
diff --git a/applied_patches/0197-recovery-report.diff b/applied_patches/0234-recovery-report.diff
similarity index 100%
rename from applied_patches/0197-recovery-report.diff
rename to applied_patches/0234-recovery-report.diff
diff --git a/applied_patches/0198-default-no-startup-wizard.diff b/applied_patches/0235-default-no-startup-wizard.diff
similarity index 100%
rename from applied_patches/0198-default-no-startup-wizard.diff
rename to applied_patches/0235-default-no-startup-wizard.diff
diff --git a/applied_patches/0199-default-no-style-dialog.diff b/applied_patches/0236-default-no-style-dialog.diff
similarity index 100%
rename from applied_patches/0199-default-no-style-dialog.diff
rename to applied_patches/0236-default-no-style-dialog.diff
diff --git a/applied_patches/0200-default-no-registration.diff b/applied_patches/0237-default-no-registration.diff
similarity index 100%
rename from applied_patches/0200-default-no-registration.diff
rename to applied_patches/0237-default-no-registration.diff
diff --git a/applied_patches/0201-tango-prefer-over-industrial.diff b/applied_patches/0238-tango-prefer-over-industrial.diff
similarity index 100%
rename from applied_patches/0201-tango-prefer-over-industrial.diff
rename to applied_patches/0238-tango-prefer-over-industrial.diff
diff --git a/applied_patches/0202-default-no-registration-menu.diff b/applied_patches/0239-default-no-registration-menu.diff
similarity index 100%
rename from applied_patches/0202-default-no-registration-menu.diff
rename to applied_patches/0239-default-no-registration-menu.diff
diff --git a/applied_patches/0203-default-no-registration-menu-sd.diff b/applied_patches/0240-default-no-registration-menu-sd.diff
similarity index 100%
rename from applied_patches/0203-default-no-registration-menu-sd.diff
rename to applied_patches/0240-default-no-registration-menu-sd.diff
diff --git a/applied_patches/0204-scp2-3layer-nicer-paths.diff b/applied_patches/0241-scp2-3layer-nicer-paths.diff
similarity index 100%
rename from applied_patches/0204-scp2-3layer-nicer-paths.diff
rename to applied_patches/0241-scp2-3layer-nicer-paths.diff
diff --git a/applied_patches/0205-default-system-fpicker.diff b/applied_patches/0242-default-system-fpicker.diff
similarity index 100%
rename from applied_patches/0205-default-system-fpicker.diff
rename to applied_patches/0242-default-system-fpicker.diff
diff --git a/applied_patches/0206-default-font-aasize.diff b/applied_patches/0243-default-font-aasize.diff
similarity index 100%
rename from applied_patches/0206-default-font-aasize.diff
rename to applied_patches/0243-default-font-aasize.diff
diff --git a/applied_patches/0207-default-font-size.diff b/applied_patches/0244-default-font-size.diff
similarity index 100%
rename from applied_patches/0207-default-font-size.diff
rename to applied_patches/0244-default-font-size.diff
diff --git a/applied_patches/0208-default-ms-filter-convert.diff b/applied_patches/0245-default-ms-filter-convert.diff
similarity index 100%
rename from applied_patches/0208-default-ms-filter-convert.diff
rename to applied_patches/0245-default-ms-filter-convert.diff
diff --git a/applied_patches/0209-writer-default-as-optimal-page-wrap.diff b/applied_patches/0246-writer-default-as-optimal-page-wrap.diff
similarity index 100%
rename from applied_patches/0209-writer-default-as-optimal-page-wrap.diff
rename to applied_patches/0246-writer-default-as-optimal-page-wrap.diff
diff --git a/applied_patches/0210-vfs-kde-too.diff b/applied_patches/0247-vfs-kde-too.diff
similarity index 100%
rename from applied_patches/0210-vfs-kde-too.diff
rename to applied_patches/0247-vfs-kde-too.diff
diff --git a/applied_patches/0211-valgrind-alloc.diff b/applied_patches/0248-valgrind-alloc.diff
similarity index 100%
rename from applied_patches/0211-valgrind-alloc.diff
rename to applied_patches/0248-valgrind-alloc.diff
diff --git a/applied_patches/0212-default-openssl-no-idea-alg.diff b/applied_patches/0249-default-openssl-no-idea-alg.diff
similarity index 100%
rename from applied_patches/0212-default-openssl-no-idea-alg.diff
rename to applied_patches/0249-default-openssl-no-idea-alg.diff
diff --git a/applied_patches/0213-odf-flatxml-import-export.diff b/applied_patches/0250-odf-flatxml-import-export.diff
similarity index 100%
rename from applied_patches/0213-odf-flatxml-import-export.diff
rename to applied_patches/0250-odf-flatxml-import-export.diff
diff --git a/applied_patches/0251-session-management.diff b/applied_patches/0251-session-management.diff
new file mode 100644
index 000000000..da65e9a76
--- /dev/null
+++ b/applied_patches/0251-session-management.diff
@@ -0,0 +1,419 @@
+diff --git vcl/inc/vcl/salsession.hxx vcl/inc/vcl/salsession.hxx
+index 13ec237..bff9626 100644
+--- vcl/inc/vcl/salsession.hxx
++++ vcl/inc/vcl/salsession.hxx
+@@ -102,11 +102,9 @@ public:
+     // query the session manager for a user interaction slot
+     virtual void queryInteraction() = 0;
+     // signal the session manager that we're done with user interaction
+-    virtual void interactionDone() = 0;
++    virtual void interactionDone( bool bCancelShutdown ) = 0;
+     // signal that we're done saving
+     virtual void saveDone() = 0;
+-    // try to cancel the sutdown in progress
+-    virtual bool cancelShutdown() = 0;
+ };
+ 
+ #endif
+diff --git vcl/source/app/session.cxx vcl/source/app/session.cxx
+index e1ebe1e..7c1f14a 100644
+--- vcl/source/app/session.cxx
++++ vcl/source/app/session.cxx
+@@ -88,9 +88,8 @@ public:
+     virtual void SAL_CALL addSessionManagerListener( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException );
+     virtual void SAL_CALL removeSessionManagerListener( const Reference< XSessionManagerListener>& xListener ) throw( RuntimeException );
+     virtual void SAL_CALL queryInteraction( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException );
+-    virtual void SAL_CALL interactionDone( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException );
++    virtual void SAL_CALL interactionDone( const Reference< XSessionManagerListener >& xListener, sal_Bool bCancelShutdown ) throw( RuntimeException );
+     virtual void SAL_CALL saveDone( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException );
+-    virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException );
+ };
+ 
+ VCLSession* VCLSession::pOneInstance = NULL;
+@@ -170,7 +169,7 @@ void VCLSession::callInteractionGranted( bool bInteractionGranted )
+         if( aListeners.empty() )
+         {
+             if( m_pSession )
+-                m_pSession->interactionDone();
++                m_pSession->interactionDone( false );
+             return;
+         }
+     }
+@@ -272,7 +271,7 @@ void SAL_CALL VCLSession::queryInteraction( const Reference<XSessionManagerListe
+     }
+ }
+ 
+-void SAL_CALL VCLSession::interactionDone( const Reference< XSessionManagerListener >& xListener ) throw( RuntimeException )
++void SAL_CALL VCLSession::interactionDone( const Reference< XSessionManagerListener >& xListener, sal_Bool bCancelShutdown ) throw( RuntimeException )
+ {
+     osl::MutexGuard aGuard( m_aMutex );
+     int nRequested = 0, nDone = 0;
+@@ -291,7 +290,7 @@ void SAL_CALL VCLSession::interactionDone( const Reference< XSessionManagerListe
+     {
+         m_bInteractionDone = true;
+         if( m_pSession )
+-            m_pSession->interactionDone();
++            m_pSession->interactionDone( bCancelShutdown );
+     }
+ }
+ 
+@@ -316,11 +315,6 @@ void SAL_CALL VCLSession::saveDone( const Reference< XSessionManagerListener >&
+     }
+ }
+ 
+-sal_Bool SAL_CALL VCLSession::cancelShutdown() throw( RuntimeException )
+-{
+-    return m_pSession ? (sal_Bool)m_pSession->cancelShutdown() : sal_False;
+-}
+-
+ // service implementation
+ 
+ OUString SAL_CALL vcl_session_getImplementationName()
+diff --git vcl/unx/inc/sm.hxx vcl/unx/inc/sm.hxx
+index 998b8ec..03646ba 100644
+--- vcl/unx/inc/sm.hxx
++++ vcl/unx/inc/sm.hxx
+@@ -39,7 +39,8 @@ class SessionManagerClient
+ {
+     static SmcConn			aSmcConnection;
+     static ByteString		aClientID;
+-    static bool			bDocSaveDone;
++    static bool			    bDocSaveDone;
++	static bool             bSaveDoneSent;
+ 
+     static void SaveYourselfProc(		SmcConn connection,
+                                         SmPointer client_data,
+@@ -68,8 +69,8 @@ public:
+ 
+     static bool checkDocumentsSaved();
+     static bool queryInteraction();
+-    static void saveDone();
+-    static void interactionDone();
++    static void saveDone( bool bSuccess = true );
++    static void interactionDone( bool bCancelShutdown = false );
+ 
+     static String getExecName();
+     static VCL_DLLPUBLIC const ByteString&  getSessionID();
+@@ -84,9 +85,8 @@ public:
+     virtual ~IceSalSession();
+     
+     virtual void queryInteraction();
+-    virtual void interactionDone();
++    virtual void interactionDone( bool bCancelShutdown );
+     virtual void saveDone();
+-    virtual bool cancelShutdown();
+ 
+     static void handleOldX11SaveYourself( SalFrame* pFrame );
+ };
+diff --git vcl/unx/source/app/sm.cxx vcl/unx/source/app/sm.cxx
+index c5c25a4..b9ed5ed 100644
+--- vcl/unx/source/app/sm.cxx
++++ vcl/unx/source/app/sm.cxx
+@@ -112,9 +112,9 @@ void IceSalSession::queryInteraction()
+     }
+ }
+ 
+-void IceSalSession::interactionDone()
++void IceSalSession::interactionDone( bool bCancelShutdown )
+ {
+-    SessionManagerClient::interactionDone();
++    SessionManagerClient::interactionDone( bCancelShutdown );
+ }
+ 
+ void IceSalSession::saveDone()
+@@ -127,11 +127,6 @@ void IceSalSession::saveDone()
+     }
+ }
+ 
+-bool IceSalSession::cancelShutdown()
+-{
+-    return false;
+-}
+-
+ void IceSalSession::handleOldX11SaveYourself( SalFrame* pFrame )
+ {
+     // do this only once
+@@ -184,6 +179,7 @@ int					ICEConnectionObserver::nWakeupFiles[2]			= { 0, 0 };
+ // HACK
+ bool SessionManagerClient::bDocSaveDone = false;
+ 
++bool SessionManagerClient::bSaveDoneSent = false;
+ 
+ static SmProp*	pSmProps = NULL;
+ static SmProp**	ppSmProps = NULL;
+@@ -265,6 +261,12 @@ bool SessionManagerClient::checkDocumentsSaved()
+     return bDocSaveDone;
+ }
+ 
++struct SaveYourselfArgs {
++	bool bShutdown;
++	bool bFast;
++	int nInteractionStyle;
++} aSaveYourselfArg;
++
+ IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
+ {
+     SMprintf( "posting save documents event shutdown = %s\n", (pThis!=0) ? "true" : "false" );
+@@ -295,7 +297,7 @@ IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
+ 
+     if( pOneInstance )
+     {
+-        SalSessionSaveRequestEvent aEvent( pThis != 0, false );
++        SalSessionSaveRequestEvent aEvent( aSaveYourselfArg.bShutdown, aSaveYourselfArg.nInteractionStyle == SmInteractStyleAny && !aSaveYourselfArg.bFast );
+         pOneInstance->CallCallback( &aEvent );        
+     }
+     else
+@@ -307,12 +309,13 @@ IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
+ IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, InteractionHdl, void*, EMPTYARG )
+ {
+     SMprintf( "interaction link\n" );
+-    if( pOneInstance )
++ 
++	if( pOneInstance )
+     {
+         SalSessionInteractionEvent aEvent( true );
+         pOneInstance->CallCallback( &aEvent );
+     }
+-    
++
+     return 0;
+ }
+ 
+@@ -325,6 +328,9 @@ IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, ShutDownCancelHdl, void*, EMP
+         pOneInstance->CallCallback( &aEvent );
+     }
+     
++ 	if( !bSaveDoneSent )
++ 		saveDone( false );
++
+     return 0;
+ }
+ 
+@@ -334,7 +340,7 @@ void SessionManagerClient::SaveYourselfProc(
+     int save_type,
+     Bool shutdown,
+     int interact_style,
+-    Bool
++	Bool fast
+     )
+ {
+     SMprintf( "Session: save yourself, save_type = %s, shutdown = %s, interact_style = %s, fast = %s\n",
+@@ -345,8 +351,9 @@ void SessionManagerClient::SaveYourselfProc(
+               interact_style == SmInteractStyleNone ? "SmInteractStyleNone" :
+               ( interact_style == SmInteractStyleErrors ? "SmInteractStyleErrors" :
+                 ( interact_style == SmInteractStyleAny ? "SmInteractStyleAny" : "<unknown>" ) ),
+-              false ? "true" : "false"
++              fast ? "true" : "false"
+               );
++	bSaveDoneSent = false;
+     BuildSmPropertyList();
+ #ifdef USE_SM_EXTENSION
+     bDocSaveDone = false;
+@@ -361,7 +368,12 @@ void SessionManagerClient::SaveYourselfProc(
+         SessionManagerClient::saveDone();
+         return;
+     }
+-    Application::PostUserEvent( STATIC_LINK( (void*)(shutdown ? 0xffffffff : 0x0), SessionManagerClient, SaveYourselfHdl ) );
++
++	aSaveYourselfArg.bShutdown = shutdown;
++	aSaveYourselfArg.nInteractionStyle = interact_style;
++	aSaveYourselfArg.bFast = fast;
++	Application::PostUserEvent( STATIC_LINK( NULL, SessionManagerClient, SaveYourselfHdl ) );
++
+     SMprintf( "waiting for save yourself event to be processed\n" );
+ #endif
+ }
+@@ -414,15 +426,17 @@ void SessionManagerClient::InteractProc(
+         Application::PostUserEvent( STATIC_LINK( NULL, SessionManagerClient, InteractionHdl ) );
+ }
+ 
+-void SessionManagerClient::saveDone()
++void SessionManagerClient::saveDone( bool bSuccess )
+ {
+     if( aSmcConnection )
+     {
+         ICEConnectionObserver::lock();
+-        SmcSetProperties( aSmcConnection, nSmProps, ppSmProps );
+-        SmcSaveYourselfDone( aSmcConnection, True );
++        if( bSuccess )
++            SmcSetProperties( aSmcConnection, nSmProps, ppSmProps );
++        SmcSaveYourselfDone( aSmcConnection, bSuccess );
+         SMprintf( "sent SaveYourselfDone SmRestartHint of %d\n", *pSmRestartHint );
+-        bDocSaveDone = true;
++        bDocSaveDone = bSuccess;
++        bSaveDoneSent = true;
+         ICEConnectionObserver::unlock();
+     }
+ }
+@@ -526,12 +540,12 @@ bool SessionManagerClient::queryInteraction()
+     return bRet;
+ }
+ 
+-void SessionManagerClient::interactionDone()
++void SessionManagerClient::interactionDone( bool bCancelShutdown )
+ {
+     if( aSmcConnection )
+     {
+         ICEConnectionObserver::lock();
+-        SmcInteractDone( aSmcConnection, False );
++        SmcInteractDone( aSmcConnection, bCancelShutdown );
+         ICEConnectionObserver::unlock();
+     }
+ }
+diff -rup offapi/com/sun/star/frame/XSessionManagerClient.idl offapi/com/sun/star/frame/XSessionManagerClient.idl
+--- offapi/com/sun/star/frame/XSessionManagerClient.idl	2005-09-08 03:25:36.000000000 +0200
++++ offapi/com/sun/star/frame/XSessionManagerClient.idl	2006-02-20 17:09:58.000000000 +0100
+@@ -88,7 +88,7 @@ module com {  module sun {  module star 
+ 
+         @see XSessionManagerListener
+         */
+-        [oneway] void interactionDone( [in] XSessionManagerListener xListener );
++        [oneway] void interactionDone( [in] XSessionManagerListener xListener, [in] boolean bCancelShutdown );
+ 
+         /** saveDone signals that a listener has processed a save request
+ 
+@@ -98,14 +98,6 @@ module com {  module sun {  module star 
+         @see XSessionManagerListener
+         */
+         [oneway] void saveDone( [in] XSessionManagerListener xListener );
+-
+-        /** Call cancelShutdown to try to cancel a desktop shutdown in progress
+-
+-        @returns
+-        <TRUE/> if shutdown was canceled,
+-        <FALSE/> else.
+-        */
+-        boolean cancelShutdown();
+     };
+ 
+ }; }; }; };
+diff -rup framework-m188/inc/services/sessionlistener.hxx framework/inc/services/sessionlistener.hxx
+--- framework-m188/inc/services/sessionlistener.hxx	2006-10-31 13:13:27.000000000 +0100
++++ framework/inc/services/sessionlistener.hxx	2006-10-31 18:14:09.000000000 +0100
+@@ -161,6 +161,10 @@ class SessionListener :   // interfaces
+ 
+         css::uno::Reference< css::frame::XSessionManagerClient > m_rSessionManager;
+ 
++        void _requestInteraction();
++        void _finishInteraction( sal_Bool bCancelShutdown );
++        void _saveAutorecovery( sal_Bool bSessionSave );
++
+         // restore handling
+         sal_Bool m_bRestored;
+  
+diff -rup framework-m188/source/services/sessionlistener.cxx framework/source/services/sessionlistener.cxx
+--- framework-m188/source/services/sessionlistener.cxx	2006-10-31 13:13:29.000000000 +0100
++++ framework/source/services/sessionlistener.cxx	2006-11-01 13:08:26.000000000 +0100
+@@ -249,38 +249,50 @@ sal_Bool SAL_CALL SessionListener::doRes
+     return m_bRestored;
+ }
+ 
++void SessionListener::_saveAutorecovery( sal_Bool bSessionSave )
++{
++	sal_Bool bDispatched = sal_False;
++	ResetableGuard aGuard(m_aLock);    
++	try 
++		{
++                        // ON session save
++			// xd create SERVICENAME_AUTORECOVERY -> XDispatch
++			// xd->dispatch("vnd.sun.star.autorecovery:/doSessionSave, async=true
++			// on stop event m_rSessionManager->saveDone(this);
++                        // ON autosave ( bSessionSave == false)
++			// xd->dispatch("vnd.sun.star.autorecovery:/doAutoSave, async=false
++
++			css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
++			css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
++			URL aURL;
++			aURL.Complete = OUString::createFromAscii(bSessionSave
++                                                                  ? "vnd.sun.star.autorecovery:/doSessionSave"
++                                                                  : "vnd.sun.star.autorecovery:/doAutoSave");
++			xURLTransformer->parseStrict(aURL);
++                        if( bSessionSave )
++                            xDispatch->addStatusListener(this, aURL);
++			Sequence< PropertyValue > args(1);
++			args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(bSessionSave),PropertyState_DIRECT_VALUE);
++			xDispatch->dispatch(aURL, args);
++			bDispatched = sal_True;
++			// on stop event set call m_rSessionManager->saveDone(this);            
++		} catch (com::sun::star::uno::Exception& e) {
++			OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
++			OSL_ENSURE(sal_False, aMsg.getStr());
++			// save failed, but tell manager to go on if we havent yet dispatched the request
++			if (m_rSessionManager.is() && !bDispatched && bSessionSave)
++				m_rSessionManager->saveDone(this);
++		}
++}
+ 
+-void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelable*/ )
++void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool bCancelable )
+     throw (RuntimeException)
+ {
+     if (bShutdown)
+     {
+-        sal_Bool bDispatched = sal_False;
+-        ResetableGuard aGuard(m_aLock);    
+-        try 
+-        {
+-            // xd create SERVICENAME_AUTORECOVERY -> XDispatch
+-            // xd->dispatch("vnd.sun.star.autorecovery:/doSessionSave, async=true
+-            // on stop event m_rSessionManager->saveDone(this);
+-
+-            css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
+-            css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
+-            URL aURL;
+-            aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionSave");
+-            xURLTransformer->parseStrict(aURL);
+-            xDispatch->addStatusListener(this, aURL);
+-            Sequence< PropertyValue > args(1);
+-            args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(sal_True),PropertyState_DIRECT_VALUE);
+-            xDispatch->dispatch(aURL, args);
+-            bDispatched = sal_True;
+-            // on stop event set call m_rSessionManager->saveDone(this);            
+-        } catch (com::sun::star::uno::Exception& e) {
+-            OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
+-            OSL_ENSURE(sal_False, aMsg.getStr());
+-            // save failed, but tell manager to go on if we havent yet dispatched the request
+-            if (m_rSessionManager.is() && !bDispatched)
+-                m_rSessionManager->saveDone(this);
+-        }
++        _saveAutorecovery( !bCancelable );
++        if (bCancelable)
++            _requestInteraction();
+     }
+     // we don't have anything to do so tell the session manager we're done
+     else if( m_rSessionManager.is() )
+@@ -289,12 +301,32 @@ void SAL_CALL SessionListener::doSave( s
+ 
+    
+ 
+-void SAL_CALL SessionListener::approveInteraction( sal_Bool /*bInteractionGranted*/ )
++void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted )
+     throw (RuntimeException)
+-{}
++{
++	if( bInteractionGranted ) {
++		bool bExit = GetpApp()->QueryExit();
++
++		if( m_rSessionManager.is() )
++			m_rSessionManager->saveDone( this );
++    
++		_finishInteraction( !bExit );
++	} else
++		_saveAutorecovery( sal_True );
++}
+ 
+ void SessionListener::shutdownCanceled()
+     throw (RuntimeException)
+ {}
+ 
++void SessionListener::_requestInteraction()
++{
++    m_rSessionManager->queryInteraction(Reference<XSessionManagerListener>(this));
++}
++  
++void SessionListener::_finishInteraction( sal_Bool bCancelShutdown )
++{
++    m_rSessionManager->interactionDone(Reference< XSessionManagerListener >(this), bCancelShutdown );
++}
++
+ }
diff --git a/applied_patches/0215-office-cfg-common-template-dir.diff b/applied_patches/0252-office-cfg-common-template-dir.diff
similarity index 100%
rename from applied_patches/0215-office-cfg-common-template-dir.diff
rename to applied_patches/0252-office-cfg-common-template-dir.diff
diff --git a/applied_patches/0216-sfx2-template-category-labels.diff b/applied_patches/0253-sfx2-template-category-labels.diff
similarity index 100%
rename from applied_patches/0216-sfx2-template-category-labels.diff
rename to applied_patches/0253-sfx2-template-category-labels.diff
diff --git a/applied_patches/0217-scp2_add_additional_dirs.diff b/applied_patches/0254-scp2_add_additional_dirs.diff
similarity index 100%
rename from applied_patches/0217-scp2_add_additional_dirs.diff
rename to applied_patches/0254-scp2_add_additional_dirs.diff
diff --git a/applied_patches/0218-build-identification.diff b/applied_patches/0255-build-identification.diff
similarity index 100%
rename from applied_patches/0218-build-identification.diff
rename to applied_patches/0255-build-identification.diff
diff --git a/applied_patches/0219-installer-strip-optional.diff b/applied_patches/0256-installer-strip-optional.diff
similarity index 100%
rename from applied_patches/0219-installer-strip-optional.diff
rename to applied_patches/0256-installer-strip-optional.diff
diff --git a/applied_patches/0220-i18nutil-glibc-braindamage-workaround.diff b/applied_patches/0257-i18nutil-glibc-braindamage-workaround.diff
similarity index 100%
rename from applied_patches/0220-i18nutil-glibc-braindamage-workaround.diff
rename to applied_patches/0257-i18nutil-glibc-braindamage-workaround.diff
diff --git a/applied_patches/0221-sdk-gid-module-name.diff b/applied_patches/0258-sdk-gid-module-name.diff
similarity index 100%
rename from applied_patches/0221-sdk-gid-module-name.diff
rename to applied_patches/0258-sdk-gid-module-name.diff
diff --git a/applied_patches/0222-psprint_config-no-orig.diff b/applied_patches/0259-psprint_config-no-orig.diff
similarity index 100%
rename from applied_patches/0222-psprint_config-no-orig.diff
rename to applied_patches/0259-psprint_config-no-orig.diff
diff --git a/applied_patches/0223-stlport-gcc-warnings.diff b/applied_patches/0260-stlport-gcc-warnings.diff
similarity index 100%
rename from applied_patches/0223-stlport-gcc-warnings.diff
rename to applied_patches/0260-stlport-gcc-warnings.diff
diff --git a/applied_patches/0224-speed-hash-style.diff b/applied_patches/0261-speed-hash-style.diff
similarity index 100%
rename from applied_patches/0224-speed-hash-style.diff
rename to applied_patches/0261-speed-hash-style.diff
diff --git a/applied_patches/0225-link-as-needed.diff b/applied_patches/0262-link-as-needed.diff
similarity index 100%
rename from applied_patches/0225-link-as-needed.diff
rename to applied_patches/0262-link-as-needed.diff
diff --git a/applied_patches/0226-svx-customshapes-NOOPTFILES.diff b/applied_patches/0263-svx-customshapes-NOOPTFILES.diff
similarity index 100%
rename from applied_patches/0226-svx-customshapes-NOOPTFILES.diff
rename to applied_patches/0263-svx-customshapes-NOOPTFILES.diff
diff --git a/applied_patches/0227-warning-return-values-filter.diff b/applied_patches/0264-warning-return-values-filter.diff
similarity index 100%
rename from applied_patches/0227-warning-return-values-filter.diff
rename to applied_patches/0264-warning-return-values-filter.diff
diff --git a/applied_patches/0228-warning-return-values-registry.diff b/applied_patches/0265-warning-return-values-registry.diff
similarity index 100%
rename from applied_patches/0228-warning-return-values-registry.diff
rename to applied_patches/0265-warning-return-values-registry.diff
diff --git a/applied_patches/0229-warning-uninitialized-variables-tools-2.diff b/applied_patches/0266-warning-uninitialized-variables-tools-2.diff
similarity index 100%
rename from applied_patches/0229-warning-uninitialized-variables-tools-2.diff
rename to applied_patches/0266-warning-uninitialized-variables-tools-2.diff
diff --git a/applied_patches/0230-stlport-solaris-fileno.diff b/applied_patches/0267-stlport-solaris-fileno.diff
similarity index 100%
rename from applied_patches/0230-stlport-solaris-fileno.diff
rename to applied_patches/0267-stlport-solaris-fileno.diff
diff --git a/applied_patches/0232-system-python-ure-bootstrap.diff b/applied_patches/0268-system-python-ure-bootstrap.diff
similarity index 100%
rename from applied_patches/0232-system-python-ure-bootstrap.diff
rename to applied_patches/0268-system-python-ure-bootstrap.diff
diff --git a/applied_patches/0233-pyuno-ooodir.diff b/applied_patches/0269-pyuno-ooodir.diff
similarity index 100%
rename from applied_patches/0233-pyuno-ooodir.diff
rename to applied_patches/0269-pyuno-ooodir.diff
diff --git a/applied_patches/0269-vba-attribute.diff b/applied_patches/0269-vba-attribute.diff
deleted file mode 100644
index c78081501..000000000
--- a/applied_patches/0269-vba-attribute.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: basic/source/comp/dim.cxx
-===================================================================
-RCS file: /cvs/script/basic/source/comp/dim.cxx,v
-retrieving revision 1.10.32.3
-diff -u -p -u -r1.10.32.3 dim.cxx
---- basic/source/comp/dim.cxx	17 Feb 2004 12:59:22 -0000	1.10.32.3
-+++ basic/source/comp/dim.cxx	29 Apr 2004 15:44:09 -0000
-@@ -794,6 +794,24 @@ void SbiParser::Declare()
- 	}
- }
- 
-+void SbiParser::Attribute()
-+{
-+	// TODO: Need to implement the method as an attributed object.
-+	while( Next() != EQ )
-+	{
-+		String aSym( GetSym() );
-+		if( Next() != DOT) 
-+			break;
-+	}
-+	
-+	if( eCurTok != EQ )
-+		Error( SbERR_SYNTAX );
-+	else
-+		SbiExpression aValue( this );
-+
-+	// Don't generate any code - just discard it.
-+}
-+
- // Aufruf einer SUB oder FUNCTION
- 
- void SbiParser::Call()
-Index: basic/source/comp/parser.cxx
-===================================================================
-RCS file: /cvs/script/basic/source/comp/parser.cxx,v
-retrieving revision 1.5.32.1
-diff -u -p -u -r1.5.32.1 parser.cxx
---- basic/source/comp/parser.cxx	20 Jan 2004 09:59:25 -0000	1.5.32.1
-+++ basic/source/comp/parser.cxx	29 Apr 2004 15:44:09 -0000
-@@ -83,6 +83,7 @@ struct SbiStatement {
- #define	N	FALSE
- 
- static SbiStatement StmntTable [] = {
-+{ ATTRIBUTE, &SbiParser::Attribute, Y, Y, }, // ATTRIBUTE
- { CALL,		&SbiParser::Call,   	N, Y, }, // CALL
- { CLOSE,	&SbiParser::Close,		N, Y, }, // CLOSE
- { _CONST_,	&SbiParser::Dim, 		Y, Y, }, // CONST
-Index: basic/source/comp/token.cxx
-===================================================================
-RCS file: /cvs/script/basic/source/comp/token.cxx,v
-retrieving revision 1.4.44.1
-diff -u -p -u -r1.4.44.1 token.cxx
---- basic/source/comp/token.cxx	20 Jan 2004 10:00:20 -0000	1.4.44.1
-+++ basic/source/comp/token.cxx	29 Apr 2004 15:44:09 -0000
-@@ -89,6 +89,7 @@ static TokenTable aTokTable_Basic [] = {
- 	{ ANY,		"Any" },
- 	{ APPEND,	"Append" },
- 	{ AS,		"As" },
-+	{ ATTRIBUTE,"Attribute" },
- 	{ BASE,		"Base" },
- 	{ BINARY,	"Binary" },
- 	{ TBOOLEAN,	"Boolean" },
-
-Index: basic/source/inc/parser.hxx
-===================================================================
-RCS file: /cvs/script/basic/source/inc/parser.hxx,v
-retrieving revision 1.1.1.1.134.1
-diff -u -p -u -r1.1.1.1.134.1 parser.hxx
---- basic/source/inc/parser.hxx	20 Jan 2004 10:00:40 -0000	1.1.1.1.134.1
-+++ basic/source/inc/parser.hxx	4 May 2004 09:08:36 -0000
-@@ -136,6 +136,7 @@ public:
- 	void BadSyntax();				// Falsches SbiToken
- 	void NoIf();					// ELSE/ELSE IF ohne IF
- 	void Assign();					// LET
-+	void Attribute();				// Attribute
- 	void Call();					// CALL
- 	void Close();					// CLOSE
- 	void Declare();					// DECLARE
-
-Index: basic/source/inc/token.hxx
-===================================================================
-RCS file: /cvs/script/basic/source/inc/token.hxx,v
-retrieving revision 1.2.44.1
-diff -u -p -u -r1.2.44.1 token.hxx
---- basic/source/inc/token.hxx	20 Jan 2004 10:02:31 -0000	1.2.44.1
-+++ basic/source/inc/token.hxx	4 May 2004 09:08:36 -0000
-@@ -108,7 +108,7 @@ enum SbiToken {
- 	IF, _IN_, INPUT,
- 	LET, LINE, LINEINPUT, LOCAL, LOOP, LPRINT, LSET,
- 	NAME, NEW, NEXT,
--	ON, OPEN, OPTION, IMPLEMENTS,
-+	ON, OPEN, OPTION, ATTRIBUTE, IMPLEMENTS,
- 	PRINT, PRIVATE, PROPERTY, PUBLIC,
- 	REDIM, REM, RESUME, RETURN, RSET,
- 	SELECT, SET, SHARED, STATIC, STEP, STOP, SUB,
diff --git a/applied_patches/0270-basic-prj-build_lst.diff b/applied_patches/0270-basic-prj-build_lst.diff
deleted file mode 100644
index 463e2efee..000000000
--- a/applied_patches/0270-basic-prj-build_lst.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- basic/prj/build.lst	1 Feb 2007 08:11:15 -0000	1.9
-+++ basic/prj/build.lst	6 Jun 2007 09:30:24 -0000
-@@ -1,4 +1,4 @@
--sb	basic	:    l10n offuh svtools sj2 xmlscript framework NULL
-+sb	basic	:    l10n offuh svtools sj2 xmlscript framework oovbaapi NULL
- sb	basic									usr1	-	all	sb_mkout NULL
- sb	basic\inc								nmake	-	all	sb_inc NULL
- sb	basic\source\app						nmake	-	all	sb_app sb_class sb_inc NULL
diff --git a/applied_patches/0234-system-python-uno-path.diff b/applied_patches/0270-system-python-uno-path.diff
similarity index 100%
rename from applied_patches/0234-system-python-uno-path.diff
rename to applied_patches/0270-system-python-uno-path.diff
diff --git a/applied_patches/0235-crash-startup.diff b/applied_patches/0271-crash-startup.diff
similarity index 100%
rename from applied_patches/0235-crash-startup.diff
rename to applied_patches/0271-crash-startup.diff
diff --git a/applied_patches/0236-no-splash-takeover.diff b/applied_patches/0272-no-splash-takeover.diff
similarity index 100%
rename from applied_patches/0236-no-splash-takeover.diff
rename to applied_patches/0272-no-splash-takeover.diff
diff --git a/applied_patches/0237-vcl-better-fallback.diff b/applied_patches/0273-vcl-better-fallback.diff
similarity index 100%
rename from applied_patches/0237-vcl-better-fallback.diff
rename to applied_patches/0273-vcl-better-fallback.diff
diff --git a/applied_patches/0238-hebrew-culmus.diff b/applied_patches/0274-hebrew-culmus.diff
similarity index 100%
rename from applied_patches/0238-hebrew-culmus.diff
rename to applied_patches/0274-hebrew-culmus.diff
diff --git a/applied_patches/0239-psprint-postscript-page-setup.diff b/applied_patches/0275-psprint-postscript-page-setup.diff
similarity index 100%
rename from applied_patches/0239-psprint-postscript-page-setup.diff
rename to applied_patches/0275-psprint-postscript-page-setup.diff
diff --git a/applied_patches/0240-vcl-bitmap2-negative-height.diff b/applied_patches/0276-vcl-bitmap2-negative-height.diff
similarity index 100%
rename from applied_patches/0240-vcl-bitmap2-negative-height.diff
rename to applied_patches/0276-vcl-bitmap2-negative-height.diff
diff --git a/applied_patches/0241-prevent-multiple-window-resize-calls-when-maximised.diff b/applied_patches/0277-prevent-multiple-window-resize-calls-when-maximised.diff
similarity index 100%
rename from applied_patches/0241-prevent-multiple-window-resize-calls-when-maximised.diff
rename to applied_patches/0277-prevent-multiple-window-resize-calls-when-maximised.diff
diff --git a/applied_patches/0242-gui-toolbox-large-icons.diff b/applied_patches/0278-gui-toolbox-large-icons.diff
similarity index 100%
rename from applied_patches/0242-gui-toolbox-large-icons.diff
rename to applied_patches/0278-gui-toolbox-large-icons.diff
diff --git a/applied_patches/0243-tango-icons-default-w32.diff b/applied_patches/0279-tango-icons-default-w32.diff
similarity index 100%
rename from applied_patches/0243-tango-icons-default-w32.diff
rename to applied_patches/0279-tango-icons-default-w32.diff
diff --git a/applied_patches/0244-about-build-ver-readability.diff b/applied_patches/0280-about-build-ver-readability.diff
similarity index 100%
rename from applied_patches/0244-about-build-ver-readability.diff
rename to applied_patches/0280-about-build-ver-readability.diff
diff --git a/applied_patches/0245-fpicker-common-build.diff b/applied_patches/0281-fpicker-common-build.diff
similarity index 100%
rename from applied_patches/0245-fpicker-common-build.diff
rename to applied_patches/0281-fpicker-common-build.diff
diff --git a/applied_patches/0246-fpicker-kde-service.diff b/applied_patches/0282-fpicker-kde-service.diff
similarity index 100%
rename from applied_patches/0246-fpicker-kde-service.diff
rename to applied_patches/0282-fpicker-kde-service.diff
diff --git a/applied_patches/0247-fpicker-kde-dialog.diff b/applied_patches/0283-fpicker-kde-dialog.diff
similarity index 100%
rename from applied_patches/0247-fpicker-kde-dialog.diff
rename to applied_patches/0283-fpicker-kde-dialog.diff
diff --git a/applied_patches/0248-fpicker-kde-partial-kio.diff b/applied_patches/0284-fpicker-kde-partial-kio.diff
similarity index 100%
rename from applied_patches/0248-fpicker-kde-partial-kio.diff
rename to applied_patches/0284-fpicker-kde-partial-kio.diff
diff --git a/applied_patches/0249-fpicker-kde-filter-name.diff b/applied_patches/0285-fpicker-kde-filter-name.diff
similarity index 100%
rename from applied_patches/0249-fpicker-kde-filter-name.diff
rename to applied_patches/0285-fpicker-kde-filter-name.diff
diff --git a/applied_patches/0250-fpicker-kde-resmgr.diff b/applied_patches/0286-fpicker-kde-resmgr.diff
similarity index 100%
rename from applied_patches/0250-fpicker-kde-resmgr.diff
rename to applied_patches/0286-fpicker-kde-resmgr.diff
diff --git a/applied_patches/0251-fpicker-kde-local-media.diff b/applied_patches/0287-fpicker-kde-local-media.diff
similarity index 100%
rename from applied_patches/0251-fpicker-kde-local-media.diff
rename to applied_patches/0287-fpicker-kde-local-media.diff
diff --git a/applied_patches/0252-fpicker-kde-local-media2.diff b/applied_patches/0288-fpicker-kde-local-media2.diff
similarity index 100%
rename from applied_patches/0252-fpicker-kde-local-media2.diff
rename to applied_patches/0288-fpicker-kde-local-media2.diff
diff --git a/applied_patches/0253-fpicker-kde-too-wide.diff b/applied_patches/0289-fpicker-kde-too-wide.diff
similarity index 100%
rename from applied_patches/0253-fpicker-kde-too-wide.diff
rename to applied_patches/0289-fpicker-kde-too-wide.diff
diff --git a/applied_patches/0254-fpicker-kde-dont-overwrite.diff b/applied_patches/0290-fpicker-kde-dont-overwrite.diff
similarity index 100%
rename from applied_patches/0254-fpicker-kde-dont-overwrite.diff
rename to applied_patches/0290-fpicker-kde-dont-overwrite.diff
diff --git a/applied_patches/0290-sc-hacky-handle-boolean.diff b/applied_patches/0290-sc-hacky-handle-boolean.diff
deleted file mode 100644
index 3cbeb7acb..000000000
--- a/applied_patches/0290-sc-hacky-handle-boolean.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: sc/inc/global.hxx
-===================================================================
-RCS file: /cvs/sc/sc/inc/global.hxx,v
-retrieving revision 1.43
-diff -u -p -r1.43 global.hxx
---- sc/inc/global.hxx	8 Sep 2005 17:41:44 -0000	1.43
-+++ sc/inc/global.hxx	9 Nov 2005 17:52:49 -0000
-@@ -234,6 +234,7 @@ const USHORT IDF_HARDATTR   = 0x0020;
- const USHORT IDF_STYLES     = 0x0040;   /// Cell styles.
- const USHORT IDF_OBJECTS    = 0x0080;   /// Drawing objects.
- const USHORT IDF_EDITATTR   = 0x0100;   /// Rich-text attributes.
-+const USHORT IDF_SPECIAL_BOOLEAN = 0x1000;
- const USHORT IDF_ATTRIB     = IDF_HARDATTR | IDF_STYLES;
- const USHORT IDF_CONTENTS   = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA;
- const USHORT IDF_ALL        = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
-Index: sc/source/core/data/column3.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/core/data/column3.cxx,v
-retrieving revision 1.18
-diff -u -p -r1.18 column3.cxx
---- sc/source/core/data/column3.cxx	28 Sep 2005 11:29:59 -0000	1.18
-+++ sc/source/core/data/column3.cxx	9 Nov 2005 17:53:11 -0000
-@@ -781,8 +781,10 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
-     bool bCloneValue    = (nFlags & IDF_VALUE) != 0;
-     bool bCloneDateTime = (nFlags & IDF_DATETIME) != 0;
-     bool bCloneString   = (nFlags & IDF_STRING) != 0;
-+    bool bCloneSpecialBoolean  = (nFlags & IDF_SPECIAL_BOOLEAN) != 0;
-     bool bCloneFormula  = (nFlags & IDF_FORMULA) != 0;
-     bool bCloneNote     = (nFlags & IDF_NOTE) != 0;
-+    bool bForceFormula  = false;
- 
-     ScBaseCell* pNew = 0;
-     ScBaseCell& rSource = *pItems[nIndex].pCell;
-@@ -806,7 +807,18 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
-         break;
- 
- 		case CELLTYPE_FORMULA:
--            if (bCloneFormula)
-+            if ( bCloneSpecialBoolean )
-+            {
-+                ScFormulaCell& rForm = (ScFormulaCell&)rSource;
-+                rtl::OUStringBuffer aBuf;
-+                // #TODO #FIXME do we have a localisation issue here?
-+                rForm.GetFormula( aBuf );
-+                rtl::OUString aVal( aBuf.makeStringAndClear() );
-+                if ( aVal.equalsAscii( "=TRUE()" )
-+                        || aVal.equalsAscii( "=FALSE()" ) )
-+                    bForceFormula = true;
-+            }
-+            if (bForceFormula || bCloneFormula)
-             {
-                 // note will be cloned below
-                 pNew = rSource.CloneWithoutNote( rDestDoc, rDestPos );
diff --git a/applied_patches/0255-fpicker-kde-non-utf8.diff b/applied_patches/0291-fpicker-kde-non-utf8.diff
similarity index 100%
rename from applied_patches/0255-fpicker-kde-non-utf8.diff
rename to applied_patches/0291-fpicker-kde-non-utf8.diff
diff --git a/applied_patches/0291-sc-vba-build-lst.diff b/applied_patches/0291-sc-vba-build-lst.diff
deleted file mode 100644
index 9fe0133fc..000000000
--- a/applied_patches/0291-sc-vba-build-lst.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- sc/prj/build.lst	2007-02-09 16:45:03.000000000 +0000
-+++ sc/prj/build.lst	2007-02-11 12:27:15.000000000 +0000
-@@ -33,7 +33,7 @@ sc	sc\source\ui\undo					nmake	-	all	sc_
- sc	sc\source\ui\unoobj					nmake	-	all	sc_unobj sc_sdi sc_inc NULL
- sc	sc\source\ui\vba					nmake	-	all	sc_vba sc_sdi sc_inc NULL
- sc	sc\source\ui\view					nmake	-	all	sc_view sc_sdi sc_inc NULL
--sc	sc\source\filter\excel					nmake	-	all	sc_excel sc_sdi sc_inc NULL
-+sc	sc\source\filter\excel					nmake	-	all	sc_excel sc_vba sc_sdi sc_inc NULL
- sc	sc\source\filter\ftools					nmake	-	all	sc_ftools sc_sdi sc_inc NULL
- sc	sc\source\filter\lotus					nmake	-	all	sc_lotus sc_sdi sc_inc NULL
- sc	sc\source\filter\qpro					nmake	-	all	sc_qpro sc_sdi sc_inc NULL
diff --git a/applied_patches/0256-fpicker-kde-modal.diff b/applied_patches/0292-fpicker-kde-modal.diff
similarity index 100%
rename from applied_patches/0256-fpicker-kde-modal.diff
rename to applied_patches/0292-fpicker-kde-modal.diff
diff --git a/applied_patches/0292-svx-source-inc-fmundo-hxx.diff b/applied_patches/0292-svx-source-inc-fmundo-hxx.diff
deleted file mode 100644
index 67c099de7..000000000
--- a/applied_patches/0292-svx-source-inc-fmundo-hxx.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: svx/source/inc/fmundo.hxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/inc/fmundo.hxx,v
-retrieving revision 1.10
-diff -u -r1.10 fmundo.hxx
---- svx/source/inc/fmundo.hxx	18 Mar 2005 18:43:50 -0000	1.10
-+++ svx/source/inc/fmundo.hxx	31 Aug 2005 08:40:26 -0000
-@@ -285,7 +285,7 @@
- 
-     void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& _rxContainer, bool _bStartListening ) SAL_THROW(());
-     void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(());
--
-+    ::com::sun::star::uno::Reference< com::sun::star::script::XScriptListener > m_vbaListener;
- public:
- 	// Methoden zur Zuordnung von Controls zu Forms,
- 	// werden von der Seite und der UndoUmgebung genutzt
diff --git a/applied_patches/0257-fpicker-common-scp2.diff b/applied_patches/0293-fpicker-common-scp2.diff
similarity index 100%
rename from applied_patches/0257-fpicker-common-scp2.diff
rename to applied_patches/0293-fpicker-common-scp2.diff
diff --git a/applied_patches/0293-svx-source-form-fmscriptingenv-cxx.diff b/applied_patches/0293-svx-source-form-fmscriptingenv-cxx.diff
deleted file mode 100644
index babc7d47a..000000000
--- a/applied_patches/0293-svx-source-form-fmscriptingenv-cxx.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: svx/source/form/fmscriptingenv.cxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/form/fmscriptingenv.cxx,v
-retrieving revision 1.2
-diff -u -p -r1.2 fmscriptingenv.cxx
---- svx/source/form/fmscriptingenv.cxx	28 Aug 2006 15:01:24 -0000	1.2
-+++ svx/source/form/fmscriptingenv.cxx	26 Oct 2006 11:35:38 -0000
-@@ -280,6 +280,11 @@ namespace svxform
-     void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException)
-     {
-         ::osl::ClearableMutexGuard aGuard( m_aMutex );
-+       static const ::rtl::OUString vbaInterOp =
-+           ::rtl::OUString::createFromAscii("VBAInterop");
-+       if ( _rEvent.ScriptType.equals(vbaInterOp) )
-+           return; // not handled here
-+	
-         if ( impl_isDisposed_nothrow() )
-             return;
- 
diff --git a/applied_patches/0258-fpicker-kde-3layer.diff b/applied_patches/0294-fpicker-kde-3layer.diff
similarity index 100%
rename from applied_patches/0258-fpicker-kde-3layer.diff
rename to applied_patches/0294-fpicker-kde-3layer.diff
diff --git a/applied_patches/0294-svx-source-form-makefile.diff b/applied_patches/0294-svx-source-form-makefile.diff
deleted file mode 100644
index 48f3305b6..000000000
--- a/applied_patches/0294-svx-source-form-makefile.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: svx/source/form/makefile.mk
-===================================================================
-RCS file: /cvs/graphics/svx/source/form/makefile.mk,v
-retrieving revision 1.25
-diff -u -r1.25 makefile.mk
---- svx/source/form/makefile.mk	5 Jan 2005 12:22:30 -0000	1.25
-+++ svx/source/form/makefile.mk	31 Aug 2005 08:39:31 -0000
-@@ -74,6 +74,10 @@
- 
- # --- Files --------------------------------------------------------
- 
-+.IF "$(ENABLE_VBA)"=="YES"
-+	CDEFS+=-DENABLE_VBA
-+.ENDIF
-+
- SRS1NAME=form
- SRC1FILES= \
- 	fmexpl.src 		\
diff --git a/applied_patches/0259-fpicker-kde-less-threads.diff b/applied_patches/0295-fpicker-kde-less-threads.diff
similarity index 100%
rename from applied_patches/0259-fpicker-kde-less-threads.diff
rename to applied_patches/0295-fpicker-kde-less-threads.diff
diff --git a/applied_patches/0295-svx-source-form-fmundo-cxx.diff b/applied_patches/0295-svx-source-form-fmundo-cxx.diff
deleted file mode 100644
index b9a37a6d3..000000000
--- a/applied_patches/0295-svx-source-form-fmundo-cxx.diff
+++ /dev/null
@@ -1,127 +0,0 @@
-diff --git svx/source/form/fmundo.cxx svx/source/form/fmundo.cxx
-index ee1d592..f3b5c3d 100644
---- svx/source/form/fmundo.cxx
-+++ svx/source/form/fmundo.cxx
-@@ -86,6 +86,90 @@ using namespace ::com::sun::star::reflection;
- using namespace ::com::sun::star::form::binding;
- using namespace ::svxform;
- 
-+
-+#include <com/sun/star/script/XScriptListener.hdl>
-+#include <comphelper/processfactory.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+
-+typedef cppu::WeakImplHelper1< XScriptListener > ScriptEventListener_BASE;
-+class ScriptEventListenerWrapper : public ScriptEventListener_BASE
-+{
-+public:
-+	ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException ) : pModel(&_rModel) 
-+	{
-+		Reference < XPropertySet > xProps(
-+			::comphelper::getProcessServiceFactory(), UNO_QUERY );
-+		if ( xProps.is() )
-+		{
-+			Reference< XComponentContext > xCtx( xProps->getPropertyValue(
-+				rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY );
-+			if ( xCtx.is() )
-+			{
-+				Reference< XMultiComponentFactory > xMFac( 
-+					xCtx->getServiceManager(), UNO_QUERY );
-+				if ( xMFac.is() )
-+				{
-+					m_vbaListener.set( xMFac->createInstanceWithContext( 
-+						rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-+							"ooo.vba.EventListener"  ) ), xCtx ), 
-+								UNO_QUERY_THROW );
-+				}
-+			}
-+		}
-+	}
-+    // XEventListener
-+    virtual void SAL_CALL disposing(const EventObject& ) throw( RuntimeException ){}
-+
-+    // XScriptListener
-+    virtual void SAL_CALL firing(const  ScriptEvent& evt) throw(RuntimeException)	
-+	{
-+		setModel();
-+		if ( m_vbaListener.is() )
-+		{
-+			m_vbaListener->firing( evt );	
-+		}
-+	}
-+
-+    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw( com::sun::star::reflection::InvocationTargetException, RuntimeException)
-+	{
-+		setModel();
-+		if ( m_vbaListener.is() )
-+		{
-+			return m_vbaListener->approveFiring( evt );	
-+		}
-+		return Any();	
-+	}
-+    
-+private:
-+	void setModel()
-+	{
-+		Reference< XPropertySet > xProps( m_vbaListener, UNO_QUERY );
-+		if ( xProps.is() )
-+		{
-+			try
-+			{
-+				SfxObjectShellRef xObjSh = pModel->GetObjectShell();
-+				if ( xObjSh.Is() && m_vbaListener.is() )
-+				{
-+					Any aVal;
-+					aVal <<= xObjSh->GetModel();
-+					xProps->setPropertyValue( 
-+						::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) ), 
-+						aVal );
-+				}
-+			}
-+			catch( Exception& e )
-+			{
-+				//swallow any errors
-+			}
-+		}
-+	}
-+    FmFormModel* pModel;
-+	Reference< XScriptListener > m_vbaListener;
-+
-+
-+};
-+
- //------------------------------------------------------------------------------
- // some helper structs for caching property infos
- //------------------------------------------------------------------------------
-@@ -128,6 +212,13 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
-                    ,m_bDisposed( false )
- {
- 	DBG_CTOR(FmXUndoEnvironment,NULL);
-+	try
-+	{
-+		m_vbaListener =  new ScriptEventListenerWrapper( _rModel );
-+	}
-+	catch( Exception& )
-+	{
-+	}
- }
- 
- //------------------------------------------------------------------------------
-@@ -752,9 +843,17 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r
- 	    if ( xManager.is() )
- 	    {
-             if ( _bStartListening )
-+            {
- 		        m_pScriptingEnv->registerEventAttacherManager( xManager );
-+                if ( m_vbaListener.is() )
-+                    xManager->addScriptListener( m_vbaListener );
-+            }
-             else
-+            {
- 		        m_pScriptingEnv->revokeEventAttacherManager( xManager );
-+                if ( m_vbaListener.is() )
-+                    xManager->removeScriptListener( m_vbaListener );
-+            }
- 		}
- 
-         // also handle all children of this element
diff --git a/applied_patches/0260-default-evolution-database.diff b/applied_patches/0296-default-evolution-database.diff
similarity index 100%
rename from applied_patches/0260-default-evolution-database.diff
rename to applied_patches/0296-default-evolution-database.diff
diff --git a/applied_patches/0296-vbaevents-services-build.diff b/applied_patches/0296-vbaevents-services-build.diff
deleted file mode 100644
index 063f0a99f..000000000
--- a/applied_patches/0296-vbaevents-services-build.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- scripting/prj/build.lst	2007-02-12 17:34:17.000000000 +0000
-+++ scripting/prj/build.lst	2007-02-11 17:11:40.000000000 +0000
-@@ -1,13 +1,14 @@
--tc	scripting	:	bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
-+tc	scripting	:	oovbaapi bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
- tc	scripting									usr1	-	all	tc1_mkout NULL
- tc	scripting\inc								nmake	-	all	tc1_inc NULL
- tc	scripting\source\provider				nmake	-	all	tc1_scriptingprovider tc1_inc NULL
- tc	scripting\source\basprov				nmake	-	all	tc1_scriptingbasprov tc1_inc NULL
-+tc	scripting\source\vbaevents				nmake	-	all	tc1_scriptingvbaevents tc1_inc NULL
- tc	scripting\source\dlgprov				nmake	-	all	tc1_scriptingdlgprov tc1_inc NULL
- tc	scripting\source\stringresource			nmake	-	all	tc1_scriptingstringresource tc1_inc NULL
- tc	scripting\source\pyprov				nmake	-	all	tc1_scriptingpyprov tc1_inc NULL
- tc	scripting\source\protocolhandler			nmake	-	all	tc1_scriptingprotocolhandler tc1_scriptingprovider tc1_inc NULL
- tc	scripting\java						nmake	-	all	tc1_scriptingjava tc1_scriptingprovider tc1_scriptingprotocolhandler NULL
- tc	scripting\examples\java				nmake	-	all	tc1_scriptingexamplesjava tc1_scriptingjava  NULL
- tc	scripting\examples				nmake	-	all	tc1_scriptingexamples tc1_scriptingexamplesjava  tc1_inc NULL
--tc	scripting\util						nmake	-	all	tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL
-+tc	scripting\util						nmake	-	all	tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingvbaevents tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL
diff --git a/applied_patches/0261-default-evo-column-mapping.diff b/applied_patches/0297-default-evo-column-mapping.diff
similarity index 100%
rename from applied_patches/0261-default-evo-column-mapping.diff
rename to applied_patches/0297-default-evo-column-mapping.diff
diff --git a/applied_patches/0297-scp_vba_uno_service.diff b/applied_patches/0297-scp_vba_uno_service.diff
deleted file mode 100644
index 35ab74484..000000000
--- a/applied_patches/0297-scp_vba_uno_service.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- scp2/source/ooo/file_library_ooo.scp	2008-04-30 11:44:31.000000000 +0100
-+++ scp2/source/ooo/file_library_ooo.scp	2008-04-30 11:56:14.000000000 +0100
-@@ -67,6 +67,20 @@ File gid_File_Lib_Basprov
-   #endif
- End
- 
-+#ifdef ENABLE_VBA
-+File gid_File_Lib_Vbaevent
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,UNO_COMPONENT);
-+    RegistryID = gid_Starregistry_Services_Rdb;
-+    Dir = gid_Dir_Program;
-+  #ifdef UNX
-+    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
-+  #else
-+    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
-+  #endif
-+End
-+#endif // ENABLE_VBA
-+
- STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib)
- 
- File gid_File_Lib_Cached1
diff --git a/applied_patches/0262-buildfix-evo1-vs-evo2.diff b/applied_patches/0298-buildfix-evo1-vs-evo2.diff
similarity index 100%
rename from applied_patches/0262-buildfix-evo1-vs-evo2.diff
rename to applied_patches/0298-buildfix-evo1-vs-evo2.diff
diff --git a/applied_patches/0298-vba-support-export-palette.diff b/applied_patches/0298-vba-support-export-palette.diff
deleted file mode 100644
index ff06b79a2..000000000
--- a/applied_patches/0298-vba-support-export-palette.diff
+++ /dev/null
@@ -1,95 +0,0 @@
---- sc/source/filter/inc/xistyle.hxx.old	2009-04-02 10:44:58.000000000 +0000
-+++ sc/source/filter/inc/xistyle.hxx	2009-04-06 16:41:58.000000000 +0000
-@@ -72,8 +72,10 @@ public:
-     void                ReadPalette( XclImpStream& rStrm );
- 
- private:
-+    void ExportPalette();
-     typedef ::std::vector< ColorData > ColorDataVec;
-     ColorDataVec        maColorTable;       /// Colors read from file.
-+    const XclImpRoot&             mrRoot;
- };
- 
- // FONT record - font information =============================================
---- sc/source/filter/excel/xistyle.cxx.old	2009-04-02 10:44:55.000000000 +0000
-+++ sc/source/filter/excel/xistyle.cxx	2009-04-06 16:41:58.000000000 +0000
-@@ -68,10 +68,70 @@
- #include "root.hxx"
- #include "colrowst.hxx"
- 
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/container/XIndexAccess.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+using namespace ::com::sun::star;
-+
-+typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE;
-+typedef ::std::vector< ColorData > ColorDataVec;
-+
-+class PaletteIndex : public XIndexAccess_BASE
-+{
-+public:
-+    PaletteIndex( const ColorDataVec& rColorDataTable ) : maColorData( rColorDataTable ) {}
-+
-+    // Methods XIndexAccess
-+    virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException)
-+    {
-+         return  maColorData.size();
-+    }
-+
-+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+        //--Index;  // apparently the palette is already 1 based
-+        return uno::makeAny( sal_Int32( maColorData[ Index ] ) );
-+    }
-+
-+    // Methods XElementAcess
-+    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
-+    {
-+        return ::getCppuType( (sal_Int32*)0 );
-+    }
-+    virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException)
-+    {
-+        return (maColorData.size() > 0);
-+    }
-+
-+private:
-+    ColorDataVec        maColorData; 
-+};
-+
-+void
-+XclImpPalette::ExportPalette()
-+{
-+    if( SfxObjectShell* pDocShell = mrRoot.GetDocShell() )
-+    {
-+        // copy values in color palette
-+        sal_Int16 nColors =  maColorTable.size();
-+        ColorDataVec aColors;
-+        aColors.resize( nColors );
-+        for( sal_uInt16 nIndex = 0; nIndex < nColors; ++nIndex )
-+            aColors[ nIndex ] = GetColorData( nIndex );
-+
-+        uno::Reference< beans::XPropertySet > xProps( pDocShell->GetModel(), uno::UNO_QUERY );
-+        if ( xProps.is() )
-+        {
-+            uno::Reference< container::XIndexAccess > xIndex( new PaletteIndex( aColors ) ); 
-+            xProps->setPropertyValue( CREATE_OUSTRING("ColorPalette"), uno::makeAny( xIndex ) ); 
-+        }
-+    }
-+            
-+}
- // PALETTE record - color information =========================================
- 
- XclImpPalette::XclImpPalette( const XclImpRoot& rRoot ) :
--    XclDefaultPalette( rRoot )
-+    XclDefaultPalette( rRoot ), mrRoot( rRoot )
- {
- }
- 
-@@ -105,6 +165,7 @@ void XclImpPalette::ReadPalette( XclImpS
-         rStrm >> aColor;
-         maColorTable[ nIndex ] = aColor.GetColor();
-     }
-+    ExportPalette();
- }
- 
- // FONT record - font information =============================================
diff --git a/applied_patches/0263-default-evo2-ab.diff b/applied_patches/0299-default-evo2-ab.diff
similarity index 100%
rename from applied_patches/0263-default-evo2-ab.diff
rename to applied_patches/0299-default-evo2-ab.diff
diff --git a/applied_patches/0299-vba-get-nonfiltered-range-selection.diff b/applied_patches/0299-vba-get-nonfiltered-range-selection.diff
deleted file mode 100644
index f8596b6be..000000000
--- a/applied_patches/0299-vba-get-nonfiltered-range-selection.diff
+++ /dev/null
@@ -1,178 +0,0 @@
-diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
-index 38369c4..83c8eac 100644
---- sc/inc/unonames.hxx
-+++ sc/inc/unonames.hxx
-@@ -528,6 +528,7 @@
- #define SC_UNO_ZOOMTYPE             "ZoomType"
- #define SC_UNO_ZOOMVALUE            "ZoomValue"
- #define SC_UNO_UPDTEMPL             "UpdateFromTemplate"
-+#define SC_UNO_FILTERED_RANGE_SELECTION       "FilteredRangeSelection"
- /*Stampit enable/disable print cancel */
- #define SC_UNO_ALLOWPRINTJOBCANCEL  "AllowPrintJobCancel"
- 
-diff --git sc/inc/viewuno.hxx sc/inc/viewuno.hxx
-index 6d72b24..8278da9 100644
---- sc/inc/viewuno.hxx
-+++ sc/inc/viewuno.hxx
-@@ -198,6 +198,7 @@ private:
- 	XMouseClickHandlerArr_Impl              aMouseClickHandlers;
- 	XActivationEventListenerArr_Impl        aActivationListeners;
- 	sal_Bool								bDrawSelModeSet;
-+    sal_Bool                                bFilteredRangeSelection;
- 
- 	ScViewPaneObj*			GetObjectByIndex_Impl(USHORT nIndex) const;
-     INT16                   GetZoom(void) const;
-diff --git sc/source/ui/unoobj/viewuno.cxx sc/source/ui/unoobj/viewuno.cxx
-index 760431f..75def7e 100644
---- sc/source/ui/unoobj/viewuno.cxx
-+++ sc/source/ui/unoobj/viewuno.cxx
-@@ -468,7 +468,8 @@ void SAL_CALL ScViewPaneObj::release() throw()
- //UNUSED2008-05  aPropSet( lcl_GetViewOptPropertyMap() ),
- //UNUSED2008-05  aMouseClickHandlers( 0 ),
- //UNUSED2008-05  aActivationListeners( 0 ),
--//UNUSED2008-05  bDrawSelModeSet(sal_False)
-+//UNUSED2008-05  bDrawSelModeSet(sal_False),
-+//UNUSED2008-05  bFilteredRangeSelection(sal_True)
- //UNUSED2008-05  {
- //UNUSED2008-05  }
- 
-@@ -478,7 +479,8 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) :
- 	aPropSet( lcl_GetViewOptPropertyMap() ),
- 	aMouseClickHandlers( 0 ),
- 	aActivationListeners( 0 ),
--	bDrawSelModeSet(sal_False)
-+	bDrawSelModeSet(sal_False),
-+    bFilteredRangeSelection(sal_True)
- {
- 	//!	Listening oder so
- }
-@@ -883,6 +885,15 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException)
- 
- 		ScRange aRange;
-         ScMarkType eMarkType = pViewData->GetSimpleArea(aRange);
-+
-+        if (!bFilteredRangeSelection)
-+        {
-+            if (eMarkType == SC_MARK_SIMPLE_FILTERED)
-+                eMarkType = SC_MARK_SIMPLE;
-+            else if (eMarkType == SC_MARK_FILTERED)
-+                eMarkType = SC_MARK_MULTI;
-+        }
-+
- 		if ( nTabs == 1 && (eMarkType == SC_MARK_SIMPLE) )
- 		{
- 			if (aRange.aStart == aRange.aEnd)
-@@ -1728,6 +1739,12 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
- 	ScUnoGuard aGuard;
- 	String aString(aPropertyName);
- 
-+    if ( aString.EqualsAscii(SC_UNO_FILTERED_RANGE_SELECTION) )
-+    {
-+        bFilteredRangeSelection = ScUnoHelpFunctions::GetBoolFromAny(aValue);
-+        return;
-+    }
-+
- 	ScTabViewShell* pViewSh = GetViewShell();
- 	if (pViewSh)
- 	{
-@@ -1848,6 +1865,12 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aProperty
- 	String aString(aPropertyName);
- 	uno::Any aRet;
- 
-+    if ( aString.EqualsAscii(SC_UNO_FILTERED_RANGE_SELECTION) )
-+    {
-+        ScUnoHelpFunctions::SetBoolInAny(aRet, bFilteredRangeSelection);
-+        return aRet;
-+    }
-+
- 	ScTabViewShell* pViewSh = GetViewShell();
- 	if (pViewSh)
- 	{
-diff --git sc/source/ui/vba/vbaapplication.cxx sc/source/ui/vba/vbaapplication.cxx
-index f126f57..431090c 100644
---- sc/source/ui/vba/vbaapplication.cxx
-+++ sc/source/ui/vba/vbaapplication.cxx
-@@ -84,10 +84,16 @@
- 
- #include "convuno.hxx"
- #include "cellsuno.hxx"
-+#include "miscuno.hxx"
-+#include "unonames.hxx"
- #include "docsh.hxx"
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
-+using ::com::sun::star::uno::Reference;
-+using ::com::sun::star::uno::UNO_QUERY_THROW;
-+using ::com::sun::star::uno::UNO_QUERY;
-+using ::rtl::OUString;
- 
- // Enable our own join detection for Intersection and Union
- // should be more efficient than using ScRangeList::Join ( because
-@@ -155,11 +161,31 @@ uno::Any SAL_CALL
- ScVbaApplication::getSelection() throw (uno::RuntimeException)
- {
-     OSL_TRACE("** ScVbaApplication::getSelection() ** ");
--    uno::Reference< lang::XServiceInfo > xServiceInfo( getCurrentDocument()->getCurrentSelection(), uno::UNO_QUERY_THROW );
--    rtl::OUString sImpementaionName = xServiceInfo->getImplementationName();
--    if( sImpementaionName.equalsIgnoreAsciiCaseAscii("com.sun.star.drawing.SvxShapeCollection") )
-+
-+    Reference< view::XSelectionSupplier > xSelSupp( getCurrentDocument()->getCurrentController(), UNO_QUERY_THROW );
-+    Reference< beans::XPropertySet > xPropSet( xSelSupp, UNO_QUERY_THROW );
-+    OUString aPropName = OUString::createFromAscii( SC_UNO_FILTERED_RANGE_SELECTION );
-+    uno::Any aOldVal = xPropSet->getPropertyValue( aPropName );
-+    uno::Any any;
-+    any <<= sal_False;
-+    xPropSet->setPropertyValue( aPropName, any );
-+    uno::Reference< uno::XInterface > aSelection = ScUnoHelpFunctions::AnyToInterface(
-+        xSelSupp->getSelection() );
-+    xPropSet->setPropertyValue( aPropName, aOldVal );
-+
-+    if (!aSelection.is())
-+    {
-+        throw uno::RuntimeException( 
-+            rtl::OUString::createFromAscii("failed to obtain current selection"), 
-+            uno::Reference< uno::XInterface >() );
-+    }
-+
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( aSelection, uno::UNO_QUERY_THROW );
-+    rtl::OUString sImplementationName = xServiceInfo->getImplementationName();
-+
-+    if( sImplementationName.equalsIgnoreAsciiCaseAscii("com.sun.star.drawing.SvxShapeCollection") )
-     {
--        uno::Reference< drawing::XShapes > xShapes( getCurrentDocument()->getCurrentSelection(), uno::UNO_QUERY_THROW );
-+        uno::Reference< drawing::XShapes > xShapes( aSelection, uno::UNO_QUERY_THROW );
-         uno::Reference< container::XIndexAccess > xIndexAccess( xShapes, uno::UNO_QUERY_THROW );
-         uno::Reference< drawing::XShape > xShape( xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW );
-     	// if ScVbaShape::getType( xShape ) == office::MsoShapeType::msoAutoShape
-@@ -170,7 +196,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
-     		uno::Reference< lang::XServiceInfo > xShapeServiceInfo( xShape, uno::UNO_QUERY_THROW );
-     		if ( xShapeServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.Text" ) ) )  )
-     		{
--            		return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, getCurrentDocument() ) ) );
-+                return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, getCurrentDocument() ) ) );
-     		}
-     	}
-         return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, ScVbaShape::getType( xShape ) ) ) );
-@@ -178,10 +204,10 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
-     else if( xServiceInfo->supportsService( rtl::OUString::createFromAscii("com.sun.star.sheet.SheetCellRange")) ||
-              xServiceInfo->supportsService( rtl::OUString::createFromAscii("com.sun.star.sheet.SheetCellRanges")))
-     {
--	    uno::Reference< table::XCellRange > xRange( getCurrentDocument()->getCurrentSelection(), ::uno::UNO_QUERY);
-+	    uno::Reference< table::XCellRange > xRange( aSelection, ::uno::UNO_QUERY);
- 	    if ( !xRange.is() )
- 	    {
--		    uno::Reference< sheet::XSheetCellRangeContainer > xRanges( getCurrentDocument()->getCurrentSelection(), ::uno::UNO_QUERY);
-+		    uno::Reference< sheet::XSheetCellRangeContainer > xRanges( aSelection, ::uno::UNO_QUERY);
- 		    if ( xRanges.is() )
- 			    return uno::makeAny( uno::Reference< excel::XRange >( new ScVbaRange( this, mxContext, xRanges ) ) );
- 
-@@ -190,7 +216,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
-     }
-     else
-     {
--        throw uno::RuntimeException( sImpementaionName + rtl::OUString::createFromAscii(" donot be surpported"), uno::Reference< uno::XInterface >() );
-+        throw uno::RuntimeException( sImplementationName + rtl::OUString::createFromAscii(" not surpported"), uno::Reference< uno::XInterface >() );
-     }
- }
- 
diff --git a/applied_patches/0264-lwp-filter-component.diff b/applied_patches/0300-lwp-filter-component.diff
similarity index 100%
rename from applied_patches/0264-lwp-filter-component.diff
rename to applied_patches/0300-lwp-filter-component.diff
diff --git a/applied_patches/0300-vba-allow-ranges-for-cell-functions.diff b/applied_patches/0300-vba-allow-ranges-for-cell-functions.diff
deleted file mode 100644
index cfa38a9fa..000000000
--- a/applied_patches/0300-vba-allow-ranges-for-cell-functions.diff
+++ /dev/null
@@ -1,223 +0,0 @@
---- sc/source/core/tool/interpr4.cxx.old	2009-04-06 16:41:48.000000000 +0000
-+++ sc/source/core/tool/interpr4.cxx	2009-04-06 16:41:58.000000000 +0000
-@@ -36,10 +36,12 @@
- #include <sfx2/app.hxx>
- #include <sfx2/docfile.hxx>
- #include <sfx2/objsh.hxx>
-+#include <sfx2/docfilt.hxx>
- #include <basic/sbmeth.hxx>
- #include <basic/sbmod.hxx>
- #include <basic/sbstar.hxx>
- #include <basic/sbx.hxx>
-+#include <basic/sbuno.hxx>
- #include <svtools/zforlist.hxx>
- #include <tools/urlobj.hxx>
- #include <rtl/logfile.hxx>
-@@ -48,6 +50,7 @@
- #include <signal.h>
- 
- #include <com/sun/star/table/XCellRange.hpp>
-+#include <comphelper/processfactory.hxx>
- 
- #include "interpre.hxx"
- #include "global.hxx"
-@@ -2503,7 +2506,38 @@ void ScInterpreter::ScMissing()
-     PushTempToken( new FormulaMissingToken );
- }
- 
--
-+bool
-+lcl_setVBARange( ScRange& aRange, ScDocument* pDok, SbxVariable* pPar )
-+{
-+	bool bOk = false;
-+	try
-+	{
-+		uno::Reference< uno::XInterface > xVBARange;
-+		uno::Reference< lang::XMultiComponentFactory > xSMgr( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+		uno::Reference< beans::XPropertySet > xProps( xSMgr, uno::UNO_QUERY_THROW );
-+		uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
-+		uno::Reference<table::XCellRange> xCellRange = ScCellRangeObj::CreateRangeFromDoc( pDok, aRange );
-+		// hmm probably better not to have to include the vba generated headers
-+		// here, but... if they ever become always available certainly the
-+		// line below is more coder friendly
-+		//xRange = ooo::vba::excel::Range::createRangeFromXCellRange( xCtx , uno::Reference< ooo::vba::XHelperInterface >(), xCellRange );	
-+		uno::Sequence< uno::Any > aArgs(2);
-+		aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
-+		aArgs[1] = uno::Any( xCellRange );
-+		xVBARange = xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Range") ), aArgs, xCtx  );
-+		if ( xVBARange.is() )
-+		{
-+			String sDummy(RTL_CONSTASCII_USTRINGPARAM("A-Range") );
-+			SbxObjectRef aObj = GetSbUnoObject( sDummy, uno::Any( xVBARange ) );
-+			SetSbUnoObjectDfltPropName( aObj );
-+			bOk = pPar->PutObject( aObj );
-+		}
-+	}
-+	catch( uno::Exception& )
-+	{
-+	}
-+	return bOk;
-+}
- void ScInterpreter::ScMacro()
- {
-     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScMacro" );
-@@ -2542,6 +2576,7 @@ void ScInterpreter::ScMacro()
- 
-     SbMethod* pMethod = (SbMethod*)pVar;
-     SbModule* pModule = pMethod->GetModule();
-+	bool bUseVBAObjects = pModule->IsVBACompat();
-     SbxObject* pObject = pModule->GetParent();
-     DBG_ASSERT(pObject->IsA(TYPE(StarBASIC)), "Kein Basic gefunden!");
-     String aMacroStr = pObject->GetName();
-@@ -2551,7 +2586,13 @@ void ScInterpreter::ScMacro()
-     aMacroStr += pMethod->GetName();
-     String aBasicStr;
-     if (pObject->GetParent())
-+	{
-         aBasicStr = pObject->GetParent()->GetName();    // Dokumentenbasic
-+		const SfxFilter* pFilter = NULL;
-+		SfxMedium* pMedium = pDok->GetDocumentShell()->GetMedium();
-+		if ( pMedium )
-+			pFilter = pMedium->GetFilter();
-+	}
-     else
-         aBasicStr = SFX_APP()->GetName();               // Applikationsbasic
- 
-@@ -2575,7 +2616,13 @@ void ScInterpreter::ScMacro()
-             {
-                 ScAddress aAdr;
-                 PopSingleRef( aAdr );
--                bOk = SetSbxVariable( pPar, aAdr );
-+				if ( bUseVBAObjects )
-+				{
-+					ScRange aRange( aAdr );
-+					bOk = lcl_setVBARange( aRange, pDok, pPar );
-+				}
-+				else
-+					bOk = SetSbxVariable( pPar, aAdr );
-             }
-             break;
-             case svDoubleRef:
-@@ -2594,24 +2641,32 @@ void ScInterpreter::ScMacro()
-                 }
-                 else
-                 {
--                    SbxDimArrayRef refArray = new SbxDimArray;
--                    refArray->AddDim32( 1, nRow2 - nRow1 + 1 );
--                    refArray->AddDim32( 1, nCol2 - nCol1 + 1 );
--                    ScAddress aAdr( nCol1, nRow1, nTab1 );
--                    for( SCROW nRow = nRow1; bOk && nRow <= nRow2; nRow++ )
--                    {
--                        aAdr.SetRow( nRow );
--                        INT32 nIdx[ 2 ];
--                        nIdx[ 0 ] = nRow-nRow1+1;
--                        for( SCCOL nCol = nCol1; bOk && nCol <= nCol2; nCol++ )
--                        {
--                            aAdr.SetCol( nCol );
--                            nIdx[ 1 ] = nCol-nCol1+1;
--                            SbxVariable* p = refArray->Get32( nIdx );
--                            bOk = SetSbxVariable( p, aAdr );
-+					if ( bUseVBAObjects )
-+                    {
-+						ScRange aRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
-+						bOk = lcl_setVBARange( aRange, pDok, pPar );
-+					}
-+					else
-+					{
-+						SbxDimArrayRef refArray = new SbxDimArray;
-+						refArray->AddDim32( 1, nRow2 - nRow1 + 1 );
-+						refArray->AddDim32( 1, nCol2 - nCol1 + 1 );
-+						ScAddress aAdr( nCol1, nRow1, nTab1 );
-+						for( SCROW nRow = nRow1; bOk && nRow <= nRow2; nRow++ )
-+						{
-+							aAdr.SetRow( nRow );
-+							INT32 nIdx[ 2 ];
-+							nIdx[ 0 ] = nRow-nRow1+1;
-+							for( SCCOL nCol = nCol1; bOk && nCol <= nCol2; nCol++ )
-+							{
-+								aAdr.SetCol( nCol );
-+								nIdx[ 1 ] = nCol-nCol1+1;
-+								SbxVariable* p = refArray->Get32( nIdx );
-+								bOk = SetSbxVariable( p, aAdr );
-+							}
-                         }
-+						pPar->PutObject( refArray );
-                     }
--                    pPar->PutObject( refArray );
-                 }
-             }
-             break;
---- basic/inc/basic/sbmod.hxx.old	2009-04-02 10:49:18.000000000 +0000
-+++ basic/inc/basic/sbmod.hxx	2009-04-06 16:41:58.000000000 +0000
-@@ -66,6 +66,7 @@ protected:
- 	SbiImage*		pImage;				// das Image
- 	SbiBreakpoints*	pBreaks;			// Breakpoints
- 	SbClassData*	pClassData;
-+	bool mbVBACompat;
- 
- 	void			StartDefinitions();
- 	SbMethod*		GetMethod( const String&, SbxDataType );
-@@ -126,6 +127,7 @@ public:
- 	BOOL LoadBinaryData( SvStream& );
- 	BOOL ExceedsLegacyModuleSize();
- 	void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
-+        bool IsVBACompat() { return mbVBACompat; }
- };
- 
- #ifndef __SB_SBMODULEREF_HXX
---- basic/source/classes/sbxmod.cxx.old	2009-04-02 10:49:17.000000000 +0000
-+++ basic/source/classes/sbxmod.cxx	2009-04-06 16:41:58.000000000 +0000
-@@ -92,7 +92,7 @@ SV_IMPL_VARARR(HighlightPortions, Highli
- 
- SbModule::SbModule( const String& rName )
- 		 : SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASICModule") ) ),
--		   pImage( NULL ), pBreaks( NULL ), pClassData( NULL )
-+		   pImage( NULL ), pBreaks( NULL ), pClassData( NULL ), mbVBACompat( false )
- {
- 	SetName( rName );
- 	SetFlag( SBX_EXTSEARCH | SBX_GBLSEARCH );
-@@ -399,8 +399,9 @@ void SbModule::SetSource32( const ::rtl:
- 				if( eCurTok == OPTION )
- 				{
- 					eCurTok = aTok.Next();
-+					mbVBACompat = ( eCurTok == VBASUPPORT ) && ( aTok.Next() == NUMBER ) && ( aTok.GetDbl()== 1 );
- 					if( eCurTok == COMPATIBLE
--					|| ( ( eCurTok == VBASUPPORT ) && ( aTok.Next() == NUMBER ) && ( aTok.GetDbl()== 1 ) ) )
-+					|| mbVBACompat )
- 						aTok.SetCompatible( true );
- 				}
- 			}
---- basic/source/classes/sbunoobj.cxx.old	2009-04-02 10:49:17.000000000 +0000
-+++ basic/source/classes/sbunoobj.cxx	2009-04-06 16:41:58.000000000 +0000
-@@ -153,6 +153,21 @@ SbxVariable* getDefaultProp( SbxVariable
- 	return pDefaultProp;
- }
- 
-+void SetSbUnoObjectDfltPropName( SbxObject* pObj )
-+{
-+	SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*) pObj);
-+	if ( pUnoObj )
-+	{
-+		String sDfltPropName;
-+		
-+		if ( SbUnoObject::getDefaultPropName( pUnoObj, sDfltPropName ) )
-+		{
-+			OSL_TRACE("SetSbUnoObjectDfltPropName setting dflt prop for %s", rtl::OUStringToOString( pObj->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+			pUnoObj->SetDfltProperty( sDfltPropName );
-+		}
-+	}
-+}
-+
- Reference< XComponentContext > getComponentContext_Impl( void )
- {
-     static Reference< XComponentContext > xContext;
---- basic/inc/basic/sbuno.hxx.old	2009-04-02 10:49:18.000000000 +0000
-+++ basic/inc/basic/sbuno.hxx	2009-04-06 16:41:58.000000000 +0000
-@@ -41,6 +41,7 @@ SbxObjectRef GetSbUnoObject( const Strin
- 
- // Force creation of all properties for debugging
- void createAllObjectProperties( SbxObject* pObj );
-+void SetSbUnoObjectDfltPropName( SbxObject* pObj );
- 
- ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
- 
diff --git a/applied_patches/0265-cws-ooo11lotusfilter-lwp-filter-component.diff b/applied_patches/0301-cws-ooo11lotusfilter-lwp-filter-component.diff
similarity index 100%
rename from applied_patches/0265-cws-ooo11lotusfilter-lwp-filter-component.diff
rename to applied_patches/0301-cws-ooo11lotusfilter-lwp-filter-component.diff
diff --git a/applied_patches/0301-vba-error-object.diff b/applied_patches/0301-vba-error-object.diff
deleted file mode 100644
index 1d3af0729..000000000
--- a/applied_patches/0301-vba-error-object.diff
+++ /dev/null
@@ -1,379 +0,0 @@
---- basic/source/runtime/stdobj.cxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/runtime/stdobj.cxx	2009-04-06 16:41:58.000000000 +0000
-@@ -36,6 +36,7 @@
- #include <basic/sbstdobj.hxx>
- #include "rtlproto.hxx"
- #include "sbintern.hxx"
-+#include "errobject.hxx"
- 
- // Das nArgs-Feld eines Tabelleneintrags ist wie folgt verschluesselt:
- // Zur Zeit wird davon ausgegangen, dass Properties keine Parameter
-@@ -655,6 +656,11 @@ SbiStdObject::~SbiStdObject()
- 
- SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
- {
-+	// #TODO #FIXME hack for substituting ooo-basic Err with vba-ish
-+	// ErrObject object
-+	static String sErr( RTL_CONSTASCII_USTRINGPARAM("Err") );
-+	if (  rName.EqualsIgnoreCaseAscii( sErr ) ) 
-+		return SbxErrObject::getErrObject();
- 	// Bereits eingetragen?
- 	SbxVariable* pVar = SbxObject::Find( rName, t );
- 	if( !pVar )
---- basic/source/classes/makefile.mk.old	2009-04-02 10:49:17.000000000 +0000
-+++ basic/source/classes/makefile.mk	2009-04-06 16:41:58.000000000 +0000
-@@ -41,6 +41,14 @@ ENABLE_EXCEPTIONS=TRUE
- 
- .INCLUDE :  settings.mk
- 
-+ALLTAR : \
-+        $(MISC)$/$(TARGET).don \
-+        $(SLOTARGET)
-+
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+        echo $@
-+
- # --- Allgemein -----------------------------------------------------------
- 
- COMMON_SLOFILES=	\
-@@ -50,7 +58,8 @@ COMMON_SLOFILES=	\
- 	$(SLO)$/sbintern.obj	\
- 	$(SLO)$/sbunoobj.obj	\
- 	$(SLO)$/propacc.obj	\
--	$(SLO)$/disas.obj
-+	$(SLO)$/disas.obj \
-+	$(SLO)$/errobject.obj \
- 
- SLOFILES=	$(COMMON_SLOFILES)	\
- 	$(SLO)$/eventatt.obj
---- basic/source/inc/errobject.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ basic/source/inc/errobject.hxx	2009-04-06 16:41:58.000000000 +0000
-@@ -0,0 +1,16 @@
-+#ifndef ERROBJECT_HXX
-+#define ERROBJECT_HXX
-+#include "sbunoobj.hxx"
-+#include <ooo/vba/XErrObject.hpp>
-+
-+
-+class SbxErrObject : public SbUnoObject
-+{
-+	com::sun::star::uno::Reference< ooo::vba::XErrObject > m_xErr;
-+	SbxErrObject( const String& aName_, const com::sun::star::uno::Any& aUnoObj_ );
-+	~SbxErrObject();
-+public:
-+	static SbxVariableRef getErrObject();
-+	static com::sun::star::uno::Reference< ooo::vba::XErrObject > getUnoErrObject();
-+};
-+#endif
---- basic/source/classes/errobject.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ basic/source/classes/errobject.cxx	2009-04-06 16:41:58.000000000 +0000
-@@ -0,0 +1,181 @@
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_basic.hxx"
-+#include "errobject.hxx"
-+
-+#include <cppuhelper/implbase2.hxx>
-+#include <com/sun/star/script/XDefaultProperty.hpp>
-+#include "sbintern.hxx"
-+#include "runtime.hxx"
-+
-+using namespace ::com::sun::star;
-+using namespace ::ooo;
-+
-+typedef ::cppu::WeakImplHelper2< vba::XErrObject, script::XDefaultProperty > ErrObjectImpl_BASE;
-+
-+class ErrObject : public ErrObjectImpl_BASE
-+{	
-+	rtl::OUString m_sHelpFile;
-+	rtl::OUString m_sSource;
-+        rtl::OUString m_sDescription; 
-+	sal_Int32 m_nNumber;
-+	sal_Int32 m_nHelpContext;
-+	
-+public:
-+	ErrObject();
-+	~ErrObject();
-+	// Attributes
-+	virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException);
-+	virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException);
-+	virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException);
-+	virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException);
-+	virtual ::rtl::OUString SAL_CALL getHelpFile() throw (uno::RuntimeException);
-+	virtual void SAL_CALL setHelpFile( const ::rtl::OUString& _helpfile ) throw (uno::RuntimeException);
-+	virtual ::rtl::OUString SAL_CALL getDescription() throw (uno::RuntimeException);
-+	virtual void SAL_CALL setDescription( const ::rtl::OUString& _description ) throw (uno::RuntimeException);
-+	virtual ::rtl::OUString SAL_CALL getSource() throw (uno::RuntimeException);
-+	virtual void SAL_CALL setSource( const ::rtl::OUString& _source ) throw (uno::RuntimeException);
-+	
-+	// Methods
-+	virtual void SAL_CALL Clear(  ) throw (uno::RuntimeException);
-+	virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException);
-+	// XDefaultProperty	
-+	virtual ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (uno::RuntimeException);
-+};
-+
-+
-+ErrObject::~ErrObject()
-+{
-+}
-+
-+ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0)
-+{
-+}
-+
-+sal_Int32 SAL_CALL
-+ErrObject::getNumber() throw (uno::RuntimeException)
-+{
-+	return m_nNumber;
-+}
-+
-+void SAL_CALL 
-+ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException)
-+{
-+	m_nNumber = _number;
-+
-+	
-+}
-+
-+::sal_Int32 SAL_CALL 
-+ErrObject::getHelpContext() throw (uno::RuntimeException)
-+{
-+	return m_nHelpContext;
-+}
-+void SAL_CALL 
-+ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException)
-+{
-+	m_nHelpContext = _helpcontext;
-+}
-+
-+::rtl::OUString SAL_CALL 
-+ErrObject::getHelpFile() throw (uno::RuntimeException)
-+{
-+	return m_sHelpFile;
-+}
-+
-+void SAL_CALL 
-+ErrObject::setHelpFile( const ::rtl::OUString& _helpfile ) throw (uno::RuntimeException)
-+{
-+	m_sHelpFile = _helpfile;
-+}
-+
-+::rtl::OUString SAL_CALL 
-+ErrObject::getDescription() throw (uno::RuntimeException)
-+{
-+	return m_sDescription;
-+}
-+
-+void SAL_CALL 
-+ErrObject::setDescription( const ::rtl::OUString& _description ) throw (uno::RuntimeException)
-+{
-+	m_sDescription = _description;
-+}
-+
-+::rtl::OUString SAL_CALL 
-+ErrObject::getSource() throw (uno::RuntimeException)
-+{
-+	return m_sSource;
-+}
-+
-+void SAL_CALL 
-+ErrObject::setSource( const ::rtl::OUString& _source ) throw (uno::RuntimeException)
-+{
-+	m_sSource = _source;
-+}
-+	
-+// Methods
-+void SAL_CALL 
-+ErrObject::Clear(  ) throw (uno::RuntimeException)
-+{
-+	m_sHelpFile = rtl::OUString();
-+	m_sSource = m_sHelpFile;
-+	m_sDescription = m_sSource;
-+	m_nNumber = 0;	
-+	m_nHelpContext = 0;	
-+}
-+
-+void SAL_CALL 
-+ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException)
-+{
-+	if ( !Number.hasValue() )
-+		throw uno::RuntimeException( rtl::OUString::createFromAscii("Missing Required Paramater"), uno::Reference< uno::XInterface >() );
-+	Description >>= m_sDescription;
-+	Source >>= m_sSource;
-+	HelpFile >>= m_sHelpFile;
-+	HelpContext >>= m_nHelpContext;
-+	Number >>= m_nNumber;
-+	if ( m_nNumber )
-+	{
-+		SbError n = StarBASIC::GetSfxFromVBError( m_nNumber );
-+		if ( !n )
-+			n = m_nNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
-+		pINST->Error( n, m_sDescription );
-+	}
-+}
-+
-+// XDefaultProperty	
-+::rtl::OUString SAL_CALL 
-+ErrObject::getDefaultPropertyName(  ) throw (uno::RuntimeException)
-+{
-+	static rtl::OUString sDfltPropName( RTL_CONSTASCII_USTRINGPARAM("Number") );
-+	return sDfltPropName;
-+}
-+
-+// SbxErrObject
-+SbxErrObject::SbxErrObject( const String& rName, const Any& rUnoObj ): SbUnoObject( rName, rUnoObj )
-+{
-+	OSL_TRACE("SbxErrObject::SbxErrObject ctor");
-+	rUnoObj >>= m_xErr;
-+	if ( m_xErr.is() )
-+		SetDfltProperty( uno::Reference< script::XDefaultProperty >( m_xErr, uno::UNO_QUERY_THROW )->getDefaultPropertyName() ) ;
-+}
-+
-+SbxErrObject::~SbxErrObject()
-+{
-+	OSL_TRACE("SbxErrObject::~SbxErrObject dtor");
-+}
-+
-+uno::Reference< vba::XErrObject > 
-+SbxErrObject::getUnoErrObject()
-+{
-+	SbxVariable* pVar = getErrObject();
-+	SbxErrObject* pGlobErr = static_cast< SbxErrObject* >(  pVar );
-+	return pGlobErr->m_xErr;	
-+}
-+
-+SbxVariableRef
-+SbxErrObject::getErrObject()
-+{
-+	static SbxVariableRef pGlobErr = new SbxErrObject( String(  RTL_CONSTASCII_USTRINGPARAM("Err")), uno::makeAny( uno::Reference< vba::XErrObject >( new ErrObject() ) ) );
-+	return pGlobErr;
-+}
-+
---- basic/source/runtime/runtime.cxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/runtime/runtime.cxx	2009-04-06 16:41:58.000000000 +0000
-@@ -46,6 +46,7 @@
- #include <comphelper/processfactory.hxx>
- #include <com/sun/star/container/XEnumerationAccess.hpp>
- #include "sbunoobj.hxx"
-+#include "errobject.hxx"
- 
- bool SbiRuntime::isVBAEnabled()
- {
-@@ -272,6 +273,7 @@ SbiInstance::SbiInstance( StarBASIC* p )
- 	nErl	 = 0;
- 	bReschedule = TRUE;
- 	bCompatibility = FALSE;
-+	SbxErrObject::getUnoErrObject()->Clear();
- }
- 
- SbiInstance::~SbiInstance()
-@@ -792,7 +794,38 @@ BOOL SbiRuntime::Step()
- void SbiRuntime::Error( SbError n )
- {
- 	if( n )
-+	{
- 		nError = n;
-+		if ( isVBAEnabled() )
-+		{
-+			String aMsg = pInst->GetErrorMsg();
-+			// If a message is defined use that ( in preference to
-+			// the defined one for the error ) NB #TODO
-+			// if there is an error defined it more than likely
-+			// is not the one you want ( some are the same though )
-+			// we really need a new vba compatible error list
-+			if ( !aMsg.Len() )
-+			{
-+				StarBASIC::MakeErrorText( n, aMsg );	
-+				aMsg =  StarBASIC::GetErrorText();
-+				if ( !aMsg.Len() ) // no message for err no.
-+					// need localized resource here
-+					aMsg = String( RTL_CONSTASCII_USTRINGPARAM("Internal Object Error:") );
-+			}
-+			// no num? most likely then it *is* really a vba err
-+			SbxErrObject::getUnoErrObject()->setNumber( ( StarBASIC::GetVBErrorCode( n ) == 0 ) ? n : StarBASIC::GetVBErrorCode( n ) );
-+			SbxErrObject::getUnoErrObject()->setDescription( aMsg );
-+
-+			// prepend an error number to the message.
-+			String aTmp = '\'';
-+                        aTmp += String::CreateFromInt32( SbxErrObject::getUnoErrObject()->getNumber() );
-+                        aTmp += String( RTL_CONSTASCII_USTRINGPARAM("\'\n") );
-+                        aTmp += aMsg;
-+
-+			pInst->aErrorMsg = aTmp;
-+			nError = SbERR_BASIC_COMPAT;
-+		}
-+	}
- }
- 
- void SbiRuntime::FatalError( SbError n )
---- basic/source/classes/sb.cxx
-+++ basic/source/classes/sb.cxx
-@@ -199,6 +199,7 @@ const SFX_VB_ErrorItem __FAR_DATA SFX_VB
- 	{ 1004, SbERR_METHOD_FAILED },
- 	{ 1005, SbERR_SETPROP_FAILED },
- 	{ 1006, SbERR_GETPROP_FAILED },
-+	{ 1007, SbERR_BASIC_COMPAT },
- 	{ 0xFFFF, 0xFFFFFFFFL }		// End mark
- };
- 
---- basic/source/classes/sb.src.old	2009-04-02 10:49:17.000000000 +0000
-+++ basic/source/classes/sb.src	2009-04-06 16:41:58.000000000 +0000
-@@ -591,6 +591,12 @@ Resource RID_BASIC_START
- 	{
- 		Text [ en-US ] = "For loop not initialized." ;
- 	};
-+	String ERRCODE_BASIC_COMPAT & ERRCODE_RES_MASK
-+	{
-+		Text [ de ] = "$(ARG1)." ;
-+		Text [ en-US ] = "$(ARG1)." ;
-+		Text [ x-comment ] = " ";
-+	};
- };
-  // Hinweis: IDS_SBERR_TERMINATED = IDS_SBERR_START+2000.
- String IDS_SBERR_TERMINATED
---- basic/inc/basic/sberrors.hxx
-+++ basic/inc/basic/sberrors.hxx
-@@ -290,6 +290,8 @@ typedef ULONG SbError;
- #define	ERRCODE_BASIC_LOOP_NOT_INIT			((LAST_SBX_ERROR_ID+109UL) | ERRCODE_AREA_SBX | \
- 											ERRCODE_CLASS_COMPILER)				// For loop not initialized
- 
-+#define	ERRCODE_BASIC_COMPAT				((LAST_SBX_ERROR_ID+103UL)| ERRCODE_AREA_SBX | ERRCODE_CLASS_RUNTIME)
-+
- // Map old codes to new codes
- #define	SbERR_SYNTAX						ERRCODE_BASIC_SYNTAX
- #define	SbERR_NO_GOSUB						ERRCODE_BASIC_NO_GOSUB
-@@ -413,6 +415,7 @@ typedef ULONG SbError;
- #define	SbERR_PROG_TOO_LARGE                ERRCODE_BASIC_PROG_TOO_LARGE
- #define	SbERR_NO_STRINGS_ARRAYS             ERRCODE_BASIC_NO_STRINGS_ARRAYS
- #define	SbERR_BASIC_EXCEPTION               ERRCODE_BASIC_EXCEPTION
-+#define	SbERR_BASIC_COMPAT                  ERRCODE_BASIC_COMPAT
- #define	SbERR_BASIC_ARRAY_FIX				ERRCODE_BASIC_ARRAY_FIX
- #define	SbERR_BASIC_STRING_OVERFLOW			ERRCODE_BASIC_STRING_OVERFLOW
- #define	SbERR_BASIC_EXPR_TOO_COMPLEX		ERRCODE_BASIC_EXPR_TOO_COMPLEX
---- basic/source/runtime/step0.cxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/runtime/step0.cxx	2009-04-06 16:41:58.000000000 +0000
-@@ -33,6 +33,7 @@
- #include <vcl/msgbox.hxx>
- #include <tools/fsys.hxx>
- 
-+#include "errobject.hxx"
- #include "runtime.hxx"
- #include "sbintern.hxx"
- #include "iosys.hxx"
-@@ -1119,6 +1120,7 @@ void SbiRuntime::StepSTDERROR()
- 	pInst->nErr = 0L;
- 	pInst->nErl = 0;
- 	nError = 0L;
-+	SbxErrObject::getUnoErrObject()->Clear();
- }
- 
- void SbiRuntime::StepNOERROR()
-@@ -1268,6 +1270,6 @@ void SbiRuntime::StepERROR()
- 	SbxVariableRef refCode = PopVar();
- 	USHORT n = refCode->GetUShort();
- 	SbError error = StarBASIC::GetSfxFromVBError( n );
--	Error( error );
-+	pInst->Error( error );
- }
- 
diff --git a/applied_patches/0266-cws-ooo11lotusfilter-lwp-filter.diff b/applied_patches/0302-cws-ooo11lotusfilter-lwp-filter.diff
similarity index 100%
rename from applied_patches/0266-cws-ooo11lotusfilter-lwp-filter.diff
rename to applied_patches/0302-cws-ooo11lotusfilter-lwp-filter.diff
diff --git a/applied_patches/0302-sc-vba-autofill-support.diff b/applied_patches/0302-sc-vba-autofill-support.diff
deleted file mode 100644
index dde867124..000000000
--- a/applied_patches/0302-sc-vba-autofill-support.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- sc.orig/source/ui/inc/docfunc.hxx	2007-01-04 12:29:30.000000000 +0000
-+++ sc/source/ui/inc/docfunc.hxx	2007-01-08 17:04:45.000000000 +0000
-@@ -159,6 +159,8 @@ public:
- 								double fStart, double fStep, double fMax,
- 								BOOL bRecord, BOOL bApi );
- 					// FillAuto: rRange wird von Source-Range auf Dest-Range angepasst
-+	SC_DLLPUBLIC	BOOL			FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd	eDateCmd, ULONG nCount, double fStep, double fMax, BOOL bRecord, BOOL bApi );
-+
- 	BOOL			FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
- 								FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi );
- 
---- sc.orig/source/ui/docshell/docfunc.cxx	2007-01-04 12:29:30.000000000 +0000
-+++ sc/source/ui/docshell/docfunc.cxx	2007-01-08 17:23:02.000000000 +0000
-@@ -3298,6 +3298,13 @@ BOOL ScDocFunc::FillSeries( const ScRang
- BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
- 							FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi )
- {
-+	double		fStep = 1.0;
-+	double		fMax = MAXDOUBLE;
-+	return FillAuto( rRange, pTabMark, eDir, FILL_AUTO, FILL_DAY, nCount, fStep, fMax, bRecord, bApi );
-+}
-+
-+BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd	eDateCmd, ULONG nCount, double fStep, double fMax,  BOOL bRecord, BOOL bApi )
-+{
- 	ScDocShellModificator aModificator( rDocShell );
- 
- 	ScDocument* pDoc = rDocShell.GetDocument();
-@@ -3323,10 +3330,6 @@ BOOL ScDocFunc::FillAuto( ScRange& rRang
- 	ScRange aSourceArea = rRange;
- 	ScRange aDestArea   = rRange;
- 
--	FillCmd		eCmd = FILL_AUTO;
--	FillDateCmd	eDateCmd = FILL_DAY;
--	double		fStep = 1.0;
--	double		fMax = MAXDOUBLE;
- 
- 	switch (eDir)
- 	{
diff --git a/applied_patches/0267-cws-ooo11lotusfilter-lwp-xfilter.diff b/applied_patches/0303-cws-ooo11lotusfilter-lwp-xfilter.diff
similarity index 100%
rename from applied_patches/0267-cws-ooo11lotusfilter-lwp-xfilter.diff
rename to applied_patches/0303-cws-ooo11lotusfilter-lwp-xfilter.diff
diff --git a/applied_patches/0303-sc-source-ui-vba-makefile-mk.diff b/applied_patches/0303-sc-source-ui-vba-makefile-mk.diff
deleted file mode 100644
index 498f593eb..000000000
--- a/applied_patches/0303-sc-source-ui-vba-makefile-mk.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- sc/source/ui/vba/makefile.mk	
-+++ sc/source/ui/vba/makefile.mk
-@@ -48,9 +48,9 @@ DLLPRE =
- dummy:
-         @echo "not building vba..."
- .ENDIF
--
-+ 
- INCPRE=$(INCCOM)$/$(TARGET)
--
-+CDEFS+=-DVBA_OOBUILD_HACK
- # ------------------------------------------------------------------
- 
- SLOFILES= \
diff --git a/applied_patches/0304-sc-export-shape-macro-bindings.diff b/applied_patches/0304-sc-export-shape-macro-bindings.diff
deleted file mode 100644
index f3f0eaf04..000000000
--- a/applied_patches/0304-sc-export-shape-macro-bindings.diff
+++ /dev/null
@@ -1,260 +0,0 @@
-diff --git sc/source/filter/excel/xeescher.cxx sc/source/filter/excel/xeescher.cxx
-index e3273e2..ced9e61 100644
---- sc/source/filter/excel/xeescher.cxx
-+++ sc/source/filter/excel/xeescher.cxx
-@@ -62,6 +62,9 @@
- #include "xelink.hxx"
- #include "xename.hxx"
- #include "xestyle.hxx"
-+#include "userdat.hxx"
-+#include "drwlayer.hxx"
-+#include "svx/unoapi.hxx"
- 
- #include <oox/core/tokens.hxx>
- 
-@@ -329,7 +332,7 @@ void XclExpOcxControlObj::WriteSubRecs( XclExpStream& rStrm )
- 
- XclExpTbxControlObj::XclExpTbxControlObj( const XclExpRoot& rRoot, Reference< XShape > xShape ) :
-     XclObj( rRoot, EXC_OBJTYPE_UNKNOWN, true ),
--    XclExpControlHelper( rRoot ),
-+    XclMacroHelper( rRoot ),
-     mnHeight( 0 ),
-     mnState( 0 ),
-     mnLineCount( 0 ),
-@@ -576,6 +579,8 @@ XclExpTbxControlObj::XclExpTbxControlObj( const XclExpRoot& rRoot, Reference< XS
- 
- bool XclExpTbxControlObj::SetMacroLink( const ScriptEventDescriptor& rEvent )
- {
-+    return XclMacroHelper::SetMacroLink( rEvent, meEventType );
-+/*
-     String aMacroName = XclControlHelper::ExtractFromMacroDescriptor( rEvent, meEventType );
-     if( aMacroName.Len() )
-     {
-@@ -585,6 +590,7 @@ bool XclExpTbxControlObj::SetMacroLink( const ScriptEventDescriptor& rEvent )
-         return true;
-     }
-     return false;
-+*/
- }
- 
- void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
-@@ -723,12 +729,6 @@ void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
-     }
- }
- 
--void XclExpTbxControlObj::WriteMacroSubRec( XclExpStream& rStrm )
--{
--    if( mxMacroLink.is() )
--        WriteFormulaSubRec( rStrm, EXC_ID_OBJMACRO, *mxMacroLink );
--}
--
- void XclExpTbxControlObj::WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId )
- {
-     if( const XclTokenArray* pCellLink = GetCellLinkTokArr() )
-@@ -757,6 +757,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& rStrm )
- 
- #endif
- 
-+
- // ----------------------------------------------------------------------------
- 
- XclExpChartObj::XclExpChartObj( const XclExpRoot& rRoot, Reference< XShape > xShape ) :
-@@ -947,6 +948,7 @@ void XclExpNote::Save( XclExpStream& rStrm )
-     }
- }
- 
-+
- void XclExpNote::WriteBody( XclExpStream& rStrm )
- {
-     // BIFF5/BIFF7 is written separately
-@@ -983,6 +985,70 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm )
- 
- // ============================================================================
- 
-+XclMacroHelper::XclMacroHelper( const XclExpRoot& rRoot ) :
-+    XclExpControlHelper( rRoot )
-+{
-+}
-+
-+XclMacroHelper::~XclMacroHelper()
-+{
-+}
-+
-+void XclMacroHelper::WriteMacroSubRec( XclExpStream& rStrm )
-+{
-+    if( mxMacroLink.is() )
-+        WriteFormulaSubRec( rStrm, EXC_ID_OBJMACRO, *mxMacroLink );
-+}
-+
-+bool 
-+XclMacroHelper::SetMacroLink( const ScriptEventDescriptor& rEvent, const XclTbxEventType& nEventType )
-+{
-+    String aMacroName = XclControlHelper::ExtractFromMacroDescriptor( rEvent, nEventType );
-+    if( aMacroName.Len() )
-+    {
-+        return SetMacroLink( aMacroName );
-+    }
-+    return false;
-+}
-+
-+bool
-+XclMacroHelper::SetMacroLink( const String& rMacroName )
-+{
-+    OSL_TRACE("SetMacroLink( macroname:=%s )", rtl::OUStringToOString( rMacroName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    if( rMacroName.Len() )
-+    {
-+        sal_uInt16 nExtSheet = GetLocalLinkManager().FindExtSheet( EXC_EXTSH_OWNDOC );
-+        sal_uInt16 nNameIdx = GetNameManager().InsertMacroCall( rMacroName, true, false );
-+        mxMacroLink = GetFormulaCompiler().CreateNameXFormula( nExtSheet, nNameIdx );
-+        return true;
-+    }
-+    return false;
-+}
-+
-+XclExpShapeObj::XclExpShapeObj( const XclExpRoot& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ) : 
-+    XclObjAny( rRoot ),
-+    XclMacroHelper( rRoot )
-+{
-+    if( SdrObject* pSdrObj = ::GetSdrObjectFromXShape( xShape ) )
-+    {
-+        ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pSdrObj );
-+        if ( pInfo && pInfo->GetMacro().getLength() )
-+            SetMacroLink( XclControlHelper::GetXclMacroName( pInfo->GetMacro() ) ); 
-+    }
-+}
-+
-+XclExpShapeObj::~XclExpShapeObj()
-+{
-+}
-+
-+void XclExpShapeObj::WriteSubRecs( XclExpStream& rStrm )
-+{
-+    XclObjAny::WriteSubRecs( rStrm );
-+    WriteMacroSubRec( rStrm );
-+}
-+
-+// ============================================================================
-+
- XclExpComments::XclExpComments( SCTAB nTab, XclExpRecordList< XclExpNote >& rNotes )
-     : mnTab( nTab ), mrNotes( rNotes )
- {
-diff --git sc/source/filter/inc/xcl97esc.hxx sc/source/filter/inc/xcl97esc.hxx
-index 9ef6c91..efb9076 100644
---- sc/source/filter/inc/xcl97esc.hxx
-+++ sc/source/filter/inc/xcl97esc.hxx
-@@ -54,6 +54,14 @@ class XclExpOcxControlObj;
- #else
- class XclExpTbxControlObj;
- #endif
-+class XclExpShapeObj;
-+
-+class ShapeInteractionHelper
-+{
-+public:
-+   static XclExpShapeObj* CreateShapeObj(const XclExpRoot& rRoot, const ::com::sun::star::uno::Reference<
-+                            ::com::sun::star::drawing::XShape >& xShape );
-+};
- 
- class XclEscherEx : public EscherEx, protected XclExpRoot
- {
-diff --git sc/source/filter/inc/xcl97rec.hxx sc/source/filter/inc/xcl97rec.hxx
-index 7517cb9..c0bd309 100644
---- sc/source/filter/inc/xcl97rec.hxx
-+++ sc/source/filter/inc/xcl97rec.hxx
-@@ -285,7 +285,7 @@ public:
- 
- class XclObjAny : public XclObj
- {
--private:
-+protected:
-     virtual void                WriteSubRecs( XclExpStream& rStrm );
- 
- public:
-diff --git sc/source/filter/inc/xeescher.hxx sc/source/filter/inc/xeescher.hxx
-index cbbad6e..8a9a143 100644
---- sc/source/filter/inc/xeescher.hxx
-+++ sc/source/filter/inc/xeescher.hxx
-@@ -88,6 +88,34 @@ private:
-     sal_uInt16          mnEntryCount;   /// Number of entries in source range.
- };
- 
-+class XclMacroHelper : public XclExpControlHelper
-+{
-+protected:
-+    XclTokenArrayRef    mxMacroLink;    /// Token array containing a link to an attached macro.
-+
-+public:
-+    explicit            XclMacroHelper( const XclExpRoot& rRoot );
-+    virtual             ~XclMacroHelper();
-+    /** Writes an ftMacro subrecord containing a macro link, or nothing, if no macro present. */
-+    void                WriteMacroSubRec( XclExpStream& rStrm  );
-+    /** Sets the name of a macro for object of passed type
-+        @return  true = The passed event descriptor was valid, macro name has been found. */
-+    bool                SetMacroLink( const ::com::sun::star::script::ScriptEventDescriptor& rEvent,  const XclTbxEventType& nEventType );
-+
-+    /** Sets the name of a macro 
-+        @return  true = The passed macro name has been found. */
-+    bool                SetMacroLink( const String& rMacro );
-+};
-+
-+class XclExpShapeObj : public XclObjAny, public XclMacroHelper
-+{
-+public:
-+    explicit            XclExpShapeObj( const XclExpRoot& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
-+    virtual             ~XclExpShapeObj();
-+private:
-+    virtual void        WriteSubRecs( XclExpStream& rStrm );
-+};
-+
- // ----------------------------------------------------------------------------
- 
- #if EXC_EXP_OCX_CTRL
-@@ -114,7 +142,7 @@ private:
- #else
- 
- /** Represents an OBJ record for an TBX form control. */
--class XclExpTbxControlObj : public XclObj, public XclExpControlHelper
-+class XclExpTbxControlObj : public XclObj, public XclMacroHelper
- {
- public:
-     explicit            XclExpTbxControlObj(
-@@ -128,8 +156,6 @@ public:
- private:
-     virtual void        WriteSubRecs( XclExpStream& rStrm );
- 
--    /** Writes an ftMacro subrecord containing a macro link, or nothing, if no macro present. */
--    void                WriteMacroSubRec( XclExpStream& rStrm );
-     /** Writes a subrecord containing a cell link, or nothing, if no link present. */
-     void                WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId );
-     /** Writes the ftSbs sub structure containing scrollbar data. */
-@@ -137,7 +163,6 @@ private:
- 
- private:
-     ScfInt16Vec         maMultiSel;     /// Indexes of all selected entries in a multi selection.
--    XclTokenArrayRef    mxMacroLink;    /// Token array containing a link to an attached macro.
-     XclTbxEventType     meEventType;    /// Type of supported macro event.
-     sal_Int32           mnHeight;       /// Height of the control.
-     sal_uInt16          mnState;        /// Checked/unchecked state.
-diff --git sc/source/filter/xcl97/xcl97esc.cxx sc/source/filter/xcl97/xcl97esc.cxx
-index 30a5041..3aa49c4 100644
---- sc/source/filter/xcl97/xcl97esc.cxx
-+++ sc/source/filter/xcl97/xcl97esc.cxx
-@@ -232,7 +232,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const com::sun::star::uno::Referen
-         {
-             // #107540# ignore permanent note shapes
-             // #i12190# do not ignore callouts (do not filter by object type ID)
--            pCurrXclObj = new XclObjAny( GetRoot() );   // just a metafile
-+            pCurrXclObj = ShapeInteractionHelper::CreateShapeObj( GetRoot(), rShape );
-         }
- 	}
- 	if ( pCurrXclObj )
-@@ -576,4 +576,8 @@ void XclEscherClientTextbox::WriteData( EscherEx& /*rEx*/ ) const
-     pXclObj->SetText( GetRoot(), rTextObj );
- }
- 
--
-+XclExpShapeObj* 
-+ShapeInteractionHelper::CreateShapeObj(const XclExpRoot& rRoot, const Reference< XShape >& xShape )
-+{
-+    return new XclExpShapeObj( rRoot, xShape );
-+}
diff --git a/applied_patches/0268-warning-return-values-lotuswordpro.diff b/applied_patches/0304-warning-return-values-lotuswordpro.diff
similarity index 100%
rename from applied_patches/0268-warning-return-values-lotuswordpro.diff
rename to applied_patches/0304-warning-return-values-lotuswordpro.diff
diff --git a/applied_patches/0271-cli_ure-source-bootstrap-assembly-cs.diff b/applied_patches/0305-cli_ure-source-bootstrap-assembly-cs.diff
similarity index 100%
rename from applied_patches/0271-cli_ure-source-bootstrap-assembly-cs.diff
rename to applied_patches/0305-cli_ure-source-bootstrap-assembly-cs.diff
diff --git a/applied_patches/0305-sc-export-shape-hlink-bindings.diff b/applied_patches/0305-sc-export-shape-hlink-bindings.diff
deleted file mode 100644
index 317f51581..000000000
--- a/applied_patches/0305-sc-export-shape-hlink-bindings.diff
+++ /dev/null
@@ -1,207 +0,0 @@
-diff --git sc/source/filter/excel/xecontent.cxx sc/source/filter/excel/xecontent.cxx
-index 083cf7a..f9588b6 100644
---- sc/source/filter/excel/xecontent.cxx
-+++ sc/source/filter/excel/xecontent.cxx
-@@ -461,12 +461,17 @@ void XclExpHyperlink::WriteBody( XclExpStream& rStrm )
- {
-     sal_uInt16 nXclCol = static_cast< sal_uInt16 >( maScPos.Col() );
-     sal_uInt16 nXclRow = static_cast< sal_uInt16 >( maScPos.Row() );
--    mxVarData->Seek( STREAM_SEEK_TO_BEGIN );
-+    rStrm   << nXclRow << nXclRow << nXclCol << nXclCol;
-+    WriteEmbeddedData( rStrm );
-+}
- 
--    rStrm   << nXclRow << nXclRow << nXclCol << nXclCol
--            << XclTools::maGuidStdLink
-+void XclExpHyperlink::WriteEmbeddedData( XclExpStream& rStrm )
-+{
-+    rStrm << XclTools::maGuidStdLink
-             << sal_uInt32( 2 )
-             << mnFlags;
-+
-+    mxVarData->Seek( STREAM_SEEK_TO_BEGIN );
-     rStrm.CopyFromStream( *mxVarData );
- }
- 
-diff --git sc/source/filter/inc/xcl97esc.hxx sc/source/filter/inc/xcl97esc.hxx
-index efb9076..3703827 100644
---- sc/source/filter/inc/xcl97esc.hxx
-+++ sc/source/filter/inc/xcl97esc.hxx
-@@ -55,12 +55,13 @@ class XclExpOcxControlObj;
- class XclExpTbxControlObj;
- #endif
- class XclExpShapeObj;
--
-+class EscherExHostAppData;
- class ShapeInteractionHelper
- {
- public:
-    static XclExpShapeObj* CreateShapeObj(const XclExpRoot& rRoot, const ::com::sun::star::uno::Reference<
-                             ::com::sun::star::drawing::XShape >& xShape );
-+   static void PopulateShapeInteractionInfo( const XclExpRoot& rRoot, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, EscherExHostAppData& rHostAppData );
- };
- 
- class XclEscherEx : public EscherEx, protected XclExpRoot
-diff --git sc/source/filter/xcl97/xcl97esc.cxx sc/source/filter/xcl97/xcl97esc.cxx
-diff --git sc/source/filter/inc/xecontent.hxx sc/source/filter/inc/xecontent.hxx
-index 729d653..aeb6c13 100644
---- sc/source/filter/inc/xecontent.hxx
-+++ sc/source/filter/inc/xecontent.hxx
-@@ -116,6 +116,8 @@ public:
-     inline const String* GetRepr() const { return mxRepr.get(); }
- 
-     virtual void        SaveXml( XclExpXmlStream& rStrm );
-+
-+    virtual void        WriteEmbeddedData( XclExpStream& rStrm );
- private:
-     /** Builds file name from the passed file URL. Tries to convert to relative file name.
-         @param rnLevel  (out-param) The parent directory level.
-index aaa0316..cf9da11 100644
---- sc/source/filter/xcl97/xcl97esc.cxx
-+++ sc/source/filter/xcl97/xcl97esc.cxx
-@@ -58,6 +58,9 @@
- #include "global.hxx"
- #include "document.hxx"
- #include "drwlayer.hxx"
-+#include "xecontent.hxx"
-+#include <svx/flditem.hxx>
-+#include "userdat.hxx"
- #include "xcl97rec.hxx"
- #include "xehelper.hxx"
- #include "xechart.hxx"
-@@ -233,6 +236,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const com::sun::star::uno::Referen
-             // #107540# ignore permanent note shapes
-             // #i12190# do not ignore callouts (do not filter by object type ID)
-             pCurrXclObj = ShapeInteractionHelper::CreateShapeObj( GetRoot(), rShape );
-+            ShapeInteractionHelper::PopulateShapeInteractionInfo( GetRoot(), rShape, *pCurrAppData );
-         }
- 	}
- 	if ( pCurrXclObj )
-@@ -345,6 +349,7 @@ void XclEscherEx::DeleteCurrAppData()
- 		delete pCurrAppData->GetClientAnchor();
- //		delete pCurrAppData->GetClientData();
- 		delete pCurrAppData->GetClientTextbox();
-+		delete pCurrAppData->GetInteractionInfo();
- 		delete pCurrAppData;
- 	}
- }
-@@ -581,3 +586,35 @@ ShapeInteractionHelper::CreateShapeObj(const XclExpRoot& rRoot, const Reference<
- {
-     return new XclExpShapeObj( rRoot, xShape );
- }
-+
-+void
-+ShapeInteractionHelper::PopulateShapeInteractionInfo(const XclExpRoot& rRoot, const Reference< XShape >& xShape, EscherExHostAppData& rHostAppData )
-+{
-+   try
-+   {
-+      SvMemoryStream* pMemStrm = NULL;
-+      rtl::OUString sHyperLink;
-+      rtl::OUString sMacro;
-+      if ( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( ::GetSdrObjectFromXShape( xShape ) ) )
-+      {
-+         sHyperLink = pInfo->GetHlink();      
-+         sMacro = pInfo->GetMacro();
-+      }
-+      if (  sHyperLink.getLength() > 0 )
-+      {
-+         pMemStrm = new SvMemoryStream();
-+         XclExpStream tmpStream( *pMemStrm, rRoot );
-+         ScAddress dummyAddress;
-+         SvxURLField aUrlField;
-+         aUrlField.SetURL( sHyperLink );
-+         XclExpHyperlink hExpHlink( rRoot, aUrlField, dummyAddress );
-+         hExpHlink.WriteEmbeddedData( tmpStream );
-+      }
-+      if ( ( sHyperLink.getLength() > 0 ) || ( sMacro.getLength() > 0 ) )
-+          rHostAppData.SetInteractionInfo( new InteractionInfo( pMemStrm, true ) );
-+   }
-+   catch( Exception& )
-+   {
-+   }
-+}
-+
-diff --git svx/inc/svx/escherex.hxx svx/inc/svx/escherex.hxx
-index ad20c74..d7b7184 100644
---- svx/inc/svx/escherex.hxx
-+++ svx/inc/svx/escherex.hxx
-@@ -47,6 +47,7 @@
- #include <com/sun/star/drawing/Hatch.hpp>
- #include <svx/msdffdef.hxx>
- #include "svx/svxdllapi.h"
-+#include <memory>
- 
- 		/*Record Name       FBT-Value   Instance                  Contents                                                          Wrd Exl PPt Ver*/
- // In der Mickysoft-Doku heissen die msofbt... statt ESCHER_...
-@@ -1256,6 +1257,19 @@ public:
- 									const Rectangle& rRect ) = 0;
- };
- 
-+class InteractionInfo
-+{
-+	bool 			mbHasInteraction;
-+	std::auto_ptr<SvMemoryStream>		mpHyperlinkRecord;
-+	InteractionInfo();
-+public:
-+	InteractionInfo( SvMemoryStream* pStream, bool bInteraction ) : mbHasInteraction( bInteraction )
-+	{
-+		mpHyperlinkRecord.reset( pStream );
-+	}
-+	bool	hasInteraction() { return mbHasInteraction; }
-+	const std::auto_ptr< SvMemoryStream >&	getHyperlinkRecord() { return mpHyperlinkRecord; }
-+};
- 
- class EscherExHostAppData
- {
-@@ -1263,14 +1277,17 @@ private:
- 		EscherExClientAnchor_Base*	pClientAnchor;
- 		EscherExClientRecord_Base*	pClientData;
- 		EscherExClientRecord_Base*	pClientTextbox;
-+		InteractionInfo*		pInteractionInfo;
- 		// ignore single shape if entire pages are written
- 		BOOL						bDontWriteShape;
- 
- public:
- 		EscherExHostAppData() : pClientAnchor(0), pClientData(0),
--								pClientTextbox(0), bDontWriteShape(FALSE)
-+								pClientTextbox(0), pInteractionInfo(0), bDontWriteShape(FALSE)
- 		{}
- 
-+		void SetInteractionInfo( InteractionInfo* p )
-+			{ pInteractionInfo = p; }
- 		void SetClientAnchor( EscherExClientAnchor_Base* p )
- 			{ pClientAnchor = p; }
- 		void SetClientData( EscherExClientRecord_Base* p )
-@@ -1279,6 +1296,8 @@ public:
- 			{ pClientTextbox = p; }
- 		void SetDontWriteShape( BOOL b )
- 			{ bDontWriteShape = b; }
-+		InteractionInfo* GetInteractionInfo() const
-+			{ return pInteractionInfo; }
- 		EscherExClientAnchor_Base* GetClientAnchor() const
- 			{ return pClientAnchor; }
- 		EscherExClientRecord_Base* GetClientData() const
-diff --git svx/source/msfilter/eschesdo.cxx svx/source/msfilter/eschesdo.cxx
-index e93661a..243c236 100644
---- svx/source/msfilter/eschesdo.cxx
-+++ svx/source/msfilter/eschesdo.cxx
-@@ -251,6 +251,19 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
-         // #i51348# shape name
-         if( aShapeName.Len() > 0 )
-             aPropOpt.AddOpt( ESCHER_Prop_wzName, aShapeName );
-+        if ( InteractionInfo* pInteraction = mpHostAppData->GetInteractionInfo() )
-+		{
-+			const std::auto_ptr< SvMemoryStream >& pMemStrm = pInteraction->getHyperlinkRecord();
-+			if ( pMemStrm.get() )
-+			{
-+				pMemStrm->ObjectOwnsMemory( FALSE );
-+				sal_uInt8* pBuf = (sal_uInt8*) pMemStrm->GetData();
-+				sal_uInt32 nSize = pMemStrm->Seek( STREAM_SEEK_TO_END );
-+				aPropOpt.AddOpt( ESCHER_Prop_pihlShape, sal_False, nSize, pBuf, nSize );;       
-+			}
-+			if ( pInteraction->hasInteraction() )
-+				aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x00080008 );       
-+        }
- 
- 		if ( rObj.GetType().EqualsAscii( "drawing.Custom" ) )
- 		{
diff --git a/applied_patches/0272-cli_ure-source-bootstrap-managed_bootstrap-cs.diff b/applied_patches/0306-cli_ure-source-bootstrap-managed_bootstrap-cs.diff
similarity index 100%
rename from applied_patches/0272-cli_ure-source-bootstrap-managed_bootstrap-cs.diff
rename to applied_patches/0306-cli_ure-source-bootstrap-managed_bootstrap-cs.diff
diff --git a/applied_patches/0306-sc-vbaimport-override-controlname.diff b/applied_patches/0306-sc-vbaimport-override-controlname.diff
deleted file mode 100644
index 1975ccfba..000000000
--- a/applied_patches/0306-sc-vbaimport-override-controlname.diff
+++ /dev/null
@@ -1,190 +0,0 @@
---- sc/source/filter/excel/excimp8.cxx.old	2009-04-06 16:41:49.000000000 +0000
-+++ sc/source/filter/excel/excimp8.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -275,11 +275,11 @@ void ImportExcel8::ReadBasic( void )
-             SvxImportMSVBasic aBasicImport( *pShell, *xRootStrg, bLoadCode, bLoadStrg );
- 			bool bAsComment = !bLoadExecutable || !lcl_hasVBAEnabled();
-             aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, bAsComment );
-+            GetObjectManager().SetOleNameOverrideInfo( aBasicImport.ControlNameForObjectId() );
-         }
-     }
- }
- 
--
- void ImportExcel8::EndSheet( void )
- {
-     GetCondFormatManager().Apply();
---- sc/source/filter/excel/xiescher.cxx.old	2009-04-06 16:41:49.000000000 +0000
-+++ sc/source/filter/excel/xiescher.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -116,6 +116,8 @@
- #include "xipage.hxx"
- #include "xichart.hxx"
- #include "xicontent.hxx"
-+#include "scextopt.hxx"
-+
- #include "namebuff.hxx"
- 
- using ::rtl::OUString;
-@@ -399,11 +401,16 @@ void XclImpDrawObjBase::SetAnchor( const
- 
- String XclImpDrawObjBase::GetObjName() const
- {
-+    String sName( GetObjectManager().GetOleNameOverride( GetObjId() ) );
-+  
-+    
-     /*  #118053# #i51348# Always return a non-empty name. Create English
-         default names depending on the object type. This is not implemented as
-         virtual functions in derived classes, as class type and object type may
-         not match. */
--    return (maObjName.Len() > 0) ? maObjName : GetObjectManager().GetDefaultObjName( *this );
-+    if ( sName.Len() == 0 )
-+        sName = ( (maObjName.Len() > 0) ? maObjName : GetObjectManager().GetDefaultObjName( *this ) );
-+    return sName;
- }
- 
- bool XclImpDrawObjBase::IsValidSize( const Rectangle& rAnchorRect ) const
-@@ -3086,6 +3093,23 @@ XclImpDffManager::~XclImpDffManager()
- {
- }
- 
-+String XclImpObjectManager::GetOleNameOverride( const XclObjId& nObjId )
-+{
-+    String sOleName; 
-+    String sCodeName = GetExtDocOptions().GetCodeName( nObjId.mnScTab );
-+    
-+    CodeNameToCntrlObjIdInfo::iterator it = maOleCtrlNameOverride.find( sCodeName );
-+    if ( it != maOleCtrlNameOverride.end() )
-+    {
-+        CntrlObjIdToName::iterator it_id = it->second.find( nObjId.mnObjId );
-+        if ( it_id != it->second.end() )
-+        {
-+            sOleName = it_id->second;
-+        }
-+    }
-+    return sOleName;
-+}
-+
- void XclImpDffManager::StartProgressBar( sal_Size nProgressSize )
- {
-     mxProgress.reset( new ScfProgressBar( GetDocShell(), STR_PROGRESS_CALCULATING ) );
---- sc/source/filter/inc/xiescher.hxx.old	2009-04-06 16:41:46.000000000 +0000
-+++ sc/source/filter/inc/xiescher.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -33,6 +33,7 @@
- 
- #include <vector>
- #include <map>
-+#include <hash_map>
- #include <svx/msdffimp.hxx>
- #include <svx/msocximex.hxx>
- #include <vcl/graph.hxx>
-@@ -1085,6 +1086,8 @@ private:
- /** Stores all drawing and OLE objects and additional data related to these objects. */
- class XclImpObjectManager : protected XclImpRoot
- {
-+typedef std::hash_map< sal_Int32, String >  CntrlObjIdToName;
-+typedef std::map< String, CntrlObjIdToName > CodeNameToCntrlObjIdInfo;
- public:
-     explicit            XclImpObjectManager( const XclImpRoot& rRoot );
-     virtual             ~XclImpObjectManager();
-@@ -1130,9 +1133,13 @@ public:
-     String              GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const;
-     /** Returns the used area in the sheet with the passed index. */
-     ScRange             GetUsedArea( SCTAB nScTab ) const;
--
-+    void SetOleNameOverrideInfo( const CodeNameToCntrlObjIdInfo& rOverrideInfo ) {  maOleCtrlNameOverride = rOverrideInfo; }
-+    String GetOleNameOverride( const XclObjId& nObjId );
-     // ------------------------------------------------------------------------
- private:
-+
-+    CodeNameToCntrlObjIdInfo maOleCtrlNameOverride;
-+
-     /** Reads and returns a bitmap from WMF/PICT format. */
-     static void         ReadWmf( Graphic& rGraphic, XclImpStream& rStrm );
-     /** Reads and returns a bitmap from BMP format. */
---- svx/inc/svxmsbas.hxx.old	2009-04-02 11:03:40.000000000 +0000
-+++ svx/inc/svxmsbas.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -35,6 +35,8 @@
- #include "svx/svxdllapi.h"
- 
- #include <sot/storage.hxx>
-+#include <map>
-+#include <hash_map>
- 
- class SfxObjectShell;
- 
-@@ -53,8 +55,15 @@ class SfxObjectShell;
-  * probably what the user expects to see when viewing the code
-  */
- 
-+typedef std::hash_map< sal_Int32, String >  ObjIdToName;
-+
-+typedef std::map< String, ObjIdToName >  ControlAttributeInfo;
-+
- class SVX_DLLPUBLIC SvxImportMSVBasic
--{
-+{ 
-+	ControlAttributeInfo m_ModuleNameToObjIdHash;
-+	void extractAttribute( const String& rAttribute, const String& rModName );
-+
- public:
- 	SvxImportMSVBasic( SfxObjectShell &rDocS, SotStorage &rRoot,
- 						BOOL bImportCode = TRUE, BOOL bCopyStorage = TRUE )
-@@ -73,9 +82,10 @@ public:
- 	// - returns a warning code if a modified basic exist, in all other
- 	//   cases return ERRCODE_NONE.
- 	ULONG SaveOrDelMSVBAStorage( BOOL bSaveInto, const String& rStorageName );
--
- 	// check if the MS-VBA-Storage exist in the RootStorage of the DocShell.
- 	// If it exist, then return the WarningId for loosing the information.
-+
-+        const ControlAttributeInfo& ControlNameForObjectId(){ return m_ModuleNameToObjIdHash; }
- 	static ULONG GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS );
- 
- 	static String GetMSBasicStorageName();
-@@ -87,7 +97,7 @@ private:
- 
- 	SVX_DLLPRIVATE BOOL ImportCode_Impl( const String& rStorageName,
- 						  const String &rSubStorageName,
--						  BOOL bAsComment, BOOL bStripped);
-+						  BOOL bAsComment, BOOL bStripped );
- 	SVX_DLLPRIVATE bool ImportForms_Impl(const String& rStorageName, 
- 		const String &rSubStorageName);
- 	SVX_DLLPRIVATE BOOL CopyStorage_Impl( const String& rStorageName,
---- svx/source/msfilter/svxmsbas.cxx.old	2009-04-02 11:03:03.000000000 +0000
-+++ svx/source/msfilter/svxmsbas.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -61,6 +61,23 @@ using namespace com::sun::star;
- 
- using rtl::OUString;
- 
-+void SvxImportMSVBasic::extractAttribute( const String& rAttribute, const String& rModName )
-+{
-+    // format of the attribute we are interested in is
-+    // Attribute VB_Control = "ControlName", intString, MSForms, ControlTypeAsString
-+    // e.g.
-+    // Attribute VB_Control = "CommandButton1, 201, 19, MSForms, CommandButton"
-+    String sControlAttribute( RTL_CONSTASCII_USTRINGPARAM("Attribute VB_Control = \"") );
-+    if ( rAttribute.Search( sControlAttribute ) !=  STRING_NOTFOUND )
-+    {
-+        String sRest = rAttribute.Copy( sControlAttribute.Len() );
-+        xub_StrLen nPos = 0; 
-+        String sCntrlName = sRest.GetToken( 0, ',', nPos );
-+        
-+        sal_Int32 nCntrlId = sRest.GetToken( 0, ',', nPos).ToInt32();
-+        m_ModuleNameToObjIdHash[ rModName ][ nCntrlId ] =  sCntrlName;
-+    }
-+}
- int SvxImportMSVBasic::Import( const String& rStorageName,
- 								const String &rSubStorageName,
- 								BOOL bAsComment, BOOL bStripped )
-@@ -369,7 +386,12 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
-                             if( nEnd == STRING_NOTFOUND )
-                                 pStr->Erase();
-                             else
-+                            {
-+								//OSL_TRACE("Erase %s", rtl::OUStringToOString(*pStr, RTL_TEXTENCODING_UTF8 ).getStr() );
-+                                String sAttr= pStr->Copy( nBegin, (nEnd-nBegin)+1);
-+                                extractAttribute( sAttr, sModule );
-                                 pStr->Erase(nBegin, (nEnd-nBegin)+1);
-+                            }
- 						}
- 					}
- 					if( aDecompressed.Get(j)->Len() )
diff --git a/applied_patches/0307-api-application-caller.diff b/applied_patches/0307-api-application-caller.diff
deleted file mode 100644
index f7d258f72..000000000
--- a/applied_patches/0307-api-application-caller.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/excel/XApplication.idl
-index 8b0bde9..82533a5 100644
---- oovbaapi/ooo/vba/excel/XApplication.idl
-+++ oovbaapi/ooo/vba/excel/XApplication.idl
-@@ -110,6 +110,7 @@ interface XApplication
-         raises(com::sun::star::script::BasicErrorException);
- 	void Volatile([in] any Volatile);
- 	void DoEvents();
-+	any Caller( [in] any aIndex );
- };
- 
- }; }; };
-diff --git sc/source/ui/vba/vbaapplication.cxx sc/source/ui/vba/vbaapplication.cxx
-index 431090c..c554faa 100644
---- sc/source/ui/vba/vbaapplication.cxx
-+++ sc/source/ui/vba/vbaapplication.cxx
-@@ -110,6 +110,8 @@ using ::rtl::OUString;
- 
- #define EXCELVERSION "11.0"
- 
-+uno::Any sbxToUnoValue( SbxVariable* pVar );
-+
- class ActiveWorkbook : public ScVbaWorkbook
- {
- protected:
-@@ -1302,6 +1304,25 @@ ScVbaApplication::setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw (
- 	}	
- }
- 
-+uno::Any SAL_CALL 
-+ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException )
-+{
-+	StarBASIC* pBasic = SFX_APP()->GetBasic();
-+	SFX_APP()->EnterBasicCall();
-+	SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FuncCaller") ), SbxCLASS_METHOD );
-+	uno::Any aRet;	
-+	if ( pMeth )
-+	{
-+		SbxVariableRef refTemp = pMeth;
-+		// forces a broadcast
-+		SbxVariableRef pNew = new  SbxMethod( *((SbxMethod*)pMeth));
-+                OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), rtl::OUStringToOString( pNew->GetString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+		aRet = sbxToUnoValue( pNew );
-+	}
-+	SFX_APP()->LeaveBasicCall();
-+	return aRet;
-+}
-+
- rtl::OUString& 
- ScVbaApplication::getServiceImplName()
- {
-diff --git sc/source/ui/vba/vbaapplication.hxx sc/source/ui/vba/vbaapplication.hxx
-index 1c2631e..754885e 100644
---- sc/source/ui/vba/vbaapplication.hxx
-+++ sc/source/ui/vba/vbaapplication.hxx
-@@ -103,6 +103,7 @@ public:
- 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- 	virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException );
- 	virtual void SAL_CALL DoEvents() throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/applied_patches/0273-cli_ure-source-bootstrap-native_glue-cxx.diff b/applied_patches/0307-cli_ure-source-bootstrap-native_glue-cxx.diff
similarity index 100%
rename from applied_patches/0273-cli_ure-source-bootstrap-native_glue-cxx.diff
rename to applied_patches/0307-cli_ure-source-bootstrap-native_glue-cxx.diff
diff --git a/applied_patches/0308-default-autotext-and-form-name.diff b/applied_patches/0308-default-autotext-and-form-name.diff
deleted file mode 100644
index 74ef21e9d..000000000
--- a/applied_patches/0308-default-autotext-and-form-name.diff
+++ /dev/null
@@ -1,168 +0,0 @@
-diff --git sc/inc/globstr.hrc sc/inc/globstr.hrc
-index 893e909..fbf7540 100644
---- sc/inc/globstr.hrc
-+++ sc/inc/globstr.hrc
-@@ -574,7 +574,23 @@
- #define STR_STYLE_FAMILY_CELL       433
- #define STR_STYLE_FAMILY_PAGE       434
- 
--#define STR_COUNT                   435
-+#define STR_SHAPE_AUTOSHAPE         435
-+#define STR_SHAPE_RECTANGLE         436
-+#define STR_SHAPE_LINE              437
-+#define STR_SHAPE_OVAL              438
-+#define STR_SHAPE_TEXTBOX           439
-+                                       
-+#define STR_FORM_BUTTON             440
-+#define STR_FORM_CHECKBOX           441
-+#define STR_FORM_OPTIONBUTTON       442
-+#define STR_FORM_LABEL              443
-+#define STR_FORM_LISTBOX            444
-+#define STR_FORM_GROUPBOX           445
-+#define STR_FORM_DROPDOWN           446
-+#define STR_FORM_SPINNER            447
-+#define STR_FORM_SCROLLBAR          448
-+                                       
-+#define STR_COUNT                   449
- 
- #endif
- 
-diff --git sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx
-index dd26d51..edb5419 100644
---- sc/source/filter/excel/xiescher.cxx
-+++ sc/source/filter/excel/xiescher.cxx
-@@ -3600,27 +3600,27 @@ XclImpObjectManager::XclImpObjectManager( const XclImpRoot& rRoot ) :
-     XclImpRoot( rRoot )
- {
-     maDefObjNames[ EXC_OBJTYPE_GROUP ]          = CREATE_STRING( "Group" );
--    maDefObjNames[ EXC_OBJTYPE_LINE ]           = CREATE_STRING( "Line" );
--    maDefObjNames[ EXC_OBJTYPE_RECTANGLE ]      = CREATE_STRING( "Rectangle" );
--    maDefObjNames[ EXC_OBJTYPE_OVAL ]           = CREATE_STRING( "Oval" );
-+    maDefObjNames[ EXC_OBJTYPE_LINE ]           = ScGlobal::GetRscString( STR_SHAPE_LINE );
-+    maDefObjNames[ EXC_OBJTYPE_RECTANGLE ]      = ScGlobal::GetRscString( STR_SHAPE_RECTANGLE );
-+    maDefObjNames[ EXC_OBJTYPE_OVAL ]           = ScGlobal::GetRscString( STR_SHAPE_OVAL );
-     maDefObjNames[ EXC_OBJTYPE_ARC ]            = CREATE_STRING( "Arc" );
-     maDefObjNames[ EXC_OBJTYPE_CHART ]          = CREATE_STRING( "Chart" );
-     maDefObjNames[ EXC_OBJTYPE_TEXT ]           = CREATE_STRING( "Text" );
--    maDefObjNames[ EXC_OBJTYPE_BUTTON ]         = CREATE_STRING( "Button" );
-+    maDefObjNames[ EXC_OBJTYPE_BUTTON ]         =  ScGlobal::GetRscString( STR_FORM_BUTTON );
-     maDefObjNames[ EXC_OBJTYPE_PICTURE ]        = CREATE_STRING( "Picture" );
-     maDefObjNames[ EXC_OBJTYPE_POLYGON ]        = CREATE_STRING( "Freeform" );
--    maDefObjNames[ EXC_OBJTYPE_CHECKBOX ]       = CREATE_STRING( "Check Box" );
--    maDefObjNames[ EXC_OBJTYPE_OPTIONBUTTON ]   = CREATE_STRING( "Option Button" );
-+    maDefObjNames[ EXC_OBJTYPE_CHECKBOX ]       = ScGlobal::GetRscString( STR_FORM_CHECKBOX ); 
-+    maDefObjNames[ EXC_OBJTYPE_OPTIONBUTTON ]   = ScGlobal::GetRscString( STR_FORM_OPTIONBUTTON );
-     maDefObjNames[ EXC_OBJTYPE_EDIT ]           = CREATE_STRING( "Edit Box" );
--    maDefObjNames[ EXC_OBJTYPE_LABEL ]          = CREATE_STRING( "Label" );
-+    maDefObjNames[ EXC_OBJTYPE_LABEL ]          = ScGlobal::GetRscString( STR_FORM_LABEL );
-     maDefObjNames[ EXC_OBJTYPE_DIALOG ]         = CREATE_STRING( "Dialog Frame" );
--    maDefObjNames[ EXC_OBJTYPE_SPIN ]           = CREATE_STRING( "Spinner" );
--    maDefObjNames[ EXC_OBJTYPE_SCROLLBAR ]      = CREATE_STRING( "Scroll Bar" );
--    maDefObjNames[ EXC_OBJTYPE_LISTBOX ]        = CREATE_STRING( "List Box" );
--    maDefObjNames[ EXC_OBJTYPE_GROUPBOX ]       = CREATE_STRING( "Group Box" );
--    maDefObjNames[ EXC_OBJTYPE_DROPDOWN ]       = CREATE_STRING( "Drop Down" );
-+    maDefObjNames[ EXC_OBJTYPE_SPIN ]           = ScGlobal::GetRscString( STR_FORM_SPINNER );
-+    maDefObjNames[ EXC_OBJTYPE_SCROLLBAR ]      = ScGlobal::GetRscString( STR_FORM_SCROLLBAR );
-+    maDefObjNames[ EXC_OBJTYPE_LISTBOX ]        = ScGlobal::GetRscString( STR_FORM_LISTBOX );
-+    maDefObjNames[ EXC_OBJTYPE_GROUPBOX ]       = ScGlobal::GetRscString( STR_FORM_GROUPBOX );
-+    maDefObjNames[ EXC_OBJTYPE_DROPDOWN ]       = ScGlobal::GetRscString( STR_FORM_DROPDOWN );
-     maDefObjNames[ EXC_OBJTYPE_NOTE ]           = CREATE_STRING( "Comment" );
--    maDefObjNames[ EXC_OBJTYPE_DRAWING ]        = CREATE_STRING( "AutoShape" );
-+    maDefObjNames[ EXC_OBJTYPE_DRAWING ]        = ScGlobal::GetRscString( STR_SHAPE_AUTOSHAPE );
- }
- 
- XclImpObjectManager::~XclImpObjectManager()
-diff --git sc/source/filter/excel/xlescher.cxx sc/source/filter/excel/xlescher.cxx
-index bea2ed1..2ea8f84 100644
---- sc/source/filter/excel/xlescher.cxx
-+++ sc/source/filter/excel/xlescher.cxx
-@@ -38,6 +38,7 @@
- #include "document.hxx"
- #include "xistream.hxx"
- #include "xlescher.hxx"
-+#include "globstr.hrc"
- 
- using ::rtl::OUString;
- using ::com::sun::star::uno::Reference;
-diff --git sc/source/ui/src/globstr.src sc/source/ui/src/globstr.src
-index 4aa90ca..6912e7a 100644
---- sc/source/ui/src/globstr.src
-+++ sc/source/ui/src/globstr.src
-@@ -1721,6 +1721,77 @@ Resource RID_GLOBSTR
-     {
-         Text [ en-US ] = "Unknown User";
-     };
-+
-+    String STR_SHAPE_AUTOSHAPE
-+    {
-+        Text [ en-US ] = "AutoShape";
-+    };
-+
-+    String STR_SHAPE_RECTANGLE
-+    {
-+        Text [ en-US ] = "Rectangle";
-+    };
-+
-+    String STR_SHAPE_LINE
-+    {
-+        Text [ en-US ] = "Line";
-+    };
-+
-+    String STR_SHAPE_OVAL
-+    {
-+        Text [ en-US ] = "Oval";
-+    };
-+
-+    String STR_SHAPE_TEXTBOX
-+    {
-+        Text [ en-US ] = "Text Box";
-+    };
-+
-+    String STR_FORM_BUTTON
-+    {
-+        Text [ en-US ] = "Button";
-+    };
-+
-+    String STR_FORM_CHECKBOX
-+    {
-+        Text [ en-US ] = "Check Box";
-+    };
-+
-+    String STR_FORM_OPTIONBUTTON
-+    {
-+        Text [ en-US ] = "Option Button";
-+    };
-+
-+    String STR_FORM_LABEL
-+    {
-+        Text [ en-US ] = "Label";
-+    };
-+
-+    String STR_FORM_LISTBOX
-+    {
-+        Text [ en-US ] = "List Box";
-+    };
-+
-+    String STR_FORM_GROUPBOX
-+    {
-+        Text [ en-US ] = "Group Box";
-+    };
-+
-+    String STR_FORM_DROPDOWN 
-+    {
-+        Text [ en-US ] = "Drop Down";
-+    };
-+
-+    String STR_FORM_SPINNER
-+    {
-+        Text [ en-US ] = "Spinner";
-+    };
-+
-+    String STR_FORM_SCROLLBAR
-+    {
-+        Text [ en-US ] = "Scroll Bar";
-+    };
-+
-     String STR_STYLE_FAMILY_CELL
-     {
-         Text [ en-US ] = "Cell Styles";
diff --git a/applied_patches/0274-mono-scp2.diff b/applied_patches/0308-mono-scp2.diff
similarity index 100%
rename from applied_patches/0274-mono-scp2.diff
rename to applied_patches/0308-mono-scp2.diff
diff --git a/applied_patches/0275-cli_ure-source-bootstrap-makefile-mk.diff b/applied_patches/0309-cli_ure-source-bootstrap-makefile-mk.diff
similarity index 100%
rename from applied_patches/0275-cli_ure-source-bootstrap-makefile-mk.diff
rename to applied_patches/0309-cli_ure-source-bootstrap-makefile-mk.diff
diff --git a/applied_patches/0309-oovbaapi-disable-vba.diff b/applied_patches/0309-oovbaapi-disable-vba.diff
deleted file mode 100644
index 3818b8014..000000000
--- a/applied_patches/0309-oovbaapi-disable-vba.diff
+++ /dev/null
@@ -1,90 +0,0 @@
---- oovbaapi/genconstidl/makefile.mk	2007-08-30 19:26:17.000000000 +0200
-+++ oovbaapi/genconstidl/makefile.mk	2007-08-30 19:32:11.000000000 +0200
-@@ -40,11 +40,6 @@ PRJNAME=oovbaapi
- 
- .INCLUDE : settings.mk
- 
--.IF "$(ENABLE_VBA)"!="YES"
--dummy:
--        @echo "not building vba..."
--.ENDIF
--
- # symbol files of Microsoft API
- MYSYMFILES = access.api vba.api adodb.api msforms.api word.api dao.api powerpoint.api excel.api stdole.api
- 
---- oovbaapi/ooo/vba/constants/makefile.mk	2007-08-30 19:30:00.000000000 +0200
-+++ oovbaapi/ooo/vba/constants/makefile.mk	2007-08-30 19:31:48.000000000 +0200
-@@ -42,11 +42,6 @@ PACKAGE=ooo$/vba$/constants
- # --- Settings -----------------------------------------------------
- .INCLUDE :  $(PRJ)$/util$/makefile.pmk
- 
--.IF "$(ENABLE_VBA)"!="YES"
--dummy:
--        @echo "not building vba..."
--.ELSE
--
- # ------------------------------------------------------------------------
- 
- # I tried to use the IDLFILES target but it failed dismally
-@@ -64,5 +64,3 @@ $(MY_GEN_UCR_PATH)$/%.urd: $(MY_GEN_IDL_
- $(MYDBTARGET) : $(MYURDFILES)  $(MYIDLFILES)
-     $(REGMERGE) $(OUT)$/ucr/constants.db /UCR @$(mktmp $(MYURDFILES))
-
--.ENDIF
--
---- oovbaapi/ooo/vba/excel/makefile.mk	2007-09-01 11:42:58.000000000 +0200
-+++ oovbaapi/ooo/vba/excel/makefile.mk	2007-09-01 11:55:50.000000000 +0200
-@@ -42,11 +42,6 @@ PACKAGE=ooo$/vba$/Excel
- # --- Settings -----------------------------------------------------
- .INCLUDE :  $(PRJ)$/util$/makefile.pmk
- 
--.IF "$(ENABLE_VBA)"!="YES"
--dummy:
--        @echo "not building vba..."
--.ENDIF
--
- # ------------------------------------------------------------------------
- 
- 
---- oovbaapi/ooo/vba/msforms/makefile.mk	2007-08-30 19:30:20.000000000 +0200
-+++ oovbaapi/ooo/vba/msforms/makefile.mk	2007-08-30 19:31:31.000000000 +0200
-@@ -42,11 +42,6 @@ PACKAGE=ooo$/vba$/msforms
- # --- Settings -----------------------------------------------------
- .INCLUDE :  $(PRJ)$/util$/makefile.pmk
- 
--.IF "$(ENABLE_VBA)"!="YES"
--dummy:
--        @echo "not building vba..."
--.ENDIF
--
- # ------------------------------------------------------------------------
- 
- IDLFILES=\
---- oovbaapi/ooo/vba/makefile.mk	2007-08-30 19:30:25.000000000 +0200
-+++ oovbaapi/ooo/vba/makefile.mk	2007-08-30 19:31:38.000000000 +0200
-@@ -42,11 +42,6 @@ PACKAGE=ooo$/vba
- # --- Settings -----------------------------------------------------
- .INCLUDE :  $(PRJ)$/util$/makefile.pmk
- 
--.IF "$(ENABLE_VBA)"!="YES"
--dummy:
--        @echo "not building vba..."
--.ENDIF
--
- # ------------------------------------------------------------------------
- 
- IDLFILES=\
---- oovbaapi/util/makefile.mk	2007-08-30 17:32:39.000000000 +0200
-+++ oovbaapi/util/makefile.mk	2007-08-30 19:32:03.000000000 +0200
-@@ -44,11 +44,6 @@ TARGET=oovbaapi_db
- 
- .INCLUDE :  makefile.pmk
- 
--.IF "$(ENABLE_VBA)"!="YES"
--dummy:
--        @echo "not building vba..."
--.ENDIF
--
- # ------------------------------------------------------------------
- UNOIDLDBFILES= \
- 	$(UCR)$/vba.db \
diff --git a/applied_patches/0276-cli_ure-mono-bridge.diff b/applied_patches/0310-cli_ure-mono-bridge.diff
similarity index 100%
rename from applied_patches/0276-cli_ure-mono-bridge.diff
rename to applied_patches/0310-cli_ure-mono-bridge.diff
diff --git a/applied_patches/0310-vba-fixup-singlerange-sheetref.diff b/applied_patches/0310-vba-fixup-singlerange-sheetref.diff
deleted file mode 100644
index 374b705f6..000000000
--- a/applied_patches/0310-vba-fixup-singlerange-sheetref.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: sc/inc/address.hxx
-===================================================================
-RCS file: /cvs/sc/sc/inc/address.hxx,v
-retrieving revision 1.14
-diff -u -p -u -p -r1.14 address.hxx
---- sc/inc/address.hxx	27 Sep 2007 13:51:08 -0000	1.14
-+++ sc/inc/address.hxx	15 Apr 2008 11:48:23 -0000
-@@ -221,6 +221,9 @@ inline bool ValidColRowTab( SCCOL nCol, 
- #define SCA_VALID_ROW       0x0100
- #define SCA_VALID_COL       0x0200
- #define SCA_VALID_TAB       0x0400
-+// SCA_BITS is a convience for 
-+// (SCA_VALID_TAB | SCA_VALID_COL | SCA_VALID_ROW | SCA_TAB_3D | SCA_TAB_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_COL_ABSOLUTE)
-+#define SCA_BITS            0x070F
- // somewhat cheesy kludge to force the display of the document name even for
- // local references.  Requires TAB_3D to be valid
- #define SCA_FORCE_DOC       0x0800
-Index: sc/source/core/tool/rangelst.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/core/tool/rangelst.cxx,v
-retrieving revision 1.10
-diff -u -p -u -p -r1.10 rangelst.cxx
---- sc/source/core/tool/rangelst.cxx	27 Feb 2007 12:18:02 -0000	1.10
-+++ sc/source/core/tool/rangelst.cxx	15 Apr 2008 11:48:41 -0000
-@@ -109,15 +109,18 @@ USHORT ScRangeList::Parse( const String&
- 		for ( USHORT i=0; i<nTCount; i++ )
- 		{
- 			aOne = rStr.GetToken( i, cDelimiter );
--			// FIXME : broken for Lotus
--			if ( aOne.Search( ':' ) == STRING_NOTFOUND )
--			{	// Range muss es sein
--				String aStrTmp( aOne );
--				aOne += ':';
--				aOne += aStrTmp;
--			}
- 			aRange.aStart.SetTab( nTab );	// Default Tab wenn nicht angegeben
--			USHORT nRes = aRange.Parse( aOne, pDoc, eConv );
-+			USHORT nRes = aRange.ParseAny( aOne, pDoc, eConv );
-+			USHORT nEndRangeBits = SCA_VALID_COL2 | SCA_VALID_ROW2 |
-+SCA_VALID_TAB2;
-+			USHORT nTmp1 = ( nRes & SCA_BITS );
-+			USHORT nTmp2 = ( nRes & nEndRangeBits );
-+			// If we have a valid single range with
-+			// any of the address bits we are interested in
-+			// set - set the equiv end range bits
-+			if ( (nRes & SCA_VALID ) && nTmp1 && ( nTmp2 != nEndRangeBits ) )
-+					nRes |= ( nTmp1 << 4 );
-+	
- 			if ( (nRes & nMask) == nMask )
- 				Append( aRange );
- 			nResult &= nRes;		// alle gemeinsamen Bits bleiben erhalten
---- sc/source/core/tool/address.cxx	18 Jan 2008 14:33:24 -0000	1.9.248.1
-+++ sc/source/core/tool/address.cxx	15 Apr 2008 11:49:25 -0000
-@@ -1027,7 +1098,7 @@ lcl_ScRange_Parse_OOo( ScRange &aRange, 
-     }
-     nRes1 = ( ( nRes1 | nRes2 ) & SCA_VALID )
-           | nRes1
--          | ( ( nRes2 & 0x070F ) << 4 );
-+          | ( ( nRes2 & SCA_BITS ) << 4 );
-     return nRes1;
- }
- 
diff --git a/applied_patches/0277-mono-build.diff b/applied_patches/0311-mono-build.diff
similarity index 100%
rename from applied_patches/0277-mono-build.diff
rename to applied_patches/0311-mono-build.diff
diff --git a/applied_patches/0311-vba-always-set-defaultprop.diff b/applied_patches/0311-vba-always-set-defaultprop.diff
deleted file mode 100644
index de5389e0d..000000000
--- a/applied_patches/0311-vba-always-set-defaultprop.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- basic/source/classes/sbunoobj.cxx	2008-04-30 14:45:37.000000000 +0100
-+++ basic/source/classes/sbunoobj.cxx	2008-05-08 16:10:05.000000000 +0100
-@@ -786,7 +786,11 @@ void unoToSbxValue( SbxVariable* pVar, c
- 			// SbUnoObject instanzieren
- 			String aName;
- 			SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue );
--			if ( SbiRuntime::isVBAEnabled() )
-+//			If this is called externally e.g. from the scripting 
-+//			framework then there is no 'active' runtime the default property will not be set up
-+//			only a vba object will have XDefaultProp set anyway so... this
-+//			test seems a bit of overkill
-+//			if ( SbiRuntime::isVBAEnabled() )
- 			{
- 				String sDfltPropName;
- 		
diff --git a/applied_patches/0278-build-mono-link.diff b/applied_patches/0312-build-mono-link.diff
similarity index 100%
rename from applied_patches/0278-build-mono-link.diff
rename to applied_patches/0312-build-mono-link.diff
diff --git a/applied_patches/0312-vba-check-for-macro.diff b/applied_patches/0312-vba-check-for-macro.diff
deleted file mode 100644
index 9b5479981..000000000
--- a/applied_patches/0312-vba-check-for-macro.diff
+++ /dev/null
@@ -1,311 +0,0 @@
---- basic/inc/basic/basmgr.hxx.old	2009-04-02 10:49:18.000000000 +0000
-+++ basic/inc/basic/basmgr.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -237,7 +237,7 @@ public:
-             takes the names of modules whose size exceeds the legacy limit
-     */
-     bool            LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< rtl::OUString >& _out_rModuleNames );
--
-+    bool HasExeCode( const String& ); 
- private:
- 	BOOL		    IsReference( USHORT nLib );
- 
---- basic/inc/basic/sbmod.hxx.old	2009-04-06 16:41:58.000000000 +0000
-+++ basic/inc/basic/sbmod.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -128,6 +128,7 @@ public:
- 	BOOL ExceedsLegacyModuleSize();
- 	void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
-         bool IsVBACompat() { return mbVBACompat; }
-+        bool HasExeCode();
- };
- 
- #ifndef __SB_SBMODULEREF_HXX
---- basic/source/basmgr/basmgr.cxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/basmgr/basmgr.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -1127,6 +1127,25 @@ void BasicManager::LegacyDeleteBasicMana
-     _rpManager = NULL;
- }
- 
-+
-+bool BasicManager::HasExeCode( const String& sLib )
-+{
-+	StarBASIC* pLib = GetLib(sLib);	
-+	if ( pLib )
-+	{
-+		SbxArray* pMods = pLib->GetModules();
-+		USHORT nMods = pMods ? pMods->Count() : 0;
-+		for( USHORT i = 0; i < nMods; i++ )
-+		{
-+			SbModule* p = (SbModule*) pMods->Get( i );
-+			if ( p )
-+				if ( p->HasExeCode() )
-+					return true;
-+		}
-+	}
-+	return false;
-+}
-+
- void BasicManager::Init()
- {
- 	DBG_CHKTHIS( BasicManager, 0 );
---- basic/source/classes/sbxmod.cxx.old	2009-04-06 16:41:58.000000000 +0000
-+++ basic/source/classes/sbxmod.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -1124,6 +1124,48 @@ BOOL SbModule::ExceedsLegacyModuleSize()
- 	return false;
- }
- 
-+class ErrorHdlResetter
-+{
-+    Link    mErrHandler;
-+    bool mbError;
-+    public:
-+    ErrorHdlResetter() : mbError( false )
-+    {
-+        // save error handler 
-+        mErrHandler = StarBASIC::GetGlobalErrorHdl();
-+        // set new error handler
-+        StarBASIC::SetGlobalErrorHdl( LINK( this, ErrorHdlResetter, BasicErrorHdl ) );
-+    }
-+    ~ErrorHdlResetter()
-+    {
-+        // restore error handler 
-+        StarBASIC::SetGlobalErrorHdl(mErrHandler);
-+    }
-+    DECL_LINK( BasicErrorHdl, StarBASIC * );
-+    bool HasError() { return mbError; }
-+};
-+IMPL_LINK( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/)
-+{
-+    mbError = true;
-+    return 0;        
-+}
-+
-+bool SbModule::HasExeCode()
-+{
-+
-+        ErrorHdlResetter aGblErrHdl;
-+	// And empty Image always has the Global Chain set up
-+        static const unsigned char pEmptyImage[] = { 0x45, 0x0 , 0x0, 0x0, 0x0 };
-+        // lets be stricter for the moment than VBA
-+
-+	bool bRes = false;
-+	if ( !IsCompiled() )
-+		Compile();
-+	if ( pImage && !( pImage->GetCodeSize() == 5 && ( memcmp( pImage->GetCode(), pEmptyImage, pImage->GetCodeSize() ) == 0 ) )
-+        || aGblErrHdl.HasError() )
-+		bRes = true;
-+	return bRes;
-+}
- 
- // Store only image, no source
- BOOL SbModule::StoreBinaryData( SvStream& rStrm )
---- basic/source/inc/dlgcont.hxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/inc/dlgcont.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -96,7 +96,9 @@ public:
-         throw (::com::sun::star::uno::RuntimeException);
-     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
-         throw (::com::sun::star::uno::RuntimeException);
--
-+    // XLibraryQueryExecutable
-+    virtual sal_Bool SAL_CALL HasExecutableCode(const rtl::OUString&)
-+        throw (::com::sun::star::uno::RuntimeException);
-     // Service
- 	static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static();
- 	static ::rtl::OUString getImplementationName_static();
---- basic/source/inc/namecont.hxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/inc/namecont.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -38,6 +38,7 @@
- #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
- #include <com/sun/star/script/XLibraryContainerPassword.hpp>
- #include <com/sun/star/script/XLibraryContainerExport.hpp>
-+#include <com/sun/star/script/XLibraryQueryExecutable.hpp>
- #include <com/sun/star/container/XNameContainer.hpp>
- #include <com/sun/star/container/XContainer.hpp>
- #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-@@ -61,6 +62,7 @@
- 
- #include <cppuhelper/implbase2.hxx>
- #include <cppuhelper/compbase6.hxx>
-+#include <cppuhelper/compbase7.hxx>
- #include <cppuhelper/interfacecontainer.hxx>
- 
- class BasicManager;
-@@ -68,12 +70,13 @@ class BasicManager;
- namespace basic
- {
- 
--typedef ::cppu::WeakComponentImplHelper6< 
-+typedef ::cppu::WeakComponentImplHelper7< 
-     ::com::sun::star::lang::XInitialization,
-     ::com::sun::star::script::XStorageBasedLibraryContainer,
-     ::com::sun::star::script::XLibraryContainerPassword,
-     ::com::sun::star::script::XLibraryContainerExport,
-     ::com::sun::star::container::XContainer,
-+    ::com::sun::star::script::XLibraryQueryExecutable,
-     ::com::sun::star::lang::XServiceInfo > LibraryContainerHelper;
- 
- typedef ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameContainer,
---- basic/source/inc/scriptcont.hxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/inc/scriptcont.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -120,7 +120,9 @@ public:
-         throw (::com::sun::star::lang::IllegalArgumentException, 
-                ::com::sun::star::container::NoSuchElementException, 
-                ::com::sun::star::uno::RuntimeException);
--
-+    // XLibraryQueryExecutable
-+    virtual sal_Bool SAL_CALL HasExecutableCode(const rtl::OUString&)
-+        throw (::com::sun::star::uno::RuntimeException);
-     // Methods XServiceInfo
-     virtual ::rtl::OUString SAL_CALL getImplementationName( )
-         throw (::com::sun::star::uno::RuntimeException);
---- basic/source/uno/dlgcont.cxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/uno/dlgcont.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -484,7 +484,11 @@ void SfxDialogLibraryContainer::onNewRoo
- 	}
- }
- 
--
-+sal_Bool SAL_CALL
-+SfxDialogLibraryContainer:: HasExecutableCode( const ::rtl::OUString& Library ) throw (uno::RuntimeException)
-+{
-+	return sal_False; // dialog library has no executable code
-+}
- //============================================================================
- // Service
- 
---- basic/source/uno/scriptcont.cxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/uno/scriptcont.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -67,7 +67,8 @@
- #include <xmlscript/xmlmod_imexp.hxx>
- #include <cppuhelper/factory.hxx>
- #include <com/sun/star/util/VetoException.hpp>
--
-+#include <com/sun/star/script/XLibraryQueryExecutable.hpp>
-+#include <cppuhelper/implbase1.hxx>
- namespace basic
- {
- 
-@@ -138,7 +139,6 @@ sal_Bool SfxScriptLibraryContainer::hasL
-     return pImplLib->mbPasswordProtected;
- }
- 
--
- // Ctor for service
- SfxScriptLibraryContainer::SfxScriptLibraryContainer( void )
-     :maScriptLanguage( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" ) )
-@@ -1050,6 +1050,17 @@ void SfxScriptLibraryContainer::onNewRoo
- {
- }
- 
-+sal_Bool SAL_CALL
-+SfxScriptLibraryContainer:: HasExecutableCode( const ::rtl::OUString& Library ) throw (uno::RuntimeException)
-+{
-+	BasicManager* pBasicMgr = getBasicManager();
-+    	OSL_ENSURE( pBasicMgr, "we need a basicmanager, really we do" );
-+	if ( pBasicMgr )
-+		return pBasicMgr->HasExeCode( Library ); // need to change this to take name
-+	// default to it has code if we can't decide
-+	return sal_True;
-+}
-+
- //============================================================================
- // Service
- void createRegistryInfo_SfxScriptLibraryContainer()
---- offapi/com/sun/star/script/XLibraryQueryExecutable.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ offapi/com/sun/star/script/XLibraryQueryExecutable.idl	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,51 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XLibraryContainer.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __com_sun_star_script_XLibraryQueryExecutable_idl__ 
-+#define __com_sun_star_script_XLibraryQueryExecutable_idl__ 
-+ 
-+#ifndef __com_sun_star_uno_XInterface_idl__ 
-+#include <com/sun/star/uno/XInterface.idl> 
-+#endif 
-+ 
-+//============================================================================= 
-+ 
-+module com {  module sun {  module star {  module script {  
-+ 
-+interface XLibraryQueryExecutable: com::sun::star::uno::XInterface
-+{ 
-+	boolean HasExecutableCode( [in] string name );
-+};
-+
-+//============================================================================= 
-+ 
-+ 
-+}; }; }; };  
-+ 
-+#endif 
---- offapi/com/sun/star/script/makefile.mk.old	2009-04-02 10:51:40.000000000 +0000
-+++ offapi/com/sun/star/script/makefile.mk	2009-04-06 16:41:59.000000000 +0000
-@@ -51,6 +51,7 @@ IDLFILES=\
- 	XLibraryContainerExport.idl\
- 	XPersistentLibraryContainer.idl\
- 	XStorageBasedLibraryContainer.idl\
-+	XLibraryQueryExecutable.idl \
- 	ModuleSizeExceededRequest.idl\
- 
- # ------------------------------------------------------------------
---- sfx2/source/doc/docmacromode.cxx.old	2009-04-02 10:43:58.000000000 +0000
-+++ sfx2/source/doc/docmacromode.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -40,6 +40,7 @@
- #include <com/sun/star/task/DocumentMacroConfirmationRequest.hpp>
- #include <com/sun/star/task/InteractionClassification.hpp>
- #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
-+#include <com/sun/star/script/XLibraryQueryExecutable.hpp>
- /** === end UNO includes === **/
- 
- #include <comphelper/componentcontext.hxx>
-@@ -75,8 +76,10 @@ namespace sfx2
-     using ::com::sun::star::document::XEmbeddedScripts;
-     using ::com::sun::star::uno::UNO_SET_THROW;
-     using ::com::sun::star::script::XLibraryContainer;
-+    using ::com::sun::star::script::XLibraryQueryExecutable;
-     using ::com::sun::star::container::XNameAccess;
-     using ::com::sun::star::uno::UNO_QUERY_THROW;
-+    using ::com::sun::star::uno::UNO_QUERY;
- 	/** === end UNO using === **/
-     namespace MacroExecMode = ::com::sun::star::document::MacroExecMode;
- 
-@@ -438,11 +441,9 @@ namespace sfx2
-                             // rid of the "Standard" thingie - this shouldn't be necessary
-                             // anymore, should it?
-                             // 2007-01-25 / frank.schoenheit@sun.com
--						    Reference < XNameAccess > xLib;
--						    Any aAny = xContainer->getByName( aStdLibName );
--						    aAny >>= xLib;
-+						    Reference < XLibraryQueryExecutable > xLib( xContainer, UNO_QUERY );
- 						    if ( xLib.is() )
--							    bHasMacroLib = xLib->hasElements();
-+							    bHasMacroLib = xLib->HasExecutableCode( aStdLibName );
- 					    }
- 				    }
- 			    }
diff --git a/applied_patches/0279-mono-build-keyfile.diff b/applied_patches/0313-mono-build-keyfile.diff
similarity index 100%
rename from applied_patches/0279-mono-build-keyfile.diff
rename to applied_patches/0313-mono-build-keyfile.diff
diff --git a/applied_patches/0313-vba-support-properties-inmodules.diff b/applied_patches/0313-vba-support-properties-inmodules.diff
deleted file mode 100644
index 3ca020eea..000000000
--- a/applied_patches/0313-vba-support-properties-inmodules.diff
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -rup basic/source/classes/sb.cxx basic.patched/source/classes/sb.cxx
---- basic/source/classes/sb.cxx	2008-05-22 09:44:11.000000000 +0100
-+++ basic/source/classes/sb.cxx	2008-05-23 18:10:51.000000000 +0100
-@@ -461,72 +461,7 @@ SbClassModuleObject::~SbClassModuleObjec
- void SbClassModuleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- 						   const SfxHint& rHint, const TypeId& rHintType )
- {
--	bool bDone = false;
--
--	const SbxHint* pHint = PTR_CAST(SbxHint,&rHint);
--	if( pHint )
--	{
--		SbxVariable* pVar = pHint->GetVar();
--		SbProcedureProperty* pProcProperty = PTR_CAST( SbProcedureProperty, pVar );
--		if( pProcProperty )
--		{
--			bDone = true;
--
--			if( pHint->GetId() == SBX_HINT_DATAWANTED )
--			{
--				String aProcName;
--				aProcName.AppendAscii( "Property Get " );
--				aProcName += pProcProperty->GetName();
--
--				SbxVariable* pMeth = Find( aProcName, SbxCLASS_METHOD );
--				if( pMeth )
--				{
--					SbxValues aVals;
--					aVals.eType = SbxVARIANT;
--					pMeth->Get( aVals );
--					pVar->Put( aVals );
--				}
--			}
--			else if( pHint->GetId() == SBX_HINT_DATACHANGED )
--			{
--				SbxVariable* pMeth = NULL;
--
--				bool bSet = pProcProperty->isSet();
--				if( bSet )
--				{
--					pProcProperty->setSet( false );
--
--					String aProcName;
--					aProcName.AppendAscii( "Property Set " );
--					aProcName += pProcProperty->GetName();
--					pMeth = Find( aProcName, SbxCLASS_METHOD );
--				}
--				if( !pMeth )	// Let
--				{
--					String aProcName;
--					aProcName.AppendAscii( "Property Let " );
--					aProcName += pProcProperty->GetName();
--					pMeth = Find( aProcName, SbxCLASS_METHOD );
--				}
--
--				if( pMeth )
--				{
--					// Setup parameters
--					SbxArrayRef xArray = new SbxArray;
--					xArray->Put( pMeth, 0 );	// Method as parameter 0
--					xArray->Put( pVar, 1 );
--					pMeth->SetParameters( xArray );
--
--					SbxValues aVals;
--					pMeth->Get( aVals );
--					pMeth->SetParameters( NULL );
--				}
--			}
--		}
--	}
--
--	if( !bDone )
--		SbModule::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
-+	SbModule::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
- }
- 
- SbxVariable* SbClassModuleObject::Find( const XubString& rName, SbxClassType t )
-diff -rup basic/source/classes/sbxmod.cxx basic.patched/source/classes/sbxmod.cxx
---- basic/source/classes/sbxmod.cxx	2008-05-22 09:44:12.000000000 +0100
-+++ basic.patched/source/classes/sbxmod.cxx	2008-05-23 18:11:36.000000000 +0100
-@@ -471,6 +471,64 @@ void SbModule::SFX_NOTIFY( SfxBroadcaste
- 		SbxVariable* pVar = pHint->GetVar();
- 		SbProperty* pProp = PTR_CAST(SbProperty,pVar);
- 		SbMethod* pMeth = PTR_CAST(SbMethod,pVar);
-+		SbProcedureProperty* pProcProperty = PTR_CAST( SbProcedureProperty, pVar );
-+		if( pProcProperty )
-+		{
-+			if( pHint->GetId() == SBX_HINT_DATAWANTED )
-+			{
-+				String aProcName;
-+				aProcName.AppendAscii( "Property Get " );
-+				aProcName += pProcProperty->GetName();
-+
-+				SbxVariable* pPropMeth = Find( aProcName, SbxCLASS_METHOD );
-+				if( pPropMeth )
-+				{
-+					// Setup parameters
-+					pPropMeth->SetParameters( pVar->GetParameters() );
-+
-+					SbxValues aVals;
-+					aVals.eType = SbxVARIANT;
-+					pPropMeth->Get( aVals );
-+					pVar->Put( aVals );
-+				}
-+			}
-+			else if( pHint->GetId() == SBX_HINT_DATACHANGED )
-+			{
-+				SbxVariable* pPropMeth = NULL;
-+
-+				bool bSet = pProcProperty->isSet();
-+				if( bSet )
-+				{
-+					pProcProperty->setSet( false );
-+
-+					String aProcName;
-+					aProcName.AppendAscii( "Property Set " );
-+					aProcName += pProcProperty->GetName();
-+					pPropMeth = Find( aProcName, SbxCLASS_METHOD );
-+				}
-+				if( !pPropMeth )	// Let
-+				{
-+					String aProcName;
-+					aProcName.AppendAscii( "Property Let " );
-+					aProcName += pProcProperty->GetName();
-+					pPropMeth = Find( aProcName, SbxCLASS_METHOD );
-+				}
-+
-+				if( pPropMeth )
-+				{
-+					// Setup parameters
-+					SbxArrayRef xArray = new SbxArray;
-+					xArray->Put( pPropMeth, 0 );	// Method as parameter 0
-+					xArray->Put( pVar, 1 );
-+					pPropMeth->SetParameters( xArray );
-+
-+					SbxValues aVals;
-+					pPropMeth->Get( aVals );
-+					pPropMeth->SetParameters( NULL );
-+				}
-+			}
-+		}
-+
- 		if( pProp )
- 		{
- 			if( pProp->GetModule() != this )
diff --git a/applied_patches/0314-controls-with-images-import.diff b/applied_patches/0314-controls-with-images-import.diff
deleted file mode 100644
index f1182e8da..000000000
--- a/applied_patches/0314-controls-with-images-import.diff
+++ /dev/null
@@ -1,443 +0,0 @@
---- svx/inc/svx/msocximex.hxx.bak	2008-09-01 10:18:35.000000000 +0800
-+++ svx/inc/svx/msocximex.hxx	2008-09-01 10:35:13.000000000 +0800
-@@ -32,6 +32,7 @@
- 
- #include <sot/storage.hxx>
- #include <tools/debug.hxx>
-+#include <com/sun/star/graphic/XGraphicObject.hpp>
- 
- //!! no such defines in global namespaces - it will break other existing code that uses the same define!!
- //#ifndef C2U
-@@ -327,14 +328,13 @@ public:
-     nMultiState(0), nValueLen(0), nCaptionLen(0), nVertPos(1), nHorzPos(7),
- 	nSpecialEffect(2), nIcon(0), nPicture(0), nAccelerator(0), nGroupNameLen(0),
- 	pValue(0), pCaption(0), pGroupName(0), nIconLen(0), pIcon(0),
--    nPictureLen(0), pPicture(0) {}
-+    nPictureLen(0) {}
- 
- 	~OCX_ModernControl() {
- 		if (pValue) delete[] pValue;
- 		if (pCaption) delete[] pCaption;
- 		if (pGroupName) delete[] pGroupName;
- 		if (pIcon) delete[] pIcon;
--		if (pPicture) delete[] pPicture;
- 	}
- 	sal_Bool Read(SotStorageStream *pS);
- 
-@@ -417,7 +417,8 @@ public:
- 
- 	sal_uInt8 pPictureHeader[20];
- 	sal_uInt32 nPictureLen;
--	sal_uInt8 *pPicture;
-+    ::rtl::OUString sImageUrl;
-+	com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
- 
- };
- 
-@@ -466,6 +467,7 @@ public:
- 
-         bool bAutoSize;
-         ::rtl::OUString sImageUrl;
-+		com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
-         sal_Bool Read(SotStorageStream *pS);
- 
- 	using OCX_Control::Import; // to not hide the other two import methods
-@@ -817,7 +819,6 @@ public:
- 	{
- 		delete[] pCaption;
- 		delete[] pIcon;
--		delete[] pPicture;
- 	}
- 
- 	virtual sal_Bool Read(SvStorageStream *pS);
-@@ -881,7 +882,8 @@ public:
- 
- 	sal_uInt8 pPictureHeader[20];
- 	sal_uInt32  nPictureLen;
--	sal_uInt8 *pPicture;
-+    ::rtl::OUString sImageUrl;
-+	com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
- private:
-         com::sun::star::uno::Reference<
-                 com::sun::star::uno::XComponentContext> mxCtx;
-@@ -1076,7 +1078,7 @@ public:
- 	fEnabled(1), fLocked(0), fBackStyle(1), fWordWrap(0), fAutoSize(0),
-         nCaptionLen(0), nVertPos(1), nHorzPos(7), nMousePointer(0), nPicture(0),
-         nAccelerator(0), nIcon(0), pCaption(0), nIconLen(0), pIcon(0), nPictureLen(0),
--        pPicture(0), mbTakeFocus( true )
-+        mbTakeFocus( true )
- 	{
- 	        msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.CommandButton");
- 	        msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlButtonModel");
-@@ -1087,7 +1089,6 @@ public:
- 	~OCX_CommandButton() {
- 		if (pCaption) delete[] pCaption;
- 		if (pIcon) delete[] pIcon;
--		if (pPicture) delete[] pPicture;
- 	}
- 	sal_Bool Read(SotStorageStream *pS);
- 
-@@ -1130,7 +1131,8 @@ public:
- 
- 	sal_uInt8 pPictureHeader[20];
- 	sal_uInt32  nPictureLen;
--	sal_uInt8 *pPicture;
-+    ::rtl::OUString sImageUrl;
-+	com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
- 
-     bool        mbTakeFocus;
- 
-@@ -1248,7 +1250,7 @@ public:
- 
- 	sal_uInt8 pPictureHeader[20];
- 	sal_uInt32  nPictureLen;
--	sal_uInt8 *pPicture;
-+ 	sal_uInt8 *pPicture;
- 
- 	static OCX_Control *Create() { return new OCX_Label;}
- 
---- svx/source/msfilter/msocximex.cxx.bak	2008-09-01 10:18:35.000000000 +0800
-+++ svx/source/msfilter/msocximex.cxx	2008-09-01 10:54:52.000000000 +0800
-@@ -79,6 +79,12 @@
- 
- #include <algorithm>
- #include <memory>
-+#include <com/sun/star/graphic/GraphicObject.hpp>
-+#include <com/sun/star/graphic/XGraphicProvider.hpp>
-+#include <com/sun/star/graphic/XGraphic.hpp>
-+#include <com/sun/star/io/XInputStream.hpp>
-+#include <comphelper/componentcontext.hxx>
-+#include <unotools/streamwrap.hxx>
- 
- #ifndef C2S
- #define C2S(cChar)	String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
-@@ -102,6 +108,7 @@ using namespace cppu;
- 
- 
- #define WW8_ASCII2STR(s) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(s))
-+#define GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
- 
- 
- static char sWW8_form[] = "WW-Standard";
-@@ -130,126 +137,48 @@ long ReadAlign(SvStorageStream *pS, long
-     return 0;
- }
- 
--
- // NP - Images in controls in OO2.0/SO8 exist as links, e.g. they are not part of the document so are
- // referenced externally. On import from ms document try to save images for controls here.
- // Images are stored in directory called temp in the user installation directory. Next version of OO/SO
- // hopefully will address this issue and allow a choice e.g. images for controls to be stored as links
- // or embeded in the document.
--
--// [out]location     path to the stream to where the image is to be stored,
--//               if same name exists in folder then this function calcuates a new name
--// [in] data     raw bytes of image to be stored.
--// [in] dataLen  no. byte to be stored
--//
--// returns, true if successful
--
--bool storePictureInFileSystem( OUString& location, sal_uInt8* data, sal_uInt32 dataLen )
-+uno::Reference< graphic::XGraphicObject> lcl_readGraphicObject( SotStorageStream *pS )
- {
--    bool result = true;
--    OUString origPath = location;
--    try
--    {
--        uno::Reference<lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(),
--                                                      uno::UNO_QUERY_THROW );
--        uno::Reference< com::sun::star::ucb::XSimpleFileAccess> xSFA( xMSF->createInstance(
--                                                       S2U("com.sun.star.ucb.SimpleFileAccess" ) ),
--                                                       uno::UNO_QUERY_THROW );
--        OUString ext;
--        sal_Int32 index = 0;
--        while (  xSFA->exists( location ) )
--        {
--            ext = OUString::valueOf( ++index );
--            location = origPath + ext;
--        }
--
--        SvStream*  pStream = ::utl::UcbStreamHelper::CreateStream( location, STREAM_WRITE | STREAM_TRUNC );
--        if ( pStream )
--        {
--            pStream->Write(data, dataLen);
--            delete pStream;
--        }
--        else
--        {
--            result = false;
--        }
--    }
--    catch( uno::Exception& )
--    {
--        result = false;
--    }
--    return result;
-+	uno::Reference< graphic::XGraphicObject > xGrfObj;
-+	uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
-+	if( xServiceManager.is() )
-+	{
-+		try
-+		{
-+			// use the GraphicProvider service to get the XGraphic
-+			uno::Reference< graphic::XGraphicProvider > xGraphProvider(
-+					xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ), uno::UNO_QUERY );
-+			if( xGraphProvider.is() )
-+			{
-+				uno::Reference< io::XInputStream > xStream( new utl::OInputStreamWrapper( *pS ) );
-+				if( xStream.is() )
-+				{
-+					uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
-+					aMediaProps[0].Name = ::rtl::OUString::createFromAscii( "InputStream" );
-+					aMediaProps[0].Value <<= xStream;
-+					uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps );
-+					if( xGraphic.is() )
-+					{
-+						// create an XGraphicObject
-+						::comphelper::ComponentContext aContext( xServiceManager );
-+						xGrfObj = graphic::GraphicObject::create( aContext.getUNOContext() );
-+						xGrfObj->setGraphic(xGraphic);
-+					}
-+				}
-+			}
-+		}
-+		catch( uno::Exception& )
-+		{
-+		}
-+	}
-+	return xGrfObj;
- }
- 
--// NP - Images in controls in OO2.0/SO8 exist as links, e.g. they are not part of the document so are
--// referenced externally. On import from ms document try to save images from controls here so this
--// at least a macro programmer has a chance to accessed them manually later. Next version of OO/SO
--// hopefully will address this issue.
--// Images will be stored in a top level folder in the document package, folder is named "MigratedImages"
--
--// [in] pDocSh*  the document shell.
--// [in] name     name of stream image to stored in.
--// [in] data     raw bytes of image to be stored.
--// [in] dataLen  no. byte to be stored
--
--bool storePictureInDoc( SfxObjectShell* pDocSh, OUString& name, sal_uInt8* data, sal_uInt32 dataLen )
--{
--    uno::Reference < embed::XStorage > xStor;
--    if (pDocSh)
--    {
--        xStor = pDocSh->GetStorage();
--        if( xStor.is() )
--        {
--            try
--            {
--                uno::Reference< embed::XStorage > xPictures = xStor->openStorageElement(
--                    OUString( RTL_CONSTASCII_USTRINGPARAM( "MigratedImages" ) ),
--                    embed::ElementModes::READWRITE );
--                uno::Reference< beans::XPropertySet > xPropSet( xPictures, uno::UNO_QUERY );
--
--                // Set media type of folder MigratedImages to something ( that is unknown ) so that
--                // it will get copied to exported OO/SO format after SaveAs
--                if ( xPropSet.is() )
--                {
--                    OUString aMediaType = C2U("MigrationImages");
--                    uno::Any a;
--                    a <<= aMediaType;
--                    xPropSet->setPropertyValue( C2U("MediaType"), a );
--                }
--
--                uno::Reference< io::XStream > xObjReplStr = xPictures->openStreamElement(
--                        name,
--                        embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
--                uno::Reference< io::XOutputStream > xOutStream( xObjReplStr->getOutputStream(), uno::UNO_QUERY_THROW );
--                uno::Sequence< sal_Int8 > imageBytes( (sal_Int8*)data, dataLen );
--                xOutStream->writeBytes( imageBytes );
--                xOutStream->closeOutput();
--
--                uno::Reference< embed::XTransactedObject > xTransact( xPictures, uno::UNO_QUERY );
--                if ( xTransact.is() )
--                {
--                    xTransact->commit();
--                }
--            }
--            catch( uno::Exception& )
--            {
--                return false;
--            }
--
--        }
--        else
--        {
--            // no storage something wrong
--            return false;
--        }
--    }
--    else
--    {
--        //No doc shell
--        return false;
--    }
--    return true;
--}
- 
- long WriteAlign(SvStorageStream *pS, int nAmount)
- {
-@@ -1243,6 +1172,12 @@ sal_Bool OCX_CommandButton::Import( com:
-     rPropSet->setPropertyValue( WW8_ASCII2STR( "FocusOnClick" ), aTmp );
- 
- 	aFontData.Import(rPropSet);
-+
-+    if ( sImageUrl.getLength() )
-+    {
-+        aTmp <<= sImageUrl;
-+        rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
-+    }
- 	return sal_True;
- }
- 
-@@ -1564,7 +1599,11 @@ sal_Bool OCX_OptionButton::Import(com::s
-         aTmp <<= lclCreateOUString( pGroupName, nGroupNameLen );
-         rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
-     }
--
-+    if ( sImageUrl.getLength() )
-+    {
-+        aTmp <<= sImageUrl;
-+        rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
-+    }
- 	aFontData.Import(rPropSet);
- 	return sal_True;
- }
-@@ -2198,6 +2139,12 @@ sal_Bool OCX_ToggleButton::Import(com::s
- 	}
- 
- 	aFontData.Import(rPropSet);
-+	
-+    if ( sImageUrl.getLength() )
-+    {
-+        aTmp <<= sImageUrl;
-+        rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
-+    }
- 	return sal_True;
- }
- 
-@@ -3051,8 +2998,15 @@ sal_Bool OCX_ModernControl::Read(SvStora
- 	{
- 		pS->Read(pPictureHeader,20);
- 		*pS >> nPictureLen;
--		pPicture = new sal_uInt8[nPictureLen];
--		pS->Read(pPicture,nPictureLen);
-+		long imagePos = pS->Tell();
-+		mxGrfObj = lcl_readGraphicObject( pS );
-+		if( mxGrfObj.is() )
-+		{
-+			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
-+			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
-+		}
-+		// make sure the stream position should be pointing after the image
-+		pS->Seek( imagePos + nPictureLen );
- 	}
- 
- 	return sal_True;
-@@ -3362,8 +3316,15 @@ sal_Bool OCX_CommandButton::Read(SvStora
- 	{
- 		pS->Read(pPictureHeader,20);
- 		*pS >> nPictureLen;
--		pPicture = new sal_uInt8[nPictureLen];
--		pS->Read(pPicture,nPictureLen);
-+		long imagePos = pS->Tell();
-+		mxGrfObj = lcl_readGraphicObject( pS );
-+		if( mxGrfObj.is() )
-+		{
-+			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
-+			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
-+		}
-+		// make sure the stream position should be pointing after the image
-+		pS->Seek( imagePos + nPictureLen );
- 	}
- 
- 	return sal_True;
-@@ -4140,8 +4101,7 @@ OCX_UserForm::OCX_UserForm( SotStorageRe
- 		nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nSpecialEffect(0),
- 		nPicture(0), nPictureAlignment(2), nPictureSizeMode(0),
- 		bPictureTiling(FALSE), nAccelerator(0), nIcon(0), pCaption(0),
--		nScrollWidth(0), nScrollHeight(0), nScrollLeft(0), nScrollTop(0), nIconLen(0), pIcon(0), nPictureLen(0),
--		pPicture(0)
-+		nScrollWidth(0), nScrollHeight(0), nScrollLeft(0), nScrollTop(0), nIconLen(0), pIcon(0), nPictureLen(0)
- 	{
-             mnForeColor = 0x80000012;
- 		    mnBackColor = 0x8000000F;
-@@ -4275,8 +4235,15 @@ sal_Bool OCX_UserForm::Read(SvStorageStr
- 	{
- 		pS->Read(pPictureHeader,20);
- 		*pS >> nPictureLen;
--		pPicture = new sal_uInt8[nPictureLen];
--		pS->Read(pPicture,nPictureLen);
-+		long imagePos = pS->Tell();
-+		mxGrfObj = lcl_readGraphicObject( pS );
-+		if( mxGrfObj.is() )
-+		{
-+			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
-+			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
-+		}
-+		// make sure the stream position should be pointing after the image
-+		pS->Seek( imagePos + nPictureLen );
- 	}
- 
-     ReadAlign( pS, pS->Tell() - nStart, 4);
-@@ -4338,6 +4305,19 @@ sal_Bool OCX_UserForm::Import(
-         rLib->replaceByName(sName, aSourceAny);
-     else
-         rLib->insertByName(sName, aSourceAny);
-+
-+    if ( sImageUrl.getLength() )
-+    {
-+        aTmp <<= sImageUrl;
-+		try
-+		{
-+        	xDialogPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
-+		}
-+		catch( uno::Exception& )
-+		{
-+			OSL_TRACE("OCX_UserForm::Import, Image fails to import");
-+		}
-+    }
-     return sal_True;
- }
- 
-@@ -5016,12 +4996,6 @@ sal_Bool OCX_TabStrip::ReadFontData(SotS
- 
- sal_Bool OCX_Image::Read(SotStorageStream *pS)
- {
--    if ( !bSetInDialog )
--    {
--        // preserve the present behavior at the moment.
--        // only import image control for UserForms
--        return sal_False;
--    }
-     ULONG nStart = pS->Tell();
- 	*pS >> nIdentifier;
- 	DBG_ASSERT(nStandardId==nIdentifier,
-@@ -5125,16 +5099,14 @@ sal_Bool OCX_Image::Read(SotStorageStrea
- 
-         long imagePos = pS->Tell();
- 
--        pS->Seek( imagePos );
--
--        sImageUrl =  C2U("vnd.sun.star.expand:${$BRAND_BASE_DIR/program/") + C2U( SAL_CONFIGFILE( "bootstrap" ) ) + C2U("::UserInstallation}/user/temp/") + sName;
--
--        sal_uInt8* pImage = new sal_uInt8[ nImageLen ];
--        pS->Read(pImage, nImageLen);
--        bool result = storePictureInFileSystem( sImageUrl, pImage, nImageLen );
--        OUString pictName = sImageUrl.copy( sImageUrl.lastIndexOf('/') + 1 );
--        result = storePictureInDoc( pDocSh, pictName, pImage, nImageLen );
--        delete pImage;
-+		mxGrfObj = lcl_readGraphicObject( pS );
-+		if( mxGrfObj.is() )
-+		{
-+			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
-+			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
-+		}
-+		// make sure the stream position should be pointing after the image
-+		pS->Seek( imagePos + nImageLen );
-     }
-     return sal_True;
- }
diff --git a/applied_patches/0280-mono-climaker.diff b/applied_patches/0314-mono-climaker.diff
similarity index 100%
rename from applied_patches/0280-mono-climaker.diff
rename to applied_patches/0314-mono-climaker.diff
diff --git a/applied_patches/0315-enhanced-form-userform-controls.diff b/applied_patches/0315-enhanced-form-userform-controls.diff
deleted file mode 100644
index 33e8b3511..000000000
--- a/applied_patches/0315-enhanced-form-userform-controls.diff
+++ /dev/null
@@ -1,2031 +0,0 @@
---- basctl/source/basicide/baside3.cxx.old	2009-04-02 10:56:36.000000000 +0000
-+++ basctl/source/basicide/baside3.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -112,7 +112,7 @@ DialogWindow::DialogWindow( Window* pPar
- {
- 	InitSettings( TRUE, TRUE, TRUE );
- 
--	pEditor = new DlgEditor();
-+	pEditor = new DlgEditor( rDocument.getDocument() );
- 	pEditor->SetWindow( this );
- 	pEditor->SetDialog( xDialogModel );
- 
-@@ -724,7 +724,7 @@ BOOL DialogWindow::SaveDialog()
- 		Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
- 		OSL_ASSERT( xProps.is() );
- 		OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
--		Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
-+		Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().getDocument() );
- 		Reference< XInputStream > xInput( xISP->createInputStream() );
- 
- 		Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
-@@ -942,7 +942,7 @@ void DialogWindow::StoreData()
-                     Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
-                     OSL_ASSERT( xProps.is() );
-                     OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
--					Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
-+					Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().getDocument() );
- 					xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) );
- 				}
- 			}
---- basctl/source/basicide/basides3.cxx.old	2009-04-02 10:56:36.000000000 +0000
-+++ basctl/source/basicide/basides3.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -98,7 +98,7 @@ DialogWindow* BasicIDEShell::CreateDlgWi
-                 Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
-                 OSL_ASSERT( xProps.is() );
-                 OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
--				::xmlscript::importDialogModel( xInput, xDialogModel, xContext );
-+				::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.getDocument() );
- 				LocalizationMgr::setStringResourceAtDialog( rDocument, rLibName, aDlgName, xDialogModel );
- 
- 				// new dialog window
---- basctl/source/basicide/moduldlg.cxx.old	2009-04-02 10:56:36.000000000 +0000
-+++ basctl/source/basicide/moduldlg.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -315,7 +315,7 @@ void BasicIDEShell::CopyDialogResources(
-     Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
-     OSL_ASSERT( xProps.is() );
-     OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
--	::xmlscript::importDialogModel( xInput, xDialogModel, xContext );
-+	::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rSourceDoc.getDocument() );
- 
- 	if( xDialogModel.is() )
- 	{
-@@ -332,7 +332,7 @@ void BasicIDEShell::CopyDialogResources(
- 		{
- 			LocalizationMgr::setResourceIDsForDialog( xDialogModel, xDestMgr );
- 		}
--		io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
-+		io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDestDoc.getDocument() );
- 	}
- }
- 
---- basctl/source/basicide/scriptdocument.cxx.old	2009-04-02 10:56:36.000000000 +0000
-+++ basctl/source/basicide/scriptdocument.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -661,7 +661,7 @@ namespace basctl
-                 if ( !_rxExistingDialogModel.is() )
-                 {
-                     Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
--    			    ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext() );
-+    			    ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext(), getDocument() );
-                 }
- 
- 			    // set new name as property
-@@ -669,7 +669,7 @@ namespace basctl
- 			    xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rNewName ) );
- 
- 			    // export dialog model
--			    xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext() );
-+			    xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), getDocument() );
- 			    aElement <<= xISP;
-             }
- 
-@@ -772,7 +772,7 @@ namespace basctl
- 		    xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rDialogName ) );
- 
- 		    // export dialog model
--            _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext() );
-+            _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), getDocument() );
- 
- 		    // insert dialog into library
- 		    xLib->insertByName( _rDialogName, makeAny( _out_rDialogProvider ) );
---- basctl/source/dlged/dlged.cxx.old	2009-04-02 10:56:34.000000000 +0000
-+++ basctl/source/dlged/dlged.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -208,7 +208,7 @@ BOOL DlgEditor::RemarkDialog()
- 
- //----------------------------------------------------------------------------
- 
--DlgEditor::DlgEditor()
-+DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel )
- 	:pHScroll(NULL)
- 	,pVScroll(NULL)
- 	,pDlgEdModel(NULL)
-@@ -230,6 +230,7 @@ DlgEditor::DlgEditor()
- 	,bCreateOK(TRUE)
- 	,bDialogModelChanged(FALSE)
- 	,mnPaintGuard(0)
-+	,m_xDocument( xModel )
- {
- 	pDlgEdModel = new DlgEdModel();
- 	pDlgEdModel->GetItemPool().FreezeIdRanges();
-@@ -838,7 +839,7 @@ void DlgEditor::Copy()
-     Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
-     OSL_ASSERT( xProps.is() );
-     OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
--	Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xClipDialogModel, xContext );
-+	Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument );
- 	Reference< XInputStream > xStream( xISP->createInputStream() );
- 	Sequence< sal_Int8 > DialogModelBytes;
- 	implCopyStreamToByteSequence( xStream, DialogModelBytes );
-@@ -871,7 +872,7 @@ void DlgEditor::Copy()
- 			uno::Reference< resource::XStringResourceManager >
- 				xStringResourceManager( xStringResourcePersistence, uno::UNO_QUERY );
- 			LocalizationMgr::resetResourceForDialog( xClipDialogModel, xStringResourceManager );
--			Reference< XInputStreamProvider > xISP2 = ::xmlscript::exportDialogModel( xClipDialogModel, xContext );
-+			Reference< XInputStreamProvider > xISP2 = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument );
- 			Reference< XInputStream > xStream2( xISP2->createInputStream() );
- 			Sequence< sal_Int8 > NoResourceDialogModelBytes;
- 			implCopyStreamToByteSequence( xStream2, NoResourceDialogModelBytes );
-@@ -1017,7 +1018,7 @@ void DlgEditor::Paste()
-                     Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
-                     OSL_ASSERT( xProps.is() );
-                     OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
--					::xmlscript::importDialogModel( ::xmlscript::createInputStream( *((::rtl::ByteSequence*)(&DialogModelBytes)) ) , xClipDialogModel, xContext );
-+					::xmlscript::importDialogModel( ::xmlscript::createInputStream( *((::rtl::ByteSequence*)(&DialogModelBytes)) ) , xClipDialogModel, xContext, m_xDocument );
- 				}
- 
- 				// get control models from clipboard dialog model
---- basctl/source/inc/dlged.hxx.old	2009-04-02 10:56:36.000000000 +0000
-+++ basctl/source/inc/dlged.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -35,6 +35,7 @@
- #include <com/sun/star/awt/XControlContainer.hpp>
- #include <com/sun/star/datatransfer/DataFlavor.hpp>
- #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
- #include <tools/link.hxx>
- #include <tools/gen.hxx> 
- #include <vcl/timer.hxx>
-@@ -129,9 +130,11 @@ protected:
- 	BOOL				bDialogModelChanged;
-     Timer               aMarkTimer;
- 	long				mnPaintGuard;
-+	::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocument;
- 
-+	DlgEditor(); // not implemented
- public:
--	DlgEditor();
-+	DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
- 	~DlgEditor();
- 
- 	void			SetWindow( Window* pWindow );
---- basic/source/classes/eventatt.cxx.old	2009-04-02 10:49:17.000000000 +0000
-+++ basic/source/classes/eventatt.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -58,7 +58,10 @@
- #include <com/sun/star/awt/XDialogProvider.hpp>
- 
- #include <com/sun/star/frame/XModel.hpp>
--
-+#include <com/sun/star/frame/XDesktop.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <basic/basicmanagerrepository.hxx>
-+#include <basic/basmgr.hxx>
- //==================================================================================================
- 
- #include <xmlscript/xmldlg_imexp.hxx>
-@@ -458,6 +461,43 @@ Any implFindDialogLibForDialog( const An
- 	return aRetDlgLibAny;
- }
- 
-+Any implFindDialogLibForDialogBasic( const Any& aAnyISP, SbxObject* pBasic, StarBASIC*& pFoundBasic )
-+{
-+	Any aDlgLibAny;
-+	// Find dialog library for dialog, direct access is not possible here
-+    StarBASIC* pStartedBasic = (StarBASIC*)pBasic;
-+	SbxObject* pParentBasic = pStartedBasic ? pStartedBasic->GetParent() : NULL;
-+	SbxObject* pParentParentBasic = pParentBasic ? pParentBasic->GetParent() : NULL;
-+
-+	SbxObject* pSearchBasic1 = NULL;
-+	SbxObject* pSearchBasic2 = NULL;
-+	if( pParentParentBasic )
-+	{
-+		pSearchBasic1 = pParentBasic;
-+		pSearchBasic2 = pParentParentBasic;
-+	}
-+	else
-+	{
-+		pSearchBasic1 = pStartedBasic;
-+		pSearchBasic2 = pParentBasic;
-+	}
-+	if( pSearchBasic1 )
-+	{
-+		aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic1 );
-+
-+		if ( aDlgLibAny.hasValue() )
-+			pFoundBasic = (StarBASIC*)pSearchBasic1;
-+
-+		else if( pSearchBasic2 )
-+		{
-+			aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic2 );
-+			if ( aDlgLibAny.hasValue() )
-+				pFoundBasic = (StarBASIC*)pSearchBasic2;
-+		}
-+	}
-+	return aDlgLibAny;
-+}
-+
- static ::rtl::OUString aDecorationPropName =
- 	::rtl::OUString::createFromAscii( "Decoration" );
- static ::rtl::OUString aTitlePropName =
-@@ -537,39 +577,51 @@ void RTL_Impl_CreateUnoDialog( StarBASIC
- 		{}
- 	}
- 
--	// Find dialog library for dialog, direct access is not possible here
--    StarBASIC* pStartedBasic = pINST->GetBasic();
--	SbxObject* pParentBasic = pStartedBasic ? pStartedBasic->GetParent() : NULL;
--	SbxObject* pParentParentBasic = pParentBasic ? pParentBasic->GetParent() : NULL;
--
--	SbxObject* pSearchBasic1 = NULL;
--	SbxObject* pSearchBasic2 = NULL;
--	if( pParentParentBasic )
--	{
--		pSearchBasic1 = pParentBasic;
--		pSearchBasic2 = pParentParentBasic;
--	}
--	else
--	{
--		pSearchBasic1 = pStartedBasic;
--		pSearchBasic2 = pParentBasic;
--	}
--
- 	Any aDlgLibAny;
--	if( pSearchBasic1 )
--	{
--		aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic1 );
--		if( pSearchBasic2 && aDlgLibAny.getValueType().getTypeClass() == TypeClass_VOID )
--			aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic2 );
--	}
--
--
-+	bool bDocDialog = false;
-+	StarBASIC* pFoundBasic = NULL;
-     OSL_TRACE("About to try get a hold of ThisComponent");
--    Reference< frame::XModel > xModel = getModelFromBasic( pStartedBasic ) ;
--	Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( pStartedBasic, xModel );
-+    Reference< frame::XModel > xModel = getModelFromBasic( pINST->GetBasic() ) ;
-+		aDlgLibAny = implFindDialogLibForDialogBasic( aAnyISP, pINST->GetBasic(), pFoundBasic );
-+		// If we found the dialog then it belongs to the Search basic
-+		if ( !pFoundBasic )
-+		{
-+			Reference< frame::XDesktop > xDesktop( xMSF->createInstance
-+		( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ) ),
-+			UNO_QUERY );
-+			Reference< container::XEnumeration > xModels;
-+			if ( xDesktop.is() )
-+			{
-+				Reference< container::XEnumerationAccess > xComponents( xDesktop->getComponents(), UNO_QUERY );
-+				if ( xComponents.is() )
-+					xModels.set( xComponents->createEnumeration(), UNO_QUERY );
-+				if ( xModels.is() )
-+				{
-+					while ( xModels->hasMoreElements() )
-+					{
-+						Reference< frame::XModel > xNextModel( xModels->nextElement(), UNO_QUERY );
-+						if ( xNextModel.is() )
-+						{
-+							BasicManager* pMgr = basic::BasicManagerRepository::getDocumentBasicManager( xNextModel );	
-+							if ( pMgr )
-+								aDlgLibAny = implFindDialogLibForDialogBasic( aAnyISP, pMgr->GetLib(0), pFoundBasic );
-+							if ( aDlgLibAny.hasValue() )
-+							{
-+								bDocDialog = true;
-+								xModel = xNextModel;
-+								break;
-+							} 
-+						}
-+					}
-+				}
-+			}
-+		}
-+	if ( pFoundBasic )
-+		bDocDialog = pFoundBasic->IsDocBasic();
-+       Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( pINST->GetBasic(), xModel );
- 
- 	Sequence< Any > aArgs( 4 );
--	aArgs[ 0 ] <<= xModel;
-+	aArgs[ 0 ] <<= bDocDialog ? xModel : uno::Reference< uno::XInterface >();
- 	aArgs[ 1 ] <<= xInput;
- 	aArgs[ 2 ] = aDlgLibAny;
- 	aArgs[ 3 ] <<= xScriptListener;
---- basic/source/uno/dlgcont.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ basic/source/uno/dlgcont.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -322,7 +322,7 @@ Any SAL_CALL SfxDialogLibraryContainer::
- 	
- 	try {
- 		// start parsing 
--		xParser->setDocumentHandler( ::xmlscript::importDialogModel( xDialogModel, xContext ) );
-+		xParser->setDocumentHandler( ::xmlscript::importDialogModel( xDialogModel, xContext, mxOwnerDocument ) );
- 		xParser->parseStream( source );
- 	}
- 	catch( Exception& )
-@@ -336,7 +336,7 @@ Any SAL_CALL SfxDialogLibraryContainer::
- 
- 	// Create InputStream, TODO: Implement own InputStreamProvider
- 	// to avoid creating the DialogModel here!
--	Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
-+	Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, mxOwnerDocument );
- 	aRetAny <<= xISP;
- 	return aRetAny;
- }
---- extensions/source/propctrlr/defaultforminspection.cxx.old	2009-04-02 10:51:17.000000000 +0000
-+++ extensions/source/propctrlr/defaultforminspection.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -154,7 +154,7 @@ namespace pcr
-             { "com.sun.star.form.inspection.EventHandler", false },
- 
-             // a handler which introduces virtual properties for binding controls to spreadsheet cells
--            { "com.sun.star.form.inspection.CellBindingPropertyHandler", true },
-+            { "com.sun.star.form.inspection.CellBindingPropertyHandler", false },
- 
-             // properties related to binding to an XForms DOM node
-             { "com.sun.star.form.inspection.XMLFormsPropertyHandler", true },
---- sc/inc/addruno.hxx.old	2009-04-02 10:45:43.000000000 +0000
-+++ sc/inc/addruno.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -50,7 +50,7 @@ private:
-     sal_Int32               nRefSheet;
-     sal_Bool                bIsRange;
- 
--    sal_Bool                ParseUIString( const String& rUIString );
-+    sal_Bool                ParseUIString( const String& rUIString, ::formula::FormulaGrammar::AddressConvention eConv = ::formula::FormulaGrammar::CONV_OOO );
- 
- public:
- 
---- sc/inc/unonames.hxx.old	2009-04-06 16:41:58.000000000 +0000
-+++ sc/inc/unonames.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -599,6 +599,7 @@
- #define SC_UNONAME_ADDRESS          "Address"
- #define SC_UNONAME_UIREPR           "UserInterfaceRepresentation"
- #define SC_UNONAME_PERSREPR         "PersistentRepresentation"
-+#define SC_UNONAME_XL_A1_REPR       "XL_A1_Representation"
- #define SC_UNONAME_REFSHEET         "ReferenceSheet"
- 
- // --> PB 2004-08-23 #i33095# Security Options
---- sc/source/ui/unoobj/addruno.cxx.old	2009-04-02 10:45:26.000000000 +0000
-+++ sc/source/ui/unoobj/addruno.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -72,7 +72,7 @@ void ScAddressConversionObj::Notify( Sfx
-     }
- }
- 
--sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString )
-+sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString, ::formula::FormulaGrammar::AddressConvention eConv )
- {
-     if (!pDocShell)
-         return sal_False;
-@@ -81,7 +81,7 @@ sal_Bool ScAddressConversionObj::ParseUI
-     sal_Bool bSuccess = sal_False;
-     if ( bIsRange )
-     {
--        USHORT nResult = aRange.ParseAny( rUIString, pDoc );
-+        USHORT nResult = aRange.ParseAny( rUIString, pDoc, eConv );
-         if ( nResult & SCA_VALID )
-         {
-             if ( ( nResult & SCA_TAB_3D ) == 0 )
-@@ -95,7 +95,7 @@ sal_Bool ScAddressConversionObj::ParseUI
-     }
-     else
-     {
--        USHORT nResult = aRange.aStart.Parse( rUIString, pDoc );
-+        USHORT nResult = aRange.aStart.Parse( rUIString, pDoc, eConv );
-         if ( nResult & SCA_VALID )
-         {
-             if ( ( nResult & SCA_TAB_3D ) == 0 )
-@@ -119,6 +119,7 @@ uno::Reference<beans::XPropertySetInfo>
-         {
-             {MAP_CHAR_LEN(SC_UNONAME_ADDRESS),  0,  &getCppuType((table::CellRangeAddress*)0), 0, 0 },
-             {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
-+            {MAP_CHAR_LEN(SC_UNONAME_XL_A1_REPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
-             {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
-             {MAP_CHAR_LEN(SC_UNONAME_UIREPR),   0,  &getCppuType((rtl::OUString*)0),    0, 0 },
-             {0,0,0,0,0,0}
-@@ -132,6 +133,7 @@ uno::Reference<beans::XPropertySetInfo>
-         {
-             {MAP_CHAR_LEN(SC_UNONAME_ADDRESS),  0,  &getCppuType((table::CellAddress*)0), 0, 0 },
-             {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
-+            {MAP_CHAR_LEN(SC_UNONAME_XL_A1_REPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
-             {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
-             {MAP_CHAR_LEN(SC_UNONAME_UIREPR),   0,  &getCppuType((rtl::OUString*)0),    0, 0 },
-             {0,0,0,0,0,0}
-@@ -193,8 +195,11 @@ void SAL_CALL ScAddressConversionObj::se
-             bSuccess = ParseUIString( aUIString );
-         }
-     }
--    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) )
-+    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
-     {
-+        ::formula::FormulaGrammar::AddressConvention aConv = ::formula::FormulaGrammar::CONV_OOO; 
-+        if ( aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
-+            aConv = ::formula::FormulaGrammar::CONV_XL_A1; 
-         //  parse the file format string
-         rtl::OUString sRepresentation;
-         if (aValue >>= sRepresentation)
-@@ -215,7 +220,7 @@ void SAL_CALL ScAddressConversionObj::se
-             }
- 
-             //  parse the rest like a UI string
--            bSuccess = ParseUIString( aUIString );
-+            bSuccess = ParseUIString( aUIString, aConv );
-         }
-     }
-     else
-@@ -268,17 +273,24 @@ uno::Any SAL_CALL ScAddressConversionObj
-             aRange.aStart.Format( aFormatStr, nFlags, pDoc );
-         aRet <<= rtl::OUString( aFormatStr );
-     }
--    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) )
-+    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
-     {
-+        ::formula::FormulaGrammar::AddressConvention aConv = ::formula::FormulaGrammar::CONV_OOO; 
-+        if ( aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
-+            aConv = ::formula::FormulaGrammar::CONV_XL_A1; 
-+
-         //  generate file format string - always include sheet
-         String aFormatStr;
--        aRange.aStart.Format( aFormatStr, SCA_VALID | SCA_TAB_3D, pDoc );
-+        aRange.aStart.Format( aFormatStr, SCA_VALID | SCA_TAB_3D, pDoc, aConv );
-         if ( bIsRange )
-         {
-             //  manually concatenate range so both parts always have the sheet name
-             aFormatStr.Append( (sal_Unicode) ':' );
-             String aSecond;
--            aRange.aEnd.Format( aSecond, SCA_VALID | SCA_TAB_3D, pDoc );
-+            USHORT nFlags = SCA_VALID;
-+            if( aConv != ::formula::FormulaGrammar::CONV_XL_A1 )
-+		nFlags |= SCA_TAB_3D;
-+            aRange.aEnd.Format( aSecond, SCA_VALID | SCA_TAB_3D, pDoc, aConv );
-             aFormatStr.Append( aSecond );
-         }
-         aRet <<= rtl::OUString( aFormatStr );
---- scripting/source/dlgprov/dlgevtatt.cxx.old	2009-04-02 10:36:33.000000000 +0000
-+++ scripting/source/dlgprov/dlgevtatt.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -399,7 +399,7 @@ namespace dlgprov
- 
-     void DialogAllListenerImpl::firing( const AllEventObject& Event ) throw ( RuntimeException )
-     {
--        ::osl::MutexGuard aGuard( getMutex() );
-+        //::osl::MutexGuard aGuard( getMutex() );
- 
-         firing_impl( Event, NULL );
-     }
-@@ -409,7 +409,7 @@ namespace dlgprov
-     Any DialogAllListenerImpl::approveFiring( const AllEventObject& Event ) 
-         throw ( reflection::InvocationTargetException, RuntimeException )
-     {
--        ::osl::MutexGuard aGuard( getMutex() );
-+        //::osl::MutexGuard aGuard( getMutex() );
- 
-         Any aReturn;
-         firing_impl( Event, &aReturn );
-@@ -653,7 +653,7 @@ namespace dlgprov
- 
-     void DialogScriptListenerImpl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException )
-     {
--        ::osl::MutexGuard aGuard( getMutex() );
-+        //::osl::MutexGuard aGuard( getMutex() );
- 
-         firing_impl( aScriptEvent, NULL );
-     }
-@@ -663,7 +663,7 @@ namespace dlgprov
-     Any DialogScriptListenerImpl::approveFiring( const ScriptEvent& aScriptEvent ) 
-         throw ( reflection::InvocationTargetException, RuntimeException )
-     {
--        ::osl::MutexGuard aGuard( getMutex() );
-+        //::osl::MutexGuard aGuard( getMutex() );
- 
-         Any aReturn;
-         firing_impl( aScriptEvent, &aReturn );
---- scripting/source/dlgprov/dlgprov.cxx.old	2009-04-02 10:36:33.000000000 +0000
-+++ scripting/source/dlgprov/dlgprov.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -196,7 +196,15 @@ static ::rtl::OUString aResourceResolver
- 		Reference< beans::XPropertySet > xDlgPropSet( xDialogModel, UNO_QUERY );
- 		xDlgPropSet->setPropertyValue( aDlgSrcUrlPropName, aDialogSourceURL );
- 
--        ::xmlscript::importDialogModel( xInput, xDialogModel, m_xContext );
-+        // #TODO we really need to detect the source of the Dialog, is it
-+        // located in the document or not. m_xModel need not be the location of
-+        // the dialog. E.g. if the dialog was created from basic ( then we just
-+        // can't tell  where its from ) 
-+        // If we are happy to always substitute the form model for the awt
-+        // one then maybe the presence of a document model is enough to trigger
-+        // swapping out the models ( or perhaps we only want to do this 
-+        // for vba mode ) there are a number of feasible and valid possibilities
-+        ::xmlscript::importDialogModel( xInput, xDialogModel, m_xContext, m_xModel );
-         // Set resource property
-         if( xStringResourceManager.is() )
-         {
-@@ -656,7 +664,10 @@ static ::rtl::OUString aResourceResolver
-             aArguments[0] >>= m_xModel;
-             m_BasicInfo.reset( new BasicRTLParams() );
-             m_BasicInfo->mxInput.set( aArguments[ 1 ], UNO_QUERY_THROW );
--            m_BasicInfo->mxDlgLib.set( aArguments[ 2 ], UNO_QUERY_THROW );
-+            // allow null mxDlgLib, a document dialog instantiated from 
-+            // from application basic is unable to provide ( or find ) it's
-+            // Library
-+            aArguments[ 2 ] >>= m_BasicInfo->mxDlgLib;
-             // leave the possibility to optionally allow the old dialog creation
-             // to use the new XScriptListener ( which converts the old style macro
-             // to a SF url )
---- svtools/inc/bindablecontrolhelper.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ svtools/inc/bindablecontrolhelper.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: imageresourceaccess.hxx,v $
-+ * $Revision: 1.5 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SVTOOLS_INC_BINDABLECONTROL_HXX
-+#define SVTOOLS_INC_BINDABLECONTROL_HXX
-+
-+#include "svtools/svtdllapi.h"
-+
-+#include <com/sun/star/frame/XModel.hpp>
-+//........................................................................
-+namespace svt
-+{
-+//........................................................................
-+
-+    //====================================================================
-+    //= GraphicAccess
-+    //====================================================================
-+    /** helper class for obtaining streams (which also can be used with the ImageProducer)
-+        from a resource
-+    */
-+    class BindableControlHelper
-+    {
-+    private:
-+        BindableControlHelper();    // never implemented
-+
-+    public:
-+        SVT_DLLPUBLIC static  void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource );
-+    };
-+
-+//........................................................................
-+} // namespace svt
-+//........................................................................
-+
-+#endif // DBA14_SVTOOLS_INC_IMAGERESOURCEACCESS_HXX
-+
---- svtools/prj/d.lst.old	2009-04-02 11:06:22.000000000 +0000
-+++ svtools/prj/d.lst	2009-04-06 16:41:59.000000000 +0000
-@@ -172,6 +172,7 @@ mkdir: %_DEST%\inc%_EXT%\svtools
- ..\inc\svtools\logindlg.hxx %_DEST%\inc%_EXT%\svtools\logindlg.hxx
- ..\inc\svtools\httpcook.hxx %_DEST%\inc%_EXT%\svtools\httpcook.hxx
- ..\inc\imageresourceaccess.hxx %_DEST%\inc%_EXT%\svtools\imageresourceaccess.hxx
-+..\inc\bindablecontrolhelper.hxx %_DEST%\inc%_EXT%\svtools\bindablecontrolhelper.hxx
- ..\inc\svtools\itemprop.hxx %_DEST%\inc%_EXT%\svtools\itemprop.hxx
- ..\inc\addresstemplate.hxx %_DEST%\inc%_EXT%\svtools\addresstemplate.hxx
- ..\inc\svtools\genericunodialog.hxx %_DEST%\inc%_EXT%\svtools\genericunodialog.hxx
---- svtools/source/misc/bindablecontrolhelper.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ svtools/source/misc/bindablecontrolhelper.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,162 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: imageresourceaccess.cxx,v $
-+ * $Revision: 1.5 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_svtools.hxx"
-+#include "bindablecontrolhelper.hxx"
-+#include <com/sun/star/form/binding/XBindableValue.hpp>
-+#include <com/sun/star/form/binding/XValueBinding.hpp>
-+#include <com/sun/star/form/binding/XListEntrySink.hpp>
-+#include <com/sun/star/form/binding/XListEntrySource.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/container/XNameAccess.hpp>
-+#include <com/sun/star/table/CellRangeAddress.hpp>
-+#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
-+#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
-+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#include <com/sun/star/table/CellAddress.hpp>
-+#include <com/sun/star/beans/NamedValue.hpp>
-+
-+//........................................................................
-+namespace svt
-+{
-+//........................................................................
-+
-+#ifndef C2U
-+#define C2U(cChar)	rtl::OUString::createFromAscii(cChar)
-+#endif
-+
-+    using namespace ::com::sun::star;
-+
-+bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress )
-+{
-+    bool bRes = false;
-+    const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
-+    uno::Reference< sheet::XCellRangeReferrer > xReferrer;
-+    try
-+    {
-+        uno::Reference< beans::XPropertySet > xPropSet( xModel, uno::UNO_QUERY_THROW );
-+        uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW );
-+        xReferrer.set ( xNamed->getByName( sAddress ), uno::UNO_QUERY );
-+    }
-+    catch( uno::Exception& /*e*/ )
-+    {
-+        // do nothing
-+    }
-+    if ( xReferrer.is() )
-+    {
-+        uno::Reference< sheet::XCellRangeAddressable > xRangeAddressable( xReferrer->getReferredCells(), uno::UNO_QUERY );
-+        if ( xRangeAddressable.is() )
-+        {
-+            aAddress = xRangeAddressable->getRangeAddress();
-+            bRes = true;
-+        }
-+    }
-+    return bRes;
-+}
-+
-+
-+void
-+BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource )
-+{
-+// XBindable etc.
-+    uno::Reference< lang::XMultiServiceFactory > xFac;
-+    if ( xModel.is() )
-+        xFac.set( xModel, uno::UNO_QUERY );
-+    uno::Reference< form::binding::XBindableValue > xBindable( rObj, uno::UNO_QUERY );
-+    if (  xFac.is() && rsCtrlSource.getLength() && xBindable.is() )
-+    {
-+         
-+         // OOo address structures
-+         // RefCell - convert from XL
-+         // pretend we converted the imported string address into the
-+         // appropriate address structure
-+         uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( C2U( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );
-+         table::CellAddress aAddress;
-+         if ( xConvertor.is() )
-+         {
-+             // we need this service to properly convert XL notation also
-+             // Should be easy to extend
-+             xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsCtrlSource ) );
-+             xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress;    
-+         }
-+        
-+         beans::NamedValue aArg1;
-+         aArg1.Name = C2U("BoundCell");
-+         aArg1.Value <<= aAddress;
-+
-+         uno::Sequence< uno::Any > aArgs(1);
-+         aArgs[ 0 ]  <<= aArg1;
-+
-+         uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY );
-+         xBindable->setValueBinding( xBinding );
-+    }
-+    else if ( xBindable.is() ) // reset it
-+        xBindable->setValueBinding( uno::Reference< form::binding::XValueBinding >() );
-+    uno::Reference< form::binding::XListEntrySink > xListEntrySink( rObj, uno::UNO_QUERY );
-+    if (  xFac.is() && rsRowSource.getLength() && xListEntrySink.is() )
-+    {
-+         
-+         // OOo address structures
-+         // RefCell - convert from XL
-+         // pretend we converted the imported string address into the
-+         // appropriate address structure
-+         uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( C2U( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );
-+         table::CellRangeAddress aAddress;
-+         if ( xConvertor.is() )
-+         {
-+             if ( !lcl_isNamedRange( rsRowSource, xModel, aAddress ) )
-+             {
-+                 // we need this service to properly convert XL notation also
-+                 // Should be easy to extend
-+                 xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsRowSource ) );
-+                 xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress;
-+             }
-+         }
-+        
-+         beans::NamedValue aArg1;
-+         aArg1.Name = C2U("CellRange");
-+         aArg1.Value <<= aAddress;
-+
-+         uno::Sequence< uno::Any > aArgs(1);
-+         aArgs[ 0 ]  <<= aArg1;
-+
-+         uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellRangeListSource" ), aArgs ), uno::UNO_QUERY );
-+         xListEntrySink->setListEntrySource( xSource );
-+    }
-+    else if (  xListEntrySink.is() ) // reset
-+         xListEntrySink->setListEntrySource( uno::Reference< form::binding::XListEntrySource >()  );
-+
-+}
-+
-+//........................................................................
-+} // namespace svt
-+//........................................................................
-+
---- svtools/source/misc/makefile.mk.old	2009-04-02 11:06:13.000000000 +0000
-+++ svtools/source/misc/makefile.mk	2009-04-06 16:41:59.000000000 +0000
-@@ -85,6 +85,7 @@ SLOFILES=\
-     $(SLO)$/lockfilecommon.obj     \
-     $(SLO)$/sharecontrolfile.obj   \
-     $(SLO)$/documentlockfile.obj   \
-+    $(SLO)$/bindablecontrolhelper.obj   \
-     $(SLO)$/langtab.obj
- 
- # --- Targets -------------------------------------------------------
---- svx/inc/svx/msocximex.hxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ svx/inc/svx/msocximex.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -405,6 +405,8 @@ public:
- 	sal_uInt32 nGroupNameLen;
- 	sal_uInt32 nUnknown10;
- 
-+        rtl::OUString msCtrlSource;
-+        rtl::OUString msRowSource;
- 	char *pValue;
- 	char *pCaption;
- 	char *pGroupName;
-@@ -490,6 +492,8 @@ struct ContainerRecord
- 
-     ::rtl::OUString cName;
-     ::rtl::OUString controlTip;
-+    ::rtl::OUString sCtrlSource;
-+    ::rtl::OUString sRowSource;
- 
-     sal_uInt32 nTop;
-     sal_uInt32 nLeft;
-@@ -916,7 +920,8 @@ public:
- 	OCX_OptionButton() : OCX_ModernControl(rtl::OUString::createFromAscii("OptionButton"))
- 	{
- 		msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton");
--		msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlRadioButtonModel");
-+		//msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlRadioButtonModel");
-+		msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton");
-         mnBackColor = 0x80000005L;
-         mnForeColor = 0x80000008L;
-         aFontData.SetHasAlign(TRUE);
-@@ -1017,7 +1022,7 @@ class OCX_ComboBox : public OCX_ModernCo
- public:
- 	OCX_ComboBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ComboBox")){
- 		msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ComboBox");
--	        msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlComboBoxModel");
-+	        msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.ComboBox");
- 		mnBackColor = 0x80000005;
- 		mnForeColor = 0x80000008;
- 		nBorderColor = 0x80000006;
-@@ -1042,7 +1047,8 @@ class OCX_ListBox : public OCX_ModernCon
- public:
- 	OCX_ListBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ListBox")){
- 		msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox");
--		msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel");
-+		//msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel");
-+		msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox");
- 		mnBackColor = 0x80000005;
- 		mnForeColor = 0x80000008;
- 		nBorderColor = 0x80000006;
---- svx/source/msfilter/msocximex.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ svx/source/msfilter/msocximex.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -49,6 +49,10 @@
- #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
- #include <com/sun/star/form/XFormsSupplier.hpp>
- #include <com/sun/star/form/XForm.hpp>
-+#include <com/sun/star/form/binding/XBindableValue.hpp>
-+#include <com/sun/star/form/binding/XValueBinding.hpp>
-+#include <com/sun/star/form/binding/XListEntrySink.hpp>
-+#include <com/sun/star/form/binding/XListEntrySource.hpp>
- #include <com/sun/star/form/FormComponentType.hpp>
- #include <com/sun/star/awt/FontWeight.hpp>
- #include <com/sun/star/awt/FontSlant.hpp>
-@@ -86,6 +90,14 @@
- #include <comphelper/componentcontext.hxx>
- #include <unotools/streamwrap.hxx>
- 
-+#include <com/sun/star/beans/NamedValue.hpp>
-+#include <com/sun/star/table/XCellRange.hpp>
-+#include <com/sun/star/table/CellRangeAddress.hpp>
-+#include <com/sun/star/table/CellAddress.hpp>
-+#include <com/sun/star/sheet/XSpreadsheetView.hpp>
-+#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
-+#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
-+ 
- #ifndef C2S
- #define C2S(cChar)	String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
- #endif
-@@ -636,14 +648,22 @@ class ContainerRecReader
-             if( nCtrlSrcBufSize > 0 )
-             {
-                 ReadAlign( pS, pS->Tell() - nStartPos, 4 );
--                pS->SeekRel( nCtrlSrcBufSize );
-+                std::auto_ptr< sal_Char > pCtrlSrcName;
-+                pCtrlSrcName.reset( new sal_Char[ nCtrlSrcBufSize ] );
-+                pS->Read( pCtrlSrcName.get(), nCtrlSrcBufSize );
-+                rec.sCtrlSource = lclCreateOUString( pCtrlSrcName.get(), nCtrlSrcLen );
-+                OSL_TRACE("*** *** *** ControlSourceName -> %s ", rtl::OUStringToOString( rec.sCtrlSource, RTL_TEXTENCODING_UTF8 ).getStr() );
-             }
-             // row source name
-             sal_uInt32 nRowSrcBufSize = lclGetBufferSize( nRowSrcLen );
-             if( nRowSrcBufSize > 0 )
-             {
-                 ReadAlign( pS, pS->Tell() - nStartPos, 4 );
--                pS->SeekRel( nRowSrcBufSize );
-+                std::auto_ptr< sal_Char > pRowSrcName;
-+                pRowSrcName.reset( new sal_Char[ nRowSrcBufSize ] );
-+                pS->Read( pRowSrcName.get(), nRowSrcBufSize );
-+                rec.sRowSource =  lclCreateOUString( pRowSrcName.get(), nRowSrcLen );
-+                OSL_TRACE("*** *** *** RowSourceName -> %s ", rtl::OUStringToOString( rec.sRowSource, RTL_TEXTENCODING_UTF8 ).getStr() );
-             }
- 
-             // seek to end of data
-@@ -1425,6 +1445,99 @@ sal_Bool OCX_ImageButton::Export(SvStora
- 	return WriteContents(xContents,rPropSet,rSize);
- }
- 
-+bool lcl_isNamedRange( const rtl::OUString& sAddress, uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress )
-+{
-+    bool bRes = false;
-+    const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
-+    uno::Reference< sheet::XCellRangeReferrer > xReferrer;
-+    try
-+    {
-+        uno::Reference< beans::XPropertySet > xPropSet( xModel, uno::UNO_QUERY_THROW );
-+        uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW );
-+        xReferrer.set ( xNamed->getByName( sAddress ), uno::UNO_QUERY );
-+    }
-+    catch( uno::Exception& /*e*/ )
-+    {
-+        // do nothing
-+    }
-+    if ( xReferrer.is() )
-+    {
-+        uno::Reference< sheet::XCellRangeAddressable > xRangeAddressable( xReferrer->getReferredCells(), uno::UNO_QUERY );
-+        if ( xRangeAddressable.is() )
-+        {
-+            aAddress = xRangeAddressable->getRangeAddress();
-+            bRes = true;
-+        }
-+    }
-+    return bRes;
-+}
-+
-+void lcl_ApplyListSourceAndBindableStuff( uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rPropSet, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource )
-+{
-+// XBindable etc.
-+    uno::Reference< lang::XMultiServiceFactory > xFac;
-+    if ( xModel.is() )
-+        xFac.set( xModel, uno::UNO_QUERY );
-+    uno::Reference< form::binding::XBindableValue > xBindable( rPropSet, uno::UNO_QUERY );
-+    if (  xFac.is() && rsCtrlSource.getLength() && xBindable.is() )
-+    {
-+         
-+         // OOo address structures
-+         // RefCell - convert from XL
-+         // pretend we converted the imported string address into the
-+         // appropriate address structure
-+         uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( C2U( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );
-+         table::CellAddress aAddress;
-+         if ( xConvertor.is() )
-+         {
-+             // we need this service to properly convert XL notation also
-+             // Should be easy to extend
-+             xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsCtrlSource ) );
-+             xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress;    
-+         }
-+        
-+         beans::NamedValue aArg1;
-+         aArg1.Name = C2U("BoundCell");
-+         aArg1.Value <<= aAddress;
-+
-+         uno::Sequence< uno::Any > aArgs(1);
-+         aArgs[ 0 ]  <<= aArg1;
-+
-+         uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY );
-+         xBindable->setValueBinding( xBinding );
-+    }
-+    uno::Reference< form::binding::XListEntrySink > xListEntrySink( rPropSet, uno::UNO_QUERY );
-+    if (  xFac.is() && rsRowSource.getLength() && xListEntrySink.is() )
-+    {
-+         
-+         // OOo address structures
-+         // RefCell - convert from XL
-+         // pretend we converted the imported string address into the
-+         // appropriate address structure
-+         uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( C2U( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );
-+         table::CellRangeAddress aAddress;
-+         if ( xConvertor.is() )
-+         {
-+             if ( !lcl_isNamedRange( rsRowSource, xModel, aAddress ) )
-+             {
-+                 // we need this service to properly convert XL notation also
-+                 // Should be easy to extend
-+                 xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsRowSource ) );
-+                 xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress;
-+             }
-+         }
-+        
-+         beans::NamedValue aArg1;
-+         aArg1.Name = C2U("CellRange");
-+         aArg1.Value <<= aAddress;
-+
-+         uno::Sequence< uno::Any > aArgs(1);
-+         aArgs[ 0 ]  <<= aArg1;
-+
-+         uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellRangeListSource" ), aArgs ), uno::UNO_QUERY );
-+         xListEntrySink->setListEntrySource( xSource );
-+    }
-+}
- 
- sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
-         com::sun::star::beans::XPropertySet> &rPropSet)
-@@ -1457,11 +1570,20 @@ sal_Bool OCX_OptionButton::Import(com::s
-     aTmp <<= ImportSpecEffect( nSpecialEffect );
-     rPropSet->setPropertyValue( WW8_ASCII2STR("VisualEffect"), aTmp);
- 
--	if (pValue && !bSetInDialog)
-+	if (pValue)
- 	{
- 		INT16 nTmp = pValue[0]-0x30;
- 		aTmp <<= nTmp;
--		rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
-+		if (!bSetInDialog)
-+			rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
-+		else
-+		{
-+			// dialog ( but we might be using the form model )
-+			if ( rPropSet->getPropertySetInfo()->hasPropertyByName( WW8_ASCII2STR("DefaultState") ) )
-+				rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
-+			else
-+				rPropSet->setPropertyValue( WW8_ASCII2STR("State"), aTmp);
-+		}
- 	}
-     // If this is a dialog control then we need to  set a groupname *always*
-     rtl::OUString sGroupName = lclCreateOUString( pGroupName, nGroupNameLen );
-@@ -1509,11 +1631,14 @@ sal_Bool OCX_OptionButton::Import(com::s
-         aTmp <<= lclCreateOUString( pGroupName, nGroupNameLen );
-         rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
-     }
-+	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
-+	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
-     if ( sImageUrl.getLength() )
-     {
-         aTmp <<= sImageUrl;
-         rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
-     }
-+
- 	aFontData.Import(rPropSet);
- 	return sal_True;
- }
-@@ -2630,7 +2755,8 @@ sal_Bool OCX_ListBox::Import(com::sun::s
- 
-     aTmp <<= ImportColor( nBorderColor );
-     rPropSet->setPropertyValue( WW8_ASCII2STR("BorderColor"), aTmp);
--
-+	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
-+	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
- 	aFontData.Import(rPropSet);
- 	return sal_True;
- }
-@@ -3419,15 +3545,29 @@ void OCX_ContainerControl::ProcessContro
-     {
-         // A container control needs to read the f stream in
-         // the folder ( substorage ) associated with this control
--        if (  rec.nTypeIdent ==  FRAME ||
--            rec.nTypeIdent ==  MULTIPAGE||
--            rec.nTypeIdent ==  PAGE )
-+        switch ( rec.nTypeIdent )
-         {
--            OCX_ContainerControl* pContainer =
--               static_cast< OCX_ContainerControl* >( pControl );
--            oStream = pContainer->getContainerStream();
-+            case FRAME:
-+            case MULTIPAGE:
-+            case PAGE:
-+                {
-+                    OCX_ContainerControl* pContainer =
-+                        static_cast< OCX_ContainerControl* >( pControl );
-+                    oStream = pContainer->getContainerStream();
-+                    break;
-+                }
-+            case LISTBOX:
-+            case OPTIONBUTTON:
-+            case COMBOBOX:
-+                {
-+                    OCX_ModernControl* pList = static_cast< OCX_ModernControl* >( pControl );
-+                    if ( pList )
-+                    {
-+                        pList->msCtrlSource = rec.sCtrlSource;
-+                        pList->msRowSource = rec.sRowSource;
-+                    }
-+                }
-         }
--
-         pControl->sName = rec.cName;
-         pControl->msToolTip = rec.controlTip;
-         // Position of controls is relative to the container
-@@ -4062,7 +4202,7 @@ sal_Bool OCX_UserForm::Import(
-     OCX_ContainerControl::Import( xPropSet );
- 
-     uno::Reference<io::XInputStreamProvider> xSource =
--        xmlscript::exportDialogModel(mxParent, mxCtx);
-+        xmlscript::exportDialogModel(mxParent, mxCtx, pDocSh->GetModel() );
-     uno::Any aSourceAny(uno::makeAny(xSource));
-     if (rLib->hasByName(sName))
-         rLib->replaceByName(sName, aSourceAny);
-@@ -4605,11 +4745,14 @@ sal_Bool OCX_CheckBox::Import(com::sun::
-     aTmp <<= ImportSpecEffect( nSpecialEffect );
-     rPropSet->setPropertyValue( WW8_ASCII2STR("VisualEffect"), aTmp);
- 
--	if (pValue && !bSetInDialog)
-+	if (pValue)
- 	{
- 		INT16 nTmp=pValue[0]-0x30;
- 		aTmp <<= nTmp;
--		rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
-+		if ( !bSetInDialog )
-+		 	rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
-+		else
-+		 	rPropSet->setPropertyValue( WW8_ASCII2STR("State"), aTmp);
- 	}
- 
- 	if (pCaption)
---- toolkit/inc/toolkit/controls/dialogcontrol.hxx.old	2009-04-06 16:41:46.000000000 +0000
-+++ toolkit/inc/toolkit/controls/dialogcontrol.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -52,6 +52,7 @@
- #include <cppuhelper/basemutex.hxx>
- #include <list>
- #include <map>
-+#include <com/sun/star/graphic/XGraphicObject.hpp>
- 
- //	----------------------------------------------------
- //	class UnoControlDialogModel
-@@ -92,7 +93,9 @@ private:
- 
- 	AllGroups							maGroups;
- 	sal_Bool							mbGroupsUpToDate;
--
-+        
-+	::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
-+	bool mbAdjustingGraphic;
- protected:	
- 	::com::sun::star::uno::Any			ImplGetDefaultValue( sal_uInt16 nPropId ) const;
- 	::cppu::IPropertyArrayHelper&		SAL_CALL getInfoHelper();
-@@ -179,6 +182,8 @@ public:
- protected:
- 	void startControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel );
- 	void stopControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel );
-+    // ::cppu::OPropertySetHelper
-+	void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception);
- 
- 	void implNotifyTabModelChange( const ::rtl::OUString& _rAccessor );
- 
---- toolkit/inc/toolkit/controls/unocontrols.hxx.old	2009-04-02 10:49:37.000000000 +0000
-+++ toolkit/inc/toolkit/controls/unocontrols.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -225,7 +225,6 @@ private:
-     bool                                                                                    mbAdjustingGraphic;
-     
-     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
--    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL );
- protected:
-     ImageProducerControlModel() : mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
-     ImageProducerControlModel( const ImageProducerControlModel& _rSource ) : com::sun::star::awt::XImageProducer(), UnoControlModel( _rSource ), mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
---- toolkit/source/controls/dialogcontrol.cxx.old	2009-04-06 16:41:46.000000000 +0000
-+++ toolkit/source/controls/dialogcontrol.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -90,6 +90,8 @@ using namespace toolkit;
- //HELPER
- ::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl );
- 
-+uno::Reference< graphic::XGraphic > getGraphicFromURL_nothrow( uno::Reference< graphic::XGraphicObject >& rxGrfObj, const ::rtl::OUString& _rURL );
-+
- struct LanguageDependentProp
- {
-     const char* pPropName;
-@@ -115,7 +117,7 @@ namespace
-         }
-         return s_aLanguageDependentProperties;
-     }
--
-+ 
-     static uno::Reference< graphic::XGraphic > lcl_getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
-     {
-         uno::Reference< graphic::XGraphic > xGraphic;
-@@ -265,7 +267,7 @@ static const ::rtl::OUString& getStepPro
- UnoControlDialogModel::UnoControlDialogModel()
- 	:maContainerListeners( *this )
- 	,maChangeListeners ( GetMutex() )
--	,mbGroupsUpToDate( sal_False )
-+	,mbGroupsUpToDate( sal_False ), mbAdjustingGraphic( false )
- {
- 	ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
- //	ImplRegisterProperty( BASEPROPERTY_BORDER );
-@@ -294,7 +296,7 @@ UnoControlDialogModel::UnoControlDialogM
-     , UnoControlDialogModel_Base( rModel )
- 	, maContainerListeners( *this )
- 	, maChangeListeners ( GetMutex() )
--	, mbGroupsUpToDate( sal_False )
-+	, mbGroupsUpToDate( sal_False ), mbAdjustingGraphic( false )
- {
- }
- 
-@@ -325,6 +327,40 @@ Sequence< Type > UnoControlDialogModel::
- 	return ::rtl::OUString::createFromAscii( szServiceName_UnoControlDialogModel );
- }
- 
-+void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
-+{
-+    UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
-+    try
-+    {
-+        switch ( nHandle )
-+        {
-+        case BASEPROPERTY_IMAGEURL:
-+            if ( !mbAdjustingGraphic && ImplHasProperty( BASEPROPERTY_GRAPHIC ) )
-+            {
-+                mbAdjustingGraphic = true;
-+                ::rtl::OUString sImageURL;
-+                OSL_VERIFY( rValue >>= sImageURL );
-+                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( mxGrfObj, sImageURL ) ) );
-+                mbAdjustingGraphic = false;
-+            }
-+            break;
-+
-+        case BASEPROPERTY_GRAPHIC:
-+            if ( !mbAdjustingGraphic && ImplHasProperty( BASEPROPERTY_IMAGEURL ) )
-+            {
-+                mbAdjustingGraphic = true;
-+                setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGEURL ), uno::makeAny( ::rtl::OUString() ) );
-+                mbAdjustingGraphic = false;
-+            }
-+            break;
-+	}
-+    }
-+    catch( const ::com::sun::star::uno::Exception& )
-+    {
-+        OSL_ENSURE( sal_False, "UnoControlDialogModel::setFastPropertyValue_NoBroadcast: caught an exception while setting Graphic/ImageURL properties!" );
-+    }
-+}
-+
- Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
- {
-     Any aAny;
-@@ -1668,17 +1704,16 @@ void UnoDialogControl::PrepareWindowDesc
-     // can lead to overwrites we have to set the graphic property
-     // before the propertiesChangeEvents are sent!
-     ::rtl::OUString aImageURL;
--    Reference< graphic::XGraphic > xGraphic;
-     if (( ImplGetPropertyValue( PROPERTY_IMAGEURL ) >>= aImageURL ) &&
-         ( aImageURL.getLength() > 0 ))
-     {
--        ::rtl::OUString absoluteUrl =
-+        aImageURL = 
-             getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ),
-                                  ImplGetPropertyValue( PROPERTY_IMAGEURL ));
- 
--        xGraphic = lcl_getGraphicFromURL_nothrow( absoluteUrl );
--        ImplSetPropertyValue( PROPERTY_GRAPHIC, uno::makeAny( xGraphic ), sal_True );
-     }
-+    if ( aImageURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 )
-+        ImplSetPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( aImageURL ), sal_True );
- }
- 
- void UnoDialogControl::elementInserted( const ContainerEvent& Event ) throw(RuntimeException)
-@@ -1910,18 +1945,16 @@ void UnoDialogControl::ImplModelProperti
-         if ( bOwnModel && rEvt.PropertyName.equalsAsciiL( "ImageURL", 8 ))
-         {
-             ::rtl::OUString aImageURL;
--            Reference< graphic::XGraphic > xGraphic;
-             if (( ImplGetPropertyValue( PROPERTY_IMAGEURL ) >>= aImageURL ) &&
-                 ( aImageURL.getLength() > 0 ))
-             {
--                ::rtl::OUString absoluteUrl =
-+                aImageURL =
-                     getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ),
-                                          ImplGetPropertyValue( PROPERTY_IMAGEURL ));
- 
--                xGraphic = lcl_getGraphicFromURL_nothrow( absoluteUrl );
-             }
- 
--            ImplSetPropertyValue( PROPERTY_GRAPHIC, uno::makeAny( xGraphic ), sal_True );
-+            ImplSetPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( aImageURL ), sal_True );
-             break;
-         }
-     }
-@@ -2120,10 +2153,17 @@ throw (RuntimeException)
- 
- 	if ( url.getLength() > 0 )
- 	{
--		INetURLObject urlObj(baseLocation);
--		urlObj.removeSegment();
--		baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE );
--		::osl::FileBase::getAbsoluteFileURL( baseLocation, url, ret );
-+		// Don't adjust GraphicObject url(s)
-+		if ( url.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 )
-+		{
-+			INetURLObject urlObj(baseLocation);
-+			urlObj.removeSegment();
-+			baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE );
-+			::osl::FileBase::getAbsoluteFileURL( baseLocation, url, ret );
-+		}
-+		else
-+			ret = url;
-+
- 	}
- 
- 	return ret;
---- toolkit/source/controls/unocontrols.cxx.old	2009-04-02 10:49:35.000000000 +0000
-+++ toolkit/source/controls/unocontrols.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -580,7 +580,7 @@ uno::Any ImageProducerControlModel::Impl
- 
-     return UnoControlModel::ImplGetDefaultValue( nPropId );
- }
--    uno::Reference< graphic::XGraphic > ImageProducerControlModel::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
-+    uno::Reference< graphic::XGraphic > getGraphicFromURL_nothrow( uno::Reference< graphic::XGraphicObject >& rxGrfObj, const ::rtl::OUString& _rURL )
-     {
-         uno::Reference< graphic::XGraphic > xGraphic;
- 
-@@ -590,10 +590,10 @@ uno::Any ImageProducerControlModel::Impl
-             rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 );
-             // get the DefaultContext
-             ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
--            mxGrfObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
-+            rxGrfObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
-         }
-         else // linked
--            mxGrfObj = NULL; // release the GraphicObject
-+            rxGrfObj = NULL; // release the GraphicObject
- 
-         if ( !_rURL.getLength() )
-             return xGraphic;
-@@ -634,7 +634,7 @@ void SAL_CALL ImageProducerControlModel:
-                 mbAdjustingGraphic = true;
-                 ::rtl::OUString sImageURL;
-                 OSL_VERIFY( rValue >>= sImageURL );
--                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( sImageURL ) ) );
-+                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( mxGrfObj, sImageURL ) ) );
-                 mbAdjustingGraphic = false;
-             }
-             break;
---- xmlscript/inc/xmlscript/xmldlg_imexp.hxx.old	2009-04-02 10:57:46.000000000 +0000
-+++ xmlscript/inc/xmlscript/xmldlg_imexp.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -30,6 +30,8 @@
- #ifndef _XMLSCRIPT_XMLDLG_IMEXP_HXX_
- #define _XMLSCRIPT_XMLDLG_IMEXP_HXX_
- 
-+#include <com/sun/star/frame/XModel.hpp>
-+
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HXX_
- #include <com/sun/star/container/XNameContainer.hpp>
- #endif
-@@ -54,7 +56,9 @@ void SAL_CALL exportDialogModel(
- 	::com::sun::star::uno::Reference<
-     ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
- 	::com::sun::star::uno::Reference<
--    ::com::sun::star::container::XNameContainer > const & xDialogModel )
-+    ::com::sun::star::container::XNameContainer > const & xDialogModel, 
-+	::com::sun::star::uno::Reference<
-+    ::com::sun::star::frame::XModel > const & xDocument )
- 	SAL_THROW( (::com::sun::star::uno::Exception) );
- 
- //==============================================================================
-@@ -63,7 +67,9 @@ SAL_CALL importDialogModel(
- 	::com::sun::star::uno::Reference<
-     ::com::sun::star::container::XNameContainer > const & xDialogModel,
-     ::com::sun::star::uno::Reference<
--    ::com::sun::star::uno::XComponentContext > const & xContext )
-+    ::com::sun::star::uno::XComponentContext > const & xContext,
-+    ::com::sun::star::uno::Reference<
-+    ::com::sun::star::frame::XModel > const & xDocument )
- 	SAL_THROW( (::com::sun::star::uno::Exception) );
- 
- // additional functions for convenience
-@@ -74,7 +80,9 @@ SAL_CALL exportDialogModel(
- 	::com::sun::star::uno::Reference<
-     ::com::sun::star::container::XNameContainer > const & xDialogModel,
-     ::com::sun::star::uno::Reference<
--    ::com::sun::star::uno::XComponentContext > const & xContext )
-+    ::com::sun::star::uno::XComponentContext > const & xContext,
-+    ::com::sun::star::uno::Reference<
-+    ::com::sun::star::frame::XModel > const & xDocument )
- 	SAL_THROW( (::com::sun::star::uno::Exception) );
- 
- //==============================================================================
-@@ -84,7 +92,9 @@ void SAL_CALL importDialogModel(
- 	::com::sun::star::uno::Reference<
-     ::com::sun::star::container::XNameContainer > const & xDialogModel,
-     ::com::sun::star::uno::Reference<
--    ::com::sun::star::uno::XComponentContext > const & xContext )
-+    ::com::sun::star::uno::XComponentContext > const & xContext,
-+    ::com::sun::star::uno::Reference<
-+    ::com::sun::star::frame::XModel > const & xDocument )
- 	SAL_THROW( (::com::sun::star::uno::Exception) );
- 
- }
---- xmlscript/source/xmldlg_imexp/exp_share.hxx.old	2009-04-02 10:57:46.000000000 +0000
-+++ xmlscript/source/xmldlg_imexp/exp_share.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -180,9 +180,9 @@ public:
-         SAL_THROW( (css::uno::Exception) );
-     void readCheckBoxModel( StyleBag * all_styles )
-         SAL_THROW( (css::uno::Exception) );
--    void readRadioButtonModel( StyleBag * all_styles )
-+    void readRadioButtonModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
-         SAL_THROW( (css::uno::Exception) );
--    void readComboBoxModel( StyleBag * all_styles )
-+    void readComboBoxModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
-         SAL_THROW( (css::uno::Exception) );
-     void readCurrencyFieldModel( StyleBag * all_styles )
-         SAL_THROW( (css::uno::Exception) );
-@@ -196,9 +196,9 @@ public:
-         SAL_THROW( (css::uno::Exception) );
-     void readGroupBoxModel( StyleBag * all_styles )
-         SAL_THROW( (css::uno::Exception) );
--    void readImageControlModel( StyleBag * all_styles )
-+    void readImageControlModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument  )
-         SAL_THROW( (css::uno::Exception) );
--    void readListBoxModel( StyleBag * all_styles )
-+    void readListBoxModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
-         SAL_THROW( (css::uno::Exception) );
-     void readNumericFieldModel( StyleBag * all_styles )
-         SAL_THROW( (css::uno::Exception) );
---- xmlscript/source/xmldlg_imexp/imp_share.hxx.old	2009-04-02 10:57:46.000000000 +0000
-+++ xmlscript/source/xmldlg_imexp/imp_share.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -131,6 +131,7 @@ struct DialogImport
-     
-     css::uno::Reference< css::container::XNameContainer > _xDialogModel;
-     css::uno::Reference< css::lang::XMultiServiceFactory > _xDialogModelFactory;
-+    css::uno::Reference< css::frame::XModel > _xDoc;
- 
-     sal_Int32 XMLNS_DIALOGS_UID, XMLNS_SCRIPT_UID;
-     
-@@ -164,16 +165,18 @@ public:
-     inline DialogImport(
-         css::uno::Reference<css::uno::XComponentContext> const & xContext,
-         css::uno::Reference<css::container::XNameContainer>
--        const & xDialogModel )
-+        const & xDialogModel,
-+        css::uno::Reference<css::frame::XModel> const & xDoc )
-         SAL_THROW( () )
-         : _xContext( xContext )
-         , _xDialogModel( xDialogModel )
--        , _xDialogModelFactory( xDialogModel, css::uno::UNO_QUERY_THROW )
-+        , _xDialogModelFactory( xDialogModel, css::uno::UNO_QUERY_THROW ), _xDoc( xDoc )
-         { OSL_ASSERT( _xDialogModel.is() && _xDialogModelFactory.is() &&
-                       _xContext.is() ); }
-     virtual ~DialogImport()
-         SAL_THROW( () );
-     
-+    inline css::uno::Reference< css::frame::XModel > getDocOwner() { return _xDoc; }
-     // XRoot
-     virtual void SAL_CALL startDocument(
-         css::uno::Reference< css::xml::input::XNamespaceMapping >
---- xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx.old	2009-04-02 10:57:46.000000000 +0000
-+++ xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -44,6 +44,7 @@
- using namespace ::rtl;
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
-+using namespace ::com::sun::star::frame;
- 
- namespace xmlscript
- {
-@@ -73,7 +74,8 @@ Reference< io::XInputStream > InputStrea
- //==================================================================================================
- Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
-     Reference< container::XNameContainer > const & xDialogModel,
--    Reference< XComponentContext > const & xContext )
-+    Reference< XComponentContext > const & xContext,
-+    Reference< XModel > const & xDocument )
- 	SAL_THROW( (Exception) )
- {
- 	Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() );
-@@ -98,7 +100,7 @@ Reference< io::XInputStreamProvider > SA
- 	
- 	Reference< io::XActiveDataSource > xSource( xHandler, UNO_QUERY );
- 	xSource->setOutputStream( createOutputStream( &aBytes ) );
--	exportDialogModel( xHandler, xDialogModel );
-+	exportDialogModel( xHandler, xDialogModel, xDocument );
- 	
- 	return new InputStreamProvider( aBytes );
- }
-@@ -107,7 +109,8 @@ Reference< io::XInputStreamProvider > SA
- void SAL_CALL importDialogModel(
- 	Reference< io::XInputStream > xInput,
- 	Reference< container::XNameContainer > const & xDialogModel,
--    Reference< XComponentContext > const & xContext )
-+    Reference< XComponentContext > const & xContext,
-+    Reference< XModel > const & xDocument )
- 	SAL_THROW( (Exception) )
- {
- 	Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() );
-@@ -129,7 +132,7 @@ void SAL_CALL importDialogModel(
- 	}
- 	
- 	// error handler, entity resolver omitted for this helper function
--	xParser->setDocumentHandler( importDialogModel( xDialogModel, xContext ) );
-+	xParser->setDocumentHandler( importDialogModel( xDialogModel, xContext, xDocument ) );
- 	
- 	xml::sax::InputSource source;
- 	source.aInputStream = xInput;
---- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx.old	2009-04-06 16:41:46.000000000 +0000
-+++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -32,7 +32,16 @@
- #include "precompiled_xmlscript.hxx"
- #include "exp_share.hxx"
- 
-+#include <com/sun/star/form/binding/XListEntrySink.hpp>
-+#include <com/sun/star/form/binding/XBindableValue.hpp>
-+#include <com/sun/star/form/binding/XValueBinding.hpp>
-+#include <com/sun/star/table/CellAddress.hpp>
-+#include <com/sun/star/table/CellRangeAddress.hpp>
- #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-+#include <com/sun/star/document/XStorageBasedDocument.hpp>
-+#include <com/sun/star/document/XGraphicObjectResolver.hpp>
-+#include <comphelper/componentcontext.hxx>
-+#include <comphelper/processfactory.hxx>
- 
- 
- using namespace ::com::sun::star;
-@@ -42,6 +51,66 @@ using ::rtl::OUString;
- namespace xmlscript
- {
- 
-+void lclExportBindableAndListSourceBits( Reference< frame::XModel > const & xDocument, const Reference< beans::XPropertySet >& _xProps, ElementDescriptor& rModel )
-+{
-+    Reference< lang::XMultiServiceFactory > xFac;
-+    if ( xDocument.is() )
-+        xFac.set( xDocument, uno::UNO_QUERY );
-+
-+    Reference< form::binding::XBindableValue > xBinding( _xProps, UNO_QUERY );
-+
-+    if ( xFac.is() && xBinding.is() )
-+    {
-+        try
-+        {
-+            Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );  
-+        Reference< beans::XPropertySet > xBindable( xBinding->getValueBinding(), UNO_QUERY );
-+            if ( xBindable.is() )
-+            {
-+                table::CellAddress aAddress; 
-+                xBindable->getPropertyValue( OUSTR("BoundCell") ) >>= aAddress; 
-+                xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) );
-+                rtl::OUString sAddress;
-+                xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
-+                if ( sAddress.getLength() > 0 )
-+                    rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell"), sAddress );
-+                
-+                OSL_TRACE( "*** Bindable value %s", rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() ); 
-+               
-+            }
-+        }
-+        catch( uno::Exception& )
-+        {
-+        }
-+    }
-+    Reference< form::binding::XListEntrySink > xEntrySink( _xProps, UNO_QUERY );
-+    if ( xEntrySink.is() )
-+    {
-+        Reference< beans::XPropertySet > xListSource( xEntrySink->getListEntrySource(), UNO_QUERY );
-+        if ( xListSource.is() )
-+        {
-+            try
-+            {
-+                Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );  
-+
-+                table::CellRangeAddress aAddress; 
-+                xListSource->getPropertyValue( OUSTR( "CellRange" ) ) >>= aAddress;
-+
-+                rtl::OUString sAddress;
-+                xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) );
-+                xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
-+                OSL_TRACE("**** cell range source list %s",
-+                    rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() ); 
-+                if ( sAddress.getLength() > 0 );
-+                    rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":source-cell-range"), sAddress );
-+            }
-+            catch( uno::Exception& )
-+            {
-+            }
-+        }
-+    }
-+
-+}
- static inline bool readBorderProps(
-     ElementDescriptor * element, Style & style )
- {
-@@ -209,7 +278,7 @@ void ElementDescriptor::readCheckBoxMode
-     readEvents();
- }
- //__________________________________________________________________________________________________
--void ElementDescriptor::readComboBoxModel( StyleBag * all_styles )
-+void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument )
-     SAL_THROW( (Exception) )
- {
-     // collect styles
-@@ -250,7 +319,8 @@ void ElementDescriptor::readComboBoxMode
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":maxlength") ) );
-     readShortAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("LineCount") ),
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) );
--
-+    // Cell Range, Ref Cell etc.
-+    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
-     // string item list
-     Sequence< OUString > itemValues;
-     if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) &&
-@@ -276,7 +346,7 @@ void ElementDescriptor::readComboBoxMode
-     readEvents();
- }
- //__________________________________________________________________________________________________
--void ElementDescriptor::readListBoxModel( StyleBag * all_styles )
-+void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
-     SAL_THROW( (Exception) )
- {
-     // collect styles
-@@ -311,7 +381,7 @@ void ElementDescriptor::readListBoxModel
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) );
-     readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
--
-+    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
-     // string item list
-     Sequence< OUString > itemValues;
-     if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) &&
-@@ -351,7 +421,7 @@ void ElementDescriptor::readListBoxModel
-     readEvents();
- }
- //__________________________________________________________________________________________________
--void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles )
-+void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
-     SAL_THROW( (Exception) )
- {
-     // collect styles
-@@ -409,6 +479,7 @@ void ElementDescriptor::readRadioButtonM
-             break;
-         }
-     }
-+    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
-     readEvents();
- }
- //__________________________________________________________________________________________________
-@@ -581,7 +652,7 @@ void ElementDescriptor::readEditModel( S
-     readEvents();
- }
- //__________________________________________________________________________________________________
--void ElementDescriptor::readImageControlModel( StyleBag * all_styles )
-+void ElementDescriptor::readImageControlModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
-     SAL_THROW( (Exception) )
- {
-     // collect styles
-@@ -600,8 +671,31 @@ void ElementDescriptor::readImageControl
-     readDefaults();
-     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
-                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scale-image") ) );
--    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
--                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":src") ) );
-+    rtl::OUString sURL;
-+    _xProps->getPropertyValue( OUSTR("ImageURL") ) >>= sURL;
-+    
-+    if ( sURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:"  ) ) ) == 0 )
-+    {
-+        Reference< document::XStorageBasedDocument > xDocStorage( xDocument, UNO_QUERY );
-+
-+        if ( xDocStorage.is() )
-+        {
-+            uno::Sequence< Any > aArgs( 1 );
-+            aArgs[ 0 ] <<= xDocStorage->getDocumentStorage();
-+
-+            ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
-+            uno::Reference< document::XGraphicObjectResolver > xGraphicResolver;
-+            aContext.createComponentWithArguments( OUSTR( "com.sun.star.comp.Svx.GraphicExportHelper" ), aArgs, xGraphicResolver );
-+            if ( xGraphicResolver.is() )
-+            {
-+                sURL = xGraphicResolver->resolveGraphicObjectURL( sURL );
-+            }
-+        }     
-+    }
-+    if ( sURL.getLength() > 0 )
-+    {
-+        addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":src"), sURL );
-+    }
-     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
-                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
-     readEvents();
---- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx.old	2009-04-02 10:57:46.000000000 +0000
-+++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -1309,7 +1309,8 @@ void StyleBag::dump( Reference< xml::sax
- //==================================================================================================
- void SAL_CALL exportDialogModel(
-     Reference< xml::sax::XExtendedDocumentHandler > const & xOut,
--    Reference< container::XNameContainer > const & xDialogModel )
-+    Reference< container::XNameContainer > const & xDialogModel,
-+    Reference< frame::XModel > const & xDocument )
-     SAL_THROW( (Exception) )
- {
-     StyleBag all_styles;
-@@ -1357,7 +1358,7 @@ void SAL_CALL exportDialogModel(
-                 xProps, xPropState,
-                 OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":radio") ) );
-             xElem = static_cast< xml::sax::XAttributeList * >( pElem );
--            pElem->readRadioButtonModel( &all_styles );
-+            pElem->readRadioButtonModel( &all_styles, xDocument  );
-             pRadioGroup->addSubElement( xElem );
-         }
-         else // no radio
-@@ -1386,7 +1387,7 @@ void SAL_CALL exportDialogModel(
-                     xProps, xPropState,
-                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":combobox") ) );
-                 xElem = static_cast< xml::sax::XAttributeList * >( pElem );
--                pElem->readComboBoxModel( &all_styles );
-+                pElem->readComboBoxModel( &all_styles, xDocument );
-             }
-             else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ) )
-             {
-@@ -1394,7 +1395,7 @@ void SAL_CALL exportDialogModel(
-                     xProps, xPropState,
-                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menulist") ) );
-                 xElem = static_cast< xml::sax::XAttributeList * >( pElem );
--                pElem->readListBoxModel( &all_styles );
-+                pElem->readListBoxModel( &all_styles, xDocument );
-             }
-             else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
-             {
-@@ -1435,7 +1436,7 @@ void SAL_CALL exportDialogModel(
-                     xProps, xPropState,
-                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":img") ) );
-                 xElem = static_cast< xml::sax::XAttributeList * >( pElem );
--                pElem->readImageControlModel( &all_styles );
-+                pElem->readImageControlModel( &all_styles, xDocument );
-             }
-             else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFileControlModel") ) ) )
-             {
---- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx.old	2009-04-06 16:41:46.000000000 +0000
-+++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -31,11 +31,19 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_xmlscript.hxx"
- #include "imp_share.hxx"
--
-+#include <com/sun/star/form/binding/XBindableValue.hpp>
-+#include <com/sun/star/form/binding/XValueBinding.hpp>
-+#include <com/sun/star/form/binding/XListEntrySink.hpp>
-+#include <com/sun/star/beans/NamedValue.hpp>
-+#include <com/sun/star/table/CellAddress.hpp>
-+#include <com/sun/star/table/CellRangeAddress.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <com/sun/star/beans/XPropertyState.hpp>
-+#include <com/sun/star/document/XStorageBasedDocument.hpp>
-+#include <com/sun/star/document/XGraphicObjectResolver.hpp>
- 
--
-+#include <comphelper/componentcontext.hxx>
-+#include <comphelper/processfactory.hxx>
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
- using ::rtl::OUString;
-@@ -43,6 +51,100 @@ using ::rtl::OUString;
- namespace xmlscript
- {
- 
-+// #FIXME cut'n'pasted from xmloff/source/core/xmlimp.cxx:1251 
-+// of course we need to find a common home for this helper
-+
-+bool IsPackageURL( const ::rtl::OUString& rURL )
-+{
-+    // Some quick tests: Some may rely on the package structure!
-+    sal_Int32 nLen = rURL.getLength();
-+    if( (nLen > 0 && '/' == rURL[0]) )
-+        // RFC2396 net_path or abs_path
-+        return false;
-+    else if( nLen > 1 && '.' == rURL[0] )
-+    {
-+        if( '.' == rURL[1] )
-+            // ../: We are never going up one level, so we know
-+            // it's not an external URI
-+            return false;
-+        else if( '/' == rURL[1] )
-+            // we are remaining on a level, so it's an package URI
-+            return true;
-+    }
-+
-+    // Now check for a RFC2396 schema
-+    sal_Int32 nPos = 1;
-+    while( nPos < nLen )
-+    {
-+        switch( rURL[nPos] )
-+        {
-+            case '/':
-+                // a relative path segement
-+                return true;
-+            case ':':
-+                // a schema
-+                return false;
-+            default:
-+                break;
-+                // we don't care about any other characters
-+        }
-+        ++nPos;
-+    }
-+
-+    return true;
-+}
-+
-+void importBindableAndListRangeBits( DialogImport* _pImport, const rtl::OUString sLinkedCell, const rtl::OUString & sCellRange, ControlImportContext& ctx )
-+{
-+    Reference< lang::XMultiServiceFactory > xFac( _pImport->getDocOwner(), UNO_QUERY );;
-+    if ( xFac.is() && ( sLinkedCell.getLength() ||  sCellRange.getLength() ) )
-+    {
-+        // Set up Celllink
-+        if ( sLinkedCell.getLength() )
-+        {
-+            Reference< form::binding::XBindableValue > xBindable( ctx.getControlModel(), uno::UNO_QUERY );
-+            Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );
-+            if ( xBindable.is() && xConvertor.is() )
-+            {
-+                table::CellAddress aAddress;
-+                xConvertor->setPropertyValue( OUSTR( "PersistentRepresentation" ), uno::makeAny( sLinkedCell ) );
-+                xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress;     
-+                beans::NamedValue aArg1;
-+                aArg1.Name = OUSTR("BoundCell");
-+                aArg1.Value <<= aAddress;
-+           
-+                uno::Sequence< uno::Any > aArgs(1);
-+                aArgs[ 0 ]  <<= aArg1;
-+           
-+                uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( OUSTR("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY );
-+                xBindable->setValueBinding( xBinding );
-+ 
-+            }
-+        }
-+        // Set up CelllRange
-+        if ( sCellRange.getLength() )
-+        {
-+           Reference< form::binding::XListEntrySink  > xListEntrySink( ctx.getControlModel(), uno::UNO_QUERY );
-+           Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );
-+           if ( xListEntrySink.is() && xConvertor.is() )
-+           {
-+               table::CellRangeAddress aAddress;
-+               xConvertor->setPropertyValue( OUSTR( "PersistentRepresentation" ), uno::makeAny( sCellRange ) );
-+               xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress;     
-+               beans::NamedValue aArg1;
-+               aArg1.Name = OUSTR("CellRange");
-+               aArg1.Value <<= aAddress;
-+           
-+               uno::Sequence< uno::Any > aArgs(1);
-+               aArgs[ 0 ]  <<= aArg1;
-+           
-+               uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( OUSTR("com.sun.star.table.CellRangeListSource" ), aArgs ), uno::UNO_QUERY );
-+               xListEntrySink->setListEntrySource( xSource );
-+ 
-+           }
-+       }
-+   }
-+}
- // progessmeter
- //__________________________________________________________________________________________________
- Reference< xml::input::XElement > ProgressBarElement::startChildElement(
-@@ -1003,9 +1105,37 @@ void ImageControlElement::endElement()
- 	ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
- 							   OUString( RTL_CONSTASCII_USTRINGPARAM("scale-image") ),
- 							   _xAttributes );
--	ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
--							  OUString( RTL_CONSTASCII_USTRINGPARAM("src") ),
--							  _xAttributes );
-+    rtl::OUString sURL = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "src" ) );
-+    Reference< document::XStorageBasedDocument > xDocStorage( _pImport->getDocOwner(), UNO_QUERY );
-+
-+    if ( xDocStorage.is() && IsPackageURL( sURL ) )
-+    {
-+        uno::Sequence< Any > aArgs( 1 );
-+        aArgs[ 0 ] <<= xDocStorage->getDocumentStorage();
-+
-+        ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
-+        uno::Reference< document::XGraphicObjectResolver > xGraphicResolver;
-+        aContext.createComponentWithArguments( OUSTR( "com.sun.star.comp.Svx.GraphicImportHelper" ), aArgs, xGraphicResolver );
-+
-+        if ( xGraphicResolver.is() )
-+        {
-+            rtl::OUString aTmp( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
-+            aTmp += sURL;
-+            sURL = xGraphicResolver->resolveGraphicObjectURL( aTmp );
-+            Reference< beans::XPropertySet > xProps( ctx.getControlModel(), UNO_QUERY );
-+            // we must set the url while the graphic object ( held by the resolver is in scope )
-+            if ( xProps.is() )
-+                xProps->setPropertyValue( OUSTR("ImageURL"), makeAny( sURL ) );
-+        }
-+    }
-+    
-+    else if ( sURL.getLength() > 0 )
-+    {
-+        Reference< beans::XPropertySet > xProps( ctx.getControlModel(), UNO_QUERY );
-+        if ( xProps.is() )
-+            xProps->setPropertyValue( OUSTR("ImageURL"), makeAny( sURL ) );
-+    }
-+
-     ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
-                                OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
-                                _xAttributes );
-@@ -1338,10 +1468,24 @@ void TitledBoxElement::endElement()
- 		Reference< xml::input::XElement > xRadio( _radios[ nPos ] );
- 		Reference< xml::input::XAttributes > xAttributes(
-             xRadio->getAttributes() );
-+		OUString sLinkedCell;
-+		OUString sCellRange;
-+		OUString sService( OUSTR("com.sun.star.awt.UnoControlRadioButtonModel") );
-+		try
-+		{
-+			sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-+			// we should probably limit this to vba mode also ( leave for now )
-+			if ( _pImport->getDocOwner().is() )
-+				sService = OUSTR("com.sun.star.form.component.RadioButton");
-+		}
-+		catch( Exception& /*e*/ )
-+		{
-+		}
-+
- 		
- 		ControlImportContext ctx(
- 			_pImport, getControlId( xAttributes ),
--			OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) );
-+			sService );
- 		Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
- 		
- 		Reference< xml::input::XElement > xStyle( getStyle( xAttributes ) );
-@@ -1393,7 +1537,7 @@ void TitledBoxElement::endElement()
- 		}
- 		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ),
- 										 makeAny( nVal ) );
--        
-+	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
-         ::std::vector< Reference< xml::input::XElement > > * radioEvents =
-             static_cast< RadioElement * >( xRadio.get() )->getEvents();
- 		ctx.importEvents( *radioEvents );
-@@ -1469,10 +1613,23 @@ void RadioGroupElement::endElement()
- 		Reference< xml::input::XElement > xRadio( _radios[ nPos ] );
- 		Reference< xml::input::XAttributes > xAttributes(
-             xRadio->getAttributes() );
-+		OUString sLinkedCell;
-+		OUString sCellRange;
-+		OUString sService( OUSTR("com.sun.star.awt.UnoControlRadioButtonModel") );
-+		try
-+		{
-+			sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-+			// we should probably limit this to vba mode also ( leave for now )
-+			if ( _pImport->getDocOwner().is() )
-+				sService = OUSTR("com.sun.star.form.component.RadioButton");
-+		}
-+		catch( Exception& /*e*/ )
-+		{
-+		}
- 		
- 		ControlImportContext ctx(
- 			_pImport, getControlId( xAttributes ),
--			OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) );
-+			sService );
- 		Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
- 		
- 		Reference< xml::input::XElement > xStyle( getStyle( xAttributes ) );
-@@ -1524,6 +1681,7 @@ void RadioGroupElement::endElement()
- 		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ),
- 										 makeAny( nVal ) );
- 		
-+	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
-         ::std::vector< Reference< xml::input::XElement > > * radioEvents =
-             static_cast< RadioElement * >( xRadio.get() )->getEvents();
- 		ctx.importEvents( *radioEvents );
-@@ -1644,9 +1802,26 @@ Reference< xml::input::XElement > MenuLi
- void MenuListElement::endElement()
- 	throw (xml::sax::SAXException, RuntimeException)
- {
-+        OUString sLinkedCell;
-+        OUString sCellRange;
-+        OUString sListBoxService( OUSTR("com.sun.star.awt.UnoControlListBoxModel") );
-+
-+        // we should probably limit this to vba mode also ( leave for now )
-+        if ( _pImport->getDocOwner().is() )
-+            sListBoxService = OUSTR("com.sun.star.form.component.ListBox");
-+
-+        try
-+        {
-+            sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-+            sCellRange = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "source-cell-range" ) );
-+        }
-+        catch( Exception& /*e*/ )
-+        {
-+        }
- 	ControlImportContext ctx(
- 		_pImport, getControlId( _xAttributes ),
--		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) );
-+		//OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) );
-+		sListBoxService );
- 	Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
- 	
- 	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
-@@ -1679,13 +1854,16 @@ void MenuListElement::endElement()
- 	ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
-                              OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
-                              _xAttributes );
--	
-+        // import cell-link and cell source range
-+	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
- 	if (_popup.is())
- 	{
- 		MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() );
--		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ),
-+        if (  !sCellRange.getLength() )
-+		    xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ),
- 										 makeAny( p->getItemValues() ) );
--		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") ),
-+        if (  !sLinkedCell.getLength() )
-+		    xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") ),
- 										 makeAny( p->getSelectedItems() ) );
- 	}
- 	ctx.importEvents( _events );
-@@ -1731,9 +1909,26 @@ Reference< xml::input::XElement > ComboB
- void ComboBoxElement::endElement()
- 	throw (xml::sax::SAXException, RuntimeException)
- {
-+        OUString sService( OUSTR("com.sun.star.awt.UnoControlComboBoxModel") );
-+
-+        // we should probably limit this to vba mode also ( leave for now )
-+        if ( _pImport->getDocOwner().is() )
-+            sService = OUSTR("com.sun.star.form.component.ComboBox");
-+
-+        OUString sLinkedCell;
-+        OUString sCellRange;
-+        try
-+        {
-+            sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-+            sCellRange = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "source-cell-range" ) );
-+        }
-+        catch( Exception& /*e*/ )
-+        {
-+        }
-+
- 	ControlImportContext ctx(
- 		_pImport, getControlId( _xAttributes ),
--		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ) );
-+		sService );
- 	Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
- 	
- 	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
-@@ -1775,8 +1970,10 @@ void ComboBoxElement::endElement()
- 	ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
-                              OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
-                              _xAttributes );
-+	// import cell-link and cell source range
-+	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
- 	
--	if (_popup.is())
-+	if (_popup.is() && !sCellRange.getLength() )
- 	{
- 		MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() );
- 		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ),
---- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx.old	2009-04-02 10:57:46.000000000 +0000
-+++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -62,6 +62,7 @@
- 
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
-+using namespace ::com::sun::star::frame;
- using ::rtl::OUString;
- 
- namespace xmlscript
-@@ -1879,12 +1880,13 @@ Reference< xml::input::XElement > Dialog
- //==================================================================================================
- Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel(
-     Reference< container::XNameContainer > const & xDialogModel,
--    Reference< XComponentContext > const & xContext )
-+    Reference< XComponentContext > const & xContext,
-+    Reference< XModel > const & xDocument )
-     SAL_THROW( (Exception) )
- {
-     return ::xmlscript::createDocumentHandler(
-         static_cast< xml::input::XRoot * >(
--            new DialogImport( xContext, xDialogModel ) ) );
-+            new DialogImport( xContext, xDialogModel, xDocument ) ) );
- }
- 
- }
diff --git a/applied_patches/0281-mono-testtools.diff b/applied_patches/0315-mono-testtools-m59.diff
similarity index 100%
rename from applied_patches/0281-mono-testtools.diff
rename to applied_patches/0315-mono-testtools-m59.diff
diff --git a/applied_patches/0316-ObjectModule.diff b/applied_patches/0316-ObjectModule.diff
deleted file mode 100644
index e1d3b7f3d..000000000
--- a/applied_patches/0316-ObjectModule.diff
+++ /dev/null
@@ -1,2061 +0,0 @@
---- basctl/source/basicide/basides1.cxx.old	2009-04-02 10:56:36.000000000 +0000
-+++ basctl/source/basicide/basides1.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -1201,10 +1201,16 @@ IDEBaseWindow* BasicIDEShell::FindWindow
-                 // return any non-suspended window
-                 return pWin;
-             }
--            else if ( pWin->IsDocument( rDocument ) && pWin->GetLibName() == rLibName && pWin->GetName() == rName &&
-+            else if ( pWin->IsDocument( rDocument ) )
-+            {
-+                OSL_TRACE("FindWindow pWin->GetLibName() %s rLibName %s",
-+			rtl::OUStringToOString( pWin->GetLibName(), RTL_TEXTENCODING_UTF8 ).getStr(),
-+			rtl::OUStringToOString( rLibName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+                OSL_TRACE("pWin->pWin->IsA( TYPE( ModulWindow ) %d && nType %d = BASICIDE_TYPE_MODULE %d", pWin->IsA( TYPE( ModulWindow ) ), nType, BASICIDE_TYPE_MODULE );
-+                OSL_TRACE("pWin->pWin->IsA( TYPE( DialogWindow ) %d && nType %d = BASICIDE_TYPE_DIALOG %d", pWin->IsA( TYPE( DialogWindow ) ), nType, BASICIDE_TYPE_DIALOG );
-+		if (  pWin->GetLibName() == rLibName && pWin->GetName() == rName &&
-                       ( ( pWin->IsA( TYPE( ModulWindow ) )  && nType == BASICIDE_TYPE_MODULE ) ||
-                         ( pWin->IsA( TYPE( DialogWindow ) ) && nType == BASICIDE_TYPE_DIALOG ) ) )
--            {
-                 return pWin;
-             }
-         }
---- basctl/source/basicide/basides2.cxx.old	2009-04-02 10:56:36.000000000 +0000
-+++ basctl/source/basicide/basides2.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -251,9 +251,12 @@ ModulWindow* BasicIDEShell::CreateBasWin
- 
-         if ( bSuccess )
-         {
--			// new module window
--			pWin = new ModulWindow( pModulLayout, rDocument, aLibName, aModName, aModule );
--			nKey = InsertWindowInTable( pWin );
-+			pWin = FindBasWin( rDocument, aLibName, aModName, FALSE, TRUE );
-+            if( !pWin )
-+			{    // new module window
-+			    pWin = new ModulWindow( pModulLayout, rDocument, aLibName, aModName, aModule );
-+			    nKey = InsertWindowInTable( pWin );
-+            }
-         }
- 	}
- 	else
-@@ -268,7 +271,8 @@ ModulWindow* BasicIDEShell::CreateBasWin
- 		}
- 		DBG_ASSERT( nKey, "CreateBasWin: Kein Key- Fenster nicht gefunden!" );
- 	}
--	pTabBar->InsertPage( (USHORT)nKey, aModName );
-+    if( nKey )
-+	    pTabBar->InsertPage( (USHORT)nKey, aModName );
- 	pTabBar->Sort();
- 	pWin->GrabScrollBars( &aHScrollBar, &aVScrollBar );
- 	if ( !pCurWin )
---- basctl/source/basicide/basidesh.cxx.old	2009-04-02 10:56:36.000000000 +0000
-+++ basctl/source/basicide/basidesh.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -80,6 +80,9 @@
- #include <com/sun/star/script/XLibraryContainer.hpp>
- #include <com/sun/star/script/XLibraryContainerPassword.hpp>
- #include <com/sun/star/container/XNameContainer.hpp>
-+#include <com/sun/star/container/XContainer.hpp>
-+#include <com/sun/star/container/XContainerListener.hpp>
-+#include <com/sun/star/script/XLibraryContainer.hpp>
- 
- #include <svx/xmlsecctrl.hxx>
- 
-@@ -87,6 +90,71 @@ using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star;
- using ::rtl::OUString;
- 
-+static const rtl::OUString sStandardLibName(  rtl::OUString::createFromAscii("Standard") );
-+
-+typedef ::cppu::WeakImplHelper1< container::XContainerListener > ContainerListenerBASE;
-+
-+class ContainerListenerImpl : public ContainerListenerBASE
-+{
-+    BasicIDEShell* mpShell;
-+public:
-+
-+    ContainerListenerImpl( BasicIDEShell* pShell ) : mpShell( pShell ) {}
-+
-+    ~ContainerListenerImpl() 
-+    {
-+    }
-+
-+    void addContainerListener( const ScriptDocument& rScriptDocument )
-+    {
-+        uno::Reference< container::XContainer > xContainer( rScriptDocument.getLibrary( E_SCRIPTS, sStandardLibName, FALSE ), uno::UNO_QUERY );
-+        if ( rScriptDocument.isDocument() && xContainer.is() )
-+        {
-+            uno::Reference< container::XContainerListener > xContainerListener( this );
-+            try
-+            {
-+                xContainer->addContainerListener( xContainerListener );
-+            }
-+            catch( uno::Exception& ) {}
-+        }
-+    }
-+    void removeContainerListener( const ScriptDocument& rScriptDocument )
-+    {
-+        uno::Reference< container::XContainer > xContainer( rScriptDocument.getLibrary( E_SCRIPTS, sStandardLibName, FALSE ), uno::UNO_QUERY );
-+        if ( rScriptDocument.isDocument(), xContainer.is() )
-+        {
-+            uno::Reference< container::XContainerListener > xContainerListener( this );
-+            try
-+            {
-+               xContainer->removeContainerListener( xContainerListener );
-+            }
-+            catch( uno::Exception& ) {}
-+        }
-+    }
-+
-+    // XEventListener
-+    virtual void SAL_CALL disposing( const lang::EventObject& ) throw( uno::RuntimeException ) {}
-+
-+    // XContainerListener
-+    virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException )
-+    {
-+        rtl::OUString sModuleName;
-+        if( mpShell && ( Event.Accessor >>= sModuleName ) )
-+            mpShell->FindBasWin( mpShell->m_aCurDocument, sStandardLibName, sModuleName, TRUE, FALSE );
-+    }
-+    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( com::sun::star::uno::RuntimeException ) { }
-+    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( com::sun::star::uno::RuntimeException )
-+    {
-+        rtl::OUString sModuleName;
-+        if( mpShell  && ( Event.Accessor >>= sModuleName ) )
-+        {
-+            IDEBaseWindow* pWin = mpShell->FindWindow( mpShell->m_aCurDocument, sStandardLibName, sModuleName, BASICIDE_TYPE_MODULE, TRUE );
-+            if( pWin )
-+                mpShell->RemoveWindow( pWin, FALSE, TRUE );
-+        }
-+    }
-+
-+};
- 
- TYPEINIT1( BasicIDEShell, SfxViewShell );
- 
-@@ -124,6 +192,7 @@ BasicIDEShell::BasicIDEShell( SfxViewFra
-         m_bAppBasicModified( FALSE ),
-         m_aNotifier( *this )
- {
-+    m_xLibListener = new ContainerListenerImpl( this );
- 	Init();
-     GnBasicIDEShellCount++;
- }
-@@ -215,6 +284,12 @@ __EXPORT BasicIDEShell::~BasicIDEShell()
- 	delete pTabBar;
- 	delete pObjectCatalog;
- 	DestroyModulWindowLayout();
-+
-+        ContainerListenerImpl* pListener = dynamic_cast< ContainerListenerImpl* >( m_xLibListener.get() );
-+        // Destroy all ContainerListeners for Basic Container.
-+        if ( pListener )
-+            pListener->removeContainerListener( m_aCurDocument );
-+    
- 	// MI: Das gab einen GPF im SDT beim Schliessen da dann der ViewFrame die
- 	// ObjSh loslaesst. Es wusste auch keiner mehr wozu das gut war.
- 	// GetViewFrame()->GetObjectShell()->Broadcast( SfxSimpleHint( SFX_HINT_DYING ) );
-@@ -921,7 +996,15 @@ void BasicIDEShell::SetCurLib( const Scr
- {
-     if ( !bCheck || ( rDocument != m_aCurDocument || aLibName != m_aCurLibName ) )
-     {
-+        ContainerListenerImpl* pListener = dynamic_cast< ContainerListenerImpl* >( m_xLibListener.get() );
-+        if ( pListener )
-+        	pListener->removeContainerListener( m_aCurDocument );
-+
-         m_aCurDocument = rDocument;
-+
-+        if ( pListener )
-+            pListener->addContainerListener( m_aCurDocument );
-+
-         m_aCurLibName = aLibName;
-         if ( bUpdateWindows )
-             UpdateWindows();
---- basctl/source/basicide/scriptdocument.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ basctl/source/basicide/scriptdocument.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -56,6 +56,7 @@
- #include <com/sun/star/frame/XModel2.hpp>
- #include <com/sun/star/awt/XWindow2.hpp>
- #include <com/sun/star/document/XEmbeddedScripts.hpp>
-+#include <com/sun/star/script/ModuleInfo.hpp>
- /** === end UNO includes === **/
- 
- #include <sfx2/objsh.hxx>
-@@ -142,6 +143,7 @@ namespace basctl
-     using ::com::sun::star::uno::RuntimeException;
-     using ::com::sun::star::document::XEventBroadcaster;
-     using ::com::sun::star::document::XEmbeddedScripts;
-+    using ::com::sun::star::script::ModuleInfo;
-     /** === end UNO using === **/
-     namespace MacroExecMode = ::com::sun::star::document::MacroExecMode;
-     namespace FrameSearchFlag = ::com::sun::star::frame::FrameSearchFlag;
-@@ -674,6 +676,15 @@ namespace basctl
-             }
- 
- 		    // insert element by new name in container
-+            if ( _eType == E_SCRIPTS )
-+            {
-+                ModuleInfo sModuleInfo;
-+                if ( aElement >>= sModuleInfo )
-+                {
-+                    sModuleInfo.ModuleName = _rNewName;
-+                    aElement <<= sModuleInfo;
-+                }
-+            }
- 		    xLib->insertByName( _rNewName, aElement );
-             return true;
-         }
-@@ -738,8 +749,16 @@ namespace basctl
-             Reference< XNameContainer > xLib( getOrCreateLibrary( E_SCRIPTS, _rLibName ), UNO_QUERY_THROW );
- 	        if ( !xLib->hasByName( _rModName ) )
-                 return false;
--
--            xLib->replaceByName( _rModName, makeAny( _rModuleCode ) );
-+            ModuleInfo mInfo;
-+            Any aMod;
-+            if ( xLib->getByName( _rModName ) >>= mInfo )
-+            {
-+                mInfo.ModuleSource = _rModuleCode;
-+                aMod <<= mInfo;
-+            }
-+            else
-+                aMod <<= _rModuleCode;
-+            xLib->replaceByName( _rModName, aMod );
-             return true;
-         }
-         catch( const Exception& )
-@@ -1392,7 +1411,15 @@ namespace basctl
-         Any aCode;
-         if ( !m_pImpl->getModuleOrDialog( E_SCRIPTS, _rLibName, _rModName, aCode ) )
-             return false;
--        OSL_VERIFY( aCode >>= _out_rModuleSource );
-+        ModuleInfo sModuleInfo;
-+        if ( aCode >>= sModuleInfo )
-+        {
-+            _out_rModuleSource = sModuleInfo.ModuleSource;
-+        }
-+        else
-+        {
-+            OSL_VERIFY( aCode >>= _out_rModuleSource );
-+        }
-         return true;
-     }
- 
---- basctl/source/inc/basidesh.hxx.old	2009-04-02 10:56:36.000000000 +0000
-+++ basctl/source/inc/basidesh.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -49,6 +49,7 @@
- #include <com/sun/star/io/XInputStreamProvider.hpp>
- #endif
- 
-+#include <com/sun/star/container/XContainerListener.hpp>
- 
- //----------------------------------------------------------------------------
- 
-@@ -107,6 +108,8 @@ friend bool BasicIDE::RemoveDialog( cons
-     BOOL                m_bAppBasicModified;
-     ::basctl::DocumentEventNotifier
-                         m_aNotifier;
-+friend class ContainerListenerImpl;
-+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xLibListener;
- 
- #if _SOLAR__PRIVATE
- 	void				Init();
---- basic/inc/basic/sbmod.hxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ basic/inc/basic/sbmod.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -37,7 +37,7 @@
- #ifndef _RTL_USTRING_HXX
- #include <rtl/ustring.hxx>
- #endif
--
-+#include <com/sun/star/script/ModuleType.hpp>
- class SbMethod;
- class SbProperty;
- class SbiRuntime;
-@@ -67,6 +67,9 @@ protected:
- 	SbiBreakpoints*	pBreaks;			// Breakpoints
- 	SbClassData*	pClassData;
- 	bool mbVBACompat;
-+	INT32 mnType; 
-+	SbxObjectRef pDocObject; // an impl object ( used by Document Modules )
-+	bool 	bIsProxyModule;
- 
- 	void			StartDefinitions();
- 	SbMethod*		GetMethod( const String&, SbxDataType );
-@@ -91,7 +94,7 @@ protected:
- public:
- 	SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2);
- 	TYPEINFO();
--					SbModule( const String& );
-+					SbModule( const String&, bool bCompat = false );
- 	virtual void	SetParent( SbxObject* );
- 	virtual void 	Clear();
- 
-@@ -127,8 +130,12 @@ public:
- 	BOOL LoadBinaryData( SvStream& );
- 	BOOL ExceedsLegacyModuleSize();
- 	void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
--        bool IsVBACompat() { return mbVBACompat; }
-         bool HasExeCode();
-+        bool IsVBACompat();
-+        void SetVBACompat( bool bCompat );
-+        INT32 GetModuleType() { return mnType; }
-+        void SetModuleType( INT32 nType ) { mnType = nType; }
-+	bool GetIsProxyModule() { return bIsProxyModule; }
- };
- 
- #ifndef __SB_SBMODULEREF_HXX
---- basic/inc/basic/sbobjmod.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ basic/inc/basic/sbobjmod.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,66 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: sbobjmod.hxx,v $
-+ *
-+ *  $Revision: 1.4 $
-+ *
-+ *  last change: $Author:  $ $Date: 2007/08/27 16:31:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef _SB_OBJMOD_HXX
-+#define _SB_OBJMOD_HXX
-+
-+#include <basic/sbmod.hxx>
-+#include <basic/sbstar.hxx>
-+#include <com/sun/star/script/ModuleInfo.hpp>
-+#include <com/sun/star/lang/XEventListener.hpp>
-+#include <com/sun/star/awt/XDialog.hpp>
-+
-+namespace css = ::com::sun::star;
-+
-+// Basic-Module for excel object.
-+
-+class SbObjModule : public SbModule
-+{
-+public:
-+    TYPEINFO();
-+    SbObjModule( const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
-+    virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
-+    SbxVariable* GetObject();
-+    void SetUnoObject( const com::sun::star::uno::Any& aObj )throw ( com::sun::star::uno::RuntimeException ) ;
-+};
-+
-+#ifndef __SB_SBOBJMODULEREF_HXX
-+#define __SB_SBOBJMODULEREF_HXX
-+
-+SV_DECL_IMPL_REF(SbObjModule);
-+
-+#endif
-+#endif
-+
---- basic/inc/basic/sbstar.hxx
-+++ basic/inc/basic/sbstar.hxx
-@@ -40,6 +40,7 @@
- 
- #include <basic/sbdef.hxx>
- #include <basic/sberrors.hxx>
-+#include <com/sun/star/script/ModuleInfo.hpp>
- 
- class SbModule;                     // completed module
- class SbiInstance;                  // runtime instance
-@@ -71,6 +72,7 @@ class StarBASIC : public SbxObject
- 	BOOL			bNoRtl;				// if TRUE: do not search RTL
- 	BOOL			bBreak;				// if TRUE: Break, otherwise Step
- 	BOOL			bDocBasic;
-+    BOOL            bVBAEnabled;
- 	BasicLibInfo*	pLibInfo;			// Info block for basic manager
- 	SbLanguageMode	eLanguageMode;		// LanguageMode of the basic object
- protected:
-@@ -113,7 +115,8 @@ public:
- 
- 	// Compiler-Interface
- 	SbModule*   	MakeModule( const String& rName, const String& rSrc );
--    SbModule*   	MakeModule32( const String& rName, const ::rtl::OUString& rSrc );
-+    SbModule*       MakeModule32( const String& rName, const ::rtl::OUString& rSrc );
-+    SbModule*       MakeModule32( const com::sun::star::script::ModuleInfo& mInfo );
- 	BOOL			Compile( SbModule* );
- 	BOOL 			Disassemble( SbModule*, String& rText );
- 	static void 	Stop();
-@@ -185,6 +188,8 @@ public:
- 					( const String& rName, USHORT& rStatus );
- 	static SbMethod* GetActiveMethod( USHORT nLevel = 0 );
- 	static SbModule* GetActiveModule();
-+    void SetVBAEnabled( BOOL bEnabled );
-+    BOOL isVBAEnabled();
- 
- 	// #60175 TRUE: SFX-Resource is not displayed on basic errors
- 	static void StaticSuppressSfxResource( BOOL bSuppress );
---- basic/source/basmgr/basmgr.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ basic/source/basmgr/basmgr.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -44,6 +44,7 @@
- #include <tools/debug.hxx>
- #include <tools/diagnose_ex.h>
- #include <basic/sbmod.hxx>
-+#include <basic/sbobjmod.hxx>
- 
- #include <basic/sbuno.hxx>
- #include <basic/basmgr.hxx>
-@@ -67,6 +68,8 @@
- #include <com/sun/star/script/XStarBasicDialogInfo.hpp>
- #include <com/sun/star/script/XStarBasicLibraryInfo.hpp>
- #include <com/sun/star/script/XLibraryContainerPassword.hpp>
-+#include <com/sun/star/script/ModuleInfo.hpp>
-+#include <com/sun/star/script/ModuleType.hpp>
- 
- #include <cppuhelper/implbase1.hxx>
- 
-@@ -243,9 +246,18 @@ void BasMgrContainerListenerImpl::addLib
- 		{
- 			::rtl::OUString aModuleName = pNames[ j ];
- 			Any aElement = xLibNameAccess->getByName( aModuleName );
--			::rtl::OUString aMod;
--			aElement >>= aMod;
--			pLib->MakeModule32( aModuleName, aMod );
-+            ModuleInfo mInfo;
-+            if ( aElement >>= mInfo )
-+            {
-+                OSL_TRACE("#addLibraryModulesImpl - aMod");
-+                pLib->MakeModule32( mInfo );
-+            }
-+            else
-+            {
-+			    ::rtl::OUString aMod;
-+			    aElement >>= aMod;
-+			    pLib->MakeModule32( aModuleName, aMod );
-+            }
- 		}
- 	}
- 
-@@ -282,8 +294,6 @@ void SAL_CALL BasMgrContainerListenerImp
- 	}
- 	else
- 	{
--		::rtl::OUString aMod;
--		Event.Element >>= aMod;
- 
- 		StarBASIC* pLib = mpMgr->GetLib( maLibName );
- 		DBG_ASSERT( pLib, "BasMgrContainerListenerImpl::elementInserted: Unknown lib!");
-@@ -292,7 +302,17 @@ void SAL_CALL BasMgrContainerListenerImp
-     		SbModule* pMod = pLib->FindModule( aName );
-             if( !pMod )
-             {
--			    pLib->MakeModule32( aName, aMod );
-+                ModuleInfo mInfo;
-+                if( Event.Element >>= mInfo )
-+                {
-+                    pLib->MakeModule32( mInfo );
-+                }
-+                else
-+                {
-+        		    ::rtl::OUString aMod;
-+        		    Event.Element >>= aMod;
-+			        pLib->MakeModule32( aName, aMod );
-+                }
- 			    pLib->SetModified( FALSE );
-             }
- 		}
-@@ -316,15 +336,35 @@ void SAL_CALL BasMgrContainerListenerImp
-     DBG_ASSERT( !bLibContainer, "library container fired elementReplaced()");
- 
- 	StarBASIC* pLib = mpMgr->GetLib( maLibName );
-+    
- 	if( pLib )
- 	{
--		SbModule* pMod = pLib->FindModule( aName );
-+	    SbModule* pMod = pLib->FindModule( aName );
- 		::rtl::OUString aMod;
--		Event.Element >>= aMod;
-+        ModuleInfo mInfo;
-+        if( Event.Element >>= mInfo )
-+			aMod = mInfo.ModuleSource;
-+        else 
-+            Event.Element >>= aMod;
- 		if( pMod )
-+		{
- 			pMod->SetSource32( aMod );
--		else
--			pLib->MakeModule32( aName, aMod );
-+			if ( mInfo.ModuleType == ModuleType::Document )
-+			{
-+				SbObjModule* pObjModule = dynamic_cast< SbObjModule* >( pMod );
-+				if ( pObjModule )	
-+					pObjModule->SetUnoObject( makeAny( mInfo.ModuleObject ) );
-+			}
-+		}
-+        else
-+			// Probably we should have an assert for
-+			// unknow module type, e.g. either we are using
-+			// the ModuleInfo structure ( vba ) for *all* modules
-+			// or not ( normal )
-+			if ( mInfo.ModuleType == ModuleType::Unknown )
-+				pLib->MakeModule32( aName, aMod );
-+			else
-+				pLib->MakeModule32( mInfo );
- 
- 		pLib->SetModified( FALSE );
- 	}
---- basic/source/classes/sb.cxx
-+++ basic/source/classes/sb.cxx
-@@ -52,12 +52,17 @@
- #include "disas.hxx"
- #include "runtime.hxx"
- #include <basic/sbuno.hxx>
-+#include <basic/sbobjmod.hxx>
- #include "stdobj.hxx"
- #include "filefmt.hxx"
- #include "sb.hrc"
- #include <basrid.hxx>
- #include <vos/mutex.hxx>
- 
-+#include <com/sun/star/script/ModuleType.hpp>
-+#include <com/sun/star/script/ModuleInfo.hpp>
-+using namespace ::com::sun::star::script;
-+
- // #pragma SW_SEGMENT_CLASS( SBASIC, SBASIC_CODE )
- 
- SV_IMPL_VARARR(SbTextPortions,SbTextPortion)
-@@ -249,6 +254,8 @@ SbxObject* SbiFactory::CreateObject( con
- 	else
- 	if( rClass.EqualsIgnoreCaseAscii( "Collection" ) )
- 	{
-+			// Only variables qualified by the Module Name e.g. Sheet1.foo
-+			// should work for Documant && Class type Modules
- 		String aCollectionName( RTL_CONSTASCII_USTRINGPARAM("Collection") );
- 		return new BasicCollection( aCollectionName );
- 	}
-@@ -447,6 +454,7 @@ SbClassModuleObject::SbClassModuleObject
- 			}
- 		}
- 	}
-+	SetModuleType( com::sun::star::script::ModuleType::Class );
- }
- 
- SbClassModuleObject::~SbClassModuleObject()
-@@ -582,6 +590,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL
- 	SetParent( p );
- 	pLibInfo = NULL;
- 	bNoRtl = bBreak = FALSE;
-+    bVBAEnabled = FALSE;
- 	pModules = new SbxArray;
- 
- 	if( !GetSbData()->nInst++ )
-@@ -684,12 +693,38 @@ SbModule* StarBASIC::MakeModule( const S
- 
- SbModule* StarBASIC::MakeModule32( const String& rName, const ::rtl::OUString& rSrc )
- {
--	SbModule* p = new SbModule( rName );
--	p->SetSource32( rSrc );
-+    ModuleInfo mInfo;
-+    mInfo.ModuleSource = rSrc;
-+    mInfo.ModuleType = ModuleType::Normal;
-+    mInfo.ModuleName = rName;
-+    return MakeModule32(  mInfo );
-+}
-+SbModule* StarBASIC::MakeModule32( const ModuleInfo& mInfo )
-+{
-+    
-+    OSL_TRACE("create module %s type mInfo %d", rtl::OUStringToOString( mInfo.ModuleName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType );
-+    SbModule* p = NULL;
-+    switch ( mInfo.ModuleType )
-+    {
-+        case ModuleType::Document:
-+            // In theory we should be able to create Object modules
-+            // in ordinary basic ( in vba mode thought these are create
-+            // by the application/basic and not by the user )
-+            p = new SbObjModule( mInfo, isVBAEnabled() );
-+            break;
-+        case ModuleType::Class:
-+            p = new SbModule( mInfo.ModuleName, isVBAEnabled() );
-+			p->SetModuleType( com::sun::star::script::ModuleType::Class );	
-+	    break;
-+        default:
-+            p = new SbModule( mInfo.ModuleName, isVBAEnabled() );
-+            
-+    }
-+	p->SetSource32( mInfo.ModuleSource );
- 	p->SetParent( this );
- 	pModules->Insert( p, pModules->Count() );
- 	SetModified( TRUE );
--	return p;
-+    return p;
- }
- 
- void StarBASIC::Insert( SbxVariable* pVar )
-@@ -863,6 +898,12 @@ SbxVariable* StarBASIC::Find( const Stri
- 				}
- 				pNamed = p;
- 			}
-+			// Only variables qualified by the Module Name e.g. Sheet1.foo
-+			// should work for Documant && Class type Modules
-+			INT32 nType = p->GetModuleType();
-+            //if ( nType == com::sun::star::script::ModuleType::Class || nType == com::sun::star::script::ModuleType::Document )
-+            if ( nType == com::sun::star::script::ModuleType::Document )
-+                continue;
- 			// otherwise check if the element is available
- 			// unset GBLSEARCH-Flag (due to Rekursion)
- 			USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
---- basic/source/classes/sbxmod.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ basic/source/classes/sbxmod.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -55,6 +55,8 @@
- 
- #include <basic/basrdll.hxx>
- #include <vos/mutex.hxx>
-+#include <basic/sbobjmod.hxx>
-+#include <com/sun/star/lang/XServiceInfo.hpp>
- 
- 
- // for the bsearch
-@@ -70,6 +72,17 @@
- 
- #include <stdio.h>
- 
-+#include <comphelper/processfactory.hxx>
-+#include <com/sun/star/script/XLibraryContainer.hpp>
-+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#include <com/sun/star/awt/XDialogProvider.hpp>
-+#include <com/sun/star/awt/XTopWindow.hpp>
-+#include <com/sun/star/awt/XControl.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <cppuhelper/implbase1.hxx>
-+#include <comphelper/anytostring.hxx>
-+
-+using namespace ::com::sun::star; 
- 
- TYPEINIT1(SbModule,SbxObject)
- TYPEINIT1(SbMethod,SbxMethod)
-@@ -77,6 +90,7 @@ TYPEINIT1(SbProperty,SbxProperty)
- TYPEINIT1(SbProcedureProperty,SbxProperty)
- TYPEINIT1(SbJScriptModule,SbModule)
- TYPEINIT1(SbJScriptMethod,SbMethod)
-+TYPEINIT1(SbObjModule,SbModule)
- 
- SV_DECL_VARARR(SbiBreakpoints,USHORT,4,4)
- SV_IMPL_VARARR(SbiBreakpoints,USHORT)
-@@ -90,12 +104,13 @@ SV_IMPL_VARARR(HighlightPortions, Highli
- // Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen
- // Elemente von anderen Modulen aus gefunden werden koennen.
- 
--SbModule::SbModule( const String& rName )
-+SbModule::SbModule( const String& rName, bool bVBACompat )
- 		 : SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASICModule") ) ),
--		   pImage( NULL ), pBreaks( NULL ), pClassData( NULL ), mbVBACompat( false )
-+		   pImage( NULL ), pBreaks( NULL ), pClassData( NULL ), mbVBACompat( bVBACompat ),  pDocObject( NULL ), bIsProxyModule( false )
- {
- 	SetName( rName );
- 	SetFlag( SBX_EXTSEARCH | SBX_GBLSEARCH );
-+	SetModuleType( com::sun::star::script::ModuleType::Normal );
- }
- 
- SbModule::~SbModule()
-@@ -270,7 +285,10 @@ void SbModule::Clear()
- 
- SbxVariable* SbModule::Find( const XubString& rName, SbxClassType t )
- {
-+	// make sure a search in an uninstatiated class module will fail
- 	SbxVariable* pRes = SbxObject::Find( rName, t );
-+	if ( bIsProxyModule )
-+		return NULL;
- 	if( !pRes && pImage )
- 	{
- 		SbiInstance* pInst = pINST;
-@@ -430,6 +448,7 @@ void SbModule::SetSource32( const ::rtl:
- 	aOUSource = r;
- 	StartDefinitions();
- 	SbiTokenizer aTok( r );
-+        aTok.SetCompatible( IsVBACompat() );
- 	while( !aTok.IsEof() )
- 	{
- 		SbiToken eEndTok = NIL;
-@@ -454,14 +473,6 @@ void SbModule::SetSource32( const ::rtl:
- 				{
- 					eEndTok = ENDPROPERTY; break;
- 				}
--				if( eCurTok == OPTION )
--				{
--					eCurTok = aTok.Next();
--					mbVBACompat = ( eCurTok == VBASUPPORT ) && ( aTok.Next() == NUMBER ) && ( aTok.GetDbl()== 1 );
--					if( eCurTok == COMPATIBLE
--					|| mbVBACompat )
--						aTok.SetCompatible( true );
--				}
- 			}
- 			eLastTok = eCurTok;
- 		}
-@@ -600,10 +611,19 @@ void ClearUnoObjectsInRTL_Impl( StarBASI
-     if( ((StarBASIC*)p) != pBasic )
- 	    ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p );
- }
-+bool SbModule::IsVBACompat()
-+{
-+	return mbVBACompat;
-+}
- 
-+void SbModule::SetVBACompat( bool bCompat )
-+{
-+	mbVBACompat = bCompat;
-+}
- // Ausfuehren eines BASIC-Unterprogramms
- USHORT SbModule::Run( SbMethod* pMeth )
- {
-+	OSL_TRACE("About to run %s, vba compatmode is %d", rtl::OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), mbVBACompat );
- 	static USHORT nMaxCallLevel = 0;
- 	static String aMSOMacroRuntimeLibName = String::CreateFromAscii( "Launcher" );
- 	static String aMSOMacroRuntimeAppSymbol = String::CreateFromAscii( "Application" );
-@@ -695,10 +715,10 @@ USHORT SbModule::Run( SbMethod* pMeth )
- 			if( pRt->pNext )
- 				pRt->pNext->block();
- 			pINST->pRun = pRt;
--			if ( SbiRuntime ::isVBAEnabled() )
-+			if ( mbVBACompat )
-                         {
- 				pINST->EnableCompatibility( TRUE );
--				pRt->SetVBAEnabled( true );
-+				//pRt->SetVBAEnabled( true ); // can we get rid of this
-                         }
- 			while( pRt->Step() ) {}
- 			if( pRt->pNext )
-@@ -1273,7 +1293,6 @@ BOOL SbModule::LoadBinaryData( SvStream&
-     return bRet;
- }
- 
--
- BOOL SbModule::LoadCompleted()
- {
- 	SbxArray* p = GetMethods();
-@@ -1513,6 +1532,53 @@ SbJScriptMethod::~SbJScriptMethod()
- 
- 
- /////////////////////////////////////////////////////////////////////////
-+SbObjModule::SbObjModule( const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible )
-+    : SbModule( mInfo.ModuleName, bIsVbaCompatible )
-+{
-+    SetModuleType( mInfo.ModuleType );
-+    if ( mInfo.ModuleType == script::ModuleType::Form )
-+    {
-+        SetClassName( rtl::OUString::createFromAscii( "Form" ) );
-+    }
-+    else if ( mInfo.ModuleObject.is() )
-+        SetUnoObject( uno::makeAny( mInfo.ModuleObject ) );
-+}
-+void
-+SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException )
-+{
-+    SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxVariable*)pDocObject);
-+    if ( pUnoObj && pUnoObj->getUnoAny() == aObj ) // object is equal, nothing to do
-+        return;
-+    pDocObject = new SbUnoObject( GetName(), uno::makeAny( aObj ) );
-+            
-+    com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > xServiceInfo( aObj, com::sun::star::uno::UNO_QUERY_THROW );
-+    if( xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Worksheet" ) ) )
-+    {
-+        SetClassName( rtl::OUString::createFromAscii( "Worksheet" ) );
-+    }
-+    else if( xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Workbook" ) ) )
-+    {
-+        SetClassName( rtl::OUString::createFromAscii( "Workbook" ) );
-+    }
-+}
-+
-+SbxVariable*
-+SbObjModule::GetObject() 
-+{
-+    return pDocObject;
-+}
-+SbxVariable*
-+SbObjModule::Find( const XubString& rName, SbxClassType t )
-+{
-+    //OSL_TRACE("SbObjectModule find for %s", rtl::OUStringToOString(  rName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    SbxVariable* pVar = NULL;
-+    if ( !pVar && pDocObject)
-+        pVar = pDocObject->Find( rName, t );
-+    if ( !pVar )
-+        pVar = SbModule::Find( rName, t );
-+    return pVar;
-+}
-+/////////////////////////////////////////////////////////////////////////
- 
- SbProperty::SbProperty( const String& r, SbxDataType t, SbModule* p )
- 		: SbxProperty( r, t ), pMod( p )
---- basic/source/comp/codegen.cxx.old	2009-04-02 10:49:17.000000000 +0000
-+++ basic/source/comp/codegen.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -130,12 +130,12 @@ void SbiCodeGen::Save()
- 	// OPTION EXPLICIT-Flag uebernehmen
- 	if( pParser->bExplicit )
- 		p->SetFlag( SBIMG_EXPLICIT );
--	if( pParser->IsVBASupportOn() )
--		p->SetFlag( SBIMG_VBASUPPORT );
- 	
- 	int nIfaceCount = 0;
--	if( pParser->bClassModule )
-+	if( rMod.mnType == com::sun::star::script::ModuleType::Class )
- 	{
-+                OSL_TRACE("COdeGen::save() classmodule processing");
-+		rMod.bIsProxyModule = true;
- 		p->SetFlag( SBIMG_CLASSMODULE );
- 		pCLASSFAC->AddClassModule( &rMod );
- 
-@@ -158,6 +158,10 @@ void SbiCodeGen::Save()
- 	else
- 	{
- 		pCLASSFAC->RemoveClassModule( &rMod );
-+		// Only a ClassModule can revert to Normal
-+                if ( rMod.mnType == com::sun::star::script::ModuleType::Class )
-+			rMod.mnType = com::sun::star::script::ModuleType::Normal;
-+		rMod.bIsProxyModule = false;
- 	}
- 	if( pParser->bText )
- 		p->SetFlag( SBIMG_COMPARETEXT );
-@@ -240,6 +244,8 @@ void SbiCodeGen::Save()
- 					if( nPass == 1 )
- 						aPropName = aPropName.Copy( aIfaceName.Len() + 1 );
- 					SbProcedureProperty* pProcedureProperty = NULL;
-+                                        OSL_TRACE("*** getProcedureProperty for thing %s",
-+						rtl::OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() );
- 					pProcedureProperty = rMod.GetProcedureProperty( aPropName, ePropType );
- 				}
- 				if( nPass == 1 )
---- basic/source/comp/parser.cxx.old	2009-04-06 16:41:57.000000000 +0000
-+++ basic/source/comp/parser.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -144,7 +144,8 @@ SbiParser::SbiParser( StarBASIC* pb, SbM
- 	bNewGblDefs =
- 	bSingleLineIf =
- 	bExplicit = FALSE;
--	bClassModule = FALSE;
-+	bClassModule = ( pm->GetModuleType() == com::sun::star::script::ModuleType::Class );
-+	OSL_TRACE("Parser - %s, bClassModule %d", rtl::OUStringToOString( pm->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), bClassModule );
- 	pPool	 = &aPublics;
- 	for( short i = 0; i < 26; i++ )
- 		eDefTypes[ i ] = SbxVARIANT;    // Kein expliziter Defaulttyp
-@@ -157,6 +158,10 @@ SbiParser::SbiParser( StarBASIC* pb, SbM
- 
- 	rTypeArray = new SbxArray; // Array fuer Benutzerdefinierte Typen
- 	rEnumArray = new SbxArray; // Array for Enum types
-+	bVBASupportOn = pm->IsVBACompat();
-+	if ( bVBASupportOn )
-+		EnableCompatibility();
-+
- }
- 
- 
-@@ -755,8 +760,9 @@ void SbiParser::Option()
- 
- 		case CLASSMODULE:
- 			bClassModule = TRUE; 
-+			aGen.GetModule().SetModuleType( com::sun::star::script::ModuleType::Class );
- 			break;
--		case VBASUPPORT:
-+		case VBASUPPORT: // Option VBASupport used to override the module mode ( in fact this must reset the mode
- 			if( Next() == NUMBER )
- 			{
- 				if ( nVal == 1 || nVal == 0 )
-@@ -764,6 +770,10 @@ void SbiParser::Option()
- 					bVBASupportOn = ( nVal == 1 );
- 					if ( bVBASupportOn )
- 						EnableCompatibility();
-+					// if the module setting is different
-+					// reset it to what the Option tells us
-+					if ( bVBASupportOn != aGen.GetModule().IsVBACompat() )
-+						aGen.GetModule().SetVBACompat( bVBASupportOn );
- 					break;
- 				}
- 			}
---- basic/source/inc/codegen.hxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/inc/codegen.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -56,6 +56,7 @@ public:
- 	void GenStmnt();			// evtl. Statement-Opcode erzeugen
- 	UINT32 GetPC();
- 	UINT32 GetOffset()				{ return GetPC() + 1; }
-+    SbModule& GetModule() { return rMod; } 
- 	void Save();
- 
- 	// #29955 for-Schleifen-Ebene pflegen
---- basic/source/inc/image.hxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/inc/image.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -109,6 +109,5 @@ public:
- #define	SBIMG_COMPARETEXT	0x0002	// OPTION COMPARE TEXT ist aktiv
- #define	SBIMG_INITCODE		0x0004	// Init-Code vorhanden
- #define	SBIMG_CLASSMODULE	0x0008	// OPTION ClassModule is active
--#define	SBIMG_VBASUPPORT	0x0020	// OPTION VBASupport is 1
- 
- #endif
---- basic/source/runtime/methods1.cxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/runtime/methods1.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -44,6 +44,7 @@
- #ifndef _SBX_HXX
- #include <basic/sbx.hxx>
- #endif
-+#include <basic/sbstar.hxx>
- #include <svtools/zforlist.hxx>
- #include <tools/fsys.hxx>
- #include <tools/urlobj.hxx>
-@@ -64,6 +65,7 @@
- #endif
- 
- #include <vcl/jobset.hxx>
-+#include <basic/sbobjmod.hxx>
- 
- #include "sbintern.hxx"
- #include "runtime.hxx"
-@@ -2594,14 +2596,14 @@ RTLFUNC(Me)
- 
- 	SbModule* pActiveModule = pINST->GetActiveModule();
- 	SbClassModuleObject* pClassModuleObject = PTR_CAST(SbClassModuleObject,pActiveModule);
-+    SbxVariableRef refVar = rPar.Get(0);
- 	if( pClassModuleObject == NULL )
- 	{
--		StarBASIC::Error( SbERR_INVALID_USAGE_OBJECT );
-+        SbObjModule* pMod = PTR_CAST(SbObjModule,pActiveModule);
-+        if ( pMod )
-+            refVar->PutObject( pMod );
- 	}
- 	else
--	{
--		SbxVariableRef refVar = rPar.Get(0);
- 		refVar->PutObject( pClassModuleObject );
--	}
- }
- 
---- basic/source/runtime/runtime.cxx.old	2009-04-06 16:41:58.000000000 +0000
-+++ basic/source/runtime/runtime.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -53,7 +53,8 @@ bool SbiRuntime::isVBAEnabled()
- 	bool result = false;
- 	SbiInstance* pInst = pINST;
- 	if ( pInst && pINST->pRun )
--		result = pInst->pRun->GetImageFlag( SBIMG_VBASUPPORT );
-+		//result = pInst->pRun->GetImageFlag( SBIMG_VBASUPPORT );
-+		result = pInst->pRun->bVBAEnabled;
- 	return result; 
- }
- 
-@@ -64,6 +65,24 @@ void StarBASIC::StaticEnableReschedule(
- {
-     bStaticGlobalEnableReschedule = bReschedule;
- }
-+void StarBASIC::SetVBAEnabled( BOOL bEnabled )
-+{
-+    if ( bDocBasic )
-+    {
-+        bVBAEnabled = bEnabled;
-+    }
-+}
-+
-+BOOL StarBASIC::isVBAEnabled()
-+{
-+    if ( bDocBasic )
-+    { 
-+        if( SbiRuntime::isVBAEnabled() )
-+            return TRUE;
-+        return bVBAEnabled;
-+    }
-+    return FALSE;
-+}
- 
- 
- struct SbiArgvStack {					// Argv stack:
-@@ -520,6 +539,7 @@ SbiRuntime::SbiRuntime( SbModule* pm, Sb
- 	nForLvl   = 0;
- 	nOps	  = 0;
- 	refExprStk = new SbxArray;
-+	SetVBAEnabled( pMod->IsVBACompat() );
- #if defined GCC
- 	SetParameters( pe ? pe->GetParameters() : (class SbxArray *)NULL );
- #else
-@@ -527,7 +547,6 @@ SbiRuntime::SbiRuntime( SbModule* pm, Sb
- #endif
- 	pRefSaveList = NULL;
- 	pItemStoreList = NULL;
--	bVBAEnabled = isVBAEnabled();
- }
- 
- SbiRuntime::~SbiRuntime()
---- basic/source/uno/namecont.cxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/uno/namecont.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -76,6 +76,9 @@
- #include <cppuhelper/exc_hlp.hxx>
- #include <basic/sbmod.hxx>
- 
-+#ifndef _COM_SUN_STAR_SCRIPT_MODULEINFO_HPP_
-+#include <com/sun/star/script/ModuleInfo.hpp>
-+#endif
- 
- namespace basic
- {
-@@ -155,7 +158,7 @@ void NameContainer::replaceByName( const
- 	throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
- {
- 	Type aAnyType = aElement.getValueType();
--	if( mType != aAnyType )
-+    if( mType != aAnyType && aAnyType != getCppuType( static_cast< ModuleInfo* >( NULL ) ) )
- 		throw IllegalArgumentException();
- 
- 	NameContainerNameMap::iterator aIt = mHashMap.find( aName );
-@@ -197,7 +200,7 @@ void NameContainer::insertByName( const
- 	throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
- {
- 	Type aAnyType = aElement.getValueType();
--	if( mType != aAnyType )
-+    if( mType != aAnyType && aAnyType != getCppuType( static_cast< ModuleInfo* >( NULL ) ) )
- 		throw IllegalArgumentException();
- 
- 	NameContainerNameMap::iterator aIt = mHashMap.find( aName );
---- basic/source/uno/scriptcont.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ basic/source/uno/scriptcont.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -214,7 +214,12 @@ void SAL_CALL SfxScriptLibraryContainer:
- 	xmlscript::ModuleDescriptor aMod;
- 	aMod.aName = aElementName;
- 	aMod.aLanguage = maScriptLanguage;
--	aElement >>= aMod.aCode;
-+	// make sure we export source
-+	::com::sun::star::script::ModuleInfo mInfo;
-+	if ( aElement >>= mInfo )
-+		aMod.aCode = mInfo.ModuleSource;
-+	else
-+		aElement >>= aMod.aCode;
- 	xmlscript::exportScriptModule( xHandler, aMod );
- }
- 
-@@ -1171,7 +1176,11 @@ void SfxScriptLibrary::storeResourcesToS
- bool SfxScriptLibrary::containsValidModule( const Any& aElement )
- {
- 	OUString sModuleText;
--	aElement >>= sModuleText;
-+	::com::sun::star::script::ModuleInfo mInfo;
-+	if ( aElement >>= mInfo )
-+		sModuleText = mInfo.ModuleSource;
-+	else
-+		aElement >>= sModuleText;
- 	return ( sModuleText.getLength() > 0 );
- }
- 
---- sc/inc/servuno.hxx.old	2009-04-02 10:45:43.000000000 +0000
-+++ sc/inc/servuno.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -93,8 +93,8 @@ class ScDocShell;
- 
- #define SC_SERVICE_FORMULAPARS  38
- #define SC_SERVICE_OPCODEMAPPER 39
--
--#define SC_SERVICE_COUNT        40
-+#define SC_SERVICE_VBAOBJECTPROVIDER   40
-+#define SC_SERVICE_COUNT        41
- #define SC_SERVICE_INVALID		USHRT_MAX
- 
- 
---- sc/source/filter/excel/excimp8.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/filter/excel/excimp8.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -102,6 +102,7 @@
- 
- #include <com/sun/star/document/XDocumentProperties.hpp>
- #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-+#include <com/sun/star/script/ModuleInfo.hpp>
- 
- 
- using namespace com::sun::star;
-@@ -109,8 +110,8 @@ using namespace com::sun::star;
- 
- #define	INVALID_POS		0xFFFFFFFF
- 
--
--
-+// defined in docfunc.cxx ( really this needs a new name )
-+script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule );
- 
- ImportExcel8::ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ) :
-     ImportExcel( rImpData, rStrm )
-@@ -260,6 +261,7 @@ bool lcl_hasVBAEnabled()
- 
- void ImportExcel8::ReadBasic( void )
- {
-+    //bHasBasic = TRUE;
-     bHasBasic = TRUE;
- 
-     SfxObjectShell* pShell = GetDocShell();
-@@ -289,6 +291,10 @@ void ImportExcel8::EndSheet( void )
- 
- void ImportExcel8::PostDocLoad( void )
- {
-+    // delay reading basic until sheet object ( codenames etc. ) are read
-+
-+    if ( bHasBasic ) 
-+        ReadBasic();
-     // #i11776# filtered ranges before outlines and hidden rows
-     if( pExcRoot->pAutoFilterBuffer )
-         pExcRoot->pAutoFilterBuffer->Apply();
---- sc/source/ui/docshell/docsh5.cxx.old	2009-04-06 16:41:49.000000000 +0000
-+++ sc/source/ui/docshell/docsh5.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -68,6 +68,10 @@
- #include "sc.hrc"
- #include "waitoff.hxx"
- #include "sizedev.hxx"
-+#include <basic/sbstar.hxx>
-+
-+// defined in docfunc.cxx
-+void lcl_InsertModule( ScDocShell& rDocSh, SCTAB nTab, String& sModuleName, String& sModuleSource );
- 
- // ---------------------------------------------------------------------------
- 
-@@ -838,6 +842,33 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTa
- 				GetUndoManager()->AddUndoAction(
- 						new ScUndoCopyTab( this, aSrcList, aDestList ) );
- 			}
-+			
-+			StarBASIC* pStarBASIC = GetBasic();
-+			BOOL bVbaEnabled = pStarBASIC ? pStarBASIC->isVBAEnabled() : FALSE;
-+			if ( bVbaEnabled )
-+			{
-+				String sCodeName;
-+				String sSource;
-+				aDocument.GetCodeName( nDestTab, sCodeName );
-+				com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > xLibContainer = GetBasicContainer();
-+				com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > xLib;
-+    				if( xLibContainer.is() )
-+    				{
-+        				String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-+        				com::sun::star::uno::Any aLibAny = xLibContainer->getByName( aLibName );
-+        				aLibAny >>= xLib;
-+    				}
-+    				if( xLib.is() )
-+    				{
-+					String sSrcCodeName;
-+					aDocument.GetCodeName( nSrcTab, sSrcCodeName );
-+					rtl::OUString sModName = sSrcCodeName;
-+					com::sun::star::script::ModuleInfo sModuleInfo;
-+					xLib->getByName( sModName ) >>= sModuleInfo;
-+					sSource = sModuleInfo.ModuleSource;
-+				} 
-+				lcl_InsertModule( *this, nDestTab, sCodeName, sSource );
-+			}
- 		}
- 
- 		Broadcast( ScTablesHint( SC_TAB_COPIED, nSrcTab, nDestTab ) );
---- sc/source/filter/excel/read.cxx.old	2009-04-06 16:41:51.000000000 +0000
-+++ sc/source/filter/excel/read.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -949,7 +949,8 @@ FltError ImportExcel8::Read( void )
- 					case 0x22:	Rec1904(); break;		// 1904			[ 2345   ]
- 					case 0x56:	Builtinfmtcnt(); break;	// BUILTINFMTCNT[  34    ]
- 					case 0x8D:	Hideobj(); break;		// HIDEOBJ		[  345   ]
--					case 0xD3:	ReadBasic(); break;
-+					case 0xD3:	/*ReadBasic()*/bHasBasic = true; break;
-+//					case 0xD3:	ReadBasic(); break;
-                     case 0xDE:  Olesize(); break;
- 					case 0x01BA: Codename( TRUE ); break;
- 
---- sc/source/ui/docshell/docfunc.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/ui/docshell/docfunc.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -51,6 +51,12 @@
- #include <svtools/zforlist.hxx>
- #include <svtools/PasswordHelper.hxx>
- 
-+#include <basic/sbstar.hxx>
-+#include <com/sun/star/container/XNameContainer.hpp>
-+#include <com/sun/star/script/XLibraryContainer.hpp>
-+#include <com/sun/star/script/ModuleInfo.hpp>
-+#include <com/sun/star/script/ModuleType.hpp>
-+
- #include <list>
- 
- #include "docfunc.hxx"
-@@ -99,6 +105,7 @@
- using namespace com::sun::star;
- using ::com::sun::star::uno::Sequence;
- 
-+
- // STATIC DATA -----------------------------------------------------------
- 
- //========================================================================
-@@ -2281,6 +2288,92 @@ BOOL ScDocFunc::MoveBlock( const ScRange
- }
- 
- //------------------------------------------------------------------------
-+uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, String& sCodeName )
-+{
-+    uno::Reference< lang::XMultiServiceFactory> xSF(rDocSh.GetModel(), uno::UNO_QUERY);
-+    uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess;
-+    uno::Reference< uno::XInterface > xDocModuleApiObject;
-+    if ( xSF.is() )
-+    {
-+        xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY );    
-+        xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY );    
-+    }
-+    return xDocModuleApiObject;
-+
-+}
-+
-+script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule, String& sSource )
-+{
-+    ::rtl::OUString aModName( sModule );
-+    ::rtl::OUString sVbaOption( RTL_CONSTASCII_USTRINGPARAM( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" ));
-+    script::ModuleInfo sModuleInfo;
-+    sModuleInfo.ModuleName = aModName;
-+    if ( sSource.Len() > 0 )
-+        sModuleInfo.ModuleSource = sSource;
-+    else
-+        sModuleInfo.ModuleSource = sVbaOption;
-+    sModuleInfo.ModuleType = script::ModuleType::Document;
-+    sModuleInfo.ModuleObject = GetDocModuleObject( rDocSh, sModule );
-+    return sModuleInfo;
-+}
-+
-+void lcl_InsertModule( ScDocShell& rDocSh, SCTAB nTab, String& sModuleName, String& sSource )
-+{
-+    SFX_APP()->EnterBasicCall();
-+    script::ModuleInfo sModuleInfo = lcl_InitModuleInfo(  rDocSh, sModuleName, sSource );
-+    uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer();
-+    DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
-+
-+    uno::Reference< container::XNameContainer > xLib;
-+    if( xLibContainer.is() )
-+    {
-+        String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-+        uno::Any aLibAny = xLibContainer->getByName( aLibName );
-+        aLibAny >>= xLib;
-+    }
-+    if( xLib.is() )
-+    {
-+        // if the Module with codename exists then find a new name
-+        sal_Int32 nNum = 1;
-+        sModuleInfo.ModuleName = sModuleName;
-+        while( xLib->hasByName( sModuleInfo.ModuleName  ) )
-+        {
-+            sModuleInfo.ModuleName = rtl::OUString::createFromAscii( "Sheet" ) + rtl::OUString::valueOf( nNum );
-+            nNum += 1;
-+        }
-+        uno::Any aSourceAny;
-+        aSourceAny <<= sModuleInfo;
-+        xLib->insertByName( sModuleInfo.ModuleName, aSourceAny );
-+        ScDocument* pDoc = rDocSh.GetDocument();
-+        String sCodeName( sModuleInfo.ModuleName );
-+        pDoc->SetCodeName( nTab, sCodeName );
-+    }
-+    SFX_APP()->LeaveBasicCall();
-+}
-+
-+void lcl_DeleteModule( ScDocShell& rDocSh, String& sModuleName )
-+{
-+    SFX_APP()->EnterBasicCall();
-+    uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer();
-+    DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
-+
-+    uno::Reference< container::XNameContainer > xLib;
-+    if( xLibContainer.is() )
-+    {
-+        String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-+        uno::Any aLibAny = xLibContainer->getByName( aLibName );
-+        aLibAny >>= xLib;
-+    }
-+    if( xLib.is() )
-+    {
-+        if( xLib->hasByName( sModuleName ) )
-+        {
-+            xLib->removeByName( sModuleName );
-+        }
-+    }
-+    SFX_APP()->LeaveBasicCall();
-+}
-+
- 
- BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi )
- {
-@@ -2290,8 +2383,18 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab,
- 	ScDocShellModificator aModificator( rDocShell );
- 
- 	ScDocument* pDoc = rDocShell.GetDocument();
--	if (bRecord && !pDoc->IsUndoEnabled())
-+    // Strange loop, also basic is loaded too early ( InsertTable )
-+    // is called via the xml import for sheets in described in odf 
-+    BOOL bInsertDocModule = false;
-+
-+    if(  !rDocShell.GetDocument()->IsImportingXML() )
-+    {
-+        StarBASIC* pStarBASIC = rDocShell.GetBasic(); 
-+        bInsertDocModule = pStarBASIC ? pStarBASIC->isVBAEnabled() : false;
-+    }
-+	if ( bInsertDocModule || ( bRecord && !pDoc->IsUndoEnabled() ) )
- 		bRecord = FALSE;
-+
- 	if (bRecord)
- 		pDoc->BeginDrawUndo();							//	InsertTab erzeugt ein SdrUndoNewPage
- 
-@@ -2302,10 +2405,19 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab,
- 
- 	if (pDoc->InsertTab( nTab, rName ))
- 	{
-+		String sCodeName;
- 		if (bRecord)
- 			rDocShell.GetUndoManager()->AddUndoAction(
- 						new ScUndoInsertTab( &rDocShell, nTab, bAppend, rName));
- 		//	Views updaten:
-+        // Only insert vba modules if vba mode ( and not currently importing XML )
-+        if( bInsertDocModule )
-+        {
-+            if ( sCodeName.Len() == 0 )
-+		sCodeName = rName;
-+            String sSource;
-+            lcl_InsertModule( rDocShell, nTab, sCodeName, sSource );
-+        }
- 		rDocShell.Broadcast( ScTablesHint( SC_TAB_INSERTED, nTab ) );
- 
- 		rDocShell.PostPaintExtras();
-@@ -2327,8 +2439,12 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab,
- 
- 	BOOL bSuccess = FALSE;
- 	ScDocument* pDoc = rDocShell.GetDocument();
-+    StarBASIC* pStarBASIC = rDocShell.GetBasic();
-+    BOOL bVbaEnabled = pStarBASIC->isVBAEnabled();
- 	if (bRecord && !pDoc->IsUndoEnabled())
- 		bRecord = FALSE;
-+    if ( bVbaEnabled )
-+        bRecord = FALSE;
- 	BOOL bWasLinked = pDoc->IsLinked(nTab);
- 	ScDocument* pUndoDoc = NULL;
- 	ScRefUndoData* pUndoData = NULL;
-@@ -2369,6 +2485,8 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab,
- 		pUndoData = new ScRefUndoData( pDoc );
- 	}
- 
-+    String sCodeName;
-+    BOOL bHasCodeName = pDoc->GetCodeName( nTab, sCodeName );
- 	if (pDoc->DeleteTab( nTab, pUndoDoc ))
- 	{
- 		if (bRecord)
-@@ -2379,6 +2497,13 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab,
- 						new ScUndoDeleteTab( &rDocShell, theTabs, pUndoDoc, pUndoData ));
- 		}
- 		//	Views updaten:
-+        if( bVbaEnabled )
-+        {
-+            if( bHasCodeName )
-+            {
-+                lcl_DeleteModule( rDocShell, sCodeName );
-+            }
-+        }
- 		rDocShell.Broadcast( ScTablesHint( SC_TAB_DELETED, nTab ) );
- 
- 		if (bWasLinked)
---- sc/source/ui/unoobj/servuno.cxx.old	2009-04-02 10:45:26.000000000 +0000
-+++ sc/source/ui/unoobj/servuno.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -38,6 +38,7 @@
- #include <svx/unofill.hxx>
- #include <svx/unonrule.hxx>
- #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-+#include <com/sun/star/container/XNameAccess.hpp>
- 
- #include "servuno.hxx"
- #include "unonames.hxx"
-@@ -61,8 +62,103 @@
- #include <svx/xmleohlp.hxx>
- #include <svx/xmlgrhlp.hxx>
- 
-+#include <comphelper/processfactory.hxx>
-+
- using namespace ::com::sun::star;
- 
-+class ScVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
-+{
-+    uno::Any maWorkbook;
-+    uno::Any maCachedObject;
-+    uno::Reference<lang::XMultiServiceFactory> mxSF;
-+    ScDocShell* mpDocShell;
-+public:
-+    ScVbaObjectForCodeNameProvider( ScDocShell* pDocShell ) : mpDocShell( pDocShell )
-+    {
-+        mxSF.set(comphelper::getProcessServiceFactory());
-+        uno::Reference<beans::XPropertySet> xProps(mxSF, uno::UNO_QUERY);
-+        if( xProps.is() )
-+        {
-+            ScDocument* pDoc = mpDocShell->GetDocument();
-+            if ( !pDoc )
-+                throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")), uno::Reference< uno::XInterface >() );
-+
-+            uno::Sequence< uno::Any > aArgs(2);
-+            aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
-+            aArgs[1] = uno::Any( mpDocShell->GetModel() );
-+            maWorkbook <<= mxSF->createInstanceWithArguments(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Workbook") ), aArgs );
-+        }
-+    }
-+
-+    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
-+    {
-+        maCachedObject = uno::Any(); // clear cached object
-+        String sName = aName;
-+        ScDocument* pDoc = mpDocShell->GetDocument();
-+        if ( !pDoc )
-+            throw uno::RuntimeException();
-+        if ( sName == pDoc->GetCodeName() )
-+            maCachedObject = maWorkbook;
-+        else 
-+        {
-+            String sCodeName;
-+            SCTAB nCount = pDoc->GetTableCount();
-+            for( SCTAB i = 0; i < nCount; i++ )
-+            {
-+                pDoc->GetCodeName( i, sCodeName );
-+                if( sCodeName == sName )
-+                {
-+                    String sSheetName;
-+                    if( pDoc->GetName( i, sSheetName ) )
-+                    {
-+                        uno::Reference< frame::XModel > xModel( mpDocShell->GetModel() );
-+                        uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xModel, uno::UNO_QUERY_THROW );
-+                        uno::Reference<sheet::XSpreadsheets > xSheets( xSpreadDoc->getSheets(), uno::UNO_QUERY_THROW );
-+                        uno::Reference< container::XIndexAccess > xIndexAccess( xSheets, uno::UNO_QUERY_THROW );
-+                        uno::Reference< sheet::XSpreadsheet > xSheet( xIndexAccess->getByIndex( i ), uno::UNO_QUERY_THROW );
-+                        uno::Sequence< uno::Any > aArgs(3);
-+                        aArgs[0] = maWorkbook;
-+                        aArgs[1] = uno::Any( xModel );
-+                        aArgs[2] = uno::Any( rtl::OUString( sSheetName ) );
-+                        maCachedObject <<= mxSF->createInstanceWithArguments(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheet") ), aArgs );
-+                        break;
-+                    }
-+                }
-+            }
-+        }
-+        return maCachedObject.hasValue();
-+
-+    }
-+    ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
-+    {
-+        OSL_TRACE("ScVbaObjectForCodeNameProvider::getByName( %s )",
-+            rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+        if ( !hasByName( aName ) )
-+            throw ::com::sun::star::container::NoSuchElementException();
-+        return maCachedObject;
-+    }
-+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (::com::sun::star::uno::RuntimeException)
-+    {
-+        ScDocument* pDoc = mpDocShell->GetDocument();
-+        if ( !pDoc )
-+            throw uno::RuntimeException();
-+        SCTAB nCount = pDoc->GetTableCount();
-+        uno::Sequence< rtl::OUString > aNames( nCount + 1 ); 
-+        SCTAB index = 0;
-+        String sCodeName;
-+        for( ; index < nCount; ++index )
-+        {
-+            pDoc->GetCodeName( index, sCodeName );
-+            aNames[ index ] = sCodeName;
-+        }
-+        aNames[ index ] = pDoc->GetCodeName();
-+        return aNames;
-+    }
-+    // XElemenAccess
-+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw (::com::sun::star::uno::RuntimeException){ return uno::Type(); }
-+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException ) { return sal_True; }
-+
-+};
- 
- //------------------------------------------------------------------------
- 
-@@ -112,7 +208,8 @@ static const sal_Char* __FAR_DATA aProvN
- 
-         SC_SERVICENAME_CHDATAPROV,                  // SC_SERVICE_CHDATAPROV
-         SC_SERVICENAME_FORMULAPARS,                 // SC_SERVICE_FORMULAPARS
--        SC_SERVICENAME_OPCODEMAPPER                 // SC_SERVICE_OPCODEMAPPER
-+        SC_SERVICENAME_OPCODEMAPPER,                 // SC_SERVICE_OPCODEMAPPER
-+"ooo.vba.VBAObjectModuleObjectProvider",// SC_SERVICE_VBAOBJECTPROVIDER
- 	};
- 
- //
-@@ -164,7 +261,8 @@ static const sal_Char* __FAR_DATA aOldNa
-         "",                                         // SC_SERVICE_SHEETDOCSET
-         "",                                         // SC_SERVICE_CHDATAPROV
-         "",                                         // SC_SERVICE_FORMULAPARS
--        ""                                          // SC_SERVICE_OPCODEMAPPER
-+        "",                                         // SC_SERVICE_OPCODEMAPPER
-+        "",                                         // SC_SERVICE_VBAOBJECTPROVIDER
- 	};
- 
- 
-@@ -363,6 +461,9 @@ uno::Reference<uno::XInterface> ScServic
-                 xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> (pComp))));
-             }
-             break;
-+        case SC_SERVICE_VBAOBJECTPROVIDER:
-+            xRet.set(static_cast<container::XNameAccess*>(new ScVbaObjectForCodeNameProvider( pDocShell )));
-+            break;
- 	}
- 	return xRet;
- }
---- sc/source/ui/view/viewfun2.cxx.old	2009-04-06 16:41:49.000000000 +0000
-+++ sc/source/ui/view/viewfun2.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -57,6 +57,11 @@
- #include <vcl/sound.hxx>
- #include <vcl/waitobj.hxx>
- 
-+#include <basic/sbstar.hxx>
-+#include <com/sun/star/container/XNameContainer.hpp>
-+#include <com/sun/star/script/XLibraryContainer.hpp>
-+using namespace com::sun::star;
-+
- #include "viewfunc.hxx"
- 
- #include "sc.hrc"
-@@ -2139,15 +2144,42 @@ BOOL ScViewFunc::DeleteTable( SCTAB nTab
- 	return bSuccess;
- }
- 
-+void lcl_DeleteModule( ScDocShell* rDocSh, String& sModuleName )
-+{
-+    SFX_APP()->EnterBasicCall();
-+    uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh->GetBasicContainer();
-+    DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
-+
-+    uno::Reference< container::XNameContainer > xLib;
-+    if( xLibContainer.is() )
-+    {
-+        String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-+        uno::Any aLibAny = xLibContainer->getByName( aLibName );
-+        aLibAny >>= xLib;
-+    }
-+    if( xLib.is() )
-+    {
-+        if( xLib->hasByName( sModuleName ) )
-+        {
-+            xLib->removeByName( sModuleName );
-+        }
-+    }
-+    SFX_APP()->LeaveBasicCall();
-+}
-+
- BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
- {
- 	ScDocShell* pDocSh	= GetViewData()->GetDocShell();
- 	ScDocument* pDoc 	= pDocSh->GetDocument();
-+    StarBASIC* pStarBASIC = pDocSh->GetBasic();
-+    BOOL bVbaEnabled = pStarBASIC->isVBAEnabled();
- 	SCTAB		nNewTab = TheTabs[0];
- 	int			i;
- 	WaitObject aWait( GetFrameWin() );
- 	if (bRecord && !pDoc->IsUndoEnabled())
- 		bRecord = FALSE;
-+    if ( bVbaEnabled )
-+        bRecord = FALSE;
- 
- 	while ( nNewTab > 0 && !pDoc->IsVisible( nNewTab ) )
- 		--nNewTab;
-@@ -2214,9 +2246,18 @@ BOOL ScViewFunc::DeleteTables(const SvSh
- 
- 	for(i=TheTabs.Count()-1;i>=0;i--)
- 	{
-+        String sCodeName;
-+        BOOL bHasCodeName = pDoc->GetCodeName( TheTabs[sal::static_int_cast<USHORT>(i)], sCodeName );
-         if (pDoc->DeleteTab( TheTabs[sal::static_int_cast<USHORT>(i)], pUndoDoc ))
- 		{
- 			bDelDone = TRUE;
-+            if( bVbaEnabled )
-+            {
-+                if( bHasCodeName )
-+                {
-+                    lcl_DeleteModule( pDocSh, sCodeName );
-+                }
-+            }
-             pDocSh->Broadcast( ScTablesHint( SC_TAB_DELETED, TheTabs[sal::static_int_cast<USHORT>(i)] ) );
- 		}
- 	}
-@@ -2244,6 +2285,7 @@ BOOL ScViewFunc::DeleteTables(const SvSh
- 		pDocSh->PostPaintExtras();
- 		pDocSh->SetDocumentModified();
- 
-+
-         SfxApplication* pSfxApp = SFX_APP();                                // Navigator
-         pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
-         pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
---- svx/source/msfilter/msvbasic.cxx.old	2009-04-02 11:03:03.000000000 +0000
-+++ svx/source/msfilter/msvbasic.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -41,6 +41,8 @@
- #include <rtl/tencinfo.h>   //rtl_getTextEncodingFromWindowsCodePage
- #include "msvbasic.hxx"
- 
-+using namespace ::com::sun::star::script;
-+
- /*
- A few urls which may in the future be of some use
- http://www.virusbtn.com/vb2000/Programme/papers/bontchev.pdf
-@@ -432,7 +434,7 @@ int VBA_Impl::ReadVBAProject(const SvSto
-  *
- */
- 
--ModuleType VBA_Impl::GetModuleType( const UniString& rModuleName )
-+ModType VBA_Impl::GetModuleType( const UniString& rModuleName )
- {
-     ModuleTypeHash::iterator iter = mhModHash.find( rModuleName );
-     ModuleTypeHash::iterator iterEnd = mhModHash.end();
-@@ -440,7 +442,7 @@ ModuleType VBA_Impl::GetModuleType( cons
-     {
-         return iter->second;
-     }
--    return Unknown;
-+    return ModuleType::Unknown;
- }
- 
- bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel )
-@@ -483,7 +485,7 @@ bool VBA_Impl::Open( const String &rTopl
-         static const String sClass(     RTL_CONSTASCII_USTRINGPARAM( "Class" ) );
-         static const String sBaseClass( RTL_CONSTASCII_USTRINGPARAM( "BaseClass" ) );
-         static const String sDocument(  RTL_CONSTASCII_USTRINGPARAM( "Document" ) );
--        mhModHash[ sThisDoc ] = Class;
-+        mhModHash[ sThisDoc ] = ModuleType::Class;
-         while ( pStp->ReadByteStringLine( tmp, meCharSet ) )
-         {
-             xub_StrLen index = tmp.Search( '=' );
-@@ -493,14 +495,14 @@ bool VBA_Impl::Open( const String &rTopl
-                 String value = tmp.Copy( index + 1 );
-                 if ( key == sClass )
-                 {
--                    mhModHash[ value ] = Class;
-+                    mhModHash[ value ] = ModuleType::Class;
-                     OSL_TRACE("Module %s is of type Class",
-                         ::rtl::OUStringToOString( value ,
-                             RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-                 }
-                 else if ( key == sBaseClass )
-                 {
--                    mhModHash[ value ] =  Form;
-+                    mhModHash[ value ] =  ModuleType::Form;
-                     OSL_TRACE("Module %s is of type Form",
-                         ::rtl::OUStringToOString( value ,
-                             RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-@@ -513,14 +515,14 @@ bool VBA_Impl::Open( const String &rTopl
-                     // value is of form <name>/&H<identifier>, strip the identifier
-                     value.Erase( value.Search( '/' ) );
- 
--                    mhModHash[ value ] = Document;
-+                    mhModHash[ value ] = ModuleType::Document;
-                     OSL_TRACE("Module %s is of type Document VBA",
-                         ::rtl::OUStringToOString( value ,
-                             RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-                 }
-                 else if ( key == sModule )
-                 {
--                    mhModHash[ value ] = Normal;
-+                    mhModHash[ value ] = ModuleType::Normal;
-                     OSL_TRACE("Module %s is of type Normal VBA",
-                         ::rtl::OUStringToOString( value ,
-                             RTL_TEXTENCODING_ASCII_US ).pData->buffer );
---- svx/source/msfilter/msvbasic.hxx.old	2009-04-02 11:03:03.000000000 +0000
-+++ svx/source/msfilter/msvbasic.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -45,6 +45,8 @@
- #include <vector>
- #endif
- #include<map>
-+#include <com/sun/star/script/ModuleType.hpp>
-+using namespace ::com::sun::star::script::ModuleType;
- 
- /* class VBA:
-  * The VBA class provides a set of methods to handle Visual Basic For
-@@ -68,13 +70,12 @@ DECLARE_DYNARRAY(StringArray,String *)
- // #117718# define internal types to distinguish between
- // module types, form, class & normal
- // #i37965# DR 2004-12-03: add "Document", used in Excel for macros attached to sheet
--enum ModuleType { Unknown = 0, Normal, Class, Form, Document };
- 
- // #117718# define map to hold types of module
- //
--
-+typedef sal_Int32 ModType;
- typedef ::std::map< UniString,
--    ModuleType > ModuleTypeHash;
-+    ModType > ModuleTypeHash;
- 
- class VBA_Impl
- {
-@@ -95,7 +96,7 @@ public:
-     void Output(int len, const sal_uInt8 *data);
-     //
-     // #117718# member map of module names to types of module
--    ModuleType GetModuleType( const UniString& rModuleName );
-+    ModType GetModuleType( const UniString& rModuleName );
- 
-     std::vector<String> maReferences;
- private:
---- svx/source/msfilter/svxmsbas.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ svx/source/msfilter/svxmsbas.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -53,6 +53,7 @@ using namespace com::sun::star::awt;
- 
- #include <com/sun/star/container/XNameContainer.hpp>
- #include <com/sun/star/script/XLibraryContainer.hpp>
-+#include <com/sun/star/script/ModuleInfo.hpp>
- using namespace com::sun::star::container;
- using namespace com::sun::star::script;
- using namespace com::sun::star::uno;
-@@ -266,8 +267,22 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
-             Any aLibAny = xLibContainer->getByName( aLibName );
- 		    aLibAny >>= xLib;
-         }
--		if( xLib.is() )
-+		if( xLib.is()  )
- 		{
-+            Reference< container::XNameAccess > xVBAObjectForCodeName;
-+			if ( !bAsComment )
-+            {
-+                rDocSh.GetBasic()->SetVBAEnabled( true );
-+                Reference< XMultiServiceFactory> xSF(rDocSh.GetModel(), UNO_QUERY);
-+                if ( xSF.is() )
-+                {
-+                    try
-+                    {
-+                        xVBAObjectForCodeName.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), UNO_QUERY );
-+                    }
-+                    catch( Exception& ) { }
-+                }
-+            }
- 			for( UINT16 i=0; i<nStreamCount;i++)
- 			{
- 				StringArray aDecompressed = aVBA.Decompress(i);
-@@ -301,7 +316,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
-                 // is the same as the encoding for the names
-                 // that are keys in the map used by GetModuleType method
-                 const String &sOrigVBAModName = aVBA.GetStreamName( i );
--                ModuleType mType = aVBA.GetModuleType( sOrigVBAModName );
-+                ModType mType = aVBA.GetModuleType( sOrigVBAModName );
- 
-                 rtl::OUString sClassRem( RTL_CONSTASCII_USTRINGPARAM( "Rem Attribute VBA_ModuleType=" ) );
- 
-@@ -309,23 +324,23 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
- 
-                 switch( mType )
-                 {
--                    case Class:
-+                    case ModuleType::Class:
-                         modeTypeComment = sClassRem +
-                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAClassModule\n" ) );
-                         break;
--                    case Form:
-+                    case ModuleType::Form:
-                         modeTypeComment = sClassRem +
-                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAFormModule\n" ) );
-                         break;
--                    case Document:
-+                    case ModuleType::Document:
-                         modeTypeComment = sClassRem +
-                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBADocumentModule\n" ) );
-                         break;
--                    case Normal:
-+                    case ModuleType::Normal:
-                         modeTypeComment = sClassRem +
-                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAModule\n" ) );
-                         break;
--                    case Unknown:
-+                    case ModuleType::Unknown:
-                         modeTypeComment = sClassRem +
-                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAUnknown\n" ) );
-                         break;
-@@ -335,10 +350,10 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
-                 }
- 				static ::rtl::OUString sVBAOption( RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ); 
- 				static ::rtl::OUString sClassOption( RTL_CONSTASCII_USTRINGPARAM( "Option ClassModule\n" ) ); 
--				if ( !bAsComment )
-+				if ( !bAsComment /*&& !rDocSh.GetBasic()->isVBAEnabled() */)
- 				{
- 					modeTypeComment = modeTypeComment + sVBAOption;
--					if ( mType == Class )
-+					if ( mType == ModuleType::Class )
- 						modeTypeComment = modeTypeComment + sClassOption;
- 
- 				}
-@@ -405,12 +420,41 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
- 						aSource += rtl::OUString::createFromAscii("\nEnd Sub");
- 				}
- 				::rtl::OUString aModName( sModule );
--				if ( aSource.getLength() )
- 				{
- 					aSource = modeTypeComment + aSource;
- 
- 					Any aSourceAny;
--					aSourceAny <<= aSource;
-+                    OSL_TRACE("erm %d", mType );
-+                    if (  !bAsComment )
-+                    {
-+                        OSL_TRACE("vba processing  %d", mType );
-+                        script::ModuleInfo sModuleInfo;
-+                        sModuleInfo.ModuleName = aModName;
-+                        sModuleInfo.ModuleSource = aSource;
-+                        sModuleInfo.ModuleType = mType;
-+                       if ( mType == ModuleType::Form )
-+                            // hack, the module ( imo document basic should...
-+                            // know the XModel... ) but it doesn't
-+                            sModuleInfo.ModuleObject.set( rDocSh.GetModel(), UNO_QUERY );
-+			//  document modules, we should be able to access
-+			//  the api objects at this time
-+                        else if ( mType == ModuleType::Document )
-+			{
-+				uno::Reference< lang::XMultiServiceFactory> xSF( rDocSh.GetModel(), uno::UNO_QUERY);
-+				uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess;
-+    				if ( xSF.is() )
-+				        xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY );    
-+				// get the api object for the codename
-+				if ( xVBACodeNamedObjectAccess.is() )
-+				{
-+					sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );    
-+					OSL_TRACE("** Straight up creation of Module");
-+				}
-+			}
-+                        aSourceAny <<= sModuleInfo;
-+                    }
-+                    else
-+					    aSourceAny <<= aSource;
- 					if( xLib->hasByName( aModName ) )
- 						xLib->replaceByName( aModName, aSourceAny );
- 					else
-@@ -420,6 +464,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
- 				bRet = true;
- 			}
- 		}
-+        if( bRet )
- 		SFX_APP()->LeaveBasicCall();
- 	}
- 	return bRet;
---- udkapi/com/sun/star/script/ModuleInfo.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ udkapi/com/sun/star/script/ModuleInfo.idl	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,57 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: ModuleInfo.idl,v $
-+ *
-+ *  $Revision: 1.2 $
-+ *
-+ *  last change: $Author: rt $ $Date: 2006/05/05 10:14:46 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef __com_sun_star_script_ModuleInfo_idl__
-+#define __com_sun_star_script_ModuleInfo_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+//=============================================================================
-+module com {  module sun {  module star { module script {
-+struct ModuleInfo
-+{
-+	string ModuleName; 
-+	string ModuleSource; 
-+	com::sun::star::uno::XInterface ModuleObject; 
-+	short ModuleType; // string?
-+};
-+
-+//=============================================================================
-+
-+}; }; }; };
-+
-+#endif
---- udkapi/com/sun/star/script/ModuleType.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ udkapi/com/sun/star/script/ModuleType.idl	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: ModuleType.idl,v $
-+ *
-+ *  $Revision: 1.2 $
-+ *
-+ *  last change: $Author: rt $ $Date: 2006/05/05 10:14:46 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef __com_sun_star_script_ModuleType_idl__
-+#define __com_sun_star_script_ModuleType_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+//=============================================================================
-+module com {  module sun {  module star { module script {
-+published constants ModuleType
-+{
-+    const long Unknown = 0;
-+    const long Normal = 1;  
-+    const long Class = 2;
-+    const long Form = 3;
-+    const long Document = 4;
-+};
-+
-+//=============================================================================
-+
-+}; }; }; };
-+
-+#endif
---- udkapi/com/sun/star/script/makefile.mk.old	2009-04-02 11:06:58.000000000 +0000
-+++ udkapi/com/sun/star/script/makefile.mk	2009-04-06 16:41:59.000000000 +0000
-@@ -85,6 +85,8 @@ IDLFILES=\
- 	XScriptEventsAttacher.idl\
- 	XDefaultMethod.idl\
- 	XDefaultProperty.idl\
-+    ModuleInfo.idl\
-+    ModuleType.idl\
- 
- # ------------------------------------------------------------------
- 
---- sc/source/filter/excel/xiescher.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/filter/excel/xiescher.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -495,7 +495,7 @@ void XclImpDrawObjBase::ProcessSdrObject
-     {
-         if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, TRUE ) )
-         {
--            pInfo->SetMacro( XclControlHelper::GetScMacroName( maMacroName ) );
-+            pInfo->SetMacro( XclControlHelper::GetScMacroName( maMacroName, GetDocShell() ) );
-             pInfo->SetHlink( maHyperlink );
-         }
-     }
-@@ -1876,7 +1876,7 @@ void XclImpTbxObjBase::SetDffProperties(
- 
- bool XclImpTbxObjBase::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor ) const
- {
--    return XclControlHelper::FillMacroDescriptor( rDescriptor, DoGetEventType(), GetMacroName() );
-+    return XclControlHelper::FillMacroDescriptor( rDescriptor, DoGetEventType(), GetMacroName(), GetDocShell() );
- }
- 
- void XclImpTbxObjBase::ConvertFont( ScfPropertySet& rPropSet ) const
---- sc/source/filter/excel/xlescher.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/filter/excel/xlescher.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -40,6 +40,11 @@
- #include "xlescher.hxx"
- #include "globstr.hrc"
- 
-+#include <sfx2/objsh.hxx>
-+#include <basic/sbstar.hxx>
-+#include <basic/sbmod.hxx>
-+#include <basic/sbmeth.hxx>
-+
- using ::rtl::OUString;
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::UNO_QUERY;
-@@ -302,10 +307,26 @@ Reference< XControlModel > XclControlHel
- #define EXC_MACRONAME_PRE "vnd.sun.star.script:Standard."
- #define EXC_MACRONAME_SUF "?language=Basic&location=document"
- 
--OUString XclControlHelper::GetScMacroName( const String& rXclMacroName )
-+OUString XclControlHelper::GetScMacroName( const String& rXclMacroName, SfxObjectShell* pDocShell )
- {
-+    String sTmp( rXclMacroName );
-     if( rXclMacroName.Len() > 0 )
--        return CREATE_OUSTRING( EXC_MACRONAME_PRE ) + rXclMacroName + CREATE_OUSTRING( EXC_MACRONAME_SUF );
-+    {
-+        if ( ( sTmp.Search( '.' ) == STRING_NOTFOUND) && pDocShell )
-+        {
-+            if( StarBASIC* pBasic = pDocShell->GetBasic() )
-+            {
-+                if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sTmp, SbxCLASS_METHOD ) ) )
-+                {
-+                    if( SbModule* pModule = pMethod->GetModule() )
-+                    {
-+                        sTmp.Insert( '.', 0 ).Insert( pModule->GetName(), 0 );
-+                    }
-+                }
-+            }
-+        }
-+        return CREATE_OUSTRING( EXC_MACRONAME_PRE ) + sTmp + CREATE_OUSTRING( EXC_MACRONAME_SUF );
-+    }
-     return OUString();
- }
- 
-@@ -339,14 +360,14 @@ spTbxListenerData[] =
- #define EXC_MACROSCRIPT "Script"
- 
- bool XclControlHelper::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor,
--        XclTbxEventType eEventType, const String& rXclMacroName )
-+        XclTbxEventType eEventType, const String& rXclMacroName, SfxObjectShell* pShell )
- {
-     if( rXclMacroName.Len() > 0 )
-     {
-         rDescriptor.ListenerType = OUString::createFromAscii( spTbxListenerData[ eEventType ].mpcListenerType );
-         rDescriptor.EventMethod = OUString::createFromAscii( spTbxListenerData[ eEventType ].mpcEventMethod );
-         rDescriptor.ScriptType = CREATE_OUSTRING( EXC_MACROSCRIPT );
--        rDescriptor.ScriptCode = GetScMacroName( rXclMacroName );
-+        rDescriptor.ScriptCode = GetScMacroName( rXclMacroName, pShell );
-         return true;
-     }
-     return false;
---- sc/source/filter/inc/xlescher.hxx.old	2009-04-02 10:44:58.000000000 +0000
-+++ sc/source/filter/inc/xlescher.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -432,7 +432,8 @@ public:
-                         GetControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
- 
-     /** Returns the Calc macro name from an Excel macro name. */
--    static ::rtl::OUString GetScMacroName( const String& rXclMacroName );
-+    static ::rtl::OUString GetScMacroName( const String& rXclMacroName, SfxObjectShell* pShell = NULL );
-+
-     /** Returns the Excel macro name from a Calc macro name. */
-     static String       GetXclMacroName( const ::rtl::OUString& rScMacroName );
- 
-@@ -440,7 +441,7 @@ public:
-     static bool         FillMacroDescriptor(
-                             ::com::sun::star::script::ScriptEventDescriptor& rDescriptor,
-                             XclTbxEventType eEventType,
--                            const String& rXclMacroName );
-+                            const String& rXclMacroName, SfxObjectShell* pShell = NULL );
-     /** Tries to extract an Excel macro name from the passed macro descriptor. */
-     static String       ExtractFromMacroDescriptor(
-                             const ::com::sun::star::script::ScriptEventDescriptor& rDescriptor,
diff --git a/applied_patches/0316-buildfix-testtool-disabled.diff b/applied_patches/0316-buildfix-testtool-disabled.diff
new file mode 100644
index 000000000..3f6f04f43
--- /dev/null
+++ b/applied_patches/0316-buildfix-testtool-disabled.diff
@@ -0,0 +1,35 @@
+diff --git testtools/source/bridgetest/idl/makefile.mk testtools/source/bridgetest/idl/makefile.mk
+index 671f982..01b9e0c 100644
+--- testtools/source/bridgetest/idl/makefile.mk
++++ testtools/source/bridgetest/idl/makefile.mk
+@@ -60,6 +60,8 @@ CLIMAKERFLAGS =
+ CLIMAKERFLAGS += --verbose
+ .ENDIF
+ 
++
++.IF "$(BUILD_FOR_CLI)" == "true"
+ ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \
+     $(MISC)$/$(TARGET).javamaker.done \
+     $(BIN)$/cli_types_bridgetest.dll 
+@@ -68,4 +70,8 @@ $(BIN)$/cli_types_bridgetest.dll: $(BIN)$/bridgetest.rdb
+     $(CLIMAKER) $(CLIMAKERFLAGS) --out $@ -r $(SOLARBINDIR)$/cli_uretypes.dll \
+         -X $(SOLARBINDIR)$/types.rdb $< 
+     $(TOUCH) $@
++.ELSE
++ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \
++    $(MISC)$/$(TARGET).javamaker.done
++.ENDIF
+ 
+diff --git testtools/util/makefile.pmk testtools/util/makefile.pmk
+index b52727a..b380d74 100644
+--- testtools/util/makefile.pmk
++++ testtools/util/makefile.pmk
+@@ -31,7 +31,7 @@
+ 
+ # no translation here anyway
+ .IF "$(L10N_framework)"==""
+-.IF "$(COM)" == "MSC"
++.IF "$(COM)" == "MSC" || "$(ENABLE_MONO)" == "YES"
+ BUILD_FOR_CLI = "true"
+ CFLAGSENABLESYMBOLS:=-Z7
+ .ENDIF
diff --git a/applied_patches/0282-climaker-csharp-win.diff b/applied_patches/0317-climaker-csharp-win.diff
similarity index 100%
rename from applied_patches/0282-climaker-csharp-win.diff
rename to applied_patches/0317-climaker-csharp-win.diff
diff --git a/applied_patches/0317-vba-userform.diff b/applied_patches/0317-vba-userform.diff
deleted file mode 100644
index 5b4763eb8..000000000
--- a/applied_patches/0317-vba-userform.diff
+++ /dev/null
@@ -1,395 +0,0 @@
-diff --git basic/inc/basic/sbmod.hxx basic/inc/basic/sbmod.hxx
-index e676a49..ab496bc 100644
---- basic/inc/basic/sbmod.hxx
-+++ basic/inc/basic/sbmod.hxx
-@@ -59,6 +59,8 @@ class SbModule : public SbxObject
- 	friend class	SbClassModuleObject;
- 
- 	SbModuleImpl*	mpSbModuleImpl;		// Impl data
-+	SbModule();
-+	SbModule(const SbModule&);
- 
- protected:
-     ::rtl::OUString	aOUSource;
-diff --git basic/inc/basic/sbobjmod.hxx basic/inc/basic/sbobjmod.hxx
-index cb581c1..96cbe9b 100644
---- basic/inc/basic/sbobjmod.hxx
-+++ basic/inc/basic/sbobjmod.hxx
-@@ -41,6 +41,7 @@
- #include <com/sun/star/script/ModuleInfo.hpp>
- #include <com/sun/star/lang/XEventListener.hpp>
- #include <com/sun/star/awt/XDialog.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
- 
- namespace css = ::com::sun::star;
- 
-@@ -48,6 +49,8 @@ namespace css = ::com::sun::star;
- 
- class SbObjModule : public SbModule
- {
-+    SbObjModule( const SbObjModule& );
-+    SbObjModule();
- public:
-     TYPEINFO();
-     SbObjModule( const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
-@@ -56,6 +59,32 @@ public:
-     void SetUnoObject( const com::sun::star::uno::Any& aObj )throw ( com::sun::star::uno::RuntimeException ) ;
- };
- 
-+class SbUserFormModule : public SbObjModule
-+{
-+    css::uno::Reference<css::lang::XEventListener> m_DialogListener;
-+    css::uno::Reference<css::awt::XDialog> m_xDialog;
-+    css::uno::Reference<css::frame::XModel> m_xModel;
-+    String sFormName;
-+    bool mbInit;
-+    SbUserFormModule( const SbUserFormModule& );
-+    SbUserFormModule();
-+
-+protected:
-+    virtual void InitObject();
-+public:
-+    TYPEINFO();
-+    SbUserFormModule( const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
-+    virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
-+    void ResetApiObj();
-+    void Unload();
-+    void load();
-+    void triggerMethod( const String& );
-+    void triggerActivateEvent();
-+    void triggerDeActivateEvent();
-+    void triggerInitializeEvent();
-+    void triggerTerminateEvent();
-+};
-+
- #ifndef __SB_SBOBJMODULEREF_HXX
- #define __SB_SBOBJMODULEREF_HXX
- 
---- basic/source/classes/sb.cxx
-+++ basic/source/classes/sb.cxx
-@@ -715,6 +715,9 @@ SbModule* StarBASIC::MakeModule32( const
-             p = new SbModule( mInfo.ModuleName, isVBAEnabled() );
- 			p->SetModuleType( com::sun::star::script::ModuleType::Class );	
- 	    break;
-+        case ModuleType::Form:
-+            p = new SbUserFormModule( mInfo, isVBAEnabled() );
-+	    break;
-         default:
-             p = new SbModule( mInfo.ModuleName, isVBAEnabled() );
-             
-@@ -900,9 +903,8 @@ SbxVariable* StarBASIC::Find( const Stri
- 			// Only variables qualified by the Module Name e.g. Sheet1.foo
- 			// should work for Documant && Class type Modules
- 			INT32 nType = p->GetModuleType();
--            //if ( nType == com::sun::star::script::ModuleType::Class || nType == com::sun::star::script::ModuleType::Document )
--            if ( nType == com::sun::star::script::ModuleType::Document )
--                continue;
-+			if ( nType == com::sun::star::script::ModuleType::Document || nType == com::sun::star::script::ModuleType::Form )
-+				continue;
- 			// otherwise check if the element is available
- 			// unset GBLSEARCH-Flag (due to Rekursion)
- 			USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
-diff --git basic/source/classes/sbxmod.cxx basic/source/classes/sbxmod.cxx
-index 8ea4b64..d3dd8d5 100644
---- basic/source/classes/sbxmod.cxx
-+++ basic/source/classes/sbxmod.cxx
-@@ -73,7 +73,6 @@
- #include <com/sun/star/awt/XDialogProvider.hpp>
- #include <com/sun/star/awt/XTopWindow.hpp>
- #include <com/sun/star/awt/XControl.hpp>
--#include <com/sun/star/frame/XModel.hpp>
- #include <cppuhelper/implbase1.hxx>
- #include <comphelper/anytostring.hxx>
- 
-@@ -86,6 +85,7 @@ TYPEINIT1(SbProcedureProperty,SbxPropert
- TYPEINIT1(SbJScriptModule,SbModule)
- TYPEINIT1(SbJScriptMethod,SbMethod)
- TYPEINIT1(SbObjModule,SbModule)
-+TYPEINIT1(SbUserFormModule,SbObjModule)
- 
- SV_DECL_VARARR(SbiBreakpoints,USHORT,4,4)
- SV_IMPL_VARARR(SbiBreakpoints,USHORT)
-@@ -2272,6 +2272,242 @@ SbObjModule::Find( const XubString& rNam
-         pVar = SbModule::Find( rName, t );
-     return pVar;
- }
-+
-+typedef ::cppu::WeakImplHelper1< awt::XTopWindowListener > EventListener_BASE;
-+
-+class FormObjEventListenerImpl : public EventListener_BASE
-+{
-+    SbUserFormModule* mpUserForm;
-+    uno::Reference< lang::XComponent > mxComponent;
-+    bool mbDisposed;
-+    sal_Bool mbOpened;
-+    sal_Bool mbActivated;
-+    sal_Bool mbShowing;
-+    FormObjEventListenerImpl(); // not defined
-+    FormObjEventListenerImpl(const FormObjEventListenerImpl&); // not defined
-+public:
-+    FormObjEventListenerImpl( SbUserFormModule* pUserForm, const uno::Reference< lang::XComponent >& xComponent ) : mpUserForm( pUserForm ), mxComponent( xComponent) , mbDisposed( false ), mbOpened( sal_False ), mbActivated( sal_False ), mbShowing( sal_False )
-+    {
-+        if ( mxComponent.is() );
-+        {
-+	    uno::Reference< awt::XTopWindow > xList( mxComponent, uno::UNO_QUERY_THROW );;
-+            //uno::Reference< awt::XWindow > xList( mxComponent, uno::UNO_QUERY_THROW );;
-+            OSL_TRACE("*********** Registering the listener");
-+            xList->addTopWindowListener( this );
-+        }
-+    }
-+
-+    ~FormObjEventListenerImpl()
-+    {
-+        removeListener();
-+    }
-+    sal_Bool isShowing() { return mbShowing; }
-+    void removeListener()
-+    {
-+        try
-+        {
-+            if ( mxComponent.is() && !mbDisposed )
-+            {
-+                uno::Reference< awt::XTopWindow > xList( mxComponent, uno::UNO_QUERY_THROW );;
-+                OSL_TRACE("*********** Removing the listener");
-+            	xList->removeTopWindowListener( this );
-+                mxComponent = NULL;
-+            }
-+        }
-+        catch( uno::Exception& ) {}
-+    } 
-+    virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
-+    {
-+        if ( mpUserForm  )
-+        {
-+            mbOpened = sal_True;
-+            mbShowing = sal_True;
-+            if ( mbActivated )
-+            {
-+                mbOpened = mbActivated = sal_False;
-+                mpUserForm->triggerActivateEvent();
-+            }
-+        }
-+    }
-+    virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) {}
-+    virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) { mbOpened = sal_False; mbShowing = sal_False; }
-+    virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) {}
-+    virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException){}
-+    virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
-+    {
-+        if ( mpUserForm  )
-+        {
-+            mbActivated = sal_True;
-+            if ( mbOpened )
-+            {
-+                mbOpened = mbActivated = sal_False;
-+                mpUserForm->triggerActivateEvent();
-+            }
-+        }
-+    }
-+   
-+    virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
-+    {
-+        if ( mpUserForm  )
-+            mpUserForm->triggerDeActivateEvent();
-+    }
-+
-+
-+    virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException)
-+    {
-+        OSL_TRACE("** Userform/Dialog disposing");
-+        mbDisposed = true;
-+        uno::Any aSource;
-+        aSource <<= Source;   
-+        mxComponent = NULL;
-+        if ( mpUserForm )
-+            mpUserForm->ResetApiObj();
-+    }
-+};
-+
-+SbUserFormModule::SbUserFormModule( const com::sun::star::script::ModuleInfo& mInfo, bool bIsCompat )
-+    :SbObjModule( mInfo, bIsCompat ), mbInit( false )
-+{
-+        m_xModel.set( mInfo.ModuleObject, uno::UNO_QUERY_THROW );
-+}
-+
-+void SbUserFormModule::ResetApiObj()
-+{
-+        if (  m_xDialog.is() ) // probably someone close the dialog window
-+	{
-+            triggerTerminateEvent();
-+        }
-+        pDocObject = NULL;
-+	m_xDialog = NULL;
-+}
-+
-+void SbUserFormModule::triggerMethod( const String& aMethodToRun )
-+{
-+	OSL_TRACE("*** trigger %s ***", rtl::OUStringToOString( aMethodToRun, RTL_TEXTENCODING_UTF8 ).getStr() );
-+	// Search method
-+	SbxVariable* pMeth = SbObjModule::Find( aMethodToRun, SbxCLASS_METHOD );
-+	if( pMeth )
-+	{
-+		SbxValues aVals;
-+		pMeth->Get( aVals );
-+	}
-+}
-+
-+void SbUserFormModule::triggerActivateEvent( void )
-+{
-+        OSL_TRACE("**** entering SbUserFormModule::triggerActivate");
-+	triggerMethod( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserForm_activate") ) );
-+        OSL_TRACE("**** leaving SbUserFormModule::triggerActivate");
-+}
-+
-+void SbUserFormModule::triggerDeActivateEvent( void )
-+{
-+        OSL_TRACE("**** SbUserFormModule::triggerDeActivate");
-+	triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_DeActivate") ) );
-+}
-+
-+void SbUserFormModule::triggerInitializeEvent( void )
-+
-+{
-+	if ( mbInit )
-+		return;
-+        OSL_TRACE("**** SbUserFormModule::triggerInitializeEvent");
-+	static String aInitMethodName( RTL_CONSTASCII_USTRINGPARAM("Userform_Initialize") );
-+	triggerMethod( aInitMethodName );
-+	mbInit = true;
-+}
-+
-+void SbUserFormModule::triggerTerminateEvent( void )
-+{
-+        OSL_TRACE("**** SbUserFormModule::triggerTerminateEvent");
-+	static String aTermMethodName( RTL_CONSTASCII_USTRINGPARAM("Userform_Terminate") );
-+	triggerMethod( aTermMethodName );
-+	mbInit=false;
-+}
-+
-+void SbUserFormModule::load()
-+{
-+    OSL_TRACE("** load() ");
-+    // forces a load
-+    if ( !pDocObject )
-+        InitObject();
-+}
-+void SbUserFormModule::Unload()
-+{
-+    OSL_TRACE("** Unload() ");
-+    if ( m_xDialog.is() )
-+    {
-+	triggerTerminateEvent();
-+    }
-+	// Search method
-+	SbxVariable* pMeth = SbObjModule::Find( String( RTL_CONSTASCII_USTRINGPARAM( "UnloadObject" ) ), SbxCLASS_METHOD );
-+	if( pMeth )
-+	{
-+		OSL_TRACE("Attempting too run the UnloadObjectMethod");
-+                m_xDialog = NULL; //release ref to the uno object
-+		SbxValues aVals;
-+               FormObjEventListenerImpl* pFormListener = dynamic_cast< FormObjEventListenerImpl* >( m_DialogListener.get() );
-+		bool bWaitForDispose = true; // assume dialog is showing
-+                if ( pFormListener ) 
-+		{
-+			bWaitForDispose = pFormListener->isShowing();
-+			OSL_TRACE("Showing %d", bWaitForDispose );
-+		}
-+		pMeth->Get( aVals);
-+                if ( !bWaitForDispose )
-+                {
-+                    // we've either already got a dispose or we'er never going to get one 
-+		    ResetApiObj();
-+                } // else wait for dispose
-+		OSL_TRACE("UnloadObject completed ( we hope )");
-+	}
-+}
-+
-+void SbUserFormModule::InitObject()
-+{
-+    try
-+    {
-+
-+        if ( m_xModel.is() )
-+        {
-+            uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
-+            uno::Sequence< uno::Any > aArgs(1);
-+            aArgs[ 0 ] <<= m_xModel;
-+            rtl::OUString sDialogUrl( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:" ) );
-+            sDialogUrl = sDialogUrl.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") ) ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) ); 
-+
-+            uno::Reference< awt::XDialogProvider > xProvider( xFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.DialogProvider")), aArgs  ), uno::UNO_QUERY_THROW );
-+            m_xDialog = xProvider->createDialog( sDialogUrl );
-+
-+            // create vba api object
-+            aArgs.realloc( 3 );
-+            aArgs[ 0 ] = uno::Any();
-+            aArgs[ 1 ] <<= m_xDialog;
-+            aArgs[ 2 ] <<= m_xModel;
-+            pDocObject = new SbUnoObject( GetName(), uno::makeAny( xFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.UserForm")), aArgs  ) ) );
-+            uno::Reference< lang::XComponent > xComponent( aArgs[ 1 ], uno::UNO_QUERY_THROW );
-+            // remove old listener if it exists
-+            FormObjEventListenerImpl* pFormListener = dynamic_cast< FormObjEventListenerImpl* >( m_DialogListener.get() );
-+            if ( pFormListener )
-+                pFormListener->removeListener();
-+            m_DialogListener = new FormObjEventListenerImpl( this, xComponent );
-+
-+            triggerInitializeEvent();
-+        } 
-+    }
-+    catch( uno::Exception& e )
-+    {
-+    }
-+
-+}
-+
-+SbxVariable*
-+SbUserFormModule::Find( const XubString& rName, SbxClassType t )
-+{
-+    if ( !pDocObject && !GetSbData()->bRunInit  )
-+        InitObject();
-+    return SbObjModule::Find( rName, t );
-+}
- /////////////////////////////////////////////////////////////////////////
- 
- SbProperty::SbProperty( const String& r, SbxDataType t, SbModule* p )
-diff --git basic/source/runtime/methods.cxx basic/source/runtime/methods.cxx
-index 792bce2..a0c3cad 100644
---- basic/source/runtime/methods.cxx
-+++ basic/source/runtime/methods.cxx
-@@ -126,6 +126,8 @@ using namespace com::sun::star::io;
- 
- using namespace rtl;
- 
-+#include <basic/sbobjmod.hxx>
-+
- static void FilterWhiteSpace( String& rStr )
- {
- 	rStr.EraseAllChars( ' ' );
-@@ -4135,7 +4137,12 @@ RTLFUNC(Load)
- 
- 	// Diesen Call einfach an das Object weiterreichen
- 	SbxBase* pObj = (SbxObject*)rPar.Get(1)->GetObject();
--	if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
-+	if( pObj && pObj->IsA( TYPE( SbUserFormModule ) ) )
-+	{
-+		SbUserFormModule* pFormModule = ( SbUserFormModule* )pObj;
-+		pFormModule->load();
-+	}
-+	else if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
- 	{
- 		SbxVariable* pVar = ((SbxObject*)pObj)->
- 			Find( String( RTL_CONSTASCII_USTRINGPARAM("Load") ), SbxCLASS_METHOD );
-@@ -4158,7 +4165,12 @@ RTLFUNC(Unload)
- 
- 	// Diesen Call einfach an das Object weitereichen
- 	SbxBase* pObj = (SbxObject*)rPar.Get(1)->GetObject();
--	if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
-+	if( pObj && pObj->IsA( TYPE( SbUserFormModule ) ) )
-+	{
-+		SbUserFormModule* pFormModule = ( SbUserFormModule* )pObj;
-+		pFormModule->Unload();
-+	}
-+	else if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
- 	{
- 		SbxVariable* pVar = ((SbxObject*)pObj)->
- 			Find( String( RTL_CONSTASCII_USTRINGPARAM("Unload") ), SbxCLASS_METHOD );
diff --git a/applied_patches/0283-buildfix-climaker-disabled.diff b/applied_patches/0318-buildfix-climaker-disabled.diff
similarity index 100%
rename from applied_patches/0283-buildfix-climaker-disabled.diff
rename to applied_patches/0318-buildfix-climaker-disabled.diff
diff --git a/applied_patches/0318-vba-compatible-mode-uno.diff b/applied_patches/0318-vba-compatible-mode-uno.diff
deleted file mode 100644
index a5c33a55f..000000000
--- a/applied_patches/0318-vba-compatible-mode-uno.diff
+++ /dev/null
@@ -1,277 +0,0 @@
---- /dev/null	2008-06-07 03:39:59.000000000 +0800
-+++ offapi/com/sun/star/script/XVBACompat.idl	2008-09-01 15:40:32.000000000 +0800
-@@ -0,0 +1,49 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XLibraryContainer.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __com_sun_star_script_XVBACompat_idl__ 
-+#define __com_sun_star_script_XVBACompat_idl__ 
-+ 
-+#ifndef __com_sun_star_uno_XInterface_idl__ 
-+#include <com/sun/star/uno/XInterface.idl> 
-+#endif 
-+ 
-+//============================================================================= 
-+ 
-+module com {  module sun {  module star {  module script {  
-+ 
-+interface XVBACompat: com::sun::star::uno::XInterface
-+{ 
-+
-+//============================================================================= 
-+    [attribute ] boolean VBACompatModeOn;
-+ 
-+}; }; }; };  
-+}; 
-+#endif 
---- offapi/com/sun/star/script/makefile.mk.orig	2008-09-02 14:58:12.000000000 +0800
-+++ offapi/com/sun/star/script/makefile.mk	2008-09-01 15:40:32.000000000 +0800
-@@ -52,6 +52,7 @@ IDLFILES=\
- 	XPersistentLibraryContainer.idl\
- 	XStorageBasedLibraryContainer.idl\
- 	XLibraryQueryExecutable.idl \
-+	XVBACompat.idl\
- 	ModuleSizeExceededRequest.idl\
- 
- # ------------------------------------------------------------------
---- basic/source/inc/namecont.hxx.orig	2008-09-02 14:40:13.000000000 +0800
-+++ basic/source/inc/namecont.hxx	2008-09-01 16:06:08.000000000 +0800
-@@ -63,20 +63,23 @@
- #include <cppuhelper/implbase2.hxx>
- #include <cppuhelper/compbase6.hxx>
- #include <cppuhelper/compbase7.hxx>
-+#include <cppuhelper/compbase8.hxx>
- #include <cppuhelper/interfacecontainer.hxx>
-+#include <com/sun/star/script/XVBACompat.hpp>
- 
- class BasicManager;
- 
- namespace basic
- {
- 
--typedef ::cppu::WeakComponentImplHelper7< 
-+typedef ::cppu::WeakComponentImplHelper8< 
-     ::com::sun::star::lang::XInitialization,
-     ::com::sun::star::script::XStorageBasedLibraryContainer,
-     ::com::sun::star::script::XLibraryContainerPassword,
-     ::com::sun::star::script::XLibraryContainerExport,
-     ::com::sun::star::container::XContainer,
-     ::com::sun::star::script::XLibraryQueryExecutable,
-+	::com::sun::star::script::XVBACompat,
-     ::com::sun::star::lang::XServiceInfo > LibraryContainerHelper;
- 
- typedef ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameContainer,
-@@ -499,6 +502,10 @@ public:
-         throw (::com::sun::star::uno::RuntimeException);
-     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
-         throw (::com::sun::star::uno::RuntimeException) = 0;
-+
-+	// Methods XVBACompat
-+	virtual ::sal_Bool SAL_CALL getVBACompatModeOn() throw (::com::sun::star::uno::RuntimeException);
-+	virtual void SAL_CALL setVBACompatModeOn( ::sal_Bool _vbacompatmodeon ) throw (::com::sun::star::uno::RuntimeException);
- };
- 
- class LibraryContainerMethodGuard
---- basic/source/uno/namecont.cxx.orig	2008-09-03 14:13:47.000000000 +0800
-+++ basic/source/uno/namecont.cxx	2008-09-03 14:40:52.000000000 +0800
-@@ -2681,6 +2681,35 @@ OUString SfxLibraryContainer::expand_url
-     }
- }
- 
-+::sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatModeOn() throw (RuntimeException)
-+{
-+	sal_Bool bVBACompat = sal_False;
-+	BasicManager* pBasMgr = getBasicManager();
-+	if( pBasMgr )
-+	{
-+		// get the standard library
-+		String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-+		StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
-+		if( pBasic )
-+			bVBACompat = pBasic->isVBAEnabled();
-+	}
-+
-+	return bVBACompat;
-+}
-+
-+void SAL_CALL SfxLibraryContainer::setVBACompatModeOn( ::sal_Bool _vbacompatmodeon ) throw (RuntimeException)
-+{
-+	BasicManager* pBasMgr = getBasicManager();
-+	if( pBasMgr )
-+	{
-+		// get the standard library
-+		String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-+		StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
-+		if( pBasic )
-+			pBasic->SetVBAEnabled( _vbacompatmodeon );
-+	}
-+}
-+
- // Methods XServiceInfo
- ::sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const ::rtl::OUString& _rServiceName )
-     throw (RuntimeException)
---- xmlscript/source/xmldlg_imexp/imp_share.hxx.orig	2008-09-05 15:24:41.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/imp_share.hxx	2008-09-05 15:25:18.000000000 +0800
-@@ -45,6 +45,7 @@
- #include <com/sun/star/awt/FontEmphasisMark.hpp>
- #include <com/sun/star/awt/FontRelief.hpp>
- #include <com/sun/star/xml/input/XRoot.hpp>
-+#include <com/sun/star/script/XLibraryContainer.hpp>
- #include <vector>
- 
- 
-@@ -132,6 +133,7 @@ struct DialogImport
-     css::uno::Reference< css::container::XNameContainer > _xDialogModel;
-     css::uno::Reference< css::lang::XMultiServiceFactory > _xDialogModelFactory;
-     css::uno::Reference< css::frame::XModel > _xDoc;
-+    css::uno::Reference< css::script::XLibraryContainer > _xScriptLibraryContainer;
- 
-     sal_Int32 XMLNS_DIALOGS_UID, XMLNS_SCRIPT_UID;
-     
-@@ -177,6 +179,8 @@ public:
-         SAL_THROW( () );
-     
-     inline css::uno::Reference< css::frame::XModel > getDocOwner() { return _xDoc; }
-+
-+	css::uno::Reference< css::script::XLibraryContainer > getScriptLibraryContainer();
-     // XRoot
-     virtual void SAL_CALL startDocument(
-         css::uno::Reference< css::xml::input::XNamespaceMapping >
---- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx.orig	2008-09-05 15:24:30.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx	2008-09-05 15:25:18.000000000 +0800
-@@ -59,6 +59,8 @@
- #include <com/sun/star/script/ScriptEventDescriptor.hpp>
- 
- #include <com/sun/star/view/SelectionType.hpp>
-+#include <com/sun/star/document/XStorageBasedDocument.hpp>
-+#include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
- 
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
-@@ -1874,6 +1876,26 @@ Reference< xml::input::XElement > Dialog
-     }
-     return 0;
- }
-+//__________________________________________________________________________________________________
-+Reference< script::XLibraryContainer > DialogImport::getScriptLibraryContainer()
-+{
-+	if( !_xScriptLibraryContainer.is() )
-+	{
-+		try
-+		{
-+			Reference< document::XStorageBasedDocument > xStorageDoc( _xDoc, UNO_QUERY );
-+			if( xStorageDoc.is() )
-+				_xScriptLibraryContainer.set(
-+									script::DocumentScriptLibraryContainer::create( comphelper_getProcessComponentContext(), xStorageDoc ), 
-+									UNO_QUERY );
-+		}
-+		catch( const Exception& )
-+		{
-+		}
-+	}
-+
-+	return _xScriptLibraryContainer;
-+}
- 
- //##################################################################################################
- 
---- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx.orig	2008-09-05 15:24:41.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx	2008-09-05 15:25:18.000000000 +0800
-@@ -41,6 +41,7 @@
- #include <com/sun/star/beans/XPropertyState.hpp>
- #include <com/sun/star/document/XStorageBasedDocument.hpp>
- #include <com/sun/star/document/XGraphicObjectResolver.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
- 
- #include <comphelper/componentcontext.hxx>
- #include <comphelper/processfactory.hxx>
-@@ -96,7 +97,7 @@ bool IsPackageURL( const ::rtl::OUString
- 
- void importBindableAndListRangeBits( DialogImport* _pImport, const rtl::OUString sLinkedCell, const rtl::OUString & sCellRange, ControlImportContext& ctx )
- {
--    Reference< lang::XMultiServiceFactory > xFac( _pImport->getDocOwner(), UNO_QUERY );;
-+    Reference< lang::XMultiServiceFactory > xFac( _pImport->getDocOwner(), UNO_QUERY );
-     if ( xFac.is() && ( sLinkedCell.getLength() ||  sCellRange.getLength() ) )
-     {
-         // Set up Celllink
-@@ -145,6 +146,18 @@ void importBindableAndListRangeBits( Dia
-        }
-    }
- }
-+
-+sal_Bool isVBACompatModeOn( DialogImport* _pImport )
-+{
-+	sal_Bool bVBAMode = sal_False;
-+	Reference< script::XVBACompat > xVBACompat( _pImport->getScriptLibraryContainer(), UNO_QUERY );
-+	if( xVBACompat.is() )
-+	{
-+		bVBAMode = xVBACompat->getVBACompatModeOn();
-+	}
-+	return bVBAMode;
-+}
-+
- // progessmeter
- //__________________________________________________________________________________________________
- Reference< xml::input::XElement > ProgressBarElement::startChildElement(
-@@ -1475,7 +1488,7 @@ void TitledBoxElement::endElement()
- 		{
- 			sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
- 			// we should probably limit this to vba mode also ( leave for now )
--			if ( _pImport->getDocOwner().is() )
-+			if ( isVBACompatModeOn( _pImport ) )
- 				sService = OUSTR("com.sun.star.form.component.RadioButton");
- 		}
- 		catch( Exception& /*e*/ )
-@@ -1620,7 +1633,7 @@ void RadioGroupElement::endElement()
- 		{
- 			sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
- 			// we should probably limit this to vba mode also ( leave for now )
--			if ( _pImport->getDocOwner().is() )
-+			if ( isVBACompatModeOn( _pImport ) )
- 				sService = OUSTR("com.sun.star.form.component.RadioButton");
- 		}
- 		catch( Exception& /*e*/ )
-@@ -1807,7 +1820,7 @@ void MenuListElement::endElement()
-         OUString sListBoxService( OUSTR("com.sun.star.awt.UnoControlListBoxModel") );
- 
-         // we should probably limit this to vba mode also ( leave for now )
--        if ( _pImport->getDocOwner().is() )
-+        if ( isVBACompatModeOn( _pImport ) )
-             sListBoxService = OUSTR("com.sun.star.form.component.ListBox");
- 
-         try
-@@ -1912,7 +1925,7 @@ void ComboBoxElement::endElement()
-         OUString sService( OUSTR("com.sun.star.awt.UnoControlComboBoxModel") );
- 
-         // we should probably limit this to vba mode also ( leave for now )
--        if ( _pImport->getDocOwner().is() )
-+        if ( isVBACompatModeOn( _pImport ) )
-             sService = OUSTR("com.sun.star.form.component.ComboBox");
- 
-         OUString sLinkedCell;
diff --git a/applied_patches/0284-mono-bootstrap-config-and-policy.diff b/applied_patches/0319-mono-bootstrap-config-and-policy.diff
similarity index 100%
rename from applied_patches/0284-mono-bootstrap-config-and-policy.diff
rename to applied_patches/0319-mono-bootstrap-config-and-policy.diff
diff --git a/applied_patches/0319-vba-spinbutton-in-userform.diff b/applied_patches/0319-vba-spinbutton-in-userform.diff
deleted file mode 100644
index dcb18ebdb..000000000
--- a/applied_patches/0319-vba-spinbutton-in-userform.diff
+++ /dev/null
@@ -1,344 +0,0 @@
---- svx/inc/svx/msocximex.hxx.orig	2008-09-10 13:54:24.000000000 +0800
-+++ svx/inc/svx/msocximex.hxx	2008-09-11 13:27:15.000000000 +0800
-@@ -292,6 +292,8 @@ public:
- 	UniString msToolTip;
- 	UniString msParentName;
- 	OCX_FontData aFontData;
-+    rtl::OUString msCtrlSource;
-+    rtl::OUString msRowSource;
-         SfxObjectShell *pDocSh;
- protected:
- 
-@@ -405,8 +407,6 @@ public:
- 	sal_uInt32 nGroupNameLen;
- 	sal_uInt32 nUnknown10;
- 
--        rtl::OUString msCtrlSource;
--        rtl::OUString msRowSource;
- 	char *pValue;
- 	char *pCaption;
- 	char *pGroupName;
---- svx/source/msfilter/msocximex.cxx.orig	2008-09-10 13:54:24.000000000 +0800
-+++ svx/source/msfilter/msocximex.cxx	2008-09-11 13:30:06.000000000 +0800
-@@ -3669,8 +3669,7 @@ void OCX_ContainerControl::ProcessContro
-     SotStorageStreamRef oStream = mContainedControlsStream;
- 
-     // can insert into OO Dialog (e.g is this a supported dialog control)??
--    if ( rec.nTypeIdent == SPINBUTTON ||
--        rec.nTypeIdent == TABSTRIP)
-+    if ( rec.nTypeIdent == TABSTRIP )
-     {
-         // skip the record in the stream, discard the control
-         oStream->SeekRel( rec.nSubStreamLen );
-@@ -3694,13 +3693,11 @@ void OCX_ContainerControl::ProcessContro
-             case LISTBOX:
-             case OPTIONBUTTON:
-             case COMBOBOX:
-+			case SPINBUTTON:
-+			case SCROLLBAR:
-                 {
--                    OCX_ModernControl* pList = static_cast< OCX_ModernControl* >( pControl );
--                    if ( pList )
--                    {
--                        pList->msCtrlSource = rec.sCtrlSource;
--                        pList->msRowSource = rec.sRowSource;
--                    }
-+                    pControl->msCtrlSource = rec.sCtrlSource;
-+                    pControl->msRowSource = rec.sRowSource;
-                 }
-         }
-         pControl->sName = rec.cName;
-@@ -5566,7 +5563,7 @@ OCX_SpinButton::OCX_SpinButton() :
-     mbPropThumb( true )
- {
-     msFormType = C2U("com.sun.star.form.component.SpinButton");
--    msDialogType = C2U("com.sun.star.awt.UnoControlSpinButtonModel");
-+    msDialogType = C2U("com.sun.star.form.component.SpinButton");
-     mnBackColor = 0x8000000F;
-     mnForeColor = 0x80000012;
- }
-@@ -5689,6 +5686,9 @@ sal_Bool OCX_SpinButton::Import(com::sun
-     aTmp <<= sal_Int16( 0 );
-     rPropSet->setPropertyValue( WW8_ASCII2STR("Border"), aTmp);
- 
-+	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
-+	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
-+
-     return sal_True;
- }
- 
-@@ -5856,7 +5856,7 @@ OCX_ScrollBar::OCX_ScrollBar()
-     sName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollBar" ) );
-     mnMax = 32767;
-     msFormType = C2U("com.sun.star.form.component.ScrollBar");
--    msDialogType = C2U("com.sun.star.awt.UnoControlScrollBarModel");
-+    msDialogType = C2U("com.sun.star.form.component.ScrollBar");
- 
- }
- 
-@@ -5922,6 +5922,9 @@ sal_Bool OCX_ScrollBar::Import(com::sun:
-     aTmp <<= sal_Int16( 0 );
-     rPropSet->setPropertyValue( WW8_ASCII2STR("Border"), aTmp);
- 
-+	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
-+	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
-+
-     return sal_True;
- }
- 
---- xmlscript/source/xmldlg_imexp/exp_share.hxx.orig	2008-09-10 13:54:25.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/exp_share.hxx	2008-09-10 13:54:35.000000000 +0800
-@@ -212,7 +212,9 @@ public:
-         SAL_THROW( (css::uno::Exception) );
-     void readProgressBarModel( StyleBag * all_styles )
-         SAL_THROW( (css::uno::Exception) );
--    void readScrollBarModel( StyleBag * all_styles )
-+    void readScrollBarModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
-+        SAL_THROW( (css::uno::Exception) );
-+    void readSpinButtonModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
-         SAL_THROW( (css::uno::Exception) );
- 	void readFixedHyperLinkModel( StyleBag * all_styles )
-         SAL_THROW( (css::uno::Exception) );
---- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx.orig	2008-09-10 13:54:25.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx	2008-09-10 13:54:35.000000000 +0800
-@@ -1164,7 +1164,7 @@ void ElementDescriptor::readProgressBarM
-     readEvents();
- }
- //__________________________________________________________________________________________________
--void ElementDescriptor::readScrollBarModel( StyleBag * all_styles )
-+void ElementDescriptor::readScrollBarModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
-     SAL_THROW( (Exception) )
- {
-     // collect styles
-@@ -1202,6 +1202,47 @@ void ElementDescriptor::readScrollBarMod
-                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":live-scroll") ) );
-     readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ),
-                      OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":symbol-color") ) );
-+    // Cell Range, Ref Cell etc.
-+    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
-+    readEvents();
-+}
-+//__________________________________________________________________________________________________
-+void ElementDescriptor::readSpinButtonModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
-+    SAL_THROW( (Exception) )
-+{
-+    // collect styles
-+    Style aStyle( 0x1 | 0x4 );
-+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
-+        aStyle._set |= 0x1;
-+    if (readBorderProps( this, aStyle ))
-+        aStyle._set |= 0x4;
-+    if (aStyle._set)
-+    {
-+        addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
-+                      all_styles->getStyleId( aStyle ) );
-+    }
-+    
-+    // collect elements
-+    readDefaults();
-+    readOrientationAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Orientation") ),
-+                         OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );  
-+    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinIncrement") ),
-+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":increment") ) );
-+    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValue") ),
-+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":curval") ) );
-+    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") ),
-+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":maxval") ) );
-+    readLongAttr( OUSTR("SpinValueMin"),
-+                  OUSTR(XMLNS_DIALOGS_PREFIX ":minval") );
-+    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Repeat") ),
-+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":repeat") ) );
-+    readLongAttr( OUSTR("RepeatDelay"), OUSTR(XMLNS_DIALOGS_PREFIX ":repeat-delay") );
-+    readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
-+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
-+    readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ),
-+                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":symbol-color") ) );
-+    // Cell Range, Ref Cell etc.
-+    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
-     readEvents();
- }
- //__________________________________________________________________________________________________
---- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx.orig	2008-09-10 13:54:25.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx	2008-09-10 13:54:35.000000000 +0800
-@@ -1516,7 +1516,15 @@ void SAL_CALL exportDialogModel(
-                     xProps, xPropState,
-                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scrollbar") ) );
-                 xElem = static_cast< xml::sax::XAttributeList * >( pElem );
--                pElem->readScrollBarModel( &all_styles );
-+                pElem->readScrollBarModel( &all_styles, xDocument );
-+            }
-+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ) ) )
-+            {
-+                pElem = new ElementDescriptor(
-+                    xProps, xPropState,
-+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":spinbutton") ) );
-+                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-+                pElem->readSpinButtonModel( &all_styles, xDocument );
-             }
-             else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
-             {
---- xmlscript/source/xmldlg_imexp/imp_share.hxx.orig	2008-09-10 13:54:25.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/imp_share.hxx	2008-09-10 13:54:35.000000000 +0800
-@@ -1006,6 +1006,28 @@ public:
- };
- 
- //==============================================================================
-+class SpinButtonElement
-+    : public ControlElement
-+{
-+public:
-+    virtual css::uno::Reference< css::xml::input::XElement >
-+    SAL_CALL startChildElement(
-+        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
-+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-+    virtual void SAL_CALL endElement()
-+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-+    
-+    inline SpinButtonElement(
-+        ::rtl::OUString const & rLocalName,
-+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
-+        ElementBase * pParent, DialogImport * pImport )
-+        SAL_THROW( () )
-+        : ControlElement( rLocalName, xAttributes, pParent, pImport )
-+        {}
-+};
-+
-+//==============================================================================
- class ProgressBarElement
-     : public ControlElement
- {
---- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx.orig	2008-09-10 13:54:25.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx	2008-09-10 13:54:35.000000000 +0800
-@@ -237,10 +237,24 @@ Reference< xml::input::XElement > Scroll
- void ScrollBarElement::endElement()
- 	throw (xml::sax::SAXException, RuntimeException)
- {
-+	OUString sService( OUSTR("com.sun.star.awt.UnoControlScrollBarModel") );
-+	// we should probably limit this to vba mode also ( leave for now )
-+	if ( isVBACompatModeOn( _pImport ) )
-+		sService = OUSTR("com.sun.star.form.component.ScrollBar");
-+
-+    OUString sLinkedCell;
-+    try
-+    {
-+        sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-+    }
-+    catch( Exception& /*e*/ )
-+    {
-+    }
-+
- 	ControlImportContext ctx(
- 		_pImport, getControlId( _xAttributes ),
--		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ) );
--	
-+		sService );	
-+
- 	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
- 	if (xStyle.is())
- 	{
-@@ -283,6 +297,92 @@ void ScrollBarElement::endElement()
-                                OUString( RTL_CONSTASCII_USTRINGPARAM("symbol-color") ),
-                                _xAttributes );
-     
-+    // import cell-link
-+	OUString sCellRange;
-+	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
-+
-+	ctx.importEvents( _events );
-+    // avoid ring-reference:
-+    // vector< event elements > holding event elements holding this (via _pParent)
-+    _events.clear();
-+}
-+
-+//##################################################################################################
-+
-+// spinbutton
-+//__________________________________________________________________________________________________
-+Reference< xml::input::XElement > SpinButtonElement::startChildElement(
-+	sal_Int32 nUid, OUString const & rLocalName,
-+	Reference< xml::input::XAttributes > const & xAttributes )
-+	throw (xml::sax::SAXException, RuntimeException)
-+{
-+	// event
-+    if (_pImport->isEventElement( nUid, rLocalName ))
-+	{
-+		return new EventElement( nUid, rLocalName, xAttributes, this, _pImport );
-+	}
-+	else
-+	{
-+		throw xml::sax::SAXException(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("expected event element!") ),
-+			Reference< XInterface >(), Any() );
-+	}
-+}
-+//__________________________________________________________________________________________________
-+void SpinButtonElement::endElement()
-+	throw (xml::sax::SAXException, RuntimeException)
-+{
-+    OUString sLinkedCell;
-+    try
-+    {
-+        sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-+    }
-+    catch( Exception& /*e*/ )
-+    {
-+    }
-+
-+	ControlImportContext ctx(
-+		_pImport, getControlId( _xAttributes ),
-+		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.SpinButton") ) );
-+	
-+	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
-+	if (xStyle.is())
-+	{
-+		StyleElement * pStyle = static_cast< StyleElement * >( xStyle.get () );
-+		Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
-+        pStyle->importBackgroundColorStyle( xControlModel );
-+		pStyle->importBorderStyle( xControlModel );
-+	}
-+	
-+	ctx.importDefaults( _nBasePosX, _nBasePosY, _xAttributes );
-+	ctx.importOrientationProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Orientation") ),
-+                                   OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
-+                                   _xAttributes );
-+	ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinIncrement") ),
-+                            OUString( RTL_CONSTASCII_USTRINGPARAM("increment") ),
-+                            _xAttributes );
-+	ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValue") ),
-+                            OUString( RTL_CONSTASCII_USTRINGPARAM("curval") ),
-+                            _xAttributes );
-+	ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") ),
-+                            OUString( RTL_CONSTASCII_USTRINGPARAM("maxval") ),
-+                            _xAttributes );
-+	ctx.importLongProperty( OUSTR("SpinValueMin"), OUSTR("minval"),
-+                            _xAttributes );
-+	ctx.importLongProperty( OUSTR("Repeat"), OUSTR("repeat"),
-+                            _xAttributes );
-+	ctx.importLongProperty( OUSTR("RepeatDelay"), OUSTR("repeat-delay"),
-+                            _xAttributes );
-+    ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
-+                               OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
-+                               _xAttributes );
-+    ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ),
-+                               OUString( RTL_CONSTASCII_USTRINGPARAM("symbol-color") ),
-+                               _xAttributes );
-+    // import cell-link
-+	OUString sCellRange;
-+	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
-+    
- 	ctx.importEvents( _events );
-     // avoid ring-reference:
-     // vector< event elements > holding event elements holding this (via _pParent)
-@@ -2312,6 +2412,11 @@ Reference< xml::input::XElement > Bullet
- 	{
- 		return new ScrollBarElement( rLocalName, xAttributes, this, _pImport );
- 	}
-+	// spinbutton
-+	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ) && isVBACompatModeOn( _pImport ) )
-+	{
-+		return new SpinButtonElement( rLocalName, xAttributes, this, _pImport );
-+	}
- 	// progressmeter
- 	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("progressmeter") ))
- 	{
diff --git a/applied_patches/0285-mono-bridge-version.diff b/applied_patches/0320-mono-bridge-version.diff
similarity index 100%
rename from applied_patches/0285-mono-bridge-version.diff
rename to applied_patches/0320-mono-bridge-version.diff
diff --git a/applied_patches/0320-vbaevents-services-sources.diff b/applied_patches/0320-vbaevents-services-sources.diff
deleted file mode 100644
index ca1048135..000000000
--- a/applied_patches/0320-vbaevents-services-sources.diff
+++ /dev/null
@@ -1,2074 +0,0 @@
---- comphelper/inc/comphelper/evtmethodhelper.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ comphelper/inc/comphelper/evtmethodhelper.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,41 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: evtlistenerhlp.hxx,v $
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef COMPHELPER_EVENTMEHODHELPER_HXX
-+#define COMPHELPER_EVENMETHODHELPER_HXX
-+#include <comphelper/sequence.hxx>
-+//........................................................................
-+namespace comphelper
-+{
-+	COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type);
-+//........................................................................
-+
-+}	// namespace comphelper
-+//........................................................................
-+#endif // COMPHELPER_EVENTMEHODHELPER_HXX
---- comphelper/source/misc/evtmethodhelper.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ comphelper/source/misc/evtmethodhelper.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,77 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: evtlistenerhlp.cxx,v $
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_comphelper.hxx"
-+#include "comphelper/evtmethodhelper.hxx"
-+#include "cppuhelper/typeprovider.hxx"
-+
-+using ::com::sun::star::uno::Sequence;
-+using ::com::sun::star::uno::Type;
-+
-+namespace comphelper
-+{
-+
-+	Sequence< ::rtl::OUString> getEventMethodsForType(const Type& type)
-+	{
-+		typelib_InterfaceTypeDescription *pType=0;
-+		type.getDescription( (typelib_TypeDescription**)&pType);
-+	
-+		if(!pType)
-+			return Sequence< ::rtl::OUString>();
-+	    
-+		Sequence< ::rtl::OUString> aNames(pType->nMembers);
-+		::rtl::OUString* pNames = aNames.getArray();
-+		for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames)
-+		{
-+			// the decription reference
-+			typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i];
-+			// the description for the reference
-+			typelib_TypeDescription* pMemberDescription = NULL;
-+			typelib_typedescriptionreference_getDescription(&pMemberDescription, pMemberDescriptionReference);
-+			if (pMemberDescription)
-+			{
-+				typelib_InterfaceMemberTypeDescription* pRealMemberDescription =
-+				reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription);
-+				*pNames = pRealMemberDescription->pMemberName;
-+			}
-+		}
-+		typelib_typedescription_release( (typelib_TypeDescription *)pType );
-+		return aNames;
-+	}
-+
-+}
-+
-+
-+
-+
-+
-+
-+
---- comphelper/source/misc/makefile.mk
-+++ comphelper/source/misc/makefile.mk
-@@ -58,6 +58,7 @@ SLOFILES=   \
-             $(SLO)$/componentmodule.obj \
-             $(SLO)$/configurationhelper.obj \
-             $(SLO)$/documentinfo.obj \
-+	    $(SLO)$/evtmethodhelper.obj \
-             $(SLO)$/documentiologring.obj \
-             $(SLO)$/evtlistenerhlp.obj \
-             $(SLO)$/facreg.obj \
---- extensions/source/propctrlr/eventhandler.cxx.old	2009-04-02 10:51:17.000000000 +0000
-+++ extensions/source/propctrlr/eventhandler.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -62,6 +62,7 @@
- /** === end UNO includes === **/
- 
- #include <comphelper/namedvaluecollection.hxx>
-+#include <comphelper/evtmethodhelper.hxx>
- #include <comphelper/types.hxx>
- #include <cppuhelper/implbase1.hxx>
- #include <rtl/ref.hxx>
-@@ -165,36 +166,6 @@ namespace pcr
-     namespace
-     {
-         //....................................................................
--        Sequence< ::rtl::OUString > lcl_getListenerMethodsForType( const Type& type )
--        {
--            typelib_InterfaceTypeDescription *pType=0;
--            type.getDescription( (typelib_TypeDescription**)&pType);
--
--            if ( !pType )
--                return Sequence< ::rtl::OUString>();
--
--            Sequence< ::rtl::OUString > aNames( pType->nMembers );
--            ::rtl::OUString* pNames = aNames.getArray();
--            for ( sal_Int32 i = 0; i < pType->nMembers; ++i, ++pNames)
--            {
--                // the decription reference
--                typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i];
--                // the description for the reference
--                typelib_TypeDescription* pMemberDescription = NULL;
--                typelib_typedescriptionreference_getDescription( &pMemberDescription, pMemberDescriptionReference );
--                if ( pMemberDescription )
--                {
--                    typelib_InterfaceMemberTypeDescription* pRealMemberDescription =
--                        reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription);
--                    *pNames = pRealMemberDescription->pMemberName;
--                }
--            }
--
--            typelib_typedescription_release( (typelib_TypeDescription*)pType );
--            return aNames;
--        }
--
--        //....................................................................
-         #define DESCRIBE_EVENT( asciinamespace, asciilistener, asciimethod, id_postfix ) \
-             s_aKnownEvents.insert( EventMap::value_type( \
-                 ::rtl::OUString::createFromAscii( asciimethod ), \
-@@ -762,7 +733,7 @@ namespace pcr
-                         continue;
- 
-                     // loop through all methods
--                    Sequence< ::rtl::OUString > aMethods( lcl_getListenerMethodsForType( *pListeners ) );
-+                    Sequence< ::rtl::OUString > aMethods( comphelper::getEventMethodsForType( *pListeners ) );
- 
-                     const ::rtl::OUString* pMethods = aMethods.getConstArray();
-                     sal_uInt32 methodCount = aMethods.getLength();
---- forms/source/inc/InterfaceContainer.hxx.old	2009-04-02 11:04:10.000000000 +0000
-+++ forms/source/inc/InterfaceContainer.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -260,6 +260,9 @@ protected:
- 	void implCheckIndex( const sal_Int32 _nIndex ) SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) );
- 
- private:
-+	// hack for Vba Events
-+	void fakeVbaEventsHack( sal_Int32 _nIndex );
-+
- 	// the runtime event format has changed from version SO5.2 to OOo
- 	enum EventFormat
- 	{
---- forms/source/misc/InterfaceContainer.cxx.old	2009-04-02 11:04:11.000000000 +0000
-+++ forms/source/misc/InterfaceContainer.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -60,13 +60,20 @@
- #include <rtl/logfile.hxx>
- 
- //.........................................................................
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <com/sun/star/document/XCodeNameQuery.hpp>
-+#include <ooo/vba/XVBAToOOEventDescGen.hpp>
-+#include <comphelper/processfactory.hxx>
-+
- namespace frm
- {
- //.........................................................................
- 
-+using namespace ::com::sun::star::frame;
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::beans;
-+using namespace ::com::sun::star::document;
- using namespace ::com::sun::star::container;
- using namespace ::com::sun::star::script;
- using namespace ::com::sun::star::io;
-@@ -81,6 +88,88 @@ namespace
- 	}
- }
- 
-+bool
-+lcl_hasVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents  )
-+{
-+	const ScriptEventDescriptor* pDesc = sEvents.getConstArray();
-+	const ScriptEventDescriptor* pEnd = ( pDesc + sEvents.getLength() );
-+	for ( ; pDesc != pEnd; ++pDesc )
-+	{
-+		if ( pDesc->ScriptType.equals( rtl::OUString::createFromAscii( "VBAInterop" ) ) )
-+			return true;
-+	}
-+	return false;
-+}
-+
-+Sequence< ScriptEventDescriptor >
-+lcl_stripVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents )
-+{
-+	Sequence< ScriptEventDescriptor > sStripped( sEvents.getLength() );
-+	
-+	const ScriptEventDescriptor* pDesc = sEvents.getConstArray();
-+	const ScriptEventDescriptor* pEnd = ( pDesc + sEvents.getLength() );
-+	sal_Int32 nCopied = 0;
-+	for ( ; pDesc != pEnd; ++pDesc )
-+	{
-+		if ( !pDesc->ScriptType.equals( rtl::OUString::createFromAscii( "VBAInterop" ) ) )
-+		{
-+			sStripped[ nCopied++ ] = *pDesc;
-+		}
-+	}
-+	if ( nCopied )
-+		sStripped.realloc( nCopied );
-+	return sStripped;
-+}
-+
-+void
-+OInterfaceContainer::fakeVbaEventsHack(  sal_Int32 _nIndex )
-+{
-+	// we are dealing with form controls
-+	try
-+	{
-+		Reference< XFormComponent > xForm( static_cast< XContainer* >(this), UNO_QUERY_THROW );
-+		// grand-parent should be the model, no parent ? if not
-+		// we'll ignore,  we'll get called back here  anyway )
-+		Reference< XChild > xChild(  xForm->getParent(), UNO_QUERY_THROW );
-+		Reference< XModel > xDocOwner( xChild->getParent(), UNO_QUERY );
-+		Reference< XCodeNameQuery > xNameQuery( xDocOwner, UNO_QUERY );
-+		OSL_TRACE(" Is DOC ????? %s", xDocOwner.is() ? "true" : "false" );
-+		if ( xDocOwner.is() && xNameQuery.is() )
-+		{
-+			bool hasVBABindings = lcl_hasVbaEvents( m_xEventAttacher->getScriptEvents( _nIndex ) );  
-+			if ( hasVBABindings )
-+			{
-+				OSL_TRACE("Has VBA bindings already, returning ");
-+				return;
-+			}
-+			Reference< XMultiServiceFactory > xFac(  comphelper::getProcessServiceFactory(), UNO_QUERY );
-+			if ( xFac.is() )
-+			{
-+				try
-+				{
-+					Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( xFac->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBAToOOEventDesc" ) ), UNO_QUERY_THROW );
-+					Reference< XInterface > xIf( getByIndex( _nIndex ) , UNO_QUERY_THROW );
-+					rtl::OUString sCodeName;	
-+					sCodeName = xNameQuery->getCodeNameForObject( xIf );
-+					Reference< XPropertySet > xProps( xIf, UNO_QUERY );
-+					rtl::OUString sServiceName;
-+					xProps->getPropertyValue( rtl::OUString::createFromAscii("DefaultControl" ) ) >>= sServiceName;
-+
-+					Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( xFac->createInstance( sServiceName ), sCodeName );
-+					// register the vba script events
-+					if ( m_xEventAttacher.is() )
-+						m_xEventAttacher->registerScriptEvents( _nIndex, vbaEvents );
-+				}
-+				catch( Exception& e ){ OSL_TRACE("lcl_fakevbaevents - Caught Exception trying to create control eventstuff "); }
-+			}
-+
-+		}
-+	}
-+	catch( Exception& e )
-+	{
-+	}
-+
-+}
- //==================================================================
- //= ElementDescription
- //==================================================================
-@@ -694,6 +783,7 @@ void OInterfaceContainer::approveNewElem
- void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XPropertySet >& _rxElement,
- 	sal_Bool _bEvents, ElementDescription* _pApprovalResult, sal_Bool _bFire ) throw( IllegalArgumentException )
- {
-+        OSL_TRACE("OInterfaceContainer::implInsert( %d)", _nIndex );
- 	RTL_LOGFILE_CONTEXT( aLogger, "forms::OInterfaceContainer::implInsert" );
- 
- 	::osl::ClearableMutexGuard aGuard( m_rMutex );
-@@ -743,6 +833,23 @@ void OInterfaceContainer::implInsert(sal
- 	{
- 		m_xEventAttacher->insertEntry(_nIndex);
- 		m_xEventAttacher->attach( _nIndex, pElementMetaData->xInterface, makeAny( _rxElement ) );
-+		// insert fake events?
-+		Reference< XEventAttacherManager > xMgr ( pElementMetaData->xInterface, UNO_QUERY );
-+		if ( xMgr.is() )
-+		{ 
-+			OInterfaceContainer* pIfcMgr = dynamic_cast< OInterfaceContainer* >( xMgr.get() );
-+			sal_Int32 nLen = pIfcMgr->getCount();
-+			for ( sal_Int32 i = 0; (i < nLen) && pIfcMgr ; ++i )
-+			{	
-+				// add fake events to the control at index i
-+				pIfcMgr->fakeVbaEventsHack( i );
-+			}	
-+		}
-+		else
-+		{
-+			// add fake events to the control at index i
-+			fakeVbaEventsHack(  _nIndex );	
-+		}
- 	}
- 
- 	// notify derived classes
-@@ -1022,20 +1129,29 @@ void SAL_CALL OInterfaceContainer::remov
- //------------------------------------------------------------------------
- void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const ScriptEventDescriptor& aScriptEvent ) throw(IllegalArgumentException, RuntimeException)
- {
-+    OSL_TRACE("*** registerScriptEvent %d", nIndex);
-     if ( m_xEventAttacher.is() )
-+    {
- 	    m_xEventAttacher->registerScriptEvent( nIndex, aScriptEvent );
-+            fakeVbaEventsHack( nIndex ); // add fake vba events
-+    }
- }
- 
- //------------------------------------------------------------------------
- void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& aScriptEvents ) throw(IllegalArgumentException, RuntimeException)
- {
-+    OSL_TRACE("*** registerScriptEvent(s) %d", nIndex);
-     if ( m_xEventAttacher.is() )
-+    {
-     	m_xEventAttacher->registerScriptEvents( nIndex, aScriptEvents );
-+        fakeVbaEventsHack( nIndex ); // add fake vba events
-+    }
- }
- 
- //------------------------------------------------------------------------
- void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const ::rtl::OUString& aListenerType, const ::rtl::OUString& aEventMethod, const ::rtl::OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException)
- {
-+    OSL_TRACE("*** revokeScriptEvent %d listenertype %s, eventMethod %s", nIndex, rtl::OUStringToOString( aListenerType, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( aEventMethod, RTL_TEXTENCODING_UTF8 ).getStr());
-     if ( m_xEventAttacher.is() )
-     	m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam );
- }
-@@ -1064,9 +1180,16 @@ void SAL_CALL OInterfaceContainer::remov
- //------------------------------------------------------------------------
- Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException)
- {
-+    OSL_TRACE("getScriptEvents");
-     Sequence< ScriptEventDescriptor > aReturn;
-     if ( m_xEventAttacher.is() )
-+    {
- 	    aReturn = m_xEventAttacher->getScriptEvents( nIndex );
-+            if ( lcl_hasVbaEvents( aReturn ) )
-+            {
-+                aReturn = lcl_stripVbaEvents( aReturn );
-+            }
-+    }
-     return aReturn;
- }
- 
---- forms/source/misc/makefile.mk.old	2009-04-02 11:04:11.000000000 +0000
-+++ forms/source/misc/makefile.mk	2009-04-06 16:41:59.000000000 +0000
-@@ -45,6 +45,7 @@ ENABLE_EXCEPTIONS=TRUE
- # --- Types -------------------------------------
- 
- INCPRE+=$(SOLARINCDIR)$/offuh
-+INCPRE*=$(INCCOM)$/$(TARGET)
- 
- # --- Files -------------------------------------
- 
-@@ -62,3 +63,12 @@ SLOFILES=	$(SLO)$/limitedformats.obj \
- 
- .INCLUDE : target.mk
- 
-+ALLTAR : \
-+        $(MISC)$/$(TARGET).don \
-+
-+$(SLOFILES) : $(MISC)$/$(TARGET).don
-+
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+        echo $@
-+
---- offapi/com/sun/star/document/XCodeNameQuery.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ offapi/com/sun/star/document/XCodeNameQuery.idl	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,56 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: XDocumentPropertiesSupplier.idl,v $
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __com_sun_star_document_XCodeNameQuery_idl__
-+#define __com_sun_star_document_XCodeNameQuery_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module com {   module sun {   module star {   module document {
-+//=============================================================================
-+interface XCodeNameQuery
-+{
-+	//-------------------------------------------------------------------------
-+    string getCodeNameForObject( [in] com::sun::star::uno::XInterface aObj );
-+};
-+
-+//=============================================================================
-+
-+}; }; }; };
-+
-+#endif
---- offapi/com/sun/star/document/makefile.mk.old	2009-04-02 10:51:33.000000000 +0000
-+++ offapi/com/sun/star/document/makefile.mk	2009-04-06 16:41:59.000000000 +0000
-@@ -115,7 +115,9 @@ IDLFILES=\
-     LinkUpdateModes.idl\
-     XDocumentRevisionListPersistence.idl\
-     DocumentRevisionListPersistence.idl \
--    XDocumentLanguages.idl
-+    XDocumentLanguages.idl \
-+    XCodeNameQuery.idl \
-+
- 
- # ------------------------------------------------------------------
- 
---- oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl.old	2009-04-02 10:36:29.000000000 +0000
-+++ oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl	2009-04-06 16:41:59.000000000 +0000
-@@ -41,8 +41,8 @@
- module ooo {  module vba { 
- interface XVBAToOOEventDescGen : com::sun::star::uno::XInterface
- {
--	sequence< com::sun::star::script::ScriptEventDescriptor >  getEventDescriptions( [in] com::sun::star::uno::XInterface xControl, [in] string sLibModName, [in] sequence< string > handlerExts );
--	com::sun::star::script::XScriptEventsSupplier getEventSupplier( [in] com::sun::star::uno::XInterface xControl );
-+	sequence< com::sun::star::script::ScriptEventDescriptor >  getEventDescriptions( [in] com::sun::star::uno::XInterface xControl, [in] string sCodeName );
-+	com::sun::star::script::XScriptEventsSupplier getEventSupplier( [in] com::sun::star::uno::XInterface xControl, [in] string sCodeName );
- };
- 
- }; };
---- sc/inc/document.hxx.old	2009-04-06 16:41:50.000000000 +0000
-+++ sc/inc/document.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -292,6 +292,7 @@ private:
- 
-     ::std::auto_ptr<ScExternalRefManager> pExternalRefMgr;
- 	String              aDocName;                       // opt: Dokumentname
-+	String              aDocCodeName;                       // opt: Dokumentname
- 	ScRangePairListRef	xColNameRanges;
- 	ScRangePairListRef	xRowNameRanges;
- 
-@@ -438,6 +439,8 @@ public:
- 
- 	SC_DLLPUBLIC const String& 	GetName() const { return aDocName; }
- 	void			SetName( const String& r ) { aDocName = r; }
-+	const String& 	GetCodeName() const { return aDocCodeName; }
-+	void			SetCodeName( const String& r ) { aDocCodeName = r; }
- 
- 	void			GetDocStat( ScDocStat& rDocStat );
- 
-@@ -528,6 +531,8 @@ public:
- 
- 	SC_DLLPUBLIC BOOL			HasTable( SCTAB nTab ) const;
- 	SC_DLLPUBLIC BOOL			GetName( SCTAB nTab, String& rName ) const;
-+	SC_DLLPUBLIC BOOL			GetCodeName( SCTAB nTab, String& rName ) const;
-+	SC_DLLPUBLIC BOOL			SetCodeName( SCTAB nTab, String& rName );
- 	SC_DLLPUBLIC BOOL			GetTable( const String& rName, SCTAB& rTab ) const;
- 	SC_DLLPUBLIC inline SCTAB	GetTableCount() const { return nMaxTableNumber; }
- 	SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; }
---- sc/inc/docuno.hxx.old	2009-04-02 10:45:43.000000000 +0000
-+++ sc/inc/docuno.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -76,6 +76,8 @@ class SvxFmDrawPage;
- class SvxDrawPage;
- class ScRangeList;
- 
-+#include <com/sun/star/document/XCodeNameQuery.hpp>
-+
- class SC_DLLPUBLIC ScModelObj : public SfxBaseModel,
- 					public com::sun::star::sheet::XSpreadsheetDocument,
- 					public com::sun::star::document::XActionLockable,
-@@ -89,6 +91,7 @@ class SC_DLLPUBLIC ScModelObj : public S
- 					public com::sun::star::view::XRenderable,
- 					public com::sun::star::document::XLinkTargetSupplier,
- 					public com::sun::star::beans::XPropertySet,
-+					public com::sun::star::document::XCodeNameQuery,
- 					public SvxFmMSFactory,	// derived from XMultiServiceFactory
-                     public com::sun::star::lang::XServiceInfo,
-                     public ::com::sun::star::util::XChangesNotifier
-@@ -315,6 +318,8 @@ public:
-     virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::util::XChangesListener >& aListener )
-                                 throw (::com::sun::star::uno::RuntimeException);
-+    virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj ) 
-+                                throw(::com::sun::star::uno::RuntimeException); 
- };
- 
- 
---- sc/inc/scextopt.hxx.old	2009-04-06 16:41:49.000000000 +0000
-+++ sc/inc/scextopt.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -124,6 +124,8 @@ public:
-     const String&       GetCodeName( size_t nIdx ) const;
-     /** Appends a codename for a sheet. */
-     void                AppendCodeName( const String& rCodeName );
-+    void                SetCodeName( const String& rCodeName, size_t nIdx );
-+    void                DeleteCodeName( size_t nIdx );
- 
- private:
-     ::std::auto_ptr< ScExtDocOptionsImpl > mxImpl;
---- sc/inc/table.hxx.old	2009-04-06 16:41:50.000000000 +0000
-+++ sc/inc/table.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -85,6 +85,7 @@ private:
- 	ScColumn		aCol[MAXCOLCOUNT];
- 
- 	String			aName;
-+	String			aCodeName;
- 	String			aComment;
- 	BOOL			bScenario;
- 	BOOL			bLayoutRTL;
-@@ -215,6 +216,9 @@ public:
- 	void		GetName( String& rName ) const;
- 	void		SetName( const String& rNewName );
- 
-+	void		GetCodeName( String& rName ) const {  rName = aCodeName; }
-+	void		SetCodeName( const String& rNewName ) { aCodeName = rNewName; }
-+
-     const String&   GetUpperName() const;
- 
- 	const String&	GetPageStyle() const					{ return aPageStyle; }
---- sc/source/core/data/document.cxx
-+++ sc/source/core/data/document.cxx
-@@ -154,6 +154,32 @@ BOOL ScDocument::GetName( SCTAB nTab, St
- 	return FALSE;
- }
- 
-+BOOL ScDocument::SetCodeName( SCTAB nTab, String& rName ) 
-+{
-+	if (VALIDTAB(nTab))
-+	{
-+		if (pTab[nTab])
-+		{
-+			pTab[nTab]->SetCodeName( rName );
-+			return TRUE;
-+		}
-+	}
-+	OSL_TRACE( "**** can't set code name %s", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+	return FALSE;
-+}
-+
-+BOOL ScDocument::GetCodeName( SCTAB nTab, String& rName ) const
-+{
-+	if (VALIDTAB(nTab))
-+		if (pTab[nTab])
-+		{
-+			pTab[nTab]->GetCodeName( rName );
-+			return TRUE;
-+		}
-+	rName.Erase();
-+	return FALSE;
-+}
-+
- 
- BOOL ScDocument::GetTable( const String& rName, SCTAB& rTab ) const
- {
-@@ -293,6 +319,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos,
- 		if (nPos == SC_TAB_APPEND || nPos == nTabCount)
- 		{
- 			pTab[nTabCount] = new ScTable(this, nTabCount, rName);
-+            pTab[nTabCount]->SetCodeName( rName );
- 			++nMaxTableNumber;
- 			if ( bExternalDocument )
- 				pTab[nTabCount]->SetVisible( FALSE );
-@@ -325,10 +352,16 @@ BOOL ScDocument::InsertTab( SCTAB nPos,
- 				for (i = 0; i <= MAXTAB; i++)
- 					if (pTab[i])
- 						pTab[i]->UpdateInsertTab(nPos);
-+
- 				for (i = nTabCount; i > nPos; i--)
-+				{
- 					pTab[i] = pTab[i - 1];
-+				}
-+
- 				pTab[nPos] = new ScTable(this, nPos, rName);
-+                pTab[nPos]->SetCodeName( rName );
- 				++nMaxTableNumber;
-+
-                 // UpdateBroadcastAreas must be called between UpdateInsertTab, 
-                 // which ends listening, and StartAllListeners, to not modify 
-                 // areas that are to be inserted by starting listeners.
-@@ -420,7 +453,10 @@ BOOL ScDocument::DeleteTab( SCTAB nTab,
- 									pRefUndoDoc ? pRefUndoDoc->pTab[i] : 0);
- 				delete pTab[nTab];
- 				for (i=nTab + 1; i < nTabCount; i++)
-+				{
- 					pTab[i - 1] = pTab[i];
-+				}
-+
- 				pTab[nTabCount - 1] = NULL;
- 				--nMaxTableNumber;
- 				for (i = 0; i <= MAXTAB; i++)
---- sc/source/core/data/table1.cxx.old	2009-04-06 16:41:50.000000000 +0000
-+++ sc/source/core/data/table1.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -125,6 +125,7 @@ extern BOOL bIsOlk, bOderSo;
- ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
- 					BOOL bColInfo, BOOL bRowInfo ) :
- 	aName( rNewName ),
-+	aCodeName( rNewName ),
- 	bScenario( FALSE ),
- 	bLayoutRTL( FALSE ),
-     bLoadingRTL( FALSE ),
---- sc/source/filter/excel/excimp8.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/filter/excel/excimp8.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -114,7 +114,7 @@ using namespace com::sun::star;
- script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule );
- 
- ImportExcel8::ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ) :
--    ImportExcel( rImpData, rStrm )
-+    ImportExcel( rImpData, rStrm ), mnTab(0)
- {
- 	delete pFormConv;
- 
-@@ -237,9 +237,15 @@ void ImportExcel8::Codename( BOOL bWorkb
-         if( aName.Len() )
-         {
-             if( bWorkbookGlobals )
-+            {
-                 GetExtDocOptions().GetDocSettings().maGlobCodeName = aName;
-+                GetDoc().SetCodeName( aName );
-+            }
-             else
-+            {
-                 GetExtDocOptions().AppendCodeName( aName );
-+                GetDoc().SetCodeName( mnTab++, aName );
-+            }
-         }
- 	}
- }
---- sc/source/filter/inc/excimp8.hxx.old	2009-04-06 16:41:49.000000000 +0000
-+++ sc/source/filter/inc/excimp8.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -52,6 +52,7 @@ class XclImpStream;
- 
- class ImportExcel8 : public ImportExcel
- {
-+        SCTAB mnTab;
- 	protected:
-         ExcScenarioList         aScenList;
- 
---- sc/source/ui/unoobj/docuno.cxx
-+++ sc/source/ui/unoobj/docuno.cxx
-@@ -104,6 +104,7 @@ using namespace com::sun::star;
- //	alles ohne Which-ID, Map nur fuer PropertySetInfo
- 
- //!	umbenennen, sind nicht mehr nur Options
-+#include <com/sun/star/script/ScriptEventDescriptor.hpp>
- const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap()
- {
-     static SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] =
-@@ -311,6 +312,7 @@ uno::Any SAL_CALL ScModelObj::queryInter
- 	SC_QUERYINTERFACE( view::XRenderable )
- 	SC_QUERYINTERFACE( document::XLinkTargetSupplier )
- 	SC_QUERYINTERFACE( beans::XPropertySet )
-+	SC_QUERYINTERFACE( document::XCodeNameQuery )
- 	SC_QUERYINTERFACE( lang::XMultiServiceFactory )
- 	SC_QUERYINTERFACE( lang::XServiceInfo )
-     SC_QUERYINTERFACE( util::XChangesNotifier )
-@@ -1717,7 +1719,49 @@ uno::Sequence<rtl::OUString> SAL_CALL Sc
- 
- 	return concatServiceNames( aMyServices, aDrawServices );
- }
--
-+// XCodeNameQuery
-+rtl::OUString SAL_CALL 
-+ScModelObj::getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
-+{
-+    rtl::OUString sCodeName;
-+    if ( pDocShell )
-+    {
-+        OSL_TRACE( "*** In ScModelObj::getCodeNameForObject");
-+        // need to find the page ( and index )  for this control
-+        uno::Reference< drawing::XDrawPagesSupplier > xSupplier( pDocShell->GetModel(), uno::UNO_QUERY_THROW );
-+        uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW );
-+        sal_Int32 nLen = xIndex->getCount();
-+        bool bMatched = false;
-+        uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;
-+        for ( sal_Int32 index = 0; index < nLen; ++index )
-+        {
-+            try
-+            {
-+                uno::Reference< form::XFormsSupplier >  xFormSupplier( xIndex->getByIndex( index ), uno::UNO_QUERY_THROW );
-+                uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
-+                // get the www-standard container
-+                uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );
-+                sal_Int32 nCntrls = xFormControls->getCount();
-+                for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
-+                {
-+                    uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );	
-+                    bMatched = ( xControl == xIf );
-+                    if ( bMatched )
-+                    {
-+                        String sName;
-+                        pDocShell->GetDocument()->GetCodeName( index, sName );
-+                        sCodeName = sName;
-+                    }
-+                }
-+            }
-+            catch( uno::Exception& ) {}
-+            if ( bMatched )
-+                break;
-+        }
-+    }
-+    // Probably should throw here ( if !bMatched )
-+     return sCodeName;
-+}
- // XServiceInfo
- 
- rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException)
---- sc/source/ui/vba/vbaworksheet.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaworksheet.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -794,7 +794,7 @@ ScVbaWorksheet::getServiceNames()
- rtl::OUString SAL_CALL
- ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException)
- {
--#ifdef VBA_OOBUILD_HACK 
-+#if 0
-     uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
-     SCTAB nTab = 0;
-     rtl::OUString aSheetName = getName();
-@@ -815,7 +815,7 @@ ScVbaWorksheet::getCodeName() throw (css
- 	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
- #endif
- }
--#ifdef VBA_OOBUILD_HACK 
-+#if 0
- void SAL_CALL
- ScVbaWorksheet::setCodeName( const rtl::OUString& sCodeName ) throw (css::uno::RuntimeException)
- {
---- scripting/source/dlgprov/dlgevtatt.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ scripting/source/dlgprov/dlgevtatt.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -121,18 +121,20 @@ namespace dlgprov
-     DialogVBAScriptListenerImpl::DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel ) : DialogScriptListenerImpl( rxContext )
-     {
-         Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() );
-+        Sequence< Any > args(1);
-         if ( xSMgr.is() )
-         {
--            Sequence< Any > args(1);
-             args[0] <<= xModel;
-             mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.EventListener" ) ), args, m_xContext ), UNO_QUERY );
-         }
-         if ( rxControl.is() )
-         {
--            Reference< XPropertySet > xProps( rxControl->getModel(), UNO_QUERY );
-             try
-             {
-+                Reference< XPropertySet > xProps( rxControl->getModel(), UNO_QUERY_THROW );
-                 xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= msDialogCodeName;
-+                xProps.set( mxListener, UNO_QUERY_THROW );
-+                xProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ), args[ 0 ] );
-             } 
-             catch ( Exception&  ) {}
-         }
-@@ -193,7 +195,7 @@ namespace dlgprov
-         return it->second; 
-     }
- #ifdef FAKE_VBA_EVENT_SUPPORT
--    Reference< XScriptEventsSupplier > DialogEventsAttacherImpl::getFakeVbaEventsSupplier( const Reference< XControl >& xControl )
-+    Reference< XScriptEventsSupplier > DialogEventsAttacherImpl::getFakeVbaEventsSupplier( const Reference< XControl >& xControl, rtl::OUString& sControlName )
-     {
-         Reference< XScriptEventsSupplier > xEventsSupplier;
-         Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() );
-@@ -201,7 +203,7 @@ namespace dlgprov
-         {
-             Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAToOOEventDesc" ) ), m_xContext ), UNO_QUERY );
-             if ( xVBAToOOEvtDesc.is() )
--                xEventsSupplier.set( xVBAToOOEvtDesc->getEventSupplier( xControl ), UNO_QUERY );
-+                xEventsSupplier.set( xVBAToOOEvtDesc->getEventSupplier( xControl, sControlName ), UNO_QUERY );
-             
-         }
-         return xEventsSupplier;
-@@ -324,6 +326,20 @@ namespace dlgprov
-         // go over all objects
-         const Reference< XInterface >* pObjects = Objects.getConstArray();
-         sal_Int32 nObjCount = Objects.getLength();
-+#ifdef FAKE_VBA_EVENT_SUPPORT
-+        Reference< awt::XControl > xDlgControl( Objects[ nObjCount - 1 ], uno::UNO_QUERY ); // last object is the dialog	
-+        rtl::OUString sDialogCodeName;
-+        if ( xDlgControl.is() )
-+        {
-+            Reference< XPropertySet > xProps( xDlgControl->getModel(), UNO_QUERY );
-+            try
-+            {
-+                xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= sDialogCodeName;  
-+            }
-+            catch( Exception& ){}
-+        }
-+#endif
-+	
-         for ( sal_Int32 i = 0; i < nObjCount; ++i )
-         {
-             // We know that we have to do with instances of XControl.
-@@ -338,7 +354,7 @@ namespace dlgprov
-             Reference< XScriptEventsSupplier > xEventsSupplier( xControlModel, UNO_QUERY );
-             attachEventsToControl( xControl, xEventsSupplier, Helper );
- #ifdef FAKE_VBA_EVENT_SUPPORT
--            xEventsSupplier.set( getFakeVbaEventsSupplier( xControl ) );
-+            xEventsSupplier.set( getFakeVbaEventsSupplier( xControl, sDialogCodeName ) );
-             attachEventsToControl( xControl, xEventsSupplier, Helper );
- #endif
-         }
---- scripting/source/dlgprov/dlgevtatt.hxx.old	2009-04-02 10:36:33.000000000 +0000
-+++ scripting/source/dlgprov/dlgevtatt.hxx	2009-04-06 16:41:59.000000000 +0000
-@@ -46,6 +46,9 @@
- #include <com/sun/star/script/XScriptEventsSupplier.hpp>
- 
- #include <hash_map>
-+
-+#define FAKE_VBA_EVENT_SUPPORT 1 
-+
- //.........................................................................
- namespace dlgprov
- {
-@@ -71,7 +74,7 @@ namespace dlgprov
-         ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacher > m_xEventAttacher;
-         ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > getScriptListenerForKey( const rtl::OUString& sScriptName ) throw ( ::com::sun::star::uno::RuntimeException );
- #ifdef FAKE_VBA_EVENT_SUPPORT
--        ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl );
-+        ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, rtl::OUString& sCodeName );
- #endif
-         void  SAL_CALL attachEventsToControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier >& events, const ::com::sun::star::uno::Any& Helper  );
-     public:
---- scripting/source/vbaevents/eventhelper.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ scripting/source/vbaevents/eventhelper.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,919 @@
-+#include <comphelper/processfactory.hxx>
-+#include <comphelper/uno3.hxx>
-+#include <comphelper/proparrhlp.hxx>
-+#include <comphelper/propertycontainer.hxx>
-+
-+#include <ooo/vba/XVBAToOOEventDescGen.hpp>
-+
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/beans/XIntrospection.hpp>
-+#include <com/sun/star/beans/PropertyAttribute.hpp>
-+
-+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-+#include <com/sun/star/lang/XServiceName.hpp>
-+#include <com/sun/star/lang/XServiceInfo.hpp>
-+#include <com/sun/star/lang/XInitialization.hpp>
-+
-+#include <com/sun/star/frame/XModel.hpp>
-+
-+#include <com/sun/star/script/XLibraryContainer.hpp>
-+#include <com/sun/star/script/ScriptEventDescriptor.hpp>
-+#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
-+
-+#include <com/sun/star/drawing/XControlShape.hpp>
-+
-+#include <com/sun/star/awt/XControl.hpp>
-+#include <com/sun/star/awt/XDialog.hpp>
-+#include <com/sun/star/awt/KeyEvent.hpp>
-+#include <com/sun/star/awt/MouseEvent.hpp>
-+
-+#include <msforms/ReturnInteger.hpp>
-+
-+#include <sfx2/objsh.hxx>
-+#include <basic/sbstar.hxx>
-+#include <basic/basmgr.hxx>
-+#include <basic/sbmeth.hxx>
-+#include <basic/sbmod.hxx>
-+#include <basic/sbx.hxx>
-+
-+
-+
-+
-+// for debug
-+#include <comphelper/anytostring.hxx>
-+
-+
-+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-+#include <com/sun/star/script/XScriptListener.hpp>
-+#include <cppuhelper/implbase1.hxx>
-+#include <cppuhelper/implbase2.hxx>
-+#include <comphelper/evtmethodhelper.hxx>
-+
-+#include <set>
-+#include <list>
-+#include <hash_map>
-+
-+using namespace ::com::sun::star;
-+using namespace ::com::sun::star::script;
-+using namespace ::com::sun::star::uno;
-+using namespace ::ooo::vba;
-+
-+
-+// Some constants 
-+const static rtl::OUString DELIM = rtl::OUString::createFromAscii( "::" );
-+const static sal_Int32 DELIMLEN = DELIM.getLength();
-+
-+#if 0
-+void dumpListeners( const Reference< beans::XIntrospection >& xIntrospection, const Reference<XInterface>& xIfc)
-+{
-+    Reference< beans::XIntrospectionAccess > xIntrospectionAccess;
-+    if ( xIntrospection.is() )
-+    {
-+        xIntrospectionAccess = xIntrospection->inspect( 
-+            makeAny( xIfc ) );
-+        Sequence< Type > aControlListeners = 
-+            xIntrospectionAccess->getSupportedListeners();
-+        sal_Int32 nLength = aControlListeners.getLength();
-+             
-+        for ( sal_Int32 i = 0; i< nLength; ++i )
-+        {
-+            Type& listType = aControlListeners[ i ];
-+            rtl::OUString sFullTypeName = listType.getTypeName();
-+            rtl::OUString sTypeName = listType.getTypeName();
-+            sal_Int32 lastDotIndex = -1;
-+            if ( ( lastDotIndex = sFullTypeName.lastIndexOf( '.' ) ) > -1 )
-+            {
-+                sTypeName = sFullTypeName.copy( lastDotIndex + 1 );    
-+            } 
-+            Sequence< ::rtl::OUString > sMeths = comphelper::getEventMethodsForType( listType );    
-+            sal_Int32 sMethLen = sMeths.getLength();
-+            for ( sal_Int32 j=0 ; j < sMethLen; ++j )
-+            {
-+                OSL_TRACE("**Listener [%d] Type[%s] Method[%s]",j,
-+                    rtl::OUStringToOString( sTypeName, 
-+                        RTL_TEXTENCODING_UTF8 ).getStr(),
-+                    rtl::OUStringToOString( sMeths[ j ], 
-+                        RTL_TEXTENCODING_UTF8 ).getStr() );
-+            }
-+        }
-+       
-+    }
-+}
-+
-+void dumpEvent( const ScriptEvent& evt )
-+{
-+    OSL_TRACE("dumpEvent: Source %s",
-+        rtl::OUStringToOString( comphelper::anyToString( makeAny(evt.Source)), 
-+            RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-+    OSL_TRACE("dumpEvent: ScriptType %s",
-+        rtl::OUStringToOString( evt.ScriptType, 
-+            RTL_TEXTENCODING_UTF8 ).getStr() );
-+    
-+    OSL_TRACE("dumpEvent: ScriptCode %s",
-+        rtl::OUStringToOString( evt.ScriptCode, 
-+            RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-+    OSL_TRACE("dumpEvent: ListenerType %s",
-+        rtl::OUStringToOString( evt.ListenerType.getTypeName(), 
-+            RTL_TEXTENCODING_UTF8 ).getStr() );
-+    
-+    OSL_TRACE("dumpEvent: Listener methodname %s",
-+        rtl::OUStringToOString( evt.MethodName, 
-+            RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-+    OSL_TRACE("dumpEvent: arguments;");
-+    sal_Int32 nLen = evt.Arguments.getLength();
-+    for ( sal_Int32 index=0; index < nLen; ++index )
-+    {
-+        OSL_TRACE("\t [%d] %s", index, 
-+        rtl::OUStringToOString( comphelper::anyToString( evt.Arguments[ index ] ), 
-+            RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-+    }
-+}
-+
-+#endif
-+
-+bool isKeyEventOk( awt::KeyEvent& evt, const Sequence< Any >& params )
-+{
-+    if ( !( params.getLength() > 0 ) ||
-+        !( params[ 0 ] >>= evt ) )
-+        return false;
-+    return true;
-+}
-+
-+bool isMouseEventOk( awt::MouseEvent& evt, const Sequence< Any >& params )
-+{
-+    if ( !( params.getLength() > 0 ) ||
-+        !( params[ 0 ] >>= evt ) )
-+        return false;
-+    return true;
-+}
-+
-+Sequence< Any > ooMouseEvtToVBADblClick( const Sequence< Any >& params )
-+{
-+    Sequence< Any > translatedParams;
-+    awt::MouseEvent evt;
-+
-+    if ( !( isMouseEventOk(evt, params)) || 
-+        (evt.ClickCount != 2) )
-+        return Sequence< Any >(); 
-+    // give back orig params, this will signal that the event is good
-+    return params;
-+}
-+
-+Sequence< Any > ooMouseEvtToVBAMouseEvt( const Sequence< Any >& params )
-+{
-+    Sequence< Any > translatedParams;
-+    awt::MouseEvent evt;
-+
-+    if ( !isMouseEventOk(evt, params) )
-+        return Sequence< Any >(); 
-+
-+    translatedParams.realloc(4);
-+
-+    // Buttons
-+    translatedParams[ 0 ] <<= evt.Buttons;
-+    // Shift
-+    translatedParams[ 1 ] <<= evt.Modifiers;
-+    // X
-+    translatedParams[ 2 ] <<= evt.X;
-+    // Y
-+    translatedParams[ 3 ] <<= evt.Y;
-+    return translatedParams;
-+}
-+
-+Sequence< Any > ooKeyPressedToVBAKeyPressed( const Sequence< Any >& params )
-+{
-+    Sequence< Any > translatedParams;
-+    awt::KeyEvent evt;
-+
-+    if ( !isKeyEventOk( evt, params ) )
-+        return Sequence< Any >(); 
-+
-+    translatedParams.realloc(1);
-+
-+    msforms::ReturnInteger keyCode;
-+    keyCode.Value = evt.KeyCode; 
-+    translatedParams[0] <<= keyCode;
-+    return  translatedParams;
-+}
-+
-+Sequence< Any > ooKeyPressedToVBAKeyUpDown( const Sequence< Any >& params )
-+{
-+    Sequence< Any > translatedParams;
-+    awt::KeyEvent evt;
-+
-+    if ( !isKeyEventOk( evt, params ) )
-+        return Sequence< Any >(); 
-+
-+    translatedParams.realloc(2);
-+
-+    msforms::ReturnInteger keyCode;
-+    sal_Int8 shift = evt.Modifiers;
-+
-+    // #TODO check whether values from OOO conform to values generated from vba
-+    keyCode.Value = evt.KeyCode; 
-+    translatedParams[0] <<= keyCode;
-+    translatedParams[1] <<= shift;
-+    return  translatedParams;
-+}
-+
-+typedef Sequence< Any > (*Translator)(const Sequence< Any >&);
-+
-+struct TranslateInfo
-+{
-+    rtl::OUString sVBAName;
-+    Translator toVBA;
-+};
-+
-+
-+typedef std::hash_map< rtl::OUString, 
-+std::list< TranslateInfo >, 
-+::rtl::OUStringHash,
-+::std::equal_to< ::rtl::OUString > > EventInfoHash;
-+
-+
-+EventInfoHash& getEventTransInfo()
-+{
-+    static bool initialised = false;
-+    static EventInfoHash eventTransInfo;
-+    if ( !initialised )
-+    {
-+        TranslateInfo  info;
-+        // actionPerformed ooo event
-+        std::list< TranslateInfo > actionInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_Click");
-+        info.toVBA = NULL;
-+        actionInfos.push_back( info );
-+        info.sVBAName = rtl::OUString::createFromAscii("_Change");
-+        info.toVBA = NULL;
-+        actionInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("actionPerformed") ] = actionInfos;
-+        // changed ooo event
-+        std::list< TranslateInfo > changeInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_Change");
-+        info.toVBA = NULL;
-+        changeInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("changed") ] = changeInfos;
-+        // focusGained ooo event
-+        std::list< TranslateInfo > focusGainedInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_GotFocus");
-+        info.toVBA = NULL;
-+        focusGainedInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("focusGained") ] = focusGainedInfos;
-+        // focusLost ooo event
-+        std::list< TranslateInfo > focusLostInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_LostFocus");
-+        info.toVBA = NULL;
-+        focusLostInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("focusGained") ] = focusLostInfos;
-+        // adjustmentValueChanged ooo event
-+        std::list< TranslateInfo > adjustInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_Scroll");
-+        info.toVBA = NULL;
-+        adjustInfos.push_back( info );
-+        info.sVBAName = rtl::OUString::createFromAscii("_Change");
-+        info.toVBA = NULL;
-+        adjustInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("adjustmentValueChanged") ] = adjustInfos;
-+        // textChanged ooo event
-+        std::list< TranslateInfo > txtChangedInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_Change");
-+        info.toVBA = NULL;
-+        txtChangedInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("textChanged") ] = txtChangedInfos;
-+
-+        // keyReleased ooo event
-+        std::list< TranslateInfo > keyReleasedInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_KeyUp");
-+        info.toVBA = ooKeyPressedToVBAKeyUpDown;
-+        keyReleasedInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("keyReleased") ] = keyReleasedInfos;
-+        // mouseReleased ooo event
-+        std::list< TranslateInfo > mouseReleasedInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_MouseUp");
-+        info.toVBA = ooMouseEvtToVBAMouseEvt;
-+        mouseReleasedInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("mouseReleased") ] = mouseReleasedInfos;
-+        // mousePressed ooo event
-+        std::list< TranslateInfo > mousePressedInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_MouseDown");
-+        info.toVBA = ooMouseEvtToVBAMouseEvt;
-+        mousePressedInfos.push_back( info );
-+        info.sVBAName = rtl::OUString::createFromAscii("_DblClick");
-+        // emulate double click event
-+        info.toVBA = ooMouseEvtToVBADblClick;
-+        mousePressedInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("mousePressed") ] = mousePressedInfos;
-+        // mouseMoved ooo event
-+        std::list< TranslateInfo > mouseMovedInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_MouseMove");
-+        info.toVBA = ooMouseEvtToVBAMouseEvt;
-+        mouseMovedInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("mouseMoved") ] = mouseMovedInfos;
-+        // keyPressed ooo event
-+        std::list< TranslateInfo > keyPressedInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_KeyDown");
-+        info.toVBA = ooKeyPressedToVBAKeyUpDown;
-+        keyPressedInfos.push_back( info );
-+        info.sVBAName = rtl::OUString::createFromAscii("_KeyPress");
-+        info.toVBA = ooKeyPressedToVBAKeyPressed;
-+        keyPressedInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("keyPressed") ] = keyPressedInfos;
-+        initialised = true;
-+    }
-+    return eventTransInfo;
-+}
-+
-+// Helper class
-+
-+class ScriptEventHelper
-+{
-+public:
-+    ScriptEventHelper( const Reference< XInterface >& xControl );
-+    Sequence< ScriptEventDescriptor > createEvents( const rtl::OUString& sCodeName );   
-+    Sequence< rtl::OUString > getEventListeners();
-+private:
-+    Reference< XComponentContext > m_xCtx;
-+    Reference< XInterface > m_xControl;
-+};
-+
-+bool
-+eventMethodToDescriptor( const ::rtl::OUString& rEventMethod, ScriptEventDescriptor& evtDesc, const ::rtl::OUString& sCodeName )
-+{
-+    // format of ControlListener is TypeName::methodname e.g.
-+    // "com.sun.star.awt.XActionListener::actionPerformed" or
-+    // "XActionListener::actionPerformed
-+
-+    ::rtl::OUString sMethodName;
-+    ::rtl::OUString sTypeName;
-+    sal_Int32 nDelimPos = rEventMethod.indexOf( DELIM );
-+    if ( nDelimPos == -1 )
-+    {
-+        return false;
-+    }
-+    sMethodName = rEventMethod.copy( nDelimPos + DELIMLEN );
-+    sTypeName = rEventMethod.copy( 0, nDelimPos );
-+            
-+    EventInfoHash& infos = getEventTransInfo();
-+
-+    // Only create an ScriptEventDescriptor for an event we can translate
-+    // or emulate
-+    if ( sMethodName.getLength() 
-+         && sTypeName.getLength()
-+         && ( infos.find( sMethodName ) != infos.end() ) )
-+    {
-+        // just fill in CodeName, when the event fires the other 
-+	// info is gathered from the event source to determine what
-+	// event handler we try to call
-+        evtDesc.ScriptCode = sCodeName;
-+        evtDesc.ListenerType = sTypeName;
-+        evtDesc.EventMethod = sMethodName;
-+
-+        // set this it VBAInterop, ensures that it doesn't
-+        // get persisted or shown in property editors
-+        evtDesc.ScriptType = rtl::OUString::createFromAscii(
-+            "VBAInterop" );	
-+        return true;
-+    }
-+    return false;
-+
-+}
-+
-+ScriptEventHelper::ScriptEventHelper( const Reference< XInterface >& xControl ) : m_xControl( xControl )
-+{
-+    Reference < beans::XPropertySet > xProps(
-+        ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
-+    m_xCtx.set( xProps->getPropertyValue( rtl::OUString(
-+        RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), 
-+        uno::UNO_QUERY_THROW );
-+}
-+
-+Sequence< rtl::OUString > 
-+ScriptEventHelper::getEventListeners()
-+{
-+    Reference< lang::XMultiComponentFactory > xMFac( 
-+        m_xCtx->getServiceManager(), UNO_QUERY );
-+    std::list< rtl::OUString > eventMethods;
-+
-+    if ( xMFac.is() )
-+    {
-+        Reference< beans::XIntrospection > xIntrospection( 
-+            xMFac->createInstanceWithContext( rtl::OUString( 
-+                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.Introspection"  ) ), m_xCtx ), UNO_QUERY );
-+#if 0
-+        dumpListeners( xIntrospection, m_xControl );
-+        dumpListeners( xIntrospection, m_xControl->getModel() );
-+#endif 
-+        Reference< beans::XIntrospectionAccess > xIntrospectionAccess;
-+	if  ( xIntrospection.is() )
-+	{
-+            xIntrospectionAccess = xIntrospection->inspect( 
-+                makeAny( m_xControl ) );
-+            Sequence< Type > aControlListeners = 
-+                xIntrospectionAccess->getSupportedListeners();
-+            sal_Int32 nLength = aControlListeners.getLength();             
-+            for ( sal_Int32 i = 0; i< nLength; ++i )
-+            {
-+                Type& listType = aControlListeners[ i ];
-+                rtl::OUString sFullTypeName = listType.getTypeName();
-+                Sequence< ::rtl::OUString > sMeths = 
-+                    comphelper::getEventMethodsForType( listType );    
-+                sal_Int32 sMethLen = sMeths.getLength();
-+                for ( sal_Int32 j=0 ; j < sMethLen; ++j )
-+                {
-+                    rtl::OUString sEventMethod = sFullTypeName;
-+                    sEventMethod += DELIM;
-+                    sEventMethod += sMeths[ j ];
-+                    eventMethods.push_back( sEventMethod );
-+                }
-+            }
-+            
-+        }
-+    }
-+
-+    Sequence< rtl::OUString > sEventMethodNames( eventMethods.size() );
-+    std::list< rtl::OUString >::const_iterator it = eventMethods.begin();
-+    rtl::OUString* pDest = sEventMethodNames.getArray();
-+
-+    for ( ; it != eventMethods.end(); ++it, ++pDest )
-+        *pDest = *it;         
-+
-+    return sEventMethodNames;
-+}
-+
-+Sequence< ScriptEventDescriptor > 
-+ScriptEventHelper::createEvents( const rtl::OUString& sCodeName )
-+{
-+    Sequence< rtl::OUString > aControlListeners = getEventListeners();
-+    rtl::OUString* pSrc = aControlListeners.getArray();
-+    sal_Int32 nLength = aControlListeners.getLength();             
-+
-+    Sequence< ScriptEventDescriptor > aDest( nLength );
-+    sal_Int32 nEvts = 0; 
-+    for ( sal_Int32 i = 0; i< nLength; ++i, ++pSrc )
-+    {
-+        // from getListeners eventName is of form
-+        // "com.sun.star.awt.XActionListener::actionPerformed"
-+        // we need to strip "com.sun.star.awt." from that for form
-+        // controls
-+    	ScriptEventDescriptor evtDesc;
-+        if ( eventMethodToDescriptor( *pSrc, evtDesc, sCodeName ) )
-+        {
-+            sal_Int32 dIndex = nEvts;
-+            ++nEvts;
-+            if ( nEvts > aDest.getLength() )
-+                aDest.realloc( nEvts );// should never happen
-+            aDest[ dIndex ] = evtDesc;
-+        }
-+    }
-+    aDest.realloc( nEvts );
-+
-+    return aDest;
-+}
-+
-+
-+typedef ::cppu::WeakImplHelper1< container::XNameContainer > NameContainer_BASE;
-+
-+class ReadOnlyEventsNameContainer : public NameContainer_BASE
-+{
-+public:
-+    ReadOnlyEventsNameContainer( const Sequence< rtl::OUString >& eventMethods, const rtl::OUString& sCodeName );
-+    // XNameContainer
-+
-+    virtual void SAL_CALL insertByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, RuntimeException)
-+    {
-+        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
-+ 
-+    }
-+    virtual void SAL_CALL removeByName( const ::rtl::OUString& ) throw (::com::sun::star::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
-+    {
-+        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
-+    }
-+
-+    // XNameReplace
-+    virtual void SAL_CALL replaceByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
-+    {
-+        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
-+ 
-+    }
-+                                                                                
-+    // XNameAccess
-+    virtual Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException);
-+    virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (RuntimeException);
-+    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (RuntimeException);
-+
-+    // XElementAccess
-+    virtual Type SAL_CALL getElementType(  ) throw (RuntimeException)
-+    { return getCppuType(static_cast< const rtl::OUString * >(0) ); }
-+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException)
-+    { return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); }
-+private:
-+
-+typedef std::hash_map< rtl::OUString, Any, ::rtl::OUStringHash,
-+::std::equal_to< ::rtl::OUString > > EventSupplierHash;
-+
-+    EventSupplierHash m_hEvents;
-+};
-+
-+ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< rtl::OUString >& eventMethods, const rtl::OUString& sCodeName )
-+{
-+    const rtl::OUString* pSrc = eventMethods.getConstArray();
-+    sal_Int32 nLen = eventMethods.getLength();
-+    for ( sal_Int32 index = 0; index < nLen; ++index, ++pSrc )
-+    {
-+        Any aDesc;
-+        ScriptEventDescriptor evtDesc;
-+        if (  eventMethodToDescriptor( *pSrc, evtDesc, sCodeName ) )
-+        {
-+            aDesc <<= evtDesc; 
-+            m_hEvents[ *pSrc ] = aDesc;
-+        }
-+    }
-+}
-+
-+Any SAL_CALL 
-+ReadOnlyEventsNameContainer::getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException){
-+    EventSupplierHash::const_iterator it = m_hEvents.find( aName );
-+    if ( it == m_hEvents.end() )
-+        throw container::NoSuchElementException();
-+    return it->second;
-+}
-+
-+Sequence< ::rtl::OUString > SAL_CALL 
-+ReadOnlyEventsNameContainer::getElementNames(  ) throw (RuntimeException)
-+{
-+    Sequence< ::rtl::OUString > names(m_hEvents.size());
-+    rtl::OUString* pDest = names.getArray();
-+    EventSupplierHash::const_iterator it = m_hEvents.begin();
-+    EventSupplierHash::const_iterator it_end = m_hEvents.end();
-+    for ( sal_Int32 index = 0; it != it_end; ++index, ++pDest, ++it )
-+        *pDest = it->first;
-+    return names;
-+}
-+
-+sal_Bool SAL_CALL 
-+ReadOnlyEventsNameContainer::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException)
-+{
-+    EventSupplierHash::const_iterator it = m_hEvents.find( aName );
-+    if ( it == m_hEvents.end() )
-+        return sal_False;
-+    return sal_True;
-+}
-+
-+typedef ::cppu::WeakImplHelper1< XScriptEventsSupplier > EventsSupplier_BASE;
-+
-+class ReadOnlyEventsSupplier : public EventsSupplier_BASE
-+{
-+public:
-+    ReadOnlyEventsSupplier( const Sequence< ::rtl::OUString >& eventMethods, const rtl::OUString& sCodeName )
-+    { m_xNameContainer = new ReadOnlyEventsNameContainer( eventMethods, sCodeName ); }
-+    
-+    // XScriptEventSupplier
-+    virtual Reference< container::XNameContainer > SAL_CALL getEvents(  ) throw (RuntimeException){ return m_xNameContainer; }
-+private:
-+    Reference< container::XNameContainer > m_xNameContainer;
-+};
-+
-+typedef ::cppu::WeakImplHelper2< XScriptListener, lang::XInitialization > EventListener_BASE;
-+
-+#define EVENTLSTNR_PROPERTY_ID_MODEL         1
-+#define EVENTLSTNR_PROPERTY_MODEL            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) )
-+
-+class EventListener : public EventListener_BASE
-+    ,public ::comphelper::OMutexAndBroadcastHelper
-+    ,public ::comphelper::OPropertyContainer
-+    ,public ::comphelper::OPropertyArrayUsageHelper< EventListener >
-+
-+{
-+    
-+public:
-+    EventListener( const Reference< XComponentContext >& rxContext );
-+    // XEventListener
-+    virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( RuntimeException );
-+
-+    // XScriptListener
-+    virtual void SAL_CALL firing(const ScriptEvent& evt) throw(RuntimeException);
-+    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException);
-+    // XPropertySet
-+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException);    
-+    // XInitialization
-+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException);
-+    // XInterface
-+    DECLARE_XINTERFACE()
-+
-+    // XTypeProvider
-+    DECLARE_XTYPEPROVIDER()
-+    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
-+    {
-+        OPropertyContainer::setFastPropertyValue( nHandle, rValue );
-+	if ( nHandle == EVENTLSTNR_PROPERTY_ID_MODEL )
-+            setShellFromModel();
-+    }
-+
-+protected:
-+    // OPropertySetHelper
-+    virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(  );
-+
-+    // OPropertyArrayUsageHelper
-+    virtual ::cppu::IPropertyArrayHelper* createArrayHelper(  ) const;
-+
-+private:
-+    void setShellFromModel();
-+    void firing_Impl( const  ScriptEvent& evt, Any *pSyncRet=NULL ) throw( RuntimeException );
-+
-+    Reference< XComponentContext > m_xContext;
-+    Reference< frame::XModel > m_xModel;
-+    SfxObjectShell* mpShell;
-+    
-+};
-+
-+EventListener::EventListener( const Reference< XComponentContext >& rxContext ) :
-+OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), mpShell( 0 )
-+{
-+    registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL,
-+        beans::PropertyAttribute::TRANSIENT, &m_xModel, ::getCppuType( &m_xModel ) );
-+
-+}
-+
-+void
-+EventListener::setShellFromModel()
-+{
-+	// reset mpShell
-+	mpShell = 0;
-+	SfxObjectShell* pShell = SfxObjectShell::GetFirst();
-+	while ( m_xModel.is() && pShell )
-+	{
-+		if ( pShell->GetModel() == m_xModel )
-+		{
-+			mpShell = pShell;
-+			break;
-+		}
-+		pShell = SfxObjectShell::GetNext( *pShell );
-+	}    
-+}
-+
-+//XEventListener
-+void
-+EventListener::disposing(const lang::EventObject&)  throw( RuntimeException )
-+{
-+}
-+
-+//XScriptListener
-+
-+void SAL_CALL 
-+EventListener::firing(const ScriptEvent& evt) throw(RuntimeException)
-+{
-+    firing_Impl( evt );
-+}
-+
-+Any SAL_CALL 
-+EventListener::approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException)
-+{
-+    Any ret;
-+    firing_Impl( evt, &ret );
-+    return ret;
-+}
-+
-+// XInitialization
-+void SAL_CALL 
-+EventListener::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
-+{
-+    if ( aArguments.getLength() == 1 )
-+        aArguments[0] >>= m_xModel;
-+    OSL_TRACE("EventListener::initialize() args %d m_xModel %d", aArguments.getLength(), m_xModel.is() );
-+}
-+
-+// XInterface
-+
-+IMPLEMENT_FORWARD_XINTERFACE2( EventListener, EventListener_BASE, OPropertyContainer )
-+
-+// XTypeProvider
-+
-+IMPLEMENT_FORWARD_XTYPEPROVIDER2( EventListener, EventListener_BASE, OPropertyContainer )
-+
-+// OPropertySetHelper
-+
-+::cppu::IPropertyArrayHelper& 
-+EventListener::getInfoHelper(  )
-+{
-+    return *getArrayHelper();
-+}
-+
-+// OPropertyArrayUsageHelper
-+
-+::cppu::IPropertyArrayHelper* 
-+EventListener::createArrayHelper(  ) const
-+{
-+    Sequence< beans::Property > aProps;
-+    describeProperties( aProps );
-+    return new ::cppu::OPropertyArrayHelper( aProps );
-+}
-+
-+// XPropertySet
-+Reference< beans::XPropertySetInfo > 
-+EventListener::getPropertySetInfo(  ) throw (RuntimeException)
-+{
-+    Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
-+    return xInfo;
-+}
-+
-+
-+// EventListener
-+
-+void
-+EventListener::firing_Impl(const ScriptEvent& evt, Any* /*pRet*/ ) throw(RuntimeException)
-+{
-+	OSL_TRACE("EventListener::firing_Impl( FAKE VBA_EVENTS )");
-+    static const ::rtl::OUString vbaInterOp =
-+        ::rtl::OUString::createFromAscii("VBAInterop");
-+
-+    // let default handlers deal with non vba stuff
-+    if ( !evt.ScriptType.equals( vbaInterOp ) )
-+        return;
-+    lang::EventObject aEvent;
-+    evt.Arguments[ 0 ] >>= aEvent;
-+	OSL_TRACE("Argument[0] is  %s", rtl::OUStringToOString( comphelper::anyToString( evt.Arguments[0] ), RTL_TEXTENCODING_UTF8 ).getStr() );
-+	OSL_TRACE("Getting Control");
-+    uno::Reference< awt::XControl > xControl( aEvent.Source, uno::UNO_QUERY_THROW );
-+	OSL_TRACE("Getting properties");
-+    uno::Reference< beans::XPropertySet > xProps( xControl->getModel(), uno::UNO_QUERY_THROW );
-+
-+    rtl::OUString sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserForm") );
-+	OSL_TRACE("Getting Name");
-+
-+    uno::Reference< awt::XDialog > xDlg( aEvent.Source, uno::UNO_QUERY );
-+    if ( !xDlg.is() )
-+        xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= sName;
-+    //dumpEvent( evt );
-+    EventInfoHash& infos = getEventTransInfo();
-+    EventInfoHash::const_iterator eventInfo_it = infos.find( evt.MethodName );
-+    EventInfoHash::const_iterator it_end = infos.end();
-+    if ( eventInfo_it == it_end )
-+    {
-+        OSL_TRACE("Bogus event for %s",
-+            rtl::OUStringToOString( evt.ScriptType, RTL_TEXTENCODING_UTF8 ).getStr() );
-+        return;
-+    }
-+
-+    uno::Reference< script::provider::XScriptProviderSupplier > xSPS( m_xModel, uno::UNO_QUERY );
-+    uno::Reference< script::provider::XScriptProvider > xScriptProvider;
-+    if ( xSPS.is() )
-+        xScriptProvider =  xSPS->getScriptProvider();
-+    if ( xScriptProvider.is() && mpShell )
-+    {
-+        std::list< TranslateInfo > matchingMethods;
-+        std::list< TranslateInfo >::const_iterator txInfo =
-+            eventInfo_it->second.begin();
-+        std::list< TranslateInfo >::const_iterator txInfo_end = eventInfo_it->second.end();
-+        rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Standard.").concat( evt.ScriptCode ).concat( rtl::OUString::createFromAscii(".") );
-+       
-+        StarBASIC* pBasic = mpShell->GetBasic();
-+        SbModule* pModule = pBasic->FindModule( evt.ScriptCode );
-+        for ( ; pModule && txInfo != txInfo_end; ++txInfo )
-+        {
-+            // see if we have a match for the handlerextension
-+            // where ScriptCode is methodname_handlerextension 
-+            rtl::OUString sTemp = sName.concat( (*txInfo).sVBAName ); 
-+            
-+            OSL_TRACE("*** trying to invoke %s ",
-+                rtl::OUStringToOString( sTemp, RTL_TEXTENCODING_UTF8 ).getStr() );
-+            SbMethod* pMeth = static_cast< SbMethod* >( pModule->Find( sTemp, SbxCLASS_METHOD ) );
-+            if ( pMeth )
-+            {
-+                // !! translate arguments & emulate events where necessary 
-+                Sequence< Any > aArguments;
-+                if  ( (*txInfo).toVBA )
-+                    aArguments = (*txInfo).toVBA( evt.Arguments );
-+                else
-+                    aArguments = evt.Arguments;
-+                if ( aArguments.getLength() )
-+                {
-+                    // call basic event handlers for event
-+
-+                    static rtl::OUString part1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
-+                    static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document"); 
-+
-+                    // create script url
-+                    rtl::OUString url = part1 + sMacroLoc + sTemp + part2;
-+                 
-+                    OSL_TRACE("script url = %s",
-+                        rtl::OUStringToOString( url, 
-+                            RTL_TEXTENCODING_UTF8 ).getStr() );
-+                    Sequence< sal_Int16 > aOutArgsIndex;
-+                    Sequence< Any > aOutArgs;
-+                    try
-+                    {
-+                        uno::Reference< script::provider::XScript > xScript = xScriptProvider->getScript( url );
-+                        if ( xScript.is() )
-+                           xScript->invoke( aArguments, aOutArgsIndex, aOutArgs  );
-+                    }
-+                    catch ( uno::Exception& e )
-+                    {
-+                        OSL_TRACE("event script raised %s", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-+                    }
-+               } 
-+           }
-+       }
-+    }
-+}
-+
-+typedef ::cppu::WeakImplHelper1< XVBAToOOEventDescGen > VBAToOOEventDescGen_BASE;
-+
-+
-+class VBAToOOEventDescGen : public VBAToOOEventDescGen_BASE
-+{
-+public:
-+    VBAToOOEventDescGen( const Reference< XComponentContext >& rxContext );
-+
-+    // XVBAToOOEventDescGen
-+    virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const Reference< XInterface >& control, const rtl::OUString& sCodeName ) throw (RuntimeException);
-+    virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl,  const rtl::OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException);
-+private:
-+    Reference< XComponentContext > m_xContext;
-+  
-+};
-+
-+VBAToOOEventDescGen::VBAToOOEventDescGen( const Reference< XComponentContext >& rxContext ):m_xContext( rxContext ) {}
-+
-+Sequence< ScriptEventDescriptor > SAL_CALL 
-+VBAToOOEventDescGen::getEventDescriptions( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName ) throw (RuntimeException)
-+{
-+    ScriptEventHelper evntHelper( xControl ); 
-+    return evntHelper.createEvents( sCodeName ); 
-+}
-+
-+Reference< XScriptEventsSupplier > SAL_CALL 
-+VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName  ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    ScriptEventHelper evntHelper( xControl ); 
-+    Reference< XScriptEventsSupplier > xSupplier = 
-+        new ReadOnlyEventsSupplier( 
-+            evntHelper.getEventListeners(), sCodeName ) ;
-+    return xSupplier;
-+}
-+
-+// Component related 
-+
-+namespace evtlstner
-+{
-+    ::rtl::OUString SAL_CALL getImplementationName()
-+    {
-+        static ::rtl::OUString* pImplName = 0;
-+        if ( !pImplName )
-+        {
-+            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-+            if ( !pImplName )
-+            {
-+                static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.EventListener" ) );
-+                pImplName = &aImplName;
-+            }
-+        }
-+        return *pImplName;
-+    }
-+
-+    uno::Reference< XInterface > SAL_CALL create(
-+    Reference< XComponentContext > const & xContext )
-+    SAL_THROW( () )
-+    {
-+        return static_cast< lang::XTypeProvider * >( new EventListener( xContext ) );
-+    }
-+
-+    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
-+    {
-+        const ::rtl::OUString strName( ::evtlstner::getImplementationName() );
-+        return Sequence< ::rtl::OUString >( &strName, 1 );
-+    }	
-+}
-+namespace ooevtdescgen 
-+{
-+    ::rtl::OUString SAL_CALL getImplementationName()
-+    {
-+        static ::rtl::OUString* pImplName = 0;
-+        if ( !pImplName )
-+        {
-+            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-+            if ( !pImplName )
-+            {
-+                static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAToOOEventDesc" ) );
-+                pImplName = &aImplName;
-+            }
-+        }
-+        return *pImplName;
-+    }
-+
-+    uno::Reference< XInterface > SAL_CALL create(
-+        Reference< XComponentContext > const & xContext )
-+        SAL_THROW( () )
-+    {
-+        return static_cast< lang::XTypeProvider * >( new VBAToOOEventDescGen( xContext ) );
-+    }
-+
-+    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
-+    {
-+    	const ::rtl::OUString strName( ::ooevtdescgen::getImplementationName() );
-+        return Sequence< ::rtl::OUString >( &strName, 1 );
-+    }	
-+}
---- scripting/source/vbaevents/makefile.mk.old	1970-01-01 00:00:00.000000000 +0000
-+++ scripting/source/vbaevents/makefile.mk	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,58 @@
-+PRJ=..$/..
-+
-+PRJNAME=vbaevents
-+TARGET=vbaevents
-+.IF "$(ENABLE_VBA)"!="YES"
-+dummy:
-+        @echo "not building vbaevents..."
-+.ENDIF
-+
-+NO_BSYMBOLIC=	TRUE
-+ENABLE_EXCEPTIONS=TRUE
-+COMP1TYPELIST=$(TARGET)
-+COMPRDB=$(SOLARBINDIR)$/types.rdb
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+DLLPRE =
-+
-+# ------------------------------------------------------------------
-+
-+ALLTAR : \
-+        $(MISC)$/$(TARGET).don \
-+        $(SLOTARGET)
-+
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+        echo $@
-+# ------------------------------------------------------------------
-+
-+#.INCLUDE :  ..$/cppumaker.mk
-+
-+SLOFILES= \
-+		$(SLO)$/service.obj \
-+		$(SLO)$/eventhelper.obj
-+
-+SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
-+SHL1IMPLIB=     i$(TARGET)
-+
-+SHL1VERSIONMAP=$(TARGET).map
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+DEF1NAME=$(SHL1TARGET)
-+                                                                              
-+SHL1STDLIBS= \
-+                $(CPPUHELPERLIB) \
-+		$(BASICLIB) \
-+		$(COMPHELPERLIB) \
-+		$(SFXLIB) \
-+                $(CPPULIB) \
-+                $(TOOLSLIB) \
-+                $(SALLIB)
-+                                                                              
-+SHL1DEPN=
-+SHL1LIBS=$(SLB)$/$(TARGET).lib
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :	target.mk
---- scripting/source/vbaevents/service.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ scripting/source/vbaevents/service.cxx	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,99 @@
-+#include "cppuhelper/implementationentry.hxx"
-+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-+#include "com/sun/star/registry/XRegistryKey.hpp"
-+
-+// =============================================================================
-+// component exports
-+// =============================================================================
-+using namespace ::com::sun::star;
-+using namespace ::com::sun::star::uno;
-+
-+namespace evtlstner
-+{
-+    // =============================================================================
-+    // component operations
-+    // =============================================================================
-+
-+    uno::Reference< XInterface > SAL_CALL create(
-+        Reference< XComponentContext > const & xContext )
-+        SAL_THROW( () );
-+
-+    // -----------------------------------------------------------------------------
-+
-+    ::rtl::OUString SAL_CALL getImplementationName();
-+
-+    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames();
-+
-+    Reference<XInterface> SAL_CALL create(
-+        Sequence<Any> const &, Reference<XComponentContext> const & );
-+} // end evtlstner
-+
-+namespace ooevtdescgen
-+{
-+    // =============================================================================
-+    // component operations
-+    // =============================================================================
-+
-+    uno::Reference< XInterface > SAL_CALL create(
-+        Reference< XComponentContext > const & xContext )
-+        SAL_THROW( () );
-+
-+    // -----------------------------------------------------------------------------
-+
-+    ::rtl::OUString SAL_CALL getImplementationName();
-+
-+    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames();
-+
-+    Reference<XInterface> SAL_CALL create(
-+        Sequence<Any> const &, Reference<XComponentContext> const & );
-+} // end ooevtdescgen
-+
-+
-+
-+    // =============================================================================
-+
-+    const ::cppu::ImplementationEntry s_component_entries [] =
-+    {
-+        {
-+            ::evtlstner::create, ::evtlstner::getImplementationName,
-+            ::evtlstner::getSupportedServiceNames, 
-+            ::cppu::createSingleComponentFactory,
-+            0, 0
-+        },
-+        {
-+            ::ooevtdescgen::create, ::ooevtdescgen::getImplementationName,
-+            ::ooevtdescgen::getSupportedServiceNames, 
-+            ::cppu::createSingleComponentFactory,
-+            0, 0
-+        },
-+        { 0, 0, 0, 0, 0, 0 }
-+    };
-+
-+extern "C"
-+{
-+    void SAL_CALL component_getImplementationEnvironment( 
-+        const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-+    {
-+        OSL_TRACE("In component_getImplementationEnv");
-+        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-+    }
-+
-+    sal_Bool SAL_CALL component_writeInfo( 
-+        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
-+    {
-+        OSL_TRACE("In component_writeInfo");
-+        if ( ::cppu::component_writeInfoHelper(
-+            pServiceManager, pRegistryKey, s_component_entries ) )
-+            return sal_True;
-+        return sal_False;
-+    }
-+
-+    void * SAL_CALL component_getFactory( 
-+        const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
-+        registry::XRegistryKey * pRegistryKey )
-+    {
-+        OSL_TRACE("In component_getFactory");
-+        return ::cppu::component_getFactoryHelper( 
-+            pImplName, pServiceManager, pRegistryKey, s_component_entries );
-+    }
-+}
---- scripting/source/vbaevents/vbaevents.map.old	1970-01-01 00:00:00.000000000 +0000
-+++ scripting/source/vbaevents/vbaevents.map	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,9 @@
-+OOO_1.1 {
-+	global:
-+		component_getImplementationEnvironment;
-+		component_getFactory;
-+		component_writeInfo;
-+
-+	local:
-+		*;
-+};
---- scripting/source/vbaevents/vbaevents.xml.old	1970-01-01 00:00:00.000000000 +0000
-+++ scripting/source/vbaevents/vbaevents.xml	2009-04-06 16:41:59.000000000 +0000
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+    <module-name>vbaevents</module-name>
-+    
-+    <component-description>
-+        <author>Noel Power </author>
-+        <name>ooo.vba.EventListener</name>
-+        <description>Event listener to handle ooo events and to translate them to calls to basic macros ala Button_Click etc.</description>
-+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-+        <language>c++</language>
-+        <status value="drafts"/>
-+        <supported-service>ooo.vba.EventListener</supported-service>
-+        <type>com.sun.star.uno.XComponentContext</type>        
-+    </component-description>
-+    
-+    <project-build-dependency>cppuhelper</project-build-dependency>
-+    <project-build-dependency>cppu</project-build-dependency>
-+    <project-build-dependency>sal</project-build-dependency>
-+
-+    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-+    <runtime-module-dependency>cppu3</runtime-module-dependency>
-+    <runtime-module-dependency>sal3</runtime-module-dependency>
-+    
-+</module-description>
---- svx/source/form/fmtools.cxx
-+++ svx/source/form/fmtools.cxx
-@@ -105,7 +105,7 @@
- #include <comphelper/extract.hxx>
- #include <comphelper/uno3.hxx>
- #include <connectivity/dbexception.hxx>
--#include <comphelper/extract.hxx>
-+#include <comphelper/evtmethodhelper.hxx>
- #include <cppuhelper/typeprovider.hxx>
- #include <algorithm>
- #include <rtl/logfile.hxx>
-@@ -719,37 +720,6 @@ sal_Int16 getControlTypeByObject(const R
- 	return ::rtl::OUString();
- }
- //------------------------------------------------------------------------------
--Sequence< ::rtl::OUString> getEventMethods(const Type& type)
--{
--    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getEventMethods" );
--	typelib_InterfaceTypeDescription *pType=0;
--	type.getDescription( (typelib_TypeDescription**)&pType);
--
--	if(!pType)
--		return Sequence< ::rtl::OUString>();
--
--	Sequence< ::rtl::OUString> aNames(pType->nMembers);
--	::rtl::OUString* pNames = aNames.getArray();
--	for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames)
--	{
--		// the decription reference
--		typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i];
--		// the description for the reference
--		typelib_TypeDescription* pMemberDescription = NULL;
--		typelib_typedescriptionreference_getDescription(&pMemberDescription, pMemberDescriptionReference);
--		if (pMemberDescription)
--		{
--			typelib_InterfaceMemberTypeDescription* pRealMemberDescription =
--				reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription);
--			*pNames = pRealMemberDescription->pMemberName;
--		}
--	}
--	typelib_typedescription_release( (typelib_TypeDescription *)pType );
--	return aNames;
--}
--
--
--//------------------------------------------------------------------------------
- void TransferEventScripts(const Reference< ::com::sun::star::awt::XControlModel>& xModel, const Reference< ::com::sun::star::awt::XControl>& xControl,
- 	const Sequence< ::com::sun::star::script::ScriptEventDescriptor>& rTransferIfAvailable)
- {
-@@ -821,7 +792,8 @@ void TransferEventScripts(const Referenc
- 					continue;
- 
- 				// now check the methods
--				Sequence< ::rtl::OUString> aMethodsNames = getEventMethods(*pCurrentListeners);
-+				Sequence< ::rtl::OUString> aMethodsNames = ::comphelper::getEventMethodsForType(*pCurrentListeners);
-+
- 				const ::rtl::OUString* pMethodsNames = aMethodsNames.getConstArray();
- 				for (k=0; k<aMethodsNames.getLength(); ++k, ++pMethodsNames)
- 				{
diff --git a/applied_patches/0286-buildfix-use-climaker-in-unoil.diff b/applied_patches/0321-buildfix-use-climaker-in-unoil.diff
similarity index 100%
rename from applied_patches/0286-buildfix-use-climaker-in-unoil.diff
rename to applied_patches/0321-buildfix-use-climaker-in-unoil.diff
diff --git a/applied_patches/0321-vba-workbook-worksheet-events.diff b/applied_patches/0321-vba-workbook-worksheet-events.diff
deleted file mode 100644
index fd8dd2bf3..000000000
--- a/applied_patches/0321-vba-workbook-worksheet-events.diff
+++ /dev/null
@@ -1,2227 +0,0 @@
---- offapi/com/sun/star/document/VbaEventId.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ offapi/com/sun/star/document/VbaEventId.idl	2009-04-06 16:42:00.000000000 +0000
-@@ -0,0 +1,82 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __org_openoffice_vba_VbaEventId_idl__
-+#define __org_openoffice_vba_VbaEventId_idl__
-+
-+//=============================================================================
-+
-+module com {  module sun {  module star { module document {
-+//=============================================================================
-+
-+/* VBA compatibility event id */
-+constants VbaEventId
-+{
-+    // Worksheet
-+    const long VBAEVENT_WORKSHEET_ACTIVATE                  	= 1;
-+    const long VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK         	= 2;
-+    const long VBAEVENT_WORKSHEET_BEFORERIGHTCLICK          	= 3;
-+    const long VBAEVENT_WORKSHEET_CALCULATE                 	= 4;
-+    const long VBAEVENT_WORKSHEET_CHANGE                    	= 5;
-+    const long VBAEVENT_WORKSHEET_DEACTIVATE                	= 6;
-+    const long VBAEVENT_WORKSHEET_FOLLOWHYPERLINK           	= 7;
-+    const long VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE          	= 8;
-+    const long VBAEVENT_WORKSHEET_SELECTIONCHANGE           	= 9;
-+    // Workbook
-+    const long VBAEVENT_WORKBOOK_ACTIVATE            			= 20;
-+    const long VBAEVENT_WORKBOOK_DEACTIVATE          			= 21;
-+    const long VBAEVENT_WORKBOOK_OPEN                			= 22;
-+    const long VBAEVENT_WORKBOOK_AUTOOPEN            			= 23;
-+    const long VBAEVENT_WORKBOOK_BEFORECLOSE         			= 24;
-+    const long VBAEVENT_WORKBOOK_BEFOREPRINT         			= 25;
-+    const long VBAEVENT_WORKBOOK_BEFORESAVE          			= 26;
-+    const long VBAEVENT_WORKBOOK_NEWSHEET            			= 27;
-+    const long VBAEVENT_WORKBOOK_WINDOWACTIVATE      			= 28;
-+    const long VBAEVENT_WORKBOOK_WINDOWDEACTIVATE    			= 29;
-+    const long VBAEVENT_WORKBOOK_WINDOWRESIZE        			= 30;
-+    // Workbook_sheet
-+    const long VBAEVENT_WORKBOOK_SHEET_ACTIVATE               	= 51;
-+    const long VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK      	= 52;
-+    const long VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK       	= 53;
-+    const long VBAEVENT_WORKBOOK_SHEET_CALCULATE              	= 54;
-+    const long VBAEVENT_WORKBOOK_SHEET_CHANGE                 	= 55;
-+    const long VBAEVENT_WORKBOOK_SHEET_DEACTIVATE             	= 56;
-+    const long VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK        	= 57;
-+    const long VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE       	= 58;
-+    const long VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE        	= 59;
-+};
-+
-+}; }; }; };
-+
-+#endif
---- offapi/com/sun/star/document/XVbaEventsHelper.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ offapi/com/sun/star/document/XVbaEventsHelper.idl	2009-04-06 16:42:00.000000000 +0000
-@@ -0,0 +1,60 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __org_openoffice_vba_XVbaEventsHelper_idl__
-+#define __org_openoffice_vba_XVbaEventsHelper_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+//=============================================================================
-+
-+module com {  module sun {  module star {  module document {
-+//=============================================================================
-+
-+interface XVbaEventsHelper
-+{
-+    /**
-+        Execute VBA compatible event.
-+        VbaEvent: Compatible VBA event id.
-+        aArgs: the array of input arguments.
-+        return: True if execute successfully, or False.
-+    **/
-+    boolean ProcessCompatibleVbaEvent( [in] long nEventId, [in] sequence< any > aArgs );
-+    [attribute ] boolean IgnoreEvents;
-+};
-+
-+}; }; }; };
-+
-+#endif
---- offapi/com/sun/star/document/VbaEventsHelper.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ offapi/com/sun/star/document/VbaEventsHelper.idl	2009-04-06 16:42:00.000000000 +0000
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __org_openoffice_vba_VbaEventsHelper_idl__
-+#define __org_openoffice_vba_VbaEventsHelper_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+#include <com/sun/star/frame/XModel.idl>
-+#include <com/sun/star/document/XVbaEventsHelper.idl>
-+//=============================================================================
-+
-+module com {  module sun {  module star { module document {
-+//=============================================================================
-+
-+service VbaEventsHelper : XVbaEventsHelper
-+{
-+  	createVbaEventsHelper(  [in] ::com::sun::star::frame::XModel xModel );
-+};
-+
-+}; }; }; };
-+
-+#endif
---- offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl	2009-04-06 16:42:00.000000000 +0000
-@@ -0,0 +1,53 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XVbaEventHelper.idl,v $
-+ * $Revision: 1.0 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __com_sun_star_document_XDocumentEventCompatibleHelper_idl__
-+#define __com_sun_star_document_XDocumentEventCompatibleHelper_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+//=============================================================================
-+
-+module com {   module sun {   module star {   module document {
-+
-+//=============================================================================
-+interface XDocumentEventCompatibleHelper
-+{
-+    /* Execute some compatible VBA event related to document, such as document save, document print.
-+       nEventId: event id.
-+    */
-+    boolean processCompatibleEvent( [in] short nEventId );
-+};
-+
-+//=============================================================================
-+
-+}; }; }; };
-+
-+#endif
---- offapi/com/sun/star/document/makefile.mk.old	2009-04-06 16:41:59.000000000 +0000
-+++ offapi/com/sun/star/document/makefile.mk	2009-04-06 16:42:00.000000000 +0000
-@@ -117,6 +117,10 @@ IDLFILES=\
-     DocumentRevisionListPersistence.idl \
-     XDocumentLanguages.idl \
-     XCodeNameQuery.idl \
-+    XDocumentEventCompatibleHelper.idl \
-+    VbaEventId.idl \
-+    XVbaEventsHelper.idl \
-+    VbaEventsHelper.idl \
- 
- 
- # ------------------------------------------------------------------
---- sc/source/ui/vba/vbaeventshelper.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sc/source/ui/vba/vbaeventshelper.hxx	2009-04-06 16:42:00.000000000 +0000
-@@ -0,0 +1,83 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: vbaeventshelper.hxx,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: vg $ $Date: 2007/12/07 10:42:26 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef SC_VBAEVENTS_HXX
-+#define SC_VBAEVENTS_HXX
-+
-+#include "document.hxx"
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/document/VbaEventId.hpp>
-+#include <com/sun/star/document/XVbaEventsHelper.hpp>
-+#include "vbahelper.hxx"
-+
-+#define INVALID_TAB -1
-+
-+typedef ::cppu::WeakImplHelper1< com::sun::star::document::XVbaEventsHelper > VBAWorkbookEvent_BASE;
-+
-+class VbaEventsListener;
-+class ScVbaEventsHelper : public VBAWorkbookEvent_BASE
-+{
-+private:
-+	ScDocument* pDoc;
-+    css::uno::Reference< css::uno::XComponentContext > m_xContext;
-+    VbaEventsListener* mpVbaEventsListener;
-+    sal_Bool mbOpened;
-+    sal_Bool mbIgnoreEvents;
-+
-+	String getSheetModuleName( SCTAB nTab );
-+	String workbookMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
-+	css::uno::Any createWorkSheet( SfxObjectShell* pShell, SCTAB nTab );
-+	css::uno::Any createRange( const css::uno::Any& aRange );
-+	css::uno::Any createHyperlink( const css::uno::Any& rCell );
-+	css::uno::Any createWindow( SfxObjectShell* pShell );
-+	sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, css::uno::Sequence< css::uno::Any >& aArgs, css::uno::Any& aRet );
-+    SCTAB getTabFromArgs( const css::uno::Sequence< css::uno::Any > aArgs, const sal_Int32 nPos = 0 );
-+    rtl::OUString getEventName( const sal_Int32 nEventId );
-+    rtl::OUString getMacroPath( const sal_Int32 nEventId, const SCTAB nTab = INVALID_TAB );
-+    sal_Bool processVbaEvent( const sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs, const SCTAB nTab = INVALID_TAB );
-+
-+public:
-+	ScVbaEventsHelper( ScDocument* pDocument ):pDoc( pDocument ), mpVbaEventsListener( NULL ), mbOpened( sal_False ){};
-+    ScVbaEventsHelper( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
-+    ~ScVbaEventsHelper();
-+	ScDocument* getDocument() { return pDoc; };
-+    // XVBAWorkbookEventHelper
-+    virtual sal_Bool SAL_CALL ProcessCompatibleVbaEvent( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setIgnoreEvents( ::sal_Bool _ignoreevents ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getIgnoreEvents() throw (css::uno::RuntimeException);
-+};
-+
-+#endif
-+
---- sc/source/ui/vba/vbaeventshelper.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sc/source/ui/vba/vbaeventshelper.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -0,0 +1,1066 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: vbaeventshelper.cxx,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: vg $ $Date: 2007/12/07 10:42:26 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbaeventshelper.hxx"
-+#include "helperdecl.hxx"
-+#include <sfx2/objsh.hxx> 
-+#include <basic/basmgr.hxx>
-+#include <basic/sbmod.hxx>
-+#include <basic/sbmeth.hxx>
-+#include <basic/sbx.hxx>
-+#include "scextopt.hxx"
-+#include <sfx2/evntconf.hxx>
-+#include <sfx2/event.hxx>
-+#include <sfx2/sfx.hrc>
-+#include <toolkit/unohlp.hxx>
-+#include <comphelper/processfactory.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
-+#include <com/sun/star/document/XEventsSupplier.hpp>
-+#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
-+#include <com/sun/star/table/XCell.hpp> 
-+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-+#include <com/sun/star/sheet/XSpreadsheet.hpp>
-+#include <com/sun/star/container/XNamed.hpp>
-+#include <com/sun/star/awt/XWindowListener.hpp>
-+#include <com/sun/star/awt/WindowEvent.hpp>
-+#include <com/sun/star/lang/EventObject.hpp>
-+#include <com/sun/star/util/XCloseListener.hpp>
-+#include <com/sun/star/util/XCloseBroadcaster.hpp>
-+#include <com/sun/star/frame/XControllerBorder.hpp>
-+#include <com/sun/star/frame/XBorderResizeListener.hpp>
-+#include "cellsuno.hxx" 
-+
-+#include <map>
-+
-+using namespace std;
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+using namespace com::sun::star::document::VbaEventId;
-+
-+const static String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
-+
-+const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
-+const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
-+const static rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document"); 
-+
-+
-+typedef ::cppu::WeakImplHelper3< awt::XWindowListener, util::XCloseListener, frame::XBorderResizeListener > WindowListener_BASE;
-+
-+// This class is to process Workbook window related event
-+class VbaEventsListener : public WindowListener_BASE
-+{
-+    ScVbaEventsHelper* pVbaEventsHelper;
-+    uno::Reference< frame::XModel > m_xModel;
-+    sal_Bool m_bPrepare;
-+    sal_Bool m_bWindowResized;
-+    sal_Bool m_bBorderChanged;
-+protected :
-+    uno::Reference< awt::XWindow > GetContainerWindow();
-+    uno::Reference< frame::XFrame > GetFrame();
-+    sal_Bool IsMouseReleased();
-+    DECL_LINK( fireResizeMacro, Timer* );
-+    void processWindowResizeMacro();
-+public :
-+    VbaEventsListener( ScVbaEventsHelper* pHelper );
-+    void startEventsLinstener();
-+    void stopEventsLinstener();
-+    // XWindowListener
-+    virtual void SAL_CALL windowResized( const awt::WindowEvent& aEvent ) throw ( uno::RuntimeException );
-+    virtual void SAL_CALL windowMoved( const awt::WindowEvent& aEvent ) throw ( uno::RuntimeException );
-+    virtual void SAL_CALL windowShown( const lang::EventObject& aEvent ) throw ( uno::RuntimeException );
-+    virtual void SAL_CALL windowHidden( const lang::EventObject& aEvent ) throw ( uno::RuntimeException );
-+    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException );
-+    // XCloseListener
-+    virtual void SAL_CALL queryClosing( const lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException);
-+    virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException);
-+    // XBorderResizeListener
-+    virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& aObject, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException);
-+};
-+VbaEventsListener::VbaEventsListener( ScVbaEventsHelper* pHelper ) : pVbaEventsHelper( pHelper )
-+{
-+    m_xModel.set( pVbaEventsHelper->getDocument()->GetDocumentShell()->GetModel(), uno::UNO_QUERY );
-+    m_bPrepare = sal_False;
-+    m_bWindowResized = sal_False;
-+    m_bBorderChanged = sal_False;
-+}
-+uno::Reference< frame::XFrame > 
-+VbaEventsListener::GetFrame()
-+{
-+    try
-+    {
-+        if( pVbaEventsHelper )
-+        {
-+            if( m_xModel.is() )
-+            {
-+                uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY );
-+                if( xController.is() )
-+                {
-+                    uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_QUERY );
-+                    if( xFrame.is() )
-+                    {
-+                            return xFrame;
-+                    }
-+                }
-+            }
-+        }
-+    }
-+	catch( uno::Exception& /*e*/ )
-+    {
-+    }
-+    return uno::Reference< frame::XFrame >();
-+}
-+uno::Reference< awt::XWindow > 
-+VbaEventsListener::GetContainerWindow() 
-+{
-+    try
-+    {
-+        uno::Reference< frame::XFrame > xFrame( GetFrame(), uno::UNO_QUERY );
-+        if( xFrame.is() )
-+        {
-+            uno::Reference< awt::XWindow > xWindow( xFrame->getContainerWindow(), uno::UNO_QUERY );
-+            if( xWindow.is() )
-+                return xWindow;
-+        }
-+    }
-+	catch( uno::Exception& /*e*/ )
-+    {
-+    }
-+    return uno::Reference< awt::XWindow >();
-+}
-+sal_Bool
-+VbaEventsListener::IsMouseReleased()
-+{
-+    Window* pWindow = (VCLUnoHelper::GetWindow(  GetContainerWindow() ) );
-+    if( pWindow )
-+    {
-+        Window::PointerState aPointerState = pWindow->GetPointerState();
-+        if( !aPointerState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) )
-+            return sal_True; 
-+    }
-+    return sal_False;
-+}
-+void
-+VbaEventsListener::startEventsLinstener()
-+{
-+    if( m_xModel.is() )
-+    {
-+        // add window listener
-+        uno::Reference< awt::XWindow > xWindow( GetContainerWindow(), uno::UNO_QUERY );
-+        if( xWindow.is() )
-+            xWindow->addWindowListener( this );
-+        // add close listener
-+        //uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( GetFrame(), uno::UNO_QUERY );
-+        uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xModel, uno::UNO_QUERY );
-+        if( xCloseBroadcaster.is() )
-+        {
-+            xCloseBroadcaster->addCloseListener( this );
-+        }
-+        // add Border resize listener
-+        uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY );
-+        if( xController.is() )
-+        {
-+            uno::Reference< frame::XControllerBorder > xControllerBorder( xController, uno::UNO_QUERY );
-+            if( xControllerBorder.is() )
-+            {
-+                xControllerBorder->addBorderResizeListener( this );
-+            }
-+        }
-+    }
-+}
-+void
-+VbaEventsListener::stopEventsLinstener()
-+{
-+    if( m_xModel.is() )
-+    {
-+        uno::Reference< awt::XWindow > xWindow( GetContainerWindow(), uno::UNO_QUERY );
-+        if( xWindow.is() )
-+        {
-+            xWindow->removeWindowListener( this );
-+        }
-+        //uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( GetFrame(), uno::UNO_QUERY );
-+        uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xModel, uno::UNO_QUERY );
-+        if( xCloseBroadcaster.is() )
-+        {
-+            xCloseBroadcaster->removeCloseListener( this );
-+        }
-+        uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY );
-+        if( xController.is() )
-+        {
-+            uno::Reference< frame::XControllerBorder > xControllerBorder( xController, uno::UNO_QUERY );
-+            if( xControllerBorder.is() )
-+            {
-+                xControllerBorder->removeBorderResizeListener( this );
-+            }
-+        }
-+        pVbaEventsHelper = NULL;
-+    }
-+}
-+void
-+VbaEventsListener::processWindowResizeMacro()
-+{
-+    if( pVbaEventsHelper )
-+        pVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWRESIZE, uno::Sequence< uno::Any >() );
-+}
-+IMPL_LINK( VbaEventsListener, fireResizeMacro, Timer*, pTimer )
-+{
-+    if( pVbaEventsHelper && m_bPrepare && pTimer )
-+    {
-+        if( IsMouseReleased() )
-+        {
-+            pTimer->Stop();
-+            delete pTimer;
-+            pTimer = 0;
-+            m_bPrepare = sal_False;
-+            processWindowResizeMacro();
-+        }
-+    }
-+    return 0;
-+}
-+void SAL_CALL
-+VbaEventsListener::windowResized(  const awt::WindowEvent& /*aEvent*/ ) throw ( uno::RuntimeException )
-+{
-+    // Workbook_window_resize event
-+    OSL_TRACE("VbaEventsListener::windowResized");
-+    m_bWindowResized = sal_True;
-+    Window* pWindow = (VCLUnoHelper::GetWindow(  GetContainerWindow() ) );
-+    if( pWindow && !m_bPrepare && m_bBorderChanged )
-+    {
-+        m_bPrepare = sal_True;
-+        m_bBorderChanged = m_bWindowResized = sal_False;
-+        AutoTimer* pTimer = new AutoTimer();
-+        pTimer->SetTimeoutHdl( LINK( this, VbaEventsListener, fireResizeMacro ) );
-+        pTimer->Start();
-+    }
-+}
-+void SAL_CALL
-+VbaEventsListener::windowMoved(  const awt::WindowEvent& /*aEvent*/ ) throw ( uno::RuntimeException )
-+{
-+    // not interest this time
-+}
-+void SAL_CALL
-+VbaEventsListener::windowShown(  const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
-+{
-+    // not interest this time
-+}
-+void SAL_CALL
-+VbaEventsListener::windowHidden(  const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
-+{
-+    // not interest this time
-+}
-+void SAL_CALL
-+VbaEventsListener::disposing(  const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
-+{
-+    pVbaEventsHelper = NULL;
-+}
-+void SAL_CALL 
-+VbaEventsListener::queryClosing( const lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException)
-+{
-+     // it can cancel the close, but need to throw a CloseVetoException, and it will be transmit to caller.
-+}
-+void SAL_CALL 
-+VbaEventsListener::notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException)
-+{
-+    OSL_TRACE("VbaEventsListener::notifyClosing");
-+    stopEventsLinstener();
-+}
-+void SAL_CALL 
-+VbaEventsListener::borderWidthsChanged( const uno::Reference< uno::XInterface >& aObject, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException)
-+{
-+    // work with WindowResized event to guard Window Resize event.
-+    OSL_TRACE("VbaEventsListener::borderWidthsChanged");
-+    m_bBorderChanged = sal_True;
-+    Window* pWindow = (VCLUnoHelper::GetWindow(  GetContainerWindow() ) );
-+    if( pWindow && !m_bPrepare && m_bWindowResized )
-+    {
-+        m_bPrepare = sal_True;
-+        m_bWindowResized = m_bBorderChanged = sal_False;
-+        AutoTimer* pTimer = new AutoTimer();
-+        pTimer->SetTimeoutHdl( LINK( this, VbaEventsListener, fireResizeMacro ) );
-+        pTimer->Start();
-+    }
-+}
-+
-+class ImplVbaEventNameInfo
-+{
-+private:
-+    map< sal_Int32, rtl::OUString > m_aEventNameMap;
-+
-+protected:
-+    static ImplVbaEventNameInfo* pImplVbaEventNameInfo;
-+    ImplVbaEventNameInfo() { InitImplVbaEventNameInfo(); }
-+private:
-+    void insert( const sal_Int32 nId, const rtl::OUString sEventName )
-+    {
-+        m_aEventNameMap.insert( make_pair( nId, sEventName ) );
-+    }
-+    void InitImplVbaEventNameInfo();
-+public:
-+    virtual ~ImplVbaEventNameInfo();
-+    rtl::OUString getEventName( const sal_Int32 nId )
-+    {
-+        map< sal_Int32, rtl::OUString >::iterator iter = m_aEventNameMap.find( nId );
-+        if( iter != m_aEventNameMap.end() )
-+            return iter->second;
-+        return rtl::OUString();
-+    }
-+    static ImplVbaEventNameInfo* GetImplVbaEventNameInfo();
-+};
-+ImplVbaEventNameInfo* ImplVbaEventNameInfo::pImplVbaEventNameInfo = NULL;
-+
-+ImplVbaEventNameInfo::~ImplVbaEventNameInfo()
-+{
-+    if( pImplVbaEventNameInfo )
-+    {
-+        delete pImplVbaEventNameInfo;
-+        pImplVbaEventNameInfo = NULL;
-+    }
-+}
-+
-+ImplVbaEventNameInfo* 
-+ImplVbaEventNameInfo::GetImplVbaEventNameInfo()
-+{
-+    if( !pImplVbaEventNameInfo )
-+    {
-+        pImplVbaEventNameInfo = new ImplVbaEventNameInfo;
-+    }
-+    return pImplVbaEventNameInfo;
-+}
-+
-+#define CREATEOUSTRING(asciistr) rtl::OUString::createFromAscii(asciistr)
-+
-+#define INSERT_EVENT_INFO( Object, Event, ObjectName, EventName ) \
-+        insert( VBAEVENT_##Object##_##Event, ObjectName + CREATEOUSTRING( EventName ) )
-+
-+#define INSERT_WORKSHEET_EVENT_INFO( Event, EventName ) \
-+        INSERT_EVENT_INFO( WORKSHEET, Event,CREATEOUSTRING("Worksheet_"), EventName ); \
-+        INSERT_EVENT_INFO( WORKBOOK_SHEET, Event, CREATEOUSTRING("Workbook_Sheet"), EventName )
-+
-+#define INSERT_WORKBOOK_EVENT_INFO( Event, EventName ) \
-+        INSERT_EVENT_INFO(  WORKBOOK, Event, CREATEOUSTRING("Workbook_"), EventName )
-+
-+void ImplVbaEventNameInfo::InitImplVbaEventNameInfo()
-+{
-+    INSERT_WORKSHEET_EVENT_INFO( ACTIVATE, "Activate");
-+    INSERT_WORKSHEET_EVENT_INFO( BEFOREDOUBLECLICK, "BeforeDoubleClick" );
-+    INSERT_WORKSHEET_EVENT_INFO( BEFORERIGHTCLICK, "BeforeRightClick" );
-+    INSERT_WORKSHEET_EVENT_INFO( CALCULATE, "Calculate" );
-+    INSERT_WORKSHEET_EVENT_INFO( CHANGE, "Change" );
-+    INSERT_WORKSHEET_EVENT_INFO( DEACTIVATE, "Deactivate" );
-+    INSERT_WORKSHEET_EVENT_INFO( FOLLOWHYPERLINK, "FollowHyperlink" );
-+    INSERT_WORKSHEET_EVENT_INFO( PIVOTTABLEUPDATE, "PivotTableUpdate" );
-+    INSERT_WORKSHEET_EVENT_INFO( SELECTIONCHANGE, "SelectionChange" );
-+
-+    // Workbook
-+    INSERT_WORKBOOK_EVENT_INFO( ACTIVATE, "Activate" );
-+    INSERT_WORKBOOK_EVENT_INFO( DEACTIVATE, "Deactivate" );
-+    INSERT_WORKBOOK_EVENT_INFO( OPEN, "Open" );
-+    // AUTOOPEN doesn't be used. TODO, this should be "auto_open"
-+    INSERT_WORKBOOK_EVENT_INFO( BEFORECLOSE, "BeforeClose" );
-+    INSERT_WORKBOOK_EVENT_INFO( BEFOREPRINT, "BeforePrint" );
-+    INSERT_WORKBOOK_EVENT_INFO( BEFORESAVE, "BeforeSave" );
-+    INSERT_WORKBOOK_EVENT_INFO( NEWSHEET, "NewSheet" );
-+    INSERT_WORKBOOK_EVENT_INFO( WINDOWACTIVATE, "WindowActivate" );
-+    INSERT_WORKBOOK_EVENT_INFO( WINDOWDEACTIVATE, "WindowDeactivate" );
-+    INSERT_WORKBOOK_EVENT_INFO( WINDOWRESIZE, "WindowResize" );
-+}
-+
-+ScVbaEventsHelper::ScVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArgs, uno::Reference< uno::XComponentContext > const& xContext )
-+    : m_xContext( xContext ), mpVbaEventsListener( NULL ), mbOpened( sal_False ), mbIgnoreEvents( sal_False )
-+{
-+    uno::Reference< frame::XModel > xModel ( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ), uno::UNO_QUERY );
-+    ScDocShell* pDocShell = getDocShell( xModel );
-+    pDoc = pDocShell->GetDocument();
-+}
-+
-+ScVbaEventsHelper::~ScVbaEventsHelper()
-+{
-+    if( mpVbaEventsListener )
-+    {
-+        mpVbaEventsListener = NULL;
-+    }
-+}
-+
-+rtl::OUString
-+ScVbaEventsHelper::getEventName( const sal_Int32 nId )
-+{
-+    rtl::OUString sEventName;
-+    ImplVbaEventNameInfo* pEventInfo = ImplVbaEventNameInfo::GetImplVbaEventNameInfo();
-+    if( pEventInfo )
-+        sEventName = pEventInfo->getEventName( nId );
-+    return sEventName;
-+}
-+
-+// Treat the args as possible inouts ( convertion at bottom of method )
-+sal_Bool ScVbaEventsHelper::executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet )
-+{
-+	// until ObjectModules ( and persisting of codenames ) is supported, if this is a
-+	// document saved from XL then we won't be able to determine the codename for the Workbook
-+	// Module, so... we have no choice but to search all modules for the moment, thus the macro
-+	// passed in should be the fully specified name. 	
-+	rtl::OUString sUrl = sUrlPart0.concat( sMacroName ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sUrlPart2 ) ;
-+	uno::Sequence< sal_Int16 > aOutArgsIndex;
-+	uno::Sequence< uno::Any > aOutArgs;
-+	ErrCode nErr = pShell->CallXScript( sUrl,  aArgs, aRet,
-+			aOutArgsIndex, aOutArgs, sal_False );
-+
-+	// Script Executed?
-+	if ( nErr != ERRCODE_NONE )
-+		return sal_False;
-+
-+	sal_Int32 nLen = aOutArgs.getLength();
-+	// convert any out params to seem like they were inouts
-+	if ( nLen )
-+	{
-+		for ( sal_Int32 index=0; index < nLen; ++index )
-+		{
-+			sal_Int32 nOutIndex = aOutArgsIndex[ index ];
-+			aArgs[ nOutIndex ] = aOutArgs[ index ];
-+		}
-+
-+	}
-+	return sal_True;
-+}
-+String ScVbaEventsHelper::workbookMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro )
-+{
-+	String sFullName;	
-+	// would use the script provider to see if the macro exists but
-+	// called at this stage tdoc content handler stuff is not set up
-+	// so it fails
-+
-+	BasicManager* pBasicMgr = pShell-> GetBasicManager();
-+	if ( pBasicMgr )
-+	{
-+		StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
-+		if ( !pBasic )
-+		{
-+			USHORT nId = pBasicMgr->GetLibId( sLibrary );
-+			pBasicMgr->LoadLib( nId );
-+			pBasic = pBasicMgr->GetLib( sLibrary );
-+		}
-+		if ( pBasic )
-+		{
-+			if ( sMod.Len() ) // we wish to find the macro is a specific module
-+			{
-+				SbModule* pModule = pBasic->FindModule( sMod );
-+				if ( pModule )
-+				{
-+					SbxArray* pMethods = pModule->GetMethods();
-+					if ( pMethods )
-+					{
-+						SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
-+						if ( pMethod )
-+						{
-+							sFullName = sMacro;
-+							sFullName.Insert( '.', 0 ).Insert( sMod, 0 ).Insert( '.', 0 ).Insert( sLibrary, 0 );
-+						}
-+					}
-+				}
-+			}
-+			else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
-+			{
-+					if( SbModule* pModule = pMethod->GetModule() )
-+					{
-+						sFullName = sMacro;
-+						sFullName.Insert( '.', 0 ).Insert( pModule->GetName(), 0).Insert( '.', 0 ).Insert( sLibrary, 0 );
-+					}
-+			}		
-+				
-+		}
-+	}
-+	return sFullName;
-+}
-+
-+uno::Any ScVbaEventsHelper::createWorkSheet( SfxObjectShell* pShell, SCTAB nTab )
-+{
-+	uno::Any aRet;
-+	try
-+	{
-+		uno::Reference< lang::XMultiComponentFactory > xSMgr( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+		uno::Reference< beans::XPropertySet > xProps( xSMgr, uno::UNO_QUERY_THROW );
-+		uno::Reference<uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
-+		// Eventually we will be able to pull the Workbook/Worksheet objects
-+		// directly from basic and register them as listeners
-+
-+		// create Workbook
-+		uno::Sequence< uno::Any > aArgs(2);
-+		aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
-+		aArgs[1] = uno::Any( pShell->GetModel() );
-+		uno::Reference< uno::XInterface > xWorkbook( xSMgr->createInstanceWithArgumentsAndContext(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Workbook") ), aArgs, xCtx ), uno::UNO_QUERY );
-+
-+		// create WorkSheet
-+		String sSheetName;
-+		pDoc->GetName( nTab, sSheetName );
-+		aArgs = uno::Sequence< uno::Any >(3);
-+		aArgs[ 0 ] <<= xWorkbook;
-+		aArgs[ 1 ] <<= pShell->GetModel();
-+		aArgs[ 2 ] = uno::makeAny( rtl::OUString( sSheetName ) );
-+		aRet <<= xSMgr->createInstanceWithArgumentsAndContext(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheet") ), aArgs, xCtx );
-+	}
-+	catch( uno::Exception& e )
-+	{
-+	}
-+	return aRet;
-+}
-+
-+uno::Any ScVbaEventsHelper::createRange( const uno::Any& aRange )
-+{
-+	uno::Any aRet;
-+	try
-+	{
-+		uno::Reference< sheet::XSheetCellRangeContainer > xRanges( 	aRange, uno::UNO_QUERY );
-+		uno::Reference< table::XCellRange > xRange( aRange, uno::UNO_QUERY );
-+		uno::Reference< lang::XMultiComponentFactory > xSMgr( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+		uno::Reference< beans::XPropertySet > xProps( xSMgr, uno::UNO_QUERY_THROW );
-+		if (  xRanges.is() || xRange.is() )
-+		{
-+			uno::Reference<uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
-+			uno::Sequence< uno::Any > aArgs(2);
-+			aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
-+			if ( xRanges.is() )
-+			{
-+				aArgs[1] <<= xRanges;
-+			}
-+			else if ( xRange.is() )
-+			{
-+				aArgs[1] <<= xRange;
-+			}
-+			else
-+			{
-+				throw uno::RuntimeException(); // 
-+			}
-+			aRet <<= xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Range") ), aArgs, xCtx  );	
-+		}
-+	}
-+	catch( uno::Exception& e ) 
-+	{
-+	}
-+	return aRet;
-+}
-+
-+uno::Any ScVbaEventsHelper::createHyperlink( const uno::Any& rCell )
-+{
-+	uno::Any aRet;
-+	try
-+	{
-+		uno::Reference< lang::XMultiComponentFactory > xSMgr( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+		uno::Reference< beans::XPropertySet > xProps( xSMgr, uno::UNO_QUERY_THROW ); 
-+		uno::Reference< table::XCell > xCell( rCell, uno::UNO_QUERY );
-+		if( xCell.is() )
-+		{
-+			uno::Reference<uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
-+			uno::Sequence< uno::Any > aArgs(2);
-+			aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
-+			aArgs[1] <<= rCell;
-+			
-+			aRet <<= xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Hyperlink") ), aArgs, xCtx  );	
-+		}
-+		else
-+		{
-+			throw uno::RuntimeException(); // 
-+		}
-+	}
-+	catch( uno::Exception& e ) 
-+	{
-+	}
-+	return aRet;
-+}
-+
-+uno::Any ScVbaEventsHelper::createWindow( SfxObjectShell* pShell )
-+{
-+    try
-+    {
-+        uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
-+        uno::Reference< frame::XModel > xModel( pShell->GetModel(), uno::UNO_QUERY );
-+        uno::Sequence< uno::Any > aWindowArgs(2);
-+        aWindowArgs[0] = uno::Any( uno::Reference< uno::XInterface > () );
-+        aWindowArgs[1] = uno::Any( xModel );
-+        uno::Reference< uno::XInterface > xWindow( xSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Window" ) ), aWindowArgs ), uno::UNO_QUERY );
-+        if( xWindow.is() )
-+            return uno::makeAny( xWindow );
-+    }
-+	catch( uno::Exception& e )
-+	{
-+	}
-+    return uno::Any();
-+}
-+
-+String ScVbaEventsHelper::getSheetModuleName( SCTAB nTab )
-+{
-+	ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
-+	String aCodeName;
-+	pDoc->GetName( nTab, aCodeName);
-+	// Use code name if that exists
-+	if ( pExtOptions )
-+		aCodeName = pExtOptions->GetCodeName( nTab );
-+	return aCodeName;	
-+}
-+
-+rtl::OUString
-+ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
-+{
-+	SfxObjectShell* pShell = pDoc->GetDocumentShell();
-+    rtl::OUString sMacroPath;
-+    rtl::OUString sMacroName = getEventName( nEventId );
-+    switch( nEventId )
-+    {
-+        // Worksheet
-+    	case VBAEVENT_WORKSHEET_ACTIVATE                      :
-+    	case VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK             :
-+    	case VBAEVENT_WORKSHEET_BEFORERIGHTCLICK              :
-+    	case VBAEVENT_WORKSHEET_CALCULATE                     :
-+    	case VBAEVENT_WORKSHEET_CHANGE                        :
-+    	case VBAEVENT_WORKSHEET_DEACTIVATE                    :
-+    	case VBAEVENT_WORKSHEET_FOLLOWHYPERLINK               :
-+    	case VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE              :
-+    	case VBAEVENT_WORKSHEET_SELECTIONCHANGE               :
-+        {
-+            rtl::OUString  aSheetModuleName = getSheetModuleName( nTab );
-+            sMacroPath = workbookMacroExists( pShell, aSheetModuleName, sMacroName );
-+            break;
-+        }
-+        // Workbook
-+    	case VBAEVENT_WORKBOOK_ACTIVATE                       :
-+    	case VBAEVENT_WORKBOOK_DEACTIVATE                     :
-+    	case VBAEVENT_WORKBOOK_OPEN                           :
-+    	case VBAEVENT_WORKBOOK_AUTOOPEN                       :
-+    	case VBAEVENT_WORKBOOK_BEFORECLOSE                    :
-+    	case VBAEVENT_WORKBOOK_BEFOREPRINT                    :
-+    	case VBAEVENT_WORKBOOK_BEFORESAVE                     :
-+    	case VBAEVENT_WORKBOOK_NEWSHEET                       :
-+    	case VBAEVENT_WORKBOOK_WINDOWACTIVATE                 :
-+    	case VBAEVENT_WORKBOOK_WINDOWDEACTIVATE               :
-+    	case VBAEVENT_WORKBOOK_WINDOWRESIZE                   :
-+        // Workbook_sheet
-+    	case VBAEVENT_WORKBOOK_SHEET_ACTIVATE                 :
-+    	case VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK        :
-+    	case VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK         :
-+    	case VBAEVENT_WORKBOOK_SHEET_CALCULATE                :
-+    	case VBAEVENT_WORKBOOK_SHEET_CHANGE                   :
-+    	case VBAEVENT_WORKBOOK_SHEET_DEACTIVATE               :
-+    	case VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK          :
-+    	case VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE         :
-+    	case VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE          :
-+        {
-+	        ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
-+            String sWorkbookModuleName = pDoc->GetCodeName();
-+            if( pExtOptions )
-+            {
-+                ScExtDocSettings aExtDocSettings = pExtOptions->GetDocSettings();
-+                sWorkbookModuleName = aExtDocSettings.maGlobCodeName;
-+            }
-+           
-+            sMacroPath = workbookMacroExists( pShell, sWorkbookModuleName, sMacroName );
-+            break;
-+        }
-+        default:
-+            break;
-+    }
-+    return sMacroPath;
-+}
-+
-+sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs, const SCTAB nTab )
-+{
-+	SfxObjectShell* pShell = pDoc->GetDocumentShell();
-+
-+	sal_Bool result = sal_False;
-+    sal_Bool bCancel = sal_False;
-+	uno::Sequence< uno::Any > aArgs;
-+	uno::Any aRet;
-+    
-+    // For most cases, there is no corresponsible event macro in the document. 
-+    // It is better fo check if the event macro exists before process the arguments to improve performance.
-+    rtl::OUString sMacroPath = getMacroPath( nEventId, nTab );
-+	if( sMacroPath.getLength() )
-+	{
-+		switch( nEventId )
-+		{
-+			case VBAEVENT_WORKSHEET_ACTIVATE:
-+			case VBAEVENT_WORKSHEET_CALCULATE:
-+			case VBAEVENT_WORKSHEET_DEACTIVATE:
-+            case VBAEVENT_WORKBOOK_ACTIVATE:
-+            case VBAEVENT_WORKBOOK_DEACTIVATE:
-+            case VBAEVENT_WORKBOOK_OPEN:
-+			{
-+				// no arguments
-+				break;
-+			}
-+    	    case VBAEVENT_WORKBOOK_SHEET_DEACTIVATE:
-+    	    case VBAEVENT_WORKBOOK_SHEET_CALCULATE:
-+    	    case VBAEVENT_WORKBOOK_SHEET_ACTIVATE:
-+            case VBAEVENT_WORKBOOK_NEWSHEET:
-+            {
-+				aArgs = uno::Sequence< uno::Any >(1);
-+				aArgs[0] = createWorkSheet( pShell, nTab ); 
-+				break;
-+            }
-+			case VBAEVENT_WORKSHEET_CHANGE:
-+			case VBAEVENT_WORKSHEET_SELECTIONCHANGE:
-+			{
-+				// one argument: range
-+				uno::Any aRange = createRange( rArgs[0] );
-+				aArgs = uno::Sequence< uno::Any >(1);
-+				aArgs[0] = aRange;
-+				break;
-+			}
-+    	    case VBAEVENT_WORKBOOK_SHEET_CHANGE:
-+    	    case VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE:
-+            {
-+				uno::Any aRange = createRange( rArgs[0] );
-+				aArgs = uno::Sequence< uno::Any >(2);
-+				aArgs[0] = createWorkSheet( pShell, nTab );
-+				aArgs[1] = aRange;
-+				break;
-+            }
-+			case VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK:
-+			case VBAEVENT_WORKSHEET_BEFORERIGHTCLICK:
-+			{
-+				// two aruments: range and cancel
-+				uno::Any aRange = createRange( rArgs[0] );
-+				aArgs = uno::Sequence< uno::Any >(2);
-+				aArgs[0] = aRange;
-+				aArgs[1] <<= bCancel;
-+				// TODO: process "cancel" action  
-+				break;
-+			}
-+    	    case VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK:
-+    	    case VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK:
-+            {
-+				uno::Any aRange = createRange( rArgs[0] );
-+				aArgs = uno::Sequence< uno::Any >(3);
-+				aArgs[0] = createWorkSheet( pShell, nTab );
-+				aArgs[1] = aRange;
-+				aArgs[2] <<= bCancel;
-+				// TODO: process "cancel" action  
-+				break;
-+            }
-+			case VBAEVENT_WORKSHEET_FOLLOWHYPERLINK:
-+			{
-+				// one argument: hyperlink
-+				uno::Any aHyperlink = createHyperlink( rArgs[0] );
-+				aArgs = uno::Sequence< uno::Any >(1);
-+				aArgs[0] = aHyperlink;
-+				break;
-+			}
-+    	    case VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK:
-+            {
-+				uno::Any aHyperlink = createHyperlink( rArgs[0] );
-+				aArgs = uno::Sequence< uno::Any >(2);
-+				aArgs[0] = createWorkSheet( pShell, nTab );
-+				aArgs[1] = aHyperlink;
-+				break;
-+            }
-+			case VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE:
-+    	    case VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE:
-+			{
-+				// one argument: pivottable
-+                // TODO: not support yet
-+				return result;
-+			}
-+            case VBAEVENT_WORKBOOK_BEFORECLOSE:
-+            case VBAEVENT_WORKBOOK_BEFOREPRINT:
-+            {
-+                // process Cancel argument
-+                aArgs = uno::Sequence< uno::Any >(1);
-+                aArgs[0] <<= bCancel;
-+                executeMacro( pShell, sMacroPath, aArgs, aRet );
-+                aArgs[0] >>= bCancel;
-+                return bCancel;
-+            }
-+            case VBAEVENT_WORKBOOK_BEFORESAVE:
-+            {
-+                // two arguments: SaveAs and Cancel
-+                aArgs = uno::Sequence< uno::Any >(2);
-+                aArgs[0] = rArgs[0];
-+                aArgs[1] <<= bCancel;
-+                executeMacro( pShell, sMacroPath, aArgs, aRet );
-+                aArgs[1] >>= bCancel;
-+                return bCancel;
-+            }
-+            case VBAEVENT_WORKBOOK_WINDOWACTIVATE:
-+            case VBAEVENT_WORKBOOK_WINDOWDEACTIVATE:
-+            case VBAEVENT_WORKBOOK_WINDOWRESIZE:
-+            {
-+                // one argument: windows
-+                aArgs = uno::Sequence< uno::Any >(1);
-+                aArgs[0] = createWindow( pShell );
-+                break;
-+            }
-+            default:
-+                return result;
-+		}
-+    
-+        // excute the macro
-+        result = executeMacro( pShell, sMacroPath, aArgs, aRet );
-+	}
-+    
-+	return result;
-+}
-+
-+SCTAB ScVbaEventsHelper::getTabFromArgs( const uno::Sequence< uno::Any > aArgs, const sal_Int32 nPos )
-+{
-+    SCTAB nTab = -1;
-+    uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable( getXSomethingFromArgs< sheet::XCellRangeAddressable >( aArgs, nPos ), uno::UNO_QUERY );
-+    if( xCellRangeAddressable.is() )
-+    {
-+        table::CellRangeAddress aAddress = xCellRangeAddressable->getRangeAddress();
-+        nTab = aAddress.Sheet;
-+    }
-+    return nTab;
-+}
-+
-+sal_Bool SAL_CALL 
-+ScVbaEventsHelper::ProcessCompatibleVbaEvent( sal_Int32 nEventId, const uno::Sequence< uno::Any >& aArgs ) throw (uno::RuntimeException)
-+{
-+	SfxObjectShell* pShell = pDoc->GetDocumentShell();
-+	if( !pShell || mbIgnoreEvents)
-+		return sal_False;
-+    
-+    // In order to better support "withevents" in the future, 
-+    // it is better to process a event at a time
-+    SCTAB nTab = INVALID_TAB;
-+    switch( nEventId )
-+    {
-+        // Worksheet
-+		case VBAEVENT_WORKSHEET_ACTIVATE:
-+        {
-+            aArgs[0] >>= nTab;
-+            if( nTab != INVALID_TAB )
-+            {
-+                // process the event
-+                processVbaEvent( nEventId, aArgs, nTab );
-+                // recursive process related workbook sheet event.
-+                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_ACTIVATE, aArgs );
-+            }
-+            break;
-+        }
-+		case VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK:
-+        {
-+            nTab = getTabFromArgs( aArgs );
-+            if( nTab != INVALID_TAB )
-+            {
-+                processVbaEvent( nEventId, aArgs, nTab );
-+                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK, aArgs );
-+            }
-+            break;
-+        }
-+		case VBAEVENT_WORKSHEET_BEFORERIGHTCLICK:
-+        {
-+            nTab = getTabFromArgs( aArgs );
-+            if( nTab != INVALID_TAB )
-+            {
-+                processVbaEvent( nEventId, aArgs, nTab );
-+                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK, aArgs );
-+            }
-+            break;
-+        }
-+		case VBAEVENT_WORKSHEET_CALCULATE:
-+        {
-+            aArgs[0] >>= nTab;
-+            if( nTab != INVALID_TAB )
-+            {
-+                processVbaEvent( nEventId, aArgs, nTab );
-+                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_CALCULATE, aArgs );
-+            }
-+            break;
-+        }
-+		case VBAEVENT_WORKSHEET_CHANGE:
-+        {
-+            nTab = getTabFromArgs( aArgs );
-+            if( nTab != INVALID_TAB )
-+            {
-+                processVbaEvent( nEventId, aArgs, nTab );
-+                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_CHANGE, aArgs );
-+            }
-+            break;
-+        }
-+		case VBAEVENT_WORKSHEET_DEACTIVATE:
-+        {
-+            aArgs[0] >>= nTab;
-+            if( nTab != INVALID_TAB )
-+            {
-+                processVbaEvent( nEventId, aArgs, nTab );
-+                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_DEACTIVATE, aArgs );
-+            }
-+            break;
-+        }
-+		case VBAEVENT_WORKSHEET_FOLLOWHYPERLINK:
-+        {
-+            nTab = getTabFromArgs( aArgs );
-+            if( nTab != INVALID_TAB )
-+            {
-+                processVbaEvent( nEventId, aArgs, nTab );
-+                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK, aArgs );
-+            }
-+            break;
-+        }
-+		case VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE:
-+            // TODO
-+            break;
-+		case VBAEVENT_WORKSHEET_SELECTIONCHANGE:
-+        {
-+            nTab = getTabFromArgs( aArgs );
-+            if( nTab != INVALID_TAB )
-+            {
-+                processVbaEvent( nEventId, aArgs, nTab );
-+                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE, aArgs );
-+            }
-+            break;
-+        }
-+        // Workbook_sheet
-+    	case VBAEVENT_WORKBOOK_SHEET_ACTIVATE:
-+        case VBAEVENT_WORKBOOK_SHEET_CALCULATE:
-+    	case VBAEVENT_WORKBOOK_SHEET_DEACTIVATE:
-+        {
-+            aArgs[0] >>= nTab;
-+            if( nTab != INVALID_TAB )
-+            {
-+                processVbaEvent( nEventId, aArgs, nTab );
-+            }
-+            break;
-+        }
-+    	case VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK:
-+        case VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK:
-+    	case VBAEVENT_WORKBOOK_SHEET_CHANGE:
-+    	case VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK:
-+    	case VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE:
-+        {
-+            nTab = getTabFromArgs( aArgs );
-+            if( nTab != INVALID_TAB )
-+            {
-+                processVbaEvent( nEventId, aArgs, nTab );
-+            }
-+            break;
-+        }
-+    	case VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE:
-+        // TODO
-+            break;
-+		// Workbook
-+		case VBAEVENT_WORKBOOK_ACTIVATE:
-+        {
-+            // if workbook open event do not be fired. fired it before 
-+            // workbook activate event to compatible with MSO.
-+            if( mbOpened )
-+            {
-+                // process workbook activate event
-+                processVbaEvent( nEventId, aArgs );
-+                // process workbook window activate event at the same time
-+                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWACTIVATE, aArgs );
-+            }
-+            break;
-+        }
-+		case VBAEVENT_WORKBOOK_DEACTIVATE:
-+        {
-+            processVbaEvent( nEventId, aArgs );
-+            // same as workbook window deactivate
-+            ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWDEACTIVATE, aArgs );
-+            break;
-+        }
-+		case VBAEVENT_WORKBOOK_OPEN:
-+        {
-+            // process workbook open macro
-+            // does auto open work here?
-+            if( !mbOpened )
-+            {
-+                processVbaEvent( nEventId, aArgs );
-+                mbOpened = sal_True;
-+                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_ACTIVATE, aArgs );
-+            }
-+            // register the window listener.
-+            if( !mpVbaEventsListener )
-+            {
-+                mpVbaEventsListener = new VbaEventsListener( this );
-+                mpVbaEventsListener->startEventsLinstener();
-+            }
-+            break;
-+        }
-+		case VBAEVENT_WORKBOOK_AUTOOPEN:
-+            // TODO
-+            break;
-+		case VBAEVENT_WORKBOOK_BEFORECLOSE:
-+        {
-+            sal_Bool bCancel = processVbaEvent( nEventId, aArgs ); 
-+            if( mpVbaEventsListener && !bCancel )
-+            {
-+                mpVbaEventsListener->stopEventsLinstener();
-+                mpVbaEventsListener = NULL;
-+            }
-+            return bCancel;
-+        }
-+		case VBAEVENT_WORKBOOK_BEFOREPRINT:
-+		case VBAEVENT_WORKBOOK_BEFORESAVE:
-+		case VBAEVENT_WORKBOOK_WINDOWACTIVATE:
-+		case VBAEVENT_WORKBOOK_WINDOWDEACTIVATE:
-+		case VBAEVENT_WORKBOOK_WINDOWRESIZE:
-+        {
-+            return processVbaEvent( nEventId, aArgs );
-+        }
-+		case VBAEVENT_WORKBOOK_NEWSHEET:
-+        {
-+            aArgs[0] >>= nTab;
-+            if( nTab != INVALID_TAB )
-+            {
-+                processVbaEvent( nEventId, aArgs, nTab );
-+            }
-+            break;
-+        }
-+        default:
-+            OSL_TRACE( "Invalid Event" );
-+    }
-+
-+    return sal_True;
-+}
-+
-+::sal_Bool SAL_CALL 
-+ScVbaEventsHelper::getIgnoreEvents() throw (uno::RuntimeException)
-+{
-+    return mbIgnoreEvents;
-+}
-+
-+void SAL_CALL 
-+ScVbaEventsHelper::setIgnoreEvents( ::sal_Bool _ignoreevents ) throw (uno::RuntimeException)
-+{
-+    mbIgnoreEvents = _ignoreevents;
-+}
-+
-+
-+namespace vbaeventshelper
-+{
-+namespace sdecl = comphelper::service_decl;
-+sdecl::class_<ScVbaEventsHelper, sdecl::with_args<true> > serviceImpl;
-+extern sdecl::ServiceDecl const serviceDecl(
-+    serviceImpl,
-+    "ScVbaEventsHelper",
-+    "com.sun.star.document.VbaEventsHelper" );
-+}
---- sc/inc/document.hxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/inc/document.hxx	2009-04-06 16:42:00.000000000 +0000
-@@ -157,6 +157,9 @@ namespace com { namespace sun { namespac
-     }
- } } }
- 
-+namespace com { namespace sun { namespace star { namespace document {
-+    class XVbaEventsHelper;
-+} } } }
- #include <svtools/zforlist.hxx>
- /*
- #ifdef _ZFORLIST_DECLARE_TABLE
-@@ -319,6 +322,8 @@ private:
- 
- 	Timer				aTrackTimer;
- 
-+    com::sun::star::uno::Reference< com::sun::star::document::XVbaEventsHelper > mxVbaEventsHelper;
-+
- public:
-     ScTabOpList         aTableOpList;		            // list of ScInterpreterTableOpParams currently in use
-     ScInterpreterTableOpParams  aLastTableOpParams;     // remember last params
-@@ -1707,6 +1712,8 @@ public:
- 	void GetSortParam( ScSortParam& rParam, SCTAB nTab );
- 	void SetSortParam( ScSortParam& rParam, SCTAB nTab );
- 
-+    com::sun::star::uno::Reference< com::sun::star::document::XVbaEventsHelper > GetVbaEventsHelper();
-+
-     /** Should only be GRAM_PODF or GRAM_ODFF. */
-     void                SetStorageGrammar( formula::FormulaGrammar::Grammar eGrammar );
-     formula::FormulaGrammar::Grammar  GetStorageGrammar() const
---- sc/source/core/data/documen2.cxx
-+++ sc/source/core/data/documen2.cxx
-@@ -96,6 +96,7 @@
- #include "externalrefmgr.hxx"
- #include "tabprotection.hxx"
- #include "clipparam.hxx"
-+#include <com/sun/star/document/XVbaEventsHelper.hpp>
- #include "formulaparserpool.hxx"
- 
- // pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
-@@ -1267,6 +1268,29 @@ void ScDocument::RemoveLookupCache( ScLo
-     }
- }
- 
-+using namespace com::sun::star;
-+uno::Reference< document::XVbaEventsHelper > 
-+ScDocument::GetVbaEventsHelper()
-+{
-+	if( !mxVbaEventsHelper.is() )
-+	{
-+        try
-+        {
-+            uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
-+            uno::Reference< frame::XModel > xModel( pShell ? pShell->GetModel() : NULL, uno::UNO_QUERY );
-+            uno::Sequence< uno::Any > aArgs(1);
-+            aArgs[0] = uno::Any( xModel );
-+            uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper( xSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.VbaEventsHelper" ) ), aArgs ), uno::UNO_QUERY );
-+            // helper will always be created successfully.
-+            mxVbaEventsHelper.set( xVbaEventsHelper, uno::UNO_QUERY );
-+        }
-+        catch( uno::Exception& e )
-+        {
-+        }
-+	}
-+	return mxVbaEventsHelper;
-+}
-+
- void ScDocument::ClearLookupCaches()
- {
-     if( pLookupCacheMapImpl )
---- sc/source/ui/docshell/docsh.cxx.old	2009-04-06 16:41:50.000000000 +0000
-+++ sc/source/ui/docshell/docsh.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -127,6 +127,13 @@
- #include <rtl/logfile.hxx>
- 
- #include <comphelper/processfactory.hxx>
-+#include "uiitems.hxx"
-+#include "cellsuno.hxx"
-+#include <com/sun/star/document/XVbaEventsHelper.hpp>
-+#include <com/sun/star/document/VbaEventId.hpp>
-+
-+using namespace com::sun::star;
-+using namespace com::sun::star::document::VbaEventId;
- 
- using namespace com::sun::star;
- 
-@@ -272,7 +279,11 @@ sal_uInt16 ScDocShell::GetHiddenInformat
- void ScDocShell::BeforeXMLLoading()
- {
-     aDocument.DisableIdle( TRUE );
--
-+    // suppress VBA events when loading the xml
-+    uno::Reference< document::XVbaEventsHelper > xEvt( aDocument.GetVbaEventsHelper() );
-+    if ( xEvt.is() )
-+       xEvt->setIgnoreEvents( sal_True );
-+    
-     // prevent unnecessary broadcasts and updates
-     DBG_ASSERT(pModificator == NULL, "The Modificator should not exist");
- 	pModificator = new ScDocShellModificator( *this );
-@@ -357,6 +368,10 @@ void ScDocShell::AfterXMLLoading(sal_Boo
-     else
- 		aDocument.SetInsertingFromOtherDoc( FALSE );
- 
-+        // suppress VBA events when loading the xml
-+        uno::Reference< document::XVbaEventsHelper > xEvt( aDocument.GetVbaEventsHelper() );
-+        if ( xEvt.is() )
-+            xEvt->setIgnoreEvents( sal_False );
- 	aDocument.SetImportingXML( FALSE );
-     aDocument.EnableUndo( TRUE );
-     bIsEmpty = FALSE;
-@@ -498,9 +513,71 @@ BOOL __EXPORT ScDocShell::Load( SfxMediu
- 	return bRet;
- }
- 
-+void lcl_processCompatibleSfxHint( uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper, const SfxHint& rHint )
-+{
-+    if (rHint.ISA(ScTablesHint) )
-+    {
-+		USHORT nId = ((ScTablesHint&)rHint).GetId();	
-+		SCTAB nTab = ((ScTablesHint&)rHint).GetTab1();	
-+        if( nId == SC_TAB_INSERTED )
-+        {
-+            uno::Sequence< uno::Any > aArgs(1);
-+            aArgs[0] <<= nTab;
-+            xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_NEWSHEET, aArgs );
-+        }
-+    }
-+    else if ( rHint.ISA( SfxEventHint ) )
-+    {
-+        ULONG nEventId = ((SfxEventHint&)rHint).GetEventId();
-+        switch ( nEventId )
-+        {
-+            case SFX_EVENT_ACTIVATEDOC:
-+            {
-+                uno::Sequence< uno::Any > aArgs;
-+                xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_ACTIVATE, aArgs );
-+            }
-+                break;
-+            case SFX_EVENT_DEACTIVATEDOC:
-+            {
-+                uno::Sequence< uno::Any > aArgs;
-+                xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_DEACTIVATE, aArgs );
-+            }
-+                break;
-+            /*case SFX_EVENT_CLOSEDOC :
-+            {
-+                uno::Sequence< uno::Any > aArgs;
-+                xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_CLOSE, aArgs );
-+            }
-+                break;
-+            case SFX_EVENT_CLOSEVIEW :
-+            {
-+                uno::Sequence< uno::Any > aArgs;
-+                xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWCOLSE, aArgs );
-+            }
-+                break;
-+            */    
-+            case SFX_EVENT_OPENDOC:
-+            {
-+                // some later than workbook activate.
-+                uno::Sequence< uno::Any > aArgs;
-+                xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_OPEN, aArgs );
-+            }
-+                break;
-+            default:
-+                {
-+                }
-+                break;
-+        }
-+    }
-+}
- 
- void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
- {
-+    uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( aDocument.GetVbaEventsHelper(), uno::UNO_QUERY );
-+    if ( xVbaEventsHelper.is() )
-+    {
-+        lcl_processCompatibleSfxHint( xVbaEventsHelper, rHint );
-+    }
- 	if (rHint.ISA(SfxSimpleHint))								// ohne Parameter
- 	{
- 		ULONG nSlot = ((const SfxSimpleHint&)rHint).GetId();
-@@ -2144,6 +2221,16 @@ USHORT __EXPORT ScDocShell::PrepareClose
- 
- 	DoEnterHandler();
- 
-+	// start handler for possible veto from DocBefore_Close
-+    uno::Sequence< uno::Any > aArgs;
-+    uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( aDocument.GetVbaEventsHelper(), uno::UNO_QUERY );
-+    if ( !IsInPrepareClose() && xVbaEventsHelper.is() )
-+    {
-+	    if ( xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFORECLOSE, aArgs ) )
-+		    return sal_False;
-+    }
-+	// end handler code
-+
- 	USHORT nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing );
- 	if (nRet == TRUE)						// TRUE = schliessen
- 		aDocument.DisableIdle(TRUE);		// nicht mehr drin rumpfuschen !!!
---- sc/source/ui/inc/docsh.hxx.old	2009-04-06 16:41:53.000000000 +0000
-+++ sc/source/ui/inc/docsh.hxx	2009-04-06 16:42:00.000000000 +0000
-@@ -47,6 +47,7 @@
- #include "refreshtimer.hxx"
- 
- #include <hash_map>
-+#include <cppuhelper/implbase1.hxx>
- 
- class ScEditEngineDefaulter;
- class FontList;
---- sc/source/ui/unoobj/viewuno.cxx
-+++ sc/source/ui/unoobj/viewuno.cxx
-@@ -71,9 +71,13 @@
- #include "gridwin.hxx"
- #include <com/sun/star/view/DocumentZoomType.hpp>
- #include "AccessibilityHints.hxx"
-+#include <com/sun/star/awt/MouseButton.hpp>
-+#include <com/sun/star/document/XVbaEventsHelper.hpp>
-+#include <com/sun/star/document/VbaEventId.hpp>
- #include <svx/sdrhittesthelper.hxx>
- 
- using namespace com::sun::star;
-+using namespace com::sun::star::document::VbaEventId;
- 
- //------------------------------------------------------------------------
- 
-@@ -458,6 +462,78 @@ void SAL_CALL ScViewPaneObj::release() t
- 	OWeakObject::release();
- }
- 
-+// To process sheet compatibile event
-+typedef ::cppu::WeakImplHelper2< awt::XEnhancedMouseClickHandler, view::XSelectionChangeListener > TabViewEventListener_BASE;
-+class ScTabViewEventListener: public TabViewEventListener_BASE
-+{
-+private:
-+    uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper;
-+    ScTabViewObj* pViewObj;
-+    
-+public:
-+    ScTabViewEventListener( ScTabViewObj* pObj, uno::Reference< document::XVbaEventsHelper >& rVbaEventsHelper);
-+    ~ScTabViewEventListener();
-+	// XEnhancedMouseClickHandler
-+	virtual sal_Bool SAL_CALL mousePressed( const awt::EnhancedMouseEvent& e ) throw (uno::RuntimeException);
-+	virtual sal_Bool SAL_CALL mouseReleased( const awt::EnhancedMouseEvent& e ) throw (uno::RuntimeException);
-+
-+    // XSelectionChangeListener
-+    virtual void SAL_CALL selectionChanged( const lang::EventObject& aEvent ) throw ( uno::RuntimeException );
-+    // XEventListener
-+	virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException );
-+};
-+
-+ScTabViewEventListener::ScTabViewEventListener(ScTabViewObj* pObj, uno::Reference< document::XVbaEventsHelper >& rVbaEventsHelper):
-+                        pViewObj( pObj ),xVbaEventsHelper( rVbaEventsHelper )
-+{
-+}
-+
-+ScTabViewEventListener::~ScTabViewEventListener()
-+{
-+}
-+
-+void SAL_CALL ScTabViewEventListener::disposing(  const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
-+{
-+}
-+
-+sal_Bool SAL_CALL ScTabViewEventListener::mousePressed( const awt::EnhancedMouseEvent& e ) throw (uno::RuntimeException)
-+{
-+	sal_Bool result =  sal_False;
-+    // process BeforeDoubleClick and BeforeRightClick events
-+	if( e.ClickCount == 2 || e.Buttons == ::com::sun::star::awt::MouseButton::RIGHT )
-+	{
-+		// ensure the target is a cell
-+        uno::Reference< table::XCell > xCell( e.Target, uno::UNO_QUERY );
-+		if( xCell.is() && xVbaEventsHelper.is() && pViewObj)
-+		{
-+			uno::Sequence< uno::Any > aArgs(1);
-+			aArgs[0] = pViewObj->getSelection();
-+			sal_Int32 nEventId = VBAEVENT_WORKSHEET_BEFORERIGHTCLICK;
-+			if( e.ClickCount == 2 )
-+				nEventId = VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK;
-+            
-+            result = xVbaEventsHelper->ProcessCompatibleVbaEvent( nEventId, aArgs );
-+			// TODO: process Cancel argument	
-+		}
-+	}
-+	return result;
-+}
-+
-+sal_Bool SAL_CALL ScTabViewEventListener::mouseReleased( const awt::EnhancedMouseEvent&/*e*/) throw (uno::RuntimeException)
-+{
-+	return sal_False;
-+}
-+
-+void SAL_CALL ScTabViewEventListener::selectionChanged( const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
-+{
-+	if ( xVbaEventsHelper.is() && pViewObj)
-+	{
-+	    uno::Sequence< uno::Any > aArgs(1);
-+	    aArgs[0] = pViewObj->getSelection();
-+	    xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_SELECTIONCHANGE, aArgs );
-+	}
-+}
-+
- //------------------------------------------------------------------------
- 
- //	Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht
-@@ -482,7 +558,19 @@ ScTabViewObj::ScTabViewObj( ScTabViewShe
- 	bDrawSelModeSet(sal_False),
-     bFilteredRangeSelection(sal_True)
- {
--	//!	Listening oder so
-+	if( pViewSh )
-+	{
-+		ScViewData* pViewData = pViewSh->GetViewData();
-+		if( pViewData )
-+		{
-+            uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper (pViewData->GetDocument()->GetVbaEventsHelper(), uno::UNO_QUERY );
-+			ScTabViewEventListener* pEventListener = new ScTabViewEventListener( this, xVbaEventsHelper );
-+			uno::Reference< awt::XEnhancedMouseClickHandler > aMouseClickHandler( *pEventListener, uno::UNO_QUERY );
-+			addEnhancedMouseClickHandler( aMouseClickHandler );
-+            uno::Reference< view::XSelectionChangeListener > aSelectionChangeListener( *pEventListener, uno::UNO_QUERY );
-+            addSelectionChangeListener( aSelectionChangeListener );
-+		}
-+	}
- }
- 
- ScTabViewObj::~ScTabViewObj()
---- sc/source/ui/unoobj/docuno.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/ui/unoobj/docuno.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -97,7 +97,10 @@
- #include <svx/unoshape.hxx>
- #endif
- 
-+#include <com/sun/star/document/XVbaEventsHelper.hpp>
-+#include <com/sun/star/document/VbaEventId.hpp>
- using namespace com::sun::star;
-+using namespace com::sun::star::document::VbaEventId;
- 
- //------------------------------------------------------------------------
- 
-@@ -313,6 +316,7 @@ uno::Any SAL_CALL ScModelObj::queryInter
- 	SC_QUERYINTERFACE( document::XLinkTargetSupplier )
- 	SC_QUERYINTERFACE( beans::XPropertySet )
- 	SC_QUERYINTERFACE( document::XCodeNameQuery )
-+	SC_QUERYINTERFACE( document::XDocumentEventCompatibleHelper)
- 	SC_QUERYINTERFACE( lang::XMultiServiceFactory )
- 	SC_QUERYINTERFACE( lang::XServiceInfo )
-     SC_QUERYINTERFACE( util::XChangesNotifier )
-@@ -1762,6 +1766,39 @@ ScModelObj::getCodeNameForObject( const
-     // Probably should throw here ( if !bMatched )
-      return sCodeName;
- }
-+// XVbaEventHelper
-+// For Vba Event
-+sal_Bool SAL_CALL
-+ScModelObj::processCompatibleEvent( sal_Int16 nSlotId ) throw( ::com::sun::star::uno::RuntimeException )
-+{
-+    USHORT nId = (USHORT)nSlotId;
-+    uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper( GetDocument()->GetVbaEventsHelper(), uno::UNO_QUERY );
-+    if( xVbaEventsHelper.is() )
-+    {
-+        switch( nId )
-+        {
-+            case SID_SAVEDOC:
-+            {
-+                uno::Sequence< uno::Any > aArgs(1);
-+                aArgs[0] <<= sal_False;
-+                return xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFORESAVE, aArgs );
-+            }
-+            case SID_SAVEASDOC:
-+            {
-+                uno::Sequence< uno::Any > aArgs(1);
-+                aArgs[0] <<= sal_True;
-+                return xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFORESAVE, aArgs );
-+            }
-+            case SID_PRINTDOC:
-+            case SID_PRINTDOCDIRECT:
-+            {
-+                uno::Sequence< uno::Any > aArgs;
-+                return xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFOREPRINT, aArgs );
-+            }
-+        }
-+    }
-+    return sal_False;
-+}
- // XServiceInfo
- 
- rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException)
---- sc/inc/docuno.hxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/inc/docuno.hxx	2009-04-06 16:42:00.000000000 +0000
-@@ -56,6 +56,7 @@
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <com/sun/star/sheet/XCellRangesAccess.hpp>
- #include <com/sun/star/util/XChangesNotifier.hpp>
-+#include <com/sun/star/document/XDocumentEventCompatibleHelper.hpp>
- #include <cppuhelper/implbase2.hxx>
- #include <cppuhelper/implbase3.hxx>
- #include <cppuhelper/implbase4.hxx>
-@@ -92,6 +93,7 @@ class SC_DLLPUBLIC ScModelObj : public S
- 					public com::sun::star::document::XLinkTargetSupplier,
- 					public com::sun::star::beans::XPropertySet,
- 					public com::sun::star::document::XCodeNameQuery,
-+                    public com::sun::star::document::XDocumentEventCompatibleHelper,
- 					public SvxFmMSFactory,	// derived from XMultiServiceFactory
-                     public com::sun::star::lang::XServiceInfo,
-                     public ::com::sun::star::util::XChangesNotifier
-@@ -320,6 +322,8 @@ public:
-                                 throw (::com::sun::star::uno::RuntimeException);
-     virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj ) 
-                                 throw(::com::sun::star::uno::RuntimeException); 
-+                            // XVbaEventHelper
-+    virtual sal_Bool SAL_CALL processCompatibleEvent( sal_Int16 nEventId ) throw (::com::sun::star::uno::RuntimeException);
- };
- 
- 
---- sc/source/ui/view/gridwin.cxx.old	2009-04-06 16:41:50.000000000 +0000
-+++ sc/source/ui/view/gridwin.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -130,7 +130,13 @@
- #include <svx/sdr/overlay/overlaymanager.hxx>
- #include <vcl/svapp.hxx>
- 
-+#include "cellsuno.hxx"
-+
-+#include <com/sun/star/document/XVbaEventsHelper.hpp>
-+#include <com/sun/star/document/VbaEventId.hpp>
-+
- using namespace com::sun::star;
-+using namespace com::sun::star::document::VbaEventId;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Any;
- 
-@@ -356,6 +362,32 @@ void lcl_UnLockComment( ScDrawView* pVie
-     }
- }
- 
-+sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTAB nTab, ScBaseCell*& rpCell )
-+{
-+	BOOL bFound = FALSE;
-+	do
-+	{
-+		pDoc->GetCell( rPosX, rPosY, nTab, rpCell );
-+		if ( !rpCell || rpCell->GetCellType() == CELLTYPE_NOTE )
-+		{
-+			if ( rPosX <= 0 )
-+				return FALSE;							// alles leer bis links
-+			else
-+				--rPosX;								// weitersuchen
-+		}
-+                else if ( rpCell->GetCellType() == CELLTYPE_EDIT)
-+                    bFound = TRUE;
-+                else if (rpCell->GetCellType() == CELLTYPE_FORMULA &&
-+                  static_cast<ScFormulaCell*>(rpCell)->IsHyperLinkCell())
-+                    bFound = TRUE;
-+	    else
-+			return FALSE;								// andere Zelle
-+	}
-+	while ( !bFound );
-+
-+	return bFound;
-+}
-+
- //==================================================================
- 
- //	WB_DIALOGCONTROL noetig fuer UNO-Controls
-@@ -1403,6 +1435,7 @@ void ScGridWindow::HandleMouseButtonDown
- 	SCCOL	nOldColFBox	  = bWasFilterBox ? pFilterBox->GetCol() : 0;
- 	SCROW  nOldRowFBox	  = bWasFilterBox ? pFilterBox->GetRow() : 0;
- #endif
-+#include "cellsuno.hxx" 
- 
- 	ClickExtern();	// loescht FilterBox, wenn vorhanden
- 
-@@ -2085,6 +2118,26 @@ void __EXPORT ScGridWindow::MouseButtonU
- 		{
- 			nMouseStatus = SC_GM_NONE;				// keinen Doppelklick anfangen
- 			ScGlobal::OpenURL( aUrl, aTarget );
-+			
-+			// fire worksheet_followhyperlink event
-+			Point aPos = rMEvt.GetPosPixel();
-+	        SCsCOL nPosX;
-+    	    SCsROW nPosY;
-+        	SCTAB nTab = pViewData->GetTabNo();
-+        	pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
-+			ScBaseCell* pCell = NULL;
-+
-+			BOOL bFound = lcl_GetHyperlinkCell( pDoc, nPosX, nPosY, nTab, pCell );
-+			if( bFound )
-+			{
-+				ScAddress aCellPos( nPosX, nPosY, nTab );
-+				ScCellObj* pObj = new ScCellObj( pViewData->GetDocShell(), aCellPos );
-+				uno::Sequence< uno::Any > aArgs(1);
-+				aArgs[0] = uno::makeAny(uno::Reference<uno::XInterface>(static_cast<cppu::OWeakObject*>(pObj)));
-+                uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( pViewData->GetDocument()->GetVbaEventsHelper(), uno::UNO_QUERY );
-+                if( xVbaEventsHelper.is() )
-+			        xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_FOLLOWHYPERLINK, aArgs );
-+			}
- 			return;
- 		}
- 	}
-@@ -2412,7 +2465,7 @@ long ScGridWindow::PreNotify( NotifyEven
- 			                lcl_InitMouseEvent( aEvent, *rNEvt.GetMouseEvent() );
- 	                        if ( rNEvt.GetWindow() )
- 		                        aEvent.Source = rNEvt.GetWindow()->GetComponentInterface();
--                            if ( nType == EVENT_MOUSEBUTTONDOWN)
-+                            if ( nType == EVENT_MOUSEBUTTONDOWN )
- 					            pImp->MousePressed( aEvent );
-                             else
-                                 pImp->MouseReleased( aEvent );
-@@ -4827,26 +4880,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BO
- 	ScDocument* pDoc = pDocSh->GetDocument();
- 	ScBaseCell* pCell = NULL;
- 
--	BOOL bFound = FALSE;
--	do
--	{
--		pDoc->GetCell( nPosX, nPosY, nTab, pCell );
--		if ( !pCell || pCell->GetCellType() == CELLTYPE_NOTE )
--		{
--			if ( nPosX <= 0 )
--				return FALSE;							// alles leer bis links
--			else
--				--nPosX;								// weitersuchen
--		}
--                else if ( pCell->GetCellType() == CELLTYPE_EDIT)
--                    bFound = TRUE;
--                else if (pCell->GetCellType() == CELLTYPE_FORMULA &&
--                  static_cast<ScFormulaCell*>(pCell)->IsHyperLinkCell())
--                    bFound = TRUE;
--	    else
--			return FALSE;								// andere Zelle
--	}
--	while ( !bFound );
-+	BOOL bFound = lcl_GetHyperlinkCell( pDoc, nPosX, nPosY, nTab, pCell );
-+	if( !bFound )
-+		return FALSE;
- 
- 	ScHideTextCursor aHideCursor( pViewData, eWhich );	// before GetEditArea (MapMode is changed)
- 
---- sc/source/ui/view/tabview3.cxx.old	2009-04-06 16:41:50.000000000 +0000
-+++ sc/source/ui/view/tabview3.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -82,6 +82,10 @@
- #include "tabprotection.hxx"
- 
- #include <com/sun/star/chart2/data/HighlightedRange.hpp>
-+#include <com/sun/star/document/XVbaEventsHelper.hpp>
-+#include <com/sun/star/document/VbaEventId.hpp>
-+
-+using namespace com::sun::star::document::VbaEventId;
- 
- namespace
- {
-@@ -1600,6 +1604,17 @@ void ScTabView::SetTabNo( SCTAB nTab, BO
- 										//	nicht InputEnterHandler wegen Referenzeingabe !
- 
- 		ScDocument* pDoc = aViewData.GetDocument();
-+		if( !bNew )
-+		{
-+            uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( pDoc->GetVbaEventsHelper(), uno::UNO_QUERY );
-+            if( xVbaEventsHelper.is() )
-+            {
-+                uno::Sequence< uno::Any > aArgs(1);
-+                aArgs[0] <<= aViewData.GetTabNo();
-+			    xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_DEACTIVATE, aArgs );
-+            }
-+		}
-+			
- 		pDoc->MakeTable( nTab );
- 
- 		SCTAB nTabCount = pDoc->GetTableCount();
-@@ -1698,8 +1713,20 @@ void ScTabView::SetTabNo( SCTAB nTab, BO
- 					if ( pGridWin[i]->IsVisible() )
- 						pGridWin[i]->UpdateEditViewPos();
- 		}
--
-+		
- 		TabChanged();										// DrawView
-+
-+		if( !bNew )
-+		{
-+            uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( pDoc->GetVbaEventsHelper(), uno::UNO_QUERY );
-+            if( xVbaEventsHelper.is() )
-+            {
-+                uno::Sequence< uno::Any > aArgs(1);
-+                aArgs[0] <<= aViewData.GetTabNo();
-+			    xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_ACTIVATE,  aArgs );
-+            }
-+		}
-+			
- 		aViewData.GetViewShell()->WindowChanged();			// falls das aktive Fenster anders ist
-         if ( !bUnoRefDialog )
-             aViewData.GetViewShell()->DisconnectAllClients();   // important for floating frames
---- sc/source/ui/vba/makefile.mk.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/ui/vba/makefile.mk	2009-04-06 16:42:00.000000000 +0000
-@@ -134,7 +134,8 @@ SLOFILES= \
-         		$(SLO)$/vbapagebreaks.obj \
- 		        $(SLO)$/vbaspinbutton.obj \
- 		        $(SLO)$/vbaimage.obj \
--				$(SLO)$/service.obj
-+				$(SLO)$/service.obj \
-+        $(SLO)$/vbaeventshelper.obj
- 
- # --- Targets ------------------------------------------------------
- 
---- sc/source/ui/vba/service.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/service.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -69,6 +69,10 @@ namespace hyperlink
- {
- extern sdecl::ServiceDecl const serviceDecl;
- }
-+namespace vbaeventshelper
-+{
-+extern sdecl::ServiceDecl const serviceDecl;
-+}
- 
- extern "C"
- {
-@@ -86,7 +90,7 @@ extern "C"
- 
- 	// Component registration
-         if ( component_writeInfoHelper( pServiceManager, pRegistryKey, 
--		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl ) )
-+		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) )
- 		{
- 			// Singleton registration
- 			try
-@@ -115,6 +119,8 @@ extern "C"
- 		OSL_TRACE("In component_getFactory for %s", pImplName );
- 	void* pRet =  component_getFactoryHelper(
-         	pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl );
-+    if( !pRet )
-+        pRet = component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl );
- 	OSL_TRACE("Ret is 0x%x", pRet);
- 	return pRet;
-     }
---- sfx2/inc/sfx2/objsh.hxx.old	2009-04-06 16:41:53.000000000 +0000
-+++ sfx2/inc/sfx2/objsh.hxx	2009-04-06 16:42:00.000000000 +0000
-@@ -308,6 +308,7 @@ public:
-     void                        SetNoName();
-     sal_Bool                    IsInModalMode() const;
-     sal_Bool					HasModalViews() const;
-+    sal_Bool                    IsInPrepareClose() const;
-     sal_Bool                    IsHelpDocument() const;
- 
-     sal_Bool                    IsDocShared() const;
-@@ -408,7 +409,8 @@ public:
-         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
-         ::com::sun::star::uno::Any& aRet,
-         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
--        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam
-+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
-+        bool bRaiseError = true
-     );
- 
-     static ErrCode  CallXScript(
-@@ -417,7 +419,8 @@ public:
-         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
-         ::com::sun::star::uno::Any& aRet,
-         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
--        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam
-+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
-+        bool bRaiseError = true
-     );
- 
-     /** adjusts the internal macro mode, according to the current security settings
---- sfx2/source/doc/objmisc.cxx.old	2009-04-02 10:43:58.000000000 +0000
-+++ sfx2/source/doc/objmisc.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -1632,7 +1632,7 @@ namespace
- }
- 
- ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const ::rtl::OUString& _rScriptURL,
--    const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
-+    const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError )
- {
-     OSL_TRACE( "in CallXScript" );
- 	ErrCode nErr = ERRCODE_NONE;
-@@ -1673,7 +1673,7 @@ ErrCode SfxObjectShell::CallXScript( con
-         nErr = ERRCODE_BASIC_INTERNAL_ERROR;
-     }
- 
--	if ( bCaughtException )
-+	if ( bCaughtException && bRaiseError )
- 	{
-         ::std::auto_ptr< VclAbstractDialog > pScriptErrDlg;
- 		SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-@@ -1697,9 +1697,9 @@ ErrCode SfxObjectShell::CallXScript( con
-         ::com::sun::star::uno::Any& aRet,
-         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
-         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
--            aOutParam)
-+            aOutParam, bool bRaiseError )
- {
--    return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam );
-+    return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError );
- }
- 
- //-------------------------------------------------------------------------
---- sfx2/source/doc/objserv.cxx.old	2009-04-06 16:41:53.000000000 +0000
-+++ sfx2/source/doc/objserv.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -103,6 +103,7 @@
- #include <com/sun/star/embed/XTransactedObject.hpp>
- #include <com/sun/star/util/XCloneable.hpp>
- #include <com/sun/star/document/XDocumentProperties.hpp>
-+#include <com/sun/star/document/XDocumentEventCompatibleHelper.hpp>
- 
- #include "helpid.hrc"
- 
-@@ -507,6 +508,18 @@ void SfxObjectShell::ExecFile_Impl(SfxRe
- 		case SID_SAVEASDOC:
- 		case SID_SAVEDOC:
- 		{
-+            if( nId == SID_SAVEDOC || nId == SID_SAVEASDOC )
-+            {
-+                uno::Reference< document::XDocumentEventCompatibleHelper > xVbaEventHelper( GetModel(), uno::UNO_QUERY );
-+                if( xVbaEventHelper.is() )
-+                {
-+                    if( xVbaEventHelper->processCompatibleEvent( nId ) )
-+                    {
-+                        rReq.SetReturnValue( SfxBoolItem( 0, sal_True ) );
-+                        return;
-+                    }
-+                }
-+            }
- 			//!! detaillierte Auswertung eines Fehlercodes
- 			SfxObjectShellRef xLock( this );
- 
---- sfx2/source/view/viewprn.cxx.old	2009-04-02 10:44:00.000000000 +0000
-+++ sfx2/source/view/viewprn.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -32,6 +32,7 @@
- #include "precompiled_sfx2.hxx"
- 
- #include <com/sun/star/document/XDocumentProperties.hpp>
-+#include <com/sun/star/document/XDocumentEventCompatibleHelper.hpp>
- #include <com/sun/star/view/PrintableState.hpp>
- #include <svtools/itempool.hxx>
- #ifndef _MSGBOX_HXX //autogen
-@@ -67,6 +68,8 @@
- #include "view.hrc"
- #include "helpid.hrc"
- 
-+using namespace com::sun::star;
-+
- TYPEINIT1(SfxPrintingHint, SfxHint);
- 
- // -----------------------------------------------------------------------
-@@ -405,6 +408,22 @@ void SfxViewShell::ExecPrint_Impl( SfxRe
- 		case SID_SETUPPRINTER:
- 	    case SID_PRINTER_NAME :
- 		{
-+            if( nId == SID_PRINTDOC )
-+            {
-+				SfxObjectShell* pDoc = GetObjectShell();
-+                if( pDoc )
-+                {
-+                    uno::Reference< document::XDocumentEventCompatibleHelper > xVbaEventHelper( pDoc->GetModel(), uno::UNO_QUERY );
-+                    if( xVbaEventHelper.is() )
-+                    {
-+                        if( xVbaEventHelper->processCompatibleEvent( nId ) )
-+                        {
-+                            rReq.SetReturnValue(SfxBoolItem(0,FALSE));
-+                            return;
-+                        }
-+                    }
-+                }
-+            }
- 	        // quiet mode (AppEvent, API call)
- 			SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, FALSE);
- 			bSilent = pSilentItem && pSilentItem->GetValue();
-@@ -717,6 +736,15 @@ void SfxViewShell::ExecPrint_Impl( SfxRe
- 	        if ( SID_PRINTDOCDIRECT == nId )
- 	        {
- 				SfxObjectShell* pDoc = GetObjectShell();
-+                uno::Reference< document::XDocumentEventCompatibleHelper > xVbaEventHelper( pDoc->GetModel(), uno::UNO_QUERY );
-+                if( xVbaEventHelper.is() )
-+                {
-+                    if( xVbaEventHelper->processCompatibleEvent( nId ) )
-+                    {
-+                        rReq.SetReturnValue(SfxBoolItem(0,FALSE));
-+                        return;
-+                    }
-+                }
- 				bool bDetectHidden = ( !bSilent && pDoc );
- 				if ( bDetectHidden && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES )
- 					return;
---- sfx2/source/doc/objxtor.cxx.old	2009-04-02 10:43:58.000000000 +0000
-+++ sfx2/source/doc/objxtor.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -579,6 +579,13 @@ SfxObjectShell* SfxObjectShell::Current(
- 	return pFrame ? pFrame->GetObjectShell() : 0;
- }
- 
-+//-------------------------------------------------------------------------
-+
-+sal_Bool SfxObjectShell::IsInPrepareClose() const
-+{
-+    return pImp->bInPrepareClose;
-+}
-+
- //------------------------------------------------------------------------
- 
- struct BoolEnv_Impl
diff --git a/applied_patches/0287-cli_ure-prj-build-lst.diff b/applied_patches/0322-cli_ure-prj-build-lst.diff
similarity index 100%
rename from applied_patches/0287-cli_ure-prj-build-lst.diff
rename to applied_patches/0322-cli_ure-prj-build-lst.diff
diff --git a/applied_patches/0322-vba-worksheet-calculate-event-fix.diff b/applied_patches/0322-vba-worksheet-calculate-event-fix.diff
deleted file mode 100644
index f924960a0..000000000
--- a/applied_patches/0322-vba-worksheet-calculate-event-fix.diff
+++ /dev/null
@@ -1,141 +0,0 @@
---- sc/inc/document.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/inc/document.hxx	2009-04-06 16:42:00.000000000 +0000
-@@ -423,6 +423,9 @@ private:
- 
-     sal_Int16           mnNamedRangesLockCount;
- 
-+	// for worksheet calculate event
-+	::std::vector< SCTAB > maTabs;
-+
- 	inline BOOL 		RowHidden( SCROW nRow, SCTAB nTab );		// FillInfo
- 
- public:
-@@ -865,6 +868,10 @@ public:
- 	BOOL			IsForcedFormulaPending() const { return bForcedFormulaPending; }
- 					// if CalcFormulaTree() is currently running
- 	BOOL			IsCalculatingFormulaTree() { return bCalculatingFormulaTree; }
-+	
-+					// for worksheet calculate event
-+	BOOL			FireCalculateEvent( SCTAB nTab );
-+	void			AddCalculateTable( SCTAB nTab );
- 
- 	USHORT			GetErrCode( const ScAddress& ) const;
- 
---- sc/source/core/data/documen7.cxx.old	2009-04-02 10:45:01.000000000 +0000
-+++ sc/source/core/data/documen7.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -59,7 +59,15 @@
- 
- 
- #include "globstr.hrc"
-+#include <algorithm>
-+#include <vector>
- 
-+
-+#include <com/sun/star/document/XVbaEventsHelper.hpp>
-+#include <com/sun/star/document/VbaEventId.hpp>
-+
-+using namespace com::sun::star;
-+using namespace com::sun::star::document::VbaEventId;
- extern const ScFormulaCell* pLastFormulaTreeTop;	// cellform.cxx Err527 WorkAround
- 
- // STATIC DATA -----------------------------------------------------------
-@@ -520,5 +528,35 @@ void ScDocument::SetAutoCalc( BOOL bNewA
- 	}
- }
- 
-+BOOL ScDocument::FireCalculateEvent( SCTAB nTab )
-+{
-+	BOOL bSuccess = FALSE;
-+	::std::vector<SCTAB>::iterator iter;
-+	iter = ::std::find( maTabs.begin(), maTabs.end(), nTab );
-+	if( iter != maTabs.end() )
-+	{
-+		// make sure fire worksheet calculate event only once for each sheet 
-+		// regardless of how many formula cells are calculated.
-+		maTabs.erase(iter);
-+
-+		uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( GetVbaEventsHelper(), uno::UNO_QUERY );
-+		if( xVbaEventsHelper.is() )
-+		{
-+			uno::Sequence< uno::Any > aArgs(1);
-+			aArgs[0] <<= nTab;
-+			bSuccess = xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_CALCULATE, aArgs );
-+		}
-+	}	
-+	return bSuccess;
-+}
- 
-+void ScDocument::AddCalculateTable( SCTAB nTab )
-+{
-+	::std::vector<SCTAB>::iterator iter;
-+	iter = ::std::find( maTabs.begin(), maTabs.end(), nTab );
-+	if( iter == maTabs.end() )
-+	{
-+		maTabs.push_back( nTab );
-+	}
-+}
- 
---- sc/inc/cell.hxx.old	2009-04-06 16:41:50.000000000 +0000
-+++ sc/inc/cell.hxx	2009-04-06 16:42:00.000000000 +0000
-@@ -418,7 +418,7 @@ public:
- 								const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
- 
- 	void			SetDirty();
--	inline void		SetDirtyVar() { bDirty = TRUE; }
-+	void			SetDirtyVar();
-     // If setting entire document dirty after load, no broadcasts but still append to FormulaTree.
-     void            SetDirtyAfterLoad();
- 	inline void		ResetTableOpDirtyVar() { bTableOpDirty = FALSE; }
---- sc/source/core/data/cell.cxx.old	2009-04-06 16:41:50.000000000 +0000
-+++ sc/source/core/data/cell.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -1486,6 +1486,9 @@ void ScFormulaCell::Interpret()
-             }
-         } while (bIterationFromRecursion || bResumeIteration);
-     }
-+
-+	// Fire worksheet calculate event
-+	pDocument->FireCalculateEvent( aPos.Tab() );
- }
- 
- void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
-@@ -1769,7 +1772,7 @@ void __EXPORT ScFormulaCell::Notify( Svt
- 			else
-             {
-                 bForceTrack = !bDirty;
--				bDirty = TRUE;
-+				SetDirtyVar();
-             }
-             // #35962# Don't remove from FormulaTree to put in FormulaTrack to
-             // put in FormulaTree again and again, only if necessary.
-@@ -1792,7 +1795,7 @@ void ScFormulaCell::SetDirty()
- 	if ( !IsInChangeTrack() )
- 	{
- 		if ( pDocument->GetHardRecalcState() )
--			bDirty = TRUE;
-+			SetDirtyVar();
- 		else
- 		{
- 			// Mehrfach-FormulaTracking in Load und in CompileAll
-@@ -1801,7 +1804,7 @@ void ScFormulaCell::SetDirty()
- 			// setzen, z.B. in CompileTokenArray
- 			if ( !bDirty || !pDocument->IsInFormulaTree( this ) )
- 			{
--				bDirty = TRUE;
-+				SetDirtyVar();
- 				pDocument->AppendToFormulaTrack( this );
- 				pDocument->TrackFormulas();
- 			}
-@@ -1809,6 +1812,13 @@ void ScFormulaCell::SetDirty()
- 	}
- }
- 
-+void ScFormulaCell::SetDirtyVar()
-+{
-+	bDirty = TRUE;
-+	// mark the sheet of this cell to be calculated
-+	pDocument->AddCalculateTable( aPos.Tab() );
-+}
-+
- void ScFormulaCell::SetDirtyAfterLoad()
- {
-     bDirty = TRUE;
diff --git a/applied_patches/0323-basic-caller-support.diff b/applied_patches/0323-basic-caller-support.diff
deleted file mode 100644
index 019ef24e7..000000000
--- a/applied_patches/0323-basic-caller-support.diff
+++ /dev/null
@@ -1,532 +0,0 @@
-diff -up /data4/Latest/ooo-build/build/ooh680-m1/scripting/source/basprov/basscript.hxx scripting/source/basprov/basscript.hxx
---- /data4/Latest/ooo-build/build/ooh680-m1/scripting/source/basprov/basscript.hxx	2005-09-09 03:24:12.000000000 +0100
-+++ scripting/source/basprov/basscript.hxx	2007-12-19 17:19:58.000000000 +0000
-@@ -36,11 +36,13 @@
- #ifndef SCRIPTING_BASSCRIPT_HXX
- #define SCRIPTING_BASSCRIPT_HXX
- 
-+#include "bcholder.hxx"
- #include <com/sun/star/script/provider/XScript.hpp>
- #include <com/sun/star/document/XScriptInvocationContext.hpp>
- #include <cppuhelper/implbase1.hxx>
-+#include <comphelper/proparrhlp.hxx>
-+#include <comphelper/propertycontainer.hxx>
- #include <basic/sbmeth.hxx>
--
- 
- class BasicManager;
- 
-@@ -66,7 +68,11 @@ namespace basprov
-         ::com::sun::star::script::provider::XScript > BasicScriptImpl_BASE;
- 
- 
--    class BasicScriptImpl : public BasicScriptImpl_BASE
-+    class BasicScriptImpl : public BasicScriptImpl_BASE,
-+                                public ::scripting_helper::OMutexHolder,
-+                                public ::scripting_helper::OBroadcastHelperHolder,
-+                                public ::comphelper::OPropertyContainer,
-+                                public ::comphelper::OPropertyArrayUsageHelper< BasicScriptImpl >
-     {
-     private:
-         SbMethodRef         m_xMethod;
-@@ -74,6 +80,16 @@ namespace basprov
-         BasicManager*       m_documentBasicManager;
-         ::com::sun::star::uno::Reference< ::com::sun::star::document::XScriptInvocationContext >
-                             m_xDocumentScriptContext;
-+        // hack, OPropertyContainer doesn't allow you to define a property of unknown
-+        // type ( I guess because an Any can't contain an Any... I've always wondered why?
-+	// as its not unusual to do that in corba )
-+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_caller;
-+    protected:
-+        // OPropertySetHelper
-+        virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(  );
-+
-+        // OPropertyArrayUsageHelper
-+        virtual ::cppu::IPropertyArrayHelper* createArrayHelper(  ) const;
- 
-     public:
-         BasicScriptImpl(
-@@ -88,6 +104,12 @@ namespace basprov
-         );
-         virtual ~BasicScriptImpl();
- 
-+        // XInterface
-+        DECLARE_XINTERFACE()
-+
-+        // XTypeProvider
-+        DECLARE_XTYPEPROVIDER()
-+
-         // XScript
-         virtual ::com::sun::star::uno::Any SAL_CALL invoke(
-             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
-@@ -97,6 +119,9 @@ namespace basprov
-                     ::com::sun::star::script::provider::ScriptFrameworkErrorException, 
-                     ::com::sun::star::reflection::InvocationTargetException,
-                     ::com::sun::star::uno::RuntimeException );               
-+        // XPropertySet
-+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) 
-+            throw (::com::sun::star::uno::RuntimeException);
-     };
- 
- //.........................................................................
---- /data4/Latest/ooo-build/build/ooh680-m1/basic/inc/basic/sbmeth.hxx	2008-01-08 09:36:28.000000000 +0000
-+++ basic/inc/basic/sbmeth.hxx	2007-12-20 09:38:21.000000000 +0000
-@@ -49,6 +49,7 @@
- 	friend class SbIfaceMapperMethod;
- 
- 	SbMethodImpl* mpSbMethodImpl;			// Impl data
-+	SbxVariable* mCaller;                   // caller
- 	SbModule* pMod;
- 	USHORT    nDebugFlags;
- 	USHORT	  nLine1, nLine2;
-@@ -75,7 +76,7 @@
- 	void 	  GetLineRange( USHORT&, USHORT& );
- 
- 	// Schnittstelle zum Ausfuehren einer Methode aus den Applikationen
--	virtual ErrCode Call( SbxValue* pRet = NULL );
-+	virtual ErrCode Call( SbxValue* pRet = NULL,  SbxVariable* pCaller = NULL );
- 	virtual void Broadcast( ULONG nHintId );
- };
- 
---- /data4/Latest/ooo-build/build/ooh680-m1/basic/source/classes/sbxmod.cxx	2008-01-08 09:36:28.000000000 +0000
-+++ basic/source/classes/sbxmod.cxx	2007-12-20 11:22:38.000000000 +0000
-@@ -1936,6 +1936,7 @@ SbMethod::SbMethod( const String& r, Sbx
- 	nLine1		 =
- 	nLine2		 = 0;
- 	refStatics = new SbxArray;
-+    mCaller          = 0;
- 	// AB: 2.7.1996: HACK wegen 'Referenz kann nicht gesichert werden'
- 	SetFlag( SBX_NO_MODIFY );
- }
-@@ -1950,6 +1951,7 @@ SbMethod::SbMethod( const SbMethod& r )
- 	nLine1		 = r.nLine1;
- 	nLine2		 = r.nLine2;
-         refStatics = r.refStatics; 
-+ 	mCaller          = r.mCaller; 
- 	SetFlag( SBX_NO_MODIFY );
- }
- 
-@@ -2018,8 +2020,13 @@ SbxInfo* SbMethod::GetInfo()
- // Schnittstelle zum Ausfuehren einer Methode aus den Applikationen
- // #34191# Mit speziellem RefCounting, damit das Basic nicht durch CloseDocument()
- // abgeschossen werden kann. Rueckgabewert wird als String geliefert.
--ErrCode SbMethod::Call( SbxValue* pRet )
-+ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
- {
-+	if ( pCaller )
-+	{
-+ 		OSL_TRACE("SbMethod::Call Have been passed a caller 0x%x", pCaller );
-+		mCaller = pCaller;
-+	}
- 	// RefCount vom Modul hochzaehlen
- 	SbModule* pMod_ = (SbModule*)GetParent();
- 	pMod_->AddRef();
-@@ -2047,7 +2054,7 @@ ErrCode SbMethod::Call( SbxValue* pRet )
- 	// Objekte freigeben
- 	pMod_->ReleaseRef();
- 	pBasic->ReleaseRef();
--
-+	mCaller = 0;
- 	return nErr;
- }
- 
---- /data4/Latest/ooo-build/build/ooh680-m1/basic/source/runtime/runtime.cxx	2008-01-08 09:36:28.000000000 +0000
-+++ basic/source/runtime/runtime.cxx	2007-12-20 11:23:14.000000000 +0000
-@@ -491,7 +491,7 @@ SbxArray* SbiInstance::GetLocals( SbMeth
- 
- SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
- 		 : rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ), 
--		   pMod( pm ), pMeth( pe ), pImg( pMod->pImage ), m_nLastTime(0)
-+		   pMod( pm ), pMeth( pe ), pImg( pMod->pImage ), mpExtCaller(0), m_nLastTime(0)
- {
- 	nFlags	  = pe ? pe->GetDebugFlags() : 0;
- 	pIosys	  = pInst->pIosys;
-@@ -545,6 +545,18 @@ SbiRuntime::~SbiRuntime()
- 	}
- }
- 
-+void SbiRuntime::SetVBAEnabled(bool bEnabled )
-+{
-+	bVBAEnabled = bEnabled; 
-+	if ( bVBAEnabled )
-+	{
-+		if ( pMeth )
-+			mpExtCaller = pMeth->mCaller;
-+	}
-+	else
-+		mpExtCaller = 0;
-+}
-+
- // Aufbau der Parameterliste. Alle ByRef-Parameter werden direkt
- // uebernommen; von ByVal-Parametern werden Kopien angelegt. Falls
- // ein bestimmter Datentyp verlangt wird, wird konvertiert.
---- /data4/Latest/ooo-build/build/ooh680-m1/basic/source/inc/runtime.hxx	2008-01-08 09:36:28.000000000 +0000
-+++ basic/source/inc/runtime.hxx	2007-12-20 11:21:36.000000000 +0000
-@@ -338,6 +338,7 @@ class SbiRuntime
- 	SbxArrayRef   refCaseStk;       // CASE expression stack
- 	SbxArrayRef   refRedimpArray;   // Array saved to use for REDIM PRESERVE
- 	SbxVariableRef xDummyVar;		// Ersatz fuer nicht gefundene Variablen
-+	SbxVariable* mpExtCaller;		// Caller ( external - e.g. button name, shape, range object etc. - only in vba mode )
- 	SbiArgvStack*  pArgvStk;		// ARGV-Stack
- 	SbiGosubStack* pGosubStk;		// GOSUB stack
- 	SbiForStack*   pForStk;			// FOR/NEXT-Stack
-@@ -479,7 +480,7 @@ class SbiRuntime
- 	void StepFIND_CM( UINT32, UINT32 );
- 	void StepFIND_STATIC( UINT32, UINT32 );
- public:
--	void          SetVBAEnabled( bool bEnabled ) { bVBAEnabled = bEnabled; };            
-+	void          SetVBAEnabled( bool bEnabled );           
- 	USHORT		GetImageFlag( USHORT n ) const;
- 	USHORT		GetBase();
- 	xub_StrLen  nLine,nCol1,nCol2;	// aktuelle Zeile, Spaltenbereich
-@@ -502,6 +503,7 @@ public:
- 	SbMethod* GetCaller();
- 	SbxArray* GetLocals();
- 	SbxArray* GetParams();
-+	SbxVariable* GetExternalCaller(){ return mpExtCaller; }
- 
- 	SbxBase* FindElementExtern( const String& rName );
- 	static bool isVBAEnabled();
---- /data4/Latest/ooo-build/build/ooh680-m1/basic/source/runtime/methods.cxx	2008-01-08 09:36:28.000000000 +0000
-+++ basic/source/runtime/methods.cxx	2007-12-19 16:44:56.000000000 +0000
-@@ -948,6 +948,26 @@ RTLFUNC(Hex)
- 	}
- }
- 
-+RTLFUNC(FuncCaller)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+    if ( SbiRuntime::isVBAEnabled() &&  pINST && pINST->pRun )
-+    {
-+        if ( pINST->pRun->GetExternalCaller() )
-+            *rPar.Get(0) =  *pINST->pRun->GetExternalCaller();
-+        else
-+        {
-+            SbxVariableRef pVar = new SbxVariable(SbxVARIANT);
-+            *rPar.Get(0) = *pVar;
-+        }
-+    }
-+    else
-+    {
-+        StarBASIC::Error( SbERR_NOT_IMPLEMENTED );
-+    }
-+
-+}
- // InStr( [start],string,string,[compare] )
- 
- RTLFUNC(InStr)
-
---- /data4/Latest/ooo-build/build/ooh680-m1/basic/source/runtime/stdobj.cxx	2008-01-08 09:36:28.000000000 +0000
-+++ basic/source/runtime/stdobj.cxx	2007-12-19 16:26:50.000000000 +0000
-@@ -608,6 +608,7 @@ static Methods aMethods[] = {
- 
- { "Wait",        	SbxNULL,      1 | _FUNCTION, RTLNAME(Wait),0            },
-   { "Milliseconds", SbxLONG, 0,NULL,0 },
-+{ "FuncCaller",          SbxVARIANT,      _FUNCTION, RTLNAME(FuncCaller),0      },
- //#i64882#
- { "WaitUntil",          SbxNULL,      1 | _FUNCTION, RTLNAME(WaitUntil),0      },
-   { "Date", SbxDOUBLE, 0,NULL,0 },
---- /data4/Latest/ooo-build/build/ooh680-m1/basic/source/runtime/rtlproto.hxx	2008-01-08 09:36:28.000000000 +0000
-+++ basic/source/runtime/rtlproto.hxx	2007-12-19 16:38:09.000000000 +0000
-@@ -303,6 +303,7 @@ extern RTLFUNC(Switch);
- extern RTLFUNC(Wait);
- //i#64882# add new WaitUntil
- extern RTLFUNC(WaitUntil);
-+extern RTLFUNC(FuncCaller);
- 
- extern RTLFUNC(GetGUIVersion);
- extern RTLFUNC(Choose);
---- /data4/Latest/ooo-build/build/ooh680-m1/sfx2/inc/sfx2/objsh.hxx	2008-01-08 09:36:27.000000000 +0000
-+++ sfx2/inc/sfx2/objsh.hxx	2008-01-10 11:25:23.000000000 +0000
-@@ -449,7 +449,8 @@ public:
-         ::com::sun::star::uno::Any& aRet,
-         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
-         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
--        bool bRaiseError = true
-+        bool bRaiseError = true,
-+        ::com::sun::star::uno::Any* aCaller = 0
-     );
- 
-     static ErrCode  CallXScript(
-@@ -459,7 +460,8 @@ public:
-         ::com::sun::star::uno::Any& aRet,
-         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
-         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
--        bool bRaiseError = true
-+        bool bRaiseError = true,
-+        ::com::sun::star::uno::Any* aCaller = 0
-     );
- 
-     /** adjusts the internal macro mode, according to the current security settings
---- /data4/Latest/ooo-build/build/ooh680-m1/sfx2/source/doc/objmisc.cxx	2008-01-08 09:36:27.000000000 +0000
-+++ sfx2/source/doc/objmisc.cxx	2008-01-10 15:12:14.000000000 +0000
-@@ -1515,7 +1515,7 @@ namespace
- }
- 
- ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const ::rtl::OUString& _rScriptURL,
--    const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError )
-+    const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, ::com::sun::star::uno::Any* pCaller )
- {
-     OSL_TRACE( "in CallXScript" );
- 	ErrCode nErr = ERRCODE_NONE;
-@@ -1546,7 +1546,16 @@ ErrCode SfxObjectShell::CallXScript( con
- 
-         // obtain the script, and execute it
-         Reference< provider::XScript > xScript( xScriptProvider->getScript( _rScriptURL ), UNO_QUERY_THROW );
--
-+        if ( pCaller && pCaller->hasValue() )
-+        {
-+            Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY ); 
-+            if ( xProps.is() )
-+            {
-+                Sequence< uno::Any > aArgs( 1 );
-+                aArgs[ 0 ] = *pCaller;
-+                xProps->setPropertyValue( rtl::OUString::createFromAscii("Caller"), uno::makeAny( aArgs ) );
-+            }
-+        }
-         aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam );
-     }
-     catch ( const uno::Exception& )
-@@ -1580,9 +1589,9 @@ ErrCode SfxObjectShell::CallXScript( con
-         ::com::sun::star::uno::Any& aRet,
-         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
-         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
--            aOutParam, bool bRaiseError )
-+            aOutParam, bool bRaiseError, ::com::sun::star::uno::Any* pCaller )
- {
--    return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError );
-+    return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError, pCaller );
- }
- 
- //-------------------------------------------------------------------------
---- /data4/Latest/ooo-build/build/ooh680-m1/sc/source/ui/drawfunc/fusel.cxx	2008-01-08 09:36:20.000000000 +0000
-+++ sc/source/ui/drawfunc/fusel.cxx	2008-01-10 15:25:12.000000000 +0000
-@@ -221,13 +221,23 @@ BOOL __EXPORT FuSelection::MouseButtonDo
-                        SfxObjectShell* pObjSh = SfxObjectShell::Current();
-                        if ( pObjSh && SfxApplication::IsXScriptURL( pInfo->GetMacro() ) )
-                        {
-+                           uno::Reference< beans::XPropertySet > xProps( pObj->getUnoShape(), uno::UNO_QUERY );
-+                           uno::Any aCaller;
-+                           if ( xProps.is() )
-+                           {
-+                               try
-+                               {
-+                                   aCaller = xProps->getPropertyValue( rtl::OUString::createFromAscii("Name") );
-+                               }
-+                               catch( uno::Exception& ) {}
-+                           }
-                            uno::Any aRet;
-                            uno::Sequence< sal_Int16 > aOutArgsIndex;
-                            uno::Sequence< uno::Any > aOutArgs;
-                            uno::Sequence< uno::Any >* pInArgs =
-                                new uno::Sequence< uno::Any >(0);
-                            pObjSh->CallXScript( pInfo->GetMacro(),
--                               *pInArgs, aRet, aOutArgsIndex, aOutArgs);
-+                               *pInArgs, aRet, aOutArgsIndex, aOutArgs, true, &aCaller );
-                            pViewShell->FakeButtonUp( pViewShell->GetViewData()->GetActivePart() );
-                            return TRUE;        // kein CaptureMouse etc.
-                        }
---- /data4/Latest/ooo-build/build/ooh680-m1/sc/source/ui/drawfunc/makefile.mk	2005-09-08 22:00:04.000000000 +0100
-+++ sc/source/ui/drawfunc/makefile.mk	2008-01-10 15:19:30.000000000 +0000
-@@ -90,6 +90,7 @@ SLOFILES =  \
-         $(SLO)$/mediash.obj
- 
- EXCEPTIONSFILES= \
-+        $(SLO)$/fusel.obj \
-         $(SLO)$/fuins2.obj
- 
- NOOPTFILES=\
---- /data4/Latest/ooo-build/build/ooh680-m1/svx/source/form/fmscriptingenv.cxx	2008-01-08 09:36:27.000000000 +0000
-+++ svx/source/form/fmscriptingenv.cxx	2008-01-10 12:10:21.000000000 +0000
-@@ -59,6 +59,8 @@
- #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
- #include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp>
- #include <com/sun/star/lang/DisposedException.hpp>
-+#include <com/sun/star/lang/EventObject.hpp>
-+#include <com/sun/star/awt/XControl.hpp>
- /** === end UNO includes === **/
- #include <tools/diagnose_ex.h>
- #include <cppuhelper/implbase1.hxx>
-@@ -111,6 +115,9 @@ namespace svxform
-     using ::com::sun::star::uno::Exception;
-     using ::com::sun::star::uno::Sequence;
-     using ::com::sun::star::uno::XInterface;
-+    using ::com::sun::star::lang::EventObject;
-+    using ::com::sun::star::awt::XControl;
-+    using ::com::sun::star::beans::XPropertySet;
- 	/** === end UNO using === **/
- 
-     class FormScriptingEnvironment;
-@@ -453,8 +460,19 @@ namespace svxform
-         {
-             Sequence< sal_Int16 > aOutArgsIndex;
-             Sequence< Any > aOutArgs;
--
--            m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs );
-+            EventObject aEvent;
-+            Any aCaller;
-+            if ( ( _rArguments.getLength() > 0 ) && ( _rArguments[ 0 ] >>= aEvent ) )
-+            {
-+                try
-+                {
-+                    Reference< XControl > xControl( aEvent.Source, UNO_QUERY_THROW );
-+                    Reference< XPropertySet > xProps( xControl->getModel(), UNO_QUERY_THROW );
-+                    aCaller = xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) );
-+                }
-+                catch( Exception& ) {}
-+            }
-+            m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs, true, aCaller.hasValue() ? &aCaller : 0 );
-         }
- 
-         //................................................................
---- /data4/Latest/ooo-build/build/ooh680-m1/scripting/source/vbaevents/eventhelper.cxx	2008-01-08 09:36:27.000000000 +0000
-+++ scripting/source/vbaevents/eventhelper.cxx	2008-01-10 14:39:12.000000000 +0000
-@@ -808,7 +808,16 @@ EventListener::firing_Impl(const ScriptE
-                     {
-                         uno::Reference< script::provider::XScript > xScript = xScriptProvider->getScript( url );
-                         if ( xScript.is() )
--                           xScript->invoke( aArguments, aOutArgsIndex, aOutArgs  );
-+                         {
-+                            uno::Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY );
-+                            if ( xProps.is() )
-+                            {
-+                                Sequence< Any > aCallerHack(1);
-+                                aCallerHack[ 0 ] = uno::makeAny( rtl::OUString::createFromAscii("Error") );
-+                                xProps->setPropertyValue( rtl::OUString::createFromAscii( "Caller" ), uno::makeAny( aCallerHack ) );
-+                            }
-+                            xScript->invoke( aArguments, aOutArgsIndex, aOutArgs  );
-+                         }
-                     }
-                     catch ( uno::Exception& e )
-                     {
---- scripting/source/basprov/basscript.cxx	2008-04-25 18:33:48.000000000 +0100
-+++ scripting/source/basprov/basscript.cxx	2008-04-25 18:23:29.000000000 +0100
-@@ -64,7 +64,10 @@
- #include <basic/sbmeth.hxx>
- #include <basic/basmgr.hxx>
- #include <com/sun/star/script/provider/ScriptFrameworkErrorType.hpp>
--
-+#include "bcholder.hxx"
-+#include <comphelper/proparrhlp.hxx>
-+#include <comphelper/propertycontainer.hxx>
-+#include <com/sun/star/beans/PropertyAttribute.hpp>
- #include <map>
- 
- 
-@@ -73,6 +76,7 @@ using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::script;
- using namespace ::com::sun::star::document;
-+using namespace ::com::sun::star::beans;
- 
- extern ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
- extern void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue );
-@@ -82,6 +86,10 @@ extern void unoToSbxValue( SbxVariable* 
- namespace basprov
- {
- //.........................................................................
-+#define BASSCRIPT_PROPERTY_ID_CALLER         1
-+#define BASSCRIPT_PROPERTY_CALLER            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Caller" ) )
-+
-+#define BASSCRIPT_DEFAULT_ATTRIBS()       PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT
- 
-     typedef ::std::map< sal_Int16, Any, ::std::less< sal_Int16 > > OutParamMap;
- 
-@@ -92,22 +100,28 @@ namespace basprov
-     // -----------------------------------------------------------------------------
- 
-     BasicScriptImpl::BasicScriptImpl( const ::rtl::OUString& funcName, SbMethodRef xMethod )
--        :m_xMethod( xMethod )
-+        : ::scripting_helper::OBroadcastHelperHolder( m_aMutex )
-+        ,OPropertyContainer( GetBroadcastHelper() )
-+        ,m_xMethod( xMethod )
-         ,m_funcName( funcName )
-         ,m_documentBasicManager( NULL )
-         ,m_xDocumentScriptContext()
-     {
-+        registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) );
-     }
- 
-     // -----------------------------------------------------------------------------
- 
-     BasicScriptImpl::BasicScriptImpl( const ::rtl::OUString& funcName, SbMethodRef xMethod,
--        BasicManager& documentBasicManager, const Reference< XScriptInvocationContext >& documentScriptContext )
--        :m_xMethod( xMethod )
-+        BasicManager& documentBasicManager, const Reference< XScriptInvocationContext >& documentScriptContext ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex )
-+        ,OPropertyContainer( GetBroadcastHelper() )
-+        ,m_xMethod( xMethod )
-         ,m_funcName( funcName )
-         ,m_documentBasicManager( &documentBasicManager )
-         ,m_xDocumentScriptContext( documentScriptContext )
-     {
-+	// 
-+        registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) );
-     }
- 
-     // -----------------------------------------------------------------------------
-@@ -116,6 +130,48 @@ namespace basprov
-     }
- 
-     // -----------------------------------------------------------------------------
-+    // XInterface
-+    // -----------------------------------------------------------------------------
-+
-+    IMPLEMENT_FORWARD_XINTERFACE2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
-+
-+    // -----------------------------------------------------------------------------
-+    // XTypeProvider
-+    // -----------------------------------------------------------------------------
-+
-+    IMPLEMENT_FORWARD_XTYPEPROVIDER2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
-+
-+    // -----------------------------------------------------------------------------
-+    // OPropertySetHelper
-+    // -----------------------------------------------------------------------------
-+
-+    ::cppu::IPropertyArrayHelper& BasicScriptImpl::getInfoHelper(  )
-+    {
-+        return *getArrayHelper();
-+    }
-+
-+    // -----------------------------------------------------------------------------
-+    // OPropertyArrayUsageHelper
-+    // -----------------------------------------------------------------------------
-+
-+    ::cppu::IPropertyArrayHelper* BasicScriptImpl::createArrayHelper(  ) const
-+    {
-+        Sequence< Property > aProps;
-+        describeProperties( aProps );
-+        return new ::cppu::OPropertyArrayHelper( aProps );
-+    }
-+
-+    // -----------------------------------------------------------------------------
-+    // XPropertySet
-+    // -----------------------------------------------------------------------------
-+
-+    Reference< XPropertySetInfo > BasicScriptImpl::getPropertySetInfo(  ) throw (RuntimeException)
-+    {
-+        Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
-+        return xInfo;
-+    }
-+
-+    // -----------------------------------------------------------------------------
-     // XScript
-     // -----------------------------------------------------------------------------
- 
-@@ -194,8 +250,14 @@ namespace basprov
-                 if ( m_documentBasicManager && m_xDocumentScriptContext.is() )
-                     aOldThisComponent = m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( m_xDocumentScriptContext ) );
- 
-+            if ( m_caller.getLength() && m_caller[ 0 ].hasValue()  )
-+            {
-+                SbxVariableRef xCallerVar = new SbxVariable( SbxVARIANT );
-+                unoToSbxValue( static_cast< SbxVariable* >( xCallerVar ), m_caller[ 0 ] );
-+                nErr = m_xMethod->Call( xReturn, xCallerVar );
-+            }
-+            else
-                 nErr = m_xMethod->Call( xReturn );
--
-                 if ( m_documentBasicManager && m_xDocumentScriptContext.is() )
-                     m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", aOldThisComponent );
-             }
diff --git a/applied_patches/0288-mono-climaker-config.diff b/applied_patches/0323-mono-climaker-config.diff
similarity index 100%
rename from applied_patches/0288-mono-climaker-config.diff
rename to applied_patches/0323-mono-climaker-config.diff
diff --git a/applied_patches/0289-mono-climaker-bridgetest.diff b/applied_patches/0324-mono-climaker-bridgetest.diff
similarity index 100%
rename from applied_patches/0289-mono-climaker-bridgetest.diff
rename to applied_patches/0324-mono-climaker-bridgetest.diff
diff --git a/applied_patches/0324-vba-empty-comparison-fix.diff b/applied_patches/0324-vba-empty-comparison-fix.diff
deleted file mode 100644
index a9550e9c6..000000000
--- a/applied_patches/0324-vba-empty-comparison-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- basic/source/sbx/sbxvalue.cxx.orig	2008-06-10 12:50:41.000000000 +0800
-+++ basic/source/sbx/sbxvalue.cxx	2008-06-10 12:55:14.000000000 +0800
-@@ -1470,7 +1470,7 @@ BOOL SbxValue::Compare( SbxOperator eOp,
- 		bRes = TRUE;
-     }
- 	else if( GetType() == SbxEMPTY && rOp.GetType() == SbxEMPTY )
--		bRes = TRUE;
-+		bRes = !bVBAInterop ? TRUE : ( eOp == SbxEQ ? TRUE : FALSE );
- 	// Sonderregel 1: Ist ein Operand Null, ist das Ergebnis FALSE
- 	else if( GetType() == SbxNULL || rOp.GetType() == SbxNULL )
- 		bRes = FALSE;
diff --git a/applied_patches/0325-cws-vbasupportdev300.diff b/applied_patches/0325-cws-vbasupportdev300.diff
new file mode 100644
index 000000000..ce24b918c
--- /dev/null
+++ b/applied_patches/0325-cws-vbasupportdev300.diff
@@ -0,0 +1,91032 @@
+Index: xmloff/source/forms/formattributes.hxx
+===================================================================
+--- xmloff/source/forms/formattributes.hxx	(revision 276159)
++++ xmloff/source/forms/formattributes.hxx	(revision 276288)
+@@ -126,6 +126,7 @@ namespace xmloff
+ 	#define SCA_MAX_VALUE				0x00000002
+ 	#define SCA_MIN_VALUE				0x00000004
+ 	#define SCA_VALIDATION				0x00000008
++    #define SCA_GROUP_NAME              0x00000010
+ 	#define SCA_MULTI_LINE				0x00000020
+ 	#define SCA_AUTOMATIC_COMPLETION	0x00000080
+ 	#define SCA_MULTIPLE				0x00000100
+Index: xmloff/source/forms/elementexport.cxx
+===================================================================
+--- xmloff/source/forms/elementexport.cxx	(revision 276159)
++++ xmloff/source/forms/elementexport.cxx	(revision 276288)
+@@ -1113,6 +1113,39 @@ namespace xmloff
+ 		}
+ 
+ 		// ----------------------------------
++		// the string properties
++		{
++			static sal_Int32 nStringPropertyAttributeIds[] =
++			{	// attribute flags
++				SCA_GROUP_NAME
++			};
++			static const ::rtl::OUString* pStringPropertyNames[] =
++			{	// property names
++				&PROPERTY_GROUP_NAME
++			};
++
++			sal_Int32 nIdCount = sizeof( nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
++		#if OSL_DEBUG_LEVEL > 0
++			sal_Int32 nNameCount = sizeof( pStringPropertyNames ) / sizeof( pStringPropertyNames[0] );
++			OSL_ENSURE( ( nIdCount == nNameCount ),
++				"OControlExport::exportSpecialAttributes: somebody tampered with the maps (2)!" );
++		#endif
++			for ( i = 0; i < nIdCount; ++i )
++				if ( nStringPropertyAttributeIds[i] & m_nIncludeSpecial )
++				{
++					exportStringPropertyAttribute(
++						OAttributeMetaData::getSpecialAttributeNamespace( nStringPropertyAttributeIds[i] ),
++						OAttributeMetaData::getSpecialAttributeName( nStringPropertyAttributeIds[i] ),
++						*( pStringPropertyNames[i] )
++					);
++			#if OSL_DEBUG_LEVEL > 0
++				//  reset the bit for later checking
++				m_nIncludeSpecial = m_nIncludeSpecial & ~nStringPropertyAttributeIds[i];
++			#endif
++				}
++		}
++
++		// ----------------------------------
+ 		if ((SCA_MIN_VALUE | SCA_MAX_VALUE) & m_nIncludeSpecial)
+ 		{
+ 			// need to export the min value and the max value as attributes
+@@ -1570,6 +1603,8 @@ namespace xmloff
+ 				}
+                 if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_IMAGE_POSITION ) )
+                     m_nIncludeSpecial |= SCA_IMAGE_POSITION;
++                if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_GROUP_NAME ) )
++                    m_nIncludeSpecial |= SCA_GROUP_NAME;
+ 				m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED;
+ 				m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
+ 				break;
+Index: xmloff/source/forms/strings.hxx
+===================================================================
+--- xmloff/source/forms/strings.hxx	(revision 276159)
++++ xmloff/source/forms/strings.hxx	(revision 276288)
+@@ -208,6 +208,7 @@ namespace xmloff
+     XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION,     "ImagePosition");
+     XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_ALIGN,        "ImageAlign");
+     XMLFORM_CONSTASCII_STRING( PROPERTY_SCALE_IMAGE,        "ScaleImage");
++    XMLFORM_CONSTASCII_STRING( PROPERTY_GROUP_NAME,         "GroupName");
+ 
+     XMLFORM_CONSTASCII_STRING( PROPERTY_BOUND_CELL,		    "BoundCell");
+     XMLFORM_CONSTASCII_STRING( PROPERTY_LIST_CELL_RANGE,    "CellRange");
+Index: xmloff/source/forms/layerimport.cxx
+===================================================================
+--- xmloff/source/forms/layerimport.cxx	(revision 276159)
++++ xmloff/source/forms/layerimport.cxx	(revision 276288)
+@@ -98,6 +98,8 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl
+ 	m_aAttributeMetaData.addStringProperty(
+ 		OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), PROPERTY_NAME);
+ 	m_aAttributeMetaData.addStringProperty(
++			OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), PROPERTY_GROUP_NAME);
++		m_aAttributeMetaData.addStringProperty(
+ 		OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), PROPERTY_IMAGEURL);
+ 	m_aAttributeMetaData.addStringProperty(
+ 		OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), PROPERTY_LABEL);
+Index: xmloff/source/forms/formattributes.cxx
+===================================================================
+--- xmloff/source/forms/formattributes.cxx	(revision 276159)
++++ xmloff/source/forms/formattributes.cxx	(revision 276288)
+@@ -195,6 +195,7 @@ namespace xmloff
+ 			case SCA_MAX_VALUE:				return "max-value";
+ 			case SCA_MIN_VALUE:				return "min-value";
+ 			case SCA_VALIDATION:			return "validation";
++            case SCA_GROUP_NAME:            return "group-name";
+ 			case SCA_MULTI_LINE:			return "multi-line";
+ 			case SCA_AUTOMATIC_COMPLETION:	return "auto-complete";
+ 			case SCA_MULTIPLE: 				return "multiple";
+@@ -215,9 +216,12 @@ namespace xmloff
+ 	}
+ 
+ 	//---------------------------------------------------------------------
+-	sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 /*_nId*/)
++	sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 _nId)
+ 	{
+-		// nothing special here
++        switch( _nId )
++        {
++            case SCA_GROUP_NAME:            return XML_NAMESPACE_FORMX;
++        }
+ 		return XML_NAMESPACE_FORM;
+ 	}
+ 
+Index: xmloff/source/core/xmltoken.cxx
+===================================================================
+--- xmloff/source/core/xmltoken.cxx	(revision 276159)
++++ xmloff/source/core/xmltoken.cxx	(revision 276288)
+@@ -152,6 +152,10 @@ namespace xmloff { namespace token {
+         TOKEN( "grddl",                                 XML_NP_GRDDL ),
+         TOKEN( "http://www.w3.org/2003/g/data-view#",   XML_N_GRDDL ),
+ 
++        // jonp: 2008-09-24 Excel Interop
++        TOKEN( "formx",                           XML_NP_FORMX ),
++        TOKEN( "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0", XML_N_FORMX ),
++
+         // units
+         TOKEN( "mm",                              XML_UNIT_MM ),
+         TOKEN( "m",                               XML_UNIT_M ),
+Index: xmloff/source/core/xmlimp.cxx
+===================================================================
+--- xmloff/source/core/xmlimp.cxx	(revision 276159)
++++ xmloff/source/core/xmlimp.cxx	(revision 276288)
+@@ -111,6 +111,7 @@ sal_Char __READONLY_DATA sXML_np__script[] = "_scr
+ sal_Char __READONLY_DATA sXML_np__config[] = "_config";
+ sal_Char __READONLY_DATA sXML_np__db[] = "_db";
+ sal_Char __READONLY_DATA sXML_np__xforms[] = "_xforms";
++sal_Char __READONLY_DATA sXML_np__formx[] = "_formx";
+ sal_Char __READONLY_DATA sXML_np__xsd[] = "_xsd";
+ sal_Char __READONLY_DATA sXML_np__xsi[] = "_xsi";
+ sal_Char __READONLY_DATA sXML_np__field[] = "_field";
+@@ -296,6 +297,9 @@ void SvXMLImport::_InitCtor()
+         mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xforms) ),
+                             GetXMLToken(XML_N_XFORMS_1_0),
+                             XML_NAMESPACE_XFORMS );
++        mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__formx) ),
++                            GetXMLToken( XML_N_FORMX ),
++                            XML_NAMESPACE_FORMX );
+         mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xsd) ),
+                             GetXMLToken(XML_N_XSD),
+                             XML_NAMESPACE_XSD );
+Index: xmloff/source/core/xmlexp.cxx
+===================================================================
+--- xmloff/source/core/xmlexp.cxx	(revision 276159)
++++ xmloff/source/core/xmlexp.cxx	(revision 276288)
+@@ -339,6 +339,7 @@ void SvXMLExport::_InitCtor()
+ 		mpNamespaceMap->Add( GetXMLToken(XML_NP_XSD), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD );
+ 		mpNamespaceMap->Add( GetXMLToken(XML_NP_XSI), GetXMLToken(XML_N_XSI), XML_NAMESPACE_XSI );
+ 		mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
++		mpNamespaceMap->Add( GetXMLToken(XML_NP_FORMX), GetXMLToken(XML_N_FORMX), XML_NAMESPACE_FORMX );
+ 	}
+     // RDFa: needed for content and header/footer styles
+     if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
+Index: xmloff/source/draw/eventimp.cxx
+===================================================================
+--- xmloff/source/draw/eventimp.cxx	(revision 276159)
++++ xmloff/source/draw/eventimp.cxx	(revision 276288)
+@@ -104,9 +104,6 @@ class SdXMLEventContext : public SvXMLImportContex
+ 
+ 	sal_Bool mbValid;
+ 	sal_Bool mbScript;
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-    sal_Bool mbActionEvent;
+-#endif
+ 	ClickAction meClickAction;
+ 	XMLEffect meEffect;
+ 	XMLEffectDirection meDirection;
+@@ -118,9 +115,6 @@ class SdXMLEventContext : public SvXMLImportContex
+ 	OUString msMacroName;
+ 	OUString msBookmark;
+ 	OUString msLanguage;
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-    OUString msHyperURL;
+-#endif
+ };
+ 
+ ///////////////////////////////////////////////////////////////////////
+@@ -179,18 +173,11 @@ TYPEINIT1( SdXMLEventContext, SvXMLImportContext )
+ 
+ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,  sal_uInt16 nPrfx, const OUString& rLocalName,  const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape )
+ :	SvXMLImportContext(rImp, nPrfx, rLocalName),
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-    mxShape( rxShape ), mbScript( sal_False ), mbActionEvent( sal_False ), meClickAction( ClickAction_NONE ),
+-#else
+     mxShape( rxShape ), mbScript( sal_False ), meClickAction( ClickAction_NONE ),
+-#endif
+ 	meEffect( EK_none ), meDirection( ED_none ), mnStartScale( 100 ),
+ 	meSpeed( AnimationSpeed_MEDIUM ), mnVerb(0), mbPlayFull( sal_False )
+ {
+     static const OUString sXMLClickName( RTL_CONSTASCII_USTRINGPARAM( "click" ) );
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-    static const OUString sXMLActionName( RTL_CONSTASCII_USTRINGPARAM( "action" ) );
+-#endif
+ 
+     if( nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_EVENT_LISTENER ) )
+ 	{
+@@ -261,12 +248,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport&
+ 				sEventName = sValue;
+ 				sal_uInt16 nScriptPrefix =
+ 					GetImport().GetNamespaceMap().GetKeyByAttrName( sValue, &sEventName );
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-                mbValid = XML_NAMESPACE_DOM == nScriptPrefix && ( sEventName == sXMLClickName || sEventName == sXMLActionName );
+-                mbActionEvent = mbValid && (sEventName == sXMLActionName);
+-#else
+                 mbValid = XML_NAMESPACE_DOM == nScriptPrefix && sEventName == sXMLClickName;
+-#endif
+ 			}
+ 			else if( IsXMLToken( aAttrLocalName, XML_LANGUAGE ) )
+ 			{
+@@ -295,12 +277,6 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport&
+ 				{
+ 					msMacroName = sValue;
+ 				}
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-                else if ( mbActionEvent )
+-                {
+-                    msHyperURL = sValue;
+-                }
+-#endif
+ 				else
+ 				{
+ 					const rtl::OUString &rTmp =
+@@ -346,26 +322,6 @@ void SdXMLEventContext::EndElement()
+         OUString sAPIEventName;
+         uno::Sequence< beans::PropertyValue > aProperties;
+ 
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-        if( mbActionEvent )
+-        {
+-            sAPIEventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "OnAction" ) );
+-            aProperties.realloc( 2 );
+-            beans::PropertyValue* pProperty = aProperties.getArray();
+-
+-            pProperty->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) );
+-            pProperty->Handle = -1;
+-            pProperty->Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "Action" ) );
+-            pProperty->State = beans::PropertyState_DIRECT_VALUE;
+-            ++pProperty;
+-            pProperty->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+-            pProperty->Handle = -1;
+-            pProperty->Value <<= msHyperURL;
+-            pProperty->State = beans::PropertyState_DIRECT_VALUE;
+-        }
+-        else
+-#endif
+-        {
+             sAPIEventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) );
+ 
+             if( mbScript )
+@@ -550,8 +506,6 @@ void SdXMLEventContext::EndElement()
+                     break;
+                 }
+             }
+-        }
+-
+         xEvents->replaceByName( sAPIEventName, uno::Any( aProperties ) );
+ 
+     } while(0);
+Index: xmloff/source/draw/ximpshap.cxx
+===================================================================
+--- xmloff/source/draw/ximpshap.cxx	(revision 276159)
++++ xmloff/source/draw/ximpshap.cxx	(revision 276288)
+@@ -375,6 +375,11 @@ void SdXMLShapeContext::EndElement()
+ 
+ 	if( msHyperlink.getLength() != 0 ) try
+ 	{
++		uno::Reference< beans::XPropertySet > xProp( mxShape, uno::UNO_QUERY );
++
++		rtl::OUString sLink( RTL_CONSTASCII_USTRINGPARAM( "Hyperlink" ) );
++		if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName( sLink ) )
++			xProp->setPropertyValue( sLink, uno::Any( msHyperlink ) );
+         Reference< XEventsSupplier > xEventsSupplier( mxShape, UNO_QUERY_THROW );
+         Reference< XNameReplace > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW );
+ 
+@@ -3230,9 +3235,16 @@ SvXMLImportContext *SdXMLFrameShapeContext::Create
+ 
+ 	if( !mxImplContext.Is() )
+ 	{
+-		pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
++
++		SvXMLShapeContext* pShapeContext= GetImport().GetShapeImport()->CreateFrameChildContext(
+ 						GetImport(), nPrefix, rLocalName, xAttrList, mxShapes, mxAttrList );
+ 
++		pContext = pShapeContext;
++
++		// propagate the hyperlink to child context
++		if ( msHyperlink.getLength() > 0 )
++			pShapeContext->setHyperlink( msHyperlink );
++ 
+ 		mxImplContext = pContext;
+ 		mbSupportsReplacement = IsXMLToken( rLocalName, XML_OBJECT ) ||
+ 								IsXMLToken( rLocalName, XML_OBJECT_OLE );
+Index: xmloff/source/draw/shapeexport.cxx
+===================================================================
+--- xmloff/source/draw/shapeexport.cxx	(revision 276159)
++++ xmloff/source/draw/shapeexport.cxx	(revision 276288)
+@@ -87,11 +87,6 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
+ 	msStartShape( RTL_CONSTASCII_USTRINGPARAM("StartShape") ),
+ 	msEndShape( RTL_CONSTASCII_USTRINGPARAM("EndShape") ),
+ 	msOnClick( RTL_CONSTASCII_USTRINGPARAM("OnClick") ),
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-	msOnAction( RTL_CONSTASCII_USTRINGPARAM("OnAction") ),
+-	msAction( RTL_CONSTASCII_USTRINGPARAM("Action") ),
+-	msURL( RTL_CONSTASCII_USTRINGPARAM("URL") ),
+-#endif
+ 	msEventType( RTL_CONSTASCII_USTRINGPARAM("EventType") ),
+ 	msPresentation( RTL_CONSTASCII_USTRINGPARAM("Presentation") ),
+ 	msMacroName( RTL_CONSTASCII_USTRINGPARAM("MacroName") ),
+Index: xmloff/source/draw/shapeexport2.cxx
+===================================================================
+--- xmloff/source/draw/shapeexport2.cxx	(revision 276159)
++++ xmloff/source/draw/shapeexport2.cxx	(revision 276288)
+@@ -297,9 +297,6 @@ const sal_Int32 FOUND_CLICKEVENTTYPE    = 0x000000
+ const sal_Int32 FOUND_MACRO             = 0x00000100;
+ const sal_Int32 FOUND_LIBRARY           = 0x00000200;
+ const sal_Int32 FOUND_ACTIONEVENTTYPE   = 0x00000400;
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-const sal_Int32 FOUND_URL               = 0x00000800;
+-#endif
+ 
+ } // namespace
+ 
+@@ -389,33 +386,6 @@ void XMLShapeExport::ImpExportEvents( const uno::R
+         }
+     }
+ 
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-    // extract properties from "OnAction" event -------------------------------
+-
+-    OUString aActionEventType;
+-    OUString aHyperURL;
+-
+-    uno::Sequence< beans::PropertyValue > aActionProperties;
+-    if( xEvents->hasByName( msOnAction ) && (xEvents->getByName( msOnAction ) >>= aActionProperties) )
+-    {
+-        const beans::PropertyValue* pProperty = aActionProperties.getConstArray();
+-        const beans::PropertyValue* pPropertyEnd = pProperty + aActionProperties.getLength();
+-        for( ; pProperty != pPropertyEnd; ++pProperty )
+-        {
+-            if( ( ( nFound & FOUND_ACTIONEVENTTYPE ) == 0 ) && pProperty->Name == msEventType )
+-            {
+-                if( pProperty->Value >>= aActionEventType )
+-                    nFound |= FOUND_ACTIONEVENTTYPE;
+-            }
+-            else if( ( ( nFound & FOUND_URL ) == 0 ) && ( pProperty->Name == msURL  ) )
+-            {
+-                if( pProperty->Value >>= aHyperURL )
+-                    nFound |= FOUND_URL;
+-            }
+-        }
+-    }
+-#endif
+-
+     // create the XML elements
+ 
+     if( aClickEventType == msPresentation )
+@@ -567,15 +537,9 @@ void XMLShapeExport::ImpExportEvents( const uno::R
+             SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
+         }
+     }
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-    else if( aClickEventType == msScript || aActionEventType == msAction )
+-    {
+-        if( nFound & ( FOUND_MACRO | FOUND_URL ) )
+-#else
+     else if( aClickEventType == msScript )
+     {
+         if( nFound & FOUND_MACRO )
+-#endif
+         {
+             SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
+             if ( nFound & FOUND_MACRO )
+@@ -590,21 +554,9 @@ void XMLShapeExport::ImpExportEvents( const uno::R
+ 
+                 SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
+             }
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-            if ( nFound & FOUND_URL )
+-            {
+-                OUString aEventQName(
+-                    mrExport.GetNamespaceMap().GetQNameByKey(
+-                            XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "action" ) ) ) );
+-                mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
+-                mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aHyperURL );
+-
+-                SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, sal_True, sal_True);
+             }
+-#endif
+         }
+     }
+-}
+ 
+ //////////////////////////////////////////////////////////////////////////////
+ 
+Index: xmloff/inc/xmloff/shapeexport.hxx
+===================================================================
+--- xmloff/inc/xmloff/shapeexport.hxx	(revision 276159)
++++ xmloff/inc/xmloff/shapeexport.hxx	(revision 276288)
+@@ -197,11 +197,6 @@ class XMLOFF_DLLPUBLIC XMLShapeExport : public Uni
+ 	const rtl::OUString							msStartShape;
+ 	const rtl::OUString							msEndShape;
+ 	const rtl::OUString							msOnClick;
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-	const rtl::OUString							msOnAction;
+-	const rtl::OUString							msAction;
+-	const rtl::OUString							msURL;
+-#endif
+ 	const rtl::OUString							msEventType;
+ 	const rtl::OUString							msPresentation;
+ 	const rtl::OUString							msMacroName;
+Index: xmloff/inc/xmloff/xmltoken.hxx
+===================================================================
+--- xmloff/inc/xmloff/xmltoken.hxx	(revision 276159)
++++ xmloff/inc/xmloff/xmltoken.hxx	(revision 276288)
+@@ -144,6 +144,10 @@ namespace xmloff { namespace token {
+         XML_NP_GRDDL,
+         XML_N_GRDDL,
+ 
++        // jonp: 2008-09-24 Excel Interop
++        XML_NP_FORMX,
++        XML_N_FORMX,
++
+         // units
+         XML_UNIT_MM,
+         XML_UNIT_M,
+Index: xmloff/inc/xmlnmspe.hxx
+===================================================================
+--- xmloff/inc/xmlnmspe.hxx	(revision 276159)
++++ xmloff/inc/xmlnmspe.hxx	(revision 276288)
+@@ -96,6 +96,7 @@ XML_OLD_NAMESPACE( META,	6U )
+ 
+ // experimental namespaces
+ XML_NAMESPACE( FIELD,			100U )
++XML_NAMESPACE( FORMX,           101U )      // form interop extensions
+ 
+ 
+ #endif	//  _XMLOFF_XMLNMSPE_HXX
+Index: oovbaapi/genconstidl/makefile.mk
+===================================================================
+--- oovbaapi/genconstidl/makefile.mk	(revision 276159)
++++ oovbaapi/genconstidl/makefile.mk	(revision 276288)
+@@ -36,11 +36,6 @@ PRJNAME=oovbaapi
+ 
+ .INCLUDE : settings.mk
+ 
+-.IF "$(ENABLE_VBA)"!="YES"
+-dummy:
+-        @echo "not building vba..."
+-.ENDIF
+-
+ # symbol files of Microsoft API
+ MYSYMFILES = access.api vba.api adodb.api msforms.api word.api dao.api powerpoint.api excel.api stdole.api
+ 
+@@ -54,18 +49,16 @@ MYDONEFILES += $(foreach,i,$(MYSYMFILES) $(MISC)$/
+ 
+ ALLTAR: GENIDL
+ 
+-GENIDL : $(MY_GEN_IDL_PATH) $(MYDONEFILES)
++GENIDL : $(MYDONEFILES)
+ 
+ GENRDB : GENIDL $(MYURDFILES)
+ 
+ $(MISC)$/%.done : %.api
++    @@-$(MKDIR) $(MY_GEN_IDL_PATH)
+     @echo Processing $?
+     $(PERL) api-to-idl.pl $? $(MY_GEN_IDL_PATH)
+     @$(TOUCH) $@
+ 
+-$(MY_GEN_IDL_PATH) : 
+-    @@-$(MKDIR) $@
+-
+ CLEAN :
+     @$(RM) $(MY_GEN_IDL_PATH)$/*.idl
+     @$(RM) $(foreach,i,$(MYSYMFILES) $(MISC)$/$(i:b).done)
+Index: oovbaapi/prj/build.lst
+===================================================================
+--- oovbaapi/prj/build.lst	(revision 276159)
++++ oovbaapi/prj/build.lst	(revision 276288)
+@@ -4,5 +4,6 @@ ovba	oovbaapi\genconstidl                nmake	-	a
+ ovba	oovbaapi\ooo\vba\constants          nmake	-	all	ovba_constants  ovba_genconstidl NULL
+ ovba	oovbaapi\ooo\vba                    nmake	-	all	ovba_vba NULL
+ ovba	oovbaapi\ooo\vba\excel              nmake	-	all	ovba_excel NULL
++ovba	oovbaapi\ooo\vba\word               nmake	-	all	ovba_word NULL
+ ovba	oovbaapi\ooo\vba\msforms            nmake	-	all	ovba_msforms NULL
+-ovba    oovbaapi\util                       nmake       -       all     ovba_util ovba_vba ovba_excel ovba_msforms ovba_constants ovba_genconstidl NULL
++ovba   oovbaapi\util                             nmake   -   all ovba_util ovba_vba ovba_excel ovba_word ovba_msforms ovba_constants ovba_genconstidl NULL
+Index: oovbaapi/ooo/vba/XGlobals.idl
+===================================================================
+--- oovbaapi/ooo/vba/XGlobals.idl	(revision 276159)
++++ oovbaapi/ooo/vba/XGlobals.idl	(revision 276288)
+@@ -1,67 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: XGlobals.idl,v $
+- * $Revision: 1.4 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef __ooo_vba_XGlobals_idl__
+-#define __ooo_vba_XGlobals_idl__
+-
+-#ifndef __com_sun_star_uno_XInterface_idl__
+-#include <com/sun/star/uno/XInterface.idl>
+-#endif
+-#ifndef __ooo_vba_excel_XApplication_idl__
+-#include <ooo/vba/excel/XApplication.idl>
+-#endif
+-#ifndef __ooo_vba_excel_XWorkbook_idl__
+-#include <ooo/vba/excel/XWorkbook.idl>
+-#endif
+-#ifndef __ooo_vba_excel_XWorksheet_idl__
+-#include <ooo/vba/excel/XWorksheet.idl>
+-#endif
+-
+-module ooo {  module vba { 
+-
+-interface XGlobals: com::sun::star::uno::XInterface
+-{
+-        // FIXME, need better way to expose globals
+-	sequence< any > getGlobals();
+-
+-	[attribute, readonly] ooo::vba::excel::XApplication Application;
+-	[attribute, readonly] ooo::vba::excel::XWorkbook ActiveWorkbook;
+-	[attribute, readonly] ooo::vba::excel::XWorksheet ActiveSheet;
+-	any WorkSheets( [in] any aIndex );
+-	any WorkBooks( [in] any aIndex );
+-	any Sheets( [in] any aIndex );
+-	any Range( [in] any Cell1, [in] any Cell2 );
+-	any Names( [in] any Index );
+-};
+-
+-}; };
+-
+-#endif
+-
+-
+Index: oovbaapi/ooo/vba/Globals.idl
+===================================================================
+--- oovbaapi/ooo/vba/Globals.idl	(revision 276159)
++++ oovbaapi/ooo/vba/Globals.idl	(revision 276288)
+@@ -1,48 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: Globals.idl,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-
+-#ifndef __ooo_vba_Globals_idl__
+-#define __ooo_vba_Globals_idl__
+-
+-#ifndef __ooo_vba_XGlobals_idl__
+-#include <ooo/vba/XGlobals.idl>
+-#endif
+-
+-#include <com/sun/star/uno/XComponentContext.idl>
+-#include <com/sun/star/table/XCellRange.idl>
+-
+-module ooo {  module vba {
+-service Globals : XGlobals
+-{
+-};
+-
+-}; };
+-
+-#endif
+Index: oovbaapi/ooo/vba/XDocumentProperty.idl
+===================================================================
+--- oovbaapi/ooo/vba/XDocumentProperty.idl	(revision 0)
++++ oovbaapi/ooo/vba/XDocumentProperty.idl	(revision 276288)
+@@ -0,0 +1,106 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XDocument.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef __ooo_vba_XDocumentProperty_idl__
++#define __ooo_vba_XDocumentProperty_idl__
++
++#ifndef __com_sun_star_script_BasicErrorException_idl__
++#include <com/sun/star/script/BasicErrorException.idl>
++#endif
++#ifndef __com_sun_star_script_XDefaultProperty_idl__
++#include <com/sun/star/script/XDefaultProperty.idl>
++#endif
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo { module vba { 
++
++/**
++ * Specific built-in document property. Use CustomDocumentProperties(index),
++ * where index is the name or index number of the custom document property,
++ * to return a DocumentProperty object that represents a specific custom document property.
++ */
++interface XDocumentProperty 
++{
++   
++    interface com::sun::star::script::XDefaultProperty;
++    interface ooo::vba::XHelperInterface;
++
++    void Delete()
++        raises (com::sun::star::script::BasicErrorException);
++
++    /** Required String. The name of the property.
++     */
++    string getName()
++        raises (com::sun::star::script::BasicErrorException);
++
++    void setName([in] string Name)
++        raises (com::sun::star::script::BasicErrorException);
++
++    /** The data type of the property.
++     * Can be one of the following MsoDocProperties constants:
++     * msoPropertyTypeBoolean, msoPropertyTypeDate, msoPropertyTypeFloat,
++     * msoPropertyTypeNumber, or msoPropertyTypeString.
++     */
++    byte getType()
++        raises (com::sun::star::script::BasicErrorException);
++
++    void setType([in] byte Type)
++        raises (com::sun::star::script::BasicErrorException);
++
++    /** If true, then LinkSource has a valid value. */
++    boolean getLinkToContent()
++        raises (com::sun::star::script::BasicErrorException);
++
++    void setLinkToContent([in] boolean LinkToContent)
++        raises (com::sun::star::script::BasicErrorException);
++
++    /** If LinkToContent is false, then this contains the value of the property
++     * The data type of the value will match the Type property.
++     */
++    any getValue()
++        raises (com::sun::star::script::BasicErrorException);
++
++    void setValue([in] any Value)
++        raises (com::sun::star::script::BasicErrorException);
++
++    /** If LinkToContent is false, then this contains the value of the property */
++    string getLinkSource()
++        raises (com::sun::star::script::BasicErrorException);
++
++    void setLinkSource([in] string LinkSource)
++        raises (com::sun::star::script::BasicErrorException);
++};
++
++}; };
++
++#endif
++
+Index: oovbaapi/ooo/vba/makefile.mk
+===================================================================
+--- oovbaapi/ooo/vba/makefile.mk	(revision 276159)
++++ oovbaapi/ooo/vba/makefile.mk	(revision 276288)
+@@ -38,16 +38,10 @@ PACKAGE=ooo$/vba
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  $(PRJ)$/util$/makefile.pmk
+ 
+-.IF "$(ENABLE_VBA)"!="YES"
+-dummy:
+-        @echo "not building vba..."
+-.ENDIF
+-
+ # ------------------------------------------------------------------------
+ 
+ IDLFILES=\
+ 	XErrObject.idl \
+-	XGlobals.idl \
+ 	XCollection.idl\
+ 	XVBAToOOEventDescGen.idl\
+ 	XPropValue.idl\
+@@ -57,7 +51,21 @@ IDLFILES=\
+ 	XCommandBarControls.idl\
+ 	XCommandBar.idl\
+ 	XCommandBars.idl\
+-	Globals.idl\
++	XCommandBarPopup.idl\
++	XCommandBarButton.idl\
++	XControlProvider.idl\
++	ControlProvider.idl\
++	XApplicationBase.idl\
++	XWindowBase.idl\
++	XDocumentBase.idl\
++	XDocumentsBase.idl\
++	XGlobalsBase.idl\
++	XDocumentProperty.idl\
++	XDocumentProperties.idl\
++	XFontBase.idl\
++	XDialogsBase.idl\
++	XDialogBase.idl\
++    XPageSetupBase.idl  \
+ 
+ # ------------------------------------------------------------------
+ 
+Index: oovbaapi/ooo/vba/msforms/XControl.idl
+===================================================================
+--- oovbaapi/ooo/vba/msforms/XControl.idl	(revision 276159)
++++ oovbaapi/ooo/vba/msforms/XControl.idl	(revision 276288)
+@@ -61,6 +61,7 @@ interface XControl
+     [attribute] double  Left;
+     [attribute] double  Top;
+ 	[attribute] string Name;
++	[attribute] string ControlTipText;
+ };
+ 
+ //=============================================================================
+Index: oovbaapi/ooo/vba/msforms/XShapes.idl
+===================================================================
+--- oovbaapi/ooo/vba/msforms/XShapes.idl	(revision 276159)
++++ oovbaapi/ooo/vba/msforms/XShapes.idl	(revision 276288)
+@@ -51,6 +51,7 @@ interface XShapes
+     */
+     any AddLine( [in] long StartX, [in] long StartY, [in] long endX, [in] long endY );
+     any AddShape([in] long ShapeType, [in] long StartX, [in] long StartY, [in] long endX, [in] long endY );
++    any AddTextbox([in] long Orientation, [in] long Left, [in] long Top, [in] long Width, [in] long Height );
+ };
+ }; }; };
+ 
+Index: oovbaapi/ooo/vba/msforms/makefile.mk
+===================================================================
+--- oovbaapi/ooo/vba/msforms/makefile.mk	(revision 276159)
++++ oovbaapi/ooo/vba/msforms/makefile.mk	(revision 276288)
+@@ -38,11 +38,6 @@ PACKAGE=ooo$/vba$/msforms
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  $(PRJ)$/util$/makefile.pmk
+ 
+-.IF "$(ENABLE_VBA)"!="YES"
+-dummy:
+-        @echo "not building vba..."
+-.ENDIF
+-
+ # ------------------------------------------------------------------------
+ 
+ IDLFILES=\
+@@ -71,6 +66,7 @@ IDLFILES=\
+ 	XSpinButton.idl \
+ 	XImage.idl \
+ 	XControls.idl \
++	XTextFrame.idl \
+ 
+ # ------------------------------------------------------------------
+ 
+Index: oovbaapi/ooo/vba/msforms/XListBox.idl
+===================================================================
+--- oovbaapi/ooo/vba/msforms/XListBox.idl	(revision 276159)
++++ oovbaapi/ooo/vba/msforms/XListBox.idl	(revision 276288)
+@@ -43,7 +43,7 @@ interface XListBox: com::sun::star::uno::XInterfac
+ {
+ 	[attribute] any Value;
+ 	[attribute] string Text;
+-	[attribute] boolean MultiSelect;
++	[attribute] long MultiSelect; //liuchen 2009-7-31 MultiSelect property in Excel VBA is type long
+ 	[attribute] any ListIndex;
+         [attribute, readonly ] long ListCount;
+ 	void AddItem( [in] any pvargItem, [in] any pvargIndex );
+Index: oovbaapi/ooo/vba/msforms/XTextFrame.idl
+===================================================================
+--- oovbaapi/ooo/vba/msforms/XTextFrame.idl	(revision 0)
++++ oovbaapi/ooo/vba/msforms/XTextFrame.idl	(revision 276288)
+@@ -0,0 +1,50 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XTextFrame.idl,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_msforms_XTextFrame_idl__
++#define __ooo_vba_msforms_XTextFrame_idl__
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module msforms {
++interface XTextFrame : ooo::vba::XHelperInterface
++{
++    [attribute] boolean AutoSize;
++    [attribute] float MarginBottom;
++    [attribute] float MarginTop;
++    [attribute] float MarginLeft;
++    [attribute] float MarginRight;
++    any Characters();
++    /*I don't find it in msdn
++    Range TextRange();*/
++};
++}; }; };
++#endif
+Index: oovbaapi/ooo/vba/msforms/XShape.idl
+===================================================================
+--- oovbaapi/ooo/vba/msforms/XShape.idl	(revision 276159)
++++ oovbaapi/ooo/vba/msforms/XShape.idl	(revision 276288)
+@@ -34,10 +34,6 @@
+ #include <ooo/vba/XHelperInterface.idl>
+ #endif
+ 
+-#ifndef __ooo_vba_excel_XTextFrame_idl__
+-#include <ooo/vba/excel/XTextFrame.idl>
+-#endif
+-
+ #ifndef __ooo_vba_msforms_XLineFormat_idl__
+ #include <ooo/vba/msforms/XLineFormat.idl>
+ #endif
+@@ -66,14 +62,13 @@ interface XShape : ooo::vba::XHelperInterface
+     [attribute, readonly] XLineFormat Line;
+     [attribute, readonly] XFillFormat Fill;
+     [attribute, readonly] XPictureFormat PictureFormat;
++    [attribute] boolean LockAspectRatio;
++    [attribute] boolean LockAnchor;
++    [attribute] long RelativeHorizontalPosition;
++    [attribute] long RelativeVerticalPosition;
+ 
+-    /*
+-    using in word
+-    [attribute] RelativeHorizontalPosition
+-    [attribute] RelativeVerticalPosition
+-    [attribute] XWrapFormat WrapFormat;
+-    */
+-    ooo::vba::excel::XTextFrame TextFrame();
++    any TextFrame();
++    any WrapFormat();
+     void Delete();
+     void ZOrder( [in] long ZOrderCmd );
+     void IncrementRotation( [in] double Increment );
+Index: oovbaapi/ooo/vba/msforms/XShapeRange.idl
+===================================================================
+--- oovbaapi/ooo/vba/msforms/XShapeRange.idl	(revision 276159)
++++ oovbaapi/ooo/vba/msforms/XShapeRange.idl	(revision 276288)
+@@ -44,9 +44,25 @@
+ 
+ module ooo {  module vba { module msforms {
+ 
++interface XLineFormat;
++interface XFillFormat;
+ interface XShapeRange 
+ {
+     interface ooo::vba::XCollection;
++
++    [attribute] double Height;
++    [attribute] double Width;
++    [attribute] double Left;
++    [attribute] double Top;
++    [attribute, readonly] XLineFormat Line;
++    [attribute, readonly] XFillFormat Fill;
++    [attribute] boolean LockAspectRatio;
++    [attribute] boolean LockAnchor;
++    [attribute] long RelativeHorizontalPosition;
++    [attribute] long RelativeVerticalPosition;
++
++    any TextFrame();
++    any WrapFormat();
+     void Select();
+     XShape Group();
+     void IncrementRotation( [in] double Increment );
+Index: oovbaapi/ooo/vba/msforms/XLabel.idl
+===================================================================
+--- oovbaapi/ooo/vba/msforms/XLabel.idl	(revision 276159)
++++ oovbaapi/ooo/vba/msforms/XLabel.idl	(revision 276288)
+@@ -42,6 +42,7 @@ interface XLabel: com::sun::star::uno::XInterface
+ {
+ 	[attribute] string Caption;
+ 	[attribute] any Value;
++	[attribute] long ForeColor; //liuchen 2009-7-3
+ };
+ 
+ //=============================================================================
+Index: oovbaapi/ooo/vba/XCommandBarPopup.idl
+===================================================================
+--- oovbaapi/ooo/vba/XCommandBarPopup.idl	(revision 0)
++++ oovbaapi/ooo/vba/XCommandBarPopup.idl	(revision 276288)
+@@ -0,0 +1,52 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XCommandBarPopup_idl__
++#define __ooo_vba_XCommandBarPopup_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++//=============================================================================
++
++module ooo {  module vba { 
++//=============================================================================
++
++interface XCommandBarPopup: com::sun::star::uno::XInterface
++{
++};
++
++}; };
++
++#endif
+Index: oovbaapi/ooo/vba/XPageSetupBase.idl
+===================================================================
+--- oovbaapi/ooo/vba/XPageSetupBase.idl	(revision 0)
++++ oovbaapi/ooo/vba/XPageSetupBase.idl	(revision 276288)
+@@ -0,0 +1,67 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XPageSetupBase_idl__
++#define __ooo_vba_XPageSetupBase_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++//=============================================================================
++
++module ooo {  module vba {
++
++//=============================================================================
++
++
++interface XPageSetupBase
++{
++
++	interface ::ooo::vba::XHelperInterface;
++
++	//Attributes
++    [attribute] double TopMargin;
++    [attribute] double BottomMargin;
++    [attribute] double RightMargin;
++    [attribute] double LeftMargin;
++    [attribute] long Orientation;
++};
++
++//=============================================================================
++
++}; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/XDialogBase.idl
+===================================================================
+--- oovbaapi/ooo/vba/XDialogBase.idl	(revision 0)
++++ oovbaapi/ooo/vba/XDialogBase.idl	(revision 276288)
+@@ -0,0 +1,58 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XDialog.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XDialog_idl__
++#define __ooo_vba_XDialog_idl__
++                                                                                                                             
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++
++//=============================================================================
++                                                                                                                             
++module ooo {  module vba {
++                                                                                                                             
++//=============================================================================
++
++interface XDialogBase 
++{
++	interface ::ooo::vba::XHelperInterface;
++
++	void Show();
++};
++                                                                                                                             
++}; };
++                                                                                                                             
++#endif
++
+Index: oovbaapi/ooo/vba/XControlProvider.idl
+===================================================================
+--- oovbaapi/ooo/vba/XControlProvider.idl	(revision 0)
++++ oovbaapi/ooo/vba/XControlProvider.idl	(revision 276288)
+@@ -0,0 +1,64 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XGlobals.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XControlProvider_idl__
++#define __ooo_vba_XControlProvider_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __com_sun_star_frame_XModel_idl__
++#include <com/sun/star/frame/XModel.idl>
++#endif
++
++#ifndef __com_sun_star_awt_XControl_idl__
++#include <com/sun/star/awt/XControl.idl>
++#endif
++
++#ifndef __com_sun_star_drawing_XControlShape_idl__
++#include <com/sun/star/drawing/XControlShape.idl>
++#endif
++#ifndef __ooo_vba_msforms_XControl_idl__
++#include <ooo/vba/msforms/XControl.idl>
++#endif
++
++module ooo {  module vba { 
++
++interface XControlProvider 
++{
++   ::ooo::vba::msforms::XControl createControl( [in] ::com::sun::star::drawing::XControlShape xControl, [in] ::com::sun::star::frame::XModel xDocOwner );
++   ::ooo::vba::msforms::XControl createUserformControl( [in] ::com::sun::star::awt::XControl xControl, [in] ::com::sun::star::awt::XControl xDialog, [in] ::com::sun::star::frame::XModel xDocOwner );
++
++};
++
++}; };
++
++#endif
++
+Index: oovbaapi/ooo/vba/XDocumentProperties.idl
+===================================================================
+--- oovbaapi/ooo/vba/XDocumentProperties.idl	(revision 0)
++++ oovbaapi/ooo/vba/XDocumentProperties.idl	(revision 276288)
+@@ -0,0 +1,71 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XDocument.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef __ooo_vba_XDocumentProperties_idl__
++#define __ooo_vba_XDocumentProperties_idl__
++
++#ifndef __com_sun_star_script_BasicErrorException_idl__
++#include <com/sun/star/script/BasicErrorException.idl>
++#endif
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++module ooo { module vba { 
++interface XDocumentProperty;
++interface XDocumentProperties
++{
++    interface XCollection;
++    /** Creates a new custom document property.
++     * You can only add a new document property to the custom DocumentProperties collection. Depending on value of
++     * boolean LinkSource, either (False) Value or (True) LinkSource must be provided.
++     * @param Name (Required String. The name of the property.
++     * @param LinkToContent Specifies whether the property is linked to the contents of the container document. If this argument is True, the LinkSource argument is required; if it's False, the value argument is required.
++     * @param Type The data type of the property. Can be one of the following MsoDocProperties constants:
++     * msoPropertyTypeBoolean, msoPropertyTypeDate, msoPropertyTypeFloat, msoPropertyTypeNumber, or msoPropertyTypeString.
++     * @param Value The value of the property, if it's not linked to the contents of the container document.
++     * The value is converted to match the data type specified by the type argument, if it can't be converted, an error occurs.
++     * If LinkToContent is True, the Value argument is ignored and the new document property is assigned a default value
++     * until the linked property values are updated by the container application (usually when the document is saved).
++     * @param LinkSource Ignored if LinkToContent is False. The source of the linked property. The container application determines
++     * what types of source linking you can use.
++     */
++    XDocumentProperty Add([in] string Name, [in] boolean LinkToContent, [in] /* MsoDocProperties */ byte Type, [in] any Value, 
++        [in] /*optional*/ any LinkSource)
++        raises (com::sun::star::script::BasicErrorException);
++};
++
++}; };
++
++#endif
++
+Index: oovbaapi/ooo/vba/XDocumentsBase.idl
+===================================================================
+--- oovbaapi/ooo/vba/XDocumentsBase.idl	(revision 0)
++++ oovbaapi/ooo/vba/XDocumentsBase.idl	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XDocumentsBase.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XDocumentsBase_idl__
++#define __ooo_vba_XDocumentsBase_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++
++//=============================================================================
++
++module ooo {  module vba {
++
++//=============================================================================
++
++interface XDocumentsBase 
++{
++	interface ::ooo::vba::XCollection;
++};
++
++}; };
++
++#endif
+Index: oovbaapi/ooo/vba/XApplicationBase.idl
+===================================================================
+--- oovbaapi/ooo/vba/XApplicationBase.idl	(revision 0)
++++ oovbaapi/ooo/vba/XApplicationBase.idl	(revision 276288)
+@@ -0,0 +1,66 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XApplicationBase_idl__
++#define __ooo_vba_XApplicationBase_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba { 
++//=============================================================================
++
++interface XApplicationBase
++{
++	interface ::ooo::vba::XHelperInterface;
++
++	[attribute] boolean ScreenUpdating;
++	[attribute] boolean DisplayStatusBar;
++	[attribute, readonly] string Version;
++
++	void Quit();
++
++    any CommandBars( [in] any aIndex );
++	void Run([in] string MacroName, [in] /*Optional*/ any varg1, [in] /*Optional*/ any varg2, [in] /*Optional*/ any varg3, [in] /*Optional*/ any varg4, [in] /*Optional*/ any varg5, [in] /*Optional*/ any varg6, [in] /*Optional*/ any varg7, [in] /*Optional*/ any varg8, [in] /*Optional*/ any varg9, [in] /*Optional*/ any varg10, [in] /*Optional*/ any varg11, [in] /*Optional*/ any varg12, [in] /*Optional*/ any varg13, [in] /*Optional*/ any varg14, [in] /*Optional*/ any varg15, [in] /*Optional*/ any varg16, [in] /*Optional*/ any varg17, [in] /*Optional*/ any varg18, [in] /*Optional*/ any varg19, [in] /*Optional*/ any varg20, [in] /*Optional*/ any varg21, [in] /*Optional*/ any varg22, [in] /*Optional*/ any varg23, [in] /*Optional*/ any varg24, [in] /*Optional*/ any varg25, [in] /*Optional*/ any varg26, [in] /*Optional*/ any varg27, [in] /*Optional*/ any varg28, [in] /*Optional*/ any varg29, [in] /*Optional*/ any varg30);
++    float CentimetersToPoints([in] float Centimeters );
++};
++
++}; };
++
++#endif
+Index: oovbaapi/ooo/vba/XCommandBarButton.idl
+===================================================================
+--- oovbaapi/ooo/vba/XCommandBarButton.idl	(revision 0)
++++ oovbaapi/ooo/vba/XCommandBarButton.idl	(revision 276288)
+@@ -0,0 +1,52 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XCommandBarButton_idl__
++#define __ooo_vba_XCommandBarButton_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++//=============================================================================
++
++module ooo {  module vba { 
++//=============================================================================
++
++interface XCommandBarButton: com::sun::star::uno::XInterface
++{
++};
++
++}; };
++
++#endif
+Index: oovbaapi/ooo/vba/XFontBase.idl
+===================================================================
+--- oovbaapi/ooo/vba/XFontBase.idl	(revision 0)
++++ oovbaapi/ooo/vba/XFontBase.idl	(revision 276288)
+@@ -0,0 +1,71 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XFont.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XFont_idl__
++#define __ooo_vba_XFont_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
++#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++//=============================================================================
++
++module ooo {  module vba {
++
++interface XFontBase
++{
++	interface ::ooo::vba::XHelperInterface;
++
++	[attribute] any   Size;
++	[attribute] any    ColorIndex;
++	[attribute] any    Color;
++	[attribute] any Bold;
++	[attribute] any Underline;
++	[attribute] any Strikethrough;
++	[attribute] any Shadow;
++	[attribute] any Italic;
++	[attribute] any Subscript;
++	[attribute] any Superscript;
++	[attribute] any  Name;
++};
++
++//=============================================================================
++
++}; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/excel/XVPageBreaks.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XVPageBreaks.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XVPageBreaks.idl	(revision 276288)
+@@ -0,0 +1,71 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XVPageBreaks.idl,v $
++ * $Revision: 1.0 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_excel_XVPageBreaks_idl__
++#define __ooo_vba_excel_XVPageBreaks_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
++#include <com/sun/star/script/BasicErrorException.idl>
++#endif
++
++#ifndef  __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++//=============================================================================
++
++module ooo {  module vba {  module excel { 
++
++//=============================================================================
++
++//interface XVPageBreak;
++
++interface XVPageBreaks
++{
++	interface ooo::vba::XCollection;
++	
++	//Methods	
++	any Add( [in] any Before ) raises( com::sun::star::script::BasicErrorException );
++};
++
++//=============================================================================
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/excel/XPageSetup.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XPageSetup.idl	(revision 276159)
++++ oovbaapi/ooo/vba/excel/XPageSetup.idl	(revision 276288)
+@@ -45,20 +45,15 @@ module ooo {  module vba {  module excel {
+ //=============================================================================
+ 
+ 
+-interface XPageSetup
++interface XPageSetup : com::sun::star::uno::XInterface
+ {
+ 
+-	interface ::ooo::vba::XHelperInterface;
++//	interface ::ooo::vba::XHelperInterface;
+ 
+ 	//Attributes
+     [attribute] string PrintArea;
+-    [attribute] double TopMargin;
+-    [attribute] double BottomMargin;
+-    [attribute] double RightMargin;
+-    [attribute] double LeftMargin;
+     [attribute] double HeaderMargin;
+     [attribute] double FooterMargin;
+-    [attribute] long Orientation;
+     [attribute] any FitToPagesTall;
+     [attribute] any FitToPagesWide;
+     [attribute] any Zoom;
+Index: oovbaapi/ooo/vba/excel/XWorkbook.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XWorkbook.idl	(revision 276159)
++++ oovbaapi/ooo/vba/excel/XWorkbook.idl	(revision 276288)
+@@ -48,31 +48,20 @@ interface XWorksheet;
+ interface XWorksheets;
+ interface XStyles;
+ 
+-interface XWorkbook
++interface XWorkbook : com::sun::star::uno::XInterface
+ {
+-	interface ::ooo::vba::XHelperInterface;
+-
+-	[attribute, readonly] string  Name;
+-	[attribute, readonly] string  Path;
+-	[attribute, readonly] string  FullName;
+ 	[attribute, readonly] boolean ProtectStructure; 
+ 	[attribute, readonly] XWorksheet ActiveSheet;
+-	[attribute] boolean Saved;
+ 	[attribute, readonly] string  CodeName;
++	[attribute] boolean  PrecisionAsDisplayed;
+ 
+ 	any  Worksheets([in] any sheet);
+ 	any  Styles([in] any Index );
+ 	any  Sheets([in] any sheet);
+ 	any  Windows([in] any index );
+-	void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook);
+-	void Protect( [in] any Password );
+-	void Unprotect( [in] any Password );
+-	void Save();
+-	void Activate();
+ 	void ResetColors() raises (com::sun::star::script::BasicErrorException);
+-
++	void Activate();
+ 	any Names( [in] any Index );
+-
+ 	any Colors([in] any Index) raises (com::sun::star::script::BasicErrorException);
+ 	long FileFormat() raises (com::sun::star::script::BasicErrorException);
+ 	void SaveCopyAs( [in] string Filename );
+Index: oovbaapi/ooo/vba/excel/XFont.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XFont.idl	(revision 276159)
++++ oovbaapi/ooo/vba/excel/XFont.idl	(revision 276288)
+@@ -47,22 +47,9 @@ module ooo {  module vba {  module excel {
+ 
+ interface XFont
+ {
+-	interface ::ooo::vba::XHelperInterface;
+-
+-	[attribute] any   Size;
+ 	[attribute] any StandardFontSize;
+ 	[attribute] any  StandardFont;
+ 	[attribute] any  FontStyle;
+-	[attribute] any    ColorIndex;
+-	[attribute] any    Color;
+-	[attribute] any Bold;
+-	[attribute] any Underline;
+-	[attribute] any Strikethrough;
+-	[attribute] any Shadow;
+-	[attribute] any Italic;
+-	[attribute] any Subscript;
+-	[attribute] any Superscript;
+-	[attribute] any  Name;
+ 	[attribute] any  OutlineFont;
+ };
+ 
+Index: oovbaapi/ooo/vba/excel/XVPageBreak.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XVPageBreak.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XVPageBreak.idl	(revision 276288)
+@@ -0,0 +1,54 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XVPageBreak.idl,v $
++ * $Revision: 1.0 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_excel_XVPageBreak_idl__
++#define __ooo_vba_excel_XVPageBreak_idl__
++
++#ifndef __ooo_vba_excel_XPageBreak_idl__
++#include <ooo/vba/excel/XPageBreak.idl>
++#endif
++
++//=============================================================================
++
++module ooo {  module vba {  module excel { 
++
++//=============================================================================
++
++interface XVPageBreak
++{
++	interface ::ooo::vba::excel::XPageBreak;
++};
++
++//=============================================================================
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/excel/makefile.mk
+===================================================================
+--- oovbaapi/ooo/vba/excel/makefile.mk	(revision 276159)
++++ oovbaapi/ooo/vba/excel/makefile.mk	(revision 276288)
+@@ -38,15 +38,12 @@ PACKAGE=ooo$/vba$/Excel
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  $(PRJ)$/util$/makefile.pmk
+ 
+-.IF "$(ENABLE_VBA)"!="YES"
+-dummy:
+-        @echo "not building vba..."
+-.ENDIF
+-
+ # ------------------------------------------------------------------------
+ 
+ 
+-IDLFILES= XApplication.idl\
++IDLFILES= XGlobals.idl\
++	Globals.idl\
++	XApplication.idl\
+ 	XComment.idl\
+ 	XComments.idl\
+ 	XRange.idl\
+@@ -103,6 +100,15 @@ PACKAGE=ooo$/vba$/Excel
+  	XPageBreak.idl \
+  	XHPageBreak.idl \
+  	XHPageBreaks.idl \
++ 	XVPageBreak.idl \
++ 	XVPageBreaks.idl \
++ 	TextFrame.idl \
++ 	XMenuBar.idl \
++ 	XMenuBars.idl \
++ 	XMenu.idl \
++ 	XMenus.idl \
++ 	XMenuItem.idl \
++ 	XMenuItems.idl \
+ 
+ 
+ # ------------------------------------------------------------------
+Index: oovbaapi/ooo/vba/excel/XApplication.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XApplication.idl	(revision 276159)
++++ oovbaapi/ooo/vba/excel/XApplication.idl	(revision 276288)
+@@ -42,10 +42,6 @@
+ #include <ooo/vba/XAssistant.idl>
+ #endif
+ 
+-#ifndef __ooo_vba_XCommandBars_idl__
+-#include <ooo/vba/XCommandBars.idl>
+-#endif
+-
+ module ooo {  module vba {  module excel { 
+ 
+ interface XRange;
+@@ -56,10 +52,10 @@ interface XWorksheetFunction;
+ interface XWindow;
+ interface XWorksheet;
+ 
+-interface XApplication
++interface XApplication : com::sun::star::uno::XInterface
+ {
+ 
+-	interface ::ooo::vba::XHelperInterface;
++//	interface ::ooo::vba::XHelperInterface;
+ 
+ 	[attribute, readonly] any Selection;
+ 	[attribute, readonly] XWorkbook ActiveWorkbook;
+@@ -74,14 +70,11 @@ interface XWorksheet;
+ 	// to determine this
+ 	[attribute, readonly] XWorkbook ThisWorkbook;
+ 	[attribute, readonly] string Name;
+-	[attribute] boolean ScreenUpdating;
+-	[attribute] boolean DisplayStatusBar;
+ 	[attribute] boolean DisplayAlerts;
+ 	[attribute] boolean DisplayFormulaBar;
+ 	[attribute] any CutCopyMode;
+ 	[attribute] any StatusBar;
+ 	[attribute] long Cursor; 
+-	[attribute, readonly] string Version;
+ 
+ 	void setDefaultFilePath([in] string DefaultFilePath) raises(com::sun::star::script::BasicErrorException);
+ 
+@@ -90,7 +83,7 @@ interface XWorksheet;
+ 	string LibraryPath() raises(com::sun::star::script::BasicErrorException);
+ 	string TemplatesPath() raises(com::sun::star::script::BasicErrorException);
+ 	string PathSeparator() raises(com::sun::star::script::BasicErrorException);
+-    any CommandBars( [in] any aIndex );
++    //any CommandBars( [in] any aIndex );
+ 	any Workbooks( [in] any aIndex );
+ 	any Worksheets( [in] any aIndex );
+ 	any Windows( [in] any aIndex );
+@@ -109,7 +102,8 @@ interface XWorksheet;
+ 	XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
+         raises(com::sun::star::script::BasicErrorException);
+ 	void Volatile([in] any Volatile);
+-	void DoEvents();
++	any Caller( [in] any aIndex );
++	any MenuBars( [in] any aIndex );
+ };
+ 
+ }; }; };
+Index: oovbaapi/ooo/vba/excel/XMenu.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XMenu.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XMenu.idl	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_excel_XMenu_idl__
++#define __ooo_vba_excel_XMenu_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++//=============================================================================
++
++module ooo {  module vba {  module excel { 
++//=============================================================================
++
++interface XMenu
++{
++	interface XHelperInterface;
++
++    [attribute] string Caption;
++
++    void Delete() raises ( com::sun::star::script::BasicErrorException );
++    any MenuItems( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/excel/XMenuItems.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XMenuItems.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XMenuItems.idl	(revision 276288)
+@@ -0,0 +1,70 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XMenuItems.idl,v $
++ * $Revision: 1.0 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_excel_XMenuItems_idl__
++#define __ooo_vba_excel_XMenuItems_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
++#include <com/sun/star/script/BasicErrorException.idl>
++#endif
++
++#ifndef  __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++//=============================================================================
++
++module ooo {  module vba {  module excel { 
++
++//=============================================================================
++
++interface XMenuItem;
++
++interface XMenuItems
++{
++	interface ooo::vba::XCollection;
++
++    XMenuItem Add( [in] string Caption, [in] any OnAction, [in] any ShortcutKey, [in] any Before, [in] any Restore, [in] any StatusBar, [in] any HelpFile, [in] any HelpContextID ) raises ( com::sun::star::script::BasicErrorException );
++};
++
++//=============================================================================
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/excel/XWindow.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XWindow.idl	(revision 276159)
++++ oovbaapi/ooo/vba/excel/XWindow.idl	(revision 276288)
+@@ -46,10 +46,8 @@ module ooo {  module vba {  module excel {
+ interface XRange;
+ interface XWorksheet;
+ interface XPane;
+-interface XWindow
++interface XWindow : com::sun::star::uno::XInterface
+ {
+-	interface ::ooo::vba::XHelperInterface;
+-
+ 	[attribute] any Caption;
+ 	[attribute] boolean DisplayGridlines; 
+ 	[attribute] boolean DisplayHeadings; 
+@@ -58,8 +56,6 @@ interface XPane;
+ 	[attribute] boolean DisplayVerticalScrollBar; 
+ 	[attribute] boolean DisplayWorkbookTabs; 
+ 	[attribute] boolean FreezePanes; 
+-	[attribute] long Height; 
+-	[attribute] long Left; 
+ 	[attribute] boolean Split; 
+ 	[attribute] long SplitColumn;
+ 	[attribute] double SplitHorizontal;
+@@ -67,10 +63,7 @@ interface XPane;
+ 	[attribute] double SplitVertical;
+ 	[attribute] any ScrollColumn;
+ 	[attribute] any ScrollRow;
+-	[attribute] long Top; 
+ 	[attribute] any View;
+-	[attribute] boolean Visible;
+-	[attribute] long Width; 
+ 	[attribute] any WindowState;
+ 	[attribute] any Zoom;
+ 	any SelectedSheets( [in] any aIndex );
+Index: oovbaapi/ooo/vba/excel/XWorkbooks.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XWorkbooks.idl	(revision 276159)
++++ oovbaapi/ooo/vba/excel/XWorkbooks.idl	(revision 276288)
+@@ -45,9 +45,8 @@ module ooo {  module vba {  module excel {
+ 
+ //=============================================================================
+ 
+-interface XWorkbooks 
++interface XWorkbooks : com::sun::star::uno::XInterface
+ {
+-	interface ::ooo::vba::XCollection;
+ 	any Add();
+ 	any Open([in] string Filename, [in] any UpdateLinks, [in] any ReadOnly, [in] any Format, [in] any Password, [in] any WriteResPassword, [in] any IgnoreReadOnlyRecommended, [in] any Origin, [in] any Delimiter, [in] any Editable, [in] any Notify, [in] any Converter, [in] any AddToMru);
+ 
+Index: oovbaapi/ooo/vba/excel/XDialogs.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XDialogs.idl	(revision 276159)
++++ oovbaapi/ooo/vba/excel/XDialogs.idl	(revision 276288)
+@@ -33,9 +33,6 @@
+ #ifndef __com_sun_star_uno_XInterface_idl__
+ #include <com/sun/star/uno/XInterface.idl>
+ #endif
+-#ifndef __ooo_vba_XCollection_idl__
+-#include <ooo/vba/XCollection.idl>
+-#endif
+ 
+ #ifndef __ooo_vba_XHelperInterface_idl__
+ #include <ooo/vba/XHelperInterface.idl>
+@@ -44,16 +41,10 @@
+ //=============================================================================
+                                                                                                                              
+ module ooo {  module vba {  module excel {
+-interface XApplication;                                                                                                                             
+-//=============================================================================
+                                                                                                                              
+-//interface XDialogs : ::ooo::vba::XCollection
+-interface XDialogs 
++interface XDialogs : com::sun::star::uno::XInterface
+ {
+-	interface ::ooo::vba::XHelperInterface;
+ 
+-        [attribute, readonly] long Count;
+-
+ 	any Item( [in] any Index );
+ };
+                                                                                                                              
+Index: oovbaapi/ooo/vba/excel/XGlobals.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XGlobals.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XGlobals.idl	(revision 276288)
+@@ -0,0 +1,87 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XGlobals.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_excel_XGlobals_idl__
++#define __ooo_vba_excel_XGlobals_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++#ifndef __com_sun_star_script_BasicErrorException_idl__
++#include <com/sun/star/script/BasicErrorException.idl>
++#endif
++#ifndef __ooo_vba_excel_XWorkbook_idl__
++#include <ooo/vba/excel/XWorkbook.idl>
++#endif
++#ifndef __ooo_vba_excel_XWorksheet_idl__
++#include <ooo/vba/excel/XWorksheet.idl>
++#endif
++#ifndef __ooo_vba_XAssistant_idl__
++#include <ooo/vba/XAssistant.idl>
++#endif
++
++module ooo {  module vba {  module excel {
++interface XRange;
++interface XWindow;
++interface XGlobals: com::sun::star::uno::XInterface
++{
++	[attribute, readonly] ooo::vba::excel::XWorkbook ActiveWorkbook;
++	[attribute, readonly] ooo::vba::excel::XWorksheet ActiveSheet;
++	[attribute, readonly] ooo::vba::excel::XWindow ActiveWindow;
++	[attribute, readonly] ooo::vba::excel::XRange ActiveCell;
++	[attribute, readonly] ooo::vba::XAssistant Assistant;
++	[attribute, readonly] any Selection;
++	[attribute, readonly] XWorkbook ThisWorkbook;
++
++	void Calculate() raises(com::sun::star::script::BasicErrorException);
++	XRange Cells([in] any RowIndex, [in] any ColumnIndex);
++	XRange Columns([in] any aIndex);
++	any CommandBars( [in] any aIndex );
++	any Evaluate( [in] string Name );
++XRange Intersect([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
++        raises(com::sun::star::script::BasicErrorException);
++	any WorkSheets( [in] any aIndex );
++	any WorkBooks( [in] any aIndex );
++	any WorksheetFunction();
++	any Windows( [in] any aIndex );
++	any Sheets( [in] any aIndex );
++	any Range( [in] any Cell1, [in] any Cell2 );
++	XRange Rows([in] any aIndex);
++	any Names( [in] any Index );
++	XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
++        raises(com::sun::star::script::BasicErrorException);
++	any MenuBars( [in] any aIndex );
++
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/excel/XMenuItem.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XMenuItem.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XMenuItem.idl	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_excel_XMenuItem_idl__
++#define __ooo_vba_excel_XMenuItem_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++//=============================================================================
++
++module ooo {  module vba {  module excel { 
++//=============================================================================
++
++interface XMenuItem
++{
++	interface XHelperInterface;
++
++    [attribute] string Caption;
++    [attribute] string OnAction;
++
++    void Delete() raises ( com::sun::star::script::BasicErrorException );
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/excel/XMenus.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XMenus.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XMenus.idl	(revision 276288)
+@@ -0,0 +1,70 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XMenus.idl,v $
++ * $Revision: 1.0 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_excel_XMenus_idl__
++#define __ooo_vba_excel_XMenus_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
++#include <com/sun/star/script/BasicErrorException.idl>
++#endif
++
++#ifndef  __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++//=============================================================================
++
++module ooo {  module vba {  module excel { 
++
++//=============================================================================
++
++interface XMenu;
++
++interface XMenus
++{
++	interface ooo::vba::XCollection;
++
++    XMenu Add( [in] string Caption, [in] any Before, [in] any Restore ) raises ( com::sun::star::script::BasicErrorException );
++};
++
++//=============================================================================
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/excel/XMenuBar.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XMenuBar.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XMenuBar.idl	(revision 276288)
+@@ -0,0 +1,59 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_excel_XMenuBar_idl__
++#define __ooo_vba_excel_XMenuBar_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++//=============================================================================
++
++module ooo {  module vba {  module excel { 
++//=============================================================================
++
++interface XMenuBar
++{
++	interface XHelperInterface;
++
++    any Menus( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/excel/XDialog.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XDialog.idl	(revision 276159)
++++ oovbaapi/ooo/vba/excel/XDialog.idl	(revision 276288)
+@@ -45,13 +45,8 @@ module ooo {  module vba {  module excel {
+                                                                                                                              
+ //=============================================================================
+ 
+-interface XApplication;
+-                                                                                                                             
+-interface XDialog 
++interface XDialog : com::sun::star::uno::XInterface
+ {
+-	interface ::ooo::vba::XHelperInterface;
+-
+-	void Show();
+ };
+                                                                                                                              
+ }; }; };
+Index: oovbaapi/ooo/vba/excel/XTextFrame.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XTextFrame.idl	(revision 276159)
++++ oovbaapi/ooo/vba/excel/XTextFrame.idl	(revision 276288)
+@@ -34,21 +34,9 @@
+ #include <ooo/vba/XHelperInterface.idl>
+ #endif
+ 
+-#ifndef __ooo_vba_excel_XCharacters_idl__
+-#include <ooo/vba/excel/XCharacters.idl>
+-#endif
+-
+ module ooo {  module vba {  module excel {
+-interface XTextFrame : ooo::vba::XHelperInterface
++interface XTextFrame : com::sun::star::uno::XInterface
+ {
+-    [attribute] boolean AutoSize;
+-    [attribute] float MarginBottom;
+-    [attribute] float MarginTop;
+-    [attribute] float MarginLeft;
+-    [attribute] float MarginRight;
+-    XCharacters Characters();
+-    /*I don't find it in msdn
+-    Range TextRange();*/
+ };
+ }; }; };
+ #endif
+Index: oovbaapi/ooo/vba/excel/XWorksheet.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XWorksheet.idl	(revision 276159)
++++ oovbaapi/ooo/vba/excel/XWorksheet.idl	(revision 276288)
+@@ -42,6 +42,9 @@
+ #include <com/sun/star/script/XInvocation.idl>
+ #endif
+ 
++#ifndef __com_sun_star_container_XNamed_idl__
++#include <com/sun/star/container/XNamed.idl>
++#endif
+ //=============================================================================
+ 
+ module ooo {  module vba {  module excel { 
+@@ -53,12 +56,13 @@ interface XRange;
+ interface XOutline;
+ interface XPageSetup;
+ interface XHPageBreaks;
++interface XVPageBreaks;
+ interface XWorksheet
+ {
+ 	interface ::ooo::vba::XHelperInterface;
+ 	interface ::com::sun::star::script::XInvocation;
++	interface ::com::sun::star::container::XNamed;
+ 
+-        [attribute] string Name;
+ 	[attribute] boolean Visible; 
+ 	[attribute, readonly] long StandardHeight;
+ 	[attribute, readonly] long StandardWidth;
+@@ -70,6 +74,7 @@ interface XWorksheet
+ 	[attribute, readonly] XWorksheet Previous;
+ 	[attribute, readonly] string CodeName;
+  	[attribute, readonly] short Index;
++ 	[attribute] long EnableSelection;
+ 	
+ 	void Activate();
+ 	void Calculate( );
+@@ -88,6 +93,7 @@ interface XWorksheet
+ 	XOutline Outline();
+ 	XPageSetup PageSetup();
+ 	any HPageBreaks([in] any Index);
++	any VPageBreaks([in] any Index);
+ 	any OLEObjects([in] any Index);
+ 	void ShowDataForm();
+ 	any Shapes([in] any Index);
+Index: oovbaapi/ooo/vba/excel/Globals.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/Globals.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/Globals.idl	(revision 276288)
+@@ -0,0 +1,48 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: Globals.idl,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef __ooo_vba_excel_Globals_idl__
++#define __ooo_vba_excel_Globals_idl__
++
++#ifndef __ooo_vba_excel_XGlobals_idl__
++#include <ooo/vba/excel/XGlobals.idl>
++#endif
++
++#include <com/sun/star/uno/XComponentContext.idl>
++#include <com/sun/star/table/XCellRange.idl>
++
++module ooo {  module vba { module excel {
++service Globals : XGlobals
++{
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/excel/XRange.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XRange.idl	(revision 276159)
++++ oovbaapi/ooo/vba/excel/XRange.idl	(revision 276288)
+@@ -45,6 +45,9 @@
+ #ifndef __com_sun_star_script_XDefaultMethod_idl__
+ #include <com/sun/star/script/XDefaultMethod.idl>
+ #endif
++#ifndef __com_sun_star_script_XErrorQuery_idl__
++#include <com/sun/star/script/XErrorQuery.idl>
++#endif
+ #ifndef __ooo_vba_XCollection_idl__
+ #include <ooo/vba/XCollection.idl>
+ #endif
+@@ -77,6 +80,7 @@ interface XRange
+  	interface com::sun::star::container::XEnumerationAccess;
+ 	interface com::sun::star::script::XDefaultMethod;
+ 	interface com::sun::star::script::XDefaultProperty;
++	interface com::sun::star::script::XErrorQuery;
+ 	interface ::ooo::vba::excel::XFormat;
+ 	//interface ::ooo::vba::XHelperInterface;
+ 
+Index: oovbaapi/ooo/vba/excel/TextFrame.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/TextFrame.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/TextFrame.idl	(revision 276288)
+@@ -0,0 +1,53 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef __ooo_vba_excel_TextFrame_idl__
++#define __ooo_vba_excel_TextFrame_idl__
++
++#ifndef __ooo_vba_excel_XTextFrame_idl__
++#include <ooo/vba/excel/XTextFrame.idl>
++#endif
++
++#include <com/sun/star/uno/XComponentContext.idl>
++
++module ooo {  module vba { module excel {
++service TextFrame : XTextFrame
++{
++  	//createTextFrame(  [in] ::ooo::vba::XHelperInterface Parent, [in] ::com::sun::star::frame::XModel xModel );
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/excel/XMenuBars.idl
+===================================================================
+--- oovbaapi/ooo/vba/excel/XMenuBars.idl	(revision 0)
++++ oovbaapi/ooo/vba/excel/XMenuBars.idl	(revision 276288)
+@@ -0,0 +1,66 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XMenuBars.idl,v $
++ * $Revision: 1.0 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_excel_XMenuBars_idl__
++#define __ooo_vba_excel_XMenuBars_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
++#include <com/sun/star/script/BasicErrorException.idl>
++#endif
++
++#ifndef  __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++//=============================================================================
++
++module ooo {  module vba {  module excel { 
++
++//=============================================================================
++
++interface XMenuBars
++{
++	interface ooo::vba::XCollection;
++};
++
++//=============================================================================
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/XWindowBase.idl
+===================================================================
+--- oovbaapi/ooo/vba/XWindowBase.idl	(revision 0)
++++ oovbaapi/ooo/vba/XWindowBase.idl	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XHelperWindow_idl__
++#define __ooo_vba_XHelperWindow_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba { 
++//=============================================================================
++
++interface XWindowBase
++{
++	interface ::ooo::vba::XHelperInterface;
++
++	[attribute] long Height; 
++	[attribute] long Left; 
++	[attribute] long Top; 
++	[attribute] boolean Visible;
++	[attribute] long Width; 
++};
++
++}; };
++
++#endif
+Index: oovbaapi/ooo/vba/XCommandBar.idl
+===================================================================
+--- oovbaapi/ooo/vba/XCommandBar.idl	(revision 276159)
++++ oovbaapi/ooo/vba/XCommandBar.idl	(revision 276288)
+@@ -54,9 +54,12 @@ interface XCommandBar
+ 
+     [attribute] string Name;
+     [attribute] boolean Visible;
++    [attribute] boolean Enabled;
+     
+     void Delete() raises ( com::sun::star::script::BasicErrorException );
+     any Controls( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
++    long Type() raises ( com::sun::star::script::BasicErrorException );
++    any FindControl( [in] any Type, [in] any Id, [in] any Tag, [in] any Visible, [in] any Recursive ) raises ( com::sun::star::script::BasicErrorException );
+ };
+ 
+ }; };
+Index: oovbaapi/ooo/vba/ControlProvider.idl
+===================================================================
+--- oovbaapi/ooo/vba/ControlProvider.idl	(revision 0)
++++ oovbaapi/ooo/vba/ControlProvider.idl	(revision 276288)
+@@ -0,0 +1,54 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XGlobals.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_ControlProvider_idl__
++#define __ooo_vba_ControlProvider_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __com_sun_star_frame_XModel_idl__
++#include <com/sun/star/frame/XModel.idl>
++#endif
++
++
++module ooo {  module vba { 
++
++interface XControlProvider;
++
++service ControlProvider 
++{
++    interface ::ooo::vba::XControlProvider;
++};
++
++}; };
++
++#endif
++
+Index: oovbaapi/ooo/vba/XCommandBarControl.idl
+===================================================================
+--- oovbaapi/ooo/vba/XCommandBarControl.idl	(revision 276159)
++++ oovbaapi/ooo/vba/XCommandBarControl.idl	(revision 276288)
+@@ -54,6 +54,8 @@ interface XCommandBarControl
+     [attribute] string Caption;
+     [attribute] string OnAction;
+     [attribute] boolean Visible;
++    [attribute, readonly] long Type;
++    [attribute] boolean Enabled;
+     
+     void Delete() raises ( com::sun::star::script::BasicErrorException );
+     any Controls( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
+Index: oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
+===================================================================
+--- oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl	(revision 276159)
++++ oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl	(revision 276288)
+@@ -41,8 +41,8 @@
+ module ooo {  module vba { 
+ interface XVBAToOOEventDescGen : com::sun::star::uno::XInterface
+ {
+-	sequence< com::sun::star::script::ScriptEventDescriptor >  getEventDescriptions( [in] com::sun::star::uno::XInterface xControl, [in] string sLibModName, [in] sequence< string > handlerExts );
+-	com::sun::star::script::XScriptEventsSupplier getEventSupplier( [in] com::sun::star::uno::XInterface xControl );
++	sequence< com::sun::star::script::ScriptEventDescriptor >  getEventDescriptions( [in] com::sun::star::uno::XInterface xControl, [in] string sCodeName );
++	com::sun::star::script::XScriptEventsSupplier getEventSupplier( [in] com::sun::star::uno::XInterface xControl, [in] string sCodeName );
+ };
+ 
+ }; };
+Index: oovbaapi/ooo/vba/XDocumentBase.idl
+===================================================================
+--- oovbaapi/ooo/vba/XDocumentBase.idl	(revision 0)
++++ oovbaapi/ooo/vba/XDocumentBase.idl	(revision 276288)
+@@ -0,0 +1,67 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XDocumentBase_idl__
++#define __ooo_vba_XDocumentBase_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba { 
++//=============================================================================
++
++interface XDocumentBase
++{
++	interface ::ooo::vba::XHelperInterface;
++
++	[attribute, readonly] string  Name;
++	[attribute, readonly] string  Path;
++	[attribute, readonly] string  FullName;
++	[attribute] boolean Saved;
++
++	void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook);
++	void Save();
++	void Activate();
++	void Protect( [in] any Password );
++	void Unprotect( [in] any Password );
++};
++
++}; };
++
++#endif
+Index: oovbaapi/ooo/vba/word/XFind.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XFind.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XFind.idl	(revision 276288)
+@@ -0,0 +1,87 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XFind_idl__
++#define __ooo_vba_word_XFind_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XFind
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute] string Text;
++    [attribute] any Replacement;
++    [attribute] boolean Forward;
++    [attribute] long Wrap;
++    [attribute] boolean Format;
++    [attribute] boolean MatchCase;
++    [attribute] boolean MatchWholeWord;
++    [attribute] boolean MatchWildcards;
++    [attribute] boolean MatchSoundsLike;
++    [attribute] boolean MatchAllWordForms;
++    [attribute] any Style;
++
++    boolean Execute([in] /* string */ any FindText,
++        [in] /* boolean */ any MatchCase,
++        [in] /* boolean */ any MatchWholeWord,
++        [in] /* boolean */ any MatchWildcards,
++        [in] /* boolean */ any MatchSoundsLike,
++        [in] /* boolean */ any MatchAllWordForms,
++        [in] /* boolean */ any Forward,
++        [in] /* long */ any Wrap,
++        [in] /* boolean */ any Format,
++        [in] /* string */ any ReplaceWith,
++        [in] /* boolean */ any Replace,
++        [in] /* boolean */ any MatchKashida,
++        [in] /* boolean */ any MatchDiacritics,
++        [in] /* boolean */ any MatchAlefHamza,
++        [in] /* boolean */ any MatchControl,
++        [in] /* boolean */ any MatchPrefix,
++        [in] /* boolean */ any MatchSuffix,
++        [in] /* boolean */ any MatchPhrase,
++        [in] /* boolean */ any IgnoreSpace,
++        [in] /* boolean */ any IgnorePunct );
++    void ClearFormatting();
++
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XDialogs.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XDialogs.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XDialogs.idl	(revision 276288)
+@@ -0,0 +1,54 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XDialogs.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XDialogs_idl__
++#define __ooo_vba_word_XDialogs_idl__
++                                                                                                                             
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++//=============================================================================
++                                                                                                                             
++module ooo {  module vba {  module word {
++                                                                                                                             
++interface XDialogs : com::sun::star::uno::XInterface
++{
++
++	any Item( [in] any Index );
++};
++                                                                                                                             
++}; }; };
++                                                                                                                             
++#endif
++
+Index: oovbaapi/ooo/vba/word/XPane.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XPane.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XPane.idl	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XPane_idl__
++#define __ooo_vba_word_XPane_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XPane
++{
++    interface ooo::vba::XHelperInterface;
++
++    any View();
++    void Close();
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XGlobals.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XGlobals.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XGlobals.idl	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XGlobals.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XGlobals_idl__
++#define __ooo_vba_word_XGlobals_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++interface XDocument;
++interface XWindow;
++interface XSystem;
++interface XOptions;
++interface XSelection;
++interface XGlobals : com::sun::star::uno::XInterface
++{
++	[attribute, readonly] XDocument ActiveDocument;
++	[attribute, readonly] XWindow ActiveWindow;
++	[attribute, readonly] string Name;
++	[attribute, readonly] ooo::vba::word::XSystem System;
++	[attribute, readonly] ooo::vba::word::XOptions Options;
++	[attribute, readonly] ooo::vba::word::XSelection Selection;
++    any CommandBars( [in] any aIndex );
++    any Documents( [in] any aIndex );
++    any Addins( [in] any aIndex );
++    any Dialogs( [in] any aIndex );
++    float CentimetersToPoints([in] float Centimeters );
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XField.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XField.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XField.idl	(revision 276288)
+@@ -0,0 +1,52 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: XField.idl,v $
++ *
++ *  $Revision: 1.1 $
++ *
++ *  last change: $Author: jsc $ $Date: 2007/02/09 08:35:01 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef __ooo_vba_word_XField_idl__
++#define __ooo_vba_word_XField_idl__
++
++#ifndef  __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++module ooo { module vba { module word {
++
++interface XField 
++{
++    interface ::ooo::vba::XHelperInterface;
++};
++
++}; }; };
++
++#endif
++
+Index: oovbaapi/ooo/vba/word/XSelection.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XSelection.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XSelection.idl	(revision 276288)
+@@ -0,0 +1,89 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XSelection_idl__
++#define __ooo_vba_word_XSelection_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++
++module ooo {  module vba {  module word { 
++
++interface XRange;
++interface XParagraphFormat;
++interface XFind;
++interface XFont;
++interface XStyle;
++interface XHeaderFooter;
++interface XSelection
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute] string Text;
++    [attribute, readonly] XRange Range;
++    [attribute] XParagraphFormat ParagraphFormat;
++    [attribute, readonly] XFind Find;
++    [attribute] XStyle Style;
++    [attribute, readonly] XFont Font;
++    [attribute, readonly] XHeaderFooter HeaderFooter;
++    [attribute] long LanguageID;
++    [attribute] long Start;
++    [attribute] long End;
++
++    any Tables( [in] any aIndex );
++    any Fields( [in] any aIndex );
++    void TypeText( [in] string Text );
++    void HomeKey( [in] any Unit, [in] any Extend );
++    void EndKey( [in] any Unit, [in] any Extend );
++    void Delete( [in] any Unit, [in] any Count );
++    void MoveRight( [in] any Unit, [in] any Count, [in] any Extend );
++    void MoveLeft( [in] any Unit, [in] any Count, [in] any Extend );
++    void MoveDown( [in] any Unit, [in] any Count, [in] any Extend );
++    void TypeParagraph();
++    void InsertParagraph();
++    void InsertParagraphBefore();
++    void InsertParagraphAfter();
++    void TypeBackspace();
++    XRange GoTo( [in] any What, [in] any Which, [in] any Count, [in] any Name );
++    any Information( [in] long Type );
++    void InsertBreak( [in] any Type );
++    any ShapeRange();
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XVariable.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XVariable.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XVariable.idl	(revision 276288)
+@@ -0,0 +1,60 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XVariable_idl__
++#define __ooo_vba_word_XVariable_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++#ifndef __com_sun_star_container_XNamed_idl__
++#include <com/sun/star/container/XNamed.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XVariable
++{
++    interface ooo::vba::XHelperInterface;
++	interface ::com::sun::star::container::XNamed;
++
++    [attribute] any Value;
++    [attribute, readonly] long Index;
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XTable.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XTable.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XTable.idl	(revision 276288)
+@@ -0,0 +1,86 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: XTable.idl,v $
++ *
++ *  $Revision: 1.1 $
++ *
++ *  last change: $Author: jsc $ $Date: 2007/02/09 08:35:01 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef __ooo_vba_word_XTable_idl__
++#define __ooo_vba_word_XTable_idl__
++
++#ifndef  __com_sun_star_script_BasicErrorException_idl__
++#include <com/sun/star/script/BasicErrorException.idl>
++#endif
++
++#ifndef  __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++module ooo { module vba { module word {
++
++interface XRange;
++
++interface XTable 
++{
++    interface ::ooo::vba::XHelperInterface;
++    [attribute, readonly ] string Name; // for debug only
++
++    XRange Range() raises (com::sun::star::script::BasicErrorException);
++
++    /**
++     select the table
++     */
++    void Select()
++        raises (com::sun::star::script::BasicErrorException);
++
++    /**
++     delete the table
++     */
++    void Delete()
++        raises (com::sun::star::script::BasicErrorException);
++
++    /**
++     convert the table to text
++     @param Separator the separator used for the text where cell separation was
++     @return XRange a range containing the text
++     @throw BasicErrorException when the conversion cannot be done
++     */
++/*
++    XRange ConvertToText([in] any Separator, [in] any NestedTables)
++        raises(com::sun::star::script::BasicErrorException);
++*/
++    any Borders( [in] any aIndex );
++
++};
++
++}; }; };
++
++#endif
++
+Index: oovbaapi/ooo/vba/word/XParagraphs.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XParagraphs.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XParagraphs.idl	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XParagraphs_idl__
++#define __ooo_vba_word_XParagraphs_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++
++interface XParagraphs 
++{
++	interface ::ooo::vba::XCollection;
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/word/XOptions.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XOptions.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XOptions.idl	(revision 276288)
+@@ -0,0 +1,68 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XOptions_idl__
++#define __ooo_vba_word_XOptions_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XOptions
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute] long DefaultBorderLineStyle;
++    [attribute] long DefaultBorderLineWidth;
++    [attribute] long DefaultBorderColorIndex;
++    [attribute] boolean ReplaceSelection;
++    [attribute] boolean MapPaperSize;
++    [attribute] boolean AutoFormatAsYouTypeApplyHeadings;
++    [attribute] boolean AutoFormatAsYouTypeApplyBulletedLists;
++    [attribute] boolean AutoFormatAsYouTypeApplyNumberedLists;
++    [attribute] boolean AutoFormatAsYouTypeFormatListItemBeginning;
++    [attribute] boolean AutoFormatAsYouTypeDefineStyles;
++    [attribute] boolean AutoFormatApplyHeadings;
++    [attribute] boolean AutoFormatApplyLists;
++    [attribute] boolean AutoFormatApplyBulletedLists;
++
++    any DefaultFilePath( [in] long Path );
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XPageSetup.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XPageSetup.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XPageSetup.idl	(revision 276288)
+@@ -0,0 +1,63 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XPageSetup_idl__
++#define __ooo_vba_word_XPageSetup_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++
++
++interface XPageSetup : com::sun::star::uno::XInterface
++{
++    [attribute] double Gutter;
++    [attribute] double HeaderDistance;
++    [attribute] double FooterDistance;
++    [attribute] boolean DifferentFirstPageHeaderFooter;
++    [attribute] long SectionStart;
++};
++
++//=============================================================================
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XReplacement.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XReplacement.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XReplacement.idl	(revision 276288)
+@@ -0,0 +1,54 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XReplacement_idl__
++#define __ooo_vba_word_XReplacement_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XReplacement
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute] string Text;
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XDialog.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XDialog.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XDialog.idl	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XDialog.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XDialog_idl__
++#define __ooo_vba_word_XDialog_idl__
++                                                                                                                             
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++
++//=============================================================================
++                                                                                                                             
++module ooo {  module vba {  module word {
++                                                                                                                             
++//=============================================================================
++
++interface XDialog : com::sun::star::uno::XInterface
++{
++};
++                                                                                                                             
++}; }; };
++                                                                                                                             
++#endif
++
+Index: oovbaapi/ooo/vba/word/XStyle.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XStyle.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XStyle.idl	(revision 276288)
+@@ -0,0 +1,58 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XStyle_idl__
++#define __ooo_vba_word_XStyle_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XFont;
++interface XStyle
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute] string Name;
++    [attribute] long LanguageID;
++    [attribute, readonly] long Type;
++    [attribute, readonly] XFont Font;
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XDocuments.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XDocuments.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XDocuments.idl	(revision 276288)
+@@ -0,0 +1,58 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XDocuments_idl__
++#define __ooo_vba_word_XDocuments_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++
++interface XDocuments : com::sun::star::uno::XInterface
++{
++	any Add([in] any Template, [in] any NewTemplate, [in] any DocumentType, [in] any Visible);
++	any Open([in] string Filename, [in] any ConfirmConversions, [in] any ReadOnly, [in] any AddToRecentFiles, [in] any PasswordDocument, [in] any PasswordTemplate, [in] any Revert, [in] any WritePasswordDocument, [in] any WritePasswordTemplate, [in] any Format, [in] any Encoding, [in] any Visible, [in] any OpenAndRepair, [in] any DocumentDirection, [in] any NoEncodingDialog, [in] any XMLTransform);
++
++	void Close([in] any SaveChanges,[in] any OriginalFormat,[in] any RouteDocument);
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/word/XSection.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XSection.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XSection.idl	(revision 276288)
+@@ -0,0 +1,58 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XSection_idl__
++#define __ooo_vba_word_XSection_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XSection
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute] boolean ProtectedForForms;
++
++    any Headers();
++    any Footers();
++    any PageSetup();
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XParagraph.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XParagraph.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XParagraph.idl	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XParagraph_idl__
++#define __ooo_vba_word_XParagraph_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XRange;
++interface XParagraph
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute, readonly] XRange Range;
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XFont.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XFont.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XFont.idl	(revision 276288)
+@@ -0,0 +1,58 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XFont.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XFont_idl__
++#define __ooo_vba_word_XFont_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
++#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++interface XFont : com::sun::star::uno::XInterface
++{
++};
++
++//=============================================================================
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XAutoTextEntries.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XAutoTextEntries.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XAutoTextEntries.idl	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XAutoTextEntries_idl__
++#define __ooo_vba_word_XAutoTextEntries_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++
++interface XAutoTextEntries 
++{
++	interface ::ooo::vba::XCollection;
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/word/XTemplate.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XTemplate.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XTemplate.idl	(revision 276288)
+@@ -0,0 +1,56 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XTemplate_idl__
++#define __ooo_vba_word_XTemplate_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XTemplate
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute, readonly] string Name;
++
++    any AutoTextEntries( [in] any aIndex );
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XParagraphFormat.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XParagraphFormat.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XParagraphFormat.idl	(revision 276288)
+@@ -0,0 +1,70 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XParagraphFormat_idl__
++#define __ooo_vba_word_XParagraphFormat_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++
++module ooo {  module vba {  module word { 
++
++interface XParagraphFormat
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute] long Alignment;
++    [attribute] float FirstLineIndent;
++    [attribute] any KeepTogether;
++    [attribute] any KeepWithNext;
++    [attribute] any Hyphenation;
++    [attribute] float LineSpacing;
++    [attribute] long LineSpacingRule;
++    [attribute] any NoLineNumber;
++    [attribute] long OutlineLevel;
++    [attribute] any PageBreakBefore;
++    [attribute] float SpaceBefore;
++    [attribute] float SpaceAfter;
++    [attribute] float LeftIndent;
++    [attribute] float RightIndent;
++    [attribute] any TabStops;
++    [attribute] any WidowControl;
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XWrapFormat.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XWrapFormat.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XWrapFormat.idl	(revision 276288)
+@@ -0,0 +1,48 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XWrapFormat.idl,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XWrapFormat_idl__
++#define __ooo_vba_word_XWrapFormat_idl__
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word {
++interface XWrapFormat : ooo::vba::XHelperInterface
++{
++    [attribute] long Type;
++    [attribute] long Side;
++    [attribute] float DistanceTop;
++    [attribute] float DistanceBottom;
++    [attribute] float DistanceLeft;
++    [attribute] float DistanceRight;
++};
++}; }; };
++#endif
+Index: oovbaapi/ooo/vba/word/XStyles.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XStyles.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XStyles.idl	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XStyles_idl__
++#define __ooo_vba_word_XStyles_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++
++interface XStyles 
++{
++	interface ::ooo::vba::XCollection;
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/word/makefile.mk
+===================================================================
+--- oovbaapi/ooo/vba/word/makefile.mk	(revision 0)
++++ oovbaapi/ooo/vba/word/makefile.mk	(revision 276288)
+@@ -0,0 +1,90 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.4 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++PRJ=..$/..$/..
++
++PRJNAME=oovapi
++
++TARGET=word
++PACKAGE=ooo$/vba$/Word
++
++# --- Settings -----------------------------------------------------
++.INCLUDE :  $(PRJ)$/util$/makefile.pmk
++
++# ------------------------------------------------------------------------
++
++
++IDLFILES= XGlobals.idl\
++	XApplication.idl \
++	XDocument.idl \
++	XWindow.idl \
++	XSystem.idl \
++	XRange.idl \
++	XBookmark.idl \
++	XBookmarks.idl \
++	XVariable.idl \
++	XVariables.idl \
++	XView.idl \
++	XPane.idl \
++	XPanes.idl \
++	XOptions.idl \
++	XSelection.idl \
++ 	XTemplate.idl \
++	XParagraphFormat.idl \
++	XAutoTextEntries.idl \
++	XAutoTextEntry.idl \
++	XParagraphs.idl \
++	XParagraph.idl \
++	XFind.idl \
++	XReplacement.idl \
++	XStyle.idl \
++	XStyles.idl \
++    XFont.idl \
++    XTable.idl \
++    XTables.idl \
++    XField.idl \
++    XFields.idl \
++    XBorder.idl \
++    XBorders.idl \
++    XDocuments.idl \
++    XHeaderFooter.idl \
++    XAddins.idl \
++    XAddin.idl \
++    XDialogs.idl \
++    XDialog.idl \
++	XWrapFormat.idl \
++	XPageSetup.idl \
++	XSection.idl \
++	XSections.idl \
++
++# ------------------------------------------------------------------
++
++.INCLUDE :  target.mk
++
+Index: oovbaapi/ooo/vba/word/XSystem.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XSystem.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XSystem.idl	(revision 276288)
+@@ -0,0 +1,56 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XSystem_idl__
++#define __ooo_vba_word_XSystem_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++
++module ooo {  module vba {  module word { 
++
++interface XSystem
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute] long Cursor;
++    any PrivateProfileString( [in] string Filename, [in] string Section, [in] string Key );
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XSections.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XSections.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XSections.idl	(revision 276288)
+@@ -0,0 +1,57 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XSections_idl__
++#define __ooo_vba_word_XSections_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++
++interface XSections 
++{
++	interface ::ooo::vba::XCollection;
++    
++    any PageSetup();
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/word/XBookmarks.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XBookmarks.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XBookmarks.idl	(revision 276288)
+@@ -0,0 +1,61 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XBookmarks_idl__
++#define __ooo_vba_word_XBookmarks_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++
++interface XBookmarks 
++{
++	interface ::ooo::vba::XCollection;
++
++    [attribute] long DefaultSorting;
++    [attribute] boolean ShowHidden;
++
++	any Add( [in] string Name, [in] any Range );
++    boolean Exists( [in] string Name );
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/word/XRange.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XRange.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XRange.idl	(revision 276288)
+@@ -0,0 +1,78 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XRange_idl__
++#define __ooo_vba_word_XRange_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __com_sun_star_text_XTextRange_idl__
++#include <com/sun/star/text/XTextRange.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++
++module ooo {  module vba {  module word { 
++
++interface XParagraphFormat;
++interface XStyle;
++interface XFont;
++interface XRange
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute] string Text;
++    [attribute] XParagraphFormat ParagraphFormat;
++    [attribute] XStyle Style;
++    [attribute,readonly] ::com::sun::star::text::XTextRange XTextRange;
++    // Of course Font is NOT readonly, #FIXME #TODO
++    // readonly though will force an error attempting to write
++    [attribute, readonly] XFont Font;
++    [attribute] long LanguageID;
++    [attribute] long Start;
++    [attribute] long End;
++
++    void InsertBreak( [in] any Type );
++    void Select();
++    void InsertParagraph();
++    void InsertParagraphBefore();
++    void InsertParagraphAfter();
++    any PageSetup();
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XAutoTextEntry.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XAutoTextEntry.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XAutoTextEntry.idl	(revision 276288)
+@@ -0,0 +1,59 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XAutoTextEntry_idl__
++#define __ooo_vba_word_XAutoTextEntry_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++#ifndef __com_sun_star_container_XNamed_idl__
++#include <com/sun/star/container/XNamed.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XRange;
++interface XAutoTextEntry
++{
++    interface ooo::vba::XHelperInterface;
++
++    XRange Insert([in] XRange Where, [in] /*Optional*/ any RichText);
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XBorders.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XBorders.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XBorders.idl	(revision 276288)
+@@ -0,0 +1,59 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XBorders.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XBorders_idl__
++#define __ooo_vba_word_XBorders_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++#ifndef  __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++interface XBorders
++{
++	interface ooo::vba::XCollection;
++
++    [attribute] boolean Shadow;
++};
++
++//=============================================================================
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XAddins.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XAddins.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XAddins.idl	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XAddins_idl__
++#define __ooo_vba_word_XAddins_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++
++interface XAddins 
++{
++	interface ::ooo::vba::XCollection;
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/word/XApplication.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XApplication.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XApplication.idl	(revision 276288)
+@@ -0,0 +1,70 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XApplication.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XApplication_idl__
++#define __ooo_vba_word_XApplication_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XDocument;
++interface XWindow;
++interface XSystem;
++interface XOptions;
++interface XSelection;
++interface XApplication : com::sun::star::uno::XInterface
++{
++	[attribute, readonly] XDocument ActiveDocument;
++	[attribute, readonly] XWindow ActiveWindow;
++	[attribute, readonly] string Name;
++	[attribute, readonly] ooo::vba::word::XSystem System;
++	[attribute, readonly] ooo::vba::word::XOptions Options;
++	[attribute, readonly] ooo::vba::word::XSelection Selection;
++	[attribute] boolean DisplayAutoCompleteTips;
++	[attribute] long EnableCancelKey;
++
++    any CommandBars( [in] any aIndex );
++    any Documents( [in] any aIndex );
++    any Addins( [in] any aIndex );
++    any Dialogs( [in] any aIndex );
++    float CentimetersToPoints([in] float Centimeters );
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XBookmark.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XBookmark.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XBookmark.idl	(revision 276288)
+@@ -0,0 +1,61 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XBookmark_idl__
++#define __ooo_vba_word_XBookmark_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++#ifndef __com_sun_star_container_XNamed_idl__
++#include <com/sun/star/container/XNamed.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XBookmark
++{
++    interface ooo::vba::XHelperInterface;
++	interface ::com::sun::star::container::XNamed;
++
++    void Delete();
++    void Select();
++    any Range();
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XPanes.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XPanes.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XPanes.idl	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XPanes_idl__
++#define __ooo_vba_word_XPanes_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++
++interface XPanes 
++{
++	interface ::ooo::vba::XCollection;
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/word/XFields.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XFields.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XFields.idl	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: XFields.idl,v $
++ *
++ *  $Revision: 1.1 $
++ *
++ *  last change: $Author: jsc $ $Date: 2007/02/09 08:45:13 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef __ooo_vba_word__XFields_idl__
++#define __ooo_vba_word__XFields_idl__
++
++#ifndef  __ooo_vba_HelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++module ooo { module vba { module word {
++
++interface XRange;
++interface XField;
++interface XFields
++{
++    interface ooo::vba::XCollection;
++
++    XField Add([in] XRange Range, [in] any Type, [in] any Text,[in] any PreserveFormatting);
++    long Update();
++};
++
++}; }; };
++
++#endif
++
+Index: oovbaapi/ooo/vba/word/XHeaderFooter.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XHeaderFooter.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XHeaderFooter.idl	(revision 276288)
+@@ -0,0 +1,59 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XHeaderFooter_idl__
++#define __ooo_vba_word_XHeaderFooter_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XRange;
++interface XHeaderFooter
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute, readonly] boolean IsHeader;
++    [attribute] boolean LinkToPrevious;
++    [attribute, readonly] XRange Range;
++    //[attribute, readonly] XShapers Shapes ;
++    any Shapes([in] any Index);
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XWindow.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XWindow.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XWindow.idl	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XWindow.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XWindow_idl__
++#define __ooo_vba_word_XWindow_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++//interface XPane;
++interface XWindow : com::sun::star::uno::XInterface
++{
++    [attribute] any View;
++	void Activate();
++    void Close([in] any SaveChanges, [in] any RouteDocument);
++	any Panes( [in] any aIndex ); // this is a fake api for it seems not support in Write
++	any ActivePane(); // this is a fake api for it seems not support in Write
++};
++
++//=============================================================================
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XVariables.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XVariables.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XVariables.idl	(revision 276288)
+@@ -0,0 +1,57 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XVariables_idl__
++#define __ooo_vba_word_XVariables_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++//=============================================================================
++
++interface XVariables 
++{
++	interface ::ooo::vba::XCollection;
++
++	any Add( [in] string Name, [in] any Value );
++};
++
++}; }; };
++
++#endif
+Index: oovbaapi/ooo/vba/word/XTables.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XTables.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XTables.idl	(revision 276288)
+@@ -0,0 +1,79 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: XTables.idl,v $
++ *
++ *  $Revision: 1.1 $
++ *
++ *  last change: $Author: jsc $ $Date: 2007/02/09 08:45:13 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef __ooo_vba_word__XTables_idl__
++#define __ooo_vba_word__XTables_idl__
++
++#ifndef  __ooo_vba_HelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++#ifndef __ooo_vba_word_XTable_idl__
++#include <ooo/vba/word/XTable.idl>
++#endif
++
++#ifndef __com_sun_star_script_BasicErrorException_idl__
++#include <com/sun/star/script/BasicErrorException.idl>
++#endif
++
++module ooo { module vba { module word {
++
++interface XRange;
++
++interface XTables
++{
++    interface ooo::vba::XCollection;
++    /** Creates a new Table, optionally with a name.
++     <p>Creates a new table at the current cursor position. </p>
++     @param range
++     @returns
++     reference to the new table.
++     */
++    XTable Add([in] XRange Range, [in] any NumRows, [in] any NumColumns,
++    /*optional*/ [in] any DefaultTableBehavior,
++    /*optional*/ [in] any AutoFitBehavior)
++        raises(com::sun::star::script::BasicErrorException);
++
++
++};
++
++}; }; };
++
++#endif
++
+Index: oovbaapi/ooo/vba/word/XView.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XView.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XView.idl	(revision 276288)
+@@ -0,0 +1,57 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XView_idl__
++#define __ooo_vba_word_XView_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XView
++{
++    interface ooo::vba::XHelperInterface;
++
++    [attribute] long SeekView;
++    [attribute] long SplitSpecial;
++    [attribute] boolean TableGridLines;
++    [attribute] long Type;
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XBorder.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XBorder.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XBorder.idl	(revision 276288)
+@@ -0,0 +1,59 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XBorder.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XBorder_idl__
++#define __ooo_vba_word_XBorder_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++//=============================================================================
++
++module ooo {  module vba {  module word { 
++
++
++//=============================================================================
++interface XBorder
++{
++	interface ::ooo::vba::XHelperInterface;
++
++	[attribute] any LineStyle;
++};
++
++//=============================================================================
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XDocument.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XDocument.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XDocument.idl	(revision 276288)
+@@ -0,0 +1,75 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XDocument.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XDocument_idl__
++#define __ooo_vba_word_XDocument_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++#ifndef __ooo_vba_word_XRange_idl__
++#include <ooo/vba/word/XRange.idl>
++#endif
++
++#ifndef __com_sun_star_script_XInvocation_idl__
++#include <com/sun/star/script/XInvocation.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XDocument : com::sun::star::script::XInvocation
++{
++    [attribute, readonly] XRange Content;
++    [attribute] any AttachedTemplate;
++
++    XRange Range( [in] any Start, [in] any End );
++    any BuiltInDocumentProperties( [in] any index );
++    any CustomDocumentProperties( [in] any index );
++    any Bookmarks( [in] any aIndex );
++    any Variables( [in] any aIndex );
++    any Paragraphs( [in] any aIndex );
++    any Styles( [in] any aIndex );
++    any Tables( [in] any aIndex );
++    any Fields( [in] any aIndex );
++    any Shapes([in] any Index);
++    any Sections([in] any Index);
++	void Activate();
++    any PageSetup();
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/word/XAddin.idl
+===================================================================
+--- oovbaapi/ooo/vba/word/XAddin.idl	(revision 0)
++++ oovbaapi/ooo/vba/word/XAddin.idl	(revision 276288)
+@@ -0,0 +1,61 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_word_XAddin_idl__
++#define __ooo_vba_word_XAddin_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++#ifndef __com_sun_star_container_XNamed_idl__
++#include <com/sun/star/container/XNamed.idl>
++#endif
++
++module ooo {  module vba {  module word { 
++
++interface XAddin
++{
++    interface ooo::vba::XHelperInterface;
++	interface ::com::sun::star::container::XNamed;
++
++    [attribute, readonly] string Path;
++    [attribute, readonly] boolean Autoload;
++    [attribute] boolean Installed;
++};
++
++}; }; };
++
++#endif
++
++
+Index: oovbaapi/ooo/vba/XDialogsBase.idl
+===================================================================
+--- oovbaapi/ooo/vba/XDialogsBase.idl	(revision 0)
++++ oovbaapi/ooo/vba/XDialogsBase.idl	(revision 276288)
+@@ -0,0 +1,60 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XDialogs.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XDialogs_idl__
++#define __ooo_vba_XDialogs_idl__
++                                                                                                                             
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++#ifndef __ooo_vba_XCollection_idl__
++#include <ooo/vba/XCollection.idl>
++#endif
++
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++
++//=============================================================================
++                                                                                                                             
++module ooo {  module vba {
++                                                                                                                             
++//interface XDialogs : ::ooo::vba::XCollection
++interface XDialogsBase 
++{
++	interface ::ooo::vba::XHelperInterface;
++
++    [attribute, readonly] long Count;
++	any Item( [in] any Index );
++};
++                                                                                                                             
++}; };
++                                                                                                                             
++#endif
++
+Index: oovbaapi/ooo/vba/constants/makefile.mk
+===================================================================
+--- oovbaapi/ooo/vba/constants/makefile.mk	(revision 276159)
++++ oovbaapi/ooo/vba/constants/makefile.mk	(revision 276288)
+@@ -38,11 +38,6 @@ PACKAGE=org$/vba$/constants
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  $(PRJ)$/util$/makefile.pmk
+ 
+-.IF "$(ENABLE_VBA)"!="YES"
+-dummy:
+-        @echo "not building vba..."
+-.ELSE
+-
+ # ------------------------------------------------------------------------
+ 
+ # I tried to use the IDLFILES target but it failed dismally
+@@ -65,5 +60,3 @@ $(MY_GEN_UCR_PATH)$/%.urd: $(MY_GEN_IDL_PATH)$/%.i
+ $(MYDBTARGET) : $(MYURDFILES)  $(MYIDLFILES)
+     $(REGMERGE) $(OUT)$/ucr/constants.db /UCR @$(mktmp $(MYURDFILES))
+ 
+-.ENDIF
+-
+Index: oovbaapi/ooo/vba/XGlobalsBase.idl
+===================================================================
+--- oovbaapi/ooo/vba/XGlobalsBase.idl	(revision 0)
++++ oovbaapi/ooo/vba/XGlobalsBase.idl	(revision 276288)
+@@ -0,0 +1,53 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XGlobals.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __ooo_vba_XGlobalsBase_idl__
++#define __ooo_vba_XGlobalsBase_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++#ifndef __ooo_vba_XHelperInterface_idl__
++#include <ooo/vba/XHelperInterface.idl>
++#endif
++#ifndef __com_sun_star_lang_XMultiServiceFactory
++#include <com/sun/star/lang/XMultiServiceFactory.idl>
++#endif
++module ooo {  module vba {
++interface XGlobalsBase
++{
++	interface ::ooo::vba::XHelperInterface;
++	interface ::com::sun::star::lang::XMultiServiceFactory;
++};
++
++}; };
++
++#endif
++
++
+Index: oovbaapi/util/makefile.mk
+===================================================================
+--- oovbaapi/util/makefile.mk	(revision 276159)
++++ oovbaapi/util/makefile.mk	(revision 276288)
+@@ -40,15 +40,11 @@ TARGET=oovbaapi_db
+ 
+ .INCLUDE :  makefile.pmk
+ 
+-.IF "$(ENABLE_VBA)"!="YES"
+-dummy:
+-        @echo "not building vba..."
+-.ENDIF
+-
+ # ------------------------------------------------------------------
+ UNOIDLDBFILES= \
+ 	$(UCR)$/vba.db \
+ 	$(UCR)$/excel.db \
++	$(UCR)$/word.db \
+ 	$(UCR)$/msforms.db \
+ 	$(UCR)$/constants.db
+ 
+Index: scripting/source/basprov/basscript.hxx
+===================================================================
+--- scripting/source/basprov/basscript.hxx	(revision 276159)
++++ scripting/source/basprov/basscript.hxx	(revision 276288)
+@@ -31,12 +31,14 @@
+ #ifndef SCRIPTING_BASSCRIPT_HXX
+ #define SCRIPTING_BASSCRIPT_HXX
+ 
++#include "bcholder.hxx"
+ #include <com/sun/star/script/provider/XScript.hpp>
+ #include <com/sun/star/document/XScriptInvocationContext.hpp>
+ #include <cppuhelper/implbase1.hxx>
++#include <comphelper/proparrhlp.hxx>
++#include <comphelper/propertycontainer.hxx>
+ #include <basic/sbmeth.hxx>
+ 
+-
+ class BasicManager;
+ 
+ //.........................................................................
+@@ -52,7 +54,11 @@ namespace basprov
+         ::com::sun::star::script::provider::XScript > BasicScriptImpl_BASE;
+ 
+ 
+-    class BasicScriptImpl : public BasicScriptImpl_BASE
++    class BasicScriptImpl : public BasicScriptImpl_BASE,
++                                public ::scripting_helper::OMutexHolder,
++                                public ::scripting_helper::OBroadcastHelperHolder,
++                                public ::comphelper::OPropertyContainer,
++                                public ::comphelper::OPropertyArrayUsageHelper< BasicScriptImpl >
+     {
+     private:
+         SbMethodRef         m_xMethod;
+@@ -60,7 +66,17 @@ namespace basprov
+         BasicManager*       m_documentBasicManager;
+         ::com::sun::star::uno::Reference< ::com::sun::star::document::XScriptInvocationContext >
+                             m_xDocumentScriptContext;
++        // hack, OPropertyContainer doesn't allow you to define a property of unknown
++        // type ( I guess because an Any can't contain an Any... I've always wondered why?
++	// as its not unusual to do that in corba )
++        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_caller;
++    protected:
++        // OPropertySetHelper
++        virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(  );
+ 
++        // OPropertyArrayUsageHelper
++        virtual ::cppu::IPropertyArrayHelper* createArrayHelper(  ) const;
++
+     public:
+         BasicScriptImpl(
+             const ::rtl::OUString& funcName,
+@@ -74,6 +90,12 @@ namespace basprov
+         );
+         virtual ~BasicScriptImpl();
+ 
++        // XInterface
++        DECLARE_XINTERFACE()
++
++        // XTypeProvider
++        DECLARE_XTYPEPROVIDER()
++
+         // XScript
+         virtual ::com::sun::star::uno::Any SAL_CALL invoke(
+             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
+@@ -83,6 +105,9 @@ namespace basprov
+                     ::com::sun::star::script::provider::ScriptFrameworkErrorException, 
+                     ::com::sun::star::reflection::InvocationTargetException,
+                     ::com::sun::star::uno::RuntimeException );               
++        // XPropertySet
++        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) 
++            throw (::com::sun::star::uno::RuntimeException);
+     };
+ 
+ //.........................................................................
+Index: scripting/source/basprov/basscript.cxx
+===================================================================
+--- scripting/source/basprov/basscript.cxx	(revision 276159)
++++ scripting/source/basprov/basscript.cxx	(revision 276288)
+@@ -39,7 +39,10 @@
+ #include <basic/sbmeth.hxx>
+ #include <basic/basmgr.hxx>
+ #include <com/sun/star/script/provider/ScriptFrameworkErrorType.hpp>
+-
++#include "bcholder.hxx"
++#include <comphelper/proparrhlp.hxx>
++#include <comphelper/propertycontainer.hxx>
++#include <com/sun/star/beans/PropertyAttribute.hpp>
+ #include <map>
+ 
+ 
+@@ -48,6 +51,7 @@ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star::script;
+ using namespace ::com::sun::star::document;
++using namespace ::com::sun::star::beans;
+ 
+ extern ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
+ extern void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue );
+@@ -57,7 +61,11 @@ extern void unoToSbxValue( SbxVariable* pVar, cons
+ namespace basprov
+ {
+ //.........................................................................
++#define BASSCRIPT_PROPERTY_ID_CALLER         1
++#define BASSCRIPT_PROPERTY_CALLER            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Caller" ) )
+ 
++#define BASSCRIPT_DEFAULT_ATTRIBS()       PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT
++
+     typedef ::std::map< sal_Int16, Any, ::std::less< sal_Int16 > > OutParamMap;
+ 
+     // =============================================================================
+@@ -67,22 +75,28 @@ namespace basprov
+     // -----------------------------------------------------------------------------
+ 
+     BasicScriptImpl::BasicScriptImpl( const ::rtl::OUString& funcName, SbMethodRef xMethod )
+-        :m_xMethod( xMethod )
++        : ::scripting_helper::OBroadcastHelperHolder( m_aMutex )
++        ,OPropertyContainer( GetBroadcastHelper() )
++        ,m_xMethod( xMethod )
+         ,m_funcName( funcName )
+         ,m_documentBasicManager( NULL )
+         ,m_xDocumentScriptContext()
+     {
++        registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) );
+     }
+ 
+     // -----------------------------------------------------------------------------
+ 
+     BasicScriptImpl::BasicScriptImpl( const ::rtl::OUString& funcName, SbMethodRef xMethod,
+-        BasicManager& documentBasicManager, const Reference< XScriptInvocationContext >& documentScriptContext )
+-        :m_xMethod( xMethod )
++        BasicManager& documentBasicManager, const Reference< XScriptInvocationContext >& documentScriptContext ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex )
++        ,OPropertyContainer( GetBroadcastHelper() )
++        ,m_xMethod( xMethod )
+         ,m_funcName( funcName )
+         ,m_documentBasicManager( &documentBasicManager )
+         ,m_xDocumentScriptContext( documentScriptContext )
+     {
++	// 
++        registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) );
+     }
+ 
+     // -----------------------------------------------------------------------------
+@@ -91,6 +105,48 @@ namespace basprov
+     }
+ 
+     // -----------------------------------------------------------------------------
++    // XInterface
++    // -----------------------------------------------------------------------------
++
++    IMPLEMENT_FORWARD_XINTERFACE2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
++
++    // -----------------------------------------------------------------------------
++    // XTypeProvider
++    // -----------------------------------------------------------------------------
++
++    IMPLEMENT_FORWARD_XTYPEPROVIDER2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
++
++    // -----------------------------------------------------------------------------
++    // OPropertySetHelper
++    // -----------------------------------------------------------------------------
++
++    ::cppu::IPropertyArrayHelper& BasicScriptImpl::getInfoHelper(  )
++    {
++        return *getArrayHelper();
++    }
++
++    // -----------------------------------------------------------------------------
++    // OPropertyArrayUsageHelper
++    // -----------------------------------------------------------------------------
++
++    ::cppu::IPropertyArrayHelper* BasicScriptImpl::createArrayHelper(  ) const
++    {
++        Sequence< Property > aProps;
++        describeProperties( aProps );
++        return new ::cppu::OPropertyArrayHelper( aProps );
++    }
++
++    // -----------------------------------------------------------------------------
++    // XPropertySet
++    // -----------------------------------------------------------------------------
++
++    Reference< XPropertySetInfo > BasicScriptImpl::getPropertySetInfo(  ) throw (RuntimeException)
++    {
++        Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
++        return xInfo;
++    }
++
++    // -----------------------------------------------------------------------------
+     // XScript
+     // -----------------------------------------------------------------------------
+ 
+@@ -169,8 +225,14 @@ namespace basprov
+                 if ( m_documentBasicManager && m_xDocumentScriptContext.is() )
+                     aOldThisComponent = m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( m_xDocumentScriptContext ) );
+ 
++            if ( m_caller.getLength() && m_caller[ 0 ].hasValue()  )
++            {
++                SbxVariableRef xCallerVar = new SbxVariable( SbxVARIANT );
++                unoToSbxValue( static_cast< SbxVariable* >( xCallerVar ), m_caller[ 0 ] );
++                nErr = m_xMethod->Call( xReturn, xCallerVar );
++            }
++            else
+                 nErr = m_xMethod->Call( xReturn );
+-
+                 if ( m_documentBasicManager && m_xDocumentScriptContext.is() )
+                     m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", aOldThisComponent );
+             }
+Index: scripting/source/dlgprov/dlgevtatt.cxx
+===================================================================
+--- scripting/source/dlgprov/dlgevtatt.cxx	(revision 276159)
++++ scripting/source/dlgprov/dlgevtatt.cxx	(revision 276288)
+@@ -112,27 +112,30 @@ namespace dlgprov
+     {
+         protected:
+         rtl::OUString msDialogCodeName;
++        rtl::OUString msDialogLibName;
+         Reference<  script::XScriptListener > mxListener;
+         virtual void firing_impl( const script::ScriptEvent& aScriptEvent, uno::Any* pRet );
+         public:
+-        DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel );
++        DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const rtl::OUString& sDialogLibName );
+     };
+ 
+-    DialogVBAScriptListenerImpl::DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel ) : DialogScriptListenerImpl( rxContext )
++    DialogVBAScriptListenerImpl::DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const rtl::OUString& sDialogLibName ) : DialogScriptListenerImpl( rxContext ), msDialogLibName( sDialogLibName )
+     {
+         Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() );
++        Sequence< Any > args(1);
+         if ( xSMgr.is() )
+         {
+-            Sequence< Any > args(1);
+             args[0] <<= xModel;
+             mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.EventListener" ) ), args, m_xContext ), UNO_QUERY );
+         }
+         if ( rxControl.is() )
+         {
+-            Reference< XPropertySet > xProps( rxControl->getModel(), UNO_QUERY );
+             try
+             {
++                Reference< XPropertySet > xProps( rxControl->getModel(), UNO_QUERY_THROW );
+                 xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= msDialogCodeName;
++                xProps.set( mxListener, UNO_QUERY_THROW );
++                xProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ), args[ 0 ] );
+             } 
+             catch ( Exception&  ) {}
+         }
+@@ -144,7 +147,7 @@ namespace dlgprov
+         if ( aScriptEvent.ScriptType.equals( rtl::OUString::createFromAscii("VBAInterop") ) && mxListener.is() )
+         {
+             ScriptEvent aScriptEventCopy( aScriptEvent );
+-            aScriptEventCopy.ScriptCode = msDialogCodeName;
++            aScriptEventCopy.ScriptCode = msDialogLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ).concat( msDialogCodeName );
+             try
+             {
+                 mxListener->firing( aScriptEventCopy );
+@@ -160,7 +163,7 @@ namespace dlgprov
+     // DialogEventsAttacherImpl
+     // =============================================================================
+ 
+-    DialogEventsAttacherImpl::DialogEventsAttacherImpl( const Reference< XComponentContext >& rxContext, const Reference< frame::XModel >& rxModel, const Reference< awt::XControl >& rxControl, const Reference< XInterface >& rxHandler, const Reference< beans::XIntrospectionAccess >& rxIntrospect, bool bProviderMode, const Reference< script::XScriptListener >& rxRTLListener   )
++    DialogEventsAttacherImpl::DialogEventsAttacherImpl( const Reference< XComponentContext >& rxContext, const Reference< frame::XModel >& rxModel, const Reference< awt::XControl >& rxControl, const Reference< XInterface >& rxHandler, const Reference< beans::XIntrospectionAccess >& rxIntrospect, bool bProviderMode, const Reference< script::XScriptListener >& rxRTLListener, const rtl::OUString& sDialogLibName  )
+         :m_xContext( rxContext )
+     {
+         // key listeners by protocol when ScriptType = 'Script'
+@@ -173,7 +176,7 @@ namespace dlgprov
+         listernersForTypes[ rtl::OUString::createFromAscii("vnd.sun.star.UNO") ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode );
+         listernersForTypes[ rtl::OUString::createFromAscii("vnd.sun.star.script") ] = new DialogSFScriptListenerImpl( rxContext, rxModel );
+ #ifdef FAKE_VBA_EVENT_SUPPORT
+-        listernersForTypes[ rtl::OUString::createFromAscii("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel );
++        listernersForTypes[ rtl::OUString::createFromAscii("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName );
+ #endif
+     }
+ 
+@@ -193,7 +196,7 @@ namespace dlgprov
+         return it->second; 
+     }
+ #ifdef FAKE_VBA_EVENT_SUPPORT
+-    Reference< XScriptEventsSupplier > DialogEventsAttacherImpl::getFakeVbaEventsSupplier( const Reference< XControl >& xControl )
++    Reference< XScriptEventsSupplier > DialogEventsAttacherImpl::getFakeVbaEventsSupplier( const Reference< XControl >& xControl, rtl::OUString& sControlName )
+     {
+         Reference< XScriptEventsSupplier > xEventsSupplier;
+         Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() );
+@@ -201,7 +204,7 @@ namespace dlgprov
+         {
+             Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAToOOEventDesc" ) ), m_xContext ), UNO_QUERY );
+             if ( xVBAToOOEvtDesc.is() )
+-                xEventsSupplier.set( xVBAToOOEvtDesc->getEventSupplier( xControl ), UNO_QUERY );
++                xEventsSupplier.set( xVBAToOOEvtDesc->getEventSupplier( xControl, sControlName ), UNO_QUERY );
+             
+         }
+         return xEventsSupplier;
+@@ -324,6 +327,20 @@ namespace dlgprov
+         // go over all objects
+         const Reference< XInterface >* pObjects = Objects.getConstArray();
+         sal_Int32 nObjCount = Objects.getLength();
++#ifdef FAKE_VBA_EVENT_SUPPORT
++        Reference< awt::XControl > xDlgControl( Objects[ nObjCount - 1 ], uno::UNO_QUERY ); // last object is the dialog	
++        rtl::OUString sDialogCodeName;
++        if ( xDlgControl.is() )
++        {
++            Reference< XPropertySet > xProps( xDlgControl->getModel(), UNO_QUERY );
++            try
++            {
++                xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= sDialogCodeName;  
++            }
++            catch( Exception& ){}
++        }
++#endif
++	
+         for ( sal_Int32 i = 0; i < nObjCount; ++i )
+         {
+             // We know that we have to do with instances of XControl.
+@@ -338,7 +355,7 @@ namespace dlgprov
+             Reference< XScriptEventsSupplier > xEventsSupplier( xControlModel, UNO_QUERY );
+             attachEventsToControl( xControl, xEventsSupplier, Helper );
+ #ifdef FAKE_VBA_EVENT_SUPPORT
+-            xEventsSupplier.set( getFakeVbaEventsSupplier( xControl ) );
++            xEventsSupplier.set( getFakeVbaEventsSupplier( xControl, sDialogCodeName ) );
+             attachEventsToControl( xControl, xEventsSupplier, Helper );
+ #endif
+         }
+@@ -399,7 +416,7 @@ namespace dlgprov
+ 
+     void DialogAllListenerImpl::firing( const AllEventObject& Event ) throw ( RuntimeException )
+     {
+-        ::osl::MutexGuard aGuard( getMutex() );
++        //::osl::MutexGuard aGuard( getMutex() );
+ 
+         firing_impl( Event, NULL );
+     }
+@@ -409,7 +426,7 @@ namespace dlgprov
+     Any DialogAllListenerImpl::approveFiring( const AllEventObject& Event ) 
+         throw ( reflection::InvocationTargetException, RuntimeException )
+     {
+-        ::osl::MutexGuard aGuard( getMutex() );
++        //::osl::MutexGuard aGuard( getMutex() );
+ 
+         Any aReturn;
+         firing_impl( Event, &aReturn );
+@@ -653,7 +670,7 @@ namespace dlgprov
+ 
+     void DialogScriptListenerImpl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException )
+     {
+-        ::osl::MutexGuard aGuard( getMutex() );
++        //::osl::MutexGuard aGuard( getMutex() );
+ 
+         firing_impl( aScriptEvent, NULL );
+     }
+@@ -663,7 +680,7 @@ namespace dlgprov
+     Any DialogScriptListenerImpl::approveFiring( const ScriptEvent& aScriptEvent ) 
+         throw ( reflection::InvocationTargetException, RuntimeException )
+     {
+-        ::osl::MutexGuard aGuard( getMutex() );
++        //::osl::MutexGuard aGuard( getMutex() );
+ 
+         Any aReturn;
+         firing_impl( aScriptEvent, &aReturn );
+Index: scripting/source/dlgprov/dlgprov.hxx
+===================================================================
+--- scripting/source/dlgprov/dlgprov.hxx	(revision 276159)
++++ scripting/source/dlgprov/dlgprov.hxx	(revision 276288)
+@@ -84,7 +84,7 @@ namespace dlgprov
+         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;
+         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >                 m_xModel;
+ 
+-
++	rtl::OUString msDialogLibName;
+         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModel( const ::rtl::OUString& sURL );
+ 
+         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > createDialogControl( 
+@@ -94,7 +94,7 @@ namespace dlgprov
+         void attachControlEvents( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxControlContainer,
+ 			const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler,
+ 			const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >& rxIntrospectionAccess,
+-			bool bDialogProviderMode );
++			bool bDialogProviderMode, const rtl::OUString& );
+ 		::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > inspectHandler( 
+ 			const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler );
+ 	// helper methods
+Index: scripting/source/dlgprov/dlgevtatt.hxx
+===================================================================
+--- scripting/source/dlgprov/dlgevtatt.hxx	(revision 276159)
++++ scripting/source/dlgprov/dlgevtatt.hxx	(revision 276288)
+@@ -46,6 +46,9 @@
+ #include <com/sun/star/script/XScriptEventsSupplier.hpp>
+ 
+ #include <hash_map>
++
++#define FAKE_VBA_EVENT_SUPPORT 1 
++
+ //.........................................................................
+ namespace dlgprov
+ {
+@@ -71,7 +74,7 @@ namespace dlgprov
+         ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacher > m_xEventAttacher;
+         ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > getScriptListenerForKey( const rtl::OUString& sScriptName ) throw ( ::com::sun::star::uno::RuntimeException );
+ #ifdef FAKE_VBA_EVENT_SUPPORT
+-        ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl );
++        ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, rtl::OUString& sCodeName );
+ #endif
+         void  SAL_CALL attachEventsToControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier >& events, const ::com::sun::star::uno::Any& Helper  );
+     public:
+@@ -81,7 +84,7 @@ namespace dlgprov
+         	 const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler, 
+         	 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >& xIntrospect, 
+              bool bProviderMode, 
+-        	 const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xRTLListener );
++        	 const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xRTLListener ,const rtl::OUString& sDialogLibName );
+         virtual ~DialogEventsAttacherImpl();
+ 
+         // XScriptEventsAttacher
+Index: scripting/source/dlgprov/dlgprov.cxx
+===================================================================
+--- scripting/source/dlgprov/dlgprov.cxx	(revision 276159)
++++ scripting/source/dlgprov/dlgprov.cxx	(revision 276288)
+@@ -196,7 +196,15 @@ static ::rtl::OUString aResourceResolverPropName =
+ 		Reference< beans::XPropertySet > xDlgPropSet( xDialogModel, UNO_QUERY );
+ 		xDlgPropSet->setPropertyValue( aDlgSrcUrlPropName, aDialogSourceURL );
+ 
+-        ::xmlscript::importDialogModel( xInput, xDialogModel, m_xContext );
++        // #TODO we really need to detect the source of the Dialog, is it
++        // located in the document or not. m_xModel need not be the location of
++        // the dialog. E.g. if the dialog was created from basic ( then we just
++        // can't tell  where its from ) 
++        // If we are happy to always substitute the form model for the awt
++        // one then maybe the presence of a document model is enough to trigger
++        // swapping out the models ( or perhaps we only want to do this 
++        // for vba mode ) there are a number of feasible and valid possibilities
++        ::xmlscript::importDialogModel( xInput, xDialogModel, m_xContext, m_xModel );
+         // Set resource property
+         if( xStringResourceManager.is() )
+         {
+@@ -410,6 +418,7 @@ static ::rtl::OUString aResourceResolverPropName =
+ 
+ 			if ( xISP.is() )
+ 				xInput = xISP->createInputStream();
++            msDialogLibName = sLibName;
+ 		}
+ 
+         // import dialog model
+@@ -527,7 +536,7 @@ static ::rtl::OUString aResourceResolverPropName =
+ 		const Reference< XControl >& rxControl,
+ 		const Reference< XInterface >& rxHandler,
+ 		const Reference< XIntrospectionAccess >& rxIntrospectionAccess,
+-		bool bDialogProviderMode )
++		bool bDialogProviderMode, const rtl::OUString& sDialogLibName )
+     {
+         if ( rxControl.is() )
+         {
+@@ -551,7 +560,7 @@ static ::rtl::OUString aResourceResolverPropName =
+ 
+ 				Reference< XScriptEventsAttacher > xScriptEventsAttacher = new DialogEventsAttacherImpl
+ 					( m_xContext, m_xModel, rxControl, rxHandler, rxIntrospectionAccess, 
+-					  bDialogProviderMode, ( m_BasicInfo.get() ? m_BasicInfo->mxBasicRTLListener : NULL ) );
++					  bDialogProviderMode, ( m_BasicInfo.get() ? m_BasicInfo->mxBasicRTLListener : NULL ), msDialogLibName );
+ 
+                 Any aHelper;
+                 xScriptEventsAttacher->attachEvents( aObjects, Reference< XScriptListener >(), aHelper );
+@@ -656,7 +665,10 @@ static ::rtl::OUString aResourceResolverPropName =
+             aArguments[0] >>= m_xModel;
+             m_BasicInfo.reset( new BasicRTLParams() );
+             m_BasicInfo->mxInput.set( aArguments[ 1 ], UNO_QUERY_THROW );
+-            m_BasicInfo->mxDlgLib.set( aArguments[ 2 ], UNO_QUERY_THROW );
++            // allow null mxDlgLib, a document dialog instantiated from 
++            // from application basic is unable to provide ( or find ) it's
++            // Library
++            aArguments[ 2 ] >>= m_BasicInfo->mxDlgLib;
+             // leave the possibility to optionally allow the old dialog creation
+             // to use the new XScriptListener ( which converts the old style macro
+             // to a SF url )
+@@ -731,7 +743,7 @@ static ::rtl::OUString aResourceResolverPropName =
+             {
+                 //xDialog = Reference< XDialog >( xCtrl, UNO_QUERY );
+ 	            Reference< XIntrospectionAccess > xIntrospectionAccess = inspectHandler( xHandler );
+-                attachControlEvents( xCtrl, xHandler, xIntrospectionAccess, bDialogProviderMode );
++                attachControlEvents( xCtrl, xHandler, xIntrospectionAccess, bDialogProviderMode, msDialogLibName );
+             }
+         }
+ 
+Index: scripting/source/vbaevents/service.cxx
+===================================================================
+--- scripting/source/vbaevents/service.cxx	(revision 0)
++++ scripting/source/vbaevents/service.cxx	(revision 276288)
+@@ -0,0 +1,99 @@
++#include "cppuhelper/implementationentry.hxx"
++#include "com/sun/star/lang/XMultiServiceFactory.hpp"
++#include "com/sun/star/registry/XRegistryKey.hpp"
++
++// =============================================================================
++// component exports
++// =============================================================================
++using namespace ::com::sun::star;
++using namespace ::com::sun::star::uno;
++
++namespace evtlstner
++{
++    // =============================================================================
++    // component operations
++    // =============================================================================
++
++    uno::Reference< XInterface > SAL_CALL create(
++        Reference< XComponentContext > const & xContext )
++        SAL_THROW( () );
++
++    // -----------------------------------------------------------------------------
++
++    ::rtl::OUString SAL_CALL getImplementationName();
++
++    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames();
++
++    Reference<XInterface> SAL_CALL create(
++        Sequence<Any> const &, Reference<XComponentContext> const & );
++} // end evtlstner
++
++namespace ooevtdescgen
++{
++    // =============================================================================
++    // component operations
++    // =============================================================================
++
++    uno::Reference< XInterface > SAL_CALL create(
++        Reference< XComponentContext > const & xContext )
++        SAL_THROW( () );
++
++    // -----------------------------------------------------------------------------
++
++    ::rtl::OUString SAL_CALL getImplementationName();
++
++    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames();
++
++    Reference<XInterface> SAL_CALL create(
++        Sequence<Any> const &, Reference<XComponentContext> const & );
++} // end ooevtdescgen
++
++
++
++    // =============================================================================
++
++    const ::cppu::ImplementationEntry s_component_entries [] =
++    {
++        {
++            ::evtlstner::create, ::evtlstner::getImplementationName,
++            ::evtlstner::getSupportedServiceNames, 
++            ::cppu::createSingleComponentFactory,
++            0, 0
++        },
++        {
++            ::ooevtdescgen::create, ::ooevtdescgen::getImplementationName,
++            ::ooevtdescgen::getSupportedServiceNames, 
++            ::cppu::createSingleComponentFactory,
++            0, 0
++        },
++        { 0, 0, 0, 0, 0, 0 }
++    };
++
++extern "C"
++{
++    void SAL_CALL component_getImplementationEnvironment( 
++        const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
++    {
++        OSL_TRACE("In component_getImplementationEnv");
++        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
++    }
++
++    sal_Bool SAL_CALL component_writeInfo( 
++        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
++    {
++        OSL_TRACE("In component_writeInfo");
++        if ( ::cppu::component_writeInfoHelper(
++            pServiceManager, pRegistryKey, s_component_entries ) )
++            return sal_True;
++        return sal_False;
++    }
++
++    void * SAL_CALL component_getFactory( 
++        const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
++        registry::XRegistryKey * pRegistryKey )
++    {
++        OSL_TRACE("In component_getFactory");
++        return ::cppu::component_getFactoryHelper( 
++            pImplName, pServiceManager, pRegistryKey, s_component_entries );
++    }
++}
+Index: scripting/source/vbaevents/eventhelper.cxx
+===================================================================
+--- scripting/source/vbaevents/eventhelper.cxx	(revision 0)
++++ scripting/source/vbaevents/eventhelper.cxx	(revision 276288)
+@@ -0,0 +1,1075 @@
++#include <comphelper/processfactory.hxx>
++#include <comphelper/uno3.hxx>
++#include <comphelper/proparrhlp.hxx>
++#include <comphelper/propertycontainer.hxx>
++
++#include <ooo/vba/XVBAToOOEventDescGen.hpp>
++
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/beans/XIntrospection.hpp>
++#include <com/sun/star/beans/PropertyAttribute.hpp>
++
++#include <com/sun/star/lang/XMultiComponentFactory.hpp>
++#include <com/sun/star/lang/XServiceName.hpp>
++#include <com/sun/star/lang/XServiceInfo.hpp>
++#include <com/sun/star/lang/XInitialization.hpp>
++
++#include <com/sun/star/frame/XModel.hpp>
++
++#include <com/sun/star/script/XLibraryContainer.hpp>
++#include <com/sun/star/script/ScriptEventDescriptor.hpp>
++#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
++
++#include <com/sun/star/drawing/XControlShape.hpp>
++
++#include <com/sun/star/awt/XControl.hpp>
++#include <com/sun/star/awt/XDialog.hpp>
++#include <com/sun/star/awt/KeyEvent.hpp>
++#include <com/sun/star/awt/MouseEvent.hpp>
++#include <com/sun/star/awt/XFixedText.hpp> //liuchen 2009-6-5
++#include <com/sun/star/awt/XTextComponent.hpp> //liuchen 2009-6-5
++#include <com/sun/star/awt/XComboBox.hpp> //liuchen 2009-6-18
++#include <com/sun/star/awt/XRadioButton.hpp> //liuchen 2009-7-30
++
++#include <msforms/ReturnInteger.hpp>
++
++#include <sfx2/objsh.hxx>
++#include <basic/sbstar.hxx>
++#include <basic/basmgr.hxx>
++#include <basic/sbmeth.hxx>
++#include <basic/sbmod.hxx>
++#include <basic/sbx.hxx>
++#include <svx/msvbahelper.hxx>
++
++// for debug
++#include <comphelper/anytostring.hxx>
++
++#include <com/sun/star/lang/XMultiComponentFactory.hpp>
++#include <com/sun/star/script/XScriptListener.hpp>
++#include <cppuhelper/implbase1.hxx>
++#include <cppuhelper/implbase2.hxx>
++#include <comphelper/evtmethodhelper.hxx>
++
++#include <set>
++#include <list>
++#include <hash_map>
++#define ASYNC 0
++
++// primitive support for asynchronous handling of 
++// events from controls ( all event will be processed asynchronously 
++// in the application thread )
++#if ASYNC
++#include <vcl/svapp.hxx>
++#endif
++
++using namespace ::com::sun::star;
++using namespace ::com::sun::star::script;
++using namespace ::com::sun::star::uno;
++using namespace ::ooo::vba;
++
++#define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x))//liuchen 2009-6-8
++#define GET_TYPE(x) ::getCppuType((uno::Reference< x > *)0);
++
++// Some constants 
++const static rtl::OUString DELIM = rtl::OUString::createFromAscii( "::" );
++const static sal_Int32 DELIMLEN = DELIM.getLength();
++
++#if 0
++void dumpListeners( const Reference< beans::XIntrospection >& xIntrospection, const Reference<XInterface>& xIfc)
++{
++    Reference< beans::XIntrospectionAccess > xIntrospectionAccess;
++    if ( xIntrospection.is() )
++    {
++        xIntrospectionAccess = xIntrospection->inspect( 
++            makeAny( xIfc ) );
++        Sequence< Type > aControlListeners = 
++            xIntrospectionAccess->getSupportedListeners();
++        sal_Int32 nLength = aControlListeners.getLength();
++             
++        for ( sal_Int32 i = 0; i< nLength; ++i )
++        {
++            Type& listType = aControlListeners[ i ];
++            rtl::OUString sFullTypeName = listType.getTypeName();
++            rtl::OUString sTypeName = listType.getTypeName();
++            sal_Int32 lastDotIndex = -1;
++            if ( ( lastDotIndex = sFullTypeName.lastIndexOf( '.' ) ) > -1 )
++            {
++                sTypeName = sFullTypeName.copy( lastDotIndex + 1 );    
++            } 
++            Sequence< ::rtl::OUString > sMeths = comphelper::getEventMethodsForType( listType );    
++            sal_Int32 sMethLen = sMeths.getLength();
++            for ( sal_Int32 j=0 ; j < sMethLen; ++j )
++            {
++                OSL_TRACE("**Listener [%d] Type[%s] Method[%s]",j,
++                    rtl::OUStringToOString( sTypeName, 
++                        RTL_TEXTENCODING_UTF8 ).getStr(),
++                    rtl::OUStringToOString( sMeths[ j ], 
++                        RTL_TEXTENCODING_UTF8 ).getStr() );
++            }
++        }
++       
++    }
++}
++
++void dumpEvent( const ScriptEvent& evt )
++{
++    OSL_TRACE("dumpEvent: Source %s",
++        rtl::OUStringToOString( comphelper::anyToString( makeAny(evt.Source)), 
++            RTL_TEXTENCODING_UTF8 ).getStr() );
++
++    OSL_TRACE("dumpEvent: ScriptType %s",
++        rtl::OUStringToOString( evt.ScriptType, 
++            RTL_TEXTENCODING_UTF8 ).getStr() );
++    
++    OSL_TRACE("dumpEvent: ScriptCode %s",
++        rtl::OUStringToOString( evt.ScriptCode, 
++            RTL_TEXTENCODING_UTF8 ).getStr() );
++
++    OSL_TRACE("dumpEvent: ListenerType %s",
++        rtl::OUStringToOString( evt.ListenerType.getTypeName(), 
++            RTL_TEXTENCODING_UTF8 ).getStr() );
++    
++    OSL_TRACE("dumpEvent: Listener methodname %s",
++        rtl::OUStringToOString( evt.MethodName, 
++            RTL_TEXTENCODING_UTF8 ).getStr() );
++
++    OSL_TRACE("dumpEvent: arguments;");
++    sal_Int32 nLen = evt.Arguments.getLength();
++    for ( sal_Int32 index=0; index < nLen; ++index )
++    {
++        OSL_TRACE("\t [%d] %s", index, 
++        rtl::OUStringToOString( comphelper::anyToString( evt.Arguments[ index ] ), 
++            RTL_TEXTENCODING_UTF8 ).getStr() );
++
++    }
++}
++
++#endif
++
++bool isKeyEventOk( awt::KeyEvent& evt, const Sequence< Any >& params )
++{
++    if ( !( params.getLength() > 0 ) ||
++        !( params[ 0 ] >>= evt ) )
++        return false;
++    return true;
++}
++
++bool isMouseEventOk( awt::MouseEvent& evt, const Sequence< Any >& params )
++{
++    if ( !( params.getLength() > 0 ) ||
++        !( params[ 0 ] >>= evt ) )
++        return false;
++    return true;
++}
++
++Sequence< Any > ooMouseEvtToVBADblClick( const Sequence< Any >& params )
++{
++    Sequence< Any > translatedParams;
++    awt::MouseEvent evt;
++
++    if ( !( isMouseEventOk(evt, params)) || 
++        (evt.ClickCount != 2) )
++        return Sequence< Any >(); 
++    // give back orig params, this will signal that the event is good
++    return params;
++}
++
++Sequence< Any > ooMouseEvtToVBAMouseEvt( const Sequence< Any >& params )
++{
++    Sequence< Any > translatedParams;
++    awt::MouseEvent evt;
++
++    if ( !isMouseEventOk(evt, params) )
++        return Sequence< Any >(); 
++
++    translatedParams.realloc(4);
++
++    // Buttons
++    translatedParams[ 0 ] <<= evt.Buttons;
++    // Shift
++    translatedParams[ 1 ] <<= evt.Modifiers;
++    // X
++    translatedParams[ 2 ] <<= evt.X;
++    // Y
++    translatedParams[ 3 ] <<= evt.Y;
++    return translatedParams;
++}
++
++Sequence< Any > ooKeyPressedToVBAKeyPressed( const Sequence< Any >& params )
++{
++    Sequence< Any > translatedParams;
++    awt::KeyEvent evt;
++
++    if ( !isKeyEventOk( evt, params ) )
++        return Sequence< Any >(); 
++
++    translatedParams.realloc(1);
++
++    msforms::ReturnInteger keyCode;
++    keyCode.Value = evt.KeyCode; 
++    translatedParams[0] <<= keyCode;
++    return  translatedParams;
++}
++
++Sequence< Any > ooKeyPressedToVBAKeyUpDown( const Sequence< Any >& params )
++{
++    Sequence< Any > translatedParams;
++    awt::KeyEvent evt;
++
++    if ( !isKeyEventOk( evt, params ) )
++        return Sequence< Any >(); 
++
++    translatedParams.realloc(2);
++
++    msforms::ReturnInteger keyCode;
++    sal_Int8 shift = evt.Modifiers;
++
++    // #TODO check whether values from OOO conform to values generated from vba
++    keyCode.Value = evt.KeyCode; 
++    translatedParams[0] <<= keyCode;
++    translatedParams[1] <<= shift;
++    return  translatedParams;
++}
++
++typedef Sequence< Any > (*Translator)(const Sequence< Any >&);
++
++//liuchen 2009-6-23
++//expand the "TranslateInfo" struct to support more kinds of events 
++struct TranslateInfo
++{
++    rtl::OUString sVBAName; //vba event name
++    Translator toVBA;       //the method to convert OO event parameters to VBA event parameters	
++	bool (*ApproveRule)(const ScriptEvent& evt, void* pPara); //this method is used to determine which types of controls should execute the event 
++	void *pPara;			//Parameters for the above approve method
++};
++
++
++typedef std::hash_map< rtl::OUString, 
++std::list< TranslateInfo >, 
++::rtl::OUStringHash,
++::std::equal_to< ::rtl::OUString > > EventInfoHash;
++
++//liuchen 2009-6-23
++struct TranslatePropMap
++{
++	rtl::OUString sEventInfo;   //OO event name
++	TranslateInfo aTransInfo;   
++};
++
++bool ApproveAll(const ScriptEvent& evt, void* pPara); //allow all types of controls to execute the event
++bool ApproveType(const ScriptEvent& evt, void* pPara); //certain types of controls should execute the event, those types are given by pPara
++bool DenyType(const ScriptEvent& evt, void* pPara);    //certain types of controls should not execute the event, those types are given by pPara
++bool DenyMouseDrag(const ScriptEvent& evt, void* pPara); //used for VBA MouseMove event when "Shift" key is pressed
++
++struct TypeList
++{
++	uno::Type* pTypeList;
++	int nListLength;
++};
++
++Type typeXFixedText = GET_TYPE(awt::XFixedText);
++Type typeXTextComponent = GET_TYPE(awt::XTextComponent);
++Type typeXComboBox = GET_TYPE(awt::XComboBox);
++Type typeXRadioButton = GET_TYPE(awt::XRadioButton);
++
++
++TypeList fixedTextList = {&typeXFixedText, 1};
++TypeList textCompList = {&typeXTextComponent, 1};
++TypeList radioButtonList = {&typeXRadioButton, 1};
++TypeList comboBoxList = {&typeXComboBox, 1};
++
++//this array stores the OO event to VBA event translation info
++static TranslatePropMap aTranslatePropMap_Impl[] = 
++{
++	// actionPerformed ooo event
++	{ MAP_CHAR_LEN("actionPerformed"), { MAP_CHAR_LEN("_Click"), NULL, ApproveAll, NULL } },	
++	{ MAP_CHAR_LEN("actionPerformed"), { MAP_CHAR_LEN("_Change"), NULL, DenyType, (void*)(&radioButtonList) } },  //liuchen 2009-7-30, OptionalButton_Change event is not the same as OptionalButton_Click event
++
++	// itemStateChanged ooo event
++	{ MAP_CHAR_LEN("itemStateChanged"), { MAP_CHAR_LEN("_Click"), NULL, ApproveType, (void*)(&comboBoxList) } },  //liuchen, add to support VBA ComboBox_Click event
++	{ MAP_CHAR_LEN("itemStateChanged"), { MAP_CHAR_LEN("_Change"), NULL, ApproveType, (void*)(&radioButtonList) } }, //liuchen 2009-7-30, OptionalButton_Change event should be triggered when the button state is changed
++	
++	// changed ooo event
++	{ MAP_CHAR_LEN("changed"), { MAP_CHAR_LEN("_Change"), NULL, ApproveAll, NULL } },	
++
++	// focusGained ooo event
++	{ MAP_CHAR_LEN("focusGained"), { MAP_CHAR_LEN("_GotFocus"), NULL, ApproveAll, NULL } },
++
++	// focusLost ooo event
++	{ MAP_CHAR_LEN("focusLost"), { MAP_CHAR_LEN("_LostFocus"), NULL, ApproveAll, NULL } },
++	{ MAP_CHAR_LEN("focusLost"), { MAP_CHAR_LEN("_Exit"), NULL, ApproveType, (void*)(&textCompList) } }, //liuchen, add to support VBA TextBox_Exit event
++
++	// adjustmentValueChanged ooo event
++	{ MAP_CHAR_LEN("adjustmentValueChanged"), { MAP_CHAR_LEN("_Scroll"), NULL, ApproveAll, NULL } },
++	{ MAP_CHAR_LEN("adjustmentValueChanged"), { MAP_CHAR_LEN("_Change"), NULL, ApproveAll, NULL } },
++
++	// textChanged ooo event
++	{ MAP_CHAR_LEN("textChanged"), { MAP_CHAR_LEN("_Change"), NULL, ApproveAll, NULL } },
++
++	// keyReleased ooo event
++	{ MAP_CHAR_LEN("keyReleased"), { MAP_CHAR_LEN("_KeyUp"), ooKeyPressedToVBAKeyUpDown, ApproveAll, NULL } },
++
++	// mouseReleased ooo event
++	{ MAP_CHAR_LEN("mouseReleased"), { MAP_CHAR_LEN("_Click"), ooMouseEvtToVBAMouseEvt, ApproveType, (void*)(&fixedTextList) } }, //liuchen, add to support VBA Label_Click event
++	{ MAP_CHAR_LEN("mouseReleased"), { MAP_CHAR_LEN("_MouseUp"), ooMouseEvtToVBAMouseEvt, ApproveAll, NULL } },
++
++	// mousePressed ooo event
++	{ MAP_CHAR_LEN("mousePressed"), { MAP_CHAR_LEN("_MouseDown"), ooMouseEvtToVBAMouseEvt, ApproveAll, NULL } },
++	{ MAP_CHAR_LEN("mousePressed"), { MAP_CHAR_LEN("_DblClick"), ooMouseEvtToVBADblClick, ApproveAll, NULL } },
++
++	// mouseMoved ooo event	
++	{ MAP_CHAR_LEN("mouseMoved"), { MAP_CHAR_LEN("_MouseMove"), ooMouseEvtToVBAMouseEvt, ApproveAll, NULL } },
++	{ MAP_CHAR_LEN("mouseDragged"), { MAP_CHAR_LEN("_MouseMove"), ooMouseEvtToVBAMouseEvt, DenyMouseDrag, NULL } }, //liuchen, add to support VBA MouseMove event when the "Shift" key is pressed
++
++	// keyPressed ooo event
++	{ MAP_CHAR_LEN("keyPressed"), { MAP_CHAR_LEN("_KeyDown"), ooKeyPressedToVBAKeyUpDown, ApproveAll, NULL } },
++	{ MAP_CHAR_LEN("keyPressed"), { MAP_CHAR_LEN("_KeyPress"), ooKeyPressedToVBAKeyUpDown, ApproveAll, NULL } }
++};
++
++EventInfoHash& getEventTransInfo()
++{
++    static bool initialised = false;
++    static EventInfoHash eventTransInfo;
++    if ( !initialised )
++    {		
++		rtl::OUString sEventInfo = MAP_CHAR_LEN("");
++		TranslatePropMap* pTransProp = aTranslatePropMap_Impl;
++
++		int nCount = sizeof(aTranslatePropMap_Impl) / sizeof(aTranslatePropMap_Impl[0]);
++
++		int i = 0;
++		while (i < nCount)
++		{			
++			if (sEventInfo != pTransProp->sEventInfo)
++			{
++				sEventInfo = pTransProp->sEventInfo;
++				std::list< TranslateInfo > infoList;
++				do
++				{									
++					infoList.push_back( pTransProp->aTransInfo );
++                                        i++;
++					pTransProp++;
++				}
++				while( ( i < nCount ) && ( sEventInfo == pTransProp->sEventInfo ) );
++				eventTransInfo[sEventInfo] = infoList;
++			}
++		}		
++        initialised = true;
++    }
++    return eventTransInfo;
++}
++//liuchen 2009-6-23 end
++
++// Helper class
++
++class ScriptEventHelper
++{
++public:
++    ScriptEventHelper( const Reference< XInterface >& xControl );
++    Sequence< ScriptEventDescriptor > createEvents( const rtl::OUString& sCodeName );   
++    Sequence< rtl::OUString > getEventListeners();
++private:
++    Reference< XComponentContext > m_xCtx;
++    Reference< XInterface > m_xControl;
++};
++
++bool
++eventMethodToDescriptor( const ::rtl::OUString& rEventMethod, ScriptEventDescriptor& evtDesc, const ::rtl::OUString& sCodeName )
++{
++    // format of ControlListener is TypeName::methodname e.g.
++    // "com.sun.star.awt.XActionListener::actionPerformed" or
++    // "XActionListener::actionPerformed
++
++    ::rtl::OUString sMethodName;
++    ::rtl::OUString sTypeName;
++    sal_Int32 nDelimPos = rEventMethod.indexOf( DELIM );
++    if ( nDelimPos == -1 )
++    {
++        return false;
++    }
++    sMethodName = rEventMethod.copy( nDelimPos + DELIMLEN );
++    sTypeName = rEventMethod.copy( 0, nDelimPos );
++            
++    EventInfoHash& infos = getEventTransInfo();
++
++    // Only create an ScriptEventDescriptor for an event we can translate
++    // or emulate
++    if ( sMethodName.getLength() 
++         && sTypeName.getLength()
++         && ( infos.find( sMethodName ) != infos.end() ) )
++    {
++        // just fill in CodeName, when the event fires the other 
++	// info is gathered from the event source to determine what
++	// event handler we try to call
++        evtDesc.ScriptCode = sCodeName;
++        evtDesc.ListenerType = sTypeName;
++        evtDesc.EventMethod = sMethodName;
++
++        // set this it VBAInterop, ensures that it doesn't
++        // get persisted or shown in property editors
++        evtDesc.ScriptType = rtl::OUString::createFromAscii(
++            "VBAInterop" );	
++        return true;
++    }
++    return false;
++
++}
++
++ScriptEventHelper::ScriptEventHelper( const Reference< XInterface >& xControl ) : m_xControl( xControl )
++{
++    Reference < beans::XPropertySet > xProps(
++        ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
++    m_xCtx.set( xProps->getPropertyValue( rtl::OUString(
++        RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), 
++        uno::UNO_QUERY_THROW );
++}
++
++Sequence< rtl::OUString > 
++ScriptEventHelper::getEventListeners()
++{
++    Reference< lang::XMultiComponentFactory > xMFac( 
++        m_xCtx->getServiceManager(), UNO_QUERY );
++    std::list< rtl::OUString > eventMethods;
++
++    if ( xMFac.is() )
++    {
++        Reference< beans::XIntrospection > xIntrospection( 
++            xMFac->createInstanceWithContext( rtl::OUString( 
++                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.Introspection"  ) ), m_xCtx ), UNO_QUERY );
++#if 0
++        dumpListeners( xIntrospection, m_xControl );
++        dumpListeners( xIntrospection, m_xControl->getModel() );
++#endif 
++        Reference< beans::XIntrospectionAccess > xIntrospectionAccess;
++	if  ( xIntrospection.is() )
++	{
++            xIntrospectionAccess = xIntrospection->inspect( 
++                makeAny( m_xControl ) );
++            Sequence< Type > aControlListeners = 
++                xIntrospectionAccess->getSupportedListeners();
++            sal_Int32 nLength = aControlListeners.getLength();             
++            for ( sal_Int32 i = 0; i< nLength; ++i )
++            {
++                Type& listType = aControlListeners[ i ];
++                rtl::OUString sFullTypeName = listType.getTypeName();
++                Sequence< ::rtl::OUString > sMeths = 
++                    comphelper::getEventMethodsForType( listType );    
++                sal_Int32 sMethLen = sMeths.getLength();
++                for ( sal_Int32 j=0 ; j < sMethLen; ++j )
++                {
++                    rtl::OUString sEventMethod = sFullTypeName;
++                    sEventMethod += DELIM;
++                    sEventMethod += sMeths[ j ];
++                    eventMethods.push_back( sEventMethod );
++                }
++            }
++            
++        }
++    }
++
++    Sequence< rtl::OUString > sEventMethodNames( eventMethods.size() );
++    std::list< rtl::OUString >::const_iterator it = eventMethods.begin();
++    rtl::OUString* pDest = sEventMethodNames.getArray();
++
++    for ( ; it != eventMethods.end(); ++it, ++pDest )
++        *pDest = *it;         
++
++    return sEventMethodNames;
++}
++
++Sequence< ScriptEventDescriptor > 
++ScriptEventHelper::createEvents( const rtl::OUString& sCodeName )
++{
++    Sequence< rtl::OUString > aControlListeners = getEventListeners();
++    rtl::OUString* pSrc = aControlListeners.getArray();
++    sal_Int32 nLength = aControlListeners.getLength();             
++
++    Sequence< ScriptEventDescriptor > aDest( nLength );
++    sal_Int32 nEvts = 0; 
++    for ( sal_Int32 i = 0; i< nLength; ++i, ++pSrc )
++    {
++        // from getListeners eventName is of form
++        // "com.sun.star.awt.XActionListener::actionPerformed"
++        // we need to strip "com.sun.star.awt." from that for form
++        // controls
++    	ScriptEventDescriptor evtDesc;
++        if ( eventMethodToDescriptor( *pSrc, evtDesc, sCodeName ) )
++        {
++            sal_Int32 dIndex = nEvts;
++            ++nEvts;
++            if ( nEvts > aDest.getLength() )
++                aDest.realloc( nEvts );// should never happen
++            aDest[ dIndex ] = evtDesc;
++        }
++    }
++    aDest.realloc( nEvts );
++
++    return aDest;
++}
++
++
++typedef ::cppu::WeakImplHelper1< container::XNameContainer > NameContainer_BASE;
++
++class ReadOnlyEventsNameContainer : public NameContainer_BASE
++{
++public:
++    ReadOnlyEventsNameContainer( const Sequence< rtl::OUString >& eventMethods, const rtl::OUString& sCodeName );
++    // XNameContainer
++
++    virtual void SAL_CALL insertByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, RuntimeException)
++    {
++        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
++ 
++    }
++    virtual void SAL_CALL removeByName( const ::rtl::OUString& ) throw (::com::sun::star::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
++    {
++        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
++    }
++
++    // XNameReplace
++    virtual void SAL_CALL replaceByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
++    {
++        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
++ 
++    }
++                                                                                
++    // XNameAccess
++    virtual Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException);
++    virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (RuntimeException);
++    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (RuntimeException);
++
++    // XElementAccess
++    virtual Type SAL_CALL getElementType(  ) throw (RuntimeException)
++    { return getCppuType(static_cast< const rtl::OUString * >(0) ); }
++    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException)
++    { return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); }
++private:
++
++typedef std::hash_map< rtl::OUString, Any, ::rtl::OUStringHash,
++::std::equal_to< ::rtl::OUString > > EventSupplierHash;
++
++    EventSupplierHash m_hEvents;
++};
++
++ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< rtl::OUString >& eventMethods, const rtl::OUString& sCodeName )
++{
++    const rtl::OUString* pSrc = eventMethods.getConstArray();
++    sal_Int32 nLen = eventMethods.getLength();
++    for ( sal_Int32 index = 0; index < nLen; ++index, ++pSrc )
++    {
++        Any aDesc;
++        ScriptEventDescriptor evtDesc;
++        if (  eventMethodToDescriptor( *pSrc, evtDesc, sCodeName ) )
++        {
++            aDesc <<= evtDesc; 
++            m_hEvents[ *pSrc ] = aDesc;
++        }
++    }
++}
++
++Any SAL_CALL 
++ReadOnlyEventsNameContainer::getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException){
++    EventSupplierHash::const_iterator it = m_hEvents.find( aName );
++    if ( it == m_hEvents.end() )
++        throw container::NoSuchElementException();
++    return it->second;
++}
++
++Sequence< ::rtl::OUString > SAL_CALL 
++ReadOnlyEventsNameContainer::getElementNames(  ) throw (RuntimeException)
++{
++    Sequence< ::rtl::OUString > names(m_hEvents.size());
++    rtl::OUString* pDest = names.getArray();
++    EventSupplierHash::const_iterator it = m_hEvents.begin();
++    EventSupplierHash::const_iterator it_end = m_hEvents.end();
++    for ( sal_Int32 index = 0; it != it_end; ++index, ++pDest, ++it )
++        *pDest = it->first;
++    return names;
++}
++
++sal_Bool SAL_CALL 
++ReadOnlyEventsNameContainer::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException)
++{
++    EventSupplierHash::const_iterator it = m_hEvents.find( aName );
++    if ( it == m_hEvents.end() )
++        return sal_False;
++    return sal_True;
++}
++
++typedef ::cppu::WeakImplHelper1< XScriptEventsSupplier > EventsSupplier_BASE;
++
++class ReadOnlyEventsSupplier : public EventsSupplier_BASE
++{
++public:
++    ReadOnlyEventsSupplier( const Sequence< ::rtl::OUString >& eventMethods, const rtl::OUString& sCodeName )
++    { m_xNameContainer = new ReadOnlyEventsNameContainer( eventMethods, sCodeName ); }
++    
++    // XScriptEventSupplier
++    virtual Reference< container::XNameContainer > SAL_CALL getEvents(  ) throw (RuntimeException){ return m_xNameContainer; }
++private:
++    Reference< container::XNameContainer > m_xNameContainer;
++};
++
++typedef ::cppu::WeakImplHelper2< XScriptListener, lang::XInitialization > EventListener_BASE;
++
++#define EVENTLSTNR_PROPERTY_ID_MODEL         1
++#define EVENTLSTNR_PROPERTY_MODEL            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) )
++
++class EventListener : public EventListener_BASE
++    ,public ::comphelper::OMutexAndBroadcastHelper
++    ,public ::comphelper::OPropertyContainer
++    ,public ::comphelper::OPropertyArrayUsageHelper< EventListener >
++
++{
++    
++public:
++    EventListener( const Reference< XComponentContext >& rxContext );
++    // XEventListener
++    virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( RuntimeException );
++
++    // XScriptListener
++    virtual void SAL_CALL firing(const ScriptEvent& evt) throw(RuntimeException);
++    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException);
++    // XPropertySet
++    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException);    
++    // XInitialization
++    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException);
++    // XInterface
++    DECLARE_XINTERFACE()
++
++    // XTypeProvider
++    DECLARE_XTYPEPROVIDER()
++    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
++    {
++        OPropertyContainer::setFastPropertyValue( nHandle, rValue );
++	if ( nHandle == EVENTLSTNR_PROPERTY_ID_MODEL )
++            setShellFromModel();
++    }
++
++protected:
++    // OPropertySetHelper
++    virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(  );
++
++    // OPropertyArrayUsageHelper
++    virtual ::cppu::IPropertyArrayHelper* createArrayHelper(  ) const;
++
++private:
++#if ASYNC
++    DECL_LINK( OnAsyncScriptEvent, ScriptEvent* );
++#endif
++    void setShellFromModel();
++    void firing_Impl( const  ScriptEvent& evt, Any *pSyncRet=NULL ) throw( RuntimeException );
++
++    Reference< XComponentContext > m_xContext;
++    Reference< frame::XModel > m_xModel;
++    SfxObjectShell* mpShell;
++    
++};
++
++EventListener::EventListener( const Reference< XComponentContext >& rxContext ) :
++OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), mpShell( 0 )
++{
++    registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL,
++        beans::PropertyAttribute::TRANSIENT, &m_xModel, ::getCppuType( &m_xModel ) );
++
++}
++
++void
++EventListener::setShellFromModel()
++{
++	// reset mpShell
++	mpShell = 0;
++	SfxObjectShell* pShell = SfxObjectShell::GetFirst();
++	while ( m_xModel.is() && pShell )
++	{
++		if ( pShell->GetModel() == m_xModel )
++		{
++			mpShell = pShell;
++			break;
++		}
++		pShell = SfxObjectShell::GetNext( *pShell );
++	}    
++}
++
++//XEventListener
++void
++EventListener::disposing(const lang::EventObject&)  throw( RuntimeException )
++{
++}
++
++//XScriptListener
++
++void SAL_CALL 
++EventListener::firing(const ScriptEvent& evt) throw(RuntimeException)
++{
++#if ASYNC
++    // needs some logic to check if the event handler is oneway or not
++    // if not oneway then firing_Impl otherwise... as below
++    acquire();
++    Application::PostUserEvent( LINK( this, EventListener, OnAsyncScriptEvent ), new ScriptEvent( evt ) );
++#else
++    firing_Impl( evt );
++#endif
++}
++
++#if ASYNC
++IMPL_LINK( EventListener, OnAsyncScriptEvent, ScriptEvent*, _pEvent )
++{
++	if ( !_pEvent )
++		return 1L;
++
++	{
++		// #FIXME if we enable ASYNC we probably need something like 
++		// below
++		//::osl::ClearableMutexGuard aGuard( m_aMutex );
++
++		//if ( !impl_isDisposed_nothrow() )
++		//	impl_doFireScriptEvent_nothrow( aGuard, *_pEvent, NULL );
++		firing_Impl( *_pEvent, NULL );
++	}
++
++	delete _pEvent;
++	// we acquired ourself immediately before posting the event
++	release();
++	return 0L;
++ }
++#endif 
++
++Any SAL_CALL 
++EventListener::approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException)
++{
++    Any ret;
++    firing_Impl( evt, &ret );
++    return ret;
++}
++
++// XInitialization
++void SAL_CALL 
++EventListener::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
++{
++    if ( aArguments.getLength() == 1 )
++        aArguments[0] >>= m_xModel;
++    OSL_TRACE("EventListener::initialize() args %d m_xModel %d", aArguments.getLength(), m_xModel.is() );
++}
++
++// XInterface
++
++IMPLEMENT_FORWARD_XINTERFACE2( EventListener, EventListener_BASE, OPropertyContainer )
++
++// XTypeProvider
++
++IMPLEMENT_FORWARD_XTYPEPROVIDER2( EventListener, EventListener_BASE, OPropertyContainer )
++
++// OPropertySetHelper
++
++::cppu::IPropertyArrayHelper& 
++EventListener::getInfoHelper(  )
++{
++    return *getArrayHelper();
++}
++
++// OPropertyArrayUsageHelper
++
++::cppu::IPropertyArrayHelper* 
++EventListener::createArrayHelper(  ) const
++{
++    Sequence< beans::Property > aProps;
++    describeProperties( aProps );
++    return new ::cppu::OPropertyArrayHelper( aProps );
++}
++
++// XPropertySet
++Reference< beans::XPropertySetInfo > 
++EventListener::getPropertySetInfo(  ) throw (RuntimeException)
++{
++    Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
++    return xInfo;
++}
++
++//liuchen 2009-6-23
++//decide if the control should execute the event
++bool ApproveAll(const ScriptEvent& evt, void* pPara)
++{
++	return true;
++}
++
++//for the given control type in evt.Arguments[0], look for if it appears in the type list in pPara
++bool FindControl(const ScriptEvent& evt, void* pPara)
++{
++	lang::EventObject aEvent;
++	evt.Arguments[ 0 ] >>= aEvent;
++	uno::Reference< uno::XInterface > xInterface( aEvent.Source, uno::UNO_QUERY );
++
++	TypeList* pTypeListInfo = static_cast<TypeList*>(pPara);
++	Type* pType = pTypeListInfo->pTypeList;
++	int nLen = pTypeListInfo->nListLength;
++
++	for (int i = 0; i < nLen; i++)
++	{
++		if ( xInterface->queryInterface( *pType ).hasValue() )
++		{
++			return true;
++		}
++		pType++;
++	}
++
++	return false;
++}
++
++//if the the given control type in evt.Arguments[0] appears in the type list in pPara, then approve the execution
++bool ApproveType(const ScriptEvent& evt, void* pPara)
++{
++	return FindControl(evt, pPara);
++}
++
++//if the the given control type in evt.Arguments[0] appears in the type list in pPara, then deny the execution
++bool DenyType(const ScriptEvent& evt, void* pPara)
++{
++	return !FindControl(evt, pPara);
++}
++
++//when mouse is moving, either the mouse button is pressed or some key is pressed can trigger the OO mouseDragged event,
++//the former should be denyed, and the latter allowed, only by doing so can the VBA MouseMove event when the "Shift" key is 
++//pressed can be correctly triggered
++bool DenyMouseDrag(const ScriptEvent& evt, void* pPara)
++{
++	awt::MouseEvent aEvent;
++	evt.Arguments[ 0 ] >>= aEvent;
++	if (aEvent.Buttons == 0 )
++	{
++		return true;
++	}
++	else
++	{
++		return false;
++	}
++}
++
++
++
++//liuchen 2009-6-23
++// EventListener
++
++void
++EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeException)
++{
++	OSL_TRACE("EventListener::firing_Impl( FAKE VBA_EVENTS )");
++    static const ::rtl::OUString vbaInterOp =
++        ::rtl::OUString::createFromAscii("VBAInterop");
++
++    // let default handlers deal with non vba stuff
++    if ( !evt.ScriptType.equals( vbaInterOp ) )
++        return;
++    lang::EventObject aEvent;
++    evt.Arguments[ 0 ] >>= aEvent;
++	OSL_TRACE("evt.MethodName is  %s", rtl::OUStringToOString( evt.MethodName, RTL_TEXTENCODING_UTF8 ).getStr() );
++	OSL_TRACE("Argument[0] is  %s", rtl::OUStringToOString( comphelper::anyToString( evt.Arguments[0] ), RTL_TEXTENCODING_UTF8 ).getStr() );
++	OSL_TRACE("Getting Control");
++    uno::Reference< awt::XControl > xControl( aEvent.Source, uno::UNO_QUERY_THROW );
++	OSL_TRACE("Getting properties");
++    uno::Reference< beans::XPropertySet > xProps( xControl->getModel(), uno::UNO_QUERY_THROW );
++
++    rtl::OUString sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserForm") );
++	OSL_TRACE("Getting Name");
++
++    uno::Reference< awt::XDialog > xDlg( aEvent.Source, uno::UNO_QUERY );
++    if ( !xDlg.is() )
++        xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= sName;
++    //dumpEvent( evt );
++    EventInfoHash& infos = getEventTransInfo();
++    EventInfoHash::const_iterator eventInfo_it = infos.find( evt.MethodName );
++    EventInfoHash::const_iterator it_end = infos.end();
++    if ( eventInfo_it == it_end )
++    {
++        OSL_TRACE("Bogus event for %s",
++            rtl::OUStringToOString( evt.ScriptType, RTL_TEXTENCODING_UTF8 ).getStr() );
++        return;
++    }
++
++    uno::Reference< script::provider::XScriptProviderSupplier > xSPS( m_xModel, uno::UNO_QUERY );
++    uno::Reference< script::provider::XScriptProvider > xScriptProvider;
++    if ( xSPS.is() )
++        xScriptProvider =  xSPS->getScriptProvider();
++    if ( xScriptProvider.is() && mpShell )
++    {
++        std::list< TranslateInfo > matchingMethods;
++        std::list< TranslateInfo >::const_iterator txInfo =
++            eventInfo_it->second.begin();
++        std::list< TranslateInfo >::const_iterator txInfo_end = eventInfo_it->second.end();
++       
++        StarBASIC* pBasic = mpShell->GetBasic();
++        BasicManager* pBasicManager = mpShell->GetBasicManager();
++        rtl::OUString sProject;
++        rtl::OUString sScriptCode( evt.ScriptCode );
++	// dialogs pass their own library, presence of Dot determines that
++	if ( sScriptCode.indexOf( '.' ) == -1 )
++	{
++        	//'Project' is a better default but I want to force failures
++	        //rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Project");
++        	sProject = rtl::OUString::createFromAscii("Standard");
++
++        	if ( pBasicManager->GetName().Len() > 0 )
++            		sProject =  pBasicManager->GetName();
++	}
++	else
++	{
++		sal_Int32 nIndex = sScriptCode.indexOf( '.' );
++		sProject = sScriptCode.copy( 0, nIndex );
++                sScriptCode = sScriptCode.copy( nIndex + 1 );
++	}
++        rtl::OUString sMacroLoc = sProject;
++        sMacroLoc = sMacroLoc.concat(  rtl::OUString::createFromAscii(".") );
++        sMacroLoc = sMacroLoc.concat( sScriptCode ).concat( rtl::OUString::createFromAscii(".") );
++        
++        OSL_TRACE("sMacroLoc is %s", rtl::OUStringToOString( sMacroLoc, RTL_TEXTENCODING_UTF8 ).getStr() );
++        for ( ; txInfo != txInfo_end; ++txInfo )
++        {
++            rtl::OUString sTemp = sName.concat( (*txInfo).sVBAName ); 
++            // see if we have a match for the handlerextension
++            // where ScriptCode is methodname_handlerextension 
++            rtl::OUString sToResolve = sMacroLoc.concat( sTemp );
++            OSL_TRACE("*** trying to invoke %s ",
++                rtl::OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() );
++            ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve ); 
++            if ( aMacroResolvedInfo.IsResolved() )
++            {
++				//liuchen 2009-6-8
++				if (! txInfo->ApproveRule(evt, txInfo->pPara) )
++				{
++					continue;
++				}
++				//liuchen 2009-6-8
++                // !! translate arguments & emulate events where necessary 
++                Sequence< Any > aArguments;
++                if  ( (*txInfo).toVBA )
++                    aArguments = (*txInfo).toVBA( evt.Arguments );
++                else
++                    aArguments = evt.Arguments;
++                if ( aArguments.getLength() )
++                {
++                    // call basic event handlers for event
++
++                    // create script url
++                    rtl::OUString url = aMacroResolvedInfo.ResolvedMacro();
++                 
++                    OSL_TRACE("resolved script = %s",
++                        rtl::OUStringToOString( url, 
++                            RTL_TEXTENCODING_UTF8 ).getStr() );
++                    try
++                    {
++                        uno::Any aDummyCaller = uno::makeAny( rtl::OUString::createFromAscii("Error") );
++                        if ( pRet )
++                            ooo::vba::executeMacro( mpShell, url, aArguments, *pRet, aDummyCaller ); 
++                        else
++                        {
++                            uno::Any aRet;
++                            ooo::vba::executeMacro( mpShell, url, aArguments, aRet, aDummyCaller ); 
++                        }
++                    }
++                    catch ( uno::Exception& e )
++                    {
++                        OSL_TRACE("event script raised %s", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
++                    }
++               } 
++           }
++       }
++    }
++}
++
++typedef ::cppu::WeakImplHelper1< XVBAToOOEventDescGen > VBAToOOEventDescGen_BASE;
++
++
++class VBAToOOEventDescGen : public VBAToOOEventDescGen_BASE
++{
++public:
++    VBAToOOEventDescGen( const Reference< XComponentContext >& rxContext );
++
++    // XVBAToOOEventDescGen
++    virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const Reference< XInterface >& control, const rtl::OUString& sCodeName ) throw (RuntimeException);
++    virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl,  const rtl::OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException);
++private:
++    Reference< XComponentContext > m_xContext;
++  
++};
++
++VBAToOOEventDescGen::VBAToOOEventDescGen( const Reference< XComponentContext >& rxContext ):m_xContext( rxContext ) {}
++
++Sequence< ScriptEventDescriptor > SAL_CALL 
++VBAToOOEventDescGen::getEventDescriptions( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName ) throw (RuntimeException)
++{
++    ScriptEventHelper evntHelper( xControl ); 
++    return evntHelper.createEvents( sCodeName ); 
++}
++
++Reference< XScriptEventsSupplier > SAL_CALL 
++VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName  ) throw (::com::sun::star::uno::RuntimeException)
++{
++    ScriptEventHelper evntHelper( xControl ); 
++    Reference< XScriptEventsSupplier > xSupplier = 
++        new ReadOnlyEventsSupplier( 
++            evntHelper.getEventListeners(), sCodeName ) ;
++    return xSupplier;
++}
++
++// Component related 
++
++namespace evtlstner
++{
++    ::rtl::OUString SAL_CALL getImplementationName()
++    {
++        static ::rtl::OUString* pImplName = 0;
++        if ( !pImplName )
++        {
++            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
++            if ( !pImplName )
++            {
++                static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.EventListener" ) );
++                pImplName = &aImplName;
++            }
++        }
++        return *pImplName;
++    }
++
++    uno::Reference< XInterface > SAL_CALL create(
++    Reference< XComponentContext > const & xContext )
++    SAL_THROW( () )
++    {
++        return static_cast< lang::XTypeProvider * >( new EventListener( xContext ) );
++    }
++
++    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
++    {
++        const ::rtl::OUString strName( ::evtlstner::getImplementationName() );
++        return Sequence< ::rtl::OUString >( &strName, 1 );
++    }	
++}
++namespace ooevtdescgen 
++{
++    ::rtl::OUString SAL_CALL getImplementationName()
++    {
++        static ::rtl::OUString* pImplName = 0;
++        if ( !pImplName )
++        {
++            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
++            if ( !pImplName )
++            {
++                static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAToOOEventDesc" ) );
++                pImplName = &aImplName;
++            }
++        }
++        return *pImplName;
++    }
++
++    uno::Reference< XInterface > SAL_CALL create(
++        Reference< XComponentContext > const & xContext )
++        SAL_THROW( () )
++    {
++        return static_cast< lang::XTypeProvider * >( new VBAToOOEventDescGen( xContext ) );
++    }
++
++    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
++    {
++    	const ::rtl::OUString strName( ::ooevtdescgen::getImplementationName() );
++        return Sequence< ::rtl::OUString >( &strName, 1 );
++    }	
++}
+Index: scripting/source/vbaevents/makefile.mk
+===================================================================
+--- scripting/source/vbaevents/makefile.mk	(revision 0)
++++ scripting/source/vbaevents/makefile.mk	(revision 276288)
+@@ -0,0 +1,59 @@
++PRJ=..$/..
++
++PRJNAME=vbaevents
++TARGET=vbaevents
++.IF "$(ENABLE_VBA)"!="YES"
++dummy:
++        @echo "not building vbaevents..."
++.ENDIF
++
++NO_BSYMBOLIC=	TRUE
++ENABLE_EXCEPTIONS=TRUE
++COMP1TYPELIST=$(TARGET)
++COMPRDB=$(SOLARBINDIR)$/types.rdb
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++DLLPRE =
++
++# ------------------------------------------------------------------
++
++ALLTAR : \
++        $(MISC)$/$(TARGET).don \
++        $(SLOTARGET)
++
++$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++        echo $@
++# ------------------------------------------------------------------
++
++#.INCLUDE :  ..$/cppumaker.mk
++
++SLOFILES= \
++		$(SLO)$/service.obj \
++		$(SLO)$/eventhelper.obj
++
++SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
++SHL1IMPLIB=     i$(TARGET)
++
++SHL1VERSIONMAP=$(TARGET).map
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++DEF1NAME=$(SHL1TARGET)
++                                                                              
++SHL1STDLIBS= \
++                $(CPPUHELPERLIB) \
++		$(BASICLIB) \
++		$(COMPHELPERLIB) \
++		$(SFXLIB) \
++		$(SVXMSFILTERLIB) \
++                $(CPPULIB) \
++                $(TOOLSLIB) \
++                $(SALLIB)
++                                                                              
++SHL1DEPN=
++SHL1LIBS=$(SLB)$/$(TARGET).lib
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :	target.mk
+Index: scripting/source/vbaevents/vbaevents.map
+===================================================================
+--- scripting/source/vbaevents/vbaevents.map	(revision 0)
++++ scripting/source/vbaevents/vbaevents.map	(revision 276288)
+@@ -0,0 +1,9 @@
++OOO_1.1 {
++	global:
++		component_getImplementationEnvironment;
++		component_getFactory;
++		component_writeInfo;
++
++	local:
++		*;
++};
+Index: scripting/source/vbaevents/vbaevents.xml
+===================================================================
+--- scripting/source/vbaevents/vbaevents.xml	(revision 0)
++++ scripting/source/vbaevents/vbaevents.xml	(revision 276288)
+@@ -0,0 +1,26 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
++<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
++
++    <module-name>vbaevents</module-name>
++    
++    <component-description>
++        <author>Noel Power </author>
++        <name>ooo.vba.EventListener</name>
++        <description>Event listener to handle ooo events and to translate them to calls to basic macros ala Button_Click etc.</description>
++        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
++        <language>c++</language>
++        <status value="drafts"/>
++        <supported-service>ooo.vba.EventListener</supported-service>
++        <type>com.sun.star.uno.XComponentContext</type>        
++    </component-description>
++    
++    <project-build-dependency>cppuhelper</project-build-dependency>
++    <project-build-dependency>cppu</project-build-dependency>
++    <project-build-dependency>sal</project-build-dependency>
++
++    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
++    <runtime-module-dependency>cppu3</runtime-module-dependency>
++    <runtime-module-dependency>sal3</runtime-module-dependency>
++    
++</module-description>
+Index: scripting/prj/build.lst
+===================================================================
+--- scripting/prj/build.lst	(revision 276159)
++++ scripting/prj/build.lst	(revision 276288)
+@@ -1,8 +1,9 @@
+-tc	scripting	:	bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
++tc	scripting	:	oovbaapi svx bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
+ tc	scripting									usr1	-	all	tc1_mkout NULL
+ tc	scripting\inc								nmake	-	all	tc1_inc NULL
+ tc	scripting\source\provider				nmake	-	all	tc1_scriptingprovider tc1_inc NULL
+ tc	scripting\source\basprov				nmake	-	all	tc1_scriptingbasprov tc1_inc NULL
++tc	scripting\source\vbaevents				nmake	-	all	tc1_scriptingvbaevents tc1_inc NULL
+ tc	scripting\source\dlgprov				nmake	-	all	tc1_scriptingdlgprov tc1_inc NULL
+ tc	scripting\source\stringresource			nmake	-	all	tc1_scriptingstringresource tc1_inc NULL
+ tc	scripting\source\pyprov				nmake	-	all	tc1_scriptingpyprov tc1_inc NULL
+@@ -10,4 +11,4 @@ tc	scripting\source\protocolhandler			nmake	-	all
+ tc	scripting\java						nmake	-	all	tc1_scriptingjava tc1_scriptingprovider tc1_scriptingprotocolhandler NULL
+ tc	scripting\examples\java				nmake	-	all	tc1_scriptingexamplesjava tc1_scriptingjava  NULL
+ tc	scripting\examples				nmake	-	all	tc1_scriptingexamples tc1_scriptingexamplesjava  tc1_inc NULL
+-tc	scripting\util						nmake	-	all	tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL
++tc	scripting\util						nmake	-	all	tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingvbaevents tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL
+Index: dbaccess/source/ext/macromigration/migrationengine.cxx
+===================================================================
+--- dbaccess/source/ext/macromigration/migrationengine.cxx	(revision 276159)
++++ dbaccess/source/ext/macromigration/migrationengine.cxx	(revision 276288)
+@@ -1838,7 +1838,7 @@ namespace dbmm
+             Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
+ 
+             Reference< XNameContainer > xDialogModel( m_aContext.createComponent( "com.sun.star.awt.UnoControlDialogModel" ), UNO_QUERY_THROW );
+-            ::xmlscript::importDialogModel( xInput, xDialogModel, m_aContext.getUNOContext() );
++            ::xmlscript::importDialogModel( xInput, xDialogModel, m_aContext.getUNOContext(), m_xDocumentModel );
+ 
+             // adjust the events of the dialog
+             impl_adjustDialogElementEvents_throw( xDialogModel );
+@@ -1853,7 +1853,7 @@ namespace dbmm
+             }
+ 
+             // export dialog model
+-            xISP = ::xmlscript::exportDialogModel( xDialogModel, m_aContext.getUNOContext() );
++            xISP = ::xmlscript::exportDialogModel( xDialogModel, m_aContext.getUNOContext(), m_xDocumentModel );
+             _inout_rDialogLibraryElement <<= xISP;
+         }
+         catch( const Exception& )
+Index: sfx2/source/doc/docmacromode.cxx
+===================================================================
+--- sfx2/source/doc/docmacromode.cxx	(revision 276159)
++++ sfx2/source/doc/docmacromode.cxx	(revision 276288)
+@@ -40,6 +40,7 @@
+ #include <com/sun/star/task/DocumentMacroConfirmationRequest.hpp>
+ #include <com/sun/star/task/InteractionClassification.hpp>
+ #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
++#include <com/sun/star/script/XLibraryQueryExecutable.hpp>
+ /** === end UNO includes === **/
+ 
+ #include <comphelper/componentcontext.hxx>
+@@ -75,8 +76,10 @@ namespace sfx2
+     using ::com::sun::star::document::XEmbeddedScripts;
+     using ::com::sun::star::uno::UNO_SET_THROW;
+     using ::com::sun::star::script::XLibraryContainer;
++    using ::com::sun::star::script::XLibraryQueryExecutable;
+     using ::com::sun::star::container::XNameAccess;
+     using ::com::sun::star::uno::UNO_QUERY_THROW;
++    using ::com::sun::star::uno::UNO_QUERY;
+ 	/** === end UNO using === **/
+     namespace MacroExecMode = ::com::sun::star::document::MacroExecMode;
+ 
+@@ -438,11 +441,9 @@ namespace sfx2
+                             // rid of the "Standard" thingie - this shouldn't be necessary
+                             // anymore, should it?
+                             // 2007-01-25 / frank.schoenheit@sun.com
+-						    Reference < XNameAccess > xLib;
+-						    Any aAny = xContainer->getByName( aStdLibName );
+-						    aAny >>= xLib;
++						    Reference < XLibraryQueryExecutable > xLib( xContainer, UNO_QUERY );
+ 						    if ( xLib.is() )
+-							    bHasMacroLib = xLib->hasElements();
++							    bHasMacroLib = xLib->HasExecutableCode( aStdLibName );
+ 					    }
+ 				    }
+ 			    }
+Index: sfx2/source/doc/objcont.cxx
+===================================================================
+--- sfx2/source/doc/objcont.cxx	(revision 276159)
++++ sfx2/source/doc/objcont.cxx	(revision 276288)
+@@ -1471,6 +1471,9 @@ sal_Bool SfxObjectShell::IsHelpDocument() const
+ 
+ void SfxObjectShell::ResetFromTemplate( const String& rTemplateName, const String& rFileName )
+ {
++    // only care about reseting this data for openoffice formats otherwise
++    if ( IsOwnStorageFormat_Impl( *GetMedium())  )
++    {
+     uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties());
+     xDocProps->setTemplateURL( ::rtl::OUString() );
+     xDocProps->setTemplateName( ::rtl::OUString() );
+@@ -1499,6 +1502,7 @@ void SfxObjectShell::ResetFromTemplate( const Stri
+         }
+     }
+ }
++}
+ 
+ sal_Bool SfxObjectShell::IsQueryLoadTemplate() const
+ {
+Index: sfx2/source/doc/SfxDocumentMetaData.cxx
+===================================================================
+--- sfx2/source/doc/SfxDocumentMetaData.cxx	(revision 276159)
++++ sfx2/source/doc/SfxDocumentMetaData.cxx	(revision 276288)
+@@ -89,6 +89,10 @@
+ #include <cstring>
+ #include <limits>
+ 
++
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/document/XCompatWriterDocProperties.hpp>
++
+ /**
+  * This file contains the implementation of the service
+  * com.sun.star.document.DocumentProperties.
+@@ -298,12 +302,12 @@ class SfxDocumentMetaData:
+         const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces)
+         throw (css::uno::RuntimeException, css::xml::sax::SAXException);
+ 
+-private:
++protected:
+     SfxDocumentMetaData(SfxDocumentMetaData &); // not defined
+     SfxDocumentMetaData& operator =(SfxDocumentMetaData &); // not defined
+ 
+     virtual ~SfxDocumentMetaData() {}
+-
++    virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) { return new SfxDocumentMetaData( context ); };
+     const css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ 
+     /// for notification
+@@ -378,6 +382,54 @@ class SfxDocumentMetaData:
+     void createUserDefined();
+ };
+ 
++typedef ::cppu::ImplInheritanceHelper1< SfxDocumentMetaData, css::document::XCompatWriterDocProperties > CompatWriterDocPropsImpl_BASE;
++
++class CompatWriterDocPropsImpl : public CompatWriterDocPropsImpl_BASE
++{
++    rtl::OUString msManager;
++    rtl::OUString msCategory;
++    rtl::OUString msCompany;
++protected:
++    virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) { return new CompatWriterDocPropsImpl( context ); };
++public:
++    CompatWriterDocPropsImpl( css::uno::Reference< css::uno::XComponentContext > const & context) : CompatWriterDocPropsImpl_BASE( context ) {}
++// XCompatWriterDocPropsImpl
++    virtual ::rtl::OUString SAL_CALL getManager() throw (::com::sun::star::uno::RuntimeException) { return msManager; }
++    virtual void SAL_CALL setManager( const ::rtl::OUString& _manager ) throw (::com::sun::star::uno::RuntimeException) { msManager = _manager; }
++    virtual ::rtl::OUString SAL_CALL getCategory() throw (::com::sun::star::uno::RuntimeException){ return msCategory; }
++    virtual void SAL_CALL setCategory( const ::rtl::OUString& _category ) throw (::com::sun::star::uno::RuntimeException){ msCategory = _category; }
++    virtual ::rtl::OUString SAL_CALL getCompany() throw (::com::sun::star::uno::RuntimeException){ return msCompany; }
++    virtual void SAL_CALL setCompany( const ::rtl::OUString& _company ) throw (::com::sun::star::uno::RuntimeException){ msCompany = _company; }
++
++// XServiceInfo
++    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
++    {
++        return comp_CompatWriterDocProps::_getImplementationName();
++    }
++
++    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException)
++    { 
++        css::uno::Sequence< rtl::OUString > sServiceNames= getSupportedServiceNames();
++        sal_Int32 nLen = sServiceNames.getLength();
++        rtl::OUString* pIt = sServiceNames.getArray();
++        rtl::OUString* pEnd = ( pIt + nLen );
++        sal_Bool bRes = sal_False;
++        for ( ; pIt != pEnd; ++pIt )
++        {
++            if ( pIt->equals( ServiceName ) )
++            {
++                bRes = sal_True;
++                break;
++            }
++        }
++        return bRes;
++    }
++
++    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException)
++    {
++        return comp_CompatWriterDocProps::_getSupportedServiceNames();
++    }
++};
+ ////////////////////////////////////////////////////////////////////////////
+ 
+ bool operator== (const css::util::DateTime &i_rLeft,
+@@ -2123,7 +2175,7 @@ SfxDocumentMetaData::createClone()
+     ::osl::MutexGuard g(m_aMutex);
+     checkInit();
+ 
+-    SfxDocumentMetaData *pNew = new SfxDocumentMetaData(m_xContext);
++    SfxDocumentMetaData *pNew = createMe(m_xContext);
+ 
+     // NB: do not copy the modification listeners, only DOM
+     css::uno::Reference<css::xml::dom::XDocument> xDoc = createDOM();
+@@ -2289,6 +2341,32 @@ void SfxDocumentMetaData::createUserDefined()
+ 
+ 
+ // component helper namespace
++namespace comp_CompatWriterDocProps {
++
++    ::rtl::OUString SAL_CALL _getImplementationName() {
++        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
++            "CompatWriterDocPropsImpl"));
++}
++
++   css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
++   {
++        static css::uno::Sequence< rtl::OUString > aServiceNames;
++        if ( aServiceNames.getLength() == 0 )
++        {
++            aServiceNames.realloc( 1 );
++            aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.writer.DocumentProperties" ) ); 
++        }
++        return aServiceNames;
++   } 
++    css::uno::Reference< css::uno::XInterface > SAL_CALL _create(
++        const css::uno::Reference< css::uno::XComponentContext > & context)
++            SAL_THROW((css::uno::Exception))
++    {
++        return static_cast< ::cppu::OWeakObject * >
++                    (new CompatWriterDocPropsImpl(context));
++    }
++
++}
+ namespace comp_SfxDocumentMetaData {
+ 
+ ::rtl::OUString SAL_CALL _getImplementationName() {
+Index: sfx2/source/doc/docinf.cxx
+===================================================================
+--- sfx2/source/doc/docinf.cxx	(revision 276159)
++++ sfx2/source/doc/docinf.cxx	(revision 276288)
+@@ -37,6 +37,7 @@
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <com/sun/star/beans/XPropertyContainer.hpp>
+ #include <com/sun/star/document/XDocumentProperties.hpp>
++#include <com/sun/star/document/XCompatWriterDocProperties.hpp>
+ #include <com/sun/star/uno/Exception.hpp>
+ 
+ #include <rtl/ustring.hxx>
+@@ -46,7 +47,6 @@
+ #include <vcl/gdimtf.hxx>
+ 
+ #include "oleprops.hxx"
+-
+ // ============================================================================
+ 
+ // stream names
+@@ -175,6 +175,28 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet(
+         }
+     }
+ 
++    uno::Reference< document::XCompatWriterDocProperties > xWriterProps( i_xDocProps, uno::UNO_QUERY );
++    if ( xWriterProps.is() )
++    {
++        SfxOleSectionRef xBuiltin = aDocSet.GetSection( SECTION_BUILTIN );
++        if ( xBuiltin.get() )
++        {
++            try
++            {
++                String aStrValue;
++                if ( xBuiltin->GetStringValue( aStrValue, PROPID_MANAGER ) )
++                    xWriterProps->setManager( aStrValue );
++                if ( xBuiltin->GetStringValue( aStrValue, PROPID_CATEGORY ) )
++                    xWriterProps->setCategory( aStrValue );
++                if ( xBuiltin->GetStringValue( aStrValue, PROPID_COMPANY ) )
++                    xWriterProps->setCompany( aStrValue );
++            }
++            catch ( uno::Exception& )
++            {
++            }
++        }
++    }
++
+     // return code
+     return (nGlobError != ERRCODE_NONE) ? nGlobError : nDocError;
+ }
+Index: sfx2/source/doc/objserv.cxx
+===================================================================
+--- sfx2/source/doc/objserv.cxx	(revision 276159)
++++ sfx2/source/doc/objserv.cxx	(revision 276288)
+@@ -103,6 +103,7 @@
+ #include <com/sun/star/embed/XTransactedObject.hpp>
+ #include <com/sun/star/util/XCloneable.hpp>
+ #include <com/sun/star/document/XDocumentProperties.hpp>
++#include <com/sun/star/document/XDocumentEventCompatibleHelper.hpp>
+ 
+ #include "helpid.hrc"
+ 
+@@ -507,6 +508,18 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rRe
+ 		case SID_SAVEASDOC:
+ 		case SID_SAVEDOC:
+ 		{
++            if( nId == SID_SAVEDOC || nId == SID_SAVEASDOC )
++            {
++                uno::Reference< document::XDocumentEventCompatibleHelper > xVbaEventHelper( GetModel(), uno::UNO_QUERY );
++                if( xVbaEventHelper.is() )
++                {
++                    if( xVbaEventHelper->processCompatibleEvent( nId ) )
++                    {
++                        rReq.SetReturnValue( SfxBoolItem( 0, sal_True ) );
++                        return;
++                    }
++                }
++            }
+ 			//!! detaillierte Auswertung eines Fehlercodes
+ 			SfxObjectShellRef xLock( this );
+ 
+@@ -1475,3 +1488,19 @@ void SfxObjectShell::SignScriptingContent()
+     ImplSign( TRUE );
+ }
+ 
++// static
++const uno::Sequence<sal_Int8>& SfxObjectShell::getUnoTunnelId()
++{
++	static uno::Sequence<sal_Int8> * pSeq = 0;
++	if( !pSeq )
++	{
++		osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
++		if( !pSeq )
++		{
++			static uno::Sequence< sal_Int8 > aSeq( 16 );
++			rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
++			pSeq = &aSeq;
++		}
++	}
++	return *pSeq;
++}
+Index: sfx2/source/doc/sfxbasemodel.cxx
+===================================================================
+--- sfx2/source/doc/sfxbasemodel.cxx	(revision 276159)
++++ sfx2/source/doc/sfxbasemodel.cxx	(revision 276288)
+@@ -888,7 +888,15 @@ uno::Reference< document::XDocumentInfo > SAL_CALL
+ 
+ 	return m_pData->m_xDocumentInfo;
+ }
+-
++void 
++SfxBaseModel::setDocumentProperties( const uno::Reference< document::XDocumentProperties >& rxNewDocProps )
++{
++	// object already disposed?
++    ::vos::OGuard aGuard( Application::GetSolarMutex() );
++    if ( impl_isDisposed() )
++        throw lang::DisposedException();
++    m_pData->m_xDocumentProperties.set(rxNewDocProps, uno::UNO_QUERY_THROW);
++}
+ // document::XDocumentPropertiesSupplier:
+ uno::Reference< document::XDocumentProperties > SAL_CALL
+ SfxBaseModel::getDocumentProperties()
+@@ -3315,7 +3323,7 @@ uno::Reference< ui::XUIConfigurationManager > SAL_
+                 // Try to open with READ
+ 				xOOo1ConfigStorage = getDocumentSubStorage( aOOo1UIConfigFolderName, embed::ElementModes::READ );
+                 if ( xOOo1ConfigStorage.is() )
+-                {
++                {
+                     uno::Reference< lang::XMultiServiceFactory > xServiceMgr( ::comphelper::getProcessServiceFactory() );
+                     uno::Sequence< uno::Reference< container::XIndexContainer > > rToolbars;
+ 
+Index: sfx2/source/doc/objmisc.cxx
+===================================================================
+--- sfx2/source/doc/objmisc.cxx	(revision 276159)
++++ sfx2/source/doc/objmisc.cxx	(revision 276288)
+@@ -1644,7 +1644,7 @@ namespace
+ }
+ 
+ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const ::rtl::OUString& _rScriptURL,
+-    const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
++    const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, ::com::sun::star::uno::Any* pCaller )
+ {
+     OSL_TRACE( "in CallXScript" );
+ 	ErrCode nErr = ERRCODE_NONE;
+@@ -1675,7 +1675,16 @@ ErrCode SfxObjectShell::CallXScript( const Referen
+ 
+         // obtain the script, and execute it
+         Reference< provider::XScript > xScript( xScriptProvider->getScript( _rScriptURL ), UNO_QUERY_THROW );
+-
++        if ( pCaller && pCaller->hasValue() )
++        {
++            Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY ); 
++            if ( xProps.is() )
++            {
++                Sequence< uno::Any > aArgs( 1 );
++                aArgs[ 0 ] = *pCaller;
++                xProps->setPropertyValue( rtl::OUString::createFromAscii("Caller"), uno::makeAny( aArgs ) );
++            }
++        }
+         aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam );
+     }
+     catch ( const uno::Exception& )
+@@ -1685,7 +1694,7 @@ ErrCode SfxObjectShell::CallXScript( const Referen
+         nErr = ERRCODE_BASIC_INTERNAL_ERROR;
+     }
+ 
+-	if ( bCaughtException )
++	if ( bCaughtException && bRaiseError )
+ 	{
+         ::std::auto_ptr< VclAbstractDialog > pScriptErrDlg;
+ 		SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+@@ -1709,9 +1718,9 @@ ErrCode SfxObjectShell::CallXScript( const String&
+         ::com::sun::star::uno::Any& aRet,
+         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
+         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
+-            aOutParam)
++            aOutParam, bool bRaiseError, ::com::sun::star::uno::Any* pCaller )
+ {
+-    return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam );
++    return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError, pCaller );
+ }
+ 
+ //-------------------------------------------------------------------------
+Index: sfx2/source/doc/objxtor.cxx
+===================================================================
+--- sfx2/source/doc/objxtor.cxx	(revision 276159)
++++ sfx2/source/doc/objxtor.cxx	(revision 276288)
+@@ -136,6 +136,33 @@ DBG_NAME(SfxObjectShell)
+ extern svtools::AsynchronLink* pPendingCloser;
+ static WeakReference< XInterface > s_xCurrentComponent;
+ 
++void lcl_UpdateAppBasicDocVars(  const Reference< XInterface >& _rxComponent, bool bClear = false )
++{
++    BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
++    if ( pAppMgr )
++    {
++        uno::Reference< beans::XPropertySet > xProps( _rxComponent, uno::UNO_QUERY );
++        if ( xProps.is() )
++        {
++            try
++            {
++                beans::PropertyValue aProp;
++                xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisVBADocObj") ) ) >>= aProp;
++                rtl::OString sTmp( rtl::OUStringToOString( aProp.Name, RTL_TEXTENCODING_UTF8 ) );
++                const char* pAscii = sTmp.getStr();
++                if ( bClear )
++                    pAppMgr->SetGlobalUNOConstant( pAscii, uno::makeAny( uno::Reference< uno::XInterface >() ) );
++                else
++                    pAppMgr->SetGlobalUNOConstant( pAscii, aProp.Value );
++    
++            }
++            catch( uno::Exception& e )
++            {
++            }
++        }
++    }
++}
++
+ //=========================================================================
+ 
+ 
+@@ -170,6 +197,7 @@ void SAL_CALL SfxModelListener_Impl::disposing( co
+     ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+     if ( SfxObjectShell::GetCurrentComponent() == _rEvent.Source )
+     {
++        lcl_UpdateAppBasicDocVars( SfxObjectShell::GetCurrentComponent(), true );
+         // remove ThisComponent reference from AppBasic
+         SfxObjectShell::SetCurrentComponent( Reference< XInterface >() );
+     }
+@@ -538,6 +566,13 @@ SfxObjectShell* SfxObjectShell::Current()
+ 	return pFrame ? pFrame->GetObjectShell() : 0;
+ }
+ 
++//-------------------------------------------------------------------------
++
++sal_Bool SfxObjectShell::IsInPrepareClose() const
++{
++    return pImp->bInPrepareClose;
++}
++
+ //------------------------------------------------------------------------
+ 
+ struct BoolEnv_Impl
+@@ -1048,7 +1083,10 @@ void SfxObjectShell::SetCurrentComponent( const Re
+     BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
+     s_xCurrentComponent = _rxComponent;
+     if ( pAppMgr )
++    {
++        lcl_UpdateAppBasicDocVars( _rxComponent );
+         pAppMgr->SetGlobalUNOConstant( "ThisComponent", makeAny( _rxComponent ) );
++    }
+ 
+ #if OSL_DEBUG_LEVEL > 0
+     const char* pComponentImplName = _rxComponent.get() ? typeid( *_rxComponent.get() ).name() : "void";
+Index: sfx2/source/doc/objuno.cxx
+===================================================================
+--- sfx2/source/doc/objuno.cxx	(revision 276159)
++++ sfx2/source/doc/objuno.cxx	(revision 276288)
+@@ -48,6 +48,7 @@
+ #include <com/sun/star/lang/Locale.hpp>
+ #include <com/sun/star/util/XModifiable.hpp>
+ #include <com/sun/star/document/XDocumentProperties.hpp>
++#include <com/sun/star/document/XCompatWriterDocProperties.hpp>
+ 
+ #include <unotools/configmgr.hxx>
+ #include <tools/inetdef.hxx>
+@@ -107,6 +108,9 @@ const SfxItemPropertyMapEntry* lcl_GetDocInfoPrope
+         { "AutoloadEnabled" , 15, MID_DOCINFO_AUTOLOADENABLED, &::getBooleanCppuType(),   PROPERTY_UNBOUND, 0 },
+         { "AutoloadSecs"    , 12, MID_DOCINFO_AUTOLOADSECS, &::getCppuType((const sal_Int32*)0),     PROPERTY_UNBOUND, 0 },
+         { "AutoloadURL"     , 11, MID_DOCINFO_AUTOLOADURL, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
++	{ "Category"			, 8	, MID_CATEGORY,           &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
++	{ "Company"			, 7	, MID_COMPANY,           &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
++	{ "Manager"			, 7	, MID_MANAGER,           &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
+         { "CreationDate"    , 12, WID_DATE_CREATED,   &::getCppuType((const ::com::sun::star::util::DateTime*)0),PROPERTY_MAYBEVOID, 0 },
+         { "DefaultTarget"   , 13, MID_DOCINFO_DEFAULTTARGET, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
+         { "Description"     , 11, MID_DOCINFO_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
+@@ -810,6 +814,22 @@ void SAL_CALL  SfxDocumentInfoObject::setFastPrope
+                     _pImp->m_xDocProps->setDefaultTarget(sTemp);
+ 				break;
+ //            case WID_CONTENT_TYPE : // this is readonly!
++               case MID_CATEGORY:
++               case MID_MANAGER:
++               case MID_COMPANY:
++                   {
++                       uno::Reference< document::XCompatWriterDocProperties > xWriterProps( _pImp->m_xDocProps, uno::UNO_QUERY  );
++                       if ( xWriterProps.is() ) 
++                       {
++                           if ( nHandle ==  MID_CATEGORY )
++                               xWriterProps->setCategory( sTemp );
++                           else if ( nHandle ==  MID_MANAGER )
++                               xWriterProps->setManager( sTemp );
++                           else
++                               xWriterProps->setCompany( sTemp );
++                           break;
++                       }
++                   }
+ 			default:
+ 				break;
+ 		}
+@@ -1027,6 +1047,23 @@ void SAL_CALL  SfxDocumentInfoObject::setFastPrope
+         case MID_DOCINFO_CHARLOCALE:
+             aValue <<= _pImp->m_xDocProps->getLanguage();
+             break;
++        case MID_CATEGORY:
++        case MID_MANAGER:
++        case MID_COMPANY:
++            {
++                uno::Reference< document::XCompatWriterDocProperties > xWriterProps( _pImp->m_xDocProps, uno::UNO_QUERY  );
++                if ( xWriterProps.is() ) 
++                {
++                    if ( nHandle ==  MID_CATEGORY )
++                        aValue <<= xWriterProps->getCategory();
++                    else if ( nHandle ==  MID_MANAGER )
++                        aValue <<= xWriterProps->getManager();
++                    else
++                        aValue <<= xWriterProps->getCompany();
++                        break;
++               }
++           }
++	
+         default:
+             aValue <<= ::rtl::OUString();
+             break;
+Index: sfx2/source/doc/oleprops.hxx
+===================================================================
+--- sfx2/source/doc/oleprops.hxx	(revision 276159)
++++ sfx2/source/doc/oleprops.hxx	(revision 276288)
+@@ -83,6 +83,10 @@ const sal_Int32 PROPID_CREATED          = 12;
+ const sal_Int32 PROPID_LASTSAVED        = 13;
+ const sal_Int32 PROPID_THUMBNAIL        = 17;
+ 
++// some Builtin properties
++const sal_Int32 PROPID_CATEGORY         = 0x2;
++const sal_Int32 PROPID_COMPANY          = 0xf;
++const sal_Int32 PROPID_MANAGER          = 0xe;
+ // predefined codepages
+ const sal_uInt16 CODEPAGE_UNKNOWN       = 0;
+ const sal_uInt16 CODEPAGE_UNICODE       = 1200;
+Index: sfx2/source/inc/SfxDocumentMetaData.hxx
+===================================================================
+--- sfx2/source/inc/SfxDocumentMetaData.hxx	(revision 276159)
++++ sfx2/source/inc/SfxDocumentMetaData.hxx	(revision 276288)
+@@ -48,5 +48,16 @@ css::uno::Reference< css::uno::XInterface > SAL_CA
+ 
+ } // closing component helper namespace
+ 
++namespace comp_CompatWriterDocProps {
++
++namespace css = ::com::sun::star;
++
++// component and service helper functions:
++::rtl::OUString SAL_CALL _getImplementationName();
++css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames();
++css::uno::Reference< css::uno::XInterface > SAL_CALL _create(
++        css::uno::Reference< css::uno::XComponentContext > const & context );
++
++}
+ #endif
+ 
+Index: sfx2/source/view/viewprn.cxx
+===================================================================
+--- sfx2/source/view/viewprn.cxx	(revision 276159)
++++ sfx2/source/view/viewprn.cxx	(revision 276288)
+@@ -32,6 +32,7 @@
+ #include "precompiled_sfx2.hxx"
+ 
+ #include <com/sun/star/document/XDocumentProperties.hpp>
++#include <com/sun/star/document/XDocumentEventCompatibleHelper.hpp>
+ #include <com/sun/star/view/PrintableState.hpp>
+ #include <svtools/itempool.hxx>
+ #ifndef _MSGBOX_HXX //autogen
+@@ -67,6 +68,8 @@
+ #include "view.hrc"
+ #include "helpid.hrc"
+ 
++using namespace com::sun::star;
++
+ TYPEINIT1(SfxPrintingHint, SfxHint);
+ 
+ // -----------------------------------------------------------------------
+@@ -405,6 +408,22 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rRe
+ 		case SID_SETUPPRINTER:
+ 	    case SID_PRINTER_NAME :
+ 		{
++            if( nId == SID_PRINTDOC )
++            {
++				SfxObjectShell* pDoc = GetObjectShell();
++                if( pDoc )
++                {
++                    uno::Reference< document::XDocumentEventCompatibleHelper > xVbaEventHelper( pDoc->GetModel(), uno::UNO_QUERY );
++                    if( xVbaEventHelper.is() )
++                    {
++                        if( xVbaEventHelper->processCompatibleEvent( nId ) )
++                        {
++                            rReq.SetReturnValue(SfxBoolItem(0,FALSE));
++                            return;
++                        }
++                    }
++                }
++            }
+ 	        // quiet mode (AppEvent, API call)
+ 			SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, FALSE);
+ 			bSilent = pSilentItem && pSilentItem->GetValue();
+@@ -717,6 +736,15 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rRe
+ 	        if ( SID_PRINTDOCDIRECT == nId )
+ 	        {
+ 				SfxObjectShell* pDoc = GetObjectShell();
++                uno::Reference< document::XDocumentEventCompatibleHelper > xVbaEventHelper( pDoc->GetModel(), uno::UNO_QUERY );
++                if( xVbaEventHelper.is() )
++                {
++                    if( xVbaEventHelper->processCompatibleEvent( nId ) )
++                    {
++                        rReq.SetReturnValue(SfxBoolItem(0,FALSE));
++                        return;
++                    }
++                }
+ 				bool bDetectHidden = ( !bSilent && pDoc );
+ 				if ( bDetectHidden && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES )
+ 					return;
+Index: sfx2/source/appl/app.cxx
+===================================================================
+--- sfx2/source/appl/app.cxx	(revision 276159)
++++ sfx2/source/appl/app.cxx	(revision 276288)
+@@ -761,7 +761,7 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Imp
+     basicide_handle_basic_error pSymbol = (basicide_handle_basic_error) osl_getFunctionSymbol( handleMod, aSymbol.pData );
+ 
+     // call basicide_handle_basic_error in basctl
+-    long nRet = pSymbol( pStarBasic );
++    long nRet = pSymbol ? pSymbol( pStarBasic ) : 0;
+ 
+ 	return nRet;
+ }
+Index: sfx2/source/appl/appuno.cxx
+===================================================================
+--- sfx2/source/appl/appuno.cxx	(revision 276159)
++++ sfx2/source/appl/appuno.cxx	(revision 276288)
+@@ -2283,6 +2283,16 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeIn
+     xNewKey = xKey->createKey( aTempStr );
+     xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentProperties") );
+ 
++
++    // writer compatable document properties
++    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
++    aImpl += comp_CompatWriterDocProps::_getImplementationName();
++
++    aTempStr = aImpl;
++    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
++    xNewKey = xKey->createKey( aTempStr );
++    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.writer.DocumentProperties") );
++
+ 	return sal_True;
+ }
+ 
+@@ -2340,8 +2350,18 @@ SFX2_DLLPUBLIC void* SAL_CALL component_getFactory
+ 			::comp_SfxDocumentMetaData::_getImplementationName(),
+ 			::comp_SfxDocumentMetaData::_getSupportedServiceNames());
+         }
++        if ( ::comp_CompatWriterDocProps::_getImplementationName().equals(
++                 ::rtl::OUString::createFromAscii( pImplementationName ) ) )
++        {
++            xFactory = ::cppu::createSingleComponentFactory(
++			::comp_CompatWriterDocProps::_create,
++			::comp_CompatWriterDocProps::_getImplementationName(),
++			::comp_CompatWriterDocProps::_getSupportedServiceNames());
++        }
+ 
+         // Factory is valid - service was found.
++
++        // Factory is valid - service was found.
+ 		if ( xFactory.is() )
+ 		{
+ 			xFactory->acquire();
+Index: sfx2/inc/sfx2/sfx.hrc
+===================================================================
+--- sfx2/inc/sfx2/sfx.hrc	(revision 276159)
++++ sfx2/inc/sfx2/sfx.hrc	(revision 276288)
+@@ -392,9 +392,11 @@
+ #define MID_DOCINFO_ENCRYPTED				 0x2c
+ #define MID_DOCINFO_STATISTIC				 0x33
+ #define MID_DOCINFO_CHARLOCALE				 0x34
++#define MID_CATEGORY                                     0x35
++#define MID_COMPANY                                      0x36
++#define MID_MANAGER                                      0x37
++#define MID_LAST_USED_PROPID              MID_MANAGER   
+ 
+-#define MID_LAST_USED_PROPID                 MID_DOCINFO_CHARLOCALE
+-
+ // Config-Ids -----------------------------------------------------------
+ 
+ #define SFX_ITEMTYPE_SW_BEGIN 		20000
+Index: sfx2/inc/sfx2/sfxbasemodel.hxx
+===================================================================
+--- sfx2/inc/sfx2/sfxbasemodel.hxx	(revision 276159)
++++ sfx2/inc/sfx2/sfxbasemodel.hxx	(revision 276288)
+@@ -1487,6 +1487,7 @@ class SFX2_DLLPUBLIC SfxBaseModel   :   protected
+     /* returns true if the document signatures are valid, otherwise false */
+     sal_Bool hasValidSignatures() const;
+ 
++    void setDocumentProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >& );
+ //________________________________________________________________________________________________________
+ //	private methods
+ //________________________________________________________________________________________________________
+Index: sfx2/inc/sfx2/objsh.hxx
+===================================================================
+--- sfx2/inc/sfx2/objsh.hxx	(revision 276159)
++++ sfx2/inc/sfx2/objsh.hxx	(revision 276288)
+@@ -264,6 +264,7 @@ friend struct ModifyBlocker_Impl;
+ 								TYPEINFO();
+ 								SFX_DECL_INTERFACE(SFX_INTERFACE_SFXDOCSH)
+ 
++    static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
+     /* Stampit disable/enable cancel button for print jobs
+        default = true = enable! */
+     void                        Stamp_SetPrintCancelState(sal_Bool bState);
+@@ -307,6 +308,7 @@ friend struct ModifyBlocker_Impl;
+     void                        SetNoName();
+     sal_Bool                    IsInModalMode() const;
+     sal_Bool					HasModalViews() const;
++    sal_Bool                    IsInPrepareClose() const;
+     sal_Bool                    IsHelpDocument() const;
+ 
+     sal_Bool                    IsDocShared() const;
+@@ -409,7 +411,9 @@ friend struct ModifyBlocker_Impl;
+         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
+         ::com::sun::star::uno::Any& aRet,
+         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
+-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam
++        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
++        bool bRaiseError = true,
++        ::com::sun::star::uno::Any* aCaller = 0
+     );
+ 
+     static ErrCode  CallXScript(
+@@ -418,7 +422,9 @@ friend struct ModifyBlocker_Impl;
+         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
+         ::com::sun::star::uno::Any& aRet,
+         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
+-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam
++        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
++        bool bRaiseError = true,
++        ::com::sun::star::uno::Any* aCaller = 0
+     );
+ 
+     /** adjusts the internal macro mode, according to the current security settings
+@@ -882,6 +888,7 @@ class SFX2_DLLPUBLIC SfxObjectShellItem: public Sf
+ 	virtual	sal_Bool		PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ 	SfxObjectShell* 		GetObjectShell() const
+ 							{ return pObjSh; }
++
+ };
+ 
+ #endif
+Index: vcl/source/control/combobox.cxx
+===================================================================
+--- vcl/source/control/combobox.cxx	(revision 276159)
++++ vcl/source/control/combobox.cxx	(revision 276288)
+@@ -471,8 +471,11 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void*, EMPTYAR
+ 		mbSyntheticModify = TRUE;
+ 		Modify();
+ 		mbSyntheticModify = FALSE;
++		if (ImplGetWindowImpl() != NULL) //liuchen 2009-7-28, resolve the problem that soffice get crashed if in ComboBox_Change event a Worksheets("SheetX").Activate sentence needs to be executed 
++		{
+ 		Select();
+ 	}
++	}
+ 
+ 	return 0;
+ }
+Index: vcl/source/gdi/bitmapex.cxx
+===================================================================
+--- vcl/source/gdi/bitmapex.cxx	(revision 276159)
++++ vcl/source/gdi/bitmapex.cxx	(revision 276288)
+@@ -47,6 +47,7 @@
+ #include <tools/rc.h>
+ #endif
+ #include <vcl/svapp.hxx>
++#include <vcl/virdev.hxx>
+ 
+ // ------------
+ // - BitmapEx -
+@@ -759,6 +760,61 @@ void BitmapEx::Draw( OutputDevice* pOutDev,
+ 	pOutDev->DrawBitmapEx( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, *this );
+ }
+ 
++BitmapEx BitmapEx:: AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize)
++{
++	Point aEmptyPoint(0,0);
++	sal_Int32 imgNewWidth = 0;
++	sal_Int32 imgNewHeight = 0;
++	double imgposX = 0;
++	double imgposY = 0;
++    BitmapEx  aRet = aBitmap;
++	double imgOldWidth = aRet.GetSizePixel().Width();
++	double imgOldHeight =aRet.GetSizePixel().Height();
++
++    Size aScaledSize;
++    if (imgOldWidth >= aStandardSize || imgOldHeight >= aStandardSize)
++	{
++		if (imgOldWidth >= imgOldHeight)
++		{
++			imgNewWidth = aStandardSize;
++			imgNewHeight = sal_Int32(imgOldHeight / (imgOldWidth / aStandardSize) + 0.5);
++			imgposX = 0;
++			imgposY = (aStandardSize - (imgOldHeight / (imgOldWidth / aStandardSize) + 0.5)) / 2 + 0.5;
++		}
++		else
++		{
++			imgNewHeight = aStandardSize;
++			imgNewWidth = sal_Int32(imgOldWidth / (imgOldHeight / aStandardSize) + 0.5);
++			imgposY = 0;
++			imgposX = (aStandardSize - (imgOldWidth / (imgOldHeight / aStandardSize) + 0.5)) / 2 + 0.5;
++		}
++
++		aScaledSize = Size( imgNewWidth, imgNewHeight );
++        aRet.Scale( aScaledSize, BMP_SCALE_INTERPOLATE );
++	}
++	else
++	{
++		imgposX = (aStandardSize - imgOldWidth) / 2 + 0.5;
++		imgposY = (aStandardSize - imgOldHeight) / 2 + 0.5;
++	}
++
++    Size aBmpSize = aRet.GetSizePixel();
++    Size aStdSize( aStandardSize, aStandardSize );
++    Rectangle aRect(aEmptyPoint, aStdSize );
++
++    VirtualDevice aVirDevice( *Application::GetDefaultDevice(), 0, 1 );
++	aVirDevice.SetOutputSizePixel( aStdSize );
++	aVirDevice.SetFillColor( COL_TRANSPARENT );
++    aVirDevice.SetLineColor( COL_TRANSPARENT );
++
++    //draw a rect into virDevice
++	aVirDevice.DrawRect( aRect );
++	Point aPointPixel( (long)imgposX, (long)imgposY );
++	aVirDevice.DrawBitmapEx( aPointPixel, aRet );
++	aRet = aVirDevice.GetBitmapEx( aEmptyPoint, aStdSize );
++
++	return aRet;
++}
+ // ------------------------------------------------------------------
+ 
+ SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx )
+Index: vcl/source/gdi/bitmap2.cxx
+===================================================================
+--- vcl/source/gdi/bitmap2.cxx	(revision 276159)
++++ vcl/source/gdi/bitmap2.cxx	(revision 276288)
+@@ -49,6 +49,8 @@
+ 
+ #define DIBCOREHEADERSIZE			( 12UL )
+ #define DIBINFOHEADERSIZE			( sizeof( DIBInfoHeader ) )
++#define BITMAPINFOHEADER                        0x28
++
+ #define SETPIXEL4( pBuf, nX, cChar )( (pBuf)[ (nX) >> 1 ] |= ( (nX) & 1 ) ? ( cChar ): (cChar) << 4 );
+ 
+ // ----------------------
+@@ -132,7 +134,7 @@ SvStream& operator<<( SvStream& rOStm, const Bitma
+ 
+ // ------------------------------------------------------------------
+ 
+-BOOL Bitmap::Read( SvStream& rIStm, BOOL bFileHeader )
++BOOL Bitmap::Read( SvStream& rIStm, BOOL bFileHeader, BOOL bIsMSOFormat )
+ {
+ 	const USHORT	nOldFormat = rIStm.GetNumberFormatInt();
+ 	const ULONG 	nOldPos = rIStm.Tell();
+@@ -147,7 +149,7 @@ SvStream& operator<<( SvStream& rOStm, const Bitma
+ 			bRet = ImplReadDIB( rIStm, *this, nOffset );
+ 	}
+ 	else
+-		bRet = ImplReadDIB( rIStm, *this, nOffset );
++		bRet = ImplReadDIB( rIStm, *this, nOffset, bIsMSOFormat );
+ 
+ 	if( !bRet )
+ 	{
+@@ -164,14 +166,14 @@ SvStream& operator<<( SvStream& rOStm, const Bitma
+ 
+ // ------------------------------------------------------------------
+ 
+-BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset )
++BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset, BOOL bIsMSOFormat )
+ {
+ 	DIBInfoHeader	aHeader;
+ 	const ULONG 	nStmPos = rIStm.Tell();
+ 	BOOL			bRet = FALSE;
+ 	sal_Bool		bTopDown = sal_False;
+ 
+-	if( ImplReadDIBInfoHeader( rIStm, aHeader, bTopDown ) && aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount )
++	if( ImplReadDIBInfoHeader( rIStm, aHeader, bTopDown, bIsMSOFormat ) && aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount )
+ 	{
+ 		const USHORT nBitCount( discretizeBitcount(aHeader.nBitCount) );
+ 
+@@ -302,21 +304,37 @@ BOOL Bitmap::ImplReadDIBFileHeader( SvStream& rISt
+ 
+ // ------------------------------------------------------------------
+ 
+-BOOL Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown )
++BOOL Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown, sal_Bool bIsMSOFormat )
+ {
+ 	// BITMAPINFOHEADER or BITMAPCOREHEADER
+ 	rIStm >> rHeader.nSize;
+ 
+ 	// BITMAPCOREHEADER
++	sal_Int16 nTmp16 = 0;
++	sal_uInt8 nTmp8 = 0;
+ 	if ( rHeader.nSize == DIBCOREHEADERSIZE )
+ 	{
+-		sal_Int16 nTmp16;
+ 
+ 		rIStm >> nTmp16; rHeader.nWidth = nTmp16;
+ 		rIStm >> nTmp16; rHeader.nHeight = nTmp16;
+ 		rIStm >> rHeader.nPlanes;
+ 		rIStm >> rHeader.nBitCount;
+ 	}
++	else if ( bIsMSOFormat && ( rHeader.nSize == BITMAPINFOHEADER ) )
++	{
++		rIStm >> nTmp16; rHeader.nWidth = nTmp16;
++		rIStm >> nTmp16; rHeader.nHeight = nTmp16;
++		rIStm >> nTmp8; rHeader.nPlanes = nTmp8;
++		rIStm >> nTmp8; rHeader.nBitCount = nTmp8;
++		rIStm >> nTmp16; rHeader.nSizeImage = nTmp16;
++		rIStm >> nTmp16; rHeader.nCompression = nTmp16;
++		if ( !rHeader.nSizeImage ) // uncompressed?
++			rHeader.nSizeImage = ((rHeader.nWidth * rHeader.nBitCount + 31) & ~31) / 8 * rHeader.nHeight;
++		rIStm >> rHeader.nXPelsPerMeter;
++		rIStm >> rHeader.nYPelsPerMeter;
++		rIStm >> rHeader.nColsUsed;
++		rIStm >> rHeader.nColsImportant;
++	}
+ 	else
+ 	{
+ 		// unknown Header
+Index: vcl/source/window/toolbox.cxx
+===================================================================
+--- vcl/source/window/toolbox.cxx	(revision 276159)
++++ vcl/source/window/toolbox.cxx	(revision 276288)
+@@ -229,6 +229,22 @@ int ToolBox::ImplGetDragWidth( ToolBox* pThis )
+     }
+     return width;
+ }
++
++ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType )
++{
++    ButtonType tmpButtonType = defaultType;
++    ToolBoxItemBits nBits( pItem->mnBits & 0x300 );
++    if ( nBits & TIB_TEXTICON ) // item has custom setting
++    {
++        tmpButtonType = BUTTON_SYMBOLTEXT; 
++        if ( nBits == TIB_TEXT_ONLY )
++            tmpButtonType = BUTTON_TEXT; 
++        else if ( nBits == TIB_ICON_ONLY )
++            tmpButtonType = BUTTON_SYMBOL; 
++    }
++    return tmpButtonType;
++}
++
+ // -----------------------------------------------------------------------
+ 
+ void ToolBox::ImplUpdateDragArea( ToolBox *pThis )
+@@ -1992,12 +2008,13 @@ BOOL ToolBox::ImplCalcItem()
+                     bText = FALSE;
+                 else
+                     bText = TRUE;
+-
++                ButtonType tmpButtonType = determineButtonType( &(*it), meButtonType ); // default to toolbox setting 
+                 if ( bImage || bText )
+                 {
++
+                     it->mbEmptyBtn = FALSE;
+ 
+-                    if ( meButtonType == BUTTON_SYMBOL )
++                    if ( tmpButtonType == BUTTON_SYMBOL )
+                     {
+                         // we're drawing images only
+                         if ( bImage || !bText )
+@@ -2011,7 +2028,7 @@ BOOL ToolBox::ImplCalcItem()
+                             it->mbVisibleText = TRUE;
+                         }
+                     }
+-                    else if ( meButtonType == BUTTON_TEXT )
++                    else if ( tmpButtonType == BUTTON_TEXT )
+                     {
+                         // we're drawing text only
+                         if ( bText || !bImage )
+@@ -3625,7 +3642,8 @@ void ToolBox::ImplDrawItem( USHORT nPos, BOOL bHig
+     // determine what has to be drawn on the button: image, text or both
+     BOOL bImage;
+     BOOL bText;
+-    pItem->DetermineButtonDrawStyle( meButtonType, bImage, bText );
++    ButtonType tmpButtonType = determineButtonType( pItem, meButtonType ); // default to toolbox setting 
++    pItem->DetermineButtonDrawStyle( tmpButtonType, bImage, bText );
+ 
+     // compute output values
+     long    nBtnWidth = aBtnSize.Width()-SMALLBUTTON_HSIZE;
+Index: vcl/source/window/toolbox2.cxx
+===================================================================
+--- vcl/source/window/toolbox2.cxx	(revision 276159)
++++ vcl/source/window/toolbox2.cxx	(revision 276288)
+@@ -59,6 +59,8 @@ using namespace rtl;
+ 
+ #define TB_SEP_SIZE 			8
+ 
++ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType );
++
+ // -----------------------------------------------------------------------
+ 
+ ImplToolBoxPrivateData::ImplToolBoxPrivateData() :
+Index: vcl/source/window/dialog.cxx
+===================================================================
+--- vcl/source/window/dialog.cxx	(revision 276159)
++++ vcl/source/window/dialog.cxx	(revision 276288)
+@@ -550,7 +550,14 @@ BOOL Dialog::Close()
+ {
+     ImplDelData aDelData;
+     ImplAddDel( &aDelData );
++	//liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event
++	mnCancelClose = 0;
+     ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE );
++	if (mnCancelClose == 1)
++	{
++		return FALSE;
++	}
++	//liuchen 2009-7-22
+     if ( aDelData.IsDelete() )
+         return FALSE;
+     ImplRemoveDel( &aDelData );
+Index: vcl/inc/vcl/toolbox.hxx
+===================================================================
+--- vcl/inc/vcl/toolbox.hxx	(revision 276159)
++++ vcl/inc/vcl/toolbox.hxx	(revision 276288)
+@@ -124,6 +124,9 @@ typedef USHORT ToolBoxItemBits;
+ #define TIB_DROPDOWN            ((ToolBoxItemBits)0x0020)
+ #define TIB_REPEAT              ((ToolBoxItemBits)0x0040)
+ #define TIB_DROPDOWNONLY        ((ToolBoxItemBits)0x0080 | TIB_DROPDOWN)    // this button has only drop down functionality
++#define TIB_TEXT_ONLY           ((ToolBoxItemBits)0x0100)
++#define TIB_ICON_ONLY           ((ToolBoxItemBits)0x0200)
++#define TIB_TEXTICON            ((ToolBoxItemBits) TIB_TEXT_ONLY | TIB_ICON_ONLY )
+ 
+ // -----------------
+ // - ToolBox-Types -
+Index: vcl/inc/vcl/bitmap.hxx
+===================================================================
+--- vcl/inc/vcl/bitmap.hxx	(revision 276159)
++++ vcl/inc/vcl/bitmap.hxx	(revision 276288)
+@@ -270,9 +270,9 @@ class VCL_DLLPUBLIC Bitmap
+     SAL_DLLPRIVATE void                 ImplSetImpBitmap( ImpBitmap* pImpBmp );
+     SAL_DLLPRIVATE void                 ImplAssignWithSize( const Bitmap& rBitmap );
+ 
+-    SAL_DLLPRIVATE static BOOL          ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset );
++    SAL_DLLPRIVATE static BOOL          ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset, BOOL bMSOFormat=FALSE );
+     SAL_DLLPRIVATE static BOOL          ImplReadDIBFileHeader( SvStream& rIStm, ULONG& rOffset );
+-    SAL_DLLPRIVATE static BOOL          ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown );
++    SAL_DLLPRIVATE static BOOL          ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown, BOOL bMSOFormat = FALSE );
+     SAL_DLLPRIVATE static BOOL          ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, BOOL bQuad );
+     SAL_DLLPRIVATE static BOOL          ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown );
+     SAL_DLLPRIVATE BOOL                 ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompressed ) const;
+@@ -767,7 +767,7 @@ class VCL_DLLPUBLIC Bitmap
+ 
+ public:
+ 
+-    BOOL                    Read( SvStream& rIStm, BOOL bFileHeader = TRUE );
++    BOOL                    Read( SvStream& rIStm, BOOL bFileHeader = TRUE, BOOL bMSOFormat = FALSE );
+     BOOL                    Write( SvStream& rOStm, BOOL bCompressed = TRUE, BOOL bFileHeader = TRUE ) const;
+ 
+     friend VCL_DLLPUBLIC SvStream&        operator>>( SvStream& rIStm, Bitmap& rBitmap );
+Index: vcl/inc/vcl/dialog.hxx
+===================================================================
+--- vcl/inc/vcl/dialog.hxx	(revision 276159)
++++ vcl/inc/vcl/dialog.hxx	(revision 276288)
+@@ -56,6 +56,7 @@ class VCL_DLLPUBLIC Dialog : public SystemWindow
+ 	BOOL			mbOldSaveBack;
+ 	BOOL			mbInClose;
+ 	BOOL			mbModalMode;
++	sal_Int8		mnCancelClose;  //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event
+ 
+ 	SAL_DLLPRIVATE void    ImplInitDialogData();
+ 	SAL_DLLPRIVATE void    ImplInitSettings();
+@@ -93,6 +94,9 @@ class VCL_DLLPUBLIC Dialog : public SystemWindow
+ 	virtual short	Execute();
+ 	BOOL			IsInExecute() const { return mbInExecute; }
+ 
++	sal_Int8		GetCloseFlag() const { return mnCancelClose; }  //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event
++	void			SetCloseFlag( sal_Int8 nCancel ) { mnCancelClose = nCancel; }  //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event
++
+     ////////////////////////////////////////
+     // Dialog::Execute replacement API
+ public:
+Index: vcl/inc/vcl/bitmapex.hxx
+===================================================================
+--- vcl/inc/vcl/bitmapex.hxx	(revision 276159)
++++ vcl/inc/vcl/bitmapex.hxx	(revision 276288)
+@@ -385,6 +385,7 @@ class VCL_DLLPUBLIC BitmapEx
+ 
+ 	friend VCL_DLLPUBLIC SvStream&	operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx );
+ 	friend VCL_DLLPUBLIC SvStream&	operator>>( SvStream& rIStm, BitmapEx& rBitmapEx );
++	static BitmapEx AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize);
+ };
+ 
+ #endif // _SV_BITMAPEX_HXX
+Index: vcl/inc/vcl/menu.hxx
+===================================================================
+--- vcl/inc/vcl/menu.hxx	(revision 276159)
++++ vcl/inc/vcl/menu.hxx	(revision 276288)
+@@ -93,6 +93,8 @@ typedef USHORT MenuItemBits;
+ #define MIB_POPUPSELECT 		((MenuItemBits)0x0020)
+ // not in rsc/vclsrc.hxx because only a prelimitary solution
+ #define MIB_NOSELECT 		    ((MenuItemBits)0x0040)
++#define MIB_ICON 		    ((MenuItemBits)0x0080)
++#define MIB_TEXT 		    ((MenuItemBits)0x0100)
+ 
+ #define MENU_FLAG_NOAUTOMNEMONICS		0x0001
+ #define MENU_FLAG_HIDEDISABLEDENTRIES	0x0002
+Index: sc/sdi/cellsh.sdi
+===================================================================
+--- sc/sdi/cellsh.sdi	(revision 276159)
++++ sc/sdi/cellsh.sdi	(revision 276288)
+@@ -60,6 +60,7 @@ interface CellSelection
+ 	SID_SBA_BRW_INSERT		[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
+ 	SID_SELECT_DB			[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
+ 	SID_SORT				[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
++	SID_DATA_FORM			[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
+ 	FID_FILTER_OK			[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
+ 	SID_AUTO_FILTER			[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
+ 	SID_AUTOFILTER_HIDE		[ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
+Index: sc/sdi/scalc.sdi
+===================================================================
+--- sc/sdi/scalc.sdi	(revision 276159)
++++ sc/sdi/scalc.sdi	(revision 276288)
+@@ -1601,6 +1601,31 @@ SfxVoidItem DataSort SID_SORT
+ ]
+ 
+ //--------------------------------------------------------------------------
++SfxVoidItem DataForm SID_DATA_FORM
++()
++[
++	/* flags: */
++	AutoUpdate = FALSE,
++	Cachable = Cachable,
++	FastCall = FALSE,
++	HasCoreId = FALSE,
++	HasDialog = TRUE,
++	ReadOnlyDoc = TRUE,
++	Toggle = FALSE,
++	Container = FALSE,
++	RecordAbsolute = FALSE,
++	RecordPerSet;
++	Synchron;
++
++	/* config: */
++	AccelConfig = TRUE,
++	MenuConfig = TRUE,
++	StatusBarConfig = FALSE,
++	ToolBoxConfig = FALSE,
++	GroupId = GID_DATA;
++]
++
++//--------------------------------------------------------------------------
+ SfxVoidItem DataSubTotals SID_SUBTOTALS
+ ()
+ [
+@@ -6347,56 +6372,56 @@ SfxVoidItem StandardFonts SID_STANDARD_FONTS
+ 
+ //--------------------------------------------------------------------------
+ // ISSUE66550_HLINK_FOR_SHAPES
+-//SfxVoidItem EditShapeHyperlink SID_DRAW_HLINK_EDIT
+-//()
+-//[
+-//   /* flags: */
+-//   AutoUpdate = FALSE,
+-//   Cachable = Cachable,
+-//   FastCall = TRUE,
+-//   HasCoreId = FALSE,
+-//   HasDialog = TRUE,
+-//   ReadOnlyDoc = TRUE,
+-//   Toggle = FALSE,
+-//   Container = FALSE,
+-//   RecordAbsolute = FALSE,
+-//   RecordPerSet;
+-//   Synchron;
+-//
++SfxVoidItem EditShapeHyperlink SID_DRAW_HLINK_EDIT
++()
++[
++   /* flags: */
++   AutoUpdate = FALSE,
++   Cachable = Cachable,
++   FastCall = TRUE,
++   HasCoreId = FALSE,
++   HasDialog = TRUE,
++   ReadOnlyDoc = TRUE,
++   Toggle = FALSE,
++   Container = FALSE,
++   RecordAbsolute = FALSE,
++   RecordPerSet;
++   Synchron;
++
+ //   /* config: */
+-//   AccelConfig = TRUE,
+-//   MenuConfig = FALSE,
+-//   StatusBarConfig = FALSE,
+-//   ToolBoxConfig = FALSE,
+-//   GroupId = GID_DRAWING;
+-//]
++   AccelConfig = TRUE,
++   MenuConfig = FALSE,
++   StatusBarConfig = FALSE,
++   ToolBoxConfig = FALSE,
++   GroupId = GID_DRAWING;
++]
+ 
+ //--------------------------------------------------------------------------
+ // ISSUE66550_HLINK_FOR_SHAPES
+-//SfxVoidItem DeleteShapeHyperlink SID_DRAW_HLINK_DELETE
+-//()
+-//[
+-//   /* flags: */
+-//   AutoUpdate = TRUE,
+-//   Cachable = Cachable,
+-//   FastCall = TRUE,
+-//   HasCoreId = FALSE,
+-//   HasDialog = FALSE,
+-//   ReadOnlyDoc = TRUE,
+-//   Toggle = FALSE,
+-//   Container = FALSE,
+-//   RecordAbsolute = FALSE,
+-//   RecordPerSet;
+-//   Synchron;
+-//
+-//   /* config: */
+-//   AccelConfig = TRUE,
+-//   MenuConfig = FALSE,
+-//   StatusBarConfig = FALSE,
+-//   ToolBoxConfig = FALSE,
+-//   GroupId = GID_DRAWING;
+-//]
++SfxVoidItem DeleteShapeHyperlink SID_DRAW_HLINK_DELETE
++()
++[
++   /* flags: */
++   AutoUpdate = TRUE,
++   Cachable = Cachable,
++   FastCall = TRUE,
++   HasCoreId = FALSE,
++   HasDialog = FALSE,
++   ReadOnlyDoc = TRUE,
++   Toggle = FALSE,
++   Container = FALSE,
++   RecordAbsolute = FALSE,
++   RecordPerSet;
++   Synchron;
+ 
++   /* config: */
++   AccelConfig = TRUE,
++   MenuConfig = FALSE,
++   StatusBarConfig = FALSE,
++   ToolBoxConfig = FALSE,
++   GroupId = GID_DRAWING;
++]
++
+ //--------------------------------------------------------------------------
+ SfxVoidItem StandardTextAttributes SID_TEXT_STANDARD
+ ()
+Index: sc/sdi/drawsh.sdi
+===================================================================
+--- sc/sdi/drawsh.sdi	(revision 276159)
++++ sc/sdi/drawsh.sdi	(revision 276288)
+@@ -229,9 +229,9 @@ interface TableDraw
+     SID_FONTWORK_CHARACTER_SPACING_DIALOG	[ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ]
+ 
+ // ISSUE66550_HLINK_FOR_SHAPES
+-//    SID_DRAW_HLINK_EDIT             [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
+-//    SID_DRAW_HLINK_DELETE           [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
+-//    SID_OPEN_HYPERLINK              [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
++    SID_DRAW_HLINK_EDIT             [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
++    SID_DRAW_HLINK_DELETE           [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
++    SID_OPEN_HYPERLINK              [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
+ }
+ 
+ 
+Index: sc/source/filter/excel/xltoolbar.cxx
+===================================================================
+--- sc/source/filter/excel/xltoolbar.cxx	(revision 0)
++++ sc/source/filter/excel/xltoolbar.cxx	(revision 276288)
+@@ -0,0 +1,427 @@
++#include "xltoolbar.hxx"
++#include <rtl/ustrbuf.hxx>
++#include <stdarg.h>
++#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
++#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
++#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
++#include <com/sun/star/lang/XMultiServiceFactory.hpp>
++#include <com/sun/star/lang/XSingleComponentFactory.hpp>
++#include <com/sun/star/lang/XMultiComponentFactory.hpp>
++#include <com/sun/star/ui/XImageManager.hpp>
++#include <com/sun/star/ui/ItemType.hpp>
++#include <fstream>
++#include <comphelper/processfactory.hxx>
++#include <vcl/graph.hxx>
++#include <map>
++using namespace com::sun::star;
++
++typedef std::map< sal_Int16, rtl::OUString > IdToString;
++
++class MSOExcelCommandConvertor : public MSOCommandConvertor
++{
++   IdToString msoToOOcmd;
++   IdToString tcidToOOcmd;
++public:
++    MSOExcelCommandConvertor();
++    virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
++    virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 key );
++};
++
++MSOExcelCommandConvertor::MSOExcelCommandConvertor()
++{
++/*
++    // mso command id to ooo command string
++    // #FIXME and *HUNDREDS* of id's to added here
++    msoToOOcmd[ 0x20b ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc") );
++    msoToOOcmd[ 0x50 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Open") );
++
++   // mso tcid to ooo command string
++    // #FIXME and *HUNDREDS* of id's to added here
++   tcidToOOcmd[ 0x9d9 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Print") );
++*/
++}
++
++rtl::OUString MSOExcelCommandConvertor::MSOCommandToOOCommand( sal_Int16 key )
++{
++    rtl::OUString sResult;
++    IdToString::iterator it = msoToOOcmd.find( key );
++    if ( it != msoToOOcmd.end() )
++        sResult = it->second;
++    return sResult;
++}
++
++rtl::OUString MSOExcelCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key )
++{
++    rtl::OUString sResult;
++    IdToString::iterator it = tcidToOOcmd.find( key );
++    if ( it != tcidToOOcmd.end() )
++        sResult = it->second;
++    return sResult;
++}
++
++
++
++CTBS::CTBS() : bSignature(0), bVersion(0), reserved1(0), reserved2(0), reserved3(0), ctb(0), ctbViews(0), ictbView(0)
++{
++}
++
++CTB::CTB() : nViews( 0 ), ectbid(0)
++{
++}
++
++CTB::CTB(sal_uInt16 nNum ) : nViews( nNum ), ectbid(0)
++{
++}
++
++bool CTB::Read( SvStream *pS )
++{
++    OSL_TRACE("CTB::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();   
++    tb.Read( pS );
++    for ( sal_uInt16 index = 0; index < nViews; ++index )
++    {
++        TBVisualData aVisData;
++        aVisData.Read( pS );
++        rVisualData.push_back( aVisData );
++    }
++    *pS >> ectbid;
++  
++    for ( sal_Int16 index = 0; index < tb.getcCL(); ++index )
++    {
++        TBC aTBC;
++        aTBC.Read( pS );
++        rTBC.push_back( aTBC ); 
++    }
++    return true;
++}
++
++void CTB::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] CTB -- dump\n", nOffSet );
++    indent_printf( fp, "  nViews 0x%x\n", nViews);
++    tb.Print( fp );
++
++    std::vector<TBVisualData>::iterator visData_end = rVisualData.end();
++    sal_Int32 counter = 0;
++    for ( std::vector<TBVisualData>::iterator it = rVisualData.begin(); it != visData_end; ++it )
++    {
++        
++        indent_printf( fp, "  TBVisualData [%d]\n", counter++ );
++        Indent b;
++        it->Print( fp );
++    } 
++    indent_printf( fp, "  ectbid 0x%x\n", ectbid);
++    std::vector<TBC>::iterator it_end = rTBC.end();
++    counter = 0;
++    for ( std::vector<TBC>::iterator it = rTBC.begin(); it != it_end; ++it )
++    {
++        indent_printf( fp, "  TBC [%d]\n", counter++);
++        Indent c;
++        it->Print( fp );
++    }
++}
++
++bool CTB::IsMenuToolbar()
++{
++    return tb.IsMenuToolbar();
++}
++
++bool CTB::ImportMenuTB( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& xMenuDesc, CustomToolBarImportHelper& helper )
++{
++    sal_Int32 index = 0;
++    for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it, ++index )
++    {
++        if ( !it->ImportToolBarControl( rWrapper, xMenuDesc, helper, IsMenuToolbar() ) )
++            return false;
++    }
++    return true;
++}
++
++bool CTB::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper )
++{
++
++    static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) );
++    bool bRes = false;
++    try
++    {
++        if ( !tb.IsEnabled() )
++            return true;  // didn't fail, just ignoring
++
++        // Create default setting
++        uno::Reference< container::XIndexContainer > xIndexContainer( helper.getCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
++        uno::Reference< container::XIndexAccess > xIndexAccess( xIndexContainer, uno::UNO_QUERY_THROW );
++        uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); 
++        WString& name = tb.getName();
++        // set UI name for toolbar
++        xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( name.getString() ) ); 
++    
++        rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() );
++        for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
++        {
++            if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, helper, IsMenuToolbar() ) )
++                return false;
++        }
++
++        OSL_TRACE("Name of toolbar :-/ %s", rtl::OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() );
++
++        helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess );
++        helper.applyIcons();
++#if 0
++        uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
++        xPersistence->store();
++
++        xPersistence.set( helper.getCfgManager(), uno::UNO_QUERY_THROW );
++        xPersistence->store();
++#endif 
++    
++        bRes = true;
++    }
++    catch( uno::Exception& )
++    {
++       bRes = false; 
++    }
++    return bRes;
++}
++bool CTBS::Read( SvStream *pS )
++{
++    OSL_TRACE("CTBS::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();    
++    *pS >> bSignature >> bVersion >> reserved1 >> reserved2 >> reserved3 >> ctb >> ctbViews >> ictbView;
++    return true;
++}
++
++void CTBS::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] CTBS -- dump\n", nOffSet );
++
++    indent_printf( fp, "  bSignature 0x%x\n", bSignature);
++    indent_printf( fp, "  bVersion 0x%x\n", bVersion);
++
++    indent_printf( fp, "  reserved1 0x%x\n", reserved1 );
++    indent_printf( fp, "  reserved2 0x%x\n", reserved2 );
++    indent_printf( fp, "  reserved3 0x%x\n", reserved3 );
++
++    indent_printf( fp, "  ctb 0x%x\n", ctb );
++    indent_printf( fp, "  ctbViews 0x%x\n", ctbViews );
++    indent_printf( fp, "  ictbView 0x%x\n", ictbView );
++}
++
++TBC::TBC()
++{
++}
++
++bool 
++TBC::Read(SvStream *pS)
++{
++    OSL_TRACE("TBC::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();    
++    if ( !tbch.Read( pS ) )
++        return false;
++    sal_uInt16 tcid = tbch.getTcID();
++    sal_uInt8 tct = tbch.getTct();
++    if (  ( tcid != 0x0001 && tcid != 0x06CC && tcid != 0x03D8 && tcid != 0x03EC && tcid != 0x1051 ) && ( ( tct > 0 && tct < 0x0B ) || ( ( tct > 0x0B && tct < 0x10 ) || tct == 0x15 ) ) )
++    {
++        tbcCmd.reset( new TBCCmd );
++        if ( !  tbcCmd->Read( pS ) )
++            return false;
++    }
++    if ( tct != 0x16 )
++    {
++        tbcd.reset( new TBCData( tbch ) );
++        if ( !tbcd->Read( pS ) )
++            return false;
++    }
++    return true;
++}
++
++
++void
++TBC::Print(FILE* fp)
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] TBC -- dump\n", nOffSet );
++    tbch.Print( fp );
++    if ( tbcCmd.get() )
++        tbcCmd->Print( fp );    
++    if ( tbcd.get() )
++        tbcd->Print( fp );    
++}
++
++bool TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuToolbar )
++{
++    // how to identify built-in-command ?
++//    bool bBuiltin = false;
++    if ( tbcd.get() )
++    {
++        std::vector< css::beans::PropertyValue > props;
++/*
++        if ( bBuiltin )
++        {
++            rtl::OUString sCommand = helper.MSOCommandToOOCommand( cmdId );
++            if ( sCommand.getLength() > 0 )
++            {
++                beans::PropertyValue aProp;
++ 
++                aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
++                aProp.Value <<= sCommand;
++                props.push_back( aProp ); 
++            }
++         
++        }
++*/
++        bool bBeginGroup = false;
++        if ( ! tbcd->ImportToolBarControl( helper, props, bBeginGroup, bIsMenuToolbar ) )
++            return false;
++        TBCMenuSpecific* pMenu = tbcd->getMenuSpecific();
++        if ( pMenu )
++        {
++            // search for CTB with the appropriate name ( it contains the
++            // menu items, although we cannot import ( or create ) a menu on
++            // a custom toolbar we can import the menu items in a separate 
++            // toolbar ( better than nothing )
++            CTB* pCustTB = rWrapper.GetCustomizationData( pMenu->Name() );
++            if ( pCustTB )
++            {
++                 uno::Reference< container::XIndexContainer > xMenuDesc;
++                 uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++                 xMenuDesc.set( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.IndexedPropertyValues" ) ) ), uno::UNO_QUERY_THROW );
++                if ( !pCustTB->ImportMenuTB( rWrapper, xMenuDesc, helper ) )
++                    return false;     
++                OSL_TRACE("*** Read menu, no. items is %d", xMenuDesc->getCount() );
++                beans::PropertyValue aProp;
++		
++                aProp.Name =  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") );
++                aProp.Value <<= xMenuDesc;
++                props.push_back( aProp );
++            } 
++        }
++
++        if ( bBeginGroup )
++        {
++            // insert spacer
++            uno::Sequence< beans::PropertyValue > sProps( 1 );
++            sProps[ 0 ].Name =  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") );
++            sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE ); 
++            toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );        
++        }
++        uno::Sequence< beans::PropertyValue > sProps( props.size() );
++        beans::PropertyValue* pProp = sProps.getArray();
++   
++        for ( std::vector< css::beans::PropertyValue >::iterator it = props.begin(); it != props.end(); ++it, ++pProp )
++            *pProp = *it;
++
++        toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );        
++    }
++    return true;
++}
++
++void
++TBCCmd::Print(FILE* fp)
++{
++    Indent a;
++    indent_printf( fp, " TBCCmd -- dump\n" );
++    indent_printf( fp, "   cmdID 0x%x\n", cmdID );
++    indent_printf( fp, "   A ( fHideDrawing ) %s\n", A ? "true" : "false" );
++    indent_printf( fp, "   B ( reserved - ignored ) %s\n", A ? "true" : "false" );
++    indent_printf( fp, "   cmdType 0x%x\n", cmdType );
++    indent_printf( fp, "   C ( reserved - ignored ) %s\n", A ? "true" : "false" );
++    indent_printf( fp, "   reserved3 0x%x\n", reserved3 );
++}
++
++bool TBCCmd::Read( SvStream *pS )
++{
++    OSL_TRACE("TBCCmd::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();    
++    *pS >> cmdID;
++    sal_uInt16 temp;
++    *pS >> temp;
++    OSL_TRACE("TBCmd temp = 0x%x", temp );
++    A = (temp & 0x8000 ) == 0x8000; 
++    B = (temp & 0x4000) == 0x4000; 
++    cmdType = ( temp & 0x3E00 ) >> 9;
++    C = ( temp & 0x100 ) == 0x100; 
++    reserved3 = ( temp & 0xFF ); 
++    return true;
++}
++
++CTBWrapper::CTBWrapper()
++{
++}
++
++CTBWrapper::~CTBWrapper()
++{
++}
++
++bool 
++CTBWrapper::Read( SvStream *pS)
++{
++    OSL_TRACE("CTBWrapper::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();   
++    if ( !ctbSet.Read( pS ) )
++        return false;
++    for ( sal_uInt16 index = 0; index < ctbSet.ctb; ++index )
++    {
++        CTB aCTB( ctbSet.ctbViews );
++        if ( !aCTB.Read( pS ) )
++            return false;
++        rCTB.push_back( aCTB ); 
++    }
++    return true;
++}
++
++void 
++CTBWrapper::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] CTBWrapper -- dump\n", nOffSet );
++    ctbSet.Print( fp );
++    std::vector<CTB>::iterator it_end = rCTB.end();
++    for ( std::vector<CTB>::iterator it = rCTB.begin(); it != it_end; ++it )
++    {
++        Indent b;
++        it->Print( fp );
++    } 
++}
++
++CTB* CTBWrapper::GetCustomizationData( const rtl::OUString& sTBName )
++{
++    CTB* pCTB = NULL;
++    for ( std::vector< CTB >::iterator it = rCTB.begin(); it != rCTB.end(); ++it )
++    {
++        if ( it->GetName().equals( sTBName ) )
++        {
++            pCTB = &(*it);
++            break;
++        }
++    }
++    return pCTB;
++}
++
++bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh )
++{
++    std::vector<CTB>::iterator it_end = rCTB.end();
++    for ( std::vector<CTB>::iterator it = rCTB.begin(); it != it_end; ++it )
++    {
++        // for each customtoolbar
++        uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++        uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xAppCfgSupp( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) ) ), uno::UNO_QUERY_THROW ); 
++        CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument" ) ) ) );
++        helper.setMSOCommandMap( new  MSOExcelCommandConvertor() );
++        // Ignore menu toolbars, excel doesn't ( afaics ) store
++        // menu customizations ( but you can have menus in a customtoolbar
++        // such menus will be dealt with when they are encountered 
++        // as part of importing the appropriate MenuSpecific toolbar control )
++
++
++        if ( !(*it).IsMenuToolbar() ) 
++        {
++            if ( !(*it).ImportCustomToolBar( *this, helper ) )
++                return false;
++        }
++    } 
++    return true;
++}
++
++
+Index: sc/source/filter/excel/xecontent.cxx
+===================================================================
+--- sc/source/filter/excel/xecontent.cxx	(revision 276159)
++++ sc/source/filter/excel/xecontent.cxx	(revision 276288)
+@@ -519,12 +519,17 @@ void XclExpHyperlink::WriteBody( XclExpStream& rSt
+ {
+     sal_uInt16 nXclCol = static_cast< sal_uInt16 >( maScPos.Col() );
+     sal_uInt16 nXclRow = static_cast< sal_uInt16 >( maScPos.Row() );
+-    mxVarData->Seek( STREAM_SEEK_TO_BEGIN );
++    rStrm   << nXclRow << nXclRow << nXclCol << nXclCol;
++    WriteEmbeddedData( rStrm );
++}
+ 
+-    rStrm   << nXclRow << nXclRow << nXclCol << nXclCol
+-            << XclTools::maGuidStdLink
++void XclExpHyperlink::WriteEmbeddedData( XclExpStream& rStrm )
++{
++    rStrm << XclTools::maGuidStdLink
+             << sal_uInt32( 2 )
+             << mnFlags;
++
++    mxVarData->Seek( STREAM_SEEK_TO_BEGIN );
+     rStrm.CopyFromStream( *mxVarData );
+ }
+ 
+Index: sc/source/filter/excel/xltoolbar.hxx
+===================================================================
+--- sc/source/filter/excel/xltoolbar.hxx	(revision 0)
++++ sc/source/filter/excel/xltoolbar.hxx	(revision 276288)
+@@ -0,0 +1,95 @@
++#ifndef _XLTOOLBAR_HXX
++#define _XLTOOLBAR_HXX
++
++#include <svx/mstoolbar.hxx>
++
++namespace css = ::com::sun::star;
++
++class CTBWrapper;
++// hmm I don't normally use these packed structures
++// but.. hey always good to do something different
++class TBCCmd : public TBBase
++{
++public:
++    TBCCmd() : cmdID(0), A(0), B(0), cmdType(0), C(0), reserved3(0) {}
++    sal_uInt16 cmdID;
++    sal_uInt16 A:1;
++    sal_uInt16 B:1;
++    sal_uInt16 cmdType:5;
++    sal_uInt16 C:1;
++    sal_uInt16 reserved3:8;
++    bool Read( SvStream* pS );
++    void Print(FILE* fp);
++};
++
++class TBC : public TBBase
++{
++    TBCHeader tbch;
++    boost::shared_ptr<TBCCmd> tbcCmd; // optional
++    boost::shared_ptr<TBCData> tbcd;
++public:
++    TBC();
++    ~TBC(){}
++    void Print( FILE* );
++    bool Read(SvStream *pS);
++    bool ImportToolBarControl( CTBWrapper&, const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar );
++};
++ 
++class CTB : public TBBase
++{
++    sal_uInt16 nViews;
++    TB tb;
++    std::vector<TBVisualData> rVisualData;
++    sal_uInt32 ectbid;
++    std::vector< TBC > rTBC;
++    bool ImportCustomToolBar_Impl( CTBWrapper&, CustomToolBarImportHelper& );
++public:
++    CTB();
++    CTB(sal_uInt16);
++    ~CTB(){}
++    void Print( FILE* );
++    bool Read(SvStream *pS);
++    bool IsMenuToolbar();
++    bool ImportCustomToolBar( CTBWrapper&, CustomToolBarImportHelper& );
++    bool ImportMenuTB( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
++    rtl::OUString GetName() { return tb.getName().getString(); }
++
++
++};
++
++class CTBS : public TBBase
++{
++public:
++    sal_uInt8 bSignature;
++    sal_uInt8 bVersion;
++    sal_uInt16 reserved1;
++    sal_uInt16 reserved2;
++    sal_uInt16 reserved3;
++    sal_uInt16 ctb;
++    sal_uInt16 ctbViews;
++    sal_uInt16 ictbView;
++    CTBS(const CTBS&);
++    CTBS& operator = ( const CTBS&);
++    CTBS();
++    ~CTBS(){}
++    void Print( FILE* );
++    bool Read(SvStream *pS);
++};
++
++class CTBWrapper : public TBBase
++{
++    CTBS ctbSet;
++
++    std::vector< CTB > rCTB; 
++
++public:
++    CTBWrapper();
++    ~CTBWrapper();
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    bool ImportCustomToolBar( SfxObjectShell& rDocSh );
++    CTB* GetCustomizationData( const rtl::OUString& name );
++};
++
++
++#endif //_XLTOOLBAR_HXX
+Index: sc/source/filter/excel/excimp8.cxx
+===================================================================
+--- sc/source/filter/excel/excimp8.cxx	(revision 276159)
++++ sc/source/filter/excel/excimp8.cxx	(revision 276288)
+@@ -99,21 +99,27 @@
+ #include "stlpool.hxx"
+ #include "stlsheet.hxx"
+ #include "detfunc.hxx"
++#include "macromgr.hxx"
+ 
+ #include <com/sun/star/document/XDocumentProperties.hpp>
+ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
++#include <com/sun/star/script/ModuleInfo.hpp>
++#include <basic/basmgr.hxx>
++#include <cppuhelper/component_context.hxx>
+ 
+-
++#include <com/sun/star/container/XNameContainer.hpp>
++#include <sfx2/app.hxx>
++#include "xltoolbar.hxx"
+ using namespace com::sun::star;
+ 
+ 
+ #define	INVALID_POS		0xFFFFFFFF
+ 
++// defined in docfunc.cxx ( really this needs a new name )
++script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule );
+ 
+-
+-
+ ImportExcel8::ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ) :
+-    ImportExcel( rImpData, rStrm )
++    ImportExcel( rImpData, rStrm ), mnTab(0)
+ {
+ 	delete pFormConv;
+ 
+@@ -236,30 +242,27 @@ void ImportExcel8::Codename( BOOL bWorkbookGlobals
+         if( aName.Len() )
+         {
+             if( bWorkbookGlobals )
++            {
+                 GetExtDocOptions().GetDocSettings().maGlobCodeName = aName;
++                GetDoc().SetCodeName( aName );
++            }
+             else
++            {
+                 GetExtDocOptions().AppendCodeName( aName );
++                GetDoc().SetCodeName( GetCurrScTab(), aName );
+         }
+ 	}
+ }
++}
+ 
+ void ImportExcel8::SheetProtection( void )
+ {
+     GetSheetProtectBuffer().ReadOptions( aIn, GetCurrScTab() );
+ }
+ 
+-bool lcl_hasVBAEnabled()
+-{
+-	uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY);
+-		// test if vba service is present
+-	uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY );
+-	uno::Reference< uno::XInterface > xGlobals( xCtx->getValueByName( ::rtl::OUString::createFromAscii( "/singletons/ooo.vba.theGlobals") ), uno::UNO_QUERY );
+-
+-	return xGlobals.is();
+-}
+-
+ void ImportExcel8::ReadBasic( void )
+ {
++    //bHasBasic = TRUE;
+     bHasBasic = TRUE;
+ 
+     SfxObjectShell* pShell = GetDocShell();
+@@ -272,13 +275,57 @@ void ImportExcel8::ReadBasic( void )
+         bool bLoadStrg = pFilterOpt->IsLoadExcelBasicStorage();
+         if( bLoadCode || bLoadStrg )
+         {
++            uno::Any aGlobs;
++            uno::Sequence< uno::Any > aArgs(1);
++            aArgs[ 0 ] <<= pShell->GetModel();
++            aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "ooo.vba.excel.Globals"), aArgs );
++            pShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
+             SvxImportMSVBasic aBasicImport( *pShell, *xRootStrg, bLoadCode, bLoadStrg );
+-			bool bAsComment = !bLoadExecutable || !lcl_hasVBAEnabled();
+-            aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, bAsComment );
++	    bool bAsComment = !bLoadExecutable || !aGlobs.hasValue();
++            aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, AutoGeneratedCodeNames, bAsComment );
++            if ( !bAsComment )
++            {
++                GetObjectManager().SetOleNameOverrideInfo( aBasicImport.ControlNameForObjectId() );
++                ScDocument& rDoc = GetDoc();
++                rDoc.GetMacroManager()->InitUserFuncData();
++                // Fake ThisComponent being setup by Activate ( which is a view 
++                // related thing ), 
++                //  a) if another document is opened then in theory  ThisComponent
++                //     will be reset as before, 
++                //  b) when this document is  'really' Activated then ThisComponent
++                //     again will be set as before
++                // The only wrinkle seems if this document is loaded 'InVisible'
++                // but.. I don't see that this is possible from the vba API 
++                // I could be wrong though
++                // There may be implications setting the current component
++                // too early :-/ so I will just manually set the Basic Variables
++                //SfxObjectShell::SetCurrentComponent( pShell->GetModel() );
++                BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
++                if ( pAppMgr )
++                {
++                    uno::Any aModel = uno::makeAny( pShell->GetModel() );
++                    pAppMgr->SetGlobalUNOConstant( "ThisExcelDoc", aModel );
+         }
++#if 1
++                // see if we have the XCB stream
++                SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "XCB" ) ), STREAM_STD_READ | STREAM_NOCREATE  );
++                if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() )
++                {
++                    CTBWrapper wrapper;
++                    if ( wrapper.Read( xXCB ) )
++                    {
++#if DEBUG
++                        wrapper.Print( stderr ); 
++#endif
++                        wrapper.ImportCustomToolBar( *pShell );
+     }
+ }
++#endif
+ 
++            }
++        }
++    }
++}
+ 
+ void ImportExcel8::EndSheet( void )
+ {
+@@ -289,6 +336,10 @@ void ImportExcel8::EndSheet( void )
+ 
+ void ImportExcel8::PostDocLoad( void )
+ {
++    // delay reading basic until sheet object ( codenames etc. ) are read
++
++    if ( bHasBasic ) 
++        ReadBasic();
+     // #i11776# filtered ranges before outlines and hidden rows
+     if( pExcRoot->pAutoFilterBuffer )
+         pExcRoot->pAutoFilterBuffer->Apply();
+Index: sc/source/filter/excel/makefile.mk
+===================================================================
+--- sc/source/filter/excel/makefile.mk	(revision 276159)
++++ sc/source/filter/excel/makefile.mk	(revision 276288)
+@@ -106,7 +106,8 @@ SLOFILES =	\
+ 		$(SLO)$/xlstyle.obj					\
+ 		$(SLO)$/xltools.obj					\
+ 		$(SLO)$/xltracer.obj				\
+-		$(SLO)$/xlview.obj
++		$(SLO)$/xlview.obj \
++		$(SLO)$/xltoolbar.obj \
+ 
+ .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCSPARC"
+ NOOPTFILES = \
+@@ -154,7 +155,8 @@ EXCEPTIONSFILES = \
+ 		$(SLO)$/xlpivot.obj					\
+ 		$(SLO)$/xlroot.obj					\
+ 		$(SLO)$/xlstyle.obj					\
+-		$(SLO)$/xlview.obj
++		$(SLO)$/xlview.obj \
++		$(SLO)$/xltoolbar.obj \
+ 
+ # --- Targets -------------------------------------------------------
+ 
+Index: sc/source/filter/excel/xistyle.cxx
+===================================================================
+--- sc/source/filter/excel/xistyle.cxx	(revision 276159)
++++ sc/source/filter/excel/xistyle.cxx	(revision 276288)
+@@ -68,10 +68,70 @@
+ #include "root.hxx"
+ #include "colrowst.hxx"
+ 
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/container/XIndexAccess.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++using namespace ::com::sun::star;
++
++typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE;
++typedef ::std::vector< ColorData > ColorDataVec;
++
++class PaletteIndex : public XIndexAccess_BASE
++{
++public:
++    PaletteIndex( const ColorDataVec& rColorDataTable ) : maColorData( rColorDataTable ) {}
++
++    // Methods XIndexAccess
++    virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException)
++    {
++         return  maColorData.size();
++    }
++
++    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        //--Index;  // apparently the palette is already 1 based
++        return uno::makeAny( sal_Int32( maColorData[ Index ] ) );
++    }
++
++    // Methods XElementAcess
++    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
++    {
++        return ::getCppuType( (sal_Int32*)0 );
++    }
++    virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException)
++    {
++        return (maColorData.size() > 0);
++    }
++
++private:
++    ColorDataVec        maColorData; 
++};
++
++void
++XclImpPalette::ExportPalette()
++{
++    if( SfxObjectShell* pDocShell = mrRoot.GetDocShell() )
++    {
++        // copy values in color palette
++        sal_Int16 nColors =  maColorTable.size();
++        ColorDataVec aColors;
++        aColors.resize( nColors );
++        for( sal_uInt16 nIndex = 0; nIndex < nColors; ++nIndex )
++            aColors[ nIndex ] = GetColorData( nIndex );
++
++        uno::Reference< beans::XPropertySet > xProps( pDocShell->GetModel(), uno::UNO_QUERY );
++        if ( xProps.is() )
++        {
++            uno::Reference< container::XIndexAccess > xIndex( new PaletteIndex( aColors ) ); 
++            xProps->setPropertyValue( CREATE_OUSTRING("ColorPalette"), uno::makeAny( xIndex ) ); 
++        }
++    }
++            
++}
+ // PALETTE record - color information =========================================
+ 
+ XclImpPalette::XclImpPalette( const XclImpRoot& rRoot ) :
+-    XclDefaultPalette( rRoot )
++    XclDefaultPalette( rRoot ), mrRoot( rRoot )
+ {
+ }
+ 
+@@ -105,6 +165,7 @@ void XclImpPalette::ReadPalette( XclImpStream& rSt
+         rStrm >> aColor;
+         maColorTable[ nIndex ] = aColor.GetColor();
+     }
++    ExportPalette();
+ }
+ 
+ // FONT record - font information =============================================
+Index: sc/source/filter/excel/xeescher.cxx
+===================================================================
+--- sc/source/filter/excel/xeescher.cxx	(revision 276159)
++++ sc/source/filter/excel/xeescher.cxx	(revision 276288)
+@@ -66,6 +66,9 @@
+ #include "xelink.hxx"
+ #include "xename.hxx"
+ #include "xestyle.hxx"
++#include "userdat.hxx"
++#include "drwlayer.hxx"
++#include "svx/unoapi.hxx"
+ 
+ #include <oox/core/tokens.hxx>
+ 
+@@ -333,7 +336,7 @@ void XclExpOcxControlObj::WriteSubRecs( XclExpStre
+ 
+ XclExpTbxControlObj::XclExpTbxControlObj( const XclExpRoot& rRoot, Reference< XShape > xShape ) :
+     XclObj( rRoot, EXC_OBJTYPE_UNKNOWN, true ),
+-    XclExpControlHelper( rRoot ),
++    XclMacroHelper( rRoot ),
+     mnHeight( 0 ),
+     mnState( 0 ),
+     mnLineCount( 0 ),
+@@ -583,6 +586,8 @@ XclExpTbxControlObj::XclExpTbxControlObj( const Xc
+ 
+ bool XclExpTbxControlObj::SetMacroLink( const ScriptEventDescriptor& rEvent )
+ {
++    return XclMacroHelper::SetMacroLink( rEvent, meEventType );
++/*
+     String aMacroName = XclControlHelper::ExtractFromMacroDescriptor( rEvent, meEventType );
+     if( aMacroName.Len() )
+     {
+@@ -592,6 +597,7 @@ bool XclExpTbxControlObj::SetMacroLink( const Scri
+         return true;
+     }
+     return false;
++*/
+ }
+ 
+ void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
+@@ -730,12 +736,6 @@ void XclExpTbxControlObj::WriteSubRecs( XclExpStre
+     }
+ }
+ 
+-void XclExpTbxControlObj::WriteMacroSubRec( XclExpStream& rStrm )
+-{
+-    if( mxMacroLink.is() )
+-        WriteFormulaSubRec( rStrm, EXC_ID_OBJMACRO, *mxMacroLink );
+-}
+-
+ void XclExpTbxControlObj::WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId )
+ {
+     if( const XclTokenArray* pCellLink = GetCellLinkTokArr() )
+@@ -764,6 +764,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream&
+ 
+ #endif
+ 
++
+ // ----------------------------------------------------------------------------
+ 
+ XclExpChartObj::XclExpChartObj( const XclExpRoot& rRoot, Reference< XShape > xShape ) :
+@@ -909,6 +910,7 @@ void XclExpNote::Save( XclExpStream& rStrm )
+     }
+ }
+ 
++
+ void XclExpNote::WriteBody( XclExpStream& rStrm )
+ {
+     // BIFF5/BIFF7 is written separately
+@@ -945,6 +947,70 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, Xc
+ 
+ // ============================================================================
+ 
++XclMacroHelper::XclMacroHelper( const XclExpRoot& rRoot ) :
++    XclExpControlHelper( rRoot )
++{
++}
++
++XclMacroHelper::~XclMacroHelper()
++{
++}
++
++void XclMacroHelper::WriteMacroSubRec( XclExpStream& rStrm )
++{
++    if( mxMacroLink.is() )
++        WriteFormulaSubRec( rStrm, EXC_ID_OBJMACRO, *mxMacroLink );
++}
++
++bool 
++XclMacroHelper::SetMacroLink( const ScriptEventDescriptor& rEvent, const XclTbxEventType& nEventType )
++{
++    String aMacroName = XclControlHelper::ExtractFromMacroDescriptor( rEvent, nEventType );
++    if( aMacroName.Len() )
++    {
++        return SetMacroLink( aMacroName );
++    }
++    return false;
++}
++
++bool
++XclMacroHelper::SetMacroLink( const String& rMacroName )
++{
++    OSL_TRACE("SetMacroLink( macroname:=%s )", rtl::OUStringToOString( rMacroName, RTL_TEXTENCODING_UTF8 ).getStr() );
++    if( rMacroName.Len() )
++    {
++        sal_uInt16 nExtSheet = GetLocalLinkManager().FindExtSheet( EXC_EXTSH_OWNDOC );
++        sal_uInt16 nNameIdx = GetNameManager().InsertMacroCall( rMacroName, true, false );
++        mxMacroLink = GetFormulaCompiler().CreateNameXFormula( nExtSheet, nNameIdx );
++        return true;
++    }
++    return false;
++}
++
++XclExpShapeObj::XclExpShapeObj( const XclExpRoot& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ) : 
++    XclObjAny( rRoot ),
++    XclMacroHelper( rRoot )
++{
++    if( SdrObject* pSdrObj = ::GetSdrObjectFromXShape( xShape ) )
++    {
++        ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pSdrObj );
++        if ( pInfo && pInfo->GetMacro().getLength() )
++            SetMacroLink( XclControlHelper::GetXclMacroName( pInfo->GetMacro() ) ); 
++    }
++}
++
++XclExpShapeObj::~XclExpShapeObj()
++{
++}
++
++void XclExpShapeObj::WriteSubRecs( XclExpStream& rStrm )
++{
++    XclObjAny::WriteSubRecs( rStrm );
++    WriteMacroSubRec( rStrm );
++}
++
++// ============================================================================
++
+ XclExpComments::XclExpComments( SCTAB nTab, XclExpRecordList< XclExpNote >& rNotes )
+     : mnTab( nTab ), mrNotes( rNotes )
+ {
+Index: sc/source/filter/excel/xiescher.cxx
+===================================================================
+--- sc/source/filter/excel/xiescher.cxx	(revision 276159)
++++ sc/source/filter/excel/xiescher.cxx	(revision 276288)
+@@ -116,6 +116,8 @@
+ #include "xipage.hxx"
+ #include "xichart.hxx"
+ #include "xicontent.hxx"
++#include "scextopt.hxx"
++
+ #include "namebuff.hxx"
+ 
+ using ::rtl::OUString;
+@@ -399,11 +401,16 @@ void XclImpDrawObjBase::SetAnchor( const XclObjAnc
+ 
+ String XclImpDrawObjBase::GetObjName() const
+ {
++    String sName( GetObjectManager().GetOleNameOverride( GetObjId() ) );
++  
++    
+     /*  #118053# #i51348# Always return a non-empty name. Create English
+         default names depending on the object type. This is not implemented as
+         virtual functions in derived classes, as class type and object type may
+         not match. */
+-    return (maObjName.Len() > 0) ? maObjName : GetObjectManager().GetDefaultObjName( *this );
++    if ( sName.Len() == 0 )
++        sName = ( (maObjName.Len() > 0) ? maObjName : GetObjectManager().GetDefaultObjName( *this ) );
++    return sName;
+ }
+ 
+ bool XclImpDrawObjBase::IsValidSize( const Rectangle& rAnchorRect ) const
+@@ -483,20 +490,15 @@ void XclImpDrawObjBase::ProcessSdrObject( SdrObjec
+     }
+ 
+     // macro and hyperlink
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-    if( mbSimpleMacro && ((maMacroName.Len() > 0) || (maHyperlink.getLength() > 0)) )
++    if( mbSimpleMacro && ((maMacroName.Len() > 0) ||
++ (maHyperlink.Len() > 0)) )
+     {
+         if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, TRUE ) )
+         {
+-            pInfo->SetMacro( XclControlHelper::GetScMacroName( maMacroName ) );
++            pInfo->SetMacro( XclControlHelper::GetScMacroName( maMacroName, GetDocShell() ) );
+             pInfo->SetHlink( maHyperlink );
+         }
+     }
+-#else
+-    if( mbSimpleMacro && (maMacroName.Len() > 0) )
+-        if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, TRUE ) )
+-            pInfo->SetMacro( XclControlHelper::GetScMacroName( maMacroName ) );
+-#endif
+ 
+     // call virtual function for object type specific processing
+     DoProcessSdrObj( rSdrObj );
+@@ -1686,21 +1688,14 @@ SdrObject* XclImpControlHelper::CreateSdrObjectFro
+     return xSdrObj.release();
+ }
+ 
+-void XclImpControlHelper::ProcessControl( const XclImpDrawObjBase& rDrawObj ) const
++void XclImpControlHelper::ApplySheetLinkProps() const
+ {
++
+     Reference< XControlModel > xCtrlModel = XclControlHelper::GetControlModel( mxShape );
+     if( !xCtrlModel.is() )
+         return;
+-
+     ScfPropertySet aPropSet( xCtrlModel );
+ 
+-    // #118053# #i51348# set object name at control model
+-    aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rDrawObj.GetObjName() );
+-
+-    // control visible and printable?
+-    aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() );
+-    aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), rDrawObj.IsPrintable() );
+-
+     // sheet links
+     if( SfxObjectShell* pDocShell = mrRoot.GetDocShell() )
+     {
+@@ -1764,7 +1759,26 @@ SdrObject* XclImpControlHelper::CreateSdrObjectFro
+             }
+         }
+     }
++}
+ 
++void XclImpControlHelper::ProcessControl( const XclImpDrawObjBase& rDrawObj ) const
++{
++    Reference< XControlModel > xCtrlModel = XclControlHelper::GetControlModel( mxShape );
++    if( !xCtrlModel.is() )
++        return;
++
++    ApplySheetLinkProps();
++
++    ScfPropertySet aPropSet( xCtrlModel );
++
++    // #118053# #i51348# set object name at control model
++    aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rDrawObj.GetObjName() );
++
++    // control visible and printable?
++    aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() );
++    aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), rDrawObj.IsPrintable() );
++
++ 
+     // virtual call for type specific processing
+     DoProcessControl( aPropSet );
+ }
+@@ -1858,7 +1872,7 @@ void XclImpTbxObjBase::SetDffProperties( const Dff
+ 
+ bool XclImpTbxObjBase::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor ) const
+ {
+-    return XclControlHelper::FillMacroDescriptor( rDescriptor, DoGetEventType(), GetMacroName() );
++    return XclControlHelper::FillMacroDescriptor( rDescriptor, DoGetEventType(), GetMacroName(), GetDocShell() );
+ }
+ 
+ void XclImpTbxObjBase::ConvertFont( ScfPropertySet& rPropSet ) const
+@@ -2095,7 +2109,46 @@ void XclImpOptionButtonObj::DoProcessControl( ScfP
+ {
+     XclImpCheckBoxObj::DoProcessControl( rPropSet );
+     // TODO: grouping
++    XclImpOptionButtonObj* pTbxObj = dynamic_cast< XclImpOptionButtonObj* >( GetObjectManager().FindDrawObj( XclObjId( GetScTab(), mnNextInGroup ) ).get() );
++    if ( ( pTbxObj && pTbxObj->mnFirstInGroup ) )
++    {
++        // Group has terminated
++        // traverse each RadioButton in group and 
++        //     a) apply the groupname 
++        //     b) propagate the linked cell from the lead radiobutton
++        //     c) apply the correct Ref value
++        XclImpOptionButtonObj* pLeader = pTbxObj;
++ ;
++        sal_Int32 nRefVal = 1;
++        OSL_TRACE( "0x%x start group ", pLeader->GetObjId().mnObjId );
++        do 
++        {
++           
++            Reference< XControlModel > xCtrlModel = XclControlHelper::GetControlModel( pTbxObj->mxShape );
++            if ( xCtrlModel.is() )
++            {
++                ScfPropertySet aProps( xCtrlModel );
++                rtl::OUString sGroupName = rtl::OUString::valueOf( static_cast< sal_Int32 >( pLeader->GetDffShapeId() ) );
++
++                aProps.SetStringProperty( CREATE_OUSTRING( "GroupName" ), sGroupName );
++                aProps.SetStringProperty( CREATE_OUSTRING( "RefValue" ), rtl::OUString::valueOf( nRefVal++ ) );
++                if ( pLeader->HasCellLink() && !pTbxObj->HasCellLink() )
++                {
++                    // propagate cell link info
++                    pTbxObj->mxCellLink.reset( new ScAddress( *pLeader->mxCellLink.get() ) );                
++                    pTbxObj->ApplySheetLinkProps();
+ }
++                pTbxObj = dynamic_cast< XclImpOptionButtonObj* >( GetObjectManager().FindDrawObj( XclObjId( GetScTab(), pTbxObj->mnNextInGroup ) ).get() );
++            }
++            else
++                pTbxObj = NULL;
++        } while ( pTbxObj && !( pTbxObj->mnFirstInGroup == 1 ) );
++    }
++    else
++    {
++        // not the leader? try and find it
++    }
++}
+ 
+ OUString XclImpOptionButtonObj::DoGetServiceName() const
+ {
+@@ -3036,6 +3089,23 @@ XclImpDffManager::~XclImpDffManager()
+ {
+ }
+ 
++String XclImpObjectManager::GetOleNameOverride( const XclObjId& nObjId )
++{
++    String sOleName; 
++    String sCodeName = GetExtDocOptions().GetCodeName( nObjId.mnScTab );
++    
++    CodeNameToCntrlObjIdInfo::iterator it = maOleCtrlNameOverride.find( sCodeName );
++    if ( it != maOleCtrlNameOverride.end() )
++    {
++        CntrlObjIdToName::iterator it_id = it->second.find( nObjId.mnObjId );
++        if ( it_id != it->second.end() )
++        {
++            sOleName = it_id->second;
++        }
++    }
++    return sOleName;
++}
++
+ void XclImpDffManager::StartProgressBar( sal_Size nProgressSize )
+ {
+     mxProgress.reset( new ScfProgressBar( GetDocShell(), STR_PROGRESS_CALCULATING ) );
+@@ -3511,27 +3581,27 @@ XclImpObjectManager::XclImpObjectManager( const Xc
+     XclImpRoot( rRoot )
+ {
+     maDefObjNames[ EXC_OBJTYPE_GROUP ]          = CREATE_STRING( "Group" );
+-    maDefObjNames[ EXC_OBJTYPE_LINE ]           = CREATE_STRING( "Line" );
+-    maDefObjNames[ EXC_OBJTYPE_RECTANGLE ]      = CREATE_STRING( "Rectangle" );
+-    maDefObjNames[ EXC_OBJTYPE_OVAL ]           = CREATE_STRING( "Oval" );
++    maDefObjNames[ EXC_OBJTYPE_LINE ]           = ScGlobal::GetRscString( STR_SHAPE_LINE );
++    maDefObjNames[ EXC_OBJTYPE_RECTANGLE ]      = ScGlobal::GetRscString( STR_SHAPE_RECTANGLE );
++    maDefObjNames[ EXC_OBJTYPE_OVAL ]           = ScGlobal::GetRscString( STR_SHAPE_OVAL );
+     maDefObjNames[ EXC_OBJTYPE_ARC ]            = CREATE_STRING( "Arc" );
+     maDefObjNames[ EXC_OBJTYPE_CHART ]          = CREATE_STRING( "Chart" );
+     maDefObjNames[ EXC_OBJTYPE_TEXT ]           = CREATE_STRING( "Text" );
+-    maDefObjNames[ EXC_OBJTYPE_BUTTON ]         = CREATE_STRING( "Button" );
++    maDefObjNames[ EXC_OBJTYPE_BUTTON ]         =  ScGlobal::GetRscString( STR_FORM_BUTTON );
+     maDefObjNames[ EXC_OBJTYPE_PICTURE ]        = CREATE_STRING( "Picture" );
+     maDefObjNames[ EXC_OBJTYPE_POLYGON ]        = CREATE_STRING( "Freeform" );
+-    maDefObjNames[ EXC_OBJTYPE_CHECKBOX ]       = CREATE_STRING( "Check Box" );
+-    maDefObjNames[ EXC_OBJTYPE_OPTIONBUTTON ]   = CREATE_STRING( "Option Button" );
++    maDefObjNames[ EXC_OBJTYPE_CHECKBOX ]       = ScGlobal::GetRscString( STR_FORM_CHECKBOX ); 
++    maDefObjNames[ EXC_OBJTYPE_OPTIONBUTTON ]   = ScGlobal::GetRscString( STR_FORM_OPTIONBUTTON );
+     maDefObjNames[ EXC_OBJTYPE_EDIT ]           = CREATE_STRING( "Edit Box" );
+-    maDefObjNames[ EXC_OBJTYPE_LABEL ]          = CREATE_STRING( "Label" );
++    maDefObjNames[ EXC_OBJTYPE_LABEL ]          = ScGlobal::GetRscString( STR_FORM_LABEL );
+     maDefObjNames[ EXC_OBJTYPE_DIALOG ]         = CREATE_STRING( "Dialog Frame" );
+-    maDefObjNames[ EXC_OBJTYPE_SPIN ]           = CREATE_STRING( "Spinner" );
+-    maDefObjNames[ EXC_OBJTYPE_SCROLLBAR ]      = CREATE_STRING( "Scroll Bar" );
+-    maDefObjNames[ EXC_OBJTYPE_LISTBOX ]        = CREATE_STRING( "List Box" );
+-    maDefObjNames[ EXC_OBJTYPE_GROUPBOX ]       = CREATE_STRING( "Group Box" );
+-    maDefObjNames[ EXC_OBJTYPE_DROPDOWN ]       = CREATE_STRING( "Drop Down" );
++    maDefObjNames[ EXC_OBJTYPE_SPIN ]           = ScGlobal::GetRscString( STR_FORM_SPINNER );
++    maDefObjNames[ EXC_OBJTYPE_SCROLLBAR ]      = ScGlobal::GetRscString( STR_FORM_SCROLLBAR );
++    maDefObjNames[ EXC_OBJTYPE_LISTBOX ]        = ScGlobal::GetRscString( STR_FORM_LISTBOX );
++    maDefObjNames[ EXC_OBJTYPE_GROUPBOX ]       = ScGlobal::GetRscString( STR_FORM_GROUPBOX );
++    maDefObjNames[ EXC_OBJTYPE_DROPDOWN ]       = ScGlobal::GetRscString( STR_FORM_DROPDOWN );
+     maDefObjNames[ EXC_OBJTYPE_NOTE ]           = CREATE_STRING( "Comment" );
+-    maDefObjNames[ EXC_OBJTYPE_DRAWING ]        = CREATE_STRING( "AutoShape" );
++    maDefObjNames[ EXC_OBJTYPE_DRAWING ]        = ScGlobal::GetRscString( STR_SHAPE_AUTOSHAPE );
+ }
+ 
+ XclImpObjectManager::~XclImpObjectManager()
+Index: sc/source/filter/excel/read.cxx
+===================================================================
+--- sc/source/filter/excel/read.cxx	(revision 276159)
++++ sc/source/filter/excel/read.cxx	(revision 276288)
+@@ -804,6 +804,12 @@ FltError ImportExcel8::Read( void )
+     ::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
+         aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
+ 
++    bool bSheetHasCodeName = false;
++
++    std::vector< String > CodeNames;
++
++    std::vector < SCTAB > nTabsWithNoCodeName;
++
+     while( eAkt != EXC_STATE_END )
+ 	{
+ 		aIn.StartNextRecord();
+@@ -871,6 +877,7 @@ FltError ImportExcel8::Read( void )
+                         // #i62752# possible to have BIFF8 sheet without globals
+                         NeueTabelle();
+                         eAkt = EXC_STATE_SHEET_PRE;  // Shrfmla Prefetch, Row-Prefetch
++                        bSheetHasCodeName = false; // reset
+                         aIn.StoreGlobalPosition();
+                     }
+                 }
+@@ -945,7 +952,8 @@ FltError ImportExcel8::Read( void )
+ 					case 0x22:	Rec1904(); break;		// 1904			[ 2345   ]
+ 					case 0x56:	Builtinfmtcnt(); break;	// BUILTINFMTCNT[  34    ]
+ 					case 0x8D:	Hideobj(); break;		// HIDEOBJ		[  345   ]
+-					case 0xD3:	ReadBasic(); break;
++					case 0xD3:	/*ReadBasic()*/bHasBasic = true; break;
++//					case 0xD3:	ReadBasic(); break;
+                     case 0xDE:  Olesize(); break;
+ 					case 0x01BA: Codename( TRUE ); break;
+ 
+@@ -1042,9 +1050,30 @@ FltError ImportExcel8::Read( void )
+                     case EXC_ID3_DIMENSIONS:    ReadDimensions();                       break;
+ 
+                     case 0x0A:                          // EOF          [ 2345   ]
++                    {
+                         eAkt = EXC_STATE_SHEET;
++                        String sName;
++                        GetDoc().GetName( GetCurrScTab(), sName );
++                        if ( !bSheetHasCodeName )
++                        {
++                            nTabsWithNoCodeName.push_back( GetCurrScTab() );
++                            OSL_TRACE("No Codename for %d", GetCurrScTab() );
++                        }
++                        else
++                        {
++                            String sCodeName;
++                            GetDoc().GetCodeName( GetCurrScTab(), sCodeName );
++                            OSL_TRACE("Have CodeName %s for SheetName %s",
++                                rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(),  rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() );
++                            CodeNames.push_back( sCodeName );
++                        }
++
++                        bSheetHasCodeName = false; // reset
++
++
+                         aIn.SeekGlobalPosition();         // und zurueck an alte Position
+                         break;
++                    }
+                     case 0x12:  SheetProtect(); break;
+                     case 0x13:  SheetPassword(); break;
+                     case 0x42:  Codepage(); break;      // CODEPAGE     [ 2345   ]
+@@ -1056,7 +1085,7 @@ FltError ImportExcel8::Read( void )
+                     case 0x9B:  FilterMode(); break;    // FILTERMODE
+                     case 0x9D:  AutoFilterInfo(); break;// AUTOFILTERINFO
+                     case 0x9E:  AutoFilter(); break;    // AUTOFILTER
+-                    case 0x01BA: Codename( FALSE ); break;
++                    case 0x01BA: Codename( FALSE ); bSheetHasCodeName = true; break;
+                     case 0x0208: Row34(); break;        // ROW          [  34    ]
+                     case 0x0021:
+                     case 0x0221: Array34(); break;      // ARRAY        [  34    ]
+@@ -1162,6 +1191,42 @@ FltError ImportExcel8::Read( void )
+ 
+     if( eLastErr == eERR_OK )
+     {
++        // In some strange circumstances a the codename might be missing
++        // # Create any missing Sheet CodeNames
++        std::vector < SCTAB >::iterator it_end = nTabsWithNoCodeName.end();
++        for ( std::vector < SCTAB >::iterator it = nTabsWithNoCodeName.begin(); it != it_end; ++it )
++        {
++            bool bGotCodeName = false;
++            SCTAB nTab = 1;
++            OSL_TRACE("Trying to find suitable codename for %d", *it );
++            while ( true )
++            {
++                String sTmpName( RTL_CONSTASCII_USTRINGPARAM("Sheet" ) );
++                sTmpName += String::CreateFromInt32( sal_Int32(nTab++) );
++                std::vector< String >::iterator codeName_It = CodeNames.begin();
++                std::vector< String >::iterator codeName_It_end = CodeNames.end();
++                // search for codename
++                for ( ; codeName_It != codeName_It_end; ++codeName_It )
++                {
++                    if ( *codeName_It == sTmpName )
++                        break;
++                }
++
++                if ( codeName_It == codeName_It_end ) // generated codename not found
++                {
++                    OSL_TRACE("Using generated codename %s", rtl::OUStringToOString( sTmpName, RTL_TEXTENCODING_UTF8 ).getStr() );
++                    // Set new codename
++                    GetDoc().SetCodeName( *it, sTmpName );
++                    // Record newly used codename
++                    CodeNames.push_back( sTmpName );
++                    // Record those we have created so they can be created in
++                    // basic
++                    AutoGeneratedCodeNames.push_back( sTmpName );
++                    break;
++                }
++            }
++            
++        }
+         // #i45843# Convert pivot tables before calculation, so they are available
+         // for the GETPIVOTDATA function.
+         if( GetBiff() == EXC_BIFF8 )
+Index: sc/source/filter/excel/xlescher.cxx
+===================================================================
+--- sc/source/filter/excel/xlescher.cxx	(revision 276159)
++++ sc/source/filter/excel/xlescher.cxx	(revision 276288)
+@@ -38,7 +38,15 @@
+ #include "document.hxx"
+ #include "xistream.hxx"
+ #include "xlescher.hxx"
++#include "globstr.hrc"
+ 
++#include <sfx2/objsh.hxx>
++#include <basic/sbstar.hxx>
++#include <basic/sbmod.hxx>
++#include <basic/sbmeth.hxx>
++#include <basic/basmgr.hxx>
++#include <svx/msvbahelper.hxx>
++
+ using ::rtl::OUString;
+ using ::com::sun::star::uno::Reference;
+ using ::com::sun::star::uno::UNO_QUERY;
+@@ -301,10 +309,16 @@ Reference< XControlModel > XclControlHelper::GetCo
+ #define EXC_MACRONAME_PRE "vnd.sun.star.script:Standard."
+ #define EXC_MACRONAME_SUF "?language=Basic&location=document"
+ 
+-OUString XclControlHelper::GetScMacroName( const String& rXclMacroName )
++OUString XclControlHelper::GetScMacroName( const String& rXclMacroName, SfxObjectShell* pDocShell )
+ {
++    String sTmp( rXclMacroName );
+     if( rXclMacroName.Len() > 0 )
+-        return CREATE_OUSTRING( EXC_MACRONAME_PRE ) + rXclMacroName + CREATE_OUSTRING( EXC_MACRONAME_SUF );
++    {
++        ooo::vba::VBAMacroResolvedInfo aMacro = ooo::vba::resolveVBAMacro( pDocShell, rXclMacroName, false );
++        if ( aMacro.IsResolved() )
++            return ooo::vba::makeMacroURL( aMacro.ResolvedMacro() );
++
++    }
+     return OUString();
+ }
+ 
+@@ -338,14 +352,14 @@ spTbxListenerData[] =
+ #define EXC_MACROSCRIPT "Script"
+ 
+ bool XclControlHelper::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor,
+-        XclTbxEventType eEventType, const String& rXclMacroName )
++        XclTbxEventType eEventType, const String& rXclMacroName, SfxObjectShell* pShell )
+ {
+     if( rXclMacroName.Len() > 0 )
+     {
+         rDescriptor.ListenerType = OUString::createFromAscii( spTbxListenerData[ eEventType ].mpcListenerType );
+         rDescriptor.EventMethod = OUString::createFromAscii( spTbxListenerData[ eEventType ].mpcEventMethod );
+         rDescriptor.ScriptType = CREATE_OUSTRING( EXC_MACROSCRIPT );
+-        rDescriptor.ScriptCode = GetScMacroName( rXclMacroName );
++        rDescriptor.ScriptCode = GetScMacroName( rXclMacroName, pShell );
+         return true;
+     }
+     return false;
+Index: sc/source/filter/xml/xmlexprt.cxx
+===================================================================
+--- sc/source/filter/xml/xmlexprt.cxx	(revision 276159)
++++ sc/source/filter/xml/xmlexprt.cxx	(revision 276288)
+@@ -3126,7 +3126,34 @@ void ScXMLExport::ExportShape(const uno::Reference
+ 		}
+ 	}
+ 	if (!bIsChart)
++	{
++		// #i66550 HLINK_FOR_SHAPES
++		rtl::OUString sHlink;
++		uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
++		if ( xProps.is() )
++			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink;
++
++		std::auto_ptr< SvXMLElementExport > pDrawA;
++		// enlose shapes with <draw:a> element only if sHlink contains something
++		if ( sHlink.getLength() > 0 )
++		{
++			// need to get delete the attributes that are pre-loaded
++			// for the shape export ( otherwise they will become 	
++			// attributes of the draw:a element ) This *shouldn't* 
++			// affect performance adversely as there are only a 
++			// couple of attributes involved
++			uno::Reference< xml::sax::XAttributeList > xSaveAttribs( new  SvXMLAttributeList( GetAttrList() ) );
++			ClearAttrList();
++			// Add Hlink	
++			AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
++			AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sHlink);
++			pDrawA.reset( new SvXMLElementExport( *this, XML_NAMESPACE_DRAW, XML_A, sal_False, sal_False ) );
++			// Attribute list has been cleared by previous operation
++			// re-add pre-loaded attributes
++			AddAttributeList( xSaveAttribs );
++		}
+ 		GetShapeExport()->exportShape(xShape, SEF_DEFAULT, pPoint);
++	}
+ 	IncrementProgressBar(sal_False);
+ }
+ 
+Index: sc/source/filter/xcl97/xcl97esc.cxx
+===================================================================
+--- sc/source/filter/xcl97/xcl97esc.cxx	(revision 276159)
++++ sc/source/filter/xcl97/xcl97esc.cxx	(revision 276288)
+@@ -57,6 +57,9 @@
+ #include "global.hxx"
+ #include "document.hxx"
+ #include "drwlayer.hxx"
++#include "xecontent.hxx"
++#include <svx/flditem.hxx>
++#include "userdat.hxx"
+ #include "xcl97rec.hxx"
+ #include "xehelper.hxx"
+ #include "xechart.hxx"
+@@ -232,7 +235,8 @@ EscherExHostAppData* XclEscherEx::StartShape( cons
+         {
+             // #107540# ignore permanent note shapes
+             // #i12190# do not ignore callouts (do not filter by object type ID)
+-            pCurrXclObj = new XclObjAny( GetRoot() );   // just a metafile
++            pCurrXclObj = ShapeInteractionHelper::CreateShapeObj( GetRoot(), rShape );
++            ShapeInteractionHelper::PopulateShapeInteractionInfo( GetRoot(), rShape, *pCurrAppData );
+         }
+ 	}
+ 	if ( pCurrXclObj )
+@@ -345,6 +349,7 @@ void XclEscherEx::DeleteCurrAppData()
+ 		delete pCurrAppData->GetClientAnchor();
+ //		delete pCurrAppData->GetClientData();
+ 		delete pCurrAppData->GetClientTextbox();
++		delete pCurrAppData->GetInteractionInfo();
+ 		delete pCurrAppData;
+ 	}
+ }
+@@ -576,4 +581,40 @@ void XclEscherClientTextbox::WriteData( EscherEx&
+     pXclObj->SetText( GetRoot(), rTextObj );
+ }
+ 
++XclExpShapeObj* 
++ShapeInteractionHelper::CreateShapeObj(const XclExpRoot& rRoot, const Reference< XShape >& xShape )
++{
++    return new XclExpShapeObj( rRoot, xShape );
++}
+ 
++void
++ShapeInteractionHelper::PopulateShapeInteractionInfo(const XclExpRoot& rRoot, const Reference< XShape >& xShape, EscherExHostAppData& rHostAppData )
++{
++   try
++   {
++      SvMemoryStream* pMemStrm = NULL;
++      rtl::OUString sHyperLink;
++      rtl::OUString sMacro;
++      if ( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( ::GetSdrObjectFromXShape( xShape ) ) )
++      {
++         sHyperLink = pInfo->GetHlink();      
++         sMacro = pInfo->GetMacro();
++      }
++      if (  sHyperLink.getLength() > 0 )
++      {
++         pMemStrm = new SvMemoryStream();
++         XclExpStream tmpStream( *pMemStrm, rRoot );
++         ScAddress dummyAddress;
++         SvxURLField aUrlField;
++         aUrlField.SetURL( sHyperLink );
++         XclExpHyperlink hExpHlink( rRoot, aUrlField, dummyAddress );
++         hExpHlink.WriteEmbeddedData( tmpStream );
++      }
++      if ( ( sHyperLink.getLength() > 0 ) || ( sMacro.getLength() > 0 ) )
++          rHostAppData.SetInteractionInfo( new InteractionInfo( pMemStrm, true ) );
++   }
++   catch( Exception& )
++   {
++   }
++}
++
+Index: sc/source/filter/inc/xlescher.hxx
+===================================================================
+--- sc/source/filter/inc/xlescher.hxx	(revision 276159)
++++ sc/source/filter/inc/xlescher.hxx	(revision 276288)
+@@ -432,7 +432,8 @@ class XclControlHelper
+                         GetControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+ 
+     /** Returns the Calc macro name from an Excel macro name. */
+-    static ::rtl::OUString GetScMacroName( const String& rXclMacroName );
++    static ::rtl::OUString GetScMacroName( const String& rXclMacroName, SfxObjectShell* pShell = NULL );
++
+     /** Returns the Excel macro name from a Calc macro name. */
+     static String       GetXclMacroName( const ::rtl::OUString& rScMacroName );
+ 
+@@ -440,7 +441,7 @@ class XclControlHelper
+     static bool         FillMacroDescriptor(
+                             ::com::sun::star::script::ScriptEventDescriptor& rDescriptor,
+                             XclTbxEventType eEventType,
+-                            const String& rXclMacroName );
++                            const String& rXclMacroName, SfxObjectShell* pShell = NULL );
+     /** Tries to extract an Excel macro name from the passed macro descriptor. */
+     static String       ExtractFromMacroDescriptor(
+                             const ::com::sun::star::script::ScriptEventDescriptor& rDescriptor,
+Index: sc/source/filter/inc/xecontent.hxx
+===================================================================
+--- sc/source/filter/inc/xecontent.hxx	(revision 276159)
++++ sc/source/filter/inc/xecontent.hxx	(revision 276288)
+@@ -116,6 +116,8 @@ class XclExpHyperlink : public XclExpRecord
+     inline const String* GetRepr() const { return mxRepr.get(); }
+ 
+     virtual void        SaveXml( XclExpXmlStream& rStrm );
++
++    virtual void        WriteEmbeddedData( XclExpStream& rStrm );
+ private:
+     /** Builds file name from the passed file URL. Tries to convert to relative file name.
+         @param rnLevel  (out-param) The parent directory level.
+Index: sc/source/filter/inc/xcl97rec.hxx
+===================================================================
+--- sc/source/filter/inc/xcl97rec.hxx	(revision 276159)
++++ sc/source/filter/inc/xcl97rec.hxx	(revision 276288)
+@@ -285,7 +285,7 @@ class XclObjOle : public XclObj
+ 
+ class XclObjAny : public XclObj
+ {
+-private:
++protected:
+     virtual void                WriteSubRecs( XclExpStream& rStrm );
+ 
+ public:
+Index: sc/source/filter/inc/xistyle.hxx
+===================================================================
+--- sc/source/filter/inc/xistyle.hxx	(revision 276159)
++++ sc/source/filter/inc/xistyle.hxx	(revision 276288)
+@@ -72,8 +72,10 @@ class XclImpPalette : public XclDefaultPalette
+     void                ReadPalette( XclImpStream& rStrm );
+ 
+ private:
++    void ExportPalette();
+     typedef ::std::vector< ColorData > ColorDataVec;
+     ColorDataVec        maColorTable;       /// Colors read from file.
++    const XclImpRoot&             mrRoot;
+ };
+ 
+ // FONT record - font information =============================================
+Index: sc/source/filter/inc/xcl97esc.hxx
+===================================================================
+--- sc/source/filter/inc/xcl97esc.hxx	(revision 276159)
++++ sc/source/filter/inc/xcl97esc.hxx	(revision 276288)
+@@ -54,6 +54,15 @@ class XclExpOcxControlObj;
+ #else
+ class XclExpTbxControlObj;
+ #endif
++class XclExpShapeObj;
++class EscherExHostAppData;
++class ShapeInteractionHelper
++{
++public:
++   static XclExpShapeObj* CreateShapeObj(const XclExpRoot& rRoot, const ::com::sun::star::uno::Reference<
++                            ::com::sun::star::drawing::XShape >& xShape );
++   static void PopulateShapeInteractionInfo( const XclExpRoot& rRoot, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, EscherExHostAppData& rHostAppData );
++};
+ 
+ class XclEscherEx : public EscherEx, protected XclExpRoot
+ {
+Index: sc/source/filter/inc/xeescher.hxx
+===================================================================
+--- sc/source/filter/inc/xeescher.hxx	(revision 276159)
++++ sc/source/filter/inc/xeescher.hxx	(revision 276288)
+@@ -88,6 +88,34 @@ class XclExpControlHelper : protected XclExpRoot
+     sal_uInt16          mnEntryCount;   /// Number of entries in source range.
+ };
+ 
++class XclMacroHelper : public XclExpControlHelper
++{
++protected:
++    XclTokenArrayRef    mxMacroLink;    /// Token array containing a link to an attached macro.
++
++public:
++    explicit            XclMacroHelper( const XclExpRoot& rRoot );
++    virtual             ~XclMacroHelper();
++    /** Writes an ftMacro subrecord containing a macro link, or nothing, if no macro present. */
++    void                WriteMacroSubRec( XclExpStream& rStrm  );
++    /** Sets the name of a macro for object of passed type
++        @return  true = The passed event descriptor was valid, macro name has been found. */
++    bool                SetMacroLink( const ::com::sun::star::script::ScriptEventDescriptor& rEvent,  const XclTbxEventType& nEventType );
++
++    /** Sets the name of a macro 
++        @return  true = The passed macro name has been found. */
++    bool                SetMacroLink( const String& rMacro );
++};
++
++class XclExpShapeObj : public XclObjAny, public XclMacroHelper
++{
++public:
++    explicit            XclExpShapeObj( const XclExpRoot& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
++    virtual             ~XclExpShapeObj();
++private:
++    virtual void        WriteSubRecs( XclExpStream& rStrm );
++};
++
+ // ----------------------------------------------------------------------------
+ 
+ #if EXC_EXP_OCX_CTRL
+@@ -114,7 +142,7 @@ class XclExpOcxControlObj : public XclObj, public
+ #else
+ 
+ /** Represents an OBJ record for an TBX form control. */
+-class XclExpTbxControlObj : public XclObj, public XclExpControlHelper
++class XclExpTbxControlObj : public XclObj, public XclMacroHelper
+ {
+ public:
+     explicit            XclExpTbxControlObj(
+@@ -128,8 +156,6 @@ class XclExpOcxControlObj : public XclObj, public
+ private:
+     virtual void        WriteSubRecs( XclExpStream& rStrm );
+ 
+-    /** Writes an ftMacro subrecord containing a macro link, or nothing, if no macro present. */
+-    void                WriteMacroSubRec( XclExpStream& rStrm );
+     /** Writes a subrecord containing a cell link, or nothing, if no link present. */
+     void                WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId );
+     /** Writes the ftSbs sub structure containing scrollbar data. */
+@@ -137,7 +163,6 @@ class XclExpOcxControlObj : public XclObj, public
+ 
+ private:
+     ScfInt16Vec         maMultiSel;     /// Indexes of all selected entries in a multi selection.
+-    XclTokenArrayRef    mxMacroLink;    /// Token array containing a link to an attached macro.
+     XclTbxEventType     meEventType;    /// Type of supported macro event.
+     sal_Int32           mnHeight;       /// Height of the control.
+     sal_uInt16          mnState;        /// Checked/unchecked state.
+Index: sc/source/filter/inc/xiescher.hxx
+===================================================================
+--- sc/source/filter/inc/xiescher.hxx	(revision 276159)
++++ sc/source/filter/inc/xiescher.hxx	(revision 276288)
+@@ -33,6 +33,7 @@
+ 
+ #include <vector>
+ #include <map>
++#include <hash_map>
+ #include <svx/msdffimp.hxx>
+ #include <svx/msocximex.hxx>
+ #include <vcl/graph.hxx>
+@@ -497,6 +498,10 @@ class XclImpControlHelper
+     /** Derived classes will set additional properties for the current form control. */
+     virtual void        DoProcessControl( ScfPropertySet& rPropSet ) const;
+ 
++    void ApplySheetLinkProps() const;
++    mutable ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
++                        mxShape;        /// The UNO wrapper of the control shape.
++    ScfRef< ScAddress > mxCellLink;     /// Linked cell in the Calc document.
+ private:
+     /** Reads a list of cell ranges from a formula at the current stream position. */
+     void                ReadRangeList( ScRangeList& rScRanges, XclImpStream& rStrm );
+@@ -505,9 +510,6 @@ class XclImpControlHelper
+ 
+ private:
+     const XclImpRoot&   mrRoot;         /// Not derived from XclImpRoot to allow multiple inheritance.
+-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+-                        mxShape;        /// The UNO wrapper of the control shape.
+-    ScfRef< ScAddress > mxCellLink;     /// Linked cell in the Calc document.
+     ScfRef< ScRange >   mxSrcRange;     /// Source data range in the Calc document.
+     XclCtrlBindMode     meBindMode;     /// Value binding mode.
+ };
+@@ -609,6 +611,7 @@ class XclImpOptionButtonObj : public XclImpCheckBo
+     virtual XclTbxEventType DoGetEventType() const;
+ 
+ protected:
++    void ApplyGrouping( XclImpOptionButtonObj& rLeader, sal_Int32 nRefVal );
+     sal_uInt16          mnNextInGroup;      /// Next option button in a group.
+     sal_uInt16          mnFirstInGroup;     /// 1 = Button is the first in a group.
+ };
+@@ -1083,6 +1086,8 @@ class XclImpDffManager : protected XclImpSimpleDff
+ /** Stores all drawing and OLE objects and additional data related to these objects. */
+ class XclImpObjectManager : protected XclImpRoot
+ {
++typedef std::hash_map< sal_Int32, String >  CntrlObjIdToName;
++typedef std::map< String, CntrlObjIdToName > CodeNameToCntrlObjIdInfo;
+ public:
+     explicit            XclImpObjectManager( const XclImpRoot& rRoot );
+     virtual             ~XclImpObjectManager();
+@@ -1128,9 +1133,13 @@ class XclImpObjectManager : protected XclImpRoot
+     String              GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const;
+     /** Returns the used area in the sheet with the passed index. */
+     ScRange             GetUsedArea( SCTAB nScTab ) const;
+-
++    void SetOleNameOverrideInfo( const CodeNameToCntrlObjIdInfo& rOverrideInfo ) {  maOleCtrlNameOverride = rOverrideInfo; }
++    String GetOleNameOverride( const XclObjId& nObjId );
+     // ------------------------------------------------------------------------
+ private:
++
++    CodeNameToCntrlObjIdInfo maOleCtrlNameOverride;
++
+     /** Reads and returns a bitmap from WMF/PICT format. */
+     static void         ReadWmf( Graphic& rGraphic, XclImpStream& rStrm );
+     /** Reads and returns a bitmap from BMP format. */
+Index: sc/source/filter/inc/excimp8.hxx
+===================================================================
+--- sc/source/filter/inc/excimp8.hxx	(revision 276159)
++++ sc/source/filter/inc/excimp8.hxx	(revision 276288)
+@@ -52,7 +52,11 @@ class XclImpStream;
+ 
+ class ImportExcel8 : public ImportExcel
+ {
++        SCTAB mnTab;
+ 	protected:
++        // represents codename ( and associated modules ) 
++        // not speficied directly in the binary format
++        std::vector< String > AutoGeneratedCodeNames; 
+         ExcScenarioList         aScenList;
+ 
+ 		BOOL					bHasBasic;
+Index: sc/source/core/data/cell.cxx
+===================================================================
+--- sc/source/core/data/cell.cxx	(revision 276159)
++++ sc/source/core/data/cell.cxx	(revision 276288)
+@@ -54,6 +54,7 @@
+ #include "recursionhelper.hxx"
+ #include "postit.hxx"
+ #include "externalrefmgr.hxx"
++#include "macromgr.hxx"
+ #include <svx/editobj.hxx>
+ #include <svtools/intitem.hxx>
+ #include <svx/flditem.hxx>
+@@ -822,6 +823,9 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell&
+ ScFormulaCell::~ScFormulaCell()
+ {
+ 	pDocument->RemoveFromFormulaTree( this );
++    if (pCode->HasOpCode(ocMacro))
++        pDocument->GetMacroManager()->RemoveDependentCell(this);
++
+ 	delete pCode;
+ #ifdef DBG_UTIL
+ 	eCellType = CELLTYPE_DESTROYED;
+@@ -1469,6 +1473,9 @@ void ScFormulaCell::Interpret()
+             }
+         } while (bIterationFromRecursion || bResumeIteration);
+     }
++
++	// Fire worksheet calculate event
++	pDocument->FireCalculateEvent( aPos.Tab() );
+ }
+ 
+ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
+@@ -1739,9 +1746,39 @@ void ScFormulaCell::InterpretTail( ScInterpretTail
+         // Reschedule verlangsamt das ganze erheblich, nur bei Prozentaenderung ausfuehren
+         ScProgress::GetInterpretProgress()->SetStateCountDownOnPercent(
+             pDocument->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE );
++
++        switch (p->GetVolatileType())
++        {
++            case ScInterpreter::VOLATILE:
++                // Volatile via built-in volatile functions.  No actions needed.
++            break;
++            case ScInterpreter::VOLATILE_MACRO:
++                // The formula contains a volatile macro.
++                pCode->SetRecalcModeAlways();
++                pDocument->PutInFormulaTree(this);
++                StartListeningTo(pDocument);
++            break;
++            case ScInterpreter::NOT_VOLATILE:
++                if (pCode->IsRecalcModeAlways())
++                {
++                    // The formula was previously volatile, but no more.
++                    EndListeningTo(pDocument);
++                    pCode->SetRecalcModeNormal();
+     }
+     else
+     {
++                    // non-volatile formula.  End listening to the area in case 
++                    // it's listening due to macro module change.
++                    pDocument->EndListeningArea(BCA_LISTEN_ALWAYS, this);
++                }
++                pDocument->RemoveFromFormulaTree(this);
++            break;
++            default:
++                ;
++        }
++    }
++    else
++    {
+         //  Zelle bei Compiler-Fehlern nicht ewig auf dirty stehenlassen
+         DBG_ASSERT( pCode->GetCodeError(), "kein UPN-Code und kein Fehler ?!?!" );
+         bDirty = FALSE;
+@@ -1806,7 +1843,7 @@ void __EXPORT ScFormulaCell::Notify( SvtBroadcaste
+ 			else
+             {
+                 bForceTrack = !bDirty;
+-				bDirty = TRUE;
++				SetDirtyVar();
+             }
+             // #35962# Don't remove from FormulaTree to put in FormulaTrack to
+             // put in FormulaTree again and again, only if necessary.
+@@ -1829,7 +1866,7 @@ void ScFormulaCell::SetDirty()
+ 	if ( !IsInChangeTrack() )
+ 	{
+ 		if ( pDocument->GetHardRecalcState() )
+-			bDirty = TRUE;
++			SetDirtyVar();
+ 		else
+ 		{
+ 			// Mehrfach-FormulaTracking in Load und in CompileAll
+@@ -1838,7 +1875,7 @@ void ScFormulaCell::SetDirty()
+ 			// setzen, z.B. in CompileTokenArray
+ 			if ( !bDirty || !pDocument->IsInFormulaTree( this ) )
+ 			{
+-				bDirty = TRUE;
++				SetDirtyVar();
+ 				pDocument->AppendToFormulaTrack( this );
+ 				pDocument->TrackFormulas();
+ 			}
+@@ -1849,6 +1886,13 @@ void ScFormulaCell::SetDirty()
+ 	}
+ }
+ 
++void ScFormulaCell::SetDirtyVar()
++{
++	bDirty = TRUE;
++	// mark the sheet of this cell to be calculated
++	pDocument->AddCalculateTable( aPos.Tab() );
++}
++
+ void ScFormulaCell::SetDirtyAfterLoad()
+ {
+     bDirty = TRUE;
+Index: sc/source/core/data/table1.cxx
+===================================================================
+--- sc/source/core/data/table1.cxx	(revision 276159)
++++ sc/source/core/data/table1.cxx	(revision 276288)
+@@ -125,6 +125,7 @@ extern BOOL bIsOlk, bOderSo;
+ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
+ 					BOOL bColInfo, BOOL bRowInfo ) :
+ 	aName( rNewName ),
++	aCodeName( rNewName ),
+ 	bScenario( FALSE ),
+ 	bLayoutRTL( FALSE ),
+     bLoadingRTL( FALSE ),
+Index: sc/source/core/data/documen2.cxx
+===================================================================
+--- sc/source/core/data/documen2.cxx	(revision 276159)
++++ sc/source/core/data/documen2.cxx	(revision 276288)
+@@ -96,6 +96,8 @@
+ #include "tabprotection.hxx"
+ #include "formulaparserpool.hxx"
+ #include "clipparam.hxx"
++#include "macromgr.hxx"
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
+ 
+ // pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
+ // dtor plus helpers are convenient.
+@@ -156,6 +158,7 @@ ScDocument::ScDocument( ScDocumentMode	eMode,
+         pCacheFieldEditEngine( NULL ),
+         pDocProtection( NULL ),
+         mpClipParam( NULL),
++        mpMacroMgr( NULL ), 
+         pExternalRefMgr( NULL ),
+ 		pViewOptions( NULL ),
+ 		pDocOptions( NULL ),
+@@ -1260,6 +1263,29 @@ void ScDocument::RemoveLookupCache( ScLookupCache
+     }
+ }
+ 
++using namespace com::sun::star;
++uno::Reference< document::XVbaEventsHelper > 
++ScDocument::GetVbaEventsHelper()
++{
++	if( !mxVbaEventsHelper.is() )
++	{
++        try
++        {
++            uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
++            uno::Reference< frame::XModel > xModel( pShell ? pShell->GetModel() : NULL, uno::UNO_QUERY );
++            uno::Sequence< uno::Any > aArgs(1);
++            aArgs[0] = uno::Any( xModel );
++            uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper( xSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.VbaEventsHelper" ) ), aArgs ), uno::UNO_QUERY );
++            // helper will always be created successfully.
++            mxVbaEventsHelper.set( xVbaEventsHelper, uno::UNO_QUERY );
++        }
++        catch( uno::Exception& e )
++        {
++        }
++	}
++	return mxVbaEventsHelper;
++}
++
+ void ScDocument::ClearLookupCaches()
+ {
+     if( pLookupCacheMapImpl )
+Index: sc/source/core/data/documen7.cxx
+===================================================================
+--- sc/source/core/data/documen7.cxx	(revision 276159)
++++ sc/source/core/data/documen7.cxx	(revision 276288)
+@@ -59,7 +59,15 @@
+ 
+ 
+ #include "globstr.hrc"
++#include <algorithm>
++#include <vector>
+ 
++
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
++
++using namespace com::sun::star;
++using namespace com::sun::star::document::VbaEventId;
+ extern const ScFormulaCell* pLastFormulaTreeTop;	// cellform.cxx Err527 WorkAround
+ 
+ // STATIC DATA -----------------------------------------------------------
+@@ -527,5 +535,35 @@ void ScDocument::SetAutoCalc( BOOL bNewAutoCalc )
+ 	}
+ }
+ 
++BOOL ScDocument::FireCalculateEvent( SCTAB nTab )
++{
++	BOOL bSuccess = FALSE;
++	::std::vector<SCTAB>::iterator iter;
++	iter = ::std::find( maTabs.begin(), maTabs.end(), nTab );
++	if( iter != maTabs.end() )
++	{
++		// make sure fire worksheet calculate event only once for each sheet 
++		// regardless of how many formula cells are calculated.
++		maTabs.erase(iter);
+ 
++		uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( GetVbaEventsHelper(), uno::UNO_QUERY );
++		if( xVbaEventsHelper.is() )
++		{
++			uno::Sequence< uno::Any > aArgs(1);
++			aArgs[0] <<= nTab;
++			bSuccess = xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_CALCULATE, aArgs );
++		}
++	}	
++	return bSuccess;
++}
+ 
++void ScDocument::AddCalculateTable( SCTAB nTab )
++{
++	::std::vector<SCTAB>::iterator iter;
++	iter = ::std::find( maTabs.begin(), maTabs.end(), nTab );
++	if( iter == maTabs.end() )
++	{
++		maTabs.push_back( nTab );
++	}
++}
++
+Index: sc/source/core/data/documen8.cxx
+===================================================================
+--- sc/source/core/data/documen8.cxx	(revision 276159)
++++ sc/source/core/data/documen8.cxx	(revision 276288)
+@@ -96,6 +96,7 @@
+ #include "sc.hrc"
+ #include "charthelper.hxx"
+ #include "dpobject.hxx"
++#include "macromgr.hxx"
+ 
+ #define GET_SCALEVALUE(set,id) 	((const SfxUInt16Item&)(set.Get( id ))).GetValue()
+ 
+@@ -420,6 +421,13 @@ BYTE ScDocument::GetEditTextDirection(SCTAB nTab)
+     return sal::static_int_cast<BYTE>(eRet);
+ }
+ 
++ScMacroManager* ScDocument::GetMacroManager()
++{
++    if (!mpMacroMgr.get())
++        mpMacroMgr.reset(new ScMacroManager(this));
++    return mpMacroMgr.get();
++}
++
+ //------------------------------------------------------------------------
+ 
+ void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo,
+Index: sc/source/core/data/column3.cxx
+===================================================================
+--- sc/source/core/data/column3.cxx	(revision 276159)
++++ sc/source/core/data/column3.cxx	(revision 276288)
+@@ -824,8 +824,10 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, USH
+     bool bCloneValue    = (nFlags & IDF_VALUE) != 0;
+     bool bCloneDateTime = (nFlags & IDF_DATETIME) != 0;
+     bool bCloneString   = (nFlags & IDF_STRING) != 0;
++    bool bCloneSpecialBoolean  = (nFlags & IDF_SPECIAL_BOOLEAN) != 0;
+     bool bCloneFormula  = (nFlags & IDF_FORMULA) != 0;
+     bool bCloneNote     = (nFlags & IDF_NOTE) != 0;
++    bool bForceFormula  = false;
+ 
+     ScBaseCell* pNew = 0;
+     ScBaseCell& rSource = *pItems[nIndex].pCell;
+@@ -849,8 +851,19 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, USH
+         break;
+ 
+ 		case CELLTYPE_FORMULA:
+-            if (bCloneFormula)
++            if ( bCloneSpecialBoolean )
+             {
++                ScFormulaCell& rForm = (ScFormulaCell&)rSource;
++                rtl::OUStringBuffer aBuf;
++                // #TODO #FIXME do we have a localisation issue here?
++                rForm.GetFormula( aBuf );
++                rtl::OUString aVal( aBuf.makeStringAndClear() );
++                if ( aVal.equalsAscii( "=TRUE()" )
++                        || aVal.equalsAscii( "=FALSE()" ) )
++                    bForceFormula = true;
++            }
++            if (bForceFormula || bCloneFormula)
++            {
+                 // note will be cloned below
+                 pNew = rSource.CloneWithoutNote( rDestDoc, rDestPos );
+             }
+Index: sc/source/core/data/document.cxx
+===================================================================
+--- sc/source/core/data/document.cxx	(revision 276159)
++++ sc/source/core/data/document.cxx	(revision 276288)
+@@ -94,10 +94,14 @@
+ #include "externalrefmgr.hxx"
+ #include "tabprotection.hxx"
+ #include "clipparam.hxx"
++#include <basic/basmgr.hxx>
++#include <com/sun/star/container/XContainer.hpp>
+ 
+ #include <map>
+ #include <limits>
+ 
++using namespace ::com::sun::star;
++
+ namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
+ 
+ struct ScDefaultAttr
+@@ -154,7 +158,33 @@ BOOL ScDocument::GetName( SCTAB nTab, String& rNam
+ 	return FALSE;
+ }
+ 
++BOOL ScDocument::SetCodeName( SCTAB nTab, String& rName ) 
++{
++	if (VALIDTAB(nTab))
++	{
++		if (pTab[nTab])
++		{
++			pTab[nTab]->SetCodeName( rName );
++			return TRUE;
++		}
++	}
++	OSL_TRACE( "**** can't set code name %s", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr() );
++	return FALSE;
++}
+ 
++BOOL ScDocument::GetCodeName( SCTAB nTab, String& rName ) const
++{
++	if (VALIDTAB(nTab))
++		if (pTab[nTab])
++		{
++			pTab[nTab]->GetCodeName( rName );
++			return TRUE;
++		}
++	rName.Erase();
++	return FALSE;
++}
++
++
+ BOOL ScDocument::GetTable( const String& rName, SCTAB& rTab ) const
+ {
+ 	String aUpperName = rName;
+@@ -293,6 +323,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const Stri
+ 		if (nPos == SC_TAB_APPEND || nPos == nTabCount)
+ 		{
+ 			pTab[nTabCount] = new ScTable(this, nTabCount, rName);
++            pTab[nTabCount]->SetCodeName( rName );
+ 			++nMaxTableNumber;
+ 			if ( bExternalDocument )
+ 				pTab[nTabCount]->SetVisible( FALSE );
+@@ -320,10 +351,16 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const Stri
+ 				for (i = 0; i <= MAXTAB; i++)
+ 					if (pTab[i])
+ 						pTab[i]->UpdateInsertTab(nPos);
++
+ 				for (i = nTabCount; i > nPos; i--)
++				{
+ 					pTab[i] = pTab[i - 1];
++				}
++
+ 				pTab[nPos] = new ScTable(this, nPos, rName);
++                pTab[nPos]->SetCodeName( rName );
+ 				++nMaxTableNumber;
++
+                 // UpdateBroadcastAreas must be called between UpdateInsertTab, 
+                 // which ends listening, and StartAllListeners, to not modify 
+                 // areas that are to be inserted by starting listeners.
+@@ -414,7 +451,10 @@ BOOL ScDocument::DeleteTab( SCTAB nTab, ScDocument
+ 									pRefUndoDoc ? pRefUndoDoc->pTab[i] : 0);
+ 				delete pTab[nTab];
+ 				for (i=nTab + 1; i < nTabCount; i++)
++				{
+ 					pTab[i - 1] = pTab[i];
++				}
++
+ 				pTab[nTabCount - 1] = NULL;
+ 				--nMaxTableNumber;
+                 // UpdateBroadcastAreas must be called between UpdateDeleteTab, 
+Index: sc/source/core/inc/interpre.hxx
+===================================================================
+--- sc/source/core/inc/interpre.hxx	(revision 276159)
++++ sc/source/core/inc/interpre.hxx	(revision 276288)
+@@ -143,6 +143,15 @@ class ScInterpreter
+     static inline double div( const double& fNumerator, const double& fDenominator );
+ 
+     ScMatrixRef GetNewMat(SCSIZE nC, SCSIZE nR);
++
++    enum VolatileType { 
++        VOLATILE,   
++        VOLATILE_MACRO,
++        NOT_VOLATILE
++    };
++
++    VolatileType GetVolatileType() const;
++
+ private:
+     static ScTokenStack*    pGlobalStack;
+     static BOOL             bGlobalStackInUse;
+@@ -176,6 +185,8 @@ class ScInterpreter
+     BOOL        bCalcAsShown;           // precision as shown
+     BOOL        bMatrixFormula;         // formula cell is a matrix formula
+ 
++    VolatileType meVolaileType;
++
+ //---------------------------------Funktionen in interpre.cxx---------
+ // nMust <= nAct <= nMax ? ok : PushError
+ inline BOOL MustHaveParamCount( short nAct, short nMust );
+Index: sc/source/core/tool/address.cxx
+===================================================================
+--- sc/source/core/tool/address.cxx	(revision 276159)
++++ sc/source/core/tool/address.cxx	(revision 276288)
+@@ -1286,7 +1286,7 @@ lcl_ScRange_Parse_OOo( ScRange &aRange, const Stri
+     }
+     nRes1 = ( ( nRes1 | nRes2 ) & SCA_VALID )
+           | nRes1
+-          | ( ( nRes2 & 0x070F ) << 4 );
++          | ( ( nRes2 & SCA_BITS ) << 4 );
+     return nRes1;
+ }
+ 
+Index: sc/source/core/tool/interpr1.cxx
+===================================================================
+--- sc/source/core/tool/interpr1.cxx	(revision 276159)
++++ sc/source/core/tool/interpr1.cxx	(revision 276288)
+@@ -72,6 +72,7 @@
+ #include "rangenam.hxx"
+ #include "compiler.hxx"
+ #include "externalrefmgr.hxx"
++#include <basic/sbstar.hxx>
+ #include "doubleref.hxx"
+ #include "queryparam.hxx"
+ 
+@@ -4145,7 +4146,20 @@ void ScInterpreter::ScMatch()
+                 }
+             }
+             if ( rEntry.bQueryByString )
++            {
++		BOOL bIsVBAMode = FALSE;
++                if ( pDok ) 
++                {
++                   SfxObjectShell* pDocSh = pDok->GetDocumentShell();
++                   if ( pDocSh )
++                        bIsVBAMode = pDocSh->GetBasic()->isVBAEnabled();
++                }
++                // #TODO handle MSO wildcards
++                if ( bIsVBAMode )
++                    rParam.bRegExp = FALSE;
++                else
+                 rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
++            }
+ 
+             if (pMatSrc) // The source data is matrix array.
+             {
+Index: sc/source/core/tool/interpr4.cxx
+===================================================================
+--- sc/source/core/tool/interpr4.cxx	(revision 276159)
++++ sc/source/core/tool/interpr4.cxx	(revision 276288)
+@@ -36,10 +36,13 @@
+ #include <sfx2/app.hxx>
+ #include <sfx2/docfile.hxx>
+ #include <sfx2/objsh.hxx>
++#include <sfx2/docfilt.hxx>
+ #include <basic/sbmeth.hxx>
+ #include <basic/sbmod.hxx>
+ #include <basic/sbstar.hxx>
+ #include <basic/sbx.hxx>
++#include <basic/sbxobj.hxx>
++#include <basic/sbuno.hxx>
+ #include <svtools/zforlist.hxx>
+ #include <tools/urlobj.hxx>
+ #include <rtl/logfile.hxx>
+@@ -48,6 +51,7 @@
+ #include <signal.h>
+ 
+ #include <com/sun/star/table/XCellRange.hpp>
++#include <comphelper/processfactory.hxx>
+ 
+ #include "interpre.hxx"
+ #include "global.hxx"
+@@ -68,14 +72,18 @@
+ #include "jumpmatrix.hxx"
+ #include "parclass.hxx"
+ #include "externalrefmgr.hxx"
++#include "formula/FormulaCompiler.hxx"
++#include "macromgr.hxx"
+ #include "doubleref.hxx"
+ 
+ #include <math.h>
+ #include <float.h>
+ #include <map>
+ #include <algorithm>
+ #include <functional>
+ #include <memory>
++#include <vbahelper/vbahelper.hxx>
++#include <basic/basmgr.hxx>
+ 
+ using namespace com::sun::star;
+ using namespace formula;
+@@ -2488,7 +2496,31 @@ void ScInterpreter::ScMissing()
+     PushTempToken( new FormulaMissingToken );
+ }
+ 
+-
++bool
++lcl_setVBARange( ScRange& aRange, ScDocument* pDok, SbxVariable* pPar )
++{
++	bool bOk = false;
++	try
++	{
++		uno::Reference< uno::XInterface > xVBARange;
++		uno::Reference<table::XCellRange> xCellRange = ScCellRangeObj::CreateRangeFromDoc( pDok, aRange );
++		uno::Sequence< uno::Any > aArgs(2);
++		aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
++		aArgs[1] = uno::Any( xCellRange );
++		xVBARange = ov::createVBAUnoAPIServiceWithArgs( pDok->GetDocumentShell(), "ooo.vba.excel.Range", aArgs );
++		if ( xVBARange.is() )
++		{
++			String sDummy(RTL_CONSTASCII_USTRINGPARAM("A-Range") );
++			SbxObjectRef aObj = GetSbUnoObject( sDummy, uno::Any( xVBARange ) );
++			SetSbUnoObjectDfltPropName( aObj );
++			bOk = pPar->PutObject( aObj );
++		}
++	}
++	catch( uno::Exception& )
++	{
++	}
++	return bOk;
++}
+ void ScInterpreter::ScMacro()
+ {
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScMacro" );
+@@ -2525,8 +2557,11 @@ void ScInterpreter::ScMacro()
+         return;
+     }
+ 
++    bool bVolatileMacro = false; 
+     SbMethod* pMethod = (SbMethod*)pVar;
++
+     SbModule* pModule = pMethod->GetModule();
++	bool bUseVBAObjects = pModule->IsVBACompat();
+     SbxObject* pObject = pModule->GetParent();
+     DBG_ASSERT(pObject->IsA(TYPE(StarBASIC)), "Kein Basic gefunden!");
+     String aMacroStr = pObject->GetName();
+@@ -2536,7 +2571,13 @@ void ScInterpreter::ScMacro()
+     aMacroStr += pMethod->GetName();
+     String aBasicStr;
+     if (pObject->GetParent())
++	{
+         aBasicStr = pObject->GetParent()->GetName();    // Dokumentenbasic
++		const SfxFilter* pFilter = NULL;
++		SfxMedium* pMedium = pDok->GetDocumentShell()->GetMedium();
++		if ( pMedium )
++			pFilter = pMedium->GetFilter();
++	}
+     else
+         aBasicStr = SFX_APP()->GetName();               // Applikationsbasic
+ 
+@@ -2560,6 +2601,12 @@ void ScInterpreter::ScMacro()
+             {
+                 ScAddress aAdr;
+                 PopSingleRef( aAdr );
++				if ( bUseVBAObjects )
++				{
++					ScRange aRange( aAdr );
++					bOk = lcl_setVBARange( aRange, pDok, pPar );
++				}
++				else
+                 bOk = SetSbxVariable( pPar, aAdr );
+             }
+             break;
+@@ -2579,6 +2626,13 @@ void ScInterpreter::ScMacro()
+                 }
+                 else
+                 {
++					if ( bUseVBAObjects )
++                    {
++						ScRange aRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
++						bOk = lcl_setVBARange( aRange, pDok, pPar );
++					}
++					else
++					{
+                     SbxDimArrayRef refArray = new SbxDimArray;
+                     refArray->AddDim32( 1, nRow2 - nRow1 + 1 );
+                     refArray->AddDim32( 1, nCol2 - nCol1 + 1 );
+@@ -2599,6 +2653,7 @@ void ScInterpreter::ScMacro()
+                     pPar->PutObject( refArray );
+                 }
+             }
++            }
+             break;
+             case svMatrix:
+             {
+@@ -2644,6 +2699,13 @@ void ScInterpreter::ScMacro()
+         pDok->DecMacroInterpretLevel();
+         pDok->UnlockTable( aPos.Tab() );
+ 
++        ScMacroManager* pMacroMgr = pDok->GetMacroManager();
++        if (pMacroMgr)
++        {
++            bVolatileMacro = pMacroMgr->GetUserFuncVolatile( pMethod->GetName() );
++            pMacroMgr->AddDependentCell(pModule->GetName(), pMyFormulaCell);
++        }
++
+         SbxDataType eResType = refRes->GetType();
+         if( pVar->GetError() )
+             SetError( errNoValue);
+@@ -2715,6 +2777,9 @@ void ScInterpreter::ScMacro()
+     }
+ 
+     pSfxApp->LeaveBasicCall();
++
++    if (bVolatileMacro && meVolaileType == NOT_VOLATILE)
++        meVolaileType = VOLATILE_MACRO;
+ }
+ 
+ 
+@@ -3372,7 +3437,8 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell
+     pTokenMatrixMap( NULL ),
+     pMyFormulaCell( pCell ),
+     pFormatter( pDoc->GetFormatTable() ),
+-    bCalcAsShown( pDoc->GetDocOptions().IsCalcAsShown() )
++    bCalcAsShown( pDoc->GetDocOptions().IsCalcAsShown() ),
++    meVolaileType(NOT_VOLATILE)
+ {
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScTTT" );
+ //  pStack = new ScToken*[ MAXSTACK ];
+@@ -3821,6 +3887,9 @@ StackVar ScInterpreter::Interpret()
+                 continue;   // while( ( pCur = aCode.Next() ) != NULL  ...
+             }
+ 
++            if (FormulaCompiler::IsOpCodeVolatile(eOp))
++                meVolaileType = VOLATILE;
++
+             // Remember result matrix in case it could be reused.
+             if (pTokenMatrixMap && sp && GetStackType() == svMatrix)
+                 pTokenMatrixMap->insert( ScTokenMatrixMap::value_type( pCur,
+Index: sc/source/core/tool/interpr5.cxx
+===================================================================
+--- sc/source/core/tool/interpr5.cxx	(revision 276159)
++++ sc/source/core/tool/interpr5.cxx	(revision 276288)
+@@ -324,6 +324,11 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SC
+     return pMat;
+ }
+ 
++ScInterpreter::VolatileType ScInterpreter::GetVolatileType() const
++{
++    return meVolaileType;
++}
++
+ ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken,
+         SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
+         SCCOL nCol2, SCROW nRow2, SCTAB nTab2 )
+Index: sc/source/core/tool/rangelst.cxx
+===================================================================
+--- sc/source/core/tool/rangelst.cxx	(revision 276159)
++++ sc/source/core/tool/rangelst.cxx	(revision 276288)
+@@ -104,15 +104,18 @@ USHORT ScRangeList::Parse( const String& rStr, ScD
+ 		for ( USHORT i=0; i<nTCount; i++ )
+ 		{
+ 			aOne = rStr.GetToken( i, cDelimiter );
+-			// FIXME : broken for Lotus
+-			if ( aOne.Search( ':' ) == STRING_NOTFOUND )
+-			{	// Range muss es sein
+-				String aStrTmp( aOne );
+-				aOne += ':';
+-				aOne += aStrTmp;
+-			}
+ 			aRange.aStart.SetTab( nTab );	// Default Tab wenn nicht angegeben
+-			USHORT nRes = aRange.Parse( aOne, pDoc, eConv );
++			USHORT nRes = aRange.ParseAny( aOne, pDoc, eConv );
++			USHORT nEndRangeBits = SCA_VALID_COL2 | SCA_VALID_ROW2 |
++SCA_VALID_TAB2;
++			USHORT nTmp1 = ( nRes & SCA_BITS );
++			USHORT nTmp2 = ( nRes & nEndRangeBits );
++			// If we have a valid single range with
++			// any of the address bits we are interested in
++			// set - set the equiv end range bits
++			if ( (nRes & SCA_VALID ) && nTmp1 && ( nTmp2 != nEndRangeBits ) )
++					nRes |= ( nTmp1 << 4 );
++	
+ 			if ( (nRes & nMask) == nMask )
+ 				Append( aRange );
+ 			nResult &= nRes;		// alle gemeinsamen Bits bleiben erhalten
+Index: sc/source/ui/src/makefile.mk
+===================================================================
+--- sc/source/ui/src/makefile.mk	(revision 276159)
++++ sc/source/ui/src/makefile.mk	(revision 276288)
+@@ -57,6 +57,7 @@ SRC1FILES = \
+ 	dbnamdlg.src \
+ 	subtdlg.src  \
+ 	miscdlgs.src \
++	datafdlg.src \
+ 	autofmt.src  \
+ 	solvrdlg.src \
+     optsolver.src \
+Index: sc/source/ui/src/datafdlg.src
+===================================================================
+--- sc/source/ui/src/datafdlg.src	(revision 0)
++++ sc/source/ui/src/datafdlg.src	(revision 276288)
+@@ -0,0 +1,108 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: datafdlg.src,v $
++ *
++ *  $Revision: 1.00 $
++ *
++ *  last change: $Author: hr $ $Date: 2005/09/23 15:07:30 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#include "datafdlg.hrc"
++
++//zhangyun, dataform
++ModalDialog RID_SCDLG_DATAFORM
++{
++    OutputSize = TRUE ;
++    SVLook = TRUE ;
++    Size = MAP_APPFONT ( 191 , 180 ) ;
++    Text [ en-US ] = "Data Form" ;
++    Moveable = TRUE ;
++    Closeable = TRUE ;
++    FixedText LAB_DATAFORM_RECORDNO
++    {
++        Pos = MAP_APPFONT ( 136 , 6 ) ;
++        Size = MAP_APPFONT ( 50 , 12 ) ;
++        Text [ en-US ] = "/" ;
++    };
++    PushButton BTN_DATAFORM_NEW
++    {
++        Pos = MAP_APPFONT ( 135 , 23 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
++        TabStop = TRUE ;
++        DefButton = TRUE ;
++        Text [ en-US ] = "New" ;
++    };
++    PushButton BTN_DATAFORM_DELETE
++    {
++        Pos = MAP_APPFONT ( 135 , 40 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
++        TabStop = TRUE ;
++        Text [ en-US ] = "Delete" ;
++    };
++    PushButton BTN_DATAFORM_RESTORE
++    {
++        Pos = MAP_APPFONT ( 135 , 57 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
++        TabStop = TRUE ;
++        Text [ en-US ] = "Restore" ;
++    };
++    PushButton BTN_DATAFORM_LAST
++    {
++        Pos = MAP_APPFONT ( 135 , 82 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
++        TabStop = TRUE ;
++        Text [ en-US ] = "Last Record" ;
++    };
++    PushButton BTN_DATAFORM_NEXT
++    {
++        Pos = MAP_APPFONT ( 135 , 99 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
++        TabStop = TRUE ;
++        Text [ en-US ] = "Next Record" ;
++    };
++    PushButton BTN_DATAFORM_CLOSE
++    {
++        Pos = MAP_APPFONT ( 135 , 116 ) ;
++        Size = MAP_APPFONT ( 50 , 14 ) ;
++        TabStop = TRUE ;
++        Text [ en-US ] = "Close" ;
++    };
++    ScrollBar WND_DATAFORM_SCROLLBAR
++    {
++        Pos = MAP_APPFONT ( 124 , 6 ) ;
++        Size = MAP_APPFONT ( 8 , 135 ) ;
++        HScroll = FALSE ;
++        TabStop = FALSE ;
++    };
++};
++//end
++
++
++
++
+Index: sc/source/ui/src/globstr.src
+===================================================================
+--- sc/source/ui/src/globstr.src	(revision 276159)
++++ sc/source/ui/src/globstr.src	(revision 276288)
+@@ -1717,6 +1717,77 @@ Resource RID_GLOBSTR
+     {
+         Text [ en-US ] = "Unknown User";
+     };
++
++    String STR_SHAPE_AUTOSHAPE
++    {
++        Text [ en-US ] = "AutoShape";
++    };
++
++    String STR_SHAPE_RECTANGLE
++    {
++        Text [ en-US ] = "Rectangle";
++    };
++
++    String STR_SHAPE_LINE
++    {
++        Text [ en-US ] = "Line";
++    };
++
++    String STR_SHAPE_OVAL
++    {
++        Text [ en-US ] = "Oval";
++    };
++
++    String STR_SHAPE_TEXTBOX
++    {
++        Text [ en-US ] = "Text Box";
++    };
++
++    String STR_FORM_BUTTON
++    {
++        Text [ en-US ] = "Button";
++    };
++
++    String STR_FORM_CHECKBOX
++    {
++        Text [ en-US ] = "Check Box";
++    };
++
++    String STR_FORM_OPTIONBUTTON
++    {
++        Text [ en-US ] = "Option Button";
++    };
++
++    String STR_FORM_LABEL
++    {
++        Text [ en-US ] = "Label";
++    };
++
++    String STR_FORM_LISTBOX
++    {
++        Text [ en-US ] = "List Box";
++    };
++
++    String STR_FORM_GROUPBOX
++    {
++        Text [ en-US ] = "Group Box";
++    };
++
++    String STR_FORM_DROPDOWN 
++    {
++        Text [ en-US ] = "Drop Down";
++    };
++
++    String STR_FORM_SPINNER
++    {
++        Text [ en-US ] = "Spinner";
++    };
++
++    String STR_FORM_SCROLLBAR
++    {
++        Text [ en-US ] = "Scroll Bar";
++    };
++
+     String STR_STYLE_FAMILY_CELL
+     {
+         Text [ en-US ] = "Cell Styles";
+Index: sc/source/ui/unoobj/shapeuno.cxx
+===================================================================
+--- sc/source/ui/unoobj/shapeuno.cxx	(revision 276159)
++++ sc/source/ui/unoobj/shapeuno.cxx	(revision 276288)
+@@ -73,6 +73,8 @@ const SfxItemPropertyMapEntry* lcl_GetShapeMap()
+         {MAP_CHAR_LEN(SC_UNONAME_HORIPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
+ 		{MAP_CHAR_LEN(SC_UNONAME_IMAGEMAP),	0, &getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 },
+ 		{MAP_CHAR_LEN(SC_UNONAME_VERTPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
++		// #i66550 HLINK_FOR_SHAPES
++		{MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), 0, &getCppuType((rtl::OUString*)0), 0, 0 },
+         {0,0,0,0,0,0}
+ 	};
+ 	return aShapeMap_Impl;
+@@ -87,6 +89,14 @@ const SvEventDescription* ScShapeObj::GetSupported
+ 	};
+ 	return aMacroDescriptionsImpl;
+ }
++// #i66550 HLINK_FOR_SHAPES
++ScMacroInfo* lcl_getShapeHyperMacroInfo( ScShapeObj* pShape, BOOL bCreate = FALSE )
++{
++        if( pShape )
++            if( SdrObject* pObj = pShape->GetSdrObject() )
++                return ScDrawLayer::GetMacroInfo( pObj, bCreate );
++        return 0;
++}
+ 
+ //------------------------------------------------------------------------
+ 
+@@ -638,6 +648,13 @@ void SAL_CALL ScShapeObj::setPropertyValue(
+             }
+         }
+     }
++	else if  ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) )
++	{
++                rtl::OUString sHlink;
++        	ScMacroInfo* pInfo = lcl_getShapeHyperMacroInfo(this, TRUE);
++        	if ( ( aValue >>= sHlink ) && pInfo )
++			pInfo->SetHlink( sHlink );
++	}
+ 	else
+ 	{
+         GetShapePropertySet();
+@@ -819,6 +836,13 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( co
+             }
+         }
+     }
++	else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) )
++	{
++		rtl::OUString sHlink;
++		if ( ScMacroInfo* pInfo = lcl_getShapeHyperMacroInfo(this) )
++			sHlink = pInfo->GetHlink();
++		aAny <<= sHlink;
++	}
+ 	else
+ 	{
+         GetShapePropertySet();
+@@ -1342,11 +1366,6 @@ SdrObject* ScShapeObj::GetSdrObject() const throw(
+ }
+ 
+ #define SC_EVENTACC_ONCLICK     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) )
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-#define SC_EVENTACC_ONACTION    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnAction" ) )
+-#define SC_EVENTACC_URL         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) )
+-#define SC_EVENTACC_ACTION      ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Action" ) )
+-#endif
+ #define SC_EVENTACC_SCRIPT      ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Script" ) )
+ #define SC_EVENTACC_EVENTTYPE   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) )
+ 
+@@ -1358,10 +1377,7 @@ class ShapeUnoEventAccessImpl : public ShapeUnoEve
+ 
+     ScMacroInfo* getInfo( BOOL bCreate = FALSE )
+ 	{
+-        if( mpShape )
+-            if( SdrObject* pObj = mpShape->GetSdrObject() )
+-                return ScDrawLayer::GetMacroInfo( pObj, bCreate );
+-        return 0;
++		return lcl_getShapeHyperMacroInfo( mpShape, bCreate );
+ 	}
+ 
+ public:
+@@ -1387,11 +1403,7 @@ class ShapeUnoEventAccessImpl : public ShapeUnoEve
+ 				isEventType = true;
+ 				continue;
+ 			}
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-            if ( isEventType && ((pProperties->Name == SC_EVENTACC_SCRIPT) || (pProperties->Name == SC_EVENTACC_URL)) )
+-#else
+             if ( isEventType && (pProperties->Name == SC_EVENTACC_SCRIPT) )
+-#endif
+ 			{
+                 rtl::OUString sValue;
+                 if ( pProperties->Value >>= sValue )
+@@ -1402,10 +1414,8 @@ class ShapeUnoEventAccessImpl : public ShapeUnoEve
+                         break;
+                     if ( pProperties->Name == SC_EVENTACC_SCRIPT )
+                         pInfo->SetMacro( sValue );
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+                     else
+                         pInfo->SetHlink( sValue );
+-#endif
+                 }
+ 			}
+ 		}
+@@ -1428,19 +1438,6 @@ class ShapeUnoEventAccessImpl : public ShapeUnoEve
+                 aProperties[ 1 ].Value <<= pInfo->GetMacro();
+             }
+         }
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-        else if( aName == SC_EVENTACC_ONACTION )
+-        {
+-            if ( pInfo && (pInfo->GetHlink().getLength() > 0) )
+-            {
+-                aProperties.realloc( 2 );
+-                aProperties[ 0 ].Name = SC_EVENTACC_EVENTTYPE;
+-                aProperties[ 0 ].Value <<= SC_EVENTACC_ACTION;
+-                aProperties[ 1 ].Name = SC_EVENTACC_URL;
+-                aProperties[ 1 ].Value <<= pInfo->GetHlink();
+-            }
+-        }
+-#endif
+         else
+         {
+             throw container::NoSuchElementException();
+@@ -1451,25 +1448,14 @@ class ShapeUnoEventAccessImpl : public ShapeUnoEve
+ 
+     virtual uno::Sequence< rtl::OUString > SAL_CALL getElementNames() throw(uno::RuntimeException)
+ 	{
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-        uno::Sequence< rtl::OUString > aSeq( 2 );
+-#else
+         uno::Sequence< rtl::OUString > aSeq( 1 );
+-#endif
+         aSeq[ 0 ] = SC_EVENTACC_ONCLICK;
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-        aSeq[ 1 ] = SC_EVENTACC_ONACTION;
+-#endif
+         return aSeq;
+ 	}
+ 
+ 	virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException)
+ 	{
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+-        return (aName == SC_EVENTACC_ONCLICK) || (aName == SC_EVENTACC_ONACTION);
+-#else
+         return aName == SC_EVENTACC_ONCLICK;
+-#endif
+ 	}
+ 
+ 	// XElementAccess
+Index: sc/source/ui/unoobj/viewuno.cxx
+===================================================================
+--- sc/source/ui/unoobj/viewuno.cxx	(revision 276159)
++++ sc/source/ui/unoobj/viewuno.cxx	(revision 276288)
+@@ -71,9 +71,13 @@
+ #include "gridwin.hxx"
+ #include <com/sun/star/view/DocumentZoomType.hpp>
+ #include "AccessibilityHints.hxx"
++#include <com/sun/star/awt/MouseButton.hpp>
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
+ #include <svx/sdrhittesthelper.hxx>
+ 
+ using namespace com::sun::star;
++using namespace com::sun::star::document::VbaEventId;
+ 
+ //------------------------------------------------------------------------
+ 
+@@ -459,6 +463,78 @@ void SAL_CALL ScViewPaneObj::release() throw()
+ 	OWeakObject::release();
+ }
+ 
++// To process sheet compatibile event
++typedef ::cppu::WeakImplHelper2< awt::XEnhancedMouseClickHandler, view::XSelectionChangeListener > TabViewEventListener_BASE;
++class ScTabViewEventListener: public TabViewEventListener_BASE
++{
++private:
++    uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper;
++    ScTabViewObj* pViewObj;
++    
++public:
++    ScTabViewEventListener( ScTabViewObj* pObj, uno::Reference< document::XVbaEventsHelper >& rVbaEventsHelper);
++    ~ScTabViewEventListener();
++	// XEnhancedMouseClickHandler
++	virtual sal_Bool SAL_CALL mousePressed( const awt::EnhancedMouseEvent& e ) throw (uno::RuntimeException);
++	virtual sal_Bool SAL_CALL mouseReleased( const awt::EnhancedMouseEvent& e ) throw (uno::RuntimeException);
++
++    // XSelectionChangeListener
++    virtual void SAL_CALL selectionChanged( const lang::EventObject& aEvent ) throw ( uno::RuntimeException );
++    // XEventListener
++	virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException );
++};
++
++ScTabViewEventListener::ScTabViewEventListener(ScTabViewObj* pObj, uno::Reference< document::XVbaEventsHelper >& rVbaEventsHelper):
++                        pViewObj( pObj ),xVbaEventsHelper( rVbaEventsHelper )
++{
++}
++
++ScTabViewEventListener::~ScTabViewEventListener()
++{
++}
++
++void SAL_CALL ScTabViewEventListener::disposing(  const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
++{
++}
++
++sal_Bool SAL_CALL ScTabViewEventListener::mousePressed( const awt::EnhancedMouseEvent& e ) throw (uno::RuntimeException)
++{
++	sal_Bool result =  sal_False;
++    // process BeforeDoubleClick and BeforeRightClick events
++	if( e.ClickCount == 2 || e.Buttons == ::com::sun::star::awt::MouseButton::RIGHT )
++	{
++		// ensure the target is a cell
++        uno::Reference< table::XCell > xCell( e.Target, uno::UNO_QUERY );
++		if( xCell.is() && xVbaEventsHelper.is() && pViewObj)
++		{
++			uno::Sequence< uno::Any > aArgs(1);
++			aArgs[0] = pViewObj->getSelection();
++			sal_Int32 nEventId = VBAEVENT_WORKSHEET_BEFORERIGHTCLICK;
++			if( e.ClickCount == 2 )
++				nEventId = VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK;
++            
++            result = xVbaEventsHelper->ProcessCompatibleVbaEvent( nEventId, aArgs );
++			// TODO: process Cancel argument	
++		}
++	}
++	return result;
++}
++
++sal_Bool SAL_CALL ScTabViewEventListener::mouseReleased( const awt::EnhancedMouseEvent&/*e*/) throw (uno::RuntimeException)
++{
++	return sal_False;
++}
++
++void SAL_CALL ScTabViewEventListener::selectionChanged( const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
++{
++	if ( xVbaEventsHelper.is() && pViewObj)
++	{
++	    uno::Sequence< uno::Any > aArgs(1);
++	    aArgs[0] = pViewObj->getSelection();
++	    xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_SELECTIONCHANGE, aArgs );
++	}
++}
++
+ //------------------------------------------------------------------------
+ 
+ //	Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht
+@@ -469,7 +545,8 @@ void SAL_CALL ScViewPaneObj::release() throw()
+ //UNUSED2008-05  aPropSet( lcl_GetViewOptPropertyMap() ),
+ //UNUSED2008-05  aMouseClickHandlers( 0 ),
+ //UNUSED2008-05  aActivationListeners( 0 ),
+-//UNUSED2008-05  bDrawSelModeSet(sal_False)
++//UNUSED2008-05  bDrawSelModeSet(sal_False),
++//UNUSED2008-05  bFilteredRangeSelection(sal_True)
+ //UNUSED2008-05  {
+ //UNUSED2008-05  }
+ 
+@@ -479,10 +556,23 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewS
+ 	aPropSet( lcl_GetViewOptPropertyMap() ),
+ 	aMouseClickHandlers( 0 ),
+ 	aActivationListeners( 0 ),
+-	bDrawSelModeSet(sal_False)
++	bDrawSelModeSet(sal_False),
++    bFilteredRangeSelection(sal_True)
+ {
+-	//!	Listening oder so
++	if( pViewSh )
++	{
++		ScViewData* pViewData = pViewSh->GetViewData();
++		if( pViewData )
++		{
++            uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper (pViewData->GetDocument()->GetVbaEventsHelper(), uno::UNO_QUERY );
++			ScTabViewEventListener* pEventListener = new ScTabViewEventListener( this, xVbaEventsHelper );
++			uno::Reference< awt::XEnhancedMouseClickHandler > aMouseClickHandler( *pEventListener, uno::UNO_QUERY );
++			addEnhancedMouseClickHandler( aMouseClickHandler );
++            uno::Reference< view::XSelectionChangeListener > aSelectionChangeListener( *pEventListener, uno::UNO_QUERY );
++            addSelectionChangeListener( aSelectionChangeListener );
+ }
++	}
++}
+ 
+ ScTabViewObj::~ScTabViewObj()
+ {
+@@ -884,6 +974,15 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() thr
+ 
+ 		ScRange aRange;
+         ScMarkType eMarkType = pViewData->GetSimpleArea(aRange);
++
++        if (!bFilteredRangeSelection)
++        {
++            if (eMarkType == SC_MARK_SIMPLE_FILTERED)
++                eMarkType = SC_MARK_SIMPLE;
++            else if (eMarkType == SC_MARK_FILTERED)
++                eMarkType = SC_MARK_MULTI;
++        }
++
+ 		if ( nTabs == 1 && (eMarkType == SC_MARK_SIMPLE) )
+ 		{
+ 			if (aRange.aStart == aRange.aEnd)
+@@ -1729,6 +1828,12 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
+ 	ScUnoGuard aGuard;
+ 	String aString(aPropertyName);
+ 
++    if ( aString.EqualsAscii(SC_UNO_FILTERED_RANGE_SELECTION) )
++    {
++        bFilteredRangeSelection = ScUnoHelpFunctions::GetBoolFromAny(aValue);
++        return;
++    }
++
+ 	ScTabViewShell* pViewSh = GetViewShell();
+ 	if (pViewSh)
+ 	{
+@@ -1849,6 +1954,12 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue(
+ 	String aString(aPropertyName);
+ 	uno::Any aRet;
+ 
++    if ( aString.EqualsAscii(SC_UNO_FILTERED_RANGE_SELECTION) )
++    {
++        ScUnoHelpFunctions::SetBoolInAny(aRet, bFilteredRangeSelection);
++        return aRet;
++    }
++
+ 	ScTabViewShell* pViewSh = GetViewShell();
+ 	if (pViewSh)
+ 	{
+Index: sc/source/ui/unoobj/docuno.cxx
+===================================================================
+--- sc/source/ui/unoobj/docuno.cxx	(revision 276159)
++++ sc/source/ui/unoobj/docuno.cxx	(revision 276288)
+@@ -100,8 +100,12 @@
+ #include <svx/unoshape.hxx>
+ #endif
+ 
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
+ using namespace com::sun::star;
++using namespace com::sun::star::document::VbaEventId;
+ 
++#define SC_UNO_VBADOCOBJ "ThisVBADocObj" // perhaps we want to actually make this ThisWorkbook ?
+ //------------------------------------------------------------------------
+ 
+ //	alles ohne Which-ID, Map nur fuer PropertySetInfo
+@@ -116,6 +120,7 @@ const SfxItemPropertyMapEntry* lcl_GetDocOptProper
+         {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC),       0, &getBooleanCppuType(),                                    0, 0},
+         {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES),    0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0},
+         {MAP_CHAR_LEN(SC_UNO_DIALOGLIBRARIES),   0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0},
++        {MAP_CHAR_LEN(SC_UNO_VBADOCOBJ),   0, &getCppuType((beans::PropertyValue*)0), beans::PropertyAttribute::READONLY, 0},
+         {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN),       PROP_UNO_CALCASSHOWN, &getBooleanCppuType(),                                    0, 0},
+         {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),        0, &getCppuType((lang::Locale*)0),                           0, 0},
+         {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),        0, &getCppuType((lang::Locale*)0),                           0, 0},
+@@ -318,6 +323,7 @@ uno::Any SAL_CALL ScModelObj::queryInterface( cons
+ 	SC_QUERYINTERFACE( view::XRenderable )
+ 	SC_QUERYINTERFACE( document::XLinkTargetSupplier )
+ 	SC_QUERYINTERFACE( beans::XPropertySet )
++	SC_QUERYINTERFACE( document::XDocumentEventCompatibleHelper)
+ 	SC_QUERYINTERFACE( lang::XMultiServiceFactory )
+ 	SC_QUERYINTERFACE( lang::XServiceInfo )
+     SC_QUERYINTERFACE( util::XChangesNotifier )
+@@ -1568,6 +1574,13 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( co
+         {
+             aRet <<= pDocShell->GetDialogContainer();
+         }
++        else if ( aString.EqualsAscii( SC_UNO_VBADOCOBJ ) )
++        {
++            beans::PropertyValue aProp;
++            aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisExcelDoc") );
++            aProp.Value <<= pDocShell->GetModel();
++            aRet <<= aProp;
++        }
+         else if ( aString.EqualsAscii( SC_UNO_RUNTIMEUID ) )
+         {
+             aRet <<= getRuntimeUID();
+@@ -1733,6 +1746,39 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::
+ 	return concatServiceNames( aMyServices, aDrawServices );
+ }
+ 
++// XVbaEventHelper
++// For Vba Event
++sal_Bool SAL_CALL
++ScModelObj::processCompatibleEvent( sal_Int16 nSlotId ) throw( ::com::sun::star::uno::RuntimeException )
++{
++    USHORT nId = (USHORT)nSlotId;
++    uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper( GetDocument()->GetVbaEventsHelper(), uno::UNO_QUERY );
++    if( xVbaEventsHelper.is() )
++    {
++        switch( nId )
++        {
++            case SID_SAVEDOC:
++            {
++                uno::Sequence< uno::Any > aArgs(1);
++                aArgs[0] <<= sal_False;
++                return xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFORESAVE, aArgs );
++            }
++            case SID_SAVEASDOC:
++            {
++                uno::Sequence< uno::Any > aArgs(1);
++                aArgs[0] <<= sal_True;
++                return xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFORESAVE, aArgs );
++            }
++            case SID_PRINTDOC:
++            case SID_PRINTDOCDIRECT:
++            {
++                uno::Sequence< uno::Any > aArgs;
++                return xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFOREPRINT, aArgs );
++            }
++        }
++    }
++    return sal_False;
++}
+ // XServiceInfo
+ 
+ rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException)
+@@ -1771,6 +1817,12 @@ sal_Int64 SAL_CALL ScModelObj::getSomething(
+         return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
+ 	}
+ 
++	if ( rId.getLength() == 16 &&
++          0 == rtl_compareMemory( SfxObjectShell::getUnoTunnelId().getConstArray(),
++									rId.getConstArray(), 16 ) )
++        {
++            return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell ));
++        }
+ 	//	aggregated number formats supplier has XUnoTunnel, too
+ 	//	interface from aggregated object must be obtained via queryAggregation
+ 
+Index: sc/source/ui/unoobj/addruno.cxx
+===================================================================
+--- sc/source/ui/unoobj/addruno.cxx	(revision 276159)
++++ sc/source/ui/unoobj/addruno.cxx	(revision 276288)
+@@ -72,7 +72,7 @@ void ScAddressConversionObj::Notify( SfxBroadcaste
+     }
+ }
+ 
+-sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString )
++sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString, ::formula::FormulaGrammar::AddressConvention eConv )
+ {
+     if (!pDocShell)
+         return sal_False;
+@@ -81,7 +81,7 @@ void ScAddressConversionObj::Notify( SfxBroadcaste
+     sal_Bool bSuccess = sal_False;
+     if ( bIsRange )
+     {
+-        USHORT nResult = aRange.ParseAny( rUIString, pDoc );
++        USHORT nResult = aRange.ParseAny( rUIString, pDoc, eConv );
+         if ( nResult & SCA_VALID )
+         {
+             if ( ( nResult & SCA_TAB_3D ) == 0 )
+@@ -95,7 +95,7 @@ void ScAddressConversionObj::Notify( SfxBroadcaste
+     }
+     else
+     {
+-        USHORT nResult = aRange.aStart.Parse( rUIString, pDoc );
++        USHORT nResult = aRange.aStart.Parse( rUIString, pDoc, eConv );
+         if ( nResult & SCA_VALID )
+         {
+             if ( ( nResult & SCA_TAB_3D ) == 0 )
+@@ -119,6 +119,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL S
+         {
+             {MAP_CHAR_LEN(SC_UNONAME_ADDRESS),  0,  &getCppuType((table::CellRangeAddress*)0), 0, 0 },
+             {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
++            {MAP_CHAR_LEN(SC_UNONAME_XL_A1_REPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
+             {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
+             {MAP_CHAR_LEN(SC_UNONAME_UIREPR),   0,  &getCppuType((rtl::OUString*)0),    0, 0 },
+             {0,0,0,0,0,0}
+@@ -132,6 +133,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL S
+         {
+             {MAP_CHAR_LEN(SC_UNONAME_ADDRESS),  0,  &getCppuType((table::CellAddress*)0), 0, 0 },
+             {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
++            {MAP_CHAR_LEN(SC_UNONAME_XL_A1_REPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
+             {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
+             {MAP_CHAR_LEN(SC_UNONAME_UIREPR),   0,  &getCppuType((rtl::OUString*)0),    0, 0 },
+             {0,0,0,0,0,0}
+@@ -193,8 +195,11 @@ void SAL_CALL ScAddressConversionObj::setPropertyV
+             bSuccess = ParseUIString( aUIString );
+         }
+     }
+-    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) )
++    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
+     {
++        ::formula::FormulaGrammar::AddressConvention aConv = ::formula::FormulaGrammar::CONV_OOO; 
++        if ( aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
++            aConv = ::formula::FormulaGrammar::CONV_XL_A1; 
+         //  parse the file format string
+         rtl::OUString sRepresentation;
+         if (aValue >>= sRepresentation)
+@@ -215,7 +220,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyV
+             }
+ 
+             //  parse the rest like a UI string
+-            bSuccess = ParseUIString( aUIString );
++            bSuccess = ParseUIString( aUIString, aConv );
+         }
+     }
+     else
+@@ -268,17 +273,24 @@ uno::Any SAL_CALL ScAddressConversionObj::getPrope
+             aRange.aStart.Format( aFormatStr, nFlags, pDoc );
+         aRet <<= rtl::OUString( aFormatStr );
+     }
+-    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) )
++    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
+     {
++        ::formula::FormulaGrammar::AddressConvention aConv = ::formula::FormulaGrammar::CONV_OOO; 
++        if ( aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
++            aConv = ::formula::FormulaGrammar::CONV_XL_A1; 
++
+         //  generate file format string - always include sheet
+         String aFormatStr;
+-        aRange.aStart.Format( aFormatStr, SCA_VALID | SCA_TAB_3D, pDoc );
++        aRange.aStart.Format( aFormatStr, SCA_VALID | SCA_TAB_3D, pDoc, aConv );
+         if ( bIsRange )
+         {
+             //  manually concatenate range so both parts always have the sheet name
+             aFormatStr.Append( (sal_Unicode) ':' );
+             String aSecond;
+-            aRange.aEnd.Format( aSecond, SCA_VALID | SCA_TAB_3D, pDoc );
++            USHORT nFlags = SCA_VALID;
++            if( aConv != ::formula::FormulaGrammar::CONV_XL_A1 )
++		nFlags |= SCA_TAB_3D;
++            aRange.aEnd.Format( aSecond, SCA_VALID | SCA_TAB_3D, pDoc, aConv );
+             aFormatStr.Append( aSecond );
+         }
+         aRet <<= rtl::OUString( aFormatStr );
+Index: sc/source/ui/unoobj/servuno.cxx
+===================================================================
+--- sc/source/ui/unoobj/servuno.cxx	(revision 276159)
++++ sc/source/ui/unoobj/servuno.cxx	(revision 276288)
+@@ -38,6 +38,7 @@
+ #include <svx/unofill.hxx>
+ #include <svx/unonrule.hxx>
+ #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
+ 
+ #include "servuno.hxx"
+ #include "unonames.hxx"
+@@ -61,9 +62,154 @@
+ #include <svx/xmleohlp.hxx>
+ #include <svx/xmlgrhlp.hxx>
+ 
++#include <comphelper/processfactory.hxx>
++#include <com/sun/star/document/XCodeNameQuery.hpp>
++#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
++#include <com/sun/star/form/XFormsSupplier.hpp>
++#include <com/sun/star/script/ScriptEventDescriptor.hpp>
++#include <comphelper/componentcontext.hxx>
++#include <cppuhelper/component_context.hxx>
++#include <vbahelper/vbahelper.hxx>
+ using namespace ::com::sun::star;
+ 
++class ScVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
++{
++    uno::Any maWorkbook;
++    uno::Any maCachedObject;
++    ScDocShell* mpDocShell;
++public:
++    ScVbaObjectForCodeNameProvider( ScDocShell* pDocShell ) : mpDocShell( pDocShell )
++    {
++        ScDocument* pDoc = mpDocShell->GetDocument();
++        if ( !pDoc )
++            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")), uno::Reference< uno::XInterface >() );
+ 
++        uno::Sequence< uno::Any > aArgs(2);
++        aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
++        aArgs[1] = uno::Any( mpDocShell->GetModel() );
++        maWorkbook <<= ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs );
++    }
++
++    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
++    {
++        maCachedObject = uno::Any(); // clear cached object
++        String sName = aName;
++        ScDocument* pDoc = mpDocShell->GetDocument();
++        if ( !pDoc )
++            throw uno::RuntimeException();
++        if ( sName == pDoc->GetCodeName() )
++            maCachedObject = maWorkbook;
++        else 
++        {
++            String sCodeName;
++            SCTAB nCount = pDoc->GetTableCount();
++            for( SCTAB i = 0; i < nCount; i++ )
++            {
++                pDoc->GetCodeName( i, sCodeName );
++                if( sCodeName == sName )
++                {
++                    String sSheetName;
++                    if( pDoc->GetName( i, sSheetName ) )
++                    {
++                        uno::Reference< frame::XModel > xModel( mpDocShell->GetModel() );
++                        uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xModel, uno::UNO_QUERY_THROW );
++                        uno::Reference<sheet::XSpreadsheets > xSheets( xSpreadDoc->getSheets(), uno::UNO_QUERY_THROW );
++                        uno::Reference< container::XIndexAccess > xIndexAccess( xSheets, uno::UNO_QUERY_THROW );
++                        uno::Reference< sheet::XSpreadsheet > xSheet( xIndexAccess->getByIndex( i ), uno::UNO_QUERY_THROW );
++                        uno::Sequence< uno::Any > aArgs(3);
++                        aArgs[0] = maWorkbook;
++                        aArgs[1] = uno::Any( xModel );
++                        aArgs[2] = uno::Any( rtl::OUString( sSheetName ) );
++                        maCachedObject <<= ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Worksheet", aArgs );
++                        break;
++                    }
++                }
++            }
++        }
++        return maCachedObject.hasValue();
++
++    }
++    ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
++    {
++        OSL_TRACE("ScVbaObjectForCodeNameProvider::getByName( %s )",
++            rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() );
++        if ( !hasByName( aName ) )
++            throw ::com::sun::star::container::NoSuchElementException();
++        return maCachedObject;
++    }
++    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (::com::sun::star::uno::RuntimeException)
++    {
++        ScDocument* pDoc = mpDocShell->GetDocument();
++        if ( !pDoc )
++            throw uno::RuntimeException();
++        SCTAB nCount = pDoc->GetTableCount();
++        uno::Sequence< rtl::OUString > aNames( nCount + 1 ); 
++        SCTAB index = 0;
++        String sCodeName;
++        for( ; index < nCount; ++index )
++        {
++            pDoc->GetCodeName( index, sCodeName );
++            aNames[ index ] = sCodeName;
++        }
++        aNames[ index ] = pDoc->GetCodeName();
++        return aNames;
++    }
++    // XElemenAccess
++    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw (::com::sun::star::uno::RuntimeException){ return uno::Type(); }
++    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException ) { return sal_True; }
++
++};
++
++class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >
++{
++ScDocShell* mpDocShell;
++public:
++    ScVbaCodeNameProvider( ScDocShell* pDocShell ) : mpDocShell( pDocShell ) {}
++    // XCodeNameQuery
++    rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
++    {
++        rtl::OUString sCodeName;
++        if ( mpDocShell )
++        {
++            OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject");
++            // need to find the page ( and index )  for this control
++            uno::Reference< drawing::XDrawPagesSupplier > xSupplier( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
++            uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW );
++            sal_Int32 nLen = xIndex->getCount();
++            bool bMatched = false;
++            uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;
++            for ( sal_Int32 index = 0; index < nLen; ++index )
++            {
++                try
++                {
++                    uno::Reference< form::XFormsSupplier >  xFormSupplier( xIndex->getByIndex( index ), uno::UNO_QUERY_THROW );
++                    uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
++                    // get the www-standard container
++                    uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );
++                    sal_Int32 nCntrls = xFormControls->getCount();
++                    for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
++                    {
++                        uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );	
++                        bMatched = ( xControl == xIf );
++                        if ( bMatched )
++                        {
++                            String sName;
++                            mpDocShell->GetDocument()->GetCodeName( index, sName );
++                            sCodeName = sName;
++                        }
++                    }
++                }
++                catch( uno::Exception& ) {}
++                if ( bMatched )
++                    break;
++            }
++        }
++        // Probably should throw here ( if !bMatched )
++         return sCodeName;
++    }
++
++};
++
+ //------------------------------------------------------------------------
+ 
+ static const sal_Char* __FAR_DATA aProvNames[SC_SERVICE_COUNT] =
+@@ -112,7 +258,9 @@ static const sal_Char* __FAR_DATA aProvNames[SC_SE
+ 
+         SC_SERVICENAME_CHDATAPROV,                  // SC_SERVICE_CHDATAPROV
+         SC_SERVICENAME_FORMULAPARS,                 // SC_SERVICE_FORMULAPARS
+-        SC_SERVICENAME_OPCODEMAPPER                 // SC_SERVICE_OPCODEMAPPER
++        SC_SERVICENAME_OPCODEMAPPER,                 // SC_SERVICE_OPCODEMAPPER
++"ooo.vba.VBAObjectModuleObjectProvider",// SC_SERVICE_VBAOBJECTPROVIDER
++"ooo.vba.VBACodeNameProvider",// SC_SERVICE_VBACODENAMEPROVIDER
+ 	};
+ 
+ //
+@@ -164,7 +312,9 @@ static const sal_Char* __FAR_DATA aOldNames[SC_SER
+         "",                                         // SC_SERVICE_SHEETDOCSET
+         "",                                         // SC_SERVICE_CHDATAPROV
+         "",                                         // SC_SERVICE_FORMULAPARS
+-        ""                                          // SC_SERVICE_OPCODEMAPPER
++        "",                                         // SC_SERVICE_OPCODEMAPPER
++        "",                                         // SC_SERVICE_VBAOBJECTPROVIDER
++        "",                                         // SC_SERVICE_VBACODENAMEPROVIDER
+ 	};
+ 
+ 
+@@ -363,6 +513,12 @@ uno::Reference<uno::XInterface> ScServiceProvider:
+                 xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> (pComp))));
+             }
+             break;
++        case SC_SERVICE_VBAOBJECTPROVIDER:
++            xRet.set(static_cast<container::XNameAccess*>(new ScVbaObjectForCodeNameProvider( pDocShell )));
++            break;
++        case SC_SERVICE_VBACODENAMEPROVIDER:
++            xRet.set(static_cast<document::XCodeNameQuery*>(new ScVbaCodeNameProvider( pDocShell )));
++            break;
+ 	}
+ 	return xRet;
+ }
+Index: sc/source/ui/docshell/docfunc.cxx
+===================================================================
+--- sc/source/ui/docshell/docfunc.cxx	(revision 276159)
++++ sc/source/ui/docshell/docfunc.cxx	(revision 276288)
+@@ -51,6 +51,12 @@
+ #include <svtools/zforlist.hxx>
+ #include <svtools/PasswordHelper.hxx>
+ 
++#include <basic/sbstar.hxx>
++#include <com/sun/star/container/XNameContainer.hpp>
++#include <com/sun/star/script/XLibraryContainer.hpp>
++#include <com/sun/star/script/ModuleInfo.hpp>
++#include <com/sun/star/script/ModuleType.hpp>
++
+ #include <list>
+ 
+ #include "docfunc.hxx"
+@@ -101,6 +107,7 @@
+ using namespace com::sun::star;
+ using ::com::sun::star::uno::Sequence;
+ 
++
+ // STATIC DATA -----------------------------------------------------------
+ 
+ //========================================================================
+@@ -2579,7 +2586,93 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource,
+ }
+ 
+ //------------------------------------------------------------------------
++uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, String& sCodeName )
++{
++    uno::Reference< lang::XMultiServiceFactory> xSF(rDocSh.GetModel(), uno::UNO_QUERY);
++    uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess;
++    uno::Reference< uno::XInterface > xDocModuleApiObject;
++    if ( xSF.is() )
++    {
++        xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY );    
++        xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY );    
++    }
++    return xDocModuleApiObject;
+ 
++}
++
++script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule, String& sSource )
++{
++    ::rtl::OUString aModName( sModule );
++    ::rtl::OUString sVbaOption( RTL_CONSTASCII_USTRINGPARAM( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" ));
++    script::ModuleInfo sModuleInfo;
++    sModuleInfo.ModuleName = aModName;
++    if ( sSource.Len() > 0 )
++        sModuleInfo.ModuleSource = sSource;
++    else
++        sModuleInfo.ModuleSource = sVbaOption;
++    sModuleInfo.ModuleType = script::ModuleType::Document;
++    sModuleInfo.ModuleObject = GetDocModuleObject( rDocSh, sModule );
++    return sModuleInfo;
++}
++
++void lcl_InsertModule( ScDocShell& rDocSh, SCTAB nTab, String& sModuleName, String& sSource )
++{
++    SFX_APP()->EnterBasicCall();
++    script::ModuleInfo sModuleInfo = lcl_InitModuleInfo(  rDocSh, sModuleName, sSource );
++    uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer();
++    DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
++
++    uno::Reference< container::XNameContainer > xLib;
++    if( xLibContainer.is() )
++    {
++        String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
++        uno::Any aLibAny = xLibContainer->getByName( aLibName );
++        aLibAny >>= xLib;
++    }
++    if( xLib.is() )
++    {
++        // if the Module with codename exists then find a new name
++        sal_Int32 nNum = 1;
++        sModuleInfo.ModuleName = sModuleName;
++        while( xLib->hasByName( sModuleInfo.ModuleName  ) )
++        {
++            sModuleInfo.ModuleName = rtl::OUString::createFromAscii( "Sheet" ) + rtl::OUString::valueOf( nNum );
++            nNum += 1;
++        }
++        uno::Any aSourceAny;
++        aSourceAny <<= sModuleInfo;
++        xLib->insertByName( sModuleInfo.ModuleName, aSourceAny );
++        ScDocument* pDoc = rDocSh.GetDocument();
++        String sCodeName( sModuleInfo.ModuleName );
++        pDoc->SetCodeName( nTab, sCodeName );
++    }
++    SFX_APP()->LeaveBasicCall();
++}
++
++void lcl_DeleteModule( ScDocShell& rDocSh, String& sModuleName )
++{
++    SFX_APP()->EnterBasicCall();
++    uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer();
++    DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
++
++    uno::Reference< container::XNameContainer > xLib;
++    if( xLibContainer.is() )
++    {
++        String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
++        uno::Any aLibAny = xLibContainer->getByName( aLibName );
++        aLibAny >>= xLib;
++    }
++    if( xLib.is() )
++    {
++        if( xLib->hasByName( sModuleName ) )
++        {
++            xLib->removeByName( sModuleName );
++        }
++    }
++    SFX_APP()->LeaveBasicCall();
++}
++
++
+ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi )
+ {
+ 	BOOL bSuccess = FALSE;
+@@ -2588,8 +2681,18 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const Str
+ 	ScDocShellModificator aModificator( rDocShell );
+ 
+ 	ScDocument* pDoc = rDocShell.GetDocument();
+-	if (bRecord && !pDoc->IsUndoEnabled())
++    // Strange loop, also basic is loaded too early ( InsertTable )
++    // is called via the xml import for sheets in described in odf 
++    BOOL bInsertDocModule = false;
++
++    if(  !rDocShell.GetDocument()->IsImportingXML() )
++    {
++        StarBASIC* pStarBASIC = rDocShell.GetBasic(); 
++        bInsertDocModule = pStarBASIC ? pStarBASIC->isVBAEnabled() : false;
++    }
++	if ( bInsertDocModule || ( bRecord && !pDoc->IsUndoEnabled() ) )
+ 		bRecord = FALSE;
++
+ 	if (bRecord)
+ 		pDoc->BeginDrawUndo();							//	InsertTab erzeugt ein SdrUndoNewPage
+ 
+@@ -2600,10 +2703,19 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const Str
+ 
+ 	if (pDoc->InsertTab( nTab, rName ))
+ 	{
++		String sCodeName;
+ 		if (bRecord)
+ 			rDocShell.GetUndoManager()->AddUndoAction(
+ 						new ScUndoInsertTab( &rDocShell, nTab, bAppend, rName));
+ 		//	Views updaten:
++        // Only insert vba modules if vba mode ( and not currently importing XML )
++        if( bInsertDocModule )
++        {
++            if ( sCodeName.Len() == 0 )
++		sCodeName = rName;
++            String sSource;
++            lcl_InsertModule( rDocShell, nTab, sCodeName, sSource );
++        }
+ 		rDocShell.Broadcast( ScTablesHint( SC_TAB_INSERTED, nTab ) );
+ 
+ 		rDocShell.PostPaintExtras();
+@@ -2625,8 +2737,12 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRec
+ 
+ 	BOOL bSuccess = FALSE;
+ 	ScDocument* pDoc = rDocShell.GetDocument();
++    StarBASIC* pStarBASIC = rDocShell.GetBasic();
++    BOOL bVbaEnabled = pStarBASIC->isVBAEnabled();
+ 	if (bRecord && !pDoc->IsUndoEnabled())
+ 		bRecord = FALSE;
++    if ( bVbaEnabled )
++        bRecord = FALSE;
+ 	BOOL bWasLinked = pDoc->IsLinked(nTab);
+ 	ScDocument* pUndoDoc = NULL;
+ 	ScRefUndoData* pUndoData = NULL;
+@@ -2667,6 +2783,8 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRec
+ 		pUndoData = new ScRefUndoData( pDoc );
+ 	}
+ 
++    String sCodeName;
++    BOOL bHasCodeName = pDoc->GetCodeName( nTab, sCodeName );
+ 	if (pDoc->DeleteTab( nTab, pUndoDoc ))
+ 	{
+ 		if (bRecord)
+@@ -2677,6 +2795,13 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRec
+ 						new ScUndoDeleteTab( &rDocShell, theTabs, pUndoDoc, pUndoData ));
+ 		}
+ 		//	Views updaten:
++        if( bVbaEnabled )
++        {
++            if( bHasCodeName )
++            {
++                lcl_DeleteModule( rDocShell, sCodeName );
++            }
++        }
+ 		rDocShell.Broadcast( ScTablesHint( SC_TAB_DELETED, nTab ) );
+ 
+ 		if (bWasLinked)
+@@ -3921,6 +4046,13 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange,
+ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
+ 							FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi )
+ {
++	double		fStep = 1.0;
++	double		fMax = MAXDOUBLE;
++	return FillAuto( rRange, pTabMark, eDir, FILL_AUTO, FILL_DAY, nCount, fStep, fMax, bRecord, bApi );
++}
++
++BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd	eDateCmd, ULONG nCount, double fStep, double fMax,  BOOL bRecord, BOOL bApi )
++{
+ 	ScDocShellModificator aModificator( rDocShell );
+ 
+ 	ScDocument* pDoc = rDocShell.GetDocument();
+@@ -3946,10 +4078,6 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const S
+ 	ScRange aSourceArea = rRange;
+ 	ScRange aDestArea   = rRange;
+ 
+-	FillCmd		eCmd = FILL_AUTO;
+-	FillDateCmd	eDateCmd = FILL_DAY;
+-	double		fStep = 1.0;
+-	double		fMax = MAXDOUBLE;
+ 
+ 	switch (eDir)
+ 	{
+Index: sc/source/ui/docshell/makefile.mk
+===================================================================
+--- sc/source/ui/docshell/makefile.mk	(revision 276159)
++++ sc/source/ui/docshell/makefile.mk	(revision 276288)
+@@ -95,7 +95,8 @@ SLOFILES =  \
+         $(SLO)$/hiranges.obj \
+         $(SLO)$/pntlock.obj \
+         $(SLO)$/sizedev.obj \
+-        $(SLO)$/editable.obj
++        $(SLO)$/editable.obj \
++	$(SLO)$/macromgr.obj
+ 
+ 
+ EXCEPTIONSFILES= \
+@@ -105,7 +106,8 @@ EXCEPTIONSFILES= \
+         $(SLO)$/docsh8.obj \
+         $(SLO)$/externalrefmgr.obj \
+         $(SLO)$/dbdocimp.obj \
+-        $(SLO)$/docfunc.obj
++        $(SLO)$/docfunc.obj \
++	$(SLO)$/macromgr.obj
+ 
+ SRS1NAME=$(TARGET)
+ SRC1FILES =  tpstat.src
+@@ -135,7 +137,8 @@ LIB1OBJFILES =  \
+         $(SLO)$/hiranges.obj \
+         $(SLO)$/pntlock.obj \
+         $(SLO)$/sizedev.obj \
+-        $(SLO)$/editable.obj
++        $(SLO)$/editable.obj \
++	$(SLO)$/macromgr.obj
+ 
+ # --- Tagets -------------------------------------------------------
+ 
+Index: sc/source/ui/docshell/docsh5.cxx
+===================================================================
+--- sc/source/ui/docshell/docsh5.cxx	(revision 276159)
++++ sc/source/ui/docshell/docsh5.cxx	(revision 276288)
+@@ -68,7 +68,12 @@
+ #include "sc.hrc"
+ #include "waitoff.hxx"
+ #include "sizedev.hxx"
++#include <basic/sbstar.hxx>
++#include <basic/basmgr.hxx>
+ 
++// defined in docfunc.cxx
++void lcl_InsertModule( ScDocShell& rDocSh, SCTAB nTab, String& sModuleName, String& sModuleSource );
++
+ // ---------------------------------------------------------------------------
+ 
+ //
+@@ -871,8 +876,45 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB n
+ 				GetUndoManager()->AddUndoAction(
+ 						new ScUndoCopyTab( this, aSrcList, aDestList ) );
+ 			}
++			
++			StarBASIC* pStarBASIC = GetBasic();
++        		String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
++                        if ( GetBasicManager()->GetName().Len() > 0 )
++			{
++				aLibName = GetBasicManager()->GetName();
++				pStarBASIC = GetBasicManager()->GetLib( aLibName );
+ 		}
++			BOOL bVbaEnabled = pStarBASIC ? pStarBASIC->isVBAEnabled() : FALSE;
++			SCTAB nTabToUse = nDestTab; 
+ 
++			if ( nDestTab == SC_TAB_APPEND )
++				nTabToUse = aDocument.GetMaxTableNumber() - 1;
++
++			if ( bVbaEnabled )
++			{
++				String sCodeName;
++				String sSource;
++				aDocument.GetCodeName( nTabToUse, sCodeName );
++				com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > xLibContainer = GetBasicContainer();
++				com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > xLib;
++    				if( xLibContainer.is() )
++    				{
++        				com::sun::star::uno::Any aLibAny = xLibContainer->getByName( aLibName );
++        				aLibAny >>= xLib;
++    				}
++    				if( xLib.is() )
++    				{
++					String sSrcCodeName;
++					aDocument.GetCodeName( nSrcTab, sSrcCodeName );
++					rtl::OUString sModName = sSrcCodeName;
++					com::sun::star::script::ModuleInfo sModuleInfo;
++					xLib->getByName( sModName ) >>= sModuleInfo;
++					sSource = sModuleInfo.ModuleSource;
++				} 
++				lcl_InsertModule( *this, nTabToUse, sCodeName, sSource );
++			}
++		}
++
+ 		Broadcast( ScTablesHint( SC_TAB_COPIED, nSrcTab, nDestTab ) );
+ 	}
+ 	else
+Index: sc/source/ui/docshell/docsh.cxx
+===================================================================
+--- sc/source/ui/docshell/docsh.cxx	(revision 276159)
++++ sc/source/ui/docshell/docsh.cxx	(revision 276288)
+@@ -128,6 +128,14 @@
+ #include <rtl/logfile.hxx>
+ 
+ #include <comphelper/processfactory.hxx>
++#include "uiitems.hxx"
++#include "cellsuno.hxx"
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
++#include <basic/sbstar.hxx>
++#include <basic/basmgr.hxx>
++using namespace com::sun::star;
++using namespace com::sun::star::document::VbaEventId;
+ 
+ using namespace com::sun::star;
+ 
+@@ -273,7 +281,12 @@ sal_uInt16 ScDocShell::GetHiddenInformationState(
+ void ScDocShell::BeforeXMLLoading()
+ {
+     aDocument.DisableIdle( TRUE );
++    // suppress VBA events when loading the xml
++    uno::Reference< document::XVbaEventsHelper > xEvt( aDocument.GetVbaEventsHelper() );
++    if ( xEvt.is() )
++       xEvt->setIgnoreEvents( sal_True );
+ 
++// if VBA enabled then we need to  
+     // prevent unnecessary broadcasts and updates
+     DBG_ASSERT(pModificator == NULL, "The Modificator should not exist");
+ 	pModificator = new ScDocShellModificator( *this );
+@@ -358,7 +371,20 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
+     }
+     else
+ 		aDocument.SetInsertingFromOtherDoc( FALSE );
+-
++	// add vba globals ( if they are availabl )
++	SfxObjectShell* pShell = aDocument.GetDocumentShell();
++	if ( pShell )
++	{
++		uno::Any aGlobs;
++                uno::Sequence< uno::Any > aArgs(1);
++                aArgs[ 0 ] <<= pShell->GetModel();
++		aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs );
++		pShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
++	}
++        // suppress VBA events when loading the xml
++        uno::Reference< document::XVbaEventsHelper > xEvt( aDocument.GetVbaEventsHelper() );
++        if ( xEvt.is() )
++            xEvt->setIgnoreEvents( sal_False );
+ 	aDocument.SetImportingXML( FALSE );
+     aDocument.EnableExecuteLink( true );
+     aDocument.EnableUndo( TRUE );
+@@ -480,9 +506,71 @@ BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium
+ 	return bRet;
+ }
+ 
++void lcl_processCompatibleSfxHint( uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper, const SfxHint& rHint )
++{
++    if (rHint.ISA(ScTablesHint) )
++    {
++		USHORT nId = ((ScTablesHint&)rHint).GetId();	
++		SCTAB nTab = ((ScTablesHint&)rHint).GetTab1();	
++        if( nId == SC_TAB_INSERTED )
++        {
++            uno::Sequence< uno::Any > aArgs(1);
++            aArgs[0] <<= nTab;
++            xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_NEWSHEET, aArgs );
++        }
++    }
++    else if ( rHint.ISA( SfxEventHint ) )
++    {
++        ULONG nEventId = ((SfxEventHint&)rHint).GetEventId();
++        switch ( nEventId )
++        {
++            case SFX_EVENT_ACTIVATEDOC:
++            {
++                uno::Sequence< uno::Any > aArgs;
++                xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_ACTIVATE, aArgs );
++            }
++                break;
++            case SFX_EVENT_DEACTIVATEDOC:
++            {
++                uno::Sequence< uno::Any > aArgs;
++                xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_DEACTIVATE, aArgs );
++            }
++                break;
++            /*case SFX_EVENT_CLOSEDOC :
++            {
++                uno::Sequence< uno::Any > aArgs;
++                xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_CLOSE, aArgs );
++            }
++                break;
++            case SFX_EVENT_CLOSEVIEW :
++            {
++                uno::Sequence< uno::Any > aArgs;
++                xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWCOLSE, aArgs );
++            }
++                break;
++            */    
++            case SFX_EVENT_OPENDOC:
++            {
++                // some later than workbook activate.
++                uno::Sequence< uno::Any > aArgs;
++                xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_OPEN, aArgs );
++            }
++                break;
++            default:
++                {
++                }
++                break;
++        }
++    }
++}
+ 
+ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
+ {
++    uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( aDocument.GetVbaEventsHelper(), uno::UNO_QUERY );
++    if ( xVbaEventsHelper.is() )
++    {
++        lcl_processCompatibleSfxHint( xVbaEventsHelper, rHint );
++    }
+ 	if (rHint.ISA(SfxSimpleHint))								// ohne Parameter
+ 	{
+ 		ULONG nSlot = ((const SfxSimpleHint&)rHint).GetId();
+@@ -2129,6 +2217,16 @@ USHORT __EXPORT ScDocShell::PrepareClose( BOOL bUI
+ 
+ 	DoEnterHandler();
+ 
++	// start handler for possible veto from DocBefore_Close
++    uno::Sequence< uno::Any > aArgs;
++    uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( aDocument.GetVbaEventsHelper(), uno::UNO_QUERY );
++    if ( !IsInPrepareClose() && xVbaEventsHelper.is() )
++    {
++	    if ( xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFORECLOSE, aArgs ) )
++		    return sal_False;
++    }
++	// end handler code
++
+ 	USHORT nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing );
+ 	if (nRet == TRUE)						// TRUE = schliessen
+ 		aDocument.DisableIdle(TRUE);		// nicht mehr drin rumpfuschen !!!
+Index: sc/source/ui/docshell/macromgr.cxx
+===================================================================
+--- sc/source/ui/docshell/macromgr.cxx	(revision 0)
++++ sc/source/ui/docshell/macromgr.cxx	(revision 276288)
+@@ -0,0 +1,217 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: document.hxx,v $
++ * $Revision: 1.115.36.9 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_sc.hxx"
++
++// INCLUDE ---------------------------------------------------------------
++
++#include "macromgr.hxx"
++#include "document.hxx"
++
++#include "basic/basmgr.hxx"
++#include "cppuhelper/implbase1.hxx"
++#include "sfx2/objsh.hxx"
++#include "cell.hxx"
++#include <com/sun/star/container/XContainer.hpp>
++
++#include <list>
++
++using namespace ::com::sun::star;
++using ::com::sun::star::uno::RuntimeException;
++using ::com::sun::star::uno::Reference;
++using ::rtl::OUString;
++using ::rtl::OUStringHash;
++using ::std::hash_map;
++using ::std::list;
++using ::std::for_each;
++using ::std::pair;
++
++// ============================================================================
++
++/** 
++ * A simple container to keep track of cells that depend on basic modules 
++ * changes.  We don't check for duplicates at insertion time; instead, we 
++ * remove duplicates at query time. 
++ */
++class ScUserMacroDepTracker
++{
++public:
++    void addCell(const OUString& rModuleName, ScFormulaCell* pCell)
++    {
++        ModuleCellMap::iterator itr = maCells.find(rModuleName);
++        if (itr == maCells.end())
++        {
++            pair<ModuleCellMap::iterator, bool> r = maCells.insert(
++                ModuleCellMap::value_type(rModuleName, list<ScFormulaCell*>()));
++
++            if (!r.second)
++                // insertion failed.
++                return;
++
++            itr = r.first;
++        }
++        itr->second.push_back(pCell);
++    }
++
++    void removeCell(ScFormulaCell* pCell)
++    {
++        ModuleCellMap::iterator itr = maCells.begin(), itrEnd = maCells.end();
++        for (; itr != itrEnd; ++itr)
++            itr->second.remove(pCell);
++    }
++
++    void getCellsByModule(const OUString& rModuleName, list<ScFormulaCell*>& rCells)
++    {
++        ModuleCellMap::iterator itr = maCells.find(rModuleName);
++        if (itr == maCells.end())
++            return;
++
++        list<ScFormulaCell*>& rCellList = itr->second;
++
++        // Remove duplicates.
++        rCellList.sort();
++        rCellList.unique();
++        // exception safe copy
++        list<ScFormulaCell*> temp(rCellList);
++        rCells.swap(temp);
++    }
++
++private:
++    typedef hash_map<OUString, list<ScFormulaCell*>, OUStringHash> ModuleCellMap;
++    ModuleCellMap maCells;
++};
++
++
++// ============================================================================
++
++ScMacroManager::ScMacroManager(ScDocument* pDoc) :
++    mpDepTracker(new ScUserMacroDepTracker),
++    mpDoc(pDoc)
++{
++}
++
++ScMacroManager::~ScMacroManager()
++{
++}
++
++typedef ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener > ContainerListenerHelper;
++
++class VBAProjectListener : public ContainerListenerHelper
++{
++    ScMacroManager* mpMacroMgr;
++public:
++    VBAProjectListener( ScMacroManager* pMacroMgr ) : mpMacroMgr( pMacroMgr ) {}
++    // XEventListener
++    virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException) {}
++
++    // XContainerListener
++    virtual void SAL_CALL elementInserted( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException){}
++    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) throw(RuntimeException)
++    {
++        rtl::OUString sModuleName;
++        Event.Accessor >>= sModuleName;
++        OSL_TRACE("VBAProjectListener::elementReplaced(%s)", rtl::OUStringToOString( sModuleName, RTL_TEXTENCODING_UTF8 ).getStr() );
++        mpMacroMgr->InitUserFuncData();
++        mpMacroMgr->BroadcastModuleUpdate(sModuleName);
++    }
++    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException){}
++
++};
++
++void ScMacroManager::InitUserFuncData()
++{
++    // Clear hash_map
++    mhFuncToVolatile.clear();
++    String sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
++
++    Reference< container::XContainer > xModuleContainer;
++    SfxObjectShell* pShell = mpDoc->GetDocumentShell();
++    if ( pShell && pShell->GetBasicManager()->GetName().Len() > 0 )
++        sProjectName = pShell->GetBasicManager()->GetName();
++    try
++    { 
++        Reference< script::XLibraryContainer > xLibraries( pShell->GetBasicContainer(), uno::UNO_QUERY_THROW );
++        xModuleContainer.set( xLibraries->getByName( sProjectName ), uno::UNO_QUERY_THROW );
++        
++        if ( xModuleContainer.is() )
++        {
++            // remove old listener ( if there was one )
++            if ( mxContainerListener.is() )
++                xModuleContainer->removeContainerListener( mxContainerListener );
++            // Create listener
++            mxContainerListener = new VBAProjectListener( this );
++            xModuleContainer->addContainerListener( mxContainerListener );
++        }
++    }
++    catch( uno::Exception& )
++    {
++    }
++}
++
++void ScMacroManager::SetUserFuncVolatile( const OUString& sName, bool isVolatile )
++{
++    mhFuncToVolatile[ sName ] = isVolatile;
++}
++
++bool ScMacroManager::GetUserFuncVolatile( const OUString& sName )
++{
++    NameBoolMap::iterator it = mhFuncToVolatile.find( sName );
++    if ( it == mhFuncToVolatile.end() )
++        return false;
++    return it->second;
++}
++
++void ScMacroManager::AddDependentCell(const OUString& aModuleName, ScFormulaCell* pCell)
++{
++    mpDepTracker->addCell(aModuleName, pCell);
++}
++
++void ScMacroManager::RemoveDependentCell(ScFormulaCell* pCell)
++{
++    mpDepTracker->removeCell(pCell);
++}
++
++void ScMacroManager::BroadcastModuleUpdate(const OUString& aModuleName)
++{
++    list<ScFormulaCell*> aCells;
++    mpDepTracker->getCellsByModule(aModuleName, aCells);
++    list<ScFormulaCell*>::iterator itr = aCells.begin(), itrEnd = aCells.end();
++    for (; itr != itrEnd; ++itr)
++    {   
++        ScFormulaCell* pCell = *itr; 
++        mpDoc->PutInFormulaTree(pCell); // for F9 recalc
++
++        // for recalc on cell value change.  If the cell is not volatile, the
++        // cell stops listening right away after it gets re-interpreted.
++        mpDoc->StartListeningArea(BCA_LISTEN_ALWAYS, pCell);
++    }
++}
++
+Index: sc/source/ui/attrdlg/scdlgfact.hxx
+===================================================================
+--- sc/source/ui/attrdlg/scdlgfact.hxx	(revision 276159)
++++ sc/source/ui/attrdlg/scdlgfact.hxx	(revision 276288)
+@@ -40,6 +40,7 @@ class ScDataPilotDatabaseDlg;
+ class ScDataPilotSourceTypeDlg;
+ class ScDataPilotServiceDlg;
+ class ScDeleteCellDlg;
++class ScDataFormDlg;
+ class ScDeleteContentsDlg;
+ class ScFillSeriesDlg;
+ class ScGroupDlg;
+@@ -164,6 +165,12 @@ class AbstractScDeleteCellDlg_Impl : public Abstra
+ 	virtual DelCellCmd GetDelCellCmd() const;
+ };
+ 
++//for dataform
++class AbstractScDataFormDlg_Impl : public AbstractScDataFormDlg  //add for ScDataFormDlg
++{
++	DECL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl,ScDataFormDlg);
++};
++
+ class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg  //add for ScDeleteContentsDlg
+ {
+ 	DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg)
+@@ -412,6 +419,9 @@ class ScAbstractDialogFactory_Impl : public ScAbst
+ 	virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId,
+ 															BOOL bDisallowCellMove = FALSE ); //add for ScDeleteCellDlg
+ 
++	//for dataform
++	virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell*      pTabViewShell); //add for ScDeleteCellDlg
++
+ 	virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
+ 																 USHORT  nCheckDefaults = 0 );
+ 
+Index: sc/source/ui/attrdlg/scdlgfact.cxx
+===================================================================
+--- sc/source/ui/attrdlg/scdlgfact.cxx	(revision 276159)
++++ sc/source/ui/attrdlg/scdlgfact.cxx	(revision 276288)
+@@ -80,6 +80,8 @@
+ #include "tpusrlst.hxx" //add for ScTpUserLists
+ #include "tpview.hxx" //add for ScTpContentOptions
+ #include "tpformula.hxx"
++//for dataform
++#include "datafdlg.hxx" //add for ScDataFormDlg
+ 
+ // ause
+ #include "editutil.hxx"
+@@ -93,6 +95,8 @@ IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_I
+ IMPL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl); //add for ScDataPilotSourceTypeDlg
+ IMPL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl); //add for ScDataPilotServiceDlg
+ IMPL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl); //add for ScDeleteCellDlg
++//for dataform
++IMPL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl); //add for ScDataFormDlg
+ IMPL_ABSTDLG_BASE(AbstractScDeleteContentsDlg_Impl); //add for ScDeleteContentsDlg
+ IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl); //add for ScFillSeriesDlg
+ IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl); //add for ScGroupDlg
+@@ -820,6 +824,26 @@ AbstractScDeleteCellDlg* ScAbstractDialogFactory_I
+ 
+ //add for ScDeleteCellDlg  end
+ 
++//add for ScDataFormDlg begin
++AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell*	pTabViewShell )
++{
++	ScDataFormDlg * pDlg=NULL;
++	switch ( nId )
++	{
++		case RID_SCDLG_DATAFORM :
++			pDlg = new ScDataFormDlg( pParent, pTabViewShell);
++			break;
++		default:
++			break;
++	}
++
++	if ( pDlg )
++		return new AbstractScDataFormDlg_Impl( pDlg );
++	return 0;
++}
++
++//add for ScDataFormDlg  end
++
+ //add for ScDeleteContentsDlg begin
+ AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
+ 																 USHORT  nCheckDefaults )
+Index: sc/source/ui/undo/undodat.cxx
+===================================================================
+--- sc/source/ui/undo/undodat.cxx	(revision 276159)
++++ sc/source/ui/undo/undodat.cxx	(revision 276288)
+@@ -54,6 +54,8 @@
+ #include "dpobject.hxx"
+ #include "attrib.hxx"
+ #include "sc.hrc"
++#include "chgtrack.hxx"  // Amelia Wang
++#include "refundo.hxx"  // Amelia Wang
+ 
+ // -----------------------------------------------------------------------
+ 
+@@ -74,6 +76,7 @@ TYPEINIT1(ScUndoRepeatDB,           ScSimpleUndo);
+ TYPEINIT1(ScUndoDataPilot,          ScSimpleUndo);
+ TYPEINIT1(ScUndoConsolidate,        ScSimpleUndo);
+ TYPEINIT1(ScUndoChartData,          ScSimpleUndo);
++TYPEINIT1(ScUndoDataForm,           SfxUndoAction);    // amelia
+ 
+ // -----------------------------------------------------------------------
+ 
+@@ -2179,8 +2182,210 @@ BOOL __EXPORT ScUndoChartData::CanRepeat(SfxRepeat
+ 	return FALSE;
+ }
+ 
++// Amelia Wang
++ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell,
++                                SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
++                                SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
++                                const ScMarkData& rMark,
++                                ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
++                                USHORT nNewFlags,
++                                ScRefUndoData* pRefData,
++                                void* /*pFill1*/, void* /*pFill2*/, void* /*pFill3*/,
++                                BOOL bRedoIsFilled ) :
++        ScBlockUndo( pNewDocShell, ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), SC_UNDO_SIMPLE ),
++        aMarkData( rMark ),
++        pUndoDoc( pNewUndoDoc ),
++        pRedoDoc( pNewRedoDoc ),
++        nFlags( nNewFlags ),
++        pRefUndoData( pRefData ),
++        pRefRedoData( NULL ),
++        bRedoFilled( bRedoIsFilled )
++{
++        //      pFill1,pFill2,pFill3 are there so the ctor calls for simple paste (without cutting)
++        //      don't have to be changed and branched for 641.
++        //      They can be removed later.
+ 
++        if ( !aMarkData.IsMarked() )                            // no cell marked:
++                aMarkData.SetMarkArea( aBlockRange );   //  mark paste block
+ 
++        if ( pRefUndoData )
++                pRefUndoData->DeleteUnchanged( pDocShell->GetDocument() );
+ 
++        SetChangeTrack();
++}
+ 
++ScUndoDataForm::~ScUndoDataForm()
++{
++        delete pUndoDoc;
++        delete pRedoDoc;
++        delete pRefUndoData;
++        delete pRefRedoData;
++}
+ 
++String ScUndoDataForm::GetComment() const
++{
++        return ScGlobal::GetRscString( STR_UNDO_PASTE ); 
++}
++
++void ScUndoDataForm::SetChangeTrack()
++{
++        ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack();
++        if ( pChangeTrack && (nFlags & IDF_CONTENTS) )
++                pChangeTrack->AppendContentRange( aBlockRange, pUndoDoc,
++                        nStartChangeAction, nEndChangeAction, SC_CACM_PASTE );
++        else
++                nStartChangeAction = nEndChangeAction = 0;
++}
++
++
++void ScUndoDataForm::Undo()
++{
++        BeginUndo();
++        DoChange( TRUE );
++        ShowTable( aBlockRange );
++        EndUndo();
++        SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
++}
++
++void ScUndoDataForm::Redo()
++{
++        BeginRedo();
++        ScDocument* pDoc = pDocShell->GetDocument();
++        EnableDrawAdjust( pDoc, FALSE );                                //! include in ScBlockUndo?
++        DoChange( FALSE );
++        EnableDrawAdjust( pDoc, TRUE );                                 //! include in ScBlockUndo?
++        EndRedo();
++        SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
++}
++
++void ScUndoDataForm::Repeat(SfxRepeatTarget& /*rTarget*/)
++{
++}
++
++BOOL ScUndoDataForm::CanRepeat(SfxRepeatTarget& rTarget) const
++{
++        return (rTarget.ISA(ScTabViewTarget));
++}
++
++void ScUndoDataForm::DoChange( const BOOL bUndo )
++{
++    ScDocument* pDoc = pDocShell->GetDocument();
++
++    //      RefUndoData for redo is created before first undo
++    //      (with DeleteUnchanged after the DoUndo call)
++    BOOL bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData );
++    if ( bCreateRedoData )
++            pRefRedoData = new ScRefUndoData( pDoc );
++
++    ScRefUndoData* pWorkRefData = bUndo ? pRefUndoData : pRefRedoData;
++
++    //      fuer Undo immer alle oder keine Inhalte sichern
++    USHORT nUndoFlags = IDF_NONE;
++    if (nFlags & IDF_CONTENTS)
++            nUndoFlags |= IDF_CONTENTS;
++    if (nFlags & IDF_ATTRIB)
++            nUndoFlags |= IDF_ATTRIB;
++
++    BOOL bPaintAll = FALSE;
++
++    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
++
++    // marking is in ScBlockUndo...
++    //ScUndoUtil::MarkSimpleBlock( pDocShell, aBlockRange );
++
++    SCTAB nTabCount = pDoc->GetTableCount();
++    if ( bUndo && !bRedoFilled )
++    {
++        if (!pRedoDoc)
++        {
++            BOOL bColInfo = ( aBlockRange.aStart.Row()==0 && aBlockRange.aEnd.Row()==MAXROW );
++            BOOL bRowInfo = ( aBlockRange.aStart.Col()==0 && aBlockRange.aEnd.Col()==MAXCOL );
++
++            pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
++            pRedoDoc->InitUndoSelected( pDoc, aMarkData, bColInfo, bRowInfo );
++        }
++        //  read "redo" data from the document in the first undo
++            //  all sheets - CopyToDocument skips those that don't exist in pRedoDoc
++        ScRange aCopyRange = aBlockRange;
++        aCopyRange.aStart.SetTab(0);
++        aCopyRange.aEnd.SetTab(nTabCount-1);
++        pDoc->CopyToDocument( aCopyRange, 1, FALSE, pRedoDoc );
++        bRedoFilled = TRUE;
++    }
++
++    USHORT nExtFlags = 0;
++    pDocShell->UpdatePaintExt( nExtFlags, aBlockRange );
++
++    for ( sal_uInt16 i=0; i <= ( aBlockRange.aEnd.Col() - aBlockRange.aStart.Col() ); i++ )
++    {
++        String aOldString;
++        pUndoDoc->GetString( aBlockRange.aStart.Col()+i , aBlockRange.aStart.Row() , aBlockRange.aStart.Tab() , aOldString );
++        pDoc->SetString( aBlockRange.aStart.Col()+i , aBlockRange.aStart.Row() , aBlockRange.aStart.Tab() , aOldString );
++    }
++
++    //ScRange aTabSelectRange = aBlockRange;
++
++    if (pWorkRefData)
++    {
++        pWorkRefData->DoUndo( pDoc, TRUE );             // TRUE = bSetChartRangeLists for SetChartListenerCollection
++        if ( pDoc->RefreshAutoFilter( 0,0, MAXCOL,MAXROW, aBlockRange.aStart.Tab() ) )
++            bPaintAll = TRUE;
++    }
++
++    if ( bCreateRedoData && pRefRedoData )
++            pRefRedoData->DeleteUnchanged( pDoc );
++    
++    if ( bUndo )
++    {
++        ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
++        if ( pChangeTrack )
++            pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
++    }
++    else
++        SetChangeTrack();
++
++    ScRange aDrawRange( aBlockRange );
++    pDoc->ExtendMerge( aDrawRange, TRUE );      // only needed for single sheet (text/rtf etc.)
++    USHORT nPaint = PAINT_GRID;
++    if (bPaintAll)
++    {
++        aDrawRange.aStart.SetCol(0);
++        aDrawRange.aStart.SetRow(0);
++        aDrawRange.aEnd.SetCol(MAXCOL);
++        aDrawRange.aEnd.SetRow(MAXROW);
++        nPaint |= PAINT_TOP | PAINT_LEFT;
++/*A*/   if (pViewShell)
++            pViewShell->AdjustBlockHeight(FALSE);
++    }
++    else
++    {
++        if ( aBlockRange.aStart.Row() == 0 && aBlockRange.aEnd.Row() == MAXROW )        // ganze Spalte
++        {
++            nPaint |= PAINT_TOP;
++            aDrawRange.aEnd.SetCol(MAXCOL);
++        }
++        if ( aBlockRange.aStart.Col() == 0 && aBlockRange.aEnd.Col() == MAXCOL )        // ganze Zeile
++        {
++            nPaint |= PAINT_LEFT;
++            aDrawRange.aEnd.SetRow(MAXROW);
++        }
++/*A*/   if ((pViewShell) && pViewShell->AdjustBlockHeight(FALSE))
++        {
++            aDrawRange.aStart.SetCol(0);
++            aDrawRange.aStart.SetRow(0);
++            aDrawRange.aEnd.SetCol(MAXCOL);
++            aDrawRange.aEnd.SetRow(MAXROW);
++            nPaint |= PAINT_LEFT;
++        }
++        pDocShell->UpdatePaintExt( nExtFlags, aDrawRange );
++    }
++
++    if ( !bUndo )                               //      draw redo after updating row heights
++        RedoSdrUndoAction( pDrawUndo );                 //!     include in ScBlockUndo?
++
++    pDocShell->PostPaint( aDrawRange, nPaint, nExtFlags );
++
++    pDocShell->PostDataChanged();
++    if (pViewShell)
++        pViewShell->CellContentChanged();
++}
+Index: sc/source/ui/miscdlgs/makefile.mk
+===================================================================
+--- sc/source/ui/miscdlgs/makefile.mk	(revision 276159)
++++ sc/source/ui/miscdlgs/makefile.mk	(revision 276288)
+@@ -45,6 +45,7 @@ LIBTARGET=no
+ # --- Files --------------------------------------------------------
+ 
+ SLOFILES =  \
++	$(SLO)$/datafdlg.obj		\
+ 	$(SLO)$/delcldlg.obj		\
+ 	$(SLO)$/inscldlg.obj		\
+ 	$(SLO)$/delcodlg.obj		\
+Index: sc/source/ui/miscdlgs/datafdlg.cxx
+===================================================================
+--- sc/source/ui/miscdlgs/datafdlg.cxx	(revision 0)
++++ sc/source/ui/miscdlgs/datafdlg.cxx	(revision 276288)
+@@ -0,0 +1,422 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: datafdlg.cxx,v $
++ *
++ *  $Revision: 1.00 $
++ *
++ *  last change: $Author: kz $ $Date: 2006/07/21 14:04:33 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_sc.hxx"
++
++#undef SC_DLLIMPLEMENTATION
++
++//------------------------------------------------------------------
++
++#include "datafdlg.hxx"
++#include "scresid.hxx"
++#include "datafdlg.hrc"
++#include "viewdata.hxx"
++//#include "document.hxx"
++#include "docsh.hxx"
++#include "refundo.hxx"
++#include "undodat.hxx"
++
++#define HDL(hdl)            LINK( this, ScDataFormDlg, hdl )
++
++//zhangyun
++ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell*  pTabViewShellOri) :
++    ModalDialog     ( pParent, ScResId( RID_SCDLG_DATAFORM ) ),
++    //
++    aBtnNew          ( this, ScResId( BTN_DATAFORM_NEW ) ),
++    aBtnDelete          ( this, ScResId( BTN_DATAFORM_DELETE ) ),
++    aBtnRestore          ( this, ScResId( BTN_DATAFORM_RESTORE ) ),
++    aBtnLast          ( this, ScResId( BTN_DATAFORM_LAST ) ),
++    aBtnNext          ( this, ScResId( BTN_DATAFORM_NEXT ) ),
++    aBtnClose          ( this, ScResId( BTN_DATAFORM_CLOSE ) ),
++    aSlider         ( this, ScResId( WND_DATAFORM_SCROLLBAR ) ),
++    aFixedText          ( this, ScResId( LAB_DATAFORM_RECORDNO ) )
++{
++    pTabViewShell = pTabViewShellOri;
++    FreeResource();
++    //read header form current document, and add new controls
++    DBG_ASSERT( pTabViewShell, "pTabViewShell is NULL! :-/" );
++    ScViewData* pViewData = pTabViewShell->GetViewData();
++    
++    pDoc = pViewData->GetDocument();
++    if (pDoc)
++    {
++        ScRange aRange;
++        pViewData->GetSimpleArea( aRange );
++        ScAddress aStart = aRange.aStart;
++        ScAddress aEnd = aRange.aEnd;
++        
++        nStartCol = aStart.Col();
++        nEndCol = aEnd.Col();
++        nStartRow   = aStart.Row();
++        nEndRow = aEnd.Row();
++        
++        nTab = pViewData->GetTabNo();
++        //if there is no selection
++        if ((nStartCol == nEndCol) && (nStartRow == nEndRow))
++            bNoSelection = TRUE;
++        
++        if (bNoSelection)
++        {
++            //find last not blank cell in row
++            for (int i=1;i<=MAX_DATAFORM_COLS;i++)
++            {
++                String  aColName;
++                nEndCol++;
++                pDoc->GetString( nEndCol, nStartRow, nTab, aColName );
++                int nColWidth = pDoc->GetColWidth( nEndCol, nTab );
++                if ( aColName.Len() == 0 && nColWidth)
++                {
++                    nEndCol--;
++                    break;
++                }
++            }
++            
++            //find first not blank cell in row
++            for (int i=1;i<=MAX_DATAFORM_COLS;i++)
++            {
++                String  aColName;
++                if (nStartCol <= 0)
++                    break;
++                nStartCol--;
++
++                pDoc->GetString( nStartCol, nStartRow, nTab, aColName );
++                int nColWidth = pDoc->GetColWidth( nEndCol, nTab );
++                if ( aColName.Len() == 0 && nColWidth)
++                {
++                    nStartCol++;
++                    break;
++                }
++            }
++            
++            //skip leading hide column
++            for (int i=1;i<=MAX_DATAFORM_COLS;i++)
++            {
++                String  aColName;
++                int nColWidth = pDoc->GetColWidth( nStartCol, nTab );
++                if (nColWidth)
++                    break;
++                nStartCol++;
++            }
++
++            if (nEndCol < nStartCol)
++                nEndCol = nStartCol;
++                
++            //find last not blank cell in row
++            for (int i=1;i<=MAX_DATAFORM_ROWS;i++)
++            {
++                String  aColName;
++                nEndRow++;
++                pDoc->GetString( nStartCol, nEndRow, nTab, aColName );
++                if ( aColName.Len() == 0 )
++                {
++                    nEndRow--;
++                    break;
++                }
++            }
++            
++            //find first not blank cell in row
++            for (int i=1;i<=MAX_DATAFORM_ROWS;i++)
++            {
++                String  aColName;
++                if (nStartRow <= 0)
++                    break;
++                nStartRow--;
++
++                pDoc->GetString( nStartCol, nStartRow, nTab, aColName );
++                if ( aColName.Len() == 0 )
++                {
++                    nStartRow++;
++                    break;
++                }
++            }
++
++            if (nEndRow < nStartRow)
++                nEndRow = nStartRow;
++        }
++        
++        aCurrentRow = nStartRow + 1;
++        
++        String  aFieldName;
++
++        int nTop = 12;
++
++        Size    nFixedSize(FIXED_WIDTH, CTRL_HEIGHT );
++        Size    nEditSize(EDIT_WIDTH, CTRL_HEIGHT );
++        
++        //pFtArray = new FixedText(this);
++        aColLength = nEndCol - nStartCol + 1;
++        
++        //new the controls
++        pFixedTexts = new FixedText*[aColLength];
++        pEdits = new Edit*[aColLength];
++        
++        for(sal_uInt16 nIndex = 0; nIndex < aColLength; nIndex++)
++        {
++            pDoc->GetString( nIndex + nStartCol, nStartRow, nTab, aFieldName );
++            int nColWidth = pDoc->GetColWidth( nIndex + nStartCol, nTab );
++            if (nColWidth)
++            {
++                pFixedTexts[nIndex] = new FixedText(this);
++                pEdits[nIndex] = new Edit(this, WB_BORDER);
++        
++                pFixedTexts[nIndex]->SetSizePixel(nFixedSize);
++                pEdits[nIndex]->SetSizePixel(nEditSize);
++                pFixedTexts[nIndex]->SetPosPixel(Point(FIXED_LEFT, nTop));
++                pEdits[nIndex]->SetPosPixel(Point(EDIT_LEFT, nTop));
++                //pFixedTexts[nIndex]->SetText(String::CreateFromAscii("W4W-Filter Nr. "));
++                pFixedTexts[nIndex]->SetText(aFieldName);
++                pFixedTexts[nIndex]->Show();
++                pEdits[nIndex]->Show();
++                
++                nTop += LINE_HEIGHT;
++            }
++            else
++            {
++                pFixedTexts[nIndex] = NULL;
++                pEdits[nIndex] = NULL;
++            }
++        pEdits[nIndex]->SetModifyHdl( HDL(Impl_DataModifyHdl) );
++        }
++        
++        Size nDialogSize = this->GetSizePixel();
++        if (nTop > nDialogSize.Height())
++        {
++            nDialogSize.setHeight(nTop);
++            this->SetSizePixel(nDialogSize);
++        }
++        Size nScrollSize = aSlider.GetSizePixel();
++        nScrollSize.setHeight(nDialogSize.Height()-20);
++        aSlider.SetSizePixel(nScrollSize);
++    }
++    
++    FillCtrls(aCurrentRow);
++    
++    aSlider.SetPageSize( 10 );
++    aSlider.SetVisibleSize( 1 );
++    aSlider.SetLineSize( 1 );
++    aSlider.SetRange( Range( 0, nEndRow - nStartRow + 1) );
++    aSlider.Show();
++    
++    aBtnNew.SetClickHdl     ( HDL(Impl_NewHdl)    );
++    aBtnLast.SetClickHdl    ( HDL(Impl_LastHdl)    );
++    aBtnNext.SetClickHdl    ( HDL(Impl_NextHdl)    );
++    
++    aBtnRestore.SetClickHdl     ( HDL(Impl_RestoreHdl)    );
++    aBtnDelete.SetClickHdl  ( HDL(Impl_DeleteHdl)    );
++    aBtnClose.SetClickHdl   ( HDL(Impl_CloseHdl)    );
++    
++    aSlider.SetEndScrollHdl( HDL( Impl_ScrollHdl ) );
++
++    SetButtonState();
++
++    //end
++    //FreeResource();
++}
++
++ScDataFormDlg::~ScDataFormDlg()
++{
++    for(sal_uInt16 i = 0; i < aColLength; i++)
++    {
++        if (pEdits[i])
++            delete pEdits[i];
++        if (pFixedTexts[i])
++            delete pFixedTexts[i];
++    }
++    if (pEdits)
++        delete pEdits;
++    if (pFixedTexts)
++        delete pFixedTexts;
++}
++
++void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
++{
++    //ScViewData*   pViewData = pTabViewShell->GetViewData();
++    
++    //pDoc = pViewData->GetDocument();
++    String  aFieldName;
++    int nRecordNum = nEndRow - nStartRow;
++    for(sal_uInt16 i = 0; i < aColLength; i++)
++    {
++        if (pEdits[i])
++        {
++            if (aCurrentRow<=nEndRow)
++            {
++                pDoc->GetString( i + nStartCol, aCurrentRow, nTab, aFieldName );
++                pEdits[i]->SetText(aFieldName);
++            }
++            else
++                pEdits[i]->SetText(String());
++        }
++    }
++    char sRecordStr[256];
++    if (aCurrentRow<=nEndRow)
++        aFixedText.SetText(String::CreateFromAscii(sRecordStr));
++    else
++        aFixedText.SetText(String::CreateFromAscii("New Record"));
++        
++    aSlider.SetThumbPos(aCurrentRow-nStartRow-1);
++}
++
++IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit*, pEdit)
++{
++    if ( pEdit->IsModified() )
++        aBtnRestore.Enable( TRUE );
++    return 0;
++}
++
++IMPL_LINK( ScDataFormDlg, Impl_NewHdl, PushButton*, EMPTYARG )
++{
++    ScViewData* pViewData = pTabViewShell->GetViewData();
++    ScDocShell* pDocSh = pViewData->GetDocShell();
++    if ( pDoc )
++    {
++        sal_Bool bHasData = sal_False;
++        for(sal_uInt16 i = 0; i < aColLength; i++)
++            if (pEdits[i])
++                if ( pEdits[i]->GetText().Len() != 0 )
++                {
++                    bHasData = sal_True;
++                    break;
++                }
++
++        if ( bHasData )
++        {
++            pTabViewShell->DataFormPutData( aCurrentRow , nStartRow , nStartCol , nEndRow , nEndCol , pEdits , aColLength );
++            aCurrentRow++;
++            if (aCurrentRow >= nEndRow + 2)
++            {
++                    nEndRow ++ ;
++                    aSlider.SetRange( Range( 0, nEndRow - nStartRow + 1) );
++            }
++            SetButtonState();
++            FillCtrls(aCurrentRow);
++            pDocSh->SetDocumentModified();
++            pDocSh->PostPaintGridAll();
++            }
++    }
++    return 0;
++}
++
++IMPL_LINK( ScDataFormDlg, Impl_LastHdl, PushButton*, EMPTYARG )
++{   
++    if (pDoc)
++    {
++        if ( aCurrentRow > nStartRow +1 )
++            aCurrentRow--;
++
++        SetButtonState();
++        FillCtrls(aCurrentRow);
++    }
++    return 0;
++}
++
++IMPL_LINK( ScDataFormDlg, Impl_NextHdl, PushButton*, EMPTYARG )
++{   
++    if (pDoc)
++    {
++        if ( aCurrentRow <= nEndRow)
++            aCurrentRow++;
++
++        SetButtonState();
++        FillCtrls(aCurrentRow);
++    }
++    return 0;
++}
++
++IMPL_LINK( ScDataFormDlg, Impl_RestoreHdl, PushButton*, EMPTYARG )
++{   
++    if (pDoc)
++    {
++        FillCtrls(aCurrentRow);
++    }
++    return 0;
++}
++
++IMPL_LINK( ScDataFormDlg, Impl_DeleteHdl, PushButton*, EMPTYARG )
++{   
++    ScViewData* pViewData = pTabViewShell->GetViewData();
++    ScDocShell* pDocSh = pViewData->GetDocShell();
++    if (pDoc)
++    {
++        ScRange aRange(nStartCol, aCurrentRow, nTab, nEndCol, aCurrentRow, nTab);
++        pDoc->DeleteRow(aRange);
++        nEndRow--;
++        
++        SetButtonState();
++        pDocSh->GetUndoManager()->Clear();
++
++        FillCtrls(aCurrentRow);
++        pDocSh->SetDocumentModified();
++        pDocSh->PostPaintGridAll();
++    }
++    return 0;
++}
++
++IMPL_LINK( ScDataFormDlg, Impl_CloseHdl, PushButton*, EMPTYARG )
++{   
++    EndDialog( );
++    return 0;
++}
++
++IMPL_LINK( ScDataFormDlg, Impl_ScrollHdl, ScrollBar*, EMPTYARG )
++{   
++    long nOffset = aSlider.GetThumbPos();
++    aCurrentRow = nStartRow + nOffset + 1;
++    SetButtonState();
++    FillCtrls(aCurrentRow);
++    return 0;
++}
++
++void ScDataFormDlg::SetButtonState()
++{
++    if ( aCurrentRow > nEndRow )
++    {
++        aBtnDelete.Enable( FALSE );
++        aBtnLast.Enable( TRUE );
++        aBtnNext.Enable( FALSE );
++    }
++    else
++    {
++        aBtnDelete.Enable( TRUE );
++        aBtnNext.Enable( TRUE );
++    }
++    if ( 1 == aCurrentRow )
++        aBtnLast.Enable( FALSE );
++
++    aBtnRestore.Enable( FALSE );
++    if ( pEdits )
++        pEdits[0]->GrabFocus();
++}
+Index: sc/source/ui/vba/vbaframe.hxx
+===================================================================
+--- sc/source/ui/vba/vbaframe.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaframe.hxx	(revision 276288)
+@@ -1,58 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_FRAME_HXX
+-#define SC_VBA_FRAME_HXX
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/msforms/XLabel.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-
+-typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XLabel > FrameImpl_BASE;
+-
+-class ScVbaFrame : public FrameImpl_BASE
+-{
+-public:
+-    ScVbaFrame(  const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
+-   // Attributes
+-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-#endif //SC_VBA_LABEL_HXX
+Index: sc/source/ui/vba/vbafillformat.cxx
+===================================================================
+--- sc/source/ui/vba/vbafillformat.cxx	(revision 276159)
++++ sc/source/ui/vba/vbafillformat.cxx	(revision 276288)
+@@ -1,202 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbafillformat.cxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-#include <com/sun/star/awt/Gradient.hpp>
+-#include <com/sun/star/awt/GradientStyle.hpp>
+-#include <ooo/vba/office/MsoGradientStyle.hpp>
+-#include "vbafillformat.hxx"
+-#include "vbacolorformat.hxx"
+-
+-using namespace ooo::vba;
+-using namespace com::sun::star;
+-
+-ScVbaFillFormat::ScVbaFillFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaFillFormat_BASE( xParent, xContext ), m_xShape( xShape )
+-{
+-    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
+-    m_nFillStyle = drawing::FillStyle_SOLID;
+-    m_nForeColor = 0;
+-    m_nBackColor = 0;
+-    m_nGradientAngle = 0;
+-}
+-
+-void
+-ScVbaFillFormat::setFillStyle( drawing::FillStyle nFillStyle ) throw (uno::RuntimeException)
+-{
+-    m_nFillStyle = nFillStyle;
+-    if( m_nFillStyle == drawing::FillStyle_GRADIENT )
+-    {
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny( drawing::FillStyle_GRADIENT ) );
+-        awt::Gradient aGradient;
+-        // AXIAL
+-        // RADIAL
+-        // ELLIPTICAL
+-        // SQUARE
+-        // RECT
+-        aGradient.Style = awt::GradientStyle_LINEAR;
+-        aGradient.StartColor = ForeColor()->getRGB();
+-        aGradient.EndColor = BackColor()->getRGB();
+-        aGradient.Angle = m_nGradientAngle;
+-        aGradient.Border = 0;
+-        aGradient.XOffset = 0;
+-        aGradient.YOffset = 0;
+-        aGradient.StartIntensity = 100;
+-        aGradient.EndIntensity = 100;
+-        aGradient.StepCount = 1;
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillGradient"), uno::makeAny( aGradient ) );
+-    }
+-    else if( m_nFillStyle == drawing::FillStyle_SOLID )
+-    {
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny(drawing::FillStyle_SOLID) );
+-    }
+-}
+-
+-void
+-ScVbaFillFormat::setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css::uno::RuntimeException)
+-{
+-    m_nForeColor = nForeColor;
+-    setFillStyle( m_nFillStyle );
+-}
+-
+-// Attributes
+-sal_Bool SAL_CALL 
+-ScVbaFillFormat::getVisible() throw (uno::RuntimeException)
+-{
+-    drawing::FillStyle nFillStyle;
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillStyle") ) >>= nFillStyle;
+-    if( nFillStyle == drawing::FillStyle_NONE )
+-        return sal_False;
+-    return sal_True;
+-}
+-
+-void SAL_CALL 
+-ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
+-{
+-    drawing::FillStyle aFillStyle;
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillStyle") ) >>= aFillStyle;
+-    if( !_visible )
+-    {
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny( drawing::FillStyle_NONE ) );
+-    }
+-    else
+-    {
+-        if( aFillStyle == drawing::FillStyle_NONE )
+-        {
+-            setFillStyle( m_nFillStyle );
+-        }
+-    }
+-}
+-
+-double SAL_CALL 
+-ScVbaFillFormat::getTransparency() throw (uno::RuntimeException)
+-{
+-    sal_Int16 nTransparence = 0;
+-    double dTransparence = 0;
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "FillTransparence" ) ) >>= nTransparence;
+-    dTransparence = static_cast<double>( nTransparence );
+-    dTransparence /= 100;
+-    return dTransparence;
+-}
+-
+-void SAL_CALL 
+-ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeException)
+-{
+-    sal_Int16 nTransparence = static_cast< sal_Int16 >( _transparency * 100 );
+-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillTransparence" ), uno::makeAny( nTransparence ) );
+-}
+-
+-
+-// Methods
+-void SAL_CALL 
+-ScVbaFillFormat::Solid() throw (uno::RuntimeException)
+-{
+-    setFillStyle( drawing::FillStyle_SOLID );
+-}
+-
+-void SAL_CALL 
+-ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) throw (uno::RuntimeException)
+-{
+-    if( style == office::MsoGradientStyle::msoGradientHorizontal )
+-    {
+-        m_nGradientAngle = 0;
+-        setFillStyle( drawing::FillStyle_GRADIENT );
+-    }
+-    else if( style == office::MsoGradientStyle::msoGradientVertical )
+-    {
+-        m_nGradientAngle = 900;
+-        setFillStyle( drawing::FillStyle_GRADIENT );
+-    }
+-    else if( style == office::MsoGradientStyle::msoGradientDiagonalDown )
+-    {
+-        m_nGradientAngle = 450;
+-        setFillStyle( drawing::FillStyle_GRADIENT );
+-    }
+-    else if( style == office::MsoGradientStyle::msoGradientDiagonalUp )
+-    {
+-        m_nGradientAngle = 900 + 450;
+-        setFillStyle( drawing::FillStyle_GRADIENT );
+-    }
+-}
+-
+-uno::Reference< msforms::XColorFormat > SAL_CALL 
+-ScVbaFillFormat::BackColor() throw (uno::RuntimeException)
+-{
+-    if( !m_xColorFormat.is() )
+-        m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_BACKCOLOR ) );
+-    return m_xColorFormat;
+-}
+-
+-uno::Reference< msforms::XColorFormat > SAL_CALL 
+-ScVbaFillFormat::ForeColor() throw (uno::RuntimeException)
+-{
+-    if( !m_xColorFormat.is() )
+-        m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_FORECOLOR ) );
+-    return m_xColorFormat;
+-}
+-
+-
+-rtl::OUString&
+-ScVbaFillFormat::getServiceImplName()
+-{
+-    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFillFormat") );
+-    return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString >
+-ScVbaFillFormat::getServiceNames()
+-{
+-    static uno::Sequence< rtl::OUString > aServiceNames;
+-    if ( aServiceNames.getLength() == 0 )
+-    {
+-        aServiceNames.realloc( 1 );
+-        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.FillFormat" ) );
+-    }
+-    return aServiceNames;
+-}
+-
+Index: sc/source/ui/vba/vbacontrols.cxx
+===================================================================
+--- sc/source/ui/vba/vbacontrols.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacontrols.cxx	(revision 276288)
+@@ -1,227 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile$
+- * $Revision$
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-
+-#include "vbacontrols.hxx"
+-#include "vbacontrol.hxx"
+-#include <cppuhelper/implbase2.hxx>
+-#include <com/sun/star/awt/XControlContainer.hpp>
+-#include <hash_map>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl;
+-
+-typedef  std::hash_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash,
+-    ::std::equal_to< ::rtl::OUString >  > ControlIndexMap;
+-typedef  std::vector< uno::Reference< awt::XControl > > ControlVec;
+-
+-class ControlArrayWrapper : public ArrayWrapImpl
+-{
+-    uno::Reference< awt::XControlContainer > mxDialog;
+-    uno::Sequence< ::rtl::OUString > msNames;
+-    ControlVec mControls;
+-    ControlIndexMap mIndices;
+-
+-    rtl::OUString getControlName( const uno::Reference< awt::XControl >& xCtrl )
+-    {
+-        uno::Reference< beans::XPropertySet > xProp( xCtrl->getModel(), uno::UNO_QUERY );
+-        rtl::OUString sName;
+-        xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
+-        return sName;
+-    }
+-
+-public:
+-
+-    ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
+-    {
+-        mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
+-        uno::Sequence< uno::Reference< awt::XControl > > sXControls = mxDialog->getControls();
+-    
+-        msNames.realloc( sXControls.getLength() );
+-        for ( sal_Int32 i = 0; i < sXControls.getLength(); ++i )
+-        {
+-            uno::Reference< awt::XControl > xCtrl = sXControls[ i ];
+-            msNames[ i ] = getControlName( xCtrl );
+-            mControls.push_back( xCtrl );
+-            mIndices[ msNames[ i ] ] = i;
+-        }
+-    }
+-    
+-    // XElementAccess
+-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
+-    {
+-        return awt::XControl::static_type(0);
+-    }
+-    
+-    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) 
+-    {
+-        return ( mControls.size() > 0 );
+-    }
+-    
+-    // XNameAcess 
+-    virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+-    {
+-        if ( !hasByName( aName ) )
+-            throw container::NoSuchElementException();
+-        return getByIndex( mIndices[ aName ] );
+-    }
+-    
+-    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
+-    {
+-        return msNames;
+-    }
+-    
+-    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
+-    {
+-        ControlIndexMap::iterator it = mIndices.find( aName );
+-        return it != mIndices.end();
+-    }
+-    
+-    // XElementAccess
+-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException)
+-    {
+-        return mControls.size();
+-    }
+-    
+-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
+-    {
+-        if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) )
+-            throw lang::IndexOutOfBoundsException();
+-        return uno::makeAny( mControls[ Index ] );
+-    }
+-};
+-
+-
+-class ControlsEnumWrapper : public EnumerationHelper_BASE
+-{
+-    uno::Reference<XHelperInterface > m_xParent;
+-    uno::Reference<uno::XComponentContext > m_xContext;
+-    uno::Reference<container::XIndexAccess > m_xIndexAccess;
+-    uno::Reference<awt::XControl > m_xDlg;
+-    sal_Int32 nIndex;
+-
+-public:
+-
+-    ControlsEnumWrapper(  const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< awt::XControl >& xDlg ) :  m_xParent( xParent ), m_xContext( xContext), m_xIndexAccess( xIndexAccess ), m_xDlg( xDlg ), nIndex( 0 ) {}
+-
+-    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
+-    {
+-        return ( nIndex < m_xIndexAccess->getCount() );
+-    }
+-
+-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+-    {
+-        if ( nIndex < m_xIndexAccess->getCount() )
+-        {
+-            uno::Reference< frame::XModel > xModel;
+-            uno::Reference< uno::XInterface > xControl;
+-            m_xIndexAccess->getByIndex( nIndex++ ) >>= xControl;
+-            // Create control from awt::XControl
+-            ScVbaControlFactory aFac( m_xContext, xControl,  xModel );
+-            uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( m_xDlg->getModel() ) );
+-            return uno::makeAny( xVBAControl );
+-        }
+-        throw container::NoSuchElementException();
+-    }
+-
+-};
+-
+-
+-uno::Reference<container::XIndexAccess >
+-lcl_controlsWrapper( const uno::Reference< awt::XControl >& xDlg )
+-{
+-    return new ControlArrayWrapper( xDlg );
+-}
+-
+-ScVbaControls::ScVbaControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
+-                const css::uno::Reference< awt::XControl >& xDialog )
+-            : ControlsImpl_BASE( xParent, xContext, lcl_controlsWrapper( xDialog  ) )
+-{
+-    mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
+-}
+-
+-uno::Reference< container::XEnumeration >
+-ScVbaControls::createEnumeration() throw (uno::RuntimeException)
+-{
+-    uno::Reference< container::XEnumeration > xEnum( new ControlsEnumWrapper( mxParent, mxContext, m_xIndexAccess, mxDialog ) );
+-    if ( !xEnum.is() )
+-        throw uno::RuntimeException();
+-    return xEnum;
+-}
+-
+-uno::Any
+-ScVbaControls::createCollectionObject( const css::uno::Any& aSource )
+-{
+-    // Create control from awt::XControl
+-    uno::Reference< awt::XControl > xControl;
+-    aSource >>= xControl;
+-    uno::Reference< frame::XModel > xModel;
+-    ScVbaControlFactory aFac( mxContext, xControl,  xModel );
+-    uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( mxDialog->getModel() ) );
+-    return uno::makeAny( xVBAControl );
+-}
+-
+-void SAL_CALL 
+-ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException)
+-{
+-    uno::Reference< container::XEnumeration > xEnum( createEnumeration() );
+-    while ( xEnum->hasMoreElements() )
+-    {
+-        uno::Reference< msforms::XControl > xControl( xEnum->nextElement(), uno::UNO_QUERY_THROW );
+-        xControl->setLeft( xControl->getLeft() + cx );
+-        xControl->setTop( xControl->getTop() + cy ); 
+-    }
+-}
+-
+-uno::Type
+-ScVbaControls::getElementType() throw (uno::RuntimeException)
+-{
+-    return ooo::vba::msforms::XControl::static_type(0);
+-}
+-rtl::OUString& 
+-ScVbaControls::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControls") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaControls::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Controls" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbalineformat.hxx
+===================================================================
+--- sc/source/ui/vba/vbalineformat.hxx	(revision 276159)
++++ sc/source/ui/vba/vbalineformat.hxx	(revision 276288)
+@@ -1,85 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbalineformat.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_XLINEFORMAT_HXX
+-#define SC_VBA_XLINEFORMAT_HXX
+-
+-#include <com/sun/star/drawing/XShape.hpp>
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-#include <ooo/vba/msforms/XLineFormat.hpp>
+-#include "vbahelperinterface.hxx"
+-
+-typedef InheritedHelperInterfaceImpl1< ov::msforms::XLineFormat > ScVbaLineFormat_BASE;
+-
+-class ScVbaLineFormat : public ScVbaLineFormat_BASE
+-{
+-private:
+-    css::uno::Reference< css::drawing::XShape > m_xShape;
+-    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
+-    sal_Int32 m_nLineDashStyle;
+-    double m_nLineWeight;
+-protected:
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-    sal_Int32 convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName );
+-    rtl::OUString convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (css::uno::RuntimeException);
+-    sal_Int32 calculateArrowheadSize();
+-public:
+-    ScVbaLineFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape );
+-
+-    // Attributes
+-    virtual sal_Int32 SAL_CALL getBeginArrowheadStyle() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getBeginArrowheadLength() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setBeginArrowheadLength( sal_Int32 _beginarrowheadlength ) throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getBeginArrowheadWidth() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setBeginArrowheadWidth( sal_Int32 _beginarrowheadwidth ) throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getEndArrowheadStylel() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setEndArrowheadStylel( sal_Int32 _endarrowheadstylel ) throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getEndArrowheadLength() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setEndArrowheadLength( sal_Int32 _endarrowheadlength ) throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getEndArrowheadWidth() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setEndArrowheadWidth( sal_Int32 _endarrowheadwidth ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getWeight() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setWeight( double _weight ) throw (css::uno::RuntimeException);
+-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException);
+-    virtual sal_Int16 SAL_CALL getStyle() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setStyle( sal_Int16 _style ) throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getDashStyle() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setDashStyle( sal_Int32 _dashstyle ) throw (css::uno::RuntimeException);
+-
+-    // Methods
+-    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException);
+-};
+-
+-#endif//SC_VBA_XLINEFORMAT_HXX
+Index: sc/source/ui/vba/vbacombobox.hxx
+===================================================================
+--- sc/source/ui/vba/vbacombobox.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacombobox.hxx	(revision 276288)
+@@ -1,80 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbacombobox.hxx,v $
+- * $Revision: 1.4 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_COMBOBOX_HXX
+-#define SC_VBA_COMBOBOX_HXX
+-#include <cppuhelper/implbase2.hxx>
+-#include <com/sun/star/uno/XComponentContext.hpp>
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-#include <com/sun/star/script/XDefaultProperty.hpp>
+-#include <ooo/vba/msforms/XComboBox.hpp>
+-#include <comphelper/proparrhlp.hxx>
+-#include <comphelper/propertycontainer.hxx>
+-#include <com/sun/star/beans/PropertyAttribute.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbalistcontrolhelper.hxx"
+-#include "vbahelper.hxx"
+-
+-typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE;
+-class ScVbaComboBox : public ComboBoxImpl_BASE
+-{		
+-	std::auto_ptr< ListControlHelper > mpListHelper;
+-	rtl::OUString sSourceName; 
+-	rtl::OUString msDftPropName;
+-	bool mbDialogType;
+-	
+-public:
+-	ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialogType = false );
+-
+-	// Attributes
+-	virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
+-	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-	virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
+-
+-	// Methods
+-	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
+-	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
+-	// XControl
+-    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
+-
+-	// XDefaultProperty
+-        ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+-	//XHelperInterface
+-	virtual rtl::OUString& getServiceImplName();
+-	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-
+-#endif //
+Index: sc/source/ui/vba/vbatogglebutton.cxx
+===================================================================
+--- sc/source/ui/vba/vbatogglebutton.cxx	(revision 276159)
++++ sc/source/ui/vba/vbatogglebutton.cxx	(revision 276288)
+@@ -1,108 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include "vbatogglebutton.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
+-const static rtl::OUString TOGGLE( RTL_CONSTASCII_USTRINGPARAM("Toggle") );
+-const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
+-ScVbaToggleButton::ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : ToggleButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-    OSL_TRACE("ScVbaToggleButton(ctor)");
+-    m_xProps->setPropertyValue( TOGGLE, uno::makeAny( sal_True ) );
+-}
+-
+-ScVbaToggleButton::~ScVbaToggleButton()
+-{
+-    OSL_TRACE("~ScVbaToggleButton(dtor)");
+-}
+-
+-// Attributes
+-rtl::OUString SAL_CALL 
+-ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException)
+-{
+-    rtl::OUString Label;
+-    m_xProps->getPropertyValue( LABEL ) >>= Label;
+-    return Label;
+-}
+-
+-void SAL_CALL 
+-ScVbaToggleButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaToggleButton::getValue() throw (uno::RuntimeException)
+-{
+-	sal_Int16 nState = 0;
+-    	m_xProps->getPropertyValue( STATE ) >>= nState;
+- 	return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) );
+-}
+-
+-void SAL_CALL 
+-ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
+-{
+-	sal_Int16 nState = 0;
+-	_value >>= nState;
+-        OSL_TRACE( "nState - %d", nState );
+-	nState = ( nState == -1 ) ?  1 : 0;
+-        OSL_TRACE( "nState - %d", nState );
+-	m_xProps->setPropertyValue( STATE, uno::makeAny(  nState ) );
+-}
+-
+-rtl::OUString& 
+-ScVbaToggleButton::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaToggleButton") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaToggleButton::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ToggleButton" ) );
+-	}
+-	return aServiceNames;
+-}
+-
+Index: sc/source/ui/vba/vbalabel.cxx
+===================================================================
+--- sc/source/ui/vba/vbalabel.cxx	(revision 276159)
++++ sc/source/ui/vba/vbalabel.cxx	(revision 276288)
+@@ -1,88 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbalabel.cxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include "vbalabel.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
+-ScVbaLabel::ScVbaLabel(  const css::uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : LabelImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-}
+-
+-// Attributes
+-rtl::OUString SAL_CALL 
+-ScVbaLabel::getCaption() throw (css::uno::RuntimeException)
+-{
+-    rtl::OUString Label;
+-    m_xProps->getPropertyValue( LABEL ) >>= Label;
+-    return Label;
+-}
+-
+-void SAL_CALL 
+-ScVbaLabel::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
+-}
+-uno::Any SAL_CALL 
+-ScVbaLabel::getValue() throw (css::uno::RuntimeException)
+-{
+-    return uno::makeAny( getCaption() );
+-}
+-
+-void SAL_CALL 
+-ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    rtl::OUString sCaption;
+-    _value >>= sCaption;
+-    setCaption( sCaption ); 
+-}
+-
+-
+-rtl::OUString& 
+-ScVbaLabel::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLabel") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaLabel::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbashapes.cxx
+===================================================================
+--- sc/source/ui/vba/vbashapes.cxx	(revision 276159)
++++ sc/source/ui/vba/vbashapes.cxx	(revision 276288)
+@@ -1,394 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbashapes.cxx,v $
+- * $Revision: 1.3.32.1 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include <com/sun/star/container/XNamed.hpp>
+-#include <com/sun/star/view/XSelectionSupplier.hpp>
+-#include <com/sun/star/text/WrapTextMode.hpp>
+-#include <ooo/vba/msforms/XShapeRange.hpp>
+-#include <ooo/vba/office/MsoAutoShapeType.hpp>
+-
+-#include "vbashapes.hxx"
+-#include "vbashape.hxx"
+-#include "vbashaperange.hxx"
+-
+-using namespace ::ooo::vba;
+-using namespace ::com::sun::star;
+-
+-class VbShapeEnumHelper : public EnumerationHelper_BASE
+-{
+-        uno::Reference<msforms::XShapes > m_xParent;
+-        uno::Reference<container::XIndexAccess > m_xIndexAccess;
+-        sal_Int32 nIndex;
+-public:
+-	VbShapeEnumHelper( const uno::Reference< msforms::XShapes >& xParent,  const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
+-        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
+-        {
+-                return ( nIndex < m_xIndexAccess->getCount() );
+-        }
+-        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+-        {
+-                ScVbaShapes* pShapes = dynamic_cast< ScVbaShapes* >(m_xParent.get());
+-                if ( pShapes && hasMoreElements() )
+-                    return pShapes->createCollectionObject(  m_xIndexAccess->getByIndex( nIndex++ ) );
+-                throw container::NoSuchElementException();
+-        }
+-
+-};
+-
+-void ScVbaShapes::initBaseCollection()
+-{
+-	if ( m_xNameAccess.is() ) // already has NameAccess
+-		return;
+-	// no NameAccess then use ShapeCollectionHelper
+-	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec mShapes;
+-	sal_Int32 nLen = m_xIndexAccess->getCount();
+-	mShapes.reserve( nLen );
+-	for ( sal_Int32 index=0; index<nLen; ++index )
+-		mShapes.push_back( uno::Reference< drawing::XShape >( m_xIndexAccess->getByIndex( index ) , uno::UNO_QUERY ) );
+-	uno::Reference< container::XIndexAccess > xShapes( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) );
+-	m_xIndexAccess.set( xShapes, uno::UNO_QUERY );
+-	m_xNameAccess.set( xShapes, uno::UNO_QUERY );
+-}
+-
+-ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes ): ScVbaShapes_BASE( xParent, xContext, xShapes ), m_nNewShapeCount(0)
+-{
+-    m_xShapes.set( xShapes, uno::UNO_QUERY_THROW );
+-    m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); 
+-    initBaseCollection();
+-}
+-
+-uno::Reference< container::XEnumeration >
+-ScVbaShapes::createEnumeration() throw (uno::RuntimeException)
+-{
+-    return new VbShapeEnumHelper( this,  m_xIndexAccess );
+-}
+-
+-uno::Any
+-ScVbaShapes::createCollectionObject( const css::uno::Any& aSource )
+-{
+-    if( aSource.hasValue() )
+-    {
+-        uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW );
+-        return uno::makeAny( uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) ) ) );
+-    }
+-    return uno::Any();
+-}
+-
+-uno::Type
+-ScVbaShapes::getElementType() throw (uno::RuntimeException)
+-{
+-    return ooo::vba::msforms::XShape::static_type(0);
+-}
+-rtl::OUString& 
+-ScVbaShapes::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapes") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaShapes::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Shapes" ) );
+-	}
+-	return aServiceNames;
+-}
+-
+-css::uno::Reference< css::container::XIndexAccess > 
+-ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index  ) throw (uno::RuntimeException)
+-{
+-	if ( Index.getValueTypeClass() != uno::TypeClass_SEQUENCE )
+-		throw uno::RuntimeException();
+-	
+-	uno::Reference< script::XTypeConverter > xConverter = getTypeConverter(mxContext);
+-	uno::Any aConverted;
+-	aConverted = xConverter->convertTo( Index, getCppuType((uno::Sequence< uno::Any >*)0) );
+-
+-	uno::Sequence< uno::Any > sIndices;
+-	aConverted >>= sIndices;
+-	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec mShapes;
+-	sal_Int32 nElems = sIndices.getLength();
+-	for( sal_Int32 index = 0; index < nElems; ++index )
+-	{
+-		uno::Reference< drawing::XShape > xShape;
+-		if ( sIndices[ index ].getValueTypeClass() == uno::TypeClass_STRING )
+-		{
+-			rtl::OUString sName;
+-			sIndices[ index ] >>= sName;
+-			xShape.set( m_xNameAccess->getByName( sName ), uno::UNO_QUERY );
+-		}
+-		else
+-		{
+-			sal_Int32 nIndex = 0;
+-			sIndices[ index ] >>= nIndex;
+-			// adjust for 1 based mso indexing
+-			xShape.set( m_xIndexAccess->getByIndex( nIndex - 1 ), uno::UNO_QUERY );		
+-			
+-		}
+-		// populate map with drawing::XShapes
+-		if ( xShape.is() )
+-			mShapes.push_back( xShape );
+-	}  
+-	uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) );
+-	return xIndexAccess;
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaShapes::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::RuntimeException)
+-{
+-	// I don't think we need to support Array of indices for shapes	
+-/*
+-	if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE )
+-	{
+-		uno::Reference< container::XIndexAccess > xIndexAccess( getShapesByArrayIndices( Index ) );
+-		// return new collection instance
+-		uno::Reference< XCollection > xShapesCollection(  new ScVbaShapes( this->getParent(), mxContext, xIndexAccess ) );
+-		return uno::makeAny( xShapesCollection );
+-	}
+-*/
+-	return 	ScVbaShapes_BASE::Item( Index, Index2 );
+-}
+-
+-uno::Reference< msforms::XShapeRange > SAL_CALL 
+-ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException)
+-{
+-	// shapes, can be an index or an array of indices
+-	uno::Reference< container::XIndexAccess > xShapes;
+-	if ( shapes.getValueTypeClass() == uno::TypeClass_SEQUENCE )
+-		xShapes = getShapesByArrayIndices( shapes );
+-	else
+-	{
+-		// wrap single index into a sequence
+-		uno::Sequence< uno::Any > sIndices(1);
+-		sIndices[ 0 ] = shapes;
+-		uno::Any aIndex;
+-		aIndex <<= sIndices;
+-		xShapes = getShapesByArrayIndices( aIndex );
+-	}
+-	return new ScVbaShapeRange(  getParent(), mxContext, xShapes, m_xDrawPage );
+-}
+-
+-void SAL_CALL 
+-ScVbaShapes::SelectAll() throw (uno::RuntimeException)
+-{
+-    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+-    try
+-    {
+-        xSelectSupp->select( uno::makeAny( m_xShapes ) );
+-    }
+-    // viewuno.cxx ScTabViewObj::select will throw IllegalArgumentException
+-    // if one of the shapes is no 'markable' e.g. a button 
+-    // the method still works
+-    catch( lang::IllegalArgumentException& )
+-    {
+-    }
+-}
+-
+-uno::Reference< drawing::XShape > 
+-ScVbaShapes::createShape( rtl::OUString service ) throw (css::uno::RuntimeException)
+-{
+-    uno::Reference< lang::XMultiServiceFactory > xMSF( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-    uno::Reference< drawing::XShape > xShape( xMSF->createInstance( service ), uno::UNO_QUERY_THROW );
+-    return xShape;
+-}
+-
+-uno::Any 
+-ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException)
+-{
+-    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape" ) );
+-    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
+-    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( startY );
+-    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
+-    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
+-
+-    uno::Reference< drawing::XShape > xShape( createShape( sCreateShapeName ), uno::UNO_QUERY_THROW );
+-    m_xShapes->add( xShape );
+-
+-    rtl::OUString sName = createName( rtl::OUString::createFromAscii( "Rectangle" ) );
+-    setDefaultShapeProperties( xShape );
+-    setShape_NameProperty( xShape, sName );
+-
+-    awt::Point aMovePositionIfRange(0, 0);
+-    awt::Point position;
+-    position.X = nXPos - aMovePositionIfRange.X;
+-    position.Y = nYPos - aMovePositionIfRange.Y;
+-    xShape->setPosition( position );
+-
+-    awt::Size size;
+-    size.Height = nHeight;
+-    size.Width = nWidth;
+-    xShape->setSize( size );
+-
+-    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
+-    pScVbaShape->setRange( aRange ); 
+-    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
+-}
+-
+-uno::Any 
+-ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException)
+-{
+-    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.EllipseShape" ) );
+-    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
+-    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( startY );
+-    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
+-    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
+-
+-    uno::Reference< drawing::XShape > xShape( createShape( sCreateShapeName ), uno::UNO_QUERY_THROW );
+-    m_xShapes->add( xShape );
+-
+-    awt::Point aMovePositionIfRange( 0, 0 );
+-    //TODO helperapi using a writer document
+-    /*
+-    XDocument xDocument = (XDocument)getParent();
+-    if (AnyConverter.isVoid(_aRange))
+-    {
+-        _aRange = xDocument.Range(new Integer(0), new Integer(1));
+-        // Top&Left in Word is Top&Left of the paper and not the writeable area.
+-        aMovePositionIfRange = calculateTopLeftMargin((HelperInterfaceAdaptor)xDocument);
+-    }
+-
+-    setShape_AnchorTypeAndRangeProperty(xShape, _aRange);
+-    */
+-    rtl::OUString name = createName( rtl::OUString::createFromAscii( "Oval" ));
+-    setDefaultShapeProperties(xShape);
+-    setShape_NameProperty(xShape, name);
+-
+-    awt::Point position;
+-    position.X = nXPos - aMovePositionIfRange.X;
+-    position.Y = nYPos - aMovePositionIfRange.Y;
+-    xShape->setPosition(position);
+-
+-    awt::Size size;
+-    size.Height = nHeight;
+-    size.Width = nWidth;
+-    xShape->setSize(size);
+-
+-    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
+-    pScVbaShape->setRange( aRange ); 
+-    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
+-}
+-
+-//helpeapi calc
+-uno::Any SAL_CALL
+-ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (uno::RuntimeException)
+-{
+-    sal_Int32 nLineWidth = endX - StartX;
+-    sal_Int32 nLineHeight = endY - StartY;
+-
+-    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
+-    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
+-    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( StartX );
+-    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( StartY );
+-    
+-    uno::Reference< drawing::XShape > xShape( createShape( rtl::OUString::createFromAscii("com.sun.star.drawing.LineShape") ), uno::UNO_QUERY_THROW );
+-    m_xShapes->add( xShape );
+-
+-    awt::Point aMovePositionIfRange( 0, 0 );
+-    
+-    rtl::OUString name = createName( rtl::OUString::createFromAscii( "Line" ) );
+-    setDefaultShapeProperties(xShape);
+-    setShape_NameProperty(xShape, name);
+-
+-    awt::Point position;
+-    position.X = nXPos - aMovePositionIfRange.X;
+-    position.Y = nYPos - aMovePositionIfRange.Y;
+-    xShape->setPosition(position);
+-
+-    awt::Size size;
+-    size.Height = nHeight;
+-    size.Width = nWidth;
+-    xShape->setSize(size);
+-
+-    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
+-    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
+-}
+-
+-uno::Any SAL_CALL
+-ScVbaShapes::AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
+-{
+-    uno::Any _aAnchor;
+-    if (_nType == office::MsoAutoShapeType::msoShapeRectangle)
+-    {
+-        return AddRectangle(_nLeft, _nTop, _nWidth, _nHeight, _aAnchor);
+-    }
+-    else if (_nType == office::MsoAutoShapeType::msoShapeOval)
+-    {
+-        return AddEllipse(_nLeft, _nTop, _nWidth, _nHeight, _aAnchor);
+-    }
+-    return uno::Any();
+-}
+-
+-void
+-ScVbaShapes::setDefaultShapeProperties( uno::Reference< drawing::XShape > xShape ) throw (uno::RuntimeException)
+-{
+-    uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
+-    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillStyle" ), uno::makeAny( rtl::OUString::createFromAscii( "SOLID" ) ) );
+-    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillColor"), uno::makeAny( sal_Int32(0xFFFFFF) )  );
+-    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextWordWrap"), uno::makeAny( text::WrapTextMode_THROUGHT )  );
+-    //not find in OOo2.3
+-    //xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "Opaque"), uno::makeAny( sal_True )  );
+-}
+-
+-void
+-ScVbaShapes::setShape_NameProperty( uno::Reference< css::drawing::XShape > xShape, rtl::OUString sName )
+-{
+-    uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
+-    try
+-    {
+-        xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "Name" ), uno::makeAny( sName ) );
+-    }
+-    catch( script::BasicErrorException e )
+-    {
+-    }
+-}
+-
+-rtl::OUString
+-ScVbaShapes::createName( rtl::OUString sName )
+-{
+-    sal_Int32 nActNumber = 1 + m_nNewShapeCount;
+-    m_nNewShapeCount++; 
+-    sName += rtl::OUString::valueOf( nActNumber );
+-    return sName;
+-}
+-
+-#if 0
+-//TODO helperapi using a writer document
+-awt::Point
+-calculateTopLeftMargin( uno::Reference< XHelperInterface > xDocument )
+-{
+-    awt::Point aPoint( 0, 0 );
+-    uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW );
+-    return awt::Point();
+-}
+-#endif
+Index: sc/source/ui/vba/vbahelper.hxx
+===================================================================
+--- sc/source/ui/vba/vbahelper.hxx	(revision 276159)
++++ sc/source/ui/vba/vbahelper.hxx	(revision 276288)
+@@ -1,352 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbahelper.hxx,v $
+- * $Revision: 1.5.32.1 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_HELPER_HXX
+-#define SC_VBA_HELPER_HXX
+-
+-#include <com/sun/star/drawing/XShape.hpp>
+-#include <com/sun/star/beans/XIntrospectionAccess.hpp>
+-#include <com/sun/star/script/BasicErrorException.hpp>
+-#include <com/sun/star/script/XTypeConverter.hpp>
+-#include <com/sun/star/lang/IllegalArgumentException.hpp>
+-#include <com/sun/star/awt/XControl.hpp>
+-#include <com/sun/star/awt/XDevice.hpp>
+-#include <basic/sberrors.hxx>
+-#include <cppuhelper/implbase1.hxx>
+-#include <com/sun/star/frame/XModel.hpp>
+-#include <docsh.hxx>
+-#include <sfx2/dispatch.hxx>
+-#include <ooo/vba/msforms/XShape.hpp>
+-#include "cellsuno.hxx"
+-
+-namespace css = ::com::sun::star;
+-
+-namespace ooo 
+-{
+-	namespace vba 
+-	{
+-		template < class T > 
+-		css::uno::Reference< T > getXSomethingFromArgs( css::uno::Sequence< css::uno::Any > const & args, sal_Int32 nPos, bool bCanBeNull = true ) throw (css::lang::IllegalArgumentException)
+-		{
+-			if ( args.getLength() < ( nPos + 1) )
+-				throw css::lang::IllegalArgumentException();
+-			css::uno::Reference< T > aSomething( args[ nPos ], css::uno::UNO_QUERY );
+-			if ( !bCanBeNull && !aSomething.is() )
+-				throw css::lang::IllegalArgumentException();
+-			return aSomething;
+-		}
+-		css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException);
+-		css::uno::Reference< css::script::XTypeConverter > getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
+-
+-		void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl) ;
+-		void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl, css::uno::Sequence< css::beans::PropertyValue >& sProps ) ;
+-		void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
+-		void implnCopy();
+-		void implnPaste();
+-		void implnCut();
+-		void implnPasteSpecial(sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
+-		css::uno::Reference< css::frame::XModel >
+-			getCurrentDocument() throw (css::uno::RuntimeException);
+-		ScTabViewShell* getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
+-		ScDocShell* getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
+-		ScTabViewShell* getCurrentBestViewShell();
+-		SfxViewFrame* getCurrentViewFrame();
+-		sal_Int32 OORGBToXLRGB( sal_Int32 );
+-		sal_Int32 XLRGBToOORGB( sal_Int32 );
+-		css::uno::Any OORGBToXLRGB( const css::uno::Any& );
+-		css::uno::Any XLRGBToOORGB( const css::uno::Any& );
+-		// provide a NULL object that can be passed as variant so that 
+-		// the object when passed to IsNull will return true. aNULL 
+-		// contains an empty object reference
+-		const css::uno::Any& aNULL();
+-		void PrintOutHelper( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, css::uno::Reference< css::frame::XModel >& xModel, sal_Bool bSelection  );
+-		void PrintPreviewHelper( const css::uno::Any& EnableChanges, css::uno::Reference< css::frame::XModel >& xModel );
+-
+-		rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException );
+-		rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic )
+-	double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical);
+-	double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
+-	double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
+-
+-
+-class ScVbaCellRangeAccess
+-{
+-public:
+-    static SfxItemSet* GetDataSet( ScCellRangeObj* pRangeObj );
+-};
+-
+-class Millimeter
+-{
+-//Factor to translate between points and hundredths of millimeters:
+-private:
+-	static const double factor;
+-    
+-	double m_nMillimeter;
+-
+-public:
+-	Millimeter():m_nMillimeter(0) {}
+-    
+-	Millimeter(double mm):m_nMillimeter(mm) {}
+-    
+-	void set(double mm) { m_nMillimeter = mm; }
+-	void setInPoints(double points) 
+-	{ 
+-		m_nMillimeter = points * 0.352777778; 
+-		// 25.4mm / 72 
+-	}
+-      
+-	void setInHundredthsOfOneMillimeter(double hmm)
+-	{
+-		m_nMillimeter = hmm / 100;
+-	}
+-    
+-	double get()
+-	{
+-		return m_nMillimeter;
+-	}
+-	double getInHundredthsOfOneMillimeter()
+-	{
+-		return m_nMillimeter * 100;
+-	}
+-	double getInPoints()
+-	{
+-		return m_nMillimeter * 2.834645669; // 72 / 25.4mm
+-	}    
+-
+-	static sal_Int32 getInHundredthsOfOneMillimeter(double points)
+-	{
+-		sal_Int32 mm = static_cast<sal_Int32>(points * factor);
+-		return mm;
+-	}
+-    
+-	static double getInPoints(int _hmm)
+-	{
+-		double points = double( static_cast<double>(_hmm) / factor);
+-		return points;
+-	}
+-};
+-
+-class AbstractGeometryAttributes // probably should replace the ShapeHelper below
+-{
+-public:
+-    virtual ~AbstractGeometryAttributes() {}
+-    virtual double getLeft() = 0;
+-    virtual void setLeft( double ) = 0;
+-    virtual double getTop() = 0;
+-    virtual void setTop( double ) = 0;
+-    virtual double getHeight() = 0;
+-    virtual void setHeight( double ) = 0;
+-    virtual double getWidth() = 0;
+-    virtual void setWidth( double ) = 0;
+-};
+-
+-class ConcreteXShapeGeometryAttributes : public AbstractGeometryAttributes
+-{
+-public:
+-    css::uno::Reference< ooo::vba::msforms::XShape > m_xShape; 
+-    ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape );
+-    virtual double getLeft()
+-    {
+-        return m_xShape->getLeft();
+-    }
+-    virtual void setLeft( double nLeft )
+-    {
+-        m_xShape->setLeft( nLeft );
+-    }
+-    virtual double getTop()
+-    {
+-        return m_xShape->getTop();
+-    }
+-    virtual void setTop( double nTop )
+-    {
+-        m_xShape->setTop( nTop );
+-    }
+-
+-    virtual double getHeight()
+-    {
+-        return m_xShape->getHeight();
+-    }
+-    virtual void setHeight( double nHeight )
+-    {
+-        m_xShape->setHeight( nHeight );
+-    }
+-    virtual double getWidth()
+-    {
+-        return m_xShape->getWidth();
+-    }
+-    virtual void setWidth( double nWidth)
+-    {
+-        m_xShape->setHeight( nWidth );
+-    }
+-
+-   
+-};
+-#define VBA_LEFT "PositionX"
+-#define VBA_TOP "PositionY"
+-class UserFormGeometryHelper : public AbstractGeometryAttributes
+-{
+-
+-    css::uno::Reference< css::beans::XPropertySet > mxModel;
+-public:
+-    UserFormGeometryHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xControl );
+-    virtual double getLeft();
+-    virtual void setLeft( double nLeft );
+-    virtual double getTop();
+-    virtual void setTop( double nTop );
+-    virtual double getHeight();
+-    virtual void setHeight( double nHeight );
+-    virtual double getWidth();
+-    virtual void setWidth( double nWidth);
+-};
+-
+-class ShapeHelper
+-{
+-protected:
+-	css::uno::Reference< css::drawing::XShape > xShape;
+-public:
+-	ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException ) : xShape( _xShape )
+-	{ 
+-		if( !xShape.is() ) 
+-			throw css::uno::RuntimeException( rtl::OUString::createFromAscii("No valid shape for helper"), css::uno::Reference< css::uno::XInterface >() );
+-	}
+-    
+-	double getHeight()
+-	{
+-        	return  Millimeter::getInPoints(xShape->getSize().Height);
+-    	}
+-
+-
+-    	void setHeight(double _fheight) throw ( css::script::BasicErrorException )
+-	{
+-		try
+-		{
+-			css::awt::Size aSize = xShape->getSize();
+-			aSize.Height = Millimeter::getInHundredthsOfOneMillimeter(_fheight);
+-			xShape->setSize(aSize);
+-		}
+-		catch ( css::uno::Exception& /*e*/)
+-		{
+-			throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
+-    		}
+-	}
+-    
+-    
+-	double getWidth()
+-	{ 
+-		return Millimeter::getInPoints(xShape->getSize().Width);
+-    	}
+-
+-	void setWidth(double _fWidth) throw ( css::script::BasicErrorException )
+-	{
+-		try
+-		{
+-			css::awt::Size aSize = xShape->getSize();
+-			aSize.Width = Millimeter::getInHundredthsOfOneMillimeter(_fWidth);
+-			xShape->setSize(aSize);
+-		}
+-		catch (css::uno::Exception& /*e*/)
+-		{
+-			throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
+-		}
+-	}
+-    
+-    
+-	double getLeft()
+-	{
+-		return Millimeter::getInPoints(xShape->getPosition().X);
+-	}
+-
+-    
+-	void setLeft(double _fLeft)
+-	{
+-		css::awt::Point aPoint = xShape->getPosition();
+-		aPoint.X = Millimeter::getInHundredthsOfOneMillimeter(_fLeft);
+-		xShape->setPosition(aPoint);
+-	}
+-    
+-
+-	double getTop()
+-	{
+-        	return Millimeter::getInPoints(xShape->getPosition().Y);
+-	}
+-
+-    
+-	void setTop(double _fTop)
+-	{
+-		css::awt::Point aPoint = xShape->getPosition();
+-		aPoint.Y = Millimeter::getInHundredthsOfOneMillimeter(_fTop);
+-		xShape->setPosition(aPoint);
+-	}
+-    
+-};
+-
+-class ContainerUtilities
+-{
+-
+-public: 
+-	static rtl::OUString getUniqueName( const css::uno::Sequence< ::rtl::OUString >&  _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator);
+-	static rtl::OUString getUniqueName( const css::uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix );
+-
+-	static sal_Int32 FieldInList( const css::uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString );
+-};
+-
+-// really just a a place holder to ease the porting pain
+-class DebugHelper
+-{
+-public:
+-	static void exception( const rtl::OUString&  DetailedMessage, const css::uno::Exception& ex,  int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException )
+-	{
+-		// #TODO #FIXME ( do we want to support additionalArg here )
+-		throw css::script::BasicErrorException( DetailedMessage.concat( rtl::OUString::createFromAscii(" ") ).concat( ex.Message ), css::uno::Reference< css::uno::XInterface >(), err, rtl::OUString() );
+-	}
+-
+-	static void exception( int err,  const rtl::OUString& additionalArgument ) throw( css::script::BasicErrorException )
+-	{
+-		exception( rtl::OUString(), css::uno::Exception(), err, additionalArgument );
+-	}
+-
+-	static void exception( css::uno::Exception& ex ) throw( css::script::BasicErrorException )
+-	{
+-		exception( rtl::OUString(), ex, SbERR_INTERNAL_ERROR, rtl::OUString() );
+-	}
+-};
+-	} // openoffice
+-} // org
+-
+-namespace ov = ooo::vba;
+-
+-#ifdef DEBUG
+-#  define SC_VBA_FIXME(a) OSL_TRACE( a )
+-#  define SC_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
+-#else
+-#  define SC_VBA_FIXME(a)
+-#  define SC_VBA_STUB()
+-#endif
+-
+-#endif
+Index: sc/source/ui/vba/vbapictureformat.cxx
+===================================================================
+--- sc/source/ui/vba/vbapictureformat.cxx	(revision 276159)
++++ sc/source/ui/vba/vbapictureformat.cxx	(revision 276288)
+@@ -1,147 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbapictureformat.cxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include "vbapictureformat.hxx"
+-
+-using namespace ooo::vba;
+-using namespace com::sun::star;
+-
+-ScVbaPictureFormat::ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent,
+-    const css::uno::Reference< css::uno::XComponentContext >& xContext,
+-    uno::Reference< drawing::XShape > xShape ) 
+-    throw( lang::IllegalArgumentException ) : ScVbaPictureFormat_BASE( xParent, xContext ), m_xShape( xShape )
+-{
+-    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
+-}
+-
+-void
+-ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException)
+-{
+-    if( nRange < nMin )
+-    {
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter out of range, value is too small.") , uno::Reference< uno::XInterface >() );
+-    }
+-    if( nRange > nMax )
+-    {
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter out of range, value is too high.") , uno::Reference< uno::XInterface >() );
+-    }
+-}
+-
+-// Attributes
+-double SAL_CALL 
+-ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException)
+-{
+-    sal_Int16 nLuminance = 0;
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance") ) >>= nLuminance;
+-    double fBrightness = static_cast< double >( nLuminance );
+-    fBrightness = ( fBrightness +100 ) / 200;
+-    return fBrightness; 
+-}
+-
+-void SAL_CALL 
+-ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeException)
+-{
+-    checkParameterRangeInDouble( _brightness, 0.0, 1.0 );
+-    double fLuminance = _brightness * 200 - 100;
+-    sal_Int16 nLuminance = static_cast< sal_Int16 >( fLuminance );
+-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance"), uno::makeAny( nLuminance ) ); 
+-}
+-
+-double SAL_CALL 
+-ScVbaPictureFormat::getContrast() throw (uno::RuntimeException)
+-{
+-    sal_Int16 nContrast = 0;
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustContrast") ) >>= nContrast;
+-    double fContrast = static_cast< double >( nContrast );
+-    fContrast = ( fContrast + 100 ) / 200;
+-    return fContrast;
+-}
+-
+-void SAL_CALL 
+-ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException)
+-{
+-    checkParameterRangeInDouble( _contrast, 0.0, 1.0 );
+-    double fContrast = _contrast * 200 - 100;
+-    sal_Int16 nContrast = static_cast< sal_Int16 >( fContrast );
+-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustContrast"), uno::makeAny( nContrast ) );
+-}
+-
+-
+-// Methods
+-void SAL_CALL 
+-ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeException)
+-{
+-    double fBrightness = getBrightness();
+-    fBrightness += increment;
+-    if( fBrightness < 0 )
+-    {
+-        fBrightness = 0.0;
+-    }
+-    if( fBrightness > 1 )
+-    {
+-        fBrightness = 1;
+-    }
+-    setBrightness( fBrightness );
+-}
+-
+-void SAL_CALL 
+-ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeException)
+-{
+-    double nContrast = getContrast();
+-    nContrast += increment;
+-    if( increment < 0 )
+-    {
+-        increment = 0.0;
+-    }
+-    if( increment > 1 )
+-    {
+-        increment = 1.0;
+-    }
+-    setContrast( nContrast );
+-}
+-
+-
+-rtl::OUString&
+-ScVbaPictureFormat::getServiceImplName()
+-{
+-    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPictureFormat") );
+-    return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString >
+-ScVbaPictureFormat::getServiceNames()
+-{
+-    static uno::Sequence< rtl::OUString > aServiceNames;
+-    if ( aServiceNames.getLength() == 0 )
+-    {
+-        aServiceNames.realloc( 1 );
+-        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.PictureFormat" ) );
+-    }
+-    return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbacontrol.hxx
+===================================================================
+--- sc/source/ui/vba/vbacontrol.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacontrol.hxx	(revision 276288)
+@@ -1,111 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbacontrol.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_CONTROL_HXX
+-#define SC_VBA_CONTROL_HXX
+-
+-#include <cppuhelper/implbase1.hxx>
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-#include <com/sun/star/uno/XComponentContext.hpp>
+-#include <com/sun/star/script/XDefaultProperty.hpp>
+-#include <com/sun/star/drawing/XControlShape.hpp>
+-#include <com/sun/star/awt/XControl.hpp>
+-#include <com/sun/star/awt/XWindowPeer.hpp>
+-#include <ooo/vba/msforms/XControl.hpp>
+-
+-#include "vbahelper.hxx"
+-#include "vbahelperinterface.hxx"
+-
+-//typedef ::cppu::WeakImplHelper1< ov::msforms::XControl > ControlImpl_BASE;
+-typedef InheritedHelperInterfaceImpl1< ov::msforms::XControl > ControlImpl_BASE;
+-
+-class ScVbaControl : public ControlImpl_BASE
+-{
+-private:
+-    com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > m_xEventListener;
+-protected:
+-    std::auto_ptr< ov::AbstractGeometryAttributes > mpGeometryHelper;
+-    css::uno::Reference< css::beans::XPropertySet > m_xProps;
+-    css::uno::Reference< css::uno::XInterface > m_xControl;
+-    css::uno::Reference< css::frame::XModel > m_xModel;
+-
+-    virtual css::uno::Reference< css::awt::XWindowPeer > getWindowPeer() throw (css::uno::RuntimeException);
+-public:
+-    ScVbaControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, 
+-                    const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pHelper );
+-    virtual ~ScVbaControl();
+-    // This class will own the helper, so make sure it is allocated from 
+-    // the heap
+-    void setGeometryHelper( ov::AbstractGeometryAttributes* pHelper );
+-    // XControl
+-    virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException);
+-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL SetFocus(  ) throw (css::uno::RuntimeException);
+-
+-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException);
+-    virtual rtl::OUString SAL_CALL getControlSource() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setControlSource( const rtl::OUString& _controlsource ) throw (css::uno::RuntimeException);
+-    virtual rtl::OUString SAL_CALL getRowSource() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
+-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
+-    //remove resouce because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape
+-    virtual void removeResouce() throw( css::uno::RuntimeException );
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-
+-
+-class ScVbaControlFactory
+-{
+-public:
+-    ScVbaControlFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, 
+-                    const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel );
+-    ScVbaControl* createControl()  throw ( css::uno::RuntimeException );
+-    ScVbaControl* createControl( const css::uno::Reference< css::uno::XInterface >& xParent )  throw ( css::uno::RuntimeException );
+-private:
+-    ScVbaControl* createControl( const css::uno::Reference< css::awt::XControl >&, const css::uno::Reference< css::uno::XInterface >&  )  throw ( css::uno::RuntimeException );
+-    ScVbaControl* createControl( const css::uno::Reference< css::drawing::XControlShape >&, const css::uno::Reference< css::uno::XInterface >& )  throw ( css::uno::RuntimeException );
+-    css::uno::Reference< css::uno::XComponentContext > m_xContext;
+-    css::uno::Reference< css::uno::XInterface > m_xControl;
+-    css::uno::Reference< css::frame::XModel > m_xModel;
+-};
+-
+-#endif//SC_VBA_CONTROL_HXX
+Index: sc/source/ui/vba/vbacommandbars.cxx
+===================================================================
+--- sc/source/ui/vba/vbacommandbars.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacommandbars.cxx	(revision 276288)
+@@ -1,247 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include <com/sun/star/lang/XServiceInfo.hpp>
+-#include <com/sun/star/frame/XDesktop.hpp>
+-#include <com/sun/star/container/XNameAccess.hpp>
+-
+-#include "vbacommandbars.hxx"
+-#include "vbacommandbar.hxx"
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarEnumeration_BASE;
+-
+-static rtl::OUString sSpreadsheetDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
+-static rtl::OUString sTextDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" ) );
+-static rtl::OUString sWindowStateConfUrl( rtl::OUString::createFromAscii( "com.sun.star.ui.WindowStateConfiguration" ) );
+-
+-class CommandBarEnumeration : public CommandBarEnumeration_BASE
+-{
+-    uno::Reference< uno::XComponentContext > m_xContext;
+-    uno::Reference< XCommandBars > m_xCommandBars;
+-    uno::Sequence< rtl::OUString > m_sNames;
+-    sal_Int32 m_nCurrentPosition;
+-public:
+-    CommandBarEnumeration( const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBars > xCommandBars, const uno::Sequence< rtl::OUString > sNames ) : m_xContext( xContext ), m_xCommandBars( xCommandBars ), m_sNames( sNames ), m_nCurrentPosition( 0 )
+-    {
+-    }
+-    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
+-    {
+-        if( m_nCurrentPosition < m_sNames.getLength() )
+-            return sal_True;
+-        return sal_False;
+-    }
+-    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
+-    {
+-        if( hasMoreElements() )
+-        {
+-            rtl::OUString sName( m_sNames[ m_nCurrentPosition ] );
+-            m_nCurrentPosition = m_nCurrentPosition + 1;
+-            if( sName.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 ) 
+-            {
+-                sal_Int32 nLastIndex = sName.lastIndexOf( rtl::OUString::createFromAscii( "/" ) );
+-                if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sName.getLength() ) )
+-                {
+-                   sName = sName.copy( nLastIndex + 1);
+-                   if( sName.getLength() > 0 )
+-                   {
+-                        uno::Reference< XHelperInterface > xHelperInterface( m_xCommandBars, uno::UNO_QUERY_THROW );
+-                        uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( xHelperInterface, m_xContext, sName, sal_True, sal_False ) );
+-                        if( xCommandBar.is() )
+-                            return uno::makeAny( xCommandBar );
+-                        else
+-                            return nextElement();
+-                    }
+-                    else
+-                        return nextElement();
+-                    }
+-             }
+-             else
+-                return nextElement();
+-        }
+-        else
+-            throw container::NoSuchElementException();
+-        return uno::Any();
+-    }
+-};
+-
+-
+-ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess > xIndexAccess ) : CommandBars_BASE( xParent, xContext, xIndexAccess )
+-{
+-    retrieveObjects();
+-}
+-void
+-ScVbaCommandBars::retrieveObjects() throw ( uno::RuntimeException )
+-{
+-    uno::Reference< lang::XServiceInfo > xServiceInfo( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-    if( xServiceInfo->supportsService( sSpreadsheetDocumentUrl ) )
+-    {
+-        m_sModuleName = sSpreadsheetDocumentUrl;
+-    }
+-    else if( xServiceInfo->supportsService( sTextDocumentUrl ) )
+-    {
+-        m_sModuleName = sTextDocumentUrl;
+-    }
+-    else
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Unsupported Document" ), uno::Reference< uno::XInterface >() );
+-    
+-    uno::Reference < lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
+-    uno::Reference < container::XNameAccess > xNameAccess( xMSF->createInstance( sWindowStateConfUrl ), uno::UNO_QUERY_THROW );
+-    m_xNameAccess.set( xNameAccess->getByName( m_sModuleName ), uno::UNO_QUERY_THROW );
+-}
+-
+-// XEnumerationAccess
+-uno::Type SAL_CALL 
+-ScVbaCommandBars::getElementType() throw ( uno::RuntimeException )
+-{
+-    return XCommandBars::static_type( 0 );
+-}
+-uno::Reference< container::XEnumeration >
+-ScVbaCommandBars::createEnumeration() throw ( uno::RuntimeException )
+-{
+-    return uno::Reference< container::XEnumeration >( new CommandBarEnumeration( mxContext, this, m_xNameAccess->getElementNames() ) );
+-}
+-
+-uno::Any
+-ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
+-{
+-    // aSource should be a name at this time, because of the class is API wrapper.
+-    rtl::OUString sToolBarName;
+-    if( aSource >>= sToolBarName )
+-    {
+-        sToolBarName = sToolBarName.toAsciiLowerCase();
+-        if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Worksheet Menu Bar") ) )
+-        {
+-            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 0 ) ) );
+-        }
+-        else if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Menu Bar") ) )
+-        {
+-            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 1 ) ) );
+-        }
+-        else if( checkToolBarExist( sToolBarName ) )
+-        {
+-            return uno::makeAny( uno::Reference< XCommandBar > (new ScVbaCommandBar( this, mxContext, sToolBarName, sal_True, sal_False ) ) );
+-        }
+-    }
+-    return uno::Any();
+-}
+-
+-// XCommandBars
+-uno::Reference< XCommandBar > SAL_CALL 
+-ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+-{
+-    // Position - MsoBar MenuBar - sal_Bool
+-    // Currently only the Name is supported.
+-    rtl::OUString sName;
+-    if( !( Name >>= sName ) )
+-    {
+-        sName = rtl::OUString::createFromAscii("Custom1");
+-    }
+-    sal_Bool bTemporary = false;
+-    if( !( Temporary >>= bTemporary ) )
+-    {
+-        bTemporary = sal_True;
+-    }
+-    return uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, sName.toAsciiLowerCase(), bTemporary, sal_True ) );
+-}
+-sal_Int32 SAL_CALL 
+-ScVbaCommandBars::getCount() throw(css::uno::RuntimeException)
+-{
+-    // Filter out all toolbars from the window collection
+-    sal_Int32 nCount = 0;
+-    uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
+-    for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
+-    {
+-        if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
+-        {
+-            nCount++;
+-        }
+-    }
+-    return nCount;
+-}
+-
+-// ScVbaCollectionBaseImpl
+-uno::Any SAL_CALL
+-ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
+-{
+-    if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
+-    {
+-        return createCollectionObject( aIndex );    
+-    }
+-    return uno::Any();
+-}
+-
+-sal_Bool
+-ScVbaCommandBars::checkToolBarExist( rtl::OUString sToolBarName )
+-{
+-    CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
+-    if( iter != mCommandBarNameMap.end() )
+-    {
+-        return sal_True;
+-    }    
+-    uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
+-    for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
+-    {
+-        if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
+-        {
+-            if( allNames[i].indexOf( sToolBarName ) != -1 )
+-            {
+-                return sal_True;
+-            }
+-        }
+-    }
+-    return sal_False;
+-}
+-    
+-// XHelperInterface
+-rtl::OUString& 
+-ScVbaCommandBars::getServiceImplName()
+-{
+-    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBars") );
+-    return sImplName;
+-}
+-uno::Sequence<rtl::OUString> 
+-ScVbaCommandBars::getServiceNames()
+-{
+-    static uno::Sequence< rtl::OUString > aServiceNames;
+-    if ( aServiceNames.getLength() == 0 )
+-    {
+-        aServiceNames.realloc( 1 );
+-        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBars" ) );
+-    }
+-    return aServiceNames;
+-}
+-
+Index: sc/source/ui/vba/vbatextbox.hxx
+===================================================================
+--- sc/source/ui/vba/vbatextbox.hxx	(revision 276159)
++++ sc/source/ui/vba/vbatextbox.hxx	(revision 276288)
+@@ -1,57 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbatextbox.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_TEXTBOX_HXX
+-#define SC_VBA_TEXTBOX_HXX
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/msforms/XTextBox.hpp>
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-
+-typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XTextBox > TextBoxImpl_BASE;
+-
+-class ScVbaTextBox : public TextBoxImpl_BASE
+-{
+-    bool mbDialog;
+-public:
+-    ScVbaTextBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialog = false );
+-   // Attributes
+-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-    virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getMaxLength() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException);
+-    virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException);
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-#endif //SC_VBA_TEXTBOX_HXX
+Index: sc/source/ui/vba/vbashape.hxx
+===================================================================
+--- sc/source/ui/vba/vbashape.hxx	(revision 276159)
++++ sc/source/ui/vba/vbashape.hxx	(revision 276288)
+@@ -1,108 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbashape.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_SHAPE_HXX
+-#define SC_VBA_SHAPE_HXX
+-
+-#include <ooo/vba/office/MsoShapeType.hpp>
+-#include <com/sun/star/drawing/XShape.hpp>
+-#include <com/sun/star/drawing/XShapes.hpp>
+-#include <com/sun/star/lang/XEventListener.hpp>
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-#include <ooo/vba/msforms/XShape.hpp>
+-#include <ooo/vba/msforms/XLineFormat.hpp>
+-#include <cppuhelper/implbase2.hxx>
+-
+-#include "vbahelperinterface.hxx"
+-
+-typedef  ::cppu::WeakImplHelper2< ov::msforms::XShape, css::lang::XEventListener > ListeningShape;
+-
+-typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE;
+-
+-class ScVbaShape : public ScVbaShape_BASE
+-{
+-friend class ConcreteXShapeHelper; // perhaps an accessor would be better
+-private:
+-protected:
+-    css::uno::Reference< css::drawing::XShape > m_xShape;
+-    css::uno::Reference< css::drawing::XShapes > m_xShapes;
+-    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
+-    sal_Int32 m_nType;
+-    css::uno::Any m_aRange;
+-	virtual void addListeners();
+-	virtual void removeShapeListener() throw( css::uno::RuntimeException );
+-	virtual void removeShapesListener() throw( css::uno::RuntimeException );
+-	virtual rtl::OUString& getServiceImplName();
+-	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-public:
+-    ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, sal_Int32 nType ) throw ( css::lang::IllegalArgumentException );
+-    ScVbaShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape ) throw ( css::lang::IllegalArgumentException );
+-    virtual ~ScVbaShape();
+-    css::uno::Any getRange() { return m_aRange; };
+-    void setRange( css::uno::Any aRange ) { m_aRange = aRange; };
+-
+-    static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException);
+-
+-    // Attributes
+-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
+-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getZOrderPosition() throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getRotation() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setRotation( double _rotation ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< ov::msforms::XPictureFormat > SAL_CALL getPictureFormat() throw (css::uno::RuntimeException);
+-
+-    // Methods
+-    virtual css::uno::Reference< ov::excel::XTextFrame > SAL_CALL TextFrame(  ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL Delete() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL ScaleHeight( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL ScaleWidth( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException);
+-    // Replace??
+-    virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL ShapeRange( const css::uno::Any& index ) throw ( css::uno::RuntimeException );
+-    // XEventListener
+-    virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) throw( css::uno::RuntimeException );
+-};
+-#endif//SC_VBA_SHAPE_HXX
+Index: sc/source/ui/vba/vbauserform.hxx
+===================================================================
+--- sc/source/ui/vba/vbauserform.hxx	(revision 276159)
++++ sc/source/ui/vba/vbauserform.hxx	(revision 276288)
+@@ -1,78 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_USERFORM_HXX
+-#define SC_VBA_USERFORM_HXX
+-
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/msforms/XUserForm.hpp>
+-#include <com/sun/star/awt/XDialog.hpp>
+-#include <com/sun/star/frame/XModel.hpp>
+-
+-#include "vbahelperinterface.hxx"
+-#include "vbacontrol.hxx"
+-
+-//typedef InheritedHelperInterfaceImpl1< ov::msforms::XUserForm > ScVbaUserForm_BASE;
+-typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XUserForm > ScVbaUserForm_BASE;
+-
+-class ScVbaUserForm : public ScVbaUserForm_BASE
+-{
+-private:
+-    css::uno::Reference< css::awt::XDialog > m_xDialog;
+-    ScDocShell* m_pDocShell;
+-    bool mbDispose;
+-protected:
+-public:
+-    ScVbaUserForm( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException );
+-    virtual ~ScVbaUserForm();
+-    // XUserForm
+-    virtual void SAL_CALL RePaint(  ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL Show(  ) throw (css::uno::RuntimeException);
+-    // XIntrospection
+-    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
+-    virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+-    virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
+-    virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
+-    virtual ::rtl::OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException);
+-    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException);
+-    virtual void SAL_CALL Hide(  ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL UnloadObject(  ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) throw (css::uno::RuntimeException);
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-#endif
+Index: sc/source/ui/vba/vbacommandbarcontrol.hxx
+===================================================================
+--- sc/source/ui/vba/vbacommandbarcontrol.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacommandbarcontrol.hxx	(revision 276288)
+@@ -1,90 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_COMMANDBARCONTROL_HXX
+-#define SC_VBA_COMMANDBARCONTROL_HXX
+-
+-#include <ooo/vba/XCommandBarControl.hpp>
+-
+-#include "vbahelperinterface.hxx"
+-#include "vbacommandbarcontrols.hxx"
+-
+-typedef InheritedHelperInterfaceImpl1< ov::XCommandBarControl > CommandBarControl_BASE;
+-
+-class ScVbaCommandBarControl : public CommandBarControl_BASE
+-{
+-private:
+-    rtl::OUString       m_sName;
+-    rtl::OUString       m_sBarName;
+-    rtl::OUString       m_sCommand;
+-    sal_Int32           m_nType;
+-    sal_Int32           m_nPosition;
+-    sal_Bool            m_bTemporary;
+-    sal_Bool            m_bIsMenu;
+-    ScVbaCommandBarControls*        m_pCommandBarControls;
+-    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
+-    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
+-    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
+-    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
+-    css::uno::Reference< css::container::XIndexContainer >          m_xCurrentSettings;
+-    css::beans::PropertyValues                                      m_aPropertyValues;
+-    
+-    void initObjects() throw (css::uno::RuntimeException);
+-    void createNewMenuBarControl();
+-    void createNewToolBarControl();
+-public:
+-    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName ) throw (css::uno::RuntimeException);
+-    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, rtl::OUString sCommand, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
+-    sal_Int32 GetPosition() { return m_nPosition; };
+-    css::uno::Reference< css::container::XIndexContainer > GetCurrentSettings() { return m_xCurrentSettings; };
+-    css::beans::PropertyValues GetPropertyValues() { return m_aPropertyValues; };
+-    void SetPropertyValues( css::beans::PropertyValues aPropertyValues ) { m_aPropertyValues = aPropertyValues; };
+-    
+-    // Attributes
+-    virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException);
+-    virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException);
+-    virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
+-
+-    // Methods
+-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+-
+-	// XHelperInterface
+-	virtual rtl::OUString& getServiceImplName();
+-	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-#endif//SC_VBA_COMMANDBARCONTROL_HXX
+Index: sc/source/ui/vba/vbaprogressbar.cxx
+===================================================================
+--- sc/source/ui/vba/vbaprogressbar.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaprogressbar.cxx	(revision 276288)
+@@ -1,78 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include "vbaprogressbar.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-// uno servicename com.sun.star.awt.UnoControlProgressBarMode
+-const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
+-
+-ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ProgressBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-}
+-
+-// Attributes
+-uno::Any SAL_CALL 
+-ScVbaProgressBar::getValue() throw (css::uno::RuntimeException)
+-{
+-    return m_xProps->getPropertyValue( SVALUE );
+-}
+-
+-void SAL_CALL 
+-ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( SVALUE,  _value );
+-}
+-
+-rtl::OUString& 
+-ScVbaProgressBar::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaProgressBar") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaProgressBar::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbafillformat.hxx
+===================================================================
+--- sc/source/ui/vba/vbafillformat.hxx	(revision 276159)
++++ sc/source/ui/vba/vbafillformat.hxx	(revision 276288)
+@@ -1,74 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbafillformat.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_XFILLFORMAT_HXX
+-#define SC_VBA_XFILLFORMAT_HXX
+-
+-#include <com/sun/star/drawing/XShape.hpp>
+-#include <com/sun/star/drawing/FillStyle.hpp>
+-#include <ooo/vba/msforms/XFillFormat.hpp>
+-#include "vbahelperinterface.hxx"
+-
+-typedef InheritedHelperInterfaceImpl1< ov::msforms::XFillFormat > ScVbaFillFormat_BASE;
+-
+-class ScVbaFillFormat : public ScVbaFillFormat_BASE
+-{
+-private:
+-    css::uno::Reference< css::drawing::XShape > m_xShape;
+-    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
+-    css::uno::Reference< ov::msforms::XColorFormat > m_xColorFormat;
+-    css::drawing::FillStyle m_nFillStyle;
+-    sal_Int32 m_nForeColor;
+-    sal_Int32 m_nBackColor;
+-    sal_Int16 m_nGradientAngle;
+-private:
+-    void setFillStyle( css::drawing::FillStyle nFillStyle ) throw (css::uno::RuntimeException);
+-protected:
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-
+-public:
+-    ScVbaFillFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape );
+-
+-    void setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css::uno::RuntimeException);
+-    // Attributes
+-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException);
+-
+-    // Methods
+-    virtual void SAL_CALL Solid() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL TwoColorGradient( sal_Int32 style, sal_Int32 variant ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException);
+-
+-};
+-
+-#endif//SC_VBA_XFILLFORMAT_HXX
+Index: sc/source/ui/vba/vbacontrols.hxx
+===================================================================
+--- sc/source/ui/vba/vbacontrols.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacontrols.hxx	(revision 276288)
+@@ -1,62 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile$
+- * $Revision$
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_CONTROLS_HXX
+-#define SC_VBA_CONTROLS_HXX
+-
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/msforms/XControls.hpp>
+-#include <com/sun/star/awt/XControl.hpp>
+-
+-#include "vbacollectionimpl.hxx"
+-#include "vbahelper.hxx"
+-
+-typedef CollTestImplHelper< ov::msforms::XControls > ControlsImpl_BASE;
+-
+-class ScVbaControls : public ControlsImpl_BASE
+-{
+-	css::uno::Reference< css::awt::XControl > mxDialog;
+-protected:
+-	virtual rtl::OUString& getServiceImplName();
+-	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-public:
+-    ScVbaControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, 
+-                    const css::uno::Reference< css::awt::XControl >& xDialog );
+-    // XControls
+-     virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException);
+-    // XEnumerationAccess
+-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
+-
+-    // ScVbaCollectionBaseImpl
+-    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+-    
+-};
+-#endif //SC_VBA_OLEOBJECTS_HXX
+-
+Index: sc/source/ui/vba/vbalistcontrolhelper.cxx
+===================================================================
+--- sc/source/ui/vba/vbalistcontrolhelper.cxx	(revision 276159)
++++ sc/source/ui/vba/vbalistcontrolhelper.cxx	(revision 276288)
+@@ -1,145 +0,0 @@
+-#include <vbalistcontrolhelper.hxx>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
+-
+-void SAL_CALL 
+-ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
+-{
+-	if ( pvargItem.hasValue()  )
+-	{
+-		uno::Sequence< rtl::OUString > sList;
+-		m_xProps->getPropertyValue( ITEMS ) >>= sList;
+-
+-		sal_Int32 nIndex = sList.getLength();
+-
+-		if ( pvargIndex.hasValue() )
+-			pvargIndex >>= nIndex;
+-
+-		rtl::OUString sString = getAnyAsString( pvargItem );
+-
+-		// if no index specified or item is to be appended to end of 
+-		// list just realloc the array and set the last item
+-		if ( nIndex  == sList.getLength() )
+-		{
+-			sal_Int32 nOldSize = sList.getLength();
+-			sList.realloc( nOldSize + 1 );
+-			sList[ nOldSize ] = sString; 
+-		}
+-		else
+-		{
+-			// just copy those elements above the one to be inserted
+-			std::vector< rtl::OUString > sVec;
+-			// reserve just the amount we need to copy
+-			sVec.reserve( sList.getLength() - nIndex );
+-
+-			// point at first element to copy
+-			rtl::OUString* pString = sList.getArray() + nIndex;
+-			const rtl::OUString* pEndString = sList.getArray() + sList.getLength();
+-			// insert the new element
+-			sVec.push_back( sString );
+-			// copy elements	
+-			for ( ; pString != pEndString; ++pString )
+-				sVec.push_back( *pString );
+-		
+-			sList.realloc(  sList.getLength() + 1 );
+-
+-			// point at first element to be overwritten
+-			pString = sList.getArray() + nIndex;
+-			pEndString = sList.getArray() + sList.getLength();
+-			std::vector< rtl::OUString >::iterator it = sVec.begin();
+-			for ( ; pString != pEndString; ++pString, ++it)
+-				*pString = *it;	
+-			//
+-		}
+-
+-		m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
+-		
+-	}
+-}
+-
+-void SAL_CALL 
+-ListControlHelper::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
+-{
+-    sal_Int32 nIndex = 0;
+-    // for int index
+-	if ( index >>= nIndex  )
+-	{
+-		uno::Sequence< rtl::OUString > sList;
+-		m_xProps->getPropertyValue( ITEMS ) >>= sList;
+-        if( nIndex < 0 || nIndex > ( sList.getLength() - 1 ) )
+-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid index" ), uno::Reference< uno::XInterface > () );
+-        if( sList.hasElements() )
+-        {
+-            if( sList.getLength() == 1 )
+-            {
+-                Clear();
+-                return;
+-            }
+-            for( sal_Int32 i = nIndex; i < ( sList.getLength()-1 ); i++ )
+-            {
+-                sList[i] = sList[i+1];
+-            }
+-			sList.realloc(  sList.getLength() - 1 );
+-		}
+-
+-		m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
+-	}
+-}
+-
+-void SAL_CALL 
+-ListControlHelper::Clear(  ) throw (uno::RuntimeException)
+-{
+-	// urk, setValue doesn't seem to work !!
+-	//setValue( uno::makeAny( sal_Int16() ) );
+-	m_xProps->setPropertyValue( ITEMS, uno::makeAny( uno::Sequence< rtl::OUString >() ) );
+-}
+-
+-void SAL_CALL
+-ListControlHelper::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
+-{
+-	if ( _rowsource.getLength() == 0 )
+-		Clear();
+-}
+-
+-sal_Int32 SAL_CALL
+-ListControlHelper::getListCount() throw (uno::RuntimeException)
+-{
+-    uno::Sequence< rtl::OUString > sList;
+-    m_xProps->getPropertyValue( ITEMS ) >>= sList;
+-    return sList.getLength();
+-}
+-
+-uno::Any SAL_CALL 
+-ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
+-{
+-    uno::Sequence< rtl::OUString > sList;
+-    m_xProps->getPropertyValue( ITEMS ) >>= sList;
+-    sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
+-    uno::Any aRet;
+-    if ( pvargIndex.hasValue() )
+-    {
+-        sal_Int16 nIndex = -1;
+-        pvargIndex >>= nIndex;
+-        if( nIndex < 0 || nIndex >= nLength )
+-            throw uno::RuntimeException( rtl::OUString::createFromAscii(
+-                    "Bad row Index" ), uno::Reference< uno::XInterface >() );       
+-        aRet <<= sList[ nIndex ];
+-    }
+-    else if ( pvarColumn.hasValue() ) // pvarColumn on its own would be bad
+-            throw uno::RuntimeException( rtl::OUString::createFromAscii(
+-                    "Bad column Index" ), uno::Reference< uno::XInterface >() );       
+-    else // List() ( e.g. no args )
+-    {
+-        uno::Sequence< uno::Sequence< rtl::OUString > > sReturnArray( nLength );
+-        for ( sal_Int32 i = 0; i < nLength; ++i )
+-        {
+-            sReturnArray[ i ].realloc( 10 );
+-            sReturnArray[ i ][ 0 ] = sList[ i ];
+-        }        
+-        aRet = uno::makeAny( sReturnArray );
+-    }
+-    return aRet;
+-}
+Index: sc/source/ui/vba/vbacollectionimpl.cxx
+===================================================================
+--- sc/source/ui/vba/vbacollectionimpl.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacollectionimpl.cxx	(revision 276288)
+@@ -1,136 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbacollectionimpl.cxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include <vbacollectionimpl.hxx>
+-#include "vbaglobals.hxx"
+-using namespace ::com::sun::star;
+-using namespace ::ooo::vba;
+-
+-
+-ScVbaCollectionBaseImpl::ScVbaCollectionBaseImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : m_xContext( xContext ), m_xIndexAccess( xIndexAccess )
+-{
+-	m_xNameAccess.set( xIndexAccess, uno::UNO_QUERY );
+-}
+-
+-uno::Any
+-ScVbaCollectionBaseImpl::getItemByStringIndex( const rtl::OUString& sIndex ) throw (::uno::RuntimeException)
+-{
+-	if ( !m_xNameAccess.is() )
+-		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBaseImpl string index access not supported by this object") ), uno::Reference< uno::XInterface >() );
+-
+-	return createCollectionObject( m_xNameAccess->getByName( sIndex ) );	
+-}
+-
+-uno::Any 
+-ScVbaCollectionBaseImpl::getItemByIntIndex( const sal_Int32 nIndex ) throw (uno::RuntimeException)
+-{
+-	if ( !m_xIndexAccess.is() )
+-		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBaseImpl numeric index access not supported by this object") ), uno::Reference< uno::XInterface >() );
+-	if ( nIndex <= 0 )
+-	{
+-		throw  lang::IndexOutOfBoundsException( 
+-			::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
+-			"index is 0 or negative" ) ), 
+-			uno::Reference< uno::XInterface >() );
+-	}
+-	// need to adjust for vba index ( for which first element is 1 )
+-	return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) );	
+-}
+-
+-::sal_Int32 SAL_CALL 
+-ScVbaCollectionBaseImpl::getCount() throw (uno::RuntimeException)
+-{
+-	return m_xIndexAccess->getCount();
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaCollectionBaseImpl::getParent() throw (uno::RuntimeException)
+-{
+-	// #TODO #FIXME investigate whether this makes sense
+-	uno::Reference< excel::XApplication > xApplication =
+-		ScVbaGlobals::getGlobalsImpl( m_xContext )->getApplication();
+-	uno::Reference< excel::XWorkbook > xWorkbook;
+-	if ( xApplication.is() )
+-	{
+-		xWorkbook = xApplication->getActiveWorkbook();
+-	}
+-	return uno::Any( xWorkbook );
+-}
+-
+-::sal_Int32 SAL_CALL ScVbaCollectionBaseImpl::getCreator() throw (uno::RuntimeException)
+-{
+-	// #TODO #FIXE some sort of implementation
+-	//SC_VBA_STUB();
+-	return 0;
+-}
+-uno::Reference< excel::XApplication > SAL_CALL ScVbaCollectionBaseImpl::getApplication() throw (uno::RuntimeException)
+-{
+-	// #TODO #FIXME investigate whether this makes sense
+-	uno::Reference< excel::XApplication > xApplication =
+-		ScVbaGlobals::getGlobalsImpl( m_xContext )->getApplication();
+-	return  xApplication;
+-}
+-
+-uno::Any SAL_CALL ScVbaCollectionBaseImpl::Item( const uno::Any& aIndex ) throw (uno::RuntimeException)
+-{
+-	if ( aIndex.getValueTypeClass() != uno::TypeClass_STRING )
+-	{
+-		sal_Int32 nIndex = 0;
+-
+-		if ( ( aIndex >>= nIndex ) != sal_True )
+-		{
+-			rtl::OUString message;
+-			message = rtl::OUString::createFromAscii(
+-				"Couldn't convert index to Int32");
+-			throw  lang::IndexOutOfBoundsException( message,
+-				uno::Reference< uno::XInterface >() );
+-		}
+-		return 	getItemByIntIndex( nIndex );
+-	}
+-	rtl::OUString aStringSheet;
+-
+-	aIndex >>= aStringSheet;
+-	return getItemByStringIndex( aStringSheet );	
+-}
+-
+-::rtl::OUString SAL_CALL 
+-ScVbaCollectionBaseImpl::getDefaultMethodName(  ) throw (css::uno::RuntimeException)
+-{
+-	const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
+-	return sName;
+-}
+-
+-	// XElementAccess
+-
+-::sal_Bool SAL_CALL ScVbaCollectionBaseImpl::hasElements() throw (uno::RuntimeException)
+-{
+-	return ( m_xIndexAccess->getCount() > 0 );
+-}
+-
+-
+Index: sc/source/ui/vba/vbatogglebutton.hxx
+===================================================================
+--- sc/source/ui/vba/vbatogglebutton.hxx	(revision 276159)
++++ sc/source/ui/vba/vbatogglebutton.hxx	(revision 276288)
+@@ -1,63 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_TOGGLEBUTTON_HXX
+-#define SC_VBA_TOGGLEBUTTON_HXX
+-#include <cppuhelper/implbase2.hxx>
+-#include <ooo/vba/msforms/XToggleButton.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-
+-typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XToggleButton, css::script::XDefaultProperty  > ToggleButtonImpl_BASE;
+-
+-class ScVbaToggleButton : public ToggleButtonImpl_BASE
+-{
+-	rtl::OUString msDftPropName;
+-public:
+-    ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
+-    ~ScVbaToggleButton();
+-   // Attributes
+-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-
+-    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-    // XDefaultProperty
+-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+-};
+-#endif //SC_VBA_TOGGLEBUTTON_HXX
+Index: sc/source/ui/vba/vbalistbox.cxx
+===================================================================
+--- sc/source/ui/vba/vbalistbox.cxx	(revision 276159)
++++ sc/source/ui/vba/vbalistbox.cxx	(revision 276288)
+@@ -1,289 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbalistbox.cxx,v $
+- * $Revision: 1.4 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
+-
+-#include "vbalistbox.hxx"
+-#include "vbapropvalue.hxx"
+-#include <vector>
+-#include <comphelper/anytostring.hxx>
+-#include <com/sun/star/script/ArrayWrapper.hpp>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
+-const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
+-const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
+-
+-
+-ScVbaListBox::ScVbaListBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ListBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-    mpListHelper.reset( new ListControlHelper( m_xProps ) );
+-}
+-
+-// Attributes
+-void SAL_CALL 
+-ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
+-{
+-    sal_Int32 nIndex = 0;
+-    _value >>= nIndex;
+-    Selected( nIndex );
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaListBox::getListIndex() throw (uno::RuntimeException)
+-{
+-    uno::Sequence< sal_Int16 > sSelection;
+-    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
+-    if ( sSelection.getLength() == 0 )
+-        return uno::Any( sal_Int32( -1 ) );
+-    return uno::Any( sSelection[ 0 ] );
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaListBox::getValue() throw (uno::RuntimeException)
+-{
+-    uno::Sequence< sal_Int16 > sSelection;
+-    uno::Sequence< rtl::OUString > sItems;
+-    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
+-    m_xProps->getPropertyValue( ITEMS ) >>= sItems;
+-    if( getMultiSelect() )
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
+-                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
+-    uno::Any aRet;
+-    if ( sSelection.getLength() )
+-        aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] ); 
+-    return aRet;
+-}
+-
+-void SAL_CALL 
+-ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
+-{
+-    if( getMultiSelect() )
+-    {	
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
+-                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
+-    }
+-    rtl::OUString sValue = getAnyAsString( _value );
+-    uno::Sequence< rtl::OUString > sList;
+-    m_xProps->getPropertyValue( ITEMS ) >>= sList;
+-    uno::Sequence< sal_Int16 > nList;
+-    sal_Int16 nLength = static_cast<sal_Int16>( sList.getLength() );
+-    sal_Int16 nValue = -1;
+-    sal_Int16 i = 0;
+-    for( i = 0; i < nLength; i++ )
+-    {
+-        if( sList[i].equals( sValue ) )
+-        {
+-            nValue = i; 
+-            break;
+-        }
+-    }
+-    if( nValue == -1 )
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
+-                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
+-
+-    uno::Sequence< sal_Int16 > nSelectedIndices(1);
+-    nSelectedIndices[ 0 ] = nValue;
+-    m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nSelectedIndices ) ); 
+-    m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) ); 
+-}
+-
+-::rtl::OUString SAL_CALL 
+-ScVbaListBox::getText() throw (uno::RuntimeException)
+-{
+-	rtl::OUString result;
+-	getValue() >>= result;
+-	return result;
+-}
+-
+-void SAL_CALL 
+-ScVbaListBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
+-{
+-	setValue( uno::makeAny( _text ) ); // seems the same
+-}
+-
+-sal_Bool SAL_CALL 
+-ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException)
+-{
+-    sal_Bool bMultiSelect = sal_False;
+-    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ) ) >>= bMultiSelect;
+-    return bMultiSelect;
+-}
+-
+-void SAL_CALL 
+-ScVbaListBox::setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ), uno::makeAny( _multiselect ) );
+-}
+-
+-css::uno::Any SAL_CALL 
+-ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException)
+-{
+-    uno::Sequence< rtl::OUString > sList;
+-    m_xProps->getPropertyValue( ITEMS ) >>= sList;
+-    sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
+-    // no choice but to do a horror cast as internally
+-    // the indices are but sal_Int16 
+-    sal_Int16 nIndex = static_cast< sal_Int16 >( index );
+-    if( nIndex < 0 || nIndex >= nLength )
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
+-                    "Error Number." ), uno::Reference< uno::XInterface >() );
+-    m_nIndex = nIndex;
+-    return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
+-}
+-
+-// Methods
+-void SAL_CALL 
+-ScVbaListBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
+-{
+-	mpListHelper->AddItem( pvargItem, pvargIndex );
+-		}
+-
+-void SAL_CALL 
+-ScVbaListBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
+-{
+-	mpListHelper->removeItem( index );
+-}
+-
+-void SAL_CALL 
+-ScVbaListBox::Clear(  ) throw (uno::RuntimeException)
+-{
+-	mpListHelper->Clear();
+-}
+-
+-// this is called when something like the following vba code is used
+-// to set the selected state of particular entries in the Listbox
+-// ListBox1.Selected( 3 ) = false
+-//PropListener
+-void 
+-ScVbaListBox::setValueEvent( const uno::Any& value )
+-{
+-    sal_Bool bValue = sal_False;
+-    if( !(value >>= bValue) )
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
+-                    "Invalid type\n. need boolean." ), uno::Reference< uno::XInterface >() );
+-    uno::Sequence< sal_Int16 > nList;
+-    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= nList;
+-    sal_Int16 nLength = static_cast<sal_Int16>( nList.getLength() );
+-    sal_Int16 nIndex = m_nIndex;
+-    for( sal_Int16 i = 0; i < nLength; i++ )
+-    {
+-        if( nList[i] == nIndex )
+-        {
+-            if( bValue )
+-                return;
+-            else
+-            {
+-                for( ; i < nLength - 1; i++ )
+-                {
+-                    nList[i] = nList[i + 1];
+-                }
+-                nList.realloc( nLength - 1 );
+-                //m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
+-		m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nList ) );
+-                return;
+-            }
+-        }
+-    }
+-    if( bValue )
+-    {
+-        if( getMultiSelect() )
+-        {
+-            nList.realloc( nLength + 1 );
+-            nList[nLength] = nIndex;
+-        }
+-        else
+-        {
+-            nList.realloc( 1 );
+-            nList[0] = nIndex;
+-        }
+-        m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
+-    }
+-}
+-
+-// this is called when something like the following vba code is used
+-// to determine the selected state of particular entries in the Listbox
+-// msgbox ListBox1.Selected( 3 )
+-
+-css::uno::Any 
+-ScVbaListBox::getValueEvent()
+-{
+-    uno::Sequence< sal_Int16 > nList;
+-    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" ) ) ) >>= nList;
+-    sal_Int32 nLength = nList.getLength();
+-    sal_Int32 nIndex = m_nIndex;
+-    
+-    for( sal_Int32 i = 0; i < nLength; i++ )
+-    {
+-        if( nList[i] == nIndex )
+-            return uno::makeAny( sal_True );
+-    }
+-
+-    return uno::makeAny( sal_False );
+-}
+-
+-void SAL_CALL
+-ScVbaListBox::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
+-{
+-	ScVbaControl::setRowSource( _rowsource );
+-	mpListHelper->setRowSource( _rowsource );
+-}
+-
+-sal_Int32 SAL_CALL
+-ScVbaListBox::getListCount() throw (uno::RuntimeException)
+-{
+-	return mpListHelper->getListCount();
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
+-{
+-	return mpListHelper->List( pvargIndex, pvarColumn );
+-}
+-
+-rtl::OUString& 
+-ScVbaListBox::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaListBox") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaListBox::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ScVbaListBox" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbalabel.hxx
+===================================================================
+--- sc/source/ui/vba/vbalabel.hxx	(revision 276159)
++++ sc/source/ui/vba/vbalabel.hxx	(revision 276288)
+@@ -1,56 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbalabel.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_LABEL_HXX
+-#define SC_VBA_LABEL_HXX
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/msforms/XLabel.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-#include <cppuhelper/implbase2.hxx>
+-
+-typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XLabel, css::script::XDefaultProperty  > LabelImpl_BASE;
+-
+-class ScVbaLabel : public LabelImpl_BASE
+-{
+-public:
+-    ScVbaLabel( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
+-   // Attributes
+-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-    // XDefaultProperty
+-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+-};
+-#endif //SC_VBA_LABEL_HXX
+Index: sc/source/ui/vba/vbamultipage.cxx
+===================================================================
+--- sc/source/ui/vba/vbamultipage.cxx	(revision 276159)
++++ sc/source/ui/vba/vbamultipage.cxx	(revision 276288)
+@@ -1,132 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include "vbamultipage.hxx"
+-#include <ooo/vba/XCollection.hpp>
+-#include "vbapages.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-// uno servicename com.sun.star.awt.UnoControlProgressBarMode
+-const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
+-const rtl::OUString SVALUEMAX( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") );
+-const rtl::OUString SSTEP( RTL_CONSTASCII_USTRINGPARAM("Step") );
+-
+-typedef cppu::WeakImplHelper1< container::XIndexAccess > PagesImpl_Base;
+-class PagesImpl : public PagesImpl_Base
+-{
+-	sal_Int32 mnPages;
+-public:
+-	PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {}
+-	virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException) { return mnPages; }
+-	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException)
+-	{
+-		if ( Index < 0 || Index > mnPages )
+-			throw lang::IndexOutOfBoundsException();
+-		return uno::makeAny( uno::Reference< uno::XInterface >() );
+-	}
+-	// XElementAccess
+-	virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
+-	{
+-		// no Pages object yet #FIXME
+-		//return msforms::XPage::static_type(0);
+-		return uno::XInterface::static_type(0);
+-	}
+-	virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
+-	{
+-		return ( mnPages > 0 );
+-	}
+-};
+-uno::Reference< container::XIndexAccess > 
+-ScVbaMultiPage::getPages( sal_Int32 nPages )
+-{
+-	return new PagesImpl( nPages );
+-}
+-
+-ScVbaMultiPage::ScVbaMultiPage( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, const uno::Reference< uno::XInterface >& xDialog ) : MultiPageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-    mxDialogProps.set( xDialog, uno::UNO_QUERY_THROW );
+-    // set dialog step to value of multipage pseudo model
+-    setValue(getValue());
+-}
+-
+-// Attributes
+-sal_Int32 SAL_CALL 
+-ScVbaMultiPage::getValue() throw (css::uno::RuntimeException)
+-{
+-    sal_Int32 nValue = 0;
+-    m_xProps->getPropertyValue( SVALUE ) >>= nValue;
+-    return nValue;
+-}
+-
+-void SAL_CALL 
+-ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    // track change in dialog ( dialog value is 1 based, 0 is a special value )
+-    m_xProps->setPropertyValue( SVALUE, uno::makeAny( _value ) );
+-    mxDialogProps->setPropertyValue( SSTEP, uno::makeAny( _value + 1) );
+-}
+-
+-
+-rtl::OUString& 
+-ScVbaMultiPage::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMultiPage") );
+-	return sImplName;
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException)
+-{
+-	sal_Int32 nValue = 0;
+-	m_xProps->getPropertyValue( SVALUEMAX ) >>= nValue;
+-	uno::Reference< XCollection > xColl( new ScVbaPages( this, mxContext, getPages( nValue ) ) );
+-	if ( !index.hasValue() )
+-		return uno::makeAny( xColl );
+-	return xColl->Item( uno::makeAny( index ), uno::Any() );
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaMultiPage::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.MultiPage" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbashapes.hxx
+===================================================================
+--- sc/source/ui/vba/vbashapes.hxx	(revision 276159)
++++ sc/source/ui/vba/vbashapes.hxx	(revision 276288)
+@@ -1,80 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbashapes.hxx,v $
+- * $Revision: 1.3.32.1 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_SHAPES_HXX
+-#define SC_VBA_SHAPES_HXX
+-
+-#include <com/sun/star/drawing/XShapes.hpp>
+-#include <com/sun/star/drawing/XDrawPage.hpp>
+-#include <com/sun/star/container/XIndexAccess.hpp>
+-#include <ooo/vba/msforms/XShapes.hpp>
+-
+-#include "vbahelperinterface.hxx"
+-
+-#include "vbacollectionimpl.hxx"
+-
+-typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE;
+-
+-class ScVbaShapes : public ScVbaShapes_BASE
+-{
+-private: 
+-    css::uno::Reference< css::drawing::XShapes > m_xShapes;
+-    css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage;
+-    sal_Int32 m_nNewShapeCount;
+-    void initBaseCollection();
+-protected:
+-	virtual rtl::OUString& getServiceImplName();
+-	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-	virtual css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
+-    css::uno::Reference< css::drawing::XShape > createShape( rtl::OUString service ) throw (css::uno::RuntimeException);
+-    css::uno::Any AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException);
+-    css::uno::Any AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException);
+-    rtl::OUString createName( rtl::OUString sName );
+-    //TODO helperapi using a writer document
+-    //css::awt::Point calculateTopLeftMargin( css::uno::Reference< ov::XHelperInterface > xDocument );
+-    
+-public:
+-    ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes );
+-    static void setDefaultShapeProperties( css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException);
+-    static void setShape_NameProperty( css::uno::Reference< css::drawing::XShape > xShape, rtl::OUString sName );
+-    //XEnumerationAccess
+-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
+-
+-    virtual void SAL_CALL SelectAll() throw (css::uno::RuntimeException);
+-    //helper::calc
+-    virtual css::uno::Any SAL_CALL AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< ov::msforms::XShapeRange > SAL_CALL Range( const css::uno::Any& shapes ) throw (css::uno::RuntimeException);
+-    // ScVbaCollectionBaseImpl
+-    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException);
+-};
+-
+-#endif//SC_VBA_SHAPES_HXX
+Index: sc/source/ui/vba/vbapictureformat.hxx
+===================================================================
+--- sc/source/ui/vba/vbapictureformat.hxx	(revision 276159)
++++ sc/source/ui/vba/vbapictureformat.hxx	(revision 276288)
+@@ -1,64 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbapictureformat.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_PICTUREFORMAT_HXX
+-#define SC_VBA_PICTUREFORMAT_HXX
+-
+-#include <com/sun/star/drawing/XShape.hpp>
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-#include <ooo/vba/msforms/XPictureFormat.hpp>
+-#include "vbahelperinterface.hxx"
+-
+-typedef InheritedHelperInterfaceImpl1< ov::msforms::XPictureFormat > ScVbaPictureFormat_BASE;
+-
+-class ScVbaPictureFormat : public ScVbaPictureFormat_BASE
+-{
+-private:
+-    css::uno::Reference< css::drawing::XShape > m_xShape;
+-    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
+-protected:
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-private:
+-    void checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException);
+-public:
+-    ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::drawing::XShape > xShape ) throw( css::lang::IllegalArgumentException );
+-
+-    // Attributes
+-    virtual double SAL_CALL getBrightness() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setBrightness( double _brightness ) throw (css::uno::RuntimeException);
+-    virtual double SAL_CALL getContrast() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setContrast( double _contrast ) throw (css::uno::RuntimeException);
+-
+-    // Methods
+-    virtual void SAL_CALL IncrementBrightness( double increment ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL IncrementContrast( double increment ) throw (css::uno::RuntimeException);
+-};
+-
+-#endif//SC_VBA_PICTUREFORMAT_HXX
+Index: sc/source/ui/vba/vbaradiobutton.cxx
+===================================================================
+--- sc/source/ui/vba/vbaradiobutton.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaradiobutton.cxx	(revision 276288)
+@@ -1,107 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbaradiobutton.cxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include "vbaradiobutton.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
+-const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
+-ScVbaRadioButton::ScVbaRadioButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : RadioButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-}
+-
+-// Attributes
+-rtl::OUString SAL_CALL 
+-ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException)
+-{
+-    rtl::OUString Label;
+-    m_xProps->getPropertyValue( LABEL ) >>= Label;
+-    return Label;
+-}
+-
+-void SAL_CALL 
+-ScVbaRadioButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaRadioButton::getValue() throw (css::uno::RuntimeException)
+-{
+-    sal_Int16 nValue = -1;
+-    m_xProps->getPropertyValue( STATE ) >>= nValue;
+-    if( nValue != 0 )
+-        nValue = -1;
+-//    return uno::makeAny( nValue ); 
+-// I must be missing something MSO says value should be -1 if selected, 0 if not
+-// selected
+-    return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); 
+-
+-}
+-
+-void SAL_CALL 
+-ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
+-{
+-    sal_Int16 nValue = 0;
+-    sal_Bool bValue = sal_False;
+-    if( _value >>= nValue )
+-    {
+-        if( nValue == -1)
+-        nValue = 1;
+-    }
+-    else if ( _value >>= bValue )
+-    {
+-        if ( bValue )
+-            nValue = 1;
+-    }
+-    m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
+-}
+-
+-rtl::OUString& 
+-ScVbaRadioButton::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRadioButton") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaRadioButton::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.RadioButton" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbacommandbars.hxx
+===================================================================
+--- sc/source/ui/vba/vbacommandbars.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacommandbars.hxx	(revision 276288)
+@@ -1,79 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_COMMANDBARS_HXX
+-#define SC_VBA_COMMANDBARS_HXX
+-
+-#include <ooo/vba/XCommandBar.hpp>
+-#include <ooo/vba/XCommandBars.hpp>
+-#include <com/sun/star/container/XNameAccess.hpp>
+-
+-#include <cppuhelper/implbase1.hxx>
+-
+-#include "vbahelperinterface.hxx"
+-#include "vbacollectionimpl.hxx"
+-
+-typedef CollTestImplHelper< ov::XCommandBars > CommandBars_BASE;
+-
+-class ScVbaCommandBars : public CommandBars_BASE
+-{
+-private:
+-    css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
+-    rtl::OUString m_sModuleName;
+-    void retrieveObjects() throw( css::uno::RuntimeException );
+-public:
+-    ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess );
+-
+-    sal_Bool checkToolBarExist( rtl::OUString sToolBarName );
+-    rtl::OUString GetModuleName(){ return m_sModuleName; };
+-    css::uno::Reference< css::container::XNameAccess > GetWindows() 
+-    { 
+-        retrieveObjects();
+-        return m_xNameAccess; 
+-    };
+-    // XCommandBars
+-    virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+-    // XEnumerationAccess
+-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
+-    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+-
+-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException);
+-    // XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-
+-#endif//SC_VBA_COMMANDBARS_HXX
+Index: sc/source/ui/vba/vbapages.cxx
+===================================================================
+--- sc/source/ui/vba/vbapages.cxx	(revision 276159)
++++ sc/source/ui/vba/vbapages.cxx	(revision 276288)
+@@ -1,81 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include "vbapages.hxx"
+-
+-using namespace ::ooo::vba;
+-using namespace ::com::sun::star;
+-using namespace ::vos;
+-
+-ScVbaPages::ScVbaPages( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPages ) throw( lang::IllegalArgumentException ) : ScVbaPages_BASE( xParent, xContext, xPages )
+-{
+-}
+-
+-uno::Type SAL_CALL 
+-ScVbaPages::getElementType() throw (uno::RuntimeException)
+-{
+-	// return msforms::XPage::static_type(0); 
+-	return uno::XInterface::static_type(0); 
+-}
+-
+-uno::Any 
+-ScVbaPages::createCollectionObject( const css::uno::Any& aSource )
+-{
+-	return aSource;
+-}
+-
+-rtl::OUString& 
+-ScVbaPages::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPages") );
+-	return sImplName;
+-}
+-
+-uno::Reference< container::XEnumeration > SAL_CALL 
+-ScVbaPages::createEnumeration() throw (uno::RuntimeException)
+-{
+-	return uno::Reference< container::XEnumeration >();
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaPages::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Pages" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbaspinbutton.cxx
+===================================================================
+--- sc/source/ui/vba/vbaspinbutton.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaspinbutton.cxx	(revision 276288)
+@@ -1,109 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include "vbaspinbutton.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
+-const static rtl::OUString SPINVALUE( RTL_CONSTASCII_USTRINGPARAM("SpinValue") );
+-const static rtl::OUString SPINMAX( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") );
+-const static rtl::OUString SPINMIN( RTL_CONSTASCII_USTRINGPARAM("SpinValueMin") );
+-
+-ScVbaSpinButton::ScVbaSpinButton(  const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : SpinButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-}
+-
+-// Attributes
+-uno::Any SAL_CALL 
+-ScVbaSpinButton::getValue() throw (css::uno::RuntimeException)
+-{
+-    return  m_xProps->getPropertyValue( SPINVALUE );
+-}
+-
+-void SAL_CALL 
+-ScVbaSpinButton::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( SPINVALUE, _value );
+-}
+-
+-::sal_Int32 SAL_CALL 
+-ScVbaSpinButton::getMax() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nMax = 0;
+-    m_xProps->getPropertyValue( SPINMAX ) >>= nMax;
+-    return nMax;
+-}
+-
+-void SAL_CALL 
+-ScVbaSpinButton::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( SPINMAX, uno::makeAny( nVal ) ); 
+-}
+-
+-::sal_Int32 SAL_CALL 
+-ScVbaSpinButton::getMin() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nVal = 0;
+-    m_xProps->getPropertyValue( SPINMIN ) >>= nVal;
+-    return nVal;
+-}
+-
+-void SAL_CALL 
+-ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) ); 
+-}
+-
+-rtl::OUString& 
+-ScVbaSpinButton::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaSpinButton") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaSpinButton::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbabutton.cxx
+===================================================================
+--- sc/source/ui/vba/vbabutton.cxx	(revision 276159)
++++ sc/source/ui/vba/vbabutton.cxx	(revision 276288)
+@@ -1,74 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbabutton.cxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include "vbabutton.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
+-ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-}
+-
+-// Attributes
+-rtl::OUString SAL_CALL 
+-ScVbaButton::getCaption() throw (css::uno::RuntimeException)
+-{
+-    rtl::OUString Label;
+-    m_xProps->getPropertyValue( LABEL ) >>= Label;
+-    return Label;
+-}
+-
+-void SAL_CALL 
+-ScVbaButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
+-}
+-
+-rtl::OUString& 
+-ScVbaButton::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaButton") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaButton::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Button" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbashaperange.cxx
+===================================================================
+--- sc/source/ui/vba/vbashaperange.cxx	(revision 276159)
++++ sc/source/ui/vba/vbashaperange.cxx	(revision 276288)
+@@ -1,170 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbashaperange.cxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include <com/sun/star/drawing/XShapeGrouper.hpp>
+-#include <com/sun/star/drawing/XDrawPage.hpp>
+-
+-#include "vbashaperange.hxx"
+-#include "vbashape.hxx"
+-
+-using namespace ::ooo::vba;
+-using namespace ::com::sun::star;
+-
+-class VbShapeRangeEnumHelper : public EnumerationHelper_BASE
+-{
+-        uno::Reference< XCollection > m_xParent;
+-        uno::Reference<container::XIndexAccess > m_xIndexAccess;
+-        sal_Int32 nIndex;
+-public:
+-	VbShapeRangeEnumHelper( const uno::Reference< XCollection >& xParent,  const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
+-        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
+-        {
+-                return ( nIndex < m_xIndexAccess->getCount() );
+-        }
+-        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+-        {
+-                ScVbaShapeRange* pCollectionImpl = dynamic_cast< ScVbaShapeRange* >(m_xParent.get());
+-                if ( pCollectionImpl && hasMoreElements() )
+-                    return pCollectionImpl->createCollectionObject(  m_xIndexAccess->getByIndex( nIndex++ ) );
+-                throw container::NoSuchElementException();
+-        }
+-
+-};
+-
+-ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xShapes, const uno::Reference< drawing::XDrawPage >& xDrawPage ) : ScVbaShapeRange_BASE( xParent, xContext, xShapes ), m_xDrawPage( xDrawPage ), m_nShapeGroupCount(0)
+-{
+-}
+-
+-// Methods
+-void SAL_CALL 
+-ScVbaShapeRange::Select(  ) throw (uno::RuntimeException)
+-{
+-    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+-    xSelectSupp->select( uno::makeAny( getShapes() ) );
+-}
+-
+-uno::Reference< msforms::XShape > SAL_CALL 
+-ScVbaShapeRange::Group() throw (uno::RuntimeException)
+-{
+-    uno::Reference< drawing::XShapeGrouper > xShapeGrouper( m_xDrawPage, uno::UNO_QUERY_THROW );
+-    uno::Reference< drawing::XShapeGroup > xShapeGroup( xShapeGrouper->group( getShapes() ), uno::UNO_QUERY_THROW );
+-    uno::Reference< drawing::XShape > xShape( xShapeGroup, uno::UNO_QUERY_THROW );
+-    return uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, getShapes(), office::MsoShapeType::msoGroup ) );
+-}
+-
+-uno::Reference< drawing::XShapes > 
+-ScVbaShapeRange::getShapes() throw (uno::RuntimeException)
+-{
+-	if ( !m_xShapes.is() )
+-	{
+-		uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
+-		m_xShapes.set( xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.drawing.ShapeCollection" ) ), uno::UNO_QUERY_THROW );
+-		sal_Int32 nLen = m_xIndexAccess->getCount();
+-		for ( sal_Int32 index = 0; index < nLen; ++index )
+-			m_xShapes->add( uno::Reference< drawing::XShape >( m_xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW ) );
+-
+-	}
+-	return m_xShapes;
+-}
+-
+-
+-void SAL_CALL 
+-ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeException)
+-{
+-	sal_Int32 nLen = getCount();
+-	for ( sal_Int32 index = 1; index <= nLen; ++index )
+-	{
+-		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
+-		xShape->IncrementRotation( Increment );
+-	}
+-}
+-
+-void SAL_CALL 
+-ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException)
+-{
+-	sal_Int32 nLen = getCount();
+-	for ( sal_Int32 index = 1; index <= nLen; ++index )
+-	{
+-		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
+-		xShape->IncrementLeft( Increment );
+-	}
+-}
+-
+-void SAL_CALL 
+-ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException)
+-{
+-	sal_Int32 nLen = getCount();
+-	for ( sal_Int32 index = 1; index <= nLen; ++index )
+-	{
+-		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
+-		xShape->IncrementTop( Increment );
+-	}
+-}
+-
+-uno::Type SAL_CALL
+-ScVbaShapeRange::getElementType() throw (uno::RuntimeException)
+-{
+-    return msforms::XShape::static_type(0);
+-}
+-
+-uno::Reference< container::XEnumeration > SAL_CALL 
+-ScVbaShapeRange::createEnumeration() throw (uno::RuntimeException)
+-{
+-	return new VbShapeRangeEnumHelper( this, m_xIndexAccess );
+-}
+-
+-uno::Any
+-ScVbaShapeRange:: createCollectionObject( const css::uno::Any& aSource )
+-{
+-	uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW );
+-	// #TODO  #FIXME Shape parent should always be the sheet the shapes belong 
+-	// to 
+-	uno::Reference< msforms::XShape > xVbShape( new ScVbaShape( uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), ScVbaShape::getType( xShape ) ) ); 
+-        return uno::makeAny( xVbShape );
+-}
+-
+-rtl::OUString& 
+-ScVbaShapeRange::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapeRange") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaShapeRange::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.ShapeRange" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbascrollbar.cxx
+===================================================================
+--- sc/source/ui/vba/vbascrollbar.cxx	(revision 276159)
++++ sc/source/ui/vba/vbascrollbar.cxx	(revision 276288)
+@@ -1,139 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include "vbascrollbar.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-const static rtl::OUString LARGECHANGE( RTL_CONSTASCII_USTRINGPARAM("BlockIncrement") );
+-const static rtl::OUString SMALLCHANGE( RTL_CONSTASCII_USTRINGPARAM("LineIncrement") );
+-const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
+-const static rtl::OUString SCROLLVALUE( RTL_CONSTASCII_USTRINGPARAM("ScrollValue") );
+-const static rtl::OUString SCROLLMAX( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMax") );
+-const static rtl::OUString SCROLLMIN( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMin") );
+-
+-ScVbaScrollBar::ScVbaScrollBar(  const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ScrollBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-}
+-
+-// Attributes
+-uno::Any SAL_CALL 
+-ScVbaScrollBar::getValue() throw (css::uno::RuntimeException)
+-{
+-    return  m_xProps->getPropertyValue( SCROLLVALUE );
+-}
+-
+-void SAL_CALL 
+-ScVbaScrollBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( SCROLLVALUE, _value );
+-}
+-
+-::sal_Int32 SAL_CALL 
+-ScVbaScrollBar::getMax() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nMax = 0;
+-    m_xProps->getPropertyValue( SCROLLMAX ) >>= nMax;
+-    return nMax;
+-}
+-
+-void SAL_CALL 
+-ScVbaScrollBar::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( SCROLLMAX, uno::makeAny( nVal ) ); 
+-}
+-
+-::sal_Int32 SAL_CALL 
+-ScVbaScrollBar::getMin() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nVal = 0;
+-    m_xProps->getPropertyValue( SCROLLMIN ) >>= nVal;
+-    return nVal;
+-}
+-
+-void SAL_CALL 
+-ScVbaScrollBar::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( SCROLLMIN, uno::makeAny( nVal ) ); 
+-}
+-
+-void SAL_CALL 
+-ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange ) throw (uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( LARGECHANGE, uno::makeAny( _largechange ) );
+-}
+-
+-::sal_Int32 SAL_CALL 
+-ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nVal = 0;
+-    m_xProps->getPropertyValue( LARGECHANGE ) >>= nVal;
+-    return nVal;
+-}
+-
+-::sal_Int32 SAL_CALL 
+-ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nSmallChange = 0;
+-    m_xProps->getPropertyValue( SMALLCHANGE ) >>= nSmallChange;
+-    return nSmallChange;
+-}
+-
+-void SAL_CALL 
+-ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( SMALLCHANGE, uno::makeAny( _smallchange ) );
+-}
+-
+-rtl::OUString& 
+-ScVbaScrollBar::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaScrollBar") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaScrollBar::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbacheckbox.cxx
+===================================================================
+--- sc/source/ui/vba/vbacheckbox.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacheckbox.cxx	(revision 276288)
+@@ -1,110 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include "vbacheckbox.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
+-const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
+-ScVbaCheckbox::ScVbaCheckbox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : CheckBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-}
+-
+-// Attributes
+-rtl::OUString SAL_CALL 
+-ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException)
+-{
+-    rtl::OUString Label;
+-    m_xProps->getPropertyValue( LABEL ) >>= Label;
+-    return Label;
+-}
+-
+-void SAL_CALL 
+-ScVbaCheckbox::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaCheckbox::getValue() throw (css::uno::RuntimeException)
+-{
+-    sal_Int16 nValue = -1;
+-    m_xProps->getPropertyValue( STATE ) >>= nValue;
+-    if( nValue != 0 )
+-        nValue = -1;
+-//    return uno::makeAny( nValue ); 
+-// I must be missing something MSO says value should be -1 if selected, 0 if not
+-// selected
+-    return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); 
+-}
+-
+-void SAL_CALL 
+-ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
+-{
+-    sal_Int16 nValue = 0;
+-    sal_Bool bValue = false;
+-    if( _value >>= nValue )
+-    {
+-        if( nValue == -1)
+-            nValue = 1;
+-    }
+-    else if ( _value >>= bValue )
+-    {
+-        if ( bValue )
+-            nValue = 1;
+-    }
+-    m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
+-}
+-rtl::OUString& 
+-ScVbaCheckbox::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCheckbox") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaCheckbox::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.CheckBox" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbaprogressbar.hxx
+===================================================================
+--- sc/source/ui/vba/vbaprogressbar.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaprogressbar.hxx	(revision 276288)
+@@ -1,59 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_PROGRESSBAR_HXX
+-#define SC_VBA_PROGRESSBAR_HXX
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/msforms/XProgressBar.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-#include <cppuhelper/implbase2.hxx>
+-
+-typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XProgressBar, css::script::XDefaultProperty  > ProgressBarImpl_BASE;
+-
+-class ScVbaProgressBar : public ProgressBarImpl_BASE
+-{
+-public:
+-    ScVbaProgressBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
+-   // Attributes
+-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-    // XDefaultProperty
+-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+-};
+-#endif //SC_VBA_LABEL_HXX
+Index: sc/source/ui/vba/vbacommandbar.cxx
+===================================================================
+--- sc/source/ui/vba/vbacommandbar.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacommandbar.cxx	(revision 276288)
+@@ -1,329 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+-#include <com/sun/star/frame/XFrame.hpp>
+-#include <com/sun/star/frame/XDesktop.hpp>
+-#include <com/sun/star/frame/XLayoutManager.hpp>
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-
+-#include "vbacommandbar.hxx"
+-#include "vbacommandbarcontrols.hxx"
+-#include "vbahelper.hxx"
+-
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw (uno::RuntimeException) : CommandBar_BASE( xParent, xContext )
+-{
+-    // it's a menu bar
+-    // only supporting factory menus ( no custom menus )
+-    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
+-    initCommandBar();
+-    switch( nModuleType )
+-    {
+-        case 0:
+-            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" );
+-            break;
+-        case 1:
+-            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
+-            break;
+-        default:
+-            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
+-    }
+-    getMenuSettings();
+-    m_bIsMenu = sal_True;
+-    m_bCustom = sal_False;
+-}
+-ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw (uno::RuntimeException) :  CommandBar_BASE( xParent, xContext )
+-{
+-    // it's a tool bar
+-    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
+-    initCommandBar();
+-    m_bTemporary = bTemporary;
+-    m_bCreate = bCreate;
+-    // get OOo ToolBarName
+-    CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
+-    if( iter != mCommandBarNameMap.end() )
+-    {
+-        m_sToolBarName = iter->second;
+-    }
+-    else
+-    {
+-        m_sToolBarName = sToolBarName;
+-    }
+-    m_sUIName = m_sToolBarName;
+-    m_bIsMenu = sal_False;
+-    getToolBarSettings( m_sToolBarName );
+-}
+-void
+-ScVbaCommandBar::initCommandBar() throw (uno::RuntimeException)
+-{
+-    m_pScVbaCommandBars = dynamic_cast< ScVbaCommandBars* >( m_xParentHardRef.get() );
+-    if ( !m_pScVbaCommandBars )
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBars"), uno::Reference< uno::XInterface >() );
+-    m_bIsMenu = sal_False;
+-    m_bCustom = sal_False;
+-    m_bTemporary = sal_True;
+-    m_sToolBarName = rtl::OUString::createFromAscii("");
+-    m_sUIName = rtl::OUString::createFromAscii("");
+-    m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" );
+-}
+-void
+-ScVbaCommandBar::getToolBarSettings( rtl::OUString sToolBarName ) throw( uno::RuntimeException )
+-{
+-    rtl::OUString sFactoryToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/") + sToolBarName.toAsciiLowerCase();
+-    rtl::OUString sCustomToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/custom_toolbar_") + sToolBarName;
+-    uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
+-    uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
+-    m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_pScVbaCommandBars->GetModuleName() ), uno::UNO_QUERY_THROW );
+-    m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
+-    if( m_xUICfgManager->hasSettings( sFactoryToolBar ) )
+-    {
+-        // exsiting standard ToolBar
+-        m_xBarSettings.set( m_xUICfgManager->getSettings( sFactoryToolBar, sal_True ), uno::UNO_QUERY_THROW );
+-        m_sToolBarName = sFactoryToolBar;
+-    }
+-    else if( m_xUICfgManager->hasSettings( sCustomToolBar ) )
+-    {
+-        // exisiting custom ToolBar
+-        m_xBarSettings.set( m_xUICfgManager->getSettings( sCustomToolBar, sal_True ), uno::UNO_QUERY_THROW );
+-        m_sToolBarName = sCustomToolBar;
+-        m_bCustom = sal_True;
+-    }
+-    else if( m_bCreate )
+-    {
+-        // new custom ToolBar
+-        m_xBarSettings.set( m_xUICfgManager->createSettings(), uno::UNO_QUERY_THROW );
+-        m_sToolBarName = sCustomToolBar;
+-        m_bCustom = sal_True;
+-        addCustomBar();
+-    }
+-    else
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii("ToolBar do not exist"), uno::Reference< uno::XInterface >() );
+-    if( m_pScVbaCommandBars->GetWindows()->hasByName( m_sToolBarName ) )
+-    {
+-        uno::Any aToolBar = m_pScVbaCommandBars->GetWindows()->getByName( m_sToolBarName );
+-        aToolBar >>= m_aToolBar; 
+-    }
+-}
+-void
+-ScVbaCommandBar::addCustomBar()
+-{
+-    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
+-    xPropertySet->setPropertyValue(rtl::OUString::createFromAscii("UIName"), uno::makeAny( m_sUIName ));
+-
+-    if( m_xUICfgManager->hasSettings(m_sToolBarName) )
+-    {
+-        m_xUICfgManager->replaceSettings( m_sToolBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-    }
+-    else
+-    {
+-        m_xUICfgManager->insertSettings( m_sToolBarName,  uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-    }
+-    if( !m_bTemporary )
+-    {
+-        m_xUICfgPers->store();
+-    }
+-}
+-void 
+-ScVbaCommandBar::getMenuSettings()
+-{
+-    try
+-    {
+-        rtl::OUString sMenuBar = rtl::OUString::createFromAscii( "private:resource/menubar/menubar" );
+-        uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
+-        uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
+-        m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_sMenuModuleName ), uno::UNO_QUERY_THROW );
+-        m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
+-        m_xBarSettings.set( m_xUICfgManager->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW );
+-    } 
+-    catch ( uno::Exception e)
+-    {
+-        OSL_TRACE( "getMenuSetting got a error\n" );
+-    }
+-}
+-::rtl::OUString SAL_CALL
+-ScVbaCommandBar::getName() throw ( uno::RuntimeException )
+-{
+-    // This will get a "NULL length string" when Name is not set. 
+-    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
+-    uno::Any aName = xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") );
+-    rtl::OUString sName;
+-    aName >>= sName;
+-    if( sName.getLength() < 1 && !m_bIsMenu )
+-    {
+-        uno::Reference< container::XNameAccess > xNameAccess( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
+-        if( xNameAccess->hasByName( m_sToolBarName ) )
+-        {
+-            beans::PropertyValues aToolBar; 
+-            xNameAccess->getByName( m_sToolBarName ) >>= aToolBar;
+-            sal_Int32 nCount = aToolBar.getLength();
+-            beans::PropertyValue aPropertyValue;
+-            for( sal_Int32 i = 0; i < nCount; i++ )
+-            {
+-                aPropertyValue = aToolBar[i];
+-                if( aPropertyValue.Name.equals( rtl::OUString::createFromAscii("UIName") ) )
+-                {
+-                    aPropertyValue.Value >>= sName;
+-                    return sName;
+-                }
+-            }
+-        }
+-    }
+-    return sName;
+-}
+-void SAL_CALL 
+-ScVbaCommandBar::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException)
+-{
+-    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
+-    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("UIName"), uno::makeAny( _name ) );
+-    uno::Reference< container::XIndexAccess > xIndexAccess( m_xBarSettings, uno::UNO_QUERY_THROW );
+-    
+-    if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
+-    {
+-        m_xUICfgManager->replaceSettings( m_sToolBarName, xIndexAccess );
+-    }
+-    else
+-    {
+-        // toolbar not found
+-    }
+-    if( !m_bTemporary )
+-    {
+-        m_xUICfgPers->store();
+-    }
+-}
+-::sal_Bool SAL_CALL 
+-ScVbaCommandBar::getVisible() throw (uno::RuntimeException)
+-{
+-    sal_Bool bVisible = sal_False;
+-    try
+-    {
+-        sal_Int32 i = 0;
+-        while( !m_aToolBar[i].Name.equals( rtl::OUString::createFromAscii( "Visible" ) ) )
+-        {
+-            i++;
+-        }
+-        m_aToolBar[i].Value >>= bVisible;
+-    }
+-    catch ( uno::Exception e )
+-    {
+-    }
+-    return bVisible;
+-}
+-void SAL_CALL 
+-ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
+-{
+-    try
+-    {
+-        uno::Reference< frame::XFrame > xFrame( getCurrentDocument()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); 
+-        uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
+-        uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW );
+-        if( _visible )
+-        {
+-            xLayoutManager->createElement( m_sToolBarName );
+-            xLayoutManager->showElement( m_sToolBarName );
+-        }
+-        else
+-        {
+-            xLayoutManager->hideElement( m_sToolBarName );
+-            xLayoutManager->destroyElement( m_sToolBarName );
+-        }
+-    }
+-    catch( uno::Exception e )
+-    {
+-        OSL_TRACE( "SetVisible get an exception\n" );
+-    }
+-}
+-void SAL_CALL 
+-ScVbaCommandBar::Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+-{
+-    if( m_bCustom )
+-    {
+-        if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
+-        {
+-            m_xUICfgManager->removeSettings(m_sToolBarName);
+-            // make it permanent
+-            if( !m_bTemporary )
+-            {
+-                m_xUICfgPers->store();
+-            }
+-        }
+-        else
+-        {
+-            // toolbar not found
+-            // TODO throw Error
+-        }
+-        uno::Reference< container::XNameContainer > xNameContainer( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
+-        if( xNameContainer->hasByName( m_sToolBarName ) )
+-        {
+-            xNameContainer->removeByName( m_sToolBarName );
+-        }
+-    }
+-}
+-uno::Any SAL_CALL 
+-ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
+-{
+-    sal_Int32 nIndex;
+-    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
+-    if( aIndex.hasValue() )
+-    {
+-        if( aIndex >>= nIndex )
+-        {
+-            uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
+-            return uno::makeAny( xCommandBarControl );
+-        }
+-        else
+-            throw uno::RuntimeException( rtl::OUString::createFromAscii(  "invalid index" ), uno::Reference< uno::XInterface >() );
+-    }
+-    return uno::makeAny( xCommandBarControls );
+-}
+-rtl::OUString& 
+-ScVbaCommandBar::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBar") );
+-	return sImplName;
+-}
+-uno::Sequence<rtl::OUString> 
+-ScVbaCommandBar::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBar" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbalistcontrolhelper.hxx
+===================================================================
+--- sc/source/ui/vba/vbalistcontrolhelper.hxx	(revision 276159)
++++ sc/source/ui/vba/vbalistcontrolhelper.hxx	(revision 276288)
+@@ -1,20 +0,0 @@
+-#ifndef SC_VBA_LISTCONTROLHELPER
+-#define SC_VBA_LISTCONTROLHELPER
+-
+-#include "vbahelper.hxx"
+-
+-class ListControlHelper
+-{
+-	css::uno::Reference< css::beans::XPropertySet > m_xProps;
+-
+-public:
+-	ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){}
+-	virtual ~ListControlHelper() {}
+-	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);   
+-    	virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
+-	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
+-	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
+-};
+-#endif
+Index: sc/source/ui/vba/vbacollectionimpl.hxx
+===================================================================
+--- sc/source/ui/vba/vbacollectionimpl.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacollectionimpl.hxx	(revision 276288)
+@@ -1,259 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbacollectionimpl.hxx,v $
+- * $Revision: 1.5 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_COLLECTION_IMPL_HXX
+-#define SC_VBA_COLLECTION_IMPL_HXX
+-
+-#include <ooo/vba/XCollection.hpp>
+-//#include <ooo/vba/XCollectionTest.hpp>
+-#include <com/sun/star/container/XEnumerationAccess.hpp>
+-#include <com/sun/star/uno/XComponentContext.hpp>
+-#include <com/sun/star/script/XDefaultMethod.hpp>
+-#include <com/sun/star/container/XIndexAccess.hpp>
+-#include <com/sun/star/container/XNameAccess.hpp>
+-#include <com/sun/star/container/XNamed.hpp>
+-
+-#include <cppuhelper/implbase3.hxx>
+-#include <cppuhelper/implbase2.hxx>
+-#include <cppuhelper/implbase1.hxx>
+-
+-#include "vbahelper.hxx"
+-#include "vbahelperinterface.hxx"
+-#include "vbaglobals.hxx"
+-
+-#include <vector>
+-
+-typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumerationHelper_BASE;
+-
+-class EnumerationHelperImpl : public EnumerationHelper_BASE
+-{
+-protected:
+-	css::uno::Reference< css::uno::XComponentContext > m_xContext;
+-	css::uno::Reference< css::container::XEnumeration > m_xEnumeration;
+-public:
+-
+-	EnumerationHelperImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XEnumeration >& xEnumeration ) throw ( css::uno::RuntimeException ) : m_xContext( xContext ),  m_xEnumeration( xEnumeration ) { }
+-	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException) { return m_xEnumeration->hasMoreElements(); }
+-};
+-
+-// a wrapper class for a providing a XIndexAccess, XNameAccess, XEnumerationAccess impl based on providing a vector of interfaces 
+-// only requirement is the object needs to implement XName
+-
+-
+-
+-typedef ::cppu::WeakImplHelper3< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE;
+-
+-template< typename Ifc1 >
+-class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
+-{
+-public:
+-typedef std::vector< css::uno::Reference< Ifc1 > >  XNamedVec;
+-private:
+-
+-	class XNamedEnumerationHelper : public EnumerationHelper_BASE
+-	{
+-		XNamedVec mXNamedVec;
+-		typename XNamedVec::iterator mIt;
+-	public:
+-	        XNamedEnumerationHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), mIt( mXNamedVec.begin() ) {}
+-	
+-	        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException)
+-	        {
+-			return ( mIt != mXNamedVec.end() );
+-	        }
+-	
+-	        virtual css::uno::Any SAL_CALL nextElement(  ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
+-	        {
+-	                if ( hasMoreElements() )
+-				return css::uno::makeAny( *mIt++ );
+-	                throw css::container::NoSuchElementException();
+-	        }
+-	};
+-
+-protected:
+-	XNamedVec mXNamedVec;
+-	typename XNamedVec::iterator cachePos;
+-public:
+-	XNamedObjectCollectionHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), cachePos(mXNamedVec.begin()) {}
+-	// XElementAccess
+-	virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException) { return  Ifc1::static_type(0); }
+-	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException) { return ( mXNamedVec.size() > 0 ); }
+-	// XNameAcess 
+-	virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
+-	{
+-		if ( !hasByName(aName) )
+-			throw css::container::NoSuchElementException();
+-		return css::uno::makeAny( *cachePos );
+-	}
+-	virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException)
+-	{
+-		css::uno::Sequence< rtl::OUString > sNames( mXNamedVec.size() );
+-		rtl::OUString* pString = sNames.getArray();
+-		typename XNamedVec::iterator it = mXNamedVec.begin();
+-		typename XNamedVec::iterator it_end = mXNamedVec.end();
+-
+-		for ( ; it != it_end; ++it, ++pString )
+-		{
+-			css::uno::Reference< css::container::XNamed > xName( *it, css::uno::UNO_QUERY_THROW );	
+-			*pString = xName->getName();
+-		}
+-		return sNames;
+-	}
+-	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
+-	{
+-		cachePos = mXNamedVec.begin();
+-		typename XNamedVec::iterator it_end = mXNamedVec.end();
+-		for ( ; cachePos != it_end; ++cachePos )
+-		{
+-			css::uno::Reference< css::container::XNamed > xName( *cachePos, css::uno::UNO_QUERY_THROW );	
+-			if ( aName.equals( xName->getName() ) )
+-				break;
+-		}
+-		return ( cachePos != it_end );
+-	}
+-
+-	// XElementAccess
+-	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException) { return mXNamedVec.size(); }	
+-	virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException )
+-	{
+-		if ( Index < 0 || Index >= getCount() )
+-			throw css::lang::IndexOutOfBoundsException();
+-	
+-		return css::uno::makeAny( mXNamedVec[ Index ] );
+-
+-	}
+-	// XEnumerationAccess
+-	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw (css::uno::RuntimeException)
+-	{
+-		return new XNamedEnumerationHelper( mXNamedVec );
+-	}
+-};
+-
+-// including a HelperInterface implementation
+-template< typename Ifc1 >
+-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
+-{
+-typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
+-protected:
+-	css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess;
+-	css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
+-
+-	virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException)
+-	{
+-		if ( !m_xNameAccess.is() )
+-			throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase string index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
+-	
+-		return createCollectionObject( m_xNameAccess->getByName( sIndex ) );	
+-	}		
+-
+-	virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException)
+-	{
+-		if ( !m_xIndexAccess.is() )
+-			throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase numeric index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
+-		if ( nIndex <= 0 )
+-		{
+-			throw  css::lang::IndexOutOfBoundsException( 
+-				::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
+-				"index is 0 or negative" ) ), 
+-				css::uno::Reference< css::uno::XInterface >() );
+-		}
+-		// need to adjust for vba index ( for which first element is 1 )
+-		return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) );		
+-	}
+-public:
+-	ScVbaCollectionBase( const css::uno::Reference< ov::XHelperInterface >& xParent,   const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) : BaseColBase( xParent, xContext ), m_xIndexAccess( xIndexAccess ){ m_xNameAccess.set(m_xIndexAccess, css::uno::UNO_QUERY); }
+-	//XCollection
+-	virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException)
+-	{
+-		return m_xIndexAccess->getCount();
+-	}
+-
+-	virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::uno::RuntimeException)
+-	{
+-		if ( Index1.getValueTypeClass() != css::uno::TypeClass_STRING )
+-		{
+-			sal_Int32 nIndex = 0;
+-	
+-			if ( ( Index1 >>= nIndex ) != sal_True )
+-			{
+-				rtl::OUString message;
+-				message = rtl::OUString::createFromAscii(
+-					"Couldn't convert index to Int32");
+-				throw  css::lang::IndexOutOfBoundsException( message,
+-					css::uno::Reference< css::uno::XInterface >() );
+-			}
+-			return 	getItemByIntIndex( nIndex );
+-		}
+-		rtl::OUString aStringSheet;
+-
+-		Index1 >>= aStringSheet;
+-		return getItemByStringIndex( aStringSheet );	
+-	}
+-	// XDefaultMethod
+-	::rtl::OUString SAL_CALL getDefaultMethodName(  ) throw (css::uno::RuntimeException)
+-	{
+-		const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
+-		return sName;
+-	}
+-	// XEnumerationAccess
+-	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0;	
+-
+-	// XElementAccess
+-	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) = 0;
+-	// XElementAccess
+-	virtual ::sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException)
+-	{
+-		return ( m_xIndexAccess->getCount() > 0 );
+-	}
+-	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0;
+-	
+-};
+-
+-typedef ::cppu::WeakImplHelper1<ov::XCollection> XCollection_InterfacesBASE;
+-
+-typedef ScVbaCollectionBase< XCollection_InterfacesBASE > CollImplBase1;
+-// compatible with the old collections ( pre XHelperInterface base class ) ( some internal objects still use this )
+-class ScVbaCollectionBaseImpl : public CollImplBase1
+-{
+-public:
+-	ScVbaCollectionBaseImpl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : CollImplBase1( xParent, xContext, xIndexAccess){}
+-
+-};
+-
+-template <typename Ifc> // where Ifc must implement XCollectionTest
+-class CollTestImplHelper :  public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
+-{
+-typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc >  > ImplBase1;
+-
+-public:
+-	CollTestImplHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,  const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : ImplBase1( xParent, xContext, xIndexAccess ) {}
+-};
+-
+-
+-#endif //SC_VBA_COLLECTION_IMPL_HXX
+Index: sc/source/ui/vba/vbaimage.cxx
+===================================================================
+--- sc/source/ui/vba/vbaimage.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaimage.cxx	(revision 276288)
+@@ -1,59 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile$
+- * $Revision$
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include "vbaimage.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
+-ScVbaImage::ScVbaImage( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ImageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-}
+-
+-rtl::OUString& 
+-ScVbaImage::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaImage") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaImage::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Image" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbacommandbarcontrols.cxx
+===================================================================
+--- sc/source/ui/vba/vbacommandbarcontrols.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacommandbarcontrols.cxx	(revision 276288)
+@@ -1,246 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include "vbacommandbarcontrols.hxx"
+-#include "vbacommandbarcontrol.hxx"
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarControlEnumeration_BASE;
+-class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE
+-{
+-    //uno::Reference< uno::XComponentContext > m_xContext;
+-    ScVbaCommandBarControls* m_pCommandBarControls;
+-    sal_Int32 m_nCurrentPosition;
+-public:
+-    CommandBarControlEnumeration( ScVbaCommandBarControls* pCommandBarControls ) : m_pCommandBarControls( pCommandBarControls ), m_nCurrentPosition( 0 ) {}
+-    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
+-    {
+-        if( m_nCurrentPosition < m_pCommandBarControls->getCount() )
+-            return sal_True;
+-        return sal_False;
+-    }
+-    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
+-    {
+-        if( hasMoreElements() )
+-        {
+-            rtl::OUString sName = m_pCommandBarControls->GetControlNameByIndex( m_nCurrentPosition );
+-            m_nCurrentPosition = m_nCurrentPosition + 1;
+-            if( sName.getLength() > 0 )
+-                return m_pCommandBarControls->createCollectionObject( uno::makeAny( sName ) );
+-            else
+-                return nextElement();
+-        }
+-        else
+-            throw container::NoSuchElementException();
+-    }
+-};
+-
+-ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess> xIndexAccess ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess )
+-{
+-    m_bIsMenu = sal_False;
+-    m_bHasElements = sal_False;
+-    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
+-    m_pCommandBar = dynamic_cast< ScVbaCommandBar* >( m_xParentHardRef.get() );
+-    m_pCommandBarControl = dynamic_cast< ScVbaCommandBarControl* >( m_xParentHardRef.get() );
+-    if( m_pCommandBar )
+-    {
+-        m_xUICfgManager.set( m_pCommandBar->GetUICfgManager(), uno::UNO_QUERY_THROW );
+-        m_xUICfgPers.set( m_pCommandBar->GetUICfgPers(), uno::UNO_QUERY_THROW );
+-        m_xBarSettings.set( m_pCommandBar->GetBarSettings(), uno::UNO_QUERY_THROW );
+-        m_bIsMenu = m_pCommandBar->IsMenu();
+-        if( m_xBarSettings->hasElements() )
+-        {
+-            m_bHasElements = sal_True;
+-        }
+-    }
+-    else if( m_pCommandBarControl )
+-    {
+-    }
+-    else
+-    {
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parent needs to be a ScVbaCommandBar or a ScVbaCommandBarControl"), uno::Reference< uno::XInterface >() );
+-    }
+-}
+-rtl::OUString
+-ScVbaCommandBarControls::GetControlNameByIndex( const sal_Int32 nIndex ) throw ( uno::RuntimeException )
+-{
+-    sal_Int32 nCount = 0;
+-    if( m_bHasElements )
+-    {
+-        sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
+-        for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
+-        {
+-            beans::PropertyValues aMenuValues;
+-            m_xBarSettings->getByIndex( i ) >>= aMenuValues;
+-            for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
+-            {
+-                if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
+-                {
+-                    nCount++;
+-                    if( nIndex == nCount )
+-                    {
+-                        rtl::OUString sCommandURL;
+-                        aMenuValues[j].Value >>= sCommandURL;
+-                        sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
+-                        if( ( nLastIndex != -1 ) && ( ( nLastIndex +1 ) < sCommandURL.getLength() ) )
+-                        {
+-                            sCommandURL = sCommandURL.copy( nLastIndex + 1 );
+-                            return sCommandURL;
+-                        }
+-                    }
+-                }
+-            }
+-        } 
+-    }
+-    else
+-        throw  uno::RuntimeException( rtl::OUString::createFromAscii( "Out of bound" ), uno::Reference< uno::XInterface >() );
+-    return rtl::OUString();
+-}
+-
+-// Attributes
+-sal_Int32 SAL_CALL 
+-ScVbaCommandBarControls::getCount() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nCount = 0;
+-    if( m_bHasElements )
+-    {
+-        sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
+-        for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
+-        {
+-            beans::PropertyValues aMenuValues;
+-            m_xBarSettings->getByIndex( i ) >>= aMenuValues;
+-            for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
+-            {
+-                if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
+-                {
+-                    nCount++;
+-                }
+-            }
+-        } 
+-    }
+-    return nCount;
+-}
+-// XEnumerationAccess
+-uno::Type SAL_CALL
+-ScVbaCommandBarControls::getElementType() throw ( uno::RuntimeException )
+-{
+-    return XCommandBarControls::static_type( 0 );
+-}
+-uno::Reference< container::XEnumeration >
+-ScVbaCommandBarControls::createEnumeration() throw ( uno::RuntimeException )
+-{
+-    return uno::Reference< container::XEnumeration >( new CommandBarControlEnumeration( this ) );
+-}
+-uno::Any
+-ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
+-{
+-    // only surport the aSource as a name string, because this class is a API wrapper
+-    rtl::OUString sName;
+-    if( aSource >>= sName )
+-        return uno::makeAny( uno::Reference< XCommandBarControl > ( new ScVbaCommandBarControl( this, mxContext, sName ) ) );
+-    return uno::Any();
+-}
+-
+-// Methods
+-uno::Any SAL_CALL 
+-ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*/ ) throw (uno::RuntimeException)
+-{
+-    if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
+-    {
+-        return createCollectionObject( aIndex );
+-    } 
+-    sal_Int32 nIndex = 0;
+-    if( aIndex >>= nIndex )
+-    {
+-        return createCollectionObject( uno::makeAny( GetControlNameByIndex( nIndex ) ) );
+-    }
+-    
+-    return uno::Any();
+-}
+-uno::Reference< XCommandBarControl > SAL_CALL 
+-ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& /*Parameter*/, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException)
+-{
+-    // Parameter is not supported
+-    // the following name needs to be individually created;
+-    rtl::OUString sCaption( rtl::OUString::createFromAscii("custom Control") );
+-    rtl::OUString sCommand( rtl::OUString::createFromAscii("macro:///Standard.Module1.Test()") );
+-    sal_Int32 nType =0;
+-    sal_Int32 nPosition = 0;
+-    sal_Int32 nId;
+-    sal_Bool bTemporary = sal_True;
+-    
+-    if( Type.hasValue() )
+-        if( Type >>= nType )
+-        {
+-            // evalute the type of the new control
+-        }
+-    if( Id.hasValue() )
+-        if( Id >>= nId )
+-        {
+-            // evalute the action of the new control
+-        }
+-    if( Before.hasValue() )
+-        if( Before >>= nPosition )
+-        {
+-            // evalute the position of the new Control
+-        }
+-    if( Temporary.hasValue() )
+-        if( Temporary >>= bTemporary )
+-        {
+-            // evalute the temporary of the new Control
+-        }
+-    return uno::Reference< XCommandBarControl > ( new ScVbaCommandBarControl( this, mxContext, sCaption, sCommand, nPosition, bTemporary ) );
+-}
+-   
+-// XHelperInterface
+-rtl::OUString& 
+-ScVbaCommandBarControls::getServiceImplName()
+-{
+-    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControls") );
+-    return sImplName;
+-}
+-uno::Sequence<rtl::OUString> 
+-ScVbaCommandBarControls::getServiceNames()
+-{
+-    static uno::Sequence< rtl::OUString > aServiceNames;
+-    if ( aServiceNames.getLength() == 0 )
+-    {
+-        aServiceNames.realloc( 1 );
+-        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControls" ) );
+-    }
+-    return aServiceNames;
+-}
+-
+Index: sc/source/ui/vba/vbacolorformat.cxx
+===================================================================
+--- sc/source/ui/vba/vbacolorformat.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacolorformat.cxx	(revision 276288)
+@@ -1,190 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbacolorformat.cxx,v $
+- * $Revision: 1.3.146.1 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-#include <ooo/vba/msforms/XLineFormat.hpp>
+-#include "vbacolorformat.hxx"
+-
+-using namespace ooo::vba;
+-using namespace com::sun::star;
+-
+-sal_Int32
+-MsoColorIndizes::getColorIndex( sal_Int32 nIndex )
+-{
+-    const static sal_Int32 COLORINDIZES[56] =
+-    {   HAPICOLOR_BLACK, HAPICOLOR_WITHE, HAPICOLOR_RED, HAPICOLOR_BRIGHTGREEN, HAPICOLOR_BLUE, HAPICOLOR_YELLOW, HAPICOLOR_PINK,
+-        HAPICOLOR_TURQUOISE, HAPICOLOR_DARKRED, HAPICOLOR_GREEN, HAPICOLOR_DARKBLUE, HAPICOLOR_DARKYELLOW, HAPICOLOR_VIOLET,
+-        HAPICOLOR_TEAL, HAPICOLOR_GRAY_25_PERCENT, HAPICOLOR_GRAY_50_PERCENT, HAPICOLOR_PERIWINCKLE, HAPICOLOR_PLUM,
+-        HAPICOLOR_IVORY, HAPICOLOR_LIGHTTURQUOISE, HAPICOLOR_DARKPRUPLE, HAPICOLOR_CORAL, HAPICOLOR_OCEANBLUE, HAPICOLOR_ICEBLUE,
+-        HAPICOLOR_GREEN, HAPICOLOR_PINK, HAPICOLOR_YELLOW, HAPICOLOR_TURQUOISE, HAPICOLOR_VIOLET, HAPICOLOR_DARKRED, HAPICOLOR_TEAL,
+-        HAPICOLOR_BLUE, HAPICOLOR_SKYBLUE, HAPICOLOR_LIGHTTURQUOISE, HAPICOLOR_LIGHTGREEN, HAPICOLOR_LIGHTYELLOW, HAPICOLOR_PALEBLUE,
+-        HAPICOLOR_ROSE, HAPICOLOR_LAVENDER, HAPICOLOR_TAN, HAPICOLOR_LIGHTBLUE, HAPICOLOR_AQUA, HAPICOLOR_LIME, HAPICOLOR_GOLD,
+-        HAPICOLOR_LIGHTORANGE, HAPICOLOR_ORANGE, HAPICOLOR_BLUEGRAY, HAPICOLOR_GRAY_40_PERCENT, HAPICOLOR_DARKTEAL,
+-        HAPICOLOR_SEAGREEN, HAPICOLOR_NONAME, HAPICOLOR_OLIVEGREEN, HAPICOLOR_BROWN, HAPICOLOR_PLUM, HAPICOLOR_INDIGO,
+-        HAPICOLOR_GRAY_80_PERCENT
+-    };
+-    return COLORINDIZES[nIndex];
+-}
+-ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XHelperInterface > xInternalParent, const uno::Reference< drawing::XShape > xShape, const sal_Int16 nColorFormatType ) : ScVbaColorFormat_BASE( xParent, xContext ), m_xInternalParent( xInternalParent ), m_xShape( xShape ), m_nColorFormatType( nColorFormatType )
+-{
+-    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
+-    m_nFillFormatBackColor = 0;
+-    try
+-    {
+-        uno::Reference< ov::msforms::XFillFormat > xFillFormat( xInternalParent, uno::UNO_QUERY_THROW );
+-        m_pFillFormat = ( ScVbaFillFormat* )( xFillFormat.get() );
+-    }catch ( uno::RuntimeException  e )
+-    {
+-        m_pFillFormat = NULL;
+-    }
+-}
+-
+-void
+-ScVbaColorFormat::setColorFormat( sal_Int16 _ntype )
+-{
+-    m_nColorFormatType = _ntype;
+-}
+-
+-// Attribute
+-sal_Int32 SAL_CALL 
+-ScVbaColorFormat::getRGB() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nRGB = 0;
+-    switch( m_nColorFormatType )
+-    {
+-    case ColorFormatType::LINEFORMAT_FORECOLOR:
+-        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LineColor") ) >>= nRGB;
+-        break;
+-    case ColorFormatType::LINEFORMAT_BACKCOLOR:
+-        //TODO BackColor not supported
+-        // m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("Color"), uno::makeAny( nRGB ) );
+-        break;
+-    case ColorFormatType::FILLFORMAT_FORECOLOR:
+-        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillColor") ) >>= nRGB;
+-        break;
+-    case ColorFormatType::FILLFORMAT_BACKCOLOR:
+-        nRGB = m_nFillFormatBackColor;
+-        break;
+-    default:
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() );
+-    }
+-    nRGB = OORGBToXLRGB( nRGB );
+-    return nRGB;
+-}
+-
+-void SAL_CALL 
+-ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException)
+-{
+-    sal_Int32 nRGB = XLRGBToOORGB( _rgb );
+-    switch( m_nColorFormatType )
+-    {
+-    case ColorFormatType::LINEFORMAT_FORECOLOR:
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineColor" ), uno::makeAny( nRGB ) );
+-        break;
+-    case ColorFormatType::LINEFORMAT_BACKCOLOR:
+-        // TODO BackColor not supported
+-        break;
+-    case ColorFormatType::FILLFORMAT_FORECOLOR:
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillColor" ), uno::makeAny( nRGB ) );
+-        if( m_pFillFormat )
+-        {
+-            m_pFillFormat->setForeColorAndInternalStyle(nRGB);
+-        }
+-        break;
+-    case ColorFormatType::FILLFORMAT_BACKCOLOR:
+-        m_nFillFormatBackColor = nRGB;
+-        if( m_pFillFormat )
+-        {
+-            m_pFillFormat->setForeColorAndInternalStyle(nRGB);
+-        }
+-        break;
+-    default:    
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() );
+-    }
+-}
+-
+-sal_Int32 SAL_CALL 
+-ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nColor = getRGB();
+-    // #TODO I guess the number of elements is determined by the correct scheme
+-    // the implementation here seems to be a rehash of color index ( which seems to be a 
+-    // different thing ) - I would guess we need to know/import etc. the correct color scheme
+-    // or at least find out a little more
+-    sal_Int32 i = 0;
+-    for( ; i < 56; i++ )
+-    {
+-        if( nColor == MsoColorIndizes::getColorIndex(i) )
+-	   break;
+-    }
+-
+-    if( i == 56 ) // this is most likely an error condition
+-        --i;
+-    return i; 
+-    // #TODO figure out what craziness is this, 
+-    // the 56 colors seems incorrect, as in default XL ( 2003 ) there are 80 colors
+-/*
+-    if( i == 56 )
+-    {
+-        i = -2;
+-    }
+-
+-    return ( i + 2 );
+-*/
+-}
+-
+-void SAL_CALL 
+-ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor ) throw (uno::RuntimeException)
+-{
+-    // the table is 0 based
+-    sal_Int32 nColor = MsoColorIndizes::getColorIndex( _schemecolor );
+-    // nColor is already xl RGB
+-    setRGB( nColor );
+-}
+-
+-
+-rtl::OUString&
+-ScVbaColorFormat::getServiceImplName()
+-{
+-    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaColorFormat") );
+-    return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString >
+-ScVbaColorFormat::getServiceNames()
+-{
+-    static uno::Sequence< rtl::OUString > aServiceNames;
+-    if ( aServiceNames.getLength() == 0 )
+-    {
+-        aServiceNames.realloc( 1 );
+-        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ColorFormat" ) );
+-    }
+-    return aServiceNames;
+-}
+-
+Index: sc/source/ui/vba/vbalistbox.hxx
+===================================================================
+--- sc/source/ui/vba/vbalistbox.hxx	(revision 276159)
++++ sc/source/ui/vba/vbalistbox.hxx	(revision 276288)
+@@ -1,90 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbalistbox.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_LISTBOX_HXX
+-#define SC_VBA_LISTBOX_HXX
+-#include <cppuhelper/implbase2.hxx>
+-#include <com/sun/star/uno/XComponentContext.hpp>
+-#include <com/sun/star/script/XDefaultProperty.hpp>
+-#include <ooo/vba/msforms/XListBox.hpp>
+-#include <com/sun/star/beans/PropertyAttribute.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbapropvalue.hxx"
+-#include "vbalistcontrolhelper.hxx"
+-#include "vbahelper.hxx"
+-
+-typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::script::XDefaultProperty > ListBoxImpl_BASE;
+-class ScVbaListBox : public ListBoxImpl_BASE
+-    ,public PropListener
+-{		
+-	std::auto_ptr< ListControlHelper > mpListHelper;
+-	rtl::OUString sSourceName; 
+-	rtl::OUString msDftPropName;
+-
+-    sal_Int16 m_nIndex;
+-	
+-public:
+-	ScVbaListBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
+-
+-	// Attributes
+-	virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
+-	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-	virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
+-    virtual sal_Bool SAL_CALL getMultiSelect() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException);
+-
+-	// Methods
+-	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
+-	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
+-	// XControl
+-    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
+-
+-	// XDefaultProperty
+-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+-    
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();    
+-
+-    //PropListener
+-    virtual void setValueEvent( const css::uno::Any& value );
+-    virtual css::uno::Any getValueEvent();
+-
+-
+-};
+-
+-#endif //
+Index: sc/source/ui/vba/vbamultipage.hxx
+===================================================================
+--- sc/source/ui/vba/vbamultipage.hxx	(revision 276159)
++++ sc/source/ui/vba/vbamultipage.hxx	(revision 276288)
+@@ -1,65 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_MULTIPAGE_HXX
+-#define SC_VBA_MULTIPAGE_HXX
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/msforms/XMultiPage.hpp>
+-#include <com/sun/star/container/XIndexAccess.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-//#include <cppuhelper/implbase2.hxx>
+-#include <cppuhelper/implbase1.hxx>
+-
+-typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XMultiPage > MultiPageImpl_BASE;
+-
+-class ScVbaMultiPage : public MultiPageImpl_BASE
+-{
+-    css::uno::Reference< css::container::XIndexAccess > getPages( sal_Int32 nPages );
+-    css::uno::Reference< css::beans::XPropertySet > mxDialogProps;
+-public:
+-    ScVbaMultiPage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, const css::uno::Reference< css::uno::XInterface >& xDialog );
+-   // Attributes
+-    virtual sal_Int32 SAL_CALL getValue() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setValue( sal_Int32 _value ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) throw (css::uno::RuntimeException);
+-
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-    // XDefaultProperty
+-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+-};
+-#endif //SC_VBA_LABEL_HXX
+Index: sc/source/ui/vba/vbaradiobutton.hxx
+===================================================================
+--- sc/source/ui/vba/vbaradiobutton.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaradiobutton.hxx	(revision 276288)
+@@ -1,55 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbaradiobutton.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_RADIOBUTTON_HXX
+-#define SC_VBA_RADIOBUTTON_HXX
+-#include <ooo/vba/msforms/XRadioButton.hpp>
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-#include <cppuhelper/implbase2.hxx>
+-
+-typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > RadioButtonImpl_BASE;
+-
+-class ScVbaRadioButton : public RadioButtonImpl_BASE
+-{
+-public:
+-    ScVbaRadioButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
+-   // Attributes
+-    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setValue(const com::sun::star::uno::Any&) throw (css::uno::RuntimeException);
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-    // XDefaultProperty
+-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+-
+-};
+-#endif //SC_VBA_RADIOBUTTON_HXX
+Index: sc/source/ui/vba/vbapages.hxx
+===================================================================
+--- sc/source/ui/vba/vbapages.hxx	(revision 276159)
++++ sc/source/ui/vba/vbapages.hxx	(revision 276288)
+@@ -1,64 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_PAGES_HXX
+-#define SC_VBA_PAGES_HXX
+-
+-#include <ooo/vba/office/MsoShapeType.hpp>
+-#include <com/sun/star/lang/XEventListener.hpp>
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-#include <ooo/vba/msforms/XPages.hpp>
+-#include <cppuhelper/implbase2.hxx>
+-#include <cppuhelper/implbase1.hxx>
+-
+-#include "vbacollectionimpl.hxx"
+-typedef CollTestImplHelper< 
+-ov::msforms::XPages > ScVbaPages_BASE;
+-
+-class ScVbaPages : public ScVbaPages_BASE
+-{
+-protected:
+-	virtual rtl::OUString& getServiceImplName();
+-	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-public:
+-    ScVbaPages( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPages ) throw ( css::lang::IllegalArgumentException );
+-    virtual ~ScVbaPages() {}
+-        // XEnumerationAccess
+-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
+-     // ScVbaPages_BASE
+-     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+-
+-};
+-#endif//SC_VBA_SHAPE_HXX
+Index: sc/source/ui/vba/vbahelperinterface.hxx
+===================================================================
+--- sc/source/ui/vba/vbahelperinterface.hxx	(revision 276159)
++++ sc/source/ui/vba/vbahelperinterface.hxx	(revision 276288)
+@@ -1,116 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbahelperinterface.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_HELPERINTERFACE_HXX
+-#define SC_VBA_HELPERINTERFACE_HXX
+-
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/XHelperInterface.hpp>
+-#include "vbahelper.hxx"
+-#include "vbaglobals.hxx"
+-
+-// use this class when you have an a object like
+-// interface  XAnInterface which contains XHelperInterface in its inheritance hierarchy
+-// interface XAnInterface
+-// { 
+-//     interface XHelperInterface;
+-//     [attribute, string] name;
+-// }
+-// or
+-// interface XAnInterface : XHelperInterface;
+-// { 
+-//     [attribute, string] name;
+-// }
+-//
+-// then this class can provide a default implementation of XHelperInterface,
+-// you can use it like this
+-// typedef InheritedHelperInterfaceImpl< XAnInterface > > AnInterfaceImpl_BASE;
+-// class AnInterfaceImpl : public AnInterfaceImpl_BASE
+-// {
+-// public:
+-//     AnInterface( const Reference< HelperInterface >& xParent ) : AnInterfaceImpl_BASE( xParent ) {}
+-//     // implement XAnInterface methods only, no need to implement the XHelperInterface 
+-//     // methods
+-//     virtual void setName( const OUString& );  
+-//     virtual OUString getName();  
+-// }
+-//
+-const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) );
+-
+-template< typename Ifc1 >
+-class InheritedHelperInterfaceImpl : public Ifc1
+-{
+-protected: 
+-	css::uno::WeakReference< ov::XHelperInterface > mxParent;
+-	css::uno::Reference< css::uno::XComponentContext > mxContext;
+-public:
+-	InheritedHelperInterfaceImpl() {}
+-	InheritedHelperInterfaceImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxParent( xParent ), mxContext( xContext ) {}
+-	virtual rtl::OUString& getServiceImplName() = 0;
+-	virtual css::uno::Sequence<rtl::OUString> getServiceNames() = 0;
+-
+-	// XHelperInterface Methods
+-	virtual ::sal_Int32 SAL_CALL getCreator() throw (css::script::BasicErrorException, css::uno::RuntimeException)
+-	{
+-		return 0x53756E4F;
+-	}
+-	virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return mxParent; }
+-	
+-	virtual css::uno::Any SAL_CALL Application(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return  css::uno::makeAny( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication() ); }
+-
+-
+-	// XServiceInfo Methods
+-	virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) { return getServiceImplName(); }
+-	virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) 
+-	{ 
+-		css::uno::Sequence< rtl::OUString > sServices = getSupportedServiceNames();
+-		const rtl::OUString* pStart = sServices.getConstArray();
+-		const rtl::OUString* pEnd = pStart + sServices.getLength();
+-		for ( ; pStart != pEnd ; ++pStart )
+-			if ( (*pStart).equals( ServiceName ) )
+-				return sal_True;
+-		return sal_False;	
+-	}
+-	virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) 
+-	{ 
+-		css::uno::Sequence< rtl::OUString > aNames = getServiceNames();;
+-		return aNames;
+-	}
+- };
+-
+-template< typename Ifc1 >
+-class InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
+-
+-{
+-typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base;
+-public:
+-	InheritedHelperInterfaceImpl1< Ifc1 > ( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}	
+-
+-};
+-#endif
+Index: sc/source/ui/vba/vbaspinbutton.hxx
+===================================================================
+--- sc/source/ui/vba/vbaspinbutton.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaspinbutton.hxx	(revision 276288)
+@@ -1,61 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_SPINBUTTON_HXX
+-#define SC_VBA_SPINBUTTON_HXX
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/msforms/XSpinButton.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-
+-typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XSpinButton > SpinButtonImpl_BASE;
+-
+-class ScVbaSpinButton : public SpinButtonImpl_BASE
+-{
+-public:
+-    ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
+-   // Attributes
+-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-    virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
+-    virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
+-
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-#endif //SC_VBA_SPINBUTTON_HXX
+Index: sc/source/ui/vba/vbabutton.hxx
+===================================================================
+--- sc/source/ui/vba/vbabutton.hxx	(revision 276159)
++++ sc/source/ui/vba/vbabutton.hxx	(revision 276288)
+@@ -1,51 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbabutton.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_BUTTON_HXX
+-#define SC_VBA_BUTTON_HXX
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/msforms/XButton.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-
+-typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XButton > ButtonImpl_BASE;
+-
+-class ScVbaButton : public ButtonImpl_BASE
+-{
+-public:
+-    ScVbaButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
+-   // Attributes
+-    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-#endif //SC_VBA_BUTTON_HXX
+Index: sc/source/ui/vba/vbashaperange.hxx
+===================================================================
+--- sc/source/ui/vba/vbashaperange.hxx	(revision 276159)
++++ sc/source/ui/vba/vbashaperange.hxx	(revision 276288)
+@@ -1,66 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbashaperange.hxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_SHAPERANGE_HXX
+-#define SC_VBA_SHAPERANGE_HXX
+-
+-#include <com/sun/star/drawing/XShapes.hpp>
+-#include <ooo/vba/msforms/XShapeRange.hpp>
+-
+-#include "vbacollectionimpl.hxx"
+-
+-typedef CollTestImplHelper< ov::msforms::XShapeRange > ScVbaShapeRange_BASE;
+-
+-class ScVbaShapeRange : public ScVbaShapeRange_BASE
+-{
+-private:
+-    css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage;
+-    css::uno::Reference< css::drawing::XShapes > m_xShapes;
+-    sal_Int32 m_nShapeGroupCount;
+-protected:
+-	virtual rtl::OUString& getServiceImplName();
+-	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-	css::uno::Reference< css::drawing::XShapes > getShapes() throw (css::uno::RuntimeException) ;
+-public:
+-    ScVbaShapeRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XDrawPage>& xDrawShape );
+-
+-    // Methods
+-    virtual void SAL_CALL Select(  ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< ::ooo::vba::msforms::XShape > SAL_CALL Group() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException) ;
+-    virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException);
+-    //XEnumerationAccess
+-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); 
+-    // ScVbaCollectionBaseImpl
+-    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+-};
+-
+-#endif//SC_VBA_SHAPERANGE_HXX
+Index: sc/source/ui/vba/vbascrollbar.hxx
+===================================================================
+--- sc/source/ui/vba/vbascrollbar.hxx	(revision 276159)
++++ sc/source/ui/vba/vbascrollbar.hxx	(revision 276288)
+@@ -1,66 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_SCROLLBAR_HXX
+-#define SC_VBA_SCROLLBAR_HXX
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/msforms/XScrollBar.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-
+-typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XScrollBar > ScrollBarImpl_BASE;
+-
+-class ScVbaScrollBar : public ScrollBarImpl_BASE
+-{
+-public:
+-    ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
+-   // Attributes
+-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-    virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
+-    virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
+-    virtual ::sal_Int32 SAL_CALL getLargeChange() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setLargeChange( ::sal_Int32 _largechange ) throw (css::uno::RuntimeException);
+-    virtual ::sal_Int32 SAL_CALL getSmallChange() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setSmallChange( ::sal_Int32 _smallchange ) throw (css::uno::RuntimeException);
+-
+-
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-#endif //SC_VBA_LABEL_HXX
+Index: sc/source/ui/vba/vbaframe.cxx
+===================================================================
+--- sc/source/ui/vba/vbaframe.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaframe.cxx	(revision 276288)
+@@ -1,93 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include "vbaframe.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
+-ScVbaFrame::ScVbaFrame( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : FrameImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
+-{
+-}
+-
+-// Attributes
+-rtl::OUString SAL_CALL 
+-ScVbaFrame::getCaption() throw (css::uno::RuntimeException)
+-{
+-    rtl::OUString Label;
+-    m_xProps->getPropertyValue( LABEL ) >>= Label;
+-    return Label;
+-}
+-
+-void SAL_CALL 
+-ScVbaFrame::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaFrame::getValue() throw (css::uno::RuntimeException)
+-{
+-    return uno::makeAny( getCaption() );
+-}
+-
+-void SAL_CALL 
+-ScVbaFrame::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    rtl::OUString sCaption;
+-    _value >>= sCaption;
+-    setCaption( sCaption ); 
+-}
+-
+-rtl::OUString& 
+-ScVbaFrame::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFrame") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaFrame::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbacheckbox.hxx
+===================================================================
+--- sc/source/ui/vba/vbacheckbox.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacheckbox.hxx	(revision 276288)
+@@ -1,60 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_CHECKBOX_HXX
+-#define SC_VBA_CHECKBOX_HXX
+-#include <cppuhelper/implbase2.hxx>
+-#include <ooo/vba/msforms/XRadioButton.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-
+-typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > CheckBoxImpl_BASE;
+-
+-class ScVbaCheckbox : public CheckBoxImpl_BASE
+-{
+-public:
+-    ScVbaCheckbox(  const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
+-   // Attributes
+-    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
+-    // XDefaultProperty
+-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-#endif //SC_VBA_CHECKBOX_HXX
+Index: sc/source/ui/vba/vbalineformat.cxx
+===================================================================
+--- sc/source/ui/vba/vbalineformat.cxx	(revision 276159)
++++ sc/source/ui/vba/vbalineformat.cxx	(revision 276288)
+@@ -1,458 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbalineformat.cxx,v $
+- * $Revision: 1.4 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include <ooo/vba/office/MsoArrowheadStyle.hpp>
+-#include <ooo/vba/office/MsoArrowheadLength.hpp>
+-#include <ooo/vba/office/MsoArrowheadWidth.hpp>
+-#include <ooo/vba/office/MsoLineDashStyle.hpp>
+-#include <com/sun/star/drawing/LineStyle.hpp>
+-#include <com/sun/star/drawing/LineDash.hpp>
+-#include "vbalineformat.hxx"
+-#include "vbacolorformat.hxx"
+-
+-using namespace ooo::vba;
+-using namespace com::sun::star;
+-
+-ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaLineFormat_BASE( xParent, xContext ), m_xShape( xShape ) 
+-{
+-    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
+-    m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid;
+-    m_nLineWeight = 1;
+-}
+-
+-sal_Int32
+-ScVbaLineFormat::calculateArrowheadSize()
+-{
+-    return 0;
+-}
+-
+-sal_Int32
+-ScVbaLineFormat::convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName )
+-{
+-    sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
+-    if (sLineName.equals(rtl::OUString::createFromAscii("Small Arrow")) ||
+-        sLineName.equals(rtl::OUString::createFromAscii("Arrow")) ||
+-        sLineName.equals(rtl::OUString::createFromAscii("msArrowEnd")) ||
+-        sLineName.equals(rtl::OUString::createFromAscii("Double Arrow")))
+-    {
+-        // msoArrowheadTriangle
+-        nLineType = office::MsoArrowheadStyle::msoArrowheadTriangle;
+-    }
+-    else if (sLineName.equals(rtl::OUString::createFromAscii("Square 45")) ||
+-             sLineName.equals(rtl::OUString::createFromAscii("Square")) ||
+-             sLineName.equals(rtl::OUString::createFromAscii("msArrowDiamondEnd")))
+-    {
+-        // msoArrowheadDiamond
+-        nLineType = office::MsoArrowheadStyle::msoArrowheadDiamond;
+-    }
+-    else if (sLineName.equals(rtl::OUString::createFromAscii("Circle")) ||
+-             sLineName.equals(rtl::OUString::createFromAscii("msArrowOvalEnd")) ||
+-             sLineName.equals(rtl::OUString::createFromAscii("Dimension Lines")) )
+-    {
+-        // msoArrowheadOval
+-        nLineType = office::MsoArrowheadStyle::msoArrowheadOval;
+-    }
+-    else if (sLineName.equals(rtl::OUString::createFromAscii("Arrow concave")) ||
+-             sLineName.equals(rtl::OUString::createFromAscii("msArrowStealthEnd")))
+-    {
+-        // msoArrowheadStealth
+-        nLineType = office::MsoArrowheadStyle::msoArrowheadStealth;
+-    }
+-    else if (sLineName.equals(rtl::OUString::createFromAscii("Rounded short Arrow")) ||
+-             sLineName.equals(rtl::OUString::createFromAscii("Rounded large Arrow")) ||
+-             sLineName.equals(rtl::OUString::createFromAscii("Symmetric Arrow")) ||
+-             sLineName.equals(rtl::OUString::createFromAscii("msArrowOpenEnd")) ||
+-             sLineName.equals(rtl::OUString::createFromAscii("Line Arrow")))
+-    {
+-        // msoArrowheadOpen
+-        nLineType = office::MsoArrowheadStyle::msoArrowheadOpen;
+-    }
+-    else
+-    {
+-        // msoArrowheadNone
+-        nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
+-    }
+-    return nLineType;
+-}
+-
+-rtl::OUString 
+-ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (uno::RuntimeException)
+-{
+-    switch( nArrowheadStyle )
+-    {
+-        case office::MsoArrowheadStyle::msoArrowheadNone:
+-            return rtl::OUString(rtl::OUString::createFromAscii( "" ) );
+-        case office::MsoArrowheadStyle::msoArrowheadStealth:
+-            return rtl::OUString::createFromAscii( "Arrow concave" );
+-        case office::MsoArrowheadStyle::msoArrowheadOpen:
+-            return rtl::OUString::createFromAscii("Line Arrow" );
+-        case office::MsoArrowheadStyle::msoArrowheadOval:
+-            return  rtl::OUString::createFromAscii("Circle" );
+-        case office::MsoArrowheadStyle::msoArrowheadDiamond:
+-            return rtl::OUString::createFromAscii( "Square 45" );
+-        case office::MsoArrowheadStyle::msoArrowheadTriangle:
+-            return rtl::OUString::createFromAscii( "Arrow" );
+-        default:
+-            throw uno::RuntimeException( rtl::OUString::createFromAscii("Invalid Arrow Style!"), uno::Reference< uno::XInterface >() );
+-    }
+-}
+-
+-// Attributes
+-sal_Int32 SAL_CALL 
+-ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
+-    rtl::OUString sLineName;
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ) ) >>= sLineName;
+-    if( ( sLineName.getLength() > 7 ) && ( sLineName.indexOf( rtl::OUString::createFromAscii( "msArray" ) ) ) != -1 )
+-    {
+-        sal_Int32 nIndex = sLineName.indexOf( rtl::OUString::createFromAscii(" ") );
+-        rtl::OUString sName = sLineName.copy( 0, nIndex );
+-        //sal_Int32 nSize = sLineName.copy( nIndex + 1 ).toInt32();
+-        nLineType = convertLineStartEndNameToArrowheadStyle( sName );
+-    }
+-    else
+-    {
+-        nLineType = convertLineStartEndNameToArrowheadStyle( sLineName );
+-    }
+-    return nLineType;
+-}
+-
+-void SAL_CALL 
+-ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (uno::RuntimeException)
+-{
+-    rtl::OUString sArrayName = convertArrowheadStyleToLineStartEndName( _beginarrowheadstyle );
+-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ), uno::makeAny( sArrayName ) );
+-}
+-
+-sal_Int32 SAL_CALL 
+-ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException)
+-{
+-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+-}
+-
+-void SAL_CALL 
+-ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) throw (uno::RuntimeException)
+-{
+-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+-}
+-
+-sal_Int32 SAL_CALL 
+-ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException)
+-{
+-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+-}
+-
+-void SAL_CALL 
+-ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) throw (uno::RuntimeException)
+-{
+-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+-}
+-
+-sal_Int32 SAL_CALL 
+-ScVbaLineFormat::getEndArrowheadStylel() throw (uno::RuntimeException)
+-{
+-    return 0;
+-}
+-
+-void SAL_CALL 
+-ScVbaLineFormat::setEndArrowheadStylel( sal_Int32 /*_endarrowheadstylel*/ ) throw (uno::RuntimeException)
+-{
+-}
+-
+-sal_Int32 SAL_CALL 
+-ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException)
+-{
+-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+-}
+-
+-void SAL_CALL 
+-ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ ) throw (uno::RuntimeException)
+-{
+-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+-}
+-
+-sal_Int32 SAL_CALL 
+-ScVbaLineFormat::getEndArrowheadWidth() throw (uno::RuntimeException)
+-{
+-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+-}
+-
+-void SAL_CALL 
+-ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ ) throw (uno::RuntimeException)
+-{
+-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+-}
+-
+-double SAL_CALL 
+-ScVbaLineFormat::getWeight() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nLineWidth=0;
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineWidth") ) >>= nLineWidth;
+-    double dLineWidth = Millimeter::getInPoints( nLineWidth );
+-    return dLineWidth;
+-}
+-
+-void SAL_CALL 
+-ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException)
+-{
+-    if( _weight < 0 )
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter: Must be positv."), uno::Reference< uno::XInterface >() );
+-    if( _weight == 0 )
+-        _weight = 0.5;
+-    m_nLineWeight = _weight;
+-    Millimeter aMillimeter;
+-    aMillimeter.setInPoints( _weight );
+-        
+-    sal_Int32 nLineWidth = static_cast<sal_Int32>( aMillimeter.getInHundredthsOfOneMillimeter() );
+-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineWidth" ), uno::makeAny( nLineWidth ) );
+-    setDashStyle( m_nLineDashStyle );
+-}
+-
+-sal_Bool SAL_CALL 
+-ScVbaLineFormat::getVisible() throw (uno::RuntimeException)
+-{
+-    drawing::LineStyle aLineStyle;
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= aLineStyle;
+-    if( aLineStyle == drawing::LineStyle_NONE )
+-    {
+-        return sal_False;
+-    }
+-    return sal_True;
+-}
+-
+-void SAL_CALL 
+-ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
+-{
+-    drawing::LineStyle aLineStyle;
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= aLineStyle;
+-    if( !_visible )
+-    {
+-        aLineStyle = drawing::LineStyle_NONE;
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( aLineStyle ) );
+-    }
+-    else
+-    {
+-        if( aLineStyle == drawing::LineStyle_NONE )
+-        {
+-            setDashStyle( m_nLineDashStyle );
+-        }
+-    }
+-}
+-
+-double SAL_CALL 
+-ScVbaLineFormat::getTransparency() throw (uno::RuntimeException)
+-{
+-    sal_Int16 nTransparency = 0;
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ) ) >>= nTransparency;
+-    double fTransparency = static_cast<double>( nTransparency );
+-    return fTransparency / 100;
+-}
+-
+-void SAL_CALL 
+-ScVbaLineFormat::setTransparency( double _transparency ) throw (uno::RuntimeException)
+-{
+-    sal_Int16 nTransparency = static_cast<sal_Int16>( _transparency * 100 );
+-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ), uno::makeAny( nTransparency ) );
+-}
+-
+-sal_Int16 SAL_CALL 
+-ScVbaLineFormat::getStyle() throw (uno::RuntimeException)
+-{
+-    //OpenOffice.org only supports one LineStyle (other than the DashStyles)
+-    //Therefore we can only return the SingleLine
+-    return 1;
+-}
+-
+-void SAL_CALL 
+-ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException)
+-{
+-    //OpenOffice.org only supports one LineStyle (other than the DashStyles)
+-    //Therefore we do not set the LineStyle, because it maybe is already set
+-    //to Dashed or Single Line. Setting the 'Visible' or 'DashStyle' properties
+-    //will be done with the according methods.
+-}
+-
+-sal_Int32 SAL_CALL 
+-ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException)
+-{
+-    drawing::LineStyle eLineStyle;
+-    //LineStyle integer in Xray
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= eLineStyle;
+-    if( eLineStyle == drawing::LineStyle_SOLID )
+-        m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid;
+-    else
+-    {
+-        drawing::LineDash aLineDash;
+-        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineDash" ) ) >>= aLineDash;
+-        if( aLineDash.Dots == 0 )
+-        {
+-            //LineDash
+-            //LineLongDash
+-            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDash;
+-            if( aLineDash.Distance > 0 && ( aLineDash.DashLen / aLineDash.Distance > 1 ) )
+-            {
+-                m_nLineDashStyle = office::MsoLineDashStyle::msoLineLongDash;
+-            }
+-        }
+-        else if( aLineDash.Dots == 1 )
+-        {
+-            // LineDashDot
+-            // LineLongDashDot
+-            // LineSquareDot
+-            // LineRoundDot ! not supported
+-            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDashDot;
+-            if( aLineDash.Dashes == 0 )
+-            {
+-                m_nLineDashStyle = office::MsoLineDashStyle::msoLineSquareDot;
+-            }
+-            else
+-            {
+-                if( aLineDash.Distance > 0 && ( aLineDash.DashLen / aLineDash.Distance > 1 ) )
+-                {
+-                    m_nLineDashStyle = office::MsoLineDashStyle::msoLineLongDashDot;
+-                }
+-            }
+-        }
+-        else if( aLineDash.Dots == 2 )
+-        {
+-            // LineDashDotDot
+-            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDashDotDot;
+-        }
+-    }
+-
+-    return m_nLineDashStyle;
+-}
+-
+-void SAL_CALL 
+-ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeException)
+-{
+-    m_nLineDashStyle = _dashstyle;
+-    if( _dashstyle == office::MsoLineDashStyle::msoLineSolid )
+-    {
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID  ));
+-    }
+-    else
+-    {
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( drawing::LineStyle_DASH ) );
+-        drawing::LineDash  pLineDash;
+-        Millimeter aMillimeter( m_nLineWeight );
+-        sal_Int32 nPixel = static_cast< sal_Int32 >( aMillimeter.getInHundredthsOfOneMillimeter() );
+-        switch( _dashstyle )
+-        {
+-        case office::MsoLineDashStyle::msoLineDashDot:
+-            pLineDash.Dots = 1;
+-            pLineDash.DotLen = nPixel;
+-            pLineDash.Dashes = 1;
+-            pLineDash.DashLen = 5 * nPixel;
+-            pLineDash.Distance = 4 * nPixel;
+-            break;
+-        case office::MsoLineDashStyle::msoLineLongDashDot:
+-            pLineDash.Dots = 1;
+-            pLineDash.DotLen = nPixel;
+-            pLineDash.Dashes = 1;
+-            pLineDash.DashLen = 10 * nPixel;
+-            pLineDash.Distance = 4 * nPixel;
+-            break;
+-        case office::MsoLineDashStyle::msoLineDash:
+-            pLineDash.Dots = 0;
+-            pLineDash.DotLen = 0;
+-            pLineDash.Dashes = 1;
+-            pLineDash.DashLen = 6 * nPixel;
+-            pLineDash.Distance = 4 * nPixel;
+-            break;
+-        case office::MsoLineDashStyle::msoLineDashDotDot:
+-            pLineDash.Dots = 2;
+-            pLineDash.DotLen = nPixel;
+-            pLineDash.Dashes = 1;
+-            pLineDash.DashLen = 10 * nPixel;
+-            pLineDash.Distance = 3 * nPixel;
+-            break;
+-        case office::MsoLineDashStyle::msoLineLongDash:
+-            pLineDash.Dots = 0;
+-            pLineDash.DotLen = 0;
+-            pLineDash.Dashes = 1;
+-            pLineDash.DashLen = 10 * nPixel;
+-            pLineDash.Distance = 4 * nPixel;
+-            break;
+-        case office::MsoLineDashStyle::msoLineSquareDot:
+-            pLineDash.Dots = 1;
+-            pLineDash.DotLen = nPixel;
+-            pLineDash.Dashes = 0;
+-            pLineDash.DashLen = 0;
+-            pLineDash.Distance = nPixel;
+-            break;
+-        case office::MsoLineDashStyle::msoLineRoundDot:
+-            pLineDash.Dots = 1;
+-            pLineDash.DotLen = nPixel;
+-            pLineDash.Dashes = 0;
+-            pLineDash.DashLen = 0;
+-            pLineDash.Distance = nPixel;
+-            break;
+-        default:
+-            throw uno::RuntimeException( rtl::OUString::createFromAscii("this MsoLineDashStyle is not supported."), uno::Reference< uno::XInterface >() );
+-        }
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineDash" ), uno::makeAny( pLineDash ) );
+-    }
+-}
+-
+-// Methods
+-uno::Reference< msforms::XColorFormat > SAL_CALL
+-ScVbaLineFormat::BackColor() throw (uno::RuntimeException)
+-{
+-    return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_BACKCOLOR ) );
+-}
+-
+-uno::Reference< msforms::XColorFormat > SAL_CALL
+-ScVbaLineFormat::ForeColor() throw (uno::RuntimeException)
+-{
+-    return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_FORECOLOR ) );
+-}
+-
+-
+-rtl::OUString& 
+-ScVbaLineFormat::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLineFormat") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaLineFormat::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.LineFormat" ) );
+-	}
+-	return aServiceNames;
+-}
+-
+-
+Index: sc/source/ui/vba/vbacombobox.cxx
+===================================================================
+--- sc/source/ui/vba/vbacombobox.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacombobox.cxx	(revision 276288)
+@@ -1,175 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbacombobox.cxx,v $
+- * $Revision: 1.4 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include "vbacombobox.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-//SelectedItems list of integer indexes
+-//StringItemList list of items
+-
+-const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
+-const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
+-const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
+-const static rtl::OUString CONTROLSOURCEPROP( RTL_CONSTASCII_USTRINGPARAM("DataFieldProperty") );
+-
+-ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialogType ) : ComboBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialogType( bDialogType )
+-{
+-    	mpListHelper.reset( new ListControlHelper( m_xProps ) );
+-	// grab the default value property name
+-	m_xProps->getPropertyValue( CONTROLSOURCEPROP ) >>= sSourceName;
+-}
+-
+-// Attributes
+-
+-
+-// Value, [read] e.g. getValue returns the value of ooo Text propery e.g. the value in
+-// the drop down
+-uno::Any SAL_CALL 
+-ScVbaComboBox::getValue() throw (uno::RuntimeException)
+-{
+-	return m_xProps->getPropertyValue( sSourceName );
+-}
+-
+-void SAL_CALL 
+-ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
+-{
+-    uno::Sequence< sal_Int16 > sSelection(1);
+-    _value >>= sSelection[ 0 ];
+-    m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( sSelection ) );
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaComboBox::getListIndex() throw (uno::RuntimeException)
+-{
+-	uno::Sequence< rtl::OUString > sItems;
+-	m_xProps->getPropertyValue( ITEMS ) >>= sItems;
+-	// should really return the item that has focus regardless of
+-	// it been selected
+-	if ( sItems.getLength() > 0 )
+-	{
+-		rtl::OUString sText = getText();
+-		sal_Int32 nLen = sItems.getLength();
+-		for ( sal_Int32 index = 0; sText.getLength() && index < nLen; ++index )
+-		{
+-			if ( sItems[ index ].equals( sText ) )
+-			{
+-				OSL_TRACE("getListIndex returning %d", index );
+-				return uno::makeAny( index );
+-			}
+-				
+-		} 
+- 	} 
+-	OSL_TRACE("getListIndex returning %d", -1 );
+-	return uno::makeAny( sal_Int32( -1 ) );
+-}
+-
+-// Value, [write]e.g. setValue sets the value in the drop down, and if the value is one
+-// of the values in the list then the selection is also set
+-void SAL_CALL 
+-ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
+-{
+-	m_xProps->setPropertyValue( sSourceName, _value );
+-}
+-
+-// see Value
+-
+-::rtl::OUString SAL_CALL 
+-ScVbaComboBox::getText() throw (uno::RuntimeException)
+-{
+-	rtl::OUString result;
+-	getValue() >>= result;
+-	return result;
+-}
+-
+-void SAL_CALL 
+-ScVbaComboBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
+-{
+-	setValue( uno::makeAny( _text ) ); // seems the same
+-}
+-
+-// Methods
+-void SAL_CALL 
+-ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
+-{
+-	mpListHelper->AddItem( pvargItem, pvargIndex );
+-}
+-
+-void SAL_CALL 
+-ScVbaComboBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
+-	{
+-	mpListHelper->removeItem( index );
+-}
+-
+-void SAL_CALL 
+-ScVbaComboBox::Clear(  ) throw (uno::RuntimeException)
+-		{
+-	mpListHelper->Clear();
+-		}
+-
+-void SAL_CALL
+-ScVbaComboBox::setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException)
+-{
+-	ScVbaControl::setRowSource( _rowsource );
+-	mpListHelper->setRowSource( _rowsource );
+-		}
+-
+-sal_Int32 SAL_CALL
+-ScVbaComboBox::getListCount() throw (uno::RuntimeException)
+-{
+-	return mpListHelper->getListCount();
+-}
+-		
+-uno::Any SAL_CALL 
+-ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
+-{
+-	return mpListHelper->List( pvargIndex, pvarColumn );
+-	}
+-
+-rtl::OUString& 
+-ScVbaComboBox::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComboBox") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaComboBox::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ComboBox" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbacommandbar.hxx
+===================================================================
+--- sc/source/ui/vba/vbacommandbar.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacommandbar.hxx	(revision 276288)
+@@ -1,105 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_COMMANDBAR_HXX
+-#define SC_VBA_COMMANDBAR_HXX
+-
+-#include <ooo/vba/XCommandBar.hpp>
+-#include <com/sun/star/ui/XUIConfigurationManager.hpp>
+-#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
+-#include <com/sun/star/container/XIndexContainer.hpp>
+-#include <com/sun/star/beans/PropertyValues.hpp>
+-
+-#include "vbahelperinterface.hxx"
+-#include "vbacommandbars.hxx"
+-
+-#include <map>
+-typedef std::map< const rtl::OUString, rtl::OUString > CommandBarNameMap;
+-typedef std::pair< const rtl::OUString, rtl::OUString > CommandBarNamePair;
+-const CommandBarNamePair namePair[] = { 
+-    CommandBarNamePair(  rtl::OUString::createFromAscii("standard"), rtl::OUString::createFromAscii("standardbar") ),
+-    CommandBarNamePair(  rtl::OUString::createFromAscii("formatting"), rtl::OUString::createFromAscii("formatobjectbar") ),
+-};
+-static const CommandBarNameMap mCommandBarNameMap( namePair, ( namePair + sizeof(namePair) / sizeof(namePair[0]) ) );
+-
+-
+-typedef InheritedHelperInterfaceImpl1< ov::XCommandBar > CommandBar_BASE;
+-
+-class ScVbaCommandBar : public CommandBar_BASE
+-{
+-private:
+-    rtl::OUString       m_sToolBarName;
+-    rtl::OUString       m_sMenuModuleName;
+-    rtl::OUString       m_sUIName;
+-    sal_Bool            m_bTemporary;
+-    sal_Bool            m_bIsMenu;
+-    sal_Bool            m_bCustom;
+-    sal_Bool            m_bCreate;
+-    ScVbaCommandBars*   m_pScVbaCommandBars;
+-    css::beans::PropertyValues  m_aToolBar;
+-    // hard reference for parent
+-    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
+-    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
+-    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
+-    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
+-    void initCommandBar() throw( css::uno::RuntimeException );
+-protected:
+-    void getToolBarSettings( rtl::OUString sToolBarName ) throw( css::uno::RuntimeException );
+-    void getMenuSettings();
+-    void addCustomBar();
+-public:
+-    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw( css::uno::RuntimeException );
+-    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw( css::uno::RuntimeException );
+-    
+-    sal_Bool IsMenu() { return m_bIsMenu; };
+-    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
+-    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
+-    css::uno::Reference< css::container::XIndexContainer > GetBarSettings() { return m_xBarSettings; };
+-    rtl::OUString GetToolBarName() { return m_sToolBarName; };
+-
+-    // Attributes
+-    virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setName( const ::rtl::OUString& _name ) throw (css::uno::RuntimeException);
+-    virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
+-
+-    // Methods
+-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+-
+-	// XHelperInterface
+-	virtual rtl::OUString& getServiceImplName();
+-	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-#endif//SC_VBA_COMMANDBAR_HXX
+Index: sc/source/ui/vba/vbaimage.hxx
+===================================================================
+--- sc/source/ui/vba/vbaimage.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaimage.hxx	(revision 276288)
+@@ -1,48 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile$
+- * $Revision$
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_IMAGE_HXX
+-#define SC_VBA_IMAGE_HXX
+-#include <cppuhelper/implbase1.hxx>
+-#include <ooo/vba/msforms/XImage.hpp>
+-
+-#include "vbacontrol.hxx"
+-#include "vbahelper.hxx"
+-
+-typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XImage > ImageImpl_BASE;
+-
+-class ScVbaImage : public ImageImpl_BASE
+-{
+-public:
+-    ScVbaImage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
+-    //XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-#endif //SC_VBA_IMAGE_HXX
+Index: sc/source/ui/vba/vbacolorformat.hxx
+===================================================================
+--- sc/source/ui/vba/vbacolorformat.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacolorformat.hxx	(revision 276288)
+@@ -1,128 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbacolorformat.hxx,v $
+- * $Revision: 1.3.146.1 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_XCOLORFORMAT_HXX
+-#define SC_VBA_XCOLORFORMAT_HXX
+-
+-#include <com/sun/star/drawing/XShape.hpp>
+-#include <ooo/vba/msforms/XColorFormat.hpp>
+-#include <ooo/vba/msforms/XFillFormat.hpp>
+-#include "vbahelperinterface.hxx"
+-#include "vbafillformat.hxx"
+-
+-typedef InheritedHelperInterfaceImpl1< ov::msforms::XColorFormat > ScVbaColorFormat_BASE;
+-
+-class ColorFormatType
+-{
+-public:
+-    const static sal_Int16 LINEFORMAT_FORECOLOR = 1;
+-    const static sal_Int16 LINEFORMAT_BACKCOLOR = 2;
+-    const static sal_Int16 FILLFORMAT_FORECOLOR = 3;
+-    const static sal_Int16 FILLFORMAT_BACKCOLOR = 4;
+-    const static sal_Int16 THREEDFORMAT_EXTRUSIONCOLOR = 5;
+-};
+-
+-struct MsoColorIndizes
+-{
+-    const static sal_Int32 HAPICOLOR_BLACK = 0;
+-    const static sal_Int32 HAPICOLOR_WITHE = 16777215;
+-    const static sal_Int32 HAPICOLOR_RED = 16711680;
+-    const static sal_Int32 HAPICOLOR_BRIGHTGREEN = 65280;
+-    const static sal_Int32 HAPICOLOR_BLUE = 255;
+-    const static sal_Int32 HAPICOLOR_YELLOW = 16776960;
+-    const static sal_Int32 HAPICOLOR_PINK = 16711935;
+-    const static sal_Int32 HAPICOLOR_TURQUOISE = 65535;
+-    const static sal_Int32 HAPICOLOR_DARKRED = 8388608;
+-    const static sal_Int32 HAPICOLOR_GREEN = 32768;
+-    const static sal_Int32 HAPICOLOR_DARKBLUE = 128;
+-    const static sal_Int32 HAPICOLOR_DARKYELLOW = 8421376;
+-    const static sal_Int32 HAPICOLOR_VIOLET = 8388736;
+-    const static sal_Int32 HAPICOLOR_TEAL = 32896;
+-    const static sal_Int32 HAPICOLOR_GRAY_25_PERCENT = 12632256;
+-    const static sal_Int32 HAPICOLOR_GRAY_50_PERCENT = 8421504;
+-    const static sal_Int32 HAPICOLOR_PERIWINCKLE = 10066431;
+-    const static sal_Int32 HAPICOLOR_PLUM = 10040166;
+-    const static sal_Int32 HAPICOLOR_IVORY = 16777164;
+-    const static sal_Int32 HAPICOLOR_LIGHTTURQUOISE = 13434879;
+-    const static sal_Int32 HAPICOLOR_DARKPRUPLE = 6684774;
+-    const static sal_Int32 HAPICOLOR_CORAL = 16744576;
+-    const static sal_Int32 HAPICOLOR_OCEANBLUE = 26316;
+-    const static sal_Int32 HAPICOLOR_ICEBLUE = 13421823;
+-    const static sal_Int32 HAPICOLOR_SKYBLUE = 52479;
+-    const static sal_Int32 HAPICOLOR_LIGHTGREEN = 13434828;
+-    const static sal_Int32 HAPICOLOR_LIGHTYELLOW = 16777113;
+-    const static sal_Int32 HAPICOLOR_PALEBLUE = 10079487;
+-    const static sal_Int32 HAPICOLOR_ROSE = 16751052;
+-    const static sal_Int32 HAPICOLOR_LAVENDER = 13408767;
+-    const static sal_Int32 HAPICOLOR_TAN = 16764057;
+-    const static sal_Int32 HAPICOLOR_LIGHTBLUE = 3368703;
+-    const static sal_Int32 HAPICOLOR_AQUA = 3394764;
+-    const static sal_Int32 HAPICOLOR_LIME = 10079232;
+-    const static sal_Int32 HAPICOLOR_GOLD = 16763904;
+-    const static sal_Int32 HAPICOLOR_LIGHTORANGE = 16750848;
+-    const static sal_Int32 HAPICOLOR_ORANGE = 16737792;
+-    const static sal_Int32 HAPICOLOR_BLUEGRAY = 6710937;
+-    const static sal_Int32 HAPICOLOR_GRAY_40_PERCENT = 9868950;
+-    const static sal_Int32 HAPICOLOR_DARKTEAL = 13158;
+-    const static sal_Int32 HAPICOLOR_SEAGREEN = 3381606;
+-    const static sal_Int32 HAPICOLOR_NONAME = 13056;
+-    const static sal_Int32 HAPICOLOR_OLIVEGREEN = 3355392;
+-    const static sal_Int32 HAPICOLOR_BROWN = 10040064;
+-    const static sal_Int32 HAPICOLOR_INDIGO = 3355545;
+-    const static sal_Int32 HAPICOLOR_GRAY_80_PERCENT = 3355443;
+-
+-    static sal_Int32 getColorIndex( sal_Int32 nIndex );
+-    
+-};
+-
+-class ScVbaColorFormat : public ScVbaColorFormat_BASE
+-{
+-private:
+-    css::uno::Reference< ov::XHelperInterface > m_xInternalParent;
+-    css::uno::Reference< css::drawing::XShape > m_xShape;
+-    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
+-    ScVbaFillFormat *m_pFillFormat;
+-    sal_Int16 m_nColorFormatType;
+-    sal_Int32 m_nFillFormatBackColor;
+-protected:
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-    void setColorFormat( sal_Int16 nType );
+-public:
+-    ScVbaColorFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XHelperInterface > xInternalParent, const css::uno::Reference< css::drawing::XShape > xShape, const sal_Int16 nColorFormatType );
+-
+-    // Attributes
+-    virtual sal_Int32 SAL_CALL getRGB() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setRGB( sal_Int32 _rgb ) throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getSchemeColor() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setSchemeColor( sal_Int32 _schemecolor ) throw (css::uno::RuntimeException);
+-
+-};
+-
+-#endif//SC_VBA_XCOLORFORMAT_HXX
+Index: sc/source/ui/vba/vbacommandbarcontrols.hxx
+===================================================================
+--- sc/source/ui/vba/vbacommandbarcontrols.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacommandbarcontrols.hxx	(revision 276288)
+@@ -1,90 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#ifndef SC_VBA_COMMANDBARCONTROLS_HXX
+-#define SC_VBA_COMMANDBARCONTROLS_HXX
+-
+-#include <ooo/vba/XCommandBarControls.hpp>
+-
+-#include "vbahelperinterface.hxx"
+-#include "vbacommandbar.hxx"
+-#include "vbacollectionimpl.hxx"
+-
+-class ScVbaCommandBarControl;
+-
+-typedef CollTestImplHelper< ov::XCommandBarControls > CommandBarControls_BASE;
+-
+-class ScVbaCommandBarControls : public CommandBarControls_BASE
+-{
+-private:
+-    sal_Bool                    m_bIsMenu;
+-    sal_Bool                    m_bHasElements;
+-    ScVbaCommandBar*            m_pCommandBar; 
+-    ScVbaCommandBarControl*     m_pCommandBarControl; 
+-    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
+-    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
+-    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
+-    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
+-
+-public:
+-    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess ) throw( css::uno::RuntimeException );
+-    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
+-    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
+-    css::uno::Reference< css::container::XIndexContainer >  GetBarSettings() { return m_xBarSettings; };
+-    sal_Bool IsMenu() { return m_bIsMenu; };
+-    ScVbaCommandBar* GetParentCommandBar() { return m_pCommandBar; };
+-    ScVbaCommandBarControl* GetParentCommandBarControl() { return m_pCommandBarControl; };
+-    rtl::OUString GetParentToolBarName() 
+-    { 
+-        if( m_pCommandBar ) return m_pCommandBar->GetToolBarName();
+-        else return rtl::OUString();
+-    }
+-    rtl::OUString GetControlNameByIndex( const sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
+-
+-    // Attributes
+-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
+-    // XEnumerationAccess
+-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
+-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
+-    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+-
+-    // Methods     
+-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); 
+-    virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+-    // XHelperInterface
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-};
+-
+-#endif//SC_VBA_COMMANDBARCONTROLS_HXX
+Index: sc/source/ui/vba/vbatextbox.cxx
+===================================================================
+--- sc/source/ui/vba/vbatextbox.cxx	(revision 276159)
++++ sc/source/ui/vba/vbatextbox.cxx	(revision 276288)
+@@ -1,137 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbatextbox.cxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include <com/sun/star/text/XTextRange.hpp>
+-
+-#include "vbatextbox.hxx"
+-#include <vector>
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-
+-
+-ScVbaTextBox::ScVbaTextBox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialog ) : TextBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialog( bDialog )
+-{
+-}
+-
+-// Attributes
+-uno::Any SAL_CALL 
+-ScVbaTextBox::getValue() throw (css::uno::RuntimeException)
+-{
+-	return uno::makeAny( getText() );
+-}
+-
+-void SAL_CALL 
+-ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
+-{
+-	rtl::OUString sVal = getAnyAsString( _value );
+-	setText( sVal );
+-}
+-
+-//getString() will cause some imfo lose.
+-rtl::OUString SAL_CALL 
+-ScVbaTextBox::getText() throw (css::uno::RuntimeException)
+-{
+-    uno::Any aValue;
+-    aValue = m_xProps->getPropertyValue
+-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ) ) );
+-    rtl::OUString sString;
+-    aValue >>= sString;
+-    return sString;
+-}
+-
+-void SAL_CALL 
+-ScVbaTextBox::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException)
+-{
+-    if ( !mbDialog )
+-    {
+-    uno::Reference< text::XTextRange > xTextRange( m_xProps, uno::UNO_QUERY_THROW );
+-    xTextRange->setString( _text );
+-}
+-    else
+-        m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text") ), uno::makeAny( _text ) ); 
+-}
+-
+-sal_Int32 SAL_CALL 
+-ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException)
+-{
+-    uno::Any aValue;
+-    aValue = m_xProps->getPropertyValue
+-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ) );
+-    sal_Int32 nMaxLength = 0;
+-    aValue >>= nMaxLength;
+-    return nMaxLength;
+-}
+-
+-void SAL_CALL 
+-ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException)
+-{
+-    uno::Any aValue( _maxlength );
+-    m_xProps->setPropertyValue
+-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ), aValue);
+-}
+-
+-sal_Bool SAL_CALL 
+-ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException)
+-{
+-    uno::Any aValue;
+-    aValue = m_xProps->getPropertyValue
+-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ) );
+-    sal_Bool bRet = false;
+-    aValue >>= bRet;
+-    return bRet;
+-}
+-
+-void SAL_CALL 
+-ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException)
+-{
+-    uno::Any aValue( _multiline );
+-    m_xProps->setPropertyValue
+-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ), aValue);
+-}
+-
+-rtl::OUString& 
+-ScVbaTextBox::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaTextBox") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaTextBox::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.TextBox" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbashape.cxx
+===================================================================
+--- sc/source/ui/vba/vbashape.cxx	(revision 276159)
++++ sc/source/ui/vba/vbashape.cxx	(revision 276288)
+@@ -1,480 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbashape.cxx,v $
+- * $Revision: 1.4 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include<ooo/vba/office/MsoZOrderCmd.hpp>
+-#include<ooo/vba/office/MsoScaleFrom.hpp>
+-#include<com/sun/star/container/XNamed.hpp>
+-#include<com/sun/star/drawing/ConnectorType.hpp>
+-#include <com/sun/star/lang/XEventListener.hpp>
+-#include<com/sun/star/drawing/XDrawPagesSupplier.hpp>
+-#include<com/sun/star/drawing/XDrawPages.hpp>
+-
+-#include <vos/mutex.hxx>
+-#include <vcl/svapp.hxx>
+-#include <svx/unopage.hxx>
+-#include <svx/unoshape.hxx>
+-
+-#include "vbashape.hxx"
+-#include "vbatextframe.hxx"
+-#include "vbalineformat.hxx"
+-#include "vbafillformat.hxx"
+-#include "vbapictureformat.hxx"
+-
+-using namespace ::ooo::vba;
+-using namespace ::com::sun::star;
+-using namespace ::vos;
+-
+-ScVbaShape::ScVbaShape( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, sal_Int32 nType ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( xParent, xContext ), m_xShape( xShape ), m_xShapes( xShapes ), m_nType( nType )
+-{
+-    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
+-    addListeners();
+-}
+-
+-ScVbaShape::ScVbaShape( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( uno::Reference< XHelperInterface >(), xContext ), m_xShape( xShape )
+-{
+-    // add listener
+-    addListeners();
+-}
+-
+-ScVbaShape::~ScVbaShape()
+-{ 
+-    // dtor must never ever throw
+-    try
+-    {
+-        removeShapeListener();
+-        removeShapesListener();
+-    }
+-    catch( uno::Exception& )
+-    {
+-    }    
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException )
+-{
+-    uno::Reference< drawing::XShapes > xShapes( rEventObject.Source, uno::UNO_QUERY );
+-    uno::Reference< drawing::XShape > xShape( rEventObject.Source, uno::UNO_QUERY );
+-    if ( xShapes.is() )
+-        removeShapesListener();
+-    if ( xShape.is() )
+-        removeShapeListener();
+-}
+-
+-
+-void ScVbaShape::addListeners()
+-{
+-    uno::Reference< lang::XComponent > xComponent( m_xShape, uno::UNO_QUERY );
+-    if ( xComponent.is() )
+-    	xComponent->addEventListener( this );
+-
+-    xComponent.set( m_xShapes, uno::UNO_QUERY );
+-    if ( xComponent.is() )
+-    	xComponent->addEventListener( this );
+-}
+-
+-void
+-ScVbaShape::removeShapeListener() throw( uno::RuntimeException )
+-{
+-    if( m_xShape.is() )
+-    {
+-        uno::Reference< lang::XComponent > xComponent( m_xShape, uno::UNO_QUERY_THROW );
+-        xComponent->removeEventListener( this );
+-    }
+-    m_xShape = NULL;
+-    m_xPropertySet = NULL;
+-}
+-
+-void
+-ScVbaShape::removeShapesListener() throw( uno::RuntimeException )
+-{
+-    if( m_xShapes.is() )
+-    {
+-        uno::Reference< lang::XComponent > xComponent( m_xShapes, uno::UNO_QUERY_THROW );
+-        xComponent->removeEventListener( this );
+-    }
+-    m_xShapes = NULL;
+-}
+-
+-sal_Int32 
+-ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw (uno::RuntimeException)
+-{
+-    rtl::OUString sShapeType;
+-    uno::Reference< drawing::XShapeDescriptor > xShapeDescriptor( xShape, uno::UNO_QUERY_THROW );
+-    sShapeType = xShapeDescriptor->getShapeType();
+-    // office::MsoShapeType::msoDiagram to "com.sun.star.drawing.GroupShape"
+-    if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.GroupShape" ) ) )
+-        return office::MsoShapeType::msoGroup;
+-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) ) )
+-        return office::MsoShapeType::msoPicture;
+-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ControlShape" ) ) )
+-        return office::MsoShapeType::msoOLEControlObject;
+-    // OOo don't support office::MsoShapeType::msoComment as a Shape.
+-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.OLE2Shape" ) ) )
+-        return office::MsoShapeType::msoChart;
+-    // Art characters office::MsoShapeType::msoTextEffect, in OOo corresponding to "com.sun.star.drawing.CustomShape"
+-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ConnectorShape" ) ) )
+-    {
+-        enum drawing::ConnectorType connectorType;
+-        uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
+-        xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("EdgeKind")) >>= connectorType;
+-        if( connectorType == drawing::ConnectorType_CURVE )
+-            return office::MsoShapeType::msoFreeform;
+-        else if( connectorType == drawing::ConnectorType_LINE )
+-            return office::MsoShapeType::msoLine;
+-        else 
+-            return office::MsoShapeType::msoAutoShape;
+-    }
+-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.LineShape" ) ) )
+-        return office::MsoShapeType::msoLine;
+-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.CustomShape" ) ) ||
+-            sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape") ) )
+-        return office::MsoShapeType::msoAutoShape;
+-    else
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "the shape type do not be surppored: " ) + sShapeType, uno::Reference< uno::XInterface >() );
+-}
+-
+-// Attributes
+-rtl::OUString SAL_CALL 
+-ScVbaShape::getName() throw (uno::RuntimeException)
+-{
+-    rtl::OUString sName;
+-    uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW );
+-    sName = xNamed->getName();
+-    return sName;
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
+-{
+-    uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW );
+-    xNamed->setName( _name );
+-}
+-
+-double SAL_CALL 
+-ScVbaShape::getHeight() throw (uno::RuntimeException)
+-{
+-    return Millimeter::getInPoints( m_xShape->getSize().Height );
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::setHeight( double _height ) throw (uno::RuntimeException)
+-{
+-    awt::Size aSize( m_xShape->getSize() );
+-    aSize.Height = Millimeter::getInHundredthsOfOneMillimeter( _height );
+-    m_xShape->setSize( aSize );
+-}
+-
+-double SAL_CALL 
+-ScVbaShape::getWidth() throw (uno::RuntimeException)
+-{
+-    return Millimeter::getInPoints( m_xShape->getSize().Width );
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::setWidth( double _width ) throw (uno::RuntimeException)
+-{
+-    awt::Size aSize( m_xShape->getSize() );
+-    aSize.Width = Millimeter::getInHundredthsOfOneMillimeter( _width );
+-    m_xShape->setSize( aSize );
+-}
+-
+-double SAL_CALL 
+-ScVbaShape::getLeft() throw (uno::RuntimeException)
+-{
+-    return Millimeter::getInPoints( m_xShape->getPosition().X );
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException)
+-{
+-    awt::Point oldPosition;
+-    oldPosition = m_xShape->getPosition();
+-    oldPosition.X = Millimeter::getInHundredthsOfOneMillimeter( _left );
+-    m_xShape->setPosition( oldPosition );
+-}
+-
+-double SAL_CALL 
+-ScVbaShape::getTop() throw (uno::RuntimeException)
+-{
+-    return Millimeter::getInPoints( m_xShape->getPosition().Y );
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::setTop( double _top ) throw (uno::RuntimeException)
+-{
+-    awt::Point oldPosition;
+-    oldPosition = m_xShape->getPosition();
+-    oldPosition.Y = Millimeter::getInHundredthsOfOneMillimeter( _top );
+-    m_xShape->setPosition( oldPosition );
+-}
+-
+-sal_Bool SAL_CALL 
+-ScVbaShape::getVisible() throw (uno::RuntimeException)
+-{
+-    //UNO Shapes are always visible
+-    return sal_True;
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::setVisible( sal_Bool /*_visible*/ ) throw (uno::RuntimeException)
+-{
+-    //UNO Shapes are always visible
+-}
+-
+-sal_Int32 SAL_CALL 
+-ScVbaShape::getZOrderPosition() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nZOrderPosition = 0;
+-    uno::Any aZOrderPosition =  m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ) );
+-    aZOrderPosition >>= nZOrderPosition;
+-    return nZOrderPosition + 1;
+-}
+-
+-sal_Int32 SAL_CALL 
+-ScVbaShape::getType() throw (uno::RuntimeException)
+-{
+-    return m_nType;
+-}
+-
+-double SAL_CALL 
+-ScVbaShape::getRotation() throw (uno::RuntimeException)
+-{
+-    double dRotation = 0;
+-    sal_Int32 nRotation = 0;
+-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "RotateAngle" ) ) >>= nRotation;
+-    dRotation = static_cast< double >( nRotation /100 );
+-    return dRotation;
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::setRotation( double _rotation ) throw (uno::RuntimeException)
+-{
+-    sal_Int32 nRotation = static_cast < sal_Int32 > ( _rotation * 100 );
+-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "RotateAngle" ), uno::makeAny( nRotation ) );
+-}
+-
+-uno::Reference< msforms::XLineFormat > SAL_CALL 
+-ScVbaShape::getLine() throw (uno::RuntimeException)
+-{
+-    // TODO should ongly return line
+-    return uno::Reference< msforms::XLineFormat >( new ScVbaLineFormat( this, mxContext, m_xShape ) );
+-}
+-
+-uno::Reference< msforms::XFillFormat > SAL_CALL
+-ScVbaShape::getFill() throw (uno::RuntimeException)
+-{
+-    return uno::Reference< msforms::XFillFormat >( new ScVbaFillFormat( this, mxContext, m_xShape ) );
+-}
+-
+-uno::Reference<  msforms::XPictureFormat > SAL_CALL
+-ScVbaShape::getPictureFormat() throw (uno::RuntimeException)
+-{
+-    return uno::Reference< msforms::XPictureFormat >( new ScVbaPictureFormat( this, mxContext, m_xShape ) );
+-}
+-
+-// Methods
+-uno::Reference< excel::XTextFrame > SAL_CALL 
+-ScVbaShape::TextFrame() throw (uno::RuntimeException)
+-{
+-    return uno::Reference< excel::XTextFrame >(new ScVbaTextFrame( getParent(), mxContext, m_xShape ) );
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::Delete() throw (uno::RuntimeException)
+-{
+-    OGuard aGuard( Application::GetSolarMutex() );
+-    m_xShapes->remove( m_xShape );
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException)
+-{
+-    sal_Int32 nOrderPositon;
+-    uno::Any aOrderPostion = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ) );
+-    aOrderPostion >>= nOrderPositon;
+-    switch( ZOrderCmd )
+-    {
+-    case office::MsoZOrderCmd::msoBringToFront:
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( SAL_MAX_INT32 ) );
+-        break;
+-    case office::MsoZOrderCmd::msoSendToBack:
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( (sal_Int32)0 ) );
+-        break;
+-    case office::MsoZOrderCmd::msoBringForward:
+-        nOrderPositon += 1;
+-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( nOrderPositon ) );
+-        break;
+-    case office::MsoZOrderCmd::msoSendBackward:
+-        if( nOrderPositon > 0 )
+-        {
+-            nOrderPositon -= 1;
+-            m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( nOrderPositon ) );
+-        }
+-        break;
+-    // below two commands use with Writer for text and image object.
+-    case office::MsoZOrderCmd::msoBringInFrontOfText:
+-    case office::MsoZOrderCmd::msoSendBehindText:
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "This ZOrderCmd is not implemented, it is use with writer." ), uno::Reference< uno::XInterface >() );
+-    default:
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Parameter." ), uno::Reference< uno::XInterface >() );
+-    }
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::IncrementRotation( double Increment ) throw (uno::RuntimeException)
+-{
+-    double nCurrentRotation = getRotation();
+-    nCurrentRotation += Increment;
+-    setRotation(nCurrentRotation);
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::IncrementLeft( double Increment ) throw (uno::RuntimeException)
+-{
+-    double nCurrentLeft = getLeft();
+-    nCurrentLeft += Increment;
+-    setLeft(nCurrentLeft);
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::IncrementTop( double Increment ) throw (uno::RuntimeException)
+-{
+-    double nCurrentTop = getTop();
+-    nCurrentTop += Increment;
+-    setTop(nCurrentTop);
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException)
+-{
+-    double nHeight = getHeight();
+-    double nNewHeight = nHeight * Factor;
+-    if( Scale == office::MsoScaleFrom::msoScaleFromTopLeft )
+-    {
+-        setHeight(nNewHeight);
+-    }
+-    else if( Scale == office::MsoScaleFrom::msoScaleFromBottomRight )
+-    {
+-        double nDeltaHeight = nNewHeight - nHeight;
+-        double nNewTop = getTop() - nDeltaHeight;
+-        setTop(nNewTop);
+-        setHeight(nNewHeight);
+-    }
+-    else if( Scale == office::MsoScaleFrom::msoScaleFromMiddle )
+-    {
+-        double nDeltaHeight = (nNewHeight - nHeight) / 2;
+-        double nNewTop = getTop() - nDeltaHeight;
+-        setTop(nNewTop);
+-        setHeight(nNewHeight);
+-    }
+-    else
+-    {
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "ScaleHeight.Scale wrong value is given." ) , uno::Reference< uno::XInterface >() );
+-    }
+-}
+-
+-void SAL_CALL 
+-ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException)
+-{
+-    double nWidth = getWidth();
+-    double nNewWidth = nWidth * Factor;
+-    if( Scale == office::MsoScaleFrom::msoScaleFromTopLeft )
+-    {
+-        setWidth(nNewWidth);
+-    }
+-    else if( Scale == office::MsoScaleFrom::msoScaleFromBottomRight )
+-    {
+-        double nDeltaWidth = nNewWidth - nWidth;
+-        double nNewLeft = getLeft() - nDeltaWidth;
+-        setLeft(nNewLeft);
+-        setWidth(nNewWidth);
+-    }
+-    else if( Scale == office::MsoScaleFrom::msoScaleFromMiddle )
+-    {
+-        double nDeltaWidth = (nNewWidth - nWidth) / 2;
+-        double nNewLeft = getLeft() - nDeltaWidth;
+-        setLeft(nNewLeft);
+-        setWidth(nNewWidth);
+-    }
+-    else
+-    {
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "ScaleHeight.Scale wrong value is given." ) , uno::Reference< uno::XInterface >() );
+-    }
+-}
+-
+-void SAL_CALL
+-ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException )
+-{
+-    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+-    xSelectSupp->select( uno::makeAny( m_xShape ) );
+-}
+-
+-// This method should not be part of Shape, what we reall need to do is...
+-// dynamically create the appropriate objects e.g. TextBox, Oval, Picture etc. 
+-// ( e.g. the ones that really do have ShapeRange as an attribute )
+-#include "vbashaperange.hxx"
+-
+-uno::Any SAL_CALL 
+-ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException )
+-{
+-	// perhaps we should store a reference to the Shapes Collection 
+-	// in this class
+-	// but anyway this method should not even be in this class
+-	// #TODO not sure what the parent of the Shapes collection should be
+-	
+-	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec aVec;
+-	aVec.push_back( m_xShape );
+-	uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( aVec ) );
+-	uno::Reference< container::XChild > xChild( m_xShape, uno::UNO_QUERY_THROW );	
+-	// #FIXME for want of a better parent, setting this
+-	uno::Reference< msforms::XShapeRange > xShapeRange( new ScVbaShapeRange( mxParent, mxContext, xIndexAccess,  uno::Reference< drawing::XDrawPage >( xChild->getParent(), uno::UNO_QUERY_THROW ) ) );
+-	if ( index.hasValue() )
+-		return xShapeRange->Item( index, uno::Any() );
+-	return uno::makeAny( xShapeRange );
+-}
+-
+-rtl::OUString& 
+-ScVbaShape::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShape") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaShape::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Shape" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbauserform.cxx
+===================================================================
+--- sc/source/ui/vba/vbauserform.cxx	(revision 276159)
++++ sc/source/ui/vba/vbauserform.cxx	(revision 276288)
+@@ -1,228 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include "helperdecl.hxx"
+-#include "vbauserform.hxx"
+-#include <com/sun/star/awt/XControl.hpp>
+-#include <com/sun/star/awt/XControlContainer.hpp>
+-#include <com/sun/star/beans/PropertyConcept.hpp>
+-#include <basic/sbx.hxx>
+-#include <basic/sbstar.hxx>
+-#include <basic/sbmeth.hxx>
+-#include "unonames.hxx"
+-#include "vbacontrols.hxx"
+-
+-using namespace ::ooo::vba;
+-using namespace ::com::sun::star;
+-
+-// some little notes
+-// XDialog implementation has the following interesting bits
+-// a Controls property ( which is an array of the container controls )
+-//   each item in the controls array is a XControl, where the model is 
+-//   basically a property bag
+-// additionally the XDialog instance has itself a model
+-//     this model has a ControlModels ( array of models ) property
+-//     the models in ControlModels can be accessed by name
+-// also the XDialog is a XControl ( to access the model above
+-
+-ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) throw ( lang::IllegalArgumentException ) :  ScVbaUserForm_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext, getXSomethingFromArgs< uno::XInterface >( aArgs, 1 ), getXSomethingFromArgs< frame::XModel >( aArgs, 2 ), static_cast< ooo::vba::AbstractGeometryAttributes* >(0) ), m_pDocShell( 0 ), mbDispose( true )
+-{
+-    m_xDialog.set( m_xControl, uno::UNO_QUERY_THROW );
+-    uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW );
+-    m_pDocShell = getDocShell( m_xModel );
+-    m_xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW );
+-    setGeometryHelper( new UserFormGeometryHelper( xContext, xControl ) );
+-}
+-
+-ScVbaUserForm::~ScVbaUserForm()
+-{
+-}
+-
+-void SAL_CALL 
+-ScVbaUserForm::Show(  ) throw (uno::RuntimeException)
+-{
+-	OSL_TRACE("ScVbaUserForm::Show(  )");
+-	short aRet = 0;
+-	if ( m_xDialog.is() )
+-		aRet = m_xDialog->execute();
+-	OSL_TRACE("ScVbaUserForm::Show() execute returned %d", aRet);
+-	if ( mbDispose )
+-	{
+-		try
+-		{
+-			uno::Reference< lang::XComponent > xComp( m_xDialog, uno::UNO_QUERY_THROW );
+-			m_xDialog = NULL;
+-			xComp->dispose();
+-			mbDispose = false; 
+-		}
+-		catch( uno::Exception& )
+-		{
+-		}
+-	}
+-}
+-
+-rtl::OUString SAL_CALL 
+-ScVbaUserForm::getCaption() throw (::com::sun::star::uno::RuntimeException)
+-{
+-    rtl::OUString sCaption;
+-    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ) ) >>= sCaption;
+-    return sCaption;
+-}
+-void
+-ScVbaUserForm::setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ), uno::makeAny( _caption ) );
+-}
+-
+-void SAL_CALL 
+-ScVbaUserForm::Hide(  ) throw (uno::RuntimeException)
+-{
+-	mbDispose = false;  // hide not dispose
+-	if ( m_xDialog.is() )
+-		m_xDialog->endExecute();
+-}
+-
+-void SAL_CALL 
+-ScVbaUserForm::RePaint(  ) throw (uno::RuntimeException)
+-{
+-	// do nothing
+-}
+-
+-void SAL_CALL 
+-ScVbaUserForm::UnloadObject(  ) throw (uno::RuntimeException)
+-{
+-	mbDispose = true;
+-	if ( m_xDialog.is() )
+-		m_xDialog->endExecute();
+-}
+-
+-rtl::OUString& 
+-ScVbaUserForm::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaUserForm") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaUserForm::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.UserForm" ) );
+-	}
+-	return aServiceNames;
+-}
+-
+-uno::Reference< beans::XIntrospectionAccess > SAL_CALL 
+-ScVbaUserForm::getIntrospection(  ) throw (uno::RuntimeException)
+-{
+-	return uno::Reference< beans::XIntrospectionAccess >();
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaUserForm::invoke( const ::rtl::OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
+-{
+-	throw uno::RuntimeException(); // unsupported operation
+-}
+-
+-void SAL_CALL 
+-ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
+-{
+-	uno::Any aObject = getValue( aPropertyName );
+-	// The Object *must* support XDefaultProperty here because getValue will
+-	// only return properties that are Objects ( e.g. controls )
+-	// e.g. Userform1.aControl = something
+-	// 'aControl' has to support XDefaultProperty to make sense here
+-	uno::Reference< script::XDefaultProperty > xDfltProp( aObject, uno::UNO_QUERY_THROW );
+-	rtl::OUString aDfltPropName = xDfltProp->getDefaultPropertyName();
+-	uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObject ) );
+-	uno::Reference< beans::XPropertySet > xPropSet( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY_THROW );
+-	xPropSet->setPropertyValue( aDfltPropName, aValue );
+-}
+-
+-uno::Any SAL_CALL 
+-ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
+-{
+-	uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
+-	uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
+-	uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
+-	ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
+-        uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
+-        ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
+-        pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
+-	return uno::makeAny( xVBAControl );
+-}
+-
+-::sal_Bool SAL_CALL 
+-ScVbaUserForm::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException)
+-{
+-	return sal_False;
+-}
+-uno::Any SAL_CALL 
+-ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException)
+-{
+-	uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
+-	uno::Reference< XCollection > xControls( new ScVbaControls( this, mxContext, xDialogControl ) );
+-	if ( index.hasValue() )
+-		return uno::makeAny( xControls->Item( index, uno::Any() ) );
+-	return uno::makeAny( xControls );
+-}
+-
+-::sal_Bool SAL_CALL 
+-ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+-{
+-	uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY );
+-	OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is() );
+-	if ( xControl.is() )
+-	{
+-		uno::Reference< container::XNameAccess > xNameAccess( xControl->getModel(), uno::UNO_QUERY_THROW );	
+-		sal_Bool bRes =  xNameAccess->hasByName( aName );
+-	OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d ---> %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is(), bRes );
+-		return bRes;
+-	}
+-	return sal_False;
+-}
+-
+-namespace userform
+-{
+-namespace sdecl = comphelper::service_decl;
+-sdecl::vba_service_class_<ScVbaUserForm, sdecl::with_args<true> > serviceImpl;
+-extern sdecl::ServiceDecl const serviceDecl(
+-    serviceImpl,
+-    "ScVbaUserForm",
+-    "ooo.vba.excel.UserForm" );
+-}
+-
+Index: sc/source/ui/vba/vbacommandbarcontrol.cxx
+===================================================================
+--- sc/source/ui/vba/vbacommandbarcontrol.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacommandbarcontrol.cxx	(revision 276288)
+@@ -1,403 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile$
+- *
+- *  $Revision$
+- *
+- *  last change: $Author$ $Date$
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-#include "vbacommandbarcontrol.hxx"
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName )
+-{
+-    sal_Int32 nCount = aPropertyValues.getLength();
+-    for( sal_Int32 i = 0; i < nCount; i++ )
+-    {
+-        if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
+-        {
+-            return aPropertyValues[i].Value;
+-        }
+-    }
+-    return uno::Any();
+-}
+-
+-beans::PropertyValues lcl_repalcePropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName, uno::Any aValue )
+-{
+-    sal_Int32 nCount = aPropertyValues.getLength();
+-    for( sal_Int32 i = 0; i < nCount; i++ )
+-    {
+-        if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
+-        {
+-            aPropertyValues[i].Value = aValue;
+-            return aPropertyValues;
+-        }
+-    }
+-    return aPropertyValues;
+-}
+-
+-ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName ) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_sName( sName )
+-{
+-    // exsiting CommandBarBarControl
+-    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
+-    initObjects();
+-    if( m_xBarSettings->hasElements() )
+-    {
+-        ScVbaCommandBarControl* pParentCommandBarControl = m_pCommandBarControls->GetParentCommandBarControl();
+-        if( pParentCommandBarControl )
+-        {
+-            beans::PropertyValues aPropertyValues;
+-            pParentCommandBarControl->GetCurrentSettings()->getByIndex( pParentCommandBarControl->GetPosition() ) >>= aPropertyValues;
+-            pParentCommandBarControl->SetPropertyValues( aPropertyValues );
+-            m_xCurrentSettings.set( lcl_getPropertyValue( pParentCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY_THROW );
+-        }
+-        if( !m_xCurrentSettings.is() )
+-        {
+-            m_xCurrentSettings.set( m_xUICfgManager->getSettings( m_pCommandBarControls->GetParentToolBarName(), sal_True ), uno::UNO_QUERY_THROW );
+-        }
+-        for( sal_Int32 i = 0; i < m_xCurrentSettings->getCount(); i++ )
+-        {
+-            beans::PropertyValues aPropertyValuesTemp;
+-            m_xCurrentSettings->getByIndex( i ) >>= aPropertyValuesTemp;
+-            // Label always empty in OOo
+-            rtl::OUString sLabel;
+-            lcl_getPropertyValue( aPropertyValuesTemp, rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+-            if( sLabel.equalsIgnoreAsciiCase( sName ) )
+-            {
+-                m_nPosition = i;
+-                break;
+-            }
+-            // using CammandURL to find
+-            rtl::OUString sCommandURL;
+-            lcl_getPropertyValue( aPropertyValuesTemp, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
+-            sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
+-            if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sCommandURL.getLength() ) )
+-            {
+-                sCommandURL = sCommandURL.copy( nLastIndex + 1 );
+-            }
+-            if( sCommandURL.equalsIgnoreAsciiCase( sName ) )
+-            {
+-                m_nPosition = i;
+-                break;
+-            }
+-        }
+-        if( m_nPosition  == -1 )
+-            throw uno::RuntimeException( rtl::OUString::createFromAscii("The CommandBarControl do not exist"), uno::Reference< uno::XInterface >() );
+-    }
+-    if( m_bIsMenu )
+-    {
+-        m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
+-    }
+-    else
+-    {
+-        m_sBarName = m_pCommandBarControls->GetParentToolBarName();
+-    }
+-    m_bTemporary = sal_True;
+-}
+-ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, rtl::OUString sCommand, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) :  CommandBarControl_BASE( xParent, xContext ), m_nPosition( nPosition ), m_bTemporary( bTemporary )
+-{
+-    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
+-    initObjects();
+-    if( sName.getLength() > 0 )
+-    {
+-        m_sName = sName;
+-    }
+-    if( sCommand.getLength() > 0 )
+-    {
+-        m_sCommand = sCommand;
+-    }
+-    else
+-    {
+-        m_sCommand = rtl::OUString::createFromAscii("vnd.openoffice.org:") + sName;
+-    }
+-    if( m_bIsMenu )
+-    {
+-        m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
+-        createNewMenuBarControl();
+-    }
+-    else
+-    {
+-        m_sBarName = m_pCommandBarControls->GetParentToolBarName();
+-        createNewToolBarControl();
+-    }
+-}
+-
+-void
+-ScVbaCommandBarControl::initObjects() throw (uno::RuntimeException)
+-{
+-    m_pCommandBarControls = dynamic_cast< ScVbaCommandBarControls* >( m_xParentHardRef.get() );
+-    if( !m_pCommandBarControls )
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBarControls"), uno::Reference< uno::XInterface >() );
+-    m_xUICfgManager.set( m_pCommandBarControls->GetUICfgManager(), uno::UNO_QUERY_THROW );
+-    m_xUICfgPers.set( m_pCommandBarControls->GetUICfgPers(), uno::UNO_QUERY_THROW );
+-    m_xBarSettings.set( m_pCommandBarControls->GetBarSettings(), uno::UNO_QUERY_THROW );
+-    m_bIsMenu = m_pCommandBarControls->IsMenu();
+-    m_sName = rtl::OUString::createFromAscii( "Custom" );
+-    m_nPosition = -1;
+-}
+-
+-void
+-ScVbaCommandBarControl::createNewMenuBarControl()
+-{
+-    uno::Sequence< beans::PropertyValue > aPropertys(4);
+-    aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
+-    aPropertys[0].Value <<= m_sCommand; 
+-    aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
+-    aPropertys[1].Value <<= m_sName; 
+-    aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
+-    aPropertys[2].Value <<= m_nType; 
+-    aPropertys[3].Name = rtl::OUString::createFromAscii("ItemDescriptorContainer");
+-
+-    m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
+-    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
+-    rtl::OUString sUIName;
+-    xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") ) >>= sUIName;
+-
+-    uno::Reference< lang::XSingleComponentFactory > xMenuMSF( m_xBarSettings, uno::UNO_QUERY_THROW );
+-    if( m_pCommandBarControls->GetParentCommandBar() != NULL )
+-    {
+-        // create a new menu
+-        m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
+-        m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
+-    }
+-    else if( m_pCommandBarControls->GetParentCommandBarControl() != NULL )
+-    {
+-        // create a new menu entry
+-        // change the parent MenuItem to a PopupMenu
+-        ScVbaCommandBarControl* pPc = m_pCommandBarControls->GetParentCommandBarControl();
+-        beans::PropertyValues aPropertyValues;
+-        pPc->GetCurrentSettings()->getByIndex( pPc->GetPosition() ) >>= aPropertyValues;
+-        pPc->SetPropertyValues( aPropertyValues );
+-        
+-        // has the property already been set?
+-        if( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ).hasValue() )
+-        {
+-            lcl_repalcePropertyValue(  pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer"), uno::makeAny( xMenuMSF->createInstanceWithContext( mxContext ) ) );
+-            pPc->GetCurrentSettings()->replaceByIndex( pPc->GetPosition(), uno::makeAny( pPc->GetPropertyValues() ) );
+-        }
+-        m_xCurrentSettings.set( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY_THROW );
+-        m_xCurrentSettings->insertByIndex( m_nPosition, uno::makeAny( m_aPropertyValues ) );
+-    }
+-    if( m_xUICfgManager->hasSettings( m_sBarName ) )
+-    {
+-        m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-    }
+-    else
+-    {
+-        m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-    }
+-    if( !m_bTemporary )
+-    {
+-        m_xUICfgPers->store();
+-    }
+-}
+-
+-void
+-ScVbaCommandBarControl::createNewToolBarControl()
+-{
+-    uno::Sequence< beans::PropertyValue > aPropertys(4);
+-    aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
+-    aPropertys[0].Value <<= m_sCommand; 
+-    aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
+-    aPropertys[1].Value <<= m_sName; 
+-    aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
+-    aPropertys[2].Value <<= m_nType; 
+-    aPropertys[3].Name = rtl::OUString::createFromAscii("IsVisible");
+-    aPropertys[3].Value <<= sal_True; 
+-
+-    m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
+-    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
+-    rtl::OUString sUIName;
+-    xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") ) >>= sUIName;
+-
+-    m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
+-    if( m_xUICfgManager->hasSettings( m_sBarName ) )
+-    {
+-        m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-    }
+-    else
+-    {
+-        m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-    }
+-    if( !m_bTemporary )
+-    {
+-        m_xUICfgPers->store();
+-    }
+-}
+-
+-::rtl::OUString SAL_CALL
+-ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException )
+-{
+-    // "Label" always empty
+-    rtl::OUString sCaption;
+-    beans::PropertyValues aPropertyValues;
+-    if( m_xCurrentSettings.is() )
+-    {
+-        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
+-        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
+-    }
+-    else if( m_xBarSettings.is() )
+-    {
+-        m_xBarSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
+-        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
+-    }
+-    return sCaption;
+-}
+-void SAL_CALL 
+-ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
+-{
+-    if( m_xCurrentSettings.is() )
+-    {
+-        beans::PropertyValues aPropertyValues;
+-        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
+-        beans::PropertyValues aNewPropertyValues;
+-        aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label"), uno::makeAny( _caption ) );
+-        m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
+-        if( m_xUICfgManager->hasSettings( m_sBarName ) )
+-        {
+-            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-        }
+-        else
+-        {
+-            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-        }
+-        // make it permanent
+-        if( !m_bTemporary )
+-        {
+-            m_xUICfgPers->store();
+-        }
+-    }
+-}
+-::rtl::OUString SAL_CALL 
+-ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException)
+-{
+-    if( m_xCurrentSettings.is() )
+-    {
+-        beans::PropertyValues aPropertyValues;
+-        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
+-        rtl::OUString sCommandURL;
+-        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
+-        return sCommandURL;
+-    }
+-    return ::rtl::OUString();
+-}
+-void SAL_CALL 
+-ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException)
+-{
+-    if( m_xCurrentSettings.is() )
+-    {
+-        beans::PropertyValues aPropertyValues;
+-        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
+-        beans::PropertyValues aNewPropertyValues;
+-        aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( _onaction ) );
+-        m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
+-        if( m_xUICfgManager->hasSettings( m_sBarName ) )
+-        {
+-            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-        }
+-        else
+-        {
+-            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-        }
+-        // make it permanent
+-        if( !m_bTemporary )
+-        {
+-            m_xUICfgPers->store();
+-        }
+-    }
+-}
+-::sal_Bool SAL_CALL 
+-ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException)
+-{
+-    // not possible in UNO?
+-    return sal_True;
+-}
+-void SAL_CALL 
+-ScVbaCommandBarControl::setVisible( ::sal_Bool /*_visible*/ ) throw (uno::RuntimeException)
+-{
+-    // "IsVisilbe"
+-}
+-void SAL_CALL 
+-ScVbaCommandBarControl::Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+-{
+-    if( m_xCurrentSettings.is() )
+-    {
+-        m_xCurrentSettings->removeByIndex( m_nPosition );
+-
+-        if( m_xUICfgManager->hasSettings( m_sBarName ) )
+-        {
+-            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-        }
+-        else
+-        {
+-            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
+-        }
+-        // make it permanent
+-        if( !m_bTemporary )
+-        {
+-            m_xUICfgPers->store();
+-        }
+-    }
+-}
+-uno::Any SAL_CALL 
+-ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
+-{
+-    sal_Int32 nIndex;
+-    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
+-    if( aIndex.hasValue() )
+-    {
+-        if( aIndex >>= nIndex )
+-        {
+-            uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
+-            return uno::makeAny( xCommandBarControl );
+-        }
+-        else
+-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "invalid index" ), uno::Reference< uno::XInterface >() );
+-    }
+-    return uno::makeAny( xCommandBarControls );
+-}
+-rtl::OUString& 
+-ScVbaCommandBarControl::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControl") );
+-	return sImplName;
+-}
+-uno::Sequence<rtl::OUString> 
+-ScVbaCommandBarControl::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControl" ) );
+-	}
+-	return aServiceNames;
+-}
+Index: sc/source/ui/vba/vbaworkbooks.hxx
+===================================================================
+--- sc/source/ui/vba/vbaworkbooks.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaworkbooks.hxx	(revision 276288)
+@@ -31,21 +31,20 @@
+ #define SC_VBA_WORKBOOKS_HXX
+ 
+ 
+-#include "vbacollectionimpl.hxx"
+-#include <ooo/vba/XGlobals.hpp>
++#include <vbahelper/vbacollectionimpl.hxx>
+ #include <ooo/vba/excel/XWorkbooks.hpp>
+ #include <com/sun/star/container/XEnumerationAccess.hpp>
+-#include "vbahelper.hxx"
++#include <vbahelper/vbadocumentsbase.hxx>
++#include "excelvbahelper.hxx"
+ 
+ 
+ class ScModelObj;
+ 
+-typedef CollTestImplHelper< ov::excel::XWorkbooks > ScVbaWorkbooks_BASE;
++typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::excel::XWorkbooks > ScVbaWorkbooks_BASE;
+ 
+ class ScVbaWorkbooks : public ScVbaWorkbooks_BASE
+ {
+ private:
+-	css::uno::Reference< ov::XGlobals > getGlobals() throw (css::uno::RuntimeException);
+ 	rtl::OUString 	getFileFilterType( const rtl::OUString& rString );
+ 	bool 	isTextFile( const rtl::OUString& rString );
+ 	bool 	isSpreadSheetFile( const rtl::OUString& rString );
+Index: sc/source/ui/vba/vbaname.hxx
+===================================================================
+--- sc/source/ui/vba/vbaname.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaname.hxx	(revision 276288)
+@@ -34,8 +34,10 @@
+ #include <com/sun/star/sheet/XNamedRange.hpp>
+ #include <com/sun/star/sheet/XNamedRanges.hpp>
+ 
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
++class ScDocument; 
++
+ typedef InheritedHelperInterfaceImpl1< ov::excel::XName > NameImpl_BASE;
+ 
+ class ScVbaName : public NameImpl_BASE 
+Index: sc/source/ui/vba/vbamenuitem.hxx
+===================================================================
+--- sc/source/ui/vba/vbamenuitem.hxx	(revision 0)
++++ sc/source/ui/vba/vbamenuitem.hxx	(revision 276288)
+@@ -0,0 +1,63 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_MENUITEM_HXX
++#define SC_VBA_MENUITEM_HXX
++
++#include <ooo/vba/excel/XMenuItem.hpp>
++#include <ooo/vba/XCommandBarControl.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ov::excel::XMenuItem > MenuItem_BASE;
++
++class ScVbaMenuItem : public MenuItem_BASE
++{
++private:
++    css::uno::Reference< ov::XCommandBarControl > m_xCommandBarControl;
++
++public:
++    ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException );
++    
++    virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException);
++    virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException);
++
++    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif//SC_VBA_MENUITEM_HXX
+Index: sc/source/ui/vba/vbacomments.hxx
+===================================================================
+--- sc/source/ui/vba/vbacomments.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacomments.hxx	(revision 276288)
+@@ -34,8 +34,8 @@
+ 
+ #include <ooo/vba/excel/XComments.hpp>
+ 
+-#include "vbahelper.hxx"
+-#include "vbacollectionimpl.hxx"
++#include "excelvbahelper.hxx"
++#include <vbahelper/vbacollectionimpl.hxx>
+ #include "vbacomment.hxx"
+ 
+ typedef CollTestImplHelper< ov::excel::XComments > ScVbaComments_BASE;
+Index: sc/source/ui/vba/vbastyle.cxx
+===================================================================
+--- sc/source/ui/vba/vbastyle.cxx	(revision 276159)
++++ sc/source/ui/vba/vbastyle.cxx	(revision 276288)
+@@ -71,7 +71,7 @@ void ScVbaStyle::initialise() throw ( uno::Runtime
+ 
+ }
+ 
+-ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) :  ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false )
++ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) :  ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel )
+ {
+ 	try
+ 	{
+@@ -83,7 +83,7 @@ void ScVbaStyle::initialise() throw ( uno::Runtime
+ 	}
+ }
+ 
+-ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false )
++ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false ),  mxModel( _xModel )
+ {
+ 	try
+ 	{
+Index: sc/source/ui/vba/vbapivottable.hxx
+===================================================================
+--- sc/source/ui/vba/vbapivottable.hxx	(revision 276159)
++++ sc/source/ui/vba/vbapivottable.hxx	(revision 276288)
+@@ -33,8 +33,8 @@
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #include <com/sun/star/sheet/XDataPilotTable.hpp>
+ #include <ooo/vba/excel/XPivotTable.hpp>
+-#include "vbahelper.hxx"
+-#include "vbahelperinterface.hxx"
++#include "excelvbahelper.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ typedef InheritedHelperInterfaceImpl1< ov::excel::XPivotTable >  PivotTableImpl_BASE;
+ 
+Index: sc/source/ui/vba/vbaworksheet.hxx
+===================================================================
+--- sc/source/ui/vba/vbaworksheet.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaworksheet.hxx	(revision 276288)
+@@ -44,9 +44,12 @@
+ #include <ooo/vba/excel/XOutline.hpp>
+ #include <ooo/vba/excel/XPageSetup.hpp>
+ #include <ooo/vba/excel/XHPageBreaks.hpp>
++#include <ooo/vba/excel/XVPageBreaks.hpp>
+ #include <ooo/vba/excel/XChartObjects.hpp>
++#include <com/sun/star/container/XNamed.hpp>
+ 
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
++#include "address.hxx"
+ 
+ typedef InheritedHelperInterfaceImpl1< ov::excel::XWorksheet >  WorksheetImpl_BASE;
+ 
+@@ -93,9 +96,12 @@ class ScVbaWorksheet : public WorksheetImpl_BASE
+ 	virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Reference< ov::excel::XPageSetup > SAL_CALL PageSetup( ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL HPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL VPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() throw (css::uno::RuntimeException);
+ 	virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() throw (css::uno::RuntimeException);
+  	virtual sal_Int16 SAL_CALL getIndex() throw (css::uno::RuntimeException);
++ 	virtual sal_Int32 SAL_CALL getEnableSelection() throw (css::uno::RuntimeException);
++ 	virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) throw (css::uno::RuntimeException);
+ 
+     // Methods
+ 	virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
+Index: sc/source/ui/vba/vbachartobjects.hxx
+===================================================================
+--- sc/source/ui/vba/vbachartobjects.hxx	(revision 276159)
++++ sc/source/ui/vba/vbachartobjects.hxx	(revision 276288)
+@@ -36,8 +36,8 @@
+ #include <com/sun/star/table/XTableCharts.hpp>
+ #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
+ #include <com/sun/star/container/XEnumerationAccess.hpp>
+-#include"vbacollectionimpl.hxx"
+-#include "vbahelper.hxx"
++#include <vbahelper/vbacollectionimpl.hxx>
++#include "excelvbahelper.hxx"
+ #include <hash_map>
+ 
+ typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE;
+Index: sc/source/ui/vba/vbapagebreak.cxx
+===================================================================
+--- sc/source/ui/vba/vbapagebreak.cxx	(revision 276159)
++++ sc/source/ui/vba/vbapagebreak.cxx	(revision 276288)
+@@ -139,3 +139,37 @@ ScVbaHPageBreak::getServiceNames()
+ 	return aServiceNames;
+ }
+ 
++template class ScVbaPageBreak< excel::XVPageBreak >;
++
++/* class ScVbaVPageBreak */
++ScVbaVPageBreak::ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, 
++								  const css::uno::Reference< css::uno::XComponentContext >& xContext,
++								  css::uno::Reference< css::beans::XPropertySet >& xProps,
++								  css::sheet::TablePageBreakData aTablePageBreakData ) throw ( css::uno::RuntimeException )
++:   ScVbaVPageBreak_BASE( xParent, xContext, xProps, aTablePageBreakData )
++{
++}
++            
++ScVbaVPageBreak::~ScVbaVPageBreak()
++{
++}
++
++rtl::OUString& 
++ScVbaVPageBreak::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreak") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaVPageBreak::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.VPageBreak" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sc/source/ui/vba/vbaformat.cxx
+===================================================================
+--- sc/source/ui/vba/vbaformat.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaformat.cxx	(revision 276288)
+@@ -33,6 +33,7 @@
+ #include <ooo/vba/excel/XlHAlign.hpp>
+ #include <ooo/vba/excel/XlOrientation.hpp>
+ #include <ooo/vba/excel/Constants.hpp>
++#include <ooo/vba/excel/XRange.hpp>
+ #include <com/sun/star/table/CellVertJustify.hpp>
+ #include <com/sun/star/table/CellHoriJustify.hpp>
+ #include <com/sun/star/table/CellOrientation.hpp>
+@@ -341,7 +342,7 @@ template< typename Ifc1 >
+ uno::Any SAL_CALL 
+ ScVbaFormat<Ifc1>::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException )
+ {
+-	ScVbaPalette aPalette( getDocShell( mxModel ) );	
++	ScVbaPalette aPalette( excel::getDocShell( mxModel ) );	
+ 	uno::Reference< XCollection > xColl =  new ScVbaBorders( thisHelperIface(), ScVbaFormat_BASE::mxContext, uno::Reference< table::XCellRange >( mxPropertySet, uno::UNO_QUERY_THROW ), aPalette );
+ 
+ 	if ( Index.hasValue() )
+@@ -355,7 +356,7 @@ template< typename Ifc1 >
+ uno::Reference< excel::XFont > SAL_CALL 
+ ScVbaFormat<Ifc1>::Font(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ {
+-	ScVbaPalette aPalette( getDocShell( mxModel ) );
++	ScVbaPalette aPalette( excel::getDocShell( mxModel ) );
+ 	return new ScVbaFont( thisHelperIface(), ScVbaFormat_BASE::mxContext, aPalette, mxPropertySet );
+ }
+ 
+Index: sc/source/ui/vba/makefile.mk
+===================================================================
+--- sc/source/ui/vba/makefile.mk	(revision 276159)
++++ sc/source/ui/vba/makefile.mk	(revision 276288)
+@@ -47,7 +47,7 @@ dummy:
+ .ENDIF
+ 
+ INCPRE=$(INCCOM)$/$(TARGET)
+-
++CDEFS+=-DVBA_OOBUILD_HACK
+ # ------------------------------------------------------------------
+ 
+ SLOFILES= \
+@@ -64,7 +64,7 @@ SLOFILES= \
+ 		$(SLO)$/vbaworksheet.obj \
+ 		$(SLO)$/vbaoutline.obj \
+ 		$(SLO)$/vbafont.obj\
+-		$(SLO)$/vbahelper.obj\
++		$(SLO)$/excelvbahelper.obj\
+ 		$(SLO)$/vbainterior.obj\
+ 		$(SLO)$/vbawsfunction.obj\
+ 		$(SLO)$/vbawindow.obj\
+@@ -81,28 +81,11 @@ SLOFILES= \
+ 		$(SLO)$/vbapalette.obj \
+ 		$(SLO)$/vbaborders.obj \
+ 		$(SLO)$/vbacharacters.obj \
+-		$(SLO)$/vbacombobox.obj \
+ 		$(SLO)$/vbavalidation.obj \
+-                $(SLO)$/vbacontrol.obj \
+-                $(SLO)$/vbacontrols.obj \
+                 $(SLO)$/vbaoleobject.obj \
+                 $(SLO)$/vbaoleobjects.obj \
+-                $(SLO)$/vbabutton.obj \
+-                $(SLO)$/vbalabel.obj \
+-                $(SLO)$/vbatextbox.obj \
+                 $(SLO)$/vbatextboxshape.obj \
+-                $(SLO)$/vbaradiobutton.obj \
+-                $(SLO)$/vbalistbox.obj \
+-		$(SLO)$/vbalistcontrolhelper.obj \
+-                $(SLO)$/vbapropvalue.obj \
+                 $(SLO)$/vbapane.obj \
+-                $(SLO)$/vbashape.obj \
+-                $(SLO)$/vbacolorformat.obj \
+-                $(SLO)$/vbashapes.obj \
+-                $(SLO)$/vbalineformat.obj \
+-                $(SLO)$/vbafillformat.obj \
+-                $(SLO)$/vbapictureformat.obj \
+-                $(SLO)$/vbashaperange.obj \
+                 $(SLO)$/vbatextframe.obj \
+                 $(SLO)$/vbacharttitle.obj \
+                 $(SLO)$/vbacharts.obj \
+@@ -116,25 +99,18 @@ SLOFILES= \
+                 $(SLO)$/vbastyle.obj \
+                 $(SLO)$/vbastyles.obj \
+                 $(SLO)$/vbaassistant.obj \
+-                $(SLO)$/vbauserform.obj \
+-                $(SLO)$/vbacheckbox.obj \
+-                $(SLO)$/vbatogglebutton.obj \
+-                $(SLO)$/vbaframe.obj \
+-                $(SLO)$/vbascrollbar.obj \
+-                $(SLO)$/vbaprogressbar.obj \
+-				$(SLO)$/vbamultipage.obj \
+-				$(SLO)$/vbapages.obj \
+-                $(SLO)$/vbacommandbarcontrol.obj \
+-                $(SLO)$/vbacommandbarcontrols.obj \
+-                $(SLO)$/vbacommandbar.obj \
+-                $(SLO)$/vbacommandbars.obj \
+ 		        $(SLO)$/vbahyperlink.obj \
+         		$(SLO)$/vbapagesetup.obj \
+ 		        $(SLO)$/vbapagebreak.obj \
+         		$(SLO)$/vbapagebreaks.obj \
+-		        $(SLO)$/vbaspinbutton.obj \
+-		        $(SLO)$/vbaimage.obj \
+-				$(SLO)$/service.obj
++				$(SLO)$/service.obj \
++        $(SLO)$/vbaeventshelper.obj \
++        $(SLO)$/vbamenubar.obj  \
++        $(SLO)$/vbamenubars.obj \
++        $(SLO)$/vbamenu.obj \
++        $(SLO)$/vbamenus.obj \
++        $(SLO)$/vbamenuitem.obj \
++        $(SLO)$/vbamenuitems.obj \
+ 
+ # --- Targets ------------------------------------------------------
+ 
+Index: sc/source/ui/vba/vbamenubar.cxx
+===================================================================
+--- sc/source/ui/vba/vbamenubar.cxx	(revision 0)
++++ sc/source/ui/vba/vbamenubar.cxx	(revision 276288)
+@@ -0,0 +1,74 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbamenubar.hxx" 
++#include "vbamenus.hxx"
++#include <ooo/vba/XCommandBarControls.hpp>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++ScVbaMenuBar::ScVbaMenuBar( const uno::Reference< ov::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBar >& xCommandBar ) throw( uno::RuntimeException ) : MenuBar_BASE( xParent, xContext ), m_xCommandBar( xCommandBar )
++{
++}
++
++uno::Any SAL_CALL 
++ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    uno::Reference< XCommandBarControls > xCommandBarControls( m_xCommandBar->Controls( uno::Any() ), uno::UNO_QUERY_THROW );
++    uno::Reference< excel::XMenus > xMenus( new ScVbaMenus( this, mxContext, xCommandBarControls ) );
++    if( aIndex.hasValue() )
++    {
++        return xMenus->Item( aIndex, uno::Any() );
++    }
++    return uno::makeAny( xMenus );
++}
++
++rtl::OUString& 
++ScVbaMenuBar::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBar") );
++	return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++ScVbaMenuBar::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuBar" ) );
++	}
++	return aServiceNames;
++}
+Index: sc/source/ui/vba/vbapagesetup.cxx
+===================================================================
+--- sc/source/ui/vba/vbapagesetup.cxx	(revision 276159)
++++ sc/source/ui/vba/vbapagesetup.cxx	(revision 276288)
+@@ -31,6 +31,7 @@
+ #include "cellsuno.hxx"
+ #include "convuno.hxx"
+ #include "rangelst.hxx"
++#include "excelvbahelper.hxx"
+ #include <com/sun/star/sheet/XPrintAreas.hpp>
+ #include <com/sun/star/sheet/XHeaderFooterContent.hpp>
+ #include <com/sun/star/text/XText.hpp>
+@@ -52,10 +53,10 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Referenc
+ 				const uno::Reference< uno::XComponentContext >& xContext,
+ 				const uno::Reference< sheet::XSpreadsheet >& xSheet,
+ 				const uno::Reference< frame::XModel >& xModel) throw (uno::RuntimeException):
+-	   	ScVbaPageSetup_BASE( xParent, xContext ),
+-		mxSheet( xSheet ), mxModel( xModel )
++	   	ScVbaPageSetup_BASE( xParent, xContext ), mxSheet( xSheet )
+ {
+     // query for current page style
++    mxModel.set( xModel, uno::UNO_QUERY_THROW );
+     uno::Reference< beans::XPropertySet > xSheetProps( mxSheet, uno::UNO_QUERY_THROW );
+     uno::Any aValue = xSheetProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageStyle" )));
+     rtl::OUString aStyleName;
+@@ -65,6 +66,8 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Referenc
+     uno::Reference< container::XNameAccess > xStyleFamilies = xStyleFamiliesSup->getStyleFamilies();
+     uno::Reference< container::XNameAccess > xPageStyle( xStyleFamilies->getByName(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles"))), uno::UNO_QUERY_THROW );
+     mxPageProps.set( xPageStyle->getByName(aStyleName), uno::UNO_QUERY_THROW );
++    mnOrientLandscape = excel::XlPageOrientation::xlLandscape;
++    mnOrientPortrait = excel::XlPageOrientation::xlPortrait;
+ }		
+ 
+ rtl::OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException)
+@@ -85,7 +88,7 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getPrintAre
+ 			ScUnoConversion::FillScRange( aRange, aSeq[i] );
+ 			aRangeList.Append( aRange );
+ 		}
+-		ScDocument* pDoc = getDocShell( mxModel )->GetDocument();
++		ScDocument* pDoc = excel::getDocShell( mxModel )->GetDocument();
+ 		aRangeList.Format( aPrintArea, nFlags, pDoc, formula::FormulaGrammar::CONV_XL_A1, ','  );
+     }
+     
+@@ -106,7 +109,7 @@ void SAL_CALL ScVbaPageSetup::setPrintArea( const
+     {
+ 		ScRangeList aCellRanges;
+ 		ScRange aRange;
+-		if( getScRangeListForAddress( rAreas, getDocShell( mxModel ) , aRange, aCellRanges ) ) 
++		if( getScRangeListForAddress( rAreas, excel::getDocShell( mxModel ) , aRange, aCellRanges ) ) 
+ 		{
+ 			uno::Sequence< table::CellRangeAddress > aSeq( aCellRanges.Count() );
+ 			USHORT i=0;
+@@ -121,292 +124,26 @@ void SAL_CALL ScVbaPageSetup::setPrintArea( const
+     }
+ }
+ 
+-double SAL_CALL ScVbaPageSetup::getTopMargin() throw (css::uno::RuntimeException)
+-{
+-    sal_Bool headerOn = sal_False;
+-    sal_Int32 topMargin = 0;
+-    sal_Int32 headerHeight = 0;
+-
+-    try
+-    {
+-        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")));
+-        aValue >>= headerOn;
+-
+-        aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")));
+-        aValue >>= topMargin;
+-
+-        if( headerOn )
+-        {
+-            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")));
+-            aValue >>= headerHeight;
+-            topMargin += headerHeight;
+-        }
+-    }
+-    catch( uno::Exception& )
+-    {
+-    }
+-    
+-    return Millimeter::getInPoints( topMargin );
+-}
+-
+-void SAL_CALL ScVbaPageSetup::setTopMargin( double margin ) throw (css::uno::RuntimeException)
+-{
+-    sal_Int32 topMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
+-    sal_Bool headerOn = sal_False;
+-    sal_Int32 headerHeight = 0;
+-
+-    try
+-    {
+-        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")));
+-        aValue >>= headerOn;
+-        
+-        if( headerOn )
+-        {
+-            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")));
+-            aValue >>= headerHeight;
+-            topMargin -= headerHeight;
+-        }
+-
+-        aValue <<= topMargin;
+-        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")), aValue );
+-    }
+-    catch( uno::Exception& )
+-    {
+-    }
+-}
+-
+-double SAL_CALL ScVbaPageSetup::getBottomMargin() throw (css::uno::RuntimeException)
+-{
+-    sal_Bool footerOn = sal_False;
+-    sal_Int32 bottomMargin = 0;
+-    sal_Int32 footerHeight = 0;
+-
+-    try
+-    {
+-        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")));
+-        aValue >>= footerOn;
+-
+-        aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")));
+-        aValue >>= bottomMargin;
+-
+-        if( footerOn )
+-        {
+-            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight")));
+-            aValue >>= footerHeight;
+-            bottomMargin += footerHeight;
+-        }
+-    }
+-    catch( uno::Exception& )
+-    {
+-    }
+-    
+-    return Millimeter::getInPoints( bottomMargin );
+-}
+-
+-void SAL_CALL ScVbaPageSetup::setBottomMargin( double margin ) throw (css::uno::RuntimeException)
+-{
+-    sal_Int32 bottomMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
+-    sal_Bool footerOn = sal_False;
+-    sal_Int32 footerHeight = 0;
+-
+-    try
+-    {
+-        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")));
+-        aValue >>= footerOn;
+-        
+-        if( footerOn )
+-        {
+-            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight")));
+-            aValue >>= footerHeight;
+-            bottomMargin -= footerHeight;
+-        }
+-
+-        aValue <<= bottomMargin;
+-        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), aValue );
+-    }
+-    catch( uno::Exception& )
+-    {
+-    }
+-}
+-
+-double SAL_CALL ScVbaPageSetup::getRightMargin() throw (css::uno::RuntimeException)
+-{
+-    sal_Int32 rightMargin = 0;
+-    try
+-    {
+-        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin")));
+-        aValue >>= rightMargin;
+-    }
+-    catch( uno::Exception& )
+-    {
+-    }
+-    
+-    return Millimeter::getInPoints( rightMargin );;
+-}
+-
+-void SAL_CALL ScVbaPageSetup::setRightMargin( double margin ) throw (css::uno::RuntimeException)
+-{
+-    sal_Int32 rightMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
+-    try
+-    {
+-        uno::Any aValue;
+-        aValue <<= rightMargin;
+-        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin")), aValue );
+-    }
+-    catch( uno::Exception& )
+-    {
+-    }
+-
+-}
+-
+-double SAL_CALL ScVbaPageSetup::getLeftMargin() throw (css::uno::RuntimeException)
+-{
+-    sal_Int32 leftMargin = 0;
+-    try
+-    {
+-        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin")));
+-        aValue >>= leftMargin;
+-    }
+-    catch( uno::Exception& )
+-    {
+-    }
+-    
+-    return Millimeter::getInPoints( leftMargin );;
+-}
+-
+-void SAL_CALL ScVbaPageSetup::setLeftMargin( double margin ) throw (css::uno::RuntimeException)
+-{
+-    sal_Int32 leftMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
+-    try
+-    {
+-        uno::Any aValue;
+-        aValue <<= leftMargin;
+-        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin")), aValue );
+-    }
+-    catch( uno::Exception& )
+-    {
+-    }
+-}
+-
+ double SAL_CALL ScVbaPageSetup::getHeaderMargin() throw (css::uno::RuntimeException)
+ {
+-    sal_Int32 headerMargin = 0;
+-    try
+-    {
+-        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")));
+-        aValue >>= headerMargin;
++    return VbaPageSetupBase::getHeaderMargin();
+     }
+-    catch( uno::Exception& )
+-    {
+-    }
+     
+-    return Millimeter::getInPoints( headerMargin );;
+-}
+-
+ void SAL_CALL ScVbaPageSetup::setHeaderMargin( double margin ) throw (css::uno::RuntimeException)
+ {
+-    sal_Int32 headerMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
+-    try
+-    {
+-        uno::Any aValue;
+-        aValue <<= headerMargin;
+-        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")), aValue );
++    VbaPageSetupBase::setHeaderMargin( margin );
+     }
+-    catch( uno::Exception& )
+-    {
+-    }
+-}
+ 
+ double SAL_CALL ScVbaPageSetup::getFooterMargin() throw (css::uno::RuntimeException)
+ {
+-    sal_Int32 footerMargin = 0;
+-    try
+-    {
+-        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")));
+-        aValue >>= footerMargin;
++    return VbaPageSetupBase::getFooterMargin();
+     }
+-    catch( uno::Exception& )
+-    {
+-    }
+     
+-    return Millimeter::getInPoints( footerMargin );;
+-}
+-
+ void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) throw (css::uno::RuntimeException)
+ {
+-    sal_Int32 footerMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
+-    try
+-    {
+-        uno::Any aValue;
+-        aValue <<= footerMargin;
+-        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), aValue );
++    VbaPageSetupBase::setFooterMargin( margin );
+     }
+-    catch( uno::Exception& )
+-    {
+-    }
+-}
+ 
+-sal_Int32 SAL_CALL ScVbaPageSetup::getOrientation() throw (css::uno::RuntimeException)
+-{
+-    sal_Int32 orientation = excel::XlPageOrientation::xlPortrait;
+-    try
+-    {
+-        sal_Bool isLandscape = sal_False;
+-        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")));
+-        aValue >>= isLandscape;
+-
+-        if( isLandscape )
+-        {
+-            orientation = excel::XlPageOrientation::xlLandscape;
+-        }
+-    }
+-    catch( uno::Exception& )
+-    {
+-    }
+-    return orientation;
+-}
+-
+-void SAL_CALL ScVbaPageSetup::setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException)
+-{
+-    if( ( orientation != excel::XlPageOrientation::xlPortrait ) &&
+-        ( orientation != excel::XlPageOrientation::xlLandscape ) )
+-    {
+-        DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
+-    }
+-
+-    try
+-    {
+-        sal_Bool isLandscape = sal_False;
+-        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")));
+-        aValue >>= isLandscape;
+-
+-        sal_Bool switchOrientation = sal_False;
+-        if(( isLandscape && orientation != excel::XlPageOrientation::xlLandscape ) || 
+-            ( !isLandscape && orientation != excel::XlPageOrientation::xlPortrait ))
+-        {
+-            switchOrientation = sal_True;
+-        }
+-
+-        if( switchOrientation )
+-        {
+-            aValue <<= !isLandscape;
+-            uno::Any aHeight = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height")));
+-            uno::Any aWidth = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width")));
+-            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")), aValue );
+-            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width")),  aHeight );
+-            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height")), aWidth );
+-        }
+-
+-        if( isLandscape )
+-        {
+-            orientation = excel::XlPageOrientation::xlLandscape;
+-        }
+-    }
+-    catch( uno::Exception& )
+-    {
+-    }
+-}
+-
+ uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() throw (css::uno::RuntimeException)
+ {
+     return mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleToPagesY")));
+Index: sc/source/ui/vba/vbarange.hxx
+===================================================================
+--- sc/source/ui/vba/vbarange.hxx	(revision 276159)
++++ sc/source/ui/vba/vbarange.hxx	(revision 276288)
+@@ -53,12 +53,15 @@
+ #include <com/sun/star/sheet/XSpreadsheet.hpp>
+ #include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
+ 
+-//#include "vbahelperinterface.hxx"
++//#include <vbahelper/vbahelperinterface.hxx>
+ #include "vbaformat.hxx"
++#include <formula/grammar.hxx>
+ 
+ class ScTableSheetsObj;
+ class ScCellRangesBase;
+ class ScCellRangeObj;
++class ScDocShell;
++class ScDocument;
+ 
+ //typedef InheritedHelperInterfaceImpl1< ov::excel::XRange >  ScVbaRange_BASE;
+ typedef ScVbaFormat< ov::excel::XRange > ScVbaRange_BASE;
+@@ -274,6 +277,8 @@ class ScVbaRange : public ScVbaRange_BASE
+ 	static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException);
+ 	virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException );  
++	// XErrorQuery
++	virtual ::sal_Bool SAL_CALL hasError(  ) throw (css::uno::RuntimeException);
+ 	// XHelperInterface
+ 	virtual rtl::OUString& getServiceImplName();
+ 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+Index: sc/source/ui/vba/vbaworkbook.hxx
+===================================================================
+--- sc/source/ui/vba/vbaworkbook.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaworkbook.hxx	(revision 276288)
+@@ -32,21 +32,20 @@
+ 
+ #include <com/sun/star/frame/XModel.hpp>
+ #include <ooo/vba/excel/XWorkbook.hpp>
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbadocumentbase.hxx>
+ 
+ class ScModelObj;
+ 
+-typedef InheritedHelperInterfaceImpl1< ov::excel::XWorkbook > ScVbaWorkbook_BASE;
++typedef cppu::ImplInheritanceHelper1< VbaDocumentBase, ov::excel::XWorkbook > ScVbaWorkbook_BASE;
+ 
+ class ScVbaWorkbook : public ScVbaWorkbook_BASE
+ {
+-	css::uno::Reference< css::frame::XModel > mxModel;
+ 	static css::uno::Sequence< sal_Int32 > ColorData;
+ 	void initColorData( const css::uno::Sequence< sal_Int32 >& sColors );
+ 	void init();
+ protected:
+ 
+-	virtual css::uno::Reference< css::frame::XModel >  getModel() { return mxModel; }
+ 	ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
+ public:
+ 	ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
+@@ -55,24 +54,15 @@ class ScVbaWorkbook : public ScVbaWorkbook_BASE
+ 	virtual ~ScVbaWorkbook() {}
+ 
+     // Attributes
+-	virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
+-	virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
+-	virtual ::rtl::OUString SAL_CALL getFullName() throw (css::uno::RuntimeException);
+ 	virtual ::sal_Bool SAL_CALL getProtectStructure() throw (css::uno::RuntimeException);
+ 	virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
+-	virtual sal_Bool SAL_CALL getSaved() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException);
++	virtual ::sal_Bool SAL_CALL getPrecisionAsDisplayed() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (css::uno::RuntimeException);
+ 
+ 	// Methods
+ 	virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL Close( const css::uno::Any &bSaveChanges,
+-								 const css::uno::Any &aFileName,
+-								 const css::uno::Any &bRouteWorkbook ) throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL Save() throw (css::uno::RuntimeException);
+ 	virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
+     // Amelia Wang
+     virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+Index: sc/source/ui/vba/service.cxx
+===================================================================
+--- sc/source/ui/vba/service.cxx	(revision 276159)
++++ sc/source/ui/vba/service.cxx	(revision 276288)
+@@ -61,14 +61,22 @@ namespace globals
+ {
+ extern sdecl::ServiceDecl const serviceDecl;
+ }
+-namespace  userform
++namespace hyperlink 
+ {
+ extern sdecl::ServiceDecl const serviceDecl;
+ }
+-namespace hyperlink 
++namespace application 
+ {
+ extern sdecl::ServiceDecl const serviceDecl;
+ }
++namespace vbaeventshelper
++{
++extern sdecl::ServiceDecl const serviceDecl;
++}
++namespace textframe 
++{
++extern sdecl::ServiceDecl const serviceDecl;
++}
+ 
+ extern "C"
+ {
+@@ -83,10 +91,10 @@ extern "C"
+         lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
+     {
+ 		OSL_TRACE("In component_writeInfo");
+-
++#if 0
+ 	// Component registration
+         if ( component_writeInfoHelper( pServiceManager, pRegistryKey, 
+-		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl ) )
++		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) )
+ 		{
+ 			// Singleton registration
+ 			try
+@@ -106,6 +114,12 @@ extern "C"
+ 			}
+ 		}
+ 		return sal_False;
++#else
++	// Component registration
++        return component_writeInfoHelper( pServiceManager, pRegistryKey, 
++		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl, textframe::serviceDecl );
++#endif
++	
+     }
+ 
+     SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( 
+@@ -114,7 +128,9 @@ extern "C"
+     {
+ 		OSL_TRACE("In component_getFactory for %s", pImplName );
+ 	void* pRet =  component_getFactoryHelper(
+-        	pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl );
++        	pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl );
++    if( !pRet )
++        pRet = component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl, textframe::serviceDecl );
+ 	OSL_TRACE("Ret is 0x%x", pRet);
+ 	return pRet;
+     }
+Index: sc/source/ui/vba/vbanames.hxx
+===================================================================
+--- sc/source/ui/vba/vbanames.hxx	(revision 276159)
++++ sc/source/ui/vba/vbanames.hxx	(revision 276288)
+@@ -34,8 +34,11 @@
+ #include <ooo/vba/XCollection.hpp>
+ #include <com/sun/star/container/XEnumerationAccess.hpp>
+ #include <com/sun/star/sheet/XNamedRanges.hpp>
+-#include "vbacollectionimpl.hxx"
++#include <vbahelper/vbacollectionimpl.hxx>
+ 
++class ScDocument;
++class ScDocShell;
++
+ typedef CollTestImplHelper< ov::excel::XNames > ScVbaNames_BASE;
+ 
+ class ScVbaNames : public ScVbaNames_BASE
+Index: sc/source/ui/vba/vbarange.cxx.pathched
+===================================================================
+--- sc/source/ui/vba/vbarange.cxx.pathched	(revision 0)
++++ sc/source/ui/vba/vbarange.cxx.pathched	(revision 276288)
+@@ -0,0 +1,5441 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbarange.cxx,v $
++ * $Revision: 1.8.30.2 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <vbahelper/helperdecl.hxx>
++
++#include <comphelper/unwrapargs.hxx>
++#include <comphelper/processfactory.hxx>
++#include <sfx2/objsh.hxx>
++
++#include <com/sun/star/script/ArrayWrapper.hpp>
++#include <com/sun/star/sheet/XDatabaseRange.hpp>
++#include <com/sun/star/sheet/XDatabaseRanges.hpp>
++#include <com/sun/star/sheet/XGoalSeek.hpp>
++#include <com/sun/star/sheet/XSheetOperation.hpp>
++#include <com/sun/star/sheet/CellFlags.hpp>
++#include <com/sun/star/table/XColumnRowRange.hpp>
++#include <com/sun/star/sheet/XCellAddressable.hpp>
++#include <com/sun/star/table/CellContentType.hpp>
++#include <com/sun/star/sheet/XCellSeries.hpp>
++#include <com/sun/star/text/XTextRange.hpp>
++#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
++#include <com/sun/star/table/CellRangeAddress.hpp>
++#include <com/sun/star/table/CellAddress.hpp>
++#include <com/sun/star/sheet/XSpreadsheetView.hpp>
++#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
++#include <com/sun/star/sheet/XSheetCellRange.hpp>
++#include <com/sun/star/sheet/XSpreadsheet.hpp>
++#include <com/sun/star/sheet/XSheetCellCursor.hpp>
++#include <com/sun/star/sheet/XArrayFormulaRange.hpp>
++#include <com/sun/star/sheet/XNamedRange.hpp>
++#include <com/sun/star/sheet/XPrintAreas.hpp>
++#include <com/sun/star/sheet/XCellRangesQuery.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/sheet/XFunctionAccess.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/view/XSelectionSupplier.hpp>
++#include <com/sun/star/table/XCellCursor.hpp>
++#include <com/sun/star/table/XTableRows.hpp>
++#include <com/sun/star/table/XTableColumns.hpp>
++#include <com/sun/star/table/TableSortField.hpp>
++#include <com/sun/star/util/XMergeable.hpp>
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <com/sun/star/lang/XMultiComponentFactory.hpp>
++#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
++#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
++#include <com/sun/star/util/XNumberFormats.hpp>
++#include <com/sun/star/util/NumberFormat.hpp>
++#include <com/sun/star/util/XNumberFormatTypes.hpp>
++#include <com/sun/star/util/XReplaceable.hpp>
++#include <com/sun/star/util/XSortable.hpp>
++#include <com/sun/star/sheet/XCellRangeMovement.hpp>
++#include <com/sun/star/sheet/XCellRangeData.hpp>
++#include <com/sun/star/sheet/FormulaResult.hpp>
++#include <com/sun/star/sheet/FilterOperator2.hpp>
++#include <com/sun/star/sheet/TableFilterField.hpp>
++#include <com/sun/star/sheet/TableFilterField2.hpp>
++#include <com/sun/star/sheet/XSheetFilterDescriptor2.hpp>
++#include <com/sun/star/sheet/XSheetFilterable.hpp>
++#include <com/sun/star/sheet/FilterConnection.hpp>
++#include <com/sun/star/util/CellProtection.hpp>
++
++#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
++#include <com/sun/star/awt/XDevice.hpp>
++
++//#include <com/sun/star/sheet/CellDeleteMode.hpp>
++#include <com/sun/star/sheet/XCellRangeMovement.hpp>
++#include <com/sun/star/sheet/XSubTotalCalculatable.hpp>
++#include <com/sun/star/sheet/XSubTotalDescriptor.hpp>
++#include <com/sun/star/sheet/GeneralFunction.hdl>
++
++#include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
++#include <com/sun/star/sheet/XSheetAnnotations.hpp>
++#include <ooo/vba/excel/XlPasteSpecialOperation.hpp>
++#include <ooo/vba/excel/XlPasteType.hpp>
++#include <ooo/vba/excel/Constants.hpp>
++#include <ooo/vba/excel/XlFindLookIn.hpp>
++#include <ooo/vba/excel/XlLookAt.hpp>
++#include <ooo/vba/excel/XlSearchOrder.hpp>
++#include <ooo/vba/excel/XlSortOrder.hpp>
++#include <ooo/vba/excel/XlYesNoGuess.hpp>
++#include <ooo/vba/excel/XlSortOrientation.hpp>
++#include <ooo/vba/excel/XlSortMethod.hpp>
++#include <ooo/vba/excel/XlDirection.hpp>
++#include <ooo/vba/excel/XlSortDataOption.hpp>
++#include <ooo/vba/excel/XlDeleteShiftDirection.hpp>
++#include <ooo/vba/excel/XlInsertShiftDirection.hpp>
++#include <ooo/vba/excel/XlReferenceStyle.hpp>
++#include <ooo/vba/excel/XlBordersIndex.hpp>
++#include <ooo/vba/excel/XlPageBreak.hpp>
++#include <ooo/vba/excel/XlAutoFilterOperator.hpp>
++#include <ooo/vba/excel/XlAutoFillType.hpp>
++#include <ooo/vba/excel/XlTextParsingType.hpp>
++#include <ooo/vba/excel/XlTextQualifier.hpp>
++#include <ooo/vba/excel/XlCellType.hpp>
++#include <ooo/vba/excel/XlSpecialCellsValue.hpp>
++#include <ooo/vba/excel/XlConsolidationFunction.hpp>
++#include <ooo/vba/excel/XlSearchDirection.hpp>
++
++#include <scitems.hxx>
++#include <svx/srchitem.hxx>
++#include <cellsuno.hxx>
++#include <dbcolect.hxx>
++#include "docfunc.hxx"
++
++#include <sfx2/dispatch.hxx>
++#include <sfx2/app.hxx>
++#include <sfx2/bindings.hxx>
++#include <sfx2/request.hxx>
++#include <sfx2/viewfrm.hxx>
++#include <sfx2/itemwrapper.hxx>
++#include <sc.hrc>
++#include <globstr.hrc>
++#include <unonames.hxx>
++
++#include "vbarange.hxx"
++#include "vbafont.hxx"
++#include "vbacomment.hxx"
++#include "vbainterior.hxx"
++#include "vbacharacters.hxx"
++#include "vbaborders.hxx"
++#include "vbaworksheet.hxx"
++#include "vbavalidation.hxx"
++
++#include "tabvwsh.hxx"
++#include "rangelst.hxx"
++#include "convuno.hxx"
++#include "compiler.hxx"
++#include "attrib.hxx"
++#include "undodat.hxx"
++#include "dbdocfun.hxx"
++#include "patattr.hxx"
++#include "olinetab.hxx"
++#include <comphelper/anytostring.hxx>
++
++#include <global.hxx>
++
++#include "vbaglobals.hxx"
++#include "vbastyle.hxx"
++#include <vector>
++#include <vbahelper/vbacollectionimpl.hxx>
++// begin test includes
++#include <com/sun/star/sheet/FunctionArgument.hpp>
++// end test includes
++
++#include <ooo/vba/excel/Range.hpp>
++#include <com/sun/star/bridge/oleautomation/Date.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++using ::std::vector;
++
++//    * 1 point = 1/72 inch = 20 twips
++//    * 1 inch = 72 points = 1440 twips
++//    * 1 cm = 567 twips
++double lcl_hmmToPoints( double nVal ) { return ( (double)((nVal /1000 ) * 567 ) / 20 ); }
++
++static const sal_Int16 supportedIndexTable[] = {  excel::XlBordersIndex::xlEdgeLeft, excel::XlBordersIndex::xlEdgeTop, excel::XlBordersIndex::xlEdgeBottom, excel::XlBordersIndex::xlEdgeRight, excel::XlBordersIndex::xlDiagonalDown, excel::XlBordersIndex::xlDiagonalUp, excel::XlBordersIndex::xlInsideVertical, excel::XlBordersIndex::xlInsideHorizontal };
++
++USHORT lcl_pointsToTwips( double nVal ) 
++{ 
++	nVal = nVal * static_cast<double>(20);
++	short nTwips = static_cast<short>(nVal);
++	return nTwips;
++}
++double lcl_TwipsToPoints( USHORT nVal ) 
++{ 
++	double nPoints = nVal;
++	return nPoints / 20; 
++}
++
++double lcl_Round2DecPlaces( double nVal )
++{
++	nVal  = (nVal * (double)100);
++	long tmp = static_cast<long>(nVal);
++	if ( ( ( nVal - tmp ) >= 0.5 ) )
++		++tmp;
++	nVal = tmp;
++	nVal = nVal/100;
++	return nVal;
++}
++
++uno::Any lcl_makeRange( uno::Reference< uno::XComponentContext >& xContext, const uno::Any aAny, bool bIsRows, bool bIsColumns )
++{
++	uno::Reference< table::XCellRange > xCellRange( aAny, uno::UNO_QUERY_THROW );
++	// #FIXME need proper (WorkSheet) parent
++	return uno::makeAny( uno::Reference< excel::XRange >( new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xCellRange, bIsRows, bIsColumns ) ) );
++}
++
++uno::Reference< excel::XRange > lcl_makeXRangeFromSheetCellRanges( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRanges >& xLocSheetCellRanges, ScDocShell* pDoc )
++{
++	uno::Reference< excel::XRange > xRange;
++	uno::Sequence< table::CellRangeAddress  > sAddresses = xLocSheetCellRanges->getRangeAddresses();
++	ScRangeList aCellRanges;
++	sal_Int32 nLen = sAddresses.getLength();
++	if ( nLen )
++       	{ 
++	for ( sal_Int32 index = 0; index < nLen; ++index )
++	{
++		ScRange refRange;
++		ScUnoConversion::FillScRange( refRange, sAddresses[ index ] );
++		aCellRanges.Append( refRange );
++	}
++	// Single range
++	if ( aCellRanges.First() == aCellRanges.Last() )
++	{
++		uno::Reference< table::XCellRange > xTmpRange( new ScCellRangeObj( pDoc, *aCellRanges.First() ) );
++		// #FIXME need proper (WorkSheet) parent
++		xRange = new ScVbaRange( xParent, xContext, xTmpRange );
++	}
++	else
++	{
++		uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pDoc, aCellRanges ) );
++		// #FIXME need proper (WorkSheet) parent
++		xRange = new ScVbaRange( xParent, xContext, xRanges );
++	}
++	}
++	return xRange;
++}
++
++ScCellRangeObj*  ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException )
++{
++	uno::Reference< uno::XInterface > xIf;
++	if ( mxRanges.is() )
++		xIf.set( mxRanges, uno::UNO_QUERY_THROW );
++	else 
++		xIf.set( mxRange, uno::UNO_QUERY_THROW );
++	ScCellRangeObj* pUnoCellRange = dynamic_cast< ScCellRangeObj* >( xIf.get() );
++	return pUnoCellRange;
++}
++
++SfxItemSet*  ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException )
++{
++	ScCellRangeObj* pUnoCellRange = getCellRangeObj();
++	SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
++	if ( !pDataSet )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for range" ) ), uno::Reference< uno::XInterface >() );
++	return pDataSet;	
++}
++
++class SingleRangeEnumeration : public EnumerationHelper_BASE
++{
++	uno::Reference< table::XCellRange > m_xRange;
++	uno::Reference< uno::XComponentContext > mxContext;
++	bool bHasMore;
++public:
++
++	SingleRangeEnumeration( const uno::Reference< css::uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) : m_xRange( xRange ), mxContext( xContext ), bHasMore( true ) { }
++	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException) { return bHasMore; }
++	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
++	{
++		if ( !bHasMore )
++			throw container::NoSuchElementException();
++		bHasMore = false;
++		return uno::makeAny( m_xRange );
++	}
++};
++
++// very simple class to pass to ScVbaCollectionBaseImpl containing
++// just one item
++typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > SingleRange_BASE;
++
++class SingleRangeIndexAccess : public SingleRange_BASE
++{
++private:
++	uno::Reference< table::XCellRange > m_xRange;
++	uno::Reference< uno::XComponentContext > mxContext;
++	SingleRangeIndexAccess(); // not defined
++public:
++	SingleRangeIndexAccess( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ):m_xRange( xRange ), mxContext( xContext ) {}
++	// XIndexAccess
++	virtual ::sal_Int32 SAL_CALL getCount() throw (::uno::RuntimeException) { return 1; }
++	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
++	{ 
++		if ( Index != 0 )
++			throw lang::IndexOutOfBoundsException();
++		return uno::makeAny( m_xRange ); 
++	}
++        // XElementAccess
++        virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException){ return table::XCellRange::static_type(0); }
++ 
++        virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException) { return sal_True; }
++	// XEnumerationAccess
++	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException) { return new SingleRangeEnumeration( mxContext, m_xRange ); }
++
++};
++
++
++
++class RangesEnumerationImpl : public EnumerationHelperImpl
++{
++	bool mbIsRows;
++	bool mbIsColumns;
++public:
++
++	RangesEnumerationImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, bool bIsRows, bool bIsColumns ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {}
++	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
++	{ 
++		return lcl_makeRange( m_xContext, m_xEnumeration->nextElement(), mbIsRows, mbIsColumns );
++	}
++};
++
++
++class ScVbaRangeAreas : public ScVbaCollectionBaseImpl
++{
++	bool mbIsRows;
++	bool mbIsColumns;
++public:
++	ScVbaRangeAreas( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, bool bIsRows, bool bIsColumns ) : ScVbaCollectionBaseImpl( uno::Reference< XHelperInterface >(), xContext, xIndexAccess ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {}
++
++	// XEnumerationAccess
++	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException);
++
++	// XElementAccess
++	virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException){ return excel::XRange::static_type(0); }
++
++	virtual uno::Any createCollectionObject( const uno::Any& aSource );
++
++	virtual rtl::OUString& getServiceImplName() { static rtl::OUString sDummy; return sDummy; }
++
++	virtual uno::Sequence< rtl::OUString > getServiceNames() { return uno::Sequence< rtl::OUString >(); } 
++
++}; 
++
++uno::Reference< container::XEnumeration > SAL_CALL 
++ScVbaRangeAreas::createEnumeration() throw (uno::RuntimeException)
++{
++	uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
++	return new RangesEnumerationImpl( mxContext, xEnumAccess->createEnumeration(), mbIsRows, mbIsColumns );
++
++}
++
++uno::Any 
++ScVbaRangeAreas::createCollectionObject( const uno::Any& aSource )
++{
++	return lcl_makeRange( mxContext, aSource, mbIsRows, mbIsColumns );
++}
++
++// assume that xIf is infact a ScCellRangesBase
++ScDocShell*
++getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException )
++{
++	ScCellRangesBase* pUno= dynamic_cast< ScCellRangesBase* >( xIf.get() );
++	if ( !pUno )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying uno range object" ) ), uno::Reference< uno::XInterface >()  );
++	return pUno->GetDocShell();
++}
++
++ScDocShell* 
++getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
++{
++	// need the ScCellRangesBase to get docshell
++	uno::Reference< uno::XInterface > xIf( xRange, uno::UNO_QUERY_THROW );
++	return getDocShellFromIf(xIf );
++}
++
++uno::Reference< frame::XModel > getModelFromXIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException )
++{
++	ScDocShell* pDocShell = getDocShellFromIf(xIf );
++	return pDocShell->GetModel();
++}
++
++uno::Reference< frame::XModel > getModelFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
++{
++	uno::Reference< uno::XInterface > xIf( xRange, uno::UNO_QUERY_THROW );
++	return getModelFromXIf( xIf );
++}
++
++ScDocument* 
++getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange )
++{
++	ScDocShell* pDocShell = getDocShellFromRange( xRange );
++	if ( !pDocShell )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying docshell from uno range object" ) ), uno::Reference< uno::XInterface >() );
++	ScDocument* pDoc = pDocShell->GetDocument();
++	return pDoc;
++}
++
++
++ScDocument* 
++ScVbaRange::getScDocument()
++{
++	if ( mxRanges.is() )
++	{
++		uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW );
++		uno::Reference< table::XCellRange > xRange( xIndex->getByIndex( 0 ), uno::UNO_QUERY_THROW );
++		return getDocumentFromRange( xRange );
++	}
++	return getDocumentFromRange( mxRange );
++}
++
++ScDocShell* 
++ScVbaRange::getScDocShell()
++{
++	if ( mxRanges.is() )
++	{
++		uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW );
++		uno::Reference< table::XCellRange > xRange( xIndex->getByIndex( 0 ), uno::UNO_QUERY_THROW );
++		return getDocShellFromRange( xRange );
++	}
++	return getDocShellFromRange( mxRange );
++}
++
++class NumFormatHelper
++{
++	uno::Reference< util::XNumberFormatsSupplier > mxSupplier;
++	uno::Reference< beans::XPropertySet > mxRangeProps;
++	uno::Reference< util::XNumberFormats > mxFormats;
++public:
++	NumFormatHelper( const uno::Reference< table::XCellRange >& xRange )
++	{
++		mxSupplier.set( getModelFromRange( xRange ), uno::UNO_QUERY_THROW );
++		mxRangeProps.set( xRange, uno::UNO_QUERY_THROW);
++		mxFormats = mxSupplier->getNumberFormats();
++	}
++	uno::Reference< beans::XPropertySet > getNumberProps()
++	{	
++		long nIndexKey = 0;
++		uno::Any aValue = mxRangeProps->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberFormat")));
++		aValue >>= nIndexKey;
++
++		if ( mxFormats.is() )
++			return  mxFormats->getByKey( nIndexKey );
++		return	uno::Reference< beans::XPropertySet > ();
++	}
++
++	bool isBooleanType()
++	{
++	
++		if ( getNumberFormat() & util::NumberFormat::LOGICAL )
++			return true;
++		return false;
++	}
++
++	bool isDateType()
++	{
++		sal_Int16 nType = getNumberFormat();
++		if(( nType & util::NumberFormat::DATETIME ))
++		{
++			return true;
++		}
++		return false;
++	}
++	
++	rtl::OUString getNumberFormatString()
++	{
++		uno::Reference< uno::XInterface > xIf( mxRangeProps, uno::UNO_QUERY_THROW );
++		ScCellRangeObj* pUnoCellRange = dynamic_cast<  ScCellRangeObj* >( xIf.get() );
++		if ( pUnoCellRange )
++		{
++			
++			SfxItemSet* pDataSet = 	excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
++			SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, TRUE, NULL);
++			// one of the cells in the range is not like the other ;-)
++			// so return a zero length format to indicate that
++			if ( eState == SFX_ITEM_DONTCARE )
++				return rtl::OUString();
++		}
++		
++	
++		uno::Reference< beans::XPropertySet > xNumberProps( getNumberProps(), uno::UNO_QUERY_THROW );
++		::rtl::OUString aFormatString;
++		uno::Any aString = xNumberProps->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FormatString")));
++		aString >>= aFormatString;
++		return aFormatString;
++	}
++
++	sal_Int16 getNumberFormat()
++	{
++		uno::Reference< beans::XPropertySet > xNumberProps = getNumberProps(); 	
++		sal_Int16 nType = ::comphelper::getINT16(
++        	xNumberProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) );
++		return nType;
++	}
++
++	bool setNumberFormat( const  rtl::OUString& rFormat )
++	{
++		lang::Locale aLocale;
++		uno::Reference< beans::XPropertySet > xNumProps = getNumberProps(); 	
++		xNumProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Locale" ) ) >>= aLocale;
++		sal_Int32 nNewIndex = mxFormats->queryKey(rFormat, aLocale, false );
++		if ( nNewIndex == -1 ) // format not defined
++		{
++			nNewIndex = mxFormats->addNew( rFormat, aLocale );
++		}
++		mxRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberFormat") ), uno::makeAny( nNewIndex ) );				
++		return true;
++	}
++
++	bool setNumberFormat( sal_Int16 nType )
++	{
++		uno::Reference< beans::XPropertySet > xNumberProps = getNumberProps(); 	
++		lang::Locale aLocale;
++		xNumberProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Locale" ) ) >>= aLocale;
++		uno::Reference<util::XNumberFormatTypes> xTypes( mxFormats, uno::UNO_QUERY );
++		if ( xTypes.is() )
++		{
++			sal_Int32 nNewIndex = xTypes->getStandardFormat( nType, aLocale );
++       		mxRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberFormat") ), uno::makeAny( nNewIndex ) );				
++			return true;
++		}
++		return false;
++	}
++
++};
++
++struct CellPos
++{
++	CellPos():m_nRow(-1), m_nCol(-1), m_nArea(0) {};
++	CellPos( sal_Int32 nRow, sal_Int32 nCol, sal_Int32 nArea ):m_nRow(nRow), m_nCol(nCol), m_nArea( nArea ) {};
++sal_Int32 m_nRow;
++sal_Int32 m_nCol;
++sal_Int32 m_nArea;
++};
++
++typedef ::cppu::WeakImplHelper1< container::XEnumeration > CellsEnumeration_BASE;
++typedef ::std::vector< CellPos > vCellPos;
++
++// #FIXME - QUICK
++// we could probably could and should modify CellsEnumeration below
++// to handle rows and columns ( but I do this seperately for now 
++// and.. this class only handles singe areas ( does it have to handle
++// multi area ranges?? ) 
++class ColumnsRowEnumeration: public CellsEnumeration_BASE
++{
++	uno::Reference< uno::XComponentContext > mxContext;
++        uno::Reference< excel::XRange > mxRange;
++	sal_Int32 mMaxElems;
++	sal_Int32 mCurElem;
++        
++public:
++	ColumnsRowEnumeration( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XRange >& xRange, sal_Int32 nElems ) : mxContext( xContext ), mxRange( xRange ), mMaxElems( nElems ), mCurElem( 0 )
++        {
++	}
++
++	virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException){ return mCurElem < mMaxElems; }
++
++	virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++	{
++		if ( !hasMoreElements() )
++			throw container::NoSuchElementException();
++		sal_Int32 vbaIndex = 1 + mCurElem++; 
++		return uno::makeAny( mxRange->Item( uno::makeAny( vbaIndex ), uno::Any() ) ); 
++	}
++};
++
++class CellsEnumeration : public CellsEnumeration_BASE
++{
++	uno::Reference< uno::XComponentContext > mxContext;
++	uno::Reference< XCollection > m_xAreas;
++	vCellPos m_CellPositions;	
++	vCellPos::const_iterator m_it; 
++	uno::Reference< table::XCellRange > getArea( sal_Int32 nVBAIndex ) throw ( uno::RuntimeException )
++	{
++		if ( nVBAIndex < 1 || nVBAIndex > m_xAreas->getCount() )
++			throw uno::RuntimeException();
++		uno::Reference< excel::XRange > xRange( m_xAreas->Item( uno::makeAny(nVBAIndex), uno::Any() ), uno::UNO_QUERY_THROW );
++		ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xRange.get() ); 
++		uno::Reference< table::XCellRange > xCellRange;
++		if ( !pRange )
++			throw uno::RuntimeException();
++		xCellRange.set( pRange->getCellRange(), uno::UNO_QUERY_THROW );;
++		return xCellRange;
++		
++	}
++        void populateArea( sal_Int32 nVBAIndex )
++	{
++		uno::Reference< table::XCellRange > xRange = getArea( nVBAIndex );
++		uno::Reference< table::XColumnRowRange > xColumnRowRange(xRange, uno::UNO_QUERY_THROW );
++		sal_Int32 nRowCount =  xColumnRowRange->getRows()->getCount();
++		sal_Int32 nColCount = xColumnRowRange->getColumns()->getCount();
++		for ( sal_Int32 i=0; i<nRowCount; ++i )
++		{
++			for ( sal_Int32 j=0; j<nColCount; ++j )
++				m_CellPositions.push_back( CellPos( i,j,nVBAIndex ) );
++		}
++	}
++public:
++	CellsEnumeration( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCollection >& xAreas ): mxContext( xContext ), m_xAreas( xAreas )
++	{
++		sal_Int32 nItems = m_xAreas->getCount();
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++        		populateArea( index );
++		}
++		m_it = m_CellPositions.begin();
++	}
++	virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException){ return m_it != m_CellPositions.end(); }
++
++	virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++	{
++		if ( !hasMoreElements() )
++			throw container::NoSuchElementException();
++		CellPos aPos = *(m_it)++;
++		
++		uno::Reference< table::XCellRange > xRangeArea = getArea( aPos.m_nArea );
++		uno::Reference< table::XCellRange > xCellRange( xRangeArea->getCellByPosition(  aPos.m_nCol, aPos.m_nRow ), uno::UNO_QUERY_THROW );
++		// #FIXME need proper (WorkSheet) parent
++		return uno::makeAny( uno::Reference< excel::XRange >( new ScVbaRange( uno::Reference< XHelperInterface >(), mxContext, xCellRange ) ) );
++
++	}
++};
++
++
++const static ::rtl::OUString ISVISIBLE(  RTL_CONSTASCII_USTRINGPARAM( "IsVisible"));
++const static ::rtl::OUString WIDTH(  RTL_CONSTASCII_USTRINGPARAM( "Width"));
++const static ::rtl::OUString HEIGHT(  RTL_CONSTASCII_USTRINGPARAM( "Height"));
++const static ::rtl::OUString POSITION(  RTL_CONSTASCII_USTRINGPARAM( "Position"));
++const static rtl::OUString EQUALS( RTL_CONSTASCII_USTRINGPARAM("=") );
++const static rtl::OUString NOTEQUALS( RTL_CONSTASCII_USTRINGPARAM("<>") );
++const static rtl::OUString GREATERTHAN( RTL_CONSTASCII_USTRINGPARAM(">") );
++const static rtl::OUString GREATERTHANEQUALS( RTL_CONSTASCII_USTRINGPARAM(">=") );
++const static rtl::OUString LESSTHAN( RTL_CONSTASCII_USTRINGPARAM("<") );
++const static rtl::OUString LESSTHANEQUALS( RTL_CONSTASCII_USTRINGPARAM("<=") );
++const static rtl::OUString CONTS_HEADER( RTL_CONSTASCII_USTRINGPARAM("ContainsHeader" ));
++const static rtl::OUString INSERTPAGEBREAKS( RTL_CONSTASCII_USTRINGPARAM("InsertPageBreaks" ));
++const static rtl::OUString STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY( RTL_CONSTASCII_USTRINGPARAM("The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again") );
++const static rtl::OUString STR_ERRORMESSAGE_NOCELLSWEREFOUND( RTL_CONSTASCII_USTRINGPARAM("No cells were found") );
++const static rtl::OUString STR_ERRORMESSAGE_APPLIESTOROWCOLUMNSONLY( RTL_CONSTASCII_USTRINGPARAM("Property only applicable for Columns and Rows") );
++const static rtl::OUString CELLSTYLE( RTL_CONSTASCII_USTRINGPARAM("CellStyle") );
++
++class CellValueSetter : public ValueSetter
++{
++protected:
++	uno::Any maValue;
++	uno::TypeClass mTypeClass;
++public:
++	CellValueSetter( const uno::Any& aValue );
++	virtual bool processValue( const uno::Any& aValue,  const uno::Reference< table::XCell >& xCell );
++	virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell );
++		
++};
++
++CellValueSetter::CellValueSetter( const uno::Any& aValue ): maValue( aValue ), mTypeClass( aValue.getValueTypeClass() ) {}
++
++void
++CellValueSetter::visitNode( sal_Int32 /*i*/, sal_Int32 /*j*/, const uno::Reference< table::XCell >& xCell )
++{
++	processValue( maValue, xCell );
++}
++
++bool
++CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell )
++{
++
++	bool isExtracted = false;
++	switch ( aValue.getValueTypeClass() )
++	{
++		case  uno::TypeClass_BOOLEAN:
++		{
++			sal_Bool bState = sal_False;
++			if ( aValue >>= bState 	 )
++			{
++				uno::Reference< table::XCellRange > xRange( xCell, uno::UNO_QUERY_THROW );
++				if ( bState )
++					xCell->setValue( (double) 1 );
++				else
++					xCell->setValue( (double) 0 );
++				NumFormatHelper cellNumFormat( xRange );
++				cellNumFormat.setNumberFormat( util::NumberFormat::LOGICAL );
++			}
++			break;
++		}
++		case uno::TypeClass_STRING:
++		{
++			rtl::OUString aString;
++			if ( aValue >>= aString )
++			{
++				uno::Reference< text::XTextRange > xTextRange( xCell, uno::UNO_QUERY_THROW );
++				xTextRange->setString( aString );
++			}
++			else
++				isExtracted = false;	
++			break;
++		}
++		default:
++		{
++			double nDouble = 0.0;
++			if ( aValue >>= nDouble )
++				xCell->setValue( nDouble );
++			else
++				isExtracted = false;	
++			break;
++		}
++	}
++	return isExtracted;
++		
++}
++
++
++class CellValueGetter : public ValueGetter
++{
++protected:
++	uno::Any maValue;
++	uno::TypeClass mTypeClass;
++public:
++	CellValueGetter() {}
++	virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell );
++	virtual void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue );
++	const uno::Any& getValue() const { return maValue; }
++		
++};
++
++void
++CellValueGetter::processValue(  sal_Int32 /*x*/, sal_Int32 /*y*/, const uno::Any& aValue )
++{
++	maValue = aValue;
++}
++void CellValueGetter::visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
++{
++	uno::Any aValue;
++	table::CellContentType eType = xCell->getType();
++	if( eType == table::CellContentType_VALUE || eType == table::CellContentType_FORMULA )
++	{
++		if ( eType == table::CellContentType_FORMULA )
++		{
++				
++			rtl::OUString sFormula = xCell->getFormula();
++			if ( sFormula.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("=TRUE()") ) ) )
++				aValue <<= sal_True;
++			else if ( sFormula.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("=FALSE()") ) ) )
++				aValue <<= sal_False;
++			else 	
++			{
++				uno::Reference< beans::XPropertySet > xProp( xCell, uno::UNO_QUERY_THROW );
++				
++				table::CellContentType eFormulaType = table::CellContentType_VALUE;
++				// some formulas give textual results
++				xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FormulaResultType" ) ) ) >>= eFormulaType;
++
++				if ( eFormulaType == table::CellContentType_TEXT )
++				{
++					uno::Reference< text::XTextRange > xTextRange(xCell, ::uno::UNO_QUERY_THROW);
++					aValue <<= xTextRange->getString();
++				}
++				else	
++					aValue <<= xCell->getValue();
++			}
++		}
++		else
++		{
++			uno::Reference< table::XCellRange > xRange( xCell, uno::UNO_QUERY_THROW );
++			NumFormatHelper cellFormat( xRange );
++			if ( cellFormat.isBooleanType() )
++				aValue = uno::makeAny( ( xCell->getValue() != 0.0 ) );
++			else if ( cellFormat.isDateType() )
++				aValue = uno::makeAny( bridge::oleautomation::Date( xCell->getValue() ) );
++			else
++				aValue <<= xCell->getValue();
++		}
++	}
++	if( eType == table::CellContentType_TEXT )
++	{
++		uno::Reference< text::XTextRange > xTextRange(xCell, ::uno::UNO_QUERY_THROW);
++		aValue <<= xTextRange->getString();
++	}
++	processValue( x,y,aValue );
++}
++
++class CellFormulaValueSetter : public CellValueSetter
++{
++private:
++	ScDocument*  m_pDoc;
++    formula::FormulaGrammar::Grammar m_eGrammar;
++public:
++	CellFormulaValueSetter( const uno::Any& aValue, ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ):CellValueSetter( aValue ),  m_pDoc( pDoc ), m_eGrammar( eGram ){}
++protected:
++	bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell )
++	{
++		rtl::OUString sFormula;
++		double aDblValue = 0.0;
++		if ( aValue >>= sFormula )
++		{
++            // convert to GRAM_PODF_A1 style grammar because XCell::setFormula
++            // always compile it in that grammar. Perhaps
++            // css.sheet.FormulaParser should be used in future to directly
++            // pass formula tokens when that API stabilizes.
++            if ( m_eGrammar != formula::FormulaGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) )	
++			{
++				uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
++				ScCellRangesBase* pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() );
++				if ( pUnoRangesBase )
++				{
++					ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();	
++					ScCompiler aCompiler( m_pDoc, aCellRanges.First()->aStart );
++                    aCompiler.SetGrammar(m_eGrammar);
++					// compile the string in the format passed in
++					aCompiler.CompileString( sFormula );
++					// set desired convention to that of the document
++                    aCompiler.SetGrammar( formula::FormulaGrammar::GRAM_PODF_A1 );
++					String sConverted;
++					aCompiler.CreateStringFromTokenArray(sConverted);
++					sFormula = EQUALS + sConverted;
++				}
++			}
++
++			xCell->setFormula( sFormula );
++			return true;
++		}
++		else if ( aValue >>= aDblValue )
++		{
++			xCell->setValue( aDblValue );
++			return true;
++		}
++		return false;
++	}
++		
++};
++
++class CellFormulaValueGetter : public CellValueGetter
++{
++private:
++	ScDocument*  m_pDoc;
++    formula::FormulaGrammar::Grammar m_eGrammar;
++public:
++	CellFormulaValueGetter(ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ) : CellValueGetter( ), m_pDoc( pDoc ), m_eGrammar( eGram ) {}
++	virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
++	{
++		uno::Any aValue;
++		aValue <<= xCell->getFormula();	
++		rtl::OUString sVal;
++		aValue >>= sVal;
++		uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
++		ScCellRangesBase* pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() );
++		if ( ( xCell->getType() == table::CellContentType_FORMULA ) &&
++			pUnoRangesBase )
++		{
++			ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();	
++			ScCompiler aCompiler( m_pDoc, aCellRanges.First()->aStart );
++            aCompiler.SetGrammar(formula::FormulaGrammar::GRAM_DEFAULT);
++			aCompiler.CompileString( sVal );
++			// set desired convention
++            aCompiler.SetGrammar( m_eGrammar );
++			String sConverted;
++			aCompiler.CreateStringFromTokenArray(sConverted);
++			sVal = EQUALS + sConverted;
++			aValue <<= sVal;
++		}
++
++		processValue( x,y,aValue );
++	}
++		
++};
++
++
++class Dim2ArrayValueGetter : public ArrayVisitor
++{
++protected:
++	uno::Any maValue;
++	ValueGetter& mValueGetter;
++	virtual void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue )
++	{
++		uno::Sequence< uno::Sequence< uno::Any > >& aMatrix = *( uno::Sequence< uno::Sequence< uno::Any > >* )( maValue.getValue() );
++		aMatrix[x][y] = aValue;
++	}
++
++public:
++	Dim2ArrayValueGetter(sal_Int32 nRowCount, sal_Int32 nColCount, ValueGetter& rValueGetter ): mValueGetter(rValueGetter) 
++	{
++		uno::Sequence< uno::Sequence< uno::Any > > aMatrix;
++		aMatrix.realloc( nRowCount );	
++		for ( sal_Int32 index = 0; index < nRowCount; ++index )
++			aMatrix[index].realloc( nColCount );
++		maValue <<= aMatrix;
++	}
++	void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
++
++	{
++		mValueGetter.visitNode( x, y, xCell );
++		processValue( x, y, mValueGetter.getValue() );
++	}
++	const uno::Any& getValue() const { return maValue; }
++
++};
++
++const static rtl::OUString sNA = rtl::OUString::createFromAscii("#N/A"); 
++
++class Dim1ArrayValueSetter : public ArrayVisitor
++{
++	uno::Sequence< uno::Any > aMatrix;
++	sal_Int32 nColCount;
++	ValueSetter& mCellValueSetter;
++public:
++	Dim1ArrayValueSetter( const uno::Any& aValue, ValueSetter& rCellValueSetter ):mCellValueSetter( rCellValueSetter )
++	{
++		aValue >>= aMatrix;
++		nColCount = aMatrix.getLength();
++	}
++	virtual void visitNode( sal_Int32 /*x*/, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
++	{
++		if ( y < nColCount )
++			mCellValueSetter.processValue( aMatrix[ y ], xCell );
++		else
++			mCellValueSetter.processValue( uno::makeAny( sNA ), xCell );
++	}
++};
++
++
++
++class Dim2ArrayValueSetter : public ArrayVisitor
++{
++	uno::Sequence< uno::Sequence< uno::Any > > aMatrix;
++	ValueSetter& mCellValueSetter;
++	sal_Int32 nRowCount;
++	sal_Int32 nColCount;
++public:
++	Dim2ArrayValueSetter( const uno::Any& aValue, ValueSetter& rCellValueSetter ) : mCellValueSetter( rCellValueSetter )
++	{
++		aValue >>= aMatrix;
++		nRowCount = aMatrix.getLength();
++		nColCount = aMatrix[0].getLength();  
++	}
++
++	virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
++	{
++		if ( x < nRowCount && y < nColCount )
++			mCellValueSetter.processValue( aMatrix[ x ][ y ], xCell );
++		else
++			mCellValueSetter.processValue( uno::makeAny( sNA ), xCell );
++			
++	}
++};
++
++class RangeProcessor
++{
++public:
++	virtual void process( const uno::Reference< excel::XRange >& xRange ) = 0;
++};
++
++class RangeValueProcessor : public RangeProcessor
++{
++	const uno::Any& m_aVal;
++public:
++	RangeValueProcessor( const uno::Any& rVal ):m_aVal( rVal ) {}
++	virtual void process( const uno::Reference< excel::XRange >& xRange )
++	{
++		xRange->setValue( m_aVal );
++	}
++};
++
++class RangeFormulaProcessor : public RangeProcessor
++{
++	const uno::Any& m_aVal;
++public:
++	RangeFormulaProcessor( const uno::Any& rVal ):m_aVal( rVal ) {}
++	virtual void process( const uno::Reference< excel::XRange >& xRange ) 
++	{
++		xRange->setFormula( m_aVal );
++	}
++};
++
++class RangeCountProcessor : public RangeProcessor
++{
++	sal_Int32 nCount;
++public:
++	RangeCountProcessor():nCount(0){}
++	virtual void process( const uno::Reference< excel::XRange >& xRange )
++	{
++		nCount = nCount + xRange->getCount();
++	}
++	sal_Int32 value() { return nCount; }
++};
++class AreasVisitor
++{
++private:
++	uno::Reference< XCollection > m_Areas;
++public:
++	AreasVisitor( const uno::Reference< XCollection >& rAreas ):m_Areas( rAreas ){} 
++	
++	void visit( RangeProcessor& processor )
++	{
++		if ( m_Areas.is() )
++		{
++			sal_Int32 nItems = m_Areas->getCount();
++			for ( sal_Int32 index=1; index <= nItems; ++index )
++			{
++				uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++				processor.process( xRange ); 
++			}
++		}	
++	}
++};
++
++class RangeHelper
++{
++	uno::Reference< table::XCellRange > m_xCellRange;
++	
++public:
++	RangeHelper( const uno::Reference< table::XCellRange >& xCellRange ) throw (uno::RuntimeException) : m_xCellRange( xCellRange ) 
++	{
++		if ( !m_xCellRange.is() )
++			throw uno::RuntimeException();
++	}
++	RangeHelper( const uno::Any aCellRange ) throw (uno::RuntimeException)
++	{
++		m_xCellRange.set( aCellRange, uno::UNO_QUERY_THROW );
++	}
++	uno::Reference< sheet::XSheetCellRange > getSheetCellRange() throw (uno::RuntimeException)
++	{
++		return uno::Reference< sheet::XSheetCellRange >(m_xCellRange, uno::UNO_QUERY_THROW);
++	}
++	uno::Reference< sheet::XSpreadsheet >  getSpreadSheet() throw (uno::RuntimeException)
++	{
++		return getSheetCellRange()->getSpreadsheet();
++	}	
++
++	uno::Reference< table::XCellRange > getCellRangeFromSheet() throw (uno::RuntimeException)
++	{
++		return uno::Reference< table::XCellRange >(getSpreadSheet(), uno::UNO_QUERY_THROW );
++	}
++
++	uno::Reference< sheet::XCellRangeAddressable >  getCellRangeAddressable() throw (uno::RuntimeException)
++	{
++		return uno::Reference< sheet::XCellRangeAddressable >(m_xCellRange, ::uno::UNO_QUERY_THROW);
++
++	}
++
++	uno::Reference< sheet::XSheetCellCursor > getSheetCellCursor() throw ( uno::RuntimeException )
++	{
++		return 	uno::Reference< sheet::XSheetCellCursor >( getSpreadSheet()->createCursorByRange( getSheetCellRange() ), uno::UNO_QUERY_THROW );
++	}	
++
++	static uno::Reference< excel::XRange > createRangeFromRange( const uno::Reference<uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, const uno::Reference< sheet::XCellRangeAddressable >& xCellRangeAddressable, sal_Int32 nStartColOffset = 0, sal_Int32 nStartRowOffset = 0,
++ sal_Int32 nEndColOffset = 0, sal_Int32 nEndRowOffset = 0 )
++	{
++		// #FIXME need proper (WorkSheet) parent
++		return uno::Reference< excel::XRange >( new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, 
++			xRange->getCellRangeByPosition(
++				xCellRangeAddressable->getRangeAddress().StartColumn + nStartColOffset,
++				xCellRangeAddressable->getRangeAddress().StartRow + nStartRowOffset,
++				xCellRangeAddressable->getRangeAddress().EndColumn + nEndColOffset,
++				xCellRangeAddressable->getRangeAddress().EndRow + nEndRowOffset ) ) );
++	}
++	
++};
++
++bool
++getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv )
++{
++	
++	ScDocument* pDoc = NULL;
++	if ( pDocSh )
++	{
++		pDoc = pDocSh->GetDocument();
++		String aString(sAddress);
++		USHORT nMask = SCA_VALID;
++		//USHORT nParse = rCellRanges.Parse( sAddress, pDoc, nMask, formula::FormulaGrammar::CONV_XL_A1 );
++		rResFlags = rCellRanges.Parse( sAddress, pDoc, nMask, eConv, 0 );
++		if ( rResFlags & SCA_VALID )
++		{
++			return true;
++		}
++	} 
++	return false;
++} 
++
++bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException )
++{
++	// see if there is a match with a named range
++	uno::Reference< beans::XPropertySet > xProps( pDocSh->GetModel(), uno::UNO_QUERY_THROW );
++	uno::Reference< container::XNameAccess > xNameAccess( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NamedRanges") ) ), uno::UNO_QUERY_THROW );
++	// Strangly enough you can have Range( "namedRange1, namedRange2, etc," )	
++	// loop around each ',' seperated name
++	std::vector< rtl::OUString > vNames;
++	sal_Int32 nIndex = 0;
++	do 
++	{
++		rtl::OUString aToken = sName.getToken( 0, ',', nIndex );
++		vNames.push_back( aToken );
++	} while ( nIndex >= 0 );
++
++	if ( !vNames.size() )
++		vNames.push_back( sName );
++
++	std::vector< rtl::OUString >::iterator it = vNames.begin(); 
++	std::vector< rtl::OUString >::iterator it_end = vNames.end(); 
++	for ( ; it != it_end; ++it )
++	{
++		
++		formula::FormulaGrammar::AddressConvention eConv = aConv; 
++		// spaces are illegal ( but the user of course can enter them )
++		rtl::OUString sAddress = (*it).trim();
++		if ( xNameAccess->hasByName( sAddress ) )
++		{
++			uno::Reference< sheet::XNamedRange > xNamed( xNameAccess->getByName( sAddress ), uno::UNO_QUERY_THROW );
++			sAddress = xNamed->getContent();
++			// As the address comes from OOO, the addressing
++			// style is may not be XL_A1
++			eConv = pDocSh->GetDocument()->GetAddressConvention();
++		}	
++
++		USHORT nFlags = 0;
++		if ( !getCellRangesForAddress( nFlags, sAddress, pDocSh, aCellRanges, eConv ) )
++			return false;
++	
++		bool bTabFromReferrer = !( nFlags & SCA_TAB_3D );
++
++		for ( ScRange* pRange = aCellRanges.First() ; pRange; pRange = aCellRanges.Next() )
++		{
++			pRange->aStart.SetCol( refRange.aStart.Col() + pRange->aStart.Col() );
++			pRange->aStart.SetRow( refRange.aStart.Row() + pRange->aStart.Row() );
++			pRange->aStart.SetTab( bTabFromReferrer ? refRange.aStart.Tab()  : pRange->aStart.Tab() );
++			pRange->aEnd.SetCol( refRange.aStart.Col() + pRange->aEnd.Col() );
++			pRange->aEnd.SetRow( refRange.aStart.Row() + pRange->aEnd.Row() );
++			pRange->aEnd.SetTab( bTabFromReferrer ? refRange.aEnd.Tab()  : pRange->aEnd.Tab() );
++		}
++	}
++	return true;
++}
++
++
++ScVbaRange*
++getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException )
++{
++	ScRangeList aCellRanges;
++	ScRange refRange;
++	ScUnoConversion::FillScRange( refRange, pAddr );
++	if ( !getScRangeListForAddress ( sName, pDocSh, refRange, aCellRanges, eConv ) ) 
++		throw uno::RuntimeException();
++	// Single range
++	if ( aCellRanges.First() == aCellRanges.Last() )
++	{
++		uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pDocSh, *aCellRanges.First() ) );
++		// #FIXME need proper (WorkSheet) parent
++		return new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xRange );
++	}
++	uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pDocSh, aCellRanges ) );
++ 	
++	// #FIXME need proper (WorkSheet) parent
++	return new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xRanges );
++}
++
++css::uno::Reference< excel::XRange >
++ScVbaRange::getRangeObjectForName( const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sRangeName, ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) throw ( uno::RuntimeException )
++{
++	table::CellRangeAddress refAddr;
++	return getRangeForName( xContext, sRangeName, pDocSh, refAddr, eConv );
++}
++
++
++table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, ScDocShell* pDocSh,  formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1) throw ( uno::RuntimeException )
++{
++	uno::Reference< table::XCellRange > xRangeParam;
++	switch ( aParam.getValueTypeClass() )
++	{
++		case uno::TypeClass_STRING:
++		{
++			rtl::OUString rString;
++			aParam >>= rString;
++			ScRangeList aCellRanges;
++			ScRange refRange;
++			if ( getScRangeListForAddress ( rString, pDocSh, refRange, aCellRanges, aConv ) ) 			
++			{
++				if ( aCellRanges.First() == aCellRanges.Last() )
++				{
++					table::CellRangeAddress aRangeAddress;
++					ScUnoConversion::FillApiRange( aRangeAddress, *aCellRanges.First() );
++					return aRangeAddress;
++				}
++			}
++		}
++		case uno::TypeClass_INTERFACE:
++		{
++			uno::Reference< excel::XRange > xRange;
++			aParam >>= xRange;
++			if ( xRange.is() )
++				xRange->getCellRange() >>= xRangeParam;
++			break;
++		}
++		default:
++			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can't extact CellRangeAddress from type" ) ), uno::Reference< uno::XInterface >() );
++	}
++	uno::Reference< sheet::XCellRangeAddressable > xAddressable( xRangeParam, uno::UNO_QUERY_THROW );
++	return xAddressable->getRangeAddress();
++
++}
++
++uno::Reference< XCollection >
++lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno::Reference<uno::XComponentContext>& xContext,  const uno::Reference< table::XCellRange >& xRange  ) throw( uno::RuntimeException )
++{
++	uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW ); 
++	ScDocument* pDoc = getDocumentFromRange(xRange);
++	if ( !pDoc )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
++	ScVbaPalette aPalette( pDoc->GetDocumentShell() );
++ 	uno::Reference< XCollection > borders( new ScVbaBorders( xParent, xContext, xRange, aPalette ) );
++	return borders;
++}
++
++ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args,
++    uno::Reference< uno::XComponentContext> const & xContext )  throw ( lang::IllegalArgumentException ) : ScVbaRange_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( sal_False ), mbIsColumns( sal_False )
++{
++	mxRange.set( mxPropertySet, uno::UNO_QUERY );
++	mxRanges.set( mxPropertySet, uno::UNO_QUERY );
++	uno::Reference< container::XIndexAccess >  xIndex;
++	if ( mxRange.is() )
++	{
++		xIndex = new SingleRangeIndexAccess( mxContext, mxRange );
++	}
++	else if ( mxRanges.is() )
++	{
++		xIndex.set( mxRanges, uno::UNO_QUERY_THROW );
++	}
++	m_Areas = new ScVbaRangeAreas( mxContext, xIndex, mbIsRows, mbIsColumns );
++}
++
++ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, sal_Bool bIsRows, sal_Bool bIsColumns ) throw( lang::IllegalArgumentException )
++: ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRange, uno::UNO_QUERY_THROW ), getModelFromRange( xRange), true ), mxRange( xRange ),
++                mbIsRows( bIsRows ),
++                mbIsColumns( bIsColumns )
++{
++	if  ( !xContext.is() )
++		throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "context is not set " ) ), uno::Reference< uno::XInterface >() , 1 );
++	if  ( !xRange.is() )
++		throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "range is not set " ) ), uno::Reference< uno::XInterface >() , 1 );
++
++	uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( mxContext, xRange ) );
++	m_Areas = new ScVbaRangeAreas( mxContext, xIndex, mbIsRows, mbIsColumns );
++
++}
++
++ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges,  sal_Bool bIsRows, sal_Bool bIsColumns  ) throw ( lang::IllegalArgumentException )
++: ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRanges, uno::UNO_QUERY_THROW ), getModelFromXIf( uno::Reference< uno::XInterface >( xRanges, uno::UNO_QUERY_THROW ) ), true ), mxRanges( xRanges ),mbIsRows( bIsRows ), mbIsColumns( bIsColumns )
++
++{
++	uno::Reference< container::XIndexAccess >  xIndex( mxRanges, uno::UNO_QUERY_THROW );
++	m_Areas	 = new ScVbaRangeAreas( mxContext, xIndex, mbIsRows, mbIsColumns );
++
++}
++
++ScVbaRange::~ScVbaRange()
++{
++}
++
++uno::Reference< XCollection >& ScVbaRange::getBorders()
++{
++	if ( !m_Borders.is() )
++	{
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
++		m_Borders = lcl_setupBorders( this, mxContext, uno::Reference< table::XCellRange >( xRange->getCellRange(), uno::UNO_QUERY_THROW ) );
++	}
++	return m_Borders;
++}
++
++void
++ScVbaRange::visitArray( ArrayVisitor& visitor )
++{
++	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
++	sal_Int32 nRowCount = xColumnRowRange->getRows()->getCount();
++	sal_Int32 nColCount = xColumnRowRange->getColumns()->getCount();
++	for ( sal_Int32 i=0; i<nRowCount; ++i )
++	{
++		for ( sal_Int32 j=0; j<nColCount; ++j )
++		{
++			uno::Reference< table::XCell > xCell( mxRange->getCellByPosition( j, i ), uno::UNO_QUERY_THROW );
++
++			visitor.visitNode( i, j, xCell );
++		}
++	}
++}
++
++
++
++uno::Any 
++ScVbaRange::getValue( ValueGetter& valueGetter) throw (uno::RuntimeException)
++{
++	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
++	// single cell range
++	if ( isSingleCellRange() )
++	{
++		visitArray( valueGetter );
++		return valueGetter.getValue();
++	}
++	sal_Int32 nRowCount = xColumnRowRange->getRows()->getCount();
++	sal_Int32 nColCount = xColumnRowRange->getColumns()->getCount();
++	// multi cell range ( return array )
++	Dim2ArrayValueGetter arrayGetter( nRowCount, nColCount, valueGetter );
++	visitArray( arrayGetter );
++	return uno::makeAny( script::ArrayWrapper( sal_False, arrayGetter.getValue() ) );
++}
++
++uno::Any SAL_CALL
++ScVbaRange::getValue() throw (uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->getValue();
++	}
++
++	CellValueGetter valueGetter;
++	return getValue( valueGetter );
++
++}
++
++
++void 
++ScVbaRange::setValue(  const uno::Any  &aValue,  ValueSetter& valueSetter ) throw (uno::RuntimeException)
++{
++	uno::TypeClass aClass = aValue.getValueTypeClass();
++	if ( aClass == uno::TypeClass_SEQUENCE )
++	{
++		uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
++		uno::Any aConverted;
++		try
++		{
++			// test for single dimension, could do 
++			// with a better test than this	
++			if ( aValue.getValueTypeName().indexOf('[') ==  aValue.getValueTypeName().lastIndexOf('[') )
++			{
++				aConverted = xConverter->convertTo( aValue, getCppuType((uno::Sequence< uno::Any >*)0) );
++				Dim1ArrayValueSetter setter( aConverted, valueSetter );
++				visitArray( setter );
++			}
++			else
++			{
++				aConverted = xConverter->convertTo( aValue, getCppuType((uno::Sequence< uno::Sequence< uno::Any > >*)0) );
++				Dim2ArrayValueSetter setter( aConverted, valueSetter );
++				visitArray( setter );
++			}
++		}
++		catch ( uno::Exception& e )
++		{
++			OSL_TRACE("Bahhh, caught exception %s", 
++				rtl::OUStringToOString( e.Message,
++					RTL_TEXTENCODING_UTF8 ).getStr() );
++		}
++	}
++	else
++	{
++		visitArray( valueSetter );
++	}
++}
++
++void SAL_CALL
++ScVbaRange::setValue( const uno::Any  &aValue ) throw (uno::RuntimeException)
++{
++	// If this is a multiple selection apply setValue over all areas
++	if ( m_Areas->getCount() > 1 )
++	{
++		AreasVisitor aVisitor( m_Areas );
++		RangeValueProcessor valueProcessor( aValue );	
++		aVisitor.visit( valueProcessor );
++		return;
++	}	
++	CellValueSetter valueSetter( aValue );
++	setValue( aValue, valueSetter );
++}
++
++void
++ScVbaRange::Clear() throw (uno::RuntimeException)
++{
++	sal_Int32 nFlags = sheet::CellFlags::VALUE | sheet::CellFlags::STRING | sheet::CellFlags::HARDATTR | sheet::CellFlags::FORMATTED | sheet::CellFlags::EDITATTR | sheet::CellFlags::FORMULA;
++	ClearContents( nFlags );
++}
++
++//helper ClearContent
++void
++ScVbaRange::ClearContents( sal_Int32 nFlags ) throw (uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		sal_Int32 nItems = m_Areas->getCount();
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++			ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xRange.get() ); 
++			if ( pRange )
++				pRange->ClearContents( nFlags );	
++		}
++		return;
++	}
++
++
++	uno::Reference< sheet::XSheetOperation > xSheetOperation(mxRange, uno::UNO_QUERY_THROW);
++	xSheetOperation->clearContents( nFlags );
++}
++void
++ScVbaRange::ClearComments() throw (uno::RuntimeException)
++{
++	ClearContents( sheet::CellFlags::ANNOTATION );
++}
++
++void
++ScVbaRange::ClearContents() throw (uno::RuntimeException)
++{
++	sal_Int32 nClearFlags = ( sheet::CellFlags::VALUE |
++		sheet::CellFlags::STRING |  sheet::CellFlags::DATETIME | 
++		sheet::CellFlags::FORMULA );
++	ClearContents( nClearFlags );
++}
++
++void
++ScVbaRange::ClearFormats() throw (uno::RuntimeException)
++{
++	//FIXME: need to check if we need to combine sheet::CellFlags::FORMATTED
++	sal_Int32 nClearFlags = sheet::CellFlags::HARDATTR | sheet::CellFlags::FORMATTED | sheet::CellFlags::EDITATTR;
++	ClearContents( nClearFlags );
++}
++
++void
++ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException)
++{
++	// If this is a multiple selection apply setFormula over all areas
++	if ( m_Areas->getCount() > 1 )
++	{
++		AreasVisitor aVisitor( m_Areas );
++		RangeFormulaProcessor valueProcessor( rFormula );	
++		aVisitor.visit( valueProcessor );
++		return;
++	}	
++	CellFormulaValueSetter formulaValueSetter( rFormula, getScDocument(), eGram );
++	setValue( rFormula, formulaValueSetter );
++}
++
++uno::Any 
++ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->getFormula();
++	}
++	CellFormulaValueGetter valueGetter( getScDocument(), eGram );
++	return getValue( valueGetter );
++		
++}
++
++void
++ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException)
++{
++	// #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO                        	// results in "=$a$1:a1", temporalily disable conversion
++	setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_PODF_XL_A1 );;
++}
++
++uno::Any
++ScVbaRange::getFormulaR1C1() throw (::com::sun::star::uno::RuntimeException)
++{
++	return getFormulaValue( formula::FormulaGrammar::GRAM_PODF_XL_R1C1 );
++}
++
++void
++ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeException)
++{
++	setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_PODF_XL_R1C1 );
++}
++
++uno::Any
++ScVbaRange::getFormula() throw (::com::sun::star::uno::RuntimeException)
++{
++	return getFormulaValue( formula::FormulaGrammar::GRAM_PODF_XL_A1 );
++}
++
++sal_Int32 
++ScVbaRange::getCount() throw (uno::RuntimeException)
++{
++	// If this is a multiple selection apply setValue over all areas
++	if ( m_Areas->getCount() > 1 )
++	{
++		AreasVisitor aVisitor( m_Areas );
++		RangeCountProcessor valueProcessor;
++		aVisitor.visit( valueProcessor );
++		return valueProcessor.value();
++	}	
++	sal_Int32 rowCount = 0;
++	sal_Int32 colCount = 0;
++	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
++	rowCount = xColumnRowRange->getRows()->getCount();
++	colCount = xColumnRowRange->getColumns()->getCount();
++
++	if( IsRows() )
++		return rowCount;	
++	if( IsColumns() )
++		return colCount;
++	return rowCount * colCount;
++}
++
++sal_Int32 
++ScVbaRange::getRow() throw (uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->getRow();
++	}
++	uno::Reference< sheet::XCellAddressable > xCellAddressable(mxRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
++	return xCellAddressable->getCellAddress().Row + 1; // Zero value indexing 
++}	
++		
++sal_Int32 
++ScVbaRange::getColumn() throw (uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->getColumn();
++	}
++	uno::Reference< sheet::XCellAddressable > xCellAddressable(mxRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
++	return xCellAddressable->getCellAddress().Column + 1; // Zero value indexing
++}
++
++uno::Any
++ScVbaRange::HasFormula() throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		sal_Int32 nItems = m_Areas->getCount();
++		uno::Any aResult = aNULL();
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++			// if the HasFormula for any area is different to another
++			// return null
++			if ( index > 1 )
++				if ( aResult != xRange->HasFormula() )
++					return aNULL();
++			aResult = xRange->HasFormula();	
++			if ( aNULL() == aResult ) 
++				return aNULL();
++		}
++		return aResult;
++	}
++	uno::Reference< uno::XInterface > xIf( mxRange, uno::UNO_QUERY_THROW );
++	ScCellRangesBase* pThisRanges = dynamic_cast< ScCellRangesBase * > ( xIf.get() );
++	if ( pThisRanges )
++	{
++		uno::Reference<uno::XInterface>  xRanges( pThisRanges->queryFormulaCells( ( sheet::FormulaResult::ERROR | sheet::FormulaResult::VALUE |  sheet::FormulaResult::STRING ) ), uno::UNO_QUERY_THROW );
++		ScCellRangesBase* pFormulaRanges = dynamic_cast< ScCellRangesBase * > ( xRanges.get() );
++		// check if there are no formula cell, return false
++		if ( pFormulaRanges->GetRangeList().Count() == 0 ) 
++			return uno::makeAny(sal_False);
++		
++		// chech if there are holes (where some cells are not formulas)
++		// or returned range is not equal to this range	 
++		if ( ( pFormulaRanges->GetRangeList().Count() > 1 ) 
++		|| ( pFormulaRanges->GetRangeList().GetObject(0)->aStart != pThisRanges->GetRangeList().GetObject(0)->aStart ) 
++		|| ( pFormulaRanges->GetRangeList().GetObject(0)->aEnd != pThisRanges->GetRangeList().GetObject(0)->aEnd ) )
++			return aNULL(); // should return aNULL;
++	}
++	return uno::makeAny( sal_True );
++}
++void
++ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( uno::RuntimeException )
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		// Multi-Area Range
++		uno::Reference< XCollection > xCollection( m_Areas, uno::UNO_QUERY_THROW );
++		for ( sal_Int32 index = 1; index <= xCollection->getCount(); ++index )
++		{
++			uno::Reference< excel::XRange > xRange( xCollection->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++			ScVbaRange* pThisRange = dynamic_cast< ScVbaRange* >( xRange.get() );
++			pThisRange->fillSeries( nFillDirection, nFillMode, nFillDateMode, fStep, fEndValue );
++				
++		}
++		return;	
++	}
++	
++	uno::Reference< sheet::XCellSeries > xCellSeries(mxRange, uno::UNO_QUERY_THROW );
++	xCellSeries->fillSeries( nFillDirection, nFillMode, nFillDateMode, fStep, fEndValue );
++}
++
++void 
++ScVbaRange::FillLeft() throw (uno::RuntimeException)
++{
++	fillSeries(sheet::FillDirection_TO_LEFT, 
++		sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
++}
++
++void 
++ScVbaRange::FillRight() throw (uno::RuntimeException)
++{
++	fillSeries(sheet::FillDirection_TO_RIGHT, 
++		sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
++}
++
++void 
++ScVbaRange::FillUp() throw (uno::RuntimeException)
++{
++	fillSeries(sheet::FillDirection_TO_TOP, 
++		sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
++}
++
++void 
++ScVbaRange::FillDown() throw (uno::RuntimeException)
++{
++	fillSeries(sheet::FillDirection_TO_BOTTOM, 
++		sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
++}
++
++::rtl::OUString
++ScVbaRange::getText() throw (uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->getText();
++	}
++	uno::Reference< text::XTextRange > xTextRange(mxRange->getCellByPosition(0,0), uno::UNO_QUERY_THROW );
++	return xTextRange->getString();
++}
++
++uno::Reference< excel::XRange >
++ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw (uno::RuntimeException)
++{
++	SCROW nRowOffset = 0;
++	SCCOL nColOffset = 0;
++	sal_Bool bIsRowOffset = ( nRowOff >>= nRowOffset );
++	sal_Bool bIsColumnOffset = ( nColOff >>= nColOffset );
++	ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
++
++	ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
++	
++
++	for ( ScRange* pRange = aCellRanges.First() ; pRange; pRange = aCellRanges.Next() )
++	{
++		if ( bIsColumnOffset )
++		{
++			pRange->aStart.SetCol( pRange->aStart.Col() + nColOffset );
++			pRange->aEnd.SetCol( pRange->aEnd.Col() + nColOffset );
++		}
++		if ( bIsRowOffset )
++		{
++			pRange->aStart.SetRow( pRange->aStart.Row() + nRowOffset );
++			pRange->aEnd.SetRow( pRange->aEnd.Row() + nRowOffset );
++		}
++	}
++
++	if ( aCellRanges.Count() > 1 ) // Multi-Area
++	{
++		uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pUnoRangesBase->GetDocShell(), aCellRanges ) );
++		return new ScVbaRange( getParent(), mxContext, xRanges );
++	}
++	// normal range
++	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), *aCellRanges.First() ) );
++	return new ScVbaRange( getParent(), mxContext, xRange  );
++}
++
++uno::Reference< excel::XRange >
++ScVbaRange::CurrentRegion() throw (uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->CurrentRegion();
++	}
++	
++	RangeHelper helper( mxRange );
++	uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = 
++		helper.getSheetCellCursor();
++	xSheetCellCursor->collapseToCurrentRegion();
++	uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
++	return RangeHelper::createRangeFromRange( mxContext, helper.getCellRangeFromSheet(), xCellRangeAddressable );	
++}
++
++uno::Reference< excel::XRange >
++ScVbaRange::CurrentArray() throw (uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->CurrentArray();
++	}
++	RangeHelper helper( mxRange );
++	uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = 
++		helper.getSheetCellCursor();
++	xSheetCellCursor->collapseToCurrentArray();
++	uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
++	return RangeHelper::createRangeFromRange( mxContext, helper.getCellRangeFromSheet(), xCellRangeAddressable );	
++}
++
++uno::Any
++ScVbaRange::getFormulaArray() throw (uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->getFormulaArray();
++	}
++	
++	uno::Reference< sheet::XCellRangeFormula> xCellRangeFormula( mxRange, uno::UNO_QUERY_THROW );
++	uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
++	uno::Any aMatrix;
++
++	//VBA, minz@cn.ibm.com
++	uno::Sequence< uno::Sequence<rtl::OUString> > aFmArray = xCellRangeFormula->getFormulaArray();
++	if( aFmArray.getLength() )
++	{
++		if( aFmArray.getLength() == 1 && aFmArray[0].getLength() == 1 )
++			aMatrix <<= aFmArray[0][0];
++		else	
++			aMatrix = xConverter->convertTo( uno::makeAny( xCellRangeFormula->getFormulaArray() ) , getCppuType((uno::Sequence< uno::Sequence< uno::Any > >*)0)  ) ;
++	}	
++	return aMatrix;
++}
++
++void 
++ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->setFormulaArray( rFormula );
++	}
++	// #TODO need to distinguish between getFormula and getFormulaArray e.g. (R1C1)
++	// but for the moment its just easier to treat them the same for setting
++
++	setFormula( rFormula );
++}
++
++::rtl::OUString
++ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->Characters( Start, Length );
++	}
++
++	long nIndex = 0, nCount = 0;
++	::rtl::OUString rString;
++	uno::Reference< text::XTextRange > xTextRange(mxRange, ::uno::UNO_QUERY_THROW );
++	rString = xTextRange->getString();
++	if( !( Start >>= nIndex ) && !( Length >>= nCount ) )
++		return rString;
++	if(!( Start >>= nIndex ) )
++		nIndex = 1;
++	if(!( Length >>= nCount ) )
++		nIndex = rString.getLength();
++	return rString.copy( --nIndex, nCount ); // Zero value indexing
++}
++
++::rtl::OUString
++ScVbaRange::Address(  const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolute, const uno::Any& ReferenceStyle, const uno::Any& External, const uno::Any& RelativeTo ) throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		// Multi-Area Range
++		rtl::OUString sAddress;
++		uno::Reference< XCollection > xCollection( m_Areas, uno::UNO_QUERY_THROW );
++                uno::Any aExternalCopy = External;
++		for ( sal_Int32 index = 1; index <= xCollection->getCount(); ++index )
++		{
++			uno::Reference< excel::XRange > xRange( xCollection->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++			if ( index > 1 )
++			{
++				sAddress += rtl::OUString( ',' );
++                                // force external to be false
++                                // only first address should have the
++                                // document and sheet specifications
++                                aExternalCopy = uno::makeAny(sal_False);
++			}
++			sAddress += xRange->Address( RowAbsolute, ColumnAbsolute, ReferenceStyle, aExternalCopy, RelativeTo );
++		}
++		return sAddress;	
++		
++	}
++	ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
++	if ( ReferenceStyle.hasValue() )
++	{
++		sal_Int32 refStyle = excel::XlReferenceStyle::xlA1;
++		ReferenceStyle >>= refStyle;
++		if ( refStyle == excel::XlReferenceStyle::xlR1C1 )
++			dDetails = ScAddress::Details( formula::FormulaGrammar::CONV_XL_R1C1, 0, 0 );
++	}
++	USHORT nFlags = SCA_VALID;
++	ScDocShell* pDocShell =  getScDocShell();
++	ScDocument* pDoc =  pDocShell->GetDocument();
++
++	RangeHelper thisRange( mxRange );	
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++	ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
++	String sRange;
++	USHORT ROW_ABSOLUTE = ( SCA_ROW_ABSOLUTE | SCA_ROW2_ABSOLUTE );
++	USHORT COL_ABSOLUTE = ( SCA_COL_ABSOLUTE | SCA_COL2_ABSOLUTE );
++	// default
++	nFlags |= ( SCA_TAB_ABSOLUTE | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB2_ABSOLUTE | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE );
++	if ( RowAbsolute.hasValue() )
++	{
++		sal_Bool bVal = sal_True;
++		RowAbsolute >>= bVal;
++		if ( !bVal )
++			nFlags &= ~ROW_ABSOLUTE;
++	}
++	if ( ColumnAbsolute.hasValue() )
++	{
++		sal_Bool bVal = sal_True;
++		ColumnAbsolute >>= bVal;
++		if ( !bVal )
++			nFlags &= ~COL_ABSOLUTE;
++	}
++	sal_Bool bLocal = sal_False;
++	if ( External.hasValue() )
++	{
++		External >>= bLocal;
++		if (  bLocal )
++			nFlags |= SCA_TAB_3D | SCA_FORCE_DOC;
++	}
++	if ( RelativeTo.hasValue() )
++	{
++		// #TODO should I throw an error if R1C1 is not set?
++		
++		table::CellRangeAddress refAddress = getCellRangeAddressForVBARange( RelativeTo, pDocShell );
++		dDetails = ScAddress::Details( formula::FormulaGrammar::CONV_XL_R1C1, static_cast< SCROW >( refAddress.StartRow ), static_cast< SCCOL >( refAddress.StartColumn ) );
++	}
++	aRange.Format( sRange,  nFlags, pDoc, dDetails ); 
++	return sRange;
++}
++
++uno::Reference < excel::XFont >
++ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException)
++{
++	uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY );
++	ScDocument* pDoc = getScDocument();
++	if ( mxRange.is() )
++		xProps.set(mxRange, ::uno::UNO_QUERY );
++	else if ( mxRanges.is() )
++		xProps.set(mxRanges, ::uno::UNO_QUERY );
++	if ( !pDoc )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
++
++	ScVbaPalette aPalette( pDoc->GetDocumentShell() );	
++	ScCellRangeObj* pRangeObj = NULL;
++	try
++	{
++		pRangeObj = getCellRangeObj();
++	}
++	catch( uno::Exception& ) 
++	{
++	}
++	return  new ScVbaFont( this, mxContext, aPalette, xProps, pRangeObj );
++}
++                                                                                                                             
++uno::Reference< excel::XRange >
++ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) throw(uno::RuntimeException)
++{
++	// #TODO code within the test below "if ( m_Areas.... " can be removed
++	// Test is performed only because m_xRange is NOT set to be
++	// the first range in m_Areas ( to force failure while
++	// the implementations for each method are being updated )
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->Cells( nRowIndex, nColumnIndex );
++	}
++
++	sal_Int32 nRow = 0, nColumn = 0;
++
++	sal_Bool bIsIndex = nRowIndex.hasValue();
++	sal_Bool bIsColumnIndex = nColumnIndex.hasValue();
++
++	// Sometimes we might get a float or a double or whatever
++	// set in the Any, we should convert as appropriate
++	// #FIXME - perhaps worth turning this into some sort of
++	// convertion routine e.g. bSuccess = getValueFromAny( nRow, nRowIndex, getCppuType((sal_Int32*)0) )
++	if ( nRowIndex.hasValue() && !( nRowIndex >>= nRow ) )
++	{
++		uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
++		uno::Any aConverted;
++		try
++		{
++			aConverted = xConverter->convertTo( nRowIndex, getCppuType((sal_Int32*)0) );
++			bIsIndex = ( aConverted >>= nRow );
++		}
++		catch( uno::Exception& ) {} // silence any errors
++	}
++	if ( bIsColumnIndex && !( nColumnIndex >>= nColumn ) )
++	{
++		uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
++		uno::Any aConverted;
++		try
++		{
++			aConverted = xConverter->convertTo( nColumnIndex, getCppuType((sal_Int32*)0) );
++			bIsColumnIndex = ( aConverted >>= nColumn );
++		}
++		catch( uno::Exception& ) {} // silence any errors
++	}
++                                                                                                                       
++	RangeHelper thisRange( mxRange );
++	table::CellRangeAddress thisRangeAddress =  thisRange.getCellRangeAddressable()->getRangeAddress();
++	uno::Reference< table::XCellRange > xSheetRange = thisRange.getCellRangeFromSheet();
++	if( !bIsIndex && !bIsColumnIndex ) // .Cells
++		// #FIXE needs proper parent ( Worksheet )
++		return uno::Reference< excel::XRange >( new ScVbaRange( uno::Reference< XHelperInterface >(), mxContext, mxRange ) );
++
++	sal_Int32 nIndex = --nRow;
++	if( bIsIndex && !bIsColumnIndex ) // .Cells(n)
++	{
++		uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, ::uno::UNO_QUERY_THROW);
++		sal_Int32 nColCount = xColumnRowRange->getColumns()->getCount();
++
++		if ( !nIndex || nIndex < 0 )
++			nRow = 0;
++		else
++			nRow = nIndex / nColCount;
++		nColumn = nIndex % nColCount;
++	}
++	else
++		--nColumn;
++	nRow = nRow + thisRangeAddress.StartRow;
++	nColumn =  nColumn + thisRangeAddress.StartColumn;	
++	return new ScVbaRange( getParent(), mxContext, xSheetRange->getCellRangeByPosition( nColumn, nRow,                                        nColumn, nRow ) );
++}
++
++void
++ScVbaRange::Select() throw (uno::RuntimeException)
++{
++	ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
++	if ( !pUnoRangesBase )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying uno range object" ) ), uno::Reference< uno::XInterface >()  );
++	ScDocShell* pShell = pUnoRangesBase->GetDocShell();
++	if ( pShell )
++	{
++		uno::Reference< frame::XModel > xModel( pShell->GetModel(), uno::UNO_QUERY_THROW );
++		uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++		if ( mxRanges.is() )
++			xSelection->select( uno::makeAny( mxRanges ) );
++		else
++			xSelection->select( uno::makeAny( mxRange ) );
++		// set focus on document e.g.
++		// ThisComponent.CurrentController.Frame.getContainerWindow.SetFocus
++		try
++		{
++			uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++			uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_QUERY_THROW );
++			uno::Reference< awt::XWindow > xWin( xFrame->getContainerWindow(), uno::UNO_QUERY_THROW );
++			xWin->setFocus();
++		}
++		catch( uno::Exception& )
++		{
++		}		
++
++	}
++}
++
++bool cellInRange( const table::CellRangeAddress& rAddr, const sal_Int32& nCol, const sal_Int32& nRow )
++{
++	if ( nCol >= rAddr.StartColumn && nCol <= rAddr.EndColumn &&
++		nRow >= rAddr.StartRow && nRow <= rAddr.EndRow )
++		return true;
++	return false;
++}
++
++void setCursor(  const SCCOL& nCol, const SCROW& nRow, const uno::Reference< frame::XModel >& xModel,  bool bInSel = true )
++{
++	ScTabViewShell* pShell = excel::getBestViewShell( xModel );
++	if ( pShell )
++	{
++		if ( bInSel )
++			pShell->SetCursor( nCol, nRow );
++		else
++			pShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_NONE, FALSE, FALSE, TRUE, FALSE );
++	}
++}
++
++void
++ScVbaRange::Activate() throw (uno::RuntimeException)
++{
++	// get first cell of current range
++	uno::Reference< table::XCellRange > xCellRange;
++	if ( mxRanges.is() )
++	{
++		uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW  );
++		xCellRange.set( xIndex->getByIndex( 0 ), uno::UNO_QUERY_THROW );
++	}
++	else
++		xCellRange.set( mxRange, uno::UNO_QUERY_THROW );
++
++	RangeHelper thisRange( xCellRange );
++	uno::Reference< sheet::XCellRangeAddressable > xThisRangeAddress = thisRange.getCellRangeAddressable();
++	table::CellRangeAddress thisRangeAddress = xThisRangeAddress->getRangeAddress();
++        uno::Reference< frame::XModel > xModel;	
++        ScDocShell* pShell = getScDocShell();
++
++        if ( pShell )
++            xModel = pShell->GetModel();
++
++        if ( !xModel.is() )
++            throw uno::RuntimeException(); 
++
++	// get current selection
++	uno::Reference< sheet::XCellRangeAddressable > xRange( xModel->getCurrentSelection(), ::uno::UNO_QUERY);
++
++	uno::Reference< sheet::XSheetCellRanges > xRanges( xModel->getCurrentSelection(), ::uno::UNO_QUERY);
++
++	if ( xRanges.is() )
++	{
++		uno::Sequence< table::CellRangeAddress > nAddrs = xRanges->getRangeAddresses();
++		for ( sal_Int32 index = 0; index < nAddrs.getLength(); ++index )
++		{
++			if ( cellInRange( nAddrs[index], thisRangeAddress.StartColumn, thisRangeAddress.StartRow ) )
++			{
++				setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel );
++				return;
++			}
++			
++		}
++	}	
++
++	if ( xRange.is() && cellInRange( xRange->getRangeAddress(), thisRangeAddress.StartColumn, thisRangeAddress.StartRow ) )
++		setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel );
++	else
++	{
++		// if this range is multi cell select the range other
++		// wise just position the cell at this single range position
++		if ( isSingleCellRange() ) 
++			// This top-leftmost cell of this Range is not in the current
++			// selection so just select this range
++			setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel, false  );
++		else
++			Select();
++	}
++
++}
++
++uno::Reference< excel::XRange >
++ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++	SCROW nStartRow = 0;
++	SCROW nEndRow = 0;
++
++	sal_Int32 nValue = 0;
++	rtl::OUString sAddress;
++
++	if ( aIndex.hasValue() )
++	{
++		ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
++		ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
++
++		ScRange aRange = *aCellRanges.First();
++		if( aIndex >>= nValue )
++		{
++			aRange.aStart.SetRow( aRange.aStart.Row() + --nValue );
++			aRange.aEnd.SetRow( aRange.aStart.Row() );
++		}
++		
++		else if ( aIndex >>= sAddress ) 
++		{
++			ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
++			ScRange tmpRange;
++			tmpRange.ParseRows( sAddress, getDocumentFromRange( mxRange ), dDetails );
++			nStartRow = tmpRange.aStart.Row();
++			nEndRow = tmpRange.aEnd.Row();
++
++			aRange.aStart.SetRow( aRange.aStart.Row() + nStartRow );
++			aRange.aEnd.SetRow( aRange.aStart.Row() + ( nEndRow  - nStartRow ));
++		}
++		else
++			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal param" ) ), uno::Reference< uno::XInterface >() );
++		
++		if ( aRange.aStart.Row() < 0 || aRange.aEnd.Row() < 0 )
++			throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() );
++		// return a normal range ( even for multi-selection
++		uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) );
++		return new ScVbaRange( getParent(), mxContext, xRange, true  );
++	}
++	// Rows() - no params
++	if ( m_Areas->getCount() > 1 )
++		return new ScVbaRange(  getParent(), mxContext, mxRanges, true );
++	return new ScVbaRange(  getParent(), mxContext, mxRange, true );
++}	
++
++uno::Reference< excel::XRange >
++ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++	SCCOL nStartCol = 0;
++	SCCOL nEndCol = 0;
++
++	sal_Int32 nValue = 0;
++	rtl::OUString sAddress;
++
++	ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
++	ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
++
++	ScRange aRange = *aCellRanges.First();
++	if ( aIndex.hasValue() )
++	{
++		if ( aIndex >>= nValue )
++		{
++			aRange.aStart.SetCol( aRange.aStart.Col() + static_cast< SCCOL > ( --nValue ) );
++			aRange.aEnd.SetCol( aRange.aStart.Col() );
++		}
++		
++		else if ( aIndex >>= sAddress ) 
++		{
++			ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
++			ScRange tmpRange;
++			tmpRange.ParseCols( sAddress, getDocumentFromRange( mxRange ), dDetails );
++			nStartCol = tmpRange.aStart.Col();
++			nEndCol = tmpRange.aEnd.Col();
++
++			aRange.aStart.SetCol( aRange.aStart.Col() + nStartCol );
++			aRange.aEnd.SetCol( aRange.aStart.Col() + ( nEndCol  - nStartCol ));
++		}
++		else
++			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal param" ) ), uno::Reference< uno::XInterface >() );
++		
++		if ( aRange.aStart.Col() < 0 || aRange.aEnd.Col() < 0 )
++			throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() );
++	}
++	// Columns() - no params
++	//return new ScVbaRange(  getParent(), mxContext, mxRange, false, true );
++	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) );
++	return new ScVbaRange( getParent(), mxContext, xRange, false, true  );
++}	
++
++void
++ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	sal_Bool bIsMerged = sal_False;
++	aIsMerged >>= bIsMerged;
++	uno::Reference< util::XMergeable > xMerge( mxRange, ::uno::UNO_QUERY_THROW );
++	//FIXME need to check whether all the cell contents are retained or lost by popping up a dialog 
++	xMerge->merge( bIsMerged );
++}
++                                                                                                                             
++uno::Any
++ScVbaRange::getMergeCells() throw (script::BasicErrorException, uno::RuntimeException)
++{
++	sal_Int32 nItems = m_Areas->getCount();
++	
++	if ( nItems > 1 )
++	{
++		uno::Any aResult = aNULL();	
++		for ( sal_Int32 index=1; index != nItems; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++			if ( index > 1 )
++				if ( aResult != xRange->getMergeCells() )
++					return aNULL();
++			aResult = xRange->getMergeCells();	
++			if ( aNULL() == aResult ) 
++				return aNULL();
++		}
++		return aResult;
++		
++	}
++	uno::Reference< util::XMergeable > xMerge( mxRange, ::uno::UNO_QUERY_THROW );
++	return uno::makeAny( xMerge->getIsMerged() );
++}
++                                                                                                                             
++void
++ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
++	if ( Destination.hasValue() )
++	{
++		uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW );
++		uno::Any aRange = xRange->getCellRange();
++		uno::Reference< table::XCellRange > xCellRange;
++		aRange >>= xCellRange;
++		uno::Reference< sheet::XSheetCellRange > xSheetCellRange(xCellRange, ::uno::UNO_QUERY_THROW);
++		uno::Reference< sheet::XSpreadsheet > xSheet = xSheetCellRange->getSpreadsheet();
++		uno::Reference< table::XCellRange > xDest( xSheet, uno::UNO_QUERY_THROW );
++		uno::Reference< sheet::XCellRangeMovement > xMover( xSheet, uno::UNO_QUERY_THROW);
++		uno::Reference< sheet::XCellAddressable > xDestination( xDest->getCellByPosition(
++												xRange->getColumn()-1,xRange->getRow()-1), uno::UNO_QUERY_THROW );
++		uno::Reference< sheet::XCellRangeAddressable > xSource( mxRange, uno::UNO_QUERY);
++		xMover->copyRange( xDestination->getCellAddress(), xSource->getRangeAddress() );
++	}
++	else
++	{
++		uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
++		Select();
++		excel::implnCopy( xModel );
++	}
++}
++
++void
++ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
++	if (Destination.hasValue())
++	{
++		uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW );
++		uno::Reference< table::XCellRange > xCellRange( xRange->getCellRange(), uno::UNO_QUERY_THROW );
++		uno::Reference< sheet::XSheetCellRange > xSheetCellRange(xCellRange, ::uno::UNO_QUERY_THROW );
++		uno::Reference< sheet::XSpreadsheet > xSheet = xSheetCellRange->getSpreadsheet();
++		uno::Reference< table::XCellRange > xDest( xSheet, uno::UNO_QUERY_THROW );
++		uno::Reference< sheet::XCellRangeMovement > xMover( xSheet, uno::UNO_QUERY_THROW);
++		uno::Reference< sheet::XCellAddressable > xDestination( xDest->getCellByPosition(
++												xRange->getColumn()-1,xRange->getRow()-1), uno::UNO_QUERY);
++		uno::Reference< sheet::XCellRangeAddressable > xSource( mxRange, uno::UNO_QUERY);
++		xMover->moveRange( xDestination->getCellAddress(), xSource->getRangeAddress() );
++	}
++	//VBA, minz@cn.ibm.com.
++	else {
++		uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
++		Select();
++		excel::implnCut( xModel );
++	}
++}
++                                                                                                                             
++void
++ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErrorException, uno::RuntimeException)
++{
++	rtl::OUString sFormat;
++	aFormat >>= sFormat;
++	if ( m_Areas->getCount() > 1 )
++	{
++		sal_Int32 nItems = m_Areas->getCount();
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++			xRange->setNumberFormat( aFormat );	
++		}
++		return;
++	}
++	NumFormatHelper numFormat( mxRange );
++	numFormat.setNumberFormat( sFormat );
++}
++                                                                                                                             
++uno::Any
++ScVbaRange::getNumberFormat() throw ( script::BasicErrorException, uno::RuntimeException)
++{
++
++	if ( m_Areas->getCount() > 1 )
++	{
++		sal_Int32 nItems = m_Areas->getCount();
++		uno::Any aResult = aNULL();
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++			// if the numberformat of one area is different to another
++			// return null
++			if ( index > 1 )
++				if ( aResult != xRange->getNumberFormat() )
++					return aNULL();
++			aResult = xRange->getNumberFormat();	
++			if ( aNULL() == aResult ) 
++				return aNULL();
++		}
++		return aResult;
++	}
++	NumFormatHelper numFormat( mxRange );
++	rtl::OUString sFormat = numFormat.getNumberFormatString();
++	if ( sFormat.getLength() > 0 )
++		return uno::makeAny( sFormat );
++	return aNULL();
++}
++
++uno::Reference< excel::XRange >
++ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw (uno::RuntimeException)
++{
++	long nRowSize = 0, nColumnSize = 0;
++	sal_Bool bIsRowChanged = ( RowSize >>= nRowSize ), bIsColumnChanged = ( ColumnSize >>= nColumnSize );
++	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, ::uno::UNO_QUERY_THROW);
++	uno::Reference< sheet::XSheetCellRange > xSheetRange(mxRange, ::uno::UNO_QUERY_THROW);
++	uno::Reference< sheet::XSheetCellCursor > xCursor( xSheetRange->getSpreadsheet()->createCursorByRange(xSheetRange), ::uno::UNO_QUERY_THROW );
++
++	if( !bIsRowChanged )
++		nRowSize = xColumnRowRange->getRows()->getCount();
++	if( !bIsColumnChanged )
++		nColumnSize = xColumnRowRange->getColumns()->getCount();
++
++	xCursor->collapseToSize( nColumnSize, nRowSize );
++	uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xCursor, ::uno::UNO_QUERY_THROW );
++	uno::Reference< table::XCellRange > xRange( xSheetRange->getSpreadsheet(), ::uno::UNO_QUERY_THROW );
++	return new ScVbaRange( getParent(), mxContext,xRange->getCellRangeByPosition(
++										xCellRangeAddressable->getRangeAddress().StartColumn,
++										xCellRangeAddressable->getRangeAddress().StartRow,
++										xCellRangeAddressable->getRangeAddress().EndColumn,
++										xCellRangeAddressable->getRangeAddress().EndRow ) );
++}
++                                                                                                                             
++void
++ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		sal_Int32 nItems = m_Areas->getCount();
++		uno::Any aResult;
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++			xRange->setWrapText( aIsWrapped );	
++		}
++		return;
++	}
++
++	uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY_THROW );
++	xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTextWrapped" ) ), aIsWrapped );
++}
++                                                                                                                             
++uno::Any
++ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		sal_Int32 nItems = m_Areas->getCount();
++		uno::Any aResult;
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++				uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++				if ( index > 1 )
++				if ( aResult != xRange->getWrapText() )
++					return aNULL();
++			aResult = xRange->getWrapText(); 
++		}
++		return aResult;
++	}
++
++	SfxItemSet* pDataSet = getCurrentDataSet();
++	
++	SfxItemState eState = pDataSet->GetItemState( ATTR_LINEBREAK, TRUE, NULL);
++	if ( eState == SFX_ITEM_DONTCARE )
++		return aNULL();
++	
++	uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY_THROW );
++	uno::Any aValue = xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTextWrapped" ) ) );
++	return aValue;
++}
++
++uno::Reference< excel::XInterior > ScVbaRange::Interior( ) throw ( script::BasicErrorException, uno::RuntimeException)
++{
++	uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW );
++        return new ScVbaInterior ( this, mxContext, xProps, getScDocument() );
++}                                                                                                                             
++uno::Reference< excel::XRange >
++ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2 ) throw (uno::RuntimeException)
++{
++    return Range( Cell1, Cell2, false );
++}
++uno::Reference< excel::XRange >
++ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (uno::RuntimeException)
++
++{
++	uno::Reference< table::XCellRange > xCellRange = mxRange;
++
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW );
++		xCellRange.set( xIndex->getByIndex( 0 ), uno::UNO_QUERY_THROW );
++	}
++	else
++		xCellRange.set( mxRange );
++
++	RangeHelper thisRange( xCellRange );
++	uno::Reference< table::XCellRange > xRanges = thisRange.getCellRangeFromSheet();
++	uno::Reference< sheet::XCellRangeAddressable > xAddressable( xRanges, uno::UNO_QUERY_THROW );
++
++	uno::Reference< table::XCellRange > xReferrer = 
++		xRanges->getCellRangeByPosition( getColumn()-1, getRow()-1, 
++				xAddressable->getRangeAddress().EndColumn, 
++				xAddressable->getRangeAddress().EndRow );
++	// xAddressable now for this range	
++	xAddressable.set( xReferrer, uno::UNO_QUERY_THROW );
++
++	
++	if( !Cell1.hasValue() )
++		throw uno::RuntimeException(
++			rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " Invalid Argument " ) ),
++			uno::Reference< XInterface >() );
++
++	table::CellRangeAddress resultAddress;
++	table::CellRangeAddress parentRangeAddress = xAddressable->getRangeAddress();
++
++	ScRange aRange;
++	// Cell1 defined only
++	if ( !Cell2.hasValue() )
++	{
++		rtl::OUString sName;
++		Cell1 >>= sName;
++		RangeHelper referRange( xReferrer );		
++		table::CellRangeAddress referAddress = referRange.getCellRangeAddressable()->getRangeAddress();
++		return getRangeForName( mxContext, sName, getScDocShell(), referAddress );
++ 
++	}
++	else
++	{
++		table::CellRangeAddress  cell1, cell2;
++		cell1 = getCellRangeAddressForVBARange( Cell1, getScDocShell() ); 	
++		// Cell1 & Cell2 defined
++		// Excel seems to combine the range as the range defined by
++		// the combination of Cell1 & Cell2
++	
++		cell2 = getCellRangeAddressForVBARange( Cell2, getScDocShell() ); 	
++
++		resultAddress.StartColumn = ( cell1.StartColumn <  cell2.StartColumn ) ? cell1.StartColumn : cell2.StartColumn;
++		resultAddress.StartRow = ( cell1.StartRow <  cell2.StartRow ) ? cell1.StartRow : cell2.StartRow;
++		resultAddress.EndColumn = ( cell1.EndColumn >  cell2.EndColumn ) ? cell1.EndColumn : cell2.EndColumn;
++		resultAddress.EndRow = ( cell1.EndRow >  cell2.EndRow ) ? cell1.EndRow : cell2.EndRow;
++		if ( bForceUseInpuRangeTab )
++		{
++			// this is a call from Application.Range( x,y )
++			// its possiblefor x or y to specify a different sheet from
++			// the current or active on ( but they must be the same )
++			if ( cell1.Sheet != cell2.Sheet )
++				throw uno::RuntimeException();
++			parentRangeAddress.Sheet = cell1.Sheet;
++		}
++		else
++		{
++			// this is not a call from Application.Range( x,y )
++			// if a different sheet from this range is specified it's
++			// an error
++			if ( parentRangeAddress.Sheet != cell1.Sheet 
++			|| parentRangeAddress.Sheet != cell2.Sheet 
++			)
++				throw uno::RuntimeException();
++
++		}
++		ScUnoConversion::FillScRange( aRange, resultAddress );
++	}
++	ScRange parentAddress;
++	ScUnoConversion::FillScRange( parentAddress, parentRangeAddress);	
++	if ( aRange.aStart.Col() >= 0 && aRange.aStart.Row() >= 0 && aRange.aEnd.Col() >= 0 && aRange.aEnd.Row() >= 0 )
++	{
++		sal_Int32 nStartX = parentAddress.aStart.Col() + aRange.aStart.Col();
++		sal_Int32 nStartY = parentAddress.aStart.Row() + aRange.aStart.Row();
++		sal_Int32 nEndX = parentAddress.aStart.Col() + aRange.aEnd.Col();
++		sal_Int32 nEndY = parentAddress.aStart.Row() + aRange.aEnd.Row();
++
++		if ( nStartX <= nEndX && nEndX <= parentAddress.aEnd.Col() &&
++			 nStartY <= nEndY && nEndY <= parentAddress.aEnd.Row() )
++		{
++			ScRange aNew( (SCCOL)nStartX, (SCROW)nStartY, parentAddress.aStart.Tab(),
++						  (SCCOL)nEndX, (SCROW)nEndY, parentAddress.aEnd.Tab() );
++			xCellRange = new ScCellRangeObj( getScDocShell(), aNew );
++		}
++	}
++		
++	return new ScVbaRange( getParent(), mxContext, xCellRange );
++
++}
++
++// Allow access to underlying openoffice uno api ( useful for debugging
++// with openoffice basic ) 
++::com::sun::star::uno::Any SAL_CALL
++ScVbaRange::getCellRange(  ) throw (::com::sun::star::uno::RuntimeException)
++{
++	uno::Any aAny;
++	if ( mxRanges.is() )
++		aAny <<= mxRanges;
++	else if ( mxRange.is() )
++		aAny <<= mxRange;
++	return aAny;
++}
++
++static USHORT 
++getPasteFlags (sal_Int32 Paste)
++{
++	USHORT nFlags = IDF_NONE;	
++	switch (Paste) {
++        case excel::XlPasteType::xlPasteComments: 
++		nFlags = IDF_NOTE;break;
++        case excel::XlPasteType::xlPasteFormats: 
++		nFlags = IDF_ATTRIB;break;
++        case excel::XlPasteType::xlPasteFormulas: 
++		nFlags = IDF_FORMULA;break;
++        case excel::XlPasteType::xlPasteFormulasAndNumberFormats : 
++        case excel::XlPasteType::xlPasteValues: 
++#ifdef VBA_OOBUILD_HACK
++		nFlags = ( IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_SPECIAL_BOOLEAN ); break;
++#else
++		nFlags = ( IDF_VALUE | IDF_DATETIME | IDF_STRING ); break;
++#endif
++        case excel::XlPasteType::xlPasteValuesAndNumberFormats:
++		nFlags = IDF_VALUE | IDF_ATTRIB; break;
++        case excel::XlPasteType::xlPasteColumnWidths:
++        case excel::XlPasteType::xlPasteValidation: 
++		nFlags = IDF_NONE;break;
++	case excel::XlPasteType::xlPasteAll: 
++        case excel::XlPasteType::xlPasteAllExceptBorders: 
++	default:
++		nFlags = IDF_ALL;break;
++	};
++return nFlags;
++}
++
++static USHORT 
++getPasteFormulaBits( sal_Int32 Operation)
++{
++	USHORT nFormulaBits = PASTE_NOFUNC ;
++	switch (Operation)
++	{
++	case excel::XlPasteSpecialOperation::xlPasteSpecialOperationAdd: 
++		nFormulaBits = PASTE_ADD;break;
++	case excel::XlPasteSpecialOperation::xlPasteSpecialOperationSubtract: 
++		nFormulaBits = PASTE_SUB;break;
++	case excel::XlPasteSpecialOperation::xlPasteSpecialOperationMultiply: 
++		nFormulaBits = PASTE_MUL;break;
++	case excel::XlPasteSpecialOperation::xlPasteSpecialOperationDivide:
++		nFormulaBits = PASTE_DIV;break;
++
++	case excel::XlPasteSpecialOperation::xlPasteSpecialOperationNone: 
++	default:
++		nFormulaBits = PASTE_NOFUNC; break;
++	};
++	
++return nFormulaBits;
++}
++void SAL_CALL 
++ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (::com::sun::star::uno::RuntimeException) 
++{
++	if ( m_Areas->getCount() > 1 )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
++        ScDocShell* pShell = getScDocShell(); 
++  
++        uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW );
++	uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++	// save old selection
++	uno::Reference< uno::XInterface > xSel( xModel->getCurrentSelection() );
++	// select this range
++	xSelection->select( uno::makeAny( mxRange ) );
++	// set up defaults	
++	sal_Int32 nPaste = excel::XlPasteType::xlPasteAll;
++	sal_Int32 nOperation = excel::XlPasteSpecialOperation::xlPasteSpecialOperationNone;
++	sal_Bool bTranspose = sal_False;
++	sal_Bool bSkipBlanks = sal_False;
++
++	if ( Paste.hasValue() )
++		Paste >>= nPaste;
++	if ( Operation.hasValue() )
++		Operation >>= nOperation;
++	if ( SkipBlanks.hasValue() )
++		SkipBlanks >>= bSkipBlanks;
++	if ( Transpose.hasValue() )
++		Transpose >>= bTranspose;
++
++	USHORT nFlags = getPasteFlags(nPaste);
++	USHORT nFormulaBits = getPasteFormulaBits(nOperation);
++	excel::implnPasteSpecial(pShell->GetModel(), nFlags,nFormulaBits,bSkipBlanks,bTranspose);
++	// restore selection
++	xSelection->select( uno::makeAny( xSel ) );
++}
++
++uno::Reference< excel::XRange > 
++ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException)
++{
++	ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
++	// copy the range list
++	ScRangeList aCellRanges = pUnoRangesBase->GetRangeList(); 
++
++	for ( ScRange* pRange = aCellRanges.First() ; pRange; pRange = aCellRanges.Next() )
++	{
++		if ( bColumn ) 
++		{
++			pRange->aStart.SetRow( 0 );
++			pRange->aEnd.SetRow( MAXROW );
++		}	
++		else
++		{
++			pRange->aStart.SetCol( 0 );
++			pRange->aEnd.SetCol( MAXCOL );
++		}
++	}
++	if ( aCellRanges.Count() > 1 ) // Multi-Area
++	{
++		uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pUnoRangesBase->GetDocShell(), aCellRanges ) );
++		
++		return new ScVbaRange( getParent(), mxContext, xRanges, !bColumn, bColumn );
++	}
++	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), *aCellRanges.First() ) );
++	return new ScVbaRange( getParent(), mxContext, xRange, !bColumn, bColumn  );
++}
++
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaRange::getEntireRow() throw (uno::RuntimeException)
++{
++	return getEntireColumnOrRow(false);
++}
++
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaRange::getEntireColumn() throw (uno::RuntimeException)
++{
++	return getEntireColumnOrRow();
++}
++
++uno::Reference< excel::XComment > SAL_CALL 
++ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException)
++{
++
++	uno::Reference< excel::XComment > xComment( new ScVbaComment( this, mxContext, mxRange ) );
++        // if there is existing text then error
++	if ( Text.hasValue() && xComment->Text( uno::Any(), uno::Any(), uno::Any() ).getLength() )
++            throw uno::RuntimeException(); 
++        // failed to write text? ( can this happen ?? )
++	if ( !xComment->Text( Text, uno::Any(), uno::Any() ).getLength()  )
++		return NULL;	
++	return xComment;
++}
++
++uno::Reference< excel::XComment > SAL_CALL
++ScVbaRange::getComment() throw (uno::RuntimeException)
++{
++	// intentional behavior to return a null object if no
++	// comment defined
++	uno::Reference< excel::XComment > xComment( new ScVbaComment( this, mxContext, mxRange ) );
++	if ( !xComment->Text( uno::Any(), uno::Any(), uno::Any() ).getLength() )
++		return NULL;
++	return xComment;
++	
++}
++
++uno::Reference< beans::XPropertySet >
++getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool bRows ) throw ( uno::RuntimeException )
++{
++	uno::Reference< table::XColumnRowRange > xColRow( xCellRange, uno::UNO_QUERY_THROW );
++	uno::Reference< beans::XPropertySet > xProps;
++	if ( bRows )
++		xProps.set( xColRow->getRows(), uno::UNO_QUERY_THROW );
++	else
++		xProps.set( xColRow->getColumns(), uno::UNO_QUERY_THROW );
++	return xProps;	
++}
++
++uno::Any SAL_CALL 
++ScVbaRange::getHidden() throw (uno::RuntimeException)
++{
++	// if multi-area result is the result of the 
++	// first area
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(sal_Int32(1)), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xRange->getHidden();	
++	}
++	bool bIsVisible = false;
++	try
++	{
++		uno::Reference< beans::XPropertySet > xProps = getRowOrColumnProps( mxRange, mbIsRows );
++		if ( !( xProps->getPropertyValue( ISVISIBLE ) >>= bIsVisible ) )
++			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to get IsVisible property")), uno::Reference< uno::XInterface >() );
++	}
++	catch( uno::Exception& e )
++	{
++		throw uno::RuntimeException( e.Message, uno::Reference< uno::XInterface >() );
++	}
++	return uno::makeAny( !bIsVisible ); 
++}
++
++void SAL_CALL 
++ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		sal_Int32 nItems = m_Areas->getCount();
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++			xRange->setHidden( _hidden );	
++		}
++		return;
++	}
++
++	sal_Bool bHidden = sal_False;
++	_hidden >>= bHidden;
++
++	try
++	{
++		uno::Reference< beans::XPropertySet > xProps = getRowOrColumnProps( mxRange, mbIsRows );
++		xProps->setPropertyValue( ISVISIBLE, uno::makeAny( !bHidden ) );
++	}
++	catch( uno::Exception& e )
++	{
++		throw uno::RuntimeException( e.Message, uno::Reference< uno::XInterface >() );
++	}	
++}
++
++::sal_Bool SAL_CALL 
++ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat  ) throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		for ( sal_Int32 index = 1; index <= m_Areas->getCount(); ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++			xRange->Replace( What, Replacement,  LookAt, SearchOrder, MatchCase, MatchByte, SearchFormat, ReplaceFormat );
++		}
++		return sal_True; // seems to return true always ( or at least I haven't found the trick of 
++	}	
++
++	// sanity check required params
++	if ( !What.getLength() /*|| !Replacement.getLength()*/ )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, missing params" )) , uno::Reference< uno::XInterface >() );
++	rtl::OUString sWhat = VBAToRegexp( What);
++	// #TODO #FIXME SearchFormat & ReplacesFormat are not processed
++	// What do we do about MatchByte.. we don't seem to support that
++	const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem();
++	SvxSearchItem newOptions( globalSearchOptions );
++
++	sal_Int16 nLook =  globalSearchOptions.GetWordOnly() ?  excel::XlLookAt::xlPart : excel::XlLookAt::xlWhole; 
++	sal_Int16 nSearchOrder = globalSearchOptions.GetRowDirection() ? excel::XlSearchOrder::xlByRows : excel::XlSearchOrder::xlByColumns;
++
++	sal_Bool bMatchCase = sal_False;
++	uno::Reference< util::XReplaceable > xReplace( mxRange, uno::UNO_QUERY );
++	if ( xReplace.is() )
++	{
++		uno::Reference< util::XReplaceDescriptor > xDescriptor =
++			xReplace->createReplaceDescriptor();
++		
++		xDescriptor->setSearchString( sWhat); 		
++		xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHREGEXP ) ), uno::makeAny( sal_True ) ); 	
++		xDescriptor->setReplaceString( Replacement); 		
++		if ( LookAt.hasValue() )
++		{
++			// sets SearchWords ( true is Cell match )
++			nLook =  ::comphelper::getINT16( LookAt );
++			sal_Bool bSearchWords = sal_False;
++			if ( nLook == excel::XlLookAt::xlPart )
++				bSearchWords = sal_False;
++			else if ( nLook == excel::XlLookAt::xlWhole )
++				bSearchWords = sal_True;
++			else
++				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for LookAt" )) , uno::Reference< uno::XInterface >() );
++			// set global search props ( affects the find dialog
++			// and of course the defaults for this method
++			newOptions.SetWordOnly( bSearchWords );
++			xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHWORDS ) ), uno::makeAny( bSearchWords ) ); 	
++		}
++		// sets SearchByRow ( true for Rows )
++		if ( SearchOrder.hasValue() )
++		{
++			nSearchOrder =  ::comphelper::getINT16( SearchOrder );
++			sal_Bool bSearchByRow = sal_False;
++			if ( nSearchOrder == excel::XlSearchOrder::xlByColumns )
++				bSearchByRow = sal_False;
++			else if ( nSearchOrder == excel::XlSearchOrder::xlByRows )
++				bSearchByRow = sal_True;
++			else
++				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for SearchOrder" )) , uno::Reference< uno::XInterface >() );
++			
++			newOptions.SetRowDirection( bSearchByRow ); 
++			xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHBYROW ) ), uno::makeAny( bSearchByRow ) ); 	
++		}			
++		if ( MatchCase.hasValue() )
++		{
++			// SearchCaseSensitive
++			MatchCase >>= bMatchCase;	
++			xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHCASE ) ), uno::makeAny( bMatchCase ) ); 	
++		}			
++
++		ScGlobal::SetSearchItem( newOptions );	
++		// ignore MatchByte for the moment, its not supported in
++		// OOo.org afaik
++
++		uno::Reference< util::XSearchDescriptor > xSearch( xDescriptor, uno::UNO_QUERY );
++		xReplace->replaceAll( xSearch );
++	}
++	return sal_True; // always
++}
++
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ ) throw (uno::RuntimeException)
++{
++    // return a Range object that represents the first cell where that information is found.
++    rtl::OUString sWhat;
++    sal_Int32 nWhat = 0;
++    float fWhat = 0.0;
++    
++    // string.
++    if( What >>= sWhat )
++    {
++        if( !sWhat.getLength() )
++		    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Find, missing params" )) , uno::Reference< uno::XInterface >() );
++    }
++    else if( What >>= nWhat )
++    {
++        sWhat = rtl::OUString::valueOf( nWhat );
++    }
++    else if( What >>= fWhat )
++    {
++        sWhat = rtl::OUString::valueOf( fWhat );
++    }
++    else
++	    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Find, missing params" )) , uno::Reference< uno::XInterface >() );
++
++    rtl::OUString sSearch = VBAToRegexp( sWhat );
++
++	const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem();
++	SvxSearchItem newOptions( globalSearchOptions );
++
++	sal_Int16 nLookAt =  globalSearchOptions.GetWordOnly() ?  excel::XlLookAt::xlPart : excel::XlLookAt::xlWhole; 
++	sal_Int16 nSearchOrder = globalSearchOptions.GetRowDirection() ? excel::XlSearchOrder::xlByRows : excel::XlSearchOrder::xlByColumns;
++
++	uno::Reference< util::XSearchable > xSearch( mxRange, uno::UNO_QUERY );
++    if( xSearch.is() )
++    {
++        uno::Reference< util::XSearchDescriptor > xDescriptor = xSearch->createSearchDescriptor();
++        xDescriptor->setSearchString( sSearch );
++
++        uno::Reference< excel::XRange > xAfterRange;
++        uno::Reference< table::XCellRange > xStartCell;
++        if( After >>= xAfterRange )
++        {
++            // After must be a single cell in the range
++            if( xAfterRange->getCount() > 1 )
++		        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("After must be a single cell." )) , uno::Reference< uno::XInterface >() );
++            uno::Reference< excel::XRange > xCell( Cells( uno::makeAny( xAfterRange->getRow() ), uno::makeAny( xAfterRange->getColumn() ) ), uno::UNO_QUERY );
++            if( !xCell.is() )
++		        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("After must be in range." )) , uno::Reference< uno::XInterface >() );
++            xStartCell.set( xAfterRange->getCellRange(), uno::UNO_QUERY_THROW );
++        }
++
++        // LookIn
++        if( LookIn.hasValue() )
++        {
++            sal_Int32 nLookIn = 0;
++            if( LookIn >>= nLookIn )
++            {
++                sal_Int16 nSearchType = 0; 
++                switch( nLookIn )
++                {
++                    case excel::XlFindLookIn::xlComments :
++                        nSearchType = SVX_SEARCHIN_NOTE; // Notes
++                    break;
++                    case excel::XlFindLookIn::xlFormulas :
++                        nSearchType = SVX_SEARCHIN_FORMULA;
++                    break;
++                    case excel::XlFindLookIn::xlValues :
++                        nSearchType = SVX_SEARCHIN_VALUE;
++                    break;
++                    default:
++		                throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for LookIn." )) , uno::Reference< uno::XInterface >() );
++                }
++                newOptions.SetCellType( nSearchType );
++                xDescriptor->setPropertyValue( rtl::OUString::createFromAscii( "SearchType" ), uno::makeAny( nSearchType ) );
++            }
++        }
++
++        // LookAt
++		if ( LookAt.hasValue() )
++		{
++			nLookAt =  ::comphelper::getINT16( LookAt );
++			sal_Bool bSearchWords = sal_False;
++			if ( nLookAt == excel::XlLookAt::xlPart )
++				bSearchWords = sal_False;
++			else if ( nLookAt == excel::XlLookAt::xlWhole )
++				bSearchWords = sal_True;
++			else
++				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for LookAt" )) , uno::Reference< uno::XInterface >() );
++			newOptions.SetWordOnly( bSearchWords );
++			xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHWORDS ) ), uno::makeAny( bSearchWords ) ); 	
++        }
++
++        // SearchOrder
++		if ( SearchOrder.hasValue() )
++		{
++			nSearchOrder =  ::comphelper::getINT16( SearchOrder );
++			sal_Bool bSearchByRow = sal_False;
++			if ( nSearchOrder == excel::XlSearchOrder::xlByColumns )
++				bSearchByRow = sal_False;
++			else if ( nSearchOrder == excel::XlSearchOrder::xlByRows )
++				bSearchByRow = sal_True;
++			else
++				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for SearchOrder" )) , uno::Reference< uno::XInterface >() );
++			
++			newOptions.SetRowDirection( bSearchByRow ); 
++			xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHBYROW ) ), uno::makeAny( bSearchByRow ) ); 	
++		}			
++
++        // SearchDirection
++        if ( SearchDirection.hasValue() )
++        {
++            sal_Int32 nSearchDirection = 0;
++            if( SearchDirection >>= nSearchDirection )
++            {
++                sal_Bool bSearchBackwards = sal_False;
++                if ( nSearchDirection == excel::XlSearchDirection::xlNext )
++                    bSearchBackwards = sal_False; 
++                else if( nSearchDirection == excel::XlSearchDirection::xlPrevious )
++                    bSearchBackwards = sal_True;
++                else
++				    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for SearchDirection" )) , uno::Reference< uno::XInterface >() );
++                newOptions.SetBackward( bSearchBackwards );
++                xDescriptor->setPropertyValue( rtl::OUString::createFromAscii( "SearchBackwards" ), uno::makeAny( bSearchBackwards ) );
++            }
++        }
++
++        // MatchCase
++        sal_Bool bMatchCase = sal_False;
++		if ( MatchCase.hasValue() )
++		{
++			// SearchCaseSensitive
++			if( !( MatchCase >>= bMatchCase ) )
++			    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for MatchCase" )) , uno::Reference< uno::XInterface >() );
++		}			
++        xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHCASE ) ), uno::makeAny( bMatchCase ) ); 	
++
++        // MatchByte
++        // SearchFormat
++        // ignore
++
++		ScGlobal::SetSearchItem( newOptions );	
++
++		uno::Reference< util::XSearchDescriptor > xSearchDescriptor( xDescriptor, uno::UNO_QUERY );
++		uno::Reference< uno::XInterface > xInterface = xStartCell.is() ? xSearch->findNext( xStartCell, xSearchDescriptor) : xSearch->findFirst( xSearchDescriptor );
++		uno::Reference< table::XCellRange > xCellRange( xInterface, uno::UNO_QUERY );
++        if ( xCellRange.is() )
++        {
++            uno::Reference< excel::XRange > xResultRange = new ScVbaRange( this, mxContext, xCellRange );
++            if( xResultRange.is() )
++            {
++                xResultRange->Select();
++                return xResultRange;
++            }
++        }
++
++    }
++
++    return uno::Reference< excel::XRange >();
++}
++
++uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Reference<  uno::XComponentContext >& xContext, ScDocShell* pDocSh )
++{
++	uno::Reference< excel::XRange > xKeyRange;
++	if ( Key.getValueType() == excel::XRange::static_type() )
++	{
++		xKeyRange.set( Key, uno::UNO_QUERY_THROW );
++	}
++	else if ( Key.getValueType() == ::getCppuType( static_cast< const rtl::OUString* >(0) )  )
++			
++	{
++		rtl::OUString sRangeName = ::comphelper::getString( Key );
++		table::CellRangeAddress  aRefAddr;
++		if ( !pDocSh )
++			throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Range::Sort no docshell to calculate key param")), uno::Reference< uno::XInterface >() );
++		xKeyRange = getRangeForName( xContext, sRangeName, pDocSh, aRefAddr ); 
++	}
++	else
++		throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Range::Sort illegal type value for key param")), uno::Reference< uno::XInterface >() );
++	uno::Reference< table::XCellRange > xKey;
++	xKey.set( xKeyRange->getCellRange(), uno::UNO_QUERY_THROW );
++	return xKey;
++}
++
++// helper method for Sort
++sal_Int32 findSortPropertyIndex( const uno::Sequence< beans::PropertyValue >& props,
++const rtl::OUString& sPropName ) throw( uno::RuntimeException )
++{
++	const beans::PropertyValue* pProp = props.getConstArray();
++	sal_Int32 nItems = props.getLength();
++
++	 sal_Int32 count=0;
++	for ( ; count < nItems; ++count, ++pProp )
++		if ( pProp->Name.equals( sPropName ) )
++			return count;
++	if ( count == nItems )
++		throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Range::Sort unknown sort property")), uno::Reference< uno::XInterface >() );
++	return -1; //should never reach here ( satisfy compiler )
++}
++
++// helper method for Sort
++void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRange,
++	const uno::Reference< table::XCellRange >& xColRowKey, sal_Int16 nOrder, 
++	table::TableSortField& aTableField, sal_Bool bIsSortColumn, sal_Bool bMatchCase ) throw ( uno::RuntimeException )
++{
++		RangeHelper parentRange( xParentRange );	
++		RangeHelper colRowRange( xColRowKey );	
++
++		table::CellRangeAddress parentRangeAddress = parentRange.getCellRangeAddressable()->getRangeAddress();
++
++		table::CellRangeAddress colRowKeyAddress = colRowRange.getCellRangeAddressable()->getRangeAddress();
++
++		// make sure that upper left poing of key range is within the
++		// parent range
++		if (  ( !bIsSortColumn && colRowKeyAddress.StartColumn >= parentRangeAddress.StartColumn &&
++			colRowKeyAddress.StartColumn <= parentRangeAddress.EndColumn ) || ( bIsSortColumn && 
++			colRowKeyAddress.StartRow >= parentRangeAddress.StartRow &&
++			colRowKeyAddress.StartRow <= parentRangeAddress.EndRow  ) )
++		{
++			//determine col/row index
++			if ( bIsSortColumn )
++				aTableField.Field = colRowKeyAddress.StartRow - parentRangeAddress.StartRow;			 
++			else
++				aTableField.Field = colRowKeyAddress.StartColumn - parentRangeAddress.StartColumn;			 
++			aTableField.IsCaseSensitive = bMatchCase;
++
++			if ( nOrder ==  excel::XlSortOrder::xlAscending ) 
++				aTableField.IsAscending = sal_True; 
++			else	
++				aTableField.IsAscending = sal_False; 
++		}
++		else
++			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal Key param" ) ), uno::Reference< uno::XInterface >() );
++
++						
++} 
++
++void SAL_CALL
++ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& Key2, const uno::Any& /*Type*/, const uno::Any& Order2, const uno::Any& Key3, const uno::Any& Order3, const uno::Any& Header, const uno::Any& OrderCustom, const uno::Any& MatchCase, const uno::Any& Orientation, const uno::Any& SortMethod,  const uno::Any& DataOption1, const uno::Any& DataOption2, const uno::Any& DataOption3  ) throw (uno::RuntimeException)
++{
++	// #TODO# #FIXME# can we do something with Type
++	if ( m_Areas->getCount() > 1 )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
++
++	sal_Int16 nDataOption1 = excel::XlSortDataOption::xlSortNormal;
++	sal_Int16 nDataOption2 = excel::XlSortDataOption::xlSortNormal;;
++	sal_Int16 nDataOption3 = excel::XlSortDataOption::xlSortNormal;
++
++	ScDocument* pDoc = getScDocument();
++	if ( !pDoc )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
++
++	RangeHelper thisRange( mxRange );
++	table::CellRangeAddress thisRangeAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++	ScSortParam aSortParam;
++	SCTAB nTab = thisRangeAddress.Sheet;
++	pDoc->GetSortParam( aSortParam, nTab );
++
++	if ( DataOption1.hasValue() )
++		DataOption1 >>= nDataOption1;
++	if ( DataOption2.hasValue() )
++		DataOption2 >>= nDataOption2;
++	if ( DataOption3.hasValue() )
++		DataOption3 >>= nDataOption3;
++
++	// 1) #TODO #FIXME need to process DataOption[1..3] not used currently
++	// 2) #TODO #FIXME need to refactor this ( below ) into a IsSingleCell() method
++	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
++			
++	// 'Fraid I don't remember what I was trying to achieve here ???
++/* 
++	if (  isSingleCellRange() )
++	{
++		uno::Reference< XRange > xCurrent = CurrentRegion();
++		xCurrent->Sort( Key1, Order1, Key2, Type, Order2, Key3, Order3, Header, OrderCustom, MatchCase, Orientation, SortMethod, DataOption1, DataOption2, DataOption3 );
++		return; 
++	}
++*/
++	// set up defaults
++
++	sal_Int16 nOrder1 = aSortParam.bAscending[0] ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
++	sal_Int16 nOrder2 = aSortParam.bAscending[1] ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
++	sal_Int16 nOrder3 = aSortParam.bAscending[2] ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
++
++	sal_Int16 nCustom = aSortParam.nUserIndex;
++	sal_Int16 nSortMethod = excel::XlSortMethod::xlPinYin;
++	sal_Bool bMatchCase = aSortParam.bCaseSens;
++
++	// seems to work opposite to expected, see below
++	sal_Int16 nOrientation = aSortParam.bByRow ?  excel::XlSortOrientation::xlSortColumns :  excel::XlSortOrientation::xlSortRows;
++
++	if ( Orientation.hasValue() )
++	{
++		// Documentation says xlSortRows is default but that doesn't appear to be 
++		// the case. Also it appears that xlSortColumns is the default which 
++		// strangely enought sorts by Row
++		nOrientation = ::comphelper::getINT16( Orientation );
++		// persist new option to be next calls default
++		if ( nOrientation == excel::XlSortOrientation::xlSortRows )
++			aSortParam.bByRow = FALSE;
++		else
++			aSortParam.bByRow = TRUE;
++
++	}
++
++	sal_Bool bIsSortColumns=sal_False; // sort by row
++
++	if ( nOrientation == excel::XlSortOrientation::xlSortRows )
++		bIsSortColumns = sal_True;
++	sal_Int16 nHeader = 0;
++#ifdef VBA_OOBUILD_HACK
++	nHeader = aSortParam.nCompatHeader;
++#endif
++	sal_Bool bContainsHeader = sal_False;
++
++	if ( Header.hasValue() )
++	{
++		nHeader = ::comphelper::getINT16( Header );
++#ifdef VBA_OOBUILD_HACK
++		aSortParam.nCompatHeader = nHeader;
++#endif
++	}			
++
++	if ( nHeader == excel::XlYesNoGuess::xlGuess )
++	{
++		bool bHasColHeader = pDoc->HasColHeader(  static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), static_cast< SCCOL >( thisRangeAddress.EndColumn ), static_cast< SCROW >( thisRangeAddress.EndRow ), static_cast< SCTAB >( thisRangeAddress.Sheet ));
++		bool bHasRowHeader = pDoc->HasRowHeader(  static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), static_cast< SCCOL >( thisRangeAddress.EndColumn ), static_cast< SCROW >( thisRangeAddress.EndRow ), static_cast< SCTAB >( thisRangeAddress.Sheet ) );
++		if ( bHasColHeader || bHasRowHeader )
++			nHeader =  excel::XlYesNoGuess::xlYes; 
++		else
++			nHeader =  excel::XlYesNoGuess::xlNo; 
++#ifdef VBA_OOBUILD_HACK 
++		aSortParam.nCompatHeader = nHeader;
++#endif
++	}
++
++	if ( nHeader == excel::XlYesNoGuess::xlYes )
++		bContainsHeader = sal_True;
++
++	if ( SortMethod.hasValue() )
++	{
++		nSortMethod = ::comphelper::getINT16( SortMethod );
++	}
++	
++	if ( OrderCustom.hasValue() )
++	{
++		OrderCustom >>= nCustom;
++		--nCustom; // 0-based in OOo
++		aSortParam.nUserIndex = nCustom;
++	}
++
++	if ( MatchCase.hasValue() )
++	{
++		MatchCase >>= bMatchCase;
++		aSortParam.bCaseSens = bMatchCase;
++	}
++
++	if ( Order1.hasValue() )
++	{
++		nOrder1 = ::comphelper::getINT16(Order1);
++		if (  nOrder1 == excel::XlSortOrder::xlAscending ) 
++			aSortParam.bAscending[0]  = TRUE;
++		else
++			aSortParam.bAscending[0]  = FALSE;
++
++	}
++	if ( Order2.hasValue() )
++	{
++		nOrder2 = ::comphelper::getINT16(Order2);
++		if ( nOrder2 == excel::XlSortOrder::xlAscending ) 
++			aSortParam.bAscending[1]  = TRUE;
++		else
++			aSortParam.bAscending[1]  = FALSE;
++	}
++	if ( Order3.hasValue() )
++	{
++		nOrder3 = ::comphelper::getINT16(Order3);
++		if ( nOrder3 == excel::XlSortOrder::xlAscending ) 
++			aSortParam.bAscending[2]  = TRUE;
++		else
++			aSortParam.bAscending[2]  = FALSE;
++	}
++
++	uno::Reference< table::XCellRange > xKey1;	
++	uno::Reference< table::XCellRange > xKey2;	
++	uno::Reference< table::XCellRange > xKey3;	
++	ScDocShell* pDocShell = getScDocShell();
++	xKey1 = processKey( Key1, mxContext, pDocShell );
++	if ( !xKey1.is() )
++		throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Range::Sort needs a key1 param")), uno::Reference< uno::XInterface >() );
++
++	if ( Key2.hasValue() )
++		xKey2 = processKey( Key2, mxContext, pDocShell );
++	if ( Key3.hasValue() )
++		xKey3 = processKey( Key3, mxContext, pDocShell );
++
++	uno::Reference< util::XSortable > xSort( mxRange, uno::UNO_QUERY_THROW );
++	uno::Sequence< beans::PropertyValue > sortDescriptor = xSort->createSortDescriptor();
++	sal_Int32 nTableSortFieldIndex = findSortPropertyIndex( sortDescriptor, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SortFields") ) );
++
++	uno::Sequence< table::TableSortField > sTableFields(1);
++	sal_Int32 nTableIndex = 0;
++	updateTableSortField(  mxRange, xKey1, nOrder1, sTableFields[ nTableIndex++ ], bIsSortColumns, bMatchCase );
++
++	if ( xKey2.is() ) 
++	{
++		sTableFields.realloc( sTableFields.getLength() + 1 );
++		updateTableSortField(  mxRange, xKey2, nOrder2, sTableFields[ nTableIndex++ ], bIsSortColumns, bMatchCase );
++	}
++	if ( xKey3.is()  ) 
++	{
++		sTableFields.realloc( sTableFields.getLength() + 1 );
++		updateTableSortField(  mxRange, xKey3, nOrder3, sTableFields[ nTableIndex++ ], bIsSortColumns, bMatchCase );
++	}
++	sortDescriptor[ nTableSortFieldIndex ].Value <<= sTableFields;
++
++	sal_Int32 nIndex = 	findSortPropertyIndex( sortDescriptor,  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSortColumns")) );
++	sortDescriptor[ nIndex ].Value <<= bIsSortColumns;
++
++	nIndex = 	findSortPropertyIndex( sortDescriptor, CONTS_HEADER );
++	sortDescriptor[ nIndex ].Value <<= bContainsHeader;
++
++	pDoc->SetSortParam( aSortParam, nTab );
++	xSort->sort( sortDescriptor );
++
++	// #FIXME #TODO
++	// The SortMethod param is not processed ( not sure what its all about, need to
++
++}
++
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaRange::End( ::sal_Int32 Direction )  throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
++		return xRange->End( Direction );
++	}
++
++	
++	// #FIXME #TODO
++	// euch! found my orig implementation sucked, so 
++	// trying this even suckier one ( really need to use/expose code in
++	// around  ScTabView::MoveCursorArea(), thats the bit that calcutes
++	// where the cursor should go ) 
++	// Main problem with this method is the ultra hacky attempt to preserve
++	// the ActiveCell, there should be no need to go to these extreems
++	
++	// Save ActiveCell pos ( to restore later )
++	uno::Any aDft;
++	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
++	rtl::OUString sActiveCell = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
++
++	// position current cell upper left of this range
++	Cells( uno::makeAny( (sal_Int32) 1 ), uno::makeAny( (sal_Int32) 1 ) )->Select();
++
++        uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
++
++	SfxViewFrame* pViewFrame = excel::getViewFrame( xModel );
++	if ( pViewFrame )
++	{
++		SfxAllItemSet aArgs( SFX_APP()->GetPool() );
++		// Hoping this will make sure this slot is called
++		// synchronously
++		SfxBoolItem sfxAsync( SID_ASYNCHRON, sal_False );
++		aArgs.Put( sfxAsync, sfxAsync.Which() );
++		SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
++
++		USHORT nSID = 0;
++	
++		switch( Direction )
++		{
++			case excel::XlDirection::xlDown:
++				nSID = SID_CURSORBLKDOWN;
++				break;
++			case excel::XlDirection::xlUp:
++				nSID = SID_CURSORBLKUP;
++				break;
++			case excel::XlDirection::xlToLeft:
++				nSID = SID_CURSORBLKLEFT;
++				break;
++			case excel::XlDirection::xlToRight:
++				nSID = SID_CURSORBLKRIGHT;
++				break;
++			default:
++				throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": Invalid ColumnIndex" ) ), uno::Reference< uno::XInterface >() ); 
++		}
++		if ( pDispatcher )
++		{
++			pDispatcher->Execute( nSID, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
++		}
++	}
++
++	// result is the ActiveCell		
++	rtl::OUString sMoved =	xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
++
++	// restore old ActiveCell		
++	uno::Any aVoid;
++
++	uno::Reference< excel::XRange > xOldActiveCell( xApplication->getActiveSheet()->Range( uno::makeAny( sActiveCell ), aVoid ), uno::UNO_QUERY_THROW );
++	xOldActiveCell->Select();
++
++	uno::Reference< excel::XRange > resultCell;
++	
++	resultCell.set( xApplication->getActiveSheet()->Range( uno::makeAny( sMoved ), aVoid ), uno::UNO_QUERY_THROW );
++
++	// return result
++	
++	return resultCell;
++}
++
++bool
++ScVbaRange::isSingleCellRange()
++{
++	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY);
++	if ( xColumnRowRange.is() && xColumnRowRange->getRows()->getCount() == 1 && xColumnRowRange->getColumns()->getCount() == 1 )
++		return true;
++	return false;
++}
++
++uno::Reference< excel::XCharacters > SAL_CALL 
++ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException)
++{
++	if ( !isSingleCellRange() )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can't create Characters property for multicell range ") ), uno::Reference< uno::XInterface >() );
++	uno::Reference< text::XSimpleText > xSimple(mxRange->getCellByPosition(0,0) , uno::UNO_QUERY_THROW );
++	ScDocument* pDoc = getDocumentFromRange(mxRange);
++	if ( !pDoc )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
++
++	ScVbaPalette aPalette( pDoc->GetDocumentShell() );
++	return  new ScVbaCharacters( this, mxContext, aPalette, xSimple, Start, Length );
++}
++
++ void SAL_CALL 
++ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		sal_Int32 nItems = m_Areas->getCount();
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++			xRange->Delete( Shift );	
++		}
++		return;
++	}
++	sheet::CellDeleteMode mode = sheet::CellDeleteMode_NONE ; 
++	RangeHelper thisRange( mxRange );
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++	if ( Shift.hasValue() )		
++	{
++		sal_Int32 nShift = 0;
++		Shift >>= nShift;
++		switch ( nShift )
++		{
++			case excel::XlDeleteShiftDirection::xlShiftUp:
++				mode = sheet::CellDeleteMode_UP;
++				break;
++			case excel::XlDeleteShiftDirection::xlShiftToLeft:
++				mode = sheet::CellDeleteMode_LEFT;
++				break;
++			default:
++				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ("Illegal paramater ") ), uno::Reference< uno::XInterface >() );
++		}
++	}
++	else
++        {
++		bool bFullRow = ( thisAddress.StartColumn == 0 && thisAddress.EndColumn == MAXCOL );
++	        sal_Int32 nCols = thisAddress.EndColumn - thisAddress.StartColumn;
++	        sal_Int32 nRows = thisAddress.EndRow - thisAddress.StartRow;
++		if ( mbIsRows || bFullRow || ( nCols >=  nRows ) )
++			mode = sheet::CellDeleteMode_UP;
++		else
++			mode = sheet::CellDeleteMode_LEFT;
++	}
++	uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
++	xCellRangeMove->removeRange( thisAddress, mode ); 
++	
++}
++
++//XElementAccess
++sal_Bool SAL_CALL 
++ScVbaRange::hasElements() throw (uno::RuntimeException)
++{
++	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY );
++	if ( xColumnRowRange.is() )
++		if ( xColumnRowRange->getRows()->getCount() ||
++			xColumnRowRange->getColumns()->getCount() )
++			return sal_True;
++	return sal_False;
++}
++
++// XEnumerationAccess
++uno::Reference< container::XEnumeration > SAL_CALL 
++ScVbaRange::createEnumeration() throw (uno::RuntimeException)
++{
++	if ( mbIsColumns || mbIsRows )
++	{
++		uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY );
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
++                sal_Int32 nElems = 0;
++		if ( mbIsColumns )	
++			nElems = xColumnRowRange->getColumns()->getCount();
++		else
++			nElems = xColumnRowRange->getRows()->getCount();
++                return new ColumnsRowEnumeration( mxContext, xRange, nElems );
++		
++	}
++	return new CellsEnumeration( mxContext, m_Areas );
++}
++
++::rtl::OUString SAL_CALL 
++ScVbaRange::getDefaultMethodName(  ) throw (uno::RuntimeException)
++{
++	const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
++	return sName;
++}
++
++
++uno::Reference< awt::XDevice > 
++getDeviceFromDoc( const uno::Reference< frame::XModel >& xModel ) throw( uno::RuntimeException )
++{
++	uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++	uno::Reference< frame::XFrame> xFrame( xController->getFrame(), uno::UNO_QUERY_THROW );
++	uno::Reference< awt::XDevice > xDevice( xFrame->getComponentWindow(), uno::UNO_QUERY_THROW );
++	return xDevice;
++}
++
++// returns calc internal col. width ( in points )
++double 
++ScVbaRange::getCalcColWidth( const table::CellRangeAddress& rAddress) throw (uno::RuntimeException)
++{
++	ScDocument* pDoc = getScDocument();
++	USHORT nWidth = pDoc->GetOriginalWidth( static_cast< SCCOL >( rAddress.StartColumn ), static_cast< SCTAB >( rAddress.Sheet ) );
++	double nPoints = lcl_TwipsToPoints( nWidth );
++	nPoints = lcl_Round2DecPlaces( nPoints );
++	return nPoints;
++}
++
++double
++ScVbaRange::getCalcRowHeight( const table::CellRangeAddress& rAddress ) throw (uno::RuntimeException)
++{
++	ScDocument* pDoc = getDocumentFromRange( mxRange );
++	USHORT nWidth = pDoc->GetOriginalHeight( rAddress.StartRow, rAddress.Sheet );
++	double nPoints = lcl_TwipsToPoints( nWidth );
++	nPoints = lcl_Round2DecPlaces( nPoints );
++	return nPoints;	
++}
++
++// return Char Width in points
++double getDefaultCharWidth( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException )
++{
++	const static rtl::OUString sDflt( RTL_CONSTASCII_USTRINGPARAM("Default")); 
++	const static rtl::OUString sCharFontName( RTL_CONSTASCII_USTRINGPARAM("CharFontName")); 
++	const static rtl::OUString sPageStyles( RTL_CONSTASCII_USTRINGPARAM("PageStyles")); 
++	// get the font from the default style
++	uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW );
++	uno::Reference< container::XNameAccess > xNameAccess( xStyleSupplier->getStyleFamilies(), uno::UNO_QUERY_THROW );
++	uno::Reference< container::XNameAccess > xNameAccess2( xNameAccess->getByName( sPageStyles ), uno::UNO_QUERY_THROW );
++	uno::Reference< beans::XPropertySet > xProps( xNameAccess2->getByName( sDflt ), uno::UNO_QUERY_THROW );
++	rtl::OUString sFontName;
++	xProps->getPropertyValue( sCharFontName ) >>= sFontName;
++
++	uno::Reference< awt::XDevice > xDevice = getDeviceFromDoc( xModel );
++	awt::FontDescriptor aDesc;
++	aDesc.Name = sFontName;
++	uno::Reference< awt::XFont > xFont( xDevice->getFont( aDesc ), uno::UNO_QUERY_THROW );
++	double nCharPixelWidth =  xFont->getCharWidth( (sal_Int8)'0' );	
++
++	double nPixelsPerMeter = xDevice->getInfo().PixelPerMeterX;
++	double nCharWidth = nCharPixelWidth /  nPixelsPerMeter;
++	nCharWidth = nCharWidth * (double)56700;// in twips
++	return lcl_TwipsToPoints( (USHORT)nCharWidth );	
++}
++
++uno::Any SAL_CALL 
++ScVbaRange::getColumnWidth() throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = m_Areas->getCount();
++	if ( nLen > 1 ) 
++	{
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xRange->getColumnWidth();
++	}
++
++	double nColWidth = 	0;
++	ScDocShell* pShell = getScDocShell();
++	if ( pShell )
++	{
++		uno::Reference< frame::XModel > xModel = pShell->GetModel();
++		double defaultCharWidth = getDefaultCharWidth( xModel );
++		RangeHelper thisRange( mxRange );
++		table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();	
++		sal_Int32 nStartCol = thisAddress.StartColumn;
++		sal_Int32 nEndCol = thisAddress.EndColumn;
++		USHORT nColTwips = 0;
++		for( sal_Int32 nCol = nStartCol ; nCol <= nEndCol; ++nCol )
++		{
++			thisAddress.StartColumn = nCol;
++			USHORT nCurTwips = pShell->GetDocument()->GetOriginalWidth( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCTAB >( thisAddress.Sheet ) );
++			if ( nCol == nStartCol ) 
++				nColTwips =  nCurTwips;
++			if ( nColTwips != nCurTwips )
++				return aNULL();
++		}
++		nColWidth = lcl_Round2DecPlaces( lcl_TwipsToPoints( nColTwips ) );
++		if ( xModel.is() )
++			nColWidth = nColWidth / defaultCharWidth;
++	}
++	nColWidth = lcl_Round2DecPlaces( nColWidth );
++	return uno::makeAny( nColWidth );
++}
++
++void SAL_CALL 
++ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = m_Areas->getCount();
++	if ( nLen > 1 ) 
++	{
++		for ( sal_Int32 index = 1; index != nLen; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(index) ), uno::Any() ), uno::UNO_QUERY_THROW );
++			xRange->setColumnWidth( _columnwidth );
++		}
++		return;
++	}
++	double nColWidth = 0;
++	_columnwidth >>= nColWidth;
++	nColWidth = lcl_Round2DecPlaces( nColWidth );
++        ScDocShell* pDocShell = getScDocShell();
++        if ( pDocShell )
++        {
++                uno::Reference< frame::XModel > xModel = pDocShell->GetModel();
++                if ( xModel.is() )
++                {
++
++			nColWidth = ( nColWidth * getDefaultCharWidth( xModel ) );
++			RangeHelper thisRange( mxRange );	
++			table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++			USHORT nTwips = lcl_pointsToTwips( nColWidth );
++			
++			ScDocFunc aFunc(*pDocShell);
++			SCCOLROW nColArr[2];
++			nColArr[0] = thisAddress.StartColumn;
++			nColArr[1] = thisAddress.EndColumn;
++			aFunc.SetWidthOrHeight( TRUE, 1, nColArr, thisAddress.Sheet, SC_SIZE_ORIGINAL,
++		                                                                        nTwips, TRUE, TRUE );		
++			
++		}
++	}
++}
++
++uno::Any SAL_CALL 
++ScVbaRange::getWidth() throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 ) 
++	{
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xRange->getWidth();
++	}
++	uno::Reference< table::XColumnRowRange > xColRowRange( mxRange, uno::UNO_QUERY_THROW );			
++	uno::Reference< container::XIndexAccess > xIndexAccess( xColRowRange->getColumns(), uno::UNO_QUERY_THROW ); 
++	sal_Int32 nElems = xIndexAccess->getCount();	
++	double nWidth = 0;
++	for ( sal_Int32 index=0; index<nElems; ++index )
++	{
++		uno::Reference< sheet::XCellRangeAddressable > xAddressable( xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW ); 
++		double nTmpWidth = getCalcColWidth( xAddressable->getRangeAddress() );
++		nWidth += nTmpWidth;
++	}
++	return uno::makeAny( nWidth );
++}
++
++uno::Any SAL_CALL 
++ScVbaRange::Areas( const uno::Any& item) throw (uno::RuntimeException)
++{
++	if ( !item.hasValue() )
++		return uno::makeAny( m_Areas );
++	return m_Areas->Item( item, uno::Any() );	
++}
++
++uno::Reference< excel::XRange >
++ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException )
++{
++	if ( !m_Areas.is() )
++		throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No areas available")), uno::Reference< uno::XInterface >() );
++	uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( ++nIndex ), uno::Any() ), uno::UNO_QUERY_THROW );
++	return xRange;
++}
++
++uno::Any
++ScVbaRange::Borders( const uno::Any& item ) throw( script::BasicErrorException, uno::RuntimeException )
++{
++	if ( !item.hasValue() )
++		return uno::makeAny( getBorders() );
++	return getBorders()->Item( item, uno::Any() );
++}
++
++uno::Any SAL_CALL
++ScVbaRange::BorderAround( const css::uno::Any& LineStyle, const css::uno::Any& Weight,
++                const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException)
++{
++    sal_Int32 nCount = getBorders()->getCount();
++
++    for( sal_Int32 i = 0; i < nCount; i++ )
++    {
++        const sal_Int32 nLineType = supportedIndexTable[i];
++        switch( nLineType )
++        {
++            case excel::XlBordersIndex::xlEdgeLeft:
++            case excel::XlBordersIndex::xlEdgeTop:
++            case excel::XlBordersIndex::xlEdgeBottom:
++            case excel::XlBordersIndex::xlEdgeRight:
++            {
++                uno::Reference< excel::XBorder > xBorder( m_Borders->Item( uno::makeAny( nLineType ), uno::Any() ), uno::UNO_QUERY_THROW );
++                if( LineStyle.hasValue() )
++                {
++                    xBorder->setLineStyle( LineStyle );
++                }
++                if( Weight.hasValue() )
++                {
++                    xBorder->setWeight( Weight );
++                }
++                if( ColorIndex.hasValue() )
++                {
++                    xBorder->setColorIndex( ColorIndex );
++                }
++                if( Color.hasValue() )
++                {
++                    xBorder->setColor( Color );
++                }
++                break;
++            }
++            case excel::XlBordersIndex::xlInsideVertical:
++            case excel::XlBordersIndex::xlInsideHorizontal:
++            case excel::XlBordersIndex::xlDiagonalDown:
++            case excel::XlBordersIndex::xlDiagonalUp:
++                break;
++            default:
++                return uno::makeAny( sal_False );
++        }
++    }
++    return uno::makeAny( sal_True );
++}
++
++uno::Any SAL_CALL 
++ScVbaRange::getRowHeight() throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = m_Areas->getCount();
++	if ( nLen > 1 ) 
++	{
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xRange->getRowHeight();
++	}	
++
++	// if any row's RowHeight in the 
++	// range is different from any other then return NULL
++	RangeHelper thisRange( mxRange );	
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++	
++	sal_Int32 nStartRow = thisAddress.StartRow;
++	sal_Int32 nEndRow = thisAddress.EndRow;
++        USHORT nRowTwips = 0;
++	// #TODO probably possible to use the SfxItemSet ( and see if
++	//  SFX_ITEM_DONTCARE is set ) to improve performance
++// #CHECKME looks like this is general behaviour not just row Range specific
++//	if ( mbIsRows ) 
++	ScDocShell* pShell = getScDocShell();
++	if ( pShell )
++	{
++		for ( sal_Int32 nRow = nStartRow ; nRow <= nEndRow; ++nRow )
++		{
++			thisAddress.StartRow = nRow;
++			USHORT nCurTwips = pShell->GetDocument()->GetOriginalHeight( thisAddress.StartRow, thisAddress.Sheet );
++			if ( nRow == nStartRow )
++				nRowTwips = nCurTwips;
++			if ( nRowTwips != nCurTwips )
++				return aNULL();
++		}
++	}
++	double nHeight = lcl_Round2DecPlaces( lcl_TwipsToPoints( nRowTwips ) );
++	return uno::makeAny( nHeight );
++}
++
++void SAL_CALL 
++ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = m_Areas->getCount();
++	if ( nLen > 1 ) 
++	{
++		for ( sal_Int32 index = 1; index != nLen; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(index) ), uno::Any() ), uno::UNO_QUERY_THROW );
++			xRange->setRowHeight( _rowheight );
++		}
++		return;
++	}
++	double nHeight = 0; // Incomming height is in points
++        _rowheight >>= nHeight;
++	nHeight = lcl_Round2DecPlaces( nHeight );
++	RangeHelper thisRange( mxRange );	
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++	USHORT nTwips = lcl_pointsToTwips( nHeight );
++	
++	ScDocShell* pDocShell = getDocShellFromRange( mxRange );
++	ScDocFunc aFunc(*pDocShell);
++	SCCOLROW nRowArr[2];
++	nRowArr[0] = thisAddress.StartRow;
++	nRowArr[1] = thisAddress.EndRow;
++	aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, thisAddress.Sheet, SC_SIZE_ORIGINAL,
++                                                                        nTwips, TRUE, TRUE );		
++}
++
++uno::Any SAL_CALL 
++ScVbaRange::getPageBreak() throw (uno::RuntimeException)
++{
++	sal_Int32 nPageBreak = excel::XlPageBreak::xlPageBreakNone;
++	ScDocShell* pShell = getDocShellFromRange( mxRange );
++	if ( pShell )
++	{
++		RangeHelper thisRange( mxRange );
++		table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++		BOOL bColumn = FALSE;
++		
++		if (thisAddress.StartRow==0)
++		    bColumn = TRUE;
++		
++		uno::Reference< frame::XModel > xModel = pShell->GetModel();
++		if ( xModel.is() )
++		{
++	        ScDocument* pDoc =  getDocumentFromRange( mxRange );
++	        
++			BYTE nFlag = 0;
++			if ( !bColumn )
++			    nFlag = pDoc -> GetRowFlags(thisAddress.StartRow, thisAddress.Sheet);
++			else
++			    nFlag = pDoc -> GetColFlags(static_cast<SCCOL>(thisAddress.StartColumn), thisAddress.Sheet);
++			    
++			if ( nFlag & CR_PAGEBREAK)
++			    nPageBreak = excel::XlPageBreak::xlPageBreakAutomatic;
++			    
++			if ( nFlag & CR_MANUALBREAK)
++			    nPageBreak = excel::XlPageBreak::xlPageBreakManual;
++		}		
++	}
++
++	return uno::makeAny( nPageBreak );
++}
++
++void SAL_CALL 
++ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeException)
++{
++	sal_Int32 nPageBreak = 0; 
++    _pagebreak >>= nPageBreak;
++		
++	ScDocShell* pShell = getDocShellFromRange( mxRange );
++	if ( pShell )
++	{
++		RangeHelper thisRange( mxRange );
++		table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++		if ((thisAddress.StartColumn==0) && (thisAddress.StartRow==0))
++		    return;
++		BOOL bColumn = FALSE;
++		
++		if (thisAddress.StartRow==0)
++		    bColumn = TRUE;
++		
++		ScAddress aAddr( static_cast<SCCOL>(thisAddress.StartColumn), thisAddress.StartRow, thisAddress.Sheet );	
++		uno::Reference< frame::XModel > xModel = pShell->GetModel();
++		if ( xModel.is() )
++		{
++			ScTabViewShell* pViewShell = excel::getBestViewShell( xModel );
++			if ( nPageBreak == excel::XlPageBreak::xlPageBreakManual )
++			    pViewShell->InsertPageBreak( bColumn, TRUE, &aAddr);
++			else if ( nPageBreak == excel::XlPageBreak::xlPageBreakNone )
++			    pViewShell->DeletePageBreak( bColumn, TRUE, &aAddr);
++		}
++	}
++}
++
++uno::Any SAL_CALL 
++ScVbaRange::getHeight() throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 ) 
++	{
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xRange->getHeight();
++	}
++	
++	uno::Reference< table::XColumnRowRange > xColRowRange( mxRange, uno::UNO_QUERY_THROW );			
++	uno::Reference< container::XIndexAccess > xIndexAccess( xColRowRange->getRows(), uno::UNO_QUERY_THROW ); 
++	sal_Int32 nElems = xIndexAccess->getCount();
++	double nHeight = 0;
++	for ( sal_Int32 index=0; index<nElems; ++index )
++	{
++        	uno::Reference< sheet::XCellRangeAddressable > xAddressable( xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW ); 
++		nHeight += getCalcRowHeight(xAddressable->getRangeAddress() );
++	}
++	return uno::makeAny( nHeight );
++}
++
++awt::Point 
++ScVbaRange::getPosition() throw ( uno::RuntimeException )
++{
++        awt::Point aPoint;
++	uno::Reference< beans::XPropertySet > xProps;
++	if ( mxRange.is() )
++		xProps.set( mxRange, uno::UNO_QUERY_THROW );
++	else
++		xProps.set( mxRanges, uno::UNO_QUERY_THROW );
++	xProps->getPropertyValue(POSITION) >>= aPoint;
++	return aPoint;
++}
++uno::Any SAL_CALL 
++ScVbaRange::getLeft() throw (uno::RuntimeException)
++{
++	// helperapi returns the first ranges left ( and top below )
++	if ( m_Areas->getCount() > 1 )
++		return getArea( 0 )->getLeft();
++        awt::Point aPoint = getPosition();
++	return uno::makeAny( lcl_hmmToPoints( aPoint.X ) );
++}
++
++
++uno::Any SAL_CALL 
++ScVbaRange::getTop() throw (uno::RuntimeException)
++{		
++	// helperapi returns the first ranges top
++	if ( m_Areas->getCount() > 1 )
++		return getArea( 0 )->getTop();
++        awt::Point aPoint= getPosition();
++	return uno::makeAny( lcl_hmmToPoints( aPoint.Y ) );
++}
++
++uno::Reference< excel::XWorksheet >
++ScVbaRange::getWorksheet() throw (uno::RuntimeException)
++{
++	// #TODO #FIXME parent should always be set up ( currently thats not
++	// the case )
++	uno::Reference< excel::XWorksheet > xSheet( getParent(), uno::UNO_QUERY );
++	if ( !xSheet.is() )
++	{
++		uno::Reference< table::XCellRange > xRange = mxRange;
++
++		if ( mxRanges.is() ) // assign xRange to first range
++		{
++			uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW );
++			xRange.set( xIndex->getByIndex( 0 ), uno::UNO_QUERY_THROW );
++		}
++		ScDocShell* pDocShell = getDocShellFromRange(xRange);
++		RangeHelper rHelper(xRange);
++		// parent should be Thisworkbook
++       	xSheet.set( new ScVbaWorksheet( uno::Reference< XHelperInterface >(), mxContext,rHelper.getSpreadSheet(),pDocShell->GetModel()) );
++	}	
++	return xSheet;
++}
++
++ScCellRangesBase*
++ScVbaRange::getCellRangesBase() throw( uno::RuntimeException )
++{
++	ScCellRangesBase* pUnoRangesBase = NULL;
++	if ( mxRanges.is() )
++	{
++		uno::Reference< uno::XInterface > xIf( mxRanges, uno::UNO_QUERY_THROW );
++		pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() );
++	}
++	else if ( mxRange.is() )
++	{
++		uno::Reference< uno::XInterface > xIf( mxRange, uno::UNO_QUERY_THROW );
++		pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() );
++	}
++	else
++		throw uno::RuntimeException( rtl::OUString::createFromAscii("General Error creating range - Unknown" ), uno::Reference< uno::XInterface >() );
++	return pUnoRangesBase;
++}
++
++// #TODO remove this ugly application processing
++// Process an application Range request e.g. 'Range("a1,b2,a4:b6")
++uno::Reference< excel::XRange >
++ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException)
++{
++	// Althought the documentation seems clear that Range without a 
++	// qualifier then its a shortcut for ActiveSheet.Range
++	// however, similarly Application.Range is apparently also a 
++	// shortcut for ActiveSheet.Range
++	// The is however a subtle behavioural difference I've come across 
++	// wrt to named ranges.
++	// If a named range "test" exists { Sheet1!$A1 } and the active sheet
++	// is Sheet2 then the following will fail
++	// msgbox ActiveSheet.Range("test").Address ' failes
++	// msgbox WorkSheets("Sheet2").Range("test").Address
++	// but !!!
++	// msgbox Range("test").Address ' works
++	// msgbox Application.Range("test").Address ' works
++
++	// Single param Range 
++	rtl::OUString sRangeName;
++	Cell1 >>= sRangeName;
++	if ( Cell1.hasValue() && !Cell2.hasValue() && sRangeName.getLength() )
++	{
++		const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
++		uno::Reference< beans::XPropertySet > xPropSet( getCurrentExcelDoc(xContext), uno::UNO_QUERY_THROW );
++		
++		uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW );
++		uno::Reference< sheet::XCellRangeReferrer > xReferrer;
++		try
++		{
++			xReferrer.set ( xNamed->getByName( sRangeName ), uno::UNO_QUERY );
++		}
++		catch( uno::Exception& /*e*/ )
++		{
++			// do nothing
++		}
++		if ( xReferrer.is() )
++		{
++			uno::Reference< table::XCellRange > xRange = xReferrer->getReferredCells();
++			if ( xRange.is() )
++			{
++				// #FIXME need proper (WorkSheet) parent
++				uno::Reference< excel::XRange > xVbRange =  new  ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xRange );
++				return xVbRange;
++			}
++		}
++	}
++	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentExcelDoc(xContext)->getCurrentController(), uno::UNO_QUERY );
++	uno::Reference< table::XCellRange > xSheetRange( xView->getActiveSheet(), uno::UNO_QUERY_THROW ); 
++	ScVbaRange* pRange = new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xSheetRange );
++	uno::Reference< excel::XRange > xVbSheetRange( pRange );
++	return pRange->Range( Cell1, Cell2, true ); 
++}
++
++uno::Reference< sheet::XDatabaseRanges > 
++lcl_GetDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException )
++{
++	uno::Reference< frame::XModel > xModel;
++	if ( pShell )
++		xModel.set( pShell->GetModel(), uno::UNO_QUERY_THROW );
++	uno::Reference< beans::XPropertySet > xModelProps( xModel, uno::UNO_QUERY_THROW );
++	uno::Reference< sheet::XDatabaseRanges > xDBRanges( xModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges") ) ), uno::UNO_QUERY_THROW );
++	return xDBRanges;	
++}
++// returns the XDatabaseRange for the autofilter on sheet (nSheet)
++// also populates sName with the name of range
++uno::Reference< sheet::XDatabaseRange > 
++lcl_GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet, rtl::OUString& sName )
++{
++	uno::Reference< container::XIndexAccess > xIndexAccess( lcl_GetDataBaseRanges( pShell ), uno::UNO_QUERY_THROW );
++	uno::Reference< sheet::XDatabaseRange > xDataBaseRange;
++	table::CellRangeAddress dbAddress;
++	for ( sal_Int32 index=0; index < xIndexAccess->getCount(); ++index )
++	{
++		uno::Reference< sheet::XDatabaseRange > xDBRange( xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW );
++		uno::Reference< container::XNamed > xNamed( xDBRange, uno::UNO_QUERY_THROW ); 
++		// autofilters work weirdly with openoffice, unnamed is the default 
++		// named range which is used to create an autofilter, but
++		// its also possible that another name could be used
++		//     this also causes problems when an autofilter is created on
++		//     another sheet
++		// ( but.. you can use any named range )
++		dbAddress = xDBRange->getDataArea();
++		if ( dbAddress.Sheet == nSheet )
++		{
++			sal_Bool bHasAuto = sal_False;
++			uno::Reference< beans::XPropertySet > xProps( xDBRange, uno::UNO_QUERY_THROW );
++			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ) ) >>= bHasAuto;
++			if ( bHasAuto )
++			{
++				sName = xNamed->getName();	
++				xDataBaseRange=xDBRange;
++				break;
++			}
++		}
++	}
++	return xDataBaseRange;
++} 
++
++// Helper functions for AutoFilter
++ScDBData* lcl_GetDBData_Impl( ScDocShell* pDocShell, sal_Int16 nSheet )
++{
++	rtl::OUString sName;
++	lcl_GetAutoFiltRange( pDocShell, nSheet, sName );
++	OSL_TRACE("lcl_GetDBData_Impl got autofilter range %s for sheet %d",
++		rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() , nSheet );
++	ScDBData* pRet = NULL;
++	if (pDocShell)
++	{
++		ScDBCollection* pNames = pDocShell->GetDocument()->GetDBCollection();
++		if (pNames)
++		{
++			USHORT nPos = 0;
++			if (pNames->SearchName( sName , nPos ))
++				pRet = (*pNames)[nPos];
++		}
++	}
++	return pRet;
++}
++
++void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam )
++{
++	if ( pDocShell )
++	{	
++		ScViewData* pViewData = pDocShell->GetViewData();
++		if ( pViewData )
++		{
++			OSL_TRACE("Pushing out SelectAll query");
++			pViewData->GetView()->Query( aParam, NULL, TRUE );
++		}
++	}
++}
++
++ScQueryParam lcl_GetQueryParam( ScDocShell* pDocShell, sal_Int16 nSheet )
++{
++	ScDBData* pDBData = lcl_GetDBData_Impl( pDocShell, nSheet );	
++	ScQueryParam aParam;	
++	if (pDBData)
++	{
++		pDBData->GetQueryParam( aParam );
++	}
++	return aParam;
++}
++
++void lcl_SetAllQueryForField( ScQueryParam& aParam, SCCOLROW nField )
++{
++	bool bFound = false;
++	SCSIZE i = 0;
++	for (; i<MAXQUERY && !bFound; i++)
++	{
++		ScQueryEntry& rEntry = aParam.GetEntry(i);
++		if ( rEntry.nField == nField)
++		{
++			OSL_TRACE("found at pos %d", i );
++			bFound = true;
++		}
++	}
++	if ( bFound )
++	{
++		OSL_TRACE("field %d to delete at pos %d", nField, ( i - 1 ) );
++		aParam.DeleteQuery(--i);
++	}
++}
++
++
++void lcl_SetAllQueryForField( ScDocShell* pDocShell, SCCOLROW nField, sal_Int16 nSheet )
++{
++	ScQueryParam aParam = lcl_GetQueryParam( pDocShell, nSheet );
++	lcl_SetAllQueryForField( aParam, nField );
++	lcl_SelectAll( pDocShell, aParam );
++}
++
++// Modifies sCriteria, and nOp depending on the value of sCriteria
++void lcl_setTableFieldsFromCriteria( rtl::OUString& sCriteria1, uno::Reference< beans::XPropertySet >& xDescProps, sheet::TableFilterField2& rFilterField )
++{
++	// #TODO make this more efficient and cycle through 
++	// sCriteria1 character by character to pick up <,<>,=, * etc.
++	// right now I am more concerned with just getting it to work right
++
++	sCriteria1 = sCriteria1.trim();
++	// table of translation of criteria text to FilterOperators
++	// <>searchtext - NOT_EQUAL
++	//  =searchtext - EQUAL
++	//  *searchtext - startwith
++	//  <>*searchtext - doesn't startwith
++	//  *searchtext* - contains
++	//  <>*searchtext* - doesn't contain
++	// [>|>=|<=|...]searchtext for GREATER_value, GREATER_EQUAL_value etc.
++	sal_Int32 nPos = 0;
++	bool bIsNumeric = false;
++	if ( ( nPos = sCriteria1.indexOf( EQUALS ) ) == 0 )
++	{
++		if ( sCriteria1.getLength() == EQUALS.getLength() )
++            rFilterField.Operator = sheet::FilterOperator2::EMPTY;
++		else
++		{
++            rFilterField.Operator = sheet::FilterOperator2::EQUAL;
++			sCriteria1 = sCriteria1.copy( EQUALS.getLength() );
++			sCriteria1 = VBAToRegexp( sCriteria1 );	
++			// UseRegularExpressions 
++			if ( xDescProps.is() )
++				xDescProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseRegularExpressions" ) ), uno::Any( sal_True ) );
++		}
++
++	}
++	else if ( ( nPos = sCriteria1.indexOf( NOTEQUALS ) ) == 0 ) 
++	{
++		if ( sCriteria1.getLength() == NOTEQUALS.getLength() )
++            rFilterField.Operator = sheet::FilterOperator2::NOT_EMPTY;	
++		else
++		{
++            rFilterField.Operator = sheet::FilterOperator2::NOT_EQUAL;
++			sCriteria1 = sCriteria1.copy( NOTEQUALS.getLength() );
++			sCriteria1 = VBAToRegexp( sCriteria1 );	
++			// UseRegularExpressions 
++			if ( xDescProps.is() )
++				xDescProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseRegularExpressions" ) ), uno::Any( sal_True ) );
++		}
++	}	
++	else if ( ( nPos = sCriteria1.indexOf( GREATERTHAN ) ) == 0 ) 
++	{
++		bIsNumeric = true;
++		if ( ( nPos = sCriteria1.indexOf( GREATERTHANEQUALS ) ) == 0 )
++		{
++			sCriteria1 = sCriteria1.copy( GREATERTHANEQUALS.getLength() );
++            rFilterField.Operator = sheet::FilterOperator2::GREATER_EQUAL;
++		}
++		else
++		{
++			sCriteria1 = sCriteria1.copy( GREATERTHAN.getLength() );
++            rFilterField.Operator = sheet::FilterOperator2::GREATER;
++		}
++
++	}
++	else if ( ( nPos = sCriteria1.indexOf( LESSTHAN ) ) == 0 ) 
++	{
++		bIsNumeric = true;
++		if ( ( nPos = sCriteria1.indexOf( LESSTHANEQUALS ) ) == 0 )
++		{
++			sCriteria1 = sCriteria1.copy( LESSTHANEQUALS.getLength() );
++            rFilterField.Operator = sheet::FilterOperator2::LESS_EQUAL;
++		}
++		else
++		{
++			sCriteria1 = sCriteria1.copy( LESSTHAN.getLength() );
++            rFilterField.Operator = sheet::FilterOperator2::LESS;
++		}
++
++	}
++	else
++        rFilterField.Operator = sheet::FilterOperator2::EQUAL;
++
++	if ( bIsNumeric )
++	{
++		rFilterField.IsNumeric= sal_True;
++		rFilterField.NumericValue = sCriteria1.toDouble();
++	}
++	rFilterField.StringValue = sCriteria1;	
++}
++
++void SAL_CALL 
++ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const uno::Any& Operator, const uno::Any& Criteria2, const uno::Any& VisibleDropDown ) throw (uno::RuntimeException)
++{
++	// Is there an existing autofilter	
++	RangeHelper thisRange( mxRange );	
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++	sal_Int16 nSheet = thisAddress.Sheet;
++	ScDocShell* pShell = getScDocShell();
++	sal_Bool bHasAuto = sal_False;	
++	rtl::OUString sAutofiltRangeName;
++	uno::Reference< sheet::XDatabaseRange > xDataBaseRange = lcl_GetAutoFiltRange( pShell, nSheet, sAutofiltRangeName );
++	if ( xDataBaseRange.is() )
++		bHasAuto = true;	
++
++	uno::Reference< table::XCellRange > xFilterRange;
++	if ( !bHasAuto )
++	{
++		if (  m_Areas->getCount() > 1 )
++			throw uno::RuntimeException( STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY, uno::Reference< uno::XInterface >() );
++
++		table::CellRangeAddress autoFiltAddress; 
++		//CurrentRegion()
++		if ( isSingleCellRange() )
++		{
++			uno::Reference< excel::XRange > xCurrent( CurrentRegion() );
++			if ( xCurrent.is() )
++			{
++				ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xCurrent.get() );
++				if ( pRange->isSingleCellRange() )
++					throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can't create AutoFilter") ), uno::Reference< uno::XInterface >() );
++				if ( pRange )
++				{
++					RangeHelper currentRegion( pRange->mxRange );
++					autoFiltAddress = currentRegion.getCellRangeAddressable()->getRangeAddress();
++				}
++			}
++		} 
++		else // multi-cell range
++		{
++			RangeHelper multiCellRange( mxRange );
++			autoFiltAddress = multiCellRange.getCellRangeAddressable()->getRangeAddress();
++		}
++
++		uno::Reference< sheet::XDatabaseRanges > xDBRanges = lcl_GetDataBaseRanges( pShell );
++		if ( xDBRanges.is() )
++		{
++			rtl::OUString sGenName( RTL_CONSTASCII_USTRINGPARAM("VBA_Autofilter_") );
++			sGenName += rtl::OUString::valueOf( static_cast< sal_Int32 >( nSheet ) );
++			OSL_TRACE("Going to add new autofilter range.. name %s",
++				rtl::OUStringToOString( sGenName, RTL_TEXTENCODING_UTF8 ).getStr() , nSheet );
++			if ( !xDBRanges->hasByName( sGenName ) )
++				xDBRanges->addNewByName(  sGenName, autoFiltAddress );
++			xDataBaseRange.set( xDBRanges->getByName(  sGenName ), uno::UNO_QUERY_THROW );
++		}
++		if ( !xDataBaseRange.is() )
++			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Failed to find the autofilter placeholder range" ) ), uno::Reference< uno::XInterface >() );		
++
++		uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW );
++		// set autofilt
++		xDBRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ), uno::Any(sal_True) ); 
++		// set header
++		uno::Reference< beans::XPropertySet > xFiltProps( xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY_THROW );
++		sal_Bool bHasColHeader = sal_False;
++		ScDocument* pDoc = pShell ? pShell->GetDocument() : NULL;
++		
++		bHasColHeader = pDoc->HasColHeader(  static_cast< SCCOL >( autoFiltAddress.StartColumn ), static_cast< SCROW >( autoFiltAddress.StartRow ), static_cast< SCCOL >( autoFiltAddress.EndColumn ), static_cast< SCROW >( autoFiltAddress.EndRow ), static_cast< SCTAB >( autoFiltAddress.Sheet ) ) ? sal_True : sal_False;
++		xFiltProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ContainsHeader") ), uno::Any( bHasColHeader ) );	
++	}
++
++
++	sal_Int32 nField = 0; // *IS* 1 based
++	rtl::OUString sCriteria1;
++	sal_Int32 nOperator = excel::XlAutoFilterOperator::xlAnd;
++	
++	sal_Bool bVisible = sal_True;
++	bool  bChangeDropDown = false;
++	VisibleDropDown >>= bVisible;
++
++	if ( bVisible == bHasAuto ) // dropdown is displayed/notdisplayed as
++								// required
++		bVisible = sal_False;
++	else
++		bChangeDropDown = true;	
++	sheet::FilterConnection nConn = sheet::FilterConnection_AND;		
++	double nCriteria1 = 0;
++
++	bool bHasCritValue = Criteria1.hasValue();
++	bool bCritHasNumericValue = sal_False; // not sure if a numeric criteria is possible
++	if ( bHasCritValue )
++		bCritHasNumericValue = ( Criteria1 >>= nCriteria1 );
++
++	if (  !Field.hasValue() && ( Criteria1.hasValue() || Operator.hasValue() || Criteria2.hasValue() ) ) 
++		throw uno::RuntimeException();
++	// Use the normal uno api, sometimes e.g. when you want to use ALL as the filter
++	// we can't use refresh as the uno interface doesn't have a concept of ALL
++	// in this case we just call the core calc functionality - 
++	bool bAll = false;;
++	if ( ( Field >>= nField )  )
++	{
++        uno::Reference< sheet::XSheetFilterDescriptor2 > xDesc(
++                xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY );
++        if ( xDesc.is() )
++        {
++            uno::Sequence< sheet::TableFilterField2 > sTabFilts;
++            uno::Reference< beans::XPropertySet > xDescProps( xDesc, uno::UNO_QUERY_THROW );
++		if ( Criteria1.hasValue() )
++		{ 
++			sTabFilts.realloc( 1 );
++            sTabFilts[0].Operator = sheet::FilterOperator2::EQUAL;// sensible default
++			if ( !bCritHasNumericValue )
++			{ 
++				Criteria1 >>= sCriteria1;
++				sTabFilts[0].IsNumeric = bCritHasNumericValue;
++				if ( bHasCritValue && sCriteria1.getLength() )
++					lcl_setTableFieldsFromCriteria( sCriteria1, xDescProps, sTabFilts[0]  );
++				else
++					bAll = true;
++			}
++			else // numeric
++			{
++				sTabFilts[0].IsNumeric = sal_True;
++				sTabFilts[0].NumericValue = nCriteria1;
++			}
++		}
++		else // no value specified
++			bAll = true;
++		// not sure what the relationship between Criteria1 and Operator is,
++		// e.g. can you have a Operator without a Criteria ? in openoffice it 	
++		if ( Operator.hasValue()  && ( Operator >>= nOperator ) )
++		{
++			// if its a bottom/top Ten(Percent/Value) and there
++			// is no value specified for critera1 set it to 10
++			if ( !bCritHasNumericValue && !sCriteria1.getLength() && ( nOperator != excel::XlAutoFilterOperator::xlOr ) && ( nOperator != excel::XlAutoFilterOperator::xlAnd ) )
++			{
++				sTabFilts[0].IsNumeric = sal_True;	
++				sTabFilts[0].NumericValue = 10;	
++				bAll = false;
++			}
++			switch ( nOperator )
++			{
++				case excel::XlAutoFilterOperator::xlBottom10Items:
++                    sTabFilts[0].Operator = sheet::FilterOperator2::BOTTOM_VALUES;
++					break;
++				case excel::XlAutoFilterOperator::xlBottom10Percent:
++                    sTabFilts[0].Operator = sheet::FilterOperator2::BOTTOM_PERCENT;
++					break;
++				case excel::XlAutoFilterOperator::xlTop10Items:
++                    sTabFilts[0].Operator = sheet::FilterOperator2::TOP_VALUES;
++					break;
++				case excel::XlAutoFilterOperator::xlTop10Percent:
++                    sTabFilts[0].Operator = sheet::FilterOperator2::TOP_PERCENT;
++					break;
++				case excel::XlAutoFilterOperator::xlOr:
++					nConn = sheet::FilterConnection_OR;
++					break;
++				case excel::XlAutoFilterOperator::xlAnd:
++					nConn = sheet::FilterConnection_AND;
++					break;
++				default:
++					throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UnknownOption") ), uno::Reference< uno::XInterface >() );
++					
++			}	
++
++		}		
++		if ( !bAll )
++		{
++			sTabFilts[0].Connection = sheet::FilterConnection_AND;	
++			sTabFilts[0].Field = (nField - 1);	
++
++			rtl::OUString sCriteria2;
++			if ( Criteria2.hasValue() ) // there is a Criteria2
++			{
++				sTabFilts.realloc(2);
++				sTabFilts[1].Field = sTabFilts[0].Field;
++				sTabFilts[1].Connection = nConn;	
++
++				if ( Criteria2 >>= sCriteria2 )
++				{
++					if ( sCriteria2.getLength() > 0 )
++					{
++						uno::Reference< beans::XPropertySet > xProps;
++						lcl_setTableFieldsFromCriteria( sCriteria2, xProps,  sTabFilts[1] );
++						sTabFilts[1].IsNumeric = sal_False;
++					}
++				}
++				else // numeric
++				{
++					Criteria2 >>= sTabFilts[1].NumericValue;
++					sTabFilts[1].IsNumeric = sal_True;
++                    sTabFilts[1].Operator = sheet::FilterOperator2::EQUAL;
++				}
++			}
++		}
++
++        xDesc->setFilterFields2( sTabFilts );
++		if ( !bAll )
++		{
++			xDataBaseRange->refresh();
++		}
++		else
++			// was 0 based now seems to be 1 
++			lcl_SetAllQueryForField( pShell, nField, nSheet );
++        }
++	}
++	else 
++	{
++		// this is just to toggle autofilter on and off ( not to be confused with 
++		// a VisibleDropDown option combined with a field, in that case just the 
++		// button should be disabled ) - currently we don't support that
++		bChangeDropDown = true;	
++		uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW );
++		if ( bHasAuto )
++		{
++			// find the any field with the query and select all
++			ScQueryParam aParam = lcl_GetQueryParam( pShell, nSheet );
++			SCSIZE i = 0;
++			for (; i<MAXQUERY; i++)
++			{
++				ScQueryEntry& rEntry = aParam.GetEntry(i);
++				if ( rEntry.bDoQuery )
++					lcl_SetAllQueryForField( pShell, rEntry.nField, nSheet );
++			}
++			// remove exising filters
++            uno::Reference< sheet::XSheetFilterDescriptor2 > xSheetFilterDescriptor(
++                    xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY );
++            if( xSheetFilterDescriptor.is() )
++			    xSheetFilterDescriptor->setFilterFields2( uno::Sequence< sheet::TableFilterField2 >() );
++		}
++		xDBRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ), uno::Any(!bHasAuto) );
++
++	}
++}
++
++void SAL_CALL 
++ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (uno::RuntimeException)
++{
++	sal_Bool bCopyOrigin = sal_True;
++	CopyOrigin >>= bCopyOrigin;
++	// It appears ( from the web ) that the undocumented CopyOrigin
++	// param should contain member of enum XlInsertFormatOrigin
++	// which can have values xlFormatFromLeftOrAbove or xlFormatFromRightOrBelow
++	// #TODO investigate resultant behaviour using these constants
++	// currently just processing Shift
++
++	sheet::CellInsertMode mode = sheet::CellInsertMode_NONE; 
++	if ( Shift.hasValue() )
++	{
++		sal_Int32 nShift = 0;
++		Shift >>= nShift;
++		switch ( nShift )
++		{
++			case excel::XlInsertShiftDirection::xlShiftToRight:
++				mode = sheet::CellInsertMode_RIGHT;
++				break;
++			case excel::XlInsertShiftDirection::xlShiftDown:
++				mode = sheet::CellInsertMode_DOWN;
++				break;
++			default:
++				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ("Illegal paramater ") ), uno::Reference< uno::XInterface >() );
++		}
++	}
++	else 
++	{
++		if ( getRow() >=  getColumn() )
++			mode = sheet::CellInsertMode_DOWN;
++		else
++			mode = sheet::CellInsertMode_RIGHT;
++	}
++	RangeHelper thisRange( mxRange );
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();	
++	uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );	
++	xCellRangeMove->insertCells( thisAddress, mode );
++	if ( bCopyOrigin )
++	{
++		// After the insert ( this range ) actually has moved
++		ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
++	 	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getDocShellFromRange( mxRange ) , aRange ) );
++		uno::Reference< excel::XRange > xVbaRange( new ScVbaRange( getParent(), mxContext, xRange, mbIsRows, mbIsColumns ) );	
++		xVbaRange->PasteSpecial( uno::Any(), uno::Any(), uno::Any(), uno::Any() );
++	}
++}
++
++void SAL_CALL
++ScVbaRange::Autofit() throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = m_Areas->getCount();
++	if ( nLen > 1 ) 
++	{
++		for ( sal_Int32 index = 1; index != nLen; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(index) ), uno::Any() ), uno::UNO_QUERY_THROW );
++			xRange->Autofit();
++		}
++		return;
++	}
++		// if the range is a not a row or column range autofit will
++		// throw an error
++
++		if ( !( mbIsColumns || mbIsRows ) )
++			DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); 			
++        ScDocShell* pDocShell = getDocShellFromRange( mxRange );
++        if ( pDocShell )
++        {
++			RangeHelper thisRange( mxRange );	
++			table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++			
++			ScDocFunc aFunc(*pDocShell);
++			SCCOLROW nColArr[2];
++			nColArr[0] = thisAddress.StartColumn;
++			nColArr[1] = thisAddress.EndColumn;
++			BOOL bDirection = TRUE;
++			if ( mbIsRows )
++			{
++				bDirection = FALSE;
++				nColArr[0] = thisAddress.StartRow;
++				nColArr[1] = thisAddress.EndRow;
++			}
++			aFunc.SetWidthOrHeight( bDirection, 1, nColArr, thisAddress.Sheet, SC_SIZE_OPTIMAL,
++		                                                                        0, TRUE, TRUE );		
++			
++	}	
++}
++
++/***************************************************************************************
++ * interface for text: 
++ * com.sun.star.text.XText, com.sun.star.table.XCell, com.sun.star.container.XEnumerationAccess
++ * com.sun.star.text.XTextRange, 
++ * the main problem is to recognize the numeric and date, which assosiate with DecimalSeparator, ThousandsSeparator, 
++ * TrailingMinusNumbers and FieldInfo.
++***************************************************************************************/
++void SAL_CALL
++ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any& DataType, const css::uno::Any& TextQualifier,
++        const css::uno::Any& ConsecutinveDelimiter, const css::uno::Any& Tab, const css::uno::Any& Semicolon, const css::uno::Any& Comma,
++        const css::uno::Any& Space, const css::uno::Any& Other, const css::uno::Any& OtherChar, const css::uno::Any& /*FieldInfo*/,
++        const css::uno::Any& DecimalSeparator, const css::uno::Any& ThousandsSeparator, const css::uno::Any& /*TrailingMinusNumbers*/  ) throw (css::uno::RuntimeException)
++{
++    uno::Reference< excel::XRange > xRange;
++    if( Destination.hasValue() )
++    {
++        if( !( Destination >>= xRange ) )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Destination parameter should be a range" ),
++                    uno::Reference< uno::XInterface >() );
++        OSL_TRACE("set range\n");
++    }
++    else
++    {
++        //set as current
++        xRange = this;
++        OSL_TRACE("set range as himself\n");
++    }
++
++   sal_Int16 xlTextParsingType = excel::XlTextParsingType::xlDelimited;
++    if ( DataType.hasValue() )
++    {
++        if( !( DataType >>= xlTextParsingType ) )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii( "DataType parameter should be a short" ),
++                    uno::Reference< uno::XInterface >() );
++        OSL_TRACE("set Datatype\n" );
++    }
++    sal_Bool bDilimited = ( xlTextParsingType == excel::XlTextParsingType::xlDelimited );
++
++    sal_Int16 xlTextQualifier = excel::XlTextQualifier::xlTextQualifierDoubleQuote; 
++    if( TextQualifier.hasValue() )
++    {
++        if( !( TextQualifier >>= xlTextQualifier ))
++             throw uno::RuntimeException( rtl::OUString::createFromAscii( "TextQualifier parameter should be a short" ),
++                    uno::Reference< uno::XInterface >() );
++        OSL_TRACE("set TextQualifier\n");
++    }
++
++    sal_Bool bConsecutinveDelimiter = sal_False;
++    if( ConsecutinveDelimiter.hasValue() )
++    {
++        if( !( ConsecutinveDelimiter >>= bConsecutinveDelimiter ) )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii( "ConsecutinveDelimiter parameter should be a boolean" ),
++                    uno::Reference< uno::XInterface >() );
++        OSL_TRACE("set ConsecutinveDelimiter\n");
++    }
++
++    sal_Bool bTab = sal_False;
++    if( Tab.hasValue() && bDilimited )
++    {
++        if( !( Tab >>= bTab ) )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Tab parameter should be a boolean" ),
++                    uno::Reference< uno::XInterface >() );
++        OSL_TRACE("set Tab\n");
++    }
++
++    sal_Bool bSemicolon = sal_False;
++    if( Semicolon.hasValue() && bDilimited )
++    {
++        if( !( Semicolon >>= bSemicolon ) )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Semicolon parameter should be a boolean" ),
++                    uno::Reference< uno::XInterface >() );
++        OSL_TRACE("set Semicolon\n");
++    }
++    sal_Bool bComma = sal_False;
++    if( Comma.hasValue() && bDilimited )
++    {
++        if( !( Comma >>= bComma ) )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Comma parameter should be a boolean" ),
++                    uno::Reference< uno::XInterface >() );
++        OSL_TRACE("set Comma\n");
++    }
++    sal_Bool bSpace = sal_False;
++    if( Space.hasValue() && bDilimited )
++    {
++        if( !( Space >>= bSpace ) )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Space parameter should be a boolean" ),
++                    uno::Reference< uno::XInterface >() );
++        OSL_TRACE("set Space\n");
++    }
++    sal_Bool bOther = sal_False;
++    rtl::OUString sOtherChar;
++    if( Other.hasValue() && bDilimited )
++    {
++        if( Other >>= bOther )
++        {
++            if( OtherChar.hasValue() )
++                if( !( OtherChar >>= sOtherChar ) )
++                    throw uno::RuntimeException( rtl::OUString::createFromAscii( "OtherChar parameter should be a String" ),
++                        uno::Reference< uno::XInterface >() );
++        OSL_TRACE("set OtherChar\n" );
++        }
++     else if( bOther )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Other parameter should be a True" ),
++                    uno::Reference< uno::XInterface >() );
++    }
++ //TODO* FieldInfo   Optional Variant. An array containing parse information for the individual columns of data. The interpretation depends on the value of DataType. When the data is delimited, this argument is an array of two-element arrays, with each two-element array specifying the conversion options for a particular column. The first element is the column number (1-based), and the second element is one of the xlColumnDataType  constants specifying how the column is parsed.
++
++    rtl::OUString sDecimalSeparator;
++    if( DecimalSeparator.hasValue() )
++    {
++        if( !( DecimalSeparator >>= sDecimalSeparator ) )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii( "DecimalSeparator parameter should be a String" ),
++                uno::Reference< uno::XInterface >() );
++        OSL_TRACE("set DecimalSeparator\n" );
++    }
++    rtl::OUString sThousandsSeparator;
++    if( ThousandsSeparator.hasValue() )
++    {
++        if( !( ThousandsSeparator >>= sThousandsSeparator ) )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii( "ThousandsSeparator parameter should be a String" ),
++                uno::Reference< uno::XInterface >() );
++        OSL_TRACE("set ThousandsSpeparator\n" );
++    }
++ //TODO* TrailingMinusNumbers  Optional Variant. Numbers that begin with a minus character.
++}
++
++css::uno::Reference< excel::XValidation > SAL_CALL 
++ScVbaRange::getValidation() throw (css::uno::RuntimeException)
++{
++	if ( !m_xValidation.is() )	
++		m_xValidation = new ScVbaValidation( this, mxContext, mxRange );
++	return m_xValidation;
++}
++
++uno::Any ScVbaRange::getFormulaHidden() throw ( script::BasicErrorException, css::uno::RuntimeException)
++{
++	SfxItemSet* pDataSet = getCurrentDataSet();
++	const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &)
++		pDataSet->Get(ATTR_PROTECTION, TRUE);
++	SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, TRUE, NULL);
++	if(eState == SFX_ITEM_DONTCARE)
++		return aNULL();
++	return uno::makeAny(rProtAttr.GetHideFormula());
++
++}
++void ScVbaRange::setFormulaHidden(const uno::Any& Hidden) throw ( script::BasicErrorException, css::uno::RuntimeException)
++{
++	uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY_THROW);
++	util::CellProtection rCellAttr;
++	xProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLPRO))) >>= rCellAttr;
++	Hidden >>= rCellAttr.IsFormulaHidden;
++	xProps->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLPRO)), uno::makeAny(rCellAttr));
++}
++
++uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException)
++{
++	// #FIXME, If the specified range is in a PivotTable report
++
++	// In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception
++	if( m_Areas->getCount() > 1 )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can not get Range.ShowDetail attribute ")), uno::Reference< uno::XInterface >() );
++	
++	sal_Bool bShowDetail = sal_False;
++
++	RangeHelper helper( mxRange );
++	uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = helper.getSheetCellCursor();
++	xSheetCellCursor->collapseToCurrentRegion();
++	uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
++	table::CellRangeAddress aOutlineAddress = xCellRangeAddressable->getRangeAddress();
++
++	// check if the specified range is a single summary column or row.
++	table::CellRangeAddress thisAddress = helper.getCellRangeAddressable()->getRangeAddress();
++	if( (thisAddress.StartRow == thisAddress.EndRow &&  thisAddress.EndRow == aOutlineAddress.EndRow ) ||
++		(thisAddress.StartColumn == thisAddress.EndColumn && thisAddress.EndColumn == aOutlineAddress.EndColumn ))
++	{
++		sal_Bool bColumn =thisAddress.StartRow == thisAddress.EndRow ? sal_False:sal_True; 
++		ScDocument* pDoc = getDocumentFromRange( mxRange );
++		ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable(static_cast<SCTAB>(thisAddress.Sheet), sal_True);
++		const ScOutlineArray* pOutlineArray =  bColumn ? pOutlineTable->GetColArray(): pOutlineTable->GetRowArray();
++		if( pOutlineArray )
++		{
++			SCCOLROW nPos = bColumn ? (SCCOLROW)(thisAddress.EndColumn-1):(SCCOLROW)(thisAddress.EndRow-1);
++			ScOutlineEntry* pEntry = pOutlineArray->GetEntryByPos( 0, nPos );
++			if( pEntry )
++			{
++				bShowDetail = !pEntry->IsHidden();
++				return uno::makeAny( bShowDetail );
++			}
++		}
++	}
++	else
++	{
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can not set Range.ShowDetail attribute ")), uno::Reference< uno::XInterface >() );
++	}
++    return aNULL();
++}
++
++void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::RuntimeException)
++{
++	// #FIXME, If the specified range is in a PivotTable report
++
++	// In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception
++	if( m_Areas->getCount() > 1 )
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can not set Range.ShowDetail attribute ")), uno::Reference< uno::XInterface >() );
++	
++	sal_Bool bShowDetail = sal_False;
++	aShowDetail >>= bShowDetail;
++
++	RangeHelper helper( mxRange );
++	uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = helper.getSheetCellCursor();
++	xSheetCellCursor->collapseToCurrentRegion();
++	uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
++	table::CellRangeAddress aOutlineAddress = xCellRangeAddressable->getRangeAddress();
++
++	// check if the specified range is a single summary column or row.
++	table::CellRangeAddress thisAddress = helper.getCellRangeAddressable()->getRangeAddress();
++	if( (thisAddress.StartRow == thisAddress.EndRow &&  thisAddress.EndRow == aOutlineAddress.EndRow ) ||
++		(thisAddress.StartColumn == thisAddress.EndColumn && thisAddress.EndColumn == aOutlineAddress.EndColumn ))
++	{			
++		// #FIXME, seems there is a different behavior between MSO and OOo. 
++		//	In OOo, the showDetail will show all the level entrys, while only show the first level entry in MSO
++		uno::Reference< sheet::XSheetOutline > xSheetOutline( helper.getSpreadSheet(), uno::UNO_QUERY_THROW );
++		if( bShowDetail )
++			xSheetOutline->showDetail( aOutlineAddress );
++		else
++			xSheetOutline->hideDetail( aOutlineAddress );
++	}
++	else
++	{
++		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can not set Range.ShowDetail attribute ")), uno::Reference< uno::XInterface >() );
++	}
++}
++
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeException)
++{
++    uno::Reference< sheet::XSheetCellRange > xMergeShellCellRange(mxRange->getCellRangeByPosition(0,0,0,0), uno::UNO_QUERY_THROW);
++    uno::Reference< sheet::XSheetCellCursor > xMergeSheetCursor(xMergeShellCellRange->getSpreadsheet()->createCursorByRange( xMergeShellCellRange ), uno::UNO_QUERY_THROW);
++    if( xMergeSheetCursor.is() )
++    {
++        xMergeSheetCursor->collapseToMergedArea();
++        uno::Reference<sheet::XCellRangeAddressable> xMergeCellAddress(xMergeSheetCursor, uno::UNO_QUERY_THROW);
++        if( xMergeCellAddress.is() )
++        {
++            table::CellRangeAddress aCellAddress = xMergeCellAddress->getRangeAddress();
++            if( aCellAddress.StartColumn ==0 && aCellAddress.EndColumn==0 &&
++                aCellAddress.StartRow==0 && aCellAddress.EndRow==0)
++            {
++                return new ScVbaRange( getParent(),mxContext,mxRange );
++            }
++            else
++            {
++                ScRange refRange( static_cast< SCCOL >( aCellAddress.StartColumn ), static_cast< SCROW >( aCellAddress.StartRow ), static_cast< SCTAB >( aCellAddress.Sheet ), 
++                                  static_cast< SCCOL >( aCellAddress.EndColumn ), static_cast< SCROW >( aCellAddress.EndRow ), static_cast< SCTAB >( aCellAddress.Sheet ) );
++                uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getScDocShell() , refRange ) );
++                return new ScVbaRange( getParent(),mxContext,xRange );
++            }
++        }
++    }
++    return new ScVbaRange( getParent(),mxContext,mxRange );
++}
++
++void SAL_CALL 
++ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException)
++{
++	ScDocShell* pShell = NULL;
++
++	sal_Int32 nItems = m_Areas->getCount();
++	uno::Sequence< 	table::CellRangeAddress > printAreas( nItems );
++	uno::Reference< sheet::XPrintAreas > xPrintAreas;
++	for ( sal_Int32 index=1; index <= nItems; ++index )
++	{
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++
++		RangeHelper thisRange( xRange->getCellRange() );
++		table::CellRangeAddress rangeAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++		if ( index == 1 )
++		{
++			ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xRange.get() ); 
++			// initialise the doc shell and the printareas
++			pShell = getDocShellFromRange( pRange->mxRange );
++			xPrintAreas.set( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
++		}
++		printAreas[ index - 1 ] = rangeAddress;
++	}
++	if ( pShell )
++	{
++		if ( xPrintAreas.is() )
++		{
++			xPrintAreas->setPrintAreas( printAreas );
++			uno::Reference< frame::XModel > xModel = pShell->GetModel();
++			PrintOutHelper( excel::getBestViewShell( xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, sal_True );
++		}
++	}
++}
++
++void SAL_CALL
++ScVbaRange::AutoFill(  const uno::Reference< excel::XRange >& Destination, const uno::Any& Type ) throw (uno::RuntimeException) 
++{
++	uno::Reference< excel::XRange > xDest( Destination, uno::UNO_QUERY_THROW );
++	ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xDest.get() );
++	RangeHelper destRangeHelper( pRange->mxRange );
++	table::CellRangeAddress destAddress = destRangeHelper.getCellRangeAddressable()->getRangeAddress();	
++	
++	RangeHelper thisRange( mxRange );
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();	
++	ScRange sourceRange;
++	ScRange destRange;
++
++	ScUnoConversion::FillScRange( destRange, destAddress );	
++	ScUnoConversion::FillScRange( sourceRange, thisAddress );
++	
++	
++	// source is valid
++//	if (  !sourceRange.In( destRange ) )
++//		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "source not in destination" ) ), uno::Reference< uno::XInterface >() );
++
++	FillDir eDir = FILL_TO_BOTTOM;
++	double fStep = 1.0;
++
++	ScRange aRange( destRange );
++	ScRange aSourceRange( destRange );
++
++	// default to include the number of Rows in the source range;
++	SCCOLROW nSourceCount = ( sourceRange.aEnd.Row() - sourceRange.aStart.Row() ) + 1;
++	SCCOLROW nCount = 0;	
++
++	if ( sourceRange != destRange )
++	{
++		// Find direction of fill, vertical or horizontal
++		if ( sourceRange.aStart == destRange.aStart )
++		{
++			if ( sourceRange.aEnd.Row() == destRange.aEnd.Row() )
++			{
++				nSourceCount = ( sourceRange.aEnd.Col() - sourceRange.aStart.Col() + 1 );
++				aSourceRange.aEnd.SetCol( static_cast<SCCOL>( aSourceRange.aStart.Col() + nSourceCount - 1 ) );
++				eDir = FILL_TO_RIGHT;			
++				nCount = aRange.aEnd.Col() - aSourceRange.aEnd.Col();
++			}
++			else if ( sourceRange.aEnd.Col() == destRange.aEnd.Col() )
++			{
++				aSourceRange.aEnd.SetRow( static_cast<SCROW>( aSourceRange.aStart.Row() + nSourceCount ) - 1 );
++				nCount = aRange.aEnd.Row() - aSourceRange.aEnd.Row();
++				eDir = FILL_TO_BOTTOM;
++			}
++		}
++
++		else if ( aSourceRange.aEnd == destRange.aEnd ) 
++		{
++			if ( sourceRange.aStart.Col() == destRange.aStart.Col() )
++			{
++				aSourceRange.aStart.SetRow( static_cast<SCROW>( aSourceRange.aEnd.Row() - nSourceCount + 1 ) );
++				nCount = aSourceRange.aStart.Row() - aRange.aStart.Row();
++				eDir = FILL_TO_TOP;			
++				fStep = -fStep;
++			}
++			else if ( sourceRange.aStart.Row() == destRange.aStart.Row() )
++			{
++				nSourceCount = ( sourceRange.aEnd.Col() - sourceRange.aStart.Col() ) + 1;
++				aSourceRange.aStart.SetCol( static_cast<SCCOL>( aSourceRange.aEnd.Col() - nSourceCount + 1 ) );
++				nCount = aSourceRange.aStart.Col() - aRange.aStart.Col();
++				eDir = FILL_TO_LEFT;			
++				fStep = -fStep;
++			}
++		}
++	}	
++	ScDocShell* pDocSh= getDocShellFromRange( mxRange );
++
++	FillCmd eCmd = FILL_AUTO;
++	FillDateCmd eDateCmd = FILL_DAY;	
++
++#ifdef VBA_OOBUILD_HACK
++	double fEndValue =  MAXDOUBLE;
++#endif
++
++	if ( Type.hasValue() )
++	{
++		sal_Int16 nFillType = excel::XlAutoFillType::xlFillDefault; 	
++		Type >>= nFillType;
++		switch ( nFillType )
++		{
++			case excel::XlAutoFillType::xlFillCopy:
++				eCmd = 	FILL_SIMPLE;
++				fStep = 0.0;
++				break;
++			case excel::XlAutoFillType::xlFillDays:
++				eCmd = FILL_DATE;
++				break;
++			case excel::XlAutoFillType::xlFillMonths:
++				eCmd = FILL_DATE;
++				eDateCmd = FILL_MONTH;
++				break;
++			case excel::XlAutoFillType::xlFillWeekdays:
++				eCmd = FILL_DATE;
++				eDateCmd = FILL_WEEKDAY;
++				break;
++			case excel::XlAutoFillType::xlFillYears:
++				eCmd = FILL_DATE;
++				eDateCmd = FILL_YEAR;
++				break;
++			case excel::XlAutoFillType::xlGrowthTrend:
++				eCmd = FILL_GROWTH;
++				break;
++			case excel::XlAutoFillType::xlFillFormats:
++				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "xlFillFormat not supported for AutoFill" ) ), uno::Reference< uno::XInterface >() );
++			case excel::XlAutoFillType::xlFillValues:
++			case excel::XlAutoFillType::xlFillSeries:
++			case excel::XlAutoFillType::xlLinearTrend:
++				eCmd = FILL_LINEAR;
++				break;
++			case excel::XlAutoFillType::xlFillDefault:
++			default:
++				eCmd = 	FILL_AUTO;
++				break;
++		}	
++	}
++	ScDocFunc aFunc(*pDocSh);
++#ifdef VBA_OOBUILD_HACK
++	aFunc.FillAuto( aSourceRange, NULL, eDir, eCmd, eDateCmd, nCount, fStep, fEndValue, TRUE, TRUE );
++#endif
++}
++sal_Bool SAL_CALL
++ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange >& ChangingCell ) throw (uno::RuntimeException)
++{
++	ScDocShell* pDocShell = getScDocShell();
++	sal_Bool bRes = sal_True;
++	ScVbaRange* pRange = static_cast< ScVbaRange* >( ChangingCell.get() );
++	if ( pDocShell && pRange )
++	{
++		uno::Reference< sheet::XGoalSeek > xGoalSeek(  pDocShell->GetModel(), uno::UNO_QUERY_THROW );
++		RangeHelper thisRange( mxRange );
++		table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++		RangeHelper changingCellRange( pRange->mxRange );
++		table::CellRangeAddress changingCellAddr = changingCellRange.getCellRangeAddressable()->getRangeAddress();
++		rtl::OUString sGoal = getAnyAsString( Goal );
++		table::CellAddress thisCell( thisAddress.Sheet, thisAddress.StartColumn, thisAddress.StartRow );
++		table::CellAddress changingCell( changingCellAddr.Sheet, changingCellAddr.StartColumn, changingCellAddr.StartRow );
++		sheet::GoalResult res = xGoalSeek->seekGoal( thisCell, changingCell, sGoal );
++		ChangingCell->setValue( uno::makeAny( res.Result ) );
++		
++		// openoffice behaves differently, result is 0 if the divergence is too great
++                // but... if it detects 0 is the value it requires then it will use that
++		// e.g. divergence & result both = 0.0 does NOT mean there is an error
++		if ( ( res.Divergence != 0.0 ) && ( res.Result == 0.0 ) )
++			bRes = sal_False;
++	}
++	else
++		bRes = sal_False;
++	return bRes;
++}
++
++void
++ScVbaRange::Calculate(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	getWorksheet()->Calculate();
++}
++
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	if ( mbIsRows || mbIsColumns )
++	{
++		if ( column.hasValue() )
++			DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
++		uno::Reference< excel::XRange > xRange;
++		if ( mbIsColumns )
++			xRange = Columns( row );
++		else
++			xRange = Rows( row );
++		return xRange;
++	}
++	return Cells( row, column );	
++}
++
++void
++ScVbaRange::AutoOutline(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	// #TODO #FIXME needs to check for summary row/col ( whatever they are )
++	// not valid for multi Area Addresses
++	if ( m_Areas->getCount() > 1 )
++		DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY); 			
++	// So needs to either span an entire Row or a just be a single cell 
++	// ( that contains a summary RowColumn )
++	// also the Single cell cause doesn't seem to be handled specially in 
++	// this code ( ported from the helperapi RangeImpl.java, 
++	// RangeRowsImpl.java, RangesImpl.java, RangeSingleCellImpl.java
++	RangeHelper thisRange( mxRange );
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++
++	if ( isSingleCellRange() || mbIsRows )
++	{
++		uno::Reference< sheet::XSheetOutline > xSheetOutline( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
++       		 xSheetOutline->autoOutline( thisAddress );	
++	}
++	else
++		DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
++}
++
++void SAL_CALL
++ScVbaRange:: ClearOutline(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		sal_Int32 nItems = m_Areas->getCount();
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++			xRange->ClearOutline();	
++		}
++		return;
++	}
++	RangeHelper thisRange( mxRange );
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++	uno::Reference< sheet::XSheetOutline > xSheetOutline( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
++        xSheetOutline->clearOutline();	
++}
++
++void 
++ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, uno::RuntimeException )
++{
++	if ( m_Areas->getCount() > 1 )
++		 DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY);
++	table::TableOrientation nOrient = table::TableOrientation_ROWS;
++	if ( mbIsColumns )
++		nOrient = table::TableOrientation_COLUMNS;
++	RangeHelper thisRange( mxRange );
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
++	uno::Reference< sheet::XSheetOutline > xSheetOutline( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
++	if ( bUnGroup )
++	        xSheetOutline->ungroup( thisAddress, nOrient );
++	else
++	        xSheetOutline->group( thisAddress, nOrient );
++}
++
++void SAL_CALL 
++ScVbaRange::Group(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	groupUnGroup();	
++}
++void SAL_CALL 
++ScVbaRange::Ungroup(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	groupUnGroup(true);	
++}
++
++void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, sal_Bool _bMerge = sal_True ) throw ( uno::RuntimeException )
++{
++        uno::Reference< util::XMergeable > xMergeable( xCellRange, uno::UNO_QUERY_THROW );
++        xMergeable->merge(_bMerge);            
++}
++void SAL_CALL 
++ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		sal_Int32 nItems = m_Areas->getCount();
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++			xRange->Merge(Across);	
++		}
++		return;
++	}
++	uno::Reference< table::XCellRange > oCellRange;	
++	sal_Bool bAcross = sal_False;
++	Across >>= bAcross;
++	if ( !bAcross )
++		lcl_mergeCellsOfRange( mxRange );
++	else
++	{
++		uno::Reference< excel::XRange > oRangeRowsImpl = Rows( uno::Any() );
++		// #TODO #FIXME this seems incredibly lame, this can't be right
++		for (sal_Int32 i=1; i <= oRangeRowsImpl->getCount();i++)
++		{
++               		oRangeRowsImpl->Cells( uno::makeAny( i ), uno::Any() )->Merge( uno::makeAny( sal_False ) );
++           	}
++	}
++}
++
++void SAL_CALL 
++ScVbaRange::UnMerge(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		sal_Int32 nItems = m_Areas->getCount();
++		for ( sal_Int32 index=1; index <= nItems; ++index )
++		{
++			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++			xRange->UnMerge();	
++		}
++		return;
++	}
++	lcl_mergeCellsOfRange( mxRange, sal_False);
++}
++
++uno::Any SAL_CALL 
++ScVbaRange::getStyle() throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32( 1 ) ), uno::Any() ), uno::UNO_QUERY_THROW  );
++		return xRange->getStyle();
++	}
++	uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW );
++	rtl::OUString sStyleName;
++    xProps->getPropertyValue(CELLSTYLE) >>= sStyleName;
++	ScDocShell* pShell = getScDocShell();
++	uno::Reference< frame::XModel > xModel( pShell->GetModel() ); 
++	uno::Reference< excel::XStyle > xStyle = new ScVbaStyle( this, mxContext,  sStyleName, xModel );
++	return uno::makeAny( xStyle );
++}
++void SAL_CALL 
++ScVbaRange::setStyle( const uno::Any& _style ) throw (uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32( 1 ) ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xRange->setStyle( _style );
++		return;
++	}
++	uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW );
++	uno::Reference< excel::XStyle > xStyle;
++	_style >>= xStyle;
++	xProps->setPropertyValue(CELLSTYLE, uno::makeAny(xStyle->getName()));
++}
++
++uno::Reference< excel::XRange >
++ScVbaRange::PreviousNext( bool bIsPrevious )
++{ 
++	ScMarkData markedRange;
++	ScRange refRange;	
++	RangeHelper thisRange( mxRange );
++	
++	ScUnoConversion::FillScRange( refRange, thisRange.getCellRangeAddressable()->getRangeAddress());
++	markedRange. SetMarkArea( refRange );
++	short nMove = bIsPrevious ? -1 : 1;
++
++	SCCOL nNewX = refRange.aStart.Col();
++	SCROW nNewY = refRange.aStart.Row();
++	SCTAB nTab = refRange.aStart.Tab();
++
++	ScDocument* pDoc = getScDocument(); 
++	pDoc->GetNextPos( nNewX,nNewY, nTab, nMove,0, TRUE,TRUE, markedRange );	
++	refRange.aStart.SetCol( nNewX );
++	refRange.aStart.SetRow( nNewY );
++	refRange.aStart.SetTab( nTab );
++	refRange.aEnd.SetCol( nNewX );
++	refRange.aEnd.SetRow( nNewY );
++	refRange.aEnd.SetTab( nTab );
++
++	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getScDocShell() , refRange ) );
++	
++	return new ScVbaRange( getParent(), mxContext, xRange );
++}
++
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaRange::Next() throw (script::BasicErrorException, uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32( 1 ) ), uno::Any() ) , uno::UNO_QUERY_THROW  );
++		return xRange->Next();
++	}
++	return PreviousNext( false );
++}
++
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaRange::Previous() throw (script::BasicErrorException, uno::RuntimeException)
++{
++	if ( m_Areas->getCount() > 1 )
++	{
++		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32( 1 ) ), uno::Any() ), uno::UNO_QUERY_THROW  );
++		return xRange->Previous();
++	}
++	return PreviousNext( true );
++}
++
++uno::Reference< excel::XRange > SAL_CALL
++ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw ( script::BasicErrorException )
++{
++	bool bIsSingleCell = isSingleCellRange(); 
++	bool bIsMultiArea = ( m_Areas->getCount() > 1 );
++	ScVbaRange* pRangeToUse = this;
++	sal_Int32 nType = 0;
++	if ( !( _oType >>= nType ) )
++		DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
++	switch(nType)
++	{
++		case excel::XlCellType::xlCellTypeSameFormatConditions:
++		case excel::XlCellType::xlCellTypeAllValidation:
++		case excel::XlCellType::xlCellTypeSameValidation:
++			DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); 
++			break;
++		case excel::XlCellType::xlCellTypeBlanks:
++		case excel::XlCellType::xlCellTypeComments:
++		case excel::XlCellType::xlCellTypeConstants:
++		case excel::XlCellType::xlCellTypeFormulas:
++		case excel::XlCellType::xlCellTypeVisible:
++		case excel::XlCellType::xlCellTypeLastCell:
++		{
++			if ( bIsMultiArea )
++			{
++				// need to process each area, gather the results and
++				// create a new range from those
++				std::vector< table::CellRangeAddress > rangeResults;
++				sal_Int32 nItems = ( m_Areas->getCount() + 1 );
++				for ( sal_Int32 index=1; index <= nItems; ++index )
++				{
++					uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
++					xRange = xRange->SpecialCells( _oType,  _oValue);
++					ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xRange.get() ); 
++					if ( xRange.is() && pRange )
++					{
++						sal_Int32 nElems = ( pRange->m_Areas->getCount() + 1 );
++						for ( sal_Int32 nArea = 1; nArea < nElems; ++nArea )
++						{
++							uno::Reference< excel::XRange > xTmpRange( m_Areas->Item( uno::makeAny( nArea ), uno::Any() ), uno::UNO_QUERY_THROW );
++							RangeHelper rHelper( xTmpRange->getCellRange() );
++							rangeResults.push_back( rHelper.getCellRangeAddressable()->getRangeAddress() );
++						}	
++					}
++				}	
++				ScRangeList aCellRanges;
++				std::vector< table::CellRangeAddress >::iterator it = rangeResults.begin();
++				std::vector< table::CellRangeAddress >::iterator it_end = rangeResults.end();
++				for ( ; it != it_end; ++ it )
++				{
++					ScRange refRange;
++					ScUnoConversion::FillScRange( refRange, *it );
++					aCellRanges.Append( refRange );
++				}
++				// Single range
++				if ( aCellRanges.First() == aCellRanges.Last() )
++				{
++					uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getScDocShell(), *aCellRanges.First() ) );
++				// #FIXME need proper (WorkSheet) parent
++					return new ScVbaRange( getParent(), mxContext, xRange );
++				}
++				uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( getScDocShell(), aCellRanges ) );
++ 	
++				// #FIXME need proper (WorkSheet) parent
++				return new ScVbaRange( getParent(), mxContext, xRanges );
++			}
++			else if ( bIsSingleCell )
++			{
++				uno::Reference< excel::XRange > xUsedRange = getWorksheet()->getUsedRange();
++				pRangeToUse = static_cast< ScVbaRange* >( xUsedRange.get() );	
++			}
++		
++			break;
++		}			
++		default:
++		DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
++			break;
++	}
++	if ( !pRangeToUse )
++		DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() );
++	return pRangeToUse->SpecialCellsImpl( nType, _oValue );	
++}
++
++sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script::BasicErrorException )
++{
++	sal_Int32 nType = excel::XlSpecialCellsValue::xlNumbers;
++	aType >>= nType;
++	sal_Int32 nRes = sheet::FormulaResult::VALUE;
++
++	switch(nType)
++	{
++		case excel::XlSpecialCellsValue::xlErrors:
++			nRes= sheet::FormulaResult::ERROR;
++			break;	
++		case excel::XlSpecialCellsValue::xlLogical:
++			//TODO bc93774: ask NN if this is really an appropriate substitute
++			nRes = sheet::FormulaResult::VALUE;
++			break;
++		case excel::XlSpecialCellsValue::xlNumbers:
++			nRes = sheet::FormulaResult::VALUE;
++			break;
++		case excel::XlSpecialCellsValue::xlTextValues:
++			nRes = sheet::FormulaResult::STRING;
++			break;
++		default:
++			DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
++	}
++	return nRes;
++}
++
++uno::Reference< excel::XRange > 
++ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( script::BasicErrorException )
++{
++	uno::Reference< excel::XRange > xRange;
++	try
++	{
++		uno::Reference< sheet::XCellRangesQuery > xQuery( mxRange, uno::UNO_QUERY_THROW );
++		uno::Reference< excel::XRange > oLocRangeImpl;
++		uno::Reference< sheet::XSheetCellRanges > xLocSheetCellRanges;
++		switch(nType)
++		{
++			case excel::XlCellType::xlCellTypeAllFormatConditions:
++			case excel::XlCellType::xlCellTypeSameFormatConditions:
++			case excel::XlCellType::xlCellTypeAllValidation:
++			case excel::XlCellType::xlCellTypeSameValidation:
++				// Shouldn't get here ( should be filtered out by 
++				// ScVbaRange::SpecialCells()
++				DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); 
++				break;
++			case excel::XlCellType::xlCellTypeBlanks:
++				xLocSheetCellRanges = xQuery->queryEmptyCells();
++				break;
++			case excel::XlCellType::xlCellTypeComments:
++				xLocSheetCellRanges = xQuery->queryContentCells(sheet::CellFlags::ANNOTATION);
++				break;
++			case excel::XlCellType::xlCellTypeConstants:
++				xLocSheetCellRanges = xQuery->queryContentCells(23);	      
++				break;
++			case excel::XlCellType::xlCellTypeFormulas:
++			{
++				sal_Int32 nFormulaResult = lcl_getFormulaResultFlags(_oValue);
++				xLocSheetCellRanges = xQuery->queryFormulaCells(nFormulaResult);
++				break;
++			}
++			case excel::XlCellType::xlCellTypeLastCell:
++				xRange = Cells( uno::makeAny( getCount() ), uno::Any() );
++			case excel::XlCellType::xlCellTypeVisible:
++				xLocSheetCellRanges = xQuery->queryVisibleCells();	      
++				break;
++			default:
++				DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
++				break;
++		}
++		if (xLocSheetCellRanges.is())
++		{
++			xRange = lcl_makeXRangeFromSheetCellRanges( getParent(), mxContext, xLocSheetCellRanges, getScDocShell() );
++		}
++	}
++	catch (uno::Exception& )
++	{
++		DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_NOCELLSWEREFOUND);                    
++	}
++	return xRange;
++}
++
++void SAL_CALL 
++ScVbaRange::RemoveSubtotal(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	uno::Reference< sheet::XSubTotalCalculatable > xSub( mxRange, uno::UNO_QUERY_THROW );
++	xSub->removeSubTotals();	
++}
++
++void SAL_CALL 
++ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::Sequence< ::sal_Int32 >& _nTotalList, const uno::Any& aReplace, const uno::Any& PageBreaks, const uno::Any& /*SummaryBelowData*/ ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++	try
++	{
++		sal_Bool bDoReplace = sal_False;
++		aReplace >>= bDoReplace;
++		sal_Bool bAddPageBreaks = sal_False;
++		PageBreaks >>= bAddPageBreaks;
++
++		uno::Reference< sheet::XSubTotalCalculatable> xSub(mxRange, uno::UNO_QUERY_THROW );
++		uno::Reference< sheet::XSubTotalDescriptor > xSubDesc = xSub->createSubTotalDescriptor(sal_True);
++		uno::Reference< beans::XPropertySet > xSubDescPropertySet( xSubDesc, uno::UNO_QUERY_THROW );
++		xSubDescPropertySet->setPropertyValue(INSERTPAGEBREAKS, uno::makeAny( bAddPageBreaks));
++		sal_Int32 nLen = _nTotalList.getLength();
++		uno::Sequence< sheet::SubTotalColumn > aColumns( nLen );
++		for (int i = 0; i < nLen; i++)
++		{
++			aColumns[i].Column = _nTotalList[i] - 1;
++			switch (_nFunction)
++			{
++				case excel::XlConsolidationFunction::xlAverage:
++					aColumns[i].Function = sheet::GeneralFunction_AVERAGE;
++					break;
++				case excel::XlConsolidationFunction::xlCount:
++					aColumns[i].Function = sheet::GeneralFunction_COUNT;
++					break;
++				case excel::XlConsolidationFunction::xlCountNums:
++					aColumns[i].Function = sheet::GeneralFunction_COUNTNUMS;
++					break;
++				case excel::XlConsolidationFunction::xlMax:
++					aColumns[i].Function = sheet::GeneralFunction_MAX;
++					break;
++				case excel::XlConsolidationFunction::xlMin:
++					aColumns[i].Function = sheet::GeneralFunction_MIN;
++					break;
++				case excel::XlConsolidationFunction::xlProduct:
++					aColumns[i].Function = sheet::GeneralFunction_PRODUCT;
++					break;
++				case excel::XlConsolidationFunction::xlStDev:
++					aColumns[i].Function = sheet::GeneralFunction_STDEV;
++					break;
++				case excel::XlConsolidationFunction::xlStDevP:
++					aColumns[i].Function = sheet::GeneralFunction_STDEVP;
++					break;
++				case excel::XlConsolidationFunction::xlSum:
++					aColumns[i].Function = sheet::GeneralFunction_SUM;
++					break;
++				case excel::XlConsolidationFunction::xlUnknown:
++					aColumns[i].Function = sheet::GeneralFunction_NONE;
++					break;
++				case excel::XlConsolidationFunction::xlVar:
++					aColumns[i].Function = sheet::GeneralFunction_VAR;
++					break;
++				case excel::XlConsolidationFunction::xlVarP:
++					aColumns[i].Function = sheet::GeneralFunction_VARP;
++					break;
++				default:
++					DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString()) ;
++					return;
++			}
++		}
++		xSubDesc->addNew(aColumns, _nGroupBy - 1);
++		xSub->applySubTotals(xSubDesc, bDoReplace);
++	}
++	catch (uno::Exception& )
++	{
++		DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
++	}
++}
++
++rtl::OUString& 
++ScVbaRange::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRange") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaRange::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Range" ) );
++	}
++	return aServiceNames;
++}
++
++sal_Bool SAL_CALL
++ScVbaRange::hasError() throw (uno::RuntimeException)
++{
++    double dResult = sal_False;
++    uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
++    uno::Reference< script::XInvocation > xInvoc( xApplication->WorksheetFunction(), uno::UNO_QUERY_THROW );
++
++    static rtl::OUString FunctionName( RTL_CONSTASCII_USTRINGPARAM("IsError" ) );
++    uno::Sequence< uno::Any > Params(1);
++    uno::Reference< excel::XRange > aRange( this );
++    Params[0] = uno::makeAny( aRange );
++    uno::Sequence< sal_Int16 > OutParamIndex;
++    uno::Sequence< uno::Any > OutParam;
++    xInvoc->invoke( FunctionName, Params, OutParamIndex, OutParam ) >>= dResult;
++    if ( dResult > 0.0 )
++         return sal_True;
++    return sal_False;
++}
++
++namespace range
++{
++namespace sdecl = comphelper::service_decl;
++sdecl::vba_service_class_<ScVbaRange, sdecl::with_args<true> > serviceImpl;
++extern sdecl::ServiceDecl const serviceDecl(
++    serviceImpl,
++    "SvVbaRange",
++    "ooo.vba.excel.Range" );
++}
+Index: sc/source/ui/vba/vbapropvalue.hxx
+===================================================================
+--- sc/source/ui/vba/vbapropvalue.hxx	(revision 276159)
++++ sc/source/ui/vba/vbapropvalue.hxx	(revision 276288)
+@@ -32,7 +32,7 @@
+ #include <ooo/vba/XPropValue.hpp>
+ #include <cppuhelper/implbase1.hxx>
+ 
+-#include "vbahelper.hxx"
++#include "excelvbahelper.hxx"
+ 
+ typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE;
+ 
+Index: sc/source/ui/vba/vbastyles.cxx
+===================================================================
+--- sc/source/ui/vba/vbastyles.cxx	(revision 276159)
++++ sc/source/ui/vba/vbastyles.cxx	(revision 276288)
+@@ -29,6 +29,7 @@
+  ************************************************************************/
+ #include "vbastyles.hxx"
+ #include "vbastyle.hxx"
++#include <ooo/vba/excel/XRange.hpp>
+ 
+ using namespace ::ooo::vba;
+ using namespace ::com::sun::star;
+Index: sc/source/ui/vba/vbaformatconditions.hxx
+===================================================================
+--- sc/source/ui/vba/vbaformatconditions.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaformatconditions.hxx	(revision 276288)
+@@ -35,7 +35,7 @@
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <com/sun/star/table/CellAddress.hpp>
+ #include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
+-#include "vbacollectionimpl.hxx"
++#include <vbahelper/vbacollectionimpl.hxx>
+ 
+ typedef CollTestImplHelper< ov::excel::XFormatConditions > ScVbaFormatConditions_BASE;
+ class ScVbaFormatConditions: public ScVbaFormatConditions_BASE
+Index: sc/source/ui/vba/vbamenus.cxx
+===================================================================
+--- sc/source/ui/vba/vbamenus.cxx	(revision 0)
++++ sc/source/ui/vba/vbamenus.cxx	(revision 276288)
+@@ -0,0 +1,145 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbamenus.hxx"
++#include "vbamenu.hxx"
++#include <ooo/vba/office/MsoControlType.hpp>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE;
++
++class MenuEnumeration : public MenuEnumeration_BASE
++{
++    uno::Reference< XHelperInterface > m_xParent;
++    uno::Reference< uno::XComponentContext > m_xContext;
++    uno::Reference< container::XEnumeration > m_xEnumeration;
++public:
++    MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
++    {
++    }
++    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
++    {
++        return m_xEnumeration->hasMoreElements();
++    }
++    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
++    {
++        // FIXME: should be add menu
++        if( hasMoreElements() )
++        {
++            uno::Reference< XCommandBarControl > xCommandBarControl( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
++            if( xCommandBarControl->getType() == office::MsoControlType::msoControlPopup )
++            {
++                uno::Reference< excel::XMenu > xMenu( new ScVbaMenu( m_xParent, m_xContext, xCommandBarControl ) );
++                return uno::makeAny( xMenu );
++            }
++            nextElement();
++        }
++        else
++            throw container::NoSuchElementException();
++        return uno::Any();
++    }
++};
++
++ScVbaMenus::ScVbaMenus( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) throw ( uno::RuntimeException ) : Menus_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls )
++{
++}
++
++// XEnumerationAccess
++uno::Type SAL_CALL 
++ScVbaMenus::getElementType() throw ( uno::RuntimeException )
++{
++    return excel::XMenu::static_type( 0 );
++}
++
++uno::Reference< container::XEnumeration >
++ScVbaMenus::createEnumeration() throw ( uno::RuntimeException )
++{
++    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBarControls, uno::UNO_QUERY_THROW );
++    return uno::Reference< container::XEnumeration >( new MenuEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) );
++}
++
++uno::Any
++ScVbaMenus::createCollectionObject( const uno::Any& aSource )
++{
++    // make no sense
++    return aSource;
++}
++
++sal_Int32 SAL_CALL 
++ScVbaMenus::getCount() throw(css::uno::RuntimeException)
++{
++    // FIXME: should check if it is a popup menu
++    return m_xCommandBarControls->getCount();
++}
++
++// ScVbaCollectionBaseImpl
++uno::Any SAL_CALL
++ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
++{
++    uno::Reference< XCommandBarControl > xCommandBarControl( m_xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
++    if( xCommandBarControl->getType() != office::MsoControlType::msoControlPopup )
++        throw uno::RuntimeException();
++    return uno::makeAny( uno::Reference< excel::XMenu > ( new ScVbaMenu( this, mxContext, xCommandBarControl ) ) );
++}
++
++uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
++{
++    sal_Int32 nType = office::MsoControlType::msoControlPopup;
++    uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore );
++    xCommandBarControl->setCaption( Caption );
++    return uno::Reference< excel::XMenu >( new ScVbaMenu( this, mxContext, xCommandBarControl ) );
++}
++
++// XHelperInterface
++rtl::OUString& 
++ScVbaMenus::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenus") );
++    return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++ScVbaMenus::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Menus" ) );
++    }
++    return aServiceNames;
++}
++
+Index: sc/source/ui/vba/vbacharts.hxx
+===================================================================
+--- sc/source/ui/vba/vbacharts.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacharts.hxx	(revision 276288)
+@@ -31,8 +31,8 @@
+ #define SC_VBA_CHARTS_HXX
+ #include <ooo/vba/excel/XCharts.hpp>
+ #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+-#include"vbacollectionimpl.hxx"
+-#include "vbahelper.hxx"
++#include <vbahelper/vbacollectionimpl.hxx>
++#include "excelvbahelper.hxx"
+ #include <hash_map>
+ 
+ typedef CollTestImplHelper< ov::excel::XCharts > Charts_BASE;
+@@ -43,7 +43,7 @@ class ScVbaCharts : public Charts_BASE
+ 	css::uno::Reference< css::sheet::XSpreadsheetDocument > xSpreadsheetDocument;
+ 	css::uno::Reference< css::lang::XComponent > xComponent;
+ public:
+-	ScVbaCharts( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext );
++	ScVbaCharts( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::frame::XModel >& xModel );
+ 	// XCharts
+ 	virtual css::uno::Any SAL_CALL Add() throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ 	virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getActiveChart(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+Index: sc/source/ui/vba/vbapivotcache.hxx
+===================================================================
+--- sc/source/ui/vba/vbapivotcache.hxx	(revision 276159)
++++ sc/source/ui/vba/vbapivotcache.hxx	(revision 276288)
+@@ -34,7 +34,7 @@
+ #include <com/sun/star/sheet/XDataPilotTable.hpp>
+ 
+ #include <ooo/vba/excel/XPivotCache.hpp>
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ typedef InheritedHelperInterfaceImpl1<ov::excel::XPivotCache > PivotCacheImpl_BASE;
+ 
+Index: sc/source/ui/vba/vbapalette.cxx
+===================================================================
+--- sc/source/ui/vba/vbapalette.cxx	(revision 276159)
++++ sc/source/ui/vba/vbapalette.cxx	(revision 276288)
+@@ -92,7 +92,7 @@ ScVbaPalette::getDefaultPalette()
+ }
+ 
+ uno::Reference< container::XIndexAccess >
+-ScVbaPalette::getPalette()
++ScVbaPalette::getPalette() const
+ {
+ 	uno::Reference< container::XIndexAccess > xIndex;
+ 	uno::Reference< beans::XPropertySet > xProps;
+Index: sc/source/ui/vba/vbawsfunction.cxx
+===================================================================
+--- sc/source/ui/vba/vbawsfunction.cxx	(revision 276159)
++++ sc/source/ui/vba/vbawsfunction.cxx	(revision 276288)
+@@ -74,26 +74,62 @@ ScVbaWSFunction::invoke(const rtl::OUString& Funct
+ 
+ 	for (int i=0; i < Params.getLength();i++) 
+ 	{
++        aArrayTemp[i]= aArray[i];
+ 		uno::Reference<excel::XRange> myRange( aArray[ i ], uno::UNO_QUERY );
+ 		if ( myRange.is() ) 
+ 		{
+ 			aArrayTemp[i] = myRange->getCellRange();
+ 			continue;
+ 		}
+-		aArrayTemp[i]= aArray[i];
++        else if ( aArray[ i ].getValueType().getTypeClass() == uno::TypeClass_SEQUENCE )
++        {
++            // the sheet.FunctionAccess service doesn't deal with Sequences, only Sequences of Sequence
++            uno::Type aType = aArray[ i ].getValueType();
++            if ( aType.equals( getCppuType( (uno::Sequence<sal_Int16>*)0 ) ) )
++            {
++                uno::Sequence< uno::Sequence< sal_Int16 > >  aTmp(1);
++                aArray[ i ] >>= aTmp[ 0 ];
++                aArrayTemp[i] <<= aTmp;
+ 	}
++            else if ( aType.equals( getCppuType( (uno::Sequence<sal_Int32>*)0 ) ) )
++            {
++                uno::Sequence< uno::Sequence< sal_Int32 > > aTmp(1);
++                aArray[ i ] >>= aTmp[ 0 ];
++                aArrayTemp[i] <<= aTmp;
++            }
++            else if ( aType.equals( getCppuType( (uno::Sequence<double>*)0 ) ) )
++            {
++                uno::Sequence< uno::Sequence< double > > aTmp(1);
++                aArray[ i ] >>= aTmp[ 0 ];
++                aArrayTemp[i] <<= aTmp;
++            }
++            else if ( aType.equals( getCppuType( (uno::Sequence<rtl::OUString>*)0 ) ) )
++            {
++                uno::Sequence< uno::Sequence< rtl::OUString > > aTmp(1);
++                aArray[ i ] >>= aTmp[ 0 ];
++                aArrayTemp[i] <<= aTmp;
++            }
++            else if ( aType.equals( getCppuType( (uno::Sequence<uno::Any>*)0 ) ) )
++            {
++                uno::Sequence< uno::Sequence<uno::Any > > aTmp(1);
++                aArray[ i ] >>= aTmp[ 0 ];
++                aArrayTemp[i] <<= aTmp;
++            }
++        }
++	}
+ 
+ 	for ( int count=0; count < aParamTemp.getLength(); ++count )
+ 		OSL_TRACE("Param[%d] is %s",
+ 			count, rtl::OUStringToOString( comphelper::anyToString( aParamTemp[count] ), RTL_TEXTENCODING_UTF8 ).getStr()  );
+ 	
+ 	uno::Any aRet = xFunctionAccess->callFunction(FunctionName,aParamTemp);
++
+ 	// MATCH function should alwayse return a double value, but currently if the first argument is XCellRange, MATCH function returns an array instead of a double value. Don't know why?
+ 	// To fix this issue in safe, current solution is to convert this array to a double value just for MATCH function.
+ 	String aUpper( FunctionName );
+ 	ScCompiler aCompiler( NULL, ScAddress() ); 
+ 	OpCode eOp = aCompiler.GetEnglishOpCode( aUpper.ToUpperAscii() );
+-	if( eOp == ocMatch )
++	if( eOp == ocMatch || eOp == ocIsError )
+ 	{
+ 		double fVal = 0.0;
+ 		if( aRet >>= fVal )
+Index: sc/source/ui/vba/vbacomment.cxx
+===================================================================
+--- sc/source/ui/vba/vbacomment.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacomment.cxx	(revision 276288)
+@@ -34,6 +34,7 @@
+ #include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
+ #include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
+ #include <com/sun/star/sheet/XSheetCellRange.hpp>
++#include <com/sun/star/sheet/XCellAddressable.hpp>
+ #include <com/sun/star/table/CellAddress.hpp>
+ #include <com/sun/star/table/XCell.hpp>
+ #include <com/sun/star/text/XText.hpp>
+@@ -161,7 +162,6 @@ ScVbaComment::Text( const uno::Any& aText, const u
+ 	aText >>= sText;
+ 
+ 	uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY_THROW );
+-	rtl::OUString sAnnoText = xAnnoText->getString();
+ 
+ 	if ( aStart.hasValue() )
+ 	{
+@@ -194,8 +194,13 @@ ScVbaComment::Text( const uno::Any& aText, const u
+ 			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScVbaComment::Text - bad Start value " ) ), uno::Reference< uno::XInterface >() );
+ 	}
+ 	else if ( aText.hasValue() )
+-		xAnnoText->setString( sText );
++	{
++		uno::Reference< sheet::XCellAddressable > xCellAddr(mxRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
++		table::CellAddress aAddress = xCellAddr->getCellAddress();
++		getAnnotations()->insertNew( aAddress, sText );
++	}
+ 
++	rtl::OUString sAnnoText = xAnnoText->getString();
+ 	return sAnnoText;
+ }
+ 
+Index: sc/source/ui/vba/vbaoleobject.cxx
+===================================================================
+--- sc/source/ui/vba/vbaoleobject.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaoleobject.cxx	(revision 276288)
+@@ -33,6 +33,7 @@
+ #include <com/sun/star/view/XControlAccess.hpp>
+ #include <com/sun/star/container/XChild.hpp>
+ #include <com/sun/star/drawing/XShape.hpp>
++#include <ooo/vba/XControlProvider.hpp>
+ 
+ #include "vbaoleobject.hxx"
+ 
+@@ -61,8 +62,9 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Referen
+     xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW );
+     xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW );
+     css::uno::Reference< css::frame::XModel > xModel( xChild->getParent(), uno::UNO_QUERY_THROW );
+-    css::uno::Reference< css::view::XControlAccess > xControlAccess( xModel->getCurrentController(), css::uno::UNO_QUERY_THROW );
+-    m_xWindowPeer = xControlAccess->getControl( xControlModel )->getPeer();
++    uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
++    uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
++    m_xControl.set( xControlProvider->createControl(  xControlShape, xModel ) );
+ }
+ 
+ uno::Reference< uno::XInterface > SAL_CALL 
+@@ -74,98 +76,76 @@ ScVbaOLEObject::getObject() throw (uno::RuntimeExc
+ sal_Bool SAL_CALL 
+ ScVbaOLEObject::getEnabled() throw (uno::RuntimeException)
+ {
+-    uno::Reference< css::awt::XWindow2 > xWindow2( m_xWindowPeer, css::uno::UNO_QUERY_THROW );
+-    return xWindow2->isEnabled();
++    return m_xControl->getEnabled();
+ }
+ 
+ void SAL_CALL 
+ ScVbaOLEObject::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException)
+ {
+-    uno::Reference< css::awt::XWindow2 > xWindow2( m_xWindowPeer, css::uno::UNO_QUERY_THROW );
+-    xWindow2->setEnable( _enabled );
++    m_xControl->setEnabled( _enabled );
+ }
+ 
+ sal_Bool SAL_CALL 
+ ScVbaOLEObject::getVisible() throw (uno::RuntimeException)
+ {
+-    uno::Reference< css::awt::XWindow2 > xWindow2( m_xWindowPeer, css::uno::UNO_QUERY_THROW );
+-    return xWindow2->isVisible();
++    OSL_TRACE("OleObject %s returning visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), m_xControl->getVisible() ? "true" : "false" );
++    return m_xControl->getVisible();
+ }
+ 
+ void SAL_CALL 
+ ScVbaOLEObject::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
+ {
+-    uno::Reference< css::awt::XWindow2 > xWindow2( m_xWindowPeer, css::uno::UNO_QUERY_THROW );
+-    xWindow2->setVisible( _visible );
++    OSL_TRACE("OleObject %s set visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), _visible ? "true" : "false" );
++    m_xControl->setVisible( _visible );
+ }
+ 
+ double SAL_CALL 
+ ScVbaOLEObject::getLeft() throw (uno::RuntimeException)
+ {
+-    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
+-    return mm2pt( xShape->getPosition().X / 100 );
++    return m_xControl->getLeft();
+ }
+ 
+ void SAL_CALL 
+ ScVbaOLEObject::setLeft( double _left ) throw (uno::RuntimeException)
+ {
+-    awt::Point oldPosition;
+-    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
+-    oldPosition = xShape->getPosition();
+-    oldPosition.X = pt2mm( _left ) * 100;
+-    xShape->setPosition( oldPosition );
++    m_xControl->setLeft( _left );
+ 
+ }
+ 
+ double SAL_CALL 
+ ScVbaOLEObject::getTop() throw (uno::RuntimeException)
+ {
+-    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
+-    return mm2pt( xShape->getPosition().Y / 100 );
++    return m_xControl->getTop();
+ }
+ 
+ void SAL_CALL 
+ ScVbaOLEObject::setTop( double _top ) throw (uno::RuntimeException)
+ {
+-    awt::Point oldPosition;
+-    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
+-    oldPosition = xShape->getPosition();
+-    oldPosition.Y = pt2mm( _top ) * 100;;
+-    xShape->setPosition( oldPosition );
++    m_xControl->setTop( _top );
+ }
+ 
+ double SAL_CALL 
+ ScVbaOLEObject::getHeight() throw (uno::RuntimeException)
+ {
+-    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
+-    return mm2pt( xShape->getSize().Height / 100 );//1pt = 1/72in
++    return m_xControl->getHeight();
+ }
+ 
+ void SAL_CALL 
+ ScVbaOLEObject::setHeight( double _height ) throw (uno::RuntimeException)
+ {
+-    awt::Size oldSize;
+-    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
+-    oldSize = xShape->getSize();
+-    oldSize.Height = pt2mm( _height ) * 100;
+-    xShape->setSize( oldSize );
++    m_xControl->setHeight( _height );
+ }
+ 
+ double SAL_CALL 
+ ScVbaOLEObject::getWidth() throw (uno::RuntimeException)
+ {
+-    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
+-    return mm2pt ( xShape->getSize().Width / 100 );
++    return m_xControl->getWidth();
+ }
+ 
+ void SAL_CALL 
+ ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException)
+ {
+-    awt::Size oldSize;
+-    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
+-    oldSize = xShape->getSize();
+-    oldSize.Width = pt2mm( _width ) * 100;
+-    xShape->setSize( oldSize );
++    m_xControl->setWidth( _width );
+ }
+ rtl::OUString& 
+ ScVbaOLEObject::getServiceImplName()
+Index: sc/source/ui/vba/vbamenuitems.cxx
+===================================================================
+--- sc/source/ui/vba/vbamenuitems.cxx	(revision 0)
++++ sc/source/ui/vba/vbamenuitems.cxx	(revision 276288)
+@@ -0,0 +1,159 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbamenuitems.hxx"
++#include "vbamenuitem.hxx"
++#include "vbamenu.hxx"
++#include <ooo/vba/office/MsoControlType.hpp>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE;
++
++class MenuEnumeration : public MenuEnumeration_BASE
++{
++    uno::Reference< XHelperInterface > m_xParent;
++    uno::Reference< uno::XComponentContext > m_xContext;
++    uno::Reference< container::XEnumeration > m_xEnumeration;
++public:
++    MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
++    {
++    }
++    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
++    {
++        return m_xEnumeration->hasMoreElements();
++    }
++    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
++    {
++        // FIXME: should be add menu
++        if( hasMoreElements() )
++        {
++            uno::Reference< XCommandBarControl > xCommandBarControl( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
++            if( xCommandBarControl->getType() == office::MsoControlType::msoControlPopup )
++            {
++                uno::Reference< excel::XMenu > xMenu( new ScVbaMenu( m_xParent, m_xContext, xCommandBarControl ) );
++                return uno::makeAny( xMenu );
++            }
++            else if( xCommandBarControl->getType() == office::MsoControlType::msoControlButton )
++            {
++                uno::Reference< excel::XMenuItem > xMenuItem( new ScVbaMenuItem( m_xParent, m_xContext, xCommandBarControl ) );
++                return uno::makeAny( xMenuItem );
++            }
++            nextElement();
++        }
++        else
++            throw container::NoSuchElementException();
++        return uno::Any();
++    }
++};
++
++ScVbaMenuItems::ScVbaMenuItems( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) throw ( uno::RuntimeException ) : MenuItems_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls )
++{
++}
++
++// XEnumerationAccess
++uno::Type SAL_CALL 
++ScVbaMenuItems::getElementType() throw ( uno::RuntimeException )
++{
++    return excel::XMenuItem::static_type( 0 );
++}
++
++uno::Reference< container::XEnumeration >
++ScVbaMenuItems::createEnumeration() throw ( uno::RuntimeException )
++{
++    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBarControls, uno::UNO_QUERY_THROW );
++    return uno::Reference< container::XEnumeration >( new MenuEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) );
++}
++
++uno::Any
++ScVbaMenuItems::createCollectionObject( const uno::Any& aSource )
++{
++    // make no sense
++    return aSource;
++}
++
++sal_Int32 SAL_CALL 
++ScVbaMenuItems::getCount() throw(css::uno::RuntimeException)
++{
++    // FIXME: should check if it is a popup menu
++    return m_xCommandBarControls->getCount();
++}
++
++// ScVbaCollectionBaseImpl
++uno::Any SAL_CALL
++ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
++{
++    uno::Reference< XCommandBarControl > xCommandBarControl( m_xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
++    if( xCommandBarControl->getType() == office::MsoControlType::msoControlPopup )
++        return uno::makeAny( uno::Reference< excel::XMenu > ( new ScVbaMenu( this, mxContext, xCommandBarControl ) ) );
++    else if( xCommandBarControl->getType() == office::MsoControlType::msoControlButton )
++        return uno::makeAny( uno::Reference< excel::XMenuItem > ( new ScVbaMenuItem( this, mxContext, xCommandBarControl ) ) );
++    throw uno::RuntimeException();    
++}
++
++uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
++{
++    sal_Int32 nType = office::MsoControlType::msoControlButton;
++    uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore );
++    xCommandBarControl->setCaption( Caption );
++    if( OnAction.hasValue() )
++    {
++        rtl::OUString sAction;
++        OnAction >>= sAction;
++        xCommandBarControl->setOnAction( sAction );
++    }
++    return uno::Reference< excel::XMenuItem >( new ScVbaMenuItem( this, mxContext, xCommandBarControl ) );
++}
++
++// XHelperInterface
++rtl::OUString& 
++ScVbaMenuItems::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItems") );
++    return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++ScVbaMenuItems::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuItems" ) );
++    }
++    return aServiceNames;
++}
++
+Index: sc/source/ui/vba/vbawindow.cxx
+===================================================================
+--- sc/source/ui/vba/vbawindow.cxx	(revision 276159)
++++ sc/source/ui/vba/vbawindow.cxx	(revision 276288)
+@@ -27,10 +27,11 @@
+  * for a copy of the LGPLv3 License.
+  *
+  ************************************************************************/
+-#include "helperdecl.hxx"
++#include <vbahelper/helperdecl.hxx>
+ #include "vbawindow.hxx"
+ #include "vbaworksheets.hxx"
+ #include "vbaworksheet.hxx"
++#include "vbaglobals.hxx"
+ #include "vbapane.hxx"
+ #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+ #include <com/sun/star/sheet/XSpreadsheet.hpp>
+@@ -57,6 +58,9 @@ using namespace ::com::sun::star;
+ using namespace ::ooo::vba;
+ using namespace ::ooo::vba::excel::XlWindowState;
+ 
++// nameExists defined in vbaworksheet.cxx
++bool nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, ::rtl::OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException );
++
+ typedef  std::hash_map< rtl::OUString,
+ SCTAB, ::rtl::OUStringHash,
+ ::std::equal_to< ::rtl::OUString > > NameIndexHash;
+@@ -118,7 +122,7 @@ class SelectedSheetsEnumAccess : public SelectedSh
+ 		ScDocShell* pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
+ 		if ( !pDocShell )
+ 			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain docshell" ) ), uno::Reference< uno::XInterface >() );
+-		ScTabViewShell* pViewShell = getBestViewShell( m_xModel );
++		ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
+ 		if ( !pViewShell )
+ 			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() );
+ 			
+@@ -202,14 +206,13 @@ class SelectedSheetsEnumAccess : public SelectedSh
+ 
+ };
+ 
+-ScVbaWindow::ScVbaWindow( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowImpl_BASE( xParent, xContext ), m_xModel( xModel ) 
++ScVbaWindow::ScVbaWindow( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowImpl_BASE( xParent, xContext, xModel )
+ {
+     init();
+ }
+ 
+ ScVbaWindow::ScVbaWindow( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext )  
+-        : WindowImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ),
+-          m_xModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) )
++        : WindowImpl_BASE( args, xContext )
+ {
+     init();
+ }
+@@ -306,8 +309,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeExcep
+ 		if ( ( nCrudLen + nCrudIndex ) == sTitle.getLength() )
+ 		{
+ 			sTitle = sTitle.copy( 0, nCrudIndex );
+-            uno::Reference< ov::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5
+-			ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
++			ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
+ 			rtl::OUString sName = workbook.getName();
+ 			// rather bizare hack to make sure the name behavior
+ 			// is like XL
+@@ -343,7 +345,7 @@ uno::Any SAL_CALL
+ ScVbaWindow::getScrollRow() throw (uno::RuntimeException)
+ {	
+     sal_Int32 nValue = 0;
+-    ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
++    ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
+ 	if ( pViewShell )
+ 	{
+ 	    ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart();
+@@ -356,7 +358,7 @@ ScVbaWindow::getScrollRow() throw (uno::RuntimeExc
+ void SAL_CALL 
+ ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeException)
+ {
+-	ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
++	ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
+ 	if ( pViewShell )
+ 	{
+ 		sal_Int32 scrollRow = 0;	
+@@ -371,7 +373,7 @@ uno::Any SAL_CALL
+ ScVbaWindow::getScrollColumn() throw (uno::RuntimeException)
+ {	
+     sal_Int32 nValue = 0;
+-    ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
++    ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
+ 	if ( pViewShell )
+ 	{
+ 	    ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart();
+@@ -384,7 +386,7 @@ ScVbaWindow::getScrollColumn() throw (uno::Runtime
+ void SAL_CALL 
+ ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::RuntimeException)
+ {
+-	ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
++	ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
+ 	if ( pViewShell )
+ 	{
+ 		sal_Int32 scrollColumn = 0;	
+@@ -399,7 +401,7 @@ uno::Any SAL_CALL
+ ScVbaWindow::getWindowState() throw (uno::RuntimeException)
+ {	
+     sal_Int32 nwindowState = xlNormal;
+-    ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
++    ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
+     SfxViewFrame* pViewFrame = pViewShell -> GetViewFrame();
+ 	SfxTopViewFrame *pTop= PTR_CAST( SfxTopViewFrame, pViewFrame -> GetTopViewFrame() );
+ 	if ( pTop )
+@@ -421,7 +423,7 @@ ScVbaWindow::setWindowState( const uno::Any& _wind
+ {
+ 	sal_Int32 nwindowState = xlMaximized;
+ 	_windowstate >>= nwindowState;
+-	ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
++	ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
+ 	SfxViewFrame* pViewFrame = pViewShell -> GetViewFrame();
+ 	SfxTopViewFrame *pTop= PTR_CAST( SfxTopViewFrame, pViewFrame -> GetTopViewFrame() );
+ 	if ( pTop )
+@@ -444,8 +446,7 @@ ScVbaWindow::setWindowState( const uno::Any& _wind
+ void
+ ScVbaWindow::Activate() throw (css::uno::RuntimeException)
+ {
+-    uno::Reference< ov::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5
+-	ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
++	ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
+ 
+ 	workbook.Activate();
+ }
+@@ -453,8 +454,7 @@ ScVbaWindow::Activate() throw (css::uno::RuntimeEx
+ void
+ ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook ) throw (uno::RuntimeException)
+ {
+-    uno::Reference< ov::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5
+-	ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
++	ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
+ 	workbook.Close(SaveChanges, FileName, RouteWorkBook );
+ }
+ 
+@@ -467,13 +467,15 @@ ScVbaWindow::ActivePane() throw (script::BasicErro
+ uno::Reference< excel::XRange > SAL_CALL 
+ ScVbaWindow::ActiveCell(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ {
+-	return ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication()->getActiveCell();
++	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
++	return xApplication->getActiveCell();
+ }
+ 
+ uno::Any SAL_CALL 
+ ScVbaWindow::Selection(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ {
+-	return ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication()->getSelection();
++	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
++	return xApplication->getSelection();
+ }
+ 
+ ::sal_Bool SAL_CALL 
+@@ -736,30 +738,25 @@ ScVbaWindow::getZoom() throw (uno::RuntimeExceptio
+ void SAL_CALL 
+ ScVbaWindow::setZoom( const uno::Any& _zoom ) throw (uno::RuntimeException)
+ {
+-	uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+-	rtl::OUString sZoomType( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) );
+-	sal_Int16 nZoomType = view::DocumentZoomType::PAGE_WIDTH;
+-	if( _zoom.getValueTypeClass() == uno::TypeClass_BOOLEAN )
+-	{		
+-		//zoom type is PAGE_WIDTH_EXACT in helperapi, it seems that there is a issue for this zoom type in current OOo.
+-		// so PAGE_WIDTH is used.   	
+-		xProps->setPropertyValue(sZoomType, uno::makeAny( nZoomType ));
++    sal_Int16 nZoom = 100;
++    _zoom >>= nZoom;
++    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( m_xModel, uno::UNO_QUERY_THROW );
++    uno::Reference< excel::XWorksheet > xActiveSheet = ActiveSheet();
++    SCTAB nTab = 0;
++    rtl::OUString sName = xActiveSheet->getName();
++    bool bSheetExists = nameExists (xSpreadDoc, sName, nTab);
++    if ( !bSheetExists )
++        throw uno::RuntimeException();
++    std::vector< SCTAB > vTabs;
++    vTabs.push_back( nTab );
++    excel::implSetZoom( m_xModel, nZoom, vTabs );
+ 	}					
+-	else
+-	{
+-		nZoomType = view::DocumentZoomType::BY_VALUE;
+-		rtl::OUString sZoomValue( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMVALUE ));
+-		sal_Int16 nZoomValue = 100;
+-		_zoom >>= nZoomValue;
+-		xProps->setPropertyValue( sZoomType, uno::makeAny( nZoomType ));
+-		xProps->setPropertyValue( sZoomValue, uno::makeAny( nZoomValue ));
+-	}			
+-}
+ 
+ uno::Reference< excel::XWorksheet > SAL_CALL 
+ ScVbaWindow::ActiveSheet(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ {
+-	return ScVbaGlobals::getGlobalsImpl(mxContext)->getApplication()->getActiveSheet();
++	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
++	return xApplication->getActiveSheet();
+ }
+ 
+ uno::Any SAL_CALL
+@@ -787,124 +784,12 @@ ScVbaWindow::setView( const uno::Any& _view) throw
+ 		default:
+ 			DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
+ 	}
+-	dispatchExecute( m_xModel, nSlot );
++	ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
++	if ( pViewShell )
++		dispatchExecute( pViewShell, nSlot );
+ }
+ 
+-sal_Bool SAL_CALL
+-ScVbaWindow::getVisible() throw (uno::RuntimeException)
+-{
+-	sal_Bool bVisible = sal_True;	
+-	uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+-	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
+-	uno::Reference< css::awt::XWindow2 > xWindow2 (xWindow, uno::UNO_QUERY_THROW );
+-	if( xWindow2.is() )
+-	{
+-		bVisible = xWindow2->isVisible();	
+-	}
+-	return bVisible;
+-}
+-
+-void SAL_CALL
+-ScVbaWindow::setVisible(sal_Bool _visible) throw (uno::RuntimeException)
+-{
+-	uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+-	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
+-	if( xWindow.is() )
+-	{
+-		xWindow->setVisible( _visible );	
+-	}
+-}
+-
+-css::awt::Rectangle getPosSize( const uno::Reference< frame::XModel >& xModel )
+-{
+-	css::awt::Rectangle aRect;
+-	uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+-	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
+-	if( xWindow.is() )
+-	{
+-		aRect = xWindow->getPosSize();
+-	}
+-	return aRect;
+-}
+-
+-void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, USHORT nFlag )
+-{
+-	uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+-	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
+-	if( xWindow.is() )
+-	{
+-		css::awt::Rectangle aRect = xWindow->getPosSize();
+-		switch( nFlag )
+-		{
+-			case css::awt::PosSize::X:
+-				xWindow->setPosSize( nValue, aRect.Y,	0, 0, css::awt::PosSize::X );
+-				break;
+-			case css::awt::PosSize::Y:
+-				xWindow->setPosSize( aRect.X, nValue,	0, 0, css::awt::PosSize::Y );
+-				break;
+-			case css::awt::PosSize::WIDTH:
+-				xWindow->setPosSize( 0, 0,	nValue, aRect.Height, css::awt::PosSize::WIDTH );
+-				break;
+-			case css::awt::PosSize::HEIGHT:
+-				xWindow->setPosSize( 0, 0,	aRect.Width, nValue, css::awt::PosSize::HEIGHT );
+-				break;
+-			default:
+-				break;
+-		}
+-	}
+-}	
+-
+ sal_Int32 SAL_CALL 
+-ScVbaWindow::getHeight() throw (uno::RuntimeException)
+-{
+-	css::awt::Rectangle aRect = getPosSize(m_xModel);
+-	return aRect.Height;
+-}
+-
+-void SAL_CALL 
+-ScVbaWindow::setHeight( sal_Int32 _height ) throw (uno::RuntimeException)
+-{
+-	setPosSize(m_xModel, _height, css::awt::PosSize::HEIGHT);
+-}
+-
+-sal_Int32 SAL_CALL 
+-ScVbaWindow::getLeft() throw (uno::RuntimeException)
+-{
+-	css::awt::Rectangle aRect = getPosSize(m_xModel);
+-	return aRect.X;
+-}
+-
+-void SAL_CALL 
+-ScVbaWindow::setLeft( sal_Int32 _left ) throw (uno::RuntimeException)
+-{
+-	setPosSize(m_xModel, _left, css::awt::PosSize::X);
+-}
+-sal_Int32 SAL_CALL 
+-ScVbaWindow::getTop() throw (uno::RuntimeException)
+-{
+-	css::awt::Rectangle aRect = getPosSize(m_xModel);
+-	return aRect.Y;
+-}
+-
+-void SAL_CALL 
+-ScVbaWindow::setTop( sal_Int32 _top ) throw (uno::RuntimeException)
+-{
+-	setPosSize(m_xModel, _top, css::awt::PosSize::Y);
+-}
+-sal_Int32 SAL_CALL 
+-ScVbaWindow::getWidth() throw (uno::RuntimeException)
+-{
+-	css::awt::Rectangle aRect = getPosSize(m_xModel);
+-	return aRect.Width;
+-}
+-
+-void SAL_CALL 
+-ScVbaWindow::setWidth( sal_Int32 _width ) throw (uno::RuntimeException)
+-{
+-	setPosSize(m_xModel, _width, css::awt::PosSize::WIDTH);
+-}
+-
+-sal_Int32 SAL_CALL 
+ ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ {
+ 	sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points );
+@@ -924,14 +809,14 @@ void SAL_CALL
+ ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ {
+ 	// need test, print current active sheet	
+-	PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, m_xModel, sal_True );
++	PrintOutHelper( excel::getBestViewShell( m_xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, sal_True );
+ }
+ 
+ void SAL_CALL 
+ ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ {
+ 	// need test, print preview current active sheet	
+-	PrintPreviewHelper( EnableChanges, m_xModel );	
++	PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) );	
+ }
+ 
+ rtl::OUString& 
+Index: sc/source/ui/vba/vbaseriescollection.hxx
+===================================================================
+--- sc/source/ui/vba/vbaseriescollection.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaseriescollection.hxx	(revision 276288)
+@@ -31,9 +31,9 @@
+ #define SC_VBA_SERIESCOLLECTION_HXX
+ 
+ #include <ooo/vba/excel/XSeriesCollection.hpp>
+-#include "vbahelperinterface.hxx"
+-#include "vbacollectionimpl.hxx"
+-#include "vbahelper.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbacollectionimpl.hxx>
++#include "excelvbahelper.hxx"
+ 
+ 
+ typedef CollTestImplHelper< ov::excel::XSeriesCollection > SeriesCollection_BASE;
+Index: sc/source/ui/vba/vbapagebreak.hxx
+===================================================================
+--- sc/source/ui/vba/vbapagebreak.hxx	(revision 276159)
++++ sc/source/ui/vba/vbapagebreak.hxx	(revision 276288)
+@@ -33,12 +33,13 @@
+ #include <cppuhelper/implbase1.hxx>
+ #include <ooo/vba/excel/XPageBreak.hpp>
+ #include <ooo/vba/excel/XHPageBreak.hpp>
++#include <ooo/vba/excel/XVPageBreak.hpp>
+ #include <ooo/vba/excel/XRange.hpp>
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #include <com/sun/star/script/BasicErrorException.hpp>
+ #include <com/sun/star/sheet/TablePageBreakData.hpp>
+ #include <com/sun/star/beans/XPropertySet.hpp>
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ template< typename Ifc1 >
+ class ScVbaPageBreak : public InheritedHelperInterfaceImpl1< Ifc1 >
+@@ -84,4 +85,22 @@ class ScVbaHPageBreak :  public ScVbaHPageBreak_BA
+ 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ };
+ 
++//VPageBreak
++typedef ScVbaPageBreak < ov::excel::XVPageBreak > ScVbaVPageBreak_BASE;
++
++class ScVbaVPageBreak :  public ScVbaVPageBreak_BASE
++{
++public:
++	ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, 
++					 const css::uno::Reference< css::uno::XComponentContext >& xContext,
++					 css::uno::Reference< css::beans::XPropertySet >& xProps,
++					 css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException);
++            
++	virtual ~ScVbaVPageBreak();
++	
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
+ #endif
+Index: sc/source/ui/vba/vbapane.hxx
+===================================================================
+--- sc/source/ui/vba/vbapane.hxx	(revision 276159)
++++ sc/source/ui/vba/vbapane.hxx	(revision 276288)
+@@ -34,7 +34,7 @@
+ #include<com/sun/star/sheet/XViewPane.hpp>
+ #include<ooo/vba/excel/XPane.hpp>
+ 
+-#include"vbahelper.hxx"
++#include"excelvbahelper.hxx"
+ 
+ typedef cppu::WeakImplHelper1< ov::excel::XPane > PaneImpl_Base;
+ 
+Index: sc/source/ui/vba/vbawindows.cxx
+===================================================================
+--- sc/source/ui/vba/vbawindows.cxx	(revision 276159)
++++ sc/source/ui/vba/vbawindows.cxx	(revision 276288)
+@@ -37,6 +37,7 @@
+ 
+ #include <tools/urlobj.hxx>
+ #include "vbawindow.hxx"
++#include "vbaglobals.hxx"
+ //#include "vbaworkbook.hxx"
+ 
+ using namespace ::com::sun::star;
+@@ -47,15 +48,15 @@ sal_Int32, ::rtl::OUStringHash,
+ ::std::equal_to< ::rtl::OUString > > NameIndexHash;
+ 
+ 
+-uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext )
++uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication )
+ {
+-	return new ScVbaWorkbook( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext,  xModel );
++	return new ScVbaWorkbook( uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext,  xModel );
+ }
+ 
+-uno::Any ComponentToWindow( const uno::Any& aSource, uno::Reference< uno::XComponentContext > & xContext )
++uno::Any ComponentToWindow( const uno::Any& aSource, uno::Reference< uno::XComponentContext > & xContext, const uno::Any& aApplication )
+ {
+ 	uno::Reference< frame::XModel > xModel( aSource, uno::UNO_QUERY_THROW );
+-	uno::Reference< excel::XWindow > xWin( new ScVbaWindow( lcl_createWorkbookHIParent( xModel, xContext ), xContext,xModel ) );
++	uno::Reference< excel::XWindow > xWin( new ScVbaWindow( lcl_createWorkbookHIParent( xModel, xContext, aApplication ), xContext,xModel ) );
+ 	return uno::makeAny( xWin );
+ }
+ 
+@@ -108,12 +109,13 @@ class WindowComponentEnumImpl : public Enumeration
+ 
+ class WindowEnumImpl : public  WindowComponentEnumImpl
+ {
++	uno::Any m_aApplication;
+ public:
+-	WindowEnumImpl(const uno::Reference< uno::XComponentContext >& xContext, const Components& components ):WindowComponentEnumImpl( xContext, components ) {}
+-	WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ): WindowComponentEnumImpl( xContext ) {}
++	WindowEnumImpl(const uno::Reference< uno::XComponentContext >& xContext, const Components& components, const uno::Any& aApplication ):WindowComponentEnumImpl( xContext, components ), m_aApplication( aApplication ){}
++	WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext,  const uno::Any& aApplication ): WindowComponentEnumImpl( xContext ), m_aApplication( aApplication ) {}
+ 	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ 	{
+-		return ComponentToWindow( WindowComponentEnumImpl::nextElement(), m_xContext );
++		return ComponentToWindow( WindowComponentEnumImpl::nextElement(), m_xContext, m_aApplication );
+ 	}
+ };
+ 
+@@ -212,16 +214,19 @@ ScVbaWindows::ScVbaWindows( const uno::Reference<
+ {
+ }
+ 
++ScVbaWindows::ScVbaWindows( const uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : ScVbaWindows_BASE( xParent, xContext, uno::Reference< container::XIndexAccess > ( new WindowsAccessImpl( xContext ) ) )
++{
++}
+ uno::Reference< container::XEnumeration >
+ ScVbaWindows::createEnumeration() throw (uno::RuntimeException)
+ {
+-	return new WindowEnumImpl( mxContext );
++	return new WindowEnumImpl( mxContext, Application() );
+ }
+ 
+ uno::Any
+ ScVbaWindows::createCollectionObject( const css::uno::Any& aSource )
+ {
+-	return ComponentToWindow( aSource,  mxContext );
++	return ComponentToWindow( aSource,  mxContext, Application() );
+ }
+ 
+ uno::Type 
+@@ -230,12 +235,6 @@ ScVbaWindows::getElementType() throw (uno::Runtime
+ 	return excel::XWindows::static_type(0);
+ }
+ 
+-uno::Reference< XCollection >
+-ScVbaWindows::Windows( const css::uno::Reference< css::uno::XComponentContext >& xContext )
+-{
+-	uno::Reference< container::XIndexAccess > xIndex( new WindowsAccessImpl( xContext ) );
+-	return  new ScVbaWindows( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext , xIndex );	
+-}
+ 
+ void SAL_CALL 
+ ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) throw (uno::RuntimeException)
+Index: sc/source/ui/vba/vbaformat.hxx
+===================================================================
+--- sc/source/ui/vba/vbaformat.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaformat.hxx	(revision 276288)
+@@ -39,7 +39,7 @@
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+ #include <com/sun/star/lang/Locale.hpp>
+ #include <com/sun/star/beans/XPropertyState.hpp>
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ template< typename Ifc1 >
+ class ScVbaFormat : public InheritedHelperInterfaceImpl1< Ifc1 >
+Index: sc/source/ui/vba/vbaworksheets.cxx
+===================================================================
+--- sc/source/ui/vba/vbaworksheets.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaworksheets.cxx	(revision 276288)
+@@ -209,16 +209,29 @@ ScVbaWorksheets::Add( const uno::Any& Before, cons
+ 	Count >>= nNewSheets;
+ 	Type >>= nType;
+ 	SCTAB nCount = 0;
++
++	uno::Reference< excel::XWorksheet > xBeforeAfterSheet;
++
++	if ( Before.hasValue() )
++	{
++        	if ( Before >>= xBeforeAfterSheet )
++			aStringSheet = xBeforeAfterSheet->getName();
++		else
+ 	Before >>= aStringSheet;
+-	if (!aStringSheet.getLength())
++	}
++
++	if (!aStringSheet.getLength() && After.hasValue() )
+ 	{
++        	if ( After >>= xBeforeAfterSheet )
++			aStringSheet = xBeforeAfterSheet->getName();
++		else
+ 		After >>= aStringSheet;
+ 		bBefore = sal_False;
+ 	}
+ 	if (!aStringSheet.getLength())
+ 	{
+-		aStringSheet = ScVbaGlobals::getGlobalsImpl( 
+-			mxContext )->getApplication()->getActiveWorkbook()->getActiveSheet()->getName();
++		uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
++		aStringSheet = xApplication->getActiveWorkbook()->getActiveSheet()->getName();
+ 		bBefore = sal_True;
+ 	}
+ 		nCount = static_cast< SCTAB >( m_xIndexAccess->getCount() );
+@@ -252,7 +265,9 @@ ScVbaWorksheets::Add( const uno::Any& Before, cons
+ 		m_xSheets->insertNewByName(aStringName, nSheetIndex + i);
+ 		result = getItemByStringIndex( aStringName );
+ 	}
+-	
++	uno::Reference< excel::XWorksheet > xNewSheet( result, uno::UNO_QUERY );
++	if ( xNewSheet.is() )
++		xNewSheet->Activate();	
+ 	return  result;
+ }
+ 
+@@ -295,7 +310,7 @@ ScVbaWorksheets::PrintOut( const uno::Any& From, c
+ 		if ( isSelectedSheets() )
+ 			bSelection = sal_True;
+ 
+-	PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, mxModel, bSelection );
++	PrintOutHelper( excel::getBestViewShell( mxModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, bSelection );
+ }
+ 
+ uno::Any SAL_CALL 
+@@ -336,7 +351,7 @@ ScVbaWorksheets::setVisible( const uno::Any& _visi
+ void SAL_CALL 
+ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException)
+ {
+-	ScTabViewShell* pViewShell = getBestViewShell( mxModel );
++	ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel );
+ 	if ( !pViewShell )
+ 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() );
+ 			
+Index: sc/source/ui/vba/vbamenubar.hxx
+===================================================================
+--- sc/source/ui/vba/vbamenubar.hxx	(revision 0)
++++ sc/source/ui/vba/vbamenubar.hxx	(revision 276288)
+@@ -0,0 +1,58 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_MENUBAR_HXX
++#define SC_VBA_MENUBAR_HXX
++
++#include <ooo/vba/excel/XMenuBar.hpp>
++#include <ooo/vba/XCommandBar.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ov::excel::XMenuBar > MenuBar_BASE;
++
++class ScVbaMenuBar : public MenuBar_BASE
++{
++private:
++    css::uno::Reference< ov::XCommandBar > m_xCommandBar;
++
++public:
++    ScVbaMenuBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBar >& xCommandBar ) throw( css::uno::RuntimeException );
++    
++    virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif//SC_VBA_MENUBAR_HXX
+Index: sc/source/ui/vba/vbatextframe.cxx
+===================================================================
+--- sc/source/ui/vba/vbatextframe.cxx	(revision 276159)
++++ sc/source/ui/vba/vbatextframe.cxx	(revision 276288)
+@@ -27,6 +27,7 @@
+  * for a copy of the LGPLv3 License.
+  *
+  ************************************************************************/
++#include <vbahelper/helperdecl.hxx>
+ #include <com/sun/star/drawing/TextFitToSizeType.hpp>
+ #include <com/sun/star/text/XText.hpp>
+ #include "vbatextframe.hxx"
+@@ -35,121 +36,19 @@
+ using namespace ::ooo::vba;
+ using namespace ::com::sun::star;
+ 
+-ScVbaTextFrame::ScVbaTextFrame( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< drawing::XShape > xShape ) : ScVbaTextFrame_BASE( xParent, xContext ), m_xShape( xShape )
++ScVbaTextFrame::ScVbaTextFrame( uno::Sequence< uno::Any> const & args, uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException ) :  ScVbaTextFrame_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< drawing::XShape >( args, 1, false ) )
+ {
+-    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
+ }
+ 
+-void
+-ScVbaTextFrame::setAsMSObehavior()
+-{
+-    //set property TextWordWrap default as False.
+-    // TextFitToSize control the text content. it seems we should set the default as False.
+-    // com.sun.star.drawing.TextFitToSizeType.NONE
+-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextWordWrap" ), uno::makeAny( sal_False ) );
+-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextFitToSize" ), uno::makeAny( drawing::TextFitToSizeType_NONE ) );
+-}
+-
+-sal_Int32 ScVbaTextFrame::getMargin( rtl::OUString sMarginType )
+-{
+-    sal_Int32 nMargin = 0;
+-    uno::Any aMargin = m_xPropertySet->getPropertyValue( sMarginType );
+-    aMargin >>= nMargin;
+-    return nMargin;
+-}
+-
+-void ScVbaTextFrame::setMargin( rtl::OUString sMarginType, float fMargin )
+-{
+-    sal_Int32 nMargin = Millimeter::getInHundredthsOfOneMillimeter( fMargin );
+-    m_xPropertySet->setPropertyValue( sMarginType, uno::makeAny( nMargin ) );
+-}
+-
+-// Attributes
+-sal_Bool SAL_CALL 
+-ScVbaTextFrame::getAutoSize() throw (uno::RuntimeException)
+-{
+-    // I don't know why, but in OOo, TextAutoGrowHeight is the property control autosize. not TextFitToSize.
+-    // TextFitToSize control the text content. 
+-    // and in mso, there isnot option TextWordWrap which means auto wrap. the default is False.
+-    sal_Bool bAutosize = sal_False;
+-    uno::Any aTextAutoGrowHeight = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ) );
+-    aTextAutoGrowHeight >>= bAutosize;
+-    return bAutosize;
+-}
+-
+-void SAL_CALL 
+-ScVbaTextFrame::setAutoSize( sal_Bool _autosize ) throw (uno::RuntimeException)
+-{
+-    setAsMSObehavior();
+-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ), uno::makeAny( _autosize ) );
+-}
+-
+-float SAL_CALL 
+-ScVbaTextFrame::getMarginBottom() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ) );
+-    float fMargin = (float)Millimeter::getInPoints( nMargin );
+-    return fMargin;
+-}
+-
+-void SAL_CALL 
+-ScVbaTextFrame::setMarginBottom( float _marginbottom ) throw (uno::RuntimeException)
+-{
+-    setMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ), _marginbottom );
+-}
+-
+-float SAL_CALL 
+-ScVbaTextFrame::getMarginTop() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ) );
+-    float fMargin = (float)Millimeter::getInPoints( nMargin );
+-    return fMargin;
+-}
+-
+-void SAL_CALL 
+-ScVbaTextFrame::setMarginTop( float _margintop ) throw (uno::RuntimeException)
+-{
+-    setMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ), _margintop );
+-}
+-
+-float SAL_CALL 
+-ScVbaTextFrame::getMarginLeft() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ) );
+-    float fMargin = (float)Millimeter::getInPoints( nMargin );
+-    return fMargin;
+-}
+-
+-void SAL_CALL 
+-ScVbaTextFrame::setMarginLeft( float _marginleft ) throw (uno::RuntimeException)
+-{
+-    setMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ), _marginleft );
+-}
+-
+-float SAL_CALL 
+-ScVbaTextFrame::getMarginRight() throw (uno::RuntimeException)
+-{
+-    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextRightDistance" ) );
+-    float fMargin = (float)Millimeter::getInPoints( nMargin );
+-    return fMargin;
+-}
+-
+-void SAL_CALL 
+-ScVbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException)
+-{
+-    setMargin( rtl::OUString::createFromAscii( "TextRightDistance" ), _marginright );
+-}
+-
+-
+ // Methods
+-uno::Reference< ov::excel::XCharacters > SAL_CALL 
++uno::Any SAL_CALL 
+ ScVbaTextFrame::Characters() throw (uno::RuntimeException)
+ {
+     uno::Reference< text::XSimpleText > xSimpleText( m_xShape, uno::UNO_QUERY_THROW );
+     ScVbaPalette aPalette( SfxObjectShell::Current() );
+     uno::Any aStart( sal_Int32( 1 ) );
+     uno::Any aLength(sal_Int32( -1 ) );
+-    return uno::Reference< ov::excel::XCharacters >( new ScVbaCharacters( this, mxContext, aPalette, xSimpleText, aStart, aLength, sal_True ) );
++    return uno::makeAny( uno::Reference< ov::excel::XCharacters >( new ScVbaCharacters( this, mxContext, aPalette, xSimpleText, aStart, aLength, sal_True ) ) );
+ }
+ 
+ rtl::OUString&
+@@ -171,3 +70,12 @@ ScVbaTextFrame::getServiceNames()
+     return aServiceNames;
+ }
+ 
++namespace textframe 
++{
++namespace sdecl = comphelper::service_decl;
++sdecl::vba_service_class_<ScVbaTextFrame, sdecl::with_args<true> > serviceImpl;
++extern sdecl::ServiceDecl const serviceDecl(
++    serviceImpl,
++    "ScVbaTextFrame",
++    "ooo.vba.excel.TextFrame" );
++}
+Index: sc/source/ui/vba/vbadialog.cxx
+===================================================================
+--- sc/source/ui/vba/vbadialog.cxx	(revision 276159)
++++ sc/source/ui/vba/vbadialog.cxx	(revision 276288)
+@@ -27,82 +27,70 @@
+  * for a copy of the LGPLv3 License.
+  *
+  ************************************************************************/
+-#include <comphelper/processfactory.hxx>
+-
+-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+-#include <com/sun/star/frame/XModel.hpp>
+-#include <ooo/vba/excel/XApplication.hpp>
+-
+-#include <tools/string.hxx>
+-
+-#include "vbahelper.hxx"
+ #include "vbadialog.hxx"
+-#include "vbaglobals.hxx"
+ 
+ using namespace ::ooo::vba;
+ using namespace ::com::sun::star;
+ 
+-// fails silently
+-void
+-ScVbaDialog::Show() throw(uno::RuntimeException)
++//liuchen 2009-7-27 
++//solve the problem that "Application.Dialogs.Item(***).Show" and "Application.Dialogs.Count" cannot get the correct result
++struct DialogMatch
+ {
+-	rtl::OUString aURL;
+-        uno::Reference< frame::XModel > xModel = getCurrentDocument();
+-	if ( xModel.is() )
+-	{
+-		aURL = mapIndexToName( mnIndex );
+-		if( aURL.getLength()  )
+-			throw uno::RuntimeException(
+-				::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " Unable to open the specified dialog " ) ),
+-				uno::Reference< XInterface > () );
+-		dispatchRequests( xModel, aURL );
+-	}
+-}	
++	sal_Int32 		nVbaDlgIndex;
++	rtl::OUString	aOODlgName;
++};
+ 
+-
+-static const rtl::OUString aStringList[]=
++static const DialogMatch aDialogMatchList[] = 
+ {
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Open" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatCellDialog" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertCell" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Print" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PasteSpecial" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolProtectionDocument" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColumnWidth" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineName" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConfigureDialog" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:HyperlinkDialog" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertGraphic" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertObject" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PageFormatDialog" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataSort" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:RowHeight" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoCorrectDlg" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConditionalFormatDialog" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataConsolidate" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CreateNames" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillSeries" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Validation") ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineLabelRange" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterAutoFilter" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterSpecialFilter" ) ),
+-	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoFormat" ) )	
++	{ 1, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Open" ) ) },						// xlDialogOpen -> .uno:Open
++	{ -1, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatCellDialog" ) ) },			// ??? -> .uno:FormatCellDialog
++	{ 55, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertCell" ) ) },				// xlDialogInsert -> .uno:InsertCell
++	{ 8, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Print" ) ) },						// xlDialogPrint -> .uno:Print
++	{ 9,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrinterSetup" ) ) }, 				// xlDialogPrinterSetup -> .uno:PrinterSetup
++	{ 53, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PasteSpecial" ) ) },				// xlDialogPasteSpecial -> .uno:PasteSpecial
++	{ 28, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolProtectionDocument" ) ) },	// xlDialogProtectDocument -> uno:ToolProtectionDocument
++	{ 47,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColumnWidth" ) ) },				// xlDialogColumnWidth -> .uno:ColumnWidth
++	{ 61,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineName" ) ) },				// xlDialogDefineName -> .uno:DefineName
++	{ -1, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConfigureDialog" ) ) },			// ??? -> .uno:ConfigureDialog
++	{ 596, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:HyperlinkDialog" ) ) },			// xlDialogInsertHyperlink -> .uno:HyperlinkDialog
++	{ 342,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertGraphic" ) ) },				// xlDialogInsertPicture -> .uno:InsertGraphic
++	{ 259, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertObject" ) ) },				// xlDialogInsertObject -> .uno:InsertObject
++	{ 7,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PageFormatDialog" ) ) },			// xlDialogPageSetup -> .uno:PageFormatDialog
++	{ 39,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataSort" ) ) },					// xlDialogSort -> .uno:DataSort
++	{ 127, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:RowHeight" ) ) },					// xlDialogRowHeight -> .uno:RowHeight
++	{ 485,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoCorrectDlg" ) ) },			// xlDialogAutoCorrect -> .uno:AutoCorrectDlg
++	{ 583, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConditionalFormatDialog" ) ) },	// xlDialogCondiationalFormatting -> .uno:ConditionalFormatDialog
++	{ 191,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataConsolidate" ) ) },			// xlDialogConsolidate -> .uno:DataConsolidate
++	{ 62,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CreateNames" ) ) },				// xlDialogCreateNames -> .uno:CreateNames
++	{ -1,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillSeries" ) ) },				// ??? -> .uno:FillSeries
++	{ -1,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Validation" ) ) },				// ??? -> .uno:Validation"
++	{ -1,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineLabelRange" ) ) },			// ??? -> .uno:DefineLabelRange
++	{ -1,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterAutoFilter" ) ) },		// ??? -> .uno:DataFilterAutoFilter
++	{ -1,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterSpecialFilter" ) ) }, 	// ??? -> .uno:DataFilterSpecialFilter
++	{ 269,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoFormat" ) ) }					// xlDialogFormatAuto -> .uno:AutoFormat
+ };
+ 
+-const sal_Int32 nDialogSize = sizeof( aStringList ) / sizeof( aStringList[ 0 ] );
++const sal_Int32 nDialogSize = sizeof( aDialogMatchList ) / sizeof( aDialogMatchList[ 0 ] );
+ 
++//liuchen modified 2009-2-27
+ rtl::OUString 
+ ScVbaDialog::mapIndexToName( sal_Int32 nIndex )
+ {
+-	if( nIndex < nDialogSize )
+-		return aStringList[ nIndex ];
++	for (int i = 0; i < nDialogSize; i++)
++	{
++		if ( aDialogMatchList[i].nVbaDlgIndex == nIndex )
++		{
++			return aDialogMatchList[i].aOODlgName;
++		}
++	}
++	
+ 	return rtl::OUString();
+ }
+ 
+ rtl::OUString& 
+ ScVbaDialog::getServiceImplName()
+ {
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTable") );
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog") );
+ 	return sImplName;
+ }
+ 
+@@ -113,7 +101,13 @@ ScVbaDialog::getServiceNames()
+ 	if ( aServiceNames.getLength() == 0 )
+ 	{
+ 		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.PivotTable" ) );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Dialog" ) );
+ 	}
+ 	return aServiceNames;
+ }
++
++//liuchen add 2009-7-27
++sal_Int32 ScVbaDialog::GetSupportedDialogCount()
++{
++	return nDialogSize;
++}
+\ No newline at end of file
+Index: sc/source/ui/vba/excelvbahelper.cxx
+===================================================================
+--- sc/source/ui/vba/excelvbahelper.cxx	(revision 0)
++++ sc/source/ui/vba/excelvbahelper.cxx	(revision 276288)
+@@ -0,0 +1,222 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbahelper.cxx,v $
++ * $Revision: 1.5.32.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <docuno.hxx>
++#include "excelvbahelper.hxx"
++#include "tabvwsh.hxx"
++#include "transobj.hxx"
++#include "scmod.hxx"
++#include "cellsuno.hxx"
++#include <comphelper/processfactory.hxx>
++
++using namespace ::com::sun::star;
++using namespace ::ooo::vba;
++
++namespace ooo
++{
++namespace vba
++{
++namespace excel
++{
++void implSetZoom( const uno::Reference< frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs )
++{
++    ScTabViewShell* pViewSh = excel::getBestViewShell( xModel );
++    Fraction aFract( nZoom, 100 );
++    pViewSh->GetViewData()->SetZoom( aFract, aFract, nTabs );
++    pViewSh->RefreshZoom();
++}
++bool isInPrintPreview( SfxViewFrame* pView )
++{
++	sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
++	if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() >
++nViewNo && !pView->GetObjectShell()->IsInPlaceActive() )
++	{
++		SfxViewFactory &rViewFactory =
++			pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo);
++		if (  pView->GetCurViewId() == rViewFactory.GetOrdinal() )
++			return true;
++	}
++	return false;
++}
++
++const ::rtl::OUString REPLACE_CELLS_WARNING(  RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning"));
++
++class PasteCellsWarningReseter
++{
++private:
++	bool bInitialWarningState;
++	static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException )
++	{
++		static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++		static uno::Reference<uno::XComponentContext > xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
++		static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
++				xContext->getServiceManager(), uno::UNO_QUERY_THROW );
++		static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW );
++		return xProps;
++	}
++
++	bool getReplaceCellsWarning() throw ( uno::RuntimeException )
++	{
++		sal_Bool res = sal_False;
++		getGlobalSheetSettings()->getPropertyValue( REPLACE_CELLS_WARNING ) >>= res;
++		return ( res == sal_True );
++	}
++
++	void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
++	{
++		getGlobalSheetSettings()->setPropertyValue( REPLACE_CELLS_WARNING, uno::makeAny( bState ) );
++	}
++public:
++	PasteCellsWarningReseter() throw ( uno::RuntimeException )
++	{
++		bInitialWarningState = getReplaceCellsWarning();
++		if ( bInitialWarningState )
++			setReplaceCellsWarning( false );
++	}
++	~PasteCellsWarningReseter()
++	{
++		if ( bInitialWarningState )
++		{
++			// don't allow dtor to throw
++			try
++			{
++				setReplaceCellsWarning( true );
++			}
++			catch ( uno::Exception& /*e*/ ){}
++		}
++	}
++};
++
++void
++implnPaste( const uno::Reference< frame::XModel>& xModel )
++{
++	PasteCellsWarningReseter resetWarningBox;
++	ScTabViewShell* pViewShell = getBestViewShell( xModel );
++	if ( pViewShell )
++	{
++		pViewShell->PasteFromSystem();
++		pViewShell->CellContentChanged();
++	}
++}
++
++
++void
++implnCopy( const uno::Reference< frame::XModel>& xModel )
++{
++	ScTabViewShell* pViewShell = getBestViewShell( xModel );
++	if ( pViewShell )
++		pViewShell->CopyToClip(NULL,false,false,true);
++}
++
++void 
++implnCut( const uno::Reference< frame::XModel>& xModel )
++{
++	ScTabViewShell* pViewShell =  getBestViewShell( xModel );
++	if ( pViewShell )
++		pViewShell->CutToClip( NULL, TRUE );
++}
++
++void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
++{
++	PasteCellsWarningReseter resetWarningBox;
++	sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
++	InsCellCmd eMoveMode = INS_NONE;
++
++	ScTabViewShell* pTabViewShell = getBestViewShell( xModel );
++	if ( pTabViewShell )
++	{
++		ScViewData* pView = pTabViewShell->GetViewData();	
++		Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
++		if ( pView && pWin )
++		{
++			if ( bAsLink && bOtherDoc )
++				pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
++			else 
++			{
++				ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
++				ScDocument* pDoc = NULL; 
++				if ( pOwnClip )
++					pDoc = pOwnClip->GetDocument();	
++				pTabViewShell->PasteFromClip( nFlags, pDoc,
++					nFunction, bSkipEmpty, bTranspose, bAsLink,
++					eMoveMode, IDF_NONE, TRUE );
++				pTabViewShell->CellContentChanged();
++			}
++		}
++	}
++
++}
++
++ScDocShell* 
++getDocShell( const css::uno::Reference< css::frame::XModel>& xModel ) 
++{
++	uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
++	ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
++	ScDocShell* pDocShell = NULL;
++	if ( pModel )
++		pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
++	return pDocShell;
++
++}
++
++ScTabViewShell* 
++getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel )
++{
++	ScDocShell* pDocShell = getDocShell( xModel );
++	if ( pDocShell )
++		return pDocShell->GetBestViewShell();
++	return NULL;
++}
++
++ScTabViewShell* 
++getCurrentBestViewShell(  const uno::Reference< uno::XComponentContext >& xContext )
++{ 
++	uno::Reference< frame::XModel > xModel = getCurrentExcelDoc( xContext );
++	return getBestViewShell( xModel );
++}
++
++SfxViewFrame* 
++getViewFrame( const uno::Reference< frame::XModel >& xModel )
++{
++	ScTabViewShell* pViewShell = getBestViewShell( xModel );	
++	if ( pViewShell )
++		return pViewShell->GetViewFrame();
++	return NULL;
++}
++
++SfxItemSet*
++ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj )
++{
++	SfxItemSet* pDataSet = pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : NULL ;
++	return pDataSet;
++	
++}
++} //excel
++} //vba 
++} //ooo 
+Index: sc/source/ui/vba/vbapivottables.hxx
+===================================================================
+--- sc/source/ui/vba/vbapivottables.hxx	(revision 276159)
++++ sc/source/ui/vba/vbapivottables.hxx	(revision 276288)
+@@ -36,9 +36,9 @@
+ #include <com/sun/star/container/XEnumerationAccess.hpp>
+ #include <com/sun/star/uno/XComponentContext.hpp>
+  
+-#include "vbahelper.hxx"
+-#include "vbahelperinterface.hxx"
+-#include "vbacollectionimpl.hxx"
++#include "excelvbahelper.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbacollectionimpl.hxx>
+ 
+ 
+ typedef CollTestImplHelper< ov::excel::XPivotTables > ScVbaPivotTables_BASE;
+Index: sc/source/ui/vba/vbapagesetup.hxx
+===================================================================
+--- sc/source/ui/vba/vbapagesetup.hxx	(revision 276159)
++++ sc/source/ui/vba/vbapagesetup.hxx	(revision 276288)
+@@ -35,39 +35,28 @@
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #include <com/sun/star/sheet/XSpreadsheet.hpp>
+ #include <com/sun/star/beans/XPropertySet.hpp>
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbapagesetupbase.hxx>
+ 
+-typedef InheritedHelperInterfaceImpl1< ov::excel::XPageSetup > ScVbaPageSetup_BASE;
++typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ov::excel::XPageSetup > ScVbaPageSetup_BASE;
+ 
+ class ScVbaPageSetup :  public ScVbaPageSetup_BASE 
+ {
+     css::uno::Reference< css::sheet::XSpreadsheet > mxSheet;
+-    css::uno::Reference< css::beans::XPropertySet > mxPageProps;
+-    css::uno::Reference< css::frame::XModel > mxModel;
+ public:
+ 	ScVbaPageSetup( const css::uno::Reference< ov::XHelperInterface >& xParent, 
+                     const css::uno::Reference< css::uno::XComponentContext >& xContext,
+ 		            const css::uno::Reference< css::sheet::XSpreadsheet>& xSheet,
+-                    const css::uno::Reference< css::frame::XModel >& xModlel) throw (css::uno::RuntimeException); 
++                    const css::uno::Reference< css::frame::XModel >& xModel) throw (css::uno::RuntimeException); 
+ 	virtual ~ScVbaPageSetup(){}
+     
+     // Attribute
+ 	virtual rtl::OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException);
+ 	virtual void SAL_CALL setPrintArea( const rtl::OUString& rAreas ) throw (css::uno::RuntimeException);
+-	virtual double SAL_CALL getTopMargin() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setTopMargin( double margin ) throw (css::uno::RuntimeException);
+-	virtual double SAL_CALL getBottomMargin() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setBottomMargin( double margin ) throw (css::uno::RuntimeException);
+-	virtual double SAL_CALL getRightMargin() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setRightMargin( double margin ) throw (css::uno::RuntimeException);
+-	virtual double SAL_CALL getLeftMargin() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setLeftMargin( double margin ) throw (css::uno::RuntimeException);
+ 	virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException);
+-	virtual double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException);
+-	virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException);
++    void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException);
++    double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException);
++    void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL getFitToPagesTall() throw (css::uno::RuntimeException);
+ 	virtual void SAL_CALL setFitToPagesTall( const css::uno::Any& fitToPagesTall ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL getFitToPagesWide() throw (css::uno::RuntimeException);
+Index: sc/source/ui/vba/vbaapplication.cxx
+===================================================================
+--- sc/source/ui/vba/vbaapplication.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaapplication.cxx	(revision 276288)
+@@ -43,6 +43,7 @@
+ #include <ooo/vba/excel/XlMousePointer.hpp>
+ #include <com/sun/star/sheet/XNamedRanges.hpp>
+ #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
++#include<ooo/vba/XCommandBars.hpp>
+ 
+ #include "vbaapplication.hxx"
+ #include "vbaworkbooks.hxx"
+@@ -54,14 +55,15 @@
+ #include "vbawindow.hxx"
+ #include "vbawindows.hxx"
+ #include "vbaglobals.hxx"
++#include "vbamenubars.hxx"
+ #include "tabvwsh.hxx"
+ #include "gridwin.hxx"
+ #include "vbanames.hxx"
+-#include "vbashape.hxx"
++#include <vbahelper/vbashape.hxx>
+ #include "vbatextboxshape.hxx"
+ #include "vbaassistant.hxx"
+-#include "vbacommandbars.hxx"
+ #include "sc.hrc"
++#include "macromgr.hxx"
+ 
+ #include <osl/file.hxx>
+ 
+@@ -84,10 +86,24 @@
+ 
+ #include "convuno.hxx"
+ #include "cellsuno.hxx"
++#include "miscuno.hxx"
++#include "unonames.hxx"
+ #include "docsh.hxx"
++#include <vbahelper/helperdecl.hxx>
++#include "excelvbahelper.hxx"
+ 
++#include <basic/sbmeth.hxx>
++#include <basic/sbmod.hxx>
++#include <basic/sbstar.hxx>
++#include <basic/sbx.hxx>
++#include <basic/sbxobj.hxx>
++#include <basic/sbuno.hxx>
+ using namespace ::ooo::vba;
+ using namespace ::com::sun::star;
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::uno::UNO_QUERY_THROW;
++using ::com::sun::star::uno::UNO_QUERY;
++using ::rtl::OUString;
+ 
+ // Enable our own join detection for Intersection and Union
+ // should be more efficient than using ScRangeList::Join ( because
+@@ -102,20 +118,20 @@ using namespace ::com::sun::star;
+ #define FILE_PATH_SEPERATOR "\\"
+ #endif 
+ 
+-#define EXCELVERSION "11.0"
++uno::Any sbxToUnoValue( SbxVariable* pVar );
+ 
+ class ActiveWorkbook : public ScVbaWorkbook
+ {
+ protected:
+ 	virtual uno::Reference< frame::XModel > getModel()
+ 	{ 	
+-		return getCurrentDocument(); 
++		return getCurrentExcelDoc(mxContext); 
+ 	}
+ public:
+ 	ActiveWorkbook( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext) : ScVbaWorkbook(  xParent, xContext ){}
+ };
+ 
+-ScVbaApplication::ScVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): ScVbaApplication_BASE( uno::Reference< XHelperInterface >(), xContext ), m_xCalculation( excel::XlCalculation::xlCalculationAutomatic )
++ScVbaApplication::ScVbaApplication( const uno::Reference<uno::XComponentContext >& xContext ): ScVbaApplication_BASE( xContext ), m_xCalculation( excel::XlCalculation::xlCalculationAutomatic )
+ {
+ }
+ 
+@@ -123,8 +139,11 @@ ScVbaApplication::~ScVbaApplication()
+ {
+ }
+ 	
++SfxObjectShell* ScVbaApplication::GetDocShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
++{
++    return static_cast< SfxObjectShell* >( excel::getDocShell( xModel ) );
++}
+ 
+-
+ uno::Reference< excel::XWorkbook >
+ ScVbaApplication::getActiveWorkbook() throw (uno::RuntimeException)
+ {
+@@ -143,23 +162,35 @@ ScVbaApplication::getAssistant() throw (uno::Runti
+ }
+ 
+ uno::Any SAL_CALL
+-ScVbaApplication::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
+-{
+-    uno::Reference< XCommandBars > xCommandBars( new ScVbaCommandBars( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
+-    if( aIndex.hasValue() )
+-        return uno::makeAny( xCommandBars->Item( aIndex, uno::Any() ) );
+-    return uno::makeAny( xCommandBars );
+-}
+-
+-uno::Any SAL_CALL
+ ScVbaApplication::getSelection() throw (uno::RuntimeException)
+ {
+     OSL_TRACE("** ScVbaApplication::getSelection() ** ");
+-    uno::Reference< lang::XServiceInfo > xServiceInfo( getCurrentDocument()->getCurrentSelection(), uno::UNO_QUERY_THROW );
+-    rtl::OUString sImpementaionName = xServiceInfo->getImplementationName();
+-    if( sImpementaionName.equalsIgnoreAsciiCaseAscii("com.sun.star.drawing.SvxShapeCollection") )
++    uno::Reference< frame::XModel > xModel( getCurrentDocument() );
++
++    Reference< view::XSelectionSupplier > xSelSupp( xModel->getCurrentController(), UNO_QUERY_THROW );
++    Reference< beans::XPropertySet > xPropSet( xSelSupp, UNO_QUERY_THROW );
++    OUString aPropName = OUString::createFromAscii( SC_UNO_FILTERED_RANGE_SELECTION );
++    uno::Any aOldVal = xPropSet->getPropertyValue( aPropName );
++    uno::Any any;
++    any <<= sal_False;
++    xPropSet->setPropertyValue( aPropName, any );
++    uno::Reference< uno::XInterface > aSelection = ScUnoHelpFunctions::AnyToInterface(
++        xSelSupp->getSelection() );
++    xPropSet->setPropertyValue( aPropName, aOldVal );
++
++    if (!aSelection.is())
+     {
+-        uno::Reference< drawing::XShapes > xShapes( getCurrentDocument()->getCurrentSelection(), uno::UNO_QUERY_THROW );
++        throw uno::RuntimeException( 
++            rtl::OUString::createFromAscii("failed to obtain current selection"), 
++            uno::Reference< uno::XInterface >() );
++    }
++
++    uno::Reference< lang::XServiceInfo > xServiceInfo( aSelection, uno::UNO_QUERY_THROW );
++    rtl::OUString sImplementationName = xServiceInfo->getImplementationName();
++
++    if( sImplementationName.equalsIgnoreAsciiCaseAscii("com.sun.star.drawing.SvxShapeCollection") )
++    {
++        uno::Reference< drawing::XShapes > xShapes( aSelection, uno::UNO_QUERY_THROW );
+         uno::Reference< container::XIndexAccess > xIndexAccess( xShapes, uno::UNO_QUERY_THROW );
+         uno::Reference< drawing::XShape > xShape( xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW );
+ 	// if ScVbaShape::getType( xShape ) == office::MsoShapeType::msoAutoShape
+@@ -170,18 +201,18 @@ ScVbaApplication::getSelection() throw (uno::Runti
+ 		uno::Reference< lang::XServiceInfo > xShapeServiceInfo( xShape, uno::UNO_QUERY_THROW );
+ 		if ( xShapeServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.Text" ) ) )  )
+ 		{
+-        		return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, getCurrentDocument() ) ) );
++                return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, xModel ) ) );
+ 		}
+ 	}
+-        return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, ScVbaShape::getType( xShape ) ) ) );
++        return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape ) ) ) );
+     }
+     else if( xServiceInfo->supportsService( rtl::OUString::createFromAscii("com.sun.star.sheet.SheetCellRange")) ||
+              xServiceInfo->supportsService( rtl::OUString::createFromAscii("com.sun.star.sheet.SheetCellRanges")))
+     {
+-	    uno::Reference< table::XCellRange > xRange( getCurrentDocument()->getCurrentSelection(), ::uno::UNO_QUERY);
++	    uno::Reference< table::XCellRange > xRange( aSelection, ::uno::UNO_QUERY);
+ 	    if ( !xRange.is() )
+ 	    {
+-		    uno::Reference< sheet::XSheetCellRangeContainer > xRanges( getCurrentDocument()->getCurrentSelection(), ::uno::UNO_QUERY);
++		    uno::Reference< sheet::XSheetCellRangeContainer > xRanges( aSelection, ::uno::UNO_QUERY);
+ 		    if ( xRanges.is() )
+ 			    return uno::makeAny( uno::Reference< excel::XRange >( new ScVbaRange( this, mxContext, xRanges ) ) );
+ 
+@@ -190,7 +221,7 @@ ScVbaApplication::getSelection() throw (uno::Runti
+     }
+     else
+     {
+-        throw uno::RuntimeException( sImpementaionName + rtl::OUString::createFromAscii(" donot be surpported"), uno::Reference< uno::XInterface >() );
++        throw uno::RuntimeException( sImplementationName + rtl::OUString::createFromAscii(" not surpported"), uno::Reference< uno::XInterface >() );
+     }
+ }
+ 
+@@ -199,7 +230,7 @@ ScVbaApplication::getActiveCell() throw (uno::Runt
+ {
+ 	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
+ 	uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW);
+-	ScTabViewShell* pViewShell = getCurrentBestViewShell();
++	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell(mxContext);
+ 	if ( !pViewShell )
+ 		throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewShell available"), uno::Reference< uno::XInterface >() );
+ 	ScViewData* pTabView = pViewShell->GetViewData();
+@@ -212,65 +243,6 @@ ScVbaApplication::getActiveCell() throw (uno::Runt
+ 	return  new ScVbaRange( this, mxContext, xRange->getCellRangeByPosition( nCursorX, nCursorY, nCursorX, nCursorY ) );
+ }
+ 
+-sal_Bool
+-ScVbaApplication::getScreenUpdating() throw (uno::RuntimeException)
+-{
+-	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-	return !xModel->hasControllersLocked();
+-}
+-
+-void
+-ScVbaApplication::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeException)
+-{
+-	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-	if (bUpdate)
+-		xModel->unlockControllers();
+-	else
+-		xModel->lockControllers();
+-}
+-
+-sal_Bool
+-ScVbaApplication::getDisplayStatusBar() throw (uno::RuntimeException)
+-{
+-	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-    uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
+-    uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
+-
+-    if( xProps.is() ){
+-        uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
+-        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
+-        if( xLayoutManager.is() && xLayoutManager->isElementVisible( url ) ){
+-            return sal_True;
+-        }
+-    }
+-    return sal_False;
+-}
+-
+-void
+-ScVbaApplication::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno::RuntimeException)
+-{
+-	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-    uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
+-    uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
+-
+-    if( xProps.is() ){
+-        uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
+-        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
+-        if( xLayoutManager.is() ){
+-            if( bDisplayStatusBar && !xLayoutManager->isElementVisible( url ) ){
+-                if( !xLayoutManager->showElement( url ) )
+-                    xLayoutManager->createElement( url );
+-                return;
+-            }
+-            else if( !bDisplayStatusBar && xLayoutManager->isElementVisible( url ) ){
+-                xLayoutManager->hideElement( url ); 
+-                return;
+-            }
+-        }
+-    }
+-    return;
+-}
+-
+ uno::Any SAL_CALL
+ ScVbaApplication::Workbooks( const uno::Any& aIndex ) throw (uno::RuntimeException)
+ {
+@@ -319,7 +291,7 @@ ScVbaApplication::Evaluate( const ::rtl::OUString&
+ uno::Any 
+ ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException)
+ {
+-	uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication(), uno::UNO_QUERY_THROW ), mxContext ) );
++	uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( this ), mxContext, getCurrentDocument() ) );
+ 	if( !aIndex.hasValue() )
+ 		return uno::Any( xDialogs );
+ 	return uno::Any( xDialogs->Item( aIndex ) );
+@@ -341,12 +313,6 @@ ScVbaApplication::getCutCopyMode() throw (uno::Run
+ 	return result;
+ }
+ 
+-::rtl::OUString
+-ScVbaApplication::getVersion() throw (uno::RuntimeException)
+-{
+-	return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(EXCELVERSION));
+-}
+-
+ void SAL_CALL 
+ ScVbaApplication::setCutCopyMode( const uno::Any& /*_cutcopymode*/ ) throw (uno::RuntimeException)
+ {
+@@ -432,7 +398,7 @@ ScVbaApplication::setCalculation( ::sal_Int32 _cal
+ uno::Any SAL_CALL 
+ ScVbaApplication::Windows( const uno::Any& aIndex  ) throw (uno::RuntimeException)
+ {
+-	uno::Reference< XCollection >  xWindows = ScVbaWindows::Windows( mxContext );
++	uno::Reference< excel::XWindows >  xWindows( new ScVbaWindows( this, mxContext ) );
+ 	if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
+ 		return uno::Any( xWindows );
+ 	return uno::Any( xWindows->Item( aIndex, uno::Any() ) );	
+@@ -543,11 +509,11 @@ ScVbaApplication::GoTo( const uno::Any& Reference,
+                 xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+         uno::Reference< sheet::XSpreadsheet > xDoc = xSpreadsheet->getActiveSheet();
+ 
+-        ScTabViewShell* pShell = getCurrentBestViewShell();
++        ScTabViewShell* pShell = excel::getCurrentBestViewShell( mxContext );
+         ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow(); 
+         try
+         {
+-            uno::Reference< excel::XRange > xVbaSheetRange = ScVbaRange::getRangeObjectForName( mxContext, sRangeName, getDocShell( xModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
++            uno::Reference< excel::XRange > xVbaSheetRange = ScVbaRange::getRangeObjectForName( mxContext, sRangeName, excel::getDocShell( xModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
+ ;
+             if( bScroll )
+             {
+@@ -585,7 +551,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference,
+     if( Reference >>= xRange )
+     {
+         uno::Reference< excel::XRange > xVbaRange( Reference, uno::UNO_QUERY );
+-        ScTabViewShell* pShell = getCurrentBestViewShell();
++        ScTabViewShell* pShell = excel::getCurrentBestViewShell( mxContext );
+         ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow(); 
+         if ( xVbaRange.is() )
+         {
+@@ -615,38 +581,10 @@ ScVbaApplication::GoTo( const uno::Any& Reference,
+             uno::Reference< uno::XInterface >() );
+ }
+ 
+-namespace
+-{
+-    static uno::Reference< frame::XController > lcl_getCurrentController()
+-    {
+-        const uno::Reference< frame::XModel > xWorkingDoc( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
+-        uno::Reference< frame::XController > xController;
+-        if ( xWorkingDoc.is() )
+-            xController.set( xWorkingDoc->getCurrentController(), uno::UNO_SET_THROW );
+-        else
+-            xController.set( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
+-        return xController;
+-    }
+-}
+-
+ sal_Int32 SAL_CALL
+ ScVbaApplication::getCursor() throw (uno::RuntimeException)
+ {
+-    sal_Int32 nPointerStyle( POINTER_ARROW );
+-    try
+-    {
+-        const uno::Reference< frame::XController > xController( lcl_getCurrentController(),     uno::UNO_SET_THROW );
+-        const uno::Reference< frame::XFrame >      xFrame     ( xController->getFrame(),        uno::UNO_SET_THROW );
+-        const uno::Reference< awt::XWindow >       xWindow    ( xFrame->getContainerWindow(),   uno::UNO_SET_THROW );
+-        // why the heck isn't there an XWindowPeer::getPointer, but a setPointer only?
+-        const Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+-        if ( pWindow )
+-            nPointerStyle = pWindow->GetSystemWindow()->GetPointer().GetStyle();
+-    }
+-    catch( const uno::Exception& )
+-    {
+-    	DBG_UNHANDLED_EXCEPTION();
+-    }
++    sal_Int32 nPointerStyle =  getPointerStyle(getCurrentDocument());
+ 
+     switch( nPointerStyle )
+     {
+@@ -668,53 +606,13 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) t
+ {
+     try
+     {
+-        ::std::vector< uno::Reference< frame::XController > > aControllers;
+-
+-        const uno::Reference< frame::XModel2 > xModel2( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
+-        if ( xModel2.is() )
+-        {
+-            const uno::Reference< container::XEnumeration > xEnumControllers( xModel2->getControllers(), uno::UNO_SET_THROW );
+-            while ( xEnumControllers->hasMoreElements() )
+-            {
+-                const uno::Reference< frame::XController > xController( xEnumControllers->nextElement(), uno::UNO_QUERY_THROW );
+-                aControllers.push_back( xController );
+-            }
+-        }
+-        else
+-        {
+-            const uno::Reference< frame::XModel > xModel( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
+-            if ( xModel.is() )
+-            {
+-                const uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
+-                aControllers.push_back( xController );
+-            }
+-            else
+-            {
+-                const uno::Reference< frame::XController > xController( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
+-                aControllers.push_back( xController );
+-            }
+-        }
+-
+-        for (   ::std::vector< uno::Reference< frame::XController > >::const_iterator controller = aControllers.begin();
+-                controller != aControllers.end();
+-                ++controller
+-            )
+-        {
+-            const uno::Reference< frame::XFrame >      xFrame     ( (*controller)->getFrame(),       uno::UNO_SET_THROW   );
+-            const uno::Reference< awt::XWindow >       xWindow    ( xFrame->getContainerWindow(),    uno::UNO_SET_THROW   );
+-
+-            Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+-            OSL_ENSURE( pWindow, "ScVbaApplication::setCursor: no window!" );
+-            if ( !pWindow )
+-                continue;
+-
++	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+             switch( _cursor )
+             {
+                 case excel::XlMousePointer::xlNorthwestArrow:
+                 {
+                     const Pointer& rPointer( POINTER_ARROW );
+-                    pWindow->GetSystemWindow()->SetPointer( rPointer );
+-                    pWindow->GetSystemWindow()->EnableChildPointerOverwrite( sal_False );
++                setCursorHelper( xModel, rPointer, sal_False );
+                     break;
+                 }
+                 case excel::XlMousePointer::xlWait:
+@@ -722,19 +620,13 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) t
+                 {
+                     const Pointer& rPointer( static_cast< PointerStyle >( _cursor ) );
+                     //It will set the edit window, toobar and statusbar's mouse pointer.
+-                    pWindow->GetSystemWindow()->SetPointer( rPointer );
+-                    pWindow->GetSystemWindow()->EnableChildPointerOverwrite( sal_True );
+-                    //It only set the edit window's mouse pointer
+-                    //pWindow->.SetPointer( rPointer );
+-                    //pWindow->.EnableChildPointerOverwrite( sal_True );
+-                    //printf("\nset Cursor...%d\n", pWindow->.GetType());
++                setCursorHelper( xModel, rPointer, sal_True );
+                     break;
+                 }
+                 case excel::XlMousePointer::xlDefault:
+                 {
+                     const Pointer& rPointer( POINTER_NULL );
+-                    pWindow->GetSystemWindow()->SetPointer( rPointer );
+-                    pWindow->GetSystemWindow()->EnableChildPointerOverwrite( sal_False );
++                setCursorHelper( xModel, rPointer, sal_False );
+                     break;
+                 }
+                 default:
+@@ -744,7 +636,6 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) t
+                     // IllegalArgumentException, or so
+             }
+         }
+-    }
+     catch( const uno::Exception& )
+     {
+     	DBG_UNHANDLED_EXCEPTION();
+@@ -1117,7 +1008,7 @@ ScVbaApplication::Intersect( const uno::Reference<
+ 	}
+ 
+ 	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-	ScDocShell* pDocShell = getDocShell( xModel );
++	ScDocShell* pDocShell = excel::getDocShell( xModel );
+ 	if ( aCellRanges.Count() == 1 )
+ 	{
+ 		xRefRange = new ScVbaRange( uno::Reference< XHelperInterface >(), mxContext, new ScCellRangeObj( pDocShell, *aCellRanges.First() ) );
+@@ -1206,7 +1097,7 @@ ScVbaApplication::Union( const uno::Reference< exc
+ 		aCellRanges.Append( *it );
+ 
+ 	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-    ScDocShell* pDocShell = getDocShell( xModel ); 
++    ScDocShell* pDocShell = excel::getDocShell( xModel ); 
+ 	if ( aCellRanges.Count() == 1 ) 
+ 	{
+ 	// normal range
+@@ -1227,30 +1118,24 @@ ScVbaApplication::Volatile( const uno::Any& aVolat
+ {
+ 	sal_Bool bVolatile = sal_True;
+ 	aVolatile >>= bVolatile;
+-	return; 
+-/*
+-	if ( bVolatile )
+-		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Volatile - not supported" ) ), uno::Reference< uno::XInterface >() );
+-	// bVoloatile is false - currently this only would make sense if 
+-	// the autocalculate mode is set to be true.
+-
+-	// so really this is crap, #TODO try and understand how ( or if ) 
+-	// the calculation mode and volatile interoperate
+-	if ( ! getCalculation() == excel::XlCalculation::xlCalculationAutomatic )
+-		setCalculation(  excel::XlCalculation::xlCalculationAutomatic );
+-*/
++    SbMethod* pMeth = StarBASIC::GetActiveMethod();
++    if ( pMeth )
++    {
++        OSL_TRACE("ScVbaApplication::Volatile() In method ->%s<-", rtl::OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
++        uno::Reference< frame::XModel > xModel( getCurrentDocument() );
++        ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
++        pDoc->GetMacroManager()->SetUserFuncVolatile( pMeth->GetName(), bVolatile);
+ }
+ 
+-void SAL_CALL
+-ScVbaApplication::DoEvents() throw ( uno::RuntimeException )
+-{
++// this is bound to break when loading the document
++	return; 
+ }
+ 
+ ::sal_Bool SAL_CALL 
+ ScVbaApplication::getDisplayFormulaBar() throw ( css::uno::RuntimeException )
+ {
+ 	sal_Bool bRes = sal_False;
+-	ScTabViewShell* pViewShell = getCurrentBestViewShell();
++	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext );
+ 	if ( pViewShell )
+ 	{
+ 		SfxBoolItem sfxFormBar( FID_TOGGLEINPUTLINE);
+@@ -1268,7 +1153,7 @@ ScVbaApplication::getDisplayFormulaBar() throw ( c
+ void SAL_CALL 
+ ScVbaApplication::setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw ( css::uno::RuntimeException )
+ {
+-	ScTabViewShell* pViewShell = getCurrentBestViewShell();
++	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext );
+ 	if ( pViewShell && ( _displayformulabar !=  getDisplayFormulaBar() ) )
+ 	{
+ 		SfxBoolItem sfxFormBar( FID_TOGGLEINPUTLINE, _displayformulabar);
+@@ -1278,6 +1163,44 @@ ScVbaApplication::setDisplayFormulaBar( ::sal_Bool
+ 	}	
+ }
+ 
++uno::Any SAL_CALL 
++ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException )
++{
++	StarBASIC* pBasic = SFX_APP()->GetBasic();
++	SFX_APP()->EnterBasicCall();
++	SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FuncCaller") ), SbxCLASS_METHOD );
++	uno::Any aRet;	
++	if ( pMeth )
++	{
++		SbxVariableRef refTemp = pMeth;
++		// forces a broadcast
++		SbxVariableRef pNew = new  SbxMethod( *((SbxMethod*)pMeth));
++                OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), rtl::OUStringToOString( pNew->GetString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++		aRet = sbxToUnoValue( pNew );
++	}
++	SFX_APP()->LeaveBasicCall();
++	return aRet;
++}
++
++uno::Reference< frame::XModel > 
++ScVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
++{
++    return getCurrentExcelDoc(mxContext);
++}
++
++uno::Any SAL_CALL
++ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++    uno::Reference< XCommandBars > xCommandBars( CommandBars( uno::Any() ), uno::UNO_QUERY_THROW );
++	uno::Reference< XCollection > xMenuBars( new ScVbaMenuBars( this, mxContext, xCommandBars ) );
++	if (  aIndex.hasValue() )
++	{
++	    return uno::Any ( xMenuBars->Item( aIndex, uno::Any() ) );
++	}
++
++	return uno::Any( xMenuBars );
++}
++
+ rtl::OUString& 
+ ScVbaApplication::getServiceImplName()
+ {
+@@ -1296,3 +1219,13 @@ ScVbaApplication::getServiceNames()
+ 	}
+ 	return aServiceNames;
+ }
++
++namespace application
++{
++namespace sdecl = comphelper::service_decl;
++sdecl::vba_service_class_<ScVbaApplication, sdecl::with_args<false> > serviceImpl;
++extern sdecl::ServiceDecl const serviceDecl(
++    serviceImpl,
++    "ScVbaApplication",
++    "ooo.vba.excel.Application" );
++}
+Index: sc/source/ui/vba/vbapagebreaks.cxx
+===================================================================
+--- sc/source/ui/vba/vbapagebreaks.cxx	(revision 276159)
++++ sc/source/ui/vba/vbapagebreaks.cxx	(revision 276288)
+@@ -90,8 +90,8 @@ class RangePageBreaks : public RangePageBreaks_Bas
+ 	virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException);
+ 	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
+ 	{
+-		//if( m_bColumn )
+-			// return excel::XVPageBreak::static_type(0);
++		if( m_bColumn )
++			 return excel::XVPageBreak::static_type(0);
+ 		return  excel::XHPageBreak::static_type(0);
+ 	}
+ 	virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
+@@ -118,10 +118,13 @@ sal_Int32 SAL_CALL RangePageBreaks::getCount(  ) t
+     for( sal_Int32 i=0; i<nLength; i++ )
+     {
+         sal_Int32 nPos = aTablePageBreakData[i].Position;
+-        if( nPos > nUsedEnd )
++
++		// VBA. minz@cn.ibm.com. All page breaks before the used range should be counted. 
++		// And the page break at the end of the used range also should be counted.
++		if(  nPos <= nUsedEnd + 1 )
++			nCount++;
++		else
+             return nCount;
+-        if( nPos >= nUsedStart )
+-            nCount++;
+     }
+ 
+     return nCount;
+@@ -137,8 +140,8 @@ uno::Any SAL_CALL RangePageBreaks::getByIndex( sal
+         if( (nPos < xIndexAccess->getCount()) && (nPos > -1) )
+         {
+             uno::Reference< beans::XPropertySet > xRowColPropertySet( xIndexAccess->getByIndex(nPos), uno::UNO_QUERY_THROW );
+-			//if( m_bColumn )
+-			//	return uno::makeAny( uno::Reference< excel::XVPageBreak >( new ScVbaVPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
++			if( m_bColumn )
++				return uno::makeAny( uno::Reference< excel::XVPageBreak >( new ScVbaVPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
+ 			return uno::makeAny( uno::Reference< excel::XHPageBreak >( new ScVbaHPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
+         }
+     }
+@@ -156,17 +159,9 @@ sheet::TablePageBreakData RangePageBreaks::getTabl
+     uno::Sequence<sheet::TablePageBreakData> aTablePageBreakDataList = getAllPageBreaks();
+ 
+     sal_Int32 nLength = aTablePageBreakDataList.getLength();
+-    for( sal_Int32 i=0; i<nLength; i++ )
+-    {
+-        aTablePageBreakData = aTablePageBreakDataList[i];
+-        sal_Int32 nPos = aTablePageBreakData.Position;
+-        if( nPos >= nUsedStart )
+-            index++;
+-        if( nPos > nUsedEnd )
+-            DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
+-        if( index == nAPIItemIndex )
+-            return aTablePageBreakData;
+-    }
++    //VBA. minz@cn.ibm.com. No need to filter the page break. All page breaks before the used range are counted.
++    if ( nAPIItemIndex < nLength && nAPIItemIndex>=0 )
++        aTablePageBreakData = aTablePageBreakDataList[nAPIItemIndex];
+ 
+     return aTablePageBreakData;
+ }
+@@ -187,8 +182,8 @@ uno::Any RangePageBreaks::Add( const css::uno::Any
+ 	sheet::TablePageBreakData aTablePageBreakData;
+ 	aTablePageBreakData.ManualBreak = sal_True;
+ 	aTablePageBreakData.Position = nAPIRowColIndex;
+-	//if( m_bColumn )
+-	//	return uno::makeAny( uno::Reference< excel::XVPageBreak >( new ScVbaVPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
++	if( m_bColumn )
++		return uno::makeAny( uno::Reference< excel::XVPageBreak >( new ScVbaVPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
+ 	return uno::makeAny( uno::Reference< excel::XHPageBreak >( new ScVbaHPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
+ }
+ 
+@@ -267,3 +262,64 @@ ScVbaHPageBreaks::getServiceNames()
+ 	return aServiceNames;
+ }
+ 
++//VPageBreak
++ScVbaVPageBreaks::ScVbaVPageBreaks( const uno::Reference< XHelperInterface >& xParent, 
++                                    const uno::Reference< uno::XComponentContext >& xContext,
++            		                uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( uno::RuntimeException )
++:   ScVbaVPageBreaks_BASE( xParent, xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, sal_True ) ), 
++	mxSheetPageBreak( xSheetPageBreak )
++{
++}
++
++ScVbaVPageBreaks::~ScVbaVPageBreaks()
++{
++}
++
++uno::Any SAL_CALL 
++ScVbaVPageBreaks::Add( const uno::Any& Before ) throw ( script::BasicErrorException, uno::RuntimeException )
++{
++	RangePageBreaks* pPageBreaks = dynamic_cast< RangePageBreaks* >( m_xIndexAccess.get() );
++	if( pPageBreaks )
++	{
++		return pPageBreaks->Add( Before );
++	}
++	return uno::Any();
++}
++
++uno::Reference< container::XEnumeration >
++ScVbaVPageBreaks::createEnumeration() throw ( uno::RuntimeException )
++{
++	return new RangePageBreaksEnumWrapper( m_xIndexAccess );
++}
++
++uno::Any
++ScVbaVPageBreaks::createCollectionObject( const css::uno::Any& aSource )
++{
++	return aSource; // its already a pagebreak object
++}
++
++uno::Type 
++ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException )
++{
++	return excel::XVPageBreak::static_type( 0 );
++}
++
++rtl::OUString& 
++ScVbaVPageBreaks::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM( "ScVbaVPageBreaks" ) );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaVPageBreaks::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.VPageBreaks" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sc/source/ui/vba/vbaeventshelper.cxx
+===================================================================
+--- sc/source/ui/vba/vbaeventshelper.cxx	(revision 0)
++++ sc/source/ui/vba/vbaeventshelper.cxx	(revision 276288)
+@@ -0,0 +1,1070 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: vbaeventshelper.cxx,v $
++ *
++ *  $Revision: 1.0 $
++ *
++ *  last change: $Author: vg $ $Date: 2007/12/07 10:42:26 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbaeventshelper.hxx"
++#include <vbahelper/helperdecl.hxx>
++#include <sfx2/objsh.hxx> 
++#include "scextopt.hxx"
++#include <sfx2/evntconf.hxx>
++#include <sfx2/event.hxx>
++#include <sfx2/sfx.hrc>
++#include <toolkit/unohlp.hxx>
++#include <comphelper/processfactory.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
++#include <com/sun/star/document/XEventsSupplier.hpp>
++#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
++#include <com/sun/star/table/XCell.hpp> 
++#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
++#include <com/sun/star/sheet/XSpreadsheet.hpp>
++#include <com/sun/star/container/XNamed.hpp>
++#include <com/sun/star/awt/WindowEvent.hpp>
++#include <com/sun/star/lang/EventObject.hpp>
++#include <com/sun/star/util/XCloseListener.hpp>
++#include <com/sun/star/util/XCloseBroadcaster.hpp>
++#include <com/sun/star/frame/XControllerBorder.hpp>
++#include <com/sun/star/frame/XBorderResizeListener.hpp>
++#include <com/sun/star/util/XChangesListener.hpp>
++#include <com/sun/star/util/ElementChange.hpp>
++#include <com/sun/star/util/XChangesNotifier.hpp>
++#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
++#include <cellsuno.hxx> 
++#include <convuno.hxx>
++#include <map>
++#include <svx/msvbahelper.hxx>
++#include <vcl/svapp.hxx>
++
++using namespace std;
++using namespace com::sun::star;
++using namespace ooo::vba;
++using namespace com::sun::star::document::VbaEventId;
++
++typedef ::cppu::WeakImplHelper1< util::XChangesListener > WorksheetChangeListener_BASE;
++
++class WorksheetChangeListener : public WorksheetChangeListener_BASE
++{
++private:
++    ScVbaEventsHelper* pVbaEventsHelper;
++public:
++    WorksheetChangeListener(ScVbaEventsHelper* pHelper ) : pVbaEventsHelper( pHelper ){}
++    virtual void SAL_CALL changesOccurred(const util::ChangesEvent& aEvent) throw (uno::RuntimeException);
++    virtual void SAL_CALL disposing(const lang::EventObject& aSource) throw(uno::RuntimeException){}
++};
++
++void WorksheetChangeListener::changesOccurred(const util::ChangesEvent& aEvent) throw (uno::RuntimeException)
++{
++    sal_Int32 nCount = aEvent.Changes.getLength();
++    if( nCount == 0 )
++        return;
++    
++    util::ElementChange aChange = aEvent.Changes[ 0 ];
++    rtl::OUString sOperation;
++    aChange.Accessor >>= sOperation;
++    if( !sOperation.equalsIgnoreAsciiCaseAscii("cell-change") )
++        return;
++
++    if( nCount == 1 )
++    {
++        uno::Reference< table::XCellRange > xRangeObj;
++        aChange.ReplacedElement >>= xRangeObj;
++        if( xRangeObj.is() )
++        {
++            uno::Sequence< uno::Any > aArgs(1);
++            aArgs[0] <<= xRangeObj;
++            pVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_CHANGE, aArgs );
++        }    
++        return;
++    }
++
++    ScRangeList aRangeList;
++    for( sal_Int32 nIndex = 0; nIndex < nCount; ++nIndex )
++    {
++        aChange = aEvent.Changes[ nIndex ];
++        aChange.Accessor >>= sOperation;
++        uno::Reference< table::XCellRange > xRangeObj;
++        aChange.ReplacedElement >>= xRangeObj;
++        if( xRangeObj.is() && sOperation.equalsIgnoreAsciiCaseAscii("cell-change") )
++        {
++            uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable( xRangeObj, uno::UNO_QUERY );
++            if( xCellRangeAddressable.is() )
++            {
++                ScRange aRange;
++                ScUnoConversion::FillScRange( aRange, xCellRangeAddressable->getRangeAddress() );
++                aRangeList.Append( aRange );
++            }
++        }
++    }
++    
++    if( aRangeList.Count() > 0 )
++    {
++        uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pVbaEventsHelper->getDocumentShell(), aRangeList ) );
++        uno::Sequence< uno::Any > aArgs(1);
++        aArgs[0] <<= xRanges;
++        pVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_CHANGE, aArgs );
++    }
++}
++
++typedef ::cppu::WeakImplHelper3< awt::XWindowListener, util::XCloseListener, frame::XBorderResizeListener > WindowListener_BASE;
++
++// This class is to process Workbook window related event
++class VbaEventsListener : public WindowListener_BASE
++{
++    ::osl::Mutex m_aMutex;
++    ScVbaEventsHelper* pVbaEventsHelper;
++    uno::Reference< frame::XModel > m_xModel;
++    sal_Bool m_bWindowResized;
++    sal_Bool m_bBorderChanged;
++protected :
++    uno::Reference< awt::XWindow > GetContainerWindow();
++    uno::Reference< frame::XFrame > GetFrame();
++    sal_Bool IsMouseReleased();
++    DECL_LINK( fireResizeMacro, void* );
++    void processWindowResizeMacro();
++public :
++    VbaEventsListener( ScVbaEventsHelper* pHelper );
++    ~VbaEventsListener();
++    void startEventsLinstener();
++    void stopEventsLinstener();
++    // XWindowListener
++    virtual void SAL_CALL windowResized( const awt::WindowEvent& aEvent ) throw ( uno::RuntimeException );
++    virtual void SAL_CALL windowMoved( const awt::WindowEvent& aEvent ) throw ( uno::RuntimeException );
++    virtual void SAL_CALL windowShown( const lang::EventObject& aEvent ) throw ( uno::RuntimeException );
++    virtual void SAL_CALL windowHidden( const lang::EventObject& aEvent ) throw ( uno::RuntimeException );
++    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException );
++    // XCloseListener
++    virtual void SAL_CALL queryClosing( const lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException);
++    virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException);
++    // XBorderResizeListener
++    virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& aObject, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException);
++};
++VbaEventsListener::VbaEventsListener( ScVbaEventsHelper* pHelper ) : pVbaEventsHelper( pHelper )
++{
++    OSL_TRACE("VbaEventsListener::VbaEventsListener( 0x%x ) - ctor ", this );
++    m_xModel.set( pVbaEventsHelper->getDocument()->GetDocumentShell()->GetModel(), uno::UNO_QUERY );
++    m_bWindowResized = sal_False;
++    m_bBorderChanged = sal_False;
++}
++
++VbaEventsListener::~VbaEventsListener()
++{
++    OSL_TRACE("VbaEventsListener::~VbaEventsListener( 0x%x ) - dtor ", this );
++}
++uno::Reference< frame::XFrame > 
++VbaEventsListener::GetFrame()
++{
++    try
++    {
++        if( pVbaEventsHelper )
++        {
++            if( m_xModel.is() )
++            {
++                uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY );
++                if( xController.is() )
++                {
++                    uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_QUERY );
++                    if( xFrame.is() )
++                    {
++                            return xFrame;
++                    }
++                }
++            }
++        }
++    }
++	catch( uno::Exception& /*e*/ )
++    {
++    }
++    return uno::Reference< frame::XFrame >();
++}
++uno::Reference< awt::XWindow > 
++VbaEventsListener::GetContainerWindow() 
++{
++    try
++    {
++        uno::Reference< frame::XFrame > xFrame( GetFrame(), uno::UNO_QUERY );
++        if( xFrame.is() )
++        {
++            uno::Reference< awt::XWindow > xWindow( xFrame->getContainerWindow(), uno::UNO_QUERY );
++            if( xWindow.is() )
++                return xWindow;
++        }
++    }
++	catch( uno::Exception& /*e*/ )
++    {
++    }
++    return uno::Reference< awt::XWindow >();
++}
++sal_Bool
++VbaEventsListener::IsMouseReleased()
++{
++    Window* pWindow = (VCLUnoHelper::GetWindow(  GetContainerWindow() ) );
++    if( pWindow )
++    {
++        Window::PointerState aPointerState = pWindow->GetPointerState();
++        if( !aPointerState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) )
++            return sal_True; 
++    }
++    return sal_False;
++}
++void
++VbaEventsListener::startEventsLinstener()
++{
++    if( m_xModel.is() )
++    {
++        // add window listener
++        uno::Reference< awt::XWindow > xWindow( GetContainerWindow(), uno::UNO_QUERY );
++        if( xWindow.is() )
++            xWindow->addWindowListener( this );
++        // add close listener
++        //uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( GetFrame(), uno::UNO_QUERY );
++        uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xModel, uno::UNO_QUERY );
++        if( xCloseBroadcaster.is() )
++        {
++            xCloseBroadcaster->addCloseListener( this );
++        }
++        // add Border resize listener
++        uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY );
++        if( xController.is() )
++        {
++            uno::Reference< frame::XControllerBorder > xControllerBorder( xController, uno::UNO_QUERY );
++            if( xControllerBorder.is() )
++            {
++                xControllerBorder->addBorderResizeListener( this );
++            }
++        }
++    }
++}
++void
++VbaEventsListener::stopEventsLinstener()
++{
++    if( m_xModel.is() )
++    {
++        uno::Reference< awt::XWindow > xWindow( GetContainerWindow(), uno::UNO_QUERY );
++        if( xWindow.is() )
++        {
++            xWindow->removeWindowListener( this );
++        }
++        //uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( GetFrame(), uno::UNO_QUERY );
++        uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xModel, uno::UNO_QUERY );
++        if( xCloseBroadcaster.is() )
++        {
++            xCloseBroadcaster->removeCloseListener( this );
++        }
++        uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY );
++        if( xController.is() )
++        {
++            uno::Reference< frame::XControllerBorder > xControllerBorder( xController, uno::UNO_QUERY );
++            if( xControllerBorder.is() )
++            {
++                xControllerBorder->removeBorderResizeListener( this );
++            }
++        }
++        pVbaEventsHelper = NULL;
++    }
++}
++
++void
++VbaEventsListener::processWindowResizeMacro()
++{
++    OSL_TRACE("**** Attempt to FIRE MACRO **** ");
++    if( pVbaEventsHelper )
++        pVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWRESIZE, uno::Sequence< uno::Any >() );
++}
++
++IMPL_LINK( VbaEventsListener, fireResizeMacro, void*, pParam )
++{
++    if ( pVbaEventsHelper ) 
++    {
++        if( IsMouseReleased() )
++                processWindowResizeMacro();
++    }
++    release();
++    return 0;
++}
++
++void SAL_CALL
++VbaEventsListener::windowResized(  const awt::WindowEvent& /*aEvent*/ ) throw ( uno::RuntimeException )
++{
++    ::osl::MutexGuard aGuard( m_aMutex );
++    // Workbook_window_resize event
++    m_bWindowResized = sal_True;
++    Window* pWindow = (VCLUnoHelper::GetWindow(  GetContainerWindow() ) );
++
++    if( pWindow && m_bBorderChanged )
++    {
++        m_bBorderChanged = m_bWindowResized = sal_False;
++        acquire(); // ensure we don't get deleted before the event is handled
++        Application::PostUserEvent( LINK( this, VbaEventsListener, fireResizeMacro ), NULL );
++    }
++}
++void SAL_CALL
++VbaEventsListener::windowMoved(  const awt::WindowEvent& /*aEvent*/ ) throw ( uno::RuntimeException )
++{
++    // not interest this time
++}
++void SAL_CALL
++VbaEventsListener::windowShown(  const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
++{
++    // not interest this time
++}
++void SAL_CALL
++VbaEventsListener::windowHidden(  const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
++{
++    // not interest this time
++}
++void SAL_CALL
++VbaEventsListener::disposing(  const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
++{
++    ::osl::MutexGuard aGuard( m_aMutex );
++    OSL_TRACE("VbaEventsListener::disposing(0x%x)", this);
++    pVbaEventsHelper = NULL;
++}
++void SAL_CALL 
++VbaEventsListener::queryClosing( const lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException)
++{
++     // it can cancel the close, but need to throw a CloseVetoException, and it will be transmit to caller.
++}
++void SAL_CALL 
++VbaEventsListener::notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException)
++{
++    ::osl::MutexGuard aGuard( m_aMutex );
++    stopEventsLinstener();
++}
++void SAL_CALL 
++VbaEventsListener::borderWidthsChanged( const uno::Reference< uno::XInterface >& aObject, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException)
++{
++    ::osl::MutexGuard aGuard( m_aMutex );
++    // work with WindowResized event to guard Window Resize event.
++    m_bBorderChanged = sal_True;
++    Window* pWindow = (VCLUnoHelper::GetWindow(  GetContainerWindow() ) );
++    if( pWindow && m_bWindowResized )
++    {
++        m_bWindowResized = m_bBorderChanged = sal_False;
++        acquire(); // ensure we don't get deleted before the timer fires.
++        Application::PostUserEvent( LINK( this, VbaEventsListener, fireResizeMacro ), NULL );
++    }
++}
++
++class ImplVbaEventNameInfo
++{
++private:
++    map< sal_Int32, rtl::OUString > m_aEventNameMap;
++
++protected:
++    static ImplVbaEventNameInfo* pImplVbaEventNameInfo;
++    ImplVbaEventNameInfo() { InitImplVbaEventNameInfo(); }
++private:
++    void insert( const sal_Int32 nId, const rtl::OUString& sEventName )
++    {
++        m_aEventNameMap.insert( make_pair( nId, sEventName ) );
++    }
++    void InitImplVbaEventNameInfo();
++public:
++    virtual ~ImplVbaEventNameInfo();
++    rtl::OUString getEventName( const sal_Int32 nId )
++    {
++        map< sal_Int32, rtl::OUString >::iterator iter = m_aEventNameMap.find( nId );
++        if( iter != m_aEventNameMap.end() )
++            return iter->second;
++        return rtl::OUString();
++    }
++    static ImplVbaEventNameInfo* GetImplVbaEventNameInfo();
++};
++ImplVbaEventNameInfo* ImplVbaEventNameInfo::pImplVbaEventNameInfo = NULL;
++
++ImplVbaEventNameInfo::~ImplVbaEventNameInfo()
++{
++    if( pImplVbaEventNameInfo )
++    {
++        delete pImplVbaEventNameInfo;
++        pImplVbaEventNameInfo = NULL;
++    }
++}
++
++ImplVbaEventNameInfo* 
++ImplVbaEventNameInfo::GetImplVbaEventNameInfo()
++{
++    if( !pImplVbaEventNameInfo )
++    {
++        pImplVbaEventNameInfo = new ImplVbaEventNameInfo;
++    }
++    return pImplVbaEventNameInfo;
++}
++
++#define CREATEOUSTRING(asciistr) rtl::OUString::createFromAscii(asciistr)
++
++#define INSERT_EVENT_INFO( Object, Event, ObjectName, EventName ) \
++        insert( VBAEVENT_##Object##_##Event, ObjectName + CREATEOUSTRING( EventName ) )
++
++#define INSERT_WORKSHEET_EVENT_INFO( Event, EventName ) \
++        INSERT_EVENT_INFO( WORKSHEET, Event,CREATEOUSTRING("Worksheet_"), EventName ); \
++        INSERT_EVENT_INFO( WORKBOOK_SHEET, Event, CREATEOUSTRING("Workbook_Sheet"), EventName )
++
++#define INSERT_WORKBOOK_EVENT_INFO( Event, EventName ) \
++        INSERT_EVENT_INFO(  WORKBOOK, Event, CREATEOUSTRING("Workbook_"), EventName )
++
++void ImplVbaEventNameInfo::InitImplVbaEventNameInfo()
++{
++    INSERT_WORKSHEET_EVENT_INFO( ACTIVATE, "Activate");
++    INSERT_WORKSHEET_EVENT_INFO( BEFOREDOUBLECLICK, "BeforeDoubleClick" );
++    INSERT_WORKSHEET_EVENT_INFO( BEFORERIGHTCLICK, "BeforeRightClick" );
++    INSERT_WORKSHEET_EVENT_INFO( CALCULATE, "Calculate" );
++    INSERT_WORKSHEET_EVENT_INFO( CHANGE, "Change" );
++    INSERT_WORKSHEET_EVENT_INFO( DEACTIVATE, "Deactivate" );
++    INSERT_WORKSHEET_EVENT_INFO( FOLLOWHYPERLINK, "FollowHyperlink" );
++    INSERT_WORKSHEET_EVENT_INFO( PIVOTTABLEUPDATE, "PivotTableUpdate" );
++    INSERT_WORKSHEET_EVENT_INFO( SELECTIONCHANGE, "SelectionChange" );
++
++    // Workbook
++    INSERT_WORKBOOK_EVENT_INFO( ACTIVATE, "Activate" );
++    INSERT_WORKBOOK_EVENT_INFO( DEACTIVATE, "Deactivate" );
++    INSERT_WORKBOOK_EVENT_INFO( OPEN, "Open" );
++    // AUTOOPEN doesn't be used. TODO, this should be "auto_open"
++    insert( VBAEVENT_WORKBOOK_AUTOOPEN, CREATEOUSTRING("Auto_Open") );                       
++    INSERT_WORKBOOK_EVENT_INFO( BEFORECLOSE, "BeforeClose" );
++    INSERT_WORKBOOK_EVENT_INFO( BEFOREPRINT, "BeforePrint" );
++    INSERT_WORKBOOK_EVENT_INFO( BEFORESAVE, "BeforeSave" );
++    INSERT_WORKBOOK_EVENT_INFO( NEWSHEET, "NewSheet" );
++    INSERT_WORKBOOK_EVENT_INFO( WINDOWACTIVATE, "WindowActivate" );
++    INSERT_WORKBOOK_EVENT_INFO( WINDOWDEACTIVATE, "WindowDeactivate" );
++    INSERT_WORKBOOK_EVENT_INFO( WINDOWRESIZE, "WindowResize" );
++}
++
++ScVbaEventsHelper::ScVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArgs, uno::Reference< uno::XComponentContext > const& xContext )
++    : m_xContext( xContext ), mbOpened( sal_False ), mbIgnoreEvents( sal_False )
++{
++    uno::Reference< frame::XModel > xModel ( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ), uno::UNO_QUERY );
++    pDocShell = excel::getDocShell( xModel );
++    pDoc = pDocShell->GetDocument();
++    // Add worksheet change listener
++    uno::Reference< util::XChangesNotifier > xChangesNotifier( xModel, uno::UNO_QUERY );
++    if( xChangesNotifier.is() )
++        xChangesNotifier->addChangesListener( uno::Reference< util::XChangesListener >( new WorksheetChangeListener( this ) ) );
++}
++
++ScVbaEventsHelper::~ScVbaEventsHelper()
++{
++}
++
++rtl::OUString
++ScVbaEventsHelper::getEventName( const sal_Int32 nId )
++{
++    rtl::OUString sEventName;
++    ImplVbaEventNameInfo* pEventInfo = ImplVbaEventNameInfo::GetImplVbaEventNameInfo();
++    if( pEventInfo )
++        sEventName = pEventInfo->getEventName( nId );
++    return sEventName;
++}
++
++uno::Any ScVbaEventsHelper::createWorkSheet( SfxObjectShell* pShell, SCTAB nTab )
++{
++	uno::Any aRet;
++	try
++	{
++		uno::Reference< lang::XMultiComponentFactory > xSMgr( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++		uno::Reference< beans::XPropertySet > xProps( xSMgr, uno::UNO_QUERY_THROW );
++		uno::Reference<uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
++		// Eventually we will be able to pull the Workbook/Worksheet objects
++		// directly from basic and register them as listeners
++
++		// create Workbook
++		uno::Sequence< uno::Any > aArgs(2);
++		aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
++		aArgs[1] = uno::Any( pShell->GetModel() );
++		uno::Reference< uno::XInterface > xWorkbook( ov::createVBAUnoAPIServiceWithArgs( pShell, "ooo.vba.excel.Workbook", aArgs ), uno::UNO_QUERY );
++
++		// create WorkSheet
++		String sSheetName;
++		pDoc->GetName( nTab, sSheetName );
++		aArgs = uno::Sequence< uno::Any >(3);
++		aArgs[ 0 ] <<= xWorkbook;
++		aArgs[ 1 ] <<= pShell->GetModel();
++		aArgs[ 2 ] = uno::makeAny( rtl::OUString( sSheetName ) );
++		aRet <<= ov::createVBAUnoAPIServiceWithArgs( pShell, "ooo.vba.excel.Worksheet", aArgs );
++	}
++	catch( uno::Exception& e )
++	{
++	}
++	return aRet;
++}
++
++uno::Any ScVbaEventsHelper::createRange( const uno::Any& aRange )
++{
++	uno::Any aRet;
++	try
++	{
++		uno::Reference< sheet::XSheetCellRangeContainer > xRanges( 	aRange, uno::UNO_QUERY );
++		uno::Reference< table::XCellRange > xRange( aRange, uno::UNO_QUERY );
++		uno::Reference< lang::XMultiComponentFactory > xSMgr( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++		uno::Reference< beans::XPropertySet > xProps( xSMgr, uno::UNO_QUERY_THROW );
++		if (  xRanges.is() || xRange.is() )
++		{
++			uno::Reference<uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
++			uno::Sequence< uno::Any > aArgs(2);
++			aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
++			if ( xRanges.is() )
++			{
++				aArgs[1] <<= xRanges;
++			}
++			else if ( xRange.is() )
++			{
++				aArgs[1] <<= xRange;
++			}
++			else
++			{
++				throw uno::RuntimeException(); // 
++			}
++			aRet <<= ov::createVBAUnoAPIServiceWithArgs( pDoc->GetDocumentShell(), "ooo.vba.excel.Range", aArgs );	
++		}
++	}
++	catch( uno::Exception& e ) 
++	{
++	}
++	return aRet;
++}
++
++uno::Any ScVbaEventsHelper::createHyperlink( const uno::Any& rCell )
++{
++	uno::Any aRet;
++	try
++	{
++		uno::Reference< lang::XMultiComponentFactory > xSMgr( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++		uno::Reference< beans::XPropertySet > xProps( xSMgr, uno::UNO_QUERY_THROW ); 
++		uno::Reference< table::XCell > xCell( rCell, uno::UNO_QUERY );
++		if( xCell.is() )
++		{
++			uno::Reference<uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
++			uno::Sequence< uno::Any > aArgs(2);
++			aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
++			aArgs[1] <<= rCell;
++			
++			aRet <<= ov::createVBAUnoAPIServiceWithArgs( pDoc->GetDocumentShell(), "ooo.vba.excel.Hyperlink", aArgs );	
++		}
++		else
++		{
++			throw uno::RuntimeException(); // 
++		}
++	}
++	catch( uno::Exception& e ) 
++	{
++	}
++	return aRet;
++}
++
++uno::Any ScVbaEventsHelper::createWindow( SfxObjectShell* pShell )
++{
++    try
++    {
++        uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
++        uno::Reference< frame::XModel > xModel( pShell->GetModel(), uno::UNO_QUERY );
++        uno::Sequence< uno::Any > aWindowArgs(2);
++        aWindowArgs[0] = uno::Any( uno::Reference< uno::XInterface > () );
++        aWindowArgs[1] = uno::Any( xModel );
++        uno::Reference< uno::XInterface > xWindow( xSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Window" ) ), aWindowArgs ), uno::UNO_QUERY );
++        if( xWindow.is() )
++            return uno::makeAny( xWindow );
++    }
++	catch( uno::Exception& e )
++	{
++	}
++    return uno::Any();
++}
++
++String ScVbaEventsHelper::getSheetModuleName( SCTAB nTab )
++{
++	ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
++	String aCodeName;
++	pDoc->GetName( nTab, aCodeName);
++	// Use code name if that exists
++	if ( pExtOptions )
++		aCodeName = pExtOptions->GetCodeName( nTab );
++	return aCodeName;	
++}
++
++rtl::OUString
++ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
++{
++	SfxObjectShell* pShell = pDoc->GetDocumentShell();
++    String sMacroName = getEventName( nEventId );
++    VBAMacroResolvedInfo sMacroResolvedInfo;
++    switch( nEventId )
++    {
++        // Worksheet
++    	case VBAEVENT_WORKSHEET_ACTIVATE                      :
++    	case VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK             :
++    	case VBAEVENT_WORKSHEET_BEFORERIGHTCLICK              :
++    	case VBAEVENT_WORKSHEET_CALCULATE                     :
++    	case VBAEVENT_WORKSHEET_CHANGE                        :
++    	case VBAEVENT_WORKSHEET_DEACTIVATE                    :
++    	case VBAEVENT_WORKSHEET_FOLLOWHYPERLINK               :
++    	case VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE              :
++    	case VBAEVENT_WORKSHEET_SELECTIONCHANGE               :
++        {
++            String  aSheetModuleName = getSheetModuleName( nTab );
++            sMacroName.Insert( '.', 0 ).Insert( aSheetModuleName, 0);
++            sMacroResolvedInfo = resolveVBAMacro( pShell, sMacroName );
++            break;
++        }
++        // Workbook
++    	case VBAEVENT_WORKBOOK_ACTIVATE                       :
++    	case VBAEVENT_WORKBOOK_DEACTIVATE                     :
++    	case VBAEVENT_WORKBOOK_OPEN                           :
++    	case VBAEVENT_WORKBOOK_BEFORECLOSE                    :
++    	case VBAEVENT_WORKBOOK_BEFOREPRINT                    :
++    	case VBAEVENT_WORKBOOK_BEFORESAVE                     :
++    	case VBAEVENT_WORKBOOK_NEWSHEET                       :
++    	case VBAEVENT_WORKBOOK_WINDOWACTIVATE                 :
++    	case VBAEVENT_WORKBOOK_WINDOWDEACTIVATE               :
++    	case VBAEVENT_WORKBOOK_WINDOWRESIZE                   :
++        // Workbook_sheet
++    	case VBAEVENT_WORKBOOK_SHEET_ACTIVATE                 :
++    	case VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK        :
++    	case VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK         :
++    	case VBAEVENT_WORKBOOK_SHEET_CALCULATE                :
++    	case VBAEVENT_WORKBOOK_SHEET_CHANGE                   :
++    	case VBAEVENT_WORKBOOK_SHEET_DEACTIVATE               :
++    	case VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK          :
++    	case VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE         :
++    	case VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE          :
++        {
++	        ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
++            String sWorkbookModuleName = pDoc->GetCodeName();
++            if( pExtOptions )
++            {
++                ScExtDocSettings aExtDocSettings = pExtOptions->GetDocSettings();
++                sWorkbookModuleName = aExtDocSettings.maGlobCodeName;
++            }
++           
++            sMacroName.Insert( '.', 0 ).Insert( sWorkbookModuleName, 0);
++            sMacroResolvedInfo = resolveVBAMacro( pShell, sMacroName );
++            break;
++        }
++    	case VBAEVENT_WORKBOOK_AUTOOPEN                       :
++        {
++            sMacroResolvedInfo = resolveVBAMacro( pShell, sMacroName );
++            break;
++        }
++        default:
++            break;
++    }
++    return sMacroResolvedInfo.ResolvedMacro();
++}
++
++sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs, const SCTAB nTab )
++{
++	SfxObjectShell* pShell = pDoc->GetDocumentShell();
++
++	sal_Bool result = sal_False;
++    sal_Bool bCancel = sal_False;
++	uno::Sequence< uno::Any > aArgs;
++	uno::Any aRet;
++	uno::Any aDummyCaller;
++    
++    // For most cases, there is no corresponsible event macro in the document. 
++    // It is better fo check if the event macro exists before process the arguments to improve performance.
++    rtl::OUString sMacroPath = getMacroPath( nEventId, nTab );
++	if( sMacroPath.getLength() )
++	{
++		switch( nEventId )
++		{
++			case VBAEVENT_WORKSHEET_ACTIVATE:
++			case VBAEVENT_WORKSHEET_CALCULATE:
++			case VBAEVENT_WORKSHEET_DEACTIVATE:
++            case VBAEVENT_WORKBOOK_ACTIVATE:
++            case VBAEVENT_WORKBOOK_DEACTIVATE:
++            case VBAEVENT_WORKBOOK_OPEN:
++    	    case VBAEVENT_WORKBOOK_AUTOOPEN:
++			{
++				// no arguments
++				break;
++			}
++    	    case VBAEVENT_WORKBOOK_SHEET_DEACTIVATE:
++    	    case VBAEVENT_WORKBOOK_SHEET_CALCULATE:
++    	    case VBAEVENT_WORKBOOK_SHEET_ACTIVATE:
++            case VBAEVENT_WORKBOOK_NEWSHEET:
++            {
++				aArgs = uno::Sequence< uno::Any >(1);
++				aArgs[0] = createWorkSheet( pShell, nTab ); 
++				break;
++            }
++			case VBAEVENT_WORKSHEET_CHANGE:
++			case VBAEVENT_WORKSHEET_SELECTIONCHANGE:
++			{
++				// one argument: range
++				uno::Any aRange = createRange( rArgs[0] );
++				aArgs = uno::Sequence< uno::Any >(1);
++				aArgs[0] = aRange;
++				break;
++			}
++    	    case VBAEVENT_WORKBOOK_SHEET_CHANGE:
++    	    case VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE:
++            {
++				uno::Any aRange = createRange( rArgs[0] );
++				aArgs = uno::Sequence< uno::Any >(2);
++				aArgs[0] = createWorkSheet( pShell, nTab );
++				aArgs[1] = aRange;
++				break;
++            }
++			case VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK:
++			case VBAEVENT_WORKSHEET_BEFORERIGHTCLICK:
++			{
++				// two aruments: range and cancel
++				uno::Any aRange = createRange( rArgs[0] );
++				aArgs = uno::Sequence< uno::Any >(2);
++				aArgs[0] = aRange;
++				aArgs[1] <<= bCancel;
++				// TODO: process "cancel" action  
++				break;
++			}
++    	    case VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK:
++    	    case VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK:
++            {
++				uno::Any aRange = createRange( rArgs[0] );
++				aArgs = uno::Sequence< uno::Any >(3);
++				aArgs[0] = createWorkSheet( pShell, nTab );
++				aArgs[1] = aRange;
++				aArgs[2] <<= bCancel;
++				// TODO: process "cancel" action  
++				break;
++            }
++			case VBAEVENT_WORKSHEET_FOLLOWHYPERLINK:
++			{
++				// one argument: hyperlink
++				uno::Any aHyperlink = createHyperlink( rArgs[0] );
++				aArgs = uno::Sequence< uno::Any >(1);
++				aArgs[0] = aHyperlink;
++				break;
++			}
++    	    case VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK:
++            {
++				uno::Any aHyperlink = createHyperlink( rArgs[0] );
++				aArgs = uno::Sequence< uno::Any >(2);
++				aArgs[0] = createWorkSheet( pShell, nTab );
++				aArgs[1] = aHyperlink;
++				break;
++            }
++			case VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE:
++    	    case VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE:
++			{
++				// one argument: pivottable
++                // TODO: not support yet
++				return result;
++			}
++            case VBAEVENT_WORKBOOK_BEFORECLOSE:
++            case VBAEVENT_WORKBOOK_BEFOREPRINT:
++            {
++                // process Cancel argument
++                aArgs = uno::Sequence< uno::Any >(1);
++                aArgs[0] <<= bCancel;
++                executeMacro( pShell, sMacroPath, aArgs, aRet, aDummyCaller );
++                aArgs[0] >>= bCancel;
++                return bCancel;
++            }
++            case VBAEVENT_WORKBOOK_BEFORESAVE:
++            {
++                // two arguments: SaveAs and Cancel
++                aArgs = uno::Sequence< uno::Any >(2);
++                aArgs[0] = rArgs[0];
++                aArgs[1] <<= bCancel;
++                executeMacro( pShell, sMacroPath, aArgs, aRet, aDummyCaller );
++                aArgs[1] >>= bCancel;
++                return bCancel;
++            }
++            case VBAEVENT_WORKBOOK_WINDOWACTIVATE:
++            case VBAEVENT_WORKBOOK_WINDOWDEACTIVATE:
++            case VBAEVENT_WORKBOOK_WINDOWRESIZE:
++            {
++                // one argument: windows
++                aArgs = uno::Sequence< uno::Any >(1);
++                aArgs[0] = createWindow( pShell );
++                break;
++            }
++            default:
++                return result;
++		}
++    
++        // excute the macro
++        result = executeMacro( pShell, sMacroPath, aArgs, aRet, aDummyCaller );
++	}
++    
++	return result;
++}
++
++SCTAB ScVbaEventsHelper::getTabFromArgs( const uno::Sequence< uno::Any > aArgs, const sal_Int32 nPos )
++{
++    SCTAB nTab = -1;
++    uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable( getXSomethingFromArgs< sheet::XCellRangeAddressable >( aArgs, nPos ), uno::UNO_QUERY );
++    if( xCellRangeAddressable.is() )
++    {
++        table::CellRangeAddress aAddress = xCellRangeAddressable->getRangeAddress();
++        nTab = aAddress.Sheet;
++    }
++    else
++    {
++        uno::Reference< sheet::XSheetCellRangeContainer > xRanges( getXSomethingFromArgs< sheet::XSheetCellRangeContainer >( aArgs, nPos ), uno::UNO_QUERY );
++        if( xRanges.is() )
++        {
++            uno::Sequence< table::CellRangeAddress > aRangeAddresses = xRanges->getRangeAddresses();
++            if( aRangeAddresses.getLength() > 0 )
++            {
++                nTab = aRangeAddresses[ 0 ].Sheet;
++            }
++        }
++    }
++    return nTab;
++}
++
++sal_Bool SAL_CALL 
++ScVbaEventsHelper::ProcessCompatibleVbaEvent( sal_Int32 nEventId, const uno::Sequence< uno::Any >& aArgs ) throw (uno::RuntimeException)
++{
++	SfxObjectShell* pShell = pDoc->GetDocumentShell();
++	if( !pShell || mbIgnoreEvents)
++		return sal_False;
++    
++    // In order to better support "withevents" in the future, 
++    // it is better to process a event at a time
++    SCTAB nTab = INVALID_TAB;
++    switch( nEventId )
++    {
++        // Worksheet
++		case VBAEVENT_WORKSHEET_ACTIVATE:
++        {
++            aArgs[0] >>= nTab;
++            if( nTab != INVALID_TAB )
++            {
++                // process the event
++                processVbaEvent( nEventId, aArgs, nTab );
++                // recursive process related workbook sheet event.
++                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_ACTIVATE, aArgs );
++            }
++            break;
++        }
++		case VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK:
++        {
++            nTab = getTabFromArgs( aArgs );
++            if( nTab != INVALID_TAB )
++            {
++                processVbaEvent( nEventId, aArgs, nTab );
++                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK, aArgs );
++            }
++            break;
++        }
++		case VBAEVENT_WORKSHEET_BEFORERIGHTCLICK:
++        {
++            nTab = getTabFromArgs( aArgs );
++            if( nTab != INVALID_TAB )
++            {
++                processVbaEvent( nEventId, aArgs, nTab );
++                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK, aArgs );
++            }
++            break;
++        }
++		case VBAEVENT_WORKSHEET_CALCULATE:
++        {
++            aArgs[0] >>= nTab;
++            if( nTab != INVALID_TAB )
++            {
++                processVbaEvent( nEventId, aArgs, nTab );
++                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_CALCULATE, aArgs );
++            }
++            break;
++        }
++		case VBAEVENT_WORKSHEET_CHANGE:
++        {
++            nTab = getTabFromArgs( aArgs );
++            if( nTab != INVALID_TAB )
++            {
++                processVbaEvent( nEventId, aArgs, nTab );
++                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_CHANGE, aArgs );
++            }
++            break;
++        }
++		case VBAEVENT_WORKSHEET_DEACTIVATE:
++        {
++            aArgs[0] >>= nTab;
++            if( nTab != INVALID_TAB )
++            {
++                processVbaEvent( nEventId, aArgs, nTab );
++                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_DEACTIVATE, aArgs );
++            }
++            break;
++        }
++		case VBAEVENT_WORKSHEET_FOLLOWHYPERLINK:
++        {
++            nTab = getTabFromArgs( aArgs );
++            if( nTab != INVALID_TAB )
++            {
++                processVbaEvent( nEventId, aArgs, nTab );
++                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK, aArgs );
++            }
++            break;
++        }
++		case VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE:
++            // TODO
++            break;
++		case VBAEVENT_WORKSHEET_SELECTIONCHANGE:
++        {
++            nTab = getTabFromArgs( aArgs );
++            if( nTab != INVALID_TAB )
++            {
++                processVbaEvent( nEventId, aArgs, nTab );
++                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE, aArgs );
++            }
++            break;
++        }
++        // Workbook_sheet
++    	case VBAEVENT_WORKBOOK_SHEET_ACTIVATE:
++        case VBAEVENT_WORKBOOK_SHEET_CALCULATE:
++    	case VBAEVENT_WORKBOOK_SHEET_DEACTIVATE:
++        {
++            aArgs[0] >>= nTab;
++            if( nTab != INVALID_TAB )
++            {
++                processVbaEvent( nEventId, aArgs, nTab );
++            }
++            break;
++        }
++    	case VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK:
++        case VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK:
++    	case VBAEVENT_WORKBOOK_SHEET_CHANGE:
++    	case VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK:
++    	case VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE:
++        {
++            nTab = getTabFromArgs( aArgs );
++            if( nTab != INVALID_TAB )
++            {
++                processVbaEvent( nEventId, aArgs, nTab );
++            }
++            break;
++        }
++    	case VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE:
++        // TODO
++            break;
++		// Workbook
++		case VBAEVENT_WORKBOOK_ACTIVATE:
++        {
++            // if workbook open event do not be fired. fired it before 
++            // workbook activate event to compatible with MSO.
++            if( mbOpened )
++            {
++                // process workbook activate event
++                processVbaEvent( nEventId, aArgs );
++                // process workbook window activate event at the same time
++                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWACTIVATE, aArgs );
++            }
++            break;
++        }
++		case VBAEVENT_WORKBOOK_DEACTIVATE:
++        {
++            processVbaEvent( nEventId, aArgs );
++            // same as workbook window deactivate
++            ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWDEACTIVATE, aArgs );
++            break;
++        }
++		case VBAEVENT_WORKBOOK_OPEN:
++        {
++            // process workbook open macro
++            // does auto open work here?
++            if( !mbOpened )
++            {
++                processVbaEvent( nEventId, aArgs );
++                processVbaEvent( VBAEVENT_WORKBOOK_AUTOOPEN, aArgs );
++                mbOpened = sal_True;
++                ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_ACTIVATE, aArgs );
++            }
++            // register the window listener.
++            if( !m_xVbaEventsListener.is() )
++            {
++                m_xVbaEventsListener = new VbaEventsListener( this );
++                VbaEventsListener* pEventsListener = dynamic_cast< VbaEventsListener* >( m_xVbaEventsListener.get() );
++                pEventsListener->startEventsLinstener();
++            }
++            break;
++        }
++		case VBAEVENT_WORKBOOK_BEFORECLOSE:
++        {
++            sal_Bool bCancel = processVbaEvent( nEventId, aArgs ); 
++            if( m_xVbaEventsListener.is() && !bCancel )
++            {
++                VbaEventsListener* pEventsListener = dynamic_cast< VbaEventsListener* >( m_xVbaEventsListener.get() );
++                pEventsListener->stopEventsLinstener();
++                m_xVbaEventsListener = NULL;
++            }
++            return bCancel;
++        }
++		case VBAEVENT_WORKBOOK_BEFOREPRINT:
++		case VBAEVENT_WORKBOOK_BEFORESAVE:
++		case VBAEVENT_WORKBOOK_WINDOWACTIVATE:
++		case VBAEVENT_WORKBOOK_WINDOWDEACTIVATE:
++		case VBAEVENT_WORKBOOK_WINDOWRESIZE:
++        {
++            return processVbaEvent( nEventId, aArgs );
++        }
++		case VBAEVENT_WORKBOOK_NEWSHEET:
++        {
++            aArgs[0] >>= nTab;
++            if( nTab != INVALID_TAB )
++            {
++                processVbaEvent( nEventId, aArgs, nTab );
++            }
++            break;
++        }
++        default:
++            OSL_TRACE( "Invalid Event" );
++    }
++
++    return sal_True;
++}
++
++::sal_Bool SAL_CALL 
++ScVbaEventsHelper::getIgnoreEvents() throw (uno::RuntimeException)
++{
++    return mbIgnoreEvents;
++}
++
++void SAL_CALL 
++ScVbaEventsHelper::setIgnoreEvents( ::sal_Bool _ignoreevents ) throw (uno::RuntimeException)
++{
++    mbIgnoreEvents = _ignoreevents;
++}
++
++
++namespace vbaeventshelper
++{
++namespace sdecl = comphelper::service_decl;
++sdecl::class_<ScVbaEventsHelper, sdecl::with_args<true> > serviceImpl;
++extern sdecl::ServiceDecl const serviceDecl(
++    serviceImpl,
++    "ScVbaEventsHelper",
++    "com.sun.star.document.VbaEventsHelper" );
++}
+Index: sc/source/ui/vba/vbaborders.hxx
+===================================================================
+--- sc/source/ui/vba/vbaborders.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaborders.hxx	(revision 276288)
+@@ -38,7 +38,7 @@
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ 
+  
+-#include "vbacollectionimpl.hxx"
++#include <vbahelper/vbacollectionimpl.hxx>
+ 
+ typedef CollTestImplHelper< ov::excel::XBorders > ScVbaBorders_BASE;
+ class ScVbaPalette;
+Index: sc/source/ui/vba/vbahyperlink.cxx
+===================================================================
+--- sc/source/ui/vba/vbahyperlink.cxx	(revision 276159)
++++ sc/source/ui/vba/vbahyperlink.cxx	(revision 276288)
+@@ -32,7 +32,7 @@
+  *    MA  02111-1307  USA
+  *
+  ************************************************************************/
+-#include "helperdecl.hxx"
++#include <vbahelper/helperdecl.hxx>
+ #include "vbahyperlink.hxx"
+ #include <com/sun/star/container/XIndexAccess.hpp>
+ #include <com/sun/star/text/XTextFieldsSupplier.hpp> 
+Index: sc/source/ui/vba/vbafont.cxx
+===================================================================
+--- sc/source/ui/vba/vbafont.cxx	(revision 276159)
++++ sc/source/ui/vba/vbafont.cxx	(revision 276288)
+@@ -46,37 +46,14 @@
+ using namespace ::ooo::vba;
+ using namespace ::com::sun::star;
+ 
+-// use local constants there is no need to expose these constants
+-// externally. Looking at the Format->Character dialog it seem that
+-// these may infact be even be calculated. Leave hardcoded for now
+-// #FIXEME #TBD investigate the code for dialog mentioned above
+-
+-// The font baseline is not specified.
+-const short NORMAL = 0;
+-
+-// specifies a superscripted.
+-const short SUPERSCRIPT = 33;
+-
+-// specifies a subscripted.
+-const short SUBSCRIPT = -33;
+-
+-// specifies a hight of superscripted font
+- const sal_Int8 SUPERSCRIPTHEIGHT = 58;
+-
+-// specifies a hight of subscripted font
+-const sal_Int8 SUBSCRIPTHEIGHT = 58;
+-
+-// specifies a hight of normal font
+-const short NORMALHEIGHT = 100;
+-
+-ScVbaFont::ScVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, uno::Reference< beans::XPropertySet > xPropertySet, ScCellRangeObj* pRangeObj  ) throw ( uno::RuntimeException ) : ScVbaFont_BASE( xParent, xContext ), mxFont( xPropertySet, css::uno::UNO_QUERY_THROW ), mPalette( dPalette ),  mpRangeObj( pRangeObj )
++ScVbaFont::ScVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, uno::Reference< beans::XPropertySet > xPropertySet, ScCellRangeObj* pRangeObj  ) throw ( uno::RuntimeException ) : ScVbaFont_BASE( xParent, xContext, dPalette.getPalette(), xPropertySet ), mPalette( dPalette ),  mpRangeObj( pRangeObj )
+ {
+ }
+ 
+ SfxItemSet*  
+ ScVbaFont::GetDataSet()
+ {
+-    SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( mpRangeObj );
++    SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( mpRangeObj );
+     return pDataSet;
+ }
+ 
+@@ -243,19 +220,13 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeExce
+ 	return uno::makeAny( ( nValue == SUBSCRIPT ) );
+ }
+ 
+-void SAL_CALL
+-ScVbaFont::setSize( const uno::Any& aValue ) throw( uno::RuntimeException )
+-{
+-	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ), aValue );
+-}
+-
+ uno::Any SAL_CALL
+ ScVbaFont::getSize() throw ( uno::RuntimeException )
+ {
+ 	if ( GetDataSet() )
+ 		if (  GetDataSet()->GetItemState( ATTR_FONT_HEIGHT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+-        return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ) );
++        return ScVbaFont_BASE::getSize();
+ }
+ 
+ void SAL_CALL
+@@ -267,14 +238,13 @@ ScVbaFont::setColorIndex( const uno::Any& _colorin
+ 	// handled properly here
+ 
+ 	if ( !nIndex || ( nIndex == excel::XlColorIndex::xlColorIndexAutomatic ) )
++        {
+ 		nIndex = 1;  // check defualt ( assume black )
+-	--nIndex; // OOo indices are zero bases
+-	uno::Reference< container::XIndexAccess > xIndex = mPalette.getPalette();
+-	// setColor expects colors in XL RGB values
+-	// #FIXME this is daft we convert OO RGB val to XL RGB val and
+-	// then back again to OO RGB value
+-	setColor( OORGBToXLRGB(xIndex->getByIndex( nIndex )) );
++                ScVbaFont_BASE::setColorIndex( uno::makeAny( nIndex ) );
+ }
++        else
++            ScVbaFont_BASE::setColorIndex( _colorindex );
++}
+ 
+ 
+ uno::Any SAL_CALL
+@@ -284,27 +254,8 @@ ScVbaFont::getColorIndex() throw ( uno::RuntimeExc
+ 	if ( GetDataSet() )
+ 		if (  GetDataSet()->GetItemState( ATTR_FONT_COLOR, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+-
+-	// getColor returns Xl ColorValue, need to convert it to OO val
+-	// as the palette deals with OO RGB values
+-	// #FIXME this is daft in getColor we convert OO RGB val to XL RGB val
+-	// and then back again to OO RGB value
+-	XLRGBToOORGB( getColor() ) >>= nColor;
+-	uno::Reference< container::XIndexAccess > xIndex = mPalette.getPalette();
+-	sal_Int32 nElems = xIndex->getCount();
+-	sal_Int32 nIndex = -1;
+-	for ( sal_Int32 count=0; count<nElems; ++count )
+-       	{
+-		sal_Int32 nPaletteColor = 0;
+-		xIndex->getByIndex( count ) >>= nPaletteColor;
+-		if ( nPaletteColor == nColor )
+-		{
+-			nIndex = count + 1; // 1 based
+-			break;
++	return ScVbaFont_BASE::getColorIndex();
+ 		}
+-	}
+-	return uno::makeAny( nIndex );
+-}
+ 
+ //////////////////////////////////////////////////////////////////////////////////////////
+ void  SAL_CALL
+@@ -396,28 +347,13 @@ ScVbaFont::getFontStyle() throw ( uno::RuntimeExce
+     return uno::makeAny( aStyles.makeStringAndClear() );
+ }
+ 
+-void SAL_CALL
+-ScVbaFont::setBold( const uno::Any& aValue ) throw( uno::RuntimeException )
+-{
+-	sal_Bool bValue = sal_False;
+-	aValue >>= bValue;
+-	double fBoldValue = awt::FontWeight::NORMAL;
+-	if( bValue )
+-		fBoldValue = awt::FontWeight::BOLD;
+-	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ), ( uno::Any )fBoldValue );
+-
+-}
+-
+ uno::Any SAL_CALL
+ ScVbaFont::getBold() throw ( uno::RuntimeException )
+ {
+ 	if ( GetDataSet() )
+ 		if (  GetDataSet()->GetItemState( ATTR_FONT_WEIGHT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+-
+-	double fValue = 0.0;
+-	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ) ) >>= fValue;
+-	return uno::makeAny( fValue == awt::FontWeight::BOLD );
++	return ScVbaFont_BASE::getBold();
+ }
+ 
+ void SAL_CALL
+@@ -481,54 +417,24 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeExce
+ 	return uno::makeAny( nValue );
+ }
+ 
+-void SAL_CALL
+-ScVbaFont::setStrikethrough( const uno::Any& aValue ) throw ( uno::RuntimeException )
+-{
+-	sal_Bool bValue = sal_False;
+-	aValue >>= bValue;
+-	short nValue = awt::FontStrikeout::NONE;
+-	if( bValue )
+-		nValue = awt::FontStrikeout::SINGLE;
+-	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharStrikeout" ) ), ( uno::Any )nValue );
+-}
+-
+ uno::Any SAL_CALL
+ ScVbaFont::getStrikethrough() throw ( uno::RuntimeException )
+ {
+ 	if ( GetDataSet() )
+ 		if (  GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+-	short nValue = 0;
+-	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharStrikeout" ) ) ) >>= nValue;
+-	return uno::Any( nValue == awt::FontStrikeout::SINGLE );
++	return ScVbaFont_BASE::getStrikethrough();
+ }
+ 
+-void  SAL_CALL
+-ScVbaFont::setShadow( const uno::Any& aValue ) throw ( uno::RuntimeException )
+-{
+-	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ), aValue );
+-}
+-
+ uno::Any SAL_CALL
+ ScVbaFont::getShadow() throw (uno::RuntimeException)
+ {
+ 	if ( GetDataSet() )
+ 		if (  GetDataSet()->GetItemState( ATTR_FONT_SHADOWED, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+-	return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ) );
++	return ScVbaFont_BASE::getShadow();
+ }
+ 
+-void  SAL_CALL
+-ScVbaFont::setItalic( const uno::Any& aValue ) throw ( uno::RuntimeException )
+-{
+-	sal_Bool bValue = sal_False;
+-	aValue >>= bValue;
+-	short nValue = awt::FontSlant_NONE;
+-	if( bValue )
+-		nValue = awt::FontSlant_ITALIC;
+-    mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ), ( uno::Any )nValue );
+-}
+-
+ uno::Any SAL_CALL
+ ScVbaFont::getItalic() throw ( uno::RuntimeException )
+ {
+@@ -536,41 +442,26 @@ ScVbaFont::getItalic() throw ( uno::RuntimeExcepti
+ 		if (  GetDataSet()->GetItemState( ATTR_FONT_POSTURE, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+ 
+-    awt::FontSlant aFS;
+-	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ) ) >>= aFS;
+-	return uno::makeAny( aFS == awt::FontSlant_ITALIC );
++	return ScVbaFont_BASE::getItalic();
+ }
+ 
+-void  SAL_CALL
+-ScVbaFont::setName( const uno::Any& aValue ) throw ( uno::RuntimeException )
+-{
+-	rtl::OUString sString;
+-	aValue >>= sString;
+-	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ), aValue);
+-}
+-
+ uno::Any SAL_CALL
+ ScVbaFont::getName() throw ( uno::RuntimeException )
+ {
+ 	if ( GetDataSet() )
+ 		if (  GetDataSet()->GetItemState( ATTR_FONT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+-	return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ) );
++	return ScVbaFont_BASE::getName();
+ }
+ uno::Any
+ ScVbaFont::getColor() throw (uno::RuntimeException)
+ {
++	// #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet )
+ 	uno::Any aAny;
+ 	aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) ) );
+ 	return aAny;
+ }
+ 
+-void
+-ScVbaFont::setColor( const uno::Any& _color  ) throw (uno::RuntimeException)
+-{
+-	mxFont->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) , XLRGBToOORGB(_color));
+-}
+-
+ void  SAL_CALL
+ ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException )
+ {
+Index: sc/source/ui/vba/vbaaxis.hxx
+===================================================================
+--- sc/source/ui/vba/vbaaxis.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaaxis.hxx	(revision 276288)
+@@ -32,8 +32,8 @@
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <ooo/vba/excel/XAxis.hpp>
+ #include <ooo/vba/excel/XChart.hpp>
+-#include "vbahelperinterface.hxx"
+-
++#include <vbahelper/vbahelperinterface.hxx>
++#include <memory>
+ typedef InheritedHelperInterfaceImpl1< ov::excel::XAxis >  ScVbaAxis_BASE;
+ class ScVbaChart;
+ class ScVbaAxis : public ScVbaAxis_BASE
+Index: sc/source/ui/vba/vbamenubars.cxx
+===================================================================
+--- sc/source/ui/vba/vbamenubars.cxx	(revision 0)
++++ sc/source/ui/vba/vbamenubars.cxx	(revision 276288)
+@@ -0,0 +1,146 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbamenubars.hxx"
++#include "vbamenubar.hxx"
++#include <ooo/vba/excel/XlSheetType.hpp>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuBarEnumeration_BASE;
++
++class MenuBarEnumeration : public MenuBarEnumeration_BASE
++{
++    uno::Reference< XHelperInterface > m_xParent;
++    uno::Reference< uno::XComponentContext > m_xContext;
++    uno::Reference< container::XEnumeration > m_xEnumeration;
++public:
++    MenuBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
++    {
++    }
++    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
++    {
++        return m_xEnumeration->hasMoreElements();
++    }
++    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
++    {
++        // FIXME: should be add menubar
++        if( hasMoreElements() )
++        {
++            uno::Reference< XCommandBar > xCommandBar( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
++            uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( m_xParent, m_xContext, xCommandBar ) );
++            return uno::makeAny( xMenuBar );
++        }
++        else
++            throw container::NoSuchElementException();
++        return uno::Any();
++    }
++};
++
++ScVbaMenuBars::ScVbaMenuBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBars >& xCommandBars ) throw ( uno::RuntimeException ) : MenuBars_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBars( xCommandBars )
++{
++}
++
++ScVbaMenuBars::~ScVbaMenuBars()
++{
++}
++
++// XEnumerationAccess
++uno::Type SAL_CALL 
++ScVbaMenuBars::getElementType() throw ( uno::RuntimeException )
++{
++    return excel::XMenuBar::static_type( 0 );
++}
++
++uno::Reference< container::XEnumeration >
++ScVbaMenuBars::createEnumeration() throw ( uno::RuntimeException )
++{
++    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBars, uno::UNO_QUERY_THROW );
++    return uno::Reference< container::XEnumeration >( new MenuBarEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) );
++}
++
++uno::Any
++ScVbaMenuBars::createCollectionObject( const uno::Any& aSource )
++{
++    // make no sense
++    return aSource;
++}
++
++sal_Int32 SAL_CALL 
++ScVbaMenuBars::getCount() throw(css::uno::RuntimeException)
++{
++    return m_xCommandBars->getCount();
++}
++
++// ScVbaCollectionBaseImpl
++uno::Any SAL_CALL
++ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
++{
++    sal_Int16 nIndex = 0;
++    aIndex >>= nIndex;
++    if( nIndex == excel::XlSheetType::xlWorksheet )
++    {
++        uno::Any aSource;
++        aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" );
++        uno::Reference< XCommandBar > xCommandBar( m_xCommandBars->Item( aSource, uno::Any() ), uno::UNO_QUERY_THROW );
++        uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( this, mxContext, xCommandBar ) );
++        return uno::makeAny( xMenuBar );
++    }
++
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++    
++    return uno::Any();
++}
++
++// XHelperInterface
++rtl::OUString& 
++ScVbaMenuBars::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBars") );
++    return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++ScVbaMenuBars::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuBars" ) );
++    }
++    return aServiceNames;
++}
++
+Index: sc/source/ui/vba/vbadialogs.cxx
+===================================================================
+--- sc/source/ui/vba/vbadialogs.cxx	(revision 276159)
++++ sc/source/ui/vba/vbadialogs.cxx	(revision 276288)
+@@ -27,18 +27,8 @@
+  * for a copy of the LGPLv3 License.
+  *
+  ************************************************************************/
+-#include <comphelper/processfactory.hxx>
+-
+-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+-#include <com/sun/star/frame/XModel.hpp>
+-#include <ooo/vba/excel/XApplication.hpp>
+ #include <ooo/vba/excel/XDialog.hpp>
+-
+-#include <tools/string.hxx>
+-
+-#include "vbahelper.hxx"
+ #include "vbadialogs.hxx"
+-#include "vbaglobals.hxx"
+ #include "vbadialog.hxx"
+ 
+ using namespace ::ooo::vba;
+@@ -49,26 +39,19 @@ ScVbaDialogs::Dummy() throw (uno::RuntimeException
+ {
+ }
+ 
+-::sal_Int32
+-ScVbaDialogs::getCount() throw (uno::RuntimeException)
+-{
+-	//#TODO #FIXEME
+-	//SC_VBA_STUB();
+-	return 0;
+-}
+-
+ uno::Any
+ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
+ {
+ 	sal_Int32 nIndex = 0;
+ 	aItem >>= nIndex;
+-	uno::Reference< excel::XDialog > aDialog( new ScVbaDialog( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication(), uno::UNO_QUERY_THROW ), nIndex, mxContext ) );
++	uno::Reference< excel::XDialog > aDialog( new ScVbaDialog( uno::Reference< XHelperInterface >( Application(),uno::UNO_QUERY_THROW ), mxContext, m_xModel, nIndex ) );
+ 	return uno::Any( aDialog );
+ }
++
+ rtl::OUString& 
+ ScVbaDialogs::getServiceImplName()
+ {
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheet") );
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs") );
+ 	return sImplName;
+ }
+ 
+@@ -79,10 +62,18 @@ ScVbaDialogs::getServiceNames()
+ 	if ( aServiceNames.getLength() == 0 )
+ 	{
+ 		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheet" ) );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Dialogs" ) );
+ 	}
+ 	return aServiceNames;
+ }
+ 
++//liuchen 2009-7-27
++::sal_Int32
++ScVbaDialogs::getCount() throw (uno::RuntimeException)
++{	
++	return ScVbaDialog::GetSupportedDialogCount();
++}
+ 
+ 
++
++
+Index: sc/source/ui/vba/vbaglobals.cxx
+===================================================================
+--- sc/source/ui/vba/vbaglobals.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaglobals.cxx	(revision 276288)
+@@ -27,13 +27,14 @@
+  * for a copy of the LGPLv3 License.
+  *
+  ************************************************************************/
+-#include "helperdecl.hxx"
++#include <vbahelper/helperdecl.hxx>
+ #include "vbaglobals.hxx"
+ 
+ #include <comphelper/unwrapargs.hxx>
+ 
+ #include <com/sun/star/lang/XMultiComponentFactory.hpp>
+ #include <com/sun/star/beans/XPropertySet.hpp>
++#include <cppuhelper/component_context.hxx>
+ 
+ #include "vbaapplication.hxx"
+ #include "vbaworksheet.hxx"
+@@ -49,11 +50,20 @@ using namespace ::ooo::vba;
+ // ScVbaGlobals
+ // =============================================================================
+ 
+-ScVbaGlobals::ScVbaGlobals(  css::uno::Reference< css::uno::XComponentContext >const& rxContext )
+-        :m_xContext( rxContext )
++//ScVbaGlobals::ScVbaGlobals(  css::uno::Reference< css::uno::XComponentContext >const& rxContext,  ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext )
++rtl::OUString sDocCtxName( RTL_CONSTASCII_USTRINGPARAM("ExcelDocumentContext") );
++
++ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, sDocCtxName )
+ {
+ 	OSL_TRACE("ScVbaGlobals::ScVbaGlobals()");
+-	mxApplication = uno::Reference< excel::XApplication > ( new ScVbaApplication( m_xContext) );
++
++        uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
++        aInitArgs[ 0 ].Name = rtl::OUString::createFromAscii("Application");
++        aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
++        aInitArgs[ 1 ].Name = sDocCtxName;
++        aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
++        
++        init( aInitArgs );
+ }
+ 
+ ScVbaGlobals::~ScVbaGlobals()
+@@ -61,23 +71,6 @@ ScVbaGlobals::~ScVbaGlobals()
+ 	OSL_TRACE("ScVbaGlobals::~ScVbaGlobals");
+ }
+ 
+-// Will throw if singleton can't be accessed 
+-uno::Reference< XGlobals >
+-ScVbaGlobals::getGlobalsImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException )
+-{
+-	uno::Reference< XGlobals > xGlobals( 
+-		xContext->getValueByName( ::rtl::OUString::createFromAscii( 
+-			"/singletons/ooo.vba.theGlobals") ), uno::UNO_QUERY);
+-
+-	if ( !xGlobals.is() )
+-	{
+-		throw uno::RuntimeException(
+-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": Couldn't access Globals" ) ),
+-                    uno::Reference< XInterface >() );
+-	}
+-	return xGlobals;
+-}
+-
+ // =============================================================================
+ // XGlobals
+ // =============================================================================
+@@ -85,6 +78,8 @@ uno::Reference<excel::XApplication >
+ ScVbaGlobals::getApplication() throw (uno::RuntimeException)
+ {
+ //	OSL_TRACE("In ScVbaGlobals::getApplication");	
++        if ( !mxApplication.is() )
++	    mxApplication.set( new ScVbaApplication( mxContext) );
+     return mxApplication;
+ }
+ 
+@@ -92,7 +87,7 @@ uno::Reference< excel::XWorkbook > SAL_CALL
+ ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException)
+ {
+ //	OSL_TRACE("In ScVbaGlobals::getActiveWorkbook");	
+-    uno::Reference< excel::XWorkbook > xWorkbook( mxApplication->getActiveWorkbook(), uno::UNO_QUERY);
++    uno::Reference< excel::XWorkbook > xWorkbook( getApplication()->getActiveWorkbook(), uno::UNO_QUERY);
+     if ( xWorkbook.is() )
+     {
+         return xWorkbook;    
+@@ -103,22 +98,28 @@ ScVbaGlobals::getActiveWorkbook() throw (uno::Runt
+ }
+ 
+ 
++uno::Reference< excel::XWindow > SAL_CALL 
++ScVbaGlobals::getActiveWindow() throw (uno::RuntimeException)
++{
++    return getApplication()->getActiveWindow();
++}
++
+ uno::Reference< excel::XWorksheet > SAL_CALL 
+ ScVbaGlobals::getActiveSheet() throw (uno::RuntimeException)
+ {
+-    return mxApplication->getActiveSheet();
++    return getApplication()->getActiveSheet();
+ }
+ 
+ uno::Any SAL_CALL 
+ ScVbaGlobals::WorkBooks( const uno::Any& aIndex ) throw (uno::RuntimeException)
+ {
+-	return uno::Any( mxApplication->Workbooks(aIndex) );
++	return uno::Any( getApplication()->Workbooks(aIndex) );
+ }
+ 
+ uno::Any SAL_CALL
+ ScVbaGlobals::WorkSheets(const uno::Any& aIndex) throw (uno::RuntimeException)
+ {
+-	return mxApplication->Worksheets( aIndex );
++	return getApplication()->Worksheets( aIndex );
+ }
+ uno::Any SAL_CALL
+ ScVbaGlobals::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException)
+@@ -126,45 +127,158 @@ ScVbaGlobals::Sheets( const uno::Any& aIndex ) thr
+ 	return WorkSheets( aIndex );
+ }
+ 
+-::uno::Sequence< ::uno::Any > SAL_CALL
+-ScVbaGlobals::getGlobals(  ) throw (::uno::RuntimeException)
++uno::Any SAL_CALL 
++ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException)
+ {
+-	sal_uInt32 nMax = 0;
+-	uno::Sequence< uno::Any > maGlobals(4);
+-	maGlobals[ nMax++ ] <<= ScVbaGlobals::getGlobalsImpl(m_xContext);
+-	maGlobals[ nMax++ ] <<= mxApplication;
++	return getApplication()->Range( Cell1, Cell2 );
++}
+ 
+-	uno::Reference< excel::XWorkbook > xWorkbook = mxApplication->getActiveWorkbook();
+-	if( xWorkbook.is() )
++uno::Any SAL_CALL
++ScVbaGlobals::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException )
+ 	{
+-		maGlobals[ nMax++ ] <<= xWorkbook;
+-		uno::Reference< excel::XWorksheet > xWorksheet = xWorkbook->getActiveSheet();
+-		if( xWorksheet.is() )
+-			maGlobals[ nMax++ ] <<= xWorksheet;
++	return getApplication()->Names( aIndex );
+ 	}
+-	maGlobals.realloc( nMax );
+-	return maGlobals;
++
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaGlobals::getActiveCell() throw (uno::RuntimeException)
++{
++	return getApplication()->getActiveCell();
+ }
+ 
++uno::Reference< XAssistant > SAL_CALL 
++ScVbaGlobals::getAssistant() throw (uno::RuntimeException)
++{
++	return getApplication()->getAssistant();
++}
++
+ uno::Any SAL_CALL 
+-ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException)
++ScVbaGlobals::getSelection() throw (uno::RuntimeException)
+ {
+-	return getApplication()->Range( Cell1, Cell2 );
++	return getApplication()->getSelection();
+ }
+ 
++uno::Reference< excel::XWorkbook > SAL_CALL 
++ScVbaGlobals::getThisWorkbook() throw (uno::RuntimeException)
++{
++	return getApplication()->getThisWorkbook();
++}
++void SAL_CALL 
++ScVbaGlobals::Calculate()  throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException)
++{
++	return getApplication()->Calculate();
++}
++
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaGlobals::Cells( const uno::Any& RowIndex, const uno::Any& ColumnIndex ) throw (uno::RuntimeException)
++{
++	return getApplication()->getActiveSheet()->Cells( RowIndex, ColumnIndex );
++}
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaGlobals::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++	return getApplication()->getActiveSheet()->Columns( aIndex );
++}
++
+ uno::Any SAL_CALL
+-ScVbaGlobals::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException )
++ScVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
+ {
+-	return getApplication()->Names( aIndex );
++	uno::Reference< XApplicationBase > xBase( getApplication(), uno::UNO_QUERY_THROW );
++	return xBase->CommandBars( aIndex );
+ }
+ 
++css::uno::Reference< ov::excel::XRange > SAL_CALL 
++ScVbaGlobals::Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
++{
++	return getApplication()->Union(  Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 );
++}
++css::uno::Reference< ov::excel::XRange > SAL_CALL 
++ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
++{
++	return getApplication()->Intersect(  Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 );
++}
++
++uno::Any SAL_CALL 
++ScVbaGlobals::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException)
++{
++	return getApplication()->Evaluate( Name );
++}
++
++css::uno::Any SAL_CALL 
++ScVbaGlobals::WorksheetFunction(  ) throw (css::uno::RuntimeException)
++{
++	return getApplication()->WorksheetFunction();
++}
++
++uno::Any SAL_CALL 
++ScVbaGlobals::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++	return getApplication()->Windows( aIndex );
++}
++
++uno::Reference< excel::XRange > SAL_CALL 
++ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++	return getApplication()->getActiveSheet()->Rows( aIndex );
++	
++}
++
++uno::Any SAL_CALL 
++ScVbaGlobals::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++	return uno::Any( getApplication()->MenuBars(aIndex) );
++}
++
++uno::Sequence< ::rtl::OUString > SAL_CALL 
++ScVbaGlobals::getAvailableServiceNames(  ) throw (uno::RuntimeException)
++{
++    static bool bInit = false;
++    static uno::Sequence< rtl::OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() );
++    if ( !bInit )
++    {
++         rtl::OUString names[] = { 
++            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Range" ) ),
++            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Workbook" ) ),
++            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Window" ) ),
++            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Worksheet" ) ),
++            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Application" ) ),
++            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Hyperlink" ) ),
++          };
++        sal_Int32 nExcelServices = ( sizeof( names )/ sizeof( names[0] ) );
++        sal_Int32 startIndex = serviceNames.getLength();
++        serviceNames.realloc( serviceNames.getLength() + nExcelServices );
++        for ( sal_Int32 index = 0; index < nExcelServices; ++index )
++             serviceNames[ startIndex + index ] = names[ index ];
++        bInit = true;
++    }
++    return serviceNames;
++}
++
++rtl::OUString&
++ScVbaGlobals::getServiceImplName()
++{
++        static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaGlobals") );
++        return sImplName;
++}
++
++uno::Sequence< rtl::OUString >
++ScVbaGlobals::getServiceNames()
++{
++        static uno::Sequence< rtl::OUString > aServiceNames;
++        if ( aServiceNames.getLength() == 0 )
++        {
++                aServiceNames.realloc( 1 );
++                aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Globals" ) );
++        }
++        return aServiceNames;
++}
++
+ namespace globals
+ {
+ namespace sdecl = comphelper::service_decl;
+-sdecl::class_<ScVbaGlobals, sdecl::with_args<false> > serviceImpl;
++sdecl::vba_service_class_<ScVbaGlobals, sdecl::with_args<true> > serviceImpl;
+ extern sdecl::ServiceDecl const serviceDecl(
+     serviceImpl,
+     "ScVbaGlobals",
+-    "ooo.vba.Globals" );
++    "ooo.vba.excel.Globals" );
+ }
+ 
+Index: sc/source/ui/vba/vbacharacters.hxx
+===================================================================
+--- sc/source/ui/vba/vbacharacters.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacharacters.hxx	(revision 276288)
+@@ -36,7 +36,7 @@
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #include <com/sun/star/text/XSimpleText.hpp>
+ 
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ #include "vbapalette.hxx"
+ typedef InheritedHelperInterfaceImpl1< ov::excel::XCharacters > ScVbaCharacters_BASE;
+ 
+Index: sc/source/ui/vba/vbastyles.hxx
+===================================================================
+--- sc/source/ui/vba/vbastyles.hxx	(revision 276159)
++++ sc/source/ui/vba/vbastyles.hxx	(revision 276288)
+@@ -31,7 +31,7 @@
+ #define SC_VBA_STYLES_HXX
+ #include <ooo/vba/excel/XStyles.hpp>
+ #include <com/sun/star/container/XNameContainer.hpp>
+-#include "vbacollectionimpl.hxx"
++#include <vbahelper/vbacollectionimpl.hxx>
+ 
+ typedef CollTestImplHelper< ov::excel::XStyles > ScVbaStyles_BASE;
+ class ScVbaStyles: public ScVbaStyles_BASE
+Index: sc/source/ui/vba/vbamenus.hxx
+===================================================================
+--- sc/source/ui/vba/vbamenus.hxx	(revision 0)
++++ sc/source/ui/vba/vbamenus.hxx	(revision 276288)
+@@ -0,0 +1,68 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_MENUS_HXX
++#define SC_VBA_MENUS_HXX
++
++#include <ooo/vba/excel/XMenus.hpp>
++#include <ooo/vba/excel/XMenu.hpp>
++#include <ooo/vba/XCommandBarControls.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbacollectionimpl.hxx>
++
++typedef CollTestImplHelper< ov::excel::XMenus > Menus_BASE;
++
++class ScVbaMenus : public Menus_BASE
++{
++private:
++    css::uno::Reference< ov::XCommandBarControls > m_xCommandBarControls;
++
++public:
++    ScVbaMenus( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException );
++
++    // XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++
++    // Methods     
++    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); 
++    virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif//SC_VBA_MENUS_HXX
+Index: sc/source/ui/vba/vbaoleobjects.hxx
+===================================================================
+--- sc/source/ui/vba/vbaoleobjects.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaoleobjects.hxx	(revision 276288)
+@@ -33,8 +33,8 @@
+ #include <cppuhelper/implbase1.hxx>
+ #include <ooo/vba/excel/XOLEObjects.hpp>
+ 
+-#include "vbacollectionimpl.hxx"
+-#include "vbahelper.hxx"
++#include <vbahelper/vbacollectionimpl.hxx>
++#include "excelvbahelper.hxx"
+ 
+ typedef CollTestImplHelper< ov::excel::XOLEObjects > OLEObjectsImpl_BASE;
+ 
+Index: sc/source/ui/vba/vbapalette.hxx
+===================================================================
+--- sc/source/ui/vba/vbapalette.hxx	(revision 276159)
++++ sc/source/ui/vba/vbapalette.hxx	(revision 276288)
+@@ -30,7 +30,7 @@
+ #ifndef SC_VBAPALETTE_HXX
+ #define SC_VBAPALETTE_HXX
+ 
+-#include "vbahelper.hxx"
++#include "excelvbahelper.hxx"
+ #include <document.hxx>
+ #include <com/sun/star/container/XIndexAccess.hpp>
+ 
+@@ -42,7 +42,7 @@ class ScVbaPalette
+ 	ScVbaPalette(  SfxObjectShell* pShell = NULL ) : m_pShell( pShell ){}
+ 	// if no palette available e.g. because the document doesn't have a 
+ 	// palette defined then a default palette will be returned.
+-	css::uno::Reference< css::container::XIndexAccess > getPalette();
++	css::uno::Reference< css::container::XIndexAccess > getPalette() const;
+ 	static css::uno::Reference< css::container::XIndexAccess > getDefaultPalette();
+ };
+ 
+Index: sc/source/ui/vba/vbamenu.cxx
+===================================================================
+--- sc/source/ui/vba/vbamenu.cxx	(revision 0)
++++ sc/source/ui/vba/vbamenu.cxx	(revision 276288)
+@@ -0,0 +1,91 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbamenu.hxx" 
++#include "vbamenuitems.hxx"
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++ScVbaMenu::ScVbaMenu( const uno::Reference< ov::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBarControl >& xCommandBarControl ) throw( uno::RuntimeException ) : Menu_BASE( xParent, xContext ), m_xCommandBarControl( xCommandBarControl )
++{
++}
++
++::rtl::OUString SAL_CALL
++ScVbaMenu::getCaption() throw ( uno::RuntimeException )
++{
++    return m_xCommandBarControl->getCaption();
++}
++
++void SAL_CALL
++ScVbaMenu::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
++{
++    m_xCommandBarControl->setCaption( _caption );
++}
++
++void SAL_CALL
++ScVbaMenu::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    m_xCommandBarControl->Delete();
++}
++
++uno::Any SAL_CALL 
++ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    uno::Reference< XCommandBarControls > xCommandBarControls( m_xCommandBarControl->Controls( uno::Any() ), uno::UNO_QUERY_THROW );
++    uno::Reference< excel::XMenuItems > xMenuItems( new ScVbaMenuItems( this, mxContext, xCommandBarControls ) );
++    if( aIndex.hasValue() )
++    {
++        return xMenuItems->Item( aIndex, uno::Any() );
++    }
++    return uno::makeAny( xMenuItems );
++}
++
++rtl::OUString& 
++ScVbaMenu::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenu") );
++	return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++ScVbaMenu::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Menu" ) );
++	}
++	return aServiceNames;
++}
+Index: sc/source/ui/vba/vbacomment.hxx
+===================================================================
+--- sc/source/ui/vba/vbacomment.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacomment.hxx	(revision 276288)
+@@ -39,7 +39,7 @@
+ #include <com/sun/star/table/XCellRange.hpp>
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ 
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ typedef InheritedHelperInterfaceImpl1< ov::excel::XComment > ScVbaComment_BASE;
+ 
+Index: sc/source/ui/vba/vbamenuitems.hxx
+===================================================================
+--- sc/source/ui/vba/vbamenuitems.hxx	(revision 0)
++++ sc/source/ui/vba/vbamenuitems.hxx	(revision 276288)
+@@ -0,0 +1,68 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_MENUITEMS_HXX
++#define SC_VBA_MENUITEMS_HXX
++
++#include <ooo/vba/excel/XMenuItems.hpp>
++#include <ooo/vba/excel/XMenuItem.hpp>
++#include <ooo/vba/XCommandBarControls.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbacollectionimpl.hxx>
++
++typedef CollTestImplHelper< ov::excel::XMenuItems > MenuItems_BASE;
++
++class ScVbaMenuItems : public MenuItems_BASE
++{
++private:
++    css::uno::Reference< ov::XCommandBarControls > m_xCommandBarControls;
++
++public:
++    ScVbaMenuItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException );
++
++    // XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++
++    // Methods     
++    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); 
++    virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif//SC_VBA_MENUITEMS_HXX
+Index: sc/source/ui/vba/vbaoleobject.hxx
+===================================================================
+--- sc/source/ui/vba/vbaoleobject.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaoleobject.hxx	(revision 276288)
+@@ -32,20 +32,20 @@
+ 
+ #include <cppuhelper/implbase1.hxx>
+ #include <com/sun/star/drawing/XControlShape.hpp>
+-#include <com/sun/star/awt/XWindowPeer.hpp>
+ #include <ooo/vba/excel/XOLEObject.hpp>
++#include <ooo/vba/msforms/XControl.hpp>
+ 
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ typedef InheritedHelperInterfaceImpl1< ov::excel::XOLEObject > OLEObjectImpl_BASE;
+ 
+ class ScVbaOLEObject : public OLEObjectImpl_BASE
+ {
+-    css::uno::Reference< css::awt::XWindowPeer > m_xWindowPeer;
+ protected:
+     css::uno::Reference< css::drawing::XControlShape > m_xControlShape;
+ 	virtual rtl::OUString& getServiceImplName();
+ 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++    css::uno::Reference< ov::msforms::XControl> m_xControl;
+ public:
+     ScVbaOLEObject( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
+             css::uno::Reference< css::drawing::XControlShape > xControlShape );
+Index: sc/source/ui/vba/vbawindow.hxx
+===================================================================
+--- sc/source/ui/vba/vbawindow.hxx	(revision 276159)
++++ sc/source/ui/vba/vbawindow.hxx	(revision 276288)
+@@ -39,15 +39,16 @@
+ #include <ooo/vba/excel/XPane.hpp>
+ #include <com/sun/star/awt/XDevice.hpp>
+ 
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbawindowbase.hxx>
+ #include "vbaworkbook.hxx"
+ 
+-typedef InheritedHelperInterfaceImpl1<ov::excel::XWindow > WindowImpl_BASE;
++//typedef InheritedHelperInterfaceImpl1<ov::excel::XWindow > WindowImpl_BASE;
++typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::excel::XWindow > WindowImpl_BASE;
+ 
+ class ScVbaWindow : public WindowImpl_BASE
+ {		
+ private:		
+-	css::uno::Reference< css::frame::XModel > m_xModel;
+ 	css::uno::Reference< css::sheet::XViewPane > m_xViewPane;
+ 	css::uno::Reference< css::sheet::XViewFreezable > m_xViewFreezable;
+ 	css::uno::Reference< css::sheet::XViewSplitable > m_xViewSplitable;
+@@ -82,10 +83,6 @@ class ScVbaWindow : public WindowImpl_BASE
+ 	virtual void SAL_CALL setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (css::uno::RuntimeException);
+ 	virtual ::sal_Bool SAL_CALL getFreezePanes() throw (css::uno::RuntimeException);
+ 	virtual void SAL_CALL setFreezePanes( ::sal_Bool _bFreezePanes ) throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException) ;
+-    virtual void SAL_CALL setHeight( sal_Int32 _height ) throw (css::uno::RuntimeException) ;
+-    virtual sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException) ;
+-    virtual void SAL_CALL setLeft( sal_Int32 _left ) throw (css::uno::RuntimeException) ;
+ 	virtual ::sal_Bool SAL_CALL getSplit() throw (css::uno::RuntimeException);
+ 	virtual void SAL_CALL setSplit( ::sal_Bool _bSplit ) throw (css::uno::RuntimeException);
+     virtual sal_Int32 SAL_CALL getSplitColumn() throw (css::uno::RuntimeException) ;
+@@ -100,14 +97,8 @@ class ScVbaWindow : public WindowImpl_BASE
+     virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) throw (css::uno::RuntimeException) ;
+     virtual css::uno::Any SAL_CALL getScrollColumn() throw (css::uno::RuntimeException) ;
+     virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) throw (css::uno::RuntimeException) ;
+-    virtual sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException) ;
+-    virtual void SAL_CALL setTop( sal_Int32 _top ) throw (css::uno::RuntimeException) ;
+     virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException);
+     virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException);
+-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
+-    virtual sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException) ;
+-    virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException) ;
+     virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException);
+     virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException);
+Index: sc/source/ui/vba/vbatextboxshape.cxx
+===================================================================
+--- sc/source/ui/vba/vbatextboxshape.cxx	(revision 276159)
++++ sc/source/ui/vba/vbatextboxshape.cxx	(revision 276288)
+@@ -41,7 +41,7 @@
+ using namespace com::sun::star;
+ using namespace ooo::vba;
+ 
+-ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, const uno::Reference< frame::XModel >& xModel ) : TextBoxShapeImpl_BASE( uno::Reference< XHelperInterface >(), xContext, xShape, xShapes, ScVbaShape::getType( xShape )  )
++ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, const uno::Reference< frame::XModel >& xModel ) : TextBoxShapeImpl_BASE( uno::Reference< XHelperInterface >(), xContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape )  )
+ {
+     m_xTextRange.set( xShape , uno::UNO_QUERY_THROW );
+     m_xModel.set( xModel );
+@@ -62,7 +62,7 @@ ScVbaTextBoxShape::setText( const rtl::OUString& _
+ uno::Reference< excel::XCharacters > SAL_CALL 
+ ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException)
+ {
+-    ScDocShell* pDocShell = getDocShell( m_xModel );
++    ScDocShell* pDocShell = excel::getDocShell( m_xModel );
+     ScDocument* pDoc = pDocShell ? pDocShell->GetDocument() : NULL;
+ 
+     if ( !pDoc )
+Index: sc/source/ui/vba/helperdecl.hxx
+===================================================================
+--- sc/source/ui/vba/helperdecl.hxx	(revision 276159)
++++ sc/source/ui/vba/helperdecl.hxx	(revision 276288)
+@@ -32,107 +32,25 @@
+ 
+ namespace comphelper {
+ namespace service_decl {
+-
+-namespace detail {
+-namespace css = ::com::sun::star;
+-template <typename ImplT>
+-class OwnServiceImpl
+-    : public ImplT,
+-      private ::boost::noncopyable
+-{
+-    typedef ImplT BaseT;
+-    
+-public:    
+-    OwnServiceImpl(
+-        ServiceDecl const& rServiceDecl,
+-        css::uno::Sequence<css::uno::Any> const& args,
+-        css::uno::Reference<css::uno::XComponentContext> const& xContext )
+-        :BaseT(args, xContext), m_rServiceDecl(rServiceDecl) {}
+-    OwnServiceImpl(
+-        ServiceDecl const& rServiceDecl,
+-        css::uno::Reference<css::uno::XComponentContext> const& xContext )
+-        : BaseT(xContext), m_rServiceDecl(rServiceDecl) {}
+-    
+-    // XServiceInfo
+-    virtual ::rtl::OUString SAL_CALL getImplementationName()
+-        throw (css::uno::RuntimeException) {
+-        return m_rServiceDecl.getImplementationName();
+-    }
+-    virtual sal_Bool SAL_CALL supportsService( ::rtl::OUString const& name )
+-        throw (css::uno::RuntimeException) {
+-        return m_rServiceDecl.supportsService(name);
+-    }
+-    virtual css::uno::Sequence< ::rtl::OUString>
+-    SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) {
+-        return m_rServiceDecl.getSupportedServiceNames();
+-    }
+-    
+-private:
+-    ServiceDecl const& m_rServiceDecl;
+-};
+-
+-
+-template <typename ImplT, typename WithArgsT>
+-struct OwnCreateFunc;
+-
+-template <typename ImplT>
+-struct OwnCreateFunc<ImplT, with_args<false> > {
+-    explicit OwnCreateFunc(  )
+-         {}
+-    
+-    css::uno::Reference<css::uno::XInterface>
+-    operator()( ServiceDecl const& rServiceDecl,
+-                css::uno::Sequence<css::uno::Any> const&,
+-                css::uno::Reference<css::uno::XComponentContext>
+-                const& xContext ) const
+-    {
+-        return css::uno::Reference< ooo::vba::XHelperInterface >(new OwnServiceImpl<ImplT>( rServiceDecl, xContext ));
+-    }
+-};
+-
+-template <typename ImplT>
+-struct OwnCreateFunc<ImplT, with_args<true> > {
+-    explicit OwnCreateFunc( )
+-         {}
+-    
+-    css::uno::Reference<css::uno::XInterface>
+-    operator()( ServiceDecl const& rServiceDecl,
+-                css::uno::Sequence<css::uno::Any> const& args,
+-                css::uno::Reference<css::uno::XComponentContext>
+-                const& xContext ) const
+-    {
+-        css::uno::Reference< ooo::vba::XHelperInterface > xHelp(
+-            new OwnServiceImpl<ImplT>( rServiceDecl, args, xContext ) );
+-	css::uno::Reference< css::uno::XInterface > xIf( xHelp, css::uno::UNO_QUERY ) ;
+-	return xIf;
+-    }
+-};
+-
+-} // namespace detail
+-
+-/** Defines a service implementation class.
+-    
+-    @tpl ImplT_ service implementation class
+-    @WithArgsT whether the implementation class ctor expects arguments
+-               (uno::Sequence<uno::Any>, uno::Reference<uno::XComponentContext>)
+-               or just (uno::Reference<uno::XComponentContext>)
+-*/
+ template <typename ImplT_, typename WithArgsT = with_args<false> >
+-struct vba_service_class_ {
+-    typedef ImplT_ ImplT;
+-    typedef detail::OwnServiceImpl<ImplT_ > ServiceImplT;
+-    
+-    detail::CreateFuncF const m_createFunc;
+-    
++struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT >
++{
++    typedef serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT > baseT;
+     /** Default ctor.  Implementation class without args, expecting
+         component context as single argument.
+     */
+-    vba_service_class_() : m_createFunc(
+-        detail::OwnCreateFunc<ImplT, WithArgsT>() ) {}
++    vba_service_class_() : baseT() {}
++    template <typename PostProcessFuncT>
++    /** Ctor to pass a post processing function/functor.
+ 
++        @tpl PostProcessDefaultT let your compiler deduce this
++        @param postProcessFunc function/functor that gets the yet unacquired
++                               ImplT_ pointer returning a
++                               uno::Reference<uno::XInterface>
++    */
++    explicit vba_service_class_( PostProcessFuncT const& postProcessFunc ) : baseT( postProcessFunc ) {}
+ };
+ 
+-
+ } // namespace service_decl
+ } // namespace comphelper
+ 
+Index: sc/source/ui/vba/vbachartobject.cxx
+===================================================================
+--- sc/source/ui/vba/vbachartobject.cxx	(revision 276159)
++++ sc/source/ui/vba/vbachartobject.cxx	(revision 276288)
+@@ -120,10 +120,11 @@ ScVbaChartObject::Activate() throw ( script::Basic
+ {
+ 	try
+ 	{
+-		// #TODO #FIXME should be ThisWorkbook or equivelant
+-		// XModel
++		// #TODO #FIXME should be ThisWorkbook or equivelant, or in
++		// fact probably the chart object should be created with 
++		// the XModel owner
+ 		//uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getXModel().getCurrentController());
+-		uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
++		uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getCurrentExcelDoc(mxContext)->getCurrentController(), uno::UNO_QUERY_THROW );
+ 		xSelectionSupplier->select(uno::makeAny(xShape));
+ 	}
+ 	catch (uno::Exception& )
+Index: sc/source/ui/vba/vbainterior.cxx
+===================================================================
+--- sc/source/ui/vba/vbainterior.cxx	(revision 276159)
++++ sc/source/ui/vba/vbainterior.cxx	(revision 276288)
+@@ -163,11 +163,19 @@ ScVbaInterior::setColorIndex( const css::uno::Any&
+ 	sal_Int32 nIndex = 0;
+ 	_colorindex >>= nIndex;
+ 	
++    // hackly for excel::XlColorIndex::xlColorIndexNone
++    if( nIndex == excel::XlColorIndex::xlColorIndexNone )
++    {
++        m_xProps->setPropertyValue( BACKCOLOR, uno::makeAny( sal_Int32( -1 ) ) );
++    }
++    else
++    {
+ 	// setColor expects colors in XL RGB values
+ 	// #FIXME this is daft we convert OO RGB val to XL RGB val and
+ 	// then back again to OO RGB value
+ 	setColor( OORGBToXLRGB( GetIndexColor( nIndex ) ) );
+ }
++}
+ uno::Any
+ ScVbaInterior::GetIndexColor( const sal_Int32& nColorIndex )
+ {
+@@ -204,13 +212,21 @@ uno::Any SAL_CALL
+ ScVbaInterior::getColorIndex() throw ( css::uno::RuntimeException )
+ {
+ 	sal_Int32 nColor = 0;
++    // hackly for excel::XlColorIndex::xlColorIndexNone
++    uno::Any aColor = m_xProps->getPropertyValue( BACKCOLOR ); 
++    if( ( aColor >>= nColor ) && ( nColor == -1 ) )
++    {
++        nColor = excel::XlColorIndex::xlColorIndexNone;
++        return uno::makeAny( nColor );
++    }
++
+ 	// getColor returns Xl ColorValue, need to convert it to OO val
+ 	// as the palette deals with OO RGB values 
+ 	// #FIXME this is daft in getColor we convert OO RGB val to XL RGB val 
+ 	// and then back again to OO RGB value
+ 	XLRGBToOORGB( getColor() ) >>= nColor; 
+      
+-	return uno::makeAny( GetIndexColor( nColor ) );
++	return uno::makeAny( GetColorIndex( nColor ) );
+ }
+ Color
+ ScVbaInterior::GetPatternColor( const Color& rPattColor, const Color& rBackColor, sal_uInt32 nXclPattern )
+Index: sc/source/ui/vba/vbawindows.hxx
+===================================================================
+--- sc/source/ui/vba/vbawindows.hxx	(revision 276159)
++++ sc/source/ui/vba/vbawindows.hxx	(revision 276288)
+@@ -35,8 +35,8 @@
+ 
+ #include <com/sun/star/uno/XComponentContext.hpp>
+  
+-#include "vbahelper.hxx"
+-#include "vbacollectionimpl.hxx"
++#include "excelvbahelper.hxx"
++#include <vbahelper/vbacollectionimpl.hxx>
+ 
+ 
+ typedef CollTestImplHelper< ov::excel::XWindows > ScVbaWindows_BASE;
+@@ -45,6 +45,7 @@ class ScVbaWindows : public ScVbaWindows_BASE
+ {
+ public:
+ 	ScVbaWindows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess );
++	ScVbaWindows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext );
+ 	virtual ~ScVbaWindows() {}
+ 
+ 	// XEnumerationAccess
+@@ -57,8 +58,6 @@ class ScVbaWindows : public ScVbaWindows_BASE
+ 	// ScVbaCollectionBaseImpl	
+ 	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
+ 
+-	static css::uno::Reference< ov::XCollection > Windows(  const css::uno::Reference< css::uno::XComponentContext >& xContext );
+-
+ 	// XHelperInterface
+ 	virtual rtl::OUString& getServiceImplName();
+ 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+Index: sc/source/ui/vba/vbaworksheets.hxx
+===================================================================
+--- sc/source/ui/vba/vbaworksheets.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaworksheets.hxx	(revision 276288)
+@@ -36,9 +36,8 @@
+ #include <com/sun/star/sheet/XSpreadsheets.hpp>
+ #include <com/sun/star/container/XEnumerationAccess.hpp>
+ #include <com/sun/star/uno/XComponentContext.hpp>
+-#include <ooo/vba/XGlobals.hpp>
+  
+-#include "vbacollectionimpl.hxx"
++#include <vbahelper/vbacollectionimpl.hxx>
+ 
+ class ScModelObj;
+ 
+Index: sc/source/ui/vba/vbadialog.hxx
+===================================================================
+--- sc/source/ui/vba/vbadialog.hxx	(revision 276159)
++++ sc/source/ui/vba/vbadialog.hxx	(revision 276288)
+@@ -31,30 +31,26 @@
+ #define SC_VBA_DIALOG_HXX
+ 
+ #include <cppuhelper/implbase1.hxx>
+-
+-#include <com/sun/star/uno/XComponentContext.hpp>
+-#include <ooo/vba/XGlobals.hpp>
+-#include <ooo/vba/excel/XApplication.hpp>
+ #include <ooo/vba/excel/XDialog.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbadialogbase.hxx>
+  
+-#include "vbahelperinterface.hxx"
+-#include "vbadialog.hxx"
++typedef cppu::ImplInheritanceHelper1< VbaDialogBase, ov::excel::XDialog > ScVbaDialog_BASE;
+ 
+-typedef InheritedHelperInterfaceImpl1< ov::excel::XDialog > ScVbaDialog_BASE;
+-
+ class ScVbaDialog : public ScVbaDialog_BASE
+ {
+-	sal_Int32 mnIndex;
+ public:
+-	ScVbaDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, sal_Int32 nIndex, const css::uno::Reference< css::uno::XComponentContext > xContext ):ScVbaDialog_BASE( xParent, xContext ), mnIndex( nIndex ) {}
++	ScVbaDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nIndex ):ScVbaDialog_BASE( xParent, xContext, xModel, nIndex ) {}
+ 	virtual ~ScVbaDialog() {}
+ 
+ 	// Methods
+-	virtual void SAL_CALL Show() throw (css::uno::RuntimeException);
+-	rtl::OUString mapIndexToName( sal_Int32 nIndex );
++	virtual rtl::OUString mapIndexToName( sal_Int32 nIndex );
+ 	// XHelperInterface
+ 	virtual rtl::OUString& getServiceImplName();
+ 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++
++	//liuchen 2009-7-27
++	static sal_Int32 GetSupportedDialogCount();
+ };
+ 
+ #endif /* SC_VBA_DIALOG_HXX */
+Index: sc/source/ui/vba/vbatextframe.hxx
+===================================================================
+--- sc/source/ui/vba/vbatextframe.hxx	(revision 276159)
++++ sc/source/ui/vba/vbatextframe.hxx	(revision 276288)
+@@ -29,45 +29,23 @@
+  ************************************************************************/
+ #ifndef SC_VBA_TEXTFRAME_HXX
+ #define SC_VBA_TEXTFRAME_HXX
+-#include <com/sun/star/drawing/XShape.hpp>
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-#include <ooo/vba/excel/XCharacters.hpp>
+ #include <ooo/vba/excel/XTextFrame.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbatextframe.hxx>
+ 
+-#include "vbahelperinterface.hxx"
+-#include "vbapalette.hxx"
++//typedef InheritedHelperInterfaceImpl1< ov::excel::XTextFrame > ScVbaTextFrame_BASE;
++typedef cppu::ImplInheritanceHelper1< VbaTextFrame, ov::excel::XTextFrame > ScVbaTextFrame_BASE;
+ 
+-typedef InheritedHelperInterfaceImpl1< ov::excel::XTextFrame > ScVbaTextFrame_BASE;
+-
+ class ScVbaTextFrame : public ScVbaTextFrame_BASE
+ {
+-private:
+-    css::uno::Reference< ov::excel::XCharacters > m_xCharacters;
+-    css::uno::Reference< css::drawing::XShape > m_xShape;
+-    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
+-protected:
+-    virtual rtl::OUString& getServiceImplName();
+-    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+-    virtual void setAsMSObehavior();
+-    sal_Int32 getMargin( rtl::OUString sMarginType );
+-    void setMargin( rtl::OUString sMarginType, float fMargin );
+ public:
+-    ScVbaTextFrame( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext , css::uno::Reference< css::drawing::XShape > xShape);
++	ScVbaTextFrame( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext ) throw ( css::lang::IllegalArgumentException );
+     virtual ~ScVbaTextFrame() {}
+-    // Attributes
+-    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setAutoSize( sal_Bool _autosize ) throw (css::uno::RuntimeException);
+-    virtual float SAL_CALL getMarginBottom() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setMarginBottom( float _marginbottom ) throw (css::uno::RuntimeException);
+-    virtual float SAL_CALL getMarginTop() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setMarginTop( float _margintop ) throw (css::uno::RuntimeException);
+-    virtual float SAL_CALL getMarginLeft() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setMarginLeft( float _marginleft ) throw (css::uno::RuntimeException);
+-    virtual float SAL_CALL getMarginRight() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setMarginRight( float _marginright ) throw (css::uno::RuntimeException);
+-
+     // Methods
+-    virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL Characters(  ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Characters(  ) throw (css::uno::RuntimeException);
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ 
+ };
+ 
+Index: sc/source/ui/vba/excelvbahelper.hxx
+===================================================================
+--- sc/source/ui/vba/excelvbahelper.hxx	(revision 0)
++++ sc/source/ui/vba/excelvbahelper.hxx	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbahelper.hxx,v $
++ * $Revision: 1.5.32.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_EXCEL_VBA_HELPER_HXX
++#define SC_EXCEL_VBA_HELPER_HXX
++
++#include<vbahelper/vbahelper.hxx>
++#include <docsh.hxx>
++
++class ScCellRangeObj;
++
++namespace ooo 
++{
++	namespace vba 
++	{
++	namespace excel
++        { 
++                // nTabs empty means apply zoom to all sheets
++                void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs );
++		void implnCopy( const css::uno::Reference< css::frame::XModel>& xModel );
++		void implnPaste ( const css::uno::Reference< css::frame::XModel>& xModel );
++		void implnCut( const css::uno::Reference< css::frame::XModel>& xModel );
++		void implnPasteSpecial( const css::uno::Reference< css::frame::XModel>& xModel, sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
++		ScTabViewShell* getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
++		ScDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
++		ScTabViewShell* getCurrentBestViewShell( const css::uno::Reference< css::uno::XComponentContext >& xContext );
++		SfxViewFrame* getViewFrame( const css::uno::Reference< css::frame::XModel >& xModel );
++            class ScVbaCellRangeAccess
++            {
++            public:
++                static SfxItemSet* GetDataSet( ScCellRangeObj* pRangeObj );
++            };
++};
++};
++};
++#endif
+Index: sc/source/ui/vba/vbaapplication.hxx
+===================================================================
+--- sc/source/ui/vba/vbaapplication.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaapplication.hxx	(revision 276288)
+@@ -35,21 +35,25 @@
+ #include <ooo/vba/excel/XApplication.hpp>
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ 
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbaapplicationbase.hxx>
++#include <cppuhelper/implbase1.hxx>
+ 
+-typedef InheritedHelperInterfaceImpl1< ov::excel::XApplication > ScVbaApplication_BASE;
++//typedef InheritedHelperInterfaceImpl1< ov::excel::XApplication > ScVbaApplication_BASE;
++typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ov::excel::XApplication > ScVbaApplication_BASE;
+ 
+ class ScVbaApplication : public ScVbaApplication_BASE
+ {
+ private:
+ 	sal_Int32 m_xCalculation;
+ 	rtl::OUString getOfficePath( const rtl::OUString& sPath ) throw ( css::uno::RuntimeException );
++protected:
++        virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
+ public:
+-	ScVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
++	ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext );
+ 	virtual ~ScVbaApplication();
+ 
+-	// XHelperInterface ( parent is itself )
+-	virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return this; }
++    virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+ 
+ 	// XApplication
+ 	virtual ::rtl::OUString SAL_CALL PathSeparator(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+@@ -68,15 +72,10 @@ class ScVbaApplication : public ScVbaApplication_B
+ 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw ( css::uno::RuntimeException);
+  virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
+  virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
+-	virtual sal_Bool SAL_CALL getScreenUpdating() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException);
+-	virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException);
+-	virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (css::uno::RuntimeException);
+ 	virtual ::sal_Bool SAL_CALL getDisplayFormulaBar() throw ( css::uno::RuntimeException );
+ 	virtual void SAL_CALL setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw ( css::uno::RuntimeException );
+ 
+     virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException);
+-    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+@@ -85,7 +84,6 @@ class ScVbaApplication : public ScVbaApplication_B
+ 	virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException);
+ 	virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException);
+-	virtual ::rtl::OUString SAL_CALL getVersion() throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL getStatusBar() throw (css::uno::RuntimeException);
+ 	virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException);
+ 	virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException);
+@@ -102,7 +100,8 @@ class ScVbaApplication : public ScVbaApplication_B
+ 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ 	virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException );
+-	virtual void SAL_CALL DoEvents() throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+ 	// XHelperInterface
+ 	virtual rtl::OUString& getServiceImplName();
+ 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+Index: sc/source/ui/vba/vbaeventshelper.hxx
+===================================================================
+--- sc/source/ui/vba/vbaeventshelper.hxx	(revision 0)
++++ sc/source/ui/vba/vbaeventshelper.hxx	(revision 276288)
+@@ -0,0 +1,85 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: vbaeventshelper.hxx,v $
++ *
++ *  $Revision: 1.0 $
++ *
++ *  last change: $Author: vg $ $Date: 2007/12/07 10:42:26 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef SC_VBAEVENTS_HXX
++#define SC_VBAEVENTS_HXX
++
++#include "document.hxx"
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/document/VbaEventId.hpp>
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/awt/XWindowListener.hpp>
++#include "excelvbahelper.hxx"
++
++#define INVALID_TAB -1
++
++typedef ::cppu::WeakImplHelper1< com::sun::star::document::XVbaEventsHelper > VBAWorkbookEvent_BASE;
++
++class VbaEventsListener;
++class ScDocShell;
++class ScVbaEventsHelper : public VBAWorkbookEvent_BASE
++{
++private:
++	ScDocument* pDoc;
++	ScDocShell* pDocShell;
++    css::uno::Reference< css::uno::XComponentContext > m_xContext;
++    css::uno::Reference< css::awt::XWindowListener > m_xVbaEventsListener;
++    sal_Bool mbOpened;
++    sal_Bool mbIgnoreEvents;
++
++	String getSheetModuleName( SCTAB nTab );
++	css::uno::Any createWorkSheet( SfxObjectShell* pShell, SCTAB nTab );
++	css::uno::Any createRange( const css::uno::Any& aRange );
++	css::uno::Any createHyperlink( const css::uno::Any& rCell );
++	css::uno::Any createWindow( SfxObjectShell* pShell );
++    SCTAB getTabFromArgs( const css::uno::Sequence< css::uno::Any > aArgs, const sal_Int32 nPos = 0 );
++    rtl::OUString getEventName( const sal_Int32 nEventId );
++    rtl::OUString getMacroPath( const sal_Int32 nEventId, const SCTAB nTab = INVALID_TAB );
++    sal_Bool processVbaEvent( const sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs, const SCTAB nTab = INVALID_TAB );
++
++public:
++	ScVbaEventsHelper( ScDocument* pDocument ):pDoc( pDocument ), mbOpened( sal_False ){};
++    ScVbaEventsHelper( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
++    ~ScVbaEventsHelper();
++	ScDocument* getDocument() { return pDoc; };
++	ScDocShell* getDocumentShell() { return pDocShell; };
++    // XVBAWorkbookEventHelper
++    virtual sal_Bool SAL_CALL ProcessCompatibleVbaEvent( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setIgnoreEvents( ::sal_Bool _ignoreevents ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getIgnoreEvents() throw (css::uno::RuntimeException);
++};
++
++#endif
++
+Index: sc/source/ui/vba/vbapagebreaks.hxx
+===================================================================
+--- sc/source/ui/vba/vbapagebreaks.hxx	(revision 276159)
++++ sc/source/ui/vba/vbapagebreaks.hxx	(revision 276288)
+@@ -33,6 +33,8 @@
+ #include <cppuhelper/implbase1.hxx>
+ #include <ooo/vba/excel/XHPageBreaks.hpp>
+ #include <ooo/vba/excel/XHPageBreak.hpp>
++#include <ooo/vba/excel/XVPageBreaks.hpp>
++#include <ooo/vba/excel/XVPageBreak.hpp>
+ #include <ooo/vba/excel/XRange.hpp>
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #include <com/sun/star/script/BasicErrorException.hpp>
+@@ -41,8 +43,8 @@
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <com/sun/star/container/XIndexAccess.hpp>
+ #include <com/sun/star/table/XColumnRowRange.hpp>
+-#include "vbahelperinterface.hxx"
+-#include "vbacollectionimpl.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbacollectionimpl.hxx>
+ 
+ typedef CollTestImplHelper< ov::excel::XHPageBreaks > ScVbaHPageBreaks_BASE;
+ 
+@@ -68,4 +70,31 @@ class ScVbaHPageBreaks : public ScVbaHPageBreaks_B
+ 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ };
+ 
++//VPageBreaks
++typedef CollTestImplHelper< ov::excel::XVPageBreaks > ScVbaVPageBreaks_BASE;
++
++class ScVbaVPageBreaks : public ScVbaVPageBreaks_BASE
++{
++	css::uno::Reference< css::sheet::XSheetPageBreak > mxSheetPageBreak;
++
++public:
++	ScVbaVPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent, 
++					  const css::uno::Reference< css::uno::XComponentContext >& xContext,
++            		  css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( css::uno::RuntimeException );
++
++	virtual ~ScVbaVPageBreaks();
++
++	// XVPageBreaks 
++	virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
++
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException );
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw ( css::uno::RuntimeException );	
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& );
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
+ #endif
+Index: sc/source/ui/vba/vbahyperlink.hxx
+===================================================================
+--- sc/source/ui/vba/vbahyperlink.hxx	(revision 276159)
++++ sc/source/ui/vba/vbahyperlink.hxx	(revision 276288)
+@@ -40,7 +40,7 @@
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <ooo/vba/excel/XRange.hpp>
+ 
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ typedef InheritedHelperInterfaceImpl1< ov::excel::XHyperlink > HyperlinkImpl_BASE;
+ 
+Index: sc/source/ui/vba/vbafont.hxx
+===================================================================
+--- sc/source/ui/vba/vbafont.hxx	(revision 276159)
++++ sc/source/ui/vba/vbafont.hxx	(revision 276288)
+@@ -32,19 +32,19 @@
+ 
+ #include <cppuhelper/implbase1.hxx>
+ 
+-#include <ooo/vba/excel/XFont.hpp>
+ #include <com/sun/star/beans/XPropertySet.hpp>
+-#include "vbahelperinterface.hxx"
++#include <ooo/vba/excel/XFont.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbafontbase.hxx>
+ #include "vbapalette.hxx"
+ 
+ class ScTableSheetsObj;
+ class ScCellRangeObj;
+ 
+-typedef  InheritedHelperInterfaceImpl1< ov::excel::XFont > ScVbaFont_BASE;
++typedef cppu::ImplInheritanceHelper1< VbaFontBase, ov::excel::XFont > ScVbaFont_BASE;
+ 
+ class ScVbaFont : public ScVbaFont_BASE
+ {
+-    css::uno::Reference< css::beans::XPropertySet > mxFont;
+     ScVbaPalette mPalette;
+     ScCellRangeObj* mpRangeObj;
+     SfxItemSet*  GetDataSet();
+@@ -54,7 +54,6 @@ class ScVbaFont : public ScVbaFont_BASE
+ 
+ 	// Attributes
+     virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setSize( const css::uno::Any& _size ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getStandardFontSize() throw (css::uno::RuntimeException);
+     virtual void SAL_CALL setStandardFontSize( const css::uno::Any& _standardfontsize ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getStandardFont() throw (css::uno::RuntimeException);
+@@ -64,23 +63,17 @@ class ScVbaFont : public ScVbaFont_BASE
+     virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException);
+     virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setBold( const css::uno::Any& _bold ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException);
+     virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setStrikethrough( const css::uno::Any& _strikethrough ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setShadow( const css::uno::Any& _shadow ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setItalic( const css::uno::Any& _italic ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException);
+     virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException);
+     virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException);
+-    virtual void SAL_CALL setName( const css::uno::Any& _name ) throw (css::uno::RuntimeException);
+     virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException) ;
+-    virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException) ;
+     virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException) ;
+     virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException) ;
+     // XHelperInterface
+Index: sc/source/ui/vba/vbaassistant.hxx
+===================================================================
+--- sc/source/ui/vba/vbaassistant.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaassistant.hxx	(revision 276288)
+@@ -40,8 +40,8 @@
+ 
+ #include <sfx2/sfxhelp.hxx>
+ 
+-#include "vbahelper.hxx"
+-#include "vbahelperinterface.hxx"
++#include "excelvbahelper.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ typedef ::cppu::WeakImplHelper1< ov::XAssistant > Assistant;
+ typedef InheritedHelperInterfaceImpl< Assistant > ScVbaAssistantImpl_BASE;
+Index: sc/source/ui/vba/vbaname.cxx
+===================================================================
+--- sc/source/ui/vba/vbaname.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaname.cxx	(revision 276288)
+@@ -27,7 +27,7 @@
+  * for a copy of the LGPLv3 License.
+  *
+  ************************************************************************/
+-#include "helperdecl.hxx"
++#include <vbahelper/helperdecl.hxx>
+ 
+ #include <com/sun/star/table/XCellRange.hpp>
+ #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
+@@ -64,7 +64,8 @@ ScVbaName::~ScVbaName()
+ css::uno::Reference< ov::excel::XWorksheet >
+ ScVbaName::getWorkSheet() throw (css::uno::RuntimeException)
+ {
+-	return ScVbaGlobals::getGlobalsImpl( mxContext )->getActiveSheet();
++	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
++	return xApplication->getActiveSheet();
+ }
+ 
+ ::rtl::OUString
+@@ -234,7 +235,7 @@ ScVbaName::setRefersToR1C1Local( const ::rtl::OUSt
+ css::uno::Reference< ov::excel::XRange >
+ ScVbaName::getRefersToRange() throw (css::uno::RuntimeException)
+ {
+-    uno::Reference< ov::excel::XRange > xRange = ScVbaRange::getRangeObjectForName( mxContext, mxNamedRange->getName(), getDocShell( mxModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
++    uno::Reference< ov::excel::XRange > xRange = ScVbaRange::getRangeObjectForName( mxContext, mxNamedRange->getName(), excel::getDocShell( mxModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
+ 	return xRange;
+ }
+ 
+Index: sc/source/ui/vba/vbaworkbooks.cxx
+===================================================================
+--- sc/source/ui/vba/vbaworkbooks.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaworkbooks.cxx	(revision 276288)
+@@ -56,7 +56,7 @@
+ #include "vbaglobals.hxx"
+ #include "vbaworkbook.hxx"
+ #include "vbaworkbooks.hxx"
+-#include "vbahelper.hxx"
++#include <vbahelper/vbahelper.hxx>
+ 
+ #include <hash_map>
+ #include <osl/file.hxx>
+@@ -65,183 +65,36 @@ using namespace ::com::sun::star;
+ 
+ const sal_Int16 CUSTOM_CHAR = 5;
+ 
+-typedef  std::hash_map< rtl::OUString,
+-sal_Int32, ::rtl::OUStringHash,
+-::std::equal_to< ::rtl::OUString > > NameIndexHash;
+-
+-typedef std::vector < uno::Reference< sheet::XSpreadsheetDocument > > WorkBooks;
+-
+-typedef ::cppu::WeakImplHelper1< container::XEnumeration > SpreadSheetDocEnumImpl_BASE;
+-
+ static uno::Any
+-getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheetDocument > &xDoc )
++getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheetDocument > &xDoc, const uno::Any& aApplication )
+ {
+ 	// FIXME: fine as long as ScVbaWorkbook is stateless ...
+ 	uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY );
+ 	if( !xModel.is() )
+ 		return uno::Any();
+ 	
+-	ScVbaWorkbook *pWb = new ScVbaWorkbook(  uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext, xModel );
++	ScVbaWorkbook *pWb = new ScVbaWorkbook(  uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext, xModel );
+ 	return uno::Any( uno::Reference< excel::XWorkbook > (pWb) );
+ }
+ 
+-
+-// #FIXME clearly this is a candidate for some sort of helper base class as
+-// this is a copy of SelectedSheetsEnum ( vbawindow.cxx )
+-
+-class SpreadSheetDocEnumImpl : public SpreadSheetDocEnumImpl_BASE
+-{
+-	uno::Reference< uno::XComponentContext > m_xContext;
+-	WorkBooks m_books;
+-	WorkBooks::const_iterator m_it;
+-
+-public:
+-	SpreadSheetDocEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const WorkBooks& books ) throw ( uno::RuntimeException ) :  m_xContext( xContext ), m_books( books )
+-	{
+-		m_it = m_books.begin();
+-	}
+-	SpreadSheetDocEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) :  m_xContext( xContext )
+-	{
+-		uno::Reference< lang::XMultiComponentFactory > xSMgr(
+-			m_xContext->getServiceManager(), uno::UNO_QUERY_THROW );
+-
+-		uno::Reference< frame::XDesktop > xDesktop
+-			(xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), m_xContext), uno::UNO_QUERY_THROW );
+-		uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration();
+-		while( mxComponents->hasMoreElements() )
+-		{
+-			uno::Reference< sheet::XSpreadsheetDocument > xNext( mxComponents->nextElement(), uno::UNO_QUERY );
+-			if ( xNext.is() )
+-				m_books.push_back( xNext );
+-		}
+-		m_it = m_books.begin();
+-	}
+-	// XEnumeration
+-	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException) 
+-	{ 
+-		return m_it != m_books.end();
+-	}
+-
+-	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
+-	{ 
+-		if ( !hasMoreElements() )
+-		{
+-			throw container::NoSuchElementException();
+-		}
+-		return makeAny( *(m_it++) );
+-	}
+-};
+-
+ class WorkBookEnumImpl : public EnumerationHelperImpl
+ {
++	uno::Any m_aApplication;
+ public:
+-	WorkBookEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ){}
++	WorkBookEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), m_aApplication( aApplication ) {}
+ 
+ 	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
+ 	{ 
+ 		uno::Reference< sheet::XSpreadsheetDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
+-		return getWorkbook( m_xContext, xDoc );
++		return getWorkbook( m_xContext, xDoc, m_aApplication );
+ 	}
+ 
+ };
+ 
+-// #FIXME clearly this is also a candidate for some sort of helper base class as
+-// a very similar one is used in vbawindow ( SelectedSheetsEnumAccess )
+-// Maybe a template base class that does all of the operations on the hashmap
+-// and vector only, and the sub-class does everything else
+-// => ctor, createEnumeration & factory method need be defined ( to be called 
+-// by getByIndex, getByName )
+-typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess 
+-	, com::sun::star::container::XIndexAccess
+-	, com::sun::star::container::XNameAccess
+-	> WorkBooksAccessImpl_BASE;
+-
+-class WorkBooksAccessImpl : public WorkBooksAccessImpl_BASE
++ScVbaWorkbooks::ScVbaWorkbooks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext ) : ScVbaWorkbooks_BASE( xParent, xContext, VbaDocumentsBase::EXCEL_DOCUMENT )
+ {
+-	uno::Reference< uno::XComponentContext > m_xContext;
+-	WorkBooks m_books;
+-	NameIndexHash namesToIndices;
+-public:	
+-	WorkBooksAccessImpl( const uno::Reference< uno::XComponentContext >& xContext ):m_xContext( xContext )
+-	{
+-		uno::Reference< container::XEnumeration > xEnum = new SpreadSheetDocEnumImpl( m_xContext );
+-		sal_Int32 nIndex=0;
+-		while( xEnum->hasMoreElements() )
+-		{
+-			uno::Reference< sheet::XSpreadsheetDocument > xNext( xEnum->nextElement(), uno::UNO_QUERY );
+-			if ( xNext.is() )
+-			{
+-				m_books.push_back( xNext );
+-				uno::Reference< frame::XModel > xModel( xNext, uno::UNO_QUERY_THROW ); // that the spreadsheetdocument is a xmodel is a given
+-				INetURLObject aURL( xModel->getURL() );
+-				namesToIndices[ aURL.GetLastName() ] = nIndex++;
+ 			}
+-		}
+-			
+-	}
+-	
+ 	//XEnumerationAccess
+-	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
+-	{
+-		return new SpreadSheetDocEnumImpl( m_xContext, m_books ); 
+-	}
+-	// XIndexAccess
+-	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException) 
+-	{ 
+-		return m_books.size();
+-	}
+-	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) 
+-	{ 
+-		if ( Index < 0 
+-			|| static_cast< WorkBooks::size_type >(Index) >= m_books.size() ) 
+-			throw lang::IndexOutOfBoundsException();
+-		return makeAny( m_books[ Index ] ); // returns xspreadsheetdoc
+-	}
+-
+-	//XElementAccess
+-	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
+-	{ 
+-		return sheet::XSpreadsheetDocument::static_type(0); 
+-	}
+-
+-	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) 
+-	{ 
+-		return (m_books.size() > 0);
+-	}
+-
+-	//XNameAccess
+-	virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
+-	{ 
+-		NameIndexHash::const_iterator it = namesToIndices.find( aName );
+-		if ( it == namesToIndices.end() )
+-			throw container::NoSuchElementException();
+-		return makeAny( m_books[ it->second ] );
+-		
+-	}
+-
+-	virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException) 
+-	{ 
+-		uno::Sequence< ::rtl::OUString > names( namesToIndices.size() );
+-		::rtl::OUString* pString = names.getArray();
+-		NameIndexHash::const_iterator it = namesToIndices.begin();
+-		NameIndexHash::const_iterator it_end = namesToIndices.end();
+-		for ( ; it != it_end; ++it, ++pString )
+-			*pString = it->first;	
+-		return names;	
+-	}
+-
+-	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) 
+-	{ 
+-		NameIndexHash::const_iterator it = namesToIndices.find( aName );
+-		return (it != namesToIndices.end());
+-	}
+-
+-};
+-
+-ScVbaWorkbooks::ScVbaWorkbooks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext ) : ScVbaWorkbooks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new WorkBooksAccessImpl( xContext ) ) )
+-{
+-}
+-// XEnumerationAccess
+ uno::Type
+ ScVbaWorkbooks::getElementType() throw (uno::RuntimeException)
+ {
+@@ -254,46 +107,32 @@ ScVbaWorkbooks::createEnumeration() throw (uno::Ru
+ 	// the state of this object ( although it should ) would be 
+ 	// safer to create an enumeration based on this objects state
+ 	// rather than one effectively based of the desktop component
+-	return new WorkBookEnumImpl( mxContext, uno::Reference< container::XEnumeration >( new SpreadSheetDocEnumImpl(mxContext) ) );
++    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
++	return new WorkBookEnumImpl( mxContext, xEnumerationAccess->createEnumeration(), Application() );
+ }
+ 
+ uno::Any
+ ScVbaWorkbooks::createCollectionObject( const css::uno::Any& aSource )
+ {
+-	uno::Reference< sheet::XSpreadsheetDocument > xDoc( aSource, uno::UNO_QUERY );
+-	return getWorkbook( mxContext, xDoc );
++	uno::Reference< sheet::XSpreadsheetDocument > xDoc( aSource, uno::UNO_QUERY_THROW );
++	return getWorkbook( mxContext, xDoc, Application() );
+ }
+ 
+ 
+ uno::Any SAL_CALL
+ ScVbaWorkbooks::Add() throw (uno::RuntimeException)
+ {
+-	uno::Reference< lang::XMultiComponentFactory > xSMgr(
+-        mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
++    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( VbaDocumentsBase::Add() , uno::UNO_QUERY_THROW );
+ 
+-	 uno::Reference< frame::XComponentLoader > xLoader(
+-        xSMgr->createInstanceWithContext(
+-            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),
+-                mxContext), uno::UNO_QUERY_THROW );
+-	uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL(
+-									   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc") ),
+-									   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, 
+-									   uno::Sequence< beans::PropertyValue >(0) );			   
+-    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW );
+-                                                                                                                             
+     if( xSpreadDoc.is() )
+-        return getWorkbook( mxContext, xSpreadDoc );
++        return getWorkbook( mxContext, xSpreadDoc, Application() );
+     return uno::Any();
+ }
+ 
+ void
+ ScVbaWorkbooks::Close() throw (uno::RuntimeException)
+ {
+-	uno::Reference< lang::XMultiComponentFactory > xSMgr(
+-		mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
+-	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+-	rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseDoc"));
+-	dispatchRequests(xModel,url);
++    VbaDocumentsBase::Close();
+ }
+ 
+ bool 
+@@ -345,16 +184,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileNa
+ 		aURL = rFileName;
+ 	else
+ 		osl::FileBase::getFileURLFromSystemPath( rFileName, aURL );
+-	uno::Reference< lang::XMultiComponentFactory > xSMgr(
+-		mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
+-	uno::Reference< frame::XDesktop > xDesktop
+-		(xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")                    , mxContext),
+-		uno::UNO_QUERY_THROW );
+-	uno::Reference< frame::XComponentLoader > xLoader(
+-		xSMgr->createInstanceWithContext(
+-		::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),
+-		mxContext),
+-		uno::UNO_QUERY_THROW );
++
+ 	uno::Sequence< beans::PropertyValue > sProps(0);
+ 	sal_Int32 nIndex = 0;
+ 	
+@@ -421,24 +251,8 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileNa
+ 	else if ( !isSpreadSheetFile( sType ) )
+ 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Bad Format")), uno::Reference< uno::XInterface >() );
+ 	
+-	if ( ReadOnly.hasValue()  )
+-	{
+-		sal_Bool bIsReadOnly = sal_False; ReadOnly >>= bIsReadOnly;
+-		if ( bIsReadOnly )
+-		{
+-			static const rtl::OUString sReadOnly( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
+-			sProps.realloc( sProps.getLength() + 1 );
+-			sProps[ nIndex ].Name = sReadOnly;
+-			sProps[ nIndex++ ].Value = uno::makeAny( (sal_Bool)sal_True );
+-		}
+-	}
+-
+-	uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL( aURL,
+-		rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_default") ),
+-		frame::FrameSearchFlag::CREATE,
+-		sProps);
+-	uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW );
+-	uno::Any aRet = getWorkbook( mxContext, xSpreadDoc );
++	uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( VbaDocumentsBase::Open( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW );
++	uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, Application() );
+ 	uno::Reference< excel::XWorkbook > xWBook( aRet, uno::UNO_QUERY );
+ 	if ( xWBook.is() )
+ 		xWBook->Activate();
+Index: sc/source/ui/vba/vbamenubars.hxx
+===================================================================
+--- sc/source/ui/vba/vbamenubars.hxx	(revision 0)
++++ sc/source/ui/vba/vbamenubars.hxx	(revision 276288)
+@@ -0,0 +1,69 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_MENUBARS_HXX
++#define SC_VBA_MENUBARS_HXX
++
++#include <ooo/vba/excel/XMenuBars.hpp>
++#include <ooo/vba/excel/XMenuBar.hpp>
++#include <ooo/vba/XCommandBars.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
++#include <cppuhelper/implbase1.hxx>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbacollectionimpl.hxx>
++
++typedef CollTestImplHelper< ov::excel::XMenuBars > MenuBars_BASE;
++
++class ScVbaMenuBars : public MenuBars_BASE
++{
++private:
++    css::uno::Reference< ov::XCommandBars > m_xCommandBars;
++
++public:
++    ScVbaMenuBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBars >& xCommandBars ) throw (css::uno::RuntimeException);
++    virtual ~ScVbaMenuBars();
++
++    // XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++
++    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException);
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif//SC_VBA_MENUBARS_HXX
+Index: sc/source/ui/vba/vbamenuitem.cxx
+===================================================================
+--- sc/source/ui/vba/vbamenuitem.cxx	(revision 0)
++++ sc/source/ui/vba/vbamenuitem.cxx	(revision 276288)
+@@ -0,0 +1,90 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbamenuitem.hxx" 
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++ScVbaMenuItem::ScVbaMenuItem( const uno::Reference< ov::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBarControl >& xCommandBarControl ) throw( uno::RuntimeException ) : MenuItem_BASE( xParent, xContext ), m_xCommandBarControl( xCommandBarControl )
++{
++}
++
++::rtl::OUString SAL_CALL
++ScVbaMenuItem::getCaption() throw ( uno::RuntimeException )
++{
++    return m_xCommandBarControl->getCaption();
++}
++
++void SAL_CALL
++ScVbaMenuItem::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
++{
++    m_xCommandBarControl->setCaption( _caption );
++}
++
++::rtl::OUString SAL_CALL
++ScVbaMenuItem::getOnAction() throw ( uno::RuntimeException )
++{
++    return m_xCommandBarControl->getOnAction();
++}
++
++void SAL_CALL
++ScVbaMenuItem::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException)
++{
++    m_xCommandBarControl->setOnAction( _onaction );
++}
++
++void SAL_CALL
++ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    m_xCommandBarControl->Delete();
++}
++
++rtl::OUString& 
++ScVbaMenuItem::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItem") );
++	return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++ScVbaMenuItem::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuItem" ) );
++	}
++	return aServiceNames;
++}
+Index: sc/source/ui/vba/vbadialogs.hxx
+===================================================================
+--- sc/source/ui/vba/vbadialogs.hxx	(revision 276159)
++++ sc/source/ui/vba/vbadialogs.hxx	(revision 276288)
+@@ -30,26 +30,24 @@
+ #ifndef SC_VBA_DIALOGS_HXX
+ #define SC_VBA_DIALOGS_HXX
+ 
+-#include <cppuhelper/implbase1.hxx>
+-
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #include <ooo/vba/excel/XDialogs.hpp>
+ #include <ooo/vba/XCollection.hpp>
+-#include "vbahelperinterface.hxx" 
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbadialogsbase.hxx>
++#include <cppuhelper/implbase1.hxx>
+ 
+-class ScModelObj;
++typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::excel::XDialogs > ScVbaDialogs_BASE;
+ 
+-typedef InheritedHelperInterfaceImpl1< ov::excel::XDialogs > ScVbaDialogs_BASE;
+-
+ class ScVbaDialogs : public ScVbaDialogs_BASE
+ {
+ public:
+-	ScVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext ): ScVbaDialogs_BASE( xParent, xContext ) {} 
++	ScVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): ScVbaDialogs_BASE( xParent, xContext, xModel ) {} 
+ 	virtual ~ScVbaDialogs() {}
+ 
+ 	// XCollection
+-	virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
++	virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); //liuchen 2009-7-27
+ 
+ 	// XDialogs
+ 	virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException);
+Index: sc/source/ui/vba/vbaglobals.hxx
+===================================================================
+--- sc/source/ui/vba/vbaglobals.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaglobals.hxx	(revision 276288)
+@@ -33,43 +33,67 @@
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ #include <com/sun/star/lang/XInitialization.hpp>
+ #include <com/sun/star/uno/XComponentContext.hpp>
+-#include <ooo/vba/XGlobals.hpp>
++#include <ooo/vba/excel/XGlobals.hpp>
++#include <ooo/vba/excel/XApplication.hpp>
+ 
+ #include <cppuhelper/implbase1.hxx>
+-#include "vbahelper.hxx"
++#include "excelvbahelper.hxx"
+ 
++#include <vbahelper/vbaglobalbase.hxx>
+     // =============================================================================
+     // class ScVbaGlobals
+     // =============================================================================
+ 
+-    typedef ::cppu::WeakImplHelper1<    
+- ov::XGlobals > ScVbaGlobals_BASE;
++typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE;
+ 
+-
+     class ScVbaGlobals : public ScVbaGlobals_BASE
+     {
+-    private:
+-            css::uno::Reference< css::uno::XComponentContext > m_xContext;
+             css::uno::Reference< ov::excel::XApplication > mxApplication;
++        virtual css::uno::Reference<
++ ov::excel::XApplication > SAL_CALL getApplication()
++                        throw (css::uno::RuntimeException);
+     public:
+ 	
+-        ScVbaGlobals(
++        ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs,
+             css::uno::Reference< css::uno::XComponentContext >const& rxContext );
++        //ScVbaGlobals(
++        //    css::uno::Reference< css::uno::XComponentContext >const& rxContext,  );
+         virtual ~ScVbaGlobals();
+ 
+-		static 	css::uno::Reference< ov::XGlobals > getGlobalsImpl(const css::uno::Reference< css::uno::XComponentContext >& ) throw (css::uno::RuntimeException);
+-
+         // XGlobals
+-        virtual css::uno::Reference<
+- ov::excel::XApplication > SAL_CALL getApplication()
+-                        throw (css::uno::RuntimeException);
+         virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException);
++        virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
+         virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL Calculate(  ) throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException);
++
++	virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException);
++        virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException);
++
+         virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+         virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL WorksheetFunction(  ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+-	virtual css::uno::Sequence< css::uno::Any > SAL_CALL getGlobals(  ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+ 	virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException );
++	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++
++    virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++
++
++
++    // XMultiServiceFactory
++    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException);
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+     };
+ #endif // 
+Index: sc/source/ui/vba/vbavalidation.hxx
+===================================================================
+--- sc/source/ui/vba/vbavalidation.hxx	(revision 276159)
++++ sc/source/ui/vba/vbavalidation.hxx	(revision 276288)
+@@ -33,7 +33,7 @@
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #include <ooo/vba/excel/XValidation.hpp>
+ #include <com/sun/star/table/XCellRange.hpp>
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ typedef InheritedHelperInterfaceImpl1<ov::excel::XValidation > ValidationImpl_BASE;
+ 
+Index: sc/source/ui/vba/vbamenu.hxx
+===================================================================
+--- sc/source/ui/vba/vbamenu.hxx	(revision 0)
++++ sc/source/ui/vba/vbamenu.hxx	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_MENU_HXX
++#define SC_VBA_MENU_HXX
++
++#include <ooo/vba/excel/XMenu.hpp>
++#include <ooo/vba/XCommandBarControl.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ov::excel::XMenu > Menu_BASE;
++
++class ScVbaMenu : public Menu_BASE
++{
++private:
++    css::uno::Reference< ov::XCommandBarControl > m_xCommandBarControl;
++
++public:
++    ScVbaMenu( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException );
++    
++    virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException);
++
++    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif//SC_VBA_MENU_HXX
+Index: sc/source/ui/vba/vbaworksheet.cxx
+===================================================================
+--- sc/source/ui/vba/vbaworksheet.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaworksheet.cxx	(revision 276288)
+@@ -27,11 +27,12 @@
+  * for a copy of the LGPLv3 License.
+  *
+  ************************************************************************/
+-#include "helperdecl.hxx"
++#include <vbahelper/helperdecl.hxx>
+ #include <cppuhelper/queryinterface.hxx>
+ 
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <com/sun/star/beans/XIntrospectionAccess.hpp>
++#include <com/sun/star/beans/XIntrospection.hpp>
+ #include <com/sun/star/container/XNamed.hpp>
+ #include <com/sun/star/util/XProtectable.hpp>
+ #include <com/sun/star/table/XCellRange.hpp>
+@@ -58,6 +59,8 @@
+ #include <com/sun/star/drawing/XControlShape.hpp>
+ #include <com/sun/star/form/FormComponentType.hpp>
+ #include <com/sun/star/form/XFormsSupplier.hpp>
++#include <ooo/vba/excel/XlEnableSelection.hpp>
++#include <ooo/vba/XControlProvider.hpp>
+ 
+ #include <comphelper/processfactory.hxx>
+ 
+@@ -74,7 +77,9 @@
+ 
+ #include "cellsuno.hxx"
+ #include "drwlayer.hxx"
+-
++#ifdef CWSSCSHEETPROTECTION
++#include "tabprotection.hxx"
++#endif
+ #include "scextopt.hxx"
+ #include "vbaoutline.hxx"
+ #include "vbarange.hxx"
+@@ -82,10 +87,9 @@
+ #include "vbaworksheet.hxx"
+ #include "vbachartobjects.hxx"
+ #include "vbapivottables.hxx"
+-#include "vbacombobox.hxx"
+ #include "vbaoleobject.hxx"
+ #include "vbaoleobjects.hxx"
+-#include "vbashapes.hxx"
++#include <vbahelper/vbashapes.hxx>
+ #include "vbapagesetup.hxx"
+ #include "vbapagebreaks.hxx"
+ 
+@@ -94,7 +98,7 @@
+ #define DOESNOTEXIST -1
+ using namespace com::sun::star;
+ using namespace ooo::vba;
+-static bool
++bool
+ nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, ::rtl::OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException )
+ {
+ 	if (!xSpreadDoc.is())
+@@ -257,6 +261,83 @@ ScVbaWorksheet::getIndex() throw (uno::RuntimeExce
+ 	return getSheetID() + 1;
+ }
+ 
++sal_Int32
++ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException)
++{
++    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
++    SCTAB nTab = 0;
++    rtl::OUString aSheetName = getName();
++    bool bSheetExists = nameExists (xSpreadDoc, aSheetName, nTab);
++    if ( bSheetExists )
++    {
++        uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
++        ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
++        ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
++		sal_Bool bLockedCells = sal_False;
++		sal_Bool bUnlockedCells = sal_False;
++		if( pProtect )
++		{
++        	bLockedCells   = pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS);
++        	bUnlockedCells = pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);
++		}
++        if( bLockedCells )
++            return excel::XlEnableSelection::xlNoRestrictions;
++        if( bUnlockedCells )
++            return excel::XlEnableSelection::xlUnlockedCells;
++        return excel::XlEnableSelection::xlNoSelection;    
++    }
++    else
++		throw uno::RuntimeException(::rtl::OUString(
++                                RTL_CONSTASCII_USTRINGPARAM( "Sheet Name does not exist. ") ),
++                                uno::Reference< XInterface >() );
++    return excel::XlEnableSelection::xlNoSelection;
++}    
++
++
++void
++ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeException)
++{
++    if( (nSelection != excel::XlEnableSelection::xlNoRestrictions) &&
++        (nSelection != excel::XlEnableSelection::xlUnlockedCells) &&
++        (nSelection != excel::XlEnableSelection::xlNoSelection) )
++    {
++        DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
++    }
++
++    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
++    SCTAB nTab = 0;
++    rtl::OUString aSheetName = getName();
++    bool bSheetExists = nameExists (xSpreadDoc, aSheetName, nTab);
++    if ( bSheetExists )
++    {
++        uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
++        ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
++        ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
++        // default is xlNoSelection
++        sal_Bool bLockedCells = sal_False;
++        sal_Bool bUnlockedCells = sal_False;
++        if( nSelection == excel::XlEnableSelection::xlNoRestrictions )
++        {
++            bLockedCells = sal_True;
++            bUnlockedCells = sal_True;
++        }
++        else if( nSelection == excel::XlEnableSelection::xlUnlockedCells )
++        {
++            bUnlockedCells = sal_True;
++        }
++		if( pProtect )
++		{
++        	pProtect->setOption( ScTableProtection::SELECT_LOCKED_CELLS, bLockedCells );
++        	pProtect->setOption( ScTableProtection::SELECT_UNLOCKED_CELLS, bUnlockedCells );
++		}	
++    }
++    else
++		throw uno::RuntimeException(::rtl::OUString(
++                                RTL_CONSTASCII_USTRINGPARAM( "Sheet Name does not exist. ") ),
++                                uno::Reference< XInterface >() );
++
++}
++
+ uno::Reference< excel::XRange > 
+ ScVbaWorksheet::getUsedRange() throw (uno::RuntimeException)
+ {
+@@ -292,6 +373,16 @@ ScVbaWorksheet::HPageBreaks( const uno::Any& aInde
+    return uno::makeAny( xHPageBreaks );
+ }
+ 
++uno::Any
++ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex ) throw ( uno::RuntimeException )
++{
++	uno::Reference< sheet::XSheetPageBreak > xSheetPageBreak( getSheet(), uno::UNO_QUERY_THROW );
++	uno::Reference< excel::XVPageBreaks > xVPageBreaks( new ScVbaVPageBreaks( this, mxContext, xSheetPageBreak ) ); 
++	if( aIndex.hasValue() )
++		return xVPageBreaks->Item( aIndex, uno::Any()); 
++	return uno::makeAny( xVPageBreaks );
++}
++
+ sal_Int32 
+ ScVbaWorksheet::getStandardWidth() throw (uno::RuntimeException)
+ {
+@@ -320,6 +411,22 @@ ScVbaWorksheet::getProtectContents()throw (uno::Ru
+ sal_Bool 
+ ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException) 
+ {
++#ifdef CWSSCSHEETPROTECTION
++	SCTAB nTab = 0;
++	rtl::OUString aSheetName = getName();
++	uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
++	bool bSheetExists = nameExists (xSpreadDoc, aSheetName, nTab);
++	if ( bSheetExists )
++	{
++		uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
++		ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
++		ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
++		if ( pProtect )
++			return pProtect->getOption( ScTableProtection::OBJECTS ); 
++        }
++#else
++	return getProtectContents(); // fallback
++#endif 
+ 	return false;
+ }
+ 
+@@ -353,11 +460,11 @@ ScVbaWorksheet::Move( const uno::Any& Before, cons
+ 		uno::Reference<excel::XRange> xRange =  new ScVbaRange( this, mxContext, xRange1);
+ 		if (xRange.is())
+ 			xRange->Select();
+-		implnCopy();
++		excel::implnCopy(mxModel);
+ 		uno::Reference<frame::XModel> xModel = openNewDoc(aCurrSheetName);
+ 		if (xModel.is()) 
+ 		{
+-			implnPaste();
++			excel::implnPaste(xModel);
+ 			Delete();
+ 		}
+ 		return ;
+@@ -391,11 +498,11 @@ ScVbaWorksheet::Copy( const uno::Any& Before, cons
+ 		uno::Reference<excel::XRange> xRange =  new ScVbaRange( this, mxContext, xRange1);
+ 		if (xRange.is())
+ 			xRange->Select();
+-		implnCopy();
++		excel::implnCopy(mxModel);
+ 		uno::Reference<frame::XModel> xModel = openNewDoc(aCurrSheetName);
+ 		if (xModel.is())
+ 		{
+-			implnPaste();
++			excel::implnPaste(xModel);
+ 		}
+ 		return;
+ 	}
+@@ -424,7 +531,7 @@ ScVbaWorksheet::Paste( const uno::Any& Destination
+ 	uno::Reference<excel::XRange> xRange( Destination, uno::UNO_QUERY );
+ 	if ( xRange.is() )
+ 		xRange->Select();
+-	implnPaste();
++	excel::implnPaste( mxModel );
+ }
+ 
+ void 
+@@ -468,14 +575,26 @@ ScVbaWorksheet::getSheetAtOffset(SCTAB offset) thr
+ uno::Reference< excel::XWorksheet >
+ ScVbaWorksheet::getNext() throw (uno::RuntimeException)
+ {
++	//VBA, minz@cn.ibm.com. catch the exception for index out of bound
++	try{
+ 	return getSheetAtOffset(static_cast<SCTAB>(1));
++	}catch( lang::IndexOutOfBoundsException& /*e*/ )
++	{
++		return NULL;
+ }
++}
+ 
+ uno::Reference< excel::XWorksheet >
+ ScVbaWorksheet::getPrevious() throw (uno::RuntimeException)
+ {
++	//VBA, minz@cn.ibm.com. catch the exception for index out of bound
++	try{
+ 	return getSheetAtOffset(-1);
++	}catch( lang::IndexOutOfBoundsException& /*e*/ )
++	{
++		return NULL;
+ }
++}
+ 
+ 
+ void
+@@ -558,7 +677,7 @@ ScVbaWorksheet::ChartObjects( const uno::Any& Inde
+ 		uno::Reference< table::XTableChartsSupplier > xChartSupplier( getSheet(), uno::UNO_QUERY_THROW );
+ 		uno::Reference< table::XTableCharts > xTableCharts = xChartSupplier->getCharts();
+ 		
+-		uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxSheet, uno::UNO_QUERY_THROW );
++		uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( getSheet(), uno::UNO_QUERY_THROW ); //VBA, minz@cn.ibm.com.
+ 		mxCharts = new ScVbaChartObjects(  this, mxContext, xTableCharts, xDrawPageSupplier );
+ 	}
+ 	if ( Index.hasValue() )
+@@ -624,7 +743,7 @@ ScVbaWorksheet::Shapes( const uno::Any& aIndex ) t
+     uno::Reference< drawing::XShapes > xShapes( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
+     uno::Reference< container::XIndexAccess > xIndexAccess( xShapes, uno::UNO_QUERY_THROW );
+ 
+-   uno::Reference< msforms::XShapes> xVbaShapes( new ScVbaShapes( this, mxContext, xIndexAccess ) );
++   uno::Reference< msforms::XShapes> xVbaShapes( new ScVbaShapes( this, mxContext, xIndexAccess, getModel() ) );
+    if ( aIndex.hasValue() )
+       return xVbaShapes->Item( aIndex, uno::Any() ); 
+    return uno::makeAny( xVbaShapes );
+@@ -635,7 +754,7 @@ ScVbaWorksheet::ShowDataForm( ) throw (uno::Runtim
+ {
+ #ifdef VBA_OOBUILD_HACK 
+ 	uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
+-	ScTabViewShell* pTabViewShell = getBestViewShell( xModel );
++	ScTabViewShell* pTabViewShell = excel::getBestViewShell( xModel );
+ 
+ 	ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
+ 	DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+@@ -676,16 +795,18 @@ ScVbaWorksheet::invoke( const ::rtl::OUString& aFu
+ }
+ 
+ void SAL_CALL 
+-ScVbaWorksheet::setValue( const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
++ScVbaWorksheet::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
+ {
+-	throw uno::RuntimeException(); // unsupported operation
++    setDefaultPropByIntrospection( uno::makeAny( getValue( aPropertyName ) ), aValue );
+ }
+ uno::Any SAL_CALL 
+ ScVbaWorksheet::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
+ {
+     uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW );
+-    ScVbaControlFactory controlFactory( mxContext, xControlShape, getModel() );
+-    uno::Reference< msforms::XControl > xControl( controlFactory.createControl( getModel() ) );
++    
++    uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
++    uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
++    uno::Reference< msforms::XControl > xControl( xControlProvider->createControl(  xControlShape, getModel() ) );
+ 	return uno::makeAny( xControl );
+ }
+ 
+@@ -794,7 +915,7 @@ ScVbaWorksheet::getServiceNames()
+ rtl::OUString SAL_CALL
+ ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException)
+ {
+-#ifdef VBA_OOBUILD_HACK 
++#if 0
+     uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
+     SCTAB nTab = 0;
+     rtl::OUString aSheetName = getName();
+@@ -815,7 +936,7 @@ ScVbaWorksheet::getCodeName() throw (css::uno::Run
+ 	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+ #endif
+ }
+-#ifdef VBA_OOBUILD_HACK 
++#if 0
+ void SAL_CALL
+ ScVbaWorksheet::setCodeName( const rtl::OUString& sCodeName ) throw (css::uno::RuntimeException)
+ {
+@@ -845,7 +966,7 @@ ScVbaWorksheet::setCodeName( const rtl::OUString&
+ sal_Int16
+ ScVbaWorksheet::getSheetID() throw (uno::RuntimeException)
+ {
+-	uno::Reference< sheet::XCellRangeAddressable > xAddressable( mxSheet, uno::UNO_QUERY_THROW );
++	uno::Reference< sheet::XCellRangeAddressable > xAddressable( getSheet(), uno::UNO_QUERY_THROW ); //VBA. minz@cn.ibm.com. if ActiveSheet, mxSheet is null.
+ 	return xAddressable->getRangeAddress().Sheet;
+ }
+ 
+@@ -869,10 +990,9 @@ ScVbaWorksheet::PrintOut( const uno::Any& From, co
+ 		bSelection = sal_True;
+ 
+     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );  
+-	PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, xModel, bSelection );
++	PrintOutHelper( excel::getBestViewShell( xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, bSelection );
+ }
+ 
+-
+ namespace worksheet
+ {
+ namespace sdecl = comphelper::service_decl;
+Index: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: sc/source/ui/vba/testvba/TestDocuments/TestUnion.xls
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/TestUnion.xls
+___________________________________________________________________
+Added: svn:mime-type
+   + application/octet-stream
+
+Index: sc/source/ui/vba/testvba/TestDocuments/CalcFont.xls
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/CalcFont.xls
+___________________________________________________________________
+Added: svn:mime-type
+   + application/octet-stream
+
+Index: sc/source/ui/vba/testvba/TestDocuments/window2.xls
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: sc/source/ui/vba/testvba/TestDocuments/MiscOperatorTests.xls
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/MiscOperatorTests.xls
+___________________________________________________________________
+Added: svn:mime-type
+   + application/octet-stream
+
+Index: sc/source/ui/vba/testvba/TestDocuments/pagesetup.xls
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/pagesetup.xls
+___________________________________________________________________
+Added: svn:mime-type
+   + application/octet-stream
+
+Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/VariantTest.log
+===================================================================
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/VariantTest.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/VariantTest.log	(revision 276288)
+@@ -0,0 +1,47 @@
++Test run started : 24/09/2008 10:58:18
++----------------------------------------------------------------
++TestAddress
++ TEST START : TestAddress
++  ITEM Assertion OK : test1: res = (aboo = '')
++  ITEM Assertion OK : test 2: res = (aboo = 'fiddlesticks')
++  ITEM Assertion OK : test 3: res = ('' = aboo)
++  ITEM Assertion OK : test 4: res = ('fiddlesticks' = aboo )
++  ITEM Assertion OK : test 5: res = (testString = '')
++  ITEM Assertion OK : test 6: res = (testString = 'fiddlesticks')
++  ITEM Assertion OK : test 7: res = ('' = testString)
++  ITEM Assertion OK : test 8: res = ('fiddlesticks' = testString )
++  ITEM Assertion OK : test 9: res = ( aboo < " )
++  ITEM Assertion OK : test 10: res = ( testString < " )
++  ITEM Assertion OK : test 11: res = ( aboo > " )
++  ITEM Assertion OK : test 12: res = ( testString > " )
++  ITEM Assertion OK : test 13: res = ( aboo <> '' )
++  ITEM Assertion OK : test 14: res = ( testString <> '' )
++  ITEM Assertion OK : test 15: res = (aboo = something/14)
++  ITEM Assertion OK : test 16: res = something + 'string'
++  ITEM Assertion OK : test 17: res = something & 'string'
++  ITEM Assertion OK : test 18: res =  something MOD 10 )
++  ITEM Assertion OK : test 19: res =  something AND 1 )
++  ITEM Assertion OK : test 20: res =  something AND 0 )
++  ITEM Assertion OK : test 21: res =  something OR 12)
++  ITEM Assertion OK : test 22: res =  something OR 0 )
++  ITEM Assertion OK : test 23: res =  something XOR 0 )
++  ITEM Assertion OK : test 24: res =  something XOR 1 )
++  ITEM Assertion OK : test 25: res =  something EQV 0 )
++  ITEM Assertion OK : test 26: res =  something EQV 1 )
++  ITEM Assertion OK : test 27: res =  something IMP 0 )
++  ITEM Assertion OK : test 28: res =  something IMP 1 )
++  ITEM Assertion OK : test 29: res =  something IMP 14 )
++  ITEM Assertion OK : test 30: res =  NOT something )
++  ITEM Assertion OK : test 31: res = something + 12 )
++  ITEM Assertion OK : test 32: res = something - 12 )
++  ITEM Assertion OK : test 33: res = -something )
++  ITEM Assertion OK : test 34: res = something * 12 )
++Test Results
++============
++
++Tests passed: 34
++Tests failed: 0
++
++END 'TestAddress
++ TEST OK : TestAddress
++Test run finished : 24/09/2008 10:58:20
+Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestIntersection.log
+===================================================================
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestIntersection.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestIntersection.log	(revision 276288)
+@@ -0,0 +1,26 @@
++Test run started : 13/01/2009 14:31:43
++----------------------------------------------------------------
++TestIntersection
++ TEST START : TestIntersection
++  ITEM Assertion OK : test1 Application.Intersect( Range('A2:D10'), Range('C4:E6'))
++  ITEM Assertion OK : test2 Application.Intersect( Range('A2:D10'), Range('A4:G10'))
++  ITEM Assertion OK : test3 Application.Intersect( Range('A2:c8,d2:f8,g2:i8'), Range('A4:G10'))
++  ITEM Assertion OK : test4 Application.Intersect( Range('A4:G10'), Range('A2:c8,d2:f8,g2:i8'))
++  ITEM Assertion OK : test5 Application.Intersect( Range('A2:c8,d2:f8,g2:i8'), Range('g4:i10,A4:G10'))
++  ITEM Assertion OK : test6 Application.Intersect( Range('g4:i10,A4:G10'), Range('A2:c8,d2:f8,g2:i8'))
++  ITEM Assertion OK : test7 Application.Intersect( Range('a2:d10,b5:e10'), Range('a5:i10'))
++  ITEM Assertion OK : test8 Application.Intersect( Range('a2:c8,d2:f8'), Range('b6:e9,a6:f9'))
++  ITEM Assertion OK : test9 Application.Intersect( Range('a2:c8,e2:f8'), Range('b6:e9,a6:f9'))
++  ITEM Assertion OK : test10 Application.Intersect( Range('a1:a3,c1:c3'), Range('a2:c3'))
++  ITEM Assertion OK : test11 Application.Intersect( Range('a1:a3,b1:b3'), Range('a2:c3'))
++  ITEM Assertion OK : test12 Application.Intersect( Range('a2:d5,b3:f7,c1:g4'), Range('b2:e6'))
++  ITEM Assertion OK : test13 Range(" a2:d10,b5:e10,g13:j32 "), Range(" a5:i10,b6:e9 "), Range("b2:r5,f10:h19")
++Test Results
++============
++
++Tests passed: 13
++Tests failed: 0
++
++END 'TestIntersection
++ TEST OK : TestIntersection
++Test run finished : 13/01/2009 14:31:43
+Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log
+===================================================================
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log	(revision 276159)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log	(revision 276288)
+@@ -1,4 +1,4 @@
+-Test run started : 17/12/2008 13:53:49
++Test run started : 09/05/2008 10:21:46 AM
+ BEGIN Replace
+  TEST START : Test Replace function
+   ITEM Assertion OK : common string:aefefdBc
+@@ -11,4 +11,4 @@ BEGIN Replace
+   ITEM Assertion OK : start = 1, count = 0, not support in Unix: abcbcdBc
+  TEST OK : Test Replace function
+ END  Replace
+-Test run finished : 17/12/2008 13:53:49
++Test run finished : 09/05/2008 10:21:47 AM
+Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log
+===================================================================
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log	(revision 276159)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log	(revision 276288)
+@@ -1,4 +1,4 @@
+-Test run started : 17/12/2008 14:18:34
++Test run started : 10/03/2008 15:15:11
+ ----------------------------------------------------------------
+ ApplicationMethods
+  TEST START : ApplicationMethods
+@@ -7,8 +7,8 @@ ApplicationMethods
+   ITEM Assertion OK :  Address of Application.Rows is: $1:$1
+   ITEM Assertion OK :  Address of Application.Range is: $1:$1,$5:$7
+   ITEM Assertion OK :  Please check manually: DefaultFilePath is: /data4/home/npower/Documents
+-  ITEM Assertion OK :  Please check manually: Library Path is: /media/disk/BUILD-related/CWS/my_working_copy/INSTALL_FOR_TEST/opt/UserInstallation/user/basic
+-  ITEM Assertion OK :  Please check manually: Template Path is: /media/disk/BUILD-related/CWS/my_working_copy/INSTALL_FOR_TEST/opt/UserInstallation/user/template
++  ITEM Assertion OK :  Please check manually: Library Path is: /data4/home/npower/.ooo-2.0/user/basic
++  ITEM Assertion OK :  Please check manually: Template Path is: /data4/home/npower/.ooo-2.0/user/template
+   ITEM Assertion OK :  FileSeparator is /
+   ITEM Assertion OK :  Name of ActiveWorkbook is: Ranges.xls
+ END 'ApplicationMethods' Symbol
+@@ -111,8 +111,8 @@ END 'Value-Issue' Symbol
+ ----------------------------------------------------------------
+ AutoFit issue
+  TEST START : AutoFit issue
+-  ITEM Assertion OK :  Columns.AutoFit: CurrentWidth is 679
+-  ITEM Assertion OK :  Rows.AutoFit: CurrentHeight is 546
++  ITEM Assertion OK :  Columns.AutoFit: CurrentWidth is 680
++  ITEM Assertion OK :  Rows.AutoFit: CurrentHeight is 554
+ END 'AutoFit issue' Symbol
+  TEST OK : AutoFit issue
+ ----------------------------------------------------------------
+@@ -204,11 +204,11 @@ Heights and Widths
+   ITEM Assertion OK : Range RowHeight is 40
+   ITEM Assertion OK : Range ColumnWidth is 50
+   ITEM Assertion OK : Range Height is 240
+-  ITEM Assertion OK : Range Width is 787.5
++  ITEM Assertion OK : Range Width is 795
+   ITEM Assertion OK : Range RowHeight is 50
+   ITEM Assertion OK : Range ColumnWidth is 50
+   ITEM Assertion OK : Range Height is 300
+-  ITEM Assertion OK : Range Width is 787.5
++  ITEM Assertion OK : Range Width is 795
+   ITEM Assertion OK : RowHeight is null: True
+   ITEM Assertion OK : ColumnWidth is null: True
+ END 'Heights and Widths' Symbol
+@@ -218,7 +218,7 @@ RangeRowColumn-Issue
+  TEST START : RangeRowColumn-Issue
+   ITEM Assertion OK : Row is: 8
+   ITEM Assertion OK : Column is: 5
+-  ITEM Assertion OK : EntireRow.Columns.Count = 1024
++  ITEM Assertion OK : EntireRow.Columns.Count = 256
+   ITEM Assertion OK : EntireColumn.Rows.Count = 131072
+ END 'RangeRowColumn-Issue' Symbol
+  TEST OK : RangeRowColumn-Issue
+@@ -255,7 +255,7 @@ End issue
+   ITEM Assertion OK : -  = $E$3
+   ITEM Assertion OK : -  = $A$8
+   ITEM Assertion OK : -  = $B$8
+-  ITEM Assertion FAIL : -  = $AMJ$8
++  ITEM Assertion OK : -  = $IV$8
+   ITEM Assertion OK : -  = $Z$8
+ END 'End issue' Symbol
+  TEST OK : End issue
+@@ -277,4 +277,4 @@ Validation
+   ITEM Assertion OK : Validation Error Title is : Microsoft Excel
+ END 'Validation' Symbol
+  TEST OK : Validation
+-Test run finished : 17/12/2008 14:18:40
++Test run finished : 10/03/2008 15:15:13
+Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log
+===================================================================
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log	(revision 276159)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log	(revision 276288)
+@@ -1,4 +1,4 @@
+-Test run started : 17/07/2007 20:56:04
++Test run started : 12/05/2009 11:23:35
+ ----------------------------------------------------------------
+ TestAddress
+  TEST START : TestAddress
+@@ -51,12 +51,17 @@ TestAddress
+   ITEM Assertion OK : test47 Range('a2:b4').Rows('1:2')
+   ITEM Assertion OK : test48 Range('a2:b4').Rows('2:2')
+   ITEM Assertion OK : test49 Range('a2:b4').Rows('2:3')
++  ITEM Assertion OK : test50 Range(' A2:B4 ')
++  ITEM Assertion OK : test51 Range('A 2:B 4')
++  ITEM Assertion OK : test52 Range('A2 : B4 ')
++  ITEM Assertion OK : test53 Range('Sheet1 !A2 : B4 ')
++  ITEM Assertion OK : test54 Range('Sheet1! A2 : B4 ')
+ Test Results
+ ============
+ 
+-Tests passed: 49
++Tests passed: 54
+ Tests failed: 0
+ 
+ END 'TestAddress
+  TEST OK : TestAddress
+-Test run finished : 17/07/2007 20:56:05
++Test run finished : 12/05/2009 11:23:35
+Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestUnion.log
+===================================================================
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestUnion.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestUnion.log	(revision 276288)
+@@ -0,0 +1,17 @@
++Test run started : 13/01/2009 14:32:16
++----------------------------------------------------------------
++TestUnion
++ TEST START : TestUnion
++  ITEM Assertion OK : test1Application.Range('A2:D10'), Range('C4:E6')
++  ITEM Assertion OK : test2Application.Range('A2:D5,a3:d4'), Range('A4:G10')
++  ITEM Assertion OK : test3Application.Range('A4:G10,A1:B6'), Range('A2:D5,A3:D4')
++  ITEM Assertion OK : test4Application.Range('A5:D10'), Range('B5:E10')
++Test Results
++============
++
++Tests passed: 4
++Tests failed: 0
++
++END 'TestUnion
++ TEST OK : TestUnion
++Test run finished : 13/01/2009 14:32:16
+Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log
+===================================================================
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log	(revision 276159)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log	(revision 276288)
+@@ -1,4 +1,4 @@
+-Test run started : 17/12/2008 14:15:22
++Test run started : 2008／09／18 11:35:34
+ BEGIN Format
+  TEST START : Test Predefined_Number_Format_Sample function
+   ITEM Assertion OK : General Number: 562486.2356
+@@ -33,4 +33,4 @@ BEGIN Format
+   ITEM Assertion OK : >: VBA
+  TEST OK : Test Custom_Text_Format_Sample function
+ END  Format
+-Test run finished : 17/12/2008 14:15:22
++Test run finished : 2008／09／18 11:35:34
+Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/CalcFont.log
+===================================================================
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/CalcFont.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/CalcFont.log	(revision 276288)
+@@ -0,0 +1,17 @@
++Test run started : 10/09/2008 02:40:17 PM
++CalcFont_Format
++ TEST START : Font_Format
++  ITEM Assertion OK : correctly set font to Bold
++  ITEM Assertion OK : correctly set font to Italic
++  ITEM Assertion OK : correctly read FontStyle
++  ITEM Assertion OK : correctly set font to Shadow
++  ITEM Assertion OK : correctly set font color
++  ITEM Assertion OK : correctly set font color index
++  ITEM Assertion OK : correctly set font name
++  ITEM Assertion OK : correctly set font outline
++  ITEM Assertion OK : correctly set font size
++  ITEM Assertion OK : correctly set font strikethrough
++  ITEM Assertion OK : correctly set font underline
++ TEST Success. : Font_Format
++CalcFont_Format
++Test run finished : 10/09/2008 02:40:17 PM
+Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log
+===================================================================
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log	(revision 276159)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log	(revision 276288)
+@@ -1,20 +1,15 @@
+-Test run started : 05/29/2008 02:55:48 PM
++Test run started : 2008／09／22 11:18:57
+ BEGIN Window2
+  TEST START : Test Window.SplitRow
+-  ITEM Assertion OK : Test SplitColumn: 2
+-  ITEM Assertion FAIL : Test SplitRow: 5
+-  ITEM Assertion FAIL : Test SplitVertical: 64.5090003183026
+-  ITEM Assertion OK : Test SplitHorizontal: 502.570118758869
+-  ITEM Assertion OK : Test SplitVertical: 242.283803521067
+-  ITEM Assertion OK : Test SplitRow: 19
+-  ITEM Assertion OK : Test SplitHorizontal: 242.283803521067
+-  ITEM Assertion OK : Test SplitColumn: 1
+-  ITEM Assertion FAIL : Test SplitRow: 8
+-  ITEM Assertion OK : Test SplitColumn: 10
++  ITEM Assertion OK : Test SplitColumn: 2 (Test only applies to maximized Window and at least has 800*600 solotion)
++  ITEM Assertion OK : Test SplitRow: 2 (Test only applies to maximized Window and at least has 800*600 solotion)
++  ITEM Assertion OK : Test SplitVertical: 242.465788476212
++  ITEM Assertion OK : Test SplitHorizontal: 242.465788476212
++  ITEM Assertion OK : Test SplitRow: 4 (Test only applies to maximized Window and at least has 800*600 solotion)
++  ITEM Assertion OK : Test SplitColumn: 3 (Test only applies to maximized Window and at least has 800*600 solotion)
+   ITEM Assertion OK : Test SplitColumn: 0
+   ITEM Assertion OK : Test SplitRow: 0
+  TEST OK : Test Window.SplitRow
+-TEST ERROR - no test begun: Test Window.SplitRow
+  TEST START : Test Window.DisplayGridlines
+   ITEM Assertion OK : Test gridlines are on
+   ITEM Assertion OK : Test gridlines are off
+@@ -25,7 +20,8 @@ BEGIN Window2
+  TEST OK : Test Window.DisplayHeadings
+  TEST START : Test Window.Visibility
+   ITEM Assertion OK : Window is visible
+- TEST FAIL : Test Window.Visibility (hit error handler).
++  ITEM Assertion OK : Window is not visible
++ TEST OK : Test Window.Visibility
+  TEST START : Test Window.FreezePanes
+   ITEM Assertion OK : Test no panes frozen
+   ITEM Assertion OK : Test panes frozen at center
+@@ -42,4 +38,4 @@ BEGIN Window2
+   ITEM Assertion OK : Application.Windows Count: 1
+  TEST OK : Test Windows.Count
+ END  Window2
+-Test run finished : 05/29/2008 02:55:48 PM
++Test run finished : 2008／09／22 11:18:58
+Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log
+===================================================================
+--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log	(revision 0)
++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log	(revision 276288)
+@@ -0,0 +1,30 @@
++Test run started : 12/05/2009 12:36:15
++----------------------------------------------------------------
++TestAddress
++ TEST START : TestAddress
++  ITEM Assertion OK : test1: res = Not ( A > B )
++  ITEM Assertion OK : test2: res = Not ( B > A )
++  ITEM Assertion OK : test3: res = Not ( D )
++  ITEM Assertion OK : test4: res = Not A
++  ITEM Assertion OK : test5: res = ( A > D )
++  ITEM Assertion OK : test6: res = ( D > A )
++  ITEM Assertion OK : test7: res = ( A < D )
++  ITEM Assertion OK : test8: res = ( D < A )
++  ITEM Assertion OK : test9: res = ( A >= D )
++  ITEM Assertion OK : test10: res = ( D >= A )
++  ITEM Assertion OK : test11: res = ( A <= D )
++  ITEM Assertion OK : test12: res = ( D <= A )
++  ITEM Assertion OK : test13: res = ( D = A )
++  ITEM Assertion OK : test14: res = ( A = D )
++  ITEM Assertion OK : test15: res = ( D <> A )
++  ITEM Assertion OK : test16: res = ( A <> D )
++  ITEM Assertion OK : test17: ( A = D ) = True 
++Test Results
++============
++
++Tests passed: 17
++Tests failed: 0
++
++END 'TestAddress
++ TEST OK : TestAddress
++Test run finished : 12/05/2009 12:36:15
+Index: sc/source/ui/vba/testvba/TestDocuments/VariantTest.xls
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/VariantTest.xls
+___________________________________________________________________
+Added: svn:mime-type
+   + application/octet-stream
+
+Index: sc/source/ui/vba/testvba/TestDocuments/TestIntersection.xls
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+
+Property changes on: sc/source/ui/vba/testvba/TestDocuments/TestIntersection.xls
+___________________________________________________________________
+Added: svn:mime-type
+   + application/octet-stream
+
+Index: sc/source/ui/vba/testvba/runTests.pl
+===================================================================
+--- sc/source/ui/vba/testvba/runTests.pl	(revision 276159)
++++ sc/source/ui/vba/testvba/runTests.pl	(revision 276288)
+@@ -20,7 +20,7 @@ my $theResult;
+ my $officepath = shift || die "please specify path to office installation program dir";
+ my $DocName = shift || "";
+ my $programpath = "$officepath"."3/program:$officepath/program:";
+-my $basiclibrarypath = "$officepath/basis3.1/program";
++my $basiclibrarypath = "$officepath/basis3.2/program";
+ my $urelibpath = "$officepath/ure/lib";
+ my $binext = "";
+ my $testDocDir = "$binDir/TestDocuments";
+Index: sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest2.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest2.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest2.log	(revision 276288)
+@@ -0,0 +1,65 @@
++Test run started : 17/09/2009 12:17:45
++BEGIN TestCalc
++ TEST START : RangeTest3
++  ITEM Assertion OK : - setFormulaR1C1
++  ITEM Assertion OK : - getFormulaR1C1
++  ITEM Assertion OK : - Range.Copy() and Range.PasteSpecial()
++  ITEM Assertion OK : - Range.Copy(Range("I10"))
++  ITEM Assertion OK : PasteSpecial Paste:=xlPasteValues
++  ITEM Assertion OK : PasteSpecial Paste:=xlPasteFormulas
++  ITEM Assertion OK : PasteSpecial Paste:=xlPasteFormats
++  ITEM Assertion OK : PasteSpecial 
++  ITEM Assertion OK : PasteSpecial SkipBlanks:=True
++  ITEM Assertion OK : PasteSpecial Operation:=xlPasteSpecialOperationAdd
++  ITEM Assertion OK : PasteSpecial Operation:=xlPasteSpecialOperationSubtract
++  ITEM Assertion OK : PasteSpecial Operation:=xlPasteSpecialOperationMultiply
++  ITEM Assertion OK : PasteSpecial Operation:=xlPasteSpecialOperationDivide
++  ITEM Assertion OK : PasteSpecial Transpose:=True
++  ITEM Assertion FAIL : ActiveWorkbook.FileFormat
++  ITEM Assertion OK : ActiveWorkbook.Name
++  ITEM Assertion OK : ActiveWorkbook.FullName und ActiveWorkbook.Path
++  ITEM Assertion FAIL : -  = ActiveWorkbook.Colors(3) set
++  ITEM Assertion OK : -  = ActiveWorkbook.ResetColors
++  ITEM Assertion OK : -  = ActiveWorkbook.Colors(3) get
++  ITEM Assertion OK : -  = Range("K22").End (xlDown)
++  ITEM Assertion OK : -  = Range("K22").End (xlUo)
++  ITEM Assertion OK : -  = Range("K22").End (xlToLeft)
++  ITEM Assertion OK : -  = Range("K22").End (xlRight)
++  ITEM Assertion OK : -  ActiveSpreadsheet.Next
++  ITEM Assertion OK : -  ActiveSpreadsheet.Next
++  ITEM Assertion OK : -  ActiveSpreadsheet.Previous
++  ITEM Assertion OK : -  ActiveSpreadsheet.Previous
++  ITEM Assertion OK : -  Range("J4:J11").AutoFilter field:=1, Criteria1:="x"
++  ITEM Assertion OK : -  Range("J4:J11").AutoFilter field:=1, Criteria1:="<>"
++  ITEM Assertion OK : -  Range("J4:J11").AutoFilter field:=1, Criteria1:="="
++  ITEM Assertion OK : -  Range("J4:J11").AutoFilter 
++  ITEM Assertion OK : -  ActiveSheet.Resize.Select
++  ITEM Assertion OK : -  Application.GoTo Reference:="R8C2"
++  ITEM Assertion FAIL : -  Application.GoTo Reference:="R[8]C[2]"
++  ITEM Assertion OK : -  Application.GoTo Reference:="R8C2"
++  ITEM Assertion OK : -  Range.Group - please check visually
++  ITEM Assertion OK : -  Range.Group - please check visually
++  ITEM Assertion OK : -  Range.Ungroup- please check visually
++  ITEM Assertion OK : -  Range.Ungroup - please check visually
++  ITEM Assertion OK : -  Range.Group - please check visually
++  ITEM Assertion OK : -  Range.Group - please check visually
++  ITEM Assertion OK : -  Range.clearOutline - please check visually
++  ITEM Assertion OK : -  Range.AutoOutline - please check visually
++  ITEM Assertion OK : -  Range.AutoOutline - please check visually
++  ITEM Assertion OK : -  ActiveSheet.UsedRange.Select
++  ITEM Assertion OK : -  Range("A13").AddIndent
++  ITEM Assertion OK : -  Range("A13").IndentLevel set
++  ITEM Assertion OK : -  Range("A13").IndentLevel get
++  ITEM Assertion OK : -  Range("A13").IndentLevel get
++  ITEM Assertion OK : - Range.Copy() and Range.PasteSpecial()
++  ITEM Assertion OK : - Range.Copy() and Range.PasteSpecial()
++  ITEM Assertion OK : - Range.Copy() and Range.PasteSpecial()
++  ITEM Assertion OK : - Range.Calculate
++  ITEM Assertion OK : Worksheet.Calculate
++  ITEM Assertion OK : - Application.Calculate
++  ITEM Assertion OK : Global.Calculate
++  ITEM Assertion OK : Calculation set
++  ITEM FAIL (RangeTest3)
++ TEST Not succesfully completed : RangeTest3
++END   TestCalc
++Test run finished : 17/09/2009 12:17:51
+Index: sc/source/ui/vba/testvba/Logs/VariantTest.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/VariantTest.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/VariantTest.log	(revision 276288)
+@@ -0,0 +1,47 @@
++Test run started : 17/09/2009 12:18:06
++----------------------------------------------------------------
++TestAddress
++ TEST START : TestAddress
++  ITEM Assertion OK : test1: res = (aboo = '')
++  ITEM Assertion OK : test 2: res = (aboo = 'fiddlesticks')
++  ITEM Assertion OK : test 3: res = ('' = aboo)
++  ITEM Assertion OK : test 4: res = ('fiddlesticks' = aboo )
++  ITEM Assertion OK : test 5: res = (testString = '')
++  ITEM Assertion OK : test 6: res = (testString = 'fiddlesticks')
++  ITEM Assertion OK : test 7: res = ('' = testString)
++  ITEM Assertion OK : test 8: res = ('fiddlesticks' = testString )
++  ITEM Assertion OK : test 9: res = ( aboo < " )
++  ITEM Assertion OK : test 10: res = ( testString < " )
++  ITEM Assertion OK : test 11: res = ( aboo > " )
++  ITEM Assertion OK : test 12: res = ( testString > " )
++  ITEM Assertion OK : test 13: res = ( aboo <> '' )
++  ITEM Assertion OK : test 14: res = ( testString <> '' )
++  ITEM Assertion OK : test 15: res = (aboo = something/14)
++  ITEM Assertion OK : test 16: res = something + 'string'
++  ITEM Assertion OK : test 17: res = something & 'string'
++  ITEM Assertion OK : test 18: res =  something MOD 10 )
++  ITEM Assertion OK : test 19: res =  something AND 1 )
++  ITEM Assertion OK : test 20: res =  something AND 0 )
++  ITEM Assertion OK : test 21: res =  something OR 12)
++  ITEM Assertion OK : test 22: res =  something OR 0 )
++  ITEM Assertion OK : test 23: res =  something XOR 0 )
++  ITEM Assertion OK : test 24: res =  something XOR 1 )
++  ITEM Assertion OK : test 25: res =  something EQV 0 )
++  ITEM Assertion OK : test 26: res =  something EQV 1 )
++  ITEM Assertion OK : test 27: res =  something IMP 0 )
++  ITEM Assertion OK : test 28: res =  something IMP 1 )
++  ITEM Assertion OK : test 29: res =  something IMP 14 )
++  ITEM Assertion OK : test 30: res =  NOT something )
++  ITEM Assertion OK : test 31: res = something + 12 )
++  ITEM Assertion OK : test 32: res = something - 12 )
++  ITEM Assertion OK : test 33: res = -something )
++  ITEM Assertion OK : test 34: res = something * 12 )
++Test Results
++============
++
++Tests passed: 34
++Tests failed: 0
++
++END 'TestAddress
++ TEST OK : TestAddress
++Test run finished : 17/09/2009 12:18:06
+Index: sc/source/ui/vba/testvba/Logs/PageBreaks.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/PageBreaks.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/PageBreaks.log	(revision 276288)
+@@ -0,0 +1,10 @@
++Test run started : 17/09/2009 12:17:15
++----------------------------------------------------------------
++ TEST START : PageBreaks-Issue
++  ITEM Assertion OK : HPageBreaks.Count is 2
++  ITEM Assertion OK : HPageBreak.Type is -4135
++  ITEM Assertion OK : HPageBreak.Location: Range.Row is 5
++  ITEM Assertion OK : HPageBreak.Delete: HPageBreaks.Count is 2
++END 'PageBreaks-Issue' Symbol
++ TEST OK : PageBreaks-Issue
++Test run finished : 17/09/2009 12:17:15
+Index: sc/source/ui/vba/testvba/Logs/stringplusdouble.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/stringplusdouble.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/stringplusdouble.log	(revision 276288)
+@@ -0,0 +1,62 @@
++Test run started : 17/09/2009 12:17:40
++BEGIN String Plus Double
++ TEST START : double = string + double
++The next compute raises error: s = null, d = null, r = s + d
++  ITEM Assertion OK : s = null, d = null, r = s + d .The result is: -1
++  ITEM Assertion OK : s = null, d = null, r = s & d .The result is: 0
++The next compute raises error: s = null, d = 20, r = s + d
++  ITEM Assertion OK : s = null, d = 20, r = s + d .The result is: -1
++  ITEM Assertion OK : s = null, d = 20, r = s & d .The result is: 20
++  ITEM Assertion OK : s = '10', d = null, r = s + d .The result is: 10
++  ITEM Assertion OK : s = '10', d = null, r = s & d .The result is: 100
++  ITEM Assertion OK : s = '10', d = 20, r = s + d .The result is: 30
++  ITEM Assertion OK : s = '10', d = 20, r = s & d .The result is: 1020
++The next compute raises error: s = 'abc', d = null, r = s + d
++  ITEM Assertion OK : s = 'abc', d = null, r = s + d .The result is: -1
++The next compute raises error: s = 'abc', d = null, r = s & d
++  ITEM Assertion OK : s = 'abc', d = null, r = s & d .The result is: -1
++The next compute raises error: s = 'abc', d = 20, r = s + d
++  ITEM Assertion OK : s = 'abc', d = 20, r = s + d .The result is: -1
++The next compute raises error: s = 'abc', d = 20, r = s & d
++  ITEM Assertion OK : s = 'abc', d = 20, r = s & d .The result is: -1
++ TEST OK : double = string + double
++ TEST START : string = string + double
++The next compute raises error: s = null, d = null, r = s + d
++  ITEM Assertion OK : s = null, d = null, r = s + d .The result is: -1
++  ITEM Assertion OK : s = null, d = null, r = s & d .The result is: 0
++The next compute raises error: s = null, d = 20, r = s + d
++  ITEM Assertion OK : s = null, d = 20, r = s + d .The result is: -1
++  ITEM Assertion OK : s = null, d = 20, r = s & d .The result is: 20
++  ITEM Assertion OK : s = '10', d = null, r = s + d .The result is: 10
++  ITEM Assertion OK : s = '10', d = null, r = s & d .The result is: 100
++  ITEM Assertion OK : s = '10', d = 20, r = s + d .The result is: 30
++  ITEM Assertion OK : s = '10', d = 20, r = s & d .The result is: 1020
++The next compute raises error: s = 'abc', d = null, r = s + d
++  ITEM Assertion OK : s = 'abc', d = null, r = s + d .The result is: -1
++  ITEM Assertion OK : s = 'abc', d = null, r = s & d .The result is: abc0
++The next compute raises error: s = 'abc', d = 20, r = s + d
++  ITEM Assertion OK : s = 'abc', d = 20, r = s + d .The result is: -1
++  ITEM Assertion OK : s = 'abc', d = 20, r = s & d .The result is: abc20
++ TEST OK : string = string + double
++ TEST START : double = string + string
++The next compute raises error: s = null, d = null, r = s + d
++  ITEM Assertion OK : s = null, d = null, r = s + d .The result is: -1
++The next compute raises error: s = null, d = null, r = s & d
++  ITEM Assertion OK : s = null, d = null, r = s & d .The result is: -1
++  ITEM Assertion OK : s = null, d = 20, r = s + d .The result is: 20
++  ITEM Assertion OK : s = null, d = 20, r = s & d .The result is: 20
++  ITEM Assertion OK : s = '10', d = null, r = s + d .The result is: 10
++  ITEM Assertion OK : s = '10', d = null, r = s & d .The result is: 10
++  ITEM Assertion OK : s = '10', d = 20, r = s + d .The result is: 1020
++  ITEM Assertion OK : s = '10', d = 20, r = s & d .The result is: 1020
++The next compute raises error: s = 'abc', d = null, r = s + d
++  ITEM Assertion OK : s = 'abc', d = null, r = s + d .The result is: -1
++The next compute raises error: s = 'abc', d = null, r = s & d
++  ITEM Assertion OK : s = 'abc', d = null, r = s & d .The result is: -1
++The next compute raises error: s = 'abc', d = 20, r = s + d
++  ITEM Assertion OK : s = 'abc', d = 20, r = s + d .The result is: -1
++The next compute raises error: s = 'abc', d = 20, r = s & d
++  ITEM Assertion OK : s = 'abc', d = 20, r = s & d .The result is: -1
++ TEST OK : double = string + string
++END  String Plus Double
++Test run finished : 17/09/2009 12:17:40
+Index: sc/source/ui/vba/testvba/Logs/TestIntersection.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/TestIntersection.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/TestIntersection.log	(revision 276288)
+@@ -0,0 +1,26 @@
++Test run started : 17/09/2009 12:18:03
++----------------------------------------------------------------
++TestIntersection
++ TEST START : TestIntersection
++  ITEM Assertion OK : test1 Application.Intersect( Range('A2:D10'), Range('C4:E6'))
++  ITEM Assertion OK : test2 Application.Intersect( Range('A2:D10'), Range('A4:G10'))
++  ITEM Assertion OK : test3 Application.Intersect( Range('A2:c8,d2:f8,g2:i8'), Range('A4:G10'))
++  ITEM Assertion OK : test4 Application.Intersect( Range('A4:G10'), Range('A2:c8,d2:f8,g2:i8'))
++  ITEM Assertion OK : test5 Application.Intersect( Range('A2:c8,d2:f8,g2:i8'), Range('g4:i10,A4:G10'))
++  ITEM Assertion OK : test6 Application.Intersect( Range('g4:i10,A4:G10'), Range('A2:c8,d2:f8,g2:i8'))
++  ITEM Assertion OK : test7 Application.Intersect( Range('a2:d10,b5:e10'), Range('a5:i10'))
++  ITEM Assertion OK : test8 Application.Intersect( Range('a2:c8,d2:f8'), Range('b6:e9,a6:f9'))
++  ITEM Assertion OK : test9 Application.Intersect( Range('a2:c8,e2:f8'), Range('b6:e9,a6:f9'))
++  ITEM Assertion OK : test10 Application.Intersect( Range('a1:a3,c1:c3'), Range('a2:c3'))
++  ITEM Assertion OK : test11 Application.Intersect( Range('a1:a3,b1:b3'), Range('a2:c3'))
++  ITEM Assertion OK : test12 Application.Intersect( Range('a2:d5,b3:f7,c1:g4'), Range('b2:e6'))
++  ITEM Assertion OK : test13 Range(" a2:d10,b5:e10,g13:j32 "), Range(" a5:i10,b6:e9 "), Range("b2:r5,f10:h19")
++Test Results
++============
++
++Tests passed: 13
++Tests failed: 0
++
++END 'TestIntersection
++ TEST OK : TestIntersection
++Test run finished : 17/09/2009 12:18:03
+Index: sc/source/ui/vba/testvba/Logs/Window.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/Window.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/Window.log	(revision 276288)
+@@ -0,0 +1,46 @@
++Test run started : 17/09/2009 12:18:08
++----------------------------------------------------------------
++ TEST START : Window-Issue
++  ITEM Assertion OK : Window.Left is: 0 (Test only applies to maximized Window)
++  ITEM Assertion OK : Window.Top is: 21 (Test only applies to maximized Window)
++  ITEM Assertion OK : Window.Width is: 1280 (Test only applies to maximized Window)
++  ITEM Assertion OK : Window.Height is: 977 (Test only applies to maximized Window)
++  ITEM Assertion OK : Window.ScrollColumn is: 100
++  ITEM Assertion OK : Window.ScrollColumn is: 1
++  ITEM Assertion OK : Window.ScrollRow is: 100
++  ITEM Assertion OK : Window.ScrollRow is: 1
++  ITEM Assertion OK : Window.LargeScroll(Down): ScrollRow is: 151 (Test may only apply to maximized Window)
++  ITEM Assertion OK : Window.LargeScroll(Up): ScrollRow is: 1
++  ITEM Assertion OK : Window.LargeScroll(ToRight): ScrollColumn is: 58 (Test may only apply to maximized Window)
++  ITEM Assertion OK : Window.LargeScroll(ToLeft): ScrollColumn is: 1
++  ITEM Assertion OK : Window.SmallScroll(ToRight): ScrollColumn is: 4 (Test may only apply to maximized Window)
++  ITEM Assertion OK : Window.SmallScroll(ToLeft): ScrollColumn is: 1
++  ITEM Assertion OK : Window.DisplayWorkBookTabs is: False
++  ITEM Assertion OK : Window.DisplayWorkBookTabs is: True
++  ITEM Assertion OK : Window.DisplayVerticalScrollBar is: True
++  ITEM Assertion OK : Window.DisplayVerticalScrollBar is: False
++  ITEM Assertion OK : Window.DisplayHorizontalScrollBar is: False
++  ITEM Assertion OK : Window.DisplayHorizontalScrollBar is: True
++  ITEM Assertion OK : Window.DisplayHeadings is: False
++  ITEM Assertion OK : Window.DisplayHeadings is: True
++  ITEM Assertion OK : Window.DisplayOutline is: False
++  ITEM Assertion OK : Window.DisplayOutline is: True
++  ITEM Assertion OK : Window.Visible is: False
++  ITEM Assertion OK : Window.Visible is: True
++  ITEM Assertion OK : Window.Caption is: MyCaption
++  ITEM Assertion OK : Pane.ScrollColumn is: 100
++  ITEM Assertion OK : Pane.ScrollColumn is: 1
++  ITEM Assertion OK : Pane.ScrollRow is: 100
++  ITEM Assertion OK : Pane.ScrollRow is: 1
++  ITEM Assertion OK : Pane.LargeScroll(Down): ScrollRow is: 151 (Test may only apply to maximized Window)
++  ITEM Assertion OK : Pane.LargeScroll(Up): ScrollRow is: 1
++  ITEM Assertion OK : Pane.LargeScroll(ToRight): ScrollColumn is: 58 (Test may only apply to maximized Window)
++  ITEM Assertion OK : Pane.LargeScroll(ToLeft): ScrollColumn is: 1
++  ITEM Assertion OK : Pane.SmallScroll(ToRight): ScrollColumn is: 4 (Test may only apply to maximized Window)
++  ITEM Assertion OK : Pane.SmallScroll(ToLeft): ScrollColumn is: 1
++  ITEM Assertion OK : Window Selection: $A$2:$D$5
++  ITEM Assertion OK : ActiveSheet name of Window: Sheet1
++  ITEM Assertion OK : Window ActiveCell: $A$1
++END 'Window-Issue' Symbol
++ TEST OK : Window-Issue
++Test run finished : 17/09/2009 12:18:09
+Index: sc/source/ui/vba/testvba/Logs/partition.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/partition.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/partition.log	(revision 276288)
+@@ -0,0 +1,11 @@
++Test run started : 17/09/2009 12:17:16
++BEGIN Partition
++ TEST START : Test Partition function
++  ITEM Assertion OK : the number 20 occurs in the range:20:24
++  ITEM Assertion OK : the number 20 occurs in the range: 20: 20
++  ITEM Assertion OK : the number 120 occurs in the range:100:   
++  ITEM Assertion OK : the number -5 occurs in the range:   : -1
++  ITEM Assertion OK : the number 2 occurs in the range: 2: 3
++ TEST OK : Test Partition function
++END  Partition
++Test run finished : 17/09/2009 12:17:16
+Index: sc/source/ui/vba/testvba/Logs/datevalue.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/datevalue.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/datevalue.log	(revision 276288)
+@@ -0,0 +1,8 @@
++Test run started : 17/09/2009 12:17:07
++BEGIN DateValue
++ TEST START : Test DateValue function
++  ITEM Assertion OK : the return date is: 12/02/1969
++  ITEM Assertion OK : the return date is: 21/01/2008
++ TEST OK : Test DateValue function
++END  DateValue
++Test run finished : 17/09/2009 12:17:07
+Index: sc/source/ui/vba/testvba/Logs/replace.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/replace.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/replace.log	(revision 276288)
+@@ -0,0 +1,14 @@
++Test run started : 17/09/2009 12:17:35
++BEGIN Replace
++ TEST START : Test Replace function
++  ITEM Assertion OK : common string:aefefdBc
++  ITEM Assertion OK : expression string:aefefdef
++  ITEM Assertion OK : binanary compare:aefefdBc
++  ITEM Assertion OK : text compare:aefefdef
++  ITEM Assertion OK : text compare:aefefdef
++  ITEM Assertion OK : start = 3:cefdBc
++  ITEM Assertion OK : count = 2: aefefdBc
++  ITEM Assertion OK : start = 1, count = 0, not support in Unix: abcbcdBc
++ TEST OK : Test Replace function
++END  Replace
++Test run finished : 17/09/2009 12:17:35
+Index: sc/source/ui/vba/testvba/Logs/StrConv-test.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/StrConv-test.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/StrConv-test.log	(revision 276288)
+@@ -0,0 +1,9 @@
++Test run started : 17/09/2009 12:17:39
++BEGIN StrConv
++ TEST START : Test StrConv function
++  ITEM Assertion OK : Converts the string to uppercase characters:ABC EFG HIJ
++  ITEM Assertion OK : Converts the string to lowercase characters:abc efg hij
++  ITEM Assertion OK : Converts the first letter of every word in string to uppercase:Abc Efg Hij
++ TEST OK : Test StrConv function
++END  StrConv
++Test run finished : 17/09/2009 12:17:39
+Index: sc/source/ui/vba/testvba/Logs/Template.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/Template.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/Template.log	(revision 276288)
+@@ -0,0 +1,14 @@
++Test run started : 17/09/2009 12:17:42
++----------------------------------------------------------------
++TestCaseName
++ TEST START : TestCaseName
++  ITEM Assertion OK : Something has been done.
++Test Results
++============
++
++Tests passed: 1
++Tests failed: 0
++
++END 'TestCaseName
++ TEST OK : TestCaseName
++Test run finished : 17/09/2009 12:17:42
+Index: sc/source/ui/vba/testvba/Logs/dateserial.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/dateserial.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/dateserial.log	(revision 276288)
+@@ -0,0 +1,9 @@
++Test run started : 17/09/2009 12:17:06
++BEGIN DateSerial
++ TEST START : Test DateSerial function
++  ITEM Assertion OK : the return date is: 15/06/1999
++  ITEM Assertion OK : the return date is: 15/06/1999
++  ITEM Assertion OK : the return date is: 15/06/1999
++ TEST OK : Test DateSerial function
++END  DateSerial
++Test run finished : 17/09/2009 12:17:06
+Index: sc/source/ui/vba/testvba/Logs/AutoFilter.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/AutoFilter.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/AutoFilter.log	(revision 276288)
+@@ -0,0 +1,20 @@
++Test run started : 17/09/2009 12:17:01
++----------------------------------------------------------------
++TestAddress
++ TEST START : TestAddress
++  ITEM Assertion OK : test1 'starts with' string criteria
++  ITEM Assertion OK : test2 'not equal to' string criteria
++  ITEM Assertion OK : test3 'ends with' string criteria
++  ITEM Assertion OK : test4 field 'all' 
++  ITEM Assertion OK : test5 numeric '<15' 
++  ITEM Assertion OK : test6 numeric '>=15' 
++  ITEM Assertion OK : test7 numeric '<=12' 
++Test Results
++============
++
++Tests passed: 7
++Tests failed: 0
++
++END 'TestAddress
++ TEST OK : TestAddress
++Test run finished : 17/09/2009 12:17:01
+Index: sc/source/ui/vba/testvba/Logs/Ranges-2.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/Ranges-2.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/Ranges-2.log	(revision 276288)
+@@ -0,0 +1,68 @@
++Test run started : 17/09/2009 12:17:21
++----------------------------------------------------------------
++ClearFormtsIssue
++ TEST START : ClearFormtsIssue
++  ITEM Assertion OK : Range.Font.Bold is: True
++  ITEM Assertion OK : Range.Font.Bold is: False
++END 'ClearFormtsIssue' Symbol
++ TEST OK : ClearFormtsIssue
++----------------------------------------------------------------
++VerticalAlignment-Issue
++ TEST START : VerticalAlignment-Issue
++  ITEM Assertion OK : -  Range.VerticalAlignment (get)
++  ITEM Assertion OK : -  Range.VerticalAlignment (set)
++  ITEM Assertion OK : -  Range.VerticalAlignment (get)
++  ITEM Assertion OK : -  Range.VerticalAlignment (get)
++  ITEM Assertion OK : -  Range.VerticalAlignment (set)
++  ITEM Assertion OK : -  Range.VerticalAlignment (get)
++  ITEM Assertion OK : -  Range.VerticalAlignment (set)
++  ITEM Assertion OK : Range.VeritcalAlignment is Null
++END 'VerticalAlignment-Issue' Symbol
++ TEST OK : VerticalAlignment-Issue
++----------------------------------------------------------------
++HorizontalAlignment-Issue
++ TEST START : HorizontalAlignment-Issue
++  ITEM Assertion OK : -  Range.HorizontalAlignment (get)
++  ITEM Assertion OK : -  Range.HorizontalAlignment (set)
++  ITEM Assertion OK : -  Range.HorizontalAlignment (get)
++  ITEM Assertion OK : -  Range.HorizontalAlignment (set)
++  ITEM Assertion OK : -  Range.HorizontalAlignment (get)
++  ITEM Assertion OK : -  Range.HorizontalAlignment (set)
++  ITEM Assertion OK : -  Range.HorizontalAlignment (get)
++  ITEM Assertion OK : -  Range.HorizontalAlignment (set)
++  ITEM Assertion OK : Range.HorizontalAlignment is Null
++END 'HorizontalAlignment-Issue' Symbol
++ TEST OK : HorizontalAlignment-Issue
++----------------------------------------------------------------
++WrapText-Issue
++ TEST START : WrapText-Issue
++  ITEM Assertion OK : -  Range.WrapText (get)
++  ITEM Assertion OK : -  Range.WrapText (get)
++  ITEM Assertion OK : Range.WrapText is Null
++END 'WrapText-Issue' Symbol
++ TEST OK : WrapText-Issue
++----------------------------------------------------------------
++FontBorderIssues
++ TEST START : FontBorderIssues
++  ITEM Assertion OK : -  = Borders.Color (getColor)
++  ITEM Assertion OK : -  = Font.Color (getColor)
++END 'FontBorderIssues' Symbol
++ TEST OK : FontBorderIssues
++----------------------------------------------------------------
++RangeSizeIssues
++ TEST START : RangeSizeIssues
++  ITEM Assertion OK : Range.Left is: 120.06225
++  ITEM Assertion OK : Range.Top is: 93.29985
++  ITEM Assertion OK : Range.Width is: 228.3
++  ITEM Assertion OK : Range.Height is: 271.5
++END 'RangeSizeIssues' Symbol
++ TEST OK : RangeSizeIssues
++----------------------------------------------------------------
++ApplicationIssues
++ TEST START : ApplicationIssues
++  ITEM Assertion OK : Range.Address is: $E$8:$G$13,$G$13:$K$19
++  ITEM Assertion OK : Range.Address is: $E$8:$G$13,$G$13:$K$19
++  ITEM Assertion OK : Application.ActiveSheet.Name: Sheet1
++END 'ApplicationIssues' Symbol
++ TEST OK : ApplicationIssues
++Test run finished : 17/09/2009 12:17:22
+Index: sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest.log	(revision 276288)
+@@ -0,0 +1,60 @@
++Test run started : 17/09/2009 12:17:52
++BEGIN TestCalc
++ TEST START : RangeTest2
++  ITEM Assertion OK : -  Range("D15").Row 
++  ITEM Assertion OK : -  WorkSheet("D15").Range.Row 
++  ITEM Assertion OK : -  Range("D15").Column 
++  ITEM Assertion OK : -  Worksheet.Range("D15").Column 
++  ITEM Assertion OK : -  Range("D1").EntireRow.Valuer 
++  ITEM Assertion OK : -  Range("D1").EntireRow.Valuer 
++  ITEM Assertion OK : -  Range("D1").EntireRow.Columns.Count 
++  ITEM Assertion OK : -  Range("D1").EntireColumn.Rows.Count 
++  ITEM Assertion OK : -  Range("D15").ClearContent
++  ITEM Assertion OK : -  Range("M1:N2").Rows.Hidden (set)
++  ITEM Assertion OK : -  Range("M1:N2").Rows.Hidden (get)
++  ITEM Assertion OK : -  Range("M1:N2").Rows(1).Hidden (set)
++  ITEM Assertion OK : -  Range("M1:N2").Rows(1).Hidden (get)
++  ITEM Assertion OK : -  Range("M1:N2").Columns.Hidden (set)
++  ITEM Assertion OK : -  Range("M1:N2").Columns.Hidden (get)
++  ITEM Assertion OK : -  Range("M1:N2").Columns(1).Hidden (set)
++  ITEM Assertion OK : -  Range("M1:N2").Columns(1).Hidden (get)
++  ITEM Assertion OK : -  Range("B38").Orientation (get)
++  ITEM Assertion OK : -  Range("B38").Orientation (set)
++  ITEM Assertion OK : -  Range("B38").Orientation (set = xlDownward)
++  ITEM Assertion OK : -  Range("B38").Orientation (set)
++  ITEM Assertion OK : -  Range("B38").Orientation (set = xlUpward)
++  ITEM Assertion OK : -  Range("B38").Orientation (set)
++  ITEM Assertion OK : -  Range("B38").Orientation (set = xlVertical)
++  ITEM Assertion OK : -  Range("B38").Orientation (set)
++  ITEM Assertion OK : -  Range("B38").Orientation (set = xlVertical)
++  ITEM Assertion OK : -  Range("B39").WrapText (get)
++  ITEM Assertion OK : -  Range("B39").WrapText (set)
++  ITEM Assertion OK : -  Range("B39").WrapText (set)
++  ITEM Assertion OK : -  Range("E39").MergeCells (get)
++  ITEM Assertion OK : -  Range("F39").MergeCells (get)
++  ITEM Assertion OK : -  Range("E39").MergeCells (set)
++  ITEM Assertion FAIL : -  Range("F39").MergeCells (set)
++  ITEM Assertion OK : -  Range("E39").MergeCells (set)
++  ITEM Assertion OK : -  Range("F39").MergeCells (set)
++  ITEM Assertion OK : -  Range("C41:C42").Replace  MatchCase:=True 
++  ITEM Assertion OK : -  Range("C41:C42").Replace  MatchCase:=True 
++  ITEM Assertion OK : -  Range("D41:D42").Replace  MatchCase:=False 
++  ITEM Assertion OK : -  Range("B39").VerticalAlignment (get)
++  ITEM Assertion OK : -  Range("B39").VerticalAlignment (set)
++  ITEM Assertion OK : -  Range("B39").VerticalAlignment (get)
++  ITEM Assertion OK : -  Range("B39").VerticalAlignment (get)
++  ITEM Assertion OK : -  Range("B39").VerticalAlignment (set)
++  ITEM Assertion OK : -  Range("B39").VerticalAlignment (get)
++  ITEM Assertion OK : -  Range("B39").VerticalAlignment (set)
++  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (get)
++  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (set)
++  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (get)
++  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (set)
++  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (get)
++  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (set)
++  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (get)
++  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (set)
++  ITEM FAIL (RangeTest2)
++ TEST Not succesfully completed : RangeTest2
++END   TestCalc
++Test run finished : 17/09/2009 12:18:02
+Index: sc/source/ui/vba/testvba/Logs/Ranges.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/Ranges.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/Ranges.log	(revision 276288)
+@@ -0,0 +1,280 @@
++Test run started : 17/09/2009 12:17:26
++----------------------------------------------------------------
++ApplicationMethods
++ TEST START : ApplicationMethods
++  ITEM Assertion OK :  Name of Workbook is: Ranges.xls
++  ITEM Assertion OK :  Address of Application.Columns is: $A:$A
++  ITEM Assertion OK :  Address of Application.Rows is: $1:$1
++  ITEM Assertion OK :  Address of Application.Range is: $1:$1,$5:$7
++  ITEM Assertion OK :  Please check manually: DefaultFilePath is: /data4/home/npower/Documents
++  ITEM Assertion OK :  Please check manually: Library Path is: /media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/UserInstallation/user/basic
++  ITEM Assertion OK :  Please check manually: Template Path is: /media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/UserInstallation/user/template
++  ITEM Assertion OK :  FileSeparator is /
++  ITEM Assertion OK :  Name of ActiveWorkbook is: Ranges.xls
++END 'ApplicationMethods' Symbol
++ TEST OK : ApplicationMethods
++----------------------------------------------------------------
++Insert-Issue
++ TEST START : Insert-Issue
++  ITEM Assertion OK : Insert with xlShiftToRight: 10
++END 'Insert-Issue' Symbol
++ TEST OK : Insert-Issue
++----------------------------------------------------------------
++MergeCells-Issue
++ TEST START : MergeCells-Issue
++  ITEM Assertion OK :  Range.MergeCells is True
++  ITEM Assertion FAIL : MergeCells is null: False
++  ITEM Assertion OK : RowCount after Merge: 13
++  ITEM Assertion OK :  Range.MergeCells is False
++  ITEM Assertion OK : MergeCells is null: False
++  ITEM Assertion FAIL : MergeCells of Second Area is null : False
++  ITEM Assertion FAIL : MergeCells of Ranges is Null: False
++  ITEM Assertion OK : RowCount after Merge: 7
++  ITEM Assertion OK :  Range.MergeCells is False
++  ITEM Assertion OK : MergeCells is null: False
++  ITEM Assertion OK : RowCount after Merge: 7
++END 'MergeCells-Issue' Symbol
++ TEST OK : MergeCells-Issue
++----------------------------------------------------------------
++Areas-Issue
++ TEST START : Areas-Issue
++  ITEM Assertion OK : Range Areas Count is2
++  ITEM Assertion OK : First Range Address is: $E$8:$G$13
++  ITEM Assertion OK : First Row is: 8
++  ITEM Assertion OK : First Column is: 5
++  ITEM Assertion OK : EntireRow Address is: $8:$13,$13:$19
++  ITEM Assertion OK : EntireColumn Address is: $E:$G,$G:$K
++  ITEM Assertion OK : Range Count:53
++END 'Areas-Issue' Symbol
++ TEST OK : Areas-Issue
++----------------------------------------------------------------
++Fill-Methods-Issue
++ TEST START : Fill-Methods-Issue
++  ITEM Assertion OK :  Range Value after FillDown: MyFillValue
++  ITEM Assertion OK :  Range Value after FillDown: MyFillValue
++  ITEM Assertion OK :  Range Value after FillDown: MyRightFillValue
++  ITEM Assertion OK :  Range Value after FillDown: MyBottomFillValue
++END 'Fill-Methods-Issue' Symbol
++ TEST OK : Fill-Methods-Issue
++----------------------------------------------------------------
++Range/Item-Method-Issue
++ TEST START : Range/Item-Method-Issue
++  ITEM Assertion OK :  Range of multiple columns is: $A:$A,$C:$C
++  ITEM Assertion OK :  Range of multiple rows is: $1:$1,$5:$7
++  ITEM Assertion OK :  Range of several columns is: $C:$E,$D:$D
++  ITEM Assertion OK :  Range of several rows is: $5:$8,$6:$10
++  ITEM Assertion OK :  Range of several single cells is: $C$5,$E$8
++  ITEM Assertion OK :  Range of several named ranges is: $L$1:$M$6,$E$8:$G$13,$G$13:$K$19
++  ITEM Assertion OK :  Range of a single Item Cell is: $E$21
++  ITEM Assertion OK :  Range of a single Item Cell is: $F$21
++  ITEM Assertion OK :  Range of a single Item Cell is: $F$10
++END 'Range/Item-Method-Issue' Symbol
++ TEST OK : Range/Item-Method-Issue
++----------------------------------------------------------------
++R1C1-Formulas-Issue
++ TEST START : R1C1-Formulas-Issue
++  ITEM Assertion OK :  R1C1 Range.Formula is: =IF(OR(R[-2]C[1]=0,RC[2]="YES"),"")
++  ITEM Assertion OK :  Range.Formula is: =IF(OR(J8=0,K10="YES"),"")
++END 'R1C1-Formulas-Issue' Symbol
++ TEST OK : R1C1-Formulas-Issue
++----------------------------------------------------------------
++Verify_Delete
++ TEST START : Verify_Delete
++  ITEM Assertion OK : Ranges are intersecting: $G$13
++  ITEM Assertion OK : Delete with Default: $AJ$4
++  ITEM Assertion OK : Delete with ShifttoLeft: $AJ$4
++  ITEM Assertion OK : Delete with ShiftUp: $M$22
++END 'Verify_Delete' Symbol
++ TEST OK : Verify_Delete
++----------------------------------------------------------------
++Value-Issue
++ TEST START : Value-Issue
++  ITEM Assertion OK : Value of Range is: 12.3
++  ITEM Assertion OK : Text of Range is: 12.3
++  ITEM Assertion OK : Range has Formula: False
++  ITEM Assertion OK : Cell has Formula: False
++  ITEM Assertion FAIL : Text of Range is null: False
++  ITEM Assertion OK : Range has Formula: True
++  ITEM Assertion OK : Cell has Formula: True
++  ITEM Assertion OK : Value of Cell is: 12
++  ITEM Assertion OK : Application.Calculation is : -4135
++  ITEM Assertion OK : Calculation is automated: True
++  ITEM Assertion OK : Range has Formula: True
++  ITEM Assertion OK : Value of Cell is: 16
++  ITEM Assertion OK : Text of Cell is: 16
++  ITEM Assertion OK : Text of Cell is: 16
++  ITEM Assertion OK : Range has Formula after 'ClearContents: False
++  ITEM Assertion OK : Text of Cell is: 
++  ITEM Assertion OK : Text of Cell is: 
++END 'Value-Issue' Symbol
++ TEST OK : Value-Issue
++----------------------------------------------------------------
++AutoFit issue
++ TEST START : AutoFit issue
++  ITEM Assertion OK :  Columns.AutoFit: CurrentWidth is 679
++  ITEM Assertion OK :  Rows.AutoFit: CurrentHeight is 546
++END 'AutoFit issue' Symbol
++ TEST OK : AutoFit issue
++----------------------------------------------------------------
++Selections
++ TEST START : Selections
++  ITEM Assertion OK : ActiveCell is : $E$8
++  ITEM Assertion OK : Active Cell is : $E$8
++  ITEM Assertion OK : Number of Cells in Range: 52
++  ITEM Assertion OK : Number of Cells in Range: 52
++  ITEM Assertion OK : Number of Cells in Range: 52
++END 'Selections' Symbol
++ TEST OK : Selections
++----------------------------------------------------------------
++Offset-Resize
++ TEST START : Offset-Resize
++  ITEM Assertion OK : Offset is : $G$10:$I$15,$I$15:$M$21
++  ITEM Assertion OK : Offset is : $G$7:$I$12,$I$12:$M$18
++  ITEM Assertion OK :   Resized Range is : $A$20:$D$23
++END 'Offset-Resize' Symbol
++ TEST OK : Offset-Resize
++----------------------------------------------------------------
++Ranges-Address
++ TEST START : Ranges-Address
++  ITEM Assertion OK : Range Address is: $E$8:$G$13,$G$13:$K$19
++  ITEM Assertion OK : Range Address is: $E8:$G13,$G13:$K19
++  ITEM Assertion OK : Range Address is: E$8:G$13,G$13:K$19
++  ITEM Assertion OK : Range Address is: R8C5:R13C7,R13C7:R19C11
++  ITEM Assertion FAIL : Range Address is: R8C5:R13C7,R13C7:R19C11
++  ITEM Assertion OK : Range Address is: R8C5:R13C7,R13C7:R19C11
++  ITEM Assertion OK : Range Address is: R[6]C[3]:R[11]C[5],R[11]C[5]:R[17]C[9]
++  ITEM Assertion OK : RangeAddress is [Ranges.xls]Sheet1!$E$8:$G$13,$G$13:$K$19
++END 'Ranges-Address' Symbol
++ TEST OK : Ranges-Address
++----------------------------------------------------------------
++Range-Address
++ TEST START : Range-Address
++  ITEM Assertion OK : Range Address is: $E$8:$G$13
++  ITEM Assertion OK : Range Address is: $E8:$G13
++  ITEM Assertion OK : Range Address is: E$8:G$13
++  ITEM Assertion OK : Range Address is: R8C5:R13C7
++  ITEM Assertion FAIL : Range Address is: R8C5:R13C7
++  ITEM Assertion OK : Range Address is: R8C5:R13C7
++  ITEM Assertion OK : Range Address is: R[6]C[3]:R[11]C[5]
++  ITEM Assertion OK : RangeAddress is [Ranges.xls]Sheet1!$E$8:$G$13
++END 'Range-Address' Symbol
++ TEST OK : Range-Address
++----------------------------------------------------------------
++Column-Address
++ TEST START : Column-Address
++  ITEM Assertion OK : Range Address is: $F$8:$F$13
++  ITEM Assertion OK : Range Address is: $F8:$F13
++  ITEM Assertion OK : Range Address is: F$8:F$13
++  ITEM Assertion OK : Range Address is: R8C6:R13C6
++  ITEM Assertion FAIL : Range Address is: R8C6:R13C6
++  ITEM Assertion OK : Range Address is: R8C6:R13C6
++  ITEM Assertion OK : Range Address is: R[6]C[4]:R[11]C[4]
++  ITEM Assertion OK : RangeAddress is [Ranges.xls]Sheet1!$F$8:$F$13
++END 'Column-Address' Symbol
++ TEST OK : Column-Address
++----------------------------------------------------------------
++Row-Address
++ TEST START : Row-Address
++  ITEM Assertion OK : Range Address is: $E$9:$G$9
++  ITEM Assertion OK : Range Address is: $E9:$G9
++  ITEM Assertion OK : Range Address is: E$9:G$9
++  ITEM Assertion OK : Range Address is: R9C5:R9C7
++  ITEM Assertion FAIL : Range Address is: R9C5:R9C7
++  ITEM Assertion OK : Range Address is: R9C5:R9C7
++  ITEM Assertion OK : Range Address is: R[7]C[3]:R[7]C[5]
++  ITEM Assertion OK : RangeAddress is [Ranges.xls]Sheet1!$E$9:$G$9
++END 'Row-Address' Symbol
++ TEST OK : Row-Address
++----------------------------------------------------------------
++SingleCell-Address
++ TEST START : SingleCell-Address
++  ITEM Assertion OK : Range Address is: $F$9
++  ITEM Assertion OK : Range Address is: $F9
++  ITEM Assertion OK : Range Address is: F$9
++  ITEM Assertion OK : Range Address is: R9C6
++  ITEM Assertion FAIL : Range Address is: R9C6
++  ITEM Assertion OK : Range Address is: R9C6
++  ITEM Assertion OK : Range Address is: R[7]C[4]
++  ITEM Assertion OK : RangeAddress is [Ranges.xls]Sheet1!$F$9
++END 'SingleCell-Address' Symbol
++ TEST OK : SingleCell-Address
++----------------------------------------------------------------
++Heights and Widths
++ TEST START : Heights and Widths
++  ITEM Assertion OK : Range RowHeight is 40
++  ITEM Assertion OK : Range ColumnWidth is 50
++  ITEM Assertion OK : Range Height is 240
++  ITEM Assertion OK : Range Width is 787.5
++  ITEM Assertion OK : Range RowHeight is 50
++  ITEM Assertion OK : Range ColumnWidth is 50
++  ITEM Assertion OK : Range Height is 300
++  ITEM Assertion OK : Range Width is 787.5
++  ITEM Assertion OK : RowHeight is null: True
++  ITEM Assertion OK : ColumnWidth is null: True
++END 'Heights and Widths' Symbol
++ TEST OK : Heights and Widths
++----------------------------------------------------------------
++RangeRowColumn-Issue
++ TEST START : RangeRowColumn-Issue
++  ITEM Assertion OK : Row is: 8
++  ITEM Assertion OK : Column is: 5
++  ITEM Assertion OK : EntireRow.Columns.Count = 1024
++  ITEM Assertion OK : EntireColumn.Rows.Count = 131072
++END 'RangeRowColumn-Issue' Symbol
++ TEST OK : RangeRowColumn-Issue
++----------------------------------------------------------------
++Replace-Issue
++ TEST START : Replace-Issue
++  ITEM Assertion OK : Value after Replace: YourValue
++  ITEM Assertion OK : Value after Replace: YourValue
++  ITEM Assertion OK : Value after Replace: ReplaceValue
++  ITEM Assertion OK : Value after Replace: New ReplaceValue
++  ITEM Assertion OK : Value after Replace: New ReplaceValue
++  ITEM Assertion OK : Value after Replace: New Replace
++  ITEM Assertion OK : Value after Replace: 
++END 'Replace-Issue' Symbol
++ TEST OK : Replace-Issue
++----------------------------------------------------------------
++Hidden-Issue
++ TEST START : Hidden-Issue
++  ITEM Assertion OK : -  Range.Rows.Hidden (set)
++  ITEM Assertion OK : -  Range.Rows.Hidden (get)
++  ITEM Assertion OK : -  Range.Rows.Item(1).Hidden (set)
++  ITEM Assertion OK : -  Range.Rows.Item(1).Hidden (get)
++  ITEM Assertion OK : -  Range.Columns.Hidden (set)
++  ITEM Assertion OK : -  Range.Columns.Hidden (get)
++  ITEM Assertion OK : -  Range.Columns.Item(1).Hidden (set)
++  ITEM Assertion OK : -  Range.Columns.Item(1).Hidden (get)
++END 'Hidden-Issue' Symbol
++ TEST OK : Hidden-Issue
++----------------------------------------------------------------
++End issue
++ TEST START : End issue
++  ITEM Assertion OK : -  = $E$48
++  ITEM Assertion OK : -  = $E$1
++  ITEM Assertion OK : -  = $E$3
++  ITEM Assertion OK : -  = $A$8
++  ITEM Assertion OK : -  = $B$8
++  ITEM Assertion OK : -  = $AMJ$8
++  ITEM Assertion OK : -  = $Z$8
++END 'End issue' Symbol
++ TEST OK : End issue
++----------------------------------------------------------------
++Outline issue
++ TEST START : Outline issue
++  ITEM Assertion OK : -  Range.clearOutline - please check visually
++  ITEM Assertion OK : -  Range.AutoOutline - please check visually
++  ITEM Assertion OK : -  Range.AutoOutline - please check visually
++END 'Outline issue' Symbol
++ TEST OK : Outline issue
++----------------------------------------------------------------
++Validation
++ TEST START : Validation
++  ITEM Assertion OK : Validation Input Message is : Attention!
++  ITEM Assertion OK : Validation Input Message is : Enter an integer from five to ten
++  ITEM Assertion OK : Validation Error Title is : You must enter a number from five to ten
++  ITEM Assertion OK : Validation Error Message is : An Error occured
++  ITEM Assertion OK : Validation Error Title is : Microsoft Excel
++END 'Validation' Symbol
++ TEST OK : Validation
++Test run finished : 17/09/2009 12:17:34
+Index: sc/source/ui/vba/testvba/Logs/Ranges-3.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/Ranges-3.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/Ranges-3.log	(revision 276288)
+@@ -0,0 +1,8 @@
++Test run started : 17/09/2009 12:17:24
++----------------------------------------------------------------
++MyGoalseek-Issue
++ TEST START : MyGoalseek-Issue
++  ITEM Assertion OK : Variable Range value: 15
++END 'MyGoalseek-Issue' Symbol
++ TEST OK : MyGoalseek-Issue
++Test run finished : 17/09/2009 12:17:24
+Index: sc/source/ui/vba/testvba/Logs/Shapes.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/Shapes.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/Shapes.log	(revision 276288)
+@@ -0,0 +1,77 @@
++Test run started : 17/09/2009 12:17:37
++BEGIN Shapes_Collection_Behaviour
++ TEST START : Shapes_Collection_Behaviour
++  ITEM Assertion OK : Name of indexed shape should be 'Sheet2Shape1' 
++  ITEM Assertion OK : Name of indexed shape should be 'Sheet2Shape2' 
++ TEST Success. : Shapes_Collection_Behaviour
++END Shapes_Collection_Behaviour
++BEGIN Shapes_Select_Item
++ TEST START : Shapes_Select_Item
++  ITEM Assertion OK : Correctly selected shape through Range
++  ITEM Assertion OK : Correctly selected shape through Item
++  ITEM Assertion OK : Needs to be visually checked. Is there a line on the document?
++  ITEM Assertion OK : Needs to be visually checked. Are All Shapes Selected?
++ TEST Success. : Shapes_Select_Item
++END Shapes_Select_Item
++BEGIN Shapes_Fill
++ TEST START : Shapes_Fill
++  ITEM Assertion OK : correctly set visibility of shape fill
++  ITEM Assertion OK : correctly set transparency of shape line
++  ITEM Assertion OK : correctly set forecolor of shape fill
++  ITEM Assertion FAIL : correctly set backcolor of shape fill
++  ITEM Assertion OK : the success of the TwoColorGradient method needs to be verified visually!
++  ITEM Assertion OK : correctly set forecolor of shape fill
++  ITEM Assertion FAIL : correctly set forecolor of shape fill
++ TEST Success. : Shapes_Fill
++END  Shapes_Fill
++BEGIN Shapes_Line
++ TEST START : Shapes_Line
++  ITEM Assertion FAIL : correctly set weight of shape line
++  ITEM Assertion OK : correctly set visibility of shape line
++  ITEM Assertion OK : correctly set transparency of shape line
++  ITEM Assertion OK : correctly set dash style of shape line
++  ITEM Assertion OK : correctly set dash style of shape line
++  ITEM Assertion OK : correctly set forecolor of shape line
++  ITEM Assertion FAIL : correctly set backcolor of shape line
++ TEST Success. : Shapes_Line
++END  Shapes_Line
++BEGIN Shapes_TextFrame
++ TEST START : Shapes_TextFrame
++  ITEM Assertion OK : correctly set Autosize of Shape TextFrame
++ TEST Success. : Shapes_TextFrame
++END  Shapes_TextFrame
++BEGIN Shapes_SimpleGeometry
++ TEST START : Shapes_SimpleGeometery
++  ITEM Assertion OK : shape height should be 46.7023593888278 and got 46.6866112323395
++  ITEM Assertion OK : shape width should be 101.496056724658 and got 101.48030856817
++  ITEM Assertion OK : shape left should be 68.5574761223637 and got 68.5417279658754
++  ITEM Assertion OK : shape top should be 41.6850368702339 and got 41.6692887137456
++  ITEM Assertion OK : shape rotation should be 0 and got 0
++  ITEM Assertion OK : shape rotation should be 25 and got 25
++  ITEM Assertion OK : shape incrementrotation should be 50 and got 50
++  ITEM Assertion OK : shape incrementleft should be 70.7968460600412 and got 70.7810979035529
++  ITEM Assertion OK : shape incrementtop should be 90.8944825893239 and got 90.8787344328356
++ TEST Success. : Shapes_SimpleGeometery
++END Shapes_SimpleGeometry
++BEGIN Shapes_Range
++ TEST START : Shapes_Range
++  ITEM Assertion OK : expected Sheets(2).Shapes.Range(1) to contain 1 element, it contains 1
++  ITEM Assertion OK : expected Sheets(2).Shapes.Range(1) to return Sheet2Shape1 got Sheet2Shape1
++  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Sheet2Shape3) to contain 1 element, it contains 1
++  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Sheet2Shape3) to return Sheet2Shape3 got Sheet2Shape3
++  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Array(3, 1) to contain 2 elements, it contains 2
++  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Array(3, 1) to return concated element/shape names Sheet2Shape3Sheet2Shape1 and got Sheet2Shape3Sheet2Shape1
++  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Array('Sheet2Shape3', 1, 'Sheet2Shape2')) to contain 3 elements, it contains 3
++  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Array('Sheet2Shape3', 1, 'Sheet2Shape2')) to return concated element/shape names Sheet2Shape3Sheet2Shape1Sheet2Shape2 and got Sheet2Shape3Sheet2Shape1Sheet2Shape2
++ TEST Success. : Shapes_Range
++END Shapes_Range
++BEGIN Shapes_ShapeRange
++ TEST START : Shapes_ShapeRange
++  ITEM Assertion OK : ShapeRange.IncrementLeft shp1.left should be 90.7810979035529 and got 90.7653486132064
++  ITEM Assertion OK : ShapeRange.IncrementLeft shp2.left should be 240.02518299054 and got 240.009433700193
++  ITEM Assertion OK : ShapeRange.IncrementTop shp1.Top should be 110.878734432836 and got 110.862985142489
++  ITEM Assertion OK : ShapeRange.IncrementTop shp2.Top should be 64.6740129339204 and got 64.6582636435739
++  ITEM Assertion OK : ShapeRange.IncrementRotation shp1.Rotation should be 70 and got 70
++  ITEM Assertion OK : ShapeRange.IncrementRotation shp2.Rotation should be 20 and got 20
++END Shapes_ShapeRange
++Test run finished : 17/09/2009 12:17:37
+Index: sc/source/ui/vba/testvba/Logs/TestAddress.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/TestAddress.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/TestAddress.log	(revision 276288)
+@@ -0,0 +1,67 @@
++Test run started : 17/09/2009 12:17:43
++----------------------------------------------------------------
++TestAddress
++ TEST START : TestAddress
++  ITEM Assertion OK : test1 Range('e3:f3') A1 style addressing
++  ITEM Assertion OK : test2 Range('e3:f3') R1C1 style addressing
++  ITEM Assertion OK : test3 Range ('e:f')  A1 style addressing
++  ITEM Assertion OK : test4 Range ('e:f')  R1C1 style addressing
++  ITEM Assertion OK : test5 Columns A1 style addressing
++  ITEM Assertion OK : test6 Columns R1C1 style addressing
++  ITEM Assertion OK : test7 Columns(3) A1 style addressing
++  ITEM Assertion OK : test8 Columns(3) R1C1 style addressing
++  ITEM Assertion OK : test9 Columns('e') A1 style addressing
++  ITEM Assertion OK : test10 Columns('e') R1C1 style addressing
++  ITEM Assertion OK : test11 Columns('b:d') A1 style addressing
++  ITEM Assertion OK : test12 Columns('b:d') R1C1 style addressing
++  ITEM Assertion OK : test13 Range('c1:g10').Columns A1 style addressing
++  ITEM Assertion OK : test14 Range('c1:g10').Columns R1C1 style addressing
++  ITEM Assertion OK : test15 Range('c1:g10').Columns(1) A1 style addressing
++  ITEM Assertion OK : test16 Range('c1:g10').Columns(1) R1C1 style addressing
++  ITEM Assertion OK : test17 Range('c1:g10').Columns('a') A1 style addressing
++  ITEM Assertion OK : test18 Range('c1:g10').Columns('a') R1C1 style addressing
++  ITEM Assertion OK : test19 Range('c1:g10').Columns('c') A1 style addressing
++  ITEM Assertion OK : test20 Range('c1:g10').Columns('c') R1C1 style addressing
++  ITEM Assertion OK : test21 Range('c1:g10').Columns('x:z') A1 style addressing
++  ITEM Assertion OK : test22 Range('c1:g10').Columns('x:z') R1C1 style addressing
++  ITEM Assertion OK : test23 Range('c1:g10').Columns(30) A1 style addressing
++  ITEM Assertion OK : test24 Range('c1:g10').Columns(30) R1C1 style addressing
++  ITEM Assertion OK : test25 Worksheets('Sheet2').Cells(1, 1) A1 style addressing
++  ITEM Assertion OK : test26 Worksheets('Sheet2').Cells(1, 1) A1 style addressing, RowAddressAbsolute is false 
++  ITEM Assertion OK : test27 Worksheets('Sheet2').Cells(1, 1) A1 style addressing, ColAddressAbsolute is false 
++  ITEM Assertion OK : test28 Worksheets('Sheet2').Cells(1, 1) R1C1 style addressing
++  ITEM Assertion OK : test29 Worksheets('Sheet2').Range('A1:E5').EntireColumn A1 style addressing
++  ITEM Assertion OK : test30 Worksheets('Sheet2').Range('A1').EntireColumn A1 style addressing
++  ITEM Assertion OK : test31 Worksheets('Sheet2').Range('A1:E5').EntireRow A1 style addressing
++  ITEM Assertion OK : test32 Worksheets('Sheet2').Range('A1') A1 style addressing
++  ITEM Assertion OK : test33 Worksheets('Sheet2').Range('IV65536').EntireRow A1 style addressing
++  ITEM Assertion OK : test34 Worksheets('Sheet2').Range('IU2:IV65536') A1 style addressing
++  ITEM Assertion OK : test35 Range('c1:g10').Columns('x:z') R1C1 style addressing
++  ITEM Assertion OK : test36 Worksheets('Sheet2').Range('A1') A1 style addressing
++  ITEM Assertion OK : test37 Worksheets('Sheet2').Range('A1:E5').EntireColumn A1 style addressing
++  ITEM Assertion OK : test38 Worksheets('Sheet2').Range('10:12') A1 style addressing
++  ITEM Assertion OK : test39 Worksheets('Sheet2').Range('10:12') R1C1 style addressing
++  ITEM Assertion OK : test40 Range('Sheet3!A1:B4') A1 style addressing
++  ITEM Assertion OK : test41 Range('Sheet3!A1,B1,D4:F20') A1 style addressing
++  ITEM Assertion OK : test42 Range('g20:h40').Columns('c:c')
++  ITEM Assertion OK : test43 Range('g20:h40').Columns('c:f')
++  ITEM Assertion OK : test44 Range('g20:h40').Columns(-1)
++  ITEM Assertion OK : test45 Range('c4:g10').Rows(-1)
++  ITEM Assertion OK : test46 Range('a2:b4').Rows('1:1')
++  ITEM Assertion OK : test47 Range('a2:b4').Rows('1:2')
++  ITEM Assertion OK : test48 Range('a2:b4').Rows('2:2')
++  ITEM Assertion OK : test49 Range('a2:b4').Rows('2:3')
++  ITEM Assertion OK : test50 Range(' A2:B4 ')
++  ITEM Assertion OK : test51 Range('A 2:B 4')
++  ITEM Assertion OK : test52 Range('A2 : B4 ')
++  ITEM Assertion OK : test53 Range('Sheet1 !A2 : B4 ')
++  ITEM Assertion OK : test54 Range('Sheet1! A2 : B4 ')
++Test Results
++============
++
++Tests passed: 54
++Tests failed: 0
++
++END 'TestAddress
++ TEST OK : TestAddress
++Test run finished : 17/09/2009 12:17:43
+Index: sc/source/ui/vba/testvba/Logs/TestUnion.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/TestUnion.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/TestUnion.log	(revision 276288)
+@@ -0,0 +1,17 @@
++Test run started : 17/09/2009 12:18:05
++----------------------------------------------------------------
++TestUnion
++ TEST START : TestUnion
++  ITEM Assertion OK : test1Application.Range('A2:D10'), Range('C4:E6')
++  ITEM Assertion OK : test2Application.Range('A2:D5,a3:d4'), Range('A4:G10')
++  ITEM Assertion OK : test3Application.Range('A4:G10,A1:B6'), Range('A2:D5,A3:D4')
++  ITEM Assertion OK : test4Application.Range('A5:D10'), Range('B5:E10')
++Test Results
++============
++
++Tests passed: 4
++Tests failed: 0
++
++END 'TestUnion
++ TEST OK : TestUnion
++Test run finished : 17/09/2009 12:18:05
+Index: sc/source/ui/vba/testvba/Logs/format.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/format.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/format.log	(revision 276288)
+@@ -0,0 +1,36 @@
++Test run started : 17/09/2009 12:17:09
++BEGIN Format
++ TEST START : Test Predefined_Number_Format_Sample function
++  ITEM Assertion OK : General Number: 562486.2356
++  ITEM Assertion OK : Fixed: 0.20
++  ITEM Assertion OK : Standard: 562,486.24
++  ITEM Assertion OK : Percent: 75.21%
++  ITEM Assertion OK : Scientific: 5.62E+05
++  ITEM Assertion OK : Scientific: -3.46E+03
++  ITEM Assertion OK : Yes/No: No
++  ITEM Assertion OK : Yes/No: Yes
++  ITEM Assertion OK : True/False: False
++  ITEM Assertion OK : True/False: True
++  ITEM Assertion OK : On/Off: Off
++  ITEM Assertion OK : On/Off: On
++ TEST OK : Test Predefined_Number_Format_Sample function
++ TEST START : Test Custom_Number_Format_Sample function
++  ITEM Assertion OK : 00.0000: 23.6750
++  ITEM Assertion OK : 00.00: 23.68
++  ITEM Assertion OK : 00000: 02658
++  ITEM Assertion OK : 00.00: 2658.00
++  ITEM Assertion OK : ##.####: 23.675
++  ITEM Assertion OK : ##.##: 23.68
++  ITEM Assertion OK : #,###.##: 12,345.25
++  ITEM Assertion OK : ##.00%: 25.00%
++  ITEM Assertion OK : #,###: 1,000,000
++  ITEM Assertion OK : ######E-###: 109838E-5
++  ITEM Assertion OK : $#,###.##: $2,345.25
++  ITEM Assertion OK : ##.###\%: .25%
++ TEST OK : Test Custom_Number_Format_Sample function
++ TEST START : Test Custom_Text_Format_Sample function
++  ITEM Assertion OK : <: vba
++  ITEM Assertion OK : >: VBA
++ TEST OK : Test Custom_Text_Format_Sample function
++END  Format
++Test run finished : 17/09/2009 12:17:09
+Index: sc/source/ui/vba/testvba/Logs/CalcFont.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/CalcFont.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/CalcFont.log	(revision 276288)
+@@ -0,0 +1,17 @@
++Test run started : 17/09/2009 12:17:04
++CalcFont_Format
++ TEST START : Font_Format
++  ITEM Assertion OK : correctly set font to Bold
++  ITEM Assertion OK : correctly set font to Italic
++  ITEM Assertion OK : correctly read FontStyle
++  ITEM Assertion OK : correctly set font to Shadow
++  ITEM Assertion OK : correctly set font color
++  ITEM Assertion OK : correctly set font color index
++  ITEM Assertion OK : correctly set font name
++  ITEM Assertion OK : correctly set font outline
++  ITEM Assertion OK : correctly set font size
++  ITEM Assertion OK : correctly set font strikethrough
++  ITEM Assertion OK : correctly set font underline
++ TEST Success. : Font_Format
++CalcFont_Format
++Test run finished : 17/09/2009 12:17:05
+Index: sc/source/ui/vba/testvba/Logs/bytearraystring.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/bytearraystring.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/bytearraystring.log	(revision 276288)
+@@ -0,0 +1,8 @@
++Test run started : 17/09/2009 12:17:03
++BEGIN Bytearray To String
++ TEST START : Test the conversion between bytearray and string
++  ITEM Assertion OK :  The number of byte is:6
++  ITEM Assertion OK : the return string is: abc
++ TEST OK : Test the conversion between bytearray and string
++END  Bytearray To String
++Test run finished : 17/09/2009 12:17:03
+Index: sc/source/ui/vba/testvba/Logs/window2.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/window2.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/window2.log	(revision 276288)
+@@ -0,0 +1,41 @@
++Test run started : 17/09/2009 12:16:59
++BEGIN Window2
++ TEST START : Test Window.SplitRow
++  ITEM Assertion OK : Test SplitColumn: 2 (Test only applies to maximized Window and at least has 800*600 solotion)
++  ITEM Assertion OK : Test SplitRow: 2 (Test only applies to maximized Window and at least has 800*600 solotion)
++  ITEM Assertion OK : Test SplitVertical: 242.283803521067
++  ITEM Assertion OK : Test SplitHorizontal: 242.283803521067
++  ITEM Assertion OK : Test SplitRow: 4 (Test only applies to maximized Window and at least has 800*600 solotion)
++  ITEM Assertion OK : Test SplitColumn: 3 (Test only applies to maximized Window and at least has 800*600 solotion)
++  ITEM Assertion OK : Test SplitColumn: 0
++  ITEM Assertion OK : Test SplitRow: 0
++ TEST OK : Test Window.SplitRow
++ TEST START : Test Window.DisplayGridlines
++  ITEM Assertion OK : Test gridlines are on
++  ITEM Assertion OK : Test gridlines are off
++ TEST OK : Test Window.DisplayGridlines
++ TEST START : Test Window.DisplayHeadings
++  ITEM Assertion OK : Test Headings are on
++  ITEM Assertion OK : Test Headings are off
++ TEST OK : Test Window.DisplayHeadings
++ TEST START : Test Window.Visibility
++  ITEM Assertion OK : Window is visible
++  ITEM Assertion OK : Window is not visible
++ TEST OK : Test Window.Visibility
++ TEST START : Test Window.FreezePanes
++  ITEM Assertion OK : Test no panes frozen
++  ITEM Assertion OK : Test panes frozen at center
++  ITEM Assertion OK : Test panes frozen at split
++ TEST OK : Test Window.FreezePanes
++ TEST START : Test Window.View
++ TEST OK : Test Window.View
++ TEST START : Test Window.Zoom
++  ITEM Assertion OK : Test zoom=100%
++  ITEM Assertion OK : Test zoom=150%
++ TEST OK : Test Window.Zoom
++ TEST START : Test Windows.Count
++  ITEM Assertion OK : Windows Count: 1
++  ITEM Assertion OK : Application.Windows Count: 1
++ TEST OK : Test Windows.Count
++END  Window2
++Test run finished : 17/09/2009 12:17:00
+Index: sc/source/ui/vba/testvba/Logs/MiscOperatorTests.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/MiscOperatorTests.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/MiscOperatorTests.log	(revision 276288)
+@@ -0,0 +1,30 @@
++Test run started : 17/09/2009 12:17:10
++----------------------------------------------------------------
++TestAddress
++ TEST START : TestAddress
++  ITEM Assertion OK : test1: res = Not ( A > B )
++  ITEM Assertion OK : test2: res = Not ( B > A )
++  ITEM Assertion OK : test3: res = Not ( D )
++  ITEM Assertion OK : test4: res = Not A
++  ITEM Assertion OK : test5: res = ( A > D )
++  ITEM Assertion OK : test6: res = ( D > A )
++  ITEM Assertion OK : test7: res = ( A < D )
++  ITEM Assertion OK : test8: res = ( D < A )
++  ITEM Assertion OK : test9: res = ( A >= D )
++  ITEM Assertion OK : test10: res = ( D >= A )
++  ITEM Assertion OK : test11: res = ( A <= D )
++  ITEM Assertion OK : test12: res = ( D <= A )
++  ITEM Assertion OK : test13: res = ( D = A )
++  ITEM Assertion OK : test14: res = ( A = D )
++  ITEM Assertion OK : test15: res = ( D <> A )
++  ITEM Assertion OK : test16: res = ( A <> D )
++  ITEM Assertion OK : test17: ( A = D ) = True 
++Test Results
++============
++
++Tests passed: 17
++Tests failed: 0
++
++END 'TestAddress
++ TEST OK : TestAddress
++Test run finished : 17/09/2009 12:17:10
+Index: sc/source/ui/vba/testvba/Logs/MiscRangeTests.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/MiscRangeTests.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/MiscRangeTests.log	(revision 276288)
+@@ -0,0 +1,45 @@
++Test run started : 17/09/2009 12:17:12
++----------------------------------------------------------------
++MiscRangeTests
++ TEST START : MiscRangeTests
++  ITEM Assertion OK : test 1
++  ITEM Assertion OK : test 2
++  ITEM Assertion OK : test 3
++  ITEM Assertion OK : test 4
++  ITEM Assertion OK : test 5
++  ITEM Assertion OK : test 6
++  ITEM Assertion OK : test 7
++  ITEM Assertion OK : test 8
++  ITEM Assertion OK : test 9
++  ITEM Assertion OK : test 10
++  ITEM Assertion OK : test 11
++  ITEM Assertion OK : test 12
++  ITEM Assertion OK : test 13
++  ITEM Assertion OK : test 14
++  ITEM Assertion OK : test 15
++  ITEM Assertion OK : test 16
++  ITEM Assertion OK : test 17
++  ITEM Assertion OK : test 18
++  ITEM Assertion OK : test 19
++  ITEM Assertion OK : test 20
++  ITEM Assertion OK : test 21
++  ITEM Assertion OK : test 22
++  ITEM Assertion OK : test 23
++  ITEM Assertion OK : test 24
++  ITEM Assertion OK : test 25
++  ITEM Assertion OK : test 26
++  ITEM Assertion OK : test 27
++  ITEM Assertion OK : test 28
++  ITEM Assertion OK : test 29
++  ITEM Assertion OK : test 30
++  ITEM Assertion OK : test 31
++No. tests: 31
++Summary
++=======
++Run:       31
++Passed:    31
++Failed:    0
++
++END 'MiscRangeTests
++ TEST OK : MiscRangeTests
++Test run finished : 17/09/2009 12:17:14
+Index: sc/source/ui/vba/testvba/Logs/pagesetup.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/pagesetup.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/pagesetup.log	(revision 276288)
+@@ -0,0 +1,77 @@
++Test run started : 17/09/2009 12:18:11
++BEGIN PageSetup
++ TEST START : Sheet_PrintArea
++  ITEM Assertion OK : PrintArea has changed as expected
++ TEST OK : Sheet_PrintArea
++ TEST START : Test margins (no headers)
++  ITEM Assertion OK : PageSetup.LeftMargin set/get
++  ITEM Assertion OK : PageSetup.RightMargin set/get
++  ITEM Assertion OK : PageSetup.TopMargin set/get
++  ITEM Assertion OK : PageSetup.BottomMargin set/get
++Verify that page margins on sheet 1 are all 0.5inch   
++ TEST OK : Test margins (no headers)
++ TEST START : Test margins (headers)
++  ITEM Assertion OK : PageSetup.HeaderMargin set/get
++  ITEM Assertion OK : PageSetup.FooterMargin set/get
++  ITEM Assertion OK : PageSetup.LeftMargin set/get
++  ITEM Assertion OK : PageSetup.LeftMargin set/get
++Verify that top/bottom/header/footer page margins on sheet 2 are all 0.5inch 
++ TEST OK : Test margins (headers)
++ TEST START : Test header/footer text
++  ITEM Assertion OK : PageSetup.LeftHeader set
++  ITEM Assertion OK : PageSetup.LeftHeader set/get
++  ITEM Assertion OK : PageSetup.CenterHeader set
++  ITEM Assertion OK : PageSetup.CenterHeader set/get
++  ITEM Assertion OK : PageSetup.RightHeader set
++  ITEM Assertion OK : PageSetup.RightHeader set/get
++  ITEM Assertion OK : PageSetup.LeftFooter set
++  ITEM Assertion OK : PageSetup.LeftFooter set/get
++  ITEM Assertion OK : PageSetup.CenterFooter set
++  ITEM Assertion OK : PageSetup.CenterFooter set/get
++  ITEM Assertion OK : PageSetup.RightFooter set
++  ITEM Assertion OK : PageSetup.RightFooter set/get
++Verify that headers on sheet 2 are Ready,to,go
++Verify that footers on sheet 2 are This,now,Works
++ TEST OK : Test header/footer text
++ TEST START : Test zoom
++  ITEM Assertion OK : PageSetup.Zoom set
++  ITEM Assertion OK : PageSetup.Zoom set/get
++Verify that sheet 1 zoom is 10%
++ TEST OK : Test zoom
++ TEST START : Test orientation
++  ITEM Assertion OK : PageSetup.Zoom set
++  ITEM Assertion OK : PageSetup.Orientation set/get
++Verify that sheet 1 orientation is now landscape
++ TEST OK : Test orientation
++ TEST START : Test order
++  ITEM Assertion OK : PageSetup.Order get
++  ITEM Assertion OK : PageSetup.Order set/get
++Verify that order on sheet 1 is now over, then down.
++ TEST OK : Test order
++ TEST START : Test first page number
++  ITEM Assertion OK : PageSetup.FirstPageNumber get
++  ITEM Assertion OK : PageSetup.FirstPageNumber set/get
++Verify that first page number on sheet 1 is now 2.
++ TEST OK : Test first page number
++ TEST START : Test center vertically
++  ITEM Assertion OK : PageSetup.CenterVertically get
++  ITEM Assertion OK : PageSetup.CenterVertically set/get
++Verify that CenterVertically on sheet 1 is now true.
++ TEST OK : Test center vertically
++ TEST START : Test center horizontally
++  ITEM Assertion OK : PageSetup.CenterHorizontally get
++  ITEM Assertion OK : PageSetup.CenterHorizontally set/get
++Verify that CenterHorizontally on sheet 1 is now true.
++ TEST OK : Test center horizontally
++ TEST START : Test FitToPagesTall
++  ITEM Assertion OK : PageSetup.FitToPagesTall set/get
++ TEST OK : Test FitToPagesTall
++ TEST START : Test FitToPagesWide
++  ITEM Assertion OK : PageSetup.FitToPagesWide set/get
++ TEST OK : Test FitToPagesWide
++ TEST START : Test PrintHeadings
++  ITEM Assertion OK : PageSetup.PrintHeadings set/get
++  ITEM Assertion OK : PageSetup.PrintHeadings set/get
++ TEST OK : Test PrintHeadings
++END  PageSetup
++Test run finished : 17/09/2009 12:18:11
+Index: sc/source/ui/vba/testvba/Logs/range-4.log
+===================================================================
+--- sc/source/ui/vba/testvba/Logs/range-4.log	(revision 0)
++++ sc/source/ui/vba/testvba/Logs/range-4.log	(revision 276288)
+@@ -0,0 +1,16 @@
++Test run started : 17/09/2009 12:17:19
++----------------------------------------------------------------
++ShowDetail-Issue
++ TEST START : ShowDetail-Issue
++  ITEM Assertion OK :  Range.ShowDetail is True
++  ITEM Assertion OK :  Range.ShowDetail is False
++END 'ShowDetail-Issue' Symbol
++ TEST OK : ShowDetail-Issue
++----------------------------------------------------------------
++RangeMerged-Issue
++ TEST START : RangeMerged-Issue
++  ITEM Assertion OK :  Range.RangeMerged is $F$2:$H$5
++  ITEM Assertion OK :  The first address of Range.RangeMerged is $F$2
++END 'RangeMerged-Issue' Symbol
++ TEST OK : RangeMerged-Issue
++Test run finished : 17/09/2009 12:17:19
+Index: sc/source/ui/vba/testvba/testrun.log
+===================================================================
+--- sc/source/ui/vba/testvba/testrun.log	(revision 0)
++++ sc/source/ui/vba/testvba/testrun.log	(revision 276288)
+@@ -0,0 +1,417 @@
++thanks, you gave me 1 command-line arguments.
++/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org
++use the latest build
++Linux
++0 = ( 0 || 0 || 0 )
++/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org:/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org3/program:/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/program::/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/basis3.2/program:/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/ure/lib:/usr/lib/mpi/gcc/openmpi/lib
++/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org3/program:/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/program::/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/basis3.2/program:/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/ure/lib/../bin:/usr/lib/mpi/gcc/openmpi/bin:/data4/home/npower/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/opt/kde3/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin:/usr/lib/qt3/bin:/opt/real/RealPlayer
++en_GB.UTF-8
++runCmd = /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/testclient /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs
++got servicemanager
++got desktop
++Entries 28
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/window2.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/window2.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /window2.xls
++move log file from file:///data4/home/npower/Documents//window2.log
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/window2.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /bytearraystring.xls
++move log file from file:///data4/home/npower/Documents//bytearraystring.log
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/CalcFont.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/CalcFont.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/CalcFont.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /dateserial.xls
++move log file from file:///data4/home/npower/Documents//dateserial.log
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /datevalue.xls
++move log file from file:///data4/home/npower/Documents//datevalue.log
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/format.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/format.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /format.xls
++move log file from file:///data4/home/npower/Documents//format.log
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/format.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscOperatorTests.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscOperatorTests.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscOperatorTests.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /PageBreaks.xls
++move log file from file:///data4/home/npower/Documents//PageBreaks.log
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /PageSetup.xls
++move log file from file:///data4/home/npower/Documents//PageSetup.log
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/partition.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/partition.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /partition.xls
++move log file from file:///data4/home/npower/Documents//partition.log
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/partition.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/range-4.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/range-4.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /range-4.xls
++move log file from file:///data4/home/npower/Documents//range-4.log
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/range-4.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/replace.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/replace.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /replace.xls
++move log file from file:///data4/home/npower/Documents//replace.log
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/replace.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /StrConv-test.xls
++move log file from file:///data4/home/npower/Documents//StrConv-test.log
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++/data4/home/npower
++file name /stringplusdouble.xls
++move log file from file:///data4/home/npower/Documents//stringplusdouble.log
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Template.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Template.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Template.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestIntersection.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestIntersection.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestIntersection.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestUnion.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestUnion.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestUnion.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/VariantTest.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/VariantTest.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/VariantTest.xls
++processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Window.xls
++try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Window.xls
++got xDoc
++try to get the ScriptProvider
++get the ScriptProvider
++try to get the Script
++get the Script
++move log file
++moved to new location
++try to close
++closed
++complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Window.xls
++analyseCmd = perl /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/testResults.pl /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix
++logdir /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs
++testlogdir /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/CalcFont.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/CalcFont.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest2.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest2.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/PageBreaks.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/PageBreaks.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/stringplusdouble.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/stringplusdouble.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Window.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Window.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/partition.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/partition.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/datevalue.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/datevalue.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/replace.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/StrConv-test.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/StrConv-test.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Template.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Template.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/dateserial.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/dateserial.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/AutoFilter.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-2.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Ranges-2.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-3.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Ranges-3.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Ranges.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Shapes.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Shapes.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/TestAddress.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/format.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/bytearraystring.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/bytearraystring.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/window2.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscRangeTests.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/MiscRangeTests.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/pagesetup.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/pagesetup.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/range-4.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/range-4.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/MiscOperatorTests.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestIntersection.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/TestIntersection.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestUnion.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/TestUnion.log
++processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/VariantTest.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/VariantTest.log
++skipped 1 test-cases(s)
++compared 27 test-case documents
++	 	 27 tests passedTests
+Index: sc/source/ui/vba/testvba/testvba.cxx
+===================================================================
+--- sc/source/ui/vba/testvba/testvba.cxx	(revision 276159)
++++ sc/source/ui/vba/testvba/testvba.cxx	(revision 276288)
+@@ -159,15 +159,15 @@ mxCompLoader( _xCompLoader ), msOutDirPath( conver
+                         Reference< script::provider::XScript > xScript;
+ 						try
+                         {
+-						    xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.TestMacros.Main?language=Basic&location=document" ));
++						    xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document" ));
+                         } catch ( uno::Exception& e )
+                         {
+                             try
+                             {
+-						        xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.testMacro.Main?language=Basic&location=document" ));
++						        xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" ));
+                             } catch ( uno::Exception& e2 )
+                             {
+-						        xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.testMain.Main?language=Basic&location=document" ));
++						        xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" ));
+                             }
+                         }
+ 						OSL_TRACE("Got script for doc %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
+Index: sc/source/ui/vba/testvba/list1
+===================================================================
+--- sc/source/ui/vba/testvba/list1	(revision 0)
++++ sc/source/ui/vba/testvba/list1	(revision 276288)
+@@ -0,0 +1,28 @@
++AutoFilter
++bytearraystring
++CalcFont
++dateserial
++datevalue
++format
++MiscOperatorTests
++MiscRangeTests
++PageBreaks
++PageSetup
++partition
++range-4
++Ranges-2
++Ranges-3
++Ranges
++replace
++Shapes
++StrConv-test
++stringplusdouble
++Template
++TestAddress
++TestCalc_Rangetest2
++TestCalc_Rangetest
++TestIntersection
++TestUnion
++VariantTest
++window2
++Window
+Index: sc/source/ui/vba/testvba/list2
+===================================================================
+--- sc/source/ui/vba/testvba/list2	(revision 0)
++++ sc/source/ui/vba/testvba/list2	(revision 276288)
+@@ -0,0 +1,28 @@
++AutoFilter
++bytearraystring
++CalcFont
++dateserial
++datevalue
++format
++MiscOperatorTests
++MiscRangeTests
++PageBreaks
++PageSetup
++partition
++range-4
++Ranges-2
++Ranges-3
++Ranges
++replace
++Shapes
++StrConv-test
++stringplusdouble
++Template
++TestAddress
++TestCalc_Rangetest2
++TestCalc_Rangetest
++TestIntersection
++TestUnion
++VariantTest
++window2
++Window
+Index: sc/source/ui/vba/testvba/list3
+===================================================================
+--- sc/source/ui/vba/testvba/list3	(revision 0)
++++ sc/source/ui/vba/testvba/list3	(revision 276288)
+@@ -0,0 +1,28 @@
++AutoFilter
++bytearraystring
++CalcFont
++dateserial
++datevalue
++format
++MiscOperatorTests
++MiscRangeTests
++PageBreaks
++pagesetup
++partition
++range-4
++Ranges-2
++Ranges-3
++Ranges
++replace
++Shapes
++StrConv-test
++stringplusdouble
++Template
++TestAddress
++TestCalc_Rangetest2
++TestCalc_Rangetest
++TestIntersection
++TestUnion
++VariantTest
++window2
++Window
+Index: sc/source/ui/vba/testvba/testclient
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+
+Property changes on: sc/source/ui/vba/testvba/testclient
+___________________________________________________________________
+Added: svn:executable
+   + *
+Added: svn:mime-type
+   + application/octet-stream
+
+Index: sc/source/ui/vba/vbahelper.cxx
+===================================================================
+--- sc/source/ui/vba/vbahelper.cxx	(revision 276159)
++++ sc/source/ui/vba/vbahelper.cxx	(revision 276288)
+@@ -1,828 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbahelper.cxx,v $
+- * $Revision: 1.5.32.1 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include <cppuhelper/bootstrap.hxx>
+-#include <com/sun/star/util/XURLTransformer.hpp>
+-#include <com/sun/star/frame/XDispatchProvider.hpp>
+-#include <com/sun/star/frame/XModel.hpp>
+-#include <com/sun/star/frame/XFrame.hpp>
+-#include <com/sun/star/frame/XDesktop.hpp>
+-#include <com/sun/star/frame/XController.hpp>
+-#include <com/sun/star/uno/XComponentContext.hpp>
+-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+-#include <com/sun/star/beans/XPropertySet.hpp>
+-#include <com/sun/star/beans/XIntrospection.hpp>
+-
+-#include <comphelper/processfactory.hxx>
+-
+-#include <sfx2/objsh.hxx>
+-#include <sfx2/viewfrm.hxx>
+-#include <sfx2/dispatch.hxx>
+-#include <sfx2/app.hxx>
+-#include <svtools/stritem.hxx>
+-
+-#include <docuno.hxx>
+-
+-#include <basic/sbx.hxx>
+-#include <basic/sbstar.hxx>
+-#include <rtl/math.hxx>
+-
+-#include <math.h>
+-#include "vbahelper.hxx"
+-#include "tabvwsh.hxx"
+-#include "transobj.hxx"
+-#include "scmod.hxx"
+-#include "vbashape.hxx"
+-#include "unonames.hxx"
+-#include "cellsuno.hxx"
+-using namespace ::com::sun::star;
+-using namespace ::ooo::vba;
+-
+-#define POINTTO100THMILLIMETERFACTOR 35.27778
+-void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue );
+-
+-uno::Any sbxToUnoValue( SbxVariable* pVar );
+-
+-
+-namespace ooo
+-{
+-namespace vba
+-{
+-
+-const double Millimeter::factor =  35.27778;
+-
+-uno::Reference< beans::XIntrospectionAccess >
+-getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException)
+-{
+-	static uno::Reference< beans::XIntrospection > xIntrospection;
+-	if( !xIntrospection.is() )
+-	{
+-		uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+-		xIntrospection.set( xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") ), uno::UNO_QUERY_THROW );
+-	}
+-	return xIntrospection->inspect( aObject );
+-}
+-
+-uno::Reference< script::XTypeConverter >
+-getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
+-{
+-	static uno::Reference< script::XTypeConverter > xTypeConv( xContext->getServiceManager()->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter") ), xContext ), uno::UNO_QUERY_THROW );
+-	return xTypeConv;
+-}
+-// helper method to determine if the view ( calc ) is in print-preview mode
+-bool isInPrintPreview( SfxViewFrame* pView )
+-{
+-	sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
+-	if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() >
+-nViewNo && !pView->GetObjectShell()->IsInPlaceActive() )
+-	{
+-		SfxViewFactory &rViewFactory =
+-			pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo);
+-		if (  pView->GetCurViewId() == rViewFactory.GetOrdinal() )
+-			return true;
+-	}
+-	return false;
+-}
+-const ::rtl::OUString REPLACE_CELLS_WARNING(  RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning"));
+-const uno::Any&
+-aNULL()
+-{
+- 	static  uno::Any aNULLL = uno::makeAny( uno::Reference< uno::XInterface >() );
+-	return aNULLL;
+-}
+-
+-class PasteCellsWarningReseter
+-{
+-private:
+-	bool bInitialWarningState;
+-	static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException )
+-	{
+-		static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+-		static uno::Reference<uno::XComponentContext > xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
+-		static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
+-				xContext->getServiceManager(), uno::UNO_QUERY_THROW );
+-		static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW );
+-		return xProps;
+-	}
+-
+-	bool getReplaceCellsWarning() throw ( uno::RuntimeException )
+-	{
+-		sal_Bool res = sal_False;
+-		getGlobalSheetSettings()->getPropertyValue( REPLACE_CELLS_WARNING ) >>= res;
+-		return ( res == sal_True );
+-	}
+-
+-	void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
+-	{
+-		getGlobalSheetSettings()->setPropertyValue( REPLACE_CELLS_WARNING, uno::makeAny( bState ) );
+-	}
+-public:
+-	PasteCellsWarningReseter() throw ( uno::RuntimeException )
+-	{
+-		bInitialWarningState = getReplaceCellsWarning();
+-		if ( bInitialWarningState )
+-			setReplaceCellsWarning( false );
+-	}
+-	~PasteCellsWarningReseter()
+-	{
+-		if ( bInitialWarningState )
+-		{
+-			// don't allow dtor to throw
+-			try
+-			{
+-				setReplaceCellsWarning( true );
+-			}
+-			catch ( uno::Exception& /*e*/ ){}
+-		}
+-	}
+-};
+-
+-void
+-dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl, uno::Sequence< beans::PropertyValue >& sProps )
+-{
+-
+-	util::URL  url ;
+-	url.Complete = aUrl;
+-	rtl::OUString emptyString = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ));
+-	uno::Reference<frame::XController> xController = xModel->getCurrentController();
+-	uno::Reference<frame::XFrame> xFrame = xController->getFrame();
+-	uno::Reference<frame::XDispatchProvider> xDispatchProvider (xFrame,uno::UNO_QUERY_THROW);
+-	try
+-	{
+-		uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+-		uno::Reference<uno::XComponentContext > xContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW  );
+-		if ( !xContext.is() )
+-		{
+-			return ;
+-		}
+-
+-		uno::Reference<lang::XMultiComponentFactory > xServiceManager(
+-				xContext->getServiceManager() );
+-		if ( !xServiceManager.is() )
+-		{
+-			return ;
+-		}
+-		uno::Reference<util::XURLTransformer> xParser( xServiceManager->createInstanceWithContext(     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) )
+-			,xContext), uno::UNO_QUERY_THROW );
+-		if (!xParser.is())
+-			return;
+-		xParser->parseStrict (url);
+-	}
+-	catch ( uno::Exception & /*e*/ )
+-	{
+-		return ;
+-	}
+-
+-	uno::Reference<frame::XDispatch> xDispatcher = xDispatchProvider->queryDispatch(url,emptyString,0);
+-
+-	uno::Sequence<beans::PropertyValue> dispatchProps(1);
+-
+-	sal_Int32 nProps = sProps.getLength();
+-	beans::PropertyValue* pDest = dispatchProps.getArray();
+-	if ( nProps )
+-	{
+-		dispatchProps.realloc( nProps + 1 );
+-		// need to reaccquire pDest after realloc
+-		pDest = dispatchProps.getArray();
+-		beans::PropertyValue* pSrc = sProps.getArray();
+-		for ( sal_Int32 index=0; index<nProps; ++index, ++pSrc, ++pDest )
+-			*pDest = *pSrc;
+-	}
+-
+-	(*pDest).Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Silent" ));
+-	(*pDest).Value <<= (sal_Bool)sal_True;
+-
+-	if (xDispatcher.is())
+-		xDispatcher->dispatch( url, dispatchProps );
+-}
+-
+-void
+-dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl) 
+-{
+-	uno::Sequence<beans::PropertyValue> dispatchProps;
+-	dispatchRequests( xModel, aUrl, dispatchProps );
+-}
+-
+-
+-void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nSlot, SfxCallMode nCall)
+-{
+-	ScTabViewShell* pViewShell = getBestViewShell( xModel );
+-	SfxViewFrame* pViewFrame = NULL;
+-	if ( pViewShell )
+-		pViewFrame = pViewShell->GetViewFrame();
+-	if ( pViewFrame )
+-	{
+-		SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
+-		if( pDispatcher )
+-		{
+-			pDispatcher->Execute( nSlot , nCall );
+-		}
+-	}	
+-}
+-		
+-void
+-implnPaste()
+-{
+-	PasteCellsWarningReseter resetWarningBox;
+-	ScTabViewShell* pViewShell = getCurrentBestViewShell();
+-	if ( pViewShell )
+-	{
+-		pViewShell->PasteFromSystem();
+-		pViewShell->CellContentChanged();
+-	}
+-}
+-
+-
+-void
+-implnCopy()
+-{
+-	ScTabViewShell* pViewShell = getCurrentBestViewShell();
+-	if ( pViewShell )
+-		pViewShell->CopyToClip(NULL,false,false,true);
+-}
+-
+-void 
+-implnCut()
+-{
+-	ScTabViewShell* pViewShell =  getCurrentBestViewShell();
+-	if ( pViewShell )
+-		pViewShell->CutToClip( NULL, TRUE );
+-}
+-
+-void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
+-{
+-	PasteCellsWarningReseter resetWarningBox;
+-	sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
+-	InsCellCmd eMoveMode = INS_NONE;
+-
+-	ScTabViewShell* pTabViewShell = ScTabViewShell::GetActiveViewShell();
+-	if ( !pTabViewShell ) 
+-		// none active, try next best
+-		pTabViewShell = getCurrentBestViewShell();
+-	if ( pTabViewShell )
+-	{
+-		ScViewData* pView = pTabViewShell->GetViewData();	
+-		Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
+-		if ( pView && pWin )
+-		{
+-			if ( bAsLink && bOtherDoc )
+-				pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
+-			else 
+-			{
+-				ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
+-				ScDocument* pDoc = NULL; 
+-				if ( pOwnClip )
+-					pDoc = pOwnClip->GetDocument();	
+-				pTabViewShell->PasteFromClip( nFlags, pDoc,
+-					nFunction, bSkipEmpty, bTranspose, bAsLink,
+-					eMoveMode, IDF_NONE, TRUE );
+-				pTabViewShell->CellContentChanged();
+-			}
+-		}
+-	}
+-
+-}
+-
+- uno::Reference< frame::XModel > 
+-getCurrentDocument() throw (uno::RuntimeException)
+-{
+-	uno::Reference< frame::XModel > xModel;
+-	SbxObject* pBasic = dynamic_cast< SbxObject* > ( SFX_APP()->GetBasic() );
+-	SbxObject* basicChosen =  pBasic ;
+-	if ( basicChosen == NULL)
+-	{
+-		OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" );
+-		return xModel;
+-	}    
+-    SbxObject* p = pBasic;
+-    SbxObject* pParent = p->GetParent();
+-    SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL;
+-
+-    if( pParentParent )
+-    {
+-        basicChosen = pParentParent;
+-    }
+-    else if( pParent )
+-    {
+-        basicChosen = pParent;
+-    }
+-
+-
+-    uno::Any aModel; 
+-    SbxVariable *pCompVar = basicChosen->Find(  UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT );
+-
+-	if ( pCompVar )
+-	{
+-		aModel = sbxToUnoValue( pCompVar );
+-		if ( sal_False == ( aModel >>= xModel ) ||
+-			!xModel.is() )
+-		{
+-			// trying last gasp try the current component
+-			uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+-			// test if vba service is present
+-			uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
+-			uno::Reference<lang::XMultiComponentFactory > xSMgr( xCtx->getServiceManager(), uno::UNO_QUERY_THROW );
+-			uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx), uno::UNO_QUERY_THROW );
+-			xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY );
+-			if ( !xModel.is() )
+-			{
+-				throw uno::RuntimeException( 
+-					rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the currently selected document") ), uno::Reference< uno::XInterface >() );
+-			}
+-			return xModel;
+-		}
+-		else
+-		{
+-			OSL_TRACE("Have model ThisComponent points to url %s",
+-			::rtl::OUStringToOString( xModel->getURL(),
+-				RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+-		}
+-	}
+-	else
+-	{
+-		OSL_TRACE("Failed to get ThisComponent");
+-		throw uno::RuntimeException( 
+-			rtl::OUString( 
+-				RTL_CONSTASCII_USTRINGPARAM(
+-					"Can't determine the currently selected document") ),
+-			uno::Reference< uno::XInterface >() );
+-	}
+-	return xModel;
+-}
+-
+-ScDocShell* 
+-getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) 
+-{
+-	uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
+-	ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
+-	ScDocShell* pDocShell = NULL;
+-	if ( pModel )
+-		pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
+-	return pDocShell;
+-
+-}
+-
+-ScTabViewShell* 
+-getBestViewShell(  css::uno::Reference< css::frame::XModel>& xModel )
+-{
+-	ScDocShell* pDocShell = getDocShell( xModel );
+-	if ( pDocShell )
+-		return pDocShell->GetBestViewShell();
+-	return NULL;
+-}
+-
+-ScTabViewShell* 
+-getCurrentBestViewShell()
+-{ 
+-	uno::Reference< frame::XModel > xModel = getCurrentDocument();
+-	return getBestViewShell( xModel );
+-}
+-
+-SfxViewFrame* 
+-getCurrentViewFrame()
+-{
+-	ScTabViewShell* pViewShell = getCurrentBestViewShell();	
+-	if ( pViewShell )
+-		return pViewShell->GetViewFrame();
+-	return NULL;
+-}
+-
+-sal_Int32 
+-OORGBToXLRGB( sal_Int32 nCol )
+-{
+-	sal_Int32 nRed = nCol;
+-	nRed &= 0x00FF0000;
+-	nRed >>= 16;
+-	sal_Int32 nGreen = nCol;
+-	nGreen &= 0x0000FF00;
+-	nGreen >>= 8;
+-	sal_Int32 nBlue = nCol;
+-	nBlue &= 0x000000FF;
+-	sal_Int32 nRGB =  ( (nBlue << 16) | (nGreen << 8) | nRed );
+-	return nRGB;
+-}
+-sal_Int32 
+-XLRGBToOORGB( sal_Int32 nCol )
+-{
+-	sal_Int32 nBlue = nCol;
+-	nBlue &= 0x00FF0000;
+-	nBlue >>= 16;
+-	sal_Int32 nGreen = nCol;
+-	nGreen &= 0x0000FF00;
+-	nGreen >>= 8;
+-	sal_Int32 nRed = nCol;
+-	nRed &= 0x000000FF;
+-	sal_Int32 nRGB =  ( (nRed << 16) | (nGreen << 8) | nBlue );
+-	return nRGB;
+-}
+-uno::Any 
+-OORGBToXLRGB( const uno::Any& aCol )
+-{
+-	sal_Int32 nCol=0;
+-	aCol >>= nCol;
+-	nCol = OORGBToXLRGB( nCol );
+-	return uno::makeAny( nCol );
+-}
+-uno::Any 
+-XLRGBToOORGB(  const uno::Any& aCol )
+-{
+-	sal_Int32 nCol=0;
+-	aCol >>= nCol;
+-	nCol = XLRGBToOORGB( nCol );
+-	return uno::makeAny( nCol );
+-}
+-
+-void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& /*ActivePrinter*/, const uno::Any& /*PrintToFile*/, const uno::Any& Collate, const uno::Any& PrToFileName, css::uno::Reference< frame::XModel >& xModel, sal_Bool bUseSelection  )
+-{
+-	sal_Int32 nTo = 0;
+-	sal_Int32 nFrom = 0;
+-	sal_Int16 nCopies = 1;
+-	sal_Bool bPreview = sal_False;
+-	sal_Bool bCollate = sal_False;
+-	sal_Bool bSelection = bUseSelection;
+-	From >>= nFrom;
+-	To >>= nTo;
+-	Copies >>= nCopies;
+-	Preview >>= bPreview;
+-	if ( nCopies > 1 ) // Collate only useful when more that 1 copy
+-		Collate >>= bCollate;
+-
+-	rtl::OUString sRange(  RTL_CONSTASCII_USTRINGPARAM( "-" ) );
+-	rtl::OUString sFileName;
+-	
+-	if (( nFrom || nTo ) )
+-	{
+-		if ( nFrom )
+-			sRange = ( ::rtl::OUString::valueOf( nFrom ) + sRange );
+-		if ( nTo )
+-			sRange += ::rtl::OUString::valueOf( nTo );
+-	}
+-
+-	if (  PrToFileName.getValue() )
+-	{
+-		PrToFileName >>= sFileName;
+-	}
+-	ScTabViewShell* pViewShell = getBestViewShell( xModel );
+-	SfxViewFrame* pViewFrame = NULL;
+-	if ( pViewShell )
+-		pViewFrame = pViewShell->GetViewFrame();
+-	if ( pViewFrame )
+-	{
+-		SfxAllItemSet aArgs( SFX_APP()->GetPool() );
+-				
+-		SfxBoolItem sfxCollate( SID_PRINT_COLLATE, bCollate );
+-		aArgs.Put( sfxCollate, sfxCollate.Which() );
+-		SfxInt16Item sfxCopies( SID_PRINT_COPIES, nCopies );
+-		aArgs.Put( sfxCopies, sfxCopies.Which() );
+-		if ( sFileName.getLength() )
+-		{
+-			SfxStringItem sfxFileName( SID_FILE_NAME, sFileName);
+-			aArgs.Put( sfxFileName, sfxFileName.Which() );
+-		
+-		}
+-		if (  sRange.getLength() )
+-		{
+-			SfxStringItem sfxRange( SID_PRINT_PAGES, sRange );
+-			aArgs.Put( sfxRange, sfxRange.Which() );
+-		}
+-		SfxBoolItem sfxSelection( SID_SELECTION, bSelection );
+-		aArgs.Put( sfxSelection, sfxSelection.Which() );
+-		SfxBoolItem sfxAsync( SID_ASYNCHRON, sal_False );
+-		aArgs.Put( sfxAsync, sfxAsync.Which() );
+-		SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
+-
+-		if ( pDispatcher )
+-		{
+-			if ( bPreview )
+-			{
+-				if ( !pViewFrame->GetFrame()->IsInPlace() ) 	
+-				{
+-					SC_MOD()->InputEnterHandler();
+-					pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON );
+-					while ( isInPrintPreview( pViewFrame ) )
+-						Application::Yield();
+-				}
+-			}
+-			else
+-				pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
+-		}
+-			
+-	}
+-	
+-	// #FIXME #TODO
+-	// 1 ActivePrinter ( how/can we switch a printer via API? )
+-	// 2 PrintToFile ( ms behaviour if this option is specified but no 
+-	//   filename supplied 'PrToFileName' then the user will be prompted )
+-	// 3 Need to check behaviour of Selected sheets with range ( e.g. From & To
+-	//    values ) in oOO these options are mutually exclusive
+-	// 4 There is a pop up to do with transparent objects in the print source
+-	//   should be able to disable that via configuration for the duration
+-	//   of this method
+-}
+-
+- void PrintPreviewHelper( const css::uno::Any& /*EnableChanges*/, css::uno::Reference< css::frame::XModel >& xModel )
+-{
+-	dispatchExecute( xModel, SID_VIEWSHELL1 );
+-}
+-
+-rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
+-{
+-	uno::Type aType = pvargItem.getValueType();
+-	uno::TypeClass eTypeClass = aType.getTypeClass();
+-	rtl::OUString sString;
+-	switch ( eTypeClass )
+-	{
+-		case uno::TypeClass_BOOLEAN:
+-		{
+-			sal_Bool bBool = sal_False;
+-			pvargItem >>= bBool;
+-			sString = rtl::OUString::valueOf( bBool );
+-			break;
+-		}
+-		case uno::TypeClass_STRING:
+-			pvargItem >>= sString;
+-			break;
+-		case uno::TypeClass_FLOAT:
+-			{
+-				float aFloat = 0;
+-				pvargItem >>= aFloat;
+-				sString = rtl::OUString::valueOf( aFloat );
+-				break;
+-			}
+-		case uno::TypeClass_DOUBLE:
+-			{
+-				double aDouble = 0;
+-				pvargItem >>= aDouble;
+-				sString = rtl::OUString::valueOf( aDouble );
+-				break;
+-			}
+-		case uno::TypeClass_SHORT:
+-		case uno::TypeClass_LONG:
+-		case uno::TypeClass_BYTE:
+-			{
+-				sal_Int32 aNum = 0;
+-				pvargItem >>= aNum;
+-				sString = rtl::OUString::valueOf( aNum );
+-				break;
+-			}
+-
+-		case uno::TypeClass_HYPER:
+-			{
+-				sal_Int64 aHyper = 0;
+-				pvargItem >>= aHyper;
+-				sString = rtl::OUString::valueOf( aHyper );
+-				break;
+-			}
+-		default:
+-       			throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid type, can't convert" ), uno::Reference< uno::XInterface >() );
+-	}
+-	return sString;
+-}
+-
+-
+-rtl::OUString 
+-ContainerUtilities::getUniqueName( const uno::Sequence< ::rtl::OUString >&  _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator)
+-{
+-	return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2));
+-}
+-
+-rtl::OUString 
+-ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix)
+-{
+-	sal_Int32 a = _nStartSuffix;
+-	rtl::OUString scompname = _sElementName;
+-	bool bElementexists = true;
+-	sal_Int32 nLen = _slist.getLength();
+-	if ( nLen == 0 )
+-		return _sElementName;
+-
+-	while (bElementexists == true) 
+-	{
+-		for (sal_Int32 i = 0; i < nLen; i++)
+-		{
+-			if (FieldInList(_slist, scompname) == -1)
+-			{
+-				return scompname;
+-			}
+-		}
+-		scompname = _sElementName + _sSuffixSeparator + rtl::OUString::valueOf( a++ );
+-	}
+-	return rtl::OUString();
+-}
+-
+-sal_Int32 
+-ContainerUtilities::FieldInList( const uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString )
+-{
+-	sal_Int32 FieldLen = SearchList.getLength();
+-	sal_Int32 retvalue = -1;
+-	for (sal_Int32 i = 0; i < FieldLen; i++) 
+-	{
+-		// I wonder why comparing lexicographically is done
+-		// when its a match is whats interesting?
+-		//if (SearchList[i].compareTo(SearchString) == 0) 
+-		if ( SearchList[i].equals( SearchString ) ) 
+-		{
+-			retvalue = i;
+-			break;
+-		}
+-	}
+-	return retvalue;
+-
+-}
+-bool NeedEsc(sal_Unicode cCode)
+-{
+-	String sEsc(RTL_CONSTASCII_USTRINGPARAM(".^$+\\|{}()"));
+-	return (STRING_NOTFOUND != sEsc.Search(cCode));
+-}
+-
+-rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike )
+-{
+-	rtl::OUStringBuffer sResult;
+-	const sal_Unicode *start = rIn.getStr();
+-	const sal_Unicode *end = start + rIn.getLength();
+-
+-	int seenright = 0;
+-	if ( bForLike )
+-		sResult.append(static_cast<sal_Unicode>('^'));
+-
+-	while (start < end) 
+-	{
+-		switch (*start)
+-		{
+-			case '?':
+-				sResult.append(static_cast<sal_Unicode>('.'));
+-				start++;
+-				break;
+-			case '*':
+-				sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".*")));
+-				start++;
+-				break;
+-			case '#':
+-				sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[0-9]")));
+-				start++;
+-				break;
+-			case '~':
+-				sResult.append(static_cast<sal_Unicode>('\\'));
+-				sResult.append(*(++start));
+-				start++;
+-				break;
+-				// dump the ~ and escape the next characture
+-			case ']':
+-				sResult.append(static_cast<sal_Unicode>('\\'));
+-				sResult.append(*start++);
+-				break;
+-			case '[':
+-				sResult.append(*start++);
+-				seenright = 0;
+-				while (start < end && !seenright)
+-				{
+-					switch (*start)
+-					{
+-						case '[':
+-						case '?':
+-						case '*':
+-						sResult.append(static_cast<sal_Unicode>('\\'));
+-						sResult.append(*start);
+-							break;
+-						case ']':
+-						sResult.append(*start);
+-							seenright = 1;
+-							break;
+-						case '!':
+-							sResult.append(static_cast<sal_Unicode>('^'));
+-							break;
+-						default:
+-						if (NeedEsc(*start))
+-							sResult.append(static_cast<sal_Unicode>('\\'));
+-						sResult.append(*start);
+-							break;
+-					}
+-					start++;
+-				}
+-				break;
+-			default:
+-				if (NeedEsc(*start))
+-					sResult.append(static_cast<sal_Unicode>('\\'));
+-				sResult.append(*start++);
+-		}
+-	}
+-
+-	if ( bForLike )
+-		sResult.append(static_cast<sal_Unicode>('$'));
+-
+-	return sResult.makeStringAndClear( );
+-}
+-
+-double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical)
+-{
+-	double fConvertFactor = 1.0;
+-	if( bVertical )
+-	{
+-		fConvertFactor = xDevice->getInfo().PixelPerMeterY/100000;
+-	}
+-	else
+-	{
+-		fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000;	
+-	}
+-	return fConvertFactor;
+-}
+-
+-double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical)
+-{
+-	double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
+-	return fPoints * POINTTO100THMILLIMETERFACTOR * fConvertFactor;
+-}
+-double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, sal_Bool bVertical)
+-{
+-	double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
+-	return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR;
+-}
+-
+-ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape )
+-{
+-	m_xShape = new ScVbaShape( xContext, xShape );
+-}
+-
+-#define VBA_LEFT "PositionX"
+-#define VBA_TOP "PositionY"
+-UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
+-{
+-    mxModel.set( xControl->getModel(), uno::UNO_QUERY_THROW );
+-}
+-    double UserFormGeometryHelper::getLeft()
+-    {
+-	sal_Int32 nLeft = 0;
+-	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;	
+-	return Millimeter::getInPoints( nLeft );
+-    }
+-    void UserFormGeometryHelper::setLeft( double nLeft )
+-    {
+-        mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nLeft ) ) );
+-    }
+-    double UserFormGeometryHelper::getTop()
+-    {
+-	sal_Int32 nTop = 0;
+-	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	VBA_TOP ) ) ) >>= nTop;	
+-	return Millimeter::getInPoints( nTop );
+-    }
+-    void UserFormGeometryHelper::setTop( double nTop )
+-    {
+-	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
+-    }
+-    double UserFormGeometryHelper::getHeight()
+-    {
+-	sal_Int32 nHeight = 0;
+-	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLHGT ) ) ) >>= nHeight;	
+-	return Millimeter::getInPoints( nHeight );
+-    }
+-    void UserFormGeometryHelper::setHeight( double nHeight )
+-    {
+-	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLHGT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
+-    }
+-    double UserFormGeometryHelper::getWidth()
+-    {
+-	sal_Int32 nWidth = 0;
+-	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLWID ) ) ) >>= nWidth;	
+-	return Millimeter::getInPoints( nWidth );
+-    }
+-    void UserFormGeometryHelper::setWidth( double nWidth)
+-    {
+-	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLWID ) ), uno::makeAny(  Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
+-    }
+-
+-SfxItemSet*
+-ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj )
+-{
+-	SfxItemSet* pDataSet = pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : NULL ;
+-	return pDataSet;
+-	
+-}
+-
+-} // openoffice
+-} //org
+Index: sc/source/ui/vba/vbacontrol.cxx
+===================================================================
+--- sc/source/ui/vba/vbacontrol.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacontrol.cxx	(revision 276288)
+@@ -1,468 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- * 
+- * Copyright 2008 by Sun Microsystems, Inc.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: vbacontrol.cxx,v $
+- * $Revision: 1.3 $
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org.  If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-#include <com/sun/star/form/FormComponentType.hpp>
+-#include <com/sun/star/awt/XControlModel.hpp>
+-#include <com/sun/star/awt/XControl.hpp>
+-#include <com/sun/star/awt/XWindow2.hpp>
+-#include <com/sun/star/lang/XEventListener.hpp>
+-#include <com/sun/star/drawing/XShape.hpp>
+-#include <com/sun/star/frame/XModel.hpp>
+-#include <com/sun/star/view/XControlAccess.hpp>
+-#include <com/sun/star/container/XChild.hpp>
+-#include <com/sun/star/form/binding/XBindableValue.hpp>
+-#include <com/sun/star/form/binding/XListEntrySink.hpp>
+-#include <com/sun/star/table/CellAddress.hpp>
+-#include <com/sun/star/table/CellRangeAddress.hpp>
+-#ifdef VBA_OOBUILD_HACK
+-#include <svtools/bindablecontrolhelper.hxx>
+-#endif
+-#include"vbacontrol.hxx"
+-#include"vbacombobox.hxx"
+-#include "vbabutton.hxx"
+-#include "vbalabel.hxx"
+-#include "vbatextbox.hxx"
+-#include "vbaradiobutton.hxx"
+-#include "vbalistbox.hxx"
+-#include "vbatogglebutton.hxx"
+-#include "vbacheckbox.hxx"
+-#include "vbaframe.hxx"
+-#include "vbascrollbar.hxx"
+-#include "vbaprogressbar.hxx"
+-#include "vbamultipage.hxx"
+-#include "vbaspinbutton.hxx"
+-#include "vbaimage.hxx"
+-
+-
+-using namespace com::sun::star;
+-using namespace ooo::vba;
+-
+-uno::Reference< css::awt::XWindowPeer > 
+-ScVbaControl::getWindowPeer() throw (uno::RuntimeException)
+-{
+-    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
+-
+-    uno::Reference< awt::XControlModel > xControlModel;
+-    uno::Reference< css::awt::XWindowPeer >  xWinPeer;
+-    if ( !xControlShape.is() ) 
+-    { 
+-        // would seem to be a Userform control
+-        uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY_THROW );
+-        xWinPeer =  xControl->getPeer();
+-	return xWinPeer;
+-    }
+-    // form control
+-    xControlModel.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
+-
+-    uno::Reference< view::XControlAccess > xControlAccess( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+-    try
+-    {
+-        uno::Reference< awt::XControl > xControl( xControlAccess->getControl( xControlModel ), uno::UNO_QUERY );
+-        xWinPeer =  xControl->getPeer();
+-    }
+-    catch( uno::Exception )
+-    {
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "The Control does not exsit" ),
+-                uno::Reference< uno::XInterface >() );
+-    }
+-    return xWinPeer;
+-}
+-
+-//ScVbaControlListener
+-class ScVbaControlListener: public cppu::WeakImplHelper1< lang::XEventListener >
+-{
+-private:
+-    ScVbaControl *pControl;
+-public:
+-    ScVbaControlListener( ScVbaControl *pTmpControl );
+-    virtual ~ScVbaControlListener();
+-    virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException );
+-};
+-
+-ScVbaControlListener::ScVbaControlListener( ScVbaControl *pTmpControl ): pControl( pTmpControl )
+-{
+-}
+-
+-ScVbaControlListener::~ScVbaControlListener()
+-{
+-}
+-
+-void SAL_CALL
+-ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeException )
+-{
+-    if( pControl )
+-    {
+-        pControl->removeResouce();
+-        pControl = NULL;
+-    }
+-}
+-
+-//ScVbaControl
+-
+-ScVbaControl::ScVbaControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< ::uno::XInterface >& xControl,  const css::uno::Reference< css::frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ControlImpl_BASE( xParent, xContext ),  m_xControl( xControl ), m_xModel( xModel )
+-{
+-    //add listener
+-    m_xEventListener.set( new ScVbaControlListener( this ) );
+-    setGeometryHelper( pGeomHelper );
+-    uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
+-    xComponent->addEventListener( m_xEventListener );
+-   
+-    //init m_xProps
+-    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ) ;
+-    uno::Reference< awt::XControl> xUserFormControl( m_xControl, uno::UNO_QUERY ) ;
+-    if ( xControlShape.is() ) // form control
+-        m_xProps.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
+-    else if ( xUserFormControl.is() ) // userform control
+-        m_xProps.set( xUserFormControl->getModel(), uno::UNO_QUERY_THROW );
+-}
+-
+-ScVbaControl::~ScVbaControl()
+-{
+-    if( m_xControl.is() )
+-{
+-        uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
+-    xComponent->removeEventListener( m_xEventListener );
+-}
+-}
+-
+-void 
+-ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
+-{
+-    mpGeometryHelper.reset( pHelper );
+-}
+-
+-void ScVbaControl::removeResouce() throw( uno::RuntimeException )
+-{
+-    uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
+-    xComponent->removeEventListener( m_xEventListener );
+-    m_xControl= NULL;
+-    m_xProps = NULL;
+-}
+-
+-//In design model has different behavior
+-sal_Bool SAL_CALL ScVbaControl::getEnabled() throw (uno::RuntimeException)
+-{
+-    uno::Any aValue = m_xProps->getPropertyValue
+-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ) );
+-    sal_Bool bRet = false;
+-    aValue >>= bRet;
+-    return bRet;
+-}
+-
+-void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeException)
+-{
+-    uno::Any aValue( bVisible );
+-    m_xProps->setPropertyValue
+-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ), aValue);
+-
+-}
+-
+-sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
+-{
+-    sal_Bool bVisible = sal_False;
+-    m_xProps->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ) ) >>= bVisible;
+-    return bVisible;
+-}
+-
+-void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
+-{
+-    m_xProps->setPropertyValue
+-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ), uno::makeAny( bVisible ) );
+-}
+-double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException)
+-{
+-    return mpGeometryHelper->getHeight();
+-}
+-void SAL_CALL ScVbaControl::setHeight( double _height ) throw (uno::RuntimeException)
+-{
+-    mpGeometryHelper->setHeight( _height );
+-}
+-
+-double SAL_CALL ScVbaControl::getWidth() throw (uno::RuntimeException)
+-{
+-    return mpGeometryHelper->getWidth();
+-}
+-void SAL_CALL ScVbaControl::setWidth( double _width ) throw (uno::RuntimeException)
+-{
+-    mpGeometryHelper->setWidth( _width );
+-}
+-
+-double SAL_CALL
+-ScVbaControl::getLeft() throw (uno::RuntimeException)
+-{
+-    return mpGeometryHelper->getLeft();
+-}
+-
+-void SAL_CALL
+-ScVbaControl::setLeft( double _left ) throw (uno::RuntimeException)
+-{
+-    mpGeometryHelper->setLeft( _left );
+-
+-}
+-
+-double SAL_CALL
+-ScVbaControl::getTop() throw (uno::RuntimeException)
+-{
+-    return mpGeometryHelper->getTop();
+-}
+-
+-void SAL_CALL
+-ScVbaControl::setTop( double _top ) throw (uno::RuntimeException)
+-{
+-    mpGeometryHelper->setTop( _top );
+-}
+-
+-uno::Reference< uno::XInterface > SAL_CALL
+-ScVbaControl::getObject() throw (uno::RuntimeException)
+-{
+-	uno::Reference< msforms::XControl > xRet( this );
+-	return xRet;
+-}
+-
+-void SAL_CALL ScVbaControl::SetFocus() throw (uno::RuntimeException) 
+-{
+-    uno::Reference< awt::XWindow > xWin( m_xControl, uno::UNO_QUERY_THROW );
+-    xWin->setFocus();
+-}
+-
+-rtl::OUString SAL_CALL 
+-ScVbaControl::getControlSource() throw (uno::RuntimeException)
+-{
+-// #FIXME I *hate* having these upstream differences
+-// but this is necessary until I manage to upstream other
+-// dependant parts
+-#ifdef VBA_OOBUILD_HACK
+-	rtl::OUString sControlSource;
+-	uno::Reference< form::binding::XBindableValue > xBindable( m_xProps, uno::UNO_QUERY );
+-	if ( xBindable.is() )
+-	{
+-		try
+-		{
+-			uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
+-			uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellAddressConversion" ))), uno::UNO_QUERY );
+-			uno::Reference< beans::XPropertySet > xProps( xBindable->getValueBinding(), uno::UNO_QUERY_THROW );
+-			table::CellAddress aAddress;
+-			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BoundCell") ) ) >>= aAddress;
+-			xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address") ), uno::makeAny( aAddress ) );
+-                	xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sControlSource;
+-		}
+-		catch( uno::Exception& )
+-		{
+-		}	
+-	}
+-	return sControlSource;
+-#else
+-	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getControlSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
+-#endif
+-}
+-
+-void SAL_CALL 
+-ScVbaControl::setControlSource( const rtl::OUString& _controlsource ) throw (uno::RuntimeException)
+-{
+-#ifdef VBA_OOBUILD_HACK
+-    rtl::OUString sEmpty;
+-    svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, _controlsource, sEmpty );
+-#else
+-	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setControlSource not supported ") ).concat( _controlsource ), uno::Reference< uno::XInterface >()); // not supported
+-#endif
+-}
+-
+-rtl::OUString SAL_CALL 
+-ScVbaControl::getRowSource() throw (uno::RuntimeException)
+-{
+-#ifdef VBA_OOBUILD_HACK
+-	rtl::OUString sRowSource;
+-	uno::Reference< form::binding::XListEntrySink > xListSink( m_xProps, uno::UNO_QUERY );
+-	if ( xListSink.is() )
+-    {
+-		try
+-		{
+-			uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
+-			uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellRangeAddressConversion" ))), uno::UNO_QUERY );
+-
+-			uno::Reference< beans::XPropertySet > xProps( xListSink->getListEntrySource(), uno::UNO_QUERY_THROW );
+-			table::CellRangeAddress aAddress;
+-			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellRange") ) ) >>= aAddress;
+-			xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address")), uno::makeAny( aAddress ) );
+-			xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sRowSource;
+-		}
+-		catch( uno::Exception& )
+-		{
+-		}	
+-	}
+-	return sRowSource;
+-#else
+-	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getRowSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
+-#endif
+-}
+-
+-void SAL_CALL 
+-ScVbaControl::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
+-{
+-#ifdef VBA_OOBUILD_HACK
+-    rtl::OUString sEmpty;
+-    svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, sEmpty, _rowsource );
+-#else
+-	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setRowSource not supported ") ).concat( _rowsource ), uno::Reference< uno::XInterface >()); // not supported
+-#endif
+-}
+-
+-rtl::OUString SAL_CALL 
+-ScVbaControl::getName() throw (uno::RuntimeException)
+-{
+-	rtl::OUString sName;
+-	m_xProps->getPropertyValue
+-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
+-	return sName;
+-
+-}
+-
+-void SAL_CALL
+-ScVbaControl::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
+-{
+-	m_xProps->setPropertyValue
+-            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), uno::makeAny( _name ) );
+-    }
+-//ScVbaControlFactory
+-
+-ScVbaControlFactory::ScVbaControlFactory( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel ): m_xContext( xContext ), m_xControl( xControl ), m_xModel( xModel )
+-{
+-}
+-
+-ScVbaControl* ScVbaControlFactory::createControl()  throw (uno::RuntimeException)
+-{
+-    return createControl( m_xModel );
+-}
+-ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< uno::XInterface >& xParent )  throw (uno::RuntimeException)
+-{
+-    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
+-    if ( xControlShape.is() ) // form controls
+-        return createControl( xControlShape, xParent );
+-    uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY );
+-    if ( !xControl.is() )
+-        throw uno::RuntimeException(); // really we should be more informative
+-    return createControl( xControl, xParent );
+-    
+-}
+-
+-ScVbaControl* ScVbaControlFactory::createControl(const uno::Reference< drawing::XControlShape >& xControlShape,  const uno::Reference< uno::XInterface >& /*xParent*/ )  throw (uno::RuntimeException)
+-{
+-    uno::Reference< beans::XPropertySet > xProps( xControlShape->getControl(), uno::UNO_QUERY_THROW );
+-    sal_Int32 nClassId = -1;
+-    const static rtl::OUString sClassId( RTL_CONSTASCII_USTRINGPARAM("ClassId") );
+-    xProps->getPropertyValue( sClassId ) >>= nClassId;
+-    uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
+-    switch( nClassId )
+-    {
+-        case form::FormComponentType::COMBOBOX:
+-            return new ScVbaComboBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
+-        case form::FormComponentType::COMMANDBUTTON:
+-            return new ScVbaButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
+-        case form::FormComponentType::FIXEDTEXT:
+-            return new ScVbaLabel( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
+-        case form::FormComponentType::TEXTFIELD:
+-            return new ScVbaTextBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
+-        case form::FormComponentType::RADIOBUTTON:
+-            return new ScVbaRadioButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
+-        case form::FormComponentType::LISTBOX:
+-            return new ScVbaListBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
+-        case form::FormComponentType::SPINBUTTON:
+-            return new ScVbaSpinButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
+-        case form::FormComponentType::IMAGECONTROL:
+-            return new ScVbaImage( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
+-        default:
+-            throw uno::RuntimeException( rtl::OUString::createFromAscii(
+-                    "Donot support this Control Type." ), uno::Reference< uno::XInterface >() );
+-    }
+-}
+-
+-ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XControl >& xControl,  const uno::Reference< uno::XInterface >& xParent  )  throw (uno::RuntimeException)
+-{
+-    uno::Reference< beans::XPropertySet > xProps( xControl->getModel(), uno::UNO_QUERY_THROW );
+-    uno::Reference< lang::XServiceInfo > xServiceInfo( xProps, uno::UNO_QUERY_THROW );
+-    ScVbaControl* pControl = NULL;
+-    uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
+-    if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ) ) )
+-	pControl = new ScVbaCheckbox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );	
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) ) )
+-	pControl = new ScVbaRadioButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );	
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlEditModel") ) ) )
+-        pControl = new ScVbaTextBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ) ) )
+-    {
+-        sal_Bool bToggle = sal_False;
+-        xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toggle") ) ) >>= bToggle;
+-        if ( bToggle )
+-            pControl = new ScVbaToggleButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+-        else
+-            pControl = new ScVbaButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+-    }
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ) ) )
+-        pControl = new ScVbaComboBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ) )
+-	pControl = new ScVbaListBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) ) )
+-	pControl = new ScVbaLabel( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ) ) )
+-	pControl = new ScVbaImage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
+-	pControl = new ScVbaProgressBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
+-	pControl = new ScVbaFrame( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ) ) )
+-	pControl = new ScVbaScrollBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ) )
+-	pControl = new ScVbaMultiPage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), xParent );
+-    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ) ) )
+-	pControl = new ScVbaSpinButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+-    else
+-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Unsupported control " ), uno::Reference< uno::XInterface >() );
+-    return pControl;
+-}
+-
+-rtl::OUString& 
+-ScVbaControl::getServiceImplName()
+-{
+-	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControl") );
+-	return sImplName;
+-}
+-
+-uno::Sequence< rtl::OUString > 
+-ScVbaControl::getServiceNames()
+-{
+-	static uno::Sequence< rtl::OUString > aServiceNames;
+-	if ( aServiceNames.getLength() == 0 )
+-	{
+-		aServiceNames.realloc( 1 );
+-		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Control" ) );
+-    }
+-	return aServiceNames;
+-}
+-
+-
+Index: sc/source/ui/vba/vbatextboxshape.hxx
+===================================================================
+--- sc/source/ui/vba/vbatextboxshape.hxx	(revision 276159)
++++ sc/source/ui/vba/vbatextboxshape.hxx	(revision 276288)
+@@ -37,8 +37,8 @@
+ #include <cppuhelper/implbase1.hxx>
+ #include <com/sun/star/text/XTextRange.hpp>
+ #include <ooo/vba/msforms/XTextBoxShape.hpp>
+-#include "vbashape.hxx"
+-#include "vbahelper.hxx"
++#include <vbahelper/vbashape.hxx>
++#include "excelvbahelper.hxx"
+ #include "vbacharacters.hxx"
+ 
+ typedef cppu::ImplInheritanceHelper1< ScVbaShape, ov::msforms::XTextBoxShape > TextBoxShapeImpl_BASE;
+Index: sc/source/ui/vba/vbatitle.hxx
+===================================================================
+--- sc/source/ui/vba/vbatitle.hxx	(revision 276159)
++++ sc/source/ui/vba/vbatitle.hxx	(revision 276288)
+@@ -30,14 +30,15 @@
+ #ifndef SC_VBA_TITLE_HXX
+ #define SC_VBA_TITLE_HXX
+ 
+-#include "vbahelperinterface.hxx"
+-#include "vbahelper.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
++#include "excelvbahelper.hxx"
+ #include "vbainterior.hxx"
+ #include "vbafont.hxx"
+ #include "vbapalette.hxx"
+ #include <com/sun/star/drawing/XShape.hpp>
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <ooo/vba/excel/XTitle.hpp>
++#include <ooo/vba/excel/XCharacters.hpp>
+ #include <basic/sberrors.hxx>
+ #include <memory>
+ 
+Index: sc/source/ui/vba/vbacondition.hxx
+===================================================================
+--- sc/source/ui/vba/vbacondition.hxx	(revision 276159)
++++ sc/source/ui/vba/vbacondition.hxx	(revision 276288)
+@@ -31,7 +31,7 @@
+ #define SC_VBA_CONDITION_HXX
+ #include <com/sun/star/sheet/XSheetCondition.hpp> 
+ #include <com/sun/star/sheet/XCellRangeAddressable.hpp> 
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ #include <com/sun/star/sheet/ConditionOperator.hpp>
+ 
+ template< typename Ifc1 >
+Index: sc/source/ui/vba/vbarange.cxx
+===================================================================
+--- sc/source/ui/vba/vbarange.cxx	(revision 276159)
++++ sc/source/ui/vba/vbarange.cxx	(revision 276288)
+@@ -27,7 +27,7 @@
+  * for a copy of the LGPLv3 License.
+  *
+  ************************************************************************/
+-#include "helperdecl.hxx"
++#include <vbahelper/helperdecl.hxx>
+ 
+ #include <comphelper/unwrapargs.hxx>
+ #include <comphelper/processfactory.hxx>
+@@ -94,6 +94,8 @@
+ #include <com/sun/star/sheet/XSubTotalDescriptor.hpp>
+ #include <com/sun/star/sheet/GeneralFunction.hdl>
+ 
++#include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
++#include <com/sun/star/sheet/XSheetAnnotations.hpp>
+ #include <ooo/vba/excel/XlPasteSpecialOperation.hpp>
+ #include <ooo/vba/excel/XlPasteType.hpp>
+ #include <ooo/vba/excel/Constants.hpp>
+@@ -149,7 +151,6 @@
+ #include "rangelst.hxx"
+ #include "convuno.hxx"
+ #include "compiler.hxx"
+-#include "formula/grammar.hxx"
+ #include "attrib.hxx"
+ #include "undodat.hxx"
+ #include "dbdocfun.hxx"
+@@ -162,7 +163,7 @@
+ #include "vbaglobals.hxx"
+ #include "vbastyle.hxx"
+ #include <vector>
+-#include <vbacollectionimpl.hxx>
++#include <vbahelper/vbacollectionimpl.hxx>
+ // begin test includes
+ #include <com/sun/star/sheet/FunctionArgument.hpp>
+ // end test includes
+@@ -256,7 +257,7 @@ ScCellRangeObj*  ScVbaRange::getCellRangeObj() thr
+ SfxItemSet*  ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException )
+ {
+ 	ScCellRangeObj* pUnoCellRange = getCellRangeObj();
+-	SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
++	SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
+ 	if ( !pDataSet )
+ 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for range" ) ), uno::Reference< uno::XInterface >() );
+ 	return pDataSet;	
+@@ -473,7 +474,7 @@ class NumFormatHelper
+ 		if ( pUnoCellRange )
+ 		{
+ 			
+-			SfxItemSet* pDataSet = 	ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
++			SfxItemSet* pDataSet = 	excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
+ 			SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, TRUE, NULL);
+ 			// one of the cells in the range is not like the other ;-)
+ 			// so return a zero length format to indicate that
+@@ -795,9 +796,10 @@ class CellFormulaValueSetter : public CellValueSet
+ 		double aDblValue = 0.0;
+ 		if ( aValue >>= sFormula )
+ 		{
+-            // convert to CONV_OOO style formula string because XCell::setFormula
+-            // always compile it in CONV_OOO style.  Perhaps css.sheet.FormulaParser
+-            // should be used in future to directly pass formula tokens.
++            // convert to GRAM_PODF_A1 style grammar because XCell::setFormula
++            // always compile it in that grammar. Perhaps
++            // css.sheet.FormulaParser should be used in future to directly
++            // pass formula tokens when that API stabilizes.
+             if ( m_eGrammar != formula::FormulaGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) )	
+ 			{
+ 				uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
+@@ -1740,7 +1742,16 @@ ScVbaRange::getFormulaArray() throw (uno::RuntimeE
+ 	uno::Reference< sheet::XCellRangeFormula> xCellRangeFormula( mxRange, uno::UNO_QUERY_THROW );
+ 	uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
+ 	uno::Any aMatrix;
++
++	//VBA, minz@cn.ibm.com
++	uno::Sequence< uno::Sequence<rtl::OUString> > aFmArray = xCellRangeFormula->getFormulaArray();
++	if( aFmArray.getLength() )
++	{
++		if( aFmArray.getLength() == 1 && aFmArray[0].getLength() == 1 )
++			aMatrix <<= aFmArray[0][0];
++		else	
+ 	aMatrix = xConverter->convertTo( uno::makeAny( xCellRangeFormula->getFormulaArray() ) , getCppuType((uno::Sequence< uno::Sequence< uno::Any > >*)0)  ) ;
++	}	
+ 	return aMatrix;
+ }
+ 
+@@ -1979,7 +1990,7 @@ ScVbaRange::Select() throw (uno::RuntimeException)
+ 		// ThisComponent.CurrentController.Frame.getContainerWindow.SetFocus
+ 		try
+ 		{
+-			uno::Reference< frame::XController > xController( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
++			uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+ 			uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_QUERY_THROW );
+ 			uno::Reference< awt::XWindow > xWin( xFrame->getContainerWindow(), uno::UNO_QUERY_THROW );
+ 			xWin->setFocus();
+@@ -1999,9 +2010,9 @@ bool cellInRange( const table::CellRangeAddress& r
+ 	return false;
+ }
+ 
+-void setCursor(  const SCCOL& nCol, const SCROW& nRow, bool bInSel = true )
++void setCursor(  const SCCOL& nCol, const SCROW& nRow, const uno::Reference< frame::XModel >& xModel,  bool bInSel = true )
+ {
+-	ScTabViewShell* pShell = getCurrentBestViewShell();
++	ScTabViewShell* pShell = excel::getBestViewShell( xModel );
+ 	if ( pShell )
+ 	{
+ 		if ( bInSel )
+@@ -2027,11 +2038,19 @@ ScVbaRange::Activate() throw (uno::RuntimeExceptio
+ 	RangeHelper thisRange( xCellRange );
+ 	uno::Reference< sheet::XCellRangeAddressable > xThisRangeAddress = thisRange.getCellRangeAddressable();
+ 	table::CellRangeAddress thisRangeAddress = xThisRangeAddress->getRangeAddress();
++        uno::Reference< frame::XModel > xModel;	
++        ScDocShell* pShell = getScDocShell();
+ 	
++        if ( pShell )
++            xModel = pShell->GetModel();
++
++        if ( !xModel.is() )
++            throw uno::RuntimeException(); 
++
+ 	// get current selection
+-	uno::Reference< sheet::XCellRangeAddressable > xRange( getCurrentDocument()->getCurrentSelection(), ::uno::UNO_QUERY);
++	uno::Reference< sheet::XCellRangeAddressable > xRange( xModel->getCurrentSelection(), ::uno::UNO_QUERY);
+ 
+-	uno::Reference< sheet::XSheetCellRanges > xRanges( getCurrentDocument()->getCurrentSelection(), ::uno::UNO_QUERY);
++	uno::Reference< sheet::XSheetCellRanges > xRanges( xModel->getCurrentSelection(), ::uno::UNO_QUERY);
+ 
+ 	if ( xRanges.is() )
+ 	{
+@@ -2040,7 +2059,7 @@ ScVbaRange::Activate() throw (uno::RuntimeExceptio
+ 		{
+ 			if ( cellInRange( nAddrs[index], thisRangeAddress.StartColumn, thisRangeAddress.StartRow ) )
+ 			{
+-				setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ) );
++				setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel );
+ 				return;
+ 			}
+ 			
+@@ -2048,7 +2067,7 @@ ScVbaRange::Activate() throw (uno::RuntimeExceptio
+ 	}	
+ 
+ 	if ( xRange.is() && cellInRange( xRange->getRangeAddress(), thisRangeAddress.StartColumn, thisRangeAddress.StartRow ) )
+-		setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ) );
++		setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel );
+ 	else
+ 	{
+ 		// if this range is multi cell select the range other
+@@ -2056,7 +2075,7 @@ ScVbaRange::Activate() throw (uno::RuntimeExceptio
+ 		if ( isSingleCellRange() ) 
+ 			// This top-leftmost cell of this Range is not in the current
+ 			// selection so just select this range
+-			setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), false  );
++			setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel, false  );
+ 		else
+ 			Select();
+ 	}
+@@ -2211,8 +2230,9 @@ ScVbaRange::Copy(const ::uno::Any& Destination) th
+ 	}
+ 	else
+ 	{
++		uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
+ 		Select();
+-		implnCopy();
++		excel::implnCopy( xModel );
+ 	}
+ }
+ 
+@@ -2234,9 +2254,11 @@ ScVbaRange::Cut(const ::uno::Any& Destination) thr
+ 		uno::Reference< sheet::XCellRangeAddressable > xSource( mxRange, uno::UNO_QUERY);
+ 		xMover->moveRange( xDestination->getCellAddress(), xSource->getRangeAddress() );
+ 	}
+-	{
++	//VBA, minz@cn.ibm.com.
++	else {
++		uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
+ 		Select();
+-		implnCut();
++		excel::implnCut( xModel );
+ 	}
+ }
+                                                                                                                              
+@@ -2544,9 +2566,12 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, c
+ {
+ 	if ( m_Areas->getCount() > 1 )
+ 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
+-	uno::Reference< view::XSelectionSupplier > xSelection( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
++        ScDocShell* pShell = getScDocShell(); 
++  
++        uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW );
++	uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+ 	// save old selection
+-	uno::Reference< uno::XInterface > xSel(  getCurrentDocument()->getCurrentSelection() );
++	uno::Reference< uno::XInterface > xSel( xModel->getCurrentSelection() );
+ 	// select this range
+ 	xSelection->select( uno::makeAny( mxRange ) );
+ 	// set up defaults	
+@@ -2566,7 +2591,7 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, c
+ 
+ 	USHORT nFlags = getPasteFlags(nPaste);
+ 	USHORT nFormulaBits = getPasteFormulaBits(nOperation);
+-	implnPasteSpecial(nFlags,nFormulaBits,bSkipBlanks,bTranspose);
++	excel::implnPasteSpecial(pShell->GetModel(), nFlags,nFormulaBits,bSkipBlanks,bTranspose);
+ 	// restore selection
+ 	xSelection->select( uno::makeAny( xSel ) );
+ }
+@@ -2618,10 +2643,11 @@ ScVbaRange::AddComment( const uno::Any& Text ) thr
+ {
+ 
+ 	uno::Reference< excel::XComment > xComment( new ScVbaComment( this, mxContext, mxRange ) );
+-	// if you don't pass a valid text or if there is already a comment
+-	// associated with the range then return NULL
+-	if ( !xComment->Text( Text, uno::Any(), uno::Any() ).getLength() 
+-	||   xComment->Text( uno::Any(), uno::Any(), uno::Any() ).getLength() )
++        // if there is existing text then error
++	if ( Text.hasValue() && xComment->Text( uno::Any(), uno::Any(), uno::Any() ).getLength() )
++            throw uno::RuntimeException(); 
++        // failed to write text? ( can this happen ?? )
++	if ( !xComment->Text( Text, uno::Any(), uno::Any() ).getLength()  )
+ 		return NULL;
+ 	return xComment;
+ }
+@@ -3235,13 +3261,15 @@ ScVbaRange::End( ::sal_Int32 Direction )  throw (u
+ 	
+ 	// Save ActiveCell pos ( to restore later )
+ 	uno::Any aDft;
+-	rtl::OUString sActiveCell =	ScVbaGlobals::getGlobalsImpl(
+-                       mxContext )->getApplication()->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
++	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
++	rtl::OUString sActiveCell = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
+ 
+ 	// position current cell upper left of this range
+ 	Cells( uno::makeAny( (sal_Int32) 1 ), uno::makeAny( (sal_Int32) 1 ) )->Select();
+ 
+-	SfxViewFrame* pViewFrame = getCurrentViewFrame();
++        uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
++
++	SfxViewFrame* pViewFrame = excel::getViewFrame( xModel );
+ 	if ( pViewFrame )
+ 	{
+ 		SfxAllItemSet aArgs( SFX_APP()->GetPool() );
+@@ -3277,19 +3305,18 @@ ScVbaRange::End( ::sal_Int32 Direction )  throw (u
+ 	}
+ 
+ 	// result is the ActiveCell		
+-	rtl::OUString sMoved =	ScVbaGlobals::getGlobalsImpl(
+-                       mxContext )->getApplication()->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
++	rtl::OUString sMoved =	xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
+ 
+ 	// restore old ActiveCell		
+ 	uno::Any aVoid;
+-	uno::Reference< excel::XRange > xOldActiveCell( ScVbaGlobals::getGlobalsImpl(
+-		mxContext )->getActiveSheet()->Range( uno::makeAny( sActiveCell ), aVoid ), uno::UNO_QUERY_THROW );
++
++	uno::Reference< excel::XRange > xOldActiveCell( xApplication->getActiveSheet()->Range( uno::makeAny( sActiveCell ), aVoid ), uno::UNO_QUERY_THROW );
+ 	xOldActiveCell->Select();
+ 
+ 	uno::Reference< excel::XRange > resultCell;
+-	resultCell.set( ScVbaGlobals::getGlobalsImpl(
+-		mxContext )->getActiveSheet()->Range( uno::makeAny( sMoved ), aVoid ), uno::UNO_QUERY_THROW );
+ 
++	resultCell.set( xApplication->getActiveSheet()->Range( uno::makeAny( sMoved ), aVoid ), uno::UNO_QUERY_THROW );
++
+ 	// return result
+ 	
+ 	return resultCell;
+@@ -3321,7 +3348,6 @@ ScVbaRange::characters( const uno::Any& Start, con
+  void SAL_CALL 
+ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException)
+ {
+-	
+ 	if ( m_Areas->getCount() > 1 )
+ 	{
+ 		sal_Int32 nItems = m_Areas->getCount();
+@@ -3333,6 +3359,8 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw
+ 		return;
+ 	}
+ 	sheet::CellDeleteMode mode = sheet::CellDeleteMode_NONE ; 
++	RangeHelper thisRange( mxRange );
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+ 	if ( Shift.hasValue() )		
+ 	{
+ 		sal_Int32 nShift = 0;
+@@ -3350,13 +3378,17 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw
+ 		}
+ 	}
+ 	else
+-		if ( getRow() >  getColumn() )
++        {
++		bool bFullRow = ( thisAddress.StartColumn == 0 && thisAddress.EndColumn == MAXCOL );
++	        sal_Int32 nCols = thisAddress.EndColumn - thisAddress.StartColumn;
++	        sal_Int32 nRows = thisAddress.EndRow - thisAddress.StartRow;
++		if ( mbIsRows || bFullRow || ( nCols >=  nRows ) )
+ 			mode = sheet::CellDeleteMode_UP;
+ 		else
+ 			mode = sheet::CellDeleteMode_LEFT;
+-	RangeHelper thisRange( mxRange );
++	}
+ 	uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
+-	xCellRangeMove->removeRange( thisRange.getCellRangeAddressable()->getRangeAddress(), mode ); 
++	xCellRangeMove->removeRange( thisAddress, mode ); 
+ 	
+ }
+ 
+@@ -3394,7 +3426,7 @@ ScVbaRange::createEnumeration() throw (uno::Runtim
+ ::rtl::OUString SAL_CALL 
+ ScVbaRange::getDefaultMethodName(  ) throw (uno::RuntimeException)
+ {
+-	const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Cells") );
++	const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
+ 	return sName;
+ }
+ 
+@@ -3751,7 +3783,7 @@ ScVbaRange::setPageBreak( const uno::Any& _pagebre
+ 		uno::Reference< frame::XModel > xModel = pShell->GetModel();
+ 		if ( xModel.is() )
+ 		{
+-			ScTabViewShell* pViewShell = getBestViewShell( xModel );
++			ScTabViewShell* pViewShell = excel::getBestViewShell( xModel );
+ 			if ( nPageBreak == excel::XlPageBreak::xlPageBreakManual )
+ 			    pViewShell->InsertPageBreak( bColumn, TRUE, &aAddr);
+ 			else if ( nPageBreak == excel::XlPageBreak::xlPageBreakNone )
+@@ -3881,7 +3913,7 @@ ScVbaRange::ApplicationRange( const uno::Reference
+ 	if ( Cell1.hasValue() && !Cell2.hasValue() && sRangeName.getLength() )
+ 	{
+ 		const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
+-		uno::Reference< beans::XPropertySet > xPropSet( getCurrentDocument(), uno::UNO_QUERY_THROW );
++		uno::Reference< beans::XPropertySet > xPropSet( getCurrentExcelDoc(xContext), uno::UNO_QUERY_THROW );
+ 		
+ 		uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW );
+ 		uno::Reference< sheet::XCellRangeReferrer > xReferrer;
+@@ -3904,7 +3936,7 @@ ScVbaRange::ApplicationRange( const uno::Reference
+ 			}
+ 		}
+ 	}
+-	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY );
++	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentExcelDoc(xContext)->getCurrentController(), uno::UNO_QUERY );
+ 	uno::Reference< table::XCellRange > xSheetRange( xView->getActiveSheet(), uno::UNO_QUERY_THROW ); 
+ 	ScVbaRange* pRange = new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xSheetRange );
+ 	uno::Reference< excel::XRange > xVbSheetRange( pRange );
+@@ -4351,8 +4383,10 @@ ScVbaRange::AutoFilter( const uno::Any& Field, con
+ }
+ 
+ void SAL_CALL 
+-ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) throw (uno::RuntimeException)
++ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (uno::RuntimeException)
+ {
++	sal_Bool bCopyOrigin = sal_True;
++	CopyOrigin >>= bCopyOrigin;
+ 	// It appears ( from the web ) that the undocumented CopyOrigin
+ 	// param should contain member of enum XlInsertFormatOrigin
+ 	// which can have values xlFormatFromLeftOrAbove or xlFormatFromRightOrBelow
+@@ -4384,9 +4418,18 @@ void SAL_CALL
+ 			mode = sheet::CellInsertMode_RIGHT;
+ 	}
+ 	RangeHelper thisRange( mxRange );
++	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();	
+ 	uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );	
+-	xCellRangeMove->insertCells( thisRange.getCellRangeAddressable()->getRangeAddress(), mode );
++	xCellRangeMove->insertCells( thisAddress, mode );
++	if ( bCopyOrigin )
++	{
++		// After the insert ( this range ) actually has moved
++		ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
++	 	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getDocShellFromRange( mxRange ) , aRange ) );
++		uno::Reference< excel::XRange > xVbaRange( new ScVbaRange( getParent(), mxContext, xRange, mbIsRows, mbIsColumns ) );	
++		xVbaRange->PasteSpecial( uno::Any(), uno::Any(), uno::Any(), uno::Any() );
+ }
++}
+ 
+ void SAL_CALL
+ ScVbaRange::Autofit() throw (uno::RuntimeException)
+@@ -4720,7 +4763,7 @@ ScVbaRange::PrintOut( const uno::Any& From, const
+ 		{
+ 			xPrintAreas->setPrintAreas( printAreas );
+ 			uno::Reference< frame::XModel > xModel = pShell->GetModel();
+-			PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, xModel, sal_True );
++			PrintOutHelper( excel::getBestViewShell( xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, sal_True );
+ 		}
+ 	}
+ }
+@@ -5034,6 +5077,7 @@ ScVbaRange::getStyle() throw (uno::RuntimeExceptio
+ 	}
+ 	uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW );
+ 	rtl::OUString sStyleName;
++    xProps->getPropertyValue(CELLSTYLE) >>= sStyleName;
+ 	ScDocShell* pShell = getScDocShell();
+ 	uno::Reference< frame::XModel > xModel( pShell->GetModel() ); 
+ 	uno::Reference< excel::XStyle > xStyle = new ScVbaStyle( this, mxContext,  sStyleName, xModel );
+@@ -5367,6 +5411,25 @@ ScVbaRange::getServiceNames()
+ 	return aServiceNames;
+ }
+ 
++sal_Bool SAL_CALL
++ScVbaRange::hasError() throw (uno::RuntimeException)
++{
++    double dResult = sal_False;
++    uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
++    uno::Reference< script::XInvocation > xInvoc( xApplication->WorksheetFunction(), uno::UNO_QUERY_THROW );
++
++    static rtl::OUString FunctionName( RTL_CONSTASCII_USTRINGPARAM("IsError" ) );
++    uno::Sequence< uno::Any > Params(1);
++    uno::Reference< excel::XRange > aRange( this );
++    Params[0] = uno::makeAny( aRange );
++    uno::Sequence< sal_Int16 > OutParamIndex;
++    uno::Sequence< uno::Any > OutParam;
++    xInvoc->invoke( FunctionName, Params, OutParamIndex, OutParam ) >>= dResult;
++    if ( dResult > 0.0 )
++         return sal_True;
++    return sal_False;
++}
++
+ namespace range
+ {
+ namespace sdecl = comphelper::service_decl;
+Index: sc/source/ui/vba/vbachartobject.hxx
+===================================================================
+--- sc/source/ui/vba/vbachartobject.hxx	(revision 276159)
++++ sc/source/ui/vba/vbachartobject.hxx	(revision 276288)
+@@ -36,7 +36,7 @@
+ #include <com/sun/star/container/XNamed.hpp>
+ #include <com/sun/star/document/XEmbeddedObjectSupplier.hpp>
+ #include <ooo/vba/excel/XChartObject.hpp>
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ #include <memory>
+ 
+ typedef InheritedHelperInterfaceImpl1<ov::excel::XChartObject > ChartObjectImpl_BASE;
+Index: sc/source/ui/vba/vbaworkbook.cxx
+===================================================================
+--- sc/source/ui/vba/vbaworkbook.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaworkbook.cxx	(revision 276288)
+@@ -27,7 +27,7 @@
+  * for a copy of the LGPLv3 License.
+  *
+  ************************************************************************/
+-#include "helperdecl.hxx"
++#include <vbahelper/helperdecl.hxx>
+ #include <tools/urlobj.hxx>
+ #include <comphelper/unwrapargs.hxx>
+ 
+@@ -46,12 +46,13 @@
+ #include "vbaworkbook.hxx"
+ #include "vbawindows.hxx"
+ #include "vbastyles.hxx"
+-#include "vbahelper.hxx"
++#include "excelvbahelper.hxx"
+ #include "vbapalette.hxx"
+ #include <osl/file.hxx>
+ #include <stdio.h>
+ #include "vbanames.hxx"  // Amelia Wang
+ #include "nameuno.hxx"
++#include "docoptio.hxx"
+ 
+ // Much of the impl. for the equivalend UNO module is
+ // sc/source/ui/unoobj/docuno.cxx, viewuno.cxx
+@@ -64,7 +65,7 @@ class ActiveSheet : public ScVbaWorksheet
+ protected:
+ 	virtual uno::Reference< frame::XModel > getModel()
+ 	{ 	
+-		return getCurrentDocument(); 
++		return getCurrentExcelDoc( mxContext ); 
+ 	}
+ 	virtual uno::Reference< sheet::XSpreadsheet > getSheet()
+ 	{ 
+@@ -192,7 +193,7 @@ ScVbaWorkbook::init()
+ 	if ( !ColorData.getLength() )
+ 		ResetColors();
+ }
+-ScVbaWorkbook::ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext) :ScVbaWorkbook_BASE( xParent, xContext ), mxModel(NULL)
++ScVbaWorkbook::ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext) :ScVbaWorkbook_BASE( xParent, xContext )
+ {
+ 	//#FIXME this persists the color data per office instance and
+ 	// not per workbook instance, need to hook the data into XModel
+@@ -203,58 +204,27 @@ ScVbaWorkbook::init()
+ 	init();
+ }
+ 
+-ScVbaWorkbook::ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ) : ScVbaWorkbook_BASE( xParent, xContext ),  mxModel( xModel ) 
++ScVbaWorkbook::ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ) : ScVbaWorkbook_BASE( xParent, xContext, xModel )
+ { 
+ 	init();
+ }
+ 
+ ScVbaWorkbook::ScVbaWorkbook( uno::Sequence< uno::Any> const & args,
+-    uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaWorkbook_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ),  mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ) 
++    uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaWorkbook_BASE( args, xContext )
+ 
+ {
+ 	init();
+ }
+ 
+-::rtl::OUString
+-ScVbaWorkbook::getName() throw (uno::RuntimeException)
+-{
+-	rtl::OUString sName = getModel()->getURL();
+-	if ( sName.getLength() )
+-	{
+-
+-		INetURLObject aURL( getModel()->getURL() );
+-		::osl::File::getSystemPathFromFileURL( aURL.GetLastName(), sName );
+-	}
+-	else
+-	{
+-		const static rtl::OUString sTitle( RTL_CONSTASCII_USTRINGPARAM("Title" ) );
+-		// process "UntitledX - $(PRODUCTNAME)"
+-		uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
+-		uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
+-		xProps->getPropertyValue(sTitle ) >>= sName;
+-		sal_Int32 pos = 0;
+-		sName = sName.getToken(0,' ',pos);	
+-	}
+-	return sName;
+-}
+-::rtl::OUString
+-ScVbaWorkbook::getPath() throw (uno::RuntimeException)
+-{
+-	INetURLObject aURL( getModel()->getURL() );
+-	aURL.CutLastName();
+-	return aURL.GetURLPath();
+-}
+-
+-::rtl::OUString
+-ScVbaWorkbook::getFullName() throw (uno::RuntimeException)
+-{
+-	INetURLObject aURL( getModel()->getURL() );
+-	return aURL.GetURLPath();
+-}
+ uno::Reference< excel::XWorksheet >
+ ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException)
+ {
+-	return new ActiveSheet( this, mxContext );
++	uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ) );	
++	uno::Reference< sheet::XSpreadsheet > xSheet;
++	uno::Reference< sheet::XSpreadsheetView > xView( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++	if ( xView.is() )
++		xSheet = xView->getActiveSheet();
++	return new ScVbaWorksheet( this, mxContext, xSheet, xModel );
+ }
+ uno::Any SAL_CALL
+ ScVbaWorkbook::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException)
+@@ -281,91 +251,19 @@ ScVbaWorkbook::Worksheets( const uno::Any& aIndex
+ uno::Any SAL_CALL
+ ScVbaWorkbook::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException)
+ {
+-	uno::Reference< XCollection >  xWindows = ScVbaWindows::Windows( mxContext );
++
++	uno::Reference< excel::XWindows >  xWindows( new ScVbaWindows( getParent(), mxContext ) );
+ 	if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
+ 		return uno::Any( xWindows );
+ 	return uno::Any( xWindows->Item( aIndex, uno::Any() ) );
+ }
+-void
+-ScVbaWorkbook::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
+-					  const uno::Any &rRouteArg ) throw (uno::RuntimeException)
+-{
+-	sal_Bool bSaveChanges = sal_False;
+-	rtl::OUString aFileName;
+-	sal_Bool bRouteWorkbook = sal_True;
+ 
+-	rSaveArg >>= bSaveChanges;
+-	sal_Bool bFileName =  ( rFileArg >>= aFileName );
+-	rRouteArg >>= bRouteWorkbook;
+-	uno::Reference< frame::XStorable > xStorable( getModel(), uno::UNO_QUERY_THROW );
+-	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
+-
+-	if( bSaveChanges )
++void SAL_CALL
++ScVbaWorkbook::Activate() throw (uno::RuntimeException)
+ 	{
+-		if( xStorable->isReadonly() )
+-		{	
+-			throw uno::RuntimeException(::rtl::OUString( 
+-				RTL_CONSTASCII_USTRINGPARAM( "Unable to save to a read only file ") ),
+-                        	uno::Reference< XInterface >() );
++    VbaDocumentBase::Activate();
+ 		}
+-		if( bFileName )
+-			xStorable->storeAsURL( aFileName, uno::Sequence< beans::PropertyValue >(0) ); 
+-		else
+-			xStorable->store();
+-	}	
+-	else
+-		xModifiable->setModified( false );		
+ 
+-	uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY );
+-
+-	if( xCloseable.is() )
+-		// use close(boolean DeliverOwnership)
+-	
+-		// The boolean parameter DeliverOwnership tells objects vetoing the close process that they may
+-		// assume ownership if they object the closure by throwing a CloseVetoException
+-		// Here we give up ownership. To be on the safe side, catch possible veto exception anyway.
+-		xCloseable->close(sal_True);
+-	// If close is not supported by this model - try to dispose it.
+-	// But if the model disagree with a reset request for the modify state
+-	// we shouldn't do so. Otherwhise some strange things can happen.
+-	else
+-	{
+-		uno::Reference< lang::XComponent > xDisposable ( getCurrentDocument(), uno::UNO_QUERY );
+-		if ( xDisposable.is() )
+-			xDisposable->dispose();
+-	}
+-}
+-
+-void
+-ScVbaWorkbook::Protect( const uno::Any &aPassword ) throw (uno::RuntimeException)
+-{
+-	rtl::OUString rPassword;
+-	uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
+-	SC_VBA_FIXME(("Workbook::Protect stub"));
+-	if(  aPassword >>= rPassword )
+-		xProt->protect( rPassword );
+-	else
+-		xProt->protect( rtl::OUString() );
+-}
+-
+-void 
+-ScVbaWorkbook::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeException)
+-{
+-	rtl::OUString rPassword;
+-	uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
+-	if( !getProtectStructure() )
+-		throw uno::RuntimeException(::rtl::OUString(
+-			RTL_CONSTASCII_USTRINGPARAM( "File is already unprotected" ) ),
+-			uno::Reference< XInterface >() );
+-	else
+-	{
+-		if( aPassword >>= rPassword )
+-			xProt->unprotect( rPassword );
+-		else
+-			xProt->unprotect( rtl::OUString() );
+-	}
+-}
+-		
+ ::sal_Bool
+ ScVbaWorkbook::getProtectStructure() throw (uno::RuntimeException)
+ {
+@@ -373,29 +271,23 @@ ScVbaWorkbook::getProtectStructure() throw (uno::R
+ 	return xProt->isProtected();
+ }
+ 
+-void 
+-ScVbaWorkbook::setSaved( sal_Bool bSave ) throw (uno::RuntimeException)
++::sal_Bool SAL_CALL ScVbaWorkbook::getPrecisionAsDisplayed() throw (uno::RuntimeException)
+ {
+-	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
+-	xModifiable->setModified( bSave );
++    uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
++    ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
++    return pDoc->GetDocOptions().IsCalcAsShown();
+ }
+ 
+-sal_Bool
+-ScVbaWorkbook::getSaved() throw (uno::RuntimeException)
++void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (uno::RuntimeException)
+ {
+-	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
+-	return xModifiable->isModified();
++    uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
++    ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
++    ScDocOptions aOpt = pDoc->GetDocOptions();
++    aOpt.SetCalcAsShown( _precisionAsDisplayed );
++    pDoc->SetDocOptions( aOpt );
+ }
+ 
+ void
+-ScVbaWorkbook::Save() throw (uno::RuntimeException)
+-{
+-	rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));
+-	uno::Reference< frame::XModel > xModel = getModel();
+-	dispatchRequests(xModel,url);
+-}
+-
+-void
+ ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::RuntimeException)
+ {
+ 	rtl::OUString aURL;
+@@ -407,13 +299,6 @@ ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sF
+ 	xStor->storeToURL( aURL, storeProps );
+ }
+ 
+-void 
+-ScVbaWorkbook::Activate() throw (uno::RuntimeException)
+-{
+-	uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
+-	xFrame->activate();
+-}	
+-
+ css::uno::Any SAL_CALL 
+ ScVbaWorkbook::Styles( const::uno::Any& Item ) throw (uno::RuntimeException)
+ {
+@@ -465,7 +350,7 @@ ScVbaWorkbook::getCodeName() throw (css::uno::Runt
+ {
+ #ifdef VBA_OOBUILD_HACK 
+     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
+-    ScDocument* pDoc = getDocShell( xModel )->GetDocument();
++    ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
+     ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
+     ScExtDocSettings pExtSettings = pExtOptions->GetDocSettings();
+     ::rtl::OUString sGlobCodeName = pExtSettings.maGlobCodeName;
+@@ -479,7 +364,7 @@ void SAL_CALL
+ ScVbaWorkbook::setCodeName( const ::rtl::OUString& sGlobCodeName ) throw (css::uno::RuntimeException)
+ {
+     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
+-    ScDocument* pDoc = getDocShell( xModel )->GetDocument();
++    ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
+     ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
+     ScExtDocSettings pExtSettings = pExtOptions->GetDocSettings();
+     pExtSettings.maGlobCodeName = sGlobCodeName;
+Index: sc/source/ui/vba/vbainterior.hxx
+===================================================================
+--- sc/source/ui/vba/vbainterior.hxx	(revision 276159)
++++ sc/source/ui/vba/vbainterior.hxx	(revision 276288)
+@@ -34,9 +34,10 @@
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <com/sun/star/container/XIndexAccess.hpp>
++#include <com/sun/star/container/XNameContainer.hpp>
+ 
+ #include <com/sun/star/script/XInvocation.hpp>
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ class ScDocument;
+ 
+Index: sc/source/ui/vba/vbanames.cxx
+===================================================================
+--- sc/source/ui/vba/vbanames.cxx	(revision 276159)
++++ sc/source/ui/vba/vbanames.cxx	(revision 276288)
+@@ -27,7 +27,7 @@
+  * for a copy of the LGPLv3 License.
+  *
+  ************************************************************************/
+-#include "helperdecl.hxx"
++#include <vbahelper/helperdecl.hxx>
+ 
+ #include <com/sun/star/table/XCellRange.hpp>
+ #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
+@@ -81,7 +81,7 @@ ScDocument *
+ ScVbaNames::getScDocument()
+ {
+ 	uno::Reference< frame::XModel > xModel( getModel() , uno::UNO_QUERY_THROW );
+-	ScTabViewShell * pTabViewShell = getBestViewShell( xModel );
++	ScTabViewShell * pTabViewShell = excel::getBestViewShell( xModel );
+ 	if ( !pTabViewShell )
+ 		throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewShell available"), uno::Reference< uno::XInterface >() );
+ 	ScViewData* pViewData = pTabViewShell->GetViewData();
+Index: sc/source/ui/vba/vbaaxes.hxx
+===================================================================
+--- sc/source/ui/vba/vbaaxes.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaaxes.hxx	(revision 276288)
+@@ -32,7 +32,7 @@
+ #include <ooo/vba/excel/XAxes.hpp>
+ #include <ooo/vba/excel/XAxis.hpp>
+ #include <ooo/vba/excel/XChart.hpp>
+-#include "vbacollectionimpl.hxx"
++#include <vbahelper/vbacollectionimpl.hxx>
+ 
+ typedef CollTestImplHelper< ov::excel::XAxes > ScVbaAxes_BASE;
+ class ScVbaAxes : public ScVbaAxes_BASE
+Index: sc/source/ui/vba/vbachart.hxx
+===================================================================
+--- sc/source/ui/vba/vbachart.hxx	(revision 276159)
++++ sc/source/ui/vba/vbachart.hxx	(revision 276288)
+@@ -41,7 +41,7 @@
+ #include <ooo/vba/excel/XChart.hpp>
+ #include <ooo/vba/excel/XDataLabels.hpp>
+ #include <ooo/vba/excel/XSeries.hpp>
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ typedef InheritedHelperInterfaceImpl1<ov::excel::XChart > ChartImpl_BASE;
+ 
+Index: sc/source/ui/vba/vbaformatconditions.cxx
+===================================================================
+--- sc/source/ui/vba/vbaformatconditions.cxx	(revision 276159)
++++ sc/source/ui/vba/vbaformatconditions.cxx	(revision 276288)
+@@ -36,6 +36,7 @@
+ #include "vbaformatcondition.hxx"
+ #include "vbaworkbook.hxx"
+ #include "vbastyles.hxx"
++#include "vbaglobals.hxx"
+ using namespace ::ooo::vba;
+ using namespace ::com::sun::star;
+ 
+@@ -50,7 +51,7 @@ static rtl::OUString sStyleNamePrefix( RTL_CONSTAS
+ ScVbaFormatConditions::ScVbaFormatConditions( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< sheet::XSheetConditionalEntries >& _xSheetConditionalEntries, const uno::Reference< frame::XModel >& xModel ) : ScVbaFormatConditions_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( _xSheetConditionalEntries, uno::UNO_QUERY_THROW ) ), mxSheetConditionalEntries( _xSheetConditionalEntries )
+ {
+ 	mxRangeParent.set( xParent, uno::UNO_QUERY_THROW );
+-	uno::Reference< excel::XWorkbook > xWorkbook = new ScVbaWorkbook(  uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext, xModel );
++	uno::Reference< excel::XWorkbook > xWorkbook = new ScVbaWorkbook(  uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), xContext, xModel );
+ 	mxStyles.set( xWorkbook->Styles( uno::Any() ), uno::UNO_QUERY_THROW );
+ 	uno::Reference< sheet::XCellRangeAddressable > xCellRange( mxRangeParent->getCellRange(), uno::UNO_QUERY_THROW );
+ 	mxParentRangePropertySet.set( xCellRange, uno::UNO_QUERY_THROW );
+Index: sc/source/ui/vba/vbacharts.cxx
+===================================================================
+--- sc/source/ui/vba/vbacharts.cxx	(revision 276159)
++++ sc/source/ui/vba/vbacharts.cxx	(revision 276288)
+@@ -35,11 +35,9 @@ using namespace ::com::sun::star;
+ using namespace ::ooo::vba;
+ 
+ 
+-ScVbaCharts::ScVbaCharts( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext ) : Charts_BASE(_xParent, _xContext, uno::Reference< container::XIndexAccess >() )
++ScVbaCharts::ScVbaCharts( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const uno::Reference< frame::XModel >& xModel ) : Charts_BASE(_xParent, _xContext, uno::Reference< container::XIndexAccess >())
+ {
+-	// #TODO #FIXME surely this is wrong, you should never use the 
+-	// currently documement ( it could be anything )
+-	xComponent.set( getCurrentDocument(), uno::UNO_QUERY_THROW );
++	xComponent.set( xModel, uno::UNO_QUERY_THROW );
+ 	xSpreadsheetDocument.set( xComponent, uno::UNO_QUERY_THROW );
+ }
+ 
+Index: sc/source/ui/vba/vbaoutline.hxx
+===================================================================
+--- sc/source/ui/vba/vbaoutline.hxx	(revision 276159)
++++ sc/source/ui/vba/vbaoutline.hxx	(revision 276288)
+@@ -34,7 +34,7 @@
+ #include <cppuhelper/implbase1.hxx>
+ #include <ooo/vba/excel/XOutline.hpp>
+ #include <com/sun/star/uno/XComponentContext.hpp>
+-#include "vbahelperinterface.hxx"
++#include <vbahelper/vbahelperinterface.hxx>
+ 
+ typedef InheritedHelperInterfaceImpl1< ov::excel::XOutline > ScVbaOutline_BASE;
+ 
+Index: sc/source/ui/inc/docsh.hxx
+===================================================================
+--- sc/source/ui/inc/docsh.hxx	(revision 276159)
++++ sc/source/ui/inc/docsh.hxx	(revision 276288)
+@@ -47,6 +47,7 @@
+ #include "refreshtimer.hxx"
+ 
+ #include <hash_map>
++#include <cppuhelper/implbase1.hxx>
+ 
+ class ScEditEngineDefaulter;
+ class FontList;
+Index: sc/source/ui/inc/tabvwsh.hxx
+===================================================================
+--- sc/source/ui/inc/tabvwsh.hxx	(revision 276159)
++++ sc/source/ui/inc/tabvwsh.hxx	(revision 276288)
+@@ -252,7 +252,7 @@ class ScTabViewShell: public SfxViewShell, public
+ 
+ 	virtual			~ScTabViewShell();
+ 
+-	Window*			GetDialogParent();
++	SC_DLLPUBLIC Window* GetDialogParent();
+ 
+     bool            IsRefInputMode() const;
+ 	void			ExecuteInputDirect();
+Index: sc/source/ui/inc/undodat.hxx
+===================================================================
+--- sc/source/ui/inc/undodat.hxx	(revision 276159)
++++ sc/source/ui/inc/undodat.hxx	(revision 276288)
+@@ -530,8 +530,44 @@ class ScUndoChartData: public ScSimpleUndo
+ 	void				Init();
+ };
+ 
++// amelia
++class ScUndoDataForm: public ScBlockUndo
++{
++public:
++					TYPEINFO();
++					ScUndoDataForm( ScDocShell* pNewDocShell,
++								SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
++								SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
++								const ScMarkData& rMark,
++								ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
++								USHORT nNewFlags,
++								ScRefUndoData* pRefData, void* pFill1, void* pFill2, void* pFill3,
++								BOOL bRedoIsFilled = TRUE
++								 );
++	virtual		~ScUndoDataForm();
+ 
++	virtual	void	Undo();
++	virtual	void	Redo();
++	virtual void	Repeat(SfxRepeatTarget& rTarget);
++	virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+ 
++	virtual String	GetComment() const;
+ 
++private:
++	ScMarkData		aMarkData;
++	ScDocument*		pUndoDoc;
++	ScDocument*		pRedoDoc;
++	USHORT			nFlags;
++	ScRefUndoData*		pRefUndoData;
++	ScRefUndoData*		pRefRedoData;
++	ULONG			nStartChangeAction;
++	ULONG			nEndChangeAction;
++	BOOL			bRedoFilled;
++
++	void			DoChange( const BOOL bUndo );
++	void			SetChangeTrack();
++};
++
++
+ #endif
+ 
+Index: sc/source/ui/inc/tabview.hxx
+===================================================================
+--- sc/source/ui/inc/tabview.hxx	(revision 276159)
++++ sc/source/ui/inc/tabview.hxx	(revision 276288)
+@@ -292,7 +292,7 @@ class ScTabView
+ 
+ 	void			TabChanged();
+ 	void			SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
+-    void            RefreshZoom();
++	SC_DLLPUBLIC void            RefreshZoom();
+ 	void			SetPagebreakMode( BOOL bSet );
+ 
+ 	void			UpdateLayerLocks();
+Index: sc/source/ui/inc/viewdata.hxx
+===================================================================
+--- sc/source/ui/inc/viewdata.hxx	(revision 276159)
++++ sc/source/ui/inc/viewdata.hxx	(revision 276288)
+@@ -225,6 +225,7 @@ class SC_DLLPUBLIC ScViewData
+ 
+ 	SC_DLLPRIVATE void			CalcPPT();
+     SC_DLLPRIVATE void          CreateTabData( SCTAB nNewTab );
++    SC_DLLPRIVATE void          CreateTabData( std::vector< SCTAB >& rvTabs );
+     SC_DLLPRIVATE void          CreateSelectedTabData();
+ 
+ public:
+@@ -311,6 +312,8 @@ class SC_DLLPUBLIC ScViewData
+ 	void			SetPagebreakMode( BOOL bSet );
+ 
+     void            SetZoomType( SvxZoomType eNew, BOOL bAll );
++    void            SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs );
++    void            SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vector< SCTAB >& tabs );
+     void            SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
+     void            RefreshZoom();
+ 
+Index: sc/source/ui/inc/datafdlg.hxx
+===================================================================
+--- sc/source/ui/inc/datafdlg.hxx	(revision 0)
++++ sc/source/ui/inc/datafdlg.hxx	(revision 276288)
+@@ -0,0 +1,121 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: datafdlg.hxx,v $
++ *
++ *  $Revision: 1.00 $
++ *
++ *  last change: $Author: rt $ $Date: 2005/09/08 21:20:35 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef SC_DATAFDLG_HXX
++#define SC_DATAFDLG_HXX
++
++
++#ifndef _SV_DIALOG_HXX //autogen
++#include <vcl/dialog.hxx>
++#endif
++
++#ifndef _SV_BUTTON_HXX //autogen
++#include <vcl/imagebtn.hxx>
++#endif
++
++#ifndef _SV_FIXED_HXX //autogen
++#include <vcl/fixed.hxx>
++#endif
++
++
++#include "global.hxx"
++
++#include <tabvwsh.hxx>
++#include <sfx2/bindings.hxx>
++#include <sfx2/dispatch.hxx>
++
++#define MAX_DATAFORM_COLS   256
++#define MAX_DATAFORM_ROWS   32000
++#define CTRL_HEIGHT         22
++#define FIXED_WIDTH         60
++#define EDIT_WIDTH          140 
++#define FIXED_LEFT          12
++#define EDIT_LEFT           78
++#define LINE_HEIGHT         30
++
++//zhangyun
++class ScDataFormDlg : public ModalDialog
++{
++private:
++
++    PushButton      aBtnNew;
++    PushButton      aBtnDelete;
++    PushButton      aBtnRestore;
++    PushButton      aBtnLast;
++    PushButton      aBtnNext;
++    PushButton      aBtnClose;
++    ScrollBar       aSlider;
++    FixedText       aFixedText;
++    //FixedText       aFixedText1;
++    //Edit            aEdit1;
++    
++    ScTabViewShell* pTabViewShell;
++    ScDocument*     pDoc;
++    sal_uInt16      aColLength;
++    SCROW           aCurrentRow;
++    SCCOL           nStartCol;
++    SCCOL           nEndCol;
++    SCROW           nStartRow;
++    SCROW           nEndRow;
++    SCTAB           nTab;
++    BOOL            bNoSelection;
++    
++    FixedText** pFixedTexts;
++    Edit** pEdits;
++
++public:
++    ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShell);
++    ~ScDataFormDlg();
++    
++    void FillCtrls(SCROW nCurrentRow);
++private:
++
++    void SetButtonState();
++
++    // Handler:
++    DECL_LINK( Impl_NewHdl,     PushButton*    );
++    DECL_LINK( Impl_LastHdl,    PushButton*    );
++    DECL_LINK( Impl_NextHdl,    PushButton*    );
++    
++    DECL_LINK( Impl_RestoreHdl, PushButton*    );
++    DECL_LINK( Impl_DeleteHdl,  PushButton*    );
++    DECL_LINK( Impl_CloseHdl,   PushButton*    );
++    
++    DECL_LINK( Impl_ScrollHdl,  ScrollBar*    );
++    DECL_LINK( Impl_DataModifyHdl,  Edit*    );
++};
++#endif // SC_DATAFDLG_HXX
++
++
+Index: sc/source/ui/inc/viewfunc.hxx
+===================================================================
+--- sc/source/ui/inc/viewfunc.hxx	(revision 276159)
++++ sc/source/ui/inc/viewfunc.hxx	(revision 276288)
+@@ -334,6 +334,13 @@ class ScViewFunc : public ScTabView
+ 	void			ForgetFormatArea()		{ bFormatValid = FALSE; }
+ 	BOOL			SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL );
+ 
++        // Amelia Wang
++        SC_DLLPUBLIC void                   DataFormPutData( SCROW nCurrentRow ,
++                                                             SCROW nStartRow , SCCOL nStartCol ,
++                                                             SCROW nEndRow , SCCOL nEndCol ,
++                                                             Edit** pEdits ,
++                                                             sal_uInt16 aColLength );
++
+ 												// interne Hilfsfunktionen
+ protected:
+ 	void			UpdateLineAttrs( SvxBorderLine&		  rLine,
+Index: sc/source/ui/inc/datafdlg.hrc
+===================================================================
+--- sc/source/ui/inc/datafdlg.hrc	(revision 0)
++++ sc/source/ui/inc/datafdlg.hrc	(revision 276288)
+@@ -0,0 +1,49 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: datafdlg.hrc,v $
++ *
++ *  $Revision: 1.00 $
++ *
++ *  last change: $Author: rt $ $Date: 2005/09/08 21:37:12 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#include "sc.hrc"	// -> RID_SCDLG_DATAFORM
++
++//dataform
++#define BTN_DATAFORM_NEW          1001
++#define BTN_DATAFORM_DELETE       1002
++#define BTN_DATAFORM_RESTORE      1003
++#define BTN_DATAFORM_LAST         1004
++#define BTN_DATAFORM_NEXT         1005
++#define BTN_DATAFORM_CLOSE        1007
++#define WND_DATAFORM_SCROLLBAR    1008
++#define LAB_DATAFORM_RECORDNO     1009
++
++#define FT_DATAFORM_FIXEDTEXT1    2001
++#define ED_DATAFORM_EDIT1         2002
+\ No newline at end of file
+Index: sc/source/ui/inc/docfunc.hxx
+===================================================================
+--- sc/source/ui/inc/docfunc.hxx	(revision 276159)
++++ sc/source/ui/inc/docfunc.hxx	(revision 276288)
+@@ -161,6 +161,8 @@ class ScDocFunc
+ 								double fStart, double fStep, double fMax,
+ 								BOOL bRecord, BOOL bApi );
+ 					// FillAuto: rRange wird von Source-Range auf Dest-Range angepasst
++	SC_DLLPUBLIC	BOOL			FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd	eDateCmd, ULONG nCount, double fStep, double fMax, BOOL bRecord, BOOL bApi );
++
+ 	BOOL			FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
+ 								FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi );
+ 
+Index: sc/source/ui/inc/drawsh.hxx
+===================================================================
+--- sc/source/ui/inc/drawsh.hxx	(revision 276159)
++++ sc/source/ui/inc/drawsh.hxx	(revision 276288)
+@@ -47,9 +47,7 @@ class ScDrawShell : public SfxShell
+ 
+     DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* );
+ 
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+     void SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk );
+-#endif
+ 
+ protected:
+ 	ScViewData*	GetViewData()	{ return pViewData; }
+Index: sc/source/ui/drawfunc/fusel.cxx
+===================================================================
+--- sc/source/ui/drawfunc/fusel.cxx	(revision 276159)
++++ sc/source/ui/drawfunc/fusel.cxx	(revision 276288)
+@@ -205,7 +205,6 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const M
+                    }
+ 
+                    ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, TRUE );
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+                    // For interoperability favour links over macros if both are defined
+                    if ( pInfo->GetHlink().getLength() > 0 )
+                    {
+@@ -213,20 +212,27 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const M
+                        sURL = pInfo->GetHlink();
+                    }
+                    else if ( pInfo->GetMacro().getLength() > 0 )
+-#else
+-                   if ( pInfo->GetMacro().getLength() > 0 )
+-#endif
+                    {
+                        SfxObjectShell* pObjSh = SfxObjectShell::Current();
+                        if ( pObjSh && SfxApplication::IsXScriptURL( pInfo->GetMacro() ) )
+                        {
++                           uno::Reference< beans::XPropertySet > xProps( pObj->getUnoShape(), uno::UNO_QUERY );
++                           uno::Any aCaller;
++                           if ( xProps.is() )
++                           {
++                               try
++                               {
++                                   aCaller = xProps->getPropertyValue( rtl::OUString::createFromAscii("Name") );
++                               }
++                               catch( uno::Exception& ) {}
++                           }
+                            uno::Any aRet;
+                            uno::Sequence< sal_Int16 > aOutArgsIndex;
+                            uno::Sequence< uno::Any > aOutArgs;
+                            uno::Sequence< uno::Any >* pInArgs =
+                                new uno::Sequence< uno::Any >(0);
+                            pObjSh->CallXScript( pInfo->GetMacro(),
+-                               *pInArgs, aRet, aOutArgsIndex, aOutArgs);
++                               *pInArgs, aRet, aOutArgsIndex, aOutArgs, true, &aCaller );
+                            pViewShell->FakeButtonUp( pViewShell->GetViewData()->GetActivePart() );
+                            return TRUE;        // kein CaptureMouse etc.
+                        }
+Index: sc/source/ui/drawfunc/makefile.mk
+===================================================================
+--- sc/source/ui/drawfunc/makefile.mk	(revision 276159)
++++ sc/source/ui/drawfunc/makefile.mk	(revision 276288)
+@@ -79,6 +79,7 @@ SLOFILES =  \
+         $(SLO)$/mediash.obj
+ 
+ EXCEPTIONSFILES= \
++        $(SLO)$/fusel.obj \
+         $(SLO)$/fuins2.obj
+ 
+ NOOPTFILES=\
+Index: sc/source/ui/drawfunc/fudraw.cxx
+===================================================================
+--- sc/source/ui/drawfunc/fudraw.cxx	(revision 276159)
++++ sc/source/ui/drawfunc/fudraw.cxx	(revision 276288)
+@@ -831,11 +831,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
+ 			SdrObjMacroHitRec aHitRec;	//! muss da noch irgendwas gesetzt werden ????
+ 			pViewShell->SetActivePointer( pObj->GetMacroPointer(aHitRec) );
+ 		}
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+         else if ( !bAlt && pInfo && ((pInfo->GetMacro().getLength() > 0) || (pInfo->GetHlink().getLength() > 0)) )
+-#else
+-        else if ( !bAlt && pInfo && (pInfo->GetMacro().getLength() > 0) )
+-#endif
+ 			pWindow->SetPointer( Pointer( POINTER_REFHAND ) );
+ 		else if ( IsDetectiveHit( aPnt ) )
+ 			pViewShell->SetActivePointer( Pointer( POINTER_DETECTIVE ) );
+Index: sc/source/ui/drawfunc/drawsh.cxx
+===================================================================
+--- sc/source/ui/drawfunc/drawsh.cxx	(revision 276159)
++++ sc/source/ui/drawfunc/drawsh.cxx	(revision 276288)
+@@ -211,7 +211,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
+ 			ExecuteTextAttrDlg( rReq );
+ 			break;
+ 
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+         case SID_DRAW_HLINK_EDIT:
+             if ( pSingleSelectedObj )
+                 pViewData->GetDispatcher().Execute( SID_HYPERLINK_DIALOG );
+@@ -239,7 +238,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
+                     ScGlobal::OpenURL( pInfo->GetHlink(), String::EmptyString() );
+             }
+             break;
+-#endif
+ 
+ 		case SID_ATTR_TRANSFORM:
+ 			{
+@@ -494,7 +492,6 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest&
+ 	delete( pDlg );
+ }
+ 
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+ void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk )
+ {
+     if ( pObj )
+@@ -504,5 +501,4 @@ void ScDrawShell::SetHlinkForObject( SdrObject* pO
+         lcl_setModified( GetObjectShell() );
+     }
+ }
+-#endif
+ 
+Index: sc/source/ui/drawfunc/drawsh2.cxx
+===================================================================
+--- sc/source/ui/drawfunc/drawsh2.cxx	(revision 276159)
++++ sc/source/ui/drawfunc/drawsh2.cxx	(revision 276288)
+@@ -200,24 +200,20 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rS
+ 	BOOL bCanRename = FALSE;
+     if ( nMarkCount > 1 )
+     {
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+         // no hypelink options for a selected group
+         rSet.DisableItem( SID_DRAW_HLINK_EDIT );
+         rSet.DisableItem( SID_DRAW_HLINK_DELETE );
+         rSet.DisableItem( SID_OPEN_HYPERLINK );
+-#endif
+     }
+     else if ( nMarkCount == 1 )
+ 	{
+         SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+         ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
+         if ( !pInfo || (pInfo->GetHlink().getLength() == 0) )
+         {
+             rSet.DisableItem( SID_DRAW_HLINK_DELETE );
+             rSet.DisableItem( SID_OPEN_HYPERLINK );
+         }
+-#endif
+         SdrLayerID nLayerID = pObj->GetLayer();
+         if ( nLayerID != SC_LAYER_INTERN )
+             bCanRename = TRUE;                          // #i51351# anything except internal objects can be renamed
+Index: sc/source/ui/drawfunc/drawsh5.cxx
+===================================================================
+--- sc/source/ui/drawfunc/drawsh5.cxx	(revision 276159)
++++ sc/source/ui/drawfunc/drawsh5.cxx	(revision 276288)
+@@ -95,14 +95,12 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet
+     if ( nMarkCount == 1 )              // URL-Button markiert ?
+     {
+         SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+         ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
+         if ( pInfo && (pInfo->GetHlink().getLength() > 0) )
+         {
+             aHLinkItem.SetURL( pInfo->GetHlink() );
+             aHLinkItem.SetInsertMode(HLINK_FIELD);
+         }
+-#endif
+         SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObj);
+         if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor())
+         {
+@@ -245,13 +243,11 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
+                                     bDone = TRUE;
+                                 }
+                             }
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+                             else
+                             {
+                                 SetHlinkForObject( pObj, rURL );
+                                 bDone = TRUE;
+                             }
+-#endif
+                         }
+                     }
+ 
+Index: sc/source/ui/drawfunc/objdraw.src
+===================================================================
+--- sc/source/ui/drawfunc/objdraw.src	(revision 276159)
++++ sc/source/ui/drawfunc/objdraw.src	(revision 276288)
+@@ -189,7 +189,6 @@
+         ITEM_FORMAT_PARA_DLG\
+     };
+ 
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+ #define MN_EDITLNK \
+     MenuItem\
+     {\
+@@ -205,7 +204,6 @@
+         HelpID = SID_DRAW_HLINK_DELETE ; \
+         Text [ en-US ] = "~Remove Hyperlink" ; \
+ 	};
+-#endif
+ 
+ #define MN_DRWTXTATTR \
+     MenuItem\
+@@ -1298,14 +1296,12 @@ Menu RID_POPUP_DRAW
+ 		MenuItem { Separator = TRUE ; };
+ 		 //------------------------------
+ 		ITEM_GROUP_MENU
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+ 		 //------------------------------
+ 		MenuItem { Separator = TRUE ; };
+ 		 //------------------------------
+ 		MN_EDITLNK
+ 		MN_DELLNK
+         MenuItem { ITEM_OPEN_HYPERLINK };
+-#endif
+ 	};
+ };
+ 
+@@ -1375,14 +1371,12 @@ Menu RID_POPUP_GRAPHIC
+ 		MenuItem { Separator = TRUE ; };
+ 		 //------------------------------
+ 		ITEM_GROUP_MENU
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+ 		 //------------------------------
+ 		MenuItem { Separator = TRUE ; };
+ 		 //------------------------------
+ 		MN_EDITLNK
+ 		MN_DELLNK
+         MenuItem { ITEM_OPEN_HYPERLINK };
+-#endif
+ 	};
+ };
+ 
+Index: sc/source/ui/view/gridwin5.cxx
+===================================================================
+--- sc/source/ui/view/gridwin5.cxx	(revision 276159)
++++ sc/source/ui/view/gridwin5.cxx	(revision 276288)
+@@ -346,14 +346,12 @@ void ScGridWindow::RequestHelp(const HelpEvent& rH
+                                     if ( pDrView->PickObj(aMDPos, pDrView->getHitTolLog(), pHit, pPV, SDRSEARCH_DEEP ) )
+                                         pObj = pHit;
+                             }
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+                             ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
+                             if ( pInfo && (pInfo->GetHlink().getLength() > 0) )
+                             {
+                                 aPixRect = LogicToPixel(aVEvt.pObj->GetLogicRect());
+                                 aHelpText = pInfo->GetHlink();
+                             }
+-#endif
+                         }
+                     }
+                 }
+Index: sc/source/ui/view/viewfun2.cxx
+===================================================================
+--- sc/source/ui/view/viewfun2.cxx	(revision 276159)
++++ sc/source/ui/view/viewfun2.cxx	(revision 276288)
+@@ -57,6 +57,11 @@
+ #include <vcl/sound.hxx>
+ #include <vcl/waitobj.hxx>
+ 
++#include <basic/sbstar.hxx>
++#include <com/sun/star/container/XNameContainer.hpp>
++#include <com/sun/star/script/XLibraryContainer.hpp>
++using namespace com::sun::star;
++
+ #include "viewfunc.hxx"
+ 
+ #include "sc.hrc"
+@@ -2139,15 +2144,42 @@ BOOL ScViewFunc::DeleteTable( SCTAB nTab, BOOL bRe
+ 	return bSuccess;
+ }
+ 
++void lcl_DeleteModule( ScDocShell* rDocSh, String& sModuleName )
++{
++    SFX_APP()->EnterBasicCall();
++    uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh->GetBasicContainer();
++    DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
++
++    uno::Reference< container::XNameContainer > xLib;
++    if( xLibContainer.is() )
++    {
++        String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
++        uno::Any aLibAny = xLibContainer->getByName( aLibName );
++        aLibAny >>= xLib;
++    }
++    if( xLib.is() )
++    {
++        if( xLib->hasByName( sModuleName ) )
++        {
++            xLib->removeByName( sModuleName );
++        }
++    }
++    SFX_APP()->LeaveBasicCall();
++}
++
+ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
+ {
+ 	ScDocShell* pDocSh	= GetViewData()->GetDocShell();
+ 	ScDocument* pDoc 	= pDocSh->GetDocument();
++    StarBASIC* pStarBASIC = pDocSh->GetBasic();
++    BOOL bVbaEnabled = pStarBASIC->isVBAEnabled();
+ 	SCTAB		nNewTab = TheTabs[0];
+ 	int			i;
+ 	WaitObject aWait( GetFrameWin() );
+ 	if (bRecord && !pDoc->IsUndoEnabled())
+ 		bRecord = FALSE;
++    if ( bVbaEnabled )
++        bRecord = FALSE;
+ 
+ 	while ( nNewTab > 0 && !pDoc->IsVisible( nNewTab ) )
+ 		--nNewTab;
+@@ -2214,9 +2246,18 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheT
+ 
+ 	for(i=TheTabs.Count()-1;i>=0;i--)
+ 	{
++        String sCodeName;
++        BOOL bHasCodeName = pDoc->GetCodeName( TheTabs[sal::static_int_cast<USHORT>(i)], sCodeName );
+         if (pDoc->DeleteTab( TheTabs[sal::static_int_cast<USHORT>(i)], pUndoDoc ))
+ 		{
+ 			bDelDone = TRUE;
++            if( bVbaEnabled )
++            {
++                if( bHasCodeName )
++                {
++                    lcl_DeleteModule( pDocSh, sCodeName );
++                }
++            }
+             pDocSh->Broadcast( ScTablesHint( SC_TAB_DELETED, TheTabs[sal::static_int_cast<USHORT>(i)] ) );
+ 		}
+ 	}
+@@ -2244,6 +2285,7 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheT
+ 		pDocSh->PostPaintExtras();
+ 		pDocSh->SetDocumentModified();
+ 
++
+         SfxApplication* pSfxApp = SFX_APP();                                // Navigator
+         pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
+         pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
+Index: sc/source/ui/view/viewfun3.cxx
+===================================================================
+--- sc/source/ui/view/viewfun3.cxx	(revision 276159)
++++ sc/source/ui/view/viewfun3.cxx	(revision 276288)
+@@ -213,6 +213,7 @@
+ #include "drwtrans.hxx"
+ #include "docuno.hxx"
+ #include "clipparam.hxx"
++#include "undodat.hxx"   // Amelia Wang
+ 
+ using namespace com::sun::star;
+ 
+@@ -1787,6 +1788,85 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource
+ 	return TRUE;
+ }
+ 
++void ScViewFunc::DataFormPutData( SCROW nCurrentRow ,
++                                  SCROW nStartRow , SCCOL nStartCol ,
++                                  SCROW nEndRow , SCCOL nEndCol ,
++                                  Edit** pEdits ,
++                                  sal_uInt16 aColLength )
++{
++    ScDocument* pDoc = GetViewData()->GetDocument();
++    ScDocShell* pDocSh = GetViewData()->GetDocShell();
++    ScMarkData& rMark = GetViewData()->GetMarkData();
++    ScDocShellModificator aModificator( *pDocSh );
++    SfxUndoManager* pUndoMgr = pDocSh->GetUndoManager();
++    if ( pDoc )
++    {
++        const BOOL bRecord( pDoc->IsUndoEnabled());
++        ScDocument* pUndoDoc = NULL;
++        ScDocument* pRedoDoc = NULL;
++        ScDocument* pRefUndoDoc = NULL;
++        ScRefUndoData* pUndoData = NULL;
++        SCTAB nTab = GetViewData()->GetTabNo();
++        SCTAB nStartTab = nTab;
++        SCTAB nEndTab = nTab;
+ 
++        {
++                ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
++                if ( pChangeTrack )
++                        pChangeTrack->ResetLastCut();   // kein CutMode mehr
++        }
++        ScRange aUserRange( nStartCol, nCurrentRow, nStartTab, nEndCol, nCurrentRow, nEndTab );
++        BOOL bColInfo = ( nStartRow==0 && nEndRow==MAXROW );
++        BOOL bRowInfo = ( nStartCol==0 && nEndCol==MAXCOL );
++        SCCOL nUndoEndCol = nStartCol+aColLength-1;
++        SCROW nUndoEndRow = nCurrentRow;
++        USHORT nUndoFlags = IDF_NONE;
+ 
++        if ( bRecord )
++        {
++            pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
++            pUndoDoc->InitUndoSelected( pDoc , rMark , bColInfo , bRowInfo );
++            pDoc->CopyToDocument( aUserRange , 1 , FALSE , pUndoDoc );
++        }
++        USHORT nExtFlags = 0;
++        pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab , nEndCol, nEndRow, nEndTab ); // content before the change
++        //rMark.SetMarkArea( aUserRange );
++        pDoc->BeginDrawUndo();
+ 
++        for(sal_uInt16 i = 0; i < aColLength; i++)
++        {
++            if (pEdits[i])
++            {
++                String  aFieldName=pEdits[i]->GetText();
++                pDoc->SetString( nStartCol + i, nCurrentRow, nTab, aFieldName );
++            }
++        }
++        //pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, rMark, TRUE );    // Refresh
++        pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nCurrentRow, nStartTab, nEndCol, nCurrentRow, nEndTab );  // content after the change
++        SfxUndoAction* pUndo = new ScUndoDataForm( pDocSh,
++                                                                nStartCol, nCurrentRow, nStartTab,
++                                                                nUndoEndCol, nUndoEndRow, nEndTab, rMark,
++                                                                pUndoDoc, pRedoDoc, nUndoFlags,
++                                                                pUndoData, NULL, NULL, NULL,
++                                                                FALSE );           // FALSE = Redo data not yet copied
++        pUndoMgr->AddUndoAction( new ScUndoWrapper( pUndo ), TRUE );
++        
++        USHORT nPaint = PAINT_GRID;
++        if (bColInfo)
++        {
++                nPaint |= PAINT_TOP;
++                nUndoEndCol = MAXCOL;                           // nur zum Zeichnen !
++        }
++        if (bRowInfo)
++        {
++                nPaint |= PAINT_LEFT;
++                nUndoEndRow = MAXROW;                           // nur zum Zeichnen !
++        }
++
++        pDocSh->PostPaint( nStartCol, nCurrentRow, nStartTab,
++                                                nUndoEndCol, nUndoEndRow, nEndTab, nPaint, nExtFlags );
++        pDocSh->UpdateOle(GetViewData());
++    }
++}
++
++
+Index: sc/source/ui/view/tabview3.cxx
+===================================================================
+--- sc/source/ui/view/tabview3.cxx	(revision 276159)
++++ sc/source/ui/view/tabview3.cxx	(revision 276288)
+@@ -82,7 +82,11 @@
+ #include "tabprotection.hxx"
+ 
+ #include <com/sun/star/chart2/data/HighlightedRange.hpp>
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
+ 
++using namespace com::sun::star::document::VbaEventId;
++
+ namespace
+ {
+ 
+@@ -1463,10 +1467,15 @@ void ScTabView::MarkRange( const ScRange& rRange,
+ 	{
+ 		SCCOL nAlignX = rRange.aStart.Col();
+ 		SCROW nAlignY = rRange.aStart.Row();
+-		if ( rRange.aStart.Col() == 0 && rRange.aEnd.Col() == MAXCOL )
++		bool bCol = ( rRange.aStart.Col() == 0 && rRange.aEnd.Col() == MAXCOL );
++		bool bRow = ( rRange.aStart.Row() == 0 && rRange.aEnd.Row() == MAXROW );
++		if ( !bCol && !bRow )
++		{
++			if ( bCol ) 
+ 			nAlignX = aViewData.GetPosX(WhichH(aViewData.GetActivePart()));
+-		if ( rRange.aStart.Row() == 0 && rRange.aEnd.Row() == MAXROW )
++			if ( bRow )
+ 			nAlignY = aViewData.GetPosY(WhichV(aViewData.GetActivePart()));
++		}
+ 		AlignToCursor( nAlignX, nAlignY, SC_FOLLOW_JUMP );
+ 	}
+ 	InitBlockMode( rRange.aStart.Col(), rRange.aStart.Row(), nTab );
+@@ -1583,6 +1592,17 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, B
+ 										//	nicht InputEnterHandler wegen Referenzeingabe !
+ 
+ 		ScDocument* pDoc = aViewData.GetDocument();
++		if( !bNew )
++		{
++            uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( pDoc->GetVbaEventsHelper(), uno::UNO_QUERY );
++            if( xVbaEventsHelper.is() )
++            {
++                uno::Sequence< uno::Any > aArgs(1);
++                aArgs[0] <<= aViewData.GetTabNo();
++			    xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_DEACTIVATE, aArgs );
++            }
++		}
++			
+ 		pDoc->MakeTable( nTab );
+ 
+         // Update pending row heights before switching the sheet, so Reschedule from the progress bar
+@@ -1689,6 +1709,18 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, B
+ 		}
+ 
+ 		TabChanged();										// DrawView
++
++		if( !bNew )
++		{
++            uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( pDoc->GetVbaEventsHelper(), uno::UNO_QUERY );
++            if( xVbaEventsHelper.is() )
++            {
++                uno::Sequence< uno::Any > aArgs(1);
++                aArgs[0] <<= aViewData.GetTabNo();
++			    xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_ACTIVATE,  aArgs );
++            }
++		}
++			
+ 		aViewData.GetViewShell()->WindowChanged();			// falls das aktive Fenster anders ist
+         if ( !bUnoRefDialog )
+             aViewData.GetViewShell()->DisconnectAllClients();   // important for floating frames
+Index: sc/source/ui/view/viewdata.cxx
+===================================================================
+--- sc/source/ui/view/viewdata.cxx	(revision 276159)
++++ sc/source/ui/view/viewdata.cxx	(revision 276288)
+@@ -597,68 +597,105 @@ void ScViewData::SetViewShell( ScTabViewShell* pVi
+ 		pView		= NULL;
+ 	}
+ }
++void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs )
++{
++    std::vector< SCTAB >::iterator it_end = rvTabs.end();
++    for ( std::vector< SCTAB >::iterator it = rvTabs.begin(); it != it_end; ++it )
++        if ( !pTabData[*it] )
++            CreateTabData( *it );
++}
+ 
+-void ScViewData::SetZoomType( SvxZoomType eNew, BOOL bAll )
++void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs )
+ {
+-    if ( !bAll )
+-        CreateSelectedTabData();    // if zoom is set for a table, it must be stored
++    BOOL bAll = ( tabs.size() == 0 );
+ 
+-    for ( SCTAB i = 0; i <= MAXTAB; i++ )
+-        if ( pTabData[i] && ( bAll || aMarkData.GetTableSelect(i) ) )
++    if ( !bAll ) // create associated table data
++        CreateTabData( tabs );
++
++    std::vector< SCTAB >::iterator it_end = tabs.end();
++    std::vector< SCTAB >::iterator it = tabs.begin();
++    for ( SCTAB i = ( bAll ? 0 : *it ); ( bAll ? i <= MAXTAB :  it != it_end  ); ++i , ++it )
++    {
++        if ( pTabData[i] )
+             pTabData[i]->eZoomType = eNew;
++    } 
+ 
+     if ( bAll )
+         eDefZoomType = eNew;
+ }
+ 
+-void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll )
++void ScViewData::SetZoomType( SvxZoomType eNew, BOOL bAll )
+ {
+-    if ( !bAll )
+-        CreateSelectedTabData();    // if zoom is set for a table, it must be stored
++    std::vector< SCTAB > vTabs; // Empty for all tabs
++    if ( !bAll ) // get selected tabs
++    {
++        SCTAB nTabCount = pDoc->GetTableCount();
++        for (SCTAB i=0; i<nTabCount; i++)
++        {
++            if ( aMarkData.GetTableSelect(i)  )
++                vTabs.push_back( i );
++        }
++    } 
++    SetZoomType( eNew, vTabs );
++}
+ 
++void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vector< SCTAB >& tabs )
++{
++    BOOL bAll = ( tabs.size() == 0 );
++    if ( !bAll ) // create associated table data
++        CreateTabData( tabs );
+ 	Fraction aFrac20( 1,5 );
+ 	Fraction aFrac400( 4,1 );
+ 
+ 	Fraction aValidX = rNewX;
+-	if (aValidX<aFrac20) aValidX = aFrac20;
+-	if (aValidX>aFrac400) aValidX = aFrac400;
++    if (aValidX<aFrac20)
++        aValidX = aFrac20;
++    if (aValidX>aFrac400)
++        aValidX = aFrac400;
+ 
+ 	Fraction aValidY = rNewY;
+-	if (aValidY<aFrac20) aValidY = aFrac20;
+-	if (aValidY>aFrac400) aValidY = aFrac400;
++    if (aValidY<aFrac20)
++        aValidY = aFrac20;
++    if (aValidY>aFrac400)
++        aValidY = aFrac400;
+ 
++    std::vector< SCTAB >::iterator it_end = tabs.end();
++    std::vector< SCTAB >::iterator it = tabs.begin();
++
++    for ( SCTAB i = ( bAll ? 0 : *it ); ( bAll ? i <= MAXTAB :  it != it_end  ); ++i , ++it )
++    {
++        if ( pTabData[i] )
++        {
+ 	if ( bPagebreak )
+ 	{
+-        for ( SCTAB i = 0; i <= MAXTAB; i++ )
+-            if ( pTabData[i] && ( bAll || aMarkData.GetTableSelect(i) ) )
+-            {
+                 pTabData[i]->aPageZoomX = aValidX;
+                 pTabData[i]->aPageZoomY = aValidY;
+             }
+-        if ( bAll )
+-        {
+-            aDefPageZoomX = aValidX;
+-            aDefPageZoomY = aValidY;
+-        }
+-	}
+ 	else
+ 	{
+-        for ( SCTAB i = 0; i <= MAXTAB; i++ )
+-            if ( pTabData[i] && ( bAll || aMarkData.GetTableSelect(i) ) )
+-            {
+                 pTabData[i]->aZoomX = aValidX;
+                 pTabData[i]->aZoomY = aValidY;
+             }
+-        if ( bAll )
+-        {
+-            aDefZoomX = aValidX;
+-            aDefZoomY = aValidY;
+         }
+ 	}
+-
+ 	RefreshZoom();
+ }
+ 
++void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll )
++{
++    std::vector< SCTAB > vTabs;
++    if ( !bAll ) // get selected tabs
++    {
++        SCTAB nTabCount = pDoc->GetTableCount();
++        for (SCTAB i=0; i<nTabCount; i++)
++        {
++            if ( aMarkData.GetTableSelect(i)  )
++                vTabs.push_back( i );
++        }
++    } 
++    SetZoom( rNewX, rNewY, vTabs );
++}
++
+ void ScViewData::SetShowGrid( bool bShow )
+ {
+     CreateSelectedTabData();
+Index: sc/source/ui/view/cellsh2.cxx
+===================================================================
+--- sc/source/ui/view/cellsh2.cxx	(revision 276159)
++++ sc/source/ui/view/cellsh2.cxx	(revision 276288)
+@@ -336,6 +336,20 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
+ 			}
+ 			break;
+ 
++		case SID_DATA_FORM:
++			{
++				ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
++	            DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
++
++	            AbstractScDataFormDlg* pDlg = pFact->CreateScDataFormDlg( pTabViewShell->GetDialogParent(),RID_SCDLG_DATAFORM, pTabViewShell);
++	            DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
++
++	            pDlg->Execute();
++	            
++				rReq.Done();
++			}
++			break;
++			
+ 		case SID_SUBTOTALS:
+ 			{
+ 				const SfxItemSet* pArgs = rReq.GetArgs();
+Index: sc/source/ui/view/gridwin.cxx
+===================================================================
+--- sc/source/ui/view/gridwin.cxx	(revision 276159)
++++ sc/source/ui/view/gridwin.cxx	(revision 276288)
+@@ -128,7 +128,13 @@
+ #include <vcl/svapp.hxx>
+ #include <svx/sdr/overlay/overlayselection.hxx>
+ 
++#include "cellsuno.hxx"
++
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
++
+ using namespace com::sun::star;
++using namespace com::sun::star::document::VbaEventId;
+ using ::com::sun::star::uno::Sequence;
+ using ::com::sun::star::uno::Any;
+ 
+@@ -352,6 +358,32 @@ void lcl_UnLockComment( ScDrawView* pView, SdrPage
+     }
+ }
+ 
++sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTAB nTab, ScBaseCell*& rpCell )
++{
++	BOOL bFound = FALSE;
++	do
++	{
++		pDoc->GetCell( rPosX, rPosY, nTab, rpCell );
++		if ( !rpCell || rpCell->GetCellType() == CELLTYPE_NOTE )
++		{
++			if ( rPosX <= 0 )
++				return FALSE;							// alles leer bis links
++			else
++				--rPosX;								// weitersuchen
++		}
++                else if ( rpCell->GetCellType() == CELLTYPE_EDIT)
++                    bFound = TRUE;
++                else if (rpCell->GetCellType() == CELLTYPE_FORMULA &&
++                  static_cast<ScFormulaCell*>(rpCell)->IsHyperLinkCell())
++                    bFound = TRUE;
++	    else
++			return FALSE;								// andere Zelle
++	}
++	while ( !bFound );
++
++	return bFound;
++}
++
+ // ---------------------------------------------------------------------------
+ //	WB_DIALOGCONTROL noetig fuer UNO-Controls
+ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos )
+@@ -1431,6 +1463,7 @@ void ScGridWindow::HandleMouseButtonDown( const Mo
+ 	SCCOL	nOldColFBox	  = bWasFilterBox ? pFilterBox->GetCol() : 0;
+ 	SCROW  nOldRowFBox	  = bWasFilterBox ? pFilterBox->GetRow() : 0;
+ #endif
++#include "cellsuno.hxx" 
+ 
+ 	ClickExtern();	// loescht FilterBox, wenn vorhanden
+ 
+@@ -2104,6 +2137,26 @@ void __EXPORT ScGridWindow::MouseButtonUp( const M
+ 		{
+ 			nMouseStatus = SC_GM_NONE;				// keinen Doppelklick anfangen
+ 			ScGlobal::OpenURL( aUrl, aTarget );
++			
++			// fire worksheet_followhyperlink event
++			Point aPos = rMEvt.GetPosPixel();
++	        SCsCOL nPosX;
++    	    SCsROW nPosY;
++        	SCTAB nTab = pViewData->GetTabNo();
++        	pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
++			ScBaseCell* pCell = NULL;
++
++			BOOL bFound = lcl_GetHyperlinkCell( pDoc, nPosX, nPosY, nTab, pCell );
++			if( bFound )
++			{
++				ScAddress aCellPos( nPosX, nPosY, nTab );
++				ScCellObj* pObj = new ScCellObj( pViewData->GetDocShell(), aCellPos );
++				uno::Sequence< uno::Any > aArgs(1);
++				aArgs[0] = uno::makeAny(uno::Reference<uno::XInterface>(static_cast<cppu::OWeakObject*>(pObj)));
++                uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( pViewData->GetDocument()->GetVbaEventsHelper(), uno::UNO_QUERY );
++                if( xVbaEventsHelper.is() )
++			        xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_FOLLOWHYPERLINK, aArgs );
++			}
+ 			return;
+ 		}
+ 	}
+@@ -4784,26 +4837,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellE
+ 	ScDocument* pDoc = pDocSh->GetDocument();
+ 	ScBaseCell* pCell = NULL;
+ 
+-	BOOL bFound = FALSE;
+-	do
+-	{
+-		pDoc->GetCell( nPosX, nPosY, nTab, pCell );
+-		if ( !pCell || pCell->GetCellType() == CELLTYPE_NOTE )
+-		{
+-			if ( nPosX <= 0 )
+-				return FALSE;							// alles leer bis links
+-			else
+-				--nPosX;								// weitersuchen
+-		}
+-                else if ( pCell->GetCellType() == CELLTYPE_EDIT)
+-                    bFound = TRUE;
+-                else if (pCell->GetCellType() == CELLTYPE_FORMULA &&
+-                  static_cast<ScFormulaCell*>(pCell)->IsHyperLinkCell())
+-                    bFound = TRUE;
+-	    else
+-			return FALSE;								// andere Zelle
+-	}
+-	while ( !bFound );
++	BOOL bFound = lcl_GetHyperlinkCell( pDoc, nPosX, nPosY, nTab, pCell );
++	if( !bFound )
++		return FALSE;
+ 
+ 	ScHideTextCursor aHideCursor( pViewData, eWhich );	// before GetEditArea (MapMode is changed)
+ 
+Index: sc/uiconfig/scalc/menubar/menubar.xml
+===================================================================
+--- sc/uiconfig/scalc/menubar/menubar.xml	(revision 276159)
++++ sc/uiconfig/scalc/menubar/menubar.xml	(revision 276288)
+@@ -391,6 +391,7 @@
+ 					<menu:menuitem menu:id=".uno:DataFilterHideAutoFilter"/>
+ 				</menu:menupopup>
+ 			</menu:menu>
++			<menu:menuitem menu:id=".uno:DataForm"/>
+ 			<menu:menuitem menu:id=".uno:DataSubTotals"/>
+ 			<menu:menuitem menu:id=".uno:Validation"/>
+ 			<menu:menuseparator/>
+Index: sc/inc/scabstdlg.hxx
+===================================================================
+--- sc/inc/scabstdlg.hxx	(revision 276159)
++++ sc/inc/scabstdlg.hxx	(revision 276288)
+@@ -42,6 +42,8 @@
+ #include "global.hxx"
+ #include "pivot.hxx"
+ 
++#include <tabvwsh.hxx>
++
+ class ScAsciiOptions;
+ class ScAutoFormat;
+ class ScAutoFormatData;
+@@ -111,6 +113,12 @@ class AbstractScDeleteCellDlg : public VclAbstract
+ 	virtual DelCellCmd GetDelCellCmd() const = 0;
+ };
+ 
++//for dataform
++class AbstractScDataFormDlg : public VclAbstractDialog  //add for ScDeleteCellDlg
++{
++
++};
++
+ class AbstractScDeleteContentsDlg: public VclAbstractDialog  //add for ScDeleteContentsDlg
+ {
+ public:
+@@ -293,7 +301,7 @@ class AbstractScImportOptionsDlg : public VclAbstr
+ class ScAbstractDialogFactory
+ {
+ public:
+-	static ScAbstractDialogFactory* 	Create();
++	SC_DLLPUBLIC static ScAbstractDialogFactory* 	Create();
+ 
+ 	virtual 	AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg
+ 																	SvStream* pInStream, int nId,
+@@ -325,6 +333,9 @@ class ScAbstractDialogFactory
+ 
+ 	virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, BOOL bDisallowCellMove = FALSE ) = 0 ; //add for ScDeleteCellDlg
+ 
++	//for dataform
++	virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell*      pTabViewShell ) = 0 ; //add for ScDataFormDlg
++
+ 	virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
+ 																 USHORT  nCheckDefaults = 0 ) = 0;
+ 	virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window*		pParent, //add for ScFillSeriesDlg
+Index: sc/inc/sc.hrc
+===================================================================
+--- sc/inc/sc.hrc	(revision 276159)
++++ sc/inc/sc.hrc	(revision 276288)
+@@ -593,11 +593,9 @@
+ // #i59082# assign macro to shape
+ #define SID_ASSIGNMACRO                 (SC_VIEW_START + 95)
+ 
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+ // #i66550# hyperlinks in shapes
+ #define SID_DRAW_HLINK_EDIT             (SC_VIEW_START + 96)
+ #define SID_DRAW_HLINK_DELETE           (SC_VIEW_START + 97)
+-#endif
+ 
+ // "Zoom / Synchronize sheets" in options dialog
+ #define SID_SC_OPT_SYNCZOOM             (SC_VIEW_START + 98)
+@@ -1650,6 +1648,13 @@
+ #define MID_3   3
+ #define MID_4   4
+ 
++#define SC_OOO_BUILD_START          (SC_DIALOGS_END)
++
++// Data Form
++#define SID_DATAFORM_NEW            (SC_OOO_BUILD_START + 1) // message
++#define SID_DATA_FORM               (SC_OOO_BUILD_START + 2) // menu (in Data menu)
++#define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 3) // dialog
++
+ #endif
+ 
+ 
+Index: sc/inc/table.hxx
+===================================================================
+--- sc/inc/table.hxx	(revision 276159)
++++ sc/inc/table.hxx	(revision 276288)
+@@ -89,6 +89,7 @@ class ScTable
+ 	ScColumn		aCol[MAXCOLCOUNT];
+ 
+ 	String			aName;
++	String			aCodeName;
+ 	String			aComment;
+ 	BOOL			bScenario;
+ 	BOOL			bLayoutRTL;
+@@ -229,6 +230,9 @@ friend class ScAttrRectIterator;
+ 	void		GetName( String& rName ) const;
+ 	void		SetName( const String& rNewName );
+ 
++	void		GetCodeName( String& rName ) const {  rName = aCodeName; }
++	void		SetCodeName( const String& rNewName ) { aCodeName = rNewName; }
++
+     const String&   GetUpperName() const;
+ 
+ 	const String&	GetPageStyle() const					{ return aPageStyle; }
+Index: sc/inc/addruno.hxx
+===================================================================
+--- sc/inc/addruno.hxx	(revision 276159)
++++ sc/inc/addruno.hxx	(revision 276288)
+@@ -50,7 +50,7 @@ class ScAddressConversionObj : public ::cppu::Weak
+     sal_Int32               nRefSheet;
+     sal_Bool                bIsRange;
+ 
+-    sal_Bool                ParseUIString( const String& rUIString );
++    sal_Bool                ParseUIString( const String& rUIString, ::formula::FormulaGrammar::AddressConvention eConv = ::formula::FormulaGrammar::CONV_OOO );
+ 
+ public:
+ 
+Index: sc/inc/cell.hxx
+===================================================================
+--- sc/inc/cell.hxx	(revision 276159)
++++ sc/inc/cell.hxx	(revision 276288)
+@@ -358,7 +358,7 @@ class SC_DLLPUBLIC ScFormulaCell : public ScBaseCe
+ 								const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
+ 
+ 	void			SetDirty();
+-	inline void		SetDirtyVar() { bDirty = TRUE; }
++	void			SetDirtyVar();
+     // If setting entire document dirty after load, no broadcasts but still append to FormulaTree.
+     void            SetDirtyAfterLoad();
+ 	inline void		ResetTableOpDirtyVar() { bTableOpDirty = FALSE; }
+Index: sc/inc/address.hxx
+===================================================================
+--- sc/inc/address.hxx	(revision 276159)
++++ sc/inc/address.hxx	(revision 276288)
+@@ -230,6 +230,9 @@ inline SCTAB SanitizeTab( SCTAB nTab, SCTAB nMaxTa
+ #define SCA_VALID_ROW       0x0100
+ #define SCA_VALID_COL       0x0200
+ #define SCA_VALID_TAB       0x0400
++// SCA_BITS is a convience for 
++// (SCA_VALID_TAB | SCA_VALID_COL | SCA_VALID_ROW | SCA_TAB_3D | SCA_TAB_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_COL_ABSOLUTE)
++#define SCA_BITS            0x070F
+ // somewhat cheesy kludge to force the display of the document name even for
+ // local references.  Requires TAB_3D to be valid
+ #define SCA_FORCE_DOC       0x0800
+Index: sc/inc/global.hxx
+===================================================================
+--- sc/inc/global.hxx	(revision 276159)
++++ sc/inc/global.hxx	(revision 276288)
+@@ -227,6 +227,7 @@ const USHORT IDF_HARDATTR   = 0x0020;   /// Hard c
+ const USHORT IDF_STYLES     = 0x0040;   /// Cell styles.
+ const USHORT IDF_OBJECTS    = 0x0080;   /// Drawing objects.
+ const USHORT IDF_EDITATTR   = 0x0100;   /// Rich-text attributes.
++const USHORT IDF_SPECIAL_BOOLEAN = 0x1000;
+ const USHORT IDF_ATTRIB     = IDF_HARDATTR | IDF_STYLES;
+ const USHORT IDF_CONTENTS   = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA;
+ const USHORT IDF_ALL        = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
+Index: sc/inc/docuno.hxx
+===================================================================
+--- sc/inc/docuno.hxx	(revision 276159)
++++ sc/inc/docuno.hxx	(revision 276288)
+@@ -56,6 +56,7 @@
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <com/sun/star/sheet/XCellRangesAccess.hpp>
+ #include <com/sun/star/util/XChangesNotifier.hpp>
++#include <com/sun/star/document/XDocumentEventCompatibleHelper.hpp>
+ #include <cppuhelper/implbase2.hxx>
+ #include <cppuhelper/implbase3.hxx>
+ #include <cppuhelper/implbase4.hxx>
+@@ -90,6 +91,7 @@ class SC_DLLPUBLIC ScModelObj : public SfxBaseMode
+ 					public com::sun::star::view::XRenderable,
+ 					public com::sun::star::document::XLinkTargetSupplier,
+ 					public com::sun::star::beans::XPropertySet,
++                    public com::sun::star::document::XDocumentEventCompatibleHelper,
+ 					public SvxFmMSFactory,	// derived from XMultiServiceFactory
+                     public com::sun::star::lang::XServiceInfo,
+                     public ::com::sun::star::util::XChangesNotifier
+@@ -319,6 +321,8 @@ class SC_DLLPUBLIC ScModelObj : public SfxBaseMode
+     virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference<
+                                     ::com::sun::star::util::XChangesListener >& aListener )
+                                 throw (::com::sun::star::uno::RuntimeException);
++                            // XVbaEventHelper
++    virtual sal_Bool SAL_CALL processCompatibleEvent( sal_Int16 nEventId ) throw (::com::sun::star::uno::RuntimeException);
+ };
+ 
+ 
+Index: sc/inc/servuno.hxx
+===================================================================
+--- sc/inc/servuno.hxx	(revision 276159)
++++ sc/inc/servuno.hxx	(revision 276288)
+@@ -93,8 +93,9 @@ class ScDocShell;
+ 
+ #define SC_SERVICE_FORMULAPARS  38
+ #define SC_SERVICE_OPCODEMAPPER 39
+-
+-#define SC_SERVICE_COUNT        40
++#define SC_SERVICE_VBAOBJECTPROVIDER   40
++#define SC_SERVICE_VBACODENAMEPROVIDER   41
++#define SC_SERVICE_COUNT        42
+ #define SC_SERVICE_INVALID		USHRT_MAX
+ 
+ 
+Index: sc/inc/scextopt.hxx
+===================================================================
+--- sc/inc/scextopt.hxx	(revision 276159)
++++ sc/inc/scextopt.hxx	(revision 276288)
+@@ -124,6 +124,8 @@ class SC_DLLPUBLIC ScExtDocOptions
+     const String&       GetCodeName( size_t nIdx ) const;
+     /** Appends a codename for a sheet. */
+     void                AppendCodeName( const String& rCodeName );
++    void                SetCodeName( const String& rCodeName, size_t nIdx );
++    void                DeleteCodeName( size_t nIdx );
+ 
+ private:
+     ::std::auto_ptr< ScExtDocOptionsImpl > mxImpl;
+Index: sc/inc/viewuno.hxx
+===================================================================
+--- sc/inc/viewuno.hxx	(revision 276159)
++++ sc/inc/viewuno.hxx	(revision 276288)
+@@ -198,6 +198,7 @@ class ScTabViewObj : public ScViewPaneBase,
+ 	XMouseClickHandlerArr_Impl              aMouseClickHandlers;
+ 	XActivationEventListenerArr_Impl        aActivationListeners;
+ 	sal_Bool								bDrawSelModeSet;
++    sal_Bool                                bFilteredRangeSelection;
+ 
+ 	ScViewPaneObj*			GetObjectByIndex_Impl(USHORT nIndex) const;
+     INT16                   GetZoom(void) const;
+Index: sc/inc/document.hxx
+===================================================================
+--- sc/inc/document.hxx	(revision 276159)
++++ sc/inc/document.hxx	(revision 276288)
+@@ -96,6 +96,7 @@ class ScDrawLayer;
+ class ScExtDocOptions;
+ class ScExternalRefManager;
+ class ScFormulaCell;
++class ScMacroManager;
+ class ScMarkData;
+ class ScOutlineTable;
+ class ScPatternAttr;
+@@ -155,6 +156,9 @@ namespace com { namespace sun { namespace star {
+     }
+ } } }
+ 
++namespace com { namespace sun { namespace star { namespace document {
++    class XVbaEventsHelper;
++} } } }
+ #include <svtools/zforlist.hxx>
+ /*
+ #ifdef _ZFORLIST_DECLARE_TABLE
+@@ -285,12 +289,15 @@ friend class ScDocShell;
+     ::std::auto_ptr<ScClipParam>     mpClipParam;
+ 
+     ::std::auto_ptr<ScExternalRefManager> pExternalRefMgr;
++    ::std::auto_ptr<ScMacroManager> mpMacroMgr;
+ 
++
+     // mutable for lazy construction
+     mutable ::std::auto_ptr< ScFormulaParserPool >
+                         mxFormulaParserPool;            /// Pool for all external formula parsers used by this document.
+ 
+ 	String              aDocName;                       // opt: Dokumentname
++	String              aDocCodeName;                       // opt: Dokumentname
+ 	ScRangePairListRef	xColNameRanges;
+ 	ScRangePairListRef	xRowNameRanges;
+ 
+@@ -317,6 +324,8 @@ friend class ScDocShell;
+ 
+ 	Timer				aTrackTimer;
+ 
++    com::sun::star::uno::Reference< com::sun::star::document::XVbaEventsHelper > mxVbaEventsHelper;
++
+ public:
+     ScTabOpList         aTableOpList;		            // list of ScInterpreterTableOpParams currently in use
+     ScInterpreterTableOpParams  aLastTableOpParams;     // remember last params
+@@ -418,6 +427,9 @@ friend class ScDocShell;
+ 
+ 	inline BOOL 		RowHidden( SCROW nRow, SCTAB nTab );		// FillInfo
+ 
++	// for worksheet calculate event
++	::std::vector< SCTAB > maTabs;
++
+ public:
+ 	SC_DLLPUBLIC ULONG			GetCellCount() const;		// alle Zellen
+ 	ULONG			GetWeightedCount() const;	// Formeln und Edit staerker gewichtet
+@@ -435,6 +447,8 @@ friend class ScDocShell;
+ 
+ 	SC_DLLPUBLIC const String& 	GetName() const { return aDocName; }
+ 	void			SetName( const String& r ) { aDocName = r; }
++	const String& 	GetCodeName() const { return aDocCodeName; }
++	void			SetCodeName( const String& r ) { aDocCodeName = r; }
+ 
+ 	void			GetDocStat( ScDocStat& rDocStat );
+ 
+@@ -520,6 +534,8 @@ friend class ScDocShell;
+ 
+ 	SC_DLLPUBLIC BOOL			HasTable( SCTAB nTab ) const;
+ 	SC_DLLPUBLIC BOOL			GetName( SCTAB nTab, String& rName ) const;
++	SC_DLLPUBLIC BOOL			GetCodeName( SCTAB nTab, String& rName ) const;
++	SC_DLLPUBLIC BOOL			SetCodeName( SCTAB nTab, String& rName );
+ 	SC_DLLPUBLIC BOOL			GetTable( const String& rName, SCTAB& rTab ) const;
+ 	SC_DLLPUBLIC inline SCTAB	GetTableCount() const { return nMaxTableNumber; }
+ 	SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; }
+@@ -863,6 +879,10 @@ friend class ScDocShell;
+ 					// if CalcFormulaTree() is currently running
+ 	BOOL			IsCalculatingFormulaTree() { return bCalculatingFormulaTree; }
+ 
++					// for worksheet calculate event
++	BOOL			FireCalculateEvent( SCTAB nTab );
++	void			AddCalculateTable( SCTAB nTab );
++
+ 	USHORT			GetErrCode( const ScAddress& ) const;
+ 
+ 	void			GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
+@@ -908,7 +928,7 @@ friend class ScDocShell;
+ 							   SCROW nStartRow, SCSIZE nSize,
+                                ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL,
+                                const ScMarkData* pTabMark = NULL );
+-	void			DeleteRow( const ScRange& rRange,
++	SC_DLLPUBLIC void	DeleteRow( const ScRange& rRange,
+ 							   ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
+ 	BOOL			InsertCol( SCROW nStartRow, SCTAB nStartTab,
+ 							   SCROW nEndRow,   SCTAB nEndTab,
+@@ -1493,6 +1513,7 @@ friend class ScDocShell;
+ 	SC_DLLPUBLIC ScLkUpdMode		GetLinkMode() const				{ return eLinkMode ;}
+ 	void			SetLinkMode( ScLkUpdMode nSet )	{ 	eLinkMode  = nSet;}
+ 
++    SC_DLLPUBLIC ScMacroManager* GetMacroManager();
+ 
+ private:
+     ScDocument(const ScDocument& r); // disabled with no definition
+@@ -1702,6 +1723,8 @@ friend class ScDocShell;
+ 	void GetSortParam( ScSortParam& rParam, SCTAB nTab );
+ 	void SetSortParam( ScSortParam& rParam, SCTAB nTab );
+ 
++    com::sun::star::uno::Reference< com::sun::star::document::XVbaEventsHelper > GetVbaEventsHelper();
++
+     /** Should only be GRAM_PODF or GRAM_ODFF. */
+     void                SetStorageGrammar( formula::FormulaGrammar::Grammar eGrammar );
+     formula::FormulaGrammar::Grammar  GetStorageGrammar() const
+Index: sc/inc/globstr.hrc
+===================================================================
+--- sc/inc/globstr.hrc	(revision 276159)
++++ sc/inc/globstr.hrc	(revision 276288)
+@@ -573,10 +573,26 @@
+ #define STR_STYLE_FAMILY_CELL       433
+ #define STR_STYLE_FAMILY_PAGE       434
+ 
+ #define STR_UNDO_SET_TAB_BG_COLOR       435
+ #define STR_UNDO_SET_MULTI_TAB_BG_COLOR 436
+  
+-#define STR_COUNT                   437
++#define STR_SHAPE_AUTOSHAPE         437
++#define STR_SHAPE_RECTANGLE         438
++#define STR_SHAPE_LINE              439
++#define STR_SHAPE_OVAL              440
++#define STR_SHAPE_TEXTBOX           441
+ 
++#define STR_FORM_BUTTON             442
++#define STR_FORM_CHECKBOX           443
++#define STR_FORM_OPTIONBUTTON       444
++#define STR_FORM_LABEL              445
++#define STR_FORM_LISTBOX            446
++#define STR_FORM_GROUPBOX           447
++#define STR_FORM_DROPDOWN           448
++#define STR_FORM_SPINNER            449
++#define STR_FORM_SCROLLBAR          450
++                                       
++#define STR_COUNT                   451
++
+ #endif
+ 
+Index: sc/inc/cellsuno.hxx
+===================================================================
+--- sc/inc/cellsuno.hxx	(revision 276159)
++++ sc/inc/cellsuno.hxx	(revision 276288)
+@@ -152,9 +152,11 @@ class ScHelperFunctions
+ namespace ooo
+ {
+     namespace vba {
++        namespace excel {
+ 	class ScVbaCellRangeAccess;  // Vba Helper class
+     }
+ }
++}
+ 
+ class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet,
+ 						 public com::sun::star::beans::XMultiPropertySet,
+@@ -175,7 +177,7 @@ class SC_DLLPUBLIC ScCellRangesBase : public com::
+ {
+ 	friend class ScTabViewObj;		// fuer select()
+ 	friend class ScTableSheetObj;	// fuer createCursorByRange()
+- 	friend class ooo::vba::ScVbaCellRangeAccess;
++ 	friend class ooo::vba::excel::ScVbaCellRangeAccess;
+ 
+ private:
+ 	const SfxItemPropertySet* pPropSet;
+Index: sc/inc/unonames.hxx
+===================================================================
+--- sc/inc/unonames.hxx	(revision 276159)
++++ sc/inc/unonames.hxx	(revision 276288)
+@@ -186,6 +186,8 @@
+ #define SC_UNONAME_ANCHOR           "Anchor"
+ #define SC_UNONAME_HORIPOS          "HoriOrientPosition"
+ #define SC_UNONAME_VERTPOS          "VertOrientPosition"
++//     #i66550 HLINK_FOR_SHAPES
++#define SC_UNONAME_HYPERLINK        "Hyperlink" 
+ 
+ //	other cell properties
+ #define SC_UNONAME_CHCOLHDR			"ChartColumnAsLabel"
+@@ -529,8 +531,9 @@
+ #define SC_UNO_ZOOMTYPE             "ZoomType"
+ #define SC_UNO_ZOOMVALUE            "ZoomValue"
+ #define SC_UNO_UPDTEMPL             "UpdateFromTemplate"
++#define SC_UNO_FILTERED_RANGE_SELECTION       "FilteredRangeSelection"
+ #define SC_UNO_TABCOLOR             "TabColor"
+ 
+ /*Stampit enable/disable print cancel */
+ #define SC_UNO_ALLOWPRINTJOBCANCEL  "AllowPrintJobCancel"
+ 
+@@ -595,6 +598,7 @@
+ #define SC_UNONAME_ADDRESS          "Address"
+ #define SC_UNONAME_UIREPR           "UserInterfaceRepresentation"
+ #define SC_UNONAME_PERSREPR         "PersistentRepresentation"
++#define SC_UNONAME_XL_A1_REPR       "XL_A1_Representation"
+ #define SC_UNONAME_REFSHEET         "ReferenceSheet"
+ 
+ // --> PB 2004-08-23 #i33095# Security Options
+Index: sc/inc/userdat.hxx
+===================================================================
+--- sc/inc/userdat.hxx	(revision 276159)
++++ sc/inc/userdat.hxx	(revision 276288)
+@@ -102,16 +102,12 @@ class ScMacroInfo : public SdrObjUserData
+     void            SetMacro( const rtl::OUString& rMacro ) { maMacro = rMacro; }
+     const rtl::OUString& GetMacro() const { return maMacro; }
+ 
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+     void            SetHlink( const rtl::OUString& rHlink ) { maHlink = rHlink; }
+     const rtl::OUString& GetHlink() const { return maHlink; }
+-#endif
+ 
+ private:
+     rtl::OUString   maMacro;
+-#ifdef ISSUE66550_HLINK_FOR_SHAPES
+     rtl::OUString   maHlink;
+-#endif
+ };
+ 
+ //-------------------------------------------------------------------------
+Index: sc/inc/sc.hrc.patched
+===================================================================
+--- sc/inc/sc.hrc.patched	(revision 0)
++++ sc/inc/sc.hrc.patched	(revision 276288)
+@@ -0,0 +1,1660 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: sc.hrc,v $
++ * $Revision: 1.63 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_SC_HRC
++#define SC_SC_HRC
++
++#ifndef _SFX_HRC
++#include <sfx2/sfx.hrc>      // ->#include <solar.hrc>
++#endif
++
++#ifndef _SVX_DIALOGS_HRC
++#include <svx/dialogs.hrc>  // ->Svx-IDs
++#endif
++
++#define VAR_ARGS				30 // variable Parameter in scfuncs.src
++
++#define RID_HANDLEBITMAP		10005
++
++// Bereiche ------------------------------------------------------------------
++
++#define SC_VIEW_START			(SID_SC_START)
++#define SC_VIEW_END				(SID_SC_START + 99)
++#define SC_MESSAGE_START		(SID_SC_START + 100)
++#define SC_MESSAGE_END			(SID_SC_START + 199)
++#define SC_FUNCTION_START 		(SID_SC_START + 200)
++#define SC_FUNCTION_END			(SID_SC_START + 299)
++#define SC_PARAM_START			(SID_SC_START + 300)
++#define SC_PARAM_END			(SID_SC_START + 399)
++
++//	kompatibel zu frueher bleiben:
++#define SC_RESOURCE_START		(RID_APP_START+5000)
++#define SC_RESOURCE_END			(RID_APP_END)
++
++// ---------------------------------------------------------------------------
++// Hilfe IDs -----------------------------------------------------------------
++//	Calc hat einen Bereich von 2000 IDs
++//	Die Funktionen brauchen 11*90 = 990 IDs
++
++#define HID_SC_FUNC_START		(HID_SC_START + 0)
++#define HID_INSWIN_START		(HID_SC_START + 1000)
++#define HID_SC_SHEET_START		(HID_SC_START + 1010)
++#define HID_SC_SHELL_START		(HID_SC_START + 1030)
++#define HID_SC_WIN_START		(HID_SC_START + 1050)
++#define HID_SC_CONTROL_START	(HID_SC_START + 1070)
++#define HID_SC_DLG_START		(HID_SC_START + 1100)
++#define HID_SC_TOOLBOX_START	(HID_SC_START + 1170)
++#define HID_SC_MENU_START		(HID_SC_START + 1180)
++#define HID_SC_OTHER_START		(HID_SC_START + 1230)
++#define HID_SC_AAI_FUNCS_START	(HID_SC_START + 1300)		// Analysis Addin Functions
++#define HID_SC_DAI_FUNCS_START  (HID_SC_START + 1420)       // DateFunc Addin Functions
++
++// ---------------------------------------------------------------------------
++
++#define HID_INSWIN_POS			(HID_INSWIN_START + 0 )
++#define HID_INSWIN_CALC			(HID_INSWIN_START + 1 )
++#define HID_INSWIN_CANCEL		(HID_INSWIN_START + 2 )
++#define HID_INSWIN_OK			(HID_INSWIN_START + 3 )
++#define HID_INSWIN_SUMME		(HID_INSWIN_START + 4 )
++#define HID_INSWIN_FUNC			(HID_INSWIN_START + 5 )
++#define HID_INSWIN_INPUT		(HID_INSWIN_START + 6 )
++
++// Hilfe IDs fuer Vorlagen ---------------------------------------------------
++#define HID_SC_SHEET_CELL_STD	(HID_SC_SHEET_START +0 )
++#define HID_SC_SHEET_CELL_ERG	(HID_SC_SHEET_START +1 )
++#define HID_SC_SHEET_CELL_ERG1	(HID_SC_SHEET_START +2 )
++#define HID_SC_SHEET_CELL_UEB	(HID_SC_SHEET_START +3 )
++#define HID_SC_SHEET_CELL_UEB1	(HID_SC_SHEET_START +4 )
++#define HID_SC_SHEET_PAGE_STD	(HID_SC_SHEET_START +10 )
++#define HID_SC_SHEET_PAGE_REP	(HID_SC_SHEET_START +11 )
++
++// Hilfe IDs fuer Shells (Helferlein) (max.20) -------------------------------
++#define HID_SCSHELL_APP			(HID_SC_SHELL_START +0 )
++#define HID_SCSHELL_DOCSH		(HID_SC_SHELL_START +1 )
++#define HID_SCSHELL_DRAWSH		(HID_SC_SHELL_START +2 )
++#define HID_SCSHELL_DRTXTOB		(HID_SC_SHELL_START +3 )
++#define HID_SCSHELL_PIVOTSH		(HID_SC_SHELL_START +4 )
++#define HID_SCSHELL_PREVWSH		(HID_SC_SHELL_START +5 )
++#define HID_SCSHELL_TABVWSH		(HID_SC_SHELL_START +6 )
++#define HID_SCSHELL_AUDIT		(HID_SC_SHELL_START +7 )
++#define HID_SCSHELL_DRAWFORMSH	(HID_SC_SHELL_START +8 )
++#define HID_SCSHELL_CELLSH		(HID_SC_SHELL_START +9 )
++#define HID_SCSHELL_FORMATSH	(HID_SC_SHELL_START +10)
++#define HID_SCSHELL_OLEOBEJCTSH	(HID_SC_SHELL_START +11)
++#define HID_SCSHELL_CHARTSH		(HID_SC_SHELL_START +12)
++#define HID_SCSHELL_GRAPHIC		(HID_SC_SHELL_START +13)
++#define HID_SCSHELL_PAGEBREAK	(HID_SC_SHELL_START +14)
++#define HID_SCSHELL_MEDIA		(HID_SC_SHELL_START +15)
++
++// Hilfe IDs fuer Dokumentfenster --------------------------------------------
++#define HID_SC_WIN_GRIDWIN		( HID_SC_WIN_START )
++#define HID_SC_WIN_PREVIEW		( HID_SC_WIN_START + 1 )
++
++// Hilfe IDs fuer einzelne Controls (max.30) ---------------------------------
++//	Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts
++#define HID_SC_HF_HLL			( HID_SC_CONTROL_START + 0 )
++#define HID_SC_HF_HLC			( HID_SC_CONTROL_START + 1 )
++#define HID_SC_HF_HLR			( HID_SC_CONTROL_START + 2 )
++#define HID_SC_HF_HRL			( HID_SC_CONTROL_START + 3 )
++#define HID_SC_HF_HRC			( HID_SC_CONTROL_START + 4 )
++#define HID_SC_HF_HRR			( HID_SC_CONTROL_START + 5 )
++#define HID_SC_HF_FLL			( HID_SC_CONTROL_START + 6 )
++#define HID_SC_HF_FLC			( HID_SC_CONTROL_START + 7 )
++#define HID_SC_HF_FLR			( HID_SC_CONTROL_START + 8 )
++#define HID_SC_HF_FRL			( HID_SC_CONTROL_START + 9 )
++#define HID_SC_HF_FRC			( HID_SC_CONTROL_START + 10 )
++#define HID_SC_HF_FRR			( HID_SC_CONTROL_START + 11 )
++//	"Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr!
++//#define HID_SC_SUBT_COLS_1		( HID_SC_CONTROL_START + 12 )
++//#define HID_SC_SUBT_COLS_2		( HID_SC_CONTROL_START + 13 )
++//#define HID_SC_SUBT_COLS_3		( HID_SC_CONTROL_START + 14 )
++//	Eintraege im Navigator
++#define HID_SC_NAVIPI_ENTRIES	( HID_SC_CONTROL_START + 15 )
++#define HID_SC_NAVIPI_ROW		( HID_SC_CONTROL_START + 16 )
++#define HID_SC_NAVIPI_COL		( HID_SC_CONTROL_START + 17 )
++#define HID_SC_NAVIPI_DOC		( HID_SC_CONTROL_START + 18 )
++#define HID_SC_NAVIPI_DATA		( HID_SC_CONTROL_START + 19 )
++#define HID_SC_NAVIPI_UP		( HID_SC_CONTROL_START + 20 )
++#define HID_SC_NAVIPI_DOWN		( HID_SC_CONTROL_START + 21 )
++#define HID_SC_NAVIPI_ZOOM		( HID_SC_CONTROL_START + 22 )
++#define HID_SC_NAVIPI_ROOT		( HID_SC_CONTROL_START + 23 )
++#define HID_SC_NAVIPI_SCEN		( HID_SC_CONTROL_START + 24 )
++#define HID_SC_NAVIPI_DROP		( HID_SC_CONTROL_START + 25 )
++//	Teilergebnisse
++#define HID_SC_SUBT_GROUP		( HID_SC_CONTROL_START + 26 )
++#define HID_SC_SUBT_COLS		( HID_SC_CONTROL_START + 27 )
++#define HID_SC_SUBT_FUNC		( HID_SC_CONTROL_START + 28 )
++//
++#define HID_SC_NAVIPI_TOOLBOX	( HID_SC_CONTROL_START + 29 )
++//	Bereich ist voll!
++
++// Hilfe IDs fuer Dialoge / Pages (max.70) -----------------------------------
++#define HID_SC_AUTOFORMAT		(HID_SC_DLG_START )
++#define HID_SC_PIVOTFILTER		(HID_SC_DLG_START +1 )
++#define HID_SC_INPORTOPT		(HID_SC_DLG_START +2 )
++#define HID_SC_PIVOTSUBT		(HID_SC_DLG_START +3 )
++#define HID_SC_FORM_ARGS		(HID_SC_DLG_START +4 )
++#define HID_SCPAGE_SORT_FIELDS	(HID_SC_DLG_START +5 )
++#define HID_SCPAGE_SORT_OPTIONS	(HID_SC_DLG_START +6 )
++#define HID_SCPAGE_SUBT_OPTIONS	(HID_SC_DLG_START +7 )
++#define HID_SCPAGE_SUBT_GROUP	(HID_SC_DLG_START +8 )
++#define HID_SCPAGE_PROTECTION	(HID_SC_DLG_START +9 )
++#define HID_SCPAGE_VIEW			(HID_SC_DLG_START +10 )
++#define HID_SCPAGE_CALC			(HID_SC_DLG_START +11 )
++#define HID_SCPAGE_USERLISTS	(HID_SC_DLG_START +12 )
++#define HID_SCPAGE_HFEDIT		(HID_SC_DLG_START +13 )
++#define HID_SCPAGE_AREAS		(HID_SC_DLG_START +14 )
++#define HID_SCPAGE_TABLE		(HID_SC_DLG_START +15 )
++#define HID_SCPAGE_PRINT		(HID_SC_DLG_START +16 )
++
++#define HID_SCPAGE_SUBT_GROUP1	(HID_SC_DLG_START +17 )
++#define HID_SCPAGE_SUBT_GROUP2	(HID_SC_DLG_START +18 )
++#define HID_SCPAGE_SUBT_GROUP3	(HID_SC_DLG_START +19 )
++
++#define HID_SCPAGE_HFED_HL		(HID_SC_DLG_START +20 )
++#define HID_SCPAGE_HFED_HR		(HID_SC_DLG_START +21 )
++#define HID_SCPAGE_HFED_FL		(HID_SC_DLG_START +22 )
++#define HID_SCPAGE_HFED_FR		(HID_SC_DLG_START +23 )
++
++#define HID_SCPAGE_CONTENT		(HID_SC_DLG_START +24 )
++#define HID_SCPAGE_LAYOUT		(HID_SC_DLG_START +25 )
++#define HID_SCPAGE_INPUT		(HID_SC_DLG_START +26 )
++
++#define HID_SC_NAVIGATOR		(HID_SC_DLG_START +27 )
++
++#define HID_SC_MTRIN_VAL		(HID_SC_DLG_START +28 )
++#define HID_SC_MTRIN_DEF		(HID_SC_DLG_START +29 )
++#define HID_SC_SELENTRY_LIST	(HID_SC_DLG_START +30 )
++#define HID_SC_GROUP_COLS		(HID_SC_DLG_START +31 )
++#define HID_SC_GROUP_ROWS		(HID_SC_DLG_START +32 )
++
++#define HID_SC_HF_TEXT			(HID_SC_DLG_START +33 )
++#define HID_SC_HF_FILE			(HID_SC_DLG_START +34 )
++#define HID_SC_HF_TABLE			(HID_SC_DLG_START +35 )
++#define HID_SC_HF_PAGE			(HID_SC_DLG_START +36 )
++#define HID_SC_HF_PAGES			(HID_SC_DLG_START +37 )
++#define HID_SC_HF_DATE			(HID_SC_DLG_START +38 )
++#define HID_SC_HF_TIME			(HID_SC_DLG_START +39 )
++
++#define HID_SC_HEADER_EDIT		(HID_SC_DLG_START +40 )
++#define HID_SC_FOOTER_EDIT		(HID_SC_DLG_START +41 )
++
++#define HID_SC_SCENWIN_TOP		(HID_SC_DLG_START +42 )
++#define HID_SC_SCENWIN_BOTTOM	(HID_SC_DLG_START +43 )
++
++#define HID_SC_INPUTWIN			(HID_SC_DLG_START +44 )
++
++#define HID_SC_RENAME_NAME		(HID_SC_DLG_START +45 )
++#define HID_SC_APPEND_NAME		(HID_SC_DLG_START +46 )
++
++//	Funktionsautopilot: nur als Unique-IDs
++#define HID_SC_FAP_PAGE			(HID_SC_DLG_START +47 )
++#define HID_SC_FAP_EDIT1		(HID_SC_DLG_START +48 )
++#define HID_SC_FAP_EDIT2		(HID_SC_DLG_START +49 )
++#define HID_SC_FAP_EDIT3		(HID_SC_DLG_START +50 )
++#define HID_SC_FAP_EDIT4		(HID_SC_DLG_START +51 )
++
++#define HID_SC_ADD_AUTOFMT		(HID_SC_DLG_START +52 )
++#define HID_SC_AUTOFMT_NAME		(HID_SC_DLG_START +53 )
++
++#define HID_SC_DROPMODE_URL		(HID_SC_DLG_START +54 )
++#define HID_SC_DROPMODE_LINK	(HID_SC_DLG_START +55 )
++#define HID_SC_DROPMODE_COPY	(HID_SC_DLG_START +56 )
++
++#define HID_SC_FAP_STRUCT		(HID_SC_DLG_START +57 )
++#define HID_SC_ASCII_TABCTR		(HID_SC_DLG_START +58 )
++
++#define HID_SC_SCENARIO_DELETE	(HID_SC_DLG_START +59 )
++#define HID_SC_SCENARIO_EDIT	(HID_SC_DLG_START +60 )
++
++#define HID_SCDLG_FORMULA		(HID_SC_DLG_START +61 )
++#define HID_SCDLG_CONDFORMAT	(HID_SC_DLG_START +62 )
++#define HID_COLROWNAMERANGES	(HID_SC_DLG_START +63 )
++
++#define HID_FUNCTION_BOX		(HID_SC_DLG_START +64 )
++#define HID_SCPAGE_OPREDLINE	(HID_SC_DLG_START +65 )
++#define HID_SC_REDLIN_CTR		(HID_SC_DLG_START +66 )
++
++//Kopf/FusszeilenDlg: Contextmenue fuer Dateiname
++#define HID_FCOMMAND_TITEL		(HID_SC_DLG_START +67 )
++#define HID_FCOMMAND_FILENAME	(HID_SC_DLG_START +68 )
++#define HID_FCOMMAND_PATH		(HID_SC_DLG_START +69 )
++
++
++// Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) -----------------------
++
++#define HID_SC_TOOLBOX_TOOLS	( HID_SC_TOOLBOX_START )
++#define HID_SC_TOOLBOX_TABLE	( HID_SC_TOOLBOX_START + 1 )
++#define HID_SC_TOOLBOX_DRAW		( HID_SC_TOOLBOX_START + 2 )
++#define HID_SC_TOOLBOX_DRTEXT	( HID_SC_TOOLBOX_START + 3 )
++#define HID_SC_TOOLBOX_PREVIEW	( HID_SC_TOOLBOX_START + 4 )
++
++//	wrong group - HID_SC_DLG_START is full
++#define HID_SC_RENAME_AUTOFMT	( HID_SC_TOOLBOX_START + 5 )
++#define HID_SC_REN_AFMT_NAME	( HID_SC_TOOLBOX_START + 6 )
++
++#define HID_SC_TOOLBOX_GRAPHIC	( HID_SC_TOOLBOX_START + 7 )
++
++#define HID_CHG_PROTECT         ( HID_SC_TOOLBOX_START + 8 )
++
++#define HID_SC_RENAME_OBJECT	( HID_SC_TOOLBOX_START + 9 )
++
++// Hilfe IDs fuer Submenus (max.50) ------------------------------------------
++#define HID_SCMENU_EDIT			( HID_SC_MENU_START )
++#define HID_SCMENU_FILL			( HID_SC_MENU_START + 1 )
++#define HID_SCMENU_DELBREAK		( HID_SC_MENU_START + 2 )
++#define HID_SCMENU_VIEW			( HID_SC_MENU_START + 3 )
++#define HID_SCMENU_TOOLBARS		( HID_SC_MENU_START + 4 )
++#define HID_SCMENU_INSERT		( HID_SC_MENU_START + 5 )
++#define HID_SCMENU_INSBREAK		( HID_SC_MENU_START + 6 )
++#define HID_SCMENU_NAME			( HID_SC_MENU_START + 7 )
++#define HID_SCMENU_GRAPHIC		( HID_SC_MENU_START + 8 )
++#define HID_SCMENU_DATA			( HID_SC_MENU_START + 9 )
++#define HID_SCMENU_FILTER		( HID_SC_MENU_START + 10 )
++#define HID_SCMENU_OUTLINE		( HID_SC_MENU_START + 11 )
++#define HID_SCMENU_PIVOT		( HID_SC_MENU_START + 12 )
++#define HID_SCMENU_EXTRA		( HID_SC_MENU_START + 13 )
++#define HID_SCMENU_SPELLING		( HID_SC_MENU_START + 14 )
++#define HID_SCMENU_AUDIT		( HID_SC_MENU_START + 15 )
++#define HID_SCMENU_PROTECT		( HID_SC_MENU_START + 16 )
++#define HID_SCMENU_CELLCONT		( HID_SC_MENU_START + 17 )
++#define HID_SCMENU_ROW			( HID_SC_MENU_START + 18 )
++#define HID_SCMENU_COL			( HID_SC_MENU_START + 19 )
++#define HID_SCMENU_TAB			( HID_SC_MENU_START + 20 )
++#define HID_SCMENU_MERGE		( HID_SC_MENU_START + 21 )
++#define HID_SCMENU_AREA			( HID_SC_MENU_START + 22 )
++#define HID_SCMENU_OBJMIRROR	( HID_SC_MENU_START + 23 )
++#define HID_SCMENU_OBJARRANGE	( HID_SC_MENU_START + 24 )
++#define HID_SCMENU_ANCHOR		( HID_SC_MENU_START + 25 )
++#define HID_SCMENU_SENDTO		( HID_SC_MENU_START + 26 )
++#define HID_SCMENU_CHANGES		( HID_SC_MENU_START + 27 )
++
++#define HID_SC_FAP_BTN_FX1		( HID_SC_MENU_START + 28 )
++#define HID_SC_FAP_BTN_FX2		( HID_SC_MENU_START + 29 )
++#define HID_SC_FAP_BTN_FX3		( HID_SC_MENU_START + 30 )
++#define HID_SC_FAP_BTN_FX4		( HID_SC_MENU_START + 31 )
++#define HID_SC_FAP_BTN_REF1		( HID_SC_MENU_START + 32 )
++#define HID_SC_FAP_BTN_REF2		( HID_SC_MENU_START + 33 )
++#define HID_SC_FAP_BTN_REF3		( HID_SC_MENU_START + 34 )
++#define HID_SC_FAP_BTN_REF4		( HID_SC_MENU_START + 35 )
++#define HID_SC_FAP_FORMULA		( HID_SC_MENU_START + 36 )
++
++#define HID_SC_SORT_ACTION		( HID_SC_MENU_START + 37 )
++#define HID_SC_SORT_AUTHOR		( HID_SC_MENU_START + 38 )
++#define HID_SC_SORT_DATE		( HID_SC_MENU_START + 39 )
++#define HID_SC_SORT_COMMENT		( HID_SC_MENU_START + 40 )
++#define HID_SORT_POSITION		( HID_SC_MENU_START + 41 )
++#define HID_SC_CHANGES_COMMENT  ( HID_SC_MENU_START + 42 )
++#define HID_SC_FUNCTIONLIST		( HID_SC_MENU_START + 43 )
++#define HID_SCPAGE_OPTLOAD		( HID_SC_MENU_START + 44 )
++#define HID_PASSWD_TABLE		( HID_SC_MENU_START + 45 )
++#define HID_PASSWD_DOC			( HID_SC_MENU_START + 46 )
++
++#define HID_DATAPILOT_TYPE		( HID_SC_MENU_START + 47 )
++#define HID_DATAPILOT_DATABASE	( HID_SC_MENU_START + 48 )
++#define HID_DATAPILOT_SERVICE	( HID_SC_MENU_START + 49 )
++
++// Other help IDs (max.70) ---------------------------------------------------
++#define HID_SCDLG_LINKAREAURL   ( HID_SC_OTHER_START )
++#define HID_SCMENU_EDIT_TABLE   ( HID_SC_OTHER_START + 1 )
++
++#define HID_SELECTTABLES        ( HID_SC_OTHER_START + 2 )
++#define HID_SC_REPLCELLSWARN    ( HID_SC_OTHER_START + 3 )
++
++// data pilot layout dialog
++#define HID_SC_DPLAY_PAGE       ( HID_SC_OTHER_START + 4 )
++#define HID_SC_DPLAY_COLUMN     ( HID_SC_OTHER_START + 5 )
++#define HID_SC_DPLAY_ROW        ( HID_SC_OTHER_START + 6 )
++#define HID_SC_DPLAY_DATA       ( HID_SC_OTHER_START + 7 )
++#define HID_SC_DPLAY_SELECT     ( HID_SC_OTHER_START + 8 )
++
++#define HID_SC_DRAW_RENAME      ( HID_SC_OTHER_START + 9 )
++
++#define HID_SC_DPDATAFIELD      ( HID_SC_OTHER_START + 10 )
++#define HID_SC_DPSUBT_OPT       ( HID_SC_OTHER_START + 11 )
++#define HID_SC_DPSUBT_HIDE      ( HID_SC_OTHER_START + 12 )
++#define HID_SC_DPNUMGROUP       ( HID_SC_OTHER_START + 13 )
++#define HID_SC_DPDATEGROUP      ( HID_SC_OTHER_START + 14 )
++#define HID_SC_DPDATEGROUP_LB   ( HID_SC_OTHER_START + 15 )
++#define HID_SC_DPSHOWDETAIL     ( HID_SC_OTHER_START + 16 )
++
++// #i68101#
++#define HID_SC_TITLE_DESCRIPTION_OBJECT	( HID_SC_OTHER_START + 17 )
++
++#define HID_SC_SOLVEROPTIONS    ( HID_SC_OTHER_START + 18 )
++#define HID_SC_SOLVEROPTIONS_LB ( HID_SC_OTHER_START + 19 )
++#define HID_SC_SOLVER_INTEGER   ( HID_SC_OTHER_START + 20 )
++#define HID_SC_SOLVER_DOUBLE    ( HID_SC_OTHER_START + 21 )
++#define HID_SC_SOLVER_PROGRESS  ( HID_SC_OTHER_START + 22 )
++#define HID_SC_SOLVER_NOSOLUTION ( HID_SC_OTHER_START + 23 )
++#define HID_SC_SOLVER_SUCCESS   ( HID_SC_OTHER_START + 24 )
++
++#define HID_SCDLG_CONFLICTS     ( HID_SC_OTHER_START + 25 )
++
++#define HID_SC_HF_HL_DEFINED    ( HID_SC_OTHER_START + 26 )
++#define HID_SC_HF_HR_DEFINED    ( HID_SC_OTHER_START + 27 )
++#define HID_SC_HF_FL_DEFINED    ( HID_SC_OTHER_START + 28 )
++#define HID_SC_HF_FR_DEFINED    ( HID_SC_OTHER_START + 29 )
++
++// Analysis Addin Functions (max.120) ----------------------------------------
++#define HID_AAI_FUNC_WORKDAY		( HID_SC_AAI_FUNCS_START )
++#define HID_AAI_FUNC_YEARFRAC		( HID_SC_AAI_FUNCS_START + 1 )
++#define HID_AAI_FUNC_EDATE			( HID_SC_AAI_FUNCS_START + 2 )
++#define HID_AAI_FUNC_WEEKNUM		( HID_SC_AAI_FUNCS_START + 3 )
++#define HID_AAI_FUNC_EOMONTH		( HID_SC_AAI_FUNCS_START + 4 )
++#define HID_AAI_FUNC_NETWORKDAYS	( HID_SC_AAI_FUNCS_START + 5 )
++#define HID_AAI_FUNC_AMORDEGRC		( HID_SC_AAI_FUNCS_START + 6 )
++#define HID_AAI_FUNC_AMORLINC		( HID_SC_AAI_FUNCS_START + 7 )
++#define HID_AAI_FUNC_ACCRINT		( HID_SC_AAI_FUNCS_START + 8 )
++#define HID_AAI_FUNC_ACCRINTM		( HID_SC_AAI_FUNCS_START + 9 )
++#define HID_AAI_FUNC_RECEIVED		( HID_SC_AAI_FUNCS_START + 10 )
++#define HID_AAI_FUNC_DISC			( HID_SC_AAI_FUNCS_START + 11 )
++#define HID_AAI_FUNC_DURATION		( HID_SC_AAI_FUNCS_START + 12 )
++#define HID_AAI_FUNC_EFFECT			( HID_SC_AAI_FUNCS_START + 13 )
++#define HID_AAI_FUNC_CUMPRINC		( HID_SC_AAI_FUNCS_START + 14 )
++#define HID_AAI_FUNC_CUMIPMT		( HID_SC_AAI_FUNCS_START + 15 )
++#define HID_AAI_FUNC_PRICE			( HID_SC_AAI_FUNCS_START + 16 )
++#define HID_AAI_FUNC_PRICEDISC		( HID_SC_AAI_FUNCS_START + 17 )
++#define HID_AAI_FUNC_PRICEMAT		( HID_SC_AAI_FUNCS_START + 18 )
++#define HID_AAI_FUNC_MDURATION		( HID_SC_AAI_FUNCS_START + 19 )
++#define HID_AAI_FUNC_NOMINAL		( HID_SC_AAI_FUNCS_START + 20 )
++#define HID_AAI_FUNC_DOLLARFR		( HID_SC_AAI_FUNCS_START + 21 )
++#define HID_AAI_FUNC_DOLLARDE		( HID_SC_AAI_FUNCS_START + 22 )
++#define HID_AAI_FUNC_YIELD			( HID_SC_AAI_FUNCS_START + 23 )
++#define HID_AAI_FUNC_YIELDDISC		( HID_SC_AAI_FUNCS_START + 24 )
++#define HID_AAI_FUNC_YIELDMAT		( HID_SC_AAI_FUNCS_START + 25 )
++#define HID_AAI_FUNC_TBILLEQ		( HID_SC_AAI_FUNCS_START + 26 )
++#define HID_AAI_FUNC_TBILLPRICE		( HID_SC_AAI_FUNCS_START + 27 )
++#define HID_AAI_FUNC_TBILLYIELD		( HID_SC_AAI_FUNCS_START + 28 )
++#define HID_AAI_FUNC_ODDFPRICE		( HID_SC_AAI_FUNCS_START + 29 )
++#define HID_AAI_FUNC_ODDFYIELD		( HID_SC_AAI_FUNCS_START + 30 )
++#define HID_AAI_FUNC_ODDLPRICE		( HID_SC_AAI_FUNCS_START + 31 )
++#define HID_AAI_FUNC_ODDLYIELD		( HID_SC_AAI_FUNCS_START + 32 )
++#define HID_AAI_FUNC_XIRR			( HID_SC_AAI_FUNCS_START + 33 )
++#define HID_AAI_FUNC_XNPV			( HID_SC_AAI_FUNCS_START + 34 )
++#define HID_AAI_FUNC_INTRATE		( HID_SC_AAI_FUNCS_START + 35 )
++#define HID_AAI_FUNC_COUPNCD		( HID_SC_AAI_FUNCS_START + 36 )
++#define HID_AAI_FUNC_COUPDAYS		( HID_SC_AAI_FUNCS_START + 37 )
++#define HID_AAI_FUNC_COUPDAYSNC		( HID_SC_AAI_FUNCS_START + 38 )
++#define HID_AAI_FUNC_COUPDAYBS		( HID_SC_AAI_FUNCS_START + 39 )
++#define HID_AAI_FUNC_COUPPCD		( HID_SC_AAI_FUNCS_START + 40 )
++#define HID_AAI_FUNC_COUPNUM		( HID_SC_AAI_FUNCS_START + 41 )
++#define HID_AAI_FUNC_FVSCHEDULE		( HID_SC_AAI_FUNCS_START + 42 )
++#define HID_AAI_FUNC_ISEVEN			( HID_SC_AAI_FUNCS_START + 43 )
++#define HID_AAI_FUNC_ISODD			( HID_SC_AAI_FUNCS_START + 44 )
++#define HID_AAI_FUNC_GCD			( HID_SC_AAI_FUNCS_START + 45 )
++#define HID_AAI_FUNC_LCM			( HID_SC_AAI_FUNCS_START + 46 )
++#define HID_AAI_FUNC_MULTINOMIAL	( HID_SC_AAI_FUNCS_START + 47 )
++#define HID_AAI_FUNC_SERIESSUM		( HID_SC_AAI_FUNCS_START + 48 )
++#define HID_AAI_FUNC_QUOTIENT		( HID_SC_AAI_FUNCS_START + 49 )
++#define HID_AAI_FUNC_MROUND			( HID_SC_AAI_FUNCS_START + 50 )
++#define HID_AAI_FUNC_SQRTPI			( HID_SC_AAI_FUNCS_START + 51 )
++#define HID_AAI_FUNC_RANDBETWEEN	( HID_SC_AAI_FUNCS_START + 52 )
++#define HID_AAI_FUNC_BESSELI		( HID_SC_AAI_FUNCS_START + 53 )
++#define HID_AAI_FUNC_BESSELJ		( HID_SC_AAI_FUNCS_START + 54 )
++#define HID_AAI_FUNC_BESSELK		( HID_SC_AAI_FUNCS_START + 55 )
++#define HID_AAI_FUNC_BESSELY		( HID_SC_AAI_FUNCS_START + 56 )
++#define HID_AAI_FUNC_BIN2DEC		( HID_SC_AAI_FUNCS_START + 57 )
++#define HID_AAI_FUNC_BIN2HEX		( HID_SC_AAI_FUNCS_START + 58 )
++#define HID_AAI_FUNC_BIN2OCT		( HID_SC_AAI_FUNCS_START + 59 )
++#define HID_AAI_FUNC_DELTA			( HID_SC_AAI_FUNCS_START + 60 )
++#define HID_AAI_FUNC_DEC2BIN		( HID_SC_AAI_FUNCS_START + 61 )
++#define HID_AAI_FUNC_DEC2HEX		( HID_SC_AAI_FUNCS_START + 62 )
++#define HID_AAI_FUNC_DEC2OCT		( HID_SC_AAI_FUNCS_START + 63 )
++#define HID_AAI_FUNC_ERF			( HID_SC_AAI_FUNCS_START + 64 )
++#define HID_AAI_FUNC_ERFC			( HID_SC_AAI_FUNCS_START + 65 )
++#define HID_AAI_FUNC_GESTEP			( HID_SC_AAI_FUNCS_START + 66 )
++#define HID_AAI_FUNC_HEX2BIN		( HID_SC_AAI_FUNCS_START + 67 )
++#define HID_AAI_FUNC_HEX2DEC		( HID_SC_AAI_FUNCS_START + 68 )
++#define HID_AAI_FUNC_HEX2OCT		( HID_SC_AAI_FUNCS_START + 69 )
++#define HID_AAI_FUNC_IMABS			( HID_SC_AAI_FUNCS_START + 70 )
++#define HID_AAI_FUNC_IMAGINARY		( HID_SC_AAI_FUNCS_START + 71 )
++#define HID_AAI_FUNC_IMPOWER		( HID_SC_AAI_FUNCS_START + 72 )
++#define HID_AAI_FUNC_IMARGUMENT		( HID_SC_AAI_FUNCS_START + 73 )
++#define HID_AAI_FUNC_IMCOS			( HID_SC_AAI_FUNCS_START + 74 )
++#define HID_AAI_FUNC_IMDIV			( HID_SC_AAI_FUNCS_START + 75 )
++#define HID_AAI_FUNC_IMEXP			( HID_SC_AAI_FUNCS_START + 76 )
++#define HID_AAI_FUNC_IMCONJUGATE	( HID_SC_AAI_FUNCS_START + 77 )
++#define HID_AAI_FUNC_IMLN			( HID_SC_AAI_FUNCS_START + 78 )
++#define HID_AAI_FUNC_IMLOG10		( HID_SC_AAI_FUNCS_START + 79 )
++#define HID_AAI_FUNC_IMLOG2			( HID_SC_AAI_FUNCS_START + 80 )
++#define HID_AAI_FUNC_IMPRODUCT		( HID_SC_AAI_FUNCS_START + 81 )
++#define HID_AAI_FUNC_IMREAL			( HID_SC_AAI_FUNCS_START + 82 )
++#define HID_AAI_FUNC_IMSIN			( HID_SC_AAI_FUNCS_START + 83 )
++#define HID_AAI_FUNC_IMSUB			( HID_SC_AAI_FUNCS_START + 84 )
++#define HID_AAI_FUNC_IMSUM			( HID_SC_AAI_FUNCS_START + 85 )
++#define HID_AAI_FUNC_IMSQRT			( HID_SC_AAI_FUNCS_START + 86 )
++#define HID_AAI_FUNC_COMPLEX		( HID_SC_AAI_FUNCS_START + 87 )
++#define HID_AAI_FUNC_OCT2BIN		( HID_SC_AAI_FUNCS_START + 88 )
++#define HID_AAI_FUNC_OCT2DEZ		( HID_SC_AAI_FUNCS_START + 89 )
++#define HID_AAI_FUNC_OCT2HEX		( HID_SC_AAI_FUNCS_START + 90 )
++#define HID_AAI_FUNC_CONVERT		( HID_SC_AAI_FUNCS_START + 91 )
++#define HID_AAI_FUNC_FACTDOUBLE		( HID_SC_AAI_FUNCS_START + 92 )
++
++// DateFunc Addin Functions (max.20) -----------------------------------------
++#define HID_DAI_FUNC_DAYSINMONTH    ( HID_SC_DAI_FUNCS_START )
++#define HID_DAI_FUNC_DAYSINYEAR     ( HID_SC_DAI_FUNCS_START + 1 )
++#define HID_DAI_FUNC_WEEKSINYEAR    ( HID_SC_DAI_FUNCS_START + 2 )
++#define HID_DAI_FUNC_DIFFMONTHS     ( HID_SC_DAI_FUNCS_START + 3 )
++#define HID_DAI_FUNC_DIFFWEEKS      ( HID_SC_DAI_FUNCS_START + 4 )
++#define HID_DAI_FUNC_DIFFYEARS      ( HID_SC_DAI_FUNCS_START + 5 )
++#define HID_DAI_FUNC_ROT13          ( HID_SC_DAI_FUNCS_START + 6 )
++
++// Ende Hilfe IDs ------------------------------------------------------------
++// ---------------------------------------------------------------------------
++
++// View-Funktionen (max. 100) ------------------------------------------------
++
++#define FID_TESTFUNC0			(SC_VIEW_START)
++#define FID_TESTFUNC1			(SC_VIEW_START + 1)
++#define FID_TESTFUNC2			(SC_VIEW_START + 2)
++#define FID_TESTFUNC3			(SC_VIEW_START + 3)
++#define FID_TESTFUNC4			(SC_VIEW_START + 4)
++#define FID_TESTFUNC5			(SC_VIEW_START + 5)
++#define FID_TESTFUNC6			(SC_VIEW_START + 6)
++#define FID_TESTFUNC7			(SC_VIEW_START + 7)
++#define FID_TESTFUNC8			(SC_VIEW_START + 8)
++#define FID_TESTFUNC9			(SC_VIEW_START + 9)
++#define FID_SCALESTATUS			(SC_VIEW_START + 10)
++#define FID_COLOR				(SC_VIEW_START + 11)
++//aus sfx: #define SID_REPAINT				(SC_VIEW_START + 12)
++#define SID_UPDATECHART			(SC_VIEW_START + 13)
++#define FID_MARKLEFT			(SC_VIEW_START + 14)
++#define FID_MARKRIGHT			(SC_VIEW_START + 15)
++#define FID_MARKUP				(SC_VIEW_START + 16)
++#define FID_MARKDOWN			(SC_VIEW_START + 17)
++#define FID_MARKPAGEUP			(SC_VIEW_START + 18)
++#define FID_MARKPAGEDOWN		(SC_VIEW_START + 19)
++
++// Slot-IDs fuer Attribute:
++
++#define SID_SCATTR_HOR_JUSTIFY	(SC_VIEW_START + 30)	// Alignment-Page
++#define SID_SCATTR_VER_JUSTIFY	(SC_VIEW_START + 31)
++#define SID_SCATTR_MARGIN		(SC_VIEW_START + 32)
++#define SID_SCATTR_STACKED      (SC_VIEW_START + 33)
++#define SID_SCATTR_LINEBREAK	(SC_VIEW_START + 35)
++#define	SID_SCATTR_PROTECTION	(SC_VIEW_START + 36)	// Protection-Page
++
++// sonstige Slot-IDs:
++
++#define SID_SCUSERLISTS         (SC_VIEW_START + 37)    // Benutzerdef.Listen
++#define RES_TBX_DUMMY			(SC_VIEW_START + 38)    // Dummy-Item
++#define SID_SCVIEWOPTIONS       (SC_VIEW_START + 39)
++#define SID_SCDOCOPTIONS        (SC_VIEW_START + 40)
++
++// Cursorbewegungen als Properties:
++
++#define	SID_CURRENTCELL			(SC_VIEW_START + 41)
++#define	SID_CURRENTTAB			(SC_VIEW_START + 42)
++#define SID_CURRENTDOC			(SC_VIEW_START + 43)
++#define SID_CURRENTOBJECT		(SC_VIEW_START + 44)
++
++// Slot-IDs fuer spez. ToolBox-Funktionen:
++
++#define SID_NUMBER_CURRENCY		(SC_VIEW_START + 45)
++#define SID_NUMBER_PERCENT		(SC_VIEW_START + 46)
++
++// "Slot" Ids fuer Eingabezeilen Images:
++#define SID_INPUT_FUNCTION		(SC_VIEW_START + 47)
++#define SID_INPUT_SUM			(SC_VIEW_START + 48)
++#define SID_INPUT_EQUAL			(SC_VIEW_START + 49)
++#define SID_INPUT_CANCEL		(SC_VIEW_START + 50)
++#define SID_INPUT_OK			(SC_VIEW_START + 51)
++
++#define SID_NUMBER_STANDARD		(SC_VIEW_START + 52)
++#define SID_NUMBER_DATE			(SC_VIEW_START + 53)
++#define SID_NUMBER_TWODEC		(SC_VIEW_START + 54)
++#define SID_NUMBER_SCIENTIFIC	(SC_VIEW_START + 55)
++#define SID_NUMBER_TIME			(SC_VIEW_START + 56)
++#define SID_NUMBER_INCDEC		(SC_VIEW_START + 57)
++#define SID_NUMBER_DECDEC		(SC_VIEW_START + 58)
++
++// Sonstiges:
++#define SID_LINKS				(SC_VIEW_START + 60)
++#define SID_INSERT_SIMAGE		(SC_VIEW_START + 61)
++#define SID_INSERT_SCHART		(SC_VIEW_START + 62)
++#define SID_INSERT_SMATH        (SC_VIEW_START + 63)
++#define SID_STANDARD_FONTS		(SC_VIEW_START + 64)
++#define SID_MIRROR_VERTICAL		(SC_VIEW_START + 65)
++#define SID_MIRROR_HORIZONTAL	(SC_VIEW_START + 66)
++#define SID_CELL_FORMAT_RESET	(SC_VIEW_START + 67)
++#define SID_SCPRINTOPTIONS      (SC_VIEW_START + 68)
++#define SID_WINDOW_SPLIT		(SC_VIEW_START + 69)
++#define SID_WINDOW_FIX			(SC_VIEW_START + 70)
++#ifdef SID_DRAW_CHART
++#undef SID_DRAW_CHART
++#endif
++#define SID_DRAW_CHART			(SC_VIEW_START + 71)
++#define SID_UPDATETABLINKS		(SC_VIEW_START + 72)
++
++//TabPage Eingabe
++#define SID_SC_INPUT_SELECTION          (SC_VIEW_START + 73)
++#define SID_SC_INPUT_SELECTIONPOS       (SC_VIEW_START + 74)
++#define SID_SC_INPUT_EDITMODE           (SC_VIEW_START + 75)
++#define SID_SC_INPUT_FMT_EXPAND         (SC_VIEW_START + 76)
++#define SID_SC_INPUT_RANGEFINDER        (SC_VIEW_START + 77)
++#define SID_SC_INPUT_REF_EXPAND			(SC_VIEW_START + 78)
++#define SID_SC_INPUT_MARK_HEADER		(SC_VIEW_START + 79)
++
++#define SID_REIMPORT_AFTER_LOAD	(SC_VIEW_START + 80)
++#define SID_DRAW_NOTEEDIT		(SC_VIEW_START + 81)
++
++#define SID_CHOOSE_DESIGN		(SC_VIEW_START + 82)
++#define SID_EURO_CONVERTER		(SC_VIEW_START + 83)
++//#define SID_CHG_PROTECT         (SC_VIEW_START + 84)		-> moved to SVX
++#define SID_EXTERNAL_SOURCE     (SC_VIEW_START + 85)
++
++#define SID_SC_INPUT_TEXTWYSIWYG		(SC_VIEW_START + 86)
++
++#define SID_ENABLE_HYPHENATION          (SC_VIEW_START + 87)
++
++#define SID_RENAME_OBJECT				(SC_VIEW_START + 88)
++#define SID_FOCUS_INPUTLINE				(SC_VIEW_START + 89)
++#define SID_SELECT_TABLES               (SC_VIEW_START + 90)
++
++// #97776# new entry "Filter..." in DP popup menu
++#define SID_DP_FILTER                   (SC_VIEW_START + 91)
++
++// #101160# Replace cell contents warning
++#define SID_SC_INPUT_REPLCELLSWARN      (SC_VIEW_START + 92)
++
++// additional IDs for list/range validity
++#define FID_VALID_LISTTYPE              (SC_VIEW_START + 93)
++
++// #i68101# ID for changing Title & Descriptopn of an Object
++#define SID_TITLE_DESCRIPTION_OBJECT	(SC_VIEW_START + 94)
++
++// #i59082# assign macro to shape
++#define SID_ASSIGNMACRO                 (SC_VIEW_START + 95)
++
++// #i66550# hyperlinks in shapes
++#define SID_DRAW_HLINK_EDIT             (SC_VIEW_START + 96)
++#define SID_DRAW_HLINK_DELETE           (SC_VIEW_START + 97)
++
++// "Zoom / Synchronize sheets" in options dialog
++#define SID_SC_OPT_SYNCZOOM             (SC_VIEW_START + 98)
++
++// NOTE: last valid ID is (SC_VIEW_START + 99)
++
++// Nachrichten -------------------------------------------------------------
++
++#define FID_INPUTLINE_STATUS	(SC_MESSAGE_START)
++#define FID_INPUTLINE_ENTER		(SC_MESSAGE_START + 1)
++#define FID_REPAINT				(SC_MESSAGE_START + 2)
++#define FID_DATACHANGED			(SC_MESSAGE_START + 3)
++#define FID_REFMODECHANGED		(SC_MESSAGE_START + 4)
++#define FID_KILLEDITVIEW		(SC_MESSAGE_START + 5)
++#define SID_SOLVE               (SC_MESSAGE_START + 6)
++#define FID_FONT_SELECTED       (SC_MESSAGE_START + 7)
++#define FID_FILTER_OK           (SC_MESSAGE_START + 8)
++#define SC_HINT_DRWLAYER_NEW	(SC_MESSAGE_START + 9)
++#define SID_TABDELETED			(SC_MESSAGE_START + 10)
++#define FID_INPUTLINE_MATRIX	(SC_MESSAGE_START + 11)
++#define SID_DLG_RETOK           (SC_MESSAGE_START + 12)
++#define FID_ANYDATACHANGED		(SC_MESSAGE_START + 13)
++#define SID_STATUS_DOCPOS       (SC_MESSAGE_START + 14)
++#define SID_STATUS_PAGESTYLE    (SC_MESSAGE_START + 15)
++#define SID_STATUS_SELMODE	    (SC_MESSAGE_START + 16)
++#define FID_KILLEDITVIEW_NOPAINT (SC_MESSAGE_START + 17)
++#define SID_DLG_MATRIX          (SC_MESSAGE_START + 18)
++#define SC_HINT_DBAREAS_CHANGED (SC_MESSAGE_START + 19)
++#define SC_HINT_AREAS_CHANGED   (SC_MESSAGE_START + 20)
++#define SC_HINT_TABLES_CHANGED  (SC_MESSAGE_START + 21)
++
++#define SID_STATUS_SELMODE_ERG  (SC_MESSAGE_START + 22)
++#define SID_STATUS_SELMODE_ERW  (SC_MESSAGE_START + 23)
++#define SID_STATUS_SELMODE_NORM (SC_MESSAGE_START + 24)
++
++#define SID_CHART_SOURCE		(SC_MESSAGE_START + 25)
++#define SID_CHART_NAME			(SC_MESSAGE_START + 26)
++#define SID_CHART_ADDSOURCE		(SC_MESSAGE_START + 27)
++
++#define SID_AUTO_STYLE			(SC_MESSAGE_START + 28)
++
++#define FID_INPUTLINE_BLOCK		(SC_MESSAGE_START + 29)
++
++#define SID_STATUS_SUM			(SC_MESSAGE_START + 30)
++
++#define SC_HINT_DRAW_CHANGED	(SC_MESSAGE_START + 31)
++#define SC_HINT_DOCNAME_CHANGED	(SC_MESSAGE_START + 32)
++#define SC_HINT_AREALINKS_CHANGED (SC_MESSAGE_START + 33)
++#define SC_HINT_SHOWRANGEFINDER	(SC_MESSAGE_START + 34)
++#define SC_HINT_DOC_SAVED		(SC_MESSAGE_START + 35)
++#define SC_HINT_FORCESETTAB		(SC_MESSAGE_START + 36)
++
++// Nachricht zum Oeffnen von Dialogen:
++#define SID_OPENDLG_CONSOLIDATE		(SC_MESSAGE_START + 50)
++#define SID_OPENDLG_PIVOTTABLE 		(SC_MESSAGE_START + 51)
++#define SID_OPENDLG_FUNCTION		(SC_MESSAGE_START + 52)
++#define SID_OPENDLG_SOLVE      		(SC_MESSAGE_START + 53)
++#define SID_OPENDLG_TABOP			(SC_MESSAGE_START + 54)
++//#define SID_OPENDLG_CHART			(SC_MESSAGE_START + 55)
++#define SID_OPENDLG_EDITFUNCTION	(SC_MESSAGE_START + 56)
++#define SID_OPENDLG_ARGUMENT		(SC_MESSAGE_START + 57)
++//#define SID_OPENDLG_MODCHART		(SC_MESSAGE_START + 58)
++#define SID_OPENDLG_CONDFRMT		(SC_MESSAGE_START + 59)
++#define SID_OPENDLG_OPTSOLVER       (SC_MESSAGE_START + 60)
++
++#define SC_HINT_NAVIGATOR_UPDATEALL  (SC_MESSAGE_START + 65)
++
++// Funktionen ------------------------------------------------------------
++
++
++//#define FID_PRINT_PREVIEW		(SC_FUNCTION_START)
++#define FID_DOC_MANAGER 		(SC_FUNCTION_START + 1)
++#define FID_CURSOR_ENTER		(SC_FUNCTION_START + 2)
++#define SID_MAIL                (SC_FUNCTION_START + 3)
++#define FILE_MENU_END			(SC_FUNCTION_START + 20)
++
++#define EDIT_MENU_START 		(FILE_MENU_END)
++#define FID_PASTE_CONTENTS		(EDIT_MENU_START)
++#define FID_DELETE_CELLCONTENTS	(EDIT_MENU_START + 1)
++#define FID_DELETE_CELL			(EDIT_MENU_START + 2)
++#define FID_DELETE_TABLE		(EDIT_MENU_START + 3)
++#define FID_FILL_TO_BOTTOM		(EDIT_MENU_START + 4)
++#define FID_FILL_TO_RIGHT		(EDIT_MENU_START + 5)
++#define FID_FILL_TO_TOP			(EDIT_MENU_START + 6)
++#define FID_FILL_TO_LEFT		(EDIT_MENU_START + 7)
++#define FID_FILL_TAB			(EDIT_MENU_START + 8)
++#define FID_FILL_SERIES			(EDIT_MENU_START + 9)
++#define FID_SEARCH_REPLACE_DLG	(EDIT_MENU_START + 10)
++#define FID_EDIT_OBJECT			(EDIT_MENU_START + 11)
++#define SID_SC_NAVIGATOR		(EDIT_MENU_START + 12)
++#define SID_SC_WIZARD		    (EDIT_MENU_START + 13)
++#define SID_SC_EDIT_OBJECT	    (EDIT_MENU_START + 14)
++#define SID_HFEDIT              (EDIT_MENU_START + 15)
++
++#define SID_DEL_ROWS            (EDIT_MENU_START + 16)//JN
++#define SID_DEL_COLS            (EDIT_MENU_START + 17)//JN
++
++//#define	FID_CHG_RECORD			(EDIT_MENU_START + 18)	-> moved to SVX
++#define	FID_CHG_SHOW			(EDIT_MENU_START + 19)
++
++#define EDIT_MENU_END			(EDIT_MENU_START + 20)
++#define VIEW_MENU_START 		(EDIT_MENU_END)
++
++#define FID_TOGGLEOBJECT		(VIEW_MENU_START)
++#define FID_TOGGLEINPUTLINE 	(VIEW_MENU_START + 1)
++#define FID_TOGGLEHEADERS		(VIEW_MENU_START + 2)
++#define FID_SCALE				(VIEW_MENU_START + 4)
++#define FID_TOGGLESYNTAX		(VIEW_MENU_START + 5)
++#define FID_SCREEN_OPTIONS		(VIEW_MENU_START + 6)
++#define FID_PAGEBREAKMODE		(VIEW_MENU_START + 7)
++#define FID_FUNCTION_BOX		(VIEW_MENU_START + 8)
++#define FID_NORMALVIEWMODE      (VIEW_MENU_START + 9)
++#define FID_TOGGLEFORMULA		(VIEW_MENU_START + 10)
++// Compare/Merge jetzt aus Sfx
++//#define FID_CHG_COMPARE		(VIEW_MENU_START + 16)// DANGER DIRTY ID
++//#define FID_CHG_MERGE			(VIEW_MENU_START + 17)// DANGER DIRTY ID
++#define	FID_CHG_ACCEPT			(VIEW_MENU_START + 18)// DANGER DIRTY ID
++#define	FID_CHG_COMMENT			(VIEW_MENU_START + 19)// DANGER DIRTY ID
++#define VIEW_MENU_END			(VIEW_MENU_START + 20)
++
++#define INSERT_MENU_START		(VIEW_MENU_END)
++#define FID_PAGEBREAK			(INSERT_MENU_START)
++#define FID_INS_ROWBRK			(INSERT_MENU_START + 1)
++#define FID_INS_COLBRK			(INSERT_MENU_START + 2)
++#define FID_DEL_ROWBRK			(INSERT_MENU_START + 3)
++#define FID_DEL_COLBRK			(INSERT_MENU_START + 4)
++#define FID_INS_CELL_CONTENTS	(INSERT_MENU_START + 5)
++#define FID_INS_CELL			(INSERT_MENU_START + 6)
++#define FID_INS_ROW 			(INSERT_MENU_START + 7)
++#define FID_INS_COLUMN			(INSERT_MENU_START + 8)
++#define FID_INS_TABLE			(INSERT_MENU_START + 9)
++#define SID_INS_FUNCTION		(INSERT_MENU_START + 10)
++#define FID_DEFINE_NAME 		(INSERT_MENU_START + 11)
++#define FID_INSERT_NAME 		(INSERT_MENU_START + 12)
++#define FID_USE_NAME			(INSERT_MENU_START + 13)
++#define FID_APPLY_NAME			(INSERT_MENU_START + 14)
++#define FID_INS_TABLE_EXT       (INSERT_MENU_START + 15)
++//#define SID_CHARMAP				(INSERT_MENU_START + 15)//!!! kommt von sfx
++//aus sfx: #define SID_INSERT_POSTIT       (INSERT_MENU_START + 16)
++#define SID_INSERT_CLIPART      (INSERT_MENU_START + 17) //!!! sollte vom Svx kommen
++#define FID_INS_CELLSDOWN		(INSERT_MENU_START + 18)
++#define FID_INS_CELLSRIGHT		(INSERT_MENU_START + 19)
++#define INSERT_MENU_END 		(INSERT_MENU_START + 20)
++
++#define FORMAT_MENU_START		(INSERT_MENU_END)
++#define FID_CELL_FORMAT 		(FORMAT_MENU_START)
++#define FID_ROW_HEIGHT			(FORMAT_MENU_START + 1)
++#define FID_ROW_OPT_HEIGHT		(FORMAT_MENU_START + 2)
++#define FID_ROW_HIDE			(FORMAT_MENU_START + 3)
++#define FID_ROW_SHOW			(FORMAT_MENU_START + 4)
++#define FID_COL_WIDTH			(FORMAT_MENU_START + 5)
++#define FID_COL_OPT_WIDTH		(FORMAT_MENU_START + 6)
++#define FID_COL_HIDE			(FORMAT_MENU_START + 7)
++#define FID_COL_SHOW			(FORMAT_MENU_START + 8)
++#define FID_TABLE_HIDE			(FORMAT_MENU_START + 9)
++#define FID_TABLE_SHOW			(FORMAT_MENU_START + 10)
++#define FID_CONDITIONAL_FORMAT	(FORMAT_MENU_START + 11)
++#define SID_SCSTYLES	 		(FORMAT_MENU_START + 12)
++#define FID_MERGE_ON			(FORMAT_MENU_START + 13)
++#define FID_MERGE_OFF			(FORMAT_MENU_START + 14)
++#define SID_FORMATPAGE          (FORMAT_MENU_START + 15)
++#define SID_TEXT_STANDARD       (FORMAT_MENU_START + 16)
++#define SID_DRAWTEXT_ATTR_DLG	(FORMAT_MENU_START + 17)
++#define FID_TABLE_VISIBLE		(FORMAT_MENU_START + 18)
++#define FID_COL_OPT_DIRECT		(FORMAT_MENU_START + 19)
++#define FORMAT_MENU_END 		(FORMAT_MENU_START + 20)
++
++#define EXTRA_MENU_START		(FORMAT_MENU_END)
++#define FID_VOICE_CONTROL 		(EXTRA_MENU_START + 1)
++#define SID_RECALC_TITLE        (EXTRA_MENU_START + 2)
++#define FID_AUTO_CALC	 		(EXTRA_MENU_START + 3)
++#define FID_RECALC		 		(EXTRA_MENU_START + 4)
++#define FID_UPDATE_DIAGRAMS	 	(EXTRA_MENU_START + 5)
++#define FID_PROTECT_TABLE		(EXTRA_MENU_START + 6)
++#define FID_PROTECT_DOC			(EXTRA_MENU_START + 7)
++#define SID_EDIT_MACRO			(EXTRA_MENU_START + 8)
++#define SID_SCOPTIONS			(EXTRA_MENU_START + 9)
++#define SID_MACRO_CHOOSER		(EXTRA_MENU_START + 10)
++#define SID_SHARE_DOC           (EXTRA_MENU_START + 11)
++#define SID_SCENARIOS			(EXTRA_MENU_START + 12)
++#define SID_ADD_IN_MANAGER		(EXTRA_MENU_START + 13)
++#define SID_PIVOT_RECALC        (EXTRA_MENU_START + 14)
++#define SID_PIVOT_KILL          (EXTRA_MENU_START + 15)
++
++// hier falsch, aber erstmal
++#define SID_SC_HELP_PI			(EXTRA_MENU_START + 16)
++#define SID_SC_SHOW_KEYBOARD_HELP (EXTRA_MENU_START + 17)
++
++#define FID_HARD_RECALC		 	(EXTRA_MENU_START + 18)
++#define FID_AUTOCOMPLETE		(EXTRA_MENU_START + 19)
++
++#define EXTRA_MENU_END	 		(EXTRA_MENU_START + 20)
++
++#define DATA_MENU_START			(EXTRA_MENU_END)
++#define SID_DEFINE_DBNAME		(DATA_MENU_START)
++#define SID_SELECT_DB			(DATA_MENU_START + 1)
++#define SID_SORT                (DATA_MENU_START + 2)
++#define SID_FILTER              (DATA_MENU_START + 3)
++#define SID_SPECIAL_FILTER      (DATA_MENU_START + 4)
++#define SID_AUTO_FILTER         (DATA_MENU_START + 5)
++#define SID_UNFILTER	        (DATA_MENU_START + 6)
++#define SID_QUERY               (DATA_MENU_START + 7)
++#define SID_SUBTOTALS           (DATA_MENU_START + 8)
++//aus sfx: #define SID_OUTLINE_HIDE        (DATA_MENU_START + 9)
++//aus sfx: #define SID_OUTLINE_SHOW        (DATA_MENU_START + 10)
++//aus sfx: #define SID_OUTLINE_MAKE        (DATA_MENU_START + 11)
++//aus sfx: #define SID_OUTLINE_REMOVE      (DATA_MENU_START + 12)
++#define SID_AUTO_OUTLINE		(DATA_MENU_START + 13)
++//aus sfx: #define SID_OUTLINE_DELETEALL   (DATA_MENU_START + 14)
++#define SID_IMPORT_DATA         (DATA_MENU_START + 15)
++#define SID_REIMPORT_DATA       (DATA_MENU_START + 16)
++#define SID_PIVOT_TABLE			(DATA_MENU_START + 17)
++#define SID_TABOP				(DATA_MENU_START + 18)
++#define SID_TEXT_TO_COLUMNS		(DATA_MENU_START + 19)
++#define SID_CONSOLIDATE			(DATA_MENU_START + 20)
++#define SID_AUTOFILTER_HIDE		(DATA_MENU_START + 21)
++
++#define SID_SBA_IMPORT			(DATA_MENU_START + 22)
++
++#define SID_SORT_DESCENDING		(DATA_MENU_START + 23)
++#define SID_SORT_ASCENDING		(DATA_MENU_START + 24)
++//
++//
++#define DATA_MENU_END           (DATA_MENU_START + 25)
++
++#define TAB_POPUP_START			(DATA_MENU_END)
++#define RID_POPUP_TAB			(TAB_POPUP_START)
++#define FID_TAB_MENU_RENAME		(TAB_POPUP_START+1)
++#define FID_TAB_RENAME			(TAB_POPUP_START+2)
++#define FID_TAB_MOVE			(TAB_POPUP_START+3)
++#define FID_TAB_SELECTALL		(TAB_POPUP_START+4)
++#define FID_TAB_APPEND			(TAB_POPUP_START+5)
++#define FID_TAB_INDEX			(TAB_POPUP_START+6)
++#define FID_TAB_RTL				(TAB_POPUP_START+7)
++#define FID_TAB_DESELECTALL     (TAB_POPUP_START+8)
++
++#define TAB_POPUP_END			(DATA_MENU_END + 20)
++
++#define OBJBAR_FORMAT_START		(TAB_POPUP_END)
++#define SID_ALIGNLEFT			(OBJBAR_FORMAT_START+6)
++#define SID_ALIGNRIGHT			(OBJBAR_FORMAT_START+7)
++#define SID_ALIGNCENTERHOR 		(OBJBAR_FORMAT_START+8)
++#define SID_ALIGNBLOCK			(OBJBAR_FORMAT_START+9)
++#define SID_ALIGNTOP			(OBJBAR_FORMAT_START+10)
++#define SID_ALIGNBOTTOM			(OBJBAR_FORMAT_START+11)
++#define SID_ALIGNCENTERVER 		(OBJBAR_FORMAT_START+12)
++#define SID_SELECT_SCENARIO		(OBJBAR_FORMAT_START+13)
++
++#define SID_V_ALIGNCELL			(OBJBAR_FORMAT_START+14)
++#define SID_H_ALIGNCELL			(OBJBAR_FORMAT_START+15)
++
++#define OBJBAR_FORMAT_END		(OBJBAR_FORMAT_START+20)
++
++#define RID_INPUTBAR_START		(OBJBAR_FORMAT_END)
++#define SID_INPUT_WINDOW		(RID_INPUTBAR_START)
++#define RID_INPUTBAR_END		(RID_INPUTBAR_START+1)
++
++#define DRAW_BAR_START			(RID_INPUTBAR_END)
++//! SID_OBJECT_MIRROR wird sicher mal allgemein
++#define SID_OBJECT_MIRROR		(DRAW_BAR_START)
++#define SID_DRAWTOABOVE			(DRAW_BAR_START+15)
++#define SID_DRAWTOBELOW			(DRAW_BAR_START+16)
++//#define SID_GROUP				(DRAW_BAR_START+17)
++//#define SID_UNGROUP				(DRAW_BAR_START+18)
++#define SID_FRAMETOTOP			(DRAW_BAR_START+19)
++#define SID_FRAMETOBOTTOM		(DRAW_BAR_START+20)
++//aus sfx: #define SID_FRAME_UP			(DRAW_BAR_START+21)
++//aus sfx: #define SID_FRAME_DOWN			(DRAW_BAR_START+22)
++#define SID_TOOL_TEXT           (DRAW_BAR_START+23)
++#define SID_ANCHOR_PAGE         (DRAW_BAR_START+24)
++#define SID_ANCHOR_CELL         (DRAW_BAR_START+25)
++#define SID_ANCHOR_TOGGLE       (DRAW_BAR_START+26)
++#define SID_ORIGINALSIZE		(DRAW_BAR_START+27)
++
++#define DRAW_BAR_END			(DRAW_BAR_START+50)
++
++#define DRAWTEXTBAR_START		(DRAW_BAR_END)
++#define SID_TEXT_LINESPACING_1	(DRAWTEXTBAR_START)
++#define SID_TEXT_LINESPACING_2	(DRAWTEXTBAR_START+1)
++#define SID_TEXT_LINESPACING_3	(DRAWTEXTBAR_START+2)
++#define DRAWTEXTBAR_END			(DRAWTEXTBAR_START+20)
++
++#define DETECTIVE_START			(DRAWTEXTBAR_END)
++#define SID_DETECTIVE_ADD_PRED  (DETECTIVE_START)
++#define SID_DETECTIVE_DEL_PRED  (DETECTIVE_START+1)
++#define SID_DETECTIVE_ADD_SUCC  (DETECTIVE_START+2)
++#define SID_DETECTIVE_DEL_SUCC  (DETECTIVE_START+3)
++#define SID_DETECTIVE_ADD_ERR   (DETECTIVE_START+4)
++#define SID_DETECTIVE_DEL_ALL   (DETECTIVE_START+5)
++
++#define SID_DETECTIVE_FILLMODE	(DETECTIVE_START+6)
++#define SID_FILL_ADD_PRED		(DETECTIVE_START+7)
++#define SID_FILL_DEL_PRED		(DETECTIVE_START+8)
++#define SID_FILL_ADD_SUCC		(DETECTIVE_START+9)
++#define SID_FILL_DEL_SUCC		(DETECTIVE_START+10)
++#define SID_FILL_NONE			(DETECTIVE_START+11)
++#define SID_FILL_SELECT			(DETECTIVE_START+12)
++
++#define SID_DETECTIVE_INVALID   (DETECTIVE_START+13)
++
++#define SID_DETECTIVE_REFRESH   (DETECTIVE_START+14)
++#define SID_DETECTIVE_AUTO      (DETECTIVE_START+15)
++
++#define DETECTIVE_END			(DETECTIVE_START+20)
++
++#define SID_API_SLOTS			(DETECTIVE_END)
++//aus sfx: #define SID_ENTER_STRING		(SID_API_SLOTS)
++#define SID_INSERT_MATRIX		(SID_API_SLOTS+1)
++
++#define SID_DELETE_NOTE         (SID_API_SLOTS+2)
++
++
++#define SID_PREVIEW_START		(SID_API_SLOTS+20)
++#define SID_PREVIEW_NEXT		(SID_PREVIEW_START)
++#define SID_PREVIEW_PREVIOUS	(SID_PREVIEW_START+1)
++#define SID_PREVIEW_FIRST		(SID_PREVIEW_START+2)
++#define SID_PREVIEW_LAST		(SID_PREVIEW_START+3)
++#define SID_PREVIEW_GOTO		(SID_PREVIEW_START+4)
++#define SID_PREVIEW_ZOOMIN		(SID_PREVIEW_START+5)
++#define SID_PREVIEW_ZOOMOUT		(SID_PREVIEW_START+6)
++#define SID_PREVIEW_CLOSE		(SID_PREVIEW_START+7)
++#define SID_PREVIEW_MARGIN      (SID_PREVIEW_START+8)
++#define SID_PREVIEW_SCALINGFACTOR   (SID_PREVIEW_START+9)
++#define SID_PREVIEW_END			(SID_PREVIEW_START+20)
++
++//aus sfx: #define SID_KEYFUNC_START		(SID_PREVIEW_END+5)
++#define SID_CURSORDOWN_SEL		(SID_KEYFUNC_START + 0)
++#define SID_CURSORUP_SEL		(SID_KEYFUNC_START + 1)
++#define SID_CURSORLEFT_SEL		(SID_KEYFUNC_START + 2)
++#define SID_CURSORRIGHT_SEL		(SID_KEYFUNC_START + 3)
++#define SID_CURSORPAGEDOWN_SEL	(SID_KEYFUNC_START + 4)
++#define SID_CURSORPAGEUP_SEL	(SID_KEYFUNC_START + 5)
++
++#define SID_CURSORPAGELEFT_		(SID_KEYFUNC_START + 6)
++#define SID_CURSORPAGELEFT_SEL	(SID_KEYFUNC_START + 7)
++#define SID_CURSORPAGERIGHT_	(SID_KEYFUNC_START + 8)
++#define SID_CURSORPAGERIGHT_SEL	(SID_KEYFUNC_START + 9)
++
++#define SID_CURSORTOPOFFILE_SEL	(SID_KEYFUNC_START + 10)
++#define SID_CURSORENDOFFILE_SEL	(SID_KEYFUNC_START + 11)
++#define SID_CURSORHOME_SEL		(SID_KEYFUNC_START + 12)
++#define SID_CURSOREND_SEL		(SID_KEYFUNC_START + 13)
++#define SID_CURSORBLKUP			(SID_KEYFUNC_START + 14)
++#define SID_CURSORBLKDOWN		(SID_KEYFUNC_START + 15)
++#define SID_CURSORBLKLEFT		(SID_KEYFUNC_START + 16)
++#define SID_CURSORBLKRIGHT		(SID_KEYFUNC_START + 17)
++#define SID_CURSORBLKUP_SEL		(SID_KEYFUNC_START + 18)
++#define SID_CURSORBLKDOWN_SEL	(SID_KEYFUNC_START + 19)
++#define SID_CURSORBLKLEFT_SEL	(SID_KEYFUNC_START + 20)
++#define SID_CURSORBLKRIGHT_SEL	(SID_KEYFUNC_START + 21)
++
++#define SID_NEXT_TABLE			(SID_KEYFUNC_START + 22)
++#define SID_PREV_TABLE			(SID_KEYFUNC_START + 23)
++
++#define SID_NEXT_UNPROTECT		(SID_KEYFUNC_START + 24)
++#define SID_PREV_UNPROTECT		(SID_KEYFUNC_START + 25)
++
++#define SID_SELECT_COL			(SID_KEYFUNC_START + 26)
++#define SID_SELECT_ROW			(SID_KEYFUNC_START + 27)
++#define SID_SELECT_NONE			(SID_KEYFUNC_START + 28)
++#define SID_ALIGNCURSOR			(SID_KEYFUNC_START + 29)
++#define SID_MARKDATAAREA		(SID_KEYFUNC_START + 30)
++#define SID_SETINPUTMODE		(SID_KEYFUNC_START + 31)
++#define SID_DELETE_CONTENTS		(SID_KEYFUNC_START + 32)
++
++#define SID_MARKAREA			(SID_KEYFUNC_START + 33)
++
++#define SID_AUTOFILL			(SID_KEYFUNC_START + 34)
++#define FID_FILL_AUTO			(SID_KEYFUNC_START + 35)
++#define SID_CANCEL				(SID_KEYFUNC_START + 36)
++
++#define SID_CURSORENTERUP		(SID_KEYFUNC_START + 37)
++#define SID_CURSORENTERDOWN		(SID_KEYFUNC_START + 38)
++
++#define SID_MARKARRAYFORMULA    (SID_KEYFUNC_START + 39)
++
++#define SID_NEXT_TABLE_SEL      (SID_KEYFUNC_START + 40)
++#define SID_PREV_TABLE_SEL      (SID_KEYFUNC_START + 41)
++
++#define SID_KEYFUNC_END			(SID_KEYFUNC_START + 50)
++
++#define SID_NEW_SLOTS			(SID_KEYFUNC_END)
++#define SID_NEW_SLOTS_END		(SID_NEW_SLOTS+100)
++
++#define SID_NEW_TABLENAME		(SID_NEW_SLOTS+1)
++#define SID_COL_START			(SID_NEW_SLOTS+2)
++#define SID_ROW_START			(SID_NEW_SLOTS+3)
++#define SID_COL_END				(SID_NEW_SLOTS+4)
++#define SID_ROW_END				(SID_NEW_SLOTS+5)
++#define SID_KEEP_MARK			(SID_NEW_SLOTS+6)
++#define SID_FILL_DIR			(SID_NEW_SLOTS+7)
++#define SID_FILL_COUNT			(SID_NEW_SLOTS+8)
++#define SID_WITH_UNDO			(SID_NEW_SLOTS+9)
++#define FID_MERGE_TOGGLE        (SID_NEW_SLOTS+10)
++//aus sfx: #define SID_ATTR_SECIALCHAR		(SID_NEW_SLOTS+10)
++#define SID_ATTR_ROWHEADERS		(SID_NEW_SLOTS+11)
++#define SID_ATTR_COLHEADERS		(SID_NEW_SLOTS+12)
++
++#define SID_SC_CELLS			(SID_NEW_SLOTS+13)
++#define SID_SC_RANGE			(SID_NEW_SLOTS+14)
++#define SID_SC_SELECTION		(SID_NEW_SLOTS+15)
++#define SID_SC_CELLTEXT			(SID_NEW_SLOTS+16)
++
++#define SID_SC_NAME_TITLE		(SID_NEW_SLOTS+17)
++
++#define SID_SC_ACTIVECELL		(SID_NEW_SLOTS+18)
++#define SID_SC_ACTIVETAB		(SID_NEW_SLOTS+19)
++#define SID_RANGE_ROW			(SID_NEW_SLOTS+20)
++#define SID_RANGE_COL			(SID_NEW_SLOTS+21)
++#define SID_RANGE_TABLE			(SID_NEW_SLOTS+22)
++#define SID_RANGE_VALUE			(SID_NEW_SLOTS+23)
++#define SID_RANGE_FORMULA		(SID_NEW_SLOTS+24)
++#define SID_RANGE_TEXT			(SID_NEW_SLOTS+25)
++#define SID_RANGE_TEXTVALUE		(SID_NEW_SLOTS+26)
++#define SID_TABLE_ACTIVATE		(SID_NEW_SLOTS+27)
++#define SID_TABLES_GET			(SID_NEW_SLOTS+28)
++#define SID_PROP_INTERIOR		(SID_NEW_SLOTS+29)
++#define SID_PROP_FONT			(SID_NEW_SLOTS+30)
++
++#define SID_DEFINE_PRINTAREA		(SID_NEW_SLOTS+31)
++#define SID_DELETE_PRINTAREA		(SID_NEW_SLOTS+32)
++#define SID_CHANGE_PRINTAREA        (SID_NEW_SLOTS+33)
++#define SID_OPENDLG_EDIT_PRINTAREA	(SID_NEW_SLOTS+34)
++
++#define SID_OLE_OBJECT			(SID_NEW_SLOTS+35)
++#define SID_OLE_ACTIVATE		(SID_NEW_SLOTS+36)
++#define SID_OLE_DEACTIVATE		(SID_NEW_SLOTS+37)
++
++#define SID_TOGGLE_REL			(SID_NEW_SLOTS+38)
++#define SID_DATA_SELECT			(SID_NEW_SLOTS+39)
++
++//	Suchen & Ersetzen
++#define FID_SEARCH				(SID_NEW_SLOTS+40)
++#define FID_REPEAT_SEARCH		(SID_NEW_SLOTS+41)
++#define FID_REPLACE				(SID_NEW_SLOTS+42)
++#define FID_SEARCH_ALL			(SID_NEW_SLOTS+43)
++#define FID_REPLACE_ALL			(SID_NEW_SLOTS+44)
++#define FID_SEARCH_COUNT		(SID_NEW_SLOTS+45)
++
++#define SID_SC_SETTEXT			(SID_NEW_SLOTS+46)
++#define SID_RANGE_ADDRESS		(SID_NEW_SLOTS+47)
++#define SID_RANGE_OFFSET		(SID_NEW_SLOTS+48)
++#define SID_NUMBER_FORMAT		(SID_NEW_SLOTS+49)
++
++#define SID_OLE_SELECT			(SID_NEW_SLOTS+50)
++#define SID_SC_ACTIVEOBJECT		(SID_NEW_SLOTS+51)
++
++#define SID_RANGE_NOTETEXT		(SID_NEW_SLOTS+52)
++#define FID_INSERT_FILE			(SID_NEW_SLOTS+53)
++
++#define FID_VALIDATION			(SID_NEW_SLOTS+54)
++
++//	Slots fuer Toolbox Controller in der Werkzeugleiste
++#define SID_TBXCTL_INSERT		(SID_NEW_SLOTS+55)
++#define SID_TBXCTL_INSCELLS		(SID_NEW_SLOTS+56)
++#define SID_TBXCTL_INSOBJ		(SID_NEW_SLOTS+57)
++
++#define SID_DEFINE_COLROWNAMERANGES (SID_NEW_SLOTS+58)
++
++#define FID_NOTE_VISIBLE		(SID_NEW_SLOTS+59)
++
++//	Items fuer Gueltigkeit
++#define FID_VALID_MODE			(SID_NEW_SLOTS+60)
++#define FID_VALID_CONDMODE		(SID_NEW_SLOTS+61)
++#define FID_VALID_VALUE1		(SID_NEW_SLOTS+62)
++#define FID_VALID_VALUE2		(SID_NEW_SLOTS+63)
++#define FID_VALID_BLANK			(SID_NEW_SLOTS+64)
++#define FID_VALID_SHOWHELP		(SID_NEW_SLOTS+65)
++#define FID_VALID_HELPTITLE		(SID_NEW_SLOTS+66)
++#define FID_VALID_HELPTEXT		(SID_NEW_SLOTS+67)
++#define FID_VALID_SHOWERR		(SID_NEW_SLOTS+68)
++#define FID_VALID_ERRSTYLE		(SID_NEW_SLOTS+69)
++#define FID_VALID_ERRTITLE		(SID_NEW_SLOTS+70)
++#define FID_VALID_ERRTEXT		(SID_NEW_SLOTS+71)
++
++#define SID_REFRESH_DBAREA		(SID_NEW_SLOTS+72)
++#define SID_RANGE_REGION		(SID_NEW_SLOTS+73)
++
++#define FID_FOCUS_POSWND		(SID_NEW_SLOTS+74)
++
++//	einzelne Slots fuer verschiedene Unterstreich-Arten (Popup-Menu)
++#define SID_ULINE_VAL_NONE		(SID_NEW_SLOTS+75)
++#define SID_ULINE_VAL_SINGLE	(SID_NEW_SLOTS+76)
++#define SID_ULINE_VAL_DOUBLE	(SID_NEW_SLOTS+77)
++#define SID_ULINE_VAL_DOTTED	(SID_NEW_SLOTS+78)
++
++#define FID_DEL_MANUALBREAKS	(SID_NEW_SLOTS+79)
++#define SID_ADD_PRINTAREA		(SID_NEW_SLOTS+80)
++#define FID_ADJUST_PRINTZOOM	(SID_NEW_SLOTS+81)
++#define FID_RESET_PRINTZOOM		(SID_NEW_SLOTS+82)
++
++#define SID_TABLES_COUNT		(SID_NEW_SLOTS+83)
++#define SID_ACTIVE_OBJ_NAME		(SID_NEW_SLOTS+84)
++#define SID_OBJECT_LEFT			(SID_NEW_SLOTS+85)
++#define SID_OBJECT_TOP			(SID_NEW_SLOTS+86)
++#define SID_OBJECT_WIDTH		(SID_NEW_SLOTS+87)
++#define SID_OBJECT_HEIGHT		(SID_NEW_SLOTS+88)
++
++#define SID_PIVOT_CREATE		(SID_NEW_SLOTS+89)
++#define SID_PIVOT_FIELDS		(SID_NEW_SLOTS+90)
++#define SID_PFIELD_NAME			(SID_NEW_SLOTS+91)
++#define SID_PFIELD_ORIENTATION	(SID_NEW_SLOTS+92)
++#define SID_PFIELD_FUNCTION		(SID_NEW_SLOTS+93)
++#define SID_PIVOT_GET			(SID_NEW_SLOTS+94)
++
++#define SID_DELETE_SCENARIO		(SID_NEW_SLOTS+95)
++#define SID_EDIT_SCENARIO		(SID_NEW_SLOTS+96)
++
++#define SID_GET_CLPBRD_FORMAT_COUNT		(SID_NEW_SLOTS+97)
++#define SID_GET_CLPBRD_FORMAT_BY_IDX	(SID_NEW_SLOTS+98)
++#define SID_GET_CLPBRD_FORMAT_NAME		(SID_NEW_SLOTS+99)
++
++// idl Parameter ---------------------------------------------------------
++
++//aus sfx: #define FN_PARAM_1				(SC_PARAM_START)
++//aus sfx: #define FN_PARAM_2				(SC_PARAM_START+1)
++//aus sfx: #define FN_PARAM_3				(SC_PARAM_START+2)
++//aus sfx: #define FN_PARAM_4				(SC_PARAM_START+3)
++//aus sfx: #define FN_PARAM_5				(SC_PARAM_START+4)
++//aus sfx: #define FN_PARAM_6				(SC_PARAM_START+5)
++//aus sfx: #define FN_PARAM_7				(SC_PARAM_START+6)
++//aus sfx: #define FN_PARAM_8				(SC_PARAM_START+7)
++#define FN_PARAM_9				(FN_PARAM_8+1)
++
++#define SID_SORT_BYROW			(SC_PARAM_START)
++#define SID_SORT_HASHEADER		(SC_PARAM_START+1)
++#define SID_SORT_CASESENS		(SC_PARAM_START+2)
++#define SID_SORT_ATTRIBS		(SC_PARAM_START+3)
++#define SID_SORT_USERDEF		(SC_PARAM_START+4)
++
++// Resourcen -------------------------------------------------------------
++
++#define RID_OBJECTBAR_APP		(SC_RESOURCE_START)
++#define RID_OBJECTBAR_FORMAT	(SC_RESOURCE_START+1)
++#define RID_OBJECTBAR_INPUT		(SC_RESOURCE_START+2)
++#define RID_POPUP_CELLS			(SC_RESOURCE_START+3)
++#define RID_POPUP_DRAW			(SC_RESOURCE_START+4)
++#define RID_TEXT_TOOLBOX		(SC_RESOURCE_START+5)
++#define RID_OBJECTBAR_PREVIEW	(SC_RESOURCE_START+6)
++#define RID_POPUP_PREVIEW		(SC_RESOURCE_START+7)
++#define RID_POPUP_OLE			(SC_RESOURCE_START+8)
++#define RID_POPUP_CHART			(SC_RESOURCE_START+9)
++//#define RID_ANCHORBITMAP		(SC_RESOURCE_START+10)
++//#define RID_GRAYANCHORBITMAP	(SC_RESOURCE_START+11)
++#define RID_OUTLINEBITMAPS		(SC_RESOURCE_START+12)
++#define RID_DRAW_WIN			(SC_RESOURCE_START+13)
++#define RID_CNTRLR_WIN			(SC_RESOURCE_START+14)
++#define RID_GLOBSTR             (SC_RESOURCE_START+15)
++#define RID_ALIGNMENT_WIN		(SC_RESOURCE_START+19)
++#define RID_SCFUNCTIONS			(SC_RESOURCE_START+20)
++#define RID_POPUP_PIVOT			(SC_RESOURCE_START+21)
++#define RID_IMGLIST_INPUTWIN    (SC_RESOURCE_START+22)
++#define RID_ERRHDLSC			(SC_RESOURCE_START+23)
++#define RID_POPUP_GRAPHIC		(SC_RESOURCE_START+24)
++#define RID_SCTEAMDLGBMP1		(SC_RESOURCE_START+25)
++#define RID_SCTEAMDLGBMP2		(SC_RESOURCE_START+26)
++#define RID_SCTEAMDLGBMP3		(SC_RESOURCE_START+27)
++#define RID_POPUP_DRAWTEXT		(SC_RESOURCE_START+29)
++#define RID_MN_FORMAT_ALGN	 	(SC_RESOURCE_START+30)
++#define RID_MN_FORMAT_STYLE		(SC_RESOURCE_START+31)
++#define RID_MN_FORMAT_LINESPACE	(SC_RESOURCE_START+32)
++#define RID_POPUP_EDIT			(SC_RESOURCE_START+33)
++#define RID_POPUP_AUDIT			(SC_RESOURCE_START+34)
++#define RID_OBJECTBAR_TOOLS		(SC_RESOURCE_START+35)
++// free
++// free
++#define RID_TBXCTL_INSERT		(SC_RESOURCE_START+38)
++#define RID_TBXCTL_INSCELLS		(SC_RESOURCE_START+39)
++#define RID_TBXCTL_INSOBJ		(SC_RESOURCE_START+40)
++// free
++// free
++#define RID_SC_FUNCTION_DESCRIPTIONS1	(SC_RESOURCE_START+43)
++#define RID_SC_FUNCTION_DESCRIPTIONS2	(SC_RESOURCE_START+44)
++#define RID_POPUP_CONTROL		(SC_RESOURCE_START+45)
++#define RID_POPUP_PAGEBREAK		(SC_RESOURCE_START+46)
++// free
++#define RID_POPUP_DRAWFORM		(SC_RESOURCE_START+48)
++#define RID_SC_ADDIN_ROT13		(SC_RESOURCE_START+50)
++#define RID_SC_ADDIN_DFA		(SC_RESOURCE_START+51)
++#define RID_IMAGELIST_NAVCONT	(SC_RESOURCE_START+52)
++#define RID_DRAW_OBJECTBAR		(SC_RESOURCE_START+53)
++#define RID_GRAPHIC_OBJECTBAR	(SC_RESOURCE_START+54)
++// free
++// free
++#define RID_IMAGELIST_H_NAVCONT	(SC_RESOURCE_START+57)
++#define RID_OUTLINEBITMAPS_H    (SC_RESOURCE_START+58)
++#define RID_MEDIA_OBJECTBAR		(SC_RESOURCE_START+60)
++#define RID_POPUP_MEDIA			(SC_RESOURCE_START+61)
++#define RID_FUNCTION_CATEGORIES	(SC_RESOURCE_START+62)
++
++#define STR_START               (SC_RESOURCE_START+100)
++#define STR_ROWHEIGHT			(STR_START)
++#define STR_ROWHEIGHT_TITLE		(STR_START + 1)
++#define STR_OPT_ROWHEIGHT		(STR_START + 2)
++#define STR_OPT_ROWHEIGHT_TITLE	(STR_START + 3)
++#define STR_COLWIDTH			(STR_START + 4)
++#define STR_COLWIDTH_TITLE		(STR_START + 5)
++#define STR_OPT_COLWIDTH		(STR_START + 6)
++#define STR_OPT_COLWIDTH_TITLE	(STR_START + 7)
++#define	SCSTR_UNDEFINED			(STR_START + 8)
++#define	SCSTR_NONAME			(STR_START + 9)
++#define	SCSTR_NONE				(STR_START + 10)
++#define	SCSTR_EMPTY				(STR_START + 11)
++#define	SCSTR_NOTEMPTY			(STR_START + 12)
++#define SCSTR_COLUMN            (STR_START + 13)
++#define SCSTR_ROW               (STR_START + 14)
++#define SCSTR_NEW               (STR_START + 15)
++#define SCSTR_ADD               (STR_START + 16)
++#define SCSTR_REMOVE            (STR_START + 17)
++#define SCSTR_CANCEL            (STR_START + 18)
++#define SCSTR_MODIFY            (STR_START + 19)
++#define SCSTR_SHOWTABLE			(STR_START + 20)
++#define SCSTR_HIDDENTABLES		(STR_START + 21)
++#define SCSTR_SELECTDB			(STR_START + 22)
++#define SCSTR_AREAS				(STR_START + 23)
++#define SCSTR_TABLE				(STR_START + 24)
++#define SCSTR_NAME				(STR_START + 25)
++#define SCSTR_INSTABLE			(STR_START + 26)
++#define SCSTR_APDTABLE			(STR_START + 27)
++#define SCSTR_RENAMETAB			(STR_START + 28)
++#define STR_INSERTGRAPHIC		(STR_START + 29)
++//#define STR_BASIC_IDE           (STR_START + 30)
++#define SCSTR_APPLICATION		(STR_START + 31)
++#define SCSTR_DOCSHELL			(STR_START + 32)
++#define SCSTR_TABVIEWSHELL		(STR_START + 33)
++#define SCSTR_EDITSHELL			(STR_START + 34)
++#define SCSTR_DRAWSHELL			(STR_START + 35)
++#define SCSTR_DRAWTEXTSHELL		(STR_START + 36)
++#define SCSTR_NEWTABLE          (STR_START + 37)
++#define SCSTR_PREVIEWSHELL		(STR_START + 38)
++
++#define SCSTR_PROTECTDOC		(STR_START + 39)
++#define SCSTR_UNPROTECTDOC		(STR_START + 40)
++#define SCSTR_PROTECTTAB		(STR_START + 41)
++#define SCSTR_UNPROTECTTAB		(STR_START + 42)
++#define SCSTR_PASSWORD			(STR_START + 43)
++#define SCSTR_PASSWORDOPT		(STR_START + 44)
++#define SCSTR_WRONGPASSWORD		(STR_START + 45)
++
++#define SCSTR_PIVOTSHELL		(STR_START + 46)
++#define SCSTR_END				(STR_START + 47)
++#define SCSTR_STAT_PRINT		(STR_START + 48)
++
++#define SCSTR_UNKNOWN           (STR_START + 49)
++#define SCSTR_CHAR_ATTRS        (STR_START + 50)
++#define	SCSTR_ALL				(STR_START + 51)
++#define	SCSTR_STDFILTER			(STR_START + 52)
++
++// Cfg-Item-Namen
++#define SCSTR_CFG_APP           (STR_START + 53)
++#define SCSTR_CFG_DOC           (STR_START + 54)
++#define SCSTR_CFG_VIEW          (STR_START + 55)
++#define SCSTR_CFG_SPELLCHECK    (STR_START + 56)
++#define SCSTR_CFG_PRINT		    (STR_START + 57)
++
++#define SCSTR_AUDITSHELL		(STR_START + 58)
++
++#define SCSTR_CHARSET_USER		(STR_START + 59)
++#define SCSTR_COLUMN_USER		(STR_START + 60)
++#define SCSTR_FIELDSEP			(STR_START + 61)
++#define SCSTR_TEXTSEP			(STR_START + 62)
++
++#define SCSTR_30_APPLICATION	(STR_START + 63)
++#define SCSTR_30_LONG_DOCNAME	(STR_START + 64)
++
++#define SCSTR_CFG_INPUT		    (STR_START + 65)
++
++#define	SCSTR_TOP10FILTER		(STR_START + 66)
++
++#define SCSTR_CFG_NAVIPI        (STR_START + 67)
++
++#define SCSTR_40_APPLICATION	(STR_START + 68)
++#define SCSTR_40_LONG_DOCNAME	(STR_START + 69)
++
++#define SCSTR_DRAWFORMSHELL		(STR_START + 70)
++#define SCSTR_CELLSHELL			(STR_START + 71)
++#define SCSTR_FORMATSHELL		(STR_START + 72)
++#define SCSTR_OLEOBJECTSHELL	(STR_START + 73)
++#define SCSTR_CHARTSHELL		(STR_START + 74)
++#define SCSTR_GRAPHICSHELL		(STR_START + 75)
++#define SCSTR_PAGEBREAKSHELL	(STR_START + 76)
++
++#define SCSTR_GRFILTER_OPENERROR     (STR_START + 77)
++#define SCSTR_GRFILTER_IOERROR       (STR_START + 78)
++#define SCSTR_GRFILTER_FORMATERROR   (STR_START + 79)
++#define SCSTR_GRFILTER_VERSIONERROR  (STR_START + 80)
++#define SCSTR_GRFILTER_FILTERERROR   (STR_START + 81)
++#define SCSTR_GRFILTER_TOOBIG        (STR_START + 82)
++#define SCSTR_UNDO_GRAFFILTER        (STR_START + 83)
++
++#define SCSTR_50_APPLICATION	(STR_START + 84)
++#define SCSTR_50_LONG_DOCNAME	(STR_START + 85)
++#define SCSTR_CHG_PROTECT       (STR_START + 86)
++#define SCSTR_CHG_UNPROTECT     (STR_START + 87)
++
++// #98185#
++#define STR_CAPTION_DEFAULT_TEXT	(STR_START + 88)
++
++// dialog: Select Sheets
++#define STR_DLG_SELECTTABLES_TITLE  (STR_START + 89)
++#define STR_DLG_SELECTTABLES_LBNAME (STR_START + 90)
++
++// #101160# Replace cell contents warning
++#define STR_REPLCELLSWARN           (STR_START + 91)
++
++#define SCSTR_DPFUNCLISTBOX         (STR_START + 92)
++#define STR_PRINT_NOTHING           (STR_START + 93)
++#define SCSTR_ALLFILTER             (STR_START + 94)
++#define SCSTR_MOREBTN_MOREOPTIONS   (STR_START + 95)
++#define SCSTR_MOREBTN_FEWEROPTIONS   (STR_START + 96)
++
++// Items
++
++#define SCSTR_HOR_JUSTIFY_LEFT		(STR_START + 100)
++#define SCSTR_HOR_JUSTIFY_CENTER	(STR_START + 101)
++#define SCSTR_HOR_JUSTIFY_RIGHT		(STR_START + 102)
++#define SCSTR_HOR_JUSTIFY_BLOCK		(STR_START + 103)
++#define SCSTR_HOR_JUSTIFY_REPEAT	(STR_START + 104)
++#define SCSTR_HOR_JUSTIFY_STANDARD	(STR_START + 105)
++#define SCSTR_VER_JUSTIFY_TOP		(STR_START + 106)
++#define SCSTR_VER_JUSTIFY_CENTER	(STR_START + 107)
++#define SCSTR_VER_JUSTIFY_BOTTOM	(STR_START + 108)
++#define SCSTR_VER_JUSTIFY_STANDARD	(STR_START + 109)
++#define SCSTR_ORIENTATION_TOPBOTTOM	(STR_START + 110)
++#define SCSTR_ORIENTATION_BOTTOMTOP	(STR_START + 111)
++#define SCSTR_ORIENTATION_STANDARD	(STR_START + 112)
++
++// Accessibility ------------------------------------
++
++// CSV import
++#define STR_ACC_CSVRULER_NAME       (STR_START + 150)
++#define STR_ACC_CSVRULER_DESCR      (STR_START + 151)
++#define STR_ACC_CSVGRID_NAME        (STR_START + 152)
++#define STR_ACC_CSVGRID_DESCR       (STR_START + 153)
++
++// Document
++#define STR_ACC_DOC_NAME            (STR_START + 154)
++#define STR_ACC_DOC_DESCR           (STR_START + 155)
++#define STR_ACC_TABLE_NAME          (STR_START + 156)
++#define STR_ACC_TABLE_DESCR         (STR_START + 157)
++#define STR_ACC_CELL_NAME           (STR_START + 158)
++#define STR_ACC_CELL_DESCR          (STR_START + 159)
++// Preview
++#define STR_ACC_PREVIEWDOC_NAME     (STR_START + 160)
++#define STR_ACC_PREVIEWDOC_DESCR    (STR_START + 161)
++#define STR_ACC_HEADERCELL_NAME     (STR_START + 162)
++#define STR_ACC_HEADERCELL_DESCR    (STR_START + 163)
++#define STR_ACC_LEFTAREA_NAME       (STR_START + 164)
++#define STR_ACC_LEFTAREA_DESCR      (STR_START + 165)
++#define STR_ACC_CENTERAREA_NAME     (STR_START + 166)
++#define STR_ACC_CENTERAREA_DESCR    (STR_START + 167)
++#define STR_ACC_RIGHTAREA_NAME      (STR_START + 168)
++#define STR_ACC_RIGHTAREA_DESCR     (STR_START + 169)
++#define STR_ACC_HEADER_NAME         (STR_START + 170)
++#define STR_ACC_HEADER_DESCR        (STR_START + 171)
++#define STR_ACC_FOOTER_NAME         (STR_START + 172)
++#define STR_ACC_FOOTER_DESCR        (STR_START + 173)
++
++// Editline
++#define STR_ACC_EDITLINE_NAME       (STR_START + 174)
++#define STR_ACC_EDITLINE_DESCR      (STR_START + 175)
++
++// EditCell
++#define STR_ACC_EDITCELL_NAME       (STR_START + 176)
++#define STR_ACC_EDITCELL_DESCR      (STR_START + 177)
++
++// DataPilot
++#define STR_ACC_DATAPILOT_ROW_DESCR (STR_START + 178)
++#define STR_ACC_DATAPILOT_COL_DESCR (STR_START + 179)
++#define STR_ACC_DATAPILOT_DATA_DESCR (STR_START + 180)
++#define STR_ACC_DATAPILOT_SEL_DESCR (STR_START + 181)
++
++// --------------------------------------------------
++
++#define SCSTR_HUMAN_SCDOC_NAME      (STR_START + 210)
++#define SCSTR_SHORT_SCDOC_NAME      (STR_START + 211)
++#define SCSTR_LONG_SCDOC_NAME       (STR_START + 212)
++
++#define SCSTR_CLPBRD_CLEAR			(STR_START + 213)
++
++#define SCSTR_FORMULA_AUTOCORRECTION	(STR_START + 214)
++
++#define SCSTR_RENAMEOBJECT			(STR_START + 215)
++
++// Navigator - in der Reihenfolge wie SC_CONTENT_...
++#define SCSTR_CONTENT_ROOT		(STR_START + 250)
++#define SCSTR_CONTENT_TABLE		(STR_START + 251)
++#define SCSTR_CONTENT_RANGENAME	(STR_START + 252)
++#define SCSTR_CONTENT_DBAREA	(STR_START + 253)
++#define SCSTR_CONTENT_GRAPHIC	(STR_START + 254)
++#define SCSTR_CONTENT_OLEOBJECT	(STR_START + 255)
++#define SCSTR_CONTENT_NOTE		(STR_START + 256)
++#define SCSTR_CONTENT_AREALINK	(STR_START + 257)
++#define SCSTR_CONTENT_DRAWING	(STR_START + 258)
++//	hier ein wenig Platz fuer Erweiterungen
++
++// Eingabezeile, Quickhelp-Strings (HelpText jetzt per HelpId aus Hilfe)
++#define SCSTR_QHELP_INPUTWND	(STR_START + 307)
++#define SCSTR_QHELP_POSWND		(STR_START + 308)
++#define SCSTR_QHELP_BTNCALC		(STR_START + 309)
++#define SCSTR_QHELP_BTNOK		(STR_START + 310)
++#define SCSTR_QHELP_BTNCANCEL	(STR_START + 311)
++#define SCSTR_QHELP_BTNSUM		(STR_START + 312)
++#define SCSTR_QHELP_BTNEQUAL	(STR_START + 313)
++
++// Validator
++#define SCSTR_VALID_MINIMUM     (STR_START + 314)
++#define SCSTR_VALID_MAXIMUM     (STR_START + 315)
++#define SCSTR_VALID_VALUE       (STR_START + 316)
++#define SCSTR_VALID_RANGE       (STR_START + 317)
++#define SCSTR_VALID_LIST        (STR_START + 318)
++
++// Formulator
++#define SCSTR_FUDB				(STR_START + 389)
++#define SCSTR_FUDATE			(STR_START + 390)
++#define SCSTR_FUFIN				(STR_START + 391)
++#define SCSTR_FUINFO			(STR_START + 392)
++#define SCSTR_FULOG				(STR_START + 393)
++#define SCSTR_FUMATHS			(STR_START + 394)
++#define SCSTR_FUSTAT			(STR_START + 395)
++#define SCSTR_FUTAB				(STR_START + 396)
++#define SCSTR_FUTEXT			(STR_START + 397)
++//
++#define SCSTR_COMPILER_STRINGS  (STR_START + 398)
++#define SCSTR_FILTER_STRINGS    (STR_START + 399)
++#define SCSTR_COMPILER_INTL_STR (STR_START + 400)
++
++// Media shell
++#define SCSTR_MEDIASHELL		(STR_START + 401)
++
++#define RID_SCSTR_ONCLICK       (STR_START + 402)
++
++#define STR_END                 RID_SCSTR_ONCLICK
++
++#define BMP_START				(STR_END)
++
++// Navigator
++// not used anymore: RID_BMP_EXPAND, RID_BMP_COLLAPSE
++//#define    RID_BMP_EXPAND          (BMP_START)
++//#define    RID_BMP_COLLAPSE        (BMP_START + 1)
++#define RID_IMG_DROP_URL		(BMP_START + 2)
++#define RID_IMG_DROP_LINK		(BMP_START + 3)
++#define RID_IMG_DROP_COPY		(BMP_START + 4)
++#define RID_IMG_H_DROP_URL		(BMP_START + 5)
++#define RID_IMG_H_DROP_LINK		(BMP_START + 6)
++#define RID_IMG_H_DROP_COPY		(BMP_START + 7)
++
++#define RID_SCPTR_PIVOTCOL      (BMP_START + 81)
++#define RID_SCPTR_PIVOTROW      (BMP_START + 82)
++#define RID_SCPTR_DETECTIVE     (BMP_START + 83)
++#define RID_SCPTR_CHART			(BMP_START + 84)
++
++#define RID_SCICN_DOCUMENT      (BMP_START + 95)
++#define RID_SCICN_TEMPLATE      (BMP_START + 96)
++#define RID_SCICN_SC10DOC       (BMP_START + 97)
++
++#define BMP_END                 (BMP_START + 100)
++
++#define SC_DIALOGS_START		(BMP_END)
++#define RID_SCDLG_ATTR			(SC_DIALOGS_START)
++#define RID_SCPAGE_NUMBER		(SC_DIALOGS_START + 1)
++#define RID_SCPAGE_ALIGNMENT	(SC_DIALOGS_START + 2)
++#define RID_SCPAGE_PROTECTION  	(SC_DIALOGS_START + 3)
++#define RID_SCDLG_SORT			(SC_DIALOGS_START + 5)
++#define RID_SCPAGE_SORT_FIELDS	(SC_DIALOGS_START + 6)
++#define RID_SCPAGE_SORT_OPTIONS	(SC_DIALOGS_START + 7)
++#define RID_SCDLG_FILTER		(SC_DIALOGS_START + 8)
++#define RID_SCDLG_SPEC_FILTER	(SC_DIALOGS_START + 9)
++#define RID_SCMISCDLGS			(SC_DIALOGS_START + 10)
++#define RID_SCDLG_DELCELL		(SC_DIALOGS_START + 11)
++#define RID_SCDLG_INSCELL		(SC_DIALOGS_START + 12)
++#define RID_SCDLG_DELCONT		(SC_DIALOGS_START + 13)
++#define RID_SCDLG_INSCONT		(SC_DIALOGS_START + 14)
++#define RID_SCDLG_MOVETAB		(SC_DIALOGS_START + 15)
++#define RID_SCDLG_STRINPUT		(SC_DIALOGS_START + 16)
++#define RID_SCDLG_MTRINPUT		(SC_DIALOGS_START + 17)
++#define RID_SCDLG_SELENTRY		(SC_DIALOGS_START + 18)
++#define RID_SCDLG_FILLSERIES	(SC_DIALOGS_START + 19)
++#define RID_SCDLG_AUTOFORMAT    (SC_DIALOGS_START + 20)
++#define RID_SCDLG_GROUP         (SC_DIALOGS_START + 21)
++#define RID_SCDLG_NAMES         (SC_DIALOGS_START + 22)
++#define RID_SCDLG_DBNAMES       (SC_DIALOGS_START + 23)
++#define RID_SCDLG_PRINTOPTIONS  (SC_DIALOGS_START + 24)
++#define RID_SCPAGE_PRINTOPTIONS (SC_DIALOGS_START + 25)
++#define RID_SCDLG_SOLVER        (SC_DIALOGS_START + 26)
++#define RID_SCDLG_SUBTOTALS		(SC_DIALOGS_START + 27)
++#define RID_SUBTBASE			(SC_DIALOGS_START + 28)
++#define RID_SCPAGE_SUBT_OPTIONS	(SC_DIALOGS_START + 29)
++#define RID_SCDLG_OPTIONS       (SC_DIALOGS_START + 30)
++#define RID_SCPAGE_USERLISTS    (SC_DIALOGS_START + 31)
++#define RID_SCDLG_PIVOTFILTER   (SC_DIALOGS_START + 33)
++#define RID_SCDLG_PIVOT_LAYOUT  (SC_DIALOGS_START + 34)
++#define RID_SCDLG_CONSOLIDATE   (SC_DIALOGS_START + 35)
++#define RID_SCTBXWND_SCENARIO   (SC_DIALOGS_START + 36)
++#define RID_SCDLG_FORMULATOR	(SC_DIALOGS_START + 37)
++#define RID_SCDLG_PIVOTSUBT     (SC_DIALOGS_START + 38)
++#define RID_SCDLG_NEWSCENARIO   (SC_DIALOGS_START + 39)
++#define RID_SCDLG_FORMULA		(SC_DIALOGS_START + 40)
++#define RID_SCDLG_ARGUMENTS     (SC_DIALOGS_START + 41)
++#define RID_SCDLG_INSERT_TABLE  (SC_DIALOGS_START + 42)
++#define RID_SCPAGE_TABLE        (SC_DIALOGS_START + 43)
++#define RID_SCPAGE_AREAS        (SC_DIALOGS_START + 44)
++#define RID_SCDLG_STYLES_START	(SC_DIALOGS_START + 45)
++#define RID_SCDLG_STYLES_CHAR	(SC_DIALOGS_START + 45)
++#define RID_SCDLG_STYLES_PAR	(SC_DIALOGS_START + 46)
++#define RID_SCDLG_STYLES_FRAME	(SC_DIALOGS_START + 47)
++#define RID_SCDLG_STYLES_PAGE	(SC_DIALOGS_START + 48)
++#define RID_SCDLG_STYLES_END	(SC_DIALOGS_START + 48)
++#define RID_HFBASE			    (SC_DIALOGS_START + 49)
++#define RID_SCDLG_HFEDIT	    (SC_DIALOGS_START + 50)
++#define RID_SCDLG_HFEDIT_ALL    (SC_DIALOGS_START + 51)
++#define RID_SCDLG_HFED_HEADER   (SC_DIALOGS_START + 52)
++#define RID_SCDLG_HFED_FOOTER	(SC_DIALOGS_START + 53)
++#define RID_SCBTN_HFEDIT        (SC_DIALOGS_START + 54)
++#define RID_SCPAGE_VIEW		    (SC_DIALOGS_START + 55)
++#define RID_SCPAGE_CALC		    (SC_DIALOGS_START + 56)
++#define RID_SCDLG_NAVIGATOR	    (SC_DIALOGS_START + 57)
++#define RID_SCDLG_TABOP		    (SC_DIALOGS_START + 58)
++#define RID_SCDLG_IMPORTOPT		(SC_DIALOGS_START + 59)
++#define RID_POPUP_ROWHEADER     (SC_DIALOGS_START + 60)
++#define RID_POPUP_COLHEADER     (SC_DIALOGS_START + 61)
++#define RID_SCDLG_HFEDIT_SHDR   (SC_DIALOGS_START + 62)
++#define RID_SCDLG_HFEDIT_SFTR   (SC_DIALOGS_START + 63)
++#define RID_SCDLG_HFEDIT_LEFTHEADER	    (SC_DIALOGS_START + 64)
++#define RID_SCDLG_HFEDIT_RIGHTHEADER    (SC_DIALOGS_START + 65)
++#define RID_SCDLG_HFEDIT_LEFTFOOTER	    (SC_DIALOGS_START + 66)
++#define RID_SCDLG_HFEDIT_RIGHTFOOTER	(SC_DIALOGS_START + 67)
++#define RID_SCDLG_HFEDIT_HEADER		    (SC_DIALOGS_START + 68)
++#define RID_SCDLG_HFEDIT_FOOTER			(SC_DIALOGS_START + 69)
++#define RID_SCPAGE_PRINT				(SC_DIALOGS_START + 70)
++#define RID_SCDLG_COLORROW              (SC_DIALOGS_START + 71)
++#define RID_SCDLG_NAMES_PASTE           (SC_DIALOGS_START + 72)
++#define RID_SCDLG_NAMES_CREATE          (SC_DIALOGS_START + 73)
++#define RID_SCDLG_NAMES_APPLY           (SC_DIALOGS_START + 74) //NYI
++#define RID_SCDLG_TEAM		            (SC_DIALOGS_START + 75)
++
++#define RID_SCDLG_CHAR			        (SC_DIALOGS_START + 76)
++#define RID_SCDLG_PARAGRAPH		        (SC_DIALOGS_START + 77)
++//#define RID_SCDLG_CHARTRANGE	        (SC_DIALOGS_START + 78)
++
++#define RID_SCPAGE_STAT		    		(SC_DIALOGS_START + 79)
++#define RID_SCDLG_CHARTCOLROW	        (SC_DIALOGS_START + 80)
++#define RID_SCDLG_AREAS					(SC_DIALOGS_START + 81)
++
++#define RID_SCDLG_EDITCHAR		        (SC_DIALOGS_START + 82)
++
++	//	Popup fuer Statusbar-Controller
++#define RID_POPUP_SUMCTL				(SC_DIALOGS_START + 83)
++#define RID_SUMCTL_SUM					(SC_DIALOGS_START + 84)
++#define RID_SUMCTL_MIN					(SC_DIALOGS_START + 85)
++#define RID_SUMCTL_MAX					(SC_DIALOGS_START + 86)
++#define RID_SUMCTL_COUNT				(SC_DIALOGS_START + 87)
++#define RID_SUMCTL_COUNT2				(SC_DIALOGS_START + 88)
++#define RID_SUMCTL_AVG					(SC_DIALOGS_START + 89)
++#define RID_SUMCTL_NONE					(SC_DIALOGS_START + 90)
++
++#define RID_SCDLG_ASCII			        (SC_DIALOGS_START + 91)
++
++	//	Popup fuer Drop-Modus im Navigator
++#define RID_POPUP_DROPMODE				(SC_DIALOGS_START + 92)
++#define RID_DROPMODE_URL				(SC_DIALOGS_START + 93)
++#define RID_DROPMODE_LINK				(SC_DIALOGS_START + 94)
++#define RID_DROPMODE_COPY				(SC_DIALOGS_START + 95)
++#define RID_SCDLG_CONDFORMAT			(SC_DIALOGS_START + 96)
++
++#define RID_SCPAGE_SUBT_GROUP1			(SC_DIALOGS_START + 97)
++#define RID_SCPAGE_SUBT_GROUP2			(SC_DIALOGS_START + 98)
++#define RID_SCPAGE_SUBT_GROUP3			(SC_DIALOGS_START + 99)
++
++#define RID_SCPAGE_HFED_HL				(SC_DIALOGS_START + 100)
++#define RID_SCPAGE_HFED_HR				(SC_DIALOGS_START + 101)
++#define RID_SCPAGE_HFED_FL				(SC_DIALOGS_START + 102)
++#define RID_SCPAGE_HFED_FR				(SC_DIALOGS_START + 103)
++
++// Ableitungen von RID_SCDLG_MTRINPUT
++#define RID_SCDLG_COL_MAN				(SC_DIALOGS_START + 104)
++#define RID_SCDLG_COL_OPT				(SC_DIALOGS_START + 105)
++#define RID_SCDLG_ROW_MAN				(SC_DIALOGS_START + 106)
++#define RID_SCDLG_ROW_OPT				(SC_DIALOGS_START + 107)
++
++// Ableitungen von RID_SCDLG_SELENTRY
++#define RID_SCDLG_SELECTDB				(SC_DIALOGS_START + 108)
++#define RID_SCDLG_SHOW_TAB				(SC_DIALOGS_START + 109)
++
++// Ableitungen von RID_SCDLG_GROUP
++#define RID_SCDLG_GRP_MAKE				(SC_DIALOGS_START + 110)
++#define RID_SCDLG_GRP_KILL				(SC_DIALOGS_START + 111)
++
++#define RID_SCDLG_COLROWNAMERANGES		(SC_DIALOGS_START + 112)
++
++#define RID_SCPAGE_CONTENT				(SC_DIALOGS_START + 113)
++#define RID_SCPAGE_LAYOUT               (SC_DIALOGS_START + 114)
++#define RID_SCPAGE_INPUT				(SC_DIALOGS_START + 115)
++
++#define RID_SCTAB_PARAMETER				(SC_DIALOGS_START + 116)
++#define RID_SCTAB_FUNCTION				(SC_DIALOGS_START + 117)
++#define RID_SCTAB_STRUCT				(SC_DIALOGS_START + 118)
++
++#define RID_SCDLG_CHANGES				(SC_DIALOGS_START + 119)
++
++#define RID_POPUP_NAVIPI_SCENARIO		(SC_DIALOGS_START + 120)
++#define RID_NAVIPI_SCENARIO_DELETE		(SC_DIALOGS_START + 121)
++#define RID_NAVIPI_SCENARIO_EDIT		(SC_DIALOGS_START + 122)
++
++#define RID_SCDLG_HIGHLIGHT_CHANGES		(SC_DIALOGS_START + 123)
++#define RID_SCPAGE_OPREDLINE			(SC_DIALOGS_START + 124)
++
++#define RID_SCDLG_SIMPLEREF				(SC_DIALOGS_START + 125)
++#define WID_SIMPLE_REF					(SC_DIALOGS_START + 126)
++#define RID_POPUP_CHANGES				(SC_DIALOGS_START + 127)
++#define RID_SCPAGE_OPTLOAD				(SC_DIALOGS_START + 128)
++
++#define RID_SCDLG_DAPITYPE				(SC_DIALOGS_START + 129)
++#define RID_SCDLG_DAPISERVICE			(SC_DIALOGS_START + 130)
++#define RID_SCDLG_DAPIDATA				(SC_DIALOGS_START + 131)
++
++#define RID_SCDLG_LINKAREA				(SC_DIALOGS_START + 132)
++#define RID_SCDLG_DPDATAFIELD           (SC_DIALOGS_START + 133)
++#define RID_SCDLG_DPSUBTOTAL_OPT        (SC_DIALOGS_START + 134)
++#define RID_SCDLG_DPNUMGROUP            (SC_DIALOGS_START + 135)
++#define RID_SCDLG_DPDATEGROUP           (SC_DIALOGS_START + 136)
++#define RID_SCDLG_DPSHOWDETAIL          (SC_DIALOGS_START + 137)
++#define RID_SCDLG_OPTSOLVER             (SC_DIALOGS_START + 138)
++#define RID_SCDLG_SOLVEROPTIONS         (SC_DIALOGS_START + 139)
++#define RID_SCDLG_SOLVER_INTEGER        (SC_DIALOGS_START + 140)
++#define RID_SCDLG_SOLVER_DOUBLE         (SC_DIALOGS_START + 141)
++#define RID_SCDLG_SOLVER_PROGRESS       (SC_DIALOGS_START + 142)
++#define RID_SCDLG_SOLVER_NOSOLUTION     (SC_DIALOGS_START + 143)
++#define RID_SCDLG_SOLVER_SUCCESS        (SC_DIALOGS_START + 144)
++
++#define RID_SCDLG_CONFLICTS             (SC_DIALOGS_START + 145)
++#define RID_SCDLG_SHAREDOCUMENT         (SC_DIALOGS_START + 146)
++#define RID_SCDLG_SORT_WARNING          (SC_DIALOGS_START + 147)
++#define RID_SCDLG_TABPROTECTION         (SC_DIALOGS_START + 148)
++#define RID_SCDLG_DOCPROTECTION         (SC_DIALOGS_START + 149)
++#define RID_SCDLG_RETYPEPASS            (SC_DIALOGS_START + 150)
++#define RID_SCDLG_RETYPEPASS_INPUT      (SC_DIALOGS_START + 151)
++
++#define SC_DIALOGS_END          (SC_DIALOGS_START + 152)
++
++#ifndef STD_MASKCOLOR
++#define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
++#endif
++
++// mask color for high contrast
++#define SC_HC_MASKCOLOR STD_MASKCOLOR
++
++#define MID_1   1
++#define MID_2   2
++#define MID_3   3
++#define MID_4   4
++
++#define SC_OOO_BUILD_START          (SC_DIALOGS_END)
++
++// Data Form
++#define SID_DATAFORM_NEW            (SC_OOO_BUILD_START + 1) // message
++#define SID_DATA_FORM               (SC_OOO_BUILD_START + 2) // menu (in Data menu)
++#define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 3) // dialog
++
++#endif
++
++
+Index: sc/inc/shapeuno.hxx
+===================================================================
+--- sc/inc/shapeuno.hxx	(revision 276159)
++++ sc/inc/shapeuno.hxx	(revision 276288)
+@@ -55,6 +55,7 @@ namespace com { namespace sun { namespace star {
+ class SdrObject;
+ struct SvEventDescription;
+ class ShapeUnoEventAccessImpl;
++class  ScMacroInfo;
+ 
+ //------------------------------------------------------------------------
+ 
+@@ -73,6 +74,7 @@ class ScShapeObj    :public ScShapeObj_Base
+                     ,public ScShapeObj_TextBase
+ {
+ private:
++friend  ScMacroInfo* lcl_getShapeHyperMacroInfo( ScShapeObj* pShape, BOOL bCreate );
+ 	::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > mxShapeAgg;
+     // cached pointers to avoid repeated queryAggregation calls:
+     ::com::sun::star::beans::XPropertySet*                                  pShapePropertySet;
+Index: sc/inc/macromgr.hxx
+===================================================================
+--- sc/inc/macromgr.hxx	(revision 0)
++++ sc/inc/macromgr.hxx	(revision 276288)
+@@ -0,0 +1,70 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: document.hxx,v $
++ * $Revision: 1.115.36.9 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SC_MACROMGR_HXX
++#define SC_MACROMGR_HXX
++
++#include <com/sun/star/container/XContainerListener.hpp>
++
++#include "rtl/ustring.hxx"
++#include "scdllapi.h"
++
++#include <hash_map>
++#include <memory>
++
++class ScDocument;
++class ScFormulaCell;
++class ScUserMacroDepTracker;
++
++class ScMacroManager
++{
++public:
++    explicit ScMacroManager(ScDocument* pDoc);
++    ~ScMacroManager();
++
++    SC_DLLPUBLIC void InitUserFuncData();
++    SC_DLLPUBLIC void SetUserFuncVolatile( const rtl::OUString& sName, bool isVolatile );
++    SC_DLLPUBLIC bool GetUserFuncVolatile( const rtl::OUString& sName );
++
++    void AddDependentCell(const ::rtl::OUString& aModuleName, ScFormulaCell* pCell);
++    void RemoveDependentCell(ScFormulaCell* pCell);
++    void BroadcastModuleUpdate(const ::rtl::OUString& aModuleName);
++
++private:
++    typedef std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameBoolMap;
++    NameBoolMap mhFuncToVolatile;
++    com::sun::star::uno::Reference< com::sun::star::container::XContainerListener > mxContainerListener;
++
++    ::std::auto_ptr<ScUserMacroDepTracker> mpDepTracker;
++    ScDocument* mpDoc;
++};
++
++#endif
++
+Index: sc/prj/build.lst
+===================================================================
+--- sc/prj/build.lst	(revision 276159)
++++ sc/prj/build.lst	(revision 276288)
+@@ -1,4 +1,4 @@
+-sc	sc	:	l10n oovbaapi svx stoc uui BOOST:boost formula oox NULL
++sc     sc      :       l10n vbahelper oovbaapi svx stoc uui BOOST:boost formula oox NULL
+ sc	sc							usr1	-	all	sc_mkout NULL
+ sc	sc\inc							nmake	-	all	sc_inc NULL
+ sc	sc\prj							get	-	all	sc_prj NULL
+@@ -33,7 +33,7 @@ sc	sc\source\ui\undo					nmake	-	all	sc_undo sc_sd
+ sc	sc\source\ui\unoobj					nmake	-	all	sc_unobj sc_sdi sc_inc NULL
+ sc	sc\source\ui\vba					nmake	-	all	sc_vba sc_sdi sc_inc NULL
+ sc	sc\source\ui\view					nmake	-	all	sc_view sc_sdi sc_inc NULL
+-sc	sc\source\filter\excel					nmake	-	all	sc_excel sc_sdi sc_inc NULL
++sc	sc\source\filter\excel					nmake	-	all	sc_excel sc_vba sc_sdi sc_inc NULL
+ sc	sc\source\filter\ftools					nmake	-	all	sc_ftools sc_sdi sc_inc NULL
+ sc	sc\source\filter\lotus					nmake	-	all	sc_lotus sc_sdi sc_inc NULL
+ sc	sc\source\filter\qpro					nmake	-	all	sc_qpro sc_sdi sc_inc NULL
+Index: sc/util/makefile.mk
+===================================================================
+--- sc/util/makefile.mk	(revision 276159)
++++ sc/util/makefile.mk	(revision 276288)
+@@ -78,6 +78,7 @@ SHL1IMPLIB= sci
+ 
+ # dynamic libraries
+ SHL1STDLIBS=       \
++		$(VBAHELPERLIB) \
+ 	$(BASICLIB)	\
+ 	$(SFXLIB)		\
+ 	$(SVTOOLLIB)	\
+@@ -276,6 +277,7 @@ LIB8OBJFILES = \
+ 		$(SLO)$/filldlg.obj			\
+ 		$(SLO)$/delcodlg.obj		\
+ 		$(SLO)$/delcldlg.obj		\
++		$(SLO)$/datafdlg.obj		\
+ 		$(SLO)$/dapitype.obj	\
+ 		$(SLO)$/dapidata.obj	\
+ 		$(SLO)$/crdlg.obj			\
+@@ -300,6 +302,7 @@ SHL9RPATH=OOO
+ .ENDIF
+ 
+ SHL9STDLIBS= \
++		$(VBAHELPERLIB) \
+ 		$(CPPUHELPERLIB) \
+ 		$(VCLLIB) \
+ 		$(CPPULIB) \
+@@ -315,6 +318,7 @@ SHL9STDLIBS= \
+ 		$(ISCLIB) \
+         $(VCLLIB) \
+         $(TKLIB) \
++	    $(SVXMSFILTERLIB)		\
+         $(FORLIB)
+ 
+ SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN)
+@@ -333,6 +337,7 @@ SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib
+ 
+ .INCLUDE :  target.mk
+ 
++COMP=
+ .IF "$(VBA_EXTENSION)"=="YES"
+     COMP=build_extn
+ .ENDIF
+Index: basic/source/uno/namecont.cxx
+===================================================================
+--- basic/source/uno/namecont.cxx	(revision 276159)
++++ basic/source/uno/namecont.cxx	(revision 276288)
+@@ -76,6 +76,9 @@
+ #include <cppuhelper/exc_hlp.hxx>
+ #include <basic/sbmod.hxx>
+ 
++#ifndef _COM_SUN_STAR_SCRIPT_MODULEINFO_HPP_
++#include <com/sun/star/script/ModuleInfo.hpp>
++#endif
+ 
+ namespace basic
+ {
+@@ -155,7 +158,7 @@ void NameContainer::replaceByName( const OUString&
+ 	throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
+ {
+ 	Type aAnyType = aElement.getValueType();
+-	if( mType != aAnyType )
++    if( mType != aAnyType && aAnyType != getCppuType( static_cast< ModuleInfo* >( NULL ) ) )
+ 		throw IllegalArgumentException();
+ 
+ 	NameContainerNameMap::iterator aIt = mHashMap.find( aName );
+@@ -197,7 +200,7 @@ void NameContainer::insertByName( const OUString&
+ 	throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
+ {
+ 	Type aAnyType = aElement.getValueType();
+-	if( mType != aAnyType )
++    if( mType != aAnyType && aAnyType != getCppuType( static_cast< ModuleInfo* >( NULL ) ) )
+ 		throw IllegalArgumentException();
+ 
+ 	NameContainerNameMap::iterator aIt = mHashMap.find( aName );
+@@ -2719,6 +2722,39 @@ OUString SfxLibraryContainer::expand_url( const OU
+     }
+ }
+ 
++::sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatModeOn() throw (RuntimeException)
++{
++	sal_Bool bVBACompat = sal_False;
++	BasicManager* pBasMgr = getBasicManager();
++	if( pBasMgr )
++	{
++		// get the standard library
++		String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
++
++                if ( pBasMgr->GetName().Len() )
++                    aLibName = pBasMgr->GetName();
++
++		StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
++		if( pBasic )
++			bVBACompat = pBasic->isVBAEnabled();
++	}
++
++	return bVBACompat;
++}
++
++void SAL_CALL SfxLibraryContainer::setVBACompatModeOn( ::sal_Bool _vbacompatmodeon ) throw (RuntimeException)
++{
++	BasicManager* pBasMgr = getBasicManager();
++	if( pBasMgr )
++	{
++		// get the standard library
++		String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
++		StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
++		if( pBasic )
++			pBasic->SetVBAEnabled( _vbacompatmodeon );
++	}
++}
++
+ // Methods XServiceInfo
+ ::sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const ::rtl::OUString& _rServiceName )
+     throw (RuntimeException)
+Index: basic/source/uno/scriptcont.cxx
+===================================================================
+--- basic/source/uno/scriptcont.cxx	(revision 276159)
++++ basic/source/uno/scriptcont.cxx	(revision 276288)
+@@ -67,7 +67,8 @@
+ #include <xmlscript/xmlmod_imexp.hxx>
+ #include <cppuhelper/factory.hxx>
+ #include <com/sun/star/util/VetoException.hpp>
+-
++#include <com/sun/star/script/XLibraryQueryExecutable.hpp>
++#include <cppuhelper/implbase1.hxx>
+ namespace basic
+ {
+ 
+@@ -138,7 +139,6 @@ sal_Bool SfxScriptLibraryContainer::hasLibraryPass
+     return pImplLib->mbPasswordProtected;
+ }
+ 
+-
+ // Ctor for service
+ SfxScriptLibraryContainer::SfxScriptLibraryContainer( void )
+     :maScriptLanguage( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" ) )
+@@ -214,6 +214,11 @@ void SAL_CALL SfxScriptLibraryContainer::writeLibr
+ 	xmlscript::ModuleDescriptor aMod;
+ 	aMod.aName = aElementName;
+ 	aMod.aLanguage = maScriptLanguage;
++	// make sure we export source
++	::com::sun::star::script::ModuleInfo mInfo;
++	if ( aElement >>= mInfo )
++		aMod.aCode = mInfo.ModuleSource;
++	else
+ 	aElement >>= aMod.aCode;
+ 	xmlscript::exportScriptModule( xHandler, aMod );
+ }
+@@ -1050,6 +1055,17 @@ void SfxScriptLibraryContainer::onNewRootStorage()
+ {
+ }
+ 
++sal_Bool SAL_CALL
++SfxScriptLibraryContainer:: HasExecutableCode( const ::rtl::OUString& Library ) throw (uno::RuntimeException)
++{
++	BasicManager* pBasicMgr = getBasicManager();
++    	OSL_ENSURE( pBasicMgr, "we need a basicmanager, really we do" );
++	if ( pBasicMgr )
++		return pBasicMgr->HasExeCode( Library ); // need to change this to take name
++	// default to it has code if we can't decide
++	return sal_True;
++}
++
+ //============================================================================
+ // Service
+ void createRegistryInfo_SfxScriptLibraryContainer()
+@@ -1160,6 +1176,10 @@ void SfxScriptLibrary::storeResourcesToStorage( co
+ bool SfxScriptLibrary::containsValidModule( const Any& aElement )
+ {
+ 	OUString sModuleText;
++	::com::sun::star::script::ModuleInfo mInfo;
++	if ( aElement >>= mInfo )
++		sModuleText = mInfo.ModuleSource;
++	else
+ 	aElement >>= sModuleText;
+ 	return ( sModuleText.getLength() > 0 );
+ }
+Index: basic/source/uno/dlgcont.cxx
+===================================================================
+--- basic/source/uno/dlgcont.cxx	(revision 276159)
++++ basic/source/uno/dlgcont.cxx	(revision 276288)
+@@ -322,7 +322,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibr
+ 	
+ 	try {
+ 		// start parsing 
+-		xParser->setDocumentHandler( ::xmlscript::importDialogModel( xDialogModel, xContext ) );
++		xParser->setDocumentHandler( ::xmlscript::importDialogModel( xDialogModel, xContext, mxOwnerDocument ) );
+ 		xParser->parseStream( source );
+ 	}
+ 	catch( Exception& )
+@@ -336,7 +336,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibr
+ 
+ 	// Create InputStream, TODO: Implement own InputStreamProvider
+ 	// to avoid creating the DialogModel here!
+-	Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
++	Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, mxOwnerDocument );
+ 	aRetAny <<= xISP;
+ 	return aRetAny;
+ }
+@@ -484,7 +484,11 @@ void SfxDialogLibraryContainer::onNewRootStorage()
+ 	}
+ }
+ 
+-
++sal_Bool SAL_CALL
++SfxDialogLibraryContainer:: HasExecutableCode( const ::rtl::OUString& Library ) throw (uno::RuntimeException)
++{
++	return sal_False; // dialog library has no executable code
++}
+ //============================================================================
+ // Service
+ 
+Index: basic/source/runtime/runtime.cxx
+===================================================================
+--- basic/source/runtime/runtime.cxx	(revision 276159)
++++ basic/source/runtime/runtime.cxx	(revision 276288)
+@@ -46,13 +46,17 @@
+ #include <comphelper/processfactory.hxx>
+ #include <com/sun/star/container/XEnumerationAccess.hpp>
+ #include "sbunoobj.hxx"
++#include "errobject.hxx"
+ 
++SbxVariable* getDefaultProp( SbxVariable* pRef );
++
+ bool SbiRuntime::isVBAEnabled()
+ {
+ 	bool result = false;
+ 	SbiInstance* pInst = pINST;
+ 	if ( pInst && pINST->pRun )
+-		result = pInst->pRun->GetImageFlag( SBIMG_VBASUPPORT );
++		//result = pInst->pRun->GetImageFlag( SBIMG_VBASUPPORT );
++		result = pInst->pRun->bVBAEnabled;
+ 	return result; 
+ }
+ 
+@@ -63,8 +67,26 @@ void StarBASIC::StaticEnableReschedule( BOOL bResc
+ {
+     bStaticGlobalEnableReschedule = bReschedule;
+ }
++void StarBASIC::SetVBAEnabled( BOOL bEnabled )
++{
++    if ( bDocBasic )
++    {
++        bVBAEnabled = bEnabled;
++    }
++}
+ 
++BOOL StarBASIC::isVBAEnabled()
++{
++    if ( bDocBasic )
++    { 
++        if( SbiRuntime::isVBAEnabled() )
++            return TRUE;
++        return bVBAEnabled;
++    }
++    return FALSE;
++}
+ 
++
+ struct SbiArgvStack {					// Argv stack:
+ 	SbiArgvStack*  pNext;	   			// Stack Chain
+ 	SbxArrayRef    refArgv;	 			// Argv
+@@ -272,6 +294,7 @@ SbiInstance::SbiInstance( StarBASIC* p )
+ 	nErl	 = 0;
+ 	bReschedule = TRUE;
+ 	bCompatibility = FALSE;
++	SbxErrObject::getUnoErrObject()->Clear();
+ }
+ 
+ SbiInstance::~SbiInstance()
+@@ -495,7 +518,7 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth
+ 
+ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
+ 		 : rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ), 
+-		   pMod( pm ), pMeth( pe ), pImg( pMod->pImage ), m_nLastTime(0)
++		   pMod( pm ), pMeth( pe ), pImg( pMod->pImage ), mpExtCaller(0), m_nLastTime(0)
+ {
+ 	nFlags	  = pe ? pe->GetDebugFlags() : 0;
+ 	pIosys	  = pInst->pIosys;
+@@ -523,6 +546,7 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe
+ 	nForLvl   = 0;
+ 	nOps	  = 0;
+ 	refExprStk = new SbxArray;
++	SetVBAEnabled( pMod->IsVBACompat() );
+ #if defined GCC
+ 	SetParameters( pe ? pe->GetParameters() : (class SbxArray *)NULL );
+ #else
+@@ -530,7 +554,6 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe
+ #endif
+ 	pRefSaveList = NULL;
+ 	pItemStoreList = NULL;
+-	bVBAEnabled = isVBAEnabled();
+ }
+ 
+ SbiRuntime::~SbiRuntime()
+@@ -549,6 +572,18 @@ SbiRuntime::~SbiRuntime()
+ 	}
+ }
+ 
++void SbiRuntime::SetVBAEnabled(bool bEnabled )
++{
++	bVBAEnabled = bEnabled; 
++	if ( bVBAEnabled )
++	{
++		if ( pMeth )
++			mpExtCaller = pMeth->mCaller;
++	}
++	else
++		mpExtCaller = 0;
++}
++
+ // Aufbau der Parameterliste. Alle ByRef-Parameter werden direkt
+ // uebernommen; von ByVal-Parametern werden Kopien angelegt. Falls
+ // ein bestimmter Datentyp verlangt wird, wird konvertiert.
+@@ -797,9 +832,40 @@ BOOL SbiRuntime::Step()
+ void SbiRuntime::Error( SbError n )
+ {
+ 	if( n )
++	{
+ 		nError = n;
++		if ( isVBAEnabled() )
++		{
++			String aMsg = pInst->GetErrorMsg();
++			// If a message is defined use that ( in preference to
++			// the defined one for the error ) NB #TODO
++			// if there is an error defined it more than likely
++			// is not the one you want ( some are the same though )
++			// we really need a new vba compatible error list
++			if ( !aMsg.Len() )
++			{
++				StarBASIC::MakeErrorText( n, aMsg );	
++				aMsg =  StarBASIC::GetErrorText();
++				if ( !aMsg.Len() ) // no message for err no.
++					// need localized resource here
++					aMsg = String( RTL_CONSTASCII_USTRINGPARAM("Internal Object Error:") );
+ }
++			// no num? most likely then it *is* really a vba err
++			SbxErrObject::getUnoErrObject()->setNumber( ( StarBASIC::GetVBErrorCode( n ) == 0 ) ? n : StarBASIC::GetVBErrorCode( n ) );
++			SbxErrObject::getUnoErrObject()->setDescription( aMsg );
+ 
++			// prepend an error number to the message.
++			String aTmp = '\'';
++                        aTmp += String::CreateFromInt32( SbxErrObject::getUnoErrObject()->getNumber() );
++                        aTmp += String( RTL_CONSTASCII_USTRINGPARAM("\'\n") );
++                        aTmp += aMsg;
++
++			pInst->aErrorMsg = aTmp;
++			nError = SbERR_BASIC_COMPAT;
++		}
++	}
++}
++
+ void SbiRuntime::Error( SbError _errCode, const String& _details )
+ {
+     if ( _errCode )
+@@ -917,8 +983,26 @@ SbxVariable* SbiRuntime::GetTOS( short n )
+ void SbiRuntime::TOSMakeTemp()
+ {
+ 	SbxVariable* p = refExprStk->Get( nExprLvl - 1 );
+-	if( p->GetRefCount() != 1 )
++	if ( p->GetType() == SbxEMPTY )
++		p->Broadcast( SBX_HINT_DATAWANTED );
++
++	SbxVariable* pDflt = NULL;
++	if ( bVBAEnabled &&  ( p->GetType() == SbxOBJECT || p->GetType() == SbxVARIANT  ) && ( pDflt = getDefaultProp( p ) ) )
+ 	{
++		pDflt->Broadcast( SBX_HINT_DATAWANTED );
++		// replacing new p on stack causes object pointed by 
++		// pDft->pParent to be deleted, when p2->Compute() is
++		// called below pParent is accessed ( but its deleted )
++		// so set it to NULL now
++		pDflt->SetParent( NULL );  
++		p = new SbxVariable( *pDflt );
++		p->SetFlag( SBX_READWRITE );
++		refExprStk->Put( p, nExprLvl - 1 );
++//		return;
++	}
++
++	else if( p->GetRefCount() != 1 )
++	{
+ 		SbxVariable* pNew = new SbxVariable( *p );
+ 		pNew->SetFlag( SBX_READWRITE );
+ 		refExprStk->Put( pNew, nExprLvl - 1 );
+@@ -926,7 +1010,6 @@ void SbiRuntime::TOSMakeTemp()
+ }
+ 
+ // Der GOSUB-Stack nimmt Returnadressen fuer GOSUBs auf
+-
+ void SbiRuntime::PushGosub( const BYTE* pc )
+ {
+ 	if( ++nGosubLvl > MAXRECURSION )
+Index: basic/source/runtime/methods1.cxx
+===================================================================
+--- basic/source/runtime/methods1.cxx	(revision 276159)
++++ basic/source/runtime/methods1.cxx	(revision 276288)
+@@ -44,6 +44,7 @@
+ #ifndef _SBX_HXX
+ #include <basic/sbx.hxx>
+ #endif
++#include <basic/sbstar.hxx>
+ #include <svtools/zforlist.hxx>
+ #include <tools/fsys.hxx>
+ #include <tools/urlobj.hxx>
+@@ -64,6 +65,7 @@
+ #endif
+ 
+ #include <vcl/jobset.hxx>
++#include <basic/sbobjmod.hxx>
+ 
+ #include "sbintern.hxx"
+ #include "runtime.hxx"
+@@ -80,11 +82,15 @@
+ #include <com/sun/star/uno/Sequence.hxx>
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+ #include <com/sun/star/i18n/XCalendar.hpp>
++#include <com/sun/star/sheet/XFunctionAccess.hpp>
+ 
+ using namespace comphelper;
++using namespace com::sun::star::sheet;
+ using namespace com::sun::star::uno;
+ using namespace com::sun::star::i18n;
+ 
++void unoToSbxValue( SbxVariable* pVar, const Any& aValue );
++Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, com::sun::star::beans::Property* pUnoProperty = NULL );
+ 
+ static Reference< XCalendar > getLocaleCalendar( void )
+ {
+@@ -2506,6 +2512,546 @@ RTLFUNC(Round)
+ 	rPar.Get(0)->PutDouble( dRes );
+ }
+ 
++void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const rtl::OUString& sFuncName, SbxVariable* pRet )
++{
++    static Reference< XFunctionAccess > xFunc;
++    Any aRes;
++    try
++    {
++        if ( !xFunc.is() )
++        {
++            Reference< XMultiServiceFactory > xFactory( getProcessServiceFactory() );
++            if( xFactory.is() )
++            {
++                xFunc.set( xFactory->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.sheet.FunctionAccess")), UNO_QUERY_THROW); 
++            }
++        }
++        Any aRet = xFunc->callFunction( sFuncName, aArgs );
++     
++        unoToSbxValue( pRet, aRet );
++
++    }
++    catch( Exception& )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++    }
++}
++
++RTLFUNC(SYD)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 4 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++
++    // retrieve non-optional params
++
++    Sequence< Any > aParams( 4 );
++    aParams[ 0 ] <<= makeAny( rPar.Get(1)->GetDouble() );
++    aParams[ 1 ] <<= makeAny( rPar.Get(2)->GetDouble() );
++    aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
++    aParams[ 3 ] <<= makeAny( rPar.Get(4)->GetDouble() );
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYD") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(SLN)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 3 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++
++    // retrieve non-optional params
++
++    Sequence< Any > aParams( 3 );
++    aParams[ 0 ] <<= makeAny( rPar.Get(1)->GetDouble() );
++    aParams[ 1 ] <<= makeAny( rPar.Get(2)->GetDouble() );
++    aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SLN") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(Pmt)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 3 || nArgCount > 5 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++    // retrieve non-optional params
++
++    double rate = rPar.Get(1)->GetDouble();
++    double nper = rPar.Get(2)->GetDouble();
++    double pmt = rPar.Get(3)->GetDouble();
++
++    // set default values for Optional args
++    double fv = 0;    
++    double type = 0;    
++    
++    // fv
++    if ( nArgCount >= 4 )
++    {
++        if( rPar.Get(4)->GetType() != SbxEMPTY )
++            fv = rPar.Get(4)->GetDouble();
++    }
++    // type
++    if ( nArgCount >= 5 )
++    {
++        if( rPar.Get(5)->GetType() != SbxEMPTY )
++            type = rPar.Get(5)->GetDouble();
++    }
++
++    Sequence< Any > aParams( 5 );
++    aParams[ 0 ] <<= rate;
++    aParams[ 1 ] <<= nper;
++    aParams[ 2 ] <<= pmt;
++    aParams[ 3 ] <<= fv;
++    aParams[ 4 ] <<= type;
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Pmt") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(PPmt)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 4 || nArgCount > 6 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++    // retrieve non-optional params
++
++    double rate = rPar.Get(1)->GetDouble();
++    double per = rPar.Get(2)->GetDouble();
++    double nper = rPar.Get(3)->GetDouble();
++    double pv = rPar.Get(4)->GetDouble();
++
++    // set default values for Optional args
++    double fv = 0;    
++    double type = 0;    
++    
++    // fv
++    if ( nArgCount >= 5 )
++    {
++        if( rPar.Get(5)->GetType() != SbxEMPTY )
++            fv = rPar.Get(5)->GetDouble();
++    }
++    // type
++    if ( nArgCount >= 6 )
++    {
++        if( rPar.Get(6)->GetType() != SbxEMPTY )
++            type = rPar.Get(6)->GetDouble();
++    }
++
++    Sequence< Any > aParams( 6 );
++    aParams[ 0 ] <<= rate;
++    aParams[ 1 ] <<= per;
++    aParams[ 2 ] <<= nper;
++    aParams[ 3 ] <<= pv;
++    aParams[ 4 ] <<= fv;
++    aParams[ 5 ] <<= type;
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PPmt") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(PV)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 3 || nArgCount > 5 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++    // retrieve non-optional params
++
++    double rate = rPar.Get(1)->GetDouble();
++    double nper = rPar.Get(2)->GetDouble();
++    double pmt = rPar.Get(3)->GetDouble();
++
++    // set default values for Optional args
++    double fv = 0;    
++    double type = 0;    
++    
++    // fv
++    if ( nArgCount >= 4 )
++    {
++        if( rPar.Get(4)->GetType() != SbxEMPTY )
++            fv = rPar.Get(4)->GetDouble();
++    }
++    // type
++    if ( nArgCount >= 5 )
++    {
++        if( rPar.Get(5)->GetType() != SbxEMPTY )
++            type = rPar.Get(5)->GetDouble();
++    }
++
++    Sequence< Any > aParams( 5 );
++    aParams[ 0 ] <<= rate;
++    aParams[ 1 ] <<= nper;
++    aParams[ 2 ] <<= pmt;
++    aParams[ 3 ] <<= fv;
++    aParams[ 4 ] <<= type;
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PV") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(NPV)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 1 || nArgCount > 2 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++
++    Sequence< Any > aParams( 2 );
++    aParams[ 0 ] <<= makeAny( rPar.Get(1)->GetDouble() );
++    Any aValues = sbxToUnoValue( rPar.Get(2),
++                getCppuType( (Sequence<double>*)0 ) );
++
++    // convert for calc functions
++    Sequence< Sequence< double > > sValues(1);
++    aValues >>= sValues[ 0 ];
++    aValues <<= sValues;
++
++    aParams[ 1 ] <<= aValues;
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NPV") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(NPer)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 3 || nArgCount > 5 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++    // retrieve non-optional params
++
++    double rate = rPar.Get(1)->GetDouble();
++    double pmt = rPar.Get(2)->GetDouble();
++    double pv = rPar.Get(3)->GetDouble();
++
++    // set default values for Optional args
++    double fv = 0;    
++    double type = 0;    
++    
++    // fv
++    if ( nArgCount >= 4 )
++    {
++        if( rPar.Get(4)->GetType() != SbxEMPTY )
++            fv = rPar.Get(4)->GetDouble();
++    }
++    // type
++    if ( nArgCount >= 5 )
++    {
++        if( rPar.Get(5)->GetType() != SbxEMPTY )
++            type = rPar.Get(5)->GetDouble();
++    }
++
++    Sequence< Any > aParams( 5 );
++    aParams[ 0 ] <<= rate;
++    aParams[ 1 ] <<= pmt;
++    aParams[ 2 ] <<= pv;
++    aParams[ 3 ] <<= fv;
++    aParams[ 4 ] <<= type;
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NPer") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(MIRR)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 3 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++
++    // retrieve non-optional params
++
++    Sequence< Any > aParams( 3 );
++    Any aValues = sbxToUnoValue( rPar.Get(1),
++                getCppuType( (Sequence<double>*)0 ) );
++
++    // convert for calc functions
++    Sequence< Sequence< double > > sValues(1);
++    aValues >>= sValues[ 0 ];
++    aValues <<= sValues;
++
++    aParams[ 0 ] <<= aValues;
++    aParams[ 1 ] <<= makeAny( rPar.Get(2)->GetDouble() );
++    aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MIRR") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(IRR)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 1 || nArgCount > 2 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++    // retrieve non-optional params
++    Any aValues = sbxToUnoValue( rPar.Get(1),
++                getCppuType( (Sequence<double>*)0 ) );
++
++    // convert for calc functions
++    Sequence< Sequence< double > > sValues(1);
++    aValues >>= sValues[ 0 ];
++    aValues <<= sValues;
++
++    // set default values for Optional args
++    double guess = 0.1;    
++    // guess
++    if ( nArgCount >= 2 )
++    {
++        if( rPar.Get(2)->GetType() != SbxEMPTY )
++            guess = rPar.Get(2)->GetDouble();
++    }
++
++    Sequence< Any > aParams( 2 );
++    aParams[ 0 ] <<= aValues;
++    aParams[ 1 ] <<= guess;
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IRR") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(IPmt)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 4 || nArgCount > 6 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++    // retrieve non-optional params
++
++    double rate = rPar.Get(1)->GetDouble();
++    double per = rPar.Get(2)->GetInteger();
++    double nper = rPar.Get(3)->GetDouble();
++    double pv = rPar.Get(4)->GetDouble();
++
++    // set default values for Optional args
++    double fv = 0;    
++    double type = 0;    
++    
++    // fv
++    if ( nArgCount >= 5 )
++    {
++        if( rPar.Get(5)->GetType() != SbxEMPTY )
++            fv = rPar.Get(5)->GetDouble();
++    }
++    // type
++    if ( nArgCount >= 6 )
++    {
++        if( rPar.Get(6)->GetType() != SbxEMPTY )
++            type = rPar.Get(6)->GetDouble();
++    }
++
++    Sequence< Any > aParams( 6 );
++    aParams[ 0 ] <<= rate;
++    aParams[ 1 ] <<= per;
++    aParams[ 2 ] <<= nper;
++    aParams[ 3 ] <<= pv;
++    aParams[ 4 ] <<= fv;
++    aParams[ 5 ] <<= type;
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IPmt") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(FV)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 3 || nArgCount > 5 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++    // retrieve non-optional params
++
++    double rate = rPar.Get(1)->GetDouble();
++    double nper = rPar.Get(2)->GetDouble();
++    double pmt = rPar.Get(3)->GetDouble();
++
++    // set default values for Optional args
++    double pv = 0;    
++    double type = 0;    
++    
++    // pv
++    if ( nArgCount >= 4 )
++    {
++        if( rPar.Get(4)->GetType() != SbxEMPTY )
++            pv = rPar.Get(4)->GetDouble();
++    }
++    // type
++    if ( nArgCount >= 5 )
++    {
++        if( rPar.Get(5)->GetType() != SbxEMPTY )
++            type = rPar.Get(5)->GetDouble();
++    }
++
++    Sequence< Any > aParams( 5 );
++    aParams[ 0 ] <<= rate;
++    aParams[ 1 ] <<= nper;
++    aParams[ 2 ] <<= pmt;
++    aParams[ 3 ] <<= pv;
++    aParams[ 4 ] <<= type;
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FV") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(DDB)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 4 || nArgCount > 5 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++    // retrieve non-optional params
++
++    double cost = rPar.Get(1)->GetDouble();
++    double salvage = rPar.Get(2)->GetDouble();
++    double life = rPar.Get(3)->GetDouble();
++    double period = rPar.Get(4)->GetDouble();
++
++    // set default values for Optional args
++    double factor = 2;    
++    
++    // factor
++    if ( nArgCount >= 5 )
++    {
++        if( rPar.Get(5)->GetType() != SbxEMPTY )
++            factor = rPar.Get(5)->GetDouble();
++    }
++
++    Sequence< Any > aParams( 5 );
++    aParams[ 0 ] <<= cost;
++    aParams[ 1 ] <<= salvage;
++    aParams[ 2 ] <<= life;
++    aParams[ 3 ] <<= period;
++    aParams[ 4 ] <<= factor;
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DDB") ), rPar.Get( 0 ) );
++}
++
++RTLFUNC(Rate)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++    ULONG nArgCount = rPar.Count()-1;
++
++    if ( nArgCount < 3 || nArgCount > 6 )
++    {
++        StarBASIC::Error( SbERR_BAD_ARGUMENT );
++        return;
++    }
++    // retrieve non-optional params
++
++    double nper = 0;    
++    double pmt = 0;    
++    double pv = 0;
++
++    nper = rPar.Get(1)->GetDouble();
++    pmt = rPar.Get(2)->GetDouble();
++    pv = rPar.Get(3)->GetDouble();
++
++    // set default values for Optional args
++    double fv = 0;    
++    double type = 0;    
++    double guess = 0.1;    
++    
++    // fv
++    if ( nArgCount >= 4 )
++    {
++        if( rPar.Get(4)->GetType() != SbxEMPTY )
++            fv = rPar.Get(4)->GetDouble();
++    }
++
++    // type
++    if ( nArgCount >= 5 )
++    {
++        if( rPar.Get(5)->GetType() != SbxEMPTY )
++            type = rPar.Get(5)->GetDouble();
++    }
++
++    // guess
++    if ( nArgCount >= 6 )
++    {
++        if( rPar.Get(6)->GetType() != SbxEMPTY )
++            type = rPar.Get(6)->GetDouble();
++    }
++
++    Sequence< Any > aParams( 6 );
++    aParams[ 0 ] <<= nper;
++    aParams[ 1 ] <<= pmt;
++    aParams[ 2 ] <<= pv;
++    aParams[ 3 ] <<= fv;
++    aParams[ 4 ] <<= type;
++    aParams[ 5 ] <<= guess;
++    
++    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Rate") ), rPar.Get( 0 ) );
++}
++
+ RTLFUNC(StrReverse)
+ {
+     (void)pBasic;
+@@ -2594,14 +3140,14 @@ RTLFUNC(Me)
+ 
+ 	SbModule* pActiveModule = pINST->GetActiveModule();
+ 	SbClassModuleObject* pClassModuleObject = PTR_CAST(SbClassModuleObject,pActiveModule);
++    SbxVariableRef refVar = rPar.Get(0);
+ 	if( pClassModuleObject == NULL )
+ 	{
+-		StarBASIC::Error( SbERR_INVALID_USAGE_OBJECT );
++        SbObjModule* pMod = PTR_CAST(SbObjModule,pActiveModule);
++        if ( pMod )
++            refVar->PutObject( pMod );
+ 	}
+ 	else
+-	{
+-		SbxVariableRef refVar = rPar.Get(0);
+ 		refVar->PutObject( pClassModuleObject );
+ 	}
+-}
+ 
+Index: basic/source/runtime/stdobj.cxx
+===================================================================
+--- basic/source/runtime/stdobj.cxx	(revision 276159)
++++ basic/source/runtime/stdobj.cxx	(revision 276288)
+@@ -36,6 +36,7 @@
+ #include <basic/sbstdobj.hxx>
+ #include "rtlproto.hxx"
+ #include "sbintern.hxx"
++#include "errobject.hxx"
+ 
+ // Das nArgs-Feld eines Tabelleneintrags ist wie folgt verschluesselt:
+ // Zur Zeit wird davon ausgegangen, dass Properties keine Parameter
+@@ -174,7 +175,12 @@ static Methods aMethods[] = {
+   { "expression",   SbxVARIANT, 0,NULL,0 },
+ { "CVErr",          SbxVARIANT,   1 | _FUNCTION, RTLNAME(CVErr),0           },
+   { "expression",   SbxVARIANT, 0,NULL,0 },
+-
++{ "DDB",      SbxDOUBLE,      5 | _FUNCTION | _COMPTMASK, RTLNAME(DDB),0       },
++  { "Cost",       SbxDOUBLE,  0, NULL,0 },
++  { "Salvage",       SbxDOUBLE,  0, NULL,0 },
++  { "Life",       SbxDOUBLE,  0, NULL,0 },
++  { "Period",       SbxDOUBLE,  0, NULL,0 },
++  { "Factor",     SbxVARIANT,  _OPT, NULL,0 },
+ { "Date",           SbxDATE,          _LFUNCTION,RTLNAME(Date),0            },
+ { "DateAdd",        SbxDATE,	  3 | _FUNCTION, RTLNAME(DateAdd),0         },
+   { "Interval",     SbxSTRING, 0,NULL,0 },
+@@ -272,6 +278,12 @@ static Methods aMethods[] = {
+ { "FreeLibrary",    SbxNULL,      1 | _FUNCTION, RTLNAME(FreeLibrary),0     },
+   { "Modulename",   SbxSTRING, 0,NULL,0 },
+ 
++{ "FV",      SbxDOUBLE,      5 | _FUNCTION | _COMPTMASK, RTLNAME(FV),0       },
++  { "Rate",       SbxDOUBLE,  0, NULL,0 },
++  { "NPer",       SbxDOUBLE,  0, NULL,0 },
++  { "Pmt",       SbxDOUBLE,  0, NULL,0 },
++  { "PV",     SbxVARIANT,  _OPT, NULL,0 },
++  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
+ { "Get",            SbxNULL,   3 | _FUNCTION, RTLNAME(Get),0                },
+   { "filenumber",   SbxINTEGER, 0,NULL,0 },
+   { "recordnumber", SbxLONG, 0,NULL,0 },
+@@ -332,6 +344,16 @@ static Methods aMethods[] = {
+   { "Compare",      SbxINTEGER,       _OPT, NULL,0 },
+ { "Int",            SbxDOUBLE,    1 | _FUNCTION, RTLNAME(Int),0             },
+   { "number",       SbxDOUBLE, 0,NULL,0 },
++{ "IPmt",      SbxDOUBLE,      6 | _FUNCTION | _COMPTMASK, RTLNAME(IPmt),0       },
++  { "Rate",       SbxDOUBLE,  0, NULL,0 },
++  { "Per",       SbxDOUBLE,  0, NULL,0 },
++  { "NPer",       SbxDOUBLE,  0, NULL,0 },
++  { "PV",     SbxDOUBLE,  0, NULL,0 },
++  { "FV",     SbxVARIANT,  _OPT, NULL,0 },
++  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
++{ "IRR",      SbxDOUBLE,      2 | _FUNCTION | _COMPTMASK, RTLNAME(IRR),0       },
++  { "ValueArray",       SbxARRAY,  0, NULL,0 },
++  { "Guess",       SbxVARIANT,  _OPT, NULL,0 },
+ { "IsArray",        SbxBOOL,      1 | _FUNCTION, RTLNAME(IsArray),0         },
+   { "Variant",      SbxVARIANT, 0,NULL,0 },
+ { "IsDate",         SbxBOOL,      1 | _FUNCTION, RTLNAME(IsDate),0          },
+@@ -400,6 +422,10 @@ static Methods aMethods[] = {
+   { "Length",       SbxLONG,          _OPT, NULL,0 },
+ { "Minute",         SbxINTEGER,   1 | _FUNCTION, RTLNAME(Minute),0          },
+   { "Date",         SbxDATE, 0,NULL,0 },
++{ "MIRR",      SbxDOUBLE,      2 | _FUNCTION | _COMPTMASK, RTLNAME(MIRR),0       },
++  { "ValueArray",       SbxARRAY,  0, NULL,0 },
++  { "FinanceRate",       SbxDOUBLE,  0, NULL,0 },
++  { "ReinvestRate",       SbxDOUBLE,  0, NULL,0 },
+ { "MkDir",          SbxNULL,      1 | _FUNCTION, RTLNAME(MkDir),0           },
+   { "pathname",     SbxSTRING, 0,NULL,0 },
+ { "Month",          SbxINTEGER,   1 | _FUNCTION, RTLNAME(Month),0           },
+@@ -416,6 +442,15 @@ static Methods aMethods[] = {
+ 
+ { "Nothing",        SbxOBJECT,        _CPROP,    RTLNAME(Nothing),0         },
+ { "Now",            SbxDATE,          _FUNCTION, RTLNAME(Now),0             },
++{ "NPer",      SbxDOUBLE,      5 | _FUNCTION | _COMPTMASK, RTLNAME(NPer),0       },
++  { "Rate",       SbxDOUBLE,  0, NULL,0 },
++  { "Pmt",       SbxDOUBLE,  0, NULL,0 },
++  { "PV",       SbxDOUBLE,  0, NULL,0 },
++  { "FV",     SbxVARIANT,  _OPT, NULL,0 },
++  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
++{ "NPV",      SbxDOUBLE,      2 | _FUNCTION | _COMPTMASK, RTLNAME(NPV),0       },
++  { "Rate",       SbxDOUBLE,  0, NULL,0 },
++  { "ValueArray",       SbxARRAY,  0, NULL,0 },
+ { "Null",			SbxNULL,          _CPROP,    RTLNAME(Null),0			},
+ 
+ { "Oct",            SbxSTRING,    1 | _FUNCTION, RTLNAME(Oct),0             },
+@@ -427,16 +462,46 @@ static Methods aMethods[] = {
+   { "stop",  	    SbxLONG, 	0,NULL,0 },
+   { "interval",     SbxLONG, 	0,NULL,0 },
+ { "Pi",				SbxDOUBLE,		  _CPROP,    RTLNAME(PI),0		      	},
++
++{ "Pmt",      SbxDOUBLE,      5 | _FUNCTION | _COMPTMASK, RTLNAME(Pmt),0       },
++  { "Rate",       SbxDOUBLE,  0, NULL,0 },
++  { "NPer",       SbxDOUBLE,  0, NULL,0 },
++  { "PV",     SbxDOUBLE,  0, NULL,0 },
++  { "FV",     SbxVARIANT,  _OPT, NULL,0 },
++  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
++
++{ "PPmt",      SbxDOUBLE,      6 | _FUNCTION | _COMPTMASK, RTLNAME(PPmt),0       },
++  { "Rate",       SbxDOUBLE,  0, NULL,0 },
++  { "Per",       SbxDOUBLE,  0, NULL,0 },
++  { "NPer",       SbxDOUBLE,  0, NULL,0 },
++  { "PV",     SbxDOUBLE,  0, NULL,0 },
++  { "FV",     SbxVARIANT,  _OPT, NULL,0 },
++  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
++
+ { "Put",            SbxNULL,   3 | _FUNCTION, RTLNAME(Put),0                },
+   { "filenumber",   SbxINTEGER, 0,NULL,0 },
+   { "recordnumber", SbxLONG, 0,NULL,0 },
+   { "variablename",	SbxVARIANT, 0,NULL,0 },
+ 
++{ "PV",      SbxDOUBLE,      5 | _FUNCTION | _COMPTMASK, RTLNAME(PV),0       },
++  { "Rate",       SbxDOUBLE,  0, NULL,0 },
++  { "NPer",       SbxDOUBLE,  0, NULL,0 },
++  { "Pmt",     SbxDOUBLE,  0, NULL,0 },
++  { "FV",     SbxVARIANT,  _OPT, NULL,0 },
++  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
++
+ { "QBColor",		SbxLONG,	  1 | _FUNCTION, RTLNAME(QBColor),0			},
+   { "number",		SbxINTEGER, 0,NULL,0 },
+ 
+ { "Randomize",      SbxNULL,      1 | _FUNCTION, RTLNAME(Randomize),0       },
+   { "Number",       SbxDOUBLE,        _OPT, NULL,0 },
++{ "Rate",      SbxDOUBLE,      6 | _FUNCTION | _COMPTMASK, RTLNAME(Rate),0       },
++  { "NPer",       SbxDOUBLE,  0, NULL,0 },
++  { "Pmt",       SbxDOUBLE,  0, NULL,0 },
++  { "PV",       SbxDOUBLE,  0, NULL,0 },
++  { "FV",       SbxVARIANT,  _OPT, NULL,0 },
++  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
++  { "Guess",    SbxVARIANT,  _OPT, NULL,0 },
+ { "Red",        SbxINTEGER,   1 | _FUNCTION, RTLNAME(Red),0                 },
+   { "RGB-Value",     SbxLONG, 0,NULL,0 },
+ { "Reset",          SbxNULL,      0 | _FUNCTION, RTLNAME(Reset),0           },
+@@ -477,6 +542,7 @@ static Methods aMethods[] = {
+ { "SendKeys",       SbxNULL,      2 | _FUNCTION, RTLNAME(SendKeys),0        },
+   { "String",       SbxSTRING, 0,NULL,0 },
+   { "Wait",         SbxBOOL,          _OPT, NULL,0 },
++{ "DoEvents",       SbxINTEGER,      0 | _FUNCTION, RTLNAME(DoEvents),0        },
+ { "SetAttr",        SbxNULL,      2 | _FUNCTION, RTLNAME(SetAttr),0         },
+   { "File"  ,       SbxSTRING, 0,NULL,0 },
+   { "Attributes",   SbxINTEGER, 0,NULL,0 },
+@@ -490,6 +556,15 @@ static Methods aMethods[] = {
+   { "WindowStyle",  SbxINTEGER,       _OPT, NULL,0 },
+ { "Sin",            SbxDOUBLE,    1 | _FUNCTION, RTLNAME(Sin),0             },
+   { "number",       SbxDOUBLE, 0,NULL,0 },
++{ "SLN",            SbxDOUBLE,    2 |  _FUNCTION | _COMPTMASK, RTLNAME(SLN),0             },
++  { "Cost",       SbxDOUBLE, 0,NULL,0 },
++  { "Double",       SbxDOUBLE, 0,NULL,0 },
++  { "Life",       SbxDOUBLE, 0,NULL,0 },
++{ "SYD",            SbxDOUBLE,    2 |  _FUNCTION | _COMPTMASK, RTLNAME(SYD),0             },
++  { "Cost",       SbxDOUBLE, 0,NULL,0 },
++  { "Salvage",       SbxDOUBLE, 0,NULL,0 },
++  { "Life",       SbxDOUBLE, 0,NULL,0 },
++  { "Period",       SbxDOUBLE, 0,NULL,0 },
+ { "Space",          SbxSTRING,      1 | _FUNCTION, RTLNAME(Space),0         },
+   { "string",       SbxLONG, 0,NULL,0 },
+ { "Spc",          	SbxSTRING,      1 | _FUNCTION, RTLNAME(Spc),0           },
+@@ -604,6 +679,7 @@ static Methods aMethods[] = {
+ 
+ { "Wait",        	SbxNULL,      1 | _FUNCTION, RTLNAME(Wait),0            },
+   { "Milliseconds", SbxLONG, 0,NULL,0 },
++{ "FuncCaller",          SbxVARIANT,      _FUNCTION, RTLNAME(FuncCaller),0      },
+ //#i64882#
+ { "WaitUntil",          SbxNULL,      1 | _FUNCTION, RTLNAME(WaitUntil),0      },
+   { "Date", SbxDOUBLE, 0,NULL,0 },
+@@ -655,6 +731,11 @@ SbiStdObject::~SbiStdObject()
+ 
+ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
+ {
++	// #TODO #FIXME hack for substituting ooo-basic Err with vba-ish
++	// ErrObject object
++	static String sErr( RTL_CONSTASCII_USTRINGPARAM("Err") );
++	if (  rName.EqualsIgnoreCaseAscii( sErr ) ) 
++		return SbxErrObject::getErrObject();
+ 	// Bereits eingetragen?
+ 	SbxVariable* pVar = SbxObject::Find( rName, t );
+ 	if( !pVar )
+Index: basic/source/runtime/rtlproto.hxx
+===================================================================
+--- basic/source/runtime/rtlproto.hxx	(revision 276159)
++++ basic/source/runtime/rtlproto.hxx	(revision 276288)
+@@ -167,28 +167,41 @@ extern RTLFUNC(Kill); // JSM
+ extern RTLFUNC(MkDir); // JSM
+ extern RTLFUNC(RmDir); // JSM
+ extern RTLFUNC(SendKeys); // JSM
++extern RTLFUNC(DDB);
++extern RTLFUNC(DoEvents);
+ extern RTLFUNC(DimArray);
+ extern RTLFUNC(Dir);
+ extern RTLFUNC(Exp);
+ extern RTLFUNC(FileLen);
+ extern RTLFUNC(Fix);
++extern RTLFUNC(FV);
+ extern RTLFUNC(Hex);
+ extern RTLFUNC(Input);
+ extern RTLFUNC(InStr);
+ extern RTLFUNC(InStrRev);
+ extern RTLFUNC(Int);
++extern RTLFUNC(IPmt);
++extern RTLFUNC(IRR);
+ extern RTLFUNC(Join);
+ extern RTLFUNC(LCase);
+ extern RTLFUNC(Left);
+ extern RTLFUNC(Log);
+ extern RTLFUNC(LTrim);
+ extern RTLFUNC(Mid);
++extern RTLFUNC(MIRR);
++extern RTLFUNC(NPer);
++extern RTLFUNC(NPV);
+ extern RTLFUNC(Oct);
++extern RTLFUNC(Pmt);
++extern RTLFUNC(PPmt);
++extern RTLFUNC(PV);
++extern RTLFUNC(Rate);
+ extern RTLFUNC(Replace);
+ extern RTLFUNC(Right);
+ extern RTLFUNC(RTrim);
+ extern RTLFUNC(RTL);
+ extern RTLFUNC(Sgn);
++extern RTLFUNC(SLN);
+ extern RTLFUNC(Space);
+ extern RTLFUNC(Split);
+ extern RTLFUNC(Sqr);
+@@ -196,6 +209,7 @@ extern RTLFUNC(Str);
+ extern RTLFUNC(StrComp);
+ extern RTLFUNC(String);
+ extern RTLFUNC(StrReverse);
++extern RTLFUNC(SYD);
+ extern RTLFUNC(Tan);
+ extern RTLFUNC(UCase);
+ extern RTLFUNC(Val);
+@@ -298,6 +312,7 @@ extern RTLFUNC(Switch);
+ extern RTLFUNC(Wait);
+ //i#64882# add new WaitUntil
+ extern RTLFUNC(WaitUntil);
++extern RTLFUNC(FuncCaller);
+ 
+ extern RTLFUNC(GetGUIVersion);
+ extern RTLFUNC(Choose);
+Index: basic/source/runtime/step0.cxx
+===================================================================
+--- basic/source/runtime/step0.cxx	(revision 276159)
++++ basic/source/runtime/step0.cxx	(revision 276288)
+@@ -33,6 +33,7 @@
+ #include <vcl/msgbox.hxx>
+ #include <tools/fsys.hxx>
+ 
++#include "errobject.hxx"
+ #include "runtime.hxx"
+ #include "sbintern.hxx"
+ #include "iosys.hxx"
+@@ -47,6 +48,11 @@
+ 
+ #include <algorithm>
+ 
++// for a patch forward declaring these methods below makes sense
++// but, #FIXME lets really just move the methods to the top
++void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType );
++void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled );
++
+ SbxVariable* getDefaultProp( SbxVariable* pRef );
+ 
+ void SbiRuntime::StepNOP()
+@@ -58,34 +64,6 @@ void SbiRuntime::StepArith( SbxOperator eOp )
+ 	TOSMakeTemp();
+ 	SbxVariable* p2 = GetTOS();
+ 
+-
+-	// This could & should be moved to the MakeTempTOS() method in runtime.cxx
+-	// In the code which this is cut'npaste from there is a check for a ref
+-	// count != 1 based on which the copy of the SbxVariable is done.
+-	// see orig code in MakeTempTOS ( and I'm not sure what the significance,
+-	// of that is )
+-	// here we alway seem to have a refcount of 1. Also it seems that
+-	// MakeTempTOS is called for other operation, so I hold off for now
+-	// until I have a better idea
+-	if ( bVBAEnabled
+-		&& ( p2->GetType() == SbxOBJECT || p2->GetType() == SbxVARIANT )
+-	)
+-	{
+-		SbxVariable* pDflt = getDefaultProp( p2 );
+-		if ( pDflt )
+-		{
+-			pDflt->Broadcast( SBX_HINT_DATAWANTED );
+-			// replacing new p2 on stack causes object pointed by 
+-			// pDft->pParent to be deleted, when p2->Compute() is
+-			// called below pParent is accessed ( but its deleted )
+-			// so set it to NULL now
+-			pDflt->SetParent( NULL );  
+-			p2 = new SbxVariable( *pDflt );
+-			p2->SetFlag( SBX_READWRITE );
+-			refExprStk->Put( p2, nExprLvl - 1 );
+-		}
+-	}
+-
+ 	p2->ResetFlag( SBX_FIXED );
+ 	p2->Compute( eOp, *p1 );
+ 
+@@ -108,19 +86,24 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
+ 	// values ( and type ) set as appropriate
+ 	SbxDataType p1Type = p1->GetType(); 
+ 	SbxDataType p2Type = p2->GetType(); 
+-	if ( p1Type == p2Type )
+-	{
+ 		if ( p1Type == SbxEMPTY )
+ 		{
+ 			p1->Broadcast( SBX_HINT_DATAWANTED );
++		p1Type = p1->GetType(); 
++	}
++	if ( p2Type == SbxEMPTY )
++	{
+ 			p2->Broadcast( SBX_HINT_DATAWANTED );
++		p2Type = p2->GetType(); 
+ 		}
++	if ( p1Type == p2Type )
++	{
+ 		// if both sides are an object and have default props
+ 		// then we need to use the default props
+ 		// we don't need to worry if only one side ( lhs, rhs ) is an 
+ 		// object ( object side will get coerced to correct type in 
+ 		// Compare )
+-		else if ( p1Type ==  SbxOBJECT )
++		if ( p1Type ==  SbxOBJECT )
+ 		{
+ 			SbxVariable* pDflt = getDefaultProp( p1 );
+ 			if ( pDflt )
+@@ -140,9 +123,22 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
+ #ifndef WIN
+ 	static SbxVariable* pTRUE = NULL;
+ 	static SbxVariable* pFALSE = NULL;
+-
+-	if( p2->Compare( eOp, *p1 ) )
++	static SbxVariable* pNULL = NULL;
++	// why do this on non-windows ?
++	// why do this at all ?
++	// I dumbly follow the pattern :-/
++	if ( bVBAEnabled && ( p1->IsNull() || p2->IsNull() ) )	
+ 	{
++		if( !pNULL )
++		{
++			pNULL = new SbxVariable;
++			pNULL->PutNull();
++			pNULL->AddRef();
++		}
++		PushVar( pNULL );
++	}
++	else if( p2->Compare( eOp, *p1 ) )
++	{
+ 		if( !pTRUE )
+ 		{
+ 			pTRUE = new SbxVariable;
+@@ -162,9 +158,14 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
+ 		PushVar( pFALSE );
+ 	}
+ #else
++	SbxVariable* pRes = new SbxVariable;
++	if ( bVBAEnabled && ( p1->IsNull() || p2->IsNull() ) )	
++		pRes->PutNull();
++	else
++	{
+ 	BOOL bRes = p2->Compare( eOp, *p1 );
+-	SbxVariable* pRes = new SbxVariable;
+ 	pRes->PutBool( bRes );
++	}
+ 	PushVar( pRes );
+ #endif
+ }
+@@ -641,6 +642,17 @@ void SbiRuntime::StepDIM()
+ // #56204 DIM-Funktionalitaet in Hilfsmethode auslagern (step0.cxx)
+ void SbiRuntime::DimImpl( SbxVariableRef refVar )
+ {
++	// If refDim then this DIM statement is terminating a ReDIM and
++	// previous StepERASE_CLEAR for an array, the following actions have 
++	// been delayed from ( StepERASE_CLEAR ) 'till here
++	if ( refRedim ) 
++	{
++		if ( !refRedimpArray ) // only erase the array not ReDim Preserve
++			lcl_eraseImpl( refVar, bVBAEnabled );
++		SbxDataType eType = refVar->GetType();
++		lcl_clearImpl( refVar, eType );
++		refRedim = NULL;
++	}
+ 	SbxArray* pDims = refVar->GetParameters();
+ 	// Muss eine gerade Anzahl Argumente haben
+ 	// Man denke daran, dass Arg[0] nicht zaehlt!
+@@ -806,6 +818,7 @@ void SbiRuntime::StepREDIMP()
+ void SbiRuntime::StepREDIMP_ERASE()
+ {
+ 	SbxVariableRef refVar = PopVar();
++	refRedim = refVar;
+ 	SbxDataType eType = refVar->GetType();
+ 	if( eType & SbxARRAY )
+ 	{
+@@ -816,12 +829,6 @@ void SbiRuntime::StepREDIMP_ERASE()
+ 			refRedimpArray = pDimArray;
+ 		}
+ 
+-		// As in ERASE
+-		USHORT nSavFlags = refVar->GetFlags();
+-		refVar->ResetFlag( SBX_FIXED );
+-		refVar->SetType( SbxDataType(eType & 0x0FFF) );
+-		refVar->SetFlags( nSavFlags );
+-		refVar->Clear();
+ 	}
+ 	else
+ 	if( refVar->IsFixed() )
+@@ -894,10 +901,7 @@ void SbiRuntime::StepERASE()
+ 
+ void SbiRuntime::StepERASE_CLEAR()
+ {
+-	SbxVariableRef refVar = PopVar();
+-	lcl_eraseImpl( refVar, bVBAEnabled );
+-	SbxDataType eType = refVar->GetType();
+-	lcl_clearImpl( refVar, eType );
++	refRedim = PopVar();
+ }
+ 
+ void SbiRuntime::StepARRAYACCESS()
+@@ -1119,6 +1123,7 @@ void SbiRuntime::StepSTDERROR()
+ 	pInst->nErr = 0L;
+ 	pInst->nErl = 0;
+ 	nError = 0L;
++	SbxErrObject::getUnoErrObject()->Clear();
+ }
+ 
+ void SbiRuntime::StepNOERROR()
+@@ -1268,6 +1273,6 @@ void SbiRuntime::StepERROR()
+ 	SbxVariableRef refCode = PopVar();
+ 	USHORT n = refCode->GetUShort();
+ 	SbError error = StarBASIC::GetSfxFromVBError( n );
+-	Error( error );
++	pInst->Error( error );
+ }
+ 
+Index: basic/source/runtime/step1.cxx
+===================================================================
+--- basic/source/runtime/step1.cxx	(revision 276159)
++++ basic/source/runtime/step1.cxx	(revision 276288)
+@@ -94,6 +94,15 @@ void SbiRuntime::StepARGN( UINT32 nOp1 )
+ 	{
+ 		String aAlias( pImg->GetString( static_cast<short>( nOp1 ) ) );
+ 		SbxVariableRef pVal = PopVar();
++		if( bVBAEnabled && ( pVal->ISA(SbxMethod) || pVal->ISA(SbUnoProperty) || pVal->ISA(SbProcedureProperty) ) )
++		{
++			// named variables ( that are Any especially properties ) can be empty at this point and need a broadcast
++			if ( pVal->GetType() == SbxEMPTY )
++				pVal->Broadcast( SBX_HINT_DATAWANTED );
++			// Methoden und Properties evaluieren!
++			SbxVariable* pRes = new SbxVariable( *pVal );
++			pVal = pRes;
++		}
+ 		refArgv->Put( pVal, nArgc );
+ 		refArgv->PutAlias( aAlias, nArgc++ );
+ 	}
+@@ -183,7 +192,9 @@ void SbiRuntime::StepJUMPT( UINT32 nOp1 )
+ void SbiRuntime::StepJUMPF( UINT32 nOp1 )
+ {
+ 	SbxVariableRef p = PopVar();
+-	if( !p->GetBool() )
++	// In a test e.g. If Null then 	
++        // will evaluate Null will act as if False
++	if( ( bVBAEnabled && p->IsNull() ) || !p->GetBool() )
+ 		StepJUMP( nOp1 );
+ }
+ 
+Index: basic/source/runtime/step2.cxx
+===================================================================
+--- basic/source/runtime/step2.cxx	(revision 276159)
++++ basic/source/runtime/step2.cxx	(revision 276288)
+@@ -54,59 +54,6 @@ using namespace com::sun::star::script;
+ 
+ using com::sun::star::uno::Reference;
+ 
+-SbxVariable* getVBAConstant( const String& rName );
+-
+-const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") );
+-const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
+-//  i#i68894#
+-SbxArray* getVBAGlobals( )
+-{
+-	static SbxArrayRef pArray;
+-	static bool isInitialised = false;
+-	if ( isInitialised )
+-		return pArray;
+-	Reference < XComponentContext > xCtx;
+-	Reference < XPropertySet > xProps(
+-	::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
+-	xCtx.set( xProps->getPropertyValue( rtl::OUString(
+-		RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))),
+-			UNO_QUERY_THROW );
+-	SbUnoObject dGlobs( String( RTL_CONSTASCII_USTRINGPARAM("ExcelGlobals") ), xCtx->getValueByName( ::rtl::OUString::createFromAscii( "/singletons/ooo.vba.theGlobals") ) );
+-
+-	SbxVariable *vba = dGlobs.Find( String( RTL_CONSTASCII_USTRINGPARAM("getGlobals") ) , SbxCLASS_DONTCARE );
+-
+-	if ( vba )
+-	{
+-		pArray = static_cast<SbxArray *>(vba->GetObject());
+-		isInitialised = true;
+-		return pArray;
+-	}
+-	return NULL;
+-}
+-
+-//  i#i68894#
+-SbxVariable* VBAFind( const String& rName, SbxClassType t )
+-{
+-	if( rName == aThisComponent )
+-		return NULL;
+-
+-	SbxArray *pVBAGlobals = getVBAGlobals( );
+-	for (USHORT i = 0; pVBAGlobals && i < pVBAGlobals->Count(); i++)
+-	{
+-		SbxVariable *pElem = pVBAGlobals->Get( i );
+-		if (!pElem || !pElem->IsObject())
+-			continue;
+-		SbxObject *pVba = static_cast<SbxObject *>(pElem->GetObject());
+-		SbxVariable *pVbaVar = pVba ? pVba->Find( rName, t ) : NULL;
+-		if( pVbaVar )
+-		{
+-			return pVbaVar;
+-		}
+-	}
+-	return NULL;
+-
+-}
+-
+ // Suchen eines Elements
+ // Die Bits im String-ID:
+ // 0x8000 - Argv ist belegt
+@@ -191,11 +138,11 @@ SbxVariable* SbiRuntime::FindElement
+ 				if ( bVBAEnabled )
+ 				{
+ 					// Try Find in VBA symbols space
+-					pElem = VBAFind( aName, SbxCLASS_DONTCARE );
++					pElem = rBasic.VBAFind( aName, SbxCLASS_DONTCARE );
+ 					if ( pElem )
+ 						bSetName = false; // don't overwrite uno name
+ 					else
+-						pElem = getVBAConstant( aName );
++                        pElem = VBAConstantHelper::instance().getVBAConstant( aName );
+ 				}
+ 				// #72382 VORSICHT! Liefert jetzt wegen unbekannten
+ 				// Modulen IMMER ein Ergebnis!
+@@ -317,8 +264,10 @@ SbxVariable* SbiRuntime::FindElement
+ 			pElem = pNew;
+ 		}
+ 		// Index-Access bei UnoObjekten beruecksichtigen
+-		/*
+-		else if( pElem->ISA(SbUnoProperty) )
++		// definitely we want this for VBA where properties are often 
++		// collections ( which need index access ), but lets only do 
++		// this if we actually have params following
++		else if( bVBAEnabled && pElem->ISA(SbUnoProperty) && pElem->GetParameters() )
+ 		{
+ 			// pElem auf eine Ref zuweisen, um ggf. eine Temp-Var zu loeschen
+ 			SbxVariableRef refTemp = pElem;
+@@ -328,7 +277,6 @@ SbxVariable* SbiRuntime::FindElement
+ 			pElem->SetParameters( NULL ); // sonst bleibt Ref auf sich selbst
+ 			pElem = pNew;
+ 		}
+-		*/
+ 	}
+ 	return CheckArray( pElem );
+ }
+@@ -431,7 +379,8 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32
+ 				bool bError_ = true;
+ 
+ 				SbUnoMethod* pUnoMethod = PTR_CAST(SbUnoMethod,p);
+-				if( pUnoMethod )
++				SbUnoProperty* pUnoProperty = PTR_CAST(SbUnoProperty,p);
++				if( pUnoMethod || pUnoProperty )
+ 				{
+ 					SbUnoObject* pParentUnoObj = PTR_CAST( SbUnoObject,p->GetParent() );
+ 					if( pParentUnoObj )
+@@ -509,7 +458,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable*
+ {
+ 	// Falls wir ein Array haben, wollen wir bitte das Array-Element!
+ 	SbxArray* pPar;
+-	if( pElem->GetType() & SbxARRAY )
++	if( ( pElem->GetType() & SbxARRAY ) && (SbxVariable*)refRedim != pElem )
+ 	{
+ 		SbxBase* pElemObj = pElem->GetObject();
+ 		SbxDimArray* pDimArray = PTR_CAST(SbxDimArray,pElemObj);
+@@ -774,6 +723,8 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nO
+ 		SaveRef( q );
+ 		*q = *p;
+ 		p = q;
++		if ( i ) 
++                	refParams->Put( p, i );
+ 	}
+ 	SetupArgs( p, nOp1 );
+ 	PushVar( CheckArray( p ) );
+@@ -1186,16 +1137,26 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 n
+ 	if( pImg->GetFlag( SBIMG_CLASSMODULE ) )
+ 		StepPUBLIC_Impl( nOp1, nOp2, true );
+ 
++        SbxObject* pStorage = &rBasic;
+ 	String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
++	// Store module scope variables at module scope 
++	// in non vba mode these are stored at the library level :/
++	// not sure if this really should not be enabled for ALL basic
++	if ( SbiRuntime::isVBAEnabled() ) 
++        {
++            pStorage = pMod;
++            pMod->AddVarName( aName );
++        }
++
+ 	SbxDataType t = (SbxDataType) nOp2;
+-	BOOL bFlag = rBasic.IsSet( SBX_NO_MODIFY );
++	BOOL bFlag = pStorage->IsSet( SBX_NO_MODIFY );
+ 	rBasic.SetFlag( SBX_NO_MODIFY );
+-	SbxVariableRef p = rBasic.Find( aName, SbxCLASS_PROPERTY );
++	SbxVariableRef p = pStorage->Find( aName, SbxCLASS_PROPERTY );
+ 	if( p.Is() )
+-		rBasic.Remove (p);
+-	p = rBasic.Make( aName, SbxCLASS_PROPERTY, t );
++		pStorage->Remove (p);
++	p = pStorage->Make( aName, SbxCLASS_PROPERTY, t );
+ 	if( !bFlag )
+-		rBasic.ResetFlag( SBX_NO_MODIFY );
++		pStorage->ResetFlag( SBX_NO_MODIFY );
+ 	if( p )
+ 	{
+ 		p->SetFlag( SBX_DONTSTORE );
+Index: basic/source/runtime/methods.cxx
+===================================================================
+--- basic/source/runtime/methods.cxx	(revision 276159)
++++ basic/source/runtime/methods.cxx	(revision 276288)
+@@ -51,6 +51,7 @@
+ #include <unotools/ucbstreamhelper.hxx>
+ #include <tools/wldcrd.hxx>
+ #include <i18npool/lang.h>
++#include <rtl/string.hxx>
+ 
+ #include "runtime.hxx"
+ #include "sbunoobj.hxx"
+@@ -77,13 +78,16 @@
+ #include <com/sun/star/io/XOutputStream.hpp>
+ #include <com/sun/star/io/XStream.hpp>
+ #include <com/sun/star/io/XSeekable.hpp>
+-
++#include <com/sun/star/script/XErrorQuery.hpp>
++#include <ooo/vba/XHelperInterface.hpp>
++#include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
+ using namespace comphelper;
+ using namespace osl;
+ using namespace com::sun::star::uno;
+ using namespace com::sun::star::lang;
+ using namespace com::sun::star::ucb;
+ using namespace com::sun::star::io;
++using namespace com::sun::star::script;
+ 
+ #endif /* _USE_UNO */
+ 
+@@ -105,6 +109,8 @@ using namespace com::sun::star::io;
+ #include <stdlib.h>
+ #include <ctype.h>
+ 
++SbxVariable* getDefaultProp( SbxVariable* pRef );
++
+ #if defined (WIN) || defined (WNT) || defined (OS2)
+ #include <direct.h>   // _getdcwd get current work directory, _chdrive
+ #endif
+@@ -123,6 +129,10 @@ using namespace com::sun::star::io;
+ #include <io.h>
+ #endif
+ 
++using namespace rtl;
++
++#include <basic/sbobjmod.hxx>
++
+ static void FilterWhiteSpace( String& rStr )
+ {
+ 	rStr.EraseAllChars( ' ' );
+@@ -837,6 +847,15 @@ RTLFUNC(SendKeys) // JSM
+ 	StarBASIC::Error(SbERR_NOT_IMPLEMENTED);
+ }
+ 
++// Stub, basic already yields by default
++RTLFUNC(DoEvents)
++{
++    (void)pBasic;
++    (void)bWrite;
++
++	rPar.Get(0)->PutInteger( 0 );
++}
++
+ RTLFUNC(Exp)
+ {
+     (void)pBasic;
+@@ -919,6 +938,26 @@ RTLFUNC(Hex)
+ 	}
+ }
+ 
++RTLFUNC(FuncCaller)
++{
++    (void)pBasic;
++    (void)bWrite;
++    if ( SbiRuntime::isVBAEnabled() &&  pINST && pINST->pRun )
++    {
++        if ( pINST->pRun->GetExternalCaller() )
++            *rPar.Get(0) =  *pINST->pRun->GetExternalCaller();
++        else
++        {
++            SbxVariableRef pVar = new SbxVariable(SbxVARIANT);
++            *rPar.Get(0) = *pVar;
++        }
++    }
++    else
++    {
++        StarBASIC::Error( SbERR_NOT_IMPLEMENTED );
++    }
++
++}
+ // InStr( [start],string,string,[compare] )
+ 
+ RTLFUNC(InStr)
+@@ -2390,8 +2429,19 @@ RTLFUNC(IsEmpty)
+ 	if ( rPar.Count() < 2 )
+ 		StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ 	else
++	{
++		SbxVariable* pVar = NULL;
++		if( SbiRuntime::isVBAEnabled() )
++			pVar = getDefaultProp( rPar.Get(1) );
++		if ( pVar )
++		{
++			pVar->Broadcast( SBX_HINT_DATAWANTED );
++			rPar.Get( 0 )->PutBool( pVar->IsEmpty() );
++		}
++		else
+ 		rPar.Get( 0 )->PutBool( rPar.Get(1)->IsEmpty() );
+ }
++}
+ 
+ RTLFUNC(IsError)
+ {
+@@ -2401,8 +2451,23 @@ RTLFUNC(IsError)
+ 	if ( rPar.Count() < 2 )
+ 		StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ 	else
++	{
++		SbxVariable* pVar =rPar.Get( 1 );
++		SbUnoObject* pObj = PTR_CAST(SbUnoObject,pVar );
++                if ( !pObj )
++                { 
++                    if ( SbxBase* pBaseObj = pVar->GetObject() )
++                        pObj = PTR_CAST(SbUnoObject, pBaseObj );
++                }
++		Reference< XErrorQuery > xError;
++		if ( pObj )
++			xError.set( pObj->getUnoAny(), UNO_QUERY );
++		if ( xError.is() )
++			rPar.Get( 0 )->PutBool( xError->hasError() );
++		else
+ 		rPar.Get( 0 )->PutBool( rPar.Get(1)->IsErr() );
+ }
++}
+ 
+ RTLFUNC(IsNull)
+ {
+@@ -3606,6 +3671,65 @@ String getBasicTypeName( SbxDataType eType )
+ 	return aRetStr;
+ }
+ 
++String getObjectTypeName( SbxVariable* pVar )
++{
++    rtl::OUString sRet( RTL_CONSTASCII_USTRINGPARAM("Object") );
++    if ( pVar )
++    {
++        SbxBase* pObj = pVar->GetObject();
++        if( !pObj )
++           sRet = String( RTL_CONSTASCII_USTRINGPARAM("Nothing") );
++        else
++        {
++            SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,pVar );
++            if ( !pUnoObj )
++            { 
++                if ( SbxBase* pBaseObj = pVar->GetObject() )
++                    pUnoObj = PTR_CAST(SbUnoObject, pBaseObj );
++            }
++            if ( pUnoObj )
++            { 
++                Any aObj = pUnoObj->getUnoAny();
++                // For upstreaming unless we start to build oovbaapi by default
++                // we need to get detect the vba-ness of the object in some
++                // other way        
++                // note: Automation objects do not support XServiceInfo
++                Reference< XServiceInfo > xServInfo( aObj, UNO_QUERY );
++                if ( xServInfo.is() )
++                {
++                    // is this a VBA object ?
++                    Reference< ooo::vba::XHelperInterface > xVBA( aObj, UNO_QUERY );
++                    Sequence< rtl::OUString > sServices = xServInfo->getSupportedServiceNames();
++                    if ( sServices.getLength() )
++                        sRet = sServices[ 0 ];
++                }
++                else
++                {
++                    Reference< com::sun::star::bridge::oleautomation::XAutomationObject > xAutoMation( aObj, UNO_QUERY );
++                    if ( xAutoMation.is() )
++                    {
++                        Reference< XInvocation > xInv( aObj, UNO_QUERY );
++                        if ( xInv.is() )
++                        {
++                            try
++                            {
++                                xInv->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$GetTypeName") ) ) >>= sRet;
++                            }
++                            catch( Exception& )
++                            {
++                            }
++                        }
++                    }
++                }
++                sal_Int32 nDot = sRet.lastIndexOf( '.' );
++                if ( nDot != -1 && nDot < sRet.getLength() )
++                       sRet = sRet.copy( nDot + 1 );
++            }
++        }
++    }         
++    return sRet;
++}
++
+ RTLFUNC(TypeName)
+ {
+     (void)pBasic;
+@@ -3617,7 +3741,12 @@ RTLFUNC(TypeName)
+ 	{
+ 		SbxDataType eType = rPar.Get(1)->GetType();
+ 		BOOL bIsArray = ( ( eType & SbxARRAY ) != 0 );
+-		String aRetStr = getBasicTypeName( eType );
++
++        String aRetStr;
++        if ( SbiRuntime::isVBAEnabled() && eType == SbxOBJECT )
++            aRetStr = getObjectTypeName( rPar.Get(1) );
++        else
++            aRetStr = getBasicTypeName( eType );
+ 		if( bIsArray )
+ 			aRetStr.AppendAscii( "()" );
+ 		rPar.Get(0)->PutString( aRetStr );
+@@ -4109,8 +4238,13 @@ RTLFUNC(Load)
+ 
+ 	// Diesen Call einfach an das Object weiterreichen
+ 	SbxBase* pObj = (SbxObject*)rPar.Get(1)->GetObject();
+-	if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
++	if( pObj && pObj->IsA( TYPE( SbUserFormModule ) ) )
+ 	{
++		SbUserFormModule* pFormModule = ( SbUserFormModule* )pObj;
++		pFormModule->load();
++	}
++	else if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
++	{
+ 		SbxVariable* pVar = ((SbxObject*)pObj)->
+ 			Find( String( RTL_CONSTASCII_USTRINGPARAM("Load") ), SbxCLASS_METHOD );
+ 		if( pVar )
+@@ -4132,8 +4266,13 @@ RTLFUNC(Unload)
+ 
+ 	// Diesen Call einfach an das Object weitereichen
+ 	SbxBase* pObj = (SbxObject*)rPar.Get(1)->GetObject();
+-	if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
++	if( pObj && pObj->IsA( TYPE( SbUserFormModule ) ) )
+ 	{
++		SbUserFormModule* pFormModule = ( SbUserFormModule* )pObj;
++		pFormModule->Unload();
++	}
++	else if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
++	{
+ 		SbxVariable* pVar = ((SbxObject*)pObj)->
+ 			Find( String( RTL_CONSTASCII_USTRINGPARAM("Unload") ), SbxCLASS_METHOD );
+ 		if( pVar )
+Index: basic/source/inc/expr.hxx
+===================================================================
+--- basic/source/inc/expr.hxx	(revision 276159)
++++ basic/source/inc/expr.hxx	(revision 276288)
+@@ -144,6 +144,7 @@ class SbiExprNode {                  // Operatoren
+ 	SbiExprNode* GetRealNode();		// letzter Knoten in x.y.z
+ 	short GetDepth();               // Tiefe eines Baumes berechnen
+ 	const String& GetString() 		{ return aStrVal; }
++	short GetNumber() 		{ return (short)nVal; }
+ 	SbiExprList* GetParameters()	{ return aVar.pPar; }
+ 	SbiExprListVector* GetMoreParameters()	{ return aVar.pvMorePar; }
+ 
+Index: basic/source/inc/errobject.hxx
+===================================================================
+--- basic/source/inc/errobject.hxx	(revision 0)
++++ basic/source/inc/errobject.hxx	(revision 276288)
+@@ -0,0 +1,16 @@
++#ifndef ERROBJECT_HXX
++#define ERROBJECT_HXX
++#include "sbunoobj.hxx"
++#include <ooo/vba/XErrObject.hpp>
++
++
++class SbxErrObject : public SbUnoObject
++{
++	com::sun::star::uno::Reference< ooo::vba::XErrObject > m_xErr;
++	SbxErrObject( const String& aName_, const com::sun::star::uno::Any& aUnoObj_ );
++	~SbxErrObject();
++public:
++	static SbxVariableRef getErrObject();
++	static com::sun::star::uno::Reference< ooo::vba::XErrObject > getUnoErrObject();
++};
++#endif
+Index: basic/source/inc/token.hxx
+===================================================================
+--- basic/source/inc/token.hxx	(revision 276159)
++++ basic/source/inc/token.hxx	(revision 276288)
+@@ -75,7 +75,7 @@ enum SbiToken {
+ 	IF, _IN_, INPUT,
+ 	LET, LINE, LINEINPUT, LOCAL, LOOP, LPRINT, LSET,
+ 	NAME, NEW, NEXT,
+-	ON, OPEN, OPTION, IMPLEMENTS,
++	ON, OPEN, OPTION, ATTRIBUTE, IMPLEMENTS,
+ 	PRINT, PRIVATE, PROPERTY, PUBLIC,
+ 	REDIM, REM, RESUME, RETURN, RSET,
+ 	SELECT, SET, SHARED, STATIC, STEP, STOP, SUB,
+@@ -162,6 +162,10 @@ class SbiTokenizer : public SbiScanner {
+ 		{ return BOOL( t >= FIRSTKWD && t <= LASTKWD ); }
+ 	static BOOL IsExtra( SbiToken t )
+ 		{ return BOOL( t >= FIRSTEXTRA ); }
++
++    // process somthing like dim Name as String
++	virtual BOOL IsSymbol( SbiToken )
++        { return FALSE; }
+ };
+ 
+ 
+Index: basic/source/inc/sbunoobj.hxx
+===================================================================
+--- basic/source/inc/sbunoobj.hxx	(revision 276159)
++++ basic/source/inc/sbunoobj.hxx	(revision 276288)
+@@ -45,6 +45,7 @@
+ #include <com/sun/star/reflection/XIdlClass.hpp>
+ #include <com/sun/star/reflection/XServiceTypeDescription2.hpp> 
+ #include <rtl/ustring.hxx>
++#include <hash_map>
+ 
+ class SbUnoObject: public SbxObject
+ {
+@@ -305,6 +306,26 @@ class BasicCollection : public SbxObject
+ 	virtual void Clear();
+ };
+ 
++typedef std::hash_map< ::rtl::OUString, ::com::sun::star::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
++
++typedef std::vector< rtl::OUString > VBAConstantsVector;
++
++class VBAConstantHelper
++{
++private:
++
++    VBAConstantsVector aConstCache;
++    VBAConstantsHash aConstHash;
++    bool isInited;
++    VBAConstantHelper():isInited( false ) {}
++    VBAConstantHelper(const VBAConstantHelper&);
++    void init();
++public:    
++    static VBAConstantHelper& instance(); 
++    SbxVariable* getVBAConstant( const String& rName );
++    bool isVBAConstantType( const String& rName );
++};
++
+ #endif
+ 
+ 
+Index: basic/source/inc/image.hxx
+===================================================================
+--- basic/source/inc/image.hxx	(revision 276159)
++++ basic/source/inc/image.hxx	(revision 276288)
+@@ -109,6 +109,5 @@ class SbiImage {
+ #define	SBIMG_COMPARETEXT	0x0002	// OPTION COMPARE TEXT ist aktiv
+ #define	SBIMG_INITCODE		0x0004	// Init-Code vorhanden
+ #define	SBIMG_CLASSMODULE	0x0008	// OPTION ClassModule is active
+-#define	SBIMG_VBASUPPORT	0x0020	// OPTION VBASupport is 1
+ 
+ #endif
+Index: basic/source/inc/runtime.hxx
+===================================================================
+--- basic/source/inc/runtime.hxx	(revision 276159)
++++ basic/source/inc/runtime.hxx	(revision 276288)
+@@ -206,7 +206,6 @@ class SbiInstance
+ 	BOOL			bCompatibility; // Flag: TRUE = VBA runtime compatibility mode
+ 
+     ComponentVector_t ComponentVector;
+-
+ public:
+ 	SbiRuntime*  pRun;        		// Call-Stack
+ 	SbiInstance* pNext;             // Instanzen-Chain
+@@ -293,7 +292,9 @@ class SbiRuntime
+ 	SbxArrayRef   refExprStk;       // expression stack
+ 	SbxArrayRef   refCaseStk;       // CASE expression stack
+ 	SbxArrayRef   refRedimpArray;   // Array saved to use for REDIM PRESERVE
++	SbxVariableRef   refRedim;   // Array saved to use for REDIM
+ 	SbxVariableRef xDummyVar;		// Ersatz fuer nicht gefundene Variablen
++	SbxVariable* mpExtCaller;		// Caller ( external - e.g. button name, shape, range object etc. - only in vba mode )
+ 	SbiArgvStack*  pArgvStk;		// ARGV-Stack
+ 	SbiGosubStack* pGosubStk;		// GOSUB stack
+ 	SbiForStack*   pForStk;			// FOR/NEXT-Stack
+@@ -436,7 +437,7 @@ class SbiRuntime
+ 	void StepFIND_CM( UINT32, UINT32 );
+ 	void StepFIND_STATIC( UINT32, UINT32 );
+ public:
+-	void          SetVBAEnabled( bool bEnabled ) { bVBAEnabled = bEnabled; };
++	void          SetVBAEnabled( bool bEnabled );           
+ 	USHORT		GetImageFlag( USHORT n ) const;
+ 	USHORT		GetBase();
+ 	xub_StrLen  nLine,nCol1,nCol2;	// aktuelle Zeile, Spaltenbereich
+@@ -461,6 +462,7 @@ class SbiRuntime
+ 	SbMethod* GetCaller();
+ 	SbxArray* GetLocals();
+ 	SbxArray* GetParams();
++	SbxVariable* GetExternalCaller(){ return mpExtCaller; }
+ 
+ 	SbxBase* FindElementExtern( const String& rName );
+ 	static bool isVBAEnabled();
+Index: basic/source/inc/scriptcont.hxx
+===================================================================
+--- basic/source/inc/scriptcont.hxx	(revision 276159)
++++ basic/source/inc/scriptcont.hxx	(revision 276288)
+@@ -120,7 +120,9 @@ class SfxScriptLibraryContainer : public SfxLibrar
+         throw (::com::sun::star::lang::IllegalArgumentException, 
+                ::com::sun::star::container::NoSuchElementException, 
+                ::com::sun::star::uno::RuntimeException);
+-
++    // XLibraryQueryExecutable
++    virtual sal_Bool SAL_CALL HasExecutableCode(const rtl::OUString&)
++        throw (::com::sun::star::uno::RuntimeException);
+     // Methods XServiceInfo
+     virtual ::rtl::OUString SAL_CALL getImplementationName( )
+         throw (::com::sun::star::uno::RuntimeException);
+Index: basic/source/inc/dlgcont.hxx
+===================================================================
+--- basic/source/inc/dlgcont.hxx	(revision 276159)
++++ basic/source/inc/dlgcont.hxx	(revision 276288)
+@@ -96,7 +96,9 @@ class SfxDialogLibraryContainer : public SfxLibrar
+         throw (::com::sun::star::uno::RuntimeException);
+     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+         throw (::com::sun::star::uno::RuntimeException);
+-
++    // XLibraryQueryExecutable
++    virtual sal_Bool SAL_CALL HasExecutableCode(const rtl::OUString&)
++        throw (::com::sun::star::uno::RuntimeException);
+     // Service
+ 	static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static();
+ 	static ::rtl::OUString getImplementationName_static();
+Index: basic/source/inc/parser.hxx
+===================================================================
+--- basic/source/inc/parser.hxx	(revision 276159)
++++ basic/source/inc/parser.hxx	(revision 276288)
+@@ -40,6 +40,7 @@
+ typedef ::std::vector< String > IfaceVector;
+ 
+ struct SbiParseStack;
++struct SbiStatement;
+ 
+ class SbiParser : public SbiTokenizer
+ {
+@@ -53,6 +54,7 @@ class SbiParser : public SbiTokenizer
+ 	BOOL		bGblDefs; 			// TRUE globale Definitionen allgemein
+ 	BOOL		bNewGblDefs; 		// TRUE globale Definitionen vor Sub
+ 	BOOL		bSingleLineIf; 		// TRUE einzeiliges if-Statement
++	SbiStatement* pCurStat;
+ 
+ 	SbiSymDef*  VarDecl( SbiDimList**,BOOL,BOOL );// Variablen-Deklaration
+ 	SbiProcDef* ProcDecl(BOOL bDecl);// Prozedur-Deklaration
+@@ -66,6 +68,7 @@ class SbiParser : public SbiTokenizer
+ 	void StmntBlock( SbiToken ); 	// Statement-Block abarbeiten
+ 	void DefType( BOOL bPrivate );	// Parse type declaration
+ 	void DefEnum( BOOL bPrivate );	// Parse enum declaration
++	void DefDeclare( BOOL bPrivate );
+ 	void EnableCompatibility();	
+ public:
+ 	SbxArrayRef	  rTypeArray;		// das Type-Array
+@@ -100,6 +103,7 @@ class SbiParser : public SbiTokenizer
+ 	BOOL TestSymbol( BOOL=FALSE );	// Symbol?
+ 	BOOL TestComma();				// Komma oder EOLN?
+ 	void TestEoln();				// EOLN?
++	virtual BOOL IsSymbol( SbiToken t ); // Process something like DIM Name as String
+ 
+ 	void Symbol();					// Let oder Call
+ 	void ErrorStmnt(); 				// ERROR n
+@@ -108,6 +112,7 @@ class SbiParser : public SbiTokenizer
+ 	void BadSyntax();				// Falsches SbiToken
+ 	void NoIf();					// ELSE/ELSE IF ohne IF
+ 	void Assign();					// LET
++	void Attribute();				// Attribute
+ 	void Call();					// CALL
+ 	void Close();					// CLOSE
+ 	void Declare();					// DECLARE
+Index: basic/source/inc/namecont.hxx
+===================================================================
+--- basic/source/inc/namecont.hxx	(revision 276159)
++++ basic/source/inc/namecont.hxx	(revision 276288)
+@@ -38,6 +38,7 @@
+ #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
+ #include <com/sun/star/script/XLibraryContainerPassword.hpp>
+ #include <com/sun/star/script/XLibraryContainerExport.hpp>
++#include <com/sun/star/script/XLibraryQueryExecutable.hpp>
+ #include <com/sun/star/container/XNameContainer.hpp>
+ #include <com/sun/star/container/XContainer.hpp>
+ #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+@@ -61,19 +62,24 @@
+ 
+ #include <cppuhelper/implbase2.hxx>
+ #include <cppuhelper/compbase6.hxx>
++#include <cppuhelper/compbase7.hxx>
++#include <cppuhelper/compbase8.hxx>
+ #include <cppuhelper/interfacecontainer.hxx>
++#include <com/sun/star/script/XVBACompat.hpp>
+ 
+ class BasicManager;
+ 
+ namespace basic
+ {
+ 
+-typedef ::cppu::WeakComponentImplHelper6< 
++typedef ::cppu::WeakComponentImplHelper8< 
+     ::com::sun::star::lang::XInitialization,
+     ::com::sun::star::script::XStorageBasedLibraryContainer,
+     ::com::sun::star::script::XLibraryContainerPassword,
+     ::com::sun::star::script::XLibraryContainerExport,
+     ::com::sun::star::container::XContainer,
++    ::com::sun::star::script::XLibraryQueryExecutable,
++	::com::sun::star::script::XVBACompat,
+     ::com::sun::star::lang::XServiceInfo > LibraryContainerHelper;
+ 
+ typedef ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameContainer,
+@@ -496,6 +502,10 @@ class SfxLibraryContainer   :public LibraryContain
+         throw (::com::sun::star::uno::RuntimeException);
+     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+         throw (::com::sun::star::uno::RuntimeException) = 0;
++
++	// Methods XVBACompat
++	virtual ::sal_Bool SAL_CALL getVBACompatModeOn() throw (::com::sun::star::uno::RuntimeException);
++	virtual void SAL_CALL setVBACompatModeOn( ::sal_Bool _vbacompatmodeon ) throw (::com::sun::star::uno::RuntimeException);
+ };
+ 
+ class LibraryContainerMethodGuard
+Index: basic/source/inc/codegen.hxx
+===================================================================
+--- basic/source/inc/codegen.hxx	(revision 276159)
++++ basic/source/inc/codegen.hxx	(revision 276288)
+@@ -56,6 +56,7 @@ class SbiCodeGen { 				// Code-Erzeugung:
+ 	void GenStmnt();			// evtl. Statement-Opcode erzeugen
+ 	UINT32 GetPC();
+ 	UINT32 GetOffset()				{ return GetPC() + 1; }
++    SbModule& GetModule() { return rMod; } 
+ 	void Save();
+ 
+ 	// #29955 for-Schleifen-Ebene pflegen
+Index: basic/source/basmgr/basmgr.cxx
+===================================================================
+--- basic/source/basmgr/basmgr.cxx	(revision 276159)
++++ basic/source/basmgr/basmgr.cxx	(revision 276288)
+@@ -44,9 +44,11 @@
+ #include <tools/debug.hxx>
+ #include <tools/diagnose_ex.h>
+ #include <basic/sbmod.hxx>
++#include <basic/sbobjmod.hxx>
+ 
+ #include <basic/sbuno.hxx>
+ #include <basic/basmgr.hxx>
++#include <sbunoobj.hxx>
+ #include "basrid.hxx"
+ #include "sbintern.hxx"
+ #include <sb.hrc>
+@@ -67,6 +69,8 @@
+ #include <com/sun/star/script/XStarBasicDialogInfo.hpp>
+ #include <com/sun/star/script/XStarBasicLibraryInfo.hpp>
+ #include <com/sun/star/script/XLibraryContainerPassword.hpp>
++#include <com/sun/star/script/ModuleInfo.hpp>
++#include <com/sun/star/script/ModuleType.hpp>
+ 
+ #include <cppuhelper/implbase1.hxx>
+ 
+@@ -243,11 +247,20 @@ void BasMgrContainerListenerImpl::addLibraryModule
+ 		{
+ 			::rtl::OUString aModuleName = pNames[ j ];
+ 			Any aElement = xLibNameAccess->getByName( aModuleName );
++            ModuleInfo mInfo;
++            if ( aElement >>= mInfo )
++            {
++                OSL_TRACE("#addLibraryModulesImpl - aMod");
++                pLib->MakeModule32( mInfo );
++            }
++            else
++            {
+ 			::rtl::OUString aMod;
+ 			aElement >>= aMod;
+ 			pLib->MakeModule32( aModuleName, aMod );
+ 		}
+ 	}
++	}
+ 
+ 	pLib->SetModified( FALSE );
+ }
+@@ -282,8 +295,6 @@ void SAL_CALL BasMgrContainerListenerImpl::element
+ 	}
+ 	else
+ 	{
+-		::rtl::OUString aMod;
+-		Event.Element >>= aMod;
+ 
+ 		StarBASIC* pLib = mpMgr->GetLib( maLibName );
+ 		DBG_ASSERT( pLib, "BasMgrContainerListenerImpl::elementInserted: Unknown lib!");
+@@ -292,7 +303,17 @@ void SAL_CALL BasMgrContainerListenerImpl::element
+     		SbModule* pMod = pLib->FindModule( aName );
+             if( !pMod )
+             {
++                ModuleInfo mInfo;
++                if( Event.Element >>= mInfo )
++                {
++                    pLib->MakeModule32( mInfo );
++                }
++                else
++                {
++        		    ::rtl::OUString aMod;
++        		    Event.Element >>= aMod;
+ 			    pLib->MakeModule32( aName, aMod );
++                }
+ 			    pLib->SetModified( FALSE );
+             }
+ 		}
+@@ -316,15 +337,35 @@ void SAL_CALL BasMgrContainerListenerImpl::element
+     DBG_ASSERT( !bLibContainer, "library container fired elementReplaced()");
+ 
+ 	StarBASIC* pLib = mpMgr->GetLib( maLibName );
++    
+ 	if( pLib )
+ 	{
+ 		SbModule* pMod = pLib->FindModule( aName );
+ 		::rtl::OUString aMod;
++        ModuleInfo mInfo;
++        if( Event.Element >>= mInfo )
++			aMod = mInfo.ModuleSource;
++        else 
+ 		Event.Element >>= aMod;
+ 		if( pMod )
++		{
+ 			pMod->SetSource32( aMod );
++			if ( mInfo.ModuleType == ModuleType::Document )
++			{
++				SbObjModule* pObjModule = dynamic_cast< SbObjModule* >( pMod );
++				if ( pObjModule )	
++					pObjModule->SetUnoObject( makeAny( mInfo.ModuleObject ) );
++			}
++		}
+ 		else
++			// Probably we should have an assert for
++			// unknow module type, e.g. either we are using
++			// the ModuleInfo structure ( vba ) for *all* modules
++			// or not ( normal )
++			if ( mInfo.ModuleType == ModuleType::Unknown )
+ 			pLib->MakeModule32( aName, aMod );
++			else
++				pLib->MakeModule32( mInfo );
+ 
+ 		pLib->SetModified( FALSE );
+ 	}
+@@ -1121,6 +1162,25 @@ void BasicManager::LegacyDeleteBasicManager( Basic
+     _rpManager = NULL;
+ }
+ 
++
++bool BasicManager::HasExeCode( const String& sLib )
++{
++	StarBASIC* pLib = GetLib(sLib);	
++	if ( pLib )
++	{
++		SbxArray* pMods = pLib->GetModules();
++		USHORT nMods = pMods ? pMods->Count() : 0;
++		for( USHORT i = 0; i < nMods; i++ )
++		{
++			SbModule* p = (SbModule*) pMods->Get( i );
++			if ( p )
++				if ( p->HasExeCode() )
++					return true;
++		}
++	}
++	return false;
++}
++
+ void BasicManager::Init()
+ {
+ 	DBG_CHKTHIS( BasicManager, 0 );
+@@ -1767,6 +1827,15 @@ BasicError* BasicManager::GetNextError()
+ 	DBG_CHKTHIS( BasicManager, 0 );
+ 	return pErrorMgr->GetNextError();
+ }
++bool BasicManager::GetGlobalUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
++{
++    bool bRes = false;
++    StarBASIC* pStandardLib = GetStdLib();
++    OSL_PRECOND( pStandardLib, "BasicManager::SetGlobalUNOConstant: no lib to insert into!" );
++    if ( pStandardLib )
++        bRes = pStandardLib->GetUNOConstant( _pAsciiName, aOut );
++    return bRes;
++}
+ 
+ Any BasicManager::SetGlobalUNOConstant( const sal_Char* _pAsciiName, const Any& _rValue )
+ {
+Index: basic/source/sbx/sbxvalue.cxx
+===================================================================
+--- basic/source/sbx/sbxvalue.cxx	(revision 276159)
++++ basic/source/sbx/sbxvalue.cxx	(revision 276288)
+@@ -1147,8 +1147,8 @@ BOOL SbxValue::Compute( SbxOperator eOp, const Sbx
+ 	{
+ 		SbxValues aL, aR;
+ 		bool bDecimal = false;
+-		if( bVBAInterop && ( ( eThisType == SbxSTRING && eOpType != SbxSTRING ) || 
+-			 ( eThisType != SbxSTRING && eOpType == SbxSTRING ) ) &&
++		if( bVBAInterop && ( ( eThisType == SbxSTRING && eOpType != SbxSTRING && eOpType != SbxEMPTY ) || 
++			 ( eThisType != SbxSTRING && eThisType != SbxEMPTY && eOpType == SbxSTRING ) ) &&
+ 			 ( eOp == SbxMUL || eOp == SbxDIV || eOp == SbxPLUS || eOp == SbxMINUS ) )
+ 		{
+ 			goto Lbl_OpIsDouble;
+@@ -1195,6 +1195,8 @@ BOOL SbxValue::Compute( SbxOperator eOp, const Sbx
+ 					aL.eType = aR.eType = GetType();
+ //				else if( GetType() == SbxDouble || GetType() == SbxSingle )
+ //					aL.eType = aR.eType = SbxLONG64;
++				else if ( bVBAInterop && eOpType == SbxBOOL )
++					aL.eType = aR.eType = SbxBOOL;
+ 				else
+ 					aL.eType = aR.eType = SbxLONG;
+ 			}
+@@ -1281,9 +1283,14 @@ BOOL SbxValue::Compute( SbxOperator eOp, const Sbx
+ 						break;
+ 					case SbxNOT:
+ 						if( aL.eType != SbxLONG && aL.eType != SbxULONG )
++						{
++							if ( aL.eType != SbxBOOL )
+ 							aL.nLong64 = ~aL.nLong64;
+ 						else
+ 							aL.nLong = ~aL.nLong;
++						}
++						else
++							aL.nLong = ~aL.nLong;
+ 						break;
+ 					default: break;
+ 				}
+@@ -1470,7 +1477,7 @@ BOOL SbxValue::Compare( SbxOperator eOp, const Sbx
+ 		bRes = TRUE;
+     }
+ 	else if( GetType() == SbxEMPTY && rOp.GetType() == SbxEMPTY )
+-		bRes = TRUE;
++		bRes = !bVBAInterop ? TRUE : ( eOp == SbxEQ ? TRUE : FALSE );
+ 	// Sonderregel 1: Ist ein Operand Null, ist das Ergebnis FALSE
+ 	else if( GetType() == SbxNULL || rOp.GetType() == SbxNULL )
+ 		bRes = FALSE;
+Index: basic/source/classes/errobject.cxx
+===================================================================
+--- basic/source/classes/errobject.cxx	(revision 0)
++++ basic/source/classes/errobject.cxx	(revision 276288)
+@@ -0,0 +1,181 @@
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_basic.hxx"
++#include "errobject.hxx"
++
++#include <cppuhelper/implbase2.hxx>
++#include <com/sun/star/script/XDefaultProperty.hpp>
++#include "sbintern.hxx"
++#include "runtime.hxx"
++
++using namespace ::com::sun::star;
++using namespace ::ooo;
++
++typedef ::cppu::WeakImplHelper2< vba::XErrObject, script::XDefaultProperty > ErrObjectImpl_BASE;
++
++class ErrObject : public ErrObjectImpl_BASE
++{	
++	rtl::OUString m_sHelpFile;
++	rtl::OUString m_sSource;
++        rtl::OUString m_sDescription; 
++	sal_Int32 m_nNumber;
++	sal_Int32 m_nHelpContext;
++	
++public:
++	ErrObject();
++	~ErrObject();
++	// Attributes
++	virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException);
++	virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException);
++	virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException);
++	virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException);
++	virtual ::rtl::OUString SAL_CALL getHelpFile() throw (uno::RuntimeException);
++	virtual void SAL_CALL setHelpFile( const ::rtl::OUString& _helpfile ) throw (uno::RuntimeException);
++	virtual ::rtl::OUString SAL_CALL getDescription() throw (uno::RuntimeException);
++	virtual void SAL_CALL setDescription( const ::rtl::OUString& _description ) throw (uno::RuntimeException);
++	virtual ::rtl::OUString SAL_CALL getSource() throw (uno::RuntimeException);
++	virtual void SAL_CALL setSource( const ::rtl::OUString& _source ) throw (uno::RuntimeException);
++	
++	// Methods
++	virtual void SAL_CALL Clear(  ) throw (uno::RuntimeException);
++	virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException);
++	// XDefaultProperty	
++	virtual ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (uno::RuntimeException);
++};
++
++
++ErrObject::~ErrObject()
++{
++}
++
++ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0)
++{
++}
++
++sal_Int32 SAL_CALL
++ErrObject::getNumber() throw (uno::RuntimeException)
++{
++	return m_nNumber;
++}
++
++void SAL_CALL 
++ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException)
++{
++	m_nNumber = _number;
++
++	
++}
++
++::sal_Int32 SAL_CALL 
++ErrObject::getHelpContext() throw (uno::RuntimeException)
++{
++	return m_nHelpContext;
++}
++void SAL_CALL 
++ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException)
++{
++	m_nHelpContext = _helpcontext;
++}
++
++::rtl::OUString SAL_CALL 
++ErrObject::getHelpFile() throw (uno::RuntimeException)
++{
++	return m_sHelpFile;
++}
++
++void SAL_CALL 
++ErrObject::setHelpFile( const ::rtl::OUString& _helpfile ) throw (uno::RuntimeException)
++{
++	m_sHelpFile = _helpfile;
++}
++
++::rtl::OUString SAL_CALL 
++ErrObject::getDescription() throw (uno::RuntimeException)
++{
++	return m_sDescription;
++}
++
++void SAL_CALL 
++ErrObject::setDescription( const ::rtl::OUString& _description ) throw (uno::RuntimeException)
++{
++	m_sDescription = _description;
++}
++
++::rtl::OUString SAL_CALL 
++ErrObject::getSource() throw (uno::RuntimeException)
++{
++	return m_sSource;
++}
++
++void SAL_CALL 
++ErrObject::setSource( const ::rtl::OUString& _source ) throw (uno::RuntimeException)
++{
++	m_sSource = _source;
++}
++	
++// Methods
++void SAL_CALL 
++ErrObject::Clear(  ) throw (uno::RuntimeException)
++{
++	m_sHelpFile = rtl::OUString();
++	m_sSource = m_sHelpFile;
++	m_sDescription = m_sSource;
++	m_nNumber = 0;	
++	m_nHelpContext = 0;	
++}
++
++void SAL_CALL 
++ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException)
++{
++	if ( !Number.hasValue() )
++		throw uno::RuntimeException( rtl::OUString::createFromAscii("Missing Required Paramater"), uno::Reference< uno::XInterface >() );
++	Description >>= m_sDescription;
++	Source >>= m_sSource;
++	HelpFile >>= m_sHelpFile;
++	HelpContext >>= m_nHelpContext;
++	Number >>= m_nNumber;
++	if ( m_nNumber )
++	{
++		SbError n = StarBASIC::GetSfxFromVBError( m_nNumber );
++		if ( !n )
++			n = m_nNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
++		pINST->Error( n, m_sDescription );
++	}
++}
++
++// XDefaultProperty	
++::rtl::OUString SAL_CALL 
++ErrObject::getDefaultPropertyName(  ) throw (uno::RuntimeException)
++{
++	static rtl::OUString sDfltPropName( RTL_CONSTASCII_USTRINGPARAM("Number") );
++	return sDfltPropName;
++}
++
++// SbxErrObject
++SbxErrObject::SbxErrObject( const String& rName, const Any& rUnoObj ): SbUnoObject( rName, rUnoObj )
++{
++	OSL_TRACE("SbxErrObject::SbxErrObject ctor");
++	rUnoObj >>= m_xErr;
++	if ( m_xErr.is() )
++		SetDfltProperty( uno::Reference< script::XDefaultProperty >( m_xErr, uno::UNO_QUERY_THROW )->getDefaultPropertyName() ) ;
++}
++
++SbxErrObject::~SbxErrObject()
++{
++	OSL_TRACE("SbxErrObject::~SbxErrObject dtor");
++}
++
++uno::Reference< vba::XErrObject > 
++SbxErrObject::getUnoErrObject()
++{
++	SbxVariable* pVar = getErrObject();
++	SbxErrObject* pGlobErr = static_cast< SbxErrObject* >(  pVar );
++	return pGlobErr->m_xErr;	
++}
++
++SbxVariableRef
++SbxErrObject::getErrObject()
++{
++	static SbxVariableRef pGlobErr = new SbxErrObject( String(  RTL_CONSTASCII_USTRINGPARAM("Err")), uno::makeAny( uno::Reference< vba::XErrObject >( new ErrObject() ) ) );
++	return pGlobErr;
++}
++
+Index: basic/source/classes/sbunoobj.cxx
+===================================================================
+--- basic/source/classes/sbunoobj.cxx	(revision 276159)
++++ basic/source/classes/sbunoobj.cxx	(revision 276288)
+@@ -63,6 +63,7 @@
+ #include <com/sun/star/script/XInvocationAdapterFactory.hpp>
+ #include <com/sun/star/script/XTypeConverter.hpp>
+ #include <com/sun/star/script/XDefaultProperty.hpp>
++#include <com/sun/star/script/XDefaultMethod.hpp>
+ #include <com/sun/star/container/XNameAccess.hpp>
+ #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+ #include <com/sun/star/reflection/XIdlArray.hpp>
+@@ -73,8 +74,8 @@
+ #include <com/sun/star/bridge/oleautomation/Date.hpp>
+ #include <com/sun/star/bridge/oleautomation/Decimal.hpp>
+ #include <com/sun/star/bridge/oleautomation/Currency.hpp>
++#include <com/sun/star/script/XAutomationInvocation.hpp>
+ 
+-
+ using com::sun::star::uno::Reference;
+ using namespace com::sun::star::uno;
+ using namespace com::sun::star::lang;
+@@ -155,6 +156,21 @@ SbxVariable* getDefaultProp( SbxVariable* pRef )
+ 	return pDefaultProp;
+ }
+ 
++void SetSbUnoObjectDfltPropName( SbxObject* pObj )
++{
++	SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*) pObj);
++	if ( pUnoObj )
++	{
++		String sDfltPropName;
++		
++		if ( SbUnoObject::getDefaultPropName( pUnoObj, sDfltPropName ) )
++		{
++			OSL_TRACE("SetSbUnoObjectDfltPropName setting dflt prop for %s", rtl::OUStringToOString( pObj->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
++			pUnoObj->SetDfltProperty( sDfltPropName );
++		}
++	}
++}
++
+ Reference< XComponentContext > getComponentContext_Impl( void )
+ {
+     static Reference< XComponentContext > xContext;
+@@ -750,7 +766,11 @@ void unoToSbxValue( SbxVariable* pVar, const Any&
+ 			// SbUnoObject instanzieren
+ 			String aName;
+ 			SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue );
+-			if ( SbiRuntime::isVBAEnabled() )
++//			If this is called externally e.g. from the scripting 
++//			framework then there is no 'active' runtime the default property will not be set up
++//			only a vba object will have XDefaultProp set anyway so... this
++//			test seems a bit of overkill
++//			if ( SbiRuntime::isVBAEnabled() )
+ 			{
+ 				String sDfltPropName;
+ 
+@@ -1485,6 +1505,103 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type&
+ 	return aRetVal;
+ }
+ 
++void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOLEAutomation, UINT32 nParamCount )
++{
++	AutomationNamedArgsSbxArray* pArgNamesArray = NULL;
++	if( bOLEAutomation )
++		pArgNamesArray = PTR_CAST(AutomationNamedArgsSbxArray,pParams);
++
++	args.realloc( nParamCount );
++	Any* pAnyArgs = args.getArray();
++	bool bBlockConversionToSmallestType = pINST->IsCompatibility();
++	UINT32 i = 0;	
++	if( pArgNamesArray )
++	{
++		Sequence< ::rtl::OUString >& rNameSeq = pArgNamesArray->getNames();
++		::rtl::OUString* pNames = rNameSeq.getArray();
++		Any aValAny;
++		for( i = 0 ; i < nParamCount ; i++ )
++		{
++			USHORT iSbx = (USHORT)(i+1);
++	
++			// ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
++			aValAny = sbxToUnoValueImpl( pParams->Get( iSbx ),
++			bBlockConversionToSmallestType );
++	
++			::rtl::OUString aParamName = pNames[iSbx];
++			if( aParamName.getLength() )
++			{
++				oleautomation::NamedArgument aNamedArgument;
++				aNamedArgument.Name = aParamName;
++				aNamedArgument.Value = aValAny;
++				pAnyArgs[i] <<= aNamedArgument;
++			}
++			else
++			{
++				pAnyArgs[i] = aValAny;
++			}
++		}
++	}
++	else
++	{
++		for( i = 0 ; i < nParamCount ; i++ )
++		{
++			// ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
++			pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (USHORT)(i+1) ),
++			bBlockConversionToSmallestType );
++		}
++	}
++
++}
++enum INVOKETYPE
++{
++   GetProp = 0, 
++   SetProp, 
++   Func
++};
++Any invokeAutomationMethod( const String& Name, Sequence< Any >& args, SbxArray* pParams, UINT32 nParamCount, Reference< XInvocation >& rxInvocation, INVOKETYPE invokeType = Func )
++{
++	Sequence< INT16 > OutParamIndex;
++	Sequence< Any > OutParam;
++    
++	Any aRetAny;
++	switch( invokeType )
++	{
++		case Func:
++			aRetAny = rxInvocation->invoke( Name, args, OutParamIndex, OutParam );
++			break;
++		case GetProp:
++			{
++				Reference< XAutomationInvocation > xAutoInv( rxInvocation, UNO_QUERY_THROW );
++				aRetAny = xAutoInv->invokeGetProperty( Name, args, OutParamIndex, OutParam );
++				break;
++			}
++		case SetProp:
++			{
++				Reference< XAutomationInvocation > xAutoInv( rxInvocation, UNO_QUERY_THROW );
++				aRetAny = xAutoInv->invokePutProperty( Name, args, OutParamIndex, OutParam );
++				break;
++			}
++		default:
++			break; // should introduce an error here
++	
++	}
++	const INT16* pIndices = OutParamIndex.getConstArray();
++	UINT32 nLen = OutParamIndex.getLength();
++	if( nLen )
++	{
++		const Any* pNewValues = OutParam.getConstArray();
++		for( UINT32 j = 0 ; j < nLen ; j++ )
++		{
++			INT16 iTarget = pIndices[ j ];
++			if( iTarget >= (INT16)nParamCount )
++				break;
++			unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pNewValues[ j ] );
++		}
++	}
++    return aRetAny;
++}
++
+ // Dbg-Hilfsmethode zum Auslesen der in einem Object implementierten Interfaces
+ String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, USHORT nRekLevel )
+ {
+@@ -1599,6 +1716,23 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj,
+ 				break;
+ 			}
+ 			::rtl::OUString sClassName = xClass->getName();
++			if ( sClassName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.oleautomation.XAutomationObject" ) ) ) )
++			{
++				// there is a hack in the extensions/source/ole/oleobj.cxx  to return the typename of the automation object, lets check if it
++				// matches
++				Reference< XInvocation > xInv( aToInspectObj, UNO_QUERY );
++				if ( xInv.is() )
++				{
++					rtl::OUString sTypeName;
++					xInv->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$GetTypeName") ) ) >>= sTypeName;
++					if ( sTypeName.getLength() == 0 || sTypeName.equals(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") ) ) )
++						// can't check type, leave it pass
++						result = true;	
++					else
++						result = sTypeName.equals( aClass );
++				}
++				break; // finished checking automation object
++			}
+ 			OSL_TRACE("Checking if object implements %s",
+ 				OUStringToOString( defaultNameSpace + aClass,
+ 					RTL_TEXTENCODING_UTF8 ).getStr() );
+@@ -1968,11 +2102,26 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC,
+ 				{
+ 					try
+ 					{
++						UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
++						sal_Bool bCanBeConsideredAMethod = mxInvocation->hasMethod( pProp->GetName() );
++						Any aRetAny;
++					   	if ( bCanBeConsideredAMethod && nParamCount )
++						{
++							// Automation properties have methods, so.. we need to invoke this through
++							// XInvocation
++							Sequence<Any> args;
++							processAutomationParams( pParams, args, true, nParamCount );
++							aRetAny = invokeAutomationMethod( pProp->GetName(), args, pParams, nParamCount, mxInvocation, GetProp );
++						}	
++						else
+ 						// Wert holen
+-						Any aRetAny = mxInvocation->getValue( pProp->GetName() );
++							aRetAny = mxInvocation->getValue( pProp->GetName() );
+ 
+ 						// Wert von Uno nach Sbx uebernehmen
+ 						unoToSbxValue( pVar, aRetAny );
++						if( pParams && bCanBeConsideredAMethod )
++							pVar->SetParameters( NULL );
++
+ 					}
+ 					catch( const Exception& )
+ 					{
+@@ -2097,53 +2246,8 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC,
+ 				else if( bInvocation && pParams && mxInvocation.is() )
+ 				{
+ 					bool bOLEAutomation = true;
+-					// TODO: bOLEAutomation = xOLEAutomation.is()
+-
+-					AutomationNamedArgsSbxArray* pArgNamesArray = NULL;
+-					if( bOLEAutomation )
+-						pArgNamesArray = PTR_CAST(AutomationNamedArgsSbxArray,pParams);
+-
+-					args.realloc( nParamCount );
+-					Any* pAnyArgs = args.getArray();
+-					bool bBlockConversionToSmallestType = pINST->IsCompatibility();
+-					if( pArgNamesArray )
+-					{
+-						Sequence< ::rtl::OUString >& rNameSeq = pArgNamesArray->getNames();
+-						::rtl::OUString* pNames = rNameSeq.getArray();
+-
+-						Any aValAny;
+-						for( i = 0 ; i < nParamCount ; i++ )
+-						{
+-							USHORT iSbx = (USHORT)(i+1);
+-
+-							// ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
+-							aValAny = sbxToUnoValueImpl( pParams->Get( iSbx ),
+-														bBlockConversionToSmallestType );
+-
+-							::rtl::OUString aParamName = pNames[iSbx];
+-							if( aParamName.getLength() )
+-							{
+-								oleautomation::NamedArgument aNamedArgument;
+-								aNamedArgument.Name = aParamName;
+-								aNamedArgument.Value = aValAny;
+-								pAnyArgs[i] <<= aNamedArgument;
++					processAutomationParams( pParams, args, bOLEAutomation, nParamCount );
+ 							}
+-							else
+-							{
+-								pAnyArgs[i] = aValAny;
+-							}
+-						}
+-					}
+-					else
+-					{
+-						for( i = 0 ; i < nParamCount ; i++ )
+-						{
+-							// ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
+-							pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (USHORT)(i+1) ),
+-															bBlockConversionToSmallestType );
+-						}
+-					}
+-				}
+ 
+ 				// Methode callen
+                 GetSbData()->bBlockCompilerError = TRUE;  // #106433 Block compiler errors for API calls
+@@ -2177,27 +2281,9 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC,
+ 					}
+ 					else if( bInvocation && mxInvocation.is() )
+ 					{
+-						Sequence< INT16 > OutParamIndex;
+-						Sequence< Any > OutParam;
+-						Any aRetAny = mxInvocation->invoke( pMeth->GetName(), args, OutParamIndex, OutParam );
+-
+-						// Wert von Uno nach Sbx uebernehmen
++						Any aRetAny = invokeAutomationMethod( pMeth->GetName(), args, pParams, nParamCount, mxInvocation );
+ 						unoToSbxValue( pVar, aRetAny );
+-
+-						const INT16* pIndices = OutParamIndex.getConstArray();
+-						UINT32 nLen = OutParamIndex.getLength();
+-						if( nLen )
+-						{
+-							const Any* pNewValues = OutParam.getConstArray();
+-							for( UINT32 j = 0 ; j < nLen ; j++ )
+-							{
+-								INT16 iTarget = pIndices[ j ];
+-								if( iTarget >= (INT16)nParamCount )
+-									break;
+-								unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pNewValues[ j ] );
+ 							}
+-						}
+-					}
+ 
+ 					// #55460, Parameter hier weghauen, da das in unoToSbxValue()
+ 					// bei Arrays wegen #54548 nicht mehr gemacht wird
+@@ -3125,11 +3211,16 @@ getTypeDescriptorEnumeration( const ::rtl::OUStrin
+ 
+ typedef std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
+ 
+-SbxVariable* getVBAConstant( const String& rName )
++VBAConstantHelper&
++VBAConstantHelper::instance()
+ {
+-	SbxVariable* pConst = NULL;
+-	static VBAConstantsHash aConstCache;
+-	static bool isInited = false;
++    static VBAConstantHelper aHelper;
++    return aHelper;
++}
++
++void
++VBAConstantHelper::init()
++{
+ 	if ( !isInited )
+ 	{
+ 		Sequence< TypeClass > types(1);
+@@ -3137,39 +3228,77 @@ typedef std::hash_map< ::rtl::OUString, Any, ::rtl
+ 		Reference< XTypeDescriptionEnumeration > xEnum = getTypeDescriptorEnumeration( defaultNameSpace, types, TypeDescriptionSearchDepth_INFINITE  );
+ 
+ 		if ( !xEnum.is() )
+-			return NULL;
++            return; //NULL;
+ 
+ 		while ( xEnum->hasMoreElements() )
+ 		{
+ 			Reference< XConstantsTypeDescription > xConstants( xEnum->nextElement(), UNO_QUERY );
+ 			if ( xConstants.is() )
+ 			{
++                // store constant group name 
++                ::rtl::OUString sFullName = xConstants->getName();
++                sal_Int32 indexLastDot = sFullName.lastIndexOf('.');
++                ::rtl::OUString sLeafName( sFullName );
++                if ( indexLastDot > -1 )
++                    sLeafName = sFullName.copy( indexLastDot + 1);
++                aConstCache.push_back( sLeafName ); // assume constant group names are unique
+ 				Sequence< Reference< XConstantTypeDescription > > aConsts = xConstants->getConstants();
+ 				Reference< XConstantTypeDescription >* pSrc = aConsts.getArray();
+ 				sal_Int32 nLen = aConsts.getLength();
+ 				for ( sal_Int32 index =0;  index<nLen; ++pSrc, ++index )
+ 				{
++                    // store constant member name
+ 					Reference< XConstantTypeDescription >& rXConst =
+ 						*pSrc;
+-					::rtl::OUString sFullName = rXConst->getName();
+-					sal_Int32 indexLastDot = sFullName.lastIndexOf('.');
+-					::rtl::OUString sLeafName;
++                    sFullName = rXConst->getName();
++                    indexLastDot = sFullName.lastIndexOf('.');
++                    sLeafName = sFullName;
+ 					if ( indexLastDot > -1 )
+ 						sLeafName = sFullName.copy( indexLastDot + 1);
+-					aConstCache[ sLeafName.toAsciiLowerCase() ] = rXConst->getConstantValue();
++                    aConstHash[ sLeafName.toAsciiLowerCase() ] = rXConst->getConstantValue();
+ 				}
+ 			}
+ 		}
+ 		isInited = true;
+ 	}
++}
++
++bool
++VBAConstantHelper::isVBAConstantType( const String& rName )
++{
++    init();
++    bool bConstant = false;
+ 	::rtl::OUString sKey( rName );
+-	VBAConstantsHash::const_iterator it = aConstCache.find( sKey.toAsciiLowerCase() );
+-	if ( it != aConstCache.end() )
++    VBAConstantsVector::const_iterator it = aConstCache.begin();
++
++    for( ; it != aConstCache.end(); it++ )
+ 	{
++        if( sKey.equalsIgnoreAsciiCase( *it ) )
++        {
++            bConstant = true;
++            break;
++        }
++    }
++    return bConstant; 
++}
++
++SbxVariable* 
++VBAConstantHelper::getVBAConstant( const String& rName )
++{
++    SbxVariable* pConst = NULL;
++    init();
++
++	::rtl::OUString sKey( rName );
++
++    VBAConstantsHash::const_iterator it = aConstHash.find( sKey.toAsciiLowerCase() );
++
++    if ( it != aConstHash.end() )
++	{
+ 		pConst = new SbxVariable( SbxVARIANT );
+ 		pConst->SetName( rName );
+ 		unoToSbxValue( pConst, it->second );
+ 	}
++
+ 	return pConst;
+ }
+ 
+Index: basic/source/classes/makefile.mk
+===================================================================
+--- basic/source/classes/makefile.mk	(revision 276159)
++++ basic/source/classes/makefile.mk	(revision 276288)
+@@ -41,18 +41,28 @@ ENABLE_EXCEPTIONS=TRUE
+ 
+ .INCLUDE :  settings.mk
+ 
++ALLTAR .SEQUENTIAL : \
++        $(MISC)$/$(TARGET).don \
++        $(MISC)$/$(TARGET).slo
++
++$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++        echo $@
++
++$(MISC)$/$(TARGET).slo : $(SLOTARGET)
++        echo $@
++
+ # --- Allgemein -----------------------------------------------------------
+ 
+-COMMON_SLOFILES=	\
++SLOFILES=	\
+ 	$(SLO)$/sb.obj       \
+ 	$(SLO)$/sbxmod.obj	\
+ 	$(SLO)$/image.obj	\
+ 	$(SLO)$/sbintern.obj	\
+ 	$(SLO)$/sbunoobj.obj	\
+ 	$(SLO)$/propacc.obj	\
+-	$(SLO)$/disas.obj
+-
+-SLOFILES=	$(COMMON_SLOFILES)	\
++	$(SLO)$/disas.obj \
++	$(SLO)$/errobject.obj \
+ 	$(SLO)$/eventatt.obj
+ 
+ OBJFILES=	\
+Index: basic/source/classes/sb.cxx
+===================================================================
+--- basic/source/classes/sb.cxx	(revision 276159)
++++ basic/source/classes/sb.cxx	(revision 276288)
+@@ -52,12 +52,17 @@
+ #include "disas.hxx"
+ #include "runtime.hxx"
+ #include <basic/sbuno.hxx>
++#include <basic/sbobjmod.hxx>
+ #include "stdobj.hxx"
+ #include "filefmt.hxx"
+ #include "sb.hrc"
+ #include <basrid.hxx>
+ #include <vos/mutex.hxx>
+ 
++#include <com/sun/star/script/ModuleType.hpp>
++#include <com/sun/star/script/ModuleInfo.hpp>
++using namespace ::com::sun::star::script;
++
+ // #pragma SW_SEGMENT_CLASS( SBASIC, SBASIC_CODE )
+ 
+ SV_IMPL_VARARR(SbTextPortions,SbTextPortion)
+@@ -65,7 +70,29 @@ SV_IMPL_VARARR(SbTextPortions,SbTextPortion)
+ TYPEINIT1(StarBASIC,SbxObject)
+ 
+ #define RTLNAME "@SBRTL"
++//  i#i68894#
+ 
++const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") );
++const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
++
++SbxObject* StarBASIC::getVBAGlobals( )
++{
++	if ( !pVBAGlobals )
++		pVBAGlobals = (SbUnoObject*)Find( aVBAHook , SbxCLASS_DONTCARE );
++	return pVBAGlobals;
++}
++
++//  i#i68894#
++SbxVariable* StarBASIC::VBAFind( const String& rName, SbxClassType t )
++{
++	if( rName == aThisComponent )
++		return NULL;
++	// rename to init globals
++	if ( getVBAGlobals( ) )
++		return pVBAGlobals->Find( rName, t );
++	return NULL;
++
++}
+ // Create array for conversion SFX <-> VB error code
+ struct SFX_VB_ErrorItem
+ {
+@@ -196,6 +223,7 @@ const SFX_VB_ErrorItem __FAR_DATA SFX_VB_ErrorTab[
+ 	{ 1004, SbERR_METHOD_FAILED },
+ 	{ 1005, SbERR_SETPROP_FAILED },
+ 	{ 1006, SbERR_GETPROP_FAILED },
++	{ 1007, SbERR_BASIC_COMPAT },
+ 	{ 0xFFFF, 0xFFFFFFFFL }		// End mark
+ };
+ 
+@@ -241,6 +269,8 @@ SbxObject* SbiFactory::CreateObject( const String&
+ 	else
+ 	if( rClass.EqualsIgnoreCaseAscii( "Collection" ) )
+ 	{
++			// Only variables qualified by the Module Name e.g. Sheet1.foo
++			// should work for Documant && Class type Modules
+ 		String aCollectionName( RTL_CONSTASCII_USTRINGPARAM("Collection") );
+ 		return new BasicCollection( aCollectionName );
+ 	}
+@@ -303,6 +333,32 @@ SbxObject* SbTypeFactory::cloneTypeObjectImpl( con
+ 		if( pProp )
+ 		{
+ 			SbxProperty* pNewProp = new SbxProperty( *pProp );
++			if( pVar->GetType() & SbxARRAY )
++			{
++		                SbxBase* pParObj = pVar->GetObject();
++               			SbxDimArray* pSource = PTR_CAST(SbxDimArray,pParObj);
++				SbxDimArray* pDest = new SbxDimArray( pVar->GetType() );
++                               	INT32 lb = 0;
++	                        INT32 ub = 0;
++
++				pDest->setHasFixedSize( pSource->hasFixedSize() );
++				if ( pSource->GetDims() && pSource->hasFixedSize() )
++				{
++					for ( INT32 i=1; i <= pSource->GetDims(); ++i )
++	                                {
++					    pSource->GetDim32( (INT32)i, lb, ub );
++					    pDest->AddDim32( lb, ub );
++					}
++				}
++				else 
++					pDest->unoAddDim( 0, -1 ); // variant array
++				USHORT nSavFlags = pVar->GetFlags();
++				pNewProp->ResetFlag( SBX_FIXED );
++				// need to reset the FIXED flag 
++				// when calling PutObject ( because the type will not match Object ) 	
++				pNewProp->PutObject( pDest );
++				pNewProp->SetFlags( nSavFlags );
++			}
+ 			pProps->PutDirect( pNewProp, i );
+ 		}
+ 	}
+@@ -439,6 +495,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule
+ 			}
+ 		}
+ 	}
++	SetModuleType( com::sun::star::script::ModuleType::Class );
+ }
+ 
+ SbClassModuleObject::~SbClassModuleObject()
+@@ -454,71 +511,6 @@ SbClassModuleObject::~SbClassModuleObject()
+ void SbClassModuleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+ 						   const SfxHint& rHint, const TypeId& rHintType )
+ {
+-	bool bDone = false;
+-
+-	const SbxHint* pHint = PTR_CAST(SbxHint,&rHint);
+-	if( pHint )
+-	{
+-		SbxVariable* pVar = pHint->GetVar();
+-		SbProcedureProperty* pProcProperty = PTR_CAST( SbProcedureProperty, pVar );
+-		if( pProcProperty )
+-		{
+-			bDone = true;
+-
+-			if( pHint->GetId() == SBX_HINT_DATAWANTED )
+-			{
+-				String aProcName;
+-				aProcName.AppendAscii( "Property Get " );
+-				aProcName += pProcProperty->GetName();
+-
+-				SbxVariable* pMeth = Find( aProcName, SbxCLASS_METHOD );
+-				if( pMeth )
+-				{
+-					SbxValues aVals;
+-					aVals.eType = SbxVARIANT;
+-					pMeth->Get( aVals );
+-					pVar->Put( aVals );
+-				}
+-			}
+-			else if( pHint->GetId() == SBX_HINT_DATACHANGED )
+-			{
+-				SbxVariable* pMeth = NULL;
+-
+-				bool bSet = pProcProperty->isSet();
+-				if( bSet )
+-				{
+-					pProcProperty->setSet( false );
+-
+-					String aProcName;
+-					aProcName.AppendAscii( "Property Set " );
+-					aProcName += pProcProperty->GetName();
+-					pMeth = Find( aProcName, SbxCLASS_METHOD );
+-				}
+-				if( !pMeth )	// Let
+-				{
+-					String aProcName;
+-					aProcName.AppendAscii( "Property Let " );
+-					aProcName += pProcProperty->GetName();
+-					pMeth = Find( aProcName, SbxCLASS_METHOD );
+-				}
+-
+-				if( pMeth )
+-				{
+-					// Setup parameters
+-					SbxArrayRef xArray = new SbxArray;
+-					xArray->Put( pMeth, 0 );	// Method as parameter 0
+-					xArray->Put( pVar, 1 );
+-					pMeth->SetParameters( xArray );
+-
+-					SbxValues aVals;
+-					pMeth->Get( aVals );
+-					pMeth->SetParameters( NULL );
+-				}
+-			}
+-		}
+-	}
+-
+-	if( !bDone )
+ 		SbModule::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
+ }
+ 
+@@ -636,6 +628,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBas
+ 	SetParent( p );
+ 	pLibInfo = NULL;
+ 	bNoRtl = bBreak = FALSE;
++    bVBAEnabled = FALSE;
+ 	pModules = new SbxArray;
+ 
+ 	if( !GetSbData()->nInst++ )
+@@ -654,6 +647,8 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBas
+ 	pRtl = new SbiStdObject( String( RTL_CONSTASCII_USTRINGPARAM(RTLNAME) ), this );
+     // Search via StarBasic is always global
+ 	SetFlag( SBX_GBLSEARCH );
++	pVBAGlobals = NULL;
++	bQuit = FALSE;
+ }
+ 
+ // #51727 Override SetModified so that the modified state
+@@ -734,8 +729,37 @@ SbModule* StarBASIC::MakeModule( const String& rNa
+ 
+ SbModule* StarBASIC::MakeModule32( const String& rName, const ::rtl::OUString& rSrc )
+ {
+-	SbModule* p = new SbModule( rName );
+-	p->SetSource32( rSrc );
++    ModuleInfo mInfo;
++    mInfo.ModuleSource = rSrc;
++    mInfo.ModuleType = ModuleType::Normal;
++    mInfo.ModuleName = rName;
++    return MakeModule32(  mInfo );
++}
++SbModule* StarBASIC::MakeModule32( const ModuleInfo& mInfo )
++{
++    
++    OSL_TRACE("create module %s type mInfo %d", rtl::OUStringToOString( mInfo.ModuleName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType );
++    SbModule* p = NULL;
++    switch ( mInfo.ModuleType )
++    {
++        case ModuleType::Document:
++            // In theory we should be able to create Object modules
++            // in ordinary basic ( in vba mode thought these are create
++            // by the application/basic and not by the user )
++            p = new SbObjModule( mInfo, isVBAEnabled() );
++            break;
++        case ModuleType::Class:
++            p = new SbModule( mInfo.ModuleName, isVBAEnabled() );
++			p->SetModuleType( com::sun::star::script::ModuleType::Class );	
++	    break;
++        case ModuleType::Form:
++            p = new SbUserFormModule( mInfo, isVBAEnabled() );
++	    break;
++        default:
++            p = new SbModule( mInfo.ModuleName, isVBAEnabled() );
++            
++    }
++	p->SetSource32( mInfo.ModuleSource );
+ 	p->SetParent( this );
+ 	pModules->Insert( p, pModules->Count() );
+ 	SetModified( TRUE );
+@@ -910,6 +934,11 @@ SbxVariable* StarBASIC::Find( const String& rName,
+ 				}
+ 				pNamed = p;
+ 			}
++			// Only variables qualified by the Module Name e.g. Sheet1.foo
++			// should work for Documant && Class type Modules
++			INT32 nType = p->GetModuleType();
++			if ( nType == com::sun::star::script::ModuleType::Document || nType == com::sun::star::script::ModuleType::Form )
++				continue;
+ 			// otherwise check if the element is available
+ 			// unset GBLSEARCH-Flag (due to Rekursion)
+ 			USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
+@@ -968,6 +997,12 @@ SbxVariable* StarBASIC::FindVarInCurrentScopy
+ 	return pVar;
+ }
+ 
++void StarBASIC::QuitAndExitApplication()
++{
++    Stop();
++    bQuit = TRUE;
++}
++
+ void StarBASIC::Stop()
+ {
+ 	SbiInstance* p = pINST;
+@@ -1506,6 +1541,18 @@ BOOL StarBASIC::LoadOldModules( SvStream& )
+ 	return FALSE;
+ }
+ 
++bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
++{
++    bool bRes = false;
++    ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
++    SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( Find( sVarName, SbxCLASS_DONTCARE ) );
++    if ( pGlobs )
++    {
++        aOut = pGlobs->getUnoAny();
++        bRes = true;
++    }
++    return bRes;
++}
+ 
+ //========================================================================
+ // #118116 Implementation Collection object
+Index: basic/source/classes/sb.src
+===================================================================
+--- basic/source/classes/sb.src	(revision 276159)
++++ basic/source/classes/sb.src	(revision 276288)
+@@ -591,7 +591,13 @@ Resource RID_BASIC_START
+ 	{
+ 		Text [ en-US ] = "For loop not initialized." ;
+ 	};
++	String ERRCODE_BASIC_COMPAT & ERRCODE_RES_MASK
++	{
++		Text [ de ] = "$(ARG1)." ;
++		Text [ en-US ] = "$(ARG1)." ;
++		Text [ x-comment ] = " ";
+ };
++};
+  // Hinweis: IDS_SBERR_TERMINATED = IDS_SBERR_START+2000.
+ String IDS_SBERR_TERMINATED
+ {
+Index: basic/source/classes/eventatt.cxx
+===================================================================
+--- basic/source/classes/eventatt.cxx	(revision 276159)
++++ basic/source/classes/eventatt.cxx	(revision 276288)
+@@ -58,7 +58,10 @@
+ #include <com/sun/star/awt/XDialogProvider.hpp>
+ 
+ #include <com/sun/star/frame/XModel.hpp>
+-
++#include <com/sun/star/frame/XDesktop.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <basic/basicmanagerrepository.hxx>
++#include <basic/basmgr.hxx>
+ //==================================================================================================
+ 
+ #include <xmlscript/xmldlg_imexp.hxx>
+@@ -458,6 +461,43 @@ Any implFindDialogLibForDialog( const Any& rDlgAny
+ 	return aRetDlgLibAny;
+ }
+ 
++Any implFindDialogLibForDialogBasic( const Any& aAnyISP, SbxObject* pBasic, StarBASIC*& pFoundBasic )
++{
++	Any aDlgLibAny;
++	// Find dialog library for dialog, direct access is not possible here
++    StarBASIC* pStartedBasic = (StarBASIC*)pBasic;
++	SbxObject* pParentBasic = pStartedBasic ? pStartedBasic->GetParent() : NULL;
++	SbxObject* pParentParentBasic = pParentBasic ? pParentBasic->GetParent() : NULL;
++
++	SbxObject* pSearchBasic1 = NULL;
++	SbxObject* pSearchBasic2 = NULL;
++	if( pParentParentBasic )
++	{
++		pSearchBasic1 = pParentBasic;
++		pSearchBasic2 = pParentParentBasic;
++	}
++	else
++	{
++		pSearchBasic1 = pStartedBasic;
++		pSearchBasic2 = pParentBasic;
++	}
++	if( pSearchBasic1 )
++	{
++		aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic1 );
++
++		if ( aDlgLibAny.hasValue() )
++			pFoundBasic = (StarBASIC*)pSearchBasic1;
++
++		else if( pSearchBasic2 )
++		{
++			aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic2 );
++			if ( aDlgLibAny.hasValue() )
++				pFoundBasic = (StarBASIC*)pSearchBasic2;
++		}
++	}
++	return aDlgLibAny;
++}
++
+ static ::rtl::OUString aDecorationPropName =
+ 	::rtl::OUString::createFromAscii( "Decoration" );
+ static ::rtl::OUString aTitlePropName =
+@@ -537,39 +577,51 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic,
+ 		{}
+ 	}
+ 
+-	// Find dialog library for dialog, direct access is not possible here
+-    StarBASIC* pStartedBasic = pINST->GetBasic();
+-	SbxObject* pParentBasic = pStartedBasic ? pStartedBasic->GetParent() : NULL;
+-	SbxObject* pParentParentBasic = pParentBasic ? pParentBasic->GetParent() : NULL;
+-
+-	SbxObject* pSearchBasic1 = NULL;
+-	SbxObject* pSearchBasic2 = NULL;
+-	if( pParentParentBasic )
++	Any aDlgLibAny;
++	bool bDocDialog = false;
++	StarBASIC* pFoundBasic = NULL;
++    OSL_TRACE("About to try get a hold of ThisComponent");
++    Reference< frame::XModel > xModel = getModelFromBasic( pINST->GetBasic() ) ;
++		aDlgLibAny = implFindDialogLibForDialogBasic( aAnyISP, pINST->GetBasic(), pFoundBasic );
++		// If we found the dialog then it belongs to the Search basic
++		if ( !pFoundBasic )
+ 	{
+-		pSearchBasic1 = pParentBasic;
+-		pSearchBasic2 = pParentParentBasic;
+-	}
+-	else
++			Reference< frame::XDesktop > xDesktop( xMSF->createInstance
++		( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ) ),
++			UNO_QUERY );
++			Reference< container::XEnumeration > xModels;
++			if ( xDesktop.is() )
+ 	{
+-		pSearchBasic1 = pStartedBasic;
+-		pSearchBasic2 = pParentBasic;
+-	}
+-
+-	Any aDlgLibAny;
+-	if( pSearchBasic1 )
++				Reference< container::XEnumerationAccess > xComponents( xDesktop->getComponents(), UNO_QUERY );
++				if ( xComponents.is() )
++					xModels.set( xComponents->createEnumeration(), UNO_QUERY );
++				if ( xModels.is() )
+ 	{
+-		aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic1 );
+-		if( pSearchBasic2 && aDlgLibAny.getValueType().getTypeClass() == TypeClass_VOID )
+-			aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic2 );
++					while ( xModels->hasMoreElements() )
++					{
++						Reference< frame::XModel > xNextModel( xModels->nextElement(), UNO_QUERY );
++						if ( xNextModel.is() )
++						{
++							BasicManager* pMgr = basic::BasicManagerRepository::getDocumentBasicManager( xNextModel );	
++							if ( pMgr )
++								aDlgLibAny = implFindDialogLibForDialogBasic( aAnyISP, pMgr->GetLib(0), pFoundBasic );
++							if ( aDlgLibAny.hasValue() )
++							{
++								bDocDialog = true;
++								xModel = xNextModel;
++								break;
+ 	}
++						}
++					}
++				}
++			}
++		}
++	if ( pFoundBasic )
++		bDocDialog = pFoundBasic->IsDocBasic();
++       Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( pINST->GetBasic(), xModel );
+ 
+-
+-    OSL_TRACE("About to try get a hold of ThisComponent");
+-    Reference< frame::XModel > xModel = getModelFromBasic( pStartedBasic ) ;
+-	Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( pStartedBasic, xModel );
+-
+ 	Sequence< Any > aArgs( 4 );
+-	aArgs[ 0 ] <<= xModel;
++	aArgs[ 0 ] <<= bDocDialog ? xModel : uno::Reference< uno::XInterface >();
+ 	aArgs[ 1 ] <<= xInput;
+ 	aArgs[ 2 ] = aDlgLibAny;
+ 	aArgs[ 3 ] <<= xScriptListener;
+Index: basic/source/classes/sbxmod.cxx
+===================================================================
+--- basic/source/classes/sbxmod.cxx	(revision 276159)
++++ basic/source/classes/sbxmod.cxx	(revision 276288)
+@@ -55,6 +55,8 @@
+ 
+ #include <basic/basrdll.hxx>
+ #include <vos/mutex.hxx>
++#include <basic/sbobjmod.hxx>
++#include <com/sun/star/lang/XServiceInfo.hpp>
+ 
+ 
+ // for the bsearch
+@@ -70,13 +72,30 @@
+ 
+ #include <stdio.h>
+ 
++#include <comphelper/processfactory.hxx>
++#include <com/sun/star/script/XLibraryContainer.hpp>
++#include <com/sun/star/lang/XMultiServiceFactory.hpp>
++#include <com/sun/star/awt/XDialogProvider.hpp>
++#include <com/sun/star/awt/XTopWindow.hpp>
++#include <com/sun/star/awt/XControl.hpp>
++#include <cppuhelper/implbase1.hxx>
++#include <comphelper/anytostring.hxx>
++#include <com/sun/star/document/XVbaMethodParameter.hpp> //liuchen 2009-7-21
++extern void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue ); //liuchen 2009-7-21
++extern ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );  //liuchen 2009-7-21
+ 
++#include <com/sun/star/frame/XDesktop.hpp>
++#include <vcl/svapp.hxx>
++using namespace ::com::sun::star; 
++
+ TYPEINIT1(SbModule,SbxObject)
+ TYPEINIT1(SbMethod,SbxMethod)
+ TYPEINIT1(SbProperty,SbxProperty)
+ TYPEINIT1(SbProcedureProperty,SbxProperty)
+ TYPEINIT1(SbJScriptModule,SbModule)
+ TYPEINIT1(SbJScriptMethod,SbMethod)
++TYPEINIT1(SbObjModule,SbModule)
++TYPEINIT1(SbUserFormModule,SbObjModule)
+ 
+ SV_DECL_VARARR(SbiBreakpoints,USHORT,4,4)
+ SV_IMPL_VARARR(SbiBreakpoints,USHORT)
+@@ -84,18 +103,73 @@ SV_IMPL_VARARR(SbiBreakpoints,USHORT)
+ 
+ SV_IMPL_VARARR(HighlightPortions, HighlightPortion)
+ 
++class AsyncQuitHandler
++{
++    AsyncQuitHandler() {}
++    AsyncQuitHandler( const AsyncQuitHandler&);
++public:
++    static AsyncQuitHandler& instance() 
++    {
++        static AsyncQuitHandler dInst;
++        return dInst;
++    }
+ 
++    void QuitApplication()
++    {
++        uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
++        if ( xFactory.is() )
++	{
++            uno::Reference< frame::XDesktop > xDeskTop( xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ) ), uno::UNO_QUERY );
++           if ( xDeskTop.is() )
++               xDeskTop->terminate(); 
++        }
++    }
++    DECL_LINK( OnAsyncQuit, void* );
++};
++
++IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, pNull )
++{
++    QuitApplication();
++    return 0L;
++}
++
++bool UnlockControllerHack( StarBASIC* pBasic )
++{
++    bool bRes = false;
++    if ( pBasic && pBasic->IsDocBasic() )
++    {
++        uno::Any aUnoVar;
++        ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( "ThisComponent" ) );
++        SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( pBasic->Find( sVarName, SbxCLASS_DONTCARE ) );
++        if ( pGlobs )
++            aUnoVar = pGlobs->getUnoAny(); 
++        uno::Reference< frame::XModel > xModel( aUnoVar, uno::UNO_QUERY);
++        if ( xModel.is() )
++        {
++            try
++            {
++                xModel->unlockControllers();
++                bRes = true;
++            }
++            catch( uno::Exception& )
++            {
++            }
++        }
++    }
++    return bRes;
++}
+ /////////////////////////////////////////////////////////////////////////////
+ 
+ // Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen
+ // Elemente von anderen Modulen aus gefunden werden koennen.
+ 
+-SbModule::SbModule( const String& rName )
++SbModule::SbModule( const String& rName, bool bVBACompat )
+ 		 : SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASICModule") ) ),
+-		   pImage( NULL ), pBreaks( NULL ), pClassData( NULL )
++		   pImage( NULL ), pBreaks( NULL ), pClassData( NULL ), mbVBACompat( bVBACompat ),  pDocObject( NULL ), bIsProxyModule( false )
+ {
+ 	SetName( rName );
+ 	SetFlag( SBX_EXTSEARCH | SBX_GBLSEARCH );
++	SetModuleType( com::sun::star::script::ModuleType::Normal );
+ }
+ 
+ SbModule::~SbModule()
+@@ -270,7 +344,10 @@ void SbModule::Clear()
+ 
+ SbxVariable* SbModule::Find( const XubString& rName, SbxClassType t )
+ {
++	// make sure a search in an uninstatiated class module will fail
+ 	SbxVariable* pRes = SbxObject::Find( rName, t );
++	if ( bIsProxyModule )
++		return NULL;
+ 	if( !pRes && pImage )
+ 	{
+ 		SbiInstance* pInst = pINST;
+@@ -332,6 +409,64 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, co
+ 		SbxVariable* pVar = pHint->GetVar();
+ 		SbProperty* pProp = PTR_CAST(SbProperty,pVar);
+ 		SbMethod* pMeth = PTR_CAST(SbMethod,pVar);
++		SbProcedureProperty* pProcProperty = PTR_CAST( SbProcedureProperty, pVar );
++		if( pProcProperty )
++		{
++			if( pHint->GetId() == SBX_HINT_DATAWANTED )
++			{
++				String aProcName;
++				aProcName.AppendAscii( "Property Get " );
++				aProcName += pProcProperty->GetName();
++
++				SbxVariable* pPropMeth = Find( aProcName, SbxCLASS_METHOD );
++				if( pPropMeth )
++				{
++					// Setup parameters
++					pPropMeth->SetParameters( pVar->GetParameters() );
++
++					SbxValues aVals;
++					aVals.eType = SbxVARIANT;
++					pPropMeth->Get( aVals );
++					pVar->Put( aVals );
++				}
++			}
++			else if( pHint->GetId() == SBX_HINT_DATACHANGED )
++			{
++				SbxVariable* pPropMeth = NULL;
++
++				bool bSet = pProcProperty->isSet();
++				if( bSet )
++				{
++					pProcProperty->setSet( false );
++
++					String aProcName;
++					aProcName.AppendAscii( "Property Set " );
++					aProcName += pProcProperty->GetName();
++					pPropMeth = Find( aProcName, SbxCLASS_METHOD );
++				}
++				if( !pPropMeth )	// Let
++				{
++					String aProcName;
++					aProcName.AppendAscii( "Property Let " );
++					aProcName += pProcProperty->GetName();
++					pPropMeth = Find( aProcName, SbxCLASS_METHOD );
++				}
++
++				if( pPropMeth )
++				{
++					// Setup parameters
++					SbxArrayRef xArray = new SbxArray;
++					xArray->Put( pPropMeth, 0 );	// Method as parameter 0
++					xArray->Put( pVar, 1 );
++					pPropMeth->SetParameters( xArray );
++
++					SbxValues aVals;
++					pPropMeth->Get( aVals );
++					pPropMeth->SetParameters( NULL );
++				}
++			}
++		}
++
+ 		if( pProp )
+ 		{
+ 			if( pProp->GetModule() != this )
+@@ -372,6 +507,7 @@ void SbModule::SetSource32( const ::rtl::OUString&
+ 	aOUSource = r;
+ 	StartDefinitions();
+ 	SbiTokenizer aTok( r );
++        aTok.SetCompatible( IsVBACompat() );
+ 	while( !aTok.IsEof() )
+ 	{
+ 		SbiToken eEndTok = NIL;
+@@ -396,14 +532,7 @@ void SbModule::SetSource32( const ::rtl::OUString&
+ 				{
+ 					eEndTok = ENDPROPERTY; break;
+ 				}
+-				if( eCurTok == OPTION )
+-				{
+-					eCurTok = aTok.Next();
+-					if( eCurTok == COMPATIBLE
+-					|| ( ( eCurTok == VBASUPPORT ) && ( aTok.Next() == NUMBER ) && ( aTok.GetDbl()== 1 ) ) )
+-						aTok.SetCompatible( true );
+ 				}
+-			}
+ 			eLastTok = eCurTok;
+ 		}
+ 		// Definition der Methode
+@@ -542,16 +671,27 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic
+     if( ((StarBASIC*)p) != pBasic )
+ 	    ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p );
+ }
++bool SbModule::IsVBACompat()
++{
++	return mbVBACompat;
++}
+ 
++void SbModule::SetVBACompat( bool bCompat )
++{
++	mbVBACompat = bCompat;
++}
+ // Ausfuehren eines BASIC-Unterprogramms
+ USHORT SbModule::Run( SbMethod* pMeth )
+ {
++	OSL_TRACE("About to run %s, vba compatmode is %d", rtl::OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), mbVBACompat );
+ 	static USHORT nMaxCallLevel = 0;
+ 	static String aMSOMacroRuntimeLibName = String::CreateFromAscii( "Launcher" );
+ 	static String aMSOMacroRuntimeAppSymbol = String::CreateFromAscii( "Application" );
+ 
+ 	USHORT nRes = 0;
+ 	BOOL bDelInst = BOOL( pINST == NULL );
++        bool bQuit = false;
++{
+ 	StarBASICRef xBasic;
+ 	if( bDelInst )
+ 	{
+@@ -637,10 +777,10 @@ USHORT SbModule::Run( SbMethod* pMeth )
+ 			if( pRt->pNext )
+ 				pRt->pNext->block();
+ 			pINST->pRun = pRt;
+-			if ( SbiRuntime ::isVBAEnabled() )
++			if ( mbVBACompat )
+                         {
+ 				pINST->EnableCompatibility( TRUE );
+-				pRt->SetVBAEnabled( true );
++				//pRt->SetVBAEnabled( true ); // can we get rid of this
+                         }
+ 			while( pRt->Step() ) {}
+ 			if( pRt->pNext )
+@@ -672,6 +812,15 @@ USHORT SbModule::Run( SbMethod* pMeth )
+ 
+ 			delete pRt;
+ 			pMOD = pOldMod;
++			if ( pINST->nCallLvl == 0 && IsVBACompat() )
++			{
++				// VBA always ensure screenupdating is enabled after completing
++				StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
++				if ( pBasic && pBasic->IsDocBasic() )
++				{
++					UnlockControllerHack( pBasic );
++				}
++			}
+ 			if( bDelInst )
+ 			{
+ 				// #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
+@@ -696,6 +845,11 @@ USHORT SbModule::Run( SbMethod* pMeth )
+ 		pINST->nCallLvl--;			// Call-Level wieder runter
+ 		StarBASIC::FatalError( SbERR_STACK_OVERFLOW );
+     }
++		
++	// VBA always ensure screenupdating is enabled after completing
++	StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
++	if ( pBasic && pBasic->IsDocBasic() && !pINST )
++		UnlockControllerHack( pBasic );
+ 	if( bDelInst )
+ 	{
+ 		// #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
+@@ -705,6 +859,15 @@ USHORT SbModule::Run( SbMethod* pMeth )
+ 		delete pINST;
+ 		pINST = NULL;
+ 	}
++	if ( pBasic && pBasic->IsDocBasic() && pBasic->IsQuitApplication() && !pINST )
++            bQuit = true;
++}
++        if ( bQuit )
++        {
++            //QuitApplicationHack();
++            Application::PostUserEvent( LINK( &AsyncQuitHandler::instance(), AsyncQuitHandler, OnAsyncQuit ), NULL );
++
++        }
+ 	return nRes;
+ }
+ 
+@@ -744,6 +907,33 @@ void SbModule::RunInit()
+ }
+ 
+ // Mit private/dim deklarierte Variablen loeschen
++
++void SbModule::AddVarName( const String& aName ) 
++{ 
++	// see if the name is added allready
++	std::vector< String >::iterator it_end = mModuleVariableNames.end();
++	for ( std::vector< String >::iterator it = mModuleVariableNames.begin(); it != it_end; ++it )
++	{
++		if ( aName == *it )
++			return;	
++	}
++	mModuleVariableNames.push_back( aName ); 
++}
++
++void SbModule::RemoveVars()
++{
++    std::vector< String >::iterator it_end = mModuleVariableNames.end();
++    for ( std::vector< String >::iterator it = mModuleVariableNames.begin(); it != it_end; ++it )
++    {
++	// We don't want a Find being called in a derived class ( e.g. 
++	// SbUserform because it could trigger say an initialise event  
++	// which would cause basic to be re-run in the middle of the init ( and remember RemoveVars is called from compile and we don't want code to run as part of the compile )
++	SbxVariableRef p = SbModule::Find( *it, SbxCLASS_PROPERTY );
++	if( p.Is() )
++		Remove (p);
++    }
++}
++
+ void SbModule::ClearPrivateVars()
+ {
+ 	for( USHORT i = 0 ; i < pProps->Count() ; i++ )
+@@ -1124,7 +1314,49 @@ BOOL SbModule::ExceedsLegacyModuleSize()
+ 	return false;
+ }
+ 
++class ErrorHdlResetter
++{
++    Link    mErrHandler;
++    bool mbError;
++    public:
++    ErrorHdlResetter() : mbError( false )
++    {
++        // save error handler 
++        mErrHandler = StarBASIC::GetGlobalErrorHdl();
++        // set new error handler
++        StarBASIC::SetGlobalErrorHdl( LINK( this, ErrorHdlResetter, BasicErrorHdl ) );
++    }
++    ~ErrorHdlResetter()
++    {
++        // restore error handler 
++        StarBASIC::SetGlobalErrorHdl(mErrHandler);
++    }
++    DECL_LINK( BasicErrorHdl, StarBASIC * );
++    bool HasError() { return mbError; }
++};
++IMPL_LINK( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/)
++{
++    mbError = true;
++    return 0;        
++}
+ 
++bool SbModule::HasExeCode()
++{
++
++        ErrorHdlResetter aGblErrHdl;
++	// And empty Image always has the Global Chain set up
++        static const unsigned char pEmptyImage[] = { 0x45, 0x0 , 0x0, 0x0, 0x0 };
++        // lets be stricter for the moment than VBA
++
++	bool bRes = false;
++	if ( !IsCompiled() )
++		Compile();
++	if ( pImage && !( pImage->GetCodeSize() == 5 && ( memcmp( pImage->GetCode(), pEmptyImage, pImage->GetCodeSize() ) == 0 ) )
++        || aGblErrHdl.HasError() )
++		bRes = true;
++	return bRes;
++}
++
+ // Store only image, no source
+ BOOL SbModule::StoreBinaryData( SvStream& rStrm )
+ {
+@@ -1173,7 +1405,6 @@ BOOL SbModule::LoadBinaryData( SvStream& rStrm )
+     return bRet;
+ }
+ 
+-
+ BOOL SbModule::LoadCompleted()
+ {
+ 	SbxArray* p = GetMethods();
+@@ -1241,6 +1472,7 @@ SbMethod::SbMethod( const String& r, SbxDataType t
+ 	nLine1		 =
+ 	nLine2		 = 0;
+ 	refStatics = new SbxArray;
++    mCaller          = 0;
+ 	// AB: 2.7.1996: HACK wegen 'Referenz kann nicht gesichert werden'
+ 	SetFlag( SBX_NO_MODIFY );
+ }
+@@ -1255,6 +1487,7 @@ SbMethod::SbMethod( const SbMethod& r )
+ 	nLine1		 = r.nLine1;
+ 	nLine2		 = r.nLine2;
+         refStatics = r.refStatics; 
++ 	mCaller          = r.mCaller; 
+ 	SetFlag( SBX_NO_MODIFY );
+ }
+ 
+@@ -1323,8 +1556,13 @@ SbxInfo* SbMethod::GetInfo()
+ // Schnittstelle zum Ausfuehren einer Methode aus den Applikationen
+ // #34191# Mit speziellem RefCounting, damit das Basic nicht durch CloseDocument()
+ // abgeschossen werden kann. Rueckgabewert wird als String geliefert.
+-ErrCode SbMethod::Call( SbxValue* pRet )
++ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
+ {
++	if ( pCaller )
++	{
++ 		OSL_TRACE("SbMethod::Call Have been passed a caller 0x%x", pCaller );
++		mCaller = pCaller;
++	}
+ 	// RefCount vom Modul hochzaehlen
+ 	SbModule* pMod_ = (SbModule*)GetParent();
+ 	pMod_->AddRef();
+@@ -1352,7 +1590,7 @@ SbxInfo* SbMethod::GetInfo()
+ 	// Objekte freigeben
+ 	pMod_->ReleaseRef();
+ 	pBasic->ReleaseRef();
+-
++	mCaller = 0;
+ 	return nErr;
+ }
+ 
+@@ -1413,7 +1651,386 @@ SbJScriptMethod::~SbJScriptMethod()
+ 
+ 
+ /////////////////////////////////////////////////////////////////////////
++SbObjModule::SbObjModule( const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible )
++    : SbModule( mInfo.ModuleName, bIsVbaCompatible )
++{
++    SetModuleType( mInfo.ModuleType );
++    if ( mInfo.ModuleType == script::ModuleType::Form )
++    {
++        SetClassName( rtl::OUString::createFromAscii( "Form" ) );
++    }
++    else if ( mInfo.ModuleObject.is() )
++        SetUnoObject( uno::makeAny( mInfo.ModuleObject ) );
++}
++void
++SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException )
++{
++    SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxVariable*)pDocObject);
++    if ( pUnoObj && pUnoObj->getUnoAny() == aObj ) // object is equal, nothing to do
++        return;
++    pDocObject = new SbUnoObject( GetName(), uno::makeAny( aObj ) );
+ 
++    com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > xServiceInfo( aObj, com::sun::star::uno::UNO_QUERY_THROW );
++    if( xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Worksheet" ) ) )
++    {
++        SetClassName( rtl::OUString::createFromAscii( "Worksheet" ) );
++    }
++    else if( xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Workbook" ) ) )
++    {
++        SetClassName( rtl::OUString::createFromAscii( "Workbook" ) );
++    }
++}
++
++SbxVariable*
++SbObjModule::GetObject() 
++{
++    return pDocObject;
++}
++SbxVariable*
++SbObjModule::Find( const XubString& rName, SbxClassType t )
++{
++    //OSL_TRACE("SbObjectModule find for %s", rtl::OUStringToOString(  rName, RTL_TEXTENCODING_UTF8 ).getStr() );
++    SbxVariable* pVar = NULL;
++    if ( !pVar && pDocObject)
++        pVar = pDocObject->Find( rName, t );
++    if ( !pVar )
++        pVar = SbModule::Find( rName, t );
++    return pVar;
++}
++
++typedef ::cppu::WeakImplHelper1< awt::XTopWindowListener > EventListener_BASE;
++
++class FormObjEventListenerImpl : public EventListener_BASE
++{
++    SbUserFormModule* mpUserForm;
++    uno::Reference< lang::XComponent > mxComponent;
++    bool mbDisposed;
++    sal_Bool mbOpened;
++    sal_Bool mbActivated;
++    sal_Bool mbShowing;
++    FormObjEventListenerImpl(); // not defined
++    FormObjEventListenerImpl(const FormObjEventListenerImpl&); // not defined
++public:
++    FormObjEventListenerImpl( SbUserFormModule* pUserForm, const uno::Reference< lang::XComponent >& xComponent ) : mpUserForm( pUserForm ), mxComponent( xComponent) , mbDisposed( false ), mbOpened( sal_False ), mbActivated( sal_False ), mbShowing( sal_False )
++    {
++        if ( mxComponent.is() );
++        {
++	    uno::Reference< awt::XTopWindow > xList( mxComponent, uno::UNO_QUERY_THROW );;
++            //uno::Reference< awt::XWindow > xList( mxComponent, uno::UNO_QUERY_THROW );;
++            OSL_TRACE("*********** Registering the listener");
++            xList->addTopWindowListener( this );
++        }
++    }
++
++    ~FormObjEventListenerImpl()
++    {
++        removeListener();
++    }
++    sal_Bool isShowing() { return mbShowing; }
++    void removeListener()
++    {
++        try
++        {
++            if ( mxComponent.is() && !mbDisposed )
++            {
++                uno::Reference< awt::XTopWindow > xList( mxComponent, uno::UNO_QUERY_THROW );;
++                OSL_TRACE("*********** Removing the listener");
++            	xList->removeTopWindowListener( this );
++                mxComponent = NULL;
++            }
++        }
++        catch( uno::Exception& ) {}
++    } 
++    virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
++    {
++        if ( mpUserForm  )
++        {
++            mbOpened = sal_True;
++            mbShowing = sal_True;
++            if ( mbActivated )
++            {
++                mbOpened = mbActivated = sal_False;
++                mpUserForm->triggerActivateEvent();
++            }
++        }
++    }
++	
++    //liuchen 2009-7-21, support Excel VBA Form_QueryClose event
++    virtual void SAL_CALL windowClosing( const lang::EventObject& e ) throw (uno::RuntimeException)
++    {    
++		uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY );
++		if ( xDialog.is() )
++		{
++			uno::Reference< awt::XControl > xControl( xDialog, uno::UNO_QUERY );
++			if ( xControl->getPeer().is() )
++			{
++				uno::Reference< document::XVbaMethodParameter > xVbaMethodParameter( xControl->getPeer(), uno::UNO_QUERY );
++				if ( xVbaMethodParameter.is() )
++				{	
++					sal_Int8 nCancel = 0;
++					sal_Int8 nCloseMode = 0;
++
++					Sequence< Any > aParams;
++					aParams.realloc(2);
++					aParams[0] <<= nCancel;
++					aParams[1] <<= nCloseMode;
++
++					mpUserForm->triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ),
++												aParams);
++					xVbaMethodParameter->setVbaMethodParameter( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Cancel")), aParams[0]);
++					return;
++	
++				}			
++			}		
++		}
++    	
++    	mpUserForm->triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ) );
++    }
++	//liuchen 2009-7-21
++	
++    virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) { mbOpened = sal_False; mbShowing = sal_False; }
++    virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) {}
++    virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException){}
++    virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
++    {
++        if ( mpUserForm  )
++        {
++            mbActivated = sal_True;
++            if ( mbOpened )
++            {
++                mbOpened = mbActivated = sal_False;
++                mpUserForm->triggerActivateEvent();
++            }
++        }
++    }
++   
++    virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
++    {
++        if ( mpUserForm  )
++            mpUserForm->triggerDeActivateEvent();
++    }
++
++
++    virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException)
++    {
++        OSL_TRACE("** Userform/Dialog disposing");
++        mbDisposed = true;
++        uno::Any aSource;
++        aSource <<= Source;   
++        mxComponent = NULL;
++        if ( mpUserForm )
++            mpUserForm->ResetApiObj();
++    }
++};
++
++SbUserFormModule::SbUserFormModule( const com::sun::star::script::ModuleInfo& mInfo, bool bIsCompat )
++    :SbObjModule( mInfo, bIsCompat ), mbInit( false )
++{
++        m_xModel.set( mInfo.ModuleObject, uno::UNO_QUERY_THROW );
++}
++
++void SbUserFormModule::ResetApiObj()
++{
++        if (  m_xDialog.is() ) // probably someone close the dialog window
++	{
++            triggerTerminateEvent();
++        }
++        pDocObject = NULL;
++	m_xDialog = NULL;
++}
++
++void SbUserFormModule::triggerMethod( const String& aMethodToRun )
++{
++	Sequence< Any > aArguments;
++	triggerMethod( aMethodToRun, aArguments );
++}
++void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any >& aArguments)
++{
++	OSL_TRACE("*** trigger %s ***", rtl::OUStringToOString( aMethodToRun, RTL_TEXTENCODING_UTF8 ).getStr() );
++	// Search method
++	SbxVariable* pMeth = SbObjModule::Find( aMethodToRun, SbxCLASS_METHOD );
++	if( pMeth )
++	{		
++                 //liuchen 2009-7-21, support Excel VBA UserForm_QueryClose event with parameters
++		if ( aArguments.getLength() > 0 )   // Setup parameters
++		{
++			SbxArrayRef xArray = new SbxArray;
++			xArray->Put( pMeth, 0 );	// Method as parameter 0
++
++			for ( sal_Int32 i = 0; i < aArguments.getLength(); ++i )
++			{
++				SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
++                unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), aArguments[i] );
++                xArray->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
++
++				// Enable passing by ref
++				if ( xSbxVar->GetType() != SbxVARIANT )
++					xSbxVar->SetFlag( SBX_FIXED );
++			}
++			pMeth->SetParameters( xArray );
++
++			SbxValues aVals;
++			pMeth->Get( aVals );
++			
++			for ( sal_Int32 i = 0; i < aArguments.getLength(); ++i )
++			{
++				aArguments[i] = sbxToUnoValue( xArray->Get( static_cast< USHORT >(i) + 1) );
++			}		
++			pMeth->SetParameters( NULL );
++		}
++		else
++//liuchen 2009-7-21
++		{
++			SbxValues aVals;
++			pMeth->Get( aVals );
++		}
++	}
++}
++
++void SbUserFormModule::triggerActivateEvent( void )
++{
++        OSL_TRACE("**** entering SbUserFormModule::triggerActivate");
++	triggerMethod( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserForm_activate") ) );
++        OSL_TRACE("**** leaving SbUserFormModule::triggerActivate");
++}
++
++void SbUserFormModule::triggerDeActivateEvent( void )
++{
++        OSL_TRACE("**** SbUserFormModule::triggerDeActivate");
++	triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_DeActivate") ) );
++}
++
++void SbUserFormModule::triggerInitializeEvent( void )
++
++{
++	if ( mbInit )
++		return;
++        OSL_TRACE("**** SbUserFormModule::triggerInitializeEvent");
++	static String aInitMethodName( RTL_CONSTASCII_USTRINGPARAM("Userform_Initialize") );
++	triggerMethod( aInitMethodName );
++	mbInit = true;
++}
++
++void SbUserFormModule::triggerTerminateEvent( void )
++{
++        OSL_TRACE("**** SbUserFormModule::triggerTerminateEvent");
++	static String aTermMethodName( RTL_CONSTASCII_USTRINGPARAM("Userform_Terminate") );
++	triggerMethod( aTermMethodName );
++	mbInit=false;
++}
++
++void SbUserFormModule::load()
++{
++    OSL_TRACE("** load() ");
++    // forces a load
++    if ( !pDocObject )
++        InitObject();
++}
++
++//liuchen 2009-7-21 change to accmordate VBA's beheavior
++void SbUserFormModule::Unload()
++{
++    OSL_TRACE("** Unload() ");
++
++	sal_Int8 nCancel = 0;
++	sal_Int8 nCloseMode = 1;
++
++	Sequence< Any > aParams;
++	aParams.realloc(2);
++	aParams[0] <<= nCancel;
++	aParams[1] <<= nCloseMode;
++
++	triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ), aParams);
++
++	aParams[0] >>= nCancel;
++	if (nCancel == 1)
++	{
++		return;
++	}
++	
++    if ( m_xDialog.is() )
++    {
++		triggerTerminateEvent();
++    }
++	// Search method
++	SbxVariable* pMeth = SbObjModule::Find( String( RTL_CONSTASCII_USTRINGPARAM( "UnloadObject" ) ), SbxCLASS_METHOD );
++	if( pMeth )
++	{
++		OSL_TRACE("Attempting too run the UnloadObjectMethod");
++                m_xDialog = NULL; //release ref to the uno object
++		SbxValues aVals;
++               FormObjEventListenerImpl* pFormListener = dynamic_cast< FormObjEventListenerImpl* >( m_DialogListener.get() );
++		bool bWaitForDispose = true; // assume dialog is showing
++                if ( pFormListener ) 
++		{
++			bWaitForDispose = pFormListener->isShowing();
++			OSL_TRACE("Showing %d", bWaitForDispose );
++		}
++		pMeth->Get( aVals);
++                if ( !bWaitForDispose )
++                {
++                    // we've either already got a dispose or we'er never going to get one 
++		    ResetApiObj();
++                } // else wait for dispose
++		OSL_TRACE("UnloadObject completed ( we hope )");
++	}
++}
++//liuchen
++
++void SbUserFormModule::InitObject()
++{
++    try
++    {
++
++        String aHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
++        SbUnoObject* pGlobs = (SbUnoObject*)GetParent()->Find( aHook, SbxCLASS_DONTCARE ); 
++        if ( m_xModel.is() && pGlobs )
++        {
++            
++            uno::Reference< lang::XMultiServiceFactory > xVBAFactory( pGlobs->getUnoAny(), uno::UNO_QUERY_THROW );
++            uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
++            uno::Sequence< uno::Any > aArgs(1);
++            aArgs[ 0 ] <<= m_xModel;
++            rtl::OUString sDialogUrl( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:" ) );
++            rtl::OUString sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
++            if ( this->GetParent()->GetName().Len() )
++                sProjectName = this->GetParent()->GetName(); 
++            sDialogUrl = sDialogUrl.concat( sProjectName ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) ); 
++
++            uno::Reference< awt::XDialogProvider > xProvider( xFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.DialogProvider")), aArgs  ), uno::UNO_QUERY_THROW );
++            m_xDialog = xProvider->createDialog( sDialogUrl );
++
++            // create vba api object
++            aArgs.realloc( 3 );
++            aArgs[ 0 ] = uno::Any();
++            aArgs[ 1 ] <<= m_xDialog;
++            aArgs[ 2 ] <<= m_xModel;
++            pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.UserForm")), aArgs  ) ) );
++            uno::Reference< lang::XComponent > xComponent( aArgs[ 1 ], uno::UNO_QUERY_THROW );
++            // remove old listener if it exists
++            FormObjEventListenerImpl* pFormListener = dynamic_cast< FormObjEventListenerImpl* >( m_DialogListener.get() );
++            if ( pFormListener )
++                pFormListener->removeListener();
++            m_DialogListener = new FormObjEventListenerImpl( this, xComponent );
++
++            triggerInitializeEvent();
++        } 
++    }
++    catch( uno::Exception& e )
++    {
++    }
++
++}
++
++SbxVariable*
++SbUserFormModule::Find( const XubString& rName, SbxClassType t )
++{
++    if ( !pDocObject && !GetSbData()->bRunInit && pINST )
++        InitObject();
++    return SbObjModule::Find( rName, t );
++}
++/////////////////////////////////////////////////////////////////////////
++
+ SbProperty::SbProperty( const String& r, SbxDataType t, SbModule* p )
+ 		: SbxProperty( r, t ), pMod( p )
+ {
+Index: basic/source/comp/exprtree.cxx
+===================================================================
+--- basic/source/comp/exprtree.cxx	(revision 276159)
++++ basic/source/comp/exprtree.cxx	(revision 276288)
+@@ -378,9 +378,13 @@ SbiExprNode* SbiExpression::Term( void )
+ 		// Typ SbxOBJECT sein
+ 		if( pDef->GetType() != SbxOBJECT && pDef->GetType() != SbxVARIANT )
+ 		{
++			// defer error until runtime if in vba mode
++			if ( !pParser->IsVBASupportOn() )
++                        {
+ 			pParser->Error( SbERR_BAD_DECLARATION, aSym );
+ 			bError = TRUE;
+ 		}
++		}
+ 		if( !bError )
+ 			pNd->aVar.pNext = ObjTerm( *pDef );
+ 	}
+@@ -716,7 +720,7 @@ SbiExprNode* SbiExpression::Like()
+ 			pNd = new SbiExprNode( pParser, pNd, eTok, Comp() ), nCount++;
+ 		}
+ 		// Mehrere Operatoren hintereinander gehen nicht
+-		if( nCount > 1 )
++		if( nCount > 1 && !pParser->IsVBASupportOn() )
+ 		{
+ 			pParser->Error( SbERR_SYNTAX );
+ 			bError = TRUE;
+Index: basic/source/comp/token.cxx
+===================================================================
+--- basic/source/comp/token.cxx	(revision 276159)
++++ basic/source/comp/token.cxx	(revision 276288)
+@@ -61,6 +61,7 @@ static TokenTable aTokTable_Basic [] = {		// Token
+ 	{ ANY,		"Any" },
+ 	{ APPEND,	"Append" },
+ 	{ AS,		"As" },
++	{ ATTRIBUTE,"Attribute" },
+ 	{ BASE,		"Base" },
+ 	{ BINARY,	"Binary" },
+ 	{ TBOOLEAN,	"Boolean" },
+@@ -593,6 +594,13 @@ special:
+ 		}
+ 		return eCurTok;
+ 	}
++
++	// check whether the keyword has been dim as a variable
++	if( IsSymbol( tp->t ) )
++	{
++		return eCurTok = SYMBOL;
++	}
++	
+ 	// Sind Datentypen Keywords?
+ 	// Nur nach AS, sonst sind es Symbole!
+ 	// Es gibt ja ERROR(), DATA(), STRING() etc.
+Index: basic/source/comp/sbcomp.cxx
+===================================================================
+--- basic/source/comp/sbcomp.cxx	(revision 276159)
++++ basic/source/comp/sbcomp.cxx	(revision 276288)
+@@ -134,6 +134,7 @@ BOOL SbModule::Compile()
+ 	if( bRet )
+ 	{
+ 		pBasic->ClearAllModuleVars();
++		RemoveVars(); // remove 'this' Modules variables
+ 		// clear all method statics
+ 		for( USHORT i = 0; i < pMethods->Count(); i++ )
+ 		{
+Index: basic/source/comp/codegen.cxx
+===================================================================
+--- basic/source/comp/codegen.cxx	(revision 276159)
++++ basic/source/comp/codegen.cxx	(revision 276288)
+@@ -130,12 +130,12 @@ void SbiCodeGen::Save()
+ 	// OPTION EXPLICIT-Flag uebernehmen
+ 	if( pParser->bExplicit )
+ 		p->SetFlag( SBIMG_EXPLICIT );
+-	if( pParser->IsVBASupportOn() )
+-		p->SetFlag( SBIMG_VBASUPPORT );
+ 	
+ 	int nIfaceCount = 0;
+-	if( pParser->bClassModule )
++	if( rMod.mnType == com::sun::star::script::ModuleType::Class )
+ 	{
++                OSL_TRACE("COdeGen::save() classmodule processing");
++		rMod.bIsProxyModule = true;
+ 		p->SetFlag( SBIMG_CLASSMODULE );
+ 		pCLASSFAC->AddClassModule( &rMod );
+ 
+@@ -158,6 +158,10 @@ void SbiCodeGen::Save()
+ 	else
+ 	{
+ 		pCLASSFAC->RemoveClassModule( &rMod );
++		// Only a ClassModule can revert to Normal
++                if ( rMod.mnType == com::sun::star::script::ModuleType::Class )
++			rMod.mnType = com::sun::star::script::ModuleType::Normal;
++		rMod.bIsProxyModule = false;
+ 	}
+ 	if( pParser->bText )
+ 		p->SetFlag( SBIMG_COMPARETEXT );
+@@ -240,6 +244,8 @@ void SbiCodeGen::Save()
+ 					if( nPass == 1 )
+ 						aPropName = aPropName.Copy( aIfaceName.Len() + 1 );
+ 					SbProcedureProperty* pProcedureProperty = NULL;
++                                        OSL_TRACE("*** getProcedureProperty for thing %s",
++						rtl::OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() );
+ 					pProcedureProperty = rMod.GetProcedureProperty( aPropName, ePropType );
+ 				}
+ 				if( nPass == 1 )
+Index: basic/source/comp/dim.cxx
+===================================================================
+--- basic/source/comp/dim.cxx	(revision 276159)
++++ basic/source/comp/dim.cxx	(revision 276288)
+@@ -32,7 +32,9 @@
+ #include "precompiled_basic.hxx"
+ #include <basic/sbx.hxx>
+ #include "sbcomp.hxx"
++#include "sbunoobj.hxx"
+ 
++
+ // Deklaration einer Variablen
+ // Bei Fehlern wird bis zum Komma oder Newline geparst.
+ // Returnwert: eine neue Instanz, die eingefuegt und dann geloescht wird.
+@@ -40,7 +42,10 @@
+ 
+ SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, BOOL bStatic, BOOL bConst )
+ {
+-	if( !TestSymbol() ) return NULL;
++	// Some keywords can be dim as varibles like " Sub Test( Name as String )"
++	eCurTok = Peek();
++	BOOL bKwdOk = IsVBASupportOn() ? BOOL( (eCurTok == NAME) || (eCurTok == LINE) || (eCurTok == TEXT) ): FALSE;
++	if( !TestSymbol( bKwdOk ) ) return NULL;
+ 	SbxDataType t = eScanType;
+ 	SbiSymDef* pDef = bConst ? new SbiConstDef( aSym ) : new SbiSymDef( aSym );
+ 	SbiDimList* pDim = NULL;
+@@ -144,7 +149,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bA
+ 							}
+ 						}
+ 					}
+-					else if( rEnumArray->Find( aCompleteName, SbxCLASS_OBJECT ) )
++					else if( rEnumArray->Find( aCompleteName, SbxCLASS_OBJECT ) || ( IsVBASupportOn() && VBAConstantHelper::instance().isVBAConstantType( aCompleteName ) ) )
+ 					{
+ 						eType = SbxLONG;
+ 						break;
+@@ -211,7 +216,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStati
+ 		Next(), bConst = TRUE;
+ 
+ 	// #110004 It can also be a sub/function
+-	if( !bConst && (eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ||
++	if( !bConst && (eCurTok == DECLARE || eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ||
+ 					eCurTok == STATIC || eCurTok == ENUM ) )
+ 	{
+ 		// Next token is read here, because !bConst
+@@ -222,6 +227,12 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStati
+ 			Next();
+ 			DefStatic( bPrivate );
+ 		}
++		else if( eCurTok == DECLARE )
++                {
++			Next();
++                        DefDeclare( bPrivate ); 
++                        return;
++                }
+ 		else if( eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY )
+ 		{
+ 			// End global chain if necessary (not done in 
+@@ -395,6 +406,9 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStati
+ 				aExpr.Gen();
+ 				SbiOpcode eOp_ = pDef->IsNew() ? _CREATE : _TCREATE;
+ 				aGen.Gen( eOp_, pDef->GetId(), pDef->GetTypeId() );
++				if ( bVBASupportOn )
++					aGen.Gen( _VBASET );
++				else	
+ 				aGen.Gen( _SET );
+ 			}
+ 		}
+@@ -570,14 +584,7 @@ void SbiParser::DefType( BOOL bPrivate )
+ 				pElem = VarDecl(&pDim,FALSE,FALSE);
+ 				if( !pElem )
+ 					bDone = TRUE;	// Error occured
+-				if( pDim )
+-				{
+-					// HOT FIX, to be updated
+-					delete pDim;
+-					Error( SbERR_NO_STRINGS_ARRAYS );
+ 				}
+-
+-		}
+ 		if( pElem )
+ 		{
+ 			SbxArray *pTypeMembers = pType -> GetProperties();
+@@ -586,6 +593,44 @@ void SbiParser::DefType( BOOL bPrivate )
+ 			else
+ 			{
+ 				SbxProperty *pTypeElem = new SbxProperty (pElem->GetName(),pElem->GetType());
++				if( pDim )
++				{
++					SbxDimArray* pArray = new SbxDimArray( pElem->GetType() );	
++					if ( pDim->GetSize() )
++					{
++						// Dimension the target array
++						
++						for ( int i=0; i<pDim->GetSize();++i )
++						{
++
++							INT32 ub = -1;
++							INT32 lb = nBase;
++							SbiExprNode* pNode =  pDim->Get(i)->GetExprNode();
++							ub = pNode->GetNumber();
++							if ( !pDim->Get( i )->IsBased() ) // each dim is low/up
++							{
++								if (  ++i >= pDim->GetSize() ) // trouble
++									StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
++								pNode =  pDim->Get(i)->GetExprNode();
++								lb = ub;
++								ub = pNode->GetNumber();
++							}
++							else if ( !bCompatible )
++								ub += nBase;
++							pArray->AddDim32( lb, ub );      
++						}
++						pArray->setHasFixedSize( true );
++					}
++					else
++						pArray->unoAddDim( 0, -1 ); // variant array
++					USHORT nSavFlags = pTypeElem->GetFlags();
++					// need to reset the FIXED flag 
++					// when calling PutObject ( because the type will not match Object ) 	
++					pTypeElem->ResetFlag( SBX_FIXED );
++					pTypeElem->PutObject( pArray );
++					pTypeElem->SetFlags( nSavFlags );
++				}
++				delete pDim;
+ 				pTypeMembers->Insert( pTypeElem, pTypeMembers->Count() );
+ 			}
+ 			delete pElem;
+@@ -872,6 +917,11 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
+ 
+ void SbiParser::Declare()
+ {
++	DefDeclare( FALSE );
++}
++
++void SbiParser::DefDeclare( BOOL bPrivate )
++{
+ 	Next();
+ 	if( eCurTok != SUB && eCurTok != FUNCTION )
+ 	  Error( SbERR_UNEXPECTED, eCurTok );
+@@ -898,10 +948,31 @@ void SbiParser::Declare()
+ 			}
+ 			else
+ 				aPublics.Add( pDef );
++			if ( pDef )
++				pDef->SetPublic( !bPrivate );
++			
+ 		}
+ 	}
+ }
+ 
++void SbiParser::Attribute()
++{
++	// TODO: Need to implement the method as an attributed object.
++	while( Next() != EQ )
++	{
++		String aSym( GetSym() );
++		if( Next() != DOT) 
++			break;
++	}
++	
++	if( eCurTok != EQ )
++		Error( SbERR_SYNTAX );
++	else
++		SbiExpression aValue( this );
++
++	// Don't generate any code - just discard it.
++}
++
+ // Aufruf einer SUB oder FUNCTION
+ 
+ void SbiParser::Call()
+Index: basic/source/comp/parser.cxx
+===================================================================
+--- basic/source/comp/parser.cxx	(revision 276159)
++++ basic/source/comp/parser.cxx	(revision 276288)
+@@ -51,6 +51,7 @@ struct SbiStatement {
+ #define	N	FALSE
+ 
+ static SbiStatement StmntTable [] = {
++{ ATTRIBUTE, &SbiParser::Attribute, Y, Y, }, // ATTRIBUTE
+ { CALL,		&SbiParser::Call,   	N, Y, }, // CALL
+ { CLOSE,	&SbiParser::Close,		N, Y, }, // CLOSE
+ { _CONST_,	&SbiParser::Dim, 		Y, Y, }, // CONST
+@@ -137,13 +138,15 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm
+ 	pProc    = NULL;
+ 	pStack   = NULL;
+ 	pWithVar = NULL;
++	pCurStat = NULL;
+ 	nBase	 = 0;
+ 	bText	 =
+ 	bGblDefs =
+ 	bNewGblDefs =
+ 	bSingleLineIf =
+ 	bExplicit = FALSE;
+-	bClassModule = FALSE;
++	bClassModule = ( pm->GetModuleType() == com::sun::star::script::ModuleType::Class );
++	OSL_TRACE("Parser - %s, bClassModule %d", rtl::OUStringToOString( pm->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), bClassModule );
+ 	pPool	 = &aPublics;
+ 	for( short i = 0; i < 26; i++ )
+ 		eDefTypes[ i ] = SbxVARIANT;    // Kein expliziter Defaulttyp
+@@ -156,6 +159,10 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm
+ 
+ 	rTypeArray = new SbxArray; // Array fuer Benutzerdefinierte Typen
+ 	rEnumArray = new SbxArray; // Array for Enum types
++	bVBASupportOn = pm->IsVBACompat();
++	if ( bVBASupportOn )
++		EnableCompatibility();
++
+ }
+ 
+ 
+@@ -302,6 +309,26 @@ void SbiParser::TestEoln()
+ 	}
+ }
+ 
++// If some keywords e.g. Name have been dim as a variable, 
++// they should be treated as symbol
++BOOL SbiParser::IsSymbol( SbiToken t )
++{
++	// FIXME: if "name" is a argument in a subroutine like "Sub Test( name as String )".
++	if( IsVBASupportOn() && ( t == NAME || t == LINE || t == TEXT ))
++	{
++		if( pCurStat && ( pCurStat->eTok == DIM || pCurStat->eTok == PUBLIC ||
++		  pCurStat->eTok == PRIVATE || pCurStat->eTok == GLOBAL	))
++		{
++			return TRUE;
++		}
++    	if( pPool->Find(aSym) )
++    	{
++        	return TRUE;
++    	}
++	}	
++    return FALSE;
++}
++
+ // Parsing eines Statement-Blocks
+ // Das Parsing laeuft bis zum Ende-Token.
+ 
+@@ -378,6 +405,18 @@ BOOL SbiParser::Parse()
+ 		Next(); return TRUE;
+ 	}
+ 
++        // In vba it's possible to do Error.foobar ( even if it results in
++	// a runtime error
++        if ( eCurTok == _ERROR_ && IsVBASupportOn() ) // we probably need to define a subset of keywords where this madness applies e.g. if ( IsVBASupportOn() && SymbolCanBeRedined( eCurTok ) )
++        {
++            SbiTokenizer tokens( *(SbiTokenizer*)this );
++            tokens.Next();
++            if ( tokens.Peek()  == DOT )
++            {
++                eCurTok = SYMBOL;
++		ePush = eCurTok;
++            }
++	}
+ 	// Kommt ein Symbol, ist es entweder eine Variable( LET )
+ 	// oder eine SUB-Prozedur( CALL ohne Klammern )
+ 	// DOT fuer Zuweisungen im WITH-Block: .A=5
+@@ -425,7 +464,9 @@ BOOL SbiParser::Parse()
+ 				if( ( p->bSubr && (eCurTok != STATIC || Peek() == SUB || Peek() == FUNCTION ) ) ||
+ 						eCurTok == SUB || eCurTok == FUNCTION )
+ 					aGen.Statement();
++				pCurStat = p;	
+ 				(this->*( p->Func ) )();
++				pCurStat = NULL;
+ 				SbxError nSbxErr = SbxBase::GetError();
+ 				if( nSbxErr )
+ 					SbxBase::ResetError(), Error( (SbError)nSbxErr );
+@@ -754,8 +795,9 @@ void SbiParser::Option()
+ 
+ 		case CLASSMODULE:
+ 			bClassModule = TRUE; 
++			aGen.GetModule().SetModuleType( com::sun::star::script::ModuleType::Class );
+ 			break;
+-		case VBASUPPORT:
++		case VBASUPPORT: // Option VBASupport used to override the module mode ( in fact this must reset the mode
+ 			if( Next() == NUMBER )
+ 			{
+ 				if ( nVal == 1 || nVal == 0 )
+@@ -763,6 +805,10 @@ void SbiParser::Option()
+ 					bVBASupportOn = ( nVal == 1 );
+ 					if ( bVBASupportOn )
+ 						EnableCompatibility();
++					// if the module setting is different
++					// reset it to what the Option tells us
++					if ( bVBASupportOn != aGen.GetModule().IsVBACompat() )
++						aGen.GetModule().SetVBACompat( bVBASupportOn );
+ 					break;
+ 				}
+ 			}
+Index: basic/inc/basic/basmgr.hxx
+===================================================================
+--- basic/inc/basic/basmgr.hxx	(revision 276159)
++++ basic/inc/basic/basmgr.hxx	(revision 276288)
+@@ -231,13 +231,15 @@ class BasicManager : public SfxBroadcaster
+     ::com::sun::star::uno::Any
+                     SetGlobalUNOConstant( const sal_Char* _pAsciiName, const ::com::sun::star::uno::Any& _rValue );
+ 
++    /** retrieves a global constant in the basic library, referring to some UNO object, returns true if a value is found ( value is in aOut ) false otherwise. */
++                    bool GetGlobalUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
+     /** determines whether there are password-protected modules whose size exceedes the
+         legacy module size
+         @param _out_rModuleNames
+             takes the names of modules whose size exceeds the legacy limit
+     */
+     bool            LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< rtl::OUString >& _out_rModuleNames );
+-
++    bool HasExeCode( const String& ); 
+ private:
+ 	BOOL		    IsReference( USHORT nLib );
+ 
+Index: basic/inc/basic/sbmeth.hxx
+===================================================================
+--- basic/inc/basic/sbmeth.hxx	(revision 276159)
++++ basic/inc/basic/sbmeth.hxx	(revision 276288)
+@@ -49,6 +49,7 @@ class SbMethod : public SbxMethod
+ 	friend class SbIfaceMapperMethod;
+ 
+ 	SbMethodImpl* mpSbMethodImpl;			// Impl data
++	SbxVariable* mCaller;                   // caller
+ 	SbModule* pMod;
+ 	USHORT    nDebugFlags;
+ 	USHORT	  nLine1, nLine2;
+@@ -75,7 +76,7 @@ class SbMethod : public SbxMethod
+ 	void 	  GetLineRange( USHORT&, USHORT& );
+ 
+ 	// Schnittstelle zum Ausfuehren einer Methode aus den Applikationen
+-	virtual ErrCode Call( SbxValue* pRet = NULL );
++	virtual ErrCode Call( SbxValue* pRet = NULL,  SbxVariable* pCaller = NULL );
+ 	virtual void Broadcast( ULONG nHintId );
+ };
+ 
+Index: basic/inc/basic/sbuno.hxx
+===================================================================
+--- basic/inc/basic/sbuno.hxx	(revision 276159)
++++ basic/inc/basic/sbuno.hxx	(revision 276288)
+@@ -41,6 +41,7 @@ SbxObjectRef GetSbUnoObject( const String& aName,
+ 
+ // Force creation of all properties for debugging
+ void createAllObjectProperties( SbxObject* pObj );
++void SetSbUnoObjectDfltPropName( SbxObject* pObj );
+ 
+ ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
+ 
+Index: basic/inc/basic/sbstar.hxx
+===================================================================
+--- basic/inc/basic/sbstar.hxx	(revision 276159)
++++ basic/inc/basic/sbstar.hxx	(revision 276288)
+@@ -40,6 +40,7 @@
+ 
+ #include <basic/sbdef.hxx>
+ #include <basic/sberrors.hxx>
++#include <com/sun/star/script/ModuleInfo.hpp>
+ 
+ class SbModule;                     // completed module
+ class SbiInstance;                  // runtime instance
+@@ -72,8 +73,14 @@ class StarBASIC : public SbxObject
+ 	BOOL			bNoRtl;                 // if TRUE: do not search RTL
+ 	BOOL			bBreak;                 // if TRUE: Break, otherwise Step
+ 	BOOL			bDocBasic;
++    BOOL            bVBAEnabled;
+ 	BasicLibInfo*	pLibInfo;			// Info block for basic manager
+ 	SbLanguageMode	eLanguageMode;		// LanguageMode of the basic object
++	BOOL			bQuit;
++
++	SbxObjectRef pVBAGlobals; 
++	SbxObject* getVBAGlobals( );
++
+ protected:
+ 	BOOL 			CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
+ private:
+@@ -115,6 +122,7 @@ class StarBASIC : public SbxObject
+ 	// Compiler-Interface
+ 	SbModule*   	MakeModule( const String& rName, const String& rSrc );
+     SbModule*   	MakeModule32( const String& rName, const ::rtl::OUString& rSrc );
++    SbModule*       MakeModule32( const com::sun::star::script::ModuleInfo& mInfo );
+ 	BOOL			Compile( SbModule* );
+ 	BOOL 			Disassemble( SbModule*, String& rText );
+ 	static void 	Stop();
+@@ -187,6 +195,8 @@ class StarBASIC : public SbxObject
+ 					( const String& rName, USHORT& rStatus );
+ 	static SbMethod* GetActiveMethod( USHORT nLevel = 0 );
+ 	static SbModule* GetActiveModule();
++    void SetVBAEnabled( BOOL bEnabled );
++    BOOL isVBAEnabled();
+ 
+ 	// #60175 TRUE: SFX-Resource is not displayed on basic errors
+ 	static void StaticSuppressSfxResource( BOOL bSuppress );
+@@ -196,6 +206,10 @@ class StarBASIC : public SbxObject
+ 
+ 	SbxObjectRef getRTL( void ) { return pRtl; }
+ 	BOOL IsDocBasic() { return bDocBasic; }
++	SbxVariable* VBAFind( const String& rName, SbxClassType t );
++	bool GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
++	void QuitAndExitApplication();
++	BOOL IsQuitApplication() { return bQuit; };
+ };
+ 
+ #ifndef __SB_SBSTARBASICREF_HXX
+Index: basic/inc/basic/sbobjmod.hxx
+===================================================================
+--- basic/inc/basic/sbobjmod.hxx	(revision 0)
++++ basic/inc/basic/sbobjmod.hxx	(revision 276288)
+@@ -0,0 +1,96 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: sbobjmod.hxx,v $
++ *
++ *  $Revision: 1.4 $
++ *
++ *  last change: $Author:  $ $Date: 2007/08/27 16:31:39 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef _SB_OBJMOD_HXX
++#define _SB_OBJMOD_HXX
++
++#include <basic/sbmod.hxx>
++#include <basic/sbstar.hxx>
++#include <com/sun/star/script/ModuleInfo.hpp>
++#include <com/sun/star/lang/XEventListener.hpp>
++#include <com/sun/star/awt/XDialog.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++
++namespace css = ::com::sun::star;
++
++// Basic-Module for excel object.
++
++class SbObjModule : public SbModule
++{
++    SbObjModule( const SbObjModule& );
++    SbObjModule();
++public:
++    TYPEINFO();
++    SbObjModule( const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
++    virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
++    SbxVariable* GetObject();
++    void SetUnoObject( const com::sun::star::uno::Any& aObj )throw ( com::sun::star::uno::RuntimeException ) ;
++};
++
++class SbUserFormModule : public SbObjModule
++{
++    css::uno::Reference<css::lang::XEventListener> m_DialogListener;
++    css::uno::Reference<css::awt::XDialog> m_xDialog;
++    css::uno::Reference<css::frame::XModel> m_xModel;
++    String sFormName;
++    bool mbInit;
++    SbUserFormModule( const SbUserFormModule& );
++    SbUserFormModule();
++
++protected:
++    virtual void InitObject();
++public:
++    TYPEINFO();
++    SbUserFormModule( const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
++    virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
++    void ResetApiObj();
++    void Unload();
++    void load();
++    void triggerMethod( const String& );
++    void triggerMethod( const String&, css::uno::Sequence< css::uno::Any >&  );
++    void triggerActivateEvent();
++    void triggerDeActivateEvent();
++    void triggerInitializeEvent();
++    void triggerTerminateEvent();
++};
++
++#ifndef __SB_SBOBJMODULEREF_HXX
++#define __SB_SBOBJMODULEREF_HXX
++
++SV_DECL_IMPL_REF(SbObjModule);
++
++#endif
++#endif
++
+Index: basic/inc/basic/sberrors.hxx
+===================================================================
+--- basic/inc/basic/sberrors.hxx	(revision 276159)
++++ basic/inc/basic/sberrors.hxx	(revision 276288)
+@@ -290,6 +290,8 @@ typedef ULONG SbError;
+ #define	ERRCODE_BASIC_LOOP_NOT_INIT			((LAST_SBX_ERROR_ID+109UL) | ERRCODE_AREA_SBX | \
+ 											ERRCODE_CLASS_COMPILER)				// For loop not initialized
+ 
++#define	ERRCODE_BASIC_COMPAT				((LAST_SBX_ERROR_ID+103UL)| ERRCODE_AREA_SBX | ERRCODE_CLASS_RUNTIME)
++
+ // Map old codes to new codes
+ #define	SbERR_SYNTAX						ERRCODE_BASIC_SYNTAX
+ #define	SbERR_NO_GOSUB						ERRCODE_BASIC_NO_GOSUB
+@@ -413,6 +415,7 @@ typedef ULONG SbError;
+ #define	SbERR_PROG_TOO_LARGE                ERRCODE_BASIC_PROG_TOO_LARGE
+ #define	SbERR_NO_STRINGS_ARRAYS             ERRCODE_BASIC_NO_STRINGS_ARRAYS
+ #define	SbERR_BASIC_EXCEPTION               ERRCODE_BASIC_EXCEPTION
++#define	SbERR_BASIC_COMPAT                  ERRCODE_BASIC_COMPAT
+ #define	SbERR_BASIC_ARRAY_FIX				ERRCODE_BASIC_ARRAY_FIX
+ #define	SbERR_BASIC_STRING_OVERFLOW			ERRCODE_BASIC_STRING_OVERFLOW
+ #define	SbERR_BASIC_EXPR_TOO_COMPLEX		ERRCODE_BASIC_EXPR_TOO_COMPLEX
+Index: basic/inc/basic/sbmod.hxx
+===================================================================
+--- basic/inc/basic/sbmod.hxx	(revision 276159)
++++ basic/inc/basic/sbmod.hxx	(revision 276288)
+@@ -37,7 +37,8 @@
+ #ifndef _RTL_USTRING_HXX
+ #include <rtl/ustring.hxx>
+ #endif
+-
++#include <com/sun/star/script/ModuleType.hpp>
++#include <vector>
+ class SbMethod;
+ class SbProperty;
+ class SbiRuntime;
+@@ -59,6 +60,9 @@ class SbModule : public SbxObject
+ 	friend class	SbClassModuleObject;
+ 
+ 	SbModuleImpl*	mpSbModuleImpl;		// Impl data
++	std::vector< String > mModuleVariableNames;
++	SbModule();
++	SbModule(const SbModule&);
+ 
+ protected:
+     ::rtl::OUString     aOUSource;
+@@ -66,6 +70,10 @@ class SbModule : public SbxObject
+     SbiImage*           pImage;        // the Image
+     SbiBreakpoints*     pBreaks;       // Breakpoints
+     SbClassData*        pClassData;
++	bool mbVBACompat;
++	INT32 mnType; 
++	SbxObjectRef pDocObject; // an impl object ( used by Document Modules )
++	bool 	bIsProxyModule;
+ 
+ 	void			StartDefinitions();
+ 	SbMethod*		GetMethod( const String&, SbxDataType );
+@@ -90,7 +98,7 @@ class SbModule : public SbxObject
+ public:
+ 	SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2);
+ 	TYPEINFO();
+-					SbModule( const String& );
++					SbModule( const String&, bool bCompat = false );
+ 	virtual void	SetParent( SbxObject* );
+ 	virtual void 	Clear();
+ 
+@@ -126,6 +134,14 @@ class SbModule : public SbxObject
+ 	BOOL LoadBinaryData( SvStream& );
+ 	BOOL ExceedsLegacyModuleSize();
+ 	void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
++        bool HasExeCode();
++        bool IsVBACompat();
++        void SetVBACompat( bool bCompat );
++        INT32 GetModuleType() { return mnType; }
++        void SetModuleType( INT32 nType ) { mnType = nType; }
++	bool GetIsProxyModule() { return bIsProxyModule; }
++        void AddVarName( const String& aName );
++        void RemoveVars();
+ };
+ 
+ #ifndef __SB_SBMODULEREF_HXX
+Index: basic/prj/build.lst
+===================================================================
+--- basic/prj/build.lst	(revision 276159)
++++ basic/prj/build.lst	(revision 276288)
+@@ -1,4 +1,4 @@
+-sb	basic	:    l10n offuh svtools sj2 xmlscript framework NULL
++sb	basic	:    l10n offuh svtools sj2 xmlscript framework oovbaapi NULL
+ sb	basic									usr1	-	all	sb_mkout NULL
+ sb	basic\inc								nmake	-	all	sb_inc NULL
+ sb	basic\source\app						nmake	-	all	sb_app sb_class sb_inc NULL
+Index: basic/prj/d.lst
+===================================================================
+--- basic/prj/d.lst	(revision 276159)
++++ basic/prj/d.lst	(revision 276288)
+@@ -7,6 +7,8 @@ mkdir: %COMMON_DEST%\res%_EXT%
+ ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+ ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+ ..\%__SRC%\slb\sb.lib %_DEST%\lib%_EXT%\xsb.lib
++..\%__SRC%\lib\vbahelp*.* %_DEST%\lib%_EXT%\vba*.*
++
+ ..\%__SRC%\srs\classes.srs %_DEST%\res%_EXT%\basic.srs
+ ..\%COMMON_OUTDIR%\srs\classes_srs.hid %COMMON_DEST%\res%_EXT%\basic_srs.hid
+ ..\%__SRC%\bin\sb?????.dll %_DEST%\bin%_EXT%\sb?????.dll
+@@ -56,4 +58,8 @@ mkdir: %_DEST%\inc%_EXT%\basic
+ ..\inc\basic\sbxmstrm.hxx %_DEST%\inc%_EXT%\basic\sbxmstrm.hxx
+ 
+ ..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx
++..\inc\basic\vbacollectionimpl.hxx %_DEST%\inc%_EXT%\basic\vbacollectionimpl.hxx
++..\inc\basic\vbahelper.hxx %_DEST%\inc%_EXT%\basic\vbahelper.hxx
++..\inc\basic\helperdecl.hxx %_DEST%\inc%_EXT%\basic\helperdecl.hxx
++..\inc\basic\vbahelperinterface.hxx %_DEST%\inc%_EXT%\basic\vbahelperinterface.hxx
+ ..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx
+Index: toolkit/source/helper/property.cxx
+===================================================================
+--- toolkit/source/helper/property.cxx	(revision 276159)
++++ toolkit/source/helper/property.cxx	(revision 276288)
+@@ -183,6 +183,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16
+             DECL_PROP_3     ( "FormatsSupplier",        FORMATSSUPPLIER,    Reference< ::com::sun::star::util::XNumberFormatsSupplier >, BOUND, MAYBEVOID, TRANSIENT ),
+ 
+             DECL_PROP_2     ( "Graphic",                GRAPHIC,            Reference< ::com::sun::star::graphic::XGraphic >, BOUND, TRANSIENT ),
++            DECL_PROP_2     ( "GroupName",              GROUPNAME,          ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
+             DECL_PROP_2     ( "HelpText",               HELPTEXT,           ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
+             DECL_PROP_2     ( "HelpURL",                HELPURL,            ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
+             DECL_PROP_2     ( "HideInactiveSelection",  HIDEINACTIVESELECTION, bool,            BOUND, MAYBEDEFAULT ),
+@@ -280,7 +281,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16
+             DECL_PROP_3     ( "GridDataModel",		GRID_DATAMODEL,   Reference< ::com::sun::star::awt::grid::XGridDataModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+             DECL_PROP_3     ( "ColumnModel",		GRID_COLUMNMODEL,   Reference< ::com::sun::star::awt::grid::XGridColumnModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+             DECL_PROP_3     ( "SelectionModel",		GRID_SELECTIONMODE,   ::com::sun::star::view::SelectionType,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+-            DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,           BOUND, MAYBEDEFAULT )
++            DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,           BOUND, MAYBEDEFAULT ),
++            DECL_PROP_2     ( "VBAForm",                VBAFORM,                sal_Bool,           BOUND, MAYBEDEFAULT )
+             };
+ 			pPropertyInfos = aImplPropertyInfos;
+ 			nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
+Index: toolkit/source/helper/servicenames.cxx
+===================================================================
+--- toolkit/source/helper/servicenames.cxx	(revision 276159)
++++ toolkit/source/helper/servicenames.cxx	(revision 276288)
+@@ -40,6 +40,8 @@ const sal_Char __FAR_DATA szServiceName_PopupMenu[
+ const sal_Char __FAR_DATA szServiceName_MenuBar[] = "stardiv.vcl.MenuBar", szServiceName2_MenuBar[] = "com.sun.star.awt.MenuBar";
+ const sal_Char __FAR_DATA szServiceName_Pointer[] = "stardiv.vcl.Pointer", szServiceName2_Pointer[] = "com.sun.star.awt.Pointer";
+ const sal_Char __FAR_DATA szServiceName_UnoControlContainer[] = "stardiv.vcl.control.ControlContainer", szServiceName2_UnoControlContainer[] = "com.sun.star.awt.UnoControlContainer";
++
++
+ const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[] = "stardiv.vcl.controlmodel.ControlContainer", szServiceName2_UnoControlContainerModel[] = "com.sun.star.awt.UnoControlContainerModel";
+ const sal_Char __FAR_DATA szServiceName_TabController[] = "stardiv.vcl.control.TabController", szServiceName2_TabController[] = "com.sun.star.awt.TabController";
+ const sal_Char __FAR_DATA szServiceName_TabControllerModel[] = "stardiv.vcl.controlmodel.TabController", szServiceName2_TabControllerModel[] = "com.sun.star.awt.TabControllerModel";
+@@ -92,6 +94,8 @@ const sal_Char __FAR_DATA szServiceName_UnoControl
+ const sal_Char __FAR_DATA szServiceName_UnoControlRoadmapModel[] = "stardiv.vcl.controlmodel.Roadmap", szServiceName2_UnoControlRoadmapModel[] = "com.sun.star.awt.UnoControlRoadmapModel";
+ const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[] = "com.sun.star.awt.UnoControlSpinButton";
+ const sal_Char __FAR_DATA szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel";
++const sal_Char __FAR_DATA szServiceName_UnoMultiPageControl[] = "com.sun.star.awt.UnoControlMultiPage";
++const sal_Char __FAR_DATA szServiceName_UnoMultiPageModel[] = "com.sun.star.awt.UnoMultiPageModel";
+ const sal_Char __FAR_DATA szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
+ const sal_Char __FAR_DATA szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
+ const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel";
+Index: toolkit/source/helper/registerservices.cxx
+===================================================================
+--- toolkit/source/helper/registerservices.cxx	(revision 276159)
++++ toolkit/source/helper/registerservices.cxx	(revision 276288)
+@@ -168,6 +168,7 @@ IMPL_CREATEINSTANCE( UnoControlTimeFieldModel )
+ IMPL_CREATEINSTANCE( UnoControlProgressBarModel )
+ IMPL_CREATEINSTANCE( UnoControlScrollBarModel )
+ IMPL_CREATEINSTANCE( UnoSpinButtonModel )
++IMPL_CREATEINSTANCE( UnoMultiPageModel )
+ IMPL_CREATEINSTANCE( UnoControlFixedLineModel )
+ IMPL_CREATEINSTANCE( UnoCurrencyFieldControl )
+ IMPL_CREATEINSTANCE( UnoDateFieldControl )
+@@ -187,6 +188,7 @@ IMPL_CREATEINSTANCE( UnoTimeFieldControl )
+ IMPL_CREATEINSTANCE( UnoProgressBarControl )
+ IMPL_CREATEINSTANCE( UnoScrollBarControl )
+ IMPL_CREATEINSTANCE( UnoSpinButtonControl )
++IMPL_CREATEINSTANCE( UnoMultiPageControl )
+ IMPL_CREATEINSTANCE( UnoFixedLineControl )
+ IMPL_CREATEINSTANCE( VCLXMenuBar )
+ IMPL_CREATEINSTANCE( VCLXPointer )
+@@ -279,6 +281,8 @@ TOOLKIT_DLLPUBLIC sal_Bool SAL_CALL component_writ
+ 		registerServices( xRegistryKey, "UnoControlScrollBarModel", szServiceName_UnoControlScrollBarModel, szServiceName2_UnoControlScrollBarModel );
+         registerServices( xRegistryKey, "UnoSpinButtonModel", szServiceName_UnoSpinButtonModel );
+         registerServices( xRegistryKey, "UnoSpinButtonControl", szServiceName_UnoSpinButtonControl );
++        registerServices( xRegistryKey, "UnoMultiPageModel", szServiceName_UnoMultiPageModel );
++        registerServices( xRegistryKey, "UnoMultiPageControl", szServiceName_UnoMultiPageControl );
+         registerServices( xRegistryKey, "UnoFixedLineControl", szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine );
+ 		registerServices( xRegistryKey, "UnoControlFixedLineModel", szServiceName_UnoControlFixedLineModel, szServiceName2_UnoControlFixedLineModel );
+ 		registerServices( xRegistryKey, "VCLXPrinterServer", szServiceName_PrinterServer, szServiceName2_PrinterServer );
+@@ -369,6 +373,8 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFact
+ 		CHECKANDCREATEFACTORY( VCLXPrinterServer, szServiceName_PrinterServer, szServiceName2_PrinterServer )
+ 		CHECKANDCREATEFACTORY( UnoRoadmapControl, szServiceName_UnoControlRoadmap, szServiceName2_UnoControlRoadmap )
+ 		CHECKANDCREATEFACTORY( UnoControlRoadmapModel, szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel )
++        CHECKANDCREATEFACTORY( UnoMultiPageModel, szServiceName_UnoMultiPageModel, NULL )
++        CHECKANDCREATEFACTORY( UnoMultiPageControl, szServiceName_UnoMultiPageControl, NULL )
+         CHECKANDCREATEFACTORY( UnoSpinButtonModel, szServiceName_UnoSpinButtonModel, NULL )
+         CHECKANDCREATEFACTORY( UnoSpinButtonControl, szServiceName_UnoSpinButtonControl, NULL )
+ 		CHECKANDCREATEFACTORY( TreeControl, szServiceName_TreeControl, NULL )
+Index: toolkit/source/controls/unocontrolmodel.cxx
+===================================================================
+--- toolkit/source/controls/unocontrolmodel.cxx	(revision 276159)
++++ toolkit/source/controls/unocontrolmodel.cxx	(revision 276288)
+@@ -349,6 +349,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uIn
+             case BASEPROPERTY_ENABLEVISIBLE:
+             case BASEPROPERTY_DECORATION:           aDefault <<= (sal_Bool) sal_True; break;
+ 
++            case BASEPROPERTY_GROUPNAME:
+             case BASEPROPERTY_HELPTEXT:
+             case BASEPROPERTY_HELPURL:
+ 	        case BASEPROPERTY_IMAGEURL:
+Index: toolkit/source/controls/unocontrols.cxx
+===================================================================
+--- toolkit/source/controls/unocontrols.cxx	(revision 276159)
++++ toolkit/source/controls/unocontrols.cxx	(revision 276288)
+@@ -571,7 +571,7 @@ uno::Any ImageProducerControlModel::ImplGetDefault
+ 
+     return UnoControlModel::ImplGetDefaultValue( nPropId );
+ }
+-    uno::Reference< graphic::XGraphic > ImageProducerControlModel::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
++    uno::Reference< graphic::XGraphic > getGraphicFromURL_nothrow( uno::Reference< graphic::XGraphicObject >& rxGrfObj, const ::rtl::OUString& _rURL )
+     {
+         uno::Reference< graphic::XGraphic > xGraphic;
+ 
+@@ -581,10 +581,10 @@ uno::Any ImageProducerControlModel::ImplGetDefault
+             rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 );
+             // get the DefaultContext
+             ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+-            mxGrfObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
++            rxGrfObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
+         }
+         else // linked
+-            mxGrfObj = NULL; // release the GraphicObject
++            rxGrfObj = NULL; // release the GraphicObject
+ 
+         if ( !_rURL.getLength() )
+             return xGraphic;
+@@ -625,7 +625,7 @@ void SAL_CALL ImageProducerControlModel::setFastPr
+                 mbAdjustingGraphic = true;
+                 ::rtl::OUString sImageURL;
+                 OSL_VERIFY( rValue >>= sImageURL );
+-                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( sImageURL ) ) );
++                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( mxGrfObj, sImageURL ) ) );
+                 mbAdjustingGraphic = false;
+             }
+             break;
+@@ -1842,7 +1842,78 @@ sal_Bool UnoGroupBoxControl::isTransparent() throw
+ 	return sal_True;
+ }
+ 
++// MultiPage
++
++UnoMultiPageModel::UnoMultiPageModel()
++{
++	ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
++	ImplRegisterProperty( BASEPROPERTY_ENABLED );
++	ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
++	ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
++	ImplRegisterProperty( BASEPROPERTY_HELPURL );
++	ImplRegisterProperty( BASEPROPERTY_LABEL );
++	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
++	ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE );
++	ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE_MAX );
++}
++
++::rtl::OUString UnoMultiPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
++{
++	return ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel );
++}
++
++uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
++{
++	if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
++	{
++		uno::Any aAny;
++		aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlGroupBox );
++		//aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageControl );
++		return aAny;
++	}
++	return UnoControlModel::ImplGetDefaultValue( nPropId );
++}
++
++::cppu::IPropertyArrayHelper& UnoMultiPageModel::getInfoHelper()
++{
++	static UnoPropertyArrayHelper* pHelper = NULL;
++	if ( !pHelper )
++	{
++		uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
++		pHelper = new UnoPropertyArrayHelper( aIDs );
++	}
++	return *pHelper;
++}
++
++// beans::XMultiPropertySet
++uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo(  ) throw(uno::RuntimeException)
++{
++	static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
++	return xInfo;
++}
++
+ //	----------------------------------------------------
++//	class MultiPageControl
++//	----------------------------------------------------
++UnoMultiPageControl::UnoMultiPageControl()
++{
++	maComponentInfos.nWidth = 100;
++	maComponentInfos.nHeight = 100;
++}
++
++::rtl::OUString UnoMultiPageControl::GetComponentServiceName()
++{
++	return ::rtl::OUString::createFromAscii( "multipage" );
++}
++
++sal_Bool UnoMultiPageControl::isTransparent() throw(uno::RuntimeException)
++{
++	return sal_True;
++}
++
++
++
++//	----------------------------------------------------
+ //	class UnoControlListBoxModel
+ //	----------------------------------------------------
+ UnoControlListBoxModel::UnoControlListBoxModel()
+Index: toolkit/source/controls/dialogcontrol.cxx
+===================================================================
+--- toolkit/source/controls/dialogcontrol.cxx	(revision 276159)
++++ toolkit/source/controls/dialogcontrol.cxx	(revision 276288)
+@@ -81,6 +81,7 @@ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::container;
+ using namespace ::com::sun::star::beans;
+ using namespace ::com::sun::star::util;
++using namespace ::com::sun::star::script;
+ using namespace toolkit;
+ 
+ #define PROPERTY_RESOURCERESOLVER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ))
+@@ -91,6 +92,8 @@ using namespace toolkit;
+ //HELPER
+ ::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl );
+ 
++uno::Reference< graphic::XGraphic > getGraphicFromURL_nothrow( uno::Reference< graphic::XGraphicObject >& rxGrfObj, const ::rtl::OUString& _rURL );
++
+ struct LanguageDependentProp
+ {
+     const char* pPropName;
+@@ -143,8 +146,20 @@ namespace
+         return xGraphic;
+     }
+ 
++    static ::rtl::OUString lcl_GetStringProperty( const ::rtl::OUString& sProperty, const Reference< XPropertySet >& xSet )
++    {
++        ::rtl::OUString sValue;
++        Reference< XPropertySetInfo > xPSI;
++        if (xSet.is() && (xPSI = xSet->getPropertySetInfo()).is() && 
++                xPSI->hasPropertyByName( sProperty ) )
++        {
++            xSet->getPropertyValue( sProperty ) >>= sValue;
+ }
++        return sValue;
++    }
+ 
++}
++
+ // ----------------------------------------------------------------------------
+ // functor for disposing a control model
+ struct DisposeControlModel : public ::std::unary_function< Reference< XControlModel >, void >
+@@ -254,7 +269,7 @@ static const ::rtl::OUString& getStepPropertyName(
+ UnoControlDialogModel::UnoControlDialogModel()
+ 	:maContainerListeners( *this )
+ 	,maChangeListeners ( GetMutex() )
+-	,mbGroupsUpToDate( sal_False )
++	,mbGroupsUpToDate( sal_False ), mbAdjustingGraphic( false )
+ {
+ 	ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
+ //	ImplRegisterProperty( BASEPROPERTY_BORDER );
+@@ -276,6 +291,8 @@ UnoControlDialogModel::UnoControlDialogModel()
+ 	aBool <<= (sal_Bool) sal_True;
+ 	ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool );
+ 	ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool );
++	aBool <<= (sal_Bool) sal_False;
++	ImplRegisterProperty( BASEPROPERTY_VBAFORM, aBool );
+ }
+ 
+ UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rModel )
+@@ -283,7 +300,7 @@ UnoControlDialogModel::UnoControlDialogModel( cons
+     , UnoControlDialogModel_Base( rModel )
+ 	, maContainerListeners( *this )
+ 	, maChangeListeners ( GetMutex() )
+-	, mbGroupsUpToDate( sal_False )
++	, mbGroupsUpToDate( sal_False ), mbAdjustingGraphic( false )
+ {
+ }
+ 
+@@ -314,6 +331,40 @@ Sequence< Type > UnoControlDialogModel::getTypes()
+ 	return ::rtl::OUString::createFromAscii( szServiceName_UnoControlDialogModel );
+ }
+ 
++void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
++{
++    UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
++    try
++    {
++        switch ( nHandle )
++        {
++        case BASEPROPERTY_IMAGEURL:
++            if ( !mbAdjustingGraphic && ImplHasProperty( BASEPROPERTY_GRAPHIC ) )
++            {
++                mbAdjustingGraphic = true;
++                ::rtl::OUString sImageURL;
++                OSL_VERIFY( rValue >>= sImageURL );
++                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( mxGrfObj, sImageURL ) ) );
++                mbAdjustingGraphic = false;
++            }
++            break;
++
++        case BASEPROPERTY_GRAPHIC:
++            if ( !mbAdjustingGraphic && ImplHasProperty( BASEPROPERTY_IMAGEURL ) )
++            {
++                mbAdjustingGraphic = true;
++                setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGEURL ), uno::makeAny( ::rtl::OUString() ) );
++                mbAdjustingGraphic = false;
++            }
++            break;
++	}
++    }
++    catch( const ::com::sun::star::uno::Exception& )
++    {
++        OSL_ENSURE( sal_False, "UnoControlDialogModel::setFastPropertyValue_NoBroadcast: caught an exception while setting Graphic/ImageURL properties!" );
++    }
++}
++
+ Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
+ {
+     Any aAny;
+@@ -901,7 +952,64 @@ void UnoControlDialogModel::implNotifyTabModelChan
+ 	}
+ }
+ 
++// ----------------------------------------------------------------------------
++void UnoControlDialogModel::AddRadioButtonGroup ( 
++        ::std::map< ::rtl::OUString, ModelGroup >& rNamedGroups )
++{
++    if ( rNamedGroups.size() == 0 )
++        return;
+ 
++    size_t nGroups = maGroups.size();
++    maGroups.reserve( nGroups + rNamedGroups.size() );
++    ::std::map< ::rtl::OUString, ModelGroup >::const_iterator i = rNamedGroups.begin(), e = rNamedGroups.end();
++    for( ; i != e; ++i)
++    {
++            maGroups.push_back( i->second );
++    }
++
++    rNamedGroups.clear();
++}
++
++void UnoControlDialogModel::AddRadioButtonToGroup ( 
++        const Reference< XControlModel >& rControlModel,
++        const ::rtl::OUString& rPropertyName,
++        ::std::map< ::rtl::OUString, ModelGroup >& rNamedGroups,
++        ModelGroup*& rpCurrentGroup )
++{
++    Reference< XPropertySet > xCurProps( rControlModel, UNO_QUERY );
++    ::rtl::OUString sGroup = lcl_GetStringProperty( rPropertyName, xCurProps );
++    const sal_Int32 nControlModelStep = lcl_getDialogStep( rControlModel );
++
++    if ( sGroup.getLength() == 0 )
++    {
++        // Create a new group if:
++        if ( maGroups.size() == 0 ||                // no groups
++                rpCurrentGroup == NULL ||           // previous group was closed
++                (nControlModelStep != 0 &&          // control step matches current group
++                 maGroups.back().size() > 0 &&      //  (group 0 == display everywhere)
++                 nControlModelStep != lcl_getDialogStep( maGroups.back().back() ) ) )
++        {
++            size_t nGroups = maGroups.size();
++            maGroups.resize( nGroups + 1 );
++        }
++        rpCurrentGroup = &maGroups.back();
++    }
++    else
++    {
++        // Different steps get different sets of named groups
++        if ( rNamedGroups.size() > 0 &&
++                rNamedGroups.begin()->second.size() > 0 )
++        {
++            const sal_Int32 nPrevStep = lcl_getDialogStep( rNamedGroups.begin()->second.front() );
++            if ( nControlModelStep != nPrevStep )
++                AddRadioButtonGroup( rNamedGroups );
++        }
++
++        rpCurrentGroup = &rNamedGroups[ sGroup ];
++    }
++    rpCurrentGroup->push_back( rControlModel );
++}
++
+ // ----------------------------------------------------------------------------
+ void UnoControlDialogModel::implUpdateGroupStructure()
+ {
+@@ -925,10 +1033,13 @@ void UnoControlDialogModel::implUpdateGroupStructu
+ 
+ 	GroupingMachineState eState = eLookingForGroup;		// the current state of our machine
+ 	Reference< XServiceInfo > xModelSI;					// for checking for a radion button
+-	AllGroups::iterator aCurrentGroup = maGroups.end();	// the group which we're currently building
+-	sal_Int32	nCurrentGroupStep = -1;					// the step which all controls of the current group belong to
++	ModelGroup* aCurrentGroup = NULL;                   // the group which we're currently building
+ 	sal_Bool	bIsRadioButton;							// is it a radio button?
+ 
++    const ::rtl::OUString GROUP_NAME( RTL_CONSTASCII_USTRINGPARAM( "GroupName" ) );
++
++    ::std::map< ::rtl::OUString, ModelGroup > aNamedGroups;
++
+ #if OSL_DEBUG_LEVEL > 1
+ 	::std::vector< ::rtl::OUString > aCurrentGroupLabels;
+ #endif
+@@ -949,14 +1060,8 @@ void UnoControlDialogModel::implUpdateGroupStructu
+ 				// the current model is a radio button
+ 				// -> we found the beginning of a new group
+ 				// create the place for this group
+-				size_t nGroups = maGroups.size();
+-				maGroups.resize( nGroups + 1 );
+-				aCurrentGroup = maGroups.begin() + nGroups;
+-				// and add the (only, til now) member
+-				aCurrentGroup->push_back( *pControlModels );
++                AddRadioButtonToGroup( *pControlModels, GROUP_NAME, aNamedGroups, aCurrentGroup );
+ 
+-				// get the step which all controls of this group now have to belong to
+-				nCurrentGroupStep = lcl_getDialogStep( *pControlModels );
+ 				// new state: looking for further members
+ 				eState = eExpandingGroup;
+ 
+@@ -974,7 +1079,7 @@ void UnoControlDialogModel::implUpdateGroupStructu
+ 			{
+ 				if ( !bIsRadioButton )
+ 				{	// no radio button -> the group is done
+-					aCurrentGroup = maGroups.end();
++					aCurrentGroup = NULL;
+ 					eState = eLookingForGroup;
+ #if OSL_DEBUG_LEVEL > 1
+ 					aCurrentGroupLabels.clear();
+@@ -982,16 +1087,7 @@ void UnoControlDialogModel::implUpdateGroupStructu
+ 					continue;
+ 				}
+ 
+-				// it is a radio button - is it on the proper page?
+-				const sal_Int32 nThisModelStep = lcl_getDialogStep( *pControlModels );
+-				if	(	( nThisModelStep == nCurrentGroupStep )	// the current button is on the same dialog page
+-					||	( 0 == nThisModelStep )					// the current button appears on all pages
+-					)
+-				{
+-					// -> it belongs to the same group
+-					aCurrentGroup->push_back( *pControlModels );
+-					// state still is eExpandingGroup - we're looking for further elements
+-					eState = eExpandingGroup;
++                AddRadioButtonToGroup( *pControlModels, GROUP_NAME, aNamedGroups, aCurrentGroup );
+ 
+ #if OSL_DEBUG_LEVEL > 1
+ 					Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
+@@ -1000,41 +1096,12 @@ void UnoControlDialogModel::implUpdateGroupStructu
+ 						xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+ 					aCurrentGroupLabels.push_back( sLabel );
+ #endif
+-					continue;
+ 				}
+-
+-				// it's a radio button, but on a different page
+-				// -> we open a new group for it
+-
+-				// close the old group
+-				aCurrentGroup = maGroups.end();
+-#if OSL_DEBUG_LEVEL > 1
+-				aCurrentGroupLabels.clear();
+-#endif
+-
+-				// open a new group
+-				size_t nGroups = maGroups.size();
+-				maGroups.resize( nGroups + 1 );
+-				aCurrentGroup = maGroups.begin() + nGroups;
+-				// and add the (only, til now) member
+-				aCurrentGroup->push_back( *pControlModels );
+-
+-				nCurrentGroupStep = nThisModelStep;
+-
+-				// state is the same: we still are looking for further elements of the current group
+-				eState = eExpandingGroup;
+-#if OSL_DEBUG_LEVEL > 1
+-				Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
+-				::rtl::OUString sLabel;
+-				if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
+-					xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+-				aCurrentGroupLabels.push_back( sLabel );
+-#endif
+-			}
+ 			break;
+ 		}
+ 	}
+ 
++    AddRadioButtonGroup( aNamedGroups );
+ 	mbGroupsUpToDate = sal_True;
+ }
+ 
+@@ -1415,17 +1482,32 @@ void UnoDialogControl::ImplSetPosSize( Reference<
+ 	xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) >>= nWidth;
+ 	xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) >>= nHeight;
+ 
+-	// Currentley we are simply using MAP_APPFONT
++	// Currentley we are simply using MAP_APPFONT ( for normal Dialogs )
++	// and MAP_100TH_MM for imported Userforms
++	MapMode aMode( MAP_APPFONT );
++	sal_Bool bVBAForm = sal_False;
++	Reference< XPropertySet > xDlgModelProps( getModel(), UNO_QUERY );
++	if ( xDlgModelProps.is() )
++	{
++		try
++		{
++			xDlgModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAForm" ) ) ) >>= bVBAForm;
++		}
++		catch( Exception& )
++		{
++		}
++	} 
++	if ( bVBAForm )
++		aMode = MapMode( MAP_100TH_MM );
+ 	OutputDevice*pOutDev = Application::GetDefaultDevice();
+-	DBG_ASSERT( pOutDev, "Missing Default Device!" );
+ 	if ( pOutDev )
+ 	{
+ 		::Size aTmp( nX, nY );
+-		aTmp = pOutDev->LogicToPixel( aTmp, MAP_APPFONT );
++		aTmp = pOutDev->LogicToPixel( aTmp, aMode );
+ 		nX = aTmp.Width();
+ 		nY = aTmp.Height();
+ 		aTmp = ::Size( nWidth, nHeight );
+-		aTmp = pOutDev->LogicToPixel( aTmp, MAP_APPFONT );
++		aTmp = pOutDev->LogicToPixel( aTmp, aMode );
+ 		nWidth = aTmp.Width();
+ 		nHeight = aTmp.Height();
+ 	}
+@@ -1644,17 +1726,16 @@ void UnoDialogControl::PrepareWindowDescriptor( ::
+     // can lead to overwrites we have to set the graphic property
+     // before the propertiesChangeEvents are sent!
+     ::rtl::OUString aImageURL;
+-    Reference< graphic::XGraphic > xGraphic;
+     if (( ImplGetPropertyValue( PROPERTY_IMAGEURL ) >>= aImageURL ) &&
+         ( aImageURL.getLength() > 0 ))
+     {
+-        ::rtl::OUString absoluteUrl =
++        aImageURL = 
+             getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ),
+                                  ImplGetPropertyValue( PROPERTY_IMAGEURL ));
+ 
+-        xGraphic = lcl_getGraphicFromURL_nothrow( absoluteUrl );
+-        ImplSetPropertyValue( PROPERTY_GRAPHIC, uno::makeAny( xGraphic ), sal_True );
+     }
++    if ( aImageURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 )
++        ImplSetPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( aImageURL ), sal_True );
+ }
+ 
+ void UnoDialogControl::elementInserted( const ContainerEvent& Event ) throw(RuntimeException)
+@@ -1886,18 +1967,16 @@ void UnoDialogControl::ImplModelPropertiesChanged(
+         if ( bOwnModel && rEvt.PropertyName.equalsAsciiL( "ImageURL", 8 ))
+         {
+             ::rtl::OUString aImageURL;
+-            Reference< graphic::XGraphic > xGraphic;
+             if (( ImplGetPropertyValue( PROPERTY_IMAGEURL ) >>= aImageURL ) &&
+                 ( aImageURL.getLength() > 0 ))
+             {
+-                ::rtl::OUString absoluteUrl =
++                aImageURL =
+                     getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ),
+                                          ImplGetPropertyValue( PROPERTY_IMAGEURL ));
+ 
+-                xGraphic = lcl_getGraphicFromURL_nothrow( absoluteUrl );
+             }
+ 
+-            ImplSetPropertyValue( PROPERTY_GRAPHIC, uno::makeAny( xGraphic ), sal_True );
++            ImplSetPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( aImageURL ), sal_True );
+             break;
+         }
+     }
+@@ -2096,12 +2175,19 @@ throw (RuntimeException)
+ 
+ 	if ( url.getLength() > 0 )
+ 	{
++		// Don't adjust GraphicObject url(s)
++		if ( url.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 )
++		{
+ 		INetURLObject urlObj(baseLocation);
+ 		urlObj.removeSegment();
+ 		baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE );
+ 		::osl::FileBase::getAbsoluteFileURL( baseLocation, url, ret );
+ 	}
++		else
++			ret = url;
+ 
++	}
++
+ 	return ret;
+ }
+ 
+Index: toolkit/source/awt/vclxmenu.cxx
+===================================================================
+--- toolkit/source/awt/vclxmenu.cxx	(revision 276159)
++++ toolkit/source/awt/vclxmenu.cxx	(revision 276288)
+@@ -529,7 +529,15 @@ void VCLXMenu::setPopupMenu( sal_Int16 nItemId, co
+ 				break;
+ 			}
+ 		}
++        // it seems the popup menu is not insert into maPopupMenueRefs
++        // if the popup men is not created by stardiv.Toolkit.VCLXPopupMenu
++        if( !aRef.is() )
++        {
++		    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pNewRef = new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > ;
++            *pNewRef = new VCLXPopupMenu( (PopupMenu*)pMenu );
++            aRef = *pNewRef;
+ 	}
++	}
+ 	return aRef;
+ }
+ 
+@@ -1060,3 +1068,8 @@ VCLXPopupMenu::VCLXPopupMenu()
+     DBG_CTOR( VCLXPopupMenu, 0 );
+     ImplCreateMenu( TRUE );
+ }
++
++VCLXPopupMenu::VCLXPopupMenu( PopupMenu* pPopMenu ) : VCLXMenu( (Menu *)pPopMenu )
++{
++    DBG_CTOR( VCLXPopupMenu, 0 );
++}
+Index: toolkit/source/awt/vclxwindows.cxx
+===================================================================
+--- toolkit/source/awt/vclxwindows.cxx	(revision 276159)
++++ toolkit/source/awt/vclxwindows.cxx	(revision 276288)
+@@ -1116,6 +1116,7 @@ void VCLXRadioButton::ImplGetPropertyIds( std::lis
+                      BASEPROPERTY_VERTICALALIGN,
+                      BASEPROPERTY_WRITING_MODE,
+                      BASEPROPERTY_CONTEXT_WRITING_MODE,
++                     BASEPROPERTY_GROUPNAME,
+                      0);
+     VCLXImageConsumer::ImplGetPropertyIds( rIds );
+ }
+@@ -1180,8 +1181,18 @@ void VCLXRadioButton::setProperty( const ::rtl::OU
+ 						pButton->Check( b );
+ 					else
+ 						pButton->SetState( b );
++					// If VBA - need to be able to test
++					// simulate click event
++					if ( maActionListeners.getLength() )
++					{
++						::com::sun::star::awt::ActionEvent aEvent;
++						aEvent.Source = (::cppu::OWeakObject*)this;
++						aEvent.ActionCommand = maActionCommand;
++						maActionListeners.actionPerformed( aEvent );
+ 				}
++					
+ 			}
++			}
+ 			break;
+ 			case BASEPROPERTY_AUTOTOGGLE:
+ 			{
+@@ -1942,8 +1953,11 @@ void VCLXListBox::setProperty( const ::rtl::OUStri
+ 				::com::sun::star::uno::Sequence< ::rtl::OUString> aItems;
+ 				if ( Value >>= aItems )
+ 				{
++					sal_Int16 nElem  = pListBox->GetEntryCount();
+ 					pListBox->Clear();
+ 					addItems( aItems, 0 );
++					if ( aItems.getLength() == 0 && nElem && maItemListeners.getLength() )
++						ImplCallItemListeners();
+ 				}
+ 			}
+ 			break;
+@@ -1956,7 +1970,11 @@ void VCLXListBox::setProperty( const ::rtl::OUStri
+ 						pListBox->SelectEntryPos( --n, sal_False );
+ 
+                     if ( aItems.getLength() )
++                    {			
+ 					    selectItemsPos( aItems, sal_True );
++                       if ( maItemListeners.getLength() )
++                           ImplCallItemListeners();
++                    }
+                     else
+                         pListBox->SetNoSelection();
+ 
+@@ -2207,12 +2225,14 @@ VCLXDialog::~VCLXDialog()
+ ::com::sun::star::uno::Any VCLXDialog::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
+ {
+ 	::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
++										SAL_STATIC_CAST( ::com::sun::star::document::XVbaMethodParameter*, this ), //liuchen 2009-6-23
+ 										SAL_STATIC_CAST( ::com::sun::star::awt::XDialog*, this ) );
+ 	return (aRet.hasValue() ? aRet : VCLXTopWindow::queryInterface( rType ));
+ }
+ 
+ // ::com::sun::star::lang::XTypeProvider
+ IMPL_XTYPEPROVIDER_START( VCLXDialog )
++	getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::document::XVbaMethodParameter>* ) NULL ), //liuchen 2009-6-23
+ 	getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDialog>* ) NULL ),
+ 	VCLXTopWindow::getTypes()
+ IMPL_XTYPEPROVIDER_END
+@@ -2300,7 +2320,41 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_
+ 	return aInfo;
+ }
+ 
++//liuchen 2009-7-22
++// ::com::sun::star::document::XVbaMethodParameter
++void SAL_CALL VCLXDialog::setVbaMethodParameter(
++	const ::rtl::OUString& PropertyName,
++	const ::com::sun::star::uno::Any& Value )
++throw(::com::sun::star::uno::RuntimeException)
++{
++	if (rtl::OUString::createFromAscii( "Cancel" ) == PropertyName)
++	{
++		::vos::OGuard aGuard( GetMutex() ); 
++		if ( GetWindow() )
++		{
++			sal_Int8 nCancel;
++			Value >>= nCancel;
+ 
++			Dialog* pDlg = (Dialog*) GetWindow();
++			pDlg->SetCloseFlag(nCancel);
++		}
++	}
++}
++
++::com::sun::star::uno::Any SAL_CALL VCLXDialog::getVbaMethodParameter(
++	const ::rtl::OUString& PropertyName )
++throw(::com::sun::star::uno::RuntimeException)
++{
++	::vos::OGuard aGuard( GetMutex() );
++
++	::com::sun::star::uno::Any aRet;	
++	return aRet;
++}
++//liuchen 2009-7-22
++
++
++
++
+ void SAL_CALL VCLXDialog::setProperty(
+     const ::rtl::OUString& PropertyName,
+     const ::com::sun::star::uno::Any& Value )
+Index: toolkit/inc/toolkit/helper/property.hxx
+===================================================================
+--- toolkit/inc/toolkit/helper/property.hxx	(revision 276159)
++++ toolkit/inc/toolkit/helper/property.hxx	(revision 276288)
+@@ -197,6 +197,8 @@ namespace rtl {
+ #define BASEPROPERTY_GRID_COLUMNMODEL               143
+ #define BASEPROPERTY_GRID_SELECTIONMODE             144
+ #define BASEPROPERTY_ENABLEVISIBLE                  145  // sal_Bool
++#define BASEPROPERTY_GROUPNAME                      146  // ::rtl::OUString
++#define BASEPROPERTY_VBAFORM                        147  // sal_Bool
+ 
+ 
+ // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
+Index: toolkit/inc/toolkit/helper/servicenames.hxx
+===================================================================
+--- toolkit/inc/toolkit/helper/servicenames.hxx	(revision 276159)
++++ toolkit/inc/toolkit/helper/servicenames.hxx	(revision 276288)
+@@ -40,6 +40,8 @@ extern const sal_Char __FAR_DATA szServiceName_Pop
+ extern const sal_Char __FAR_DATA szServiceName_MenuBar[], szServiceName2_MenuBar[];
+ extern const sal_Char __FAR_DATA szServiceName_Pointer[], szServiceName2_Pointer[];
+ extern const sal_Char __FAR_DATA szServiceName_UnoControlContainer[], szServiceName2_UnoControlContainer[];
++extern const sal_Char __FAR_DATA szServiceName_UnoMultiPageControl[], szServiceName2_UnoMultiPageControl[];
++extern const sal_Char __FAR_DATA szServiceName_UnoMultiPageModel[], szServiceName2_UnoMultiPageModel[];
+ extern const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[], szServiceName2_UnoControlContainerModel[];
+ extern const sal_Char __FAR_DATA szServiceName_TabController[], szServiceName2_TabController[];
+ extern const sal_Char __FAR_DATA szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[];
+Index: toolkit/inc/toolkit/controls/unocontrols.hxx
+===================================================================
+--- toolkit/inc/toolkit/controls/unocontrols.hxx	(revision 276159)
++++ toolkit/inc/toolkit/controls/unocontrols.hxx	(revision 276288)
+@@ -225,7 +225,6 @@ class ImageProducerControlModel : public ::com::su
+     bool                                                                                    mbAdjustingGraphic;
+     
+     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
+-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL );
+ protected:
+     ImageProducerControlModel() : mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
+     ImageProducerControlModel( const ImageProducerControlModel& _rSource ) : com::sun::star::awt::XImageProducer(), UnoControlModel( _rSource ), mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
+@@ -670,7 +669,45 @@ class UnoControlFixedTextModel : public UnoControl
+ 
+ };
+ 
++class UnoMultiPageModel : public UnoControlModel
++{
++protected:
++	::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
++	::cppu::IPropertyArrayHelper& 	SAL_CALL getInfoHelper();
++
++public:
++						UnoMultiPageModel();
++						UnoMultiPageModel( const UnoMultiPageModel& rModel ) : UnoControlModel( rModel ) {;}
++
++	UnoControlModel*	Clone() const { return new UnoMultiPageModel( *this ); }
++
++	// ::com::sun::star::io::XPersistObject
++    ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
++
++	// ::com::sun::star::beans::XMultiPropertySet
++    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
++
++	// ::com::sun::star::lang::XServiceInfo
++	DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, UnoControlModel, szServiceName_UnoMultiPageModel )
++
++};
+ //  ----------------------------------------------------
++//	class UnoGroupBoxControl
++//	----------------------------------------------------
++class UnoMultiPageControl :	public UnoControlBase
++{
++public:
++						UnoMultiPageControl();
++	::rtl::OUString		GetComponentServiceName();
++
++    sal_Bool SAL_CALL isTransparent(  ) throw(::com::sun::star::uno::RuntimeException);
++
++	// ::com::sun::star::lang::XServiceInfo
++	DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, UnoControlBase, szServiceName_UnoMultiPageControl )
++
++};
++
++//  ----------------------------------------------------
+ //  class UnoFixedTextControl
+ //  ----------------------------------------------------
+ class UnoFixedTextControl : public UnoControlBase,
+Index: toolkit/inc/toolkit/controls/dialogcontrol.hxx
+===================================================================
+--- toolkit/inc/toolkit/controls/dialogcontrol.hxx	(revision 276159)
++++ toolkit/inc/toolkit/controls/dialogcontrol.hxx	(revision 276288)
+@@ -51,6 +51,8 @@
+ #include <cppuhelper/propshlp.hxx>
+ #include <cppuhelper/basemutex.hxx>
+ #include <list>
++#include <map>
++#include <com/sun/star/graphic/XGraphicObject.hpp>
+ 
+ //	----------------------------------------------------
+ //	class UnoControlDialogModel
+@@ -92,6 +94,8 @@ class UnoControlDialogModel :	public UnoControlDia
+ 	AllGroups							maGroups;
+ 	sal_Bool							mbGroupsUpToDate;
+ 
++	::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
++	bool mbAdjustingGraphic;
+ protected:	
+ 	::com::sun::star::uno::Any			ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+ 	::cppu::IPropertyArrayHelper&		SAL_CALL getInfoHelper();
+@@ -178,10 +182,20 @@ class UnoControlDialogModel :	public UnoControlDia
+ protected:
+ 	void startControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel );
+ 	void stopControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel );
++    // ::cppu::OPropertySetHelper
++	void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception);
+ 
+ 	void implNotifyTabModelChange( const ::rtl::OUString& _rAccessor );
+ 
+ 	void implUpdateGroupStructure();
++private:
++    void AddRadioButtonToGroup (
++            const ::com::sun::star::uno::Reference< XControlModel >& rControlModel,
++            const ::rtl::OUString& rPropertyName,
++            ::std::map< ::rtl::OUString, ModelGroup >& pNamedGroups,
++            ModelGroup*& rpCurrentGroup );
++    void AddRadioButtonGroup (
++            ::std::map< ::rtl::OUString, ModelGroup >& pNamedGroups );
+ };
+ 
+ //	----------------------------------------------------
+Index: toolkit/inc/toolkit/awt/vclxwindows.hxx
+===================================================================
+--- toolkit/inc/toolkit/awt/vclxwindows.hxx	(revision 276159)
++++ toolkit/inc/toolkit/awt/vclxwindows.hxx	(revision 276288)
+@@ -96,6 +96,7 @@
+ #include <vcl/imgcons.hxx>
+ #include <vcl/image.hxx>
+ 
++#include <com/sun/star/document/XVbaMethodParameter.hpp>  //liuchen 2009-6-22, add the support of input/output parameters to VBA Dialog_QueryClose event
+ class Button;
+ class CheckBox;
+ class RadioButton;
+@@ -391,6 +392,7 @@ class VCLXMessageBox :	public ::com::sun::star::aw
+ //	class VCLXDialog
+ //	----------------------------------------------------
+ class VCLXDialog :	public ::com::sun::star::awt::XDialog,
++						public ::com::sun::star::document::XVbaMethodParameter, //liuchen 2009-6-22, add the support of input/output parameters to VBA UserForm_QueryClose event
+ 					public VCLXTopWindow
+ {
+ public:
+@@ -424,6 +426,10 @@ class VCLXDialog :	public ::com::sun::star::awt::X
+ 	// ::com::sun::star::awt::XVclWindowPeer
+     void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
+ 
++	//liuchen 2009-6-23, support Excel VBA UserForm_QueryClose event
++	// ::com::sun::star::document::XVBAMethodParameter
++	void SAL_CALL setVbaMethodParameter( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
++	::com::sun::star::uno::Any SAL_CALL getVbaMethodParameter( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); 
+ };
+ 
+ //	----------------------------------------------------
+Index: toolkit/inc/toolkit/awt/vclxmenu.hxx
+===================================================================
+--- toolkit/inc/toolkit/awt/vclxmenu.hxx	(revision 276159)
++++ toolkit/inc/toolkit/awt/vclxmenu.hxx	(revision 276288)
+@@ -48,6 +48,7 @@
+ class Menu;
+ class MenuBar;
+ class VclSimpleEvent;
++class PopupMenu;
+ 
+ DECLARE_LIST( PopupMenuRefList, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >* )
+ 
+@@ -184,6 +185,7 @@ class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCL
+ {
+ public:
+ 		VCLXPopupMenu();
++		VCLXPopupMenu( PopupMenu* pPopMenu );
+ };
+ 
+ #endif // _TOOLKIT_AWT_VCLXMENU_HXX_
+Index: sw/source/filter/ww8/makefile.mk
+===================================================================
+--- sw/source/filter/ww8/makefile.mk	(revision 276159)
++++ sw/source/filter/ww8/makefile.mk	(revision 276288)
+@@ -69,7 +69,8 @@ EXCEPTIONSFILES = \
+ 		$(SLO)$/writerwordglue.obj \
+         $(SLO)$/ww8scan.obj \
+         $(SLO)$/WW8TableInfo.obj \
+-        $(SLO)$/WW8FFData.obj
++        $(SLO)$/WW8FFData.obj \
++        $(SLO)$/ww8toolbar.obj \
+ 
+ 
+ SLOFILES =	\
+@@ -96,9 +97,11 @@ SLOFILES =	\
+ 		$(SLO)$/writerhelper.obj \
+ 		$(SLO)$/writerwordglue.obj \
+         $(SLO)$/WW8TableInfo.obj \
+-        $(SLO)$/WW8FFData.obj
++        $(SLO)$/WW8FFData.obj \
++        $(SLO)$/ww8toolbar.obj \
+ 
+ 
++
+ # --- Tagets -------------------------------------------------------
+ 
+ .INCLUDE :	target.mk
+Index: sw/source/filter/ww8/ww8par.cxx
+===================================================================
+--- sw/source/filter/ww8/ww8par.cxx	(revision 276159)
++++ sw/source/filter/ww8/ww8par.cxx	(revision 276288)
+@@ -133,11 +133,19 @@
+ #include <svtools/itemiter.hxx>  //SfxItemIter
+ 
+ #include <stdio.h>
++#include <comphelper/processfactory.hxx>
++#include <basic/basmgr.hxx>
+ 
++#include "ww8toolbar.hxx"
++#include <osl/file.hxx>
++#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
++
+ #ifdef DEBUG
+ #include <iostream>
+ #include <dbgoutsw.hxx>
+ #endif
++#include <unotools/localfilehelper.hxx>
++#include <comphelper/configurationhelper.hxx>
+ 
+ #define MM_250 1417             // WW-Default fuer Hor. Seitenraender: 2.5 cm
+ #define MM_200 1134             // WW-Default fuer u.Seitenrand: 2.0 cm
+@@ -147,7 +155,150 @@ using namespace sw::util;
+ using namespace sw::types;
+ using namespace nsHdFtFlags;
+ 
++#include <com/sun/star/document/XEventsSupplier.hpp>
++#include <com/sun/star/container/XNameReplace.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++#include <svx/msvbahelper.hxx>
++#include <svtools/pathoptions.hxx>
++#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+ 
++const static String sThisDocument( RTL_CONSTASCII_USTRINGPARAM("ThisDocument"));
++
++struct DocEventNameTable
++{
++    const sal_Char* sEventName;
++    const sal_Char* sMacroName;
++};
++
++const DocEventNameTable aEventNameTable[] = 
++{
++    {"OnNew", "Document_New"},
++    {"OnLoad", "Document_Open"},
++    {"OnPrepareUnload", "Document_Close"},
++    {NULL, NULL}
++};
++
++bool registerDocEvent( SfxObjectShell* pShell )
++{
++	bool result = false;
++	const static rtl::OUString sEvtType( RTL_CONSTASCII_USTRINGPARAM("EventType") );
++	const static rtl::OUString sScript( RTL_CONSTASCII_USTRINGPARAM("Script") );
++    uno::Reference< document::XEventsSupplier > xEvtSupplier( pShell->GetModel(), uno::UNO_QUERY );
++    if( !xEvtSupplier.is() )
++        return result;
++    uno::Reference< container::XNameReplace > xEvts( xEvtSupplier->getEvents(), uno::UNO_QUERY );     
++	if ( xEvts.is() )
++	{
++        for( const DocEventNameTable* pTable = aEventNameTable; pTable->sEventName != NULL; pTable++ )
++        {
++            rtl::OUString sEvt = rtl::OUString::createFromAscii( pTable->sEventName );
++            String sMacroName = String::CreateFromAscii( pTable->sMacroName ).Insert( '.', 0 ).Insert( sThisDocument, 0);
++            // fail to search the macro if the module is not specified.
++            ooo::vba::VBAMacroResolvedInfo aMacroInfo = ooo::vba::resolveVBAMacro( pShell, sMacroName );
++            if( !aMacroInfo.IsResolved() )
++                continue;
++
++		    uno::Sequence< beans::PropertyValue > aEvents;
++		    xEvts->getByName( sEvt ) >>= aEvents;
++		    uno::Sequence< beans::PropertyValue > aOpenEvt( 2 );
++		    aOpenEvt[ 0 ].Name = sEvtType;
++		    aOpenEvt[ 0 ].Value = uno::makeAny(sScript);
++		    aOpenEvt[ 1 ].Name = sScript;
++            rtl::OUString sUrl = ooo::vba::makeMacroURL( aMacroInfo.ResolvedMacro() );
++    		aOpenEvt[ 1 ].Value = uno::makeAny(sUrl);
++	    	sal_Int32 nPos = aEvents.getLength();
++
++		    sal_Int32 nNewSize = aEvents.getLength() + aOpenEvt.getLength();
++		    if ( nNewSize > aEvents.getLength() )
++			    aEvents.realloc( nNewSize );
++
++	    	for ( sal_Int32 nIndex = nPos, nCpyIndex = 0; nIndex<nNewSize; nIndex++, nCpyIndex++ )
++		    	aEvents[ nIndex ] = aOpenEvt[ nCpyIndex ];	
++			
++		    uno::Any aParam = uno::makeAny( aEvents );
++
++		    xEvts->replaceByName( sEvt, aParam ); 
++		    result = true;
++        }    
++	}
++	return result;
++}
++
++class Sttb : TBBase
++{
++struct SBBItem
++{
++    sal_uInt16 cchData;
++    rtl::OUString data; 
++    SBBItem() : cchData(0){}
++};
++    sal_uInt16 fExtend;
++    sal_uInt16 cData;
++    sal_uInt16 cbExtra;
++
++    std::vector< SBBItem > dataItems;
++
++    Sttb(const Sttb&);
++    Sttb& operator = ( const Sttb&);
++public:
++    Sttb();
++    ~Sttb();
++    bool Read(SvStream *pS);
++    void Print( FILE* fp );
++    rtl::OUString getStringAtIndex( sal_uInt32 );
++};
++
++Sttb::Sttb() : fExtend( 0 )
++,cData( 0 )
++,cbExtra( 0 )
++{
++}
++
++Sttb::~Sttb()
++{
++}
++
++bool Sttb::Read( SvStream* pS )
++{
++    OSL_TRACE("Sttb::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> fExtend >> cData >> cbExtra;
++    if ( cData )
++    {
++        for ( sal_Int32 index = 0; index < cData; ++index )
++        {
++            SBBItem aItem;
++            *pS >> aItem.cchData;
++            aItem.data = readUnicodeString( pS, aItem.cchData );
++            dataItems.push_back( aItem );
++        }
++    }
++    return true;
++}
++
++void Sttb::Print( FILE* fp )
++{
++    fprintf( fp, "[ 0x%x ] Sttb - dump\n", nOffSet);
++    fprintf( fp, " fExtend 0x%x [expected 0xFFFF ]\n", fExtend );
++    fprintf( fp, " cData no. or string data items %d (0x%x)\n", cData, cData );
++    
++    if ( cData )
++    {
++        for ( sal_Int32 index = 0; index < cData; ++index )
++            fprintf(fp,"   string dataItem[ %d(0x%x) ] has name %s\n", static_cast< int >( index ), static_cast< unsigned int >( index ), rtl::OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr() );
++    }
++
++}
++
++rtl::OUString 
++Sttb::getStringAtIndex( sal_uInt32 index )
++{
++    rtl::OUString aRet;
++    if ( index < dataItems.size() )
++        aRet = dataItems[ index ].data;
++    return aRet;
++}
++
+ SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr )
+     : SvxMSDffManager(*rRdr.pTableStream, rRdr.GetBaseURL(), rRdr.pWwFib->fcDggInfo,
+         rRdr.pDataStream, 0, 0, COL_WHITE, 12, rRdr.pStrm,
+@@ -3661,11 +3812,164 @@ void SwWW8ImplReader::ReadDocInfo()
+         DBG_ASSERT(xDocProps.is(), "DocumentProperties is null");
+ 
+         if (xDocProps.is()) {
++            if ( pWwFib->fDot )
++            {
++                rtl::OUString sTemplateURL;
++                SfxMedium* pMedium = mpDocShell->GetMedium();
++                if ( pMedium )
++                {
++                    rtl::OUString aName = pMedium->GetName();
++                    INetURLObject aURL( aName );
++                    sTemplateURL = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI);
++                    if ( sTemplateURL.getLength() > 0 )
++                        xDocProps->setTemplateURL( sTemplateURL );
++                }
++            }
++            else // not a template
++            {
++                long nCur = pTableStream->Tell();
++                Sttb aSttb;
++                pTableStream->Seek( pWwFib->fcSttbfAssoc ); // point at tgc record
++                if (!aSttb.Read( pTableStream ) )
++                    OSL_TRACE("** Read of SttbAssoc data failed!!!! ");
++                pTableStream->Seek( nCur ); // return to previous position, is that necessary?
++#if DEBUG
++                aSttb.Print( stderr );
++#endif
++                String sPath = aSttb.getStringAtIndex( 0x1 );
++                String aURL;
++                // attempt to convert to url ( won't work for obvious reasons on  linux 
++                if ( sPath.Len() )
++	        	::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPath, aURL );
++                if ( aURL.Len() )
++                    xDocProps->setTemplateURL( aURL );
++                else
++                    xDocProps->setTemplateURL( sPath );
++                
++            }
+             sfx2::LoadOlePropertySet(xDocProps, pStg);
+         }
+     }
+ }
+ 
++void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameContainer >& xPrjNameCache, const rtl::OUString& sTemplatePathOrURL, const rtl::OUString& sVBAProjName )
++{
++    if ( xPrjNameCache.is() )
++    {
++        INetURLObject aObj;
++        aObj.SetURL( sTemplatePathOrURL );
++        bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
++        rtl::OUString aURL;
++        if ( bIsURL )
++            aURL = sTemplatePathOrURL;
++        else
++        {
++            osl::FileBase::getFileURLFromSystemPath( sTemplatePathOrURL, aURL );
++            aObj.SetURL( aURL );
++        }
++        try
++        {
++            rtl::OUString templateNameWithExt = aObj.GetLastName();
++            rtl::OUString templateName;
++            sal_Int32 nIndex =  templateNameWithExt.lastIndexOf( '.' );
++            //xPrjNameCache->insertByName( templateNameWithExt, uno::makeAny( sVBAProjName ) );    
++            if ( nIndex != -1 )
++            {
++                templateName = templateNameWithExt.copy( 0, nIndex );
++                xPrjNameCache->insertByName( templateName, uno::makeAny( sVBAProjName ) );    
++            }
++        }
++        catch( uno::Exception& )
++        {
++        }
++    }
++}
++
++class WW8Customizations
++{
++    SvStream* mpTableStream;
++    WW8Fib mWw8Fib;
++public:
++    WW8Customizations( SvStream*, WW8Fib& );
++    bool  Import( SwDocShell* pShell );
++};
++
++WW8Customizations::WW8Customizations( SvStream* pTableStream, WW8Fib& rFib ) : mpTableStream(pTableStream), mWw8Fib( rFib )
++{
++}
++
++bool WW8Customizations::Import( SwDocShell* pShell ) 
++{
++    if ( mWw8Fib.lcbCmds == 0 )
++        return false;
++    Tcg aTCG;
++    long nCur = mpTableStream->Tell();
++    mpTableStream->Seek( mWw8Fib.fcCmds ); // point at tgc record
++    if (!aTCG.Read( mpTableStream ) )
++        OSL_TRACE("** Read of Customization data failed!!!! ");
++    mpTableStream->Seek( nCur ); // return to previous position, is that necessary?
++#if DEBUG
++    aTCG.Print( stderr );
++#endif
++    return aTCG.ImportCustomToolBar( *pShell );
++}
++
++bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const uno::Reference< container::XNameContainer >& xPrjNameCache )
++{
++    SvtPathOptions aPathOpt;
++    String aAddinPath = aPathOpt.GetAddinPath();
++    uno::Sequence< rtl::OUString > sGlobalTemplates;
++
++    // first get the autoload addins in the directory STARTUP
++    uno::Reference< ucb::XSimpleFileAccess > xSFA( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), uno::UNO_QUERY_THROW );
++
++    if( xSFA->isFolder( aAddinPath ) )
++        sGlobalTemplates = xSFA->getFolderContents( aAddinPath, sal_False );
++
++    sal_Int32 nEntries = sGlobalTemplates.getLength();
++    bool bRes = true;
++    const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
++    for ( sal_Int32 i=0; i<nEntries; ++i )
++    {
++        INetURLObject aObj;
++        aObj.SetURL( sGlobalTemplates[ i ] );
++        bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
++        rtl::OUString aURL;
++        if ( bIsURL )
++                aURL = sGlobalTemplates[ i ];
++        else
++                osl::FileBase::getFileURLFromSystemPath( sGlobalTemplates[ i ], aURL );        
++        if ( !aURL.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) || ( sCreatedFrom.getLength() && sCreatedFrom.equals( aURL ) ) )
++            continue; // don't try and read the same document as ourselves
++
++        SotStorageRef rRoot = new SotStorage( aURL, STREAM_STD_READWRITE, STORAGE_TRANSACTED ); 
++
++        // Read Macro Projects
++        SvxImportMSVBasic aVBasic(*mpDocShell, *rRoot,
++            pVBAFlags->IsLoadWordBasicCode(),
++            pVBAFlags->IsLoadWordBasicStorage() );
++
++
++        String s1(CREATE_CONST_ASC("Macros"));
++        String s2(CREATE_CONST_ASC("VBA"));
++        int nRet = aVBasic.Import( s1, s2, ! pVBAFlags->IsLoadWordBasicCode() );
++        lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aVBasic.GetVBAProjectName() );
++        // Read toolbars & menus
++        SvStorageStreamRef refMainStream = rRoot->OpenSotStream( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WordDocument") ) );
++        refMainStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
++        WW8Fib aWwFib( *refMainStream, 8 );       
++        SvStorageStreamRef xTableStream = rRoot->OpenSotStream(String::CreateFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
++
++        if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
++        {
++            xTableStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
++            WW8Customizations aGblCustomisations( xTableStream, aWwFib ); 
++            aGblCustomisations.Import( mpDocShell );
++        }
++    }
++    return bRes;
++}
++
+ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
+ {
+     ULONG nErrRet = 0;
+@@ -3911,7 +4215,7 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGlos
+                 rDoc.GetTxtCollFromPool(RES_POOLCOLL_STANDARD,
+                 false);
+             SwStartNode *pNode =
+-                rDoc.GetNodes().MakeTextSection(aIdx,
++                rDoc.GetNodes().MakeTextSection(aIdx,
+                 SwNormalStartNode,pColl);
+             pPaM->GetPoint()->nNode = pNode->GetIndex()+1;
+             pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(),0);
+@@ -3921,7 +4225,63 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGlos
+     }
+     else //ordinary case
+     {
++        if (mbNewDoc && pStg && !pGloss) /*meaningless for a glossary, cmc*/
++        {
++            mpDocShell->SetIsTemplate( pWwFib->fDot ); // point at tgc record
++            const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
++            maTracer.EnterEnvironment(sw::log::eMacros);
++// dissable below for 3.1 at the moment, 'cause it's kinda immature
++// similarly the project reference in svx/source/msvba
++#if 1
++            uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
++            uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
++            uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
++    
++            rtl::OUString sCreatedFrom = xDocProps->getTemplateURL();
++            uno::Reference< container::XNameContainer > xPrjNameCache;
++            uno::Reference< lang::XMultiServiceFactory> xSF(mpDocShell->GetModel(), uno::UNO_QUERY);
++            if ( xSF.is() )
++                xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY );
++
++            // Read Global templates 
++            ReadGlobalTemplateSettings( sCreatedFrom, xPrjNameCache );
++#endif 
++            // Create and insert Word vba Globals
++            uno::Any aGlobs;
++            uno::Sequence< uno::Any > aArgs(1);
++            aArgs[ 0 ] <<= mpDocShell->GetModel();
++            aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals"), aArgs );
++            mpDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
++            
++            SvxImportMSVBasic aVBasic(*mpDocShell, *pStg,
++                            pVBAFlags->IsLoadWordBasicCode(),
++                            pVBAFlags->IsLoadWordBasicStorage() );
++            String s1(CREATE_CONST_ASC("Macros"));
++            String s2(CREATE_CONST_ASC("VBA"));
++            int nRet = aVBasic.Import( s1, s2, ! pVBAFlags->IsLoadWordBasicCode() );
++// dissable below for 3.1 at the moment, 'cause it's kinda immature
++// similarly the project reference in svx/source/msvba
++#if 1
++            lcl_createTemplateToProjectEntry( xPrjNameCache, sCreatedFrom, aVBasic.GetVBAProjectName() );
++            WW8Customizations aCustomisations( pTableStream, *pWwFib ); 
++            aCustomisations.Import( mpDocShell );
++#endif 
++            if( 2 & nRet )
++            {
++                maTracer.Log(sw::log::eContainsVisualBasic);
++                rDoc.SetContainsMSVBasic(true);
++            }
++
++            StoreMacroCmds();
++
++            // Hackly to register the document event.
++            // should be find a better solution to share the codes with Excel Workbook event. 
++            registerDocEvent( mpDocShell );
++
++            maTracer.LeaveEnvironment(sw::log::eMacros);
++        }
+         ReadText(0, pWwFib->ccpText, MAN_MAINTEXT);
++
+     }
+ 
+     ::SetProgressState(nProgress, mpDocShell);    // Update
+@@ -3995,28 +4355,8 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGlos
+             eMode |= nsRedlineMode_t::REDLINE_ON;
+         if( pWDop->fRMView )
+             eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE;
+-        if (pStg && !pGloss) /*meaningless for a glossary, cmc*/
+-        {
+-            const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
+-            maTracer.EnterEnvironment(sw::log::eMacros);
+-            SvxImportMSVBasic aVBasic(*mpDocShell, *pStg,
+-                            pVBAFlags->IsLoadWordBasicCode(),
+-                            pVBAFlags->IsLoadWordBasicStorage() );
+-            String s1(CREATE_CONST_ASC("Macros"));
+-            String s2(CREATE_CONST_ASC("VBA"));
+-            int nRet = aVBasic.Import( s1, s2 );
+-            if( 2 & nRet )
+-            {
+-                maTracer.Log(sw::log::eContainsVisualBasic);
+-                rDoc.SetContainsMSVBasic(true);
+             }
+ 
+-            StoreMacroCmds();
+-
+-            maTracer.LeaveEnvironment(sw::log::eMacros);
+-        }
+-    }
+-
+     maInsertedTables.DelAndMakeTblFrms();
+     maSectionManager.InsertSegments();
+ 
+Index: sw/source/filter/ww8/ww8par.hxx
+===================================================================
+--- sw/source/filter/ww8/ww8par.hxx	(revision 276159)
++++ sw/source/filter/ww8/ww8par.hxx	(revision 276288)
+@@ -1423,7 +1423,7 @@ friend class wwSectionManager;
+     // determine object attribute "Layout in Table Cell"
+     bool IsObjectLayoutInTableCell( const UINT32 nLayoutInTableCell ) const;
+     // <--
+-
++    bool ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap );
+     //No copying
+     SwWW8ImplReader(const SwWW8ImplReader &);
+     SwWW8ImplReader& operator=(const SwWW8ImplReader&);
+Index: sw/source/filter/ww8/ww8toolbar.cxx
+===================================================================
+--- sw/source/filter/ww8/ww8toolbar.cxx	(revision 0)
++++ sw/source/filter/ww8/ww8toolbar.cxx	(revision 276288)
+@@ -0,0 +1,1281 @@
++#include "ww8toolbar.hxx"
++#include <rtl/ustrbuf.hxx>
++#include <stdarg.h>
++#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
++#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
++#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
++#include <com/sun/star/lang/XMultiServiceFactory.hpp>
++#include <com/sun/star/lang/XSingleComponentFactory.hpp>
++#include <com/sun/star/lang/XMultiComponentFactory.hpp>
++#include <com/sun/star/ui/XImageManager.hpp>
++#include <com/sun/star/ui/ItemType.hpp>
++#include <fstream>
++#include <comphelper/processfactory.hxx>
++#include <vcl/graph.hxx>
++#include <map>
++using namespace com::sun::star;
++
++// no. of visual data elements in a CTB ( fixed ) 
++const short nVisualData = 5;
++
++typedef std::map< sal_Int16, rtl::OUString > IdToString;
++
++class MSOWordCommandConvertor : public MSOCommandConvertor
++{
++   IdToString msoToOOcmd;
++   IdToString tcidToOOcmd;
++public:
++    MSOWordCommandConvertor();
++    virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
++    virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 key );
++};
++
++MSOWordCommandConvertor::MSOWordCommandConvertor()
++{
++    // mso command id to ooo command string
++    // #FIXME and *HUNDREDS* of id's to added here
++    msoToOOcmd[ 0x20b ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc") );
++    msoToOOcmd[ 0x50 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Open") );
++
++   // mso tcid to ooo command string
++    // #FIXME and *HUNDREDS* of id's to added here
++   tcidToOOcmd[ 0x9d9 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Print") );
++}
++
++rtl::OUString MSOWordCommandConvertor::MSOCommandToOOCommand( sal_Int16 key )
++{
++    rtl::OUString sResult;
++    IdToString::iterator it = msoToOOcmd.find( key );
++    if ( it != msoToOOcmd.end() )
++        sResult = it->second;
++    return sResult;
++}
++
++rtl::OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key )
++{
++    rtl::OUString sResult;
++    IdToString::iterator it = tcidToOOcmd.find( key );
++    if ( it != tcidToOOcmd.end() )
++        sResult = it->second;
++    return sResult;
++}
++
++
++CTBWrapper::CTBWrapper( bool bReadId ) : Tcg255SubStruct( bReadId )
++,reserved2(0)
++,reserved3(0)
++,reserved4(0)
++,reserved5(0)
++,cbTBD(0)
++,cCust(0)
++,cbDTBC(0)
++,rtbdc(0)
++{
++}
++
++CTBWrapper::~CTBWrapper()
++{
++}
++
++Customization* CTBWrapper::GetCustomizaton( sal_Int16 index )
++{
++    if ( index < 0 || index >= rCustomizations.size() )
++        return NULL;
++    return &rCustomizations[ index ]; 
++}
++
++CTB* CTBWrapper::GetCustomizationData( const rtl::OUString& sTBName )
++{
++    CTB* pCTB = NULL;
++    for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it )
++    {
++        if ( it->GetCustomizationData() && it->GetCustomizationData()->GetName().equals( sTBName ) )
++        {
++            pCTB = it->GetCustomizationData();
++            break;
++        }
++    }
++    return pCTB;
++}
++
++bool CTBWrapper::Read( SvStream* pS )
++{
++    OSL_TRACE("CTBWrapper::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    Tcg255SubStruct::Read( pS );
++    *pS >> reserved2 >> reserved3 >> reserved4 >> reserved5;
++    *pS >> cbTBD >> cCust >> cbDTBC;
++    if ( cbDTBC )
++    {
++        // cbDTBC is the size in bytes of the TBC array
++        // but the size of a TBC element is dynamic ( and this relates to TBDelta's
++        int nStart = pS->Tell();
++
++        int bytesRead = 0;
++        int bytesToRead = cbDTBC - bytesRead; 
++        // cbDTBC specifies the size ( in bytes ) taken by an array ( of unspecified size )
++        // of TBC records ( TBC records have dynamic length, so we need to check our position
++        // after each read )
++        do
++        {
++            TBC aTBC;
++            if ( !aTBC.Read( pS ) )
++                return false;
++            rtbdc.push_back( aTBC );
++            bytesToRead = cbDTBC - ( pS->Tell() - nStart ); 
++        } while ( bytesToRead > 0 );
++    }
++    if ( cCust )
++    {
++        for ( sal_Int32 index = 0; index < cCust; ++index )
++        {
++            Customization aCust( this );
++            if ( !aCust.Read( pS ) )
++                return false;
++            rCustomizations.push_back( aCust );
++        } 
++    } 
++    std::vector< sal_Int16 >::iterator it_end = dropDownMenuIndices.end();
++    for ( std::vector< sal_Int16 >::iterator it = dropDownMenuIndices.begin(); it != it_end; ++it )
++    {
++        rCustomizations[ *it ].bIsDroppedMenuTB = true;
++    }
++    return true;
++}
++
++TBC* CTBWrapper::GetTBCAtOffset( sal_uInt32 nStreamOffset )
++{
++    for ( std::vector< TBC >::iterator it = rtbdc.begin(); it != rtbdc.end(); ++it )
++    {
++        if ( (*it).GetOffset() == nStreamOffset )
++            return &(*it);
++    }
++    return NULL;
++}
++
++void CTBWrapper::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp,"[ 0x%x ] CTBWrapper - dump\n", nOffSet );
++    bool bRes = ( ch == 0x12 && reserved2 == 0x0 && reserved3 == 0x7 && reserved4 == 0x6 && reserved5 == 0xC );
++    if ( bRes )
++        indent_printf(fp,"  sanity check ( first 8 bytes conform )\n");
++    else 
++    {
++        indent_printf(fp,"    reserved1(0x%x)\n",ch);
++        indent_printf(fp,"    reserved2(0x%x)\n",reserved2);
++        indent_printf(fp,"    reserved3(0x%x)\n",reserved3);
++        indent_printf(fp,"    reserved4(0x%x)\n",reserved4);
++        indent_printf(fp,"    reserved5(0x%x)\n",reserved5);
++        indent_printf(fp,"Quiting dump");
++        return;
++    }
++    indent_printf(fp,"  size of TBDelta structures 0x%x\n", cbTBD );
++    indent_printf(fp,"  cCust: no. of cCust structures 0x%x\n",cCust);
++    indent_printf(fp,"  cbDTBC: no. of bytes in rtbdc array 0x%x\n", static_cast< unsigned int >( cbDTBC ));
++
++    sal_Int32 index = 0;
++
++    for ( std::vector< TBC >::iterator it = rtbdc.begin(); it != rtbdc.end(); ++it, ++index )
++    {
++        indent_printf(fp,"  Dumping rtbdc[%d]\n", static_cast< int >( index ));
++        Indent b;
++        it->Print( fp );
++    }
++
++    index = 0;
++
++    for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it, ++index )
++    {
++        indent_printf(fp,"  Dumping custimization [%d]\n", static_cast< int >( index ));
++        Indent c;
++        it->Print(fp);
++    }
++}
++
++bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh )
++{
++    for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it )
++    {
++        uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++        uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xAppCfgSupp( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) ) ), uno::UNO_QUERY_THROW ); 
++        CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) );
++        helper.setMSOCommandMap( new MSOWordCommandConvertor() );
++
++        if ( !(*it).ImportCustomToolBar( *this, helper ) )
++            return false;
++    }
++    return false;
++}
++
++Customization::Customization( CTBWrapper* wrapper ) : tbidForTBD( 0 )
++,reserved1( 0 )
++, ctbds( 0 )
++, pWrapper( wrapper )
++, bIsDroppedMenuTB( false )
++{
++}
++
++Customization::~Customization()
++{
++}
++
++bool Customization::Read( SvStream *pS)
++{
++    OSL_TRACE("Custimization::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> tbidForTBD >> reserved1 >> ctbds;
++    if ( tbidForTBD )
++    {
++        for ( sal_Int32 index = 0; index < ctbds; ++index )
++        {
++            TBDelta aTBDelta;
++            if (!aTBDelta.Read( pS ) )
++                return false;
++            customizationDataTBDelta.push_back( aTBDelta );
++            // Only set the drop down for menu's associated with standard toolbar
++            if ( aTBDelta.ControlDropsToolBar() && tbidForTBD == 0x25 )
++                pWrapper->InsertDropIndex( aTBDelta.CustomizationIndex() );
++        }
++    }
++    else
++    {
++        customizationDataCTB.reset( new CTB() );
++        if ( !customizationDataCTB->Read( pS ) )
++                return false;
++    }
++    return true;
++}
++
++void Customization::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp,"[ 0x%x ] Customization -- dump \n", nOffSet );
++    indent_printf( fp,"  tbidForTBD 0x%x ( should be 0 for CTBs )\n", static_cast< unsigned int >( tbidForTBD ));
++    indent_printf( fp,"  reserved1 0x%x \n", reserved1);
++    indent_printf( fp,"  ctbds - number of customisations %d(0x%x) \n", ctbds, ctbds );
++    if ( !tbidForTBD && !ctbds )
++        customizationDataCTB->Print( fp );
++    else
++    {
++        const char* pToolBar = NULL;
++        switch ( tbidForTBD )
++        {
++            case 0x9:
++                pToolBar = "Standard";
++                break;
++            case 0x25:
++                pToolBar = "Builtin-Menu";
++                break;
++            default:
++                pToolBar = "Unknown toolbar";
++                break;
++        }
++        
++        indent_printf( fp,"  TBDelta(s) are associated with %s toolbar.\n", pToolBar);
++        std::vector< TBDelta >::iterator it = customizationDataTBDelta.begin();
++        for ( sal_Int32 index = 0; index < ctbds; ++it,++index )
++            it->Print( fp );
++    }
++    
++}
++
++bool Customization::ImportMenu( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper )
++{
++    if ( tbidForTBD == 0x25 )  // we can handle in a limited way additions the built-in menu bar
++    {
++        for ( std::vector< TBDelta >::iterator it = customizationDataTBDelta.begin(); it != customizationDataTBDelta.end(); ++it )
++        {
++            // for each new menu ( control that drops a toolbar )
++            // import a toolbar
++            if ( it->ControlIsInserted() && it->ControlDropsToolBar() )
++            {
++                Customization* pCust = pWrapper->GetCustomizaton( it->CustomizationIndex() );
++                if ( pCust )
++                {
++                    // currently only support built-in menu
++                    rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") );
++
++                    sMenuBar = sMenuBar.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("menubar") ) );
++                    // Get menu name
++                    TBC* pTBC = pWrapper->GetTBCAtOffset( it->TBCStreamOffset() );
++                    if ( !pTBC )
++                        return false;
++                    rtl::OUString sMenuName = pTBC->GetCustomText();
++                    sMenuName = sMenuName.replace('&','~');
++
++                    // see if the document has already setting for the menubar
++                
++                    uno::Reference< container::XIndexContainer > xIndexContainer;
++                    bool bHasSettings = false;
++                    if ( helper.getCfgManager()->hasSettings( sMenuBar ) )
++                    {
++                        xIndexContainer.set( helper.getCfgManager()->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW );
++                        bHasSettings = true;
++                    }
++                    else
++                    {
++                        if ( helper.getAppCfgManager()->hasSettings( sMenuBar ) )
++                            xIndexContainer.set( helper.getAppCfgManager()->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW );
++                        else 
++                            xIndexContainer.set( helper.getAppCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
++                    }
++               
++                    uno::Reference< lang::XSingleComponentFactory > xSCF( xIndexContainer, uno::UNO_QUERY_THROW );
++                    uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++                    uno::Reference< uno::XComponentContext > xContext(  xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
++                    // create the popup menu
++                    uno::Sequence< beans::PropertyValue > aPopupMenu( 4 );
++                    aPopupMenu[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
++                    aPopupMenu[0].Value = uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("vnd.openoffice.org:") ) + sMenuName );
++                    aPopupMenu[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Label") );
++                    aPopupMenu[1].Value <<= sMenuName;
++                    aPopupMenu[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type" ) );
++                    aPopupMenu[2].Value <<= sal_Int32( 0 );
++                    aPopupMenu[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") );
++                    uno::Reference< container::XIndexContainer > xMenuContainer( xSCF->createInstanceWithContext( xContext ), uno::UNO_QUERY_THROW );
++                    aPopupMenu[3].Value <<= xMenuContainer;
++                    if ( pCust->customizationDataCTB.get() && !pCust->customizationDataCTB->ImportMenuTB( rWrapper, xMenuContainer, helper ) )
++                        return false;
++                    OSL_TRACE("** there are %d menu items on the bar, inserting after that", xIndexContainer->getCount() );
++                    xIndexContainer->insertByIndex( xIndexContainer->getCount(), uno::makeAny( aPopupMenu ) );
++
++                    if ( bHasSettings )
++                        helper.getCfgManager()->replaceSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xIndexContainer, uno::UNO_QUERY_THROW ) );
++                    else
++                        helper.getCfgManager()->insertSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xIndexContainer, uno::UNO_QUERY_THROW ) );
++        uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager(), uno::UNO_QUERY_THROW );
++        xPersistence->store();
++                }
++            }
++        }
++        return true;
++    }
++    return true;
++}
++
++bool Customization::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper )
++{
++    if ( GetTBIDForTB() == 0x25 )
++        return ImportMenu( rWrapper, helper );
++    if ( !customizationDataCTB.get() )
++        return false;
++    if ( !customizationDataCTB->IsMenuToolbar() )
++    {
++        if ( !customizationDataCTB->ImportCustomToolBar( rWrapper, helper ) )
++            return false;
++    }
++    return true;
++}
++
++TBDelta::TBDelta() : doprfatendFlags(0)
++,ibts(0)
++,cidNext(0)
++,cid(0)
++,fc(0)
++,cbTBC(0)
++{
++}
++
++bool TBDelta::ControlIsModified()
++{
++    return ( ( doprfatendFlags & 0x3 ) == 0x2 );
++}
++
++bool TBDelta::ControlIsInserted()
++{
++    return ( ( doprfatendFlags & 0x3 ) == 0x1 );
++}
++
++bool TBDelta::ControlIsChanged()
++{
++    return ( ( doprfatendFlags & 0x3 ) == 0x1 );
++}
++
++bool TBDelta::ControlDropsToolBar()
++{
++    return !( CiTBDE & 0x8000 );
++}
++
++sal_Int32 TBDelta::TBCStreamOffset()
++{
++    return fc;
++}
++
++sal_Int16 TBDelta::CustomizationIndex()
++{
++    sal_Int16 nIndex = CiTBDE;
++    nIndex = nIndex >> 1;
++    nIndex &= 0x1ff; // only 13 bits are relevant
++    return nIndex;
++}
++
++bool TBDelta::Read(SvStream *pS)
++{
++    OSL_TRACE("TBDelta::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> doprfatendFlags >> ibts >> cidNext >> cid >> fc ;
++    *pS >> CiTBDE >> cbTBC;
++    return true;
++}
++
++void TBDelta::Print( FILE* fp )
++{
++    // Like most of the debug output, it's raw and little ( no )
++    // interpretation of the data is output ( e.g. flag values etc. )
++    indent_printf( fp, "[ 0x%x ] TBDelta -- dump\n", nOffSet );
++    indent_printf( fp, " doprfatendFlags 0x%x\n",doprfatendFlags );
++    
++    indent_printf( fp, " ibts 0x%x\n",ibts );
++    indent_printf( fp, " cidNext 0x%x\n", static_cast< unsigned int >( cidNext ) );
++    indent_printf( fp, " cid 0x%x\n", static_cast< unsigned int >( cid ) );
++    indent_printf( fp, " fc 0x%x\n", static_cast< unsigned int >( fc ) );
++    indent_printf( fp, " CiTBDE 0x%x\n",CiTBDE );
++    indent_printf( fp, " cbTBC 0x%x\n", cbTBC );
++    if ( ControlDropsToolBar() )
++    {
++        indent_printf( fp, " this delta is associated with a control that drops a menu toolbar\n", cbTBC );
++        indent_printf( fp, " the menu toolbar drops the toolbar defined at index[%d] in the rCustomizations array of the CTBWRAPPER that contains this TBDelta\n", CustomizationIndex() );
++    }
++}
++
++CTB::CTB() : cbTBData( 0 )
++,iWCTBl( 0 )
++,reserved( 0 )
++,unused( 0 )
++,cCtls( 0 )
++{
++}
++
++CTB::~CTB()
++{
++}
++
++bool CTB::IsMenuToolbar()
++{
++    return tb.IsMenuToolbar();
++}
++
++
++bool CTB::Read( SvStream *pS)
++{
++    OSL_TRACE("CTB::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    if ( !name.Read( pS ) )
++        return false;
++    *pS >> cbTBData;
++    if ( !tb.Read( pS ) )
++        return false;
++    for ( short index = 0; index < nVisualData; ++index )
++    {
++        TBVisualData aVisData;
++        aVisData.Read( pS );
++        rVisualData.push_back( aVisData );
++    }
++
++    *pS >> iWCTBl >> reserved >> unused >> cCtls;
++    
++    if ( cCtls )
++    {
++        for ( sal_Int32 index = 0; index < cCtls; ++index )
++        {
++            TBC aTBC;
++            if ( !aTBC.Read( pS ) )
++                return false;
++            rTBC.push_back( aTBC );
++        }
++    }
++    return true;
++}
++
++void
++CTB::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp, "[ 0x%x ] CTB - dump\n", nOffSet );
++    indent_printf(fp, "  name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++    indent_printf(fp, "  cbTBData size, in bytes, of this structure excluding the name, cCtls, and rTBC fields.  %x\n", static_cast< unsigned int >( cbTBData ) );
++    
++    tb.Print(fp);
++    for ( short counter = 0; counter < nVisualData; ++counter )
++    {
++        indent_printf( fp, "  TBVisualData [%d]\n", counter);
++        Indent b;
++        rVisualData[ counter ].Print( fp );
++    } 
++    indent_printf(fp, "  iWCTBl 0x%x reserved 0x%x unused 0x%x cCtls( toolbar controls ) 0x%x \n", static_cast< unsigned int >( iWCTBl ), reserved, unused, static_cast< unsigned int >( cCtls ) );
++    if ( cCtls )
++    {
++        for ( sal_Int32 index = 0; index < cCtls; ++index )
++        {
++        
++            indent_printf(fp, "  dumping toolbar control 0x%x\n", static_cast< unsigned int >( index ) );
++            rTBC[ index ].Print( fp );
++        }
++    }
++}
++
++bool CTB::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper )
++{
++    static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) );
++    bool bRes = false;
++    try
++    {
++        if ( !tb.IsEnabled() )
++            return true;  // didn't fail, just ignoring
++        // Create default setting
++        uno::Reference< container::XIndexContainer > xIndexContainer( helper.getCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
++        uno::Reference< container::XIndexAccess > xIndexAccess( xIndexContainer, uno::UNO_QUERY_THROW );
++        uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); 
++        
++        // set UI name for toolbar
++        xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( name.getString() ) ); 
++    
++        rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() );
++        for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
++        {
++            // createToolBar item for control
++            if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, helper, IsMenuToolbar() ) )
++                return false;
++        }
++    
++        OSL_TRACE("Name of toolbar :-/ %s", rtl::OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() );
++    
++        helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess );
++        helper.applyIcons();
++#if 1 // don't think this is necessary
++        uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
++        xPersistence->store();
++
++        xPersistence.set( helper.getCfgManager(), uno::UNO_QUERY_THROW );
++        xPersistence->store();
++#endif
++        bRes = true;
++    }
++    catch( uno::Exception& e )
++    {
++        OSL_TRACE("***** For some reason we have an exception %s", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
++        bRes = false;
++    }
++    return bRes;
++}
++
++bool CTB::ImportMenuTB( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& xIndexContainer, CustomToolBarImportHelper& rHelper )
++{
++    for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
++    {
++        // createToolBar item for control
++        if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, rHelper, true ) )
++            return false;
++    }
++    return true;
++}
++
++TBC::TBC()
++{
++}
++
++TBC::~TBC()
++{
++}
++
++bool TBC::Read( SvStream *pS )
++{
++    OSL_TRACE("TBC::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    if ( !tbch.Read( pS ) )
++        return false;
++    if ( tbch.getTcID() != 0x1 && tbch.getTcID() != 0x1051 )
++    {
++        cid.reset( new sal_uInt32 );
++        *pS >> *cid;
++    }
++    // MUST exist if tbch.tct is not equal to 0x16
++    if ( tbch.getTct() != 0x16 )
++    {
++        tbcd.reset(  new TBCData( tbch ) );
++        if ( !tbcd->Read( pS ) )
++            return false;
++    }
++    return true;
++}
++
++void TBC::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp,"[ 0x%x ] TBC -- dump\n", nOffSet );
++    indent_printf(fp,"  dumping header ( TBCHeader )\n");
++    tbch.Print( fp );
++    if ( cid.get() )
++        indent_printf(fp,"  cid = 0x%x\n", static_cast< unsigned int >( *cid ) );
++    if ( tbcd.get() )
++    {
++        indent_printf(fp,"  dumping toolbar data TBCData \n");
++        tbcd->Print(fp);
++    }
++}
++
++bool
++TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar )
++{
++    // cmtFci       0x1 Command based on a built-in command. See CidFci.
++    // cmtMacro     0x2 Macro command. See CidMacro.
++    // cmtAllocated 0x3 Allocated command. See CidAllocated.
++    // cmtNil       0x7 No command. See Cid.
++    bool bBuiltin = false;
++    sal_uInt16 cmdId = 0;
++    if  ( cid.get() )
++    {
++        sal_uInt16 arg2 = ( *( cid.get() ) & 0xFFFF );
++
++        sal_uInt8 cmt = ( arg2 & 0x7 );
++        arg2 = ( arg2 >> 3 );
++
++        switch ( cmt )
++        {
++            case 1:
++                OSL_TRACE("cmt is cmtFci builtin command 0x%x", arg2);
++                bBuiltin = true;
++                cmdId = arg2;
++                break;
++            case 2:
++                OSL_TRACE("cmt is cmtMacro macro 0x%x", arg2);
++                break;
++            case 3:
++                OSL_TRACE("cmt is cmtAllocated [???] 0x%x", arg2);
++                break;
++            case 7:
++                OSL_TRACE("cmt is cmNill no-phing 0x%x", arg2);
++                break;
++            default:
++                OSL_TRACE("illegal 0x%x", cmt);
++                break;
++        }
++    }
++
++    if ( tbcd.get() )
++    {
++        std::vector< css::beans::PropertyValue > props;
++        if ( bBuiltin )
++        {
++            rtl::OUString sCommand = helper.MSOCommandToOOCommand( cmdId );
++            if ( sCommand.getLength() > 0 )
++            {
++                beans::PropertyValue aProp;
++ 
++                aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
++                aProp.Value <<= sCommand;
++                props.push_back( aProp ); 
++            }
++        }
++        bool bBeginGroup = false;
++        if ( ! tbcd->ImportToolBarControl( helper, props, bBeginGroup, bIsMenuBar ) )
++            return false;
++
++        TBCMenuSpecific* pMenu = tbcd->getMenuSpecific();
++        if ( pMenu )
++        {
++            OSL_TRACE("** control has a menu, name of toolbar with menu items is %s", rtl::OUStringToOString( pMenu->Name(), RTL_TEXTENCODING_UTF8 ).getStr() );
++            // search for CTB with the appropriate name ( it contains the
++            // menu items, although we cannot import ( or create ) a menu on
++            // a custom toolbar we can import the menu items in a separate 
++            // toolbar ( better than nothing )
++            CTB* pCustTB = rWrapper.GetCustomizationData( pMenu->Name() );
++            if ( pCustTB )
++            {
++                 uno::Reference< container::XIndexContainer > xMenuDesc;
++                 uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++                 xMenuDesc.set( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.IndexedPropertyValues" ) ) ), uno::UNO_QUERY_THROW );
++                if ( !pCustTB->ImportMenuTB( rWrapper,xMenuDesc, helper ) )
++                    return false;     
++                beans::PropertyValue aProp;
++		
++                aProp.Name =  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") );
++                aProp.Value <<= xMenuDesc;
++                props.push_back( aProp );
++            } 
++        }
++
++        if ( bBeginGroup )
++        {
++            // insert spacer
++            uno::Sequence< beans::PropertyValue > sProps( 1 );
++            sProps[ 0 ].Name =  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") );
++            sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE ); 
++            toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );       
++        }
++ 
++        uno::Sequence< beans::PropertyValue > sProps( props.size() );
++        beans::PropertyValue* pProp = sProps.getArray();
++   
++        for ( std::vector< css::beans::PropertyValue >::iterator it = props.begin(); it != props.end(); ++it, ++pProp )
++            *pProp = *it;
++
++        toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );        
++    }
++    return true;
++}
++
++rtl::OUString 
++TBC::GetCustomText()
++{
++    rtl::OUString sCustomText;
++    if ( tbcd.get() )
++        sCustomText = tbcd->getGeneralInfo().CustomText();
++    return sCustomText;
++   
++    
++}
++
++bool 
++Xst::Read( SvStream* pS )
++{
++    OSL_TRACE("Xst::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    sal_Int16 nChars = 0;
++    *pS >> nChars;
++    sString = readUnicodeString( pS, static_cast< sal_Int32 >( nChars  ) );
++    return true;
++}
++
++void
++Xst::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] Xst -- dump\n", nOffSet );
++    indent_printf( fp, " %s",  rtl::OUStringToOString( sString, RTL_TEXTENCODING_UTF8 ).getStr() );
++}
++
++Tcg::Tcg() : nTcgVer( 255 )
++{
++}
++
++bool Tcg::Read(SvStream *pS)
++{
++    OSL_TRACE("Tcg::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> nTcgVer;
++    if ( nTcgVer != (sal_Int8)255 )
++        return false;
++    tcg.reset( new Tcg255() );
++    return tcg->Read( pS );
++}
++
++void Tcg::Print( FILE* fp )
++{
++    Indent a(true);
++    indent_printf(fp, "[ 0x%x ] Tcg - dump %d\n", nOffSet, nTcgVer);
++    indent_printf(fp,"  nTcgVer %d\n", nTcgVer);
++    tcg->Print( fp );
++}
++
++bool Tcg::ImportCustomToolBar( SfxObjectShell& rDocSh )
++{
++    return tcg->ImportCustomToolBar( rDocSh );
++}
++
++Tcg255::Tcg255()
++{
++}
++
++Tcg255::~Tcg255()
++{
++    std::vector< Tcg255SubStruct* >::iterator it = rgtcgData.begin();
++    for ( ; it != rgtcgData.end(); ++it )
++        delete *it;
++}
++
++bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream *pS )
++{
++     Tcg255SubStruct* pSubStruct = NULL;
++     switch ( nId )
++     {
++         case 0x1:
++         {
++             pSubStruct = new PlfMcd( false ); // don't read the id
++             break;
++         }
++         case 0x2: 
++         {
++             pSubStruct = new PlfAcd( false );
++             break;
++         }
++         case 0x3: 
++         case 0x4: 
++         {
++             pSubStruct = new PlfKme( false );
++             break;
++         }
++         case 0x10: 
++         {
++             pSubStruct = new TcgSttbf( false );
++             break;
++         }
++         case 0x11: 
++         {
++             pSubStruct = new MacroNames( false );
++             break;
++         }
++         case 0x12: 
++         {
++             pSubStruct = new CTBWrapper( false );
++             break;
++         }
++         default:
++             OSL_TRACE("Unknown id 0x%x",nId);
++             return false;
++    }
++    pSubStruct->ch = nId;
++    if ( !pSubStruct->Read( pS ) )
++        return false;
++    rgtcgData.push_back( pSubStruct );
++    return true;
++}
++
++bool Tcg255::ImportCustomToolBar( SfxObjectShell& rDocSh )
++{
++    // Find the CTBWrapper
++    for ( std::vector< Tcg255SubStruct* >::const_iterator it = rgtcgData.begin(); it != rgtcgData.end(); ++it )
++    {
++        if ( (*it)->id() == 0x12 )
++        {
++            // not so great, shouldn't really have to do a horror casting    
++            CTBWrapper* pCTBWrapper =  dynamic_cast< CTBWrapper* > ( *it );
++            if ( pCTBWrapper )
++            {
++                if ( !pCTBWrapper->ImportCustomToolBar( rDocSh ) )
++                    return false;
++            }
++        }
++    }
++    return true;
++}
++
++
++bool Tcg255::Read(SvStream *pS)
++{
++    OSL_TRACE("Tcg255::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    sal_uInt8 nId = 0; // 
++    *pS >> nId;
++    while (  nId != 0x40  )
++    {
++        if ( !processSubStruct( nId, pS ) )
++            return false;
++        *pS >> nId;
++    } 
++    return true;
++    // Peek at  
++}
++
++void Tcg255::Print( FILE* fp)
++{
++    Indent a;
++    indent_printf(fp, "[ 0x%x ] Tcg255 - dump\n", nOffSet );
++    indent_printf(fp, "  contains %d sub records\n", rgtcgData.size() );
++    std::vector< Tcg255SubStruct* >::iterator it = rgtcgData.begin(); 
++    std::vector< Tcg255SubStruct* >::iterator it_end = rgtcgData.end(); 
++    
++    for( sal_Int32 count = 1; it != it_end ; ++it, ++count )
++    {
++        Indent b;
++        indent_printf(fp, "  [%d] Tcg255SubStruct \n", static_cast< unsigned int >( count ) );
++        (*it)->Print(fp);
++    }
++}
++
++
++Tcg255SubStruct::Tcg255SubStruct( bool bReadId ) : mbReadId( bReadId ), ch(0)
++{
++}
++
++bool Tcg255SubStruct::Read(SvStream *pS)
++{
++    OSL_TRACE("Tcg255SubStruct::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    if ( mbReadId )
++        *pS >> ch;
++    return true;
++}
++
++PlfMcd::PlfMcd( bool bReadId ): Tcg255SubStruct( bReadId ), rgmcd( NULL )
++{
++}
++PlfMcd::~PlfMcd()
++{
++    if ( rgmcd )
++        delete[] rgmcd;
++}
++
++bool PlfMcd::Read(SvStream *pS)
++{
++    OSL_TRACE("PffMcd::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    Tcg255SubStruct::Read( pS );
++    *pS >> iMac;
++    if ( iMac )
++    { 
++        rgmcd = new MCD[ iMac ];
++        for ( sal_Int32 index = 0; index < iMac; ++index )
++        {
++            if ( !rgmcd[ index ].Read( pS ) )
++                return false; 
++        } 
++    }
++    return true;
++}
++
++void PlfMcd::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp, "[ 0x%x ] PlfMcd ( Tcg255SubStruct ) - dump\n", nOffSet );
++    indent_printf(fp, " contains %d MCD records\n", static_cast<int>( iMac ) );
++    for ( sal_Int32 count=0; count < iMac; ++count )
++    {
++        Indent b;
++        indent_printf(fp, "[%d] MCD\n", static_cast< int >( count ) );
++        rgmcd[ count ].Print( fp );
++    }
++    
++}
++
++PlfAcd::PlfAcd( bool bReadId ) : Tcg255SubStruct( bReadId )
++,iMac(0)
++,rgacd(NULL)
++{
++}
++
++
++PlfAcd::~PlfAcd()
++{
++    if ( rgacd )
++        delete[] rgacd;
++}
++
++bool PlfAcd::Read( SvStream *pS)
++{
++    OSL_TRACE("PffAcd::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    Tcg255SubStruct::Read( pS );
++    *pS >> iMac;
++    if ( iMac )
++    {
++        rgacd = new Acd[ iMac ];
++        for ( sal_Int32 index = 0; index < iMac; ++index )
++        {
++            if ( !rgacd[ index ].Read( pS ) ) 
++                return false;
++        }
++    }
++    return true;
++}
++void PlfAcd::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp, "[ 0x%x ] PlfAcd ( Tcg255SubStruct ) - dump\n", nOffSet );
++    indent_printf(fp, " contains %d ACD records\n", static_cast< int >( iMac ) );
++    for ( sal_Int32 count=0; count < iMac; ++count )
++    {
++        Indent b;
++        indent_printf(fp, "[%d] ACD\n", static_cast< int >( count ) );
++        rgacd[ count ].Print( fp );
++    }
++    
++}
++
++PlfKme::PlfKme( bool bReadId ) : Tcg255SubStruct( bReadId )
++,iMac( 0 )
++,rgkme( NULL )
++{
++}
++
++PlfKme::~PlfKme()
++{
++    if ( rgkme )
++        delete[] rgkme;
++}
++
++bool PlfKme::Read(SvStream *pS)
++{
++    OSL_TRACE("PlfKme::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    Tcg255SubStruct::Read( pS );
++    *pS >> iMac;
++    if ( iMac )
++    {
++        rgkme = new Kme[ iMac ];
++        for( sal_Int32 index=0; index<iMac; ++index )
++        {
++            if ( !rgkme[ index ].Read( pS ) )
++                return false;
++        }
++    }
++    return true;
++}
++ 
++void PlfKme::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp, "[ 0x%x ] PlfKme ( Tcg255SubStruct ) - dump\n", nOffSet );
++    indent_printf(fp, " contains %d Kme records\n", static_cast< int >( iMac ) );
++    for ( sal_Int32 count=0; count < iMac; ++count )
++    {
++        Indent b;
++        indent_printf(fp, "[%d] Kme\n", static_cast< int >( count ) );
++        rgkme[ count ].Print( fp );
++    }
++    
++}
++
++TcgSttbf::TcgSttbf( bool bReadId ) : Tcg255SubStruct( bReadId )
++{
++}
++
++bool TcgSttbf::Read( SvStream *pS) 
++{
++    OSL_TRACE("TcgSttbf::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    Tcg255SubStruct::Read( pS );
++    return sttbf.Read( pS );
++}
++
++void TcgSttbf::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp,"[ 0x%x ] TcgSttbf - dump\n", nOffSet );
++    sttbf.Print( fp );
++}
++
++TcgSttbfCore::TcgSttbfCore() : fExtend( 0 )
++,cData( 0 )
++,cbExtra( 0 )
++,dataItems( NULL )
++{
++}
++
++TcgSttbfCore::~TcgSttbfCore()
++{
++    if ( dataItems )
++        delete[] dataItems;
++}
++
++bool TcgSttbfCore::Read( SvStream* pS )
++{
++    OSL_TRACE("TcgSttbfCore::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> fExtend >> cData >> cbExtra;
++    if ( cData )
++    {
++        dataItems = new SBBItem[ cData ];
++        for ( sal_Int32 index = 0; index < cData; ++index )
++        {
++            *pS >> dataItems[ index ].cchData;
++            dataItems[ index ].data = readUnicodeString( pS, dataItems[ index ].cchData );
++            *pS >> dataItems[ index ].extraData;
++        }
++    }
++    return true;
++}
++
++void TcgSttbfCore::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] TcgSttbfCore - dump\n");
++    indent_printf( fp, " fExtend 0x%x [expected 0xFFFF ]\n", fExtend );
++    indent_printf( fp, " cbExtra 0x%x [expected 0x02 ]\n", cbExtra );
++    indent_printf( fp, " cData no. or string data items %d (0x%x)\n", cData, cData );
++    
++    if ( cData )
++    {
++        for ( sal_Int32 index = 0; index < cData; ++index )
++            indent_printf(fp,"   string dataItem[ %d(0x%x) ] has name %s and if referenced %d times.\n", static_cast< int >( index ), static_cast< unsigned int >( index ), rtl::OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr(), dataItems[ index ].extraData );
++    }
++
++}
++MacroNames::MacroNames( bool bReadId ) : Tcg255SubStruct( bReadId )
++,iMac( 0 )
++,rgNames( NULL )
++{
++}
++
++MacroNames::~MacroNames()
++{
++    if ( rgNames )
++        delete[] rgNames;
++}
++
++bool MacroNames::Read( SvStream *pS)
++{
++    OSL_TRACE("MacroNames::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    Tcg255SubStruct::Read( pS );
++    *pS >> iMac;
++    if ( iMac )
++    {
++        rgNames = new MacroName[ iMac ]; 
++        for ( sal_Int32 index = 0; index < iMac; ++index )
++        {
++            if ( !rgNames[ index ].Read( pS ) )
++                return false;
++        }
++    }
++    return true;
++}
++
++void MacroNames::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp, "[ 0x%x ] MacroNames ( Tcg255SubStruct ) - dump\n");
++    indent_printf(fp, " contains %d MacroName records\n", iMac );
++    for ( sal_Int32 count=0; count < iMac; ++count )
++    {
++        Indent b;
++        indent_printf(fp, "[%d] MacroName\n", static_cast<int>( count ) );
++        rgNames[ count ].Print( fp );
++    }
++    
++}
++
++MacroName::MacroName():ibst(0)
++{
++}
++
++
++bool MacroName::Read(SvStream *pS)
++{
++    OSL_TRACE("MacroName::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> ibst;
++    return xstz.Read( pS );
++}
++
++void MacroName::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] MacroName - dump");
++    indent_printf( fp,"  index - 0x%x has associated following record\n", ibst );
++    xstz.Print( fp );
++}
++
++
++
++Xstz::Xstz():chTerm(0)
++{
++}
++
++bool 
++Xstz::Read(SvStream *pS)
++{
++    OSL_TRACE("Xstz::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    if ( !xst.Read( pS ) )
++        return false;
++    *pS >> chTerm;
++    if ( chTerm != 0 ) // should be an assert 
++        return false;
++    return true;
++}
++
++void Xstz::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp,"[ 0x%x ] Xstz -- dump\n", nOffSet );
++    indent_printf(fp,"  Xst\n");
++    xst.Print( fp ); 
++    indent_printf(fp,"  chterm 0x%x ( should be zero )\n", chTerm);
++}
++
++Kme::Kme() : reserved1(0)
++,reserved2(0)
++,kcm1(0)
++,kcm2(0)
++,kt(0)
++,param(0)
++{
++}
++
++Kme::~Kme()
++{
++}
++
++bool
++Kme::Read(SvStream *pS)
++{
++    OSL_TRACE("Kme::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> reserved1 >> reserved2 >> kcm1 >> kcm2 >> kt >> param;
++    return true;
++}
++
++void Kme::Print( FILE* fp )
++{
++    Indent a;
++    
++   indent_printf( fp, "[ 0x%x ] Kme - dump\n", nOffSet );
++   indent_printf( fp, " reserved1 0x%x [expected 0x0 ]\n", reserved1 );
++   indent_printf( fp, " reserved2 0x%x [expected 0x0 ]\n", reserved2 );
++   indent_printf( fp, " kcm1 0x%x [shortcut key]\n", kcm1 );
++   indent_printf( fp, " kcm2 0x%x [shortcut key]\n", kcm2 );
++   indent_printf( fp, " kt 0x%x \n", kt );
++   indent_printf( fp, " param 0x%x \n", static_cast< unsigned int >( param ) );
++}
++
++Acd::Acd() : ibst( 0 )
++, fciBasedOnABC( 0 )
++{
++}
++
++bool Acd::Read(SvStream *pS)
++{
++    OSL_TRACE("Acd::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> ibst >> fciBasedOnABC;
++    return true;
++}
++
++void Acd::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp,"[ 0x%x ] ACD - dump\n", nOffSet );
++    // #TODO flesh out interpretation of these values
++    indent_printf( fp,"  ibst 0x%x\n", ibst);
++    indent_printf( fp,"  fciBaseObABC 0x%x\n", fciBasedOnABC);
++}
++
++MCD::MCD() :  reserved1(0x56)
++,reserved2( 0 )
++,ibst( 0 )
++,ibstName( 0 )
++,reserved3( 0xFFFF )
++,reserved4( 0 )
++,reserved5( 0 )
++,reserved6( 0 )
++,reserved7( 0 )
++{
++}
++
++bool  MCD::Read(SvStream *pS)
++{
++    OSL_TRACE("MCD::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> reserved1 >> reserved2 >> ibst >> ibstName >> reserved3;
++    *pS >> reserved4 >> reserved5 >> reserved6 >> reserved7;
++    return true;
++}
++
++void MCD::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] MCD - dump\n", nOffSet );
++    indent_printf( fp, " reserved1 0x%x [expected 0x56 ]\n", reserved1 );
++    indent_printf( fp, " reserved2 0x%x [expected 0x0 ]\n", reserved2 );
++    indent_printf( fp, " ibst 0x%x specifies macro with MacroName.xstz = 0x%x\n", ibst, ibst );
++    indent_printf( fp, " ibstName 0x%x index into command string table ( TcgSttbf.sttbf )\n", ibstName );
++
++    indent_printf( fp, " reserved3 0x%x [expected 0xFFFF ]\n", reserved3 );
++    indent_printf( fp, " reserved4 0x%x\n", static_cast< unsigned int >( reserved4 ) );
++    indent_printf( fp, " reserved5 0x%x [expected 0x0 ]\n", static_cast< unsigned int >( reserved5 ) );
++    indent_printf( fp, " reserved6 0x%x\n", static_cast< unsigned int >( reserved6 ) );
++    indent_printf( fp, " reserved7 0x%x\n", static_cast< unsigned int >( reserved7 ) );
++}
++
+Index: sw/source/filter/ww8/ww8toolbar.hxx
+===================================================================
+--- sw/source/filter/ww8/ww8toolbar.hxx	(revision 0)
++++ sw/source/filter/ww8/ww8toolbar.hxx	(revision 276288)
+@@ -0,0 +1,347 @@
++#ifndef _WW8TOOLBAR_HXX
++#define _WW8TOOLBAR_HXX
++
++#include <svx/mstoolbar.hxx>
++
++namespace css = ::com::sun::star;
++
++class Xst : public TBBase
++{
++    rtl::OUString sString;
++public:
++    Xst(){}
++    bool Read(SvStream *pS);
++    rtl::OUString getString() { return sString; }
++    void Print( FILE* fp );
++};
++
++class CTBWrapper;
++class TBC : public TBBase
++{
++    TBCHeader tbch;
++    boost::shared_ptr< sal_uInt32 > cid; // optional
++    boost::shared_ptr<TBCData> tbcd;
++public:
++    TBC();
++    ~TBC();
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    bool ImportToolBarControl( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool );
++    rtl::OUString GetCustomText();
++};
++
++class CTB : public TBBase
++{
++    Xst name;
++    sal_Int32 cbTBData;
++    TB tb;
++    std::vector<TBVisualData> rVisualData;
++    sal_Int32 iWCTBl;
++    sal_uInt16 reserved;
++    sal_uInt16 unused;
++    sal_Int32 cCtls;
++    std::vector< TBC > rTBC;
++
++    CTB(const CTB&);
++    CTB& operator = ( const CTB&);
++public:
++    CTB();
++    ~CTB();
++    bool Read(SvStream *pS);
++    void Print( FILE* fp );
++    bool IsMenuToolbar();
++    bool ImportCustomToolBar( CTBWrapper&, CustomToolBarImportHelper& );
++    bool ImportMenuTB( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
++    rtl::OUString GetName() { return tb.getName().getString(); }
++};
++
++class TBDelta : public TBBase
++{
++    sal_uInt8 doprfatendFlags;
++
++    sal_uInt8 ibts;
++    sal_Int32 cidNext; 
++    sal_Int32 cid;
++    sal_Int32 fc;
++    sal_uInt16 CiTBDE; // careful of this ( endian matters etc. )
++    sal_uInt16 cbTBC;
++public:
++    TBDelta();
++    ~TBDelta(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    bool ControlIsModified();
++    bool ControlIsInserted();
++    bool ControlIsChanged();
++    bool ControlDropsToolBar();
++    sal_Int32 TBCStreamOffset();
++    sal_Int16 CustomizationIndex();
++    
++};
++
++class Tcg255SubStruct : public TBBase
++{
++friend class Tcg255;
++    bool mbReadId;
++    Tcg255SubStruct(const Tcg255SubStruct&);
++    Tcg255SubStruct& operator = ( const Tcg255SubStruct&);
++protected:
++    sal_uInt8 ch;
++public:
++    Tcg255SubStruct( bool bReadId );
++    ~Tcg255SubStruct(){}
++    virtual sal_uInt8 id() const { return ch; }
++    bool Read(SvStream *pS);
++};
++
++class CTBWrapper;
++class Customization : public TBBase
++{
++friend class CTBWrapper;
++    sal_Int32 tbidForTBD;
++    sal_uInt16 reserved1;
++    sal_Int16 ctbds;
++    CTBWrapper* pWrapper;
++    boost::shared_ptr< CTB > customizationDataCTB;
++    std::vector< TBDelta > customizationDataTBDelta; 
++    bool bIsDroppedMenuTB; 
++    bool ImportMenu( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
++public:    
++    Customization( CTBWrapper* rapper );
++    ~Customization();
++    bool Read(SvStream *pS);
++    bool ImportCustomToolBar( CTBWrapper&, CustomToolBarImportHelper& );
++    bool ImportMenu( CTBWrapper&, CustomToolBarImportHelper& );
++    void Print( FILE* );
++    sal_Int32 GetTBIDForTB(){ return tbidForTBD; }
++    CTB*  GetCustomizationData() { return customizationDataCTB.get(); };
++};
++
++class SfxObjectShell; 
++
++class CTBWrapper : public Tcg255SubStruct
++{
++    // reserved1 is the ch field of Tcg255SubStruct
++    sal_uInt16 reserved2;
++    sal_uInt8 reserved3;
++    sal_uInt16 reserved4;
++    sal_uInt16 reserved5;
++
++    sal_Int16 cbTBD;
++    sal_Int16 cCust;
++
++    sal_Int32 cbDTBC;
++
++    std::vector< TBC > rtbdc; // 
++    std::vector< Customization > rCustomizations; // array of Customizations
++    std::vector< sal_Int16 > dropDownMenuIndices; // array of indexes of Customization toolbars that are dropped by a menu
++    CTBWrapper(const CTBWrapper&);
++    CTBWrapper& operator = ( const CTBWrapper&);
++public:
++    CTBWrapper( bool bReadId = true );
++    ~CTBWrapper();
++    void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); }
++    TBC* GetTBCAtOffset( sal_uInt32 nStreamOffset );
++    bool Read(SvStream *pS);
++    bool ImportCustomToolBar( SfxObjectShell& rDocSh );
++
++    Customization* GetCustomizaton( sal_Int16 index );
++    CTB* GetCustomizationData( const rtl::OUString& name );
++    void Print( FILE* );
++};
++
++class MCD : public TBBase
++{
++    sal_Int8 reserved1; //  A signed integer that MUST be 0x56. 
++    sal_uInt8 reserved2; // MUST be 0.
++    sal_uInt16 ibst; // Unsigned integer that specifies the name of the macro. Macro name is specified by MacroName.xstz of the MacroName entry in the MacroNames such that MacroName.ibst equals ibst. MacroNames MUST contain such an entry.
++    sal_uInt16 ibstName; // An unsigned integer that specifies the index into the Command String Table (TcgSttbf.sttbf) where the macro‘s name and arguments are specified.
++    sal_uInt16 reserved3; // An unsigned integer that MUST be 0xFFFF.
++    sal_uInt32 reserved4; //MUST be ignored. 
++    sal_uInt32 reserved5; //MUST be 0. 
++    sal_uInt32 reserved6; //MUST be ignored. 
++    sal_uInt32 reserved7; //MUST be ignored   
++
++    MCD(const MCD&);
++    MCD& operator = ( const MCD&);
++public:
++    MCD();
++    ~MCD(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++};
++
++class PlfMcd : public Tcg255SubStruct
++{
++    sal_Int32 iMac;
++    MCD* rgmcd; // array of MCD's
++    PlfMcd(const PlfMcd&);
++    PlfMcd& operator = ( const PlfMcd&);
++public:
++    PlfMcd( bool bReadId = true );
++    ~PlfMcd();
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++};
++
++class Acd : public TBBase
++{
++    sal_Int16 ibst;
++    sal_uInt16 fciBasedOnABC; //  fciBasedOn(13 bits) A(1bit)B(1bit)C(1Bit)
++    Acd(const Acd&);
++    Acd& operator = ( const Acd&);
++public:
++    Acd();
++    ~Acd(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++};
++
++class PlfAcd: public Tcg255SubStruct
++{
++    sal_Int32 iMac;
++    Acd* rgacd;
++    PlfAcd(const PlfAcd&);
++    PlfAcd& operator = ( const PlfAcd&);
++public:
++    PlfAcd( bool bReadId = true );
++    ~PlfAcd();
++    bool Read(SvStream *pS);
++    void Print(FILE*);
++};
++
++class Kme : public TBBase
++{
++    sal_Int16 reserved1; //MUST be zero. 
++    sal_Int16 reserved2; //MUST be zero.
++    sal_uInt16 kcm1; //A Kcm that specifies the primary shortcut key.
++    sal_uInt16 kcm2; //A Kcm that specifies the secondary shortcut key, or 0x00FF if there is no secondary shortcut key.
++    sal_uInt16 kt; //A Kt that specifies the type of action to be taken when the key combination is pressed. 
++    sal_uInt32 param; //The meaning of this field depends on the value of kt
++
++    Kme(const Kme&);
++    Kme& operator = ( const Kme&);
++public:
++    Kme();
++    ~Kme();
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++};
++
++class PlfKme : public Tcg255SubStruct
++{
++    sal_Int32 iMac;
++    Kme* rgkme;
++    PlfKme(const PlfKme&);
++    PlfKme& operator = ( const PlfKme&);
++public:
++    PlfKme( bool bReadId = true );
++    ~PlfKme();
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++};
++
++class TcgSttbfCore : public TBBase
++{
++struct SBBItem
++{
++    sal_uInt16 cchData;
++    rtl::OUString data; 
++    sal_uInt16 extraData;
++    SBBItem() : cchData(0), extraData(0){}
++};
++    sal_uInt16 fExtend;
++    sal_uInt16 cData;
++    sal_uInt16 cbExtra;
++    SBBItem* dataItems;
++    TcgSttbfCore(const TcgSttbfCore&);
++    TcgSttbfCore& operator = ( const TcgSttbfCore&);
++public:
++    TcgSttbfCore();
++    ~TcgSttbfCore();
++    bool Read(SvStream *pS);
++    void Print( FILE* fp );
++};
++
++class TcgSttbf : public Tcg255SubStruct
++{
++    TcgSttbfCore sttbf;
++    TcgSttbf(const TcgSttbf&);
++    TcgSttbf& operator = ( const TcgSttbf&);
++public:
++    TcgSttbf( bool bReadId = true );
++    ~TcgSttbf(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* fp );
++};
++
++class Xstz : public TBBase
++{
++    Xst xst; //An Xst specifying the string with its pre-pended length. 
++    sal_uInt16 chTerm;
++
++    Xstz(const Xstz&);
++    Xstz& operator = ( const Xstz&);
++public:
++    Xstz();
++    ~Xstz(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* fp );
++};
++
++class MacroName : public TBBase
++{
++    sal_uInt16 ibst; //An unsigned integer that specifies the index of the current entry in the macro name table. MUST NOT be the same as the index of any other entry.
++    Xstz xstz;
++    MacroName(const MacroName&);
++    MacroName& operator = ( const MacroName&);
++public:
++    MacroName();
++    ~MacroName(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++};
++
++class MacroNames : public Tcg255SubStruct
++{
++    sal_uInt16 iMac; //An unsigned integer that specifies the number of MacroName structures in rgNames.
++    MacroName* rgNames;
++
++    MacroNames(const MacroNames&);
++    MacroNames& operator = ( const MacroNames&);
++public:
++    MacroNames( bool bReadId = true );
++    ~MacroNames();
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++};
++
++class Tcg255 : public TBBase
++{
++    std::vector< Tcg255SubStruct* > rgtcgData; // array of sub structures
++    Tcg255(const Tcg255&);
++    Tcg255& operator = ( const Tcg255&);
++    bool processSubStruct( sal_uInt8 nId, SvStream*  );
++public:
++    Tcg255();
++    ~Tcg255();
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    bool ImportCustomToolBar( SfxObjectShell& rDocSh );
++};
++
++class Tcg: public TBBase
++{
++    sal_Int8 nTcgVer; 
++    std::auto_ptr< Tcg255 > tcg;
++    Tcg(const Tcg&);
++    Tcg& operator = ( const Tcg&);
++public:
++    Tcg();
++    ~Tcg(){}
++    bool Read(SvStream *pS);
++    bool ImportCustomToolBar( SfxObjectShell& rDocSh );
++    void Print( FILE* );
++};
++
++#endif
+Index: sw/source/core/unocore/unocoll.cxx
+===================================================================
+--- sw/source/core/unocore/unocoll.cxx	(revision 276159)
++++ sw/source/core/unocore/unocoll.cxx	(revision 276288)
+@@ -77,7 +77,14 @@
+ #include <iterator>
+ 
+ #include "docsh.hxx"
+-
++#include <com/sun/star/document/XCodeNameQuery.hpp>
++#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
++#include <com/sun/star/form/XFormsSupplier.hpp>
++#include <com/sun/star/script/ModuleInfo.hpp>
++#include <com/sun/star/script/ModuleType.hpp>
++#include <com/sun/star/script/ScriptEventDescriptor.hpp>
++#include <vbahelper/vbahelper.hxx>
++#include <basic/basmgr.hxx>
+ using ::rtl::OUString;
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::document;
+@@ -86,6 +93,184 @@ using namespace ::com::sun::star::text;
+ using namespace ::com::sun::star::container;
+ using namespace ::com::sun::star::lang;
+ 
++class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >
++{
++    SwDocShell* mpDocShell;
++    rtl::OUString msThisDocumentCodeName;
++public:
++    SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {}
++        // XCodeNameQuery
++    rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
++    {
++        // Initialise the code name
++        if ( msThisDocumentCodeName.getLength() == 0 )
++        {
++            try
++            {
++                uno::Reference< beans::XPropertySet > xProps( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
++                uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
++		rtl::OUString sProjectName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") ) );
++                if ( mpDocShell->GetBasicManager()->GetName().Len() )
++                    sProjectName =  mpDocShell->GetBasicManager()->GetName();
++    
++                uno::Reference< container::XNameAccess > xStandard( xLibContainer->getByName( sProjectName ), uno::UNO_QUERY_THROW );
++                uno::Sequence< rtl::OUString > sModuleNames = xStandard->getElementNames();
++                for ( sal_Int32 i=0; i < sModuleNames.getLength(); ++i )
++                {
++                    script::ModuleInfo mInfo;
++                    if ( xStandard->getByName( sModuleNames[ i ] ) >>= mInfo )
++                    {
++                        if ( mInfo.ModuleType == script::ModuleType::Document )
++                        {
++                            msThisDocumentCodeName = sModuleNames[ i ];
++                            break;
++                        }
++                    } 
++                }
++            }
++            catch( uno::Exception& )
++            {
++            }
++        }
++        rtl::OUString sCodeName;
++        if ( mpDocShell )
++        {
++            OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject");
++            // need to find the page ( and index )  for this control
++            uno::Reference< drawing::XDrawPageSupplier > xSupplier( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
++            uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
++            sal_Int32 nLen = xIndex->getCount();
++            bool bMatched = false;
++            uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;
++                try
++                {
++                    uno::Reference< form::XFormsSupplier >  xFormSupplier( xIndex, uno::UNO_QUERY_THROW );
++                    uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
++                    // get the www-standard container
++                    uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );
++                    sal_Int32 nCntrls = xFormControls->getCount();
++                    for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
++                    {
++                        uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );	
++                        bMatched = ( xControl == xIf );
++                        if ( bMatched )
++                        {
++                            sCodeName = msThisDocumentCodeName;
++                            break;
++                        }
++                    }
++                }
++                catch( uno::Exception& ) {}
++        }
++        // Probably should throw here ( if !bMatched )
++        return sCodeName;
++    }
++};
++
++typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > StringHashMap;
++class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer >
++{
++    SwDocShell* mpDocShell;
++    StringHashMap mTemplateToProject; 
++public:
++    SwVbaProjectNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell )
++    {
++    }
++    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
++    {
++        return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() );
++    }
++    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
++    {
++        if ( !hasByName( aName ) )
++            throw container::NoSuchElementException();
++        return uno::makeAny( mTemplateToProject.find( aName )->second );
++    }
++    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (::com::sun::star::uno::RuntimeException)
++    {
++        uno::Sequence< rtl::OUString > aElements( mTemplateToProject.size() );
++        StringHashMap::iterator it_end = mTemplateToProject.end();
++        sal_Int32 index = 0;
++        for ( StringHashMap::iterator it = mTemplateToProject.begin(); it != it_end; ++it, ++index )
++            aElements[ index ] = it->first;
++        return aElements;
++    }
++
++    virtual void SAL_CALL insertByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException )
++    {
++        
++        rtl::OUString sProjectName;
++        aElement >>= sProjectName;
++        OSL_TRACE("** Template cache inserting template name %s with project %s"
++            , rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr()
++            , rtl::OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr() );
++        mTemplateToProject[ aName ] = sProjectName;
++    }
++
++    virtual void SAL_CALL removeByName( const rtl::OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException )
++    {
++        if ( !hasByName( Name ) )
++            throw container::NoSuchElementException();
++        mTemplateToProject.erase( Name );
++    }
++    virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException )
++    {
++        if ( !hasByName( aName ) )
++            throw container::NoSuchElementException();
++        insertByName( aName, aElement ); // insert will overwrite
++    }
++    // XElemenAccess
++    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw (::com::sun::star::uno::RuntimeException)
++    { 
++        return ::getCppuType((const rtl::OUString*)0); 
++    }
++    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException ) 
++    { 
++        
++        return ( mTemplateToProject.size() > 0 );
++    }
++
++};
++
++class SwVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
++{
++    SwDocShell* mpDocShell;
++public:
++    SwVbaObjectForCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell )
++    {
++        // #FIXME #TODO is the code name for ThisDocument read anywhere?
++    }
++
++    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
++    {
++        // #FIXME #TODO we really need to be checking against the codename for 
++        // ThisDocument 
++        if ( aName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisDocument" ) ) ) )
++            return sal_True;
++        return sal_False;
++    }
++    ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
++    {
++        if ( !hasByName( aName ) )
++             throw container::NoSuchElementException();
++	uno::Sequence< uno::Any > aArgs( 2 );
++        aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
++        aArgs[1] = uno::Any( mpDocShell->GetModel() );
++        uno::Reference< uno::XInterface > xDocObj = ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.word.Document" , aArgs );
++        OSL_TRACE("Creating Object ( ooo.vba.word.Document ) 0x%x", xDocObj.get() );
++        return  uno::makeAny( xDocObj );
++    }
++    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (::com::sun::star::uno::RuntimeException)
++    {
++        uno::Sequence< rtl::OUString > aNames;
++        return aNames;
++    }
++    // XElemenAccess
++    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw (::com::sun::star::uno::RuntimeException){ return uno::Type(); }
++    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException ) { return sal_True; }
++
++};
++
+ /******************************************************************************
+  *
+  ******************************************************************************/
+@@ -207,6 +392,9 @@ const ProvNamesId_Type __FAR_DATA aProvNamesId[] =
+     { "com.sun.star.chart2.data.DataProvider",                SW_SERVICE_CHART2_DATA_PROVIDER },
+     { "com.sun.star.text.Fieldmark",                          SW_SERVICE_TYPE_FIELDMARK },
+     { "com.sun.star.text.FormFieldmark",                      SW_SERVICE_TYPE_FORMFIELDMARK },
++    { "ooo.vba.VBAObjectModuleObjectProvider",                SW_SERVICE_VBAOBJECTPROVIDER },
++    { "ooo.vba.VBACodeNameProvider",                          SW_SERVICE_VBACODENAMEPROVIDER },
++    { "ooo.vba.VBAProjectNameProvider",                       SW_SERVICE_VBAPROJECTNAMEPROVIDER },
+ 
+     // case-correct versions of the service names (see #i67811)
+     { CSS_TEXT_TEXTFIELD_DATE_TIME,                   SW_SERVICE_FIELDTYPE_DATETIME },
+@@ -387,6 +575,30 @@ uno::Reference< uno::XInterface >   SwXServiceProv
+             xRet =  (cppu::OWeakObject*)pFieldmark;
+         }
+         break;
++		case  SW_SERVICE_VBAOBJECTPROVIDER :
++		{
++			SwVbaObjectForCodeNameProvider* pObjProv = new SwVbaObjectForCodeNameProvider( pDoc->GetDocShell() );
++			xRet =  (cppu::OWeakObject*)pObjProv;
++		}
++		break;
++		case  SW_SERVICE_VBACODENAMEPROVIDER :
++		{
++			SwVbaCodeNameProvider* pObjProv = new SwVbaCodeNameProvider( pDoc->GetDocShell() );
++			xRet =  (cppu::OWeakObject*)pObjProv;
++		}
++		break;
++		case  SW_SERVICE_VBAPROJECTNAMEPROVIDER :
++		{
++                        uno::Reference< container::XNameContainer > xProjProv = pDoc->GetVBATemplateToProjectCache();
++                        if ( !xProjProv.is() )
++                        {
++			    xProjProv = new SwVbaProjectNameProvider( pDoc->GetDocShell() );
++                            pDoc->SetVBATemplateToProjectCache( xProjProv );
++                        }
++			//xRet =  (cppu::OWeakObject*)xProjProv;
++			xRet = xProjProv;
++		}
++		break;
+         case  SW_SERVICE_TYPE_FOOTNOTE :
+             xRet =  (cppu::OWeakObject*)new SwXFootnote(sal_False);
+         break;
+Index: sw/source/core/unocore/unoprnms.cxx
+===================================================================
+--- sw/source/core/unocore/unoprnms.cxx	(revision 276159)
++++ sw/source/core/unocore/unoprnms.cxx	(revision 276288)
+@@ -779,7 +779,9 @@ const SwPropNameTab aPropNameTab = {
+ /* 0734 CHAR_OVERLINE_COLOR */         {MAP_CHAR_LEN("CharOverlineColor")},
+ /* 0735 CHAR_OVERLINE_HAS_COLOR */     {MAP_CHAR_LEN("CharOverlineHasColor")},
+ /* 0736 UNO_NAME_OUTLINE_LEVEL */       {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel
+-/* 0737 UNO_NAME_DESCRIPTION */         {MAP_CHAR_LEN("Description")}
++/* 0737 UNO_NAME_DESCRIPTION */         {MAP_CHAR_LEN("Description")},
++/* 0738 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")},
++/* 0739 UNO_NAME_VBA_DOCOBJ */       {MAP_CHAR_LEN("ThisVBADocObj")},
+ };
+ 
+ const SwPropNameLen& SwGetPropName( USHORT nId )
+Index: sw/source/core/unocore/unomap.cxx
+===================================================================
+--- sw/source/core/unocore/unomap.cxx	(revision 276159)
++++ sw/source/core/unocore/unomap.cxx	(revision 276288)
+@@ -1591,11 +1591,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapPro
+ 					{ SW_PROP_NMID(UNO_NAME_CHAR_LOCALE), RES_CHRATR_LANGUAGE ,   CPPU_E2T(CPPUTYPE_LOCALE), PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
+ 					{ SW_PROP_NMID(UNO_NAME_CHARACTER_COUNT), WID_DOC_CHAR_COUNT,			CPPU_E2T(CPPUTYPE_INT32),	PropertyAttribute::READONLY,   0},
+                     { SW_PROP_NMID(UNO_NAME_DIALOG_LIBRARIES), WID_DOC_DIALOG_LIBRARIES,  CPPU_E2T(CPPUTYPE_REFLIBCONTAINER), PropertyAttribute::READONLY, 0},
++                    { SW_PROP_NMID(UNO_NAME_VBA_DOCOBJ), WID_DOC_VBA_DOCOBJ,  CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PropertyAttribute::READONLY, 0},
+ 					{ SW_PROP_NMID(UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L), WID_DOC_AUTO_MARK_URL, CPPU_E2T(CPPUTYPE_OUSTRING),	PROPERTY_NONE,   0},
+ 					{ SW_PROP_NMID(UNO_NAME_PARAGRAPH_COUNT), WID_DOC_PARA_COUNT,			CPPU_E2T(CPPUTYPE_INT32),	PropertyAttribute::READONLY,   0},
+ 					{ SW_PROP_NMID(UNO_NAME_RECORD_CHANGES), WID_DOC_CHANGES_RECORD,		CPPU_E2T(CPPUTYPE_BOOLEAN),	PROPERTY_NONE,   0},
+ 					{ SW_PROP_NMID(UNO_NAME_SHOW_CHANGES), WID_DOC_CHANGES_SHOW,		CPPU_E2T(CPPUTYPE_BOOLEAN),	PROPERTY_NONE,   0},
+ 					{ SW_PROP_NMID(UNO_NAME_WORD_COUNT), WID_DOC_WORD_COUNT,			CPPU_E2T(CPPUTYPE_INT32),	PropertyAttribute::READONLY,   0},
++					{ SW_PROP_NMID(UNO_NAME_IS_TEMPLATE), WID_DOC_ISTEMPLATEID,			CPPU_E2T(CPPUTYPE_BOOLEAN),	PropertyAttribute::READONLY,   0},
+ 					{ SW_PROP_NMID(UNO_NAME_WORD_SEPARATOR), WID_DOC_WORD_SEPARATOR,		CPPU_E2T(CPPUTYPE_OUSTRING),	PROPERTY_NONE,   0},
+ 					{ SW_PROP_NMID(UNO_NAME_HIDE_FIELD_TIPS), WID_DOC_HIDE_TIPS, 			CPPU_E2T(CPPUTYPE_BOOLEAN),	PROPERTY_NONE,   0},
+ 					{ SW_PROP_NMID(UNO_NAME_REDLINE_DISPLAY_TYPE), WID_DOC_REDLINE_DISPLAY, 	CPPU_E2T(CPPUTYPE_INT16),	PROPERTY_NONE,   0},
+Index: sw/source/ui/app/docsh.cxx
+===================================================================
+--- sw/source/ui/app/docsh.cxx	(revision 276159)
++++ sw/source/ui/app/docsh.cxx	(revision 276288)
+@@ -495,16 +495,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
+             xDocSh->DoClose();
+ 		}
+ 
+-        if( pDoc->ContainsMSVBasic() )
+-        {
+-            //TODO/MBA: it looks as that this code can be removed!
+-            //SvxImportMSVBasic aTmp( *this, pIo->GetStorage() );
+-            //aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr );
+-            if( SvtFilterOptions::Get()->IsLoadWordBasicStorage() )
+-                nVBWarning = SvxImportMSVBasic::
+-                                GetSaveWarningOfMSVBAStorage( *this );
+-            pDoc->SetContainsMSVBasic( FALSE );
+-        }
+ 
+ 		// TabellenBox Edit beenden!
+ 		if( pWrtShell )
+Index: sw/source/ui/uno/unotxdoc.cxx
+===================================================================
+--- sw/source/ui/uno/unotxdoc.cxx	(revision 276159)
++++ sw/source/ui/uno/unotxdoc.cxx	(revision 276288)
+@@ -166,6 +166,7 @@ using ::osl::FileBase;
+ #define SW_CREATE_MARKER_TABLE          0x06
+ #define SW_CREATE_DRAW_DEFAULTS         0x07
+ 
++#include <comphelper/processfactory.hxx> 
+ 
+ /******************************************************************************
+  *
+@@ -220,6 +221,12 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething(
+     {
+             return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ));
+     }
++    if( rId.getLength() == 16
++        && 0 == rtl_compareMemory( SfxObjectShell::getUnoTunnelId().getConstArray(),
++										rId.getConstArray(), 16 ) )
++    {
++        return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell ));
++    }
+ 
+ 	sal_Int64 nRet = SfxBaseModel::getSomething( rId );
+ 	if ( nRet )
+@@ -366,6 +373,9 @@ SwXTextDocument::SwXTextDocument(SwDocShell* pShel
+     pxXRedlines(0),
+     m_pHiddenViewFrame(0)
+ {
++    uno::Reference< document::XDocumentProperties > xWriterProps( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.writer.DocumentProperties") ), uno::UNO_QUERY_THROW);
++
++    SfxBaseModel::setDocumentProperties( xWriterProps );
+ }
+ /*-- 18.12.98 11:53:00---------------------------------------------------
+ 
+@@ -2145,6 +2155,9 @@ Any SwXTextDocument::getPropertyValue(const OUStri
+ 	Any aAny;
+     switch(pEntry->nWID)
+ 	{
++		case WID_DOC_ISTEMPLATEID    :
++			aAny <<= pDocShell->IsTemplate();
++			break;
+ 		case  WID_DOC_CHAR_COUNT     :
+ 		case  WID_DOC_PARA_COUNT     :
+ 		case  WID_DOC_WORD_COUNT     :
+@@ -2253,6 +2266,14 @@ Any SwXTextDocument::getPropertyValue(const OUStri
+         case WID_DOC_DIALOG_LIBRARIES:
+             aAny <<= pDocShell->GetDialogContainer();
+         break;
++        case WID_DOC_VBA_DOCOBJ:
++        {
++            beans::PropertyValue aProp;
++            aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisWordDoc") );
++            aProp.Value <<= pDocShell->GetModel();
++            aAny <<= aProp;
++        }
++        break;
+         case WID_DOC_RUNTIME_UID:
+             aAny <<= getRuntimeUID();
+         break;
+@@ -2902,6 +2923,7 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocu
+ {
+ 	::vos::OGuard aGuard(Application::GetSolarMutex());
+ 
++
+     // possible canonical values for nScriptTypes
+     // any bit wise combination is allowed
+     const sal_Int16 nLatin   = 0x001;
+Index: sw/source/ui/vba/vbaselection.cxx
+===================================================================
+--- sw/source/ui/vba/vbaselection.cxx	(revision 0)
++++ sw/source/ui/vba/vbaselection.cxx	(revision 276288)
+@@ -0,0 +1,682 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaselection.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include "vbarange.hxx"
++#include "vbafind.hxx"
++#include "wordvbahelper.hxx"
++#include <com/sun/star/text/XTextRange.hpp>
++#include <com/sun/star/text/XTextTable.hpp>
++#include <com/sun/star/text/XTextTableCursor.hpp>
++#include <com/sun/star/text/ControlCharacter.hpp>
++#include <com/sun/star/table/XCell.hpp>
++#include <ooo/vba/word/WdUnits.hpp>
++#include <ooo/vba/word/WdMovementType.hpp>
++#include <ooo/vba/word/WdGoToItem.hpp>
++#include <ooo/vba/word/WdGoToDirection.hpp>
++#include <ooo/vba/word/XBookmark.hpp>
++#include <ooo/vba/word/XApplication.hpp>
++#include <com/sun/star/text/XPageCursor.hpp>
++#include "unotbl.hxx"
++#include "unocoll.hxx"
++#include "vbatable.hxx"
++#include <com/sun/star/view/XSelectionSupplier.hpp>
++#include <com/sun/star/view/XViewCursor.hpp>
++#include <ooo/vba/word/WdInformation.hpp>
++#include <ooo/vba/word/WdHeaderFooterIndex.hpp>
++#include "vbainformationhelper.hxx"
++#include "vbafield.hxx"
++#include "vbaheaderfooter.hxx"
++#include "vbaheaderfooterhelper.hxx"
++#include <vbahelper/vbashaperange.hxx>
++#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
++#include <com/sun/star/drawing/XDrawPage.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaSelection::SwVbaSelection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& rModel ) throw ( uno::RuntimeException ) : SwVbaSelection_BASE( rParent, rContext ), mxModel( rModel )
++{
++    mxTextViewCursor = word::getXTextViewCursor( mxModel );
++}
++
++SwVbaSelection::~SwVbaSelection()
++{
++}
++
++uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextRange > xTextRange;
++    uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel->getCurrentSelection(), uno::UNO_QUERY_THROW );
++    if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextRanges") ) ) ) 
++    {
++        uno::Reference< container::XIndexAccess > xTextRanges( xServiceInfo, uno::UNO_QUERY_THROW );
++        if( xTextRanges->getCount() > 0 )
++        {
++            // if there are multipul selection, just return the last selected Range.
++            xTextRange.set( xTextRanges->getByIndex( xTextRanges->getCount()-1 ), uno::UNO_QUERY_THROW );
++        }
++    }
++    else
++    {
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++    }
++    return xTextRange;
++}
++
++uno::Reference< word::XRange > SAL_CALL 
++SwVbaSelection::getRange() throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextRange > xTextRange = GetSelectedRange();
++    uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
++    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, xDocument, xTextRange->getStart(), xTextRange->getEnd(), mxTextViewCursor->getText() ) );
++}
++
++rtl::OUString SAL_CALL
++SwVbaSelection::getText() throw ( uno::RuntimeException )
++{
++    return getRange()->getText();
++}
++
++void SAL_CALL
++SwVbaSelection::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
++{
++    getRange()->setText( rText );
++}
++
++void SAL_CALL
++SwVbaSelection::TypeText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
++{
++    // FIXME: handle the property Options.ReplaceSelection, the default value is TRUE
++    setText( rText );
++}
++
++void SAL_CALL
++SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( uno::RuntimeException )
++{
++    sal_Int32 nUnit = word::WdUnits::wdLine;
++    sal_Int32 nExtend = word::WdMovementType::wdMove;
++    _unit >>= nUnit;
++    _extend >>= nExtend;
++
++    switch( nUnit )
++    {
++        case word::WdUnits::wdStory:
++        {
++            // go to the begin of the document
++            rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfDoc"));
++            dispatchRequests( mxModel,url );
++            // If something is selected, it needs to go twice
++            dispatchRequests( mxModel,url );
++            break;
++        }
++        case word::WdUnits::wdLine:
++        {
++            // go to the begin of the Line
++            rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfLine"));
++            dispatchRequests( mxModel,url );
++            break;
++        }
++        default:
++        {
++            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++            break;
++        }
++    }
++}
++
++void SAL_CALL
++SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( uno::RuntimeException )
++{
++    sal_Int32 nUnit = word::WdUnits::wdLine;
++    sal_Int32 nExtend = word::WdMovementType::wdMove;
++    _unit >>= nUnit;
++    _extend >>= nExtend;
++
++    switch( nUnit )
++    {
++        case word::WdUnits::wdStory:
++        {
++            // go to the end of the document
++            rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfDoc"));
++            dispatchRequests( mxModel,url );
++            // If something is selected, it needs to go twice
++            dispatchRequests( mxModel,url );
++            break;
++        }
++        case word::WdUnits::wdLine:
++        {
++            // go to the end of the Line
++            rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfLine"));
++            dispatchRequests( mxModel,url );
++            break;
++        }
++        default:
++        {
++            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++            break;
++        }
++    }
++}
++
++void SAL_CALL
++SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( uno::RuntimeException )
++{
++    // FIXME: handle the arguments: _unit and _count 
++    rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Delete"));
++    dispatchRequests( mxModel,url );
++}
++
++void SwVbaSelection::NextCell( sal_Int32 nCount, E_DIRECTION eDirection ) throw ( uno::RuntimeException )
++{
++    uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextTable > xTextTable;
++    uno::Reference< table::XCell > xCell;
++    xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextTable;
++    xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Cell") ) ) >>= xCell;
++    if( !xTextTable.is() || !xCell.is() )
++    {
++        DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
++        return;
++    }
++    uno::Reference< beans::XPropertySet > xCellProps( xCell, uno::UNO_QUERY_THROW );
++    rtl::OUString aCellName;
++    xCellProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellName") ) ) >>= aCellName;
++    uno::Reference< text::XTextTableCursor > xTextTableCursor = xTextTable->createCursorByCellName( aCellName );
++    // move the table cursor 
++    switch( eDirection )
++    {
++        case MOVE_LEFT:
++        {
++            xTextTableCursor->goLeft( nCount, sal_False );
++            break;
++        }
++        case MOVE_RIGHT:
++        {
++            xTextTableCursor->goRight( nCount, sal_False );
++            break;
++        }
++        case MOVE_UP:
++        {
++            xTextTableCursor->goUp( nCount, sal_False );
++            break;
++        }
++        case MOVE_DOWN:
++        {
++            xTextTableCursor->goDown( nCount, sal_False );
++            break;
++        }
++        default:
++        {
++            DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
++            return;
++        }
++    }
++    // move the view cursor
++    xCell = xTextTable->getCellByName( xTextTableCursor->getRangeName() );
++    mxTextViewCursor->gotoRange( uno::Reference< text::XTextRange >( xCell, uno::UNO_QUERY_THROW ), sal_False );
++}
++
++void SAL_CALL
++SwVbaSelection::MoveRight( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend ) throw ( uno::RuntimeException )
++{
++    sal_Int32 nUnit = word::WdUnits::wdCharacter;
++    sal_Int32 nCount = 1;
++    sal_Int32 nExtend = word::WdMovementType::wdMove;
++
++    if( _unit.hasValue() )
++        _unit >>= nUnit;
++    if( _count.hasValue() )
++        _count >>= nCount;
++    if( _extend.hasValue() )
++        _extend >>= nExtend;
++    
++    if( nCount == 0 )
++        return;
++    
++    if( nCount < 0 )
++    {
++        // TODO: call MoveLeft;
++        MoveLeft( _unit, uno::makeAny( -nCount ), _extend );
++        return;
++    }
++    
++    switch( nUnit )
++    {
++        case word::WdUnits::wdCell:
++        {
++            if(  nExtend == word::WdMovementType::wdExtend )
++            {
++                DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
++                return;
++            }
++            NextCell( nCount, MOVE_RIGHT );
++            break;
++        }
++        default:
++        {
++            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++            break;
++        }
++    }
++
++}
++
++void SAL_CALL
++SwVbaSelection::MoveLeft( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend ) throw ( uno::RuntimeException )
++{
++    sal_Int32 nUnit = word::WdUnits::wdCharacter;
++    sal_Int32 nCount = 1;
++    sal_Int32 nExtend = word::WdMovementType::wdMove;
++
++    if( _unit.hasValue() )
++        _unit >>= nUnit;
++    if( _count.hasValue() )
++        _count >>= nCount;
++    if( _extend.hasValue() )
++        _extend >>= nExtend;
++    
++    if( nCount == 0 )
++        return;
++    
++    if( nCount < 0 )
++    {
++        MoveRight( _unit, uno::makeAny( -nCount ), _extend );
++        return;
++    }
++    
++    switch( nUnit )
++    {
++        case word::WdUnits::wdCell:
++        {
++            if(  nExtend == word::WdMovementType::wdExtend )
++            {
++                DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
++                return;
++            }
++            NextCell( nCount, MOVE_LEFT );
++            break;
++        }
++        default:
++        {
++            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++            break;
++        }
++    }
++
++}
++
++void SAL_CALL
++SwVbaSelection::MoveDown( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend ) throw ( uno::RuntimeException )
++{
++    sal_Int32 nUnit = word::WdUnits::wdCharacter;
++    sal_Int32 nCount = 1;
++    sal_Int32 nExtend = word::WdMovementType::wdMove;
++
++    if( _unit.hasValue() )
++        _unit >>= nUnit;
++    if( _count.hasValue() )
++        _count >>= nCount;
++    if( _extend.hasValue() )
++        _extend >>= nExtend;
++    
++    if( nCount == 0 )
++        return;
++    
++    if( nCount < 0 )
++    {
++        // TODO: call MoveLeft;
++        //MoveUp( _unit, uno::makeAny( -nCount ), _extend );
++        return;
++    }
++    
++    switch( nUnit )
++    {
++        case word::WdUnits::wdLine:
++        {
++            uno::Reference< view::XViewCursor > xViewCursor( mxTextViewCursor, uno::UNO_QUERY_THROW );
++            sal_Bool bExpand = ( nExtend == word::WdMovementType::wdMove ) ? sal_False : sal_True;
++            xViewCursor->goDown( nCount, bExpand );
++            break;
++        }
++        default:
++        {
++            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++            break;
++        }
++    }
++
++}
++
++void SAL_CALL
++SwVbaSelection::TypeParagraph() throw ( uno::RuntimeException )
++{
++    // #FIXME: if the selection is an entire paragraph, it's replaced 
++    // by the new paragraph
++    sal_Bool isCollapsed = mxTextViewCursor->isCollapsed();
++    InsertParagraph();
++    if( isCollapsed )
++        mxTextViewCursor->collapseToStart();
++}
++
++void SAL_CALL
++SwVbaSelection::InsertParagraph() throw ( uno::RuntimeException )
++{
++    // #FIME: the selection should include the new paragraph.
++    getRange()->InsertParagraph();
++}
++
++void SAL_CALL
++SwVbaSelection::InsertParagraphBefore() throw ( uno::RuntimeException )
++{
++    getRange()->InsertParagraphBefore();
++}
++
++void SAL_CALL
++SwVbaSelection::InsertParagraphAfter() throw ( uno::RuntimeException )
++{
++    getRange()->InsertParagraphAfter();
++}
++
++uno::Reference< word::XParagraphFormat > SAL_CALL
++SwVbaSelection::getParagraphFormat() throw ( uno::RuntimeException )
++{
++    return getRange()->getParagraphFormat();
++}
++
++void SAL_CALL
++SwVbaSelection::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& rParagraphFormat ) throw ( uno::RuntimeException )
++{
++    return getRange()->setParagraphFormat( rParagraphFormat );
++}
++
++uno::Reference< word::XFind > SAL_CALL 
++SwVbaSelection::getFind() throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextRange > xTextRange = GetSelectedRange();
++    return uno::Reference< word::XFind >( new SwVbaFind( this, mxContext, mxModel, xTextRange ) );
++}
++
++uno::Reference< word::XStyle > SAL_CALL
++SwVbaSelection::getStyle() throw ( uno::RuntimeException )
++{
++    return getRange()->getStyle();
++}
++
++void SAL_CALL
++SwVbaSelection::setStyle( const uno::Reference< word::XStyle >& rStyle ) throw ( uno::RuntimeException )
++{
++    return getRange()->setStyle( rStyle );
++}
++
++uno::Reference< word::XFont > SAL_CALL
++SwVbaSelection::getFont() throw ( uno::RuntimeException )
++{
++    return getRange()->getFont();
++}
++
++void SAL_CALL
++SwVbaSelection::TypeBackspace() throw ( uno::RuntimeException )
++{
++    rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SwBackspace"));
++    dispatchRequests( mxModel,url );
++}
++
++uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _what, const uno::Any& _which, const uno::Any& _count, const uno::Any& _name ) throw (uno::RuntimeException)
++{
++    sal_Int32 nWhat;
++    if( ( _what >>= nWhat ) != sal_True )
++         DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
++    switch( nWhat )
++    {
++        case word::WdGoToItem::wdGoToBookmark:
++        {
++            rtl::OUString sName;
++            uno::Reference< word::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
++            uno::Reference< word::XBookmark > xBookmark( xApplication->getActiveDocument()->Bookmarks(_name), uno::UNO_QUERY_THROW );
++            xBookmark->Select();
++            //return uno::Reference< word::XRange >( xBookmark->Range(), uno::UNO_QUERY_THROW );
++            break;
++        }
++        case word::WdGoToItem::wdGoToPage:
++        {
++            uno::Reference< text::XPageCursor > xPageCursor( mxTextViewCursor, uno::UNO_QUERY_THROW );
++            sal_Int32 nCurrPage = xPageCursor->getPage();
++            sal_Int32 nLastPage = word::getPageCount( mxModel );
++            sal_Int32 nCount = 0;
++            if( _count.hasValue() )
++                _count >>= nCount;
++            sal_Int32 nWhich = 0;
++            if( _which.hasValue() )
++                _which >>= nWhich;
++             sal_Int32 nPage = 0;
++             switch( nWhich )
++             {
++                case word::WdGoToDirection::wdGoToLast:
++                {
++                    nPage = nLastPage;
++                    break;
++                }
++                case word::WdGoToDirection::wdGoToNext:
++                {
++                    nPage = nCurrPage + 1;
++                    break;
++                }
++                case word::WdGoToDirection::wdGoToPrevious:
++                {
++                    nPage = nCurrPage - 1;
++                    break;
++                }
++                default:
++                {
++                    nPage = nCount;
++                }
++             }
++             if( nPage <= 0 )
++                nPage = 1;
++             if( nPage > nLastPage )
++                nPage = nLastPage;
++             xPageCursor->jumpToPage( ( sal_Int16 )( nPage ) );
++             break;
++        }
++        case word::WdGoToItem::wdGoToSection:
++        {
++            // TODO: implement Section object
++        }
++        default:
++            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++    }
++    return getRange();
++}
++
++::sal_Int32 SAL_CALL SwVbaSelection::getLanguageID() throw (uno::RuntimeException)
++{
++    return getRange()->getLanguageID();
++}
++
++void SAL_CALL SwVbaSelection::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException)
++{
++    getRange()->setLanguageID( _languageid );
++}
++
++uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::RuntimeException)
++{
++    uno::Any result;
++    //uno::Reference< view::XSelectionSupplier > xSel( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
++    //uno::Any aSelectedObject = xSel->getSelection();
++    switch( _type )
++    {
++        case word::WdInformation::wdActiveEndPageNumber:
++        {
++            result = uno::makeAny( SwVbaInformationHelper::handleWdActiveEndPageNumber( mxTextViewCursor ) );
++            break;
++        }
++        case word::WdInformation::wdNumberOfPagesInDocument:
++        {
++            result = uno::makeAny( SwVbaInformationHelper::handleWdNumberOfPagesInDocument( mxModel ) );
++            break;
++        }
++        case word::WdInformation::wdVerticalPositionRelativeToPage:
++        {
++            result = uno::makeAny( SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( mxModel, mxTextViewCursor ) );
++            break;
++        }
++        default:
++            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++    }
++    // This method fails to restore the previouse selection
++    //xSel->select( aSelectedObject );
++    return result;
++}
++
++void SAL_CALL SwVbaSelection::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException)
++{
++    getRange()->InsertBreak( _breakType );
++}
++
++uno::Any SAL_CALL
++SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++    // Hacky implementation due to missing api ( and lack of knowledge )
++    // we can only support a selection that is a single table
++    if ( !aIndex.hasValue() ) // currently we can't support multiple tables in a selection
++       throw uno::RuntimeException(); 
++    // if the current selection is a XTextTableCursor and the index is 1 then we can service this request, otherwise we just have to throw
++    uno::Reference< text::XTextTableCursor > xTextTableCursor( mxModel->getCurrentSelection(), uno::UNO_QUERY );
++
++    if ( !xTextTableCursor.is() )
++       throw uno::RuntimeException(); 
++
++    sal_Int32 nIndex = 0;
++    aIndex >>= nIndex;
++
++    uno::Any aRet;
++
++    if ( nIndex != 1 )
++       throw uno::RuntimeException(); 
++    SwXTextTableCursor* pTTCursor = dynamic_cast< SwXTextTableCursor* >( xTextTableCursor.get() );
++    if ( pTTCursor )
++    {
++        SwFrmFmt* pFmt = pTTCursor->GetFrmFmt();
++        rtl::OUString sTableName;
++        if ( pFmt )
++        {
++            uno::Reference< text::XTextTable > xTbl = SwXTextTables::GetObject(*pFmt);
++            uno::Reference< css::text::XTextDocument > xTextDoc( mxModel, uno::UNO_QUERY_THROW );
++            uno::Reference< word::XTable > xVBATbl = new SwVbaTable( mxParent, mxContext, xTextDoc, xTbl ); 
++            aRet <<= xVBATbl;
++        }
++    }
++    return aRet;
++    
++}
++
++uno::Any SAL_CALL
++SwVbaSelection::Fields( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< XCollection > xCol( new SwVbaFields( mxParent, mxContext, mxModel ) );
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++uno::Reference< word::XHeaderFooter > SAL_CALL
++SwVbaSelection::getHeaderFooter() throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XText > xCurrentText = word::getXTextViewCursor( mxModel )->getText();
++    if( HeaderFooterHelper::isHeader( mxModel, xCurrentText ) || HeaderFooterHelper::isFooter( mxModel, xCurrentText ) )
++    {
++        uno::Reference< beans::XPropertySet > xPageStyleProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
++        sal_Int32 nIndex = word::WdHeaderFooterIndex::wdHeaderFooterPrimary;
++        sal_Bool isHeader = HeaderFooterHelper::isHeader( mxModel, xCurrentText );
++        if( HeaderFooterHelper::isEvenPagesHeader( mxModel, xCurrentText ) || HeaderFooterHelper::isEvenPagesFooter( mxModel, xCurrentText ) )
++            nIndex = word::WdHeaderFooterIndex::wdHeaderFooterEvenPages;
++        else if( HeaderFooterHelper::isFirstPageHeader( mxModel, xCurrentText ) || HeaderFooterHelper::isFirstPageFooter( mxModel, xCurrentText ) )
++            nIndex = word::WdHeaderFooterIndex::wdHeaderFooterFirstPage;
++        
++        return uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( this, mxContext, mxModel, xPageStyleProps, isHeader, nIndex ) );
++
++    }
++    return uno::Reference< word::XHeaderFooter >();
++}
++
++uno::Any SAL_CALL
++SwVbaSelection::ShapeRange( ) throw (uno::RuntimeException)
++{
++    uno::Reference< drawing::XShapes > xShapes( mxModel->getCurrentSelection(), uno::UNO_QUERY );
++
++    if ( !xShapes.is() )
++       throw uno::RuntimeException(); 
++
++    uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW );
++    uno::Reference< drawing::XDrawPage > xDrawPage = xDrawPageSupplier->getDrawPage();
++    uno::Reference< container::XIndexAccess > xShapesAccess( xShapes, uno::UNO_QUERY_THROW );
++    return uno::makeAny( uno::Reference< msforms::XShapeRange >( new ScVbaShapeRange( this, mxContext, xShapesAccess, xDrawPage, mxModel ) ) );
++}
++
++::sal_Int32 SAL_CALL SwVbaSelection::getStart() throw (uno::RuntimeException)
++{
++    return getRange()->getStart();
++}
++
++void SAL_CALL SwVbaSelection::setStart( ::sal_Int32 _start ) throw (uno::RuntimeException)
++{
++    getRange()->setStart( _start );
++}
++::sal_Int32 SAL_CALL SwVbaSelection::getEnd() throw (uno::RuntimeException)
++{
++    return getRange()->getEnd();
++}
++
++void SAL_CALL SwVbaSelection::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeException)
++{
++    getRange()->setEnd( _end );
++}
++
++rtl::OUString& 
++SwVbaSelection::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSelection") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaSelection::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Selection" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbatable.cxx
+===================================================================
+--- sw/source/ui/vba/vbatable.cxx	(revision 0)
++++ sw/source/ui/vba/vbatable.cxx	(revision 276288)
+@@ -0,0 +1,97 @@
++#include "vbatable.hxx"
++#include "vbarange.hxx"
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
++#include <com/sun/star/view/XSelectionSupplier.hpp>
++#include <com/sun/star/text/XTextTable.hpp>
++#include <com/sun/star/text/XTextTablesSupplier.hpp>
++#include <com/sun/star/table/XTableRows.hpp>
++#include <com/sun/star/container/XNamed.hpp>
++#include "vbaborders.hxx"
++#include "vbapalette.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaTable::SwVbaTable(  const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const  uno::Reference< css::text::XTextTable >& xTextTable) throw ( uno::RuntimeException ) : SwVbaTable_BASE( rParent, rContext ), mxTextDocument( rDocument )
++{
++    mxTextTable.set( xTextTable, uno::UNO_QUERY_THROW );
++}
++
++uno::Reference< word::XRange > SAL_CALL 
++SwVbaTable::Range(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    return new SwVbaRange( mxParent, mxContext, mxTextDocument, mxTextTable->getAnchor() );
++}
++
++void SAL_CALL 
++SwVbaTable::Select(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );    
++    uno::Reference< frame::XController > xController = xModel->getCurrentController();
++
++    uno::Reference< text::XTextViewCursorSupplier > xViewCursorSupplier( xController, uno::UNO_QUERY_THROW );
++    uno::Reference< view::XSelectionSupplier > xSelectionSupplier( xController, uno::UNO_QUERY_THROW );
++
++    // set the view cursor to the start of the table.
++    xSelectionSupplier->select( uno::makeAny( mxTextTable ) );
++
++    // go to the end of the table and span the view
++    uno::Reference< text::XTextViewCursor > xCursor = xViewCursorSupplier->getViewCursor();
++    xCursor->gotoEnd(sal_True);
++    
++}
++
++void SAL_CALL 
++SwVbaTable::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    uno::Reference< table::XTableRows > xRows( mxTextTable->getRows() );
++    xRows->removeByIndex( 0, xRows->getCount() );
++}
++
++uno::Reference< word::XRange > SAL_CALL 
++SwVbaTable::ConvertToText( const uno::Any& Separator, const uno::Any& NestedTables ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // #FIXME the helper api uses the dreaded dispatch mechanism, holding off 
++    // implementation while I look for alternative solution
++    throw uno::RuntimeException();
++}
++
++rtl::OUString SAL_CALL
++SwVbaTable::getName() throw (uno::RuntimeException)
++{
++    uno::Reference< container::XNamed > xNamed( mxTextTable, uno::UNO_QUERY_THROW );
++    return xNamed->getName();
++}
++
++uno::Any SAL_CALL
++SwVbaTable::Borders( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< table::XCellRange > aCellRange( mxTextTable, uno::UNO_QUERY_THROW );
++    VbaPalette aPalette;
++    uno::Reference< XCollection > xCol( new SwVbaBorders( this, mxContext, aCellRange, aPalette ) );
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++// XHelperInterface
++rtl::OUString& 
++SwVbaTable::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTable") );
++    return sImplName;    
++}
++
++uno::Sequence<rtl::OUString> 
++SwVbaTable::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Table" ) );
++    }
++    return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbasections.cxx
+===================================================================
+--- sw/source/ui/vba/vbasections.cxx	(revision 0)
++++ sw/source/ui/vba/vbasections.cxx	(revision 276288)
+@@ -0,0 +1,190 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbasections.hxx"
++#include "vbasection.hxx"
++#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
++#include <com/sun/star/style/XStyle.hpp>
++#include <docsh.hxx>
++#include <doc.hxx>
++#include "wordvbahelper.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++typedef ::cppu::WeakImplHelper1< container::XEnumeration > SectionEnumeration_BASE;
++typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > SectionCollectionHelper_Base;
++typedef std::vector< uno::Reference< beans::XPropertySet > > XSectionVec;
++
++class SectionEnumeration : public SectionEnumeration_BASE
++{
++    XSectionVec mxSections;
++    XSectionVec::iterator mIt;
++
++public:
++	SectionEnumeration( const XSectionVec& rVec ) : mxSections( rVec ), mIt( mxSections.begin() ) {}
++	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
++	{
++		return ( mIt != mxSections.end() );
++	}
++
++	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++	{
++		if ( hasMoreElements() )
++			return uno::makeAny( *mIt++ );
++		throw container::NoSuchElementException();
++	}
++};
++
++// here I regard pagestyle as section
++class SectionCollectionHelper : public SectionCollectionHelper_Base
++{
++private:
++    uno::Reference< XHelperInterface > mxParent;
++    uno::Reference< uno::XComponentContext > mxContext;
++    uno::Reference< frame::XModel > mxModel;
++    XSectionVec mxSections;
++
++public:
++    SectionCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel )
++    {
++        uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( mxModel, uno::UNO_QUERY_THROW );
++        uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
++        uno::Reference< container::XIndexAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles") ) ), uno::UNO_QUERY_THROW );
++        sal_Int32 nCount = xPageStyles->getCount();
++        for( sal_Int32 index = 0; index < nCount; ++index )
++        {
++            uno::Reference< style::XStyle > xStyle( xPageStyles->getByIndex( index ), uno::UNO_QUERY_THROW );
++            // only the pagestyles in using are considered
++            if( xStyle->isInUse( ) )
++            {
++                uno::Reference< beans::XPropertySet > xPageProps( xStyle, uno::UNO_QUERY_THROW );
++                mxSections.push_back( xPageProps );
++            }
++        }
++    }
++
++    ~SectionCollectionHelper(){}
++
++    // XIndexAccess
++    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
++    {
++        return mxSections.size();
++    }
++    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        if ( Index < 0 || Index >= getCount() )    
++            throw css::lang::IndexOutOfBoundsException();
++
++        uno::Reference< beans::XPropertySet > xPageProps( mxSections[ Index ], uno::UNO_QUERY_THROW );
++        return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent,  mxContext, mxModel, xPageProps ) ) );    
++    }
++    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
++    {
++        return word::XSection::static_type(0);
++    }
++    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
++    {
++        return sal_True;
++    }
++    // XEnumerationAccess
++    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
++    {
++        return new SectionEnumeration( mxSections );
++    }
++};
++
++class SectionsEnumWrapper : public EnumerationHelperImpl
++{
++	uno::Reference< frame::XModel > mxModel;
++	uno::WeakReference< XHelperInterface > mxParent;
++public:
++	SectionsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), mxModel( xModel ), mxParent( xParent ) {}
++
++	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
++	{ 
++		uno::Reference< beans::XPropertySet > xPageProps( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
++		return uno::makeAny( uno::Reference< word::XSection > ( new SwVbaSection( mxParent, m_xContext, mxModel, xPageProps ) ) );
++	}
++};
++
++SwVbaSections::SwVbaSections( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ): SwVbaSections_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new SectionCollectionHelper( xParent, xContext, xModel ) ) ),  mxModel( xModel )
++{
++}
++
++uno::Any SAL_CALL
++SwVbaSections::PageSetup( ) throw (uno::RuntimeException)
++{
++    if( m_xIndexAccess->getCount() )
++    {
++        // check if the first section is our want
++        uno::Reference< word::XSection > xSection( m_xIndexAccess->getByIndex( 0 ), uno::UNO_QUERY_THROW );
++        return xSection->PageSetup();
++    }
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("There is no section") ), uno::Reference< uno::XInterface >() );
++}
++
++// XEnumerationAccess
++uno::Type SAL_CALL
++SwVbaSections::getElementType() throw (uno::RuntimeException)
++{
++	return word::XSection::static_type(0);
++}
++
++uno::Reference< container::XEnumeration > SAL_CALL
++SwVbaSections::createEnumeration() throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
++    return new SectionsEnumWrapper( this, mxContext, xEnumAccess->createEnumeration(), mxModel );
++}
++
++uno::Any
++SwVbaSections::createCollectionObject( const css::uno::Any& aSource )
++{
++    return aSource;
++}
++
++rtl::OUString& 
++SwVbaSections::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSections") );
++	return sImplName;
++}
++
++css::uno::Sequence<rtl::OUString> 
++SwVbaSections::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > sNames;
++	if ( sNames.getLength() == 0 )
++	{
++		sNames.realloc( 1 );
++		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Sections") );
++	}
++	return sNames;
++}
+Index: sw/source/ui/vba/vbastyles.hxx
+===================================================================
+--- sw/source/ui/vba/vbastyles.hxx	(revision 0)
++++ sw/source/ui/vba/vbastyles.hxx	(revision 276288)
+@@ -0,0 +1,54 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbastyles.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_STYLES_HXX
++#define SW_VBA_STYLES_HXX
++
++#include <ooo/vba/word/XStyles.hpp>
++#include <vbahelper/vbacollectionimpl.hxx>
++
++typedef CollTestImplHelper< ooo::vba::word::XStyles > SwVbaStyles_BASE;
++class SwVbaStyles: public SwVbaStyles_BASE
++{
++	css::uno::Reference< css::frame::XModel > mxModel;
++	css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF;
++public:
++	SwVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::script::BasicErrorException );
++
++    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException);
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);	
++	virtual css::uno::Any createCollectionObject(const css::uno::Any&);
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif 
+Index: sw/source/ui/vba/vbafield.hxx
+===================================================================
+--- sw/source/ui/vba/vbafield.hxx	(revision 0)
++++ sw/source/ui/vba/vbafield.hxx	(revision 276288)
+@@ -0,0 +1,80 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile:  $
++ * $Revision:  $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_FIELD_HXX
++#define SW_VBA_FIELD_HXX
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/text/XTextDocument.hpp>
++#include <com/sun/star/text/XTextField.hpp>
++#include <ooo/vba/word/XField.hpp>
++#include <ooo/vba/word/XFields.hpp>
++#include <vbahelper/vbacollectionimpl.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XField > SwVbaField_BASE;
++
++class SwVbaField : public SwVbaField_BASE
++{
++    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
++    css::uno::Reference< css::text::XTextField > mxTextField;
++public:
++    SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException);;
++
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();  
++};
++
++// *** SwVbaFields ***********************************************
++
++typedef CollTestImplHelper< ov::word::XFields > SwVbaFields_BASE;
++
++class SwVbaFields : public SwVbaFields_BASE
++{
++    css::uno::Reference< css::frame::XModel > mxModel;
++    css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF;
++private:
++    css::uno::Reference< css::text::XTextField > Create_Field_FileName( const rtl::OUString _text ) throw (css::uno::RuntimeException);
++
++public:
++    SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
++    // XFields
++    virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL Update() throw (css::uno::RuntimeException);
++    // XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++    // ScVbaCollectionBaseImpl      
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();    
++};
++
++#endif
+Index: sw/source/ui/vba/vbainformationhelper.hxx
+===================================================================
+--- sw/source/ui/vba/vbainformationhelper.hxx	(revision 0)
++++ sw/source/ui/vba/vbainformationhelper.hxx	(revision 276288)
+@@ -0,0 +1,46 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_INFORMATIONHELPER_HXX
++#define SW_VBA_INFORMATIONHELPER_HXX
++
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/text/XTextViewCursor.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++
++class SwVbaInformationHelper
++{
++public:
++    static sal_Int32 handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException );
++    static sal_Int32 handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException );
++    static double handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException );
++    //static double verticalPositionRelativeToPageBoundary( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor, const css::uno::Reference< css::beans::XPropertySet >& xStyleProps ) throw( css::uno::RuntimeException );
++
++};
++#endif /* SW_VBA_INFORMATIONHELPER_HXX */
+Index: sw/source/ui/vba/vbaoptions.cxx
+===================================================================
+--- sw/source/ui/vba/vbaoptions.cxx	(revision 0)
++++ sw/source/ui/vba/vbaoptions.cxx	(revision 276288)
+@@ -0,0 +1,287 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microoptionss, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaoptions.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <ooo/vba/word/WdDefaultFilePath.hpp>
++#include <ooo/vba/word/WdLineStyle.hpp>
++#include <ooo/vba/word/WdLineWidth.hpp>
++#include <ooo/vba/word/WdColorIndex.hpp>
++#include <com/sun/star/util/XStringSubstitution.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <osl/file.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaOptions::SwVbaOptions( uno::Reference<uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) : SwVbaOptions_BASE( uno::Reference< XHelperInterface >(), xContext )
++{
++    mxFactory.set( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++}
++
++SwVbaOptions::~SwVbaOptions()
++{
++}
++
++uno::Any SAL_CALL 
++SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException )
++{
++    switch( _path )
++    {
++        case word::WdDefaultFilePath::wdDocumentsPath:
++        {
++            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work") );
++            break;
++        }
++        case word::WdDefaultFilePath::wdPicturesPath:
++        {
++            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Gallery") );
++            break;
++        }
++        case word::WdDefaultFilePath::wdUserTemplatesPath:
++        case word::WdDefaultFilePath::wdWorkgroupTemplatesPath:
++        {
++            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Template") );
++            break;
++        }
++        case word::WdDefaultFilePath::wdStartupPath:
++        {
++            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Addin") );
++            break;
++        }
++        case word::WdDefaultFilePath::wdUserOptionsPath:
++        {
++            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserConfig") );
++            break;
++        }
++        case word::WdDefaultFilePath::wdToolsPath:
++        case word::WdDefaultFilePath::wdProgramPath:
++        {
++            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Module") );
++            break;
++        }
++        case word::WdDefaultFilePath::wdTempFilePath:
++        {
++            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Temp") );
++            break;
++        }
++        default:
++        {
++            DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); 
++            break;
++        }
++    }
++    return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
++}
++
++void SwVbaOptions::setValueEvent( const uno::Any& value )
++{
++    rtl::OUString sNewPath;
++    value >>= sNewPath;
++    rtl::OUString sNewPathUrl;
++    ::osl::File::getFileURLFromSystemPath( sNewPath, sNewPathUrl );
++    uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW );
++    rtl::OUString sOldPathUrl;
++    xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sOldPathUrl;
++    // path could be a multipath, Microsoft doesn't support this feature in Word currently
++    // only the last path is from interest.
++    sal_Int32 nIndex = sOldPathUrl.lastIndexOf( sal_Unicode(';') );
++    if( nIndex != -1 )
++    {
++        sNewPathUrl = sOldPathUrl.copy( 0, nIndex + 1 ).concat( sNewPathUrl );
++    }
++    xPathSettings->setPropertyValue( msDefaultFilePath, uno::makeAny( sNewPathUrl ) );
++}
++
++uno::Any SwVbaOptions::getValueEvent()
++{
++    uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW );
++    rtl::OUString sPathUrl;
++    xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sPathUrl;
++    // path could be a multipath, Microsoft doesn't support this feature in Word currently
++    // only the last path is from interest.
++    sal_Int32 nIndex = sPathUrl.lastIndexOf( sal_Unicode(';') );
++    if( nIndex != -1 )
++    {
++        sPathUrl = sPathUrl.copy( nIndex + 1 );
++    }
++    rtl::OUString sPath;
++    ::osl::File::getSystemPathFromFileURL( sPathUrl, sPath );
++    return uno::makeAny( sPath );
++}
++
++sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineStyle() throw (uno::RuntimeException)
++{
++    return word::WdLineStyle::wdLineStyleSingle;
++}
++
++void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineWidth() throw (uno::RuntimeException)
++{
++    return word::WdLineWidth::wdLineWidth050pt;
++}
++
++void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderColorIndex() throw (uno::RuntimeException)
++{
++    return word::WdColorIndex::wdAuto;
++}
++
++void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++::sal_Bool SAL_CALL SwVbaOptions::getReplaceSelection() throw (uno::RuntimeException)
++{
++    return sal_True;
++}
++
++void SAL_CALL SwVbaOptions::setReplaceSelection( ::sal_Bool _replaceselection ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++::sal_Bool SAL_CALL SwVbaOptions::getMapPaperSize() throw (uno::RuntimeException)
++{
++    return sal_False;
++}
++
++void SAL_CALL SwVbaOptions::setMapPaperSize( ::sal_Bool _mappapersize ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyHeadings() throw (uno::RuntimeException)
++{
++    return sal_False;
++}
++
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _autoformatasyoutypeapplyheadings ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyBulletedLists() throw (uno::RuntimeException)
++{
++    return sal_False;
++}
++
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyNumberedLists() throw (uno::RuntimeException)
++{
++    return sal_False;
++}
++
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeFormatListItemBeginning() throw (uno::RuntimeException)
++{
++    return sal_False;
++}
++
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeDefineStyles() throw (uno::RuntimeException)
++{
++    return sal_False;
++}
++
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _autoformatasyoutypedefinestyles ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyHeadings() throw (uno::RuntimeException)
++{
++    return sal_False;
++}
++
++void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( ::sal_Bool _autoformatapplyheadings ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyLists() throw (uno::RuntimeException)
++{
++    return sal_False;
++}
++
++void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( ::sal_Bool _autoformatapplylists ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyBulletedLists() throw (uno::RuntimeException)
++{
++    return sal_False;
++}
++
++void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool _autoformatapplybulletedlists ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++
++rtl::OUString& 
++SwVbaOptions::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaOptions") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaOptions::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Options" ) );
++	}
++	return aServiceNames;
++}
+Index: sw/source/ui/vba/vbarangehelper.cxx
+===================================================================
+--- sw/source/ui/vba/vbarangehelper.cxx	(revision 0)
++++ sw/source/ui/vba/vbarangehelper.cxx	(revision 276288)
+@@ -0,0 +1,174 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbarangehelper.hxx"
++#include <com/sun/star/text/ControlCharacter.hpp>
++#include <com/sun/star/text/XTextRangeCompare.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++/**
++ * get a range in a xText by creating
++ * a cursor that iterates over the text. If the iterating cursor is 
++ * equal to the desired position, the range equivalent is returned.
++ * Some special cases are tables that are inside of the text, because the
++ * position has to be adjusted.
++ * @param xText a text where a range position is searched
++ * @param position a position inside o the text
++ * @return a range for the postion; null is returned if no range can be
++ * constructed.
++ */
++uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const uno::Reference< text::XText >& rText, sal_Int32 _position ) throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextRange > xRange;
++    if( rText.is() )
++    {
++        sal_Int32 nPos = 0;
++        uno::Reference< text::XTextCursor > xCursor = rText->createTextCursor();
++        xCursor->collapseToStart();
++        sal_Bool bCanGo = sal_True;
++        while( !xRange.is() && bCanGo )
++        {
++            if( _position == nPos )
++            {
++                xRange = xCursor->getStart();
++            }    
++            else
++            {
++                bCanGo = xCursor->goRight( 1, sal_False );
++                nPos++;
++            }
++        }
++    }
++    return xRange;
++}
++
++
++void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException )
++{
++    sal_Int32 nlastIndex = 0;
++    sal_Int32 nIndex = 0;
++    uno::Reference< text::XTextRange > xRange = rTextRange;
++    
++    while(( nIndex = rStr.indexOf('\n', nlastIndex)) >= 0  )
++    {
++        xRange = xRange->getEnd();
++        if( nlastIndex < ( nIndex - 1 ) )
++        {
++            rText->insertString( xRange, rStr.copy( nlastIndex, ( nIndex - 1 - nlastIndex ) ), _bAbsorb );
++            xRange = xRange->getEnd();
++        }
++
++        rText->insertControlCharacter( xRange, text::ControlCharacter::PARAGRAPH_BREAK, _bAbsorb );
++        nlastIndex = nIndex + 1;
++    }
++
++    if( nlastIndex < rStr.getLength() )
++    {
++        xRange = xRange->getEnd();
++
++        rtl::OUString aWatt = rStr.copy( nlastIndex );
++        rText->insertString( xRange, aWatt, _bAbsorb );
++    }
++}
++
++uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Reference< text::XTextRange >& rTextRange, const uno::Reference< text::XText >& rText ) throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextCursor > xTextCursor;
++    sal_Bool bGotTextCursor = sal_False;
++
++    try
++    {
++        xTextCursor = rText->createTextCursorByRange( rTextRange );
++        bGotTextCursor = sal_True;
++    }
++    catch (uno::Exception& e)
++    {
++        DebugHelper::exception(e);
++    }
++
++    if( !bGotTextCursor )
++    {
++        try
++        {
++            uno::Reference< text::XText > xText = rTextRange->getText();
++            xTextCursor = xText->createTextCursor();
++            bGotTextCursor = sal_True;
++        }
++        catch( uno::Exception& e )
++        {
++            DebugHelper::exception(e);
++        }
++    }
++
++    if( !bGotTextCursor )
++    {
++        try
++        {
++            xTextCursor = rText->createTextCursor();
++            bGotTextCursor = sal_True;
++        }
++        catch( uno::Exception& e )
++        {
++            DebugHelper::exception(e);
++        }
++    }
++    return xTextCursor;
++}
++
++sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rText, const uno::Reference< text::XTextRange >& rTextRange ) throw ( uno::RuntimeException )
++{
++    sal_Int32 nPosition = -1;
++    if( rText.is() && rTextRange.is() )
++    {
++        nPosition = 0;
++        uno::Reference< text::XTextCursor > xCursor = rText->createTextCursor();
++        xCursor->collapseToStart();
++        uno::Reference< text::XTextRangeCompare > xCompare( rText, uno::UNO_QUERY_THROW );
++        // compareValue is 0 if the ranges are equal
++        sal_Int32 nCompareValue = xCompare->compareRegionStarts( xCursor->getStart(), rTextRange );
++        sal_Bool canGo = sal_True;
++
++        while( nCompareValue !=0 && canGo )
++        {
++            canGo = xCursor->goRight( 1, sal_False );
++            nCompareValue = xCompare->compareRegionStarts( xCursor->getStart(), rTextRange );
++            nPosition++;
++        }
++
++        // check fails: no correct position found
++        if( !canGo && nCompareValue != 0 )
++        {
++            nPosition = -1;
++        }
++    }
++
++    return nPosition;
++}
+Index: sw/source/ui/vba/vbareplacement.cxx
+===================================================================
+--- sw/source/ui/vba/vbareplacement.cxx	(revision 0)
++++ sw/source/ui/vba/vbareplacement.cxx	(revision 276288)
+@@ -0,0 +1,74 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbareplacement.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaReplacement::SwVbaReplacement( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< util::XPropertyReplace >& xPropertyReplace ) throw ( uno::RuntimeException ) :
++    SwVbaReplacement_BASE( rParent, rContext ), mxPropertyReplace( xPropertyReplace )
++{
++}
++
++SwVbaReplacement::~SwVbaReplacement()
++{
++}
++
++::rtl::OUString SAL_CALL SwVbaReplacement::getText() throw (uno::RuntimeException)
++{
++    return mxPropertyReplace->getReplaceString();
++}
++
++void SAL_CALL SwVbaReplacement::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
++{
++    mxPropertyReplace->setReplaceString( _text );
++}
++
++rtl::OUString& 
++SwVbaReplacement::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaReplacement") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaReplacement::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Replacement" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbastyle.cxx
+===================================================================
+--- sw/source/ui/vba/vbastyle.cxx	(revision 0)
++++ sw/source/ui/vba/vbastyle.cxx	(revision 276288)
+@@ -0,0 +1,152 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile:
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#include "vbastyle.hxx"
++#include <ooo/vba/word/WdStyleType.hpp>
++#include <com/sun/star/lang/Locale.hpp>
++#include <i18npool/mslangid.hxx>
++#include "vbafont.hxx"
++#include "vbapalette.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++
++SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet ) throw ( script::BasicErrorException, uno::RuntimeException ) : SwVbaStyle_BASE( xParent, xContext ) , mxStyleProps( _xPropertySet )
++{
++    mxStyle.set( _xPropertySet, uno::UNO_QUERY_THROW );
++}
++
++void SAL_CALL 
++SwVbaStyle::setName( const ::rtl::OUString& Name ) throw (uno::RuntimeException)
++{
++	mxStyle->setName(Name);
++}
++
++::rtl::OUString SAL_CALL 
++SwVbaStyle::getName() throw (uno::RuntimeException)
++{
++	return mxStyle->getName();
++}
++
++sal_Int32 SwVbaStyle::getLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps ) throw (uno::RuntimeException)
++{
++    lang::Locale aLocale;
++    xTCProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharLocale") ) ) >>= aLocale;
++    return MsLangId::convertLocaleToLanguage( aLocale );
++}
++
++void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (uno::RuntimeException)
++{
++    lang::Locale aLocale = MsLangId::convertLanguageToLocale( _languageid );
++    xTCProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharLocale") ), uno::makeAny( aLocale ) ) ;
++}
++
++::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID() throw (uno::RuntimeException)
++{
++    return getLanguageID( mxStyleProps );
++}
++
++void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException)
++{
++    setLanguageID( mxStyleProps, _languageid );
++}
++
++::sal_Int32 SAL_CALL SwVbaStyle::getType() throw (uno::RuntimeException)
++{
++    sal_Int32 nType = word::WdStyleType::wdStyleTypeParagraph;
++    uno::Reference< lang::XServiceInfo > xServiceInfo( mxStyle, uno::UNO_QUERY_THROW );
++    if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.ParagraphStyle") ) ) )
++        nType = word::WdStyleType::wdStyleTypeParagraph;
++    else if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CharacterStyle") ) ) )    
++        nType = word::WdStyleType::wdStyleTypeCharacter;
++    else // if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.NumberingStyle") ) ) )    
++        nType = word::WdStyleType::wdStyleTypeList;
++    return nType;
++}
++
++uno::Reference< word::XFont > SAL_CALL
++SwVbaStyle::getFont() throw ( uno::RuntimeException )
++{
++    VbaPalette aColors;
++    return new SwVbaFont( mxParent, mxContext, aColors.getPalette(), mxStyleProps );
++}
++
++void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xTCProps, const uno::Reference< ooo::vba::word::XStyle >& xStyle )throw (uno::RuntimeException)
++{
++    rtl::OUString aStyleType = getOOoStyleTypeFromMSWord( xStyle->getType() );
++    xTCProps->setPropertyValue( aStyleType, uno::makeAny( xStyle->getName() ) );
++}
++
++rtl::OUString SwVbaStyle::getOOoStyleTypeFromMSWord( sal_Int32 _wdStyleType )
++{
++    rtl::OUString aStyleType;
++    switch( _wdStyleType )
++    {
++        case word::WdStyleType::wdStyleTypeParagraph:
++        case word::WdStyleType::wdStyleTypeTable:
++        {
++            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName") );
++            break;
++        }
++        case word::WdStyleType::wdStyleTypeCharacter:
++        {
++            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharStyleName") );
++            break;
++        }
++        case word::WdStyleType::wdStyleTypeList:
++        {
++            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingStyleName") );
++            break;
++        }
++        default:
++            DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
++    }
++    return aStyleType;
++}
++
++rtl::OUString&
++SwVbaStyle::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaStyle") );
++    return sImplName;
++}
++
++uno::Sequence< rtl::OUString >
++SwVbaStyle::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.XStyle" ) );
++    }
++    return aServiceNames;
++}
+Index: sw/source/ui/vba/vbadocumentproperties.hxx
+===================================================================
+--- sw/source/ui/vba/vbadocumentproperties.hxx	(revision 0)
++++ sw/source/ui/vba/vbadocumentproperties.hxx	(revision 276288)
+@@ -0,0 +1,70 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadocument.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_DOCUMENTPROPERTIES_HXX
++#define SW_VBA_DOCUMENTPROPERTIES_HXX
++
++#include <ooo/vba/XDocumentProperties.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <hash_map>
++
++typedef CollTestImplHelper< ov::XDocumentProperties > SwVbaDocumentproperties_BASE;
++
++class SwVbaBuiltinDocumentProperties : public SwVbaDocumentproperties_BASE
++{
++protected:
++    css::uno::Reference< css::frame::XModel > m_xModel;
++public:
++    SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
++
++    // XDocumentProperties
++    virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    // XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++    // ScVbaCollectionBaseImpl      
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties
++{
++public:
++    SwVbaCustomDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
++// XDocumentProperties
++    virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++};
++
++#endif /* SW_VBA_DOCUMENTPROPERTY_HXX */
+Index: sw/source/ui/vba/vbapalette.hxx
+===================================================================
+--- sw/source/ui/vba/vbapalette.hxx	(revision 0)
++++ sw/source/ui/vba/vbapalette.hxx	(revision 276288)
+@@ -0,0 +1,15 @@
++#ifndef VBAPALETTE_HXX
++#define VBAPALETTE_HXX
++#include <vbahelper/vbahelper.hxx>
++
++class VbaPalette
++{
++        css::uno::Reference< css::container::XIndexAccess > mxPalette;
++public:
++        VbaPalette();
++        // if no palette available e.g. because the document doesn't have a 
++        // palette defined then a default palette will be returned.
++        css::uno::Reference< css::container::XIndexAccess > getPalette() const;
++};
++
++#endif
+Index: sw/source/ui/vba/vbabookmark.cxx
+===================================================================
+--- sw/source/ui/vba/vbabookmark.cxx	(revision 0)
++++ sw/source/ui/vba/vbabookmark.cxx	(revision 276288)
+@@ -0,0 +1,112 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbabookmark.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include <com/sun/star/text/XTextDocument.hpp>
++#include <com/sun/star/text/XTextContent.hpp>
++#include <com/sun/star/text/XTextViewCursor.hpp>
++#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
++#include "vbarange.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaBookmark::SwVbaBookmark( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
++    const css::uno::Reference< frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ) :
++    SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ), maName( rName ), mbValid( sal_True )
++{
++    uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( mxModel, uno::UNO_QUERY_THROW );
++    mxBookmark.set( xBookmarksSupplier->getBookmarks()->getByName( maName ), uno::UNO_QUERY_THROW );
++}
++
++SwVbaBookmark::~SwVbaBookmark()
++{
++}
++
++void SwVbaBookmark::checkVality() throw ( uno::RuntimeException )
++{
++    if( !mbValid )
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("The bookmark is not valid" ) ), uno::Reference< uno::XInterface >() );
++}
++
++void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException )
++{
++    checkVality();
++    uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
++    xTextDocument->getText()->removeTextContent( mxBookmark );
++    mbValid = sal_False;
++}
++
++void SAL_CALL SwVbaBookmark::Select() throw ( uno::RuntimeException )
++{
++    checkVality();
++    uno::Reference< text::XTextViewCursorSupplier > xViewCursorSupplier( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
++    xViewCursorSupplier->getViewCursor()->gotoRange( mxBookmark->getAnchor(),sal_False );
++}
++
++rtl::OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException )
++{
++    return maName;
++}
++
++void SAL_CALL SwVbaBookmark::setName( const rtl::OUString& _name ) throw ( uno::RuntimeException )
++{
++    uno::Reference< container::XNamed > xNamed( mxBookmark, uno::UNO_QUERY_THROW );
++    xNamed->setName( _name );
++}
++
++uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextContent > xTextContent( mxBookmark, uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextRange > xTextRange( xTextContent->getAnchor(), uno::UNO_QUERY_THROW );
++    return uno::makeAny( uno::Reference< word::XRange>(  new SwVbaRange( this, mxContext, xTextDocument, xTextRange->getStart(), xTextRange->getEnd(), xTextRange->getText() ) ) );
++}
++
++rtl::OUString& 
++SwVbaBookmark::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmark") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaBookmark::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Bookmark" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbadocuments.hxx
+===================================================================
+--- sw/source/ui/vba/vbadocuments.hxx	(revision 0)
++++ sw/source/ui/vba/vbadocuments.hxx	(revision 276288)
+@@ -0,0 +1,65 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_DOCUMENTS_HXX
++#define SW_VBA_DOCUMENTS_HXX
++
++
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <ooo/vba/word/XDocuments.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <vbahelper/vbadocumentsbase.hxx>
++#include "wordvbahelper.hxx"
++
++
++typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::word::XDocuments > SwVbaDocuments_BASE;
++
++class SwVbaDocuments : public SwVbaDocuments_BASE
++{
++public:
++	SwVbaDocuments( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext );
++	virtual ~SwVbaDocuments() {}
++
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++	// SwVbaDocuments_BASE
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++
++	// Methods
++    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException);
++
++};
++
++#endif /* SW_VBA_DOCUMENTS_HXX */
+Index: sw/source/ui/vba/vbaaddins.hxx
+===================================================================
+--- sw/source/ui/vba/vbaaddins.hxx	(revision 0)
++++ sw/source/ui/vba/vbaaddins.hxx	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_ADDINS_HXX
++#define SW_VBA_ADDINS_HXX
++
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <ooo/vba/word/XAddins.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef CollTestImplHelper< ooo::vba::word::XAddins > SwVbaAddins_BASE;
++
++class SwVbaAddins : public SwVbaAddins_BASE
++{
++public:
++	SwVbaAddins( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext ) throw (css::uno::RuntimeException);
++	virtual ~SwVbaAddins() {}
++
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++	// SwVbaAddins_BASE
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};    
++
++#endif /* SW_VBA_ADDINS_HXX */
+Index: sw/source/ui/vba/vbaheaderfooterhelper.cxx
+===================================================================
+--- sw/source/ui/vba/vbaheaderfooterhelper.cxx	(revision 0)
++++ sw/source/ui/vba/vbaheaderfooterhelper.cxx	(revision 276288)
+@@ -0,0 +1,178 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaheaderfooterhelper.hxx"
++#include "wordvbahelper.hxx"
++#include <comphelper/processfactory.hxx>
++#include <com/sun/star/frame/XController.hpp>
++#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
++#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
++
++using namespace ::com::sun::star;
++using namespace ::ooo::vba;
++
++#define FIRST_PAGE 1;
++
++// Class HeaderFooterHelper 
++
++sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
++{
++    uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
++    uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
++    
++    sal_Bool isOn = sal_False;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isOn;
++    if( !isOn )
++        return sal_False;
++
++    sal_Bool isShared = sal_False;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared"))) >>= isShared;
++
++    rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") );
++    if( !isShared )
++    {
++        if( 0 == xPageCursor->getPage() % 2 )
++        {
++            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextLeft") );
++        }
++        else
++        {
++            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextRight") );
++        }
++    }
++    
++    uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
++    //FIXME: can not compare in this way?
++    return ( xText == xCurrentText );
++}
++
++sal_Bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
++{
++    if( isHeader( xModel, xCurrentText ) )
++    {
++        uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
++        // FIXME: getPage allways returns 1
++        sal_Int32 nPage = xPageCursor->getPage();
++        return nPage == FIRST_PAGE;
++    }
++    return sal_False;
++}
++
++sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
++{
++    if( isHeader( xModel, xCurrentText ) )
++    {
++        uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
++        sal_Bool isShared = sal_False;
++        xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared"))) >>= isShared;
++        if( !isShared )
++        {
++            uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
++            return ( 0 == xPageCursor->getPage() % 2 );
++        }    
++    }
++    return sal_False;
++}
++
++sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
++{
++    uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
++    uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
++    
++    sal_Bool isOn = sal_False;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isOn;
++    if( !isOn )
++        return sal_False;
++
++    sal_Bool isShared = sal_False;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))) >>= isShared;
++
++    rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
++    if( !isShared )
++    {
++        if( 0 == xPageCursor->getPage() % 2 )
++        {
++            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextLeft") );
++        }
++        else
++        {
++            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextRight") );
++        }
++    }
++    
++    uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
++
++    return ( xText == xCurrentText );
++}
++
++sal_Bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
++{
++    if( isFooter( xModel, xCurrentText ) )
++    {
++        uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
++        sal_Int32 nPage = xPageCursor->getPage();
++        return nPage == FIRST_PAGE;
++    }
++    return sal_False;
++}
++
++sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
++{
++    if( isFooter( xModel, xCurrentText ) )
++    {
++        uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
++        sal_Bool isShared = sal_False;
++        xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))) >>= isShared;
++        if( !isShared )
++        {
++            uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
++            return ( 0 == xPageCursor->getPage() % 2 );
++        }    
++    }
++    return sal_False;
++}
++
++sal_Bool HeaderFooterHelper::isPrimaryHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
++{
++    if( isHeader( xModel, xCurrentText ) )
++    {
++        return( !( isFirstPageHeader( xModel, xCurrentText ) && isEvenPagesHeader( xModel, xCurrentText ) ) );
++    }
++    return sal_False;
++}
++
++sal_Bool HeaderFooterHelper::isPrimaryFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
++{
++    if( isHeader( xModel, xCurrentText ) )
++    {
++        return( !( isFirstPageFooter( xModel, xCurrentText ) && isEvenPagesFooter( xModel, xCurrentText ) ) );
++    }
++    return sal_False;
++}
+Index: sw/source/ui/vba/vbasection.hxx
+===================================================================
+--- sw/source/ui/vba/vbasection.hxx	(revision 0)
++++ sw/source/ui/vba/vbasection.hxx	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_SECTION_HXX
++#define SW_VBA_SECTION_HXX
++
++#include <ooo/vba/word/XSection.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSection > SwVbaSection_BASE;
++
++class SwVbaSection : public SwVbaSection_BASE
++{
++private:
++    css::uno::Reference< css::frame::XModel > mxModel;
++    css::uno::Reference< css::beans::XPropertySet > mxPageProps;
++
++public:
++	SwVbaSection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaSection();
++
++    // Attributes
++    virtual ::sal_Bool SAL_CALL getProtectedForForms() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setProtectedForForms( ::sal_Bool _protectedforforms ) throw (css::uno::RuntimeException);
++
++    // Methods
++    virtual css::uno::Any SAL_CALL Headers(  ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Footers(  ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL PageSetup(  ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_SECTION_HXX */
+Index: sw/source/ui/vba/vbaparagraph.hxx
+===================================================================
+--- sw/source/ui/vba/vbaparagraph.hxx	(revision 0)
++++ sw/source/ui/vba/vbaparagraph.hxx	(revision 276288)
+@@ -0,0 +1,84 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_PARAGRAPH_HXX
++#define SW_VBA_PARAGRAPH_HXX
++
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <ooo/vba/word/XParagraphs.hpp>
++#include <ooo/vba/word/XParagraph.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/text/XTextRange.hpp>
++#include <com/sun/star/text/XTextDocument.hpp>
++
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XParagraph > SwVbaParagraph_BASE;
++
++class SwVbaParagraph : public SwVbaParagraph_BASE
++{
++private:
++    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
++    css::uno::Reference< css::text::XTextRange > mxTextRange;
++
++public:
++	SwVbaParagraph( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDocument, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaParagraph();
++
++    // XParagraph
++    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw ( css::uno::RuntimeException );
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++
++/* class SwVbaParagraphs */
++typedef CollTestImplHelper< ooo::vba::word::XParagraphs > SwVbaParagraphs_BASE;
++
++class SwVbaParagraphs : public SwVbaParagraphs_BASE
++{
++private:
++    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
++public:
++	SwVbaParagraphs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDocument ) throw (css::uno::RuntimeException);
++	virtual ~SwVbaParagraphs() {}
++
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++	// SwVbaParagraphs_BASE
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};    
++
++#endif /* SW_VBA_PARAGRAPH_HXX */
+Index: sw/source/ui/vba/vbatables.cxx
+===================================================================
+--- sw/source/ui/vba/vbatables.cxx	(revision 0)
++++ sw/source/ui/vba/vbatables.cxx	(revision 276288)
+@@ -0,0 +1,131 @@
++#include "vbatables.hxx"
++#include "vbatable.hxx"
++#include "vbarange.hxx"
++#include <com/sun/star/text/XTextTable.hpp>
++#include <com/sun/star/text/XTextTablesSupplier.hpp>
++#include <com/sun/star/text/XTextDocument.hpp>
++#include <comphelper/componentcontext.hxx>
++
++using namespace ::ooo::vba;
++using namespace css;
++
++uno::Reference< container::XIndexAccess > lcl_getTables( const uno::Reference< frame::XModel >& xDoc )
++{
++    uno::Reference< container::XIndexAccess > xTables;
++    uno::Reference< text::XTextTablesSupplier > xSupp( xDoc, uno::UNO_QUERY );
++    if ( xSupp.is() )
++        xTables.set( xSupp->getTextTables(), uno::UNO_QUERY_THROW );
++    return xTables;
++}
++
++uno::Any lcl_createTable( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Any& aSource )
++{
++    uno::Reference< text::XTextTable > xTextTable( aSource, uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextDocument > xTextDocument( xDocument, uno::UNO_QUERY_THROW );
++    uno::Reference< word::XTable > xTable( new SwVbaTable( xParent, xContext, xTextDocument, xTextTable ) );
++    return uno::makeAny( xTable );
++}
++
++typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumBase;
++
++class TableEnumerationImpl : public EnumBase
++{
++    uno::Reference< XHelperInterface > mxParent;
++    uno::Reference< uno::XComponentContext > mxContext;
++    uno::Reference< frame::XModel > mxDocument;
++    uno::Reference< container::XIndexAccess > mxIndexAccess;
++    sal_Int32 mnCurIndex;
++public:
++    TableEnumerationImpl(  const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxParent( xParent ), mxContext( xContext ), mxDocument( xDocument ), mxIndexAccess( xIndexAccess ), mnCurIndex(0)
++    {
++    }
++    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException) 
++    { 
++        return ( mnCurIndex < mxIndexAccess->getCount() );
++    }
++    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        if ( !hasMoreElements() )
++            throw container::NoSuchElementException();
++        return lcl_createTable( mxParent, mxContext, mxDocument, mxIndexAccess->getByIndex( mnCurIndex++ ) );
++    }
++    
++};
++ 
++SwVbaTables::SwVbaTables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xDocument ) : SwVbaTables_BASE( xParent, xContext , lcl_getTables( xDocument ) ), mxDocument( xDocument )
++{
++}
++
++
++uno::Reference< word::XTable > SAL_CALL 
++SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& DefaultTableBehavior, const uno::Any& AutoFitBehavior ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    sal_Int32 nCols = 0;
++    sal_Int32 nRows = 0;
++    SwVbaRange* pVbaRange = dynamic_cast< SwVbaRange* >( Range.get() );
++    // Preconditions
++    if ( !( pVbaRange && ( NumRows >>= nRows ) && ( NumColumns >>= nCols ) ) )
++        throw uno::RuntimeException(); // #FIXME better exception??
++    if ( nCols <= 0 || nRows <= 0 ) 
++        throw uno::RuntimeException(); // #FIXME better exception??
++
++    uno::Reference< frame::XModel > xModel( pVbaRange->getDocument(), uno::UNO_QUERY_THROW );
++    uno::Reference< lang::XMultiServiceFactory > xMsf( xModel, uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextRange > xTextRange = pVbaRange->getXTextRange();
++
++    uno::Reference< text::XTextTable > xTable;
++    xTable.set( xMsf->createInstance( rtl::OUString::createFromAscii("com.sun.star.text.TextTable") ), uno::UNO_QUERY_THROW );
++/*
++    comphelper::ComponentContext aCtx( xMsf );
++    if ( !aCtx.createComponent( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextTable") ), xTable ) );
++        throw uno::RuntimeException(); // #FIXME better exception??
++*/
++    xTable->initialize( nRows, nCols );
++    uno::Reference< text::XText > xText = xTextRange->getText();
++    uno::Reference< text::XTextContent > xContext( xTable, uno::UNO_QUERY_THROW );     
++    
++    xText->insertTextContent( xTextRange, xContext, true );
++    uno::Reference< word::XTable > xVBATable( new SwVbaTable( mxParent, mxContext,  pVbaRange->getDocument(), xTable ) );
++    return xVBATable;
++}
++
++uno::Reference< container::XEnumeration > SAL_CALL 
++SwVbaTables::createEnumeration() throw (uno::RuntimeException)
++{
++    return new TableEnumerationImpl( mxParent, mxContext, mxDocument, m_xIndexAccess );
++}
++
++// ScVbaCollectionBaseImpl      
++uno::Any 
++SwVbaTables::createCollectionObject( const uno::Any& aSource )
++{
++    return lcl_createTable( mxParent, mxContext, mxDocument, aSource );
++} 
++
++// XHelperInterface
++rtl::OUString& 
++SwVbaTables::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTables") );
++    return sImplName;    
++}
++
++// XEnumerationAccess
++uno::Type SAL_CALL 
++SwVbaTables::getElementType() throw (uno::RuntimeException)
++{
++    return  word::XTable::static_type(0); 
++}
++
++uno::Sequence<rtl::OUString> 
++SwVbaTables::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Tables" ) );
++    }
++    return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbawindow.hxx
+===================================================================
+--- sw/source/ui/vba/vbawindow.hxx	(revision 0)
++++ sw/source/ui/vba/vbawindow.hxx	(revision 276288)
+@@ -0,0 +1,61 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbawindow.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_WINDOW_HXX
++#define SW_VBA_WINDOW_HXX
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/word/XWindow.hpp>
++#include <com/sun/star/uno/XComponentContext.hpp>
++
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbawindowbase.hxx>
++
++typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::word::XWindow > WindowImpl_BASE;
++
++class SwVbaWindow : public WindowImpl_BASE
++{		
++public:	
++	SwVbaWindow( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel );
++    SwVbaWindow( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
++
++
++    // Attributes
++    virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException);
++	// Methods
++	virtual void SAL_CALL Activate(  ) throw (css::uno::RuntimeException);
++	virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException);
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif //SW_VBA_WINDOW_HXX
+Index: sw/source/ui/vba/vbaview.hxx
+===================================================================
+--- sw/source/ui/vba/vbaview.hxx	(revision 0)
++++ sw/source/ui/vba/vbaview.hxx	(revision 276288)
+@@ -0,0 +1,71 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_VIEW_HXX
++#define SW_VBA_VIEW_HXX
++
++#include <ooo/vba/word/XView.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/text/XTextViewCursor.hpp>
++#include <com/sun/star/text/XTextRange.hpp>
++#include <com/sun/star/text/XText.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XView > SwVbaView_BASE;
++
++class SwVbaView : public SwVbaView_BASE
++{
++private:
++    css::uno::Reference< css::frame::XModel > mxModel;
++    css::uno::Reference< css::text::XTextViewCursor > mxViewCursor;
++    css::uno::Reference< css::beans::XPropertySet > mxViewSettings;
++
++    css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ) throw (css::uno::RuntimeException);
++    css::uno::Reference< css::text::XTextRange > getFirstObjectPosition( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
++
++public:
++	SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
++        const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaView();
++
++   // XView
++    virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getSplitSpecial() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getTableGridLines() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_VIEW_HXX */
+Index: sw/source/ui/vba/vbawrapformat.cxx
+===================================================================
+--- sw/source/ui/vba/vbawrapformat.cxx	(revision 0)
++++ sw/source/ui/vba/vbawrapformat.cxx	(revision 276288)
+@@ -0,0 +1,260 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbawrapformat.cxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbawrapformat.hxx"
++#include <ooo/vba/word/WdWrapSideType.hpp>
++#include <ooo/vba/word/WdWrapType.hpp>
++#include <com/sun/star/text/WrapTextMode.hpp>
++#include <vbahelper/vbahelper.hxx>
++#include <vbahelper/helperdecl.hxx>
++
++using namespace ooo::vba;
++using namespace com::sun::star;
++
++SwVbaWrapFormat::SwVbaWrapFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : SwVbaWrapFormat_BASE( xParent, xContext ), m_xShape( xShape ), mnWrapFormatType( 0 ), mnSide( word::WdWrapSideType::wdWrapBoth ) 
++{
++    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
++}
++
++SwVbaWrapFormat::SwVbaWrapFormat( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) : SwVbaWrapFormat_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext ), m_xShape( getXSomethingFromArgs< drawing::XShape >( aArgs, 1, false ) ), mnWrapFormatType( 0 ), mnSide( word::WdWrapSideType::wdWrapBoth )
++{
++    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
++}
++
++void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
++{
++    text::WrapTextMode eTextMode = text::WrapTextMode_NONE;
++    if( mnSide == word::WdWrapSideType::wdWrapLeft )
++    {
++        eTextMode = text::WrapTextMode_LEFT;
++    }
++    else if(  mnSide == word::WdWrapSideType::wdWrapRight )
++    {
++        eTextMode = text::WrapTextMode_RIGHT;
++    }
++    else if( mnSide == word::WdWrapSideType::wdWrapBoth ||
++            mnSide == word::WdWrapSideType::wdWrapLargest )
++    {
++        switch( mnWrapFormatType )
++        {
++            case word::WdWrapType::wdWrapNone:
++            case word::WdWrapType::wdWrapThrough:
++            {
++                eTextMode = text::WrapTextMode_THROUGHT;
++                break;
++            }
++            case word::WdWrapType::wdWrapInline:
++            case word::WdWrapType::wdWrapTopBottom:
++            {
++                eTextMode = text::WrapTextMode_NONE;
++                break;
++            }
++            case word::WdWrapType::wdWrapSquare:
++            {
++                eTextMode = text::WrapTextMode_PARALLEL;
++                m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SurroundContour") ), uno::makeAny( sal_False ) );
++                break;
++            }
++            case word::WdWrapType::wdWrapTight:
++            {
++                eTextMode = text::WrapTextMode_PARALLEL;
++                m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SurroundContour") ), uno::makeAny( sal_True ) );
++                break;
++            }
++            default:
++            {
++                DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
++            }
++        }
++    }
++    m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextWrap") ), uno::makeAny( eTextMode ) );
++}
++
++::sal_Int32 SAL_CALL SwVbaWrapFormat::getType() throw (uno::RuntimeException)
++{
++    sal_Int32 nType = word::WdWrapType::wdWrapSquare;
++    text::WrapTextMode eTextMode;
++    m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextWrap") )) >>= eTextMode;
++    switch( eTextMode )
++    {
++        case text::WrapTextMode_NONE:
++        {
++            nType = word::WdWrapType::wdWrapTopBottom;
++            break;
++        }
++        case text::WrapTextMode_THROUGHT:
++        {
++            nType = word::WdWrapType::wdWrapNone;
++            break;
++        }
++        case text::WrapTextMode_PARALLEL:
++        {
++            sal_Bool bContour = sal_False;
++            m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SurroundContour") )) >>= bContour;
++            if( bContour )
++                nType = word::WdWrapType::wdWrapTight;
++            else    
++                nType = word::WdWrapType::wdWrapSquare;
++            break;
++        }
++        case text::WrapTextMode_DYNAMIC:
++        case text::WrapTextMode_LEFT:
++        case text::WrapTextMode_RIGHT:
++        {
++            nType = word::WdWrapType::wdWrapThrough;
++            break;
++        }
++        default:
++        {
++            nType = word::WdWrapType::wdWrapSquare;
++        }
++    }
++    return nType;
++}
++
++void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type ) throw (uno::RuntimeException)
++{
++    mnWrapFormatType = _type;
++    makeWrap();
++}
++
++::sal_Int32 SAL_CALL SwVbaWrapFormat::getSide() throw (uno::RuntimeException)
++{
++    sal_Int32 nSide = word::WdWrapSideType::wdWrapBoth;
++    text::WrapTextMode eTextMode;
++    m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextWrap") )) >>= eTextMode;
++    switch( eTextMode )
++    {
++        case text::WrapTextMode_LEFT:
++        {
++            nSide = word::WdWrapSideType::wdWrapLeft;
++            break;
++        }
++        case text::WrapTextMode_RIGHT:
++        {
++            nSide = word::WdWrapSideType::wdWrapRight;
++            break;
++        }
++        default:
++        {
++            nSide = word::WdWrapSideType::wdWrapBoth;
++        }
++    }
++    return nSide;
++}
++
++void SAL_CALL SwVbaWrapFormat::setSide( ::sal_Int32 _side ) throw (uno::RuntimeException)
++{
++    mnSide = _side;
++    makeWrap();
++}
++
++float SwVbaWrapFormat::getDistance( const rtl::OUString& sName ) throw (uno::RuntimeException)
++{
++    sal_Int32 nDistance = 0;
++    m_xPropertySet->getPropertyValue( sName ) >>= nDistance;
++    return static_cast< float >( Millimeter::getInPoints( nDistance ) );
++}
++
++void SwVbaWrapFormat::setDistance( const rtl::OUString& sName, float _distance ) throw (uno::RuntimeException)
++{
++    sal_Int32 nDistance = Millimeter::getInHundredthsOfOneMillimeter( _distance );
++    m_xPropertySet->setPropertyValue( sName, uno::makeAny( nDistance ) );
++}
++
++float SAL_CALL SwVbaWrapFormat::getDistanceTop() throw (uno::RuntimeException)
++{
++    return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin") ) );
++}
++
++void SAL_CALL SwVbaWrapFormat::setDistanceTop( float _distancetop ) throw (uno::RuntimeException)
++{
++    setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin") ), _distancetop );
++}
++
++float SAL_CALL SwVbaWrapFormat::getDistanceBottom() throw (uno::RuntimeException)
++{
++    return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin") ) );
++}
++
++void SAL_CALL SwVbaWrapFormat::setDistanceBottom( float _distancebottom ) throw (uno::RuntimeException)
++{
++    setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin") ), _distancebottom );
++}
++
++float SAL_CALL SwVbaWrapFormat::getDistanceLeft() throw (uno::RuntimeException)
++{
++    return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin") ) );
++}
++
++void SAL_CALL SwVbaWrapFormat::setDistanceLeft( float _distanceleft ) throw (uno::RuntimeException)
++{
++    setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin") ), _distanceleft );
++}
++
++float SAL_CALL SwVbaWrapFormat::getDistanceRight() throw (uno::RuntimeException)
++{
++    return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ) );
++}
++
++void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) throw (uno::RuntimeException)
++{
++    setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ), _distanceright );
++}
++
++rtl::OUString& 
++SwVbaWrapFormat::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaWrapFormat") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaWrapFormat::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.WrapFormat" ) );
++	}
++	return aServiceNames;
++}
++
++namespace wrapformat
++{
++namespace sdecl = comphelper::service_decl;
++sdecl::vba_service_class_<SwVbaWrapFormat, sdecl::with_args<true> > serviceImpl;
++extern sdecl::ServiceDecl const serviceDecl(
++    serviceImpl,
++    "SwVbaWrapFormat",
++    "ooo.vba.word.WrapFormat" );
++}
++
++
+Index: sw/source/ui/vba/vbapane.cxx
+===================================================================
+--- sw/source/ui/vba/vbapane.cxx	(revision 0)
++++ sw/source/ui/vba/vbapane.cxx	(revision 276288)
+@@ -0,0 +1,79 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbapane.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include "vbaview.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaPane::SwVbaPane( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
++    const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) :
++    SwVbaPane_BASE( rParent, rContext ), mxModel( xModel )
++{
++}
++
++SwVbaPane::~SwVbaPane()
++{
++}
++
++uno::Any SAL_CALL
++SwVbaPane::View() throw ( css::uno::RuntimeException )
++{
++    return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this,  mxContext, mxModel ) ) );    
++}
++
++void SAL_CALL
++SwVbaPane::Close( ) throw ( css::uno::RuntimeException )
++{
++    rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseWin"));
++    dispatchRequests( mxModel,url );
++}
++
++rtl::OUString& 
++SwVbaPane::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPane") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaPane::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Pane" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbadocument.hxx
+===================================================================
+--- sw/source/ui/vba/vbadocument.hxx	(revision 0)
++++ sw/source/ui/vba/vbadocument.hxx	(revision 276288)
+@@ -0,0 +1,83 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadocument.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_DOCUMENT_HXX
++#define SW_VBA_DOCUMENT_HXX
++
++#include <ooo/vba/word/XDocument.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbadocumentbase.hxx>
++#include <com/sun/star/text/XTextDocument.hpp>
++
++typedef cppu::ImplInheritanceHelper1< VbaDocumentBase, ooo::vba::word::XDocument > SwVbaDocument_BASE;
++
++class SwVbaDocument : public SwVbaDocument_BASE
++{
++private:
++    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
++
++    void Initialize();
++    css::uno::Any getControlShape( const rtl::OUString& sName );
++    css::uno::Reference< css::container::XNameAccess > getFormControls();
++
++public:
++	SwVbaDocument( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& m_xContext, css::uno::Reference< css::frame::XModel > xModel );
++	SwVbaDocument(  css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
++	virtual ~SwVbaDocument();
++
++    // XDocument
++    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException );
++    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd ) throw ( css::uno::RuntimeException );
++    virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
++    virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
++    virtual css::uno::Any SAL_CALL getAttachedTemplate() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
++    virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
++    virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++	virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException);
++	// XInvocation
++	virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
++	virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
++	virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
++	virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_DOCUMENT_HXX */
+Index: sw/source/ui/vba/vbafind.hxx
+===================================================================
+--- sw/source/ui/vba/vbafind.hxx	(revision 0)
++++ sw/source/ui/vba/vbafind.hxx	(revision 276288)
+@@ -0,0 +1,104 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_FIND_HXX
++#define SW_VBA_FIND_HXX
++
++#include <ooo/vba/word/XFind.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/text/XTextRange.hpp>
++#include <com/sun/star/util/XReplaceable.hpp>
++#include <com/sun/star/util/XPropertyReplace.hpp>
++#include <com/sun/star/text/XTextViewCursor.hpp>
++#include <com/sun/star/text/XTextCursor.hpp>
++#include <com/sun/star/view/XSelectionSupplier.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XFind > SwVbaFind_BASE;
++
++class SwVbaFind : public SwVbaFind_BASE
++{
++private:
++    css::uno::Reference< css::frame::XModel > mxModel;
++    css::uno::Reference< css::text::XTextRange > mxTextRange;
++    css::uno::Reference< css::util::XReplaceable > mxReplaceable;
++    css::uno::Reference< css::util::XPropertyReplace> mxPropertyReplace;
++    css::uno::Reference< css::text::XTextViewCursor> mxTVC;
++    css::uno::Reference< css::view::XSelectionSupplier> mxSelSupp;
++    sal_Bool mbReplace;
++    sal_Int32 mnReplaceType;
++    sal_Int32 mnWrap;
++
++private:
++    sal_Bool InRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException );
++    sal_Bool InEqualRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException );
++    void SetReplace( sal_Int32 type );
++    void SetReplaceWith( const rtl::OUString& rText ) throw ( css::uno::RuntimeException );
++    rtl::OUString GetReplaceWith() throw ( css::uno::RuntimeException );
++    rtl::OUString ReplaceWildcards( const rtl::OUString& rText ) throw ( css::uno::RuntimeException );
++    css::uno::Reference< css::text::XTextRange > FindOneElement() throw ( css::uno::RuntimeException );
++    sal_Bool SearchReplace() throw ( css::uno::RuntimeException );
++
++public:
++	SwVbaFind( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaFind();
++
++    // Attributes
++    virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setForward( ::sal_Bool _forward ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getWrap() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getFormat() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setFormat( ::sal_Bool _format ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getMatchCase() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMatchCase( ::sal_Bool _matchcase ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getMatchWholeWord() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getMatchWildcards() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMatchWildcards( ::sal_Bool _matchwildcards ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getMatchSoundsLike() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getMatchAllWordForms() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException);
++
++    // Methods
++    virtual ::sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL ClearFormatting(  ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_FIND_HXX */
+Index: sw/source/ui/vba/makefile.mk
+===================================================================
+--- sw/source/ui/vba/makefile.mk	(revision 0)
++++ sw/source/ui/vba/makefile.mk	(revision 276288)
+@@ -0,0 +1,111 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.6 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..
++
++PRJNAME=sw
++TARGET=vbaswobj
++ENABLE_EXCEPTIONS=TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++DLLPRE =
++
++.IF "$(ENABLE_VBA)"!="YES"
++dummy:
++        @echo "not building vba..."
++.ENDIF
++ 
++INCPRE=$(INCCOM)$/$(TARGET)
++CDEFS+=-DVBA_OOBUILD_HACK
++# ------------------------------------------------------------------
++
++SLOFILES= \
++		$(SLO)$/vbaglobals.obj \
++		$(SLO)$/vbaapplication.obj \
++		$(SLO)$/vbadocument.obj \
++		$(SLO)$/vbawindow.obj \
++		$(SLO)$/vbasystem.obj \
++		$(SLO)$/vbarangehelper.obj \
++		$(SLO)$/vbarange.obj \
++		$(SLO)$/vbabookmark.obj \
++		$(SLO)$/vbabookmarks.obj \
++		$(SLO)$/vbavariable.obj \
++		$(SLO)$/vbavariables.obj \
++		$(SLO)$/vbaview.obj \
++		$(SLO)$/wordvbahelper.obj \
++				$(SLO)$/service.obj \
++				$(SLO)$/vbadocumentproperties.obj \
++				$(SLO)$/vbapane.obj \
++				$(SLO)$/vbapanes.obj \
++				$(SLO)$/vbaoptions.obj \
++				$(SLO)$/vbaselection.obj \
++ 				$(SLO)$/vbatemplate.obj \
++				$(SLO)$/vbaparagraphformat.obj \
++				$(SLO)$/vbaautotextentry.obj \
++				$(SLO)$/vbaparagraph.obj \
++				$(SLO)$/vbafind.obj \
++				$(SLO)$/vbareplacement.obj \
++				$(SLO)$/vbastyle.obj \
++				$(SLO)$/vbastyles.obj \
++				$(SLO)$/vbafont.obj \
++				$(SLO)$/vbapalette.obj \
++				$(SLO)$/vbainformationhelper.obj \
++				$(SLO)$/vbatable.obj \
++				$(SLO)$/vbatables.obj \
++				$(SLO)$/vbafield.obj \
++				$(SLO)$/vbaborders.obj \
++				$(SLO)$/vbadocuments.obj \
++				$(SLO)$/vbaheaderfooter.obj \
++				$(SLO)$/vbaheaderfooterhelper.obj \
++				$(SLO)$/vbaaddin.obj \
++				$(SLO)$/vbaaddins.obj \
++				$(SLO)$/vbadialogs.obj \
++				$(SLO)$/vbadialog.obj \
++				$(SLO)$/vbawrapformat.obj \
++				$(SLO)$/vbapagesetup.obj \
++				$(SLO)$/vbasection.obj \
++				$(SLO)$/vbasections.obj \
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :	target.mk
++
++ALLTAR : \
++        $(MISC)$/$(TARGET).don \
++
++$(SLOFILES) : $(MISC)$/$(TARGET).don
++
++$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++        echo $@
++
+Index: sw/source/ui/vba/vbavariable.hxx
+===================================================================
+--- sw/source/ui/vba/vbavariable.hxx	(revision 0)
++++ sw/source/ui/vba/vbavariable.hxx	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_VARIABLE_HXX
++#define SW_VBA_VARIABLE_HXX
++
++#include <ooo/vba/word/XVariable.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/beans/XPropertyAccess.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XVariable > SwVbaVariable_BASE;
++
++class SwVbaVariable : public SwVbaVariable_BASE
++{
++private:
++    css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined;
++    rtl::OUString maName;
++
++public:
++	SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
++        const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaVariable();
++
++   // XVariable
++    virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException );
++    virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException );
++    virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException );
++    virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException );
++    virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException );
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_VARIABLE_HXX */
+Index: sw/source/ui/vba/vbapagesetup.cxx
+===================================================================
+--- sw/source/ui/vba/vbapagesetup.cxx	(revision 0)
++++ sw/source/ui/vba/vbapagesetup.cxx	(revision 276288)
+@@ -0,0 +1,275 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbapagesetup.hxx"
++#include <com/sun/star/text/XText.hpp>
++#include <com/sun/star/text/XPageCursor.hpp>
++#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
++#include <ooo/vba/word/WdSectionStart.hpp>
++#include <ooo/vba/word/WdOrientation.hpp>
++#include "wordvbahelper.hxx"
++
++using namespace ::com::sun::star;
++using namespace ::ooo::vba;
++
++SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent, 
++				const uno::Reference< uno::XComponentContext >& xContext,
++				const uno::Reference< frame::XModel >& xModel,
++                const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException):
++	   	SwVbaPageSetup_BASE( xParent, xContext )
++{
++    mxModel.set( xModel, uno::UNO_QUERY_THROW );
++    mxPageProps.set( xProps, uno::UNO_QUERY_THROW );
++    mnOrientPortrait = word::WdOrientation::wdOrientPortrait;
++    mnOrientLandscape = word::WdOrientation::wdOrientLandscape;
++}		
++
++double SAL_CALL SwVbaPageSetup::getGutter() throw (uno::RuntimeException)
++{
++    // not support in Writer
++    return 0;
++}
++
++void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeException)
++{
++    // default add gutter into left margin
++    if( _gutter != 0 )
++    {
++        double margin = VbaPageSetupBase::getLeftMargin() + _gutter;
++        VbaPageSetupBase::setLeftMargin( margin );
++    }
++}
++
++double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException)
++{
++    sal_Bool isHeaderOn = sal_False;
++    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isHeaderOn;
++    if( !isHeaderOn )
++        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")), uno::makeAny( sal_True ) );
++    return VbaPageSetupBase::getHeaderMargin();
++}
++
++    /**
++     * changes the value of TopMargin to the value of new MS-Word-HeaderDistance. Subtracts the difference
++     * between old TopMargin and the new headerDistance from the value of HeaderSpacing (which defines the
++     * space between the header and the body of the text). calculates the new HeaderHeight (= height of the
++     * header + headerBodyDistance).
++     *
++     * @param: headerDistance is the value that is set in MS Word for the distance from the top of the page
++     *          to the header
++     */
++void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw (uno::RuntimeException)
++{
++    sal_Int32 newHeaderDistance = Millimeter::getInHundredthsOfOneMillimeter( _headerdistance );
++    sal_Bool isHeaderOn = sal_False;
++    sal_Int32 aktTopMargin = 0;
++    sal_Int32 aktSpacing = 0;
++    sal_Int32 aktHeaderHeight = 0;
++
++    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isHeaderOn;
++    if( !isHeaderOn )
++        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")), uno::makeAny( sal_True ) );
++        
++    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin"))) >>= aktTopMargin;
++    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance"))) >>= aktSpacing;
++    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight"))) >>= aktHeaderHeight;
++
++    sal_Int32 newSpacing = aktSpacing - ( newHeaderDistance - aktTopMargin );
++    sal_Int32 height = aktHeaderHeight - aktSpacing;
++    sal_Int32 newHeaderHeight = newSpacing + height;
++
++    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")), uno::makeAny( newHeaderDistance ) );
++    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance")), uno::makeAny( newSpacing ) );
++    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")), uno::makeAny( newHeaderHeight ) );
++}
++
++double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException)
++{
++    sal_Bool isFooterOn = sal_False;
++    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isFooterOn;
++    if( !isFooterOn )
++        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")), uno::makeAny( sal_True ) );
++    return VbaPageSetupBase::getFooterMargin();
++}
++
++void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw (uno::RuntimeException)
++{
++    sal_Int32 newFooterDistance = Millimeter::getInHundredthsOfOneMillimeter( _footerdistance );
++    sal_Bool isFooterOn = sal_False;
++    sal_Int32 aktBottomMargin = 0;
++    sal_Int32 aktSpacing = 0;
++    sal_Int32 aktFooterHeight = 0;
++
++    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isFooterOn;
++    if( !isFooterOn )
++        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")), uno::makeAny( sal_True ) );
++        
++    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin"))) >>= aktBottomMargin;
++    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance"))) >>= aktSpacing;
++    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight"))) >>= aktFooterHeight;
++
++    sal_Int32 newSpacing = aktSpacing - ( newFooterDistance - aktBottomMargin );
++    sal_Int32 height = aktFooterHeight - aktSpacing;
++    sal_Int32 newFooterHeight = newSpacing + height;
++
++    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), uno::makeAny( newFooterDistance ) );
++    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance")), uno::makeAny( newSpacing ) );
++    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight")), uno::makeAny( newFooterHeight ) );
++}
++
++sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() throw (uno::RuntimeException)
++{
++    rtl::OUString pageStyle = getStyleOfFirstPage();
++    if( pageStyle.equalsAscii( "First Page" ) )
++        return sal_True;
++
++    return sal_False;
++}
++
++void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (uno::RuntimeException)
++{
++    if( status == getDifferentFirstPageHeaderFooter() )
++        return;
++
++    rtl::OUString newStyle;
++    if( status )
++        newStyle = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("First Page") );
++    else
++        newStyle = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") );
++
++    uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
++    sal_Int32 nTopMargin = 0;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin"))) >>= nTopMargin;
++    sal_Int32 nBottomMargin = 0;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin"))) >>= nBottomMargin;
++    sal_Int32 nLeftMargin = 0;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin"))) >>= nLeftMargin;
++    sal_Int32 nRightMargin = 0;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin"))) >>= nRightMargin;
++    sal_Int32 nHeaderHeight = 0;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight"))) >>= nHeaderHeight;
++    sal_Int32 nFooterHeight = 0;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight"))) >>= nFooterHeight;
++
++    sal_Bool isHeaderOn = sal_False;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isHeaderOn;
++    if( isHeaderOn )
++    {
++        nTopMargin += nHeaderHeight;
++        nBottomMargin += nFooterHeight;
++        xStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")), uno::makeAny( sal_False ) );
++        xStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")), uno::makeAny( sal_False ) );
++    }
++    uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW );
++    if( xPageCursor->getPage() != 1 )
++    {
++        xPageCursor->jumpToFirstPage();
++    }
++
++    uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW );
++    uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ), uno::UNO_QUERY );
++    if( xTableProps.is() )
++    {
++        xTableProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ), uno::makeAny( newStyle ) );
++    }
++    else
++    {
++        xCursorProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ), uno::makeAny( newStyle ) );
++    }
++
++    uno::Reference< beans::XPropertySet > xFirstPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
++    xFirstPageProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin") ), uno::makeAny( nTopMargin ) );
++    xFirstPageProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin") ), uno::makeAny( nBottomMargin ) );
++    xFirstPageProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin") ), uno::makeAny( nLeftMargin ) );
++    xFirstPageProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ), uno::makeAny( nRightMargin ) );
++}
++
++rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException)
++{
++    rtl::OUString styleFirstPage;
++    uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW );
++    if( xPageCursor->getPage() != 1 )
++    {
++        xPageCursor->jumpToFirstPage();
++    }
++
++    uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW );
++    uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ), uno::UNO_QUERY );
++    if( xTableProps.is() )
++    {
++        xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ) ) >>= styleFirstPage;
++    }
++    else
++    {
++        xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ) ) >>= styleFirstPage;
++    }
++    return styleFirstPage;
++}
++
++::sal_Int32 SAL_CALL SwVbaPageSetup::getSectionStart() throw (uno::RuntimeException)
++{
++    // FIXME:
++    sal_Int32 wdSectionStart = word::WdSectionStart::wdSectionNewPage;
++    uno::Reference< container::XNamed > xNamed( mxPageProps, uno::UNO_QUERY_THROW );
++    rtl::OUString sStyleName = xNamed->getName();
++    //mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= sStyleName;
++    if( sStyleName.equalsAscii("Left Page") )
++        wdSectionStart = word::WdSectionStart::wdSectionEvenPage;
++    else if( sStyleName.equalsAscii("Right Page") )
++        wdSectionStart = word::WdSectionStart::wdSectionOddPage;
++    else
++        wdSectionStart = word::WdSectionStart::wdSectionNewPage;
++    return wdSectionStart;    
++}
++
++void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 _sectionstart ) throw (uno::RuntimeException)
++{
++    // fail to find corresponding feature in Writer
++    // #FIXME:
++}
++
++rtl::OUString& 
++SwVbaPageSetup::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPageSetup") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaPageSetup::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.PageSetup" ) );
++	}
++	return aServiceNames;
++}
+Index: sw/source/ui/vba/vbabookmarks.hxx
+===================================================================
+--- sw/source/ui/vba/vbabookmarks.hxx	(revision 0)
++++ sw/source/ui/vba/vbabookmarks.hxx	(revision 276288)
+@@ -0,0 +1,78 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_BOOKMARKS_HXX
++#define SW_VBA_BOOKMARKS_HXX
++
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <ooo/vba/word/XBookmarks.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <com/sun/star/container/XIndexAccess.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/text/XBookmarksSupplier.hpp>
++#include <com/sun/star/text/XTextRange.hpp>
++#include <com/sun/star/text/XText.hpp>
++
++typedef CollTestImplHelper< ooo::vba::word::XBookmarks > SwVbaBookmarks_BASE;
++
++class SwVbaBookmarks : public SwVbaBookmarks_BASE
++{
++private:
++	css::uno::Reference< css::frame::XModel > mxModel;
++    css::uno::Reference< css::text::XBookmarksSupplier > mxBookmarksSupplier;
++    css::uno::Reference< css::text::XText > mxText;
++
++private:
++    void removeBookmarkByName( const rtl::OUString& rName ) throw (css::uno::RuntimeException);
++    void addBookmarkByName( const rtl::OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException);
++
++public:
++	SwVbaBookmarks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xBookmarks, const css::uno::Reference< css::frame::XModel >& xModel );
++	virtual ~SwVbaBookmarks() {}
++
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++	// SwVbaBookmarks_BASE
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++
++	// XBookmarks
++    virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) throw (css::uno::RuntimeException);
++    virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException);
++
++	virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException);
++    virtual sal_Bool SAL_CALL Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException);
++};    
++
++#endif /* SW_VBA_BOOKMARKS_HXX */
+Index: sw/source/ui/vba/vbaborders.cxx
+===================================================================
+--- sw/source/ui/vba/vbaborders.cxx	(revision 0)
++++ sw/source/ui/vba/vbaborders.cxx	(revision 276288)
+@@ -0,0 +1,381 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbaborders.cxx,v $
++ * $Revision: 1.6 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaborders.hxx"
++#include <ooo/vba/word/XBorder.hpp>
++#include <ooo/vba/word/WdBorderType.hpp>
++#include <ooo/vba/word/WdLineStyle.hpp>
++#include <cppuhelper/implbase3.hxx>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/table/TableBorder.hpp>
++#include <com/sun/star/table/ShadowFormat.hpp>
++#include <com/sun/star/table/ShadowLocation.hpp>
++#include "vbapalette.hxx"
++
++using namespace ::com::sun::star;
++using namespace ::ooo::vba;
++
++
++typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangeBorders_Base;
++typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base;
++
++// #TODO sort these indexes to match the order in which Word iterates over the
++// borders, the enumeration will match the order in this list
++static const sal_Int16 supportedIndexTable[] = { word::WdBorderType::wdBorderBottom, word::WdBorderType::wdBorderDiagonalDown, word::WdBorderType::wdBorderDiagonalUp, word::WdBorderType::wdBorderHorizontal, word::WdBorderType::wdBorderLeft, word::WdBorderType::wdBorderRight, word::WdBorderType::wdBorderTop, word::WdBorderType::wdBorderVertical };
++
++const static rtl::OUString sTableBorder( RTL_CONSTASCII_USTRINGPARAM("TableBorder") );
++
++//  Equiv widths in in 1/100 mm
++const static sal_Int32 OOLineThin = 35;
++const static sal_Int32 OOLineMedium = 88;
++const static sal_Int32 OOLineThick = 141;
++const static sal_Int32 OOLineHairline = 2;
++
++class SwVbaBorder : public SwVbaBorder_Base
++{
++private:
++	uno::Reference< beans::XPropertySet > m_xProps;
++	sal_Int32 m_LineType;	
++	VbaPalette m_Palette;
++	bool setBorderLine( table::BorderLine& rBorderLine )
++	{
++		table::TableBorder aTableBorder;
++		m_xProps->getPropertyValue( sTableBorder ) >>= aTableBorder;
++
++		switch ( m_LineType )
++		{
++			case word::WdBorderType::wdBorderLeft:
++				aTableBorder.IsLeftLineValid = sal_True;
++				aTableBorder.LeftLine= rBorderLine;
++				break;
++			case word::WdBorderType::wdBorderTop:
++				aTableBorder.IsTopLineValid = sal_True;
++				aTableBorder.TopLine = rBorderLine;
++				break;
++			
++			case word::WdBorderType::wdBorderBottom:
++				aTableBorder.IsBottomLineValid = sal_True;
++				aTableBorder.BottomLine = rBorderLine;
++				break;
++			case word::WdBorderType::wdBorderRight:
++				aTableBorder.IsRightLineValid = sal_True;
++				aTableBorder.RightLine = rBorderLine;
++				break;
++			case word::WdBorderType::wdBorderVertical:
++				aTableBorder.IsVerticalLineValid = sal_True;
++				aTableBorder.VerticalLine = rBorderLine;
++				break;
++			case word::WdBorderType::wdBorderHorizontal:
++				aTableBorder.IsHorizontalLineValid = sal_True;
++				aTableBorder.HorizontalLine = rBorderLine;
++				break;
++			case word::WdBorderType::wdBorderDiagonalDown:
++			case word::WdBorderType::wdBorderDiagonalUp:
++				// #TODO have to ignore at the momement, would be
++				// nice to investigate what we can do here
++				break; 
++			default:
++					return false;
++		}
++		m_xProps->setPropertyValue( sTableBorder, uno::makeAny(aTableBorder) );
++		return true;
++	}	
++
++	bool getBorderLine( table::BorderLine& rBorderLine )
++	{
++		table::TableBorder aTableBorder;
++		m_xProps->getPropertyValue( sTableBorder ) >>= aTableBorder;
++		switch ( m_LineType )
++		{
++			case word::WdBorderType::wdBorderLeft:
++				if ( aTableBorder.IsLeftLineValid )
++					rBorderLine = aTableBorder.LeftLine;
++				break;
++			case word::WdBorderType::wdBorderTop:
++				if ( aTableBorder.IsTopLineValid )
++					rBorderLine = aTableBorder.TopLine;
++				break;
++			case word::WdBorderType::wdBorderBottom:
++				if ( aTableBorder.IsBottomLineValid )
++					rBorderLine = aTableBorder.BottomLine;
++				break;
++			case word::WdBorderType::wdBorderRight:
++				if ( aTableBorder.IsRightLineValid )
++					rBorderLine = aTableBorder.RightLine;
++				break;
++			case word::WdBorderType::wdBorderVertical:
++                if ( aTableBorder.IsVerticalLineValid )
++                    rBorderLine = aTableBorder.VerticalLine;
++				break;
++			case word::WdBorderType::wdBorderHorizontal:
++                if ( aTableBorder.IsHorizontalLineValid )
++                    rBorderLine = aTableBorder.HorizontalLine;
++				break;
++
++			case word::WdBorderType::wdBorderDiagonalDown:
++			case word::WdBorderType::wdBorderDiagonalUp:
++				// #TODO have to ignore at the momement, would be
++				// nice to investigate what we can do here
++				break; 
++			default:
++					return false;
++		}
++		return true;
++	}	
++	SwVbaBorder(); // no impl
++protected: 
++	virtual rtl::OUString& getServiceImplName()
++	{
++		static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBorder") );
++	return sImplName;		
++	}
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames()
++	{
++		static uno::Sequence< rtl::OUString > aServiceNames;
++		if ( aServiceNames.getLength() == 0 )
++		{
++			aServiceNames.realloc( 1 );
++			aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Border" ) );
++		}
++		return aServiceNames;		
++	}
++public:
++	SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, VbaPalette& rPalette) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {}  	
++
++	uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException)
++	{
++        sal_Int32 nLineStyle = word::WdLineStyle::wdLineStyleNone;
++        table::BorderLine aBorderLine;
++        if ( getBorderLine( aBorderLine ) )
++        {
++            if( aBorderLine.InnerLineWidth !=0 && aBorderLine.OuterLineWidth !=0 )
++            {
++                nLineStyle = word::WdLineStyle::wdLineStyleDouble;
++            }
++            else if( aBorderLine.InnerLineWidth !=0 || aBorderLine.OuterLineWidth !=0 )
++            {
++                nLineStyle = word::WdLineStyle::wdLineStyleSingle;
++            }
++            else
++            {
++                nLineStyle = word::WdLineStyle::wdLineStyleNone;
++            }
++        }
++		return uno::makeAny( nLineStyle );
++	}
++	void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException) 
++	{
++		// Urk no choice but to silently ignore we don't support this attribute
++		// #TODO would be nice to support the word line styles
++        sal_Int32 nLineStyle = 0;
++        _linestyle >>= nLineStyle;
++        table::BorderLine aBorderLine;
++		if ( getBorderLine( aBorderLine ) )
++		{
++			switch ( nLineStyle )
++			{
++                case word::WdLineStyle::wdLineStyleNone:
++                {
++                    aBorderLine.InnerLineWidth = 0;
++                    aBorderLine.OuterLineWidth = 0;
++                    break;
++                }
++                case word::WdLineStyle::wdLineStyleDashDot:
++                case word::WdLineStyle::wdLineStyleDashDotDot:
++                case word::WdLineStyle::wdLineStyleDashDotStroked:
++                case word::WdLineStyle::wdLineStyleDashLargeGap:
++                case word::WdLineStyle::wdLineStyleDashSmallGap:
++                case word::WdLineStyle::wdLineStyleDot:
++                case word::WdLineStyle::wdLineStyleDouble:
++                case word::WdLineStyle::wdLineStyleDoubleWavy:
++                case word::WdLineStyle::wdLineStyleEmboss3D:
++                case word::WdLineStyle::wdLineStyleEngrave3D:
++                case word::WdLineStyle::wdLineStyleInset:
++                case word::WdLineStyle::wdLineStyleOutset:
++                case word::WdLineStyle::wdLineStyleSingle:
++                case word::WdLineStyle::wdLineStyleSingleWavy:
++                case word::WdLineStyle::wdLineStyleThickThinLargeGap:
++                case word::WdLineStyle::wdLineStyleThickThinMedGap:
++                case word::WdLineStyle::wdLineStyleThickThinSmallGap:
++                case word::WdLineStyle::wdLineStyleThinThickLargeGap:
++                case word::WdLineStyle::wdLineStyleThinThickMedGap:
++                case word::WdLineStyle::wdLineStyleThinThickSmallGap:
++                case word::WdLineStyle::wdLineStyleThinThickThinLargeGap:
++                case word::WdLineStyle::wdLineStyleThinThickThinMedGap:
++                case word::WdLineStyle::wdLineStyleThinThickThinSmallGap:
++                case word::WdLineStyle::wdLineStyleTriple:
++                {
++                    aBorderLine.InnerLineWidth = 0;
++                    aBorderLine.OuterLineWidth = OOLineHairline;
++                    break;
++                }
++                default:
++                    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bad param" ) ), uno::Reference< uno::XInterface >() );
++            }
++			setBorderLine( aBorderLine );
++        }
++		else
++            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() );
++	}
++};
++
++class RangeBorders : public RangeBorders_Base
++{
++private:
++	uno::Reference< table::XCellRange > m_xRange;
++	uno::Reference< uno::XComponentContext > m_xContext;
++	VbaPalette m_Palette;
++	sal_Int32 getTableIndex( sal_Int32 nConst )
++	{
++		// hokay return position of the index in the table
++		sal_Int32 nIndexes = getCount();
++		sal_Int32 realIndex = 0;
++		const sal_Int16* pTableEntry = supportedIndexTable;
++		for ( ; realIndex < nIndexes; ++realIndex, ++pTableEntry )
++		{
++			if ( *pTableEntry == nConst )
++				return realIndex;
++		}
++		return getCount(); // error condition
++	}
++public:
++	RangeBorders(  const uno::Reference< table::XCellRange >& xRange,  const uno::Reference< uno::XComponentContext > & xContext, VbaPalette& rPalette ) : m_xRange( xRange ), m_xContext( xContext ), m_Palette( rPalette )
++	{
++	}
++	// XIndexAccess 
++	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
++	{
++		return sizeof( supportedIndexTable ) / sizeof( supportedIndexTable[0] );
++	}
++	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) 
++	{
++			
++		sal_Int32 nIndex = getTableIndex( Index );
++		if ( nIndex >= 0 && nIndex < getCount() )
++		{
++			uno::Reference< beans::XPropertySet > xProps( m_xRange, uno::UNO_QUERY_THROW );
++			return uno::makeAny( uno::Reference< word::XBorder >( new SwVbaBorder( xProps, m_xContext, supportedIndexTable[ nIndex ], m_Palette )) );
++		}
++		throw lang::IndexOutOfBoundsException();
++	}
++	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
++	{
++		return  word::XBorder::static_type(0);
++	}
++	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
++	{
++		return sal_True;
++	}
++};
++
++uno::Reference< container::XIndexAccess > 
++rangeToBorderIndexAccess( const uno::Reference< table::XCellRange >& xRange,  const uno::Reference< uno::XComponentContext > & xContext, VbaPalette& rPalette )
++{
++	return new RangeBorders( xRange, xContext, rPalette );
++}
++
++class RangeBorderEnumWrapper : public EnumerationHelper_BASE
++{
++	uno::Reference<container::XIndexAccess > m_xIndexAccess;
++	sal_Int32 nIndex;
++public:
++	RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
++	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
++	{
++		return ( nIndex < m_xIndexAccess->getCount() );
++	}
++
++	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++	{
++		if ( nIndex < m_xIndexAccess->getCount() )
++			return m_xIndexAccess->getByIndex( nIndex++ );
++		throw container::NoSuchElementException();
++	}
++};
++
++// for Table borders
++SwVbaBorders::SwVbaBorders( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< table::XCellRange >& xRange, VbaPalette& rPalette  ):  SwVbaBorders_BASE( xParent, xContext, rangeToBorderIndexAccess( xRange ,xContext, rPalette ) )
++{
++	m_xProps.set( xRange, uno::UNO_QUERY_THROW );
++}
++
++uno::Reference< container::XEnumeration >
++SwVbaBorders::createEnumeration() throw (uno::RuntimeException)
++{
++	return new RangeBorderEnumWrapper( m_xIndexAccess );
++}
++
++uno::Any
++SwVbaBorders::createCollectionObject( const css::uno::Any& aSource )
++{
++	return aSource; // its already a Border object
++}
++
++uno::Type 
++SwVbaBorders::getElementType() throw (uno::RuntimeException)
++{
++	return word::XBorders::static_type(0);
++}
++
++uno::Any
++SwVbaBorders::getItemByIntIndex( const sal_Int32 nIndex )  throw (uno::RuntimeException)
++{
++	return createCollectionObject( m_xIndexAccess->getByIndex( nIndex ) );
++}
++
++sal_Bool SAL_CALL SwVbaBorders::getShadow() throw (uno::RuntimeException)
++{
++    table::ShadowFormat aShadowFormat;
++    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShadowFormat") ) ) >>= aShadowFormat;
++    return ( aShadowFormat.Location != table::ShadowLocation_NONE );
++}
++
++void SAL_CALL SwVbaBorders::setShadow( sal_Bool _shadow ) throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++rtl::OUString& 
++SwVbaBorders::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBorders") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaBorders::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Borders" ) );
++	}
++	return aServiceNames;
++}
+Index: sw/source/ui/vba/vbarange.hxx
+===================================================================
+--- sw/source/ui/vba/vbarange.hxx	(revision 0)
++++ sw/source/ui/vba/vbarange.hxx	(revision 276288)
+@@ -0,0 +1,93 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_RANGE_HXX
++#define SW_VBA_RANGE_HXX
++
++#include <ooo/vba/word/XRange.hpp>
++#include <ooo/vba/word/XParagraphFormat.hpp>
++#include <ooo/vba/word/XFont.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/text/XTextRange.hpp>
++#include <com/sun/star/text/XTextDocument.hpp>
++#include <ooo/vba/word/XStyle.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XRange > SwVbaRange_BASE;
++
++class SwVbaRange : public SwVbaRange_BASE
++{
++private:
++    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
++    css::uno::Reference< css::text::XTextCursor > mxTextCursor;
++    css::uno::Reference< css::text::XText > mxText;
++    sal_Bool mbMaySpanEndOfDocument;
++
++private:
++    void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::uno::RuntimeException);
++public:
++	SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
++	SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
++	SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
++	virtual ~SwVbaRange();
++   css::uno::Reference< css::text::XTextDocument > getDocument() { return mxTextDocument; }
++    
++    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException);
++    void setXTextRange( const css::uno::Reference< css::text::XTextRange >& xRange ) throw (css::uno::RuntimeException);
++    css::uno::Reference< css::text::XText > getXText() { return mxText; }
++    void setXTextCursor( const css::uno::Reference< css::text::XTextCursor >& xTextCursor ) { mxTextCursor = xTextCursor; }
++
++	// Attribute
++    virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XStyle > SAL_CALL getStyle() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setStyle( const css::uno::Reference< ooo::vba::word::XStyle >& _xStyle ) throw (css::uno::RuntimeException);
++
++    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException);
++    // Methods
++    virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL Select() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getLanguageID() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_RANGE_HXX */
+Index: sw/source/ui/vba/vbadialog.hxx
+===================================================================
+--- sw/source/ui/vba/vbadialog.hxx	(revision 0)
++++ sw/source/ui/vba/vbadialog.hxx	(revision 276288)
+@@ -0,0 +1,53 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadialog.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_DIALOG_HXX
++#define SW_VBA_DIALOG_HXX
++
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/word/XDialog.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbadialogbase.hxx>
++
++typedef cppu::ImplInheritanceHelper1< VbaDialogBase, ov::word::XDialog > SwVbaDialog_BASE;
++
++class SwVbaDialog : public SwVbaDialog_BASE
++{
++public:
++	SwVbaDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nIndex ):SwVbaDialog_BASE( xParent, xContext, xModel, nIndex ) {}
++	virtual ~SwVbaDialog() {}
++
++	// Methods
++	virtual rtl::OUString mapIndexToName( sal_Int32 nIndex );
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif /* SW_VBA_DIALOG_HXX */
+Index: sw/source/ui/vba/vbaautotextentry.hxx
+===================================================================
+--- sw/source/ui/vba/vbaautotextentry.hxx	(revision 0)
++++ sw/source/ui/vba/vbaautotextentry.hxx	(revision 276288)
+@@ -0,0 +1,83 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_AUTOTEXTENTRY_HXX
++#define SW_VBA_AUTOTEXTENTRY_HXX
++
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <ooo/vba/word/XAutoTextEntries.hpp>
++#include <ooo/vba/word/XAutoTextEntry.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/word/XRange.hpp>
++#include <com/sun/star/text/XAutoTextEntry.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XAutoTextEntry > SwVbaAutoTextEntry_BASE;
++
++class SwVbaAutoTextEntry : public SwVbaAutoTextEntry_BASE
++{
++private:
++    css::uno::Reference< css::text::XAutoTextEntry > mxEntry;
++
++public:
++	SwVbaAutoTextEntry( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XAutoTextEntry >& xEntry ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaAutoTextEntry();
++
++    // XAutoTextEntry
++    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException );
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++
++/* class SwVbaAutoTextEntries */
++typedef CollTestImplHelper< ooo::vba::word::XAutoTextEntries > SwVbaAutoTextEntries_BASE;
++
++class SwVbaAutoTextEntries : public SwVbaAutoTextEntries_BASE
++{
++private:
++    css::uno::Reference< css::container::XIndexAccess > mxAutoTextEntryAccess;
++
++public:
++	SwVbaAutoTextEntries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw (css::uno::RuntimeException);
++	virtual ~SwVbaAutoTextEntries() {}
++
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++	// SwVbaAutoTextEntries_BASE
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};    
++
++#endif /* SW_VBA_AUTOTEXTENTRY_HXX */
+Index: sw/source/ui/vba/vbapanes.cxx
+===================================================================
+--- sw/source/ui/vba/vbapanes.cxx	(revision 0)
++++ sw/source/ui/vba/vbapanes.cxx	(revision 276288)
+@@ -0,0 +1,127 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbapanes.hxx"
++#include "vbapane.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++// I assume there is only one pane in Writer
++typedef ::cppu::WeakImplHelper1<container::XIndexAccess > PanesIndexAccess_Base;
++class PanesIndexAccess : public PanesIndexAccess_Base
++{
++private:
++    uno::Reference< XHelperInterface > mxParent;
++    uno::Reference< uno::XComponentContext > mxContext;
++    uno::Reference< frame::XModel > mxModel;
++
++public:
++    PanesIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) {}
++    ~PanesIndexAccess(){}
++
++    // XIndexAccess
++    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
++    {
++        return 1;
++    }
++    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        if( Index != 1 )
++            throw container::NoSuchElementException();
++        return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent,  mxContext, mxModel ) ) );    
++    }
++    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
++    {
++        return word::XPane::static_type(0);
++    }
++    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
++    {
++        return sal_True;
++    }
++};
++
++class PanesEnumWrapper : public EnumerationHelper_BASE
++{
++	uno::Reference<container::XIndexAccess > m_xIndexAccess;
++	sal_Int32 nIndex;
++public:
++	PanesEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
++	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
++	{
++		return ( nIndex < m_xIndexAccess->getCount() );
++	}
++
++	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++	{
++		if ( nIndex < m_xIndexAccess->getCount() )
++			return m_xIndexAccess->getByIndex( nIndex++ );
++		throw container::NoSuchElementException();
++	}
++};
++
++SwVbaPanes::SwVbaPanes( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ): SwVbaPanes_BASE( xParent, xContext, new PanesIndexAccess( xParent, xContext, xModel ) ),  mxModel( xModel )
++{
++}
++// XEnumerationAccess
++uno::Type
++SwVbaPanes::getElementType() throw (uno::RuntimeException)
++{
++	return word::XPane::static_type(0);
++}
++uno::Reference< container::XEnumeration >
++SwVbaPanes::createEnumeration() throw (uno::RuntimeException)
++{
++    return new PanesEnumWrapper( m_xIndexAccess );
++}
++
++uno::Any
++SwVbaPanes::createCollectionObject( const css::uno::Any& aSource )
++{
++    return aSource;
++}
++
++rtl::OUString& 
++SwVbaPanes::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPanes") );
++	return sImplName;
++}
++
++css::uno::Sequence<rtl::OUString> 
++SwVbaPanes::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > sNames;
++	if ( sNames.getLength() == 0 )
++	{
++		sNames.realloc( 1 );
++		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Panes") );
++	}
++	return sNames;
++}
+Index: sw/source/ui/vba/service.cxx
+===================================================================
+--- sw/source/ui/vba/service.cxx	(revision 0)
++++ sw/source/ui/vba/service.cxx	(revision 276288)
+@@ -0,0 +1,87 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: service.cxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "cppuhelper/implementationentry.hxx"
++#include "com/sun/star/lang/XMultiServiceFactory.hpp"
++#include "com/sun/star/registry/XRegistryKey.hpp"
++#include "comphelper/servicedecl.hxx"
++
++// =============================================================================
++// component exports
++// =============================================================================
++using namespace ::com::sun::star;
++using namespace ::com::sun::star::uno;
++
++namespace sdecl = comphelper::service_decl;
++
++namespace globals
++{
++extern sdecl::ServiceDecl const serviceDecl;
++}
++
++namespace document
++{
++extern sdecl::ServiceDecl const serviceDecl;
++}
++
++namespace wrapformat
++{
++extern sdecl::ServiceDecl const serviceDecl;
++}
++
++extern "C"
++{
++    void SAL_CALL component_getImplementationEnvironment( 
++        const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
++    {
++		OSL_TRACE("In component_getImplementationEnv");
++        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
++    }
++
++    sal_Bool SAL_CALL component_writeInfo( 
++        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
++    {
++		OSL_TRACE("In component_writeInfo");
++
++	// Component registration
++        return component_writeInfoHelper( pServiceManager, pRegistryKey, 
++		globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl  ); 
++    }
++
++    void * SAL_CALL component_getFactory( 
++        const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
++        registry::XRegistryKey * pRegistryKey )
++    {
++		OSL_TRACE("In component_getFactory for %s", pImplName );
++	void* pRet =  component_getFactoryHelper(
++        	pImplName, pServiceManager, pRegistryKey, globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl );
++	OSL_TRACE("Ret is 0x%x", pRet);
++	return pRet;
++    }
++}
+Index: sw/source/ui/vba/vbaheaderfooter.cxx
+===================================================================
+--- sw/source/ui/vba/vbaheaderfooter.cxx	(revision 0)
++++ sw/source/ui/vba/vbaheaderfooter.cxx	(revision 276288)
+@@ -0,0 +1,114 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaheaderfooter.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include <ooo/vba/word/WdHeaderFooterIndex.hpp>
++#include <com/sun/star/text/XText.hpp>
++#include <com/sun/star/text/XTextDocument.hpp>
++#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
++#include "vbarange.hxx"
++#include <vbahelper/vbashapes.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaHeaderFooter::SwVbaHeaderFooter( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rProps, sal_Bool isHeader, sal_Int32 index ) throw ( uno::RuntimeException ) : SwVbaHeaderFooter_BASE( rParent, rContext ), mxModel( xModel ), mxPageStyleProps( rProps ), mbHeader( isHeader ), mnIndex( index )
++{
++}
++
++sal_Bool SAL_CALL SwVbaHeaderFooter::getIsHeader() throw (uno::RuntimeException)
++{
++    return mbHeader;
++}
++
++sal_Bool SAL_CALL SwVbaHeaderFooter::getLinkToPrevious() throw (uno::RuntimeException)
++{
++    // seems always false
++    return sal_False;
++}
++
++void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( ::sal_Bool _linktoprevious ) throw (uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno::RuntimeException)
++{
++    rtl::OUString sPropsNameText;
++    if( mbHeader )
++    {
++        sPropsNameText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") );
++    }
++    else
++    {
++        sPropsNameText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
++    }
++    if( mnIndex = word::WdHeaderFooterIndex::wdHeaderFooterEvenPages )
++    {
++        sPropsNameText.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left") ) );
++    }
++
++    uno::Reference< text::XText > xText( mxPageStyleProps->getPropertyValue( sPropsNameText ), uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
++    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, xDocument, xText->getStart(), xText->getEnd(), xText ) );
++}
++
++uno::Any SAL_CALL
++SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW );
++    //uno::Reference< drawing::XShapes > xShapes( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
++    uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
++    uno::Reference< XCollection > xCol( new ScVbaShapes( this, mxContext, xIndexAccess, mxModel ) );
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++rtl::OUString& 
++SwVbaHeaderFooter::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaHeaderFooter") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaHeaderFooter::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Pane" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbavariables.cxx
+===================================================================
+--- sw/source/ui/vba/vbavariables.cxx	(revision 0)
++++ sw/source/ui/vba/vbavariables.cxx	(revision 276288)
+@@ -0,0 +1,105 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbavariables.hxx"
++#include "vbavariable.hxx"
++#include <com/sun/star/beans/XPropertyContainer.hpp>
++#include <com/sun/star/beans/PropertyAttribute.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++uno::Reference< container::XIndexAccess > createVariablesAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertyAccess >& xUserDefined ) throw ( uno::RuntimeException )
++{
++    // FIXME: the performance is poor?
++    XNamedObjectCollectionHelper< word::XVariable >::XNamedVec mVariables;
++    const uno::Sequence< beans::PropertyValue > props = xUserDefined->getPropertyValues();
++    sal_Int32 nCount = props.getLength();
++    mVariables.reserve( nCount );
++    for( sal_Int32 i=0; i < nCount; i++ )
++        mVariables.push_back( uno::Reference< word::XVariable > ( new SwVbaVariable( xParent, xContext, xUserDefined, props[i].Name ) ) );
++
++    uno::Reference< container::XIndexAccess > xVariables( new XNamedObjectCollectionHelper< word::XVariable >( mVariables ) );
++    return xVariables;
++}
++
++SwVbaVariables::SwVbaVariables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertyAccess >& rUserDefined ): SwVbaVariables_BASE( xParent, xContext, createVariablesAccess( xParent, xContext, rUserDefined ) ),  mxUserDefined( rUserDefined )
++{
++}
++// XEnumerationAccess
++uno::Type
++SwVbaVariables::getElementType() throw (uno::RuntimeException)
++{
++	return word::XVariable::static_type(0);
++}
++uno::Reference< container::XEnumeration >
++SwVbaVariables::createEnumeration() throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
++    return xEnumerationAccess->createEnumeration();
++}
++
++uno::Any
++SwVbaVariables::createCollectionObject( const css::uno::Any& aSource )
++{
++    return aSource;
++}
++
++uno::Any SAL_CALL
++SwVbaVariables::Add( const rtl::OUString& rName, const uno::Any& rValue ) throw (uno::RuntimeException)
++{
++    uno::Any aValue;
++    if( rValue.hasValue() )
++        aValue = rValue;
++    else
++        aValue <<= rtl::OUString();
++    uno::Reference< beans::XPropertyContainer > xPropertyContainer( mxUserDefined, uno::UNO_QUERY_THROW );
++    xPropertyContainer->addProperty( rName, beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::REMOVEABLE, aValue );
++
++    return uno::makeAny( uno::Reference< word::XVariable >( new SwVbaVariable( getParent(), mxContext, mxUserDefined, rName ) ) );
++}
++
++rtl::OUString& 
++SwVbaVariables::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariables") );
++	return sImplName;
++}
++
++css::uno::Sequence<rtl::OUString> 
++SwVbaVariables::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > sNames;
++	if ( sNames.getLength() == 0 )
++	{
++		sNames.realloc( 1 );
++		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Variables") );
++	}
++	return sNames;
++}
+Index: sw/source/ui/vba/vbaapplication.hxx
+===================================================================
+--- sw/source/ui/vba/vbaapplication.hxx	(revision 0)
++++ sw/source/ui/vba/vbaapplication.hxx	(revision 276288)
+@@ -0,0 +1,77 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbaapplication.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_APPLICATION_HXX
++#define SW_VBA_APPLICATION_HXX
++
++#include <ooo/vba/word/XApplication.hpp>
++#include <ooo/vba/word/XDocument.hpp>
++#include <ooo/vba/word/XWindow.hpp>
++#include <ooo/vba/word/XSystem.hpp>
++#include <ooo/vba/word/XOptions.hpp>
++#include <ooo/vba/word/XSelection.hpp>
++#include <ooo/vba/word/XAddins.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbaapplicationbase.hxx>
++#include <cppuhelper/implbase1.hxx>
++
++//typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XApplication > SwVbaApplication_BASE;
++typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ooo::vba::word::XApplication > SwVbaApplication_BASE;
++
++class SwVbaApplication : public SwVbaApplication_BASE
++{
++public:
++	SwVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
++	virtual ~SwVbaApplication();
++
++    virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
++
++	// XApplication
++    virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
++    virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
++    virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
++    virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
++    virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException);
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++protected:
++    virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
++};
++#endif /* SW_VBA_APPLICATION_HXX */
+Index: sw/source/ui/vba/wordvbahelper.cxx
+===================================================================
+--- sw/source/ui/vba/wordvbahelper.cxx	(revision 0)
++++ sw/source/ui/vba/wordvbahelper.cxx	(revision 276288)
+@@ -0,0 +1,95 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbahelper.cxx,v $
++ * $Revision: 1.5.32.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <docsh.hxx>
++#include "wordvbahelper.hxx"
++#include <comphelper/processfactory.hxx>
++#include <com/sun/star/frame/XController.hpp>
++#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
++#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
++#include <com/sun/star/lang/XUnoTunnel.hpp>
++#include <unotxdoc.hxx>
++#include <doc.hxx>
++
++using namespace ::com::sun::star;
++using namespace ::ooo::vba;
++
++#define FIRST_PAGE 1;
++
++namespace ooo
++{
++namespace vba
++{
++namespace word
++{
++
++SwDocShell* getDocShell( const uno::Reference< frame::XModel>& xModel ) 
++{
++	uno::Reference< lang::XUnoTunnel > xTunnel( xModel, uno::UNO_QUERY_THROW );
++    SwXTextDocument* pXDoc = reinterpret_cast< SwXTextDocument * >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SwXTextDocument::getUnoTunnelId())));
++	return pXDoc ? pXDoc->GetDocShell() : 0;
++}
++
++SwView* getView( const uno::Reference< frame::XModel>& xModel )
++{
++    SwDocShell* pDocShell = getDocShell( xModel );
++    return pDocShell? pDocShell->GetView() : 0;
++}
++
++uno::Reference< text::XTextViewCursor > getXTextViewCursor( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
++{
++    uno::Reference< frame::XController > xController = xModel->getCurrentController();
++    uno::Reference< text::XTextViewCursorSupplier > xTextViewCursorSupp( xController, uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextViewCursor > xTextViewCursor = xTextViewCursorSupp->getViewCursor();
++    return xTextViewCursor;
++}
++
++uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
++{
++    uno::Reference< beans::XPropertySet > xCursorProps( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
++    rtl::OUString aPageStyleName;
++    xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName;
++    uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW );
++    uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
++    uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles") ) ), uno::UNO_QUERY_THROW );
++    uno::Reference< style::XStyle > xStyle( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW );
++
++    return xStyle;
++}
++
++sal_Int32 getPageCount( const uno::Reference< frame::XModel>& xModel ) throw (uno::RuntimeException)
++{
++    SwDocShell* pDocShell = getDocShell( xModel );
++    return pDocShell ? pDocShell->GetDoc()->GetPageCount() : 0;
++}
++
++} // word
++} // 
++} //
+Index: sw/source/ui/vba/vbafont.hxx
+===================================================================
+--- sw/source/ui/vba/vbafont.hxx	(revision 0)
++++ sw/source/ui/vba/vbafont.hxx	(revision 276288)
+@@ -0,0 +1,31 @@
++#ifndef VBA_FONT_HXX
++#define VBA_FONT_HXX
++
++#include <vbahelper/vbafontbase.hxx>
++#include <ooo/vba/word/XFont.hpp>
++
++typedef cppu::ImplInheritanceHelper1< VbaFontBase, ov::word::XFont > SwVbaFont_BASE;
++
++class SwVbaFont : public SwVbaFont_BASE
++{
++public:
++	SwVbaFont( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPalette, css::uno::Reference< css::beans::XPropertySet > xPropertySet ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaFont(){}
++
++    // Attributes
++    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getSubscript() throw ( css::uno::RuntimeException );
++    virtual css::uno::Any SAL_CALL getSuperscript() throw ( css::uno::RuntimeException );
++
++    virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException);
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();   
++};
++#endif
+Index: sw/source/ui/vba/vbaaddin.cxx
+===================================================================
+--- sw/source/ui/vba/vbaaddin.cxx	(revision 0)
++++ sw/source/ui/vba/vbaaddin.cxx	(revision 276288)
+@@ -0,0 +1,107 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaaddin.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include <tools/urlobj.hxx>
++#include <osl/file.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const rtl::OUString& rFileURL, sal_Bool bAutoload ) throw ( uno::RuntimeException ) :
++    SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbAutoload( bAutoload ), mbInstalled( bAutoload )
++{
++}
++
++SwVbaAddin::~SwVbaAddin()
++{
++}
++
++::rtl::OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException)
++{
++    rtl::OUString sName;
++    INetURLObject aURL( msFileURL );
++    ::osl::File::getSystemPathFromFileURL( aURL.GetLastName(), sName );
++    return sName;
++}
++
++void SAL_CALL
++SwVbaAddin::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException )
++{
++    throw uno::RuntimeException( rtl::OUString(
++            RTL_CONSTASCII_USTRINGPARAM(" Fail to set name")), uno::Reference< uno::XInterface >() );
++}
++
++::rtl::OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException)
++{
++    INetURLObject aURL( msFileURL );
++    aURL.CutLastName();
++    return aURL.GetURLPath();
++}
++
++::sal_Bool SAL_CALL SwVbaAddin::getAutoload() throw (uno::RuntimeException)
++{
++    return mbAutoload;
++}
++
++::sal_Bool SAL_CALL SwVbaAddin::getInstalled() throw (uno::RuntimeException)
++{
++    return mbInstalled;
++}
++
++void SAL_CALL SwVbaAddin::setInstalled( ::sal_Bool _installed ) throw (uno::RuntimeException)
++{
++    if( _installed != mbInstalled )
++    {
++        mbInstalled = _installed;
++        // TODO: should call AutoExec and AutoExit etc.
++    }
++}
++
++rtl::OUString& 
++SwVbaAddin::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAddin") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaAddin::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Addin" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbatemplate.hxx
+===================================================================
+--- sw/source/ui/vba/vbatemplate.hxx	(revision 0)
++++ sw/source/ui/vba/vbatemplate.hxx	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_TEMPLATE_HXX
++#define SW_VBA_TEMPLATE_HXX
++
++#include <ooo/vba/word/XTemplate.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XTemplate > SwVbaTemplate_BASE;
++
++class SwVbaTemplate : public SwVbaTemplate_BASE
++{
++private:
++    css::uno::Reference< css::frame::XModel > mxModel;
++    rtl::OUString msName;
++public:
++	SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
++        const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& );
++	virtual ~SwVbaTemplate();
++
++   // XTemplate
++    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException);
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_TEMPLATE_HXX */
+Index: sw/source/ui/vba/vbastyles.cxx
+===================================================================
+--- sw/source/ui/vba/vbastyles.cxx	(revision 0)
++++ sw/source/ui/vba/vbastyles.cxx	(revision 276288)
+@@ -0,0 +1,380 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbastyles.cxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbastyles.hxx"
++#include "vbastyle.hxx"
++#include <cppuhelper/implbase3.hxx>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
++#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
++#include <com/sun/star/style/XStyle.hpp>
++#include <ooo/vba/word/WdBuiltinStyle.hpp>
++#include <ooo/vba/word/WdStyleType.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++struct BuiltinStyleTable
++{
++    sal_Int32 wdBuiltinStyle;
++    const sal_Char* pOOoStyleName;
++    sal_Int32 wdStyleType;
++};
++
++const BuiltinStyleTable aBuiltinStyleTable[] =
++{
++    { word::WdBuiltinStyle::wdStyleBlockQuotation, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleBodyText, "Text body", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleBodyText2, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleBodyText3, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleBodyTextFirstIndent, "First line indent", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleBodyTextFirstIndent2, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleBodyTextIndent, "Text body indent", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleBodyTextIndent2, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleBodyTextIndent3, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleCaption, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleClosing, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleCommentReference, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleCommentText, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleDate, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleDefaultParagraphFont, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleEmphasis, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleEndnoteReference, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleEndnoteText, "Endnote", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleEnvelopeAddress, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleEnvelopeReturn, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleFooter, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleFootnoteReference, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleFootnoteText, "Footnote", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHeader, "Header", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHeading1, "Heading 1", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHeading2, "Heading 2", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHeading3, "Heading 3", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHeading4, "Heading 4", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHeading5, "Heading 5", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHeading6, "Heading 6", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHeading7, "Heading 7", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHeading8, "Heading 8", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHeading9, "Heading 9", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHtmlAcronym, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHtmlAddress, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHtmlCite, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHtmlCode, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHtmlDfn, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHtmlKbd, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHtmlNormal, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHtmlPre, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHtmlSamp, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHtmlTt, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHtmlVar, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHyperlink, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleHyperlinkFollowed, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleIndex1, "Index 1", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleIndex2, "Index 2", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleIndex3, "Index 3", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleIndex4, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleIndex5, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleIndex6, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleIndex7, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleIndex8, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleIndex9, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleIndexHeading, "Index Heading", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleLineNumber, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleList, "List", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleList2, "List 2", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleList3, "List 3", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleList4, "List 4", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleList5, "List 5", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleListBullet, "List 1", word::WdStyleType::wdStyleTypeList },
++    { word::WdBuiltinStyle::wdStyleListBullet2, "List 2", word::WdStyleType::wdStyleTypeList },
++    { word::WdBuiltinStyle::wdStyleListBullet3, "List 3", word::WdStyleType::wdStyleTypeList },
++    { word::WdBuiltinStyle::wdStyleListBullet4, "List 4", word::WdStyleType::wdStyleTypeList },
++    { word::WdBuiltinStyle::wdStyleListBullet5, "List 5", word::WdStyleType::wdStyleTypeList },
++    { word::WdBuiltinStyle::wdStyleListContinue, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleListContinue2, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleListContinue3, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleListContinue4, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleListContinue5, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleListNumber, "Numbering 1", word::WdStyleType::wdStyleTypeList },
++    { word::WdBuiltinStyle::wdStyleListNumber2, "Numbering 2", word::WdStyleType::wdStyleTypeList },
++    { word::WdBuiltinStyle::wdStyleListNumber3, "Numbering 3", word::WdStyleType::wdStyleTypeList },
++    { word::WdBuiltinStyle::wdStyleListNumber4, "Numbering 4", word::WdStyleType::wdStyleTypeList },
++    { word::WdBuiltinStyle::wdStyleListNumber5, "Numbering 5", word::WdStyleType::wdStyleTypeList },
++    { word::WdBuiltinStyle::wdStyleMacroText, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleMessageHeader, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleNavPane, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleNormal, "Default", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleNormalIndent, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleNormalTable, "Table", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleNoteHeading, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStylePageNumber, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStylePlainText, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleSalutation, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleSignature, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleStrong, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleSubtitle, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTableOfAuthorities, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTableOfFigures, "", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTitle, "Title", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTOAHeading, "Contents Heading", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTOC1, "Contents 1", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTOC2, "Contents 2", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTOC3, "Contents 3", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTOC4, "Contents 4", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTOC5, "Contents 5", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTOC6, "Contents 6", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTOC7, "Contents 7", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTOC8, "Contents 8", word::WdStyleType::wdStyleTypeParagraph },
++    { word::WdBuiltinStyle::wdStyleTOC9, "Contents 9", word::WdStyleType::wdStyleTypeParagraph },
++    { 0, 0, 0 }
++};
++
++
++static uno::Sequence< rtl::OUString > getStyleTypes()
++{
++    uno::Sequence< rtl::OUString > aRet(3);
++    rtl::OUString* pArray = aRet.getArray();
++    pArray[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") );
++    pArray[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharacterStyles") );
++    pArray[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingStyles") );
++    return aRet;
++}
++
++typedef ::cppu::WeakImplHelper1< container::XEnumeration > StyleEnumeration_BASE;
++typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > StyleCollectionHelper_BASE;
++/*
++class StylesEnumeration : public StyleEnumeration_BASE
++{
++public:
++	StylesEnumeration( const SheetMap& sMap ) : mSheetMap( sMap ), mIt( mSheetMap.begin() ) {}
++	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
++	{
++		return ( mIt != mSheetMap.end() );
++	}
++	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++	{
++		if ( !hasMoreElements() )
++			throw container::NoSuchElementException();
++		uno::Reference< sheet::XSpreadsheet > xSheet( *mIt++ );
++		return uno::makeAny( xSheet ) ;
++	}
++};
++*/
++class StyleCollectionHelper : public StyleCollectionHelper_BASE
++{
++private:
++    uno::Reference< frame::XModel > mxModel;
++    uno::Reference< container::XNameAccess > mxStyleFamilies;
++    uno::Reference< container::XNameContainer > mxCurrentStyleFamily;
++    uno::Any cachePos;
++public:
++	StyleCollectionHelper( const uno::Reference< frame::XModel >& _xModel ) : mxModel( _xModel )
++    {
++        uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( _xModel, uno::UNO_QUERY_THROW);
++        mxStyleFamilies = xStyleSupplier->getStyleFamilies();
++    }
++    uno::Reference< container::XNameContainer > getCurrentStyleFamily(){ return mxCurrentStyleFamily; }
++	// XElementAccess
++	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) { return  style::XStyle::static_type(0); }
++	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) { return getCount() > 0; }
++	// XNameAcess 
++	virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++	{
++		if ( !hasByName(aName) )
++			throw container::NoSuchElementException();
++		return cachePos;
++	}
++	virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
++	{
++		uno::Sequence< rtl::OUString > sNames( getCount() );
++		rtl::OUString* pString = sNames.getArray();
++        uno::Sequence< rtl::OUString > aStyleTypes = getStyleTypes();
++        sal_Int32 nCount = 0;
++        for( sal_Int32 i = 0; i < aStyleTypes.getLength(); i++ )
++        {
++            uno::Reference< container::XNameAccess > xNameAccess( mxStyleFamilies->getByName( aStyleTypes[i] ), uno::UNO_QUERY_THROW );
++            uno::Sequence< rtl::OUString > sElementNames = xNameAccess->getElementNames();
++            for( sal_Int32 j = 0; j < sElementNames.getLength(); j++ )
++            {
++                pString[nCount++] = sElementNames[j];
++            }
++        }
++		return sNames;
++	}
++	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
++	{
++        uno::Sequence< rtl::OUString > aStyleTypes = getStyleTypes();
++        for( sal_Int32 i = 0; i < aStyleTypes.getLength(); i++ )
++        {
++            uno::Reference< container::XNameAccess > xNameAccess( mxStyleFamilies->getByName( aStyleTypes[i] ), uno::UNO_QUERY_THROW );
++            if( xNameAccess->hasByName( aName ) )
++            {
++                cachePos = xNameAccess->getByName( aName );
++                mxCurrentStyleFamily.set( xNameAccess, uno::UNO_QUERY_THROW );
++                return sal_True;
++            }
++        }
++        return sal_False;
++	}
++
++	// XIndexAccess
++	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
++    { 
++        uno::Sequence< rtl::OUString > aStyleTypes = getStyleTypes();
++        sal_Int32 nCount = 0;
++        for( sal_Int32 i = 0; i < aStyleTypes.getLength(); i++ )
++        {
++            uno::Reference< container::XIndexAccess > xIndexAccess( mxStyleFamilies->getByName( aStyleTypes[i] ), uno::UNO_QUERY_THROW );
++            nCount += xIndexAccess->getCount();
++        }
++        return nCount;
++    }	
++	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
++	{
++		if ( Index < 0 || Index >= getCount() )
++			throw lang::IndexOutOfBoundsException();
++	
++        // FIXME: need to make a alphabetically sorted list of style names
++        uno::Sequence< rtl::OUString > aStyleTypes = getStyleTypes();
++        for( sal_Int32 i = 0; i < aStyleTypes.getLength(); i++ )
++        {
++            uno::Reference< container::XIndexAccess > xIndexAccess( mxStyleFamilies->getByName( aStyleTypes[i] ), uno::UNO_QUERY_THROW );
++            sal_Int32 nCount = xIndexAccess->getCount();
++            if( Index >= nCount )
++                Index -= nCount;
++            else
++            {
++                mxCurrentStyleFamily.set( xIndexAccess, uno::UNO_QUERY_THROW );
++                return xIndexAccess->getByIndex( Index );
++            }
++        }
++		throw lang::IndexOutOfBoundsException();
++	}
++	// XEnumerationAccess
++	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
++	{
++        // FIXME:
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++	}
++};
++
++SwVbaStyles::SwVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException ) : SwVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new StyleCollectionHelper( xModel )  ) ), mxModel( xModel )
++{
++    mxMSF.set( mxModel, uno::UNO_QUERY_THROW );
++}
++
++uno::Any 
++SwVbaStyles::createCollectionObject(const uno::Any& aObject)
++{
++    uno::Reference< beans::XPropertySet > xStyleProp( aObject, uno::UNO_QUERY_THROW );
++    return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xStyleProp ) ) );
++}
++
++uno::Type SAL_CALL 
++SwVbaStyles::getElementType() throw (uno::RuntimeException)
++{
++	return word::XStyle::static_type(0);
++}
++
++uno::Reference< container::XEnumeration > SAL_CALL 
++SwVbaStyles::createEnumeration() throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++uno::Any SAL_CALL
++SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno::RuntimeException)
++{
++    //handle WdBuiltinStyle
++    sal_Int32 nIndex = 0;
++    if( ( Index1 >>= nIndex ) && ( nIndex < 0 ) )
++    {
++        for( const BuiltinStyleTable* pTable = aBuiltinStyleTable; pTable->wdBuiltinStyle != NULL; pTable++ )
++        {
++            if( nIndex == pTable->wdBuiltinStyle )
++            {
++                rtl::OUString aStyleName = rtl::OUString::createFromAscii( pTable->pOOoStyleName );
++                if( aStyleName.getLength() > 0 )
++                {
++                    rtl::OUString aStyleType = SwVbaStyle::getOOoStyleTypeFromMSWord( pTable->wdStyleType );
++                    switch( pTable->wdStyleType )
++                    {
++                        case word::WdStyleType::wdStyleTypeParagraph:
++                        case word::WdStyleType::wdStyleTypeTable:
++                        {
++                            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") );
++                            break;
++                        }
++                        case word::WdStyleType::wdStyleTypeCharacter:
++                        {
++                            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharacterStyles") );
++                            break;
++                        }
++                        case word::WdStyleType::wdStyleTypeList:
++                        {
++                            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingStyles") );
++                            break;
++                        }
++                        default:
++                            DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
++                    }
++                    uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxModel, uno::UNO_QUERY_THROW);
++                    uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW );
++                    uno::Reference< beans::XPropertySet > xStyleProps( xStylesAccess->getByName( aStyleName ), uno::UNO_QUERY_THROW );
++                    return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xStyleProps ) ) );
++                }
++                else
++                {
++                    OSL_TRACE("SwVbaStyles::Item: the builtin style type is not implemented");
++                    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++                }
++            }
++        }
++    }
++    return SwVbaStyles_BASE::Item( Index1, Index2 );
++}
++
++rtl::OUString&
++SwVbaStyles::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaStyles") );
++    return sImplName;
++}
++
++uno::Sequence< rtl::OUString >
++SwVbaStyles::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.XStyles" ) );
++    }
++    return aServiceNames;
++}
+Index: sw/source/ui/vba/vbafield.cxx
+===================================================================
+--- sw/source/ui/vba/vbafield.cxx	(revision 0)
++++ sw/source/ui/vba/vbafield.cxx	(revision 276288)
+@@ -0,0 +1,481 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile:  $
++ * $Revision:  $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbafield.hxx"
++#include "vbarange.hxx"
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
++#include <com/sun/star/view/XSelectionSupplier.hpp>
++#include <com/sun/star/text/XTextFieldsSupplier.hpp>
++#include <ooo/vba/word/WdFieldType.hpp>
++#include <com/sun/star/text/FilenameDisplayFormat.hpp>
++#include <com/sun/star/util/XRefreshable.hpp>
++#include <swtypes.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++// *** SwVbaField ***********************************************
++
++SwVbaField::SwVbaField(  const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const  uno::Reference< css::text::XTextField >& xTextField) throw ( uno::RuntimeException ) : SwVbaField_BASE( rParent, rContext ), mxTextDocument( rDocument )
++{
++    mxTextField.set( xTextField, uno::UNO_QUERY_THROW );
++}
++
++// XHelperInterface
++rtl::OUString& 
++SwVbaField::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaField") );
++    return sImplName;    
++}
++
++uno::Sequence<rtl::OUString> 
++SwVbaField::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Field" ) );
++    }
++    return aServiceNames;
++}
++
++// *** _ReadFieldParams ***********************************************
++// the codes are copied from ww8par5.cxx
++class _ReadFieldParams
++{
++private:
++    String aData;
++    xub_StrLen nLen, nFnd, nNext, nSavPtr;
++    String aFieldName;
++public:
++    _ReadFieldParams( const String& rData );
++    ~_ReadFieldParams();
++
++    xub_StrLen GoToTokenParam();
++    long SkipToNextToken();
++    xub_StrLen GetTokenSttPtr() const   { return nFnd;  }
++
++    xub_StrLen FindNextStringPiece( xub_StrLen _nStart = STRING_NOTFOUND );
++    bool GetTokenSttFromTo(xub_StrLen* _pFrom, xub_StrLen* _pTo,
++        xub_StrLen _nMax);
++
++    String GetResult() const;
++    String GetFieldName()const { return aFieldName; }
++};
++
++
++_ReadFieldParams::_ReadFieldParams( const String& _rData )
++    : aData( _rData ), nLen( _rData.Len() ), nNext( 0 )
++{
++    /*
++        erstmal nach einer oeffnenden Klammer oder einer Leerstelle oder einem
++        Anfuehrungszeichen oder einem Backslash suchen, damit der Feldbefehl
++        (also INCLUDEPICTURE bzw EINFUeGENGRAFIK bzw ...) ueberlesen wird
++    */
++    while( (nLen > nNext) && (aData.GetChar( nNext ) == ' ') )
++        ++nNext;
++
++    sal_Unicode c;
++    while(     nLen > nNext
++            && (c = aData.GetChar( nNext )) != ' '
++            && c != '"'
++            && c != '\\'
++            && c != 132
++            && c != 0x201c )
++        ++nNext;
++
++    nFnd      = nNext;
++    nSavPtr   = nNext;
++    aFieldName = aData.Copy( 0, nFnd );
++//  cLastChar = aData.GetChar( nSavPtr );
++}
++
++
++_ReadFieldParams::~_ReadFieldParams()
++{
++//  aData.SetChar( nSavPtr, cLastChar );
++}
++
++
++String _ReadFieldParams::GetResult() const
++{
++    return    (STRING_NOTFOUND == nFnd)
++            ? aEmptyStr
++            : aData.Copy( nFnd, (nSavPtr - nFnd) );
++}
++
++
++xub_StrLen _ReadFieldParams::GoToTokenParam()
++{
++    xub_StrLen nOld = nNext;
++    if( -2 == SkipToNextToken() )
++        return GetTokenSttPtr();
++    nNext = nOld;
++    return STRING_NOTFOUND;
++}
++
++// ret: -2: NOT a '\' parameter but normal Text
++long _ReadFieldParams::SkipToNextToken()
++{
++    long nRet = -1;     // Ende
++    if (
++         (STRING_NOTFOUND != nNext) && (nLen > nNext) &&
++         STRING_NOTFOUND != (nFnd = FindNextStringPiece(nNext))
++       )
++    {
++        nSavPtr = nNext;
++
++        if ('\\' == aData.GetChar(nFnd) && '\\' != aData.GetChar(nFnd + 1))
++        {
++            nRet = aData.GetChar(++nFnd);
++            nNext = ++nFnd;             // und dahinter setzen
++        }
++        else
++        {
++            nRet = -2;
++            if (
++                 (STRING_NOTFOUND != nSavPtr ) &&
++                 (
++                   ('"' == aData.GetChar(nSavPtr - 1)) ||
++                   (0x201d == aData.GetChar(nSavPtr - 1))
++                 )
++               )
++            {
++                --nSavPtr;
++            }
++        }
++    }
++    return nRet;
++}
++
++// FindNextPara sucht naechsten Backslash-Parameter oder naechste Zeichenkette
++// bis zum Blank oder naechsten "\" oder zum schliessenden Anfuehrungszeichen
++// oder zum String-Ende von pStr.
++//
++// Ausgabe ppNext (falls ppNext != 0) Suchbeginn fuer naechsten Parameter bzw. 0
++//
++// Returnwert: 0 falls String-Ende erreicht,
++//             ansonsten Anfang des Paramters bzw. der Zeichenkette
++//
++xub_StrLen _ReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
++{
++    xub_StrLen  n = ( STRING_NOTFOUND == nStart ) ? nFnd : nStart;  // Anfang
++    xub_StrLen n2;          // Ende
++
++    nNext = STRING_NOTFOUND;        // Default fuer nicht gefunden
++
++    while( (nLen > n) && (aData.GetChar( n ) == ' ') )
++        ++n;
++
++    if( nLen == n )
++        return STRING_NOTFOUND;     // String End reached!
++
++    if(     (aData.GetChar( n ) == '"')     // Anfuehrungszeichen vor Para?
++        ||  (aData.GetChar( n ) == 0x201c)
++        ||  (aData.GetChar( n ) == 132) )
++    {
++        n++;                        // Anfuehrungszeichen ueberlesen
++        n2 = n;                     // ab hier nach Ende suchen
++        while(     (nLen > n2)
++                && (aData.GetChar( n2 ) != '"')
++                && (aData.GetChar( n2 ) != 0x201d)
++                && (aData.GetChar( n2 ) != 147) )
++            n2++;                   // Ende d. Paras suchen
++    }
++    else                        // keine Anfuehrungszeichen
++    {
++        n2 = n;                     // ab hier nach Ende suchen
++        while( (nLen > n2) && (aData.GetChar( n2 ) != ' ') ) // Ende d. Paras suchen
++        {
++            if( aData.GetChar( n2 ) == '\\' )
++            {
++                if( aData.GetChar( n2+1 ) == '\\' )
++                    n2 += 2;        // Doppel-Backslash -> OK
++                else
++                {
++                    if( n2 > n )
++                        n2--;
++                    break;          // einfach-Backslash -> Ende
++                }
++            }
++            else
++                n2++;               // kein Backslash -> OK
++        }
++    }
++    if( nLen > n2 )
++    {
++        if(aData.GetChar( n2 ) != ' ') n2++;
++        nNext = n2;
++    }
++    return n;
++}
++
++
++
++// read parameters "1-3" or 1-3 with both values between 1 and nMax
++bool _ReadFieldParams::GetTokenSttFromTo(USHORT* pFrom, USHORT* pTo, USHORT nMax)
++{
++    USHORT nStart = 0;
++    USHORT nEnd   = 0;
++    xub_StrLen n = GoToTokenParam();
++    if( STRING_NOTFOUND != n )
++    {
++
++        String sParams( GetResult() );
++
++        xub_StrLen nIndex = 0;
++        String sStart( sParams.GetToken(0, '-', nIndex) );
++        if( STRING_NOTFOUND != nIndex )
++        {
++            nStart = static_cast<USHORT>(sStart.ToInt32());
++            nEnd   = static_cast<USHORT>(sParams.Copy(nIndex).ToInt32());
++        }
++    }
++    if( pFrom ) *pFrom = nStart;
++    if( pTo )   *pTo   = nEnd;
++
++    return nStart && nEnd && (nMax >= nStart) && (nMax >= nEnd);
++}
++
++// *** SwVbaFields ***********************************************
++
++uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Any& aSource )
++{
++    uno::Reference< text::XTextField > xTextField( aSource, uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextDocument > xTextDocument( xModel, uno::UNO_QUERY_THROW );
++    uno::Reference< word::XField > xField( new SwVbaField( xParent, xContext, xTextDocument, xTextField ) );
++    return uno::makeAny( xField );
++}
++
++typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > FieldEnumeration_BASE;
++typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > FieldCollectionHelper_BASE;
++
++class FieldEnumeration : public FieldEnumeration_BASE 
++{
++    uno::Reference< XHelperInterface > mxParent;
++    uno::Reference< uno::XComponentContext > mxContext;
++    uno::Reference< frame::XModel > mxModel;
++    uno::Reference< container::XEnumeration > mxEnumeration;
++public:
++    FieldEnumeration(  const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< container::XEnumeration >& xEnumeration ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxEnumeration( xEnumeration )
++    {
++    }
++    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException) 
++    { 
++        return mxEnumeration->hasMoreElements();
++    }
++    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        if ( !hasMoreElements() )
++            throw container::NoSuchElementException();
++        return lcl_createField( mxParent, mxContext, mxModel, mxEnumeration->nextElement() );
++    }
++};
++
++class FieldCollectionHelper : public FieldCollectionHelper_BASE
++{
++    uno::Reference< XHelperInterface > mxParent;
++    uno::Reference< uno::XComponentContext > mxContext;
++    uno::Reference< frame::XModel > mxModel;
++    uno::Reference< container::XEnumerationAccess > mxEnumerationAccess;
++public:
++    FieldCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) throw (css::uno::RuntimeException) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel )
++    {
++        uno::Reference< text::XTextFieldsSupplier > xSupp( xModel, uno::UNO_QUERY_THROW );
++        mxEnumerationAccess.set( xSupp->getTextFields(), uno::UNO_QUERY_THROW );
++    }
++	// XElementAccess
++	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) { return  mxEnumerationAccess->getElementType(); }
++	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) { return mxEnumerationAccess->hasElements(); }
++	// XIndexAccess
++	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
++    { 
++        uno::Reference< container::XEnumeration > xEnumeration =  mxEnumerationAccess->createEnumeration();
++        sal_Int32 nCount = 0;
++        while( xEnumeration->hasMoreElements() )
++        {
++            ++nCount;
++            xEnumeration->nextElement();
++        }    
++        return nCount;    
++    }
++	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
++	{
++        if( Index < 0 || Index >= getCount() )
++            throw lang::IndexOutOfBoundsException();
++
++        uno::Reference< container::XEnumeration > xEnumeration =  mxEnumerationAccess->createEnumeration();
++        sal_Int32 nCount = 0;
++        while( xEnumeration->hasMoreElements() )
++        {
++            if( nCount == Index )
++            {
++                return xEnumeration->nextElement();
++            }
++            ++nCount;
++        }
++        throw lang::IndexOutOfBoundsException();
++    }
++	// XEnumerationAccess
++	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
++    {
++        uno::Reference< container::XEnumeration > xEnumeration =  mxEnumerationAccess->createEnumeration();
++        return uno::Reference< container::XEnumeration >( new FieldEnumeration( mxParent, mxContext, mxModel, xEnumeration ) );
++    }
++};
++ 
++SwVbaFields::SwVbaFields( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaFields_BASE( xParent, xContext , uno::Reference< container::XIndexAccess >( new FieldCollectionHelper( xParent, xContext, xModel ) ) ), mxModel( xModel )
++{
++    mxMSF.set( mxModel, uno::UNO_QUERY_THROW );
++}
++
++uno::Reference< word::XField > SAL_CALL 
++SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& /*PreserveFormatting*/ ) throw (css::uno::RuntimeException)
++{
++    sal_Int32 nType = word::WdFieldType::wdFieldEmpty;
++    Type >>= nType;
++    rtl::OUString sText;
++    Text >>= sText;
++
++    String sFieldName;
++    if( ( nType == word::WdFieldType::wdFieldEmpty ) && ( sText.getLength() > 0 ) )
++    {
++        _ReadFieldParams aReadParam(sText);
++        sFieldName = aReadParam.GetFieldName();
++    }
++
++    uno::Reference< text::XTextContent > xTextField;
++    if( nType == word::WdFieldType::wdFieldFileName || sFieldName.EqualsIgnoreCaseAscii("FILENAME") )
++    {
++        xTextField.set( Create_Field_FileName( sText ), uno::UNO_QUERY_THROW );
++    }
++    else
++    {
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++    }
++
++    SwVbaRange* pVbaRange = dynamic_cast< SwVbaRange* >( Range.get() );
++    uno::Reference< text::XTextRange > xTextRange = pVbaRange->getXTextRange();
++    uno::Reference< text::XText > xText = xTextRange->getText();
++    xText->insertTextContent( xTextRange, xTextField, true );
++    return uno::Reference< word::XField >( new SwVbaField( mxParent, mxContext, uno::Reference< text::XTextDocument >( mxModel, uno::UNO_QUERY_THROW ), uno::Reference< text::XTextField >( xTextField, uno::UNO_QUERY_THROW ) ) );
++}
++
++uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl::OUString _text ) throw (uno::RuntimeException)
++{
++    uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( rtl::OUString::createFromAscii("com.sun.star.text.TextField.FileName") ), uno::UNO_QUERY_THROW );
++    sal_Int16 nFileFormat = text::FilenameDisplayFormat::NAME_AND_EXT;
++    if( _text.getLength() > 0 )
++    {
++        long nRet;
++        _ReadFieldParams aReadParam( _text );
++        while (-1 != (nRet = aReadParam.SkipToNextToken()))
++        {
++            switch (nRet)
++            {
++                case 'p':
++                    nFileFormat = text::FilenameDisplayFormat::FULL;
++                    break;
++                case '*':
++                    //Skip over MERGEFORMAT
++                    aReadParam.SkipToNextToken();
++                    break;
++                default:
++                    DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
++                    break;
++            }
++        }
++    }
++
++    uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW );
++    xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FileFormat") ), uno::makeAny( nFileFormat ) );
++
++    return xTextField;
++}
++
++uno::Reference< container::XEnumeration > SAL_CALL 
++SwVbaFields::createEnumeration() throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
++    return xEnumerationAccess->createEnumeration();
++}
++
++// ScVbaCollectionBaseImpl      
++uno::Any 
++SwVbaFields::createCollectionObject( const uno::Any& aSource )
++{
++    return lcl_createField( mxParent, mxContext, mxModel, aSource );
++} 
++
++sal_Int32 SAL_CALL SwVbaFields::Update() throw (uno::RuntimeException)
++{
++    sal_Int32 nUpdate = 1;
++    try
++    {
++        uno::Reference< text::XTextFieldsSupplier > xSupp( mxModel, uno::UNO_QUERY_THROW );
++        uno::Reference< util::XRefreshable > xRef( xSupp->getTextFields(), uno::UNO_QUERY_THROW );
++        xRef->refresh();
++        nUpdate = 0;
++    }catch( uno::Exception )
++    {
++        nUpdate = 1;
++    }
++    return nUpdate;
++}
++
++// XHelperInterface
++rtl::OUString& 
++SwVbaFields::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFields") );
++    return sImplName;    
++}
++
++// XEnumerationAccess
++uno::Type SAL_CALL 
++SwVbaFields::getElementType() throw (uno::RuntimeException)
++{
++    return  word::XField::static_type(0); 
++}
++
++uno::Sequence<rtl::OUString> 
++SwVbaFields::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Fields" ) );
++    }
++    return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbaparagraphformat.hxx
+===================================================================
+--- sw/source/ui/vba/vbaparagraphformat.hxx	(revision 0)
++++ sw/source/ui/vba/vbaparagraphformat.hxx	(revision 276288)
+@@ -0,0 +1,98 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_PARAGRAPHFORMAT_HXX
++#define SW_VBA_PARAGRAPHFORMAT_HXX
++
++#include <ooo/vba/word/XParagraphFormat.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/text/XTextDocument.hpp>
++#include <com/sun/star/style/LineSpacing.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XParagraphFormat > SwVbaParagraphFormat_BASE;
++
++class SwVbaParagraphFormat : public SwVbaParagraphFormat_BASE
++{
++private:
++    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
++    css::uno::Reference< css::beans::XPropertySet > mxParaProps;
++
++private:
++    css::style::LineSpacing getOOoLineSpacing( float _lineSpace, sal_Int16 mode );
++    css::style::LineSpacing getOOoLineSpacingFromRule( sal_Int32 _linespacingrule );
++    float getMSWordLineSpacing( css::style::LineSpacing& rLineSpacing );
++    sal_Int32 getMSWordLineSpacingRule( css::style::LineSpacing& rLineSpacing );
++    sal_Int16 getCharHeight() throw (css::uno::RuntimeException);
++    sal_Int32 getOOoAlignment( sal_Int32 _alignment );
++    sal_Int32 getMSWordAlignment( sal_Int32 _alignment );
++
++public:
++	SwVbaParagraphFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::beans::XPropertySet >& rParaProps );
++	virtual ~SwVbaParagraphFormat();
++    
++    // Attributes
++    virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getFirstLineIndent() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getKeepTogether() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getKeepWithNext() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getHyphenation() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getLineSpacing() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLineSpacing( float _linespacing ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getLineSpacingRule() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getNoLineNumber() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getOutlineLevel() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getPageBreakBefore() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getSpaceBefore() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setSpaceBefore( float _spacebefore ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getSpaceAfter() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setSpaceAfter( float _spaceafter ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getLeftIndent() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLeftIndent( float _leftindent ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getRightIndent() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setRightIndent( float _rightindent ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getTabStops() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getWidowControl() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_PARAGRAPHFORMAT_HXX */
+Index: sw/source/ui/vba/vbainformationhelper.cxx
+===================================================================
+--- sw/source/ui/vba/vbainformationhelper.cxx	(revision 0)
++++ sw/source/ui/vba/vbainformationhelper.cxx	(revision 276288)
+@@ -0,0 +1,71 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbainformationhelper.hxx"
++#include <com/sun/star/text/XPageCursor.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include "wordvbahelper.hxx"
++#include <docsh.hxx>
++#include <doc.hxx>
++#include <vbahelper/vbahelper.hxx>
++#include <swtypes.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++static const sal_Int32 DEFAULT_PAGE_DISTANCE = 500;
++
++sal_Int32 SwVbaInformationHelper::handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException )
++{
++    uno::Reference< text::XPageCursor > xPageCursor( xTVCursor, uno::UNO_QUERY_THROW );
++    return xPageCursor->getPage();
++}
++
++sal_Int32 SwVbaInformationHelper::handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException )
++{
++    return word::getPageCount( xModel );
++}
++
++double SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException )
++{
++    xTVCursor->collapseToStart();
++    uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
++    sal_Int32 nTopMargin = 0;
++    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin") ) ) >>= nTopMargin;
++    sal_Int32 nCurrentPos = xTVCursor->getPosition().Y;
++
++    sal_Int32 nCurrentPage = handleWdActiveEndPageNumber( xTVCursor );
++    sal_Int32 nPageHeight = word::getDocShell( xModel )->GetDoc()->GetPageSize( nCurrentPage, sal_False ).Height();
++    // FIXME: handle multipul page style
++    // it is very strange that the curros position is incorrect when open Word file.
++    // e.g. if current cursor in the top left of the text body of the first page without header,
++    // the top value of current position should be 0, but is 201 when open a Word file. 
++    nCurrentPos = nCurrentPos + nTopMargin - ( DEFAULT_PAGE_DISTANCE + TWIP_TO_MM100( nPageHeight ) ) * (  nCurrentPage - 1  );
++    return Millimeter::getInPoints( nCurrentPos );
++}
+Index: sw/source/ui/vba/vbadialogs.hxx
+===================================================================
+--- sw/source/ui/vba/vbadialogs.hxx	(revision 0)
++++ sw/source/ui/vba/vbadialogs.hxx	(revision 276288)
+@@ -0,0 +1,56 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadialogs.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_DIALOGS_HXX
++#define SW_VBA_DIALOGS_HXX
++
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <ooo/vba/word/XDialogs.hpp>
++#include <ooo/vba/XCollection.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbadialogsbase.hxx>
++#include <cppuhelper/implbase1.hxx>
++
++typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::word::XDialogs > SwVbaDialogs_BASE;
++
++class SwVbaDialogs : public SwVbaDialogs_BASE
++{
++public:
++	SwVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): SwVbaDialogs_BASE( xParent, xContext, xModel ) {} 
++	virtual ~SwVbaDialogs() {}
++
++	// XCollection
++	virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif /* SW_VBA_DIALOGS_HXX */
+Index: sw/source/ui/vba/vbaglobals.hxx
+===================================================================
+--- sw/source/ui/vba/vbaglobals.hxx	(revision 0)
++++ sw/source/ui/vba/vbaglobals.hxx	(revision 276288)
+@@ -0,0 +1,83 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbaglobals.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_GLOBALS_HXX
++#define SW_VBA_GLOBALS_HXX
++
++#include <com/sun/star/lang/XServiceInfo.hpp>
++#include <com/sun/star/lang/XInitialization.hpp>
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <ooo/vba/word/XGlobals.hpp>
++#include <ooo/vba/word/XApplication.hpp>
++#include <ooo/vba/word/XSystem.hpp>
++#include <ooo/vba/word/XOptions.hpp>
++#include <ooo/vba/word/XSelection.hpp>
++#include <cppuhelper/implbase1.hxx>
++#include <vbahelper/vbahelper.hxx>
++#include <vbahelper/vbaglobalbase.hxx>
++
++// =============================================================================
++// class SwVbaGlobals
++// =============================================================================
++
++
++typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE;
++
++class SwVbaGlobals : public SwVbaGlobals_BASE 
++{
++private:
++    css::uno::Reference< ooo::vba::word::XApplication > mxApplication;
++
++    virtual css::uno::Reference< ooo::vba::word::XApplication > getApplication() throw (css::uno::RuntimeException);
++
++public:
++	
++    SwVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& rxContext );
++    virtual ~SwVbaGlobals();
++
++    // XGlobals
++    virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
++    virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
++    virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
++    virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
++    virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException);
++    // XMultiServiceFactory
++    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException);
++
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_GLOBALS_HXX */ 
+Index: sw/source/ui/vba/vbasystem.hxx
+===================================================================
+--- sw/source/ui/vba/vbasystem.hxx	(revision 0)
++++ sw/source/ui/vba/vbasystem.hxx	(revision 276288)
+@@ -0,0 +1,75 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbasystem.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_SYSTEM_HXX
++#define SW_VBA_SYSTEM_HXX
++
++#include <ooo/vba/word/XSystem.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <vbahelper/vbapropvalue.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSystem > SwVbaSystem_BASE;
++
++class PrivateProfileStringListener : public PropListener
++{
++private:
++    rtl::OUString maFileName;
++    ByteString maGroupName;
++    ByteString  maKey;
++public:    
++    PrivateProfileStringListener(){};
++    PrivateProfileStringListener( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey );
++    virtual ~PrivateProfileStringListener();
++    void Initialize( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey );
++
++    //PropListener
++    virtual void setValueEvent( const css::uno::Any& value );
++    virtual css::uno::Any getValueEvent();
++};
++
++class SwVbaSystem : public SwVbaSystem_BASE
++{
++private:
++    PrivateProfileStringListener maPrivateProfileStringListener;
++
++public:
++	SwVbaSystem( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
++	virtual ~SwVbaSystem();
++
++	// XSystem
++	virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException );
++	virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException );
++    virtual css::uno::Any SAL_CALL PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( css::uno::RuntimeException );
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_SYSTEM_HXX */
+Index: sw/source/ui/vba/vbaselection.hxx
+===================================================================
+--- sw/source/ui/vba/vbaselection.hxx	(revision 0)
++++ sw/source/ui/vba/vbaselection.hxx	(revision 276288)
+@@ -0,0 +1,108 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_SELECTION_HXX
++#define SW_VBA_SELECTION_HXX
++
++#include <ooo/vba/word/XSelection.hpp>
++#include <ooo/vba/word/XRange.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/text/XTextViewCursor.hpp>
++#include <ooo/vba/word/XParagraphFormat.hpp>
++#include <ooo/vba/word/XFind.hpp>
++#include <ooo/vba/word/XStyle.hpp>
++#include <ooo/vba/word/XFont.hpp>
++#include <ooo/vba/word/XHeaderFooter.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSelection > SwVbaSelection_BASE;
++
++class SwVbaSelection : public SwVbaSelection_BASE
++{
++private:
++    css::uno::Reference< css::frame::XModel > mxModel;
++    css::uno::Reference< css::text::XTextViewCursor > mxTextViewCursor;
++    css::uno::Reference< ooo::vba::word::XRange > mxRange;
++
++    enum E_DIRECTION
++    {
++        MOVE_LEFT = 1,
++        MOVE_RIGHT,
++        MOVE_UP,
++        MOVE_DOWN
++    };
++
++private:
++    void NextCell( sal_Int32 nCount, E_DIRECTION eDirection ) throw ( css::uno::RuntimeException );
++    css::uno::Reference< css::text::XTextRange > GetSelectedRange() throw ( css::uno::RuntimeException );
++
++public:
++	SwVbaSelection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaSelection();
++    
++	// Attribute
++    virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL TypeText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XStyle > SAL_CALL getStyle() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setStyle( const css::uno::Reference< ooo::vba::word::XStyle >& _xStyle ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL TypeBackspace() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL GoTo( const css::uno::Any& _what, const css::uno::Any& _which, const css::uno::Any& _count, const css::uno::Any& _name ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL ShapeRange( ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_SELECTION_HXX */
+Index: sw/source/ui/vba/vbadocumentproperties.cxx
+===================================================================
+--- sw/source/ui/vba/vbadocumentproperties.cxx	(revision 0)
++++ sw/source/ui/vba/vbadocumentproperties.cxx	(revision 276288)
+@@ -0,0 +1,767 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadocument.cxx,v $
++ * $Revision: 1.7 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbadocumentproperties.hxx"
++#include <cppuhelper/implbase1.hxx>
++#include <cppuhelper/implbase3.hxx>
++#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
++#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
++#include <com/sun/star/beans/NamedValue.hpp>
++#include <com/sun/star/beans/XPropertyContainer.hpp>
++#include <ooo/vba/word/WdBuiltInProperty.hpp>
++#include <ooo/vba/office/MsoDocProperties.hpp>
++#include <memory>
++#include <boost/shared_ptr.hpp>
++#include "wordvbahelper.hxx"
++#include "fesh.hxx"
++#include "docsh.hxx"
++using namespace ::ooo::vba;
++using namespace css;
++
++sal_Int8 lcl_toMSOPropType( const uno::Type& aType ) throw ( lang::IllegalArgumentException )
++{
++    sal_Int16 msoType = office::MsoDocProperties::msoPropertyTypeString;
++
++    switch ( aType.getTypeClass() )
++    {
++        case uno::TypeClass_BOOLEAN:       
++            msoType =  office::MsoDocProperties::msoPropertyTypeBoolean;
++            break;
++        case uno::TypeClass_FLOAT:
++            msoType =  office::MsoDocProperties::msoPropertyTypeFloat;
++            break;
++        case uno::TypeClass_STRUCT: // Assume date
++            msoType =  office::MsoDocProperties::msoPropertyTypeDate;
++            break;
++        case  uno::TypeClass_BYTE:
++        case  uno::TypeClass_SHORT:
++        case  uno::TypeClass_LONG:
++        case  uno::TypeClass_HYPER:
++            msoType =  office::MsoDocProperties::msoPropertyTypeNumber;
++            break;
++        default:
++            throw lang::IllegalArgumentException();
++    }
++    return msoType;
++}
++
++class PropertGetSetHelper
++{
++protected:
++    uno::Reference< frame::XModel > m_xModel;
++    uno::Reference< beans::XPropertySet > mxProps;
++public:
++    PropertGetSetHelper( const uno::Reference< frame::XModel >& xModel ):m_xModel( xModel ) 
++    {
++        uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( m_xModel, uno::UNO_QUERY_THROW );
++        mxProps.set( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
++    }
++    virtual ~PropertGetSetHelper() {}
++    virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) = 0;
++    virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue ) = 0;
++    virtual uno::Reference< beans::XPropertySet > getUnoProperties() { return mxProps; }
++
++};
++
++class BuiltinPropertyGetSetHelper : public PropertGetSetHelper
++{
++public:
++    BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) 
++    {
++    }
++    virtual uno::Any getPropertyValue( const rtl::OUString& rPropName )
++    {
++        if ( rPropName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("EditingDuration" ) ) ) )
++        {
++            sal_Int32 nSecs = 0;
++            mxProps->getPropertyValue( rPropName ) >>= nSecs;
++            return uno::makeAny( nSecs/60 ); // minutes
++        }
++        return mxProps->getPropertyValue( rPropName );
++    }
++    virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue )
++    {
++        mxProps->setPropertyValue( rPropName, aValue );
++    }
++};
++
++class CustomPropertyGetSetHelper : public BuiltinPropertyGetSetHelper
++{
++public:
++    CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel )
++    {
++        uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( mxProps, uno::UNO_QUERY_THROW );
++        uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );  
++        mxProps.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW );
++    }
++};
++class StatisticPropertyGetSetHelper : public PropertGetSetHelper
++{
++    SwDocShell* mpDocShell;
++    uno::Reference< beans::XPropertySet > mxModelProps;
++public:
++    StatisticPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) , mpDocShell( NULL )
++    {
++            mxModelProps.set( m_xModel, uno::UNO_QUERY_THROW );
++            mpDocShell = word::getDocShell( xModel );
++    }
++    virtual uno::Any getPropertyValue( const rtl::OUString& rPropName )
++    {
++        uno::Sequence< beans::NamedValue > stats;
++        try 
++        {
++            // Characters, ParagraphCount & WordCount are available from
++            // the model ( and addtionally these also update the statics object )
++            //return mxProps->getPropertyValue( rPropName );
++            return mxModelProps->getPropertyValue( rPropName );
++        }
++        catch( uno::Exception& )
++        {
++            OSL_TRACE("Got exception");
++        }
++        uno::Any aReturn;
++        if ( rPropName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LineCount")) ) ) // special processing needed
++        {
++            if ( mpDocShell )
++            {
++                SwFEShell* pFEShell = mpDocShell->GetFEShell();
++                if(pFEShell)
++                {
++                    aReturn <<= pFEShell->GetLineCount(FALSE);
++                }
++            }
++        }
++        else
++        {
++            mxModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphCount") ) ) >>= stats;
++            mxProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ) ) >>= stats;
++  
++            sal_Int32 nLen = stats.getLength();
++            bool bFound = false;
++            for ( sal_Int32 index = 0; index < nLen && !bFound ; ++index )
++            {
++                if ( rPropName.equals( stats[ index ].Name ) )
++                {
++                    aReturn = stats[ index ].Value;
++                    bFound = true;
++                }  
++            }     
++            if ( !bFound )
++                throw uno::RuntimeException(); // bad Property
++        }
++        return aReturn;
++    }
++
++    virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue )
++    {
++
++        uno::Sequence< beans::NamedValue > stats;
++        mxProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ) ) >>= stats;
++  
++        sal_Int32 nLen = stats.getLength();
++        for ( sal_Int32 index = 0; index < nLen; ++index )
++        {
++            if ( rPropName.equals( stats[ index ].Name ) )
++            {
++                stats[ index ].Value = aValue;
++                mxProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ), uno::makeAny( stats ) );
++                break;
++            }  
++        }     
++    }
++};
++
++class DocPropInfo
++{
++public:
++    rtl::OUString msMSODesc;
++    rtl::OUString msOOOPropName;
++    boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
++    
++    static DocPropInfo createDocPropInfo( const rtl::OUString& sDesc, const rtl::OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
++    {
++        return createDocPropInfo( rtl::OUStringToOString( sDesc, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( sPropName, RTL_TEXTENCODING_UTF8 ).getStr(), rHelper );
++    }
++
++    static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
++    {
++        DocPropInfo aItem;
++        aItem.msMSODesc = rtl::OUString::createFromAscii( sDesc );
++        aItem.msOOOPropName = rtl::OUString::createFromAscii( sPropName );
++        aItem.mpPropGetSetHelper = rHelper;
++        return aItem;
++    }
++    uno::Any getValue() 
++    {
++        if ( mpPropGetSetHelper.get() )
++            return mpPropGetSetHelper->getPropertyValue( msOOOPropName ); 
++        return uno::Any();
++    }
++    void setValue( const uno::Any& rValue ) 
++    {
++        if ( mpPropGetSetHelper.get() )
++            mpPropGetSetHelper->setPropertyValue( msOOOPropName, rValue ); 
++    }
++    uno::Reference< beans::XPropertySet > getUnoProperties() 
++    { 
++        
++        uno::Reference< beans::XPropertySet > xProps;
++        if ( mpPropGetSetHelper.get() )
++            return mpPropGetSetHelper->getUnoProperties(); 
++        return xProps; 
++    }
++};
++
++
++typedef std::hash_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo;
++
++class BuiltInIndexHelper
++{
++    MSOIndexToOODocPropInfo m_docPropInfoMap;
++    BuiltInIndexHelper();
++public:
++    BuiltInIndexHelper( const uno::Reference< frame::XModel >& xModel )
++    {
++        boost::shared_ptr< PropertGetSetHelper > aStandardHelper( new BuiltinPropertyGetSetHelper( xModel ) );
++        boost::shared_ptr< PropertGetSetHelper > aUsingStatsHelper( new StatisticPropertyGetSetHelper( xModel ) );
++
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTitle ] = DocPropInfo::createDocPropInfo( "Title", "Title", aStandardHelper );
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySubject ] = DocPropInfo::createDocPropInfo( "Subject", "Subject", aStandardHelper );
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAuthor ] = DocPropInfo::createDocPropInfo( "Author", "Author", aStandardHelper );
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyKeywords ] = DocPropInfo::createDocPropInfo( "Keywords", "Keywords", aStandardHelper );
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyComments ] = DocPropInfo::createDocPropInfo( "Comments", "Description", aStandardHelper );
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTemplate ] = DocPropInfo::createDocPropInfo( "Template", "Template", aStandardHelper );
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLastAuthor ] = DocPropInfo::createDocPropInfo( "Last author", "ModifiedBy", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyRevision ] = DocPropInfo::createDocPropInfo( "Revision number", "EditingCycles", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAppName ] = DocPropInfo::createDocPropInfo( "Application name", "Generator", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastPrinted ] = DocPropInfo::createDocPropInfo( "Last print date", "PrintDate", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeCreated ] = DocPropInfo::createDocPropInfo( "Creation date", "CreationDate", aStandardHelper );
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastSaved ] = DocPropInfo::createDocPropInfo( "Last save time", "ModifyDate", aStandardHelper );
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyVBATotalEdit ] = DocPropInfo::createDocPropInfo( "Total editing time", "EditingDuration", aStandardHelper ); // Not sure if this is correct 
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyPages ] = DocPropInfo::createDocPropInfo( "Number of pages", "PageCount", aUsingStatsHelper ); // special handling required ?
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyWords ] = DocPropInfo::createDocPropInfo( "Number of words", "WordCount", aUsingStatsHelper ); // special handling require ?
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharacters ] = DocPropInfo::createDocPropInfo( "Number of characters", "CharacterCount", aUsingStatsHelper ); // special handling required ?
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySecurity ] = DocPropInfo::createDocPropInfo( "Security", "", aStandardHelper ); // doesn't seem to exist
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCategory ] = DocPropInfo::createDocPropInfo( "Category", "Category", aStandardHelper ); // hacked in
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyFormat ] = DocPropInfo::createDocPropInfo( "Format", "", aStandardHelper ); // doesn't seem to exist
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyManager ] = DocPropInfo::createDocPropInfo( "Manager", "Manager", aStandardHelper ); // hacked in
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCompany ] = DocPropInfo::createDocPropInfo( "Company", "Company", aStandardHelper ); // hacked in
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyBytes ] = DocPropInfo::createDocPropInfo( "Number of bytes", "", aStandardHelper ); // doesn't seem to exist - size on disk exists ( for an already saved document ) perhaps it will do ( or we need something else )
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLines ] = DocPropInfo::createDocPropInfo( "Number of lines", "LineCount", aUsingStatsHelper ); // special handling
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyParas ] = DocPropInfo::createDocPropInfo( "Number of paragraphs", "ParagraphCount", aUsingStatsHelper ); // special handling
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySlides ] = DocPropInfo::createDocPropInfo( "Number of slides", "" , aStandardHelper ); // doesn't seem to exist
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyNotes ] = DocPropInfo::createDocPropInfo( "Number of notes", "", aStandardHelper ); // doesn't seem to exist
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHiddenSlides ] = DocPropInfo::createDocPropInfo("Number of hidden Slides", "", aStandardHelper  ); // doesn't seem to exist
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyMMClips ] = DocPropInfo::createDocPropInfo( "Number of multimedia clips", "", aStandardHelper ); // doesn't seem to exist
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHyperlinkBase ] = DocPropInfo::createDocPropInfo( "Hyperlink base", "AutoloadURL", aStandardHelper );
++        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharsWSpaces ] = DocPropInfo::createDocPropInfo( "Number of characters (with spaces)", "", aStandardHelper ); // doesn't seem to be supported
++    }
++
++    MSOIndexToOODocPropInfo& getDocPropInfoMap() { return m_docPropInfoMap; }
++};
++
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentProperty > SwVbaDocumentProperty_BASE;
++
++class SwVbaBuiltInDocumentProperty : public SwVbaDocumentProperty_BASE
++{
++protected:
++    DocPropInfo mPropInfo;
++public:
++    SwVbaBuiltInDocumentProperty(  const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo );
++    // XDocumentProperty
++    virtual void SAL_CALL Delete(  ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual ::rtl::OUString SAL_CALL getName(  ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual ::sal_Int8 SAL_CALL getType(  ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual uno::Any SAL_CALL getValue(  ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual rtl::OUString SAL_CALL getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException);
++    //XDefaultProperty
++    virtual ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (uno::RuntimeException) { return rtl::OUString::createFromAscii("Value"); }
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++class SwVbaCustomDocumentProperty : public SwVbaBuiltInDocumentProperty
++{
++public:
++
++    SwVbaCustomDocumentProperty(  const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo );
++
++    virtual ::sal_Bool SAL_CALL getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException);
++
++    virtual rtl::OUString SAL_CALL getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual void SAL_CALL Delete(  ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException);
++    virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException);
++
++};
++
++
++SwVbaCustomDocumentProperty::SwVbaCustomDocumentProperty(  const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ) : SwVbaBuiltInDocumentProperty( xParent, xContext, rInfo )
++{
++}
++
++sal_Bool
++SwVbaCustomDocumentProperty::getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // #FIXME we need to store the link content somewhere
++    return sal_False;
++}
++
++void
++SwVbaCustomDocumentProperty::setLinkToContent( sal_Bool /*bLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++}
++
++rtl::OUString
++SwVbaCustomDocumentProperty::getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // #FIXME we need to store the link content somewhere
++    return rtl::OUString();;
++}
++
++void
++SwVbaCustomDocumentProperty::setLinkSource( const rtl::OUString& /*rsLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // #FIXME we need to store the link source somewhere
++}
++
++void SAL_CALL 
++SwVbaCustomDocumentProperty::setName( const ::rtl::OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // setName on existing property ? 
++    // #FIXME 
++    // do we need to delete existing property and create a new one?
++}
++
++void SAL_CALL 
++SwVbaCustomDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // setType, do we need to do a conversion?
++    // #FIXME the underlying value needs to be changed to the new type
++}
++
++void SAL_CALL 
++SwVbaCustomDocumentProperty::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    uno::Reference< beans::XPropertyContainer > xContainer( mPropInfo.getUnoProperties(), uno::UNO_QUERY_THROW );
++    xContainer->removeProperty( getName() );
++}
++
++SwVbaBuiltInDocumentProperty::SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ) : SwVbaDocumentProperty_BASE( xParent, xContext ), mPropInfo( rInfo )
++{
++} 
++
++void SAL_CALL 
++SwVbaBuiltInDocumentProperty::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // not valid for Builtin
++    throw uno::RuntimeException();
++}
++ 
++::rtl::OUString SAL_CALL 
++SwVbaBuiltInDocumentProperty::getName(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    return mPropInfo.msMSODesc;
++}
++
++void SAL_CALL
++SwVbaBuiltInDocumentProperty::setName( const rtl::OUString& ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // not valid for Builtin
++    throw uno::RuntimeException();
++}
++
++::sal_Int8 SAL_CALL 
++SwVbaBuiltInDocumentProperty::getType(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    return lcl_toMSOPropType( getValue().getValueType() );
++}
++
++void SAL_CALL 
++SwVbaBuiltInDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // not valid for Builtin
++    throw uno::RuntimeException();
++}
++
++::sal_Bool SAL_CALL 
++SwVbaBuiltInDocumentProperty::getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    return sal_False; // built-in always false
++}
++
++void SAL_CALL 
++SwVbaBuiltInDocumentProperty::setLinkToContent( ::sal_Bool /*LinkToContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // not valid for Builtin
++    throw uno::RuntimeException();
++}
++
++uno::Any SAL_CALL 
++SwVbaBuiltInDocumentProperty::getValue(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    uno::Any aRet = mPropInfo.getValue();
++    if ( !aRet.hasValue() )
++        throw uno::RuntimeException();
++    return aRet;
++}
++
++void SAL_CALL 
++SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    mPropInfo.setValue( Value );
++}
++
++rtl::OUString SAL_CALL 
++SwVbaBuiltInDocumentProperty::getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // not valid for Builtin
++    throw uno::RuntimeException();
++}
++
++void SAL_CALL 
++SwVbaBuiltInDocumentProperty::setLinkSource( const rtl::OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // not valid for Builtin
++    throw uno::RuntimeException();
++}
++
++rtl::OUString& 
++SwVbaBuiltInDocumentProperty::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperty") );
++    return sImplName;    
++}
++
++uno::Sequence<rtl::OUString> 
++SwVbaBuiltInDocumentProperty::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.DocumentProperty" ) );
++    }
++    return aServiceNames;
++}
++typedef ::cppu::WeakImplHelper3< com::sun::star::container::XIndexAccess
++        ,com::sun::star::container::XNameAccess
++        ,com::sun::star::container::XEnumerationAccess
++        > PropertiesImpl_BASE;
++
++typedef std::hash_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps;
++
++typedef ::cppu::WeakImplHelper1< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE;
++class DocPropEnumeration : public DocPropEnumeration_BASE
++{
++    DocProps mDocProps;
++    DocProps::iterator mIt;
++public:
++    
++    DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.begin() ) {}
++    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
++    {
++        return mIt != mDocProps.end();
++    }
++    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        if ( !hasMoreElements() )
++            throw container::NoSuchElementException();
++        return uno::makeAny( mIt++->second );
++    }
++};
++
++typedef std::hash_map< rtl::OUString, uno::Reference< XDocumentProperty >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > DocPropsByName;
++
++class BuiltInPropertiesImpl : public PropertiesImpl_BASE
++{
++protected:
++
++    uno::Reference< XHelperInterface > m_xParent;
++    uno::Reference< uno::XComponentContext > m_xContext;
++    uno::Reference< frame::XModel > m_xModel;
++    uno::Reference< document::XDocumentInfo > m_xOOOBuiltIns;
++ 
++    DocProps mDocProps;
++    DocPropsByName mNamedDocProps;
++      
++    public:
++    BuiltInPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel )
++    {
++    	BuiltInIndexHelper builtIns( m_xModel );
++        for ( sal_Int32 index = word::WdBuiltInProperty::wdPropertyTitle; index <= word::WdBuiltInProperty::wdPropertyCharsWSpaces; ++index )
++        {
++            mDocProps[ index ] = new SwVbaBuiltInDocumentProperty( xParent, xContext, builtIns.getDocPropInfoMap()[ index ] );
++            mNamedDocProps[ mDocProps[ index ]->getName() ] = mDocProps[ index ];
++        } 
++    }
++// XIndexAccess
++    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
++    {
++        return mDocProps.size();
++    }
++    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException )
++    {
++        // correct the correct by the base class for 1 based indices
++        DocProps::iterator it = mDocProps.find( ++Index );
++        if ( it == mDocProps.end() )
++            throw lang::IndexOutOfBoundsException();
++        return uno::makeAny( it->second  );
++    }
++    virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        if ( !hasByName( aName ) )
++		throw container::NoSuchElementException();
++        DocPropsByName::iterator it = mNamedDocProps.find( aName );
++        return uno::Any( it->second );
++        
++    }
++    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
++    {
++        uno::Sequence< rtl::OUString > aNames( getCount() );
++        rtl::OUString* pName = aNames.getArray();
++        DocPropsByName::iterator it_end = mNamedDocProps.end();
++        for(  DocPropsByName::iterator it = mNamedDocProps.begin(); it != it_end; ++it, ++pName )
++           *pName = it->first;
++        return aNames; 
++    }
++
++    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
++    {
++        DocPropsByName::iterator it = mNamedDocProps.find( aName );
++        if ( it == mNamedDocProps.end() )
++            return sal_False;
++        return sal_True;
++    }
++// XElementAccess
++    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) 
++    {
++        return  XDocumentProperty::static_type(0); 
++    }
++    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
++    {
++        return mDocProps.size() > 0;
++    }
++    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
++    {
++        return new DocPropEnumeration( mDocProps );
++    }
++};
++
++SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaDocumentproperties_BASE( xParent, xContext,  uno::Reference< container::XIndexAccess >( new BuiltInPropertiesImpl( xParent, xContext, xModel ) ) ), m_xModel( xModel )
++{
++} 
++
++uno::Reference< XDocumentProperty > SAL_CALL 
++SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    throw uno::RuntimeException(
++        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("not supported for Builtin properties") ), uno::Reference< uno::XInterface >() );
++}
++
++// XEnumerationAccess
++uno::Type SAL_CALL 
++SwVbaBuiltinDocumentProperties::getElementType() throw (uno::RuntimeException)
++{
++    return  XDocumentProperty::static_type(0); 
++}
++
++uno::Reference< container::XEnumeration > SAL_CALL 
++SwVbaBuiltinDocumentProperties::createEnumeration() throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
++    return xEnumAccess->createEnumeration();
++}
++
++// ScVbaCollectionBaseImpl      
++uno::Any 
++SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource )
++{
++    // pass through
++    return aSource;
++}
++
++// XHelperInterface
++rtl::OUString& 
++SwVbaBuiltinDocumentProperties::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperties") );
++    return sImplName;    
++}
++
++uno::Sequence<rtl::OUString> 
++SwVbaBuiltinDocumentProperties::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.DocumentProperties" ) );
++    }
++    return aServiceNames;
++}
++
++class CustomPropertiesImpl : public PropertiesImpl_BASE
++{
++    uno::Reference< XHelperInterface > m_xParent;
++    uno::Reference< uno::XComponentContext > m_xContext;
++    uno::Reference< frame::XModel > m_xModel;
++    uno::Reference< beans::XPropertySet > mxUserDefinedProp;
++    boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
++public:
++    CustomPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel )
++    {
++        // suck in the document( custom ) properties
++        uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( m_xModel, uno::UNO_QUERY_THROW );
++        uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );     
++        uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );     
++        mxUserDefinedProp.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW );     
++        mpPropGetSetHelper.reset( new CustomPropertyGetSetHelper( m_xModel ) );
++    }; 
++    // XIndexAccess
++    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
++    {
++        return mxUserDefinedProp->getPropertySetInfo()->getProperties().getLength();
++    }
++
++    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException )
++    {
++        uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties();
++        if ( Index >= aProps.getLength() )
++            throw lang::IndexOutOfBoundsException();
++        // How to determine type e.g Date? ( com.sun.star.util.DateTime )
++        DocPropInfo aPropInfo = DocPropInfo::createDocPropInfo( aProps[ Index ].Name, aProps[ Index ].Name, mpPropGetSetHelper );
++        return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) );
++    }
++
++    virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        if ( !hasByName( aName ) )
++            throw container::NoSuchElementException();
++
++        DocPropInfo aPropInfo = DocPropInfo::createDocPropInfo( aName, aName, mpPropGetSetHelper );
++        return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) );
++    }
++
++    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
++    {
++        uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties();
++        uno::Sequence< rtl::OUString > aNames( aProps.getLength() );
++        rtl::OUString* pString = aNames.getArray();
++        rtl::OUString* pEnd = ( pString + aNames.getLength() );
++        beans::Property* pProp = aProps.getArray();
++        for ( ; pString != pEnd; ++pString, ++pProp )
++            *pString = pProp->Name;
++        return aNames;
++    }
++
++    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
++    {
++        OSL_TRACE("hasByName(%s) returns %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) );
++        return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName );
++    }
++
++    // XElementAccess
++    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) 
++    {
++        return  XDocumentProperty::static_type(0); 
++    }
++
++    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
++    {
++        return getCount() > 0;
++    }
++
++    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
++    {
++        // create a map of properties ( the key doesn't matter )
++        OSL_TRACE("Creating an enumeration");
++        sal_Int32 key = 0;
++        sal_Int32 nElem =  getCount();
++        DocProps simpleDocPropSnapShot;
++        for ( ; key < nElem; ++key )
++             simpleDocPropSnapShot[ key ].set( getByIndex( key ), uno::UNO_QUERY_THROW );
++        OSL_TRACE("After creating the enumeration");
++        return  new DocPropEnumeration( simpleDocPropSnapShot );
++    }
++
++    void addProp( const ::rtl::OUString& Name, ::sal_Int8 /*Type*/, const uno::Any& Value )
++    {
++        sal_Int16 attributes = 128;
++        uno::Reference< beans::XPropertyContainer > xContainer( mxUserDefinedProp, uno::UNO_QUERY_THROW );
++        // TODO fixme, perform the necessary Type Value conversions
++        xContainer->addProperty( Name, attributes, Value );
++    }
++
++};
++
++
++SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaBuiltinDocumentProperties( xParent, xContext, xModel )
++{
++    // replace the m_xIndexAccess implementation ( we need a virtual init )
++    m_xIndexAccess.set( new CustomPropertiesImpl( xParent, xContext, xModel ) );
++    m_xNameAccess.set( m_xIndexAccess, uno::UNO_QUERY_THROW );
++}
++
++uno::Reference< XDocumentProperty > SAL_CALL 
++SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    CustomPropertiesImpl* pCustomProps = dynamic_cast< CustomPropertiesImpl* > ( m_xIndexAccess.get() );
++    uno::Reference< XDocumentProperty > xDocProp;
++    if ( pCustomProps )
++    {
++        rtl::OUString sLinkSource;
++        pCustomProps->addProp( Name, Type, Value );
++
++        xDocProp.set( m_xNameAccess->getByName( Name ), uno::UNO_QUERY_THROW );
++        xDocProp->setLinkToContent( LinkToContent );
++
++        if ( LinkSource >>= sLinkSource )
++           xDocProp->setLinkSource( sLinkSource );
++    }
++    return xDocProp;
++}
++
++// XHelperInterface
++rtl::OUString& 
++SwVbaCustomDocumentProperties::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaCustomDocumentProperties") );
++    return sImplName;    
++}
+Index: sw/source/ui/vba/vbatable.hxx
+===================================================================
+--- sw/source/ui/vba/vbatable.hxx	(revision 0)
++++ sw/source/ui/vba/vbatable.hxx	(revision 276288)
+@@ -0,0 +1,28 @@
++#ifndef SW_VBA_TABLE_HXX
++#define SW_VBA_TABLE_HXX
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/text/XTextDocument.hpp>
++#include <com/sun/star/text/XTextTable.hpp>
++#include <ooo/vba/word/XRange.hpp>
++#include <ooo/vba/word/XTable.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XTable > SwVbaTable_BASE;
++
++class SwVbaTable : public SwVbaTable_BASE
++{
++    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
++    css::uno::Reference< css::text::XTextTable > mxTextTable;
++public:
++    SwVbaTable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextTable >& xTextTable) throw ( css::uno::RuntimeException);;
++    css::uno::Reference< css::text::XTextDocument > getDocument() { return mxTextDocument; };
++    virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
++    virtual void SAL_CALL Select(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    virtual rtl::OUString SAL_CALL getName( ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();  
++};
++#endif
+Index: sw/source/ui/vba/vbasections.hxx
+===================================================================
+--- sw/source/ui/vba/vbasections.hxx	(revision 0)
++++ sw/source/ui/vba/vbasections.hxx	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_SECTIONS_HXX
++#define SW_VBA_SECTIONS_HXX
++
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <ooo/vba/word/XSections.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <com/sun/star/container/XIndexAccess.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef CollTestImplHelper< ooo::vba::word::XSections > SwVbaSections_BASE;
++
++class SwVbaSections : public SwVbaSections_BASE
++{
++private:
++    css::uno::Reference< css::frame::XModel > mxModel;
++
++public:
++	SwVbaSections( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
++	virtual ~SwVbaSections() {}
++
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++    virtual css::uno::Any SAL_CALL PageSetup(  ) throw (css::uno::RuntimeException);
++
++	// SwVbaSections_BASE
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};    
++
++#endif /* SW_VBA_SECTIONS_HXX */
+Index: sw/source/ui/vba/vbapalette.cxx
+===================================================================
+--- sw/source/ui/vba/vbapalette.cxx	(revision 0)
++++ sw/source/ui/vba/vbapalette.cxx	(revision 276288)
+@@ -0,0 +1,75 @@
++#include "vbapalette.hxx"
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <ooo/vba/word/WdColor.hpp>
++#include <ooo/vba/word/WdColorIndex.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::ooo::vba::word;
++using namespace ::com::sun::star;
++
++static const sal_Int32 ColorTable[] =
++{
++WdColor::wdColorAutomatic, // 0
++WdColor::wdColorBlack,             // 1
++WdColor::wdColorBlue,               // 2 
++WdColor::wdColorTurquoise,     // 3
++WdColor::wdColorBrightGreen, // 4
++WdColor::wdColorPink,               // 5
++WdColor::wdColorRed,                 // 6
++WdColor::wdColorYellow,           // 7
++WdColor::wdColorWhite,             // 8
++WdColor::wdColorDarkBlue,       // 9
++WdColor::wdColorTeal,               // 10
++WdColor::wdColorGreen,             // 11
++WdColor::wdColorViolet,           // 12
++WdColor::wdColorDarkRed,         // 13
++WdColor::wdColorDarkYellow,   // 14
++WdColor::wdColorGray50,           // 15
++WdColor::wdColorGray25,           // 16
++};
++
++typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE;
++
++class DefaultPalette : public XIndexAccess_BASE
++{
++public:
++   DefaultPalette(){}
++
++    // Methods XIndexAccess
++    virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException)
++    {
++        return sizeof(ColorTable) / sizeof(ColorTable[0]);
++    }
++
++    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++	if ( Index < 0 || Index >= getCount() )
++		throw lang::IndexOutOfBoundsException();
++        return uno::makeAny( sal_Int32( ColorTable[ Index ] ) );
++    }
++
++    // Methods XElementAcess
++    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
++    {
++        return ::getCppuType( (sal_Int32*)0 );
++    }
++    virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException)
++    {
++        return sal_True;
++    }
++
++};
++
++VbaPalette::VbaPalette()
++{
++    mxPalette = new DefaultPalette();
++}
++
++uno::Reference< container::XIndexAccess >
++VbaPalette::getPalette() const
++{
++
++	return mxPalette;	
++}
++
+Index: sw/source/ui/vba/vbaoptions.hxx
+===================================================================
+--- sw/source/ui/vba/vbaoptions.hxx	(revision 0)
++++ sw/source/ui/vba/vbaoptions.hxx	(revision 276288)
+@@ -0,0 +1,90 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbasystem.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_OPTIONS_HXX
++#define SW_VBA_OPTIONS_HXX
++
++#include <ooo/vba/word/XOptions.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <vbahelper/vbapropvalue.hxx>
++#include <comphelper/processfactory.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XOptions > SwVbaOptions_BASE;
++
++class SwVbaOptions : public SwVbaOptions_BASE, 
++                    public PropListener
++{
++private:
++    rtl::OUString msDefaultFilePath;
++    css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory;
++public:
++	SwVbaOptions( css::uno::Reference< css::uno::XComponentContext >& m_xContext ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaOptions();
++
++    // Attributes
++    virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getReplaceSelection() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setReplaceSelection( ::sal_Bool _replaceselection ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getMapPaperSize() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMapPaperSize( ::sal_Bool _mappapersize ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _autoformatasyoutypeapplyheadings ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _autoformatasyoutypedefinestyles ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getAutoFormatApplyHeadings() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setAutoFormatApplyHeadings( ::sal_Bool _autoformatapplyheadings ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getAutoFormatApplyLists() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setAutoFormatApplyLists( ::sal_Bool _autoformatapplylists ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setAutoFormatApplyBulletedLists( ::sal_Bool _autoformatapplybulletedlists ) throw (css::uno::RuntimeException);
++
++    // Methods
++    virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) throw ( css::uno::RuntimeException );
++
++    //PropListener
++    virtual void setValueEvent( const css::uno::Any& value );
++    virtual css::uno::Any getValueEvent();
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_OPTIONS_HXX */
+Index: sw/source/ui/vba/vbadocuments.cxx
+===================================================================
+--- sw/source/ui/vba/vbadocuments.cxx	(revision 0)
++++ sw/source/ui/vba/vbadocuments.cxx	(revision 276288)
+@@ -0,0 +1,181 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadocuments.cxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <comphelper/processfactory.hxx>
++
++#include <cppuhelper/implbase1.hxx>
++#include <cppuhelper/implbase3.hxx>
++
++#include <com/sun/star/frame/XDesktop.hpp>
++#include <com/sun/star/text/XTextDocument.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <com/sun/star/frame/XComponentLoader.hpp>
++#include <com/sun/star/lang/XComponent.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/frame/XFrame.hpp>
++#include <com/sun/star/frame/FrameSearchFlag.hpp>
++#include <com/sun/star/util/XModifiable.hpp>
++#include <com/sun/star/frame/XStorable.hpp>
++#include <com/sun/star/lang/DisposedException.hpp>
++#include <com/sun/star/beans/PropertyVetoException.hpp>
++#include <com/sun/star/util/XCloseable.hpp>
++#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
++#include <com/sun/star/document/XTypeDetection.hpp>
++#include <com/sun/star/uri/XUriReference.hpp>
++#include <com/sun/star/uri/XUriReferenceFactory.hpp>
++
++#include <sfx2/objsh.hxx>
++#include <tools/urlobj.hxx>
++
++#include "vbaglobals.hxx"
++#include "vbadocument.hxx"
++#include "vbadocuments.hxx"
++#include <vbahelper/vbahelper.hxx>
++
++#include <hash_map>
++#include <osl/file.hxx>
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++static uno::Any
++getDocument( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< text::XTextDocument > &xDoc, const uno::Any& aApplication )
++{
++	// FIXME: fine as long as SwVbaDocument is stateless ...
++	uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY );
++	if( !xModel.is() )
++		return uno::Any();
++	
++	SwVbaDocument *pWb = new SwVbaDocument(  uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext, xModel );
++	return uno::Any( uno::Reference< word::XDocument > (pWb) );
++}
++
++class DocumentEnumImpl : public EnumerationHelperImpl
++{
++	uno::Any m_aApplication;
++public:
++	DocumentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), m_aApplication( aApplication ) {}
++
++	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
++	{ 
++		uno::Reference< text::XTextDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
++		return getDocument( m_xContext, xDoc, m_aApplication );
++	}
++};
++
++SwVbaDocuments::SwVbaDocuments( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) : SwVbaDocuments_BASE( xParent, xContext, VbaDocumentsBase::WORD_DOCUMENT )
++{
++}
++// XEnumerationAccess
++uno::Type
++SwVbaDocuments::getElementType() throw (uno::RuntimeException)
++{
++	return word::XDocument::static_type(0);
++}
++uno::Reference< container::XEnumeration >
++SwVbaDocuments::createEnumeration() throw (uno::RuntimeException)
++{
++	// #FIXME its possible the DocumentEnumImpl here doens't reflect
++	// the state of this object ( although it should ) would be 
++	// safer to create an enumeration based on this objects state
++	// rather than one effectively based of the desktop component
++    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
++	return new DocumentEnumImpl( mxContext, xEnumerationAccess->createEnumeration(), Application() );
++}
++
++uno::Any
++SwVbaDocuments::createCollectionObject( const uno::Any& aSource )
++{
++	uno::Reference< text::XTextDocument > xDoc( aSource, uno::UNO_QUERY_THROW );
++	return getDocument( mxContext, xDoc, Application() );
++}
++
++uno::Any SAL_CALL
++SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& NewTemplate, const uno::Any& DocumentType, const uno::Any& Visible ) throw (uno::RuntimeException)
++{
++    rtl::OUString sFileName;
++    if( Template.hasValue() && ( Template >>= sFileName ) )
++    {
++        return  Open( sFileName, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any());
++    }
++    uno::Reference <text::XTextDocument> xTextDoc( VbaDocumentsBase::Add() , uno::UNO_QUERY_THROW );
++
++    if( xTextDoc.is() )
++        return getDocument( mxContext, xTextDoc, Application() );
++    return uno::Any();
++}
++
++// #TODO# #FIXME# can any of the unused params below be used?
++void SAL_CALL
++SwVbaDocuments::Close( const uno::Any& SaveChanges, const uno::Any& OriginalFormat, const uno::Any& RouteDocument ) throw (uno::RuntimeException)
++{
++    VbaDocumentsBase::Close();
++}
++
++// #TODO# #FIXME# can any of the unused params below be used?
++uno::Any SAL_CALL
++SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToRecentFiles, const uno::Any& PasswordDocument, const uno::Any& PasswordTemplate, const uno::Any& Revert, const uno::Any& WritePasswordDocument, const uno::Any& WritePasswordTemplate, const uno::Any& Format, const uno::Any& Encoding, const uno::Any& Visible, const uno::Any& OpenAndRepair, const uno::Any& DocumentDirection, const uno::Any& NoEncodingDialog, const uno::Any& XMLTransform ) throw (uno::RuntimeException)
++{
++	// we need to detect if this is a URL, if not then assume its a file path
++    rtl::OUString aURL;
++    INetURLObject aObj;
++	aObj.SetURL( Filename );
++	bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
++	if ( bIsURL )
++		aURL = Filename;
++	else
++		osl::FileBase::getFileURLFromSystemPath( Filename, aURL );
++
++	uno::Sequence< beans::PropertyValue > sProps(0);
++
++	uno::Reference <text::XTextDocument> xSpreadDoc( VbaDocumentsBase::Open( Filename, ReadOnly, sProps ), uno::UNO_QUERY_THROW );
++	uno::Any aRet = getDocument( mxContext, xSpreadDoc, Application() );
++	uno::Reference< word::XDocument > xDocument( aRet, uno::UNO_QUERY );
++	if ( xDocument.is() )
++		xDocument->Activate();
++	return aRet;
++}
++
++rtl::OUString& 
++SwVbaDocuments::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocuments") );
++	return sImplName;
++}
++
++uno::Sequence<rtl::OUString> 
++SwVbaDocuments::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > sNames;
++	if ( sNames.getLength() == 0 )
++	{
++		sNames.realloc( 1 );
++		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Documents") );
++	}
++	return sNames;
++}
+Index: sw/source/ui/vba/vbarangehelper.hxx
+===================================================================
+--- sw/source/ui/vba/vbarangehelper.hxx	(revision 0)
++++ sw/source/ui/vba/vbarangehelper.hxx	(revision 276288)
+@@ -0,0 +1,46 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_RANGEHELPER_HXX
++#define SW_VBA_RANGEHELPER_HXX
++
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/text/XTextViewCursor.hpp>
++#include <com/sun/star/text/XText.hpp>
++
++class SwVbaRangeHelper
++{
++public:
++    static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException );
++    static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException );
++    static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException );
++    static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw ( css::uno::RuntimeException );
++
++};
++#endif /* SW_VBA_RANGEHELPER_HXX */
+Index: sw/source/ui/vba/vbaaddins.cxx
+===================================================================
+--- sw/source/ui/vba/vbaaddins.cxx	(revision 0)
++++ sw/source/ui/vba/vbaaddins.cxx	(revision 276288)
+@@ -0,0 +1,110 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaaddins.hxx"
++#include "vbaaddin.hxx"
++#include <cppuhelper/implbase3.hxx>
++#include <svtools/pathoptions.hxx>
++#include <com/sun/star/lang/XMultiComponentFactory.hpp>
++#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext )
++{
++    XNamedObjectCollectionHelper< word::XAddin >::XNamedVec maAddins;
++
++    // first get the autoload addins in the directory STARTUP
++    uno::Reference< lang::XMultiComponentFactory > xMCF( xContext->getServiceManager(), uno::UNO_QUERY_THROW );
++    uno::Reference< ucb::XSimpleFileAccess > xSFA( xMCF->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), xContext), uno::UNO_QUERY_THROW );
++    SvtPathOptions aPathOpt;
++    // FIXME: temporary the STARTUP path is located in $OO/basic3.1/program/addin
++    String aAddinPath = aPathOpt.GetAddinPath();
++    OSL_TRACE("lcl_getAddinCollection: %s", rtl::OUStringToOString( aAddinPath, RTL_TEXTENCODING_UTF8 ).getStr() );
++    if( xSFA->isFolder( aAddinPath ) )
++    {
++        uno::Sequence< rtl::OUString > sEntries = xSFA->getFolderContents( aAddinPath, sal_False );
++        sal_Int32 nEntry = sEntries.getLength();
++        for( sal_Int32 index = 0; index < nEntry; ++index )
++        {
++            rtl::OUString sUrl = sEntries[ index ];
++            if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) )
++            {
++                maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl, sal_True ) ) );
++            }
++        }
++    }
++
++    // TODO: second get the customize addins in the org.openoffice.Office.Writer/GlobalTemplateList
++
++    uno::Reference< container::XIndexAccess > xAddinsAccess( new XNamedObjectCollectionHelper< word::XAddin >( maAddins ) );
++    return xAddinsAccess;
++}
++
++SwVbaAddins::SwVbaAddins( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext ) throw (uno::RuntimeException): SwVbaAddins_BASE( xParent, xContext, lcl_getAddinCollection( xParent,xContext ) )
++{
++}
++// XEnumerationAccess
++uno::Type
++SwVbaAddins::getElementType() throw (uno::RuntimeException)
++{
++	return word::XAddin::static_type(0);
++}
++uno::Reference< container::XEnumeration >
++SwVbaAddins::createEnumeration() throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
++    return xEnumerationAccess->createEnumeration();
++}
++
++uno::Any
++SwVbaAddins::createCollectionObject( const css::uno::Any& aSource )
++{
++    return aSource;
++}
++
++rtl::OUString& 
++SwVbaAddins::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAddins") );
++	return sImplName;
++}
++
++css::uno::Sequence<rtl::OUString> 
++SwVbaAddins::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > sNames;
++	if ( sNames.getLength() == 0 )
++	{
++		sNames.realloc( 1 );
++		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Addins") );
++	}
++	return sNames;
++}
+Index: sw/source/ui/vba/vbareplacement.hxx
+===================================================================
+--- sw/source/ui/vba/vbareplacement.hxx	(revision 0)
++++ sw/source/ui/vba/vbareplacement.hxx	(revision 276288)
+@@ -0,0 +1,57 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_REPLACEMENT_HXX
++#define SW_VBA_REPLACEMENT_HXX
++
++#include <ooo/vba/word/XReplacement.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/util/XPropertyReplace.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XReplacement > SwVbaReplacement_BASE;
++
++class SwVbaReplacement : public SwVbaReplacement_BASE
++{
++private:
++    css::uno::Reference< css::util::XPropertyReplace> mxPropertyReplace;
++
++public:
++	SwVbaReplacement( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::util::XPropertyReplace >& xPropertyReplace ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaReplacement();
++
++    // Attributes
++    virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_REPLACEMENT_HXX */
+Index: sw/source/ui/vba/vbasection.cxx
+===================================================================
+--- sw/source/ui/vba/vbasection.cxx	(revision 0)
++++ sw/source/ui/vba/vbasection.cxx	(revision 276288)
+@@ -0,0 +1,90 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbasection.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include "vbapagesetup.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaSection::SwVbaSection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) throw ( uno::RuntimeException ) :
++    SwVbaSection_BASE( rParent, rContext ), mxModel( xModel ), mxPageProps( xProps )
++{
++}
++
++SwVbaSection::~SwVbaSection()
++{
++}
++
++::sal_Bool SAL_CALL SwVbaSection::getProtectedForForms() throw (uno::RuntimeException)
++{
++    return sal_False;
++}
++
++void SAL_CALL SwVbaSection::setProtectedForForms( ::sal_Bool _protectedforforms ) throw (uno::RuntimeException)
++{
++}
++
++uno::Any SAL_CALL SwVbaSection::Headers(  ) throw (uno::RuntimeException)
++{
++    return uno::Any();
++}
++
++uno::Any SAL_CALL SwVbaSection::Footers(  ) throw (uno::RuntimeException)
++{
++    return uno::Any();
++}
++
++uno::Any SAL_CALL
++SwVbaSection::PageSetup( ) throw (uno::RuntimeException)
++{
++    return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) );
++}
++
++rtl::OUString& 
++SwVbaSection::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSection") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaSection::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Section" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbastyle.hxx
+===================================================================
+--- sw/source/ui/vba/vbastyle.hxx	(revision 0)
++++ sw/source/ui/vba/vbastyle.hxx	(revision 276288)
+@@ -0,0 +1,70 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile:  $
++ * $Revision:  $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_STYLE_HXX
++#define SW_VBA_STYLE_HXX
++#include <ooo/vba/word/XStyle.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/container/XNameContainer.hpp>
++#include <com/sun/star/style/XStyle.hpp>
++#include <ooo/vba/word/XFont.hpp>
++
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XStyle > SwVbaStyle_BASE;
++
++class SwVbaStyle : public SwVbaStyle_BASE
++{
++private:
++	css::uno::Reference< css::beans::XPropertySet > mxStyleProps;
++	css::uno::Reference< css::style::XStyle > mxStyle;
++public:
++	SwVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
++	virtual ~SwVbaStyle(){}
++
++    static void setStyle( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, const css::uno::Reference< ooo::vba::word::XStyle >& xStyle ) throw (css::uno::RuntimeException);
++    static rtl::OUString getOOoStyleTypeFromMSWord( sal_Int32 _wdStyleType );
++    static sal_Int32 getLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps ) throw (css::uno::RuntimeException);
++    static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException);
++
++    // Attributes
++    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setName( const rtl::OUString& Name ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif //SW_VBA_AXIS_HXX
+Index: sw/source/ui/vba/vbaparagraph.cxx
+===================================================================
+--- sw/source/ui/vba/vbaparagraph.cxx	(revision 0)
++++ sw/source/ui/vba/vbaparagraph.cxx	(revision 276288)
+@@ -0,0 +1,177 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaparagraph.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include "vbarange.hxx"
++#include <com/sun/star/lang/XServiceInfo.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaParagraph::SwVbaParagraph( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xDocument, const uno::Reference< text::XTextRange >& xTextRange ) throw ( uno::RuntimeException ) :
++    SwVbaParagraph_BASE( rParent, rContext ), mxTextDocument( xDocument ), mxTextRange( xTextRange )
++{
++}
++
++SwVbaParagraph::~SwVbaParagraph()
++{
++}
++
++uno::Reference< word::XRange > SAL_CALL 
++SwVbaParagraph::getRange( ) throw ( uno::RuntimeException )
++{
++    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText(), sal_True ) );
++}
++
++rtl::OUString& 
++SwVbaParagraph::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraph") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaParagraph::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Paragraph" ) );
++	}
++	return aServiceNames;
++}
++
++
++//typedef ::cppu::WeakImplHelper1< container::XEnumeration > ParagraphEnumeration_BASE;
++typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > ParagraphCollectionHelper_BASE;
++
++class ParagraphCollectionHelper : public ParagraphCollectionHelper_BASE
++{
++private:
++    uno::Reference< text::XTextDocument > mxTextDocument;
++    
++    uno::Reference< container::XEnumeration > getEnumeration() throw (uno::RuntimeException)
++    {
++        uno::Reference< container::XEnumerationAccess > xParEnumAccess( mxTextDocument->getText(), uno::UNO_QUERY_THROW );
++        return xParEnumAccess->createEnumeration();
++    }
++
++public:
++    ParagraphCollectionHelper( const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException): mxTextDocument( xDocument )
++    {
++    }
++	// XElementAccess
++	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) { return  text::XTextRange::static_type(0); }
++	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) { return sal_True; }
++	// XIndexAccess
++	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
++    {
++        sal_Int32 nCount = 0;
++        uno::Reference< container::XEnumeration > xParEnum = getEnumeration();
++        while( xParEnum->hasMoreElements() )
++        {
++            uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW );
++            if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Paragraph") ) ) )
++            {
++                nCount++;
++            }
++        }
++        return nCount;
++    }	
++	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
++	{
++        if( Index < getCount() )
++        {
++            sal_Int32 nCount = 0;
++            uno::Reference< container::XEnumeration > xParEnum = getEnumeration();
++            while( xParEnum->hasMoreElements() )
++            {
++                uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW );
++                if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Paragraph") ) ) )
++                {
++                    if( Index == nCount )
++                        return uno::makeAny( xServiceInfo );
++                    nCount++;
++                }        
++            }
++        }
++        throw lang::IndexOutOfBoundsException();
++    }
++	// XEnumerationAccess
++	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
++	{
++		return getEnumeration();
++    }    
++};
++
++SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument )
++{
++}
++
++// XEnumerationAccess
++uno::Type
++SwVbaParagraphs::getElementType() throw (uno::RuntimeException)
++{
++	return word::XParagraph::static_type(0);
++}
++uno::Reference< container::XEnumeration >
++SwVbaParagraphs::createEnumeration() throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
++    return xEnumerationAccess->createEnumeration();
++}
++
++uno::Any
++SwVbaParagraphs::createCollectionObject( const css::uno::Any& aSource )
++{
++    uno::Reference< text::XTextRange > xTextRange( aSource, uno::UNO_QUERY_THROW );
++    return uno::makeAny( uno::Reference< word::XParagraph >( new SwVbaParagraph( this, mxContext, mxTextDocument, xTextRange ) ) );
++}
++
++rtl::OUString& 
++SwVbaParagraphs::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphs") );
++	return sImplName;
++}
++
++css::uno::Sequence<rtl::OUString> 
++SwVbaParagraphs::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > sNames;
++	if ( sNames.getLength() == 0 )
++	{
++		sNames.realloc( 1 );
++		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Paragraphs") );
++	}
++	return sNames;
++}
+Index: sw/source/ui/vba/vbawindow.cxx
+===================================================================
+--- sw/source/ui/vba/vbawindow.cxx	(revision 0)
++++ sw/source/ui/vba/vbawindow.cxx	(revision 276288)
+@@ -0,0 +1,116 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbawindow.cxx,v $
++ * $Revision: 1.5 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <vbahelper/helperdecl.hxx>
++#include "vbawindow.hxx"
++#include "vbaglobals.hxx"
++#include "vbadocument.hxx"
++#include "vbaview.hxx"
++#include "vbapanes.hxx"
++#include "vbapane.hxx"
++
++using namespace ::com::sun::star;
++using namespace ::ooo::vba;
++
++SwVbaWindow::SwVbaWindow( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowImpl_BASE( xParent, xContext, xModel )
++{
++}
++
++SwVbaWindow::SwVbaWindow( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext )  
++        : WindowImpl_BASE( args, xContext )
++{
++}
++
++void
++SwVbaWindow::Activate() throw (css::uno::RuntimeException)
++{
++	SwVbaDocument document( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
++
++	document.Activate();
++}
++
++void
++SwVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& RouteDocument ) throw (uno::RuntimeException)
++{
++    // FIXME: it is incorrect when there are more than 1 windows
++	SwVbaDocument document( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
++    uno::Any FileName;
++	document.Close(SaveChanges, FileName, RouteDocument );
++}
++
++uno::Any SAL_CALL 
++SwVbaWindow::getView() throw (uno::RuntimeException)
++{
++    return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this,  mxContext, m_xModel ) ) );    
++}
++
++void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) throw (uno::RuntimeException)
++{
++    sal_Int32 nType = 0;
++    if( _view >>= nType )
++    {
++        SwVbaView view( this,  mxContext, m_xModel );
++        view.setType( nType );
++    }    
++}
++
++uno::Any SAL_CALL 
++SwVbaWindow::Panes( const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++    uno::Reference< XCollection > xPanes( new SwVbaPanes( this,  mxContext, m_xModel ) );
++    if(  aIndex.getValueTypeClass() == uno::TypeClass_VOID )
++        return uno::makeAny( xPanes );
++
++    return uno::Any( xPanes->Item( aIndex, uno::Any() ) );    
++}
++
++uno::Any SAL_CALL 
++SwVbaWindow::ActivePane() throw (uno::RuntimeException)
++{
++    return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this,  mxContext, m_xModel ) ) );    
++}
++
++rtl::OUString& 
++SwVbaWindow::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaWindow") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaWindow::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Window" ) );
++	}
++	return aServiceNames;
++}
+Index: sw/source/ui/vba/vbabookmark.hxx
+===================================================================
+--- sw/source/ui/vba/vbabookmark.hxx	(revision 0)
++++ sw/source/ui/vba/vbabookmark.hxx	(revision 276288)
+@@ -0,0 +1,68 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_BOOKMARK_HXX
++#define SW_VBA_BOOKMARK_HXX
++
++#include <ooo/vba/word/XBookmark.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/text/XBookmarksSupplier.hpp>
++#include <com/sun/star/text/XTextContent.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XBookmark > SwVbaBookmark_BASE;
++
++class SwVbaBookmark : public SwVbaBookmark_BASE
++{
++private:
++    css::uno::Reference< css::frame::XModel > mxModel;
++    css::uno::Reference< css::text::XTextContent > mxBookmark;
++    rtl::OUString maName;
++    sal_Bool mbValid;
++
++private:
++    void checkVality() throw ( css::uno::RuntimeException );
++
++public:
++	SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
++        const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaBookmark();
++
++   // Methods
++    virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException );
++    virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException );
++    virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException );
++    virtual void SAL_CALL Select() throw ( css::uno::RuntimeException );
++    virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException );
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_BOOKMARK_HXX */
+Index: sw/source/ui/vba/vbaview.cxx
+===================================================================
+--- sw/source/ui/vba/vbaview.cxx	(revision 0)
++++ sw/source/ui/vba/vbaview.cxx	(revision 276288)
+@@ -0,0 +1,425 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaview.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/view/XViewSettingsSupplier.hpp>
++#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
++#include <com/sun/star/text/XText.hpp>
++#include <com/sun/star/text/XTextTable.hpp>
++#include <com/sun/star/table/XCellRange.hpp>
++#include <com/sun/star/text/XTextDocument.hpp>
++#include <com/sun/star/text/XFootnotesSupplier.hpp>
++#include <com/sun/star/text/XEndnotesSupplier.hpp>
++#include <com/sun/star/container/XIndexAccess.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <com/sun/star/container/XEnumeration.hpp>
++#include <com/sun/star/frame/XController.hpp>
++#include <com/sun/star/lang/XServiceInfo.hpp>
++#include <ooo/vba/word/WdSpecialPane.hpp>
++#include <ooo/vba/word/WdViewType.hpp>
++#include <ooo/vba/word/WdSeekView.hpp>
++
++#include "wordvbahelper.hxx"
++#include "vbaheaderfooterhelper.hxx"
++#include <view.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++static const sal_Int32 DEFAULT_BODY_DISTANCE = 500;
++
++SwVbaView::SwVbaView( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
++    const uno::Reference< frame::XModel >& rModel ) throw ( uno::RuntimeException ) :
++    SwVbaView_BASE( rParent, rContext ), mxModel( rModel )
++{
++    uno::Reference< frame::XController > xController = mxModel->getCurrentController();
++
++    uno::Reference< text::XTextViewCursorSupplier > xTextViewCursorSupp( xController, uno::UNO_QUERY_THROW );
++    mxViewCursor = xTextViewCursorSupp->getViewCursor();
++
++    uno::Reference< view::XViewSettingsSupplier > xViewSettingSupp( xController, uno::UNO_QUERY_THROW );
++    mxViewSettings.set( xViewSettingSupp->getViewSettings(), uno::UNO_QUERY_THROW );
++}
++
++SwVbaView::~SwVbaView()
++{
++}
++
++::sal_Int32 SAL_CALL 
++SwVbaView::getSeekView() throw (css::uno::RuntimeException)
++{
++    // FIXME: if the view cursor is in table, field, section and frame
++    // handle if the cursor is in table
++    uno::Reference< text::XText > xCurrentText = mxViewCursor->getText();
++    uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextContent > xTextContent;
++    while( xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextContent )
++    {
++        xCurrentText = xTextContent->getAnchor()->getText();
++        xCursorProps.set( xCurrentText->createTextCursor(), uno::UNO_QUERY_THROW );
++    }
++    uno::Reference< lang::XServiceInfo > xServiceInfo( xCurrentText, uno::UNO_QUERY_THROW );
++    rtl::OUString aImplName = xServiceInfo->getImplementationName();
++    if( aImplName.equalsAscii("SwXBodyText") )
++    {
++        return word::WdSeekView::wdSeekMainDocument;
++    }
++    else if( aImplName.equalsAscii("SwXHeadFootText") )
++    {
++        if( HeaderFooterHelper::isHeader( mxModel, xCurrentText ) )
++        {
++            if( HeaderFooterHelper::isFirstPageHeader( mxModel, xCurrentText ) )
++                return word::WdSeekView::wdSeekFirstPageHeader;
++            else if( HeaderFooterHelper::isEvenPagesHeader( mxModel, xCurrentText ) )
++                return word::WdSeekView::wdSeekEvenPagesHeader;
++            else
++                return word::WdSeekView::wdSeekPrimaryHeader;
++        }
++        else
++        {
++            if( HeaderFooterHelper::isFirstPageFooter( mxModel, xCurrentText ) )
++                return word::WdSeekView::wdSeekFirstPageFooter;
++            else if( HeaderFooterHelper::isEvenPagesFooter( mxModel, xCurrentText ) )
++                return word::WdSeekView::wdSeekEvenPagesFooter;
++            else
++                return word::WdSeekView::wdSeekPrimaryFooter;
++        }
++    }
++    else if( aImplName.equalsAscii("SwXFootnote") )
++    {
++        if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Endnote") ) ) )
++            return word::WdSeekView::wdSeekEndnotes;
++        else
++            return word::WdSeekView::wdSeekFootnotes;
++    }
++
++    return word::WdSeekView::wdSeekMainDocument;
++}
++
++void SAL_CALL 
++SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException)
++{
++    // FIXME: save the current cursor position, if the cursor is in the main
++    // document, so we can jump back to this position, if the macro sets
++    // the ViewMode back to wdSeekMainDocument
++
++    // if( _seekview == getSeekView() )
++    //    return;
++
++    switch( _seekview )
++    {
++        case word::WdSeekView::wdSeekFirstPageFooter:
++        case word::WdSeekView::wdSeekFirstPageHeader:
++        case word::WdSeekView::wdSeekCurrentPageFooter:
++        case word::WdSeekView::wdSeekCurrentPageHeader:
++        case word::WdSeekView::wdSeekPrimaryFooter:
++        case word::WdSeekView::wdSeekPrimaryHeader:
++        case word::WdSeekView::wdSeekEvenPagesFooter:
++        case word::WdSeekView::wdSeekEvenPagesHeader:
++        {
++            // need to test
++            mxViewCursor->gotoRange( getHFTextRange( _seekview ), sal_False );
++            break;
++        }
++        case word::WdSeekView::wdSeekFootnotes:
++        {
++            uno::Reference< text::XFootnotesSupplier > xFootnotesSupp( mxModel, uno::UNO_QUERY_THROW );
++            uno::Reference< container::XIndexAccess > xFootnotes( xFootnotesSupp->getFootnotes(), uno::UNO_QUERY_THROW );
++            if( xFootnotes->getCount() > 0 )
++            {
++                uno::Reference< text::XText > xText( xFootnotes->getByIndex(0), uno::UNO_QUERY_THROW );
++                mxViewCursor->gotoRange( xText->getStart(), sal_False );
++            }
++            else
++            {
++                DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() );
++            }
++            break;
++        }
++        case word::WdSeekView::wdSeekEndnotes:
++        {
++            uno::Reference< text::XEndnotesSupplier > xEndnotesSupp( mxModel, uno::UNO_QUERY_THROW );
++            uno::Reference< container::XIndexAccess > xEndnotes( xEndnotesSupp->getEndnotes(), uno::UNO_QUERY_THROW );
++            if( xEndnotes->getCount() > 0 )
++            {
++                uno::Reference< text::XText > xText( xEndnotes->getByIndex(0), uno::UNO_QUERY_THROW );
++                mxViewCursor->gotoRange( xText->getStart(), sal_False );
++            }
++            else
++            {
++                DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() );
++            }
++            break;
++        }
++        case word::WdSeekView::wdSeekMainDocument:
++        {
++            uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
++            uno::Reference< text::XText > xText = xTextDocument->getText();
++            mxViewCursor->gotoRange( getFirstObjectPosition( xText ), sal_False );
++            break;
++        }
++    }
++}
++
++::sal_Int32 SAL_CALL 
++SwVbaView::getSplitSpecial() throw (css::uno::RuntimeException)
++{
++    return word::WdSpecialPane::wdPaneNone;
++}
++
++void SAL_CALL 
++SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++::sal_Bool SAL_CALL 
++SwVbaView::getTableGridLines() throw (css::uno::RuntimeException)
++{
++    sal_Bool bShowTableGridLine = sal_False;
++    mxViewSettings->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowTableBoundaries"))) >>= bShowTableGridLine;
++    return bShowTableGridLine;
++}
++
++void SAL_CALL 
++SwVbaView::setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException)
++{
++    mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowTableBoundaries")), uno::makeAny( _tablegridlines ) );
++}
++
++::sal_Int32 SAL_CALL 
++SwVbaView::getType() throw (css::uno::RuntimeException)
++{
++    // FIXME: handle wdPrintPreview type
++    sal_Bool bOnlineLayout = sal_False;
++    mxViewSettings->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout"))) >>= bOnlineLayout;
++    return bOnlineLayout ? word::WdViewType::wdWebView : word::WdViewType::wdPrintView;
++}
++
++void SAL_CALL 
++SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException)
++{
++    // FIXME: handle wdPrintPreview type
++    switch( _type )
++    {
++        case word::WdViewType::wdPrintView:
++        case word::WdViewType::wdNormalView:
++        {
++            mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout")), uno::makeAny( sal_False ) );
++            break;
++        }
++        case word::WdViewType::wdWebView:
++        {
++            mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout")), uno::makeAny( sal_True ) );
++            break;
++        }
++        case word::WdViewType::wdPrintPreview:
++        {
++            PrintPreviewHelper( uno::Any(),word::getView( mxModel ) ); 
++            break;
++        }
++        default:
++            DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
++            
++    }
++}
++
++uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) throw (uno::RuntimeException)
++{
++    mxModel->lockControllers();
++
++    rtl::OUString aPropIsOn;
++    rtl::OUString aPropIsShared;
++    rtl::OUString aPropBodyDistance;
++    rtl::OUString aPropText;
++    
++    switch( nType )
++    {
++        case word::WdSeekView::wdSeekCurrentPageFooter:
++        case word::WdSeekView::wdSeekFirstPageFooter:
++        case word::WdSeekView::wdSeekPrimaryFooter:
++        case word::WdSeekView::wdSeekEvenPagesFooter:
++        {
++            aPropIsOn = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn") );
++            aPropIsShared = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared") );
++            aPropBodyDistance = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance") );
++            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
++            break;
++        }
++        case word::WdSeekView::wdSeekCurrentPageHeader:
++        case word::WdSeekView::wdSeekFirstPageHeader:
++        case word::WdSeekView::wdSeekPrimaryHeader:
++        case word::WdSeekView::wdSeekEvenPagesHeader:
++        {
++            aPropIsOn = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn") );
++            aPropIsShared = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared") );
++            aPropBodyDistance = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance") );
++            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") );
++            break;
++        }
++    }
++
++    uno::Reference< text::XPageCursor > xPageCursor( mxViewCursor, uno::UNO_QUERY_THROW );
++    
++    if( nType == word::WdSeekView::wdSeekFirstPageFooter
++        || nType == word::WdSeekView::wdSeekFirstPageHeader )
++    {
++        xPageCursor->jumpToFirstPage();
++    }
++
++    uno::Reference< style::XStyle > xStyle;
++    uno::Reference< text::XText > xText;
++    switch( nType )
++    {
++        case word::WdSeekView::wdSeekPrimaryFooter:
++        case word::WdSeekView::wdSeekPrimaryHeader:
++        case word::WdSeekView::wdSeekEvenPagesFooter:
++        case word::WdSeekView::wdSeekEvenPagesHeader:
++        {
++            // The primary header is the first header of the section.
++            // If the header is not shared between odd and even pages
++            // the odd page's header is the primary header. If the
++            // first page's header is different from the rest of the
++            // document, it is NOT the primary header ( the next primary
++            // header would be on page 3 )
++            // The even pages' header is only available if the header is
++            // not shared and the current style is applied to a page with
++            // an even page number
++            uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW );
++            rtl::OUString aPageStyleName;
++            xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName;
++            if( aPageStyleName.equalsAscii("First Page") )
++            {
++                // go to the beginning of where the next style is used
++                sal_Bool hasNextPage = sal_False;
++                xStyle = word::getCurrentPageStyle( mxModel );
++                do
++                {
++                    hasNextPage = xPageCursor->jumpToNextPage();
++                }
++                while( hasNextPage && ( xStyle == word::getCurrentPageStyle( mxModel ) ) );
++
++                if( !hasNextPage )
++                    DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() );
++            }
++            break;
++        }    
++        default:
++        {
++            break;
++        }
++    }    
++
++    xStyle = word::getCurrentPageStyle( mxModel );
++    uno::Reference< beans::XPropertySet > xPageProps( xStyle, uno::UNO_QUERY_THROW );
++    sal_Bool isOn = sal_False;
++    xPageProps->getPropertyValue( aPropIsOn ) >>= isOn;
++    sal_Bool isShared =  sal_False;
++    xPageProps->getPropertyValue( aPropIsShared ) >>= isShared;
++    if( !isOn )
++    {
++        xPageProps->setPropertyValue( aPropIsOn, uno::makeAny( sal_True ) );
++        xPageProps->setPropertyValue( aPropBodyDistance, uno::makeAny( DEFAULT_BODY_DISTANCE ) );
++    }
++    if( !isShared )
++    {
++        rtl::OUString aTempPropText = aPropText;
++        if( nType == word::WdSeekView::wdSeekEvenPagesFooter
++            || nType == word::WdSeekView::wdSeekEvenPagesHeader )
++        {
++            aTempPropText += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left") );
++        }
++        else
++        {
++            aTempPropText += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Right") );
++        }
++        xText.set( xPageProps->getPropertyValue( aTempPropText), uno::UNO_QUERY_THROW );
++    }
++    else
++    {
++        if( nType == word::WdSeekView::wdSeekEvenPagesFooter
++            || nType == word::WdSeekView::wdSeekEvenPagesHeader )
++        {
++            DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() );
++        }
++        xText.set( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
++    }
++
++    mxModel->unlockControllers();
++    if( !xText.is() )
++    {
++        DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
++    }
++    uno::Reference< text::XTextRange > xTextRange = getFirstObjectPosition( xText );
++    return xTextRange;
++}
++
++uno::Reference< text::XTextRange > SwVbaView::getFirstObjectPosition( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException)
++{
++    // if the first object is table, get the position of first cell 
++    uno::Reference< text::XTextRange > xTextRange;
++    uno::Reference< container::XEnumerationAccess > xParaAccess( xText, uno::UNO_QUERY_THROW );
++    uno::Reference< container::XEnumeration> xParaEnum = xParaAccess->createEnumeration();
++    if( xParaEnum->hasMoreElements() )
++    {
++        uno::Reference< lang::XServiceInfo > xServiceInfo( xParaEnum->nextElement(), uno::UNO_QUERY_THROW );
++        if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextTable") ) ) )
++        {
++            uno::Reference< table::XCellRange > xCellRange( xServiceInfo, uno::UNO_QUERY_THROW );
++            uno::Reference< text::XText> xFirstCellText( xCellRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
++            xTextRange = xFirstCellText->getStart();
++        }
++    }
++    if( !xTextRange.is() )
++        xTextRange = xText->getStart();
++    return xTextRange;
++}
++
++rtl::OUString& 
++SwVbaView::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaView") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaView::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.View" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbaheaderfooterhelper.hxx
+===================================================================
+--- sw/source/ui/vba/vbaheaderfooterhelper.hxx	(revision 0)
++++ sw/source/ui/vba/vbaheaderfooterhelper.hxx	(revision 276288)
+@@ -0,0 +1,52 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbahelper.hxx,v $
++ * $Revision: 1.5.32.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_WORD_VBA_HEADERFOOTERHELPER_HXX
++#define SW_WORD_VBA_HEADERFOOTERHELPER_HXX
++
++#include <vbahelper/vbahelper.hxx>
++#include <com/sun/star/text/XText.hpp>
++#include <com/sun/star/text/XTextViewCursor.hpp>
++#include <com/sun/star/text/XPageCursor.hpp>
++#include <com/sun/star/style/XStyle.hpp>
++
++class HeaderFooterHelper
++{
++public:
++    static sal_Bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
++    static sal_Bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
++    static sal_Bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
++    static sal_Bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
++    static sal_Bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
++    static sal_Bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
++    static sal_Bool isPrimaryHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
++    static sal_Bool isPrimaryFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
++};
++
++#endif
+Index: sw/source/ui/vba/vbadocument.cxx
+===================================================================
+--- sw/source/ui/vba/vbadocument.cxx	(revision 0)
++++ sw/source/ui/vba/vbadocument.cxx	(revision 276288)
+@@ -0,0 +1,385 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadocument.cxx,v $
++ * $Revision: 1.7 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbadocument.hxx"
++#include "vbarange.hxx"
++#include "vbarangehelper.hxx"
++#include "vbadocumentproperties.hxx"
++#include "vbabookmarks.hxx"
++#include "vbavariables.hxx"
++#include <com/sun/star/text/XBookmarksSupplier.hpp>
++#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
++#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
++#include <com/sun/star/document/XDocumentProperties.hpp>
++#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
++#include <com/sun/star/drawing/XControlShape.hpp>
++#include <com/sun/star/drawing/XControlShape.hpp>
++#include <com/sun/star/form/XFormsSupplier.hpp>
++#include <ooo/vba/XControlProvider.hpp>
++
++#include <vbahelper/helperdecl.hxx>
++#include <wordvbahelper.hxx>
++#include <docsh.hxx>
++#include "vbatemplate.hxx"
++#include "vbaparagraph.hxx"
++#include "vbastyles.hxx"
++#include "vbatables.hxx"
++#include "vbafield.hxx"
++#include "vbapagesetup.hxx"
++#include "vbasections.hxx"
++#include <vbahelper/vbashapes.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaDocument::SwVbaDocument( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< frame::XModel > xModel ): SwVbaDocument_BASE( xParent, xContext, xModel )
++{
++    Initialize();
++}
++SwVbaDocument::SwVbaDocument( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) : SwVbaDocument_BASE( aArgs, xContext )
++{
++    Initialize();
++} 
++
++SwVbaDocument::~SwVbaDocument()
++{
++}
++
++void SwVbaDocument::Initialize()
++{
++    mxTextDocument.set( getModel(), uno::UNO_QUERY_THROW );    
++}
++
++uno::Reference< word::XRange > SAL_CALL 
++SwVbaDocument::getContent() throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextRange > xStart = mxTextDocument->getText()->getStart();
++    uno::Reference< text::XTextRange > xEnd;
++    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd, sal_True ) );
++}
++
++uno::Reference< word::XRange > SAL_CALL 
++SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) throw ( uno::RuntimeException )
++{
++    if( !rStart.hasValue() && !rEnd.hasValue() )
++        return getContent();
++    
++    sal_Int32 nStart = 0;
++    sal_Int32 nEnd = 0;
++    rStart >>= nStart;
++    rEnd >>= nEnd;
++    nStart--;
++    nEnd--;
++
++    uno::Reference< text::XTextRange > xStart;
++    uno::Reference< text::XTextRange > xEnd;
++    if( nStart != -1 || nEnd != -1 )
++    {
++        if( nStart == -1 )
++            xStart = mxTextDocument->getText()->getStart();
++        else
++            xStart = SwVbaRangeHelper::getRangeByPosition( mxTextDocument->getText(), nStart );
++
++        if( nEnd == -1 )
++            xEnd = mxTextDocument->getText()->getEnd();
++        else
++            xEnd = SwVbaRangeHelper::getRangeByPosition( mxTextDocument->getText(), nEnd );
++    }
++
++    if( !xStart.is() && !xEnd.is() )
++    {
++        try
++        {
++            // FIXME
++            xStart = mxTextDocument->getText()->getStart();
++            xEnd = mxTextDocument->getText()->getEnd();
++        }
++        catch( uno::Exception )
++        {
++            DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
++        }    
++    }
++    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd ) );
++}
++
++uno::Any SAL_CALL
++SwVbaDocument::BuiltInDocumentProperties( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< XCollection > xCol( new SwVbaBuiltinDocumentProperties( mxParent, mxContext, getModel() ) );
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++uno::Any SAL_CALL
++SwVbaDocument::CustomDocumentProperties( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< XCollection > xCol( new SwVbaCustomDocumentProperties( mxParent, mxContext, getModel() ) );
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++uno::Any SAL_CALL 
++SwVbaDocument::Bookmarks( const uno::Any& rIndex ) throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( getModel(),uno::UNO_QUERY_THROW );
++    uno::Reference<container::XIndexAccess > xBookmarks( xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY_THROW );
++    uno::Reference< XCollection > xBookmarksVba( new SwVbaBookmarks( this, mxContext, xBookmarks, getModel() ) );
++    if (  rIndex.getValueTypeClass() == uno::TypeClass_VOID )
++        return uno::makeAny( xBookmarksVba );
++    
++    return uno::Any( xBookmarksVba->Item( rIndex, uno::Any() ) );
++}
++
++uno::Any SAL_CALL 
++SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException )
++{
++    uno::Reference< document::XDocumentPropertiesSupplier > xDocumentPropertiesSupplier( getModel(),uno::UNO_QUERY_THROW );
++    uno::Reference< document::XDocumentProperties > xDocumentProperties =  xDocumentPropertiesSupplier->getDocumentProperties();
++    uno::Reference< beans::XPropertyAccess > xUserDefined( xDocumentProperties->getUserDefinedProperties(), uno::UNO_QUERY_THROW );
++
++    uno::Reference< XCollection > xVariables( new SwVbaVariables( this, mxContext, xUserDefined ) );
++    if (  rIndex.getValueTypeClass() == uno::TypeClass_VOID )
++        return uno::makeAny( xVariables );
++    
++    return uno::Any( xVariables->Item( rIndex, uno::Any() ) );
++}
++
++uno::Any SAL_CALL
++SwVbaDocument::Paragraphs( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< XCollection > xCol( new SwVbaParagraphs( mxParent, mxContext, mxTextDocument ) );
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++uno::Any SAL_CALL
++SwVbaDocument::Styles( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< XCollection > xCol( new SwVbaStyles( mxParent, mxContext, getModel() ) );
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++uno::Any SAL_CALL
++SwVbaDocument::Fields( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< XCollection > xCol( new SwVbaFields( mxParent, mxContext, getModel() ) );
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++uno::Any SAL_CALL
++SwVbaDocument::Shapes( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( getModel(), uno::UNO_QUERY_THROW );
++    //uno::Reference< drawing::XShapes > xShapes( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
++    uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
++    uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
++    uno::Reference< XCollection > xCol( new ScVbaShapes( this, mxContext, xIndexAccess, xModel ) );
++
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++uno::Any SAL_CALL
++SwVbaDocument::Sections( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< XCollection > xCol( new SwVbaSections( mxParent, mxContext, getModel() ) );
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++uno::Any SAL_CALL
++SwVbaDocument::PageSetup( ) throw (uno::RuntimeException)
++{
++    uno::Reference< beans::XPropertySet > xPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
++    return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) );
++}
++
++rtl::OUString& 
++SwVbaDocument::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocument") );
++	return sImplName;
++}
++uno::Any SAL_CALL 
++SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException)
++{
++    SwDocShell* pDocShell = word::getDocShell( getModel() );
++    uno::Reference< word::XTemplate > xTemplate;
++    uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( getModel(), uno::UNO_QUERY_THROW );
++    uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
++    uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
++    rtl::OUString sTemplateName = xDocProps->getTemplateName();
++
++    xTemplate = new SwVbaTemplate( this, mxContext, getModel(), sTemplateName );
++    return uno::makeAny( xTemplate );
++}
++
++void SAL_CALL 
++SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException();
++}
++
++uno::Any SAL_CALL 
++SwVbaDocument::Tables( const css::uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++    uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
++    uno::Reference< XCollection > xColl( new SwVbaTables( mxParent, mxContext, xModel ) );
++    
++    if ( aIndex.hasValue() )
++        return xColl->Item( aIndex, uno::Any() );
++    return uno::makeAny( xColl );
++}
++
++void SAL_CALL SwVbaDocument::Activate() throw (uno::RuntimeException)
++{
++    VbaDocumentBase::Activate();
++}
++
++uno::Any
++SwVbaDocument::getControlShape( const ::rtl::OUString& sName )
++{
++    uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxTextDocument, uno::UNO_QUERY_THROW );
++    uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
++
++    sal_Int32 nCount = xIndexAccess->getCount();
++    for( int index = 0; index < nCount; index++ )
++    {
++        uno::Any aUnoObj =  xIndexAccess->getByIndex( index );
++        // It seems there are some drawing objects that can not query into Control shapes?
++        uno::Reference< drawing::XControlShape > xControlShape( aUnoObj, uno::UNO_QUERY );
++        if( xControlShape.is() )
++        {
++     	    uno::Reference< container::XNamed > xNamed( xControlShape->getControl(), uno::UNO_QUERY_THROW );
++            if( sName.equals( xNamed->getName() ))
++            {
++                return aUnoObj;
++            }
++        }
++    }
++    return uno::Any();
++}
++
++uno::Reference< beans::XIntrospectionAccess > SAL_CALL 
++SwVbaDocument::getIntrospection(  ) throw (uno::RuntimeException)
++{
++	return uno::Reference< beans::XIntrospectionAccess >();
++}
++
++uno::Any SAL_CALL 
++SwVbaDocument::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
++{
++	OSL_TRACE("** SwVbaDocument::invoke( %s ), will barf",
++		rtl::OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() );
++	
++	throw uno::RuntimeException(); // unsupported operation
++}
++
++void SAL_CALL 
++SwVbaDocument::setValue( const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
++{
++	throw uno::RuntimeException(); // unsupported operation
++}
++uno::Any SAL_CALL 
++SwVbaDocument::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
++{
++    uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW );
++    
++    uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
++    uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
++    uno::Reference< msforms::XControl > xControl( xControlProvider->createControl(  xControlShape, getModel() ) );
++    return uno::makeAny( xControl );
++}
++
++::sal_Bool SAL_CALL 
++SwVbaDocument::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException)
++{
++	return sal_False;
++}
++
++::sal_Bool SAL_CALL 
++SwVbaDocument::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
++{
++	uno::Reference< container::XNameAccess > xFormControls( getFormControls() );
++	if ( xFormControls.is() )
++		return xFormControls->hasByName( aName );
++	return sal_False;
++}
++
++uno::Reference< container::XNameAccess > 
++SwVbaDocument::getFormControls()
++{
++	uno::Reference< container::XNameAccess > xFormControls;
++	try
++	{
++		uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxTextDocument, uno::UNO_QUERY_THROW );
++		uno::Reference< form::XFormsSupplier >  xFormSupplier( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
++    		uno::Reference< container::XIndexAccess > xIndexAccess( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
++		// get the www-standard container ( maybe we should access the 
++		// 'www-standard' by name rather than index, this seems an
++		// implementation detail
++		xFormControls.set( xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW );
++	}
++	catch( uno::Exception& )
++	{
++	}
++	return xFormControls;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaDocument::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Document" ) );
++	}
++	return aServiceNames;
++}
++
++namespace document
++{
++namespace sdecl = comphelper::service_decl;
++sdecl::vba_service_class_<SwVbaDocument, sdecl::with_args<true> > serviceImpl;
++extern sdecl::ServiceDecl const serviceDecl(
++    serviceImpl,
++    "SwVbaDocument",
++    "ooo.vba.word.Document" );
++}
++
+Index: sw/source/ui/vba/vbatables.hxx
+===================================================================
+--- sw/source/ui/vba/vbatables.hxx	(revision 0)
++++ sw/source/ui/vba/vbatables.hxx	(revision 276288)
+@@ -0,0 +1,28 @@
++#ifndef SW_VBA_TABLES_HXX
++#define SW_VBA_TABLES_HXX
++
++#include <ooo/vba/word/XTables.hpp>
++#include <vbahelper/vbacollectionimpl.hxx>
++
++
++typedef CollTestImplHelper< ov::word::XTables > SwVbaTables_BASE;
++
++class SwVbaTables : public SwVbaTables_BASE
++{
++    css::uno::Reference< css::frame::XModel > mxDocument;
++public:
++    SwVbaTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
++    // XTables
++    virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    // XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++    // ScVbaCollectionBaseImpl      
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();    
++};
++
++#endif
+Index: sw/source/ui/vba/vbafind.cxx
+===================================================================
+--- sw/source/ui/vba/vbafind.cxx	(revision 0)
++++ sw/source/ui/vba/vbafind.cxx	(revision 276288)
+@@ -0,0 +1,431 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbafind.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include "vbareplacement.hxx"
++#include <ooo/vba/word/WdFindWrap.hpp>
++#include <ooo/vba/word/WdReplace.hpp>
++#include <com/sun/star/text/XTextRangeCompare.hpp>
++#include "wordvbahelper.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaFind::SwVbaFind( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw ( uno::RuntimeException ) :
++    SwVbaFind_BASE( rParent, rContext ), mxModel( xModel ), mxTextRange( xTextRange ), mbReplace( sal_False ), mnReplaceType( word::WdReplace::wdReplaceOne ), mnWrap( word::WdFindWrap::wdFindStop )
++{
++    mxReplaceable.set( mxModel, uno::UNO_QUERY_THROW );
++    mxPropertyReplace.set( mxReplaceable->createReplaceDescriptor(), uno::UNO_QUERY_THROW );
++    mxTVC = word::getXTextViewCursor( mxModel );
++    mxSelSupp.set( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
++}
++
++SwVbaFind::~SwVbaFind()
++{
++}
++
++sal_Bool SwVbaFind::InRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextRangeCompare > xTRC( mxTextRange->getText(), uno::UNO_QUERY_THROW );
++    if( xTRC->compareRegionStarts( mxTextRange, xCurrentRange ) >= 0 && xTRC->compareRegionEnds( mxTextRange, xCurrentRange ) <= 0 )
++        return sal_True;
++    return sal_False;
++}
++
++sal_Bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextRangeCompare > xTRC( mxTextRange->getText(), uno::UNO_QUERY_THROW );
++    if( xTRC->compareRegionStarts( mxTextRange, xCurrentRange ) == 0 && xTRC->compareRegionEnds( mxTextRange, xCurrentRange ) == 0 )
++        return sal_True;
++    return sal_False;
++}
++
++void SwVbaFind::SetReplaceWith( const rtl::OUString& rText ) throw (uno::RuntimeException)
++{
++    mxPropertyReplace->setReplaceString( rText );
++    mbReplace = sal_True;
++}
++
++rtl::OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException)
++{
++    return mxPropertyReplace->getReplaceString();
++}
++void SwVbaFind::SetReplace( sal_Int32 type )
++{
++    mnReplaceType = type;
++    mbReplace = sal_True;
++}
++
++rtl::OUString SwVbaFind::ReplaceWildcards( const rtl::OUString& rText ) throw ( uno::RuntimeException )
++{
++    // TODO:
++    return rtl::OUString();
++}
++
++uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextRange > xFoundOne;
++    if( mxTVC->getString().getLength() > 0 )
++    {
++        if( getForward() )
++        {
++            xFoundOne.set( mxReplaceable->findNext( mxTextRange->getStart(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
++        }
++        else
++        {
++            xFoundOne.set( mxReplaceable->findNext( mxTextRange->getEnd(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
++        }
++
++        if( xFoundOne.is() && InEqualRange( xFoundOne ) )
++        {
++            xFoundOne.set( mxReplaceable->findNext( xFoundOne, uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
++        }
++        else if( xFoundOne.is() && !InRange( xFoundOne ) )
++        {
++            xFoundOne = uno::Reference< text::XTextRange >();
++        }
++    }
++    else
++    {
++        xFoundOne.set( mxReplaceable->findNext( mxTextRange, uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
++    }
++
++    if( !xFoundOne.is() && ( getWrap() == word::WdFindWrap::wdFindContinue || getWrap() == word::WdFindWrap::wdFindAsk ) )
++    {
++        if( getForward() )
++        {
++            mxTVC->gotoStart(sal_False);
++            xFoundOne.set( mxReplaceable->findNext( mxTextRange->getStart(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
++        }    
++        else
++        {
++            mxTVC->gotoEnd( sal_False );
++            xFoundOne.set( mxReplaceable->findNext( mxTextRange->getEnd(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
++
++        }
++    }
++    return xFoundOne;
++}
++
++sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
++{
++    sal_Bool result = sal_False;
++
++    // TODO: map wildcards in area to OOo wildcards
++
++    if( mbReplace )
++    {
++        switch( mnReplaceType )
++        {
++            case word::WdReplace::wdReplaceNone:
++            {
++                result = sal_True;
++                break;
++            }
++            case word::WdReplace::wdReplaceOne:
++            {
++                uno::Reference< text::XTextRange > xFindOne = FindOneElement();
++                if( xFindOne.is() )
++                {
++                    xFindOne->setString( GetReplaceWith() );
++                    result = mxSelSupp->select( uno::makeAny( xFindOne ) );
++                }
++                break;
++            }
++            case word::WdReplace::wdReplaceAll:
++            {
++                uno::Reference< container::XIndexAccess > xIndexAccess = mxReplaceable->findAll( uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) );
++                if( xIndexAccess->getCount() > 0 )
++                {
++                    for( sal_Int32 i = 0; i < xIndexAccess->getCount(); i++ )
++                    {
++                        uno::Reference< text::XTextRange > xTextRange( xIndexAccess->getByIndex( i ), uno::UNO_QUERY_THROW );
++                        if( mnWrap == word::WdFindWrap::wdFindContinue || mnWrap == word::WdFindWrap::wdFindAsk || InRange( xTextRange ) )
++                        {
++                            xTextRange->setString( GetReplaceWith() );
++                            result = sal_True;
++                        }
++                    }
++                }
++                break;
++            }
++            defalut:
++            {
++                result = sal_False;
++            }
++        }
++    }
++    else
++    {
++        uno::Reference< text::XTextRange > xFindOne = FindOneElement();
++        if( xFindOne.is() )
++            result = mxSelSupp->select( uno::makeAny( xFindOne ) );
++    }
++
++    return result;
++}
++
++::rtl::OUString SAL_CALL SwVbaFind::getText() throw (uno::RuntimeException)
++{
++    return mxPropertyReplace->getSearchString();
++}
++
++void SAL_CALL SwVbaFind::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
++{
++    mxPropertyReplace->setSearchString( _text );
++}
++
++uno::Any SAL_CALL SwVbaFind::getReplacement() throw (uno::RuntimeException)
++{
++    return uno::makeAny( uno::Reference< word::XReplacement >( new SwVbaReplacement( this, mxContext, mxPropertyReplace ) ) );
++}
++
++void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++::sal_Bool SAL_CALL SwVbaFind::getForward() throw (uno::RuntimeException)
++{
++    sal_Bool bBackward = sal_False;
++    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ) ) >>= bBackward;
++    return !bBackward;
++}
++
++void SAL_CALL SwVbaFind::setForward( ::sal_Bool _forward ) throw (uno::RuntimeException)
++{
++    sal_Bool bBackward = !_forward;
++    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ), uno::makeAny( bBackward ) );
++}
++
++::sal_Int32 SAL_CALL SwVbaFind::getWrap() throw (uno::RuntimeException)
++{
++    // seems not supported in Writer
++    return mnWrap;
++}
++
++void SAL_CALL SwVbaFind::setWrap( ::sal_Int32 _wrap ) throw (uno::RuntimeException)
++{
++    // seems not supported in Writer
++    mnWrap = _wrap;
++}
++
++::sal_Bool SAL_CALL SwVbaFind::getFormat() throw (uno::RuntimeException)
++{
++    return mxPropertyReplace->getValueSearch();
++}
++
++void SAL_CALL SwVbaFind::setFormat( ::sal_Bool _format ) throw (uno::RuntimeException)
++{
++    mxPropertyReplace->setValueSearch( _format );
++}
++
++::sal_Bool SAL_CALL SwVbaFind::getMatchCase() throw (uno::RuntimeException)
++{
++    sal_Bool value = sal_False;
++    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ) ) >>= value;
++    return value;
++}
++
++void SAL_CALL SwVbaFind::setMatchCase( ::sal_Bool _matchcase ) throw (uno::RuntimeException)
++{
++    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ), uno::makeAny( _matchcase ) );
++}
++
++::sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() throw (uno::RuntimeException)
++{
++    sal_Bool value = sal_False;
++    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ) ) >>= value;
++    return value;
++}
++
++void SAL_CALL SwVbaFind::setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (uno::RuntimeException)
++{
++    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ), uno::makeAny( _matchwholeword ) );
++}
++
++::sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() throw (uno::RuntimeException)
++{
++    sal_Bool value = sal_False;
++    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ) ) >>= value;
++    return value;
++}
++
++void SAL_CALL SwVbaFind::setMatchWildcards( ::sal_Bool _matchwildcards ) throw (uno::RuntimeException)
++{
++    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ), uno::makeAny( _matchwildcards ) );
++}
++
++::sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() throw (uno::RuntimeException)
++{
++    sal_Bool value = sal_False;
++    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ) ) >>= value;
++    return value;
++}
++
++void SAL_CALL SwVbaFind::setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (uno::RuntimeException)
++{
++    // seems not accurate
++    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ), uno::makeAny( _matchsoundslike ) );
++}
++
++::sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException)
++{
++    sal_Bool value = sal_False;
++    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ) ) >>= value;
++    if( value )
++        mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ) ) >>= value;
++    return value;
++}
++
++void SAL_CALL SwVbaFind::setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (uno::RuntimeException)
++{
++    // seems not accurate
++    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ), uno::makeAny( _matchallwordforms ) );
++    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ), uno::makeAny( _matchallwordforms ) );
++}
++
++uno::Any SAL_CALL SwVbaFind::getStyle() throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++sal_Bool SAL_CALL 
++SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const uno::Any& MatchWholeWord, const uno::Any& MatchWildcards, const uno::Any& MatchSoundsLike, const uno::Any& MatchAllWordForms, const uno::Any& Forward, const uno::Any& Wrap, const uno::Any& Format, const uno::Any& ReplaceWith, const uno::Any& Replace, const uno::Any& /*MatchKashida*/, const uno::Any& /*MatchDiacritics*/, const uno::Any& /*MatchAlefHamza*/, const uno::Any& /*MatchControl*/, const uno::Any& /*MatchPrefix*/, const uno::Any& /*MatchSuffix*/, const uno::Any& /*MatchPhrase*/, const uno::Any& /*IgnoreSpace*/, const uno::Any& /*IgnorePunct*/ ) throw (uno::RuntimeException)
++{
++    sal_Bool result = sal_False;
++    if( FindText.hasValue() )
++    {
++        rtl::OUString sText;
++        FindText >>= sText;
++        setText( sText );
++    }
++
++    sal_Bool bValue = sal_False;
++    if( MatchCase.hasValue() )
++    {
++        MatchCase >>= bValue;
++        setMatchCase( bValue );
++    }
++
++    if( MatchWholeWord.hasValue() )
++    {
++        MatchWholeWord >>= bValue;
++        setMatchWholeWord( bValue );
++    }
++
++    if( MatchWildcards.hasValue() )
++    {
++        MatchWildcards >>= bValue;
++        setMatchWildcards( bValue );
++    }
++
++    if( MatchSoundsLike.hasValue() )
++    {
++        MatchSoundsLike >>= bValue;
++        setMatchSoundsLike( bValue );
++    }
++
++    if( MatchAllWordForms.hasValue() )
++    {
++        MatchAllWordForms >>= bValue;
++        setMatchAllWordForms( bValue );
++    }
++
++    if( Forward.hasValue() )
++    {
++        Forward >>= bValue;
++        setForward( bValue );
++    }
++
++    if( Wrap.hasValue() )
++    {
++        sal_Int32 nWrapType = 0;
++        Wrap >>= nWrapType;
++        setWrap( nWrapType );
++    }
++
++    if( Format.hasValue() )
++    {
++        Format >>= bValue;
++        setFormat( bValue );
++    }
++
++    if( ReplaceWith.hasValue() )
++    {
++        rtl::OUString sValue;
++        ReplaceWith >>= sValue;
++        SetReplaceWith( sValue );
++    }
++
++    if( Replace.hasValue() )
++    {
++        sal_Int32 nValue;
++        Replace >>= nValue;
++        SetReplace( nValue );
++    }
++
++    result = SearchReplace();
++
++    return result;
++}
++
++void SAL_CALL 
++SwVbaFind::ClearFormatting(  ) throw (uno::RuntimeException)
++{
++    uno::Sequence< beans::PropertyValue >  aSearchAttribs;
++    mxPropertyReplace->setSearchAttributes( aSearchAttribs );
++}
++
++rtl::OUString& 
++SwVbaFind::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFind") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaFind::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Find" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbavariable.cxx
+===================================================================
+--- sw/source/ui/vba/vbavariable.cxx	(revision 0)
++++ sw/source/ui/vba/vbavariable.cxx	(revision 276288)
+@@ -0,0 +1,108 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbavariable.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/beans/PropertyValue.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaVariable::SwVbaVariable( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
++    const uno::Reference< beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( uno::RuntimeException ) :
++    SwVbaVariable_BASE( rParent, rContext ), mxUserDefined( rUserDefined ), maName( rName )
++{
++}
++
++SwVbaVariable::~SwVbaVariable()
++{
++}
++
++rtl::OUString SAL_CALL
++SwVbaVariable::getName() throw ( css::uno::RuntimeException )
++{
++    return maName;
++}
++
++void SAL_CALL
++SwVbaVariable::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException )
++{
++    throw uno::RuntimeException( rtl::OUString(
++            RTL_CONSTASCII_USTRINGPARAM(" Fail to set name")), uno::Reference< uno::XInterface >() );
++}
++
++uno::Any SAL_CALL
++SwVbaVariable::getValue() throw ( css::uno::RuntimeException )
++{
++    uno::Reference< beans::XPropertySet > xProp( mxUserDefined, uno::UNO_QUERY_THROW );
++    return xProp->getPropertyValue( maName );
++}
++
++void SAL_CALL
++SwVbaVariable::setValue( const uno::Any& rValue ) throw ( css::uno::RuntimeException )
++{
++    // FIXME: fail to set the value if the new type of vaue is differenct from the original one.
++    uno::Reference< beans::XPropertySet > xProp( mxUserDefined, uno::UNO_QUERY_THROW );
++    xProp->setPropertyValue( maName, rValue );
++}
++
++sal_Int32 SAL_CALL
++SwVbaVariable::getIndex() throw ( css::uno::RuntimeException )
++{
++    const uno::Sequence< beans::PropertyValue > props = mxUserDefined->getPropertyValues();
++    for (sal_Int32 i = 0; i < props.getLength(); ++i)
++    {
++        if( maName.equals( props[i].Name ) )
++            return i+1;
++    }
++
++    return 0;
++}
++
++rtl::OUString& 
++SwVbaVariable::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariable") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaVariable::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Variable" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbawrapformat.hxx
+===================================================================
+--- sw/source/ui/vba/vbawrapformat.hxx	(revision 0)
++++ sw/source/ui/vba/vbawrapformat.hxx	(revision 276288)
+@@ -0,0 +1,73 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbafillformat.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_XWRAPFORMAT_HXX
++#define SW_VBA_XWRAPFORMAT_HXX
++
++#include <com/sun/star/drawing/XShape.hpp>
++#include <ooo/vba/word/XWrapFormat.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XWrapFormat > SwVbaWrapFormat_BASE;
++
++class SwVbaWrapFormat : public SwVbaWrapFormat_BASE
++{
++private:
++    css::uno::Reference< css::drawing::XShape > m_xShape;
++    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
++    sal_Int32 mnWrapFormatType;
++    sal_Int32 mnSide;
++
++private:
++    void makeWrap() throw (css::uno::RuntimeException);
++    float getDistance( const rtl::OUString& sName ) throw (css::uno::RuntimeException);
++    void setDistance( const rtl::OUString& sName, float _distance ) throw (css::uno::RuntimeException);
++
++public:
++    SwVbaWrapFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape );
++	SwVbaWrapFormat(  css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
++
++    virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getSide() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setSide( ::sal_Int32 _side ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getDistanceTop() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setDistanceTop( float _distancetop ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getDistanceBottom() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setDistanceBottom( float _distancebottom ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getDistanceLeft() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setDistanceLeft( float _distanceleft ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException);
++
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif//SW_VBA_XWRAPFORMAT_HXX
+Index: sw/source/ui/vba/vbapane.hxx
+===================================================================
+--- sw/source/ui/vba/vbapane.hxx	(revision 0)
++++ sw/source/ui/vba/vbapane.hxx	(revision 276288)
+@@ -0,0 +1,57 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_PANE_HXX
++#define SW_VBA_PANE_HXX
++
++#include <ooo/vba/word/XPane.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XPane > SwVbaPane_BASE;
++
++class SwVbaPane : public SwVbaPane_BASE
++{
++private:
++    css::uno::Reference< css::frame::XModel > mxModel;
++
++public:
++	SwVbaPane( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
++        const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaPane();
++
++    // Methods
++    virtual css::uno::Any SAL_CALL View(  ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL Close(  ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_PANE_HXX */
+Index: sw/source/ui/vba/vbabookmarks.cxx
+===================================================================
+--- sw/source/ui/vba/vbabookmarks.cxx	(revision 0)
++++ sw/source/ui/vba/vbabookmarks.cxx	(revision 276288)
+@@ -0,0 +1,240 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbabookmarks.hxx"
++#include "vbabookmark.hxx"
++#include <com/sun/star/container/XNamed.hpp>
++#include <com/sun/star/text/XTextDocument.hpp>
++#include <com/sun/star/text/XTextViewCursor.hpp>
++#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
++#include <ooo/vba/word/WdBookmarkSortBy.hpp>
++#include "vbarange.hxx"
++#include "wordvbahelper.hxx"
++#include <cppuhelper/implbase2.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++class BookmarksEnumeration : public EnumerationHelperImpl
++{
++	uno::Reference< frame::XModel > mxModel;
++	uno::WeakReference< XHelperInterface > mxParent;
++public:
++	BookmarksEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), mxModel( xModel ), mxParent( xParent ) {}
++
++	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
++	{ 
++		uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
++        rtl::OUString aName = xNamed->getName();
++		return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( mxParent, m_xContext, mxModel, aName ) ) );
++	}
++
++};
++
++// Bookmarks use case-insensitive name lookup in MS Word.
++typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > BookmarkCollectionHelper_BASE;
++class BookmarkCollectionHelper : public BookmarkCollectionHelper_BASE
++{
++private:
++    uno::Reference< container::XNameAccess > mxNameAccess;
++    uno::Reference< container::XIndexAccess > mxIndexAccess;
++    uno::Any cachePos;
++public:
++    BookmarkCollectionHelper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : mxIndexAccess( xIndexAccess )
++    {
++        mxNameAccess.set( mxIndexAccess, uno::UNO_QUERY_THROW );
++    }
++	// XElementAccess
++	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) { return  mxIndexAccess->getElementType(); }
++	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) { return mxIndexAccess->hasElements(); }
++	// XNameAcess 
++	virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++		if ( !hasByName(aName) )
++			throw container::NoSuchElementException();
++		return cachePos;
++    }
++	virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
++	{
++        return mxNameAccess->getElementNames();
++    }
++	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
++	{
++        if( mxNameAccess->hasByName( aName ) )
++        {
++            cachePos = mxNameAccess->getByName( aName );
++            return sal_True;
++        }
++        else
++        {
++            for( sal_Int32 nIndex = 0; nIndex < mxIndexAccess->getCount(); nIndex++ )
++            {
++                uno::Reference< container::XNamed > xNamed( mxIndexAccess->getByIndex( nIndex ), uno::UNO_QUERY_THROW );
++                rtl::OUString aBookmarkName = xNamed->getName();
++                if( aName.equalsIgnoreAsciiCase( aBookmarkName ) )
++                {
++                    cachePos <<= xNamed;
++                    return sal_True;
++                }
++            }
++        }
++        return sal_False;
++    }
++	// XIndexAccess
++	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
++    {
++        return mxIndexAccess->getCount();
++    }
++	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
++	{
++        return mxIndexAccess->getByIndex( Index );
++    }
++};
++
++SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BookmarkCollectionHelper( xBookmarks ) ) ), mxModel( xModel ) 
++{
++    mxBookmarksSupplier.set( mxModel, uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
++    // use view cursor to insert bookmark, or it will fail if insert bookmark in table
++    // mxText = xDocument->getText();
++    mxText = word::getXTextViewCursor( mxModel )->getText();
++}
++// XEnumerationAccess
++uno::Type
++SwVbaBookmarks::getElementType() throw (uno::RuntimeException)
++{
++	return word::XBookmark::static_type(0);
++}
++uno::Reference< container::XEnumeration >
++SwVbaBookmarks::createEnumeration() throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
++	return new BookmarksEnumeration( getParent(), mxContext,xEnumAccess->createEnumeration(), mxModel );
++}
++
++uno::Any
++SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource )
++{
++	uno::Reference< container::XNamed > xNamed( aSource, uno::UNO_QUERY_THROW );
++    rtl::OUString aName = xNamed->getName();
++    return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) );
++}
++
++void SwVbaBookmarks::removeBookmarkByName( const rtl::OUString& rName ) throw (uno::RuntimeException)
++{
++    uno::Reference< text::XTextContent > xBookmark( m_xNameAccess->getByName( rName ), uno::UNO_QUERY_THROW );
++    mxText->removeTextContent( xBookmark );
++}
++
++void SwVbaBookmarks::addBookmarkByName( const rtl::OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException)
++{
++    uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxModel, uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmark")) ), uno::UNO_QUERY_THROW );
++    uno::Reference< container::XNamed > xNamed( xBookmark, uno::UNO_QUERY_THROW );
++    xNamed->setName( rName );
++    mxText->insertTextContent( rTextRange, xBookmark, sal_False );
++}
++
++uno::Any SAL_CALL
++SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException)
++{
++    uno::Reference< text::XTextRange > xTextRange;
++    uno::Reference< word::XRange > xRange;
++    if( rRange >>= xRange )
++    {
++        SwVbaRange* pRange = dynamic_cast< SwVbaRange* >( xRange.get() );
++        if( pRange )
++            xTextRange = pRange->getXTextRange();
++    }
++    else
++    {
++        // FIXME: insert the bookmark into current view cursor
++        xTextRange.set( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW );
++    }
++
++    // remove the exist bookmark
++    // rtl::OUString aName = rName.toAsciiLowerCase();
++    rtl::OUString aName = rName;
++    if( m_xNameAccess->hasByName( aName ) )
++        removeBookmarkByName( aName );
++    
++    addBookmarkByName( aName, xTextRange );
++
++    return uno::makeAny( uno::Reference< word::XBookmark >( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) );
++}
++
++sal_Int32 SAL_CALL 
++SwVbaBookmarks::getDefaultSorting() throw (css::uno::RuntimeException)
++{
++    return word::WdBookmarkSortBy::wdSortByName;
++}
++
++void SAL_CALL 
++SwVbaBookmarks::setDefaultSorting( sal_Int32/* _type*/ ) throw (css::uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++sal_Bool SAL_CALL 
++SwVbaBookmarks::getShowHidden() throw (css::uno::RuntimeException)
++{
++    return sal_True;
++}
++
++void SAL_CALL 
++SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeException)
++{
++    // not support in Writer
++}
++
++sal_Bool SAL_CALL 
++SwVbaBookmarks::Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException)
++{
++    sal_Bool bExist = m_xNameAccess->hasByName( rName );
++    return bExist;
++}
++
++rtl::OUString& 
++SwVbaBookmarks::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmarks") );
++	return sImplName;
++}
++
++css::uno::Sequence<rtl::OUString> 
++SwVbaBookmarks::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > sNames;
++	if ( sNames.getLength() == 0 )
++	{
++		sNames.realloc( 1 );
++		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Bookmarks") );
++	}
++	return sNames;
++}
+Index: sw/source/ui/vba/vbarange.cxx
+===================================================================
+--- sw/source/ui/vba/vbarange.cxx	(revision 0)
++++ sw/source/ui/vba/vbarange.cxx	(revision 276288)
+@@ -0,0 +1,348 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbarange.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include "vbarangehelper.hxx"
++#include <ooo/vba/word/WdBreakType.hpp>
++#include <com/sun/star/style/BreakType.hpp>
++#include <com/sun/star/text/ControlCharacter.hpp>
++#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
++#include "wordvbahelper.hxx"
++#include "vbaparagraphformat.hxx"
++#include "vbastyle.hxx"
++#include "vbafont.hxx"
++#include "vbapalette.hxx"
++#include "vbapagesetup.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
++{
++    uno::Reference< text::XTextRange > xEnd;
++    initialize( rStart, xEnd );
++}
++
++SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
++{
++    initialize( rStart, rEnd );
++}
++
++SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument ), mxText( rText )
++{
++    initialize( rStart, rEnd );
++}
++
++SwVbaRange::~SwVbaRange()
++{
++}
++
++void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) throw (uno::RuntimeException)
++{
++    if( !mxText.is() )
++    {
++        mxText = mxTextDocument->getText();
++    }    
++    
++    mxTextCursor = SwVbaRangeHelper::initCursor( rStart, mxText );
++    mxTextCursor->collapseToStart();
++
++    if( rEnd.is() )
++        mxTextCursor->gotoRange( rEnd, sal_True );
++    else
++        mxTextCursor->gotoEnd( sal_True );
++}
++
++uno::Reference< text::XTextRange > SAL_CALL
++SwVbaRange::getXTextRange() throw (uno::RuntimeException)
++{
++    uno::Reference< text::XTextRange > xTextRange( mxTextCursor, uno::UNO_QUERY_THROW );
++    return xTextRange;
++}
++
++void SwVbaRange::setXTextRange( const uno::Reference< text::XTextRange >& xRange ) throw (uno::RuntimeException)
++{
++    mxTextCursor->gotoRange( xRange->getStart(), sal_False );
++    mxTextCursor->gotoRange( xRange->getEnd(), sal_True );
++}
++
++/**
++* The complexity in this method is because we need to workaround
++* an issue that the last paragraph in a document does not have a trailing CRLF.
++* @return
++*/
++rtl::OUString SAL_CALL
++SwVbaRange::getText() throw ( uno::RuntimeException )
++{
++    rtl::OUString aText = mxTextCursor->getString();
++    sal_Int32 nLen = aText.getLength();
++
++    // FIXME: should add a line separator if the range includes the last paragraph
++    if( nLen == 0 )
++    {
++        if( mxTextCursor->isCollapsed() )
++        {
++            mxTextCursor->goRight( 1, sal_True );
++            aText = mxTextCursor->getString();
++            mxTextCursor->collapseToStart();
++        }
++        else
++        {
++            uno::Reference< text::XTextRange > xStart = mxTextCursor->getStart();
++            uno::Reference< text::XTextRange > xEnd = mxTextCursor->getEnd();
++            mxTextCursor->collapseToEnd();
++            mxTextCursor->goRight( 1, sal_True );
++            mxTextCursor->gotoRange( xStart, sal_False );
++            mxTextCursor->gotoRange( xEnd, sal_True );
++        }
++    }
++
++    return aText;
++}
++
++void SAL_CALL
++SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
++{
++    if( rText.indexOf( '\n' )  != -1 )
++    {
++        mxTextCursor->setString( rtl::OUString() );
++        // process CR in strings
++        uno::Reference< text::XTextRange > xRange( mxTextCursor, uno::UNO_QUERY_THROW );
++        SwVbaRangeHelper::insertString( xRange, mxText, rText, sal_True );
++    }
++    else
++    {
++        mxTextCursor->setString( rText );
++    }
++}
++
++// FIXME: test is not pass
++void SAL_CALL SwVbaRange::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException)
++{
++    // default type is wdPageBreak;
++    sal_Int32 nBreakType = word::WdBreakType::wdPageBreak;
++    if( _breakType.hasValue() )
++        _breakType >>= nBreakType;
++
++    style::BreakType eBreakType = style::BreakType_NONE;
++    switch( nBreakType )
++    {
++        case word::WdBreakType::wdPageBreak:
++            eBreakType = style::BreakType_PAGE_BEFORE;
++            break;
++        case word::WdBreakType::wdColumnBreak:
++            eBreakType = style::BreakType_COLUMN_AFTER;
++            break;
++        case word::WdBreakType::wdLineBreak:
++        case word::WdBreakType::wdLineBreakClearLeft:
++        case word::WdBreakType::wdLineBreakClearRight:
++        case word::WdBreakType::wdSectionBreakContinuous:
++        case word::WdBreakType::wdSectionBreakEvenPage:
++        case word::WdBreakType::wdSectionBreakNextPage:
++        case word::WdBreakType::wdSectionBreakOddPage:
++        case word::WdBreakType::wdTextWrappingBreak:
++            DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
++            break;
++        default:
++            DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
++    }
++
++    if( eBreakType != style::BreakType_NONE )
++    {
++        if( !mxTextCursor->isCollapsed() )
++        {
++            mxTextCursor->setString( rtl::OUString() );
++            mxTextCursor->collapseToStart();
++        }
++
++        uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW );
++        xProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ), uno::makeAny( eBreakType ) );
++    }
++}
++
++void SAL_CALL
++SwVbaRange::Select() throw ( uno::RuntimeException )
++{
++    uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
++    uno::Reference< text::XTextViewCursor > xTextViewCursor = word::getXTextViewCursor( xModel );
++    xTextViewCursor->gotoRange( mxTextCursor->getStart(), sal_False );
++    xTextViewCursor->gotoRange( mxTextCursor->getEnd(), sal_True );
++}
++
++void SAL_CALL
++SwVbaRange::InsertParagraph() throw ( uno::RuntimeException )
++{
++    mxTextCursor->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("") ) );
++    InsertParagraphBefore();
++}
++
++void SAL_CALL
++SwVbaRange::InsertParagraphBefore() throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextRange > xTextRange = mxTextCursor->getStart();
++    mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, sal_True );
++    mxTextCursor->gotoRange( xTextRange, sal_True );
++}
++
++void SAL_CALL
++SwVbaRange::InsertParagraphAfter() throw ( uno::RuntimeException )
++{
++    uno::Reference< text::XTextRange > xTextRange = mxTextCursor->getEnd();
++    mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, sal_True );
++}
++
++uno::Reference< word::XParagraphFormat > SAL_CALL
++SwVbaRange::getParagraphFormat() throw ( uno::RuntimeException )
++{
++    uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
++    return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, mxTextDocument, xParaProps ) );
++}
++
++void SAL_CALL
++SwVbaRange::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& /*rParagraphFormat*/ ) throw ( uno::RuntimeException )
++{
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++uno::Reference< word::XStyle > SAL_CALL
++SwVbaRange::getStyle() throw ( uno::RuntimeException )
++{
++    rtl::OUString aStyleName;
++    rtl::OUString aStyleType;
++    uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW );
++    if( ( xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharStyleName") ) ) >>= aStyleName ) && aStyleName.getLength() )
++    {
++        aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharacterStyles") );
++    }
++    else if( ( xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName") ) ) >>= aStyleName ) && aStyleName.getLength() )
++    {
++        aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") );
++    }
++    if( aStyleType.getLength() == 0 )
++    {
++        DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
++    }
++    uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW);
++    uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW );
++    uno::Reference< beans::XPropertySet > xStyleProps( xStylesAccess->getByName( aStyleName ), uno::UNO_QUERY_THROW );
++    return uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xStyleProps ) ); 
++}
++
++void SAL_CALL
++SwVbaRange::setStyle( const uno::Reference< word::XStyle >& rStyle ) throw ( uno::RuntimeException )
++{
++    uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
++    SwVbaStyle::setStyle( xParaProps, rStyle );
++}
++
++uno::Reference< word::XFont > SAL_CALL
++SwVbaRange::getFont() throw ( uno::RuntimeException )
++{
++    VbaPalette aColors;
++    return new SwVbaFont( mxParent, mxContext, aColors.getPalette(), uno::Reference< beans::XPropertySet >( getXTextRange(), uno::UNO_QUERY_THROW ) );
++}
++
++::sal_Int32 SAL_CALL SwVbaRange::getLanguageID() throw (uno::RuntimeException)
++{
++    uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
++    return SwVbaStyle::getLanguageID( xParaProps );
++}
++
++void SAL_CALL SwVbaRange::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException)
++{
++    uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
++    SwVbaStyle::setLanguageID( xParaProps, _languageid );
++}
++
++uno::Any SAL_CALL
++SwVbaRange::PageSetup( ) throw (uno::RuntimeException)
++{
++    uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
++    uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
++    rtl::OUString aPageStyleName;
++    xParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName;
++    uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW );
++    uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
++    uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles") ) ), uno::UNO_QUERY_THROW );
++    uno::Reference< beans::XPropertySet > xPageProps( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW );
++    return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, xModel, xPageProps ) ) );
++}
++
++::sal_Int32 SAL_CALL SwVbaRange::getStart() throw (uno::RuntimeException)
++{
++    uno::Reference< text::XText > xText = mxTextDocument->getText();
++    return SwVbaRangeHelper::getPosition( xText, mxTextCursor->getStart() );
++}
++
++void SAL_CALL SwVbaRange::setStart( ::sal_Int32 _start ) throw (uno::RuntimeException)
++{
++    uno::Reference< text::XText > xText = mxTextDocument->getText();
++    uno::Reference< text::XTextRange > xStart = SwVbaRangeHelper::getRangeByPosition( xText, _start );
++    uno::Reference< text::XTextRange > xEnd = mxTextCursor->getEnd();
++
++    mxTextCursor->gotoRange( xStart, sal_False );
++    mxTextCursor->gotoRange( xEnd, sal_True );
++}
++
++::sal_Int32 SAL_CALL SwVbaRange::getEnd() throw (uno::RuntimeException)
++{
++    uno::Reference< text::XText > xText = mxTextDocument->getText();
++    return SwVbaRangeHelper::getPosition( xText, mxTextCursor->getEnd() );
++}
++
++void SAL_CALL SwVbaRange::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeException)
++{
++    uno::Reference< text::XText > xText = mxTextDocument->getText();
++    uno::Reference< text::XTextRange > xEnd = SwVbaRangeHelper::getRangeByPosition( xText, _end );
++
++    mxTextCursor->collapseToStart();
++    mxTextCursor->gotoRange( xEnd, sal_True );
++}
++
++rtl::OUString& 
++SwVbaRange::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaRange") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaRange::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Range" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbaautotextentry.cxx
+===================================================================
+--- sw/source/ui/vba/vbaautotextentry.cxx	(revision 0)
++++ sw/source/ui/vba/vbaautotextentry.cxx	(revision 276288)
+@@ -0,0 +1,129 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaautotextentry.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include "vbarange.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaAutoTextEntry::SwVbaAutoTextEntry( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XAutoTextEntry >& xEntry ) throw ( uno::RuntimeException ) :
++    SwVbaAutoTextEntry_BASE( rParent, rContext ), mxEntry( xEntry )
++{
++}
++
++SwVbaAutoTextEntry::~SwVbaAutoTextEntry()
++{
++}
++
++uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& _richtext ) throw ( uno::RuntimeException )
++{
++    SwVbaRange* pWhere = dynamic_cast<SwVbaRange*>( _where.get() );
++    if( pWhere )
++    {
++        uno::Reference< text::XTextRange > xTextRange = pWhere->getXTextRange();
++        xTextRange->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("x") ) ); // set marker
++        uno::Reference< text::XTextRange > xEndMarker = xTextRange->getEnd();
++        xEndMarker->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("x") ) ); // set marker
++        uno::Reference< text::XText > xText = pWhere->getXText();
++        mxEntry->applyTo( xEndMarker->getStart() );
++        uno::Reference< text::XTextCursor > xTC = xText->createTextCursorByRange( xTextRange->getStart() );
++        xTC->goRight( 1, sal_True );
++        xTC->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("") ) ); // remove marker
++        xEndMarker->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("") ) ); // remove marker
++        xTC->gotoRange( xEndMarker, sal_True );
++        pWhere->setXTextCursor( xTC );
++    }
++    return uno::Reference< word::XRange >( pWhere );
++}
++
++rtl::OUString& 
++SwVbaAutoTextEntry::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntry") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaAutoTextEntry::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.AutoTextEntry" ) );
++	}
++	return aServiceNames;
++}
++
++
++SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ), mxAutoTextEntryAccess( xIndexAccess )
++{
++}
++
++// XEnumerationAccess
++uno::Type
++SwVbaAutoTextEntries::getElementType() throw (uno::RuntimeException)
++{
++	return word::XAutoTextEntry::static_type(0);
++}
++uno::Reference< container::XEnumeration >
++SwVbaAutoTextEntries::createEnumeration() throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
++    return xEnumerationAccess->createEnumeration();
++}
++
++uno::Any
++SwVbaAutoTextEntries::createCollectionObject( const css::uno::Any& aSource )
++{
++    uno::Reference< text::XAutoTextEntry > xEntry( aSource, uno::UNO_QUERY_THROW );
++    return uno::makeAny( uno::Reference< word::XAutoTextEntry >( new SwVbaAutoTextEntry( this, mxContext, xEntry ) ) );
++}
++
++rtl::OUString& 
++SwVbaAutoTextEntries::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntries") );
++	return sImplName;
++}
++
++css::uno::Sequence<rtl::OUString> 
++SwVbaAutoTextEntries::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > sNames;
++	if ( sNames.getLength() == 0 )
++	{
++		sNames.realloc( 1 );
++		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.AutoTextEntries") );
++	}
++	return sNames;
++}
+Index: sw/source/ui/vba/vbadialog.cxx
+===================================================================
+--- sw/source/ui/vba/vbadialog.cxx	(revision 0)
++++ sw/source/ui/vba/vbadialog.cxx	(revision 276288)
+@@ -0,0 +1,81 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadialog.cxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbadialog.hxx"
++#include <ooo/vba/word/WdWordDialog.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++struct WordDialogTable
++{
++    sal_Int32 wdDialog;
++    const sal_Char* ooDialog;
++};
++
++static const WordDialogTable aWordDialogTable[] =
++{
++    { word::WdWordDialog::wdDialogFileNew, ".uno:NewDoc" },
++    { word::WdWordDialog::wdDialogFileOpen, ".uno:Open" },
++    { word::WdWordDialog::wdDialogFilePrint, ".uno:Print" },
++    { word::WdWordDialog::wdDialogFileSaveAs, ".uno:SaveAs" },
++    { 0, 0 }
++};
++
++rtl::OUString 
++SwVbaDialog::mapIndexToName( sal_Int32 nIndex )
++{
++    for( const WordDialogTable* pTable = aWordDialogTable; pTable->wdDialog != NULL; pTable++ )
++    {
++        if( nIndex == pTable->wdDialog )
++        {
++            return rtl::OUString::createFromAscii( pTable->ooDialog );
++        }
++    }
++	return rtl::OUString();
++}
++
++rtl::OUString& 
++SwVbaDialog::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDialog") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaDialog::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Dialog" ) );
++	}
++	return aServiceNames;
++}
+Index: sw/source/ui/vba/vbapagesetup.hxx
+===================================================================
+--- sw/source/ui/vba/vbapagesetup.hxx	(revision 0)
++++ sw/source/ui/vba/vbapagesetup.hxx	(revision 276288)
+@@ -0,0 +1,70 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_PAGESETUP_HXX
++#define SW_VBA_PAGESETUP_HXX
++
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/word/XPageSetup.hpp>
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbapagesetupbase.hxx>
++
++typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ooo::vba::word::XPageSetup > SwVbaPageSetup_BASE;
++
++class SwVbaPageSetup :  public SwVbaPageSetup_BASE 
++{
++private:
++    rtl::OUString getStyleOfFirstPage() throw (css::uno::RuntimeException);
++
++public:
++	SwVbaPageSetup( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, 
++                    const css::uno::Reference< css::uno::XComponentContext >& xContext,
++                    const css::uno::Reference< css::frame::XModel >& xModel, 
++                    const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw (css::uno::RuntimeException); 
++	virtual ~SwVbaPageSetup(){}
++
++    // Attributes
++    virtual double SAL_CALL getGutter() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setGutter( double _gutter ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getHeaderDistance() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setHeaderDistance( double _headerdistance ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getFooterDistance() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setFooterDistance( double _footerdistance ) throw (css::uno::RuntimeException);
++    virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getSectionStart() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif
+Index: sw/source/ui/vba/vbaapplication.cxx
+===================================================================
+--- sw/source/ui/vba/vbaapplication.cxx	(revision 0)
++++ sw/source/ui/vba/vbaapplication.cxx	(revision 276288)
+@@ -0,0 +1,206 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbaapplication.cxx,v $
++ * $Revision: 1.7 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <stdio.h>
++#include "vbaapplication.hxx"
++#include "vbadocument.hxx"
++#include <osl/file.hxx>
++#include <vbahelper/vbahelper.hxx>
++#include "vbawindow.hxx"
++#include "vbasystem.hxx"
++#include "vbaoptions.hxx"
++#include "vbaselection.hxx"
++#include "vbadocuments.hxx"
++#include "vbaaddins.hxx"
++#include "vbadialogs.hxx"
++#include <ooo/vba/word/WdEnableCancelKey.hpp>
++#include <svx/acorrcfg.hxx>
++#include "wordvbahelper.hxx"
++#include <docsh.hxx>
++
++using namespace ::ooo;
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::uno::UNO_QUERY_THROW;
++using ::com::sun::star::uno::UNO_QUERY;
++using ::rtl::OUString;
++
++// Enable our own join detection for Intersection and Union
++// should be more efficient than using ScRangeList::Join ( because
++// we already are testing the same things )
++
++#define OWN_JOIN 1
++
++// #TODO is this defined somewhere else?
++#if ( defined UNX ) || ( defined OS2 ) //unix
++#define FILE_PATH_SEPERATOR "/"
++#else // windows
++#define FILE_PATH_SEPERATOR "\\"
++#endif 
++
++#define EXCELVERSION "11.0"
++
++uno::Any sbxToUnoValue( SbxVariable* pVar );
++
++SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): SwVbaApplication_BASE( xContext )
++{
++}
++
++SwVbaApplication::~SwVbaApplication()
++{
++}
++
++SfxObjectShell* SwVbaApplication::GetDocShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
++{
++    return static_cast< SfxObjectShell* >( word::getDocShell( xModel ) );
++}
++
++rtl::OUString SAL_CALL
++SwVbaApplication::getName() throw (uno::RuntimeException)
++{
++    static rtl::OUString appName( RTL_CONSTASCII_USTRINGPARAM("Microsoft Word" ) );
++    return appName;
++}
++
++uno::Reference< word::XDocument > SAL_CALL
++SwVbaApplication::getActiveDocument() throw (uno::RuntimeException)
++{
++    return new SwVbaDocument( this, mxContext, getCurrentDocument() );
++}
++
++uno::Reference< word::XWindow > SAL_CALL 
++SwVbaApplication::getActiveWindow() throw (uno::RuntimeException)
++{
++	// #FIXME sofar can't determine Parent
++	return new SwVbaWindow( uno::Reference< XHelperInterface >(), mxContext, getCurrentDocument() );
++}
++
++uno::Reference<word::XSystem > SAL_CALL
++SwVbaApplication::getSystem() throw (uno::RuntimeException)
++{
++    return uno::Reference< word::XSystem >( new SwVbaSystem( mxContext ) );
++}
++
++uno::Reference<word::XOptions > SAL_CALL
++SwVbaApplication::getOptions() throw (uno::RuntimeException)
++{
++    return uno::Reference< word::XOptions >( new SwVbaOptions( mxContext ) );
++}
++
++uno::Any SAL_CALL
++SwVbaApplication::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++    return VbaApplicationBase::CommandBars( aIndex );
++}
++
++uno::Reference< word::XSelection > SAL_CALL
++SwVbaApplication::getSelection() throw (uno::RuntimeException)
++{
++    return new SwVbaSelection( this, mxContext, getCurrentDocument() );
++}
++
++uno::Any SAL_CALL
++SwVbaApplication::Documents( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< XCollection > xCol( new SwVbaDocuments( this, mxContext ) );
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++uno::Any SAL_CALL
++SwVbaApplication::Addins( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    static uno::Reference< XCollection > xCol( new SwVbaAddins( this, mxContext ) );
++    if ( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++uno::Any SAL_CALL
++SwVbaApplication::Dialogs( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< word::XDialogs > xCol( new SwVbaDialogs( this, mxContext, getCurrentDocument() ));
++    if ( index.hasValue() )
++        return xCol->Item( index );
++    return uno::makeAny( xCol );
++}
++
++sal_Bool SAL_CALL SwVbaApplication::getDisplayAutoCompleteTips() throw (css::uno::RuntimeException)
++{
++    return SvxAutoCorrCfg::Get()->IsAutoTextTip();
++}
++
++void SAL_CALL SwVbaApplication::setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException)
++{
++    SvxAutoCorrCfg::Get()->SetAutoTextTip( _displayAutoCompleteTips );
++}
++
++sal_Int32 SAL_CALL SwVbaApplication::getEnableCancelKey() throw (css::uno::RuntimeException)
++{
++    // the default value is wdCancelInterrupt in Word
++    return word::WdEnableCancelKey::wdCancelInterrupt;
++}
++
++void SAL_CALL SwVbaApplication::setEnableCancelKey( sal_Int32/* _enableCancelKey */) throw (css::uno::RuntimeException)
++{
++    // seems not supported in Writer
++}
++
++float SAL_CALL SwVbaApplication::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException)
++{
++    return VbaApplicationBase::CentimetersToPoints( _Centimeters );
++}
++
++uno::Reference< frame::XModel > 
++SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
++{
++    return getCurrentWordDoc( mxContext );
++}
++
++rtl::OUString& 
++SwVbaApplication::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaApplication") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaApplication::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Application" ) );
++	}
++	return aServiceNames;
++}
+Index: sw/source/ui/vba/vbaborders.hxx
+===================================================================
+--- sw/source/ui/vba/vbaborders.hxx	(revision 0)
++++ sw/source/ui/vba/vbaborders.hxx	(revision 276288)
+@@ -0,0 +1,66 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbaborders.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_BORDERS_HXX
++#define SW_VBA_BORDERS_HXX
++
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/word/XBorders.hpp>
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <com/sun/star/table/XCellRange.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <vbahelper/vbacollectionimpl.hxx>
++
++typedef CollTestImplHelper< ov::word::XBorders > SwVbaBorders_BASE;
++class VbaPalette;
++class SwVbaBorders : public SwVbaBorders_BASE
++{
++	// XEnumerationAccess
++	virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException);
++	css::uno::Reference< css::beans::XPropertySet > m_xProps;
++public:
++	SwVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, VbaPalette& rPalette );
++	virtual ~SwVbaBorders() {}
++
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++	// SwVbaCollectionBaseImpl	
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
++	
++	virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException);
++
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif //SW_VBA_BORDERS_HXX
++
+Index: sw/source/ui/vba/vbafont.cxx
+===================================================================
+--- sw/source/ui/vba/vbafont.cxx	(revision 0)
++++ sw/source/ui/vba/vbafont.cxx	(revision 276288)
+@@ -0,0 +1,216 @@
++#include "vbafont.hxx"
++#include <com/sun/star/awt/FontUnderline.hpp>
++#include <ooo/vba/word/WdUnderline.hpp>
++#include <hash_map>
++#include <ooo/vba/word/WdColorIndex.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++const uno::Any aLongAnyTrue( sal_Int16(-1) );
++const uno::Any aLongAnyFalse( sal_Int16( 0 ) );
++
++struct MapPair
++{
++    sal_Int32 nMSOConst;
++    sal_Int32 nOOOConst;
++};
++
++static MapPair UnderLineTable[] = {
++        { word::WdUnderline::wdUnderlineNone, com::sun::star::awt::FontUnderline::NONE },
++        { word::WdUnderline::wdUnderlineSingle, com::sun::star::awt::FontUnderline::SINGLE },
++        { word::WdUnderline::wdUnderlineWords, com::sun::star::awt::FontUnderline::SINGLE },
++        { word::WdUnderline::wdUnderlineDouble, com::sun::star::awt::FontUnderline::DOUBLE },
++        { word::WdUnderline::wdUnderlineDotted, com::sun::star::awt::FontUnderline::DOTTED },
++        { word::WdUnderline::wdUnderlineThick, com::sun::star::awt::FontUnderline::BOLDDASH },
++        { word::WdUnderline::wdUnderlineDash, com::sun::star::awt::FontUnderline::DASH }, 
++	{ word::WdUnderline::wdUnderlineDotDash, com::sun::star::awt::FontUnderline::DASHDOT }, 
++	{ word::WdUnderline::wdUnderlineDotDotDash, com::sun::star::awt::FontUnderline::DASHDOTDOT },
++        { word::WdUnderline::wdUnderlineWavy, com::sun::star::awt::FontUnderline::WAVE },
++        { word::WdUnderline::wdUnderlineDottedHeavy, com::sun::star::awt::FontUnderline::BOLDDOTTED },
++        { word::WdUnderline::wdUnderlineDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASH },
++        { word::WdUnderline::wdUnderlineDotDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASHDOT },
++        { word::WdUnderline::wdUnderlineDotDotDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASHDOTDOT },
++        { word::WdUnderline::wdUnderlineWavyHeavy, com::sun::star::awt::FontUnderline::BOLDWAVE },
++        { word::WdUnderline::wdUnderlineDashLong, com::sun::star::awt::FontUnderline::LONGDASH },
++        { word::WdUnderline::wdUnderlineWavyDouble, com::sun::star::awt::FontUnderline::DOUBLEWAVE },
++        { word::WdUnderline::wdUnderlineDashLongHeavy, com::sun::star::awt::FontUnderline::BOLDLONGDASH },
++};
++
++typedef std::hash_map< sal_Int32, sal_Int32 > ConstToConst;
++class UnderLineMapper
++{
++    ConstToConst MSO2OOO;
++    ConstToConst OOO2MSO;
++private:
++    UnderLineMapper()
++    {
++        sal_Int32 nLen = sizeof( UnderLineTable )/ sizeof( UnderLineTable[0] );
++
++        for ( sal_Int32 index=0; index<nLen; ++index )
++        {
++            MSO2OOO[ UnderLineTable[ index ].nMSOConst ] = UnderLineTable[ index ].nOOOConst;
++            OOO2MSO[ UnderLineTable[ index ].nOOOConst ] = UnderLineTable[ index ].nMSOConst;
++        }
++    }
++public:
++    static rtl::OUString propName()
++    {
++        static rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("CharUnderline") );
++        return sPropName;
++    }
++
++    static UnderLineMapper& instance()
++    {
++        static  UnderLineMapper theMapper;
++        return theMapper; 
++    }
++
++    sal_Int32 getOOOFromMSO( sal_Int32 nMSOConst ) throw( lang::IllegalArgumentException )
++    {
++        ConstToConst::iterator it = MSO2OOO.find( nMSOConst );
++        if ( it == MSO2OOO.end() )
++            throw lang::IllegalArgumentException();
++        return it->second;
++    }
++    sal_Int32 getMSOFromOOO( sal_Int32 nOOOConst ) throw( lang::IllegalArgumentException )
++    {
++        ConstToConst::iterator it = OOO2MSO.find( nOOOConst );
++        if ( it == OOO2MSO.end() )
++            throw lang::IllegalArgumentException();
++        return it->second;
++    }
++};
++
++SwVbaFont::SwVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPalette, uno::Reference< css::beans::XPropertySet > xPropertySet ) throw ( css::uno::RuntimeException ) : SwVbaFont_BASE( xParent, xContext, xPalette, xPropertySet )
++{
++}
++
++uno::Any SAL_CALL 
++SwVbaFont::getUnderline() throw (uno::RuntimeException)
++{
++    sal_Int32 nOOVal = 0;
++    mxFont->getPropertyValue(  UnderLineMapper::propName() ) >>= nOOVal;
++    return uno::makeAny( UnderLineMapper::instance().getMSOFromOOO( nOOVal ) );
++}
++
++void SAL_CALL 
++SwVbaFont::setUnderline( const uno::Any& _underline ) throw (uno::RuntimeException)
++{
++    sal_Int32 nMSOVal = 0;
++
++    if ( _underline >>= nMSOVal )
++    {
++        sal_Int32 nOOVal =  UnderLineMapper::instance().getOOOFromMSO( nMSOVal );
++        mxFont->setPropertyValue(  UnderLineMapper::propName(), uno::makeAny( nOOVal ) );
++    }
++}
++
++rtl::OUString&
++SwVbaFont::getServiceImplName()
++{
++        static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFont") );
++        return sImplName;
++}
++
++void SAL_CALL
++SwVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException )
++{
++        sal_Int32 nIndex = 0;
++        _colorindex >>= nIndex;
++        return setColor( OORGBToXLRGB(mxPalette->getByIndex( nIndex )) );
++} 
++
++uno::Any SAL_CALL
++SwVbaFont::getColorIndex() throw ( uno::RuntimeException )
++{
++    	sal_Int32 nColor = 0;
++
++	XLRGBToOORGB( getColor() ) >>= nColor;
++	sal_Int32 nElems = mxPalette->getCount();
++	sal_Int32 nIndex = 0;
++	for ( sal_Int32 count=0; count<nElems; ++count )
++       	{
++		sal_Int32 nPaletteColor = 0;
++		mxPalette->getByIndex( count ) >>= nPaletteColor;
++		if ( nPaletteColor == nColor )
++		{
++			nIndex = count;
++			break;
++		}
++	}
++	return uno::makeAny( nIndex );
++}	
++uno::Any SAL_CALL 
++SwVbaFont::getSubscript() throw ( uno::RuntimeException )
++{
++    sal_Bool bRes = sal_False;
++    SwVbaFont_BASE::getSubscript() >>= bRes;
++    if ( bRes )
++        return aLongAnyTrue;
++    return aLongAnyFalse;
++}
++
++uno::Any SAL_CALL 
++SwVbaFont::getSuperscript() throw ( uno::RuntimeException )
++{
++    sal_Bool bRes = sal_False;
++    SwVbaFont_BASE::getSuperscript() >>= bRes;
++    if ( bRes )
++        return aLongAnyTrue;
++    return aLongAnyFalse;
++}
++
++uno::Any SAL_CALL 
++SwVbaFont::getBold() throw (uno::RuntimeException)
++{
++    sal_Bool bRes = sal_False;
++    SwVbaFont_BASE::getBold() >>= bRes;
++    if ( bRes )
++        return aLongAnyTrue;
++    return aLongAnyFalse;
++}
++
++uno::Any SAL_CALL 
++SwVbaFont::getItalic() throw (uno::RuntimeException)
++{
++    sal_Bool bRes = sal_False;
++    SwVbaFont_BASE::getItalic() >>= bRes;
++    if ( bRes )
++        return aLongAnyTrue;
++    return aLongAnyFalse;
++}
++
++uno::Any SAL_CALL 
++SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException)
++{
++    sal_Bool bRes = sal_False;
++    SwVbaFont_BASE::getStrikethrough() >>= bRes;
++    if ( bRes )
++        return aLongAnyTrue;
++    return aLongAnyFalse;
++}
++
++uno::Any SAL_CALL 
++SwVbaFont::getShadow() throw (uno::RuntimeException)
++{
++    sal_Bool bRes = sal_False;
++    SwVbaFont_BASE::getShadow() >>= bRes;
++    if ( bRes )
++        return aLongAnyTrue;
++    return aLongAnyFalse;
++}
++
++uno::Sequence< rtl::OUString >
++SwVbaFont::getServiceNames()
++{
++        static uno::Sequence< rtl::OUString > aServiceNames;
++        if ( aServiceNames.getLength() == 0 )
++        {
++                aServiceNames.realloc( 1 );
++                aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Font" ) );
++        }
++        return aServiceNames;
++}
++
++
+Index: sw/source/ui/vba/vbapanes.hxx
+===================================================================
+--- sw/source/ui/vba/vbapanes.hxx	(revision 0)
++++ sw/source/ui/vba/vbapanes.hxx	(revision 276288)
+@@ -0,0 +1,60 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_PANES_HXX
++#define SW_VBA_PANES_HXX
++
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <ooo/vba/word/XPanes.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <com/sun/star/container/XIndexAccess.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef CollTestImplHelper< ooo::vba::word::XPanes > SwVbaPanes_BASE;
++
++class SwVbaPanes : public SwVbaPanes_BASE
++{
++private:
++    css::uno::Reference< css::frame::XModel > mxModel;
++
++public:
++	SwVbaPanes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
++	virtual ~SwVbaPanes() {}
++
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++	// SwVbaPanes_BASE
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};    
++
++#endif /* SW_VBA_PANES_HXX */
+Index: sw/source/ui/vba/vbatemplate.cxx
+===================================================================
+--- sw/source/ui/vba/vbatemplate.cxx	(revision 0)
++++ sw/source/ui/vba/vbatemplate.cxx	(revision 276288)
+@@ -0,0 +1,105 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbatemplate.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include "wordvbahelper.hxx"
++#include "vbaautotextentry.hxx"
++#include <comphelper/processfactory.hxx>
++#include <com/sun/star/text/XAutoTextContainer.hpp>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rName )
++    : SwVbaTemplate_BASE( rParent, rContext ), mxModel( rModel ), msName( rName )
++{
++}
++
++
++SwVbaTemplate::~SwVbaTemplate()
++{
++}
++
++rtl::OUString
++SwVbaTemplate::getName() throw ( css::uno::RuntimeException )
++{
++    return msName;
++}
++
++uno::Any SAL_CALL
++SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    uno::Reference< lang::XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory();
++    uno::Reference< text::XAutoTextContainer > xAutoTextContainer( xMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.AutoTextContainer") ) ), uno::UNO_QUERY_THROW );
++
++    // the default template is "Normal.dot" in Word.
++    rtl::OUString sGroup( RTL_CONSTASCII_USTRINGPARAM("Normal") );
++    if( sal_Int32 nIndex = msName.lastIndexOf( sal_Unicode('.') ) > 0 )
++    {
++        sGroup = msName.copy( 0, msName.lastIndexOf( sal_Unicode('.') ) );
++       // OSL_TRACE("SwVbaTemplate::AutoTextEntries: %s", rtl::OUStringToOString( sGroup, RTL_TEXTENCODING_UTF8 ).getStr() );
++    }
++    
++    uno::Reference< container::XIndexAccess > xGroup;
++    if( xAutoTextContainer->hasByName( sGroup ) )
++    {
++        xGroup.set( xAutoTextContainer->getByName( sGroup ), uno::UNO_QUERY_THROW );
++    }
++    else
++    {
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Auto Text Entry doesn't exist") ), uno::Reference< uno::XInterface >() );
++        //xGroup.set( xAutoTextContainer->insertNewByName( sGroup ), uno::UNO_QUERY_THROW );
++    }
++
++    uno::Reference< XCollection > xCol( new SwVbaAutoTextEntries( this, mxContext, xGroup ) );
++    if( index.hasValue() )
++        return xCol->Item( index, uno::Any() );
++    return uno::makeAny( xCol );
++}
++
++rtl::OUString&
++SwVbaTemplate::getServiceImplName()
++{
++        static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTemplate") );
++        return sImplName;
++}
++
++uno::Sequence< rtl::OUString >
++SwVbaTemplate::getServiceNames()
++{
++        static uno::Sequence< rtl::OUString > aServiceNames;
++        if ( aServiceNames.getLength() == 0 )
++        {
++                aServiceNames.realloc( 1 );
++                aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Template" ) );
++        }
++        return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbaheaderfooter.hxx
+===================================================================
+--- sw/source/ui/vba/vbaheaderfooter.hxx	(revision 0)
++++ sw/source/ui/vba/vbaheaderfooter.hxx	(revision 276288)
+@@ -0,0 +1,63 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_HEADERFOOTER_HXX
++#define SW_VBA_HEADERFOOTER_HXX
++
++#include <ooo/vba/word/XHeaderFooter.hpp>
++#include <ooo/vba/word/XRange.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XHeaderFooter > SwVbaHeaderFooter_BASE;
++
++class SwVbaHeaderFooter : public SwVbaHeaderFooter_BASE
++{
++private:
++    css::uno::Reference< css::frame::XModel > mxModel;
++    css::uno::Reference< css::beans::XPropertySet > mxPageStyleProps;
++    sal_Bool mbHeader;
++    sal_Int32 mnIndex;
++
++public:
++	SwVbaHeaderFooter( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, sal_Bool isHeader, sal_Int32 index ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaHeaderFooter(){}
++
++    // Attributes
++    virtual ::sal_Bool SAL_CALL getIsHeader() throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getLinkToPrevious() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLinkToPrevious( ::sal_Bool _linktoprevious ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_HEADERFOOTER_HXX */
+Index: sw/source/ui/vba/vbavariables.hxx
+===================================================================
+--- sw/source/ui/vba/vbavariables.hxx	(revision 0)
++++ sw/source/ui/vba/vbavariables.hxx	(revision 276288)
+@@ -0,0 +1,64 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_VARIABLES_HXX
++#define SW_VBA_VARIABLES_HXX
++
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <ooo/vba/word/XVariables.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <com/sun/star/container/XIndexAccess.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/beans/XPropertyAccess.hpp>
++
++typedef CollTestImplHelper< ooo::vba::word::XVariables > SwVbaVariables_BASE;
++
++class SwVbaVariables : public SwVbaVariables_BASE
++{
++private:
++    css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined;
++
++public:
++	SwVbaVariables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined );
++	virtual ~SwVbaVariables() {}
++
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++	// SwVbaVariables_BASE
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++
++	// XVariables
++	virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException);
++};    
++
++#endif /* SW_VBA_VARIABLES_HXX */
+Index: sw/source/ui/vba/vbaparagraphformat.cxx
+===================================================================
+--- sw/source/ui/vba/vbaparagraphformat.cxx	(revision 0)
++++ sw/source/ui/vba/vbaparagraphformat.cxx	(revision 276288)
+@@ -0,0 +1,576 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaparagraphformat.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <tools/diagnose_ex.h>
++#include "wordvbahelper.hxx"
++#include <com/sun/star/style/LineSpacingMode.hpp>
++#include <ooo/vba/word/WdLineSpacing.hpp>
++#include <ooo/vba/word/WdParagraphAlignment.hpp>
++#include <ooo/vba/word/WdOutlineLevel.hpp>
++#include <com/sun/star/style/ParagraphAdjust.hpp>
++#include <com/sun/star/style/BreakType.hpp>
++
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++static const sal_Int16 CHARACTER_INDENT_FACTOR = 12;
++static const sal_Int16 PERCENT100 = 100;
++static const sal_Int16 PERCENT150 = 150;
++static const sal_Int16 PERCENT200 = 200;
++
++SwVbaParagraphFormat::SwVbaParagraphFormat( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< beans::XPropertySet >& rParaProps ) : SwVbaParagraphFormat_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mxParaProps( rParaProps )
++{
++}
++
++SwVbaParagraphFormat::~SwVbaParagraphFormat()
++{
++}
++
++sal_Int32 SAL_CALL SwVbaParagraphFormat::getAlignment() throw (uno::RuntimeException)
++{
++    style::ParagraphAdjust aParaAdjust = style::ParagraphAdjust_LEFT;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaAdjust") ) ) >>= aParaAdjust;
++    return getMSWordAlignment( aParaAdjust );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setAlignment( sal_Int32 _alignment ) throw (uno::RuntimeException)
++{
++    style::ParagraphAdjust aParaAdjust = ( style::ParagraphAdjust ) getOOoAlignment( _alignment );
++    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaAdjust") ), uno::makeAny( aParaAdjust ) );
++}
++
++float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() throw (uno::RuntimeException)
++{
++    sal_Int32 indent = 0;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaFirstLineIndent") ) ) >>= indent;
++    return (float)( Millimeter::getInPoints( indent ) );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent ) throw (uno::RuntimeException)
++{
++    sal_Int32 indent = Millimeter::getInHundredthsOfOneMillimeter( _firstlineindent );
++    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaFirstLineIndent") ), uno::makeAny( indent ) );
++}
++
++uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() throw (uno::RuntimeException)
++{
++    sal_Bool bKeep = sal_False;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaKeepTogether") ) ) >>= bKeep;
++    return uno::makeAny ( bKeep );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogether ) throw (uno::RuntimeException)
++{
++    sal_Bool bKeep = sal_False;
++    if( _keeptogether >>= bKeep )
++    {
++        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaKeepTogether") ), uno::makeAny( bKeep ) );
++    }    
++    else
++    {
++        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
++    }
++}
++
++uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() throw (uno::RuntimeException)
++{
++    sal_Bool bKeep = sal_False;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaSplit") ) ) >>= bKeep;
++    return uno::makeAny ( bKeep );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithnext ) throw (uno::RuntimeException)
++{
++    sal_Bool bKeep = sal_False;
++    if( _keepwithnext >>= bKeep )
++    {
++        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaSplit") ), uno::makeAny( bKeep ) );
++    }    
++    else
++    {
++        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
++    }
++}
++
++uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() throw (uno::RuntimeException)
++{
++    sal_Bool bHypn = sal_False;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation") ) ) >>= bHypn;
++    return uno::makeAny ( bHypn );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation ) throw (uno::RuntimeException)
++{
++    sal_Bool bHypn = sal_False;
++    if( _hyphenation >>= bHypn )
++    {
++        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation") ), uno::makeAny( bHypn ) );
++    }    
++    else
++    {
++        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
++    }
++}
++
++float SAL_CALL SwVbaParagraphFormat::getLineSpacing() throw (uno::RuntimeException)
++{
++    style::LineSpacing aLineSpacing;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ) ) >>= aLineSpacing;
++    return getMSWordLineSpacing( aLineSpacing );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) throw (uno::RuntimeException)
++{
++    style::LineSpacing aLineSpacing;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ) ) >>= aLineSpacing;
++    aLineSpacing = getOOoLineSpacing( _linespacing, aLineSpacing.Mode );
++    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ), uno::makeAny( aLineSpacing ) );
++}
++
++sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule() throw (uno::RuntimeException)
++{
++    style::LineSpacing aLineSpacing;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ) ) >>= aLineSpacing;
++    return getMSWordLineSpacingRule( aLineSpacing );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingrule ) throw (uno::RuntimeException)
++{
++    style::LineSpacing aLineSpacing = getOOoLineSpacingFromRule( _linespacingrule );
++    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ), uno::makeAny( aLineSpacing ) );
++}
++
++uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() throw (uno::RuntimeException)
++{
++    sal_Bool noLineNum = sal_False;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberCount") ) ) >>= noLineNum;
++    return uno::makeAny ( noLineNum );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumber ) throw (uno::RuntimeException)
++{
++    sal_Bool noLineNum = sal_False;
++    if( _nolinenumber >>= noLineNum )
++    {
++        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberCount") ), uno::makeAny( noLineNum ) );
++    }    
++    else
++    {
++        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
++    }
++}
++
++sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeException)
++{
++    sal_Int32 nLevel = word::WdOutlineLevel::wdOutlineLevelBodyText;
++    rtl::OUString aHeading;
++    const rtl::OUString HEADING = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Heading") );
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName") ) ) >>= aHeading;
++    if( aHeading.indexOf( HEADING ) == 0 )
++    {
++        // get the sub string after "Heading"
++        nLevel = aHeading.copy( HEADING.getLength() ).toInt32();
++    }
++    return nLevel;
++}
++
++void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::RuntimeException)
++{
++    style::BreakType aBreakType;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ) ) >>= aBreakType;
++    sal_Bool bBreakBefore = ( aBreakType == style::BreakType_PAGE_BEFORE || aBreakType == style::BreakType_PAGE_BOTH );
++    return uno::makeAny( bBreakBefore );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbefore ) throw (uno::RuntimeException)
++{
++    sal_Bool bBreakBefore = sal_False;
++    if( _breakbefore >>= bBreakBefore )
++    {
++        style::BreakType aBreakType;
++        mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ) ) >>= aBreakType;
++        if( bBreakBefore )
++        {
++            if( aBreakType == style::BreakType_NONE )
++                aBreakType = style::BreakType_PAGE_BEFORE;
++            else if ( aBreakType == style::BreakType_PAGE_AFTER )
++                aBreakType = style::BreakType_PAGE_BOTH;
++        }
++        else
++        {
++            if( aBreakType == style::BreakType_PAGE_BOTH )
++                aBreakType = style::BreakType_PAGE_AFTER;
++            else if ( aBreakType == style::BreakType_PAGE_BEFORE )
++                aBreakType = style::BreakType_PAGE_AFTER;
++        }
++        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ), uno::makeAny( aBreakType ) );
++    }    
++    else
++    {
++        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
++    }
++}
++
++float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() throw (uno::RuntimeException)
++{
++    sal_Int32 nSpace;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin") ) ) >>= nSpace;
++    return (float)( Millimeter::getInPoints( nSpace ) );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space ) throw (uno::RuntimeException)
++{
++    sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space );
++    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin") ), uno::makeAny( nSpace ) );
++}
++
++float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() throw (uno::RuntimeException)
++{
++    sal_Int32 nSpace = 0;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaBottomMargin") ) ) >>= nSpace;
++    return (float)( Millimeter::getInPoints( nSpace ) );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space ) throw (uno::RuntimeException)
++{
++    sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space );
++    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaBottomMargin") ), uno::makeAny( nSpace ) );
++}
++
++float SAL_CALL SwVbaParagraphFormat::getLeftIndent() throw (uno::RuntimeException)
++{
++    sal_Int32 nIndent = 0;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLeftMargin") ) ) >>= nIndent;
++    return (float)( Millimeter::getInPoints( nIndent ) );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent ) throw (uno::RuntimeException)
++{
++    sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _leftindent );
++    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLeftMargin") ), uno::makeAny( nIndent ) );
++}
++
++float SAL_CALL SwVbaParagraphFormat::getRightIndent() throw (uno::RuntimeException)
++{
++    sal_Int32 nIndent = 0;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaRightMargin") ) ) >>= nIndent;
++    return (float)( Millimeter::getInPoints( nIndent ) );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) throw (uno::RuntimeException)
++{
++    sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _rightindent );
++    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaRightMargin") ), uno::makeAny( nIndent ) );
++}
++
++uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& _tabstops ) throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeException)
++{
++    sal_Bool bWidow = sal_False;
++    sal_Int8 nWidow = 0;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaWidows") ) ) >>= nWidow;
++    sal_Int8 nOrphan = 0;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaOrphans") ) ) >>= nOrphan;
++    // if the amount of single lines on one page > 1 and the same of start and end of the paragraph,
++    // true is retured.
++    bWidow = ( nWidow > 1 && nOrphan == nWidow );
++    return uno::makeAny( bWidow );
++}
++
++void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontrol ) throw (uno::RuntimeException)
++{
++    // if we get true, the part of the paragraph on one page has to be
++    // at least two lines
++    sal_Bool bWidow = sal_False;
++    if( _widowcontrol >>= bWidow )
++    {
++        sal_Int8 nControl = bWidow? 2:1;
++        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaWidows") ), uno::makeAny( nControl ) );
++        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaOrphans") ), uno::makeAny( nControl ) );
++    }
++    else
++    {
++        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
++    }
++}
++
++style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacing( float _lineSpace, sal_Int16 mode )
++{
++    style::LineSpacing aLineSpacing;
++    if( mode != style::LineSpacingMode::MINIMUM && mode != style::LineSpacingMode::FIX )
++    {
++        // special behaviour of word: if the space is set to these values, the rule and 
++        // the height are changed accordingly
++        if( _lineSpace == CHARACTER_INDENT_FACTOR )
++        {
++            aLineSpacing.Mode = style::LineSpacingMode::PROP;
++            aLineSpacing.Height = PERCENT100;
++        }
++        else if( _lineSpace == ( sal_Int16 )( CHARACTER_INDENT_FACTOR * 1.5 ) )
++        {
++            aLineSpacing.Mode = style::LineSpacingMode::PROP;
++            aLineSpacing.Height = PERCENT150;
++        }
++        else if( _lineSpace == ( sal_Int16 )( ( CHARACTER_INDENT_FACTOR ) * 2 ) )
++        {
++            aLineSpacing.Mode = style::LineSpacingMode::PROP;
++            aLineSpacing.Height = PERCENT200;
++        }
++        else
++        {
++            aLineSpacing.Mode = style::LineSpacingMode::FIX;
++            aLineSpacing.Height = ( sal_Int16 )( Millimeter::getInHundredthsOfOneMillimeter( _lineSpace ) );
++        }
++    }
++    else
++    {
++        aLineSpacing.Mode = mode;
++        aLineSpacing.Height = ( sal_Int16 )( Millimeter::getInHundredthsOfOneMillimeter( _lineSpace ) );
++    }
++    return aLineSpacing;
++}
++
++style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacingFromRule( sal_Int32 _linespacingrule )
++{
++    style::LineSpacing aLineSpacing;
++    switch( _linespacingrule )
++    {
++        case word::WdLineSpacing::wdLineSpace1pt5:
++        {
++            aLineSpacing.Mode = style::LineSpacingMode::PROP;
++            aLineSpacing.Height = PERCENT150;
++            break;
++        }
++        case word::WdLineSpacing::wdLineSpaceAtLeast:
++        {
++            aLineSpacing.Mode = style::LineSpacingMode::MINIMUM;
++            aLineSpacing.Height = getCharHeight();
++            break;
++        }
++        case word::WdLineSpacing::wdLineSpaceDouble:
++        {
++            aLineSpacing.Mode = style::LineSpacingMode::PROP;
++            aLineSpacing.Height = getCharHeight();
++            break;
++        }
++        case word::WdLineSpacing::wdLineSpaceExactly:
++        case word::WdLineSpacing::wdLineSpaceMultiple:
++        {
++            aLineSpacing.Mode = style::LineSpacingMode::FIX;
++            aLineSpacing.Height = getCharHeight();
++            break;
++        }
++        case word::WdLineSpacing::wdLineSpaceSingle:
++        {
++            aLineSpacing.Mode = style::LineSpacingMode::PROP;
++            aLineSpacing.Height = PERCENT100;
++            break;
++        }
++        default:
++        {
++            DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
++            break;
++        }
++    }
++    return aLineSpacing;
++}
++
++float SwVbaParagraphFormat::getMSWordLineSpacing( style::LineSpacing& rLineSpacing )
++{
++    float wdLineSpacing = 0;
++    if( rLineSpacing.Mode != style::LineSpacingMode::PROP )
++    {
++        wdLineSpacing = (float)( Millimeter::getInPoints( rLineSpacing.Height ) );
++    }
++    else
++    {
++        wdLineSpacing = (float)( CHARACTER_INDENT_FACTOR * rLineSpacing.Height ) / PERCENT100;
++    }
++    return wdLineSpacing;
++}
++
++sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rLineSpacing )
++{
++    sal_Int32 wdLineSpacing = word::WdLineSpacing::wdLineSpaceSingle;
++    switch( rLineSpacing.Mode )
++    {
++        case style::LineSpacingMode::PROP:
++        {
++            switch( rLineSpacing.Height )
++            {
++                case PERCENT100:
++                {
++                    wdLineSpacing = word::WdLineSpacing::wdLineSpaceSingle;
++                    break;
++                }
++                case PERCENT150:
++                {
++                    wdLineSpacing = word::WdLineSpacing::wdLineSpace1pt5;
++                    break;
++                }
++                case PERCENT200:
++                {
++                    wdLineSpacing = word::WdLineSpacing::wdLineSpaceDouble;
++                    break;
++                }
++                default:
++                {
++                    wdLineSpacing = word::WdLineSpacing::wdLineSpaceMultiple;
++                }
++            }
++            break;
++        }
++        case style::LineSpacingMode::MINIMUM:
++        {
++            wdLineSpacing = word::WdLineSpacing::wdLineSpaceAtLeast;
++            break;
++        }
++        case style::LineSpacingMode::FIX:
++        case style::LineSpacingMode::LEADING:
++        {
++            wdLineSpacing = word::WdLineSpacing::wdLineSpaceExactly;
++            break;
++        }
++        default:
++        {
++            DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
++        }
++    }
++    return wdLineSpacing;
++}
++
++sal_Int16 SwVbaParagraphFormat::getCharHeight() throw (uno::RuntimeException)
++{
++    float fCharHeight;
++    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharHeight") ) ) >>= fCharHeight;
++    return (sal_Int16)( Millimeter::getInHundredthsOfOneMillimeter( fCharHeight ) );
++}
++
++sal_Int32 SwVbaParagraphFormat::getOOoAlignment( sal_Int32 _alignment )
++{
++    sal_Int32 nParaAjust = style::ParagraphAdjust_LEFT;
++    switch( _alignment )
++    {
++        case word::WdParagraphAlignment::wdAlignParagraphCenter:
++        {
++            nParaAjust = style::ParagraphAdjust_CENTER;
++            break;
++        }
++        case word::WdParagraphAlignment::wdAlignParagraphJustify:
++        {
++            nParaAjust = style::ParagraphAdjust_BLOCK;
++            break;
++        }
++        case word::WdParagraphAlignment::wdAlignParagraphLeft:
++        {
++            nParaAjust = style::ParagraphAdjust_LEFT;
++            break;
++        }
++        case word::WdParagraphAlignment::wdAlignParagraphRight:
++        {
++            nParaAjust = style::ParagraphAdjust_RIGHT;
++            break;
++        }
++        default:
++        {
++            DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
++        }
++    }
++    return nParaAjust;
++}
++
++sal_Int32 SwVbaParagraphFormat::getMSWordAlignment( sal_Int32 _alignment )
++{
++    sal_Int32 wdAlignment = word::WdParagraphAlignment::wdAlignParagraphLeft;
++    switch( _alignment )
++    {
++        case style::ParagraphAdjust_CENTER:
++        {
++            wdAlignment = word::WdParagraphAlignment::wdAlignParagraphCenter;
++            break;
++        }
++        case style::ParagraphAdjust_LEFT:
++        {
++            wdAlignment = word::WdParagraphAlignment::wdAlignParagraphLeft;
++            break;
++        }
++        case style::ParagraphAdjust_BLOCK:
++        {
++            wdAlignment = word::WdParagraphAlignment::wdAlignParagraphJustify;
++            break;
++        }
++        case style::ParagraphAdjust_RIGHT:
++        {
++            wdAlignment = word::WdParagraphAlignment::wdAlignParagraphRight;
++            break;
++        }
++        default:
++        {
++            DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
++        }
++    }
++    return wdAlignment;
++}
++
++rtl::OUString& 
++SwVbaParagraphFormat::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphFormat") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaParagraphFormat::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.ParagraphFormat" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/wordvbahelper.hxx
+===================================================================
+--- sw/source/ui/vba/wordvbahelper.hxx	(revision 0)
++++ sw/source/ui/vba/wordvbahelper.hxx	(revision 276288)
+@@ -0,0 +1,57 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbahelper.hxx,v $
++ * $Revision: 1.5.32.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_WORD_VBA_HELPER_HXX
++#define SW_WORD_VBA_HELPER_HXX
++
++#include <vbahelper/vbahelper.hxx>
++#include <com/sun/star/text/XText.hpp>
++#include <com/sun/star/text/XTextViewCursor.hpp>
++#include <com/sun/star/text/XPageCursor.hpp>
++#include <com/sun/star/style/XStyle.hpp>
++
++class SwDocShell;
++class SwView;
++namespace ooo 
++{
++	namespace vba 
++	{
++    namespace word
++    {
++		//css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
++        SwDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel );
++        SwView* getView( const css::uno::Reference< css::frame::XModel>& xModel );
++        css::uno::Reference< css::text::XTextViewCursor > getXTextViewCursor( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
++        css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
++        sal_Int32 getPageCount( const css::uno::Reference< css::frame::XModel>& xModel ) throw (css::uno::RuntimeException);
++
++}; // word
++}; // vba
++}; // ooo
++#endif
+Index: sw/source/ui/vba/vbadialogs.cxx
+===================================================================
+--- sw/source/ui/vba/vbadialogs.cxx	(revision 0)
++++ sw/source/ui/vba/vbadialogs.cxx	(revision 276288)
+@@ -0,0 +1,64 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadialogs.cxx,v $
++ * $Revision: 1.5 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <ooo/vba/word/XDialog.hpp>
++#include "vbadialogs.hxx"
++#include "vbadialog.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++uno::Any
++SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
++{
++	sal_Int32 nIndex = 0;
++	aItem >>= nIndex;
++	uno::Reference< word::XDialog > aDialog( new SwVbaDialog( uno::Reference< XHelperInterface >( Application(),uno::UNO_QUERY_THROW ), mxContext, m_xModel, nIndex ) );
++	return uno::Any( aDialog );
++}
++
++rtl::OUString& 
++SwVbaDialogs::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDialogs") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaDialogs::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Dialogs" ) );
++	}
++	return aServiceNames;
++}
++
+Index: sw/source/ui/vba/vbaglobals.cxx
+===================================================================
+--- sw/source/ui/vba/vbaglobals.cxx	(revision 0)
++++ sw/source/ui/vba/vbaglobals.cxx	(revision 276288)
+@@ -0,0 +1,196 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbaglobals.cxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <vbahelper/helperdecl.hxx>
++#include "vbaglobals.hxx"
++
++#include <comphelper/unwrapargs.hxx>
++
++#include <com/sun/star/lang/XMultiComponentFactory.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/container/XNameContainer.hpp>
++#include <cppuhelper/bootstrap.hxx>
++#include "vbaapplication.hxx"
++using namespace ::com::sun::star;
++using namespace ::com::sun::star::uno;
++using namespace ::ooo::vba;
++
++
++rtl::OUString sDocCtxName( RTL_CONSTASCII_USTRINGPARAM("WordDocumentContext") );
++
++// =============================================================================
++// SwVbaGlobals
++// =============================================================================
++
++SwVbaGlobals::SwVbaGlobals(  uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, sDocCtxName )
++{
++	OSL_TRACE("SwVbaGlobals::SwVbaGlobals()");
++        uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
++        aInitArgs[ 0 ].Name = rtl::OUString::createFromAscii("Application");
++        aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
++        aInitArgs[ 1 ].Name = sDocCtxName;
++        aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
++        
++        init( aInitArgs );
++}
++
++SwVbaGlobals::~SwVbaGlobals()
++{
++	OSL_TRACE("SwVbaGlobals::~SwVbaGlobals");
++}
++
++// =============================================================================
++// XGlobals
++// =============================================================================
++uno::Reference<word::XApplication >
++SwVbaGlobals::getApplication() throw (uno::RuntimeException)
++{
++	OSL_TRACE("In SwVbaGlobals::getApplication");	
++	if ( !mxApplication.is() )
++		 mxApplication.set( new SwVbaApplication( mxContext) );
++        
++   	return mxApplication; 
++}
++
++uno::Reference<word::XSystem > SAL_CALL
++SwVbaGlobals::getSystem() throw (uno::RuntimeException)
++{
++	return getApplication()->getSystem();	
++}
++
++uno::Reference< word::XDocument > SAL_CALL 
++SwVbaGlobals::getActiveDocument() throw (uno::RuntimeException)
++{
++	return getApplication()->getActiveDocument();	
++}
++
++uno::Reference< word::XWindow > SAL_CALL 
++SwVbaGlobals::getActiveWindow() throw (uno::RuntimeException)
++{
++	return getApplication()->getActiveWindow();
++}
++
++rtl::OUString SAL_CALL 
++SwVbaGlobals::getName() throw (uno::RuntimeException)
++{
++	return getApplication()->getName();
++}
++
++uno::Reference<word::XOptions > SAL_CALL
++SwVbaGlobals::getOptions() throw (uno::RuntimeException)
++{
++	return getApplication()->getOptions();
++}
++
++uno::Any SAL_CALL
++SwVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++    return getApplication()->CommandBars( aIndex );
++}
++
++uno::Any SAL_CALL
++SwVbaGlobals::Documents( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    return getApplication()->Documents( index );
++}
++
++uno::Any SAL_CALL
++SwVbaGlobals::Addins( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    return getApplication()->Addins( index );
++}
++
++uno::Any SAL_CALL
++SwVbaGlobals::Dialogs( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    return getApplication()->Dialogs( index );
++}
++
++uno::Reference<word::XSelection > SAL_CALL
++SwVbaGlobals::getSelection() throw (uno::RuntimeException)
++{
++	return getApplication()->getSelection();
++}
++
++float SAL_CALL SwVbaGlobals::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException)
++{
++    return getApplication()->CentimetersToPoints( _Centimeters );
++}
++
++rtl::OUString&
++SwVbaGlobals::getServiceImplName()
++{
++        static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaGlobals") );
++        return sImplName;
++}
++
++uno::Sequence< rtl::OUString >
++SwVbaGlobals::getServiceNames()
++{
++        static uno::Sequence< rtl::OUString > aServiceNames;
++        if ( aServiceNames.getLength() == 0 )
++        {
++                aServiceNames.realloc( 1 );
++                aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Globals" ) );
++        }
++        return aServiceNames;
++}
++
++uno::Sequence< rtl::OUString >
++SwVbaGlobals::getAvailableServiceNames(  ) throw (uno::RuntimeException)
++{
++    static bool bInit = false;
++    static uno::Sequence< rtl::OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() );
++    if ( !bInit )
++    {
++         rtl::OUString names[] = { 
++            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Document" ) ),
++//            #FIXME #TODO make Application a proper service
++//            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Application" ) ),
++        };
++        sal_Int32 nWordServices = ( sizeof( names )/ sizeof( names[0] ) );
++        sal_Int32 startIndex = serviceNames.getLength();
++        serviceNames.realloc( serviceNames.getLength() + nWordServices );
++        for ( sal_Int32 index = 0; index < nWordServices; ++index )
++             serviceNames[ startIndex + index ] = names[ index ];
++        bInit = true;
++    }
++    return serviceNames;
++}
++
++namespace globals
++{
++namespace sdecl = comphelper::service_decl;
++sdecl::vba_service_class_<SwVbaGlobals, sdecl::with_args<true> > serviceImpl;
++extern sdecl::ServiceDecl const serviceDecl(
++    serviceImpl,
++    "SwVbaGlobals",
++    "ooo.vba.word.Globals" );
++}
++
+Index: sw/source/ui/vba/vbaaddin.hxx
+===================================================================
+--- sw/source/ui/vba/vbaaddin.hxx	(revision 0)
++++ sw/source/ui/vba/vbaaddin.hxx	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SW_VBA_ADDIN_HXX
++#define SW_VBA_ADDIN_HXX
++
++#include <ooo/vba/word/XAddin.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <cppuhelper/implbase1.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XAddin > SwVbaAddin_BASE;
++
++class SwVbaAddin : public SwVbaAddin_BASE
++{
++private:
++    rtl::OUString msFileURL;
++    sal_Bool mbAutoload;
++    sal_Bool mbInstalled;
++
++public:
++	SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const rtl::OUString& rFileURL, sal_Bool bAutoload ) throw ( css::uno::RuntimeException );
++	virtual ~SwVbaAddin();
++
++    // Attributes
++    virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
++    virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setInstalled( ::sal_Bool _installed ) throw (css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif /* SW_VBA_ADDIN_HXX */
+Index: sw/source/ui/vba/vbasystem.cxx
+===================================================================
+--- sw/source/ui/vba/vbasystem.cxx	(revision 0)
++++ sw/source/ui/vba/vbasystem.cxx	(revision 276288)
+@@ -0,0 +1,195 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbasystem.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <ooo/vba/word/WdCursorType.hpp>
++#include <tools/diagnose_ex.h>
++#include <tools/config.hxx>
++#include <tools/string.hxx>
++#include <osl/file.hxx>
++#include <tools/urlobj.hxx>
++#include <tools/string.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++PrivateProfileStringListener::PrivateProfileStringListener( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey )
++    :maFileName( rFileName ), maGroupName( rGroupName ), maKey( rKey )
++{
++}
++
++PrivateProfileStringListener::~PrivateProfileStringListener()
++{
++}
++
++void PrivateProfileStringListener::Initialize( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey )
++{
++    maFileName = rFileName;
++    maGroupName = rGroupName;
++    maKey = rKey;
++}
++
++uno::Any PrivateProfileStringListener::getValueEvent()
++{
++    // get the private profile string
++    Config aCfg( maFileName );
++    aCfg.SetGroup( maGroupName );
++    rtl::OUString sValue = String( aCfg.ReadKey( maKey ), RTL_TEXTENCODING_DONTKNOW );
++
++    return uno::makeAny( sValue );
++}
++
++void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value )
++{
++    // set the private profile string
++    Config aCfg( maFileName );
++    aCfg.SetGroup( maGroupName );
++
++    rtl::OUString aValue;
++    value >>= aValue;
++    aCfg.WriteKey( maKey, ByteString( aValue.getStr(), RTL_TEXTENCODING_DONTKNOW ) );
++}
++
++SwVbaSystem::SwVbaSystem( uno::Reference<uno::XComponentContext >& xContext ): SwVbaSystem_BASE( uno::Reference< XHelperInterface >(), xContext )
++{
++}
++
++SwVbaSystem::~SwVbaSystem()
++{
++}
++
++sal_Int32 SAL_CALL
++SwVbaSystem::getCursor() throw (uno::RuntimeException)
++{
++    sal_Int32 nPointerStyle =  getPointerStyle( getCurrentWordDoc(mxContext) );
++
++    switch( nPointerStyle )
++    {
++        case POINTER_ARROW:
++            return word::WdCursorType::wdCursorNorthwestArrow;
++        case POINTER_NULL:
++            return word::WdCursorType::wdCursorNormal;
++        case POINTER_WAIT:
++            return word::WdCursorType::wdCursorWait;
++        case POINTER_TEXT:
++            return word::WdCursorType::wdCursorIBeam;
++        default:
++            return word::WdCursorType::wdCursorNormal;
++    }
++}
++
++void SAL_CALL 
++SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
++{
++    try
++    {
++        switch( _cursor )
++        {
++            case word::WdCursorType::wdCursorNorthwestArrow:
++            {
++                const Pointer& rPointer( POINTER_ARROW );
++                setCursorHelper( getCurrentWordDoc(mxContext), rPointer, sal_False );
++                break;
++            }
++            case word::WdCursorType::wdCursorWait:
++            {
++                const Pointer& rPointer( static_cast< PointerStyle >( POINTER_WAIT ) );
++                //It will set the edit window, toobar and statusbar's mouse pointer.
++                setCursorHelper( getCurrentWordDoc(mxContext), rPointer, sal_True );
++                break;
++            }
++            case word::WdCursorType::wdCursorIBeam:
++            {
++                const Pointer& rPointer( static_cast< PointerStyle >( POINTER_TEXT ) );
++                //It will set the edit window, toobar and statusbar's mouse pointer.
++                setCursorHelper( getCurrentWordDoc( mxContext ), rPointer, sal_True );
++                break;
++            }
++            case word::WdCursorType::wdCursorNormal:
++            {
++                const Pointer& rPointer( POINTER_NULL );
++                setCursorHelper( getCurrentWordDoc( mxContext ), rPointer, sal_False );
++                break;
++            }
++            default:
++                throw uno::RuntimeException( rtl::OUString( 
++                        RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() );
++                // TODO: isn't this a flaw in the API? It should be allowed to throw an
++                // IllegalArgumentException, or so
++        }        
++    }
++    catch( const uno::Exception& )
++    {
++    	DBG_UNHANDLED_EXCEPTION();
++    }
++}
++
++uno::Any SAL_CALL 
++SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( uno::RuntimeException )
++{
++    if( rFilename.getLength() == 0 )
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
++
++    // FIXME: need to detect whether it is a relative file path
++    // we need to detect if this is a URL, if not then assume its a file path
++    rtl::OUString sFileUrl;
++    INetURLObject aObj;
++	aObj.SetURL( rFilename );
++	bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
++	if ( bIsURL )
++		sFileUrl = rFilename;
++	else
++		osl::FileBase::getFileURLFromSystemPath( rFilename, sFileUrl);
++
++    ByteString aGroupName = ByteString( rSection.getStr(), RTL_TEXTENCODING_DONTKNOW);
++    ByteString aKey = ByteString( rKey.getStr(), RTL_TEXTENCODING_DONTKNOW);
++    maPrivateProfileStringListener.Initialize( sFileUrl, aGroupName, aKey );
++
++    return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( &maPrivateProfileStringListener ) ) );
++}
++
++rtl::OUString& 
++SwVbaSystem::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSystem") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++SwVbaSystem::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.System" ) );
++	}
++	return aServiceNames;
++}
+Index: sw/inc/unoprnms.hxx
+===================================================================
+--- sw/inc/unoprnms.hxx	(revision 276159)
++++ sw/inc/unoprnms.hxx	(revision 276288)
+@@ -807,7 +807,9 @@ enum SwPropNameIds
+ // --> OD 2009-07-13 #i73249#
+ /* 0737 */  UNO_NAME_DESCRIPTION,
+ // <--
+-/* 0738 */  SW_PROPNAME_END
++/* 0738 */  UNO_NAME_IS_TEMPLATE,
++/* 0739 */  UNO_NAME_VBA_DOCOBJ,
++/* 0740 */  SW_PROPNAME_END
+ };
+ 
+ 
+Index: sw/inc/doc.hxx
+===================================================================
+--- sw/inc/doc.hxx	(revision 276159)
++++ sw/inc/doc.hxx	(revision 276288)
+@@ -395,6 +395,7 @@ class SW_DLLPUBLIC SwDoc :
+ 
+ 	// table of forbidden characters of this document
+ 	vos::ORef<SvxForbiddenCharactersTable>	xForbiddenCharsTable;
++   com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache;
+ 
+     // --> OD 2007-10-26 #i83479#
+ public:
+@@ -2092,6 +2093,8 @@ class SW_DLLPUBLIC SwDoc :
+ 	{
+ 		return n32DummyCompatabilityOptions2;
+ 	}
++        void SetVBATemplateToProjectCache( com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xCache ) { m_xTemplateToProjectCache = xCache; };
++        com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; };
+ 
+     ::sfx2::IXmlIdRegistry& GetXmlIdRegistry();
+     SwDoc* CreateCopy() const;
+Index: sw/inc/docsh.hxx
+===================================================================
+--- sw/inc/docsh.hxx	(revision 276159)
++++ sw/inc/docsh.hxx	(revision 276288)
+@@ -85,6 +85,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShe
+     comphelper::EmbeddedObjectContainer*    pOLEChildList;
+     sal_Int16               nUpdateDocMode; // contains the com::sun::star::document::UpdateDocMode
+     bool                    bInUpdateFontList; //prevent nested calls of UpdateFontList
++    bool                    bIsATemplate; //prevent nested calls of UpdateFontList
+ 	// Methoden fuer den Zugriff aufs Doc
+ 	SW_DLLPRIVATE void					AddLink();
+ 	SW_DLLPRIVATE void					RemoveLink();
+@@ -299,6 +300,8 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShe
+                                 GetController();
+ 
+     SfxInPlaceClient* GetIPClient( const ::svt::EmbeddedObjectRef& xObjRef );
++    SW_DLLPRIVATE sal_Bool IsTemplate() { return bIsATemplate; }
++    SW_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; }
+ 
+     virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const;
+ };
+Index: sw/inc/unocoll.hxx
+===================================================================
+--- sw/inc/unocoll.hxx	(revision 276159)
++++ sw/inc/unocoll.hxx	(revision 276288)
+@@ -43,6 +43,7 @@
+ #include <cppuhelper/implbase4.hxx>	// helper for implementations
+ #include <IMark.hxx>
+ #include <unobaseclass.hxx>
++#include "swdllapi.h"
+ /***************************************************
+  ***************************************************
+  *
+@@ -196,8 +197,11 @@ class SwUnoCollection
+ #define SW_SERVICE_CHART2_DATA_PROVIDER                 106
+ #define SW_SERVICE_TYPE_FIELDMARK                       107
+ #define SW_SERVICE_TYPE_FORMFIELDMARK                   108
++#define SW_SERVICE_VBAOBJECTPROVIDER                    109
++#define SW_SERVICE_VBACODENAMEPROVIDER                  110
++#define SW_SERVICE_VBAPROJECTNAMEPROVIDER               111
+ 
+-#define SW_SERVICE_LAST                 SW_SERVICE_TYPE_FORMFIELDMARK
++#define SW_SERVICE_LAST                 SW_SERVICE_VBAPROJECTNAMEPROVIDER
+ 
+ #define SW_SERVICE_INVALID			USHRT_MAX
+ 
+@@ -283,7 +287,7 @@ cppu::WeakImplHelper3
+ 	::com::sun::star::lang::XServiceInfo
+ >
+ SwCollectionBaseClass;
+-class SwXTextTables : public SwCollectionBaseClass,
++class SW_DLLPUBLIC SwXTextTables : public SwCollectionBaseClass,
+ 	public SwUnoCollection
+ {
+ protected:
+Index: sw/inc/unotbl.hxx
+===================================================================
+--- sw/inc/unotbl.hxx	(revision 276159)
++++ sw/inc/unotbl.hxx	(revision 276288)
+@@ -214,14 +214,13 @@ typedef cppu::WeakImplHelper3<
+ 								::com::sun::star::lang::XServiceInfo,
+ 								::com::sun::star::beans::XPropertySet
+ 							> SwXTextTableCursor_Base;
+-class SwXTextTableCursor : public SwXTextTableCursor_Base
++class SW_DLLPUBLIC SwXTextTableCursor : public SwXTextTableCursor_Base
+ 	,public SwClient
+ 	,public OTextCursorHelper
+ {
+ 	SwDepend 				aCrsrDepend;
+     const SfxItemPropertySet*   m_pPropSet;
+ 
+-	SwFrmFmt* 		GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
+ 	//	SwUnoCrsr* 		GetCrsr() const { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
+ 
+ protected:
+@@ -271,6 +270,7 @@ typedef cppu::WeakImplHelper3<
+ 
+ 	const SwUnoCrsr*			GetCrsr() const;
+ 	SwUnoCrsr*					GetCrsr();
++	SwFrmFmt* 		GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
+ };
+ 
+ /*-----------------11.12.97 09:38-------------------
+Index: sw/inc/unomap.hxx
+===================================================================
+--- sw/inc/unomap.hxx	(revision 276159)
++++ sw/inc/unomap.hxx	(revision 276288)
+@@ -250,6 +250,7 @@
+ #define WID_DOC_LOCK_UPDATES                    1016
+ #define WID_DOC_HAS_VALID_SIGNATURES            1017
+ #define WID_DOC_BUILDID							1024
++#define WID_DOC_ISTEMPLATEID						1025
+ // --> OD 2006-03-21 #b6375613#
+ #define WID_APPLY_WORKAROUND_FOR_B6375613       1070
+ // <--
+@@ -294,6 +295,7 @@
+ 
+ #define WID_LAYOUT_SIZE                         1104
+ #define WID_DOC_DIALOG_LIBRARIES                1105
++#define WID_DOC_VBA_DOCOBJ                      1106
+ 
+ 
+ //AutoText
+Index: sw/prj/build.lst
+===================================================================
+--- sw/prj/build.lst	(revision 276159)
++++ sw/prj/build.lst	(revision 276288)
+@@ -1,4 +1,4 @@
+-sw	sw	:    l10n connectivity OOo:writerperfect OOo:lotuswordpro svx stoc uui writerfilter NULL
++sw	sw	:    l10n connectivity OOo:writerperfect OOo:lotuswordpro svx stoc uui writerfilter vbahelper NULL
+ sw	sw										usr1	-	all	sw_mkout NULL
+ sw	sw\inc									nmake		-	all	sw_inc NULL
+ sw	sw\uiconfig\layout									nmake	-	all	sw_layout NULL
+@@ -33,6 +33,7 @@ sw      sw\source\ui\smartmenu
+ sw      sw\source\ui\table                                              nmake   -       all     sw_table sw_inc NULL
+ sw	sw\source\ui\uiview						nmake	-	all	sw_uivw sw_sdi sw_inc NULL
+ sw	sw\source\ui\uno						nmake	-	all	sw_uiuno sw_sdi sw_inc NULL
++sw	sw\source\ui\vba						nmake	-	all	sw_vba sw_inc NULL
+ sw	sw\source\ui\utlui						nmake	-	all	sw_utlui sw_inc NULL
+ sw	sw\source\ui\web						nmake	-	all	sw_web sw_uinc sw_sdi sw_inc NULL
+ sw	sw\source\ui\wrtsh						nmake	-	all	sw_wrtsh sw_inc NULL
+@@ -69,7 +70,7 @@ sw      sw\source\filter\writer             nmake
+ sw      sw\source\filter\ww1                nmake   -       all     sw_ww1 sw_inc NULL
+ sw      sw\source\filter\ww8                nmake   -       all     sw_ww8 sw_inc NULL
+ sw      sw\source\filter\xml                nmake   -       all     sw_xml sw_inc NULL
+-sw      sw\source\ui                        nmake   -       all     sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu NULL
++sw      sw\source\ui                        nmake   -       all     sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu sw_vba NULL
+ sw      sw\source\core                      nmake   -       all     sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL
+ sw      sw\source\filter                    nmake   -       all     sw_flt sw_ascii sw_bsflt sw_html sw_rtf sw_wrtr sw_ww1 sw_ww8 sw_xml NULL
+ sw      sw\util                             nmake   -       all     sw_util sw_core sw_flt sw_sdi sw_ui NULL
+Index: sw/prj/d.lst
+===================================================================
+--- sw/prj/d.lst	(revision 276159)
++++ sw/prj/d.lst	(revision 276288)
+@@ -63,6 +63,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport
+ ..\%__SRC%\bin\swd?????.dll %_DEST%\bin%_EXT%\swd?????.dll
+ ..\%__SRC%\bin\swui?????.dll %_DEST%\bin%_EXT%\swui?????.dll
+ ..\%__SRC%\bin\msword?????.dll %_DEST%\bin%_EXT%\msword?????.dll
++..\%__SRC%\bin\vbaswobj*.dll %_DEST%\bin%_EXT%\vbaswobj*.dll
+ ..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res
+ ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
+ 
+Index: sw/util/makefile.mk
+===================================================================
+--- sw/util/makefile.mk	(revision 276159)
++++ sw/util/makefile.mk	(revision 276288)
+@@ -127,6 +127,7 @@ SHL1STDLIBS+= \
+ 	$(SALHELPERLIB) \
+     $(ICUUCLIB) \
+ 	$(I18NUTILLIB)	\
++		        $(VBAHELPERLIB) \
+ 	$(AVMEDIALIB)
+ 
+ .IF "$(GUI)"=="WNT"
+@@ -338,6 +339,40 @@ SHL4STDLIBS= \
+ 	$(CPPUHELPERLIB) \
+ 	$(SALLIB) \
+ 	$(ICUUCLIB) \
++    $(BASICLIB)     \
+ 	$(I18NUTILLIB)
+ 
++#target vba
++TARGET_VBA=vbaswobj
++SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno
++SHL5IMPLIB=     i$(TARGET_VBA)
++
++SHL5VERSIONMAP=$(TARGET_VBA).map
++SHL5DEF=$(MISC)$/$(SHL5TARGET).def
++DEF5NAME=$(SHL5TARGET)
++SHL5STDLIBS= \
++                $(ISWLIB) \
++                $(CPPUHELPERLIB) \
++                $(VCLLIB) \
++                $(CPPULIB) \
++                $(COMPHELPERLIB) \
++                $(SVLIB) \
++	            $(UNOTOOLSLIB) \
++                $(TOOLSLIB) \
++                $(SALLIB)\
++		        $(VBAHELPERLIB) \
++                $(BASICLIB)     \
++                $(SFXLIB)       \
++                $(SVXLIB)       \
++                $(SVTOOLLIB)    \
++                $(SVLLIB) \
++                $(VCLLIB) \
++                $(TKLIB) \
++                $(I18NISOLANGLIB) \
++	            $(SVXCORELIB) \
++                $(SVXMSFILTERLIB) \
++
++SHL5DEPN=$(SHL1TARGETN)
++SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib
++
+ .INCLUDE :  target.mk
+Index: sw/util/vbaswobj.map
+===================================================================
+--- sw/util/vbaswobj.map	(revision 0)
++++ sw/util/vbaswobj.map	(revision 276288)
+@@ -0,0 +1,9 @@
++OOO_1.1 {
++	global:
++		component_getImplementationEnvironment;
++		component_getFactory;
++		component_writeInfo;
++
++	local:
++		*;
++};
+Index: extensions/source/ole/oleobjw.cxx
+===================================================================
+--- extensions/source/ole/oleobjw.cxx	(revision 276159)
++++ extensions/source/ole/oleobjw.cxx	(revision 276288)
+@@ -72,6 +72,7 @@ using namespace boost;
+ using namespace osl;
+ using namespace rtl;
+ using namespace cppu;
++using namespace com::sun::star::script;
+ using namespace com::sun::star::lang;
+ using namespace com::sun::star::bridge;
+ using namespace com::sun::star::bridge::oleautomation;
+@@ -111,7 +112,7 @@ IUnknownWrapper_Impl::IUnknownWrapper_Impl( Refere
+ 										   sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass):
+ 	UnoConversionUtilities<IUnknownWrapper_Impl>( xFactory, unoWrapperClass, comWrapperClass),
+ 	m_pxIdlClass( NULL), m_eJScript( JScriptUndefined),
+-    m_bComTlbIndexInit(false)
++    m_bComTlbIndexInit(false),  m_bHasDfltMethod(false), m_bHasDfltProperty(false)
+ {
+ }
+ 
+@@ -150,17 +151,15 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl()
+ Any IUnknownWrapper_Impl::queryInterface(const Type& t)
+     throw (RuntimeException)
+ {
+-    if (t == getCppuType(static_cast<Reference<XInvocation>*>( 0)))
+-    {
+-        if (m_spDispatch)
+-            return WeakImplHelper4<XInvocation, XBridgeSupplier2,
+-                XInitialization, XAutomationObject>::queryInterface(t);
+-        else
++    if (t == getCppuType(static_cast<Reference<XDefaultMethod>*>( 0)) && !m_bHasDfltMethod )
+             return Any();
+-    }
++    if (t == getCppuType(static_cast<Reference<XDefaultProperty>*>( 0)) && !m_bHasDfltProperty )
++        return Any();
++    if (t == getCppuType(static_cast<Reference<XInvocation>*>( 0)) && !m_spDispatch)
++        return Any();
+ 
+-    return WeakImplHelper4<XInvocation, XBridgeSupplier2,
+-        XInitialization, XAutomationObject>::queryInterface(t);
++    return WeakImplHelper6<XInvocation, XBridgeSupplier2,
++        XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod>::queryInterface(t);
+ }
+ 
+ Reference<XIntrospectionAccess> SAL_CALL IUnknownWrapper_Impl::getIntrospection(void)
+@@ -425,6 +424,46 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const
+     {
+         o2u_attachCurrentThread();
+         ITypeInfo * pInfo = getTypeInfo();
++        // I was going to implement an XServiceInfo interface to allow the type
++        // of the automation object to be exposed.. but it seems
++        // from looking at comments in the code that it is possible for a 
++        // this object to actually wrap an UNO object ( I guess if automation is
++        // used from MSO to create Openoffice objects ) Therefore, those objects
++        // will more than likely already have an XServiceInfo interface.
++        // Instead here I chose a name that should be illegal both in COM and
++        // UNO ( from an IDL point of view ) therefore I think this is a safe
++        // hack
++        if ( aPropertyName.equals( rtl::OUString::createFromAscii("$GetTypeName") )) 
++        {
++            if ( pInfo && m_sTypeName.getLength() == 0 )
++            {
++            	 m_sTypeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") );
++                CComBSTR sName;
++                
++                if ( SUCCEEDED( pInfo->GetDocumentation( -1, &sName, NULL, NULL, NULL  ) ) )
++                {
++                    rtl::OUString sTmp( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName)));
++                    if ( sTmp.indexOf('_')  == 0 )
++                       sTmp = sTmp.copy(1);
++                    // do we own the memory for pTypeLib, msdn doco is vague
++                    // I'll assume we do 
++                    CComPtr< ITypeLib > pTypeLib;
++                    unsigned int index;
++                    if ( SUCCEEDED(  pInfo->GetContainingTypeLib(  &pTypeLib.p, &index )) )
++                    {
++                        if ( SUCCEEDED( pTypeLib->GetDocumentation( -1, &sName, NULL, NULL, NULL  ) ) )
++                        {
++                            rtl::OUString sLibName( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName)));
++                            m_sTypeName = sLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sTmp );
++                            
++                        }
++                    }
++                }
++                
++            }
++            ret <<= m_sTypeName;
++            return ret;
++        }
+         FuncDesc aDescGet(pInfo);
+         FuncDesc aDescPut(pInfo);
+         VarDesc aVarDesc(pInfo);
+@@ -1157,8 +1196,49 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( co
+ 
+     aArguments[1] >>= m_bOriginalDispatch;    
+ 	aArguments[2] >>= m_seqTypes;
++    try
++    {
++        ITypeInfo* pType= getTypeInfo();
++        // Get Default member
++        CComBSTR defaultMemberName;
++        if ( SUCCEEDED( pType->GetDocumentation(0, &defaultMemberName, 0, 0, 0 ) ) )
++        {
++            OUString usName(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(defaultMemberName)));
++            FuncDesc aDescGet(pType);
++            FuncDesc aDescPut(pType);
++            VarDesc aVarDesc(pType);
++            // see if this is a property first ( more likely to be a property then a method )
++            getPropDesc( usName, & aDescGet, & aDescPut, & aVarDesc);
++
++            if ( !aDescGet && !aDescPut )
++            {
++                getFuncDesc( usName, &aDescGet );
++                if ( !aDescGet )
++                    // we're knackered
++                    throw RuntimeException();
++                
+ }
++            // now for some funny heuristics to make basic understand what to do
++            // a single aDescGet ( that doesn't take any params ) would be 
++            // a read only ( defaultmember ) property e.g. this object
++            // should implement XDefaultProperty
++            // a single aDescGet ( that *does* ) take params is basically a
++            // default method e.g. implement XDefaultMethod
+ 
++            // a DescPut ( I guess we only really support a default param with '1' param ) as a setValue ( but I guess we can leave it through, the object will fail if we don't get it right anyway )
++            if ( aDescPut || ( aDescGet && aDescGet->cParams == 0 ) )
++                m_bHasDfltProperty = true;
++            if ( aDescGet->cParams > 0 )
++                m_bHasDfltMethod = true;
++            if ( m_bHasDfltProperty || m_bHasDfltMethod )
++                m_sDefaultMember = usName;
++        }
++    }
++    catch( Exception& )
++    {
++    } 
++}
++
+ // UnoConversionUtilities --------------------------------------------------------------------------------
+ Reference< XInterface > IUnknownWrapper_Impl::createUnoWrapperInstance()
+ {
+@@ -1408,6 +1488,9 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdComTlb(
+         arDispidNamedArgs.reset(new DISPID[nSizeAr]);   
+         HRESULT hr = getTypeInfo()->GetIDsOfNames(arNames, nSizeAr,
+                                                   arDispidNamedArgs.get()); 
++        if ( hr == E_NOTIMPL )
++            hr = m_spDispatch->GetIDsOfNames(IID_NULL, arNames, nSizeAr, LOCALE_USER_DEFAULT, arDispidNamedArgs.get() );
++
+         if (hr == S_OK)
+         {
+             // In a "property put" operation, the property value is a named param with the
+Index: extensions/source/ole/oleobjw.hxx
+===================================================================
+--- extensions/source/ole/oleobjw.hxx	(revision 276159)
++++ extensions/source/ole/oleobjw.hxx	(revision 276288)
+@@ -53,11 +53,14 @@
+ #endif
+ #include <cppuhelper/implbase3.hxx>
+ #include <cppuhelper/implbase4.hxx>
++#include <cppuhelper/implbase6.hxx>
+ 
+ #include <com/sun/star/lang/XInitialization.hpp>
+ #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
+ #include <rtl/ustring.hxx>
+ 
++#include <com/sun/star/script/XDefaultProperty.hpp>
++#include <com/sun/star/script/XDefaultMethod.hpp>
+ 
+ #include <typelib/typedescription.hxx>
+ #include "unoconversionutilities.hxx"
+@@ -81,7 +84,8 @@ typedef hash_multimap<OUString, unsigned int, hash
+ // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object.
+ // If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component.
+ // The interface is not a real interface in terms of an abstract class but is realized through IDispatch.
+-class IUnknownWrapper_Impl : public WeakImplHelper4<XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject>,
++class IUnknownWrapper_Impl : public WeakImplHelper6<XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod>,
++
+ 							 public UnoConversionUtilities<IUnknownWrapper_Impl>
+ 
+ {
+@@ -129,7 +133,9 @@ typedef hash_multimap<OUString, unsigned int, hash
+ 	// XInitialization
+     virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
+         throw(Exception, RuntimeException);
++    virtual ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
+ protected:
++    virtual ::rtl::OUString SAL_CALL getDefaultMethodName(  ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
+     
+ 	// ----------------------------------------------------------------------------
+     virtual Any invokeWithDispIdUnoTlb(const OUString& sFunctionName,
+@@ -237,6 +243,7 @@ typedef hash_multimap<OUString, unsigned int, hash
+ 	Sequence<Type> m_seqTypes;
+ 	CComPtr<IUnknown> m_spUnknown;
+ 	CComPtr<IDispatch> m_spDispatch;
++        rtl::OUString m_sTypeName; // is "" ( not initialised ), "IDispatch" ( we have no idea ) or "SomeLibrary.SomeTypeName" if we managed to get a type
+     /** This value is set dureing XInitialization::initialize. It indicates that the COM interface
+     was transported as VT_DISPATCH in a VARIANT rather then a VT_UNKNOWN
+     */
+@@ -255,6 +262,9 @@ typedef hash_multimap<OUString, unsigned int, hash
+     bool m_bComTlbIndexInit;
+ 	// Keeps the ITypeInfo obtained from IDispatch::GetTypeInfo
+ 	CComPtr< ITypeInfo > m_spTypeInfo;
++    rtl::OUString m_sDefaultMember;
++    bool m_bHasDfltMethod;
++    bool m_bHasDfltProperty;
+ };
+ 
+ } // end namespace
+Index: extensions/source/propctrlr/defaultforminspection.cxx
+===================================================================
+--- extensions/source/propctrlr/defaultforminspection.cxx	(revision 276159)
++++ extensions/source/propctrlr/defaultforminspection.cxx	(revision 276288)
+@@ -154,7 +154,7 @@ namespace pcr
+             { "com.sun.star.form.inspection.EventHandler", false },
+ 
+             // a handler which introduces virtual properties for binding controls to spreadsheet cells
+-            { "com.sun.star.form.inspection.CellBindingPropertyHandler", true },
++            { "com.sun.star.form.inspection.CellBindingPropertyHandler", false },
+ 
+             // properties related to binding to an XForms DOM node
+             { "com.sun.star.form.inspection.XMLFormsPropertyHandler", true },
+Index: extensions/source/propctrlr/formres.src
+===================================================================
+--- extensions/source/propctrlr/formres.src	(revision 276159)
++++ extensions/source/propctrlr/formres.src	(revision 276288)
+@@ -234,6 +234,10 @@ String RID_STR_NAME
+ {
+ 	Text [ en-US ] = "Name" ;
+ };
++String RID_STR_GROUP_NAME
++{
++	Text [ en-US ] = "Group name" ;
++};
+ String RID_STR_TABINDEX
+ {
+ 	Text [ en-US ] = "Tab order" ;
+Index: extensions/source/propctrlr/formmetadata.cxx
+===================================================================
+--- extensions/source/propctrlr/formmetadata.cxx	(revision 276159)
++++ extensions/source/propctrlr/formmetadata.cxx	(revision 276288)
+@@ -143,6 +143,7 @@ namespace pcr
+         DEF_INFO_3( LABEL,             LABEL,              LABEL,             FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
+         DEF_INFO_2( CONTROLLABEL,      LABELCONTROL,       CONTROLLABEL,      FORM_VISIBLE, COMPOSEABLE ),
+         DEF_INFO_3( WRITING_MODE,      WRITING_MODE,       WRITING_MODE,      FORM_VISIBLE, ENUM, COMPOSEABLE ),
++        DEF_INFO_3( GROUP_NAME,        GROUP_NAME,         GROUP_NAME,        FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
+         DEF_INFO_2( TEXT,              TEXT,               TEXT,              DIALOG_VISIBLE, COMPOSEABLE ),
+         DEF_INFO_3( MAXTEXTLEN,        MAXTEXTLEN,         MAXTEXTLEN,        FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
+         DEF_INFO_3( EDITMASK,          EDITMASK,           EDITMASK,          FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
+Index: extensions/source/propctrlr/formresid.hrc
+===================================================================
+--- extensions/source/propctrlr/formresid.hrc	(revision 276159)
++++ extensions/source/propctrlr/formresid.hrc	(revision 276288)
+@@ -152,6 +152,7 @@
+ #define RID_STR_CURSOR_TYPE					( RID_FORMBROWSER_START + 121 )
+ #define RID_STR_ENABLE_VISIBLE              ( RID_FORMBROWSER_START + 122 )
+ #define RID_STR_WHEEL_BEHAVIOR              ( RID_FORMBROWSER_START + 123 )
++#define RID_STR_GROUP_NAME                  ( RID_FORMBROWSER_START + 124 )
+     // FREE
+     // FREE
+     // FREE
+Index: extensions/source/propctrlr/eventhandler.cxx
+===================================================================
+--- extensions/source/propctrlr/eventhandler.cxx	(revision 276159)
++++ extensions/source/propctrlr/eventhandler.cxx	(revision 276288)
+@@ -65,6 +65,7 @@
+ /** === end UNO includes === **/
+ 
+ #include <comphelper/namedvaluecollection.hxx>
++#include <comphelper/evtmethodhelper.hxx>
+ #include <comphelper/types.hxx>
+ #include <cppuhelper/implbase1.hxx>
+ #include <rtl/ref.hxx>
+@@ -172,36 +173,6 @@ namespace pcr
+     namespace
+     {
+         //....................................................................
+-        Sequence< ::rtl::OUString > lcl_getListenerMethodsForType( const Type& type )
+-        {
+-            typelib_InterfaceTypeDescription *pType=0;
+-            type.getDescription( (typelib_TypeDescription**)&pType);
+-
+-            if ( !pType )
+-                return Sequence< ::rtl::OUString>();
+-
+-            Sequence< ::rtl::OUString > aNames( pType->nMembers );
+-            ::rtl::OUString* pNames = aNames.getArray();
+-            for ( sal_Int32 i = 0; i < pType->nMembers; ++i, ++pNames)
+-            {
+-                // the decription reference
+-                typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i];
+-                // the description for the reference
+-                typelib_TypeDescription* pMemberDescription = NULL;
+-                typelib_typedescriptionreference_getDescription( &pMemberDescription, pMemberDescriptionReference );
+-                if ( pMemberDescription )
+-                {
+-                    typelib_InterfaceMemberTypeDescription* pRealMemberDescription =
+-                        reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription);
+-                    *pNames = pRealMemberDescription->pMemberName;
+-                }
+-            }
+-
+-            typelib_typedescription_release( (typelib_TypeDescription*)pType );
+-            return aNames;
+-        }
+-
+-        //....................................................................
+         #define DESCRIBE_EVENT( asciinamespace, asciilistener, asciimethod, id_postfix ) \
+             s_aKnownEvents.insert( EventMap::value_type( \
+                 ::rtl::OUString::createFromAscii( asciimethod ), \
+@@ -822,7 +793,7 @@ namespace pcr
+                         continue;
+ 
+                     // loop through all methods
+-                    Sequence< ::rtl::OUString > aMethods( lcl_getListenerMethodsForType( *pListeners ) );
++                    Sequence< ::rtl::OUString > aMethods( comphelper::getEventMethodsForType( *pListeners ) );
+ 
+                     const ::rtl::OUString* pMethods = aMethods.getConstArray();
+                     sal_uInt32 methodCount = aMethods.getLength();
+Index: extensions/source/propctrlr/formstrings.hxx
+===================================================================
+--- extensions/source/propctrlr/formstrings.hxx	(revision 276159)
++++ extensions/source/propctrlr/formstrings.hxx	(revision 276288)
+@@ -51,6 +51,7 @@ namespace pcr
+     PCR_CONSTASCII_STRING( PROPERTY_WHEEL_BEHAVIOR,         "MouseWheelBehavior");
+ 	PCR_CONSTASCII_STRING( PROPERTY_TAG,					"Tag");
+ 	PCR_CONSTASCII_STRING( PROPERTY_NAME,					"Name");
++	PCR_CONSTASCII_STRING( PROPERTY_GROUP_NAME,             "GroupName");
+ 	PCR_CONSTASCII_STRING( PROPERTY_VALUE,					"Value");
+ 	PCR_CONSTASCII_STRING( PROPERTY_TEXT,					"Text");
+ 	PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION,				"NavigationBarMode");
+Index: extensions/source/propctrlr/formmetadata.hxx
+===================================================================
+--- extensions/source/propctrlr/formmetadata.hxx	(revision 276159)
++++ extensions/source/propctrlr/formmetadata.hxx	(revision 276288)
+@@ -166,6 +166,7 @@ namespace pcr
+ 	#define PROPERTY_ID_ALLOWADDITIONS		 20
+ 	#define PROPERTY_ID_ALLOWEDITS			 21
+ 	#define PROPERTY_ID_ALLOWDELETIONS		 22
++	#define PROPERTY_ID_GROUP_NAME    		 23
+ 	#define PROPERTY_ID_NAVIGATION			 24
+ 	#define PROPERTY_ID_CYCLE				 25
+ 	#define PROPERTY_ID_HIDDEN_VALUE		 26
+Index: extensions/inc/extensio.hrc
+===================================================================
+--- extensions/inc/extensio.hrc	(revision 276159)
++++ extensions/inc/extensio.hrc	(revision 276288)
+@@ -459,9 +459,10 @@
+ #define HID_PROP_NOLABEL                        (HID_FORMS_START + 340)
+ #define HID_PROP_WRITING_MODE                   (HID_FORMS_START + 341)
+ #define HID_PROP_ANCHOR_TYPE                    (HID_FORMS_START + 343)
++#define HID_PROP_GROUP_NAME                     (HID_FORMS_START + 344)
+     // please adjust HID_LAST_FORMS_ID if you add new ids here!
+ 
+-#define HID_LAST_FORMS_ID   HID_PROP_ANCHOR_TYPE
++#define HID_LAST_FORMS_ID   HID_PROP_GROUP_NAME
+ 
+ #if HID_LAST_FORMS_ID > HID_FORMS_END
+     #error id overflow
+Index: extensions/util/hidother.src
+===================================================================
+--- extensions/util/hidother.src	(revision 276159)
++++ extensions/util/hidother.src	(revision 276288)
+@@ -213,6 +213,7 @@ hidspecial HID_PROP_FOCUSONCLICK                {
+ hidspecial HID_PROP_FONT                        { HelpId = HID_PROP_FONT; }
+ hidspecial HID_PROP_FORMATKEY                   { HelpId = HID_PROP_FORMATKEY; }
+ hidspecial HID_PROP_GROUPBOX                    { HelpId = HID_PROP_GROUPBOX; }
++hidspecial HID_PROP_GROUP_NAME                  { HelpId = HID_PROP_GROUP_NAME; }
+ hidspecial HID_PROP_HEIGHT                      { HelpId = HID_PROP_HEIGHT; }
+ hidspecial HID_PROP_HELPTEXT                    { HelpId = HID_PROP_HELPTEXT; }
+ hidspecial HID_PROP_HELPURL                     { HelpId = HID_PROP_HELPURL; }
+Index: offapi/com/sun/star/drawing/Shape.idl
+===================================================================
+--- offapi/com/sun/star/drawing/Shape.idl	(revision 276159)
++++ offapi/com/sun/star/drawing/Shape.idl	(revision 276288)
+@@ -195,6 +195,10 @@ published service Shape
+ 		the z-order.
+ 	*/
+ 	[optional, property] long NavigationOrder;
++
++	/** this property lets you get and set a hyperlink for this shape.
++	 */
++	[optional, property] string Hyperlink;
+ };
+ 
+ //=============================================================================
+Index: offapi/com/sun/star/document/XVbaMethodParameter.idl
+===================================================================
+--- offapi/com/sun/star/document/XVbaMethodParameter.idl	(revision 0)
++++ offapi/com/sun/star/document/XVbaMethodParameter.idl	(revision 276288)
+@@ -0,0 +1,68 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright IBM Corporation 2009
++ * Copyright 2009 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XVbaMethodParameter,v $
++ * $Revision: 1.13 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef __org_openoffice_vba_XVbaMethodParameter_idl__
++#define __org_openoffice_vba_XVbaMethodParameter_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++//============================================================================= 
++
++module com {  module sun {  module star {  module document {
++
++//============================================================================= 
++//gives access to vba method input/output parameters
++//
++//some OO objects need to implement this interface to support the passing of input/output parameters
++//for certain VBA events
++
++interface XVbaMethodParameter : com::sun::star::uno::XInterface
++{
++	//------------------------------------------------------------------------- 
++	 
++	/** sets the value of the parameter with the specified name.
++	 */
++	void setVbaMethodParameter( [in] string PropertyName, 
++			 [in] any Value ); 
++ 
++	//------------------------------------------------------------------------- 
++
++	/** returns the value of the parameter with the specified name.
++     */
++	any getVbaMethodParameter( [in] string PropertyName ); 
++};
++
++//============================================================================= 
++
++}; }; }; };
++#endif
+Index: offapi/com/sun/star/document/makefile.mk
+===================================================================
+--- offapi/com/sun/star/document/makefile.mk	(revision 276159)
++++ offapi/com/sun/star/document/makefile.mk	(revision 276288)
+@@ -116,8 +116,16 @@ IDLFILES=\
+     LinkUpdateModes.idl\
+     XDocumentRevisionListPersistence.idl\
+     DocumentRevisionListPersistence.idl \
+-    XDocumentLanguages.idl
++    XDocumentLanguages.idl \
++    XCodeNameQuery.idl \
++    XDocumentEventCompatibleHelper.idl \
++    XCompatWriterDocProperties.idl \
++    XVbaMethodParameter.idl \
++    VbaEventId.idl \
++    XVbaEventsHelper.idl \
++    VbaEventsHelper.idl \
+ 
++
+ # ------------------------------------------------------------------
+ 
+ .INCLUDE :  target.mk
+Index: offapi/com/sun/star/document/VbaEventId.idl
+===================================================================
+--- offapi/com/sun/star/document/VbaEventId.idl	(revision 0)
++++ offapi/com/sun/star/document/VbaEventId.idl	(revision 276288)
+@@ -0,0 +1,82 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __org_openoffice_vba_VbaEventId_idl__
++#define __org_openoffice_vba_VbaEventId_idl__
++
++//=============================================================================
++
++module com {  module sun {  module star { module document {
++//=============================================================================
++
++/* VBA compatibility event id */
++constants VbaEventId
++{
++    // Worksheet
++    const long VBAEVENT_WORKSHEET_ACTIVATE                  	= 1;
++    const long VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK         	= 2;
++    const long VBAEVENT_WORKSHEET_BEFORERIGHTCLICK          	= 3;
++    const long VBAEVENT_WORKSHEET_CALCULATE                 	= 4;
++    const long VBAEVENT_WORKSHEET_CHANGE                    	= 5;
++    const long VBAEVENT_WORKSHEET_DEACTIVATE                	= 6;
++    const long VBAEVENT_WORKSHEET_FOLLOWHYPERLINK           	= 7;
++    const long VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE          	= 8;
++    const long VBAEVENT_WORKSHEET_SELECTIONCHANGE           	= 9;
++    // Workbook
++    const long VBAEVENT_WORKBOOK_ACTIVATE            			= 20;
++    const long VBAEVENT_WORKBOOK_DEACTIVATE          			= 21;
++    const long VBAEVENT_WORKBOOK_OPEN                			= 22;
++    const long VBAEVENT_WORKBOOK_AUTOOPEN            			= 23;
++    const long VBAEVENT_WORKBOOK_BEFORECLOSE         			= 24;
++    const long VBAEVENT_WORKBOOK_BEFOREPRINT         			= 25;
++    const long VBAEVENT_WORKBOOK_BEFORESAVE          			= 26;
++    const long VBAEVENT_WORKBOOK_NEWSHEET            			= 27;
++    const long VBAEVENT_WORKBOOK_WINDOWACTIVATE      			= 28;
++    const long VBAEVENT_WORKBOOK_WINDOWDEACTIVATE    			= 29;
++    const long VBAEVENT_WORKBOOK_WINDOWRESIZE        			= 30;
++    // Workbook_sheet
++    const long VBAEVENT_WORKBOOK_SHEET_ACTIVATE               	= 51;
++    const long VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK      	= 52;
++    const long VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK       	= 53;
++    const long VBAEVENT_WORKBOOK_SHEET_CALCULATE              	= 54;
++    const long VBAEVENT_WORKBOOK_SHEET_CHANGE                 	= 55;
++    const long VBAEVENT_WORKBOOK_SHEET_DEACTIVATE             	= 56;
++    const long VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK        	= 57;
++    const long VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE       	= 58;
++    const long VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE        	= 59;
++};
++
++}; }; }; };
++
++#endif
+Index: offapi/com/sun/star/document/XCodeNameQuery.idl
+===================================================================
+--- offapi/com/sun/star/document/XCodeNameQuery.idl	(revision 0)
++++ offapi/com/sun/star/document/XCodeNameQuery.idl	(revision 276288)
+@@ -0,0 +1,56 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: XDocumentPropertiesSupplier.idl,v $
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __com_sun_star_document_XCodeNameQuery_idl__
++#define __com_sun_star_document_XCodeNameQuery_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++//=============================================================================
++
++module com {   module sun {   module star {   module document {
++//=============================================================================
++interface XCodeNameQuery
++{
++	//-------------------------------------------------------------------------
++    string getCodeNameForObject( [in] com::sun::star::uno::XInterface aObj );
++};
++
++//=============================================================================
++
++}; }; }; };
++
++#endif
+Index: offapi/com/sun/star/document/XCompatWriterDocProperties.idl
+===================================================================
+--- offapi/com/sun/star/document/XCompatWriterDocProperties.idl	(revision 0)
++++ offapi/com/sun/star/document/XCompatWriterDocProperties.idl	(revision 276288)
+@@ -0,0 +1,49 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XDocumentProperties.idl,v $
++ * $Revision: 1.5 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __com_sun_star_document_XCompatWriterDocProperties_idl__
++#define __com_sun_star_document_XCompatWriterDocProperties_idl__
++
++#ifndef __com_sun_star_document_XDocumentProperties_idl__
++#include <com/sun/star/document/XDocumentProperties.idl>
++#endif
++//=============================================================================
++
++module com {   module sun {   module star {   module document {
++interface XCompatWriterDocProperties
++{
++//    interface ::com::sun::star::document::XDocumentProperties;
++    [attribute] string Manager;
++    [attribute] string Category;
++    [attribute] string Company;
++
++
++}; }; }; };
++};
++#endif
+Index: offapi/com/sun/star/document/XVbaEventsHelper.idl
+===================================================================
+--- offapi/com/sun/star/document/XVbaEventsHelper.idl	(revision 0)
++++ offapi/com/sun/star/document/XVbaEventsHelper.idl	(revision 276288)
+@@ -0,0 +1,60 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __org_openoffice_vba_XVbaEventsHelper_idl__
++#define __org_openoffice_vba_XVbaEventsHelper_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++//=============================================================================
++
++module com {  module sun {  module star {  module document {
++//=============================================================================
++
++interface XVbaEventsHelper
++{
++    /**
++        Execute VBA compatible event.
++        VbaEvent: Compatible VBA event id.
++        aArgs: the array of input arguments.
++        return: True if execute successfully, or False.
++    **/
++    boolean ProcessCompatibleVbaEvent( [in] long nEventId, [in] sequence< any > aArgs );
++    [attribute ] boolean IgnoreEvents;
++};
++
++}; }; }; };
++
++#endif
+Index: offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl
+===================================================================
+--- offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl	(revision 0)
++++ offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl	(revision 276288)
+@@ -0,0 +1,53 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XVbaEventHelper.idl,v $
++ * $Revision: 1.0 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __com_sun_star_document_XDocumentEventCompatibleHelper_idl__
++#define __com_sun_star_document_XDocumentEventCompatibleHelper_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++//=============================================================================
++
++module com {   module sun {   module star {   module document {
++
++//=============================================================================
++interface XDocumentEventCompatibleHelper
++{
++    /* Execute some compatible VBA event related to document, such as document save, document print.
++       nEventId: event id.
++    */
++    boolean processCompatibleEvent( [in] short nEventId );
++};
++
++//=============================================================================
++
++}; }; }; };
++
++#endif
+Index: offapi/com/sun/star/document/VbaEventsHelper.idl
+===================================================================
+--- offapi/com/sun/star/document/VbaEventsHelper.idl	(revision 0)
++++ offapi/com/sun/star/document/VbaEventsHelper.idl	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef __org_openoffice_vba_VbaEventsHelper_idl__
++#define __org_openoffice_vba_VbaEventsHelper_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++#include <com/sun/star/frame/XModel.idl>
++#include <com/sun/star/document/XVbaEventsHelper.idl>
++//=============================================================================
++
++module com {  module sun {  module star { module document {
++//=============================================================================
++
++service VbaEventsHelper : XVbaEventsHelper
++{
++  	createVbaEventsHelper(  [in] ::com::sun::star::frame::XModel xModel );
++};
++
++}; }; }; };
++
++#endif
+Index: offapi/com/sun/star/script/makefile.mk
+===================================================================
+--- offapi/com/sun/star/script/makefile.mk	(revision 276159)
++++ offapi/com/sun/star/script/makefile.mk	(revision 276288)
+@@ -51,6 +51,8 @@ IDLFILES=\
+ 	XLibraryContainerExport.idl\
+ 	XPersistentLibraryContainer.idl\
+ 	XStorageBasedLibraryContainer.idl\
++	XLibraryQueryExecutable.idl \
++	XVBACompat.idl\
+ 	ModuleSizeExceededRequest.idl\
+ 
+ # ------------------------------------------------------------------
+Index: offapi/com/sun/star/script/XLibraryQueryExecutable.idl
+===================================================================
+--- offapi/com/sun/star/script/XLibraryQueryExecutable.idl	(revision 0)
++++ offapi/com/sun/star/script/XLibraryQueryExecutable.idl	(revision 276288)
+@@ -0,0 +1,51 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XLibraryContainer.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __com_sun_star_script_XLibraryQueryExecutable_idl__ 
++#define __com_sun_star_script_XLibraryQueryExecutable_idl__ 
++ 
++#ifndef __com_sun_star_uno_XInterface_idl__ 
++#include <com/sun/star/uno/XInterface.idl> 
++#endif 
++ 
++//============================================================================= 
++ 
++module com {  module sun {  module star {  module script {  
++ 
++interface XLibraryQueryExecutable: com::sun::star::uno::XInterface
++{ 
++	boolean HasExecutableCode( [in] string name );
++};
++
++//============================================================================= 
++ 
++ 
++}; }; }; };  
++ 
++#endif 
+Index: offapi/com/sun/star/script/XVBACompat.idl
+===================================================================
+--- offapi/com/sun/star/script/XVBACompat.idl	(revision 0)
++++ offapi/com/sun/star/script/XVBACompat.idl	(revision 276288)
+@@ -0,0 +1,49 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XLibraryContainer.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __com_sun_star_script_XVBACompat_idl__ 
++#define __com_sun_star_script_XVBACompat_idl__ 
++ 
++#ifndef __com_sun_star_uno_XInterface_idl__ 
++#include <com/sun/star/uno/XInterface.idl> 
++#endif 
++ 
++//============================================================================= 
++ 
++module com {  module sun {  module star {  module script {  
++ 
++interface XVBACompat: com::sun::star::uno::XInterface
++{ 
++
++//============================================================================= 
++    [attribute ] boolean VBACompatModeOn;
++ 
++}; }; }; };  
++}; 
++#endif 
+Index: offapi/com/sun/star/ui/ItemStyle.idl
+===================================================================
+--- offapi/com/sun/star/ui/ItemStyle.idl	(revision 276159)
++++ offapi/com/sun/star/ui/ItemStyle.idl	(revision 276288)
+@@ -149,6 +149,7 @@ constants ItemStyle
+         <p>This style is only valid if the item describes a toolbar item.</p>
+     */
+     const short DROPDOWN_ONLY = 1024;
++    const short TEXT = 2048;
+ };
+ 
+ }; }; }; };
+Index: scp2/source/ooo/file_library_ooo.scp
+===================================================================
+--- scp2/source/ooo/file_library_ooo.scp	(revision 276159)
++++ scp2/source/ooo/file_library_ooo.scp	(revision 276288)
+@@ -71,6 +71,20 @@ File gid_File_Lib_Basprov
+   #endif
+ End
+ 
++#ifdef ENABLE_VBA
++File gid_File_Lib_Vbaevent
++    TXT_FILE_BODY;
++    Styles = (PACKED,UNO_COMPONENT);
++    RegistryID = gid_Starregistry_Services_Rdb;
++    Dir = gid_Dir_Program;
++  #ifdef UNX
++    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
++  #else
++    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
++  #endif
++End
++#endif // ENABLE_VBA
++
+ STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib)
+ 
+ File gid_File_Lib_Cached1
+@@ -400,7 +414,42 @@ File gid_File_Lib_Vbaobj
+   #endif
+ End
+ 
++File gid_File_Lib_Vbaswobj
++    TXT_FILE_BODY;
++    Styles = (PACKED,UNO_COMPONENT);
++    RegistryID = gid_Starregistry_Services_Rdb;
++    Dir = gid_Dir_Program;
++  #ifdef UNX
++    Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
++  #else
++    Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll));
++  #endif
++End
++
++File gid_File_Lib_Vbamsforms
++    TXT_FILE_BODY;
++    Styles = (PACKED,UNO_COMPONENT);
++    RegistryID = gid_Starregistry_Services_Rdb;
++    Dir = gid_Dir_Program;
++  #ifdef UNX
++    Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX));
++  #else
++    Name = STRING(CONCAT4(msforms,DLLPOSTFIX,.uno,.dll));
++  #endif
++End
++
+ #endif // VBA_EXTENSION
++File gid_File_Lib_Vbahelper
++    TXT_FILE_BODY;
++    Styles = (PACKED);
++    RegistryID = gid_Starregistry_Services_Rdb;
++    Dir = SCP2_OOO_BIN_DIR;
++  #ifdef UNX
++    Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX));
++  #else
++    Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll));
++  #endif
++End
+ #endif // ENABLE_VBA
+ 
+ 
+Index: formula/source/core/api/FormulaCompiler.cxx
+===================================================================
+--- formula/source/core/api/FormulaCompiler.cxx	(revision 276159)
++++ formula/source/core/api/FormulaCompiler.cxx	(revision 276288)
+@@ -723,6 +723,30 @@ OpCode FormulaCompiler::GetEnglishOpCode( const St
+     return bFound ? (*iLook).second : OpCode(ocNone);
+ }
+ 
++bool FormulaCompiler::IsOpCodeVolatile( OpCode eOp )
++{
++    switch (eOp)
++    {
++        // no parameters:
++        case ocRandom:
++        case ocGetActDate:
++        case ocGetActTime:
++        // one parameter:
++        case ocFormula:
++        case ocInfo:
++        // more than one parameters:
++            // ocIndirect/ocIndirectXL otherwise would have to do
++            // StopListening and StartListening on a reference for every
++            // interpreted value.
++        case ocIndirect:
++        case ocIndirectXL:
++            // ocOffset results in indirect references.
++        case ocOffset:
++            return true;
++    }
++    return false;
++}
++
+ // Remove quotes, escaped quotes are unescaped.
+ BOOL FormulaCompiler::DeQuote( String& rStr )
+ {
+@@ -939,26 +963,13 @@ void FormulaCompiler::Factor()
+     {
+         if( nNumFmt == NUMBERFORMAT_UNDEFINED )
+             nNumFmt = lcl_GetRetFormat( eOp );
+-        // Functions that have to be always recalculated
++
++        if ( IsOpCodeVolatile(eOp) )
++            pArr->SetRecalcModeAlways();
++        else
++        {
+         switch( eOp )
+         {
+-            // no parameters:
+-            case ocRandom:
+-            case ocGetActDate:
+-            case ocGetActTime:
+-            // one parameter:
+-            case ocFormula:
+-            case ocInfo:
+-            // more than one parameters:
+-                // ocIndirect/ocIndirectXL otherwise would have to do
+-                // StopListening and StartListening on a reference for every
+-                // interpreted value.
+-            case ocIndirect:
+-            case ocIndirectXL:
+-                // ocOffset results in indirect references.
+-            case ocOffset:
+-                pArr->SetRecalcModeAlways();
+-            break;
+                 // Functions recalculated on every document load.
+                 // Don't use SetRecalcModeOnLoad() which would override
+                 // ModeAlways.
+@@ -978,6 +989,7 @@ void FormulaCompiler::Factor()
+             default:
+                 ;   // nothing
+         }
++        }
+         if (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR)
+         {
+             pFacToken = pToken;
+Index: formula/inc/formula/FormulaCompiler.hxx
+===================================================================
+--- formula/inc/formula/FormulaCompiler.hxx	(revision 276159)
++++ formula/inc/formula/FormulaCompiler.hxx	(revision 276288)
+@@ -222,6 +222,8 @@ class FORMULA_DLLPUBLIC FormulaCompiler
+     void            SetCompileForFAP( BOOL bVal )
+                         { bCompileForFAP = bVal; bIgnoreErrors = bVal; }
+ 
++    static bool IsOpCodeVolatile( OpCode eOp );
++
+     static BOOL DeQuote( String& rStr );
+ 
+     static const String&    GetNativeSymbol( OpCode eOp );
+Index: solenv/inc/libs.mk
+===================================================================
+--- solenv/inc/libs.mk	(revision 276159)
++++ solenv/inc/libs.mk	(revision 276288)
+@@ -188,6 +188,7 @@ SAXLIB=-lsax$(DLLPOSTFIX)
+ MAILLIB=-lmail
+ DOCMGRLIB=-ldmg$(DLLPOSTFIX)
+ BASICLIB=-lsb$(DLLPOSTFIX)
++VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX)
+ DBTOOLSLIB=-ldbtools$(DLLPOSTFIX)
+ HM2LIBSH=-lhmwrpdll
+ HM2LIBST=-lhmwrap
+@@ -420,6 +421,7 @@ SAXLIB=isax.lib
+ MAILLIB=mail.lib
+ DOCMGRLIB=docmgr.lib
+ BASICLIB=basic.lib
++VBAHELPERLIB=vbahelper.lib
+ TKTLIB=tkt.lib
+ SJLIB=sj.lib
+ SVXCORELIB=isvxcore.lib
+Index: framework/source/uielement/menubarmanager.cxx
+===================================================================
+--- framework/source/uielement/menubarmanager.cxx	(revision 276159)
++++ framework/source/uielement/menubarmanager.cxx	(revision 276288)
+@@ -74,6 +74,7 @@
+ #include <com/sun/star/frame/XModuleManager.hpp>
+ #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
++#include <com/sun/star/ui/ItemStyle.hpp>
+ #include <com/sun/star/frame/status/Visibility.hpp>
+ 
+ //_________________________________________________________________________________________________________________
+@@ -136,6 +137,7 @@ static const char ITEM_DESCRIPTOR_LABEL[]
+ static const char ITEM_DESCRIPTOR_TYPE[]              = "Type";
+ static const char ITEM_DESCRIPTOR_MODULEIDENTIFIER[]  = "ModuleIdentifier";
+ static const char ITEM_DESCRIPTOR_DISPATCHPROVIDER[]  = "DispatchProvider";
++static const char   ITEM_DESCRIPTOR_STYLE[]         = "Style";
+ 
+ const sal_Int32   LEN_DESCRIPTOR_COMMANDURL           = 10;
+ const sal_Int32   LEN_DESCRIPTOR_HELPURL              = 7;
+@@ -144,6 +146,7 @@ const sal_Int32   LEN_DESCRIPTOR_LABEL
+ const sal_Int32   LEN_DESCRIPTOR_TYPE                 = 4;
+ const sal_Int32   LEN_DESCRIPTOR_MODULEIDENTIFIER     = 16;
+ const sal_Int32   LEN_DESCRIPTOR_DISPATCHPROVIDER     = 16;
++static const sal_Int32 ITEM_DESCRIPTOR_STYLE_LEN       = 5;
+ 
+ const sal_uInt16 ADDONMENU_MERGE_ITEMID_START = 1500;
+ 
+@@ -1327,6 +1330,11 @@ void MenuBarManager::FillMenuManager( Menu* pMenu,
+         Reference< XDispatch > xDispatch;
+ 		Reference< XStatusListener > xStatusListener;
+ 		PopupMenu* pPopup = pMenu->GetPopupMenu( nItemId );
++        bool bItemShowMenuImages = m_bShowMenuImages;
++        MenuItemBits nBits =  pMenu->GetItemBits( nItemId );
++        // overwrite the show icons on menu option?
++        if ( nBits )
++            bItemShowMenuImages = ( ( nBits & MIB_ICON ) == MIB_ICON );
+ 		if ( pPopup )
+ 		{
+             // Retrieve module identifier from Help Command entry
+@@ -1422,7 +1430,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu,
+                         pSubMenuManager->m_aMenuItemCommand = ::rtl::OUString();
+ 
+ 			            // Set image for the addon popup menu item
+-			            if ( m_bShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
++			            if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
+ 			            {
+                             Reference< XFrame > xTemp( rFrame );
+                             Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE, m_bWasHiContrast );
+@@ -1441,7 +1449,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu,
+ 		}
+         else if ( pMenu->GetItemType( i ) != MENUITEM_SEPARATOR )
+ 		{
+-			if ( m_bShowMenuImages )
++            if ( bItemShowMenuImages )
+ 			{
+ 			    if ( AddonMenuManager::IsAddonMenuId( nItemId ))
+ 			    {
+@@ -1752,7 +1760,7 @@ void MenuBarManager::FillMenu(
+         sal_uInt16                      nType = 0;
+         Reference< XIndexAccess >       xIndexContainer;
+         Reference< XDispatchProvider >  xDispatchProvider( rDispatchProvider );
+-
++        sal_Int16 nStyle = 0;
+         try
+         {
+             if ( rItemContainer->getByIndex( n ) >>= aProp )
+@@ -1781,6 +1789,8 @@ void MenuBarManager::FillMenu(
+                     else if ( aPropName.equalsAsciiL( ITEM_DESCRIPTOR_DISPATCHPROVIDER,
+                                                       LEN_DESCRIPTOR_DISPATCHPROVIDER ))
+                         aProp[i].Value >>= xDispatchProvider;
++                   else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_STYLE, ITEM_DESCRIPTOR_STYLE_LEN ))
++                        aProp[i].Value >>= nStyle;
+                 }
+ 
+                 if ( nType == ::com::sun::star::ui::ItemType::DEFAULT )
+@@ -1791,7 +1801,15 @@ void MenuBarManager::FillMenu(
+                     sal_Int32 nHelpId = aHelpURL.toInt32();
+                     if ( nHelpId > 0 )
+                         pMenu->SetHelpId( nId, (USHORT)nHelpId );
+-
++                    if ( nStyle )
++                    {
++                        MenuItemBits nBits = pMenu->GetItemBits( nId );
++                        if ( nStyle & ::com::sun::star::ui::ItemStyle::ICON )
++                           nBits |= MIB_ICON;
++                        if ( nStyle & ::com::sun::star::ui::ItemStyle::TEXT )
++                           nBits |= MIB_TEXT;
++                        pMenu->SetItemBits( nId, nBits );
++                    } 
+                     if ( xIndexContainer.is() )
+                     {
+                         PopupMenu* pNewPopupMenu = new PopupMenu;
+Index: framework/source/uielement/toolbarmanager.cxx
+===================================================================
+--- framework/source/uielement/toolbarmanager.cxx	(revision 276159)
++++ framework/source/uielement/toolbarmanager.cxx	(revision 276288)
+@@ -71,7 +71,6 @@
+ #include <com/sun/star/lang/XMultiComponentFactory.hpp>
+ #include <com/sun/star/frame/XModuleManager.hpp>
+ #include <com/sun/star/ui/XUIElementSettings.hpp>
+-#include <com/sun/star/container/XIndexContainer.hpp>
+ #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
+ #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+@@ -122,6 +121,7 @@ namespace framework
+ 
+ static const char   ITEM_DESCRIPTOR_COMMANDURL[]    = "CommandURL";
+ static const char   ITEM_DESCRIPTOR_HELPURL[]       = "HelpURL";
++static const char   ITEM_DESCRIPTOR_TOOLTIP[]       = "Tooltip";
+ static const char   ITEM_DESCRIPTOR_CONTAINER[]     = "ItemDescriptorContainer";
+ static const char   ITEM_DESCRIPTOR_LABEL[]         = "Label";
+ static const char   ITEM_DESCRIPTOR_TYPE[]          = "Type";
+@@ -131,6 +131,7 @@ static const char   ITEM_DESCRIPTOR_STYLE[]
+ 
+ static const sal_Int32 ITEM_DESCRIPTOR_COMMANDURL_LEN  = 10;
+ static const sal_Int32 ITEM_DESCRIPTOR_HELPURL_LEN     = 7;
++static const sal_Int32 ITEM_DESCRIPTOR_TOOLTIP_LEN     = 7;
+ static const sal_Int32 ITEM_DESCRIPTOR_CONTAINER_LEN   = 23;
+ static const sal_Int32 ITEM_DESCRIPTOR_LABEL_LEN       = 5;
+ static const sal_Int32 ITEM_DESCRIPTOR_TYPE_LEN        = 4;
+@@ -966,8 +967,13 @@ void ToolBarManager::CreateControllers()
+                 }
+                 else
+                 {
++                    MenuDescriptionMap::iterator it = m_aMenuMap.find( nId );
++                    if ( it == m_aMenuMap.end() )
+                     xController = Reference< XStatusListener >(
+                         new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL ));
++                    else
++                        xController = Reference< XStatusListener >(
++                            new MenuToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL, m_aModuleIdentifier, m_aMenuMap[ nId ] ));
+                 }
+             }
+             else if ( pController )
+@@ -1099,6 +1105,10 @@ sal_uInt16 ToolBarManager::ConvertStyleToToolboxIt
+         nItemBits |= TIB_REPEAT;
+     if ( nStyle & ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY )
+         nItemBits |= TIB_DROPDOWNONLY;
++    if ( nStyle & ::com::sun::star::ui::ItemStyle::TEXT )
++        nItemBits |= TIB_TEXT_ONLY;
++    if ( nStyle & ::com::sun::star::ui::ItemStyle::ICON )
++        nItemBits |= TIB_ICON_ONLY;
+ 
+     return nItemBits;
+ }
+@@ -1164,6 +1174,8 @@ void ToolBarManager::FillToolbar( const Reference<
+     m_aControllerMap.clear();
+     m_aCommandMap.clear();
+ 
++    m_aMenuMap.clear();
++
+     CommandInfo aCmdInfo;
+     for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
+     {
+@@ -1171,11 +1183,13 @@ void ToolBarManager::FillToolbar( const Reference<
+         rtl::OUString               aCommandURL;
+         rtl::OUString               aLabel;
+         rtl::OUString               aHelpURL;
++        rtl::OUString               aTooltip;
+         sal_uInt16                  nType( ::com::sun::star::ui::ItemType::DEFAULT );
+         sal_uInt16                  nWidth( 0 );
+         sal_Bool                    bIsVisible( sal_True );
+         sal_uInt32                  nStyle( 0 );
+ 
++        Reference< XIndexAccess >   aMenuDesc;
+         try
+         {
+             if ( rItemContainer->getByIndex( n ) >>= aProp )
+@@ -1186,6 +1200,8 @@ void ToolBarManager::FillToolbar( const Reference<
+                         aProp[i].Value >>= aCommandURL;
+                     else if (  aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_HELPURL, ITEM_DESCRIPTOR_HELPURL_LEN ))
+                         aProp[i].Value >>= aHelpURL;
++                    else if (  aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TOOLTIP, ITEM_DESCRIPTOR_TOOLTIP_LEN ))
++                        aProp[i].Value >>= aTooltip;
+                     else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_LABEL, ITEM_DESCRIPTOR_LABEL_LEN ))
+                         aProp[i].Value >>= aLabel;
+                     else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TYPE, ITEM_DESCRIPTOR_TYPE_LEN ))
+@@ -1196,6 +1212,8 @@ void ToolBarManager::FillToolbar( const Reference<
+                         aProp[i].Value >>= nWidth;
+                     else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_STYLE, ITEM_DESCRIPTOR_STYLE_LEN ))
+                         aProp[i].Value >>= nStyle;
++                    else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_CONTAINER, ITEM_DESCRIPTOR_CONTAINER_LEN ))
++                        aProp[i].Value >>= aMenuDesc;
+                 }
+ 
+                 if (( nType == ::com::sun::star::ui::ItemType::DEFAULT ) && ( aCommandURL.getLength() > 0 ))
+@@ -1203,8 +1221,13 @@ void ToolBarManager::FillToolbar( const Reference<
+                     ::rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL ));
+ 
+                     sal_uInt16 nItemBits = ConvertStyleToToolboxItemBits( nStyle );
++                    if ( aMenuDesc.is() )
++                        m_aMenuMap[ nId ] = aMenuDesc;
+                     m_pToolBar->InsertItem( nId, aString, nItemBits );
+                     m_pToolBar->SetItemCommand( nId, aCommandURL );
++                    if ( aTooltip.getLength() )
++                        m_pToolBar->SetQuickHelpText( nId, aTooltip );
++                    else
+                     m_pToolBar->SetQuickHelpText( nId, aString );
+                     if ( aLabel.getLength() > 0 )
+                         m_pToolBar->SetItemText( nId, aLabel );
+Index: framework/source/uielement/generictoolbarcontroller.cxx
+===================================================================
+--- framework/source/uielement/generictoolbarcontroller.cxx	(revision 276159)
++++ framework/source/uielement/generictoolbarcontroller.cxx	(revision 276288)
+@@ -68,6 +68,9 @@
+ #include <classes/fwkresid.hxx>
+ #include <dispatch/uieventloghelper.hxx>
+ 
++#include <xml/menuconfiguration.hxx>
++#include <uielement/menubarmanager.hxx>
++
+ using namespace ::com::sun::star::awt;
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star::beans;
+@@ -75,6 +78,7 @@ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::frame;
+ using namespace ::com::sun::star::frame::status;
+ using namespace ::com::sun::star::util;
++using namespace ::com::sun::star::container;
+ 
+ namespace framework
+ {
+@@ -326,5 +330,67 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarControl
+    return 0;
+ }
+ 
++MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, USHORT   nID, const rtl::OUString& aCommand, const rtl::OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier )
++{
++}
++
++MenuToolbarController::~MenuToolbarController()
++{
++    try
++    {
++        if ( m_xMenuManager.is() )
++            m_xMenuManager->dispose();
++    }
++    catch( Exception& ) {}
++    if ( pMenu )
++    {
++        delete pMenu;
++        pMenu = NULL;
++    }
++ 
++}
++
++class Toolbarmenu : public PopupMenu
++{
++    public:
++    Toolbarmenu();
++    ~Toolbarmenu();
++};
++
++Toolbarmenu::Toolbarmenu()
++{
++    OSL_TRACE("**** contstructing Toolbarmenu 0x%x", this );
++}
++
++Toolbarmenu::~Toolbarmenu()
++{
++    OSL_TRACE("**** destructing Toolbarmenu 0x%x", this );
++}
++
++void SAL_CALL MenuToolbarController::click() throw (RuntimeException)
++{
++    createPopupWindow();
++}
++
++Reference< XWindow > SAL_CALL 
++MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException)
++{
++    if ( !pMenu ) 
++    {
++        Reference< XDispatchProvider > xDispatch;
++        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
++        pMenu = new Toolbarmenu();
++        m_xMenuManager.set( new MenuBarManager( m_xServiceManager, m_xFrame, xURLTransformer, xDispatch, m_aModuleIdentifier, pMenu, sal_True, sal_True ) );
++        if ( m_xMenuManager.is() )
++        {
++            MenuBarManager* pMgr = dynamic_cast< MenuBarManager* >( m_xMenuManager.get() );
++            pMgr->SetItemContainer( m_xMenuDesc );
++        }
++    }
++
++    ::Rectangle aRect( m_pToolbar->GetItemRect( m_nID ) );
++    pMenu->Execute( m_pToolbar, aRect, POPUPMENU_EXECUTE_DOWN );
++    return NULL; 
++}
+ } // namespace
+ 
+Index: framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+===================================================================
+--- framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx	(revision 276159)
++++ framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx	(revision 276288)
+@@ -1281,7 +1281,7 @@ throw ( ElementExistException, IllegalArgumentExce
+                 bInsertData   = true;
+             }
+         }
+-        if ( !pDataSettings )
++        if ( !pDataSettings || bInsertData )
+         {
+             aUIElementData.bDefault     = false;
+             if ( !m_bUseDefault )
+Index: framework/inc/uielement/toolbarmanager.hxx
+===================================================================
+--- framework/inc/uielement/toolbarmanager.hxx	(revision 276159)
++++ framework/inc/uielement/toolbarmanager.hxx	(revision 276288)
+@@ -50,6 +50,7 @@
+ #include <com/sun/star/lang/XComponent.hpp>
+ #include <com/sun/star/container/XIndexAccess.hpp>
+ #include <com/sun/star/container/XNameAccess.hpp>
++#include <com/sun/star/container/XIndexContainer.hpp>
+ #include <com/sun/star/frame/XModuleManager.hpp>
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+ #include <com/sun/star/frame/XUIControllerRegistration.hpp>
+@@ -200,6 +201,7 @@ class ToolBarManager : public ::com::sun::star::fr
+         typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector;
+         typedef BaseHash< SubToolBarControllerVector >                                                              SubToolBarToSubToolBarControllerMap;
+ 
++        typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
+         sal_Bool                                                                               m_bDisposed : 1,
+                                                                                                m_bIsHiContrast : 1,
+                                                                                                m_bSmallSymbols : 1,
+@@ -229,6 +231,7 @@ class ToolBarManager : public ::com::sun::star::fr
+         SubToolBarToSubToolBarControllerMap                                                    m_aSubToolBarControllerMap;
+         Timer				                                                                   m_aAsyncUpdateControllersTimer;
+         sal_Int16                                                                              m_nSymbolsStyle;
++        MenuDescriptionMap m_aMenuMap;
+ };
+     
+ }
+Index: framework/inc/uielement/generictoolbarcontroller.hxx
+===================================================================
+--- framework/inc/uielement/generictoolbarcontroller.hxx	(revision 276159)
++++ framework/inc/uielement/generictoolbarcontroller.hxx	(revision 276288)
+@@ -37,7 +37,10 @@
+ 
+ #include <svtools/toolboxcontroller.hxx>
+ #include <vcl/toolbox.hxx>
++#include <memory>
+ 
++class PopupMenu;
++
+ namespace framework
+ {
+ 
+@@ -64,7 +67,7 @@ class GenericToolbarController : public svt::Toolb
+ 
+          DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo* ); 
+     
+-    private:
++    protected:
+         ToolBox*        m_pToolbar;
+         sal_uInt16      m_nID;
+         sal_Bool        m_bEnumCommand : 1,
+@@ -72,6 +75,28 @@ class GenericToolbarController : public svt::Toolb
+         rtl::OUString   m_aEnumCommand;
+ };
+ 
++class MenuToolbarController : public GenericToolbarController
++{
++    com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xMenuDesc;
++    PopupMenu* pMenu;
++    com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuManager;
++    rtl::OUString m_aModuleIdentifier;
++    public:
++        MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
++                                  const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
++                                  ToolBox* pToolBar,
++                                  USHORT   nID,
++                                  const rtl::OUString& aCommand, 
++                                  const rtl::OUString& aModuleIdentifier, 
++                                  const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc );
++
++    ~MenuToolbarController();
++    // XToolbarController
++    virtual void SAL_CALL click() throw ( ::com::sun::star::uno::RuntimeException );
++    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
++
++};
++
+ }
+ 
+ #endif // __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_
+Index: framework/inc/xml/menuconfiguration.hxx
+===================================================================
+--- framework/inc/xml/menuconfiguration.hxx	(revision 276159)
++++ framework/inc/xml/menuconfiguration.hxx	(revision 276288)
+@@ -85,6 +85,7 @@ class MenuConfiguration
+ 			::rtl::OUString aTargetFrame;
+ 			::rtl::OUString	aImageId;
+             ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider;
++                        sal_Int16 nStyle;
+ 		};
+ 						
+ 		MenuConfiguration(
+Index: comphelper/source/misc/makefile.mk
+===================================================================
+--- comphelper/source/misc/makefile.mk	(revision 276159)
++++ comphelper/source/misc/makefile.mk	(revision 276288)
+@@ -60,6 +60,7 @@ SLOFILES=   \
+             $(SLO)$/docpasswordhelper.obj \
+             $(SLO)$/docpasswordrequest.obj \
+             $(SLO)$/documentinfo.obj \
++	    $(SLO)$/evtmethodhelper.obj \
+             $(SLO)$/documentiologring.obj \
+             $(SLO)$/evtlistenerhlp.obj \
+             $(SLO)$/ihwrapnofilter.obj \
+Index: comphelper/source/misc/evtmethodhelper.cxx
+===================================================================
+--- comphelper/source/misc/evtmethodhelper.cxx	(revision 0)
++++ comphelper/source/misc/evtmethodhelper.cxx	(revision 276288)
+@@ -0,0 +1,77 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: evtlistenerhlp.cxx,v $
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_comphelper.hxx"
++#include "comphelper/evtmethodhelper.hxx"
++#include "cppuhelper/typeprovider.hxx"
++
++using ::com::sun::star::uno::Sequence;
++using ::com::sun::star::uno::Type;
++
++namespace comphelper
++{
++
++	Sequence< ::rtl::OUString> getEventMethodsForType(const Type& type)
++	{
++		typelib_InterfaceTypeDescription *pType=0;
++		type.getDescription( (typelib_TypeDescription**)&pType);
++	
++		if(!pType)
++			return Sequence< ::rtl::OUString>();
++	    
++		Sequence< ::rtl::OUString> aNames(pType->nMembers);
++		::rtl::OUString* pNames = aNames.getArray();
++		for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames)
++		{
++			// the decription reference
++			typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i];
++			// the description for the reference
++			typelib_TypeDescription* pMemberDescription = NULL;
++			typelib_typedescriptionreference_getDescription(&pMemberDescription, pMemberDescriptionReference);
++			if (pMemberDescription)
++			{
++				typelib_InterfaceMemberTypeDescription* pRealMemberDescription =
++				reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription);
++				*pNames = pRealMemberDescription->pMemberName;
++			}
++		}
++		typelib_typedescription_release( (typelib_TypeDescription *)pType );
++		return aNames;
++	}
++
++}
++
++
++
++
++
++
++
+Index: comphelper/inc/comphelper/servicedecl.hxx
+===================================================================
+--- comphelper/inc/comphelper/servicedecl.hxx	(revision 276159)
++++ comphelper/inc/comphelper/servicedecl.hxx	(revision 276288)
+@@ -169,21 +169,20 @@ template <bool> struct with_args;
+ 
+ /// @internal
+ namespace detail {
+-
+ template <typename ImplT>
+-class ServiceImpl
+-    : public ::cppu::ImplInheritanceHelper1<ImplT, css::lang::XServiceInfo>,
++class OwnServiceImpl
++    : public ImplT,
+       private ::boost::noncopyable
+ {
+-    typedef ::cppu::ImplInheritanceHelper1<ImplT,css::lang::XServiceInfo> BaseT;
++    typedef ImplT BaseT;
+     
+ public:    
+-    ServiceImpl(
++    OwnServiceImpl(
+         ServiceDecl const& rServiceDecl,
+         css::uno::Sequence<css::uno::Any> const& args,
+         css::uno::Reference<css::uno::XComponentContext> const& xContext )
+         : BaseT(args, xContext), m_rServiceDecl(rServiceDecl) {}
+-    ServiceImpl(
++    OwnServiceImpl(
+         ServiceDecl const& rServiceDecl,
+         css::uno::Reference<css::uno::XComponentContext> const& xContext )
+         : BaseT(xContext), m_rServiceDecl(rServiceDecl) {}
+@@ -206,6 +205,22 @@ template <typename ImplT>
+     ServiceDecl const& m_rServiceDecl;
+ };
+ 
++template <typename ImplT>
++class ServiceImpl : public OwnServiceImpl< ::cppu::ImplInheritanceHelper1<ImplT,css::lang::XServiceInfo> >
++{
++typedef OwnServiceImpl< ::cppu::ImplInheritanceHelper1<ImplT,css::lang::XServiceInfo> > ServiceImpl_BASE;
++public:
++    ServiceImpl(
++        ServiceDecl const& rServiceDecl,
++        css::uno::Sequence<css::uno::Any> const& args,
++        css::uno::Reference<css::uno::XComponentContext> const& xContext )
++        : ServiceImpl_BASE(rServiceDecl, args, xContext) {}
++    ServiceImpl(
++        ServiceDecl const& rServiceDecl,
++        css::uno::Reference<css::uno::XComponentContext> const& xContext )
++        : ServiceImpl_BASE(rServiceDecl, xContext) {}
++};
++
+ template <typename ServiceImplT>
+ struct PostProcessDefault {
+     css::uno::Reference<css::uno::XInterface>
+@@ -230,7 +245,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_ar
+                 const& xContext ) const
+     {
+         return m_postProcessFunc(
+-            new ServiceImpl<ImplT>( rServiceDecl, xContext ) );
++            new ImplT( rServiceDecl, xContext ) );
+     }
+ };
+ 
+@@ -247,7 +262,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_ar
+                 const& xContext ) const
+     {
+         return m_postProcessFunc(
+-            new ServiceImpl<ImplT>( rServiceDecl, args, xContext ) );
++            new ImplT( rServiceDecl, args, xContext ) );
+     }
+ };
+ 
+@@ -261,18 +276,17 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_ar
+                or just (uno::Reference<uno::XComponentContext>)
+ */
+ template <typename ImplT_, typename WithArgsT = with_args<false> >
+-struct class_ {
++struct serviceimpl_base {
+     typedef ImplT_ ImplT;
+-    typedef detail::ServiceImpl<ImplT_> ServiceImplT;
+     
+     detail::CreateFuncF const m_createFunc;
+     
+-    typedef detail::PostProcessDefault<ServiceImplT> PostProcessDefaultT;
++    typedef detail::PostProcessDefault<ImplT> PostProcessDefaultT;
+ 
+     /** Default ctor.  Implementation class without args, expecting
+         component context as single argument.
+     */
+-    class_() : m_createFunc(
++    serviceimpl_base() : m_createFunc(
+         detail::CreateFunc<ImplT, PostProcessDefaultT, WithArgsT>(
+             PostProcessDefaultT() ) ) {}
+ 
+@@ -284,12 +298,30 @@ template <typename ImplT_, typename WithArgsT = wi
+                                uno::Reference<uno::XInterface>
+     */
+     template <typename PostProcessFuncT>
+-    explicit class_( PostProcessFuncT const& postProcessFunc )
++    explicit serviceimpl_base( PostProcessFuncT const& postProcessFunc )
+         : m_createFunc( detail::CreateFunc<ImplT, PostProcessFuncT, WithArgsT>(
+                             postProcessFunc ) ) {}
+ };
+ 
++template <typename ImplT_, typename WithArgsT = with_args<false> >
++struct class_ : public serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT >
++{
++    typedef serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT > baseT;
++    /** Default ctor.  Implementation class without args, expecting
++        component context as single argument.
++    */
++    class_() : baseT() {}
++    template <typename PostProcessFuncT>
++    /** Ctor to pass a post processing function/functor.
+ 
++        @tpl PostProcessDefaultT let your compiler deduce this
++        @param postProcessFunc function/functor that gets the yet unacquired
++                               ImplT_ pointer returning a
++                               uno::Reference<uno::XInterface>
++    */
++    explicit class_( PostProcessFuncT const& postProcessFunc ) : baseT( postProcessFunc ) {}
++};
++
+ //
+ // component_... helpers with arbitrary service declarations:
+ //
+Index: comphelper/inc/comphelper/evtmethodhelper.hxx
+===================================================================
+--- comphelper/inc/comphelper/evtmethodhelper.hxx	(revision 0)
++++ comphelper/inc/comphelper/evtmethodhelper.hxx	(revision 276288)
+@@ -0,0 +1,41 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: evtlistenerhlp.hxx,v $
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef COMPHELPER_EVENTMEHODHELPER_HXX
++#define COMPHELPER_EVENMETHODHELPER_HXX
++#include <comphelper/sequence.hxx>
++//........................................................................
++namespace comphelper
++{
++	COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type);
++//........................................................................
++
++}	// namespace comphelper
++//........................................................................
++#endif // COMPHELPER_EVENTMEHODHELPER_HXX
+Index: basctl/source/dlged/dlged.cxx
+===================================================================
+--- basctl/source/dlged/dlged.cxx	(revision 276159)
++++ basctl/source/dlged/dlged.cxx	(revision 276288)
+@@ -208,7 +208,7 @@ BOOL DlgEditor::RemarkDialog()
+ 
+ //----------------------------------------------------------------------------
+ 
+-DlgEditor::DlgEditor()
++DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel )
+ 	:pHScroll(NULL)
+ 	,pVScroll(NULL)
+ 	,pDlgEdModel(NULL)
+@@ -230,6 +230,7 @@ BOOL DlgEditor::RemarkDialog()
+ 	,bCreateOK(TRUE)
+ 	,bDialogModelChanged(FALSE)
+ 	,mnPaintGuard(0)
++	,m_xDocument( xModel )
+ {
+ 	pDlgEdModel = new DlgEdModel();
+ 	pDlgEdModel->GetItemPool().FreezeIdRanges();
+@@ -838,7 +839,7 @@ void DlgEditor::Copy()
+     Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
+     OSL_ASSERT( xProps.is() );
+     OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
+-	Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xClipDialogModel, xContext );
++	Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument );
+ 	Reference< XInputStream > xStream( xISP->createInputStream() );
+ 	Sequence< sal_Int8 > DialogModelBytes;
+ 	implCopyStreamToByteSequence( xStream, DialogModelBytes );
+@@ -871,7 +872,7 @@ void DlgEditor::Copy()
+ 			uno::Reference< resource::XStringResourceManager >
+ 				xStringResourceManager( xStringResourcePersistence, uno::UNO_QUERY );
+ 			LocalizationMgr::resetResourceForDialog( xClipDialogModel, xStringResourceManager );
+-			Reference< XInputStreamProvider > xISP2 = ::xmlscript::exportDialogModel( xClipDialogModel, xContext );
++			Reference< XInputStreamProvider > xISP2 = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument );
+ 			Reference< XInputStream > xStream2( xISP2->createInputStream() );
+ 			Sequence< sal_Int8 > NoResourceDialogModelBytes;
+ 			implCopyStreamToByteSequence( xStream2, NoResourceDialogModelBytes );
+@@ -1017,7 +1018,7 @@ void DlgEditor::Paste()
+                     Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
+                     OSL_ASSERT( xProps.is() );
+                     OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
+-					::xmlscript::importDialogModel( ::xmlscript::createInputStream( *((::rtl::ByteSequence*)(&DialogModelBytes)) ) , xClipDialogModel, xContext );
++					::xmlscript::importDialogModel( ::xmlscript::createInputStream( *((::rtl::ByteSequence*)(&DialogModelBytes)) ) , xClipDialogModel, xContext, m_xDocument );
+ 				}
+ 
+ 				// get control models from clipboard dialog model
+Index: basctl/source/dlged/dlgedobj.cxx
+===================================================================
+--- basctl/source/dlged/dlgedobj.cxx	(revision 276159)
++++ basctl/source/dlged/dlgedobj.cxx	(revision 276288)
+@@ -77,6 +77,22 @@ TYPEINIT1(DlgEdObj, SdrUnoObj);
+ DBG_NAME(DlgEdObj);
+ 
+ //----------------------------------------------------------------------------
++MapMode lcl_getMapModeForForm( DlgEdForm* pForm )
++{
++	MapMode aMode( MAP_APPFONT ); //Default
++	try
++	{
++		uno::Reference< beans::XPropertySet > xProps( pForm ? pForm->GetUnoControlModel() : NULL, uno::UNO_QUERY_THROW );
++		sal_Bool bVBAForm = sal_False;
++		xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VBAForm") ) ) >>= bVBAForm;	
++		if ( bVBAForm )
++			aMode = MapMode( MAP_100TH_MM );
++	}
++	catch ( Exception& )
++	{
++	}
++	return aMode;
++}
+ 
+ DlgEdObj::DlgEdObj()
+ 		  :SdrUnoObj(String(), sal_False)
+@@ -197,8 +213,9 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
+ 	}
+     
+     // convert pixel to logic units
+-    aPos = pDevice->PixelToLogic( aPos, MapMode( MAP_APPFONT ) );
+-    aSize = pDevice->PixelToLogic( aSize, MapMode( MAP_APPFONT ) );
++    MapMode aConvMode = lcl_getMapModeForForm( pForm );
++    aPos = pDevice->PixelToLogic( aPos, aConvMode );
++    aSize = pDevice->PixelToLogic( aSize, aConvMode );
+ 
+     // set out parameters
+     nXOut = aPos.Width();
+@@ -245,10 +262,10 @@ bool DlgEdObj::TransformSdrToFormCoordinates(
+ 		aSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset;
+ 		aSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset;
+ 	}
+-
++    MapMode aConvMode = lcl_getMapModeForForm( pForm );
+     // convert pixel to logic units
+-    aPos = pDevice->PixelToLogic( aPos, MapMode( MAP_APPFONT ) );
+-    aSize = pDevice->PixelToLogic( aSize, MapMode( MAP_APPFONT ) );
++    aPos = pDevice->PixelToLogic( aPos, aConvMode );
++    aSize = pDevice->PixelToLogic( aSize, aConvMode );
+ 
+     // set out parameters
+     nXOut = aPos.Width();
+@@ -290,9 +307,10 @@ bool DlgEdObj::TransformControlToSdrCoordinates(
+     DBG_ASSERT( pDevice, "DlgEdObj::TransformControlToSdrCoordinates: missing default device!" );
+     if ( !pDevice )
+         return false;
+-    aPos = pDevice->LogicToPixel( aPos, MapMode( MAP_APPFONT ) );
+-    aSize = pDevice->LogicToPixel( aSize, MapMode( MAP_APPFONT ) );
+-    aFormPos = pDevice->LogicToPixel( aFormPos, MapMode( MAP_APPFONT ) );
++    MapMode aConvMode = lcl_getMapModeForForm( pForm );
++    aPos = pDevice->LogicToPixel( aPos, aConvMode );
++    aSize = pDevice->LogicToPixel( aSize, aConvMode );
++    aFormPos = pDevice->LogicToPixel( aFormPos, aConvMode );
+ 
+     // add form position
+     aPos.Width() += aFormPos.Width();
+@@ -336,14 +354,16 @@ bool DlgEdObj::TransformFormToSdrCoordinates(
+     DBG_ASSERT( pDevice, "DlgEdObj::TransformFormToSdrCoordinates: missing default device!" );
+     if ( !pDevice )
+         return false;
+-    aPos = pDevice->LogicToPixel( aPos, MapMode( MAP_APPFONT ) );
+-    aSize = pDevice->LogicToPixel( aSize, MapMode( MAP_APPFONT ) );
+ 
+     // take window borders into account
+     DlgEdForm* pForm = NULL;
+     if ( !lcl_getDlgEdForm( this, pForm ) )
+         return false;
+ 
++    MapMode aConvMode = lcl_getMapModeForForm( pForm );
++    aPos = pDevice->LogicToPixel( aPos, aConvMode );
++    aSize = pDevice->LogicToPixel( aSize, aConvMode );
++
+     // take window borders into account
+     Reference< beans::XPropertySet > xPSetForm( pForm->GetUnoControlModel(), UNO_QUERY );
+     DBG_ASSERT( xPSetForm.is(), "DlgEdObj::TransformFormToSdrCoordinates: no form property set!" );
+Index: basctl/source/basicide/basidesh.cxx
+===================================================================
+--- basctl/source/basicide/basidesh.cxx	(revision 276159)
++++ basctl/source/basicide/basidesh.cxx	(revision 276288)
+@@ -80,6 +80,9 @@
+ #include <com/sun/star/script/XLibraryContainer.hpp>
+ #include <com/sun/star/script/XLibraryContainerPassword.hpp>
+ #include <com/sun/star/container/XNameContainer.hpp>
++#include <com/sun/star/container/XContainer.hpp>
++#include <com/sun/star/container/XContainerListener.hpp>
++#include <com/sun/star/script/XLibraryContainer.hpp>
+ 
+ #include <svx/xmlsecctrl.hxx>
+ 
+@@ -87,7 +90,72 @@ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star;
+ using ::rtl::OUString;
+ 
++static const rtl::OUString sStandardLibName(  rtl::OUString::createFromAscii("Standard") );
+ 
++typedef ::cppu::WeakImplHelper1< container::XContainerListener > ContainerListenerBASE;
++
++class ContainerListenerImpl : public ContainerListenerBASE
++{
++    BasicIDEShell* mpShell;
++public:
++
++    ContainerListenerImpl( BasicIDEShell* pShell ) : mpShell( pShell ) {}
++
++    ~ContainerListenerImpl() 
++    {
++    }
++
++    void addContainerListener( const ScriptDocument& rScriptDocument )
++    {
++        uno::Reference< container::XContainer > xContainer( rScriptDocument.getLibrary( E_SCRIPTS, sStandardLibName, FALSE ), uno::UNO_QUERY );
++        if ( rScriptDocument.isDocument() && xContainer.is() )
++        {
++            uno::Reference< container::XContainerListener > xContainerListener( this );
++            try
++            {
++                xContainer->addContainerListener( xContainerListener );
++            }
++            catch( uno::Exception& ) {}
++        }
++    }
++    void removeContainerListener( const ScriptDocument& rScriptDocument )
++    {
++        uno::Reference< container::XContainer > xContainer( rScriptDocument.getLibrary( E_SCRIPTS, sStandardLibName, FALSE ), uno::UNO_QUERY );
++        if ( rScriptDocument.isDocument(), xContainer.is() )
++        {
++            uno::Reference< container::XContainerListener > xContainerListener( this );
++            try
++            {
++               xContainer->removeContainerListener( xContainerListener );
++            }
++            catch( uno::Exception& ) {}
++        }
++    }
++
++    // XEventListener
++    virtual void SAL_CALL disposing( const lang::EventObject& ) throw( uno::RuntimeException ) {}
++
++    // XContainerListener
++    virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException )
++    {
++        rtl::OUString sModuleName;
++        if( mpShell && ( Event.Accessor >>= sModuleName ) )
++            mpShell->FindBasWin( mpShell->m_aCurDocument, sStandardLibName, sModuleName, TRUE, FALSE );
++    }
++    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( com::sun::star::uno::RuntimeException ) { }
++    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( com::sun::star::uno::RuntimeException )
++    {
++        rtl::OUString sModuleName;
++        if( mpShell  && ( Event.Accessor >>= sModuleName ) )
++        {
++            IDEBaseWindow* pWin = mpShell->FindWindow( mpShell->m_aCurDocument, sStandardLibName, sModuleName, BASICIDE_TYPE_MODULE, TRUE );
++            if( pWin )
++                mpShell->RemoveWindow( pWin, FALSE, TRUE );
++        }
++    }
++
++};
++
+ TYPEINIT1( BasicIDEShell, SfxViewShell );
+ 
+ SFX_IMPL_VIEWFACTORY( BasicIDEShell, IDEResId( SVX_INTERFACE_BASIDE_VIEWSH ) )
+@@ -124,6 +192,7 @@ BasicIDEShell::BasicIDEShell( SfxViewFrame* pFrame
+         m_bAppBasicModified( FALSE ),
+         m_aNotifier( *this )
+ {
++    m_xLibListener = new ContainerListenerImpl( this );
+ 	Init();
+     GnBasicIDEShellCount++;
+ }
+@@ -215,6 +284,12 @@ __EXPORT BasicIDEShell::~BasicIDEShell()
+ 	delete pTabBar;
+ 	delete pObjectCatalog;
+ 	DestroyModulWindowLayout();
++
++        ContainerListenerImpl* pListener = dynamic_cast< ContainerListenerImpl* >( m_xLibListener.get() );
++        // Destroy all ContainerListeners for Basic Container.
++        if ( pListener )
++            pListener->removeContainerListener( m_aCurDocument );
++    
+ 	// MI: Das gab einen GPF im SDT beim Schliessen da dann der ViewFrame die
+ 	// ObjSh loslaesst. Es wusste auch keiner mehr wozu das gut war.
+ 	// GetViewFrame()->GetObjectShell()->Broadcast( SfxSimpleHint( SFX_HINT_DYING ) );
+@@ -921,7 +996,15 @@ void BasicIDEShell::SetCurLib( const ScriptDocumen
+ {
+     if ( !bCheck || ( rDocument != m_aCurDocument || aLibName != m_aCurLibName ) )
+     {
++        ContainerListenerImpl* pListener = dynamic_cast< ContainerListenerImpl* >( m_xLibListener.get() );
++        if ( pListener )
++        	pListener->removeContainerListener( m_aCurDocument );
++
+         m_aCurDocument = rDocument;
++
++        if ( pListener )
++            pListener->addContainerListener( m_aCurDocument );
++
+         m_aCurLibName = aLibName;
+         if ( bUpdateWindows )
+             UpdateWindows();
+Index: basctl/source/basicide/bastype2.cxx
+===================================================================
+--- basctl/source/basicide/bastype2.cxx	(revision 276159)
++++ basctl/source/basicide/bastype2.cxx	(revision 276288)
+@@ -53,11 +53,26 @@
+ #include <com/sun/star/frame/XModuleManager.hpp>
+ #include <comphelper/processfactory.hxx>
+ #include <comphelper/componentcontext.hxx>
++#include <map>
++#include <com/sun/star/script/ModuleType.hpp>
++#include <com/sun/star/script/ModuleInfo.hpp>
++#include <com/sun/star/container/XNameContainer.hpp>
+ 
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star;
+ 
++void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib, const String& rModName, String& rObjName );
+ 
++sal_Int32 lcl_getModuleType(  const uno::Reference< container::XNameContainer >& rLib, const String& rModName )
++{
++    sal_Int32 nType = com::sun::star::script::ModuleType::Normal;
++    uno::Any aElement( rLib->getByName( rModName ) );
++    script::ModuleInfo aModuleInfo;
++    if( aElement >>= aModuleInfo )
++        nType = aModuleInfo.ModuleType;
++    return nType;    
++}
++
+ BasicEntry::~BasicEntry()
+ {
+ }
+@@ -91,20 +106,22 @@ BasicEntryDescriptor::BasicEntryDescriptor()
+ {
+ }
+ 
+-BasicEntryDescriptor::BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rName, BasicEntryType eType )
++BasicEntryDescriptor::BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rLibSubName, const String& rName, BasicEntryType eType )
+     :m_aDocument( rDocument )
+     ,m_eLocation( eLocation )
+     ,m_aLibName( rLibName )
++    ,m_aLibSubName( rLibSubName )
+     ,m_aName( rName )
+     ,m_eType( eType )
+ {
+     OSL_ENSURE( m_aDocument.isValid(), "BasicEntryDescriptor::BasicEntryDescriptor: invalid document!" );
+ }
+ 
+-BasicEntryDescriptor::BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rName, const String& rMethodName, BasicEntryType eType )
++BasicEntryDescriptor::BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rLibSubName, const String& rName, const String& rMethodName, BasicEntryType eType )
+     :m_aDocument( rDocument )
+     ,m_eLocation( eLocation )
+     ,m_aLibName( rLibName )
++    ,m_aLibSubName( rLibSubName )
+     ,m_aName( rName )
+     ,m_aMethodName( rMethodName )
+     ,m_eType( eType )
+@@ -120,6 +137,7 @@ BasicEntryDescriptor::BasicEntryDescriptor( const
+     :m_aDocument( rDesc.m_aDocument )
+     ,m_eLocation( rDesc.m_eLocation )
+     ,m_aLibName( rDesc.m_aLibName )
++    ,m_aLibSubName( rDesc.m_aLibSubName )
+     ,m_aName( rDesc.m_aName )
+     ,m_aMethodName( rDesc.m_aMethodName )
+     ,m_eType( rDesc.m_eType )
+@@ -131,6 +149,7 @@ BasicEntryDescriptor& BasicEntryDescriptor::operat
+     m_aDocument = rDesc.m_aDocument;
+     m_eLocation = rDesc.m_eLocation;
+     m_aLibName = rDesc.m_aLibName;
++    m_aLibSubName = rDesc.m_aLibSubName;
+     m_aName = rDesc.m_aName;
+     m_aMethodName = rDesc.m_aMethodName;
+     m_eType = rDesc.m_eType;
+@@ -143,6 +162,7 @@ bool BasicEntryDescriptor::operator==( const Basic
+     return m_aDocument == rDesc.m_aDocument &&
+            m_eLocation == rDesc.m_eLocation &&
+            m_aLibName == rDesc.m_aLibName &&
++           m_aLibSubName == rDesc.m_aLibSubName &&
+            m_aName == rDesc.m_aName &&
+            m_aMethodName == rDesc.m_aMethodName &&
+            m_eType == rDesc.m_eType;
+@@ -287,6 +307,13 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvL
+         {
+             try
+ 		    {
++                BasicManager* pBasMgr = rDocument.getBasicManager();
++                StarBASIC* pBasic = pBasMgr ? pBasMgr->GetLib( rLibName ) : 0;
++                sal_Bool bVBAEnabled = pBasic ? pBasic->isVBAEnabled(): sal_False;
++                if( bVBAEnabled )
++                    ImpCreateLibSubEntriesInVBAMode( pLibRootEntry, rDocument, rLibName );
++                else
++                {
+                 // get a sorted list of module names
+                 Sequence< ::rtl::OUString > aModNames = rDocument.getObjectNames( E_SCRIPTS, rLibName );
+                 sal_Int32 nModCount = aModNames.getLength();
+@@ -326,6 +353,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvL
+                     }
+ 				}
+             }
++            }
+ 		    catch ( const container::NoSuchElementException& )
+ 		    {
+                 DBG_UNHANDLED_EXCEPTION();
+@@ -368,6 +396,139 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvL
+     }
+ }
+ 
++void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName )
++{
++    ::std::map< BasicEntryType, ::rtl::OUString > aEntryMap;
++    aEntryMap.insert( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) );
++    aEntryMap.insert( ::std::make_pair( OBJ_TYPE_USERFORMS,  String( IDEResId( RID_STR_USERFORMS ) ) ) );
++    aEntryMap.insert( ::std::make_pair( OBJ_TYPE_NORMAL_MODULES, String( IDEResId( RID_STR_NORMAL_MODULES ) ) ) );
++    aEntryMap.insert( ::std::make_pair( OBJ_TYPE_CLASS_MODULES,  String( IDEResId( RID_STR_CLASS_MODULES ) ) ) );
++
++    ::std::map< BasicEntryType, ::rtl::OUString >::iterator iter;
++    for( iter = aEntryMap.begin(); iter != aEntryMap.end(); ++iter )
++    {
++        BasicEntryType eType = iter->first;
++        ::rtl::OUString aEntryName = iter->second;
++        SvLBoxEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType );
++        if( pLibSubRootEntry )
++        {
++            SetEntryBitmaps( pLibSubRootEntry, Image( IDEResId( RID_IMG_MODLIB ) ), Image( IDEResId( RID_IMG_MODLIB_HC ) ) );
++            if ( IsExpanded( pLibSubRootEntry ) )
++			    ImpCreateLibSubSubEntriesInVBAMode( pLibSubRootEntry, rDocument, rLibName );
++        }
++        else
++        {
++            pLibSubRootEntry = AddEntry(
++                aEntryName,
++                Image( IDEResId( RID_IMG_MODLIB ) ),
++                Image( IDEResId( RID_IMG_MODLIB_HC ) ),
++                pLibRootEntry, true,
++                std::auto_ptr< BasicEntry >( new BasicEntry( eType ) ) );
++        }
++    }
++}
++
++void BasicTreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const String& rLibName )
++{
++    uno::Reference< container::XNameContainer > xLib = rDocument.getOrCreateLibrary( E_SCRIPTS, rLibName );
++    if( !xLib.is() )
++        return;
++
++    try
++	{
++        // get a sorted list of module names
++        Sequence< ::rtl::OUString > aModNames = rDocument.getObjectNames( E_SCRIPTS, rLibName );
++        sal_Int32 nModCount = aModNames.getLength();
++    	const ::rtl::OUString* pModNames = aModNames.getConstArray();
++
++        BasicEntryDescriptor aDesc( GetEntryDescriptor( pLibSubRootEntry ) );
++        BasicEntryType eCurrentType( aDesc.GetType() );
++
++        for ( sal_Int32 i = 0 ; i < nModCount ; i++ )
++		{
++            String aModName = pModNames[ i ];
++            BasicEntryType eType = OBJ_TYPE_UNKNOWN;
++            switch( lcl_getModuleType( xLib, aModName ) )
++            {
++                case script::ModuleType::Document:
++                    eType = OBJ_TYPE_DOCUMENT_OBJECTS;
++                    break;
++                case script::ModuleType::Form:
++                    eType = OBJ_TYPE_USERFORMS;
++                    break;
++                case script::ModuleType::Normal:
++                    eType = OBJ_TYPE_NORMAL_MODULES;
++                    break;
++                case script::ModuleType::Class:
++                    eType = OBJ_TYPE_CLASS_MODULES;
++                    break;
++            }
++            if( eType != eCurrentType )
++                continue;
++
++			// display a nice friendly name in the ObjectModule tab,
++           	// combining the objectname and module name, e.g. Sheet1 ( Financials )
++            String aEntryName( aModName );
++            if( eType == OBJ_TYPE_DOCUMENT_OBJECTS )
++            {
++	       	    String sObjName;
++            	lcl_getObjectName( xLib, aModName, sObjName );
++		    	if( sObjName.Len() )
++        	   	{
++		        	aEntryName.AppendAscii(" (").Append(sObjName).AppendAscii(")");
++            	}
++            }
++            SvLBoxEntry* pModuleEntry = FindEntry( pLibSubRootEntry, aEntryName, OBJ_TYPE_MODULE );
++            if ( !pModuleEntry )
++                pModuleEntry = AddEntry(
++                    aEntryName,
++                    Image( IDEResId( RID_IMG_MODULE ) ),
++                    Image( IDEResId( RID_IMG_MODULE_HC ) ),
++                    pLibSubRootEntry, false,
++                    std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
++
++			// methods
++			if ( nMode & BROWSEMODE_SUBS )
++			{
++                Sequence< ::rtl::OUString > aNames = BasicIDE::GetMethodNames( rDocument, rLibName, aModName );
++				sal_Int32 nCount = aNames.getLength();
++				const ::rtl::OUString* pNames = aNames.getConstArray();
++
++				for ( sal_Int32 j = 0 ; j < nCount ; j++ )
++				{
++					String aName = pNames[ j ];
++					SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
++                    if ( !pEntry )
++                        pEntry = AddEntry(
++                            aName,
++                            Image( IDEResId( RID_IMG_MACRO ) ),
++                            Image( IDEResId( RID_IMG_MACRO_HC ) ),
++                            pModuleEntry, false,
++                            std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_METHOD ) ) );
++    			}
++            }
++	    }
++    }
++    catch ( const container::NoSuchElementException& )
++	{
++        DBG_UNHANDLED_EXCEPTION();
++    }
++}
++
++SvLBoxEntry* BasicTreeListBox::ImpFindEntry( SvLBoxEntry* pParent, const String& rText )
++{
++	ULONG nRootPos = 0;
++	SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
++	while ( pEntry )
++	{
++		if (  GetEntryText( pEntry ) == rText ) 
++			return pEntry;
++
++		pEntry = pParent ? NextSibling( pEntry ) : GetEntry( ++nRootPos );
++	}
++	return 0;
++}
++
+ void BasicTreeListBox::onDocumentCreated( const ScriptDocument& /*_rDocument*/ )
+ {
+     UpdateEntries();
+@@ -480,10 +641,11 @@ long BasicTreeListBox::ExpandingHdl()
+         if ( aDocument.isAlive() )
+         {
+             String aLibName( aDesc.GetLibName() );
++            String aLibSubName( aDesc.GetLibSubName() );
+             String aName( aDesc.GetName() );
+             String aMethodName( aDesc.GetMethodName() );
+ 
+-            if ( aLibName.Len() && !aName.Len() && !aMethodName.Len() )
++            if ( aLibName.Len() && !aLibSubName.Len() && !aName.Len() && !aMethodName.Len() )
+ 		    {
+                 // check password, if library is password protected and not verified
+                 ::rtl::OUString aOULibName( aLibName );
+@@ -636,7 +798,7 @@ void BasicTreeListBox::SetCurrentEntry( BasicEntry
+         aDesc = BasicEntryDescriptor(
+             ScriptDocument::getApplicationScriptDocument(),
+             LIBRARY_LOCATION_USER, String::CreateFromAscii( "Standard" ), 
+-            String::CreateFromAscii( "." ), OBJ_TYPE_UNKNOWN );
++            String(), String::CreateFromAscii( "." ), OBJ_TYPE_UNKNOWN );
+     }
+     ScriptDocument aDocument( aDesc.GetDocument() );
+     OSL_ENSURE( aDocument.isValid(), "BasicTreeListBox::SetCurrentEntry: invalid document!" );
+@@ -653,14 +815,24 @@ void BasicTreeListBox::SetCurrentEntry( BasicEntry
+             if ( pLibEntry )
+             {
+                 pCurEntry = pLibEntry;
++                String aLibSubName( aDesc.GetLibSubName() );
++                if( aLibSubName.Len() )
++                {
++                    Expand( pLibEntry );
++                    SvLBoxEntry* pLibSubEntry = ImpFindEntry( pLibEntry, aLibSubName );
++                    if( pLibSubEntry )
++                    {
++                        pCurEntry = pLibSubEntry;
++                    }
++                }
+                 String aName( aDesc.GetName() );
+                 if ( aName.Len() )
+                 {
+-                    Expand( pLibEntry );
++                    Expand( pCurEntry );
+                     BasicEntryType eType = OBJ_TYPE_MODULE;
+                     if ( aDesc.GetType() == OBJ_TYPE_DIALOG )
+                         eType = OBJ_TYPE_DIALOG;
+-                    SvLBoxEntry* pEntry = FindEntry( pLibEntry, aName, eType );
++                    SvLBoxEntry* pEntry = FindEntry( pCurEntry, aName, eType );
+                     if ( pEntry )
+                     {
+                         pCurEntry = pEntry;
+Index: basctl/source/basicide/bastypes.cxx
+===================================================================
+--- basctl/source/basicide/bastypes.cxx	(revision 276159)
++++ basctl/source/basicide/bastypes.cxx	(revision 276288)
+@@ -60,6 +60,7 @@
+ #include <com/sun/star/script/XLibraryContainer2.hpp>
+ #endif
+ #include <com/sun/star/script/XLibraryContainerPassword.hpp>
++#include <com/sun/star/script/ModuleType.hpp>
+ 
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star;
+@@ -594,8 +595,30 @@ void __EXPORT BasicIDETabBar::Command( const Comma
+                 aPopup.EnableItem( SID_BASICIDE_RENAMECURRENT, FALSE );
+                 aPopup.RemoveDisabledEntries();
+             }
++			
++			// disable to delete or remove object modules in IDE
++			BasicManager* pBasMgr = aDocument.getBasicManager();
++			if ( pBasMgr )
++			{
++				StarBASIC* pBasic = pBasMgr->GetLib( aOULibName );
++				if( pBasic )
++				{
++					IDEWindowTable& aIDEWindowTable = pIDEShell->GetIDEWindowTable();
++					IDEBaseWindow* pWin = aIDEWindowTable.Get( GetCurPageId() );
++					if( pWin && pWin->ISA( ModulWindow ) )
++					{
++						SbModule* pActiveModule = (SbModule*)pBasic->FindModule( pWin->GetName() );
++						if( pActiveModule && ( pActiveModule->GetModuleType() == script::ModuleType::Document ) )
++						{
++							aPopup.EnableItem( SID_BASICIDE_DELETECURRENT, FALSE );
++							aPopup.EnableItem( SID_BASICIDE_RENAMECURRENT, FALSE );
+         }
++					}
++				}
++			}
++        }
+ 
++
+         SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
+ 	    SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
+         if ( pDispatcher )
+Index: basctl/source/basicide/bastype3.cxx
+===================================================================
+--- basctl/source/basicide/bastype3.cxx	(revision 276159)
++++ basctl/source/basicide/bastype3.cxx	(revision 276288)
+@@ -134,6 +134,14 @@ void __EXPORT BasicTreeListBox::RequestingChilds(
+ 		    }
+         }
+     }
++    else if ( eType == OBJ_TYPE_DOCUMENT_OBJECTS 
++            || eType == OBJ_TYPE_USERFORMS
++            || eType == OBJ_TYPE_NORMAL_MODULES
++            || eType == OBJ_TYPE_CLASS_MODULES )
++    {
++        String aLibName( aDesc.GetLibName() );
++        ImpCreateLibSubSubEntriesInVBAMode( pEntry, aDocument, aLibName );
++    }
+ 	else {
+ 		DBG_ERROR( "BasicTreeListBox::RequestingChilds: Unknown Type!" );
+     }
+@@ -204,6 +212,7 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBo
+     }
+ 
+ 	SbxVariable* pVar = 0;
++    bool bDocumentObjects = false;
+ 	if ( aEntries.Count() )
+ 	{
+ 		for ( USHORT n = 0; n < aEntries.Count(); n++ )
+@@ -226,6 +235,12 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBo
+ 				case OBJ_TYPE_MODULE:
+ 				{
+ 					DBG_ASSERT( pVar && pVar->IsA( TYPE(StarBASIC) ), "FindVariable: Ungueltiges Basic" );
++                    // extract the module name from the string like "Sheet1 (Example1)"
++                    if( bDocumentObjects )
++                    {
++                        sal_uInt16 nIndex = 0;
++                        aName = aName.GetToken( 0, ' ', nIndex );
++                    }
+ 					pVar = ((StarBASIC*)pVar)->FindModule( aName );
+ 				}
+ 				break;
+@@ -240,6 +255,15 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBo
+ 					// sbx dialogs removed
+ 				}
+ 				break;
++                case OBJ_TYPE_DOCUMENT_OBJECTS:
++                    bDocumentObjects = true;
++                case OBJ_TYPE_USERFORMS:
++                case OBJ_TYPE_NORMAL_MODULES:
++                case OBJ_TYPE_CLASS_MODULES:
++                {
++                    // skip, to find the child entry.
++                    continue;
++                }
+                 default:
+                 {
+                     DBG_ERROR( "FindVariable: Unbekannter Typ!" );
+@@ -260,12 +284,13 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDes
+     ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
+     LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN;
+ 	String aLibName;
++	String aLibSubName;
+ 	String aName;
+ 	String aMethodName;
+     BasicEntryType eType = OBJ_TYPE_UNKNOWN;
+ 
+ 	if ( !pEntry )
+-        return BasicEntryDescriptor( aDocument, eLocation, aLibName, aName, aMethodName, eType );
++        return BasicEntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, aName, aMethodName, eType );
+ 
+ 	EntryArray aEntries;
+ 
+@@ -332,6 +357,15 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDes
+ 					eType = pBE->GetType();
+ 				}
+ 				break;
++                case OBJ_TYPE_DOCUMENT_OBJECTS:
++                case OBJ_TYPE_USERFORMS:
++                case OBJ_TYPE_NORMAL_MODULES:
++                case OBJ_TYPE_CLASS_MODULES:
++				{
++					aLibSubName = GetEntryText( pLE );
++					eType = pBE->GetType();
++				}
++				break;
+ 				default:
+                 {
+                     DBG_ERROR( "GetEntryDescriptor: Unbekannter Typ!" );
+@@ -345,7 +379,7 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDes
+ 		}
+ 	}
+ 
+-    return BasicEntryDescriptor( aDocument, eLocation, aLibName, aName, aMethodName, eType );
++    return BasicEntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, aName, aMethodName, eType );
+ }
+ 
+ USHORT BasicTreeListBox::ConvertType( BasicEntryType eType )
+@@ -427,6 +461,14 @@ bool BasicTreeListBox::IsValidEntry( SvLBoxEntry*
+             bIsValid = BasicIDE::HasMethod( aDocument, aLibName, aName, aMethodName );
+         }
+         break;
++        case OBJ_TYPE_DOCUMENT_OBJECTS:
++        case OBJ_TYPE_USERFORMS:
++        case OBJ_TYPE_NORMAL_MODULES:
++        case OBJ_TYPE_CLASS_MODULES:
++        {
++            bIsValid = true;
++        }
++        break;
+ 		default: ;
+     }
+ 
+Index: basctl/source/basicide/basides1.cxx
+===================================================================
+--- basctl/source/basicide/basides1.cxx	(revision 276159)
++++ basctl/source/basicide/basides1.cxx	(revision 276288)
+@@ -1201,10 +1201,16 @@ IDEBaseWindow* BasicIDEShell::FindWindow( const Sc
+                 // return any non-suspended window
+                 return pWin;
+             }
+-            else if ( pWin->IsDocument( rDocument ) && pWin->GetLibName() == rLibName && pWin->GetName() == rName &&
++            else if ( pWin->IsDocument( rDocument ) )
++            {
++                OSL_TRACE("FindWindow pWin->GetLibName() %s rLibName %s",
++			rtl::OUStringToOString( pWin->GetLibName(), RTL_TEXTENCODING_UTF8 ).getStr(),
++			rtl::OUStringToOString( rLibName, RTL_TEXTENCODING_UTF8 ).getStr() );
++                OSL_TRACE("pWin->pWin->IsA( TYPE( ModulWindow ) %d && nType %d = BASICIDE_TYPE_MODULE %d", pWin->IsA( TYPE( ModulWindow ) ), nType, BASICIDE_TYPE_MODULE );
++                OSL_TRACE("pWin->pWin->IsA( TYPE( DialogWindow ) %d && nType %d = BASICIDE_TYPE_DIALOG %d", pWin->IsA( TYPE( DialogWindow ) ), nType, BASICIDE_TYPE_DIALOG );
++		if (  pWin->GetLibName() == rLibName && pWin->GetName() == rName &&
+                       ( ( pWin->IsA( TYPE( ModulWindow ) )  && nType == BASICIDE_TYPE_MODULE ) ||
+                         ( pWin->IsA( TYPE( DialogWindow ) ) && nType == BASICIDE_TYPE_DIALOG ) ) )
+-            {
+                 return pWin;
+             }
+         }
+Index: basctl/source/basicide/basides2.cxx
+===================================================================
+--- basctl/source/basicide/basides2.cxx	(revision 276159)
++++ basctl/source/basicide/basides2.cxx	(revision 276288)
+@@ -55,11 +55,38 @@
+ #include <tools/diagnose_ex.h>
+ #include <sfx2/sfxdefs.hxx>
+ #include <sfx2/signaturestate.hxx>
++#include <com/sun/star/script/ModuleInfo.hpp>
++#include <com/sun/star/container/XNameContainer.hpp>
++#include <com/sun/star/container/XNamed.hpp>
++#include <com/sun/star/lang/XServiceInfo.hpp>
+ 
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::uno;
+ namespace css = ::com::sun::star;
+ 
++void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib, const String& rModName, String& rObjName )
++{
++    try
++    {
++		uno::Any aElement( rLib->getByName( rModName ) );
++		script::ModuleInfo aModuleInfo;
++		if( aElement >>= aModuleInfo )
++		{
++			uno::Any aObject( aModuleInfo.ModuleObject );
++			uno::Reference< lang::XServiceInfo > xServiceInfo( aObject, uno::UNO_QUERY );
++			if( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Worksheet" ) ) )
++			{
++				uno::Reference< container::XNamed > xNamed( aObject, uno::UNO_QUERY );
++				if( xNamed.is() )
++					rObjName = xNamed->getName();
++			}
++		}
++    }
++    catch( uno::Exception& )
++    {
++    }
++}
++
+ IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )
+ {
+ 	ShowObjectDialog( FALSE, TRUE );
+@@ -232,7 +259,7 @@ ModulWindow* BasicIDEShell::CreateBasWin( const Sc
+     if ( !aLibName.Len() )
+         aLibName = String::CreateFromAscii( "Standard" );
+ 
+-    rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
++    uno::Reference< container::XNameContainer > xLib = rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
+ 
+ 	if ( !aModName.Len() )
+         aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
+@@ -251,11 +278,14 @@ ModulWindow* BasicIDEShell::CreateBasWin( const Sc
+ 
+         if ( bSuccess )
+         {
+-			// new module window
++			pWin = FindBasWin( rDocument, aLibName, aModName, FALSE, TRUE );
++            if( !pWin )
++			{    // new module window
+ 			pWin = new ModulWindow( pModulLayout, rDocument, aLibName, aModName, aModule );
+ 			nKey = InsertWindowInTable( pWin );
+         }
+ 	}
++	}
+ 	else
+ 	{
+ 		pWin->SetStatus( pWin->GetStatus() & ~BASWIN_SUSPENDED );
+@@ -268,7 +298,21 @@ ModulWindow* BasicIDEShell::CreateBasWin( const Sc
+ 		}
+ 		DBG_ASSERT( nKey, "CreateBasWin: Kein Key- Fenster nicht gefunden!" );
+ 	}
++    if( nKey )
++	{
++		if( xLib.is() )
++		{
++			// display a nice friendly name in the ObjectModule tab,
++			// combining the objectname and module name, e.g. Sheet1 ( Financials )
++			String sObjName;
++			lcl_getObjectName( xLib, rModName, sObjName );
++			if( sObjName.Len() )
++			{
++				aModName.AppendAscii(" (").Append(sObjName).AppendAscii(")");
++			}
++		}
+ 	pTabBar->InsertPage( (USHORT)nKey, aModName );
++	}	
+ 	pTabBar->Sort();
+ 	pWin->GrabScrollBars( &aHScrollBar, &aVScrollBar );
+ 	if ( !pCurWin )
+Index: basctl/source/basicide/basides3.cxx
+===================================================================
+--- basctl/source/basicide/basides3.cxx	(revision 276159)
++++ basctl/source/basicide/basides3.cxx	(revision 276288)
+@@ -98,7 +98,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const S
+                 Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
+                 OSL_ASSERT( xProps.is() );
+                 OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
+-				::xmlscript::importDialogModel( xInput, xDialogModel, xContext );
++				::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.getDocument() );
+ 				LocalizationMgr::setStringResourceAtDialog( rDocument, rLibName, aDlgName, xDialogModel );
+ 
+ 				// new dialog window
+Index: basctl/source/basicide/bastype2.hxx
+===================================================================
+--- basctl/source/basicide/bastype2.hxx	(revision 276159)
++++ basctl/source/basicide/bastype2.hxx	(revision 276288)
+@@ -42,7 +42,7 @@
+ #include <sbxitem.hxx>
+ #include "basobj.hxx"
+ 
+-enum BasicEntryType { OBJ_TYPE_UNKNOWN, OBJ_TYPE_DOCUMENT, OBJ_TYPE_LIBRARY, OBJ_TYPE_MODULE, OBJ_TYPE_DIALOG, OBJ_TYPE_METHOD };
++enum BasicEntryType { OBJ_TYPE_UNKNOWN, OBJ_TYPE_DOCUMENT, OBJ_TYPE_LIBRARY, OBJ_TYPE_MODULE, OBJ_TYPE_DIALOG, OBJ_TYPE_METHOD, OBJ_TYPE_DOCUMENT_OBJECTS, OBJ_TYPE_USERFORMS, OBJ_TYPE_NORMAL_MODULES, OBJ_TYPE_CLASS_MODULES };
+ 
+ #define BROWSEMODE_MODULES		0x01
+ #define BROWSEMODE_SUBS			0x02
+@@ -101,14 +101,15 @@ class BasicEntryDescriptor
+     ScriptDocument          m_aDocument;
+     LibraryLocation         m_eLocation;
+     String                  m_aLibName;
++    String                  m_aLibSubName;  // for vba entry:  Document Objects, Class Modules, Forms and Normal Modules
+     String                  m_aName;
+     String                  m_aMethodName;
+     BasicEntryType          m_eType;
+ 
+ public:
+                             BasicEntryDescriptor();
+-	                        BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rName, BasicEntryType eType );
+-	                        BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rName, const String& rMethodName, BasicEntryType eType );
++	                        BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rLibSubName, const String& rName, BasicEntryType eType );
++	                        BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rLibSubName, const String& rName, const String& rMethodName, BasicEntryType eType );
+     virtual                 ~BasicEntryDescriptor();
+ 
+                             BasicEntryDescriptor( const BasicEntryDescriptor& rDesc );
+@@ -125,6 +126,9 @@ class BasicEntryDescriptor
+     const String&           GetLibName() const { return m_aLibName; }
+     void                    SetLibName( const String& aLibName ) { m_aLibName = aLibName; }
+ 
++    const String&           GetLibSubName() const { return m_aLibSubName; }
++    void                    SetLibSubName( const String& aLibSubName ) { m_aLibSubName = aLibSubName; }
++
+     const String&           GetName() const { return m_aName; }
+     void                    SetName( const String& aName ) { m_aName = aName; }
+ 
+@@ -164,6 +168,9 @@ class BasicTreeListBox  :public SvTreeListBox
+ 
+     void                    ImpCreateLibEntries( SvLBoxEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
+ 	void 					ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName );
++	void 					ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName );
++	void 					ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const String& rLibName );
++    SvLBoxEntry*            ImpFindEntry( SvLBoxEntry* pParent, const String& rText );
+ 
+     // DocumentEventListener
+     virtual void onDocumentCreated( const ScriptDocument& _rDocument );
+Index: basctl/source/basicide/scriptdocument.cxx
+===================================================================
+--- basctl/source/basicide/scriptdocument.cxx	(revision 276159)
++++ basctl/source/basicide/scriptdocument.cxx	(revision 276288)
+@@ -56,6 +56,7 @@
+ #include <com/sun/star/frame/XModel2.hpp>
+ #include <com/sun/star/awt/XWindow2.hpp>
+ #include <com/sun/star/document/XEmbeddedScripts.hpp>
++#include <com/sun/star/script/ModuleInfo.hpp>
+ /** === end UNO includes === **/
+ 
+ #include <sfx2/objsh.hxx>
+@@ -142,6 +143,7 @@ namespace basctl
+     using ::com::sun::star::uno::RuntimeException;
+     using ::com::sun::star::document::XEventBroadcaster;
+     using ::com::sun::star::document::XEmbeddedScripts;
++    using ::com::sun::star::script::ModuleInfo;
+     /** === end UNO using === **/
+     namespace MacroExecMode = ::com::sun::star::document::MacroExecMode;
+     namespace FrameSearchFlag = ::com::sun::star::frame::FrameSearchFlag;
+@@ -661,7 +663,7 @@ namespace basctl
+                 if ( !_rxExistingDialogModel.is() )
+                 {
+                     Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
+-    			    ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext() );
++    			    ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext(), getDocument() );
+                 }
+ 
+ 			    // set new name as property
+@@ -669,11 +671,20 @@ namespace basctl
+ 			    xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rNewName ) );
+ 
+ 			    // export dialog model
+-			    xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext() );
++			    xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), getDocument() );
+ 			    aElement <<= xISP;
+             }
+ 
+ 		    // insert element by new name in container
++            if ( _eType == E_SCRIPTS )
++            {
++                ModuleInfo sModuleInfo;
++                if ( aElement >>= sModuleInfo )
++                {
++                    sModuleInfo.ModuleName = _rNewName;
++                    aElement <<= sModuleInfo;
++                }
++            }
+ 		    xLib->insertByName( _rNewName, aElement );
+             return true;
+         }
+@@ -738,8 +749,16 @@ namespace basctl
+             Reference< XNameContainer > xLib( getOrCreateLibrary( E_SCRIPTS, _rLibName ), UNO_QUERY_THROW );
+ 	        if ( !xLib->hasByName( _rModName ) )
+                 return false;
+-
+-            xLib->replaceByName( _rModName, makeAny( _rModuleCode ) );
++            ModuleInfo mInfo;
++            Any aMod;
++            if ( xLib->getByName( _rModName ) >>= mInfo )
++            {
++                mInfo.ModuleSource = _rModuleCode;
++                aMod <<= mInfo;
++            }
++            else
++                aMod <<= _rModuleCode;
++            xLib->replaceByName( _rModName, aMod );
+             return true;
+         }
+         catch( const Exception& )
+@@ -772,7 +791,7 @@ namespace basctl
+ 		    xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rDialogName ) );
+ 
+ 		    // export dialog model
+-            _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext() );
++            _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), getDocument() );
+ 
+ 		    // insert dialog into library
+ 		    xLib->insertByName( _rDialogName, makeAny( _out_rDialogProvider ) );
+@@ -1392,7 +1411,15 @@ namespace basctl
+         Any aCode;
+         if ( !m_pImpl->getModuleOrDialog( E_SCRIPTS, _rLibName, _rModName, aCode ) )
+             return false;
++        ModuleInfo sModuleInfo;
++        if ( aCode >>= sModuleInfo )
++        {
++            _out_rModuleSource = sModuleInfo.ModuleSource;
++        }
++        else
++        {
+         OSL_VERIFY( aCode >>= _out_rModuleSource );
++        }
+         return true;
+     }
+ 
+Index: basctl/source/basicide/macrodlg.cxx
+===================================================================
+--- basctl/source/basicide/macrodlg.cxx	(revision 276159)
++++ basctl/source/basicide/macrodlg.cxx	(revision 276288)
+@@ -385,7 +385,15 @@ SbMethod* MacroChooser::CreateMacro()
+         SbModule* pModule = 0;
+         String aModName( aDesc.GetName() );
+         if ( aModName.Len() )
++        {
++            // extract the module name from the string like "Sheet1 (Example1)"
++            if( aDesc.GetLibSubName().Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) )
++            {
++                sal_uInt16 nIndex = 0;
++                aModName = aModName.GetToken( 0, ' ', nIndex );
++            }
+ 	        pModule = pBasic->FindModule( aModName );
++        }    
+         else if ( pBasic->GetModules()->Count() )
+ 	        pModule = (SbModule*)pBasic->GetModules()->Get( 0 );
+ 
+@@ -713,6 +721,12 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pBut
+         BasicManager* pBasMgr = aDocument.getBasicManager();
+         String aLib( aDesc.GetLibName() );
+         String aMod( aDesc.GetName() );
++        // extract the module name from the string like "Sheet1 (Example1)"
++        if( aDesc.GetLibSubName().Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) )
++        {
++            sal_uInt16 nIndex = 0;
++            aMod = aMod.GetToken( 0, ' ', nIndex );
++        }
+         String aSub( aDesc.GetMethodName() );
+ 		SfxMacroInfoItem aInfoItem( SID_BASICIDE_ARG_MACROINFO, pBasMgr, aLib, aMod, aSub, String() );
+ 		if ( pButton == &aEditButton )
+Index: basctl/source/basicide/basidesh.src
+===================================================================
+--- basctl/source/basicide/basidesh.src	(revision 276159)
++++ basctl/source/basicide/basidesh.src	(revision 276288)
+@@ -639,6 +639,22 @@ String RID_STR_TRANSLATION_DEFAULT
+ {
+ 	Text [ en-US ] = "[Default Language]" ;
+ };
++String RID_STR_DOCUMENT_OBJECTS
++{
++    Text [ en-US ] = "Document Objects" ;
++};
++String RID_STR_USERFORMS
++{
++    Text [ en-US ] = "Forms" ;
++};
++String RID_STR_NORMAL_MODULES
++{
++    Text [ en-US ] = "Modules" ;
++};
++String RID_STR_CLASS_MODULES
++{
++    Text [ en-US ] = "Class Modules" ;
++};
+ 
+ #define MN_EDIT       20
+ #define MN_VIEW 21
+Index: basctl/source/basicide/moduldlg.cxx
+===================================================================
+--- basctl/source/basicide/moduldlg.cxx	(revision 276159)
++++ basctl/source/basicide/moduldlg.cxx	(revision 276288)
+@@ -87,7 +87,7 @@ BOOL __EXPORT ExtBasicTreeListBox::EditingEntry( S
+     if ( pEntry )
+     {
+         USHORT nDepth = GetModel()->GetDepth( pEntry );
+-        if ( nDepth == 2 )
++        if ( nDepth >= 2 )
+         {
+             BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) );
+             ScriptDocument aDocument( aDesc.GetDocument() );
+@@ -165,7 +165,7 @@ DragDropMode __EXPORT ExtBasicTreeListBox::NotifyS
+     if ( pEntry )
+     {
+         USHORT nDepth = GetModel()->GetDepth( pEntry );
+-        if ( nDepth == 2 )
++        if ( nDepth >= 2 )
+         {
+             nMode_ = SV_DRAGDROP_CTRL_COPY;
+             BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) );
+@@ -213,7 +213,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyAcceptDro
+ 
+     // don't drop on a library, which is not loaded, readonly or password protected
+     // or which already has a module/dialog with this name
+-    if ( bValid && ( nDepth == 1 || nDepth == 2 ) )
++    if ( bValid && ( nDepth > 0 ) )
+     {
+ 		// get source module/dialog name
+         BasicEntryDescriptor aSourceDesc( GetEntryDescriptor( pSelected ) );
+@@ -315,7 +315,7 @@ void BasicIDEShell::CopyDialogResources( Reference
+     Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
+     OSL_ASSERT( xProps.is() );
+     OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
+-	::xmlscript::importDialogModel( xInput, xDialogModel, xContext );
++	::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rSourceDoc.getDocument() );
+ 
+ 	if( xDialogModel.is() )
+ 	{
+@@ -332,7 +332,7 @@ void BasicIDEShell::CopyDialogResources( Reference
+ 		{
+ 			LocalizationMgr::setResourceIDsForDialog( xDialogModel, xDestMgr );
+ 		}
+-		io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
++		io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDestDoc.getDocument() );
+ 	}
+ }
+ 
+@@ -351,7 +351,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMo
+ 		rpNewParent = pTarget;
+ 		rNewChildPos = 0;
+ 	}
+-	else if ( nDepth == 2 )
++	else if ( nDepth >= 2 )
+ 	{
+ 		// Target = Modul/Dialog => Modul/Dialog unter das uebergeordnete Basic haengen...
+ 		rpNewParent = GetParent( pTarget );
+@@ -626,20 +626,31 @@ void ObjectPage::CheckButtons()
+ {
+     // enable/disable edit button
+ 	SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
++    BasicEntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) );
++    ScriptDocument aDocument( aDesc.GetDocument() );
++    ::rtl::OUString aOULibName( aDesc.GetLibName() );
++    String aLibSubName( aDesc.GetLibSubName() );
++    BasicManager* pBasMgr = aDocument.getBasicManager();
++    StarBASIC* pBasic = pBasMgr ? pBasMgr->GetLib( aOULibName ) : 0;
++    sal_Bool bVBAEnabled = pBasic ? pBasic->isVBAEnabled(): sal_False;
++    USHORT nMode = aBasicBox.GetMode();
++
+ 	USHORT nDepth = pCurEntry ? aBasicBox.GetModel()->GetDepth( pCurEntry ) : 0;
+-	if ( nDepth == 2 )
++	if ( nDepth >= 2 )
++    {
++        if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( nDepth == 2 ) )
++            aEditButton.Disable();
++        else
+ 		aEditButton.Enable();
++    }    
+ 	else
+ 		aEditButton.Disable();
+ 
+     // enable/disable new module/dialog buttons
+-    BasicEntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) );
+     LibraryLocation eLocation( aDesc.GetLocation() );
+     BOOL bReadOnly = FALSE;
+-    if ( nDepth == 1 || nDepth == 2 )
++    if ( nDepth > 0 )
+     {
+-        ScriptDocument aDocument( aDesc.GetDocument() );
+-        ::rtl::OUString aOULibName( aDesc.GetLibName() );
+         Reference< script::XLibraryContainer2 > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
+         Reference< script::XLibraryContainer2 > xDlgLibContainer( aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
+         if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryReadOnly( aOULibName ) ) ||
+@@ -660,8 +671,13 @@ void ObjectPage::CheckButtons()
+     }
+ 
+     // enable/disable delete button
+-	if ( nDepth == 2 && !bReadOnly && eLocation != LIBRARY_LOCATION_SHARE )
++    if ( nDepth >= 2 && !bReadOnly && eLocation != LIBRARY_LOCATION_SHARE )
++    {
++        if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( ( nDepth == 2 ) || aLibSubName.Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) ) )
++            aDelButton.Disable();
++        else
+ 		aDelButton.Enable();
++    }
+ 	else
+ 		aDelButton.Disable();
+ }
+@@ -688,13 +704,20 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButto
+         SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
+         SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ 		DBG_ASSERT( pCurEntry, "Entry?!" );
+-		if ( aBasicBox.GetModel()->GetDepth( pCurEntry ) == 2 )
++		if ( aBasicBox.GetModel()->GetDepth( pCurEntry ) >= 2 )
+ 		{
+             BasicEntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) );
+ 			if ( pDispatcher )
+ 			{
++                String aModName( aDesc.GetName() );
++                // extract the module name from the string like "Sheet1 (Example1)"
++                if( aDesc.GetLibSubName().Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) )
++                {
++                    sal_uInt16 nIndex = 0;
++                    aModName = aModName.GetToken( 0, ' ', nIndex );
++                }
+                 SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), 
+-                                  aDesc.GetName(), aBasicBox.ConvertType( aDesc.GetType() ) );
++                                  aModName, aBasicBox.ConvertType( aDesc.GetType() ) );
+ 				pDispatcher->Execute( SID_BASICIDE_SHOWSBX, SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
+ 			}
+ 		}
+@@ -976,14 +999,14 @@ SbModule* createModImpl( Window* pWin, const Scrip
+ 		try
+ 		{
+             ::rtl::OUString sModuleCode;
++            // the module has existed
++            if( rDocument.hasModule( aLibName, aModName ) )
++                return NULL;
+             rDocument.createModule( aLibName, aModName, bMain, sModuleCode );
+             BasicManager* pBasMgr = rDocument.getBasicManager();
+-            if ( pBasMgr )
+-            {
+-                StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
++            StarBASIC* pBasic = pBasMgr? pBasMgr->GetLib( aLibName ) : 0;
+                 if ( pBasic )
+                     pModule = pBasic->FindModule( aModName );
+-            }
+ 			SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE );					
+ 			BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ 			SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
+@@ -1005,14 +1028,27 @@ SbModule* createModImpl( Window* pWin, const Scrip
+                 {
+                     if ( !rBasicBox.IsExpanded( pLibEntry ) )
+                         rBasicBox.Expand( pLibEntry );
+-                    SvLBoxEntry* pEntry = rBasicBox.FindEntry( pLibEntry, aModName, OBJ_TYPE_MODULE );
++                    SvLBoxEntry* pSubRootEntry = pLibEntry;
++                    if( pBasic && pBasic->isVBAEnabled() )
++                    {
++                        // add the new module in the "Modules" entry
++                        SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, String( IDEResId( RID_STR_NORMAL_MODULES ) ) , OBJ_TYPE_NORMAL_MODULES );
++                        if( pLibSubEntry )
++                        {
++                            if( !rBasicBox.IsExpanded( pLibSubEntry ) )
++                                rBasicBox.Expand( pLibSubEntry );
++                            pSubRootEntry = pLibSubEntry;    
++                        }
++                    }
++                    
++                    SvLBoxEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE );
+                     if ( !pEntry )
+                     {
+                         pEntry = rBasicBox.AddEntry(
+                             aModName,
+                             Image( IDEResId( RID_IMG_MODULE ) ),
+                             Image( IDEResId( RID_IMG_MODULE_HC ) ),
+-                            pLibEntry, false,
++                            pSubRootEntry, false,
+                             std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
+                         DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
+                     }
+Index: basctl/source/basicide/baside2.cxx
+===================================================================
+--- basctl/source/basicide/baside2.cxx	(revision 276159)
++++ basctl/source/basicide/baside2.cxx	(revision 276288)
+@@ -49,6 +49,7 @@
+ #include <com/sun/star/script/XLibraryContainer2.hpp>
+ #endif
+ #include <com/sun/star/document/MacroExecMode.hpp>
++#include <com/sun/star/script/ModuleType.hpp>
+ #include <toolkit/helper/vclunohelper.hxx>
+ #include <sfx2/docfile.hxx>
+ #include <basic/basrdll.hxx>
+@@ -110,6 +111,8 @@ DBG_NAME( ModulWindow )
+ 
+ TYPEINIT1( ModulWindow , IDEBaseWindow );
+ 
++void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib, const String& rModName, String& rObjName );
++
+ void lcl_PrintHeader( Printer* pPrinter, USHORT nPages, USHORT nCurPage, const String& rTitle )
+ {
+ 	short nLeftMargin 	= LMARGPRN;
+@@ -331,6 +334,8 @@ BOOL ModulWindow::BasicExecute()
+ 			DBG_ASSERT( xModule.Is(), "Kein Modul!" );
+ 			AddStatus( BASWIN_RUNNINGBASIC );
+ 			USHORT nStart, nEnd, nCurMethodStart = 0;
++			TextSelection aSel = GetEditView()->GetSelection();
++			nCurMethodStart = ( aSel.GetStart().GetPara() + 1 );
+ 			SbMethod* pMethod = 0;
+ 			// erstes Macro, sonst blind "Main" (ExtSearch?)
+ 			for ( USHORT nMacro = 0; nMacro < xModule->GetMethods()->Count(); nMacro++ )
+@@ -338,16 +343,16 @@ BOOL ModulWindow::BasicExecute()
+ 				SbMethod* pM = (SbMethod*)xModule->GetMethods()->Get( nMacro );
+ 				DBG_ASSERT( pM, "Method?" );
+ 				pM->GetLineRange( nStart, nEnd );
+-				if ( !pMethod || ( nStart < nCurMethodStart ) )
++				if (  nCurMethodStart >= nStart && nCurMethodStart <= nEnd ) 
+ 				{
+ 					pMethod = pM;
+-					nCurMethodStart = nStart;
++					break;
+ 				}
+ 			}
+ 			if ( !pMethod )
+-				pMethod = (SbMethod*)xModule->Find( String( RTL_CONSTASCII_USTRINGPARAM( "Main" ) ), SbxCLASS_METHOD );
++				return ( BasicIDE::ChooseMacro( uno::Reference< frame::XModel >(), FALSE, rtl::OUString() ).getLength() > 0 ) ? TRUE : FALSE;
+ 
+-			if ( pMethod )
++			else
+ 			{
+ 				pMethod->SetDebugFlags( aStatus.nBasicFlags );
+ 				BasicDLL::SetDebugMode( TRUE );
+@@ -1345,8 +1350,40 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescr
+     ScriptDocument aDocument( GetDocument() );
+     String aLibName( GetLibName() );
+     LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
+-    return BasicEntryDescriptor( aDocument, eLocation, aLibName, GetName(), OBJ_TYPE_MODULE );
++    String aModName( GetName() );
++    String aLibSubName;
++    if( xBasic.Is() && xBasic->isVBAEnabled() && xModule.Is() )
++    {
++        switch( xModule->GetModuleType() )
++        {
++            case script::ModuleType::Document:
++            {
++                aLibSubName = String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) );
++                uno::Reference< container::XNameContainer > xLib = aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
++                if( xLib.is() )
++                {
++                    String sObjName;
++                    lcl_getObjectName( xLib, aModName, sObjName );
++                    if( sObjName.Len() )
++                    {
++                        aModName.AppendAscii(" (").Append(sObjName).AppendAscii(")");
+ }
++                }
++                break;
++            }    
++            case script::ModuleType::Form:
++                aLibSubName = String( IDEResId( RID_STR_USERFORMS ) );
++                break;
++            case script::ModuleType::Normal:
++                aLibSubName = String( IDEResId( RID_STR_NORMAL_MODULES ) );
++                break;
++            case script::ModuleType::Class:
++                aLibSubName = String( IDEResId( RID_STR_CLASS_MODULES ) );
++                break;
++        }
++    }
++    return BasicEntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, aModName, OBJ_TYPE_MODULE );
++}
+ 
+ void ModulWindow::SetReadOnly( BOOL b )
+ {
+Index: basctl/source/basicide/baside3.cxx
+===================================================================
+--- basctl/source/basicide/baside3.cxx	(revision 276159)
++++ basctl/source/basicide/baside3.cxx	(revision 276288)
+@@ -82,6 +82,7 @@
+ #include <com/sun/star/resource/XStringResourceResolver.hpp>
+ #include <com/sun/star/resource/StringResourceWithLocation.hpp>
+ #include <com/sun/star/task/XInteractionHandler.hpp>
++#include <com/sun/star/script/XVBACompat.hpp>
+ 
+ using namespace comphelper;
+ using namespace	::com::sun::star;
+@@ -112,8 +113,16 @@ DialogWindow::DialogWindow( Window* pParent, const
+ {
+ 	InitSettings( TRUE, TRUE, TRUE );
+ 
+-	pEditor = new DlgEditor();
++	pEditor = new DlgEditor( rDocument.getDocument() );
+ 	pEditor->SetWindow( this );
++	// set vba mode on DialogModel ( allows it to work in 100thmm instead of MAP_APPFONT )
++	if ( rDocument.getDocument().is() )
++	{
++		uno::Reference< script::XVBACompat > xDocVBAMode( rDocument.getLibraryContainer( E_SCRIPTS ), uno::UNO_QUERY );
++		uno::Reference< script::XVBACompat > xDialogModelVBAMode( xDialogModel, uno::UNO_QUERY );
++		if ( xDocVBAMode.is()  &&  xDialogModelVBAMode.is() )
++			xDialogModelVBAMode->setVBACompatModeOn( xDocVBAMode->getVBACompatModeOn() );
++	}
+ 	pEditor->SetDialog( xDialogModel );
+ 
+ 	// Undo einrichten
+@@ -724,7 +733,7 @@ BOOL DialogWindow::SaveDialog()
+ 		Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
+ 		OSL_ASSERT( xProps.is() );
+ 		OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
+-		Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
++		Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().getDocument() );
+ 		Reference< XInputStream > xInput( xISP->createInputStream() );
+ 
+ 		Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
+@@ -894,8 +903,9 @@ BasicEntryDescriptor DialogWindow::CreateEntryDesc
+ {
+     ScriptDocument aDocument( GetDocument() );
+     String aLibName( GetLibName() );
++    String aLibSubName;
+     LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
+-    return BasicEntryDescriptor( aDocument, eLocation, aLibName, GetName(), OBJ_TYPE_DIALOG );
++    return BasicEntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, GetName(), OBJ_TYPE_DIALOG );
+ }
+ 
+ void DialogWindow::SetReadOnly( BOOL b )
+@@ -942,7 +952,7 @@ void DialogWindow::StoreData()
+                     Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
+                     OSL_ASSERT( xProps.is() );
+                     OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
+-					Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
++					Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().getDocument() );
+ 					xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) );
+ 				}
+ 			}
+Index: basctl/source/inc/dlged.hxx
+===================================================================
+--- basctl/source/inc/dlged.hxx	(revision 276159)
++++ basctl/source/inc/dlged.hxx	(revision 276288)
+@@ -35,6 +35,7 @@
+ #include <com/sun/star/awt/XControlContainer.hpp>
+ #include <com/sun/star/datatransfer/DataFlavor.hpp>
+ #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
++#include <com/sun/star/frame/XModel.hpp>
+ #include <tools/link.hxx>
+ #include <tools/gen.hxx> 
+ #include <vcl/timer.hxx>
+@@ -129,9 +130,11 @@ class DlgEditor: public SfxBroadcaster
+ 	BOOL				bDialogModelChanged;
+     Timer               aMarkTimer;
+ 	long				mnPaintGuard;
++	::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocument;
+ 
++	DlgEditor(); // not implemented
+ public:
+-	DlgEditor();
++	DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
+ 	~DlgEditor();
+ 
+ 	void			SetWindow( Window* pWindow );
+Index: basctl/source/inc/basidesh.hxx
+===================================================================
+--- basctl/source/inc/basidesh.hxx	(revision 276159)
++++ basctl/source/inc/basidesh.hxx	(revision 276288)
+@@ -49,6 +49,7 @@
+ #include <com/sun/star/io/XInputStreamProvider.hpp>
+ #endif
+ 
++#include <com/sun/star/container/XContainerListener.hpp>
+ 
+ //----------------------------------------------------------------------------
+ 
+@@ -107,6 +108,8 @@ friend bool BasicIDE::RemoveDialog( const ScriptDo
+     BOOL                m_bAppBasicModified;
+     ::basctl::DocumentEventNotifier
+                         m_aNotifier;
++friend class ContainerListenerImpl;
++    ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xLibListener;
+ 
+ #if _SOLAR__PRIVATE
+ 	void				Init();
+Index: basctl/inc/basidesh.hrc
+===================================================================
+--- basctl/inc/basidesh.hrc	(revision 276159)
++++ basctl/inc/basidesh.hrc	(revision 276288)
+@@ -175,6 +175,10 @@
+ #define RID_STR_EXPORTPACKAGE			( RID_BASICIDE_START + 100 )
+ #define RID_STR_EXPORTBASIC				( RID_BASICIDE_START + 101 )
+ #define RID_STR_PACKAGE_BUNDLE			( RID_BASICIDE_START + 102 )
++#define RID_STR_DOCUMENT_OBJECTS        ( RID_BASICIDE_START + 110 )
++#define RID_STR_USERFORMS               ( RID_BASICIDE_START + 111 )
++#define RID_STR_NORMAL_MODULES          ( RID_BASICIDE_START + 112 )
++#define RID_STR_CLASS_MODULES           ( RID_BASICIDE_START + 113 )
+ 
+ #endif	// _SVX_NOIDERESIDS
+ 
+Index: xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+===================================================================
+--- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx	(revision 276159)
++++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx	(revision 276288)
+@@ -31,18 +31,196 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_xmlscript.hxx"
+ #include "imp_share.hxx"
+-
++#include <com/sun/star/form/binding/XBindableValue.hpp>
++#include <com/sun/star/form/binding/XValueBinding.hpp>
++#include <com/sun/star/form/binding/XListEntrySink.hpp>
++#include <com/sun/star/beans/NamedValue.hpp>
++#include <com/sun/star/table/CellAddress.hpp>
++#include <com/sun/star/table/CellRangeAddress.hpp>
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <com/sun/star/beans/XPropertyState.hpp>
++#include <com/sun/star/document/XStorageBasedDocument.hpp>
++#include <com/sun/star/document/XGraphicObjectResolver.hpp>
++#include <com/sun/star/script/XVBACompat.hpp>
+ 
+-
++#include <comphelper/componentcontext.hxx>
++#include <comphelper/processfactory.hxx>
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::uno;
+ using ::rtl::OUString;
+ 
+ namespace xmlscript
+ {
++Reference< xml::input::XElement > MultiPage::startChildElement(
++	sal_Int32 nUid, OUString const & rLocalName,
++	Reference< xml::input::XAttributes > const & xAttributes )
++	throw (xml::sax::SAXException, RuntimeException)
++{
++	// event
++rtl::OUString _label = rtl::OUString::createFromAscii("foo");
++    if (_pImport->isEventElement( nUid, rLocalName ))
++	{
++		return new EventElement(
++            nUid, rLocalName, xAttributes, this, _pImport );
++	}
++	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("title") ))
++	{
++		getStringAttr( &_label,
++                       OUString( RTL_CONSTASCII_USTRINGPARAM("value") ),
++                       xAttributes,
++                       _pImport->XMLNS_DIALOGS_UID );
+ 
++		return new ElementBase(
++            _pImport->XMLNS_DIALOGS_UID,
++            rLocalName, xAttributes, this, _pImport );
++	}
++	else
++	{
++		
++		throw xml::sax::SAXException(
++			OUString( RTL_CONSTASCII_USTRINGPARAM("expected event element!") ),
++			Reference< XInterface >(), Any() );
++	}
++}
++//__________________________________________________________________________________________________
++
++void MultiPage::endElement()
++	throw (xml::sax::SAXException, RuntimeException)
++{
++	ControlImportContext ctx(
++		_pImport, getControlId( _xAttributes ),
++		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) );
++//		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) );
++	Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
++	
++	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
++	if (xStyle.is())
++	{
++		StyleElement * pStyle = static_cast< StyleElement * >( xStyle.get () );
++		pStyle->importTextColorStyle( xControlModel );
++		pStyle->importTextLineColorStyle( xControlModel );
++		pStyle->importFontStyle( xControlModel );
++	}
++	
++	ctx.importDefaults( 0, 0, _xAttributes ); // inherited from BulletinBoardElement
++	ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") ),
++                            OUString( RTL_CONSTASCII_USTRINGPARAM("value") ),
++                            _xAttributes );
++	ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") ),
++                            OUString( RTL_CONSTASCII_USTRINGPARAM("value-max") ),
++                            _xAttributes );
++	ctx.importEvents( _events );
++    // avoid ring-reference:
++    // vector< event elements > holding event elements holding this (via _pParent)
++    _events.clear();
++}
++
++// #FIXME cut'n'pasted from xmloff/source/core/xmlimp.cxx:1251 
++// of course we need to find a common home for this helper
++
++bool IsPackageURL( const ::rtl::OUString& rURL )
++{
++    // Some quick tests: Some may rely on the package structure!
++    sal_Int32 nLen = rURL.getLength();
++    if( (nLen > 0 && '/' == rURL[0]) )
++        // RFC2396 net_path or abs_path
++        return false;
++    else if( nLen > 1 && '.' == rURL[0] )
++    {
++        if( '.' == rURL[1] )
++            // ../: We are never going up one level, so we know
++            // it's not an external URI
++            return false;
++        else if( '/' == rURL[1] )
++            // we are remaining on a level, so it's an package URI
++            return true;
++    }
++
++    // Now check for a RFC2396 schema
++    sal_Int32 nPos = 1;
++    while( nPos < nLen )
++    {
++        switch( rURL[nPos] )
++        {
++            case '/':
++                // a relative path segement
++                return true;
++            case ':':
++                // a schema
++                return false;
++            default:
++                break;
++                // we don't care about any other characters
++        }
++        ++nPos;
++    }
++
++    return true;
++}
++
++void importBindableAndListRangeBits( DialogImport* _pImport, const rtl::OUString sLinkedCell, const rtl::OUString & sCellRange, ControlImportContext& ctx )
++{
++    Reference< lang::XMultiServiceFactory > xFac( _pImport->getDocOwner(), UNO_QUERY );
++    if ( xFac.is() && ( sLinkedCell.getLength() ||  sCellRange.getLength() ) )
++    {
++        // Set up Celllink
++        if ( sLinkedCell.getLength() )
++        {
++            Reference< form::binding::XBindableValue > xBindable( ctx.getControlModel(), uno::UNO_QUERY );
++            Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );
++            if ( xBindable.is() && xConvertor.is() )
++            {
++                table::CellAddress aAddress;
++                xConvertor->setPropertyValue( OUSTR( "PersistentRepresentation" ), uno::makeAny( sLinkedCell ) );
++                xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress;     
++                beans::NamedValue aArg1;
++                aArg1.Name = OUSTR("BoundCell");
++                aArg1.Value <<= aAddress;
++           
++                uno::Sequence< uno::Any > aArgs(1);
++                aArgs[ 0 ]  <<= aArg1;
++           
++                uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( OUSTR("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY );
++                xBindable->setValueBinding( xBinding );
++ 
++            }
++        }
++        // Set up CelllRange
++        if ( sCellRange.getLength() )
++        {
++           Reference< form::binding::XListEntrySink  > xListEntrySink( ctx.getControlModel(), uno::UNO_QUERY );
++           Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );
++           if ( xListEntrySink.is() && xConvertor.is() )
++           {
++               table::CellRangeAddress aAddress;
++               xConvertor->setPropertyValue( OUSTR( "PersistentRepresentation" ), uno::makeAny( sCellRange ) );
++               xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress;     
++               beans::NamedValue aArg1;
++               aArg1.Name = OUSTR("CellRange");
++               aArg1.Value <<= aAddress;
++           
++               uno::Sequence< uno::Any > aArgs(1);
++               aArgs[ 0 ]  <<= aArg1;
++           
++               uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( OUSTR("com.sun.star.table.CellRangeListSource" ), aArgs ), uno::UNO_QUERY );
++               xListEntrySink->setListEntrySource( xSource );
++ 
++           }
++       }
++   }
++}
++
++sal_Bool isVBACompatModeOn( DialogImport* _pImport )
++{
++	sal_Bool bVBAMode = sal_False;
++	Reference< script::XVBACompat > xVBACompat( _pImport->getScriptLibraryContainer(), UNO_QUERY );
++	if( xVBACompat.is() )
++	{
++		bVBAMode = xVBACompat->getVBACompatModeOn();
++	}
++	return bVBAMode;
++}
++
+ // progessmeter
+ //__________________________________________________________________________________________________
+ Reference< xml::input::XElement > ProgressBarElement::startChildElement(
+@@ -122,9 +300,23 @@ Reference< xml::input::XElement > ScrollBarElement
+ void ScrollBarElement::endElement()
+ 	throw (xml::sax::SAXException, RuntimeException)
+ {
++	OUString sService( OUSTR("com.sun.star.awt.UnoControlScrollBarModel") );
++	// we should probably limit this to vba mode also ( leave for now )
++	if ( isVBACompatModeOn( _pImport ) )
++		sService = OUSTR("com.sun.star.form.component.ScrollBar");
++
++    OUString sLinkedCell;
++    try
++    {
++        sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
++    }
++    catch( Exception& /*e*/ )
++    {
++    }
++
+ 	ControlImportContext ctx(
+ 		_pImport, getControlId( _xAttributes ),
+-		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ) );
++		sService );	
+ 	
+ 	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
+ 	if (xStyle.is())
+@@ -168,6 +360,10 @@ void ScrollBarElement::endElement()
+                                OUString( RTL_CONSTASCII_USTRINGPARAM("symbol-color") ),
+                                _xAttributes );
+     
++    // import cell-link
++	OUString sCellRange;
++	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
++
+ 	ctx.importEvents( _events );
+     // avoid ring-reference:
+     // vector< event elements > holding event elements holding this (via _pParent)
+@@ -176,6 +372,88 @@ void ScrollBarElement::endElement()
+ 
+ //##################################################################################################
+ 
++// spinbutton
++//__________________________________________________________________________________________________
++Reference< xml::input::XElement > SpinButtonElement::startChildElement(
++	sal_Int32 nUid, OUString const & rLocalName,
++	Reference< xml::input::XAttributes > const & xAttributes )
++	throw (xml::sax::SAXException, RuntimeException)
++{
++	// event
++    if (_pImport->isEventElement( nUid, rLocalName ))
++	{
++		return new EventElement( nUid, rLocalName, xAttributes, this, _pImport );
++	}
++	else
++	{
++		throw xml::sax::SAXException(
++			OUString( RTL_CONSTASCII_USTRINGPARAM("expected event element!") ),
++			Reference< XInterface >(), Any() );
++	}
++}
++//__________________________________________________________________________________________________
++void SpinButtonElement::endElement()
++	throw (xml::sax::SAXException, RuntimeException)
++{
++    OUString sLinkedCell;
++    try
++    {
++        sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
++    }
++    catch( Exception& /*e*/ )
++    {
++    }
++
++	ControlImportContext ctx(
++		_pImport, getControlId( _xAttributes ),
++		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.SpinButton") ) );
++	
++	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
++	if (xStyle.is())
++	{
++		StyleElement * pStyle = static_cast< StyleElement * >( xStyle.get () );
++		Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
++        pStyle->importBackgroundColorStyle( xControlModel );
++		pStyle->importBorderStyle( xControlModel );
++	}
++	
++	ctx.importDefaults( _nBasePosX, _nBasePosY, _xAttributes );
++	ctx.importOrientationProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Orientation") ),
++                                   OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
++                                   _xAttributes );
++	ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinIncrement") ),
++                            OUString( RTL_CONSTASCII_USTRINGPARAM("increment") ),
++                            _xAttributes );
++	ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValue") ),
++                            OUString( RTL_CONSTASCII_USTRINGPARAM("curval") ),
++                            _xAttributes );
++	ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") ),
++                            OUString( RTL_CONSTASCII_USTRINGPARAM("maxval") ),
++                            _xAttributes );
++	ctx.importLongProperty( OUSTR("SpinValueMin"), OUSTR("minval"),
++                            _xAttributes );
++	ctx.importLongProperty( OUSTR("Repeat"), OUSTR("repeat"),
++                            _xAttributes );
++	ctx.importLongProperty( OUSTR("RepeatDelay"), OUSTR("repeat-delay"),
++                            _xAttributes );
++    ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
++                               OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
++                               _xAttributes );
++    ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ),
++                               OUString( RTL_CONSTASCII_USTRINGPARAM("symbol-color") ),
++                               _xAttributes );
++    // import cell-link
++	OUString sCellRange;
++	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
++    
++	ctx.importEvents( _events );
++    // avoid ring-reference:
++    // vector< event elements > holding event elements holding this (via _pParent)
++    _events.clear();
++}
++
++//##################################################################################################
++
+ // fixedline
+ //__________________________________________________________________________________________________
+ Reference< xml::input::XElement > FixedLineElement::startChildElement(
+@@ -1003,9 +1281,37 @@ void ImageControlElement::endElement()
+ 	ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
+ 							   OUString( RTL_CONSTASCII_USTRINGPARAM("scale-image") ),
+ 							   _xAttributes );
+-	ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
+-							  OUString( RTL_CONSTASCII_USTRINGPARAM("src") ),
+-							  _xAttributes );
++    rtl::OUString sURL = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "src" ) );
++    Reference< document::XStorageBasedDocument > xDocStorage( _pImport->getDocOwner(), UNO_QUERY );
++
++    if ( xDocStorage.is() && IsPackageURL( sURL ) )
++    {
++        uno::Sequence< Any > aArgs( 1 );
++        aArgs[ 0 ] <<= xDocStorage->getDocumentStorage();
++
++        ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
++        uno::Reference< document::XGraphicObjectResolver > xGraphicResolver;
++        aContext.createComponentWithArguments( OUSTR( "com.sun.star.comp.Svx.GraphicImportHelper" ), aArgs, xGraphicResolver );
++
++        if ( xGraphicResolver.is() )
++        {
++            rtl::OUString aTmp( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
++            aTmp += sURL;
++            sURL = xGraphicResolver->resolveGraphicObjectURL( aTmp );
++            Reference< beans::XPropertySet > xProps( ctx.getControlModel(), UNO_QUERY );
++            // we must set the url while the graphic object ( held by the resolver is in scope )
++            if ( xProps.is() )
++                xProps->setPropertyValue( OUSTR("ImageURL"), makeAny( sURL ) );
++        }
++    }
++    
++    else if ( sURL.getLength() > 0 )
++    {
++        Reference< beans::XPropertySet > xProps( ctx.getControlModel(), UNO_QUERY );
++        if ( xProps.is() )
++            xProps->setPropertyValue( OUSTR("ImageURL"), makeAny( sURL ) );
++    }
++
+     ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
+                                OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
+                                _xAttributes );
+@@ -1338,10 +1644,24 @@ void TitledBoxElement::endElement()
+ 		Reference< xml::input::XElement > xRadio( _radios[ nPos ] );
+ 		Reference< xml::input::XAttributes > xAttributes(
+             xRadio->getAttributes() );
++		OUString sLinkedCell;
++		OUString sCellRange;
++		OUString sService( OUSTR("com.sun.star.awt.UnoControlRadioButtonModel") );
++		try
++		{
++			sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
++			// we should probably limit this to vba mode also ( leave for now )
++			if ( isVBACompatModeOn( _pImport ) )
++				sService = OUSTR("com.sun.star.form.component.RadioButton");
++		}
++		catch( Exception& /*e*/ )
++		{
++		}
+ 		
++		
+ 		ControlImportContext ctx(
+ 			_pImport, getControlId( xAttributes ),
+-			OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) );
++			sService );
+ 		Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
+ 		
+ 		Reference< xml::input::XElement > xStyle( getStyle( xAttributes ) );
+@@ -1377,6 +1697,9 @@ void TitledBoxElement::endElement()
+         ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
+                                    OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ),
+                                    xAttributes );
++        ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
++                                  OUString( RTL_CONSTASCII_USTRINGPARAM("group-name") ),
++                                  xAttributes );
+ 		
+ 		sal_Int16 nVal = 0;
+ 		sal_Bool bChecked = sal_False;
+@@ -1390,7 +1713,7 @@ void TitledBoxElement::endElement()
+ 		}
+ 		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ),
+ 										 makeAny( nVal ) );
+-        
++	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
+         ::std::vector< Reference< xml::input::XElement > > * radioEvents =
+             static_cast< RadioElement * >( xRadio.get() )->getEvents();
+ 		ctx.importEvents( *radioEvents );
+@@ -1466,10 +1789,23 @@ void RadioGroupElement::endElement()
+ 		Reference< xml::input::XElement > xRadio( _radios[ nPos ] );
+ 		Reference< xml::input::XAttributes > xAttributes(
+             xRadio->getAttributes() );
++		OUString sLinkedCell;
++		OUString sCellRange;
++		OUString sService( OUSTR("com.sun.star.awt.UnoControlRadioButtonModel") );
++		try
++		{
++			sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
++			// we should probably limit this to vba mode also ( leave for now )
++			if ( isVBACompatModeOn( _pImport ) )
++				sService = OUSTR("com.sun.star.form.component.RadioButton");
++		}
++		catch( Exception& /*e*/ )
++		{
++		}
+ 		
+ 		ControlImportContext ctx(
+ 			_pImport, getControlId( xAttributes ),
+-			OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) );
++			sService );
+ 		Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
+ 		
+ 		Reference< xml::input::XElement > xStyle( getStyle( xAttributes ) );
+@@ -1505,6 +1841,9 @@ void RadioGroupElement::endElement()
+         ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
+                                    OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ),
+                                    xAttributes );
++        ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
++                                  OUString( RTL_CONSTASCII_USTRINGPARAM("group-name") ),
++                                  xAttributes );
+ 		sal_Int16 nVal = 0;
+ 		sal_Bool bChecked = sal_False;
+ 		if (getBoolAttr( &bChecked,
+@@ -1518,6 +1857,7 @@ void RadioGroupElement::endElement()
+ 		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ),
+ 										 makeAny( nVal ) );
+ 		
++	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
+         ::std::vector< Reference< xml::input::XElement > > * radioEvents =
+             static_cast< RadioElement * >( xRadio.get() )->getEvents();
+ 		ctx.importEvents( *radioEvents );
+@@ -1638,9 +1978,26 @@ Reference< xml::input::XElement > MenuListElement:
+ void MenuListElement::endElement()
+ 	throw (xml::sax::SAXException, RuntimeException)
+ {
++        OUString sLinkedCell;
++        OUString sCellRange;
++        OUString sListBoxService( OUSTR("com.sun.star.awt.UnoControlListBoxModel") );
++
++        // we should probably limit this to vba mode also ( leave for now )
++        if ( isVBACompatModeOn( _pImport ) )
++            sListBoxService = OUSTR("com.sun.star.form.component.ListBox");
++
++        try
++        {
++            sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
++            sCellRange = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "source-cell-range" ) );
++        }
++        catch( Exception& /*e*/ )
++        {
++        }
+ 	ControlImportContext ctx(
+ 		_pImport, getControlId( _xAttributes ),
+-		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) );
++		//OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) );
++		sListBoxService );
+ 	Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
+ 	
+ 	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
+@@ -1673,12 +2030,15 @@ void MenuListElement::endElement()
+ 	ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
+                              OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
+                              _xAttributes );
+-	
++        // import cell-link and cell source range
++	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
+ 	if (_popup.is())
+ 	{
+ 		MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() );
++        if (  !sCellRange.getLength() )
+ 		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ),
+ 										 makeAny( p->getItemValues() ) );
++        if (  !sLinkedCell.getLength() )
+ 		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") ),
+ 										 makeAny( p->getSelectedItems() ) );
+ 	}
+@@ -1725,9 +2085,26 @@ Reference< xml::input::XElement > ComboBoxElement:
+ void ComboBoxElement::endElement()
+ 	throw (xml::sax::SAXException, RuntimeException)
+ {
++        OUString sService( OUSTR("com.sun.star.awt.UnoControlComboBoxModel") );
++
++        // we should probably limit this to vba mode also ( leave for now )
++        if ( isVBACompatModeOn( _pImport ) )
++            sService = OUSTR("com.sun.star.form.component.ComboBox");
++
++        OUString sLinkedCell;
++        OUString sCellRange;
++        try
++        {
++            sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
++            sCellRange = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "source-cell-range" ) );
++        }
++        catch( Exception& /*e*/ )
++        {
++        }
++
+ 	ControlImportContext ctx(
+ 		_pImport, getControlId( _xAttributes ),
+-		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ) );
++		sService );
+ 	Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
+ 	
+ 	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
+@@ -1769,8 +2146,10 @@ void ComboBoxElement::endElement()
+ 	ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
+                              OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
+                              _xAttributes );
++	// import cell-link and cell source range
++	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
+ 	
+-	if (_popup.is())
++	if (_popup.is() && !sCellRange.getLength() )
+ 	{
+ 		MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() );
+ 		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ),
+@@ -2096,11 +2475,20 @@ Reference< xml::input::XElement > BulletinBoardEle
+ 	{
+ 		return new ScrollBarElement( rLocalName, xAttributes, this, _pImport );
+ 	}
++	// spinbutton
++	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ) && isVBACompatModeOn( _pImport ) )
++	{
++		return new SpinButtonElement( rLocalName, xAttributes, this, _pImport );
++	}
+ 	// progressmeter
+ 	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("progressmeter") ))
+ 	{
+ 		return new ProgressBarElement( rLocalName, xAttributes, this, _pImport );
+ 	}
++	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("multipage") ))
++	{
++		return new MultiPage( rLocalName, xAttributes, this, _pImport );
++	}
+ 	// bulletinboard
+ 	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
+ 	{
+Index: xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+===================================================================
+--- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx	(revision 276159)
++++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx	(revision 276288)
+@@ -60,9 +60,13 @@
+ #include <com/sun/star/script/ScriptEventDescriptor.hpp>
+ 
+ #include <com/sun/star/view/SelectionType.hpp>
++#include <com/sun/star/document/XStorageBasedDocument.hpp>
++#include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
++#include <com/sun/star/script/XVBACompat.hpp>
+ 
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::uno;
++using namespace ::com::sun::star::frame;
+ using ::rtl::OUString;
+ 
+ namespace xmlscript
+@@ -1891,18 +1895,44 @@ Reference< xml::input::XElement > DialogImport::ge
+     }
+     return 0;
+ }
++//__________________________________________________________________________________________________
++Reference< script::XLibraryContainer > DialogImport::getScriptLibraryContainer()
++{
++	if( !_xScriptLibraryContainer.is() )
++	{
++		try
++		{
++			Reference< document::XStorageBasedDocument > xStorageDoc( _xDoc, UNO_QUERY );
++			if( xStorageDoc.is() )
++				_xScriptLibraryContainer.set(
++									script::DocumentScriptLibraryContainer::create( comphelper_getProcessComponentContext(), xStorageDoc ), 
++									UNO_QUERY );
++		}
++		catch( const Exception& )
++		{
++		}
++	}
+ 
++	return _xScriptLibraryContainer;
++}
++
+ //##################################################################################################
+ 
+ //==================================================================================================
+ Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel(
+     Reference< container::XNameContainer > const & xDialogModel,
+-    Reference< XComponentContext > const & xContext )
++    Reference< XComponentContext > const & xContext,
++    Reference< XModel > const & xDocument )
+     SAL_THROW( (Exception) )
+ {
++    DialogImport* pImport = new DialogImport( xContext, xDialogModel, xDocument );
++    uno::Reference< script::XVBACompat > xVBAModeSource( pImport->getScriptLibraryContainer(), uno::UNO_QUERY );
++    
++    uno::Reference< beans::XPropertySet > xDlgProps( xDialogModel, uno::UNO_QUERY );
++    if ( xVBAModeSource.is() && xDlgProps.is() && xVBAModeSource->getVBACompatModeOn() )
++        xDlgProps->setPropertyValue( OUSTR("VBAForm"), uno::makeAny( sal_True ) );
+     return ::xmlscript::createDocumentHandler(
+-        static_cast< xml::input::XRoot * >(
+-            new DialogImport( xContext, xDialogModel ) ) );
++        static_cast< xml::input::XRoot * >( pImport ) );
+ }
+ 
+ }
+Index: xmlscript/source/xmldlg_imexp/exp_share.hxx
+===================================================================
+--- xmlscript/source/xmldlg_imexp/exp_share.hxx	(revision 276159)
++++ xmlscript/source/xmldlg_imexp/exp_share.hxx	(revision 276288)
+@@ -174,15 +174,17 @@ class ElementDescriptor
+     //
+     void readDialogModel( StyleBag * all_styles )
+         SAL_THROW( (css::uno::Exception) );
++    void readMultiPageModel( StyleBag * all_styles )
++        SAL_THROW( (css::uno::Exception) );
+     void readButtonModel( StyleBag * all_styles )
+         SAL_THROW( (css::uno::Exception) );
+     void readEditModel( StyleBag * all_styles )
+         SAL_THROW( (css::uno::Exception) );
+     void readCheckBoxModel( StyleBag * all_styles )
+         SAL_THROW( (css::uno::Exception) );
+-    void readRadioButtonModel( StyleBag * all_styles )
++    void readRadioButtonModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
+         SAL_THROW( (css::uno::Exception) );
+-    void readComboBoxModel( StyleBag * all_styles )
++    void readComboBoxModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
+         SAL_THROW( (css::uno::Exception) );
+     void readCurrencyFieldModel( StyleBag * all_styles )
+         SAL_THROW( (css::uno::Exception) );
+@@ -196,9 +198,9 @@ class ElementDescriptor
+         SAL_THROW( (css::uno::Exception) );
+     void readGroupBoxModel( StyleBag * all_styles )
+         SAL_THROW( (css::uno::Exception) );
+-    void readImageControlModel( StyleBag * all_styles )
++    void readImageControlModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument  )
+         SAL_THROW( (css::uno::Exception) );
+-    void readListBoxModel( StyleBag * all_styles )
++    void readListBoxModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
+         SAL_THROW( (css::uno::Exception) );
+     void readNumericFieldModel( StyleBag * all_styles )
+         SAL_THROW( (css::uno::Exception) );
+@@ -212,8 +214,10 @@ class ElementDescriptor
+         SAL_THROW( (css::uno::Exception) );
+     void readProgressBarModel( StyleBag * all_styles )
+         SAL_THROW( (css::uno::Exception) );
+-    void readScrollBarModel( StyleBag * all_styles )
++    void readScrollBarModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
+         SAL_THROW( (css::uno::Exception) );
++    void readSpinButtonModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
++        SAL_THROW( (css::uno::Exception) );
+ 	void readFixedHyperLinkModel( StyleBag * all_styles )
+         SAL_THROW( (css::uno::Exception) );
+ };
+Index: xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+===================================================================
+--- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx	(revision 276159)
++++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx	(revision 276288)
+@@ -32,7 +32,16 @@
+ #include "precompiled_xmlscript.hxx"
+ #include "exp_share.hxx"
+ 
++#include <com/sun/star/form/binding/XListEntrySink.hpp>
++#include <com/sun/star/form/binding/XBindableValue.hpp>
++#include <com/sun/star/form/binding/XValueBinding.hpp>
++#include <com/sun/star/table/CellAddress.hpp>
++#include <com/sun/star/table/CellRangeAddress.hpp>
+ #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
++#include <com/sun/star/document/XStorageBasedDocument.hpp>
++#include <com/sun/star/document/XGraphicObjectResolver.hpp>
++#include <comphelper/componentcontext.hxx>
++#include <comphelper/processfactory.hxx>
+ 
+ 
+ using namespace ::com::sun::star;
+@@ -42,6 +51,66 @@ using ::rtl::OUString;
+ namespace xmlscript
+ {
+ 
++void lclExportBindableAndListSourceBits( Reference< frame::XModel > const & xDocument, const Reference< beans::XPropertySet >& _xProps, ElementDescriptor& rModel )
++{
++    Reference< lang::XMultiServiceFactory > xFac;
++    if ( xDocument.is() )
++        xFac.set( xDocument, uno::UNO_QUERY );
++
++    Reference< form::binding::XBindableValue > xBinding( _xProps, UNO_QUERY );
++
++    if ( xFac.is() && xBinding.is() )
++    {
++        try
++        {
++            Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );  
++        Reference< beans::XPropertySet > xBindable( xBinding->getValueBinding(), UNO_QUERY );
++            if ( xBindable.is() )
++            {
++                table::CellAddress aAddress; 
++                xBindable->getPropertyValue( OUSTR("BoundCell") ) >>= aAddress; 
++                xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) );
++                rtl::OUString sAddress;
++                xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
++                if ( sAddress.getLength() > 0 )
++                    rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell"), sAddress );
++                
++                OSL_TRACE( "*** Bindable value %s", rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() ); 
++               
++            }
++        }
++        catch( uno::Exception& )
++        {
++        }
++    }
++    Reference< form::binding::XListEntrySink > xEntrySink( _xProps, UNO_QUERY );
++    if ( xEntrySink.is() )
++    {
++        Reference< beans::XPropertySet > xListSource( xEntrySink->getListEntrySource(), UNO_QUERY );
++        if ( xListSource.is() )
++        {
++            try
++            {
++                Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );  
++
++                table::CellRangeAddress aAddress; 
++                xListSource->getPropertyValue( OUSTR( "CellRange" ) ) >>= aAddress;
++
++                rtl::OUString sAddress;
++                xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) );
++                xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
++                OSL_TRACE("**** cell range source list %s",
++                    rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() ); 
++                if ( sAddress.getLength() > 0 );
++                    rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":source-cell-range"), sAddress );
++            }
++            catch( uno::Exception& )
++            {
++            }
++        }
++    }
++
++}
+ static inline bool readBorderProps(
+     ElementDescriptor * element, Style & style )
+ {
+@@ -68,6 +137,42 @@ static inline bool readFontProps( ElementDescripto
+ }
+ 
+ //__________________________________________________________________________________________________
++void ElementDescriptor::readMultiPageModel( StyleBag * all_styles )
++{
++    // collect styles
++    Style aStyle( 0x2 | 0x8 | 0x20 );
++    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
++        aStyle._set |= 0x2;
++    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
++        aStyle._set |= 0x20;
++    if (readFontProps( this, aStyle ))
++        aStyle._set |= 0x8;
++    if (aStyle._set)
++    {
++        addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
++                      all_styles->getStyleId( aStyle ) );
++    }
++
++    // collect elements
++    readDefaults();
++    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") ),
++                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );
++    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") ),
++                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value-max") ) );
++
++    OUString aTitle;
++    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ) ) >>= aTitle)
++    {
++        ElementDescriptor * title = new ElementDescriptor(
++            _xProps, _xPropState,
++            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":title") ) );
++        title->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ),
++                             aTitle );
++        addSubElement( title );
++    }
++
++    readEvents();
++}
+ void ElementDescriptor::readButtonModel( StyleBag * all_styles )
+     SAL_THROW( (Exception) )
+ {
+@@ -209,7 +314,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBa
+     readEvents();
+ }
+ //__________________________________________________________________________________________________
+-void ElementDescriptor::readComboBoxModel( StyleBag * all_styles )
++void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument )
+     SAL_THROW( (Exception) )
+ {
+     // collect styles
+@@ -250,7 +355,8 @@ void ElementDescriptor::readCheckBoxModel( StyleBa
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":maxlength") ) );
+     readShortAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("LineCount") ),
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) );
+-
++    // Cell Range, Ref Cell etc.
++    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
+     // string item list
+     Sequence< OUString > itemValues;
+     if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) &&
+@@ -276,7 +382,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBa
+     readEvents();
+ }
+ //__________________________________________________________________________________________________
+-void ElementDescriptor::readListBoxModel( StyleBag * all_styles )
++void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
+     SAL_THROW( (Exception) )
+ {
+     // collect styles
+@@ -311,7 +417,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBa
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) );
+     readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
+-
++    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
+     // string item list
+     Sequence< OUString > itemValues;
+     if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) &&
+@@ -351,7 +457,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBa
+     readEvents();
+ }
+ //__________________________________________________________________________________________________
+-void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles )
++void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
+     SAL_THROW( (Exception) )
+ {
+     // collect styles
+@@ -388,6 +494,8 @@ void ElementDescriptor::readCheckBoxModel( StyleBa
+                            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) );
+     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
+                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) );
++    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
++                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":group-name") ) );
+ 
+     sal_Int16 nState = 0;
+     if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ) ) >>= nState)
+@@ -407,6 +515,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBa
+             break;
+         }
+     }
++    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
+     readEvents();
+ }
+ //__________________________________________________________________________________________________
+@@ -579,7 +688,7 @@ void ElementDescriptor::readEditModel( StyleBag *
+     readEvents();
+ }
+ //__________________________________________________________________________________________________
+-void ElementDescriptor::readImageControlModel( StyleBag * all_styles )
++void ElementDescriptor::readImageControlModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
+     SAL_THROW( (Exception) )
+ {
+     // collect styles
+@@ -598,8 +707,31 @@ void ElementDescriptor::readEditModel( StyleBag *
+     readDefaults();
+     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
+                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scale-image") ) );
+-    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
+-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":src") ) );
++    rtl::OUString sURL;
++    _xProps->getPropertyValue( OUSTR("ImageURL") ) >>= sURL;
++    
++    if ( sURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:"  ) ) ) == 0 )
++    {
++        Reference< document::XStorageBasedDocument > xDocStorage( xDocument, UNO_QUERY );
++
++        if ( xDocStorage.is() )
++        {
++            uno::Sequence< Any > aArgs( 1 );
++            aArgs[ 0 ] <<= xDocStorage->getDocumentStorage();
++
++            ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
++            uno::Reference< document::XGraphicObjectResolver > xGraphicResolver;
++            aContext.createComponentWithArguments( OUSTR( "com.sun.star.comp.Svx.GraphicExportHelper" ), aArgs, xGraphicResolver );
++            if ( xGraphicResolver.is() )
++            {
++                sURL = xGraphicResolver->resolveGraphicObjectURL( sURL );
++            }
++        }     
++    }
++    if ( sURL.getLength() > 0 )
++    {
++        addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":src"), sURL );
++    }
+     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
+                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
+     readEvents();
+@@ -1074,7 +1206,7 @@ void ElementDescriptor::readProgressBarModel( Styl
+     readEvents();
+ }
+ //__________________________________________________________________________________________________
+-void ElementDescriptor::readScrollBarModel( StyleBag * all_styles )
++void ElementDescriptor::readScrollBarModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
+     SAL_THROW( (Exception) )
+ {
+     // collect styles
+@@ -1112,9 +1244,50 @@ void ElementDescriptor::readProgressBarModel( Styl
+                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":live-scroll") ) );
+     readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ),
+                      OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":symbol-color") ) );
++    // Cell Range, Ref Cell etc.
++    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
+     readEvents();
+ }
+ //__________________________________________________________________________________________________
++void ElementDescriptor::readSpinButtonModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
++    SAL_THROW( (Exception) )
++{
++    // collect styles
++    Style aStyle( 0x1 | 0x4 );
++    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
++        aStyle._set |= 0x1;
++    if (readBorderProps( this, aStyle ))
++        aStyle._set |= 0x4;
++    if (aStyle._set)
++    {
++        addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
++                      all_styles->getStyleId( aStyle ) );
++    }
++    
++    // collect elements
++    readDefaults();
++    readOrientationAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Orientation") ),
++                         OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );  
++    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinIncrement") ),
++                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":increment") ) );
++    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValue") ),
++                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":curval") ) );
++    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") ),
++                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":maxval") ) );
++    readLongAttr( OUSTR("SpinValueMin"),
++                  OUSTR(XMLNS_DIALOGS_PREFIX ":minval") );
++    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Repeat") ),
++                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":repeat") ) );
++    readLongAttr( OUSTR("RepeatDelay"), OUSTR(XMLNS_DIALOGS_PREFIX ":repeat-delay") );
++    readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
++                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
++    readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ),
++                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":symbol-color") ) );
++    // Cell Range, Ref Cell etc.
++    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
++    readEvents();
++}
++//__________________________________________________________________________________________________
+ void ElementDescriptor::readDialogModel( StyleBag * all_styles )
+     SAL_THROW( (Exception) )
+ {
+Index: xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+===================================================================
+--- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx	(revision 276159)
++++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx	(revision 276288)
+@@ -1328,7 +1328,8 @@ void StyleBag::dump( Reference< xml::sax::XExtende
+ //==================================================================================================
+ void SAL_CALL exportDialogModel(
+     Reference< xml::sax::XExtendedDocumentHandler > const & xOut,
+-    Reference< container::XNameContainer > const & xDialogModel )
++    Reference< container::XNameContainer > const & xDialogModel,
++    Reference< frame::XModel > const & xDocument )
+     SAL_THROW( (Exception) )
+ {
+     StyleBag all_styles;
+@@ -1376,7 +1377,7 @@ void SAL_CALL exportDialogModel(
+                 xProps, xPropState,
+                 OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":radio") ) );
+             xElem = static_cast< xml::sax::XAttributeList * >( pElem );
+-            pElem->readRadioButtonModel( &all_styles );
++            pElem->readRadioButtonModel( &all_styles, xDocument  );
+             pRadioGroup->addSubElement( xElem );
+         }
+         else // no radio
+@@ -1405,7 +1406,7 @@ void SAL_CALL exportDialogModel(
+                     xProps, xPropState,
+                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":combobox") ) );
+                 xElem = static_cast< xml::sax::XAttributeList * >( pElem );
+-                pElem->readComboBoxModel( &all_styles );
++                pElem->readComboBoxModel( &all_styles, xDocument );
+             }
+             else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ) )
+             {
+@@ -1413,7 +1414,7 @@ void SAL_CALL exportDialogModel(
+                     xProps, xPropState,
+                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menulist") ) );
+                 xElem = static_cast< xml::sax::XAttributeList * >( pElem );
+-                pElem->readListBoxModel( &all_styles );
++                pElem->readListBoxModel( &all_styles, xDocument );
+             }
+             else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
+             {
+@@ -1423,6 +1424,14 @@ void SAL_CALL exportDialogModel(
+                 xElem = static_cast< xml::sax::XAttributeList * >( pElem );
+                 pElem->readGroupBoxModel( &all_styles );
+             }
++            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ) )
++            {
++                pElem = new ElementDescriptor(
++                    xProps, xPropState,
++                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multipage") ) );
++                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
++                pElem->readMultiPageModel( &all_styles );
++            }
+             else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) ) )
+             {
+                 pElem = new ElementDescriptor(
+@@ -1454,7 +1463,7 @@ void SAL_CALL exportDialogModel(
+                     xProps, xPropState,
+                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":img") ) );
+                 xElem = static_cast< xml::sax::XAttributeList * >( pElem );
+-                pElem->readImageControlModel( &all_styles );
++                pElem->readImageControlModel( &all_styles, xDocument );
+             }
+             else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFileControlModel") ) ) )
+             {
+@@ -1534,8 +1543,16 @@ void SAL_CALL exportDialogModel(
+                     xProps, xPropState,
+                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scrollbar") ) );
+                 xElem = static_cast< xml::sax::XAttributeList * >( pElem );
+-                pElem->readScrollBarModel( &all_styles );
++                pElem->readScrollBarModel( &all_styles, xDocument );
+             }
++            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ) ) )
++            {
++                pElem = new ElementDescriptor(
++                    xProps, xPropState,
++                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":spinbutton") ) );
++                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
++                pElem->readSpinButtonModel( &all_styles, xDocument );
++            }
+             else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
+             {
+                 pElem = new ElementDescriptor(
+Index: xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+===================================================================
+--- xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx	(revision 276159)
++++ xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx	(revision 276288)
+@@ -44,6 +44,7 @@
+ using namespace ::rtl;
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::uno;
++using namespace ::com::sun::star::frame;
+ 
+ namespace xmlscript
+ {
+@@ -73,7 +74,8 @@ Reference< io::XInputStream > InputStreamProvider:
+ //==================================================================================================
+ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
+     Reference< container::XNameContainer > const & xDialogModel,
+-    Reference< XComponentContext > const & xContext )
++    Reference< XComponentContext > const & xContext,
++    Reference< XModel > const & xDocument )
+ 	SAL_THROW( (Exception) )
+ {
+ 	Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() );
+@@ -98,7 +100,7 @@ Reference< io::XInputStreamProvider > SAL_CALL exp
+ 	
+ 	Reference< io::XActiveDataSource > xSource( xHandler, UNO_QUERY );
+ 	xSource->setOutputStream( createOutputStream( &aBytes ) );
+-	exportDialogModel( xHandler, xDialogModel );
++	exportDialogModel( xHandler, xDialogModel, xDocument );
+ 	
+ 	return new InputStreamProvider( aBytes );
+ }
+@@ -107,7 +109,8 @@ Reference< io::XInputStreamProvider > SAL_CALL exp
+ void SAL_CALL importDialogModel(
+ 	Reference< io::XInputStream > xInput,
+ 	Reference< container::XNameContainer > const & xDialogModel,
+-    Reference< XComponentContext > const & xContext )
++    Reference< XComponentContext > const & xContext,
++    Reference< XModel > const & xDocument )
+ 	SAL_THROW( (Exception) )
+ {
+ 	Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() );
+@@ -129,7 +132,7 @@ void SAL_CALL importDialogModel(
+ 	}
+ 	
+ 	// error handler, entity resolver omitted for this helper function
+-	xParser->setDocumentHandler( importDialogModel( xDialogModel, xContext ) );
++	xParser->setDocumentHandler( importDialogModel( xDialogModel, xContext, xDocument ) );
+ 	
+ 	xml::sax::InputSource source;
+ 	source.aInputStream = xInput;
+Index: xmlscript/source/xmldlg_imexp/imp_share.hxx
+===================================================================
+--- xmlscript/source/xmldlg_imexp/imp_share.hxx	(revision 276159)
++++ xmlscript/source/xmldlg_imexp/imp_share.hxx	(revision 276288)
+@@ -45,6 +45,7 @@
+ #include <com/sun/star/awt/FontEmphasisMark.hpp>
+ #include <com/sun/star/awt/FontRelief.hpp>
+ #include <com/sun/star/xml/input/XRoot.hpp>
++#include <com/sun/star/script/XLibraryContainer.hpp>
+ #include <vector>
+ 
+ 
+@@ -131,6 +132,8 @@ struct DialogImport
+     
+     css::uno::Reference< css::container::XNameContainer > _xDialogModel;
+     css::uno::Reference< css::lang::XMultiServiceFactory > _xDialogModelFactory;
++    css::uno::Reference< css::frame::XModel > _xDoc;
++    css::uno::Reference< css::script::XLibraryContainer > _xScriptLibraryContainer;
+ 
+     sal_Int32 XMLNS_DIALOGS_UID, XMLNS_SCRIPT_UID;
+     
+@@ -164,16 +167,20 @@ struct DialogImport
+     inline DialogImport(
+         css::uno::Reference<css::uno::XComponentContext> const & xContext,
+         css::uno::Reference<css::container::XNameContainer>
+-        const & xDialogModel )
++        const & xDialogModel,
++        css::uno::Reference<css::frame::XModel> const & xDoc )
+         SAL_THROW( () )
+         : _xContext( xContext )
+         , _xDialogModel( xDialogModel )
+-        , _xDialogModelFactory( xDialogModel, css::uno::UNO_QUERY_THROW )
++        , _xDialogModelFactory( xDialogModel, css::uno::UNO_QUERY_THROW ), _xDoc( xDoc )
+         { OSL_ASSERT( _xDialogModel.is() && _xDialogModelFactory.is() &&
+                       _xContext.is() ); }
+     virtual ~DialogImport()
+         SAL_THROW( () );
+     
++    inline css::uno::Reference< css::frame::XModel > getDocOwner() { return _xDoc; }
++
++	css::uno::Reference< css::script::XLibraryContainer > getScriptLibraryContainer();
+     // XRoot
+     virtual void SAL_CALL startDocument(
+         css::uno::Reference< css::xml::input::XNamespaceMapping >
+@@ -999,6 +1006,49 @@ class ScrollBarElement
+ };
+ 
+ //==============================================================================
++class SpinButtonElement
++    : public ControlElement
++{
++public:
++    virtual css::uno::Reference< css::xml::input::XElement >
++    SAL_CALL startChildElement(
++        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
++        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
++        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
++    virtual void SAL_CALL endElement()
++        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
++    
++    inline SpinButtonElement(
++        ::rtl::OUString const & rLocalName,
++        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
++        ElementBase * pParent, DialogImport * pImport )
++        SAL_THROW( () )
++        : ControlElement( rLocalName, xAttributes, pParent, pImport )
++        {}
++};
++
++//==============================================================================
++class MultiPage
++    : public ControlElement
++{
++public:
++    virtual css::uno::Reference< css::xml::input::XElement >
++    SAL_CALL startChildElement(
++        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
++        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
++        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
++    virtual void SAL_CALL endElement()
++        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
++    
++    inline MultiPage(
++        ::rtl::OUString const & rLocalName,
++        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
++        ElementBase * pParent, DialogImport * pImport )
++        SAL_THROW( () )
++        : ControlElement( rLocalName, xAttributes, pParent, pImport )
++        {}
++};
++
+ class ProgressBarElement
+     : public ControlElement
+ {
+Index: xmlscript/inc/xmlscript/xmldlg_imexp.hxx
+===================================================================
+--- xmlscript/inc/xmlscript/xmldlg_imexp.hxx	(revision 276159)
++++ xmlscript/inc/xmlscript/xmldlg_imexp.hxx	(revision 276288)
+@@ -30,6 +30,8 @@
+ #ifndef _XMLSCRIPT_XMLDLG_IMEXP_HXX_
+ #define _XMLSCRIPT_XMLDLG_IMEXP_HXX_
+ 
++#include <com/sun/star/frame/XModel.hpp>
++
+ #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HXX_
+ #include <com/sun/star/container/XNameContainer.hpp>
+ #endif
+@@ -54,7 +56,9 @@ void SAL_CALL exportDialogModel(
+ 	::com::sun::star::uno::Reference<
+     ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
+ 	::com::sun::star::uno::Reference<
+-    ::com::sun::star::container::XNameContainer > const & xDialogModel )
++    ::com::sun::star::container::XNameContainer > const & xDialogModel, 
++	::com::sun::star::uno::Reference<
++    ::com::sun::star::frame::XModel > const & xDocument )
+ 	SAL_THROW( (::com::sun::star::uno::Exception) );
+ 
+ //==============================================================================
+@@ -63,7 +67,9 @@ SAL_CALL importDialogModel(
+ 	::com::sun::star::uno::Reference<
+     ::com::sun::star::container::XNameContainer > const & xDialogModel,
+     ::com::sun::star::uno::Reference<
+-    ::com::sun::star::uno::XComponentContext > const & xContext )
++    ::com::sun::star::uno::XComponentContext > const & xContext,
++    ::com::sun::star::uno::Reference<
++    ::com::sun::star::frame::XModel > const & xDocument )
+ 	SAL_THROW( (::com::sun::star::uno::Exception) );
+ 
+ // additional functions for convenience
+@@ -74,7 +80,9 @@ SAL_CALL exportDialogModel(
+ 	::com::sun::star::uno::Reference<
+     ::com::sun::star::container::XNameContainer > const & xDialogModel,
+     ::com::sun::star::uno::Reference<
+-    ::com::sun::star::uno::XComponentContext > const & xContext )
++    ::com::sun::star::uno::XComponentContext > const & xContext,
++    ::com::sun::star::uno::Reference<
++    ::com::sun::star::frame::XModel > const & xDocument )
+ 	SAL_THROW( (::com::sun::star::uno::Exception) );
+ 
+ //==============================================================================
+@@ -84,7 +92,9 @@ void SAL_CALL importDialogModel(
+ 	::com::sun::star::uno::Reference<
+     ::com::sun::star::container::XNameContainer > const & xDialogModel,
+     ::com::sun::star::uno::Reference<
+-    ::com::sun::star::uno::XComponentContext > const & xContext )
++    ::com::sun::star::uno::XComponentContext > const & xContext,
++    ::com::sun::star::uno::Reference<
++    ::com::sun::star::frame::XModel > const & xDocument )
+ 	SAL_THROW( (::com::sun::star::uno::Exception) );
+ 
+ }
+Index: xmlscript/util/makefile.mk
+===================================================================
+--- xmlscript/util/makefile.mk	(revision 276159)
++++ xmlscript/util/makefile.mk	(revision 276288)
+@@ -58,6 +58,7 @@ SHL1LIBS= \
+ 		$(LIB1TARGET)
+ 
+ SHL1STDLIBS= \
++		$(COMPHELPERLIB)                \
+ 		$(CPPUHELPERLIB)		\
+ 		$(CPPULIB) 			\
+ 		$(SALLIB)
+Index: xmlscript/util/makefile.mk.patched
+===================================================================
+--- xmlscript/util/makefile.mk.patched	(revision 0)
++++ xmlscript/util/makefile.mk.patched	(revision 276288)
+@@ -0,0 +1,81 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.12 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++PRJ=..
++
++PRJNAME=xmlscript
++TARGET=xcr
++NO_BSYMBOLIC=TRUE
++#USE_DEFFILE=TRUE
++ENABLE_EXCEPTIONS=TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++#-------------------------------------------------------------------
++
++LIB1TARGET=	$(SLB)$/$(TARGET).lib
++
++LIB1FILES= \
++		$(SLB)$/xml_helper.lib		\
++		$(SLB)$/xmldlg_imexp.lib	\
++		$(SLB)$/xmllib_imexp.lib	\
++		$(SLB)$/xmlmod_imexp.lib	\
++		$(SLB)$/xmlflat_imexp.lib	\
++		$(SLB)$/misc.lib
++
++SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
++
++SHL1LIBS= \
++		$(LIB1TARGET)
++
++SHL1STDLIBS= \
++		$(COMPHELPERLIB)                \
++		$(CPPUHELPERLIB)		\
++		$(CPPULIB) 			\
++		$(SALLIB)
++
++SHL1DEPN=
++SHL1IMPLIB=	i$(TARGET)
++SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
++
++DEF1NAME=	$(SHL1TARGET)
++DEFLIB1NAME=	$(TARGET)
++DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt
++
++# --- Targets -------------------------------------------------------
++
++.INCLUDE :	target.mk
++
++$(MISC)$/$(SHL1TARGET).flt : makefile.mk xcr.flt
++	@echo ------------------------------
++	@echo Making: $@
++	$(TYPE) xcr.flt > $@
+Index: vbahelper/source/msforms/vbacheckbox.cxx
+===================================================================
+--- vbahelper/source/msforms/vbacheckbox.cxx	(revision 0)
++++ vbahelper/source/msforms/vbacheckbox.cxx	(revision 276288)
+@@ -0,0 +1,112 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbacheckbox.hxx"
++#include <vbahelper/helperdecl.hxx>
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
++const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
++ScVbaCheckbox::ScVbaCheckbox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : CheckBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++}
++
++// Attributes
++rtl::OUString SAL_CALL 
++ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException)
++{
++    rtl::OUString Label;
++    m_xProps->getPropertyValue( LABEL ) >>= Label;
++    return Label;
++}
++
++void SAL_CALL 
++ScVbaCheckbox::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
++}
++
++uno::Any SAL_CALL 
++ScVbaCheckbox::getValue() throw (css::uno::RuntimeException)
++{
++    sal_Int16 nValue = -1;
++    m_xProps->getPropertyValue( STATE ) >>= nValue;
++    if( nValue != 0 )
++        nValue = -1;
++//    return uno::makeAny( nValue ); 
++// I must be missing something MSO says value should be -1 if selected, 0 if not
++// selected
++    return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); 
++}
++
++void SAL_CALL 
++ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
++{
++    sal_Int16 nValue = 0;
++    sal_Bool bValue = false;
++    if( _value >>= nValue )
++    {
++        if( nValue == -1)
++            nValue = 1;
++    }
++    else if ( _value >>= bValue )
++    {
++        if ( bValue )
++            nValue = 1;
++    }
++    m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
++}
++rtl::OUString& 
++ScVbaCheckbox::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCheckbox") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaCheckbox::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.CheckBox" ) );
++	}
++	return aServiceNames;
++}
++
+Index: vbahelper/source/msforms/vbascrollbar.hxx
+===================================================================
+--- vbahelper/source/msforms/vbascrollbar.hxx	(revision 0)
++++ vbahelper/source/msforms/vbascrollbar.hxx	(revision 276288)
+@@ -0,0 +1,66 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_SCROLLBAR_HXX
++#define SC_VBA_SCROLLBAR_HXX
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/msforms/XScrollBar.hpp>
++
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++
++typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XScrollBar > ScrollBarImpl_BASE;
++
++class ScVbaScrollBar : public ScrollBarImpl_BASE
++{
++public:
++    ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
++   // Attributes
++    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getLargeChange() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLargeChange( ::sal_Int32 _largechange ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getSmallChange() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setSmallChange( ::sal_Int32 _smallchange ) throw (css::uno::RuntimeException);
++
++
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif //SC_VBA_LABEL_HXX
+Index: vbahelper/source/msforms/vbaprogressbar.cxx
+===================================================================
+--- vbahelper/source/msforms/vbaprogressbar.cxx	(revision 0)
++++ vbahelper/source/msforms/vbaprogressbar.cxx	(revision 276288)
+@@ -0,0 +1,78 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbaprogressbar.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++// uno servicename com.sun.star.awt.UnoControlProgressBarMode
++const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
++
++ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ProgressBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++}
++
++// Attributes
++uno::Any SAL_CALL 
++ScVbaProgressBar::getValue() throw (css::uno::RuntimeException)
++{
++    return m_xProps->getPropertyValue( SVALUE );
++}
++
++void SAL_CALL 
++ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( SVALUE,  _value );
++}
++
++rtl::OUString& 
++ScVbaProgressBar::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaProgressBar") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaProgressBar::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/vbaframe.cxx
+===================================================================
+--- vbahelper/source/msforms/vbaframe.cxx	(revision 0)
++++ vbahelper/source/msforms/vbaframe.cxx	(revision 276288)
+@@ -0,0 +1,104 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbaframe.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
++ScVbaFrame::ScVbaFrame( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : FrameImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++}
++
++// Attributes
++rtl::OUString SAL_CALL 
++ScVbaFrame::getCaption() throw (css::uno::RuntimeException)
++{
++    rtl::OUString Label;
++    m_xProps->getPropertyValue( LABEL ) >>= Label;
++    return Label;
++}
++
++void SAL_CALL 
++ScVbaFrame::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
++}
++
++uno::Any SAL_CALL 
++ScVbaFrame::getValue() throw (css::uno::RuntimeException)
++{
++    return uno::makeAny( getCaption() );
++}
++
++void SAL_CALL 
++ScVbaFrame::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
++{
++    rtl::OUString sCaption;
++    _value >>= sCaption;
++    setCaption( sCaption ); 
++}
++//liuchen 2009-7-6 
++::sal_Int32 SAL_CALL ScVbaFrame::getForeColor() throw (::com::sun::star::uno::RuntimeException)
++{
++	return 0;
++}
++
++void SAL_CALL ScVbaFrame::setForeColor( ::sal_Int32 /*_forecolor*/ ) throw (::com::sun::star::uno::RuntimeException)
++{
++	return;
++}
++//liuchen 2009-7-6 end
++
++rtl::OUString& 
++ScVbaFrame::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFrame") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaFrame::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/vbacheckbox.hxx
+===================================================================
+--- vbahelper/source/msforms/vbacheckbox.hxx	(revision 0)
++++ vbahelper/source/msforms/vbacheckbox.hxx	(revision 276288)
+@@ -0,0 +1,61 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_CHECKBOX_HXX
++#define SC_VBA_CHECKBOX_HXX
++#include <cppuhelper/implbase2.hxx>
++#include <ooo/vba/msforms/XRadioButton.hpp>
++
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++
++typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > CheckBoxImpl_BASE;
++
++class ScVbaCheckbox : public CheckBoxImpl_BASE
++{
++public:
++    ScVbaCheckbox(  const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
++   // Attributes
++    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++    // XDefaultProperty
++    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif //SC_VBA_CHECKBOX_HXX
+Index: vbahelper/source/msforms/vbaprogressbar.hxx
+===================================================================
+--- vbahelper/source/msforms/vbaprogressbar.hxx	(revision 0)
++++ vbahelper/source/msforms/vbaprogressbar.hxx	(revision 276288)
+@@ -0,0 +1,59 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_PROGRESSBAR_HXX
++#define SC_VBA_PROGRESSBAR_HXX
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/msforms/XProgressBar.hpp>
++
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <cppuhelper/implbase2.hxx>
++
++typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XProgressBar, css::script::XDefaultProperty  > ProgressBarImpl_BASE;
++
++class ScVbaProgressBar : public ProgressBarImpl_BASE
++{
++public:
++    ScVbaProgressBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
++   // Attributes
++    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++    // XDefaultProperty
++    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
++};
++#endif //SC_VBA_LABEL_HXX
+Index: vbahelper/source/msforms/vbaframe.hxx
+===================================================================
+--- vbahelper/source/msforms/vbaframe.hxx	(revision 0)
++++ vbahelper/source/msforms/vbaframe.hxx	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_FRAME_HXX
++#define SC_VBA_FRAME_HXX
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/msforms/XLabel.hpp>
++
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++
++typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XLabel > FrameImpl_BASE;
++
++class ScVbaFrame : public FrameImpl_BASE
++{
++public:
++    ScVbaFrame(  const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
++   // Attributes
++    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
++	//liuchen 2009-7-6 
++	virtual ::sal_Int32 SAL_CALL getForeColor() throw (::com::sun::star::uno::RuntimeException);
++	virtual void SAL_CALL setForeColor( ::sal_Int32 _forecolor ) throw (::com::sun::star::uno::RuntimeException);
++	//liuchen 2009-7-6 end
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif //SC_VBA_LABEL_HXX
+Index: vbahelper/source/msforms/vbacontrols.cxx
+===================================================================
+--- vbahelper/source/msforms/vbacontrols.cxx	(revision 0)
++++ vbahelper/source/msforms/vbacontrols.cxx	(revision 276288)
+@@ -0,0 +1,232 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#include "vbacontrols.hxx"
++#include <cppuhelper/implbase2.hxx>
++#include <com/sun/star/awt/XControlContainer.hpp>
++#include <ooo/vba//XControlProvider.hpp>
++#include <hash_map>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl;
++
++typedef  std::hash_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash,
++    ::std::equal_to< ::rtl::OUString >  > ControlIndexMap;
++typedef  std::vector< uno::Reference< awt::XControl > > ControlVec;
++
++class ControlArrayWrapper : public ArrayWrapImpl
++{
++    uno::Reference< awt::XControlContainer > mxDialog;
++    uno::Sequence< ::rtl::OUString > msNames;
++    ControlVec mControls;
++    ControlIndexMap mIndices;
++
++    rtl::OUString getControlName( const uno::Reference< awt::XControl >& xCtrl )
++    {
++        uno::Reference< beans::XPropertySet > xProp( xCtrl->getModel(), uno::UNO_QUERY );
++        rtl::OUString sName;
++        xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
++        return sName;
++    }
++
++public:
++
++    ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
++    {
++        mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
++        uno::Sequence< uno::Reference< awt::XControl > > sXControls = mxDialog->getControls();
++    
++        msNames.realloc( sXControls.getLength() );
++        for ( sal_Int32 i = 0; i < sXControls.getLength(); ++i )
++        {
++            uno::Reference< awt::XControl > xCtrl = sXControls[ i ];
++            msNames[ i ] = getControlName( xCtrl );
++            mControls.push_back( xCtrl );
++            mIndices[ msNames[ i ] ] = i;
++        }
++    }
++    
++    // XElementAccess
++    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
++    {
++        return awt::XControl::static_type(0);
++    }
++    
++    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) 
++    {
++        return ( mControls.size() > 0 );
++    }
++    
++    // XNameAcess 
++    virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        if ( !hasByName( aName ) )
++            throw container::NoSuchElementException();
++        return getByIndex( mIndices[ aName ] );
++    }
++    
++    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
++    {
++        return msNames;
++    }
++    
++    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
++    {
++        ControlIndexMap::iterator it = mIndices.find( aName );
++        return it != mIndices.end();
++    }
++    
++    // XElementAccess
++    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException)
++    {
++        return mControls.size();
++    }
++    
++    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
++    {
++        if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) )
++            throw lang::IndexOutOfBoundsException();
++        return uno::makeAny( mControls[ Index ] );
++    }
++};
++
++
++class ControlsEnumWrapper : public EnumerationHelper_BASE
++{
++    uno::Reference<XHelperInterface > m_xParent;
++    uno::Reference<uno::XComponentContext > m_xContext;
++    uno::Reference<container::XIndexAccess > m_xIndexAccess;
++    uno::Reference<awt::XControl > m_xDlg;
++    sal_Int32 nIndex;
++
++public:
++
++    ControlsEnumWrapper(  const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< awt::XControl >& xDlg ) :  m_xParent( xParent ), m_xContext( xContext), m_xIndexAccess( xIndexAccess ), m_xDlg( xDlg ), nIndex( 0 ) {}
++
++    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
++    {
++        return ( nIndex < m_xIndexAccess->getCount() );
++    }
++
++    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        if ( nIndex < m_xIndexAccess->getCount() )
++        {
++            uno::Reference< frame::XModel > xModel;
++            uno::Reference< awt::XControl > xControl;
++            m_xIndexAccess->getByIndex( nIndex++ ) >>= xControl;
++
++	uno::Reference<lang::XMultiComponentFactory > xServiceManager( m_xContext->getServiceManager(), uno::UNO_QUERY_THROW );
++	uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), m_xContext ), uno::UNO_QUERY_THROW );
++
++	uno::Reference< msforms::XControl > xVBAControl( xControlProvider->createUserformControl(  xControl, m_xDlg, xModel ) );
++            return uno::makeAny( xVBAControl );
++        }
++        throw container::NoSuchElementException();
++    }
++
++};
++
++
++uno::Reference<container::XIndexAccess >
++lcl_controlsWrapper( const uno::Reference< awt::XControl >& xDlg )
++{
++    return new ControlArrayWrapper( xDlg );
++}
++
++ScVbaControls::ScVbaControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
++                const css::uno::Reference< awt::XControl >& xDialog )
++            : ControlsImpl_BASE( xParent, xContext, lcl_controlsWrapper( xDialog  ) )
++{
++    mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
++}
++
++uno::Reference< container::XEnumeration >
++ScVbaControls::createEnumeration() throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumeration > xEnum( new ControlsEnumWrapper( mxParent, mxContext, m_xIndexAccess, mxDialog ) );
++    if ( !xEnum.is() )
++        throw uno::RuntimeException();
++    return xEnum;
++}
++
++uno::Any
++ScVbaControls::createCollectionObject( const css::uno::Any& aSource )
++{
++    // Create control from awt::XControl
++    uno::Reference< awt::XControl > xControl;
++    aSource >>= xControl;
++    uno::Reference< frame::XModel > xModel;
++    uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
++    uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
++
++    uno::Reference< msforms::XControl > xVBAControl( xControlProvider->createUserformControl(  xControl, mxDialog, xModel ) );
++
++    return uno::makeAny( xVBAControl );
++}
++
++void SAL_CALL 
++ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumeration > xEnum( createEnumeration() );
++    while ( xEnum->hasMoreElements() )
++    {
++        uno::Reference< msforms::XControl > xControl( xEnum->nextElement(), uno::UNO_QUERY_THROW );
++        xControl->setLeft( xControl->getLeft() + cx );
++        xControl->setTop( xControl->getTop() + cy ); 
++    }
++}
++
++uno::Type
++ScVbaControls::getElementType() throw (uno::RuntimeException)
++{
++    return ooo::vba::msforms::XControl::static_type(0);
++}
++rtl::OUString& 
++ScVbaControls::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControls") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaControls::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Controls" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/vbacombobox.cxx
+===================================================================
+--- vbahelper/source/msforms/vbacombobox.cxx	(revision 0)
++++ vbahelper/source/msforms/vbacombobox.cxx	(revision 276288)
+@@ -0,0 +1,183 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbacombobox.cxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbacombobox.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++//SelectedItems list of integer indexes
++//StringItemList list of items
++
++const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
++const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
++const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
++const static rtl::OUString CONTROLSOURCEPROP( RTL_CONSTASCII_USTRINGPARAM("DataFieldProperty") );
++
++ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialogType ) : ComboBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialogType( bDialogType )
++{
++    	mpListHelper.reset( new ListControlHelper( m_xProps ) );
++	// grab the default value property name
++	m_xProps->getPropertyValue( CONTROLSOURCEPROP ) >>= sSourceName;
++}
++
++// Attributes
++
++
++// Value, [read] e.g. getValue returns the value of ooo Text propery e.g. the value in
++// the drop down
++uno::Any SAL_CALL 
++ScVbaComboBox::getValue() throw (uno::RuntimeException)
++{
++	return m_xProps->getPropertyValue( sSourceName );
++}
++
++void SAL_CALL 
++ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
++{
++    sal_Int16 nIndex = 0;
++    if( _value >>= nIndex )
++    {
++	    uno::Sequence< rtl::OUString > sItems;
++    	m_xProps->getPropertyValue( ITEMS ) >>= sItems;
++        if( ( nIndex >= 0 ) && ( sItems.getLength() > nIndex ) )
++        {
++            rtl::OUString sText = sItems[ nIndex ];
++            m_xProps->setPropertyValue( TEXT, uno::makeAny( sText ) );
++        }
++    }
++}
++
++uno::Any SAL_CALL 
++ScVbaComboBox::getListIndex() throw (uno::RuntimeException)
++{
++	uno::Sequence< rtl::OUString > sItems;
++	m_xProps->getPropertyValue( ITEMS ) >>= sItems;
++	// should really return the item that has focus regardless of
++	// it been selected
++	if ( sItems.getLength() > 0 )
++	{
++		rtl::OUString sText = getText();
++		sal_Int32 nLen = sItems.getLength();
++		for ( sal_Int32 index = 0; sText.getLength() && index < nLen; ++index )
++		{
++			if ( sItems[ index ].equals( sText ) )
++			{
++				OSL_TRACE("getListIndex returning %d", index );
++				return uno::makeAny( index );
++			}
++				
++		} 
++ 	} 
++	OSL_TRACE("getListIndex returning %d", -1 );
++	return uno::makeAny( sal_Int32( -1 ) );
++}
++
++// Value, [write]e.g. setValue sets the value in the drop down, and if the value is one
++// of the values in the list then the selection is also set
++void SAL_CALL 
++ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
++{
++	m_xProps->setPropertyValue( sSourceName, _value );
++}
++
++// see Value
++
++::rtl::OUString SAL_CALL 
++ScVbaComboBox::getText() throw (uno::RuntimeException)
++{
++	rtl::OUString result;
++	getValue() >>= result;
++	return result;
++}
++
++void SAL_CALL 
++ScVbaComboBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
++{
++	setValue( uno::makeAny( _text ) ); // seems the same
++}
++
++// Methods
++void SAL_CALL 
++ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
++{
++	mpListHelper->AddItem( pvargItem, pvargIndex );
++}
++
++void SAL_CALL 
++ScVbaComboBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
++	{
++	mpListHelper->removeItem( index );
++}
++
++void SAL_CALL 
++ScVbaComboBox::Clear(  ) throw (uno::RuntimeException)
++		{
++	mpListHelper->Clear();
++		}
++
++void SAL_CALL
++ScVbaComboBox::setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException)
++{
++	ScVbaControl::setRowSource( _rowsource );
++	mpListHelper->setRowSource( _rowsource );
++		}
++
++sal_Int32 SAL_CALL
++ScVbaComboBox::getListCount() throw (uno::RuntimeException)
++{
++	return mpListHelper->getListCount();
++}
++		
++uno::Any SAL_CALL 
++ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
++{
++	return mpListHelper->List( pvargIndex, pvarColumn );
++	}
++
++rtl::OUString& 
++ScVbaComboBox::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComboBox") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaComboBox::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ComboBox" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/vbacontrols.hxx
+===================================================================
+--- vbahelper/source/msforms/vbacontrols.hxx	(revision 0)
++++ vbahelper/source/msforms/vbacontrols.hxx	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_CONTROLS_HXX
++#define SC_VBA_CONTROLS_HXX
++
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/msforms/XControls.hpp>
++#include <com/sun/star/awt/XControl.hpp>
++
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <vbahelper/vbahelper.hxx>
++
++typedef CollTestImplHelper< ov::msforms::XControls > ControlsImpl_BASE;
++
++class ScVbaControls : public ControlsImpl_BASE
++{
++	css::uno::Reference< css::awt::XControl > mxDialog;
++protected:
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++public:
++    ScVbaControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, 
++                    const css::uno::Reference< css::awt::XControl >& xDialog );
++    // XControls
++     virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException);
++    // XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++    // ScVbaCollectionBaseImpl
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++    
++};
++#endif //SC_VBA_OLEOBJECTS_HXX
++
+Index: vbahelper/source/msforms/vbalistcontrolhelper.cxx
+===================================================================
+--- vbahelper/source/msforms/vbalistcontrolhelper.cxx	(revision 0)
++++ vbahelper/source/msforms/vbalistcontrolhelper.cxx	(revision 276288)
+@@ -0,0 +1,146 @@
++#include <vbalistcontrolhelper.hxx>
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
++
++void SAL_CALL 
++ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
++{
++	if ( pvargItem.hasValue()  )
++	{
++		uno::Sequence< rtl::OUString > sList;
++		m_xProps->getPropertyValue( ITEMS ) >>= sList;
++
++		sal_Int32 nIndex = sList.getLength();
++
++		if ( pvargIndex.hasValue() )
++			pvargIndex >>= nIndex;
++
++		rtl::OUString sString = getAnyAsString( pvargItem );
++
++		// if no index specified or item is to be appended to end of 
++		// list just realloc the array and set the last item
++		if ( nIndex  == sList.getLength() )
++		{
++			sal_Int32 nOldSize = sList.getLength();
++			sList.realloc( nOldSize + 1 );
++			sList[ nOldSize ] = sString; 
++		}
++		else
++		{
++			// just copy those elements above the one to be inserted
++			std::vector< rtl::OUString > sVec;
++			// reserve just the amount we need to copy
++			sVec.reserve( sList.getLength() - nIndex );
++
++			// point at first element to copy
++			rtl::OUString* pString = sList.getArray() + nIndex;
++			const rtl::OUString* pEndString = sList.getArray() + sList.getLength();
++			// insert the new element
++			sVec.push_back( sString );
++			// copy elements	
++			for ( ; pString != pEndString; ++pString )
++				sVec.push_back( *pString );
++		
++			sList.realloc(  sList.getLength() + 1 );
++
++			// point at first element to be overwritten
++			pString = sList.getArray() + nIndex;
++			pEndString = sList.getArray() + sList.getLength();
++			std::vector< rtl::OUString >::iterator it = sVec.begin();
++			for ( ; pString != pEndString; ++pString, ++it)
++				*pString = *it;	
++			//
++		}
++
++		m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
++		
++	}
++}
++
++void SAL_CALL 
++ListControlHelper::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
++{
++    sal_Int32 nIndex = 0;
++    // for int index
++	if ( index >>= nIndex  )
++	{
++		uno::Sequence< rtl::OUString > sList;
++		m_xProps->getPropertyValue( ITEMS ) >>= sList;
++        if( nIndex < 0 || nIndex > ( sList.getLength() - 1 ) )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid index" ), uno::Reference< uno::XInterface > () );
++        if( sList.hasElements() )
++        {
++            if( sList.getLength() == 1 )
++            {
++                Clear();
++                return;
++            }
++            for( sal_Int32 i = nIndex; i < ( sList.getLength()-1 ); i++ )
++            {
++                sList[i] = sList[i+1];
++            }
++			sList.realloc(  sList.getLength() - 1 );
++		}
++
++		m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
++	}
++}
++
++void SAL_CALL 
++ListControlHelper::Clear(  ) throw (uno::RuntimeException)
++{
++	// urk, setValue doesn't seem to work !!
++	//setValue( uno::makeAny( sal_Int16() ) );
++	m_xProps->setPropertyValue( ITEMS, uno::makeAny( uno::Sequence< rtl::OUString >() ) );
++}
++
++void SAL_CALL
++ListControlHelper::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
++{
++	if ( _rowsource.getLength() == 0 )
++		Clear();
++}
++
++sal_Int32 SAL_CALL
++ListControlHelper::getListCount() throw (uno::RuntimeException)
++{
++    uno::Sequence< rtl::OUString > sList;
++    m_xProps->getPropertyValue( ITEMS ) >>= sList;
++    return sList.getLength();
++}
++
++uno::Any SAL_CALL 
++ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
++{
++    uno::Sequence< rtl::OUString > sList;
++    m_xProps->getPropertyValue( ITEMS ) >>= sList;
++    sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
++    uno::Any aRet;
++    if ( pvargIndex.hasValue() )
++    {
++        sal_Int16 nIndex = -1;
++        pvargIndex >>= nIndex;
++        if( nIndex < 0 || nIndex >= nLength )
++            throw uno::RuntimeException( rtl::OUString::createFromAscii(
++                    "Bad row Index" ), uno::Reference< uno::XInterface >() );       
++        aRet <<= sList[ nIndex ];
++    }
++    else if ( pvarColumn.hasValue() ) // pvarColumn on its own would be bad
++            throw uno::RuntimeException( rtl::OUString::createFromAscii(
++                    "Bad column Index" ), uno::Reference< uno::XInterface >() );       
++    else // List() ( e.g. no args )
++    {
++        uno::Sequence< uno::Sequence< rtl::OUString > > sReturnArray( nLength );
++        for ( sal_Int32 i = 0; i < nLength; ++i )
++        {
++            sReturnArray[ i ].realloc( 10 );
++            sReturnArray[ i ][ 0 ] = sList[ i ];
++        }        
++        aRet = uno::makeAny( sReturnArray );
++    }
++    return aRet;
++}
+Index: vbahelper/source/msforms/vbacombobox.hxx
+===================================================================
+--- vbahelper/source/msforms/vbacombobox.hxx	(revision 0)
++++ vbahelper/source/msforms/vbacombobox.hxx	(revision 276288)
+@@ -0,0 +1,80 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbacombobox.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_COMBOBOX_HXX
++#define SC_VBA_COMBOBOX_HXX
++#include <cppuhelper/implbase2.hxx>
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/script/XDefaultProperty.hpp>
++#include <ooo/vba/msforms/XComboBox.hpp>
++#include <comphelper/proparrhlp.hxx>
++#include <comphelper/propertycontainer.hxx>
++#include <com/sun/star/beans/PropertyAttribute.hpp>
++
++#include "vbacontrol.hxx"
++#include "vbalistcontrolhelper.hxx"
++#include <vbahelper/vbahelper.hxx>
++
++typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE;
++class ScVbaComboBox : public ComboBoxImpl_BASE
++{		
++	std::auto_ptr< ListControlHelper > mpListHelper;
++	rtl::OUString sSourceName; 
++	rtl::OUString msDftPropName;
++	bool mbDialogType;
++	
++public:
++	ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialogType = false );
++
++	// Attributes
++	virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
++	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++	virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
++
++	// Methods
++	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
++	virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
++	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
++	// XControl
++    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
++
++	// XDefaultProperty
++        ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
++	//XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif //
+Index: vbahelper/source/msforms/vbatogglebutton.cxx
+===================================================================
+--- vbahelper/source/msforms/vbatogglebutton.cxx	(revision 0)
++++ vbahelper/source/msforms/vbatogglebutton.cxx	(revision 276288)
+@@ -0,0 +1,125 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbatogglebutton.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
++const static rtl::OUString TOGGLE( RTL_CONSTASCII_USTRINGPARAM("Toggle") );
++const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
++ScVbaToggleButton::ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : ToggleButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++    OSL_TRACE("ScVbaToggleButton(ctor)");
++    m_xProps->setPropertyValue( TOGGLE, uno::makeAny( sal_True ) );
++}
++
++ScVbaToggleButton::~ScVbaToggleButton()
++{
++    OSL_TRACE("~ScVbaToggleButton(dtor)");
++}
++
++// Attributes
++rtl::OUString SAL_CALL 
++ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException)
++{
++    rtl::OUString Label;
++    m_xProps->getPropertyValue( LABEL ) >>= Label;
++    return Label;
++}
++
++void SAL_CALL 
++ScVbaToggleButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
++}
++
++uno::Any SAL_CALL 
++ScVbaToggleButton::getValue() throw (uno::RuntimeException)
++{
++	sal_Int16 nState = 0;
++    	m_xProps->getPropertyValue( STATE ) >>= nState;
++ 	return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) );
++}
++
++//liuchen 2009-7-23, resolve the defect that ToggleButton.Value cannot be set correctly
++void SAL_CALL 
++ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
++{
++	sal_Int16 nState = 0;
++	if (_value.getValueTypeClass() == typelib_TypeClass_BOOLEAN)
++	{
++		sal_Bool bValue;
++		_value >>= bValue;
++		nState = static_cast< sal_Int16 >(bValue);
++	}
++	else if (_value.getValueTypeClass() == typelib_TypeClass_BYTE)
++	{
++		sal_Int8 nValue;
++		_value >>= nValue;
++		nState = ( nValue == 1) ? 1 : 0;
++	}
++	else
++	{
++		_value >>= nState;
++        OSL_TRACE( "nState - %d", nState );
++		nState = ( nState == -1 ) ?  1 : 0;
++        OSL_TRACE( "nState - %d", nState );
++	}
++	m_xProps->setPropertyValue( STATE, uno::makeAny(  nState ) );
++}
++//liuchen 2009-7-23
++
++rtl::OUString& 
++ScVbaToggleButton::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaToggleButton") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaToggleButton::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ToggleButton" ) );
++	}
++	return aServiceNames;
++}
++
+Index: vbahelper/source/msforms/vbalabel.cxx
+===================================================================
+--- vbahelper/source/msforms/vbalabel.cxx	(revision 0)
++++ vbahelper/source/msforms/vbalabel.cxx	(revision 276288)
+@@ -0,0 +1,103 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbalabel.cxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbalabel.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
++const static rtl::OUString FORECOLOR( RTL_CONSTASCII_USTRINGPARAM("TextColor") ); //liuchen 2009-7-6
++ScVbaLabel::ScVbaLabel(  const css::uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : LabelImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++}
++
++// Attributes
++rtl::OUString SAL_CALL 
++ScVbaLabel::getCaption() throw (css::uno::RuntimeException)
++{
++    rtl::OUString Label;
++    m_xProps->getPropertyValue( LABEL ) >>= Label;
++    return Label;
++}
++
++void SAL_CALL 
++ScVbaLabel::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
++}
++uno::Any SAL_CALL 
++ScVbaLabel::getValue() throw (css::uno::RuntimeException)
++{
++    return uno::makeAny( getCaption() );
++}
++
++void SAL_CALL 
++ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
++{
++    rtl::OUString sCaption;
++    _value >>= sCaption;
++    setCaption( sCaption ); 
++}
++
++
++//liuchen 2009-7-6
++::sal_Int32 SAL_CALL ScVbaLabel::getForeColor() throw (::com::sun::star::uno::RuntimeException)
++{
++	sal_Int32 nForeColor;
++	m_xProps->getPropertyValue( FORECOLOR ) >>= nForeColor; 
++	return OORGBToXLRGB( nForeColor );
++}
++
++void SAL_CALL ScVbaLabel::setForeColor( ::sal_Int32 _forecolor ) throw (::com::sun::star::uno::RuntimeException)
++{	
++	 m_xProps->setPropertyValue( FORECOLOR, uno::makeAny( XLRGBToOORGB( _forecolor ) ) );
++}
++//liuchenn 2009-7-6
++
++rtl::OUString& 
++ScVbaLabel::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLabel") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaLabel::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/vbacontrol.cxx
+===================================================================
+--- vbahelper/source/msforms/vbacontrol.cxx	(revision 0)
++++ vbahelper/source/msforms/vbacontrol.cxx	(revision 276288)
+@@ -0,0 +1,545 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbacontrol.cxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <com/sun/star/form/FormComponentType.hpp>
++#include <com/sun/star/awt/XControlModel.hpp>
++#include <com/sun/star/awt/XControl.hpp>
++#include <com/sun/star/awt/XWindow2.hpp>
++#include <com/sun/star/lang/XEventListener.hpp>
++#include <com/sun/star/drawing/XShape.hpp>
++#include <com/sun/star/drawing/XControlShape.hpp>
++#include <com/sun/star/awt/XControl.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/view/XControlAccess.hpp>
++#include <com/sun/star/container/XChild.hpp>
++#include <com/sun/star/form/binding/XBindableValue.hpp>
++#include <com/sun/star/form/binding/XListEntrySink.hpp>
++#include <com/sun/star/table/CellAddress.hpp>
++#include <com/sun/star/table/CellRangeAddress.hpp>
++#include <ooo/vba/XControlProvider.hpp>
++#ifdef VBA_OOBUILD_HACK
++#include <svtools/bindablecontrolhelper.hxx>
++#endif
++#include"vbacontrol.hxx"
++#include"vbacombobox.hxx"
++#include "vbabutton.hxx"
++#include "vbalabel.hxx"
++#include "vbatextbox.hxx"
++#include "vbaradiobutton.hxx"
++#include "vbalistbox.hxx"
++#include "vbatogglebutton.hxx"
++#include "vbacheckbox.hxx"
++#include "vbaframe.hxx"
++#include "vbascrollbar.hxx"
++#include "vbaprogressbar.hxx"
++#include "vbamultipage.hxx"
++#include "vbaspinbutton.hxx"
++#include "vbaimage.hxx"
++#include <vbahelper/helperdecl.hxx>
++
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++uno::Reference< css::awt::XWindowPeer > 
++ScVbaControl::getWindowPeer() throw (uno::RuntimeException)
++{
++    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
++
++    uno::Reference< awt::XControlModel > xControlModel;
++    uno::Reference< css::awt::XWindowPeer >  xWinPeer;
++    if ( !xControlShape.is() ) 
++    { 
++        // would seem to be a Userform control
++        uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY_THROW );
++        xWinPeer =  xControl->getPeer();
++	return xWinPeer;
++    }
++    // form control
++    xControlModel.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
++
++    uno::Reference< view::XControlAccess > xControlAccess( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++    try
++    {
++        uno::Reference< awt::XControl > xControl( xControlAccess->getControl( xControlModel ), uno::UNO_QUERY );
++        xWinPeer =  xControl->getPeer();
++    }
++    catch( uno::Exception )
++    {
++        throw uno::RuntimeException( rtl::OUString::createFromAscii( "The Control does not exsit" ),
++                uno::Reference< uno::XInterface >() );
++    }
++    return xWinPeer;
++}
++
++//ScVbaControlListener
++class ScVbaControlListener: public cppu::WeakImplHelper1< lang::XEventListener >
++{
++private:
++    ScVbaControl *pControl;
++public:
++    ScVbaControlListener( ScVbaControl *pTmpControl );
++    virtual ~ScVbaControlListener();
++    virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException );
++};
++
++ScVbaControlListener::ScVbaControlListener( ScVbaControl *pTmpControl ): pControl( pTmpControl )
++{
++}
++
++ScVbaControlListener::~ScVbaControlListener()
++{
++}
++
++void SAL_CALL
++ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeException )
++{
++    if( pControl )
++    {
++        pControl->removeResouce();
++        pControl = NULL;
++    }
++}
++
++//ScVbaControl
++
++ScVbaControl::ScVbaControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< ::uno::XInterface >& xControl,  const css::uno::Reference< css::frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ControlImpl_BASE( xParent, xContext ),  m_xControl( xControl ), m_xModel( xModel )
++{
++    //add listener
++    m_xEventListener.set( new ScVbaControlListener( this ) );
++    setGeometryHelper( pGeomHelper );
++    uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
++    xComponent->addEventListener( m_xEventListener );
++   
++    //init m_xProps
++    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ) ;
++    uno::Reference< awt::XControl> xUserFormControl( m_xControl, uno::UNO_QUERY ) ;
++    if ( xControlShape.is() ) // form control
++        m_xProps.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
++    else if ( xUserFormControl.is() ) // userform control
++        m_xProps.set( xUserFormControl->getModel(), uno::UNO_QUERY_THROW );
++}
++
++ScVbaControl::~ScVbaControl()
++{
++    if( m_xControl.is() )
++{
++        uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
++    xComponent->removeEventListener( m_xEventListener );
++}
++}
++
++void 
++ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
++{
++    mpGeometryHelper.reset( pHelper );
++}
++
++void ScVbaControl::removeResouce() throw( uno::RuntimeException )
++{
++    uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
++    xComponent->removeEventListener( m_xEventListener );
++    m_xControl= NULL;
++    m_xProps = NULL;
++}
++
++//In design model has different behavior
++sal_Bool SAL_CALL ScVbaControl::getEnabled() throw (uno::RuntimeException)
++{
++    uno::Any aValue = m_xProps->getPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ) );
++    sal_Bool bRet = false;
++    aValue >>= bRet;
++    return bRet;
++}
++
++void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeException)
++{
++    uno::Any aValue( bVisible );
++    m_xProps->setPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ), aValue);
++
++}
++
++sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
++{
++    uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
++    return xWindow2->isVisible();
++}
++
++void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
++{
++    uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
++    xWindow2->setVisible( bVisible );
++}
++double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException)
++{
++    return mpGeometryHelper->getHeight();
++}
++void SAL_CALL ScVbaControl::setHeight( double _height ) throw (uno::RuntimeException)
++{
++    mpGeometryHelper->setHeight( _height );
++}
++
++double SAL_CALL ScVbaControl::getWidth() throw (uno::RuntimeException)
++{
++    return mpGeometryHelper->getWidth();
++}
++void SAL_CALL ScVbaControl::setWidth( double _width ) throw (uno::RuntimeException)
++{
++    mpGeometryHelper->setWidth( _width );
++}
++
++double SAL_CALL
++ScVbaControl::getLeft() throw (uno::RuntimeException)
++{
++    return mpGeometryHelper->getLeft();
++}
++
++void SAL_CALL
++ScVbaControl::setLeft( double _left ) throw (uno::RuntimeException)
++{
++    mpGeometryHelper->setLeft( _left );
++
++}
++
++double SAL_CALL
++ScVbaControl::getTop() throw (uno::RuntimeException)
++{
++    return mpGeometryHelper->getTop();
++}
++
++void SAL_CALL
++ScVbaControl::setTop( double _top ) throw (uno::RuntimeException)
++{
++    mpGeometryHelper->setTop( _top );
++}
++
++uno::Reference< uno::XInterface > SAL_CALL
++ScVbaControl::getObject() throw (uno::RuntimeException)
++{
++	uno::Reference< msforms::XControl > xRet( this );
++	return xRet;
++}
++
++void SAL_CALL ScVbaControl::SetFocus() throw (uno::RuntimeException) 
++{
++    uno::Reference< awt::XWindow > xWin( m_xControl, uno::UNO_QUERY_THROW );
++    xWin->setFocus();
++}
++
++rtl::OUString SAL_CALL 
++ScVbaControl::getControlSource() throw (uno::RuntimeException)
++{
++// #FIXME I *hate* having these upstream differences
++// but this is necessary until I manage to upstream other
++// dependant parts
++#ifdef VBA_OOBUILD_HACK
++	rtl::OUString sControlSource;
++	uno::Reference< form::binding::XBindableValue > xBindable( m_xProps, uno::UNO_QUERY );
++	if ( xBindable.is() )
++	{
++		try
++		{
++			uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
++			uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellAddressConversion" ))), uno::UNO_QUERY );
++			uno::Reference< beans::XPropertySet > xProps( xBindable->getValueBinding(), uno::UNO_QUERY_THROW );
++			table::CellAddress aAddress;
++			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BoundCell") ) ) >>= aAddress;
++			xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address") ), uno::makeAny( aAddress ) );
++                	xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sControlSource;
++		}
++		catch( uno::Exception& )
++		{
++		}	
++	}
++	return sControlSource;
++#else
++	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getControlSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
++#endif
++}
++
++void SAL_CALL 
++ScVbaControl::setControlSource( const rtl::OUString& _controlsource ) throw (uno::RuntimeException)
++{
++#ifdef VBA_OOBUILD_HACK
++    rtl::OUString sEmpty;
++    svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, _controlsource, sEmpty );
++#else
++	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setControlSource not supported ") ).concat( _controlsource ), uno::Reference< uno::XInterface >()); // not supported
++#endif
++}
++
++rtl::OUString SAL_CALL 
++ScVbaControl::getRowSource() throw (uno::RuntimeException)
++{
++#ifdef VBA_OOBUILD_HACK
++	rtl::OUString sRowSource;
++	uno::Reference< form::binding::XListEntrySink > xListSink( m_xProps, uno::UNO_QUERY );
++	if ( xListSink.is() )
++    {
++		try
++		{
++			uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
++			uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellRangeAddressConversion" ))), uno::UNO_QUERY );
++
++			uno::Reference< beans::XPropertySet > xProps( xListSink->getListEntrySource(), uno::UNO_QUERY_THROW );
++			table::CellRangeAddress aAddress;
++			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellRange") ) ) >>= aAddress;
++			xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address")), uno::makeAny( aAddress ) );
++			xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sRowSource;
++		}
++		catch( uno::Exception& )
++		{
++		}	
++	}
++	return sRowSource;
++#else
++	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getRowSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
++#endif
++}
++
++void SAL_CALL 
++ScVbaControl::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
++{
++#ifdef VBA_OOBUILD_HACK
++    rtl::OUString sEmpty;
++    svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, sEmpty, _rowsource );
++#else
++	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setRowSource not supported ") ).concat( _rowsource ), uno::Reference< uno::XInterface >()); // not supported
++#endif
++}
++
++rtl::OUString SAL_CALL 
++ScVbaControl::getName() throw (uno::RuntimeException)
++{
++	rtl::OUString sName;
++	m_xProps->getPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
++	return sName;
++
++}
++
++void SAL_CALL
++ScVbaControl::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
++{
++	m_xProps->setPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), uno::makeAny( _name ) );
++    }
++
++rtl::OUString SAL_CALL 
++ScVbaControl::getControlTipText() throw (css::uno::RuntimeException)
++{
++	rtl::OUString sName;
++	m_xProps->getPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) ) ) >>= sName;
++	return sName;
++}
++
++void SAL_CALL 
++ScVbaControl::setControlTipText( const rtl::OUString& rsToolTip ) throw (css::uno::RuntimeException)
++{
++	m_xProps->setPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) ), uno::makeAny( rsToolTip ) );
++}
++//ScVbaControlFactory
++
++ScVbaControlFactory::ScVbaControlFactory( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel ): m_xContext( xContext ), m_xControl( xControl ), m_xModel( xModel )
++{
++}
++
++ScVbaControl* ScVbaControlFactory::createControl()  throw (uno::RuntimeException)
++{
++    return createControl( m_xModel );
++}
++ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< uno::XInterface >& xParent )  throw (uno::RuntimeException)
++{
++    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
++    if ( xControlShape.is() ) // form controls
++        return createControl( xControlShape, xParent );
++    uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY );
++    if ( !xControl.is() )
++        throw uno::RuntimeException(); // really we should be more informative
++    return createControl( xControl, xParent );
++    
++}
++
++ScVbaControl* ScVbaControlFactory::createControl(const uno::Reference< drawing::XControlShape >& xControlShape,  const uno::Reference< uno::XInterface >& /*xParent*/ )  throw (uno::RuntimeException)
++{
++    uno::Reference< beans::XPropertySet > xProps( xControlShape->getControl(), uno::UNO_QUERY_THROW );
++    sal_Int32 nClassId = -1;
++    const static rtl::OUString sClassId( RTL_CONSTASCII_USTRINGPARAM("ClassId") );
++    xProps->getPropertyValue( sClassId ) >>= nClassId;
++    uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
++    sal_Bool bToggle = sal_False;  //liuchen 2009-8-11,  
++	switch( nClassId )
++    {
++        case form::FormComponentType::COMBOBOX:
++            return new ScVbaComboBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
++        case form::FormComponentType::COMMANDBUTTON:
++			//liuchen 2009-8-11
++			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toggle") ) ) >>= bToggle;
++			if ( bToggle )
++				return new ScVbaToggleButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
++			else
++				return new ScVbaButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
++			//liuchen 2009-8-11
++		case form::FormComponentType::FIXEDTEXT:
++            return new ScVbaLabel( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
++        case form::FormComponentType::TEXTFIELD:
++            return new ScVbaTextBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
++        case form::FormComponentType::CHECKBOX:
++            return new ScVbaCheckbox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
++        case form::FormComponentType::RADIOBUTTON:
++            return new ScVbaRadioButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
++        case form::FormComponentType::LISTBOX:
++            return new ScVbaListBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
++        case form::FormComponentType::SPINBUTTON:
++            return new ScVbaSpinButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
++        case form::FormComponentType::IMAGECONTROL:
++            return new ScVbaImage( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
++        default:
++            throw uno::RuntimeException( rtl::OUString::createFromAscii(
++                    "Donot support this Control Type." ), uno::Reference< uno::XInterface >() );
++    }
++}
++
++ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XControl >& xControl,  const uno::Reference< uno::XInterface >& xParent  )  throw (uno::RuntimeException)
++{
++    uno::Reference< beans::XPropertySet > xProps( xControl->getModel(), uno::UNO_QUERY_THROW );
++    uno::Reference< lang::XServiceInfo > xServiceInfo( xProps, uno::UNO_QUERY_THROW );
++    ScVbaControl* pControl = NULL;
++    uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
++    if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ) ) )
++	pControl = new ScVbaCheckbox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );	
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) ) )
++	pControl = new ScVbaRadioButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );	
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlEditModel") ) ) )
++        pControl = new ScVbaTextBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ) ) )
++    {
++        sal_Bool bToggle = sal_False;
++        xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toggle") ) ) >>= bToggle;
++        if ( bToggle )
++            pControl = new ScVbaToggleButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
++        else
++            pControl = new ScVbaButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
++    }
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ) ) )
++        pControl = new ScVbaComboBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ) )
++	pControl = new ScVbaListBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) ) )
++	pControl = new ScVbaLabel( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ) ) )
++	pControl = new ScVbaImage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
++	pControl = new ScVbaProgressBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
++	pControl = new ScVbaFrame( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ) ) )
++	pControl = new ScVbaScrollBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ) )
++	pControl = new ScVbaMultiPage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), xParent );
++    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ) ) )
++	pControl = new ScVbaSpinButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
++    else
++        throw uno::RuntimeException( rtl::OUString::createFromAscii("Unsupported control " ), uno::Reference< uno::XInterface >() );
++    return pControl;
++}
++
++rtl::OUString& 
++ScVbaControl::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControl") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaControl::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Control" ) );
++    }
++	return aServiceNames;
++}
++
++
++
++typedef cppu::WeakImplHelper1< XControlProvider > ControlProvider_BASE;
++class ControlProviderImpl : public ControlProvider_BASE
++{
++    uno::Reference< uno::XComponentContext > m_xCtx;
++public:
++    ControlProviderImpl( const uno::Reference< uno::XComponentContext >& xCtx ) : m_xCtx( xCtx ) {}
++    virtual uno::Reference< msforms::XControl > SAL_CALL createControl( const uno::Reference< drawing::XControlShape >& xControl, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException);
++    virtual uno::Reference< msforms::XControl > SAL_CALL createUserformControl( const uno::Reference< awt::XControl >& xControl, const uno::Reference< awt::XControl >& xDialog, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException);
++};
++
++uno::Reference< msforms::XControl > SAL_CALL 
++ControlProviderImpl::createControl( const uno::Reference< drawing::XControlShape >& xControlShape, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException)
++{
++	uno::Reference< msforms::XControl > xControlToReturn;
++	if ( xControlShape.is() ) 
++	{
++		ScVbaControlFactory controlFactory( m_xCtx, xControlShape, xDocOwner );
++		xControlToReturn.set( controlFactory.createControl( xDocOwner ) );
++	}
++	return xControlToReturn;
++		
++}
++uno::Reference< msforms::XControl > SAL_CALL 
++ControlProviderImpl::createUserformControl( const uno::Reference< awt::XControl >& xControl, const uno::Reference< awt::XControl >& xDialog, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException)
++{
++	uno::Reference< msforms::XControl > xControlToReturn;
++	if ( xControl.is() && xDialog.is() ) 
++	{ 
++			
++		ScVbaControlFactory controlFactory( m_xCtx, xControl, xDocOwner );
++		xControlToReturn.set( controlFactory.createControl( xDialog->getModel() ) );
++		ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xControlToReturn.get() );
++		pControl->setGeometryHelper( new UserFormGeometryHelper( m_xCtx, xControl ) );
++	}
++	return xControlToReturn;
++}
++
++namespace controlprovider
++{
++namespace sdecl = comphelper::service_decl;
++sdecl::class_<ControlProviderImpl, sdecl::with_args<false> > serviceImpl;
++extern sdecl::ServiceDecl const serviceDecl(
++    serviceImpl,
++    "ControlProviderImpl",
++    "ooo.vba.ControlProvider" );
++}
++
++
+Index: vbahelper/source/msforms/vbalistcontrolhelper.hxx
+===================================================================
+--- vbahelper/source/msforms/vbalistcontrolhelper.hxx	(revision 0)
++++ vbahelper/source/msforms/vbalistcontrolhelper.hxx	(revision 276288)
+@@ -0,0 +1,20 @@
++#ifndef SC_VBA_LISTCONTROLHELPER
++#define SC_VBA_LISTCONTROLHELPER
++
++#include <vbahelper/vbahelper.hxx>
++
++class ListControlHelper
++{
++	css::uno::Reference< css::beans::XPropertySet > m_xProps;
++
++public:
++	ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){}
++	virtual ~ListControlHelper() {}
++	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
++	virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);   
++    	virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
++	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
++	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
++};
++#endif
+Index: vbahelper/source/msforms/vbatogglebutton.hxx
+===================================================================
+--- vbahelper/source/msforms/vbatogglebutton.hxx	(revision 0)
++++ vbahelper/source/msforms/vbatogglebutton.hxx	(revision 276288)
+@@ -0,0 +1,63 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_TOGGLEBUTTON_HXX
++#define SC_VBA_TOGGLEBUTTON_HXX
++#include <cppuhelper/implbase2.hxx>
++#include <ooo/vba/msforms/XToggleButton.hpp>
++
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++
++typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XToggleButton, css::script::XDefaultProperty  > ToggleButtonImpl_BASE;
++
++class ScVbaToggleButton : public ToggleButtonImpl_BASE
++{
++	rtl::OUString msDftPropName;
++public:
++    ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
++    ~ScVbaToggleButton();
++   // Attributes
++    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++
++    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++    // XDefaultProperty
++    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
++};
++#endif //SC_VBA_TOGGLEBUTTON_HXX
+Index: vbahelper/source/msforms/vbaimage.cxx
+===================================================================
+--- vbahelper/source/msforms/vbaimage.cxx	(revision 0)
++++ vbahelper/source/msforms/vbaimage.cxx	(revision 276288)
+@@ -0,0 +1,59 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaimage.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
++ScVbaImage::ScVbaImage( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ImageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++}
++
++rtl::OUString& 
++ScVbaImage::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaImage") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaImage::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Image" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/vbalabel.hxx
+===================================================================
+--- vbahelper/source/msforms/vbalabel.hxx	(revision 0)
++++ vbahelper/source/msforms/vbalabel.hxx	(revision 276288)
+@@ -0,0 +1,60 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbalabel.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_LABEL_HXX
++#define SC_VBA_LABEL_HXX
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/msforms/XLabel.hpp>
++
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <cppuhelper/implbase2.hxx>
++
++typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XLabel, css::script::XDefaultProperty  > LabelImpl_BASE;
++
++class ScVbaLabel : public LabelImpl_BASE
++{
++public:
++    ScVbaLabel( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
++   // Attributes
++    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
++	//liuchen 2009-7-6 
++	virtual ::sal_Int32 SAL_CALL getForeColor() throw (::com::sun::star::uno::RuntimeException);
++	virtual void SAL_CALL setForeColor( ::sal_Int32 _forecolor ) throw (::com::sun::star::uno::RuntimeException);
++	//liuchen 2009-7-6 end
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++    // XDefaultProperty
++    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
++};
++#endif //SC_VBA_LABEL_HXX
+Index: vbahelper/source/msforms/vbalistbox.cxx
+===================================================================
+--- vbahelper/source/msforms/vbalistbox.cxx	(revision 0)
++++ vbahelper/source/msforms/vbalistbox.cxx	(revision 276288)
+@@ -0,0 +1,292 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbalistbox.cxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
++
++#include "vbalistbox.hxx"
++#include <vector>
++#include <comphelper/anytostring.hxx>
++#include <com/sun/star/script/ArrayWrapper.hpp>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
++const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
++const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
++
++
++ScVbaListBox::ScVbaListBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ListBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++    mpListHelper.reset( new ListControlHelper( m_xProps ) );
++}
++
++// Attributes
++void SAL_CALL 
++ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
++{
++    sal_Int32 nIndex = 0;
++    _value >>= nIndex;
++    uno::Reference< XPropValue > xPropVal( Selected( nIndex ), uno::UNO_QUERY_THROW );
++    xPropVal->setValue( uno::makeAny( sal_True ) ); 
++}
++
++uno::Any SAL_CALL 
++ScVbaListBox::getListIndex() throw (uno::RuntimeException)
++{
++    uno::Sequence< sal_Int16 > sSelection;
++    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
++    if ( sSelection.getLength() == 0 )
++        return uno::Any( sal_Int32( -1 ) );
++    return uno::Any( sSelection[ 0 ] );
++}
++
++uno::Any SAL_CALL 
++ScVbaListBox::getValue() throw (uno::RuntimeException)
++{
++    uno::Sequence< sal_Int16 > sSelection;
++    uno::Sequence< rtl::OUString > sItems;
++    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
++    m_xProps->getPropertyValue( ITEMS ) >>= sItems;
++    if( getMultiSelect() )
++        throw uno::RuntimeException( rtl::OUString::createFromAscii(
++                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
++    uno::Any aRet;
++    if ( sSelection.getLength() )
++        aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] ); 
++    return aRet;
++}
++
++void SAL_CALL 
++ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
++{
++    if( getMultiSelect() )
++    {	
++        throw uno::RuntimeException( rtl::OUString::createFromAscii(
++                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
++    }
++    rtl::OUString sValue = getAnyAsString( _value );
++    uno::Sequence< rtl::OUString > sList;
++    m_xProps->getPropertyValue( ITEMS ) >>= sList;
++    uno::Sequence< sal_Int16 > nList;
++    sal_Int16 nLength = static_cast<sal_Int16>( sList.getLength() );
++    sal_Int16 nValue = -1;
++    sal_Int16 i = 0;
++    for( i = 0; i < nLength; i++ )
++    {
++        if( sList[i].equals( sValue ) )
++        {
++            nValue = i; 
++            break;
++        }
++    }
++    if( nValue == -1 )
++        throw uno::RuntimeException( rtl::OUString::createFromAscii(
++                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
++
++    uno::Sequence< sal_Int16 > nSelectedIndices(1);
++    nSelectedIndices[ 0 ] = nValue;
++    m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nSelectedIndices ) ); 
++	//m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) );   //liuchen 2009-8-12 solve the problem that ListBox.Text and ListBox.Value cannot be set
++}
++
++::rtl::OUString SAL_CALL 
++ScVbaListBox::getText() throw (uno::RuntimeException)
++{
++	rtl::OUString result;
++	getValue() >>= result;
++	return result;
++}
++
++void SAL_CALL 
++ScVbaListBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
++{
++	setValue( uno::makeAny( _text ) ); // seems the same
++}
++
++sal_Int32 SAL_CALL 
++ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException)
++{
++    sal_Bool bMultiSelect = sal_False;
++    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ) ) >>= bMultiSelect;
++    return bMultiSelect ? 1 : 0 ;
++}
++
++void SAL_CALL 
++ScVbaListBox::setMultiSelect( sal_Int32 _multiselect ) throw (css::uno::RuntimeException)
++{
++	sal_Bool bMultiSelect = _multiselect == 1 ? 1 : 0;
++    m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ), uno::makeAny( bMultiSelect ) );
++}
++
++
++css::uno::Any SAL_CALL 
++ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException)
++{
++    uno::Sequence< rtl::OUString > sList;
++    m_xProps->getPropertyValue( ITEMS ) >>= sList;
++    sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
++    // no choice but to do a horror cast as internally
++    // the indices are but sal_Int16 
++    sal_Int16 nIndex = static_cast< sal_Int16 >( index );
++    if( nIndex < 0 || nIndex >= nLength )
++        throw uno::RuntimeException( rtl::OUString::createFromAscii(
++                    "Error Number." ), uno::Reference< uno::XInterface >() );
++    m_nIndex = nIndex;
++    return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
++}
++
++// Methods
++void SAL_CALL 
++ScVbaListBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
++{
++	mpListHelper->AddItem( pvargItem, pvargIndex );
++		}
++
++void SAL_CALL 
++ScVbaListBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
++{
++	mpListHelper->removeItem( index );
++}
++
++void SAL_CALL 
++ScVbaListBox::Clear(  ) throw (uno::RuntimeException)
++{
++	mpListHelper->Clear();
++}
++
++// this is called when something like the following vba code is used
++// to set the selected state of particular entries in the Listbox
++// ListBox1.Selected( 3 ) = false
++//PropListener
++void 
++ScVbaListBox::setValueEvent( const uno::Any& value )
++{
++    sal_Bool bValue = sal_False;
++    if( !(value >>= bValue) )
++        throw uno::RuntimeException( rtl::OUString::createFromAscii(
++                    "Invalid type\n. need boolean." ), uno::Reference< uno::XInterface >() );
++    uno::Sequence< sal_Int16 > nList;
++    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= nList;
++    sal_Int16 nLength = static_cast<sal_Int16>( nList.getLength() );
++    sal_Int16 nIndex = m_nIndex;
++    for( sal_Int16 i = 0; i < nLength; i++ )
++    {
++        if( nList[i] == nIndex )
++        {
++            if( bValue )
++                return;
++            else
++            {
++                for( ; i < nLength - 1; i++ )
++                {
++                    nList[i] = nList[i + 1];
++                }
++                nList.realloc( nLength - 1 );
++                //m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
++		m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nList ) );
++                return;
++            }
++        }
++    }
++    if( bValue )
++    {
++        if( getMultiSelect() )
++        {
++            nList.realloc( nLength + 1 );
++            nList[nLength] = nIndex;
++        }
++        else
++        {
++            nList.realloc( 1 );
++            nList[0] = nIndex;
++        }
++        //m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
++        m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nList ) );
++    }
++}
++
++// this is called when something like the following vba code is used
++// to determine the selected state of particular entries in the Listbox
++// msgbox ListBox1.Selected( 3 )
++
++css::uno::Any 
++ScVbaListBox::getValueEvent()
++{
++    uno::Sequence< sal_Int16 > nList;
++    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" ) ) ) >>= nList;
++    sal_Int32 nLength = nList.getLength();
++    sal_Int32 nIndex = m_nIndex;
++    
++    for( sal_Int32 i = 0; i < nLength; i++ )
++    {
++        if( nList[i] == nIndex )
++            return uno::makeAny( sal_True );
++    }
++
++    return uno::makeAny( sal_False );
++}
++
++void SAL_CALL
++ScVbaListBox::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
++{
++	ScVbaControl::setRowSource( _rowsource );
++	mpListHelper->setRowSource( _rowsource );
++}
++
++sal_Int32 SAL_CALL
++ScVbaListBox::getListCount() throw (uno::RuntimeException)
++{
++	return mpListHelper->getListCount();
++}
++
++uno::Any SAL_CALL 
++ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
++{
++	return mpListHelper->List( pvargIndex, pvarColumn );
++}
++
++rtl::OUString& 
++ScVbaListBox::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaListBox") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaListBox::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ScVbaListBox" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/vbacontrol.hxx
+===================================================================
+--- vbahelper/source/msforms/vbacontrol.hxx	(revision 0)
++++ vbahelper/source/msforms/vbacontrol.hxx	(revision 276288)
+@@ -0,0 +1,114 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbacontrol.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_CONTROL_HXX
++#define SC_VBA_CONTROL_HXX
++
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <com/sun/star/script/XDefaultProperty.hpp>
++#include <com/sun/star/drawing/XControlShape.hpp>
++#include <com/sun/star/awt/XControl.hpp>
++#include <com/sun/star/awt/XWindowPeer.hpp>
++#include <ooo/vba/msforms/XControl.hpp>
++
++#include <vbahelper/vbahelper.hxx>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <memory>
++
++//typedef ::cppu::WeakImplHelper1< ov::msforms::XControl > ControlImpl_BASE;
++typedef InheritedHelperInterfaceImpl1< ov::msforms::XControl > ControlImpl_BASE;
++
++class ScVbaControl : public ControlImpl_BASE
++{
++private:
++    com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > m_xEventListener;
++protected:
++    std::auto_ptr< ov::AbstractGeometryAttributes > mpGeometryHelper;
++    css::uno::Reference< css::beans::XPropertySet > m_xProps;
++    css::uno::Reference< css::uno::XInterface > m_xControl;
++    css::uno::Reference< css::frame::XModel > m_xModel;
++
++    virtual css::uno::Reference< css::awt::XWindowPeer > getWindowPeer() throw (css::uno::RuntimeException);
++public:
++    ScVbaControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, 
++                    const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pHelper );
++    virtual ~ScVbaControl();
++    // This class will own the helper, so make sure it is allocated from 
++    // the heap
++    void setGeometryHelper( ov::AbstractGeometryAttributes* pHelper );
++    // XControl
++    virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException);
++    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL SetFocus(  ) throw (css::uno::RuntimeException);
++
++    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException);
++    virtual rtl::OUString SAL_CALL getControlSource() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setControlSource( const rtl::OUString& _controlsource ) throw (css::uno::RuntimeException);
++    virtual rtl::OUString SAL_CALL getRowSource() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
++    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
++    virtual rtl::OUString SAL_CALL getControlTipText() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setControlTipText( const rtl::OUString& ) throw (css::uno::RuntimeException);
++    //remove resouce because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape
++    virtual void removeResouce() throw( css::uno::RuntimeException );
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++
++class ScVbaControlFactory
++{
++public:
++    ScVbaControlFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, 
++                    const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel );
++    ScVbaControl* createControl()  throw ( css::uno::RuntimeException );
++    ScVbaControl* createControl( const css::uno::Reference< css::uno::XInterface >& xParent )  throw ( css::uno::RuntimeException );
++private:
++    ScVbaControl* createControl( const css::uno::Reference< css::awt::XControl >&, const css::uno::Reference< css::uno::XInterface >&  )  throw ( css::uno::RuntimeException );
++    ScVbaControl* createControl( const css::uno::Reference< css::drawing::XControlShape >&, const css::uno::Reference< css::uno::XInterface >& )  throw ( css::uno::RuntimeException );
++    css::uno::Reference< css::uno::XComponentContext > m_xContext;
++    css::uno::Reference< css::uno::XInterface > m_xControl;
++    css::uno::Reference< css::frame::XModel > m_xModel;
++};
++
++#endif//SC_VBA_CONTROL_HXX
+Index: vbahelper/source/msforms/vbaimage.hxx
+===================================================================
+--- vbahelper/source/msforms/vbaimage.hxx	(revision 0)
++++ vbahelper/source/msforms/vbaimage.hxx	(revision 276288)
+@@ -0,0 +1,48 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_IMAGE_HXX
++#define SC_VBA_IMAGE_HXX
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/msforms/XImage.hpp>
++
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++
++typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XImage > ImageImpl_BASE;
++
++class ScVbaImage : public ImageImpl_BASE
++{
++public:
++    ScVbaImage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif //SC_VBA_IMAGE_HXX
+Index: vbahelper/source/msforms/vbamultipage.cxx
+===================================================================
+--- vbahelper/source/msforms/vbamultipage.cxx	(revision 0)
++++ vbahelper/source/msforms/vbamultipage.cxx	(revision 276288)
+@@ -0,0 +1,132 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbamultipage.hxx"
++#include <ooo/vba/XCollection.hpp>
++#include "vbapages.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++// uno servicename com.sun.star.awt.UnoControlProgressBarMode
++const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
++const rtl::OUString SVALUEMAX( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") );
++const rtl::OUString SSTEP( RTL_CONSTASCII_USTRINGPARAM("Step") );
++
++typedef cppu::WeakImplHelper1< container::XIndexAccess > PagesImpl_Base;
++class PagesImpl : public PagesImpl_Base
++{
++	sal_Int32 mnPages;
++public:
++	PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {}
++	virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException) { return mnPages; }
++	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException)
++	{
++		if ( Index < 0 || Index > mnPages )
++			throw lang::IndexOutOfBoundsException();
++		return uno::makeAny( uno::Reference< uno::XInterface >() );
++	}
++	// XElementAccess
++	virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
++	{
++		// no Pages object yet #FIXME
++		//return msforms::XPage::static_type(0);
++		return uno::XInterface::static_type(0);
++	}
++	virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
++	{
++		return ( mnPages > 0 );
++	}
++};
++uno::Reference< container::XIndexAccess > 
++ScVbaMultiPage::getPages( sal_Int32 nPages )
++{
++	return new PagesImpl( nPages );
++}
++
++ScVbaMultiPage::ScVbaMultiPage( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, const uno::Reference< uno::XInterface >& xDialog ) : MultiPageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++    mxDialogProps.set( xDialog, uno::UNO_QUERY_THROW );
++    // set dialog step to value of multipage pseudo model
++    setValue(getValue());
++}
++
++// Attributes
++sal_Int32 SAL_CALL 
++ScVbaMultiPage::getValue() throw (css::uno::RuntimeException)
++{
++    sal_Int32 nValue = 0;
++    m_xProps->getPropertyValue( SVALUE ) >>= nValue;
++    return nValue;
++}
++
++void SAL_CALL 
++ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException)
++{
++    // track change in dialog ( dialog value is 1 based, 0 is a special value )
++    m_xProps->setPropertyValue( SVALUE, uno::makeAny( _value ) );
++    mxDialogProps->setPropertyValue( SSTEP, uno::makeAny( _value + 1) );
++}
++
++
++rtl::OUString& 
++ScVbaMultiPage::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMultiPage") );
++	return sImplName;
++}
++
++uno::Any SAL_CALL 
++ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException)
++{
++	sal_Int32 nValue = 0;
++	m_xProps->getPropertyValue( SVALUEMAX ) >>= nValue;
++	uno::Reference< XCollection > xColl( new ScVbaPages( this, mxContext, getPages( nValue ) ) );
++	if ( !index.hasValue() )
++		return uno::makeAny( xColl );
++	return xColl->Item( uno::makeAny( index ), uno::Any() );
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaMultiPage::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.MultiPage" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/makefile.mk
+===================================================================
+--- vbahelper/source/msforms/makefile.mk	(revision 0)
++++ vbahelper/source/msforms/makefile.mk	(revision 276288)
+@@ -0,0 +1,78 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.45 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..
++PRJNAME=vbahelper
++TARGET=msforms
++
++ENABLE_EXCEPTIONS := TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++SLOFILES=\
++    $(SLO)$/vbacontrol.obj \
++    $(SLO)$/vbacontrols.obj \
++    $(SLO)$/vbabutton.obj \
++    $(SLO)$/vbacombobox.obj \
++    $(SLO)$/vbalabel.obj \
++    $(SLO)$/vbatextbox.obj \
++    $(SLO)$/vbaradiobutton.obj \
++    $(SLO)$/vbalistbox.obj \
++    $(SLO)$/vbatogglebutton.obj \
++    $(SLO)$/vbacheckbox.obj \
++    $(SLO)$/vbaframe.obj \
++    $(SLO)$/vbascrollbar.obj \
++    $(SLO)$/vbaprogressbar.obj \
++    $(SLO)$/vbamultipage.obj \
++    $(SLO)$/vbalistcontrolhelper.obj \
++    $(SLO)$/vbaspinbutton.obj \
++    $(SLO)$/vbaimage.obj \
++    $(SLO)$/vbapages.obj \
++    $(SLO)$/vbauserform.obj \
++    $(SLO)$/service.obj \
++
++# #FIXME vbapropvalue needs to move to vbahelper
++
++# --- Targets -------------------------------------------------------
++
++.INCLUDE :  target.mk
++
++ALLTAR : \
++        $(MISC)$/$(TARGET).don \
++
++$(SLOFILES) : $(MISC)$/$(TARGET).don
++
++$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++        echo $@
++
+Index: vbahelper/source/msforms/vbalistbox.hxx
+===================================================================
+--- vbahelper/source/msforms/vbalistbox.hxx	(revision 0)
++++ vbahelper/source/msforms/vbalistbox.hxx	(revision 276288)
+@@ -0,0 +1,90 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbalistbox.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_LISTBOX_HXX
++#define SC_VBA_LISTBOX_HXX
++#include <cppuhelper/implbase2.hxx>
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <com/sun/star/script/XDefaultProperty.hpp>
++#include <ooo/vba/msforms/XListBox.hpp>
++#include <com/sun/star/beans/PropertyAttribute.hpp>
++
++#include "vbacontrol.hxx"
++#include <vbahelper/vbapropvalue.hxx>
++#include "vbalistcontrolhelper.hxx"
++#include <vbahelper/vbahelper.hxx>
++
++typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::script::XDefaultProperty > ListBoxImpl_BASE;
++class ScVbaListBox : public ListBoxImpl_BASE
++    ,public PropListener
++{		
++	std::auto_ptr< ListControlHelper > mpListHelper;
++	rtl::OUString sSourceName; 
++	rtl::OUString msDftPropName;
++
++    sal_Int16 m_nIndex;
++	
++public:
++	ScVbaListBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
++
++	// Attributes
++	virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++	virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getMultiSelect() throw (css::uno::RuntimeException);  //liuchen 2009-7-31
++    virtual void SAL_CALL setMultiSelect( ::sal_Int32 _multiselect ) throw (css::uno::RuntimeException); //liuchen 2009-7-31
++    virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException);
++
++	// Methods
++	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
++	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
++	// XControl
++    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
++
++	// XDefaultProperty
++    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
++    
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();    
++
++    //PropListener
++    virtual void setValueEvent( const css::uno::Any& value );
++    virtual css::uno::Any getValueEvent();
++
++
++};
++
++#endif //
+Index: vbahelper/source/msforms/vbaradiobutton.cxx
+===================================================================
+--- vbahelper/source/msforms/vbaradiobutton.cxx	(revision 0)
++++ vbahelper/source/msforms/vbaradiobutton.cxx	(revision 276288)
+@@ -0,0 +1,107 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbaradiobutton.cxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbaradiobutton.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
++const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
++ScVbaRadioButton::ScVbaRadioButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : RadioButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++}
++
++// Attributes
++rtl::OUString SAL_CALL 
++ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException)
++{
++    rtl::OUString Label;
++    m_xProps->getPropertyValue( LABEL ) >>= Label;
++    return Label;
++}
++
++void SAL_CALL 
++ScVbaRadioButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
++}
++
++uno::Any SAL_CALL 
++ScVbaRadioButton::getValue() throw (css::uno::RuntimeException)
++{
++    sal_Int16 nValue = -1;
++    m_xProps->getPropertyValue( STATE ) >>= nValue;
++    if( nValue != 0 )
++        nValue = -1;
++//    return uno::makeAny( nValue ); 
++// I must be missing something MSO says value should be -1 if selected, 0 if not
++// selected
++    return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); 
++
++}
++
++void SAL_CALL 
++ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
++{
++    sal_Int16 nValue = 0;
++    sal_Bool bValue = sal_False;
++    if( _value >>= nValue )
++    {
++        if( nValue == -1)
++        nValue = 1;
++    }
++    else if ( _value >>= bValue )
++    {
++        if ( bValue )
++            nValue = 1;
++    }
++    m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
++}
++
++rtl::OUString& 
++ScVbaRadioButton::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRadioButton") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaRadioButton::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.RadioButton" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/vbamultipage.hxx
+===================================================================
+--- vbahelper/source/msforms/vbamultipage.hxx	(revision 0)
++++ vbahelper/source/msforms/vbamultipage.hxx	(revision 276288)
+@@ -0,0 +1,65 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_MULTIPAGE_HXX
++#define SC_VBA_MULTIPAGE_HXX
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/msforms/XMultiPage.hpp>
++#include <com/sun/star/container/XIndexAccess.hpp>
++
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++//#include <cppuhelper/implbase2.hxx>
++#include <cppuhelper/implbase1.hxx>
++
++typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XMultiPage > MultiPageImpl_BASE;
++
++class ScVbaMultiPage : public MultiPageImpl_BASE
++{
++    css::uno::Reference< css::container::XIndexAccess > getPages( sal_Int32 nPages );
++    css::uno::Reference< css::beans::XPropertySet > mxDialogProps;
++public:
++    ScVbaMultiPage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, const css::uno::Reference< css::uno::XInterface >& xDialog );
++   // Attributes
++    virtual sal_Int32 SAL_CALL getValue() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( sal_Int32 _value ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) throw (css::uno::RuntimeException);
++
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++    // XDefaultProperty
++    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
++};
++#endif //SC_VBA_LABEL_HXX
+Index: vbahelper/source/msforms/vbatextbox.cxx
+===================================================================
+--- vbahelper/source/msforms/vbatextbox.cxx	(revision 0)
++++ vbahelper/source/msforms/vbatextbox.cxx	(revision 276288)
+@@ -0,0 +1,138 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbatextbox.cxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <com/sun/star/text/XTextRange.hpp>
++
++#include "vbatextbox.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++
++ScVbaTextBox::ScVbaTextBox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialog ) : TextBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialog( bDialog )
++{
++}
++
++// Attributes
++uno::Any SAL_CALL 
++ScVbaTextBox::getValue() throw (css::uno::RuntimeException)
++{
++	return uno::makeAny( getText() );
++}
++
++void SAL_CALL 
++ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
++{
++	rtl::OUString sVal = getAnyAsString( _value );
++	setText( sVal );
++}
++
++//getString() will cause some imfo lose.
++rtl::OUString SAL_CALL 
++ScVbaTextBox::getText() throw (css::uno::RuntimeException)
++{
++    uno::Any aValue;
++    aValue = m_xProps->getPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ) ) );
++    rtl::OUString sString;
++    aValue >>= sString;
++    return sString;
++}
++
++void SAL_CALL 
++ScVbaTextBox::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException)
++{
++    if ( !mbDialog )
++    {
++    uno::Reference< text::XTextRange > xTextRange( m_xProps, uno::UNO_QUERY_THROW );
++    xTextRange->setString( _text );
++}
++    else
++        m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text") ), uno::makeAny( _text ) ); 
++}
++
++sal_Int32 SAL_CALL 
++ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException)
++{
++    uno::Any aValue;
++    aValue = m_xProps->getPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ) );
++    sal_Int32 nMaxLength = 0;
++    aValue >>= nMaxLength;
++    return nMaxLength;
++}
++
++void SAL_CALL 
++ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException)
++{
++	sal_Int16 _maxlength16 = static_cast<sal_Int16> (_maxlength); //liuchen 2009-7-24, resolve the problem that MaxLength cannot be set correctly
++    uno::Any aValue( _maxlength16 );                              //liuchen 2009-7-24, resolve the problem that MaxLength cannot be set correctly
++    m_xProps->setPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ), aValue);
++}
++
++sal_Bool SAL_CALL 
++ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException)
++{
++    uno::Any aValue;
++    aValue = m_xProps->getPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ) );
++    sal_Bool bRet = false;
++    aValue >>= bRet;
++    return bRet;
++}
++
++void SAL_CALL 
++ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException)
++{
++    uno::Any aValue( _multiline );
++    m_xProps->setPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ), aValue);
++}
++
++rtl::OUString& 
++ScVbaTextBox::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaTextBox") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaTextBox::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.TextBox" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/vbapages.cxx
+===================================================================
+--- vbahelper/source/msforms/vbapages.cxx	(revision 0)
++++ vbahelper/source/msforms/vbapages.cxx	(revision 276288)
+@@ -0,0 +1,80 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbapages.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++ScVbaPages::ScVbaPages( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPages ) throw( lang::IllegalArgumentException ) : ScVbaPages_BASE( xParent, xContext, xPages )
++{
++}
++
++uno::Type SAL_CALL 
++ScVbaPages::getElementType() throw (uno::RuntimeException)
++{
++	// return msforms::XPage::static_type(0); 
++	return uno::XInterface::static_type(0); 
++}
++
++uno::Any 
++ScVbaPages::createCollectionObject( const css::uno::Any& aSource )
++{
++	return aSource;
++}
++
++rtl::OUString& 
++ScVbaPages::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPages") );
++	return sImplName;
++}
++
++uno::Reference< container::XEnumeration > SAL_CALL 
++ScVbaPages::createEnumeration() throw (uno::RuntimeException)
++{
++	return uno::Reference< container::XEnumeration >();
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaPages::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Pages" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/vbaradiobutton.hxx
+===================================================================
+--- vbahelper/source/msforms/vbaradiobutton.hxx	(revision 0)
++++ vbahelper/source/msforms/vbaradiobutton.hxx	(revision 276288)
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbaradiobutton.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_RADIOBUTTON_HXX
++#define SC_VBA_RADIOBUTTON_HXX
++#include <ooo/vba/msforms/XRadioButton.hpp>
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <cppuhelper/implbase2.hxx>
++
++typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > RadioButtonImpl_BASE;
++
++class ScVbaRadioButton : public RadioButtonImpl_BASE
++{
++public:
++    ScVbaRadioButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
++   // Attributes
++    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue(const com::sun::star::uno::Any&) throw (css::uno::RuntimeException);
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++    // XDefaultProperty
++    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
++
++};
++#endif //SC_VBA_RADIOBUTTON_HXX
+Index: vbahelper/source/msforms/vbatextbox.hxx
+===================================================================
+--- vbahelper/source/msforms/vbatextbox.hxx	(revision 0)
++++ vbahelper/source/msforms/vbatextbox.hxx	(revision 276288)
+@@ -0,0 +1,59 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbatextbox.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_TEXTBOX_HXX
++#define SC_VBA_TEXTBOX_HXX
++#include <cppuhelper/implbase2.hxx>
++#include <ooo/vba/msforms/XTextBox.hpp>
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++
++typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XTextBox, css::script::XDefaultProperty > TextBoxImpl_BASE;
++
++class ScVbaTextBox : public TextBoxImpl_BASE
++{
++    bool mbDialog;
++public:
++    ScVbaTextBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialog = false );
++   // Attributes
++    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++    virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getMaxLength() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException);
++    virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException);
++    // XDefaultProperty
++    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif //SC_VBA_TEXTBOX_HXX
+Index: vbahelper/source/msforms/vbauserform.cxx
+===================================================================
+--- vbahelper/source/msforms/vbauserform.cxx	(revision 0)
++++ vbahelper/source/msforms/vbauserform.cxx	(revision 276288)
+@@ -0,0 +1,227 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include <vbahelper/helperdecl.hxx>
++#include "vbauserform.hxx"
++#include <com/sun/star/awt/XControl.hpp>
++#include <com/sun/star/awt/XControlContainer.hpp>
++#include <com/sun/star/beans/PropertyConcept.hpp>
++#include <basic/sbx.hxx>
++#include <basic/sbstar.hxx>
++#include <basic/sbmeth.hxx>
++#include "vbacontrols.hxx"
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++// some little notes
++// XDialog implementation has the following interesting bits
++// a Controls property ( which is an array of the container controls )
++//   each item in the controls array is a XControl, where the model is 
++//   basically a property bag
++// additionally the XDialog instance has itself a model
++//     this model has a ControlModels ( array of models ) property
++//     the models in ControlModels can be accessed by name
++// also the XDialog is a XControl ( to access the model above
++
++ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) throw ( lang::IllegalArgumentException ) :  ScVbaUserForm_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext, getXSomethingFromArgs< uno::XInterface >( aArgs, 1 ), getXSomethingFromArgs< frame::XModel >( aArgs, 2 ), static_cast< ooo::vba::AbstractGeometryAttributes* >(0) ),  mbDispose( true )
++{
++    m_xDialog.set( m_xControl, uno::UNO_QUERY_THROW );
++    uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW );
++    m_xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW );
++    setGeometryHelper( new UserFormGeometryHelper( xContext, xControl ) );
++}
++
++ScVbaUserForm::~ScVbaUserForm()
++{
++}
++
++void SAL_CALL 
++ScVbaUserForm::Show(  ) throw (uno::RuntimeException)
++{
++	OSL_TRACE("ScVbaUserForm::Show(  )");
++	short aRet = 0;
++        mbDispose = true;
++	if ( m_xDialog.is() )
++		aRet = m_xDialog->execute();
++	OSL_TRACE("ScVbaUserForm::Show() execute returned %d", aRet);
++	if ( mbDispose )
++	{
++		try
++		{
++			uno::Reference< lang::XComponent > xComp( m_xDialog, uno::UNO_QUERY_THROW );
++			m_xDialog = NULL;
++			xComp->dispose();
++			mbDispose = false; 
++		}
++		catch( uno::Exception& )
++		{
++		}
++	}
++}
++
++rtl::OUString SAL_CALL 
++ScVbaUserForm::getCaption() throw (::com::sun::star::uno::RuntimeException)
++{
++    rtl::OUString sCaption;
++    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ) ) >>= sCaption;
++    return sCaption;
++}
++void
++ScVbaUserForm::setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ), uno::makeAny( _caption ) );
++}
++
++void SAL_CALL 
++ScVbaUserForm::Hide(  ) throw (uno::RuntimeException)
++{
++	mbDispose = false;  // hide not dispose
++	if ( m_xDialog.is() )
++		m_xDialog->endExecute();
++}
++
++void SAL_CALL 
++ScVbaUserForm::RePaint(  ) throw (uno::RuntimeException)
++{
++	// do nothing
++}
++
++void SAL_CALL 
++ScVbaUserForm::UnloadObject(  ) throw (uno::RuntimeException)
++{
++	mbDispose = true;
++	if ( m_xDialog.is() )
++		m_xDialog->endExecute();
++}
++
++rtl::OUString& 
++ScVbaUserForm::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaUserForm") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaUserForm::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.UserForm" ) );
++	}
++	return aServiceNames;
++}
++
++uno::Reference< beans::XIntrospectionAccess > SAL_CALL 
++ScVbaUserForm::getIntrospection(  ) throw (uno::RuntimeException)
++{
++	return uno::Reference< beans::XIntrospectionAccess >();
++}
++
++uno::Any SAL_CALL 
++ScVbaUserForm::invoke( const ::rtl::OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
++{
++	throw uno::RuntimeException(); // unsupported operation
++}
++
++void SAL_CALL 
++ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
++{
++	uno::Any aObject = getValue( aPropertyName );
++	// The Object *must* support XDefaultProperty here because getValue will
++	// only return properties that are Objects ( e.g. controls )
++	// e.g. Userform1.aControl = something
++	// 'aControl' has to support XDefaultProperty to make sense here
++	uno::Reference< script::XDefaultProperty > xDfltProp( aObject, uno::UNO_QUERY_THROW );
++	rtl::OUString aDfltPropName = xDfltProp->getDefaultPropertyName();
++	uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObject ) );
++	uno::Reference< beans::XPropertySet > xPropSet( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY_THROW );
++	xPropSet->setPropertyValue( aDfltPropName, aValue );
++}
++
++uno::Any SAL_CALL 
++ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
++{
++	uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
++	uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
++	uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
++	ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
++        uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
++        ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
++        pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
++	return uno::makeAny( xVBAControl );
++}
++
++::sal_Bool SAL_CALL 
++ScVbaUserForm::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException)
++{
++	return sal_False;
++}
++uno::Any SAL_CALL 
++ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException)
++{
++	uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
++	uno::Reference< XCollection > xControls( new ScVbaControls( this, mxContext, xDialogControl ) );
++	if ( index.hasValue() )
++		return uno::makeAny( xControls->Item( index, uno::Any() ) );
++	return uno::makeAny( xControls );
++}
++
++::sal_Bool SAL_CALL 
++ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
++{
++	uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY );
++	OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is() );
++	if ( xControl.is() )
++	{
++		uno::Reference< container::XNameAccess > xNameAccess( xControl->getModel(), uno::UNO_QUERY_THROW );	
++		sal_Bool bRes =  xNameAccess->hasByName( aName );
++	OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d ---> %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is(), bRes );
++		return bRes;
++	}
++	return sal_False;
++}
++
++namespace userform
++{
++namespace sdecl = comphelper::service_decl;
++sdecl::vba_service_class_<ScVbaUserForm, sdecl::with_args<true> > serviceImpl;
++extern sdecl::ServiceDecl const serviceDecl(
++    serviceImpl,
++    "ScVbaUserForm",
++    "ooo.vba.msforms.UserForm" );
++}
++
+Index: vbahelper/source/msforms/vbapages.hxx
+===================================================================
+--- vbahelper/source/msforms/vbapages.hxx	(revision 0)
++++ vbahelper/source/msforms/vbapages.hxx	(revision 276288)
+@@ -0,0 +1,64 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_PAGES_HXX
++#define SC_VBA_PAGES_HXX
++
++#include <ooo/vba/office/MsoShapeType.hpp>
++#include <com/sun/star/lang/XEventListener.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <ooo/vba/msforms/XPages.hpp>
++#include <cppuhelper/implbase2.hxx>
++#include <cppuhelper/implbase1.hxx>
++
++#include <vbahelper/vbacollectionimpl.hxx>
++typedef CollTestImplHelper< 
++ov::msforms::XPages > ScVbaPages_BASE;
++
++class ScVbaPages : public ScVbaPages_BASE
++{
++protected:
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++public:
++    ScVbaPages( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPages ) throw ( css::lang::IllegalArgumentException );
++    virtual ~ScVbaPages() {}
++        // XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++     // ScVbaPages_BASE
++     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++
++};
++#endif//SC_VBA_SHAPE_HXX
+Index: vbahelper/source/msforms/vbaspinbutton.cxx
+===================================================================
+--- vbahelper/source/msforms/vbaspinbutton.cxx	(revision 0)
++++ vbahelper/source/msforms/vbaspinbutton.cxx	(revision 276288)
+@@ -0,0 +1,109 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbaspinbutton.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
++const static rtl::OUString SPINVALUE( RTL_CONSTASCII_USTRINGPARAM("SpinValue") );
++const static rtl::OUString SPINMAX( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") );
++const static rtl::OUString SPINMIN( RTL_CONSTASCII_USTRINGPARAM("SpinValueMin") );
++
++ScVbaSpinButton::ScVbaSpinButton(  const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : SpinButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++}
++
++// Attributes
++uno::Any SAL_CALL 
++ScVbaSpinButton::getValue() throw (css::uno::RuntimeException)
++{
++    return  m_xProps->getPropertyValue( SPINVALUE );
++}
++
++void SAL_CALL 
++ScVbaSpinButton::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( SPINVALUE, _value );
++}
++
++::sal_Int32 SAL_CALL 
++ScVbaSpinButton::getMax() throw (uno::RuntimeException)
++{
++    sal_Int32 nMax = 0;
++    m_xProps->getPropertyValue( SPINMAX ) >>= nMax;
++    return nMax;
++}
++
++void SAL_CALL 
++ScVbaSpinButton::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( SPINMAX, uno::makeAny( nVal ) ); 
++}
++
++::sal_Int32 SAL_CALL 
++ScVbaSpinButton::getMin() throw (uno::RuntimeException)
++{
++    sal_Int32 nVal = 0;
++    m_xProps->getPropertyValue( SPINMIN ) >>= nVal;
++    return nVal;
++}
++
++void SAL_CALL 
++ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) ); 
++}
++
++rtl::OUString& 
++ScVbaSpinButton::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaSpinButton") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaSpinButton::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/service.cxx
+===================================================================
+--- vbahelper/source/msforms/service.cxx	(revision 0)
++++ vbahelper/source/msforms/service.cxx	(revision 276288)
+@@ -0,0 +1,83 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: service.cxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "cppuhelper/implementationentry.hxx"
++#include "com/sun/star/lang/XMultiServiceFactory.hpp"
++#include "com/sun/star/registry/XRegistryKey.hpp"
++#include "comphelper/servicedecl.hxx"
++
++// =============================================================================
++// component exports
++// =============================================================================
++using namespace ::com::sun::star;
++using namespace ::com::sun::star::uno;
++
++namespace sdecl = comphelper::service_decl;
++
++// reference service helper(s)
++namespace  controlprovider
++{
++extern sdecl::ServiceDecl const serviceDecl;
++}
++
++namespace  userform
++{
++extern sdecl::ServiceDecl const serviceDecl;
++}
++
++extern "C"
++{
++    void SAL_CALL component_getImplementationEnvironment( 
++        const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
++    {
++		OSL_TRACE("In component_getImplementationEnv");
++        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
++    }
++
++    sal_Bool SAL_CALL component_writeInfo( 
++        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
++    {
++		OSL_TRACE("In component_writeInfo");
++
++	// Component registration
++         return component_writeInfoHelper( pServiceManager, pRegistryKey, 
++		controlprovider::serviceDecl, userform::serviceDecl );
++    }
++
++    void * SAL_CALL component_getFactory( 
++        const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
++        registry::XRegistryKey * pRegistryKey )
++    {
++		OSL_TRACE("In component_getFactory for %s", pImplName );
++	void* pRet =  component_getFactoryHelper(
++        	pImplName, pServiceManager, pRegistryKey, controlprovider::serviceDecl, userform::serviceDecl );
++	OSL_TRACE("Ret is 0x%x", pRet);
++	return pRet;
++    }
++}
+Index: vbahelper/source/msforms/vbauserform.hxx
+===================================================================
+--- vbahelper/source/msforms/vbauserform.hxx	(revision 0)
++++ vbahelper/source/msforms/vbauserform.hxx	(revision 276288)
+@@ -0,0 +1,77 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_USERFORM_HXX
++#define SC_VBA_USERFORM_HXX
++
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/msforms/XUserForm.hpp>
++#include <com/sun/star/awt/XDialog.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++
++#include <vbahelper/vbahelperinterface.hxx>
++#include "vbacontrol.hxx"
++
++//typedef InheritedHelperInterfaceImpl1< ov::msforms::XUserForm > ScVbaUserForm_BASE;
++typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XUserForm > ScVbaUserForm_BASE;
++
++class ScVbaUserForm : public ScVbaUserForm_BASE
++{
++private:
++    css::uno::Reference< css::awt::XDialog > m_xDialog;
++    bool mbDispose;
++protected:
++public:
++    ScVbaUserForm( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException );
++    virtual ~ScVbaUserForm();
++    // XUserForm
++    virtual void SAL_CALL RePaint(  ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL Show(  ) throw (css::uno::RuntimeException);
++    // XIntrospection
++    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
++    virtual ::rtl::OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException);
++    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException);
++    virtual void SAL_CALL Hide(  ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL UnloadObject(  ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) throw (css::uno::RuntimeException);
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif
+Index: vbahelper/source/msforms/vbaspinbutton.hxx
+===================================================================
+--- vbahelper/source/msforms/vbaspinbutton.hxx	(revision 0)
++++ vbahelper/source/msforms/vbaspinbutton.hxx	(revision 276288)
+@@ -0,0 +1,61 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_SPINBUTTON_HXX
++#define SC_VBA_SPINBUTTON_HXX
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/msforms/XSpinButton.hpp>
++
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++
++typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XSpinButton > SpinButtonImpl_BASE;
++
++class ScVbaSpinButton : public SpinButtonImpl_BASE
++{
++public:
++    ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
++   // Attributes
++    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
++
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif //SC_VBA_SPINBUTTON_HXX
+Index: vbahelper/source/msforms/vbabutton.cxx
+===================================================================
+--- vbahelper/source/msforms/vbabutton.cxx	(revision 0)
++++ vbahelper/source/msforms/vbabutton.cxx	(revision 276288)
+@@ -0,0 +1,74 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbabutton.cxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbabutton.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
++ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++}
++
++// Attributes
++rtl::OUString SAL_CALL 
++ScVbaButton::getCaption() throw (css::uno::RuntimeException)
++{
++    rtl::OUString Label;
++    m_xProps->getPropertyValue( LABEL ) >>= Label;
++    return Label;
++}
++
++void SAL_CALL 
++ScVbaButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
++}
++
++rtl::OUString& 
++ScVbaButton::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaButton") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaButton::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Button" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/msforms/vbabutton.hxx
+===================================================================
+--- vbahelper/source/msforms/vbabutton.hxx	(revision 0)
++++ vbahelper/source/msforms/vbabutton.hxx	(revision 276288)
+@@ -0,0 +1,51 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbabutton.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_BUTTON_HXX
++#define SC_VBA_BUTTON_HXX
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/msforms/XButton.hpp>
++
++#include "vbacontrol.hxx"
++#include <vbahelper/vbahelper.hxx>
++
++typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XButton > ButtonImpl_BASE;
++
++class ScVbaButton : public ButtonImpl_BASE
++{
++public:
++    ScVbaButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
++   // Attributes
++    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
++    //XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif //SC_VBA_BUTTON_HXX
+Index: vbahelper/source/msforms/vbascrollbar.cxx
+===================================================================
+--- vbahelper/source/msforms/vbascrollbar.cxx	(revision 0)
++++ vbahelper/source/msforms/vbascrollbar.cxx	(revision 276288)
+@@ -0,0 +1,139 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbascrollbar.hxx"
++#include <vector>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++const static rtl::OUString LARGECHANGE( RTL_CONSTASCII_USTRINGPARAM("BlockIncrement") );
++const static rtl::OUString SMALLCHANGE( RTL_CONSTASCII_USTRINGPARAM("LineIncrement") );
++const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
++const static rtl::OUString SCROLLVALUE( RTL_CONSTASCII_USTRINGPARAM("ScrollValue") );
++const static rtl::OUString SCROLLMAX( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMax") );
++const static rtl::OUString SCROLLMIN( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMin") );
++
++ScVbaScrollBar::ScVbaScrollBar(  const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ScrollBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
++{
++}
++
++// Attributes
++uno::Any SAL_CALL 
++ScVbaScrollBar::getValue() throw (css::uno::RuntimeException)
++{
++    return  m_xProps->getPropertyValue( SCROLLVALUE );
++}
++
++void SAL_CALL 
++ScVbaScrollBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( SCROLLVALUE, _value );
++}
++
++::sal_Int32 SAL_CALL 
++ScVbaScrollBar::getMax() throw (uno::RuntimeException)
++{
++    sal_Int32 nMax = 0;
++    m_xProps->getPropertyValue( SCROLLMAX ) >>= nMax;
++    return nMax;
++}
++
++void SAL_CALL 
++ScVbaScrollBar::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( SCROLLMAX, uno::makeAny( nVal ) ); 
++}
++
++::sal_Int32 SAL_CALL 
++ScVbaScrollBar::getMin() throw (uno::RuntimeException)
++{
++    sal_Int32 nVal = 0;
++    m_xProps->getPropertyValue( SCROLLMIN ) >>= nVal;
++    return nVal;
++}
++
++void SAL_CALL 
++ScVbaScrollBar::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( SCROLLMIN, uno::makeAny( nVal ) ); 
++}
++
++void SAL_CALL 
++ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange ) throw (uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( LARGECHANGE, uno::makeAny( _largechange ) );
++}
++
++::sal_Int32 SAL_CALL 
++ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException)
++{
++    sal_Int32 nVal = 0;
++    m_xProps->getPropertyValue( LARGECHANGE ) >>= nVal;
++    return nVal;
++}
++
++::sal_Int32 SAL_CALL 
++ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException)
++{
++    sal_Int32 nSmallChange = 0;
++    m_xProps->getPropertyValue( SMALLCHANGE ) >>= nSmallChange;
++    return nSmallChange;
++}
++
++void SAL_CALL 
++ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeException)
++{
++    m_xProps->setPropertyValue( SMALLCHANGE, uno::makeAny( _smallchange ) );
++}
++
++rtl::OUString& 
++ScVbaScrollBar::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaScrollBar") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaScrollBar::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/vbahelper/vbaglobalbase.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbaglobalbase.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbaglobalbase.cxx	(revision 276288)
+@@ -0,0 +1,126 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbahelper/vbaglobalbase.hxx"
++
++#include <cppuhelper/component_context.hxx>
++#include <comphelper/processfactory.hxx>
++#include <com/sun/star/container/XNameContainer.hpp>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++rtl::OUString sApplication( RTL_CONSTASCII_USTRINGPARAM("Application") );
++
++VbaGlobalsBase::VbaGlobalsBase( 
++const uno::Reference< ov::XHelperInterface >& xParent, 
++const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sDocCtxName ) 
++:  Globals_BASE( xParent, xContext )
++{
++    // overwrite context with custom one ( that contains the application )
++    ::cppu::ContextEntry_Init aHandlerContextInfo[] =
++    {
++        ::cppu::ContextEntry_Init( sApplication, uno::Any() ), 
++        ::cppu::ContextEntry_Init( sDocCtxName, uno::Any() ), 
++    };
++
++    mxContext = ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), xContext );
++
++}
++
++
++void
++VbaGlobalsBase::init(  const uno::Sequence< beans::PropertyValue >& aInitArgs )
++{
++    sal_Int32 nLen = aInitArgs.getLength();
++    for ( sal_Int32 nIndex = 0; nIndex < nLen; ++nIndex )
++    {
++        uno::Reference< container::XNameContainer > xNameContainer( mxContext, uno::UNO_QUERY_THROW );
++        if ( aInitArgs[ nIndex ].Name.equals( sApplication ) )
++        {
++            xNameContainer->replaceByName( sApplication, aInitArgs[ nIndex ].Value );
++            uno::Reference< XHelperInterface > xParent( aInitArgs[ nIndex ].Value, uno::UNO_QUERY );
++            mxParent = xParent;
++        }
++        else 
++            xNameContainer->replaceByName( aInitArgs[ nIndex ].Name, aInitArgs[ nIndex ].Value );
++    }
++}
++
++uno::Reference< uno::XInterface > SAL_CALL 
++VbaGlobalsBase::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException)
++{
++    uno::Reference< uno::XInterface > xReturn;
++
++    if ( hasServiceName( aServiceSpecifier ) )
++        xReturn = mxContext->getServiceManager()->createInstanceWithContext( aServiceSpecifier, mxContext );
++    return xReturn;
++}
++
++uno::Reference< uno::XInterface > SAL_CALL 
++VbaGlobalsBase::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException)
++{
++    
++    uno::Reference< uno::XInterface > xReturn;
++
++    if ( hasServiceName( ServiceSpecifier ) )
++        xReturn = mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( ServiceSpecifier, Arguments, mxContext );
++    return xReturn;
++}
++
++uno::Sequence< ::rtl::OUString > SAL_CALL 
++VbaGlobalsBase::getAvailableServiceNames(  ) throw (uno::RuntimeException)
++{
++    static const rtl::OUString names[] = { 
++    // common
++        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.msforms.UserForm" ) ),
++      };
++    static uno::Sequence< rtl::OUString > serviceNames( names, sizeof( names )/ sizeof( names[0] ) );
++    return serviceNames;
++}
++
++bool
++VbaGlobalsBase::hasServiceName( const rtl::OUString& serviceName )
++{
++    uno::Sequence< rtl::OUString > sServiceNames( getAvailableServiceNames() );
++    sal_Int32 nLen = sServiceNames.getLength();
++    for ( sal_Int32 index = 0; index < nLen; ++index )
++    {
++        if ( sServiceNames[ index ].equals( serviceName ) )
++            return true;
++    }
++    return false;
++}
++
++
+Index: vbahelper/source/vbahelper/vbadocumentsbase.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbadocumentsbase.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbadocumentsbase.cxx	(revision 276288)
+@@ -0,0 +1,305 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <vbahelper/vbadocumentsbase.hxx>
++#include <comphelper/processfactory.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <cppuhelper/implbase3.hxx>
++#include <com/sun/star/frame/XDesktop.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <com/sun/star/frame/XComponentLoader.hpp>
++#include <com/sun/star/lang/XComponent.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/frame/XFrame.hpp>
++#include <com/sun/star/frame/FrameSearchFlag.hpp>
++#include <com/sun/star/util/XModifiable.hpp>
++#include <com/sun/star/frame/XStorable.hpp>
++#include <com/sun/star/lang/DisposedException.hpp>
++#include <com/sun/star/beans/PropertyVetoException.hpp>
++#include <com/sun/star/util/XCloseable.hpp>
++#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
++#include <com/sun/star/document/XTypeDetection.hpp>
++#include <com/sun/star/document/MacroExecMode.hpp>
++#include <com/sun/star/uri/XUriReference.hpp>
++#include <com/sun/star/uri/XUriReferenceFactory.hpp>
++#include <com/sun/star/lang/XServiceInfo.hpp>
++#include <sfx2/objsh.hxx>
++#include <tools/urlobj.hxx>
++#include <vbahelper/vbahelper.hxx>
++#include <hash_map>
++#include <osl/file.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++static const rtl::OUString sSpreadsheetDocument( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
++static const rtl::OUString sTextDocument( rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" ) );
++
++typedef  std::hash_map< rtl::OUString,
++sal_Int32, ::rtl::OUStringHash,
++::std::equal_to< ::rtl::OUString > > NameIndexHash;
++
++typedef std::vector < uno::Reference< frame::XModel > > Documents;
++
++typedef ::cppu::WeakImplHelper1< container::XEnumeration > DocumentsEnumImpl_BASE;
++
++// #FIXME clearly this is a candidate for some sort of helper base class as
++// this is a copy of SelectedSheetsEnum ( vbawindow.cxx )
++
++class DocumentsEnumImpl : public DocumentsEnumImpl_BASE
++{
++	uno::Reference< uno::XComponentContext > m_xContext;
++	Documents m_documents;
++	Documents::const_iterator m_it;
++
++public:
++	DocumentsEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const Documents& docs ) throw ( uno::RuntimeException ) :  m_xContext( xContext ), m_documents( docs )
++	{
++		m_it = m_documents.begin();
++	}
++	DocumentsEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) :  m_xContext( xContext )
++	{
++		uno::Reference< lang::XMultiComponentFactory > xSMgr(
++			m_xContext->getServiceManager(), uno::UNO_QUERY_THROW );
++
++		uno::Reference< frame::XDesktop > xDesktop
++			(xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), m_xContext), uno::UNO_QUERY_THROW );
++		uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration();
++		while( mxComponents->hasMoreElements() )
++		{
++			uno::Reference< frame::XModel > xNext( mxComponents->nextElement(), uno::UNO_QUERY );
++			if ( xNext.is() )
++				m_documents.push_back( xNext );
++		}
++		m_it = m_documents.begin();
++	}
++	// XEnumeration
++	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException) 
++	{ 
++		return m_it != m_documents.end();
++	}
++
++	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
++	{ 
++		if ( !hasMoreElements() )
++		{
++			throw container::NoSuchElementException();
++		}
++		return makeAny( *(m_it++) );
++	}
++};
++
++// #FIXME clearly this is also a candidate for some sort of helper base class as
++// a very similar one is used in vbawindow ( SelectedSheetsEnumAccess )
++// Maybe a template base class that does all of the operations on the hashmap
++// and vector only, and the sub-class does everything else
++// => ctor, createEnumeration & factory method need be defined ( to be called 
++// by getByIndex, getByName )
++typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess 
++	, com::sun::star::container::XIndexAccess
++	, com::sun::star::container::XNameAccess
++	> DocumentsAccessImpl_BASE;
++
++class DocumentsAccessImpl : public DocumentsAccessImpl_BASE
++{
++	uno::Reference< uno::XComponentContext > m_xContext;
++	Documents m_documents;
++	NameIndexHash namesToIndices;
++    VbaDocumentsBase::DOCUMENT_TYPE meDocType;
++public:	
++	DocumentsAccessImpl( const uno::Reference< uno::XComponentContext >& xContext, VbaDocumentsBase::DOCUMENT_TYPE eDocType ) throw (uno::RuntimeException) :m_xContext( xContext ), meDocType( eDocType )
++	{
++		uno::Reference< container::XEnumeration > xEnum = new DocumentsEnumImpl( m_xContext );
++		sal_Int32 nIndex=0;
++		while( xEnum->hasMoreElements() )
++		{
++            uno::Reference< lang::XServiceInfo > xServiceInfo( xEnum->nextElement(), uno::UNO_QUERY );
++			if ( xServiceInfo.is() 
++                && (  ( xServiceInfo->supportsService( sSpreadsheetDocument ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT )
++                || ( xServiceInfo->supportsService( sTextDocument ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) )
++			{
++				uno::Reference< frame::XModel > xModel( xServiceInfo, uno::UNO_QUERY_THROW ); // that the spreadsheetdocument is a xmodel is a given
++				m_documents.push_back( xModel );
++				INetURLObject aURL( xModel->getURL() );
++				namesToIndices[ aURL.GetLastName() ] = nIndex++;
++			}
++		}
++			
++	}
++	
++	//XEnumerationAccess
++	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
++	{
++		return new DocumentsEnumImpl( m_xContext, m_documents ); 
++	}
++	// XIndexAccess
++	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException) 
++	{ 
++		return m_documents.size();
++	}
++	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) 
++	{ 
++		if ( Index < 0 
++			|| static_cast< Documents::size_type >(Index) >= m_documents.size() ) 
++			throw lang::IndexOutOfBoundsException();
++		return makeAny( m_documents[ Index ] ); // returns xspreadsheetdoc
++	}
++
++	//XElementAccess
++	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
++	{ 
++		return frame::XModel::static_type(0); 
++	}
++
++	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) 
++	{ 
++		return (m_documents.size() > 0);
++	}
++
++	//XNameAccess
++	virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
++	{ 
++		NameIndexHash::const_iterator it = namesToIndices.find( aName );
++		if ( it == namesToIndices.end() )
++			throw container::NoSuchElementException();
++		return makeAny( m_documents[ it->second ] );
++		
++	}
++
++	virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException) 
++	{ 
++		uno::Sequence< ::rtl::OUString > names( namesToIndices.size() );
++		::rtl::OUString* pString = names.getArray();
++		NameIndexHash::const_iterator it = namesToIndices.begin();
++		NameIndexHash::const_iterator it_end = namesToIndices.end();
++		for ( ; it != it_end; ++it, ++pString )
++			*pString = it->first;	
++		return names;	
++	}
++
++	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) 
++	{ 
++		NameIndexHash::const_iterator it = namesToIndices.find( aName );
++		return (it != namesToIndices.end());
++	}
++
++};
++
++VbaDocumentsBase::VbaDocumentsBase( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext, DOCUMENT_TYPE eDocType ) throw (uno::RuntimeException) : VbaDocumentsBase_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new DocumentsAccessImpl( xContext, eDocType ) ) ), meDocType( eDocType )
++{
++}
++
++uno::Any SAL_CALL
++VbaDocumentsBase::Add() throw (uno::RuntimeException)
++{
++	uno::Reference< lang::XMultiComponentFactory > xSMgr(
++        mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
++
++	 uno::Reference< frame::XComponentLoader > xLoader(
++        xSMgr->createInstanceWithContext(
++            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),
++                mxContext), uno::UNO_QUERY_THROW );
++    rtl::OUString sURL;
++    if( meDocType == WORD_DOCUMENT )
++        sURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:factory/swriter") );
++    else if( meDocType == EXCEL_DOCUMENT )
++        sURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc") );
++    else
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++	uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL(
++									   sURL ,
++									   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, 
++									   uno::Sequence< beans::PropertyValue >(0) );			   
++    return uno::makeAny( xComponent );
++}
++
++void
++VbaDocumentsBase::Close() throw (uno::RuntimeException)
++{
++// #FIXME this *MUST* be wrong documents::close surely closes ALL documents
++// in the collection, use of getCurrentDocument here is totally wrong
++/*
++	uno::Reference< lang::XMultiComponentFactory > xSMgr(
++		mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
++	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
++	rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseDoc"));
++	dispatchRequests(xModel,url);
++*/
++}
++
++// #TODO# #FIXME# can any of the unused params below be used?
++uno::Any
++VbaDocumentsBase::Open( const rtl::OUString& rFileName, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (uno::RuntimeException)
++{
++	// we need to detect if this is a URL, if not then assume its a file path
++        rtl::OUString aURL;
++        INetURLObject aObj;
++	aObj.SetURL( rFileName );
++	bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
++	if ( bIsURL )
++		aURL = rFileName;
++	else
++		osl::FileBase::getFileURLFromSystemPath( rFileName, aURL );
++	uno::Reference< lang::XMultiComponentFactory > xSMgr(
++		mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
++	uno::Reference< frame::XDesktop > xDesktop
++		(xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")                    , mxContext),
++		uno::UNO_QUERY_THROW );
++	uno::Reference< frame::XComponentLoader > xLoader(
++		xSMgr->createInstanceWithContext(
++		::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),
++		mxContext),
++		uno::UNO_QUERY_THROW );
++
++	uno::Sequence< beans::PropertyValue > sProps( rProps );
++	sProps.realloc( sProps.getLength() + 1 );
++	sProps[ sProps.getLength() - 1 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode") );
++	sProps[ sProps.getLength() - 1 ].Value <<= uno::makeAny( document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN );
++
++	sal_Int32 nIndex = sProps.getLength() - 1;
++	
++	if ( ReadOnly.hasValue()  )
++	{
++		sal_Bool bIsReadOnly = sal_False; ReadOnly >>= bIsReadOnly;
++		if ( bIsReadOnly )
++		{
++			static const rtl::OUString sReadOnly( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
++			sProps.realloc( sProps.getLength() + 1 );
++			sProps[ nIndex ].Name = sReadOnly;
++			sProps[ nIndex++ ].Value = uno::makeAny( (sal_Bool)sal_True );
++		}
++	}
++
++	uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL( aURL,
++		rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_default") ),
++		frame::FrameSearchFlag::CREATE,
++		sProps);
++    return uno::makeAny( xComponent );
++}
++
+Index: vbahelper/source/vbahelper/vbafillformat.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbafillformat.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbafillformat.cxx	(revision 276288)
+@@ -0,0 +1,202 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbafillformat.cxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/awt/Gradient.hpp>
++#include <com/sun/star/awt/GradientStyle.hpp>
++#include <ooo/vba/office/MsoGradientStyle.hpp>
++#include "vbafillformat.hxx"
++#include "vbacolorformat.hxx"
++
++using namespace ooo::vba;
++using namespace com::sun::star;
++
++ScVbaFillFormat::ScVbaFillFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaFillFormat_BASE( xParent, xContext ), m_xShape( xShape )
++{
++    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
++    m_nFillStyle = drawing::FillStyle_SOLID;
++    m_nForeColor = 0;
++    m_nBackColor = 0;
++    m_nGradientAngle = 0;
++}
++
++void
++ScVbaFillFormat::setFillStyle( drawing::FillStyle nFillStyle ) throw (uno::RuntimeException)
++{
++    m_nFillStyle = nFillStyle;
++    if( m_nFillStyle == drawing::FillStyle_GRADIENT )
++    {
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny( drawing::FillStyle_GRADIENT ) );
++        awt::Gradient aGradient;
++        // AXIAL
++        // RADIAL
++        // ELLIPTICAL
++        // SQUARE
++        // RECT
++        aGradient.Style = awt::GradientStyle_LINEAR;
++        aGradient.StartColor = ForeColor()->getRGB();
++        aGradient.EndColor = BackColor()->getRGB();
++        aGradient.Angle = m_nGradientAngle;
++        aGradient.Border = 0;
++        aGradient.XOffset = 0;
++        aGradient.YOffset = 0;
++        aGradient.StartIntensity = 100;
++        aGradient.EndIntensity = 100;
++        aGradient.StepCount = 1;
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillGradient"), uno::makeAny( aGradient ) );
++    }
++    else if( m_nFillStyle == drawing::FillStyle_SOLID )
++    {
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny(drawing::FillStyle_SOLID) );
++    }
++}
++
++void
++ScVbaFillFormat::setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css::uno::RuntimeException)
++{
++    m_nForeColor = nForeColor;
++    setFillStyle( m_nFillStyle );
++}
++
++// Attributes
++sal_Bool SAL_CALL 
++ScVbaFillFormat::getVisible() throw (uno::RuntimeException)
++{
++    drawing::FillStyle nFillStyle;
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillStyle") ) >>= nFillStyle;
++    if( nFillStyle == drawing::FillStyle_NONE )
++        return sal_False;
++    return sal_True;
++}
++
++void SAL_CALL 
++ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
++{
++    drawing::FillStyle aFillStyle;
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillStyle") ) >>= aFillStyle;
++    if( !_visible )
++    {
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny( drawing::FillStyle_NONE ) );
++    }
++    else
++    {
++        if( aFillStyle == drawing::FillStyle_NONE )
++        {
++            setFillStyle( m_nFillStyle );
++        }
++    }
++}
++
++double SAL_CALL 
++ScVbaFillFormat::getTransparency() throw (uno::RuntimeException)
++{
++    sal_Int16 nTransparence = 0;
++    double dTransparence = 0;
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "FillTransparence" ) ) >>= nTransparence;
++    dTransparence = static_cast<double>( nTransparence );
++    dTransparence /= 100;
++    return dTransparence;
++}
++
++void SAL_CALL 
++ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeException)
++{
++    sal_Int16 nTransparence = static_cast< sal_Int16 >( _transparency * 100 );
++    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillTransparence" ), uno::makeAny( nTransparence ) );
++}
++
++
++// Methods
++void SAL_CALL 
++ScVbaFillFormat::Solid() throw (uno::RuntimeException)
++{
++    setFillStyle( drawing::FillStyle_SOLID );
++}
++
++void SAL_CALL 
++ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) throw (uno::RuntimeException)
++{
++    if( style == office::MsoGradientStyle::msoGradientHorizontal )
++    {
++        m_nGradientAngle = 0;
++        setFillStyle( drawing::FillStyle_GRADIENT );
++    }
++    else if( style == office::MsoGradientStyle::msoGradientVertical )
++    {
++        m_nGradientAngle = 900;
++        setFillStyle( drawing::FillStyle_GRADIENT );
++    }
++    else if( style == office::MsoGradientStyle::msoGradientDiagonalDown )
++    {
++        m_nGradientAngle = 450;
++        setFillStyle( drawing::FillStyle_GRADIENT );
++    }
++    else if( style == office::MsoGradientStyle::msoGradientDiagonalUp )
++    {
++        m_nGradientAngle = 900 + 450;
++        setFillStyle( drawing::FillStyle_GRADIENT );
++    }
++}
++
++uno::Reference< msforms::XColorFormat > SAL_CALL 
++ScVbaFillFormat::BackColor() throw (uno::RuntimeException)
++{
++    if( !m_xColorFormat.is() )
++        m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_BACKCOLOR ) );
++    return m_xColorFormat;
++}
++
++uno::Reference< msforms::XColorFormat > SAL_CALL 
++ScVbaFillFormat::ForeColor() throw (uno::RuntimeException)
++{
++    if( !m_xColorFormat.is() )
++        m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_FORECOLOR ) );
++    return m_xColorFormat;
++}
++
++
++rtl::OUString&
++ScVbaFillFormat::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFillFormat") );
++    return sImplName;
++}
++
++uno::Sequence< rtl::OUString >
++ScVbaFillFormat::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.FillFormat" ) );
++    }
++    return aServiceNames;
++}
++
+Index: vbahelper/source/vbahelper/vbalineformat.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbalineformat.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbalineformat.cxx	(revision 276288)
+@@ -0,0 +1,458 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbalineformat.cxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <ooo/vba/office/MsoArrowheadStyle.hpp>
++#include <ooo/vba/office/MsoArrowheadLength.hpp>
++#include <ooo/vba/office/MsoArrowheadWidth.hpp>
++#include <ooo/vba/office/MsoLineDashStyle.hpp>
++#include <com/sun/star/drawing/LineStyle.hpp>
++#include <com/sun/star/drawing/LineDash.hpp>
++#include "vbalineformat.hxx"
++#include "vbacolorformat.hxx"
++
++using namespace ooo::vba;
++using namespace com::sun::star;
++
++ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaLineFormat_BASE( xParent, xContext ), m_xShape( xShape ) 
++{
++    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
++    m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid;
++    m_nLineWeight = 1;
++}
++
++sal_Int32
++ScVbaLineFormat::calculateArrowheadSize()
++{
++    return 0;
++}
++
++sal_Int32
++ScVbaLineFormat::convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName )
++{
++    sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
++    if (sLineName.equals(rtl::OUString::createFromAscii("Small Arrow")) ||
++        sLineName.equals(rtl::OUString::createFromAscii("Arrow")) ||
++        sLineName.equals(rtl::OUString::createFromAscii("msArrowEnd")) ||
++        sLineName.equals(rtl::OUString::createFromAscii("Double Arrow")))
++    {
++        // msoArrowheadTriangle
++        nLineType = office::MsoArrowheadStyle::msoArrowheadTriangle;
++    }
++    else if (sLineName.equals(rtl::OUString::createFromAscii("Square 45")) ||
++             sLineName.equals(rtl::OUString::createFromAscii("Square")) ||
++             sLineName.equals(rtl::OUString::createFromAscii("msArrowDiamondEnd")))
++    {
++        // msoArrowheadDiamond
++        nLineType = office::MsoArrowheadStyle::msoArrowheadDiamond;
++    }
++    else if (sLineName.equals(rtl::OUString::createFromAscii("Circle")) ||
++             sLineName.equals(rtl::OUString::createFromAscii("msArrowOvalEnd")) ||
++             sLineName.equals(rtl::OUString::createFromAscii("Dimension Lines")) )
++    {
++        // msoArrowheadOval
++        nLineType = office::MsoArrowheadStyle::msoArrowheadOval;
++    }
++    else if (sLineName.equals(rtl::OUString::createFromAscii("Arrow concave")) ||
++             sLineName.equals(rtl::OUString::createFromAscii("msArrowStealthEnd")))
++    {
++        // msoArrowheadStealth
++        nLineType = office::MsoArrowheadStyle::msoArrowheadStealth;
++    }
++    else if (sLineName.equals(rtl::OUString::createFromAscii("Rounded short Arrow")) ||
++             sLineName.equals(rtl::OUString::createFromAscii("Rounded large Arrow")) ||
++             sLineName.equals(rtl::OUString::createFromAscii("Symmetric Arrow")) ||
++             sLineName.equals(rtl::OUString::createFromAscii("msArrowOpenEnd")) ||
++             sLineName.equals(rtl::OUString::createFromAscii("Line Arrow")))
++    {
++        // msoArrowheadOpen
++        nLineType = office::MsoArrowheadStyle::msoArrowheadOpen;
++    }
++    else
++    {
++        // msoArrowheadNone
++        nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
++    }
++    return nLineType;
++}
++
++rtl::OUString 
++ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (uno::RuntimeException)
++{
++    switch( nArrowheadStyle )
++    {
++        case office::MsoArrowheadStyle::msoArrowheadNone:
++            return rtl::OUString(rtl::OUString::createFromAscii( "" ) );
++        case office::MsoArrowheadStyle::msoArrowheadStealth:
++            return rtl::OUString::createFromAscii( "Arrow concave" );
++        case office::MsoArrowheadStyle::msoArrowheadOpen:
++            return rtl::OUString::createFromAscii("Line Arrow" );
++        case office::MsoArrowheadStyle::msoArrowheadOval:
++            return  rtl::OUString::createFromAscii("Circle" );
++        case office::MsoArrowheadStyle::msoArrowheadDiamond:
++            return rtl::OUString::createFromAscii( "Square 45" );
++        case office::MsoArrowheadStyle::msoArrowheadTriangle:
++            return rtl::OUString::createFromAscii( "Arrow" );
++        default:
++            throw uno::RuntimeException( rtl::OUString::createFromAscii("Invalid Arrow Style!"), uno::Reference< uno::XInterface >() );
++    }
++}
++
++// Attributes
++sal_Int32 SAL_CALL 
++ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException)
++{
++    sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
++    rtl::OUString sLineName;
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ) ) >>= sLineName;
++    if( ( sLineName.getLength() > 7 ) && ( sLineName.indexOf( rtl::OUString::createFromAscii( "msArray" ) ) ) != -1 )
++    {
++        sal_Int32 nIndex = sLineName.indexOf( rtl::OUString::createFromAscii(" ") );
++        rtl::OUString sName = sLineName.copy( 0, nIndex );
++        //sal_Int32 nSize = sLineName.copy( nIndex + 1 ).toInt32();
++        nLineType = convertLineStartEndNameToArrowheadStyle( sName );
++    }
++    else
++    {
++        nLineType = convertLineStartEndNameToArrowheadStyle( sLineName );
++    }
++    return nLineType;
++}
++
++void SAL_CALL 
++ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (uno::RuntimeException)
++{
++    rtl::OUString sArrayName = convertArrowheadStyleToLineStartEndName( _beginarrowheadstyle );
++    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ), uno::makeAny( sArrayName ) );
++}
++
++sal_Int32 SAL_CALL 
++ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
++}
++
++void SAL_CALL 
++ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
++}
++
++sal_Int32 SAL_CALL 
++ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
++}
++
++void SAL_CALL 
++ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
++}
++
++sal_Int32 SAL_CALL 
++ScVbaLineFormat::getEndArrowheadStylel() throw (uno::RuntimeException)
++{
++    return 0;
++}
++
++void SAL_CALL 
++ScVbaLineFormat::setEndArrowheadStylel( sal_Int32 /*_endarrowheadstylel*/ ) throw (uno::RuntimeException)
++{
++}
++
++sal_Int32 SAL_CALL 
++ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
++}
++
++void SAL_CALL 
++ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ ) throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
++}
++
++sal_Int32 SAL_CALL 
++ScVbaLineFormat::getEndArrowheadWidth() throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
++}
++
++void SAL_CALL 
++ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ ) throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
++}
++
++double SAL_CALL 
++ScVbaLineFormat::getWeight() throw (uno::RuntimeException)
++{
++    sal_Int32 nLineWidth=0;
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineWidth") ) >>= nLineWidth;
++    double dLineWidth = Millimeter::getInPoints( nLineWidth );
++    return dLineWidth;
++}
++
++void SAL_CALL 
++ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException)
++{
++    if( _weight < 0 )
++        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter: Must be positv."), uno::Reference< uno::XInterface >() );
++    if( _weight == 0 )
++        _weight = 0.5;
++    m_nLineWeight = _weight;
++    Millimeter aMillimeter;
++    aMillimeter.setInPoints( _weight );
++        
++    sal_Int32 nLineWidth = static_cast<sal_Int32>( aMillimeter.getInHundredthsOfOneMillimeter() );
++    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineWidth" ), uno::makeAny( nLineWidth ) );
++    setDashStyle( m_nLineDashStyle );
++}
++
++sal_Bool SAL_CALL 
++ScVbaLineFormat::getVisible() throw (uno::RuntimeException)
++{
++    drawing::LineStyle aLineStyle;
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= aLineStyle;
++    if( aLineStyle == drawing::LineStyle_NONE )
++    {
++        return sal_False;
++    }
++    return sal_True;
++}
++
++void SAL_CALL 
++ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
++{
++    drawing::LineStyle aLineStyle;
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= aLineStyle;
++    if( !_visible )
++    {
++        aLineStyle = drawing::LineStyle_NONE;
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( aLineStyle ) );
++    }
++    else
++    {
++        if( aLineStyle == drawing::LineStyle_NONE )
++        {
++            setDashStyle( m_nLineDashStyle );
++        }
++    }
++}
++
++double SAL_CALL 
++ScVbaLineFormat::getTransparency() throw (uno::RuntimeException)
++{
++    sal_Int16 nTransparency = 0;
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ) ) >>= nTransparency;
++    double fTransparency = static_cast<double>( nTransparency );
++    return fTransparency / 100;
++}
++
++void SAL_CALL 
++ScVbaLineFormat::setTransparency( double _transparency ) throw (uno::RuntimeException)
++{
++    sal_Int16 nTransparency = static_cast<sal_Int16>( _transparency * 100 );
++    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ), uno::makeAny( nTransparency ) );
++}
++
++sal_Int16 SAL_CALL 
++ScVbaLineFormat::getStyle() throw (uno::RuntimeException)
++{
++    //OpenOffice.org only supports one LineStyle (other than the DashStyles)
++    //Therefore we can only return the SingleLine
++    return 1;
++}
++
++void SAL_CALL 
++ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException)
++{
++    //OpenOffice.org only supports one LineStyle (other than the DashStyles)
++    //Therefore we do not set the LineStyle, because it maybe is already set
++    //to Dashed or Single Line. Setting the 'Visible' or 'DashStyle' properties
++    //will be done with the according methods.
++}
++
++sal_Int32 SAL_CALL 
++ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException)
++{
++    drawing::LineStyle eLineStyle;
++    //LineStyle integer in Xray
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= eLineStyle;
++    if( eLineStyle == drawing::LineStyle_SOLID )
++        m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid;
++    else
++    {
++        drawing::LineDash aLineDash;
++        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineDash" ) ) >>= aLineDash;
++        if( aLineDash.Dots == 0 )
++        {
++            //LineDash
++            //LineLongDash
++            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDash;
++            if( aLineDash.Distance > 0 && ( aLineDash.DashLen / aLineDash.Distance > 1 ) )
++            {
++                m_nLineDashStyle = office::MsoLineDashStyle::msoLineLongDash;
++            }
++        }
++        else if( aLineDash.Dots == 1 )
++        {
++            // LineDashDot
++            // LineLongDashDot
++            // LineSquareDot
++            // LineRoundDot ! not supported
++            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDashDot;
++            if( aLineDash.Dashes == 0 )
++            {
++                m_nLineDashStyle = office::MsoLineDashStyle::msoLineSquareDot;
++            }
++            else
++            {
++                if( aLineDash.Distance > 0 && ( aLineDash.DashLen / aLineDash.Distance > 1 ) )
++                {
++                    m_nLineDashStyle = office::MsoLineDashStyle::msoLineLongDashDot;
++                }
++            }
++        }
++        else if( aLineDash.Dots == 2 )
++        {
++            // LineDashDotDot
++            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDashDotDot;
++        }
++    }
++
++    return m_nLineDashStyle;
++}
++
++void SAL_CALL 
++ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeException)
++{
++    m_nLineDashStyle = _dashstyle;
++    if( _dashstyle == office::MsoLineDashStyle::msoLineSolid )
++    {
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID  ));
++    }
++    else
++    {
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( drawing::LineStyle_DASH ) );
++        drawing::LineDash  pLineDash;
++        Millimeter aMillimeter( m_nLineWeight );
++        sal_Int32 nPixel = static_cast< sal_Int32 >( aMillimeter.getInHundredthsOfOneMillimeter() );
++        switch( _dashstyle )
++        {
++        case office::MsoLineDashStyle::msoLineDashDot:
++            pLineDash.Dots = 1;
++            pLineDash.DotLen = nPixel;
++            pLineDash.Dashes = 1;
++            pLineDash.DashLen = 5 * nPixel;
++            pLineDash.Distance = 4 * nPixel;
++            break;
++        case office::MsoLineDashStyle::msoLineLongDashDot:
++            pLineDash.Dots = 1;
++            pLineDash.DotLen = nPixel;
++            pLineDash.Dashes = 1;
++            pLineDash.DashLen = 10 * nPixel;
++            pLineDash.Distance = 4 * nPixel;
++            break;
++        case office::MsoLineDashStyle::msoLineDash:
++            pLineDash.Dots = 0;
++            pLineDash.DotLen = 0;
++            pLineDash.Dashes = 1;
++            pLineDash.DashLen = 6 * nPixel;
++            pLineDash.Distance = 4 * nPixel;
++            break;
++        case office::MsoLineDashStyle::msoLineDashDotDot:
++            pLineDash.Dots = 2;
++            pLineDash.DotLen = nPixel;
++            pLineDash.Dashes = 1;
++            pLineDash.DashLen = 10 * nPixel;
++            pLineDash.Distance = 3 * nPixel;
++            break;
++        case office::MsoLineDashStyle::msoLineLongDash:
++            pLineDash.Dots = 0;
++            pLineDash.DotLen = 0;
++            pLineDash.Dashes = 1;
++            pLineDash.DashLen = 10 * nPixel;
++            pLineDash.Distance = 4 * nPixel;
++            break;
++        case office::MsoLineDashStyle::msoLineSquareDot:
++            pLineDash.Dots = 1;
++            pLineDash.DotLen = nPixel;
++            pLineDash.Dashes = 0;
++            pLineDash.DashLen = 0;
++            pLineDash.Distance = nPixel;
++            break;
++        case office::MsoLineDashStyle::msoLineRoundDot:
++            pLineDash.Dots = 1;
++            pLineDash.DotLen = nPixel;
++            pLineDash.Dashes = 0;
++            pLineDash.DashLen = 0;
++            pLineDash.Distance = nPixel;
++            break;
++        default:
++            throw uno::RuntimeException( rtl::OUString::createFromAscii("this MsoLineDashStyle is not supported."), uno::Reference< uno::XInterface >() );
++        }
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineDash" ), uno::makeAny( pLineDash ) );
++    }
++}
++
++// Methods
++uno::Reference< msforms::XColorFormat > SAL_CALL
++ScVbaLineFormat::BackColor() throw (uno::RuntimeException)
++{
++    return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_BACKCOLOR ) );
++}
++
++uno::Reference< msforms::XColorFormat > SAL_CALL
++ScVbaLineFormat::ForeColor() throw (uno::RuntimeException)
++{
++    return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_FORECOLOR ) );
++}
++
++
++rtl::OUString& 
++ScVbaLineFormat::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLineFormat") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaLineFormat::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.LineFormat" ) );
++	}
++	return aServiceNames;
++}
++
++
+Index: vbahelper/source/vbahelper/vbawindowbase.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbawindowbase.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbawindowbase.cxx	(revision 276288)
+@@ -0,0 +1,180 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <vbahelper/helperdecl.hxx>
++#include <vbahelper/vbawindowbase.hxx>
++#include <com/sun/star/awt/XWindow.hpp>
++#include <com/sun/star/awt/XWindow2.hpp>
++#include <com/sun/star/awt/PosSize.hpp>
++
++using namespace ::com::sun::star;
++using namespace ::ooo::vba;
++
++VbaWindowBase::VbaWindowBase( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowBaseImpl_BASE( xParent, xContext ), m_xModel( xModel ) 
++{
++}
++
++VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext )  
++        : WindowBaseImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ),
++          m_xModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) )
++{
++}
++
++sal_Bool SAL_CALL
++VbaWindowBase::getVisible() throw (uno::RuntimeException)
++{
++	sal_Bool bVisible = sal_True;	
++	uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
++	uno::Reference< css::awt::XWindow2 > xWindow2 (xWindow, uno::UNO_QUERY_THROW );
++	if( xWindow2.is() )
++	{
++		bVisible = xWindow2->isVisible();	
++	}
++	return bVisible;
++}
++
++void SAL_CALL
++VbaWindowBase::setVisible(sal_Bool _visible) throw (uno::RuntimeException)
++{
++	uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
++	if( xWindow.is() )
++	{
++		xWindow->setVisible( _visible );	
++	}
++}
++
++css::awt::Rectangle getPosSize( const uno::Reference< frame::XModel >& xModel )
++{
++	css::awt::Rectangle aRect;
++	uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
++	if( xWindow.is() )
++	{
++		aRect = xWindow->getPosSize();
++	}
++	return aRect;
++}
++
++void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, USHORT nFlag )
++{
++	uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
++	if( xWindow.is() )
++	{
++		css::awt::Rectangle aRect = xWindow->getPosSize();
++		switch( nFlag )
++		{
++			case css::awt::PosSize::X:
++				xWindow->setPosSize( nValue, aRect.Y,	0, 0, css::awt::PosSize::X );
++				break;
++			case css::awt::PosSize::Y:
++				xWindow->setPosSize( aRect.X, nValue,	0, 0, css::awt::PosSize::Y );
++				break;
++			case css::awt::PosSize::WIDTH:
++				xWindow->setPosSize( 0, 0,	nValue, aRect.Height, css::awt::PosSize::WIDTH );
++				break;
++			case css::awt::PosSize::HEIGHT:
++				xWindow->setPosSize( 0, 0,	aRect.Width, nValue, css::awt::PosSize::HEIGHT );
++				break;
++			default:
++				break;
++		}
++	}
++}	
++
++sal_Int32 SAL_CALL 
++VbaWindowBase::getHeight() throw (uno::RuntimeException)
++{
++	css::awt::Rectangle aRect = getPosSize(m_xModel);
++	return aRect.Height;
++}
++
++void SAL_CALL 
++VbaWindowBase::setHeight( sal_Int32 _height ) throw (uno::RuntimeException)
++{
++	setPosSize(m_xModel, _height, css::awt::PosSize::HEIGHT);
++}
++
++sal_Int32 SAL_CALL 
++VbaWindowBase::getLeft() throw (uno::RuntimeException)
++{
++	css::awt::Rectangle aRect = getPosSize(m_xModel);
++	return aRect.X;
++}
++
++void SAL_CALL 
++VbaWindowBase::setLeft( sal_Int32 _left ) throw (uno::RuntimeException)
++{
++	setPosSize(m_xModel, _left, css::awt::PosSize::X);
++}
++sal_Int32 SAL_CALL 
++VbaWindowBase::getTop() throw (uno::RuntimeException)
++{
++	css::awt::Rectangle aRect = getPosSize(m_xModel);
++	return aRect.Y;
++}
++
++void SAL_CALL 
++VbaWindowBase::setTop( sal_Int32 _top ) throw (uno::RuntimeException)
++{
++	setPosSize(m_xModel, _top, css::awt::PosSize::Y);
++}
++sal_Int32 SAL_CALL 
++VbaWindowBase::getWidth() throw (uno::RuntimeException)
++{
++	css::awt::Rectangle aRect = getPosSize(m_xModel);
++	return aRect.Width;
++}
++
++void SAL_CALL 
++VbaWindowBase::setWidth( sal_Int32 _width ) throw (uno::RuntimeException)
++{
++	setPosSize(m_xModel, _width, css::awt::PosSize::WIDTH);
++}
++
++rtl::OUString& 
++VbaWindowBase::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaWindowBase") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++VbaWindowBase::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VbaWindowBase" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/vbahelper/vbacommandbar.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacommandbar.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacommandbar.cxx	(revision 276288)
+@@ -0,0 +1,212 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbacommandbar.hxx" 
++#include "vbacommandbarcontrols.hxx" 
++#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
++#include <com/sun/star/frame/XFrame.hpp>
++#include <com/sun/star/frame/XDesktop.hpp>
++#include <com/sun/star/frame/XLayoutManager.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/container/XNameContainer.hpp>
++#include <ooo/vba/office/MsoBarType.hpp>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const uno::Reference< container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Bool bIsMenu, sal_Bool bTemporary ) throw( uno::RuntimeException ) : CommandBar_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl ), m_bIsMenu( bIsMenu ), m_bTemporary( bTemporary )
++{
++}
++
++::rtl::OUString SAL_CALL
++ScVbaCommandBar::getName() throw ( uno::RuntimeException )
++{
++    // This will get a "NULL length string" when Name is not set. 
++    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
++    uno::Any aName = xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") );
++    rtl::OUString sName;
++    aName >>= sName;
++    if( sName.getLength() < 1 )
++    {
++        if( m_bIsMenu )
++        {
++            if( m_sResourceUrl.equalsAscii( ITEM_MENUBAR_URL ) )
++            {
++                if( pCBarHelper->getModuleId().equalsAscii("com.sun.star.sheet.SpreadsheetDocument") )
++                    sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Worksheet Menu Bar") );
++                else if( pCBarHelper->getModuleId().equalsAscii("com.sun.star.text.TextDocument") )
++                    sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Menu Bar") );
++                return sName;    
++            }
++        }
++        // Toolbar name
++        uno::Reference< container::XNameAccess > xNameAccess = pCBarHelper->getPersistentWindowState();
++        if( xNameAccess->hasByName( m_sResourceUrl ) )
++        {
++            uno::Sequence< beans::PropertyValue > aToolBar; 
++            xNameAccess->getByName( m_sResourceUrl ) >>= aToolBar;
++            getPropertyValue( aToolBar, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ) ) >>= sName;
++        }
++    }
++    return sName;
++}
++void SAL_CALL 
++ScVbaCommandBar::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException)
++{
++    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
++    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("UIName"), uno::makeAny( _name ) );
++    
++    pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings );
++}
++::sal_Bool SAL_CALL 
++ScVbaCommandBar::getVisible() throw (uno::RuntimeException)
++{
++    // menu bar is allways visible in OOo 
++    if( m_bIsMenu )
++        return sal_True;
++
++    sal_Bool bVisible = sal_False;
++    try
++    {
++        uno::Reference< container::XNameAccess > xNameAccess = pCBarHelper->getPersistentWindowState();
++        if( xNameAccess->hasByName( m_sResourceUrl ) )
++        {
++            uno::Sequence< beans::PropertyValue > aToolBar; 
++            xNameAccess->getByName( m_sResourceUrl ) >>= aToolBar;
++            getPropertyValue( aToolBar, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ) >>= bVisible;
++        }
++    }
++    catch ( uno::Exception e )
++    {
++    }
++    return bVisible;
++}
++void SAL_CALL 
++ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
++{
++    try
++    {
++        uno::Reference< frame::XLayoutManager > xLayoutManager = pCBarHelper->getLayoutManager();
++        if( _visible )
++        {
++            xLayoutManager->createElement( m_sResourceUrl );
++            xLayoutManager->showElement( m_sResourceUrl );
++        }
++        else
++        {
++            xLayoutManager->hideElement( m_sResourceUrl );
++            xLayoutManager->destroyElement( m_sResourceUrl );
++        }
++    }
++    catch( uno::Exception e )
++    {
++        OSL_TRACE( "SetVisible get an exception\n" );
++    }
++}
++
++::sal_Bool SAL_CALL 
++ScVbaCommandBar::getEnabled() throw (uno::RuntimeException)
++{
++    // emulated with Visible
++    return getVisible();
++}
++
++void SAL_CALL
++ScVbaCommandBar::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException)
++{
++    // emulated with Visible
++    setVisible( _enabled );
++}
++
++void SAL_CALL 
++ScVbaCommandBar::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    pCBarHelper->removeSettings( m_sResourceUrl );
++    uno::Reference< container::XNameContainer > xNameContainer( pCBarHelper->getPersistentWindowState(), uno::UNO_QUERY_THROW );
++    if( xNameContainer->hasByName( m_sResourceUrl ) )
++    {
++        xNameContainer->removeByName( m_sResourceUrl );
++    }
++}
++uno::Any SAL_CALL 
++ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    uno::Reference< awt::XMenu > xMenu;
++    if( m_bIsMenu )
++    {
++        uno::Reference< frame::XLayoutManager > xLayoutManager = pCBarHelper->getLayoutManager();
++        uno::Reference< beans::XPropertySet > xPropertySet( xLayoutManager->getElement( m_sResourceUrl ), uno::UNO_QUERY_THROW );
++        xMenu.set( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("XMenuBar") ), uno::UNO_QUERY );
++    }
++    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, m_xBarSettings, pCBarHelper, m_xBarSettings, m_sResourceUrl, xMenu ) );
++    if( aIndex.hasValue() )
++    {
++        return xCommandBarControls->Item( aIndex, uno::Any() );
++    }
++    return uno::makeAny( xCommandBarControls );
++}
++
++sal_Int32 SAL_CALL
++ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // #FIXME support msoBarTypePopup
++    sal_Int32 nType = office::MsoBarType::msoBarTypePopup;
++    nType = m_bIsMenu? office::MsoBarType::msoBarTypeNormal : office::MsoBarType::msoBarTypeMenuBar;
++    return nType;
++}
++
++uno::Any SAL_CALL 
++ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // alwayse fail to find control
++    return uno::makeAny( uno::Reference< XCommandBarControl > () );
++}
++
++rtl::OUString& 
++ScVbaCommandBar::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBar") );
++	return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++ScVbaCommandBar::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBar" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/vbahelper/vbafillformat.hxx
+===================================================================
+--- vbahelper/source/vbahelper/vbafillformat.hxx	(revision 0)
++++ vbahelper/source/vbahelper/vbafillformat.hxx	(revision 276288)
+@@ -0,0 +1,74 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbafillformat.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_XFILLFORMAT_HXX
++#define SC_VBA_XFILLFORMAT_HXX
++
++#include <com/sun/star/drawing/XShape.hpp>
++#include <com/sun/star/drawing/FillStyle.hpp>
++#include <ooo/vba/msforms/XFillFormat.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ov::msforms::XFillFormat > ScVbaFillFormat_BASE;
++
++class ScVbaFillFormat : public ScVbaFillFormat_BASE
++{
++private:
++    css::uno::Reference< css::drawing::XShape > m_xShape;
++    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
++    css::uno::Reference< ov::msforms::XColorFormat > m_xColorFormat;
++    css::drawing::FillStyle m_nFillStyle;
++    sal_Int32 m_nForeColor;
++    sal_Int32 m_nBackColor;
++    sal_Int16 m_nGradientAngle;
++private:
++    void setFillStyle( css::drawing::FillStyle nFillStyle ) throw (css::uno::RuntimeException);
++protected:
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++
++public:
++    ScVbaFillFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape );
++
++    void setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css::uno::RuntimeException);
++    // Attributes
++    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException);
++
++    // Methods
++    virtual void SAL_CALL Solid() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL TwoColorGradient( sal_Int32 style, sal_Int32 variant ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException);
++
++};
++
++#endif//SC_VBA_XFILLFORMAT_HXX
+Index: vbahelper/source/vbahelper/vbalineformat.hxx
+===================================================================
+--- vbahelper/source/vbahelper/vbalineformat.hxx	(revision 0)
++++ vbahelper/source/vbahelper/vbalineformat.hxx	(revision 276288)
+@@ -0,0 +1,85 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbalineformat.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_XLINEFORMAT_HXX
++#define SC_VBA_XLINEFORMAT_HXX
++
++#include <com/sun/star/drawing/XShape.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <ooo/vba/msforms/XLineFormat.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ov::msforms::XLineFormat > ScVbaLineFormat_BASE;
++
++class ScVbaLineFormat : public ScVbaLineFormat_BASE
++{
++private:
++    css::uno::Reference< css::drawing::XShape > m_xShape;
++    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
++    sal_Int32 m_nLineDashStyle;
++    double m_nLineWeight;
++protected:
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++    sal_Int32 convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName );
++    rtl::OUString convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (css::uno::RuntimeException);
++    sal_Int32 calculateArrowheadSize();
++public:
++    ScVbaLineFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape );
++
++    // Attributes
++    virtual sal_Int32 SAL_CALL getBeginArrowheadStyle() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getBeginArrowheadLength() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setBeginArrowheadLength( sal_Int32 _beginarrowheadlength ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getBeginArrowheadWidth() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setBeginArrowheadWidth( sal_Int32 _beginarrowheadwidth ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getEndArrowheadStylel() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setEndArrowheadStylel( sal_Int32 _endarrowheadstylel ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getEndArrowheadLength() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setEndArrowheadLength( sal_Int32 _endarrowheadlength ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getEndArrowheadWidth() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setEndArrowheadWidth( sal_Int32 _endarrowheadwidth ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getWeight() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setWeight( double _weight ) throw (css::uno::RuntimeException);
++    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException);
++    virtual sal_Int16 SAL_CALL getStyle() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setStyle( sal_Int16 _style ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getDashStyle() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setDashStyle( sal_Int32 _dashstyle ) throw (css::uno::RuntimeException);
++
++    // Methods
++    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException);
++};
++
++#endif//SC_VBA_XLINEFORMAT_HXX
+Index: vbahelper/source/vbahelper/vbacommandbar.hxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacommandbar.hxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacommandbar.hxx	(revision 276288)
+@@ -0,0 +1,83 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_COMMANDBAR_HXX
++#define SC_VBA_COMMANDBAR_HXX
++
++#include <ooo/vba/XCommandBar.hpp>
++#include <com/sun/star/ui/XUIConfigurationManager.hpp>
++#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
++#include <com/sun/star/container/XIndexContainer.hpp>
++#include <com/sun/star/beans/PropertyValues.hpp>
++
++#include <vbahelper/vbahelperinterface.hxx>
++#include "vbacommandbarhelper.hxx"
++
++#include <map>
++
++typedef InheritedHelperInterfaceImpl1< ov::XCommandBar > CommandBar_BASE;
++
++class ScVbaCommandBar : public CommandBar_BASE
++{
++private:
++    VbaCommandBarHelperRef pCBarHelper;
++    css::uno::Reference< css::container::XIndexAccess > m_xBarSettings;
++    rtl::OUString   m_sResourceUrl;
++    sal_Bool        m_bIsMenu;
++    sal_Bool        m_bTemporary;
++
++public:
++    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Bool bIsMenu, sal_Bool bTemporary = sal_True ) throw( css::uno::RuntimeException );
++    
++    sal_Bool IsMenu() { return m_bIsMenu; }
++
++    // Attributes
++    virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setName( const ::rtl::OUString& _name ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException);
++
++    // Methods
++    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL Type(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif//SC_VBA_COMMANDBAR_HXX
+Index: vbahelper/source/vbahelper/vbadocumentbase.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbadocumentbase.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbadocumentbase.cxx	(revision 276288)
+@@ -0,0 +1,228 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <vbahelper/vbadocumentbase.hxx>
++#include <vbahelper/helperdecl.hxx>
++#include <comphelper/unwrapargs.hxx>
++
++#include <com/sun/star/util/XModifiable.hpp>
++#include <com/sun/star/util/XProtectable.hpp>
++#include <com/sun/star/util/XCloseable.hpp>
++#include <com/sun/star/frame/XStorable.hpp>
++#include <com/sun/star/frame/XFrame.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++
++#include <tools/urlobj.hxx>
++#include <osl/file.hxx>
++
++using namespace ::com::sun::star;
++using namespace ::ooo::vba;
++
++VbaDocumentBase::VbaDocumentBase( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext) :VbaDocumentBase_BASE( xParent, xContext ), mxModel(NULL)
++{
++}
++
++VbaDocumentBase::VbaDocumentBase( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< frame::XModel > xModel ) : VbaDocumentBase_BASE( xParent, xContext ),  mxModel( xModel ) 
++{ 
++}
++
++VbaDocumentBase::VbaDocumentBase( uno::Sequence< uno::Any> const & args,
++    uno::Reference< uno::XComponentContext> const & xContext ) : VbaDocumentBase_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ),  mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ) 
++{
++}
++
++::rtl::OUString
++VbaDocumentBase::getName() throw (uno::RuntimeException)
++{
++	rtl::OUString sName = getModel()->getURL();
++	if ( sName.getLength() )
++	{
++
++		INetURLObject aURL( getModel()->getURL() );
++		::osl::File::getSystemPathFromFileURL( aURL.GetLastName(), sName );
++	}
++	else
++	{
++		const static rtl::OUString sTitle( RTL_CONSTASCII_USTRINGPARAM("Title" ) );
++		// process "UntitledX - $(PRODUCTNAME)"
++		uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
++		uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
++		xProps->getPropertyValue(sTitle ) >>= sName;
++		sal_Int32 pos = 0;
++		sName = sName.getToken(0,' ',pos);	
++	}
++	return sName;
++}
++::rtl::OUString
++VbaDocumentBase::getPath() throw (uno::RuntimeException)
++{
++       INetURLObject aURL( getModel()->getURL() );
++	rtl::OUString sURL( aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
++	sURL = sURL.copy( 0, sURL.getLength() - aURL.GetLastName().getLength() - 1 );
++        rtl::OUString sPath;
++	::osl::File::getSystemPathFromFileURL( sURL, sPath );
++	return sPath;
++}
++
++::rtl::OUString
++VbaDocumentBase::getFullName() throw (uno::RuntimeException)
++{
++        rtl::OUString sPath;
++	::osl::File::getSystemPathFromFileURL( getModel()->getURL(), sPath );
++	return sPath;
++}
++
++void
++VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
++					  const uno::Any &rRouteArg ) throw (uno::RuntimeException)
++{
++	sal_Bool bSaveChanges = sal_False;
++	rtl::OUString aFileName;
++	sal_Bool bRouteWorkbook = sal_True;
++
++	rSaveArg >>= bSaveChanges;
++	sal_Bool bFileName =  ( rFileArg >>= aFileName );
++	rRouteArg >>= bRouteWorkbook;
++	uno::Reference< frame::XStorable > xStorable( getModel(), uno::UNO_QUERY_THROW );
++	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
++
++	if( bSaveChanges )
++	{
++		if( xStorable->isReadonly() )
++		{	
++			throw uno::RuntimeException(::rtl::OUString( 
++				RTL_CONSTASCII_USTRINGPARAM( "Unable to save to a read only file ") ),
++                        	uno::Reference< XInterface >() );
++		}
++		if( bFileName )
++			xStorable->storeAsURL( aFileName, uno::Sequence< beans::PropertyValue >(0) ); 
++		else
++			xStorable->store();
++	}	
++	else
++		xModifiable->setModified( false );		
++
++	uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY );
++
++	if( xCloseable.is() )
++		// use close(boolean DeliverOwnership)
++	
++		// The boolean parameter DeliverOwnership tells objects vetoing the close process that they may
++		// assume ownership if they object the closure by throwing a CloseVetoException
++		// Here we give up ownership. To be on the safe side, catch possible veto exception anyway.
++		xCloseable->close(sal_True);
++	// If close is not supported by this model - try to dispose it.
++	// But if the model disagree with a reset request for the modify state
++	// we shouldn't do so. Otherwhise some strange things can happen.
++	else
++	{
++		uno::Reference< lang::XComponent > xDisposable ( getModel(), uno::UNO_QUERY );
++		if ( xDisposable.is() )
++			xDisposable->dispose();
++	}
++}
++
++void
++VbaDocumentBase::Protect( const uno::Any &aPassword ) throw (uno::RuntimeException)
++{
++	rtl::OUString rPassword;
++	uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
++	SC_VBA_FIXME(("Workbook::Protect stub"));
++	if(  aPassword >>= rPassword )
++		xProt->protect( rPassword );
++	else
++		xProt->protect( rtl::OUString() );
++}
++
++void 
++VbaDocumentBase::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeException)
++{
++	rtl::OUString rPassword;
++	uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
++	if( !xProt->isProtected() )
++		throw uno::RuntimeException(::rtl::OUString(
++			RTL_CONSTASCII_USTRINGPARAM( "File is already unprotected" ) ),
++			uno::Reference< XInterface >() );
++	else
++	{
++		if( aPassword >>= rPassword )
++			xProt->unprotect( rPassword );
++		else
++			xProt->unprotect( rtl::OUString() );
++	}
++}
++		
++void 
++VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException)
++{
++	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
++	xModifiable->setModified( bSave );
++}
++
++sal_Bool
++VbaDocumentBase::getSaved() throw (uno::RuntimeException)
++{
++	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
++	return xModifiable->isModified();
++}
++
++void
++VbaDocumentBase::Save() throw (uno::RuntimeException)
++{
++	rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));
++	uno::Reference< frame::XModel > xModel = getModel();
++	dispatchRequests(xModel,url);
++}
++
++void 
++VbaDocumentBase::Activate() throw (uno::RuntimeException)
++{
++	uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
++	xFrame->activate();
++}	
++
++rtl::OUString& 
++VbaDocumentBase::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaDocumentBase") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++VbaDocumentBase::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VbaDocumentBase" ) );
++	}
++	return aServiceNames;
++}
++
+Index: vbahelper/source/vbahelper/vbahelper.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbahelper.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbahelper.cxx	(revision 276288)
+@@ -0,0 +1,1200 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbahelper.cxx,v $
++ * $Revision: 1.5.32.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <cppuhelper/bootstrap.hxx>
++#include <com/sun/star/util/XURLTransformer.hpp>
++#include <com/sun/star/frame/XDispatchProvider.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/frame/XFrame.hpp>
++#include <com/sun/star/frame/XDesktop.hpp>
++#include <com/sun/star/frame/XController.hpp>
++#include <com/sun/star/script/XDefaultProperty.hpp>
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <com/sun/star/lang/XMultiComponentFactory.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/beans/XIntrospection.hpp>
++#include <ooo/vba/msforms/XShape.hpp>
++
++#include <comphelper/processfactory.hxx>
++
++#include <sfx2/objsh.hxx>
++#include <sfx2/viewfrm.hxx>
++#include <sfx2/dispatch.hxx>
++#include <sfx2/app.hxx>
++#include <svtools/stritem.hxx>
++#include <svtools/eitem.hxx>
++#include <svtools/intitem.hxx>
++#include <svtools/itemset.hxx>
++//#include <svtools/itempool.hxx>
++#include <sfx2/docfac.hxx>
++#include <sfx2/viewfac.hxx>
++
++#include <basic/sbx.hxx>
++#include <basic/sbstar.hxx>
++#include <basic/basmgr.hxx>
++#include <basic/sbmod.hxx>
++#include <basic/sbmeth.hxx>
++#include <rtl/math.hxx>
++#include <sfx2/viewsh.hxx>
++#include <math.h>
++#include <tools/urlobj.hxx>
++#include <osl/file.hxx>
++#include <toolkit/awt/vclxwindow.hxx>
++#include <toolkit/helper/vclunohelper.hxx>
++#include <com/sun/star/frame/XModel2.hpp>
++#include <com/sun/star/lang/XUnoTunnel.hpp>
++#include <vcl/window.hxx>
++#include <vcl/syswin.hxx>
++#include <tools/diagnose_ex.h>
++
++#ifndef OOVBA_DLLIMPLEMENTATION
++#define OOVBA_DLLIMPLEMENTATION
++#endif 
++
++#include <vbahelper/vbahelper.hxx>
++#include <sfx2/app.hxx>
++// #FIXME needs service
++//#include "vbashape.hxx"
++//#include "unonames.hxx"
++
++using namespace ::com::sun::star;
++using namespace ::ooo::vba;
++
++#define NAME_HEIGHT "Height"
++#define NAME_WIDTH "Width"
++
++#define POINTTO100THMILLIMETERFACTOR 35.27778
++
++
++void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue );
++
++uno::Any sbxToUnoValue( SbxVariable* pVar );
++
++
++namespace ooo
++{
++namespace vba
++{
++
++uno::Reference< lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell* pShell )
++{
++    uno::Any aUnoVar;
++    if ( !pShell || ! pShell->GetBasicManager()->GetGlobalUNOConstant( "VBAGlobals", aUnoVar ) )
++        throw lang::IllegalArgumentException();
++    uno::Reference< lang::XMultiServiceFactory > xVBAFactory( aUnoVar, uno::UNO_QUERY_THROW );
++    return xVBAFactory;
++}
++
++css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell, const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException)
++{
++    OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" );
++    ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
++    return getVBAServiceFactory( pShell )->createInstance( sVarName );
++}
++
++css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell, const sal_Char* _pAsciiName, const uno::Sequence< uno::Any >& aArgs ) throw ( css::uno::RuntimeException )
++{
++    OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" );
++    ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
++    uno::Reference< uno::XInterface > xIf = getVBAServiceFactory( pShell )->createInstanceWithArguments( sVarName, aArgs  );
++    return xIf;
++}
++// helper method to determine if the view ( calc ) is in print-preview mode
++bool isInPrintPreview( SfxViewFrame* pView )
++{
++	sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
++	if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() >
++nViewNo && !pView->GetObjectShell()->IsInPlaceActive() )
++	{
++		SfxViewFactory &rViewFactory =
++			pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo);
++		if (  pView->GetCurViewId() == rViewFactory.GetOrdinal() )
++			return true;
++	}
++	return false;
++}
++#if 0
++namespace excel // all in this namespace probably can be moved to sc
++{
++
++
++const ::rtl::OUString REPLACE_CELLS_WARNING(  RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning"));
++class PasteCellsWarningReseter
++{
++private:
++	bool bInitialWarningState;
++	static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException )
++	{
++		static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++		static uno::Reference<uno::XComponentContext > xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
++		static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
++				xContext->getServiceManager(), uno::UNO_QUERY_THROW );
++		static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW );
++		return xProps;
++	}
++
++	bool getReplaceCellsWarning() throw ( uno::RuntimeException )
++	{
++		sal_Bool res = sal_False;
++		getGlobalSheetSettings()->getPropertyValue( REPLACE_CELLS_WARNING ) >>= res;
++		return ( res == sal_True );
++	}
++
++	void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
++	{
++		getGlobalSheetSettings()->setPropertyValue( REPLACE_CELLS_WARNING, uno::makeAny( bState ) );
++	}
++public:
++	PasteCellsWarningReseter() throw ( uno::RuntimeException )
++	{
++		bInitialWarningState = getReplaceCellsWarning();
++		if ( bInitialWarningState )
++			setReplaceCellsWarning( false );
++	}
++	~PasteCellsWarningReseter()
++	{
++		if ( bInitialWarningState )
++		{
++			// don't allow dtor to throw
++			try
++			{
++				setReplaceCellsWarning( true );
++			}
++			catch ( uno::Exception& /*e*/ ){}
++		}
++	}
++};
++
++void
++implnPaste()
++{
++	PasteCellsWarningReseter resetWarningBox;
++	ScTabViewShell* pViewShell = getCurrentBestViewShell();
++	if ( pViewShell )
++	{
++		pViewShell->PasteFromSystem();
++		pViewShell->CellContentChanged();
++	}
++}
++
++
++void
++implnCopy()
++{
++	ScTabViewShell* pViewShell = getCurrentBestViewShell();
++	if ( pViewShell )
++		pViewShell->CopyToClip(NULL,false,false,true);
++}
++
++void 
++implnCut()
++{
++	ScTabViewShell* pViewShell =  getCurrentBestViewShell();
++	if ( pViewShell )
++		pViewShell->CutToClip( NULL, TRUE );
++}
++void implnPasteSpecial(SfxViewShell* pViewShell, USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
++{
++	PasteCellsWarningReseter resetWarningBox;
++	sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
++	InsCellCmd eMoveMode = INS_NONE;
++
++	if ( !pTabViewShell ) 
++		// none active, try next best
++		pTabViewShell = getCurrentBestViewShell();
++	if ( pTabViewShell )
++	{
++		ScViewData* pView = pTabViewShell->GetViewData();	
++		Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
++		if ( pView && pWin )
++		{
++			if ( bAsLink && bOtherDoc )
++				pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
++			else 
++			{
++				ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
++				ScDocument* pDoc = NULL; 
++				if ( pOwnClip )
++					pDoc = pOwnClip->GetDocument();	
++				pTabViewShell->PasteFromClip( nFlags, pDoc,
++					nFunction, bSkipEmpty, bTranspose, bAsLink,
++					eMoveMode, IDF_NONE, TRUE );
++				pTabViewShell->CellContentChanged();
++			}
++		}
++	}
++
++}
++
++ScDocShell* 
++getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) 
++{
++	uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
++	ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
++	ScDocShell* pDocShell = NULL;
++	if ( pModel )
++		pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
++	return pDocShell;
++
++}
++
++ScTabViewShell* 
++getBestViewShell(  css::uno::Reference< css::frame::XModel>& xModel )
++{
++	ScDocShell* pDocShell = getDocShell( xModel );
++	if ( pDocShell )
++		return pDocShell->GetBestViewShell();
++	return NULL;
++}
++
++ScTabViewShell* 
++getCurrentBestViewShell()
++{ 
++	uno::Reference< frame::XModel > xModel = getCurrentDocument();
++	return getBestViewShell( xModel );
++}
++
++SfxViewFrame* 
++getCurrentViewFrame()
++{
++	ScTabViewShell* pViewShell = getCurrentBestViewShell();	
++	if ( pViewShell )
++		return pViewShell->GetViewFrame();
++	return NULL;
++}
++};
++
++#endif
++const double Millimeter::factor =  35.27778;
++
++uno::Reference< beans::XIntrospectionAccess >
++getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException)
++{
++	static uno::Reference< beans::XIntrospection > xIntrospection;
++	if( !xIntrospection.is() )
++	{
++		uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++		xIntrospection.set( xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") ), uno::UNO_QUERY_THROW );
++	}
++	return xIntrospection->inspect( aObject );
++}
++
++uno::Reference< script::XTypeConverter >
++getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
++{
++	static uno::Reference< script::XTypeConverter > xTypeConv( xContext->getServiceManager()->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter") ), xContext ), uno::UNO_QUERY_THROW );
++	return xTypeConv;
++}
++const uno::Any&
++aNULL()
++{
++ 	static  uno::Any aNULLL = uno::makeAny( uno::Reference< uno::XInterface >() );
++	return aNULLL;
++}
++
++void dispatchExecute(SfxViewShell* pViewShell, USHORT nSlot, SfxCallMode nCall)
++{
++	SfxViewFrame* pViewFrame = NULL;
++	if ( pViewShell )
++		pViewFrame = pViewShell->GetViewFrame();
++	if ( pViewFrame )
++	{
++		SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
++		if( pDispatcher )
++		{
++			pDispatcher->Execute( nSlot , nCall );
++		}
++	}	
++}
++	
++void
++dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl, uno::Sequence< beans::PropertyValue >& sProps )
++{
++
++	util::URL  url ;
++	url.Complete = aUrl;
++	rtl::OUString emptyString = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ));
++	uno::Reference<frame::XController> xController = xModel->getCurrentController();
++	uno::Reference<frame::XFrame> xFrame = xController->getFrame();
++	uno::Reference<frame::XDispatchProvider> xDispatchProvider (xFrame,uno::UNO_QUERY_THROW);
++	try
++	{
++		uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++		uno::Reference<uno::XComponentContext > xContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW  );
++		if ( !xContext.is() )
++		{
++			return ;
++		}
++
++		uno::Reference<lang::XMultiComponentFactory > xServiceManager(
++				xContext->getServiceManager() );
++		if ( !xServiceManager.is() )
++		{
++			return ;
++		}
++		uno::Reference<util::XURLTransformer> xParser( xServiceManager->createInstanceWithContext(     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) )
++			,xContext), uno::UNO_QUERY_THROW );
++		if (!xParser.is())
++			return;
++		xParser->parseStrict (url);
++	}
++	catch ( uno::Exception & /*e*/ )
++	{
++		return ;
++	}
++
++	uno::Reference<frame::XDispatch> xDispatcher = xDispatchProvider->queryDispatch(url,emptyString,0);
++
++	uno::Sequence<beans::PropertyValue> dispatchProps(1);
++
++	sal_Int32 nProps = sProps.getLength();
++	beans::PropertyValue* pDest = dispatchProps.getArray();
++	if ( nProps )
++	{
++		dispatchProps.realloc( nProps + 1 );
++		// need to reaccquire pDest after realloc
++		pDest = dispatchProps.getArray();
++		beans::PropertyValue* pSrc = sProps.getArray();
++		for ( sal_Int32 index=0; index<nProps; ++index, ++pSrc, ++pDest )
++			*pDest = *pSrc;
++	}
++
++	(*pDest).Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Silent" ));
++	(*pDest).Value <<= (sal_Bool)sal_True;
++
++	if (xDispatcher.is())
++		xDispatcher->dispatch( url, dispatchProps );
++}
++
++void
++dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl) 
++{
++	uno::Sequence<beans::PropertyValue> dispatchProps;
++	dispatchRequests( xModel, aUrl, dispatchProps );
++}
++
++
++
++
++ uno::Reference< frame::XModel > 
++getCurrentDoc( const rtl::OUString& sKey ) throw (uno::RuntimeException)
++{
++	uno::Reference< frame::XModel > xModel;
++	SbxObject* pBasic = dynamic_cast< SbxObject* > ( SFX_APP()->GetBasic() );
++	SbxObject* basicChosen =  pBasic ;
++	if ( basicChosen == NULL)
++	{
++		OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" );
++		return xModel;
++	}    
++    SbxObject* p = pBasic;
++    SbxObject* pParent = p->GetParent();
++    SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL;
++
++    if( pParentParent )
++    {
++        basicChosen = pParentParent;
++    }
++    else if( pParent )
++    {
++        basicChosen = pParent;
++    }
++
++
++    uno::Any aModel; 
++    SbxVariable *pCompVar = basicChosen->Find(  sKey, SbxCLASS_OBJECT );
++
++	if ( pCompVar )
++	{
++		aModel = sbxToUnoValue( pCompVar );
++		if ( sal_False == ( aModel >>= xModel ) ||
++			!xModel.is() )
++		{
++			throw uno::RuntimeException( 
++				rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the current documet context") ), uno::Reference< uno::XInterface >() );
++		}
++		else
++		{
++			OSL_TRACE("Have model points to url %s",
++			::rtl::OUStringToOString( xModel->getURL(),
++				RTL_TEXTENCODING_ASCII_US ).pData->buffer );
++		}
++	}
++	else
++	{
++		OSL_TRACE("Failed to get %s", rtl::OUStringToOString( sKey, RTL_TEXTENCODING_UTF8 ).getStr() );
++		throw uno::RuntimeException( 
++			rtl::OUString( 
++				RTL_CONSTASCII_USTRINGPARAM(
++					"Can't determine the currently selected document") ),
++			uno::Reference< uno::XInterface >() );
++	}
++	return xModel;
++}
++
++ uno::Reference< frame::XModel > 
++getCurrentDocCtx( const rtl::OUString& ctxName, const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
++{
++    uno::Reference< frame::XModel > xModel;
++     // try fallback to calling doc
++     css::uno::Reference< css::container::XNameAccess > xNameAccess( xContext, css::uno::UNO_QUERY_THROW );
++     xModel.set( xNameAccess->getByName( ctxName ), uno::UNO_QUERY_THROW );
++     return xModel;
++}
++
++ uno::Reference< frame::XModel > 
++getCurrentExcelDoc( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
++{
++    static const rtl::OUString sThisExcelDoc( RTL_CONSTASCII_USTRINGPARAM("ThisExcelDoc" ) );
++    uno::Reference< frame::XModel > xModel;
++    try
++    {
++        xModel = getCurrentDoc( sThisExcelDoc ); 
++    }
++    catch( uno::Exception& e )
++    {
++        xModel = getCurrentDocCtx( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ExcelDocumentContext" ) ), xContext );
++    }
++    return xModel;
++}
++
++ uno::Reference< frame::XModel > 
++getCurrentWordDoc( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
++{
++    static const rtl::OUString sThisWordDoc( RTL_CONSTASCII_USTRINGPARAM("ThisWordDoc" ) );
++    uno::Reference< frame::XModel > xModel;
++    try
++    {
++        xModel = getCurrentDoc( sThisWordDoc ); 
++    }
++    catch( uno::Exception& e )
++    {
++        xModel = getCurrentDocCtx( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WordDocumentContext" ) ), xContext );
++    }
++    return xModel;
++}
++
++sal_Int32 
++OORGBToXLRGB( sal_Int32 nCol )
++{
++        sal_Int32 nAutoBits = nCol;
++        nAutoBits &= 0xFF000000;
++	sal_Int32 nRed = nCol;
++	nRed &= 0x00FF0000;
++	nRed >>= 16;
++	sal_Int32 nGreen = nCol;
++	nGreen &= 0x0000FF00;
++	nGreen >>= 8;
++	sal_Int32 nBlue = nCol;
++	nBlue &= 0x000000FF;
++	sal_Int32 nRGB =  ( nAutoBits | (nBlue << 16) | (nGreen << 8) | nRed );
++	return nRGB;
++}
++sal_Int32 
++XLRGBToOORGB( sal_Int32 nCol )
++{
++        sal_Int32 nAutoBits = nCol;
++        nAutoBits &= 0xFF000000;
++
++	sal_Int32 nBlue = nCol;
++	nBlue &= 0x00FF0000;
++	nBlue >>= 16;
++	sal_Int32 nGreen = nCol;
++	nGreen &= 0x0000FF00;
++	nGreen >>= 8;
++	sal_Int32 nRed = nCol;
++	nRed &= 0x000000FF;
++	sal_Int32 nRGB =  ( nAutoBits | (nRed << 16) | (nGreen << 8) | nBlue );
++	return nRGB;
++}
++uno::Any 
++OORGBToXLRGB( const uno::Any& aCol )
++{
++	sal_Int32 nCol;
++	aCol >>= nCol;
++	nCol = OORGBToXLRGB( nCol );
++	return uno::makeAny( nCol );
++}
++uno::Any 
++XLRGBToOORGB(  const uno::Any& aCol )
++{
++	sal_Int32 nCol;
++	aCol >>= nCol;
++	nCol = XLRGBToOORGB( nCol );
++	return uno::makeAny( nCol );
++}
++
++void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& /*ActivePrinter*/, const uno::Any& /*PrintToFile*/, const uno::Any& Collate, const uno::Any& PrToFileName, sal_Bool bUseSelection  )
++{
++	sal_Int32 nTo = 0;
++	sal_Int32 nFrom = 0;
++	sal_Int16 nCopies = 1;
++	sal_Bool bPreview = sal_False;
++	sal_Bool bCollate = sal_False;
++	sal_Bool bSelection = bUseSelection;
++	From >>= nFrom;
++	To >>= nTo;
++	Copies >>= nCopies;
++	Preview >>= bPreview;
++	if ( nCopies > 1 ) // Collate only useful when more that 1 copy
++		Collate >>= bCollate;
++
++	rtl::OUString sRange(  RTL_CONSTASCII_USTRINGPARAM( "-" ) );
++	rtl::OUString sFileName;
++	
++	if (( nFrom || nTo ) )
++	{
++		if ( nFrom )
++			sRange = ( ::rtl::OUString::valueOf( nFrom ) + sRange );
++		if ( nTo )
++			sRange += ::rtl::OUString::valueOf( nTo );
++	}
++
++	if (  PrToFileName.getValue() )
++	{
++		PrToFileName >>= sFileName;
++	}
++	SfxViewFrame* pViewFrame = NULL;
++	if ( pViewShell )
++		pViewFrame = pViewShell->GetViewFrame();
++	if ( pViewFrame )
++	{
++		SfxAllItemSet aArgs( SFX_APP()->GetPool() );
++				
++		SfxBoolItem sfxCollate( SID_PRINT_COLLATE, bCollate );
++		aArgs.Put( sfxCollate, sfxCollate.Which() );
++		SfxInt16Item sfxCopies( SID_PRINT_COPIES, nCopies );
++		aArgs.Put( sfxCopies, sfxCopies.Which() );
++		if ( sFileName.getLength() )
++		{
++			SfxStringItem sfxFileName( SID_FILE_NAME, sFileName);
++			aArgs.Put( sfxFileName, sfxFileName.Which() );
++		
++		}
++		if (  sRange.getLength() )
++		{
++			SfxStringItem sfxRange( SID_PRINT_PAGES, sRange );
++			aArgs.Put( sfxRange, sfxRange.Which() );
++		}
++		SfxBoolItem sfxSelection( SID_SELECTION, bSelection );
++		aArgs.Put( sfxSelection, sfxSelection.Which() );
++		SfxBoolItem sfxAsync( SID_ASYNCHRON, sal_False );
++		aArgs.Put( sfxAsync, sfxAsync.Which() );
++		SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
++
++		if ( pDispatcher )
++		{
++			if ( bPreview )
++			{
++				if ( !pViewFrame->GetFrame()->IsInPlace() ) 	
++				{
++					// #TODO is this necessary ( calc specific )
++//					SC_MOD()->InputEnterHandler();
++					pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON );
++					while ( isInPrintPreview( pViewFrame ) )
++						Application::Yield();
++				}
++			}
++			else
++				pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
++		}
++			
++	}
++	
++	// #FIXME #TODO
++	// 1 ActivePrinter ( how/can we switch a printer via API? )
++	// 2 PrintToFile ( ms behaviour if this option is specified but no 
++	//   filename supplied 'PrToFileName' then the user will be prompted )
++	// 3 Need to check behaviour of Selected sheets with range ( e.g. From & To
++	//    values ) in oOO these options are mutually exclusive
++	// 4 There is a pop up to do with transparent objects in the print source
++	//   should be able to disable that via configuration for the duration
++	//   of this method
++}
++
++ void PrintPreviewHelper( const css::uno::Any& /*EnableChanges*/, SfxViewShell* pViewShell )
++{
++	dispatchExecute( pViewShell, SID_VIEWSHELL1 );
++}
++
++rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
++{
++	uno::Type aType = pvargItem.getValueType();
++	uno::TypeClass eTypeClass = aType.getTypeClass();
++	rtl::OUString sString;
++	switch ( eTypeClass )
++	{
++		case uno::TypeClass_BOOLEAN:
++		{
++			sal_Bool bBool = sal_False;
++			pvargItem >>= bBool;
++			sString = rtl::OUString::valueOf( bBool );
++			break;
++		}
++		case uno::TypeClass_STRING:
++			pvargItem >>= sString;
++			break;
++		case uno::TypeClass_FLOAT:
++			{
++				float aFloat = 0;
++				pvargItem >>= aFloat;
++				sString = rtl::OUString::valueOf( aFloat );
++				break;
++			}
++		case uno::TypeClass_DOUBLE:
++			{
++				double aDouble = 0;
++				pvargItem >>= aDouble;
++				sString = rtl::OUString::valueOf( aDouble );
++				break;
++			}
++		case uno::TypeClass_SHORT:
++		case uno::TypeClass_LONG:
++		case uno::TypeClass_BYTE:
++			{
++				sal_Int32 aNum = 0;
++				pvargItem >>= aNum;
++				sString = rtl::OUString::valueOf( aNum );
++				break;
++			}
++
++		case uno::TypeClass_HYPER:
++			{
++				sal_Int64 aHyper = 0;
++				pvargItem >>= aHyper;
++				sString = rtl::OUString::valueOf( aHyper );
++				break;
++			}
++		default:
++       			throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid type, can't convert" ), uno::Reference< uno::XInterface >() );
++	}
++	return sString;
++}
++
++
++rtl::OUString 
++ContainerUtilities::getUniqueName( const uno::Sequence< ::rtl::OUString >&  _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator)
++{
++	return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2));
++}
++
++rtl::OUString 
++ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix)
++{
++	sal_Int32 a = _nStartSuffix;
++	rtl::OUString scompname = _sElementName;
++	bool bElementexists = true;
++	sal_Int32 nLen = _slist.getLength();
++	if ( nLen == 0 )
++		return _sElementName;
++
++	while (bElementexists == true) 
++	{
++		for (sal_Int32 i = 0; i < nLen; i++)
++		{
++			if (FieldInList(_slist, scompname) == -1)
++			{
++				return scompname;
++			}
++		}
++		scompname = _sElementName + _sSuffixSeparator + rtl::OUString::valueOf( a++ );
++	}
++	return rtl::OUString();
++}
++
++sal_Int32 
++ContainerUtilities::FieldInList( const uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString )
++{
++	sal_Int32 FieldLen = SearchList.getLength();
++	sal_Int32 retvalue = -1;
++	for (sal_Int32 i = 0; i < FieldLen; i++) 
++	{
++		// I wonder why comparing lexicographically is done
++		// when its a match is whats interesting?
++		//if (SearchList[i].compareTo(SearchString) == 0) 
++		if ( SearchList[i].equals( SearchString ) ) 
++		{
++			retvalue = i;
++			break;
++		}
++	}
++	return retvalue;
++
++}
++bool NeedEsc(sal_Unicode cCode)
++{
++	String sEsc(RTL_CONSTASCII_USTRINGPARAM(".^$+\\|{}()"));
++	return (STRING_NOTFOUND != sEsc.Search(cCode));
++}
++
++rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike )
++{
++	rtl::OUStringBuffer sResult;
++	const sal_Unicode *start = rIn.getStr();
++	const sal_Unicode *end = start + rIn.getLength();
++
++	int seenright = 0;
++	if ( bForLike )
++		sResult.append(static_cast<sal_Unicode>('^'));
++
++	while (start < end) 
++	{
++		switch (*start)
++		{
++			case '?':
++				sResult.append(static_cast<sal_Unicode>('.'));
++				start++;
++				break;
++			case '*':
++				sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".*")));
++				start++;
++				break;
++			case '#':
++				sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[0-9]")));
++				start++;
++				break;
++			case '~':
++				sResult.append(static_cast<sal_Unicode>('\\'));
++				sResult.append(*(++start));
++				start++;
++				break;
++				// dump the ~ and escape the next characture
++			case ']':
++				sResult.append(static_cast<sal_Unicode>('\\'));
++				sResult.append(*start++);
++				break;
++			case '[':
++				sResult.append(*start++);
++				seenright = 0;
++				while (start < end && !seenright)
++				{
++					switch (*start)
++					{
++						case '[':
++						case '?':
++						case '*':
++						sResult.append(static_cast<sal_Unicode>('\\'));
++						sResult.append(*start);
++							break;
++						case ']':
++						sResult.append(*start);
++							seenright = 1;
++							break;
++						case '!':
++							sResult.append(static_cast<sal_Unicode>('^'));
++							break;
++						default:
++						if (NeedEsc(*start))
++							sResult.append(static_cast<sal_Unicode>('\\'));
++						sResult.append(*start);
++							break;
++					}
++					start++;
++				}
++				break;
++			default:
++				if (NeedEsc(*start))
++					sResult.append(static_cast<sal_Unicode>('\\'));
++				sResult.append(*start++);
++		}
++	}
++
++	if ( bForLike )
++		sResult.append(static_cast<sal_Unicode>('$'));
++
++	return sResult.makeStringAndClear( );
++}
++
++double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical)
++{
++	double fConvertFactor = 1.0;
++	if( bVertical )
++	{
++		fConvertFactor = xDevice->getInfo().PixelPerMeterY/100000;
++	}
++	else
++	{
++		fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000;	
++	}
++	return fConvertFactor;
++}
++
++double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical)
++{
++	double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
++	return fPoints * POINTTO100THMILLIMETERFACTOR * fConvertFactor;
++}
++double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, sal_Bool bVertical)
++{
++	double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
++	return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR;
++}
++
++ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape )
++{
++    m_pShapeHelper.reset( new ShapeHelper( xShape ) );
++}
++
++sal_Int32 getPointerStyle( const uno::Reference< frame::XModel >& xModel )
++{
++    
++    sal_Int32 nPointerStyle( POINTER_ARROW );
++    try
++    {
++        const uno::Reference< frame::XController > xController( xModel->getCurrentController(),     uno::UNO_SET_THROW );
++        const uno::Reference< frame::XFrame >      xFrame     ( xController->getFrame(),        uno::UNO_SET_THROW );
++        const uno::Reference< awt::XWindow >       xWindow    ( xFrame->getContainerWindow(),   uno::UNO_SET_THROW );
++        // why the heck isn't there an XWindowPeer::getPointer, but a setPointer only?
++        const Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
++        if ( pWindow )
++            nPointerStyle = pWindow->GetSystemWindow()->GetPointer().GetStyle();
++    }
++    catch( const uno::Exception& )
++    {
++    	DBG_UNHANDLED_EXCEPTION();
++    }
++    return nPointerStyle;
++}
++
++// #FIXME this method looks wrong, shouldn't it just affect calc *or* writer
++// document/frame/window(s) but not both ( and depending on what api called 
++// this )
++void setCursorHelper( const uno::Reference< frame::XModel >& xModel, const Pointer& rPointer, sal_Bool bOverWrite )
++{
++    ::std::vector< uno::Reference< frame::XController > > aControllers;
++
++    uno::Reference< frame::XModel2 > xModel2( xModel, uno::UNO_QUERY );
++    if ( xModel2.is() )
++    {
++        const uno::Reference< container::XEnumeration > xEnumControllers( xModel2->getControllers(), uno::UNO_SET_THROW );
++        while ( xEnumControllers->hasMoreElements() )
++        {
++            const uno::Reference< frame::XController > xController( xEnumControllers->nextElement(), uno::UNO_QUERY_THROW );
++            aControllers.push_back( xController );
++        }
++    }
++    else
++    {
++        const uno::Reference< frame::XModel > xModel( xModel2, uno::UNO_QUERY );
++        if ( xModel.is() )
++        {
++            const uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
++            aControllers.push_back( xController );
++        }
++    }
++
++    for (   ::std::vector< uno::Reference< frame::XController > >::const_iterator controller = aControllers.begin();
++            controller != aControllers.end();
++            ++controller
++        )
++    {
++        const uno::Reference< frame::XFrame >      xFrame     ( (*controller)->getFrame(),       uno::UNO_SET_THROW   );
++        const uno::Reference< awt::XWindow >       xWindow    ( xFrame->getContainerWindow(),    uno::UNO_SET_THROW   );
++
++        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
++        OSL_ENSURE( pWindow, "ScVbaApplication::setCursor: no window!" );
++        if ( !pWindow )
++            continue;
++
++        pWindow->GetSystemWindow()->SetPointer( rPointer );
++        pWindow->GetSystemWindow()->EnableChildPointerOverwrite( bOverWrite );
++    }
++}
++
++void setDefaultPropByIntrospection( const uno::Any& aObj, const uno::Any& aValue  ) throw ( uno::RuntimeException )
++{
++    uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObj ) );
++
++    // #MAYBE #FIXME sort of a bit of a hack, 
++    uno::Reference<  script::XDefaultProperty > xDflt( aObj, uno::UNO_QUERY_THROW );
++    uno::Reference< beans::XPropertySet > xPropSet;
++
++    if ( xUnoAccess.is() )
++        xPropSet.set( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY);
++           
++    if ( xPropSet.is() )
++        xPropSet->setPropertyValue( xDflt->getDefaultPropertyName(), aValue );
++    else
++        throw uno::RuntimeException();
++}
++
++uno::Any getPropertyValue( const uno::Sequence< beans::PropertyValue >& aProp, const rtl::OUString& aName )
++{
++    uno::Any result;
++    for ( sal_Int32 i = 0; i < aProp.getLength(); i++ )
++    {
++        if ( aProp[i].Name.equals(aName) )
++        {
++            aProp[i].Value >>= result;
++            return result;
++        }
++    }
++    return result;
++}
++
++sal_Bool setPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, const rtl::OUString& aName, const uno::Any& aValue )
++{
++    for ( sal_Int32 i = 0; i < aProp.getLength(); i++ )
++    {
++        if ( aProp[i].Name.equals(aName) )
++        {
++            aProp[i].Value = aValue;
++            return sal_True;
++        }
++    }
++    return sal_False;
++}
++
++#define VBA_LEFT "PositionX"
++#define VBA_TOP "PositionY"
++UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
++{
++    mxModel.set( xControl->getModel(), uno::UNO_QUERY_THROW );
++}
++    double UserFormGeometryHelper::getLeft()
++    {
++	sal_Int32 nLeft = 0;
++	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;	
++	return Millimeter::getInPoints( nLeft );
++    }
++    void UserFormGeometryHelper::setLeft( double nLeft )
++    {
++        mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nLeft ) ) );
++    }
++    double UserFormGeometryHelper::getTop()
++    {
++	sal_Int32 nTop = 0;
++	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ) ) >>= nTop;	
++	return Millimeter::getInPoints( nTop );
++    }
++    void UserFormGeometryHelper::setTop( double nTop )
++    {
++	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
++    }
++    double UserFormGeometryHelper::getHeight()
++    {
++	sal_Int32 nHeight = 0;
++	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( NAME_HEIGHT ) ) ) >>= nHeight;	
++	return Millimeter::getInPoints( nHeight );
++    }
++    void UserFormGeometryHelper::setHeight( double nHeight )
++    {
++	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	NAME_HEIGHT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
++    }
++    double UserFormGeometryHelper::getWidth()
++    {
++	sal_Int32 nWidth = 0;
++	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	NAME_WIDTH ) ) ) >>= nWidth;	
++	return Millimeter::getInPoints( nWidth );
++    }
++    void UserFormGeometryHelper::setWidth( double nWidth)
++    {
++	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	NAME_WIDTH ) ), uno::makeAny(  Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
++    }
++
++    double ConcreteXShapeGeometryAttributes::getLeft()
++    {
++        return m_pShapeHelper->getLeft();
++    }
++    void ConcreteXShapeGeometryAttributes::setLeft( double nLeft )
++    {
++        m_pShapeHelper->setLeft( nLeft );
++    }
++    double ConcreteXShapeGeometryAttributes::getTop()
++    {
++        return m_pShapeHelper->getTop();
++    }
++    void ConcreteXShapeGeometryAttributes::setTop( double nTop )
++    {
++        m_pShapeHelper->setTop( nTop );
++    }
++
++    double ConcreteXShapeGeometryAttributes::getHeight()
++    {
++        return m_pShapeHelper->getHeight();
++    }
++    void ConcreteXShapeGeometryAttributes::setHeight( double nHeight )
++    {
++        m_pShapeHelper->setHeight( nHeight );
++    }
++    double ConcreteXShapeGeometryAttributes::getWidth()
++    {
++        return m_pShapeHelper->getWidth();
++    }
++    void ConcreteXShapeGeometryAttributes::setWidth( double nWidth)
++    {
++        m_pShapeHelper->setWidth( nWidth );
++    }
++
++
++	ShapeHelper::ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException ) : xShape( _xShape )
++	{ 
++		if( !xShape.is() ) 
++			throw css::uno::RuntimeException( rtl::OUString::createFromAscii("No valid shape for helper"), css::uno::Reference< css::uno::XInterface >() );
++	}
++    
++	double ShapeHelper::getHeight()
++	{
++        	return  Millimeter::getInPoints(xShape->getSize().Height);
++    	}
++
++
++    	void ShapeHelper::setHeight(double _fheight) throw ( css::script::BasicErrorException )
++	{
++		try
++		{
++			css::awt::Size aSize = xShape->getSize();
++			aSize.Height = Millimeter::getInHundredthsOfOneMillimeter(_fheight);
++			xShape->setSize(aSize);
++		}
++		catch ( css::uno::Exception& /*e*/)
++		{
++			throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
++    		}
++	}
++    
++    
++	double ShapeHelper::getWidth()
++	{ 
++		return Millimeter::getInPoints(xShape->getSize().Width);
++    	}
++
++	void ShapeHelper::setWidth(double _fWidth) throw ( css::script::BasicErrorException )
++	{
++		try
++		{
++			css::awt::Size aSize = xShape->getSize();
++			aSize.Width = Millimeter::getInHundredthsOfOneMillimeter(_fWidth);
++			xShape->setSize(aSize);
++		}
++		catch (css::uno::Exception& /*e*/)
++		{
++			throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
++		}
++	}
++    
++    
++	double ShapeHelper::getLeft()
++	{
++		return Millimeter::getInPoints(xShape->getPosition().X);
++	}
++
++    
++	void ShapeHelper::setLeft(double _fLeft)
++	{
++		css::awt::Point aPoint = xShape->getPosition();
++		aPoint.X = Millimeter::getInHundredthsOfOneMillimeter(_fLeft);
++		xShape->setPosition(aPoint);
++	}
++    
++
++	double ShapeHelper::getTop()
++	{
++        	return Millimeter::getInPoints(xShape->getPosition().Y);
++	}
++
++    
++	void ShapeHelper::setTop(double _fTop)
++	{
++		css::awt::Point aPoint = xShape->getPosition();
++		aPoint.Y = Millimeter::getInHundredthsOfOneMillimeter(_fTop);
++		xShape->setPosition(aPoint);
++	}
++    
++	void DebugHelper::exception( const rtl::OUString&  DetailedMessage, const css::uno::Exception& ex,  int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException )
++	{
++		// #TODO #FIXME ( do we want to support additionalArg here )
++		throw css::script::BasicErrorException( DetailedMessage.concat( rtl::OUString::createFromAscii(" ") ).concat( ex.Message ), css::uno::Reference< css::uno::XInterface >(), err, rtl::OUString() );
++	}
++
++	void DebugHelper::exception( int err,  const rtl::OUString& additionalArgument ) throw( css::script::BasicErrorException )
++	{
++		exception( rtl::OUString(), css::uno::Exception(), err, additionalArgument );
++	}
++	void DebugHelper::exception( css::uno::Exception& ex ) throw( css::script::BasicErrorException )
++	{
++		exception( rtl::OUString(), ex, SbERR_INTERNAL_ERROR, rtl::OUString() );
++	}
++
++	Millimeter::Millimeter():m_nMillimeter(0) {}
++    
++	Millimeter::Millimeter(double mm):m_nMillimeter(mm) {}
++    
++	void Millimeter::set(double mm) { m_nMillimeter = mm; }
++	void Millimeter::setInPoints(double points) 
++	{ 
++		m_nMillimeter = points * 0.352777778; 
++		// 25.4mm / 72 
++	}
++      
++	void Millimeter::setInHundredthsOfOneMillimeter(double hmm)
++	{
++		m_nMillimeter = hmm / 100;
++	}
++    
++	double Millimeter::get()
++	{
++		return m_nMillimeter;
++	}
++	double Millimeter::getInHundredthsOfOneMillimeter()
++	{
++		return m_nMillimeter * 100;
++	}
++	double Millimeter::getInPoints()
++	{
++		return m_nMillimeter * 2.834645669; // 72 / 25.4mm
++	}    
++
++	sal_Int32 Millimeter::getInHundredthsOfOneMillimeter(double points)
++	{
++		sal_Int32 mm = static_cast<sal_Int32>(points * factor);
++		return mm;
++	}
++    
++	double Millimeter::getInPoints(int _hmm)
++	{
++		double points = double( static_cast<double>(_hmm) / factor);
++		return points;
++	}
++        
++        SfxObjectShell* getSfxObjShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
++        {
++            SfxObjectShell* pFoundShell = NULL;
++            if ( xModel.is() )
++            {
++                uno::Reference< lang::XUnoTunnel >  xObjShellTunnel( xModel, uno::UNO_QUERY_THROW );
++                pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId()));
++            }
++            if ( !pFoundShell )
++                throw uno::RuntimeException();
++            return pFoundShell;
++        }
++
++} // openoffice
++} //org
+Index: vbahelper/source/vbahelper/vbashapes.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbashapes.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbashapes.cxx	(revision 276288)
+@@ -0,0 +1,491 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbashapes.cxx,v $
++ * $Revision: 1.3.32.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <com/sun/star/container/XNamed.hpp>
++#include <com/sun/star/view/XSelectionSupplier.hpp>
++#include <com/sun/star/text/WrapTextMode.hpp>
++#include <ooo/vba/msforms/XShapeRange.hpp>
++#include <ooo/vba/office/MsoAutoShapeType.hpp>
++#include <ooo/vba/office/MsoTextOrientation.hpp>
++#include <com/sun/star/lang/XServiceInfo.hpp>
++#include <com/sun/star/text/XText.hpp>
++#include <com/sun/star/text/XTextDocument.hpp>
++#include <com/sun/star/text/XTextContent.hpp>
++#include <com/sun/star/text/TextContentAnchorType.hpp>
++#include <com/sun/star/text/HoriOrientation.hpp>
++#include <com/sun/star/text/VertOrientation.hpp>
++#include <com/sun/star/text/RelOrientation.hpp>
++#include <com/sun/star/text/SizeType.hpp>
++#include <com/sun/star/text/WritingMode.hpp>
++#include <com/sun/star/drawing/LineStyle.hpp>
++
++#include <vbahelper/vbahelper.hxx>
++#include <vbahelper/vbashape.hxx>
++#include <vbahelper/vbashapes.hxx>
++#include <vbahelper/vbashaperange.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++class VbShapeEnumHelper : public EnumerationHelper_BASE
++{
++        uno::Reference<msforms::XShapes > m_xParent;
++        uno::Reference<container::XIndexAccess > m_xIndexAccess;
++        sal_Int32 nIndex;
++public:
++	VbShapeEnumHelper( const uno::Reference< msforms::XShapes >& xParent,  const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
++        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
++        {
++                return ( nIndex < m_xIndexAccess->getCount() );
++        }
++        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++        {
++                ScVbaShapes* pShapes = dynamic_cast< ScVbaShapes* >(m_xParent.get());
++                if ( pShapes && hasMoreElements() )
++                    return pShapes->createCollectionObject(  m_xIndexAccess->getByIndex( nIndex++ ) );
++                throw container::NoSuchElementException();
++        }
++
++};
++
++void ScVbaShapes::initBaseCollection()
++{
++	if ( m_xNameAccess.is() ) // already has NameAccess
++		return;
++	// no NameAccess then use ShapeCollectionHelper
++	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec mShapes;
++	sal_Int32 nLen = m_xIndexAccess->getCount();
++	mShapes.reserve( nLen );
++	for ( sal_Int32 index=0; index<nLen; ++index )
++		mShapes.push_back( uno::Reference< drawing::XShape >( m_xIndexAccess->getByIndex( index ) , uno::UNO_QUERY ) );
++	uno::Reference< container::XIndexAccess > xShapes( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) );
++	m_xIndexAccess.set( xShapes, uno::UNO_QUERY );
++	m_xNameAccess.set( xShapes, uno::UNO_QUERY );
++}
++
++ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const uno::Reference< frame::XModel>& xModel ): ScVbaShapes_BASE( xParent, xContext, xShapes ), m_nNewShapeCount(0), m_xModel( xModel )
++{
++    m_xShapes.set( xShapes, uno::UNO_QUERY_THROW );
++    m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); 
++    initBaseCollection();
++}
++
++uno::Reference< container::XEnumeration >
++ScVbaShapes::createEnumeration() throw (uno::RuntimeException)
++{
++    return new VbShapeEnumHelper( this,  m_xIndexAccess );
++}
++
++uno::Any
++ScVbaShapes::createCollectionObject( const css::uno::Any& aSource ) throw (uno::RuntimeException)
++{
++    if( aSource.hasValue() )
++    {
++        uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW );
++        return uno::makeAny( uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) ) ) );
++    }
++    return uno::Any();
++}
++
++uno::Type
++ScVbaShapes::getElementType() throw (uno::RuntimeException)
++{
++    return ooo::vba::msforms::XShape::static_type(0);
++}
++rtl::OUString& 
++ScVbaShapes::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapes") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaShapes::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Shapes" ) );
++	}
++	return aServiceNames;
++}
++
++css::uno::Reference< css::container::XIndexAccess > 
++ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index  ) throw (uno::RuntimeException)
++{
++	if ( Index.getValueTypeClass() != uno::TypeClass_SEQUENCE )
++		throw uno::RuntimeException();
++	
++	uno::Reference< script::XTypeConverter > xConverter = getTypeConverter(mxContext);
++	uno::Any aConverted;
++	aConverted = xConverter->convertTo( Index, getCppuType((uno::Sequence< uno::Any >*)0) );
++
++	uno::Sequence< uno::Any > sIndices;
++	aConverted >>= sIndices;
++	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec mShapes;
++	sal_Int32 nElems = sIndices.getLength();
++	for( sal_Int32 index = 0; index < nElems; ++index )
++	{
++		uno::Reference< drawing::XShape > xShape;
++		if ( sIndices[ index ].getValueTypeClass() == uno::TypeClass_STRING )
++		{
++			rtl::OUString sName;
++			sIndices[ index ] >>= sName;
++			xShape.set( m_xNameAccess->getByName( sName ), uno::UNO_QUERY );
++		}
++		else
++		{
++			sal_Int32 nIndex = 0;
++			sIndices[ index ] >>= nIndex;
++			// adjust for 1 based mso indexing
++			xShape.set( m_xIndexAccess->getByIndex( nIndex - 1 ), uno::UNO_QUERY );		
++			
++		}
++		// populate map with drawing::XShapes
++		if ( xShape.is() )
++			mShapes.push_back( xShape );
++	}  
++	uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) );
++	return xIndexAccess;
++}
++
++uno::Any SAL_CALL 
++ScVbaShapes::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::RuntimeException)
++{
++	// I don't think we need to support Array of indices for shapes	
++/*
++	if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE )
++	{
++		uno::Reference< container::XIndexAccess > xIndexAccess( getShapesByArrayIndices( Index ) );
++		// return new collection instance
++		uno::Reference< XCollection > xShapesCollection(  new ScVbaShapes( this->getParent(), mxContext, xIndexAccess ) );
++		return uno::makeAny( xShapesCollection );
++	}
++*/
++	return 	ScVbaShapes_BASE::Item( Index, Index2 );
++}
++
++uno::Reference< msforms::XShapeRange > SAL_CALL 
++ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException)
++{
++	// shapes, can be an index or an array of indices
++	uno::Reference< container::XIndexAccess > xShapes;
++	if ( shapes.getValueTypeClass() == uno::TypeClass_SEQUENCE )
++		xShapes = getShapesByArrayIndices( shapes );
++	else
++	{
++		// wrap single index into a sequence
++		uno::Sequence< uno::Any > sIndices(1);
++		sIndices[ 0 ] = shapes;
++		uno::Any aIndex;
++		aIndex <<= sIndices;
++		xShapes = getShapesByArrayIndices( aIndex );
++	}
++	return new ScVbaShapeRange(  getParent(), mxContext, xShapes, m_xDrawPage, m_xModel );
++}
++
++void SAL_CALL 
++ScVbaShapes::SelectAll() throw (uno::RuntimeException)
++{
++    uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++    try
++    {
++        xSelectSupp->select( uno::makeAny( m_xShapes ) );
++    }
++    // viewuno.cxx ScTabViewObj::select will throw IllegalArgumentException
++    // if one of the shapes is no 'markable' e.g. a button 
++    // the method still works
++    catch( lang::IllegalArgumentException& )
++    {
++    }
++}
++
++uno::Reference< drawing::XShape > 
++ScVbaShapes::createShape( rtl::OUString service ) throw (css::uno::RuntimeException)
++{
++    uno::Reference< lang::XMultiServiceFactory > xMSF( m_xModel, uno::UNO_QUERY_THROW );
++    uno::Reference< drawing::XShape > xShape( xMSF->createInstance( service ), uno::UNO_QUERY_THROW );
++    return xShape;
++}
++
++uno::Any 
++ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException)
++{
++    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape" ) );
++    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
++    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( startY );
++    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
++    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
++
++    uno::Reference< drawing::XShape > xShape( createShape( sCreateShapeName ), uno::UNO_QUERY_THROW );
++    m_xShapes->add( xShape );
++
++    rtl::OUString sName = createName( rtl::OUString::createFromAscii( "Rectangle" ) );
++    setDefaultShapeProperties( xShape );
++    setShape_NameProperty( xShape, sName );
++
++    awt::Point aMovePositionIfRange(0, 0);
++    awt::Point position;
++    position.X = nXPos - aMovePositionIfRange.X;
++    position.Y = nYPos - aMovePositionIfRange.Y;
++    xShape->setPosition( position );
++
++    awt::Size size;
++    size.Height = nHeight;
++    size.Width = nWidth;
++    xShape->setSize( size );
++
++    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
++    pScVbaShape->setRange( aRange ); 
++    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
++}
++
++uno::Any 
++ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException)
++{
++    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.EllipseShape" ) );
++    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
++    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( startY );
++    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
++    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
++
++    uno::Reference< drawing::XShape > xShape( createShape( sCreateShapeName ), uno::UNO_QUERY_THROW );
++    m_xShapes->add( xShape );
++
++    awt::Point aMovePositionIfRange( 0, 0 );
++    //TODO helperapi using a writer document
++    /*
++    XDocument xDocument = (XDocument)getParent();
++    if (AnyConverter.isVoid(_aRange))
++    {
++        _aRange = xDocument.Range(new Integer(0), new Integer(1));
++        // Top&Left in Word is Top&Left of the paper and not the writeable area.
++        aMovePositionIfRange = calculateTopLeftMargin((HelperInterfaceAdaptor)xDocument);
++    }
++
++    setShape_AnchorTypeAndRangeProperty(xShape, _aRange);
++    */
++    rtl::OUString name = createName( rtl::OUString::createFromAscii( "Oval" ));
++    setDefaultShapeProperties(xShape);
++    setShape_NameProperty(xShape, name);
++
++    awt::Point position;
++    position.X = nXPos - aMovePositionIfRange.X;
++    position.Y = nYPos - aMovePositionIfRange.Y;
++    xShape->setPosition(position);
++
++    awt::Size size;
++    size.Height = nHeight;
++    size.Width = nWidth;
++    xShape->setSize(size);
++
++    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
++    pScVbaShape->setRange( aRange ); 
++    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
++}
++
++//helpeapi calc
++uno::Any SAL_CALL
++ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (uno::RuntimeException)
++{
++    sal_Int32 nLineWidth = endX - StartX;
++    sal_Int32 nLineHeight = endY - StartY;
++
++    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
++    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
++    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( StartX );
++    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( StartY );
++    
++    uno::Reference< drawing::XShape > xShape( createShape( rtl::OUString::createFromAscii("com.sun.star.drawing.LineShape") ), uno::UNO_QUERY_THROW );
++    m_xShapes->add( xShape );
++
++    awt::Point aMovePositionIfRange( 0, 0 );
++    
++    rtl::OUString name = createName( rtl::OUString::createFromAscii( "Line" ) );
++    setDefaultShapeProperties(xShape);
++    setShape_NameProperty(xShape, name);
++
++    awt::Point position;
++    position.X = nXPos - aMovePositionIfRange.X;
++    position.Y = nYPos - aMovePositionIfRange.Y;
++    xShape->setPosition(position);
++
++    awt::Size size;
++    size.Height = nHeight;
++    size.Width = nWidth;
++    xShape->setSize(size);
++
++    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
++    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
++}
++
++uno::Any SAL_CALL
++ScVbaShapes::AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
++{
++    uno::Any _aAnchor;
++    if (_nType == office::MsoAutoShapeType::msoShapeRectangle)
++    {
++        return AddRectangle(_nLeft, _nTop, _nWidth, _nHeight, _aAnchor);
++    }
++    else if (_nType == office::MsoAutoShapeType::msoShapeOval)
++    {
++        return AddEllipse(_nLeft, _nTop, _nWidth, _nHeight, _aAnchor);
++    }
++    return uno::Any();
++}
++
++uno::Any SAL_CALL
++ScVbaShapes::AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
++{
++    uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
++    if( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) )
++    {
++        return AddTextboxInWriter( _nOrientation, _nLeft, _nTop, _nWidth, _nHeight );
++    }
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++uno::Any
++ScVbaShapes::AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
++{
++    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.TextShape" ) );
++    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( _nLeft );
++    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( _nTop );
++    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( _nWidth );
++    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( _nHeight );
++
++    uno::Reference< drawing::XShape > xShape( createShape( sCreateShapeName ), uno::UNO_QUERY_THROW );
++    m_xShapes->add( xShape );
++
++    setDefaultShapeProperties(xShape);
++
++    rtl::OUString sName =  createName( rtl::OUString::createFromAscii( "Text Box") );
++    setShape_NameProperty( xShape, sName );
++
++    awt::Size size;
++    size.Height = nHeight;
++    size.Width = nWidth;
++    xShape->setSize(size);
++
++    uno::Reference< beans::XPropertySet > xShapeProps( xShape, uno::UNO_QUERY_THROW );
++    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "AnchorType" ), uno::makeAny( text::TextContentAnchorType_AT_PAGE ) );
++    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "HoriOrientRelation" ), uno::makeAny( text::RelOrientation::PAGE_LEFT ) );
++    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "HoriOrient" ), uno::makeAny( text::HoriOrientation::NONE ) );
++    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "HoriOrientPosition" ), uno::makeAny( nXPos ) );
++
++    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "VertOrientRelation" ), uno::makeAny( text::RelOrientation::PAGE_FRAME ) );
++    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "VertOrient" ), uno::makeAny( text::VertOrientation::NONE ) );
++    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "VertOrientPosition" ), uno::makeAny( nYPos ) );
++
++    // set to visible
++    drawing::LineStyle aLineStyle = drawing::LineStyle_SOLID;
++    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( aLineStyle ) );
++    // set to font
++    sal_Int16 nLayerId = 1;
++    rtl::OUString sLayerName = rtl::OUString::createFromAscii("Heaven");
++    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "LayerID" ), uno::makeAny( nLayerId ) );
++    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "LayerName" ), uno::makeAny( sLayerName ) );
++
++
++    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
++    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
++}
++
++uno::Any
++ScVbaShapes::AddShape( const rtl::OUString& sService, const rtl::OUString& sName, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
++{
++    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( _nLeft );
++    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( _nTop );
++    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( _nWidth );
++    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( _nHeight );
++
++    uno::Reference< drawing::XShape > xShape( createShape( sService ), uno::UNO_QUERY_THROW );
++    m_xShapes->add( xShape );
++
++    setDefaultShapeProperties(xShape);
++    setShape_NameProperty( xShape, sName );
++
++    awt::Point aMovePositionIfRange( 0, 0 );
++    awt::Point position;
++    position.X = nXPos - aMovePositionIfRange.X;
++    position.Y = nYPos - aMovePositionIfRange.Y;
++    xShape->setPosition(position);
++
++    awt::Size size;
++    size.Height = nHeight;
++    size.Width = nWidth;
++    xShape->setSize(size);
++
++    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
++    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
++}
++void
++ScVbaShapes::setDefaultShapeProperties( uno::Reference< drawing::XShape > xShape ) throw (uno::RuntimeException)
++{
++    uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
++    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillStyle" ), uno::makeAny( rtl::OUString::createFromAscii( "SOLID" ) ) );
++    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillColor"), uno::makeAny( sal_Int32(0xFFFFFF) )  );
++    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextWordWrap"), uno::makeAny( text::WrapTextMode_THROUGHT )  );
++    //not find in OOo2.3
++    //xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "Opaque"), uno::makeAny( sal_True )  );
++}
++
++void
++ScVbaShapes::setShape_NameProperty( uno::Reference< css::drawing::XShape > xShape, rtl::OUString sName )
++{
++    uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
++    try
++    {
++        xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "Name" ), uno::makeAny( sName ) );
++    }
++    catch( script::BasicErrorException e )
++    {
++    }
++}
++
++rtl::OUString
++ScVbaShapes::createName( rtl::OUString sName )
++{
++    sal_Int32 nActNumber = 1 + m_nNewShapeCount;
++    m_nNewShapeCount++; 
++    sName += rtl::OUString::valueOf( nActNumber );
++    return sName;
++}
++
++#if 0
++//TODO helperapi using a writer document
++awt::Point
++calculateTopLeftMargin( uno::Reference< XHelperInterface > xDocument )
++{
++    awt::Point aPoint( 0, 0 );
++    uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW );
++    return awt::Point();
++}
++#endif
+Index: vbahelper/source/vbahelper/vbapictureformat.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbapictureformat.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbapictureformat.cxx	(revision 276288)
+@@ -0,0 +1,148 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbapictureformat.cxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbapictureformat.hxx"
++
++using namespace ooo::vba;
++using namespace com::sun::star;
++
++ScVbaPictureFormat::ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent,
++    const css::uno::Reference< css::uno::XComponentContext >& xContext,
++    uno::Reference< drawing::XShape > xShape ) 
++    throw( lang::IllegalArgumentException ) : ScVbaPictureFormat_BASE( xParent, xContext ), m_xShape( xShape )
++{
++    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
++}
++
++void
++ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException)
++{
++    if( nRange < nMin )
++    {
++        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter out of range, value is too small.") , uno::Reference< uno::XInterface >() );
++    }
++    if( nRange > nMax )
++    {
++        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter out of range, value is too high.") , uno::Reference< uno::XInterface >() );
++    }
++}
++
++// Attributes
++double SAL_CALL 
++ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException)
++{
++    sal_Int16 nLuminance = 0;
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance") ) >>= nLuminance;
++    double fBrightness = static_cast< double >( nLuminance );
++    fBrightness = ( fBrightness +100 ) / 200;
++    return fBrightness; 
++}
++
++void SAL_CALL 
++ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeException)
++{
++    checkParameterRangeInDouble( _brightness, 0.0, 1.0 );
++    double fLuminance = _brightness * 200 - 100;
++    sal_Int16 nLuminance = static_cast< sal_Int16 >( fLuminance );
++    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance"), uno::makeAny( nLuminance ) ); 
++}
++
++double SAL_CALL 
++ScVbaPictureFormat::getContrast() throw (uno::RuntimeException)
++{
++    sal_Int16 nContrast = 0;
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustContrast") ) >>= nContrast;
++    double fContrast = static_cast< double >( nContrast );
++    fContrast = ( fContrast + 100 ) / 200;
++    return fContrast;
++}
++
++void SAL_CALL 
++ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException)
++{
++    checkParameterRangeInDouble( _contrast, 0.0, 1.0 );
++    double fContrast = _contrast * 200 - 100;
++    sal_Int16 nContrast = static_cast< sal_Int16 >( fContrast );
++    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustContrast"), uno::makeAny( nContrast ) );
++}
++
++
++// Methods
++void SAL_CALL 
++ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeException)
++{
++    double fBrightness = getBrightness();
++    fBrightness += increment;
++    if( fBrightness < 0 )
++    {
++        fBrightness = 0.0;
++    }
++    if( fBrightness > 1 )
++    {
++        fBrightness = 1;
++    }
++    setBrightness( fBrightness );
++}
++
++void SAL_CALL 
++ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeException)
++{
++    double nContrast = getContrast();
++    nContrast += increment;
++	//VBA, minz@cn.ibm.com.
++    if( nContrast < 0 )
++    {
++        nContrast = 0.0;
++    }
++    if( nContrast > 1 )
++    {
++        nContrast = 1.0;
++    }
++    setContrast( nContrast );
++}
++
++
++rtl::OUString&
++ScVbaPictureFormat::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPictureFormat") );
++    return sImplName;
++}
++
++uno::Sequence< rtl::OUString >
++ScVbaPictureFormat::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.PictureFormat" ) );
++    }
++    return aServiceNames;
++}
+Index: vbahelper/source/vbahelper/vbacommandbars.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacommandbars.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacommandbars.cxx	(revision 276288)
+@@ -0,0 +1,238 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include <com/sun/star/lang/XServiceInfo.hpp>
++#include <com/sun/star/frame/XDesktop.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
++#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
++#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
++#include <com/sun/star/ui/XModuleUIConfigurationManager.hpp>
++#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
++
++#include "vbacommandbars.hxx"
++#include "vbacommandbar.hxx"
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++
++typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarEnumeration_BASE;
++
++class CommandBarEnumeration : public CommandBarEnumeration_BASE
++{
++    uno::Reference< XHelperInterface > m_xParent;
++    uno::Reference< uno::XComponentContext > m_xContext;
++    VbaCommandBarHelperRef pCBarHelper;
++    uno::Sequence< rtl::OUString > m_sNames;
++    sal_Int32 m_nCurrentPosition;
++public:
++    CommandBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, VbaCommandBarHelperRef pHelper) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), pCBarHelper( pHelper ) , m_nCurrentPosition( 0 )
++    {
++        uno::Reference< container::XNameAccess > xNameAccess = pCBarHelper->getPersistentWindowState();
++        m_sNames = xNameAccess->getElementNames();
++    }
++    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
++    {
++        if( m_nCurrentPosition < m_sNames.getLength() )
++            return sal_True;
++        return sal_False;
++    }
++    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
++    {
++        // FIXME: should be add menubar
++        if( hasMoreElements() )
++        {
++            rtl::OUString sResourceUrl( m_sNames[ m_nCurrentPosition++ ] );
++            if( sResourceUrl.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 ) 
++            {
++                uno::Reference< container::XIndexAccess > xCBarSetting = pCBarHelper->getSettings( sResourceUrl );
++                uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, pCBarHelper, xCBarSetting, sResourceUrl, sal_False, sal_False ) );
++             }
++             else
++                return nextElement();
++        }
++        else
++            throw container::NoSuchElementException();
++        return uno::Any();
++    }
++};
++
++ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : CommandBars_BASE( xParent, xContext, xIndexAccess )
++{
++    pCBarHelper.reset( new VbaCommandBarHelper( mxContext, xModel ) );
++    m_xNameAccess = pCBarHelper->getPersistentWindowState();
++}
++
++ScVbaCommandBars::~ScVbaCommandBars()
++{
++}
++
++// XEnumerationAccess
++uno::Type SAL_CALL 
++ScVbaCommandBars::getElementType() throw ( uno::RuntimeException )
++{
++    return XCommandBar::static_type( 0 );
++}
++
++uno::Reference< container::XEnumeration >
++ScVbaCommandBars::createEnumeration() throw ( uno::RuntimeException )
++{
++    return uno::Reference< container::XEnumeration >( new CommandBarEnumeration( this, mxContext, pCBarHelper ) );
++}
++
++uno::Any
++ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
++{
++    // aSource should be a name at this time, because of the class is API wrapper.
++    rtl::OUString sResourceUrl;
++    uno::Reference< container::XIndexAccess > xBarSettings;
++    rtl::OUString sBarName;
++    sal_Bool bMenu = sal_False;
++    if( aSource >>= sBarName )
++    {
++        if( sBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Worksheet Menu Bar") )
++            || sBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Menu Bar") ) )
++        {
++            // menu bar
++            sResourceUrl = rtl::OUString::createFromAscii( ITEM_MENUBAR_URL );
++            bMenu = sal_True;
++        }
++        else
++        {
++            sResourceUrl = pCBarHelper->findToolbarByName( m_xNameAccess, sBarName );
++            bMenu = sal_False;
++        }
++    }
++
++    if( sResourceUrl.getLength() )
++        xBarSettings = pCBarHelper->getSettings( sResourceUrl );
++    else
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toolbar do not exist") ), uno::Reference< uno::XInterface >() );
++
++    return uno::Any( uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, pCBarHelper, xBarSettings, sResourceUrl, bMenu, sal_False ) ) );
++}
++
++// XCommandBars
++uno::Reference< XCommandBar > SAL_CALL 
++ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
++{
++    // FIXME: only support to add Toolbar
++    // Position - MsoBar MenuBar - sal_Bool
++    // Currently only the Name is supported.
++    rtl::OUString sName;
++    if( Name.hasValue() )
++        Name >>= sName;
++
++    rtl::OUString sResourceUrl;
++    if( sName.getLength() )
++    {
++        sResourceUrl = pCBarHelper->findToolbarByName( m_xNameAccess, sName );
++        if( sResourceUrl.getLength() )
++            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toolbar exists") ), uno::Reference< uno::XInterface >() );
++    }
++    else
++    {
++        sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Custom1") );
++    }    
++
++    sal_Bool bTemporary = sal_False;
++    if( Temporary.hasValue() )
++        Temporary >>= bTemporary;
++    
++    sResourceUrl = VbaCommandBarHelper::generateCustomURL();
++    uno::Reference< container::XIndexAccess > xBarSettings( pCBarHelper->getSettings( sResourceUrl ), uno::UNO_QUERY_THROW );
++    uno::Reference< XCommandBar > xCBar( new ScVbaCommandBar( this, mxContext, pCBarHelper, xBarSettings, sResourceUrl, sal_False, bTemporary ) );
++    xCBar->setName( sName );
++    return xCBar;
++}
++sal_Int32 SAL_CALL 
++ScVbaCommandBars::getCount() throw(css::uno::RuntimeException)
++{
++    // Filter out all toolbars from the window collection
++    sal_Int32 nCount = 1; // there is a Menubar in OOo
++    uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
++    for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
++    {
++        if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
++        {
++            nCount++;
++        }
++    }
++    return nCount;
++}
++
++// ScVbaCollectionBaseImpl
++uno::Any SAL_CALL
++ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
++{
++    if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
++    {
++        return createCollectionObject( aIndex );    
++    }
++
++    // hardcode if "aIndex = 1" that would return "main menu".
++    sal_Int16 nIndex = 0;
++    aIndex >>= nIndex;
++    if( nIndex == 1 )
++    {
++        uno::Any aSource;
++        if( pCBarHelper->getModuleId().equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ) )
++            aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" );
++        else if( pCBarHelper->getModuleId().equalsAscii("com.sun.star.text.TextDocument") )
++            aSource <<= rtl::OUString::createFromAscii( "Menu Bar" );
++        if( aSource.hasValue() )    
++            return createCollectionObject( aSource );
++    }
++    return uno::Any();
++}
++
++// XHelperInterface
++rtl::OUString& 
++ScVbaCommandBars::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBars") );
++    return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++ScVbaCommandBars::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBars" ) );
++    }
++    return aServiceNames;
++}
++
+Index: vbahelper/source/vbahelper/vbacolorformat.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacolorformat.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacolorformat.cxx	(revision 276288)
+@@ -0,0 +1,190 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbacolorformat.cxx,v $
++ * $Revision: 1.3.146.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <ooo/vba/msforms/XLineFormat.hpp>
++#include "vbacolorformat.hxx"
++
++using namespace ooo::vba;
++using namespace com::sun::star;
++
++sal_Int32
++MsoColorIndizes::getColorIndex( sal_Int32 nIndex )
++{
++    const static sal_Int32 COLORINDIZES[56] =
++    {   HAPICOLOR_BLACK, HAPICOLOR_WITHE, HAPICOLOR_RED, HAPICOLOR_BRIGHTGREEN, HAPICOLOR_BLUE, HAPICOLOR_YELLOW, HAPICOLOR_PINK,
++        HAPICOLOR_TURQUOISE, HAPICOLOR_DARKRED, HAPICOLOR_GREEN, HAPICOLOR_DARKBLUE, HAPICOLOR_DARKYELLOW, HAPICOLOR_VIOLET,
++        HAPICOLOR_TEAL, HAPICOLOR_GRAY_25_PERCENT, HAPICOLOR_GRAY_50_PERCENT, HAPICOLOR_PERIWINCKLE, HAPICOLOR_PLUM,
++        HAPICOLOR_IVORY, HAPICOLOR_LIGHTTURQUOISE, HAPICOLOR_DARKPRUPLE, HAPICOLOR_CORAL, HAPICOLOR_OCEANBLUE, HAPICOLOR_ICEBLUE,
++        HAPICOLOR_GREEN, HAPICOLOR_PINK, HAPICOLOR_YELLOW, HAPICOLOR_TURQUOISE, HAPICOLOR_VIOLET, HAPICOLOR_DARKRED, HAPICOLOR_TEAL,
++        HAPICOLOR_BLUE, HAPICOLOR_SKYBLUE, HAPICOLOR_LIGHTTURQUOISE, HAPICOLOR_LIGHTGREEN, HAPICOLOR_LIGHTYELLOW, HAPICOLOR_PALEBLUE,
++        HAPICOLOR_ROSE, HAPICOLOR_LAVENDER, HAPICOLOR_TAN, HAPICOLOR_LIGHTBLUE, HAPICOLOR_AQUA, HAPICOLOR_LIME, HAPICOLOR_GOLD,
++        HAPICOLOR_LIGHTORANGE, HAPICOLOR_ORANGE, HAPICOLOR_BLUEGRAY, HAPICOLOR_GRAY_40_PERCENT, HAPICOLOR_DARKTEAL,
++        HAPICOLOR_SEAGREEN, HAPICOLOR_NONAME, HAPICOLOR_OLIVEGREEN, HAPICOLOR_BROWN, HAPICOLOR_PLUM, HAPICOLOR_INDIGO,
++        HAPICOLOR_GRAY_80_PERCENT
++    };
++    return COLORINDIZES[nIndex];
++}
++ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XHelperInterface > xInternalParent, const uno::Reference< drawing::XShape > xShape, const sal_Int16 nColorFormatType ) : ScVbaColorFormat_BASE( xParent, xContext ), m_xInternalParent( xInternalParent ), m_xShape( xShape ), m_nColorFormatType( nColorFormatType )
++{
++    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
++    m_nFillFormatBackColor = 0;
++    try
++    {
++        uno::Reference< ov::msforms::XFillFormat > xFillFormat( xInternalParent, uno::UNO_QUERY_THROW );
++        m_pFillFormat = ( ScVbaFillFormat* )( xFillFormat.get() );
++    }catch ( uno::RuntimeException  e )
++    {
++        m_pFillFormat = NULL;
++    }
++}
++
++void
++ScVbaColorFormat::setColorFormat( sal_Int16 _ntype )
++{
++    m_nColorFormatType = _ntype;
++}
++
++// Attribute
++sal_Int32 SAL_CALL 
++ScVbaColorFormat::getRGB() throw (uno::RuntimeException)
++{
++    sal_Int32 nRGB = 0;
++    switch( m_nColorFormatType )
++    {
++    case ColorFormatType::LINEFORMAT_FORECOLOR:
++        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LineColor") ) >>= nRGB;
++        break;
++    case ColorFormatType::LINEFORMAT_BACKCOLOR:
++        //TODO BackColor not supported
++        // m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("Color"), uno::makeAny( nRGB ) );
++        break;
++    case ColorFormatType::FILLFORMAT_FORECOLOR:
++        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillColor") ) >>= nRGB;
++        break;
++    case ColorFormatType::FILLFORMAT_BACKCOLOR:
++        nRGB = m_nFillFormatBackColor;
++        break;
++    default:
++        throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() );
++    }
++    nRGB = OORGBToXLRGB( nRGB );
++    return nRGB;
++}
++
++void SAL_CALL 
++ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException)
++{
++    sal_Int32 nRGB = XLRGBToOORGB( _rgb );
++    switch( m_nColorFormatType )
++    {
++    case ColorFormatType::LINEFORMAT_FORECOLOR:
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineColor" ), uno::makeAny( nRGB ) );
++        break;
++    case ColorFormatType::LINEFORMAT_BACKCOLOR:
++        // TODO BackColor not supported
++        break;
++    case ColorFormatType::FILLFORMAT_FORECOLOR:
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillColor" ), uno::makeAny( nRGB ) );
++        if( m_pFillFormat )
++        {
++            m_pFillFormat->setForeColorAndInternalStyle(nRGB);
++        }
++        break;
++    case ColorFormatType::FILLFORMAT_BACKCOLOR:
++        m_nFillFormatBackColor = nRGB;
++        if( m_pFillFormat )
++        {
++            m_pFillFormat->setForeColorAndInternalStyle(nRGB);
++        }
++        break;
++    default:    
++        throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() );
++    }
++}
++
++sal_Int32 SAL_CALL 
++ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException)
++{
++    sal_Int32 nColor = getRGB();
++    // #TODO I guess the number of elements is determined by the correct scheme
++    // the implementation here seems to be a rehash of color index ( which seems to be a 
++    // different thing ) - I would guess we need to know/import etc. the correct color scheme
++    // or at least find out a little more
++    sal_Int32 i = 0;
++    for( ; i < 56; i++ )
++    {
++        if( nColor == MsoColorIndizes::getColorIndex(i) )
++	   break;
++    }
++
++    if( i == 56 ) // this is most likely an error condition
++        --i;
++    return i; 
++    // #TODO figure out what craziness is this, 
++    // the 56 colors seems incorrect, as in default XL ( 2003 ) there are 80 colors
++/*
++    if( i == 56 )
++    {
++        i = -2;
++    }
++
++    return ( i + 2 );
++*/
++}
++
++void SAL_CALL 
++ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor ) throw (uno::RuntimeException)
++{
++    // the table is 0 based
++    sal_Int32 nColor = MsoColorIndizes::getColorIndex( _schemecolor );
++    // nColor is already xl RGB
++    setRGB( nColor );
++}
++
++
++rtl::OUString&
++ScVbaColorFormat::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaColorFormat") );
++    return sImplName;
++}
++
++uno::Sequence< rtl::OUString >
++ScVbaColorFormat::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ColorFormat" ) );
++    }
++    return aServiceNames;
++}
++
+Index: vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacommandbarcontrols.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacommandbarcontrols.cxx	(revision 276288)
+@@ -0,0 +1,256 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbacommandbarcontrols.hxx"
++#include "vbacommandbarcontrol.hxx"
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarControlEnumeration_BASE;
++class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE
++{
++    //uno::Reference< uno::XComponentContext > m_xContext;
++    ScVbaCommandBarControls* m_pCommandBarControls;
++    sal_Int32 m_nCurrentPosition;
++public:
++    CommandBarControlEnumeration( ScVbaCommandBarControls* pCommandBarControls ) : m_pCommandBarControls( pCommandBarControls ), m_nCurrentPosition( 0 ) {}
++    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
++    {
++        if( m_nCurrentPosition < m_pCommandBarControls->getCount() )
++            return sal_True;
++        return sal_False;
++    }
++    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
++    {
++        if( hasMoreElements() )
++        {
++            return m_pCommandBarControls->createCollectionObject( uno::makeAny( m_nCurrentPosition++ ) );
++        }
++        else
++            throw container::NoSuchElementException();
++    }
++};
++
++ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess>& xIndexAccess, VbaCommandBarHelperRef pHelper, const uno::Reference< container::XIndexAccess>& xBarSettings, const rtl::OUString& sResourceUrl, const uno::Reference< awt::XMenu >& xMenu  ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl ), m_xMenu( xMenu )
++{
++    m_bIsMenu = sResourceUrl.equalsAscii( ITEM_MENUBAR_URL ) ? sal_True : sal_False;
++}
++
++uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateMenuItemData( const rtl::OUString& sCommandURL, const rtl::OUString& sHelpURL, const rtl::OUString& sLabel, sal_uInt16 nType, const uno::Any& aSubMenu )
++{
++    uno::Sequence< beans::PropertyValue > aProps(5);
++
++    aProps[0].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_COMMANDURL );
++    aProps[0].Value <<= sCommandURL;
++    aProps[1].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_HELPURL );
++    aProps[1].Value <<= sHelpURL;
++    aProps[2].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_LABEL );
++    aProps[2].Value <<= sLabel;
++    aProps[3].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_TYPE );
++    aProps[3].Value <<= nType;
++    aProps[4].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER );
++    aProps[4].Value = aSubMenu;
++
++    return aProps;
++}
++
++uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateToolbarItemData( const rtl::OUString& sCommandURL, const rtl::OUString& sHelpURL, const rtl::OUString& sLabel, sal_uInt16 nType, const uno::Any& aSubMenu, sal_Bool isVisible, sal_Int32 nStyle )
++{
++    uno::Sequence< beans::PropertyValue > aProps(7);
++
++    aProps[0].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_COMMANDURL );
++    aProps[0].Value <<= sCommandURL;
++    aProps[1].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_HELPURL );
++    aProps[1].Value <<= sHelpURL;
++    aProps[2].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_LABEL );
++    aProps[2].Value <<= sLabel;
++    aProps[3].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_TYPE );
++    aProps[3].Value <<= nType;
++    aProps[4].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER );
++    aProps[4].Value = aSubMenu;
++    aProps[5].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_ISVISIBLE );
++    aProps[5].Value <<= isVisible;
++    aProps[6].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_STYLE );
++    aProps[6].Value <<= nStyle;
++
++    return aProps;
++}
++
++// XEnumerationAccess
++uno::Type SAL_CALL
++ScVbaCommandBarControls::getElementType() throw ( uno::RuntimeException )
++{
++    return XCommandBarControl::static_type( 0 );
++}
++
++uno::Reference< container::XEnumeration >
++ScVbaCommandBarControls::createEnumeration() throw ( uno::RuntimeException )
++{
++    return uno::Reference< container::XEnumeration >( new CommandBarControlEnumeration( this ) );
++}
++
++uno::Any
++ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
++{
++    sal_Int32 nPosition = -1;
++    aSource >>= nPosition;
++    uno::Sequence< beans::PropertyValue > aProps;
++    m_xIndexAccess->getByIndex( nPosition ) >>= aProps;
++    uno::Reference< container::XIndexAccess > xSubMenu;
++    getPropertyValue( aProps, rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER ) ) >>= xSubMenu;
++    ScVbaCommandBarControl* pNewCommandBarControl = NULL;
++    if( xSubMenu.is() )
++        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, sal_True, m_xMenu );
++    else
++        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, sal_True, m_xMenu );
++
++    return uno::makeAny( uno::Reference< XCommandBarControl > ( pNewCommandBarControl ) );
++}
++
++// Methods
++uno::Any SAL_CALL 
++ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*/ ) throw (uno::RuntimeException)
++{
++    sal_Int32 nPosition = -1;
++    if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
++    {
++        rtl::OUString sName;
++        aIndex >>= sName;
++        nPosition = VbaCommandBarHelper::findControlByName( m_xIndexAccess, sName );
++    } 
++    else
++    {
++        aIndex >>= nPosition;
++    }
++
++    if( nPosition < 0 || nPosition >= getCount() )
++    {
++        throw uno::RuntimeException();
++    }
++    
++    return createCollectionObject( uno::makeAny( nPosition ) ); 
++}
++
++uno::Reference< XCommandBarControl > SAL_CALL 
++ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& Parameter, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // Parameter is not supported
++    // the following name needs to be individually created;
++    rtl::OUString sLabel( rtl::OUString::createFromAscii("Custom") );
++    rtl::OUString sCommandUrl = rtl::OUString::createFromAscii( CUSTOM_MENU_STR ) + sLabel;
++    sal_Int32 nType = office::MsoControlType::msoControlButton;
++    sal_Int32 nPosition = 0;
++    sal_Bool bTemporary = sal_True;
++    
++    if( Type.hasValue() )
++    {
++        Type >>= nType;
++    }
++
++    if( nType != office::MsoControlType::msoControlButton &&
++        nType != office::MsoControlType::msoControlPopup )
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++
++    if( Id.hasValue() || Parameter.hasValue( ) )
++    {
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++    }
++
++    if( Before.hasValue() )
++        Before >>= nPosition;
++    else
++        nPosition = m_xIndexAccess->getCount();
++
++    if( Temporary.hasValue() )
++        Temporary >>= bTemporary;
++    
++    uno::Any aSubMenu;
++    if( nType == office::MsoControlType::msoControlPopup )
++    {
++        // it is a Popmenu
++        uno::Reference< lang::XSingleComponentFactory > xSCF( m_xBarSettings, uno::UNO_QUERY_THROW );
++        aSubMenu <<= xSCF->createInstanceWithContext( mxContext );
++    }
++
++    // create control 
++    uno::Sequence< beans::PropertyValue > aProps;
++    rtl::OUString sHelpUrl;
++    sal_Int32 nItemType = 0;
++    if( IsMenu() )
++    {
++        aProps = CreateMenuItemData( sCommandUrl, sHelpUrl, sLabel, nItemType, aSubMenu );
++    }
++    else
++    {
++        sal_Bool isVisible = sal_True;
++        sal_Int32 nStyle = 0;
++        aProps = CreateToolbarItemData( sCommandUrl, sHelpUrl, sLabel, nItemType, aSubMenu, isVisible, nStyle );
++    }
++
++
++    uno::Reference< container::XIndexContainer > xIndexContainer( m_xIndexAccess, uno::UNO_QUERY_THROW );
++    xIndexContainer->insertByIndex( nPosition, uno::makeAny( aProps ) );
++
++    pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings );
++
++    // sometimes it would crash if passing m_xMenu instead of uno::Reference< awt::XMenu >() in Linux. 
++    ScVbaCommandBarControl* pNewCommandBarControl = NULL;
++    if( nType == office::MsoControlType::msoControlPopup )
++        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary, uno::Reference< awt::XMenu >() );
++    else
++        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary, uno::Reference< awt::XMenu >() );
++
++    return uno::Reference< XCommandBarControl >( pNewCommandBarControl );
++}
++   
++// XHelperInterface
++rtl::OUString& 
++ScVbaCommandBarControls::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControls") );
++    return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++ScVbaCommandBarControls::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControls" ) );
++    }
++    return aServiceNames;
++}
++
+Index: vbahelper/source/vbahelper/vbapagesetupbase.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbapagesetupbase.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbapagesetupbase.cxx	(revision 276288)
+@@ -0,0 +1,325 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <vbahelper/vbapagesetupbase.hxx>
++
++using namespace ::com::sun::star;
++using namespace ::ooo::vba;
++
++VbaPageSetupBase::VbaPageSetupBase(const uno::Reference< XHelperInterface >& xParent, 
++				const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException): VbaPageSetupBase_BASE( xParent, xContext )
++{
++}		
++
++double SAL_CALL VbaPageSetupBase::getTopMargin() throw (css::uno::RuntimeException)
++{
++    sal_Bool headerOn = sal_False;
++    sal_Int32 topMargin = 0;
++    sal_Int32 headerHeight = 0;
++
++    try
++    {
++        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")));
++        aValue >>= headerOn;
++
++        aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")));
++        aValue >>= topMargin;
++
++        if( headerOn )
++        {
++            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")));
++            aValue >>= headerHeight;
++            topMargin = topMargin + headerHeight;
++        }
++    }
++    catch( uno::Exception& )
++    {
++    }
++    
++    return Millimeter::getInPoints( topMargin );
++}
++
++void SAL_CALL VbaPageSetupBase::setTopMargin( double margin ) throw (css::uno::RuntimeException)
++{
++    sal_Int32 topMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
++    sal_Bool headerOn = sal_False;
++    sal_Int32 headerHeight = 0;
++
++    try
++    {
++        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")));
++        aValue >>= headerOn;
++        
++        if( headerOn )
++        {
++            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")));
++            aValue >>= headerHeight;
++            topMargin -= headerHeight;
++        }
++
++        aValue <<= topMargin;
++        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")), aValue );
++    }
++    catch( uno::Exception& )
++    {
++    }
++}
++
++double SAL_CALL VbaPageSetupBase::getBottomMargin() throw (css::uno::RuntimeException)
++{
++    sal_Bool footerOn = sal_False;
++    sal_Int32 bottomMargin = 0;
++    sal_Int32 footerHeight = 0;
++
++    try
++    {
++        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")));
++        aValue >>= footerOn;
++
++        aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")));
++        aValue >>= bottomMargin;
++
++        if( footerOn )
++        {
++            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight")));
++            aValue >>= footerHeight;
++            bottomMargin += footerHeight;
++        }
++    }
++    catch( uno::Exception& )
++    {
++    }
++    
++    return Millimeter::getInPoints( bottomMargin );
++}
++
++void SAL_CALL VbaPageSetupBase::setBottomMargin( double margin ) throw (css::uno::RuntimeException)
++{
++    sal_Int32 bottomMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
++    sal_Bool footerOn = sal_False;
++    sal_Int32 footerHeight = 0;
++
++    try
++    {
++        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")));
++        aValue >>= footerOn;
++        
++        if( footerOn )
++        {
++            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight")));
++            aValue >>= footerHeight;
++            bottomMargin -= footerHeight;
++        }
++
++        aValue <<= bottomMargin;
++        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), aValue );
++    }
++    catch( uno::Exception& )
++    {
++    }
++}
++
++double SAL_CALL VbaPageSetupBase::getRightMargin() throw (css::uno::RuntimeException)
++{
++    sal_Int32 rightMargin = 0;
++    try
++    {
++        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin")));
++        aValue >>= rightMargin;
++    }
++    catch( uno::Exception& )
++    {
++    }
++    
++    return Millimeter::getInPoints( rightMargin );;
++}
++
++void SAL_CALL VbaPageSetupBase::setRightMargin( double margin ) throw (css::uno::RuntimeException)
++{
++    sal_Int32 rightMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
++    try
++    {
++        uno::Any aValue;
++        aValue <<= rightMargin;
++        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin")), aValue );
++    }
++    catch( uno::Exception& )
++    {
++    }
++
++}
++
++double SAL_CALL VbaPageSetupBase::getLeftMargin() throw (css::uno::RuntimeException)
++{
++    sal_Int32 leftMargin = 0;
++    try
++    {
++        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin")));
++        aValue >>= leftMargin;
++    }
++    catch( uno::Exception& )
++    {
++    }
++    
++    return Millimeter::getInPoints( leftMargin );;
++}
++
++void SAL_CALL VbaPageSetupBase::setLeftMargin( double margin ) throw (css::uno::RuntimeException)
++{
++    sal_Int32 leftMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
++    try
++    {
++        uno::Any aValue;
++        aValue <<= leftMargin;
++        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin")), aValue );
++    }
++    catch( uno::Exception& )
++    {
++    }
++}
++
++double SAL_CALL VbaPageSetupBase::getHeaderMargin() throw (css::uno::RuntimeException)
++{
++    sal_Int32 headerMargin = 0;
++    try
++    {
++        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")));
++        aValue >>= headerMargin;
++    }
++    catch( uno::Exception& )
++    {
++    }
++    
++    return Millimeter::getInPoints( headerMargin );;
++}
++
++void SAL_CALL VbaPageSetupBase::setHeaderMargin( double margin ) throw (css::uno::RuntimeException)
++{
++    sal_Int32 headerMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
++    try
++    {
++        uno::Any aValue;
++        aValue <<= headerMargin;
++        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")), aValue );
++    }
++    catch( uno::Exception& )
++    {
++    }
++}
++
++double SAL_CALL VbaPageSetupBase::getFooterMargin() throw (css::uno::RuntimeException)
++{
++    sal_Int32 footerMargin = 0;
++    try
++    {
++        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")));
++        aValue >>= footerMargin;
++    }
++    catch( uno::Exception& )
++    {
++    }
++    
++    return Millimeter::getInPoints( footerMargin );;
++}
++
++void SAL_CALL VbaPageSetupBase::setFooterMargin( double margin ) throw (css::uno::RuntimeException)
++{
++    sal_Int32 footerMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
++    try
++    {
++        uno::Any aValue;
++        aValue <<= footerMargin;
++        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), aValue );
++    }
++    catch( uno::Exception& )
++    {
++    }
++}
++
++sal_Int32 SAL_CALL VbaPageSetupBase::getOrientation() throw (css::uno::RuntimeException)
++{
++    sal_Int32 orientation = mnOrientPortrait;
++    try
++    {
++        sal_Bool isLandscape = sal_False;
++        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")));
++        aValue >>= isLandscape;
++
++        if( isLandscape )
++        {
++            orientation = mnOrientLandscape;
++        }
++    }
++    catch( uno::Exception& )
++    {
++    }
++    return orientation;
++}
++
++void SAL_CALL VbaPageSetupBase::setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException)
++{
++    if( ( orientation != mnOrientPortrait ) &&
++        ( orientation != mnOrientLandscape ) )
++    {
++        DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
++    }
++
++    try
++    {
++        sal_Bool isLandscape = sal_False;
++        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")));
++        aValue >>= isLandscape;
++
++        sal_Bool switchOrientation = sal_False;
++        if(( isLandscape && orientation != mnOrientLandscape ) || 
++            ( !isLandscape && orientation != mnOrientPortrait ))
++        {
++            switchOrientation = sal_True;
++        }
++
++        if( switchOrientation )
++        {
++            aValue <<= !isLandscape;
++            uno::Any aHeight = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height")));
++            uno::Any aWidth = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width")));
++            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")), aValue );
++            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width")),  aHeight );
++            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height")), aWidth );
++        }
++
++        if( isLandscape )
++        {
++            orientation = mnOrientLandscape;
++        }
++    }
++    catch( uno::Exception& )
++    {
++    }
++}
++
+Index: vbahelper/source/vbahelper/makefile.mk
+===================================================================
+--- vbahelper/source/vbahelper/makefile.mk	(revision 0)
++++ vbahelper/source/vbahelper/makefile.mk	(revision 276288)
+@@ -0,0 +1,80 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.45 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/../
++PRJNAME=vbahelper
++TARGET=vbahelperbits
++
++ENABLE_EXCEPTIONS := TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++SLOFILES=\
++    $(SLO)$/vbahelper.obj \
++    $(SLO)$/vbapropvalue.obj \
++    $(SLO)$/vbacommandbars.obj \
++    $(SLO)$/vbacommandbar.obj \
++    $(SLO)$/vbacommandbarcontrols.obj \
++    $(SLO)$/vbacommandbarcontrol.obj \
++    $(SLO)$/vbacommandbarhelper.obj \
++    $(SLO)$/vbaapplicationbase.obj \
++    $(SLO)$/vbawindowbase.obj \
++    $(SLO)$/vbadocumentbase.obj \
++    $(SLO)$/vbadocumentsbase.obj \
++    $(SLO)$/vbaglobalbase.obj \
++    $(SLO)$/vbafontbase.obj \
++    $(SLO)$/vbadialogbase.obj \
++    $(SLO)$/vbadialogsbase.obj \
++    $(SLO)$/vbashape.obj \
++    $(SLO)$/vbacolorformat.obj \
++    $(SLO)$/vbashapes.obj \
++    $(SLO)$/vbalineformat.obj \
++    $(SLO)$/vbafillformat.obj \
++    $(SLO)$/vbapictureformat.obj \
++    $(SLO)$/vbashaperange.obj \
++    $(SLO)$/vbatextframe.obj \
++    $(SLO)$/vbapagesetupbase.obj \
++
++# --- Targets -------------------------------------------------------
++
++.INCLUDE :  target.mk
++
++ALLTAR : \
++        $(MISC)$/$(TARGET).don \
++
++$(SLOFILES) : $(MISC)$/$(TARGET).don
++
++$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++        echo $@
++
+Index: vbahelper/source/vbahelper/vbapictureformat.hxx
+===================================================================
+--- vbahelper/source/vbahelper/vbapictureformat.hxx	(revision 0)
++++ vbahelper/source/vbahelper/vbapictureformat.hxx	(revision 276288)
+@@ -0,0 +1,64 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbapictureformat.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_PICTUREFORMAT_HXX
++#define SC_VBA_PICTUREFORMAT_HXX
++
++#include <com/sun/star/drawing/XShape.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <ooo/vba/msforms/XPictureFormat.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ov::msforms::XPictureFormat > ScVbaPictureFormat_BASE;
++
++class ScVbaPictureFormat : public ScVbaPictureFormat_BASE
++{
++private:
++    css::uno::Reference< css::drawing::XShape > m_xShape;
++    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
++protected:
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++private:
++    void checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException);
++public:
++    ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::drawing::XShape > xShape ) throw( css::lang::IllegalArgumentException );
++
++    // Attributes
++    virtual double SAL_CALL getBrightness() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setBrightness( double _brightness ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getContrast() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setContrast( double _contrast ) throw (css::uno::RuntimeException);
++
++    // Methods
++    virtual void SAL_CALL IncrementBrightness( double increment ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL IncrementContrast( double increment ) throw (css::uno::RuntimeException);
++};
++
++#endif//SC_VBA_PICTUREFORMAT_HXX
+Index: vbahelper/source/vbahelper/vbadialogbase.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbadialogbase.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbadialogbase.cxx	(revision 276288)
+@@ -0,0 +1,51 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadialog.cxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <vbahelper/vbadialogbase.hxx>
++#include <vbahelper/vbahelper.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++// fails silently
++void
++VbaDialogBase::Show() throw(uno::RuntimeException)
++{
++	rtl::OUString aURL;
++	if ( m_xModel.is() )
++	{
++		aURL = mapIndexToName( mnIndex );
++		if( aURL.getLength() == 0  )
++			throw uno::RuntimeException(
++				::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " Unable to open the specified dialog " ) ),
++				uno::Reference< XInterface > () );
++		dispatchRequests( m_xModel, aURL );
++	}
++}	
++
+Index: vbahelper/source/vbahelper/vbacommandbars.hxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacommandbars.hxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacommandbars.hxx	(revision 276288)
+@@ -0,0 +1,71 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_COMMANDBARS_HXX
++#define SC_VBA_COMMANDBARS_HXX
++
++#include <ooo/vba/XCommandBar.hpp>
++#include <ooo/vba/XCommandBars.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
++#include <cppuhelper/implbase1.hxx>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbacollectionimpl.hxx>
++#include "vbacommandbarhelper.hxx"
++
++typedef CollTestImplHelper< ov::XCommandBars > CommandBars_BASE;
++
++class ScVbaCommandBars : public CommandBars_BASE
++{
++private:
++    VbaCommandBarHelperRef pCBarHelper;
++
++public:
++    ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
++    virtual ~ScVbaCommandBars();
++
++    // XCommandBars
++    virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    // XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++
++    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException);
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif//SC_VBA_COMMANDBARS_HXX
+Index: vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacommandbarcontrols.hxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacommandbarcontrols.hxx	(revision 276288)
+@@ -0,0 +1,75 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_COMMANDBARCONTROLS_HXX
++#define SC_VBA_COMMANDBARCONTROLS_HXX
++
++#include <ooo/vba/XCommandBarControls.hpp>
++#include <com/sun/star/awt/XMenu.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <vbahelper/vbacollectionimpl.hxx>
++#include "vbacommandbarhelper.hxx"
++
++typedef CollTestImplHelper< ov::XCommandBarControls > CommandBarControls_BASE;
++
++class ScVbaCommandBarControls : public CommandBarControls_BASE
++{
++private:
++    VbaCommandBarHelperRef pCBarHelper;
++    css::uno::Reference< css::container::XIndexAccess >          m_xBarSettings;
++    rtl::OUString       m_sResourceUrl;
++    css::uno::Reference< css::awt::XMenu >                        m_xMenu;
++    sal_Bool m_bIsMenu;
++
++    css::uno::Sequence< css::beans::PropertyValue > CreateMenuItemData( const rtl::OUString& sCommandURL, const rtl::OUString& sHelpURL, const rtl::OUString& sLabel, sal_uInt16 nType, const css::uno::Any& aSubMenu );
++    css::uno::Sequence< css::beans::PropertyValue > CreateToolbarItemData( const rtl::OUString& sCommandURL, const rtl::OUString& sHelpURL, const rtl::OUString& sLabel, sal_uInt16 nType, const css::uno::Any& aSubMenu, sal_Bool isVisible, sal_Int32 nStyle );
++
++public:
++    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, const css::uno::Reference< css::awt::XMenu >& xMenu ) throw( css::uno::RuntimeException );
++    sal_Bool IsMenu(){ return m_bIsMenu; }
++
++    // XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++
++    // Methods     
++    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); 
++    virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    // XHelperInterface
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif//SC_VBA_COMMANDBARCONTROLS_HXX
+Index: vbahelper/source/vbahelper/vbacolorformat.hxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacolorformat.hxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacolorformat.hxx	(revision 276288)
+@@ -0,0 +1,128 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbacolorformat.hxx,v $
++ * $Revision: 1.3.146.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_XCOLORFORMAT_HXX
++#define SC_VBA_XCOLORFORMAT_HXX
++
++#include <com/sun/star/drawing/XShape.hpp>
++#include <ooo/vba/msforms/XColorFormat.hpp>
++#include <ooo/vba/msforms/XFillFormat.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include "vbafillformat.hxx"
++
++typedef InheritedHelperInterfaceImpl1< ov::msforms::XColorFormat > ScVbaColorFormat_BASE;
++
++class ColorFormatType
++{
++public:
++    const static sal_Int16 LINEFORMAT_FORECOLOR = 1;
++    const static sal_Int16 LINEFORMAT_BACKCOLOR = 2;
++    const static sal_Int16 FILLFORMAT_FORECOLOR = 3;
++    const static sal_Int16 FILLFORMAT_BACKCOLOR = 4;
++    const static sal_Int16 THREEDFORMAT_EXTRUSIONCOLOR = 5;
++};
++
++struct MsoColorIndizes
++{
++    const static sal_Int32 HAPICOLOR_BLACK = 0;
++    const static sal_Int32 HAPICOLOR_WITHE = 16777215;
++    const static sal_Int32 HAPICOLOR_RED = 16711680;
++    const static sal_Int32 HAPICOLOR_BRIGHTGREEN = 65280;
++    const static sal_Int32 HAPICOLOR_BLUE = 255;
++    const static sal_Int32 HAPICOLOR_YELLOW = 16776960;
++    const static sal_Int32 HAPICOLOR_PINK = 16711935;
++    const static sal_Int32 HAPICOLOR_TURQUOISE = 65535;
++    const static sal_Int32 HAPICOLOR_DARKRED = 8388608;
++    const static sal_Int32 HAPICOLOR_GREEN = 32768;
++    const static sal_Int32 HAPICOLOR_DARKBLUE = 128;
++    const static sal_Int32 HAPICOLOR_DARKYELLOW = 8421376;
++    const static sal_Int32 HAPICOLOR_VIOLET = 8388736;
++    const static sal_Int32 HAPICOLOR_TEAL = 32896;
++    const static sal_Int32 HAPICOLOR_GRAY_25_PERCENT = 12632256;
++    const static sal_Int32 HAPICOLOR_GRAY_50_PERCENT = 8421504;
++    const static sal_Int32 HAPICOLOR_PERIWINCKLE = 10066431;
++    const static sal_Int32 HAPICOLOR_PLUM = 10040166;
++    const static sal_Int32 HAPICOLOR_IVORY = 16777164;
++    const static sal_Int32 HAPICOLOR_LIGHTTURQUOISE = 13434879;
++    const static sal_Int32 HAPICOLOR_DARKPRUPLE = 6684774;
++    const static sal_Int32 HAPICOLOR_CORAL = 16744576;
++    const static sal_Int32 HAPICOLOR_OCEANBLUE = 26316;
++    const static sal_Int32 HAPICOLOR_ICEBLUE = 13421823;
++    const static sal_Int32 HAPICOLOR_SKYBLUE = 52479;
++    const static sal_Int32 HAPICOLOR_LIGHTGREEN = 13434828;
++    const static sal_Int32 HAPICOLOR_LIGHTYELLOW = 16777113;
++    const static sal_Int32 HAPICOLOR_PALEBLUE = 10079487;
++    const static sal_Int32 HAPICOLOR_ROSE = 16751052;
++    const static sal_Int32 HAPICOLOR_LAVENDER = 13408767;
++    const static sal_Int32 HAPICOLOR_TAN = 16764057;
++    const static sal_Int32 HAPICOLOR_LIGHTBLUE = 3368703;
++    const static sal_Int32 HAPICOLOR_AQUA = 3394764;
++    const static sal_Int32 HAPICOLOR_LIME = 10079232;
++    const static sal_Int32 HAPICOLOR_GOLD = 16763904;
++    const static sal_Int32 HAPICOLOR_LIGHTORANGE = 16750848;
++    const static sal_Int32 HAPICOLOR_ORANGE = 16737792;
++    const static sal_Int32 HAPICOLOR_BLUEGRAY = 6710937;
++    const static sal_Int32 HAPICOLOR_GRAY_40_PERCENT = 9868950;
++    const static sal_Int32 HAPICOLOR_DARKTEAL = 13158;
++    const static sal_Int32 HAPICOLOR_SEAGREEN = 3381606;
++    const static sal_Int32 HAPICOLOR_NONAME = 13056;
++    const static sal_Int32 HAPICOLOR_OLIVEGREEN = 3355392;
++    const static sal_Int32 HAPICOLOR_BROWN = 10040064;
++    const static sal_Int32 HAPICOLOR_INDIGO = 3355545;
++    const static sal_Int32 HAPICOLOR_GRAY_80_PERCENT = 3355443;
++
++    static sal_Int32 getColorIndex( sal_Int32 nIndex );
++    
++};
++
++class ScVbaColorFormat : public ScVbaColorFormat_BASE
++{
++private:
++    css::uno::Reference< ov::XHelperInterface > m_xInternalParent;
++    css::uno::Reference< css::drawing::XShape > m_xShape;
++    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
++    ScVbaFillFormat *m_pFillFormat;
++    sal_Int16 m_nColorFormatType;
++    sal_Int32 m_nFillFormatBackColor;
++protected:
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++    void setColorFormat( sal_Int16 nType );
++public:
++    ScVbaColorFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XHelperInterface > xInternalParent, const css::uno::Reference< css::drawing::XShape > xShape, const sal_Int16 nColorFormatType );
++
++    // Attributes
++    virtual sal_Int32 SAL_CALL getRGB() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setRGB( sal_Int32 _rgb ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getSchemeColor() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setSchemeColor( sal_Int32 _schemecolor ) throw (css::uno::RuntimeException);
++
++};
++
++#endif//SC_VBA_XCOLORFORMAT_HXX
+Index: vbahelper/source/vbahelper/vbaapplicationbase.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbaapplicationbase.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbaapplicationbase.cxx	(revision 276288)
+@@ -0,0 +1,218 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbahelper/vbaapplicationbase.hxx"
++#include <com/sun/star/container/XIndexAccess.hpp>
++#include <com/sun/star/frame/XLayoutManager.hpp>
++#include <com/sun/star/frame/XDesktop.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
++#include <com/sun/star/document/XDocumentProperties.hpp>
++#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
++
++#include "vbacommandbars.hxx"
++#include <svx/msvbahelper.hxx>
++
++// start basic includes
++#include <basic/sbx.hxx>
++#include <basic/sbstar.hxx>
++#include <basic/sbuno.hxx>
++#include <basic/sbmeth.hxx>
++#include <basic/sbmod.hxx>
++// end basic includes
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++#define OFFICEVERSION "11.0"
++
++VbaApplicationBase::VbaApplicationBase( const uno::Reference< uno::XComponentContext >& xContext )
++                    : ApplicationBase_BASE( uno::Reference< XHelperInterface >(), xContext )
++{
++}
++
++VbaApplicationBase::~VbaApplicationBase()
++{
++}
++
++sal_Bool SAL_CALL
++VbaApplicationBase::getScreenUpdating() throw (uno::RuntimeException)
++{
++	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
++	return !xModel->hasControllersLocked();
++}
++
++void SAL_CALL
++VbaApplicationBase::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeException)
++{
++	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
++	if (bUpdate)
++		xModel->unlockControllers();
++	else
++		xModel->lockControllers();
++}
++
++sal_Bool SAL_CALL
++VbaApplicationBase::getDisplayStatusBar() throw (uno::RuntimeException)
++{
++	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
++    uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
++    uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
++
++    if( xProps.is() ){
++        uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
++        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
++        if( xLayoutManager.is() && xLayoutManager->isElementVisible( url ) ){
++            return sal_True;
++        }
++    }
++    return sal_False;
++}
++
++void SAL_CALL
++VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno::RuntimeException)
++{
++	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
++    uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
++    uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
++
++    if( xProps.is() ){
++        uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
++        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
++        if( xLayoutManager.is() ){
++            if( bDisplayStatusBar && !xLayoutManager->isElementVisible( url ) ){
++                if( !xLayoutManager->showElement( url ) )
++                    xLayoutManager->createElement( url );
++                return;
++            }
++            else if( !bDisplayStatusBar && xLayoutManager->isElementVisible( url ) ){
++                xLayoutManager->hideElement( url ); 
++                return;
++            }
++        }
++    }
++    return;
++}
++
++uno::Any SAL_CALL
++VbaApplicationBase::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
++{
++    uno::Reference< XCommandBars > xCommandBars( new ScVbaCommandBars( this, mxContext, uno::Reference< container::XIndexAccess >(), getCurrentDocument() ) );
++    if( aIndex.hasValue() )
++        return uno::makeAny( xCommandBars->Item( aIndex, uno::Any() ) );
++    return uno::makeAny( xCommandBars );
++}
++
++::rtl::OUString SAL_CALL
++VbaApplicationBase::getVersion() throw (uno::RuntimeException)
++{
++	return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(OFFICEVERSION));
++}
++
++void SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException)
++{
++    VBAMacroResolvedInfo aMacroInfo = resolveVBAMacro( getSfxObjShell( getCurrentDocument() ), MacroName );
++    if( aMacroInfo.IsResolved() )
++    {
++        // handle the arguments
++        const uno::Any* aArgsPtrArray[] = { &varg1, &varg2, &varg3, &varg4, &varg5, &varg6, &varg7, &varg8, &varg9, &varg10, &varg11, &varg12, &varg13, &varg14, &varg15, &varg16, &varg17, &varg18, &varg19, &varg20, &varg21, &varg22, &varg23, &varg24, &varg25, &varg26, &varg27, &varg28, &varg29, &varg30 };
++
++        int nArg = sizeof( aArgsPtrArray ) / sizeof( aArgsPtrArray[0] );
++        uno::Sequence< uno::Any > aArgs( nArg );
++
++        const uno::Any** pArg = aArgsPtrArray;
++        const uno::Any** pArgEnd = ( aArgsPtrArray + nArg );
++
++        sal_Int32 nLastArgWithValue = 0;
++        sal_Int32 nArgProcessed = 0;
++
++        for ( ; pArg != pArgEnd; ++pArg, ++nArgProcessed )
++        {
++            aArgs[ nArgProcessed ] =  **pArg;
++            if( (*pArg)->hasValue() )
++                nLastArgWithValue = nArgProcessed;
++        }
++
++        // resize array to position of last param with value
++        aArgs.realloc( nArgProcessed + 1 );
++
++        uno::Any aRet;
++        uno::Any aDummyCaller;
++        executeMacro( aMacroInfo.MacroDocContext(), aMacroInfo.ResolvedMacro(), aArgs, aRet, aDummyCaller );
++    }
++    else
++    {
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("The macro doesn't exist") ), uno::Reference< uno::XInterface >() );
++    }
++}
++
++float SAL_CALL VbaApplicationBase::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException)
++{
++    // i cm = 28.35 points
++    static const float rate = 28.35;
++    return ( _Centimeters * rate );
++}
++
++rtl::OUString& 
++VbaApplicationBase::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaApplicationBase") );
++	return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++VbaApplicationBase::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VbaApplicationBase" ) );
++	}
++	return aServiceNames;
++}
++
++void VbaApplicationBase::Quit() throw (uno::RuntimeException)
++{
++    // need to stop basic
++    SbMethod* pMeth = StarBASIC::GetActiveMethod();
++    if ( pMeth )
++    {
++        SbModule* pMod = dynamic_cast< SbModule* >( pMeth->GetParent() );
++        if ( pMod )
++        { 
++            StarBASIC* pBasic = dynamic_cast< StarBASIC* >( pMod->GetParent() );
++            if ( pBasic )
++                pBasic->QuitAndExitApplication();
++        }
++    }
++}
+Index: vbahelper/source/vbahelper/vbatextframe.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbatextframe.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbatextframe.cxx	(revision 276288)
+@@ -0,0 +1,169 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbatextframe.cxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <vbahelper/helperdecl.hxx>
++#include <com/sun/star/drawing/TextFitToSizeType.hpp>
++#include <com/sun/star/text/XText.hpp>
++#include <vbahelper/vbatextframe.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++VbaTextFrame::VbaTextFrame( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< drawing::XShape > xShape ) : VbaTextFrame_BASE( xParent, xContext ), m_xShape( xShape )
++{
++    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
++}
++
++void
++VbaTextFrame::setAsMSObehavior()
++{
++    //set property TextWordWrap default as False.
++    // TextFitToSize control the text content. it seems we should set the default as False.
++    // com.sun.star.drawing.TextFitToSizeType.NONE
++    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextWordWrap" ), uno::makeAny( sal_False ) );
++    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextFitToSize" ), uno::makeAny( drawing::TextFitToSizeType_NONE ) );
++}
++
++sal_Int32 VbaTextFrame::getMargin( rtl::OUString sMarginType )
++{
++    sal_Int32 nMargin = 0;
++    uno::Any aMargin = m_xPropertySet->getPropertyValue( sMarginType );
++    aMargin >>= nMargin;
++    return nMargin;
++}
++
++void VbaTextFrame::setMargin( rtl::OUString sMarginType, float fMargin )
++{
++    sal_Int32 nMargin = Millimeter::getInHundredthsOfOneMillimeter( fMargin );
++    m_xPropertySet->setPropertyValue( sMarginType, uno::makeAny( nMargin ) );
++}
++
++// Attributes
++sal_Bool SAL_CALL 
++VbaTextFrame::getAutoSize() throw (uno::RuntimeException)
++{
++    // I don't know why, but in OOo, TextAutoGrowHeight is the property control autosize. not TextFitToSize.
++    // TextFitToSize control the text content. 
++    // and in mso, there isnot option TextWordWrap which means auto wrap. the default is False.
++    sal_Bool bAutosize = sal_False;
++    uno::Any aTextAutoGrowHeight = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ) );
++    aTextAutoGrowHeight >>= bAutosize;
++    return bAutosize;
++}
++
++void SAL_CALL 
++VbaTextFrame::setAutoSize( sal_Bool _autosize ) throw (uno::RuntimeException)
++{
++    setAsMSObehavior();
++    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ), uno::makeAny( _autosize ) );
++}
++
++float SAL_CALL 
++VbaTextFrame::getMarginBottom() throw (uno::RuntimeException)
++{
++    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ) );
++    float fMargin = (float)Millimeter::getInPoints( nMargin );
++    return fMargin;
++}
++
++void SAL_CALL 
++VbaTextFrame::setMarginBottom( float _marginbottom ) throw (uno::RuntimeException)
++{
++    setMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ), _marginbottom );
++}
++
++float SAL_CALL 
++VbaTextFrame::getMarginTop() throw (uno::RuntimeException)
++{
++    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ) );
++    float fMargin = (float)Millimeter::getInPoints( nMargin );
++    return fMargin;
++}
++
++void SAL_CALL 
++VbaTextFrame::setMarginTop( float _margintop ) throw (uno::RuntimeException)
++{
++    setMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ), _margintop );
++}
++
++float SAL_CALL 
++VbaTextFrame::getMarginLeft() throw (uno::RuntimeException)
++{
++    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ) );
++    float fMargin = (float)Millimeter::getInPoints( nMargin );
++    return fMargin;
++}
++
++void SAL_CALL 
++VbaTextFrame::setMarginLeft( float _marginleft ) throw (uno::RuntimeException)
++{
++    setMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ), _marginleft );
++}
++
++float SAL_CALL 
++VbaTextFrame::getMarginRight() throw (uno::RuntimeException)
++{
++    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextRightDistance" ) );
++    float fMargin = (float)Millimeter::getInPoints( nMargin );
++    return fMargin;
++}
++
++void SAL_CALL 
++VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException)
++{
++    setMargin( rtl::OUString::createFromAscii( "TextRightDistance" ), _marginright );
++}
++
++
++// Methods
++uno::Any SAL_CALL 
++VbaTextFrame::Characters() throw (uno::RuntimeException)
++{
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++rtl::OUString&
++VbaTextFrame::getServiceImplName()
++{
++    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaTextFrame") );
++    return sImplName;
++}
++
++uno::Sequence< rtl::OUString >
++VbaTextFrame::getServiceNames()
++{
++    static uno::Sequence< rtl::OUString > aServiceNames;
++    if ( aServiceNames.getLength() == 0 )
++    {
++        aServiceNames.realloc( 1 );
++        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.TextFrame" ) );
++    }
++    return aServiceNames;
++}
++
+Index: vbahelper/source/vbahelper/vbashape.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbashape.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbashape.cxx	(revision 276288)
+@@ -0,0 +1,676 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbashape.cxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include<ooo/vba/office/MsoZOrderCmd.hpp>
++#include<ooo/vba/office/MsoScaleFrom.hpp>
++#include<com/sun/star/container/XNamed.hpp>
++#include<com/sun/star/drawing/ConnectorType.hpp>
++#include <com/sun/star/lang/XEventListener.hpp>
++#include<com/sun/star/drawing/XDrawPagesSupplier.hpp>
++#include<com/sun/star/drawing/XDrawPages.hpp>
++#include<com/sun/star/view/XSelectionSupplier.hpp>
++#include <com/sun/star/lang/XServiceInfo.hpp>
++#include <com/sun/star/lang/XMultiServiceFactory.hpp>
++#include <com/sun/star/text/TextContentAnchorType.hpp>
++#include <ooo/vba/word/WdRelativeHorizontalPosition.hpp>
++#include <ooo/vba/word/WdRelativeVerticalPosition.hpp>
++
++#include <comphelper/processfactory.hxx>
++#include <vos/mutex.hxx>
++#include <vcl/svapp.hxx>
++#include <svx/unopage.hxx>
++#include <svx/unoshape.hxx>
++
++#include <vbahelper/vbashape.hxx>
++#include <vbahelper/vbatextframe.hxx>
++#include "vbalineformat.hxx"
++#include "vbafillformat.hxx"
++#include "vbapictureformat.hxx"
++#include <vbahelper/vbashaperange.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++using namespace ::vos;
++
++ScVbaShape::ScVbaShape( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, const uno::Reference< frame::XModel >& xModel, sal_Int32 nType ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( xParent, xContext ), m_xShape( xShape ), m_xShapes( xShapes ), m_nType( nType ), m_xModel( xModel )
++{
++    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
++    m_pShapeHelper.reset( new ShapeHelper( m_xShape ) );
++    addListeners();
++}
++
++ScVbaShape::ScVbaShape( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< frame::XModel >& xModel ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( uno::Reference< XHelperInterface >(), xContext ), m_xShape( xShape ), m_xModel( xModel )
++{
++    // add listener
++    addListeners();
++}
++
++ScVbaShape::~ScVbaShape()
++{ 
++    // dtor must never ever throw
++    /*try
++    {
++        removeShapeListener();
++        removeShapesListener();
++    }
++    catch( uno::Exception& )
++    {
++    }*/   
++}
++
++void SAL_CALL 
++ScVbaShape::disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException )
++{
++    try
++    {
++    uno::Reference< drawing::XShapes > xShapes( rEventObject.Source, uno::UNO_QUERY );
++    uno::Reference< drawing::XShape > xShape( rEventObject.Source, uno::UNO_QUERY );
++    if ( xShapes.is() )
++        removeShapesListener();
++    if ( xShape.is() )
++        removeShapeListener();
++    }    
++    catch( uno::Exception& )
++    {
++    }
++}
++
++
++void ScVbaShape::addListeners()
++{
++    uno::Reference< lang::XComponent > xComponent( m_xShape, uno::UNO_QUERY );
++    if ( xComponent.is() )
++    	xComponent->addEventListener( this );
++
++    xComponent.set( m_xShapes, uno::UNO_QUERY );
++    if ( xComponent.is() )
++    	xComponent->addEventListener( this );
++}
++
++void
++ScVbaShape::removeShapeListener() throw( uno::RuntimeException )
++{
++    if( m_xShape.is() )
++    {
++        uno::Reference< lang::XComponent > xComponent( m_xShape, uno::UNO_QUERY_THROW );
++        xComponent->removeEventListener( this );
++    }
++    m_xShape = NULL;
++    m_xPropertySet = NULL;
++}
++
++void
++ScVbaShape::removeShapesListener() throw( uno::RuntimeException )
++{
++    if( m_xShapes.is() )
++    {
++        uno::Reference< lang::XComponent > xComponent( m_xShapes, uno::UNO_QUERY_THROW );
++        xComponent->removeEventListener( this );
++    }
++    m_xShapes = NULL;
++}
++
++sal_Int32 
++ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw (uno::RuntimeException)
++{
++    rtl::OUString sShapeType;
++    uno::Reference< drawing::XShapeDescriptor > xShapeDescriptor( xShape, uno::UNO_QUERY_THROW );
++    sShapeType = xShapeDescriptor->getShapeType();
++    OSL_TRACE("ScVbaShape::getType: %s", rtl::OUStringToOString( sShapeType, RTL_TEXTENCODING_UTF8 ).getStr() );
++    // office::MsoShapeType::msoDiagram to "com.sun.star.drawing.GroupShape"
++    if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.GroupShape" ) ) )
++        return office::MsoShapeType::msoGroup;
++    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) ) )
++        return office::MsoShapeType::msoPicture;
++    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ControlShape" ) ) || 
++            sShapeType.equals( rtl::OUString::createFromAscii( "FrameShape" ) ) )
++        return office::MsoShapeType::msoOLEControlObject;
++    // OOo don't support office::MsoShapeType::msoComment as a Shape.
++    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.OLE2Shape" ) ) )
++        return office::MsoShapeType::msoChart;
++    // Art characters office::MsoShapeType::msoTextEffect, in OOo corresponding to "com.sun.star.drawing.CustomShape"
++    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ConnectorShape" ) ) )
++    {
++        enum drawing::ConnectorType connectorType;
++        uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
++        xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("EdgeKind")) >>= connectorType;
++        if( connectorType == drawing::ConnectorType_CURVE )
++            return office::MsoShapeType::msoFreeform;
++        else if( connectorType == drawing::ConnectorType_LINE )
++            return office::MsoShapeType::msoLine;
++        else 
++            return office::MsoShapeType::msoAutoShape;
++    }
++    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.LineShape" ) ) )
++        return office::MsoShapeType::msoLine;
++    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.CustomShape" ) ) ||
++            sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape") ) )
++        return office::MsoShapeType::msoAutoShape;
++    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.TextShape" ) ) )
++        return office::MsoShapeType::msoTextBox;
++    else
++        throw uno::RuntimeException( rtl::OUString::createFromAscii( "the shape type do not be supported: " ) + sShapeType, uno::Reference< uno::XInterface >() );
++}
++
++// Attributes
++rtl::OUString SAL_CALL 
++ScVbaShape::getName() throw (uno::RuntimeException)
++{
++    rtl::OUString sName;
++    uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW );
++    sName = xNamed->getName();
++    return sName;
++}
++
++void SAL_CALL 
++ScVbaShape::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
++{
++    uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW );
++    xNamed->setName( _name );
++}
++
++double SAL_CALL 
++ScVbaShape::getHeight() throw (uno::RuntimeException)
++{
++    return m_pShapeHelper->getHeight();
++}
++
++void SAL_CALL 
++ScVbaShape::setHeight( double _height ) throw (uno::RuntimeException)
++{
++    m_pShapeHelper->setHeight( _height );
++}
++
++double SAL_CALL 
++ScVbaShape::getWidth() throw (uno::RuntimeException)
++{
++    return m_pShapeHelper->getWidth();
++}
++
++void SAL_CALL 
++ScVbaShape::setWidth( double _width ) throw (uno::RuntimeException)
++{
++    m_pShapeHelper->setWidth( _width );
++}
++
++double SAL_CALL 
++ScVbaShape::getLeft() throw (uno::RuntimeException)
++{
++    return m_pShapeHelper->getLeft();
++}
++
++void SAL_CALL 
++ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException)
++{
++    m_pShapeHelper->setLeft( _left );
++}
++
++double SAL_CALL 
++ScVbaShape::getTop() throw (uno::RuntimeException)
++{
++    return m_pShapeHelper->getTop();
++}
++
++void SAL_CALL 
++ScVbaShape::setTop( double _top ) throw (uno::RuntimeException)
++{
++    return m_pShapeHelper->setTop( _top );
++}
++
++sal_Bool SAL_CALL 
++ScVbaShape::getVisible() throw (uno::RuntimeException)
++{
++    //UNO Shapes are always visible
++    return sal_True;
++}
++
++void SAL_CALL 
++ScVbaShape::setVisible( sal_Bool /*_visible*/ ) throw (uno::RuntimeException)
++{
++    //UNO Shapes are always visible
++}
++
++sal_Int32 SAL_CALL 
++ScVbaShape::getZOrderPosition() throw (uno::RuntimeException)
++{
++    sal_Int32 nZOrderPosition = 0;
++    uno::Any aZOrderPosition =  m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ) );
++    aZOrderPosition >>= nZOrderPosition;
++    return nZOrderPosition + 1;
++}
++
++sal_Int32 SAL_CALL 
++ScVbaShape::getType() throw (uno::RuntimeException)
++{
++    return m_nType;
++}
++
++double SAL_CALL 
++ScVbaShape::getRotation() throw (uno::RuntimeException)
++{
++    double dRotation = 0;
++    sal_Int32 nRotation = 0;
++    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "RotateAngle" ) ) >>= nRotation;
++    dRotation = static_cast< double >( nRotation /100 );
++    return dRotation;
++}
++
++void SAL_CALL 
++ScVbaShape::setRotation( double _rotation ) throw (uno::RuntimeException)
++{
++    sal_Int32 nRotation = static_cast < sal_Int32 > ( _rotation * 100 );
++    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "RotateAngle" ), uno::makeAny( nRotation ) );
++}
++
++uno::Reference< msforms::XLineFormat > SAL_CALL 
++ScVbaShape::getLine() throw (uno::RuntimeException)
++{
++    // TODO should ongly return line
++    return uno::Reference< msforms::XLineFormat >( new ScVbaLineFormat( this, mxContext, m_xShape ) );
++}
++
++uno::Reference< msforms::XFillFormat > SAL_CALL
++ScVbaShape::getFill() throw (uno::RuntimeException)
++{
++    return uno::Reference< msforms::XFillFormat >( new ScVbaFillFormat( this, mxContext, m_xShape ) );
++}
++
++uno::Reference<  msforms::XPictureFormat > SAL_CALL
++ScVbaShape::getPictureFormat() throw (uno::RuntimeException)
++{
++    return uno::Reference< msforms::XPictureFormat >( new ScVbaPictureFormat( this, mxContext, m_xShape ) );
++}
++
++// Methods
++uno::Any SAL_CALL 
++ScVbaShape::TextFrame() throw (uno::RuntimeException)
++{
++    uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
++    if( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument" ) ) ) )
++    {
++        uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++        uno::Sequence< uno::Any > aArgs(2);
++        aArgs[0] = uno::makeAny( getParent() );
++        aArgs[1] <<= m_xShape;
++        uno::Reference< uno::XInterface > xTextFrame( xSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.TextFrame") ) , aArgs ) , uno::UNO_QUERY_THROW );
++        return uno::makeAny( xTextFrame );
++    }
++
++    return uno::makeAny( uno::Reference< msforms::XTextFrame >( new VbaTextFrame( this, mxContext, m_xShape ) ) );
++}
++
++void SAL_CALL 
++ScVbaShape::Delete() throw (uno::RuntimeException)
++{
++    OGuard aGuard( Application::GetSolarMutex() );
++    m_xShapes->remove( m_xShape );
++}
++
++void SAL_CALL 
++ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException)
++{
++    sal_Int32 nOrderPositon;
++    uno::Any aOrderPostion = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ) );
++    aOrderPostion >>= nOrderPositon;
++    switch( ZOrderCmd )
++    {
++    case office::MsoZOrderCmd::msoBringToFront:
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( SAL_MAX_INT32 ) );
++        break;
++    case office::MsoZOrderCmd::msoSendToBack:
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( (sal_Int32)0 ) );
++        break;
++    case office::MsoZOrderCmd::msoBringForward:
++        nOrderPositon += 1;
++        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( nOrderPositon ) );
++        break;
++    case office::MsoZOrderCmd::msoSendBackward:
++        if( nOrderPositon > 0 )
++        {
++            nOrderPositon -= 1;
++            m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( nOrderPositon ) );
++        }
++        break;
++    // below two commands use with Writer for text and image object.
++    case office::MsoZOrderCmd::msoBringInFrontOfText:
++    case office::MsoZOrderCmd::msoSendBehindText:
++        throw uno::RuntimeException( rtl::OUString::createFromAscii( "This ZOrderCmd is not implemented, it is use with writer." ), uno::Reference< uno::XInterface >() );
++    default:
++        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Parameter." ), uno::Reference< uno::XInterface >() );
++    }
++}
++
++void SAL_CALL 
++ScVbaShape::IncrementRotation( double Increment ) throw (uno::RuntimeException)
++{
++    double nCurrentRotation = getRotation();
++    nCurrentRotation += Increment;
++    setRotation(nCurrentRotation);
++}
++
++void SAL_CALL 
++ScVbaShape::IncrementLeft( double Increment ) throw (uno::RuntimeException)
++{
++    double nCurrentLeft = getLeft();
++    nCurrentLeft += Increment;
++    setLeft(nCurrentLeft);
++}
++
++void SAL_CALL 
++ScVbaShape::IncrementTop( double Increment ) throw (uno::RuntimeException)
++{
++    double nCurrentTop = getTop();
++    nCurrentTop += Increment;
++    setTop(nCurrentTop);
++}
++
++void SAL_CALL 
++ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException)
++{
++    double nHeight = getHeight();
++    double nNewHeight = nHeight * Factor;
++    if( Scale == office::MsoScaleFrom::msoScaleFromTopLeft )
++    {
++        setHeight(nNewHeight);
++    }
++    else if( Scale == office::MsoScaleFrom::msoScaleFromBottomRight )
++    {
++        double nDeltaHeight = nNewHeight - nHeight;
++        double nNewTop = getTop() - nDeltaHeight;
++        setTop(nNewTop);
++        setHeight(nNewHeight);
++    }
++    else if( Scale == office::MsoScaleFrom::msoScaleFromMiddle )
++    {
++        double nDeltaHeight = (nNewHeight - nHeight) / 2;
++        double nNewTop = getTop() - nDeltaHeight;
++        setTop(nNewTop);
++        setHeight(nNewHeight);
++    }
++    else
++    {
++        throw uno::RuntimeException( rtl::OUString::createFromAscii( "ScaleHeight.Scale wrong value is given." ) , uno::Reference< uno::XInterface >() );
++    }
++}
++
++void SAL_CALL 
++ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException)
++{
++    double nWidth = getWidth();
++    double nNewWidth = nWidth * Factor;
++    if( Scale == office::MsoScaleFrom::msoScaleFromTopLeft )
++    {
++        setWidth(nNewWidth);
++    }
++    else if( Scale == office::MsoScaleFrom::msoScaleFromBottomRight )
++    {
++        double nDeltaWidth = nNewWidth - nWidth;
++        double nNewLeft = getLeft() - nDeltaWidth;
++        setLeft(nNewLeft);
++        setWidth(nNewWidth);
++    }
++    else if( Scale == office::MsoScaleFrom::msoScaleFromMiddle )
++    {
++        double nDeltaWidth = (nNewWidth - nWidth) / 2;
++        double nNewLeft = getLeft() - nDeltaWidth;
++        setLeft(nNewLeft);
++        setWidth(nNewWidth);
++    }
++    else
++    {
++        throw uno::RuntimeException( rtl::OUString::createFromAscii( "ScaleHeight.Scale wrong value is given." ) , uno::Reference< uno::XInterface >() );
++    }
++}
++
++void SAL_CALL
++ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException )
++{
++    uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++    xSelectSupp->select( uno::makeAny( m_xShape ) );
++}
++
++// This method should not be part of Shape, what we reall need to do is...
++// dynamically create the appropriate objects e.g. TextBox, Oval, Picture etc. 
++// ( e.g. the ones that really do have ShapeRange as an attribute )
++uno::Any SAL_CALL 
++ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException )
++{
++	// perhaps we should store a reference to the Shapes Collection 
++	// in this class
++	// but anyway this method should not even be in this class
++	// #TODO not sure what the parent of the Shapes collection should be
++	
++	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec aVec;
++	aVec.push_back( m_xShape );
++	uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( aVec ) );
++	uno::Reference< container::XChild > xChild( m_xShape, uno::UNO_QUERY_THROW );	
++	// #FIXME for want of a better parent, setting this
++	uno::Reference< msforms::XShapeRange > xShapeRange( new ScVbaShapeRange( mxParent, mxContext, xIndexAccess,  uno::Reference< drawing::XDrawPage >( xChild->getParent(), uno::UNO_QUERY_THROW ), m_xModel ) );
++	if ( index.hasValue() )
++		return xShapeRange->Item( index, uno::Any() );
++	return uno::makeAny( xShapeRange );
++}
++
++sal_Bool SAL_CALL 
++ScVbaShape::getLockAspectRatio() throw (uno::RuntimeException)
++{
++    // FIXME:
++    return sal_False;
++}
++
++void SAL_CALL 
++ScVbaShape::setLockAspectRatio( sal_Bool /*_lockaspectratio*/ ) throw (uno::RuntimeException)
++{
++    // FIXME:
++}
++
++sal_Bool SAL_CALL 
++ScVbaShape::getLockAnchor() throw (uno::RuntimeException)
++{
++    // FIXME:
++    return sal_True;
++}
++
++void SAL_CALL 
++ScVbaShape::setLockAnchor( sal_Bool /*_lockanchor*/ ) throw (uno::RuntimeException)
++{
++    // FIXME:
++}
++
++sal_Int32 SAL_CALL 
++ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException)
++{
++    sal_Int32 nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionMargin;
++    text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH;
++    m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ) ) >>= eType;
++    
++    switch( eType )
++    {
++        case text::TextContentAnchorType_AT_PARAGRAPH:
++        {
++            nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionColumn;
++            break;
++        }
++        case text::TextContentAnchorType_AT_PAGE:
++        {
++            nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionPage;
++            break;
++        }
++        case text::TextContentAnchorType_AT_CHARACTER:
++        {
++            nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionCharacter;
++            break;
++        }
++        case text::TextContentAnchorType_AT_FRAME:
++        case text::TextContentAnchorType_AS_CHARACTER:
++        {
++            nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionMargin;
++            break;
++        }
++        default:
++        {
++            nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionMargin;
++        }
++    }
++    return nRelativeHorizontalPosition;
++}
++
++void SAL_CALL 
++ScVbaShape::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException)
++{
++    text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH;
++    switch( _relativehorizontalposition )
++    {
++        case word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionCharacter:
++        {
++            eType = text::TextContentAnchorType_AT_CHARACTER;
++            break;
++        }
++        case word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionColumn:
++        case word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionMargin:
++        {
++            eType = text::TextContentAnchorType_AT_PARAGRAPH;
++            break;
++        }
++        case word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionPage:
++        {
++            eType = text::TextContentAnchorType_AT_PAGE;
++            break;
++        }
++        default:
++        {
++            DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
++        }
++    }
++    m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ), uno::makeAny( eType ) );
++}
++
++sal_Int32 SAL_CALL 
++ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException)
++{
++    sal_Int32 nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionMargin;
++    text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH;
++    m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ) ) >>= eType;
++    
++    switch( eType )
++    {
++        case text::TextContentAnchorType_AT_PARAGRAPH:
++        {
++            nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionParagraph;
++            break;
++        }
++        case text::TextContentAnchorType_AT_PAGE:
++        {
++            nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionPage;
++            break;
++        }
++        case text::TextContentAnchorType_AT_CHARACTER:
++        {
++            nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionLine;
++            break;
++        }
++        case text::TextContentAnchorType_AT_FRAME:
++        case text::TextContentAnchorType_AS_CHARACTER:
++        {
++            nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionMargin;
++            break;
++        }
++        default:
++        {
++            nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionMargin;
++        }
++    }
++    return nRelativeVerticalPosition;
++}
++
++void SAL_CALL 
++ScVbaShape::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException)
++{
++    text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH;
++    switch( _relativeverticalposition )
++    {
++        case word::WdRelativeVerticalPosition::wdRelativeVerticalPositionLine:
++        {
++            eType = text::TextContentAnchorType_AT_CHARACTER;
++            break;
++        }
++        case word::WdRelativeVerticalPosition::wdRelativeVerticalPositionParagraph:
++        case word::WdRelativeVerticalPosition::wdRelativeVerticalPositionMargin:
++        {
++            eType = text::TextContentAnchorType_AT_PARAGRAPH;
++            break;
++        }
++        case word::WdRelativeVerticalPosition::wdRelativeVerticalPositionPage:
++        {
++            eType = text::TextContentAnchorType_AT_PAGE;
++            break;
++        }
++        default:
++        {
++            DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
++        }
++    }
++    m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ), uno::makeAny( eType ) );
++}
++
++uno::Any SAL_CALL 
++ScVbaShape::WrapFormat() throw (uno::RuntimeException)
++{
++    uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
++    if( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) )
++    {
++        uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
++        uno::Sequence< uno::Any > aArgs(2);
++        aArgs[0] = uno::makeAny( getParent() );
++        aArgs[1] <<= m_xShape;
++        uno::Reference< uno::XInterface > xWrapFormat( xSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.WrapFormat") ) , aArgs ) , uno::UNO_QUERY_THROW );
++        return uno::makeAny( xWrapFormat );
++    }
++    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++}
++
++
++rtl::OUString& 
++ScVbaShape::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShape") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaShape::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Shape" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/vbahelper/vbafontbase.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbafontbase.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbafontbase.cxx	(revision 276288)
+@@ -0,0 +1,309 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbafont.cxx,v $
++ * $Revision: 1.7 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <com/sun/star/beans/XProperty.hpp>
++#include <com/sun/star/awt/FontWeight.hpp>
++#include <com/sun/star/awt/FontUnderline.hpp>
++#include <com/sun/star/awt/FontStrikeout.hpp>
++#include <com/sun/star/awt/FontSlant.hpp>
++#include <com/sun/star/text/XSimpleText.hpp>
++#include <vbahelper/vbafontbase.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++VbaFontBase::VbaFontBase( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::container::XIndexAccess >& xPalette, uno::Reference< beans::XPropertySet > xPropertySet  ) throw ( uno::RuntimeException ) : VbaFontBase_BASE( xParent, xContext ), mxFont( xPropertySet, css::uno::UNO_QUERY_THROW ), mxPalette( xPalette )
++{
++}
++
++VbaFontBase::~VbaFontBase()
++{
++}
++
++
++void SAL_CALL
++VbaFontBase::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeException )
++{
++	sal_Bool bValue = sal_False;
++	aValue >>= bValue;
++	sal_Int16 nValue = NORMAL;
++	sal_Int8 nValue2 = NORMALHEIGHT;
++
++        if( bValue )
++	{
++		nValue = SUPERSCRIPT;
++	        nValue2 = SUPERSCRIPTHEIGHT;
++	}
++	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), ( uno::Any )nValue );
++ 	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapementHeight" ) ), ( uno::Any )nValue2 );
++}
++
++uno::Any SAL_CALL
++VbaFontBase::getSuperscript() throw ( uno::RuntimeException )
++{
++	short nValue = 0;
++	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ) ) >>= nValue;
++	return uno::makeAny( ( nValue == SUPERSCRIPT ) );
++}
++
++void SAL_CALL
++VbaFontBase::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException )
++{
++	sal_Bool bValue = sal_False;
++	aValue >>= bValue;
++	sal_Int16 nValue = NORMAL;
++	sal_Int8 nValue2 = NORMALHEIGHT;
++
++        if( bValue )
++	{
++		nValue= SUBSCRIPT;
++	        nValue2 = SUBSCRIPTHEIGHT;
++	}
++
++ 	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapementHeight" ) ), ( uno::Any )nValue2 );
++	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), ( uno::Any )nValue );
++
++}
++
++uno::Any SAL_CALL
++VbaFontBase::getSubscript() throw ( uno::RuntimeException )
++{
++	short nValue = NORMAL;
++	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ) ) >>= nValue;
++	return uno::makeAny( ( nValue == SUBSCRIPT ) );
++}
++
++void SAL_CALL
++VbaFontBase::setSize( const uno::Any& aValue ) throw( uno::RuntimeException )
++{
++	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ), aValue );
++}
++
++uno::Any SAL_CALL
++VbaFontBase::getSize() throw ( uno::RuntimeException )
++{
++        return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ) );
++}
++
++void SAL_CALL
++VbaFontBase::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException )
++{
++	sal_Int32 nIndex = 0;
++	_colorindex >>= nIndex;
++
++	--nIndex; // OOo indices are zero bases
++
++	// setColor expects colors in XL RGB values
++	// #FIXME this is daft we convert OO RGB val to XL RGB val and
++	// then back again to OO RGB value
++	setColor( OORGBToXLRGB(mxPalette->getByIndex( nIndex )) );
++}
++
++
++uno::Any SAL_CALL
++VbaFontBase::getColorIndex() throw ( uno::RuntimeException )
++{
++	sal_Int32 nColor = 0;
++
++	XLRGBToOORGB( getColor() ) >>= nColor;
++	sal_Int32 nElems = mxPalette->getCount();
++	sal_Int32 nIndex = -1;
++	for ( sal_Int32 count=0; count<nElems; ++count )
++       	{
++		sal_Int32 nPaletteColor = 0;
++		mxPalette->getByIndex( count ) >>= nPaletteColor;
++		if ( nPaletteColor == nColor )
++		{
++			nIndex = count + 1; // 1 based
++			break;
++		}
++	}
++	return uno::makeAny( nIndex );
++}
++
++void SAL_CALL
++VbaFontBase::setBold( const uno::Any& aValue ) throw( uno::RuntimeException )
++{
++	sal_Bool bValue = sal_False;
++	aValue >>= bValue;
++	double fBoldValue = awt::FontWeight::NORMAL;
++	if( bValue )
++		fBoldValue = awt::FontWeight::BOLD;
++	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ), ( uno::Any )fBoldValue );
++
++}
++
++uno::Any SAL_CALL
++VbaFontBase::getBold() throw ( uno::RuntimeException )
++{
++	double fValue = 0.0;
++	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ) ) >>= fValue;
++	return uno::makeAny( fValue == awt::FontWeight::BOLD );
++}
++
++void SAL_CALL
++VbaFontBase::setStrikethrough( const uno::Any& aValue ) throw ( uno::RuntimeException )
++{
++	sal_Bool bValue = sal_False;
++	aValue >>= bValue;
++	short nValue = awt::FontStrikeout::NONE;
++	if( bValue )
++		nValue = awt::FontStrikeout::SINGLE;
++	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharStrikeout" ) ), ( uno::Any )nValue );
++}
++
++uno::Any SAL_CALL
++VbaFontBase::getStrikethrough() throw ( uno::RuntimeException )
++{
++	short nValue = 0;
++	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharStrikeout" ) ) ) >>= nValue;
++	return uno::Any( nValue == awt::FontStrikeout::SINGLE );
++}
++
++void  SAL_CALL
++VbaFontBase::setShadow( const uno::Any& aValue ) throw ( uno::RuntimeException )
++{
++	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ), aValue );
++}
++
++uno::Any SAL_CALL
++VbaFontBase::getShadow() throw (uno::RuntimeException)
++{
++	return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ) );
++}
++
++void  SAL_CALL
++VbaFontBase::setItalic( const uno::Any& aValue ) throw ( uno::RuntimeException )
++{
++	sal_Bool bValue = sal_False;
++	aValue >>= bValue;
++	short nValue = awt::FontSlant_NONE;
++	if( bValue )
++		nValue = awt::FontSlant_ITALIC;
++    mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ), ( uno::Any )nValue );
++}
++
++uno::Any SAL_CALL
++VbaFontBase::getItalic() throw ( uno::RuntimeException )
++{
++
++    awt::FontSlant aFS;
++	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ) ) >>= aFS;
++	return uno::makeAny( aFS == awt::FontSlant_ITALIC );
++}
++
++void  SAL_CALL
++VbaFontBase::setName( const uno::Any& aValue ) throw ( uno::RuntimeException )
++{
++	rtl::OUString sString;
++	aValue >>= sString;
++	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ), aValue);
++}
++
++uno::Any SAL_CALL
++VbaFontBase::getName() throw ( uno::RuntimeException )
++{
++	return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ) );
++}
++uno::Any
++VbaFontBase::getColor() throw (uno::RuntimeException)
++{
++	uno::Any aAny;
++	aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) ) );
++	return aAny;
++}
++
++void
++VbaFontBase::setColor( const uno::Any& _color  ) throw (uno::RuntimeException)
++{
++	mxFont->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) , XLRGBToOORGB(_color));
++}
++
++void SAL_CALL
++VbaFontBase::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException )
++{
++/*
++	// default
++	sal_Int32 nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone;
++	aValue >>= nValue;
++	switch ( nValue )
++	{
++// NOTE:: #TODO #FIMXE
++// xlUnderlineStyleDoubleAccounting & xlUnderlineStyleSingleAccounting
++// don't seem to be supported in Openoffice.
++// The import filter converts them to single or double underlines as appropriate
++// So, here at the moment we are similarly silently converting
++// xlUnderlineStyleSingleAccounting to xlUnderlineStyleSingle.
++
++		case excel::XlUnderlineStyle::xlUnderlineStyleNone:
++			nValue = awt::FontUnderline::NONE;
++			break;
++		case excel::XlUnderlineStyle::xlUnderlineStyleSingle:
++		case excel::XlUnderlineStyle::xlUnderlineStyleSingleAccounting:
++			nValue = awt::FontUnderline::SINGLE;
++			break;
++		case excel::XlUnderlineStyle::xlUnderlineStyleDouble:
++		case excel::XlUnderlineStyle::xlUnderlineStyleDoubleAccounting:
++			nValue = awt::FontUnderline::DOUBLE;
++			break;
++		default:
++			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown value for Underline")), uno::Reference< uno::XInterface >() );
++	}
++
++	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ), ( uno::Any )nValue );
++*/
++
++}
++
++uno::Any SAL_CALL
++VbaFontBase::getUnderline() throw ( uno::RuntimeException )
++{
++	sal_Int32 nValue = awt::FontUnderline::NONE;
++	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ) ) >>= nValue;
++/*
++	switch ( nValue )
++	{
++		case  awt::FontUnderline::DOUBLE:
++			nValue = excel::XlUnderlineStyle::xlUnderlineStyleDouble;
++			break;
++		case  awt::FontUnderline::SINGLE:
++			nValue = excel::XlUnderlineStyle::xlUnderlineStyleSingle;
++			break;
++		case  awt::FontUnderline::NONE:
++			nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone;
++			break;
++		default:
++			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown value retrieved for Underline") ), uno::Reference< uno::XInterface >() );
++
++	}
++*/
++	return uno::makeAny( nValue );
++}
++
++
+Index: vbahelper/source/vbahelper/vbacommandbarhelper.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacommandbarhelper.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacommandbarhelper.cxx	(revision 276288)
+@@ -0,0 +1,282 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbacommandbarhelper.hxx" 
++#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
++#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
++#include <com/sun/star/ui/XModuleUIConfigurationManager.hpp>
++#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
++#include <com/sun/star/ui/XUIElement.hpp>
++#ifndef _COM_SUN_STAR_UI_UIElementType_HPP_
++#include <com/sun/star/ui/UIElementType.hpp>
++#endif
++#include <comphelper/processfactory.hxx>
++#include <vbahelper/vbahelper.hxx>
++#include <time.h>
++#include <map>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++#define CREATEOUSTRING(asciistr) rtl::OUString::createFromAscii(asciistr)
++
++typedef std::map< rtl::OUString, rtl::OUString > MSO2OOCommandbarMap;
++
++class MSO2OOCommandbarHelper
++{
++private:
++    static MSO2OOCommandbarHelper* pMSO2OOCommandbarHelper;
++    MSO2OOCommandbarMap maBuildinToolbarMap;
++
++    MSO2OOCommandbarHelper()
++    {
++        // Buildin toolbars
++        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Standard"),CREATEOUSTRING("private:resource/toolbar/standardbar") ) );
++        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Formatting"),CREATEOUSTRING("private:resource/toolbar/formatobjectbar") ) );
++        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Drawing"),CREATEOUSTRING("private:resource/toolbar/drawbar") ) );
++        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Toolbar List"),CREATEOUSTRING("private:resource/toolbar/toolbar") ) );
++        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Forms"),CREATEOUSTRING("private:resource/toolbar/formcontrols") ) );
++        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Form Controls"),CREATEOUSTRING("private:resource/toolbar/formcontrols") ) );
++        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Full Screen"),CREATEOUSTRING("private:resource/toolbar/fullscreenbar") ) );
++        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Chart"),CREATEOUSTRING("private:resource/toolbar/flowchartshapes") ) );
++        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Picture"),CREATEOUSTRING("private:resource/toolbar/graphicobjectbar") ) );
++        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("WordArt"),CREATEOUSTRING("private:resource/toolbar/fontworkobjectbar") ) );
++        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("3-D Settings"),CREATEOUSTRING("private:resource/toolbar/extrusionobjectbar") ) );
++    }
++
++public:
++    virtual ~MSO2OOCommandbarHelper() {};
++    static MSO2OOCommandbarHelper* getMSO2OOCommandbarHelper()
++    {
++        if( pMSO2OOCommandbarHelper == NULL )
++        {
++            pMSO2OOCommandbarHelper = new MSO2OOCommandbarHelper();
++        }
++        return pMSO2OOCommandbarHelper;
++    }
++
++    rtl::OUString findBuildinToolbar( const rtl::OUString& sToolbarName )
++    {
++        MSO2OOCommandbarMap::iterator it = maBuildinToolbarMap.begin();
++        for(; it != maBuildinToolbarMap.end(); it++ )
++        {
++            rtl::OUString sName = it->first;
++            if( sName.equalsIgnoreAsciiCase( sToolbarName ) )
++                return it->second;
++        }
++        return rtl::OUString();
++    }
++};
++
++MSO2OOCommandbarHelper* MSO2OOCommandbarHelper::pMSO2OOCommandbarHelper = NULL;
++
++
++VbaCommandBarHelper::VbaCommandBarHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException) : mxContext( xContext ), mxModel( xModel )
++{
++    Init();
++}
++
++void VbaCommandBarHelper::Init( ) throw (css::uno::RuntimeException)
++{
++    uno::Reference< css::ui::XUIConfigurationManagerSupplier > xUICfgSupplier( mxModel, uno::UNO_QUERY_THROW );
++    m_xDocCfgMgr = xUICfgSupplier->getUIConfigurationManager();
++
++    uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel, uno::UNO_QUERY_THROW );
++    if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") ) ) )
++    {
++        maModuleId = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") );
++    }
++    else if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) )
++    {
++        maModuleId = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument") );
++    }
++
++    if( maModuleId.getLength() == 0 )
++    {
++        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
++    }
++
++	uno::Reference< lang::XMultiServiceFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
++        
++	css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUICfgMgrSupp( xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ))), uno::UNO_QUERY_THROW );
++
++    m_xAppCfgMgr.set( xUICfgMgrSupp->getUIConfigurationManager( maModuleId ), uno::UNO_QUERY_THROW );
++
++	css::uno::Reference< css::container::XNameAccess > xNameAccess( xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.WindowStateConfiguration" ))), uno::UNO_QUERY_THROW );
++
++    m_xWindowState.set( xNameAccess->getByName( maModuleId ), uno::UNO_QUERY_THROW );
++}
++
++css::uno::Reference< css::container::XIndexAccess > VbaCommandBarHelper::getSettings( const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException)
++{
++    if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
++        return m_xDocCfgMgr->getSettings( sResourceUrl, sal_True );
++    else if( m_xAppCfgMgr->hasSettings( sResourceUrl ) )
++        return m_xAppCfgMgr->getSettings( sResourceUrl, sal_True );
++    else
++    {
++        css::uno::Reference< css::container::XIndexAccess > xSettings( m_xAppCfgMgr->createSettings( ), uno::UNO_QUERY_THROW );
++        return xSettings;
++    }
++}
++
++void VbaCommandBarHelper::removeSettings( const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException)
++{
++    if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
++        m_xDocCfgMgr->removeSettings( sResourceUrl );
++    else if( m_xAppCfgMgr->hasSettings( sResourceUrl ) )
++        m_xAppCfgMgr->removeSettings( sResourceUrl );
++    
++    // persistChanges();
++}
++
++void VbaCommandBarHelper::ApplyChange( const rtl::OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings, sal_Bool bTemporary ) throw (css::uno::RuntimeException)
++{
++    if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
++    {
++        m_xDocCfgMgr->replaceSettings( sResourceUrl, xSettings );
++    }
++    else
++    {
++        m_xDocCfgMgr->insertSettings( sResourceUrl, xSettings );
++    }
++    if( !bTemporary )
++    {
++        persistChanges();
++    }
++}
++
++sal_Bool VbaCommandBarHelper::persistChanges() throw (css::uno::RuntimeException)
++{
++    uno::Reference< css::ui::XUIConfigurationPersistence > xConfigPersistence( m_xDocCfgMgr, uno::UNO_QUERY_THROW );
++    sal_Bool result = sal_False;
++    if( xConfigPersistence->isModified() )
++    {
++        xConfigPersistence->store();
++        result = sal_True;
++    }
++    return result;
++}
++
++uno::Reference< frame::XLayoutManager > VbaCommandBarHelper::getLayoutManager() throw (uno::RuntimeException)
++{
++    uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); 
++    uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
++    uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW );
++    return xLayoutManager;
++}
++
++sal_Bool VbaCommandBarHelper::hasToolbar( const rtl::OUString& sResourceUrl, const rtl::OUString& sName ) throw (css::uno::RuntimeException)
++{
++    if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
++    {
++        rtl::OUString sUIName;
++        uno::Reference< beans::XPropertySet > xPropertySet( m_xDocCfgMgr->getSettings( sResourceUrl, sal_False ), uno::UNO_QUERY_THROW );
++        xPropertySet->getPropertyValue( rtl::OUString::createFromAscii(ITEM_DESCRIPTOR_UINAME) ) >>= sUIName;
++        if( sName.equalsIgnoreAsciiCase( sUIName ) )
++            return sal_True;
++    }
++    return sal_False;
++}
++
++// return the resource url if found
++rtl::OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException)
++{
++    rtl::OUString sResourceUrl;
++
++    // check if it is an buildin toolbar
++    sResourceUrl = MSO2OOCommandbarHelper::getMSO2OOCommandbarHelper()->findBuildinToolbar( sName );
++    if( sResourceUrl.getLength() > 0 )
++        return sResourceUrl;
++
++    uno::Sequence< ::rtl::OUString > allNames = xNameAccess->getElementNames();
++    for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
++    {
++        sResourceUrl = allNames[i];
++        if(sResourceUrl.indexOf( rtl::OUString::createFromAscii( ITEM_TOOLBAR_URL ) ) == 0 )
++        {
++            if( hasToolbar( sResourceUrl, sName ) )
++                return sResourceUrl;
++        }
++    }
++    
++    // the customize toolbars creating during importing, shoud found there.
++    static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) );
++    sResourceUrl = sToolbarPrefix.concat( sName );
++    if( hasToolbar( sResourceUrl, sName ) )
++        return sResourceUrl;
++
++    return rtl::OUString();
++}
++
++// if found, return the position of the control. if not found, return -1
++sal_Int32 VbaCommandBarHelper::findControlByName( const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException)
++{
++    sal_Int32 nCount = xIndexAccess->getCount();
++    css::uno::Sequence< css::beans::PropertyValue > aProps;
++    for( sal_Int32 i = 0; i < nCount; i++ )
++    {
++        rtl::OUString sLabel;
++        xIndexAccess->getByIndex( i ) >>= aProps;
++        getPropertyValue( aProps, rtl::OUString::createFromAscii(ITEM_DESCRIPTOR_LABEL) ) >>= sLabel;
++        // handle the hotkey character '~'
++        rtl::OUString sNewLabel;
++        sal_Int32 index = sLabel.indexOf( sal_Unicode('~') );
++        if( index < 0 )
++            sNewLabel = sLabel;
++        else if( index == 0 )
++            sNewLabel = sLabel.copy( index + 1);
++        else if( index == sNewLabel.getLength() - 1 )
++            sNewLabel = sLabel.copy(0, index );
++        else
++            sNewLabel = sLabel.copy( 0, index ) + sLabel.copy( index + 1 ); 
++        OSL_TRACE("VbaCommandBarHelper::findControlByName, control name: %s", rtl::OUStringToOString( sNewLabel, RTL_TEXTENCODING_UTF8 ).getStr() );
++        if( sName.equalsIgnoreAsciiCase( sNewLabel ) )
++            return i;
++    }
++
++    // not found
++    return -1;
++}
++
++rtl::OUString VbaCommandBarHelper::generateCustomURL()
++{
++    rtl::OUString url = rtl::OUString::createFromAscii( ITEM_TOOLBAR_URL );
++    url += rtl::OUString::createFromAscii( CUSTOM_TOOLBAR_STR );
++
++    // use a random number to minimize possible clash with existing custom toolbars
++    srand( unsigned( time( NULL ) ));
++    url += rtl::OUString::valueOf( sal_Int64( rand() ), 16 );
++    return url;
++}
+Index: vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacommandbarcontrol.cxx	(revision 276288)
+@@ -0,0 +1,259 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#include "vbacommandbarcontrol.hxx"
++#include "vbacommandbarcontrols.hxx"
++#include <vbahelper/vbahelper.hxx>
++#include <svx/msvbahelper.hxx>
++
++using namespace com::sun::star;
++using namespace ooo::vba;
++
++ScVbaCommandBarControl::ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_sResourceUrl( sResourceUrl ), m_xCurrentSettings( xSettings ), m_xBarSettings( xBarSettings ), m_nPosition( 0 ), m_bTemporary( sal_True )
++{
++}
++
++ScVbaCommandBarControl::ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_sResourceUrl( sResourceUrl ), m_xCurrentSettings( xSettings ), m_xBarSettings( xBarSettings ), m_nPosition( nPosition ), m_bTemporary( bTemporary )
++{
++    m_xCurrentSettings->getByIndex( nPosition ) >>= m_aPropertyValues;
++}
++
++void ScVbaCommandBarControl::ApplyChange() throw ( uno::RuntimeException )
++{
++    uno::Reference< container::XIndexContainer > xIndexContainer( m_xCurrentSettings, uno::UNO_QUERY_THROW );
++    xIndexContainer->replaceByIndex( m_nPosition, uno::makeAny( m_aPropertyValues ) );
++    pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings );
++}
++
++::rtl::OUString SAL_CALL
++ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException )
++{
++    // "Label" always empty
++    rtl::OUString sCaption;
++    getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
++    return sCaption;
++}
++
++void SAL_CALL 
++ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
++{
++    rtl::OUString sCaption = _caption.replace('&','~');
++    setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("Label"), uno::makeAny( sCaption ) );
++    ApplyChange();
++}
++
++::rtl::OUString SAL_CALL 
++ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException)
++{
++    rtl::OUString sCommandURL;
++    getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL") ) >>= sCommandURL;
++    return sCommandURL;
++}
++
++void SAL_CALL 
++ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException)
++{
++    // get the current model
++    uno::Reference< frame::XModel > xModel( pCBarHelper->getModel() ); 
++    VBAMacroResolvedInfo aResolvedMacro = ooo::vba::resolveVBAMacro( getSfxObjShell( xModel ), _onaction, true );
++    if ( aResolvedMacro.IsResolved() )
++    {
++        rtl::OUString aCommandURL = ooo::vba::makeMacroURL( aResolvedMacro.ResolvedMacro() );
++		OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
++        setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
++        ApplyChange();
++    }
++}
++
++::sal_Bool SAL_CALL 
++ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException)
++{
++    sal_Bool bVisible = sal_True;
++    uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible") );
++    if( aValue.hasValue() )
++        aValue >>= bVisible;
++    return bVisible;
++}
++void SAL_CALL 
++ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
++{
++    uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible") );
++    if( aValue.hasValue() )
++    {
++        setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible"), uno::makeAny( _visible ) );
++        ApplyChange();
++    }
++}
++
++::sal_Bool SAL_CALL 
++ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException)
++{
++    sal_Bool bEnabled = sal_True;
++    if( m_xParentMenu.is() )
++    {
++        // currently only the menu in the MenuBat support Enable/Disable
++        // FIXME: how to support the menu item in Toolbar
++        bEnabled = m_xParentMenu->isItemEnabled( m_xParentMenu->getItemId( m_nPosition ) );
++    }
++    else
++    {
++        // emulated with Visible
++        bEnabled = getVisible();
++    }    
++    return bEnabled;
++}
++
++void SAL_CALL
++ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException)
++{
++    if( m_xParentMenu.is() )
++    {
++        // currently only the menu in the MenuBat support Enable/Disable
++        m_xParentMenu->enableItem( m_xParentMenu->getItemId( m_nPosition ), _enabled );
++    }
++    else
++    {
++        // emulated with Visible
++        setVisible( _enabled );
++    }    
++}
++
++void SAL_CALL 
++ScVbaCommandBarControl::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    if( m_xCurrentSettings.is() )
++    {
++        uno::Reference< container::XIndexContainer > xIndexContainer( m_xCurrentSettings, uno::UNO_QUERY_THROW );
++        xIndexContainer->removeByIndex( m_nPosition );
++
++        pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings );
++    }
++}
++
++uno::Any SAL_CALL 
++ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++    // only Popup Menu has controls
++    uno::Reference< container::XIndexAccess > xSubMenu;
++    getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER ) ) >>= xSubMenu;
++    if( !xSubMenu.is() )
++        throw uno::RuntimeException();
++    
++    uno::Reference< awt::XMenu > xMenu;
++    if( m_xParentMenu.is() )
++    {
++        sal_Int32 nItemId = m_xParentMenu->getItemId( m_nPosition );
++        xMenu.set( m_xParentMenu->getPopupMenu( nItemId ), uno::UNO_QUERY );
++    }    
++
++    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, xSubMenu, pCBarHelper, m_xBarSettings, m_sResourceUrl, xMenu ) );
++    if( aIndex.hasValue() )
++    {
++        return xCommandBarControls->Item( aIndex, uno::Any() );
++    }
++    return uno::makeAny( xCommandBarControls );
++}
++
++rtl::OUString& 
++ScVbaCommandBarControl::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControl") );
++	return sImplName;
++}
++
++uno::Sequence<rtl::OUString> 
++ScVbaCommandBarControl::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControl" ) );
++	}
++	return aServiceNames;
++}
++
++//////////// ScVbaCommandBarPopup //////////////////////////////
++ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary, const css::uno::Reference< css::awt::XMenu >& xMenu ) throw (css::uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
++{
++    m_nPosition = nPosition;
++    m_bTemporary = bTemporary;
++    m_xCurrentSettings->getByIndex( m_nPosition ) >>= m_aPropertyValues;
++    m_xParentMenu = xMenu;
++}
++
++rtl::OUString& 
++ScVbaCommandBarPopup::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarPopup") );
++	return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++ScVbaCommandBarPopup::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarPopup" ) );
++	}
++	return aServiceNames;
++}
++
++//////////// ScVbaCommandBarButton //////////////////////////////
++ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary, const css::uno::Reference< css::awt::XMenu >& xMenu ) throw (css::uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
++{
++    m_nPosition = nPosition;
++    m_bTemporary = bTemporary;
++    m_xCurrentSettings->getByIndex( m_nPosition ) >>= m_aPropertyValues;
++    m_xParentMenu = xMenu;
++}
++
++rtl::OUString& 
++ScVbaCommandBarButton::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarButton") );
++	return sImplName;
++}
++uno::Sequence<rtl::OUString> 
++ScVbaCommandBarButton::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarButton" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/vbahelper/vbacommandbarhelper.hxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacommandbarhelper.hxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacommandbarhelper.hxx	(revision 276288)
+@@ -0,0 +1,110 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef VBA_COMMANDBARHELPER_HXX
++#define VBA_COMMANDBARHELPER_HXX
++
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <com/sun/star/ui/XUIConfigurationManager.hpp>
++#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
++#include <com/sun/star/container/XIndexAccess.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
++#include <com/sun/star/frame/XLayoutManager.hpp>
++#include <boost/shared_ptr.hpp>
++
++
++static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
++static const char ITEM_DESCRIPTOR_HELPURL[]     = "HelpURL";
++static const char ITEM_DESCRIPTOR_CONTAINER[]   = "ItemDescriptorContainer";
++static const char ITEM_DESCRIPTOR_LABEL[]       = "Label";
++static const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
++static const char ITEM_DESCRIPTOR_STYLE[]       = "Style";
++static const char ITEM_DESCRIPTOR_ISVISIBLE[]   = "IsVisible";
++static const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL";
++static const char ITEM_DESCRIPTOR_UINAME[]		= "UIName";
++
++static const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar";
++static const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/";
++
++static const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_";
++static const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu";
++
++class VbaCommandBarHelper;
++typedef ::boost::shared_ptr< VbaCommandBarHelper > VbaCommandBarHelperRef;
++
++class VbaCommandBarHelper
++{
++private:
++    css::uno::Reference< css::uno::XComponentContext > mxContext;
++    css::uno::Reference< css::frame::XModel > mxModel;
++    css::uno::Reference< css::ui::XUIConfigurationManager > m_xDocCfgMgr; // current document
++    css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr;
++    css::uno::Reference< css::container::XNameAccess > m_xWindowState;
++    rtl::OUString maModuleId;
++
++    void Init() throw (css::uno::RuntimeException);
++    sal_Bool hasToolbar( const rtl::OUString& sResourceUrl, const rtl::OUString& sName )  throw (css::uno::RuntimeException);
++public:
++    VbaCommandBarHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException );
++
++    css::uno::Reference< css::frame::XModel > getModel() { return mxModel; }
++
++    css::uno::Reference< css::ui::XUIConfigurationManager > getDocCfgManager() throw (css::uno::RuntimeException)
++    {
++        return m_xDocCfgMgr;
++    }
++    css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager() throw (css::uno::RuntimeException)
++    {
++        return m_xAppCfgMgr;
++    }
++    css::uno::Reference< css::container::XNameAccess > getPersistentWindowState() throw (css::uno::RuntimeException)
++    {
++        return m_xWindowState;
++    }
++    sal_Bool persistChanges() throw (css::uno::RuntimeException);
++    css::uno::Reference< css::container::XIndexAccess > getSettings( const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException);
++    void removeSettings( const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException);
++    void ApplyChange( const rtl::OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings, sal_Bool bTemporary = sal_True ) throw (css::uno::RuntimeException);
++
++    css::uno::Reference< css::frame::XLayoutManager > getLayoutManager() throw (css::uno::RuntimeException);
++
++    const rtl::OUString getModuleId(){ return maModuleId; }
++    rtl::OUString findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException);
++    static sal_Int32 findControlByName( const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException);
++    static rtl::OUString generateCustomURL();
++};
++
++#endif//VBA_COMMANDBARHELPER_HXX
+Index: vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
+===================================================================
+--- vbahelper/source/vbahelper/vbacommandbarcontrol.hxx	(revision 0)
++++ vbahelper/source/vbahelper/vbacommandbarcontrol.hxx	(revision 276288)
+@@ -0,0 +1,122 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#ifndef SC_VBA_COMMANDBARCONTROL_HXX
++#define SC_VBA_COMMANDBARCONTROL_HXX
++
++#include <ooo/vba/XCommandBarControl.hpp>
++#include <ooo/vba/XCommandBarPopup.hpp>
++#include <ooo/vba/XCommandBarButton.hpp>
++#include <ooo/vba/office/MsoControlType.hpp>
++#include <com/sun/star/awt/XMenu.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include "vbacommandbarhelper.hxx"
++#include <cppuhelper/implbase1.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ov::XCommandBarControl > CommandBarControl_BASE;
++
++class ScVbaCommandBarControl : public CommandBarControl_BASE
++{
++protected:
++    VbaCommandBarHelperRef pCBarHelper;
++    rtl::OUString       m_sResourceUrl;
++    css::uno::Reference< css::container::XIndexAccess >          m_xCurrentSettings;
++    css::uno::Reference< css::container::XIndexAccess >          m_xBarSettings;
++    css::uno::Sequence< css::beans::PropertyValue >              m_aPropertyValues;
++    css::uno::Reference< css::awt::XMenu >                        m_xParentMenu;
++
++    sal_Int32           m_nPosition;
++    sal_Bool            m_bTemporary;
++
++private:
++    void ApplyChange() throw (css::uno::RuntimeException);
++
++public:
++    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException);
++    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
++    
++    // Attributes
++    virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException);
++    virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException)
++    {
++        return ov::office::MsoControlType::msoControlButton;
++    }
++
++    // Methods
++    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarPopup > CommandBarPopup_BASE;
++class ScVbaCommandBarPopup : public CommandBarPopup_BASE
++{
++public:
++    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary, const css::uno::Reference< css::awt::XMenu >& xMenu ) throw (css::uno::RuntimeException);
++
++    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException)
++    {
++        return ov::office::MsoControlType::msoControlPopup;
++    }
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarButton > CommandBarButton_BASE;
++class ScVbaCommandBarButton : public CommandBarButton_BASE
++{
++public:
++    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary, const css::uno::Reference< css::awt::XMenu >& xMenu ) throw (css::uno::RuntimeException);
++
++    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException)
++    {
++        return ov::office::MsoControlType::msoControlButton;
++    }
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif//SC_VBA_COMMANDBARCONTROL_HXX
+Index: vbahelper/source/vbahelper/vbashaperange.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbashaperange.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbashaperange.cxx	(revision 276288)
+@@ -0,0 +1,382 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbashaperange.cxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <com/sun/star/drawing/XShapeGrouper.hpp>
++#include <com/sun/star/drawing/XDrawPage.hpp>
++#include<com/sun/star/view/XSelectionSupplier.hpp>
++
++#include <vbahelper/vbahelper.hxx>
++#include <vbahelper/vbashaperange.hxx>
++#include <vbahelper/vbashape.hxx>
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++class VbShapeRangeEnumHelper : public EnumerationHelper_BASE
++{
++        uno::Reference< XCollection > m_xParent;
++        uno::Reference<container::XIndexAccess > m_xIndexAccess;
++        sal_Int32 nIndex;
++public:
++	VbShapeRangeEnumHelper( const uno::Reference< XCollection >& xParent,  const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
++        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
++        {
++                return ( nIndex < m_xIndexAccess->getCount() );
++        }
++        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++        {
++                ScVbaShapeRange* pCollectionImpl = dynamic_cast< ScVbaShapeRange* >(m_xParent.get());
++                if ( pCollectionImpl && hasMoreElements() )
++                    return pCollectionImpl->createCollectionObject(  m_xIndexAccess->getByIndex( nIndex++ ) );
++                throw container::NoSuchElementException();
++        }
++
++};
++
++ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xShapes, const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Reference< frame::XModel >& xModel  ) : ScVbaShapeRange_BASE( xParent, xContext, xShapes ), m_xDrawPage( xDrawPage ), m_nShapeGroupCount(0), m_xModel( xModel )
++{
++}
++
++// Methods
++void SAL_CALL 
++ScVbaShapeRange::Select(  ) throw (uno::RuntimeException)
++{
++    uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++    xSelectSupp->select( uno::makeAny( getShapes() ) );
++}
++
++uno::Reference< msforms::XShape > SAL_CALL 
++ScVbaShapeRange::Group() throw (uno::RuntimeException)
++{
++    uno::Reference< drawing::XShapeGrouper > xShapeGrouper( m_xDrawPage, uno::UNO_QUERY_THROW );
++    uno::Reference< drawing::XShapeGroup > xShapeGroup( xShapeGrouper->group( getShapes() ), uno::UNO_QUERY_THROW );
++    uno::Reference< drawing::XShape > xShape( xShapeGroup, uno::UNO_QUERY_THROW );
++    return uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, getShapes(), m_xModel, office::MsoShapeType::msoGroup ) );
++}
++
++uno::Reference< drawing::XShapes > 
++ScVbaShapeRange::getShapes() throw (uno::RuntimeException)
++{
++	if ( !m_xShapes.is() )
++	{
++		uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
++		m_xShapes.set( xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.drawing.ShapeCollection" ) ), uno::UNO_QUERY_THROW );
++		sal_Int32 nLen = m_xIndexAccess->getCount();
++		for ( sal_Int32 index = 0; index < nLen; ++index )
++			m_xShapes->add( uno::Reference< drawing::XShape >( m_xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW ) );
++
++	}
++	return m_xShapes;
++}
++
++
++void SAL_CALL 
++ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xShape->IncrementRotation( Increment );
++	}
++}
++
++void SAL_CALL 
++ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xShape->IncrementLeft( Increment );
++	}
++}
++
++void SAL_CALL 
++ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xShape->IncrementTop( Increment );
++	}
++}
++
++double SAL_CALL ScVbaShapeRange::getHeight() throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->getHeight( );
++	}
++    throw uno::RuntimeException();
++}
++
++void SAL_CALL ScVbaShapeRange::setHeight( double _height ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xShape->setHeight( _height );
++	}
++}
++
++double SAL_CALL ScVbaShapeRange::getWidth() throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->getWidth( );
++	}
++    throw uno::RuntimeException();
++}
++
++void SAL_CALL ScVbaShapeRange::setWidth( double _width ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xShape->setWidth( _width );
++	}
++}
++
++double SAL_CALL ScVbaShapeRange::getLeft() throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->getLeft();
++	}
++    throw uno::RuntimeException();
++}
++
++void SAL_CALL ScVbaShapeRange::setLeft( double _left ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xShape->setLeft( _left );
++	}
++}
++
++double SAL_CALL ScVbaShapeRange::getTop() throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->getTop();
++	}
++    throw uno::RuntimeException();
++}
++
++void SAL_CALL ScVbaShapeRange::setTop( double _top ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xShape->setTop( _top );
++	}
++}
++
++uno::Reference< ov::msforms::XLineFormat > SAL_CALL ScVbaShapeRange::getLine() throw (css::uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->getLine();
++	}
++    throw uno::RuntimeException();
++}
++
++uno::Reference< ov::msforms::XFillFormat > SAL_CALL ScVbaShapeRange::getFill() throw (css::uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->getFill();
++	}
++    throw uno::RuntimeException();
++}
++
++::sal_Bool SAL_CALL ScVbaShapeRange::getLockAspectRatio() throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->getLockAspectRatio();
++	}
++    throw uno::RuntimeException();
++}
++
++void SAL_CALL ScVbaShapeRange::setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xShape->setLockAspectRatio( _lockaspectratio );
++	}
++}
++
++::sal_Bool SAL_CALL ScVbaShapeRange::getLockAnchor() throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->getLockAnchor();
++	}
++    throw uno::RuntimeException();
++}
++
++void SAL_CALL ScVbaShapeRange::setLockAnchor( ::sal_Bool _lockanchor ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xShape->setLockAnchor( _lockanchor );
++	}
++}
++
++::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeHorizontalPosition() throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->getRelativeHorizontalPosition();
++	}
++    throw uno::RuntimeException();
++}
++
++void SAL_CALL ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xShape->setRelativeHorizontalPosition( _relativehorizontalposition );
++	}
++}
++
++::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeVerticalPosition() throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->getRelativeVerticalPosition();
++	}
++    throw uno::RuntimeException();
++}
++
++void SAL_CALL ScVbaShapeRange::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		xShape->setRelativeVerticalPosition( _relativeverticalposition );
++	}
++}
++
++uno::Any SAL_CALL ScVbaShapeRange::TextFrame(  ) throw (css::uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->TextFrame();
++	}
++    throw uno::RuntimeException();
++}
++
++uno::Any SAL_CALL ScVbaShapeRange::WrapFormat(  ) throw (css::uno::RuntimeException)
++{
++	sal_Int32 nLen = getCount();
++	for ( sal_Int32 index = 1; index <= nLen; ++index )
++	{
++		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
++		return xShape->WrapFormat();
++	}
++    throw uno::RuntimeException();
++}
++
++uno::Type SAL_CALL
++ScVbaShapeRange::getElementType() throw (uno::RuntimeException)
++{
++    return msforms::XShape::static_type(0);
++}
++
++uno::Reference< container::XEnumeration > SAL_CALL 
++ScVbaShapeRange::createEnumeration() throw (uno::RuntimeException)
++{
++	return new VbShapeRangeEnumHelper( this, m_xIndexAccess );
++}
++
++uno::Any
++ScVbaShapeRange:: createCollectionObject( const css::uno::Any& aSource )
++{
++	uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW );
++	// #TODO  #FIXME Shape parent should always be the sheet the shapes belong 
++	// to 
++	uno::Reference< msforms::XShape > xVbShape( new ScVbaShape( uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), m_xModel, ScVbaShape::getType( xShape ) ) ); 
++        return uno::makeAny( xVbShape );
++}
++
++rtl::OUString& 
++ScVbaShapeRange::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapeRange") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaShapeRange::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.ShapeRange" ) );
++	}
++	return aServiceNames;
++}
+Index: vbahelper/source/vbahelper/vbapropvalue.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbapropvalue.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbapropvalue.cxx	(revision 276288)
+@@ -0,0 +1,48 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbapropvalue.cxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include "vbahelper/vbapropvalue.hxx"
++
++using namespace com::sun::star;
++ 
++ScVbaPropValue::ScVbaPropValue( PropListener* pListener ) : m_pListener( pListener )
++{
++}
++
++css::uno::Any SAL_CALL 
++ScVbaPropValue::getValue() throw (css::uno::RuntimeException)
++{
++    return m_pListener->getValueEvent();
++}
++
++void SAL_CALL 
++ScVbaPropValue::setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException)
++{
++    m_pListener->setValueEvent( _value );
++}
+Index: vbahelper/source/vbahelper/vbadialogsbase.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbadialogsbase.cxx	(revision 0)
++++ vbahelper/source/vbahelper/vbadialogsbase.cxx	(revision 276288)
+@@ -0,0 +1,47 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadialogs.cxx,v $
++ * $Revision: 1.5 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#include <vbahelper/vbadialogsbase.hxx>
++
++using namespace ::ooo::vba;
++using namespace ::com::sun::star;
++
++::sal_Int32
++VbaDialogsBase::getCount() throw (uno::RuntimeException)
++{
++	//#TODO #FIXEME
++	return 0;
++}
++
++uno::Any
++VbaDialogsBase::Item( const uno::Any& /* &aItem */) throw (uno::RuntimeException)
++{
++	return uno::Any();
++}
++
+Index: vbahelper/inc/vbahelper/vbashapes.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbashapes.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbashapes.hxx	(revision 276288)
+@@ -0,0 +1,84 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbashapes.hxx,v $
++ * $Revision: 1.3.32.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_SHAPES_HXX
++#define SC_VBA_SHAPES_HXX
++
++#include <com/sun/star/drawing/XShapes.hpp>
++#include <com/sun/star/drawing/XDrawPage.hpp>
++#include <com/sun/star/container/XIndexAccess.hpp>
++#include <ooo/vba/msforms/XShapes.hpp>
++
++#include <vbahelper/vbahelperinterface.hxx>
++
++#include <vbahelper/vbacollectionimpl.hxx>
++
++typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE;
++
++class VBAHELPER_DLLPUBLIC ScVbaShapes : public ScVbaShapes_BASE
++{
++private: 
++    css::uno::Reference< css::drawing::XShapes > m_xShapes;
++    css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage;
++    sal_Int32 m_nNewShapeCount;
++    void initBaseCollection();
++protected:
++    css::uno::Reference< css::frame::XModel > m_xModel;
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++	virtual css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
++    css::uno::Reference< css::drawing::XShape > createShape( rtl::OUString service ) throw (css::uno::RuntimeException);
++    css::uno::Any AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException);
++    css::uno::Any AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException);
++    css::uno::Any AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException);
++    rtl::OUString createName( rtl::OUString sName );
++    css::uno::Any AddShape( const rtl::OUString& sService, const rtl::OUString& sName, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException);
++    //TODO helperapi using a writer document
++    //css::awt::Point calculateTopLeftMargin( css::uno::Reference< ov::XHelperInterface > xDocument );
++    
++public:
++    ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const css::uno::Reference< css::frame::XModel >& xModel );
++    static void setDefaultShapeProperties( css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException);
++    static void setShape_NameProperty( css::uno::Reference< css::drawing::XShape > xShape, rtl::OUString sName );
++    //XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++    virtual void SAL_CALL SelectAll() throw (css::uno::RuntimeException);
++    //helper::calc
++    virtual css::uno::Any SAL_CALL AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::msforms::XShapeRange > SAL_CALL Range( const css::uno::Any& shapes ) throw (css::uno::RuntimeException);
++    // ScVbaCollectionBaseImpl
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException);
++};
++
++#endif//SC_VBA_SHAPES_HXX
+Index: vbahelper/inc/vbahelper/vbadllapi.h
+===================================================================
+--- vbahelper/inc/vbahelper/vbadllapi.h	(revision 0)
++++ vbahelper/inc/vbahelper/vbadllapi.h	(revision 276288)
+@@ -0,0 +1,44 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: svldllapi.h,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef INCLUDED_VBADLLAPI_H
++#define INCLUDED_VBADLLAPI_H
++
++#include "sal/types.h"
++
++#if defined(VBAHELPER_DLLIMPLEMENTATION)
++#define VBAHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
++#else
++#define VBAHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
++#endif
++#define VBAHELPER_DLLPRIVATE SAL_DLLPRIVATE
++
++#endif /* INCLUDED_SVLDLLAPI_H */
++
+Index: vbahelper/inc/vbahelper/vbapagesetupbase.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbapagesetupbase.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbapagesetupbase.hxx	(revision 276288)
+@@ -0,0 +1,70 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef VBA_PAGESETUPBASE_HXX
++#define VBA_PAGESETUPBASE_HXX
++
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/XPageSetupBase.hpp>
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::XPageSetupBase > VbaPageSetupBase_BASE;
++
++class VBAHELPER_DLLPUBLIC VbaPageSetupBase :  public VbaPageSetupBase_BASE 
++{
++protected:
++    css::uno::Reference< css::frame::XModel > mxModel;
++    css::uno::Reference< css::beans::XPropertySet > mxPageProps;
++    sal_Int32 mnOrientLandscape;
++    sal_Int32 mnOrientPortrait;
++
++	VbaPageSetupBase( const css::uno::Reference< ov::XHelperInterface >& xParent, 
++                    const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); 
++public:
++	virtual ~VbaPageSetupBase(){}
++    
++    // Attribute
++	virtual double SAL_CALL getTopMargin() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setTopMargin( double margin ) throw (css::uno::RuntimeException);
++	virtual double SAL_CALL getBottomMargin() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setBottomMargin( double margin ) throw (css::uno::RuntimeException);
++	virtual double SAL_CALL getRightMargin() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setRightMargin( double margin ) throw (css::uno::RuntimeException);
++	virtual double SAL_CALL getLeftMargin() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setLeftMargin( double margin ) throw (css::uno::RuntimeException);
++	virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException);
++	virtual double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException);
++	virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException);
++};
++#endif
+Index: vbahelper/inc/vbahelper/vbadialogbase.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbadialogbase.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbadialogbase.hxx	(revision 276288)
+@@ -0,0 +1,54 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadialog.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef VBA_DIALOG_BASE_HXX
++#define VBA_DIALOG_BASE_HXX
++
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/XDialogBase.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/frame/XModel.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ov::XDialogBase > VbaDialogBase_BASE;
++
++class VBAHELPER_DLLPUBLIC VbaDialogBase : public VbaDialogBase_BASE
++{
++protected:
++	sal_Int32 mnIndex;
++        css::uno::Reference< css::frame::XModel > m_xModel;
++public:
++	VbaDialogBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nIndex ):VbaDialogBase_BASE( xParent, xContext ), mnIndex( nIndex ), m_xModel( xModel ) {}
++	virtual ~VbaDialogBase() {}
++
++	// Methods
++	virtual void SAL_CALL Show() throw (css::uno::RuntimeException);
++	virtual rtl::OUString mapIndexToName( sal_Int32 nIndex ) = 0;
++};
++
++#endif /* VBA_DIALOG_BASE_HXX */
+Index: vbahelper/inc/vbahelper/vbaglobalbase.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbaglobalbase.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbaglobalbase.hxx	(revision 276288)
+@@ -0,0 +1,53 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbaapplicationbase.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef VBA_GLOBAL_BASE_HXX
++#define VBA_GLOBAL_BASE_HXX
++
++#include "vbahelperinterface.hxx"
++#include <ooo/vba/XGlobalsBase.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ov::XGlobalsBase > Globals_BASE;
++class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE
++
++{
++protected:
++
++    bool hasServiceName( const rtl::OUString& serviceName );
++    void init(  const css::uno::Sequence< css::beans::PropertyValue >& aInitArgs );
++
++public:
++    VbaGlobalsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sDocCtxName );
++    virtual ~VbaGlobalsBase(){};
++    // XMultiServiceFactory
++    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException);
++    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException);
++    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException);
++};
++#endif
+Index: vbahelper/inc/vbahelper/vbadocumentsbase.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbadocumentsbase.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbadocumentsbase.hxx	(revision 276288)
+@@ -0,0 +1,69 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef VBA_WORKBOOKS_HXX
++#define VBA_WORKBOOKS_HXX
++
++
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <ooo/vba/XDocumentsBase.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++
++typedef CollTestImplHelper< ooo::vba::XDocumentsBase > VbaDocumentsBase_BASE;
++
++class VBAHELPER_DLLPUBLIC VbaDocumentsBase : public VbaDocumentsBase_BASE
++{
++public:
++    enum DOCUMENT_TYPE
++    {
++        WORD_DOCUMENT = 1,
++        EXCEL_DOCUMENT
++    };
++
++private:
++    DOCUMENT_TYPE meDocType;
++
++public:
++	VbaDocumentsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, DOCUMENT_TYPE eDocType ) throw (css::uno::RuntimeException);
++	virtual ~VbaDocumentsBase() {}
++
++	// XEnumerationAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) = 0;
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0;
++
++	// VbaDocumentsBase_BASE
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0;
++
++	// XDocumentsBase
++	virtual css::uno::Any SAL_CALL Add() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL Close(  ) throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
++};
++
++#endif /* SC_VBA_WORKBOOKS_HXX */
+Index: vbahelper/inc/vbahelper/vbaapplicationbase.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbaapplicationbase.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbaapplicationbase.hxx	(revision 276288)
+@@ -0,0 +1,64 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbaapplicationbase.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef VBA_APPLICATION_BASE_HXX
++#define VBA_APPLICATION_BASE_HXX
++
++#include <ooo/vba/XHelperInterface.hpp>
++#include <ooo/vba/XApplicationBase.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <sfx2/objsh.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ov::XApplicationBase > ApplicationBase_BASE;
++
++class VBAHELPER_DLLPUBLIC VbaApplicationBase : public ApplicationBase_BASE
++{
++protected:
++    VbaApplicationBase( const css::uno::Reference< css::uno::XComponentContext >& xContext );
++    virtual ~VbaApplicationBase();
++
++    virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) = 0;
++public:
++	// XHelperInterface ( parent is itself )
++	virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return this; }
++
++	virtual sal_Bool SAL_CALL getScreenUpdating() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException);
++	virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
++	virtual ::rtl::OUString SAL_CALL getVersion() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL Run( const ::rtl::OUString& MacroName, const css::uno::Any& varg1, const css::uno::Any& varg2, const css::uno::Any& varg3, const css::uno::Any& varg4, const css::uno::Any& varg5, const css::uno::Any& varg6, const css::uno::Any& varg7, const css::uno::Any& varg8, const css::uno::Any& varg9, const css::uno::Any& varg10, const css::uno::Any& varg11, const css::uno::Any& varg12, const css::uno::Any& varg13, const css::uno::Any& varg14, const css::uno::Any& varg15, const css::uno::Any& varg16, const css::uno::Any& varg17, const css::uno::Any& varg18, const css::uno::Any& varg19, const css::uno::Any& varg20, const css::uno::Any& varg21, const css::uno::Any& varg22, const css::uno::Any& varg23, const css::uno::Any& varg24, const css::uno::Any& varg25, const css::uno::Any& varg26, const css::uno::Any& varg27, const css::uno::Any& varg28, const css::uno::Any& varg29, const css::uno::Any& varg30 ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL Quit(  ) throw (::com::sun::star::uno::RuntimeException);
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++#endif
+Index: vbahelper/inc/vbahelper/vbatextframe.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbatextframe.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbatextframe.hxx	(revision 276288)
+@@ -0,0 +1,70 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbatextframe.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef VBA_TEXTFRAME_HXX
++#define VBA_TEXTFRAME_HXX
++#include <ooo/vba/msforms/XTextFrame.hpp>
++#include <com/sun/star/drawing/XShape.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ov::msforms::XTextFrame > VbaTextFrame_BASE;
++
++class VBAHELPER_DLLPUBLIC VbaTextFrame : public VbaTextFrame_BASE
++{
++protected:    
++    css::uno::Reference< css::drawing::XShape > m_xShape;
++    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
++protected:
++    virtual rtl::OUString& getServiceImplName();
++    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++    virtual void setAsMSObehavior();
++    sal_Int32 getMargin( rtl::OUString sMarginType );
++    void setMargin( rtl::OUString sMarginType, float fMargin );
++public:
++    VbaTextFrame( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext , css::uno::Reference< css::drawing::XShape > xShape);
++    virtual ~VbaTextFrame() {}
++    // Attributes
++    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setAutoSize( sal_Bool _autosize ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getMarginBottom() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMarginBottom( float _marginbottom ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getMarginTop() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMarginTop( float _margintop ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getMarginLeft() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMarginLeft( float _marginleft ) throw (css::uno::RuntimeException);
++    virtual float SAL_CALL getMarginRight() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setMarginRight( float _marginright ) throw (css::uno::RuntimeException);
++
++    // Methods
++    virtual css::uno::Any SAL_CALL Characters(  ) throw (css::uno::RuntimeException);
++
++};
++
++#endif//SC_VBA_TEXTFRAME_HXX
+Index: vbahelper/inc/vbahelper/vbahelperinterface.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbahelperinterface.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbahelperinterface.hxx	(revision 276288)
+@@ -0,0 +1,121 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbahelperinterface.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef OOVBAAPI_VBA_HELPERINTERFACE_HXX
++#define OOVBAAPI_VBA_HELPERINTERFACE_HXX
++
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/XHelperInterface.hpp>
++#include <vbahelper/vbahelper.hxx>
++#include <com/sun/star/container/XNameAccess.hpp>
++
++// use this class when you have an a object like
++// interface  XAnInterface which contains XHelperInterface in its inheritance hierarchy
++// interface XAnInterface
++// { 
++//     interface XHelperInterface;
++//     [attribute, string] name;
++// }
++// or
++// interface XAnInterface : XHelperInterface;
++// { 
++//     [attribute, string] name;
++// }
++//
++// then this class can provide a default implementation of XHelperInterface,
++// you can use it like this
++// typedef InheritedHelperInterfaceImpl< XAnInterface > > AnInterfaceImpl_BASE;
++// class AnInterfaceImpl : public AnInterfaceImpl_BASE
++// {
++// public:
++//     AnInterface( const Reference< HelperInterface >& xParent ) : AnInterfaceImpl_BASE( xParent ) {}
++//     // implement XAnInterface methods only, no need to implement the XHelperInterface 
++//     // methods
++//     virtual void setName( const OUString& );  
++//     virtual OUString getName();  
++// }
++//
++const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) );
++
++template< typename Ifc1 >
++class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl : public Ifc1
++{
++protected: 
++	css::uno::WeakReference< ov::XHelperInterface > mxParent;
++	css::uno::Reference< css::uno::XComponentContext > mxContext;
++public:
++	InheritedHelperInterfaceImpl() {}
++	InheritedHelperInterfaceImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxParent( xParent ), mxContext( xContext ) {}
++	virtual rtl::OUString& getServiceImplName() = 0;
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames() = 0;
++
++	// XHelperInterface Methods
++	virtual ::sal_Int32 SAL_CALL getCreator() throw (css::script::BasicErrorException, css::uno::RuntimeException)
++	{
++		return 0x53756E4F;
++	}
++	virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return mxParent; }
++	
++	virtual css::uno::Any SAL_CALL Application(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { 
++            // The application could certainly be passed around in the context - seems
++            // to make sense
++            css::uno::Reference< css::container::XNameAccess > xNameAccess( mxContext, css::uno::UNO_QUERY_THROW );
++            return xNameAccess->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Application" ) ) );
++	}
++
++
++	// XServiceInfo Methods
++	virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) { return getServiceImplName(); }
++	virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) 
++	{ 
++		css::uno::Sequence< rtl::OUString > sServices = getSupportedServiceNames();
++		const rtl::OUString* pStart = sServices.getConstArray();
++		const rtl::OUString* pEnd = pStart + sServices.getLength();
++		for ( ; pStart != pEnd ; ++pStart )
++			if ( (*pStart).equals( ServiceName ) )
++				return sal_True;
++		return sal_False;	
++	}
++	virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) 
++	{ 
++		css::uno::Sequence< rtl::OUString > aNames = getServiceNames();;
++		return aNames;
++	}
++ };
++
++template< typename Ifc1 >
++class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
++
++{
++typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base;
++public:
++	InheritedHelperInterfaceImpl1< Ifc1 > ( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}	
++
++};
++#endif
+Index: vbahelper/inc/vbahelper/vbashape.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbashape.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbashape.hxx	(revision 276288)
+@@ -0,0 +1,118 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbashape.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_SHAPE_HXX
++#define SC_VBA_SHAPE_HXX
++
++#include <ooo/vba/office/MsoShapeType.hpp>
++#include <com/sun/star/drawing/XShape.hpp>
++#include <com/sun/star/drawing/XShapes.hpp>
++#include <com/sun/star/lang/XEventListener.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <ooo/vba/msforms/XShape.hpp>
++#include <ooo/vba/msforms/XLineFormat.hpp>
++#include <cppuhelper/implbase2.hxx>
++
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef  ::cppu::WeakImplHelper2< ov::msforms::XShape, css::lang::XEventListener > ListeningShape;
++
++typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE;
++
++class VBAHELPER_DLLPUBLIC ScVbaShape : public ScVbaShape_BASE
++{
++private:
++protected:
++    std::auto_ptr< ov::ShapeHelper > m_pShapeHelper;
++    css::uno::Reference< css::drawing::XShape > m_xShape;
++    css::uno::Reference< css::drawing::XShapes > m_xShapes;
++    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
++    sal_Int32 m_nType;
++    css::uno::Reference< css::frame::XModel > m_xModel;
++    css::uno::Any m_aRange;
++	virtual void addListeners();
++	virtual void removeShapeListener() throw( css::uno::RuntimeException );
++	virtual void removeShapesListener() throw( css::uno::RuntimeException );
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++public:
++    ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nType ) throw ( css::lang::IllegalArgumentException );
++    ScVbaShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::lang::IllegalArgumentException );
++    virtual ~ScVbaShape();
++    css::uno::Any getRange() { return m_aRange; };
++    void setRange( css::uno::Any aRange ) { m_aRange = aRange; };
++
++    static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException);
++
++    // Attributes
++    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
++    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getZOrderPosition() throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getRotation() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setRotation( double _rotation ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::msforms::XPictureFormat > SAL_CALL getPictureFormat() throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getLockAspectRatio() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getLockAnchor() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLockAnchor( ::sal_Bool _lockanchor ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (css::uno::RuntimeException);
++
++    // Methods
++    virtual css::uno::Any SAL_CALL SAL_CALL TextFrame(  ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat(  ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL Delete() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL ScaleHeight( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL ScaleWidth( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException);
++    // Replace??
++    virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL ShapeRange( const css::uno::Any& index ) throw ( css::uno::RuntimeException );
++    // XEventListener
++    virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) throw( css::uno::RuntimeException );
++};
++#endif//SC_VBA_SHAPE_HXX
+Index: vbahelper/inc/vbahelper/vbafontbase.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbafontbase.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbafontbase.hxx	(revision 276288)
+@@ -0,0 +1,99 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbafont.hxx,v $
++ * $Revision: 1.5 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef VBAHELPER_FONTBASE_HXX
++#define VBAHELPER_FONTBASE_HXX
++
++#include <cppuhelper/implbase1.hxx>
++
++#include <ooo/vba/XFontBase.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++// use local constants there is no need to expose these constants
++// externally. Looking at the Format->Character dialog it seem that
++// these may infact be even be calculated. Leave hardcoded for now
++// #FIXEME #TBD investigate the code for dialog mentioned above
++
++// The font baseline is not specified.
++const short NORMAL = 0;
++
++// specifies a superscripted.
++const short SUPERSCRIPT = 33;
++
++// specifies a subscripted.
++const short SUBSCRIPT = -33;
++
++// specifies a hight of superscripted font
++ const sal_Int8 SUPERSCRIPTHEIGHT = 58;
++
++// specifies a hight of subscripted font
++const sal_Int8 SUBSCRIPTHEIGHT = 58;
++
++// specifies a hight of normal font
++const short NORMALHEIGHT = 100;
++
++typedef  InheritedHelperInterfaceImpl1< ov::XFontBase > VbaFontBase_BASE;
++
++class VBAHELPER_DLLPUBLIC VbaFontBase : public VbaFontBase_BASE
++{
++protected:
++    css::uno::Reference< css::beans::XPropertySet > mxFont;
++    css::uno::Reference< css::container::XIndexAccess > mxPalette;
++public:
++	VbaFontBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPalette, css::uno::Reference< css::beans::XPropertySet > xPropertySet ) throw ( css::uno::RuntimeException );
++	virtual ~VbaFontBase();// {}
++
++	// Attributes
++    virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setSize( const css::uno::Any& _size ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setBold( const css::uno::Any& _bold ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException) = 0;
++    virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException) = 0;
++    virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setStrikethrough( const css::uno::Any& _strikethrough ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setShadow( const css::uno::Any& _shadow ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setItalic( const css::uno::Any& _italic ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setName( const css::uno::Any& _name ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException) ;
++    virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException) ;
++};
++
++#endif
++
+Index: vbahelper/inc/vbahelper/vbawindowbase.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbawindowbase.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbawindowbase.hxx	(revision 276288)
+@@ -0,0 +1,66 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef VBA_WINDOWBASE_HXX
++#define VBA_WINDOWBASE_HXX
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/XWindowBase.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/awt/XDevice.hpp>
++
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1<ov::XWindowBase > WindowBaseImpl_BASE;
++
++class VBAHELPER_DLLPUBLIC VbaWindowBase : public WindowBaseImpl_BASE
++{		
++protected:		
++	css::uno::Reference< css::frame::XModel > m_xModel;
++public:
++	VbaWindowBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel );
++    VbaWindowBase( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
++
++	// XWindowBase
++    virtual sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException) ;
++    virtual void SAL_CALL setHeight( sal_Int32 _height ) throw (css::uno::RuntimeException) ;
++    virtual sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException) ;
++    virtual void SAL_CALL setLeft( sal_Int32 _left ) throw (css::uno::RuntimeException) ;
++    virtual sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException) ;
++    virtual void SAL_CALL setTop( sal_Int32 _top ) throw (css::uno::RuntimeException) ;
++    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
++    virtual sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException) ;
++    virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException) ;
++
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif //VBA_WINDOWBASE_HXX
+Index: vbahelper/inc/vbahelper/vbadocumentbase.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbadocumentbase.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbadocumentbase.hxx	(revision 276288)
+@@ -0,0 +1,73 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef VBA_DOCUMENTBASE_HXX
++#define VBA_DOCUMENTBASE_HXX
++
++#include <com/sun/star/frame/XModel.hpp>
++#include <ooo/vba/XDocumentBase.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++
++typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentBase > VbaDocumentBase_BASE;
++
++class VBAHELPER_DLLPUBLIC VbaDocumentBase : public VbaDocumentBase_BASE
++{
++protected:
++	css::uno::Reference< css::frame::XModel > mxModel;
++protected:
++	virtual css::uno::Reference< css::frame::XModel >  getModel() { return mxModel; }
++	VbaDocumentBase( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
++public:
++	VbaDocumentBase( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
++			css::uno::Reference< css::frame::XModel > xModel );
++	VbaDocumentBase( 	css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
++	virtual ~VbaDocumentBase() {}
++
++    // Attributes
++	virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
++	virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
++	virtual ::rtl::OUString SAL_CALL getFullName() throw (css::uno::RuntimeException);
++	virtual sal_Bool SAL_CALL getSaved() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException);
++
++	// Methods
++	virtual void SAL_CALL Close( const css::uno::Any &bSaveChanges,
++								 const css::uno::Any &aFileName,
++								 const css::uno::Any &bRouteWorkbook ) throw (css::uno::RuntimeException);
++	virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException);
++	virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException);
++	virtual void SAL_CALL Save() throw (css::uno::RuntimeException);
++	virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
++    
++	// XHelperInterface
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++};
++
++#endif /* VBA_DOCUMENTBASE_HXX */
+Index: vbahelper/inc/vbahelper/vbacollectionimpl.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx	(revision 276288)
+@@ -0,0 +1,257 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbacollectionimpl.hxx,v $
++ * $Revision: 1.5 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef OOVBAAPI_VBA_COLLECTION_IMPL_HXX
++#define OOVBAAPI_VBA_COLLECTION_IMPL_HXX
++
++#include <ooo/vba/XCollection.hpp>
++#include <com/sun/star/container/XEnumerationAccess.hpp>
++#include <com/sun/star/uno/XComponentContext.hpp>
++#include <com/sun/star/script/XDefaultMethod.hpp>
++#include <com/sun/star/container/XIndexAccess.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
++#include <com/sun/star/container/XNamed.hpp>
++
++#include <cppuhelper/implbase3.hxx>
++#include <cppuhelper/implbase2.hxx>
++#include <cppuhelper/implbase1.hxx>
++
++#include "vbahelper/vbahelper.hxx"
++#include "vbahelper/vbahelperinterface.hxx"
++
++#include <vector>
++
++typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumerationHelper_BASE;
++
++class VBAHELPER_DLLPUBLIC EnumerationHelperImpl : public EnumerationHelper_BASE
++{
++protected:
++	css::uno::Reference< css::uno::XComponentContext > m_xContext;
++	css::uno::Reference< css::container::XEnumeration > m_xEnumeration;
++public:
++
++	EnumerationHelperImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XEnumeration >& xEnumeration ) throw ( css::uno::RuntimeException ) : m_xContext( xContext ),  m_xEnumeration( xEnumeration ) { }
++	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException) { return m_xEnumeration->hasMoreElements(); }
++};
++
++// a wrapper class for a providing a XIndexAccess, XNameAccess, XEnumerationAccess impl based on providing a vector of interfaces 
++// only requirement is the object needs to implement XName
++
++
++
++typedef ::cppu::WeakImplHelper3< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE;
++
++template< typename Ifc1 >
++class VBAHELPER_DLLPUBLIC XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
++{
++public:
++typedef std::vector< css::uno::Reference< Ifc1 > >  XNamedVec;
++private:
++
++	class XNamedEnumerationHelper : public EnumerationHelper_BASE
++	{
++		XNamedVec mXNamedVec;
++		typename XNamedVec::iterator mIt;
++	public:
++	        XNamedEnumerationHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), mIt( mXNamedVec.begin() ) {}
++	
++	        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException)
++	        {
++			return ( mIt != mXNamedVec.end() );
++	        }
++	
++	        virtual css::uno::Any SAL_CALL nextElement(  ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
++	        {
++	                if ( hasMoreElements() )
++				return css::uno::makeAny( *mIt++ );
++	                throw css::container::NoSuchElementException();
++	        }
++	};
++
++protected:
++	XNamedVec mXNamedVec;
++	typename XNamedVec::iterator cachePos;
++public:
++	XNamedObjectCollectionHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), cachePos(mXNamedVec.begin()) {}
++	// XElementAccess
++	virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException) { return  Ifc1::static_type(0); }
++	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException) { return ( mXNamedVec.size() > 0 ); }
++	// XNameAcess 
++	virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
++	{
++		if ( !hasByName(aName) )
++			throw css::container::NoSuchElementException();
++		return css::uno::makeAny( *cachePos );
++	}
++	virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException)
++	{
++		css::uno::Sequence< rtl::OUString > sNames( mXNamedVec.size() );
++		rtl::OUString* pString = sNames.getArray();
++		typename XNamedVec::iterator it = mXNamedVec.begin();
++		typename XNamedVec::iterator it_end = mXNamedVec.end();
++
++		for ( ; it != it_end; ++it, ++pString )
++		{
++			css::uno::Reference< css::container::XNamed > xName( *it, css::uno::UNO_QUERY_THROW );	
++			*pString = xName->getName();
++		}
++		return sNames;
++	}
++	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
++	{
++		cachePos = mXNamedVec.begin();
++		typename XNamedVec::iterator it_end = mXNamedVec.end();
++		for ( ; cachePos != it_end; ++cachePos )
++		{
++			css::uno::Reference< css::container::XNamed > xName( *cachePos, css::uno::UNO_QUERY_THROW );	
++			if ( aName.equals( xName->getName() ) )
++				break;
++		}
++		return ( cachePos != it_end );
++	}
++
++	// XElementAccess
++	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException) { return mXNamedVec.size(); }	
++	virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException )
++	{
++		if ( Index < 0 || Index >= getCount() )
++			throw css::lang::IndexOutOfBoundsException();
++	
++		return css::uno::makeAny( mXNamedVec[ Index ] );
++
++	}
++	// XEnumerationAccess
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw (css::uno::RuntimeException)
++	{
++		return new XNamedEnumerationHelper( mXNamedVec );
++	}
++};
++
++// including a HelperInterface implementation
++template< typename Ifc1 >
++class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
++{
++typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
++protected:
++	css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess;
++	css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
++
++	virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException)
++	{
++		if ( !m_xNameAccess.is() )
++			throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase string index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
++	
++		return createCollectionObject( m_xNameAccess->getByName( sIndex ) );	
++	}		
++
++	virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException)
++	{
++		if ( !m_xIndexAccess.is() )
++			throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase numeric index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
++		if ( nIndex <= 0 )
++		{
++			throw  css::lang::IndexOutOfBoundsException( 
++				::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
++				"index is 0 or negative" ) ), 
++				css::uno::Reference< css::uno::XInterface >() );
++		}
++		// need to adjust for vba index ( for which first element is 1 )
++		return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) );		
++	}
++public:
++	ScVbaCollectionBase( const css::uno::Reference< ov::XHelperInterface >& xParent,   const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) : BaseColBase( xParent, xContext ), m_xIndexAccess( xIndexAccess ){ m_xNameAccess.set(m_xIndexAccess, css::uno::UNO_QUERY); }
++	//XCollection
++	virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException)
++	{
++		return m_xIndexAccess->getCount();
++	}
++
++	virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::uno::RuntimeException)
++	{
++		if ( Index1.getValueTypeClass() != css::uno::TypeClass_STRING )
++		{
++			sal_Int32 nIndex = 0;
++	
++			if ( ( Index1 >>= nIndex ) != sal_True )
++			{
++				rtl::OUString message;
++				message = rtl::OUString::createFromAscii(
++					"Couldn't convert index to Int32");
++				throw  css::lang::IndexOutOfBoundsException( message,
++					css::uno::Reference< css::uno::XInterface >() );
++			}
++			return 	getItemByIntIndex( nIndex );
++		}
++		rtl::OUString aStringSheet;
++
++		Index1 >>= aStringSheet;
++		return getItemByStringIndex( aStringSheet );	
++	}
++	// XDefaultMethod
++	::rtl::OUString SAL_CALL getDefaultMethodName(  ) throw (css::uno::RuntimeException)
++	{
++		const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
++		return sName;
++	}
++	// XEnumerationAccess
++	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0;	
++
++	// XElementAccess
++	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) = 0;
++	// XElementAccess
++	virtual ::sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException)
++	{
++		return ( m_xIndexAccess->getCount() > 0 );
++	}
++	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0;
++	
++};
++
++typedef ::cppu::WeakImplHelper1<ov::XCollection> XCollection_InterfacesBASE;
++
++typedef ScVbaCollectionBase< XCollection_InterfacesBASE > CollImplBase1;
++// compatible with the old collections ( pre XHelperInterface base class ) ( some internal objects still use this )
++class VBAHELPER_DLLPUBLIC ScVbaCollectionBaseImpl : public CollImplBase1
++{
++public:
++	ScVbaCollectionBaseImpl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : CollImplBase1( xParent, xContext, xIndexAccess){}
++
++};
++
++template <typename Ifc> // where Ifc must implement XCollectionTest
++class VBAHELPER_DLLPUBLIC CollTestImplHelper :  public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
++{
++typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc >  > ImplBase1;
++
++public:
++	CollTestImplHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,  const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : ImplBase1( xParent, xContext, xIndexAccess ) {}
++};
++
++
++#endif //SC_VBA_COLLECTION_IMPL_HXX
+Index: vbahelper/inc/vbahelper/vbadialogsbase.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbadialogsbase.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbadialogsbase.hxx	(revision 276288)
+@@ -0,0 +1,54 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbadialogs.hxx,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef VBA_DIALOGS_BASE_HXX
++#define VBA_DIALOGS_BASE_HXX
++
++#include <cppuhelper/implbase1.hxx>
++#include <ooo/vba/XHelperInterface.hpp>
++#include <ooo/vba/XDialogsBase.hpp>
++#include <vbahelper/vbahelperinterface.hxx>
++#include <com/sun/star/frame/XModel.hpp>
++
++typedef InheritedHelperInterfaceImpl1< ov::XDialogsBase > VbaDialogsBase_BASE;
++
++class VBAHELPER_DLLPUBLIC VbaDialogsBase : public VbaDialogsBase_BASE
++{
++protected:
++        css::uno::Reference< css::frame::XModel > m_xModel;
++public:
++	VbaDialogsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): VbaDialogsBase_BASE( xParent, xContext ), m_xModel( xModel ) {} 
++	virtual ~VbaDialogsBase() {}
++
++	// XCollection
++	virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
++	virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
++};
++
++#endif /* VBA_DIALOGS_BASE_HXX */
+Index: vbahelper/inc/vbahelper/vbapropvalue.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbapropvalue.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbapropvalue.hxx	(revision 276288)
+@@ -0,0 +1,60 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbapropvalue.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_PROPVALULE_HXX
++#define SC_VBA_PROPVALULE_HXX
++#include <ooo/vba/XPropValue.hpp>
++#include <cppuhelper/implbase1.hxx>
++
++#include <vbahelper/vbahelper.hxx>
++
++typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE;
++
++class VBAHELPER_DLLPUBLIC PropListener 
++{
++public:
++    virtual void setValueEvent( const css::uno::Any& value ) = 0;
++    virtual css::uno::Any getValueEvent() = 0; 
++};
++
++
++class VBAHELPER_DLLPUBLIC ScVbaPropValue : public PropValueImpl_BASE 
++{
++    PropListener* m_pListener;
++public:
++    ScVbaPropValue( PropListener* pListener );
++
++    // Attributes
++    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
++
++    rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
++
++};
++#endif //SC_VBA_PROPVALULE_HXX
+Index: vbahelper/inc/vbahelper/vbashaperange.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbashaperange.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbashaperange.hxx	(revision 276288)
+@@ -0,0 +1,89 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbashaperange.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_SHAPERANGE_HXX
++#define SC_VBA_SHAPERANGE_HXX
++
++#include <com/sun/star/drawing/XShapes.hpp>
++#include <ooo/vba/msforms/XShapeRange.hpp>
++#include <com/sun/star/drawing/XDrawPage.hpp>
++#include <vbahelper/vbacollectionimpl.hxx>
++#include <ooo/vba/msforms/XLineFormat.hpp>
++#include <ooo/vba/msforms/XFillFormat.hpp>
++
++typedef CollTestImplHelper< ov::msforms::XShapeRange > ScVbaShapeRange_BASE;
++
++class VBAHELPER_DLLPUBLIC ScVbaShapeRange : public ScVbaShapeRange_BASE
++{
++private:
++    css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage;
++    css::uno::Reference< css::drawing::XShapes > m_xShapes;
++    sal_Int32 m_nShapeGroupCount;
++protected:
++    css::uno::Reference< css::frame::XModel > m_xModel;
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++	css::uno::Reference< css::drawing::XShapes > getShapes() throw (css::uno::RuntimeException) ;
++public:
++    ScVbaShapeRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XDrawPage>& xDrawShape, const css::uno::Reference< css::frame::XModel >& xModel );
++
++    // Methods
++    virtual void SAL_CALL Select(  ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ::ooo::vba::msforms::XShape > SAL_CALL Group() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException);
++    virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException) ;
++    virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
++    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getLockAspectRatio() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getLockAnchor() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setLockAnchor( ::sal_Bool _lockanchor ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (css::uno::RuntimeException);
++    virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL SAL_CALL TextFrame(  ) throw (css::uno::RuntimeException);
++    virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat(  ) throw (css::uno::RuntimeException);
++    //XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); 
++    // ScVbaCollectionBaseImpl
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++};
++
++#endif//SC_VBA_SHAPERANGE_HXX
+Index: vbahelper/inc/vbahelper/helperdecl.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/helperdecl.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/helperdecl.hxx	(revision 276288)
+@@ -0,0 +1,58 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: helperdecl.hxx,v $
++ * $Revision: 1.3 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef OOVBAAPI_SERV_DECL
++#define OOVBAAPI_SERV_DECL
++#include <comphelper/servicedecl.hxx>
++#include <ooo/vba/XHelperInterface.hpp>
++
++namespace comphelper {
++namespace service_decl {
++template <typename ImplT_, typename WithArgsT = with_args<false> >
++struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT >
++{
++    typedef serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT > baseT;
++    /** Default ctor.  Implementation class without args, expecting
++        component context as single argument.
++    */
++    vba_service_class_() : baseT() {}
++    template <typename PostProcessFuncT>
++    /** Ctor to pass a post processing function/functor.
++        
++        @tpl PostProcessDefaultT let your compiler deduce this
++        @param postProcessFunc function/functor that gets the yet unacquired
++                               ImplT_ pointer returning a
++                               uno::Reference<uno::XInterface>
++    */
++    explicit vba_service_class_( PostProcessFuncT const& postProcessFunc ) : baseT( postProcessFunc ) {}
++};
++
++} // namespace service_decl
++} // namespace comphelper
++#endif
+Index: vbahelper/inc/vbahelper/vbahelper.hxx
+===================================================================
+--- vbahelper/inc/vbahelper/vbahelper.hxx	(revision 0)
++++ vbahelper/inc/vbahelper/vbahelper.hxx	(revision 276288)
+@@ -0,0 +1,231 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbahelper.hxx,v $
++ * $Revision: 1.5.32.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef OOVBAAPI_VBA_HELPER_HXX
++#define OOVBAAPI_VBA_HELPER_HXX
++
++#include <com/sun/star/drawing/XShape.hpp>
++#include <com/sun/star/beans/XIntrospectionAccess.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/script/BasicErrorException.hpp>
++#include <com/sun/star/script/XTypeConverter.hpp>
++#include <com/sun/star/lang/IllegalArgumentException.hpp>
++#include <com/sun/star/awt/XControl.hpp>
++#include <com/sun/star/awt/XDevice.hpp>
++#include <basic/sberrors.hxx>
++#include <cppuhelper/implbase1.hxx>
++#include <com/sun/star/frame/XModel.hpp>
++#include <sfx2/dispatch.hxx>
++//#include <ooo/vba/msforms/XShape.hpp>
++#include <vcl/pointr.hxx>
++#define VBAHELPER_DLLIMPLEMENTATION
++#include <vbahelper/vbadllapi.h>
++#include <memory>
++namespace css = ::com::sun::star;
++
++namespace ooo 
++{
++	namespace vba 
++	{
++		template < class T > 
++		css::uno::Reference< T > getXSomethingFromArgs( css::uno::Sequence< css::uno::Any > const & args, sal_Int32 nPos, bool bCanBeNull = true ) throw (css::lang::IllegalArgumentException)
++		{
++			if ( args.getLength() < ( nPos + 1) )
++				throw css::lang::IllegalArgumentException();
++			css::uno::Reference< T > aSomething( args[ nPos ], css::uno::UNO_QUERY );
++			if ( !bCanBeNull && !aSomething.is() )
++				throw css::lang::IllegalArgumentException();
++			return aSomething;
++		}
++        VBAHELPER_DLLPUBLIC SfxObjectShell* getSfxObjShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException);
++        VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell,  const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException);
++        VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell,  const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
++        css::uno::Reference< css::frame::XModel > getCurrentDoc( const rtl::OUString& sKey ) throw (css::uno::RuntimeException);
++        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentExcelDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
++        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentWordDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
++
++		VBAHELPER_DLLPUBLIC css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException);
++		VBAHELPER_DLLPUBLIC css::uno::Reference< css::script::XTypeConverter > getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
++
++		VBAHELPER_DLLPUBLIC void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl) ;
++		VBAHELPER_DLLPUBLIC void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl, css::uno::Sequence< css::beans::PropertyValue >& sProps ) ;
++		VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, USHORT nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
++		VBAHELPER_DLLPUBLIC sal_Int32 OORGBToXLRGB( sal_Int32 );
++		VBAHELPER_DLLPUBLIC sal_Int32 XLRGBToOORGB( sal_Int32 );
++		VBAHELPER_DLLPUBLIC css::uno::Any OORGBToXLRGB( const css::uno::Any& );
++		VBAHELPER_DLLPUBLIC css::uno::Any XLRGBToOORGB( const css::uno::Any& );
++		// provide a NULL object that can be passed as variant so that 
++		// the object when passed to IsNull will return true. aNULL 
++		// contains an empty object reference
++		VBAHELPER_DLLPUBLIC const css::uno::Any& aNULL();
++		VBAHELPER_DLLPUBLIC void PrintOutHelper( SfxViewShell* pViewShell, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, sal_Bool bSelection  );
++		VBAHELPER_DLLPUBLIC void PrintPreviewHelper( const css::uno::Any& EnableChanges,  SfxViewShell* );
++
++		VBAHELPER_DLLPUBLIC rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException );
++		VBAHELPER_DLLPUBLIC rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic )
++	    VBAHELPER_DLLPUBLIC double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical);
++    	VBAHELPER_DLLPUBLIC double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
++	    VBAHELPER_DLLPUBLIC double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
++        VBAHELPER_DLLPUBLIC sal_Int32 getPointerStyle( const css::uno::Reference< css::frame::XModel >& );
++        VBAHELPER_DLLPUBLIC void setCursorHelper( const css::uno::Reference< css::frame::XModel >& xModel, const Pointer& rPointer, sal_Bool bOverWrite );
++        VBAHELPER_DLLPUBLIC void setDefaultPropByIntrospection( const css::uno::Any& aObj, const css::uno::Any& aValue  ) throw ( css::uno::RuntimeException );
++        VBAHELPER_DLLPUBLIC css::uno::Any getPropertyValue( const css::uno::Sequence< css::beans::PropertyValue >& aProp, const rtl::OUString& aName );
++        VBAHELPER_DLLPUBLIC sal_Bool setPropertyValue( css::uno::Sequence< css::beans::PropertyValue >& aProp, const rtl::OUString& aName, const css::uno::Any& aValue );
++
++class VBAHELPER_DLLPUBLIC Millimeter
++{
++//Factor to translate between points and hundredths of millimeters:
++private:
++	static const double factor;
++    
++	double m_nMillimeter;
++
++public:
++	Millimeter();
++    
++	Millimeter(double mm);
++    
++	void set(double mm);
++	void setInPoints(double points) ;
++	void setInHundredthsOfOneMillimeter(double hmm);
++	double get();
++	double getInHundredthsOfOneMillimeter();
++	double getInPoints();
++	static sal_Int32 getInHundredthsOfOneMillimeter(double points);
++	static double getInPoints(int _hmm);
++};
++
++class VBAHELPER_DLLPUBLIC AbstractGeometryAttributes // probably should replace the ShapeHelper below
++{
++public:
++    virtual ~AbstractGeometryAttributes() {}
++    virtual double getLeft() = 0;
++    virtual void setLeft( double ) = 0;
++    virtual double getTop() = 0;
++    virtual void setTop( double ) = 0;
++    virtual double getHeight() = 0;
++    virtual void setHeight( double ) = 0;
++    virtual double getWidth() = 0;
++    virtual void setWidth( double ) = 0;
++};
++
++namespace msforms {
++    class XShape;
++}
++
++class VBAHELPER_DLLPUBLIC ShapeHelper
++{
++protected:
++	css::uno::Reference< css::drawing::XShape > xShape;
++public:
++	ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException );
++    
++	double getHeight();
++
++    	void setHeight(double _fheight) throw ( css::script::BasicErrorException );
++    
++	double getWidth();
++
++	void setWidth(double _fWidth) throw ( css::script::BasicErrorException );
++    
++	double getLeft();
++    
++	void setLeft(double _fLeft);
++
++	double getTop();
++    
++	void setTop(double _fTop);
++};
++
++class VBAHELPER_DLLPUBLIC ConcreteXShapeGeometryAttributes : public AbstractGeometryAttributes
++{
++    std::auto_ptr< ShapeHelper > m_pShapeHelper;
++public:
++    ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape );
++    virtual double getLeft();
++    virtual void setLeft( double nLeft );
++    virtual double getTop();
++    virtual void setTop( double nTop );
++    virtual double getHeight();
++    virtual void setHeight( double nHeight );
++    virtual double getWidth();
++    virtual void setWidth( double nWidth);
++};
++#define VBA_LEFT "PositionX"
++#define VBA_TOP "PositionY"
++class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttributes
++{
++
++    css::uno::Reference< css::beans::XPropertySet > mxModel;
++public:
++    UserFormGeometryHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xControl );
++    virtual double getLeft();
++    virtual void setLeft( double nLeft );
++    virtual double getTop();
++    virtual void setTop( double nTop );
++    virtual double getHeight();
++    virtual void setHeight( double nHeight );
++    virtual double getWidth();
++    virtual void setWidth( double nWidth);
++};
++
++class VBAHELPER_DLLPUBLIC ContainerUtilities
++{
++
++public: 
++	static rtl::OUString getUniqueName( const css::uno::Sequence< ::rtl::OUString >&  _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator);
++	static rtl::OUString getUniqueName( const css::uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix );
++
++	static sal_Int32 FieldInList( const css::uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString );
++};
++
++// really just a a place holder to ease the porting pain
++class VBAHELPER_DLLPUBLIC DebugHelper
++{
++public:
++	static void exception( const rtl::OUString&  DetailedMessage, const css::uno::Exception& ex,  int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException );
++
++	static void exception( int err,  const rtl::OUString& additionalArgument ) throw( css::script::BasicErrorException );
++
++	static void exception( css::uno::Exception& ex ) throw( css::script::BasicErrorException );
++};
++	} // openoffice
++} // org
++
++namespace ov = ooo::vba;
++
++#ifdef DEBUG
++#  define SC_VBA_FIXME(a) OSL_TRACE( a )
++#  define SC_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
++#else
++#  define SC_VBA_FIXME(a)
++#  define SC_VBA_STUB()
++#endif
++
++#endif
+Index: vbahelper/prj/build.lst
+===================================================================
+--- vbahelper/prj/build.lst	(revision 0)
++++ vbahelper/prj/build.lst	(revision 276288)
+@@ -0,0 +1,6 @@
++vba	vbahelper	:	oovbaapi basic sfx2 svx cppuhelper vcl comphelper svtools tools sal NULL
++vba	vbahelper									usr1	-	all	  vba_mkout NULL
++#vba	vbahelper\inc								nmake	-	all	vba_inc NULL
++vba	vbahelper\source\vbahelper                        nmake	-	all	vba_vbahelper NULL
++vba	vbahelper\source\msforms                        nmake	-	all	vba_msforms NULL
++vba	vbahelper\util								nmake	-	all	vba_util vba_vbahelper vba_msforms NULL
+Index: vbahelper/prj/d.lst
+===================================================================
+--- vbahelper/prj/d.lst	(revision 0)
++++ vbahelper/prj/d.lst	(revision 276288)
+@@ -0,0 +1,27 @@
++..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
++..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
++..\%__SRC%\lib\ivbahelper.lib %_DEST%\lib%_EXT%\vbahelper.lib
++..\%__SRC%\lib\vbahelp*.* %_DEST%\lib%_EXT%\vba*.*
++..\%__SRC%\bin\vbahelper*.* %_DEST%\bin%_EXT%\vbahelper*.*
++..\%__SRC%\bin\msforms*.* %_DEST%\bin%_EXT%\msforms*.*
++
++mkdir: %_DEST%\inc%_EXT%\basic
++..\inc\vbahelper\vbacollectionimpl.hxx %_DEST%\inc%_EXT%\vbahelper\vbacollectionimpl.hxx
++..\inc\vbahelper\vbahelper.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelper.hxx
++..\inc\vbahelper\helperdecl.hxx %_DEST%\inc%_EXT%\vbahelper\helperdecl.hxx
++..\inc\vbahelper\vbahelperinterface.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelperinterface.hxx
++..\inc\vbahelper\vbaapplicationbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaapplicationbase.hxx
++..\inc\vbahelper\vbafontbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbafontbase.hxx
++..\inc\vbahelper\vbadllapi.h %_DEST%\inc%_EXT%\vbahelper\vbadllapi.h
++..\inc\vbahelper\vbawindowbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbawindowbase.hxx
++..\inc\vbahelper\vbadocumentbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentbase.hxx
++..\inc\vbahelper\vbadocumentsbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentsbase.hxx
++..\inc\vbahelper\vbapropvalue.hxx %_DEST%\inc%_EXT%\vbahelper\vbapropvalue.hxx
++..\inc\vbahelper\vbaglobalbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaglobalbase.hxx
++..\inc\vbahelper\vbadialogbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadialogbase.hxx
++..\inc\vbahelper\vbadialogsbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadialogsbase.hxx
++..\inc\vbahelper\vbashape.hxx %_DEST%\inc%_EXT%\vbahelper\vbashape.hxx
++..\inc\vbahelper\vbashapes.hxx %_DEST%\inc%_EXT%\vbahelper\vbashapes.hxx
++..\inc\vbahelper\vbatextframe.hxx %_DEST%\inc%_EXT%\vbahelper\vbatextframe.hxx
++..\inc\vbahelper\vbashaperange.hxx %_DEST%\inc%_EXT%\vbahelper\vbashaperange.hxx
++..\inc\vbahelper\vbapagesetupbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbapagesetupbase.hxx
+Index: vbahelper/util/msforms.map
+===================================================================
+--- vbahelper/util/msforms.map	(revision 0)
++++ vbahelper/util/msforms.map	(revision 276288)
+@@ -0,0 +1,9 @@
++OOO_1.1 {
++	global:
++		component_getImplementationEnvironment;
++		component_getFactory;
++		component_writeInfo;
++
++	local:
++		*;
++};
+Index: vbahelper/util/makefile.mk
+===================================================================
+--- vbahelper/util/makefile.mk	(revision 0)
++++ vbahelper/util/makefile.mk	(revision 276288)
+@@ -0,0 +1,104 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.24 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..
++
++PRJNAME=vbahelper
++TARGET=vbahelper
++
++# --- Settings ---------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++
++TARGET_HELPER=vbahelper
++
++LIB1TARGET=     $(SLB)$/$(TARGET).lib
++LIB1FILES=$(SLB)$/$(TARGET)bits.lib
++
++SHL1TARGET= $(TARGET_HELPER)$(DLLPOSTFIX)
++
++
++# dynamic libraries
++SHL1STDLIBS=       \
++		$(CPPULIB) \
++		$(COMPHELPERLIB) \
++		$(CPPUHELPERLIB) \
++		$(BASICLIB) \
++		$(TOOLSLIB) \
++		$(SALLIB)\
++		$(SFXLIB)	\
++		$(SVTOOLLIB)    \
++		$(SVLLIB) \
++        $(VCLLIB) \
++		$(SVTOOLLIB)    \
++        $(TKLIB) \
++        $(SVXMSFILTERLIB) \
++
++SHL1DEPN=
++SHL1IMPLIB= i$(TARGET_HELPER)
++SHL1USE_EXPORTS=name
++SHL1LIBS=$(LIB1TARGET)
++
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++
++DEF1NAME=$(SHL1TARGET)
++DEFLIB1NAME=$(TARGET)
++
++TARGET_MSFORMS=msforms
++SHL2TARGET=$(TARGET_MSFORMS)$(DLLPOSTFIX).uno
++SHL2IMPLIB=     i$(TARGET_MSFORMS)
++
++SHL2VERSIONMAP=$(TARGET_MSFORMS).map
++SHL2DEF=$(MISC)$/$(SHL2TARGET).def
++DEF2NAME=$(SHL2TARGET)
++SHL2STDLIBS= \
++                $(CPPUHELPERLIB) \
++                $(CPPULIB) \
++                $(COMPHELPERLIB) \
++                $(SVLIB) \
++                $(TOOLSLIB) \
++                $(SALLIB)\
++		$(VBAHELPERLIB) \
++                $(SFXLIB)       \
++                $(SVXLIB)       \
++                $(SVTOOLLIB)    \
++                $(SVLLIB) \
++        $(VCLLIB) \
++        $(TKLIB) \
++                $(BASICLIB) \
++
++SHL2DEPN=$(SHL1TARGETN)
++SHL2LIBS=$(SLB)$/$(TARGET_MSFORMS).lib
++
++# --- Targets -----------------------------------------------------------
++
++.INCLUDE :  target.mk
+Index: officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+===================================================================
+--- officecfg/registry/schema/org/openoffice/Office/Calc.xcs	(revision 276159)
++++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs	(revision 276288)
+@@ -1223,7 +1223,7 @@
+               <desc>Indicates whether VBA macros are imported without comments to be executable.</desc>
+               <label>Executable code</label>
+             </info>
+-            <value>false</value>
++            <value>true</value>
+           </prop>
+           <prop oor:name="Save" oor:type="xs:boolean">
+ 						<!-- OldPath: Filter/MS_Office/Basic/Excel -->
+Index: officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+===================================================================
+--- officecfg/registry/schema/org/openoffice/Office/Writer.xcs	(revision 276159)
++++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs	(revision 276288)
+@@ -749,6 +749,17 @@
+ 		</group>
+ 	</templates>
+ 	<component>
++        <group oor:name="GlobalTemplateList">
++            <info>
++               <desc>Contains the most recently opened documents.</desc>
++            </info>
++            <prop oor:name="Paths" oor:type="oor:string-list">
++                <info>
++                    <desc>Lists the file global templates loaded when importing writer documents.</desc>
++                </info>
++                <value oor:separator=";"></value> 
++            </prop>
++        </group>
+         <group oor:name="MailMergeWizard">
+             <info>
+                 <desc>Settings of the mail merge wizard.</desc>
+Index: officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+===================================================================
+--- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu	(revision 276159)
++++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu	(revision 276288)
+@@ -1189,6 +1189,12 @@
+ 					<value xml:lang="en-US">~Remove Filter</value>
+ 				</prop>
+ 			</node>
++                        <node oor:name=".uno:DataForm" oor:op="replace">
++                                <prop oor:name="Label" oor:type="xs:string">
++                                        <value xml:lang="de">D~atenForm...</value>
++                                        <value xml:lang="en-US">D~ataForm...</value>
++                                </prop>
++                        </node>
+ 			<node oor:name=".uno:DataSubTotals" oor:op="replace">
+ 				<prop oor:name="Label" oor:type="xs:string">
+ 					<value xml:lang="en-US">Sub~totals...</value>
+Index: svx/source/cui/cfg.cxx
+===================================================================
+--- svx/source/cui/cfg.cxx	(revision 276159)
++++ svx/source/cui/cfg.cxx	(revision 276288)
+@@ -5724,7 +5724,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
+ 				if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) )
+ 				{
+ 					BitmapEx aBitmap = aImage.GetBitmapEx();
+-					BitmapEx aBitmapex = AutoScaleBitmap(aBitmap, m_nExpectedSize);
++                    BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, m_nExpectedSize);
+ 					aImage = Image( aBitmapex);
+ 				}
+ 				aTbSymbol.InsertItem( nId,aImage, aURL, 0, 0 ); //modify
+@@ -5888,7 +5888,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const O
+                 if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) )
+ 				{
+ 					BitmapEx aBitmap = aImage.GetBitmapEx();
+-					BitmapEx aBitmapex = AutoScaleBitmap(aBitmap, m_nExpectedSize);
++                    BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, m_nExpectedSize);
+ 					aImage = Image( aBitmapex);
+ 				}
+ 				if ( bOK && !!aImage )
+Index: svx/source/msfilter/makefile.mk
+===================================================================
+--- svx/source/msfilter/makefile.mk	(revision 276159)
++++ svx/source/msfilter/makefile.mk	(revision 276288)
+@@ -54,7 +54,9 @@ LIB1OBJFILES= \
+ 	$(SLO)$/svxmsbas.obj	\
+ 	$(SLO)$/msocximex.obj	\
+ 	$(SLO)$/mscodec.obj		\
+-	$(SLO)$/msfiltertracer.obj
++	$(SLO)$/msfiltertracer.obj\
++	$(SLO)$/mstoolbar.obj\
++	$(SLO)$/msvbahelper.obj\
+ 
+ LIB2TARGET= $(SLB)$/$(TARGET)-core.lib
+ LIB2OBJFILES= \
+@@ -70,7 +72,9 @@ EXCEPTIONSFILES= \
+ 	$(SLO)$/msocximex.obj	\
+ 	$(SLO)$/msoleexp.obj	\
+ 	$(SLO)$/svxmsbas.obj	\
+-	$(SLO)$/msfiltertracer.obj
++	$(SLO)$/msfiltertracer.obj\
++	$(SLO)$/mstoolbar.obj\
++	$(SLO)$/msvbahelper.obj\
+ 
+ .INCLUDE :  target.mk
+ 
+Index: svx/source/msfilter/msoleexp.cxx
+===================================================================
+--- svx/source/msfilter/msoleexp.cxx	(revision 276159)
++++ svx/source/msfilter/msoleexp.cxx	(revision 276288)
+@@ -231,7 +231,12 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::
+             aSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
+             aSeq[1].Value <<= ::rtl::OUString( pExpFilter->GetName() );
+             uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY );
++        try
++        {
+             xStor->storeToURL( ::rtl::OUString::createFromAscii( "private:stream" ), aSeq );
++        }
++        catch( uno::Exception& ) {} // #TODO really handle exceptions - interactionalhandler etc. ? 
++        
+             SotStorageRef xOLEStor = new SotStorage( pStream, TRUE );
+             xOLEStor->CopyTo( &rDestStg );
+             rDestStg.Commit();
+Index: svx/source/msfilter/eschesdo.cxx
+===================================================================
+--- svx/source/msfilter/eschesdo.cxx	(revision 276159)
++++ svx/source/msfilter/eschesdo.cxx	(revision 276288)
+@@ -251,6 +251,19 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrO
+         // #i51348# shape name
+         if( aShapeName.Len() > 0 )
+             aPropOpt.AddOpt( ESCHER_Prop_wzName, aShapeName );
++        if ( InteractionInfo* pInteraction = mpHostAppData->GetInteractionInfo() )
++		{
++			const std::auto_ptr< SvMemoryStream >& pMemStrm = pInteraction->getHyperlinkRecord();
++			if ( pMemStrm.get() )
++			{
++				pMemStrm->ObjectOwnsMemory( FALSE );
++				sal_uInt8* pBuf = (sal_uInt8*) pMemStrm->GetData();
++				sal_uInt32 nSize = pMemStrm->Seek( STREAM_SEEK_TO_END );
++				aPropOpt.AddOpt( ESCHER_Prop_pihlShape, sal_False, nSize, pBuf, nSize );;       
++			}
++			if ( pInteraction->hasInteraction() )
++				aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x00080008 );       
++        }
+ 
+ 		if ( rObj.GetType().EqualsAscii( "drawing.Custom" ) )
+ 		{
+Index: svx/source/msfilter/mstoolbar.cxx
+===================================================================
+--- svx/source/msfilter/mstoolbar.cxx	(revision 0)
++++ svx/source/msfilter/mstoolbar.cxx	(revision 276288)
+@@ -0,0 +1,772 @@
++#include <svx/mstoolbar.hxx>
++#include <rtl/ustrbuf.hxx>
++#include <stdarg.h>
++#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
++#include <com/sun/star/ui/XImageManager.hpp>
++#include <com/sun/star/ui/ItemType.hpp>
++#include <com/sun/star/ui/ItemStyle.hpp>
++#include <com/sun/star/frame/XLayoutManager.hpp>
++#include <fstream>
++#include <vcl/graph.hxx>
++#include <vcl/bitmapex.hxx>
++#include <vcl/image.hxx>
++#include <map>
++#include <sfx2/objsh.hxx>
++#include <basic/basmgr.hxx>
++#include <svtools/filterutils.hxx>
++#include <boost/scoped_array.hpp>
++#include <svx/msvbahelper.hxx>
++#include <svtools/miscopt.hxx>
++#include <vcl/svapp.hxx>
++#include <vcl/window.hxx>
++
++using namespace com::sun::star;
++
++int TBBase::nIndent = 0;
++
++void CustomToolBarImportHelper::showToolbar( const rtl::OUString& rName )
++{
++    try
++    {
++        uno::Reference< frame::XController > xCntrller( mrDocSh.GetModel()->getCurrentController(), uno::UNO_QUERY_THROW );
++        uno::Reference< beans::XPropertySet > xProps( xCntrller->getFrame(), uno::UNO_QUERY_THROW );
++        uno::Reference< frame::XLayoutManager > xLayoutMgr( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LayoutManager") ) ), uno::UNO_QUERY_THROW );
++        xLayoutMgr->showElement( rName );
++    }
++    catch( uno::Exception& ) {}
++}
++
++void CustomToolBarImportHelper::ScaleImage( uno::Reference< graphic::XGraphic >& xGraphic, long nNewSize )
++{
++    Graphic aGraphic( xGraphic );
++    Size aSize = aGraphic.GetSizePixel();
++    if ( aSize.Height() && ( aSize.Height() == aSize.Width() ) )
++    {
++        Image aImage( xGraphic );
++        if ( aSize.Height() != nNewSize )
++        {
++            BitmapEx aBitmap = aImage.GetBitmapEx();
++            BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, nNewSize );
++            aImage = Image( aBitmapex);
++            xGraphic = aImage.GetXGraphic();
++        }
++    } 
++}
++
++void CustomToolBarImportHelper::applyIcons()
++{
++    for ( std::vector< iconcontrolitem >::iterator it = iconcommands.begin(); it != iconcommands.end(); ++it )
++    {
++        uno::Sequence< rtl::OUString > commands(1);
++        commands[ 0 ] = it->sCommand;
++        uno::Sequence< uno::Reference< graphic::XGraphic > > images(1);
++        images[ 0 ] = it->image;
++       
++        OSL_TRACE("About to applyIcons for command %s, have image ? %s", rtl::OUStringToOString( commands[ 0 ], RTL_TEXTENCODING_UTF8 ).getStr(), images[ 0 ].is() ? "yes" : "no" );
++        uno::Reference< ui::XImageManager > xImageManager( getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
++        sal_uInt16 nColor = ui::ImageType::COLOR_NORMAL; 
++
++        Window* topwin = Application::GetActiveTopWindow();
++	if ( topwin != NULL && topwin->GetDisplayBackground().GetColor().IsDark() )
++            nColor = css::ui::ImageType::COLOR_HIGHCONTRAST;
++
++        ScaleImage( images[ 0 ], 16 );
++        xImageManager->replaceImages( ui::ImageType::SIZE_DEFAULT | nColor,  commands, images );
++        ScaleImage( images[ 0 ], 26 );
++        xImageManager->replaceImages( ui::ImageType::SIZE_LARGE | nColor,  commands, images );
++    }
++}
++
++void CustomToolBarImportHelper::addIcon( const uno::Reference< graphic::XGraphic >& xImage, const rtl::OUString& sString )
++{
++    iconcontrolitem item;
++    item.sCommand = sString;
++    item.image = xImage;
++    iconcommands.push_back( item );
++}
++
++CustomToolBarImportHelper::CustomToolBarImportHelper( SfxObjectShell& rDocShell,  const css::uno::Reference< css::ui::XUIConfigurationManager>& rxAppCfgMgr ) : mrDocSh( rDocShell ) 
++{
++    m_xCfgSupp.set( mrDocSh.GetModel(), uno::UNO_QUERY_THROW );
++    m_xAppCfgMgr.set( rxAppCfgMgr, uno::UNO_QUERY_THROW );
++}
++
++uno::Reference< ui::XUIConfigurationManager > 
++CustomToolBarImportHelper::getCfgManager()
++{
++    return m_xCfgSupp->getUIConfigurationManager();
++}
++
++uno::Reference< ui::XUIConfigurationManager > 
++CustomToolBarImportHelper::getAppCfgManager()
++{
++    return m_xAppCfgMgr;
++}
++
++uno::Any 
++CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd )
++{
++//"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"    
++    static rtl::OUString scheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
++    static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document");
++    // create script url
++    rtl::OUString scriptURL = scheme + sCmd + part2;
++    return uno::makeAny( scriptURL );
++}
++
++rtl::OUString CustomToolBarImportHelper::MSOCommandToOOCommand( sal_Int16 msoCmd )
++{
++    rtl::OUString result;
++    if ( pMSOCmdConvertor.get() )
++        result = pMSOCmdConvertor->MSOCommandToOOCommand( msoCmd );
++    return result;
++}
++
++rtl::OUString CustomToolBarImportHelper::MSOTCIDToOOCommand( sal_Int16 msoTCID )
++{
++    rtl::OUString result;
++    if ( pMSOCmdConvertor.get() )
++        result = pMSOCmdConvertor->MSOTCIDToOOCommand( msoTCID );
++    return result;
++}
++
++void
++TBBase::indent_printf( FILE* fp, const char* format, ... )
++{
++   va_list ap;
++   va_start ( ap, format );
++
++   // indent nIndent spaces
++   for ( int i=0; i<nIndent; ++i)
++      fprintf(fp," ");
++   // append the rest of the message
++   vfprintf( fp, format, ap );
++   va_end( ap );
++}
++
++rtl::OUString TBBase::readUnicodeString( SvStream* pS, sal_Int32 nChars )
++{
++    sal_Int32 nBufSize = nChars * 2;
++    boost::scoped_array< sal_uInt8 > pArray( new sal_uInt8[ nBufSize ] );
++    pS->Read( pArray.get(), nBufSize );
++    return svt::BinFilterUtils::CreateOUStringFromUniStringArray(  reinterpret_cast< const char* >( pArray.get() ), nBufSize );
++}
++
++TBCHeader::TBCHeader() : bSignature( 0x3 )
++,bVersion( 0x01 )
++,bFlagsTCR( 0 )
++,tct(0x1) // default to Button
++,tcid(0)
++,tbct(0)
++{
++}
++
++
++TBCHeader::~TBCHeader()
++{
++}
++
++bool TBCHeader::Read( SvStream* pS )
++{
++    OSL_TRACE("TBCHeader::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> bSignature >> bVersion >> bFlagsTCR >> tct >> tcid >> tbct >> bPriority;
++    //  bit 4 ( from lsb ) 
++    if ( bFlagsTCR & 0x10 )
++    {
++        width.reset( new sal_uInt16 );
++        height.reset( new sal_uInt16 );
++        *pS >> *width >> *height;
++    }
++    return true;
++}
++
++void TBCHeader::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp,"[ 0x%x ] TBCHeader -- dump\n", nOffSet );
++    indent_printf(fp,"  bSignature 0x%x\n", bSignature );
++    indent_printf(fp,"  bVersion 0x%x\n", bVersion );
++    indent_printf(fp,"  bFlagsTCR 0x%x\n", bFlagsTCR );
++    indent_printf(fp,"  tct 0x%x\n", tct );
++    indent_printf(fp,"  tcid 0x%x\n", tcid );
++    indent_printf(fp,"  tbct 0x%x\n", static_cast< unsigned int >( tbct ));
++    indent_printf(fp,"  bPriority 0x%x\n", bPriority );
++    if ( width.get() )
++        indent_printf(fp,"  width 0x%d(0x%x)\n", *width, *width);
++    if ( height.get() )
++        indent_printf(fp,"  height 0x%d(0x%x)\n", *height, *height);
++}
++
++TBCData::TBCData( const TBCHeader& Header ) : rHeader( Header )
++{
++}
++
++bool TBCData::Read(SvStream *pS)
++{
++    OSL_TRACE("TBCData::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    if ( !controlGeneralInfo.Read(pS) /*|| !controlSpecificInfo.Read(pS)*/ )
++        return false;
++    switch ( rHeader.getTct() )
++    {
++        case 0x01: // (Button control)
++        case 0x10: // (ExpandingGrid control)
++            controlSpecificInfo.reset( new TBCBSpecific() );
++            break;
++        case 0x0A: // (Popup control)
++        case 0x0C: // (ButtonPopup control)
++        case 0x0D: // (SplitButtonPopup control)
++        case 0x0E: // (SplitButtonMRUPopup control)
++            controlSpecificInfo.reset( new TBCMenuSpecific() );
++            break;
++        case 0x02: // (Edit control)
++        case 0x04: // (ComboBox control)
++        case 0x14: // (GraphicCombo control)
++        case 0x03: // (DropDown control)
++        case 0x06: // (SplitDropDown control)
++        case 0x09: // (GraphicDropDown control)
++            controlSpecificInfo.reset( new TBCComboDropdownSpecific( rHeader ) );
++            break;
++        default:
++            break;
++    }
++    if ( controlSpecificInfo.get() )
++        return controlSpecificInfo->Read( pS );
++    //#FIXME I need to be able to handle different controlSpecificInfo types.
++    return true;
++}
++
++TBCMenuSpecific* TBCData::getMenuSpecific()
++{
++    TBCMenuSpecific* pMenu = dynamic_cast< TBCMenuSpecific* >( controlSpecificInfo.get() );
++    return pMenu;
++}
++bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vector< css::beans::PropertyValue >& props, bool& bBeginGroup, bool bIsMenuBar )
++{
++    sal_uInt16  nStyle = 0;
++    bBeginGroup = rHeader.isBeginGroup();
++    controlGeneralInfo.ImportToolBarControlData( helper, props );
++    beans::PropertyValue aProp;
++    aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ;
++    aProp.Value = uno::makeAny( rHeader.isVisible() ); // where is the visible attribute stored
++    props.push_back( aProp );
++    if ( rHeader.getTct() == 0x01
++    || rHeader.getTct() == 0x10 )
++    {
++        TBCBSpecific* pSpecificInfo = dynamic_cast< TBCBSpecific* >( controlSpecificInfo.get() );
++        if ( pSpecificInfo )
++        {
++            // if we have a icon then lets  set it for the command 
++            rtl::OUString sCommand;
++            for ( std::vector< css::beans::PropertyValue >::iterator it = props.begin(); it != props.end(); ++it )
++            {
++                if ( it->Name.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") ) ) )
++                    it->Value >>= sCommand;
++            }
++            if ( TBCBitMap* pIcon = pSpecificInfo->getIcon() )
++            {
++                // Without a command openoffice won't display the icon
++                if ( sCommand.getLength() )
++                {    
++                    BitmapEx aBitEx( pIcon->getBitMap() );
++                    if ( pSpecificInfo->getIconMask() )
++                         // according to the spec:
++                         // "the iconMask is white in all the areas in which the icon is
++                         // displayed as transparent and is black in all other areas."
++                         aBitEx = BitmapEx( aBitEx.GetBitmap(), pSpecificInfo->getIconMask()->getBitMap().CreateMask( Color( COL_WHITE ) ) );
++    
++                    Graphic aGraphic( aBitEx );
++                    helper.addIcon( aGraphic.GetXGraphic(), sCommand );
++                }
++            }
++            else if ( pSpecificInfo->getBtnFace() )
++            {
++               
++                rtl::OUString sBuiltInCmd = helper.MSOTCIDToOOCommand(  *pSpecificInfo->getBtnFace() );
++                if ( sBuiltInCmd.getLength() )
++                {
++                    uno::Sequence< rtl::OUString> sCmds(1);
++                    sCmds[ 0 ] = sBuiltInCmd;
++                    uno::Reference< ui::XImageManager > xImageManager( helper.getAppCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
++                    // 0 = default image size
++                    uno::Sequence< uno::Reference< graphic::XGraphic > > sImages = xImageManager->getImages( 0, sCmds );
++                    if ( sImages.getLength() && sImages[0].is() )
++                        helper.addIcon( sImages[0], sCommand );
++                }
++            }
++        }
++    }
++    else if ( rHeader.getTct() == 0x0a )
++    {
++        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") ) ;
++        aProp.Value = uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:" ) ) ); // dummy command
++        nStyle |= ui::ItemStyle::DROP_DOWN;
++        props.push_back( aProp );
++    }
++
++    short icontext =  ( rHeader.getTbct() & 0x03 );
++    aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Style") ) ;
++    if ( bIsMenuBar )
++    {
++        nStyle |= ui::ItemStyle::TEXT;
++        if ( !icontext || icontext == 0x3 )
++            // Text And image
++            nStyle |= ui::ItemStyle::ICON;
++    }
++    else 
++    {
++        if ( ( icontext & 0x02 ) == 0x02 )
++            nStyle |= ui::ItemStyle::TEXT;
++        if ( !icontext || ( icontext & 0x03 ) == 0x03 )
++            nStyle |= ui::ItemStyle::ICON;
++    }
++    aProp.Value <<= nStyle;
++    props.push_back( aProp );
++    return true; // just ignore
++}
++
++void TBCData::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp,"[ 0x%x ] TBCData -- dump\n", nOffSet );
++    indent_printf(fp,"  dumping controlGeneralInfo( TBCGeneralInfo )\n");
++    controlGeneralInfo.Print( fp );
++    //if ( rHeader.getTct() == 1 )
++    if ( controlSpecificInfo.get() )
++    {
++        indent_printf(fp,"  dumping controlSpecificInfo( TBCBSpecificInfo )\n");
++        controlSpecificInfo->Print( fp );
++    }
++}
++
++bool
++WString::Read( SvStream *pS )
++{
++    OSL_TRACE("WString::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    sal_Int8 nChars = 0;
++    *pS >> nChars;
++    sString = readUnicodeString( pS, static_cast< sal_Int32 >( nChars  ) );
++    return true;
++}
++
++TBCExtraInfo::TBCExtraInfo() : idHelpContext( 0 )
++{
++}
++
++bool
++TBCExtraInfo::Read( SvStream *pS )
++{
++    OSL_TRACE("TBCExtraInfo::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    if( !wstrHelpFile.Read( pS )  )
++        return false;
++
++    *pS >> idHelpContext;
++
++    if ( !wstrTag.Read( pS ) || !wstrOnAction.Read( pS ) || !wstrParam.Read( pS ) )
++        return false;
++
++    *pS >> tbcu >> tbmg;    
++    return true;
++}
++
++void
++TBCExtraInfo::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] TBCExtraInfo -- dump\n", nOffSet );
++    indent_printf( fp, "  wstrHelpFile %s\n", 
++        rtl::OUStringToOString( wstrHelpFile.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++    indent_printf( fp, "  idHelpContext 0x%x\n", static_cast< unsigned int >( idHelpContext ) );
++    indent_printf( fp, "  wstrTag %s\n", 
++        rtl::OUStringToOString( wstrTag.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++    indent_printf( fp, "  wstrOnAction %s\n", 
++        rtl::OUStringToOString( wstrOnAction.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++    indent_printf( fp, "  wstrParam %s\n", 
++        rtl::OUStringToOString( wstrParam.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++    indent_printf( fp, "  tbcu 0x%x\n", tbcu );
++    indent_printf( fp, "  tbmg 0x%x\n", tbmg );
++    
++}
++
++rtl::OUString
++TBCExtraInfo::getOnAction()
++{
++    return wstrOnAction.getString();
++}
++
++TBCGeneralInfo::TBCGeneralInfo() : bFlags( 0 )
++{
++}
++
++bool TBCGeneralInfo::Read( SvStream *pS )
++{
++    OSL_TRACE("TBCGeneralInfo::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> bFlags;
++
++    if ( ( bFlags & 0x1 ) && !customText.Read( pS ) )
++        return false;
++    if ( ( bFlags & 0x2 ) && ( !descriptionText.Read( pS ) ||  !tooltip.Read( pS ) ) )
++        return false;
++    if ( ( bFlags & 0x4 ) && !extraInfo.Read( pS ) )
++        return false;
++    return true;
++}
++
++void 
++TBCGeneralInfo::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] TBCGeneralInfo -- dump\n", nOffSet );
++    indent_printf( fp, "  bFlags 0x%x\n", bFlags );
++    indent_printf( fp, "  customText %s\n", 
++        rtl::OUStringToOString( customText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++    indent_printf( fp, "  description %s\n", 
++        rtl::OUStringToOString( descriptionText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++    indent_printf( fp, "  tooltip %s\n", 
++        rtl::OUStringToOString( tooltip.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++    if ( bFlags & 0x4 ) 
++        extraInfo.Print( fp );
++}
++
++bool 
++TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std::vector< beans::PropertyValue >& sControlData )
++{
++    if ( ( bFlags & 0x5 ) )
++    {
++        beans::PropertyValue aProp;
++        // probably access to the header would be a better test than seeing if there is an action, e.g.
++        // if ( rHeader.getTct() == 0x01 && rHeader.getTcID() == 0x01 ) // not defined, probably this is a command
++        if ( extraInfo.getOnAction().getLength() )
++        {
++            aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
++            ooo::vba::VBAMacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true );
++            if ( aMacroInf.IsResolved() )
++                aProp.Value = helper.createCommandFromMacro( aMacroInf.ResolvedMacro() );
++            else
++                aProp.Value <<= rtl::OUString::createFromAscii("UnResolvedMacro[").concat( extraInfo.getOnAction() ).concat( rtl::OUString::createFromAscii("]") );
++            sControlData.push_back( aProp );
++        }
++
++        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Label") );
++        aProp.Value = uno::makeAny( customText.getString().replace('&','~') );
++        sControlData.push_back( aProp );
++
++        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") );
++        aProp.Value = uno::makeAny( ui::ItemType::DEFAULT ); 
++        sControlData.push_back( aProp );
++
++        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Tooltip") );
++        aProp.Value = uno::makeAny( tooltip.getString() ); 
++        sControlData.push_back( aProp );
++/*
++aToolbarItem(0).Name = "CommandURL" wstrOnAction
++aToolbarItem(0).Value = Command
++aToolbarItem(1).Name = "Label"      customText
++aToolbarItem(1).Value = Label
++aToolbarItem(2).Name = "Type"
++aToolbarItem(2).Value = 0
++aToolbarItem(3).Name = "Visible"
++aToolbarItem(3).Value = true        
++*/
++    }
++    return true;
++}
++
++TBCMenuSpecific::TBCMenuSpecific() : tbid( 0 )
++{
++}
++
++bool
++TBCMenuSpecific::Read( SvStream *pS)
++{
++    OSL_TRACE("TBCMenuSpecific::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> tbid;
++    if ( tbid == 1 ) 
++    {
++        name.reset( new WString() );
++        return name->Read( pS );
++    }
++    return true;
++}
++
++void 
++TBCMenuSpecific::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] TBCMenuSpecific -- dump\n", nOffSet );
++    indent_printf( fp, "  tbid 0x%x\n", static_cast< unsigned int >( tbid ) );
++    if ( tbid == 1 )
++        indent_printf( fp, "  name %s\n", rtl::OUStringToOString( name->getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++
++}
++
++rtl::OUString TBCMenuSpecific::Name()
++{
++    rtl::OUString aName;
++    if ( name.get() )
++        aName = name->getString();
++    return aName;
++}
++TBCBSpecific::TBCBSpecific() : bFlags( 0 )
++{
++}
++
++bool TBCBSpecific::Read( SvStream *pS)
++{
++    OSL_TRACE("TBCBSpecific::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> bFlags;
++
++    // bFlags determines what we read next
++
++    // bFlags.fCustomBitmap = 1 ( 0x8 ) set 
++    if ( bFlags & 0x8 )
++    {
++        icon.reset( new TBCBitMap() );
++        iconMask.reset( new TBCBitMap() );
++        if ( !icon->Read( pS ) || !iconMask->Read( pS ) )
++            return false;
++    }
++    // if bFlags.fCustomBtnFace = 1 ( 0x10 )
++    if ( bFlags & 0x10 )
++    {
++        iBtnFace.reset( new sal_uInt16 );
++        *pS >> *iBtnFace.get();
++    }
++    // if bFlags.fAccelerator equals 1 ( 0x04 )
++    if ( bFlags & 0x04 )
++    {
++        wstrAcc.reset( new WString() );
++        return wstrAcc->Read( pS );
++    }
++    return true;
++}
++
++
++void TBCBSpecific::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] TBCBSpecific -- dump\n", nOffSet );
++    indent_printf( fp, "  bFlags 0x%x\n", bFlags );
++    bool bResult = ( icon.get() != NULL );
++    indent_printf( fp, "  icon present? %s\n", bResult ? "true" : "false" );
++    if ( bResult )
++    {
++        Indent b;
++        indent_printf( fp, "  icon: \n");
++        icon->Print( fp ); // will dump size
++    }
++    bResult = ( iconMask.get() != NULL );
++    indent_printf( fp, "  icon mask present? %s\n", bResult ? "true" : "false" );
++    if ( bResult )
++    {
++        Indent c;
++        indent_printf( fp, "  icon mask: \n");
++        iconMask->Print( fp ); // will dump size
++    }
++    if ( iBtnFace.get() )
++    {
++        indent_printf( fp, "  iBtnFace 0x%x\n", *(iBtnFace.get()) );
++    }
++    bResult = ( wstrAcc.get() != NULL );
++    indent_printf( fp, "  option string present? %s ->%s<-\n", bResult ? "true" : "false", bResult ? rtl::OUStringToOString( wstrAcc->getString(), RTL_TEXTENCODING_UTF8 ).getStr() : "N/A" );
++}
++
++TBCBitMap* 
++TBCBSpecific::getIcon()
++{
++    return icon.get();
++}
++
++TBCBitMap* 
++TBCBSpecific::getIconMask()
++{
++    return iconMask.get();
++}
++
++TBCComboDropdownSpecific::TBCComboDropdownSpecific(const TBCHeader& header ) 
++{
++    if ( header.getTcID() == 0x01 )
++        data.reset( new TBCCDData() );
++}
++
++bool TBCComboDropdownSpecific::Read( SvStream *pS)
++{
++    nOffSet = pS->Tell();
++    if ( data.get() )
++        return data->Read( pS );
++    return true;
++}
++
++void TBCComboDropdownSpecific::Print( FILE* fp)
++{
++    Indent a;
++    indent_printf(fp,"[ 0x%x ] TBCComboDropdownSpecific -- dump\n", nOffSet );
++    if ( data.get() )
++        data->Print( fp );
++    else
++        indent_printf(fp," no data " );
++}
++
++TBCCDData::TBCCDData() : cwstrItems( 0 )
++,iSel( 0 )
++,cLines( 0 )
++,dxWidth( 0 )
++{
++}
++
++TBCCDData::~TBCCDData()
++{
++}
++
++bool TBCCDData::Read( SvStream *pS)
++{
++    nOffSet = pS->Tell();
++    *pS >> cwstrItems;
++    if ( cwstrItems )
++    {
++        for( sal_Int32 index=0; index < cwstrItems; ++index )
++        {
++            WString aString;
++            if ( !aString.Read( pS ) )
++                return false;
++            wstrList.push_back( aString );
++        } 
++    }
++    *pS >> cwstrMRU >> iSel >> cLines >> dxWidth;
++
++    return wstrEdit.Read( pS );
++}
++
++void TBCCDData::Print( FILE* fp)
++{
++    Indent a;
++    indent_printf(fp,"[ 0x%x ] TBCCDData -- dump\n", nOffSet );
++    indent_printf(fp,"  cwstrItems items in wstrList 0x%d\n", cwstrItems);
++    for ( sal_Int32 index=0; index < cwstrItems; ++index )
++    {
++        Indent b;
++        indent_printf(fp, "  wstrList[%d] %s", static_cast< int >( index ), rtl::OUStringToOString( wstrList[index].getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++    }
++    indent_printf(fp,"  cwstrMRU num most recently used string 0x%d item\n", cwstrMRU);
++    indent_printf(fp,"  iSel index of selected item 0x%d item\n", iSel);
++    indent_printf(fp,"  cLines num of suggested lines to display 0x%d", cLines);
++    indent_printf(fp,"  dxWidth width in pixels 0x%d", dxWidth);
++    indent_printf(fp,"  wstrEdit %s", rtl::OUStringToOString( wstrEdit.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++}
++
++TBCBitMap::TBCBitMap() : cbDIB( 0 ), size( 0 )
++{
++}
++
++TBCBitMap::~TBCBitMap()
++{
++}
++
++// #FIXME Const-ness
++Bitmap& 
++TBCBitMap::getBitMap()
++{
++    return mBitMap;
++}
++
++bool TBCBitMap::Read( SvStream* pS)
++{
++    OSL_TRACE("TBCBitMap::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> cbDIB;
++    // cbDIB = sizeOf(biHeader) + sizeOf(colors) + sizeOf(bitmapData) + 10
++    return mBitMap.Read( *pS, FALSE, TRUE );
++}
++
++void TBCBitMap::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp, "[ 0x%x ] TBCBitMap -- dump\n", nOffSet );
++    indent_printf(fp, "  TBCBitMap size of bitmap data 0x%x\n", static_cast< unsigned int > ( cbDIB ) );
++}
++
++TB::TB() : bSignature(0x2),
++bVersion(0x1),
++cCL(0),
++ltbid( 0x1 ),
++ltbtr(0),
++cRowsDefault( 0 ),
++bFlags( 0 )
++{
++}
++
++bool TB::Read(SvStream *pS)
++{
++    OSL_TRACE("TB::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> bSignature >> bVersion >> cCL >> ltbid >> ltbtr >> cRowsDefault >> bFlags;
++    name.Read( pS );
++    return true;
++ 
++}
++
++bool TB::IsEnabled()
++{
++    return ( bFlags & 0x01 ) != 0x01;
++}
++
++bool TB::NeedsPositioning()
++{
++    return ( bFlags & 0x10 ) == 0x10;
++}
++
++void TB::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf(fp,"[ 0x%x ] TB -- dump\n", nOffSet );
++    indent_printf(fp,"  bSignature 0x%x\n", bSignature );
++    indent_printf(fp,"  bVersion 0x%x\n", bVersion );
++    indent_printf(fp,"  cCL 0x%x\n", cCL );
++    indent_printf(fp,"  ltbid 0x%x\n", ltbid );
++    indent_printf(fp,"  ltbtr 0x%x\n", ltbtr );
++    indent_printf(fp,"  cRowsDefault 0x%x\n", cRowsDefault );
++    indent_printf(fp,"  bFlags 0x%x\n", bFlags );
++    indent_printf(fp, "  name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++}
++
++TBVisualData::TBVisualData() : tbds(0), tbv(0), tbdsDock(0), iRow(0)
++{
++}
++
++bool TBVisualData::Read( SvStream* pS )
++{
++    OSL_TRACE("TBVisualData::Read() stream pos 0x%x", pS->Tell() );
++    nOffSet = pS->Tell();
++    *pS >> tbds >> tbv >> tbdsDock >> iRow;
++    rcDock.Read( pS );
++    rcFloat.Read( pS );
++    return true;
++}
++
++void SRECT::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "  left 0x%x\n", left);
++    indent_printf( fp, "  top 0x%x\n", top);
++    indent_printf( fp, "  right 0x%x\n", right);
++    indent_printf( fp, "  bottom 0x%x\n", bottom);
++}
++
++void TBVisualData::Print( FILE* fp )
++{
++    Indent a;
++    indent_printf( fp, "[ 0x%x ] TBVisualData -- dump\n", nOffSet );
++    indent_printf( fp, "  tbds 0x%x\n", tbds);
++    indent_printf( fp, "  tbv  0x%x\n", tbv);
++    indent_printf( fp, "  tbdsDoc  0x%x\n", tbdsDock);
++    indent_printf( fp, "  iRow  0x%x\n", iRow);
++    rcDock.Print( fp );
++    rcFloat.Print( fp );
++}
++
+Index: svx/source/msfilter/svxmsbas.cxx
+===================================================================
+--- svx/source/msfilter/svxmsbas.cxx	(revision 276159)
++++ svx/source/msfilter/svxmsbas.cxx	(revision 276288)
+@@ -53,6 +53,7 @@ using namespace com::sun::star::awt;
+ 
+ #include <com/sun/star/container/XNameContainer.hpp>
+ #include <com/sun/star/script/XLibraryContainer.hpp>
++#include <com/sun/star/script/ModuleInfo.hpp>
+ using namespace com::sun::star::container;
+ using namespace com::sun::star::script;
+ using namespace com::sun::star::uno;
+@@ -61,17 +62,45 @@ using namespace com::sun::star;
+ 
+ using rtl::OUString;
+ 
++static ::rtl::OUString sVBAOption( RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ); 
++
++void SvxImportMSVBasic::extractAttribute( const String& rAttribute, const String& rModName )
++{
++    // format of the attribute we are interested in is
++    // Attribute VB_Control = "ControlName", intString, MSForms, ControlTypeAsString
++    // e.g.
++    // Attribute VB_Control = "CommandButton1, 201, 19, MSForms, CommandButton"
++    String sControlAttribute( RTL_CONSTASCII_USTRINGPARAM("Attribute VB_Control = \"") );
++    if ( rAttribute.Search( sControlAttribute ) !=  STRING_NOTFOUND )
++    {
++        String sRest = rAttribute.Copy( sControlAttribute.Len() );
++        xub_StrLen nPos = 0; 
++        String sCntrlName = sRest.GetToken( 0, ',', nPos );
++        
++        sal_Int32 nCntrlId = sRest.GetToken( 0, ',', nPos).ToInt32();
++        m_ModuleNameToObjIdHash[ rModName ][ nCntrlId ] =  sCntrlName;
++    }
++}
+ int SvxImportMSVBasic::Import( const String& rStorageName,
+ 								const String &rSubStorageName,
+ 								BOOL bAsComment, BOOL bStripped )
+ {
++    std::vector< String > codeNames;
++    return Import(  rStorageName, rSubStorageName, codeNames, bAsComment, bStripped );
++}
++int SvxImportMSVBasic::Import( const String& rStorageName,
++								const String &rSubStorageName,
++								const std::vector< String >& codeNames,
++								BOOL bAsComment, BOOL bStripped )
++{
++        msProjectName = rtl::OUString();
+ 	int nRet = 0;
+-	if( bImport && ImportCode_Impl( rStorageName, rSubStorageName,
++	if( bImport && ImportCode_Impl( rStorageName, rSubStorageName, codeNames, 
+ 									bAsComment, bStripped ))
+ 		nRet |= 1;
+ 
+     if (bImport)
+-        ImportForms_Impl(rStorageName, rSubStorageName);
++        ImportForms_Impl(rStorageName, rSubStorageName, !bAsComment);
+ 
+ 	if( bCopy && CopyStorage_Impl( rStorageName, rSubStorageName ))
+ 		nRet |= 2;
+@@ -80,9 +109,44 @@ int SvxImportMSVBasic::Import( const String& rStor
+ }
+ 
+ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
+-    const String& rSubStorageName)
++    const String& rSubStorageName, BOOL bVBAMode )
+ {
+-    SvStorageRef xVBAStg(xRoot->OpenSotStorage(rStorageName,
++    BOOL bRet = FALSE;
++    // #FIXME VBA_Impl ( or some other new class ) should handle both userforms
++    // and code 
++	VBA_Impl aVBA( *xRoot, TRUE );
++    // This call is a waste we read the source ( again ) only to get the refereneces
++    // *AGAIN*, we really need to rewrite all of this
++    aVBA.Open( rStorageName, rSubStorageName ); 
++
++    bRet = ImportForms_Impl( aVBA, rStorageName, rSubStorageName, bVBAMode );
++	std::vector<rtl::OUString> sProjectRefs = aVBA.ProjectReferences();
++
++	for ( std::vector<rtl::OUString>::iterator it = sProjectRefs.begin(); it != sProjectRefs.end(); ++it )
++    {
++       rtl::OUString sFileName = *it;
++#ifndef WIN 
++#ifdef DEBUG
++       // hacky test code to read referenced projects on linux
++       sal_Int32 nPos = (*it).lastIndexOf('\\');
++       sFileName = (*it).copy( nPos + 1 );
++       sFileName =  rtl::OUString::createFromAscii("~/Documents/") + sFileName;
++#endif
++#endif
++       SotStorageRef rRoot = new SotStorage( sFileName, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
++	   VBA_Impl refVBA( *rRoot, TRUE );        
++       refVBA.Open( rStorageName, rSubStorageName );
++       // The return from ImportForms doesn't indicate and error ( it could )
++       // but also it just means no userforms were imported
++       if ( ImportForms_Impl( refVBA, rStorageName, rSubStorageName, bVBAMode ) )
++           bRet = true; // mark that at least on userform was imported
++    }
++    return bRet;
++}
++
++bool SvxImportMSVBasic::ImportForms_Impl( VBA_Impl& rVBA, const String& rStorageName, const String& rSubStorageName, BOOL bVBAMode )
++{
++    SvStorageRef xVBAStg(rVBA.GetStorage()->OpenSotStorage(rStorageName,
+         STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL));
+     if (!xVBAStg.Is() || xVBAStg->GetError())
+         return false;
+@@ -115,6 +179,10 @@ bool SvxImportMSVBasic::ImportForms_Impl(const Str
+         DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
+ 
+         String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
++
++        if (rVBA.ProjectName().getLength() )
++            aLibName = rVBA.ProjectName();
++        OSL_TRACE( "userformage lib name %s", rtl::OUStringToOString( aLibName, RTL_TEXTENCODING_UTF8 ).getStr() );
+         Reference<XNameContainer> xLib;
+         if (xLibContainer.is())
+         {
+@@ -164,7 +232,17 @@ bool SvxImportMSVBasic::ImportForms_Impl(const Str
+                     xSF->createInstance(
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.awt.UnoControlDialogModel"))), uno::UNO_QUERY);
+-
++                // #FIXME HACK - mark the Model with the VBA mode
++                // In vba mode the imported userform uses 100th mm as units
++                // or geometry 
++                // In non vba mode MAP_APPFONT is used ( same as normal basic
++                // dialogs
++                if ( bVBAMode )
++                {
++                    Reference<XPropertySet> xDlgProps(xDialog, UNO_QUERY); 
++                    if ( xDlgProps.is() )
++                        xDlgProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VBAForm") ), uno::makeAny( sal_True ) );
++                }
+                 OCX_UserForm aForm(xVBAStg, *aIter, *aIter, xDialog, xSF );
+                 aForm.pDocSh = &rDocSh;
+                 sal_Bool bOk = aForm.Read(xTypes);
+@@ -228,21 +306,53 @@ BOOL SvxImportMSVBasic::CopyStorage_Impl( const St
+ 
+ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
+ 										const String &rSubStorageName,
++										const std::vector< String >& codeNames,
+ 										BOOL bAsComment, BOOL bStripped )
+ {
+ 	BOOL bRet = FALSE;
+ 	VBA_Impl aVBA( *xRoot, bAsComment );
++        
+ 	if( aVBA.Open(rStorageName,rSubStorageName) )
+ 	{
++        msProjectName = aVBA.ProjectName();
++
++        if ( msProjectName.getLength() )
++            rDocSh.GetBasicManager()->SetName( msProjectName ); // set name of Project
++
++        bRet = ImportCode_Impl( aVBA, codeNames, bAsComment, bStripped );
++    	std::vector<rtl::OUString> sProjectRefs = aVBA.ProjectReferences();
++    
++    	for ( std::vector<rtl::OUString>::iterator it = sProjectRefs.begin(); it != sProjectRefs.end(); ++it )
++        {
++            rtl::OUString sFileName = *it;
++    		OSL_TRACE("referenced project %s ", rtl::OUStringToOString( sFileName, RTL_TEXTENCODING_UTF8 ).getStr() );
++            SotStorageRef rRoot = new SotStorage( sFileName, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
++    	    VBA_Impl refVBA( *rRoot, bAsComment );
++			std::vector< String > codeNamesNone;
++    	    if( refVBA.Open(rStorageName,rSubStorageName) && ImportCode_Impl( refVBA, codeNamesNone, bAsComment, bStripped ) )
++                bRet = TRUE; // mark that some code was imported
++        }
++    }
++    return bRet;
++}
++
++BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< String >& codeNames, BOOL bAsComment, BOOL bStripped )
++{
++        BOOL bRet = FALSE;
+ 		SFX_APP()->EnterBasicCall();
+         Reference<XLibraryContainer> xLibContainer = rDocSh.GetBasicContainer();
+ 		DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
+ 
+         UINT16 nStreamCount = aVBA.GetNoStreams();
+ 		Reference<XNameContainer> xLib;
++
++        String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
++
+         if( xLibContainer.is() && nStreamCount )
+         {
+-            String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
++            if ( aVBA.ProjectName().getLength() )
++                aLibName = aVBA.ProjectName();
++
+ 		    if( !xLibContainer->hasByName( aLibName ) )
+ 			    xLibContainer->createLibrary( aLibName );
+ 
+@@ -251,6 +361,25 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const Str
+         }
+ 		if( xLib.is() )
+ 		{
++            Reference< container::XNameAccess > xVBACodeNamedObjectAccess;
++			if ( !bAsComment )
++            {
++                rDocSh.GetBasicManager()->GetLib( aLibName )->SetVBAEnabled( true );
++                Reference< XMultiServiceFactory> xSF(rDocSh.GetModel(), UNO_QUERY);
++                if ( xSF.is() )
++                {
++                    try
++                    {
++                        xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), UNO_QUERY );
++                    }
++                    catch( Exception& ) { }
++                }
++            }
++            typedef  std::hash_map< rtl::OUString, uno::Any, ::rtl::OUStringHash,
++::std::equal_to< ::rtl::OUString > > NameModuleDataHash;
++
++            NameModuleDataHash moduleData;
++
+ 			for( UINT16 i=0; i<nStreamCount;i++)
+ 			{
+ 				StringArray aDecompressed = aVBA.Decompress(i);
+@@ -284,7 +413,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const Str
+                 // is the same as the encoding for the names
+                 // that are keys in the map used by GetModuleType method
+                 const String &sOrigVBAModName = aVBA.GetStreamName( i );
+-                ModuleType mType = aVBA.GetModuleType( sOrigVBAModName );
++                ModType mType = aVBA.GetModuleType( sOrigVBAModName );
+ 
+                 rtl::OUString sClassRem( RTL_CONSTASCII_USTRINGPARAM( "Rem Attribute VBA_ModuleType=" ) );
+ 
+@@ -292,23 +421,23 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const Str
+ 
+                 switch( mType )
+                 {
+-                    case Class:
++                    case ModuleType::Class:
+                         modeTypeComment = sClassRem +
+                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAClassModule\n" ) );
+                         break;
+-                    case Form:
++                    case ModuleType::Form:
+                         modeTypeComment = sClassRem +
+                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAFormModule\n" ) );
+                         break;
+-                    case Document:
++                    case ModuleType::Document:
+                         modeTypeComment = sClassRem +
+                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBADocumentModule\n" ) );
+                         break;
+-                    case Normal:
++                    case ModuleType::Normal:
+                         modeTypeComment = sClassRem +
+                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAModule\n" ) );
+                         break;
+-                    case Unknown:
++                    case ModuleType::Unknown:
+                         modeTypeComment = sClassRem +
+                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAUnknown\n" ) );
+                         break;
+@@ -316,12 +445,11 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const Str
+                         DBG_ERRORFILE( "SvxImportMSVBasic::ImportCode_Impl - unknown module type" );
+                         break;
+                 }
+-				static ::rtl::OUString sVBAOption( RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ); 
+ 				static ::rtl::OUString sClassOption( RTL_CONSTASCII_USTRINGPARAM( "Option ClassModule\n" ) ); 
+-				if ( !bAsComment )
++				if ( !bAsComment /*&& !rDocSh.GetBasic()->isVBAEnabled() */)
+ 				{
+ 					modeTypeComment = modeTypeComment + sVBAOption;
+-					if ( mType == Class )
++					if ( mType == ModuleType::Class )
+ 						modeTypeComment = modeTypeComment + sClassOption;
+ 
+ 				}
+@@ -369,9 +497,14 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const Str
+                             if( nEnd == STRING_NOTFOUND )
+                                 pStr->Erase();
+                             else
++                            {
++								//OSL_TRACE("Erase %s", rtl::OUStringToOString(*pStr, RTL_TEXTENCODING_UTF8 ).getStr() );
++                                String sAttr= pStr->Copy( nBegin, (nEnd-nBegin)+1);
++                                extractAttribute( sAttr, sModule );
+                                 pStr->Erase(nBegin, (nEnd-nBegin)+1);
+ 						}
+ 					}
++					}
+ 					if( aDecompressed.Get(j)->Len() )
+ 					{
+ 			            aSource+=::rtl::OUString( *aDecompressed.Get(j) );
+@@ -383,23 +516,78 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const Str
+ 						aSource += rtl::OUString::createFromAscii("\nEnd Sub");
+ 				}
+ 				::rtl::OUString aModName( sModule );
+-				if ( aSource.getLength() )
+-				{
+ 					aSource = modeTypeComment + aSource;
+ 
+ 					Any aSourceAny;
++                OSL_TRACE("erm %d", mType );
++                if (  !bAsComment )
++                {
++                    OSL_TRACE("vba processing  %d", mType );
++                    script::ModuleInfo sModuleInfo;
++                    sModuleInfo.ModuleName = aModName;
++                    sModuleInfo.ModuleSource = aSource;
++                    sModuleInfo.ModuleType = mType;
++                    aSourceAny <<= sModuleInfo;
++                }
++                else
+ 					aSourceAny <<= aSource;
+-					if( xLib->hasByName( aModName ) )
+-						xLib->replaceByName( aModName, aSourceAny );
+-					else
+-						xLib->insertByName( aModName, aSourceAny );
++                moduleData[ aModName ] = aSourceAny;
+ 				}                                
+ 
++            // Hack for missing codenames ( only know to happen in excel but... )
++            // only makes sense to do this if we are importing non-commented basic
++            if ( !bAsComment )
++            {
++                for ( std::vector< String >::const_iterator it =  codeNames.begin(); it != codeNames.end(); ++it )
++                {
++                    script::ModuleInfo sModuleInfo;
++                    sModuleInfo.ModuleName = *it;
++                    sModuleInfo.ModuleType = ModuleType::Document ;
++                    sModuleInfo.ModuleSource = sVBAOption;
++                    moduleData[ *it ] = uno::makeAny( sModuleInfo );
++                }
++            }
++            NameModuleDataHash::iterator it_end = moduleData.end();
++            for ( NameModuleDataHash::iterator it = moduleData.begin(); it != it_end; ++it )
++            {
++                script::ModuleInfo sModuleInfo;
++                if ( it->second >>=sModuleInfo )
++                {
++            
++                    if ( sModuleInfo.ModuleType == ModuleType::Form )
++                        // hack, the module ( imo document basic should...
++                        // know the XModel... ) but it doesn't
++                        sModuleInfo.ModuleObject.set( rDocSh.GetModel(), UNO_QUERY );
++                    //  document modules, we should be able to access
++			        //  the api objects at this time
++                    else if ( sModuleInfo.ModuleType == ModuleType::Document )
++			        {
++                        if ( xVBACodeNamedObjectAccess.is() )
++                        {
++                            try
++                            {
++                                sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );    
++                                OSL_TRACE("** Straight up creation of Module");
++                            }
++                            catch(uno::Exception& e)
++                            {
++    						    OSL_TRACE("Failed to get documument object for %s", rtl::OUStringToOString( sModuleInfo.ModuleName, RTL_TEXTENCODING_UTF8 ).getStr() );
++    					    }
++    				    }
++    			    }
++                    it->second = uno::makeAny( sModuleInfo );
++                }
++                     
++                if( xLib->hasByName( it->first ) )
++                    xLib->replaceByName( it->first, it->second );
++                else
++                    xLib->insertByName( it->first, it->second );
+ 				bRet = true;
+ 			}
++
+ 		}
++        if( bRet )
+ 		SFX_APP()->LeaveBasicCall();
+-	}
+ 	return bRet;
+ }
+ 
+Index: svx/source/msfilter/msvbasic.cxx
+===================================================================
+--- svx/source/msfilter/msvbasic.cxx	(revision 276159)
++++ svx/source/msfilter/msvbasic.cxx	(revision 276288)
+@@ -40,7 +40,802 @@
+ #include <osl/endian.h>
+ #include <rtl/tencinfo.h>   //rtl_getTextEncodingFromWindowsCodePage
+ #include "msvbasic.hxx"
++#include <fstream>
++#include <memory>
++#include <rtl/ustrbuf.hxx>
++#include <boost/shared_ptr.hpp>
++#include <boost/scoped_array.hpp>
++#include <boost/shared_array.hpp>
++#include <svtools/filterutils.hxx>
+ 
++using namespace ::com::sun::star::script;
++
++namespace MSLZSS {
++
++static unsigned int getShift( sal_uInt32 nPos )
++{
++    if (nPos <= 0x80) {
++        if (nPos <= 0x20)
++            return (nPos <= 0x10) ? 12 : 11;
++        else
++            return (nPos <= 0x40) ? 10 : 9;
++    } else {
++    if (nPos <= 0x200)
++        return (nPos <= 0x100) ? 8 : 7;
++    else if (nPos <= 0x800)
++        return (nPos <= 0x400) ? 6 : 5;
++    else
++        return 4;
++    }
++}
++
++SvMemoryStream *decompressAsStream( SvStream *pStream, sal_uInt32 nOffset, sal_uInt32 *pCompressedLength = NULL, sal_uInt32 *pLength = NULL )
++{
++    SvMemoryStream *pResult;
++    const sal_Int32 nWINDOWLEN = 4096;
++    pResult = new SvMemoryStream();
++
++    sal_uInt8 nLeadbyte;
++    unsigned int nPos = 0;
++    int nLen, nDistance, nShift, nClean=1;
++    sal_uInt8 aHistory[ nWINDOWLEN ];
++
++    pStream->Seek( nOffset + 3 );
++
++    while( pStream->Read( &nLeadbyte, 1 ) )
++    {
++        for(int nMask=0x01; nMask < 0x100; nMask = nMask<<1)
++        {
++            // we see if the leadbyte has flagged this location as a dataunit
++            // which is actually a token which must be looked up in the history
++            if( nLeadbyte & nMask )
++            {
++                sal_uInt16 nToken;
++            
++                *pStream >> nToken;
++    
++                if (nClean == 0)
++                    nClean=1;
++    
++                //For some reason the division of the token into the length
++                //field of the data to be inserted, and the distance back into
++                //the history differs depending on how full the history is
++                nShift = getShift( nPos % nWINDOWLEN );
++        
++                nLen = (nToken & ((1<<nShift) - 1)) + 3;
++                nDistance = nToken >> nShift;
++        
++                //read the len of data from the history, wrapping around the
++                //nWINDOWLEN boundary if necessary data read from the history
++                //is also copied into the recent part of the history as well.
++                for (int i = 0; i < nLen; i++)
++                {
++                    unsigned char c;
++                    c = aHistory[(nPos-nDistance-1) % nWINDOWLEN];
++                    aHistory[nPos % nWINDOWLEN] = c;
++                    nPos++;
++                }
++            }
++            else
++            {
++                // special boundary case code, not guarantueed to be correct
++                // seems to work though, there is something wrong with the
++                // compression scheme (or maybe a feature) where when the data
++                // ends on a nWINDOWLEN boundary and the excess bytes in the 8
++                // dataunit list are discarded, and not interpreted as tokens
++                // or normal data.
++                if ((nPos != 0) && ((nPos % nWINDOWLEN) == 0) && (nClean))
++                {
++                    pStream->SeekRel(2);
++                    nClean=0;
++                    pResult->Write( aHistory, nWINDOWLEN );
++                    break;
++                }
++                //This is the normal case for when the data unit is not a
++                //token to be looked up, but instead some normal data which
++                //can be output, and placed in the history.
++                if (pStream->Read(&aHistory[nPos % nWINDOWLEN],1))
++                    nPos++;
++                    
++                if (nClean == 0)
++                    nClean=1;
++            }
++        }
++    }
++    if (nPos % nWINDOWLEN)
++        pResult->Write( aHistory, nPos % nWINDOWLEN );
++    pResult->Flush();
++
++    if( pCompressedLength )
++        *pCompressedLength = nPos;
++    
++    if( pLength )
++        *pLength = pResult->Tell();
++
++    pResult->Seek( 0 );
++
++    return pResult;
++} 
++
++} //MSZSS
++
++// also _VBA_PROJECT_VDPI can be used to create a usable 
++// ( and much smaller ) "_VBA_PROJECT" stream
++
++// _VBA_PROJECT Stream Version Dependant Project Information
++// _VBA_PROJECT Stream Version Dependant Project Information
++
++class _VBA_PROJECT_VDPI
++{
++public:
++sal_Int16 Reserved1;
++sal_Int16 Version;
++sal_Int8 Reserved2;
++sal_Int16 Reserved3;
++boost::scoped_array< sal_uInt8 > PerformanceCache;
++sal_Int32 PerformanceCacheSize;
++_VBA_PROJECT_VDPI(): Reserved1( 0x61CC), Version( 0xFFFF ), Reserved2(0x0), Reserved3(0x0), PerformanceCacheSize(0) {}
++~_VBA_PROJECT_VDPI()
++{
++    PerformanceCacheSize = 0;
++}
++void read(){}
++void write( SvStream* pStream )
++{
++    *pStream << Reserved1 << Version << Reserved2 << Reserved3;
++    if ( PerformanceCacheSize )
++    {
++        PerformanceCache.reset( new sal_uInt8[ PerformanceCacheSize ] );
++        pStream->Read( PerformanceCache.get(), PerformanceCacheSize );
++    }
++}
++};
++
++class ProjectSysKindRecord
++{
++public:
++sal_Int16 Id;
++sal_Int32 Size;
++sal_Int32 SysKind;
++ProjectSysKindRecord(): Id(0x1), Size(0x4), SysKind( 0x1 ) {}
++void read( SvStream* pStream )
++{
++    *pStream >> Id >> Size >> SysKind;
++}
++};
++
++class ProjectLcidRecord
++{
++public:
++sal_Int16 Id;
++sal_Int32 Size;
++sal_Int32 Lcid;
++
++ProjectLcidRecord() : Id( 0x2 ), Size( 0x4 ), Lcid( 0x409 ) {}
++void read( SvStream* pStream )
++{
++    OSL_TRACE("ProjectLcidRecord [0x%x]", pStream->Tell() );
++    *pStream >> Id >> Size >> Lcid;
++}
++};
++
++class ProjectLcidInvokeRecord
++{
++sal_Int16 Id;
++sal_Int32 Size;
++sal_Int32 LcidInvoke;
++public:
++ProjectLcidInvokeRecord() : Id( 0x14 ), Size( 0x4 ), LcidInvoke( 0x409 ) {}
++void read( SvStream* pStream )
++{
++    OSL_TRACE("ProjectLcidInvokeRecord [0x%x]", pStream->Tell() );
++    *pStream >> Id >> Size >> LcidInvoke;
++}
++};
++
++class ProjectCodePageRecord
++{
++sal_Int16 Id;
++sal_Int32 Size;
++sal_Int16 CodePage;
++public:
++// #FIXME get a better default for the CodePage
++ProjectCodePageRecord() : Id( 0x03 ), Size( 0x2 ), CodePage( 0x0 ) {}
++void read( SvStream* pStream )
++{
++    OSL_TRACE("ProjectCodePageRecord [0x%x]", pStream->Tell() );
++    *pStream >> Id >> Size >> CodePage;
++}
++};
++class ProjectNameRecord
++{
++public:
++sal_Int16 Id;
++sal_Int32 SizeOfProjectName;
++rtl::OUString ProjectName;
++ProjectNameRecord() : Id( 0x04 ), SizeOfProjectName( 0x0 ){}
++~ProjectNameRecord()
++{
++}
++void read( SvStream* pStream )
++{
++    OSL_TRACE("ProjectNameRecord [0x%x]", pStream->Tell() );
++    *pStream >> Id >> SizeOfProjectName;
++
++    if ( SizeOfProjectName ) 
++    {
++        boost::scoped_array< sal_uInt8 > pProjectName( new sal_uInt8[ SizeOfProjectName ] );
++        OSL_TRACE("ProjectNameRecord about to read name from [0x%x], size %d", pStream->Tell(), SizeOfProjectName );
++        pStream->Read( pProjectName.get(), SizeOfProjectName );
++        ProjectName = svt::BinFilterUtils::CreateOUStringFromStringArray( reinterpret_cast< const char* >( pProjectName.get() ), SizeOfProjectName );
++    }
++}
++};
++
++class ProjectDocStringRecord
++{
++public:
++sal_Int16 Id;
++sal_Int32 SizeOfDocString;
++sal_Int16 Reserved;
++sal_Int32 SizeOfDocStringUnicode;
++rtl::OUString DocString;
++rtl::OUString DocStringUnicode; 
++
++ProjectDocStringRecord() : Id( 0x5 ), SizeOfDocString( 0x0 ), Reserved( 0x0 ), SizeOfDocStringUnicode( 0 ){}
++
++~ProjectDocStringRecord()
++{
++}
++void read( SvStream* pStream )
++{
++    OSL_TRACE("ProjectDocStringRecord [0x%x]", pStream->Tell() );
++    *pStream >> Id >> SizeOfDocString;
++
++
++    boost::scoped_array< sal_uInt8 > pDocString( new sal_uInt8[ SizeOfDocString ] );
++    pStream->Read( pDocString.get(), SizeOfDocString );
++ 
++    DocString = svt::BinFilterUtils::CreateOUStringFromStringArray( reinterpret_cast< const char* >( pDocString.get() ), SizeOfDocString );
++
++    *pStream >> Reserved >> SizeOfDocStringUnicode;
++
++    boost::scoped_array< sal_uInt8 > pDocStringUnicode( new sal_uInt8[ SizeOfDocStringUnicode ] );
++
++    pStream->Read( pDocStringUnicode.get(), SizeOfDocStringUnicode );
++    DocStringUnicode = svt::BinFilterUtils::CreateOUStringFromUniStringArray( reinterpret_cast< const char* >( pDocStringUnicode.get() ), SizeOfDocString );
++
++}
++
++};
++
++class ProjectHelpFilePath
++{
++public:
++sal_Int16 Id;
++sal_Int32 SizeOfHelpFile1;
++boost::scoped_array< sal_uInt8 > HelpFile1;
++sal_Int16 Reserved;
++sal_Int32 SizeOfHelpFile2;
++boost::scoped_array< sal_uInt8 > HelpFile2;
++
++ProjectHelpFilePath() : Id( 0x06 ), SizeOfHelpFile1(0), Reserved(0x0), SizeOfHelpFile2(0) {}
++~ProjectHelpFilePath()
++{
++}
++
++void read( SvStream* pStream )
++{
++    OSL_TRACE("ProjectHelpFilePath [0x%x]", pStream->Tell() );
++    *pStream >> Id >> SizeOfHelpFile1;
++
++    HelpFile1.reset( new sal_uInt8[ SizeOfHelpFile1 ] );
++    pStream->Read( HelpFile1.get(), SizeOfHelpFile1 );
++
++    *pStream >> Reserved >> SizeOfHelpFile2;
++
++    HelpFile2.reset( new sal_uInt8[ SizeOfHelpFile2 ] );
++    pStream->Read( HelpFile2.get(), SizeOfHelpFile2 );
++  
++}
++};
++
++class ProjectHelpContextRecord
++{
++public:
++sal_Int16 Id;
++sal_Int32 Size;    
++sal_Int32 HelpContext;    
++
++ProjectHelpContextRecord() : Id( 0x7 ), Size( 0x4 ), HelpContext( 0 ) {}
++void read( SvStream* pStream )
++{
++    
++   OSL_TRACE("ProjectHelpContextRecord [0x%x]", pStream->Tell() );
++   *pStream >> Id >> Size >> HelpContext;
++}
++
++};
++
++class ProjectLibFlagsRecord
++{
++sal_Int16 Id;
++sal_Int32 Size;
++sal_Int32 ProjectLibFlags;
++
++public:
++ProjectLibFlagsRecord() : Id( 0x8 ), Size( 0x4 ), ProjectLibFlags( 0x0 ) {}
++void read( SvStream* pStream ) 
++{
++    OSL_TRACE("ProjectLibFlagsRecord [0x%x]", pStream->Tell() );
++    *pStream >> Id >> Size >> ProjectLibFlags;
++}
++};
++
++class ProjectVersionRecord
++{
++public:
++sal_Int16 Id;
++sal_Int32 Reserved;
++sal_Int32 VersionMajor;
++sal_Int16 VersionMinor;
++ProjectVersionRecord() : Id( 0x9 ), Reserved( 0x4 ), VersionMajor( 0x1 ), VersionMinor( 0 ) {}
++void read( SvStream* pStream )
++{
++    OSL_TRACE("ProjectVersionRecord [0x%x]", pStream->Tell() );
++    *pStream >> Id >> Reserved >> VersionMajor >> VersionMinor;
++}
++};
++
++class ProjectConstantsRecord
++{
++sal_Int16 Id;
++sal_Int32 SizeOfConstants;
++boost::scoped_array< sal_uInt8 > Constants;
++sal_Int16 Reserved;
++sal_Int32 SizeOfConstantsUnicode;
++boost::scoped_array< sal_uInt8 > ConstantsUnicode;
++public:
++ProjectConstantsRecord() : Id( 0xC ), SizeOfConstants( 0 ), Constants( 0 ), Reserved( 0x3C ), SizeOfConstantsUnicode( 0 ), ConstantsUnicode(0) {}
++
++~ProjectConstantsRecord()
++{
++}
++
++void read( SvStream* pStream )
++{
++    OSL_TRACE("ProjectConstantsRecord [0x%x]", pStream->Tell() );
++   *pStream >> Id >> SizeOfConstants;
++    Constants.reset( new sal_uInt8[ SizeOfConstants ] );
++
++    pStream->Read( Constants.get(), SizeOfConstants );
++
++    *pStream >> Reserved;
++
++    *pStream >> SizeOfConstantsUnicode;
++
++    ConstantsUnicode.reset( new sal_uInt8[ SizeOfConstantsUnicode ] );
++    pStream->Read( ConstantsUnicode.get(), SizeOfConstantsUnicode );
++}
++
++};
++
++class ReferenceNameRecord
++{
++public:
++sal_Int16 Id;
++sal_Int32 SizeOfName;
++rtl::OUString Name;
++sal_Int16 Reserved;
++sal_Int32 SizeOfNameUnicode;
++rtl::OUString NameUnicode;
++
++ReferenceNameRecord() : Id( 0x16 ), SizeOfName( 0 ), Reserved( 0x3E ), SizeOfNameUnicode( 0 ){}
++~ReferenceNameRecord()
++{
++}
++
++void read( SvStream* pStream )
++{
++    OSL_TRACE("NameRecord [0x%x]", pStream->Tell() );
++    *pStream >> Id >> SizeOfName;
++ 
++    boost::scoped_array< sal_uInt8 > pName( new sal_uInt8[ SizeOfName ] );
++
++    pStream->Read( pName.get(), SizeOfName );
++    Name = svt::BinFilterUtils::CreateOUStringFromStringArray( reinterpret_cast< const char* >( pName.get() ), SizeOfName );
++
++    *pStream >> Reserved >> SizeOfNameUnicode;
++
++    boost::scoped_array< sal_uInt8 > pNameUnicode( new sal_uInt8[ SizeOfNameUnicode ] );
++    pStream->Read( pNameUnicode.get(), SizeOfNameUnicode );
++    NameUnicode = svt::BinFilterUtils::CreateOUStringFromUniStringArray( reinterpret_cast< const char* >( pNameUnicode.get() ), SizeOfName );
++}
++
++};
++
++// Baseclass for ReferenceControlRecord, ReferenceRegisteredRecord, ReferenceProjectRecord
++class DirDumper; 
++
++class BaseReferenceRecord 
++{
++public:
++virtual ~BaseReferenceRecord(){}
++virtual bool read( SvStream* pStream ) = 0;
++virtual void import( VBA_Impl& ){}
++};
++
++
++class ReferenceProjectRecord : public BaseReferenceRecord
++{
++public:
++    sal_uInt16 Id;
++    sal_uInt32 Size;
++    sal_uInt32 SizeOfLibidAbsolute;
++    sal_uInt32 SizeOfLibidRelative; 
++    sal_uInt32 MajorVersion;
++    sal_uInt16 MinorVersion;
++    rtl::OUString AbsoluteLibid; 
++    rtl::OUString RelativeLibid; 
++
++    virtual bool read( SvStream* pStream );
++    virtual void import( VBA_Impl& rDir );
++    ReferenceProjectRecord();
++    ~ReferenceProjectRecord();
++};
++
++ReferenceProjectRecord::ReferenceProjectRecord() : Id( 0x000E ), Size( 0 ), SizeOfLibidAbsolute( 0 ), SizeOfLibidRelative( 0 ), MajorVersion( 0 ), MinorVersion( 0 )
++{ 
++}
++
++ReferenceProjectRecord::~ReferenceProjectRecord()
++{
++}
++
++bool ReferenceProjectRecord::read( SvStream* pStream )
++{
++    OSL_TRACE("ReferenceProjectRecord [0x%x]", pStream->Tell() ); 
++    *pStream >> Id >> Size >> SizeOfLibidAbsolute;
++
++    boost::scoped_array< sal_uInt8 > pLibidAbsolute( new sal_uInt8[ SizeOfLibidAbsolute ] );
++    OSL_TRACE("ReferenceProjectRecord about to read LibidAbsolute at [0x%x]", pStream->Tell() );
++    pStream->Read( pLibidAbsolute.get(), SizeOfLibidAbsolute );
++
++    *pStream >> SizeOfLibidRelative; 
++
++    boost::scoped_array< sal_uInt8 > pLibidRelative( new sal_uInt8[ SizeOfLibidRelative ] );
++    OSL_TRACE("ReferenceProjectRecord about to read LibidRelative at [0x%x]", pStream->Tell() );
++    pStream->Read( pLibidRelative.get(), SizeOfLibidRelative );
++
++    *pStream >> MajorVersion >> MinorVersion;
++
++    // array size is ORed with SVX_MSOCX_COMPRESSED to force processing of ascii bytes ( and not 
++    // 16 bit unicode )
++    // the offset of 3 is needed to skip the ProjectReference "*\" and project kind ( 0x4[1-4] ) info.
++
++    AbsoluteLibid = svt::BinFilterUtils::CreateOUStringFromStringArray( reinterpret_cast< const char* >( pLibidAbsolute.get() + 3 ), (SizeOfLibidAbsolute - 3 ) );
++    RelativeLibid = svt::BinFilterUtils::CreateOUStringFromStringArray( reinterpret_cast< const char* >( pLibidRelative.get() + 3 ), ( SizeOfLibidRelative -3 ) );
++
++    OSL_TRACE("ReferenceProjectRecord - absolute path %s", rtl::OUStringToOString( AbsoluteLibid, RTL_TEXTENCODING_UTF8 ).getStr() );
++    OSL_TRACE("ReferenceProjectRecord - relative path %s", rtl::OUStringToOString( RelativeLibid, RTL_TEXTENCODING_UTF8 ).getStr() );
++    return true;
++}
++
++void ReferenceProjectRecord::import( VBA_Impl& rDir )
++{
++    rDir.AddProjectReference( AbsoluteLibid );
++}
++
++class ReferenceRegisteredRecord : public BaseReferenceRecord
++{
++public:
++    sal_uInt16 Id;
++    sal_uInt32 Size;
++    sal_uInt32 SizeOfLibid;
++    boost::scoped_array< sal_uInt8> pLibid;
++    sal_Int32 Reserved1;
++    sal_Int16 Reserved2;
++
++    ReferenceRegisteredRecord();
++    ~ReferenceRegisteredRecord();
++    bool read( SvStream* pStream );
++};
++
++ReferenceRegisteredRecord::ReferenceRegisteredRecord() : Id( 0x000D ), Size( 0 ), SizeOfLibid( 0 ), Reserved1( 0 ), Reserved2( 0 )
++{
++}
++
++ReferenceRegisteredRecord::~ReferenceRegisteredRecord()
++{
++}
++
++bool 
++ReferenceRegisteredRecord::read( SvStream* pStream )
++{
++    OSL_TRACE("ReferenceRegisteredRecord [0x%x]", pStream->Tell() ); 
++    *pStream >> Id >> Size >> SizeOfLibid;
++    if ( SizeOfLibid )
++    {
++        pLibid.reset( new sal_uInt8[ SizeOfLibid] );
++        pStream->Read( pLibid.get(), SizeOfLibid );
++    }
++    *pStream >> Reserved1 >> Reserved2;
++    return true;
++}
++
++class ReferenceOriginalRecord
++{
++public:
++    sal_uInt16 Id;
++    sal_uInt32 SizeOfLibOriginal;
++    boost::scoped_array< sal_uInt8 > pLibidOriginal;
++
++
++ReferenceOriginalRecord() : Id( 0x033 ), SizeOfLibOriginal( 0 )
++{
++}
++
++~ReferenceOriginalRecord()
++{
++}
++
++void read( SvStream* pStream )
++{
++    *pStream >> Id >> SizeOfLibOriginal;
++    if ( SizeOfLibOriginal )
++    {
++        pLibidOriginal.reset( new sal_uInt8[ SizeOfLibOriginal ] );
++        pStream->Read( pLibidOriginal.get(), SizeOfLibOriginal );
++    }
++}
++
++};
++
++class ReferenceControlRecord : public BaseReferenceRecord
++{
++public:
++std::auto_ptr< ReferenceOriginalRecord > OriginalRecord;
++sal_Int16 Id;
++sal_uInt32 SizeTwiddled;
++sal_uInt32 SizeOfLibidTwiddled;
++boost::shared_array< sal_uInt8 > LibidTwiddled;
++sal_uInt32 Reserved1;
++sal_uInt16 Reserved2;
++std::auto_ptr< ReferenceNameRecord > NameRecordExtended;// Optional
++sal_uInt16 Reserved3;
++sal_uInt32 SizeExtended;
++sal_uInt32 SizeOfLibidExtended;
++boost::shared_array< sal_uInt8 > LibidExtended;
++sal_uInt32 Reserved4;
++sal_uInt16 Reserved5;
++sal_uInt8  OriginalTypeLib[ 16 ];
++sal_uInt32 Cookie;
++
++ReferenceControlRecord() : Id( 0x2F ), SizeTwiddled( 0 ), SizeOfLibidTwiddled( 0 ), Reserved1( 0 ), Reserved2( 0 ), Reserved3( 0x30 ), SizeExtended( 0 ), SizeOfLibidExtended( 0 ), Reserved4( 0 ), Reserved5( 0 ), Cookie( 0 )
++{
++    for( int i = 0; i < 16; ++i )
++        OriginalTypeLib[ i ] = 0;
++}
++
++~ReferenceControlRecord()
++{
++}
++
++bool read( SvStream* pStream )
++{
++    OSL_TRACE("ReferenceControlRecord [0x%x]", pStream->Tell() ); 
++    long nPos = pStream->Tell();
++
++    *pStream >> Id;
++    pStream->Seek( nPos ); // point before the peeked Id
++    if ( Id == 0x33 ) // we have an OriginalRecord
++    {
++        OriginalRecord.reset( new ReferenceOriginalRecord() );
++        OriginalRecord->read( pStream );
++    }
++    *pStream >> Id >> SizeTwiddled >> SizeOfLibidTwiddled;
++
++    if ( SizeOfLibidTwiddled )
++    {
++        LibidTwiddled.reset( new sal_uInt8[ SizeOfLibidTwiddled ] );
++        pStream->Read( LibidTwiddled.get(),  SizeOfLibidTwiddled );
++    }
++
++    *pStream >> Reserved1 >> Reserved2;
++
++    nPos = pStream->Tell();
++    // peek at the id for optional NameRecord
++    sal_Int16 nTmpId;
++    *pStream >> nTmpId;
++    if ( nTmpId == 0x30 )
++    {
++        Reserved3 = 0x30;
++    }
++    else
++    {
++        pStream->Seek( nPos );
++        NameRecordExtended.reset( new ReferenceNameRecord() );
++        NameRecordExtended->read( pStream );
++        *pStream >> Reserved3;
++    }
++    *pStream >> SizeExtended >> SizeOfLibidExtended;
++
++    if ( SizeExtended )
++    {
++        LibidExtended.reset( new sal_uInt8[ SizeOfLibidExtended ] ); 
++        pStream->Read( LibidExtended.get(), SizeOfLibidExtended );
++    } 
++
++    *pStream >> Reserved4;
++    *pStream >> Reserved5;
++
++    pStream->Read( OriginalTypeLib, sizeof( OriginalTypeLib ) );
++    *pStream >> Cookie;
++    return true;
++}
++
++};
++
++class ReferenceRecord : public BaseReferenceRecord
++{
++public:
++// NameRecord is Optional
++std::auto_ptr< ReferenceNameRecord > NameRecord;
++std::auto_ptr< BaseReferenceRecord >  aReferenceRecord;
++
++ReferenceRecord(){}
++~ReferenceRecord()
++{
++}
++
++// false return would mean failed to read Record e.g. end of array encountered
++// Note: this read routine will make sure the stream is pointing to where it was the 
++// method was called ) 
++
++bool read( SvStream* pStream )
++{
++    OSL_TRACE("ReferenceRecord [0x%x]", pStream->Tell() );
++    bool bRead = true;
++    long nStart = pStream->Tell();
++    long nPos = nStart;
++    // Peek at the ID 
++    sal_Int16 Id;
++    *pStream >> Id;
++    pStream->Seek( nPos ); // place back before Id
++    if ( Id == 0x16 ) // Optional NameRecord
++    {
++        NameRecord.reset( new ReferenceNameRecord() );
++        NameRecord->read( pStream ); 
++    }
++    else if ( Id == 0x0f )
++    {
++        pStream->Seek( nStart );
++        bRead = false;
++        return bRead; // start of module, terminate read
++    }
++
++    nPos = pStream->Tell(); // mark position, peek at next Id
++    *pStream >> Id;
++    pStream->Seek( nPos ); // place back before Id
++
++    switch( Id )
++    {
++        case 0x0D:
++            aReferenceRecord.reset( new ReferenceRegisteredRecord() );
++            break; 
++        case 0x0E:
++            aReferenceRecord.reset( new ReferenceProjectRecord() );
++            break; 
++        case 0x2F:
++        case 0x33:
++            aReferenceRecord.reset( new ReferenceControlRecord() );
++            break; 
++        default:
++            bRead = false;
++            OSL_TRACE("Big fat error, unknown ID 0x%x", Id);
++            break;
++    } 
++    if ( bRead )
++        aReferenceRecord->read( pStream );
++    return bRead;
++}
++
++void import( VBA_Impl& rVBA )
++{
++    if ( aReferenceRecord.get() )
++        aReferenceRecord->import( rVBA );
++}
++
++};
++
++class DirDumper
++{
++public:
++ProjectSysKindRecord mSysKindRec;
++ProjectLcidRecord mLcidRec;
++ProjectLcidInvokeRecord mLcidInvokeRec;
++ProjectCodePageRecord mCodePageRec;
++ProjectNameRecord mProjectNameRec;
++ProjectDocStringRecord mDocStringRec;
++ProjectHelpFilePath mHelpFileRec;
++ProjectHelpContextRecord mHelpContextRec;
++ProjectLibFlagsRecord mLibFlagsRec;
++ProjectVersionRecord mVersionRec;
++ProjectConstantsRecord mConstantsRecord;
++std::vector< ReferenceRecord* > ReferenceArray;
++
++DirDumper() {}
++~DirDumper() 
++{
++    for ( std::vector< ReferenceRecord* >::iterator it = ReferenceArray.begin(); it != ReferenceArray.end(); ++it )
++        delete *it;
++    
++}
++
++void read( SvStream* pStream )
++{
++    sal_Int32 nPos = pStream->Tell();
++#ifdef DEBUG
++    std::ofstream aDump("dir.dump");
++    while ( !pStream->IsEof() ) 
++    {
++        sal_Int8 aByte;
++        *pStream >> aByte;
++        aDump << aByte;
++    }
++    aDump.flush();
++#endif
++    pStream->Seek( nPos );
++    readProjectInformation( pStream );
++    readProjectReferenceInformation( pStream );
++}
++
++void readProjectReferenceInformation( SvStream* pStream )
++{
++    bool bKeepReading = true;
++    while( bKeepReading )
++    {
++        ReferenceRecord* pRef = new ReferenceRecord();
++        bKeepReading = pRef->read( pStream );
++        if ( bKeepReading ) 
++            ReferenceArray.push_back( pRef );
++    }
++}
++
++void readProjectInformation( SvStream* pStream )
++{
++    mSysKindRec.read( pStream );
++    mLcidRec.read( pStream ); 
++    mLcidInvokeRec.read( pStream );
++    mCodePageRec.read( pStream );
++    mProjectNameRec.read( pStream );
++    mDocStringRec.read( pStream );
++    mHelpFileRec.read( pStream );
++    mHelpContextRec.read( pStream );
++    mLibFlagsRec.read( pStream );
++    mVersionRec.read( pStream ); 
++    sal_Int32 nPos = pStream->Tell();
++    sal_uInt16 nTmp;
++    *pStream >> nTmp;
++    if ( nTmp == 0x0C )
++    {
++        pStream->Seek( nPos );
++        mConstantsRecord.read( pStream );
++    }
++    OSL_TRACE("After Information pos is 0x%x", pStream->Tell() );
++}
++
++void import( VBA_Impl& rVBA )
++{
++    // get project references
++    for ( std::vector< ReferenceRecord* >::iterator it = ReferenceArray.begin(); it != ReferenceArray.end(); ++it )
++        (*it)->import( rVBA );
++    rVBA.SetProjectName( mProjectNameRec.ProjectName );
++    
++}
++};
++
++
+ /*
+ A few urls which may in the future be of some use
+ http://www.virusbtn.com/vb2000/Programme/papers/bontchev.pdf
+@@ -153,7 +948,21 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &r
+     xVBAProject = rxVBAStorage->OpenSotStream(
+                     String( RTL_CONSTASCII_USTRINGPARAM( "_VBA_PROJECT" ) ),
+ 					STREAM_STD_READ | STREAM_NOCREATE );
+-
++    // read Dir stream
++    SvStorageStreamRef xDir = rxVBAStorage->OpenSotStream(
++                    String( RTL_CONSTASCII_USTRINGPARAM( "dir" ) ),
++					STREAM_STD_READ | STREAM_NOCREATE );
++// disable read and import of Dir stream bits, e.g. project references and
++// project name for 3.1 ( a bit unstable yet )
++#if 1
++    // decompress the stream
++    std::auto_ptr< SvMemoryStream > xCmpDir;
++    xCmpDir.reset( MSLZSS::decompressAsStream( xDir, 0 ) );
++    // try to parse the dir stream
++    DirDumper dDump;
++    dDump.read( xCmpDir.get() );
++    dDump.import( *this );
++#endif
+ 	if( !xVBAProject.Is() || SVSTREAM_OK != xVBAProject->GetError() )
+ 	{
+ 		DBG_WARNING("Not able to find vba project, cannot find macros");
+@@ -432,7 +1241,7 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &r
+  *
+ */
+ 
+-ModuleType VBA_Impl::GetModuleType( const UniString& rModuleName )
++ModType VBA_Impl::GetModuleType( const UniString& rModuleName )
+ {
+     ModuleTypeHash::iterator iter = mhModHash.find( rModuleName );
+     ModuleTypeHash::iterator iterEnd = mhModHash.end();
+@@ -440,7 +1249,7 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &r
+     {
+         return iter->second;
+     }
+-    return Unknown;
++    return ModuleType::Unknown;
+ }
+ 
+ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel )
+@@ -453,6 +1262,7 @@ bool VBA_Impl::Open( const String &rToplevel, cons
+ 	if( !xMacros.Is() || SVSTREAM_OK != xMacros->GetError() )
+ 	{
+ 		DBG_WARNING("No Macros Storage");
++		OSL_TRACE("No Macros Storage");
+ 	}
+ 	else
+ 	{
+@@ -462,6 +1272,7 @@ bool VBA_Impl::Open( const String &rToplevel, cons
+ 		if( !xVBA.Is() || SVSTREAM_OK != xVBA->GetError() )
+ 		{
+ 			DBG_WARNING("No Visual Basic in Storage");
++			OSL_TRACE("No Visual Basic in Storage");
+ 		}
+ 		else
+ 		{
+@@ -476,6 +1287,7 @@ bool VBA_Impl::Open( const String &rToplevel, cons
+          * ( value ) is either a Class Module, Form Module or a plain VB Module.        */
+         SvStorageStreamRef xProject = xMacros->OpenSotStream(
+             String( RTL_CONSTASCII_USTRINGPARAM( "PROJECT" ) ) );
++
+         SvStorageStream* pStp = xProject;
+         UniString tmp;
+         static const String sThisDoc(   RTL_CONSTASCII_USTRINGPARAM( "ThisDocument" ) );
+@@ -483,7 +1295,7 @@ bool VBA_Impl::Open( const String &rToplevel, cons
+         static const String sClass(     RTL_CONSTASCII_USTRINGPARAM( "Class" ) );
+         static const String sBaseClass( RTL_CONSTASCII_USTRINGPARAM( "BaseClass" ) );
+         static const String sDocument(  RTL_CONSTASCII_USTRINGPARAM( "Document" ) );
+-        mhModHash[ sThisDoc ] = Class;
++        mhModHash[ sThisDoc ] = ModuleType::Class;
+         while ( pStp->ReadByteStringLine( tmp, meCharSet ) )
+         {
+             xub_StrLen index = tmp.Search( '=' );
+@@ -493,14 +1305,14 @@ bool VBA_Impl::Open( const String &rToplevel, cons
+                 String value = tmp.Copy( index + 1 );
+                 if ( key == sClass )
+                 {
+-                    mhModHash[ value ] = Class;
++                    mhModHash[ value ] = ModuleType::Class;
+                     OSL_TRACE("Module %s is of type Class",
+                         ::rtl::OUStringToOString( value ,
+                             RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+                 }
+                 else if ( key == sBaseClass )
+                 {
+-                    mhModHash[ value ] =  Form;
++                    mhModHash[ value ] =  ModuleType::Form;
+                     OSL_TRACE("Module %s is of type Form",
+                         ::rtl::OUStringToOString( value ,
+                             RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+@@ -513,14 +1325,14 @@ bool VBA_Impl::Open( const String &rToplevel, cons
+                     // value is of form <name>/&H<identifier>, strip the identifier
+                     value.Erase( value.Search( '/' ) );
+ 
+-                    mhModHash[ value ] = Document;
++                    mhModHash[ value ] = ModuleType::Document;
+                     OSL_TRACE("Module %s is of type Document VBA",
+                         ::rtl::OUStringToOString( value ,
+                             RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+                 }
+                 else if ( key == sModule )
+                 {
+-                    mhModHash[ value ] = Normal;
++                    mhModHash[ value ] = ModuleType::Normal;
+                     OSL_TRACE("Module %s is of type Normal VBA",
+                         ::rtl::OUStringToOString( value ,
+                             RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+Index: svx/source/msfilter/msvbahelper.cxx
+===================================================================
+--- svx/source/msfilter/msvbahelper.cxx	(revision 0)
++++ svx/source/msfilter/msvbahelper.cxx	(revision 276288)
+@@ -0,0 +1,383 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#include <svx/msvbahelper.hxx>
++#include <basic/sbx.hxx>
++#include <basic/sbstar.hxx>
++#include <basic/basmgr.hxx>
++#include <basic/sbmod.hxx>
++#include <basic/sbmeth.hxx>
++#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
++#include <com/sun/star/document/XDocumentProperties.hpp>
++#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
++#include <tools/urlobj.hxx>
++#include <osl/file.hxx>
++
++using namespace ::com::sun::star;
++
++const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
++const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "?language=Basic&location=document"); 
++
++namespace ooo { namespace vba {
++
++String makeMacroURL( const String& sMacroName )
++{
++	return sUrlPart0.concat( sMacroName ).concat( sUrlPart1 ) ;
++}
++
++SfxObjectShell* findShellForUrl( const rtl::OUString& sMacroURLOrPath )
++{
++    SfxObjectShell* pFoundShell=NULL;
++    SfxObjectShell* pShell = SfxObjectShell::GetFirst();
++    INetURLObject aObj;
++    aObj.SetURL( sMacroURLOrPath );
++    bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
++    rtl::OUString aURL;
++    if ( bIsURL )
++        aURL = sMacroURLOrPath;
++    else
++    {
++        osl::FileBase::getFileURLFromSystemPath( sMacroURLOrPath, aURL );
++        aObj.SetURL( aURL );
++    }    
++    OSL_TRACE("Trying to find shell for url %s", rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() );
++    while ( pShell )
++    {
++
++        uno::Reference< frame::XModel > xModel = pShell->GetModel();
++        // are we searching for a template? if so we have to cater for the
++        // fact that in openoffice a document opened from a template is always
++        // a new document :/
++        if ( xModel.is() )
++        {
++            OSL_TRACE("shell 0x%x has model with url %s and we look for %s", pShell
++                , rtl::OUStringToOString( xModel->getURL(), RTL_TEXTENCODING_UTF8 ).getStr() 
++                , rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() 
++            );
++            if ( sMacroURLOrPath.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) )
++            {
++                uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( xModel, uno::UNO_QUERY );
++                if( xDocInfoSupp.is() )
++                {
++                    uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
++                    uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
++                    rtl::OUString sCurrName = xDocProps->getTemplateName();
++                    if( sMacroURLOrPath.lastIndexOf( sCurrName ) >= 0 )
++                    {
++                        pFoundShell = pShell; 
++                        break;
++                    }
++                }
++            }
++            else
++            {
++                if ( aURL.equals( xModel->getURL() ) )
++                {
++                    pFoundShell = pShell; 
++                    break;
++                }
++            }
++        }
++        pShell = SfxObjectShell::GetNext( *pShell );
++    }
++    return pFoundShell;
++}
++
++// sMod can be empty ( but we really need the library to search in )
++// if sMod is empty and a macro is found then sMod is updated
++bool hasMacro( SfxObjectShell* pShell, const String& sLibrary, String& sMod, const String& sMacro )
++{
++    bool bFound = false;
++    if ( sLibrary.Len() && sMacro.Len() )
++    {
++        OSL_TRACE("** Searching for %s.%s in library %s"
++            ,rtl::OUStringToOString( sMod, RTL_TEXTENCODING_UTF8 ).getStr()
++            ,rtl::OUStringToOString( sMacro, RTL_TEXTENCODING_UTF8 ).getStr()
++            ,rtl::OUStringToOString( sLibrary, RTL_TEXTENCODING_UTF8 ).getStr() );
++        BasicManager* pBasicMgr = pShell-> GetBasicManager();
++        if ( pBasicMgr )
++        {
++            StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
++            if ( !pBasic )
++            {
++                USHORT nId = pBasicMgr->GetLibId( sLibrary );
++                pBasicMgr->LoadLib( nId );
++                pBasic = pBasicMgr->GetLib( sLibrary );
++            }
++            if ( pBasic )
++            {
++                if ( sMod.Len() ) // we wish to find the macro is a specific module
++                {
++                    SbModule* pModule = pBasic->FindModule( sMod );
++                    if ( pModule )
++                    {
++                        SbxArray* pMethods = pModule->GetMethods();
++                        if ( pMethods )
++                        {
++                            SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
++                            if ( pMethod )
++                              bFound = true;
++                        }
++                    }
++                }
++                else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
++                {
++                    if( SbModule* pModule = pMethod->GetModule() )
++                    {
++                        sMod = pModule->GetName();
++                        bFound = true;
++                    }
++                }
++            }
++        }
++    }
++    return bFound;
++}
++void parseMacro( const rtl::OUString& sMacro, String& sContainer, String& sModule, String& sProcedure )
++{
++    sal_Int32 nMacroDot = sMacro.lastIndexOf( '.' );
++    
++    if ( nMacroDot != -1 )
++    {
++        sProcedure = sMacro.copy( nMacroDot + 1 );
++ 
++        sal_Int32 nContainerDot = sMacro.lastIndexOf( '.',  nMacroDot - 1 );
++        if ( nContainerDot != -1 )
++        {
++            sModule = sMacro.copy( nContainerDot + 1, nMacroDot - nContainerDot - 1 );
++            sContainer = sMacro.copy( 0, nContainerDot );
++        }
++        else
++            sModule = sMacro.copy( 0, nMacroDot );
++    }
++    else
++       sProcedure = sMacro;
++}
++
++VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& MacroName, bool bSearchGlobalTemplates )
++{
++    VBAMacroResolvedInfo aRes;
++    if ( !pShell )
++        return aRes;
++    aRes.SetMacroDocContext( pShell );
++    // parse the macro name
++    sal_Int32 nDocSepIndex = MacroName.indexOfAsciiL( "!", 1 );
++    String sMacroUrl = MacroName;
++
++    String sContainer;
++    String sModule;
++    String sProcedure;
++    
++    if( nDocSepIndex > 0 )
++    {
++        // macro specified by document name
++        // find document shell for document name and call ourselves 
++        // recursively
++
++        // assume for now that the document name is *this* document
++        String sDocUrlOrPath = MacroName.copy( 0, nDocSepIndex );
++        sMacroUrl = MacroName.copy( nDocSepIndex + 1 );
++        OSL_TRACE("doc search, current shell is 0x%x", pShell );
++        SfxObjectShell* pFoundShell = findShellForUrl( sDocUrlOrPath );
++        OSL_TRACE("doc search, after find, found shell is 0x%x", pFoundShell );
++        aRes = resolveVBAMacro( pFoundShell, sMacroUrl ); 
++    }    
++    else
++    {
++        // macro is contained in 'this' document ( or code imported from a template
++        // where that template is a global template or perhaps the template this
++        // document is created from ) 
++    
++        // macro format = Container.Module.Procedure
++        parseMacro( MacroName, sContainer, sModule, sProcedure ); 
++        uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY);
++        uno::Reference< container::XNameContainer > xPrjNameCache;
++        if ( xSF.is() )
++            xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY );
++    
++        std::vector< rtl::OUString > sSearchList; 
++
++        if ( sContainer.Len() > 0 )
++        { 
++            // get the Project associated with the Container
++            if ( xPrjNameCache.is() )
++            {
++                if ( xPrjNameCache->hasByName( sContainer ) )
++                {
++                    rtl::OUString sProject;
++                    xPrjNameCache->getByName( sContainer ) >>= sProject;
++                    sContainer = sProject;
++                }
++            }
++            sSearchList.push_back( sContainer ); // First Lib to search
++        }
++        else
++        {
++            // Ok, if we have no Container specified then we need to search them in order, this document, template this document created from, global templates, 
++            // get the name of Project/Library for 'this' document
++            rtl::OUString sThisProject;
++            BasicManager* pBasicMgr = pShell-> GetBasicManager();
++            if ( pBasicMgr )
++            {
++                if ( pBasicMgr->GetName().Len() )
++                   sThisProject = pBasicMgr->GetName();
++                else // cater for the case where VBA is not enabled
++                   sThisProject = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") );
++            }
++            sSearchList.push_back( sThisProject ); // First Lib to search
++            if ( xPrjNameCache.is() )
++            {
++                // is this document created from a template?
++                uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( pShell->GetModel(), uno::UNO_QUERY_THROW );
++                uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
++                uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
++            
++                rtl::OUString sCreatedFrom = xDocProps->getTemplateURL();
++                if ( sCreatedFrom.getLength() )
++                {
++                    INetURLObject aObj;
++                    aObj.SetURL( sCreatedFrom );
++                    bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
++                    rtl::OUString aURL;
++                    if ( bIsURL )
++                        aURL = sCreatedFrom;
++                    else
++                    {
++                        osl::FileBase::getFileURLFromSystemPath( sCreatedFrom, aURL );
++                        aObj.SetURL( aURL );
++                    }        
++                    sCreatedFrom =  aObj.GetLastName();
++                } 
++                
++                sal_Int32 nIndex =  sCreatedFrom.lastIndexOf( '.' );
++                if ( nIndex != -1 )
++                    sCreatedFrom = sCreatedFrom.copy( 0, nIndex );
++        
++                rtl::OUString sPrj;
++                if ( sCreatedFrom.getLength() && xPrjNameCache->hasByName( sCreatedFrom ) )
++                {
++                    xPrjNameCache->getByName( sCreatedFrom ) >>= sPrj;
++                    // Make sure we don't double up with this project
++                    if ( !sPrj.equals( sThisProject ) )
++                        sSearchList.push_back( sPrj );
++                }
++        
++                // get list of global template Names
++                uno::Sequence< rtl::OUString > sTemplateNames = xPrjNameCache->getElementNames();
++                sal_Int32 nLen = sTemplateNames.getLength();
++                for ( sal_Int32 index = 0; ( bSearchGlobalTemplates && index < nLen ); ++index )
++                {
++                    
++                    if ( !sCreatedFrom.equals( sTemplateNames[ index ] ) )
++                    {
++                        if ( xPrjNameCache->hasByName( sTemplateNames[ index ] ) )
++                        {
++                            xPrjNameCache->getByName( sTemplateNames[ index ] ) >>= sPrj;
++                            // Make sure we don't double up with this project
++                            if ( !sPrj.equals( sThisProject ) )
++                                sSearchList.push_back( sPrj );
++                        }
++                    }
++        
++                }
++            }
++        }
++        std::vector< rtl::OUString >::iterator it_end = sSearchList.end();
++        for ( std::vector< rtl::OUString >::iterator it = sSearchList.begin(); it != it_end; ++it )
++        {
++            bool bRes = hasMacro( pShell, *it, sModule, sProcedure );
++            if ( bRes )
++            {
++                aRes.SetResolved( true );
++                aRes.SetMacroDocContext( pShell );
++                sContainer = *it;
++                break;
++            }
++        }
++    }
++    aRes.SetResolvedMacro( sProcedure.Insert( '.', 0 ).Insert( sModule, 0).Insert( '.', 0 ).Insert( sContainer, 0 ) );
++
++    return aRes;
++}
++
++// Treat the args as possible inouts ( convertion at bottom of method )
++sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& /*aRet*/, const uno::Any& aCaller )
++{
++    sal_Bool bRes = sal_False;
++    if ( !pShell )
++        return bRes;
++    rtl::OUString sUrl = makeMacroURL( sMacroName );
++
++    uno::Sequence< sal_Int16 > aOutArgsIndex;
++    uno::Sequence< uno::Any > aOutArgs;
++
++    try
++    {    
++        uno::Reference< script::provider::XScriptProvider > xScriptProvider;
++        uno::Reference< script::provider::XScriptProviderSupplier > xSPS( pShell->GetModel(), uno::UNO_QUERY_THROW );
++
++        xScriptProvider.set( xSPS->getScriptProvider(), uno::UNO_QUERY_THROW );
++
++        uno::Reference< script::provider::XScript > xScript( xScriptProvider->getScript( sUrl ), uno::UNO_QUERY_THROW );
++
++        if ( aCaller.hasValue() )
++        {
++            uno::Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY );
++            if ( xProps.is() )
++            {
++                uno::Sequence< uno::Any > aCallerHack(1);
++                aCallerHack[ 0 ] = aCaller;
++                xProps->setPropertyValue( rtl::OUString::createFromAscii( "Caller" ), uno::makeAny( aCallerHack ) );
++            }
++        }
++
++
++        xScript->invoke( aArgs, aOutArgsIndex, aOutArgs  );
++        
++        sal_Int32 nLen = aOutArgs.getLength();
++        // convert any out params to seem like they were inouts
++        if ( nLen )
++        {
++            for ( sal_Int32 index=0; index < nLen; ++index )
++            {
++                sal_Int32 nOutIndex = aOutArgsIndex[ index ];
++                aArgs[ nOutIndex ] = aOutArgs[ index ];
++           }
++        }
++
++        bRes = sal_True;
++    }
++    catch ( uno::Exception& e )
++    {
++       bRes = sal_False;
++    }
++    return bRes; 
++}
++} } // vba // ooo
+Index: svx/source/msfilter/msocximex.cxx
+===================================================================
+--- svx/source/msfilter/msocximex.cxx	(revision 276159)
++++ svx/source/msfilter/msocximex.cxx	(revision 276288)
+@@ -49,6 +49,10 @@
+ #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
+ #include <com/sun/star/form/XFormsSupplier.hpp>
+ #include <com/sun/star/form/XForm.hpp>
++#include <com/sun/star/form/binding/XBindableValue.hpp>
++#include <com/sun/star/form/binding/XValueBinding.hpp>
++#include <com/sun/star/form/binding/XListEntrySink.hpp>
++#include <com/sun/star/form/binding/XListEntrySource.hpp>
+ #include <com/sun/star/form/FormComponentType.hpp>
+ #include <com/sun/star/awt/FontWeight.hpp>
+ #include <com/sun/star/awt/FontSlant.hpp>
+@@ -79,7 +83,22 @@
+ 
+ #include <algorithm>
+ #include <memory>
++#include <com/sun/star/graphic/GraphicObject.hpp>
++#include <com/sun/star/graphic/XGraphicProvider.hpp>
++#include <com/sun/star/graphic/XGraphic.hpp>
++#include <com/sun/star/io/XInputStream.hpp>
++#include <comphelper/componentcontext.hxx>
++#include <unotools/streamwrap.hxx>
+ 
++#include <com/sun/star/beans/NamedValue.hpp>
++#include <com/sun/star/table/XCellRange.hpp>
++#include <com/sun/star/table/CellRangeAddress.hpp>
++#include <com/sun/star/table/CellAddress.hpp>
++#include <com/sun/star/sheet/XSpreadsheetView.hpp>
++#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
++#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
++#include <svtools/filterutils.hxx>
++ 
+ #ifndef C2S
+ #define C2S(cChar)	String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
+ #endif
+@@ -102,6 +121,7 @@ using namespace cppu;
+ 
+ 
+ #define WW8_ASCII2STR(s) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(s))
++#define GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
+ 
+ 
+ static char sWW8_form[] = "WW-Standard";
+@@ -130,127 +150,49 @@ long ReadAlign(SvStorageStream *pS, long nPos, int
+     return 0;
+ }
+ 
+-
+ // NP - Images in controls in OO2.0/SO8 exist as links, e.g. they are not part of the document so are
+ // referenced externally. On import from ms document try to save images for controls here.
+ // Images are stored in directory called temp in the user installation directory. Next version of OO/SO
+ // hopefully will address this issue and allow a choice e.g. images for controls to be stored as links
+ // or embeded in the document.
+-
+-// [out]location     path to the stream to where the image is to be stored,
+-//               if same name exists in folder then this function calcuates a new name
+-// [in] data     raw bytes of image to be stored.
+-// [in] dataLen  no. byte to be stored
+-//
+-// returns, true if successful
+-
+-bool storePictureInFileSystem( OUString& location, sal_uInt8* data, sal_uInt32 dataLen )
++uno::Reference< graphic::XGraphicObject> lcl_readGraphicObject( SotStorageStream *pS )
+ {
+-    bool result = true;
+-    OUString origPath = location;
++	uno::Reference< graphic::XGraphicObject > xGrfObj;
++	uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
++	if( xServiceManager.is() )
++	{
+     try
+     {
+-        uno::Reference<lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(),
+-                                                      uno::UNO_QUERY_THROW );
+-        uno::Reference< com::sun::star::ucb::XSimpleFileAccess> xSFA( xMSF->createInstance(
+-                                                       S2U("com.sun.star.ucb.SimpleFileAccess" ) ),
+-                                                       uno::UNO_QUERY_THROW );
+-        OUString ext;
+-        sal_Int32 index = 0;
+-        while (  xSFA->exists( location ) )
++			// use the GraphicProvider service to get the XGraphic
++			uno::Reference< graphic::XGraphicProvider > xGraphProvider(
++					xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ), uno::UNO_QUERY );
++			if( xGraphProvider.is() )
+         {
+-            ext = OUString::valueOf( ++index );
+-            location = origPath + ext;
+-        }
+-
+-        SvStream*  pStream = ::utl::UcbStreamHelper::CreateStream( location, STREAM_WRITE | STREAM_TRUNC );
+-        if ( pStream )
++				uno::Reference< io::XInputStream > xStream( new utl::OInputStreamWrapper( *pS ) );
++				if( xStream.is() )
+         {
+-            pStream->Write(data, dataLen);
+-            delete pStream;
+-        }
+-        else
++					uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
++					aMediaProps[0].Name = ::rtl::OUString::createFromAscii( "InputStream" );
++					aMediaProps[0].Value <<= xStream;
++					uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps );
++					if( xGraphic.is() )
+         {
+-            result = false;
++						// create an XGraphicObject
++						::comphelper::ComponentContext aContext( xServiceManager );
++						xGrfObj = graphic::GraphicObject::create( aContext.getUNOContext() );
++						xGrfObj->setGraphic(xGraphic);
+         }
+     }
+-    catch( uno::Exception& )
+-    {
+-        result = false;
+     }
+-    return result;
+ }
+-
+-// NP - Images in controls in OO2.0/SO8 exist as links, e.g. they are not part of the document so are
+-// referenced externally. On import from ms document try to save images from controls here so this
+-// at least a macro programmer has a chance to accessed them manually later. Next version of OO/SO
+-// hopefully will address this issue.
+-// Images will be stored in a top level folder in the document package, folder is named "MigratedImages"
+-
+-// [in] pDocSh*  the document shell.
+-// [in] name     name of stream image to stored in.
+-// [in] data     raw bytes of image to be stored.
+-// [in] dataLen  no. byte to be stored
+-
+-bool storePictureInDoc( SfxObjectShell* pDocSh, OUString& name, sal_uInt8* data, sal_uInt32 dataLen )
+-{
+-    uno::Reference < embed::XStorage > xStor;
+-    if (pDocSh)
+-    {
+-        xStor = pDocSh->GetStorage();
+-        if( xStor.is() )
+-        {
+-            try
+-            {
+-                uno::Reference< embed::XStorage > xPictures = xStor->openStorageElement(
+-                    OUString( RTL_CONSTASCII_USTRINGPARAM( "MigratedImages" ) ),
+-                    embed::ElementModes::READWRITE );
+-                uno::Reference< beans::XPropertySet > xPropSet( xPictures, uno::UNO_QUERY );
+-
+-                // Set media type of folder MigratedImages to something ( that is unknown ) so that
+-                // it will get copied to exported OO/SO format after SaveAs
+-                if ( xPropSet.is() )
+-                {
+-                    OUString aMediaType = C2U("MigrationImages");
+-                    uno::Any a;
+-                    a <<= aMediaType;
+-                    xPropSet->setPropertyValue( C2U("MediaType"), a );
+-                }
+-
+-                uno::Reference< io::XStream > xObjReplStr = xPictures->openStreamElement(
+-                        name,
+-                        embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
+-                uno::Reference< io::XOutputStream > xOutStream( xObjReplStr->getOutputStream(), uno::UNO_QUERY_THROW );
+-                uno::Sequence< sal_Int8 > imageBytes( (sal_Int8*)data, dataLen );
+-                xOutStream->writeBytes( imageBytes );
+-                xOutStream->closeOutput();
+-
+-                uno::Reference< embed::XTransactedObject > xTransact( xPictures, uno::UNO_QUERY );
+-                if ( xTransact.is() )
+-                {
+-                    xTransact->commit();
+-                }
+-            }
+             catch( uno::Exception& )
+             {
+-                return false;
+             }
+-
+         }
+-        else
+-        {
+-            // no storage something wrong
+-            return false;
++	return xGrfObj;
+         }
+-    }
+-    else
+-    {
+-        //No doc shell
+-        return false;
+-    }
+-    return true;
+-}
+ 
++
+ long WriteAlign(SvStorageStream *pS, int nAmount)
+ {
+ 	if (long nAlign = pS->Tell() % nAmount)
+@@ -413,36 +355,12 @@ void lclReadCharArray( SvStorageStream& rStrm, cha
+  */
+ OUString lclCreateOUString( const char* pcCharArr, sal_uInt32 nLenFld )
+ {
+-    OUStringBuffer aBuffer;
+     sal_uInt32 nBufSize = lclGetBufferSize( nLenFld );
+     if( lclIsCompressed( nLenFld ) )
+-    {
+-        // buffer contains compressed Unicode, not encoded bytestring
+-        sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize );
+-        aBuffer.setLength( nStrLen );
+-        const char* pcCurrChar = pcCharArr;
+-        for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar, ++pcCurrChar )
+-            /*  *pcCurrChar may contain negative values and therefore MUST be
+-                casted to unsigned char, before assigned to a sal_Unicode. */
+-            aBuffer.setCharAt( nChar, static_cast< unsigned char >( *pcCurrChar ) );
++        return svt::BinFilterUtils::CreateOUStringFromStringArray( pcCharArr, nBufSize );
++
++    return svt::BinFilterUtils::CreateOUStringFromUniStringArray( pcCharArr, nBufSize );
+     }
+-    else
+-    {
+-        // buffer contains Little-Endian Unicode
+-        sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize ) / 2;
+-        aBuffer.setLength( nStrLen );
+-        const char* pcCurrChar = pcCharArr;
+-        for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar )
+-        {
+-            /*  *pcCurrChar may contain negative values and therefore MUST be
+-                casted to unsigned char, before assigned to a sal_Unicode. */
+-            sal_Unicode cChar = static_cast< unsigned char >( *pcCurrChar++ );
+-            cChar |= (static_cast< unsigned char >( *pcCurrChar++ ) << 8);
+-            aBuffer.setCharAt( nChar, cChar );
+-        }
+-    }
+-    return aBuffer.makeStringAndClear();
+-}
+ 
+ // export ---------------------------------------------------------------------
+ 
+@@ -561,8 +479,129 @@ const sal_uInt16 TOGGLEBUTTON = (sal_uInt16)0x1C;
+ const sal_uInt16 SCROLLBAR = (sal_uInt16)0x2F;
+ 
+ const sal_uInt16 MULTIPAGE = (sal_uInt16)0x39;
++// The IDs with bit 0x8000 set appear to be generated.
++// It looks like these ID's are used with the non-toolbox [1]
++// ActiveX controls that can be present in a Userform
++// ( note: RefEdit seems to be an exception )
++// In UserForm::Read just before the Container record starts
++// you will notice there can be sometimes trailing records, 
++// it seems that these records have a 1:1 relationship with the non-toolbox
++// controls present in the Userform. An id in the trailing record
++// seems to identify the specific ActiveX control and an artificial nTypeIdent
++// e.g. 0x8000, 0x8001 etc. is created so as to be able to associate
++// the ActiveX control when referenced later 
++// [1] Such ActiveX controls are added via Tools/AddionalControls
++// menu
++
++// create a fixed set of those special id(s)
++// ahem, we can only read one Progress bars at the moment so....
+ const sal_uInt16 PROGRESSBAR = (sal_uInt16)0x8000;
+ 
++// A set of IDs from the trailing records mentioned above that seem to
++// identify the following ActiveX controls 
++// Currently we only can process ( in a limited way ) the ProgressBar
++// the other ID's are for reference ( & future )
++
++// RefEdit control {00024512-0000-0000-c000-000000000046}
++const sal_uInt8 aRefEditID[] =
++{
++0x12, 0x45, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
++};
++
++// Microsoft ProgressBar Control, version 6.0 {35053A22-8589-11D1-B16A-00C0F0283628}
++const sal_uInt8 aProgressID[] =
++{
++0x22, 0x3a, 0x05, 0x35, 0x89, 0x85, 0xd1, 0x11,  0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
++};
++
++// Calendar Control 10.0 
++const sal_uInt8 aCalendarID[] =
++{
++0x2b, 0xc9, 0x27, 0x8e, 0x64, 0x12, 0x1c, 0x10, 0x8a, 0x2f, 0x04, 0x02, 0x24, 0x00, 0x9c, 0x02,
++};
++
++
++// Microsoft ImageComboxBox Control, version 6.0 {DD9DA666-8594-11D1-B16A-00C0F0283628}
++const sal_uInt8 aImageComboID[] =
++{
++0x66, 0xa6, 0x9d, 0xdd, 0x94, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
++};
++
++// Microsoft ImageList Control, version 6.0 {2C247F23-8591-11D1-B16A-00C0F0283628}
++const sal_uInt8 aImageListID[] =
++{
++0x23, 0x7f, 0x24, 0x2c, 0x91, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
++};
++
++// Microsoft Slider Control, version 6.0 {F08DF954-8592-11D1-B16A-00C0F0283628}
++const sal_uInt8 aSliderID[] =
++{
++0x54, 0xf9, 0x8d, 0xf0, 0x92, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
++};
++
++// Microsoft StatusBar Control, version 6.0 {8E3867A3-8586-11D1-B16A-00C0F0283628}
++const sal_uInt8 aStatusBarID[] =
++{
++0xa3, 0x67, 0x38, 0x8e, 0x86, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
++};
++
++// Microsoft Office Chart 10.0
++const sal_uInt8 aChartSpaceID[] =
++{
++0x46, 0xe5, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
++};
++
++const sal_Int16 ActiveXIDLen = 0x10; // CLSID len
++const sal_Int16 ActiveXIDBlockLen = 0x30; // the block len that contains the CLSID
++
++bool lcl_handleActiveXControl(  SvStorageStream *pS, sal_uInt16& nTypeID )
++{
++    nTypeID = 0; // Illegal ActiveX ID 
++    bool bRes = false;
++    sal_uInt16 nIdentifier, nFixedAreaLen;
++    *pS >> nIdentifier;    
++    *pS >> nFixedAreaLen;    
++    pS->SeekRel( ( nFixedAreaLen - ActiveXIDBlockLen ) );
++    sal_uInt8 aID[ ActiveXIDLen ];
++    if ( !pS->IsEof() )
++    {
++        pS->Read( aID, ActiveXIDLen );
++        pS->SeekRel( ActiveXIDBlockLen - ActiveXIDLen ); // read remainer of record
++        if ( memcmp( aID, aProgressID, ActiveXIDLen ) == 0 )
++        {
++            nTypeID = PROGRESSBAR;
++            OSL_TRACE("Found supported ***PROGRESSBAR*** ActiveX control");
++            bRes = true;
++        }
++#if (OSL_DEBUG_LEVEL > 0)
++        // If we really want to process these more controls we should put them in 
++        // a list or array and have a single loop testing each id. For the moment 
++        // as we only can process PROGRESSBAR, not much point doing that until 
++        // we add support for at least another activex control
++
++        else if ( memcmp( aID, aCalendarID, ActiveXIDLen ) == 0 )
++            OSL_TRACE("Found unsupported ***CALENDAR*** ActiveX control");
++        else if ( memcmp( aID, aRefEditID, ActiveXIDLen ) == 0 )
++            OSL_TRACE("Found unsupported ***REFEDIT*** ActiveX control");
++        else if ( memcmp( aID, aImageComboID, ActiveXIDLen ) == 0 )
++            OSL_TRACE("Found unsupported ***IMAGECOMBO*** ActiveX control");
++        else if ( memcmp( aID, aImageListID, ActiveXIDLen ) == 0 )
++            OSL_TRACE("Found unsupported ***IMAGELIST*** ActiveX control");
++        else if ( memcmp( aID, aChartSpaceID, ActiveXIDLen ) == 0 )
++            OSL_TRACE("Found unsupported ***CHARTSPACE*** ActiveX control");
++        else if ( memcmp( aID, aSliderID, ActiveXIDLen ) == 0 )
++            OSL_TRACE("Found unsupported ***SLIDER*** ActiveX control");
++        else if ( memcmp( aID, aStatusBarID, ActiveXIDLen ) == 0 )
++            OSL_TRACE("Found unsupported ***STATUSBAR*** ActiveX control");
++#endif
++        else
++        {
++            OSL_TRACE("Unknown activeX ID !");
++        }
++    }
++    return bRes;
++}
++
+ typedef std::vector< ContainerRecord > ContainerRecordList;
+ 
+ class ContainerRecReader
+@@ -637,6 +676,8 @@ class ContainerRecReader
+             // control type
+             if( nContentFlags & 0x00000080 )
+                 *pS >> rec.nTypeIdent;
++            if( nContentFlags & 0x00000200 )
++                pS->SeekRel( 4 ); // Grouping?
+             // length of infotip
+             sal_uInt32 nTipLen = 0;
+             if( nContentFlags & 0x00000800 )
+@@ -711,14 +752,22 @@ class ContainerRecReader
+             if( nCtrlSrcBufSize > 0 )
+             {
+                 ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+-                pS->SeekRel( nCtrlSrcBufSize );
++                std::auto_ptr< sal_Char > pCtrlSrcName;
++                pCtrlSrcName.reset( new sal_Char[ nCtrlSrcBufSize ] );
++                pS->Read( pCtrlSrcName.get(), nCtrlSrcBufSize );
++                rec.sCtrlSource = lclCreateOUString( pCtrlSrcName.get(), nCtrlSrcLen );
++                OSL_TRACE("*** *** *** ControlSourceName -> %s ", rtl::OUStringToOString( rec.sCtrlSource, RTL_TEXTENCODING_UTF8 ).getStr() );
+             }
+             // row source name
+             sal_uInt32 nRowSrcBufSize = lclGetBufferSize( nRowSrcLen );
+             if( nRowSrcBufSize > 0 )
+             {
+                 ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+-                pS->SeekRel( nRowSrcBufSize );
++                std::auto_ptr< sal_Char > pRowSrcName;
++                pRowSrcName.reset( new sal_Char[ nRowSrcBufSize ] );
++                pS->Read( pRowSrcName.get(), nRowSrcBufSize );
++                rec.sRowSource =  lclCreateOUString( pRowSrcName.get(), nRowSrcLen );
++                OSL_TRACE("*** *** *** RowSourceName -> %s ", rtl::OUStringToOString( rec.sRowSource, RTL_TEXTENCODING_UTF8 ).getStr() );
+             }
+ 
+             // seek to end of data
+@@ -735,6 +784,13 @@ class ContainerRecReader
+                 pControl->pDocSh = pContainerControl->pDocSh;
+                 pContainerControl->ProcessControl( pControl, pS, rec );
+             }
++            else if ( rec.nTypeIdent & 0x8000 )
++            {
++                // Skip ActiveX Controls we can't import
++                SotStorageStreamRef oStream = pContainerControl->getContainedControlsStream(); 
++                ULONG nStrmPos = oStream->Tell();
++                oStream->Seek( nStrmPos + rec.nSubStreamLen );
++            }  
+             else
+             {
+                 DBG_ERROR("Terminating import, unexpected error");
+@@ -755,6 +811,11 @@ class ContainerRecReader
+     {
+         sal_uInt8 aUnknown11[4];
+         pS->Read(aUnknown11, sizeof(aUnknown11));
++        // discovered a dialog with value of 0xFF for aUnknown11 
++        // needed an extra 4 bytes to offset correctly  into the control
++        // records. Valid test or coincidence ?
++        if ( aUnknown11[1] == 0xFF )
++           pS->Read( aUnknown11, sizeof(aUnknown11));
+         return true;
+     }
+ 
+@@ -829,176 +890,6 @@ class ContainerRecordReaderFac
+ 
+ // ============================================================================
+ 
+-void RBGroup::add(OCX_Control* pRB)
+-{
+-    // The tab index for the group is calculated as
+-    // the lowest tab index found in the list of RadioButtons
+-    if ( pRB->mnTabPos < mRBGroupPos )
+-    {
+-        mRBGroupPos = pRB->mnTabPos;
+-        CtrlIterator aEnd = mpControls.end();
+-        for (CtrlIterator aIter = mpControls.begin(); aIter != aEnd; ++ aIter )
+-        {
+-            (*aIter)->mnTabPos = mRBGroupPos;
+-        }
+-    }
+-    mpControls.push_back( pRB );
+-}
+-
+-struct SortGroupByTabPos
+-{
+-    bool operator()( const RBGroup* a, const RBGroup* b )
+-    {
+-        return a->tabPos() < b->tabPos();
+-    }
+-};
+-
+-RBGroupManager::RBGroupManager( String& defaultName ):mSDefaultName( defaultName ),
+-    numRadioButtons(0)
+-{
+-    groupList.reserve( 8 ); // reserve far more than we expect
+-}
+-
+-RBGroupManager::~RBGroupManager()
+-{
+-    for ( GroupIterator gIter=groupList.begin(); gIter!=groupList.end(); ++gIter )
+-    {
+-        delete( *gIter );
+-    }
+-}
+-
+-// Loose description of the method below ( I sure there is a better way to do
+-// this )
+-// In order to "fake" MS grouping behavior for OptionButtons the OptionButtons
+-// in the same group need to have consecutive tab indices ( regardless of the
+-// imported tab indices of the RadioButtons ). Additionally if two
+-// groups of OptionButtons end up having all consecutive indices they
+-// will be treated as a single group by OpenOffice. In this case
+-// a dummy seperator control needs to be inserted between the groups.
+-//
+-// This method returns a new list "destinationList" containing the controls
+-// passed in "sourceList" and the OptionButtons contained in the various
+-// Groups maintained by this  class.
+-// Controls are ordered in the destination list by tab index.
+-// Each RadioButtonGroup has a tab index associated with it.
+-// ( Tab index of a RadioGroup is determined as the tab index of the
+-// OptionButton control with the lowest tab index in the group )
+-
+-
+-void RBGroupManager::addRadioButton( OCX_OptionButton* pRButton )
+-{
+-    if ( pRButton )
+-    {
+-        OUString groupName = mSDefaultName;
+-        if ( pRButton->nGroupNameLen )
+-        {
+-            groupName =
+-                lclCreateOUString(pRButton->pGroupName,
+-                    pRButton->nGroupNameLen);
+-        }
+-        ++numRadioButtons;
+-        RBGroupHash::iterator iter = rbGroups.find( groupName );
+-        if ( iter != rbGroups.end() )
+-        {
+-            iter->second->controls().push_back( pRButton );
+-        }
+-        else
+-        {
+-            RBGroup* newGroup = new RBGroup(pRButton->mnTabPos);
+-            newGroup->controls().push_back( pRButton );
+-            rbGroups[ groupName ] = newGroup;
+-            groupList.push_back( newGroup );
+-        }
+-
+-    }
+-}
+-
+-CtrlList RBGroupManager::insertGroupsIntoControlList( const CtrlList& sourceList )
+-{
+-    ::std::sort( groupList.begin(), groupList.end(), SortGroupByTabPos() );
+-    std::vector<OCX_Control*> destinationList;
+-    if ( groupList.size() )
+-    {
+-        destinationList.reserve( sourceList.size() + numRadioButtons );
+-
+-        GroupIterator groupEnd = groupList.end();
+-        CtrlIteratorConst sourceEnd = sourceList.end();
+-
+-        size_t prevGroupListSize = 0;
+-
+-        CtrlIteratorConst containees = sourceList.begin();
+-        GroupIterator groupIter=groupList.begin();
+-        while ( containees != sourceEnd ||
+-                groupIter != groupEnd )
+-        {
+-            bool addGroupSeperator = false;
+-            if ( containees != sourceEnd )
+-            {
+-                if ( groupIter != groupEnd )
+-                {
+-                    sal_Int16 groupTabPos = (*groupIter)->tabPos();
+-                    if ( (*containees)->mnTabPos >= groupTabPos )
+-                    {
+-                       if ( !(destinationList.size() >=  prevGroupListSize ))
+-                        {
+-                            addGroupSeperator = true;
+-                        }
+-                        copyList( (*groupIter)->controls(), destinationList, addGroupSeperator );
+-                        ++groupIter;
+-
+-                        prevGroupListSize = destinationList.size();
+-                    }
+-                }
+-                destinationList.push_back(*containees);
+-                ++containees;
+-            }
+-            else
+-            {
+-               if ( groupIter != groupEnd )
+-               {
+-                    if ( !(destinationList.size() >  prevGroupListSize ))
+-                    {
+-                        addGroupSeperator = true;
+-                    }
+-                    copyList( (*groupIter)->controls(), destinationList, addGroupSeperator );
+-                    ++groupIter;
+-                    prevGroupListSize = destinationList.size();
+-                }
+-            }
+-        }
+-    }
+-    else
+-    {
+-        destinationList = sourceList;
+-    }
+-    return destinationList;
+-
+-}
+-
+-
+-void RBGroupManager::addSeperator( std::vector< OCX_Control* >& dest )
+-{
+-    OCX_Control* seperator = new OCX_CommandButton;
+-    seperator->SetInDialog(true);
+-    seperator->sName = C2S("GroupSeperator");
+-    dest.push_back( seperator );
+-}
+-
+-void RBGroupManager::copyList( std::vector< OCX_Control* >& src,
+-    std::vector< OCX_Control* >& dest,
+-    bool addGroupSeperator )
+-{
+-    if ( addGroupSeperator )
+-    {
+-        addSeperator( dest );
+-    }
+-
+-    for ( CtrlIterator rbIter = src.begin(); rbIter != src.end(); ++rbIter )
+-    {
+-        dest.push_back( *rbIter );
+-    }
+-}
+-
+ class OCX_UserFormLabel : public OCX_Label
+ {
+ public:
+@@ -1165,6 +1056,9 @@ sal_Bool OCX_Control::Import(
+ sal_Bool OCX_Control::Import(uno::Reference<container::XNameContainer> &rDialog
+     )
+ {
++    uno::Reference<beans::XPropertySet > xDlgProps( rDialog, uno::UNO_QUERY);
++
++    
+     uno::Reference<lang::XMultiServiceFactory>
+         xFactory(rDialog, uno::UNO_QUERY);
+ 
+@@ -1177,11 +1071,15 @@ sal_Bool OCX_Control::Import(uno::Reference<contai
+ 	if (!xModel.is())
+ 		return sal_False;
+ 
++    sal_Bool bVBA = sal_False;
+     /*  #147900# sometimes insertion of a control fails due to existing name,
+         do not break entire form import then... */
+     try
+     {
+         rDialog->insertByName(sName, uno::makeAny(xModel));
++        if ( xDlgProps.is() )
++            xDlgProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("VBAForm") ) ) >>= bVBA;
++
+     }
+     catch( uno::Exception& )
+     {
+@@ -1199,6 +1097,10 @@ sal_Bool OCX_Control::Import(uno::Reference<contai
+         return sal_False;
+ 
+     uno::Any aTmp;
++    sal_Int32 nFactor = 3528; 
++
++    if ( !bVBA  )
++    {
+     aTmp <<= sal_Int32((mnLeft * 2) / 100);
+     xPropSet->setPropertyValue(WW8_ASCII2STR("PositionX"), aTmp);
+     aTmp <<= sal_Int32((mnTop * 2) / 100);
+@@ -1207,6 +1109,18 @@ sal_Bool OCX_Control::Import(uno::Reference<contai
+     xPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
+     aTmp <<= sal_Int32((nHeight * 2) / 100);
+     xPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
++    }
++    else
++    {
++        aTmp <<= sal_Int32(mnLeft); // 100thmm
++        xPropSet->setPropertyValue(WW8_ASCII2STR("PositionX"), aTmp);
++        aTmp <<= sal_Int32(mnTop); //100th mm
++        xPropSet->setPropertyValue(WW8_ASCII2STR("PositionY"), aTmp);
++        aTmp <<= sal_Int32(nWidth); // 100thmm
++        xPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
++        aTmp <<= sal_Int32(nHeight); //100th mm
++        xPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
++    }
+     if ( msToolTip.Len() > 0 )
+ 		xPropSet->setPropertyValue(WW8_ASCII2STR("HelpText"), uno::Any(OUString(msToolTip)));
+ 
+@@ -1421,6 +1335,12 @@ sal_Bool OCX_CommandButton::Import( com::sun::star
+     rPropSet->setPropertyValue( WW8_ASCII2STR( "FocusOnClick" ), aTmp );
+ 
+ 	aFontData.Import(rPropSet);
++
++    if ( sImageUrl.getLength() )
++    {
++        aTmp <<= sImageUrl;
++        rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
++    }
+ 	return sal_True;
+ }
+ 
+@@ -1668,7 +1588,100 @@ sal_Bool OCX_ImageButton::Export(SvStorageRef &rOb
+ 	return WriteContents(xContents,rPropSet,rSize);
+ }
+ 
++bool lcl_isNamedRange( const rtl::OUString& sAddress, uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress )
++{
++    bool bRes = false;
++    const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
++    uno::Reference< sheet::XCellRangeReferrer > xReferrer;
++    try
++    {
++        uno::Reference< beans::XPropertySet > xPropSet( xModel, uno::UNO_QUERY_THROW );
++        uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW );
++        xReferrer.set ( xNamed->getByName( sAddress ), uno::UNO_QUERY );
++    }
++    catch( uno::Exception& /*e*/ )
++    {
++        // do nothing
++    }
++    if ( xReferrer.is() )
++    {
++        uno::Reference< sheet::XCellRangeAddressable > xRangeAddressable( xReferrer->getReferredCells(), uno::UNO_QUERY );
++        if ( xRangeAddressable.is() )
++        {
++            aAddress = xRangeAddressable->getRangeAddress();
++            bRes = true;
++        }
++    }
++    return bRes;
++}
+ 
++void lcl_ApplyListSourceAndBindableStuff( uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rPropSet, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource )
++{
++// XBindable etc.
++    uno::Reference< lang::XMultiServiceFactory > xFac;
++    if ( xModel.is() )
++        xFac.set( xModel, uno::UNO_QUERY );
++    uno::Reference< form::binding::XBindableValue > xBindable( rPropSet, uno::UNO_QUERY );
++    if (  xFac.is() && rsCtrlSource.getLength() && xBindable.is() )
++    {
++         
++         // OOo address structures
++         // RefCell - convert from XL
++         // pretend we converted the imported string address into the
++         // appropriate address structure
++         uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( C2U( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );
++         table::CellAddress aAddress;
++         if ( xConvertor.is() )
++         {
++             // we need this service to properly convert XL notation also
++             // Should be easy to extend
++             xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsCtrlSource ) );
++             xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress;    
++         }
++        
++         beans::NamedValue aArg1;
++         aArg1.Name = C2U("BoundCell");
++         aArg1.Value <<= aAddress;
++
++         uno::Sequence< uno::Any > aArgs(1);
++         aArgs[ 0 ]  <<= aArg1;
++
++         uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY );
++         xBindable->setValueBinding( xBinding );
++    }
++    uno::Reference< form::binding::XListEntrySink > xListEntrySink( rPropSet, uno::UNO_QUERY );
++    if (  xFac.is() && rsRowSource.getLength() && xListEntrySink.is() )
++    {
++         
++         // OOo address structures
++         // RefCell - convert from XL
++         // pretend we converted the imported string address into the
++         // appropriate address structure
++         uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( C2U( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );
++         table::CellRangeAddress aAddress;
++         if ( xConvertor.is() )
++         {
++             if ( !lcl_isNamedRange( rsRowSource, xModel, aAddress ) )
++             {
++                 // we need this service to properly convert XL notation also
++                 // Should be easy to extend
++                 xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsRowSource ) );
++                 xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress;
++             }
++         }
++        
++         beans::NamedValue aArg1;
++         aArg1.Name = C2U("CellRange");
++         aArg1.Value <<= aAddress;
++
++         uno::Sequence< uno::Any > aArgs(1);
++         aArgs[ 0 ]  <<= aArg1;
++
++         uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellRangeListSource" ), aArgs ), uno::UNO_QUERY );
++         xListEntrySink->setListEntrySource( xSource );
++    }
++}
++
+ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
+         com::sun::star::beans::XPropertySet> &rPropSet)
+ {
+@@ -1700,12 +1713,51 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::
+     aTmp <<= ImportSpecEffect( nSpecialEffect );
+     rPropSet->setPropertyValue( WW8_ASCII2STR("VisualEffect"), aTmp);
+ 
+-	if (pValue && !bSetInDialog)
++	if (pValue)
+ 	{
+ 		INT16 nTmp = pValue[0]-0x30;
+ 		aTmp <<= nTmp;
++		if (!bSetInDialog)
+ 		rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
++		else
++		{
++			// dialog ( but we might be using the form model )
++			if ( rPropSet->getPropertySetInfo()->hasPropertyByName( WW8_ASCII2STR("DefaultState") ) )
++				rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
++			else
++				rPropSet->setPropertyValue( WW8_ASCII2STR("State"), aTmp);
+ 	}
++	}
++    // If this is a dialog control then we need to  set a groupname *always*
++    rtl::OUString sGroupName = lclCreateOUString( pGroupName, nGroupNameLen );
++    if ( GetInDialog() ) // Userform/Dialog
++    {
++        // By default groupnames are not set in Excel, it's not unusual to have
++        // a number of groups of radiobuttons located inside frame ( or other container
++        // controls ) where there is *no* specific groupname set for the radiobuttons.
++        // But... there is implicit grouping for radio buttons in seperate containers
++        // e.g. radio buttons in a frame are by default in the same group.
++        // Unfortunately in openoffice there are no containers below the dialog itself :-(
++        // To ensure correct grouping for imported radiobuttons either with no groupname
++        // or identical groupnames that are in separate containers we *must* ensure
++        // that a suitable groupname is applied. 
++        // Because controlNames are unique even across different containers we can use the
++        // controls container (e.g. parent) name as a prefix for a group name
++	rtl::OUString sParentName = msParentName;
++        sGroupName = sParentName.concat( C2U( ":" ) ).concat( sGroupName );
++    }
++    if ( sGroupName.getLength() == 0 )
++        sGroupName = rtl::OUString::createFromAscii("DefaultGroup");
++	OSL_TRACE("RadioButton %s has groupname %s", 
++		rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr(),  rtl::OUStringToOString( sGroupName, RTL_TEXTENCODING_UTF8 ).getStr() );
++        try
++        {
++            aTmp <<= sGroupName;
++            rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
++        }
++        catch( uno::Exception& )
++        {
++        }
+ 
+ 	if (pCaption)
+ 	{
+@@ -1717,6 +1769,14 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::
+     aTmp <<= ::com::sun::star::style::VerticalAlignment_MIDDLE;
+     rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp );
+ 
++	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
++	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
++    if ( sImageUrl.getLength() )
++    {
++        aTmp <<= sImageUrl;
++        rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
++    }
++
+ 	aFontData.Import(rPropSet);
+ 	return sal_True;
+ }
+@@ -2352,6 +2412,12 @@ sal_Bool OCX_ToggleButton::Import(com::sun::star::
+ 	}
+ 
+ 	aFontData.Import(rPropSet);
++	
++    if ( sImageUrl.getLength() )
++    {
++        aTmp <<= sImageUrl;
++        rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
++    }
+ 	return sal_True;
+ }
+ 
+@@ -2608,6 +2674,8 @@ sal_Bool OCX_ComboBox::Import(com::sun::star::uno:
+ 	rPropSet->setPropertyValue( WW8_ASCII2STR("MaxTextLen"), aTmp);
+ 
+ 	aFontData.Import(rPropSet);
++	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
++	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
+ 	return sal_True;
+ }
+ 
+@@ -2827,7 +2895,8 @@ sal_Bool OCX_ListBox::Import(com::sun::star::uno::
+ 
+     aTmp <<= ImportColor( nBorderColor );
+     rPropSet->setPropertyValue( WW8_ASCII2STR("BorderColor"), aTmp);
+-
++	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
++	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
+ 	aFontData.Import(rPropSet);
+ 	return sal_True;
+ }
+@@ -3205,9 +3274,16 @@ sal_Bool OCX_ModernControl::Read(SvStorageStream *
+ 	{
+ 		pS->Read(pPictureHeader,20);
+ 		*pS >> nPictureLen;
+-		pPicture = new sal_uInt8[nPictureLen];
+-		pS->Read(pPicture,nPictureLen);
++		long imagePos = pS->Tell();
++		mxGrfObj = lcl_readGraphicObject( pS );
++		if( mxGrfObj.is() )
++		{
++			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
++			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
+ 	}
++		// make sure the stream position should be pointing after the image
++		pS->Seek( imagePos + nPictureLen );
++	}
+ 
+ 	return sal_True;
+ }
+@@ -3296,9 +3372,16 @@ sal_Bool OCX_CommandButton::Read(SvStorageStream *
+ 	{
+ 		pS->Read(pPictureHeader,20);
+ 		*pS >> nPictureLen;
+-		pPicture = new sal_uInt8[nPictureLen];
+-		pS->Read(pPicture,nPictureLen);
++		long imagePos = pS->Tell();
++		mxGrfObj = lcl_readGraphicObject( pS );
++		if( mxGrfObj.is() )
++		{
++			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
++			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
+ 	}
++		// make sure the stream position should be pointing after the image
++		pS->Seek( imagePos + nPictureLen );
++	}
+ 
+ 	return sal_True;
+ }
+@@ -3418,7 +3501,7 @@ OCX_ContainerControl::OCX_ContainerControl( SotSto
+             const ::rtl::OUString& sN,
+             const uno::Reference< container::XNameContainer >  &rParent,
+             OCX_Control* pParent ) :
+-                OCX_Control(sN, pParent), rbGroupMgr( sName ), mxParent(rParent), nNoRecords(0), nTotalLen(0), containerType( STDCONTAINER )
++                OCX_Control(sN, pParent), mxParent(rParent), nNoRecords(0), nTotalLen(0), containerType( STDCONTAINER )
+ {
+ 
+     mContainerStorage = parent->OpenSotStorage(storageName,
+@@ -3481,9 +3564,18 @@ OUString OCX_ContainerControl::createSubStreamName
+     return buf.makeStringAndClear();
+ }
+ 
+-bool OCX_ContainerControl::createFromContainerRecord( const ContainerRecord& record, OCX_Control*& pControl )
++
++bool OCX_ContainerControl::createFromContainerRecord( ContainerRecord& record, OCX_Control*& pControl )
+ {
+     pControl = NULL;
++    if (  record.nTypeIdent & 0x8000 )
++    {
++        std::hash_map<sal_uInt16, sal_uInt16>::iterator it = mActiveXIDMap.find( record.nTypeIdent );
++        if ( it == mActiveXIDMap.end() )
++            return false;
++        // replace the generated id with our hardcoded one
++        record.nTypeIdent = it->second; 
++    }
+     switch ( record.nTypeIdent)
+         {
+             case CMDBUTTON:
+@@ -3591,8 +3683,7 @@ void OCX_ContainerControl::ProcessControl(OCX_Cont
+     SotStorageStreamRef oStream = mContainedControlsStream;
+ 
+     // can insert into OO Dialog (e.g is this a supported dialog control)??
+-    if ( rec.nTypeIdent == SPINBUTTON ||
+-        rec.nTypeIdent == TABSTRIP)
++    if ( rec.nTypeIdent == TABSTRIP )
+     {
+         // skip the record in the stream, discard the control
+         oStream->SeekRel( rec.nSubStreamLen );
+@@ -3602,15 +3693,27 @@ void OCX_ContainerControl::ProcessControl(OCX_Cont
+     {
+         // A container control needs to read the f stream in
+         // the folder ( substorage ) associated with this control
+-        if (  rec.nTypeIdent ==  FRAME ||
+-            rec.nTypeIdent ==  MULTIPAGE||
+-            rec.nTypeIdent ==  PAGE )
++        switch ( rec.nTypeIdent )
+         {
++            case FRAME:
++            case MULTIPAGE:
++            case PAGE:
++                {
+             OCX_ContainerControl* pContainer =
+                static_cast< OCX_ContainerControl* >( pControl );
+             oStream = pContainer->getContainerStream();
++                    break;
+         }
+-
++            case LISTBOX:
++            case OPTIONBUTTON:
++            case COMBOBOX:
++			case SPINBUTTON:
++			case SCROLLBAR:
++                {
++                    pControl->msCtrlSource = rec.sCtrlSource;
++                    pControl->msRowSource = rec.sRowSource;
++                }
++        }
+         pControl->sName = rec.cName;
+         pControl->msToolTip = rec.controlTip;
+         // Position of controls is relative to the container
+@@ -3630,6 +3733,7 @@ void OCX_ContainerControl::ProcessControl(OCX_Cont
+             // applied to all containees
+             pControl->mnStep = mnStep;
+         }
++        pControl->msParentName = sName;
+ 
+         // #117490# DR: container records provide size of substream, use it here...
+ 
+@@ -3640,19 +3744,9 @@ void OCX_ContainerControl::ProcessControl(OCX_Cont
+         // set stream to position behind substream of this control
+         oStream->Seek( nStrmPos + rec.nSubStreamLen );
+ 
+-        //need to fake grouping behaviour for radio ( option ) buttons
+-        if ( rec.nTypeIdent == OPTIONBUTTON )
+-        {
+-            OCX_OptionButton* pRButton =
+-                static_cast< OCX_OptionButton*>(pControl);
+-            rbGroupMgr.addRadioButton( pRButton );
+-        }
+-        else
+-        {
+             mpControls.push_back( pControl );
+         }
+     }
+-}
+ 
+ sal_Bool OCX_ContainerControl::Read(SvStorageStream *pS)
+ {
+@@ -3673,7 +3767,6 @@ sal_Bool OCX_ContainerControl::Read(SvStorageStrea
+     // this ensures that the default tab index created by Star/Open office
+     // reflects the "flattened" ms tab order.
+     ::std::sort( mpControls.begin(), mpControls.end(), SortOrderByTabPos() );
+-    mpControls = rbGroupMgr.insertGroupsIntoControlList( mpControls );
+ 	return true;
+ }
+ 
+@@ -3691,7 +3784,8 @@ OCX_MultiPage::OCX_MultiPage( SotStorageRef& paren
+ 		nScrollWidth(0), nScrollHeight(0), nIconLen(0), pIcon(0), nPictureLen(0),
+ 		pPicture(0)
+ {
+-    msDialogType = C2U("NotSupported");
++    //msDialogType = C2U("NotSupported");
++    msDialogType = C2U("com.sun.star.awt.UnoMultiPageModel");
+     mnForeColor = 0x80000012L,
+     mnBackColor = 0x8000000FL;
+     bSetInDialog = true;// UserForm control only
+@@ -3755,7 +3849,6 @@ sal_Bool OCX_MultiPage::Read(SvStorageStream *pS)
+ sal_Bool OCX_MultiPage::Import(com::sun::star::uno::Reference<
+     com::sun::star::beans::XPropertySet> &rPropSet)
+ {
+-    // Calls import on contained controls
+     OCX_ContainerControl::Import( rPropSet );
+     return sal_True;
+ }
+@@ -3776,6 +3869,43 @@ sal_Bool OCX_MultiPage::Import(com::sun::star::uno
+ 
+     if ( xPropSet.is() )
+     {
++        uno::Reference<lang::XMultiServiceFactory>
++            xFactory(rDialog, uno::UNO_QUERY);
++	OSL_TRACE("** MultiPage creating control %s", rtl::OUStringToOString( msDialogType, RTL_TEXTENCODING_UTF8 ).getStr() );
++	uno::Reference<uno::XInterface> xCreate = xFactory->createInstance(msDialogType);
++	if (!xCreate.is())
++		return sal_False;
++
++	uno::Reference<awt::XControlModel> xModel(xCreate, uno::UNO_QUERY);
++	if (!xModel.is())
++		return sal_False;
++
++        try
++        {
++		// we should just call MultiPage::Import( XPropertySet )
++    		OSL_TRACE("********* MULTIPAGE cName %s", rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() );
++		uno::Any aTmp(&sName,getCppuType((OUString *)0));
++		uno::Reference<beans::XPropertySet> xPrps(xModel, uno::UNO_QUERY);
++		xPrps->setPropertyValue( WW8_ASCII2STR("Name"), aTmp );
++		aTmp = uno::makeAny( mnCurrentPageStep );
++		xPrps->setPropertyValue( WW8_ASCII2STR("ProgressValueMax"), aTmp );
++		// default current page to 0 ( #FIXME, we need to read this value )
++		aTmp = uno::makeAny( sal_Int32(0) );
++		xPrps->setPropertyValue( WW8_ASCII2STR("ProgressValue"), aTmp );
++    		OSL_TRACE("********* MULTIPAGE vomitted out properties");
++
++    // Calls import on contained controls
++            rDialog->insertByName(sName, uno::makeAny(xModel));
++            OSL_TRACE("*** inserted ***");
++        }
++        catch( uno::Exception& )
++        {
++            DBG_ERRORFILE(
++                ByteString( "OCX_Control::Import - cannot insert control \"" ).
++                Append( ByteString( sName, RTL_TEXTENCODING_UTF8 ) ).
++                Append( '"' ).GetBuffer() );
++        }
++
+         // Calls import on contained pages
+         return OCX_ContainerControl::Import( xPropSet );
+     }
+@@ -4062,8 +4192,7 @@ OCX_UserForm::OCX_UserForm( SotStorageRef& parent,
+ 		nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nSpecialEffect(0),
+ 		nPicture(0), nPictureAlignment(2), nPictureSizeMode(0),
+ 		bPictureTiling(FALSE), nAccelerator(0), nIcon(0), pCaption(0),
+-		nScrollWidth(0), nScrollHeight(0), nScrollLeft(0), nScrollTop(0), nIconLen(0), pIcon(0), nPictureLen(0),
+-		pPicture(0)
++		nScrollWidth(0), nScrollHeight(0), nScrollLeft(0), nScrollTop(0), nIconLen(0), pIcon(0), nPictureLen(0)
+ 	{
+             mnForeColor = 0x80000012;
+ 		    mnBackColor = 0x8000000F;
+@@ -4193,16 +4322,7 @@ sal_Bool OCX_UserForm::Read(SvStorageStream *pS)
+ 		pS->Read(pIcon,nIconLen);
+ 	}
+ 
+-	if (nPicture)
+-	{
+-		pS->Read(pPictureHeader,20);
+-		*pS >> nPictureLen;
+-		pPicture = new sal_uInt8[nPictureLen];
+-		pS->Read(pPicture,nPictureLen);
+-	}
+-
+     ReadAlign( pS, pS->Tell() - nStart, 4);
+-
+     if (pBlockFlags[2] & 0x10)
+     {
+         //Font Stuff..
+@@ -4211,6 +4331,21 @@ sal_Bool OCX_UserForm::Read(SvStorageStream *pS)
+         *pS >> nFontLen;
+         pS->SeekRel(nFontLen);
+     }
++	if (nPicture)
++	{
++		pS->Read(pPictureHeader,20);
++		*pS >> nPictureLen;
++		long imagePos = pS->Tell();
++		// great embedded object
++		mxGrfObj = lcl_readGraphicObject( pS );
++		if( mxGrfObj.is() )
++		{
++			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
++			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
++		}
++		// make sure the stream position should be pointing after the image.
++		pS->Seek( imagePos + nPictureLen );
++	}
+ 
+     sal_Int16 numTrailingRecs = 0;
+     *pS >> numTrailingRecs;
+@@ -4219,12 +4354,16 @@ sal_Bool OCX_UserForm::Read(SvStorageStream *pS)
+     // ( unknown what these trailing records are for)
+     if ( numTrailingRecs )
+     {
+-        for ( ; numTrailingRecs ; --numTrailingRecs )
++        for ( sal_Int16 i = 0 ; numTrailingRecs ; --numTrailingRecs, ++i )
+         {
+-            OCX_Control skip(C2S("dummy")) ;
+-            skip.Read( pS );
++            sal_uInt16 nTypeID = 0;
++            if ( lcl_handleActiveXControl( pS, nTypeID ) )
++            {
++                if ( nTypeID & 0x8000 ) // valid ActiveXID
++                    mActiveXIDMap[ ( i | 0x8000 ) ] = nTypeID;
+         }
+     }
++    }
+ 	return OCX_ContainerControl::Read( pS );
+ }
+ 
+@@ -4233,6 +4372,8 @@ sal_Bool OCX_UserForm::Import(
+ {
+     uno::Reference<beans::XPropertySet>
+         xDialogPropSet(mxParent, uno::UNO_QUERY);
++    if ( !xDialogPropSet.is() )
++        return sal_False;
+     uno::Any aTmp(&sName,getCppuType((OUString *)0));
+     xDialogPropSet->setPropertyValue(
+         OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aTmp);
+@@ -4240,22 +4381,56 @@ sal_Bool OCX_UserForm::Import(
+         OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), aTmp);
+     aTmp <<= ImportColor(mnBackColor);
+ 	xDialogPropSet->setPropertyValue( WW8_ASCII2STR("BackgroundColor"), aTmp);
+-
++    sal_Bool bVBA = sal_False;
++    // Ok we are importing xls but maybe we aren't in VBA mode
++    // if we are not in VBA mode then we should import sizes etc. ( as before )
++    try
++    {
++        xDialogPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("VBAForm") ) ) >>= bVBA;
++    }
++    catch( uno::Exception& e )
++    {
++    }
++    sal_Int32 nFactor( 3528 );
++    if ( !bVBA )
++    {
+     aTmp <<= sal_Int32((nWidth * 2) / 100);
+     xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
+     aTmp <<= sal_Int32((nHeight * 2) / 100);
+     xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
++    }
++    else
++    {
++        aTmp <<= sal_Int32( nWidth + 160 ); // 100thmm
++        xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
++        aTmp <<= sal_Int32(nHeight + 662 - 714); //100th mm
++        xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
++    }
+ 
++
+     uno::Reference<beans::XPropertySet> xPropSet( mxParent, uno::UNO_QUERY );
+     OCX_ContainerControl::Import( xPropSet );
+ 
+     uno::Reference<io::XInputStreamProvider> xSource =
+-        xmlscript::exportDialogModel(mxParent, mxCtx);
++        xmlscript::exportDialogModel(mxParent, mxCtx, pDocSh->GetModel() );
+     uno::Any aSourceAny(uno::makeAny(xSource));
+     if (rLib->hasByName(sName))
+         rLib->replaceByName(sName, aSourceAny);
+     else
+         rLib->insertByName(sName, aSourceAny);
++
++    if ( sImageUrl.getLength() )
++    {
++        aTmp <<= sImageUrl;
++		try
++		{
++        	xDialogPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
++		}
++		catch( uno::Exception& )
++		{
++			OSL_TRACE("OCX_UserForm::Import, Image fails to import");
++		}
++    }
+     return sal_True;
+ }
+ 
+@@ -4780,11 +4955,14 @@ sal_Bool OCX_CheckBox::Import(com::sun::star::uno:
+     aTmp <<= ImportSpecEffect( nSpecialEffect );
+     rPropSet->setPropertyValue( WW8_ASCII2STR("VisualEffect"), aTmp);
+ 
+-	if (pValue && !bSetInDialog)
++	if (pValue)
+ 	{
+ 		INT16 nTmp=pValue[0]-0x30;
+ 		aTmp <<= nTmp;
++		if ( !bSetInDialog )
+ 		rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
++		else
++		 	rPropSet->setPropertyValue( WW8_ASCII2STR("State"), aTmp);
+ 	}
+ 
+ 	if (pCaption)
+@@ -5194,12 +5372,6 @@ sal_Bool OCX_TabStrip::ReadFontData(SotStorageStre
+ 
+ sal_Bool OCX_Image::Read(SotStorageStream *pS)
+ {
+-    if ( !bSetInDialog )
+-    {
+-        // preserve the present behavior at the moment.
+-        // only import image control for UserForms
+-        return sal_False;
+-    }
+     ULONG nStart = pS->Tell();
+ 	*pS >> nIdentifier;
+ 	DBG_ASSERT(nStandardId==nIdentifier,
+@@ -5290,17 +5462,15 @@ sal_Bool OCX_Image::Read(SotStorageStream *pS)
+ 
+         long imagePos = pS->Tell();
+ 
+-        pS->Seek( imagePos );
+-
+-        sImageUrl =  C2U("vnd.sun.star.expand:${$BRAND_BASE_DIR/program/") + C2U( SAL_CONFIGFILE( "bootstrap" ) ) + C2U("::UserInstallation}/user/temp/") + sName;
+-
+-        sal_uInt8* pImage = new sal_uInt8[ nImageLen ];
+-        pS->Read(pImage, nImageLen);
+-        bool result = storePictureInFileSystem( sImageUrl, pImage, nImageLen );
+-        OUString pictName = sImageUrl.copy( sImageUrl.lastIndexOf('/') + 1 );
+-        result = storePictureInDoc( pDocSh, pictName, pImage, nImageLen );
+-        delete pImage;
++		mxGrfObj = lcl_readGraphicObject( pS );
++		if( mxGrfObj.is() )
++		{
++			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
++			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
+     }
++		// make sure the stream position should be pointing after the image
++		pS->Seek( imagePos + nImageLen );
++    }
+     return sal_True;
+ }
+ 
+@@ -5467,7 +5637,7 @@ OCX_SpinButton::OCX_SpinButton() :
+     mbPropThumb( true )
+ {
+     msFormType = C2U("com.sun.star.form.component.SpinButton");
+-    msDialogType = C2U("com.sun.star.awt.UnoControlSpinButtonModel");
++    msDialogType = C2U("com.sun.star.form.component.SpinButton");
+     mnBackColor = 0x8000000F;
+     mnForeColor = 0x80000012;
+ }
+@@ -5504,8 +5674,8 @@ sal_Bool OCX_SpinButton::Read( SvStorageStream *pS
+     if( mnBlockFlags & 0x00000080 )     rStrm >> mnValue;
+     if( mnBlockFlags & 0x00000100 )     rStrm.SeekRel( 4 );     // unknown
+     if( mnBlockFlags & 0x00000200 )     rStrm.SeekRel( 4 );     // unknown
+-    if( mnBlockFlags & 0x00000400 )     rStrm.SeekRel( 4 );     // unknown
+-    if( mnBlockFlags & 0x00000800 )     rStrm >> mnSmallStep;
++    if( mnBlockFlags & 0x00000400 )     rStrm >> mnSmallStep;
++    if( mnBlockFlags & 0x00000800 )     rStrm.SeekRel( 4 );     // unknown
+     if( mnBlockFlags & 0x00001000 )     rStrm >> mnPageStep;
+     if( mnBlockFlags & 0x00002000 )     rStrm >> mnOrient;
+     if( mnBlockFlags & 0x00004000 )
+@@ -5590,6 +5760,9 @@ sal_Bool OCX_SpinButton::Import(com::sun::star::un
+     aTmp <<= sal_Int16( 0 );
+     rPropSet->setPropertyValue( WW8_ASCII2STR("Border"), aTmp);
+ 
++	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
++	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
++
+     return sal_True;
+ }
+ 
+@@ -5757,7 +5930,7 @@ OCX_ScrollBar::OCX_ScrollBar()
+     sName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollBar" ) );
+     mnMax = 32767;
+     msFormType = C2U("com.sun.star.form.component.ScrollBar");
+-    msDialogType = C2U("com.sun.star.awt.UnoControlScrollBarModel");
++    msDialogType = C2U("com.sun.star.form.component.ScrollBar");
+ 
+ }
+ 
+@@ -5823,6 +5996,9 @@ sal_Bool OCX_ScrollBar::Import(com::sun::star::uno
+     aTmp <<= sal_Int16( 0 );
+     rPropSet->setPropertyValue( WW8_ASCII2STR("Border"), aTmp);
+ 
++	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
++	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
++
+     return sal_True;
+ }
+ 
+Index: svx/source/msfilter/msvbasic.hxx
+===================================================================
+--- svx/source/msfilter/msvbasic.hxx	(revision 276159)
++++ svx/source/msfilter/msvbasic.hxx	(revision 276288)
+@@ -45,6 +45,8 @@
+ #include <vector>
+ #endif
+ #include<map>
++#include <com/sun/star/script/ModuleType.hpp>
++using namespace ::com::sun::star::script::ModuleType;
+ 
+ /* class VBA:
+  * The VBA class provides a set of methods to handle Visual Basic For
+@@ -68,13 +70,12 @@ DECLARE_DYNARRAY(StringArray,String *)
+ // #117718# define internal types to distinguish between
+ // module types, form, class & normal
+ // #i37965# DR 2004-12-03: add "Document", used in Excel for macros attached to sheet
+-enum ModuleType { Unknown = 0, Normal, Class, Form, Document };
+ 
+ // #117718# define map to hold types of module
+ //
+-
++typedef sal_Int32 ModType;
+ typedef ::std::map< UniString,
+-    ModuleType > ModuleTypeHash;
++    ModType > ModuleTypeHash;
+ 
+ class VBA_Impl
+ {
+@@ -95,10 +96,15 @@ class VBA_Impl
+     void Output(int len, const sal_uInt8 *data);
+     //
+     // #117718# member map of module names to types of module
+-    ModuleType GetModuleType( const UniString& rModuleName );
+-
+-    std::vector<String> maReferences;
++    ModType GetModuleType( const UniString& rModuleName );
++    rtl::OUString& ProjectName() { return msProjectName; }
++    void SetProjectName( const rtl::OUString& rPName ) { msProjectName = rPName; }
++    const std::vector<rtl::OUString>& ProjectReferences() { return maPrjReferences; }
++    void AddProjectReference( const rtl::OUString& rProject ) { maPrjReferences.push_back( rProject); }
++    SvStorage* GetStorage() { return xStor; }
+ private:
++    std::vector<rtl::OUString> maReferences;
++    std::vector<rtl::OUString> maPrjReferences;
+     struct VBAOffset_Impl
+     {
+         String sName;
+@@ -124,6 +130,7 @@ class VBA_Impl
+     int ReadVBAProject(const SvStorageRef &rxVBAStorage);
+     int DecompressVBA(int index, SvStorageStreamRef &rxVBAStream);
+     sal_uInt8 ReadPString(SvStorageStreamRef &xVBAProject, bool bIsUnicode);
++    rtl::OUString msProjectName;
+ };
+ 
+ #endif
+Index: svx/source/form/fmtools.cxx
+===================================================================
+--- svx/source/form/fmtools.cxx	(revision 276159)
++++ svx/source/form/fmtools.cxx	(revision 276288)
+@@ -103,7 +103,7 @@
+ #include <comphelper/extract.hxx>
+ #include <comphelper/uno3.hxx>
+ #include <connectivity/dbexception.hxx>
+-#include <comphelper/extract.hxx>
++#include <comphelper/evtmethodhelper.hxx>
+ #include <cppuhelper/typeprovider.hxx>
+ #include <algorithm>
+ #include <rtl/logfile.hxx>
+@@ -720,37 +720,6 @@ sal_Int16 getControlTypeByObject(const Reference<
+ 	return ::rtl::OUString();
+ }
+ //------------------------------------------------------------------------------
+-Sequence< ::rtl::OUString> getEventMethods(const Type& type)
+-{
+-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getEventMethods" );
+-	typelib_InterfaceTypeDescription *pType=0;
+-	type.getDescription( (typelib_TypeDescription**)&pType);
+-
+-	if(!pType)
+-		return Sequence< ::rtl::OUString>();
+-
+-	Sequence< ::rtl::OUString> aNames(pType->nMembers);
+-	::rtl::OUString* pNames = aNames.getArray();
+-	for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames)
+-	{
+-		// the decription reference
+-		typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i];
+-		// the description for the reference
+-		typelib_TypeDescription* pMemberDescription = NULL;
+-		typelib_typedescriptionreference_getDescription(&pMemberDescription, pMemberDescriptionReference);
+-		if (pMemberDescription)
+-		{
+-			typelib_InterfaceMemberTypeDescription* pRealMemberDescription =
+-				reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription);
+-			*pNames = pRealMemberDescription->pMemberName;
+-		}
+-	}
+-	typelib_typedescription_release( (typelib_TypeDescription *)pType );
+-	return aNames;
+-}
+-
+-
+-//------------------------------------------------------------------------------
+ void TransferEventScripts(const Reference< ::com::sun::star::awt::XControlModel>& xModel, const Reference< ::com::sun::star::awt::XControl>& xControl,
+ 	const Sequence< ::com::sun::star::script::ScriptEventDescriptor>& rTransferIfAvailable)
+ {
+@@ -824,7 +793,8 @@ void TransferEventScripts(const Reference< ::com::
+ 					continue;
+ 
+ 				// now check the methods
+-				Sequence< ::rtl::OUString> aMethodsNames = getEventMethods(*pCurrentListeners);
++				Sequence< ::rtl::OUString> aMethodsNames = ::comphelper::getEventMethodsForType(*pCurrentListeners);
++
+ 				const ::rtl::OUString* pMethodsNames = aMethodsNames.getConstArray();
+ 				for (k=0; k<aMethodsNames.getLength(); ++k, ++pMethodsNames)
+ 				{
+Index: svx/source/form/fmscriptingenv.cxx
+===================================================================
+--- svx/source/form/fmscriptingenv.cxx	(revision 276159)
++++ svx/source/form/fmscriptingenv.cxx	(revision 276288)
+@@ -39,6 +39,8 @@
+ #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+ #include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp>
+ #include <com/sun/star/lang/DisposedException.hpp>
++#include <com/sun/star/lang/EventObject.hpp>
++#include <com/sun/star/awt/XControl.hpp>
+ /** === end UNO includes === **/
+ #include <tools/diagnose_ex.h>
+ #include <cppuhelper/implbase1.hxx>
+@@ -74,6 +76,9 @@ namespace svxform
+     using ::com::sun::star::uno::Exception;
+     using ::com::sun::star::uno::Sequence;
+     using ::com::sun::star::uno::XInterface;
++    using ::com::sun::star::lang::EventObject;
++    using ::com::sun::star::awt::XControl;
++    using ::com::sun::star::beans::XPropertySet;
+ 	/** === end UNO using === **/
+ 
+     class FormScriptingEnvironment;
+@@ -236,6 +241,11 @@ namespace svxform
+     void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException)
+     {
+         ::osl::ClearableMutexGuard aGuard( m_aMutex );
++       static const ::rtl::OUString vbaInterOp =
++           ::rtl::OUString::createFromAscii("VBAInterop");
++       if ( _rEvent.ScriptType.equals(vbaInterOp) )
++           return; // not handled here
++	
+         if ( impl_isDisposed_nothrow() )
+             return;
+ 
+@@ -411,9 +421,20 @@ namespace svxform
+         {
+             Sequence< sal_Int16 > aOutArgsIndex;
+             Sequence< Any > aOutArgs;
+-
+-            m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs );
++            EventObject aEvent;
++            Any aCaller;
++            if ( ( _rArguments.getLength() > 0 ) && ( _rArguments[ 0 ] >>= aEvent ) )
++            {
++                try
++                {
++                    Reference< XControl > xControl( aEvent.Source, UNO_QUERY_THROW );
++                    Reference< XPropertySet > xProps( xControl->getModel(), UNO_QUERY_THROW );
++                    aCaller = xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) );
+         }
++                catch( Exception& ) {}
++            }
++            m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs, true, aCaller.hasValue() ? &aCaller : 0 );
++        }
+ 
+         //................................................................
+         //. QualifiedBasicScript
+Index: svx/source/form/makefile.mk
+===================================================================
+--- svx/source/form/makefile.mk	(revision 276159)
++++ svx/source/form/makefile.mk	(revision 276288)
+@@ -44,6 +44,10 @@ ENABLE_EXCEPTIONS=TRUE
+ 
+ # --- Files --------------------------------------------------------
+ 
++.IF "$(ENABLE_VBA)"=="YES"
++	CDEFS+=-DENABLE_VBA
++.ENDIF
++
+ SRS1NAME=form
+ SRC1FILES= \
+ 	fmexpl.src 		\
+Index: svx/source/form/fmundo.cxx
+===================================================================
+--- svx/source/form/fmundo.cxx	(revision 276159)
++++ svx/source/form/fmundo.cxx	(revision 276288)
+@@ -87,6 +87,90 @@ using namespace ::com::sun::star::reflection;
+ using namespace ::com::sun::star::form::binding;
+ using namespace ::svxform;
+ 
++
++#include <com/sun/star/script/XScriptListener.hdl>
++#include <comphelper/processfactory.hxx>
++#include <cppuhelper/implbase1.hxx>
++
++typedef cppu::WeakImplHelper1< XScriptListener > ScriptEventListener_BASE;
++class ScriptEventListenerWrapper : public ScriptEventListener_BASE
++{
++public:
++	ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException ) : pModel(&_rModel) 
++	{
++		Reference < XPropertySet > xProps(
++			::comphelper::getProcessServiceFactory(), UNO_QUERY );
++		if ( xProps.is() )
++		{
++			Reference< XComponentContext > xCtx( xProps->getPropertyValue(
++				rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY );
++			if ( xCtx.is() )
++			{
++				Reference< XMultiComponentFactory > xMFac( 
++					xCtx->getServiceManager(), UNO_QUERY );
++				if ( xMFac.is() )
++				{
++					m_vbaListener.set( xMFac->createInstanceWithContext( 
++						rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
++							"ooo.vba.EventListener"  ) ), xCtx ), 
++								UNO_QUERY_THROW );
++				}
++			}
++		}
++	}
++    // XEventListener
++    virtual void SAL_CALL disposing(const EventObject& ) throw( RuntimeException ){}
++
++    // XScriptListener
++    virtual void SAL_CALL firing(const  ScriptEvent& evt) throw(RuntimeException)	
++	{
++		setModel();
++		if ( m_vbaListener.is() )
++		{
++			m_vbaListener->firing( evt );	
++		}
++	}
++
++    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw( com::sun::star::reflection::InvocationTargetException, RuntimeException)
++	{
++		setModel();
++		if ( m_vbaListener.is() )
++		{
++			return m_vbaListener->approveFiring( evt );	
++		}
++		return Any();	
++	}
++    
++private:
++	void setModel()
++	{
++		Reference< XPropertySet > xProps( m_vbaListener, UNO_QUERY );
++		if ( xProps.is() )
++		{
++			try
++			{
++				SfxObjectShellRef xObjSh = pModel->GetObjectShell();
++				if ( xObjSh.Is() && m_vbaListener.is() )
++				{
++					Any aVal;
++					aVal <<= xObjSh->GetModel();
++					xProps->setPropertyValue( 
++						::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) ), 
++						aVal );
++				}
++			}
++			catch( Exception& e )
++			{
++				//swallow any errors
++			}
++		}
++	}
++    FmFormModel* pModel;
++	Reference< XScriptListener > m_vbaListener;
++
++
++};
++
+ //------------------------------------------------------------------------------
+ // some helper structs for caching property infos
+ //------------------------------------------------------------------------------
+@@ -130,7 +214,14 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel
+ {
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::FmXUndoEnvironment" );
+ 	DBG_CTOR(FmXUndoEnvironment,NULL);
++	try
++	{
++		m_vbaListener =  new ScriptEventListenerWrapper( _rModel );
+ }
++	catch( Exception& )
++	{
++	}
++}
+ 
+ //------------------------------------------------------------------------------
+ FmXUndoEnvironment::~FmXUndoEnvironment()
+@@ -771,10 +862,18 @@ void FmXUndoEnvironment::switchListening( const Re
+ 	    if ( xManager.is() )
+ 	    {
+             if ( _bStartListening )
++            {
+ 		        m_pScriptingEnv->registerEventAttacherManager( xManager );
++                if ( m_vbaListener.is() )
++                    xManager->addScriptListener( m_vbaListener );
++            }
+             else
++            {
+ 		        m_pScriptingEnv->revokeEventAttacherManager( xManager );
++                if ( m_vbaListener.is() )
++                    xManager->removeScriptListener( m_vbaListener );
+ 		}
++		}
+ 
+         // also handle all children of this element
+ 	    sal_uInt32 nCount = _rxContainer->getCount();
+Index: svx/source/inc/fmundo.hxx
+===================================================================
+--- svx/source/inc/fmundo.hxx	(revision 276159)
++++ svx/source/inc/fmundo.hxx	(revision 276288)
+@@ -217,7 +217,7 @@ class SVX_DLLPRIVATE FmXUndoEnvironment
+ 
+     void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& _rxContainer, bool _bStartListening ) SAL_THROW(());
+     void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(());
+-
++    ::com::sun::star::uno::Reference< com::sun::star::script::XScriptListener > m_vbaListener;
+ public:
+ 	// Methoden zur Zuordnung von Controls zu Forms,
+ 	// werden von der Seite und der UndoUmgebung genutzt
+Index: svx/inc/svxmsbas.hxx
+===================================================================
+--- svx/inc/svxmsbas.hxx	(revision 276159)
++++ svx/inc/svxmsbas.hxx	(revision 276288)
+@@ -35,6 +35,8 @@
+ #include "svx/svxdllapi.h"
+ 
+ #include <sot/storage.hxx>
++#include <map>
++#include <hash_map>
+ 
+ class SfxObjectShell;
+ 
+@@ -53,8 +55,17 @@ class SfxObjectShell;
+  * probably what the user expects to see when viewing the code
+  */
+ 
++typedef std::hash_map< sal_Int32, String >  ObjIdToName;
++
++typedef std::map< String, ObjIdToName >  ControlAttributeInfo;
++
++class VBA_Impl;
++
+ class SVX_DLLPUBLIC SvxImportMSVBasic
+ {
++	ControlAttributeInfo m_ModuleNameToObjIdHash;
++	void extractAttribute( const String& rAttribute, const String& rModName );
++
+ public:
+ 	SvxImportMSVBasic( SfxObjectShell &rDocS, SotStorage &rRoot,
+ 						BOOL bImportCode = TRUE, BOOL bCopyStorage = TRUE )
+@@ -67,18 +78,22 @@ class SVX_DLLPUBLIC SvxImportMSVBasic
+ 	// bit 1 = 1 -> the VBA - storage is copy to the ObjectShell storage
+ 	int Import( const String& rStorageName, const String &rSubStorageName,
+ 				BOOL bAsComment=TRUE, BOOL bStripped=TRUE );
++	int Import( const String& rStorageName, const String &rSubStorageName, 
++				const std::vector< String >& codeNames, BOOL bAsComment=TRUE, BOOL bStripped=TRUE );
+ 
+ 	// only for the export - copy or delete the saved VBA-macro-storage
+ 	// form the ObjectShell
+ 	// - returns a warning code if a modified basic exist, in all other
+ 	//   cases return ERRCODE_NONE.
+ 	ULONG SaveOrDelMSVBAStorage( BOOL bSaveInto, const String& rStorageName );
+-
+ 	// check if the MS-VBA-Storage exist in the RootStorage of the DocShell.
+ 	// If it exist, then return the WarningId for loosing the information.
++
++        const ControlAttributeInfo& ControlNameForObjectId(){ return m_ModuleNameToObjIdHash; }
+ 	static ULONG GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS );
+ 
+ 	static String GetMSBasicStorageName();
++        rtl::OUString GetVBAProjectName() { return msProjectName; }
+ private:
+ 	SotStorageRef xRoot;
+ 	SfxObjectShell &rDocSh;
+@@ -87,11 +102,15 @@ class SVX_DLLPUBLIC SvxImportMSVBasic
+ 
+ 	SVX_DLLPRIVATE BOOL ImportCode_Impl( const String& rStorageName,
+ 						  const String &rSubStorageName,
++	                                              const std::vector< String >&,
+ 						  BOOL bAsComment, BOOL bStripped);
+ 	SVX_DLLPRIVATE bool ImportForms_Impl(const String& rStorageName, 
+-		const String &rSubStorageName);
++		const String &rSubStorageName, BOOL bVBAMode );
+ 	SVX_DLLPRIVATE BOOL CopyStorage_Impl( const String& rStorageName,
+ 						   const String &rSubStorageName);
++        rtl::OUString msProjectName;
++	SVX_DLLPRIVATE BOOL ImportCode_Impl( VBA_Impl&, const std::vector< String >&, BOOL, BOOL );
++	SVX_DLLPRIVATE bool ImportForms_Impl( VBA_Impl&, const String&, const String&, BOOL);
+ };
+ 
+ #endif
+Index: svx/inc/svx/escherex.hxx
+===================================================================
+--- svx/inc/svx/escherex.hxx	(revision 276159)
++++ svx/inc/svx/escherex.hxx	(revision 276288)
+@@ -47,6 +47,7 @@
+ #include <com/sun/star/drawing/Hatch.hpp>
+ #include <svx/msdffdef.hxx>
+ #include "svx/svxdllapi.h"
++#include <memory>
+ 
+ 		/*Record Name       FBT-Value   Instance                  Contents                                                          Wrd Exl PPt Ver*/
+ // In der Mickysoft-Doku heissen die msofbt... statt ESCHER_...
+@@ -1306,6 +1307,19 @@ class SVX_DLLPUBLIC EscherExClientAnchor_Base
+ 									const Rectangle& rRect ) = 0;
+ };
+ 
++class InteractionInfo
++{
++	bool 			mbHasInteraction;
++	std::auto_ptr<SvMemoryStream>		mpHyperlinkRecord;
++	InteractionInfo();
++public:
++	InteractionInfo( SvMemoryStream* pStream, bool bInteraction ) : mbHasInteraction( bInteraction )
++	{
++		mpHyperlinkRecord.reset( pStream );
++	}
++	bool	hasInteraction() { return mbHasInteraction; }
++	const std::auto_ptr< SvMemoryStream >&	getHyperlinkRecord() { return mpHyperlinkRecord; }
++};
+ 
+ class EscherExHostAppData
+ {
+@@ -1313,14 +1327,17 @@ class EscherExHostAppData
+ 		EscherExClientAnchor_Base*	pClientAnchor;
+ 		EscherExClientRecord_Base*	pClientData;
+ 		EscherExClientRecord_Base*	pClientTextbox;
++		InteractionInfo*		pInteractionInfo;
+ 		// ignore single shape if entire pages are written
+ 		BOOL						bDontWriteShape;
+ 
+ public:
+ 		EscherExHostAppData() : pClientAnchor(0), pClientData(0),
+-								pClientTextbox(0), bDontWriteShape(FALSE)
++								pClientTextbox(0), pInteractionInfo(0), bDontWriteShape(FALSE)
+ 		{}
+ 
++		void SetInteractionInfo( InteractionInfo* p )
++			{ pInteractionInfo = p; }
+ 		void SetClientAnchor( EscherExClientAnchor_Base* p )
+ 			{ pClientAnchor = p; }
+ 		void SetClientData( EscherExClientRecord_Base* p )
+@@ -1329,6 +1346,8 @@ class EscherExHostAppData
+ 			{ pClientTextbox = p; }
+ 		void SetDontWriteShape( BOOL b )
+ 			{ bDontWriteShape = b; }
++		InteractionInfo* GetInteractionInfo() const
++			{ return pInteractionInfo; }
+ 		EscherExClientAnchor_Base* GetClientAnchor() const
+ 			{ return pClientAnchor; }
+ 		EscherExClientRecord_Base* GetClientData() const
+Index: svx/inc/svx/msocximex.hxx
+===================================================================
+--- svx/inc/svx/msocximex.hxx	(revision 276159)
++++ svx/inc/svx/msocximex.hxx	(revision 276288)
+@@ -32,6 +32,7 @@
+ 
+ #include <sot/storage.hxx>
+ #include <tools/debug.hxx>
++#include <com/sun/star/graphic/XGraphicObject.hpp>
+ 
+ //!! no such defines in global namespaces - it will break other existing code that uses the same define!!
+ //#ifndef C2U
+@@ -290,7 +291,10 @@ class SVX_DLLPUBLIC OCX_Control
+ 	bool mbVisible;
+ 	UniString sName;
+ 	UniString msToolTip;
++	UniString msParentName;
+ 	OCX_FontData aFontData;
++    rtl::OUString msCtrlSource;
++    rtl::OUString msRowSource;
+         SfxObjectShell *pDocSh;
+ protected:
+ 
+@@ -327,14 +331,13 @@ class OCX_ModernControl : public OCX_Control
+     nMultiState(0), nValueLen(0), nCaptionLen(0), nVertPos(1), nHorzPos(7),
+ 	nSpecialEffect(2), nIcon(0), nPicture(0), nAccelerator(0), nGroupNameLen(0),
+ 	pValue(0), pCaption(0), pGroupName(0), nIconLen(0), pIcon(0),
+-    nPictureLen(0), pPicture(0) {}
++    nPictureLen(0) {}
+ 
+ 	~OCX_ModernControl() {
+ 		if (pValue) delete[] pValue;
+ 		if (pCaption) delete[] pCaption;
+ 		if (pGroupName) delete[] pGroupName;
+ 		if (pIcon) delete[] pIcon;
+-		if (pPicture) delete[] pPicture;
+ 	}
+ 	sal_Bool Read(SotStorageStream *pS);
+ 
+@@ -415,7 +418,8 @@ class OCX_ModernControl : public OCX_Control
+ 
+ 	sal_uInt8 pPictureHeader[20];
+ 	sal_uInt32 nPictureLen;
+-	sal_uInt8 *pPicture;
++    ::rtl::OUString sImageUrl;
++	com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
+ 
+ };
+ 
+@@ -464,6 +468,7 @@ class OCX_Image : public OCX_Control
+ 
+         bool bAutoSize;
+         ::rtl::OUString sImageUrl;
++		com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
+         sal_Bool Read(SotStorageStream *pS);
+ 
+ 	using OCX_Control::Import; // to not hide the other two import methods
+@@ -488,6 +493,8 @@ struct ContainerRecord
+ 
+     ::rtl::OUString cName;
+     ::rtl::OUString controlTip;
++    ::rtl::OUString sCtrlSource;
++    ::rtl::OUString sRowSource;
+ 
+     sal_uInt32 nTop;
+     sal_uInt32 nLeft;
+@@ -502,54 +509,8 @@ typedef std::vector<OCX_Control*>::iterator CtrlIt
+ typedef std::vector<OCX_Control*>::const_iterator CtrlIteratorConst;
+ typedef std::vector<OCX_Control*>  CtrlList;
+ 
+-
+-
+-class RBGroup
+-{
+-    public:
+-    RBGroup():mRBGroupPos(0){}
+-    RBGroup(sal_uInt16& groupPos ):mRBGroupPos(groupPos){}
+-    sal_Int16 tabPos() const { return mRBGroupPos; }
+-    std::vector<OCX_Control*>::size_type numControls()
+-    { return mpControls.size(); }
+-    std::vector<OCX_Control*>& controls() { return mpControls; }
+-
+-    void add(OCX_Control* pRB);
+-    private:
+-    sal_uInt16 mRBGroupPos;
+-    std::vector<OCX_Control*> mpControls;
+-};
+-
+-typedef ::std::hash_map < ::rtl::OUString, RBGroup*, ::rtl::OUStringHash,
+-    ::std::equal_to< ::rtl::OUString > > RBGroupHash;
+-typedef std::vector<RBGroup*>::iterator GroupIterator;
+-
+ class OCX_OptionButton;
+ 
+-class RBGroupManager
+-{
+-public:
+-    RBGroupManager( String& defaultName );
+-    ~RBGroupManager();
+-
+-    CtrlList insertGroupsIntoControlList( const CtrlList& sourceList );
+-    void addRadioButton( OCX_OptionButton* pRButton );
+-private:
+-
+-    void addSeperator( std::vector< OCX_Control* >& dest );
+-    void copyList( std::vector< OCX_Control* >& src,
+-                  std::vector< OCX_Control* >& dest,
+-                  bool addGroupSeperator );
+-
+-    RBGroupHash rbGroups;
+-    String mSDefaultName;
+-    std::vector< RBGroup* > groupList;
+-    sal_uInt16 numRadioButtons;
+-};
+-
+-
+-
+-
+ class OCX_ContainerControl : public OCX_Control
+ {
+ public:
+@@ -575,8 +536,9 @@ class OCX_ContainerControl : public OCX_Control
+         SotStorageStreamRef getContainerStream() { return mContainerStream; }
+ 
+         virtual void ProcessControl( OCX_Control* pControl, SvStorageStream* pS, ContainerRecord& rec );
+-        bool createFromContainerRecord( const ContainerRecord& record,
++        bool createFromContainerRecord( ContainerRecord& record,
+             OCX_Control*& );
++        SotStorageStreamRef getContainedControlsStream(){ return mContainedControlsStream; }
+ protected:
+         // This class not meant to be instantiated
+         // needs to be subclassed
+@@ -588,10 +550,10 @@ class OCX_ContainerControl : public OCX_Control
+             OCX_Control* pParent = NULL );
+         rtl::OUString createSubStreamName( const sal_uInt32& subStorageID );
+ 
+-        RBGroupManager rbGroupMgr;
+         com::sun::star::uno::Reference<
+                 com::sun::star::container::XNameContainer > mxParent;
+ 	std::vector<OCX_Control*> mpControls;
++        std::hash_map<sal_uInt16, sal_uInt16> mActiveXIDMap;
+         SotStorageRef mContainerStorage;
+         SotStorageStreamRef mContainerStream;
+         SotStorageStreamRef mContainedControlsStream;
+@@ -859,7 +821,6 @@ class OCX_UserForm : public OCX_ContainerControl
+ 	{
+ 		delete[] pCaption;
+ 		delete[] pIcon;
+-		delete[] pPicture;
+ 	}
+ 
+ 	virtual sal_Bool Read(SvStorageStream *pS);
+@@ -923,7 +884,8 @@ class OCX_UserForm : public OCX_ContainerControl
+ 
+ 	sal_uInt8 pPictureHeader[20];
+ 	sal_uInt32  nPictureLen;
+-	sal_uInt8 *pPicture;
++    ::rtl::OUString sImageUrl;
++	com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
+ private:
+         com::sun::star::uno::Reference<
+                 com::sun::star::uno::XComponentContext> mxCtx;
+@@ -962,7 +924,8 @@ class OCX_OptionButton : public OCX_ModernControl
+ 	OCX_OptionButton() : OCX_ModernControl(rtl::OUString::createFromAscii("OptionButton"))
+ 	{
+ 		msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton");
+-		msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlRadioButtonModel");
++		//msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlRadioButtonModel");
++		msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton");
+         mnBackColor = 0x80000005L;
+         mnForeColor = 0x80000008L;
+         aFontData.SetHasAlign(TRUE);
+@@ -1063,7 +1026,7 @@ class OCX_ComboBox : public OCX_ModernControl
+ public:
+ 	OCX_ComboBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ComboBox")){
+ 		msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ComboBox");
+-	        msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlComboBoxModel");
++	        msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.ComboBox");
+ 		mnBackColor = 0x80000005;
+ 		mnForeColor = 0x80000008;
+ 		nBorderColor = 0x80000006;
+@@ -1088,7 +1051,8 @@ class OCX_ListBox : public OCX_ModernControl
+ public:
+ 	OCX_ListBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ListBox")){
+ 		msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox");
+-		msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel");
++		//msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel");
++		msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox");
+ 		mnBackColor = 0x80000005;
+ 		mnForeColor = 0x80000008;
+ 		nBorderColor = 0x80000006;
+@@ -1116,7 +1080,7 @@ class OCX_CommandButton : public OCX_Control
+ 	fEnabled(1), fLocked(0), fBackStyle(1), fWordWrap(0), fAutoSize(0),
+         nCaptionLen(0), nVertPos(1), nHorzPos(7), nMousePointer(0), nPicture(0),
+         nAccelerator(0), nIcon(0), pCaption(0), nIconLen(0), pIcon(0), nPictureLen(0),
+-        pPicture(0), mbTakeFocus( true )
++        mbTakeFocus( true )
+ 	{
+ 	        msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.CommandButton");
+ 	        msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlButtonModel");
+@@ -1127,7 +1091,6 @@ class OCX_CommandButton : public OCX_Control
+ 	~OCX_CommandButton() {
+ 		if (pCaption) delete[] pCaption;
+ 		if (pIcon) delete[] pIcon;
+-		if (pPicture) delete[] pPicture;
+ 	}
+ 	sal_Bool Read(SotStorageStream *pS);
+ 
+@@ -1170,7 +1133,8 @@ class OCX_CommandButton : public OCX_Control
+ 
+ 	sal_uInt8 pPictureHeader[20];
+ 	sal_uInt32  nPictureLen;
+-	sal_uInt8 *pPicture;
++    ::rtl::OUString sImageUrl;
++	com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
+ 
+     bool        mbTakeFocus;
+ 
+Index: svx/inc/svx/msvbahelper.hxx
+===================================================================
+--- svx/inc/svx/msvbahelper.hxx	(revision 0)
++++ svx/inc/svx/msvbahelper.hxx	(revision 276288)
+@@ -0,0 +1,58 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: 
++ * $Revision: 
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef _MSVBAHELPER_HXX
++#define _MSVBAHELPER_HXX
++
++#include <sfx2/objsh.hxx>
++#include "svx/svxdllapi.h"
++
++namespace ooo { namespace vba 
++{
++    class SVX_DLLPUBLIC VBAMacroResolvedInfo
++    {
++        SfxObjectShell* mpDocContext;
++        bool mbFound;
++        String msResolvedMacro;
++        public:
++        VBAMacroResolvedInfo() : mpDocContext(NULL), mbFound( false ){}
++        void SetResolved( bool bRes ) { mbFound = bRes; }
++        bool IsResolved() { return mbFound; }
++        void SetMacroDocContext(SfxObjectShell* pShell )  { mpDocContext = pShell; }
++        SfxObjectShell* MacroDocContext() { return mpDocContext; }
++        String ResolvedMacro() { return msResolvedMacro; }
++        void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; }
++    };
++
++    SVX_DLLPUBLIC String makeMacroURL( const String& sMacroName );
++    SVX_DLLPUBLIC  VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false );
++    SVX_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
++} }
++
++#endif
+Index: svx/inc/svx/mstoolbar.hxx
+===================================================================
+--- svx/inc/svx/mstoolbar.hxx	(revision 0)
++++ svx/inc/svx/mstoolbar.hxx	(revision 276288)
+@@ -0,0 +1,333 @@
++#ifndef _MSTOOLBAR_HXX
++#define _MSTOOLBAR_HXX
++#include "svx/svxdllapi.h"
++#include <tools/string.hxx>
++#include <sot/storage.hxx>
++#include <ostream>
++#include <memory>
++#include <vector>
++#include <boost/shared_ptr.hpp>
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/container/XIndexContainer.hpp>
++#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
++#include <com/sun/star/ui/ImageType.hpp>
++#include <com/sun/star/graphic/XGraphic.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <vcl/bitmap.hxx>
++#include <cppuhelper/implbase1.hxx>
++
++namespace css = ::com::sun::star;
++
++class TBCHeader;
++
++
++class MSOCommandConvertor
++{
++public:
++    virtual ~MSOCommandConvertor() {}
++    virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) = 0; 
++    virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ) = 0; 
++};
++
++class SfxObjectShell;
++
++class SVX_DLLPUBLIC CustomToolBarImportHelper
++{
++    struct iconcontrolitem
++    {
++        rtl::OUString sCommand;
++        css::uno::Reference< css::graphic::XGraphic > image;
++    };
++    std::vector< iconcontrolitem > iconcommands;
++    std::auto_ptr< MSOCommandConvertor > pMSOCmdConvertor;
++    css::uno::Reference< css::ui::XUIConfigurationManagerSupplier > m_xCfgSupp;
++    css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr;
++    SfxObjectShell& mrDocSh;
++    void ScaleImage( css::uno::Reference< css::graphic::XGraphic >& xGraphic, long nNewSize );
++public:
++    CustomToolBarImportHelper( SfxObjectShell& rDocSh, const css::uno::Reference< css::ui::XUIConfigurationManager >& rxAppCfgMgr );
++
++    void setMSOCommandMap( MSOCommandConvertor* pCnvtr ) { pMSOCmdConvertor.reset( pCnvtr ); }
++    css::uno::Reference< css::ui::XUIConfigurationManager > getCfgManager();
++    css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager();
++
++
++    css::uno::Any createCommandFromMacro( const rtl::OUString& sCmd );
++
++    void addIcon( const css::uno::Reference< css::graphic::XGraphic >& xImage, const rtl::OUString& sString );
++    void applyIcons();
++    rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
++    rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID );
++    SfxObjectShell& GetDocShell() { return mrDocSh; }
++    void showToolbar( const rtl::OUString& rName );
++};
++
++class SVX_DLLPUBLIC TBBase
++{
++friend class Indent;
++    static int nIndent; // num spaces to indent before printing 
++protected:
++    void indent_printf(FILE* fp, const char* format, ... );
++    sal_uInt32 nOffSet; // usually for debug we can store the offset in the stream to this record
++public:
++    TBBase() : nOffSet( 0 ) {}
++    virtual ~TBBase(){}
++    rtl::OUString readUnicodeString( SvStream* pS, sal_Int32 nChars );
++
++    virtual bool Read(SvStream *pS) = 0;
++    virtual void Print( FILE* ) {} // #FIXME remove this an implement the debug routines in all the classes below to enable some sort of readable output
++    sal_uInt32 GetOffset() { return nOffSet; }
++};
++
++class Indent
++{
++public:
++    Indent( bool binit = false ) 
++    { 
++        if ( binit )
++            init();
++        else
++            TBBase::nIndent = TBBase::nIndent + 2; 
++    }
++    ~Indent() { TBBase::nIndent = TBBase::nIndent - 2; }
++    void init() { TBBase::nIndent = 0; }
++};
++
++
++class SVX_DLLPUBLIC WString : public TBBase
++{
++    rtl::OUString sString;
++
++public:
++    WString(){};
++    ~WString(){};
++    bool Read(SvStream *pS);
++    rtl::OUString getString(){ return sString; }
++};
++
++class SVX_DLLPUBLIC TBCExtraInfo : public TBBase
++{
++    WString wstrHelpFile;
++    sal_Int32 idHelpContext;
++    WString wstrTag;
++    WString wstrOnAction;
++    WString wstrParam;
++    sal_Int8 tbcu;
++    sal_Int8 tbmg;
++
++    TBCExtraInfo(const TBCExtraInfo&);
++    TBCExtraInfo& operator = ( const TBCExtraInfo&);
++public:
++    TBCExtraInfo();
++    ~TBCExtraInfo(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    rtl::OUString getOnAction();
++};
++
++class SVX_DLLPUBLIC TBCGeneralInfo  : public TBBase
++{
++    sal_uInt8 bFlags;
++    WString customText;
++    WString descriptionText;
++    WString tooltip;
++    TBCExtraInfo extraInfo;
++
++public:
++    TBCGeneralInfo();
++    ~TBCGeneralInfo() {}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    bool ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& );
++    rtl::OUString CustomText() { return customText.getString(); }
++    rtl::OUString DescriptionText() { return descriptionText.getString(); }
++    rtl::OUString Tooltip() { return tooltip.getString(); }
++};
++
++class SVX_DLLPUBLIC TBCBitMap : public TBBase
++{
++friend class TBCBSpecific; // #FIXME hacky access, need to fix
++    sal_Int32 cbDIB;
++    Bitmap mBitMap;
++    int size;
++public:
++    TBCBitMap();
++    ~TBCBitMap();
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    Bitmap& getBitMap(); 
++};
++
++class SVX_DLLPUBLIC TBCMenuSpecific : public TBBase
++{
++    sal_Int32 tbid;
++    boost::shared_ptr< WString > name; //exist only if tbid equals 0x00000001
++public:
++    TBCMenuSpecific();
++    ~TBCMenuSpecific(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    rtl::OUString Name();
++};
++
++class SVX_DLLPUBLIC TBCCDData : public TBBase
++{
++    sal_Int16 cwstrItems; //Signed integer that specifies the number of items in wstrList. MUST be positive.
++    std::vector< WString > wstrList;  // Zero-based index array of WString structures. Number of elements MUST be equal to cwstrItems.
++    sal_Int16 cwstrMRU; // Signed integer that specifies the number of most recently used string
++    sal_Int16 iSel ; // Signed integer that specifies the zero-based index of the selected item in the wstrList field. MUST be equal to 0xFFFF (-1) or greater than or equal to 0x0000.
++    sal_Int16 cLines; // Signed integer that specifies the suggested number of lines that the toolbar control will display at any time when displaying the elements of wstrList of available items. 
++    sal_Int16 dxWidth; // Signed integer that specifies the width in pixels that the interior of the dropdown has. This excludes the width of the toolbar control border and scroll bar.
++    WString wstrEdit; //Structure of type WString. Editable text for editable area of the ComboBox toolbar control.
++
++public:
++    TBCCDData();
++    ~TBCCDData();
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++};
++
++class TBCComboDropdownSpecific : public TBBase
++{
++    boost::shared_ptr< TBCCDData > data;
++public:
++    TBCComboDropdownSpecific( const TBCHeader& header );
++    TBCComboDropdownSpecific(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++};
++
++class TBCBSpecific :  public TBBase
++{
++    sal_uInt8 bFlags;
++    boost::shared_ptr< TBCBitMap > icon; // optional
++    boost::shared_ptr< TBCBitMap > iconMask; // optional
++    boost::shared_ptr< sal_uInt16 > iBtnFace; // optional
++    boost::shared_ptr< WString > wstrAcc; // optional
++   
++public:
++    TBCBSpecific();
++    ~TBCBSpecific(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    // #TODO just add a getGraphic member here
++    TBCBitMap* getIcon();
++    TBCBitMap* getIconMask();
++    sal_uInt16* getBtnFace() { return iBtnFace.get(); }
++};
++
++/* TBCHeader.tct                   controlSpecificInfo type
++
++0x01 (Button control)              TBCBSpecific
++0x10 (ExpandingGrid control)       TBCBSpecific
++0x0A (Popup control)               TBCMenuSpecific
++0x0C (ButtonPopup control)         TBCMenuSpecific
++0x0D (SplitButtonPopup control)    TBCMenuSpecific
++0x0E (SplitButtonMRUPopup control) TBCMenuSpecific
++0x02 (Edit control)                TBCComboDropdow nSpecific
++0x04 (ComboBox control)            TBCComboDropdow nSpecific
++0x14 (GraphicCombo control)        TBCComboDropdow nSpecific
++0x03 (DropDown control)            TBCComboDropdow nSpecific
++0x06 (SplitDropDown control)       TBCComboDropdow nSpecific
++0x09 (GraphicDropDown control)     TBCComboDropdow nSpecific
++0x07 (OCXDropDown control)         controlSpecificInfo MUST NOT exist
++0x0F (Label control)               controlSpecificInfo MUST NOT exist
++0x12 (Grid control)                controlSpecificInfo MUST NOT exist
++0x13 (Gauge control)               controlSpecificInfo MUST NOT exist
++0x16 (ActiveX control)             controlSpecificInfo MUST NOT exist
++
++*/
++class SVX_DLLPUBLIC TBCHeader : public TBBase
++{
++    sal_Int8 bSignature; 
++    sal_Int8 bVersion; 
++    sal_uInt8 bFlagsTCR; 
++    sal_uInt8 tct; 
++    sal_uInt16 tcid;
++    sal_uInt32 tbct;
++    sal_uInt8 bPriority;
++    boost::shared_ptr< sal_uInt16 > width;  //optional
++    boost::shared_ptr< sal_uInt16 > height; //optional
++
++public:
++    TBCHeader();
++    ~TBCHeader();
++    sal_uInt8 getTct() const { return tct; }
++    sal_uInt16 getTcID() const { return tcid; }
++    bool isVisible() { return !( bFlagsTCR & 0x1 ); }
++    bool isBeginGroup() { return ( bFlagsTCR & 0x2 ); }
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    sal_uInt32 getTbct() { return tbct; };
++};
++
++class SVX_DLLPUBLIC TBCData : public TBBase
++{
++    TBCHeader rHeader;
++    TBCGeneralInfo controlGeneralInfo;
++    boost::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct 
++    TBCData(const TBCData&);
++    TBCData& operator = ( const TBCData&);
++public:
++    TBCData( const TBCHeader& Header );
++    ~TBCData(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    bool ImportToolBarControl( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >&, bool& bBeginGroup, bool bIsMenuBar );
++    TBCGeneralInfo& getGeneralInfo() { return controlGeneralInfo; }
++    TBCMenuSpecific* getMenuSpecific();
++};
++
++class SVX_DLLPUBLIC TB : public TBBase
++{
++    sal_uInt8 bSignature;// Signed integer that specifies the toolbar signature number. MUST be 0x02.
++    sal_uInt8 bVersion; // Signed integer that specifies the toolbar version number. MUST be 0x01.
++    sal_Int16 cCL; // Signed integer that SHOULD  specify the number of toolbar controls contained in this toolbar.
++    sal_Int32 ltbid;// Signed integer that specifies the toolbar ID. MUST be 0x0001 (custom toolbar ID).
++    sal_uInt32 ltbtr;// Unsigned integer of type TBTRFlags that specifies the toolbar type and toolbar restrictions.
++    sal_uInt16 cRowsDefault;// Unsigned integer that specifies the number of preferred rows for the toolbar when the toolbar is not docked. MUST be less than or equal to 255.
++    sal_uInt16 bFlags; //Unsigned integer of type TBFlags.
++    WString name; //Structure of type WString that specifies the toolbar name
++public:
++    TB();
++    ~TB(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++    sal_Int16 getcCL(){ return cCL; }
++    WString& getName(){ return name; }
++    bool IsEnabled();
++    bool IsMenuToolbar(){ return ( ( ltbtr & 0x2000000 ) == 0x2000000 ); }
++    bool NeedsPositioning();
++};
++
++class SVX_DLLPUBLIC SRECT : public TBBase
++{
++public:
++    SRECT() : left(0), top(0), right(0), bottom(0) {}
++    sal_Int16 left;
++    sal_Int16 top;
++    sal_Int16 right;
++    sal_Int16 bottom;
++    bool Read( SvStream* pS ) { *pS >> left >> top >> right >> bottom; return true; }
++    void Print( FILE* fo );
++};
++
++typedef cppu::WeakImplHelper1< css::container::XIndexContainer > PropertyValueIndexContainer_BASE;
++
++class SVX_DLLPUBLIC TBVisualData : public TBBase
++{
++    sal_Int8 tbds;
++    sal_Int8 tbv;
++    sal_Int8 tbdsDock;
++    sal_Int8 iRow;
++
++    SRECT rcDock;
++    SRECT rcFloat;
++
++public:
++    TBVisualData();
++    ~TBVisualData(){}
++    bool Read(SvStream *pS);
++    void Print( FILE* );
++};
++#endif
+Index: svx/prj/d.lst
+===================================================================
+--- svx/prj/d.lst	(revision 276159)
++++ svx/prj/d.lst	(revision 276288)
+@@ -658,5 +658,7 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
+ ..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
+ ..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx
+ ..\inc\svx\optimprove.hxx %_DEST%\inc%_EXT%\svx\optimprove.hxx
++..\inc\svx\mstoolbar.hxx %_DEST%\inc%_EXT%\svx\mstoolbar.hxx
++..\inc\svx\msvbahelper.hxx %_DEST%\inc%_EXT%\svx\msvbahelper.hxx
+ 
+ ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
+Index: forms/source/component/RadioButton.hxx
+===================================================================
+--- forms/source/component/RadioButton.hxx	(revision 276159)
++++ forms/source/component/RadioButton.hxx	(revision 276288)
+@@ -87,6 +87,8 @@ class ORadioButtonModel		:public OReferenceValueCo
+             our mutex is aquired exactly once
+     */
+     void    setNewAggregateState( const ::com::sun::star::uno::Any& _rValue );
++
++    void setControlSource();
+ };
+ 
+ //==================================================================
+Index: forms/source/component/FormComponent.cxx
+===================================================================
+--- forms/source/component/FormComponent.cxx	(revision 276159)
++++ forms/source/component/FormComponent.cxx	(revision 276288)
+@@ -2754,8 +2754,8 @@ void SAL_CALL OBoundControlModel::setValueBinding(
+     OSL_PRECOND( m_bSupportsExternalBinding, "OBoundControlModel::setValueBinding: How did you reach this method?" );
+         // the interface for this method should not have been exposed if we do not
+         // support binding to external data
+-
+-    if ( !impl_approveValueBinding_nolock( _rxBinding ) )
++    // allow reset
++    if ( _rxBinding.is() && !impl_approveValueBinding_nolock( _rxBinding ) )
+     {
+         throw IncompatibleTypesException(
+             FRM_RES_STRING( RID_STR_INCOMPATIBLE_TYPES ),
+Index: forms/source/component/GroupManager.hxx
+===================================================================
+--- forms/source/component/GroupManager.hxx	(revision 276159)
++++ forms/source/component/GroupManager.hxx	(revision 276288)
+@@ -220,6 +220,8 @@ class OGroupManager	: public ::cppu::WeakImplHelpe
+ 	void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, ::rtl::OUString& Name);
+ 	void getGroupByName(const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup);
+ 	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > getControlModels();
++
++	static ::rtl::OUString GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent );
+ };
+ 
+ 
+Index: forms/source/component/ListBox.cxx
+===================================================================
+--- forms/source/component/ListBox.cxx	(revision 276159)
++++ forms/source/component/ListBox.cxx	(revision 276288)
+@@ -1549,6 +1549,8 @@ namespace frm
+     void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent) throw(RuntimeException)
+     {
+         // forward this to our listeners
++        Reference< XChild > xChild( getModel(), UNO_QUERY );
++        if ( xChild.is() && xChild->getParent().is() )
+         {
+             ::osl::MutexGuard aGuard( m_aMutex );
+             if ( m_aItemListeners.getLength() )
+@@ -1561,6 +1563,8 @@ namespace frm
+ 		        m_pItemBroadcaster->addEvent( new ItemEventDescription( _rEvent ), this );
+             }
+         }
++        else
++            m_aItemListeners.notifyEach( &XItemListener::itemStateChanged, _rEvent );
+ 
+         // and do the handling for the ChangeListeners
+         ::osl::ClearableMutexGuard aGuard(m_aMutex);
+Index: forms/source/component/RadioButton.cxx
+===================================================================
+--- forms/source/component/RadioButton.cxx	(revision 276159)
++++ forms/source/component/RadioButton.cxx	(revision 276288)
+@@ -31,6 +31,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_forms.hxx"
+ #include "RadioButton.hxx"
++#include "GroupManager.hxx"
+ #include "property.hxx"
+ #ifndef _FRM_PROPERTY_HRC_
+ #include "property.hrc"
+@@ -122,6 +123,7 @@ ORadioButtonModel::ORadioButtonModel(const Referen
+ 	m_nClassId = FormComponentType::RADIOBUTTON;
+ 	m_aLabelServiceName = FRM_SUN_COMPONENT_GROUPBOX;
+     initValueProperty( PROPERTY_STATE, PROPERTY_ID_STATE );
++	startAggregatePropertyListening( PROPERTY_GROUP_NAME );
+ }
+ 
+ //------------------------------------------------------------------
+@@ -169,7 +171,11 @@ StringSequence SAL_CALL	ORadioButtonModel::getSupp
+ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, const Any& rValue)
+ {
+ 	// mein Name
+-	::rtl::OUString sMyName(m_aName);
++    ::rtl::OUString sMyGroup;
++    if (hasProperty(PROPERTY_GROUP_NAME, this))
++        this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sMyGroup;
++    if (sMyGroup.getLength() == 0)
++        sMyGroup = m_aName;
+ 
+ 	// meine Siblings durchiterieren
+ 	Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
+@@ -177,8 +183,9 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::
+ 	{
+ 		Reference<XPropertySet> xMyProps;
+ 		query_interface(static_cast<XWeak*>(this), xMyProps);
+-		::rtl::OUString	sCurrentName;
+-		for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i)
++		::rtl::OUString	sCurrentGroup;
++		sal_Int32 nNumSiblings = xIndexAccess->getCount();
++		for (sal_Int32 i=0; i<nNumSiblings; ++i)
+ 		{
+ 			Reference<XPropertySet>	xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
+ 			if (!xSiblingProperties.is())
+@@ -195,8 +202,8 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::
+ 				continue;
+ 
+ 			// das 'zur selben Gruppe gehoeren' wird am Namen festgemacht
+-			xSiblingProperties->getPropertyValue(PROPERTY_NAME) >>= sCurrentName;
+-			if (sCurrentName == sMyName)
++			sCurrentGroup = OGroupManager::GetGroupName( xSiblingProperties );
++			if (sCurrentGroup == sMyGroup)
+ 				xSiblingProperties->setPropertyValue(rPropName, rValue);
+ 		}
+ 	}
+@@ -223,13 +230,35 @@ void ORadioButtonModel::setFastPropertyValue_NoBro
+ 	// die andere Richtung : wenn sich mein Name aendert ...
+ 	if (nHandle == PROPERTY_ID_NAME)
+ 	{
+-		// ... muss ich testen, ob ich Siblings mit dem selben Namen habe, damit ich deren ControlSource uebernehmen kann
++        setControlSource();
++	}
++
++	if (nHandle == PROPERTY_ID_DEFAULT_STATE)
++	{
++		sal_Int16 nValue;
++		rValue >>= nValue;
++		if (1 == nValue)
++		{	// bei allen Radios der selben Gruppe das 'default checked' ruecksetzen, denn wie schon der highlander wusste :
++			// es kann nur einen geben.
++			Any aZero;
++			nValue = 0;
++			aZero <<= nValue;
++			SetSiblingPropsTo(PROPERTY_DEFAULT_STATE, aZero);
++		}
++	}
++}
++
++void ORadioButtonModel::setControlSource()
++{
+ 		Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
+ 		if (xIndexAccess.is())
+ 		{
+-			::rtl::OUString			sName;
+-			::rtl::OUString			sControlSource;
++        ::rtl::OUString sName, sGroupName;
+ 
++        if (hasProperty(PROPERTY_GROUP_NAME, this))
++            this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sGroupName;
++        this->getPropertyValue(PROPERTY_NAME) >>= sName;
++
+ 			Reference<XPropertySet> xMyProps;
+ 			query_interface(static_cast<XWeak*>(this), xMyProps);
+ 			for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i)
+@@ -248,9 +277,15 @@ void ORadioButtonModel::setFastPropertyValue_NoBro
+ 					// nur Radio-Buttons
+ 					continue;
+ 
+-				xSiblingProperties->getPropertyValue(PROPERTY_NAME) >>= sName;
+-				// Control, das zur gleichen Gruppe gehoert ?
+-				if (rValue == sName)
++            ::rtl::OUString sSiblingName, sSiblingGroupName;
++            if (hasProperty(PROPERTY_GROUP_NAME, xSiblingProperties))
++                xSiblingProperties->getPropertyValue(PROPERTY_GROUP_NAME) >>= sSiblingGroupName;
++            xSiblingProperties->getPropertyValue(PROPERTY_NAME) >>= sSiblingName;
++
++            if ((sGroupName.getLength() == 0 && sSiblingGroupName.getLength() == 0 &&   // (no group name
++                 sName == sSiblingName) ||                                              //  names match) or
++                (sGroupName.getLength() != 0 && sSiblingGroupName.getLength() != 0 &&   // (have group name
++                 sGroupName == sSiblingGroupName))                                      //  they match)
+ 				{
+ 					setPropertyValue(PROPERTY_CONTROLSOURCE, xSiblingProperties->getPropertyValue(PROPERTY_CONTROLSOURCE));
+ 					break;
+@@ -259,21 +294,6 @@ void ORadioButtonModel::setFastPropertyValue_NoBro
+ 		}
+ 	}
+ 
+-	if (nHandle == PROPERTY_ID_DEFAULT_STATE)
+-	{
+-		sal_Int16 nValue;
+-		rValue >>= nValue;
+-		if (1 == nValue)
+-		{	// bei allen Radios der selben Gruppe das 'default checked' ruecksetzen, denn wie schon der highlander wusste :
+-			// es kann nur einen geben.
+-			Any aZero;
+-			nValue = 0;
+-			aZero <<= nValue;
+-			SetSiblingPropsTo(PROPERTY_DEFAULT_STATE, aZero);
+-		}
+-	}
+-}
+-
+ //------------------------------------------------------------------------------
+ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const
+ {
+@@ -363,6 +383,13 @@ void ORadioButtonModel::_propertyChanged(const Pro
+ 			SetSiblingPropsTo( PROPERTY_STATE, aZero );
+ 		}
+ 	}
++    else if ( _rEvent.PropertyName.equals( PROPERTY_GROUP_NAME ) )
++    {
++        setControlSource();
++        // Can't call OReferenceValueComponent::_propertyChanged(), as it
++        // doesn't know what to do with the GroupName property.
++        return;
++    }
+ 
+     OReferenceValueComponent::_propertyChanged( _rEvent );
+ }
+Index: forms/source/component/GroupManager.cxx
+===================================================================
+--- forms/source/component/GroupManager.cxx	(revision 276159)
++++ forms/source/component/GroupManager.cxx	(revision 276288)
+@@ -127,14 +127,13 @@ OGroupComp::OGroupComp(const Reference<XPropertySe
+     ,m_xControlModel(rxSet,UNO_QUERY)
+     ,m_nPos( nInsertPos )
+     ,m_nTabIndex(0)
++    ,m_aName( OGroupManager::GetGroupName( rxSet ) )
+ {
+ 	if (m_xComponent.is())
+ 	{
+ 		if (hasProperty( PROPERTY_TABINDEX, m_xComponent ) )
+ 			// Indices kleiner 0 werden wie 0 behandelt
+ 			m_nTabIndex = Max(getINT16(m_xComponent->getPropertyValue( PROPERTY_TABINDEX )) , sal_Int16(0));
+-
+-		m_xComponent->getPropertyValue( PROPERTY_NAME ) >>= m_aName;
+ 	}
+ }
+ 
+@@ -321,7 +320,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl
+ 		aFind->second.RemoveComponent( _xSet );
+ 
+ 		// Wenn Anzahl der Gruppenelemente == 1 ist, Gruppe deaktivieren
+-		if ( aFind->second.Count() == 1 )
++		sal_Int32 nCount = aFind->second.Count();
++		if ( nCount == 1 || nCount == 0 )
+ 		{
+ 			OActiveGroups::iterator aActiveFind = ::std::find(
+                 m_aActiveGroupMap.begin(),
+@@ -332,7 +332,7 @@ void OGroupManager::removeFromGroupMap(const ::rtl
+             {
+                 // the group is active. Deactivate it if the remaining component
+                 // is *no* radio button
+-                if ( !isRadioButton( aFind->second.GetObject( 0 ) ) )
++                if ( nCount == 0 || !isRadioButton( aFind->second.GetObject( 0 ) ) )
+ 				    m_aActiveGroupMap.erase( aActiveFind );
+             }
+ 		}
+@@ -341,6 +341,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl
+ 
+ 	// Bei Component als PropertyChangeListener abmelden
+ 	_xSet->removePropertyChangeListener( PROPERTY_NAME, this );
++	if (hasProperty(PROPERTY_GROUP_NAME, _xSet))
++		_xSet->removePropertyChangeListener( PROPERTY_GROUP_NAME, this );
+ 	if (hasProperty(PROPERTY_TABINDEX, _xSet))
+ 		_xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this );
+ }
+@@ -351,10 +353,23 @@ void SAL_CALL OGroupManager::propertyChange(const
+ 
+ 	// Component aus Gruppe entfernen
+ 	::rtl::OUString		sGroupName;
+-	if (evt.PropertyName == PROPERTY_NAME)
++	if (hasProperty( PROPERTY_GROUP_NAME, xSet ))
++		xSet->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName;
++	if (evt.PropertyName == PROPERTY_NAME) {
++		if (sGroupName.getLength() > 0)
++			return; // group hasn't changed; ignore this name change.
++		// no GroupName; use Name as GroupNme
+ 		evt.OldValue >>= sGroupName;
++	}
++	else if (evt.PropertyName == PROPERTY_GROUP_NAME) {
++		evt.OldValue >>= sGroupName;
++		if (sGroupName.getLength() == 0) {
++			// No prior GroupName; fallback to Nme
++			xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
++		}
++	}
+ 	else
+-		xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
++		sGroupName = GetGroupName( xSet );
+ 
+ 	removeFromGroupMap(sGroupName,xSet);
+ 
+@@ -437,8 +452,7 @@ void OGroupManager::InsertElement( const Reference
+ 	m_pCompGroup->InsertComponent( xSet );
+ 
+ 	// Component in Gruppe aufnehmen
+-	::rtl::OUString sGroupName;
+-	xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
++	::rtl::OUString sGroupName( GetGroupName( xSet ) );
+ 
+ 	OGroupArr::iterator aFind = m_aGroupArr.find(sGroupName);
+ 
+@@ -476,6 +490,8 @@ void OGroupManager::InsertElement( const Reference
+ 
+ 	// Bei Component als PropertyChangeListener anmelden
+ 	xSet->addPropertyChangeListener( PROPERTY_NAME, this );
++	if (hasProperty(PROPERTY_GROUP_NAME, xSet))
++		xSet->addPropertyChangeListener( PROPERTY_GROUP_NAME, this );
+ 
+     // Tabindex muss nicht jeder unterstuetzen
+ 	if (hasProperty(PROPERTY_TABINDEX, xSet))
+@@ -492,12 +508,26 @@ void OGroupManager::RemoveElement( const Reference
+ 		return;
+ 
+ 	// Component aus Gruppe entfernen
+-	::rtl::OUString		sGroupName;
+-	xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
++	::rtl::OUString		sGroupName( GetGroupName( xSet ) );
+ 
+ 	removeFromGroupMap(sGroupName,xSet);
+ }
+ 
++::rtl::OUString OGroupManager::GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent )
++{
++    if (!xComponent.is())
++        return ::rtl::OUString();
++    ::rtl::OUString sGroupName;
++    if (hasProperty( PROPERTY_GROUP_NAME, xComponent )) {
++        xComponent->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName;
++        if (sGroupName.getLength() == 0)
++            xComponent->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
++    }
++    else
++        xComponent->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
++    return sGroupName;
++}
++
+ //.........................................................................
+ }	// namespace frm
+ //.........................................................................
+Index: forms/source/inc/property.hrc
+===================================================================
+--- forms/source/inc/property.hrc	(revision 276159)
++++ forms/source/inc/property.hrc	(revision 276288)
+@@ -63,6 +63,7 @@ namespace frm
+ #define PROPERTY_ID_INPUT_REQUIRED      (PROPERTY_ID_START + 19)
+ #define PROPERTY_ID_WRITING_MODE        (PROPERTY_ID_START + 20)
+ #define PROPERTY_ID_CONTEXT_WRITING_MODE    (PROPERTY_ID_START + 21)
++#define PROPERTY_ID_GROUP_NAME          (PROPERTY_ID_START + 22)
+     // free
+     // free
+     // free
+@@ -71,7 +72,6 @@ namespace frm
+     // free
+     // free
+     // free
+-    // free
+ #define PROPERTY_ID_VALUE               (PROPERTY_ID_START + 31)    // INT32
+     // free
+ #define PROPERTY_ID_FORMATKEY           (PROPERTY_ID_START + 33)    // UINT32
+Index: forms/source/inc/frm_strings.hxx
+===================================================================
+--- forms/source/inc/frm_strings.hxx	(revision 276159)
++++ forms/source/inc/frm_strings.hxx	(revision 276288)
+@@ -100,6 +100,7 @@ namespace frm
+     FORMS_CONSTASCII_STRING( PROPERTY_TABINDEX,                 "TabIndex" );
+     FORMS_CONSTASCII_STRING( PROPERTY_TAG,                      "Tag" );
+     FORMS_CONSTASCII_STRING( PROPERTY_NAME,                     "Name" );
++    FORMS_CONSTASCII_STRING( PROPERTY_GROUP_NAME,               "GroupName" );
+     FORMS_CONSTASCII_STRING( PROPERTY_CLASSID,                  "ClassId" );
+     FORMS_CONSTASCII_STRING( PROPERTY_FETCHSIZE,                "FetchSize" );
+     FORMS_CONSTASCII_STRING( PROPERTY_VALUE,                    "Value" );
+Index: forms/source/inc/InterfaceContainer.hxx
+===================================================================
+--- forms/source/inc/InterfaceContainer.hxx	(revision 276159)
++++ forms/source/inc/InterfaceContainer.hxx	(revision 276288)
+@@ -275,6 +275,9 @@ class OInterfaceContainer :	public OInterfaceConta
+ 	void implCheckIndex( const sal_Int32 _nIndex ) SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) );
+ 
+ private:
++	// hack for Vba Events
++	void fakeVbaEventsHack( sal_Int32 _nIndex );
++
+ 	// the runtime event format has changed from version SO5.2 to OOo
+ 	enum EventFormat
+ 	{
+Index: forms/source/misc/makefile.mk
+===================================================================
+--- forms/source/misc/makefile.mk	(revision 276159)
++++ forms/source/misc/makefile.mk	(revision 276288)
+@@ -45,6 +45,7 @@ ENABLE_EXCEPTIONS=TRUE
+ # --- Types -------------------------------------
+ 
+ INCPRE+=$(SOLARINCDIR)$/offuh
++INCPRE*=$(INCCOM)$/$(TARGET)
+ 
+ # --- Files -------------------------------------
+ 
+@@ -62,3 +63,12 @@ SLOFILES=	$(SLO)$/limitedformats.obj \
+ 
+ .INCLUDE : target.mk
+ 
++ALLTAR : \
++        $(MISC)$/$(TARGET).don \
++
++$(SLOFILES) : $(MISC)$/$(TARGET).don
++
++$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++        echo $@
++
+Index: forms/source/misc/InterfaceContainer.cxx
+===================================================================
+--- forms/source/misc/InterfaceContainer.cxx	(revision 276159)
++++ forms/source/misc/InterfaceContainer.cxx	(revision 276288)
+@@ -60,13 +60,20 @@
+ #include <memory>
+ 
+ //.........................................................................
++#include <com/sun/star/frame/XModel.hpp>
++#include <com/sun/star/document/XCodeNameQuery.hpp>
++#include <ooo/vba/XVBAToOOEventDescGen.hpp>
++#include <comphelper/processfactory.hxx>
++
+ namespace frm
+ {
+ //.........................................................................
+ 
++using namespace ::com::sun::star::frame;
+ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star::beans;
++using namespace ::com::sun::star::document;
+ using namespace ::com::sun::star::container;
+ using namespace ::com::sun::star::script;
+ using namespace ::com::sun::star::io;
+@@ -82,6 +89,89 @@ namespace
+ 	}
+ }
+ 
++bool
++lcl_hasVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents  )
++{
++	const ScriptEventDescriptor* pDesc = sEvents.getConstArray();
++	const ScriptEventDescriptor* pEnd = ( pDesc + sEvents.getLength() );
++	for ( ; pDesc != pEnd; ++pDesc )
++	{
++		if ( pDesc->ScriptType.equals( rtl::OUString::createFromAscii( "VBAInterop" ) ) )
++			return true;
++	}
++	return false;
++}
++
++Sequence< ScriptEventDescriptor >
++lcl_stripVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents )
++{
++	Sequence< ScriptEventDescriptor > sStripped( sEvents.getLength() );
++	
++	const ScriptEventDescriptor* pDesc = sEvents.getConstArray();
++	const ScriptEventDescriptor* pEnd = ( pDesc + sEvents.getLength() );
++	sal_Int32 nCopied = 0;
++	for ( ; pDesc != pEnd; ++pDesc )
++	{
++		if ( !pDesc->ScriptType.equals( rtl::OUString::createFromAscii( "VBAInterop" ) ) )
++		{
++			sStripped[ nCopied++ ] = *pDesc;
++		}
++	}
++	if ( nCopied )
++		sStripped.realloc( nCopied );
++	return sStripped;
++}
++
++void
++OInterfaceContainer::fakeVbaEventsHack(  sal_Int32 _nIndex )
++{
++	// we are dealing with form controls
++	try
++	{
++		Reference< XFormComponent > xForm( static_cast< XContainer* >(this), UNO_QUERY_THROW );
++		// grand-parent should be the model, no parent ? if not
++		// we'll ignore,  we'll get called back here  anyway )
++		Reference< XChild > xChild(  xForm->getParent(), UNO_QUERY_THROW );
++		Reference< XModel > xDocOwner( xChild->getParent(), UNO_QUERY );
++		OSL_TRACE(" Is DOC ????? %s", xDocOwner.is() ? "true" : "false" );
++		if ( xDocOwner.is() )
++		{
++			bool hasVBABindings = lcl_hasVbaEvents( m_xEventAttacher->getScriptEvents( _nIndex ) );  
++			if ( hasVBABindings )
++			{
++				OSL_TRACE("Has VBA bindings already, returning ");
++				return;
++			}
++			Reference< XMultiServiceFactory > xFac(  comphelper::getProcessServiceFactory(), UNO_QUERY );
++			Reference< XMultiServiceFactory > xDocFac(  xDocOwner, UNO_QUERY );
++			if ( xFac.is() && xDocFac.is() )
++			{
++				try
++				{
++					Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( xFac->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBAToOOEventDesc" ) ), UNO_QUERY_THROW );
++					Reference< XInterface > xIf( getByIndex( _nIndex ) , UNO_QUERY_THROW );
++					Reference< XCodeNameQuery > xNameQuery(  xDocFac->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBACodeNameProvider" ) ), UNO_QUERY_THROW );
++					rtl::OUString sCodeName;	
++					sCodeName = xNameQuery->getCodeNameForObject( xIf );
++					Reference< XPropertySet > xProps( xIf, UNO_QUERY );
++					rtl::OUString sServiceName;
++					xProps->getPropertyValue( rtl::OUString::createFromAscii("DefaultControl" ) ) >>= sServiceName;
++
++					Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( xFac->createInstance( sServiceName ), sCodeName );
++					// register the vba script events
++					if ( m_xEventAttacher.is() )
++						m_xEventAttacher->registerScriptEvents( _nIndex, vbaEvents );
++				}
++				catch( Exception& e ){ OSL_TRACE("lcl_fakevbaevents - Caught Exception trying to create control eventstuff "); }
++			}
++
++		}
++	}
++	catch( Exception& e )
++	{
++	}
++
++}
+ //==================================================================
+ //= ElementDescription
+ //==================================================================
+@@ -739,6 +829,7 @@ void OInterfaceContainer::approveNewElement( const
+ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XPropertySet >& _rxElement,
+ 	sal_Bool _bEvents, ElementDescription* _pApprovalResult, sal_Bool _bFire ) throw( IllegalArgumentException )
+ {
++        OSL_TRACE("OInterfaceContainer::implInsert( %d)", _nIndex );
+ 	RTL_LOGFILE_CONTEXT( aLogger, "forms::OInterfaceContainer::implInsert" );
+ 
+ 	::osl::ClearableMutexGuard aGuard( m_rMutex );
+@@ -788,7 +879,24 @@ void OInterfaceContainer::implInsert(sal_Int32 _nI
+ 	{
+ 		m_xEventAttacher->insertEntry(_nIndex);
+ 		m_xEventAttacher->attach( _nIndex, pElementMetaData->xInterface, makeAny( _rxElement ) );
++		// insert fake events?
++		Reference< XEventAttacherManager > xMgr ( pElementMetaData->xInterface, UNO_QUERY );
++		if ( xMgr.is() )
++		{ 
++			OInterfaceContainer* pIfcMgr = dynamic_cast< OInterfaceContainer* >( xMgr.get() );
++			sal_Int32 nLen = pIfcMgr->getCount();
++			for ( sal_Int32 i = 0; (i < nLen) && pIfcMgr ; ++i )
++			{	
++				// add fake events to the control at index i
++				pIfcMgr->fakeVbaEventsHack( i );
+ 	}
++		}
++		else
++		{
++			// add fake events to the control at index i
++			fakeVbaEventsHack(  _nIndex );	
++		}
++	}
+ 
+ 	// notify derived classes
+ 	implInserted( pElementMetaData );
+@@ -1082,20 +1190,29 @@ void SAL_CALL OInterfaceContainer::removeByName(co
+ //------------------------------------------------------------------------
+ void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const ScriptEventDescriptor& aScriptEvent ) throw(IllegalArgumentException, RuntimeException)
+ {
++    OSL_TRACE("*** registerScriptEvent %d", nIndex);
+     if ( m_xEventAttacher.is() )
++    {
+ 	    m_xEventAttacher->registerScriptEvent( nIndex, aScriptEvent );
++            fakeVbaEventsHack( nIndex ); // add fake vba events
+ }
++}
+ 
+ //------------------------------------------------------------------------
+ void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& aScriptEvents ) throw(IllegalArgumentException, RuntimeException)
+ {
++    OSL_TRACE("*** registerScriptEvent(s) %d", nIndex);
+     if ( m_xEventAttacher.is() )
++    {
+     	m_xEventAttacher->registerScriptEvents( nIndex, aScriptEvents );
++        fakeVbaEventsHack( nIndex ); // add fake vba events
+ }
++}
+ 
+ //------------------------------------------------------------------------
+ void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const ::rtl::OUString& aListenerType, const ::rtl::OUString& aEventMethod, const ::rtl::OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException)
+ {
++    OSL_TRACE("*** revokeScriptEvent %d listenertype %s, eventMethod %s", nIndex, rtl::OUStringToOString( aListenerType, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( aEventMethod, RTL_TEXTENCODING_UTF8 ).getStr());
+     if ( m_xEventAttacher.is() )
+     	m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam );
+ }
+@@ -1124,9 +1241,16 @@ void SAL_CALL OInterfaceContainer::removeEntry( sa
+ //------------------------------------------------------------------------
+ Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException)
+ {
++    OSL_TRACE("getScriptEvents");
+     Sequence< ScriptEventDescriptor > aReturn;
+     if ( m_xEventAttacher.is() )
++    {
+ 	    aReturn = m_xEventAttacher->getScriptEvents( nIndex );
++            if ( lcl_hasVbaEvents( aReturn ) )
++            {
++                aReturn = lcl_stripVbaEvents( aReturn );
++            }
++    }
+     return aReturn;
+ }
+ 
+Index: svtools/source/misc/bindablecontrolhelper.cxx
+===================================================================
+--- svtools/source/misc/bindablecontrolhelper.cxx	(revision 0)
++++ svtools/source/misc/bindablecontrolhelper.cxx	(revision 276288)
+@@ -0,0 +1,162 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: imageresourceaccess.cxx,v $
++ * $Revision: 1.5 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_svtools.hxx"
++#include "bindablecontrolhelper.hxx"
++#include <com/sun/star/form/binding/XBindableValue.hpp>
++#include <com/sun/star/form/binding/XValueBinding.hpp>
++#include <com/sun/star/form/binding/XListEntrySink.hpp>
++#include <com/sun/star/form/binding/XListEntrySource.hpp>
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
++#include <com/sun/star/table/CellRangeAddress.hpp>
++#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
++#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
++#include <com/sun/star/lang/XMultiServiceFactory.hpp>
++#include <com/sun/star/table/CellAddress.hpp>
++#include <com/sun/star/beans/NamedValue.hpp>
++
++//........................................................................
++namespace svt
++{
++//........................................................................
++
++#ifndef C2U
++#define C2U(cChar)	rtl::OUString::createFromAscii(cChar)
++#endif
++
++    using namespace ::com::sun::star;
++
++bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress )
++{
++    bool bRes = false;
++    const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
++    uno::Reference< sheet::XCellRangeReferrer > xReferrer;
++    try
++    {
++        uno::Reference< beans::XPropertySet > xPropSet( xModel, uno::UNO_QUERY_THROW );
++        uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW );
++        xReferrer.set ( xNamed->getByName( sAddress ), uno::UNO_QUERY );
++    }
++    catch( uno::Exception& /*e*/ )
++    {
++        // do nothing
++    }
++    if ( xReferrer.is() )
++    {
++        uno::Reference< sheet::XCellRangeAddressable > xRangeAddressable( xReferrer->getReferredCells(), uno::UNO_QUERY );
++        if ( xRangeAddressable.is() )
++        {
++            aAddress = xRangeAddressable->getRangeAddress();
++            bRes = true;
++        }
++    }
++    return bRes;
++}
++
++
++void
++BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource )
++{
++// XBindable etc.
++    uno::Reference< lang::XMultiServiceFactory > xFac;
++    if ( xModel.is() )
++        xFac.set( xModel, uno::UNO_QUERY );
++    uno::Reference< form::binding::XBindableValue > xBindable( rObj, uno::UNO_QUERY );
++    if (  xFac.is() && rsCtrlSource.getLength() && xBindable.is() )
++    {
++         
++         // OOo address structures
++         // RefCell - convert from XL
++         // pretend we converted the imported string address into the
++         // appropriate address structure
++         uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( C2U( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );
++         table::CellAddress aAddress;
++         if ( xConvertor.is() )
++         {
++             // we need this service to properly convert XL notation also
++             // Should be easy to extend
++             xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsCtrlSource ) );
++             xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress;    
++         }
++        
++         beans::NamedValue aArg1;
++         aArg1.Name = C2U("BoundCell");
++         aArg1.Value <<= aAddress;
++
++         uno::Sequence< uno::Any > aArgs(1);
++         aArgs[ 0 ]  <<= aArg1;
++
++         uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY );
++         xBindable->setValueBinding( xBinding );
++    }
++    else if ( xBindable.is() ) // reset it
++        xBindable->setValueBinding( uno::Reference< form::binding::XValueBinding >() );
++    uno::Reference< form::binding::XListEntrySink > xListEntrySink( rObj, uno::UNO_QUERY );
++    if (  xFac.is() && rsRowSource.getLength() && xListEntrySink.is() )
++    {
++         
++         // OOo address structures
++         // RefCell - convert from XL
++         // pretend we converted the imported string address into the
++         // appropriate address structure
++         uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( C2U( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );
++         table::CellRangeAddress aAddress;
++         if ( xConvertor.is() )
++         {
++             if ( !lcl_isNamedRange( rsRowSource, xModel, aAddress ) )
++             {
++                 // we need this service to properly convert XL notation also
++                 // Should be easy to extend
++                 xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsRowSource ) );
++                 xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress;
++             }
++         }
++        
++         beans::NamedValue aArg1;
++         aArg1.Name = C2U("CellRange");
++         aArg1.Value <<= aAddress;
++
++         uno::Sequence< uno::Any > aArgs(1);
++         aArgs[ 0 ]  <<= aArg1;
++
++         uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellRangeListSource" ), aArgs ), uno::UNO_QUERY );
++         xListEntrySink->setListEntrySource( xSource );
++    }
++    else if (  xListEntrySink.is() ) // reset
++         xListEntrySink->setListEntrySource( uno::Reference< form::binding::XListEntrySource >()  );
++
++}
++
++//........................................................................
++} // namespace svt
++//........................................................................
++
+Index: svtools/source/misc/filterutils.cxx
+===================================================================
+--- svtools/source/misc/filterutils.cxx	(revision 0)
++++ svtools/source/misc/filterutils.cxx	(revision 276288)
+@@ -0,0 +1,56 @@
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_svtools.hxx"
++#include "filterutils.hxx"
++#include <rtl/ustrbuf.hxx>
++
++namespace svt
++{
++//........................................................................
++
++    using namespace ::com::sun::star;
++
++    rtl::OUString lcl_createStringFromArray( const char* pcCharArr, sal_uInt32 nBufSize, bool bIsCompressed )
++    {
++        rtl::OUStringBuffer aBuffer;
++        if( bIsCompressed )
++        {
++            // buffer contains compressed Unicode, not encoded bytestring
++            sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize );
++            aBuffer.setLength( nStrLen );
++            const char* pcCurrChar = pcCharArr;
++            for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar, ++pcCurrChar )
++                /*  *pcCurrChar may contain negative values and therefore MUST be
++                    casted to unsigned char, before assigned to a sal_Unicode. */
++                aBuffer.setCharAt( nChar, static_cast< unsigned char >( *pcCurrChar ) );
++        }
++        else
++        {
++            // buffer contains Little-Endian Unicode
++            sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize ) / 2;
++            aBuffer.setLength( nStrLen );
++            const char* pcCurrChar = pcCharArr;
++            for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar )
++            {
++                /*  *pcCurrChar may contain negative values and therefore MUST be
++                    casted to unsigned char, before assigned to a sal_Unicode. */
++                sal_Unicode cChar = static_cast< unsigned char >( *pcCurrChar++ );
++                cChar |= (static_cast< unsigned char >( *pcCurrChar++ ) << 8);
++                aBuffer.setCharAt( nChar, cChar );
++            }
++        }
++        return aBuffer.makeStringAndClear();
++    }
++
++    rtl::OUString BinFilterUtils::CreateOUStringFromUniStringArray( const char* pcCharArr, sal_uInt32 nBufSize )
++    {
++        return lcl_createStringFromArray( pcCharArr, nBufSize, false );
++    }
++
++    rtl::OUString BinFilterUtils::CreateOUStringFromStringArray( const char* pcCharArr, sal_uInt32 nBufSize )
++    {
++        return lcl_createStringFromArray( pcCharArr, nBufSize, true );
++    }    
++//........................................................................
++} // namespace svt
++//........................................................................
++
+Index: svtools/source/misc/makefile.mk
+===================================================================
+--- svtools/source/misc/makefile.mk	(revision 276159)
++++ svtools/source/misc/makefile.mk	(revision 276288)
+@@ -85,6 +85,8 @@ SLOFILES=\
+     $(SLO)$/lockfilecommon.obj     \
+     $(SLO)$/sharecontrolfile.obj   \
+     $(SLO)$/documentlockfile.obj   \
++    $(SLO)$/bindablecontrolhelper.obj   \
++    $(SLO)$/filterutils.obj   \
+     $(SLO)$/langtab.obj
+ 
+ # --- Targets -------------------------------------------------------
+Index: svtools/inc/bindablecontrolhelper.hxx
+===================================================================
+--- svtools/inc/bindablecontrolhelper.hxx	(revision 0)
++++ svtools/inc/bindablecontrolhelper.hxx	(revision 276288)
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: imageresourceaccess.hxx,v $
++ * $Revision: 1.5 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef SVTOOLS_INC_BINDABLECONTROL_HXX
++#define SVTOOLS_INC_BINDABLECONTROL_HXX
++
++#include "svtools/svtdllapi.h"
++
++#include <com/sun/star/frame/XModel.hpp>
++//........................................................................
++namespace svt
++{
++//........................................................................
++
++    //====================================================================
++    //= GraphicAccess
++    //====================================================================
++    /** helper class for obtaining streams (which also can be used with the ImageProducer)
++        from a resource
++    */
++    class BindableControlHelper
++    {
++    private:
++        BindableControlHelper();    // never implemented
++
++    public:
++        SVT_DLLPUBLIC static  void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource );
++    };
++
++//........................................................................
++} // namespace svt
++//........................................................................
++
++#endif // DBA14_SVTOOLS_INC_IMAGERESOURCEACCESS_HXX
++
+Index: svtools/inc/filterutils.hxx
+===================================================================
+--- svtools/inc/filterutils.hxx	(revision 0)
++++ svtools/inc/filterutils.hxx	(revision 276288)
+@@ -0,0 +1,22 @@
++#ifndef SVTOOLS_INC_FILTERUTILS_HXX
++#define SVTOOLS_INC_FILTERUTILS_HXX
++
++#include "svtools/svtdllapi.h"
++#include <com/sun/star/uno/RuntimeException.hpp>
++namespace svt
++{
++    class BinFilterUtils
++    {
++    private:
++        BinFilterUtils();    // never implemented
++
++    public:
++        SVT_DLLPUBLIC static  rtl::OUString CreateOUStringFromUniStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
++        SVT_DLLPUBLIC static  rtl::OUString CreateOUStringFromStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
++    };
++
++//........................................................................
++} // namespace svt
++//........................................................................
++
++#endif 
+Index: svtools/prj/d.lst
+===================================================================
+--- svtools/prj/d.lst	(revision 276159)
++++ svtools/prj/d.lst	(revision 276288)
+@@ -172,6 +172,8 @@ mkdir: %_DEST%\inc%_EXT%\svtools
+ ..\inc\svtools\logindlg.hxx %_DEST%\inc%_EXT%\svtools\logindlg.hxx
+ ..\inc\svtools\httpcook.hxx %_DEST%\inc%_EXT%\svtools\httpcook.hxx
+ ..\inc\imageresourceaccess.hxx %_DEST%\inc%_EXT%\svtools\imageresourceaccess.hxx
++..\inc\bindablecontrolhelper.hxx %_DEST%\inc%_EXT%\svtools\bindablecontrolhelper.hxx
++..\inc\filterutils.hxx %_DEST%\inc%_EXT%\svtools\filterutils.hxx
+ ..\inc\svtools\itemprop.hxx %_DEST%\inc%_EXT%\svtools\itemprop.hxx
+ ..\inc\addresstemplate.hxx %_DEST%\inc%_EXT%\svtools\addresstemplate.hxx
+ ..\inc\svtools\genericunodialog.hxx %_DEST%\inc%_EXT%\svtools\genericunodialog.hxx
+Index: udkapi/com/sun/star/script/ModuleType.idl
+===================================================================
+--- udkapi/com/sun/star/script/ModuleType.idl	(revision 0)
++++ udkapi/com/sun/star/script/ModuleType.idl	(revision 276288)
+@@ -0,0 +1,58 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: ModuleType.idl,v $
++ *
++ *  $Revision: 1.2 $
++ *
++ *  last change: $Author: rt $ $Date: 2006/05/05 10:14:46 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef __com_sun_star_script_ModuleType_idl__
++#define __com_sun_star_script_ModuleType_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++//=============================================================================
++module com {  module sun {  module star { module script {
++published constants ModuleType
++{
++    const long Unknown = 0;
++    const long Normal = 1;  
++    const long Class = 2;
++    const long Form = 3;
++    const long Document = 4;
++};
++
++//=============================================================================
++
++}; }; }; };
++
++#endif
+Index: udkapi/com/sun/star/script/ModuleInfo.idl
+===================================================================
+--- udkapi/com/sun/star/script/ModuleInfo.idl	(revision 0)
++++ udkapi/com/sun/star/script/ModuleInfo.idl	(revision 276288)
+@@ -0,0 +1,57 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: ModuleInfo.idl,v $
++ *
++ *  $Revision: 1.2 $
++ *
++ *  last change: $Author: rt $ $Date: 2006/05/05 10:14:46 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef __com_sun_star_script_ModuleInfo_idl__
++#define __com_sun_star_script_ModuleInfo_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++//=============================================================================
++module com {  module sun {  module star { module script {
++struct ModuleInfo
++{
++	string ModuleName; 
++	string ModuleSource; 
++	com::sun::star::uno::XInterface ModuleObject; 
++	short ModuleType; // string?
++};
++
++//=============================================================================
++
++}; }; }; };
++
++#endif
+Index: udkapi/com/sun/star/script/XErrorQuery.idl
+===================================================================
+--- udkapi/com/sun/star/script/XErrorQuery.idl	(revision 0)
++++ udkapi/com/sun/star/script/XErrorQuery.idl	(revision 276288)
+@@ -0,0 +1,25 @@
++#ifndef __com_sun_star_script_XErrorQuery_idl__
++#define __com_sun_star_script_XErrorQuery_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++module com { module sun { module star { module script {
++//==============================================================================
++
++interface XErrorQuery : ::com::sun::star::uno::XInterface
++{
++  //-----------------------------------------------------------------------
++  /**
++    Returns whether this object has an error
++
++    @return
++    <atom>boolean</atom> indicating an error or not
++  */
++  boolean hasError();
++
++};
++
++};  };  };  };
++#endif
+Index: udkapi/com/sun/star/script/makefile.mk
+===================================================================
+--- udkapi/com/sun/star/script/makefile.mk	(revision 276159)
++++ udkapi/com/sun/star/script/makefile.mk	(revision 276288)
+@@ -85,6 +85,10 @@ IDLFILES=\
+ 	XScriptEventsAttacher.idl\
+ 	XDefaultMethod.idl\
+ 	XDefaultProperty.idl\
++	XAutomationInvocation.idl\
++    ModuleInfo.idl\
++    ModuleType.idl\
++    XErrorQuery.idl\
+ 
+ # ------------------------------------------------------------------
+ 
+Index: udkapi/com/sun/star/script/XAutomationInvocation.idl
+===================================================================
+--- udkapi/com/sun/star/script/XAutomationInvocation.idl	(revision 0)
++++ udkapi/com/sun/star/script/XAutomationInvocation.idl	(revision 276288)
+@@ -0,0 +1,51 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XInvocation2.idl,v $
++ * $Revision: 1.10 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __com_sun_star_script_XAutomationInvocation_idl__ 
++#define __com_sun_star_script_XAutomationInvocation_idl__
++ 
++#ifndef __com_sun_star_script_XInvocation_idl__ 
++#include <com/sun/star/script/XInvocation.idl> 
++#endif 
++ 
++ 
++ module com {  module sun {  module star {  module script {  
++ 
++interface XAutomationInvocation: com::sun::star::script::XInvocation
++{ 
++    any invokeGetProperty(  [in] string aFunctionName, [in] sequence<any> aParams, [out] sequence<short> aOutParamIndex, [out] sequence<any> aOutParam ) raises( com::sun::star::lang::IllegalArgumentException, com::sun::star::script::CannotConvertException, com::sun::star::reflection::InvocationTargetException );
++    any invokePutProperty(  [in] string aFunctionName, [in] sequence<any> aParams, [out] sequence<short> aOutParamIndex, [out] sequence<any> aOutParam ) raises( com::sun::star::lang::IllegalArgumentException, com::sun::star::script::CannotConvertException, com::sun::star::reflection::InvocationTargetException );
++ 
++}; 
++ 
++//============================================================================= 
++ 
++}; }; }; };  
++ 
++#endif 
diff --git a/applied_patches/0325-vba-worksheet-enableselection.diff b/applied_patches/0325-vba-worksheet-enableselection.diff
deleted file mode 100644
index f2fd688d2..000000000
--- a/applied_patches/0325-vba-worksheet-enableselection.diff
+++ /dev/null
@@ -1,116 +0,0 @@
---- oovbaapi/ooo/vba/excel/XWorksheet.idl.orig	2008-07-29 18:14:09.000000000 +0800
-+++ oovbaapi/ooo/vba/excel/XWorksheet.idl	2008-07-29 18:17:10.000000000 +0800
-@@ -70,6 +70,7 @@ interface XWorksheet
- 	[attribute, readonly] XWorksheet Previous;
- 	[attribute, readonly] string CodeName;
-  	[attribute, readonly] short Index;
-+ 	[attribute] long EnableSelection;
- 	
- 	void Activate();
- 	void Calculate( );
---- sc/source/ui/vba/vbaworksheet.hxx.orig	2008-07-29 18:14:09.000000000 +0800
-+++ sc/source/ui/vba/vbaworksheet.hxx	2008-07-29 18:17:49.000000000 +0800
-@@ -96,6 +96,8 @@ public:
- 	virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() throw (css::uno::RuntimeException);
- 	virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() throw (css::uno::RuntimeException);
-  	virtual sal_Int16 SAL_CALL getIndex() throw (css::uno::RuntimeException);
-+ 	virtual sal_Int32 SAL_CALL getEnableSelection() throw (css::uno::RuntimeException);
-+ 	virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) throw (css::uno::RuntimeException);
- 
-     // Methods
- 	virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
---- sc/source/ui/vba/vbaworksheet.cxx.orig	2008-07-29 18:14:32.000000000 +0800
-+++ sc/source/ui/vba/vbaworksheet.cxx	2008-07-29 18:22:43.000000000 +0800
-@@ -58,6 +58,7 @@
- #include <com/sun/star/drawing/XControlShape.hpp>
- #include <com/sun/star/form/FormComponentType.hpp>
- #include <com/sun/star/form/XFormsSupplier.hpp>
-+#include <ooo/vba/excel/XlEnableSelection.hpp>
- 
- #include <comphelper/processfactory.hxx>
- 
-@@ -257,6 +258,83 @@ ScVbaWorksheet::getIndex() throw (uno::R
- 	return getSheetID() + 1;
- }
- 
-+sal_Int32
-+ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException)
-+{
-+    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
-+    SCTAB nTab = 0;
-+    rtl::OUString aSheetName = getName();
-+    bool bSheetExists = nameExists (xSpreadDoc, aSheetName, nTab);
-+    if ( bSheetExists )
-+    {
-+        uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
-+        ScDocument* pDoc = getDocShell( xModel )->GetDocument();
-+        ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
-+		sal_Bool bLockedCells = sal_False;
-+		sal_Bool bUnlockedCells = sal_False;
-+		if( pProtect )
-+		{
-+        	bLockedCells   = pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS);
-+        	bUnlockedCells = pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);
-+		}
-+        if( bLockedCells )
-+            return excel::XlEnableSelection::xlNoRestrictions;
-+        if( bUnlockedCells )
-+            return excel::XlEnableSelection::xlUnlockedCells;
-+        return excel::XlEnableSelection::xlNoSelection;    
-+    }
-+    else
-+		throw uno::RuntimeException(::rtl::OUString(
-+                                RTL_CONSTASCII_USTRINGPARAM( "Sheet Name does not exist. ") ),
-+                                uno::Reference< XInterface >() );
-+    return excel::XlEnableSelection::xlNoSelection;
-+}    
-+
-+
-+void
-+ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeException)
-+{
-+    if( (nSelection != excel::XlEnableSelection::xlNoRestrictions) &&
-+        (nSelection != excel::XlEnableSelection::xlUnlockedCells) &&
-+        (nSelection != excel::XlEnableSelection::xlNoSelection) )
-+    {
-+        DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
-+    }
-+
-+    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
-+    SCTAB nTab = 0;
-+    rtl::OUString aSheetName = getName();
-+    bool bSheetExists = nameExists (xSpreadDoc, aSheetName, nTab);
-+    if ( bSheetExists )
-+    {
-+        uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
-+        ScDocument* pDoc = getDocShell( xModel )->GetDocument();
-+        ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
-+        // default is xlNoSelection
-+        sal_Bool bLockedCells = sal_False;
-+        sal_Bool bUnlockedCells = sal_False;
-+        if( nSelection == excel::XlEnableSelection::xlNoRestrictions )
-+        {
-+            bLockedCells = sal_True;
-+            bUnlockedCells = sal_True;
-+        }
-+        else if( nSelection == excel::XlEnableSelection::xlUnlockedCells )
-+        {
-+            bUnlockedCells = sal_True;
-+        }
-+		if( pProtect )
-+		{
-+        	pProtect->setOption( ScTableProtection::SELECT_LOCKED_CELLS, bLockedCells );
-+        	pProtect->setOption( ScTableProtection::SELECT_UNLOCKED_CELLS, bUnlockedCells );
-+		}	
-+    }
-+    else
-+		throw uno::RuntimeException(::rtl::OUString(
-+                                RTL_CONSTASCII_USTRINGPARAM( "Sheet Name does not exist. ") ),
-+                                uno::Reference< XInterface >() );
-+
-+}
-+
- uno::Reference< excel::XRange > 
- ScVbaWorksheet::getUsedRange() throw (uno::RuntimeException)
- {
-
diff --git a/applied_patches/0326-vba-keyword-fix.diff b/applied_patches/0326-vba-keyword-fix.diff
deleted file mode 100644
index 2c95976ff..000000000
--- a/applied_patches/0326-vba-keyword-fix.diff
+++ /dev/null
@@ -1,116 +0,0 @@
---- basic/source/inc/token.hxx.orig	2008-07-30 11:33:31.000000000 +0800
-+++ basic/source/inc/token.hxx	2008-07-30 16:54:58.000000000 +0800
-@@ -162,6 +162,10 @@ public:
- 		{ return BOOL( t >= FIRSTKWD && t <= LASTKWD ); }
- 	static BOOL IsExtra( SbiToken t )
- 		{ return BOOL( t >= FIRSTEXTRA ); }
-+
-+    // process somthing like dim Name as String
-+	virtual BOOL IsSymbol( SbiToken )
-+        { return FALSE; }
- };
- 
- 
---- basic/source/inc/parser.hxx.orig	2008-07-30 11:33:31.000000000 +0800
-+++ basic/source/inc/parser.hxx	2008-07-30 16:54:58.000000000 +0800
-@@ -40,6 +40,7 @@
- typedef ::std::vector< String > IfaceVector;
- 
- struct SbiParseStack;
-+struct SbiStatement;
- 
- class SbiParser : public SbiTokenizer
- {
-@@ -53,6 +54,7 @@ class SbiParser : public SbiTokenizer
- 	BOOL		bGblDefs; 			// TRUE globale Definitionen allgemein
- 	BOOL		bNewGblDefs; 		// TRUE globale Definitionen vor Sub
- 	BOOL		bSingleLineIf; 		// TRUE einzeiliges if-Statement
-+	SbiStatement* pCurStat;
- 
- 	SbiSymDef*  VarDecl( SbiDimList**,BOOL,BOOL );// Variablen-Deklaration
- 	SbiProcDef* ProcDecl(BOOL bDecl);// Prozedur-Deklaration
-@@ -100,6 +102,7 @@ public:
- 	BOOL TestSymbol( BOOL=FALSE );	// Symbol?
- 	BOOL TestComma();				// Komma oder EOLN?
- 	void TestEoln();				// EOLN?
-+	virtual BOOL IsSymbol( SbiToken t ); // Process something like DIM Name as String
- 
- 	void Symbol();					// Let oder Call
- 	void ErrorStmnt(); 				// ERROR n
---- basic/source/comp/token.cxx.orig	2008-07-30 11:33:31.000000000 +0800
-+++ basic/source/comp/token.cxx	2008-08-08 16:12:12.000000000 +0800
-@@ -594,6 +594,13 @@ special:
- 		}
- 		return eCurTok;
- 	}
-+
-+	// check whether the keyword has been dim as a variable
-+	if( IsSymbol( tp->t ) )
-+	{
-+		return eCurTok = SYMBOL;
-+	}
-+	
- 	// Sind Datentypen Keywords?
- 	// Nur nach AS, sonst sind es Symbole!
- 	// Es gibt ja ERROR(), DATA(), STRING() etc.
---- basic/source/comp/parser.cxx.orig	2008-07-30 11:33:33.000000000 +0800
-+++ basic/source/comp/parser.cxx	2008-08-11 10:10:40.000000000 +0800
-@@ -138,6 +138,7 @@ SbiParser::SbiParser( StarBASIC* pb, SbM
- 	pProc    = NULL;
- 	pStack   = NULL;
- 	pWithVar = NULL;
-+	pCurStat = NULL;
- 	nBase	 = 0;
- 	bText	 =
- 	bGblDefs =
-@@ -308,6 +309,26 @@ void SbiParser::TestEoln()
- 	}
- }
- 
-+// If some keywords e.g. Name have been dim as a variable, 
-+// they should be treated as symbol
-+BOOL SbiParser::IsSymbol( SbiToken t )
-+{
-+	// FIXME: if "name" is a argument in a subroutine like "Sub Test( name as String )".
-+	if( IsVBASupportOn() && ( t == NAME || t == LINE || t == TEXT ))
-+	{
-+		if( pCurStat && ( pCurStat->eTok == DIM || pCurStat->eTok == PUBLIC ||
-+		  pCurStat->eTok == PRIVATE || pCurStat->eTok == GLOBAL	))
-+		{
-+			return TRUE;
-+		}
-+    	if( pPool->Find(aSym) )
-+    	{
-+        	return TRUE;
-+    	}
-+	}	
-+    return FALSE;
-+}
-+
- // Parsing eines Statement-Blocks
- // Das Parsing laeuft bis zum Ende-Token.
- 
-@@ -431,7 +452,9 @@ BOOL SbiParser::Parse()
- 				if( ( p->bSubr && (eCurTok != STATIC || Peek() == SUB || Peek() == FUNCTION ) ) ||
- 						eCurTok == SUB || eCurTok == FUNCTION )
- 					aGen.Statement();
-+				pCurStat = p;	
- 				(this->*( p->Func ) )();
-+				pCurStat = NULL;
- 				SbxError nSbxErr = SbxBase::GetError();
- 				if( nSbxErr )
- 					SbxBase::ResetError(), Error( (SbError)nSbxErr );
---- basic/source/comp/dim.cxx.orig	2008-07-31 14:54:31.000000000 +0800
-+++ basic/source/comp/dim.cxx	2008-08-11 10:12:22.000000000 +0800
-@@ -40,7 +40,10 @@
- 
- SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, BOOL bStatic, BOOL bConst )
- {
--	if( !TestSymbol() ) return NULL;
-+	// Some keywords can be dim as varibles like " Sub Test( Name as String )"
-+	eCurTok = Peek();
-+	BOOL bKwdOk = IsVBASupportOn() ? BOOL( (eCurTok == NAME) || (eCurTok == LINE) || (eCurTok == TEXT) ): FALSE;
-+	if( !TestSymbol( bKwdOk ) ) return NULL;
- 	SbxDataType t = eScanType;
- 	SbiSymDef* pDef = bConst ? new SbiConstDef( aSym ) : new SbiSymDef( aSym );
- 	SbiDimList* pDim = NULL;
diff --git a/applied_patches/0326-vba-reenable-rowsourcefixes.diff b/applied_patches/0326-vba-reenable-rowsourcefixes.diff
new file mode 100644
index 000000000..abd8ee896
--- /dev/null
+++ b/applied_patches/0326-vba-reenable-rowsourcefixes.diff
@@ -0,0 +1,13 @@
+diff --git vbahelper/source/msforms/makefile.mk vbahelper/source/msforms/makefile.mk
+index ad5e7b4..9bde7db 100644
+--- vbahelper/source/msforms/makefile.mk
++++ vbahelper/source/msforms/makefile.mk
+@@ -39,6 +39,8 @@ ENABLE_EXCEPTIONS := TRUE
+ 
+ .INCLUDE :  settings.mk
+ 
++CDEFS+=-DVBA_OOBUILD_HACK
++
+ SLOFILES=\
+     $(SLO)$/vbacontrol.obj \
+     $(SLO)$/vbacontrols.obj \
diff --git a/applied_patches/0327-userform-activex-identify.diff b/applied_patches/0327-userform-activex-identify.diff
deleted file mode 100644
index e9d029034..000000000
--- a/applied_patches/0327-userform-activex-identify.diff
+++ /dev/null
@@ -1,209 +0,0 @@
-diff --git svx/inc/svx/msocximex.hxx svx/inc/svx/msocximex.hxx
-index 3d52e4d..1b2b811 100644
---- svx/inc/svx/msocximex.hxx
-+++ svx/inc/svx/msocximex.hxx
-@@ -532,8 +532,9 @@ public:
-         SotStorageStreamRef getContainerStream() { return mContainerStream; }
- 
-         virtual void ProcessControl( OCX_Control* pControl, SvStorageStream* pS, ContainerRecord& rec );
--        bool createFromContainerRecord( const ContainerRecord& record,
-+        bool createFromContainerRecord( ContainerRecord& record,
-             OCX_Control*& );
-+        SotStorageStreamRef getContainedControlsStream(){ return mContainedControlsStream; }
- protected:
-         // This class not meant to be instantiated
-         // needs to be subclassed
-@@ -548,6 +549,7 @@ protected:
-         com::sun::star::uno::Reference<
-                 com::sun::star::container::XNameContainer > mxParent;
- 	std::vector<OCX_Control*> mpControls;
-+        std::hash_map<sal_uInt16, sal_uInt16> mActiveXIDMap;
-         SotStorageRef mContainerStorage;
-         SotStorageStreamRef mContainerStream;
-         SotStorageStreamRef mContainedControlsStream;
-diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index 85cabda..a771d13 100644
---- svx/source/msfilter/msocximex.cxx
-+++ svx/source/msfilter/msocximex.cxx
-@@ -572,8 +572,129 @@ const sal_uInt16 TOGGLEBUTTON = (sal_uIn
- const sal_uInt16 SCROLLBAR = (sal_uInt16)0x2F;
- 
- const sal_uInt16 MULTIPAGE = (sal_uInt16)0x39;
-+// The IDs with bit 0x8000 set appear to be generated.
-+// It looks like these ID's are used with the non-toolbox [1]
-+// ActiveX controls that can be present in a Userform
-+// ( note: RefEdit seems to be an exception )
-+// In UserForm::Read just before the Container record starts
-+// you will notice there can be sometimes trailing records, 
-+// it seems that these records have a 1:1 relationship with the non-toolbox
-+// controls present in the Userform. An id in the trailing record
-+// seems to identify the specific ActiveX control and an artificial nTypeIdent
-+// e.g. 0x8000, 0x8001 etc. is created so as to be able to associate
-+// the ActiveX control when referenced later 
-+// [1] Such ActiveX controls are added via Tools/AddionalControls
-+// menu
-+
-+// create a fixed set of those special id(s)
-+// ahem, we can only read one Progress bars at the moment so....
- const sal_uInt16 PROGRESSBAR = (sal_uInt16)0x8000;
- 
-+// A set of IDs from the trailing records mentioned above that seem to
-+// identify the following ActiveX controls 
-+// Currently we only can process ( in a limited way ) the ProgressBar
-+// the other ID's are for reference ( & future )
-+
-+// RefEdit control {00024512-0000-0000-c000-000000000046}
-+const sal_uInt8 aRefEditID[] =
-+{
-+0x12, 0x45, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
-+};
-+
-+// Microsoft ProgressBar Control, version 6.0 {35053A22-8589-11D1-B16A-00C0F0283628}
-+const sal_uInt8 aProgressID[] =
-+{
-+0x22, 0x3a, 0x05, 0x35, 0x89, 0x85, 0xd1, 0x11,  0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+};
-+
-+// Calendar Control 10.0 
-+const sal_uInt8 aCalendarID[] =
-+{
-+0x2b, 0xc9, 0x27, 0x8e, 0x64, 0x12, 0x1c, 0x10, 0x8a, 0x2f, 0x04, 0x02, 0x24, 0x00, 0x9c, 0x02,
-+};
-+
-+
-+// Microsoft ImageComboxBox Control, version 6.0 {DD9DA666-8594-11D1-B16A-00C0F0283628}
-+const sal_uInt8 aImageComboID[] =
-+{
-+0x66, 0xa6, 0x9d, 0xdd, 0x94, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+};
-+
-+// Microsoft ImageList Control, version 6.0 {2C247F23-8591-11D1-B16A-00C0F0283628}
-+const sal_uInt8 aImageListID[] =
-+{
-+0x23, 0x7f, 0x24, 0x2c, 0x91, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+};
-+
-+// Microsoft Slider Control, version 6.0 {F08DF954-8592-11D1-B16A-00C0F0283628}
-+const sal_uInt8 aSliderID[] =
-+{
-+0x54, 0xf9, 0x8d, 0xf0, 0x92, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+};
-+
-+// Microsoft StatusBar Control, version 6.0 {8E3867A3-8586-11D1-B16A-00C0F0283628}
-+const sal_uInt8 aStatusBarID[] =
-+{
-+0xa3, 0x67, 0x38, 0x8e, 0x86, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+};
-+
-+// Microsoft Office Chart 10.0
-+const sal_uInt8 aChartSpaceID[] =
-+{
-+0x46, 0xe5, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
-+};
-+
-+const sal_Int16 ActiveXIDLen = 0x10; // CLSID len
-+const sal_Int16 ActiveXIDBlockLen = 0x30; // the block len that contains the CLSID
-+
-+bool lcl_handleActiveXControl(  SvStorageStream *pS, sal_uInt16& nTypeID )
-+{
-+    nTypeID = 0; // Illegal ActiveX ID 
-+    bool bRes = false;
-+    sal_uInt16 nIdentifier, nFixedAreaLen;
-+    *pS >> nIdentifier;    
-+    *pS >> nFixedAreaLen;    
-+    pS->SeekRel( ( nFixedAreaLen - ActiveXIDBlockLen ) );
-+    sal_uInt8 aID[ ActiveXIDLen ];
-+    if ( !pS->IsEof() )
-+    {
-+        pS->Read( aID, ActiveXIDLen );
-+        pS->SeekRel( ActiveXIDBlockLen - ActiveXIDLen ); // read remainer of record
-+        if ( memcmp( aID, aProgressID, ActiveXIDLen ) == 0 )
-+        {
-+            nTypeID = PROGRESSBAR;
-+            OSL_TRACE("Found supported ***PROGRESSBAR*** ActiveX control");
-+            bRes = true;
-+        }
-+#if (OSL_DEBUG_LEVEL > 0)
-+        // If we really want to process these more controls we should put them in 
-+        // a list or array and have a single loop testing each id. For the moment 
-+        // as we only can process PROGRESSBAR, not much point doing that until 
-+        // we add support for at least another activex control
-+
-+        else if ( memcmp( aID, aCalendarID, ActiveXIDLen ) == 0 )
-+            OSL_TRACE("Found unsupported ***CALENDAR*** ActiveX control");
-+        else if ( memcmp( aID, aRefEditID, ActiveXIDLen ) == 0 )
-+            OSL_TRACE("Found unsupported ***REFEDIT*** ActiveX control");
-+        else if ( memcmp( aID, aImageComboID, ActiveXIDLen ) == 0 )
-+            OSL_TRACE("Found unsupported ***IMAGECOMBO*** ActiveX control");
-+        else if ( memcmp( aID, aImageListID, ActiveXIDLen ) == 0 )
-+            OSL_TRACE("Found unsupported ***IMAGELIST*** ActiveX control");
-+        else if ( memcmp( aID, aChartSpaceID, ActiveXIDLen ) == 0 )
-+            OSL_TRACE("Found unsupported ***CHARTSPACE*** ActiveX control");
-+        else if ( memcmp( aID, aSliderID, ActiveXIDLen ) == 0 )
-+            OSL_TRACE("Found unsupported ***SLIDER*** ActiveX control");
-+        else if ( memcmp( aID, aStatusBarID, ActiveXIDLen ) == 0 )
-+            OSL_TRACE("Found unsupported ***STATUSBAR*** ActiveX control");
-+#endif
-+        else
-+        {
-+            OSL_TRACE("Unknown activeX ID !");
-+        }
-+    }
-+    return bRes;
-+}
-+
- typedef std::vector< ContainerRecord > ContainerRecordList;
- 
- class ContainerRecReader
-@@ -750,6 +887,13 @@ class ContainerRecReader
-                 pControl->pDocSh = pContainerControl->pDocSh;
-                 pContainerControl->ProcessControl( pControl, pS, rec );
-             }
-+            else if ( rec.nTypeIdent & 0x8000 )
-+            {
-+                // Skip ActiveX Controls we can't import
-+                SotStorageStreamRef oStream = pContainerControl->getContainedControlsStream(); 
-+                ULONG nStrmPos = oStream->Tell();
-+                oStream->Seek( nStrmPos + rec.nSubStreamLen );
-+            }  
-             else
-             {
-                 DBG_ERROR("Terminating import, unexpected error");
-@@ -3412,9 +3561,18 @@ OUString OCX_ContainerControl::createSub
-     return buf.makeStringAndClear();
- }
- 
--bool OCX_ContainerControl::createFromContainerRecord( const ContainerRecord& record, OCX_Control*& pControl )
-+
-+bool OCX_ContainerControl::createFromContainerRecord( ContainerRecord& record, OCX_Control*& pControl )
- {
-     pControl = NULL;
-+    if (  record.nTypeIdent & 0x8000 )
-+    {
-+        std::hash_map<sal_uInt16, sal_uInt16>::iterator it = mActiveXIDMap.find( record.nTypeIdent );
-+        if ( it == mActiveXIDMap.end() )
-+            return false;
-+        // replace the generated id with our hardcoded one
-+        record.nTypeIdent = it->second; 
-+    }
-     switch ( record.nTypeIdent)
-         {
-             case CMDBUTTON:
-@@ -4153,10 +4311,14 @@ sal_Bool OCX_UserForm::Read(SvStorageStr
-     // ( unknown what these trailing records are for)
-     if ( numTrailingRecs )
-     {
--        for ( ; numTrailingRecs ; --numTrailingRecs )
-+        for ( sal_Int16 i = 0 ; numTrailingRecs ; --numTrailingRecs, ++i )
-         {
--            OCX_Control skip(C2S("dummy")) ;
--            skip.Read( pS );
-+            sal_uInt16 nTypeID = 0;
-+            if ( lcl_handleActiveXControl( pS, nTypeID ) )
-+            {
-+                if ( nTypeID & 0x8000 ) // valid ActiveXID
-+                    mActiveXIDMap[ ( i | 0x8000 ) ] = nTypeID;
-+            }
-         }
-     }
- 	return OCX_ContainerControl::Read( pS );
diff --git a/applied_patches/0327-vba-basic-not-fix.diff b/applied_patches/0327-vba-basic-not-fix.diff
new file mode 100644
index 000000000..6b67ce974
--- /dev/null
+++ b/applied_patches/0327-vba-basic-not-fix.diff
@@ -0,0 +1,17 @@
+diff --git basic/source/comp/exprtree.cxx basic/source/comp/exprtree.cxx
+index 1c9ad8f..e12496c 100644
+--- basic/source/comp/exprtree.cxx
++++ basic/source/comp/exprtree.cxx
+@@ -574,7 +574,11 @@ SbiExprNode* SbiExpression::Unary()
+             eTok = NEG;
+         case NOT:
+             pParser->Next();
+-            pNd = new SbiExprNode( pParser, Unary(), eTok, NULL );
++            // process something like "Do While Not "foo"="" "
++            if( pParser->IsVBASupportOn() )
++                pNd = new SbiExprNode( pParser, Like(), eTok, NULL );
++            else    
++                pNd = new SbiExprNode( pParser, Unary(), eTok, NULL );
+             break;
+         case PLUS:
+             pParser->Next();
diff --git a/applied_patches/0328-cws-vbasupportdev300-wae.diff b/applied_patches/0328-cws-vbasupportdev300-wae.diff
new file mode 100644
index 000000000..4a0738b04
--- /dev/null
+++ b/applied_patches/0328-cws-vbasupportdev300-wae.diff
@@ -0,0 +1,481 @@
+Index: sc/source/ui/vba/vbafont.cxx
+===================================================================
+--- sc/source/ui/vba/vbafont.cxx	(revision 276354)
++++ sc/source/ui/vba/vbafont.cxx	(working copy)
+@@ -250,7 +250,6 @@
+ uno::Any SAL_CALL
+ ScVbaFont::getColorIndex() throw ( uno::RuntimeException )
+ {
+-	sal_Int32 nColor = 0;
+ 	if ( GetDataSet() )
+ 		if (  GetDataSet()->GetItemState( ATTR_FONT_COLOR, TRUE, NULL) == SFX_ITEM_DONTCARE )
+ 			return aNULL();
+Index: basic/source/classes/sbxmod.cxx
+===================================================================
+--- basic/source/classes/sbxmod.cxx	(revision 276381)
++++ basic/source/classes/sbxmod.cxx	(working copy)
+@@ -113,7 +113,7 @@
+     DECL_LINK( OnAsyncQuit, void* );
+ };
+ 
+-IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, pNull )
++IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, /*pNull*/ )
+ {
+     QuitApplication();
+     return 0L;
+Index: sw/source/ui/vba/vbaselection.cxx
+===================================================================
+--- sw/source/ui/vba/vbaselection.cxx	(revision 276294)
++++ sw/source/ui/vba/vbaselection.cxx	(working copy)
+@@ -188,7 +188,7 @@
+ }
+ 
+ void SAL_CALL
+-SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( uno::RuntimeException )
++SwVbaSelection::Delete( const uno::Any& /*_unit*/, const uno::Any& /*_count*/ ) throw ( uno::RuntimeException )
+ {
+     // FIXME: handle the arguments: _unit and _count 
+     rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Delete"));
+Index: sw/source/ui/vba/vbatable.cxx
+===================================================================
+--- sw/source/ui/vba/vbatable.cxx	(revision 276294)
++++ sw/source/ui/vba/vbatable.cxx	(working copy)
+@@ -50,7 +50,7 @@
+ }
+ 
+ uno::Reference< word::XRange > SAL_CALL 
+-SwVbaTable::ConvertToText( const uno::Any& Separator, const uno::Any& NestedTables ) throw (script::BasicErrorException, uno::RuntimeException)
++SwVbaTable::ConvertToText( const uno::Any& /*Separator*/, const uno::Any& /*NestedTables*/ ) throw (script::BasicErrorException, uno::RuntimeException)
+ {
+     // #FIXME the helper api uses the dreaded dispatch mechanism, holding off 
+     // implementation while I look for alternative solution
+Index: sw/source/ui/vba/vbaoptions.cxx
+===================================================================
+--- sw/source/ui/vba/vbaoptions.cxx	(revision 276294)
++++ sw/source/ui/vba/vbaoptions.cxx	(working copy)
+@@ -141,7 +141,7 @@
+     return word::WdLineStyle::wdLineStyleSingle;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 /*_defaultborderlinestyle*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -151,7 +151,7 @@
+     return word::WdLineWidth::wdLineWidth050pt;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 /*_defaultborderlinewidth*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -161,7 +161,7 @@
+     return word::WdColorIndex::wdAuto;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 /*_defaultbordercolorindex*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -171,7 +171,7 @@
+     return sal_True;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setReplaceSelection( ::sal_Bool _replaceselection ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setReplaceSelection( ::sal_Bool /*_replaceselection*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -181,7 +181,7 @@
+     return sal_False;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setMapPaperSize( ::sal_Bool _mappapersize ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setMapPaperSize( ::sal_Bool /*_mappapersize*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -191,7 +191,7 @@
+     return sal_False;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _autoformatasyoutypeapplyheadings ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool /*_autoformatasyoutypeapplyheadings*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -201,7 +201,7 @@
+     return sal_False;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool /*_autoformatasyoutypeapplybulletedlists*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -211,7 +211,7 @@
+     return sal_False;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool /*_autoformatasyoutypeapplynumberedlists*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -221,7 +221,7 @@
+     return sal_False;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool /*_autoformatasyoutypeformatlistitembeginning*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -231,7 +231,7 @@
+     return sal_False;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _autoformatasyoutypedefinestyles ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( ::sal_Bool /*_autoformatasyoutypedefinestyles*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -241,7 +241,7 @@
+     return sal_False;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( ::sal_Bool _autoformatapplyheadings ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( ::sal_Bool /*_autoformatapplyheadings*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -251,7 +251,7 @@
+     return sal_False;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( ::sal_Bool _autoformatapplylists ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( ::sal_Bool /*_autoformatapplylists*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -261,7 +261,7 @@
+     return sal_False;
+ }
+ 
+-void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool _autoformatapplybulletedlists ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool /*_autoformatapplybulletedlists*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+Index: sw/source/ui/vba/vbatables.cxx
+===================================================================
+--- sw/source/ui/vba/vbatables.cxx	(revision 276294)
++++ sw/source/ui/vba/vbatables.cxx	(working copy)
+@@ -58,7 +58,7 @@
+ 
+ 
+ uno::Reference< word::XTable > SAL_CALL 
+-SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& DefaultTableBehavior, const uno::Any& AutoFitBehavior ) throw (script::BasicErrorException, uno::RuntimeException)
++SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& /*DefaultTableBehavior*/, const uno::Any& /*AutoFitBehavior*/ ) throw (script::BasicErrorException, uno::RuntimeException)
+ {
+     sal_Int32 nCols = 0;
+     sal_Int32 nRows = 0;
+Index: sw/source/ui/vba/vbapagesetup.cxx
+===================================================================
+--- sw/source/ui/vba/vbapagesetup.cxx	(revision 276294)
++++ sw/source/ui/vba/vbapagesetup.cxx	(working copy)
+@@ -249,7 +249,7 @@
+     return wdSectionStart;    
+ }
+ 
+-void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 _sectionstart ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) throw (uno::RuntimeException)
+ {
+     // fail to find corresponding feature in Writer
+     // #FIXME:
+Index: sw/source/ui/vba/vbaborders.cxx
+===================================================================
+--- sw/source/ui/vba/vbaborders.cxx	(revision 276294)
++++ sw/source/ui/vba/vbaborders.cxx	(working copy)
+@@ -356,7 +356,7 @@
+     return ( aShadowFormat.Location != table::ShadowLocation_NONE );
+ }
+ 
+-void SAL_CALL SwVbaBorders::setShadow( sal_Bool _shadow ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::RuntimeException)
+ {
+     throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+ }
+Index: sw/source/ui/vba/vbaheaderfooter.cxx
+===================================================================
+--- sw/source/ui/vba/vbaheaderfooter.cxx	(revision 276294)
++++ sw/source/ui/vba/vbaheaderfooter.cxx	(working copy)
+@@ -55,7 +55,7 @@
+     return sal_False;
+ }
+ 
+-void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( ::sal_Bool _linktoprevious ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( ::sal_Bool /*_linktoprevious*/ ) throw (uno::RuntimeException)
+ {
+     // not support in Writer
+ }
+@@ -71,7 +71,7 @@
+     {
+         sPropsNameText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
+     }
+-    if( mnIndex = word::WdHeaderFooterIndex::wdHeaderFooterEvenPages )
++    if( mnIndex == word::WdHeaderFooterIndex::wdHeaderFooterEvenPages )
+     {
+         sPropsNameText.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left") ) );
+     }
+Index: sw/source/ui/vba/vbastyles.cxx
+===================================================================
+--- sw/source/ui/vba/vbastyles.cxx	(revision 276294)
++++ sw/source/ui/vba/vbastyles.cxx	(working copy)
+@@ -315,7 +315,7 @@
+     sal_Int32 nIndex = 0;
+     if( ( Index1 >>= nIndex ) && ( nIndex < 0 ) )
+     {
+-        for( const BuiltinStyleTable* pTable = aBuiltinStyleTable; pTable->wdBuiltinStyle != NULL; pTable++ )
++        for( const BuiltinStyleTable* pTable = aBuiltinStyleTable; pTable != NULL; pTable++ )
+         {
+             if( nIndex == pTable->wdBuiltinStyle )
+             {
+Index: sw/source/ui/vba/vbadocuments.cxx
+===================================================================
+--- sw/source/ui/vba/vbadocuments.cxx	(revision 276294)
++++ sw/source/ui/vba/vbadocuments.cxx	(working copy)
+@@ -116,7 +116,7 @@
+ }
+ 
+ uno::Any SAL_CALL
+-SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& NewTemplate, const uno::Any& DocumentType, const uno::Any& Visible ) throw (uno::RuntimeException)
++SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, const uno::Any& /*DocumentType*/, const uno::Any& /*Visible*/ ) throw (uno::RuntimeException)
+ {
+     rtl::OUString sFileName;
+     if( Template.hasValue() && ( Template >>= sFileName ) )
+@@ -132,14 +132,14 @@
+ 
+ // #TODO# #FIXME# can any of the unused params below be used?
+ void SAL_CALL
+-SwVbaDocuments::Close( const uno::Any& SaveChanges, const uno::Any& OriginalFormat, const uno::Any& RouteDocument ) throw (uno::RuntimeException)
++SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*OriginalFormat*/, const uno::Any& /*RouteDocument*/ ) throw (uno::RuntimeException)
+ {
+     VbaDocumentsBase::Close();
+ }
+ 
+ // #TODO# #FIXME# can any of the unused params below be used?
+ uno::Any SAL_CALL
+-SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToRecentFiles, const uno::Any& PasswordDocument, const uno::Any& PasswordTemplate, const uno::Any& Revert, const uno::Any& WritePasswordDocument, const uno::Any& WritePasswordTemplate, const uno::Any& Format, const uno::Any& Encoding, const uno::Any& Visible, const uno::Any& OpenAndRepair, const uno::Any& DocumentDirection, const uno::Any& NoEncodingDialog, const uno::Any& XMLTransform ) throw (uno::RuntimeException)
++SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) throw (uno::RuntimeException)
+ {
+ 	// we need to detect if this is a URL, if not then assume its a file path
+     rtl::OUString aURL;
+Index: sw/source/ui/vba/vbasection.cxx
+===================================================================
+--- sw/source/ui/vba/vbasection.cxx	(revision 276294)
++++ sw/source/ui/vba/vbasection.cxx	(working copy)
+@@ -49,7 +49,7 @@
+     return sal_False;
+ }
+ 
+-void SAL_CALL SwVbaSection::setProtectedForForms( ::sal_Bool _protectedforforms ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaSection::setProtectedForForms( ::sal_Bool /*_protectedforforms*/ ) throw (uno::RuntimeException)
+ {
+ }
+ 
+Index: sw/source/ui/vba/vbadocument.cxx
+===================================================================
+--- sw/source/ui/vba/vbadocument.cxx	(revision 276294)
++++ sw/source/ui/vba/vbadocument.cxx	(working copy)
+@@ -238,7 +238,6 @@
+ uno::Any SAL_CALL 
+ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException)
+ {
+-    SwDocShell* pDocShell = word::getDocShell( getModel() );
+     uno::Reference< word::XTemplate > xTemplate;
+     uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( getModel(), uno::UNO_QUERY_THROW );
+     uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
+@@ -250,7 +249,7 @@
+ }
+ 
+ void SAL_CALL 
+-SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (uno::RuntimeException)
++SwVbaDocument::setAttachedTemplate( const css::uno::Any& /*_attachedtemplate*/ ) throw (uno::RuntimeException)
+ {
+     throw uno::RuntimeException();
+ }
+Index: sw/source/ui/vba/vbafind.cxx
+===================================================================
+--- sw/source/ui/vba/vbafind.cxx	(revision 276294)
++++ sw/source/ui/vba/vbafind.cxx	(working copy)
+@@ -84,7 +84,7 @@
+     mbReplace = sal_True;
+ }
+ 
+-rtl::OUString SwVbaFind::ReplaceWildcards( const rtl::OUString& rText ) throw ( uno::RuntimeException )
++rtl::OUString SwVbaFind::ReplaceWildcards( const rtl::OUString& /*rText*/ ) throw ( uno::RuntimeException )
+ {
+     // TODO:
+     return rtl::OUString();
+@@ -177,7 +177,7 @@
+                 }
+                 break;
+             }
+-            defalut:
++            default:
+             {
+                 result = sal_False;
+             }
+@@ -393,7 +393,7 @@
+ 
+     if( Replace.hasValue() )
+     {
+-        sal_Int32 nValue;
++        sal_Int32 nValue(0);
+         Replace >>= nValue;
+         SetReplace( nValue );
+     }
+Index: sw/source/ui/vba/vbarange.cxx
+===================================================================
+--- sw/source/ui/vba/vbarange.cxx	(revision 276294)
++++ sw/source/ui/vba/vbarange.cxx	(working copy)
+@@ -56,7 +56,7 @@
+     initialize( rStart, rEnd );
+ }
+ 
+-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument ), mxText( rText )
++SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
+ {
+     initialize( rStart, rEnd );
+ }
+Index: sw/source/ui/vba/vbaautotextentry.cxx
+===================================================================
+--- sw/source/ui/vba/vbaautotextentry.cxx	(revision 276294)
++++ sw/source/ui/vba/vbaautotextentry.cxx	(working copy)
+@@ -44,7 +44,7 @@
+ {
+ }
+ 
+-uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& _richtext ) throw ( uno::RuntimeException )
++uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& /*_richtext*/ ) throw ( uno::RuntimeException )
+ {
+     SwVbaRange* pWhere = dynamic_cast<SwVbaRange*>( _where.get() );
+     if( pWhere )
+Index: sw/source/ui/vba/vbadialog.cxx
+===================================================================
+--- sw/source/ui/vba/vbadialog.cxx	(revision 276294)
++++ sw/source/ui/vba/vbadialog.cxx	(working copy)
+@@ -51,7 +51,7 @@
+ rtl::OUString 
+ SwVbaDialog::mapIndexToName( sal_Int32 nIndex )
+ {
+-    for( const WordDialogTable* pTable = aWordDialogTable; pTable->wdDialog != NULL; pTable++ )
++    for( const WordDialogTable* pTable = aWordDialogTable; pTable != NULL; pTable++ )
+     {
+         if( nIndex == pTable->wdDialog )
+         {
+Index: sw/source/ui/vba/vbatemplate.cxx
+===================================================================
+--- sw/source/ui/vba/vbatemplate.cxx	(revision 276294)
++++ sw/source/ui/vba/vbatemplate.cxx	(working copy)
+@@ -61,7 +61,8 @@
+ 
+     // the default template is "Normal.dot" in Word.
+     rtl::OUString sGroup( RTL_CONSTASCII_USTRINGPARAM("Normal") );
+-    if( sal_Int32 nIndex = msName.lastIndexOf( sal_Unicode('.') ) > 0 )
++    sal_Int32 nIndex = msName.lastIndexOf( sal_Unicode('.') );
++    if( nIndex > 0 )
+     {
+         sGroup = msName.copy( 0, msName.lastIndexOf( sal_Unicode('.') ) );
+        // OSL_TRACE("SwVbaTemplate::AutoTextEntries: %s", rtl::OUStringToOString( sGroup, RTL_TEXTENCODING_UTF8 ).getStr() );
+Index: sw/source/ui/vba/vbaparagraphformat.cxx
+===================================================================
+--- sw/source/ui/vba/vbaparagraphformat.cxx	(revision 276294)
++++ sw/source/ui/vba/vbaparagraphformat.cxx	(working copy)
+@@ -203,7 +203,7 @@
+     return nLevel;
+ }
+ 
+-void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 /*_outlinelevel*/ ) throw (uno::RuntimeException)
+ {
+     throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+ }
+@@ -247,7 +247,7 @@
+ 
+ float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() throw (uno::RuntimeException)
+ {
+-    sal_Int32 nSpace;
++    sal_Int32 nSpace = 0;
+     mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin") ) ) >>= nSpace;
+     return (float)( Millimeter::getInPoints( nSpace ) );
+ }
+@@ -302,7 +302,7 @@
+     throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+ }
+ 
+-void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& _tabstops ) throw (uno::RuntimeException)
++void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) throw (uno::RuntimeException)
+ {
+     throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+ }
+@@ -484,7 +484,7 @@
+ 
+ sal_Int16 SwVbaParagraphFormat::getCharHeight() throw (uno::RuntimeException)
+ {
+-    float fCharHeight;
++    float fCharHeight = 0.0;
+     mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharHeight") ) ) >>= fCharHeight;
+     return (sal_Int16)( Millimeter::getInHundredthsOfOneMillimeter( fCharHeight ) );
+ }
+Index: vbahelper/source/vbahelper/vbahelper.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbahelper.cxx	(revision 276294)
++++ vbahelper/source/vbahelper/vbahelper.cxx	(working copy)
+@@ -856,7 +856,7 @@
+ 	return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR;
+ }
+ 
+-ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape )
++ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& /*xContext*/, const css::uno::Reference< css::drawing::XShape >& xShape )
+ {
+     m_pShapeHelper.reset( new ShapeHelper( xShape ) );
+ }
+@@ -901,7 +901,6 @@
+     }
+     else
+     {
+-        const uno::Reference< frame::XModel > xModel( xModel2, uno::UNO_QUERY );
+         if ( xModel.is() )
+         {
+             const uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
+Index: vbahelper/source/vbahelper/vbashapes.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbashapes.cxx	(revision 276294)
++++ vbahelper/source/vbahelper/vbashapes.cxx	(working copy)
+@@ -373,7 +373,7 @@
+ }
+ 
+ uno::Any
+-ScVbaShapes::AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
++ScVbaShapes::AddTextboxInWriter( sal_Int32 /*_nOrientation*/, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
+ {
+     rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.TextShape" ) );
+     sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( _nLeft );
+Index: vbahelper/source/vbahelper/vbafontbase.cxx
+===================================================================
+--- vbahelper/source/vbahelper/vbafontbase.cxx	(revision 276294)
++++ vbahelper/source/vbahelper/vbafontbase.cxx	(working copy)
+@@ -246,7 +246,7 @@
+ }
+ 
+ void SAL_CALL
+-VbaFontBase::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException )
++VbaFontBase::setUnderline( const uno::Any& /*aValue*/ ) throw ( uno::RuntimeException )
+ {
+ /*
+ 	// default
diff --git a/applied_patches/0328-userform-possible-groupingtweak.diff b/applied_patches/0328-userform-possible-groupingtweak.diff
deleted file mode 100644
index 43cb3c9e7..000000000
--- a/applied_patches/0328-userform-possible-groupingtweak.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git svx/inc/svx/msocximex.hxx svx/inc/svx/msocximex.hxx
-index 3d52e4d..1b2b811 100644
-diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index 85cabda..a771d13 100644
---- svx/source/msfilter/msocximex.cxx
-+++ svx/source/msfilter/msocximex.cxx
-@@ -644,6 +779,8 @@ class ContainerRecReader
-             // control type
-             if( nContentFlags & 0x00000080 )
-                 *pS >> rec.nTypeIdent;
-+            if( nContentFlags & 0x00000200 )
-+                pS->SeekRel( 4 ); // Grouping?
-             // length of infotip
-             sal_uInt32 nTipLen = 0;
-             if( nContentFlags & 0x00000800 )
-@@ -770,6 +914,11 @@ class ContainerRecReader
-     {
-         sal_uInt8 aUnknown11[4];
-         pS->Read(aUnknown11, sizeof(aUnknown11));
-+        // discovered a dialog with value of 0xFF for aUnknown11 
-+        // needed an extra 4 bytes to offset correctly  into the control
-+        // records. Valid test or coincidence ?
-+        if ( aUnknown11[1] == 0xFF )
-+           pS->Read( aUnknown11, sizeof(aUnknown11));
-         return true;
-     }
- 
diff --git a/applied_patches/0329-basic-ide-objectmodule.diff b/applied_patches/0329-basic-ide-objectmodule.diff
deleted file mode 100644
index 715b4cceb..000000000
--- a/applied_patches/0329-basic-ide-objectmodule.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- basctl/source/basicide/bastypes.cxx.orig	2008-08-20 18:25:53.000000000 +0800
-+++ basctl/source/basicide/bastypes.cxx	2008-08-19 18:40:27.000000000 +0800
-@@ -60,6 +60,7 @@
- #include <com/sun/star/script/XLibraryContainer2.hpp>
- #endif
- #include <com/sun/star/script/XLibraryContainerPassword.hpp>
-+#include <com/sun/star/script/ModuleType.hpp>
- 
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star;
-@@ -640,8 +641,30 @@ void __EXPORT BasicIDETabBar::Command( c
-                 aPopup.EnableItem( SID_BASICIDE_RENAMECURRENT, FALSE );
-                 aPopup.RemoveDisabledEntries();
-             }
-+			
-+			// disable to delete or remove object modules in IDE
-+			BasicManager* pBasMgr = aDocument.getBasicManager();
-+			if ( pBasMgr )
-+			{
-+				StarBASIC* pBasic = pBasMgr->GetLib( aOULibName );
-+				if( pBasic )
-+				{
-+					IDEWindowTable& aIDEWindowTable = pIDEShell->GetIDEWindowTable();
-+					IDEBaseWindow* pWin = aIDEWindowTable.Get( GetCurPageId() );
-+					if( pWin && pWin->ISA( ModulWindow ) )
-+					{
-+						SbModule* pActiveModule = (SbModule*)pBasic->FindModule( pWin->GetName() );
-+						if( pActiveModule && ( pActiveModule->GetModuleType() == script::ModuleType::Document ) )
-+						{
-+							aPopup.EnableItem( SID_BASICIDE_DELETECURRENT, FALSE );
-+							aPopup.EnableItem( SID_BASICIDE_RENAMECURRENT, FALSE );
-+						}
-+					}
-+				}
-+			}
-         }
- 
-+
-         SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
- 	    SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
-         if ( pDispatcher )
diff --git a/applied_patches/0329-vba-control-api-vis-fix.diff b/applied_patches/0329-vba-control-api-vis-fix.diff
new file mode 100644
index 000000000..d2867254c
--- /dev/null
+++ b/applied_patches/0329-vba-control-api-vis-fix.diff
@@ -0,0 +1,26 @@
+diff --git vbahelper/source/msforms/vbacontrol.cxx vbahelper/source/msforms/vbacontrol.cxx
+index 0989548..f51cf56 100644
+--- vbahelper/source/msforms/vbacontrol.cxx
++++ vbahelper/source/msforms/vbacontrol.cxx
+@@ -189,14 +189,17 @@ void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeE
+ 
+ sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
+ {
+-    uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
+-    return xWindow2->isVisible();
++    sal_Bool bVisible( sal_True );
++    m_xProps->getPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) )) >>= bVisible;
++    return bVisible;
+ }
+ 
+ void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
+ {
+-    uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
+-    xWindow2->setVisible( bVisible );
++    uno::Any aValue( bVisible );
++    m_xProps->setPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ), aValue);
+ }
+ double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException)
+ {
diff --git a/applied_patches/0330-basic-ide-module-object-name-combile.diff b/applied_patches/0330-basic-ide-module-object-name-combile.diff
deleted file mode 100644
index 95a1d5f40..000000000
--- a/applied_patches/0330-basic-ide-module-object-name-combile.diff
+++ /dev/null
@@ -1,98 +0,0 @@
---- oovbaapi/ooo/vba/excel/XWorksheet.idl.old	2009-04-06 16:42:00.000000000 +0000
-+++ oovbaapi/ooo/vba/excel/XWorksheet.idl	2009-04-06 16:42:00.000000000 +0000
-@@ -42,6 +42,9 @@
- #include <com/sun/star/script/XInvocation.idl>
- #endif
- 
-+#ifndef __com_sun_star_container_XNamed_idl__
-+#include <com/sun/star/container/XNamed.idl>
-+#endif
- //=============================================================================
- 
- module ooo {  module vba {  module excel { 
-@@ -57,8 +60,8 @@ interface XWorksheet
- {
- 	interface ::ooo::vba::XHelperInterface;
- 	interface ::com::sun::star::script::XInvocation;
-+	interface ::com::sun::star::container::XNamed;
- 
--        [attribute] string Name;
- 	[attribute] boolean Visible; 
- 	[attribute, readonly] long StandardHeight;
- 	[attribute, readonly] long StandardWidth;
---- sc/source/ui/vba/vbaworksheet.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbaworksheet.hxx	2009-04-06 16:42:00.000000000 +0000
-@@ -45,6 +45,7 @@
- #include <ooo/vba/excel/XPageSetup.hpp>
- #include <ooo/vba/excel/XHPageBreaks.hpp>
- #include <ooo/vba/excel/XChartObjects.hpp>
-+#include <com/sun/star/container/XNamed.hpp>
- 
- #include "vbahelperinterface.hxx"
- 
---- basctl/source/basicide/basides2.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ basctl/source/basicide/basides2.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -55,11 +55,32 @@
- #include <tools/diagnose_ex.h>
- #include <sfx2/sfxdefs.hxx>
- #include <sfx2/signaturestate.hxx>
-+#include <com/sun/star/script/ModuleInfo.hpp>
-+#include <com/sun/star/container/XNameContainer.hpp>
-+#include <com/sun/star/container/XNamed.hpp>
-+#include <com/sun/star/lang/XServiceInfo.hpp>
- 
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
- namespace css = ::com::sun::star;
- 
-+void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib, const String& rModName, String& rObjName )
-+{
-+	uno::Any aElement( rLib->getByName( rModName ) );
-+	script::ModuleInfo aModuleInfo;
-+	if( aElement >>= aModuleInfo )
-+	{
-+		uno::Any aObject( aModuleInfo.ModuleObject );
-+		uno::Reference< lang::XServiceInfo > xServiceInfo( aObject, uno::UNO_QUERY );
-+		if( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString::createFromAscii( "org.openoffice.excel.Worksheet" ) ) )
-+		{
-+			uno::Reference< container::XNamed > xNamed( aObject, uno::UNO_QUERY );
-+			if( xNamed.is() )
-+				rObjName = xNamed->getName();
-+		}
-+	}	
-+}
-+
- IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )
- {
- 	ShowObjectDialog( FALSE, TRUE );
-@@ -232,7 +253,7 @@ ModulWindow* BasicIDEShell::CreateBasWin
-     if ( !aLibName.Len() )
-         aLibName = String::CreateFromAscii( "Standard" );
- 
--    rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
-+    uno::Reference< container::XNameContainer > xLib = rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
- 
- 	if ( !aModName.Len() )
-         aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
-@@ -272,7 +293,20 @@ ModulWindow* BasicIDEShell::CreateBasWin
- 		DBG_ASSERT( nKey, "CreateBasWin: Kein Key- Fenster nicht gefunden!" );
- 	}
-     if( nKey )
--	    pTabBar->InsertPage( (USHORT)nKey, aModName );
-+	{
-+		if( xLib.is() )
-+		{
-+			// display a nice friendly name in the ObjectModule tab,
-+			// combining the objectname and module name, e.g. Sheet1 ( Financials )
-+			String sObjName;
-+			lcl_getObjectName( xLib, rModName, sObjName );
-+			if( sObjName.Len() )
-+			{
-+				aModName.AppendAscii(" (").Append(sObjName).AppendAscii(")");
-+			}
-+		}
-+		pTabBar->InsertPage( (USHORT)nKey, aModName );
-+	}	
- 	pTabBar->Sort();
- 	pWin->GrabScrollBars( &aHScrollBar, &aVScrollBar );
- 	if ( !pCurWin )
diff --git a/applied_patches/0330-vba-fix-isempty.diff b/applied_patches/0330-vba-fix-isempty.diff
new file mode 100644
index 000000000..4bf3aa205
--- /dev/null
+++ b/applied_patches/0330-vba-fix-isempty.diff
@@ -0,0 +1,34 @@
+diff --git basic/source/classes/sbunoobj.cxx basic/source/classes/sbunoobj.cxx
+index b02dca2..6abb00c 100644
+--- basic/source/classes/sbunoobj.cxx
++++ basic/source/classes/sbunoobj.cxx
+@@ -139,16 +139,19 @@ bool SbUnoObject::getDefaultPropName( SbUnoObject* pUnoObj, String& sDfltProp )
+ SbxVariable* getDefaultProp( SbxVariable* pRef )
+ {
+ 	SbxVariable* pDefaultProp = NULL;
+-	SbxObject* pObj = PTR_CAST(SbxObject,(SbxVariable*) pRef);
+-	if ( !pObj )
++	if ( pRef->GetType() == SbxOBJECT )
+ 	{
+-		SbxBase* pObjVarObj = pRef->GetObject();
+-		pObj = PTR_CAST(SbxObject,pObjVarObj);
+-	}
+-	if ( pObj && pObj->ISA(SbUnoObject) )
+-	{
+-		SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj);
+-		pDefaultProp = pUnoObj->GetDfltProperty();
++  		SbxObject* pObj = PTR_CAST(SbxObject,(SbxVariable*) pRef);
++		if ( !pObj )
++		{
++			SbxBase* pObjVarObj = pRef->GetObject();
++			pObj = PTR_CAST(SbxObject,pObjVarObj);
++		}
++		if ( pObj && pObj->ISA(SbUnoObject) )
++		{
++			SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj);
++			pDefaultProp = pUnoObj->GetDfltProperty();
++		}
+ 	}
+ 	return pDefaultProp;
+ }
+
diff --git a/applied_patches/0331-vba-fix-ide-friendly-modulename.diff b/applied_patches/0331-vba-fix-ide-friendly-modulename.diff
deleted file mode 100644
index b660f5a66..000000000
--- a/applied_patches/0331-vba-fix-ide-friendly-modulename.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git basctl/source/basicide/basides2.cxx basctl/source/basicide/basides2.cxx
-index 981de5b..f29b272 100644
---- basctl/source/basicide/basides2.cxx
-+++ basctl/source/basicide/basides2.cxx
-@@ -66,19 +66,25 @@ namespace css = ::com::sun::star;
- 
- void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib, const String& rModName, String& rObjName )
- {
--	uno::Any aElement( rLib->getByName( rModName ) );
--	script::ModuleInfo aModuleInfo;
--	if( aElement >>= aModuleInfo )
--	{
--		uno::Any aObject( aModuleInfo.ModuleObject );
--		uno::Reference< lang::XServiceInfo > xServiceInfo( aObject, uno::UNO_QUERY );
--		if( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString::createFromAscii( "org.openoffice.excel.Worksheet" ) ) )
-+    try
-+    {
-+		uno::Any aElement( rLib->getByName( rModName ) );
-+		script::ModuleInfo aModuleInfo;
-+		if( aElement >>= aModuleInfo )
- 		{
--			uno::Reference< container::XNamed > xNamed( aObject, uno::UNO_QUERY );
--			if( xNamed.is() )
--				rObjName = xNamed->getName();
-+			uno::Any aObject( aModuleInfo.ModuleObject );
-+			uno::Reference< lang::XServiceInfo > xServiceInfo( aObject, uno::UNO_QUERY );
-+			if( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Worksheet" ) ) )
-+			{
-+				uno::Reference< container::XNamed > xNamed( aObject, uno::UNO_QUERY );
-+				if( xNamed.is() )
-+					rObjName = xNamed->getName();
-+			}
- 		}
--	}	
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
- }
- 
- IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )
diff --git a/applied_patches/0331-vba-fix-wsfunction-booleanparam.diff b/applied_patches/0331-vba-fix-wsfunction-booleanparam.diff
new file mode 100644
index 000000000..733474480
--- /dev/null
+++ b/applied_patches/0331-vba-fix-wsfunction-booleanparam.diff
@@ -0,0 +1,22 @@
+diff --git sc/source/ui/vba/vbawsfunction.cxx sc/source/ui/vba/vbawsfunction.cxx
+index d0e7ee3..ed3a749 100644
+--- sc/source/ui/vba/vbawsfunction.cxx
++++ sc/source/ui/vba/vbawsfunction.cxx
+@@ -81,6 +81,16 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence<
+ 			aArrayTemp[i] = myRange->getCellRange();
+ 			continue;
+ 		}
++                else if (  aArray[ i ].getValueType().getTypeClass() == uno::TypeClass_BOOLEAN )
++		{
++			sal_Bool bValue( sal_False );
++			aArray[ i ] >>= bValue;
++			if ( bValue )
++				aArrayTemp[ i ] <<= double( 1.0 ); 
++			else
++				aArrayTemp[ i ] <<= double( 0.0 ); 
++                        
++		}
+         else if ( aArray[ i ].getValueType().getTypeClass() == uno::TypeClass_SEQUENCE )
+         {
+             // the sheet.FunctionAccess service doesn't deal with Sequences, only Sequences of Sequence
+
diff --git a/applied_patches/0332-vba-basic-macrochoose-dialog.diff b/applied_patches/0332-vba-basic-macrochoose-dialog.diff
deleted file mode 100644
index 895a919e8..000000000
--- a/applied_patches/0332-vba-basic-macrochoose-dialog.diff
+++ /dev/null
@@ -1,831 +0,0 @@
-diff -urp '--exclude=unxlngi6.pro' basctl.bk/inc/basidesh.hrc basctl/inc/basidesh.hrc
---- basctl.bk/inc/basidesh.hrc	2008-10-10 09:48:33.000000000 +0800
-+++ basctl/inc/basidesh.hrc	2008-10-10 09:53:46.000000000 +0800
-@@ -175,6 +175,10 @@
- #define RID_STR_EXPORTPACKAGE			( RID_BASICIDE_START + 100 )
- #define RID_STR_EXPORTBASIC				( RID_BASICIDE_START + 101 )
- #define RID_STR_PACKAGE_BUNDLE			( RID_BASICIDE_START + 102 )
-+#define RID_STR_DOCUMENT_OBJECTS        ( RID_BASICIDE_START + 110 )
-+#define RID_STR_USERFORMS               ( RID_BASICIDE_START + 111 )
-+#define RID_STR_NORMAL_MODULES          ( RID_BASICIDE_START + 112 )
-+#define RID_STR_CLASS_MODULES           ( RID_BASICIDE_START + 113 )
- 
- #endif	// _SVX_NOIDERESIDS
- 
-diff -urp '--exclude=unxlngi6.pro' basctl.bk/source/basicide/baside2.cxx basctl/source/basicide/baside2.cxx
---- basctl.bk/source/basicide/baside2.cxx	2008-10-10 09:48:33.000000000 +0800
-+++ basctl/source/basicide/baside2.cxx	2008-10-10 09:53:46.000000000 +0800
-@@ -49,6 +49,7 @@
- #include <com/sun/star/script/XLibraryContainer2.hpp>
- #endif
- #include <com/sun/star/document/MacroExecMode.hpp>
-+#include <com/sun/star/script/ModuleType.hpp>
- #include <toolkit/helper/vclunohelper.hxx>
- #include <sfx2/docfile.hxx>
- #include <basic/basrdll.hxx>
-@@ -110,6 +111,8 @@ DBG_NAME( ModulWindow )
- 
- TYPEINIT1( ModulWindow , IDEBaseWindow );
- 
-+void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib, const String& rModName, String& rObjName );
-+
- void lcl_PrintHeader( Printer* pPrinter, USHORT nPages, USHORT nCurPage, const String& rTitle )
- {
- 	short nLeftMargin 	= LMARGPRN;
-@@ -1347,7 +1350,39 @@ BasicEntryDescriptor ModulWindow::Create
-     ScriptDocument aDocument( GetDocument() );
-     String aLibName( GetLibName() );
-     LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
--    return BasicEntryDescriptor( aDocument, eLocation, aLibName, GetName(), OBJ_TYPE_MODULE );
-+    String aModName( GetName() );
-+    String aLibSubName;
-+    if( xBasic.Is() && xBasic->isVBAEnabled() && xModule.Is() )
-+    {
-+        switch( xModule->GetModuleType() )
-+        {
-+            case script::ModuleType::Document:
-+            {
-+                aLibSubName = String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) );
-+                uno::Reference< container::XNameContainer > xLib = aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
-+                if( xLib.is() )
-+                {
-+                    String sObjName;
-+                    lcl_getObjectName( xLib, aModName, sObjName );
-+                    if( sObjName.Len() )
-+                    {
-+                        aModName.AppendAscii(" (").Append(sObjName).AppendAscii(")");
-+                    }
-+                }
-+                break;
-+            }    
-+            case script::ModuleType::Form:
-+                aLibSubName = String( IDEResId( RID_STR_USERFORMS ) );
-+                break;
-+            case script::ModuleType::Normal:
-+                aLibSubName = String( IDEResId( RID_STR_NORMAL_MODULES ) );
-+                break;
-+            case script::ModuleType::Class:
-+                aLibSubName = String( IDEResId( RID_STR_CLASS_MODULES ) );
-+                break;
-+        }
-+    }
-+    return BasicEntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, aModName, OBJ_TYPE_MODULE );
- }
- 
- void ModulWindow::SetReadOnly( BOOL b )
-diff -urp '--exclude=unxlngi6.pro' basctl.bk/source/basicide/baside3.cxx basctl/source/basicide/baside3.cxx
---- basctl.bk/source/basicide/baside3.cxx	2008-10-10 09:48:33.000000000 +0800
-+++ basctl/source/basicide/baside3.cxx	2008-10-10 09:53:46.000000000 +0800
-@@ -903,8 +903,9 @@ BasicEntryDescriptor DialogWindow::Creat
- {
-     ScriptDocument aDocument( GetDocument() );
-     String aLibName( GetLibName() );
-+    String aLibSubName;
-     LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
--    return BasicEntryDescriptor( aDocument, eLocation, aLibName, GetName(), OBJ_TYPE_DIALOG );
-+    return BasicEntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, GetName(), OBJ_TYPE_DIALOG );
- }
- 
- void DialogWindow::SetReadOnly( BOOL b )
-diff -urp '--exclude=unxlngi6.pro' basctl.bk/source/basicide/basidesh.src basctl/source/basicide/basidesh.src
---- basctl.bk/source/basicide/basidesh.src	2008-10-10 09:48:33.000000000 +0800
-+++ basctl/source/basicide/basidesh.src	2008-10-10 09:53:46.000000000 +0800
-@@ -639,6 +639,22 @@ String RID_STR_TRANSLATION_DEFAULT
- {
- 	Text [ en-US ] = "[Default Language]" ;
- };
-+String RID_STR_DOCUMENT_OBJECTS
-+{
-+    Text [ en-US ] = "Document Objects" ;
-+};
-+String RID_STR_USERFORMS
-+{
-+    Text [ en-US ] = "Forms" ;
-+};
-+String RID_STR_NORMAL_MODULES
-+{
-+    Text [ en-US ] = "Modules" ;
-+};
-+String RID_STR_CLASS_MODULES
-+{
-+    Text [ en-US ] = "Class Modules" ;
-+};
- 
- #define MN_EDIT       20
- #define MN_VIEW 21
-diff -urp '--exclude=unxlngi6.pro' basctl.bk/source/basicide/bastype2.cxx basctl/source/basicide/bastype2.cxx
---- basctl.bk/source/basicide/bastype2.cxx	2008-10-10 09:48:34.000000000 +0800
-+++ basctl/source/basicide/bastype2.cxx	2008-10-10 09:53:46.000000000 +0800
-@@ -53,10 +53,25 @@
- #include <com/sun/star/frame/XModuleManager.hpp>
- #include <comphelper/processfactory.hxx>
- #include <comphelper/componentcontext.hxx>
-+#include <map>
-+#include <com/sun/star/script/ModuleType.hpp>
-+#include <com/sun/star/script/ModuleInfo.hpp>
-+#include <com/sun/star/container/XNameContainer.hpp>
- 
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star;
- 
-+void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib, const String& rModName, String& rObjName );
-+
-+sal_Int32 lcl_getModuleType(  const uno::Reference< container::XNameContainer >& rLib, const String& rModName )
-+{
-+    sal_Int32 nType = com::sun::star::script::ModuleType::Normal;
-+    uno::Any aElement( rLib->getByName( rModName ) );
-+    script::ModuleInfo aModuleInfo;
-+    if( aElement >>= aModuleInfo )
-+        nType = aModuleInfo.ModuleType;
-+    return nType;    
-+}
- 
- BasicEntry::~BasicEntry()
- {
-@@ -91,20 +106,22 @@ BasicEntryDescriptor::BasicEntryDescript
- {
- }
- 
--BasicEntryDescriptor::BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rName, BasicEntryType eType )
-+BasicEntryDescriptor::BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rLibSubName, const String& rName, BasicEntryType eType )
-     :m_aDocument( rDocument )
-     ,m_eLocation( eLocation )
-     ,m_aLibName( rLibName )
-+    ,m_aLibSubName( rLibSubName )
-     ,m_aName( rName )
-     ,m_eType( eType )
- {
-     OSL_ENSURE( m_aDocument.isValid(), "BasicEntryDescriptor::BasicEntryDescriptor: invalid document!" );
- }
- 
--BasicEntryDescriptor::BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rName, const String& rMethodName, BasicEntryType eType )
-+BasicEntryDescriptor::BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rLibSubName, const String& rName, const String& rMethodName, BasicEntryType eType )
-     :m_aDocument( rDocument )
-     ,m_eLocation( eLocation )
-     ,m_aLibName( rLibName )
-+    ,m_aLibSubName( rLibSubName )
-     ,m_aName( rName )
-     ,m_aMethodName( rMethodName )
-     ,m_eType( eType )
-@@ -120,6 +137,7 @@ BasicEntryDescriptor::BasicEntryDescript
-     :m_aDocument( rDesc.m_aDocument )
-     ,m_eLocation( rDesc.m_eLocation )
-     ,m_aLibName( rDesc.m_aLibName )
-+    ,m_aLibSubName( rDesc.m_aLibSubName )
-     ,m_aName( rDesc.m_aName )
-     ,m_aMethodName( rDesc.m_aMethodName )
-     ,m_eType( rDesc.m_eType )
-@@ -131,6 +149,7 @@ BasicEntryDescriptor& BasicEntryDescript
-     m_aDocument = rDesc.m_aDocument;
-     m_eLocation = rDesc.m_eLocation;
-     m_aLibName = rDesc.m_aLibName;
-+    m_aLibSubName = rDesc.m_aLibSubName;
-     m_aName = rDesc.m_aName;
-     m_aMethodName = rDesc.m_aMethodName;
-     m_eType = rDesc.m_eType;
-@@ -143,6 +162,7 @@ bool BasicEntryDescriptor::operator==( c
-     return m_aDocument == rDesc.m_aDocument &&
-            m_eLocation == rDesc.m_eLocation &&
-            m_aLibName == rDesc.m_aLibName &&
-+           m_aLibSubName == rDesc.m_aLibSubName &&
-            m_aName == rDesc.m_aName &&
-            m_aMethodName == rDesc.m_aMethodName &&
-            m_eType == rDesc.m_eType;
-@@ -286,50 +306,58 @@ void BasicTreeListBox::ImpCreateLibSubEn
-         if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLoaded( aOULibName ) )
-         {
-             try
--		    {
--                // get a sorted list of module names
--                Sequence< ::rtl::OUString > aModNames = rDocument.getObjectNames( E_SCRIPTS, rLibName );
--                sal_Int32 nModCount = aModNames.getLength();
--	            const ::rtl::OUString* pModNames = aModNames.getConstArray();
--
--                for ( sal_Int32 i = 0 ; i < nModCount ; i++ )
--				{
--                    String aModName = pModNames[ i ];
--                    SvLBoxEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE );
--                    if ( !pModuleEntry )
--                        pModuleEntry = AddEntry(
--                            aModName,
--                            Image( IDEResId( RID_IMG_MODULE ) ),
--                            Image( IDEResId( RID_IMG_MODULE_HC ) ),
--                            pLibRootEntry, false,
--                            std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
--
--					// methods
--					if ( nMode & BROWSEMODE_SUBS )
--					{
--                        Sequence< ::rtl::OUString > aNames = BasicIDE::GetMethodNames( rDocument, rLibName, aModName );
--						sal_Int32 nCount = aNames.getLength();
--						const ::rtl::OUString* pNames = aNames.getConstArray();
--
--						for ( sal_Int32 j = 0 ; j < nCount ; j++ )
--						{
--							String aName = pNames[ j ];
--							SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
--                            if ( !pEntry )
--                                pEntry = AddEntry(
--                                    aName,
--                                    Image( IDEResId( RID_IMG_MACRO ) ),
--                                    Image( IDEResId( RID_IMG_MACRO_HC ) ),
--                                    pModuleEntry, false,
--                                    std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_METHOD ) ) );
--						}
--                    }
--				}
-+		 	{
-+                BasicManager* pBasMgr = rDocument.getBasicManager();
-+                StarBASIC* pBasic = pBasMgr ? pBasMgr->GetLib( rLibName ) : 0;
-+                sal_Bool bVBAEnabled = pBasic ? pBasic->isVBAEnabled(): sal_False;
-+                if( bVBAEnabled )
-+                    ImpCreateLibSubEntriesInVBAMode( pLibRootEntry, rDocument, rLibName );
-+                else
-+                {
-+                    // get a sorted list of module names
-+                    Sequence< ::rtl::OUString > aModNames = rDocument.getObjectNames( E_SCRIPTS, rLibName );
-+                    sal_Int32 nModCount = aModNames.getLength();
-+		            const ::rtl::OUString* pModNames = aModNames.getConstArray();
-+
-+                    for ( sal_Int32 i = 0 ; i < nModCount ; i++ )
-+		 			{
-+                        String aModName = pModNames[ i ];
-+                        SvLBoxEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE );
-+                        if ( !pModuleEntry )
-+                            pModuleEntry = AddEntry(
-+                                aModName,
-+                                Image( IDEResId( RID_IMG_MODULE ) ),
-+                                Image( IDEResId( RID_IMG_MODULE_HC ) ),
-+                                pLibRootEntry, false,
-+                                std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
-+
-+		 				// methods
-+		 				if ( nMode & BROWSEMODE_SUBS )
-+		 				{
-+                            Sequence< ::rtl::OUString > aNames = BasicIDE::GetMethodNames( rDocument, rLibName, aModName );
-+		 					sal_Int32 nCount = aNames.getLength();
-+		 					const ::rtl::OUString* pNames = aNames.getConstArray();
-+
-+		 					for ( sal_Int32 j = 0 ; j < nCount ; j++ )
-+		 					{
-+		 						String aName = pNames[ j ];
-+		 						SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
-+                                if ( !pEntry )
-+                                    pEntry = AddEntry(
-+                                        aName,
-+                                        Image( IDEResId( RID_IMG_MACRO ) ),
-+                                        Image( IDEResId( RID_IMG_MACRO_HC ) ),
-+                                        pModuleEntry, false,
-+                                        std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_METHOD ) ) );
-+		 					}
-+                        }
-+		 			}
-+                }
-             }
--		    catch ( const container::NoSuchElementException& )
--		    {
-+		 	catch ( const container::NoSuchElementException& )
-+		 	{
-                 DBG_UNHANDLED_EXCEPTION();
--		    }
-+		 	}
-         }   
-     }
- 
-@@ -368,6 +396,139 @@ void BasicTreeListBox::ImpCreateLibSubEn
-     }
- }
- 
-+void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName )
-+{
-+    ::std::map< BasicEntryType, ::rtl::OUString > aEntryMap;
-+    aEntryMap.insert( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) );
-+    aEntryMap.insert( ::std::make_pair( OBJ_TYPE_USERFORMS,  String( IDEResId( RID_STR_USERFORMS ) ) ) );
-+    aEntryMap.insert( ::std::make_pair( OBJ_TYPE_NORMAL_MODULES, String( IDEResId( RID_STR_NORMAL_MODULES ) ) ) );
-+    aEntryMap.insert( ::std::make_pair( OBJ_TYPE_CLASS_MODULES,  String( IDEResId( RID_STR_CLASS_MODULES ) ) ) );
-+
-+    ::std::map< BasicEntryType, ::rtl::OUString >::iterator iter;
-+    for( iter = aEntryMap.begin(); iter != aEntryMap.end(); ++iter )
-+    {
-+        BasicEntryType eType = iter->first;
-+        ::rtl::OUString aEntryName = iter->second;
-+        SvLBoxEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType );
-+        if( pLibSubRootEntry )
-+        {
-+            SetEntryBitmaps( pLibSubRootEntry, Image( IDEResId( RID_IMG_MODLIB ) ), Image( IDEResId( RID_IMG_MODLIB_HC ) ) );
-+            if ( IsExpanded( pLibSubRootEntry ) )
-+			    ImpCreateLibSubSubEntriesInVBAMode( pLibSubRootEntry, rDocument, rLibName );
-+        }
-+        else
-+        {
-+            pLibSubRootEntry = AddEntry(
-+                aEntryName,
-+                Image( IDEResId( RID_IMG_MODLIB ) ),
-+                Image( IDEResId( RID_IMG_MODLIB_HC ) ),
-+                pLibRootEntry, true,
-+                std::auto_ptr< BasicEntry >( new BasicEntry( eType ) ) );
-+        }
-+    }
-+}
-+
-+void BasicTreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const String& rLibName )
-+{
-+    uno::Reference< container::XNameContainer > xLib = rDocument.getOrCreateLibrary( E_SCRIPTS, rLibName );
-+    if( !xLib.is() )
-+        return;
-+
-+    try
-+	{
-+        // get a sorted list of module names
-+        Sequence< ::rtl::OUString > aModNames = rDocument.getObjectNames( E_SCRIPTS, rLibName );
-+        sal_Int32 nModCount = aModNames.getLength();
-+    	const ::rtl::OUString* pModNames = aModNames.getConstArray();
-+
-+        BasicEntryDescriptor aDesc( GetEntryDescriptor( pLibSubRootEntry ) );
-+        BasicEntryType eCurrentType( aDesc.GetType() );
-+
-+        for ( sal_Int32 i = 0 ; i < nModCount ; i++ )
-+		{
-+            String aModName = pModNames[ i ];
-+            BasicEntryType eType = OBJ_TYPE_UNKNOWN;
-+            switch( lcl_getModuleType( xLib, aModName ) )
-+            {
-+                case script::ModuleType::Document:
-+                    eType = OBJ_TYPE_DOCUMENT_OBJECTS;
-+                    break;
-+                case script::ModuleType::Form:
-+                    eType = OBJ_TYPE_USERFORMS;
-+                    break;
-+                case script::ModuleType::Normal:
-+                    eType = OBJ_TYPE_NORMAL_MODULES;
-+                    break;
-+                case script::ModuleType::Class:
-+                    eType = OBJ_TYPE_CLASS_MODULES;
-+                    break;
-+            }
-+            if( eType != eCurrentType )
-+                continue;
-+
-+			// display a nice friendly name in the ObjectModule tab,
-+           	// combining the objectname and module name, e.g. Sheet1 ( Financials )
-+            String aEntryName( aModName );
-+            if( eType == OBJ_TYPE_DOCUMENT_OBJECTS )
-+            {
-+	       	    String sObjName;
-+            	lcl_getObjectName( xLib, aModName, sObjName );
-+		    	if( sObjName.Len() )
-+        	   	{
-+		        	aEntryName.AppendAscii(" (").Append(sObjName).AppendAscii(")");
-+            	}
-+            }
-+            SvLBoxEntry* pModuleEntry = FindEntry( pLibSubRootEntry, aEntryName, OBJ_TYPE_MODULE );
-+            if ( !pModuleEntry )
-+                pModuleEntry = AddEntry(
-+                    aEntryName,
-+                    Image( IDEResId( RID_IMG_MODULE ) ),
-+                    Image( IDEResId( RID_IMG_MODULE_HC ) ),
-+                    pLibSubRootEntry, false,
-+                    std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
-+
-+			// methods
-+			if ( nMode & BROWSEMODE_SUBS )
-+			{
-+                Sequence< ::rtl::OUString > aNames = BasicIDE::GetMethodNames( rDocument, rLibName, aModName );
-+				sal_Int32 nCount = aNames.getLength();
-+				const ::rtl::OUString* pNames = aNames.getConstArray();
-+
-+				for ( sal_Int32 j = 0 ; j < nCount ; j++ )
-+				{
-+					String aName = pNames[ j ];
-+					SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
-+                    if ( !pEntry )
-+                        pEntry = AddEntry(
-+                            aName,
-+                            Image( IDEResId( RID_IMG_MACRO ) ),
-+                            Image( IDEResId( RID_IMG_MACRO_HC ) ),
-+                            pModuleEntry, false,
-+                            std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_METHOD ) ) );
-+    			}
-+            }
-+	    }
-+    }
-+    catch ( const container::NoSuchElementException& )
-+	{
-+        DBG_UNHANDLED_EXCEPTION();
-+    }
-+}
-+
-+SvLBoxEntry* BasicTreeListBox::ImpFindEntry( SvLBoxEntry* pParent, const String& rText )
-+{
-+	ULONG nRootPos = 0;
-+	SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
-+	while ( pEntry )
-+	{
-+		if (  GetEntryText( pEntry ) == rText ) 
-+			return pEntry;
-+
-+		pEntry = pParent ? NextSibling( pEntry ) : GetEntry( ++nRootPos );
-+	}
-+	return 0;
-+}
-+
- void BasicTreeListBox::onDocumentCreated( const ScriptDocument& /*_rDocument*/ )
- {
-     UpdateEntries();
-@@ -480,10 +641,11 @@ long BasicTreeListBox::ExpandingHdl()
-         if ( aDocument.isAlive() )
-         {
-             String aLibName( aDesc.GetLibName() );
-+            String aLibSubName( aDesc.GetLibSubName() );
-             String aName( aDesc.GetName() );
-             String aMethodName( aDesc.GetMethodName() );
- 
--            if ( aLibName.Len() && !aName.Len() && !aMethodName.Len() )
-+            if ( aLibName.Len() && !aLibSubName.Len() && !aName.Len() && !aMethodName.Len() )
- 		    {
-                 // check password, if library is password protected and not verified
-                 ::rtl::OUString aOULibName( aLibName );
-@@ -636,7 +798,7 @@ void BasicTreeListBox::SetCurrentEntry(
-         aDesc = BasicEntryDescriptor(
-             ScriptDocument::getApplicationScriptDocument(),
-             LIBRARY_LOCATION_USER, String::CreateFromAscii( "Standard" ), 
--            String::CreateFromAscii( "." ), OBJ_TYPE_UNKNOWN );
-+            String(), String::CreateFromAscii( "." ), OBJ_TYPE_UNKNOWN );
-     }
-     ScriptDocument aDocument( aDesc.GetDocument() );
-     OSL_ENSURE( aDocument.isValid(), "BasicTreeListBox::SetCurrentEntry: invalid document!" );
-@@ -653,14 +815,24 @@ void BasicTreeListBox::SetCurrentEntry(
-             if ( pLibEntry )
-             {
-                 pCurEntry = pLibEntry;
-+                String aLibSubName( aDesc.GetLibSubName() );
-+                if( aLibSubName.Len() )
-+                {
-+                    Expand( pLibEntry );
-+                    SvLBoxEntry* pLibSubEntry = ImpFindEntry( pLibEntry, aLibSubName );
-+                    if( pLibSubEntry )
-+                    {
-+                        pCurEntry = pLibSubEntry;
-+                    }
-+                }
-                 String aName( aDesc.GetName() );
-                 if ( aName.Len() )
-                 {
--                    Expand( pLibEntry );
-+                    Expand( pCurEntry );
-                     BasicEntryType eType = OBJ_TYPE_MODULE;
-                     if ( aDesc.GetType() == OBJ_TYPE_DIALOG )
-                         eType = OBJ_TYPE_DIALOG;
--                    SvLBoxEntry* pEntry = FindEntry( pLibEntry, aName, eType );
-+                    SvLBoxEntry* pEntry = FindEntry( pCurEntry, aName, eType );
-                     if ( pEntry )
-                     {
-                         pCurEntry = pEntry;
-diff -urp '--exclude=unxlngi6.pro' basctl.bk/source/basicide/bastype2.hxx basctl/source/basicide/bastype2.hxx
---- basctl.bk/source/basicide/bastype2.hxx	2008-10-10 09:48:34.000000000 +0800
-+++ basctl/source/basicide/bastype2.hxx	2008-10-10 09:53:46.000000000 +0800
-@@ -42,7 +42,7 @@
- #include <sbxitem.hxx>
- #include "basobj.hxx"
- 
--enum BasicEntryType { OBJ_TYPE_UNKNOWN, OBJ_TYPE_DOCUMENT, OBJ_TYPE_LIBRARY, OBJ_TYPE_MODULE, OBJ_TYPE_DIALOG, OBJ_TYPE_METHOD };
-+enum BasicEntryType { OBJ_TYPE_UNKNOWN, OBJ_TYPE_DOCUMENT, OBJ_TYPE_LIBRARY, OBJ_TYPE_MODULE, OBJ_TYPE_DIALOG, OBJ_TYPE_METHOD, OBJ_TYPE_DOCUMENT_OBJECTS, OBJ_TYPE_USERFORMS, OBJ_TYPE_NORMAL_MODULES, OBJ_TYPE_CLASS_MODULES };
- 
- #define BROWSEMODE_MODULES		0x01
- #define BROWSEMODE_SUBS			0x02
-@@ -101,14 +101,15 @@ class BasicEntryDescriptor
-     ScriptDocument          m_aDocument;
-     LibraryLocation         m_eLocation;
-     String                  m_aLibName;
-+    String                  m_aLibSubName;  // for vba entry:  Document Objects, Class Modules, Forms and Normal Modules
-     String                  m_aName;
-     String                  m_aMethodName;
-     BasicEntryType          m_eType;
- 
- public:
-                             BasicEntryDescriptor();
--	                        BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rName, BasicEntryType eType );
--	                        BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rName, const String& rMethodName, BasicEntryType eType );
-+	                        BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rLibSubName, const String& rName, BasicEntryType eType );
-+	                        BasicEntryDescriptor( const ScriptDocument& rDocument, LibraryLocation eLocation, const String& rLibName, const String& rLibSubName, const String& rName, const String& rMethodName, BasicEntryType eType );
-     virtual                 ~BasicEntryDescriptor();
- 
-                             BasicEntryDescriptor( const BasicEntryDescriptor& rDesc );
-@@ -125,6 +126,9 @@ public:
-     const String&           GetLibName() const { return m_aLibName; }
-     void                    SetLibName( const String& aLibName ) { m_aLibName = aLibName; }
- 
-+    const String&           GetLibSubName() const { return m_aLibSubName; }
-+    void                    SetLibSubName( const String& aLibSubName ) { m_aLibSubName = aLibSubName; }
-+
-     const String&           GetName() const { return m_aName; }
-     void                    SetName( const String& aName ) { m_aName = aName; }
- 
-@@ -164,6 +168,9 @@ protected:
- 
-     void                    ImpCreateLibEntries( SvLBoxEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
- 	void 					ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName );
-+	void 					ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName );
-+	void 					ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const String& rLibName );
-+    SvLBoxEntry*            ImpFindEntry( SvLBoxEntry* pParent, const String& rText );
- 
-     // DocumentEventListener
-     virtual void onDocumentCreated( const ScriptDocument& _rDocument );
-diff -urp '--exclude=unxlngi6.pro' basctl.bk/source/basicide/bastype3.cxx basctl/source/basicide/bastype3.cxx
---- basctl.bk/source/basicide/bastype3.cxx	2008-10-10 09:48:34.000000000 +0800
-+++ basctl/source/basicide/bastype3.cxx	2008-10-10 10:06:49.000000000 +0800
-@@ -134,6 +134,14 @@ void __EXPORT BasicTreeListBox::Requesti
- 		    }
-         }
-     }
-+    else if ( eType == OBJ_TYPE_DOCUMENT_OBJECTS 
-+            || eType == OBJ_TYPE_USERFORMS
-+            || eType == OBJ_TYPE_NORMAL_MODULES
-+            || eType == OBJ_TYPE_CLASS_MODULES )
-+    {
-+        String aLibName( aDesc.GetLibName() );
-+        ImpCreateLibSubSubEntriesInVBAMode( pEntry, aDocument, aLibName );
-+    }
- 	else {
- 		DBG_ERROR( "BasicTreeListBox::RequestingChilds: Unknown Type!" );
-     }
-@@ -204,6 +212,7 @@ SbxVariable* BasicTreeListBox::FindVaria
-     }
- 
- 	SbxVariable* pVar = 0;
-+    bool bDocumentObjects = false;
- 	if ( aEntries.Count() )
- 	{
- 		for ( USHORT n = 0; n < aEntries.Count(); n++ )
-@@ -226,6 +235,12 @@ SbxVariable* BasicTreeListBox::FindVaria
- 				case OBJ_TYPE_MODULE:
- 				{
- 					DBG_ASSERT( pVar && pVar->IsA( TYPE(StarBASIC) ), "FindVariable: Ungueltiges Basic" );
-+                    // extract the module name from the string like "Sheet1 (Example1)"
-+                    if( bDocumentObjects )
-+                    {
-+                        sal_uInt16 nIndex = 0;
-+                        aName = aName.GetToken( 0, ' ', nIndex );
-+                    }
- 					pVar = ((StarBASIC*)pVar)->FindModule( aName );
- 				}
- 				break;
-@@ -240,6 +255,15 @@ SbxVariable* BasicTreeListBox::FindVaria
- 					// sbx dialogs removed
- 				}
- 				break;
-+                case OBJ_TYPE_DOCUMENT_OBJECTS:
-+                    bDocumentObjects = true;
-+                case OBJ_TYPE_USERFORMS:
-+                case OBJ_TYPE_NORMAL_MODULES:
-+                case OBJ_TYPE_CLASS_MODULES:
-+                {
-+                    // skip, to find the child entry.
-+                    continue;
-+                }
-                 default:
-                 {
-                     DBG_ERROR( "FindVariable: Unbekannter Typ!" );
-@@ -260,12 +284,13 @@ BasicEntryDescriptor BasicTreeListBox::G
-     ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
-     LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN;
- 	String aLibName;
-+	String aLibSubName;
- 	String aName;
- 	String aMethodName;
-     BasicEntryType eType = OBJ_TYPE_UNKNOWN;
- 
- 	if ( !pEntry )
--        return BasicEntryDescriptor( aDocument, eLocation, aLibName, aName, aMethodName, eType );
-+        return BasicEntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, aName, aMethodName, eType );
- 
- 	EntryArray aEntries;
- 
-@@ -332,6 +357,15 @@ BasicEntryDescriptor BasicTreeListBox::G
- 					eType = pBE->GetType();
- 				}
- 				break;
-+                case OBJ_TYPE_DOCUMENT_OBJECTS:
-+                case OBJ_TYPE_USERFORMS:
-+                case OBJ_TYPE_NORMAL_MODULES:
-+                case OBJ_TYPE_CLASS_MODULES:
-+				{
-+					aLibSubName = GetEntryText( pLE );
-+					eType = pBE->GetType();
-+				}
-+				break;
- 				default:
-                 {
-                     DBG_ERROR( "GetEntryDescriptor: Unbekannter Typ!" );
-@@ -345,7 +379,7 @@ BasicEntryDescriptor BasicTreeListBox::G
- 		}
- 	}
- 
--    return BasicEntryDescriptor( aDocument, eLocation, aLibName, aName, aMethodName, eType );
-+    return BasicEntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, aName, aMethodName, eType );
- }
- 
- USHORT BasicTreeListBox::ConvertType( BasicEntryType eType )
-@@ -427,6 +461,14 @@ bool BasicTreeListBox::IsValidEntry( SvL
-             bIsValid = BasicIDE::HasMethod( aDocument, aLibName, aName, aMethodName );
-         }
-         break;
-+        case OBJ_TYPE_DOCUMENT_OBJECTS:
-+        case OBJ_TYPE_USERFORMS:
-+        case OBJ_TYPE_NORMAL_MODULES:
-+        case OBJ_TYPE_CLASS_MODULES:
-+        {
-+            bIsValid = true;
-+        }
-+        break;
- 		default: ;
-     }
- 
-diff -urp '--exclude=unxlngi6.pro' basctl.bk/source/basicide/macrodlg.cxx basctl/source/basicide/macrodlg.cxx
---- basctl.bk/source/basicide/macrodlg.cxx	2008-10-10 09:48:33.000000000 +0800
-+++ basctl/source/basicide/macrodlg.cxx	2008-10-10 10:08:05.000000000 +0800
-@@ -385,7 +385,15 @@ SbMethod* MacroChooser::CreateMacro()
-         SbModule* pModule = 0;
-         String aModName( aDesc.GetName() );
-         if ( aModName.Len() )
-+        {
-+            // extract the module name from the string like "Sheet1 (Example1)"
-+            if( aDesc.GetLibSubName().Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) )
-+            {
-+                sal_uInt16 nIndex = 0;
-+                aModName = aModName.GetToken( 0, ' ', nIndex );
-+            }
- 	        pModule = pBasic->FindModule( aModName );
-+        }    
-         else if ( pBasic->GetModules()->Count() )
- 	        pModule = (SbModule*)pBasic->GetModules()->Get( 0 );
- 
-@@ -713,6 +721,12 @@ IMPL_LINK( MacroChooser, ButtonHdl, Butt
-         BasicManager* pBasMgr = aDocument.getBasicManager();
-         String aLib( aDesc.GetLibName() );
-         String aMod( aDesc.GetName() );
-+        // extract the module name from the string like "Sheet1 (Example1)"
-+        if( aDesc.GetLibSubName().Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) )
-+        {
-+            sal_uInt16 nIndex = 0;
-+            aMod = aMod.GetToken( 0, ' ', nIndex );
-+        }
-         String aSub( aDesc.GetMethodName() );
- 		SfxMacroInfoItem aInfoItem( SID_BASICIDE_ARG_MACROINFO, pBasMgr, aLib, aMod, aSub, String() );
- 		if ( pButton == &aEditButton )
-diff -urp '--exclude=unxlngi6.pro' basctl.bk/source/basicide/moduldlg.cxx basctl/source/basicide/moduldlg.cxx
---- basctl.bk/source/basicide/moduldlg.cxx	2008-10-10 09:48:33.000000000 +0800
-+++ basctl/source/basicide/moduldlg.cxx	2008-10-10 10:08:44.000000000 +0800
-@@ -87,7 +87,7 @@ BOOL __EXPORT ExtBasicTreeListBox::Editi
-     if ( pEntry )
-     {
-         USHORT nDepth = GetModel()->GetDepth( pEntry );
--        if ( nDepth == 2 )
-+        if ( nDepth >= 2 )
-         {
-             BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) );
-             ScriptDocument aDocument( aDesc.GetDocument() );
-@@ -165,7 +165,7 @@ DragDropMode __EXPORT ExtBasicTreeListBo
-     if ( pEntry )
-     {
-         USHORT nDepth = GetModel()->GetDepth( pEntry );
--        if ( nDepth == 2 )
-+        if ( nDepth >= 2 )
-         {
-             nMode_ = SV_DRAGDROP_CTRL_COPY;
-             BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) );
-@@ -213,7 +213,7 @@ BOOL __EXPORT ExtBasicTreeListBox::Notif
- 
-     // don't drop on a library, which is not loaded, readonly or password protected
-     // or which already has a module/dialog with this name
--    if ( bValid && ( nDepth == 1 || nDepth == 2 ) )
-+    if ( bValid && ( nDepth > 0 ) )
-     {
- 		// get source module/dialog name
-         BasicEntryDescriptor aSourceDesc( GetEntryDescriptor( pSelected ) );
-@@ -351,7 +351,7 @@ BOOL __EXPORT ExtBasicTreeListBox::Notif
- 		rpNewParent = pTarget;
- 		rNewChildPos = 0;
- 	}
--	else if ( nDepth == 2 )
-+	else if ( nDepth >= 2 )
- 	{
- 		// Target = Modul/Dialog => Modul/Dialog unter das uebergeordnete Basic haengen...
- 		rpNewParent = GetParent( pTarget );
-@@ -626,20 +626,27 @@ void ObjectPage::CheckButtons()
- {
-     // enable/disable edit button
- 	SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
-+    BasicEntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) );
-+    ScriptDocument aDocument( aDesc.GetDocument() );
-+    ::rtl::OUString aOULibName( aDesc.GetLibName() );
-+    String aLibSubName( aDesc.GetLibSubName() );
-+    BasicManager* pBasMgr = aDocument.getBasicManager();
-+    StarBASIC* pBasic = pBasMgr ? pBasMgr->GetLib( aOULibName ) : 0;
-+    sal_Bool bVBAEnabled = pBasic ? pBasic->isVBAEnabled(): sal_False;
-+    USHORT nMode = aBasicBox.GetMode();
-+
- 	USHORT nDepth = pCurEntry ? aBasicBox.GetModel()->GetDepth( pCurEntry ) : 0;
--	if ( nDepth == 2 )
-+	if ( ( !bVBAEnabled && ( nDepth == 2 ) ) 
-+        || ( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( nDepth == 3 ) ) )
- 		aEditButton.Enable();
- 	else
- 		aEditButton.Disable();
- 
-     // enable/disable new module/dialog buttons
--    BasicEntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) );
-     LibraryLocation eLocation( aDesc.GetLocation() );
-     BOOL bReadOnly = FALSE;
--    if ( nDepth == 1 || nDepth == 2 )
-+    if ( nDepth > 0 )
-     {
--        ScriptDocument aDocument( aDesc.GetDocument() );
--        ::rtl::OUString aOULibName( aDesc.GetLibName() );
-         Reference< script::XLibraryContainer2 > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
-         Reference< script::XLibraryContainer2 > xDlgLibContainer( aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
-         if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryReadOnly( aOULibName ) ) ||
-@@ -660,7 +667,8 @@ void ObjectPage::CheckButtons()
-     }
- 
-     // enable/disable delete button
--	if ( nDepth == 2 && !bReadOnly && eLocation != LIBRARY_LOCATION_SHARE )
-+	if ( ( ( !bVBAEnabled && nDepth == 2 ) || ( bVBAEnabled && ( nDepth == 3 ) && !aLibSubName.Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) ) )
-+        && !bReadOnly && eLocation != LIBRARY_LOCATION_SHARE )
- 		aDelButton.Enable();
- 	else
- 		aDelButton.Disable();
-@@ -688,13 +696,20 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button
-         SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
-         SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
- 		DBG_ASSERT( pCurEntry, "Entry?!" );
--		if ( aBasicBox.GetModel()->GetDepth( pCurEntry ) == 2 )
-+		if ( aBasicBox.GetModel()->GetDepth( pCurEntry ) >= 2 )
- 		{
-             BasicEntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) );
- 			if ( pDispatcher )
- 			{
-+                String aModName( aDesc.GetName() );
-+                // extract the module name from the string like "Sheet1 (Example1)"
-+                if( aDesc.GetLibSubName().Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) )
-+                {
-+                    sal_uInt16 nIndex = 0;
-+                    aModName = aModName.GetToken( 0, ' ', nIndex );
-+                }
-                 SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), 
--                                  aDesc.GetName(), aBasicBox.ConvertType( aDesc.GetType() ) );
-+                                  aModName, aBasicBox.ConvertType( aDesc.GetType() ) );
- 				pDispatcher->Execute( SID_BASICIDE_SHOWSBX, SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
- 			}
- 		}
-@@ -976,14 +991,14 @@ SbModule* createModImpl( Window* pWin, c
- 		try
- 		{
-             ::rtl::OUString sModuleCode;
-+            // the module has existed
-+            if( rDocument.hasModule( aLibName, aModName ) )
-+                return NULL;
-             rDocument.createModule( aLibName, aModName, bMain, sModuleCode );
-             BasicManager* pBasMgr = rDocument.getBasicManager();
--            if ( pBasMgr )
--            {
--                StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
--                if ( pBasic )
--                    pModule = pBasic->FindModule( aModName );
--            }
-+            StarBASIC* pBasic = pBasMgr? pBasMgr->GetLib( aLibName ) : 0;
-+            if ( pBasic )
-+                pModule = pBasic->FindModule( aModName );
- 			SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE );					
- 			BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
- 			SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
-@@ -1005,14 +1020,27 @@ SbModule* createModImpl( Window* pWin, c
-                 {
-                     if ( !rBasicBox.IsExpanded( pLibEntry ) )
-                         rBasicBox.Expand( pLibEntry );
--                    SvLBoxEntry* pEntry = rBasicBox.FindEntry( pLibEntry, aModName, OBJ_TYPE_MODULE );
-+                    SvLBoxEntry* pSubRootEntry = pLibEntry;
-+                    if( pBasic && pBasic->isVBAEnabled() )
-+                    {
-+                        // add the new module in the "Modules" entry
-+                        SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, String( IDEResId( RID_STR_NORMAL_MODULES ) ) , OBJ_TYPE_NORMAL_MODULES );
-+                        if( pLibSubEntry )
-+                        {
-+                            if( !rBasicBox.IsExpanded( pLibSubEntry ) )
-+                                rBasicBox.Expand( pLibSubEntry );
-+                            pSubRootEntry = pLibSubEntry;    
-+                        }
-+                    }
-+                    
-+                    SvLBoxEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE );
-                     if ( !pEntry )
-                     {
-                         pEntry = rBasicBox.AddEntry(
-                             aModName,
-                             Image( IDEResId( RID_IMG_MODULE ) ),
-                             Image( IDEResId( RID_IMG_MODULE_HC ) ),
--                            pLibEntry, false,
-+                            pSubRootEntry, false,
-                             std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
-                         DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
-                     }
diff --git a/applied_patches/0332-vba-fix-errobj-errnum.diff b/applied_patches/0332-vba-fix-errobj-errnum.diff
new file mode 100644
index 000000000..37caabde7
--- /dev/null
+++ b/applied_patches/0332-vba-fix-errobj-errnum.diff
@@ -0,0 +1,63 @@
+diff --git basic/source/runtime/runtime.cxx basic/source/runtime/runtime.cxx
+index 69c75b3..93a8afd 100644
+--- basic/source/runtime/runtime.cxx
++++ basic/source/runtime/runtime.cxx
+@@ -294,7 +294,6 @@ SbiInstance::SbiInstance( StarBASIC* p )
+ 	nErl	 = 0;
+ 	bReschedule = TRUE;
+ 	bCompatibility = FALSE;
+-	SbxErrObject::getUnoErrObject()->Clear();
+ }
+ 
+ SbiInstance::~SbiInstance()
+diff --git basic/source/runtime/step0.cxx basic/source/runtime/step0.cxx
+index fa66194..c43931d 100644
+--- basic/source/runtime/step0.cxx
++++ basic/source/runtime/step0.cxx
+@@ -1132,6 +1132,7 @@ void SbiRuntime::StepNOERROR()
+ 	pInst->nErr = 0L;
+ 	pInst->nErl = 0;
+ 	nError = 0L;
++	SbxErrObject::getUnoErrObject()->Clear();
+ 	bError = FALSE;
+ }
+ 
+@@ -1140,6 +1141,9 @@ void SbiRuntime::StepNOERROR()
+ void SbiRuntime::StepLEAVE()
+ {
+ 	bRun = FALSE;
++        // If VBA and we are leaving an ErrorHandler then clear the error ( it's been processed )
++	if ( bInError && pError )
++	    SbxErrObject::getUnoErrObject()->Clear();
+ }
+ 
+ void SbiRuntime::StepCHANNEL()	  	// TOS = Kanalnummer
+diff --git basic/source/runtime/step1.cxx basic/source/runtime/step1.cxx
+index 57d7f02..d6dc7d0 100644
+--- basic/source/runtime/step1.cxx
++++ basic/source/runtime/step1.cxx
+@@ -38,6 +38,7 @@
+ #include "iosys.hxx"
+ #include "image.hxx"
+ #include "sbunoobj.hxx"
++#include "errobject.hxx"
+ 
+ bool checkUnoObjectType( SbUnoObject* refVal, 
+ 	const String& aClass );
+@@ -374,6 +375,7 @@ void SbiRuntime::StepERRHDL( UINT32 nOp1 )
+ 	pInst->nErr = 0;
+ 	pInst->nErl = 0;
+ 	nError = 0;
++	SbxErrObject::getUnoErrObject()->Clear();
+ }
+ 
+ // Resume nach Fehlern (+0=statement, 1=next or Label)
+@@ -394,6 +396,8 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
+ 	}
+ 	else
+ 		pCode = pErrStmnt;
++	if ( pError ) // current in error handler ( and got a Resume Next statment )
++		SbxErrObject::getUnoErrObject()->Clear();
+ 
+ 	if( nOp1 > 1 )
+ 		StepJUMP( nOp1 );
diff --git a/applied_patches/0417-sfx2-pre-and-postprocess-during-save-load.diff b/applied_patches/0333-sfx2-pre-and-postprocess-during-save-load.diff
similarity index 100%
rename from applied_patches/0417-sfx2-pre-and-postprocess-during-save-load.diff
rename to applied_patches/0333-sfx2-pre-and-postprocess-during-save-load.diff
diff --git a/applied_patches/0333-vba-fix-basic-macro-organizer.diff b/applied_patches/0333-vba-fix-basic-macro-organizer.diff
deleted file mode 100644
index c15ab749f..000000000
--- a/applied_patches/0333-vba-fix-basic-macro-organizer.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git basctl/source/basicide/moduldlg.cxx basctl/source/basicide/moduldlg.cxx
-index 23b890c..54fc2ea 100644
---- basctl/source/basicide/moduldlg.cxx
-+++ basctl/source/basicide/moduldlg.cxx
-@@ -636,9 +636,13 @@ void ObjectPage::CheckButtons()
-     USHORT nMode = aBasicBox.GetMode();
- 
- 	USHORT nDepth = pCurEntry ? aBasicBox.GetModel()->GetDepth( pCurEntry ) : 0;
--	if ( ( !bVBAEnabled && ( nDepth == 2 ) ) 
--        || ( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( nDepth == 3 ) ) )
--		aEditButton.Enable();
-+	if ( nDepth >= 2 )
-+    {
-+        if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( nDepth == 2 ) )
-+            aEditButton.Disable();
-+        else
-+		    aEditButton.Enable();
-+    }    
- 	else
- 		aEditButton.Disable();
- 
-@@ -667,10 +671,14 @@ void ObjectPage::CheckButtons()
-     }
- 
-     // enable/disable delete button
--	if ( ( ( !bVBAEnabled && nDepth == 2 ) || ( bVBAEnabled && ( nDepth == 3 ) && !aLibSubName.Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) ) )
--        && !bReadOnly && eLocation != LIBRARY_LOCATION_SHARE )
--		aDelButton.Enable();
--	else
-+    if ( nDepth >= 2 && !bReadOnly && eLocation != LIBRARY_LOCATION_SHARE )
-+    {
-+        if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( ( nDepth == 2 ) || aLibSubName.Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) ) )
-+            aDelButton.Disable();
-+        else
-+            aDelButton.Enable();
-+    }
-+    else
- 		aDelButton.Disable();
- }
- 
diff --git a/applied_patches/0334-range-listBox-compare.diff b/applied_patches/0334-range-listBox-compare.diff
deleted file mode 100644
index 4eea87c36..000000000
--- a/applied_patches/0334-range-listBox-compare.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git basic/source/runtime/step0.cxx basic/source/runtime/step0.cxx
-index 25adf15..cbd2fad 100644
---- basic/source/runtime/step0.cxx
-+++ basic/source/runtime/step0.cxx
-@@ -109,19 +109,24 @@ void SbiRuntime::StepCompare( SbxOperato
- 	// values ( and type ) set as appropriate
- 	SbxDataType p1Type = p1->GetType(); 
- 	SbxDataType p2Type = p2->GetType(); 
-+	if ( p1Type == SbxEMPTY )
-+	{
-+		p1->Broadcast( SBX_HINT_DATAWANTED );
-+		p1Type = p1->GetType(); 
-+	}
-+	if ( p2Type == SbxEMPTY )
-+	{
-+		p2->Broadcast( SBX_HINT_DATAWANTED );
-+		p2Type = p2->GetType(); 
-+	}
- 	if ( p1Type == p2Type )
- 	{
--		if ( p1Type == SbxEMPTY )
--		{
--			p1->Broadcast( SBX_HINT_DATAWANTED );
--			p2->Broadcast( SBX_HINT_DATAWANTED );
--		}
- 		// if both sides are an object and have default props
- 		// then we need to use the default props
- 		// we don't need to worry if only one side ( lhs, rhs ) is an 
- 		// object ( object side will get coerced to correct type in 
- 		// Compare )
--		else if ( p1Type ==  SbxOBJECT )
-+		if ( p1Type ==  SbxOBJECT )
- 		{
- 			SbxVariable* pDflt = getDefaultProp( p1 );
- 			if ( pDflt )
diff --git a/applied_patches/0418-sfx2-pre-and-postprocess-crash-fix.diff b/applied_patches/0334-sfx2-pre-and-postprocess-crash-fix.diff
similarity index 100%
rename from applied_patches/0418-sfx2-pre-and-postprocess-crash-fix.diff
rename to applied_patches/0334-sfx2-pre-and-postprocess-crash-fix.diff
diff --git a/applied_patches/0335-vba-userform-geometry-tweak.diff b/applied_patches/0335-vba-userform-geometry-tweak.diff
deleted file mode 100644
index 3124a22f1..000000000
--- a/applied_patches/0335-vba-userform-geometry-tweak.diff
+++ /dev/null
@@ -1,394 +0,0 @@
-diff --git basctl/source/basicide/baside3.cxx basctl/source/basicide/baside3.cxx
-index e89c22f..8d11a16 100644
---- basctl/source/basicide/baside3.cxx
-+++ basctl/source/basicide/baside3.cxx
-@@ -82,6 +82,7 @@
- #include <com/sun/star/resource/XStringResourceResolver.hpp>
- #include <com/sun/star/resource/StringResourceWithLocation.hpp>
- #include <com/sun/star/task/XInteractionHandler.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
- 
- using namespace comphelper;
- using namespace	::com::sun::star;
-@@ -114,6 +115,14 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St
- 
- 	pEditor = new DlgEditor( rDocument.getDocument() );
- 	pEditor->SetWindow( this );
-+	// set vba mode on DialogModel ( allows it to work in 100thmm instead of MAP_APPFONT )
-+	if ( rDocument.getDocument().is() )
-+	{
-+		uno::Reference< script::XVBACompat > xDocVBAMode( rDocument.getLibraryContainer( E_SCRIPTS ), uno::UNO_QUERY );
-+		uno::Reference< script::XVBACompat > xDialogModelVBAMode( xDialogModel, uno::UNO_QUERY );
-+		if ( xDocVBAMode.is()  &&  xDialogModelVBAMode.is() )
-+			xDialogModelVBAMode->setVBACompatModeOn( xDocVBAMode->getVBACompatModeOn() );
-+	}
- 	pEditor->SetDialog( xDialogModel );
- 
- 	// Undo einrichten
-diff --git basctl/source/dlged/dlgedobj.cxx basctl/source/dlged/dlgedobj.cxx
-index bed7bc3..0899661 100644
---- basctl/source/dlged/dlgedobj.cxx
-+++ basctl/source/dlged/dlgedobj.cxx
-@@ -77,6 +77,22 @@ TYPEINIT1(DlgEdObj, SdrUnoObj);
- DBG_NAME(DlgEdObj);
- 
- //----------------------------------------------------------------------------
-+MapMode lcl_getMapModeForForm( DlgEdForm* pForm )
-+{
-+	MapMode aMode( MAP_APPFONT ); //Default
-+	try
-+	{
-+		uno::Reference< beans::XPropertySet > xProps( pForm ? pForm->GetUnoControlModel() : NULL, uno::UNO_QUERY_THROW );
-+		sal_Bool bVBAForm = sal_False;
-+		xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VBAForm") ) ) >>= bVBAForm;	
-+		if ( bVBAForm )
-+			aMode = MapMode( MAP_100TH_MM );
-+	}
-+	catch ( Exception& )
-+	{
-+	}
-+	return aMode;
-+}
- 
- DlgEdObj::DlgEdObj()
- 		  :SdrUnoObj(String(), sal_False)
-@@ -207,8 +223,9 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
- 	}
-     
-     // convert pixel to logic units
--    aPos = pDevice->PixelToLogic( aPos, MapMode( MAP_APPFONT ) );
--    aSize = pDevice->PixelToLogic( aSize, MapMode( MAP_APPFONT ) );
-+    MapMode aConvMode = lcl_getMapModeForForm( pForm );
-+    aPos = pDevice->PixelToLogic( aPos, aConvMode );
-+    aSize = pDevice->PixelToLogic( aSize, aConvMode );
- 
-     // set out parameters
-     nXOut = aPos.Width();
-@@ -255,10 +272,10 @@ bool DlgEdObj::TransformSdrToFormCoordinates(
- 		aSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset;
- 		aSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset;
- 	}
--
-+    MapMode aConvMode = lcl_getMapModeForForm( pForm );
-     // convert pixel to logic units
--    aPos = pDevice->PixelToLogic( aPos, MapMode( MAP_APPFONT ) );
--    aSize = pDevice->PixelToLogic( aSize, MapMode( MAP_APPFONT ) );
-+    aPos = pDevice->PixelToLogic( aPos, aConvMode );
-+    aSize = pDevice->PixelToLogic( aSize, aConvMode );
- 
-     // set out parameters
-     nXOut = aPos.Width();
-@@ -300,9 +317,10 @@ bool DlgEdObj::TransformControlToSdrCoordinates(
-     DBG_ASSERT( pDevice, "DlgEdObj::TransformControlToSdrCoordinates: missing default device!" );
-     if ( !pDevice )
-         return false;
--    aPos = pDevice->LogicToPixel( aPos, MapMode( MAP_APPFONT ) );
--    aSize = pDevice->LogicToPixel( aSize, MapMode( MAP_APPFONT ) );
--    aFormPos = pDevice->LogicToPixel( aFormPos, MapMode( MAP_APPFONT ) );
-+    MapMode aConvMode = lcl_getMapModeForForm( pForm );
-+    aPos = pDevice->LogicToPixel( aPos, aConvMode );
-+    aSize = pDevice->LogicToPixel( aSize, aConvMode );
-+    aFormPos = pDevice->LogicToPixel( aFormPos, aConvMode );
- 
-     // add form position
-     aPos.Width() += aFormPos.Width();
-@@ -346,14 +364,16 @@ bool DlgEdObj::TransformFormToSdrCoordinates(
-     DBG_ASSERT( pDevice, "DlgEdObj::TransformFormToSdrCoordinates: missing default device!" );
-     if ( !pDevice )
-         return false;
--    aPos = pDevice->LogicToPixel( aPos, MapMode( MAP_APPFONT ) );
--    aSize = pDevice->LogicToPixel( aSize, MapMode( MAP_APPFONT ) );
- 
-     // take window borders into account
-     DlgEdForm* pForm = NULL;
-     if ( !lcl_getDlgEdForm( this, pForm ) )
-         return false;
- 
-+    MapMode aConvMode = lcl_getMapModeForForm( pForm );
-+    aPos = pDevice->LogicToPixel( aPos, aConvMode );
-+    aSize = pDevice->LogicToPixel( aSize, aConvMode );
-+
-     // take window borders into account
-     Reference< beans::XPropertySet > xPSetForm( pForm->GetUnoControlModel(), UNO_QUERY );
-     DBG_ASSERT( xPSetForm.is(), "DlgEdObj::TransformFormToSdrCoordinates: no form property set!" );
-diff --git svx/inc/svxmsbas.hxx svx/inc/svxmsbas.hxx
-index f99247b..5e87fe6 100644
---- svx/inc/svxmsbas.hxx
-+++ svx/inc/svxmsbas.hxx
-@@ -99,7 +99,7 @@ private:
- 						  const String &rSubStorageName,
- 						  BOOL bAsComment, BOOL bStripped );
- 	SVX_DLLPRIVATE bool ImportForms_Impl(const String& rStorageName, 
--		const String &rSubStorageName);
-+		const String &rSubStorageName, BOOL bVBAMode );
- 	SVX_DLLPRIVATE BOOL CopyStorage_Impl( const String& rStorageName,
- 						   const String &rSubStorageName);
- };
-diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index f773bc4..ea070c6 100644
---- svx/source/msfilter/msocximex.cxx
-+++ svx/source/msfilter/msocximex.cxx
-@@ -1075,6 +1075,9 @@ sal_Bool OCX_Control::Import(
- sal_Bool OCX_Control::Import(uno::Reference<container::XNameContainer> &rDialog
-     )
- {
-+    uno::Reference<beans::XPropertySet > xDlgProps( rDialog, uno::UNO_QUERY);
-+
-+    
-     uno::Reference<lang::XMultiServiceFactory>
-         xFactory(rDialog, uno::UNO_QUERY);
- 
-@@ -1087,11 +1090,15 @@ sal_Bool OCX_Control::Import(uno::Reference<container::XNameContainer> &rDialog
- 	if (!xModel.is())
- 		return sal_False;
- 
-+    sal_Bool bVBA = sal_False;
-     /*  #147900# sometimes insertion of a control fails due to existing name,
-         do not break entire form import then... */
-     try
-     {
-         rDialog->insertByName(sName, uno::makeAny(xModel));
-+        if ( xDlgProps.is() )
-+            xDlgProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("VBAForm") ) ) >>= bVBA;
-+
-     }
-     catch( uno::Exception& )
-     {
-@@ -1107,16 +1114,32 @@ sal_Bool OCX_Control::Import(uno::Reference<container::XNameContainer> &rDialog
- 
-     if (!Import(xPropSet))
-         return sal_False;
--
-+    
-     uno::Any aTmp;
--    aTmp <<= sal_Int32((mnLeft * 2) / 100);
--    xPropSet->setPropertyValue(WW8_ASCII2STR("PositionX"), aTmp);
--    aTmp <<= sal_Int32((mnTop * 2) / 100);
--    xPropSet->setPropertyValue(WW8_ASCII2STR("PositionY"), aTmp);
--    aTmp <<= sal_Int32((nWidth * 2) / 100);
--    xPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
--    aTmp <<= sal_Int32((nHeight * 2) / 100);
--    xPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
-+    sal_Int32 nFactor = 3528; 
-+
-+    if ( !bVBA  )
-+    {
-+        aTmp <<= sal_Int32((mnLeft * 2) / 100);
-+        xPropSet->setPropertyValue(WW8_ASCII2STR("PositionX"), aTmp);
-+        aTmp <<= sal_Int32((mnTop * 2) / 100);
-+        xPropSet->setPropertyValue(WW8_ASCII2STR("PositionY"), aTmp);
-+        aTmp <<= sal_Int32((nWidth * 2) / 100);
-+        xPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
-+        aTmp <<= sal_Int32((nHeight * 2) / 100);
-+        xPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
-+    }
-+    else
-+    {
-+        aTmp <<= sal_Int32(mnLeft); // 100thmm
-+        xPropSet->setPropertyValue(WW8_ASCII2STR("PositionX"), aTmp);
-+        aTmp <<= sal_Int32(mnTop); //100th mm
-+        xPropSet->setPropertyValue(WW8_ASCII2STR("PositionY"), aTmp);
-+        aTmp <<= sal_Int32(nWidth); // 100thmm
-+        xPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
-+        aTmp <<= sal_Int32(nHeight); //100th mm
-+        xPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
-+    }
-     if ( msToolTip.Len() > 0 )
-     {
- 	uno::Any aTmp(&msToolTip,getCppuType((OUString *)0));
-@@ -4330,6 +4353,8 @@ sal_Bool OCX_UserForm::Import(
- {
-     uno::Reference<beans::XPropertySet>
-         xDialogPropSet(mxParent, uno::UNO_QUERY);
-+    if ( !xDialogPropSet.is() )
-+        return sal_False;
-     uno::Any aTmp(&sName,getCppuType((OUString *)0));
-     xDialogPropSet->setPropertyValue(
-         OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aTmp);
-@@ -4337,11 +4362,32 @@ sal_Bool OCX_UserForm::Import(
-         OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), aTmp);
-     aTmp <<= ImportColor(mnBackColor);
- 	xDialogPropSet->setPropertyValue( WW8_ASCII2STR("BackgroundColor"), aTmp);
-+    sal_Bool bVBA = sal_False;
-+    // Ok we are importing xls but maybe we aren't in VBA mode
-+    // if we are not in VBA mode then we should import sizes etc. ( as before )
-+    try
-+    {
-+        xDialogPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("VBAForm") ) ) >>= bVBA;
-+    }
-+    catch( uno::Exception& e )
-+    {
-+    }
-+    sal_Int32 nFactor( 3528 );
-+    if ( !bVBA )
-+    {
-+        aTmp <<= sal_Int32((nWidth * 2) / 100); 
-+        xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
-+        aTmp <<= sal_Int32((nHeight * 2) / 100); 
-+        xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
-+    }
-+    else
-+    {
-+        aTmp <<= sal_Int32( nWidth + 160 ); // 100thmm
-+        xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
-+        aTmp <<= sal_Int32(nHeight + 662 - 714); //100th mm
-+        xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
-+    }
- 
--    aTmp <<= sal_Int32((nWidth * 2) / 100);
--    xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
--    aTmp <<= sal_Int32((nHeight * 2) / 100);
--    xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
- 
-     uno::Reference<beans::XPropertySet> xPropSet( mxParent, uno::UNO_QUERY );
-     OCX_ContainerControl::Import( xPropSet );
-diff --git svx/source/msfilter/svxmsbas.cxx svx/source/msfilter/svxmsbas.cxx
-index bf3bca5..2a94b6f 100644
---- svx/source/msfilter/svxmsbas.cxx
-+++ svx/source/msfilter/svxmsbas.cxx
-@@ -89,7 +89,7 @@ int SvxImportMSVBasic::Import( const String& rStorageName,
- 		nRet |= 1;
- 
-     if (bImport)
--        ImportForms_Impl(rStorageName, rSubStorageName);
-+        ImportForms_Impl(rStorageName, rSubStorageName, !bAsComment);
- 
- 	if( bCopy && CopyStorage_Impl( rStorageName, rSubStorageName ))
- 		nRet |= 2;
-@@ -98,7 +98,7 @@ int SvxImportMSVBasic::Import( const String& rStorageName,
- }
- 
- bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
--    const String& rSubStorageName)
-+    const String& rSubStorageName, BOOL bVBAMode )
- {
-     SvStorageRef xVBAStg(xRoot->OpenSotStorage(rStorageName,
-         STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL));
-@@ -182,7 +182,17 @@ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
-                     xSF->createInstance(
-                        OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.awt.UnoControlDialogModel"))), uno::UNO_QUERY);
--
-+                // #FIXME HACK - mark the Model with the VBA mode
-+                // In vba mode the imported userform uses 100th mm as units
-+                // or geometry 
-+                // In non vba mode MAP_APPFONT is used ( same as normal basic
-+                // dialogs
-+                if ( bVBAMode )
-+                {
-+                    Reference<XPropertySet> xDlgProps(xDialog, UNO_QUERY); 
-+                    if ( xDlgProps.is() )
-+                        xDlgProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VBAForm") ), uno::makeAny( sal_True ) );
-+                }
-                 OCX_UserForm aForm(xVBAStg, *aIter, *aIter, xDialog, xSF );
-                 aForm.pDocSh = &rDocSh;
-                 sal_Bool bOk = aForm.Read(xTypes);
---- toolkit/inc/toolkit/helper/property.hxx
-+++ toolkit/inc/toolkit/helper/property.hxx
-@@ -193,6 +193,7 @@ namespace rtl {
- #define BASEPROPERTY_GRID_SELECTIONMODE             144
- #define BASEPROPERTY_ENABLEVISIBLE                  145  // sal_Bool
- #define BASEPROPERTY_GROUPNAME                      146  // ::rtl::OUString
-+#define BASEPROPERTY_VBAFORM                        147  // sal_Bool
- 
- 
- // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
-diff --git toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/dialogcontrol.cxx
-index be06bbb..f976562 100644
---- toolkit/source/controls/dialogcontrol.cxx
-+++ toolkit/source/controls/dialogcontrol.cxx
-@@ -80,6 +80,7 @@ using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::container;
- using namespace ::com::sun::star::beans;
- using namespace ::com::sun::star::util;
-+using namespace ::com::sun::star::script;
- using namespace toolkit;
- 
- #define PROPERTY_RESOURCERESOLVER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ))
-@@ -289,6 +290,8 @@ UnoControlDialogModel::UnoControlDialogModel()
- 	aBool <<= (sal_Bool) sal_True;
- 	ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool );
- 	ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool );
-+	aBool <<= (sal_Bool) sal_False;
-+	ImplRegisterProperty( BASEPROPERTY_VBAFORM, aBool );
- }
- 
- UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rModel )
-@@ -1475,17 +1478,32 @@ void UnoDialogControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
- 	xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) >>= nWidth;
- 	xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) >>= nHeight;
- 
--	// Currentley we are simply using MAP_APPFONT
-+	// Currentley we are simply using MAP_APPFONT ( for normal Dialogs )
-+	// and MAP_100TH_MM for imported Userforms
-+	MapMode aMode( MAP_APPFONT );
-+	sal_Bool bVBAForm = sal_False;
-+	Reference< XPropertySet > xDlgModelProps( getModel(), UNO_QUERY );
-+	if ( xDlgModelProps.is() )
-+	{
-+		try
-+		{
-+			xDlgModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAForm" ) ) ) >>= bVBAForm;
-+		}
-+		catch( Exception& )
-+		{
-+		}
-+	} 
-+	if ( bVBAForm )
-+		aMode = MapMode( MAP_100TH_MM );
- 	OutputDevice*pOutDev = Application::GetDefaultDevice();
--	DBG_ASSERT( pOutDev, "Missing Default Device!" );
- 	if ( pOutDev )
- 	{
- 		::Size aTmp( nX, nY );
--		aTmp = pOutDev->LogicToPixel( aTmp, MAP_APPFONT );
-+		aTmp = pOutDev->LogicToPixel( aTmp, aMode );
- 		nX = aTmp.Width();
- 		nY = aTmp.Height();
- 		aTmp = ::Size( nWidth, nHeight );
--		aTmp = pOutDev->LogicToPixel( aTmp, MAP_APPFONT );
-+		aTmp = pOutDev->LogicToPixel( aTmp, aMode );
- 		nWidth = aTmp.Width();
- 		nHeight = aTmp.Height();
- 	}
---- toolkit/source/helper/property.cxx
-+++ toolkit/source/helper/property.cxx
-@@ -274,7 +274,8 @@ ImplPropertyInfo* ImplGetPropertyInfos(
-             DECL_PROP_3     ( "GridDataModel",		GRID_DATAMODEL,   Reference< ::com::sun::star::awt::grid::XGridDataModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
-             DECL_PROP_3     ( "ColumnModel",		GRID_COLUMNMODEL,   Reference< ::com::sun::star::awt::grid::XGridColumnModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
-             DECL_PROP_3     ( "SelectionModel",		GRID_SELECTIONMODE,   ::com::sun::star::view::SelectionType,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
--            DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,           BOUND, MAYBEDEFAULT )
-+            DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,           BOUND, MAYBEDEFAULT ),
-+            DECL_PROP_2     ( "VBAForm",                VBAFORM,                sal_Bool,           BOUND, MAYBEDEFAULT )
-             };
-             pPropertyInfos = aImplPropertyInfos;
-             nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
-diff --git xmlscript/source/xmldlg_imexp/xmldlg_import.cxx xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
-index 9abe014..816731a 100644
---- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
-+++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
-@@ -61,6 +61,7 @@
- #include <com/sun/star/view/SelectionType.hpp>
- #include <com/sun/star/document/XStorageBasedDocument.hpp>
- #include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
- 
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
-@@ -1906,9 +1907,14 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel(
-     Reference< XModel > const & xDocument )
-     SAL_THROW( (Exception) )
- {
-+    DialogImport* pImport = new DialogImport( xContext, xDialogModel, xDocument );
-+    uno::Reference< script::XVBACompat > xVBAModeSource( pImport->getScriptLibraryContainer(), uno::UNO_QUERY );
-+    
-+    uno::Reference< beans::XPropertySet > xDlgProps( xDialogModel, uno::UNO_QUERY );
-+    if ( xVBAModeSource.is() && xDlgProps.is() && xVBAModeSource->getVBACompatModeOn() )
-+        xDlgProps->setPropertyValue( OUSTR("VBAForm"), uno::makeAny( sal_True ) );
-     return ::xmlscript::createDocumentHandler(
--        static_cast< xml::input::XRoot * >(
--            new DialogImport( xContext, xDialogModel, xDocument ) ) );
-+        static_cast< xml::input::XRoot * >( pImport ) );
- }
- 
- }
diff --git a/applied_patches/0419-win32-installer-register-moox-types.diff b/applied_patches/0335-win32-installer-register-moox-types.diff
similarity index 100%
rename from applied_patches/0419-win32-installer-register-moox-types.diff
rename to applied_patches/0335-win32-installer-register-moox-types.diff
diff --git a/applied_patches/0336-vba-allow-forms-resetvalue-binding.diff b/applied_patches/0336-vba-allow-forms-resetvalue-binding.diff
deleted file mode 100644
index b9dd5eae5..000000000
--- a/applied_patches/0336-vba-allow-forms-resetvalue-binding.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git forms/source/component/FormComponent.cxx forms/source/component/FormComponent.cxx
-index 2919abd..2b73ec6 100644
---- forms/source/component/FormComponent.cxx
-+++ forms/source/component/FormComponent.cxx
-@@ -2556,8 +2556,8 @@ void SAL_CALL OBoundControlModel::setVal
-     OSL_PRECOND( m_bSupportsExternalBinding, "OBoundControlModel::setValueBinding: How did you reach this method?" );
-         // the interface for this method should not have been exposed if we do not
-         // support binding to external data
--
--    if ( !impl_approveValueBinding_nolock( _rxBinding ) )
-+    // allow reset
-+    if ( _rxBinding.is() && !impl_approveValueBinding_nolock( _rxBinding ) )
-     {
-         throw IncompatibleTypesException(
-             FRM_RES_STRING( RID_STR_INCOMPATIBLE_TYPES ),
diff --git a/applied_patches/0420-writerfilter-module-writer.diff b/applied_patches/0336-writerfilter-module-writer.diff
similarity index 100%
rename from applied_patches/0420-writerfilter-module-writer.diff
rename to applied_patches/0336-writerfilter-module-writer.diff
diff --git a/applied_patches/0337-fix-vba-NOT-trigger-update.diff b/applied_patches/0337-fix-vba-NOT-trigger-update.diff
deleted file mode 100644
index 0aa397199..000000000
--- a/applied_patches/0337-fix-vba-NOT-trigger-update.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git basic/source/runtime/runtime.cxx basic/source/runtime/runtime.cxx
-index 5cec3e2..69c75b3 100644
---- basic/source/runtime/runtime.cxx
-+++ basic/source/runtime/runtime.cxx
-@@ -48,6 +48,8 @@
- #include "sbunoobj.hxx"
- #include "errobject.hxx"
- 
-+SbxVariable* getDefaultProp( SbxVariable* pRef );
-+
- bool SbiRuntime::isVBAEnabled()
- {
- 	bool result = false;
-@@ -961,7 +963,25 @@ SbxVariable* SbiRuntime::GetTOS( short n
- void SbiRuntime::TOSMakeTemp()
- {
- 	SbxVariable* p = refExprStk->Get( nExprLvl - 1 );
--	if( p->GetRefCount() != 1 )
-+	if ( p->GetType() == SbxEMPTY )
-+		p->Broadcast( SBX_HINT_DATAWANTED );
-+
-+	SbxVariable* pDflt = NULL;
-+	if ( bVBAEnabled &&  ( p->GetType() == SbxOBJECT || p->GetType() == SbxVARIANT  ) && ( pDflt = getDefaultProp( p ) ) )
-+	{
-+		pDflt->Broadcast( SBX_HINT_DATAWANTED );
-+		// replacing new p on stack causes object pointed by 
-+		// pDft->pParent to be deleted, when p2->Compute() is
-+		// called below pParent is accessed ( but its deleted )
-+		// so set it to NULL now
-+		pDflt->SetParent( NULL );  
-+		p = new SbxVariable( *pDflt );
-+		p->SetFlag( SBX_READWRITE );
-+		refExprStk->Put( p, nExprLvl - 1 );
-+//		return;
-+	}
-+
-+	else if( p->GetRefCount() != 1 )
- 	{
- 		SbxVariable* pNew = new SbxVariable( *p );
- 		pNew->SetFlag( SBX_READWRITE );
-@@ -970,7 +990,6 @@ void SbiRuntime::TOSMakeTemp()
- }
- 
- // Der GOSUB-Stack nimmt Returnadressen fuer GOSUBs auf
--
- void SbiRuntime::PushGosub( const BYTE* pc )
- {
- 	if( ++nGosubLvl > MAXRECURSION )
-diff --git basic/source/runtime/step0.cxx basic/source/runtime/step0.cxx
-index cbd2fad..0666725 100644
---- basic/source/runtime/step0.cxx
-+++ basic/source/runtime/step0.cxx
-@@ -59,34 +59,6 @@ void SbiRuntime::StepArith( SbxOperator 
- 	TOSMakeTemp();
- 	SbxVariable* p2 = GetTOS();
- 
--
--	// This could & should be moved to the MakeTempTOS() method in runtime.cxx
--	// In the code which this is cut'npaste from there is a check for a ref
--	// count != 1 based on which the copy of the SbxVariable is done.
--	// see orig code in MakeTempTOS ( and I'm not sure what the significance,
--	// of that is )
--	// here we alway seem to have a refcount of 1. Also it seems that
--	// MakeTempTOS is called for other operation, so I hold off for now
--	// until I have a better idea
--	if ( bVBAEnabled
--		&& ( p2->GetType() == SbxOBJECT || p2->GetType() == SbxVARIANT )
--	)
--	{
--		SbxVariable* pDflt = getDefaultProp( p2 );
--		if ( pDflt )
--		{
--			pDflt->Broadcast( SBX_HINT_DATAWANTED );
--			// replacing new p2 on stack causes object pointed by 
--			// pDft->pParent to be deleted, when p2->Compute() is
--			// called below pParent is accessed ( but its deleted )
--			// so set it to NULL now
--			pDflt->SetParent( NULL );  
--			p2 = new SbxVariable( *pDflt );
--			p2->SetFlag( SBX_READWRITE );
--			refExprStk->Put( p2, nExprLvl - 1 );
--		}
--	}
--
- 	p2->ResetFlag( SBX_FIXED );
- 	p2->Compute( eOp, *p1 );
- 
diff --git a/applied_patches/0421-writerfilter-source-dmapper-domainmapper-debug.diff b/applied_patches/0337-writerfilter-source-dmapper-domainmapper-debug.diff
similarity index 100%
rename from applied_patches/0421-writerfilter-source-dmapper-domainmapper-debug.diff
rename to applied_patches/0337-writerfilter-source-dmapper-domainmapper-debug.diff
diff --git a/applied_patches/0338-buildfix-oox-depends-on-unotools.diff b/applied_patches/0338-buildfix-oox-depends-on-unotools.diff
new file mode 100644
index 000000000..613990675
--- /dev/null
+++ b/applied_patches/0338-buildfix-oox-depends-on-unotools.diff
@@ -0,0 +1,8 @@
+--- oox/prj/build.lst-old	2008-03-16 10:41:32.000000000 +0100
++++ oox/prj/build.lst	2008-03-16 10:41:45.000000000 +0100
+@@ -1,4 +1,4 @@
+-oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl BOOST:boost OPENSSL:openssl NULL
++oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl unotools BOOST:boost OPENSSL:openssl NULL
+ oox	oox					usr1	-   all	oox_mkout NULL
+ oox	oox\prj					get	-   all	oox_prj NULL
+ oox	oox\source\token			nmake	-   all	oox_token NULL
diff --git a/applied_patches/0338-vba-variant-fix.diff b/applied_patches/0338-vba-variant-fix.diff
deleted file mode 100644
index 669d5cac2..000000000
--- a/applied_patches/0338-vba-variant-fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- basic/source/sbx/sbxvalue.cxx.orig	2008-09-17 14:56:02.000000000 +0800
-+++ basic/source/sbx/sbxvalue.cxx	2008-09-17 15:11:36.000000000 +0800
-@@ -1147,8 +1147,8 @@ BOOL SbxValue::Compute( SbxOperator eOp,
- 	{
- 		SbxValues aL, aR;
- 		bool bDecimal = false;
--		if( bVBAInterop && ( ( eThisType == SbxSTRING && eOpType != SbxSTRING ) || 
--			 ( eThisType != SbxSTRING && eOpType == SbxSTRING ) ) &&
-+		if( bVBAInterop && ( ( eThisType == SbxSTRING && eOpType != SbxSTRING && eOpType != SbxEMPTY ) || 
-+			 ( eThisType != SbxSTRING && eThisType != SbxEMPTY && eOpType == SbxSTRING ) ) &&
- 			 ( eOp == SbxMUL || eOp == SbxDIV || eOp == SbxPLUS || eOp == SbxMINUS ) )
- 		{
- 			goto Lbl_OpIsDouble;
diff --git a/applied_patches/0423-oox-fix-placeholder-layout.diff b/applied_patches/0339-oox-fix-placeholder-layout.diff
similarity index 100%
rename from applied_patches/0423-oox-fix-placeholder-layout.diff
rename to applied_patches/0339-oox-fix-placeholder-layout.diff
diff --git a/applied_patches/0339-userform-image-import-fix.diff b/applied_patches/0339-userform-image-import-fix.diff
deleted file mode 100644
index 09db612ea..000000000
--- a/applied_patches/0339-userform-image-import-fix.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index 164073d..b4a46ce 100644
---- svx/source/msfilter/msocximex.cxx
-+++ svx/source/msfilter/msocximex.cxx
-@@ -4449,32 +4449,31 @@ sal_Bool OCX_UserForm::Read(SvStorageStream *pS)
- 		pS->Read(pIcon,nIconLen);
- 	}
- 
-+	ReadAlign( pS, pS->Tell() - nStart, 4);
-+	if (pBlockFlags[2] & 0x10)
-+	{
-+		//Font Stuff..
-+		pS->SeekRel(0x1a);
-+		sal_uInt8 nFontLen;
-+		*pS >> nFontLen;
-+		pS->SeekRel(nFontLen);
-+	}
- 	if (nPicture)
- 	{
- 		pS->Read(pPictureHeader,20);
- 		*pS >> nPictureLen;
- 		long imagePos = pS->Tell();
-+		// great embedded object
- 		mxGrfObj = lcl_readGraphicObject( pS );
- 		if( mxGrfObj.is() )
- 		{
- 			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
- 			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
- 		}
--		// make sure the stream position should be pointing after the image
-+		// make sure the stream position should be pointing after the image.
- 		pS->Seek( imagePos + nPictureLen );
- 	}
- 
--     ReadAlign( pS, pS->Tell() - nStart, 4);
-- 
--    if (pBlockFlags[2] & 0x10)
--    {
--        //Font Stuff..
--        pS->SeekRel(0x1a);
--        sal_uInt8 nFontLen;
--        *pS >> nFontLen;
--        pS->SeekRel(nFontLen);
--    }
--
-     sal_Int16 numTrailingRecs = 0;
-     *pS >> numTrailingRecs;
-     // seems to be no. of trailing records,
diff --git a/applied_patches/0424-oox-fix-list-style-apply.diff b/applied_patches/0340-oox-fix-list-style-apply.diff
similarity index 100%
rename from applied_patches/0424-oox-fix-list-style-apply.diff
rename to applied_patches/0340-oox-fix-list-style-apply.diff
diff --git a/applied_patches/0340-spinbutton-import-valuechange.diff b/applied_patches/0340-spinbutton-import-valuechange.diff
deleted file mode 100644
index 0b9622780..000000000
--- a/applied_patches/0340-spinbutton-import-valuechange.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- svx/source/msfilter/msocximex.cxx	2008-09-17 17:40:38.000000000 +0100
-+++ svx/source/msfilter/msocximex.cxx	2008-09-17 18:15:08.000000000 +0100
-@@ -5611,8 +5611,8 @@ sal_Bool OCX_SpinButton::Read( SvStorage
-     if( mnBlockFlags & 0x00000080 )     rStrm >> mnValue;
-     if( mnBlockFlags & 0x00000100 )     rStrm.SeekRel( 4 );     // unknown
-     if( mnBlockFlags & 0x00000200 )     rStrm.SeekRel( 4 );     // unknown
--    if( mnBlockFlags & 0x00000400 )     rStrm.SeekRel( 4 );     // unknown
--    if( mnBlockFlags & 0x00000800 )     rStrm >> mnSmallStep;
-+    if( mnBlockFlags & 0x00000400 )     rStrm >> mnSmallStep;
-+    if( mnBlockFlags & 0x00000800 )     rStrm.SeekRel( 4 );     // unknown
-     if( mnBlockFlags & 0x00001000 )     rStrm >> mnPageStep;
-     if( mnBlockFlags & 0x00002000 )     rStrm >> mnOrient;
-     if( mnBlockFlags & 0x00004000 )
diff --git a/applied_patches/0425-oox-pptx-import-fix-layout.diff b/applied_patches/0341-oox-pptx-import-fix-layout.diff
similarity index 100%
rename from applied_patches/0425-oox-pptx-import-fix-layout.diff
rename to applied_patches/0341-oox-pptx-import-fix-layout.diff
diff --git a/applied_patches/0341-vba-noregrex-for-match.diff b/applied_patches/0341-vba-noregrex-for-match.diff
deleted file mode 100644
index 9ea2f6ac1..000000000
--- a/applied_patches/0341-vba-noregrex-for-match.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git sc/source/core/tool/interpr1.cxx sc/source/core/tool/interpr1.cxx
-index 2ae49af..8699b1b 100644
---- sc/source/core/tool/interpr1.cxx
-+++ sc/source/core/tool/interpr1.cxx
-@@ -72,6 +72,7 @@
- #include "rangenam.hxx"
- #include "compiler.hxx"
- #include "externalrefmgr.hxx"
-+#include <basic/sbstar.hxx>
-
- #define SC_DOUBLE_MAXVALUE  1.7e307
-
-@@ -4092,7 +4093,20 @@ void ScInterpreter::ScMatch()
-                 }
-             }
-             if ( rEntry.bQueryByString )
--                rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
-+            {
-+		BOOL bIsVBAMode = FALSE;
-+                if ( pDok ) 
-+                {
-+                   SfxObjectShell* pDocSh = pDok->GetDocumentShell();
-+                   if ( pDocSh )
-+                        bIsVBAMode = pDocSh->GetBasic()->isVBAEnabled();
-+                }
-+                // #TODO handle MSO wildcards
-+                if ( bIsVBAMode )
-+                    rParam.bRegExp = FALSE;
-+                else
-+                    rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
-+            }
- 
-             if (pMatSrc) // The source data is matrix array.
-             {
diff --git a/applied_patches/0426-oox-pptx-import-fix-wipe-transition.diff b/applied_patches/0342-oox-pptx-import-fix-wipe-transition.diff
similarity index 100%
rename from applied_patches/0426-oox-pptx-import-fix-wipe-transition.diff
rename to applied_patches/0342-oox-pptx-import-fix-wipe-transition.diff
diff --git a/applied_patches/0342-vba-null-not-treatment.diff b/applied_patches/0342-vba-null-not-treatment.diff
deleted file mode 100644
index 9d7ee59c7..000000000
--- a/applied_patches/0342-vba-null-not-treatment.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git basic/source/runtime/step0.cxx basic/source/runtime/step0.cxx
-index 0666725..a2df718 100644
---- basic/source/runtime/step0.cxx
-+++ basic/source/runtime/step0.cxx
-@@ -118,8 +118,21 @@ void SbiRuntime::StepCompare( SbxOperato
- #ifndef WIN
- 	static SbxVariable* pTRUE = NULL;
- 	static SbxVariable* pFALSE = NULL;
--
--	if( p2->Compare( eOp, *p1 ) )
-+	static SbxVariable* pNULL = NULL;
-+	// why do this on non-windows ?
-+	// why do this at all ?
-+	// I dumbly follow the pattern :-/
-+	if ( bVBAEnabled && ( p1->IsNull() || p2->IsNull() ) )	
-+	{
-+		if( !pNULL )
-+		{
-+			pNULL = new SbxVariable;
-+			pNULL->PutNull();
-+			pNULL->AddRef();
-+		}
-+		PushVar( pNULL );
-+	}
-+	else if( p2->Compare( eOp, *p1 ) )
- 	{
- 		if( !pTRUE )
- 		{
-@@ -140,9 +153,14 @@ void SbiRuntime::StepCompare( SbxOperato
- 		PushVar( pFALSE );
- 	}
- #else
--	BOOL bRes = p2->Compare( eOp, *p1 );
- 	SbxVariable* pRes = new SbxVariable;
--	pRes->PutBool( bRes );
-+	if ( bVBAEnabled && ( p1->IsNull() || p2->IsNull() ) )	
-+		pRes->PutNull();
-+	else
-+	{
-+		BOOL bRes = p2->Compare( eOp, *p1 );
-+		pRes->PutBool( bRes );
-+	}
- 	PushVar( pRes );
- #endif
- }
-diff --git basic/source/runtime/step1.cxx basic/source/runtime/step1.cxx
-index 8a4adfa..57d7f02 100644
---- basic/source/runtime/step1.cxx
-+++ basic/source/runtime/step1.cxx
-@@ -192,7 +192,9 @@ void SbiRuntime::StepJUMPT( UINT32 nOp1 )
- void SbiRuntime::StepJUMPF( UINT32 nOp1 )
- {
- 	SbxVariableRef p = PopVar();
--	if( !p->GetBool() )
-+	// In a test e.g. If Null then 	
-+        // will evaluate Null will act as if False
-+	if( ( bVBAEnabled && p->IsNull() ) || !p->GetBool() )
- 		StepJUMP( nOp1 );
- }
- 
-diff --git basic/source/sbx/sbxvalue.cxx basic/source/sbx/sbxvalue.cxx
-index 37e9523..5447439 100644
---- basic/source/sbx/sbxvalue.cxx
-+++ basic/source/sbx/sbxvalue.cxx
-@@ -1195,6 +1195,8 @@ BOOL SbxValue::Compute( SbxOperator eOp,
- 					aL.eType = aR.eType = GetType();
- //				else if( GetType() == SbxDouble || GetType() == SbxSingle )
- //					aL.eType = aR.eType = SbxLONG64;
-+				else if ( bVBAInterop && eOpType == SbxBOOL )
-+					aL.eType = aR.eType = SbxBOOL;
- 				else
- 					aL.eType = aR.eType = SbxLONG;
- 			}
-@@ -1281,7 +1283,12 @@ BOOL SbxValue::Compute( SbxOperator eOp,
- 						break;
- 					case SbxNOT:
- 						if( aL.eType != SbxLONG && aL.eType != SbxULONG )
--							aL.nLong64 = ~aL.nLong64;
-+						{
-+							if ( aL.eType != SbxBOOL )
-+								aL.nLong64 = ~aL.nLong64;
-+							else
-+								aL.nLong = ~aL.nLong;
-+						}
- 						else
- 							aL.nLong = ~aL.nLong;
- 						break;
diff --git a/applied_patches/0427-oox-pptx-import-fix-subtitle-placeholder.diff b/applied_patches/0343-oox-pptx-import-fix-subtitle-placeholder.diff
similarity index 100%
rename from applied_patches/0427-oox-pptx-import-fix-subtitle-placeholder.diff
rename to applied_patches/0343-oox-pptx-import-fix-subtitle-placeholder.diff
diff --git a/applied_patches/0343-vba-commandbar-fix.diff b/applied_patches/0343-vba-commandbar-fix.diff
deleted file mode 100644
index 816aa6399..000000000
--- a/applied_patches/0343-vba-commandbar-fix.diff
+++ /dev/null
@@ -1,654 +0,0 @@
---- oovbaapi/ooo/vba/XCommandBar.idl.old	2009-04-02 10:36:29.000000000 +0000
-+++ oovbaapi/ooo/vba/XCommandBar.idl	2009-04-06 16:42:00.000000000 +0000
-@@ -57,6 +57,8 @@ interface XCommandBar
-     
-     void Delete() raises ( com::sun::star::script::BasicErrorException );
-     any Controls( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
-+    long Type() raises ( com::sun::star::script::BasicErrorException );
-+    any FindControl( [in] any Type, [in] any Id, [in] any Tag, [in] any Visible, [in] any Recursive ) raises ( com::sun::star::script::BasicErrorException );
- };
- 
- }; };
---- oovbaapi/ooo/vba/XCommandBarButton.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/XCommandBarButton.idl	2009-04-06 16:42:00.000000000 +0000
-@@ -0,0 +1,52 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XCommandBarButton_idl__
-+#define __ooo_vba_XCommandBarButton_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+//=============================================================================
-+
-+module ooo {  module vba { 
-+//=============================================================================
-+
-+interface XCommandBarButton: com::sun::star::uno::XInterface
-+{
-+};
-+
-+}; };
-+
-+#endif
---- oovbaapi/ooo/vba/XCommandBarPopup.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/XCommandBarPopup.idl	2009-04-06 16:42:00.000000000 +0000
-@@ -0,0 +1,52 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XCommandBarPopup_idl__
-+#define __ooo_vba_XCommandBarPopup_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+//=============================================================================
-+
-+module ooo {  module vba { 
-+//=============================================================================
-+
-+interface XCommandBarPopup: com::sun::star::uno::XInterface
-+{
-+};
-+
-+}; };
-+
-+#endif
---- oovbaapi/ooo/vba/makefile.mk.old	2009-04-06 16:41:59.000000000 +0000
-+++ oovbaapi/ooo/vba/makefile.mk	2009-04-06 16:42:00.000000000 +0000
-@@ -52,6 +52,8 @@ IDLFILES=\
- 	XCommandBarControls.idl\
- 	XCommandBar.idl\
- 	XCommandBars.idl\
-+	XCommandBarPopup.idl\
-+	XCommandBarButton.idl\
- 	Globals.idl\
- 
- # ------------------------------------------------------------------
---- sc/source/ui/vba/vbacommandbar.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbar.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -37,6 +37,7 @@
- #include <com/sun/star/frame/XDesktop.hpp>
- #include <com/sun/star/frame/XLayoutManager.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
-+#include <ooo/vba/office/MsoBarType.hpp>
- 
- #include "vbacommandbar.hxx"
- #include "vbacommandbarcontrols.hxx"
-@@ -99,7 +100,7 @@ ScVbaCommandBar::initCommandBar() throw
-     m_bTemporary = sal_True;
-     m_sToolBarName = rtl::OUString::createFromAscii("");
-     m_sUIName = rtl::OUString::createFromAscii("");
--    m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" );
-+    m_sMenuModuleName = m_pScVbaCommandBars->GetModuleName();
- }
- void
- ScVbaCommandBar::getToolBarSettings( rtl::OUString sToolBarName ) throw( uno::RuntimeException )
-@@ -310,6 +311,23 @@ ScVbaCommandBar::Controls( const uno::An
-     }
-     return uno::makeAny( xCommandBarControls );
- }
-+
-+sal_Int32 SAL_CALL
-+ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // #FIXME support msoBarTypePopup
-+    sal_Int32 nType = office::MsoBarType::msoBarTypePopup;
-+    nType = m_bIsMenu? office::MsoBarType::msoBarTypeNormal : office::MsoBarType::msoBarTypeMenuBar;
-+    return nType;
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // alwayse fail to find control
-+    return uno::makeAny( uno::Reference< XCommandBarControl > () );
-+}
-+
- rtl::OUString& 
- ScVbaCommandBar::getServiceImplName()
- {
---- sc/source/ui/vba/vbacommandbar.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbar.hxx	2009-04-06 16:42:00.000000000 +0000
-@@ -97,6 +97,8 @@ public:
-     // Methods
-     virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL Type(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- 
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
---- sc/source/ui/vba/vbacommandbarcontrol.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbarcontrol.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -33,6 +33,8 @@
-  *
-  ************************************************************************/
- #include "vbacommandbarcontrol.hxx"
-+#include <basic/sbstar.hxx>
-+#include <basic/sbmod.hxx>
- 
- using namespace com::sun::star;
- using namespace ooo::vba;
-@@ -64,7 +66,7 @@ beans::PropertyValues lcl_repalcePropert
-     return aPropertyValues;
- }
- 
--ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName ) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_sName( sName )
-+ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Int32 nType ) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_sName( sName ), m_nPosition( nPosition ), m_nType( nType )
- {
-     // exsiting CommandBarBarControl
-     m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
-@@ -83,34 +85,6 @@ ScVbaCommandBarControl::ScVbaCommandBarC
-         {
-             m_xCurrentSettings.set( m_xUICfgManager->getSettings( m_pCommandBarControls->GetParentToolBarName(), sal_True ), uno::UNO_QUERY_THROW );
-         }
--        for( sal_Int32 i = 0; i < m_xCurrentSettings->getCount(); i++ )
--        {
--            beans::PropertyValues aPropertyValuesTemp;
--            m_xCurrentSettings->getByIndex( i ) >>= aPropertyValuesTemp;
--            // Label always empty in OOo
--            rtl::OUString sLabel;
--            lcl_getPropertyValue( aPropertyValuesTemp, rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
--            if( sLabel.equalsIgnoreAsciiCase( sName ) )
--            {
--                m_nPosition = i;
--                break;
--            }
--            // using CammandURL to find
--            rtl::OUString sCommandURL;
--            lcl_getPropertyValue( aPropertyValuesTemp, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
--            sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
--            if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sCommandURL.getLength() ) )
--            {
--                sCommandURL = sCommandURL.copy( nLastIndex + 1 );
--            }
--            if( sCommandURL.equalsIgnoreAsciiCase( sName ) )
--            {
--                m_nPosition = i;
--                break;
--            }
--        }
--        if( m_nPosition  == -1 )
--            throw uno::RuntimeException( rtl::OUString::createFromAscii("The CommandBarControl do not exist"), uno::Reference< uno::XInterface >() );
-     }
-     if( m_bIsMenu )
-     {
-@@ -122,7 +96,7 @@ ScVbaCommandBarControl::ScVbaCommandBarC
-     }
-     m_bTemporary = sal_True;
- }
--ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, rtl::OUString sCommand, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) :  CommandBarControl_BASE( xParent, xContext ), m_nPosition( nPosition ), m_bTemporary( bTemporary )
-+ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType) throw (uno::RuntimeException) :  CommandBarControl_BASE( xParent, xContext ), m_nPosition( nPosition ), m_bTemporary( bTemporary ), m_nType( nType )
- {
-     m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
-     initObjects();
-@@ -130,14 +104,7 @@ ScVbaCommandBarControl::ScVbaCommandBarC
-     {
-         m_sName = sName;
-     }
--    if( sCommand.getLength() > 0 )
--    {
--        m_sCommand = sCommand;
--    }
--    else
--    {
--        m_sCommand = rtl::OUString::createFromAscii("vnd.openoffice.org:") + sName;
--    }
-+    m_sCommand = rtl::OUString::createFromAscii("vnd.openoffice.org:") + sName;
-     if( m_bIsMenu )
-     {
-         m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
-@@ -161,27 +128,32 @@ ScVbaCommandBarControl::initObjects() th
-     m_xBarSettings.set( m_pCommandBarControls->GetBarSettings(), uno::UNO_QUERY_THROW );
-     m_bIsMenu = m_pCommandBarControls->IsMenu();
-     m_sName = rtl::OUString::createFromAscii( "Custom" );
--    m_nPosition = -1;
- }
- 
- void
- ScVbaCommandBarControl::createNewMenuBarControl()
- {
--    uno::Sequence< beans::PropertyValue > aPropertys(4);
-+    uno::Reference< lang::XSingleComponentFactory > xMenuMSF( m_xBarSettings, uno::UNO_QUERY_THROW );
-+
-+    uno::Sequence< beans::PropertyValue > aPropertys;
-+    if( m_nType == office::MsoControlType::msoControlPopup )
-+        aPropertys = uno::Sequence< beans::PropertyValue >( 4 );
-+    else
-+        aPropertys = uno::Sequence< beans::PropertyValue >( 3 );
-+
-     aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
-     aPropertys[0].Value <<= m_sCommand; 
-     aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
-     aPropertys[1].Value <<= m_sName; 
-     aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
--    aPropertys[2].Value <<= m_nType; 
--    aPropertys[3].Name = rtl::OUString::createFromAscii("ItemDescriptorContainer");
-+    aPropertys[2].Value <<= sal_Int32(0); 
- 
--    m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
--    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
--    rtl::OUString sUIName;
--    xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") ) >>= sUIName;
-+    if( m_nType == office::MsoControlType::msoControlPopup )
-+    {
-+        aPropertys[3].Name = rtl::OUString::createFromAscii("ItemDescriptorContainer");
-+        aPropertys[3].Value <<= xMenuMSF->createInstanceWithContext( mxContext );
-+    }    
- 
--    uno::Reference< lang::XSingleComponentFactory > xMenuMSF( m_xBarSettings, uno::UNO_QUERY_THROW );
-     if( m_pCommandBarControls->GetParentCommandBar() != NULL )
-     {
-         // create a new menu
-@@ -191,7 +163,6 @@ ScVbaCommandBarControl::createNewMenuBar
-     else if( m_pCommandBarControls->GetParentCommandBarControl() != NULL )
-     {
-         // create a new menu entry
--        // change the parent MenuItem to a PopupMenu
-         ScVbaCommandBarControl* pPc = m_pCommandBarControls->GetParentCommandBarControl();
-         beans::PropertyValues aPropertyValues;
-         pPc->GetCurrentSettings()->getByIndex( pPc->GetPosition() ) >>= aPropertyValues;
-@@ -204,7 +175,7 @@ ScVbaCommandBarControl::createNewMenuBar
-             pPc->GetCurrentSettings()->replaceByIndex( pPc->GetPosition(), uno::makeAny( pPc->GetPropertyValues() ) );
-         }
-         m_xCurrentSettings.set( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY_THROW );
--        m_xCurrentSettings->insertByIndex( m_nPosition, uno::makeAny( m_aPropertyValues ) );
-+        m_xCurrentSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
-     }
-     if( m_xUICfgManager->hasSettings( m_sBarName ) )
-     {
-@@ -229,7 +200,7 @@ ScVbaCommandBarControl::createNewToolBar
-     aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
-     aPropertys[1].Value <<= m_sName; 
-     aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
--    aPropertys[2].Value <<= m_nType; 
-+    aPropertys[2].Value <<= sal_Int32(0); 
-     aPropertys[3].Name = rtl::OUString::createFromAscii("IsVisible");
-     aPropertys[3].Value <<= sal_True; 
- 
-@@ -314,10 +285,25 @@ ScVbaCommandBarControl::setOnAction( con
- {
-     if( m_xCurrentSettings.is() )
-     {
-+        // convert the comand url into something like vnd.sun.star.script:Standard.testMacro.Macro1?language=Basic&location=document
-+        rtl::OUString aCommandURL;
-+        rtl::OUString sUrlPart = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
-+        SbModule* pModule = StarBASIC::GetActiveModule();
-+        if( pModule && ( _onaction.indexOf( sUrlPart ) == -1 ) )
-+        {
-+            rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
-+            aCommandURL = sUrlPart.concat( pModule->GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( _onaction ).concat( sUrlPart1 );
-+        }
-+        else
-+        {
-+            aCommandURL = _onaction;
-+        }
-+		OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-         beans::PropertyValues aPropertyValues;
-         m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
-         beans::PropertyValues aNewPropertyValues;
--        aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( _onaction ) );
-+        aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
-         m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
-         if( m_xUICfgManager->hasSettings( m_sBarName ) )
-         {
-@@ -401,3 +387,57 @@ ScVbaCommandBarControl::getServiceNames(
- 	}
- 	return aServiceNames;
- }
-+
-+//////////// ScVbaCommandBarPopup //////////////////////////////
-+ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlPopup )
-+{
-+}
-+
-+ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlPopup) 
-+{
-+}
-+
-+rtl::OUString& 
-+ScVbaCommandBarPopup::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarPopup") );
-+	return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaCommandBarPopup::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarPopup" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+//////////// ScVbaCommandBarButton //////////////////////////////
-+ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlButton )
-+{
-+}
-+
-+ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlButton) 
-+{
-+}
-+
-+rtl::OUString& 
-+ScVbaCommandBarButton::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarButton") );
-+	return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaCommandBarButton::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarButton" ) );
-+	}
-+	return aServiceNames;
-+}
---- sc/source/ui/vba/vbacommandbarcontrol.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbarcontrol.hxx	2009-04-06 16:42:00.000000000 +0000
-@@ -36,6 +36,9 @@
- #define SC_VBA_COMMANDBARCONTROL_HXX
- 
- #include <ooo/vba/XCommandBarControl.hpp>
-+#include <ooo/vba/XCommandBarPopup.hpp>
-+#include <ooo/vba/XCommandBarButton.hpp>
-+#include <ooo/vba/office/MsoControlType.hpp>
- 
- #include "vbahelperinterface.hxx"
- #include "vbacommandbarcontrols.hxx"
-@@ -64,8 +67,12 @@ private:
-     void createNewMenuBarControl();
-     void createNewToolBarControl();
- public:
--    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName ) throw (css::uno::RuntimeException);
--    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, rtl::OUString sCommand, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
-+    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
-+    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
-+    css::uno::Reference< css::container::XIndexContainer >  GetBarSettings() { return m_xBarSettings; };
-+    sal_Bool IsMenu() { return m_bIsMenu; };
-     sal_Int32 GetPosition() { return m_nPosition; };
-     css::uno::Reference< css::container::XIndexContainer > GetCurrentSettings() { return m_xCurrentSettings; };
-     css::beans::PropertyValues GetPropertyValues() { return m_aPropertyValues; };
-@@ -87,4 +94,27 @@ public:
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
- };
-+
-+typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarPopup > CommandBarPopup_BASE;
-+class ScVbaCommandBarPopup : public CommandBarPopup_BASE
-+{
-+public:
-+    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarButton > CommandBarButton_BASE;
-+class ScVbaCommandBarButton : public CommandBarButton_BASE
-+{
-+public:
-+    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
- #endif//SC_VBA_COMMANDBARCONTROL_HXX
---- sc/source/ui/vba/vbacommandbarcontrols.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbarcontrols.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -38,6 +38,8 @@
- using namespace com::sun::star;
- using namespace ooo::vba;
- 
-+uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName );
-+
- typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarControlEnumeration_BASE;
- class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE
- {
-@@ -88,6 +90,24 @@ ScVbaCommandBarControls::ScVbaCommandBar
-     }
-     else if( m_pCommandBarControl )
-     {
-+        m_xUICfgManager.set( m_pCommandBarControl->GetUICfgManager(), uno::UNO_QUERY_THROW );
-+        m_xUICfgPers.set( m_pCommandBarControl->GetUICfgPers(), uno::UNO_QUERY_THROW );
-+        beans::PropertyValues aPropertyValues;
-+        m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
-+        m_pCommandBarControl->SetPropertyValues( aPropertyValues );
-+        m_xBarSettings.set( m_pCommandBarControl->GetCurrentSettings(), uno::UNO_QUERY_THROW );
-+
-+        uno::Any aValue = lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") );
-+        if( aValue.hasValue() )
-+        {
-+            m_xCurrentSettings = m_pCommandBarControl->GetCurrentSettings();
-+            m_bHasElements = sal_True;
-+        }
-+        else
-+        {
-+            m_bHasElements = sal_False;
-+        }
-+        m_bIsMenu = m_pCommandBarControl->IsMenu();
-     }
-     else
-     {
-@@ -170,7 +190,62 @@ ScVbaCommandBarControls::createCollectio
-     // only surport the aSource as a name string, because this class is a API wrapper
-     rtl::OUString sName;
-     if( aSource >>= sName )
--        return uno::makeAny( uno::Reference< XCommandBarControl > ( new ScVbaCommandBarControl( this, mxContext, sName ) ) );
-+    {
-+        uno::Reference< container::XIndexContainer > xCurrentSettings;
-+        beans::PropertyValues aPropertyValues;
-+        if( m_pCommandBarControl )
-+        {
-+            m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
-+            xCurrentSettings.set( lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY );
-+            if( !xCurrentSettings.is() )
-+            {
-+                xCurrentSettings.set( m_xUICfgManager->getSettings( GetParentToolBarName(), sal_True ), uno::UNO_QUERY );
-+            }
-+        }
-+
-+        sal_Int32 nPosition = -1;
-+        for( sal_Int32 i = 0; i < xCurrentSettings->getCount(); i++ )
-+        {
-+            xCurrentSettings->getByIndex( i ) >>= aPropertyValues;
-+            // Label always empty in OOo
-+            rtl::OUString sLabel;
-+            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
-+            if( sLabel.equalsIgnoreAsciiCase( sName ) )
-+            {
-+                nPosition = i;
-+                break;
-+            }
-+            // using CammandURL to find
-+            rtl::OUString sCommandURL;
-+            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
-+            sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
-+            if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sCommandURL.getLength() ) )
-+            {
-+                sCommandURL = sCommandURL.copy( nLastIndex + 1 );
-+            }
-+            if( sCommandURL.equalsIgnoreAsciiCase( sName ) )
-+            {
-+                nPosition = i;
-+                break;
-+            }
-+        }
-+
-+        if( nPosition  != -1 )
-+        {
-+            uno::Reference< container::XIndexContainer > xSubMenu;
-+            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ) >>= xSubMenu;
-+            ScVbaCommandBarControl* pNewCommandBarControl = NULL;
-+            if( xSubMenu.is() )
-+                pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sName, nPosition );
-+            else
-+                pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sName, nPosition );
-+
-+            return uno::makeAny( uno::Reference< XCommandBarControl > ( pNewCommandBarControl ) );
-+        }
-+        else
-+            throw uno::RuntimeException( rtl::OUString::createFromAscii("The CommandBarControl do not exist"), uno::Reference< uno::XInterface >() );
-+        
-+    }
-     return uno::Any();
- }
- 
-@@ -213,16 +288,43 @@ ScVbaCommandBarControls::Add( const uno:
-             // evalute the action of the new control
-         }
-     if( Before.hasValue() )
--        if( Before >>= nPosition )
-+        Before >>= nPosition;
-+    else
-+    {
-+        // if Before is ignore, the new control should be placed at the end of the commandbars;
-+        if( m_pCommandBar )
-+            nPosition = getCount();
-+        else if ( m_pCommandBarControl )
-         {
--            // evalute the position of the new Control
-+            css::uno::Reference< css::container::XIndexContainer > xCurrentSettings;
-+            xCurrentSettings.set( lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY );
-+            if( xCurrentSettings.is() )
-+            {
-+                nPosition = xCurrentSettings->getCount();
-+            }
-         }
-+    }
-     if( Temporary.hasValue() )
-         if( Temporary >>= bTemporary )
-         {
-             // evalute the temporary of the new Control
-         }
--    return uno::Reference< XCommandBarControl > ( new ScVbaCommandBarControl( this, mxContext, sCaption, sCommand, nPosition, bTemporary ) );
-+    
-+    ScVbaCommandBarControl* pNewCommandBarControl = NULL;
-+    if( nType == office::MsoControlType::msoControlButton )
-+    {
-+        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sCaption, nPosition, bTemporary );
-+    }
-+    else if ( nType == office::MsoControlType::msoControlPopup )
-+    {
-+        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sCaption, nPosition, bTemporary );
-+    }
-+    else
-+    {
-+        pNewCommandBarControl = new ScVbaCommandBarControl( this, mxContext, sCaption, nPosition, bTemporary );
-+    }
-+
-+    return uno::Reference< XCommandBarControl >( pNewCommandBarControl );
- }
-    
- // XHelperInterface
---- sc/source/ui/vba/vbacommandbarcontrols.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbarcontrols.hxx	2009-04-06 16:42:00.000000000 +0000
-@@ -56,6 +56,7 @@ private:
-     css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
-     css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
-     css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
-+    css::uno::Reference< css::container::XIndexContainer >          m_xCurrentSettings;
- 
- public:
-     ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess ) throw( css::uno::RuntimeException );
---- sc/source/ui/vba/vbacommandbars.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbars.cxx	2009-04-06 16:42:00.000000000 +0000
-@@ -201,6 +201,20 @@ ScVbaCommandBars::Item( const uno::Any&
-     {
-         return createCollectionObject( aIndex );    
-     }
-+
-+    // hardcode if "aIndex = 1" that would return "main menu".
-+    sal_Int16 nIndex = 0;
-+    aIndex >>= nIndex;
-+    if( nIndex == 1 )
-+    {
-+        uno::Any aSource;
-+        if( m_sModuleName.equalsIgnoreAsciiCase( sSpreadsheetDocumentUrl ) )
-+            aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" );
-+        else if( m_sModuleName.equalsIgnoreAsciiCase( sTextDocumentUrl ) )
-+            aSource <<= rtl::OUString::createFromAscii( "Menu Bar" );
-+        if( aSource.hasValue() )    
-+            return createCollectionObject( aSource );
-+    }
-     return uno::Any();
- }
- 
diff --git a/applied_patches/0464-sdbc-postgresql.diff b/applied_patches/0344-sdbc-postgresql.diff
similarity index 100%
rename from applied_patches/0464-sdbc-postgresql.diff
rename to applied_patches/0344-sdbc-postgresql.diff
diff --git a/applied_patches/0344-vba-xls-formula-parser.diff b/applied_patches/0344-vba-xls-formula-parser.diff
deleted file mode 100644
index f42587ff5..000000000
--- a/applied_patches/0344-vba-xls-formula-parser.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index e7f6797..0911361 100644
---- sc/source/ui/vba/vbarange.cxx
-+++ sc/source/ui/vba/vbarange.cxx
-@@ -792,9 +792,10 @@ protected:
- 		double aDblValue = 0.0;
- 		if ( aValue >>= sFormula )
- 		{
--            // convert to CONV_OOO style formula string because XCell::setFormula
--            // always compile it in CONV_OOO style.  Perhaps css.sheet.FormulaParser
--            // should be used in future to directly pass formula tokens.
-+            // convert to GRAM_PODF_A1 style grammar because XCell::setFormula
-+            // always compile it in that grammar. Perhaps
-+            // css.sheet.FormulaParser should be used in future to directly
-+            // pass formula tokens when that API stabilizes.
-             if ( m_eGrammar != formula::FormulaGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) )	
- 			{
- 				uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
-@@ -1462,25 +1463,25 @@ void
- ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException)
- {
- 	// #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO                        	// results in "=$a$1:a1", temporalily disable conversion
--	setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );;
-+	setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_ENGLISH_XL_A1 );;
- }
- 
- uno::Any
- ScVbaRange::getFormulaR1C1() throw (::com::sun::star::uno::RuntimeException)
- {
--	return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
-+	return getFormulaValue( formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1 );
- }
- 
- void
- ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeException)
- {
--	setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
-+	setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1 );
- }
- 
- uno::Any
- ScVbaRange::getFormula() throw (::com::sun::star::uno::RuntimeException)
- {
--	return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
-+	return getFormulaValue( formula::FormulaGrammar::GRAM_ENGLISH_XL_A1 );
- }
- 
- sal_Int32 
diff --git a/applied_patches/0465-sdbc-postgresql-build-lst.diff b/applied_patches/0345-sdbc-postgresql-build-lst.diff
similarity index 100%
rename from applied_patches/0465-sdbc-postgresql-build-lst.diff
rename to applied_patches/0345-sdbc-postgresql-build-lst.diff
diff --git a/applied_patches/0345-vba-fix-docmodule-import-crash.diff b/applied_patches/0345-vba-fix-docmodule-import-crash.diff
deleted file mode 100644
index 13710d482..000000000
--- a/applied_patches/0345-vba-fix-docmodule-import-crash.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git svx/source/msfilter/svxmsbas.cxx svx/source/msfilter/svxmsbas.cxx
-index 3b2feb0..2826ed4 100644
---- svx/source/msfilter/svxmsbas.cxx
-+++ svx/source/msfilter/svxmsbas.cxx
-@@ -457,8 +457,15 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
- 				// get the api object for the codename
- 				if ( xVBACodeNamedObjectAccess.is() )
- 				{
--					sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );    
--					OSL_TRACE("** Straight up creation of Module");
-+					try
-+					{
-+						sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );    
-+						OSL_TRACE("** Straight up creation of Module");
-+					}
-+					catch(uno::Exception& e)
-+					{
-+						OSL_TRACE("Failed to get documument object for %s", rtl::OUStringToOString( sModuleInfo.ModuleName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+					}
- 				}
- 			}
-                         aSourceAny <<= sModuleInfo;
diff --git a/applied_patches/0466-connectivity-workben-postgresql.diff b/applied_patches/0346-connectivity-workben-postgresql.diff
similarity index 100%
rename from applied_patches/0466-connectivity-workben-postgresql.diff
rename to applied_patches/0346-connectivity-workben-postgresql.diff
diff --git a/applied_patches/0346-vba-servicemacros-rework.diff b/applied_patches/0346-vba-servicemacros-rework.diff
deleted file mode 100644
index 7059edbb1..000000000
--- a/applied_patches/0346-vba-servicemacros-rework.diff
+++ /dev/null
@@ -1,251 +0,0 @@
-diff --git comphelper/inc/comphelper/servicedecl.hxx comphelper/inc/comphelper/servicedecl.hxx
-index bbfb1c8..bd114be 100644
---- comphelper/inc/comphelper/servicedecl.hxx
-+++ comphelper/inc/comphelper/servicedecl.hxx
-@@ -169,21 +169,20 @@ template <bool> struct with_args;
- 
- /// @internal
- namespace detail {
--
- template <typename ImplT>
--class ServiceImpl
--    : public ::cppu::ImplInheritanceHelper1<ImplT, css::lang::XServiceInfo>,
-+class OwnServiceImpl
-+    : public ImplT,
-       private ::boost::noncopyable
- {
--    typedef ::cppu::ImplInheritanceHelper1<ImplT,css::lang::XServiceInfo> BaseT;
-+    typedef ImplT BaseT;
-     
- public:    
--    ServiceImpl(
-+    OwnServiceImpl(
-         ServiceDecl const& rServiceDecl,
-         css::uno::Sequence<css::uno::Any> const& args,
-         css::uno::Reference<css::uno::XComponentContext> const& xContext )
--        : BaseT(args, xContext), m_rServiceDecl(rServiceDecl) {}
--    ServiceImpl(
-+        :BaseT(args, xContext), m_rServiceDecl(rServiceDecl) {}
-+    OwnServiceImpl(
-         ServiceDecl const& rServiceDecl,
-         css::uno::Reference<css::uno::XComponentContext> const& xContext )
-         : BaseT(xContext), m_rServiceDecl(rServiceDecl) {}
-@@ -206,6 +205,22 @@ private:
-     ServiceDecl const& m_rServiceDecl;
- };
- 
-+template <typename ImplT>
-+class ServiceImpl : public OwnServiceImpl< ::cppu::ImplInheritanceHelper1<ImplT,css::lang::XServiceInfo> >
-+{
-+typedef OwnServiceImpl< ::cppu::ImplInheritanceHelper1<ImplT,css::lang::XServiceInfo> > ServiceImpl_BASE;
-+public:
-+    ServiceImpl(
-+        ServiceDecl const& rServiceDecl,
-+        css::uno::Sequence<css::uno::Any> const& args,
-+        css::uno::Reference<css::uno::XComponentContext> const& xContext )
-+        : ServiceImpl_BASE(rServiceDecl, args, xContext) {}
-+    ServiceImpl(
-+        ServiceDecl const& rServiceDecl,
-+        css::uno::Reference<css::uno::XComponentContext> const& xContext )
-+        : ServiceImpl_BASE(rServiceDecl, xContext) {}
-+};
-+
- template <typename ServiceImplT>
- struct PostProcessDefault {
-     css::uno::Reference<css::uno::XInterface>
-@@ -230,7 +245,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<false> > {
-                 const& xContext ) const
-     {
-         return m_postProcessFunc(
--            new ServiceImpl<ImplT>( rServiceDecl, xContext ) );
-+            new ImplT( rServiceDecl, xContext ) );
-     }
- };
- 
-@@ -247,7 +262,7 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<true> > {
-                 const& xContext ) const
-     {
-         return m_postProcessFunc(
--            new ServiceImpl<ImplT>( rServiceDecl, args, xContext ) );
-+            new ImplT( rServiceDecl, args, xContext ) );
-     }
- };
- 
-@@ -261,18 +276,17 @@ struct CreateFunc<ImplT, PostProcessFuncT, with_args<true> > {
-                or just (uno::Reference<uno::XComponentContext>)
- */
- template <typename ImplT_, typename WithArgsT = with_args<false> >
--struct class_ {
-+struct serviceimpl_base {
-     typedef ImplT_ ImplT;
--    typedef detail::ServiceImpl<ImplT_> ServiceImplT;
-     
-     detail::CreateFuncF const m_createFunc;
-     
--    typedef detail::PostProcessDefault<ServiceImplT> PostProcessDefaultT;
-+    typedef detail::PostProcessDefault<ImplT> PostProcessDefaultT;
- 
-     /** Default ctor.  Implementation class without args, expecting
-         component context as single argument.
-     */
--    class_() : m_createFunc(
-+    serviceimpl_base() : m_createFunc(
-         detail::CreateFunc<ImplT, PostProcessDefaultT, WithArgsT>(
-             PostProcessDefaultT() ) ) {}
- 
-@@ -284,11 +298,29 @@ struct class_ {
-                                uno::Reference<uno::XInterface>
-     */
-     template <typename PostProcessFuncT>
--    explicit class_( PostProcessFuncT const& postProcessFunc )
-+    explicit serviceimpl_base( PostProcessFuncT const& postProcessFunc )
-         : m_createFunc( detail::CreateFunc<ImplT, PostProcessFuncT, WithArgsT>(
-                             postProcessFunc ) ) {}
- };
- 
-+template <typename ImplT_, typename WithArgsT = with_args<false> >
-+struct class_ : public serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT >
-+{
-+    typedef serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT > baseT;
-+    /** Default ctor.  Implementation class without args, expecting
-+        component context as single argument.
-+    */
-+    class_() : baseT() {}
-+    template <typename PostProcessFuncT>
-+    /** Ctor to pass a post processing function/functor.
-+        
-+        @tpl PostProcessDefaultT let your compiler deduce this
-+        @param postProcessFunc function/functor that gets the yet unacquired
-+                               ImplT_ pointer returning a
-+                               uno::Reference<uno::XInterface>
-+    */
-+    explicit class_( PostProcessFuncT const& postProcessFunc ) : baseT( postProcessFunc ) {}
-+};
- 
- //
- // component_... helpers with arbitrary service declarations:
-diff --git sc/source/ui/vba/helperdecl.hxx sc/source/ui/vba/helperdecl.hxx
-index 1581e66..c3c1007 100644
---- sc/source/ui/vba/helperdecl.hxx
-+++ sc/source/ui/vba/helperdecl.hxx
-@@ -32,107 +32,25 @@
- 
- namespace comphelper {
- namespace service_decl {
--
--namespace detail {
--namespace css = ::com::sun::star;
--template <typename ImplT>
--class OwnServiceImpl
--    : public ImplT,
--      private ::boost::noncopyable
--{
--    typedef ImplT BaseT;
--    
--public:    
--    OwnServiceImpl(
--        ServiceDecl const& rServiceDecl,
--        css::uno::Sequence<css::uno::Any> const& args,
--        css::uno::Reference<css::uno::XComponentContext> const& xContext )
--        :BaseT(args, xContext), m_rServiceDecl(rServiceDecl) {}
--    OwnServiceImpl(
--        ServiceDecl const& rServiceDecl,
--        css::uno::Reference<css::uno::XComponentContext> const& xContext )
--        : BaseT(xContext), m_rServiceDecl(rServiceDecl) {}
--    
--    // XServiceInfo
--    virtual ::rtl::OUString SAL_CALL getImplementationName()
--        throw (css::uno::RuntimeException) {
--        return m_rServiceDecl.getImplementationName();
--    }
--    virtual sal_Bool SAL_CALL supportsService( ::rtl::OUString const& name )
--        throw (css::uno::RuntimeException) {
--        return m_rServiceDecl.supportsService(name);
--    }
--    virtual css::uno::Sequence< ::rtl::OUString>
--    SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) {
--        return m_rServiceDecl.getSupportedServiceNames();
--    }
--    
--private:
--    ServiceDecl const& m_rServiceDecl;
--};
--
--
--template <typename ImplT, typename WithArgsT>
--struct OwnCreateFunc;
--
--template <typename ImplT>
--struct OwnCreateFunc<ImplT, with_args<false> > {
--    explicit OwnCreateFunc(  )
--         {}
--    
--    css::uno::Reference<css::uno::XInterface>
--    operator()( ServiceDecl const& rServiceDecl,
--                css::uno::Sequence<css::uno::Any> const&,
--                css::uno::Reference<css::uno::XComponentContext>
--                const& xContext ) const
--    {
--        return css::uno::Reference< ooo::vba::XHelperInterface >(new OwnServiceImpl<ImplT>( rServiceDecl, xContext ));
--    }
--};
--
--template <typename ImplT>
--struct OwnCreateFunc<ImplT, with_args<true> > {
--    explicit OwnCreateFunc( )
--         {}
--    
--    css::uno::Reference<css::uno::XInterface>
--    operator()( ServiceDecl const& rServiceDecl,
--                css::uno::Sequence<css::uno::Any> const& args,
--                css::uno::Reference<css::uno::XComponentContext>
--                const& xContext ) const
--    {
--        css::uno::Reference< ooo::vba::XHelperInterface > xHelp(
--            new OwnServiceImpl<ImplT>( rServiceDecl, args, xContext ) );
--	css::uno::Reference< css::uno::XInterface > xIf( xHelp, css::uno::UNO_QUERY ) ;
--	return xIf;
--    }
--};
--
--} // namespace detail
--
--/** Defines a service implementation class.
--    
--    @tpl ImplT_ service implementation class
--    @WithArgsT whether the implementation class ctor expects arguments
--               (uno::Sequence<uno::Any>, uno::Reference<uno::XComponentContext>)
--               or just (uno::Reference<uno::XComponentContext>)
--*/
- template <typename ImplT_, typename WithArgsT = with_args<false> >
--struct vba_service_class_ {
--    typedef ImplT_ ImplT;
--    typedef detail::OwnServiceImpl<ImplT_ > ServiceImplT;
--    
--    detail::CreateFuncF const m_createFunc;
--    
-+struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT >
-+{
-+    typedef serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT > baseT;
-     /** Default ctor.  Implementation class without args, expecting
-         component context as single argument.
-     */
--    vba_service_class_() : m_createFunc(
--        detail::OwnCreateFunc<ImplT, WithArgsT>() ) {}
--
-+    vba_service_class_() : baseT() {}
-+    template <typename PostProcessFuncT>
-+    /** Ctor to pass a post processing function/functor.
-+        
-+        @tpl PostProcessDefaultT let your compiler deduce this
-+        @param postProcessFunc function/functor that gets the yet unacquired
-+                               ImplT_ pointer returning a
-+                               uno::Reference<uno::XInterface>
-+    */
-+    explicit vba_service_class_( PostProcessFuncT const& postProcessFunc ) : baseT( postProcessFunc ) {}
- };
- 
--
- } // namespace service_decl
- } // namespace comphelper
- 
diff --git a/applied_patches/0467-gcc-4.3-postgresql.diff b/applied_patches/0347-gcc-4.3-postgresql.diff
similarity index 100%
rename from applied_patches/0467-gcc-4.3-postgresql.diff
rename to applied_patches/0347-gcc-4.3-postgresql.diff
diff --git a/applied_patches/0347-vba-interior-object-fix.diff b/applied_patches/0347-vba-interior-object-fix.diff
deleted file mode 100644
index f4a45c474..000000000
--- a/applied_patches/0347-vba-interior-object-fix.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git sc/source/ui/vba/vbainterior.cxx sc/source/ui/vba/vbainterior.cxx
-index 99f1bd7..e9f538a 100644
---- sc/source/ui/vba/vbainterior.cxx
-+++ sc/source/ui/vba/vbainterior.cxx
-@@ -162,11 +162,19 @@ ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno
- {
- 	sal_Int32 nIndex = 0;
- 	_colorindex >>= nIndex;
--	
--	// setColor expects colors in XL RGB values
--	// #FIXME this is daft we convert OO RGB val to XL RGB val and
--	// then back again to OO RGB value
--	setColor( OORGBToXLRGB( GetIndexColor( nIndex ) ) );
-+
-+    // hackly for excel::XlColorIndex::xlColorIndexNone
-+    if( nIndex == excel::XlColorIndex::xlColorIndexNone )
-+    {
-+        m_xProps->setPropertyValue( BACKCOLOR, uno::makeAny( sal_Int32( -1 ) ) );
-+    }
-+    else
-+    {
-+	    // setColor expects colors in XL RGB values
-+    	// #FIXME this is daft we convert OO RGB val to XL RGB val and
-+	    // then back again to OO RGB value
-+    	setColor( OORGBToXLRGB( GetIndexColor( nIndex ) ) );
-+    }
- }
- uno::Any
- ScVbaInterior::GetIndexColor( const sal_Int32& nColorIndex )
-@@ -204,13 +212,21 @@ uno::Any SAL_CALL
- ScVbaInterior::getColorIndex() throw ( css::uno::RuntimeException )
- {
- 	sal_Int32 nColor = 0;
-+    // hackly for excel::XlColorIndex::xlColorIndexNone
-+    uno::Any aColor = m_xProps->getPropertyValue( BACKCOLOR ); 
-+    if( ( aColor >>= nColor ) && ( nColor == -1 ) )
-+    {
-+        nColor = excel::XlColorIndex::xlColorIndexNone;
-+        return uno::makeAny( nColor );
-+    }
-+
- 	// getColor returns Xl ColorValue, need to convert it to OO val
- 	// as the palette deals with OO RGB values 
- 	// #FIXME this is daft in getColor we convert OO RGB val to XL RGB val 
- 	// and then back again to OO RGB value
- 	XLRGBToOORGB( getColor() ) >>= nColor; 
-      
--	return uno::makeAny( GetIndexColor( nColor ) );
-+	return uno::makeAny( GetColorIndex( nColor ) );
- }
- Color
- ScVbaInterior::GetPatternColor( const Color& rPattColor, const Color& rBackColor, sal_uInt32 nXclPattern )
diff --git a/applied_patches/0348-range-defaultmethod-i98476.diff b/applied_patches/0348-range-defaultmethod-i98476.diff
deleted file mode 100644
index 72a679df8..000000000
--- a/applied_patches/0348-range-defaultmethod-i98476.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index 95f312c..cd25749 100644
---- sc/source/ui/vba/vbarange.cxx
-+++ sc/source/ui/vba/vbarange.cxx
-@@ -3388,7 +3391,7 @@ ScVbaRange::createEnumeration() throw (uno::RuntimeException)
- ::rtl::OUString SAL_CALL 
- ScVbaRange::getDefaultMethodName(  ) throw (uno::RuntimeException)
- {
--	const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Cells") );
-+	const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
- 	return sName;
- }
- 
diff --git a/applied_patches/0468-sdbc-postgresql-config_office.diff b/applied_patches/0348-sdbc-postgresql-config_office.diff
similarity index 100%
rename from applied_patches/0468-sdbc-postgresql-config_office.diff
rename to applied_patches/0348-sdbc-postgresql-config_office.diff
diff --git a/applied_patches/0469-kde4-buildfix-connectivity.diff b/applied_patches/0349-kde4-buildfix-connectivity.diff
similarity index 100%
rename from applied_patches/0469-kde4-buildfix-connectivity.diff
rename to applied_patches/0349-kde4-buildfix-connectivity.diff
diff --git a/applied_patches/0349-vba-excel-iserror-fix.diff b/applied_patches/0349-vba-excel-iserror-fix.diff
deleted file mode 100644
index d2784c940..000000000
--- a/applied_patches/0349-vba-excel-iserror-fix.diff
+++ /dev/null
@@ -1,168 +0,0 @@
---- sc/source/ui/vba/vbawsfunction.cxx	2009-02-02 15:33:32.000000000 +0000
-+++ sc/source/ui/vba/vbawsfunction.cxx.patched	2009-02-02 16:18:58.000000000 +0000
-@@ -88,12 +88,13 @@ ScVbaWSFunction::invoke(const rtl::OUStr
- 			count, rtl::OUStringToOString( comphelper::anyToString( aParamTemp[count] ), RTL_TEXTENCODING_UTF8 ).getStr()  );
- 	
- 	uno::Any aRet = xFunctionAccess->callFunction(FunctionName,aParamTemp);
-+
- 	// MATCH function should alwayse return a double value, but currently if the first argument is XCellRange, MATCH function returns an array instead of a double value. Don't know why?
- 	// To fix this issue in safe, current solution is to convert this array to a double value just for MATCH function.
- 	String aUpper( FunctionName );
- 	ScCompiler aCompiler( NULL, ScAddress() ); 
- 	OpCode eOp = aCompiler.GetEnglishOpCode( aUpper.ToUpperAscii() );
--	if( eOp == ocMatch )
-+	if( eOp == ocMatch || eOp == ocIsError )
- 	{
- 		double fVal = 0.0;
- 		if( aRet >>= fVal )
-diff --git basic/source/runtime/methods.cxx basic/source/runtime/methods.cxx
-index 8a9d408..0a7a30e 100644
---- basic/source/runtime/methods.cxx
-+++ basic/source/runtime/methods.cxx
-@@ -78,6 +78,7 @@
- #include <com/sun/star/io/XOutputStream.hpp>
- #include <com/sun/star/io/XStream.hpp>
- #include <com/sun/star/io/XSeekable.hpp>
-+#include <com/sun/star/script/XErrorQuery.hpp>
- 
- using namespace comphelper;
- using namespace osl;
-@@ -85,6 +86,7 @@ using namespace com::sun::star::uno;
- using namespace com::sun::star::lang;
- using namespace com::sun::star::ucb;
- using namespace com::sun::star::io;
-+using namespace com::sun::star::script;
- 
- #endif /* _USE_UNO */
- 
-@@ -2426,7 +2428,22 @@ RTLFUNC(IsError)
- 	if ( rPar.Count() < 2 )
- 		StarBASIC::Error( SbERR_BAD_ARGUMENT );
- 	else
--		rPar.Get( 0 )->PutBool( rPar.Get(1)->IsErr() );
-+	{
-+		SbxVariable* pVar =rPar.Get( 1 );
-+		SbUnoObject* pObj = PTR_CAST(SbUnoObject,pVar );
-+                if ( !pObj )
-+                { 
-+                    if ( SbxBase* pBaseObj = pVar->GetObject() )
-+                        pObj = PTR_CAST(SbUnoObject, pBaseObj );
-+                }
-+		Reference< XErrorQuery > xError;
-+		if ( pObj )
-+			xError.set( pObj->getUnoAny(), UNO_QUERY );
-+		if ( xError.is() )
-+			rPar.Get( 0 )->PutBool( xError->hasError() );
-+		else
-+			rPar.Get( 0 )->PutBool( rPar.Get(1)->IsErr() );
-+	}
- }
- 
- RTLFUNC(IsNull)
-diff --git oovbaapi/ooo/vba/excel/XRange.idl oovbaapi/ooo/vba/excel/XRange.idl
-index d84dcae..8062497 100644
---- oovbaapi/ooo/vba/excel/XRange.idl
-+++ oovbaapi/ooo/vba/excel/XRange.idl
-@@ -45,6 +45,9 @@
- #ifndef __com_sun_star_script_XDefaultMethod_idl__
- #include <com/sun/star/script/XDefaultMethod.idl>
- #endif
-+#ifndef __com_sun_star_script_XErrorQuery_idl__
-+#include <com/sun/star/script/XErrorQuery.idl>
-+#endif
- #ifndef __ooo_vba_XCollection_idl__
- #include <ooo/vba/XCollection.idl>
- #endif
-@@ -77,6 +80,7 @@ interface XRange
-  	interface com::sun::star::container::XEnumerationAccess;
- 	interface com::sun::star::script::XDefaultMethod;
- 	interface com::sun::star::script::XDefaultProperty;
-+	interface com::sun::star::script::XErrorQuery;
- 	interface ::ooo::vba::excel::XFormat;
- 	//interface ::ooo::vba::XHelperInterface;
- 
-diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index d7e20e5..a052262 100644
---- sc/source/ui/vba/vbarange.cxx
-+++ sc/source/ui/vba/vbarange.cxx
-@@ -5358,6 +5358,24 @@ ScVbaRange::getServiceNames()
- 	return aServiceNames;
- }
- 
-+sal_Bool SAL_CALL
-+ScVbaRange::hasError() throw (uno::RuntimeException)
-+{
-+    double dResult = sal_False;
-+    uno::Reference< script::XInvocation > xInvoc( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication()->WorksheetFunction(), uno::UNO_QUERY_THROW );
-+
-+    static rtl::OUString FunctionName( RTL_CONSTASCII_USTRINGPARAM("IsError" ) );
-+    uno::Sequence< uno::Any > Params(1);
-+    uno::Reference< excel::XRange > aRange( this );
-+    Params[0] = uno::makeAny( aRange );
-+    uno::Sequence< sal_Int16 > OutParamIndex;
-+    uno::Sequence< uno::Any > OutParam;
-+    xInvoc->invoke( FunctionName, Params, OutParamIndex, OutParam ) >>= dResult;
-+    if ( dResult > 0.0 )
-+         return sal_True;
-+    return sal_False;
-+}
-+
- namespace range
- {
- namespace sdecl = comphelper::service_decl;
-diff --git sc/source/ui/vba/vbarange.hxx sc/source/ui/vba/vbarange.hxx
-index ce902f1..0df668c 100644
---- sc/source/ui/vba/vbarange.hxx
-+++ sc/source/ui/vba/vbarange.hxx
-@@ -274,6 +274,8 @@ public:
- 	static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException);
- 	virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException );  
-+	// XErrorQuery
-+	virtual ::sal_Bool SAL_CALL hasError(  ) throw (css::uno::RuntimeException);
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-diff --git udkapi/com/sun/star/script/XErrorQuery.idl udkapi/com/sun/star/script/XErrorQuery.idl
-new file mode 100644
-index 0000000..9a1860e
---- /dev/null
-+++ udkapi/com/sun/star/script/XErrorQuery.idl
-@@ -0,0 +1,25 @@
-+#ifndef __com_sun_star_script_XErrorQuery_idl__
-+#define __com_sun_star_script_XErrorQuery_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+module com { module sun { module star { module script {
-+//==============================================================================
-+
-+interface XErrorQuery : ::com::sun::star::uno::XInterface
-+{
-+  //-----------------------------------------------------------------------
-+  /**
-+    Returns whether this object has an error
-+
-+    @return
-+    <atom>boolean</atom> indicating an error or not
-+  */
-+  boolean hasError();
-+
-+};
-+
-+};  };  };  };
-+#endif
-diff --git udkapi/com/sun/star/script/makefile.mk udkapi/com/sun/star/script/makefile.mk
-index 69e06dd..250b5cc 100644
---- udkapi/com/sun/star/script/makefile.mk
-+++ udkapi/com/sun/star/script/makefile.mk
-@@ -87,6 +87,7 @@ IDLFILES=\
- 	XDefaultProperty.idl\
-     ModuleInfo.idl\
-     ModuleType.idl\
-+    XErrorQuery.idl\
- 
- # ------------------------------------------------------------------
- 
diff --git a/applied_patches/0470-kde4-oxygen-icons.diff b/applied_patches/0350-kde4-oxygen-icons.diff
similarity index 100%
rename from applied_patches/0470-kde4-oxygen-icons.diff
rename to applied_patches/0350-kde4-oxygen-icons.diff
diff --git a/applied_patches/0350-word-read-custom-toolbar-filter.diff b/applied_patches/0350-word-read-custom-toolbar-filter.diff
deleted file mode 100644
index 03f16f3d2..000000000
--- a/applied_patches/0350-word-read-custom-toolbar-filter.diff
+++ /dev/null
@@ -1,2494 +0,0 @@
-diff --git svx/inc/svx/mstoolbar.hxx svx/inc/svx/mstoolbar.hxx
-new file mode 100644
-index 0000000..d78a90d
---- /dev/null
-+++ svx/inc/svx/mstoolbar.hxx
-@@ -0,0 +1,267 @@
-+#ifndef _MSTOOLBAR_HXX
-+#define _MSTOOLBAR_HXX
-+#include "svx/svxdllapi.h"
-+#include <tools/string.hxx>
-+#include <sot/storage.hxx>
-+#include <ostream>
-+#include <memory>
-+#include <vector>
-+#include <boost/shared_ptr.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <com/sun/star/container/XIndexContainer.hpp>
-+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-+#include <com/sun/star/graphic/XGraphic.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <vcl/bitmap.hxx>
-+
-+namespace css = ::com::sun::star;
-+
-+class TBCHeader;
-+
-+
-+class MSOCommandConvertor
-+{
-+public:
-+    virtual ~MSOCommandConvertor() {}
-+    virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) = 0; 
-+    virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ) = 0; 
-+};
-+
-+
-+class SVX_DLLPUBLIC CustomToolBarImportHelper
-+{
-+    struct iconcontrolitem
-+    {
-+        rtl::OUString sCommand;
-+        css::uno::Reference< css::graphic::XGraphic > image;
-+    };
-+    std::vector< iconcontrolitem > iconcommands;
-+    std::auto_ptr< MSOCommandConvertor > pMSOCmdConvertor;
-+    css::uno::Reference< css::ui::XUIConfigurationManagerSupplier > m_xCfgSupp;
-+    css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr;
-+
-+public:
-+    CustomToolBarImportHelper( const css::uno::Reference< css::frame::XModel >& rxModel, const css::uno::Reference< css::ui::XUIConfigurationManager >& rxAppCfgMgr );
-+
-+    void setMSOCommandMap( MSOCommandConvertor* pCnvtr ) { pMSOCmdConvertor.reset( pCnvtr ); }
-+    css::uno::Reference< css::ui::XUIConfigurationManager > getCfgManager();
-+    css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager();
-+
-+
-+    static css::uno::Any createCommandFromMacro( const rtl::OUString& sCmd );
-+
-+    void addIcon( const css::uno::Reference< css::graphic::XGraphic >& xImage, const rtl::OUString& sString );
-+    void applyIcons();
-+    rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
-+    rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID );
-+};
-+
-+class SVX_DLLPUBLIC TBBase
-+{
-+friend class Indent;
-+    static int nIndent; // num spaces to indent before printing 
-+protected:
-+    void indent_printf(FILE* fp, const char* format, ... );
-+    sal_uInt32 nOffSet; // usually for debug we can store the offset in the stream to this record
-+public:
-+    TBBase() : nOffSet( 0 ) {}
-+    virtual ~TBBase(){}
-+    rtl::OUString readUnicodeString( SvStream* pS, sal_Int32 nChars );
-+
-+    virtual bool Read(SvStream *pS) = 0;
-+    virtual void Print( FILE* ) {} // #FIXME remove this an implement the debug routines in all the classes below to enable some sort of readable output
-+};
-+
-+class Indent
-+{
-+public:
-+    Indent( bool binit = false ) 
-+    { 
-+        if ( binit )
-+            init();
-+        else
-+            TBBase::nIndent = TBBase::nIndent + 2; 
-+    }
-+    ~Indent() { TBBase::nIndent = TBBase::nIndent - 2; }
-+    void init() { TBBase::nIndent = 0; }
-+};
-+
-+
-+class SVX_DLLPUBLIC WString : public TBBase
-+{
-+    rtl::OUString sString;
-+
-+public:
-+    WString(){};
-+    ~WString(){};
-+    bool Read(SvStream *pS);
-+    rtl::OUString getString(){ return sString; }
-+};
-+
-+class SVX_DLLPUBLIC TBCExtraInfo : public TBBase
-+{
-+    WString wstrHelpFile;
-+    sal_Int32 idHelpContext;
-+    WString wstrTag;
-+    WString wstrOnAction;
-+    WString wstrParam;
-+    sal_Int8 tbcu;
-+    sal_Int8 tbmg;
-+
-+    TBCExtraInfo(const TBCExtraInfo&);
-+    TBCExtraInfo& operator = ( const TBCExtraInfo&);
-+public:
-+    TBCExtraInfo();
-+    ~TBCExtraInfo(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+    rtl::OUString getOnAction();
-+};
-+
-+class SVX_DLLPUBLIC TBCGeneralInfo  : public TBBase
-+{
-+    sal_uInt8 bFlags;
-+    WString customText;
-+    WString descriptionText;
-+    WString tooltip;
-+    TBCExtraInfo extraInfo;
-+
-+public:
-+    TBCGeneralInfo();
-+    ~TBCGeneralInfo() {}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+    bool ImportToolBarControlData( std::vector< css::beans::PropertyValue >& );
-+};
-+
-+class SVX_DLLPUBLIC TBCBitMap : public TBBase
-+{
-+friend class TBCBSpecific; // #FIXME hacky access, need to fix
-+    sal_Int32 cbDIB;
-+    Bitmap mBitMap;
-+    int size;
-+public:
-+    TBCBitMap();
-+    ~TBCBitMap();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+    Bitmap& getBitMap(); 
-+};
-+
-+class SVX_DLLPUBLIC TBCMenuSpecific : public TBBase
-+{
-+    sal_Int32 tbid;
-+    boost::shared_ptr< WString > name; //exist only if tbid equals 0x00000001
-+public:
-+    TBCMenuSpecific();
-+    ~TBCMenuSpecific(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class SVX_DLLPUBLIC TBCCDData : public TBBase
-+{
-+    sal_Int16 cwstrItems; //Signed integer that specifies the number of items in wstrList. MUST be positive.
-+    std::vector< WString > wstrList;  // Zero-based index array of WString structures. Number of elements MUST be equal to cwstrItems.
-+    sal_Int16 cwstrMRU; // Signed integer that specifies the number of most recently used string
-+    sal_Int16 iSel ; // Signed integer that specifies the zero-based index of the selected item in the wstrList field. MUST be equal to 0xFFFF (-1) or greater than or equal to 0x0000.
-+    sal_Int16 cLines; // Signed integer that specifies the suggested number of lines that the toolbar control will display at any time when displaying the elements of wstrList of available items. 
-+    sal_Int16 dxWidth; // Signed integer that specifies the width in pixels that the interior of the dropdown has. This excludes the width of the toolbar control border and scroll bar.
-+    WString wstrEdit; //Structure of type WString. Editable text for editable area of the ComboBox toolbar control.
-+
-+public:
-+    TBCCDData();
-+    ~TBCCDData();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class TBCComboDropdownSpecific : public TBBase
-+{
-+    boost::shared_ptr< TBCCDData > data;
-+public:
-+    TBCComboDropdownSpecific( const TBCHeader& header );
-+    TBCComboDropdownSpecific(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class TBCBSpecific :  public TBBase
-+{
-+    sal_uInt8 bFlags;
-+    boost::shared_ptr< TBCBitMap > icon; // optional
-+    boost::shared_ptr< TBCBitMap > iconMask; // optional
-+    boost::shared_ptr< sal_uInt16 > iBtnFace; // optional
-+    boost::shared_ptr< WString > wstrAcc; // optional
-+   
-+public:
-+    TBCBSpecific();
-+    ~TBCBSpecific(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+    // #TODO just add a getGraphic member here
-+    TBCBitMap* getIcon();
-+    TBCBitMap* getIconMask();
-+    sal_uInt16* getBtnFace() { return iBtnFace.get(); }
-+};
-+
-+/* TBCHeader.tct                   controlSpecificInfo type
-+
-+0x01 (Button control)              TBCBSpecific
-+0x10 (ExpandingGrid control)       TBCBSpecific
-+0x0A (Popup control)               TBCMenuSpecific
-+0x0C (ButtonPopup control)         TBCMenuSpecific
-+0x0D (SplitButtonPopup control)    TBCMenuSpecific
-+0x0E (SplitButtonMRUPopup control) TBCMenuSpecific
-+0x02 (Edit control)                TBCComboDropdow nSpecific
-+0x04 (ComboBox control)            TBCComboDropdow nSpecific
-+0x14 (GraphicCombo control)        TBCComboDropdow nSpecific
-+0x03 (DropDown control)            TBCComboDropdow nSpecific
-+0x06 (SplitDropDown control)       TBCComboDropdow nSpecific
-+0x09 (GraphicDropDown control)     TBCComboDropdow nSpecific
-+0x07 (OCXDropDown control)         controlSpecificInfo MUST NOT exist
-+0x0F (Label control)               controlSpecificInfo MUST NOT exist
-+0x12 (Grid control)                controlSpecificInfo MUST NOT exist
-+0x13 (Gauge control)               controlSpecificInfo MUST NOT exist
-+0x16 (ActiveX control)             controlSpecificInfo MUST NOT exist
-+
-+*/
-+class SVX_DLLPUBLIC TBCHeader : public TBBase
-+{
-+    sal_Int8 bSignature; 
-+    sal_Int8 bVersion; 
-+    sal_uInt8 bFlagsTCR; 
-+    sal_uInt8 tct; 
-+    sal_uInt16 tcid;
-+    sal_uInt32 tbct;
-+    sal_uInt8 bPriority;
-+    boost::shared_ptr< sal_uInt16 > width;  //optional
-+    boost::shared_ptr< sal_uInt16 > height; //optional
-+
-+public:
-+    TBCHeader();
-+    ~TBCHeader();
-+    sal_uInt8 getTct() const { return tct; }
-+    sal_uInt16 getTcID() const { return tcid; }
-+    bool isVisible() { return !( bFlagsTCR & 0x1 ); }
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+    sal_uInt32 getTbct() { return tbct; };
-+};
-+
-+class SVX_DLLPUBLIC TBCData : public TBBase
-+{
-+    TBCHeader rHeader;
-+    TBCGeneralInfo controlGeneralInfo;
-+    boost::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct 
-+    TBCData(const TBCData&);
-+    TBCData& operator = ( const TBCData&);
-+public:
-+    TBCData( const TBCHeader& Header );
-+    ~TBCData(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+    bool ImportToolBarControl(  const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& );
-+};
-+
-+#endif
-diff --git svx/prj/d.lst svx/prj/d.lst
-index e32ec30..385a905 100644
---- svx/prj/d.lst
-+++ svx/prj/d.lst
-@@ -655,5 +655,6 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
- ..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
- ..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx
- ..\inc\svx\optimprove.hxx %_DEST%\inc%_EXT%\svx\optimprove.hxx
-+..\inc\svx\mstoolbar.hxx %_DEST%\inc%_EXT%\svx\mstoolbar.hxx
- 
- ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
-diff --git svx/source/msfilter/makefile.mk svx/source/msfilter/makefile.mk
-index 8db71d1..768bc0e 100644
---- svx/source/msfilter/makefile.mk
-+++ svx/source/msfilter/makefile.mk
-@@ -54,7 +54,8 @@ SLOFILES=\
- 	$(SLO)$/msocximex.obj	\
- 	$(SLO)$/msashape3d.obj	\
- 	$(SLO)$/mscodec.obj		\
--	$(SLO)$/msfiltertracer.obj
-+	$(SLO)$/msfiltertracer.obj\
-+	$(SLO)$/mstoolbar.obj\
- 
- EXCEPTIONSFILES= \
- 	$(SLO)$/eschesdo.obj	\
-@@ -65,7 +66,8 @@ EXCEPTIONSFILES= \
- 	$(SLO)$/msocximex.obj	\
- 	$(SLO)$/msoleexp.obj	\
- 	$(SLO)$/svxmsbas.obj	\
--	$(SLO)$/msfiltertracer.obj
-+	$(SLO)$/msfiltertracer.obj\
-+	$(SLO)$/mstoolbar.obj\
- 
- .INCLUDE :  target.mk
- 
-diff --git svx/source/msfilter/mstoolbar.cxx svx/source/msfilter/mstoolbar.cxx
-new file mode 100644
-index 0000000..cb1c4bf
---- /dev/null
-+++ svx/source/msfilter/mstoolbar.cxx
-@@ -0,0 +1,607 @@
-+#include <svx/mstoolbar.hxx>
-+#include <rtl/ustrbuf.hxx>
-+#include <stdarg.h>
-+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-+#include <com/sun/star/ui/XImageManager.hpp>
-+#include <com/sun/star/ui/ItemType.hpp>
-+#include <fstream>
-+#include <vcl/graph.hxx>
-+#include <vcl/bitmapex.hxx>
-+#include <map>
-+
-+int TBBase::nIndent = 0;
-+
-+using namespace com::sun::star;
-+void CustomToolBarImportHelper::applyIcons()
-+{
-+    for ( std::vector< iconcontrolitem >::iterator it = iconcommands.begin(); it != iconcommands.end(); ++it )
-+    {
-+        uno::Sequence< rtl::OUString > commands(1);
-+        commands[ 0 ] = it->sCommand;
-+        uno::Sequence< uno::Reference< graphic::XGraphic > > images(1);
-+        images[ 0 ] = it->image;
-+
-+        uno::Reference< ui::XImageManager > xImageManager( getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
-+        // 1 seems to work best for MSO images, otherwise they don't get displayed ( I guess the default size
-+        // in ooo is different )
-+        xImageManager->insertImages( 1,  commands, images );
-+    }
-+}
-+
-+void CustomToolBarImportHelper::addIcon( const uno::Reference< graphic::XGraphic >& xImage, const rtl::OUString& sString )
-+{
-+    iconcontrolitem item;
-+    item.sCommand = sString;
-+    item.image = xImage;
-+    iconcommands.push_back( item );
-+}
-+
-+CustomToolBarImportHelper::CustomToolBarImportHelper( const uno::Reference< frame::XModel >& rxModel,  const css::uno::Reference< css::ui::XUIConfigurationManager>& rxAppCfgMgr )
-+{
-+    m_xCfgSupp.set( rxModel, uno::UNO_QUERY_THROW );
-+    m_xAppCfgMgr.set( rxAppCfgMgr, uno::UNO_QUERY_THROW );
-+}
-+
-+uno::Reference< ui::XUIConfigurationManager > 
-+CustomToolBarImportHelper::getCfgManager()
-+{
-+    return m_xCfgSupp->getUIConfigurationManager();
-+}
-+
-+uno::Reference< ui::XUIConfigurationManager > 
-+CustomToolBarImportHelper::getAppCfgManager()
-+{
-+    return m_xAppCfgMgr;
-+}
-+
-+uno::Any 
-+CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd )
-+{
-+//"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"    
-+    static rtl::OUString part1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
-+    static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document");
-+    // create script url
-+    rtl::OUString scriptURL = part1 + sCmd + part2;
-+    return uno::makeAny( scriptURL );
-+}
-+
-+rtl::OUString CustomToolBarImportHelper::MSOCommandToOOCommand( sal_Int16 msoCmd )
-+{
-+    rtl::OUString result;
-+    if ( pMSOCmdConvertor.get() )
-+        result = pMSOCmdConvertor->MSOCommandToOOCommand( msoCmd );
-+    return result;
-+}
-+
-+rtl::OUString CustomToolBarImportHelper::MSOTCIDToOOCommand( sal_Int16 msoTCID )
-+{
-+    rtl::OUString result;
-+    if ( pMSOCmdConvertor.get() )
-+        result = pMSOCmdConvertor->MSOTCIDToOOCommand( msoTCID );
-+    return result;
-+}
-+
-+void
-+TBBase::indent_printf( FILE* fp, const char* format, ... )
-+{
-+   va_list ap;
-+   va_start ( ap, format );
-+
-+   // indent nIndent spaces
-+   for ( int i=0; i<nIndent; ++i)
-+      fprintf(fp," ");
-+   // append the rest of the message
-+   vfprintf( fp, format, ap );
-+   va_end( ap );
-+}
-+
-+rtl::OUString TBBase::readUnicodeString( SvStream* pS, sal_Int32 nChars )
-+{
-+    rtl::OUStringBuffer buf(40);
-+    for ( sal_Int32 index = 0; index < nChars; ++index )
-+    {
-+        sal_uInt16 ch = 0;
-+        *pS >> ch;
-+        sal_Unicode uni = static_cast< sal_Unicode >( ch );
-+        buf.append( &uni, 1 );
-+    }
-+    return buf.makeStringAndClear();
-+}
-+
-+TBCHeader::TBCHeader() : bSignature( 0x3 )
-+,bVersion( 0x01 )
-+,bFlagsTCR( 0 )
-+,tct(0x1) // default to Button
-+,tcid(0)
-+,tbct(0)
-+{
-+}
-+
-+
-+TBCHeader::~TBCHeader()
-+{
-+}
-+
-+bool TBCHeader::Read( SvStream* pS )
-+{
-+    OSL_TRACE("TBCHeader::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> bSignature >> bVersion >> bFlagsTCR >> tct >> tcid >> tbct >> bPriority;
-+    //  bit 4 ( from lsb ) 
-+    if ( bFlagsTCR & 0x10 )
-+    {
-+        width.reset( new sal_uInt16 );
-+        height.reset( new sal_uInt16 );
-+        *pS >> *width >> *height;
-+    }
-+    return true;
-+}
-+
-+void TBCHeader::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp,"[ 0x%x ] TBCHeader -- dump\n", nOffSet );
-+    indent_printf(fp,"  bSignature 0x%xn", bSignature );
-+    indent_printf(fp,"  bVersion 0x%x\n", bVersion );
-+    indent_printf(fp,"  bFlagsTCR 0x%x\n", bFlagsTCR );
-+    indent_printf(fp,"  tct 0x%x\n", tct );
-+    indent_printf(fp,"  tcid 0x%x\n", tcid );
-+    indent_printf(fp,"  tbct 0x%x\n", static_cast< unsigned int >( tbct ));
-+    indent_printf(fp,"  bPriority 0x%x\n", bPriority );
-+    if ( width.get() )
-+        indent_printf(fp,"  width 0x%d(0x%x)\n", *width, *width);
-+    if ( height.get() )
-+        indent_printf(fp,"  height 0x%d(0x%x)\n", *height, *height);
-+}
-+
-+TBCData::TBCData( const TBCHeader& Header ) : rHeader( Header )
-+{
-+}
-+
-+bool TBCData::Read(SvStream *pS)
-+{
-+    OSL_TRACE("TBCData::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    if ( !controlGeneralInfo.Read(pS) /*|| !controlSpecificInfo.Read(pS)*/ )
-+        return false;
-+    switch ( rHeader.getTct() )
-+    {
-+        case 0x01: // (Button control)
-+        case 0x10: // (ExpandingGrid control)
-+            controlSpecificInfo.reset( new TBCBSpecific() );
-+            break;
-+        case 0x0A: // (Popup control)
-+        case 0x0C: // (ButtonPopup control)
-+        case 0x0D: // (SplitButtonPopup control)
-+        case 0x0E: // (SplitButtonMRUPopup control)
-+            controlSpecificInfo.reset( new TBCMenuSpecific() );
-+            break;
-+        case 0x02: // (Edit control)
-+        case 0x04: // (ComboBox control)
-+        case 0x14: // (GraphicCombo control)
-+        case 0x03: // (DropDown control)
-+        case 0x06: // (SplitDropDown control)
-+        case 0x09: // (GraphicDropDown control)
-+            controlSpecificInfo.reset( new TBCComboDropdownSpecific( rHeader ) );
-+            break;
-+        default:
-+            break;
-+    }
-+    if ( controlSpecificInfo.get() )
-+        return controlSpecificInfo->Read( pS );
-+    return true;
-+
-+    OSL_TRACE("#FIXME I need to be able to handle different controlSpecificInfo types.");
-+    return false;
-+}
-+
-+bool TBCData::ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >& /*toolbarcontainer*/, CustomToolBarImportHelper& helper, std::vector< css::beans::PropertyValue >& props )
-+{
-+    controlGeneralInfo.ImportToolBarControlData( props );
-+    beans::PropertyValue aProp;
-+    aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ;
-+    aProp.Value = uno::makeAny( rHeader.isVisible() ); // where is the visible attribute stored
-+
-+    if ( rHeader.getTct() == 0x01
-+    || rHeader.getTct() == 0x10 )
-+    {
-+        TBCBSpecific* pSpecificInfo = dynamic_cast< TBCBSpecific* >( controlSpecificInfo.get() );
-+        if ( pSpecificInfo )
-+        {
-+            // if we have a icon then lets  set it for the command ( but I
-+            // have a nasty suspicion the toolbar actually needs to be set
-+            // up ( and added ) before you can asssign an image :-/
-+            rtl::OUString sCommand;
-+            for ( std::vector< css::beans::PropertyValue >::iterator it = props.begin(); it != props.end(); ++it )
-+            {
-+                if ( it->Name.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") ) ) )
-+                    it->Value >>= sCommand;
-+            }
-+            if ( TBCBitMap* pIcon = pSpecificInfo->getIcon() )
-+            {
-+           
-+                BitmapEx aBitEx( pIcon->getBitMap() );
-+                if ( pSpecificInfo->getIconMask() )
-+                     // according to the spec:
-+                     // "the iconMask is white in all the areas in which the icon is
-+                     // displayed as transparent and is black in all other areas."
-+                     aBitEx = BitmapEx( aBitEx.GetBitmap(), pSpecificInfo->getIconMask()->getBitMap().CreateMask( Color( COL_WHITE ) ) );
-+
-+                Graphic aGraphic( aBitEx );
-+                helper.addIcon( aGraphic.GetXGraphic(), sCommand );
-+            }
-+            else if ( pSpecificInfo->getBtnFace() )
-+            {
-+               
-+                rtl::OUString sBuiltInCmd = helper.MSOTCIDToOOCommand(  *pSpecificInfo->getBtnFace() );
-+                if ( sBuiltInCmd.getLength() )
-+                {
-+                    uno::Sequence< rtl::OUString> sCmds(1);
-+                    sCmds[ 0 ] = sBuiltInCmd;
-+                    uno::Reference< ui::XImageManager > xImageManager( helper.getAppCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
-+                    // 0 = default image size
-+                    uno::Sequence< uno::Reference< graphic::XGraphic > > sImages = xImageManager->getImages( 0, sCmds );
-+                    if ( sImages.getLength() && sImages[0].is() )
-+                        helper.addIcon( sImages[0], sCommand );
-+                }
-+            }
-+        }
-+    }
-+    return true; // just ignore
-+}
-+
-+void TBCData::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp,"[ 0x%x ] TBCData -- dump\n", nOffSet );
-+    indent_printf(fp,"  dumping controlGeneralInfo( TBCGeneralInfo )\n");
-+    controlGeneralInfo.Print( fp );
-+    if ( rHeader.getTct() == 1 )
-+    {
-+        indent_printf(fp,"  dumping controlSpecificInfo( TBCBSpecificInfo )\n");
-+        controlSpecificInfo->Print( fp );
-+    }
-+}
-+
-+bool
-+WString::Read( SvStream *pS )
-+{
-+    OSL_TRACE("WString::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    sal_Int8 nChars = 0;
-+    *pS >> nChars;
-+    sString = readUnicodeString( pS, static_cast< sal_Int32 >( nChars  ) );
-+    return true;
-+}
-+
-+TBCExtraInfo::TBCExtraInfo() : idHelpContext( 0 )
-+{
-+}
-+
-+bool
-+TBCExtraInfo::Read( SvStream *pS )
-+{
-+    OSL_TRACE("TBCExtraInfo::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    if( !wstrHelpFile.Read( pS )  )
-+        return false;
-+
-+    *pS >> idHelpContext;
-+
-+    if ( !wstrTag.Read( pS ) || !wstrOnAction.Read( pS ) || !wstrParam.Read( pS ) )
-+        return false;
-+
-+    *pS >> tbcu >> tbmg;    
-+    return true;
-+}
-+
-+void
-+TBCExtraInfo::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] TBCExtraInfo -- dump\n", nOffSet );
-+    indent_printf( fp, "  wstrHelpFile %s\n", 
-+        rtl::OUStringToOString( wstrHelpFile.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+    indent_printf( fp, "  idHelpContext 0x%x\n", static_cast< unsigned int >( idHelpContext ) );
-+    indent_printf( fp, "  wstrTag %s\n", 
-+        rtl::OUStringToOString( wstrTag.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+    indent_printf( fp, "  wstrOnAction %s\n", 
-+        rtl::OUStringToOString( wstrOnAction.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+    indent_printf( fp, "  wstrParam %s\n", 
-+        rtl::OUStringToOString( wstrParam.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+    indent_printf( fp, "  tbcu 0x%x\n", tbcu );
-+    indent_printf( fp, "  tbmg 0x%x\n", tbmg );
-+    
-+}
-+
-+rtl::OUString
-+TBCExtraInfo::getOnAction()
-+{
-+    return wstrOnAction.getString();
-+}
-+
-+TBCGeneralInfo::TBCGeneralInfo() : bFlags( 0 )
-+{
-+}
-+
-+bool TBCGeneralInfo::Read( SvStream *pS )
-+{
-+    OSL_TRACE("TBCGeneralInfo::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> bFlags;
-+
-+    if ( ( bFlags & 0x1 ) && !customText.Read( pS ) )
-+        return false;
-+    if ( ( bFlags & 0x2 ) && ( !descriptionText.Read( pS ) ||  !tooltip.Read( pS ) ) )
-+        return false;
-+    if ( ( bFlags & 0x4 ) && !extraInfo.Read( pS ) )
-+        return false;
-+    return true;
-+}
-+
-+void 
-+TBCGeneralInfo::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] TBCGeneralInfo -- dump\n", nOffSet );
-+    indent_printf( fp, "  bFlags 0x%x\n", bFlags );
-+    indent_printf( fp, "  customText %s\n", 
-+        rtl::OUStringToOString( customText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+    indent_printf( fp, "  description %s\n", 
-+        rtl::OUStringToOString( descriptionText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+    indent_printf( fp, "  tooltip %s\n", 
-+        rtl::OUStringToOString( tooltip.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+    if ( bFlags & 0x4 ) 
-+        extraInfo.Print( fp );
-+}
-+
-+bool 
-+TBCGeneralInfo::ImportToolBarControlData( std::vector< beans::PropertyValue >& sControlData )
-+{
-+    if ( ( bFlags & 0x5 ) )
-+    {
-+        beans::PropertyValue aProp;
-+        // probably access to the header would be a better test than seeing if there is an action, e.g.
-+        // if ( rHeader.getTct() == 0x01 && rHeader.getTcID() == 0x01 ) // not defined, probably this is a command
-+        if ( extraInfo.getOnAction().getLength() )
-+        {
-+            aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
-+            aProp.Value = CustomToolBarImportHelper::createCommandFromMacro( extraInfo.getOnAction() );
-+            sControlData.push_back( aProp );
-+        }
-+
-+        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Label") );
-+        aProp.Value = uno::makeAny( customText.getString() );
-+        sControlData.push_back( aProp );
-+
-+        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") );
-+        aProp.Value = uno::makeAny( ui::ItemType::DEFAULT ); 
-+        sControlData.push_back( aProp );
-+
-+        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HelpURL") );
-+        aProp.Value = uno::makeAny( CustomToolBarImportHelper::createCommandFromMacro( tooltip.getString() ) ); 
-+        sControlData.push_back( aProp );
-+
-+        // #TODO find out what is the property for tooltip?
-+        sControlData.push_back( aProp );
-+/*
-+aToolbarItem(0).Name = "CommandURL" wstrOnAction
-+aToolbarItem(0).Value = Command
-+aToolbarItem(1).Name = "Label"      customText
-+aToolbarItem(1).Value = Label
-+aToolbarItem(2).Name = "Type"
-+aToolbarItem(2).Value = 0
-+aToolbarItem(3).Name = "Visible"
-+aToolbarItem(3).Value = true        
-+*/
-+    }
-+    return true;
-+}
-+
-+TBCMenuSpecific::TBCMenuSpecific() : tbid( 0 )
-+{
-+}
-+
-+bool
-+TBCMenuSpecific::Read( SvStream *pS)
-+{
-+    OSL_TRACE("TBCMenuSpecific::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> tbid;
-+    if ( tbid == 1 ) 
-+    {
-+        name.reset( new WString() );
-+        return name->Read( pS );
-+    }
-+    return true;
-+}
-+
-+void 
-+TBCMenuSpecific::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] TBCMenuSpecific -- dump\n", nOffSet );
-+    indent_printf( fp, "  tbid 0x%x\n", static_cast< unsigned int >( tbid ) );
-+    if ( tbid == 1 )
-+        indent_printf( fp, "  name %s", rtl::OUStringToOString( name->getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-+}
-+
-+TBCBSpecific::TBCBSpecific() : bFlags( 0 )
-+{
-+}
-+
-+bool TBCBSpecific::Read( SvStream *pS)
-+{
-+    OSL_TRACE("TBCBSpecific::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> bFlags;
-+
-+    // bFlags determines what we read next
-+
-+    // bFlags.fCustomBitmap = 1 ( 0x8 ) set 
-+    if ( bFlags & 0x8 )
-+    {
-+        icon.reset( new TBCBitMap() );
-+        iconMask.reset( new TBCBitMap() );
-+        if ( !icon->Read( pS ) || !iconMask->Read( pS ) )
-+            return false;
-+    }
-+    // if bFlags.fCustomBtnFace = 1 ( 0x10 )
-+    if ( bFlags & 0x10 )
-+    {
-+        iBtnFace.reset( new sal_uInt16 );
-+        *pS >> *iBtnFace.get();
-+    }
-+    // if bFlags.fAccelerator equals 1 ( 0x04 )
-+    if ( bFlags & 0x04 )
-+    {
-+        wstrAcc.reset( new WString() );
-+        return wstrAcc->Read( pS );
-+    }
-+    return true;
-+}
-+
-+
-+void TBCBSpecific::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] TBCBSpecific -- dump\n", nOffSet );
-+    indent_printf( fp, "  bFlags 0x%x\n", bFlags );
-+    bool bResult = ( icon.get() != NULL );
-+    indent_printf( fp, "  icon present? %s\n", bResult ? "true" : "false" );
-+    if ( bResult )
-+    {
-+        Indent b;
-+        indent_printf( fp, "  icon: \n");
-+        icon->Print( fp ); // will dump size
-+    }
-+    bResult = ( iconMask.get() != NULL );
-+    indent_printf( fp, "  icon mask present? %s\n", bResult ? "true" : "false" );
-+    if ( bResult )
-+    {
-+        Indent c;
-+        indent_printf( fp, "  icon mask: \n");
-+        iconMask->Print( fp ); // will dump size
-+    }
-+    if ( iBtnFace.get() )
-+    {
-+        indent_printf( fp, "  iBtnFace 0x%x\n", *(iBtnFace.get()) );
-+    }
-+    bResult = ( wstrAcc.get() != NULL );
-+    indent_printf( fp, "  option string present? %s ->%s<-\n", bResult ? "true" : "false", bResult ? rtl::OUStringToOString( wstrAcc->getString(), RTL_TEXTENCODING_UTF8 ).getStr() : "N/A" );
-+}
-+
-+TBCBitMap* 
-+TBCBSpecific::getIcon()
-+{
-+    return icon.get();
-+}
-+
-+TBCBitMap* 
-+TBCBSpecific::getIconMask()
-+{
-+    return iconMask.get();
-+}
-+
-+TBCComboDropdownSpecific::TBCComboDropdownSpecific(const TBCHeader& header ) 
-+{
-+    if ( header.getTcID() == 0x01 )
-+        data.reset( new TBCCDData() );
-+}
-+
-+bool TBCComboDropdownSpecific::Read( SvStream *pS)
-+{
-+    nOffSet = pS->Tell();
-+    if ( data.get() )
-+        return data->Read( pS );
-+    return true;
-+}
-+
-+void TBCComboDropdownSpecific::Print( FILE* fp)
-+{
-+    Indent a;
-+    indent_printf(fp,"[ 0x%x ] TBCComboDropdownSpecific -- dump\n", nOffSet );
-+    if ( data.get() )
-+        data->Print( fp );
-+    else
-+        indent_printf(fp," no data " );
-+}
-+
-+TBCCDData::TBCCDData() : cwstrItems( 0 )
-+,iSel( 0 )
-+,cLines( 0 )
-+,dxWidth( 0 )
-+{
-+}
-+
-+TBCCDData::~TBCCDData()
-+{
-+}
-+
-+bool TBCCDData::Read( SvStream *pS)
-+{
-+    nOffSet = pS->Tell();
-+    *pS >> cwstrItems;
-+    if ( cwstrItems )
-+    {
-+        for( sal_Int32 index=0; index < cwstrItems; ++index )
-+        {
-+            WString aString;
-+            if ( !aString.Read( pS ) )
-+                return false;
-+            wstrList.push_back( aString );
-+        } 
-+    }
-+    *pS >> cwstrMRU >> iSel >> cLines >> dxWidth;
-+
-+    return wstrEdit.Read( pS );
-+}
-+
-+void TBCCDData::Print( FILE* fp)
-+{
-+    Indent a;
-+    indent_printf(fp,"[ 0x%x ] TBCCDData -- dump\n", nOffSet );
-+    indent_printf(fp,"  cwstrItems items in wstrList 0x%d\n", cwstrItems);
-+    for ( sal_Int32 index=0; index < cwstrItems; ++index )
-+    {
-+        Indent b;
-+        indent_printf(fp, "  wstrList[%d] %s", static_cast< int >( index ), rtl::OUStringToOString( wstrList[index].getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+    }
-+    indent_printf(fp,"  cwstrMRU num most recently used string 0x%d item\n", cwstrMRU);
-+    indent_printf(fp,"  iSel index of selected item 0x%d item\n", iSel);
-+    indent_printf(fp,"  cLines num of suggested lines to display 0x%d", cLines);
-+    indent_printf(fp,"  dxWidth width in pixels 0x%d", dxWidth);
-+    indent_printf(fp,"  wstrEdit %s", rtl::OUStringToOString( wstrEdit.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+}
-+
-+TBCBitMap::TBCBitMap() : cbDIB( 0 ), size( 0 )
-+{
-+}
-+
-+TBCBitMap::~TBCBitMap()
-+{
-+}
-+
-+// #FIXME Const-ness
-+Bitmap& 
-+TBCBitMap::getBitMap()
-+{
-+    return mBitMap;
-+}
-+
-+bool TBCBitMap::Read( SvStream* pS)
-+{
-+    OSL_TRACE("TBCBitMap::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> cbDIB;
-+    // cbDIB = sizeOf(biHeader) + sizeOf(colors) + sizeOf(bitmapData) + 10
-+    return mBitMap.Read( *pS, FALSE, TRUE );
-+}
-+
-+void TBCBitMap::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp, "[ 0x%x ] TBCBitMap -- dump\n", nOffSet );
-+    indent_printf(fp, "  TBCBitMap size of bitmap data 0x%x\n", static_cast< unsigned int > ( cbDIB ) );
-+}
-diff --git sw/source/filter/ww8/makefile.mk sw/source/filter/ww8/makefile.mk
-index 68f641d..324d18d 100644
---- sw/source/filter/ww8/makefile.mk
-+++ sw/source/filter/ww8/makefile.mk
-@@ -69,7 +69,8 @@ EXCEPTIONSFILES = \
- 		$(SLO)$/writerwordglue.obj \
-         $(SLO)$/ww8scan.obj \
-         $(SLO)$/WW8TableInfo.obj \
--        $(SLO)$/WW8FFData.obj
-+        $(SLO)$/WW8FFData.obj \
-+        $(SLO)$/ww8toolbar.obj \
- 
- 
- SLOFILES =	\
-@@ -96,7 +97,9 @@ SLOFILES =	\
- 		$(SLO)$/writerhelper.obj \
- 		$(SLO)$/writerwordglue.obj \
-         $(SLO)$/WW8TableInfo.obj \
--        $(SLO)$/WW8FFData.obj
-+        $(SLO)$/WW8FFData.obj \
-+        $(SLO)$/ww8toolbar.obj \
-+
- 
- 
- # --- Tagets -------------------------------------------------------
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index e1c2fe5..290ffda 100644
---- sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -132,7 +132,7 @@
- #include <svtools/itemiter.hxx>  //SfxItemIter
- 
- #include <stdio.h>
--
-+#include "ww8toolbar.hxx"
- #ifdef DEBUG
- #include <iostream>
- #include <dbgoutsw.hxx>
-@@ -3988,6 +3988,21 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
-             eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE;
-         if (pStg && !pGloss) /*meaningless for a glossary, cmc*/
-         {
-+            // Read custom toolbars 
-+            if ( pWwFib->lcbCmds )
-+            {
-+                // there is a tgc255 structure
-+                long nCur = pTableStream->Tell();
-+                Tcg aTCG;
-+                pTableStream->Seek( pWwFib->fcCmds ); // point at tgc record
-+                if (!aTCG.Read( pTableStream ) )
-+                    OSL_TRACE("** Read of Customization data failed!!!! ");
-+                pTableStream->Seek( nCur ); // return to previous position, is that necessary?
-+#if DEBUG
-+                aTCG.Print( stderr );
-+#endif
-+                aTCG.ImportCustomToolBar( mpDocShell->GetModel() );
-+            }
-             const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
-             maTracer.EnterEnvironment(sw::log::eMacros);
-             SvxImportMSVBasic aVBasic(*mpDocShell, *pStg,
-diff --git sw/source/filter/ww8/ww8toolbar.cxx sw/source/filter/ww8/ww8toolbar.cxx
-new file mode 100644
-index 0000000..ac10d7a
---- /dev/null
-+++ sw/source/filter/ww8/ww8toolbar.cxx
-@@ -0,0 +1,1050 @@
-+#include "ww8toolbar.hxx"
-+#include <rtl/ustrbuf.hxx>
-+#include <stdarg.h>
-+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
-+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#include <com/sun/star/ui/XImageManager.hpp>
-+#include <com/sun/star/ui/ItemType.hpp>
-+#include <fstream>
-+#include <comphelper/processfactory.hxx>
-+#include <vcl/graph.hxx>
-+#include <map>
-+using namespace com::sun::star;
-+
-+typedef std::map< sal_Int16, rtl::OUString > IdToString;
-+
-+class MSOWordCommandConvertor : public MSOCommandConvertor
-+{
-+   IdToString msoToOOcmd;
-+   IdToString tcidToOOcmd;
-+public:
-+    MSOWordCommandConvertor();
-+    virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
-+    virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 key );
-+};
-+
-+MSOWordCommandConvertor::MSOWordCommandConvertor()
-+{
-+    // mso command id to ooo command string
-+    // #FIXME and *HUNDREDS* of id's to added here
-+    msoToOOcmd[ 0x20b ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc") );
-+    msoToOOcmd[ 0x50 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Open") );
-+
-+   // mso tcid to ooo command string
-+    // #FIXME and *HUNDREDS* of id's to added here
-+   tcidToOOcmd[ 0x9d9 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Print") );
-+}
-+
-+rtl::OUString MSOWordCommandConvertor::MSOCommandToOOCommand( sal_Int16 key )
-+{
-+    rtl::OUString sResult;
-+    IdToString::iterator it = msoToOOcmd.find( key );
-+    if ( it != msoToOOcmd.end() )
-+        sResult = it->second;
-+    return sResult;
-+}
-+
-+rtl::OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key )
-+{
-+    rtl::OUString sResult;
-+    IdToString::iterator it = tcidToOOcmd.find( key );
-+    if ( it != tcidToOOcmd.end() )
-+        sResult = it->second;
-+    return sResult;
-+}
-+
-+
-+CTBWrapper::CTBWrapper( bool bReadId ) : Tcg255SubStruct( bReadId )
-+,reserved2(0)
-+,reserved3(0)
-+,reserved4(0)
-+,reserved5(0)
-+,cbTBD(0)
-+,cCust(0)
-+,cbDTBC(0)
-+,rtbdc(0)
-+{
-+}
-+
-+CTBWrapper::~CTBWrapper()
-+{
-+}
-+
-+bool CTBWrapper::Read( SvStream* pS )
-+{
-+    OSL_TRACE("CTBWrapper::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    Tcg255SubStruct::Read( pS );
-+    *pS >> reserved2 >> reserved3 >> reserved4 >> reserved5;
-+    *pS >> cbTBD >> cCust >> cbDTBC;
-+    if ( cbDTBC )
-+    {
-+        // cbDTBC is the size in bytes of the TBC array
-+        // but the size of a TBC element is dynamic ( and this relates to TBDelta's
-+        // which we don't read right now )
-+        //pS->SeekRel( cbDTBC );
-+        int nStart = pS->Tell();
-+
-+        int bytesRead = 0;
-+        int bytesToRead = cbDTBC - bytesRead; 
-+        // cbDTBC specifies the size ( in bytes ) taken by an array ( of unspecified size )
-+        // of TBC records ( TBC records have dynamic length, so we need to check our position
-+        // after each read )
-+        do
-+        {
-+            TBC aTBC;
-+            if ( !aTBC.Read( pS ) )
-+                return false;
-+            rtbdc.push_back( aTBC );
-+            bytesToRead = cbDTBC - ( pS->Tell() - nStart ); 
-+        } while ( bytesToRead > 0 );
-+    }
-+    if ( cCust )
-+    {
-+        for ( sal_Int32 index = 0; index < cCust; ++index )
-+        {
-+            Customization aCust;
-+            if ( !aCust.Read( pS ) )
-+                return false;
-+            rCustomizations.push_back( aCust );
-+        } 
-+    } 
-+    return true;
-+}
-+
-+void CTBWrapper::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp,"[ 0x%x ] CTBWrapper - dump\n", nOffSet );
-+    bool bRes = ( ch == 0x12 && reserved2 == 0x0 && reserved3 == 0x7 && reserved4 == 0x6 && reserved5 == 0xC );
-+    if ( bRes )
-+        indent_printf(fp,"  sanity check ( first 8 bytes conform )\n");
-+    else 
-+    {
-+        indent_printf(fp,"    reserved1(0x%x)\n",ch);
-+        indent_printf(fp,"    reserved2(0x%x)\n",reserved2);
-+        indent_printf(fp,"    reserved3(0x%x)\n",reserved3);
-+        indent_printf(fp,"    reserved4(0x%x)\n",reserved4);
-+        indent_printf(fp,"    reserved5(0x%x)\n",reserved5);
-+        indent_printf(fp,"Quiting dump");
-+        return;
-+    }
-+    indent_printf(fp,"  size of TBDelta structures 0x%x\n", cbTBD );
-+    indent_printf(fp,"  cCust: no. of cCust structures 0x%x\n",cCust);
-+    indent_printf(fp,"  cbDTBC: no. of bytes in rtbdc array 0x%x\n", static_cast< unsigned int >( cbDTBC ));
-+
-+    sal_Int32 index = 0;
-+
-+    for ( std::vector< TBC >::iterator it = rtbdc.begin(); it != rtbdc.end(); ++it, ++index )
-+    {
-+        indent_printf(fp,"  Dumping rtbdc[%d]\n", static_cast< int >( index ));
-+        Indent b;
-+        it->Print( fp );
-+    }
-+
-+    index = 0;
-+
-+    for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it, ++index )
-+    {
-+        indent_printf(fp,"  Dumping custimization [%d]\n", static_cast< int >( index ));
-+        Indent c;
-+        it->Print(fp);
-+    }
-+}
-+
-+bool CTBWrapper::ImportCustomToolBar( const uno::Reference< css::frame::XModel >& rxModel )
-+{
-+    
-+    for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it )
-+    {
-+        uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+        uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xAppCfgSupp( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) ) ), uno::UNO_QUERY_THROW ); 
-+        CustomToolBarImportHelper helper( rxModel, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) );
-+        helper.setMSOCommandMap( new  MSOWordCommandConvertor() );
-+        if ( !(*it).ImportCustomToolBar( helper ) )
-+            return false;
-+    }
-+    return false;
-+}
-+
-+Customization::Customization() : tbidForTBD( 0 )
-+,reserved1( 0 )
-+, ctbds( 0 )
-+{
-+}
-+
-+Customization::~Customization()
-+{
-+}
-+
-+bool Customization::Read( SvStream *pS)
-+{
-+    OSL_TRACE("Custimization::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> tbidForTBD >> reserved1 >> ctbds;
-+    if ( tbidForTBD && ctbds )
-+    {
-+        TBDelta aTBDelta;
-+        for ( sal_Int32 index = 0; index < ctbds; ++index )
-+        {
-+            if (!aTBDelta.Read( pS ) )
-+                return false;
-+            customizationDataTBDelta.push_back( aTBDelta );
-+        }
-+    }
-+    else
-+    {
-+        customizationDataCTB.reset( new CTB() );
-+        if ( !customizationDataCTB->Read( pS ) )
-+                return false;
-+    }
-+    return true;
-+}
-+
-+void Customization::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp,"[ 0x%x ] Customization -- dump \n", nOffSet );
-+    indent_printf( fp,"  tbidForTBD 0x%x ( should be 0 for CTBs )\n", static_cast< unsigned int >( tbidForTBD ));
-+    indent_printf( fp,"  reserved1 0x%x \n", reserved1);
-+    indent_printf( fp,"  ctbds - number of customisations %d(0x%x) \n", ctbds, ctbds );
-+    if ( !tbidForTBD && !ctbds )
-+        customizationDataCTB->Print( fp );
-+    else
-+    {
-+        std::vector< TBDelta >::iterator it = customizationDataTBDelta.begin();
-+        for ( sal_Int32 index = 0; index < ctbds; ++it,++index )
-+            it->Print( fp );
-+    }
-+    
-+}
-+
-+bool Customization::ImportCustomToolBar( CustomToolBarImportHelper& helper )
-+{
-+    if ( !customizationDataCTB.get() )
-+        return false;
-+    return customizationDataCTB->ImportCustomToolBar( helper );
-+}
-+
-+TBDelta::TBDelta() : doprfatendFlags(0)
-+,ibts(0)
-+,cidNext(0)
-+,cid(0)
-+,fc(0)
-+,cbTBC(0)
-+{
-+}
-+
-+bool TBDelta::Read(SvStream *pS)
-+{
-+    OSL_TRACE("TBDelta::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> doprfatendFlags >> ibts >> cidNext >> cid >> fc ;
-+    *pS >> CiTBDE >> cbTBC;
-+    return true;
-+}
-+
-+void TBDelta::Print( FILE* fp )
-+{
-+    // Like most of the debug output, it's raw and little ( no )
-+    // interpretation of the data is output ( e.g. flag values etc. )
-+    indent_printf( fp, "[ 0x%x ] TBDelta -- dump\n", nOffSet );
-+    indent_printf( fp, " doprfatendFlags 0x%x\n",doprfatendFlags );
-+    
-+    indent_printf( fp, " ibts 0x%x\n",ibts );
-+    indent_printf( fp, " cidNext 0x%x\n", static_cast< unsigned int >( cidNext ) );
-+    indent_printf( fp, " cid 0x%x\n", static_cast< unsigned int >( cid ) );
-+    indent_printf( fp, " fc 0x%x\n", static_cast< unsigned int >( fc ) );
-+    indent_printf( fp, " CiTBDE 0x%x\n",CiTBDE );
-+    indent_printf( fp, " cbTBC 0x%x\n", cbTBC );
-+}
-+
-+CTB::CTB() : cbTBData( 0 )
-+,iWCTBl( 0 )
-+,reserved( 0 )
-+,unused( 0 )
-+,cCtls( 0 )
-+{
-+}
-+
-+CTB::~CTB()
-+{
-+}
-+
-+bool CTB::Read( SvStream *pS)
-+{
-+    OSL_TRACE("CTB::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    if ( !name.Read( pS ) )
-+        return false;
-+    *pS >> cbTBData;
-+    // sal_Int32 nTBSize = cbTBData - sizeof(rVisualData) - 12;
-+    if ( !tb.Read( pS ) )
-+        return false;
-+    pS->Read( &rVisualData, sizeof( rVisualData ) );
-+
-+    *pS >> iWCTBl >> reserved >> unused >> cCtls;
-+    
-+    if ( cCtls )
-+    {
-+        for ( sal_Int32 index = 0; index < cCtls; ++index )
-+        {
-+            TBC aTBC;
-+            if ( !aTBC.Read( pS ) )
-+                return false;
-+            rTBC.push_back( aTBC );
-+        }
-+    }
-+    return true;
-+}
-+
-+void
-+CTB::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp, "[ 0x%x ] CTB - dump\n", nOffSet );
-+    indent_printf(fp, "  name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+    indent_printf(fp, "  cbTBData size, in bytes, of this structure excluding the name, cCtls, and rTBC fields.  %x\n", static_cast< unsigned int >( cbTBData ) );
-+    
-+    tb.Print(fp);
-+    indent_printf(fp, "  iWCTBl 0x%x reserved 0x%x unused 0x%x cCtls( toolbar controls ) 0x%x \n", static_cast< unsigned int >( iWCTBl ), reserved, unused, static_cast< unsigned int >( cCtls ) );
-+    if ( cCtls )
-+    {
-+        for ( sal_Int32 index = 0; index < cCtls; ++index )
-+        {
-+        
-+            indent_printf(fp, "  dumping toolbar control 0x%x\n", static_cast< unsigned int >( index ) );
-+            rTBC[ index ].Print( fp );
-+        }
-+    }
-+}
-+
-+bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
-+{
-+    static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) );
-+    
-+    // Create default setting
-+    uno::Reference< container::XIndexContainer > xIndexContainer( helper.getCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
-+    uno::Reference< container::XIndexAccess > xIndexAccess( xIndexContainer, uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); 
-+
-+    // set UI name for toolbar
-+    xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( name.getString() ) ); 
-+
-+    rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() );
-+
-+    for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
-+    {
-+        // createToolBar item for control
-+        if ( !it->ImportToolBarControl( xIndexContainer, helper ) )
-+            return false;
-+    }
-+
-+    OSL_TRACE("Name of toolbar :-/ %s", rtl::OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-+    helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess );
-+    helper.applyIcons();
-+
-+    uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
-+    xPersistence->store();
-+
-+    xPersistence.set( helper.getCfgManager(), uno::UNO_QUERY_THROW );
-+    xPersistence->store();
-+    
-+    return true;
-+}
-+
-+TB::TB() : bSignature( 0 )
-+,bVersion( 0 )
-+,cCL( 0 )
-+,ltbid( 0 )
-+,ltbtr( 0 )
-+,cRowsDefault( 0 )
-+,bFlags( 0 )
-+{
-+}
-+
-+bool TB::Read( SvStream* pS )
-+{
-+    OSL_TRACE("TB::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> bSignature >> bVersion >> cCL >> ltbid >> ltbtr >> cRowsDefault >> bFlags;
-+    return name.Read( pS );
-+}
-+
-+void TB::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] TB -- dump\n", nOffSet );
-+    indent_printf( fp, "  bSignature (0x%x), bVersion(0x%x), cCL(0x%x), ltbid(0x%x), cRowsDefault (0x%x), ltbtr(0x%x), bFlags(0x%x)\n", bSignature, bVersion, cCL, static_cast< unsigned int >( ltbid ), static_cast< unsigned int >( ltbtr ), cRowsDefault, bFlags );
-+    indent_printf( fp, "  name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-+}
-+
-+TBC::TBC()
-+{
-+}
-+
-+TBC::~TBC()
-+{
-+}
-+
-+bool TBC::Read( SvStream *pS )
-+{
-+    OSL_TRACE("TBC::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    if ( !tbch.Read( pS ) )
-+        return false;
-+    if ( tbch.getTcID() != 0x1 && tbch.getTcID() != 0x1051 )
-+    {
-+        cid.reset( new sal_uInt32 );
-+        *pS >> *cid;
-+    }
-+    // MUST exist if tbch.tct is not equal to 0x16
-+    if ( tbch.getTct() != 0x16 )
-+    {
-+        tbcd.reset(  new TBCData( tbch ) );
-+        if ( !tbcd->Read( pS ) )
-+            return false;
-+    }
-+    return true;
-+}
-+
-+void TBC::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp,"[ 0x%x ] TBC -- dump\n", nOffSet );
-+    indent_printf(fp,"  dumping header ( TBCHeader )\n");
-+    tbch.Print( fp );
-+    if ( cid.get() )
-+        indent_printf(fp,"  cid = 0x%x\n", static_cast< unsigned int >( *cid ) );
-+    if ( tbcd.get() )
-+    {
-+        indent_printf(fp,"  dumping toolbar data TBCData \n");
-+        tbcd->Print(fp);
-+    }
-+}
-+
-+bool
-+TBC::ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper )
-+{
-+    // cmtFci       0x1 Command based on a built-in command. See CidFci.
-+    // cmtMacro     0x2 Macro command. See CidMacro.
-+    // cmtAllocated 0x3 Allocated command. See CidAllocated.
-+    // cmtNil       0x7 No command. See Cid.
-+    bool bBuiltin = false;
-+    sal_uInt16 cmdId = 0;
-+    if  ( cid.get() )
-+    {
-+        sal_uInt16 arg2 = ( *( cid.get() ) & 0xFFFF );
-+
-+        sal_uInt8 cmt = ( arg2 & 0x7 );
-+        arg2 = ( arg2 >> 3 );
-+
-+        switch ( cmt )
-+        {
-+            case 1:
-+                OSL_TRACE("cmt is cmtFci builtin command 0x%x", arg2);
-+                bBuiltin = true;
-+                cmdId = arg2;
-+                break;
-+            case 2:
-+                OSL_TRACE("cmt is cmtMacro macro 0x%x", arg2);
-+                break;
-+            case 3:
-+                OSL_TRACE("cmt is cmtAllocated [???] 0x%x", arg2);
-+                break;
-+            case 7:
-+                OSL_TRACE("cmt is cmNill no-phing 0x%x", arg2);
-+                break;
-+            default:
-+                OSL_TRACE("illegal 0x%x", cmt);
-+                break;
-+        }
-+    }
-+
-+    if ( tbcd.get() )
-+    {
-+        std::vector< css::beans::PropertyValue > props;
-+        if ( bBuiltin )
-+        {
-+            rtl::OUString sCommand = helper.MSOCommandToOOCommand( cmdId );
-+            if ( sCommand.getLength() > 0 )
-+            {
-+                beans::PropertyValue aProp;
-+ 
-+                aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
-+                aProp.Value <<= sCommand;
-+                props.push_back( aProp ); 
-+            }
-+         
-+        }
-+        if ( ! tbcd->ImportToolBarControl( toolbarcontainer, helper, props ) )
-+            return false;
-+
-+
-+        uno::Sequence< beans::PropertyValue > sProps( props.size() );
-+        beans::PropertyValue* pProp = sProps.getArray();
-+   
-+        for ( std::vector< css::beans::PropertyValue >::iterator it = props.begin(); it != props.end(); ++it, ++pProp )
-+            *pProp = *it;
-+
-+        toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );        
-+    }
-+    return true;
-+}
-+
-+bool 
-+Xst::Read( SvStream* pS )
-+{
-+    OSL_TRACE("Xst::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    sal_Int16 nChars = 0;
-+    *pS >> nChars;
-+    sString = readUnicodeString( pS, static_cast< sal_Int32 >( nChars  ) );
-+    return true;
-+}
-+
-+void
-+Xst::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] Xst -- dump\n", nOffSet );
-+    indent_printf( fp, " %s",  rtl::OUStringToOString( sString, RTL_TEXTENCODING_UTF8 ).getStr() );
-+}
-+
-+Tcg::Tcg() : nTcgVer( 255 )
-+{
-+}
-+
-+bool Tcg::Read(SvStream *pS)
-+{
-+    OSL_TRACE("Tcg::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> nTcgVer;
-+    if ( nTcgVer != (sal_Int8)255 )
-+        return false;
-+    tcg.reset( new Tcg255() );
-+    return tcg->Read( pS );
-+}
-+
-+void Tcg::Print( FILE* fp )
-+{
-+    Indent a(true);
-+    indent_printf(fp, "[ 0x%x ] Tcg - dump %d\n", nOffSet, nTcgVer);
-+    indent_printf(fp,"  nTcgVer %d\n", nTcgVer);
-+    tcg->Print( fp );
-+}
-+
-+bool Tcg::ImportCustomToolBar( const uno::Reference< frame::XModel >& rxModel )
-+{
-+    return tcg->ImportCustomToolBar( rxModel );
-+}
-+
-+Tcg255::Tcg255()
-+{
-+}
-+
-+Tcg255::~Tcg255()
-+{
-+    std::vector< Tcg255SubStruct* >::iterator it = rgtcgData.begin();
-+    for ( ; it != rgtcgData.end(); ++it )
-+        delete *it;
-+}
-+
-+bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream *pS )
-+{
-+     Tcg255SubStruct* pSubStruct = NULL;
-+     switch ( nId )
-+     {
-+         case 0x1:
-+         {
-+             pSubStruct = new PlfMcd( false ); // don't read the id
-+             break;
-+         }
-+         case 0x2: 
-+         {
-+             pSubStruct = new PlfAcd( false );
-+             break;
-+         }
-+         case 0x3: 
-+         case 0x4: 
-+         {
-+             pSubStruct = new PlfKme( false );
-+             break;
-+         }
-+         case 0x10: 
-+         {
-+             pSubStruct = new TcgSttbf( false );
-+             break;
-+         }
-+         case 0x11: 
-+         {
-+             pSubStruct = new MacroNames( false );
-+             break;
-+         }
-+         case 0x12: 
-+         {
-+             pSubStruct = new CTBWrapper( false );
-+             break;
-+         }
-+         default:
-+             OSL_TRACE("Unknown id 0x%x",nId);
-+             return false;
-+    }
-+    pSubStruct->ch = nId;
-+    if ( !pSubStruct->Read( pS ) )
-+        return false;
-+    rgtcgData.push_back( pSubStruct );
-+    return true;
-+}
-+
-+bool Tcg255::ImportCustomToolBar( const uno::Reference< css::frame::XModel >& rxModel )
-+{
-+    // Find the CTBWrapper
-+    for ( std::vector< Tcg255SubStruct* >::const_iterator it = rgtcgData.begin(); it != rgtcgData.end(); ++it )
-+    {
-+        if ( (*it)->id() == 0x12 )
-+        {
-+            // not so great, shouldn't really have to do a horror casting    
-+            CTBWrapper* pCTBWrapper =  dynamic_cast< CTBWrapper* > ( *it );
-+            if ( pCTBWrapper )
-+            {
-+                if ( !pCTBWrapper->ImportCustomToolBar( rxModel ) )
-+                    return false;
-+            }
-+        }
-+    }
-+    return true;
-+}
-+
-+
-+bool Tcg255::Read(SvStream *pS)
-+{
-+    OSL_TRACE("Tcg255::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    sal_uInt8 nId = 0; // 
-+    *pS >> nId;
-+    while (  nId != 0x40  )
-+    {
-+        if ( !processSubStruct( nId, pS ) )
-+            return false;
-+        *pS >> nId;
-+    } 
-+    return true;
-+    // Peek at  
-+}
-+
-+void Tcg255::Print( FILE* fp)
-+{
-+    Indent a;
-+    indent_printf(fp, "[ 0x%x ] Tcg255 - dump\n", nOffSet );
-+    indent_printf(fp, "  contains %d sub records\n", rgtcgData.size() );
-+    std::vector< Tcg255SubStruct* >::iterator it = rgtcgData.begin(); 
-+    std::vector< Tcg255SubStruct* >::iterator it_end = rgtcgData.end(); 
-+    
-+    for( sal_Int32 count = 1; it != it_end ; ++it, ++count )
-+    {
-+        Indent b;
-+        indent_printf(fp, "  [%d] Tcg255SubStruct \n", static_cast< unsigned int >( count ) );
-+        (*it)->Print(fp);
-+    }
-+}
-+
-+
-+Tcg255SubStruct::Tcg255SubStruct( bool bReadId ) : mbReadId( bReadId ), ch(0)
-+{
-+}
-+
-+bool Tcg255SubStruct::Read(SvStream *pS)
-+{
-+    OSL_TRACE("Tcg255SubStruct::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    if ( mbReadId )
-+        *pS >> ch;
-+    return true;
-+}
-+
-+PlfMcd::PlfMcd( bool bReadId ): Tcg255SubStruct( bReadId ), rgmcd( NULL )
-+{
-+}
-+PlfMcd::~PlfMcd()
-+{
-+    if ( rgmcd )
-+        delete[] rgmcd;
-+}
-+
-+bool PlfMcd::Read(SvStream *pS)
-+{
-+    OSL_TRACE("PffMcd::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    Tcg255SubStruct::Read( pS );
-+    *pS >> iMac;
-+    if ( iMac )
-+    { 
-+        rgmcd = new MCD[ iMac ];
-+        for ( sal_Int32 index = 0; index < iMac; ++index )
-+        {
-+            if ( !rgmcd[ index ].Read( pS ) )
-+                return false; 
-+        } 
-+    }
-+    return true;
-+}
-+
-+void PlfMcd::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp, "[ 0x%x ] PlfMcd ( Tcg255SubStruct ) - dump\n", nOffSet );
-+    indent_printf(fp, " contains %d MCD records\n", static_cast<int>( iMac ) );
-+    for ( sal_Int32 count=0; count < iMac; ++count )
-+    {
-+        Indent b;
-+        indent_printf(fp, "[%d] MCD\n", static_cast< int >( count ) );
-+        rgmcd[ count ].Print( fp );
-+    }
-+    
-+}
-+
-+PlfAcd::PlfAcd( bool bReadId ) : Tcg255SubStruct( bReadId )
-+,iMac(0)
-+,rgacd(NULL)
-+{
-+}
-+
-+
-+PlfAcd::~PlfAcd()
-+{
-+    if ( rgacd )
-+        delete[] rgacd;
-+}
-+
-+bool PlfAcd::Read( SvStream *pS)
-+{
-+    OSL_TRACE("PffAcd::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    Tcg255SubStruct::Read( pS );
-+    *pS >> iMac;
-+    if ( iMac )
-+    {
-+        rgacd = new Acd[ iMac ];
-+        for ( sal_Int32 index = 0; index < iMac; ++index )
-+        {
-+            if ( !rgacd[ index ].Read( pS ) ) 
-+                return false;
-+        }
-+    }
-+    return true;
-+}
-+void PlfAcd::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp, "[ 0x%x ] PlfAcd ( Tcg255SubStruct ) - dump\n", nOffSet );
-+    indent_printf(fp, " contains %d ACD records\n", static_cast< int >( iMac ) );
-+    for ( sal_Int32 count=0; count < iMac; ++count )
-+    {
-+        Indent b;
-+        indent_printf(fp, "[%d] ACD\n", static_cast< int >( count ) );
-+        rgacd[ count ].Print( fp );
-+    }
-+    
-+}
-+
-+PlfKme::PlfKme( bool bReadId ) : Tcg255SubStruct( bReadId )
-+,iMac( 0 )
-+,rgkme( NULL )
-+{
-+}
-+
-+PlfKme::~PlfKme()
-+{
-+    if ( rgkme )
-+        delete[] rgkme;
-+}
-+
-+bool PlfKme::Read(SvStream *pS)
-+{
-+    OSL_TRACE("PlfKme::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    Tcg255SubStruct::Read( pS );
-+    *pS >> iMac;
-+    if ( iMac )
-+    {
-+        rgkme = new Kme[ iMac ];
-+        for( sal_Int32 index=0; index<iMac; ++index )
-+        {
-+            if ( !rgkme[ index ].Read( pS ) )
-+                return false;
-+        }
-+    }
-+    return true;
-+}
-+ 
-+void PlfKme::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp, "[ 0x%x ] PlfKme ( Tcg255SubStruct ) - dump\n", nOffSet );
-+    indent_printf(fp, " contains %d Kme records\n", static_cast< int >( iMac ) );
-+    for ( sal_Int32 count=0; count < iMac; ++count )
-+    {
-+        Indent b;
-+        indent_printf(fp, "[%d] Kme\n", static_cast< int >( count ) );
-+        rgkme[ count ].Print( fp );
-+    }
-+    
-+}
-+
-+TcgSttbf::TcgSttbf( bool bReadId ) : Tcg255SubStruct( bReadId )
-+{
-+}
-+
-+bool TcgSttbf::Read( SvStream *pS) 
-+{
-+    OSL_TRACE("TcgSttbf::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    Tcg255SubStruct::Read( pS );
-+    return sttbf.Read( pS );
-+}
-+
-+void TcgSttbf::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp,"[ 0x%x ] TcgSttbf - dump\n", nOffSet );
-+    sttbf.Print( fp );
-+}
-+
-+TcgSttbfCore::TcgSttbfCore() : fExtend( 0 )
-+,cData( 0 )
-+,cbExtra( 0 )
-+,dataItems( NULL )
-+{
-+}
-+
-+TcgSttbfCore::~TcgSttbfCore()
-+{
-+    if ( dataItems )
-+        delete[] dataItems;
-+}
-+
-+bool TcgSttbfCore::Read( SvStream* pS )
-+{
-+    OSL_TRACE("TcgSttbfCore::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> fExtend >> cData >> cbExtra;
-+    if ( cData )
-+    {
-+        dataItems = new SBBItem[ cData ];
-+        for ( sal_Int32 index = 0; index < cData; ++index )
-+        {
-+            *pS >> dataItems[ index ].cchData;
-+            dataItems[ index ].data = readUnicodeString( pS, dataItems[ index ].cchData );
-+            *pS >> dataItems[ index ].extraData;
-+        }
-+    }
-+    return true;
-+}
-+
-+void TcgSttbfCore::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] TcgSttbfCore - dump\n");
-+    indent_printf( fp, " fExtend 0x%x [expected 0xFFFF ]\n", fExtend );
-+    indent_printf( fp, " cbExtra 0x%x [expected 0x02 ]\n", cbExtra );
-+    indent_printf( fp, " cData no. or string data items %d (0x%x)\n", cData, cData );
-+    
-+    if ( cData )
-+    {
-+        for ( sal_Int32 index = 0; index < cData; ++index )
-+            indent_printf(fp,"   string dataItem[ %d(0x%x) ] has name %s and if referenced %d times.\n", static_cast< int >( index ), static_cast< unsigned int >( index ), rtl::OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr(), dataItems[ index ].extraData );
-+    }
-+
-+}
-+MacroNames::MacroNames( bool bReadId ) : Tcg255SubStruct( bReadId )
-+,iMac( 0 )
-+,rgNames( NULL )
-+{
-+}
-+
-+MacroNames::~MacroNames()
-+{
-+    if ( rgNames )
-+        delete[] rgNames;
-+}
-+
-+bool MacroNames::Read( SvStream *pS)
-+{
-+    OSL_TRACE("MacroNames::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    Tcg255SubStruct::Read( pS );
-+    *pS >> iMac;
-+    if ( iMac )
-+    {
-+        rgNames = new MacroName[ iMac ]; 
-+        for ( sal_Int32 index = 0; index < iMac; ++index )
-+        {
-+            if ( !rgNames[ index ].Read( pS ) )
-+                return false;
-+        }
-+    }
-+    return true;
-+}
-+
-+void MacroNames::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp, "[ 0x%x ] MacroNames ( Tcg255SubStruct ) - dump\n");
-+    indent_printf(fp, " contains %d MacroName records\n", iMac );
-+    for ( sal_Int32 count=0; count < iMac; ++count )
-+    {
-+        Indent b;
-+        indent_printf(fp, "[%d] MacroName\n", static_cast<int>( count ) );
-+        rgNames[ count ].Print( fp );
-+    }
-+    
-+}
-+
-+MacroName::MacroName():ibst(0)
-+{
-+}
-+
-+
-+bool MacroName::Read(SvStream *pS)
-+{
-+    OSL_TRACE("MacroName::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> ibst;
-+    return xstz.Read( pS );
-+}
-+
-+void MacroName::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] MacroName - dump");
-+    indent_printf( fp,"  index - 0x%x has associated following record\n", ibst );
-+    xstz.Print( fp );
-+}
-+
-+
-+
-+Xstz::Xstz():chTerm(0)
-+{
-+}
-+
-+bool 
-+Xstz::Read(SvStream *pS)
-+{
-+    OSL_TRACE("Xstz::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    if ( !xst.Read( pS ) )
-+        return false;
-+    *pS >> chTerm;
-+    if ( chTerm != 0 ) // should be an assert 
-+        return false;
-+    return true;
-+}
-+
-+void Xstz::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp,"[ 0x%x ] Xstz -- dump\n", nOffSet );
-+    indent_printf(fp,"  Xst\n");
-+    xst.Print( fp ); 
-+    indent_printf(fp,"  chterm 0x%x ( should be zero )\n", chTerm);
-+}
-+
-+Kme::Kme() : reserved1(0)
-+,reserved2(0)
-+,kcm1(0)
-+,kcm2(0)
-+,kt(0)
-+,param(0)
-+{
-+}
-+
-+Kme::~Kme()
-+{
-+}
-+
-+bool
-+Kme::Read(SvStream *pS)
-+{
-+    OSL_TRACE("Kme::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> reserved1 >> reserved2 >> kcm1 >> kcm2 >> param;
-+    return true;
-+}
-+
-+void Kme::Print( FILE* fp )
-+{
-+    Indent a;
-+    
-+   indent_printf( fp, "[ 0x%x ] Kme - dump\n", nOffSet );
-+   indent_printf( fp, " reserved1 0x%x [expected 0x0 ]\n", reserved1 );
-+   indent_printf( fp, " reserved2 0x%x [expected 0x0 ]\n", reserved2 );
-+   indent_printf( fp, " kcm1 0x%x [shortcut key]\n", kcm1 );
-+   indent_printf( fp, " kcm2 0x%x [shortcut key]\n", kcm2 );
-+   indent_printf( fp, " kt 0x%x \n", kt );
-+   indent_printf( fp, " param 0x%x \n", static_cast< unsigned int >( param ) );
-+}
-+
-+Acd::Acd() : ibst( 0 )
-+, fciBasedOnABC( 0 )
-+{
-+}
-+
-+bool Acd::Read(SvStream *pS)
-+{
-+    OSL_TRACE("Acd::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> ibst >> fciBasedOnABC;
-+    return true;
-+}
-+
-+void Acd::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp,"[ 0x%x ] ACD - dump\n", nOffSet );
-+    // #TODO flesh out interpretation of these values
-+    indent_printf( fp,"  ibst 0x%x\n", ibst);
-+    indent_printf( fp,"  fciBaseObABC 0x%x\n", fciBasedOnABC);
-+}
-+
-+MCD::MCD() :  reserved1(0x56)
-+,reserved2( 0 )
-+,ibst( 0 )
-+,ibstName( 0 )
-+,reserved3( 0xFFFF )
-+,reserved4( 0 )
-+,reserved5( 0 )
-+,reserved6( 0 )
-+,reserved7( 0 )
-+{
-+}
-+
-+bool  MCD::Read(SvStream *pS)
-+{
-+    OSL_TRACE("MCD::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> reserved1 >> reserved2 >> ibst >> ibstName >> reserved3;
-+    *pS >> reserved4 >> reserved5 >> reserved6 >> reserved7;
-+    return true;
-+}
-+
-+void MCD::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] MCD - dump\n", nOffSet );
-+    indent_printf( fp, " reserved1 0x%x [expected 0x56 ]\n", reserved1 );
-+    indent_printf( fp, " reserved2 0x%x [expected 0x0 ]\n", reserved2 );
-+    indent_printf( fp, " ibst 0x%x specifies macro with MacroName.xstz = 0x%x\n", ibst, ibst );
-+    indent_printf( fp, " ibstName 0x%x index into command string table ( TcgSttbf.sttbf )\n", ibstName );
-+
-+    indent_printf( fp, " reserved3 0x%x [expected 0xFFFF ]\n", reserved3 );
-+    indent_printf( fp, " reserved4 0x%x\n", static_cast< unsigned int >( reserved4 ) );
-+    indent_printf( fp, " reserved5 0x%x [expected 0x0 ]\n", static_cast< unsigned int >( reserved5 ) );
-+    indent_printf( fp, " reserved6 0x%x\n", static_cast< unsigned int >( reserved6 ) );
-+    indent_printf( fp, " reserved7 0x%x\n", static_cast< unsigned int >( reserved7 ) );
-+}
-+
-diff --git sw/source/filter/ww8/ww8toolbar.hxx sw/source/filter/ww8/ww8toolbar.hxx
-new file mode 100644
-index 0000000..188213c
---- /dev/null
-+++ sw/source/filter/ww8/ww8toolbar.hxx
-@@ -0,0 +1,340 @@
-+#ifndef _WW8TOOLBAR_HXX
-+#define _WW8TOOLBAR_HXX
-+
-+#include <svx/mstoolbar.hxx>
-+
-+namespace css = ::com::sun::star;
-+
-+class Xst : public TBBase
-+{
-+    rtl::OUString sString;
-+public:
-+    Xst(){}
-+    bool Read(SvStream *pS);
-+    rtl::OUString getString() { return sString; }
-+    void Print( FILE* fp );
-+};
-+
-+class TBC : public TBBase
-+{
-+    TBCHeader tbch;
-+    boost::shared_ptr< sal_uInt32 > cid; // optional
-+    boost::shared_ptr<TBCData> tbcd;
-+public:
-+    TBC();
-+    ~TBC();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+    bool ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
-+};
-+
-+class TB : public TBBase
-+{
-+    sal_Int8 bSignature; //Signed integer that specifies the toolbar signature number. MUST be 0x02.
-+    sal_Int8 bVersion; //Signed integer that specifies the toolbar version number. MUST be 0x01.
-+    sal_Int16 cCL; //Signed integer that SHOULD  specify the number of toolbar controls contained in this toolbar.
-+    sal_Int32 ltbid; //Signed integer that specifies the toolbar ID. MUST be 0x0001 (custom toolbar ID).
-+    sal_uInt32 ltbtr; //Unsigned integer of type TBTRFlags that specifies the toolbar type and toolbar restrictions.
-+    sal_uInt16 cRowsDefault; //Unsigned integer that specifies the number of preferred rows for the toolbar when the toolbar is not docked. MUST be less than or equal to 255.
-+    sal_uInt16 bFlags; //Unsigned integer of type TBFlags.
-+    WString name; //Structure of type WString that specifies the toolbar name.
-+    TB(const TB&);
-+    TB& operator = ( const TB&);
-+public:
-+    TB();
-+    ~TB(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class CTB : public TBBase
-+{
-+    Xst name;
-+    sal_Int32 cbTBData;
-+    TB tb;
-+    sal_uInt8 rVisualData[ 100 ];
-+    sal_Int32 iWCTBl;
-+    sal_uInt16 reserved;
-+    sal_uInt16 unused;
-+    sal_Int32 cCtls;
-+    std::vector< TBC > rTBC;
-+
-+    CTB(const CTB&);
-+    CTB& operator = ( const CTB&);
-+public:
-+    CTB();
-+    ~CTB();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* fp );
-+    bool ImportCustomToolBar( CustomToolBarImportHelper& );
-+};
-+
-+class TBDelta : public TBBase
-+{
-+    sal_uInt8 doprfatendFlags;
-+    sal_uInt8 ibts;
-+    sal_Int32 cidNext; 
-+    sal_Int32 cid;
-+    sal_Int32 fc;
-+    sal_uInt16 CiTBDE; // careful of this ( endian matters etc. )
-+    sal_uInt16 cbTBC;
-+public:
-+    TBDelta();
-+    ~TBDelta(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class Tcg255SubStruct : public TBBase
-+{
-+friend class Tcg255;
-+    bool mbReadId;
-+    Tcg255SubStruct(const Tcg255SubStruct&);
-+    Tcg255SubStruct& operator = ( const Tcg255SubStruct&);
-+protected:
-+    sal_uInt8 ch;
-+public:
-+    Tcg255SubStruct( bool bReadId );
-+    ~Tcg255SubStruct(){}
-+    virtual sal_uInt8 id() const { return ch; }
-+    bool Read(SvStream *pS);
-+};
-+
-+class Customization : public TBBase
-+{
-+    sal_Int32 tbidForTBD;
-+    sal_uInt16 reserved1;
-+    sal_Int16 ctbds;
-+
-+    boost::shared_ptr< CTB > customizationDataCTB;
-+    std::vector< TBDelta > customizationDataTBDelta; 
-+    
-+public:    
-+    Customization();
-+    ~Customization();
-+    bool Read(SvStream *pS);
-+    bool ImportCustomToolBar( CustomToolBarImportHelper& );
-+    void Print( FILE* );
-+};
-+
-+class CTBWrapper : public Tcg255SubStruct
-+{
-+    // reserved1 is the ch field of Tcg255SubStruct
-+    sal_uInt16 reserved2;
-+    sal_uInt8 reserved3;
-+    sal_uInt16 reserved4;
-+    sal_uInt16 reserved5;
-+
-+    sal_Int16 cbTBD;
-+    sal_Int16 cCust;
-+
-+    sal_Int32 cbDTBC;
-+
-+    std::vector< TBC > rtbdc; // array of TBC's - we don't read these yet 
-+    std::vector< Customization > rCustomizations; // array of Customizations
-+
-+    CTBWrapper(const CTBWrapper&);
-+    CTBWrapper& operator = ( const CTBWrapper&);
-+public:
-+    CTBWrapper( bool bReadId = true );
-+    ~CTBWrapper();
-+    bool Read(SvStream *pS);
-+    bool ImportCustomToolBar( const css::uno::Reference< css::frame::XModel >& rxModel );
-+    void Print( FILE* );
-+};
-+
-+class MCD : public TBBase
-+{
-+    sal_Int8 reserved1; //  A signed integer that MUST be 0x56. 
-+    sal_uInt8 reserved2; // MUST be 0.
-+    sal_uInt16 ibst; // Unsigned integer that specifies the name of the macro. Macro name is specified by MacroName.xstz of the MacroName entry in the MacroNames such that MacroName.ibst equals ibst. MacroNames MUST contain such an entry.
-+    sal_uInt16 ibstName; // An unsigned integer that specifies the index into the Command String Table (TcgSttbf.sttbf) where the macro‘s name and arguments are specified.
-+    sal_uInt16 reserved3; // An unsigned integer that MUST be 0xFFFF.
-+    sal_uInt32 reserved4; //MUST be ignored. 
-+    sal_uInt32 reserved5; //MUST be 0. 
-+    sal_uInt32 reserved6; //MUST be ignored. 
-+    sal_uInt32 reserved7; //MUST be ignored   
-+
-+    MCD(const MCD&);
-+    MCD& operator = ( const MCD&);
-+public:
-+    MCD();
-+    ~MCD(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class PlfMcd : public Tcg255SubStruct
-+{
-+    sal_Int32 iMac;
-+    MCD* rgmcd; // array of MCD's
-+    PlfMcd(const PlfMcd&);
-+    PlfMcd& operator = ( const PlfMcd&);
-+public:
-+    PlfMcd( bool bReadId = true );
-+    ~PlfMcd();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class Acd : public TBBase
-+{
-+    sal_Int16 ibst;
-+    sal_uInt16 fciBasedOnABC; //  fciBasedOn(13 bits) A(1bit)B(1bit)C(1Bit)
-+    Acd(const Acd&);
-+    Acd& operator = ( const Acd&);
-+public:
-+    Acd();
-+    ~Acd(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class PlfAcd: public Tcg255SubStruct
-+{
-+    sal_Int32 iMac;
-+    Acd* rgacd;
-+    PlfAcd(const PlfAcd&);
-+    PlfAcd& operator = ( const PlfAcd&);
-+public:
-+    PlfAcd( bool bReadId = true );
-+    ~PlfAcd();
-+    bool Read(SvStream *pS);
-+    void Print(FILE*);
-+};
-+
-+class Kme : public TBBase
-+{
-+    sal_Int16 reserved1; //MUST be zero. 
-+    sal_Int16 reserved2; //MUST be zero.
-+    sal_uInt16 kcm1; //A Kcm that specifies the primary shortcut key.
-+    sal_uInt16 kcm2; //A Kcm that specifies the secondary shortcut key, or 0x00FF if there is no secondary shortcut key.
-+    sal_uInt16 kt; //A Kt that specifies the type of action to be taken when the key combination is pressed. 
-+    sal_uInt32 param; //The meaning of this field depends on the value of kt
-+
-+    Kme(const Kme&);
-+    Kme& operator = ( const Kme&);
-+public:
-+    Kme();
-+    ~Kme();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class PlfKme : public Tcg255SubStruct
-+{
-+    sal_Int32 iMac;
-+    Kme* rgkme;
-+    PlfKme(const PlfKme&);
-+    PlfKme& operator = ( const PlfKme&);
-+public:
-+    PlfKme( bool bReadId = true );
-+    ~PlfKme();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class TcgSttbfCore : public TBBase
-+{
-+struct SBBItem
-+{
-+    sal_uInt16 cchData;
-+    rtl::OUString data; 
-+    sal_uInt16 extraData;
-+    SBBItem() : cchData(0), extraData(0){}
-+};
-+    sal_uInt16 fExtend;
-+    sal_uInt16 cData;
-+    sal_uInt16 cbExtra;
-+    SBBItem* dataItems;
-+    TcgSttbfCore(const TcgSttbfCore&);
-+    TcgSttbfCore& operator = ( const TcgSttbfCore&);
-+public:
-+    TcgSttbfCore();
-+    ~TcgSttbfCore();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* fp );
-+};
-+
-+class TcgSttbf : public Tcg255SubStruct
-+{
-+    TcgSttbfCore sttbf;
-+    TcgSttbf(const TcgSttbf&);
-+    TcgSttbf& operator = ( const TcgSttbf&);
-+public:
-+    TcgSttbf( bool bReadId = true );
-+    ~TcgSttbf(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* fp );
-+};
-+
-+class Xstz : public TBBase
-+{
-+    Xst xst; //An Xst specifying the string with its pre-pended length. 
-+    sal_uInt16 chTerm;
-+
-+    Xstz(const Xstz&);
-+    Xstz& operator = ( const Xstz&);
-+public:
-+    Xstz();
-+    ~Xstz(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* fp );
-+};
-+
-+class MacroName : public TBBase
-+{
-+    sal_uInt16 ibst; //An unsigned integer that specifies the index of the current entry in the macro name table. MUST NOT be the same as the index of any other entry.
-+    Xstz xstz;
-+    MacroName(const MacroName&);
-+    MacroName& operator = ( const MacroName&);
-+public:
-+    MacroName();
-+    ~MacroName(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class MacroNames : public Tcg255SubStruct
-+{
-+    sal_uInt16 iMac; //An unsigned integer that specifies the number of MacroName structures in rgNames.
-+    MacroName* rgNames;
-+
-+    MacroNames(const MacroNames&);
-+    MacroNames& operator = ( const MacroNames&);
-+public:
-+    MacroNames( bool bReadId = true );
-+    ~MacroNames();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
-+
-+class Tcg255 : public TBBase
-+{
-+    std::vector< Tcg255SubStruct* > rgtcgData; // array of sub structures
-+    Tcg255(const Tcg255&);
-+    Tcg255& operator = ( const Tcg255&);
-+    bool processSubStruct( sal_uInt8 nId, SvStream*  );
-+public:
-+    Tcg255();
-+    ~Tcg255();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+    bool ImportCustomToolBar( const css::uno::Reference< css::frame::XModel >& rxModel );
-+};
-+
-+class Tcg: public TBBase
-+{
-+    sal_Int8 nTcgVer; 
-+    std::auto_ptr< Tcg255 > tcg;
-+    Tcg(const Tcg&);
-+    Tcg& operator = ( const Tcg&);
-+public:
-+    Tcg();
-+    ~Tcg(){}
-+    bool Read(SvStream *pS);
-+    bool ImportCustomToolBar( const css::uno::Reference< css::frame::XModel >& rxModel );
-+    void Print( FILE* );
-+};
-+
-+#endif
-Index: vcl/inc/vcl/bitmap.hxx
-===================================================================
---- vcl/inc/vcl/bitmap.hxx	(revision 267686)
-+++ vcl/inc/vcl/bitmap.hxx	(working copy)
-@@ -270,9 +270,9 @@
-     SAL_DLLPRIVATE void                 ImplSetImpBitmap( ImpBitmap* pImpBmp );
-     SAL_DLLPRIVATE void                 ImplAssignWithSize( const Bitmap& rBitmap );
- 
--    SAL_DLLPRIVATE static BOOL          ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset );
-+    SAL_DLLPRIVATE static BOOL          ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset, BOOL bMSOFormat=FALSE );
-     SAL_DLLPRIVATE static BOOL          ImplReadDIBFileHeader( SvStream& rIStm, ULONG& rOffset );
--    SAL_DLLPRIVATE static BOOL          ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown );
-+    SAL_DLLPRIVATE static BOOL          ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown, BOOL bMSOFormat = FALSE );
-     SAL_DLLPRIVATE static BOOL          ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, BOOL bQuad );
-     SAL_DLLPRIVATE static BOOL          ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown );
-     SAL_DLLPRIVATE BOOL                 ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompressed ) const;
-@@ -767,7 +767,7 @@
- 
- public:
- 
--    BOOL                    Read( SvStream& rIStm, BOOL bFileHeader = TRUE );
-+    BOOL                    Read( SvStream& rIStm, BOOL bFileHeader = TRUE, BOOL bMSOFormat = FALSE );
-     BOOL                    Write( SvStream& rOStm, BOOL bCompressed = TRUE, BOOL bFileHeader = TRUE ) const;
- 
-     friend VCL_DLLPUBLIC SvStream&        operator>>( SvStream& rIStm, Bitmap& rBitmap );
---- vcl/source/gdi/bitmap2.cxx.old	2009-04-06 21:35:20.000000000 +0200
-+++ vcl/source/gdi/bitmap2.cxx	2009-04-06 21:35:39.000000000 +0200
-@@ -49,6 +49,8 @@
- 
- #define DIBCOREHEADERSIZE			( 12UL )
- #define DIBINFOHEADERSIZE			( sizeof( DIBInfoHeader ) )
-+#define BITMAPINFOHEADER                        0x28
-+
- #define SETPIXEL4( pBuf, nX, cChar )( (pBuf)[ (nX) >> 1 ] |= ( (nX) & 1 ) ? ( cChar ): (cChar) << 4 );
- 
- // ----------------------
-@@ -132,7 +134,7 @@ SvStream& operator<<( SvStream& rOStm, c
- 
- // ------------------------------------------------------------------
- 
--BOOL Bitmap::Read( SvStream& rIStm, BOOL bFileHeader )
-+BOOL Bitmap::Read( SvStream& rIStm, BOOL bFileHeader, BOOL bIsMSOFormat )
- {
- 	const USHORT	nOldFormat = rIStm.GetNumberFormatInt();
- 	const ULONG 	nOldPos = rIStm.Tell();
-@@ -147,7 +149,7 @@ BOOL Bitmap::Read( SvStream& rIStm, BOOL
- 			bRet = ImplReadDIB( rIStm, *this, nOffset );
- 	}
- 	else
--		bRet = ImplReadDIB( rIStm, *this, nOffset );
-+		bRet = ImplReadDIB( rIStm, *this, nOffset, bIsMSOFormat );
- 
- 	if( !bRet )
- 	{
-@@ -164,14 +166,14 @@ BOOL Bitmap::Read( SvStream& rIStm, BOOL
- 
- // ------------------------------------------------------------------
- 
--BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset )
-+BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset, BOOL bIsMSOFormat )
- {
- 	DIBInfoHeader	aHeader;
- 	const ULONG 	nStmPos = rIStm.Tell();
- 	BOOL			bRet = FALSE;
- 	sal_Bool		bTopDown = sal_False;
- 
--	if( ImplReadDIBInfoHeader( rIStm, aHeader, bTopDown ) && aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount )
-+	if( ImplReadDIBInfoHeader( rIStm, aHeader, bTopDown, bIsMSOFormat ) && aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount )
- 	{
- 		const USHORT nBitCount( discretizeBitcount(aHeader.nBitCount) );
- 
-@@ -302,21 +304,37 @@ BOOL Bitmap::ImplReadDIBFileHeader( SvSt
- 
- // ------------------------------------------------------------------
- 
--BOOL Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown )
-+BOOL Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown, sal_Bool bIsMSOFormat )
- {
- 	// BITMAPINFOHEADER or BITMAPCOREHEADER
- 	rIStm >> rHeader.nSize;
- 
- 	// BITMAPCOREHEADER
-+	sal_Int16 nTmp16 = 0;
-+	sal_uInt8 nTmp8 = 0;
- 	if ( rHeader.nSize == DIBCOREHEADERSIZE )
- 	{
--		sal_Int16 nTmp16;
- 
- 		rIStm >> nTmp16; rHeader.nWidth = nTmp16;
- 		rIStm >> nTmp16; rHeader.nHeight = nTmp16;
- 		rIStm >> rHeader.nPlanes;
- 		rIStm >> rHeader.nBitCount;
- 	}
-+	else if ( bIsMSOFormat && ( rHeader.nSize == BITMAPINFOHEADER ) )
-+	{
-+		rIStm >> nTmp16; rHeader.nWidth = nTmp16;
-+		rIStm >> nTmp16; rHeader.nHeight = nTmp16;
-+		rIStm >> nTmp8; rHeader.nPlanes = nTmp8;
-+		rIStm >> nTmp8; rHeader.nBitCount = nTmp8;
-+		rIStm >> nTmp16; rHeader.nSizeImage = nTmp16;
-+		rIStm >> nTmp16; rHeader.nCompression = nTmp16;
-+		if ( !rHeader.nSizeImage ) // uncompressed?
-+			rHeader.nSizeImage = ((rHeader.nWidth * rHeader.nBitCount + 31) & ~31) / 8 * rHeader.nHeight;
-+		rIStm >> rHeader.nXPelsPerMeter;
-+		rIStm >> rHeader.nYPelsPerMeter;
-+		rIStm >> rHeader.nColsUsed;
-+		rIStm >> rHeader.nColsImportant;
-+	}
- 	else
- 	{
- 		// unknown Header
diff --git a/applied_patches/0471-kde4-fpicker-fix-toOUString.diff b/applied_patches/0351-kde4-fpicker-fix-toOUString.diff
similarity index 100%
rename from applied_patches/0471-kde4-fpicker-fix-toOUString.diff
rename to applied_patches/0351-kde4-fpicker-fix-toOUString.diff
diff --git a/applied_patches/0351-vba-word-support.diff b/applied_patches/0351-vba-word-support.diff
deleted file mode 100644
index e7b073a88..000000000
--- a/applied_patches/0351-vba-word-support.diff
+++ /dev/null
@@ -1,30504 +0,0 @@
---- basic/inc/basic/basmgr.hxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ basic/inc/basic/basmgr.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -231,6 +231,8 @@ public:
-     ::com::sun::star::uno::Any
-                     SetGlobalUNOConstant( const sal_Char* _pAsciiName, const ::com::sun::star::uno::Any& _rValue );
- 
-+    /** retrieves a global constant in the basic library, referring to some UNO object, returns true if a value is found ( value is in aOut ) false otherwise. */
-+                    bool GetGlobalUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
-     /** determines whether there are password-protected modules whose size exceedes the
-         legacy module size
-         @param _out_rModuleNames
---- basic/inc/basic/sbstar.hxx
-+++ basic/inc/basic/sbstar.hxx
-@@ -75,6 +75,10 @@ class StarBASIC : public SbxObject
-     BOOL            bVBAEnabled;
- 	BasicLibInfo*	pLibInfo;			// Info block for basic manager
- 	SbLanguageMode	eLanguageMode;		// LanguageMode of the basic object
-+
-+	SbxObjectRef pVBAGlobals; 
-+	SbxObject* getVBAGlobals( );
-+
- protected:
- 	BOOL 			CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
- private:
-@@ -199,6 +203,7 @@ public:
- 
- 	SbxObjectRef getRTL( void ) { return pRtl; }
- 	BOOL IsDocBasic() { return bDocBasic; }
-+	SbxVariable* VBAFind( const String& rName, SbxClassType t );
- };
- 
- #ifndef __SB_SBSTARBASICREF_HXX
---- basic/prj/d.lst.old	2009-04-02 10:49:18.000000000 +0000
-+++ basic/prj/d.lst	2009-04-06 16:42:01.000000000 +0000
-@@ -7,6 +7,8 @@ mkdir: %COMMON_DEST%\res%_EXT%
- ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
- ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
- ..\%__SRC%\slb\sb.lib %_DEST%\lib%_EXT%\xsb.lib
-+..\%__SRC%\lib\vbahelp*.* %_DEST%\lib%_EXT%\vba*.*
-+
- ..\%__SRC%\srs\classes.srs %_DEST%\res%_EXT%\basic.srs
- ..\%COMMON_OUTDIR%\srs\classes_srs.hid %COMMON_DEST%\res%_EXT%\basic_srs.hid
- ..\%__SRC%\bin\sb?????.dll %_DEST%\bin%_EXT%\sb?????.dll
-@@ -56,4 +58,8 @@ mkdir: %_DEST%\inc%_EXT%\basic
- ..\inc\basic\sbxmstrm.hxx %_DEST%\inc%_EXT%\basic\sbxmstrm.hxx
- 
- ..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx
-+..\inc\basic\vbacollectionimpl.hxx %_DEST%\inc%_EXT%\basic\vbacollectionimpl.hxx
-+..\inc\basic\vbahelper.hxx %_DEST%\inc%_EXT%\basic\vbahelper.hxx
-+..\inc\basic\helperdecl.hxx %_DEST%\inc%_EXT%\basic\helperdecl.hxx
-+..\inc\basic\vbahelperinterface.hxx %_DEST%\inc%_EXT%\basic\vbahelperinterface.hxx
- ..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx
---- basic/source/basmgr/basmgr.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ basic/source/basmgr/basmgr.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -48,6 +48,7 @@
- 
- #include <basic/sbuno.hxx>
- #include <basic/basmgr.hxx>
-+#include <sbunoobj.hxx>
- #include "basrid.hxx"
- #include "sbintern.hxx"
- #include <sb.hrc>
-@@ -1833,6 +1834,23 @@ BasicError* BasicManager::GetNextError()
- 	DBG_CHKTHIS( BasicManager, 0 );
- 	return pErrorMgr->GetNextError();
- }
-+bool BasicManager::GetGlobalUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
-+{
-+    bool bRes = false;
-+    StarBASIC* pStandardLib = GetStdLib();
-+    OSL_PRECOND( pStandardLib, "BasicManager::SetGlobalUNOConstant: no lib to insert into!" );
-+    if ( pStandardLib )
-+    {
-+        ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
-+        SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( pStandardLib->Find( sVarName, SbxCLASS_DONTCARE ) );
-+        if ( pGlobs )
-+        {
-+            aOut = pGlobs->getUnoAny(); 
-+            bRes = true;
-+        } 
-+    }
-+    return bRes;
-+}
- 
- Any BasicManager::SetGlobalUNOConstant( const sal_Char* _pAsciiName, const Any& _rValue )
- {
---- basic/source/classes/sb.cxx
-+++ basic/source/classes/sb.cxx
-@@ -70,7 +70,29 @@ SV_IMPL_VARARR(SbTextPortions,SbTextPort
- TYPEINIT1(StarBASIC,SbxObject)
- 
- #define RTLNAME "@SBRTL"
-+//  i#i68894#
- 
-+const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") );
-+const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
-+
-+SbxObject* StarBASIC::getVBAGlobals( )
-+{
-+	if ( !pVBAGlobals )
-+		pVBAGlobals = (SbUnoObject*)Find( aVBAHook , SbxCLASS_DONTCARE );
-+	return pVBAGlobals;
-+}
-+
-+//  i#i68894#
-+SbxVariable* StarBASIC::VBAFind( const String& rName, SbxClassType t )
-+{
-+	if( rName == aThisComponent )
-+		return NULL;
-+	// rename to init globals
-+	if ( getVBAGlobals( ) )
-+		return pVBAGlobals->Find( rName, t );
-+	return NULL;
-+
-+}
- // Create array for conversion SFX <-> VB error code
- struct SFX_VB_ErrorItem
- {
-@@ -609,6 +631,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL
- 	pRtl = new SbiStdObject( String( RTL_CONSTASCII_USTRINGPARAM(RTLNAME) ), this );
-     // Search via StarBasic is always global
- 	SetFlag( SBX_GBLSEARCH );
-+	pVBAGlobals = NULL;
- }
- 
- // #51727 Override SetModified so that the modified state
---- basic/source/classes/sbxmod.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ basic/source/classes/sbxmod.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -1781,13 +1781,20 @@ void SbUserFormModule::InitObject()
-     try
-     {
- 
--        if ( m_xModel.is() )
-+        String aHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
-+        SbUnoObject* pGlobs = (SbUnoObject*)GetParent()->Find( aHook, SbxCLASS_DONTCARE ); 
-+        if ( m_xModel.is() && pGlobs )
-         {
-+            
-+            uno::Reference< lang::XMultiServiceFactory > xVBAFactory( pGlobs->getUnoAny(), uno::UNO_QUERY_THROW );
-             uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
-             uno::Sequence< uno::Any > aArgs(1);
-             aArgs[ 0 ] <<= m_xModel;
-             rtl::OUString sDialogUrl( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:" ) );
--            sDialogUrl = sDialogUrl.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") ) ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) ); 
-+            rtl::OUString sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
-+            if ( this->GetParent()->GetName().Len() )
-+                sProjectName = this->GetParent()->GetName(); 
-+            sDialogUrl = sDialogUrl.concat( sProjectName ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) ); 
- 
-             uno::Reference< awt::XDialogProvider > xProvider( xFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.DialogProvider")), aArgs  ), uno::UNO_QUERY_THROW );
-             m_xDialog = xProvider->createDialog( sDialogUrl );
-@@ -1797,7 +1804,7 @@ void SbUserFormModule::InitObject()
-             aArgs[ 0 ] = uno::Any();
-             aArgs[ 1 ] <<= m_xDialog;
-             aArgs[ 2 ] <<= m_xModel;
--            pDocObject = new SbUnoObject( GetName(), uno::makeAny( xFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.UserForm")), aArgs  ) ) );
-+            pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.UserForm")), aArgs  ) ) );
-             uno::Reference< lang::XComponent > xComponent( aArgs[ 1 ], uno::UNO_QUERY_THROW );
-             // remove old listener if it exists
-             FormObjEventListenerImpl* pFormListener = dynamic_cast< FormObjEventListenerImpl* >( m_DialogListener.get() );
---- basic/source/inc/runtime.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ basic/source/inc/runtime.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -206,7 +206,6 @@ class SbiInstance
- 	BOOL			bCompatibility; // Flag: TRUE = VBA runtime compatibility mode
- 
-     ComponentVector_t ComponentVector;
--
- public:
- 	SbiRuntime*  pRun;        		// Call-Stack
- 	SbiInstance* pNext;             // Instanzen-Chain
---- basic/source/runtime/methods.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ basic/source/runtime/methods.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -844,6 +844,15 @@ RTLFUNC(SendKeys) // JSM
- 	StarBASIC::Error(SbERR_NOT_IMPLEMENTED);
- }
- 
-+// Stub, basic already yields by default
-+RTLFUNC(DoEvents)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+	rPar.Get(0)->PutInteger( 0 );
-+}
-+
- RTLFUNC(Exp)
- {
-     (void)pBasic;
---- basic/source/runtime/rtlproto.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ basic/source/runtime/rtlproto.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -167,6 +167,7 @@ extern RTLFUNC(Kill); // JSM
- extern RTLFUNC(MkDir); // JSM
- extern RTLFUNC(RmDir); // JSM
- extern RTLFUNC(SendKeys); // JSM
-+extern RTLFUNC(DoEvents);
- extern RTLFUNC(DimArray);
- extern RTLFUNC(Dir);
- extern RTLFUNC(Exp);
---- basic/source/runtime/stdobj.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ basic/source/runtime/stdobj.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -478,6 +478,7 @@ static Methods aMethods[] = {
- { "SendKeys",       SbxNULL,      2 | _FUNCTION, RTLNAME(SendKeys),0        },
-   { "String",       SbxSTRING, 0,NULL,0 },
-   { "Wait",         SbxBOOL,          _OPT, NULL,0 },
-+{ "DoEvents",       SbxINTEGER,      0 | _FUNCTION, RTLNAME(DoEvents),0        },
- { "SetAttr",        SbxNULL,      2 | _FUNCTION, RTLNAME(SetAttr),0         },
-   { "File"  ,       SbxSTRING, 0,NULL,0 },
-   { "Attributes",   SbxINTEGER, 0,NULL,0 },
---- basic/source/runtime/step2.cxx.old	2009-04-02 10:49:15.000000000 +0000
-+++ basic/source/runtime/step2.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -56,57 +56,6 @@ using com::sun::star::uno::Reference;
- 
- SbxVariable* getVBAConstant( const String& rName );
- 
--const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") );
--const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
--//  i#i68894#
--SbxArray* getVBAGlobals( )
--{
--	static SbxArrayRef pArray;
--	static bool isInitialised = false;
--	if ( isInitialised )
--		return pArray;
--	Reference < XComponentContext > xCtx;
--	Reference < XPropertySet > xProps(
--	::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
--	xCtx.set( xProps->getPropertyValue( rtl::OUString(
--		RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))),
--			UNO_QUERY_THROW );
--	SbUnoObject dGlobs( String( RTL_CONSTASCII_USTRINGPARAM("ExcelGlobals") ), xCtx->getValueByName( ::rtl::OUString::createFromAscii( "/singletons/ooo.vba.theGlobals") ) );
--
--	SbxVariable *vba = dGlobs.Find( String( RTL_CONSTASCII_USTRINGPARAM("getGlobals") ) , SbxCLASS_DONTCARE );
--
--	if ( vba )
--	{
--		pArray = static_cast<SbxArray *>(vba->GetObject());
--		isInitialised = true;
--		return pArray;
--	}
--	return NULL;
--}
--
--//  i#i68894#
--SbxVariable* VBAFind( const String& rName, SbxClassType t )
--{
--	if( rName == aThisComponent )
--		return NULL;
--
--	SbxArray *pVBAGlobals = getVBAGlobals( );
--	for (USHORT i = 0; pVBAGlobals && i < pVBAGlobals->Count(); i++)
--	{
--		SbxVariable *pElem = pVBAGlobals->Get( i );
--		if (!pElem || !pElem->IsObject())
--			continue;
--		SbxObject *pVba = static_cast<SbxObject *>(pElem->GetObject());
--		SbxVariable *pVbaVar = pVba ? pVba->Find( rName, t ) : NULL;
--		if( pVbaVar )
--		{
--			return pVbaVar;
--		}
--	}
--	return NULL;
--
--}
--
- // Suchen eines Elements
- // Die Bits im String-ID:
- // 0x8000 - Argv ist belegt
-@@ -191,7 +140,7 @@ SbxVariable* SbiRuntime::FindElement
- 				if ( bVBAEnabled )
- 				{
- 					// Try Find in VBA symbols space
--					pElem = VBAFind( aName, SbxCLASS_DONTCARE );
-+					pElem = rBasic.VBAFind( aName, SbxCLASS_DONTCARE );
- 					if ( pElem )
- 						bSetName = false; // don't overwrite uno name
- 					else
---- forms/source/misc/InterfaceContainer.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ forms/source/misc/InterfaceContainer.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -132,9 +132,8 @@ OInterfaceContainer::fakeVbaEventsHack(
- 		// we'll ignore,  we'll get called back here  anyway )
- 		Reference< XChild > xChild(  xForm->getParent(), UNO_QUERY_THROW );
- 		Reference< XModel > xDocOwner( xChild->getParent(), UNO_QUERY );
--		Reference< XCodeNameQuery > xNameQuery( xDocOwner, UNO_QUERY );
- 		OSL_TRACE(" Is DOC ????? %s", xDocOwner.is() ? "true" : "false" );
--		if ( xDocOwner.is() && xNameQuery.is() )
-+		if ( xDocOwner.is() )
- 		{
- 			bool hasVBABindings = lcl_hasVbaEvents( m_xEventAttacher->getScriptEvents( _nIndex ) );  
- 			if ( hasVBABindings )
-@@ -143,12 +142,14 @@ OInterfaceContainer::fakeVbaEventsHack(
- 				return;
- 			}
- 			Reference< XMultiServiceFactory > xFac(  comphelper::getProcessServiceFactory(), UNO_QUERY );
--			if ( xFac.is() )
-+			Reference< XMultiServiceFactory > xDocFac(  xDocOwner, UNO_QUERY );
-+			if ( xFac.is() && xDocFac.is() )
- 			{
- 				try
- 				{
- 					Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( xFac->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBAToOOEventDesc" ) ), UNO_QUERY_THROW );
- 					Reference< XInterface > xIf( getByIndex( _nIndex ) , UNO_QUERY_THROW );
-+					Reference< XCodeNameQuery > xNameQuery(  xDocFac->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBACodeNameProvider" ) ), UNO_QUERY_THROW );
- 					rtl::OUString sCodeName;	
- 					sCodeName = xNameQuery->getCodeNameForObject( xIf );
- 					Reference< XPropertySet > xProps( xIf, UNO_QUERY );
---- offapi/com/sun/star/document/XCompatWriterDocProperties.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ offapi/com/sun/star/document/XCompatWriterDocProperties.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,49 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XDocumentProperties.idl,v $
-+ * $Revision: 1.5 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __com_sun_star_document_XCompatWriterDocProperties_idl__
-+#define __com_sun_star_document_XCompatWriterDocProperties_idl__
-+
-+#ifndef __com_sun_star_document_XDocumentProperties_idl__
-+#include <com/sun/star/document/XDocumentProperties.idl>
-+#endif
-+//=============================================================================
-+
-+module com {   module sun {   module star {   module document {
-+interface XCompatWriterDocProperties
-+{
-+//    interface ::com::sun::star::document::XDocumentProperties;
-+    [attribute] string Manager;
-+    [attribute] string Category;
-+    [attribute] string Company;
-+
-+
-+}; }; }; };
-+};
-+#endif
---- offapi/com/sun/star/document/makefile.mk.old	2009-04-06 16:42:00.000000000 +0000
-+++ offapi/com/sun/star/document/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -118,6 +118,7 @@ IDLFILES=\
-     XDocumentLanguages.idl \
-     XCodeNameQuery.idl \
-     XDocumentEventCompatibleHelper.idl \
-+    XCompatWriterDocProperties.idl \
-     VbaEventId.idl \
-     XVbaEventsHelper.idl \
-     VbaEventsHelper.idl \
---- oovbaapi/ooo/vba/ControlProvider.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/ControlProvider.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,54 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XGlobals.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_ControlProvider_idl__
-+#define __ooo_vba_ControlProvider_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __com_sun_star_frame_XModel_idl__
-+#include <com/sun/star/frame/XModel.idl>
-+#endif
-+
-+
-+module ooo {  module vba { 
-+
-+interface XControlProvider;
-+
-+service ControlProvider 
-+{
-+    interface ::ooo::vba::XControlProvider;
-+};
-+
-+}; };
-+
-+#endif
-+
---- oovbaapi/ooo/vba/Globals.idl.old	2009-04-02 10:36:29.000000000 +0000
-+++ oovbaapi/ooo/vba/Globals.idl	1970-01-01 00:00:00.000000000 +0000
-@@ -1,48 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: Globals.idl,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--
--#ifndef __ooo_vba_Globals_idl__
--#define __ooo_vba_Globals_idl__
--
--#ifndef __ooo_vba_XGlobals_idl__
--#include <ooo/vba/XGlobals.idl>
--#endif
--
--#include <com/sun/star/uno/XComponentContext.idl>
--#include <com/sun/star/table/XCellRange.idl>
--
--module ooo {  module vba {
--service Globals : XGlobals
--{
--};
--
--}; };
--
--#endif
---- oovbaapi/ooo/vba/XApplicationBase.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/XApplicationBase.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,61 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XApplicationBase_idl__
-+#define __ooo_vba_XApplicationBase_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba { 
-+//=============================================================================
-+
-+interface XApplicationBase
-+{
-+	interface ::ooo::vba::XHelperInterface;
-+
-+	[attribute] boolean ScreenUpdating;
-+	[attribute] boolean DisplayStatusBar;
-+
-+    any CommandBars( [in] any aIndex );
-+};
-+
-+}; };
-+
-+#endif
---- oovbaapi/ooo/vba/XControlProvider.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/XControlProvider.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,64 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XGlobals.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XControlProvider_idl__
-+#define __ooo_vba_XControlProvider_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __com_sun_star_frame_XModel_idl__
-+#include <com/sun/star/frame/XModel.idl>
-+#endif
-+
-+#ifndef __com_sun_star_awt_XControl_idl__
-+#include <com/sun/star/awt/XControl.idl>
-+#endif
-+
-+#ifndef __com_sun_star_drawing_XControlShape_idl__
-+#include <com/sun/star/drawing/XControlShape.idl>
-+#endif
-+#ifndef __ooo_vba_msforms_XControl_idl__
-+#include <ooo/vba/msforms/XControl.idl>
-+#endif
-+
-+module ooo {  module vba { 
-+
-+interface XControlProvider 
-+{
-+   ::ooo::vba::msforms::XControl createControl( [in] ::com::sun::star::drawing::XControlShape xControl, [in] ::com::sun::star::frame::XModel xDocOwner );
-+   ::ooo::vba::msforms::XControl createUserformControl( [in] ::com::sun::star::awt::XControl xControl, [in] ::com::sun::star::awt::XControl xDialog, [in] ::com::sun::star::frame::XModel xDocOwner );
-+
-+};
-+
-+}; };
-+
-+#endif
-+
---- oovbaapi/ooo/vba/XDocumentBase.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/XDocumentBase.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,67 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XDocumentBase_idl__
-+#define __ooo_vba_XDocumentBase_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba { 
-+//=============================================================================
-+
-+interface XDocumentBase
-+{
-+	interface ::ooo::vba::XHelperInterface;
-+
-+	[attribute, readonly] string  Name;
-+	[attribute, readonly] string  Path;
-+	[attribute, readonly] string  FullName;
-+	[attribute] boolean Saved;
-+
-+	void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook);
-+	void Save();
-+	void Activate();
-+	void Protect( [in] any Password );
-+	void Unprotect( [in] any Password );
-+};
-+
-+}; };
-+
-+#endif
---- oovbaapi/ooo/vba/XDocumentProperties.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/XDocumentProperties.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,71 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XDocument.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __ooo_vba_XDocumentProperties_idl__
-+#define __ooo_vba_XDocumentProperties_idl__
-+
-+#ifndef __com_sun_star_script_BasicErrorException_idl__
-+#include <com/sun/star/script/BasicErrorException.idl>
-+#endif
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+module ooo { module vba { 
-+interface XDocumentProperty;
-+interface XDocumentProperties
-+{
-+    interface XCollection;
-+    /** Creates a new custom document property.
-+     * You can only add a new document property to the custom DocumentProperties collection. Depending on value of
-+     * boolean LinkSource, either (False) Value or (True) LinkSource must be provided.
-+     * @param Name (Required String. The name of the property.
-+     * @param LinkToContent Specifies whether the property is linked to the contents of the container document. If this argument is True, the LinkSource argument is required; if it's False, the value argument is required.
-+     * @param Type The data type of the property. Can be one of the following MsoDocProperties constants:
-+     * msoPropertyTypeBoolean, msoPropertyTypeDate, msoPropertyTypeFloat, msoPropertyTypeNumber, or msoPropertyTypeString.
-+     * @param Value The value of the property, if it's not linked to the contents of the container document.
-+     * The value is converted to match the data type specified by the type argument, if it can't be converted, an error occurs.
-+     * If LinkToContent is True, the Value argument is ignored and the new document property is assigned a default value
-+     * until the linked property values are updated by the container application (usually when the document is saved).
-+     * @param LinkSource Ignored if LinkToContent is False. The source of the linked property. The container application determines
-+     * what types of source linking you can use.
-+     */
-+    XDocumentProperty Add([in] string Name, [in] boolean LinkToContent, [in] /* MsoDocProperties */ byte Type, [in] any Value, 
-+        [in] /*optional*/ any LinkSource)
-+        raises (com::sun::star::script::BasicErrorException);
-+};
-+
-+}; };
-+
-+#endif
-+
---- oovbaapi/ooo/vba/XDocumentProperty.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/XDocumentProperty.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,106 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XDocument.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __ooo_vba_XDocumentProperty_idl__
-+#define __ooo_vba_XDocumentProperty_idl__
-+
-+#ifndef __com_sun_star_script_BasicErrorException_idl__
-+#include <com/sun/star/script/BasicErrorException.idl>
-+#endif
-+#ifndef __com_sun_star_script_XDefaultProperty_idl__
-+#include <com/sun/star/script/XDefaultProperty.idl>
-+#endif
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo { module vba { 
-+
-+/**
-+ * Specific built-in document property. Use CustomDocumentProperties(index),
-+ * where index is the name or index number of the custom document property,
-+ * to return a DocumentProperty object that represents a specific custom document property.
-+ */
-+interface XDocumentProperty 
-+{
-+   
-+    interface com::sun::star::script::XDefaultProperty;
-+    interface ooo::vba::XHelperInterface;
-+
-+    void Delete()
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    /** Required String. The name of the property.
-+     */
-+    string getName()
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    void setName([in] string Name)
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    /** The data type of the property.
-+     * Can be one of the following MsoDocProperties constants:
-+     * msoPropertyTypeBoolean, msoPropertyTypeDate, msoPropertyTypeFloat,
-+     * msoPropertyTypeNumber, or msoPropertyTypeString.
-+     */
-+    byte getType()
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    void setType([in] byte Type)
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    /** If true, then LinkSource has a valid value. */
-+    boolean getLinkToContent()
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    void setLinkToContent([in] boolean LinkToContent)
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    /** If LinkToContent is false, then this contains the value of the property
-+     * The data type of the value will match the Type property.
-+     */
-+    any getValue()
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    void setValue([in] any Value)
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    /** If LinkToContent is false, then this contains the value of the property */
-+    string getLinkSource()
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    void setLinkSource([in] string LinkSource)
-+        raises (com::sun::star::script::BasicErrorException);
-+};
-+
-+}; };
-+
-+#endif
-+
---- oovbaapi/ooo/vba/XGlobals.idl.old	2009-04-02 10:36:29.000000000 +0000
-+++ oovbaapi/ooo/vba/XGlobals.idl	1970-01-01 00:00:00.000000000 +0000
-@@ -1,67 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: XGlobals.idl,v $
-- * $Revision: 1.4 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef __ooo_vba_XGlobals_idl__
--#define __ooo_vba_XGlobals_idl__
--
--#ifndef __com_sun_star_uno_XInterface_idl__
--#include <com/sun/star/uno/XInterface.idl>
--#endif
--#ifndef __ooo_vba_excel_XApplication_idl__
--#include <ooo/vba/excel/XApplication.idl>
--#endif
--#ifndef __ooo_vba_excel_XWorkbook_idl__
--#include <ooo/vba/excel/XWorkbook.idl>
--#endif
--#ifndef __ooo_vba_excel_XWorksheet_idl__
--#include <ooo/vba/excel/XWorksheet.idl>
--#endif
--
--module ooo {  module vba { 
--
--interface XGlobals: com::sun::star::uno::XInterface
--{
--        // FIXME, need better way to expose globals
--	sequence< any > getGlobals();
--
--	[attribute, readonly] ooo::vba::excel::XApplication Application;
--	[attribute, readonly] ooo::vba::excel::XWorkbook ActiveWorkbook;
--	[attribute, readonly] ooo::vba::excel::XWorksheet ActiveSheet;
--	any WorkSheets( [in] any aIndex );
--	any WorkBooks( [in] any aIndex );
--	any Sheets( [in] any aIndex );
--	any Range( [in] any Cell1, [in] any Cell2 );
--	any Names( [in] any Index );
--};
--
--}; };
--
--#endif
--
--
---- oovbaapi/ooo/vba/XGlobalsBase.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/XGlobalsBase.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,53 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XGlobals.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XGlobalsBase_idl__
-+#define __ooo_vba_XGlobalsBase_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+#ifndef __com_sun_star_lang_XMultiServiceFactory
-+#include <com/sun/star/lang/XMultiServiceFactory.idl>
-+#endif
-+module ooo {  module vba {
-+interface XGlobalsBase
-+{
-+	interface ::ooo::vba::XHelperInterface;
-+	interface ::com::sun::star::lang::XMultiServiceFactory;
-+};
-+
-+}; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/XWindowBase.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/XWindowBase.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XHelperWindow_idl__
-+#define __ooo_vba_XHelperWindow_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba { 
-+//=============================================================================
-+
-+interface XWindowBase
-+{
-+	interface ::ooo::vba::XHelperInterface;
-+
-+	[attribute] long Height; 
-+	[attribute] long Left; 
-+	[attribute] long Top; 
-+	[attribute] boolean Visible;
-+	[attribute] long Width; 
-+};
-+
-+}; };
-+
-+#endif
---- oovbaapi/ooo/vba/excel/Globals.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/excel/Globals.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,48 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: Globals.idl,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __ooo_vba_excel_Globals_idl__
-+#define __ooo_vba_excel_Globals_idl__
-+
-+#ifndef __ooo_vba_excel_XGlobals_idl__
-+#include <ooo/vba/excel/XGlobals.idl>
-+#endif
-+
-+#include <com/sun/star/uno/XComponentContext.idl>
-+#include <com/sun/star/table/XCellRange.idl>
-+
-+module ooo {  module vba { module excel {
-+service Globals : XGlobals
-+{
-+};
-+
-+}; }; };
-+
-+#endif
---- oovbaapi/ooo/vba/excel/XApplication.idl.old	2009-04-06 16:41:59.000000000 +0000
-+++ oovbaapi/ooo/vba/excel/XApplication.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -42,10 +42,6 @@
- #include <ooo/vba/XAssistant.idl>
- #endif
- 
--#ifndef __ooo_vba_XCommandBars_idl__
--#include <ooo/vba/XCommandBars.idl>
--#endif
--
- module ooo {  module vba {  module excel { 
- 
- interface XRange;
-@@ -56,10 +52,10 @@ interface XWorksheetFunction;
- interface XWindow;
- interface XWorksheet;
- 
--interface XApplication
-+interface XApplication : com::sun::star::uno::XInterface
- {
- 
--	interface ::ooo::vba::XHelperInterface;
-+//	interface ::ooo::vba::XHelperInterface;
- 
- 	[attribute, readonly] any Selection;
- 	[attribute, readonly] XWorkbook ActiveWorkbook;
-@@ -74,8 +70,6 @@ interface XApplication
- 	// to determine this
- 	[attribute, readonly] XWorkbook ThisWorkbook;
- 	[attribute, readonly] string Name;
--	[attribute] boolean ScreenUpdating;
--	[attribute] boolean DisplayStatusBar;
- 	[attribute] boolean DisplayAlerts;
- 	[attribute] boolean DisplayFormulaBar;
- 	[attribute] any CutCopyMode;
-@@ -90,7 +84,7 @@ interface XApplication
- 	string LibraryPath() raises(com::sun::star::script::BasicErrorException);
- 	string TemplatesPath() raises(com::sun::star::script::BasicErrorException);
- 	string PathSeparator() raises(com::sun::star::script::BasicErrorException);
--    any CommandBars( [in] any aIndex );
-+    //any CommandBars( [in] any aIndex );
- 	any Workbooks( [in] any aIndex );
- 	any Worksheets( [in] any aIndex );
- 	any Windows( [in] any aIndex );
-@@ -109,7 +103,6 @@ interface XApplication
- 	XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
-         raises(com::sun::star::script::BasicErrorException);
- 	void Volatile([in] any Volatile);
--	void DoEvents();
- 	any Caller( [in] any aIndex );
- };
- 
---- oovbaapi/ooo/vba/excel/XGlobals.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/excel/XGlobals.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,86 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XGlobals.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_excel_XGlobals_idl__
-+#define __ooo_vba_excel_XGlobals_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+#ifndef __com_sun_star_script_BasicErrorException_idl__
-+#include <com/sun/star/script/BasicErrorException.idl>
-+#endif
-+#ifndef __ooo_vba_excel_XWorkbook_idl__
-+#include <ooo/vba/excel/XWorkbook.idl>
-+#endif
-+#ifndef __ooo_vba_excel_XWorksheet_idl__
-+#include <ooo/vba/excel/XWorksheet.idl>
-+#endif
-+#ifndef __ooo_vba_XAssistant_idl__
-+#include <ooo/vba/XAssistant.idl>
-+#endif
-+
-+module ooo {  module vba {  module excel {
-+interface XRange;
-+interface XWindow;
-+interface XGlobals: com::sun::star::uno::XInterface
-+{
-+	[attribute, readonly] ooo::vba::excel::XWorkbook ActiveWorkbook;
-+	[attribute, readonly] ooo::vba::excel::XWorksheet ActiveSheet;
-+	[attribute, readonly] ooo::vba::excel::XWindow ActiveWindow;
-+	[attribute, readonly] ooo::vba::excel::XRange ActiveCell;
-+	[attribute, readonly] ooo::vba::XAssistant Assistant;
-+	[attribute, readonly] any Selection;
-+	[attribute, readonly] XWorkbook ThisWorkbook;
-+
-+	void Calculate() raises(com::sun::star::script::BasicErrorException);
-+	XRange Cells([in] any RowIndex, [in] any ColumnIndex);
-+	XRange Columns([in] any aIndex);
-+	any CommandBars( [in] any aIndex );
-+	any Evaluate( [in] string Name );
-+XRange Intersect([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
-+        raises(com::sun::star::script::BasicErrorException);
-+	any WorkSheets( [in] any aIndex );
-+	any WorkBooks( [in] any aIndex );
-+	any WorksheetFunction();
-+	any Windows( [in] any aIndex );
-+	any Sheets( [in] any aIndex );
-+	any Range( [in] any Cell1, [in] any Cell2 );
-+	XRange Rows([in] any aIndex);
-+	any Names( [in] any Index );
-+	XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
-+        raises(com::sun::star::script::BasicErrorException);
-+
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/excel/XWindow.idl.old	2009-04-02 10:36:29.000000000 +0000
-+++ oovbaapi/ooo/vba/excel/XWindow.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -46,10 +46,8 @@ module ooo {  module vba {  module excel
- interface XRange;
- interface XWorksheet;
- interface XPane;
--interface XWindow
-+interface XWindow : com::sun::star::uno::XInterface
- {
--	interface ::ooo::vba::XHelperInterface;
--
- 	[attribute] any Caption;
- 	[attribute] boolean DisplayGridlines; 
- 	[attribute] boolean DisplayHeadings; 
-@@ -58,8 +56,6 @@ interface XWindow
- 	[attribute] boolean DisplayVerticalScrollBar; 
- 	[attribute] boolean DisplayWorkbookTabs; 
- 	[attribute] boolean FreezePanes; 
--	[attribute] long Height; 
--	[attribute] long Left; 
- 	[attribute] boolean Split; 
- 	[attribute] long SplitColumn;
- 	[attribute] double SplitHorizontal;
-@@ -67,10 +63,7 @@ interface XWindow
- 	[attribute] double SplitVertical;
- 	[attribute] any ScrollColumn;
- 	[attribute] any ScrollRow;
--	[attribute] long Top; 
- 	[attribute] any View;
--	[attribute] boolean Visible;
--	[attribute] long Width; 
- 	[attribute] any WindowState;
- 	[attribute] any Zoom;
- 	any SelectedSheets( [in] any aIndex );
---- oovbaapi/ooo/vba/excel/XWorkbook.idl.old	2009-04-02 10:36:29.000000000 +0000
-+++ oovbaapi/ooo/vba/excel/XWorkbook.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -48,31 +48,19 @@ interface XWorksheet;
- interface XWorksheets;
- interface XStyles;
- 
--interface XWorkbook
-+interface XWorkbook : com::sun::star::uno::XInterface
- {
--	interface ::ooo::vba::XHelperInterface;
--
--	[attribute, readonly] string  Name;
--	[attribute, readonly] string  Path;
--	[attribute, readonly] string  FullName;
- 	[attribute, readonly] boolean ProtectStructure; 
- 	[attribute, readonly] XWorksheet ActiveSheet;
--	[attribute] boolean Saved;
- 	[attribute, readonly] string  CodeName;
- 
- 	any  Worksheets([in] any sheet);
- 	any  Styles([in] any Index );
- 	any  Sheets([in] any sheet);
- 	any  Windows([in] any index );
--	void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook);
--	void Protect( [in] any Password );
--	void Unprotect( [in] any Password );
--	void Save();
--	void Activate();
- 	void ResetColors() raises (com::sun::star::script::BasicErrorException);
--
-+	void Activate();
- 	any Names( [in] any Index );
--
- 	any Colors([in] any Index) raises (com::sun::star::script::BasicErrorException);
- 	long FileFormat() raises (com::sun::star::script::BasicErrorException);
- 	void SaveCopyAs( [in] string Filename );
---- oovbaapi/ooo/vba/excel/makefile.mk.old	2009-04-06 16:41:59.000000000 +0000
-+++ oovbaapi/ooo/vba/excel/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -41,7 +41,9 @@ PACKAGE=ooo$/vba$/Excel
- # ------------------------------------------------------------------------
- 
- 
--IDLFILES= XApplication.idl\
-+IDLFILES= XGlobals.idl\
-+	Globals.idl\
-+	XApplication.idl\
- 	XComment.idl\
- 	XComments.idl\
- 	XRange.idl\
---- oovbaapi/ooo/vba/makefile.mk.old	2009-04-06 16:42:00.000000000 +0000
-+++ oovbaapi/ooo/vba/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -42,7 +42,6 @@ PACKAGE=ooo$/vba
- 
- IDLFILES=\
- 	XErrObject.idl \
--	XGlobals.idl \
- 	XCollection.idl\
- 	XVBAToOOEventDescGen.idl\
- 	XPropValue.idl\
-@@ -54,7 +53,14 @@ IDLFILES=\
- 	XCommandBars.idl\
- 	XCommandBarPopup.idl\
- 	XCommandBarButton.idl\
--	Globals.idl\
-+	XControlProvider.idl\
-+	ControlProvider.idl\
-+	XApplicationBase.idl\
-+	XWindowBase.idl\
-+	XDocumentBase.idl\
-+	XGlobalsBase.idl\
-+	XDocumentProperty.idl\
-+	XDocumentProperties.idl\
- 
- # ------------------------------------------------------------------
- 
---- oovbaapi/ooo/vba/word/XApplication.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XApplication.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,63 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XApplication.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XApplication_idl__
-+#define __ooo_vba_word_XApplication_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XDocument;
-+interface XWindow;
-+interface XSystem;
-+interface XOptions;
-+interface XSelection;
-+interface XApplication : com::sun::star::uno::XInterface
-+{
-+	[attribute, readonly] XDocument ActiveDocument;
-+	[attribute, readonly] XWindow ActiveWindow;
-+	[attribute, readonly] string Name;
-+	[attribute, readonly] ooo::vba::word::XSystem System;
-+	[attribute, readonly] ooo::vba::word::XOptions Options;
-+	[attribute, readonly] ooo::vba::word::XSelection Selection;
-+    any CommandBars( [in] any aIndex );
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/XBookmark.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XBookmark.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,61 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XBookmark_idl__
-+#define __ooo_vba_word_XBookmark_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+#ifndef __com_sun_star_container_XNamed_idl__
-+#include <com/sun/star/container/XNamed.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XBookmark
-+{
-+    interface ooo::vba::XHelperInterface;
-+	interface ::com::sun::star::container::XNamed;
-+
-+    void Delete();
-+    void Select();
-+    any Range();
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/XBookmarks.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XBookmarks.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,61 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XBookmarks_idl__
-+#define __ooo_vba_word_XBookmarks_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+
-+interface XBookmarks 
-+{
-+	interface ::ooo::vba::XCollection;
-+
-+    [attribute] long DefaultSorting;
-+    [attribute] boolean ShowHidden;
-+
-+	any Add( [in] string Name, [in] any Range );
-+    boolean Exists( [in] string Name );
-+};
-+
-+}; }; };
-+
-+#endif
---- oovbaapi/ooo/vba/word/XDocument.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XDocument.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XDocument.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XDocument_idl__
-+#define __ooo_vba_word_XDocument_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_word_XRange_idl__
-+#include <ooo/vba/word/XRange.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XDocument : com::sun::star::uno::XInterface
-+{
-+    [attribute, readonly] XRange Content;
-+
-+    XRange Range( [in] any Start, [in] any End );
-+    any BuiltInDocumentProperties( [in] any index );
-+    any CustomDocumentProperties( [in] any index );
-+    any Bookmarks( [in] any aIndex );
-+    any Variables( [in] any aIndex );
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/XGlobals.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XGlobals.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XGlobals.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XGlobals_idl__
-+#define __ooo_vba_word_XGlobals_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+interface XDocument;
-+interface XWindow;
-+interface XSystem;
-+interface XOptions;
-+interface XSelection;
-+interface XGlobals : com::sun::star::uno::XInterface
-+{
-+	[attribute, readonly] XDocument ActiveDocument;
-+	[attribute, readonly] XWindow ActiveWindow;
-+	[attribute, readonly] string Name;
-+	[attribute, readonly] ooo::vba::word::XSystem System;
-+	[attribute, readonly] ooo::vba::word::XOptions Options;
-+	[attribute, readonly] ooo::vba::word::XSelection Selection;
-+    any CommandBars( [in] any aIndex );
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/XOptions.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XOptions.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,54 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XOptions_idl__
-+#define __ooo_vba_word_XOptions_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XOptions
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    any DefaultFilePath( [in] long Path );
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/XPane.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XPane.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XPane_idl__
-+#define __ooo_vba_word_XPane_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XPane
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    any View();
-+    void Close();
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/XPanes.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XPanes.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XPanes_idl__
-+#define __ooo_vba_word_XPanes_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+
-+interface XPanes 
-+{
-+	interface ::ooo::vba::XCollection;
-+};
-+
-+}; }; };
-+
-+#endif
---- oovbaapi/ooo/vba/word/XRange.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XRange.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,57 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XRange_idl__
-+#define __ooo_vba_word_XRange_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XRange
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute] string Text;
-+
-+    void InsertBreak( [in] any Type );
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/XSelection.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XSelection.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XSelection_idl__
-+#define __ooo_vba_word_XSelection_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XSelection
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute] string Text;
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/XSystem.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XSystem.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,56 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XSystem_idl__
-+#define __ooo_vba_word_XSystem_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XSystem
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute] long Cursor;
-+    any PrivateProfileString( [in] string Filename, [in] string Section, [in] string Key );
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/XVariable.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XVariable.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,60 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XVariable_idl__
-+#define __ooo_vba_word_XVariable_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+#ifndef __com_sun_star_container_XNamed_idl__
-+#include <com/sun/star/container/XNamed.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XVariable
-+{
-+    interface ooo::vba::XHelperInterface;
-+	interface ::com::sun::star::container::XNamed;
-+
-+    [attribute] any Value;
-+    [attribute, readonly] long Index;
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/XVariables.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XVariables.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,57 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XVariables_idl__
-+#define __ooo_vba_word_XVariables_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+
-+interface XVariables 
-+{
-+	interface ::ooo::vba::XCollection;
-+
-+	any Add( [in] string Name, [in] any Value );
-+};
-+
-+}; }; };
-+
-+#endif
---- oovbaapi/ooo/vba/word/XView.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XView.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,57 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XView_idl__
-+#define __ooo_vba_word_XView_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XView
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute] long SeekView;
-+    [attribute] long SplitSpecial;
-+    [attribute] boolean TableGridLines;
-+    [attribute] long Type;
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/XWindow.idl.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/XWindow.idl	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XWindow.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XWindow_idl__
-+#define __ooo_vba_word_XWindow_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+//interface XPane;
-+interface XWindow : com::sun::star::uno::XInterface
-+{
-+    [attribute] any View;
-+	void Activate();
-+    void Close([in] any SaveChanges, [in] any RouteDocument);
-+	any Panes( [in] any aIndex ); // this is a fake api for it seems not support in Write
-+	any ActivePane(); // this is a fake api for it seems not support in Write
-+};
-+
-+//=============================================================================
-+
-+}; }; };
-+
-+#endif
-+
-+
---- oovbaapi/ooo/vba/word/makefile.mk.old	1970-01-01 00:00:00.000000000 +0000
-+++ oovbaapi/ooo/vba/word/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,63 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.4 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+PRJ=..$/..$/..
-+
-+PRJNAME=oovapi
-+
-+TARGET=word
-+PACKAGE=ooo$/vba$/Word
-+
-+# --- Settings -----------------------------------------------------
-+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-+
-+# ------------------------------------------------------------------------
-+
-+
-+IDLFILES= XGlobals.idl\
-+	XApplication.idl \
-+	XDocument.idl \
-+	XWindow.idl \
-+	XSystem.idl \
-+	XRange.idl \
-+	XBookmark.idl \
-+	XBookmarks.idl \
-+	XVariable.idl \
-+	XVariables.idl \
-+	XView.idl \
-+	XPane.idl \
-+	XPanes.idl \
-+	XOptions.idl \
-+	XSelection.idl \
-+
-+# ------------------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
---- oovbaapi/prj/build.lst.old	2009-04-02 10:36:28.000000000 +0000
-+++ oovbaapi/prj/build.lst	2009-04-06 16:42:01.000000000 +0000
-@@ -4,5 +4,6 @@ ovba	oovbaapi\genconstidl
- ovba	oovbaapi\ooo\vba\constants          nmake	-	all	ovba_constants  ovba_genconstidl NULL
- ovba	oovbaapi\ooo\vba                    nmake	-	all	ovba_vba NULL
- ovba	oovbaapi\ooo\vba\excel              nmake	-	all	ovba_excel NULL
-+ovba	oovbaapi\ooo\vba\word               nmake	-	all	ovba_word NULL
- ovba	oovbaapi\ooo\vba\msforms            nmake	-	all	ovba_msforms NULL
--ovba    oovbaapi\util                       nmake       -       all     ovba_util ovba_vba ovba_excel ovba_msforms ovba_constants ovba_genconstidl NULL
-+ovba   oovbaapi\util                             nmake   -   all ovba_util ovba_vba ovba_excel ovba_word ovba_msforms ovba_constants ovba_genconstidl NULL
---- oovbaapi/util/makefile.mk.old	2009-04-06 16:41:59.000000000 +0000
-+++ oovbaapi/util/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -44,6 +44,7 @@ TARGET=oovbaapi_db
- UNOIDLDBFILES= \
- 	$(UCR)$/vba.db \
- 	$(UCR)$/excel.db \
-+	$(UCR)$/word.db \
- 	$(UCR)$/msforms.db \
- 	$(UCR)$/constants.db
- 
---- sc/inc/docuno.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/inc/docuno.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -77,8 +77,6 @@ class SvxFmDrawPage;
- class SvxDrawPage;
- class ScRangeList;
- 
--#include <com/sun/star/document/XCodeNameQuery.hpp>
--
- class SC_DLLPUBLIC ScModelObj : public SfxBaseModel,
- 					public com::sun::star::sheet::XSpreadsheetDocument,
- 					public com::sun::star::document::XActionLockable,
-@@ -92,7 +90,6 @@ class SC_DLLPUBLIC ScModelObj : public S
- 					public com::sun::star::view::XRenderable,
- 					public com::sun::star::document::XLinkTargetSupplier,
- 					public com::sun::star::beans::XPropertySet,
--					public com::sun::star::document::XCodeNameQuery,
-                     public com::sun::star::document::XDocumentEventCompatibleHelper,
- 					public SvxFmMSFactory,	// derived from XMultiServiceFactory
-                     public com::sun::star::lang::XServiceInfo,
-@@ -320,8 +317,6 @@ public:
-     virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::util::XChangesListener >& aListener )
-                                 throw (::com::sun::star::uno::RuntimeException);
--    virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj ) 
--                                throw(::com::sun::star::uno::RuntimeException); 
-                             // XVbaEventHelper
-     virtual sal_Bool SAL_CALL processCompatibleEvent( sal_Int16 nEventId ) throw (::com::sun::star::uno::RuntimeException);
- };
---- sc/inc/servuno.hxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/inc/servuno.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -94,7 +94,8 @@ class ScDocShell;
- #define SC_SERVICE_FORMULAPARS  38
- #define SC_SERVICE_OPCODEMAPPER 39
- #define SC_SERVICE_VBAOBJECTPROVIDER   40
--#define SC_SERVICE_COUNT        41
-+#define SC_SERVICE_VBACODENAMEPROVIDER   41
-+#define SC_SERVICE_COUNT        42
- #define SC_SERVICE_INVALID		USHRT_MAX
- 
- 
---- sc/prj/build.lst
-+++ sc/prj/build.lst
-@@ -1,4 +1,4 @@
--sc	sc	:	l10n oovbaapi svx stoc uui BOOST:boost formula oox NULL
-+sc     sc      :       l10n vbahelper oovbaapi svx stoc uui BOOST:boost formula oox NULL
- sc	sc							usr1	-	all	sc_mkout NULL
- sc	sc\inc							nmake	-	all	sc_inc NULL
- sc	sc\prj							get	-	all	sc_prj NULL
---- sc/source/core/tool/interpr4.cxx.old	2009-04-06 16:41:58.000000000 +0000
-+++ sc/source/core/tool/interpr4.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -77,6 +77,7 @@
- #include <map>
- #include <algorithm>
- #include <functional>
-+#include <vbahelper/vbahelper.hxx>
- 
- using namespace com::sun::star;
- using namespace formula;
-@@ -2513,18 +2514,11 @@ lcl_setVBARange( ScRange& aRange, ScDocu
- 	try
- 	{
- 		uno::Reference< uno::XInterface > xVBARange;
--		uno::Reference< lang::XMultiComponentFactory > xSMgr( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
--		uno::Reference< beans::XPropertySet > xProps( xSMgr, uno::UNO_QUERY_THROW );
--		uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
- 		uno::Reference<table::XCellRange> xCellRange = ScCellRangeObj::CreateRangeFromDoc( pDok, aRange );
--		// hmm probably better not to have to include the vba generated headers
--		// here, but... if they ever become always available certainly the
--		// line below is more coder friendly
--		//xRange = ooo::vba::excel::Range::createRangeFromXCellRange( xCtx , uno::Reference< ooo::vba::XHelperInterface >(), xCellRange );	
- 		uno::Sequence< uno::Any > aArgs(2);
- 		aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
- 		aArgs[1] = uno::Any( xCellRange );
--		xVBARange = xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Range") ), aArgs, xCtx  );
-+		xVBARange = ov::createVBAUnoAPIServiceWithArgs( pDok->GetDocumentShell(), "ooo.vba.excel.Range", aArgs );
- 		if ( xVBARange.is() )
- 		{
- 			String sDummy(RTL_CONSTASCII_USTRINGPARAM("A-Range") );
---- sc/source/filter/excel/excimp8.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/filter/excel/excimp8.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -103,8 +103,11 @@
- #include <com/sun/star/document/XDocumentProperties.hpp>
- #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
- #include <com/sun/star/script/ModuleInfo.hpp>
-+#include <basic/basmgr.hxx>
-+#include <cppuhelper/component_context.hxx>
- 
--
-+#include <com/sun/star/container/XNameContainer.hpp>
-+ 
- using namespace com::sun::star;
- 
- 
-@@ -255,16 +258,6 @@ void ImportExcel8::SheetProtection( void
-     GetSheetProtectBuffer().ReadOptions( aIn, GetCurrScTab() );
- }
- 
--bool lcl_hasVBAEnabled()
--{
--	uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY);
--		// test if vba service is present
--	uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY );
--	uno::Reference< uno::XInterface > xGlobals( xCtx->getValueByName( ::rtl::OUString::createFromAscii( "/singletons/ooo.vba.theGlobals") ), uno::UNO_QUERY );
--
--	return xGlobals.is();
--}
--
- void ImportExcel8::ReadBasic( void )
- {
-     //bHasBasic = TRUE;
-@@ -280,8 +273,11 @@ void ImportExcel8::ReadBasic( void )
-         bool bLoadStrg = pFilterOpt->IsLoadExcelBasicStorage();
-         if( bLoadCode || bLoadStrg )
-         {
-+            uno::Any aGlobs;
-+            aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.excel.Globals") );
-+            pShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
-             SvxImportMSVBasic aBasicImport( *pShell, *xRootStrg, bLoadCode, bLoadStrg );
--			bool bAsComment = !bLoadExecutable || !lcl_hasVBAEnabled();
-+	    bool bAsComment = !bLoadExecutable || !aGlobs.hasValue();
-             aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, bAsComment );
-             GetObjectManager().SetOleNameOverrideInfo( aBasicImport.ControlNameForObjectId() );
-         }
---- sc/source/filter/excel/xlescher.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/filter/excel/xlescher.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -44,6 +44,7 @@
- #include <basic/sbstar.hxx>
- #include <basic/sbmod.hxx>
- #include <basic/sbmeth.hxx>
-+#include <basic/basmgr.hxx>
- 
- using ::rtl::OUString;
- using ::com::sun::star::uno::Reference;
-@@ -305,6 +306,7 @@ Reference< XControlModel > XclControlHel
- }
- 
- #define EXC_MACRONAME_PRE "vnd.sun.star.script:Standard."
-+#define EXC_MACRO_SCHEME "vnd.sun.star.script:"
- #define EXC_MACRONAME_SUF "?language=Basic&location=document"
- 
- OUString XclControlHelper::GetScMacroName( const String& rXclMacroName, SfxObjectShell* pDocShell )
-@@ -312,9 +314,14 @@ OUString XclControlHelper::GetScMacroNam
-     String sTmp( rXclMacroName );
-     if( rXclMacroName.Len() > 0 )
-     {
-+        String sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
-+
-+        if ( pDocShell && pDocShell->GetBasicManager()->GetName().Len() > 0 )
-+            sProjectName = pDocShell->GetBasicManager()->GetName();
-+
-         if ( ( sTmp.Search( '.' ) == STRING_NOTFOUND) && pDocShell )
-         {
--            if( StarBASIC* pBasic = pDocShell->GetBasic() )
-+            if( StarBASIC* pBasic = pDocShell->GetBasicManager()->GetLib( sProjectName ) )
-             {
-                 if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sTmp, SbxCLASS_METHOD ) ) )
-                 {
-@@ -325,7 +332,9 @@ OUString XclControlHelper::GetScMacroNam
-                 }
-             }
-         }
--        return CREATE_OUSTRING( EXC_MACRONAME_PRE ) + sTmp + CREATE_OUSTRING( EXC_MACRONAME_SUF );
-+        sProjectName.Append( '.' ); 
-+        sTmp.Insert( sProjectName, 0 );
-+        return CREATE_OUSTRING( EXC_MACRO_SCHEME ) + sTmp + CREATE_OUSTRING( EXC_MACRONAME_SUF );
-     }
-     return OUString();
- }
---- sc/source/ui/docshell/docsh.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/docshell/docsh.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -131,7 +131,8 @@
- #include "cellsuno.hxx"
- #include <com/sun/star/document/XVbaEventsHelper.hpp>
- #include <com/sun/star/document/VbaEventId.hpp>
--
-+#include <basic/sbstar.hxx>
-+#include <basic/basmgr.hxx>
- using namespace com::sun::star;
- using namespace com::sun::star::document::VbaEventId;
- 
-@@ -284,6 +285,7 @@ void ScDocShell::BeforeXMLLoading()
-     if ( xEvt.is() )
-        xEvt->setIgnoreEvents( sal_True );
-     
-+// if VBA enabled then we need to  
-     // prevent unnecessary broadcasts and updates
-     DBG_ASSERT(pModificator == NULL, "The Modificator should not exist");
- 	pModificator = new ScDocShellModificator( *this );
-@@ -367,7 +369,14 @@ void ScDocShell::AfterXMLLoading(sal_Boo
-     }
-     else
- 		aDocument.SetInsertingFromOtherDoc( FALSE );
--
-+	// add vba globals ( if they are availabl )
-+	SfxObjectShell* pShell = aDocument.GetDocumentShell();
-+	if ( pShell )
-+	{
-+		uno::Any aGlobs;
-+		aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ) );
-+		pShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
-+	}
-         // suppress VBA events when loading the xml
-         uno::Reference< document::XVbaEventsHelper > xEvt( aDocument.GetVbaEventsHelper() );
-         if ( xEvt.is() )
---- sc/source/ui/unoobj/docuno.cxx
-+++ sc/source/ui/unoobj/docuno.cxx
-@@ -107,7 +107,6 @@ using namespace com::sun::star::document
- //	alles ohne Which-ID, Map nur fuer PropertySetInfo
- 
- //!	umbenennen, sind nicht mehr nur Options
--#include <com/sun/star/script/ScriptEventDescriptor.hpp>
- const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap()
- {
-     static SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] =
-@@ -315,7 +314,6 @@ uno::Any SAL_CALL ScModelObj::queryInter
- 	SC_QUERYINTERFACE( view::XRenderable )
- 	SC_QUERYINTERFACE( document::XLinkTargetSupplier )
- 	SC_QUERYINTERFACE( beans::XPropertySet )
--	SC_QUERYINTERFACE( document::XCodeNameQuery )
- 	SC_QUERYINTERFACE( document::XDocumentEventCompatibleHelper)
- 	SC_QUERYINTERFACE( lang::XMultiServiceFactory )
- 	SC_QUERYINTERFACE( lang::XServiceInfo )
-@@ -1723,49 +1721,7 @@ uno::Sequence<rtl::OUString> SAL_CALL Sc
- 
- 	return concatServiceNames( aMyServices, aDrawServices );
- }
--// XCodeNameQuery
--rtl::OUString SAL_CALL 
--ScModelObj::getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
--{
--    rtl::OUString sCodeName;
--    if ( pDocShell )
--    {
--        OSL_TRACE( "*** In ScModelObj::getCodeNameForObject");
--        // need to find the page ( and index )  for this control
--        uno::Reference< drawing::XDrawPagesSupplier > xSupplier( pDocShell->GetModel(), uno::UNO_QUERY_THROW );
--        uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW );
--        sal_Int32 nLen = xIndex->getCount();
--        bool bMatched = false;
--        uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;
--        for ( sal_Int32 index = 0; index < nLen; ++index )
--        {
--            try
--            {
--                uno::Reference< form::XFormsSupplier >  xFormSupplier( xIndex->getByIndex( index ), uno::UNO_QUERY_THROW );
--                uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
--                // get the www-standard container
--                uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );
--                sal_Int32 nCntrls = xFormControls->getCount();
--                for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
--                {
--                    uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );	
--                    bMatched = ( xControl == xIf );
--                    if ( bMatched )
--                    {
--                        String sName;
--                        pDocShell->GetDocument()->GetCodeName( index, sName );
--                        sCodeName = sName;
--                    }
--                }
--            }
--            catch( uno::Exception& ) {}
--            if ( bMatched )
--                break;
--        }
--    }
--    // Probably should throw here ( if !bMatched )
--     return sCodeName;
--}
-+
- // XVbaEventHelper
- // For Vba Event
- sal_Bool SAL_CALL
---- sc/source/ui/unoobj/servuno.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/ui/unoobj/servuno.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -63,31 +63,31 @@
- #include <svx/xmlgrhlp.hxx>
- 
- #include <comphelper/processfactory.hxx>
--
-+#include <com/sun/star/document/XCodeNameQuery.hpp>
-+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-+#include <com/sun/star/form/XFormsSupplier.hpp>
-+#include <com/sun/star/script/ScriptEventDescriptor.hpp>
-+#include <comphelper/componentcontext.hxx>
-+#include <cppuhelper/component_context.hxx>
-+#include <vbahelper/vbahelper.hxx>
- using namespace ::com::sun::star;
- 
- class ScVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
- {
-     uno::Any maWorkbook;
-     uno::Any maCachedObject;
--    uno::Reference<lang::XMultiServiceFactory> mxSF;
-     ScDocShell* mpDocShell;
- public:
-     ScVbaObjectForCodeNameProvider( ScDocShell* pDocShell ) : mpDocShell( pDocShell )
-     {
--        mxSF.set(comphelper::getProcessServiceFactory());
--        uno::Reference<beans::XPropertySet> xProps(mxSF, uno::UNO_QUERY);
--        if( xProps.is() )
--        {
--            ScDocument* pDoc = mpDocShell->GetDocument();
--            if ( !pDoc )
--                throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")), uno::Reference< uno::XInterface >() );
--
--            uno::Sequence< uno::Any > aArgs(2);
--            aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
--            aArgs[1] = uno::Any( mpDocShell->GetModel() );
--            maWorkbook <<= mxSF->createInstanceWithArguments(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Workbook") ), aArgs );
--        }
-+        ScDocument* pDoc = mpDocShell->GetDocument();
-+        if ( !pDoc )
-+            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")), uno::Reference< uno::XInterface >() );
-+
-+        uno::Sequence< uno::Any > aArgs(2);
-+        aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
-+        aArgs[1] = uno::Any( mpDocShell->GetModel() );
-+        maWorkbook <<= ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs );
-     }
- 
-     virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
-@@ -120,7 +120,7 @@ public:
-                         aArgs[0] = maWorkbook;
-                         aArgs[1] = uno::Any( xModel );
-                         aArgs[2] = uno::Any( rtl::OUString( sSheetName ) );
--                        maCachedObject <<= mxSF->createInstanceWithArguments(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheet") ), aArgs );
-+                        maCachedObject <<= ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Worksheet", aArgs );
-                         break;
-                     }
-                 }
-@@ -160,6 +160,56 @@ public:
- 
- };
- 
-+class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >
-+{
-+ScDocShell* mpDocShell;
-+public:
-+    ScVbaCodeNameProvider( ScDocShell* pDocShell ) : mpDocShell( pDocShell ) {}
-+    // XCodeNameQuery
-+    rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
-+    {
-+        rtl::OUString sCodeName;
-+        if ( mpDocShell )
-+        {
-+            OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject");
-+            // need to find the page ( and index )  for this control
-+            uno::Reference< drawing::XDrawPagesSupplier > xSupplier( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
-+            uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW );
-+            sal_Int32 nLen = xIndex->getCount();
-+            bool bMatched = false;
-+            uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;
-+            for ( sal_Int32 index = 0; index < nLen; ++index )
-+            {
-+                try
-+                {
-+                    uno::Reference< form::XFormsSupplier >  xFormSupplier( xIndex->getByIndex( index ), uno::UNO_QUERY_THROW );
-+                    uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
-+                    // get the www-standard container
-+                    uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );
-+                    sal_Int32 nCntrls = xFormControls->getCount();
-+                    for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
-+                    {
-+                        uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );	
-+                        bMatched = ( xControl == xIf );
-+                        if ( bMatched )
-+                        {
-+                            String sName;
-+                            mpDocShell->GetDocument()->GetCodeName( index, sName );
-+                            sCodeName = sName;
-+                        }
-+                    }
-+                }
-+                catch( uno::Exception& ) {}
-+                if ( bMatched )
-+                    break;
-+            }
-+        }
-+        // Probably should throw here ( if !bMatched )
-+         return sCodeName;
-+    }
-+
-+};
-+
- //------------------------------------------------------------------------
- 
- static const sal_Char* __FAR_DATA aProvNames[SC_SERVICE_COUNT] =
-@@ -210,6 +260,7 @@ static const sal_Char* __FAR_DATA aProvN
-         SC_SERVICENAME_FORMULAPARS,                 // SC_SERVICE_FORMULAPARS
-         SC_SERVICENAME_OPCODEMAPPER,                 // SC_SERVICE_OPCODEMAPPER
- "ooo.vba.VBAObjectModuleObjectProvider",// SC_SERVICE_VBAOBJECTPROVIDER
-+"ooo.vba.VBACodeNameProvider",// SC_SERVICE_VBACODENAMEPROVIDER
- 	};
- 
- //
-@@ -263,6 +314,7 @@ static const sal_Char* __FAR_DATA aOldNa
-         "",                                         // SC_SERVICE_FORMULAPARS
-         "",                                         // SC_SERVICE_OPCODEMAPPER
-         "",                                         // SC_SERVICE_VBAOBJECTPROVIDER
-+        "",                                         // SC_SERVICE_VBACODENAMEPROVIDER
- 	};
- 
- 
-@@ -464,6 +516,9 @@ uno::Reference<uno::XInterface> ScServic
-         case SC_SERVICE_VBAOBJECTPROVIDER:
-             xRet.set(static_cast<container::XNameAccess*>(new ScVbaObjectForCodeNameProvider( pDocShell )));
-             break;
-+        case SC_SERVICE_VBACODENAMEPROVIDER:
-+            xRet.set(static_cast<document::XCodeNameQuery*>(new ScVbaCodeNameProvider( pDocShell )));
-+            break;
- 	}
- 	return xRet;
- }
---- sc/source/ui/vba/excelvbahelper.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sc/source/ui/vba/excelvbahelper.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,218 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbahelper.cxx,v $
-+ * $Revision: 1.5.32.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <docuno.hxx>
-+#include "excelvbahelper.hxx"
-+#include "tabvwsh.hxx"
-+#include "transobj.hxx"
-+#include "scmod.hxx"
-+#include "cellsuno.hxx"
-+#include <comphelper/processfactory.hxx>
-+
-+using namespace ::com::sun::star;
-+using namespace ::ooo::vba;
-+
-+namespace ooo
-+{
-+namespace vba
-+{
-+namespace excel
-+{
-+bool isInPrintPreview( SfxViewFrame* pView )
-+{
-+	sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
-+	if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() >
-+nViewNo && !pView->GetObjectShell()->IsInPlaceActive() )
-+	{
-+		SfxViewFactory &rViewFactory =
-+			pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo);
-+		if (  pView->GetCurViewId() == rViewFactory.GetOrdinal() )
-+			return true;
-+	}
-+	return false;
-+}
-+
-+const ::rtl::OUString REPLACE_CELLS_WARNING(  RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning"));
-+
-+class PasteCellsWarningReseter
-+{
-+private:
-+	bool bInitialWarningState;
-+	static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException )
-+	{
-+		static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+		static uno::Reference<uno::XComponentContext > xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
-+		static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
-+				xContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+		static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW );
-+		return xProps;
-+	}
-+
-+	bool getReplaceCellsWarning() throw ( uno::RuntimeException )
-+	{
-+		sal_Bool res = sal_False;
-+		getGlobalSheetSettings()->getPropertyValue( REPLACE_CELLS_WARNING ) >>= res;
-+		return ( res == sal_True );
-+	}
-+
-+	void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
-+	{
-+		getGlobalSheetSettings()->setPropertyValue( REPLACE_CELLS_WARNING, uno::makeAny( bState ) );
-+	}
-+public:
-+	PasteCellsWarningReseter() throw ( uno::RuntimeException )
-+	{
-+		bInitialWarningState = getReplaceCellsWarning();
-+		if ( bInitialWarningState )
-+			setReplaceCellsWarning( false );
-+	}
-+	~PasteCellsWarningReseter()
-+	{
-+		if ( bInitialWarningState )
-+		{
-+			// don't allow dtor to throw
-+			try
-+			{
-+				setReplaceCellsWarning( true );
-+			}
-+			catch ( uno::Exception& /*e*/ ){}
-+		}
-+	}
-+};
-+
-+void
-+implnPaste()
-+{
-+	PasteCellsWarningReseter resetWarningBox;
-+	ScTabViewShell* pViewShell = getCurrentBestViewShell();
-+	if ( pViewShell )
-+	{
-+		pViewShell->PasteFromSystem();
-+		pViewShell->CellContentChanged();
-+	}
-+}
-+
-+
-+void
-+implnCopy()
-+{
-+	ScTabViewShell* pViewShell = getCurrentBestViewShell();
-+	if ( pViewShell )
-+		pViewShell->CopyToClip(NULL,false,false,true);
-+}
-+
-+void 
-+implnCut()
-+{
-+	ScTabViewShell* pViewShell =  getCurrentBestViewShell();
-+	if ( pViewShell )
-+		pViewShell->CutToClip( NULL, TRUE );
-+}
-+
-+void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
-+{
-+	PasteCellsWarningReseter resetWarningBox;
-+	sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
-+	InsCellCmd eMoveMode = INS_NONE;
-+
-+	ScTabViewShell* pTabViewShell = ScTabViewShell::GetActiveViewShell();
-+	if ( !pTabViewShell ) 
-+		// none active, try next best
-+		pTabViewShell = getCurrentBestViewShell();
-+	if ( pTabViewShell )
-+	{
-+		ScViewData* pView = pTabViewShell->GetViewData();	
-+		Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
-+		if ( pView && pWin )
-+		{
-+			if ( bAsLink && bOtherDoc )
-+				pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
-+			else 
-+			{
-+				ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
-+				ScDocument* pDoc = NULL; 
-+				if ( pOwnClip )
-+					pDoc = pOwnClip->GetDocument();	
-+				pTabViewShell->PasteFromClip( nFlags, pDoc,
-+					nFunction, bSkipEmpty, bTranspose, bAsLink,
-+					eMoveMode, IDF_NONE, TRUE );
-+				pTabViewShell->CellContentChanged();
-+			}
-+		}
-+	}
-+
-+}
-+
-+ScDocShell* 
-+getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) 
-+{
-+	uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
-+	ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
-+	ScDocShell* pDocShell = NULL;
-+	if ( pModel )
-+		pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
-+	return pDocShell;
-+
-+}
-+
-+ScTabViewShell* 
-+getBestViewShell(  css::uno::Reference< css::frame::XModel>& xModel )
-+{
-+	ScDocShell* pDocShell = getDocShell( xModel );
-+	if ( pDocShell )
-+		return pDocShell->GetBestViewShell();
-+	return NULL;
-+}
-+
-+ScTabViewShell* 
-+getCurrentBestViewShell()
-+{ 
-+	uno::Reference< frame::XModel > xModel = getCurrentDocument();
-+	return getBestViewShell( xModel );
-+}
-+
-+SfxViewFrame* 
-+getCurrentViewFrame()
-+{
-+	ScTabViewShell* pViewShell = getCurrentBestViewShell();	
-+	if ( pViewShell )
-+		return pViewShell->GetViewFrame();
-+	return NULL;
-+}
-+
-+SfxItemSet*
-+ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj )
-+{
-+	SfxItemSet* pDataSet = pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : NULL ;
-+	return pDataSet;
-+	
-+}
-+} //excel
-+} //vba 
-+} //ooo 
---- sc/source/ui/vba/excelvbahelper.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sc/source/ui/vba/excelvbahelper.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,60 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbahelper.hxx,v $
-+ * $Revision: 1.5.32.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_EXCEL_VBA_HELPER_HXX
-+#define SC_EXCEL_VBA_HELPER_HXX
-+
-+#include<vbahelper/vbahelper.hxx>
-+#include <docsh.hxx>
-+
-+class ScCellRangeObj;
-+
-+namespace ooo 
-+{
-+	namespace vba 
-+	{
-+	namespace excel
-+        { 
-+		void implnCopy();
-+		void implnPaste();
-+		void implnCut();
-+		void implnPasteSpecial(sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
-+		ScTabViewShell* getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
-+		ScDocShell* getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
-+		ScTabViewShell* getCurrentBestViewShell();
-+		SfxViewFrame* getCurrentViewFrame();
-+            class ScVbaCellRangeAccess
-+            {
-+            public:
-+                static SfxItemSet* GetDataSet( ScCellRangeObj* pRangeObj );
-+            };
-+};
-+};
-+};
-+#endif
---- sc/source/ui/vba/makefile.mk.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -64,7 +64,7 @@ SLOFILES= \
- 		$(SLO)$/vbaworksheet.obj \
- 		$(SLO)$/vbaoutline.obj \
- 		$(SLO)$/vbafont.obj\
--		$(SLO)$/vbahelper.obj\
-+		$(SLO)$/excelvbahelper.obj\
- 		$(SLO)$/vbainterior.obj\
- 		$(SLO)$/vbawsfunction.obj\
- 		$(SLO)$/vbawindow.obj\
-@@ -81,20 +81,10 @@ SLOFILES= \
- 		$(SLO)$/vbapalette.obj \
- 		$(SLO)$/vbaborders.obj \
- 		$(SLO)$/vbacharacters.obj \
--		$(SLO)$/vbacombobox.obj \
- 		$(SLO)$/vbavalidation.obj \
--                $(SLO)$/vbacontrol.obj \
--                $(SLO)$/vbacontrols.obj \
-                 $(SLO)$/vbaoleobject.obj \
-                 $(SLO)$/vbaoleobjects.obj \
--                $(SLO)$/vbabutton.obj \
--                $(SLO)$/vbalabel.obj \
--                $(SLO)$/vbatextbox.obj \
-                 $(SLO)$/vbatextboxshape.obj \
--                $(SLO)$/vbaradiobutton.obj \
--                $(SLO)$/vbalistbox.obj \
--		$(SLO)$/vbalistcontrolhelper.obj \
--                $(SLO)$/vbapropvalue.obj \
-                 $(SLO)$/vbapane.obj \
-                 $(SLO)$/vbashape.obj \
-                 $(SLO)$/vbacolorformat.obj \
-@@ -116,24 +106,10 @@ SLOFILES= \
-                 $(SLO)$/vbastyle.obj \
-                 $(SLO)$/vbastyles.obj \
-                 $(SLO)$/vbaassistant.obj \
--                $(SLO)$/vbauserform.obj \
--                $(SLO)$/vbacheckbox.obj \
--                $(SLO)$/vbatogglebutton.obj \
--                $(SLO)$/vbaframe.obj \
--                $(SLO)$/vbascrollbar.obj \
--                $(SLO)$/vbaprogressbar.obj \
--				$(SLO)$/vbamultipage.obj \
--				$(SLO)$/vbapages.obj \
--                $(SLO)$/vbacommandbarcontrol.obj \
--                $(SLO)$/vbacommandbarcontrols.obj \
--                $(SLO)$/vbacommandbar.obj \
--                $(SLO)$/vbacommandbars.obj \
- 		        $(SLO)$/vbahyperlink.obj \
-         		$(SLO)$/vbapagesetup.obj \
- 		        $(SLO)$/vbapagebreak.obj \
-         		$(SLO)$/vbapagebreaks.obj \
--		        $(SLO)$/vbaspinbutton.obj \
--		        $(SLO)$/vbaimage.obj \
- 				$(SLO)$/service.obj \
-         $(SLO)$/vbaeventshelper.obj
- 
---- sc/source/ui/vba/service.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/service.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -61,11 +61,11 @@ namespace globals
- {
- extern sdecl::ServiceDecl const serviceDecl;
- }
--namespace  userform
-+namespace hyperlink 
- {
- extern sdecl::ServiceDecl const serviceDecl;
- }
--namespace hyperlink 
-+namespace application 
- {
- extern sdecl::ServiceDecl const serviceDecl;
- }
-@@ -87,10 +87,10 @@ extern "C"
-         lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
-     {
- 		OSL_TRACE("In component_writeInfo");
--
-+#if 0
- 	// Component registration
-         if ( component_writeInfoHelper( pServiceManager, pRegistryKey, 
--		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) )
-+		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) )
- 		{
- 			// Singleton registration
- 			try
-@@ -110,6 +110,12 @@ extern "C"
- 			}
- 		}
- 		return sal_False;
-+#else
-+	// Component registration
-+        return component_writeInfoHelper( pServiceManager, pRegistryKey, 
-+		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl );
-+#endif
-+	
-     }
- 
-     SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( 
-@@ -118,7 +124,7 @@ extern "C"
-     {
- 		OSL_TRACE("In component_getFactory for %s", pImplName );
- 	void* pRet =  component_getFactoryHelper(
--        	pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl );
-+        	pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl );
-     if( !pRet )
-         pRet = component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl );
- 	OSL_TRACE("Ret is 0x%x", pRet);
---- sc/source/ui/vba/vbaapplication.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/ui/vba/vbaapplication.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -60,7 +60,6 @@
- #include "vbashape.hxx"
- #include "vbatextboxshape.hxx"
- #include "vbaassistant.hxx"
--#include "vbacommandbars.hxx"
- #include "sc.hrc"
- 
- #include <osl/file.hxx>
-@@ -87,6 +86,7 @@
- #include "miscuno.hxx"
- #include "unonames.hxx"
- #include "docsh.hxx"
-+#include <vbahelper/helperdecl.hxx>
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
-@@ -123,7 +123,7 @@ public:
- 	ActiveWorkbook( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext) : ScVbaWorkbook(  xParent, xContext ){}
- };
- 
--ScVbaApplication::ScVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): ScVbaApplication_BASE( uno::Reference< XHelperInterface >(), xContext ), m_xCalculation( excel::XlCalculation::xlCalculationAutomatic )
-+ScVbaApplication::ScVbaApplication( const uno::Reference<uno::XComponentContext >& xContext ): ScVbaApplication_BASE( xContext ), m_xCalculation( excel::XlCalculation::xlCalculationAutomatic )
- {
- }
- 
-@@ -151,15 +151,6 @@ ScVbaApplication::getAssistant() throw (
- }
- 
- uno::Any SAL_CALL
--ScVbaApplication::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
--{
--    uno::Reference< XCommandBars > xCommandBars( new ScVbaCommandBars( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
--    if( aIndex.hasValue() )
--        return uno::makeAny( xCommandBars->Item( aIndex, uno::Any() ) );
--    return uno::makeAny( xCommandBars );
--}
--
--uno::Any SAL_CALL
- ScVbaApplication::getSelection() throw (uno::RuntimeException)
- {
-     OSL_TRACE("** ScVbaApplication::getSelection() ** ");
-@@ -227,7 +218,7 @@ ScVbaApplication::getActiveCell() throw
- {
- 	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
- 	uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW);
--	ScTabViewShell* pViewShell = getCurrentBestViewShell();
-+	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell();
- 	if ( !pViewShell )
- 		throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewShell available"), uno::Reference< uno::XInterface >() );
- 	ScViewData* pTabView = pViewShell->GetViewData();
-@@ -240,65 +231,6 @@ ScVbaApplication::getActiveCell() throw
- 	return  new ScVbaRange( this, mxContext, xRange->getCellRangeByPosition( nCursorX, nCursorY, nCursorX, nCursorY ) );
- }
- 
--sal_Bool
--ScVbaApplication::getScreenUpdating() throw (uno::RuntimeException)
--{
--	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--	return !xModel->hasControllersLocked();
--}
--
--void
--ScVbaApplication::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeException)
--{
--	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--	if (bUpdate)
--		xModel->unlockControllers();
--	else
--		xModel->lockControllers();
--}
--
--sal_Bool
--ScVbaApplication::getDisplayStatusBar() throw (uno::RuntimeException)
--{
--	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--    uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
--    uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
--
--    if( xProps.is() ){
--        uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
--        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
--        if( xLayoutManager.is() && xLayoutManager->isElementVisible( url ) ){
--            return sal_True;
--        }
--    }
--    return sal_False;
--}
--
--void
--ScVbaApplication::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno::RuntimeException)
--{
--	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--    uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
--    uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
--
--    if( xProps.is() ){
--        uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
--        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
--        if( xLayoutManager.is() ){
--            if( bDisplayStatusBar && !xLayoutManager->isElementVisible( url ) ){
--                if( !xLayoutManager->showElement( url ) )
--                    xLayoutManager->createElement( url );
--                return;
--            }
--            else if( !bDisplayStatusBar && xLayoutManager->isElementVisible( url ) ){
--                xLayoutManager->hideElement( url ); 
--                return;
--            }
--        }
--    }
--    return;
--}
--
- uno::Any SAL_CALL
- ScVbaApplication::Workbooks( const uno::Any& aIndex ) throw (uno::RuntimeException)
- {
-@@ -347,7 +279,7 @@ ScVbaApplication::Evaluate( const ::rtl:
- uno::Any 
- ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException)
- {
--	uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication(), uno::UNO_QUERY_THROW ), mxContext ) );
-+	uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( this ), mxContext ) );
- 	if( !aIndex.hasValue() )
- 		return uno::Any( xDialogs );
- 	return uno::Any( xDialogs->Item( aIndex ) );
-@@ -460,7 +392,7 @@ ScVbaApplication::setCalculation( ::sal_
- uno::Any SAL_CALL 
- ScVbaApplication::Windows( const uno::Any& aIndex  ) throw (uno::RuntimeException)
- {
--	uno::Reference< XCollection >  xWindows = ScVbaWindows::Windows( mxContext );
-+	uno::Reference< excel::XWindows >  xWindows( new ScVbaWindows( this, mxContext ) );
- 	if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
- 		return uno::Any( xWindows );
- 	return uno::Any( xWindows->Item( aIndex, uno::Any() ) );	
-@@ -571,11 +503,11 @@ ScVbaApplication::GoTo( const uno::Any&
-                 xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-         uno::Reference< sheet::XSpreadsheet > xDoc = xSpreadsheet->getActiveSheet();
- 
--        ScTabViewShell* pShell = getCurrentBestViewShell();
-+        ScTabViewShell* pShell = excel::getCurrentBestViewShell();
-         ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow(); 
-         try
-         {
--            uno::Reference< excel::XRange > xVbaSheetRange = ScVbaRange::getRangeObjectForName( mxContext, sRangeName, getDocShell( xModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
-+            uno::Reference< excel::XRange > xVbaSheetRange = ScVbaRange::getRangeObjectForName( mxContext, sRangeName, excel::getDocShell( xModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
- ;
-             if( bScroll )
-             {
-@@ -613,7 +545,7 @@ ScVbaApplication::GoTo( const uno::Any&
-     if( Reference >>= xRange )
-     {
-         uno::Reference< excel::XRange > xVbaRange( Reference, uno::UNO_QUERY );
--        ScTabViewShell* pShell = getCurrentBestViewShell();
-+        ScTabViewShell* pShell = excel::getCurrentBestViewShell();
-         ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow(); 
-         if ( xVbaRange.is() )
-         {
-@@ -643,38 +575,10 @@ ScVbaApplication::GoTo( const uno::Any&
-             uno::Reference< uno::XInterface >() );
- }
- 
--namespace
--{
--    static uno::Reference< frame::XController > lcl_getCurrentController()
--    {
--        const uno::Reference< frame::XModel > xWorkingDoc( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
--        uno::Reference< frame::XController > xController;
--        if ( xWorkingDoc.is() )
--            xController.set( xWorkingDoc->getCurrentController(), uno::UNO_SET_THROW );
--        else
--            xController.set( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
--        return xController;
--    }
--}
--
- sal_Int32 SAL_CALL
- ScVbaApplication::getCursor() throw (uno::RuntimeException)
- {
--    sal_Int32 nPointerStyle( POINTER_ARROW );
--    try
--    {
--        const uno::Reference< frame::XController > xController( lcl_getCurrentController(),     uno::UNO_SET_THROW );
--        const uno::Reference< frame::XFrame >      xFrame     ( xController->getFrame(),        uno::UNO_SET_THROW );
--        const uno::Reference< awt::XWindow >       xWindow    ( xFrame->getContainerWindow(),   uno::UNO_SET_THROW );
--        // why the heck isn't there an XWindowPeer::getPointer, but a setPointer only?
--        const Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
--        if ( pWindow )
--            nPointerStyle = pWindow->GetSystemWindow()->GetPointer().GetStyle();
--    }
--    catch( const uno::Exception& )
--    {
--    	DBG_UNHANDLED_EXCEPTION();
--    }
-+    sal_Int32 nPointerStyle =  getPointerStyle();
- 
-     switch( nPointerStyle )
-     {
-@@ -696,82 +600,34 @@ ScVbaApplication::setCursor( sal_Int32 _
- {
-     try
-     {
--        ::std::vector< uno::Reference< frame::XController > > aControllers;
--
--        const uno::Reference< frame::XModel2 > xModel2( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
--        if ( xModel2.is() )
--        {
--            const uno::Reference< container::XEnumeration > xEnumControllers( xModel2->getControllers(), uno::UNO_SET_THROW );
--            while ( xEnumControllers->hasMoreElements() )
--            {
--                const uno::Reference< frame::XController > xController( xEnumControllers->nextElement(), uno::UNO_QUERY_THROW );
--                aControllers.push_back( xController );
--            }
--        }
--        else
-+        switch( _cursor )
-         {
--            const uno::Reference< frame::XModel > xModel( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
--            if ( xModel.is() )
-+            case excel::XlMousePointer::xlNorthwestArrow:
-             {
--                const uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
--                aControllers.push_back( xController );
-+                const Pointer& rPointer( POINTER_ARROW );
-+                setCursorHelper( rPointer, sal_False );
-+                break;
-             }
--            else
-+            case excel::XlMousePointer::xlWait:
-+            case excel::XlMousePointer::xlIBeam:
-             {
--                const uno::Reference< frame::XController > xController( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
--                aControllers.push_back( xController );
-+                const Pointer& rPointer( static_cast< PointerStyle >( _cursor ) );
-+                //It will set the edit window, toobar and statusbar's mouse pointer.
-+                setCursorHelper( rPointer, sal_True );
-+                break;
-             }
--        }
--
--        for (   ::std::vector< uno::Reference< frame::XController > >::const_iterator controller = aControllers.begin();
--                controller != aControllers.end();
--                ++controller
--            )
--        {
--            const uno::Reference< frame::XFrame >      xFrame     ( (*controller)->getFrame(),       uno::UNO_SET_THROW   );
--            const uno::Reference< awt::XWindow >       xWindow    ( xFrame->getContainerWindow(),    uno::UNO_SET_THROW   );
--
--            Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
--            OSL_ENSURE( pWindow, "ScVbaApplication::setCursor: no window!" );
--            if ( !pWindow )
--                continue;
--
--            switch( _cursor )
-+            case excel::XlMousePointer::xlDefault:
-             {
--                case excel::XlMousePointer::xlNorthwestArrow:
--                {
--                    const Pointer& rPointer( POINTER_ARROW );
--                    pWindow->GetSystemWindow()->SetPointer( rPointer );
--                    pWindow->GetSystemWindow()->EnableChildPointerOverwrite( sal_False );
--                    break;
--                }
--                case excel::XlMousePointer::xlWait:
--                case excel::XlMousePointer::xlIBeam:
--                {
--                    const Pointer& rPointer( static_cast< PointerStyle >( _cursor ) );
--                    //It will set the edit window, toobar and statusbar's mouse pointer.
--                    pWindow->GetSystemWindow()->SetPointer( rPointer );
--                    pWindow->GetSystemWindow()->EnableChildPointerOverwrite( sal_True );
--                    //It only set the edit window's mouse pointer
--                    //pWindow->.SetPointer( rPointer );
--                    //pWindow->.EnableChildPointerOverwrite( sal_True );
--                    //printf("\nset Cursor...%d\n", pWindow->.GetType());
--                    break;
--                }
--                case excel::XlMousePointer::xlDefault:
--                {
--                    const Pointer& rPointer( POINTER_NULL );
--                    pWindow->GetSystemWindow()->SetPointer( rPointer );
--                    pWindow->GetSystemWindow()->EnableChildPointerOverwrite( sal_False );
--                    break;
--                }
--                default:
--                    throw uno::RuntimeException( rtl::OUString( 
--                            RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() );
--                    // TODO: isn't this a flaw in the API? It should be allowed to throw an
--                    // IllegalArgumentException, or so
-+                const Pointer& rPointer( POINTER_NULL );
-+                setCursorHelper( rPointer, sal_False );
-+                break;
-             }
--        }
-+            default:
-+                throw uno::RuntimeException( rtl::OUString( 
-+                        RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() );
-+                // TODO: isn't this a flaw in the API? It should be allowed to throw an
-+                // IllegalArgumentException, or so
-+        }        
-     }
-     catch( const uno::Exception& )
-     {
-@@ -1145,7 +1001,7 @@ ScVbaApplication::Intersect( const uno::
- 	}
- 
- 	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--	ScDocShell* pDocShell = getDocShell( xModel );
-+	ScDocShell* pDocShell = excel::getDocShell( xModel );
- 	if ( aCellRanges.Count() == 1 )
- 	{
- 		xRefRange = new ScVbaRange( uno::Reference< XHelperInterface >(), mxContext, new ScCellRangeObj( pDocShell, *aCellRanges.First() ) );
-@@ -1234,7 +1090,7 @@ ScVbaApplication::Union( const uno::Refe
- 		aCellRanges.Append( *it );
- 
- 	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--    ScDocShell* pDocShell = getDocShell( xModel ); 
-+    ScDocShell* pDocShell = excel::getDocShell( xModel ); 
- 	if ( aCellRanges.Count() == 1 ) 
- 	{
- 	// normal range
-@@ -1269,16 +1125,11 @@ ScVbaApplication::Volatile( const uno::A
- */
- }
- 
--void SAL_CALL
--ScVbaApplication::DoEvents() throw ( uno::RuntimeException )
--{
--}
--
- ::sal_Bool SAL_CALL 
- ScVbaApplication::getDisplayFormulaBar() throw ( css::uno::RuntimeException )
- {
- 	sal_Bool bRes = sal_False;
--	ScTabViewShell* pViewShell = getCurrentBestViewShell();
-+	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell();
- 	if ( pViewShell )
- 	{
- 		SfxBoolItem sfxFormBar( FID_TOGGLEINPUTLINE);
-@@ -1296,7 +1147,7 @@ ScVbaApplication::getDisplayFormulaBar()
- void SAL_CALL 
- ScVbaApplication::setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw ( css::uno::RuntimeException )
- {
--	ScTabViewShell* pViewShell = getCurrentBestViewShell();
-+	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell();
- 	if ( pViewShell && ( _displayformulabar !=  getDisplayFormulaBar() ) )
- 	{
- 		SfxBoolItem sfxFormBar( FID_TOGGLEINPUTLINE, _displayformulabar);
-@@ -1343,3 +1194,13 @@ ScVbaApplication::getServiceNames()
- 	}
- 	return aServiceNames;
- }
-+
-+namespace application
-+{
-+namespace sdecl = comphelper::service_decl;
-+sdecl::vba_service_class_<ScVbaApplication, sdecl::with_args<false> > serviceImpl;
-+extern sdecl::ServiceDecl const serviceDecl(
-+    serviceImpl,
-+    "ScVbaApplication",
-+    "ooo.vba.excel.Application" );
-+}
---- sc/source/ui/vba/vbaapplication.hxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/source/ui/vba/vbaapplication.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -35,9 +35,12 @@
- #include <ooo/vba/excel/XApplication.hpp>
- #include <com/sun/star/uno/XComponentContext.hpp>
- 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbaapplicationbase.hxx>
-+#include <cppuhelper/implbase1.hxx>
- 
--typedef InheritedHelperInterfaceImpl1< ov::excel::XApplication > ScVbaApplication_BASE;
-+//typedef InheritedHelperInterfaceImpl1< ov::excel::XApplication > ScVbaApplication_BASE;
-+typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ov::excel::XApplication > ScVbaApplication_BASE;
- 
- class ScVbaApplication : public ScVbaApplication_BASE
- {
-@@ -45,12 +48,9 @@ private:
- 	sal_Int32 m_xCalculation;
- 	rtl::OUString getOfficePath( const rtl::OUString& sPath ) throw ( css::uno::RuntimeException );
- public:
--	ScVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
-+	ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext );
- 	virtual ~ScVbaApplication();
- 
--	// XHelperInterface ( parent is itself )
--	virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return this; }
--
- 	// XApplication
- 	virtual ::rtl::OUString SAL_CALL PathSeparator(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- 	virtual void SAL_CALL setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-@@ -68,15 +68,10 @@ public:
- 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw ( css::uno::RuntimeException);
-  virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
-  virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
--	virtual sal_Bool SAL_CALL getScreenUpdating() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException);
--	virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (css::uno::RuntimeException);
- 	virtual ::sal_Bool SAL_CALL getDisplayFormulaBar() throw ( css::uno::RuntimeException );
- 	virtual void SAL_CALL setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw ( css::uno::RuntimeException );
- 
-     virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-@@ -102,7 +97,6 @@ public:
- 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- 	virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException );
--	virtual void SAL_CALL DoEvents() throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
---- sc/source/ui/vba/vbaassistant.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaassistant.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -40,8 +40,8 @@
- 
- #include <sfx2/sfxhelp.hxx>
- 
--#include "vbahelper.hxx"
--#include "vbahelperinterface.hxx"
-+#include "excelvbahelper.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef ::cppu::WeakImplHelper1< ov::XAssistant > Assistant;
- typedef InheritedHelperInterfaceImpl< Assistant > ScVbaAssistantImpl_BASE;
---- sc/source/ui/vba/vbaaxes.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaaxes.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -32,7 +32,7 @@
- #include <ooo/vba/excel/XAxes.hpp>
- #include <ooo/vba/excel/XAxis.hpp>
- #include <ooo/vba/excel/XChart.hpp>
--#include "vbacollectionimpl.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
- 
- typedef CollTestImplHelper< ov::excel::XAxes > ScVbaAxes_BASE;
- class ScVbaAxes : public ScVbaAxes_BASE
---- sc/source/ui/vba/vbaaxis.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaaxis.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -32,8 +32,8 @@
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <ooo/vba/excel/XAxis.hpp>
- #include <ooo/vba/excel/XChart.hpp>
--#include "vbahelperinterface.hxx"
--
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <memory>
- typedef InheritedHelperInterfaceImpl1< ov::excel::XAxis >  ScVbaAxis_BASE;
- class ScVbaChart;
- class ScVbaAxis : public ScVbaAxis_BASE
---- sc/source/ui/vba/vbaborders.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaborders.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -38,7 +38,7 @@
- #include <com/sun/star/beans/XPropertySet.hpp>
- 
-  
--#include "vbacollectionimpl.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
- 
- typedef CollTestImplHelper< ov::excel::XBorders > ScVbaBorders_BASE;
- class ScVbaPalette;
---- sc/source/ui/vba/vbabutton.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbabutton.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,74 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbabutton.cxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include "vbabutton.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
--ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--}
--
--// Attributes
--rtl::OUString SAL_CALL 
--ScVbaButton::getCaption() throw (css::uno::RuntimeException)
--{
--    rtl::OUString Label;
--    m_xProps->getPropertyValue( LABEL ) >>= Label;
--    return Label;
--}
--
--void SAL_CALL 
--ScVbaButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
--}
--
--rtl::OUString& 
--ScVbaButton::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaButton") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaButton::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Button" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbabutton.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbabutton.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,51 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbabutton.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_BUTTON_HXX
--#define SC_VBA_BUTTON_HXX
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/msforms/XButton.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--
--typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XButton > ButtonImpl_BASE;
--
--class ScVbaButton : public ButtonImpl_BASE
--{
--public:
--    ScVbaButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
--   // Attributes
--    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--#endif //SC_VBA_BUTTON_HXX
---- sc/source/ui/vba/vbacharacters.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacharacters.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -36,7 +36,7 @@
- #include <com/sun/star/uno/XComponentContext.hpp>
- #include <com/sun/star/text/XSimpleText.hpp>
- 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- #include "vbapalette.hxx"
- typedef InheritedHelperInterfaceImpl1< ov::excel::XCharacters > ScVbaCharacters_BASE;
- 
---- sc/source/ui/vba/vbachart.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbachart.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -41,7 +41,7 @@
- #include <ooo/vba/excel/XChart.hpp>
- #include <ooo/vba/excel/XDataLabels.hpp>
- #include <ooo/vba/excel/XSeries.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1<ov::excel::XChart > ChartImpl_BASE;
- 
---- sc/source/ui/vba/vbachartobject.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbachartobject.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -36,7 +36,7 @@
- #include <com/sun/star/container/XNamed.hpp>
- #include <com/sun/star/document/XEmbeddedObjectSupplier.hpp>
- #include <ooo/vba/excel/XChartObject.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- #include <memory>
- 
- typedef InheritedHelperInterfaceImpl1<ov::excel::XChartObject > ChartObjectImpl_BASE;
---- sc/source/ui/vba/vbachartobjects.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbachartobjects.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -36,8 +36,8 @@
- #include <com/sun/star/table/XTableCharts.hpp>
- #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
- #include <com/sun/star/container/XEnumerationAccess.hpp>
--#include"vbacollectionimpl.hxx"
--#include "vbahelper.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include "excelvbahelper.hxx"
- #include <hash_map>
- 
- typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE;
---- sc/source/ui/vba/vbacharts.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacharts.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -31,8 +31,8 @@
- #define SC_VBA_CHARTS_HXX
- #include <ooo/vba/excel/XCharts.hpp>
- #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
--#include"vbacollectionimpl.hxx"
--#include "vbahelper.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include "excelvbahelper.hxx"
- #include <hash_map>
- 
- typedef CollTestImplHelper< ov::excel::XCharts > Charts_BASE;
---- sc/source/ui/vba/vbacheckbox.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacheckbox.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,110 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include "vbacheckbox.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
--const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
--ScVbaCheckbox::ScVbaCheckbox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : CheckBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--}
--
--// Attributes
--rtl::OUString SAL_CALL 
--ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException)
--{
--    rtl::OUString Label;
--    m_xProps->getPropertyValue( LABEL ) >>= Label;
--    return Label;
--}
--
--void SAL_CALL 
--ScVbaCheckbox::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
--}
--
--uno::Any SAL_CALL 
--ScVbaCheckbox::getValue() throw (css::uno::RuntimeException)
--{
--    sal_Int16 nValue = -1;
--    m_xProps->getPropertyValue( STATE ) >>= nValue;
--    if( nValue != 0 )
--        nValue = -1;
--//    return uno::makeAny( nValue ); 
--// I must be missing something MSO says value should be -1 if selected, 0 if not
--// selected
--    return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); 
--}
--
--void SAL_CALL 
--ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
--{
--    sal_Int16 nValue = 0;
--    sal_Bool bValue = false;
--    if( _value >>= nValue )
--    {
--        if( nValue == -1)
--            nValue = 1;
--    }
--    else if ( _value >>= bValue )
--    {
--        if ( bValue )
--            nValue = 1;
--    }
--    m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
--}
--rtl::OUString& 
--ScVbaCheckbox::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCheckbox") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaCheckbox::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.CheckBox" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbacheckbox.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacheckbox.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,60 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_CHECKBOX_HXX
--#define SC_VBA_CHECKBOX_HXX
--#include <cppuhelper/implbase2.hxx>
--#include <ooo/vba/msforms/XRadioButton.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--
--typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > CheckBoxImpl_BASE;
--
--class ScVbaCheckbox : public CheckBoxImpl_BASE
--{
--public:
--    ScVbaCheckbox(  const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
--   // Attributes
--    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--    // XDefaultProperty
--    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--#endif //SC_VBA_CHECKBOX_HXX
---- sc/source/ui/vba/vbacollectionimpl.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacollectionimpl.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,136 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbacollectionimpl.cxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include <vbacollectionimpl.hxx>
--#include "vbaglobals.hxx"
--using namespace ::com::sun::star;
--using namespace ::ooo::vba;
--
--
--ScVbaCollectionBaseImpl::ScVbaCollectionBaseImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : m_xContext( xContext ), m_xIndexAccess( xIndexAccess )
--{
--	m_xNameAccess.set( xIndexAccess, uno::UNO_QUERY );
--}
--
--uno::Any
--ScVbaCollectionBaseImpl::getItemByStringIndex( const rtl::OUString& sIndex ) throw (::uno::RuntimeException)
--{
--	if ( !m_xNameAccess.is() )
--		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBaseImpl string index access not supported by this object") ), uno::Reference< uno::XInterface >() );
--
--	return createCollectionObject( m_xNameAccess->getByName( sIndex ) );	
--}
--
--uno::Any 
--ScVbaCollectionBaseImpl::getItemByIntIndex( const sal_Int32 nIndex ) throw (uno::RuntimeException)
--{
--	if ( !m_xIndexAccess.is() )
--		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBaseImpl numeric index access not supported by this object") ), uno::Reference< uno::XInterface >() );
--	if ( nIndex <= 0 )
--	{
--		throw  lang::IndexOutOfBoundsException( 
--			::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
--			"index is 0 or negative" ) ), 
--			uno::Reference< uno::XInterface >() );
--	}
--	// need to adjust for vba index ( for which first element is 1 )
--	return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) );	
--}
--
--::sal_Int32 SAL_CALL 
--ScVbaCollectionBaseImpl::getCount() throw (uno::RuntimeException)
--{
--	return m_xIndexAccess->getCount();
--}
--
--uno::Any SAL_CALL 
--ScVbaCollectionBaseImpl::getParent() throw (uno::RuntimeException)
--{
--	// #TODO #FIXME investigate whether this makes sense
--	uno::Reference< excel::XApplication > xApplication =
--		ScVbaGlobals::getGlobalsImpl( m_xContext )->getApplication();
--	uno::Reference< excel::XWorkbook > xWorkbook;
--	if ( xApplication.is() )
--	{
--		xWorkbook = xApplication->getActiveWorkbook();
--	}
--	return uno::Any( xWorkbook );
--}
--
--::sal_Int32 SAL_CALL ScVbaCollectionBaseImpl::getCreator() throw (uno::RuntimeException)
--{
--	// #TODO #FIXE some sort of implementation
--	//SC_VBA_STUB();
--	return 0;
--}
--uno::Reference< excel::XApplication > SAL_CALL ScVbaCollectionBaseImpl::getApplication() throw (uno::RuntimeException)
--{
--	// #TODO #FIXME investigate whether this makes sense
--	uno::Reference< excel::XApplication > xApplication =
--		ScVbaGlobals::getGlobalsImpl( m_xContext )->getApplication();
--	return  xApplication;
--}
--
--uno::Any SAL_CALL ScVbaCollectionBaseImpl::Item( const uno::Any& aIndex ) throw (uno::RuntimeException)
--{
--	if ( aIndex.getValueTypeClass() != uno::TypeClass_STRING )
--	{
--		sal_Int32 nIndex = 0;
--
--		if ( ( aIndex >>= nIndex ) != sal_True )
--		{
--			rtl::OUString message;
--			message = rtl::OUString::createFromAscii(
--				"Couldn't convert index to Int32");
--			throw  lang::IndexOutOfBoundsException( message,
--				uno::Reference< uno::XInterface >() );
--		}
--		return 	getItemByIntIndex( nIndex );
--	}
--	rtl::OUString aStringSheet;
--
--	aIndex >>= aStringSheet;
--	return getItemByStringIndex( aStringSheet );	
--}
--
--::rtl::OUString SAL_CALL 
--ScVbaCollectionBaseImpl::getDefaultMethodName(  ) throw (css::uno::RuntimeException)
--{
--	const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
--	return sName;
--}
--
--	// XElementAccess
--
--::sal_Bool SAL_CALL ScVbaCollectionBaseImpl::hasElements() throw (uno::RuntimeException)
--{
--	return ( m_xIndexAccess->getCount() > 0 );
--}
--
--
---- sc/source/ui/vba/vbacollectionimpl.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacollectionimpl.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,259 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbacollectionimpl.hxx,v $
-- * $Revision: 1.5 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_COLLECTION_IMPL_HXX
--#define SC_VBA_COLLECTION_IMPL_HXX
--
--#include <ooo/vba/XCollection.hpp>
--//#include <ooo/vba/XCollectionTest.hpp>
--#include <com/sun/star/container/XEnumerationAccess.hpp>
--#include <com/sun/star/uno/XComponentContext.hpp>
--#include <com/sun/star/script/XDefaultMethod.hpp>
--#include <com/sun/star/container/XIndexAccess.hpp>
--#include <com/sun/star/container/XNameAccess.hpp>
--#include <com/sun/star/container/XNamed.hpp>
--
--#include <cppuhelper/implbase3.hxx>
--#include <cppuhelper/implbase2.hxx>
--#include <cppuhelper/implbase1.hxx>
--
--#include "vbahelper.hxx"
--#include "vbahelperinterface.hxx"
--#include "vbaglobals.hxx"
--
--#include <vector>
--
--typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumerationHelper_BASE;
--
--class EnumerationHelperImpl : public EnumerationHelper_BASE
--{
--protected:
--	css::uno::Reference< css::uno::XComponentContext > m_xContext;
--	css::uno::Reference< css::container::XEnumeration > m_xEnumeration;
--public:
--
--	EnumerationHelperImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XEnumeration >& xEnumeration ) throw ( css::uno::RuntimeException ) : m_xContext( xContext ),  m_xEnumeration( xEnumeration ) { }
--	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException) { return m_xEnumeration->hasMoreElements(); }
--};
--
--// a wrapper class for a providing a XIndexAccess, XNameAccess, XEnumerationAccess impl based on providing a vector of interfaces 
--// only requirement is the object needs to implement XName
--
--
--
--typedef ::cppu::WeakImplHelper3< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE;
--
--template< typename Ifc1 >
--class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
--{
--public:
--typedef std::vector< css::uno::Reference< Ifc1 > >  XNamedVec;
--private:
--
--	class XNamedEnumerationHelper : public EnumerationHelper_BASE
--	{
--		XNamedVec mXNamedVec;
--		typename XNamedVec::iterator mIt;
--	public:
--	        XNamedEnumerationHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), mIt( mXNamedVec.begin() ) {}
--	
--	        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException)
--	        {
--			return ( mIt != mXNamedVec.end() );
--	        }
--	
--	        virtual css::uno::Any SAL_CALL nextElement(  ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
--	        {
--	                if ( hasMoreElements() )
--				return css::uno::makeAny( *mIt++ );
--	                throw css::container::NoSuchElementException();
--	        }
--	};
--
--protected:
--	XNamedVec mXNamedVec;
--	typename XNamedVec::iterator cachePos;
--public:
--	XNamedObjectCollectionHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), cachePos(mXNamedVec.begin()) {}
--	// XElementAccess
--	virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException) { return  Ifc1::static_type(0); }
--	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException) { return ( mXNamedVec.size() > 0 ); }
--	// XNameAcess 
--	virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
--	{
--		if ( !hasByName(aName) )
--			throw css::container::NoSuchElementException();
--		return css::uno::makeAny( *cachePos );
--	}
--	virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException)
--	{
--		css::uno::Sequence< rtl::OUString > sNames( mXNamedVec.size() );
--		rtl::OUString* pString = sNames.getArray();
--		typename XNamedVec::iterator it = mXNamedVec.begin();
--		typename XNamedVec::iterator it_end = mXNamedVec.end();
--
--		for ( ; it != it_end; ++it, ++pString )
--		{
--			css::uno::Reference< css::container::XNamed > xName( *it, css::uno::UNO_QUERY_THROW );	
--			*pString = xName->getName();
--		}
--		return sNames;
--	}
--	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
--	{
--		cachePos = mXNamedVec.begin();
--		typename XNamedVec::iterator it_end = mXNamedVec.end();
--		for ( ; cachePos != it_end; ++cachePos )
--		{
--			css::uno::Reference< css::container::XNamed > xName( *cachePos, css::uno::UNO_QUERY_THROW );	
--			if ( aName.equals( xName->getName() ) )
--				break;
--		}
--		return ( cachePos != it_end );
--	}
--
--	// XElementAccess
--	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException) { return mXNamedVec.size(); }	
--	virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException )
--	{
--		if ( Index < 0 || Index >= getCount() )
--			throw css::lang::IndexOutOfBoundsException();
--	
--		return css::uno::makeAny( mXNamedVec[ Index ] );
--
--	}
--	// XEnumerationAccess
--	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw (css::uno::RuntimeException)
--	{
--		return new XNamedEnumerationHelper( mXNamedVec );
--	}
--};
--
--// including a HelperInterface implementation
--template< typename Ifc1 >
--class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
--{
--typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
--protected:
--	css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess;
--	css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
--
--	virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException)
--	{
--		if ( !m_xNameAccess.is() )
--			throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase string index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
--	
--		return createCollectionObject( m_xNameAccess->getByName( sIndex ) );	
--	}		
--
--	virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException)
--	{
--		if ( !m_xIndexAccess.is() )
--			throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase numeric index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
--		if ( nIndex <= 0 )
--		{
--			throw  css::lang::IndexOutOfBoundsException( 
--				::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
--				"index is 0 or negative" ) ), 
--				css::uno::Reference< css::uno::XInterface >() );
--		}
--		// need to adjust for vba index ( for which first element is 1 )
--		return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) );		
--	}
--public:
--	ScVbaCollectionBase( const css::uno::Reference< ov::XHelperInterface >& xParent,   const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) : BaseColBase( xParent, xContext ), m_xIndexAccess( xIndexAccess ){ m_xNameAccess.set(m_xIndexAccess, css::uno::UNO_QUERY); }
--	//XCollection
--	virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException)
--	{
--		return m_xIndexAccess->getCount();
--	}
--
--	virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::uno::RuntimeException)
--	{
--		if ( Index1.getValueTypeClass() != css::uno::TypeClass_STRING )
--		{
--			sal_Int32 nIndex = 0;
--	
--			if ( ( Index1 >>= nIndex ) != sal_True )
--			{
--				rtl::OUString message;
--				message = rtl::OUString::createFromAscii(
--					"Couldn't convert index to Int32");
--				throw  css::lang::IndexOutOfBoundsException( message,
--					css::uno::Reference< css::uno::XInterface >() );
--			}
--			return 	getItemByIntIndex( nIndex );
--		}
--		rtl::OUString aStringSheet;
--
--		Index1 >>= aStringSheet;
--		return getItemByStringIndex( aStringSheet );	
--	}
--	// XDefaultMethod
--	::rtl::OUString SAL_CALL getDefaultMethodName(  ) throw (css::uno::RuntimeException)
--	{
--		const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
--		return sName;
--	}
--	// XEnumerationAccess
--	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0;	
--
--	// XElementAccess
--	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) = 0;
--	// XElementAccess
--	virtual ::sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException)
--	{
--		return ( m_xIndexAccess->getCount() > 0 );
--	}
--	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0;
--	
--};
--
--typedef ::cppu::WeakImplHelper1<ov::XCollection> XCollection_InterfacesBASE;
--
--typedef ScVbaCollectionBase< XCollection_InterfacesBASE > CollImplBase1;
--// compatible with the old collections ( pre XHelperInterface base class ) ( some internal objects still use this )
--class ScVbaCollectionBaseImpl : public CollImplBase1
--{
--public:
--	ScVbaCollectionBaseImpl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : CollImplBase1( xParent, xContext, xIndexAccess){}
--
--};
--
--template <typename Ifc> // where Ifc must implement XCollectionTest
--class CollTestImplHelper :  public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
--{
--typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc >  > ImplBase1;
--
--public:
--	CollTestImplHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,  const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : ImplBase1( xParent, xContext, xIndexAccess ) {}
--};
--
--
--#endif //SC_VBA_COLLECTION_IMPL_HXX
---- sc/source/ui/vba/vbacolorformat.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacolorformat.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,7 +33,7 @@
- #include <com/sun/star/drawing/XShape.hpp>
- #include <ooo/vba/msforms/XColorFormat.hpp>
- #include <ooo/vba/msforms/XFillFormat.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- #include "vbafillformat.hxx"
- 
- typedef InheritedHelperInterfaceImpl1< ov::msforms::XColorFormat > ScVbaColorFormat_BASE;
---- sc/source/ui/vba/vbacombobox.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacombobox.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,175 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbacombobox.cxx,v $
-- * $Revision: 1.4 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include "vbacombobox.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--//SelectedItems list of integer indexes
--//StringItemList list of items
--
--const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
--const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
--const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
--const static rtl::OUString CONTROLSOURCEPROP( RTL_CONSTASCII_USTRINGPARAM("DataFieldProperty") );
--
--ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialogType ) : ComboBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialogType( bDialogType )
--{
--    	mpListHelper.reset( new ListControlHelper( m_xProps ) );
--	// grab the default value property name
--	m_xProps->getPropertyValue( CONTROLSOURCEPROP ) >>= sSourceName;
--}
--
--// Attributes
--
--
--// Value, [read] e.g. getValue returns the value of ooo Text propery e.g. the value in
--// the drop down
--uno::Any SAL_CALL 
--ScVbaComboBox::getValue() throw (uno::RuntimeException)
--{
--	return m_xProps->getPropertyValue( sSourceName );
--}
--
--void SAL_CALL 
--ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
--{
--    uno::Sequence< sal_Int16 > sSelection(1);
--    _value >>= sSelection[ 0 ];
--    m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( sSelection ) );
--}
--
--uno::Any SAL_CALL 
--ScVbaComboBox::getListIndex() throw (uno::RuntimeException)
--{
--	uno::Sequence< rtl::OUString > sItems;
--	m_xProps->getPropertyValue( ITEMS ) >>= sItems;
--	// should really return the item that has focus regardless of
--	// it been selected
--	if ( sItems.getLength() > 0 )
--	{
--		rtl::OUString sText = getText();
--		sal_Int32 nLen = sItems.getLength();
--		for ( sal_Int32 index = 0; sText.getLength() && index < nLen; ++index )
--		{
--			if ( sItems[ index ].equals( sText ) )
--			{
--				OSL_TRACE("getListIndex returning %d", index );
--				return uno::makeAny( index );
--			}
--				
--		} 
-- 	} 
--	OSL_TRACE("getListIndex returning %d", -1 );
--	return uno::makeAny( sal_Int32( -1 ) );
--}
--
--// Value, [write]e.g. setValue sets the value in the drop down, and if the value is one
--// of the values in the list then the selection is also set
--void SAL_CALL 
--ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
--{
--	m_xProps->setPropertyValue( sSourceName, _value );
--}
--
--// see Value
--
--::rtl::OUString SAL_CALL 
--ScVbaComboBox::getText() throw (uno::RuntimeException)
--{
--	rtl::OUString result;
--	getValue() >>= result;
--	return result;
--}
--
--void SAL_CALL 
--ScVbaComboBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
--{
--	setValue( uno::makeAny( _text ) ); // seems the same
--}
--
--// Methods
--void SAL_CALL 
--ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
--{
--	mpListHelper->AddItem( pvargItem, pvargIndex );
--}
--
--void SAL_CALL 
--ScVbaComboBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
--	{
--	mpListHelper->removeItem( index );
--}
--
--void SAL_CALL 
--ScVbaComboBox::Clear(  ) throw (uno::RuntimeException)
--		{
--	mpListHelper->Clear();
--		}
--
--void SAL_CALL
--ScVbaComboBox::setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException)
--{
--	ScVbaControl::setRowSource( _rowsource );
--	mpListHelper->setRowSource( _rowsource );
--		}
--
--sal_Int32 SAL_CALL
--ScVbaComboBox::getListCount() throw (uno::RuntimeException)
--{
--	return mpListHelper->getListCount();
--}
--		
--uno::Any SAL_CALL 
--ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
--{
--	return mpListHelper->List( pvargIndex, pvarColumn );
--	}
--
--rtl::OUString& 
--ScVbaComboBox::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComboBox") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaComboBox::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ComboBox" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbacombobox.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacombobox.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,80 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbacombobox.hxx,v $
-- * $Revision: 1.4 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_COMBOBOX_HXX
--#define SC_VBA_COMBOBOX_HXX
--#include <cppuhelper/implbase2.hxx>
--#include <com/sun/star/uno/XComponentContext.hpp>
--#include <com/sun/star/beans/XPropertySet.hpp>
--#include <com/sun/star/script/XDefaultProperty.hpp>
--#include <ooo/vba/msforms/XComboBox.hpp>
--#include <comphelper/proparrhlp.hxx>
--#include <comphelper/propertycontainer.hxx>
--#include <com/sun/star/beans/PropertyAttribute.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbalistcontrolhelper.hxx"
--#include "vbahelper.hxx"
--
--typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE;
--class ScVbaComboBox : public ComboBoxImpl_BASE
--{		
--	std::auto_ptr< ListControlHelper > mpListHelper;
--	rtl::OUString sSourceName; 
--	rtl::OUString msDftPropName;
--	bool mbDialogType;
--	
--public:
--	ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialogType = false );
--
--	// Attributes
--	virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
--	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--	virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
--
--	// Methods
--	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
--	virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
--	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
--	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
--	// XControl
--    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
--
--	// XDefaultProperty
--        ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
--	//XHelperInterface
--	virtual rtl::OUString& getServiceImplName();
--	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--
--#endif //
---- sc/source/ui/vba/vbacommandbar.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbar.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,347 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
--#include <com/sun/star/frame/XFrame.hpp>
--#include <com/sun/star/frame/XDesktop.hpp>
--#include <com/sun/star/frame/XLayoutManager.hpp>
--#include <com/sun/star/beans/XPropertySet.hpp>
--#include <ooo/vba/office/MsoBarType.hpp>
--
--#include "vbacommandbar.hxx"
--#include "vbacommandbarcontrols.hxx"
--#include "vbahelper.hxx"
--
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw (uno::RuntimeException) : CommandBar_BASE( xParent, xContext )
--{
--    // it's a menu bar
--    // only supporting factory menus ( no custom menus )
--    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
--    initCommandBar();
--    switch( nModuleType )
--    {
--        case 0:
--            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" );
--            break;
--        case 1:
--            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
--            break;
--        default:
--            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
--    }
--    getMenuSettings();
--    m_bIsMenu = sal_True;
--    m_bCustom = sal_False;
--}
--ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw (uno::RuntimeException) :  CommandBar_BASE( xParent, xContext )
--{
--    // it's a tool bar
--    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
--    initCommandBar();
--    m_bTemporary = bTemporary;
--    m_bCreate = bCreate;
--    // get OOo ToolBarName
--    CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
--    if( iter != mCommandBarNameMap.end() )
--    {
--        m_sToolBarName = iter->second;
--    }
--    else
--    {
--        m_sToolBarName = sToolBarName;
--    }
--    m_sUIName = m_sToolBarName;
--    m_bIsMenu = sal_False;
--    getToolBarSettings( m_sToolBarName );
--}
--void
--ScVbaCommandBar::initCommandBar() throw (uno::RuntimeException)
--{
--    m_pScVbaCommandBars = dynamic_cast< ScVbaCommandBars* >( m_xParentHardRef.get() );
--    if ( !m_pScVbaCommandBars )
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBars"), uno::Reference< uno::XInterface >() );
--    m_bIsMenu = sal_False;
--    m_bCustom = sal_False;
--    m_bTemporary = sal_True;
--    m_sToolBarName = rtl::OUString::createFromAscii("");
--    m_sUIName = rtl::OUString::createFromAscii("");
--    m_sMenuModuleName = m_pScVbaCommandBars->GetModuleName();
--}
--void
--ScVbaCommandBar::getToolBarSettings( rtl::OUString sToolBarName ) throw( uno::RuntimeException )
--{
--    rtl::OUString sFactoryToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/") + sToolBarName.toAsciiLowerCase();
--    rtl::OUString sCustomToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/custom_toolbar_") + sToolBarName;
--    uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
--    uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
--    m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_pScVbaCommandBars->GetModuleName() ), uno::UNO_QUERY_THROW );
--    m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
--    if( m_xUICfgManager->hasSettings( sFactoryToolBar ) )
--    {
--        // exsiting standard ToolBar
--        m_xBarSettings.set( m_xUICfgManager->getSettings( sFactoryToolBar, sal_True ), uno::UNO_QUERY_THROW );
--        m_sToolBarName = sFactoryToolBar;
--    }
--    else if( m_xUICfgManager->hasSettings( sCustomToolBar ) )
--    {
--        // exisiting custom ToolBar
--        m_xBarSettings.set( m_xUICfgManager->getSettings( sCustomToolBar, sal_True ), uno::UNO_QUERY_THROW );
--        m_sToolBarName = sCustomToolBar;
--        m_bCustom = sal_True;
--    }
--    else if( m_bCreate )
--    {
--        // new custom ToolBar
--        m_xBarSettings.set( m_xUICfgManager->createSettings(), uno::UNO_QUERY_THROW );
--        m_sToolBarName = sCustomToolBar;
--        m_bCustom = sal_True;
--        addCustomBar();
--    }
--    else
--        throw uno::RuntimeException( rtl::OUString::createFromAscii("ToolBar do not exist"), uno::Reference< uno::XInterface >() );
--    if( m_pScVbaCommandBars->GetWindows()->hasByName( m_sToolBarName ) )
--    {
--        uno::Any aToolBar = m_pScVbaCommandBars->GetWindows()->getByName( m_sToolBarName );
--        aToolBar >>= m_aToolBar; 
--    }
--}
--void
--ScVbaCommandBar::addCustomBar()
--{
--    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
--    xPropertySet->setPropertyValue(rtl::OUString::createFromAscii("UIName"), uno::makeAny( m_sUIName ));
--
--    if( m_xUICfgManager->hasSettings(m_sToolBarName) )
--    {
--        m_xUICfgManager->replaceSettings( m_sToolBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
--    else
--    {
--        m_xUICfgManager->insertSettings( m_sToolBarName,  uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
--    if( !m_bTemporary )
--    {
--        m_xUICfgPers->store();
--    }
--}
--void 
--ScVbaCommandBar::getMenuSettings()
--{
--    try
--    {
--        rtl::OUString sMenuBar = rtl::OUString::createFromAscii( "private:resource/menubar/menubar" );
--        uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
--        uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
--        m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_sMenuModuleName ), uno::UNO_QUERY_THROW );
--        m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
--        m_xBarSettings.set( m_xUICfgManager->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW );
--    } 
--    catch ( uno::Exception e)
--    {
--        OSL_TRACE( "getMenuSetting got a error\n" );
--    }
--}
--::rtl::OUString SAL_CALL
--ScVbaCommandBar::getName() throw ( uno::RuntimeException )
--{
--    // This will get a "NULL length string" when Name is not set. 
--    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
--    uno::Any aName = xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") );
--    rtl::OUString sName;
--    aName >>= sName;
--    if( sName.getLength() < 1 && !m_bIsMenu )
--    {
--        uno::Reference< container::XNameAccess > xNameAccess( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
--        if( xNameAccess->hasByName( m_sToolBarName ) )
--        {
--            beans::PropertyValues aToolBar; 
--            xNameAccess->getByName( m_sToolBarName ) >>= aToolBar;
--            sal_Int32 nCount = aToolBar.getLength();
--            beans::PropertyValue aPropertyValue;
--            for( sal_Int32 i = 0; i < nCount; i++ )
--            {
--                aPropertyValue = aToolBar[i];
--                if( aPropertyValue.Name.equals( rtl::OUString::createFromAscii("UIName") ) )
--                {
--                    aPropertyValue.Value >>= sName;
--                    return sName;
--                }
--            }
--        }
--    }
--    return sName;
--}
--void SAL_CALL 
--ScVbaCommandBar::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException)
--{
--    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
--    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("UIName"), uno::makeAny( _name ) );
--    uno::Reference< container::XIndexAccess > xIndexAccess( m_xBarSettings, uno::UNO_QUERY_THROW );
--    
--    if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
--    {
--        m_xUICfgManager->replaceSettings( m_sToolBarName, xIndexAccess );
--    }
--    else
--    {
--        // toolbar not found
--    }
--    if( !m_bTemporary )
--    {
--        m_xUICfgPers->store();
--    }
--}
--::sal_Bool SAL_CALL 
--ScVbaCommandBar::getVisible() throw (uno::RuntimeException)
--{
--    sal_Bool bVisible = sal_False;
--    try
--    {
--        sal_Int32 i = 0;
--        while( !m_aToolBar[i].Name.equals( rtl::OUString::createFromAscii( "Visible" ) ) )
--        {
--            i++;
--        }
--        m_aToolBar[i].Value >>= bVisible;
--    }
--    catch ( uno::Exception e )
--    {
--    }
--    return bVisible;
--}
--void SAL_CALL 
--ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
--{
--    try
--    {
--        uno::Reference< frame::XFrame > xFrame( getCurrentDocument()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); 
--        uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
--        uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW );
--        if( _visible )
--        {
--            xLayoutManager->createElement( m_sToolBarName );
--            xLayoutManager->showElement( m_sToolBarName );
--        }
--        else
--        {
--            xLayoutManager->hideElement( m_sToolBarName );
--            xLayoutManager->destroyElement( m_sToolBarName );
--        }
--    }
--    catch( uno::Exception e )
--    {
--        OSL_TRACE( "SetVisible get an exception\n" );
--    }
--}
--void SAL_CALL 
--ScVbaCommandBar::Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
--{
--    if( m_bCustom )
--    {
--        if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
--        {
--            m_xUICfgManager->removeSettings(m_sToolBarName);
--            // make it permanent
--            if( !m_bTemporary )
--            {
--                m_xUICfgPers->store();
--            }
--        }
--        else
--        {
--            // toolbar not found
--            // TODO throw Error
--        }
--        uno::Reference< container::XNameContainer > xNameContainer( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
--        if( xNameContainer->hasByName( m_sToolBarName ) )
--        {
--            xNameContainer->removeByName( m_sToolBarName );
--        }
--    }
--}
--uno::Any SAL_CALL 
--ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
--{
--    sal_Int32 nIndex;
--    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
--    if( aIndex.hasValue() )
--    {
--        if( aIndex >>= nIndex )
--        {
--            uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
--            return uno::makeAny( xCommandBarControl );
--        }
--        else
--            throw uno::RuntimeException( rtl::OUString::createFromAscii(  "invalid index" ), uno::Reference< uno::XInterface >() );
--    }
--    return uno::makeAny( xCommandBarControls );
--}
--
--sal_Int32 SAL_CALL
--ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException)
--{
--    // #FIXME support msoBarTypePopup
--    sal_Int32 nType = office::MsoBarType::msoBarTypePopup;
--    nType = m_bIsMenu? office::MsoBarType::msoBarTypeNormal : office::MsoBarType::msoBarTypeMenuBar;
--    return nType;
--}
--
--uno::Any SAL_CALL 
--ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException)
--{
--    // alwayse fail to find control
--    return uno::makeAny( uno::Reference< XCommandBarControl > () );
--}
--
--rtl::OUString& 
--ScVbaCommandBar::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBar") );
--	return sImplName;
--}
--uno::Sequence<rtl::OUString> 
--ScVbaCommandBar::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBar" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbacommandbar.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbar.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,107 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_COMMANDBAR_HXX
--#define SC_VBA_COMMANDBAR_HXX
--
--#include <ooo/vba/XCommandBar.hpp>
--#include <com/sun/star/ui/XUIConfigurationManager.hpp>
--#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
--#include <com/sun/star/container/XIndexContainer.hpp>
--#include <com/sun/star/beans/PropertyValues.hpp>
--
--#include "vbahelperinterface.hxx"
--#include "vbacommandbars.hxx"
--
--#include <map>
--typedef std::map< const rtl::OUString, rtl::OUString > CommandBarNameMap;
--typedef std::pair< const rtl::OUString, rtl::OUString > CommandBarNamePair;
--const CommandBarNamePair namePair[] = { 
--    CommandBarNamePair(  rtl::OUString::createFromAscii("standard"), rtl::OUString::createFromAscii("standardbar") ),
--    CommandBarNamePair(  rtl::OUString::createFromAscii("formatting"), rtl::OUString::createFromAscii("formatobjectbar") ),
--};
--static const CommandBarNameMap mCommandBarNameMap( namePair, ( namePair + sizeof(namePair) / sizeof(namePair[0]) ) );
--
--
--typedef InheritedHelperInterfaceImpl1< ov::XCommandBar > CommandBar_BASE;
--
--class ScVbaCommandBar : public CommandBar_BASE
--{
--private:
--    rtl::OUString       m_sToolBarName;
--    rtl::OUString       m_sMenuModuleName;
--    rtl::OUString       m_sUIName;
--    sal_Bool            m_bTemporary;
--    sal_Bool            m_bIsMenu;
--    sal_Bool            m_bCustom;
--    sal_Bool            m_bCreate;
--    ScVbaCommandBars*   m_pScVbaCommandBars;
--    css::beans::PropertyValues  m_aToolBar;
--    // hard reference for parent
--    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
--    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
--    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
--    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
--    void initCommandBar() throw( css::uno::RuntimeException );
--protected:
--    void getToolBarSettings( rtl::OUString sToolBarName ) throw( css::uno::RuntimeException );
--    void getMenuSettings();
--    void addCustomBar();
--public:
--    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw( css::uno::RuntimeException );
--    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw( css::uno::RuntimeException );
--    
--    sal_Bool IsMenu() { return m_bIsMenu; };
--    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
--    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
--    css::uno::Reference< css::container::XIndexContainer > GetBarSettings() { return m_xBarSettings; };
--    rtl::OUString GetToolBarName() { return m_sToolBarName; };
--
--    // Attributes
--    virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setName( const ::rtl::OUString& _name ) throw (css::uno::RuntimeException);
--    virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
--
--    // Methods
--    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL Type(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
--
--	// XHelperInterface
--	virtual rtl::OUString& getServiceImplName();
--	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--#endif//SC_VBA_COMMANDBAR_HXX
---- sc/source/ui/vba/vbacommandbarcontrol.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbarcontrol.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,443 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include "vbacommandbarcontrol.hxx"
--#include <basic/sbstar.hxx>
--#include <basic/sbmod.hxx>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName )
--{
--    sal_Int32 nCount = aPropertyValues.getLength();
--    for( sal_Int32 i = 0; i < nCount; i++ )
--    {
--        if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
--        {
--            return aPropertyValues[i].Value;
--        }
--    }
--    return uno::Any();
--}
--
--beans::PropertyValues lcl_repalcePropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName, uno::Any aValue )
--{
--    sal_Int32 nCount = aPropertyValues.getLength();
--    for( sal_Int32 i = 0; i < nCount; i++ )
--    {
--        if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
--        {
--            aPropertyValues[i].Value = aValue;
--            return aPropertyValues;
--        }
--    }
--    return aPropertyValues;
--}
--
--ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Int32 nType ) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_sName( sName ), m_nPosition( nPosition ), m_nType( nType )
--{
--    // exsiting CommandBarBarControl
--    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
--    initObjects();
--    if( m_xBarSettings->hasElements() )
--    {
--        ScVbaCommandBarControl* pParentCommandBarControl = m_pCommandBarControls->GetParentCommandBarControl();
--        if( pParentCommandBarControl )
--        {
--            beans::PropertyValues aPropertyValues;
--            pParentCommandBarControl->GetCurrentSettings()->getByIndex( pParentCommandBarControl->GetPosition() ) >>= aPropertyValues;
--            pParentCommandBarControl->SetPropertyValues( aPropertyValues );
--            m_xCurrentSettings.set( lcl_getPropertyValue( pParentCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY_THROW );
--        }
--        if( !m_xCurrentSettings.is() )
--        {
--            m_xCurrentSettings.set( m_xUICfgManager->getSettings( m_pCommandBarControls->GetParentToolBarName(), sal_True ), uno::UNO_QUERY_THROW );
--        }
--    }
--    if( m_bIsMenu )
--    {
--        m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
--    }
--    else
--    {
--        m_sBarName = m_pCommandBarControls->GetParentToolBarName();
--    }
--    m_bTemporary = sal_True;
--}
--ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType) throw (uno::RuntimeException) :  CommandBarControl_BASE( xParent, xContext ), m_nPosition( nPosition ), m_bTemporary( bTemporary ), m_nType( nType )
--{
--    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
--    initObjects();
--    if( sName.getLength() > 0 )
--    {
--        m_sName = sName;
--    }
--    m_sCommand = rtl::OUString::createFromAscii("vnd.openoffice.org:") + sName;
--    if( m_bIsMenu )
--    {
--        m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
--        createNewMenuBarControl();
--    }
--    else
--    {
--        m_sBarName = m_pCommandBarControls->GetParentToolBarName();
--        createNewToolBarControl();
--    }
--}
--
--void
--ScVbaCommandBarControl::initObjects() throw (uno::RuntimeException)
--{
--    m_pCommandBarControls = dynamic_cast< ScVbaCommandBarControls* >( m_xParentHardRef.get() );
--    if( !m_pCommandBarControls )
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBarControls"), uno::Reference< uno::XInterface >() );
--    m_xUICfgManager.set( m_pCommandBarControls->GetUICfgManager(), uno::UNO_QUERY_THROW );
--    m_xUICfgPers.set( m_pCommandBarControls->GetUICfgPers(), uno::UNO_QUERY_THROW );
--    m_xBarSettings.set( m_pCommandBarControls->GetBarSettings(), uno::UNO_QUERY_THROW );
--    m_bIsMenu = m_pCommandBarControls->IsMenu();
--    m_sName = rtl::OUString::createFromAscii( "Custom" );
--}
--
--void
--ScVbaCommandBarControl::createNewMenuBarControl()
--{
--    uno::Reference< lang::XSingleComponentFactory > xMenuMSF( m_xBarSettings, uno::UNO_QUERY_THROW );
--
--    uno::Sequence< beans::PropertyValue > aPropertys;
--    if( m_nType == office::MsoControlType::msoControlPopup )
--        aPropertys = uno::Sequence< beans::PropertyValue >( 4 );
--    else
--        aPropertys = uno::Sequence< beans::PropertyValue >( 3 );
--
--    aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
--    aPropertys[0].Value <<= m_sCommand; 
--    aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
--    aPropertys[1].Value <<= m_sName; 
--    aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
--    aPropertys[2].Value <<= sal_Int32(0); 
--
--    if( m_nType == office::MsoControlType::msoControlPopup )
--    {
--        aPropertys[3].Name = rtl::OUString::createFromAscii("ItemDescriptorContainer");
--        aPropertys[3].Value <<= xMenuMSF->createInstanceWithContext( mxContext );
--    }    
--
--    if( m_pCommandBarControls->GetParentCommandBar() != NULL )
--    {
--        // create a new menu
--        m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
--        m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
--    }
--    else if( m_pCommandBarControls->GetParentCommandBarControl() != NULL )
--    {
--        // create a new menu entry
--        ScVbaCommandBarControl* pPc = m_pCommandBarControls->GetParentCommandBarControl();
--        beans::PropertyValues aPropertyValues;
--        pPc->GetCurrentSettings()->getByIndex( pPc->GetPosition() ) >>= aPropertyValues;
--        pPc->SetPropertyValues( aPropertyValues );
--        
--        // has the property already been set?
--        if( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ).hasValue() )
--        {
--            lcl_repalcePropertyValue(  pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer"), uno::makeAny( xMenuMSF->createInstanceWithContext( mxContext ) ) );
--            pPc->GetCurrentSettings()->replaceByIndex( pPc->GetPosition(), uno::makeAny( pPc->GetPropertyValues() ) );
--        }
--        m_xCurrentSettings.set( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY_THROW );
--        m_xCurrentSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
--    }
--    if( m_xUICfgManager->hasSettings( m_sBarName ) )
--    {
--        m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
--    else
--    {
--        m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
--    if( !m_bTemporary )
--    {
--        m_xUICfgPers->store();
--    }
--}
--
--void
--ScVbaCommandBarControl::createNewToolBarControl()
--{
--    uno::Sequence< beans::PropertyValue > aPropertys(4);
--    aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
--    aPropertys[0].Value <<= m_sCommand; 
--    aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
--    aPropertys[1].Value <<= m_sName; 
--    aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
--    aPropertys[2].Value <<= sal_Int32(0); 
--    aPropertys[3].Name = rtl::OUString::createFromAscii("IsVisible");
--    aPropertys[3].Value <<= sal_True; 
--
--    m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
--    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
--    rtl::OUString sUIName;
--    xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") ) >>= sUIName;
--
--    m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
--    if( m_xUICfgManager->hasSettings( m_sBarName ) )
--    {
--        m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
--    else
--    {
--        m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
--    if( !m_bTemporary )
--    {
--        m_xUICfgPers->store();
--    }
--}
--
--::rtl::OUString SAL_CALL
--ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException )
--{
--    // "Label" always empty
--    rtl::OUString sCaption;
--    beans::PropertyValues aPropertyValues;
--    if( m_xCurrentSettings.is() )
--    {
--        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
--        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
--    }
--    else if( m_xBarSettings.is() )
--    {
--        m_xBarSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
--        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
--    }
--    return sCaption;
--}
--void SAL_CALL 
--ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
--{
--    if( m_xCurrentSettings.is() )
--    {
--        beans::PropertyValues aPropertyValues;
--        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
--        beans::PropertyValues aNewPropertyValues;
--        aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label"), uno::makeAny( _caption ) );
--        m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
--        if( m_xUICfgManager->hasSettings( m_sBarName ) )
--        {
--            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        else
--        {
--            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        // make it permanent
--        if( !m_bTemporary )
--        {
--            m_xUICfgPers->store();
--        }
--    }
--}
--::rtl::OUString SAL_CALL 
--ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException)
--{
--    if( m_xCurrentSettings.is() )
--    {
--        beans::PropertyValues aPropertyValues;
--        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
--        rtl::OUString sCommandURL;
--        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
--        return sCommandURL;
--    }
--    return ::rtl::OUString();
--}
--void SAL_CALL 
--ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException)
--{
--    if( m_xCurrentSettings.is() )
--    {
--        // convert the comand url into something like vnd.sun.star.script:Standard.testMacro.Macro1?language=Basic&location=document
--        rtl::OUString aCommandURL;
--        rtl::OUString sUrlPart = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
--        SbModule* pModule = StarBASIC::GetActiveModule();
--        if( pModule && ( _onaction.indexOf( sUrlPart ) == -1 ) )
--        {
--            rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
--            aCommandURL = sUrlPart.concat( pModule->GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( _onaction ).concat( sUrlPart1 );
--        }
--        else
--        {
--            aCommandURL = _onaction;
--        }
--		OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
--
--        beans::PropertyValues aPropertyValues;
--        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
--        beans::PropertyValues aNewPropertyValues;
--        aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
--        m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
--        if( m_xUICfgManager->hasSettings( m_sBarName ) )
--        {
--            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        else
--        {
--            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        // make it permanent
--        if( !m_bTemporary )
--        {
--            m_xUICfgPers->store();
--        }
--    }
--}
--::sal_Bool SAL_CALL 
--ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException)
--{
--    // not possible in UNO?
--    return sal_True;
--}
--void SAL_CALL 
--ScVbaCommandBarControl::setVisible( ::sal_Bool /*_visible*/ ) throw (uno::RuntimeException)
--{
--    // "IsVisilbe"
--}
--void SAL_CALL 
--ScVbaCommandBarControl::Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
--{
--    if( m_xCurrentSettings.is() )
--    {
--        m_xCurrentSettings->removeByIndex( m_nPosition );
--
--        if( m_xUICfgManager->hasSettings( m_sBarName ) )
--        {
--            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        else
--        {
--            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        // make it permanent
--        if( !m_bTemporary )
--        {
--            m_xUICfgPers->store();
--        }
--    }
--}
--uno::Any SAL_CALL 
--ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
--{
--    sal_Int32 nIndex;
--    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
--    if( aIndex.hasValue() )
--    {
--        if( aIndex >>= nIndex )
--        {
--            uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
--            return uno::makeAny( xCommandBarControl );
--        }
--        else
--            throw uno::RuntimeException( rtl::OUString::createFromAscii( "invalid index" ), uno::Reference< uno::XInterface >() );
--    }
--    return uno::makeAny( xCommandBarControls );
--}
--rtl::OUString& 
--ScVbaCommandBarControl::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControl") );
--	return sImplName;
--}
--uno::Sequence<rtl::OUString> 
--ScVbaCommandBarControl::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControl" ) );
--	}
--	return aServiceNames;
--}
--
--//////////// ScVbaCommandBarPopup //////////////////////////////
--ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlPopup )
--{
--}
--
--ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlPopup) 
--{
--}
--
--rtl::OUString& 
--ScVbaCommandBarPopup::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarPopup") );
--	return sImplName;
--}
--uno::Sequence<rtl::OUString> 
--ScVbaCommandBarPopup::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarPopup" ) );
--	}
--	return aServiceNames;
--}
--
--//////////// ScVbaCommandBarButton //////////////////////////////
--ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlButton )
--{
--}
--
--ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlButton) 
--{
--}
--
--rtl::OUString& 
--ScVbaCommandBarButton::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarButton") );
--	return sImplName;
--}
--uno::Sequence<rtl::OUString> 
--ScVbaCommandBarButton::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarButton" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbacommandbarcontrol.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbarcontrol.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,120 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_COMMANDBARCONTROL_HXX
--#define SC_VBA_COMMANDBARCONTROL_HXX
--
--#include <ooo/vba/XCommandBarControl.hpp>
--#include <ooo/vba/XCommandBarPopup.hpp>
--#include <ooo/vba/XCommandBarButton.hpp>
--#include <ooo/vba/office/MsoControlType.hpp>
--
--#include "vbahelperinterface.hxx"
--#include "vbacommandbarcontrols.hxx"
--
--typedef InheritedHelperInterfaceImpl1< ov::XCommandBarControl > CommandBarControl_BASE;
--
--class ScVbaCommandBarControl : public CommandBarControl_BASE
--{
--private:
--    rtl::OUString       m_sName;
--    rtl::OUString       m_sBarName;
--    rtl::OUString       m_sCommand;
--    sal_Int32           m_nType;
--    sal_Int32           m_nPosition;
--    sal_Bool            m_bTemporary;
--    sal_Bool            m_bIsMenu;
--    ScVbaCommandBarControls*        m_pCommandBarControls;
--    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
--    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
--    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
--    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
--    css::uno::Reference< css::container::XIndexContainer >          m_xCurrentSettings;
--    css::beans::PropertyValues                                      m_aPropertyValues;
--    
--    void initObjects() throw (css::uno::RuntimeException);
--    void createNewMenuBarControl();
--    void createNewToolBarControl();
--public:
--    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
--    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
--    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
--    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
--    css::uno::Reference< css::container::XIndexContainer >  GetBarSettings() { return m_xBarSettings; };
--    sal_Bool IsMenu() { return m_bIsMenu; };
--    sal_Int32 GetPosition() { return m_nPosition; };
--    css::uno::Reference< css::container::XIndexContainer > GetCurrentSettings() { return m_xCurrentSettings; };
--    css::beans::PropertyValues GetPropertyValues() { return m_aPropertyValues; };
--    void SetPropertyValues( css::beans::PropertyValues aPropertyValues ) { m_aPropertyValues = aPropertyValues; };
--    
--    // Attributes
--    virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException);
--    virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException);
--    virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
--
--    // Methods
--    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
--
--	// XHelperInterface
--	virtual rtl::OUString& getServiceImplName();
--	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--
--typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarPopup > CommandBarPopup_BASE;
--class ScVbaCommandBarPopup : public CommandBarPopup_BASE
--{
--public:
--    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
--    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
--	// XHelperInterface
--	virtual rtl::OUString& getServiceImplName();
--	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--
--typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarButton > CommandBarButton_BASE;
--class ScVbaCommandBarButton : public CommandBarButton_BASE
--{
--public:
--    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
--    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
--	// XHelperInterface
--	virtual rtl::OUString& getServiceImplName();
--	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--
--#endif//SC_VBA_COMMANDBARCONTROL_HXX
---- sc/source/ui/vba/vbacommandbarcontrols.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbarcontrols.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,348 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include "vbacommandbarcontrols.hxx"
--#include "vbacommandbarcontrol.hxx"
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName );
--
--typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarControlEnumeration_BASE;
--class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE
--{
--    //uno::Reference< uno::XComponentContext > m_xContext;
--    ScVbaCommandBarControls* m_pCommandBarControls;
--    sal_Int32 m_nCurrentPosition;
--public:
--    CommandBarControlEnumeration( ScVbaCommandBarControls* pCommandBarControls ) : m_pCommandBarControls( pCommandBarControls ), m_nCurrentPosition( 0 ) {}
--    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
--    {
--        if( m_nCurrentPosition < m_pCommandBarControls->getCount() )
--            return sal_True;
--        return sal_False;
--    }
--    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
--    {
--        if( hasMoreElements() )
--        {
--            rtl::OUString sName = m_pCommandBarControls->GetControlNameByIndex( m_nCurrentPosition );
--            m_nCurrentPosition = m_nCurrentPosition + 1;
--            if( sName.getLength() > 0 )
--                return m_pCommandBarControls->createCollectionObject( uno::makeAny( sName ) );
--            else
--                return nextElement();
--        }
--        else
--            throw container::NoSuchElementException();
--    }
--};
--
--ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess> xIndexAccess ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess )
--{
--    m_bIsMenu = sal_False;
--    m_bHasElements = sal_False;
--    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
--    m_pCommandBar = dynamic_cast< ScVbaCommandBar* >( m_xParentHardRef.get() );
--    m_pCommandBarControl = dynamic_cast< ScVbaCommandBarControl* >( m_xParentHardRef.get() );
--    if( m_pCommandBar )
--    {
--        m_xUICfgManager.set( m_pCommandBar->GetUICfgManager(), uno::UNO_QUERY_THROW );
--        m_xUICfgPers.set( m_pCommandBar->GetUICfgPers(), uno::UNO_QUERY_THROW );
--        m_xBarSettings.set( m_pCommandBar->GetBarSettings(), uno::UNO_QUERY_THROW );
--        m_bIsMenu = m_pCommandBar->IsMenu();
--        if( m_xBarSettings->hasElements() )
--        {
--            m_bHasElements = sal_True;
--        }
--    }
--    else if( m_pCommandBarControl )
--    {
--        m_xUICfgManager.set( m_pCommandBarControl->GetUICfgManager(), uno::UNO_QUERY_THROW );
--        m_xUICfgPers.set( m_pCommandBarControl->GetUICfgPers(), uno::UNO_QUERY_THROW );
--        beans::PropertyValues aPropertyValues;
--        m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
--        m_pCommandBarControl->SetPropertyValues( aPropertyValues );
--        m_xBarSettings.set( m_pCommandBarControl->GetCurrentSettings(), uno::UNO_QUERY_THROW );
--
--        uno::Any aValue = lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") );
--        if( aValue.hasValue() )
--        {
--            m_xCurrentSettings = m_pCommandBarControl->GetCurrentSettings();
--            m_bHasElements = sal_True;
--        }
--        else
--        {
--            m_bHasElements = sal_False;
--        }
--        m_bIsMenu = m_pCommandBarControl->IsMenu();
--    }
--    else
--    {
--        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parent needs to be a ScVbaCommandBar or a ScVbaCommandBarControl"), uno::Reference< uno::XInterface >() );
--    }
--}
--rtl::OUString
--ScVbaCommandBarControls::GetControlNameByIndex( const sal_Int32 nIndex ) throw ( uno::RuntimeException )
--{
--    sal_Int32 nCount = 0;
--    if( m_bHasElements )
--    {
--        sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
--        for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
--        {
--            beans::PropertyValues aMenuValues;
--            m_xBarSettings->getByIndex( i ) >>= aMenuValues;
--            for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
--            {
--                if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
--                {
--                    nCount++;
--                    if( nIndex == nCount )
--                    {
--                        rtl::OUString sCommandURL;
--                        aMenuValues[j].Value >>= sCommandURL;
--                        sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
--                        if( ( nLastIndex != -1 ) && ( ( nLastIndex +1 ) < sCommandURL.getLength() ) )
--                        {
--                            sCommandURL = sCommandURL.copy( nLastIndex + 1 );
--                            return sCommandURL;
--                        }
--                    }
--                }
--            }
--        } 
--    }
--    else
--        throw  uno::RuntimeException( rtl::OUString::createFromAscii( "Out of bound" ), uno::Reference< uno::XInterface >() );
--    return rtl::OUString();
--}
--
--// Attributes
--sal_Int32 SAL_CALL 
--ScVbaCommandBarControls::getCount() throw (uno::RuntimeException)
--{
--    sal_Int32 nCount = 0;
--    if( m_bHasElements )
--    {
--        sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
--        for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
--        {
--            beans::PropertyValues aMenuValues;
--            m_xBarSettings->getByIndex( i ) >>= aMenuValues;
--            for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
--            {
--                if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
--                {
--                    nCount++;
--                }
--            }
--        } 
--    }
--    return nCount;
--}
--// XEnumerationAccess
--uno::Type SAL_CALL
--ScVbaCommandBarControls::getElementType() throw ( uno::RuntimeException )
--{
--    return XCommandBarControls::static_type( 0 );
--}
--uno::Reference< container::XEnumeration >
--ScVbaCommandBarControls::createEnumeration() throw ( uno::RuntimeException )
--{
--    return uno::Reference< container::XEnumeration >( new CommandBarControlEnumeration( this ) );
--}
--uno::Any
--ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
--{
--    // only surport the aSource as a name string, because this class is a API wrapper
--    rtl::OUString sName;
--    if( aSource >>= sName )
--    {
--        uno::Reference< container::XIndexContainer > xCurrentSettings;
--        beans::PropertyValues aPropertyValues;
--        if( m_pCommandBarControl )
--        {
--            m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
--            xCurrentSettings.set( lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY );
--            if( !xCurrentSettings.is() )
--            {
--                xCurrentSettings.set( m_xUICfgManager->getSettings( GetParentToolBarName(), sal_True ), uno::UNO_QUERY );
--            }
--        }
--
--        sal_Int32 nPosition = -1;
--        for( sal_Int32 i = 0; i < xCurrentSettings->getCount(); i++ )
--        {
--            xCurrentSettings->getByIndex( i ) >>= aPropertyValues;
--            // Label always empty in OOo
--            rtl::OUString sLabel;
--            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
--            if( sLabel.equalsIgnoreAsciiCase( sName ) )
--            {
--                nPosition = i;
--                break;
--            }
--            // using CammandURL to find
--            rtl::OUString sCommandURL;
--            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
--            sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
--            if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sCommandURL.getLength() ) )
--            {
--                sCommandURL = sCommandURL.copy( nLastIndex + 1 );
--            }
--            if( sCommandURL.equalsIgnoreAsciiCase( sName ) )
--            {
--                nPosition = i;
--                break;
--            }
--        }
--
--        if( nPosition  != -1 )
--        {
--            uno::Reference< container::XIndexContainer > xSubMenu;
--            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ) >>= xSubMenu;
--            ScVbaCommandBarControl* pNewCommandBarControl = NULL;
--            if( xSubMenu.is() )
--                pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sName, nPosition );
--            else
--                pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sName, nPosition );
--
--            return uno::makeAny( uno::Reference< XCommandBarControl > ( pNewCommandBarControl ) );
--        }
--        else
--            throw uno::RuntimeException( rtl::OUString::createFromAscii("The CommandBarControl do not exist"), uno::Reference< uno::XInterface >() );
--        
--    }
--    return uno::Any();
--}
--
--// Methods
--uno::Any SAL_CALL 
--ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*/ ) throw (uno::RuntimeException)
--{
--    if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
--    {
--        return createCollectionObject( aIndex );
--    } 
--    sal_Int32 nIndex = 0;
--    if( aIndex >>= nIndex )
--    {
--        return createCollectionObject( uno::makeAny( GetControlNameByIndex( nIndex ) ) );
--    }
--    
--    return uno::Any();
--}
--uno::Reference< XCommandBarControl > SAL_CALL 
--ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& /*Parameter*/, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException)
--{
--    // Parameter is not supported
--    // the following name needs to be individually created;
--    rtl::OUString sCaption( rtl::OUString::createFromAscii("custom Control") );
--    rtl::OUString sCommand( rtl::OUString::createFromAscii("macro:///Standard.Module1.Test()") );
--    sal_Int32 nType =0;
--    sal_Int32 nPosition = 0;
--    sal_Int32 nId;
--    sal_Bool bTemporary = sal_True;
--    
--    if( Type.hasValue() )
--        if( Type >>= nType )
--        {
--            // evalute the type of the new control
--        }
--    if( Id.hasValue() )
--        if( Id >>= nId )
--        {
--            // evalute the action of the new control
--        }
--    if( Before.hasValue() )
--        Before >>= nPosition;
--    else
--    {
--        // if Before is ignore, the new control should be placed at the end of the commandbars;
--        if( m_pCommandBar )
--            nPosition = getCount();
--        else if ( m_pCommandBarControl )
--        {
--            css::uno::Reference< css::container::XIndexContainer > xCurrentSettings;
--            xCurrentSettings.set( lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY );
--            if( xCurrentSettings.is() )
--            {
--                nPosition = xCurrentSettings->getCount();
--            }
--        }
--    }
--    if( Temporary.hasValue() )
--        if( Temporary >>= bTemporary )
--        {
--            // evalute the temporary of the new Control
--        }
--    
--    ScVbaCommandBarControl* pNewCommandBarControl = NULL;
--    if( nType == office::MsoControlType::msoControlButton )
--    {
--        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sCaption, nPosition, bTemporary );
--    }
--    else if ( nType == office::MsoControlType::msoControlPopup )
--    {
--        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sCaption, nPosition, bTemporary );
--    }
--    else
--    {
--        pNewCommandBarControl = new ScVbaCommandBarControl( this, mxContext, sCaption, nPosition, bTemporary );
--    }
--
--    return uno::Reference< XCommandBarControl >( pNewCommandBarControl );
--}
--   
--// XHelperInterface
--rtl::OUString& 
--ScVbaCommandBarControls::getServiceImplName()
--{
--    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControls") );
--    return sImplName;
--}
--uno::Sequence<rtl::OUString> 
--ScVbaCommandBarControls::getServiceNames()
--{
--    static uno::Sequence< rtl::OUString > aServiceNames;
--    if ( aServiceNames.getLength() == 0 )
--    {
--        aServiceNames.realloc( 1 );
--        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControls" ) );
--    }
--    return aServiceNames;
--}
--
---- sc/source/ui/vba/vbacommandbarcontrols.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbarcontrols.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,91 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_COMMANDBARCONTROLS_HXX
--#define SC_VBA_COMMANDBARCONTROLS_HXX
--
--#include <ooo/vba/XCommandBarControls.hpp>
--
--#include "vbahelperinterface.hxx"
--#include "vbacommandbar.hxx"
--#include "vbacollectionimpl.hxx"
--
--class ScVbaCommandBarControl;
--
--typedef CollTestImplHelper< ov::XCommandBarControls > CommandBarControls_BASE;
--
--class ScVbaCommandBarControls : public CommandBarControls_BASE
--{
--private:
--    sal_Bool                    m_bIsMenu;
--    sal_Bool                    m_bHasElements;
--    ScVbaCommandBar*            m_pCommandBar; 
--    ScVbaCommandBarControl*     m_pCommandBarControl; 
--    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
--    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
--    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
--    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
--    css::uno::Reference< css::container::XIndexContainer >          m_xCurrentSettings;
--
--public:
--    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess ) throw( css::uno::RuntimeException );
--    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
--    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
--    css::uno::Reference< css::container::XIndexContainer >  GetBarSettings() { return m_xBarSettings; };
--    sal_Bool IsMenu() { return m_bIsMenu; };
--    ScVbaCommandBar* GetParentCommandBar() { return m_pCommandBar; };
--    ScVbaCommandBarControl* GetParentCommandBarControl() { return m_pCommandBarControl; };
--    rtl::OUString GetParentToolBarName() 
--    { 
--        if( m_pCommandBar ) return m_pCommandBar->GetToolBarName();
--        else return rtl::OUString();
--    }
--    rtl::OUString GetControlNameByIndex( const sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
--
--    // Attributes
--    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
--    // XEnumerationAccess
--    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
--    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
--
--    // Methods     
--    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); 
--    virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
--    // XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--
--#endif//SC_VBA_COMMANDBARCONTROLS_HXX
---- sc/source/ui/vba/vbacommandbars.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbars.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,261 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include <com/sun/star/lang/XServiceInfo.hpp>
--#include <com/sun/star/frame/XDesktop.hpp>
--#include <com/sun/star/container/XNameAccess.hpp>
--
--#include "vbacommandbars.hxx"
--#include "vbacommandbar.hxx"
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarEnumeration_BASE;
--
--static rtl::OUString sSpreadsheetDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
--static rtl::OUString sTextDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" ) );
--static rtl::OUString sWindowStateConfUrl( rtl::OUString::createFromAscii( "com.sun.star.ui.WindowStateConfiguration" ) );
--
--class CommandBarEnumeration : public CommandBarEnumeration_BASE
--{
--    uno::Reference< uno::XComponentContext > m_xContext;
--    uno::Reference< XCommandBars > m_xCommandBars;
--    uno::Sequence< rtl::OUString > m_sNames;
--    sal_Int32 m_nCurrentPosition;
--public:
--    CommandBarEnumeration( const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBars > xCommandBars, const uno::Sequence< rtl::OUString > sNames ) : m_xContext( xContext ), m_xCommandBars( xCommandBars ), m_sNames( sNames ), m_nCurrentPosition( 0 )
--    {
--    }
--    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
--    {
--        if( m_nCurrentPosition < m_sNames.getLength() )
--            return sal_True;
--        return sal_False;
--    }
--    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
--    {
--        if( hasMoreElements() )
--        {
--            rtl::OUString sName( m_sNames[ m_nCurrentPosition ] );
--            m_nCurrentPosition = m_nCurrentPosition + 1;
--            if( sName.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 ) 
--            {
--                sal_Int32 nLastIndex = sName.lastIndexOf( rtl::OUString::createFromAscii( "/" ) );
--                if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sName.getLength() ) )
--                {
--                   sName = sName.copy( nLastIndex + 1);
--                   if( sName.getLength() > 0 )
--                   {
--                        uno::Reference< XHelperInterface > xHelperInterface( m_xCommandBars, uno::UNO_QUERY_THROW );
--                        uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( xHelperInterface, m_xContext, sName, sal_True, sal_False ) );
--                        if( xCommandBar.is() )
--                            return uno::makeAny( xCommandBar );
--                        else
--                            return nextElement();
--                    }
--                    else
--                        return nextElement();
--                    }
--             }
--             else
--                return nextElement();
--        }
--        else
--            throw container::NoSuchElementException();
--        return uno::Any();
--    }
--};
--
--
--ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess > xIndexAccess ) : CommandBars_BASE( xParent, xContext, xIndexAccess )
--{
--    retrieveObjects();
--}
--void
--ScVbaCommandBars::retrieveObjects() throw ( uno::RuntimeException )
--{
--    uno::Reference< lang::XServiceInfo > xServiceInfo( getCurrentDocument(), uno::UNO_QUERY_THROW );
--    if( xServiceInfo->supportsService( sSpreadsheetDocumentUrl ) )
--    {
--        m_sModuleName = sSpreadsheetDocumentUrl;
--    }
--    else if( xServiceInfo->supportsService( sTextDocumentUrl ) )
--    {
--        m_sModuleName = sTextDocumentUrl;
--    }
--    else
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Unsupported Document" ), uno::Reference< uno::XInterface >() );
--    
--    uno::Reference < lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
--    uno::Reference < container::XNameAccess > xNameAccess( xMSF->createInstance( sWindowStateConfUrl ), uno::UNO_QUERY_THROW );
--    m_xNameAccess.set( xNameAccess->getByName( m_sModuleName ), uno::UNO_QUERY_THROW );
--}
--
--// XEnumerationAccess
--uno::Type SAL_CALL 
--ScVbaCommandBars::getElementType() throw ( uno::RuntimeException )
--{
--    return XCommandBars::static_type( 0 );
--}
--uno::Reference< container::XEnumeration >
--ScVbaCommandBars::createEnumeration() throw ( uno::RuntimeException )
--{
--    return uno::Reference< container::XEnumeration >( new CommandBarEnumeration( mxContext, this, m_xNameAccess->getElementNames() ) );
--}
--
--uno::Any
--ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
--{
--    // aSource should be a name at this time, because of the class is API wrapper.
--    rtl::OUString sToolBarName;
--    if( aSource >>= sToolBarName )
--    {
--        sToolBarName = sToolBarName.toAsciiLowerCase();
--        if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Worksheet Menu Bar") ) )
--        {
--            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 0 ) ) );
--        }
--        else if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Menu Bar") ) )
--        {
--            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 1 ) ) );
--        }
--        else if( checkToolBarExist( sToolBarName ) )
--        {
--            return uno::makeAny( uno::Reference< XCommandBar > (new ScVbaCommandBar( this, mxContext, sToolBarName, sal_True, sal_False ) ) );
--        }
--    }
--    return uno::Any();
--}
--
--// XCommandBars
--uno::Reference< XCommandBar > SAL_CALL 
--ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
--{
--    // Position - MsoBar MenuBar - sal_Bool
--    // Currently only the Name is supported.
--    rtl::OUString sName;
--    if( !( Name >>= sName ) )
--    {
--        sName = rtl::OUString::createFromAscii("Custom1");
--    }
--    sal_Bool bTemporary = false;
--    if( !( Temporary >>= bTemporary ) )
--    {
--        bTemporary = sal_True;
--    }
--    return uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, sName.toAsciiLowerCase(), bTemporary, sal_True ) );
--}
--sal_Int32 SAL_CALL 
--ScVbaCommandBars::getCount() throw(css::uno::RuntimeException)
--{
--    // Filter out all toolbars from the window collection
--    sal_Int32 nCount = 0;
--    uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
--    for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
--    {
--        if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
--        {
--            nCount++;
--        }
--    }
--    return nCount;
--}
--
--// ScVbaCollectionBaseImpl
--uno::Any SAL_CALL
--ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
--{
--    if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
--    {
--        return createCollectionObject( aIndex );    
--    }
--
--    // hardcode if "aIndex = 1" that would return "main menu".
--    sal_Int16 nIndex = 0;
--    aIndex >>= nIndex;
--    if( nIndex == 1 )
--    {
--        uno::Any aSource;
--        if( m_sModuleName.equalsIgnoreAsciiCase( sSpreadsheetDocumentUrl ) )
--            aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" );
--        else if( m_sModuleName.equalsIgnoreAsciiCase( sTextDocumentUrl ) )
--            aSource <<= rtl::OUString::createFromAscii( "Menu Bar" );
--        if( aSource.hasValue() )    
--            return createCollectionObject( aSource );
--    }
--    return uno::Any();
--}
--
--sal_Bool
--ScVbaCommandBars::checkToolBarExist( rtl::OUString sToolBarName )
--{
--    CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
--    if( iter != mCommandBarNameMap.end() )
--    {
--        return sal_True;
--    }    
--    uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
--    for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
--    {
--        if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
--        {
--            if( allNames[i].indexOf( sToolBarName ) != -1 )
--            {
--                return sal_True;
--            }
--        }
--    }
--    return sal_False;
--}
--    
--// XHelperInterface
--rtl::OUString& 
--ScVbaCommandBars::getServiceImplName()
--{
--    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBars") );
--    return sImplName;
--}
--uno::Sequence<rtl::OUString> 
--ScVbaCommandBars::getServiceNames()
--{
--    static uno::Sequence< rtl::OUString > aServiceNames;
--    if ( aServiceNames.getLength() == 0 )
--    {
--        aServiceNames.realloc( 1 );
--        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBars" ) );
--    }
--    return aServiceNames;
--}
--
---- sc/source/ui/vba/vbacommandbars.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacommandbars.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,79 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_COMMANDBARS_HXX
--#define SC_VBA_COMMANDBARS_HXX
--
--#include <ooo/vba/XCommandBar.hpp>
--#include <ooo/vba/XCommandBars.hpp>
--#include <com/sun/star/container/XNameAccess.hpp>
--
--#include <cppuhelper/implbase1.hxx>
--
--#include "vbahelperinterface.hxx"
--#include "vbacollectionimpl.hxx"
--
--typedef CollTestImplHelper< ov::XCommandBars > CommandBars_BASE;
--
--class ScVbaCommandBars : public CommandBars_BASE
--{
--private:
--    css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
--    rtl::OUString m_sModuleName;
--    void retrieveObjects() throw( css::uno::RuntimeException );
--public:
--    ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess );
--
--    sal_Bool checkToolBarExist( rtl::OUString sToolBarName );
--    rtl::OUString GetModuleName(){ return m_sModuleName; };
--    css::uno::Reference< css::container::XNameAccess > GetWindows() 
--    { 
--        retrieveObjects();
--        return m_xNameAccess; 
--    };
--    // XCommandBars
--    virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
--    // XEnumerationAccess
--    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
--    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
--
--    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException);
--    // XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--
--#endif//SC_VBA_COMMANDBARS_HXX
---- sc/source/ui/vba/vbacomment.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacomment.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -39,7 +39,7 @@
- #include <com/sun/star/table/XCellRange.hpp>
- #include <com/sun/star/uno/XComponentContext.hpp>
- 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1< ov::excel::XComment > ScVbaComment_BASE;
- 
---- sc/source/ui/vba/vbacomments.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacomments.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -34,8 +34,8 @@
- 
- #include <ooo/vba/excel/XComments.hpp>
- 
--#include "vbahelper.hxx"
--#include "vbacollectionimpl.hxx"
-+#include "excelvbahelper.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
- #include "vbacomment.hxx"
- 
- typedef CollTestImplHelper< ov::excel::XComments > ScVbaComments_BASE;
---- sc/source/ui/vba/vbacondition.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacondition.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -31,7 +31,7 @@
- #define SC_VBA_CONDITION_HXX
- #include <com/sun/star/sheet/XSheetCondition.hpp> 
- #include <com/sun/star/sheet/XCellRangeAddressable.hpp> 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- #include <com/sun/star/sheet/ConditionOperator.hpp>
- 
- template< typename Ifc1 >
---- sc/source/ui/vba/vbacontrol.cxx
-+++ sc/source/ui/vba/vbacontrol.cxx
-@@ -1,468 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbacontrol.cxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include <com/sun/star/form/FormComponentType.hpp>
--#include <com/sun/star/awt/XControlModel.hpp>
--#include <com/sun/star/awt/XControl.hpp>
--#include <com/sun/star/awt/XWindow2.hpp>
--#include <com/sun/star/lang/XEventListener.hpp>
--#include <com/sun/star/drawing/XShape.hpp>
--#include <com/sun/star/frame/XModel.hpp>
--#include <com/sun/star/view/XControlAccess.hpp>
--#include <com/sun/star/container/XChild.hpp>
--#include <com/sun/star/form/binding/XBindableValue.hpp>
--#include <com/sun/star/form/binding/XListEntrySink.hpp>
--#include <com/sun/star/table/CellAddress.hpp>
--#include <com/sun/star/table/CellRangeAddress.hpp>
--#ifdef VBA_OOBUILD_HACK
--#include <svtools/bindablecontrolhelper.hxx>
--#endif
--#include"vbacontrol.hxx"
--#include"vbacombobox.hxx"
--#include "vbabutton.hxx"
--#include "vbalabel.hxx"
--#include "vbatextbox.hxx"
--#include "vbaradiobutton.hxx"
--#include "vbalistbox.hxx"
--#include "vbatogglebutton.hxx"
--#include "vbacheckbox.hxx"
--#include "vbaframe.hxx"
--#include "vbascrollbar.hxx"
--#include "vbaprogressbar.hxx"
--#include "vbamultipage.hxx"
--#include "vbaspinbutton.hxx"
--#include "vbaimage.hxx"
--
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--uno::Reference< css::awt::XWindowPeer > 
--ScVbaControl::getWindowPeer() throw (uno::RuntimeException)
--{
--    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
--
--    uno::Reference< awt::XControlModel > xControlModel;
--    uno::Reference< css::awt::XWindowPeer >  xWinPeer;
--    if ( !xControlShape.is() ) 
--    { 
--        // would seem to be a Userform control
--        uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY_THROW );
--        xWinPeer =  xControl->getPeer();
--	return xWinPeer;
--    }
--    // form control
--    xControlModel.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
--
--    uno::Reference< view::XControlAccess > xControlAccess( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
--    try
--    {
--        uno::Reference< awt::XControl > xControl( xControlAccess->getControl( xControlModel ), uno::UNO_QUERY );
--        xWinPeer =  xControl->getPeer();
--    }
--    catch( uno::Exception )
--    {
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "The Control does not exsit" ),
--                uno::Reference< uno::XInterface >() );
--    }
--    return xWinPeer;
--}
--
--//ScVbaControlListener
--class ScVbaControlListener: public cppu::WeakImplHelper1< lang::XEventListener >
--{
--private:
--    ScVbaControl *pControl;
--public:
--    ScVbaControlListener( ScVbaControl *pTmpControl );
--    virtual ~ScVbaControlListener();
--    virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException );
--};
--
--ScVbaControlListener::ScVbaControlListener( ScVbaControl *pTmpControl ): pControl( pTmpControl )
--{
--}
--
--ScVbaControlListener::~ScVbaControlListener()
--{
--}
--
--void SAL_CALL
--ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeException )
--{
--    if( pControl )
--    {
--        pControl->removeResouce();
--        pControl = NULL;
--    }
--}
--
--//ScVbaControl
--
--ScVbaControl::ScVbaControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< ::uno::XInterface >& xControl,  const css::uno::Reference< css::frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ControlImpl_BASE( xParent, xContext ),  m_xControl( xControl ), m_xModel( xModel )
--{
--    //add listener
--    m_xEventListener.set( new ScVbaControlListener( this ) );
--    setGeometryHelper( pGeomHelper );
--    uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
--    xComponent->addEventListener( m_xEventListener );
--   
--    //init m_xProps
--    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ) ;
--    uno::Reference< awt::XControl> xUserFormControl( m_xControl, uno::UNO_QUERY ) ;
--    if ( xControlShape.is() ) // form control
--        m_xProps.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
--    else if ( xUserFormControl.is() ) // userform control
--        m_xProps.set( xUserFormControl->getModel(), uno::UNO_QUERY_THROW );
--}
--
--ScVbaControl::~ScVbaControl()
--{
--    if( m_xControl.is() )
--{
--        uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
--    xComponent->removeEventListener( m_xEventListener );
--}
--}
--
--void 
--ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
--{
--    mpGeometryHelper.reset( pHelper );
--}
--
--void ScVbaControl::removeResouce() throw( uno::RuntimeException )
--{
--    uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
--    xComponent->removeEventListener( m_xEventListener );
--    m_xControl= NULL;
--    m_xProps = NULL;
--}
--
--//In design model has different behavior
--sal_Bool SAL_CALL ScVbaControl::getEnabled() throw (uno::RuntimeException)
--{
--    uno::Any aValue = m_xProps->getPropertyValue
--            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ) );
--    sal_Bool bRet = false;
--    aValue >>= bRet;
--    return bRet;
--}
--
--void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeException)
--{
--    uno::Any aValue( bVisible );
--    m_xProps->setPropertyValue
--            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ), aValue);
--
--}
--
--sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
--{
--    sal_Bool bVisible = sal_False;
--    m_xProps->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ) ) >>= bVisible;
--    return bVisible;
--}
--
--void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
--{
--    m_xProps->setPropertyValue
--            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ), uno::makeAny( bVisible ) );
--}
--double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException)
--{
--    return mpGeometryHelper->getHeight();
--}
--void SAL_CALL ScVbaControl::setHeight( double _height ) throw (uno::RuntimeException)
--{
--    mpGeometryHelper->setHeight( _height );
--}
--
--double SAL_CALL ScVbaControl::getWidth() throw (uno::RuntimeException)
--{
--    return mpGeometryHelper->getWidth();
--}
--void SAL_CALL ScVbaControl::setWidth( double _width ) throw (uno::RuntimeException)
--{
--    mpGeometryHelper->setWidth( _width );
--}
--
--double SAL_CALL
--ScVbaControl::getLeft() throw (uno::RuntimeException)
--{
--    return mpGeometryHelper->getLeft();
--}
--
--void SAL_CALL
--ScVbaControl::setLeft( double _left ) throw (uno::RuntimeException)
--{
--    mpGeometryHelper->setLeft( _left );
--
--}
--
--double SAL_CALL
--ScVbaControl::getTop() throw (uno::RuntimeException)
--{
--    return mpGeometryHelper->getTop();
--}
--
--void SAL_CALL
--ScVbaControl::setTop( double _top ) throw (uno::RuntimeException)
--{
--    mpGeometryHelper->setTop( _top );
--}
--
--uno::Reference< uno::XInterface > SAL_CALL
--ScVbaControl::getObject() throw (uno::RuntimeException)
--{
--	uno::Reference< msforms::XControl > xRet( this );
--	return xRet;
--}
--
--void SAL_CALL ScVbaControl::SetFocus() throw (uno::RuntimeException) 
--{
--    uno::Reference< awt::XWindow > xWin( m_xControl, uno::UNO_QUERY_THROW );
--    xWin->setFocus();
--}
--
--rtl::OUString SAL_CALL 
--ScVbaControl::getControlSource() throw (uno::RuntimeException)
--{
--// #FIXME I *hate* having these upstream differences
--// but this is necessary until I manage to upstream other
--// dependant parts
--#ifdef VBA_OOBUILD_HACK
--	rtl::OUString sControlSource;
--	uno::Reference< form::binding::XBindableValue > xBindable( m_xProps, uno::UNO_QUERY );
--	if ( xBindable.is() )
--	{
--		try
--		{
--			uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
--			uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellAddressConversion" ))), uno::UNO_QUERY );
--			uno::Reference< beans::XPropertySet > xProps( xBindable->getValueBinding(), uno::UNO_QUERY_THROW );
--			table::CellAddress aAddress;
--			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BoundCell") ) ) >>= aAddress;
--			xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address") ), uno::makeAny( aAddress ) );
--                	xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sControlSource;
--		}
--		catch( uno::Exception& )
--		{
--		}	
--	}
--	return sControlSource;
--#else
--	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getControlSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
--#endif
--}
--
--void SAL_CALL 
--ScVbaControl::setControlSource( const rtl::OUString& _controlsource ) throw (uno::RuntimeException)
--{
--#ifdef VBA_OOBUILD_HACK
--    rtl::OUString sEmpty;
--    svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, _controlsource, sEmpty );
--#else
--	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setControlSource not supported ") ).concat( _controlsource ), uno::Reference< uno::XInterface >()); // not supported
--#endif
--}
--
--rtl::OUString SAL_CALL 
--ScVbaControl::getRowSource() throw (uno::RuntimeException)
--{
--#ifdef VBA_OOBUILD_HACK
--	rtl::OUString sRowSource;
--	uno::Reference< form::binding::XListEntrySink > xListSink( m_xProps, uno::UNO_QUERY );
--	if ( xListSink.is() )
--    {
--		try
--		{
--			uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
--			uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellRangeAddressConversion" ))), uno::UNO_QUERY );
--
--			uno::Reference< beans::XPropertySet > xProps( xListSink->getListEntrySource(), uno::UNO_QUERY_THROW );
--			table::CellRangeAddress aAddress;
--			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellRange") ) ) >>= aAddress;
--			xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address")), uno::makeAny( aAddress ) );
--			xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sRowSource;
--		}
--		catch( uno::Exception& )
--		{
--		}	
--	}
--	return sRowSource;
--#else
--	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getRowSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
--#endif
--}
--
--void SAL_CALL 
--ScVbaControl::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
--{
--#ifdef VBA_OOBUILD_HACK
--    rtl::OUString sEmpty;
--    svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, sEmpty, _rowsource );
--#else
--	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setRowSource not supported ") ).concat( _rowsource ), uno::Reference< uno::XInterface >()); // not supported
--#endif
--}
--
--rtl::OUString SAL_CALL 
--ScVbaControl::getName() throw (uno::RuntimeException)
--{
--	rtl::OUString sName;
--	m_xProps->getPropertyValue
--            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
--	return sName;
--
--}
--
--void SAL_CALL
--ScVbaControl::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
--{
--	m_xProps->setPropertyValue
--            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), uno::makeAny( _name ) );
--    }
--//ScVbaControlFactory
--
--ScVbaControlFactory::ScVbaControlFactory( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel ): m_xContext( xContext ), m_xControl( xControl ), m_xModel( xModel )
--{
--}
--
--ScVbaControl* ScVbaControlFactory::createControl()  throw (uno::RuntimeException)
--{
--    return createControl( m_xModel );
--}
--ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< uno::XInterface >& xParent )  throw (uno::RuntimeException)
--{
--    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
--    if ( xControlShape.is() ) // form controls
--        return createControl( xControlShape, xParent );
--    uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY );
--    if ( !xControl.is() )
--        throw uno::RuntimeException(); // really we should be more informative
--    return createControl( xControl, xParent );
--    
--}
--
--ScVbaControl* ScVbaControlFactory::createControl(const uno::Reference< drawing::XControlShape >& xControlShape,  const uno::Reference< uno::XInterface >& /*xParent*/ )  throw (uno::RuntimeException)
--{
--    uno::Reference< beans::XPropertySet > xProps( xControlShape->getControl(), uno::UNO_QUERY_THROW );
--    sal_Int32 nClassId = -1;
--    const static rtl::OUString sClassId( RTL_CONSTASCII_USTRINGPARAM("ClassId") );
--    xProps->getPropertyValue( sClassId ) >>= nClassId;
--    uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
--    switch( nClassId )
--    {
--        case form::FormComponentType::COMBOBOX:
--            return new ScVbaComboBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
--        case form::FormComponentType::COMMANDBUTTON:
--            return new ScVbaButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
--        case form::FormComponentType::FIXEDTEXT:
--            return new ScVbaLabel( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
--        case form::FormComponentType::TEXTFIELD:
--            return new ScVbaTextBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
--        case form::FormComponentType::RADIOBUTTON:
--            return new ScVbaRadioButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
--        case form::FormComponentType::LISTBOX:
--            return new ScVbaListBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
--        case form::FormComponentType::SPINBUTTON:
--            return new ScVbaSpinButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
--        case form::FormComponentType::IMAGECONTROL:
--            return new ScVbaImage( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
--        default:
--            throw uno::RuntimeException( rtl::OUString::createFromAscii(
--                    "Donot support this Control Type." ), uno::Reference< uno::XInterface >() );
--    }
--}
--
--ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XControl >& xControl,  const uno::Reference< uno::XInterface >& xParent  )  throw (uno::RuntimeException)
--{
--    uno::Reference< beans::XPropertySet > xProps( xControl->getModel(), uno::UNO_QUERY_THROW );
--    uno::Reference< lang::XServiceInfo > xServiceInfo( xProps, uno::UNO_QUERY_THROW );
--    ScVbaControl* pControl = NULL;
--    uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
--    if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ) ) )
--	pControl = new ScVbaCheckbox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );	
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) ) )
--	pControl = new ScVbaRadioButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );	
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlEditModel") ) ) )
--        pControl = new ScVbaTextBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ) ) )
--    {
--        sal_Bool bToggle = sal_False;
--        xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toggle") ) ) >>= bToggle;
--        if ( bToggle )
--            pControl = new ScVbaToggleButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
--        else
--            pControl = new ScVbaButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
--    }
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ) ) )
--        pControl = new ScVbaComboBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ) )
--	pControl = new ScVbaListBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) ) )
--	pControl = new ScVbaLabel( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ) ) )
--	pControl = new ScVbaImage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
--	pControl = new ScVbaProgressBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
--	pControl = new ScVbaFrame( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ) ) )
--	pControl = new ScVbaScrollBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ) )
--	pControl = new ScVbaMultiPage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), xParent );
--    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ) ) )
--	pControl = new ScVbaSpinButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
--    else
--        throw uno::RuntimeException( rtl::OUString::createFromAscii("Unsupported control " ), uno::Reference< uno::XInterface >() );
--    return pControl;
--}
--
--rtl::OUString& 
--ScVbaControl::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControl") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaControl::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Control" ) );
--    }
--	return aServiceNames;
--}
--
--
---- sc/source/ui/vba/vbacontrol.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacontrol.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,111 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbacontrol.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_CONTROL_HXX
--#define SC_VBA_CONTROL_HXX
--
--#include <cppuhelper/implbase1.hxx>
--#include <com/sun/star/beans/XPropertySet.hpp>
--#include <com/sun/star/uno/XComponentContext.hpp>
--#include <com/sun/star/script/XDefaultProperty.hpp>
--#include <com/sun/star/drawing/XControlShape.hpp>
--#include <com/sun/star/awt/XControl.hpp>
--#include <com/sun/star/awt/XWindowPeer.hpp>
--#include <ooo/vba/msforms/XControl.hpp>
--
--#include "vbahelper.hxx"
--#include "vbahelperinterface.hxx"
--
--//typedef ::cppu::WeakImplHelper1< ov::msforms::XControl > ControlImpl_BASE;
--typedef InheritedHelperInterfaceImpl1< ov::msforms::XControl > ControlImpl_BASE;
--
--class ScVbaControl : public ControlImpl_BASE
--{
--private:
--    com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > m_xEventListener;
--protected:
--    std::auto_ptr< ov::AbstractGeometryAttributes > mpGeometryHelper;
--    css::uno::Reference< css::beans::XPropertySet > m_xProps;
--    css::uno::Reference< css::uno::XInterface > m_xControl;
--    css::uno::Reference< css::frame::XModel > m_xModel;
--
--    virtual css::uno::Reference< css::awt::XWindowPeer > getWindowPeer() throw (css::uno::RuntimeException);
--public:
--    ScVbaControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, 
--                    const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pHelper );
--    virtual ~ScVbaControl();
--    // This class will own the helper, so make sure it is allocated from 
--    // the heap
--    void setGeometryHelper( ov::AbstractGeometryAttributes* pHelper );
--    // XControl
--    virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException);
--    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL SetFocus(  ) throw (css::uno::RuntimeException);
--
--    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException);
--    virtual rtl::OUString SAL_CALL getControlSource() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setControlSource( const rtl::OUString& _controlsource ) throw (css::uno::RuntimeException);
--    virtual rtl::OUString SAL_CALL getRowSource() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
--    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
--    //remove resouce because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape
--    virtual void removeResouce() throw( css::uno::RuntimeException );
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--
--
--class ScVbaControlFactory
--{
--public:
--    ScVbaControlFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, 
--                    const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel );
--    ScVbaControl* createControl()  throw ( css::uno::RuntimeException );
--    ScVbaControl* createControl( const css::uno::Reference< css::uno::XInterface >& xParent )  throw ( css::uno::RuntimeException );
--private:
--    ScVbaControl* createControl( const css::uno::Reference< css::awt::XControl >&, const css::uno::Reference< css::uno::XInterface >&  )  throw ( css::uno::RuntimeException );
--    ScVbaControl* createControl( const css::uno::Reference< css::drawing::XControlShape >&, const css::uno::Reference< css::uno::XInterface >& )  throw ( css::uno::RuntimeException );
--    css::uno::Reference< css::uno::XComponentContext > m_xContext;
--    css::uno::Reference< css::uno::XInterface > m_xControl;
--    css::uno::Reference< css::frame::XModel > m_xModel;
--};
--
--#endif//SC_VBA_CONTROL_HXX
---- sc/source/ui/vba/vbacontrols.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacontrols.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,227 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile$
-- * $Revision$
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--
--#include "vbacontrols.hxx"
--#include "vbacontrol.hxx"
--#include <cppuhelper/implbase2.hxx>
--#include <com/sun/star/awt/XControlContainer.hpp>
--#include <hash_map>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl;
--
--typedef  std::hash_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash,
--    ::std::equal_to< ::rtl::OUString >  > ControlIndexMap;
--typedef  std::vector< uno::Reference< awt::XControl > > ControlVec;
--
--class ControlArrayWrapper : public ArrayWrapImpl
--{
--    uno::Reference< awt::XControlContainer > mxDialog;
--    uno::Sequence< ::rtl::OUString > msNames;
--    ControlVec mControls;
--    ControlIndexMap mIndices;
--
--    rtl::OUString getControlName( const uno::Reference< awt::XControl >& xCtrl )
--    {
--        uno::Reference< beans::XPropertySet > xProp( xCtrl->getModel(), uno::UNO_QUERY );
--        rtl::OUString sName;
--        xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
--        return sName;
--    }
--
--public:
--
--    ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
--    {
--        mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
--        uno::Sequence< uno::Reference< awt::XControl > > sXControls = mxDialog->getControls();
--    
--        msNames.realloc( sXControls.getLength() );
--        for ( sal_Int32 i = 0; i < sXControls.getLength(); ++i )
--        {
--            uno::Reference< awt::XControl > xCtrl = sXControls[ i ];
--            msNames[ i ] = getControlName( xCtrl );
--            mControls.push_back( xCtrl );
--            mIndices[ msNames[ i ] ] = i;
--        }
--    }
--    
--    // XElementAccess
--    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
--    {
--        return awt::XControl::static_type(0);
--    }
--    
--    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) 
--    {
--        return ( mControls.size() > 0 );
--    }
--    
--    // XNameAcess 
--    virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
--    {
--        if ( !hasByName( aName ) )
--            throw container::NoSuchElementException();
--        return getByIndex( mIndices[ aName ] );
--    }
--    
--    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
--    {
--        return msNames;
--    }
--    
--    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
--    {
--        ControlIndexMap::iterator it = mIndices.find( aName );
--        return it != mIndices.end();
--    }
--    
--    // XElementAccess
--    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException)
--    {
--        return mControls.size();
--    }
--    
--    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
--    {
--        if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) )
--            throw lang::IndexOutOfBoundsException();
--        return uno::makeAny( mControls[ Index ] );
--    }
--};
--
--
--class ControlsEnumWrapper : public EnumerationHelper_BASE
--{
--    uno::Reference<XHelperInterface > m_xParent;
--    uno::Reference<uno::XComponentContext > m_xContext;
--    uno::Reference<container::XIndexAccess > m_xIndexAccess;
--    uno::Reference<awt::XControl > m_xDlg;
--    sal_Int32 nIndex;
--
--public:
--
--    ControlsEnumWrapper(  const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< awt::XControl >& xDlg ) :  m_xParent( xParent ), m_xContext( xContext), m_xIndexAccess( xIndexAccess ), m_xDlg( xDlg ), nIndex( 0 ) {}
--
--    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
--    {
--        return ( nIndex < m_xIndexAccess->getCount() );
--    }
--
--    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
--    {
--        if ( nIndex < m_xIndexAccess->getCount() )
--        {
--            uno::Reference< frame::XModel > xModel;
--            uno::Reference< uno::XInterface > xControl;
--            m_xIndexAccess->getByIndex( nIndex++ ) >>= xControl;
--            // Create control from awt::XControl
--            ScVbaControlFactory aFac( m_xContext, xControl,  xModel );
--            uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( m_xDlg->getModel() ) );
--            return uno::makeAny( xVBAControl );
--        }
--        throw container::NoSuchElementException();
--    }
--
--};
--
--
--uno::Reference<container::XIndexAccess >
--lcl_controlsWrapper( const uno::Reference< awt::XControl >& xDlg )
--{
--    return new ControlArrayWrapper( xDlg );
--}
--
--ScVbaControls::ScVbaControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
--                const css::uno::Reference< awt::XControl >& xDialog )
--            : ControlsImpl_BASE( xParent, xContext, lcl_controlsWrapper( xDialog  ) )
--{
--    mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
--}
--
--uno::Reference< container::XEnumeration >
--ScVbaControls::createEnumeration() throw (uno::RuntimeException)
--{
--    uno::Reference< container::XEnumeration > xEnum( new ControlsEnumWrapper( mxParent, mxContext, m_xIndexAccess, mxDialog ) );
--    if ( !xEnum.is() )
--        throw uno::RuntimeException();
--    return xEnum;
--}
--
--uno::Any
--ScVbaControls::createCollectionObject( const css::uno::Any& aSource )
--{
--    // Create control from awt::XControl
--    uno::Reference< awt::XControl > xControl;
--    aSource >>= xControl;
--    uno::Reference< frame::XModel > xModel;
--    ScVbaControlFactory aFac( mxContext, xControl,  xModel );
--    uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( mxDialog->getModel() ) );
--    return uno::makeAny( xVBAControl );
--}
--
--void SAL_CALL 
--ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException)
--{
--    uno::Reference< container::XEnumeration > xEnum( createEnumeration() );
--    while ( xEnum->hasMoreElements() )
--    {
--        uno::Reference< msforms::XControl > xControl( xEnum->nextElement(), uno::UNO_QUERY_THROW );
--        xControl->setLeft( xControl->getLeft() + cx );
--        xControl->setTop( xControl->getTop() + cy ); 
--    }
--}
--
--uno::Type
--ScVbaControls::getElementType() throw (uno::RuntimeException)
--{
--    return ooo::vba::msforms::XControl::static_type(0);
--}
--rtl::OUString& 
--ScVbaControls::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControls") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaControls::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Controls" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbacontrols.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacontrols.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,62 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile$
-- * $Revision$
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_CONTROLS_HXX
--#define SC_VBA_CONTROLS_HXX
--
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/msforms/XControls.hpp>
--#include <com/sun/star/awt/XControl.hpp>
--
--#include "vbacollectionimpl.hxx"
--#include "vbahelper.hxx"
--
--typedef CollTestImplHelper< ov::msforms::XControls > ControlsImpl_BASE;
--
--class ScVbaControls : public ControlsImpl_BASE
--{
--	css::uno::Reference< css::awt::XControl > mxDialog;
--protected:
--	virtual rtl::OUString& getServiceImplName();
--	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--public:
--    ScVbaControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, 
--                    const css::uno::Reference< css::awt::XControl >& xDialog );
--    // XControls
--     virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException);
--    // XEnumerationAccess
--    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
--
--    // ScVbaCollectionBaseImpl
--    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
--    
--};
--#endif //SC_VBA_OLEOBJECTS_HXX
--
---- sc/source/ui/vba/vbadialog.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbadialog.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -35,7 +35,7 @@
- 
- #include <tools/string.hxx>
- 
--#include "vbahelper.hxx"
-+#include "excelvbahelper.hxx"
- #include "vbadialog.hxx"
- #include "vbaglobals.hxx"
- 
---- sc/source/ui/vba/vbadialog.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbadialog.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,11 +33,10 @@
- #include <cppuhelper/implbase1.hxx>
- 
- #include <com/sun/star/uno/XComponentContext.hpp>
--#include <ooo/vba/XGlobals.hpp>
- #include <ooo/vba/excel/XApplication.hpp>
- #include <ooo/vba/excel/XDialog.hpp>
-  
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- #include "vbadialog.hxx"
- 
- typedef InheritedHelperInterfaceImpl1< ov::excel::XDialog > ScVbaDialog_BASE;
---- sc/source/ui/vba/vbadialogs.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbadialogs.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -36,7 +36,7 @@
- 
- #include <tools/string.hxx>
- 
--#include "vbahelper.hxx"
-+#include "excelvbahelper.hxx"
- #include "vbadialogs.hxx"
- #include "vbaglobals.hxx"
- #include "vbadialog.hxx"
-@@ -62,7 +62,7 @@ ScVbaDialogs::Item( const uno::Any &aIte
- {
- 	sal_Int32 nIndex = 0;
- 	aItem >>= nIndex;
--	uno::Reference< excel::XDialog > aDialog( new ScVbaDialog( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication(), uno::UNO_QUERY_THROW ), nIndex, mxContext ) );
-+	uno::Reference< excel::XDialog > aDialog( new ScVbaDialog( uno::Reference< XHelperInterface >( Application(),uno::UNO_QUERY_THROW ), nIndex, mxContext ) );
- 	return uno::Any( aDialog );
- }
- rtl::OUString& 
---- sc/source/ui/vba/vbadialogs.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbadialogs.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -35,7 +35,7 @@
- #include <com/sun/star/uno/XComponentContext.hpp>
- #include <ooo/vba/excel/XDialogs.hpp>
- #include <ooo/vba/XCollection.hpp>
--#include "vbahelperinterface.hxx" 
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- class ScModelObj;
- 
---- sc/source/ui/vba/vbaeventshelper.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbaeventshelper.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,12 +33,8 @@
-  *
-  ************************************************************************/
- #include "vbaeventshelper.hxx"
--#include "helperdecl.hxx"
-+#include <vbahelper/helperdecl.hxx>
- #include <sfx2/objsh.hxx> 
--#include <basic/basmgr.hxx>
--#include <basic/sbmod.hxx>
--#include <basic/sbmeth.hxx>
--#include <basic/sbx.hxx>
- #include "scextopt.hxx"
- #include <sfx2/evntconf.hxx>
- #include <sfx2/event.hxx>
-@@ -69,8 +65,6 @@ using namespace com::sun::star;
- using namespace ooo::vba;
- using namespace com::sun::star::document::VbaEventId;
- 
--const static String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
--
- const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
- const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
- const static rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document"); 
-@@ -400,7 +394,7 @@ ScVbaEventsHelper::ScVbaEventsHelper( un
-     : m_xContext( xContext ), mpVbaEventsListener( NULL ), mbOpened( sal_False ), mbIgnoreEvents( sal_False )
- {
-     uno::Reference< frame::XModel > xModel ( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ), uno::UNO_QUERY );
--    ScDocShell* pDocShell = getDocShell( xModel );
-+    ScDocShell* pDocShell = excel::getDocShell( xModel );
-     pDoc = pDocShell->GetDocument();
- }
- 
-@@ -452,55 +446,6 @@ sal_Bool ScVbaEventsHelper::executeMacro
- 	}
- 	return sal_True;
- }
--String ScVbaEventsHelper::workbookMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro )
--{
--	String sFullName;	
--	// would use the script provider to see if the macro exists but
--	// called at this stage tdoc content handler stuff is not set up
--	// so it fails
--
--	BasicManager* pBasicMgr = pShell-> GetBasicManager();
--	if ( pBasicMgr )
--	{
--		StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
--		if ( !pBasic )
--		{
--			USHORT nId = pBasicMgr->GetLibId( sLibrary );
--			pBasicMgr->LoadLib( nId );
--			pBasic = pBasicMgr->GetLib( sLibrary );
--		}
--		if ( pBasic )
--		{
--			if ( sMod.Len() ) // we wish to find the macro is a specific module
--			{
--				SbModule* pModule = pBasic->FindModule( sMod );
--				if ( pModule )
--				{
--					SbxArray* pMethods = pModule->GetMethods();
--					if ( pMethods )
--					{
--						SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
--						if ( pMethod )
--						{
--							sFullName = sMacro;
--							sFullName.Insert( '.', 0 ).Insert( sMod, 0 ).Insert( '.', 0 ).Insert( sLibrary, 0 );
--						}
--					}
--				}
--			}
--			else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
--			{
--					if( SbModule* pModule = pMethod->GetModule() )
--					{
--						sFullName = sMacro;
--						sFullName.Insert( '.', 0 ).Insert( pModule->GetName(), 0).Insert( '.', 0 ).Insert( sLibrary, 0 );
--					}
--			}		
--				
--		}
--	}
--	return sFullName;
--}
- 
- uno::Any ScVbaEventsHelper::createWorkSheet( SfxObjectShell* pShell, SCTAB nTab )
- {
-@@ -517,7 +462,7 @@ uno::Any ScVbaEventsHelper::createWorkSh
- 		uno::Sequence< uno::Any > aArgs(2);
- 		aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
- 		aArgs[1] = uno::Any( pShell->GetModel() );
--		uno::Reference< uno::XInterface > xWorkbook( xSMgr->createInstanceWithArgumentsAndContext(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Workbook") ), aArgs, xCtx ), uno::UNO_QUERY );
-+		uno::Reference< uno::XInterface > xWorkbook( ov::createVBAUnoAPIServiceWithArgs( pShell, "ooo.vba.excel.Workbook", aArgs ), uno::UNO_QUERY );
- 
- 		// create WorkSheet
- 		String sSheetName;
-@@ -526,7 +471,7 @@ uno::Any ScVbaEventsHelper::createWorkSh
- 		aArgs[ 0 ] <<= xWorkbook;
- 		aArgs[ 1 ] <<= pShell->GetModel();
- 		aArgs[ 2 ] = uno::makeAny( rtl::OUString( sSheetName ) );
--		aRet <<= xSMgr->createInstanceWithArgumentsAndContext(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheet") ), aArgs, xCtx );
-+		aRet <<= ov::createVBAUnoAPIServiceWithArgs( pShell, "ooo.vba.excel.Worksheet", aArgs );
- 	}
- 	catch( uno::Exception& e )
- 	{
-@@ -560,7 +505,7 @@ uno::Any ScVbaEventsHelper::createRange(
- 			{
- 				throw uno::RuntimeException(); // 
- 			}
--			aRet <<= xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Range") ), aArgs, xCtx  );	
-+			aRet <<= ov::createVBAUnoAPIServiceWithArgs( pDoc->GetDocumentShell(), "ooo.vba.excel.Range", aArgs );	
- 		}
- 	}
- 	catch( uno::Exception& e ) 
-@@ -584,7 +529,7 @@ uno::Any ScVbaEventsHelper::createHyperl
- 			aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
- 			aArgs[1] <<= rCell;
- 			
--			aRet <<= xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Hyperlink") ), aArgs, xCtx  );	
-+			aRet <<= ov::createVBAUnoAPIServiceWithArgs( pDoc->GetDocumentShell(), "ooo.vba.excel.Hyperlink", aArgs );	
- 		}
- 		else
- 		{
-@@ -647,7 +592,7 @@ ScVbaEventsHelper::getMacroPath( const s
-     	case VBAEVENT_WORKSHEET_SELECTIONCHANGE               :
-         {
-             rtl::OUString  aSheetModuleName = getSheetModuleName( nTab );
--            sMacroPath = workbookMacroExists( pShell, aSheetModuleName, sMacroName );
-+            sMacroPath = docMacroExists( pShell, aSheetModuleName, sMacroName );
-             break;
-         }
-         // Workbook
-@@ -681,7 +626,7 @@ ScVbaEventsHelper::getMacroPath( const s
-                 sWorkbookModuleName = aExtDocSettings.maGlobCodeName;
-             }
-            
--            sMacroPath = workbookMacroExists( pShell, sWorkbookModuleName, sMacroName );
-+            sMacroPath = docMacroExists( pShell, sWorkbookModuleName, sMacroName );
-             break;
-         }
-         default:
---- sc/source/ui/vba/vbaeventshelper.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbaeventshelper.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -40,7 +40,7 @@
- #include <cppuhelper/implbase1.hxx>
- #include <com/sun/star/document/VbaEventId.hpp>
- #include <com/sun/star/document/XVbaEventsHelper.hpp>
--#include "vbahelper.hxx"
-+#include "excelvbahelper.hxx"
- 
- #define INVALID_TAB -1
- 
-@@ -57,7 +57,6 @@ private:
-     sal_Bool mbIgnoreEvents;
- 
- 	String getSheetModuleName( SCTAB nTab );
--	String workbookMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
- 	css::uno::Any createWorkSheet( SfxObjectShell* pShell, SCTAB nTab );
- 	css::uno::Any createRange( const css::uno::Any& aRange );
- 	css::uno::Any createHyperlink( const css::uno::Any& rCell );
---- sc/source/ui/vba/vbafillformat.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbafillformat.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,7 +33,7 @@
- #include <com/sun/star/drawing/XShape.hpp>
- #include <com/sun/star/drawing/FillStyle.hpp>
- #include <ooo/vba/msforms/XFillFormat.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1< ov::msforms::XFillFormat > ScVbaFillFormat_BASE;
- 
---- sc/source/ui/vba/vbafont.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbafont.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -34,7 +34,7 @@
- 
- #include <ooo/vba/excel/XFont.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- #include "vbapalette.hxx"
- 
- class ScTableSheetsObj;
---- sc/source/ui/vba/vbaformat.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaformat.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,6 +33,7 @@
- #include <ooo/vba/excel/XlHAlign.hpp>
- #include <ooo/vba/excel/XlOrientation.hpp>
- #include <ooo/vba/excel/Constants.hpp>
-+#include <ooo/vba/excel/XRange.hpp>
- #include <com/sun/star/table/CellVertJustify.hpp>
- #include <com/sun/star/table/CellHoriJustify.hpp>
- #include <com/sun/star/table/CellOrientation.hpp>
-@@ -341,7 +342,7 @@ template< typename Ifc1 >
- uno::Any SAL_CALL 
- ScVbaFormat<Ifc1>::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException )
- {
--	ScVbaPalette aPalette( getDocShell( mxModel ) );	
-+	ScVbaPalette aPalette( excel::getDocShell( mxModel ) );	
- 	uno::Reference< XCollection > xColl =  new ScVbaBorders( thisHelperIface(), ScVbaFormat_BASE::mxContext, uno::Reference< table::XCellRange >( mxPropertySet, uno::UNO_QUERY_THROW ), aPalette );
- 
- 	if ( Index.hasValue() )
-@@ -355,7 +356,7 @@ template< typename Ifc1 >
- uno::Reference< excel::XFont > SAL_CALL 
- ScVbaFormat<Ifc1>::Font(  ) throw (script::BasicErrorException, uno::RuntimeException)
- {
--	ScVbaPalette aPalette( getDocShell( mxModel ) );
-+	ScVbaPalette aPalette( excel::getDocShell( mxModel ) );
- 	return new ScVbaFont( thisHelperIface(), ScVbaFormat_BASE::mxContext, aPalette, mxPropertySet );
- }
- 
---- sc/source/ui/vba/vbaformat.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaformat.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -39,7 +39,7 @@
- #include <com/sun/star/lang/XMultiServiceFactory.hpp>
- #include <com/sun/star/lang/Locale.hpp>
- #include <com/sun/star/beans/XPropertyState.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- template< typename Ifc1 >
- class ScVbaFormat : public InheritedHelperInterfaceImpl1< Ifc1 >
---- sc/source/ui/vba/vbaformatconditions.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaformatconditions.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -36,6 +36,7 @@
- #include "vbaformatcondition.hxx"
- #include "vbaworkbook.hxx"
- #include "vbastyles.hxx"
-+#include "vbaglobals.hxx"
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
- 
-@@ -50,7 +51,7 @@ static rtl::OUString sStyleNamePrefix( R
- ScVbaFormatConditions::ScVbaFormatConditions( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< sheet::XSheetConditionalEntries >& _xSheetConditionalEntries, const uno::Reference< frame::XModel >& xModel ) : ScVbaFormatConditions_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( _xSheetConditionalEntries, uno::UNO_QUERY_THROW ) ), mxSheetConditionalEntries( _xSheetConditionalEntries )
- {
- 	mxRangeParent.set( xParent, uno::UNO_QUERY_THROW );
--	uno::Reference< excel::XWorkbook > xWorkbook = new ScVbaWorkbook(  uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext, xModel );
-+	uno::Reference< excel::XWorkbook > xWorkbook = new ScVbaWorkbook(  uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), xContext, xModel );
- 	mxStyles.set( xWorkbook->Styles( uno::Any() ), uno::UNO_QUERY_THROW );
- 	uno::Reference< sheet::XCellRangeAddressable > xCellRange( mxRangeParent->getCellRange(), uno::UNO_QUERY_THROW );
- 	mxParentRangePropertySet.set( xCellRange, uno::UNO_QUERY_THROW );
---- sc/source/ui/vba/vbaformatconditions.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaformatconditions.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -35,7 +35,7 @@
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <com/sun/star/table/CellAddress.hpp>
- #include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
--#include "vbacollectionimpl.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
- 
- typedef CollTestImplHelper< ov::excel::XFormatConditions > ScVbaFormatConditions_BASE;
- class ScVbaFormatConditions: public ScVbaFormatConditions_BASE
---- sc/source/ui/vba/vbaframe.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaframe.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,93 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include "vbaframe.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
--ScVbaFrame::ScVbaFrame( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : FrameImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--}
--
--// Attributes
--rtl::OUString SAL_CALL 
--ScVbaFrame::getCaption() throw (css::uno::RuntimeException)
--{
--    rtl::OUString Label;
--    m_xProps->getPropertyValue( LABEL ) >>= Label;
--    return Label;
--}
--
--void SAL_CALL 
--ScVbaFrame::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
--}
--
--uno::Any SAL_CALL 
--ScVbaFrame::getValue() throw (css::uno::RuntimeException)
--{
--    return uno::makeAny( getCaption() );
--}
--
--void SAL_CALL 
--ScVbaFrame::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
--{
--    rtl::OUString sCaption;
--    _value >>= sCaption;
--    setCaption( sCaption ); 
--}
--
--rtl::OUString& 
--ScVbaFrame::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFrame") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaFrame::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbaframe.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaframe.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,58 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_FRAME_HXX
--#define SC_VBA_FRAME_HXX
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/msforms/XLabel.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--
--typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XLabel > FrameImpl_BASE;
--
--class ScVbaFrame : public FrameImpl_BASE
--{
--public:
--    ScVbaFrame(  const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
--   // Attributes
--    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--#endif //SC_VBA_LABEL_HXX
---- sc/source/ui/vba/vbaglobals.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaglobals.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -27,13 +27,14 @@
-  * for a copy of the LGPLv3 License.
-  *
-  ************************************************************************/
--#include "helperdecl.hxx"
-+#include <vbahelper/helperdecl.hxx>
- #include "vbaglobals.hxx"
- 
- #include <comphelper/unwrapargs.hxx>
- 
- #include <com/sun/star/lang/XMultiComponentFactory.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
-+#include <cppuhelper/component_context.hxx>
- 
- #include "vbaapplication.hxx"
- #include "vbaworksheet.hxx"
-@@ -49,11 +50,10 @@ using namespace ::ooo::vba;
- // ScVbaGlobals
- // =============================================================================
- 
--ScVbaGlobals::ScVbaGlobals(  css::uno::Reference< css::uno::XComponentContext >const& rxContext )
--        :m_xContext( rxContext )
-+ScVbaGlobals::ScVbaGlobals(  css::uno::Reference< css::uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext )
- {
- 	OSL_TRACE("ScVbaGlobals::ScVbaGlobals()");
--	mxApplication = uno::Reference< excel::XApplication > ( new ScVbaApplication( m_xContext) );
-+        init( rxContext, uno::Any( getApplication() ) );
- }
- 
- ScVbaGlobals::~ScVbaGlobals()
-@@ -61,23 +61,6 @@ ScVbaGlobals::~ScVbaGlobals()
- 	OSL_TRACE("ScVbaGlobals::~ScVbaGlobals");
- }
- 
--// Will throw if singleton can't be accessed 
--uno::Reference< XGlobals >
--ScVbaGlobals::getGlobalsImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException )
--{
--	uno::Reference< XGlobals > xGlobals( 
--		xContext->getValueByName( ::rtl::OUString::createFromAscii( 
--			"/singletons/ooo.vba.theGlobals") ), uno::UNO_QUERY);
--
--	if ( !xGlobals.is() )
--	{
--		throw uno::RuntimeException(
--                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": Couldn't access Globals" ) ),
--                    uno::Reference< XInterface >() );
--	}
--	return xGlobals;
--}
--
- // =============================================================================
- // XGlobals
- // =============================================================================
-@@ -85,14 +68,15 @@ uno::Reference<excel::XApplication >
- ScVbaGlobals::getApplication() throw (uno::RuntimeException)
- {
- //	OSL_TRACE("In ScVbaGlobals::getApplication");	
--    return mxApplication;
-+	static  uno::Reference< excel::XApplication > ExcelApplication( new ScVbaApplication( mxContext) );
-+   	return ExcelApplication; 
- }
- 
- uno::Reference< excel::XWorkbook > SAL_CALL 
- ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException)
- {
- //	OSL_TRACE("In ScVbaGlobals::getActiveWorkbook");	
--    uno::Reference< excel::XWorkbook > xWorkbook( mxApplication->getActiveWorkbook(), uno::UNO_QUERY);
-+    uno::Reference< excel::XWorkbook > xWorkbook( getApplication()->getActiveWorkbook(), uno::UNO_QUERY);
-     if ( xWorkbook.is() )
-     {
-         return xWorkbook;    
-@@ -103,22 +87,28 @@ ScVbaGlobals::getActiveWorkbook() throw
- }
- 
- 
-+uno::Reference< excel::XWindow > SAL_CALL 
-+ScVbaGlobals::getActiveWindow() throw (uno::RuntimeException)
-+{
-+    return getApplication()->getActiveWindow();
-+}
-+
- uno::Reference< excel::XWorksheet > SAL_CALL 
- ScVbaGlobals::getActiveSheet() throw (uno::RuntimeException)
- {
--    return mxApplication->getActiveSheet();
-+    return getApplication()->getActiveSheet();
- }
- 
- uno::Any SAL_CALL 
- ScVbaGlobals::WorkBooks( const uno::Any& aIndex ) throw (uno::RuntimeException)
- {
--	return uno::Any( mxApplication->Workbooks(aIndex) );
-+	return uno::Any( getApplication()->Workbooks(aIndex) );
- }
- 
- uno::Any SAL_CALL
- ScVbaGlobals::WorkSheets(const uno::Any& aIndex) throw (uno::RuntimeException)
- {
--	return mxApplication->Worksheets( aIndex );
-+	return getApplication()->Worksheets( aIndex );
- }
- uno::Any SAL_CALL
- ScVbaGlobals::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException)
-@@ -126,26 +116,6 @@ ScVbaGlobals::Sheets( const uno::Any& aI
- 	return WorkSheets( aIndex );
- }
- 
--::uno::Sequence< ::uno::Any > SAL_CALL
--ScVbaGlobals::getGlobals(  ) throw (::uno::RuntimeException)
--{
--	sal_uInt32 nMax = 0;
--	uno::Sequence< uno::Any > maGlobals(4);
--	maGlobals[ nMax++ ] <<= ScVbaGlobals::getGlobalsImpl(m_xContext);
--	maGlobals[ nMax++ ] <<= mxApplication;
--
--	uno::Reference< excel::XWorkbook > xWorkbook = mxApplication->getActiveWorkbook();
--	if( xWorkbook.is() )
--	{
--		maGlobals[ nMax++ ] <<= xWorkbook;
--		uno::Reference< excel::XWorksheet > xWorksheet = xWorkbook->getActiveSheet();
--		if( xWorksheet.is() )
--			maGlobals[ nMax++ ] <<= xWorksheet;
--	}
--	maGlobals.realloc( nMax );
--	return maGlobals;
--}
--
- uno::Any SAL_CALL 
- ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException)
- {
-@@ -158,13 +128,140 @@ ScVbaGlobals::Names( const css::uno::Any
- 	return getApplication()->Names( aIndex );
- }
- 
-+uno::Reference< excel::XRange > SAL_CALL 
-+ScVbaGlobals::getActiveCell() throw (uno::RuntimeException)
-+{
-+	return getApplication()->getActiveCell();
-+}
-+
-+uno::Reference< XAssistant > SAL_CALL 
-+ScVbaGlobals::getAssistant() throw (uno::RuntimeException)
-+{
-+	return getApplication()->getAssistant();
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaGlobals::getSelection() throw (uno::RuntimeException)
-+{
-+	return getApplication()->getSelection();
-+}
-+
-+uno::Reference< excel::XWorkbook > SAL_CALL 
-+ScVbaGlobals::getThisWorkbook() throw (uno::RuntimeException)
-+{
-+	return getApplication()->getThisWorkbook();
-+}
-+void SAL_CALL 
-+ScVbaGlobals::Calculate()  throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException)
-+{
-+	return getApplication()->Calculate();
-+}
-+
-+uno::Reference< excel::XRange > SAL_CALL 
-+ScVbaGlobals::Cells( const uno::Any& RowIndex, const uno::Any& ColumnIndex ) throw (uno::RuntimeException)
-+{
-+	return getApplication()->getActiveSheet()->Cells( RowIndex, ColumnIndex );
-+}
-+uno::Reference< excel::XRange > SAL_CALL 
-+ScVbaGlobals::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+	return getApplication()->getActiveSheet()->Columns( aIndex );
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+	uno::Reference< XApplicationBase > xBase( getApplication(), uno::UNO_QUERY_THROW );
-+	return xBase->CommandBars( aIndex );
-+}
-+
-+css::uno::Reference< ov::excel::XRange > SAL_CALL 
-+ScVbaGlobals::Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
-+{
-+	return getApplication()->Union(  Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 );
-+}
-+css::uno::Reference< ov::excel::XRange > SAL_CALL 
-+ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
-+{
-+	return getApplication()->Intersect(  Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 );
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaGlobals::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException)
-+{
-+	return getApplication()->Evaluate( Name );
-+}
-+
-+css::uno::Any SAL_CALL 
-+ScVbaGlobals::WorksheetFunction(  ) throw (css::uno::RuntimeException)
-+{
-+	return getApplication()->WorksheetFunction();
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaGlobals::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+	return getApplication()->Windows( aIndex );
-+}
-+
-+uno::Reference< excel::XRange > SAL_CALL 
-+ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+	return getApplication()->getActiveSheet()->Rows( aIndex );
-+	
-+}
-+
-+uno::Sequence< ::rtl::OUString > SAL_CALL 
-+ScVbaGlobals::getAvailableServiceNames(  ) throw (uno::RuntimeException)
-+{
-+    static bool bInit = false;
-+    static uno::Sequence< rtl::OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() );
-+    if ( !bInit )
-+    {
-+         rtl::OUString names[] = { 
-+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Range" ) ),
-+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Workbook" ) ),
-+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Window" ) ),
-+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Worksheet" ) ),
-+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Application" ) ),
-+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Hyperlink" ) ),
-+          };
-+        sal_Int32 nExcelServices = ( sizeof( names )/ sizeof( names[0] ) );
-+        sal_Int32 startIndex = serviceNames.getLength();
-+        serviceNames.realloc( serviceNames.getLength() + nExcelServices );
-+        for ( sal_Int32 index = 0; index < nExcelServices; ++index )
-+             serviceNames[ startIndex + index ] = names[ index ];
-+        bInit = true;
-+    }
-+    return serviceNames;
-+}
-+
-+rtl::OUString&
-+ScVbaGlobals::getServiceImplName()
-+{
-+        static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaGlobals") );
-+        return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString >
-+ScVbaGlobals::getServiceNames()
-+{
-+        static uno::Sequence< rtl::OUString > aServiceNames;
-+        if ( aServiceNames.getLength() == 0 )
-+        {
-+                aServiceNames.realloc( 1 );
-+                aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Globals" ) );
-+        }
-+        return aServiceNames;
-+}
-+
- namespace globals
- {
- namespace sdecl = comphelper::service_decl;
--sdecl::class_<ScVbaGlobals, sdecl::with_args<false> > serviceImpl;
-+sdecl::vba_service_class_<ScVbaGlobals, sdecl::with_args<false> > serviceImpl;
- extern sdecl::ServiceDecl const serviceDecl(
-     serviceImpl,
-     "ScVbaGlobals",
--    "ooo.vba.Globals" );
-+    "ooo.vba.excel.Globals" );
- }
- 
---- sc/source/ui/vba/vbaglobals.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaglobals.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,43 +33,62 @@
- #include <com/sun/star/lang/XServiceInfo.hpp>
- #include <com/sun/star/lang/XInitialization.hpp>
- #include <com/sun/star/uno/XComponentContext.hpp>
--#include <ooo/vba/XGlobals.hpp>
-+#include <ooo/vba/excel/XGlobals.hpp>
-+#include <ooo/vba/excel/XApplication.hpp>
- 
- #include <cppuhelper/implbase1.hxx>
--#include "vbahelper.hxx"
-+#include "excelvbahelper.hxx"
- 
-+#include <vbahelper/vbaglobalbase.hxx>
-     // =============================================================================
-     // class ScVbaGlobals
-     // =============================================================================
- 
--    typedef ::cppu::WeakImplHelper1<    
-- ov::XGlobals > ScVbaGlobals_BASE;
--
-+typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE;
- 
-     class ScVbaGlobals : public ScVbaGlobals_BASE
-     {
--    private:
--            css::uno::Reference< css::uno::XComponentContext > m_xContext;
--            css::uno::Reference< ov::excel::XApplication > mxApplication;
-+        virtual css::uno::Reference<
-+ ov::excel::XApplication > SAL_CALL getApplication()
-+                        throw (css::uno::RuntimeException);
-     public:
- 	
-         ScVbaGlobals(
-             css::uno::Reference< css::uno::XComponentContext >const& rxContext );
-         virtual ~ScVbaGlobals();
- 
--		static 	css::uno::Reference< ov::XGlobals > getGlobalsImpl(const css::uno::Reference< css::uno::XComponentContext >& ) throw (css::uno::RuntimeException);
--
-         // XGlobals
--        virtual css::uno::Reference<
-- ov::excel::XApplication > SAL_CALL getApplication()
--                        throw (css::uno::RuntimeException);
-         virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException);
-+        virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
-         virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL Calculate(  ) throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException);
-+
-+	virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException);
-+        virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException);
-+
-         virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-         virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL WorksheetFunction(  ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
--	virtual css::uno::Sequence< css::uno::Any > SAL_CALL getGlobals(  ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException );
-+	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+
-+
-+
-+    // XMultiServiceFactory
-+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException);
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-     };
- #endif // 
---- sc/source/ui/vba/vbahelper.cxx
-+++ sc/source/ui/vba/vbahelper.cxx
-@@ -1,828 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbahelper.cxx,v $
-- * $Revision: 1.5.32.1 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include <cppuhelper/bootstrap.hxx>
--#include <com/sun/star/util/XURLTransformer.hpp>
--#include <com/sun/star/frame/XDispatchProvider.hpp>
--#include <com/sun/star/frame/XModel.hpp>
--#include <com/sun/star/frame/XFrame.hpp>
--#include <com/sun/star/frame/XDesktop.hpp>
--#include <com/sun/star/frame/XController.hpp>
--#include <com/sun/star/uno/XComponentContext.hpp>
--#include <com/sun/star/lang/XMultiComponentFactory.hpp>
--#include <com/sun/star/beans/XPropertySet.hpp>
--#include <com/sun/star/beans/XIntrospection.hpp>
--
--#include <comphelper/processfactory.hxx>
--
--#include <sfx2/objsh.hxx>
--#include <sfx2/viewfrm.hxx>
--#include <sfx2/dispatch.hxx>
--#include <sfx2/app.hxx>
--#include <svtools/stritem.hxx>
--
--#include <docuno.hxx>
--
--#include <basic/sbx.hxx>
--#include <basic/sbstar.hxx>
--#include <rtl/math.hxx>
--
--#include <math.h>
--#include "vbahelper.hxx"
--#include "tabvwsh.hxx"
--#include "transobj.hxx"
--#include "scmod.hxx"
--#include "vbashape.hxx"
--#include "unonames.hxx"
--#include "cellsuno.hxx"
--using namespace ::com::sun::star;
--using namespace ::ooo::vba;
--
--#define POINTTO100THMILLIMETERFACTOR 35.27778
--void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue );
--
--uno::Any sbxToUnoValue( SbxVariable* pVar );
--
--
--namespace ooo
--{
--namespace vba
--{
--
--const double Millimeter::factor =  35.27778;
--
--uno::Reference< beans::XIntrospectionAccess >
--getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException)
--{
--	static uno::Reference< beans::XIntrospection > xIntrospection;
--	if( !xIntrospection.is() )
--	{
--		uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
--		xIntrospection.set( xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") ), uno::UNO_QUERY_THROW );
--	}
--	return xIntrospection->inspect( aObject );
--}
--
--uno::Reference< script::XTypeConverter >
--getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
--{
--	static uno::Reference< script::XTypeConverter > xTypeConv( xContext->getServiceManager()->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter") ), xContext ), uno::UNO_QUERY_THROW );
--	return xTypeConv;
--}
--// helper method to determine if the view ( calc ) is in print-preview mode
--bool isInPrintPreview( SfxViewFrame* pView )
--{
--	sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
--	if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() >
--nViewNo && !pView->GetObjectShell()->IsInPlaceActive() )
--	{
--		SfxViewFactory &rViewFactory =
--			pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo);
--		if (  pView->GetCurViewId() == rViewFactory.GetOrdinal() )
--			return true;
--	}
--	return false;
--}
--const ::rtl::OUString REPLACE_CELLS_WARNING(  RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning"));
--const uno::Any&
--aNULL()
--{
-- 	static  uno::Any aNULLL = uno::makeAny( uno::Reference< uno::XInterface >() );
--	return aNULLL;
--}
--
--class PasteCellsWarningReseter
--{
--private:
--	bool bInitialWarningState;
--	static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException )
--	{
--		static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
--		static uno::Reference<uno::XComponentContext > xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
--		static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
--				xContext->getServiceManager(), uno::UNO_QUERY_THROW );
--		static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW );
--		return xProps;
--	}
--
--	bool getReplaceCellsWarning() throw ( uno::RuntimeException )
--	{
--		sal_Bool res = sal_False;
--		getGlobalSheetSettings()->getPropertyValue( REPLACE_CELLS_WARNING ) >>= res;
--		return ( res == sal_True );
--	}
--
--	void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
--	{
--		getGlobalSheetSettings()->setPropertyValue( REPLACE_CELLS_WARNING, uno::makeAny( bState ) );
--	}
--public:
--	PasteCellsWarningReseter() throw ( uno::RuntimeException )
--	{
--		bInitialWarningState = getReplaceCellsWarning();
--		if ( bInitialWarningState )
--			setReplaceCellsWarning( false );
--	}
--	~PasteCellsWarningReseter()
--	{
--		if ( bInitialWarningState )
--		{
--			// don't allow dtor to throw
--			try
--			{
--				setReplaceCellsWarning( true );
--			}
--			catch ( uno::Exception& /*e*/ ){}
--		}
--	}
--};
--
--void
--dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl, uno::Sequence< beans::PropertyValue >& sProps )
--{
--
--	util::URL  url ;
--	url.Complete = aUrl;
--	rtl::OUString emptyString = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ));
--	uno::Reference<frame::XController> xController = xModel->getCurrentController();
--	uno::Reference<frame::XFrame> xFrame = xController->getFrame();
--	uno::Reference<frame::XDispatchProvider> xDispatchProvider (xFrame,uno::UNO_QUERY_THROW);
--	try
--	{
--		uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
--		uno::Reference<uno::XComponentContext > xContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW  );
--		if ( !xContext.is() )
--		{
--			return ;
--		}
--
--		uno::Reference<lang::XMultiComponentFactory > xServiceManager(
--				xContext->getServiceManager() );
--		if ( !xServiceManager.is() )
--		{
--			return ;
--		}
--		uno::Reference<util::XURLTransformer> xParser( xServiceManager->createInstanceWithContext(     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) )
--			,xContext), uno::UNO_QUERY_THROW );
--		if (!xParser.is())
--			return;
--		xParser->parseStrict (url);
--	}
--	catch ( uno::Exception & /*e*/ )
--	{
--		return ;
--	}
--
--	uno::Reference<frame::XDispatch> xDispatcher = xDispatchProvider->queryDispatch(url,emptyString,0);
--
--	uno::Sequence<beans::PropertyValue> dispatchProps(1);
--
--	sal_Int32 nProps = sProps.getLength();
--	beans::PropertyValue* pDest = dispatchProps.getArray();
--	if ( nProps )
--	{
--		dispatchProps.realloc( nProps + 1 );
--		// need to reaccquire pDest after realloc
--		pDest = dispatchProps.getArray();
--		beans::PropertyValue* pSrc = sProps.getArray();
--		for ( sal_Int32 index=0; index<nProps; ++index, ++pSrc, ++pDest )
--			*pDest = *pSrc;
--	}
--
--	(*pDest).Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Silent" ));
--	(*pDest).Value <<= (sal_Bool)sal_True;
--
--	if (xDispatcher.is())
--		xDispatcher->dispatch( url, dispatchProps );
--}
--
--void
--dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl) 
--{
--	uno::Sequence<beans::PropertyValue> dispatchProps;
--	dispatchRequests( xModel, aUrl, dispatchProps );
--}
--
--
--void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nSlot, SfxCallMode nCall)
--{
--	ScTabViewShell* pViewShell = getBestViewShell( xModel );
--	SfxViewFrame* pViewFrame = NULL;
--	if ( pViewShell )
--		pViewFrame = pViewShell->GetViewFrame();
--	if ( pViewFrame )
--	{
--		SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
--		if( pDispatcher )
--		{
--			pDispatcher->Execute( nSlot , nCall );
--		}
--	}	
--}
--		
--void
--implnPaste()
--{
--	PasteCellsWarningReseter resetWarningBox;
--	ScTabViewShell* pViewShell = getCurrentBestViewShell();
--	if ( pViewShell )
--	{
--		pViewShell->PasteFromSystem();
--		pViewShell->CellContentChanged();
--	}
--}
--
--
--void
--implnCopy()
--{
--	ScTabViewShell* pViewShell = getCurrentBestViewShell();
--	if ( pViewShell )
--		pViewShell->CopyToClip(NULL,false,false,true);
--}
--
--void 
--implnCut()
--{
--	ScTabViewShell* pViewShell =  getCurrentBestViewShell();
--	if ( pViewShell )
--		pViewShell->CutToClip( NULL, TRUE );
--}
--
--void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
--{
--	PasteCellsWarningReseter resetWarningBox;
--	sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
--	InsCellCmd eMoveMode = INS_NONE;
--
--	ScTabViewShell* pTabViewShell = ScTabViewShell::GetActiveViewShell();
--	if ( !pTabViewShell ) 
--		// none active, try next best
--		pTabViewShell = getCurrentBestViewShell();
--	if ( pTabViewShell )
--	{
--		ScViewData* pView = pTabViewShell->GetViewData();	
--		Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
--		if ( pView && pWin )
--		{
--			if ( bAsLink && bOtherDoc )
--				pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
--			else 
--			{
--				ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
--				ScDocument* pDoc = NULL; 
--				if ( pOwnClip )
--					pDoc = pOwnClip->GetDocument();	
--				pTabViewShell->PasteFromClip( nFlags, pDoc,
--					nFunction, bSkipEmpty, bTranspose, bAsLink,
--					eMoveMode, IDF_NONE, TRUE );
--				pTabViewShell->CellContentChanged();
--			}
--		}
--	}
--
--}
--
-- uno::Reference< frame::XModel > 
--getCurrentDocument() throw (uno::RuntimeException)
--{
--	uno::Reference< frame::XModel > xModel;
--	SbxObject* pBasic = dynamic_cast< SbxObject* > ( SFX_APP()->GetBasic() );
--	SbxObject* basicChosen =  pBasic ;
--	if ( basicChosen == NULL)
--	{
--		OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" );
--		return xModel;
--	}    
--    SbxObject* p = pBasic;
--    SbxObject* pParent = p->GetParent();
--    SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL;
--
--    if( pParentParent )
--    {
--        basicChosen = pParentParent;
--    }
--    else if( pParent )
--    {
--        basicChosen = pParent;
--    }
--
--
--    uno::Any aModel; 
--    SbxVariable *pCompVar = basicChosen->Find(  UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT );
--
--	if ( pCompVar )
--	{
--		aModel = sbxToUnoValue( pCompVar );
--		if ( sal_False == ( aModel >>= xModel ) ||
--			!xModel.is() )
--		{
--			// trying last gasp try the current component
--			uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
--			// test if vba service is present
--			uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
--			uno::Reference<lang::XMultiComponentFactory > xSMgr( xCtx->getServiceManager(), uno::UNO_QUERY_THROW );
--			uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx), uno::UNO_QUERY_THROW );
--			xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY );
--			if ( !xModel.is() )
--			{
--				throw uno::RuntimeException( 
--					rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the currently selected document") ), uno::Reference< uno::XInterface >() );
--			}
--			return xModel;
--		}
--		else
--		{
--			OSL_TRACE("Have model ThisComponent points to url %s",
--			::rtl::OUStringToOString( xModel->getURL(),
--				RTL_TEXTENCODING_ASCII_US ).pData->buffer );
--		}
--	}
--	else
--	{
--		OSL_TRACE("Failed to get ThisComponent");
--		throw uno::RuntimeException( 
--			rtl::OUString( 
--				RTL_CONSTASCII_USTRINGPARAM(
--					"Can't determine the currently selected document") ),
--			uno::Reference< uno::XInterface >() );
--	}
--	return xModel;
--}
--
--ScDocShell* 
--getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) 
--{
--	uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
--	ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
--	ScDocShell* pDocShell = NULL;
--	if ( pModel )
--		pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
--	return pDocShell;
--
--}
--
--ScTabViewShell* 
--getBestViewShell(  css::uno::Reference< css::frame::XModel>& xModel )
--{
--	ScDocShell* pDocShell = getDocShell( xModel );
--	if ( pDocShell )
--		return pDocShell->GetBestViewShell();
--	return NULL;
--}
--
--ScTabViewShell* 
--getCurrentBestViewShell()
--{ 
--	uno::Reference< frame::XModel > xModel = getCurrentDocument();
--	return getBestViewShell( xModel );
--}
--
--SfxViewFrame* 
--getCurrentViewFrame()
--{
--	ScTabViewShell* pViewShell = getCurrentBestViewShell();	
--	if ( pViewShell )
--		return pViewShell->GetViewFrame();
--	return NULL;
--}
--
--sal_Int32 
--OORGBToXLRGB( sal_Int32 nCol )
--{
--	sal_Int32 nRed = nCol;
--	nRed &= 0x00FF0000;
--	nRed >>= 16;
--	sal_Int32 nGreen = nCol;
--	nGreen &= 0x0000FF00;
--	nGreen >>= 8;
--	sal_Int32 nBlue = nCol;
--	nBlue &= 0x000000FF;
--	sal_Int32 nRGB =  ( (nBlue << 16) | (nGreen << 8) | nRed );
--	return nRGB;
--}
--sal_Int32 
--XLRGBToOORGB( sal_Int32 nCol )
--{
--	sal_Int32 nBlue = nCol;
--	nBlue &= 0x00FF0000;
--	nBlue >>= 16;
--	sal_Int32 nGreen = nCol;
--	nGreen &= 0x0000FF00;
--	nGreen >>= 8;
--	sal_Int32 nRed = nCol;
--	nRed &= 0x000000FF;
--	sal_Int32 nRGB =  ( (nRed << 16) | (nGreen << 8) | nBlue );
--	return nRGB;
--}
--uno::Any 
--OORGBToXLRGB( const uno::Any& aCol )
--{
--	sal_Int32 nCol=0;
--	aCol >>= nCol;
--	nCol = OORGBToXLRGB( nCol );
--	return uno::makeAny( nCol );
--}
--uno::Any 
--XLRGBToOORGB(  const uno::Any& aCol )
--{
--	sal_Int32 nCol=0;
--	aCol >>= nCol;
--	nCol = XLRGBToOORGB( nCol );
--	return uno::makeAny( nCol );
--}
--
--void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& /*ActivePrinter*/, const uno::Any& /*PrintToFile*/, const uno::Any& Collate, const uno::Any& PrToFileName, css::uno::Reference< frame::XModel >& xModel, sal_Bool bUseSelection  )
--{
--	sal_Int32 nTo = 0;
--	sal_Int32 nFrom = 0;
--	sal_Int16 nCopies = 1;
--	sal_Bool bPreview = sal_False;
--	sal_Bool bCollate = sal_False;
--	sal_Bool bSelection = bUseSelection;
--	From >>= nFrom;
--	To >>= nTo;
--	Copies >>= nCopies;
--	Preview >>= bPreview;
--	if ( nCopies > 1 ) // Collate only useful when more that 1 copy
--		Collate >>= bCollate;
--
--	rtl::OUString sRange(  RTL_CONSTASCII_USTRINGPARAM( "-" ) );
--	rtl::OUString sFileName;
--	
--	if (( nFrom || nTo ) )
--	{
--		if ( nFrom )
--			sRange = ( ::rtl::OUString::valueOf( nFrom ) + sRange );
--		if ( nTo )
--			sRange += ::rtl::OUString::valueOf( nTo );
--	}
--
--	if (  PrToFileName.getValue() )
--	{
--		PrToFileName >>= sFileName;
--	}
--	ScTabViewShell* pViewShell = getBestViewShell( xModel );
--	SfxViewFrame* pViewFrame = NULL;
--	if ( pViewShell )
--		pViewFrame = pViewShell->GetViewFrame();
--	if ( pViewFrame )
--	{
--		SfxAllItemSet aArgs( SFX_APP()->GetPool() );
--				
--		SfxBoolItem sfxCollate( SID_PRINT_COLLATE, bCollate );
--		aArgs.Put( sfxCollate, sfxCollate.Which() );
--		SfxInt16Item sfxCopies( SID_PRINT_COPIES, nCopies );
--		aArgs.Put( sfxCopies, sfxCopies.Which() );
--		if ( sFileName.getLength() )
--		{
--			SfxStringItem sfxFileName( SID_FILE_NAME, sFileName);
--			aArgs.Put( sfxFileName, sfxFileName.Which() );
--		
--		}
--		if (  sRange.getLength() )
--		{
--			SfxStringItem sfxRange( SID_PRINT_PAGES, sRange );
--			aArgs.Put( sfxRange, sfxRange.Which() );
--		}
--		SfxBoolItem sfxSelection( SID_SELECTION, bSelection );
--		aArgs.Put( sfxSelection, sfxSelection.Which() );
--		SfxBoolItem sfxAsync( SID_ASYNCHRON, sal_False );
--		aArgs.Put( sfxAsync, sfxAsync.Which() );
--		SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
--
--		if ( pDispatcher )
--		{
--			if ( bPreview )
--			{
--				if ( !pViewFrame->GetFrame()->IsInPlace() ) 	
--				{
--					SC_MOD()->InputEnterHandler();
--					pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON );
--					while ( isInPrintPreview( pViewFrame ) )
--						Application::Yield();
--				}
--			}
--			else
--				pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
--		}
--			
--	}
--	
--	// #FIXME #TODO
--	// 1 ActivePrinter ( how/can we switch a printer via API? )
--	// 2 PrintToFile ( ms behaviour if this option is specified but no 
--	//   filename supplied 'PrToFileName' then the user will be prompted )
--	// 3 Need to check behaviour of Selected sheets with range ( e.g. From & To
--	//    values ) in oOO these options are mutually exclusive
--	// 4 There is a pop up to do with transparent objects in the print source
--	//   should be able to disable that via configuration for the duration
--	//   of this method
--}
--
-- void PrintPreviewHelper( const css::uno::Any& /*EnableChanges*/, css::uno::Reference< css::frame::XModel >& xModel )
--{
--	dispatchExecute( xModel, SID_VIEWSHELL1 );
--}
--
--rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
--{
--	uno::Type aType = pvargItem.getValueType();
--	uno::TypeClass eTypeClass = aType.getTypeClass();
--	rtl::OUString sString;
--	switch ( eTypeClass )
--	{
--		case uno::TypeClass_BOOLEAN:
--		{
--			sal_Bool bBool = sal_False;
--			pvargItem >>= bBool;
--			sString = rtl::OUString::valueOf( bBool );
--			break;
--		}
--		case uno::TypeClass_STRING:
--			pvargItem >>= sString;
--			break;
--		case uno::TypeClass_FLOAT:
--			{
--				float aFloat = 0;
--				pvargItem >>= aFloat;
--				sString = rtl::OUString::valueOf( aFloat );
--				break;
--			}
--		case uno::TypeClass_DOUBLE:
--			{
--				double aDouble = 0;
--				pvargItem >>= aDouble;
--				sString = rtl::OUString::valueOf( aDouble );
--				break;
--			}
--		case uno::TypeClass_SHORT:
--		case uno::TypeClass_LONG:
--		case uno::TypeClass_BYTE:
--			{
--				sal_Int32 aNum = 0;
--				pvargItem >>= aNum;
--				sString = rtl::OUString::valueOf( aNum );
--				break;
--			}
--
--		case uno::TypeClass_HYPER:
--			{
--				sal_Int64 aHyper = 0;
--				pvargItem >>= aHyper;
--				sString = rtl::OUString::valueOf( aHyper );
--				break;
--			}
--		default:
--       			throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid type, can't convert" ), uno::Reference< uno::XInterface >() );
--	}
--	return sString;
--}
--
--
--rtl::OUString 
--ContainerUtilities::getUniqueName( const uno::Sequence< ::rtl::OUString >&  _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator)
--{
--	return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2));
--}
--
--rtl::OUString 
--ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix)
--{
--	sal_Int32 a = _nStartSuffix;
--	rtl::OUString scompname = _sElementName;
--	bool bElementexists = true;
--	sal_Int32 nLen = _slist.getLength();
--	if ( nLen == 0 )
--		return _sElementName;
--
--	while (bElementexists == true) 
--	{
--		for (sal_Int32 i = 0; i < nLen; i++)
--		{
--			if (FieldInList(_slist, scompname) == -1)
--			{
--				return scompname;
--			}
--		}
--		scompname = _sElementName + _sSuffixSeparator + rtl::OUString::valueOf( a++ );
--	}
--	return rtl::OUString();
--}
--
--sal_Int32 
--ContainerUtilities::FieldInList( const uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString )
--{
--	sal_Int32 FieldLen = SearchList.getLength();
--	sal_Int32 retvalue = -1;
--	for (sal_Int32 i = 0; i < FieldLen; i++) 
--	{
--		// I wonder why comparing lexicographically is done
--		// when its a match is whats interesting?
--		//if (SearchList[i].compareTo(SearchString) == 0) 
--		if ( SearchList[i].equals( SearchString ) ) 
--		{
--			retvalue = i;
--			break;
--		}
--	}
--	return retvalue;
--
--}
--bool NeedEsc(sal_Unicode cCode)
--{
--	String sEsc(RTL_CONSTASCII_USTRINGPARAM(".^$+\\|{}()"));
--	return (STRING_NOTFOUND != sEsc.Search(cCode));
--}
--
--rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike )
--{
--	rtl::OUStringBuffer sResult;
--	const sal_Unicode *start = rIn.getStr();
--	const sal_Unicode *end = start + rIn.getLength();
--
--	int seenright = 0;
--	if ( bForLike )
--		sResult.append(static_cast<sal_Unicode>('^'));
--
--	while (start < end) 
--	{
--		switch (*start)
--		{
--			case '?':
--				sResult.append(static_cast<sal_Unicode>('.'));
--				start++;
--				break;
--			case '*':
--				sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".*")));
--				start++;
--				break;
--			case '#':
--				sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[0-9]")));
--				start++;
--				break;
--			case '~':
--				sResult.append(static_cast<sal_Unicode>('\\'));
--				sResult.append(*(++start));
--				start++;
--				break;
--				// dump the ~ and escape the next characture
--			case ']':
--				sResult.append(static_cast<sal_Unicode>('\\'));
--				sResult.append(*start++);
--				break;
--			case '[':
--				sResult.append(*start++);
--				seenright = 0;
--				while (start < end && !seenright)
--				{
--					switch (*start)
--					{
--						case '[':
--						case '?':
--						case '*':
--						sResult.append(static_cast<sal_Unicode>('\\'));
--						sResult.append(*start);
--							break;
--						case ']':
--						sResult.append(*start);
--							seenright = 1;
--							break;
--						case '!':
--							sResult.append(static_cast<sal_Unicode>('^'));
--							break;
--						default:
--						if (NeedEsc(*start))
--							sResult.append(static_cast<sal_Unicode>('\\'));
--						sResult.append(*start);
--							break;
--					}
--					start++;
--				}
--				break;
--			default:
--				if (NeedEsc(*start))
--					sResult.append(static_cast<sal_Unicode>('\\'));
--				sResult.append(*start++);
--		}
--	}
--
--	if ( bForLike )
--		sResult.append(static_cast<sal_Unicode>('$'));
--
--	return sResult.makeStringAndClear( );
--}
--
--double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical)
--{
--	double fConvertFactor = 1.0;
--	if( bVertical )
--	{
--		fConvertFactor = xDevice->getInfo().PixelPerMeterY/100000;
--	}
--	else
--	{
--		fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000;	
--	}
--	return fConvertFactor;
--}
--
--double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical)
--{
--	double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
--	return fPoints * POINTTO100THMILLIMETERFACTOR * fConvertFactor;
--}
--double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, sal_Bool bVertical)
--{
--	double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
--	return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR;
--}
--
--ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape )
--{
--	m_xShape = new ScVbaShape( xContext, xShape );
--}
--
--#define VBA_LEFT "PositionX"
--#define VBA_TOP "PositionY"
--UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
--{
--    mxModel.set( xControl->getModel(), uno::UNO_QUERY_THROW );
--}
--    double UserFormGeometryHelper::getLeft()
--    {
--	sal_Int32 nLeft = 0;
--	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;	
--	return Millimeter::getInPoints( nLeft );
--    }
--    void UserFormGeometryHelper::setLeft( double nLeft )
--    {
--        mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nLeft ) ) );
--    }
--    double UserFormGeometryHelper::getTop()
--    {
--	sal_Int32 nTop = 0;
--	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	VBA_TOP ) ) ) >>= nTop;	
--	return Millimeter::getInPoints( nTop );
--    }
--    void UserFormGeometryHelper::setTop( double nTop )
--    {
--	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
--    }
--    double UserFormGeometryHelper::getHeight()
--    {
--	sal_Int32 nHeight = 0;
--	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLHGT ) ) ) >>= nHeight;	
--	return Millimeter::getInPoints( nHeight );
--    }
--    void UserFormGeometryHelper::setHeight( double nHeight )
--    {
--	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLHGT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
--    }
--    double UserFormGeometryHelper::getWidth()
--    {
--	sal_Int32 nWidth = 0;
--	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLWID ) ) ) >>= nWidth;	
--	return Millimeter::getInPoints( nWidth );
--    }
--    void UserFormGeometryHelper::setWidth( double nWidth)
--    {
--	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	SC_UNONAME_CELLWID ) ), uno::makeAny(  Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
--    }
--
--SfxItemSet*
--ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj )
--{
--	SfxItemSet* pDataSet = pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : NULL ;
--	return pDataSet;
--	
--}
--
--} // openoffice
--} //org
---- sc/source/ui/vba/vbahelper.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbahelper.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,352 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbahelper.hxx,v $
-- * $Revision: 1.5.32.1 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_HELPER_HXX
--#define SC_VBA_HELPER_HXX
--
--#include <com/sun/star/drawing/XShape.hpp>
--#include <com/sun/star/beans/XIntrospectionAccess.hpp>
--#include <com/sun/star/script/BasicErrorException.hpp>
--#include <com/sun/star/script/XTypeConverter.hpp>
--#include <com/sun/star/lang/IllegalArgumentException.hpp>
--#include <com/sun/star/awt/XControl.hpp>
--#include <com/sun/star/awt/XDevice.hpp>
--#include <basic/sberrors.hxx>
--#include <cppuhelper/implbase1.hxx>
--#include <com/sun/star/frame/XModel.hpp>
--#include <docsh.hxx>
--#include <sfx2/dispatch.hxx>
--#include <ooo/vba/msforms/XShape.hpp>
--#include "cellsuno.hxx"
--
--namespace css = ::com::sun::star;
--
--namespace ooo 
--{
--	namespace vba 
--	{
--		template < class T > 
--		css::uno::Reference< T > getXSomethingFromArgs( css::uno::Sequence< css::uno::Any > const & args, sal_Int32 nPos, bool bCanBeNull = true ) throw (css::lang::IllegalArgumentException)
--		{
--			if ( args.getLength() < ( nPos + 1) )
--				throw css::lang::IllegalArgumentException();
--			css::uno::Reference< T > aSomething( args[ nPos ], css::uno::UNO_QUERY );
--			if ( !bCanBeNull && !aSomething.is() )
--				throw css::lang::IllegalArgumentException();
--			return aSomething;
--		}
--		css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException);
--		css::uno::Reference< css::script::XTypeConverter > getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
--
--		void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl) ;
--		void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl, css::uno::Sequence< css::beans::PropertyValue >& sProps ) ;
--		void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
--		void implnCopy();
--		void implnPaste();
--		void implnCut();
--		void implnPasteSpecial(sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
--		css::uno::Reference< css::frame::XModel >
--			getCurrentDocument() throw (css::uno::RuntimeException);
--		ScTabViewShell* getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
--		ScDocShell* getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
--		ScTabViewShell* getCurrentBestViewShell();
--		SfxViewFrame* getCurrentViewFrame();
--		sal_Int32 OORGBToXLRGB( sal_Int32 );
--		sal_Int32 XLRGBToOORGB( sal_Int32 );
--		css::uno::Any OORGBToXLRGB( const css::uno::Any& );
--		css::uno::Any XLRGBToOORGB( const css::uno::Any& );
--		// provide a NULL object that can be passed as variant so that 
--		// the object when passed to IsNull will return true. aNULL 
--		// contains an empty object reference
--		const css::uno::Any& aNULL();
--		void PrintOutHelper( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, css::uno::Reference< css::frame::XModel >& xModel, sal_Bool bSelection  );
--		void PrintPreviewHelper( const css::uno::Any& EnableChanges, css::uno::Reference< css::frame::XModel >& xModel );
--
--		rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException );
--		rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic )
--	double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical);
--	double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
--	double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
--
--
--class ScVbaCellRangeAccess
--{
--public:
--    static SfxItemSet* GetDataSet( ScCellRangeObj* pRangeObj );
--};
--
--class Millimeter
--{
--//Factor to translate between points and hundredths of millimeters:
--private:
--	static const double factor;
--    
--	double m_nMillimeter;
--
--public:
--	Millimeter():m_nMillimeter(0) {}
--    
--	Millimeter(double mm):m_nMillimeter(mm) {}
--    
--	void set(double mm) { m_nMillimeter = mm; }
--	void setInPoints(double points) 
--	{ 
--		m_nMillimeter = points * 0.352777778; 
--		// 25.4mm / 72 
--	}
--      
--	void setInHundredthsOfOneMillimeter(double hmm)
--	{
--		m_nMillimeter = hmm / 100;
--	}
--    
--	double get()
--	{
--		return m_nMillimeter;
--	}
--	double getInHundredthsOfOneMillimeter()
--	{
--		return m_nMillimeter * 100;
--	}
--	double getInPoints()
--	{
--		return m_nMillimeter * 2.834645669; // 72 / 25.4mm
--	}    
--
--	static sal_Int32 getInHundredthsOfOneMillimeter(double points)
--	{
--		sal_Int32 mm = static_cast<sal_Int32>(points * factor);
--		return mm;
--	}
--    
--	static double getInPoints(int _hmm)
--	{
--		double points = double( static_cast<double>(_hmm) / factor);
--		return points;
--	}
--};
--
--class AbstractGeometryAttributes // probably should replace the ShapeHelper below
--{
--public:
--    virtual ~AbstractGeometryAttributes() {}
--    virtual double getLeft() = 0;
--    virtual void setLeft( double ) = 0;
--    virtual double getTop() = 0;
--    virtual void setTop( double ) = 0;
--    virtual double getHeight() = 0;
--    virtual void setHeight( double ) = 0;
--    virtual double getWidth() = 0;
--    virtual void setWidth( double ) = 0;
--};
--
--class ConcreteXShapeGeometryAttributes : public AbstractGeometryAttributes
--{
--public:
--    css::uno::Reference< ooo::vba::msforms::XShape > m_xShape; 
--    ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape );
--    virtual double getLeft()
--    {
--        return m_xShape->getLeft();
--    }
--    virtual void setLeft( double nLeft )
--    {
--        m_xShape->setLeft( nLeft );
--    }
--    virtual double getTop()
--    {
--        return m_xShape->getTop();
--    }
--    virtual void setTop( double nTop )
--    {
--        m_xShape->setTop( nTop );
--    }
--
--    virtual double getHeight()
--    {
--        return m_xShape->getHeight();
--    }
--    virtual void setHeight( double nHeight )
--    {
--        m_xShape->setHeight( nHeight );
--    }
--    virtual double getWidth()
--    {
--        return m_xShape->getWidth();
--    }
--    virtual void setWidth( double nWidth)
--    {
--        m_xShape->setHeight( nWidth );
--    }
--
--   
--};
--#define VBA_LEFT "PositionX"
--#define VBA_TOP "PositionY"
--class UserFormGeometryHelper : public AbstractGeometryAttributes
--{
--
--    css::uno::Reference< css::beans::XPropertySet > mxModel;
--public:
--    UserFormGeometryHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xControl );
--    virtual double getLeft();
--    virtual void setLeft( double nLeft );
--    virtual double getTop();
--    virtual void setTop( double nTop );
--    virtual double getHeight();
--    virtual void setHeight( double nHeight );
--    virtual double getWidth();
--    virtual void setWidth( double nWidth);
--};
--
--class ShapeHelper
--{
--protected:
--	css::uno::Reference< css::drawing::XShape > xShape;
--public:
--	ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException ) : xShape( _xShape )
--	{ 
--		if( !xShape.is() ) 
--			throw css::uno::RuntimeException( rtl::OUString::createFromAscii("No valid shape for helper"), css::uno::Reference< css::uno::XInterface >() );
--	}
--    
--	double getHeight()
--	{
--        	return  Millimeter::getInPoints(xShape->getSize().Height);
--    	}
--
--
--    	void setHeight(double _fheight) throw ( css::script::BasicErrorException )
--	{
--		try
--		{
--			css::awt::Size aSize = xShape->getSize();
--			aSize.Height = Millimeter::getInHundredthsOfOneMillimeter(_fheight);
--			xShape->setSize(aSize);
--		}
--		catch ( css::uno::Exception& /*e*/)
--		{
--			throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
--    		}
--	}
--    
--    
--	double getWidth()
--	{ 
--		return Millimeter::getInPoints(xShape->getSize().Width);
--    	}
--
--	void setWidth(double _fWidth) throw ( css::script::BasicErrorException )
--	{
--		try
--		{
--			css::awt::Size aSize = xShape->getSize();
--			aSize.Width = Millimeter::getInHundredthsOfOneMillimeter(_fWidth);
--			xShape->setSize(aSize);
--		}
--		catch (css::uno::Exception& /*e*/)
--		{
--			throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
--		}
--	}
--    
--    
--	double getLeft()
--	{
--		return Millimeter::getInPoints(xShape->getPosition().X);
--	}
--
--    
--	void setLeft(double _fLeft)
--	{
--		css::awt::Point aPoint = xShape->getPosition();
--		aPoint.X = Millimeter::getInHundredthsOfOneMillimeter(_fLeft);
--		xShape->setPosition(aPoint);
--	}
--    
--
--	double getTop()
--	{
--        	return Millimeter::getInPoints(xShape->getPosition().Y);
--	}
--
--    
--	void setTop(double _fTop)
--	{
--		css::awt::Point aPoint = xShape->getPosition();
--		aPoint.Y = Millimeter::getInHundredthsOfOneMillimeter(_fTop);
--		xShape->setPosition(aPoint);
--	}
--    
--};
--
--class ContainerUtilities
--{
--
--public: 
--	static rtl::OUString getUniqueName( const css::uno::Sequence< ::rtl::OUString >&  _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator);
--	static rtl::OUString getUniqueName( const css::uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix );
--
--	static sal_Int32 FieldInList( const css::uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString );
--};
--
--// really just a a place holder to ease the porting pain
--class DebugHelper
--{
--public:
--	static void exception( const rtl::OUString&  DetailedMessage, const css::uno::Exception& ex,  int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException )
--	{
--		// #TODO #FIXME ( do we want to support additionalArg here )
--		throw css::script::BasicErrorException( DetailedMessage.concat( rtl::OUString::createFromAscii(" ") ).concat( ex.Message ), css::uno::Reference< css::uno::XInterface >(), err, rtl::OUString() );
--	}
--
--	static void exception( int err,  const rtl::OUString& additionalArgument ) throw( css::script::BasicErrorException )
--	{
--		exception( rtl::OUString(), css::uno::Exception(), err, additionalArgument );
--	}
--
--	static void exception( css::uno::Exception& ex ) throw( css::script::BasicErrorException )
--	{
--		exception( rtl::OUString(), ex, SbERR_INTERNAL_ERROR, rtl::OUString() );
--	}
--};
--	} // openoffice
--} // org
--
--namespace ov = ooo::vba;
--
--#ifdef DEBUG
--#  define SC_VBA_FIXME(a) OSL_TRACE( a )
--#  define SC_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
--#else
--#  define SC_VBA_FIXME(a)
--#  define SC_VBA_STUB()
--#endif
--
--#endif
---- sc/source/ui/vba/vbahelperinterface.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbahelperinterface.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,116 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbahelperinterface.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_HELPERINTERFACE_HXX
--#define SC_VBA_HELPERINTERFACE_HXX
--
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/XHelperInterface.hpp>
--#include "vbahelper.hxx"
--#include "vbaglobals.hxx"
--
--// use this class when you have an a object like
--// interface  XAnInterface which contains XHelperInterface in its inheritance hierarchy
--// interface XAnInterface
--// { 
--//     interface XHelperInterface;
--//     [attribute, string] name;
--// }
--// or
--// interface XAnInterface : XHelperInterface;
--// { 
--//     [attribute, string] name;
--// }
--//
--// then this class can provide a default implementation of XHelperInterface,
--// you can use it like this
--// typedef InheritedHelperInterfaceImpl< XAnInterface > > AnInterfaceImpl_BASE;
--// class AnInterfaceImpl : public AnInterfaceImpl_BASE
--// {
--// public:
--//     AnInterface( const Reference< HelperInterface >& xParent ) : AnInterfaceImpl_BASE( xParent ) {}
--//     // implement XAnInterface methods only, no need to implement the XHelperInterface 
--//     // methods
--//     virtual void setName( const OUString& );  
--//     virtual OUString getName();  
--// }
--//
--const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) );
--
--template< typename Ifc1 >
--class InheritedHelperInterfaceImpl : public Ifc1
--{
--protected: 
--	css::uno::WeakReference< ov::XHelperInterface > mxParent;
--	css::uno::Reference< css::uno::XComponentContext > mxContext;
--public:
--	InheritedHelperInterfaceImpl() {}
--	InheritedHelperInterfaceImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxParent( xParent ), mxContext( xContext ) {}
--	virtual rtl::OUString& getServiceImplName() = 0;
--	virtual css::uno::Sequence<rtl::OUString> getServiceNames() = 0;
--
--	// XHelperInterface Methods
--	virtual ::sal_Int32 SAL_CALL getCreator() throw (css::script::BasicErrorException, css::uno::RuntimeException)
--	{
--		return 0x53756E4F;
--	}
--	virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return mxParent; }
--	
--	virtual css::uno::Any SAL_CALL Application(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return  css::uno::makeAny( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication() ); }
--
--
--	// XServiceInfo Methods
--	virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) { return getServiceImplName(); }
--	virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) 
--	{ 
--		css::uno::Sequence< rtl::OUString > sServices = getSupportedServiceNames();
--		const rtl::OUString* pStart = sServices.getConstArray();
--		const rtl::OUString* pEnd = pStart + sServices.getLength();
--		for ( ; pStart != pEnd ; ++pStart )
--			if ( (*pStart).equals( ServiceName ) )
--				return sal_True;
--		return sal_False;	
--	}
--	virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) 
--	{ 
--		css::uno::Sequence< rtl::OUString > aNames = getServiceNames();;
--		return aNames;
--	}
-- };
--
--template< typename Ifc1 >
--class InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
--
--{
--typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base;
--public:
--	InheritedHelperInterfaceImpl1< Ifc1 > ( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}	
--
--};
--#endif
---- sc/source/ui/vba/vbahyperlink.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbahyperlink.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -32,7 +32,7 @@
-  *    MA  02111-1307  USA
-  *
-  ************************************************************************/
--#include "helperdecl.hxx"
-+#include <vbahelper/helperdecl.hxx>
- #include "vbahyperlink.hxx"
- #include <com/sun/star/container/XIndexAccess.hpp>
- #include <com/sun/star/text/XTextFieldsSupplier.hpp> 
---- sc/source/ui/vba/vbahyperlink.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbahyperlink.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -40,7 +40,7 @@
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <ooo/vba/excel/XRange.hpp>
- 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1< ov::excel::XHyperlink > HyperlinkImpl_BASE;
- 
---- sc/source/ui/vba/vbaimage.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaimage.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,59 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile$
-- * $Revision$
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include "vbaimage.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
--ScVbaImage::ScVbaImage( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ImageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--}
--
--rtl::OUString& 
--ScVbaImage::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaImage") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaImage::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Image" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbaimage.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaimage.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,48 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile$
-- * $Revision$
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_IMAGE_HXX
--#define SC_VBA_IMAGE_HXX
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/msforms/XImage.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--
--typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XImage > ImageImpl_BASE;
--
--class ScVbaImage : public ImageImpl_BASE
--{
--public:
--    ScVbaImage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--#endif //SC_VBA_IMAGE_HXX
---- sc/source/ui/vba/vbainterior.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbainterior.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -34,9 +34,10 @@
- #include <com/sun/star/uno/XComponentContext.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <com/sun/star/container/XIndexAccess.hpp>
-+#include <com/sun/star/container/XNameContainer.hpp>
- 
- #include <com/sun/star/script/XInvocation.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- class ScDocument;
- 
---- sc/source/ui/vba/vbalabel.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbalabel.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,88 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbalabel.cxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include "vbalabel.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
--ScVbaLabel::ScVbaLabel(  const css::uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : LabelImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--}
--
--// Attributes
--rtl::OUString SAL_CALL 
--ScVbaLabel::getCaption() throw (css::uno::RuntimeException)
--{
--    rtl::OUString Label;
--    m_xProps->getPropertyValue( LABEL ) >>= Label;
--    return Label;
--}
--
--void SAL_CALL 
--ScVbaLabel::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
--}
--uno::Any SAL_CALL 
--ScVbaLabel::getValue() throw (css::uno::RuntimeException)
--{
--    return uno::makeAny( getCaption() );
--}
--
--void SAL_CALL 
--ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
--{
--    rtl::OUString sCaption;
--    _value >>= sCaption;
--    setCaption( sCaption ); 
--}
--
--
--rtl::OUString& 
--ScVbaLabel::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLabel") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaLabel::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbalabel.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbalabel.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,56 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbalabel.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_LABEL_HXX
--#define SC_VBA_LABEL_HXX
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/msforms/XLabel.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--#include <cppuhelper/implbase2.hxx>
--
--typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XLabel, css::script::XDefaultProperty  > LabelImpl_BASE;
--
--class ScVbaLabel : public LabelImpl_BASE
--{
--public:
--    ScVbaLabel( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
--   // Attributes
--    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--    // XDefaultProperty
--    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
--};
--#endif //SC_VBA_LABEL_HXX
---- sc/source/ui/vba/vbalineformat.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbalineformat.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,7 +33,7 @@
- #include <com/sun/star/drawing/XShape.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <ooo/vba/msforms/XLineFormat.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1< ov::msforms::XLineFormat > ScVbaLineFormat_BASE;
- 
---- sc/source/ui/vba/vbalistbox.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbalistbox.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,289 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbalistbox.cxx,v $
-- * $Revision: 1.4 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
--
--#include "vbalistbox.hxx"
--#include "vbapropvalue.hxx"
--#include <vector>
--#include <comphelper/anytostring.hxx>
--#include <com/sun/star/script/ArrayWrapper.hpp>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
--const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
--const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
--
--
--ScVbaListBox::ScVbaListBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ListBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--    mpListHelper.reset( new ListControlHelper( m_xProps ) );
--}
--
--// Attributes
--void SAL_CALL 
--ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
--{
--    sal_Int32 nIndex = 0;
--    _value >>= nIndex;
--    Selected( nIndex );
--}
--
--uno::Any SAL_CALL 
--ScVbaListBox::getListIndex() throw (uno::RuntimeException)
--{
--    uno::Sequence< sal_Int16 > sSelection;
--    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
--    if ( sSelection.getLength() == 0 )
--        return uno::Any( sal_Int32( -1 ) );
--    return uno::Any( sSelection[ 0 ] );
--}
--
--uno::Any SAL_CALL 
--ScVbaListBox::getValue() throw (uno::RuntimeException)
--{
--    uno::Sequence< sal_Int16 > sSelection;
--    uno::Sequence< rtl::OUString > sItems;
--    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
--    m_xProps->getPropertyValue( ITEMS ) >>= sItems;
--    if( getMultiSelect() )
--        throw uno::RuntimeException( rtl::OUString::createFromAscii(
--                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
--    uno::Any aRet;
--    if ( sSelection.getLength() )
--        aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] ); 
--    return aRet;
--}
--
--void SAL_CALL 
--ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
--{
--    if( getMultiSelect() )
--    {	
--        throw uno::RuntimeException( rtl::OUString::createFromAscii(
--                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
--    }
--    rtl::OUString sValue = getAnyAsString( _value );
--    uno::Sequence< rtl::OUString > sList;
--    m_xProps->getPropertyValue( ITEMS ) >>= sList;
--    uno::Sequence< sal_Int16 > nList;
--    sal_Int16 nLength = static_cast<sal_Int16>( sList.getLength() );
--    sal_Int16 nValue = -1;
--    sal_Int16 i = 0;
--    for( i = 0; i < nLength; i++ )
--    {
--        if( sList[i].equals( sValue ) )
--        {
--            nValue = i; 
--            break;
--        }
--    }
--    if( nValue == -1 )
--        throw uno::RuntimeException( rtl::OUString::createFromAscii(
--                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
--
--    uno::Sequence< sal_Int16 > nSelectedIndices(1);
--    nSelectedIndices[ 0 ] = nValue;
--    m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nSelectedIndices ) ); 
--    m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) ); 
--}
--
--::rtl::OUString SAL_CALL 
--ScVbaListBox::getText() throw (uno::RuntimeException)
--{
--	rtl::OUString result;
--	getValue() >>= result;
--	return result;
--}
--
--void SAL_CALL 
--ScVbaListBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
--{
--	setValue( uno::makeAny( _text ) ); // seems the same
--}
--
--sal_Bool SAL_CALL 
--ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException)
--{
--    sal_Bool bMultiSelect = sal_False;
--    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ) ) >>= bMultiSelect;
--    return bMultiSelect;
--}
--
--void SAL_CALL 
--ScVbaListBox::setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ), uno::makeAny( _multiselect ) );
--}
--
--css::uno::Any SAL_CALL 
--ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException)
--{
--    uno::Sequence< rtl::OUString > sList;
--    m_xProps->getPropertyValue( ITEMS ) >>= sList;
--    sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
--    // no choice but to do a horror cast as internally
--    // the indices are but sal_Int16 
--    sal_Int16 nIndex = static_cast< sal_Int16 >( index );
--    if( nIndex < 0 || nIndex >= nLength )
--        throw uno::RuntimeException( rtl::OUString::createFromAscii(
--                    "Error Number." ), uno::Reference< uno::XInterface >() );
--    m_nIndex = nIndex;
--    return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
--}
--
--// Methods
--void SAL_CALL 
--ScVbaListBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
--{
--	mpListHelper->AddItem( pvargItem, pvargIndex );
--		}
--
--void SAL_CALL 
--ScVbaListBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
--{
--	mpListHelper->removeItem( index );
--}
--
--void SAL_CALL 
--ScVbaListBox::Clear(  ) throw (uno::RuntimeException)
--{
--	mpListHelper->Clear();
--}
--
--// this is called when something like the following vba code is used
--// to set the selected state of particular entries in the Listbox
--// ListBox1.Selected( 3 ) = false
--//PropListener
--void 
--ScVbaListBox::setValueEvent( const uno::Any& value )
--{
--    sal_Bool bValue = sal_False;
--    if( !(value >>= bValue) )
--        throw uno::RuntimeException( rtl::OUString::createFromAscii(
--                    "Invalid type\n. need boolean." ), uno::Reference< uno::XInterface >() );
--    uno::Sequence< sal_Int16 > nList;
--    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= nList;
--    sal_Int16 nLength = static_cast<sal_Int16>( nList.getLength() );
--    sal_Int16 nIndex = m_nIndex;
--    for( sal_Int16 i = 0; i < nLength; i++ )
--    {
--        if( nList[i] == nIndex )
--        {
--            if( bValue )
--                return;
--            else
--            {
--                for( ; i < nLength - 1; i++ )
--                {
--                    nList[i] = nList[i + 1];
--                }
--                nList.realloc( nLength - 1 );
--                //m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
--		m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nList ) );
--                return;
--            }
--        }
--    }
--    if( bValue )
--    {
--        if( getMultiSelect() )
--        {
--            nList.realloc( nLength + 1 );
--            nList[nLength] = nIndex;
--        }
--        else
--        {
--            nList.realloc( 1 );
--            nList[0] = nIndex;
--        }
--        m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
--    }
--}
--
--// this is called when something like the following vba code is used
--// to determine the selected state of particular entries in the Listbox
--// msgbox ListBox1.Selected( 3 )
--
--css::uno::Any 
--ScVbaListBox::getValueEvent()
--{
--    uno::Sequence< sal_Int16 > nList;
--    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" ) ) ) >>= nList;
--    sal_Int32 nLength = nList.getLength();
--    sal_Int32 nIndex = m_nIndex;
--    
--    for( sal_Int32 i = 0; i < nLength; i++ )
--    {
--        if( nList[i] == nIndex )
--            return uno::makeAny( sal_True );
--    }
--
--    return uno::makeAny( sal_False );
--}
--
--void SAL_CALL
--ScVbaListBox::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
--{
--	ScVbaControl::setRowSource( _rowsource );
--	mpListHelper->setRowSource( _rowsource );
--}
--
--sal_Int32 SAL_CALL
--ScVbaListBox::getListCount() throw (uno::RuntimeException)
--{
--	return mpListHelper->getListCount();
--}
--
--uno::Any SAL_CALL 
--ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
--{
--	return mpListHelper->List( pvargIndex, pvarColumn );
--}
--
--rtl::OUString& 
--ScVbaListBox::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaListBox") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaListBox::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ScVbaListBox" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbalistbox.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbalistbox.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,90 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbalistbox.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_LISTBOX_HXX
--#define SC_VBA_LISTBOX_HXX
--#include <cppuhelper/implbase2.hxx>
--#include <com/sun/star/uno/XComponentContext.hpp>
--#include <com/sun/star/script/XDefaultProperty.hpp>
--#include <ooo/vba/msforms/XListBox.hpp>
--#include <com/sun/star/beans/PropertyAttribute.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbapropvalue.hxx"
--#include "vbalistcontrolhelper.hxx"
--#include "vbahelper.hxx"
--
--typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::script::XDefaultProperty > ListBoxImpl_BASE;
--class ScVbaListBox : public ListBoxImpl_BASE
--    ,public PropListener
--{		
--	std::auto_ptr< ListControlHelper > mpListHelper;
--	rtl::OUString sSourceName; 
--	rtl::OUString msDftPropName;
--
--    sal_Int16 m_nIndex;
--	
--public:
--	ScVbaListBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
--
--	// Attributes
--	virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
--	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--	virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
--    virtual sal_Bool SAL_CALL getMultiSelect() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException);
--
--	// Methods
--	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
--	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
--	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
--	// XControl
--    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
--
--	// XDefaultProperty
--    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
--    
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();    
--
--    //PropListener
--    virtual void setValueEvent( const css::uno::Any& value );
--    virtual css::uno::Any getValueEvent();
--
--
--};
--
--#endif //
---- sc/source/ui/vba/vbalistcontrolhelper.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbalistcontrolhelper.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,145 +0,0 @@
--#include <vbalistcontrolhelper.hxx>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
--
--void SAL_CALL 
--ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
--{
--	if ( pvargItem.hasValue()  )
--	{
--		uno::Sequence< rtl::OUString > sList;
--		m_xProps->getPropertyValue( ITEMS ) >>= sList;
--
--		sal_Int32 nIndex = sList.getLength();
--
--		if ( pvargIndex.hasValue() )
--			pvargIndex >>= nIndex;
--
--		rtl::OUString sString = getAnyAsString( pvargItem );
--
--		// if no index specified or item is to be appended to end of 
--		// list just realloc the array and set the last item
--		if ( nIndex  == sList.getLength() )
--		{
--			sal_Int32 nOldSize = sList.getLength();
--			sList.realloc( nOldSize + 1 );
--			sList[ nOldSize ] = sString; 
--		}
--		else
--		{
--			// just copy those elements above the one to be inserted
--			std::vector< rtl::OUString > sVec;
--			// reserve just the amount we need to copy
--			sVec.reserve( sList.getLength() - nIndex );
--
--			// point at first element to copy
--			rtl::OUString* pString = sList.getArray() + nIndex;
--			const rtl::OUString* pEndString = sList.getArray() + sList.getLength();
--			// insert the new element
--			sVec.push_back( sString );
--			// copy elements	
--			for ( ; pString != pEndString; ++pString )
--				sVec.push_back( *pString );
--		
--			sList.realloc(  sList.getLength() + 1 );
--
--			// point at first element to be overwritten
--			pString = sList.getArray() + nIndex;
--			pEndString = sList.getArray() + sList.getLength();
--			std::vector< rtl::OUString >::iterator it = sVec.begin();
--			for ( ; pString != pEndString; ++pString, ++it)
--				*pString = *it;	
--			//
--		}
--
--		m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
--		
--	}
--}
--
--void SAL_CALL 
--ListControlHelper::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
--{
--    sal_Int32 nIndex = 0;
--    // for int index
--	if ( index >>= nIndex  )
--	{
--		uno::Sequence< rtl::OUString > sList;
--		m_xProps->getPropertyValue( ITEMS ) >>= sList;
--        if( nIndex < 0 || nIndex > ( sList.getLength() - 1 ) )
--            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid index" ), uno::Reference< uno::XInterface > () );
--        if( sList.hasElements() )
--        {
--            if( sList.getLength() == 1 )
--            {
--                Clear();
--                return;
--            }
--            for( sal_Int32 i = nIndex; i < ( sList.getLength()-1 ); i++ )
--            {
--                sList[i] = sList[i+1];
--            }
--			sList.realloc(  sList.getLength() - 1 );
--		}
--
--		m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
--	}
--}
--
--void SAL_CALL 
--ListControlHelper::Clear(  ) throw (uno::RuntimeException)
--{
--	// urk, setValue doesn't seem to work !!
--	//setValue( uno::makeAny( sal_Int16() ) );
--	m_xProps->setPropertyValue( ITEMS, uno::makeAny( uno::Sequence< rtl::OUString >() ) );
--}
--
--void SAL_CALL
--ListControlHelper::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
--{
--	if ( _rowsource.getLength() == 0 )
--		Clear();
--}
--
--sal_Int32 SAL_CALL
--ListControlHelper::getListCount() throw (uno::RuntimeException)
--{
--    uno::Sequence< rtl::OUString > sList;
--    m_xProps->getPropertyValue( ITEMS ) >>= sList;
--    return sList.getLength();
--}
--
--uno::Any SAL_CALL 
--ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
--{
--    uno::Sequence< rtl::OUString > sList;
--    m_xProps->getPropertyValue( ITEMS ) >>= sList;
--    sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
--    uno::Any aRet;
--    if ( pvargIndex.hasValue() )
--    {
--        sal_Int16 nIndex = -1;
--        pvargIndex >>= nIndex;
--        if( nIndex < 0 || nIndex >= nLength )
--            throw uno::RuntimeException( rtl::OUString::createFromAscii(
--                    "Bad row Index" ), uno::Reference< uno::XInterface >() );       
--        aRet <<= sList[ nIndex ];
--    }
--    else if ( pvarColumn.hasValue() ) // pvarColumn on its own would be bad
--            throw uno::RuntimeException( rtl::OUString::createFromAscii(
--                    "Bad column Index" ), uno::Reference< uno::XInterface >() );       
--    else // List() ( e.g. no args )
--    {
--        uno::Sequence< uno::Sequence< rtl::OUString > > sReturnArray( nLength );
--        for ( sal_Int32 i = 0; i < nLength; ++i )
--        {
--            sReturnArray[ i ].realloc( 10 );
--            sReturnArray[ i ][ 0 ] = sList[ i ];
--        }        
--        aRet = uno::makeAny( sReturnArray );
--    }
--    return aRet;
--}
---- sc/source/ui/vba/vbalistcontrolhelper.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbalistcontrolhelper.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,20 +0,0 @@
--#ifndef SC_VBA_LISTCONTROLHELPER
--#define SC_VBA_LISTCONTROLHELPER
--
--#include "vbahelper.hxx"
--
--class ListControlHelper
--{
--	css::uno::Reference< css::beans::XPropertySet > m_xProps;
--
--public:
--	ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){}
--	virtual ~ListControlHelper() {}
--	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
--	virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);   
--    	virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
--	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
--	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
--	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
--};
--#endif
---- sc/source/ui/vba/vbamultipage.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbamultipage.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,132 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include "vbamultipage.hxx"
--#include <ooo/vba/XCollection.hpp>
--#include "vbapages.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--// uno servicename com.sun.star.awt.UnoControlProgressBarMode
--const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
--const rtl::OUString SVALUEMAX( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") );
--const rtl::OUString SSTEP( RTL_CONSTASCII_USTRINGPARAM("Step") );
--
--typedef cppu::WeakImplHelper1< container::XIndexAccess > PagesImpl_Base;
--class PagesImpl : public PagesImpl_Base
--{
--	sal_Int32 mnPages;
--public:
--	PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {}
--	virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException) { return mnPages; }
--	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException)
--	{
--		if ( Index < 0 || Index > mnPages )
--			throw lang::IndexOutOfBoundsException();
--		return uno::makeAny( uno::Reference< uno::XInterface >() );
--	}
--	// XElementAccess
--	virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
--	{
--		// no Pages object yet #FIXME
--		//return msforms::XPage::static_type(0);
--		return uno::XInterface::static_type(0);
--	}
--	virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
--	{
--		return ( mnPages > 0 );
--	}
--};
--uno::Reference< container::XIndexAccess > 
--ScVbaMultiPage::getPages( sal_Int32 nPages )
--{
--	return new PagesImpl( nPages );
--}
--
--ScVbaMultiPage::ScVbaMultiPage( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, const uno::Reference< uno::XInterface >& xDialog ) : MultiPageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--    mxDialogProps.set( xDialog, uno::UNO_QUERY_THROW );
--    // set dialog step to value of multipage pseudo model
--    setValue(getValue());
--}
--
--// Attributes
--sal_Int32 SAL_CALL 
--ScVbaMultiPage::getValue() throw (css::uno::RuntimeException)
--{
--    sal_Int32 nValue = 0;
--    m_xProps->getPropertyValue( SVALUE ) >>= nValue;
--    return nValue;
--}
--
--void SAL_CALL 
--ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException)
--{
--    // track change in dialog ( dialog value is 1 based, 0 is a special value )
--    m_xProps->setPropertyValue( SVALUE, uno::makeAny( _value ) );
--    mxDialogProps->setPropertyValue( SSTEP, uno::makeAny( _value + 1) );
--}
--
--
--rtl::OUString& 
--ScVbaMultiPage::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMultiPage") );
--	return sImplName;
--}
--
--uno::Any SAL_CALL 
--ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException)
--{
--	sal_Int32 nValue = 0;
--	m_xProps->getPropertyValue( SVALUEMAX ) >>= nValue;
--	uno::Reference< XCollection > xColl( new ScVbaPages( this, mxContext, getPages( nValue ) ) );
--	if ( !index.hasValue() )
--		return uno::makeAny( xColl );
--	return xColl->Item( uno::makeAny( index ), uno::Any() );
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaMultiPage::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.MultiPage" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbamultipage.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbamultipage.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,65 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_MULTIPAGE_HXX
--#define SC_VBA_MULTIPAGE_HXX
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/msforms/XMultiPage.hpp>
--#include <com/sun/star/container/XIndexAccess.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--//#include <cppuhelper/implbase2.hxx>
--#include <cppuhelper/implbase1.hxx>
--
--typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XMultiPage > MultiPageImpl_BASE;
--
--class ScVbaMultiPage : public MultiPageImpl_BASE
--{
--    css::uno::Reference< css::container::XIndexAccess > getPages( sal_Int32 nPages );
--    css::uno::Reference< css::beans::XPropertySet > mxDialogProps;
--public:
--    ScVbaMultiPage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, const css::uno::Reference< css::uno::XInterface >& xDialog );
--   // Attributes
--    virtual sal_Int32 SAL_CALL getValue() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setValue( sal_Int32 _value ) throw (css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) throw (css::uno::RuntimeException);
--
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--    // XDefaultProperty
--    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
--};
--#endif //SC_VBA_LABEL_HXX
---- sc/source/ui/vba/vbaname.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaname.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -27,7 +27,7 @@
-  * for a copy of the LGPLv3 License.
-  *
-  ************************************************************************/
--#include "helperdecl.hxx"
-+#include <vbahelper/helperdecl.hxx>
- 
- #include <com/sun/star/table/XCellRange.hpp>
- #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
-@@ -64,7 +64,8 @@ ScVbaName::~ScVbaName()
- css::uno::Reference< ov::excel::XWorksheet >
- ScVbaName::getWorkSheet() throw (css::uno::RuntimeException)
- {
--	return ScVbaGlobals::getGlobalsImpl( mxContext )->getActiveSheet();
-+	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
-+	return xApplication->getActiveSheet();
- }
- 
- ::rtl::OUString
-@@ -234,7 +235,7 @@ ScVbaName::setRefersToR1C1Local( const :
- css::uno::Reference< ov::excel::XRange >
- ScVbaName::getRefersToRange() throw (css::uno::RuntimeException)
- {
--    uno::Reference< ov::excel::XRange > xRange = ScVbaRange::getRangeObjectForName( mxContext, mxNamedRange->getName(), getDocShell( mxModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
-+    uno::Reference< ov::excel::XRange > xRange = ScVbaRange::getRangeObjectForName( mxContext, mxNamedRange->getName(), excel::getDocShell( mxModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
- 	return xRange;
- }
- 
---- sc/source/ui/vba/vbaname.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaname.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -34,7 +34,9 @@
- #include <com/sun/star/sheet/XNamedRange.hpp>
- #include <com/sun/star/sheet/XNamedRanges.hpp>
- 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+class ScDocument; 
- 
- typedef InheritedHelperInterfaceImpl1< ov::excel::XName > NameImpl_BASE;
- 
---- sc/source/ui/vba/vbanames.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbanames.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -27,7 +27,7 @@
-  * for a copy of the LGPLv3 License.
-  *
-  ************************************************************************/
--#include "helperdecl.hxx"
-+#include <vbahelper/helperdecl.hxx>
- 
- #include <com/sun/star/table/XCellRange.hpp>
- #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
-@@ -81,7 +81,7 @@ ScDocument *
- ScVbaNames::getScDocument()
- {
- 	uno::Reference< frame::XModel > xModel( getModel() , uno::UNO_QUERY_THROW );
--	ScTabViewShell * pTabViewShell = getBestViewShell( xModel );
-+	ScTabViewShell * pTabViewShell = excel::getBestViewShell( xModel );
- 	if ( !pTabViewShell )
- 		throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewShell available"), uno::Reference< uno::XInterface >() );
- 	ScViewData* pViewData = pTabViewShell->GetViewData();
---- sc/source/ui/vba/vbanames.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbanames.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -34,7 +34,10 @@
- #include <ooo/vba/XCollection.hpp>
- #include <com/sun/star/container/XEnumerationAccess.hpp>
- #include <com/sun/star/sheet/XNamedRanges.hpp>
--#include "vbacollectionimpl.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
-+
-+class ScDocument;
-+class ScDocShell;
- 
- typedef CollTestImplHelper< ov::excel::XNames > ScVbaNames_BASE;
- 
---- sc/source/ui/vba/vbaoleobject.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaoleobject.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -35,7 +35,7 @@
- #include <com/sun/star/awt/XWindowPeer.hpp>
- #include <ooo/vba/excel/XOLEObject.hpp>
- 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1< ov::excel::XOLEObject > OLEObjectImpl_BASE;
- 
---- sc/source/ui/vba/vbaoleobjects.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaoleobjects.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,8 +33,8 @@
- #include <cppuhelper/implbase1.hxx>
- #include <ooo/vba/excel/XOLEObjects.hpp>
- 
--#include "vbacollectionimpl.hxx"
--#include "vbahelper.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include "excelvbahelper.hxx"
- 
- typedef CollTestImplHelper< ov::excel::XOLEObjects > OLEObjectsImpl_BASE;
- 
---- sc/source/ui/vba/vbaoutline.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaoutline.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -34,7 +34,7 @@
- #include <cppuhelper/implbase1.hxx>
- #include <ooo/vba/excel/XOutline.hpp>
- #include <com/sun/star/uno/XComponentContext.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1< ov::excel::XOutline > ScVbaOutline_BASE;
- 
---- sc/source/ui/vba/vbapagebreak.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapagebreak.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -38,7 +38,7 @@
- #include <com/sun/star/script/BasicErrorException.hpp>
- #include <com/sun/star/sheet/TablePageBreakData.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- template< typename Ifc1 >
- class ScVbaPageBreak : public InheritedHelperInterfaceImpl1< Ifc1 >
---- sc/source/ui/vba/vbapagebreaks.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapagebreaks.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -41,8 +41,8 @@
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <com/sun/star/container/XIndexAccess.hpp>
- #include <com/sun/star/table/XColumnRowRange.hpp>
--#include "vbahelperinterface.hxx"
--#include "vbacollectionimpl.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbacollectionimpl.hxx>
- 
- typedef CollTestImplHelper< ov::excel::XHPageBreaks > ScVbaHPageBreaks_BASE;
- 
---- sc/source/ui/vba/vbapages.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapages.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,81 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include "vbapages.hxx"
--
--using namespace ::ooo::vba;
--using namespace ::com::sun::star;
--using namespace ::vos;
--
--ScVbaPages::ScVbaPages( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPages ) throw( lang::IllegalArgumentException ) : ScVbaPages_BASE( xParent, xContext, xPages )
--{
--}
--
--uno::Type SAL_CALL 
--ScVbaPages::getElementType() throw (uno::RuntimeException)
--{
--	// return msforms::XPage::static_type(0); 
--	return uno::XInterface::static_type(0); 
--}
--
--uno::Any 
--ScVbaPages::createCollectionObject( const css::uno::Any& aSource )
--{
--	return aSource;
--}
--
--rtl::OUString& 
--ScVbaPages::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPages") );
--	return sImplName;
--}
--
--uno::Reference< container::XEnumeration > SAL_CALL 
--ScVbaPages::createEnumeration() throw (uno::RuntimeException)
--{
--	return uno::Reference< container::XEnumeration >();
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaPages::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Pages" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbapages.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapages.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,64 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_PAGES_HXX
--#define SC_VBA_PAGES_HXX
--
--#include <ooo/vba/office/MsoShapeType.hpp>
--#include <com/sun/star/lang/XEventListener.hpp>
--#include <com/sun/star/beans/XPropertySet.hpp>
--#include <ooo/vba/msforms/XPages.hpp>
--#include <cppuhelper/implbase2.hxx>
--#include <cppuhelper/implbase1.hxx>
--
--#include "vbacollectionimpl.hxx"
--typedef CollTestImplHelper< 
--ov::msforms::XPages > ScVbaPages_BASE;
--
--class ScVbaPages : public ScVbaPages_BASE
--{
--protected:
--	virtual rtl::OUString& getServiceImplName();
--	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--public:
--    ScVbaPages( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPages ) throw ( css::lang::IllegalArgumentException );
--    virtual ~ScVbaPages() {}
--        // XEnumerationAccess
--    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
--     // ScVbaPages_BASE
--     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
--
--};
--#endif//SC_VBA_SHAPE_HXX
---- sc/source/ui/vba/vbapagesetup.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapagesetup.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -31,6 +31,7 @@
- #include "cellsuno.hxx"
- #include "convuno.hxx"
- #include "rangelst.hxx"
-+#include "excelvbahelper.hxx"
- #include <com/sun/star/sheet/XPrintAreas.hpp>
- #include <com/sun/star/sheet/XHeaderFooterContent.hpp>
- #include <com/sun/star/text/XText.hpp>
-@@ -85,7 +86,7 @@ rtl::OUString SAL_CALL ScVbaPageSetup::g
- 			ScUnoConversion::FillScRange( aRange, aSeq[i] );
- 			aRangeList.Append( aRange );
- 		}
--		ScDocument* pDoc = getDocShell( mxModel )->GetDocument();
-+		ScDocument* pDoc = excel::getDocShell( mxModel )->GetDocument();
- 		aRangeList.Format( aPrintArea, nFlags, pDoc, formula::FormulaGrammar::CONV_XL_A1, ','  );
-     }
-     
-@@ -106,7 +107,7 @@ void SAL_CALL ScVbaPageSetup::setPrintAr
-     {
- 		ScRangeList aCellRanges;
- 		ScRange aRange;
--		if( getScRangeListForAddress( rAreas, getDocShell( mxModel ) , aRange, aCellRanges ) ) 
-+		if( getScRangeListForAddress( rAreas, excel::getDocShell( mxModel ) , aRange, aCellRanges ) ) 
- 		{
- 			uno::Sequence< table::CellRangeAddress > aSeq( aCellRanges.Count() );
- 			USHORT i=0;
---- sc/source/ui/vba/vbapagesetup.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapagesetup.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -35,7 +35,7 @@
- #include <com/sun/star/uno/XComponentContext.hpp>
- #include <com/sun/star/sheet/XSpreadsheet.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1< ov::excel::XPageSetup > ScVbaPageSetup_BASE;
- 
---- sc/source/ui/vba/vbapalette.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapalette.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -30,7 +30,7 @@
- #ifndef SC_VBAPALETTE_HXX
- #define SC_VBAPALETTE_HXX
- 
--#include "vbahelper.hxx"
-+#include "excelvbahelper.hxx"
- #include <document.hxx>
- #include <com/sun/star/container/XIndexAccess.hpp>
- 
---- sc/source/ui/vba/vbapane.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapane.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -34,7 +34,7 @@
- #include<com/sun/star/sheet/XViewPane.hpp>
- #include<ooo/vba/excel/XPane.hpp>
- 
--#include"vbahelper.hxx"
-+#include"excelvbahelper.hxx"
- 
- typedef cppu::WeakImplHelper1< ov::excel::XPane > PaneImpl_Base;
- 
---- sc/source/ui/vba/vbapictureformat.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapictureformat.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,7 +33,7 @@
- #include <com/sun/star/drawing/XShape.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <ooo/vba/msforms/XPictureFormat.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1< ov::msforms::XPictureFormat > ScVbaPictureFormat_BASE;
- 
---- sc/source/ui/vba/vbapivotcache.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapivotcache.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -34,7 +34,7 @@
- #include <com/sun/star/sheet/XDataPilotTable.hpp>
- 
- #include <ooo/vba/excel/XPivotCache.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1<ov::excel::XPivotCache > PivotCacheImpl_BASE;
- 
---- sc/source/ui/vba/vbapivottable.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapivottable.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,8 +33,8 @@
- #include <com/sun/star/uno/XComponentContext.hpp>
- #include <com/sun/star/sheet/XDataPilotTable.hpp>
- #include <ooo/vba/excel/XPivotTable.hpp>
--#include "vbahelper.hxx"
--#include "vbahelperinterface.hxx"
-+#include "excelvbahelper.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1< ov::excel::XPivotTable >  PivotTableImpl_BASE;
- 
---- sc/source/ui/vba/vbapivottables.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapivottables.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -36,9 +36,9 @@
- #include <com/sun/star/container/XEnumerationAccess.hpp>
- #include <com/sun/star/uno/XComponentContext.hpp>
-  
--#include "vbahelper.hxx"
--#include "vbahelperinterface.hxx"
--#include "vbacollectionimpl.hxx"
-+#include "excelvbahelper.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbacollectionimpl.hxx>
- 
- 
- typedef CollTestImplHelper< ov::excel::XPivotTables > ScVbaPivotTables_BASE;
---- sc/source/ui/vba/vbaprogressbar.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaprogressbar.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,78 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include "vbaprogressbar.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--// uno servicename com.sun.star.awt.UnoControlProgressBarMode
--const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
--
--ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ProgressBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--}
--
--// Attributes
--uno::Any SAL_CALL 
--ScVbaProgressBar::getValue() throw (css::uno::RuntimeException)
--{
--    return m_xProps->getPropertyValue( SVALUE );
--}
--
--void SAL_CALL 
--ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( SVALUE,  _value );
--}
--
--rtl::OUString& 
--ScVbaProgressBar::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaProgressBar") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaProgressBar::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbaprogressbar.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaprogressbar.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,59 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_PROGRESSBAR_HXX
--#define SC_VBA_PROGRESSBAR_HXX
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/msforms/XProgressBar.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--#include <cppuhelper/implbase2.hxx>
--
--typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XProgressBar, css::script::XDefaultProperty  > ProgressBarImpl_BASE;
--
--class ScVbaProgressBar : public ProgressBarImpl_BASE
--{
--public:
--    ScVbaProgressBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
--   // Attributes
--    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--    // XDefaultProperty
--    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
--};
--#endif //SC_VBA_LABEL_HXX
---- sc/source/ui/vba/vbapropvalue.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbapropvalue.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -32,7 +32,7 @@
- #include <ooo/vba/XPropValue.hpp>
- #include <cppuhelper/implbase1.hxx>
- 
--#include "vbahelper.hxx"
-+#include "excelvbahelper.hxx"
- 
- typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE;
- 
---- sc/source/ui/vba/vbaradiobutton.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaradiobutton.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,107 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbaradiobutton.cxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include "vbaradiobutton.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
--const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
--ScVbaRadioButton::ScVbaRadioButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : RadioButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--}
--
--// Attributes
--rtl::OUString SAL_CALL 
--ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException)
--{
--    rtl::OUString Label;
--    m_xProps->getPropertyValue( LABEL ) >>= Label;
--    return Label;
--}
--
--void SAL_CALL 
--ScVbaRadioButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
--}
--
--uno::Any SAL_CALL 
--ScVbaRadioButton::getValue() throw (css::uno::RuntimeException)
--{
--    sal_Int16 nValue = -1;
--    m_xProps->getPropertyValue( STATE ) >>= nValue;
--    if( nValue != 0 )
--        nValue = -1;
--//    return uno::makeAny( nValue ); 
--// I must be missing something MSO says value should be -1 if selected, 0 if not
--// selected
--    return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); 
--
--}
--
--void SAL_CALL 
--ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
--{
--    sal_Int16 nValue = 0;
--    sal_Bool bValue = sal_False;
--    if( _value >>= nValue )
--    {
--        if( nValue == -1)
--        nValue = 1;
--    }
--    else if ( _value >>= bValue )
--    {
--        if ( bValue )
--            nValue = 1;
--    }
--    m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
--}
--
--rtl::OUString& 
--ScVbaRadioButton::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRadioButton") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaRadioButton::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.RadioButton" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbaradiobutton.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaradiobutton.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,55 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbaradiobutton.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_RADIOBUTTON_HXX
--#define SC_VBA_RADIOBUTTON_HXX
--#include <ooo/vba/msforms/XRadioButton.hpp>
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--#include <cppuhelper/implbase2.hxx>
--
--typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > RadioButtonImpl_BASE;
--
--class ScVbaRadioButton : public RadioButtonImpl_BASE
--{
--public:
--    ScVbaRadioButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
--   // Attributes
--    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setValue(const com::sun::star::uno::Any&) throw (css::uno::RuntimeException);
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--    // XDefaultProperty
--    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
--
--};
--#endif //SC_VBA_RADIOBUTTON_HXX
---- sc/source/ui/vba/vbarange.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbarange.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -27,7 +27,7 @@
-  * for a copy of the LGPLv3 License.
-  *
-  ************************************************************************/
--#include "helperdecl.hxx"
-+#include <vbahelper/helperdecl.hxx>
- 
- #include <comphelper/unwrapargs.hxx>
- #include <comphelper/processfactory.hxx>
-@@ -146,7 +146,6 @@
- #include "rangelst.hxx"
- #include "convuno.hxx"
- #include "compiler.hxx"
--#include "formula/grammar.hxx"
- #include "attrib.hxx"
- #include "undodat.hxx"
- #include "dbdocfun.hxx"
-@@ -159,7 +158,7 @@
- #include "vbaglobals.hxx"
- #include "vbastyle.hxx"
- #include <vector>
--#include <vbacollectionimpl.hxx>
-+#include <vbahelper/vbacollectionimpl.hxx>
- // begin test includes
- #include <com/sun/star/sheet/FunctionArgument.hpp>
- // end test includes
-@@ -253,7 +252,7 @@ ScCellRangeObj*  ScVbaRange::getCellRang
- SfxItemSet*  ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException )
- {
- 	ScCellRangeObj* pUnoCellRange = getCellRangeObj();
--	SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
-+	SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
- 	if ( !pDataSet )
- 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for range" ) ), uno::Reference< uno::XInterface >() );
- 	return pDataSet;	
-@@ -470,7 +469,7 @@ public:
- 		if ( pUnoCellRange )
- 		{
- 			
--			SfxItemSet* pDataSet = 	ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
-+			SfxItemSet* pDataSet = 	excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
- 			SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, TRUE, NULL);
- 			// one of the cells in the range is not like the other ;-)
- 			// so return a zero length format to indicate that
-@@ -1999,7 +1998,7 @@ bool cellInRange( const table::CellRange
- 
- void setCursor(  const SCCOL& nCol, const SCROW& nRow, bool bInSel = true )
- {
--	ScTabViewShell* pShell = getCurrentBestViewShell();
-+	ScTabViewShell* pShell = excel::getCurrentBestViewShell();
- 	if ( pShell )
- 	{
- 		if ( bInSel )
-@@ -2210,7 +2209,7 @@ ScVbaRange::Copy(const ::uno::Any& Desti
- 	else
- 	{
- 		Select();
--		implnCopy();
-+		excel::implnCopy();
- 	}
- }
- 
-@@ -2234,7 +2233,7 @@ ScVbaRange::Cut(const ::uno::Any& Destin
- 	}
- 	{
- 		Select();
--		implnCut();
-+		excel::implnCut();
- 	}
- }
-                                                                                                                              
-@@ -2564,7 +2563,7 @@ ScVbaRange::PasteSpecial( const uno::Any
- 
- 	USHORT nFlags = getPasteFlags(nPaste);
- 	USHORT nFormulaBits = getPasteFormulaBits(nOperation);
--	implnPasteSpecial(nFlags,nFormulaBits,bSkipBlanks,bTranspose);
-+	excel::implnPasteSpecial(nFlags,nFormulaBits,bSkipBlanks,bTranspose);
- 	// restore selection
- 	xSelection->select( uno::makeAny( xSel ) );
- }
-@@ -3233,13 +3232,13 @@ ScVbaRange::End( ::sal_Int32 Direction )
- 	
- 	// Save ActiveCell pos ( to restore later )
- 	uno::Any aDft;
--	rtl::OUString sActiveCell =	ScVbaGlobals::getGlobalsImpl(
--                       mxContext )->getApplication()->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
-+	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
-+	rtl::OUString sActiveCell = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
- 
- 	// position current cell upper left of this range
- 	Cells( uno::makeAny( (sal_Int32) 1 ), uno::makeAny( (sal_Int32) 1 ) )->Select();
- 
--	SfxViewFrame* pViewFrame = getCurrentViewFrame();
-+	SfxViewFrame* pViewFrame = excel::getCurrentViewFrame();
- 	if ( pViewFrame )
- 	{
- 		SfxAllItemSet aArgs( SFX_APP()->GetPool() );
-@@ -3275,18 +3274,17 @@ ScVbaRange::End( ::sal_Int32 Direction )
- 	}
- 
- 	// result is the ActiveCell		
--	rtl::OUString sMoved =	ScVbaGlobals::getGlobalsImpl(
--                       mxContext )->getApplication()->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
-+	rtl::OUString sMoved =	xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
- 
- 	// restore old ActiveCell		
- 	uno::Any aVoid;
--	uno::Reference< excel::XRange > xOldActiveCell( ScVbaGlobals::getGlobalsImpl(
--		mxContext )->getActiveSheet()->Range( uno::makeAny( sActiveCell ), aVoid ), uno::UNO_QUERY_THROW );
-+
-+	uno::Reference< excel::XRange > xOldActiveCell( xApplication->getActiveSheet()->Range( uno::makeAny( sActiveCell ), aVoid ), uno::UNO_QUERY_THROW );
- 	xOldActiveCell->Select();
- 
- 	uno::Reference< excel::XRange > resultCell;
--	resultCell.set( ScVbaGlobals::getGlobalsImpl(
--		mxContext )->getActiveSheet()->Range( uno::makeAny( sMoved ), aVoid ), uno::UNO_QUERY_THROW );
-+	
-+	resultCell.set( xApplication->getActiveSheet()->Range( uno::makeAny( sMoved ), aVoid ), uno::UNO_QUERY_THROW );
- 
- 	// return result
- 	
-@@ -3749,7 +3747,7 @@ ScVbaRange::setPageBreak( const uno::Any
- 		uno::Reference< frame::XModel > xModel = pShell->GetModel();
- 		if ( xModel.is() )
- 		{
--			ScTabViewShell* pViewShell = getBestViewShell( xModel );
-+			ScTabViewShell* pViewShell = excel::getBestViewShell( xModel );
- 			if ( nPageBreak == excel::XlPageBreak::xlPageBreakManual )
- 			    pViewShell->InsertPageBreak( bColumn, TRUE, &aAddr);
- 			else if ( nPageBreak == excel::XlPageBreak::xlPageBreakNone )
-@@ -4711,7 +4709,7 @@ ScVbaRange::PrintOut( const uno::Any& Fr
- 		{
- 			xPrintAreas->setPrintAreas( printAreas );
- 			uno::Reference< frame::XModel > xModel = pShell->GetModel();
--			PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, xModel, sal_True );
-+			PrintOutHelper( excel::getBestViewShell( xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, sal_True );
- 		}
- 	}
- }
-@@ -5362,7 +5360,8 @@ sal_Bool SAL_CALL
- ScVbaRange::hasError() throw (uno::RuntimeException)
- {
-     double dResult = sal_False;
--    uno::Reference< script::XInvocation > xInvoc( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication()->WorksheetFunction(), uno::UNO_QUERY_THROW );
-+    uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
-+    uno::Reference< script::XInvocation > xInvoc( xApplication->WorksheetFunction(), uno::UNO_QUERY_THROW );
- 
-     static rtl::OUString FunctionName( RTL_CONSTASCII_USTRINGPARAM("IsError" ) );
-     uno::Sequence< uno::Any > Params(1);
---- sc/source/ui/vba/vbarange.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbarange.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -53,12 +53,15 @@
- #include <com/sun/star/sheet/XSpreadsheet.hpp>
- #include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
- 
--//#include "vbahelperinterface.hxx"
-+//#include <vbahelper/vbahelperinterface.hxx>
- #include "vbaformat.hxx"
-+#include <formula/grammar.hxx>
- 
- class ScTableSheetsObj;
- class ScCellRangesBase;
- class ScCellRangeObj;
-+class ScDocShell;
-+class ScDocument;
- 
- //typedef InheritedHelperInterfaceImpl1< ov::excel::XRange >  ScVbaRange_BASE;
- typedef ScVbaFormat< ov::excel::XRange > ScVbaRange_BASE;
---- sc/source/ui/vba/vbascrollbar.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbascrollbar.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,139 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include "vbascrollbar.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--const static rtl::OUString LARGECHANGE( RTL_CONSTASCII_USTRINGPARAM("BlockIncrement") );
--const static rtl::OUString SMALLCHANGE( RTL_CONSTASCII_USTRINGPARAM("LineIncrement") );
--const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
--const static rtl::OUString SCROLLVALUE( RTL_CONSTASCII_USTRINGPARAM("ScrollValue") );
--const static rtl::OUString SCROLLMAX( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMax") );
--const static rtl::OUString SCROLLMIN( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMin") );
--
--ScVbaScrollBar::ScVbaScrollBar(  const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ScrollBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--}
--
--// Attributes
--uno::Any SAL_CALL 
--ScVbaScrollBar::getValue() throw (css::uno::RuntimeException)
--{
--    return  m_xProps->getPropertyValue( SCROLLVALUE );
--}
--
--void SAL_CALL 
--ScVbaScrollBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( SCROLLVALUE, _value );
--}
--
--::sal_Int32 SAL_CALL 
--ScVbaScrollBar::getMax() throw (uno::RuntimeException)
--{
--    sal_Int32 nMax = 0;
--    m_xProps->getPropertyValue( SCROLLMAX ) >>= nMax;
--    return nMax;
--}
--
--void SAL_CALL 
--ScVbaScrollBar::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( SCROLLMAX, uno::makeAny( nVal ) ); 
--}
--
--::sal_Int32 SAL_CALL 
--ScVbaScrollBar::getMin() throw (uno::RuntimeException)
--{
--    sal_Int32 nVal = 0;
--    m_xProps->getPropertyValue( SCROLLMIN ) >>= nVal;
--    return nVal;
--}
--
--void SAL_CALL 
--ScVbaScrollBar::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( SCROLLMIN, uno::makeAny( nVal ) ); 
--}
--
--void SAL_CALL 
--ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange ) throw (uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( LARGECHANGE, uno::makeAny( _largechange ) );
--}
--
--::sal_Int32 SAL_CALL 
--ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException)
--{
--    sal_Int32 nVal = 0;
--    m_xProps->getPropertyValue( LARGECHANGE ) >>= nVal;
--    return nVal;
--}
--
--::sal_Int32 SAL_CALL 
--ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException)
--{
--    sal_Int32 nSmallChange = 0;
--    m_xProps->getPropertyValue( SMALLCHANGE ) >>= nSmallChange;
--    return nSmallChange;
--}
--
--void SAL_CALL 
--ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( SMALLCHANGE, uno::makeAny( _smallchange ) );
--}
--
--rtl::OUString& 
--ScVbaScrollBar::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaScrollBar") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaScrollBar::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbascrollbar.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbascrollbar.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,66 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_SCROLLBAR_HXX
--#define SC_VBA_SCROLLBAR_HXX
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/msforms/XScrollBar.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--
--typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XScrollBar > ScrollBarImpl_BASE;
--
--class ScVbaScrollBar : public ScrollBarImpl_BASE
--{
--public:
--    ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
--   // Attributes
--    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--    virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
--    virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
--    virtual ::sal_Int32 SAL_CALL getLargeChange() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setLargeChange( ::sal_Int32 _largechange ) throw (css::uno::RuntimeException);
--    virtual ::sal_Int32 SAL_CALL getSmallChange() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setSmallChange( ::sal_Int32 _smallchange ) throw (css::uno::RuntimeException);
--
--
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--#endif //SC_VBA_LABEL_HXX
---- sc/source/ui/vba/vbaseriescollection.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaseriescollection.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -31,9 +31,9 @@
- #define SC_VBA_SERIESCOLLECTION_HXX
- 
- #include <ooo/vba/excel/XSeriesCollection.hpp>
--#include "vbahelperinterface.hxx"
--#include "vbacollectionimpl.hxx"
--#include "vbahelper.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include "excelvbahelper.hxx"
- 
- 
- typedef CollTestImplHelper< ov::excel::XSeriesCollection > SeriesCollection_BASE;
---- sc/source/ui/vba/vbashape.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbashape.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -39,7 +39,7 @@
- #include <ooo/vba/msforms/XLineFormat.hpp>
- #include <cppuhelper/implbase2.hxx>
- 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef  ::cppu::WeakImplHelper2< ov::msforms::XShape, css::lang::XEventListener > ListeningShape;
- 
---- sc/source/ui/vba/vbashaperange.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbashaperange.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -30,6 +30,7 @@
- #include <com/sun/star/drawing/XShapeGrouper.hpp>
- #include <com/sun/star/drawing/XDrawPage.hpp>
- 
-+#include "excelvbahelper.hxx"
- #include "vbashaperange.hxx"
- #include "vbashape.hxx"
- 
---- sc/source/ui/vba/vbashaperange.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbashaperange.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,7 +33,7 @@
- #include <com/sun/star/drawing/XShapes.hpp>
- #include <ooo/vba/msforms/XShapeRange.hpp>
- 
--#include "vbacollectionimpl.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
- 
- typedef CollTestImplHelper< ov::msforms::XShapeRange > ScVbaShapeRange_BASE;
- 
---- sc/source/ui/vba/vbashapes.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbashapes.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,6 +33,7 @@
- #include <ooo/vba/msforms/XShapeRange.hpp>
- #include <ooo/vba/office/MsoAutoShapeType.hpp>
- 
-+#include "excelvbahelper.hxx"
- #include "vbashapes.hxx"
- #include "vbashape.hxx"
- #include "vbashaperange.hxx"
---- sc/source/ui/vba/vbashapes.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbashapes.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -35,9 +35,9 @@
- #include <com/sun/star/container/XIndexAccess.hpp>
- #include <ooo/vba/msforms/XShapes.hpp>
- 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
--#include "vbacollectionimpl.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
- 
- typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE;
- 
---- sc/source/ui/vba/vbaspinbutton.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaspinbutton.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,109 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include "vbaspinbutton.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
--const static rtl::OUString SPINVALUE( RTL_CONSTASCII_USTRINGPARAM("SpinValue") );
--const static rtl::OUString SPINMAX( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") );
--const static rtl::OUString SPINMIN( RTL_CONSTASCII_USTRINGPARAM("SpinValueMin") );
--
--ScVbaSpinButton::ScVbaSpinButton(  const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : SpinButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--}
--
--// Attributes
--uno::Any SAL_CALL 
--ScVbaSpinButton::getValue() throw (css::uno::RuntimeException)
--{
--    return  m_xProps->getPropertyValue( SPINVALUE );
--}
--
--void SAL_CALL 
--ScVbaSpinButton::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( SPINVALUE, _value );
--}
--
--::sal_Int32 SAL_CALL 
--ScVbaSpinButton::getMax() throw (uno::RuntimeException)
--{
--    sal_Int32 nMax = 0;
--    m_xProps->getPropertyValue( SPINMAX ) >>= nMax;
--    return nMax;
--}
--
--void SAL_CALL 
--ScVbaSpinButton::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( SPINMAX, uno::makeAny( nVal ) ); 
--}
--
--::sal_Int32 SAL_CALL 
--ScVbaSpinButton::getMin() throw (uno::RuntimeException)
--{
--    sal_Int32 nVal = 0;
--    m_xProps->getPropertyValue( SPINMIN ) >>= nVal;
--    return nVal;
--}
--
--void SAL_CALL 
--ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) ); 
--}
--
--rtl::OUString& 
--ScVbaSpinButton::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaSpinButton") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaSpinButton::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbaspinbutton.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaspinbutton.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,61 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_SPINBUTTON_HXX
--#define SC_VBA_SPINBUTTON_HXX
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/msforms/XSpinButton.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--
--typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XSpinButton > SpinButtonImpl_BASE;
--
--class ScVbaSpinButton : public SpinButtonImpl_BASE
--{
--public:
--    ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
--   // Attributes
--    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--    virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
--    virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
--
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--#endif //SC_VBA_SPINBUTTON_HXX
---- sc/source/ui/vba/vbastyles.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbastyles.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -29,6 +29,7 @@
-  ************************************************************************/
- #include "vbastyles.hxx"
- #include "vbastyle.hxx"
-+#include <ooo/vba/excel/XRange.hpp>
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
---- sc/source/ui/vba/vbastyles.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbastyles.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -31,7 +31,7 @@
- #define SC_VBA_STYLES_HXX
- #include <ooo/vba/excel/XStyles.hpp>
- #include <com/sun/star/container/XNameContainer.hpp>
--#include "vbacollectionimpl.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
- 
- typedef CollTestImplHelper< ov::excel::XStyles > ScVbaStyles_BASE;
- class ScVbaStyles: public ScVbaStyles_BASE
---- sc/source/ui/vba/vbatextbox.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbatextbox.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,137 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbatextbox.cxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include <com/sun/star/text/XTextRange.hpp>
--
--#include "vbatextbox.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--
--ScVbaTextBox::ScVbaTextBox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialog ) : TextBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialog( bDialog )
--{
--}
--
--// Attributes
--uno::Any SAL_CALL 
--ScVbaTextBox::getValue() throw (css::uno::RuntimeException)
--{
--	return uno::makeAny( getText() );
--}
--
--void SAL_CALL 
--ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
--{
--	rtl::OUString sVal = getAnyAsString( _value );
--	setText( sVal );
--}
--
--//getString() will cause some imfo lose.
--rtl::OUString SAL_CALL 
--ScVbaTextBox::getText() throw (css::uno::RuntimeException)
--{
--    uno::Any aValue;
--    aValue = m_xProps->getPropertyValue
--            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ) ) );
--    rtl::OUString sString;
--    aValue >>= sString;
--    return sString;
--}
--
--void SAL_CALL 
--ScVbaTextBox::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException)
--{
--    if ( !mbDialog )
--    {
--    uno::Reference< text::XTextRange > xTextRange( m_xProps, uno::UNO_QUERY_THROW );
--    xTextRange->setString( _text );
--}
--    else
--        m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text") ), uno::makeAny( _text ) ); 
--}
--
--sal_Int32 SAL_CALL 
--ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException)
--{
--    uno::Any aValue;
--    aValue = m_xProps->getPropertyValue
--            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ) );
--    sal_Int32 nMaxLength = 0;
--    aValue >>= nMaxLength;
--    return nMaxLength;
--}
--
--void SAL_CALL 
--ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException)
--{
--    uno::Any aValue( _maxlength );
--    m_xProps->setPropertyValue
--            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ), aValue);
--}
--
--sal_Bool SAL_CALL 
--ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException)
--{
--    uno::Any aValue;
--    aValue = m_xProps->getPropertyValue
--            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ) );
--    sal_Bool bRet = false;
--    aValue >>= bRet;
--    return bRet;
--}
--
--void SAL_CALL 
--ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException)
--{
--    uno::Any aValue( _multiline );
--    m_xProps->setPropertyValue
--            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ), aValue);
--}
--
--rtl::OUString& 
--ScVbaTextBox::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaTextBox") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaTextBox::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.TextBox" ) );
--	}
--	return aServiceNames;
--}
---- sc/source/ui/vba/vbatextbox.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbatextbox.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,57 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbatextbox.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_TEXTBOX_HXX
--#define SC_VBA_TEXTBOX_HXX
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/msforms/XTextBox.hpp>
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--
--typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XTextBox > TextBoxImpl_BASE;
--
--class ScVbaTextBox : public TextBoxImpl_BASE
--{
--    bool mbDialog;
--public:
--    ScVbaTextBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialog = false );
--   // Attributes
--    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--    virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getMaxLength() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException);
--    virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException);
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--#endif //SC_VBA_TEXTBOX_HXX
---- sc/source/ui/vba/vbatextboxshape.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbatextboxshape.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -62,7 +62,7 @@ ScVbaTextBoxShape::setText( const rtl::O
- uno::Reference< excel::XCharacters > SAL_CALL 
- ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException)
- {
--    ScDocShell* pDocShell = getDocShell( m_xModel );
-+    ScDocShell* pDocShell = excel::getDocShell( m_xModel );
-     ScDocument* pDoc = pDocShell ? pDocShell->GetDocument() : NULL;
- 
-     if ( !pDoc )
---- sc/source/ui/vba/vbatextboxshape.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbatextboxshape.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -38,7 +38,7 @@
- #include <com/sun/star/text/XTextRange.hpp>
- #include <ooo/vba/msforms/XTextBoxShape.hpp>
- #include "vbashape.hxx"
--#include "vbahelper.hxx"
-+#include "excelvbahelper.hxx"
- #include "vbacharacters.hxx"
- 
- typedef cppu::ImplInheritanceHelper1< ScVbaShape, ov::msforms::XTextBoxShape > TextBoxShapeImpl_BASE;
---- sc/source/ui/vba/vbatextframe.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbatextframe.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -34,7 +34,7 @@
- #include <ooo/vba/excel/XCharacters.hpp>
- #include <ooo/vba/excel/XTextFrame.hpp>
- 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- #include "vbapalette.hxx"
- 
- typedef InheritedHelperInterfaceImpl1< ov::excel::XTextFrame > ScVbaTextFrame_BASE;
---- sc/source/ui/vba/vbatitle.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbatitle.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -30,14 +30,15 @@
- #ifndef SC_VBA_TITLE_HXX
- #define SC_VBA_TITLE_HXX
- 
--#include "vbahelperinterface.hxx"
--#include "vbahelper.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include "excelvbahelper.hxx"
- #include "vbainterior.hxx"
- #include "vbafont.hxx"
- #include "vbapalette.hxx"
- #include <com/sun/star/drawing/XShape.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <ooo/vba/excel/XTitle.hpp>
-+#include <ooo/vba/excel/XCharacters.hpp>
- #include <basic/sberrors.hxx>
- #include <memory>
- 
---- sc/source/ui/vba/vbatogglebutton.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbatogglebutton.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,108 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include "vbatogglebutton.hxx"
--#include <vector>
--
--using namespace com::sun::star;
--using namespace ooo::vba;
--
--
--const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
--const static rtl::OUString TOGGLE( RTL_CONSTASCII_USTRINGPARAM("Toggle") );
--const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
--ScVbaToggleButton::ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : ToggleButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
--{
--    OSL_TRACE("ScVbaToggleButton(ctor)");
--    m_xProps->setPropertyValue( TOGGLE, uno::makeAny( sal_True ) );
--}
--
--ScVbaToggleButton::~ScVbaToggleButton()
--{
--    OSL_TRACE("~ScVbaToggleButton(dtor)");
--}
--
--// Attributes
--rtl::OUString SAL_CALL 
--ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException)
--{
--    rtl::OUString Label;
--    m_xProps->getPropertyValue( LABEL ) >>= Label;
--    return Label;
--}
--
--void SAL_CALL 
--ScVbaToggleButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
--}
--
--uno::Any SAL_CALL 
--ScVbaToggleButton::getValue() throw (uno::RuntimeException)
--{
--	sal_Int16 nState = 0;
--    	m_xProps->getPropertyValue( STATE ) >>= nState;
-- 	return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) );
--}
--
--void SAL_CALL 
--ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
--{
--	sal_Int16 nState = 0;
--	_value >>= nState;
--        OSL_TRACE( "nState - %d", nState );
--	nState = ( nState == -1 ) ?  1 : 0;
--        OSL_TRACE( "nState - %d", nState );
--	m_xProps->setPropertyValue( STATE, uno::makeAny(  nState ) );
--}
--
--rtl::OUString& 
--ScVbaToggleButton::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaToggleButton") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaToggleButton::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ToggleButton" ) );
--	}
--	return aServiceNames;
--}
--
---- sc/source/ui/vba/vbatogglebutton.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbatogglebutton.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,63 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_TOGGLEBUTTON_HXX
--#define SC_VBA_TOGGLEBUTTON_HXX
--#include <cppuhelper/implbase2.hxx>
--#include <ooo/vba/msforms/XToggleButton.hpp>
--
--#include "vbacontrol.hxx"
--#include "vbahelper.hxx"
--
--typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XToggleButton, css::script::XDefaultProperty  > ToggleButtonImpl_BASE;
--
--class ScVbaToggleButton : public ToggleButtonImpl_BASE
--{
--	rtl::OUString msDftPropName;
--public:
--    ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
--    ~ScVbaToggleButton();
--   // Attributes
--    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
--
--    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--    // XDefaultProperty
--    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
--};
--#endif //SC_VBA_TOGGLEBUTTON_HXX
---- sc/source/ui/vba/vbauserform.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbauserform.cxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,228 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#include "helperdecl.hxx"
--#include "vbauserform.hxx"
--#include <com/sun/star/awt/XControl.hpp>
--#include <com/sun/star/awt/XControlContainer.hpp>
--#include <com/sun/star/beans/PropertyConcept.hpp>
--#include <basic/sbx.hxx>
--#include <basic/sbstar.hxx>
--#include <basic/sbmeth.hxx>
--#include "unonames.hxx"
--#include "vbacontrols.hxx"
--
--using namespace ::ooo::vba;
--using namespace ::com::sun::star;
--
--// some little notes
--// XDialog implementation has the following interesting bits
--// a Controls property ( which is an array of the container controls )
--//   each item in the controls array is a XControl, where the model is 
--//   basically a property bag
--// additionally the XDialog instance has itself a model
--//     this model has a ControlModels ( array of models ) property
--//     the models in ControlModels can be accessed by name
--// also the XDialog is a XControl ( to access the model above
--
--ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) throw ( lang::IllegalArgumentException ) :  ScVbaUserForm_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext, getXSomethingFromArgs< uno::XInterface >( aArgs, 1 ), getXSomethingFromArgs< frame::XModel >( aArgs, 2 ), static_cast< ooo::vba::AbstractGeometryAttributes* >(0) ), m_pDocShell( 0 ), mbDispose( true )
--{
--    m_xDialog.set( m_xControl, uno::UNO_QUERY_THROW );
--    uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW );
--    m_pDocShell = getDocShell( m_xModel );
--    m_xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW );
--    setGeometryHelper( new UserFormGeometryHelper( xContext, xControl ) );
--}
--
--ScVbaUserForm::~ScVbaUserForm()
--{
--}
--
--void SAL_CALL 
--ScVbaUserForm::Show(  ) throw (uno::RuntimeException)
--{
--	OSL_TRACE("ScVbaUserForm::Show(  )");
--	short aRet = 0;
--	if ( m_xDialog.is() )
--		aRet = m_xDialog->execute();
--	OSL_TRACE("ScVbaUserForm::Show() execute returned %d", aRet);
--	if ( mbDispose )
--	{
--		try
--		{
--			uno::Reference< lang::XComponent > xComp( m_xDialog, uno::UNO_QUERY_THROW );
--			m_xDialog = NULL;
--			xComp->dispose();
--			mbDispose = false; 
--		}
--		catch( uno::Exception& )
--		{
--		}
--	}
--}
--
--rtl::OUString SAL_CALL 
--ScVbaUserForm::getCaption() throw (::com::sun::star::uno::RuntimeException)
--{
--    rtl::OUString sCaption;
--    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ) ) >>= sCaption;
--    return sCaption;
--}
--void
--ScVbaUserForm::setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
--{
--    m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ), uno::makeAny( _caption ) );
--}
--
--void SAL_CALL 
--ScVbaUserForm::Hide(  ) throw (uno::RuntimeException)
--{
--	mbDispose = false;  // hide not dispose
--	if ( m_xDialog.is() )
--		m_xDialog->endExecute();
--}
--
--void SAL_CALL 
--ScVbaUserForm::RePaint(  ) throw (uno::RuntimeException)
--{
--	// do nothing
--}
--
--void SAL_CALL 
--ScVbaUserForm::UnloadObject(  ) throw (uno::RuntimeException)
--{
--	mbDispose = true;
--	if ( m_xDialog.is() )
--		m_xDialog->endExecute();
--}
--
--rtl::OUString& 
--ScVbaUserForm::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaUserForm") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaUserForm::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.UserForm" ) );
--	}
--	return aServiceNames;
--}
--
--uno::Reference< beans::XIntrospectionAccess > SAL_CALL 
--ScVbaUserForm::getIntrospection(  ) throw (uno::RuntimeException)
--{
--	return uno::Reference< beans::XIntrospectionAccess >();
--}
--
--uno::Any SAL_CALL 
--ScVbaUserForm::invoke( const ::rtl::OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
--{
--	throw uno::RuntimeException(); // unsupported operation
--}
--
--void SAL_CALL 
--ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
--{
--	uno::Any aObject = getValue( aPropertyName );
--	// The Object *must* support XDefaultProperty here because getValue will
--	// only return properties that are Objects ( e.g. controls )
--	// e.g. Userform1.aControl = something
--	// 'aControl' has to support XDefaultProperty to make sense here
--	uno::Reference< script::XDefaultProperty > xDfltProp( aObject, uno::UNO_QUERY_THROW );
--	rtl::OUString aDfltPropName = xDfltProp->getDefaultPropertyName();
--	uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObject ) );
--	uno::Reference< beans::XPropertySet > xPropSet( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY_THROW );
--	xPropSet->setPropertyValue( aDfltPropName, aValue );
--}
--
--uno::Any SAL_CALL 
--ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
--{
--	uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
--	uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
--	uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
--	ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
--        uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
--        ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
--        pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
--	return uno::makeAny( xVBAControl );
--}
--
--::sal_Bool SAL_CALL 
--ScVbaUserForm::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException)
--{
--	return sal_False;
--}
--uno::Any SAL_CALL 
--ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException)
--{
--	uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
--	uno::Reference< XCollection > xControls( new ScVbaControls( this, mxContext, xDialogControl ) );
--	if ( index.hasValue() )
--		return uno::makeAny( xControls->Item( index, uno::Any() ) );
--	return uno::makeAny( xControls );
--}
--
--::sal_Bool SAL_CALL 
--ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
--{
--	uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY );
--	OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is() );
--	if ( xControl.is() )
--	{
--		uno::Reference< container::XNameAccess > xNameAccess( xControl->getModel(), uno::UNO_QUERY_THROW );	
--		sal_Bool bRes =  xNameAccess->hasByName( aName );
--	OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d ---> %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is(), bRes );
--		return bRes;
--	}
--	return sal_False;
--}
--
--namespace userform
--{
--namespace sdecl = comphelper::service_decl;
--sdecl::vba_service_class_<ScVbaUserForm, sdecl::with_args<true> > serviceImpl;
--extern sdecl::ServiceDecl const serviceDecl(
--    serviceImpl,
--    "ScVbaUserForm",
--    "ooo.vba.excel.UserForm" );
--}
--
---- sc/source/ui/vba/vbauserform.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbauserform.hxx	1970-01-01 00:00:00.000000000 +0000
-@@ -1,78 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile$
-- *
-- *  $Revision$
-- *
-- *  last change: $Author$ $Date$
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--#ifndef SC_VBA_USERFORM_HXX
--#define SC_VBA_USERFORM_HXX
--
--#include <cppuhelper/implbase1.hxx>
--#include <ooo/vba/msforms/XUserForm.hpp>
--#include <com/sun/star/awt/XDialog.hpp>
--#include <com/sun/star/frame/XModel.hpp>
--
--#include "vbahelperinterface.hxx"
--#include "vbacontrol.hxx"
--
--//typedef InheritedHelperInterfaceImpl1< ov::msforms::XUserForm > ScVbaUserForm_BASE;
--typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XUserForm > ScVbaUserForm_BASE;
--
--class ScVbaUserForm : public ScVbaUserForm_BASE
--{
--private:
--    css::uno::Reference< css::awt::XDialog > m_xDialog;
--    ScDocShell* m_pDocShell;
--    bool mbDispose;
--protected:
--public:
--    ScVbaUserForm( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException );
--    virtual ~ScVbaUserForm();
--    // XUserForm
--    virtual void SAL_CALL RePaint(  ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL Show(  ) throw (css::uno::RuntimeException);
--    // XIntrospection
--    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
--    virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
--    virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
--    virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
--    virtual ::rtl::OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException);
--    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException);
--    virtual void SAL_CALL Hide(  ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL UnloadObject(  ) throw (css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) throw (css::uno::RuntimeException);
--    //XHelperInterface
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--};
--#endif
---- sc/source/ui/vba/vbavalidation.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbavalidation.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -33,7 +33,7 @@
- #include <com/sun/star/uno/XComponentContext.hpp>
- #include <ooo/vba/excel/XValidation.hpp>
- #include <com/sun/star/table/XCellRange.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
- 
- typedef InheritedHelperInterfaceImpl1<ov::excel::XValidation > ValidationImpl_BASE;
- 
---- sc/source/ui/vba/vbawindow.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbawindow.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -27,10 +27,11 @@
-  * for a copy of the LGPLv3 License.
-  *
-  ************************************************************************/
--#include "helperdecl.hxx"
-+#include <vbahelper/helperdecl.hxx>
- #include "vbawindow.hxx"
- #include "vbaworksheets.hxx"
- #include "vbaworksheet.hxx"
-+#include "vbaglobals.hxx"
- #include "vbapane.hxx"
- #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
- #include <com/sun/star/sheet/XSpreadsheet.hpp>
-@@ -118,7 +119,7 @@ public:
- 		ScDocShell* pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
- 		if ( !pDocShell )
- 			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain docshell" ) ), uno::Reference< uno::XInterface >() );
--		ScTabViewShell* pViewShell = getBestViewShell( m_xModel );
-+		ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
- 		if ( !pViewShell )
- 			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() );
- 			
-@@ -202,14 +203,13 @@ public:
- 
- };
- 
--ScVbaWindow::ScVbaWindow( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowImpl_BASE( xParent, xContext ), m_xModel( xModel ) 
-+ScVbaWindow::ScVbaWindow( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowImpl_BASE( xParent, xContext, xModel )
- {
-     init();
- }
- 
- ScVbaWindow::ScVbaWindow( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext )  
--        : WindowImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ),
--          m_xModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) )
-+        : WindowImpl_BASE( args, xContext )
- {
-     init();
- }
-@@ -306,8 +306,7 @@ ScVbaWindow::getCaption() throw (uno::Ru
- 		if ( ( nCrudLen + nCrudIndex ) == sTitle.getLength() )
- 		{
- 			sTitle = sTitle.copy( 0, nCrudIndex );
--            uno::Reference< ov::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5
--			ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
-+			ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
- 			rtl::OUString sName = workbook.getName();
- 			// rather bizare hack to make sure the name behavior
- 			// is like XL
-@@ -343,7 +342,7 @@ uno::Any SAL_CALL
- ScVbaWindow::getScrollRow() throw (uno::RuntimeException)
- {	
-     sal_Int32 nValue = 0;
--    ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
-+    ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
- 	if ( pViewShell )
- 	{
- 	    ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart();
-@@ -356,7 +355,7 @@ ScVbaWindow::getScrollRow() throw (uno::
- void SAL_CALL 
- ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeException)
- {
--	ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
-+	ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
- 	if ( pViewShell )
- 	{
- 		sal_Int32 scrollRow = 0;	
-@@ -371,7 +370,7 @@ uno::Any SAL_CALL
- ScVbaWindow::getScrollColumn() throw (uno::RuntimeException)
- {	
-     sal_Int32 nValue = 0;
--    ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
-+    ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
- 	if ( pViewShell )
- 	{
- 	    ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart();
-@@ -384,7 +383,7 @@ ScVbaWindow::getScrollColumn() throw (un
- void SAL_CALL 
- ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::RuntimeException)
- {
--	ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
-+	ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
- 	if ( pViewShell )
- 	{
- 		sal_Int32 scrollColumn = 0;	
-@@ -399,7 +398,7 @@ uno::Any SAL_CALL
- ScVbaWindow::getWindowState() throw (uno::RuntimeException)
- {	
-     sal_Int32 nwindowState = xlNormal;
--    ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
-+    ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
-     SfxViewFrame* pViewFrame = pViewShell -> GetViewFrame();
- 	SfxTopViewFrame *pTop= PTR_CAST( SfxTopViewFrame, pViewFrame -> GetTopViewFrame() );
- 	if ( pTop )
-@@ -421,7 +420,7 @@ ScVbaWindow::setWindowState( const uno::
- {
- 	sal_Int32 nwindowState = xlMaximized;
- 	_windowstate >>= nwindowState;
--	ScTabViewShell* pViewShell = getBestViewShell( m_xModel );	
-+	ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );	
- 	SfxViewFrame* pViewFrame = pViewShell -> GetViewFrame();
- 	SfxTopViewFrame *pTop= PTR_CAST( SfxTopViewFrame, pViewFrame -> GetTopViewFrame() );
- 	if ( pTop )
-@@ -444,8 +443,7 @@ ScVbaWindow::setWindowState( const uno::
- void
- ScVbaWindow::Activate() throw (css::uno::RuntimeException)
- {
--    uno::Reference< ov::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5
--	ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
-+	ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
- 
- 	workbook.Activate();
- }
-@@ -453,8 +451,7 @@ ScVbaWindow::Activate() throw (css::uno:
- void
- ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook ) throw (uno::RuntimeException)
- {
--    uno::Reference< ov::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5
--	ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
-+	ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
- 	workbook.Close(SaveChanges, FileName, RouteWorkBook );
- }
- 
-@@ -467,13 +464,15 @@ ScVbaWindow::ActivePane() throw (script:
- uno::Reference< excel::XRange > SAL_CALL 
- ScVbaWindow::ActiveCell(  ) throw (script::BasicErrorException, uno::RuntimeException)
- {
--	return ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication()->getActiveCell();
-+	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
-+	return xApplication->getActiveCell();
- }
- 
- uno::Any SAL_CALL 
- ScVbaWindow::Selection(  ) throw (script::BasicErrorException, uno::RuntimeException)
- {
--	return ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication()->getSelection();
-+	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
-+	return xApplication->getSelection();
- }
- 
- ::sal_Bool SAL_CALL 
-@@ -759,7 +758,8 @@ ScVbaWindow::setZoom( const uno::Any& _z
- uno::Reference< excel::XWorksheet > SAL_CALL 
- ScVbaWindow::ActiveSheet(  ) throw (script::BasicErrorException, uno::RuntimeException)
- {
--	return ScVbaGlobals::getGlobalsImpl(mxContext)->getApplication()->getActiveSheet();
-+	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
-+	return xApplication->getActiveSheet();
- }
- 
- uno::Any SAL_CALL
-@@ -787,121 +787,9 @@ ScVbaWindow::setView( const uno::Any& _v
- 		default:
- 			DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
- 	}
--	dispatchExecute( m_xModel, nSlot );
--}
--
--sal_Bool SAL_CALL
--ScVbaWindow::getVisible() throw (uno::RuntimeException)
--{
--	sal_Bool bVisible = sal_True;	
--	uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
--	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
--	uno::Reference< css::awt::XWindow2 > xWindow2 (xWindow, uno::UNO_QUERY_THROW );
--	if( xWindow2.is() )
--	{
--		bVisible = xWindow2->isVisible();	
--	}
--	return bVisible;
--}
--
--void SAL_CALL
--ScVbaWindow::setVisible(sal_Bool _visible) throw (uno::RuntimeException)
--{
--	uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
--	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
--	if( xWindow.is() )
--	{
--		xWindow->setVisible( _visible );	
--	}
--}
--
--css::awt::Rectangle getPosSize( const uno::Reference< frame::XModel >& xModel )
--{
--	css::awt::Rectangle aRect;
--	uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
--	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
--	if( xWindow.is() )
--	{
--		aRect = xWindow->getPosSize();
--	}
--	return aRect;
--}
--
--void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, USHORT nFlag )
--{
--	uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
--	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
--	if( xWindow.is() )
--	{
--		css::awt::Rectangle aRect = xWindow->getPosSize();
--		switch( nFlag )
--		{
--			case css::awt::PosSize::X:
--				xWindow->setPosSize( nValue, aRect.Y,	0, 0, css::awt::PosSize::X );
--				break;
--			case css::awt::PosSize::Y:
--				xWindow->setPosSize( aRect.X, nValue,	0, 0, css::awt::PosSize::Y );
--				break;
--			case css::awt::PosSize::WIDTH:
--				xWindow->setPosSize( 0, 0,	nValue, aRect.Height, css::awt::PosSize::WIDTH );
--				break;
--			case css::awt::PosSize::HEIGHT:
--				xWindow->setPosSize( 0, 0,	aRect.Width, nValue, css::awt::PosSize::HEIGHT );
--				break;
--			default:
--				break;
--		}
--	}
--}	
--
--sal_Int32 SAL_CALL 
--ScVbaWindow::getHeight() throw (uno::RuntimeException)
--{
--	css::awt::Rectangle aRect = getPosSize(m_xModel);
--	return aRect.Height;
--}
--
--void SAL_CALL 
--ScVbaWindow::setHeight( sal_Int32 _height ) throw (uno::RuntimeException)
--{
--	setPosSize(m_xModel, _height, css::awt::PosSize::HEIGHT);
--}
--
--sal_Int32 SAL_CALL 
--ScVbaWindow::getLeft() throw (uno::RuntimeException)
--{
--	css::awt::Rectangle aRect = getPosSize(m_xModel);
--	return aRect.X;
--}
--
--void SAL_CALL 
--ScVbaWindow::setLeft( sal_Int32 _left ) throw (uno::RuntimeException)
--{
--	setPosSize(m_xModel, _left, css::awt::PosSize::X);
--}
--sal_Int32 SAL_CALL 
--ScVbaWindow::getTop() throw (uno::RuntimeException)
--{
--	css::awt::Rectangle aRect = getPosSize(m_xModel);
--	return aRect.Y;
--}
--
--void SAL_CALL 
--ScVbaWindow::setTop( sal_Int32 _top ) throw (uno::RuntimeException)
--{
--	setPosSize(m_xModel, _top, css::awt::PosSize::Y);
--}
--sal_Int32 SAL_CALL 
--ScVbaWindow::getWidth() throw (uno::RuntimeException)
--{
--	css::awt::Rectangle aRect = getPosSize(m_xModel);
--	return aRect.Width;
--}
--
--void SAL_CALL 
--ScVbaWindow::setWidth( sal_Int32 _width ) throw (uno::RuntimeException)
--{
--	setPosSize(m_xModel, _width, css::awt::PosSize::WIDTH);
-+	ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
-+	if ( pViewShell )
-+		dispatchExecute( pViewShell, nSlot );
- }
- 
- sal_Int32 SAL_CALL 
-@@ -924,14 +812,14 @@ void SAL_CALL
- ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
- {
- 	// need test, print current active sheet	
--	PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, m_xModel, sal_True );
-+	PrintOutHelper( excel::getBestViewShell( m_xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, sal_True );
- }
- 
- void SAL_CALL 
- ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
- {
- 	// need test, print preview current active sheet	
--	PrintPreviewHelper( EnableChanges, m_xModel );	
-+	PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) );	
- }
- 
- rtl::OUString& 
---- sc/source/ui/vba/vbawindow.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbawindow.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -39,15 +39,16 @@
- #include <ooo/vba/excel/XPane.hpp>
- #include <com/sun/star/awt/XDevice.hpp>
- 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbawindowbase.hxx>
- #include "vbaworkbook.hxx"
- 
--typedef InheritedHelperInterfaceImpl1<ov::excel::XWindow > WindowImpl_BASE;
-+//typedef InheritedHelperInterfaceImpl1<ov::excel::XWindow > WindowImpl_BASE;
-+typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::excel::XWindow > WindowImpl_BASE;
- 
- class ScVbaWindow : public WindowImpl_BASE
- {		
- private:		
--	css::uno::Reference< css::frame::XModel > m_xModel;
- 	css::uno::Reference< css::sheet::XViewPane > m_xViewPane;
- 	css::uno::Reference< css::sheet::XViewFreezable > m_xViewFreezable;
- 	css::uno::Reference< css::sheet::XViewSplitable > m_xViewSplitable;
-@@ -82,10 +83,6 @@ public:
- 	virtual void SAL_CALL setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (css::uno::RuntimeException);
- 	virtual ::sal_Bool SAL_CALL getFreezePanes() throw (css::uno::RuntimeException);
- 	virtual void SAL_CALL setFreezePanes( ::sal_Bool _bFreezePanes ) throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException) ;
--    virtual void SAL_CALL setHeight( sal_Int32 _height ) throw (css::uno::RuntimeException) ;
--    virtual sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException) ;
--    virtual void SAL_CALL setLeft( sal_Int32 _left ) throw (css::uno::RuntimeException) ;
- 	virtual ::sal_Bool SAL_CALL getSplit() throw (css::uno::RuntimeException);
- 	virtual void SAL_CALL setSplit( ::sal_Bool _bSplit ) throw (css::uno::RuntimeException);
-     virtual sal_Int32 SAL_CALL getSplitColumn() throw (css::uno::RuntimeException) ;
-@@ -100,14 +97,8 @@ public:
-     virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) throw (css::uno::RuntimeException) ;
-     virtual css::uno::Any SAL_CALL getScrollColumn() throw (css::uno::RuntimeException) ;
-     virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) throw (css::uno::RuntimeException) ;
--    virtual sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException) ;
--    virtual void SAL_CALL setTop( sal_Int32 _top ) throw (css::uno::RuntimeException) ;
-     virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException);
--    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException) ;
--    virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException) ;
-     virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException);
---- sc/source/ui/vba/vbawindows.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbawindows.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -37,6 +37,7 @@
- 
- #include <tools/urlobj.hxx>
- #include "vbawindow.hxx"
-+#include "vbaglobals.hxx"
- //#include "vbaworkbook.hxx"
- 
- using namespace ::com::sun::star;
-@@ -47,15 +48,15 @@ sal_Int32, ::rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > NameIndexHash;
- 
- 
--uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext )
-+uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication )
- {
--	return new ScVbaWorkbook( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext,  xModel );
-+	return new ScVbaWorkbook( uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext,  xModel );
- }
- 
--uno::Any ComponentToWindow( const uno::Any& aSource, uno::Reference< uno::XComponentContext > & xContext )
-+uno::Any ComponentToWindow( const uno::Any& aSource, uno::Reference< uno::XComponentContext > & xContext, const uno::Any& aApplication )
- {
- 	uno::Reference< frame::XModel > xModel( aSource, uno::UNO_QUERY_THROW );
--	uno::Reference< excel::XWindow > xWin( new ScVbaWindow( lcl_createWorkbookHIParent( xModel, xContext ), xContext,xModel ) );
-+	uno::Reference< excel::XWindow > xWin( new ScVbaWindow( lcl_createWorkbookHIParent( xModel, xContext, aApplication ), xContext,xModel ) );
- 	return uno::makeAny( xWin );
- }
- 
-@@ -108,12 +109,13 @@ public:
- 
- class WindowEnumImpl : public  WindowComponentEnumImpl
- {
-+	uno::Any m_aApplication;
- public:
--	WindowEnumImpl(const uno::Reference< uno::XComponentContext >& xContext, const Components& components ):WindowComponentEnumImpl( xContext, components ) {}
--	WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ): WindowComponentEnumImpl( xContext ) {}
-+	WindowEnumImpl(const uno::Reference< uno::XComponentContext >& xContext, const Components& components, const uno::Any& aApplication ):WindowComponentEnumImpl( xContext, components ), m_aApplication( aApplication ){}
-+	WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext,  const uno::Any& aApplication ): WindowComponentEnumImpl( xContext ), m_aApplication( aApplication ) {}
- 	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- 	{
--		return ComponentToWindow( WindowComponentEnumImpl::nextElement(), m_xContext );
-+		return ComponentToWindow( WindowComponentEnumImpl::nextElement(), m_xContext, m_aApplication );
- 	}
- };
- 
-@@ -212,16 +214,19 @@ ScVbaWindows::ScVbaWindows( const uno::R
- {
- }
- 
-+ScVbaWindows::ScVbaWindows( const uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : ScVbaWindows_BASE( xParent, xContext, uno::Reference< container::XIndexAccess > ( new WindowsAccessImpl( xContext ) ) )
-+{
-+}
- uno::Reference< container::XEnumeration >
- ScVbaWindows::createEnumeration() throw (uno::RuntimeException)
- {
--	return new WindowEnumImpl( mxContext );
-+	return new WindowEnumImpl( mxContext, Application() );
- }
- 
- uno::Any
- ScVbaWindows::createCollectionObject( const css::uno::Any& aSource )
- {
--	return ComponentToWindow( aSource,  mxContext );
-+	return ComponentToWindow( aSource,  mxContext, Application() );
- }
- 
- uno::Type 
-@@ -230,12 +235,6 @@ ScVbaWindows::getElementType() throw (un
- 	return excel::XWindows::static_type(0);
- }
- 
--uno::Reference< XCollection >
--ScVbaWindows::Windows( const css::uno::Reference< css::uno::XComponentContext >& xContext )
--{
--	uno::Reference< container::XIndexAccess > xIndex( new WindowsAccessImpl( xContext ) );
--	return  new ScVbaWindows( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext , xIndex );	
--}
- 
- void SAL_CALL 
- ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) throw (uno::RuntimeException)
---- sc/source/ui/vba/vbawindows.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbawindows.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -35,8 +35,8 @@
- 
- #include <com/sun/star/uno/XComponentContext.hpp>
-  
--#include "vbahelper.hxx"
--#include "vbacollectionimpl.hxx"
-+#include "excelvbahelper.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
- 
- 
- typedef CollTestImplHelper< ov::excel::XWindows > ScVbaWindows_BASE;
-@@ -45,6 +45,7 @@ class ScVbaWindows : public ScVbaWindows
- {
- public:
- 	ScVbaWindows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess );
-+	ScVbaWindows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext );
- 	virtual ~ScVbaWindows() {}
- 
- 	// XEnumerationAccess
-@@ -57,8 +58,6 @@ public:
- 	// ScVbaCollectionBaseImpl	
- 	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
- 
--	static css::uno::Reference< ov::XCollection > Windows(  const css::uno::Reference< css::uno::XComponentContext >& xContext );
--
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
---- sc/source/ui/vba/vbaworkbook.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaworkbook.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -27,7 +27,7 @@
-  * for a copy of the LGPLv3 License.
-  *
-  ************************************************************************/
--#include "helperdecl.hxx"
-+#include <vbahelper/helperdecl.hxx>
- #include <tools/urlobj.hxx>
- #include <comphelper/unwrapargs.hxx>
- 
-@@ -46,7 +46,7 @@
- #include "vbaworkbook.hxx"
- #include "vbawindows.hxx"
- #include "vbastyles.hxx"
--#include "vbahelper.hxx"
-+#include "excelvbahelper.hxx"
- #include "vbapalette.hxx"
- #include <osl/file.hxx>
- #include <stdio.h>
-@@ -192,7 +192,7 @@ ScVbaWorkbook::init()
- 	if ( !ColorData.getLength() )
- 		ResetColors();
- }
--ScVbaWorkbook::ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext) :ScVbaWorkbook_BASE( xParent, xContext ), mxModel(NULL)
-+ScVbaWorkbook::ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext) :ScVbaWorkbook_BASE( xParent, xContext )
- {
- 	//#FIXME this persists the color data per office instance and
- 	// not per workbook instance, need to hook the data into XModel
-@@ -203,54 +203,18 @@ ScVbaWorkbook::ScVbaWorkbook( 	const css
- 	init();
- }
- 
--ScVbaWorkbook::ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ) : ScVbaWorkbook_BASE( xParent, xContext ),  mxModel( xModel ) 
-+ScVbaWorkbook::ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ) : ScVbaWorkbook_BASE( xParent, xContext, xModel )
- { 
- 	init();
- }
- 
- ScVbaWorkbook::ScVbaWorkbook( uno::Sequence< uno::Any> const & args,
--    uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaWorkbook_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ),  mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ) 
-+    uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaWorkbook_BASE( args, xContext )
- 
- {
- 	init();
- }
- 
--::rtl::OUString
--ScVbaWorkbook::getName() throw (uno::RuntimeException)
--{
--	rtl::OUString sName = getModel()->getURL();
--	if ( sName.getLength() )
--	{
--
--		INetURLObject aURL( getModel()->getURL() );
--		::osl::File::getSystemPathFromFileURL( aURL.GetLastName(), sName );
--	}
--	else
--	{
--		const static rtl::OUString sTitle( RTL_CONSTASCII_USTRINGPARAM("Title" ) );
--		// process "UntitledX - $(PRODUCTNAME)"
--		uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
--		uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
--		xProps->getPropertyValue(sTitle ) >>= sName;
--		sal_Int32 pos = 0;
--		sName = sName.getToken(0,' ',pos);	
--	}
--	return sName;
--}
--::rtl::OUString
--ScVbaWorkbook::getPath() throw (uno::RuntimeException)
--{
--	INetURLObject aURL( getModel()->getURL() );
--	aURL.CutLastName();
--	return aURL.GetURLPath();
--}
--
--::rtl::OUString
--ScVbaWorkbook::getFullName() throw (uno::RuntimeException)
--{
--	INetURLObject aURL( getModel()->getURL() );
--	return aURL.GetURLPath();
--}
- uno::Reference< excel::XWorksheet >
- ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException)
- {
-@@ -281,91 +245,19 @@ ScVbaWorkbook::Worksheets( const uno::An
- uno::Any SAL_CALL
- ScVbaWorkbook::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException)
- {
--	uno::Reference< XCollection >  xWindows = ScVbaWindows::Windows( mxContext );
-+
-+	uno::Reference< excel::XWindows >  xWindows( new ScVbaWindows( getParent(), mxContext ) );
- 	if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
- 		return uno::Any( xWindows );
- 	return uno::Any( xWindows->Item( aIndex, uno::Any() ) );
- }
--void
--ScVbaWorkbook::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
--					  const uno::Any &rRouteArg ) throw (uno::RuntimeException)
--{
--	sal_Bool bSaveChanges = sal_False;
--	rtl::OUString aFileName;
--	sal_Bool bRouteWorkbook = sal_True;
--
--	rSaveArg >>= bSaveChanges;
--	sal_Bool bFileName =  ( rFileArg >>= aFileName );
--	rRouteArg >>= bRouteWorkbook;
--	uno::Reference< frame::XStorable > xStorable( getModel(), uno::UNO_QUERY_THROW );
--	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
--
--	if( bSaveChanges )
--	{
--		if( xStorable->isReadonly() )
--		{	
--			throw uno::RuntimeException(::rtl::OUString( 
--				RTL_CONSTASCII_USTRINGPARAM( "Unable to save to a read only file ") ),
--                        	uno::Reference< XInterface >() );
--		}
--		if( bFileName )
--			xStorable->storeAsURL( aFileName, uno::Sequence< beans::PropertyValue >(0) ); 
--		else
--			xStorable->store();
--	}	
--	else
--		xModifiable->setModified( false );		
--
--	uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY );
- 
--	if( xCloseable.is() )
--		// use close(boolean DeliverOwnership)
--	
--		// The boolean parameter DeliverOwnership tells objects vetoing the close process that they may
--		// assume ownership if they object the closure by throwing a CloseVetoException
--		// Here we give up ownership. To be on the safe side, catch possible veto exception anyway.
--		xCloseable->close(sal_True);
--	// If close is not supported by this model - try to dispose it.
--	// But if the model disagree with a reset request for the modify state
--	// we shouldn't do so. Otherwhise some strange things can happen.
--	else
--	{
--		uno::Reference< lang::XComponent > xDisposable ( getCurrentDocument(), uno::UNO_QUERY );
--		if ( xDisposable.is() )
--			xDisposable->dispose();
--	}
--}
--
--void
--ScVbaWorkbook::Protect( const uno::Any &aPassword ) throw (uno::RuntimeException)
-+void SAL_CALL
-+ScVbaWorkbook::Activate() throw (uno::RuntimeException)
- {
--	rtl::OUString rPassword;
--	uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
--	SC_VBA_FIXME(("Workbook::Protect stub"));
--	if(  aPassword >>= rPassword )
--		xProt->protect( rPassword );
--	else
--		xProt->protect( rtl::OUString() );
-+    VbaDocumentBase::Activate();
- }
- 
--void 
--ScVbaWorkbook::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeException)
--{
--	rtl::OUString rPassword;
--	uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
--	if( !getProtectStructure() )
--		throw uno::RuntimeException(::rtl::OUString(
--			RTL_CONSTASCII_USTRINGPARAM( "File is already unprotected" ) ),
--			uno::Reference< XInterface >() );
--	else
--	{
--		if( aPassword >>= rPassword )
--			xProt->unprotect( rPassword );
--		else
--			xProt->unprotect( rtl::OUString() );
--	}
--}
--		
- ::sal_Bool
- ScVbaWorkbook::getProtectStructure() throw (uno::RuntimeException)
- {
-@@ -373,28 +265,6 @@ ScVbaWorkbook::getProtectStructure() thr
- 	return xProt->isProtected();
- }
- 
--void 
--ScVbaWorkbook::setSaved( sal_Bool bSave ) throw (uno::RuntimeException)
--{
--	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
--	xModifiable->setModified( bSave );
--}
--
--sal_Bool
--ScVbaWorkbook::getSaved() throw (uno::RuntimeException)
--{
--	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
--	return xModifiable->isModified();
--}
--
--void
--ScVbaWorkbook::Save() throw (uno::RuntimeException)
--{
--	rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));
--	uno::Reference< frame::XModel > xModel = getModel();
--	dispatchRequests(xModel,url);
--}
--
- void
- ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::RuntimeException)
- {
-@@ -407,13 +277,6 @@ ScVbaWorkbook::SaveCopyAs( const rtl::OU
- 	xStor->storeToURL( aURL, storeProps );
- }
- 
--void 
--ScVbaWorkbook::Activate() throw (uno::RuntimeException)
--{
--	uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
--	xFrame->activate();
--}	
--
- css::uno::Any SAL_CALL 
- ScVbaWorkbook::Styles( const::uno::Any& Item ) throw (uno::RuntimeException)
- {
-@@ -465,7 +328,7 @@ ScVbaWorkbook::getCodeName() throw (css:
- {
- #ifdef VBA_OOBUILD_HACK 
-     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
--    ScDocument* pDoc = getDocShell( xModel )->GetDocument();
-+    ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
-     ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
-     ScExtDocSettings pExtSettings = pExtOptions->GetDocSettings();
-     ::rtl::OUString sGlobCodeName = pExtSettings.maGlobCodeName;
-@@ -479,7 +342,7 @@ void SAL_CALL
- ScVbaWorkbook::setCodeName( const ::rtl::OUString& sGlobCodeName ) throw (css::uno::RuntimeException)
- {
-     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
--    ScDocument* pDoc = getDocShell( xModel )->GetDocument();
-+    ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
-     ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
-     ScExtDocSettings pExtSettings = pExtOptions->GetDocSettings();
-     pExtSettings.maGlobCodeName = sGlobCodeName;
---- sc/source/ui/vba/vbaworkbook.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaworkbook.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -32,21 +32,20 @@
- 
- #include <com/sun/star/frame/XModel.hpp>
- #include <ooo/vba/excel/XWorkbook.hpp>
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbadocumentbase.hxx>
- 
- class ScModelObj;
- 
--typedef InheritedHelperInterfaceImpl1< ov::excel::XWorkbook > ScVbaWorkbook_BASE;
-+typedef cppu::ImplInheritanceHelper1< VbaDocumentBase, ov::excel::XWorkbook > ScVbaWorkbook_BASE;
- 
- class ScVbaWorkbook : public ScVbaWorkbook_BASE
- {
--	css::uno::Reference< css::frame::XModel > mxModel;
- 	static css::uno::Sequence< sal_Int32 > ColorData;
- 	void initColorData( const css::uno::Sequence< sal_Int32 >& sColors );
- 	void init();
- protected:
- 
--	virtual css::uno::Reference< css::frame::XModel >  getModel() { return mxModel; }
- 	ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
- public:
- 	ScVbaWorkbook( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
-@@ -55,25 +54,14 @@ public:
- 	virtual ~ScVbaWorkbook() {}
- 
-     // Attributes
--	virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
--	virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
--	virtual ::rtl::OUString SAL_CALL getFullName() throw (css::uno::RuntimeException);
- 	virtual ::sal_Bool SAL_CALL getProtectStructure() throw (css::uno::RuntimeException);
- 	virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
--	virtual sal_Bool SAL_CALL getSaved() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException);
- 
- 	// Methods
- 	virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
--	virtual void SAL_CALL Close( const css::uno::Any &bSaveChanges,
--								 const css::uno::Any &aFileName,
--								 const css::uno::Any &bRouteWorkbook ) throw (css::uno::RuntimeException);
--	virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException);
--	virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException);
--	virtual void SAL_CALL Save() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
-     // Amelia Wang
-     virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- 
---- sc/source/ui/vba/vbaworkbooks.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaworkbooks.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -56,7 +56,7 @@
- #include "vbaglobals.hxx"
- #include "vbaworkbook.hxx"
- #include "vbaworkbooks.hxx"
--#include "vbahelper.hxx"
-+#include <vbahelper/vbahelper.hxx>
- 
- #include <hash_map>
- #include <osl/file.hxx>
-@@ -74,14 +74,14 @@ typedef std::vector < uno::Reference< sh
- typedef ::cppu::WeakImplHelper1< container::XEnumeration > SpreadSheetDocEnumImpl_BASE;
- 
- static uno::Any
--getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheetDocument > &xDoc )
-+getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheetDocument > &xDoc, const uno::Any& aApplication )
- {
- 	// FIXME: fine as long as ScVbaWorkbook is stateless ...
- 	uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY );
- 	if( !xModel.is() )
- 		return uno::Any();
- 	
--	ScVbaWorkbook *pWb = new ScVbaWorkbook(  uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext, xModel );
-+	ScVbaWorkbook *pWb = new ScVbaWorkbook(  uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext, xModel );
- 	return uno::Any( uno::Reference< excel::XWorkbook > (pWb) );
- }
- 
-@@ -134,13 +134,14 @@ public:
- 
- class WorkBookEnumImpl : public EnumerationHelperImpl
- {
-+	uno::Any m_aApplication;
- public:
--	WorkBookEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ){}
-+	WorkBookEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), m_aApplication( aApplication ) {}
- 
- 	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
- 	{ 
- 		uno::Reference< sheet::XSpreadsheetDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
--		return getWorkbook( m_xContext, xDoc );
-+		return getWorkbook( m_xContext, xDoc, m_aApplication );
- 	}
- 
- };
-@@ -254,14 +255,14 @@ ScVbaWorkbooks::createEnumeration() thro
- 	// the state of this object ( although it should ) would be 
- 	// safer to create an enumeration based on this objects state
- 	// rather than one effectively based of the desktop component
--	return new WorkBookEnumImpl( mxContext, uno::Reference< container::XEnumeration >( new SpreadSheetDocEnumImpl(mxContext) ) );
-+	return new WorkBookEnumImpl( mxContext, uno::Reference< container::XEnumeration >( new SpreadSheetDocEnumImpl(mxContext) ), Application() );
- }
- 
- uno::Any
- ScVbaWorkbooks::createCollectionObject( const css::uno::Any& aSource )
- {
- 	uno::Reference< sheet::XSpreadsheetDocument > xDoc( aSource, uno::UNO_QUERY );
--	return getWorkbook( mxContext, xDoc );
-+	return getWorkbook( mxContext, xDoc, Application() );
- }
- 
- 
-@@ -282,7 +283,7 @@ ScVbaWorkbooks::Add() throw (uno::Runtim
-     uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW );
-                                                                                                                              
-     if( xSpreadDoc.is() )
--        return getWorkbook( mxContext, xSpreadDoc );
-+        return getWorkbook( mxContext, xSpreadDoc, Application() );
-     return uno::Any();
- }
- 
-@@ -438,7 +439,7 @@ ScVbaWorkbooks::Open( const rtl::OUStrin
- 		frame::FrameSearchFlag::CREATE,
- 		sProps);
- 	uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW );
--	uno::Any aRet = getWorkbook( mxContext, xSpreadDoc );
-+	uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, Application() );
- 	uno::Reference< excel::XWorkbook > xWBook( aRet, uno::UNO_QUERY );
- 	if ( xWBook.is() )
- 		xWBook->Activate();
---- sc/source/ui/vba/vbaworkbooks.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaworkbooks.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -31,11 +31,10 @@
- #define SC_VBA_WORKBOOKS_HXX
- 
- 
--#include "vbacollectionimpl.hxx"
--#include <ooo/vba/XGlobals.hpp>
-+#include <vbahelper/vbacollectionimpl.hxx>
- #include <ooo/vba/excel/XWorkbooks.hpp>
- #include <com/sun/star/container/XEnumerationAccess.hpp>
--#include "vbahelper.hxx"
-+#include "excelvbahelper.hxx"
- 
- 
- class ScModelObj;
-@@ -45,7 +44,6 @@ typedef CollTestImplHelper< ov::excel::X
- class ScVbaWorkbooks : public ScVbaWorkbooks_BASE
- {
- private:
--	css::uno::Reference< ov::XGlobals > getGlobals() throw (css::uno::RuntimeException);
- 	rtl::OUString 	getFileFilterType( const rtl::OUString& rString );
- 	bool 	isTextFile( const rtl::OUString& rString );
- 	bool 	isSpreadSheetFile( const rtl::OUString& rString );
---- sc/source/ui/vba/vbaworksheet.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbaworksheet.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -27,7 +27,7 @@
-  * for a copy of the LGPLv3 License.
-  *
-  ************************************************************************/
--#include "helperdecl.hxx"
-+#include <vbahelper/helperdecl.hxx>
- #include <cppuhelper/queryinterface.hxx>
- 
- #include <com/sun/star/beans/XPropertySet.hpp>
-@@ -59,6 +59,7 @@
- #include <com/sun/star/form/FormComponentType.hpp>
- #include <com/sun/star/form/XFormsSupplier.hpp>
- #include <ooo/vba/excel/XlEnableSelection.hpp>
-+#include <ooo/vba/XControlProvider.hpp>
- 
- #include <comphelper/processfactory.hxx>
- 
-@@ -83,7 +84,6 @@
- #include "vbaworksheet.hxx"
- #include "vbachartobjects.hxx"
- #include "vbapivottables.hxx"
--#include "vbacombobox.hxx"
- #include "vbaoleobject.hxx"
- #include "vbaoleobjects.hxx"
- #include "vbashapes.hxx"
-@@ -268,7 +268,7 @@ ScVbaWorksheet::getEnableSelection() thr
-     if ( bSheetExists )
-     {
-         uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
--        ScDocument* pDoc = getDocShell( xModel )->GetDocument();
-+        ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
-         ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
- 		sal_Bool bLockedCells = sal_False;
- 		sal_Bool bUnlockedCells = sal_False;
-@@ -308,7 +308,7 @@ ScVbaWorksheet::setEnableSelection( sal_
-     if ( bSheetExists )
-     {
-         uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
--        ScDocument* pDoc = getDocShell( xModel )->GetDocument();
-+        ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
-         ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
-         // default is xlNoSelection
-         sal_Bool bLockedCells = sal_False;
-@@ -431,11 +431,11 @@ ScVbaWorksheet::Move( const uno::Any& Be
- 		uno::Reference<excel::XRange> xRange =  new ScVbaRange( this, mxContext, xRange1);
- 		if (xRange.is())
- 			xRange->Select();
--		implnCopy();
-+		excel::implnCopy();
- 		uno::Reference<frame::XModel> xModel = openNewDoc(aCurrSheetName);
- 		if (xModel.is()) 
- 		{
--			implnPaste();
-+			excel::implnPaste();
- 			Delete();
- 		}
- 		return ;
-@@ -469,11 +469,11 @@ ScVbaWorksheet::Copy( const uno::Any& Be
- 		uno::Reference<excel::XRange> xRange =  new ScVbaRange( this, mxContext, xRange1);
- 		if (xRange.is())
- 			xRange->Select();
--		implnCopy();
-+		excel::implnCopy();
- 		uno::Reference<frame::XModel> xModel = openNewDoc(aCurrSheetName);
- 		if (xModel.is())
- 		{
--			implnPaste();
-+			excel::implnPaste();
- 		}
- 		return;
- 	}
-@@ -502,7 +502,7 @@ ScVbaWorksheet::Paste( const uno::Any& D
- 	uno::Reference<excel::XRange> xRange( Destination, uno::UNO_QUERY );
- 	if ( xRange.is() )
- 		xRange->Select();
--	implnPaste();
-+	excel::implnPaste();
- }
- 
- void 
-@@ -713,7 +713,7 @@ ScVbaWorksheet::ShowDataForm( ) throw (u
- {
- #ifdef VBA_OOBUILD_HACK 
- 	uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
--	ScTabViewShell* pTabViewShell = getBestViewShell( xModel );
-+	ScTabViewShell* pTabViewShell = excel::getBestViewShell( xModel );
- 
- 	ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- 	DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
-@@ -762,9 +762,11 @@ uno::Any SAL_CALL
- ScVbaWorksheet::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
- {
-     uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW );
--    ScVbaControlFactory controlFactory( mxContext, xControlShape, getModel() );
--    uno::Reference< msforms::XControl > xControl( controlFactory.createControl( getModel() ) );
--	return uno::makeAny( xControl );
-+    
-+    uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+    uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
-+    uno::Reference< msforms::XControl > xControl( xControlProvider->createControl(  xControlShape, getModel() ) );
-+    return uno::makeAny( xControl );
- }
- 
- ::sal_Bool SAL_CALL 
-@@ -947,10 +949,9 @@ ScVbaWorksheet::PrintOut( const uno::Any
- 		bSelection = sal_True;
- 
-     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );  
--	PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, xModel, bSelection );
-+	PrintOutHelper( excel::getBestViewShell( xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, bSelection );
- }
- 
--
- namespace worksheet
- {
- namespace sdecl = comphelper::service_decl;
---- sc/source/ui/vba/vbaworksheet.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/vba/vbaworksheet.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -47,7 +47,8 @@
- #include <ooo/vba/excel/XChartObjects.hpp>
- #include <com/sun/star/container/XNamed.hpp>
- 
--#include "vbahelperinterface.hxx"
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include "address.hxx"
- 
- typedef InheritedHelperInterfaceImpl1< ov::excel::XWorksheet >  WorksheetImpl_BASE;
- 
---- sc/source/ui/vba/vbaworksheets.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaworksheets.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -217,8 +217,8 @@ ScVbaWorksheets::Add( const uno::Any& Be
- 	}
- 	if (!aStringSheet.getLength())
- 	{
--		aStringSheet = ScVbaGlobals::getGlobalsImpl( 
--			mxContext )->getApplication()->getActiveWorkbook()->getActiveSheet()->getName();
-+		uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
-+		aStringSheet = xApplication->getActiveWorkbook()->getActiveSheet()->getName();
- 		bBefore = sal_True;
- 	}
- 		nCount = static_cast< SCTAB >( m_xIndexAccess->getCount() );
-@@ -295,7 +295,7 @@ ScVbaWorksheets::PrintOut( const uno::An
- 		if ( isSelectedSheets() )
- 			bSelection = sal_True;
- 
--	PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, mxModel, bSelection );
-+	PrintOutHelper( excel::getBestViewShell( mxModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, bSelection );
- }
- 
- uno::Any SAL_CALL 
-@@ -336,7 +336,7 @@ ScVbaWorksheets::setVisible( const uno::
- void SAL_CALL 
- ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException)
- {
--	ScTabViewShell* pViewShell = getBestViewShell( mxModel );
-+	ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel );
- 	if ( !pViewShell )
- 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() );
- 			
---- sc/source/ui/vba/vbaworksheets.hxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbaworksheets.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -36,9 +36,8 @@
- #include <com/sun/star/sheet/XSpreadsheets.hpp>
- #include <com/sun/star/container/XEnumerationAccess.hpp>
- #include <com/sun/star/uno/XComponentContext.hpp>
--#include <ooo/vba/XGlobals.hpp>
-  
--#include "vbacollectionimpl.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
- 
- class ScModelObj;
- 
---- sc/util/makefile.mk.old	2009-04-06 16:41:56.000000000 +0000
-+++ sc/util/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -78,6 +78,7 @@ SHL1IMPLIB= sci
- 
- # dynamic libraries
- SHL1STDLIBS=       \
-+		$(VBAHELPERLIB) \
- 	$(BASICLIB)	\
- 	$(SFXLIB)		\
- 	$(SVTOOLLIB)	\
-@@ -299,6 +300,7 @@ SHL9RPATH=OOO
- .ENDIF
- 
- SHL9STDLIBS= \
-+		$(VBAHELPERLIB) \
- 		$(CPPUHELPERLIB) \
- 		$(VCLLIB) \
- 		$(CPPULIB) \
---- scp2/source/ooo/file_library_ooo.scp.old	2009-04-06 16:41:58.000000000 +0000
-+++ scp2/source/ooo/file_library_ooo.scp	2009-04-06 16:42:01.000000000 +0000
-@@ -406,7 +406,42 @@ File gid_File_Lib_Vbaobj
-   #endif
- End
- 
-+File gid_File_Lib_Vbaswobj
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,UNO_COMPONENT);
-+    RegistryID = gid_Starregistry_Services_Rdb;
-+    Dir = gid_Dir_Program;
-+  #ifdef UNX
-+    Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
-+  #else
-+    Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll));
-+  #endif
-+End
-+
-+File gid_File_Lib_Vbamsforms
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,UNO_COMPONENT);
-+    RegistryID = gid_Starregistry_Services_Rdb;
-+    Dir = gid_Dir_Program;
-+  #ifdef UNX
-+    Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX));
-+  #else
-+    Name = STRING(CONCAT4(msforms,DLLPOSTFIX,.uno,.dll));
-+  #endif
-+End
-+
- #endif // VBA_EXTENSION
-+File gid_File_Lib_Vbahelper
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
-+    RegistryID = gid_Starregistry_Services_Rdb;
-+    Dir = gid_Dir_Program;
-+  #ifdef UNX
-+    Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX));
-+  #else
-+    Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll));
-+  #endif
-+End
- #endif // ENABLE_VBA
- 
- 
---- scripting/source/vbaevents/eventhelper.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ scripting/source/vbaevents/eventhelper.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -768,10 +768,27 @@ EventListener::firing_Impl(const ScriptE
-         std::list< TranslateInfo >::const_iterator txInfo =
-             eventInfo_it->second.begin();
-         std::list< TranslateInfo >::const_iterator txInfo_end = eventInfo_it->second.end();
--        rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Standard.").concat( evt.ScriptCode ).concat( rtl::OUString::createFromAscii(".") );
-        
-         StarBASIC* pBasic = mpShell->GetBasic();
-+        BasicManager* pBasicManager = mpShell->GetBasicManager();
-+        //'Project' is a better default but I want to force failures
-+        //rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Project");
-+        rtl::OUString sProject = rtl::OUString::createFromAscii("Standard");
-+
-+        if ( pBasicManager->GetName().Len() > 0 )
-+            sProject =  pBasicManager->GetName();
-+
-+        rtl::OUString sMacroLoc = sProject;
-+        sMacroLoc = sMacroLoc.concat(  rtl::OUString::createFromAscii(".") );
-+        sMacroLoc = sMacroLoc.concat( evt.ScriptCode ).concat( rtl::OUString::createFromAscii(".") );
-+        
-+        OSL_TRACE("sMacroLoc is %s", rtl::OUStringToOString( sMacroLoc, RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-+        // find library
-+        pBasic = pBasicManager->GetLib( sProject );
-+        
-         SbModule* pModule = pBasic->FindModule( evt.ScriptCode );
-+
-         for ( ; pModule && txInfo != txInfo_end; ++txInfo )
-         {
-             // see if we have a match for the handlerextension
---- sfx2/inc/sfx2/sfx.hrc.old	2009-04-02 10:44:03.000000000 +0000
-+++ sfx2/inc/sfx2/sfx.hrc	2009-04-06 16:42:01.000000000 +0000
-@@ -402,8 +402,10 @@
- #define MID_DOCINFO_ENCRYPTED				 0x2c
- #define MID_DOCINFO_STATISTIC				 0x33
- #define MID_DOCINFO_CHARLOCALE				 0x34
--
--#define MID_LAST_USED_PROPID                 MID_DOCINFO_CHARLOCALE
-+#define MID_CATEGORY                                     0x35
-+#define MID_COMPANY                                      0x36
-+#define MID_MANAGER                                      0x37
-+#define MID_LAST_USED_PROPID              MID_MANAGER   
- 
- // Config-Ids -----------------------------------------------------------
- 
---- sfx2/inc/sfx2/sfxbasemodel.hxx.old	2009-04-02 10:44:03.000000000 +0000
-+++ sfx2/inc/sfx2/sfxbasemodel.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -1379,6 +1379,7 @@ protected:
-     /* returns true if the document signatures are valid, otherwise false */
-     sal_Bool hasValidSignatures() const;
- 
-+    void setDocumentProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >& );
- //________________________________________________________________________________________________________
- //	private methods
- //________________________________________________________________________________________________________
---- sfx2/source/appl/appuno.cxx.old	2009-04-02 10:44:02.000000000 +0000
-+++ sfx2/source/appl/appuno.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -2283,6 +2283,16 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL compone
-     xNewKey = xKey->createKey( aTempStr );
-     xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentProperties") );
- 
-+
-+    // writer compatable document properties
-+    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-+    aImpl += comp_CompatWriterDocProps::_getImplementationName();
-+
-+    aTempStr = aImpl;
-+    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-+    xNewKey = xKey->createKey( aTempStr );
-+    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.writer.DocumentProperties") );
-+
- 	return sal_True;
- }
- 
-@@ -2340,6 +2350,16 @@ SFX2_DLLPUBLIC void* SAL_CALL component_
- 			::comp_SfxDocumentMetaData::_getImplementationName(),
- 			::comp_SfxDocumentMetaData::_getSupportedServiceNames());
-         }
-+        if ( ::comp_CompatWriterDocProps::_getImplementationName().equals(
-+                 ::rtl::OUString::createFromAscii( pImplementationName ) ) )
-+        {
-+            xFactory = ::cppu::createSingleComponentFactory(
-+			::comp_CompatWriterDocProps::_create,
-+			::comp_CompatWriterDocProps::_getImplementationName(),
-+			::comp_CompatWriterDocProps::_getSupportedServiceNames());
-+        }
-+
-+        // Factory is valid - service was found.
- 
-         // Factory is valid - service was found.
- 		if ( xFactory.is() )
---- sfx2/source/doc/SfxDocumentMetaData.cxx.old	2009-04-02 10:43:58.000000000 +0000
-+++ sfx2/source/doc/SfxDocumentMetaData.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -89,6 +89,10 @@
- #include <cstring>
- #include <limits>
- 
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/document/XCompatWriterDocProperties.hpp>
-+
- /**
-  * This file contains the implementation of the service
-  * com.sun.star.document.DocumentProperties.
-@@ -298,12 +302,12 @@ public:
-         const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces)
-         throw (css::uno::RuntimeException, css::xml::sax::SAXException);
- 
--private:
-+protected:
-     SfxDocumentMetaData(SfxDocumentMetaData &); // not defined
-     SfxDocumentMetaData& operator =(SfxDocumentMetaData &); // not defined
- 
-     virtual ~SfxDocumentMetaData() {}
--
-+    virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) { return new SfxDocumentMetaData( context ); };
-     const css::uno::Reference< css::uno::XComponentContext > m_xContext;
- 
-     /// for notification
-@@ -377,6 +381,54 @@ private:
-     // throw (css::uno::RuntimeException);
- };
- 
-+typedef ::cppu::ImplInheritanceHelper1< SfxDocumentMetaData, css::document::XCompatWriterDocProperties > CompatWriterDocPropsImpl_BASE;
-+
-+class CompatWriterDocPropsImpl : public CompatWriterDocPropsImpl_BASE
-+{
-+    rtl::OUString msManager;
-+    rtl::OUString msCategory;
-+    rtl::OUString msCompany;
-+protected:
-+    virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) { return new CompatWriterDocPropsImpl( context ); };
-+public:
-+    CompatWriterDocPropsImpl( css::uno::Reference< css::uno::XComponentContext > const & context) : CompatWriterDocPropsImpl_BASE( context ) {}
-+// XCompatWriterDocPropsImpl
-+    virtual ::rtl::OUString SAL_CALL getManager() throw (::com::sun::star::uno::RuntimeException) { return msManager; }
-+    virtual void SAL_CALL setManager( const ::rtl::OUString& _manager ) throw (::com::sun::star::uno::RuntimeException) { msManager = _manager; }
-+    virtual ::rtl::OUString SAL_CALL getCategory() throw (::com::sun::star::uno::RuntimeException){ return msCategory; }
-+    virtual void SAL_CALL setCategory( const ::rtl::OUString& _category ) throw (::com::sun::star::uno::RuntimeException){ msCategory = _category; }
-+    virtual ::rtl::OUString SAL_CALL getCompany() throw (::com::sun::star::uno::RuntimeException){ return msCompany; }
-+    virtual void SAL_CALL setCompany( const ::rtl::OUString& _company ) throw (::com::sun::star::uno::RuntimeException){ msCompany = _company; }
-+
-+// XServiceInfo
-+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
-+    {
-+        return comp_CompatWriterDocProps::_getImplementationName();
-+    }
-+
-+    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException)
-+    { 
-+        css::uno::Sequence< rtl::OUString > sServiceNames= getSupportedServiceNames();
-+        sal_Int32 nLen = sServiceNames.getLength();
-+        rtl::OUString* pIt = sServiceNames.getArray();
-+        rtl::OUString* pEnd = ( pIt + nLen );
-+        sal_Bool bRes = sal_False;
-+        for ( ; pIt != pEnd; ++pIt )
-+        {
-+            if ( pIt->equals( ServiceName ) )
-+            {
-+                bRes = sal_True;
-+                break;
-+            }
-+        }
-+        return bRes;
-+    }
-+
-+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException)
-+    {
-+        return comp_CompatWriterDocProps::_getSupportedServiceNames();
-+    }
-+};
- ////////////////////////////////////////////////////////////////////////////
- 
- bool operator== (const css::util::DateTime &i_rLeft,
-@@ -2149,7 +2201,7 @@ SfxDocumentMetaData::createClone()
-     ::osl::MutexGuard g(m_aMutex);
-     checkInit();
- 
--    SfxDocumentMetaData *pNew = new SfxDocumentMetaData(m_xContext);
-+    SfxDocumentMetaData *pNew = createMe(m_xContext);
- 
-     // NB: do not copy the modification listeners, only DOM
-     css::uno::Reference<css::xml::dom::XDocument> xDoc = createDOM();
-@@ -2266,6 +2318,32 @@ void SAL_CALL SfxDocumentMetaData::seria
- 
- 
- // component helper namespace
-+namespace comp_CompatWriterDocProps {
-+
-+    ::rtl::OUString SAL_CALL _getImplementationName() {
-+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-+            "CompatWriterDocPropsImpl"));
-+}
-+
-+   css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
-+   {
-+        static css::uno::Sequence< rtl::OUString > aServiceNames;
-+        if ( aServiceNames.getLength() == 0 )
-+        {
-+            aServiceNames.realloc( 1 );
-+            aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.writer.DocumentProperties" ) ); 
-+        }
-+        return aServiceNames;
-+   } 
-+    css::uno::Reference< css::uno::XInterface > SAL_CALL _create(
-+        const css::uno::Reference< css::uno::XComponentContext > & context)
-+            SAL_THROW((css::uno::Exception))
-+    {
-+        return static_cast< ::cppu::OWeakObject * >
-+                    (new CompatWriterDocPropsImpl(context));
-+    }
-+
-+}
- namespace comp_SfxDocumentMetaData {
- 
- ::rtl::OUString SAL_CALL _getImplementationName() {
---- sfx2/source/doc/docinf.cxx.old	2009-04-02 10:43:58.000000000 +0000
-+++ sfx2/source/doc/docinf.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -37,6 +37,7 @@
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <com/sun/star/beans/XPropertyContainer.hpp>
- #include <com/sun/star/document/XDocumentProperties.hpp>
-+#include <com/sun/star/document/XCompatWriterDocProperties.hpp>
- #include <com/sun/star/uno/Exception.hpp>
- 
- #include <rtl/ustring.hxx>
-@@ -46,7 +47,6 @@
- #include <vcl/gdimtf.hxx>
- 
- #include "oleprops.hxx"
--
- // ============================================================================
- 
- // stream names
-@@ -174,6 +174,28 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropert
-             }
-         }
-     }
-+
-+    uno::Reference< document::XCompatWriterDocProperties > xWriterProps( i_xDocProps, uno::UNO_QUERY );
-+    if ( xWriterProps.is() )
-+    {
-+        SfxOleSectionRef xBuiltin = aDocSet.GetSection( SECTION_BUILTIN );
-+        if ( xBuiltin.get() )
-+        {
-+            try
-+            {
-+                String aStrValue;
-+                if ( xBuiltin->GetStringValue( aStrValue, PROPID_MANAGER ) )
-+                    xWriterProps->setManager( aStrValue );
-+                if ( xBuiltin->GetStringValue( aStrValue, PROPID_CATEGORY ) )
-+                    xWriterProps->setCategory( aStrValue );
-+                if ( xBuiltin->GetStringValue( aStrValue, PROPID_COMPANY ) )
-+                    xWriterProps->setCompany( aStrValue );
-+            }
-+            catch ( uno::Exception& )
-+            {
-+            }
-+        }
-+    }
- 
-     // return code
-     return (nGlobError != ERRCODE_NONE) ? nGlobError : nDocError;
---- sfx2/source/doc/objuno.cxx.old	2009-04-02 10:43:58.000000000 +0000
-+++ sfx2/source/doc/objuno.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -48,6 +48,7 @@
- #include <com/sun/star/lang/Locale.hpp>
- #include <com/sun/star/util/XModifiable.hpp>
- #include <com/sun/star/document/XDocumentProperties.hpp>
-+#include <com/sun/star/document/XCompatWriterDocProperties.hpp>
- 
- #include <unotools/configmgr.hxx>
- #include <tools/inetdef.hxx>
-@@ -105,6 +106,9 @@ SfxItemPropertyMap aDocInfoPropertyMap_I
- 	{ "AutoloadEnabled"	, 15, MID_DOCINFO_AUTOLOADENABLED, &::getBooleanCppuType(),   PROPERTY_UNBOUND, 0 },
-     { "AutoloadSecs"    , 12, MID_DOCINFO_AUTOLOADSECS, &::getCppuType((const sal_Int32*)0),     PROPERTY_UNBOUND, 0 },
- 	{ "AutoloadURL"		, 11, MID_DOCINFO_AUTOLOADURL, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
-+	{ "Category"			, 8	, MID_CATEGORY,           &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
-+	{ "Company"			, 7	, MID_COMPANY,           &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
-+	{ "Manager"			, 7	, MID_MANAGER,           &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
-     { "CreationDate"    , 12, WID_DATE_CREATED,   &::getCppuType((const ::com::sun::star::util::DateTime*)0),PROPERTY_MAYBEVOID, 0 },
- 	{ "DefaultTarget"	, 13, MID_DOCINFO_DEFAULTTARGET, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
- 	{ "Description"		, 11, MID_DOCINFO_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
-@@ -824,6 +828,22 @@ void SAL_CALL  SfxDocumentInfoObject::se
-                     _pImp->m_xDocProps->setDefaultTarget(sTemp);
- 				break;
- //            case WID_CONTENT_TYPE : // this is readonly!
-+               case MID_CATEGORY:
-+               case MID_MANAGER:
-+               case MID_COMPANY:
-+                   {
-+                       uno::Reference< document::XCompatWriterDocProperties > xWriterProps( _pImp->m_xDocProps, uno::UNO_QUERY  );
-+                       if ( xWriterProps.is() ) 
-+                       {
-+                           if ( nHandle ==  MID_CATEGORY )
-+                               xWriterProps->setCategory( sTemp );
-+                           else if ( nHandle ==  MID_MANAGER )
-+                               xWriterProps->setManager( sTemp );
-+                           else
-+                               xWriterProps->setCompany( sTemp );
-+                           break;
-+                       }
-+                   }
- 			default:
- 				break;
- 		}
-@@ -1041,6 +1061,23 @@ void SAL_CALL  SfxDocumentInfoObject::se
-         case MID_DOCINFO_CHARLOCALE:
-             aValue <<= _pImp->m_xDocProps->getLanguage();
-             break;
-+        case MID_CATEGORY:
-+        case MID_MANAGER:
-+        case MID_COMPANY:
-+            {
-+                uno::Reference< document::XCompatWriterDocProperties > xWriterProps( _pImp->m_xDocProps, uno::UNO_QUERY  );
-+                if ( xWriterProps.is() ) 
-+                {
-+                    if ( nHandle ==  MID_CATEGORY )
-+                        aValue <<= xWriterProps->getCategory();
-+                    else if ( nHandle ==  MID_MANAGER )
-+                        aValue <<= xWriterProps->getManager();
-+                    else
-+                        aValue <<= xWriterProps->getCompany();
-+                        break;
-+               }
-+           }
-+	
-         default:
-             aValue <<= ::rtl::OUString();
-             break;
---- sfx2/source/doc/oleprops.hxx.old	2009-04-02 10:43:58.000000000 +0000
-+++ sfx2/source/doc/oleprops.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -83,6 +83,10 @@ const sal_Int32 PROPID_CREATED
- const sal_Int32 PROPID_LASTSAVED        = 13;
- const sal_Int32 PROPID_THUMBNAIL        = 17;
- 
-+// some Builtin properties
-+const sal_Int32 PROPID_CATEGORY         = 0x2;
-+const sal_Int32 PROPID_COMPANY          = 0xf;
-+const sal_Int32 PROPID_MANAGER          = 0xe;
- // predefined codepages
- const sal_uInt16 CODEPAGE_UNKNOWN       = 0;
- const sal_uInt16 CODEPAGE_UNICODE       = 1200;
---- sfx2/source/doc/sfxbasemodel.cxx.old	2009-04-02 10:43:58.000000000 +0000
-+++ sfx2/source/doc/sfxbasemodel.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -784,7 +784,15 @@ uno::Reference< document::XDocumentInfo
- 
- 	return m_pData->m_xDocumentInfo;
- }
--
-+void 
-+SfxBaseModel::setDocumentProperties( const uno::Reference< document::XDocumentProperties >& rxNewDocProps )
-+{
-+	// object already disposed?
-+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
-+    if ( impl_isDisposed() )
-+        throw lang::DisposedException();
-+    m_pData->m_xDocumentProperties.set(rxNewDocProps, uno::UNO_QUERY_THROW);
-+}
- // document::XDocumentPropertiesSupplier:
- uno::Reference< document::XDocumentProperties > SAL_CALL
- SfxBaseModel::getDocumentProperties()
---- sfx2/source/inc/SfxDocumentMetaData.hxx.old	2009-04-02 10:43:59.000000000 +0000
-+++ sfx2/source/inc/SfxDocumentMetaData.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -48,5 +48,16 @@ css::uno::Reference< css::uno::XInterfac
- 
- } // closing component helper namespace
- 
-+namespace comp_CompatWriterDocProps {
-+
-+namespace css = ::com::sun::star;
-+
-+// component and service helper functions:
-+::rtl::OUString SAL_CALL _getImplementationName();
-+css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames();
-+css::uno::Reference< css::uno::XInterface > SAL_CALL _create(
-+        css::uno::Reference< css::uno::XComponentContext > const & context );
-+
-+}
- #endif
- 
---- solenv/inc/libs.mk.old	2009-04-02 10:53:10.000000000 +0000
-+++ solenv/inc/libs.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -192,6 +192,7 @@ SAXLIB=-lsax$(DLLPOSTFIX)
- MAILLIB=-lmail
- DOCMGRLIB=-ldmg$(DLLPOSTFIX)
- BASICLIB=-lsb$(DLLPOSTFIX)
-+VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX)
- DBTOOLSLIB=-ldbtools$(DLLPOSTFIX)
- HM2LIBSH=-lhmwrpdll
- HM2LIBST=-lhmwrap
-@@ -433,6 +434,7 @@ SAXLIB=isax.lib
- MAILLIB=mail.lib
- DOCMGRLIB=docmgr.lib
- BASICLIB=basic.lib
-+VBAHELPERLIB=vbahelper.lib
- TKTLIB=tkt.lib
- SJLIB=sj.lib
- SVXLIB=isvx.lib
---- svx/inc/svx/mstoolbar.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ svx/inc/svx/mstoolbar.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -27,6 +27,7 @@ public:
-     virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ) = 0; 
- };
- 
-+class SfxObjectShell;
- 
- class SVX_DLLPUBLIC CustomToolBarImportHelper
- {
-@@ -39,16 +40,16 @@ class SVX_DLLPUBLIC CustomToolBarImportH
-     std::auto_ptr< MSOCommandConvertor > pMSOCmdConvertor;
-     css::uno::Reference< css::ui::XUIConfigurationManagerSupplier > m_xCfgSupp;
-     css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr;
--
-+    SfxObjectShell& mrDocSh;
- public:
--    CustomToolBarImportHelper( const css::uno::Reference< css::frame::XModel >& rxModel, const css::uno::Reference< css::ui::XUIConfigurationManager >& rxAppCfgMgr );
-+    CustomToolBarImportHelper( SfxObjectShell& rDocSh, const css::uno::Reference< css::ui::XUIConfigurationManager >& rxAppCfgMgr );
- 
-     void setMSOCommandMap( MSOCommandConvertor* pCnvtr ) { pMSOCmdConvertor.reset( pCnvtr ); }
-     css::uno::Reference< css::ui::XUIConfigurationManager > getCfgManager();
-     css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager();
- 
- 
--    static css::uno::Any createCommandFromMacro( const rtl::OUString& sCmd );
-+    css::uno::Any createCommandFromMacro( const rtl::OUString& sCmd );
- 
-     void addIcon( const css::uno::Reference< css::graphic::XGraphic >& xImage, const rtl::OUString& sString );
-     void applyIcons();
-@@ -131,7 +132,7 @@ public:
-     ~TBCGeneralInfo() {}
-     bool Read(SvStream *pS);
-     void Print( FILE* );
--    bool ImportToolBarControlData( std::vector< css::beans::PropertyValue >& );
-+    bool ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& );
- };
- 
- class SVX_DLLPUBLIC TBCBitMap : public TBBase
---- svx/inc/svxmsbas.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ svx/inc/svxmsbas.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -59,6 +59,8 @@ typedef std::hash_map< sal_Int32, String
- 
- typedef std::map< String, ObjIdToName >  ControlAttributeInfo;
- 
-+class VBA_Impl;
-+
- class SVX_DLLPUBLIC SvxImportMSVBasic
- { 
- 	ControlAttributeInfo m_ModuleNameToObjIdHash;
-@@ -102,6 +104,9 @@ private:
- 		const String &rSubStorageName, BOOL bVBAMode );
- 	SVX_DLLPRIVATE BOOL CopyStorage_Impl( const String& rStorageName,
- 						   const String &rSubStorageName);
-+        rtl::OUString msProjectName;
-+	SVX_DLLPRIVATE BOOL ImportCode_Impl( VBA_Impl&, BOOL, BOOL );
-+	SVX_DLLPRIVATE bool ImportForms_Impl( VBA_Impl&, const String&, const String&, BOOL);
- };
- 
- #endif
---- svx/source/msfilter/mstoolbar.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ svx/source/msfilter/mstoolbar.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -8,6 +8,8 @@
- #include <vcl/graph.hxx>
- #include <vcl/bitmapex.hxx>
- #include <map>
-+#include <sfx2/objsh.hxx>
-+#include <basic/basmgr.hxx>
- 
- int TBBase::nIndent = 0;
- 
-@@ -36,9 +38,9 @@ void CustomToolBarImportHelper::addIcon(
-     iconcommands.push_back( item );
- }
- 
--CustomToolBarImportHelper::CustomToolBarImportHelper( const uno::Reference< frame::XModel >& rxModel,  const css::uno::Reference< css::ui::XUIConfigurationManager>& rxAppCfgMgr )
-+CustomToolBarImportHelper::CustomToolBarImportHelper( SfxObjectShell& rDocShell,  const css::uno::Reference< css::ui::XUIConfigurationManager>& rxAppCfgMgr ) : mrDocSh( rDocShell ) 
- {
--    m_xCfgSupp.set( rxModel, uno::UNO_QUERY_THROW );
-+    m_xCfgSupp.set( mrDocSh.GetModel(), uno::UNO_QUERY_THROW );
-     m_xAppCfgMgr.set( rxAppCfgMgr, uno::UNO_QUERY_THROW );
- }
- 
-@@ -58,10 +60,18 @@ uno::Any
- CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd )
- {
- //"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"    
--    static rtl::OUString part1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
-+    static rtl::OUString scheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
-     static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document");
-+    rtl::OUString sProject( RTL_CONSTASCII_USTRINGPARAM("Standard") );
-+    if ( mrDocSh.GetBasicManager()->GetName().Len() )
-+        sProject = mrDocSh.GetBasicManager()->GetName();
-+    sProject += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") );
-+
-+    // #TODO #FIXME a script can also be loosly defined ( e.g. with no module 
-+    // spec )
-+
-     // create script url
--    rtl::OUString scriptURL = part1 + sCmd + part2;
-+    rtl::OUString scriptURL = scheme + sProject + sCmd + part2;
-     return uno::makeAny( scriptURL );
- }
- 
-@@ -197,7 +207,7 @@ bool TBCData::Read(SvStream *pS)
- 
- bool TBCData::ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >& /*toolbarcontainer*/, CustomToolBarImportHelper& helper, std::vector< css::beans::PropertyValue >& props )
- {
--    controlGeneralInfo.ImportToolBarControlData( props );
-+    controlGeneralInfo.ImportToolBarControlData( helper, props );
-     beans::PropertyValue aProp;
-     aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ;
-     aProp.Value = uno::makeAny( rHeader.isVisible() ); // where is the visible attribute stored
-@@ -356,7 +366,7 @@ TBCGeneralInfo::Print( FILE* fp )
- }
- 
- bool 
--TBCGeneralInfo::ImportToolBarControlData( std::vector< beans::PropertyValue >& sControlData )
-+TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std::vector< beans::PropertyValue >& sControlData )
- {
-     if ( ( bFlags & 0x5 ) )
-     {
-@@ -366,7 +376,7 @@ TBCGeneralInfo::ImportToolBarControlData
-         if ( extraInfo.getOnAction().getLength() )
-         {
-             aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
--            aProp.Value = CustomToolBarImportHelper::createCommandFromMacro( extraInfo.getOnAction() );
-+            aProp.Value = helper.createCommandFromMacro( extraInfo.getOnAction() );
-             sControlData.push_back( aProp );
-         }
- 
-@@ -379,7 +389,7 @@ TBCGeneralInfo::ImportToolBarControlData
-         sControlData.push_back( aProp );
- 
-         aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HelpURL") );
--        aProp.Value = uno::makeAny( CustomToolBarImportHelper::createCommandFromMacro( tooltip.getString() ) ); 
-+        aProp.Value = uno::makeAny( helper.createCommandFromMacro( tooltip.getString() ) ); 
-         sControlData.push_back( aProp );
- 
-         // #TODO find out what is the property for tooltip?
---- svx/source/msfilter/msvbasic.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ svx/source/msfilter/msvbasic.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -40,9 +40,929 @@
- #include <osl/endian.h>
- #include <rtl/tencinfo.h>   //rtl_getTextEncodingFromWindowsCodePage
- #include "msvbasic.hxx"
-+#include <fstream>
-+#include <memory>
-+#include <rtl/ustrbuf.hxx>
- 
- using namespace ::com::sun::star::script;
- 
-+// #FIXME this routine is stolen from msocximex ( needs to be somewhere central )
-+
-+const sal_uInt32 SVX_MSOCX_SIZEMASK     = 0x7FFFFFFF;   /// Mask for character buffer size.
-+const sal_uInt32 SVX_MSOCX_COMPRESSED   = 0x80000000; 
-+
-+inline bool lclIsCompressed( sal_uInt32 nLenFld )
-+{
-+    return (nLenFld & SVX_MSOCX_COMPRESSED) != 0;
-+}
-+
-+
-+/** Extracts and returns the memory size of the character buffer.
-+    @return  Character buffer size (may differ from resulting string length!).
-+ */
-+inline sal_uInt32 lclGetBufferSize( sal_uInt32 nLenFld )
-+{
-+    return nLenFld & SVX_MSOCX_SIZEMASK;
-+}
-+/** Creates an OUString from a character array created with lclReadCharArray().
-+
-+    The passed parameters must match, that means the length field must be the
-+    same used to create the passed character array.
-+
-+    @param pcCharArr
-+        The character array returned by lclReadCharArray(). May be compressed
-+        or uncompressed, next parameter nLenFld will specify this.
-+
-+    @param nLenFld
-+        MUST be the same string length field that has been passed to
-+        lclReadCharArray() to create the character array in previous parameter
-+        pcCharArr.
-+
-+    @return
-+        An OUString containing the decoded string data. Will be empty if
-+        pcCharArr is 0.
-+ */
-+rtl::OUString lclCreateOUString( const char* pcCharArr, sal_uInt32 nLenFld )
-+{
-+    rtl::OUStringBuffer aBuffer;
-+    sal_uInt32 nBufSize = lclGetBufferSize( nLenFld );
-+    if( lclIsCompressed( nLenFld ) )
-+    {
-+        // buffer contains compressed Unicode, not encoded bytestring
-+        sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize );
-+        aBuffer.setLength( nStrLen );
-+        const char* pcCurrChar = pcCharArr;
-+        for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar, ++pcCurrChar )
-+            /*  *pcCurrChar may contain negative values and therefore MUST be
-+                casted to unsigned char, before assigned to a sal_Unicode. */
-+            aBuffer.setCharAt( nChar, static_cast< unsigned char >( *pcCurrChar ) );
-+    }
-+    else
-+    {
-+        // buffer contains Little-Endian Unicode
-+        sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize ) / 2;
-+        aBuffer.setLength( nStrLen );
-+        const char* pcCurrChar = pcCharArr;
-+        for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar )
-+        {
-+            /*  *pcCurrChar may contain negative values and therefore MUST be
-+                casted to unsigned char, before assigned to a sal_Unicode. */
-+            sal_Unicode cChar = static_cast< unsigned char >( *pcCurrChar++ );
-+            cChar |= (static_cast< unsigned char >( *pcCurrChar++ ) << 8);
-+            aBuffer.setCharAt( nChar, cChar );
-+        }
-+    }
-+    return aBuffer.makeStringAndClear();
-+}
-+
-+
-+namespace MSLZSS {
-+
-+static unsigned int getShift( sal_uInt32 nPos )
-+{
-+    if (nPos <= 0x80) {
-+        if (nPos <= 0x20)
-+            return (nPos <= 0x10) ? 12 : 11;
-+        else
-+            return (nPos <= 0x40) ? 10 : 9;
-+    } else {
-+    if (nPos <= 0x200)
-+        return (nPos <= 0x100) ? 8 : 7;
-+    else if (nPos <= 0x800)
-+        return (nPos <= 0x400) ? 6 : 5;
-+    else
-+        return 4;
-+    }
-+}
-+
-+SvMemoryStream *decompressAsStream( SvStream *pStream, sal_uInt32 nOffset, sal_uInt32 *pCompressedLength = NULL, sal_uInt32 *pLength = NULL )
-+{
-+    SvMemoryStream *pResult;
-+    const sal_Int32 nWINDOWLEN = 4096;
-+    pResult = new SvMemoryStream();
-+
-+    sal_uInt8 nLeadbyte;
-+    unsigned int nPos = 0;
-+    int nLen, nDistance, nShift, nClean=1;
-+    sal_uInt8 aHistory[ nWINDOWLEN ];
-+
-+    pStream->Seek( nOffset + 3 );
-+
-+    while( pStream->Read( &nLeadbyte, 1 ) )
-+    {
-+        for(int nMask=0x01; nMask < 0x100; nMask = nMask<<1)
-+        {
-+            // we see if the leadbyte has flagged this location as a dataunit
-+            // which is actually a token which must be looked up in the history
-+            if( nLeadbyte & nMask )
-+            {
-+                sal_uInt16 nToken;
-+            
-+                *pStream >> nToken;
-+    
-+                if (nClean == 0)
-+                    nClean=1;
-+    
-+                //For some reason the division of the token into the length
-+                //field of the data to be inserted, and the distance back into
-+                //the history differs depending on how full the history is
-+                nShift = getShift( nPos % nWINDOWLEN );
-+        
-+                nLen = (nToken & ((1<<nShift) - 1)) + 3;
-+                nDistance = nToken >> nShift;
-+        
-+                //read the len of data from the history, wrapping around the
-+                //nWINDOWLEN boundary if necessary data read from the history
-+                //is also copied into the recent part of the history as well.
-+                for (int i = 0; i < nLen; i++)
-+                {
-+                    unsigned char c;
-+                    c = aHistory[(nPos-nDistance-1) % nWINDOWLEN];
-+                    aHistory[nPos % nWINDOWLEN] = c;
-+                    nPos++;
-+                }
-+            }
-+            else
-+            {
-+                // special boundary case code, not guarantueed to be correct
-+                // seems to work though, there is something wrong with the
-+                // compression scheme (or maybe a feature) where when the data
-+                // ends on a nWINDOWLEN boundary and the excess bytes in the 8
-+                // dataunit list are discarded, and not interpreted as tokens
-+                // or normal data.
-+                if ((nPos != 0) && ((nPos % nWINDOWLEN) == 0) && (nClean))
-+                {
-+                    pStream->SeekRel(2);
-+                    nClean=0;
-+                    pResult->Write( aHistory, nWINDOWLEN );
-+                    break;
-+                }
-+                //This is the normal case for when the data unit is not a
-+                //token to be looked up, but instead some normal data which
-+                //can be output, and placed in the history.
-+                if (pStream->Read(&aHistory[nPos % nWINDOWLEN],1))
-+                    nPos++;
-+                    
-+                if (nClean == 0)
-+                    nClean=1;
-+            }
-+        }
-+    }
-+    if (nPos % nWINDOWLEN)
-+        pResult->Write( aHistory, nPos % nWINDOWLEN );
-+    pResult->Flush();
-+
-+    if( pCompressedLength )
-+        *pCompressedLength = nPos;
-+    
-+    if( pLength )
-+        *pLength = pResult->Tell();
-+
-+    pResult->Seek( 0 );
-+
-+    return pResult;
-+} 
-+
-+} //MSZSS
-+
-+// also _VBA_PROJECT_VDPI can be used to create a usable 
-+// ( and much smaller ) "_VBA_PROJECT" stream
-+
-+// _VBA_PROJECT Stream Version Dependant Project Information
-+// _VBA_PROJECT Stream Version Dependant Project Information
-+
-+class _VBA_PROJECT_VDPI
-+{
-+public:
-+sal_Int16 Reserved1;
-+sal_Int16 Version;
-+sal_Int8 Reserved2;
-+sal_Int16 Reserved3;
-+sal_uInt8* PerformanceCache;
-+sal_Int32 PerformanceCacheSize;
-+_VBA_PROJECT_VDPI(): Reserved1( 0x61CC), Version( 0xFFFF ), Reserved2(0x0), Reserved3(0x0), PerformanceCache(0),  PerformanceCacheSize(0) {}
-+~_VBA_PROJECT_VDPI()
-+{
-+    if (  PerformanceCache )
-+       delete [] PerformanceCache;
-+    PerformanceCache = 0;
-+    PerformanceCacheSize = 0;
-+}
-+void read(){}
-+void write( SvStream* pStream )
-+{
-+    *pStream << Reserved1 << Version << Reserved2 << Reserved3;
-+    for( sal_Int32 i = 0; PerformanceCache && i < PerformanceCacheSize; ++i )
-+    {
-+        *pStream >> PerformanceCache[ i ];
-+    }
-+}
-+};
-+
-+class ProjectSysKindRecord
-+{
-+public:
-+sal_Int16 Id;
-+sal_Int32 Size;
-+sal_Int32 SysKind;
-+ProjectSysKindRecord(): Id(0x1), Size(0x4), SysKind( 0x1 ) {}
-+void read( SvStream* pStream )
-+{
-+    *pStream >> Id >> Size >> SysKind;
-+}
-+};
-+
-+class ProjectLcidRecord
-+{
-+public:
-+sal_Int16 Id;
-+sal_Int32 Size;
-+sal_Int32 Lcid;
-+
-+ProjectLcidRecord() : Id( 0x2 ), Size( 0x4 ), Lcid( 0x409 ) {}
-+void read( SvStream* pStream )
-+{
-+    OSL_TRACE("ProjectLcidRecord [0x%x]", pStream->Tell() );
-+    *pStream >> Id >> Size >> Lcid;
-+}
-+};
-+
-+class ProjectLcidInvokeRecord
-+{
-+sal_Int16 Id;
-+sal_Int32 Size;
-+sal_Int32 LcidInvoke;
-+public:
-+ProjectLcidInvokeRecord() : Id( 0x14 ), Size( 0x4 ), LcidInvoke( 0x409 ) {}
-+void read( SvStream* pStream )
-+{
-+    OSL_TRACE("ProjectLcidInvokeRecord [0x%x]", pStream->Tell() );
-+    *pStream >> Id >> Size >> LcidInvoke;
-+}
-+};
-+
-+class ProjectCodePageRecord
-+{
-+sal_Int16 Id;
-+sal_Int32 Size;
-+sal_Int16 CodePage;
-+public:
-+// #FIXME get a better default for the CodePage
-+ProjectCodePageRecord() : Id( 0x03 ), Size( 0x2 ), CodePage( 0x0 ) {}
-+void read( SvStream* pStream )
-+{
-+    OSL_TRACE("ProjectCodePageRecord [0x%x]", pStream->Tell() );
-+    *pStream >> Id >> Size >> CodePage;
-+}
-+};
-+class ProjectNameRecord
-+{
-+public:
-+sal_Int16 Id;
-+sal_Int32 SizeOfProjectName;
-+sal_uInt8* ProjectName;
-+rtl::OUString msProjectName;
-+ProjectNameRecord() : Id( 0x04 ), SizeOfProjectName( 0x0 ), ProjectName(0) {}
-+~ProjectNameRecord()
-+{
-+    delete [] ProjectName;
-+    ProjectName = 0;
-+}
-+void read( SvStream* pStream )
-+{
-+    OSL_TRACE("ProjectNameRecord [0x%x]", pStream->Tell() );
-+    *pStream >> Id >> SizeOfProjectName;
-+    if ( ProjectName )
-+        delete [] ProjectName;
-+
-+    if ( SizeOfProjectName ) 
-+    {
-+        ProjectName = new sal_uInt8[ SizeOfProjectName ];
-+        OSL_TRACE("ProjectNameRecord about to read name from [0x%x], size %d", pStream->Tell(), SizeOfProjectName );
-+        pStream->Read( ProjectName, SizeOfProjectName );
-+        msProjectName = lclCreateOUString( reinterpret_cast< const char* >( ProjectName ), ( SVX_MSOCX_COMPRESSED |  SizeOfProjectName ) );
-+    }
-+}
-+};
-+
-+class ProjectDocStringRecord
-+{
-+public:
-+sal_Int16 Id;
-+sal_Int32 SizeOfDocString;
-+sal_uInt8* DocString;
-+sal_Int16 Reserved;
-+sal_Int32 SizeOfDocStringUnicode;
-+sal_uInt8* DocStringUnicode;
-+
-+ProjectDocStringRecord() : Id( 0x5 ), SizeOfDocString( 0x0 ), DocString( 0 ), Reserved( 0x0 ), SizeOfDocStringUnicode( 0 ), DocStringUnicode( 0 ) {}
-+
-+~ProjectDocStringRecord()
-+{
-+    delete [] DocString;
-+    delete [] DocStringUnicode;
-+    DocString = 0;
-+    DocStringUnicode = 0;
-+}
-+void read( SvStream* pStream )
-+{
-+    OSL_TRACE("ProjectDocStringRecord [0x%x]", pStream->Tell() );
-+    *pStream >> Id >> SizeOfDocString;
-+
-+    if ( DocString )
-+        delete [] DocString;
-+
-+    DocString = new sal_uInt8[ SizeOfDocString ];
-+    pStream->Read( DocString, SizeOfDocString );
-+
-+    if ( SizeOfDocStringUnicode )
-+        delete [] DocStringUnicode;
-+
-+    *pStream >> Reserved >> SizeOfDocStringUnicode;
-+
-+    if ( DocStringUnicode )
-+        delete [] DocStringUnicode;
-+
-+    DocStringUnicode =  new sal_uInt8[ SizeOfDocStringUnicode ];
-+
-+    pStream->Read( DocStringUnicode, SizeOfDocStringUnicode );
-+}
-+
-+};
-+
-+class ProjectHelpFilePath
-+{
-+public:
-+sal_Int16 Id;
-+sal_Int32 SizeOfHelpFile1;
-+sal_uInt8* HelpFile1;
-+sal_Int16 Reserved;
-+sal_Int32 SizeOfHelpFile2;
-+sal_uInt8* HelpFile2;
-+
-+ProjectHelpFilePath() : Id( 0x06 ), SizeOfHelpFile1(0), HelpFile1(0), Reserved(0x0), SizeOfHelpFile2(0), HelpFile2(0) {}
-+~ProjectHelpFilePath()
-+{
-+    if ( HelpFile1 )
-+        delete [] HelpFile1;
-+    if ( HelpFile2 )
-+        delete [] HelpFile2;
-+    HelpFile1 = 0;
-+    HelpFile2 = 0;
-+}
-+void read( SvStream* pStream )
-+{
-+    OSL_TRACE("ProjectHelpFilePath [0x%x]", pStream->Tell() );
-+    *pStream >> Id >> SizeOfHelpFile1;
-+
-+    if ( HelpFile1 )
-+        delete HelpFile1;
-+
-+    HelpFile1 = new sal_uInt8[ SizeOfHelpFile1 ];
-+    pStream->Read( HelpFile1, SizeOfHelpFile1 );
-+
-+    *pStream >> Reserved >> SizeOfHelpFile2;
-+
-+    if ( HelpFile2 )
-+        delete HelpFile2;
-+
-+    HelpFile2 = new sal_uInt8[ SizeOfHelpFile2 ];
-+    pStream->Read( HelpFile2, SizeOfHelpFile2 );
-+  
-+}
-+};
-+
-+class ProjectHelpContextRecord
-+{
-+public:
-+sal_Int16 Id;
-+sal_Int32 Size;    
-+sal_Int32 HelpContext;    
-+
-+ProjectHelpContextRecord() : Id( 0x7 ), Size( 0x4 ), HelpContext( 0 ) {}
-+void read( SvStream* pStream )
-+{
-+    
-+   OSL_TRACE("ProjectHelpContextRecord [0x%x]", pStream->Tell() );
-+   *pStream >> Id >> Size >> HelpContext;
-+}
-+
-+};
-+
-+class ProjectLibFlagsRecord
-+{
-+sal_Int16 Id;
-+sal_Int32 Size;
-+sal_Int32 ProjectLibFlags;
-+
-+public:
-+ProjectLibFlagsRecord() : Id( 0x8 ), Size( 0x4 ), ProjectLibFlags( 0x0 ) {}
-+void read( SvStream* pStream ) 
-+{
-+    OSL_TRACE("ProjectLibFlagsRecord [0x%x]", pStream->Tell() );
-+    *pStream >> Id >> Size >> ProjectLibFlags;
-+}
-+};
-+
-+class ProjectVersionRecord
-+{
-+public:
-+sal_Int16 Id;
-+sal_Int32 Reserved;
-+sal_Int32 VersionMajor;
-+sal_Int16 VersionMinor;
-+ProjectVersionRecord() : Id( 0x9 ), Reserved( 0x4 ), VersionMajor( 0x1 ), VersionMinor( 0 ) {}
-+void read( SvStream* pStream )
-+{
-+    OSL_TRACE("ProjectVersionRecord [0x%x]", pStream->Tell() );
-+    *pStream >> Id >> Reserved >> VersionMajor >> VersionMinor;
-+}
-+};
-+
-+class ProjectConstantsRecord
-+{
-+sal_Int16 Id;
-+sal_Int32 SizeOfConstants;
-+sal_uInt8* Constants;
-+sal_Int16 Reserved;
-+sal_Int32 SizeOfConstantsUnicode;
-+sal_uInt8* ConstantsUnicode;
-+public:
-+ProjectConstantsRecord() : Id( 0xC ), SizeOfConstants( 0 ), Constants( 0 ), Reserved( 0x3C ), SizeOfConstantsUnicode( 0 ), ConstantsUnicode(0) {}
-+
-+~ProjectConstantsRecord()
-+{
-+    delete [] Constants;
-+    Constants = 0;
-+    delete [] ConstantsUnicode;
-+    ConstantsUnicode = 0;
-+}
-+
-+void read( SvStream* pStream )
-+{
-+    OSL_TRACE("ProjectConstantsRecord [0x%x]", pStream->Tell() );
-+   *pStream >> Id >> SizeOfConstants;
-+    if ( Constants )
-+        delete [] Constants;
-+    Constants = new sal_uInt8[ SizeOfConstants ];
-+
-+    pStream->Read( Constants, SizeOfConstants );
-+
-+    *pStream >> Reserved;
-+
-+    if ( ConstantsUnicode )
-+        delete [] ConstantsUnicode;
-+
-+    *pStream >> SizeOfConstantsUnicode;
-+
-+    ConstantsUnicode = new sal_uInt8[ SizeOfConstantsUnicode ];
-+    pStream->Read( ConstantsUnicode, SizeOfConstantsUnicode );
-+}
-+
-+};
-+
-+class ReferenceNameRecord
-+{
-+public:
-+sal_Int16 Id;
-+sal_Int32 SizeOfName;
-+sal_uInt8* Name;
-+sal_Int16 Reserved;
-+sal_Int32 SizeOfNameUnicode;
-+sal_uInt8* NameUnicode;
-+
-+ReferenceNameRecord() : Id( 0x16 ), SizeOfName( 0 ), Name( 0 ), Reserved( 0x3E ), SizeOfNameUnicode( 0 ), NameUnicode( 0 ) {}
-+~ReferenceNameRecord()
-+{
-+    delete [] Name;
-+    Name = 0;
-+    delete [] NameUnicode;
-+    NameUnicode = 0;
-+}
-+
-+void read( SvStream* pStream )
-+{
-+    OSL_TRACE("NameRecord [0x%x]", pStream->Tell() );
-+    *pStream >> Id >> SizeOfName;
-+ 
-+    if ( Name )
-+        delete [] Name;
-+
-+    Name = new sal_uInt8[ SizeOfName ];
-+
-+    pStream->Read( Name, SizeOfName );
-+
-+    *pStream >> Reserved >> SizeOfNameUnicode;
-+
-+    if ( NameUnicode )
-+        delete [] Name;
-+
-+    NameUnicode = new sal_uInt8[ SizeOfNameUnicode ];
-+    pStream->Read( NameUnicode, SizeOfNameUnicode );
-+}
-+
-+};
-+
-+// Baseclass for ReferenceControlRecord, ReferenceRegisteredRecord, ReferenceProjectRecord
-+class DirDumper; 
-+
-+class BaseReferenceRecord 
-+{
-+public:
-+virtual ~BaseReferenceRecord(){}
-+virtual bool read( SvStream* pStream ) = 0;
-+virtual void import( VBA_Impl& ){}
-+};
-+
-+
-+class ReferenceProjectRecord : public BaseReferenceRecord
-+{
-+public:
-+    sal_uInt16 Id;
-+    sal_uInt32 Size;
-+    sal_uInt32 SizeOfLibidAbsolute;
-+    sal_uInt8* pLibidAbsolute;
-+    sal_uInt32 SizeOfLibidRelative; 
-+    sal_uInt8* pLibidRelative;
-+    sal_uInt32 MajorVersion;
-+    sal_uInt16 MinorVersion;
-+    rtl::OUString msAbsoluteLibid; 
-+    rtl::OUString msRelativeLibid; 
-+
-+    virtual bool read( SvStream* pStream );
-+    virtual void import( VBA_Impl& rDir );
-+    ReferenceProjectRecord();
-+    ~ReferenceProjectRecord();
-+};
-+
-+ReferenceProjectRecord::ReferenceProjectRecord() : Id( 0x000E ), Size( 0 ), SizeOfLibidAbsolute( 0 ), pLibidAbsolute( NULL ), SizeOfLibidRelative( 0 ), pLibidRelative( 0 ), MajorVersion( 0 ), MinorVersion( 0 )
-+{ 
-+}
-+
-+ReferenceProjectRecord::~ReferenceProjectRecord()
-+{
-+    if ( pLibidAbsolute )
-+        delete[] pLibidAbsolute;
-+    if ( pLibidRelative )
-+        delete[] pLibidRelative;
-+}
-+
-+bool ReferenceProjectRecord::read( SvStream* pStream )
-+{
-+    OSL_TRACE("ReferenceProjectRecord [0x%x]", pStream->Tell() ); 
-+    *pStream >> Id >> Size >> SizeOfLibidAbsolute;
-+
-+    if ( SizeOfLibidAbsolute )
-+    {
-+        pLibidAbsolute = new sal_uInt8[ SizeOfLibidAbsolute ];
-+        OSL_TRACE("ReferenceProjectRecord about to read LibidAbsolute at [0x%x]", pStream->Tell() );
-+        pStream->Read( pLibidAbsolute, SizeOfLibidAbsolute );
-+    }
-+
-+    *pStream >> SizeOfLibidRelative; 
-+
-+    if ( SizeOfLibidRelative )
-+    {
-+        pLibidRelative = new sal_uInt8[ SizeOfLibidRelative ];
-+        OSL_TRACE("ReferenceProjectRecord about to read LibidRelative at [0x%x]", pStream->Tell() );
-+        pStream->Read( pLibidRelative, SizeOfLibidRelative );
-+    }
-+
-+    *pStream >> MajorVersion >> MinorVersion;
-+
-+    // array size is ORed with SVX_MSOCX_COMPRESSED to force processing of ascii bytes ( and not 
-+    // 16 bit unicode )
-+    // the offset of 3 is needed to skip the ProjectReference "*\" and project kind ( 0x4[1-4] ) info.
-+
-+    msAbsoluteLibid = lclCreateOUString( reinterpret_cast< const char* >( pLibidAbsolute + 3 ), ( SVX_MSOCX_COMPRESSED | (SizeOfLibidAbsolute - 3 )));
-+    msRelativeLibid = lclCreateOUString( reinterpret_cast< const char* >( pLibidRelative + 3 ), ( SVX_MSOCX_COMPRESSED | ( SizeOfLibidRelative -3 )));
-+
-+    OSL_TRACE("ReferenceProjectRecord - absolute path %s", rtl::OUStringToOString( msAbsoluteLibid, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    OSL_TRACE("ReferenceProjectRecord - relative path %s", rtl::OUStringToOString( msRelativeLibid, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    return true;
-+}
-+
-+void ReferenceProjectRecord::import( VBA_Impl& rDir )
-+{
-+    rDir.AddProjectReference( msAbsoluteLibid );
-+}
-+
-+class ReferenceRegisteredRecord : public BaseReferenceRecord
-+{
-+public:
-+    sal_uInt16 Id;
-+    sal_uInt32 Size;
-+    sal_uInt32 SizeOfLibid;
-+    sal_uInt8* pLibid;
-+    sal_Int32 Reserved1;
-+    sal_Int16 Reserved2;
-+
-+    ReferenceRegisteredRecord();
-+    ~ReferenceRegisteredRecord();
-+    bool read( SvStream* pStream );
-+};
-+
-+ReferenceRegisteredRecord::ReferenceRegisteredRecord() : Id( 0x000D ), Size( 0 ), SizeOfLibid( 0 ), pLibid( NULL ), Reserved1( 0 ), Reserved2( 0 )
-+{
-+}
-+
-+ReferenceRegisteredRecord::~ReferenceRegisteredRecord()
-+{
-+    if ( pLibid )
-+    {
-+        delete[] pLibid;
-+    }
-+}
-+
-+bool 
-+ReferenceRegisteredRecord::read( SvStream* pStream )
-+{
-+    OSL_TRACE("ReferenceRegisteredRecord [0x%x]", pStream->Tell() ); 
-+    *pStream >> Id >> Size >> SizeOfLibid;
-+    if ( SizeOfLibid )
-+    {
-+        pLibid = new sal_uInt8[ SizeOfLibid ];
-+        OSL_TRACE("ReferenceRegisteredRecord about to read Libid [0x%x]", pStream->Tell() ); 
-+        pStream->Read( pLibid, SizeOfLibid );
-+    }
-+    *pStream >> Reserved1 >> Reserved2;
-+    return true;
-+}
-+
-+class ReferenceOriginalRecord
-+{
-+public:
-+    sal_uInt16 Id;
-+    sal_uInt32 SizeOfLibOriginal;
-+    sal_uInt8* pLibidOriginal;
-+
-+
-+ReferenceOriginalRecord() : Id( 0x033 ), SizeOfLibOriginal( 0 ), pLibidOriginal( NULL )
-+{
-+}
-+
-+~ReferenceOriginalRecord()
-+{
-+    if ( pLibidOriginal )
-+        delete[] pLibidOriginal;
-+}
-+
-+void read( SvStream* pStream )
-+{
-+    *pStream >> Id >> SizeOfLibOriginal;
-+    if ( SizeOfLibOriginal )
-+    {
-+        pLibidOriginal = new sal_uInt8[ SizeOfLibOriginal ];
-+        pStream->Read( pLibidOriginal, SizeOfLibOriginal );
-+    }
-+}
-+
-+};
-+
-+class ReferenceControlRecord : public BaseReferenceRecord
-+{
-+public:
-+ReferenceOriginalRecord OriginalRecord;
-+sal_Int16 Id;
-+sal_uInt32 SizeTwiddled;
-+sal_uInt32 SizeOfLibidTwiddled;
-+sal_uInt8* LibidTwiddled;
-+sal_uInt32 Reserved1;
-+sal_uInt16 Reserved2;
-+ReferenceNameRecord* NameRecordExtended;// Optional
-+sal_uInt16 Reserved3;
-+sal_uInt32 SizeExtended;
-+sal_uInt32 SizeOfLibidExtended;
-+sal_uInt8* LibidExtended;
-+sal_uInt32 Reserved4;
-+sal_uInt16 Reserved5;
-+sal_uInt8  OriginalTypeLib[ 16 ];
-+sal_uInt32 Cookie;
-+
-+ReferenceControlRecord() : Id( 0x2F ), SizeTwiddled( 0 ), SizeOfLibidTwiddled( 0 ), LibidTwiddled( 0 ), Reserved1( 0 ), Reserved2( 0 ), NameRecordExtended( 0 ), Reserved3( 0x30 ), SizeExtended( 0 ), SizeOfLibidExtended( 0 ), LibidExtended( 0 ), Reserved4( 0 ), Reserved5( 0 ), Cookie( 0 )
-+{
-+    for( int i = 0; i < 16; ++i )
-+        OriginalTypeLib[ i ] = 0;
-+}
-+
-+~ReferenceControlRecord()
-+{
-+    delete LibidTwiddled;
-+    delete NameRecordExtended;
-+    delete [] LibidExtended;
-+    LibidTwiddled = 0;
-+    NameRecordExtended = 0;
-+    LibidExtended = 0;
-+}
-+
-+bool read( SvStream* pStream )
-+{
-+    OSL_TRACE("ReferenceControlRecord [0x%x]", pStream->Tell() ); 
-+    OriginalRecord.read( pStream );
-+    *pStream >> Id >> SizeTwiddled >> SizeOfLibidTwiddled;
-+
-+    if ( SizeOfLibidTwiddled )
-+    {
-+        LibidTwiddled = new sal_uInt8[ SizeOfLibidTwiddled ];
-+        pStream->Read( LibidTwiddled,  SizeOfLibidTwiddled );
-+    }
-+
-+    *pStream >> Reserved1 >> Reserved2;
-+
-+    long nPos = pStream->Tell();
-+    // peek at the id for optional NameRecord
-+    sal_Int16 nTmpId;
-+    *pStream >> nTmpId;
-+    if ( nTmpId == 0x30 )
-+    {
-+        Reserved3 = 0x30;
-+    }
-+    else
-+    {
-+        pStream->Seek( nPos );
-+        NameRecordExtended = new ReferenceNameRecord();
-+        NameRecordExtended->read( pStream );
-+        *pStream >> Reserved3;
-+    }
-+    *pStream >> SizeExtended >> SizeOfLibidExtended;
-+
-+    if ( SizeExtended )
-+    {
-+        LibidExtended = new sal_uInt8[ SizeOfLibidExtended ]; 
-+        pStream->Read( LibidExtended, SizeOfLibidExtended );
-+    } 
-+
-+    *pStream >> Reserved4;
-+    *pStream >> Reserved5;
-+
-+    pStream->Read( OriginalTypeLib, sizeof( OriginalTypeLib ) );
-+    *pStream >> Cookie;
-+    return true;
-+}
-+
-+};
-+
-+class ReferenceRecord : public BaseReferenceRecord
-+{
-+public:
-+// NameRecord is Optional
-+ReferenceNameRecord* NameRecord;
-+BaseReferenceRecord*  aReferenceRecord;
-+ReferenceRecord(): NameRecord(0), aReferenceRecord(0) {}
-+~ReferenceRecord()
-+{
-+    if ( NameRecord )
-+        delete NameRecord;       
-+    if ( aReferenceRecord )
-+        delete aReferenceRecord;       
-+}
-+
-+// false return would mean failed to read Record e.g. end of array encountered
-+// Note: this read routine will make sure the stream is pointing to where it was the 
-+// method was called ) 
-+
-+bool read( SvStream* pStream )
-+{
-+    OSL_TRACE("ReferenceRecord [0x%x]", pStream->Tell() );
-+    bool bRead = true;
-+    long nStart = pStream->Tell();
-+    long nPos = nStart;
-+    // Peek at the ID 
-+    sal_Int16 Id;
-+    *pStream >> Id;
-+    pStream->Seek( nPos ); // place back before Id
-+    if ( Id == 0x16 ) // Optional NameRecord
-+    {
-+        NameRecord = new ReferenceNameRecord();
-+        NameRecord->read( pStream ); 
-+    }
-+    else if ( Id == 0x0f )
-+    {
-+        pStream->Seek( nStart );
-+        bRead = false;
-+        return bRead; // start of module, terminate read
-+    }
-+
-+    nPos = pStream->Tell(); // mark position, peek at next Id
-+    *pStream >> Id;
-+    pStream->Seek( nPos ); // place back before Id
-+
-+    switch( Id )
-+    {
-+        case 0x0D:
-+            aReferenceRecord = new ReferenceRegisteredRecord();
-+            break; 
-+        case 0x0E:
-+            aReferenceRecord = new ReferenceProjectRecord();
-+            break; 
-+        case 0x2F:
-+        case 0x33:
-+            aReferenceRecord = new ReferenceControlRecord();
-+            break; 
-+        default:
-+            bRead = false;
-+            OSL_TRACE("Big fat error, unknown ID 0x%x", Id);
-+            break;
-+    } 
-+    if ( bRead )
-+        aReferenceRecord->read( pStream );
-+    return bRead;
-+}
-+
-+void import( VBA_Impl& rVBA )
-+{
-+    if ( aReferenceRecord )
-+        aReferenceRecord->import( rVBA );
-+}
-+
-+};
-+
-+class DirDumper
-+{
-+public:
-+ProjectSysKindRecord mSysKindRec;
-+ProjectLcidRecord mLcidRec;
-+ProjectLcidInvokeRecord mLcidInvokeRec;
-+ProjectCodePageRecord mCodePageRec;
-+ProjectNameRecord mProjectNameRec;
-+ProjectDocStringRecord mDocStringRec;
-+ProjectHelpFilePath mHelpFileRec;
-+ProjectHelpContextRecord mHelpContextRec;
-+ProjectLibFlagsRecord mLibFlagsRec;
-+ProjectVersionRecord mVersionRec;
-+ProjectConstantsRecord mConstantsRecord;
-+std::vector< ReferenceRecord* > ReferenceArray;
-+
-+DirDumper() {}
-+~DirDumper() 
-+{
-+    for ( std::vector< ReferenceRecord* >::iterator it = ReferenceArray.begin(); it != ReferenceArray.end(); ++it )
-+        delete *it;
-+    
-+}
-+
-+void read( SvStream* pStream )
-+{
-+    sal_Int32 nPos = pStream->Tell();
-+    std::ofstream aDump("dir.dump");
-+    while ( !pStream->IsEof() ) 
-+    {
-+        sal_Int8 aByte;
-+        *pStream >> aByte;
-+        aDump << aByte;
-+    }
-+    aDump.flush();
-+    pStream->Seek( nPos );
-+    readProjectInformation( pStream );
-+    readProjectReferenceInformation( pStream );
-+}
-+
-+void readProjectReferenceInformation( SvStream* pStream )
-+{
-+    bool bKeepReading = true;
-+    while( bKeepReading )
-+    {
-+        ReferenceRecord* pRef = new ReferenceRecord();
-+        bKeepReading = pRef->read( pStream );
-+        if ( bKeepReading ) 
-+            ReferenceArray.push_back( pRef );
-+    }
-+}
-+
-+void readProjectInformation( SvStream* pStream )
-+{
-+    mSysKindRec.read( pStream );
-+    mLcidRec.read( pStream ); 
-+    mLcidInvokeRec.read( pStream );
-+    mCodePageRec.read( pStream );
-+    mProjectNameRec.read( pStream );
-+    mDocStringRec.read( pStream );
-+    mHelpFileRec.read( pStream );
-+    mHelpContextRec.read( pStream );
-+    mLibFlagsRec.read( pStream );
-+    mVersionRec.read( pStream ); 
-+    sal_Int32 nPos = pStream->Tell();
-+    sal_uInt16 nTmp;
-+    *pStream >> nTmp;
-+    if ( nTmp == 0x0C )
-+    {
-+        pStream->Seek( nPos );
-+        mConstantsRecord.read( pStream );
-+    }
-+    OSL_TRACE("After Information pos is 0x%x", pStream->Tell() );
-+}
-+
-+void import( VBA_Impl& rVBA )
-+{
-+    // get project references
-+    for ( std::vector< ReferenceRecord* >::iterator it = ReferenceArray.begin(); it != ReferenceArray.end(); ++it )
-+        (*it)->import( rVBA );
-+    rVBA.SetProjectName( mProjectNameRec.msProjectName );
-+    
-+}
-+};
-+
-+
- /*
- A few urls which may in the future be of some use
- http://www.virusbtn.com/vb2000/Programme/papers/bontchev.pdf
-@@ -155,7 +1075,17 @@ int VBA_Impl::ReadVBAProject(const SvSto
-     xVBAProject = rxVBAStorage->OpenSotStream(
-                     String( RTL_CONSTASCII_USTRINGPARAM( "_VBA_PROJECT" ) ),
- 					STREAM_STD_READ | STREAM_NOCREATE );
--
-+    // read Dir stream
-+    SvStorageStreamRef xDir = rxVBAStorage->OpenSotStream(
-+                    String( RTL_CONSTASCII_USTRINGPARAM( "dir" ) ),
-+					STREAM_STD_READ | STREAM_NOCREATE );
-+    // decompress the stream
-+    std::auto_ptr< SvMemoryStream > xCmpDir;
-+    xCmpDir.reset( MSLZSS::decompressAsStream( xDir, 0 ) );
-+    // try to parse the dir stream
-+    DirDumper dDump;
-+    dDump.read( xCmpDir.get() );
-+    dDump.import( *this );
- 	if( !xVBAProject.Is() || SVSTREAM_OK != xVBAProject->GetError() )
- 	{
- 		DBG_WARNING("Not able to find vba project, cannot find macros");
-@@ -455,6 +1385,7 @@ bool VBA_Impl::Open( const String &rTopl
- 	if( !xMacros.Is() || SVSTREAM_OK != xMacros->GetError() )
- 	{
- 		DBG_WARNING("No Macros Storage");
-+		OSL_TRACE("No Macros Storage");
- 	}
- 	else
- 	{
-@@ -464,6 +1395,7 @@ bool VBA_Impl::Open( const String &rTopl
- 		if( !xVBA.Is() || SVSTREAM_OK != xVBA->GetError() )
- 		{
- 			DBG_WARNING("No Visual Basic in Storage");
-+			OSL_TRACE("No Visual Basic in Storage");
- 		}
- 		else
- 		{
-@@ -478,6 +1410,7 @@ bool VBA_Impl::Open( const String &rTopl
-          * ( value ) is either a Class Module, Form Module or a plain VB Module.        */
-         SvStorageStreamRef xProject = xMacros->OpenSotStream(
-             String( RTL_CONSTASCII_USTRINGPARAM( "PROJECT" ) ) );
-+
-         SvStorageStream* pStp = xProject;
-         UniString tmp;
-         static const String sThisDoc(   RTL_CONSTASCII_USTRINGPARAM( "ThisDocument" ) );
---- svx/source/msfilter/msvbasic.hxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ svx/source/msfilter/msvbasic.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -97,9 +97,14 @@ public:
-     //
-     // #117718# member map of module names to types of module
-     ModType GetModuleType( const UniString& rModuleName );
--
--    std::vector<String> maReferences;
-+    rtl::OUString& ProjectName() { return msProjectName; }
-+    void SetProjectName( const rtl::OUString& rPName ) { msProjectName = rPName; }
-+    const std::vector<rtl::OUString>& ProjectReferences() { return maPrjReferences; }
-+    void AddProjectReference( const rtl::OUString& rProject ) { maPrjReferences.push_back( rProject); }
-+    SvStorage* GetStorage() { return xStor; }
- private:
-+    std::vector<rtl::OUString> maReferences;
-+    std::vector<rtl::OUString> maPrjReferences;
-     struct VBAOffset_Impl
-     {
-         String sName;
-@@ -125,6 +130,7 @@ private:
-     int ReadVBAProject(const SvStorageRef &rxVBAStorage);
-     int DecompressVBA(int index, SvStorageStreamRef &rxVBAStream);
-     sal_uInt8 ReadPString(SvStorageStreamRef &xVBAProject, bool bIsUnicode);
-+    rtl::OUString msProjectName;
- };
- 
- #endif
---- svx/source/msfilter/svxmsbas.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ svx/source/msfilter/svxmsbas.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -83,6 +83,7 @@ int SvxImportMSVBasic::Import( const Str
- 								const String &rSubStorageName,
- 								BOOL bAsComment, BOOL bStripped )
- {
-+        msProjectName = rtl::OUString();
- 	int nRet = 0;
- 	if( bImport && ImportCode_Impl( rStorageName, rSubStorageName,
- 									bAsComment, bStripped ))
-@@ -100,7 +101,42 @@ int SvxImportMSVBasic::Import( const Str
- bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
-     const String& rSubStorageName, BOOL bVBAMode )
- {
--    SvStorageRef xVBAStg(xRoot->OpenSotStorage(rStorageName,
-+    BOOL bRet = FALSE;
-+    // #FIXME VBA_Impl ( or some other new class ) should handle both userforms
-+    // and code 
-+	VBA_Impl aVBA( *xRoot, TRUE );
-+    // This call is a waste we read the source ( again ) only to get the refereneces
-+    // *AGAIN*, we really need to rewrite all of this
-+    aVBA.Open( rStorageName, rSubStorageName ); 
-+
-+    bRet = ImportForms_Impl( aVBA, rStorageName, rSubStorageName, bVBAMode );
-+	std::vector<rtl::OUString> sProjectRefs = aVBA.ProjectReferences();
-+
-+	for ( std::vector<rtl::OUString>::iterator it = sProjectRefs.begin(); it != sProjectRefs.end(); ++it )
-+    {
-+       rtl::OUString sFileName = *it;
-+#ifndef WIN 
-+#ifdef DEBUG
-+       // hacky test code to read referenced projects on linux
-+       sal_Int32 nPos = (*it).lastIndexOf('\\');
-+       sFileName = (*it).copy( nPos + 1 );
-+       sFileName =  rtl::OUString::createFromAscii("~/Documents/") + sFileName;
-+#endif
-+#endif
-+       SotStorageRef rRoot = new SotStorage( sFileName, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
-+	   VBA_Impl refVBA( *rRoot, TRUE );        
-+       refVBA.Open( rStorageName, rSubStorageName );
-+       // The return from ImportForms doesn't indicate and error ( it could )
-+       // but also it just means no userforms were imported
-+       if ( ImportForms_Impl( refVBA, rStorageName, rSubStorageName, bVBAMode ) )
-+           bRet = true; // mark that at least on userform was imported
-+    }
-+    return bRet;
-+}
-+
-+bool SvxImportMSVBasic::ImportForms_Impl( VBA_Impl& rVBA, const String& rStorageName, const String& rSubStorageName, BOOL bVBAMode )
-+{
-+    SvStorageRef xVBAStg(rVBA.GetStorage()->OpenSotStorage(rStorageName,
-         STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL));
-     if (!xVBAStg.Is() || xVBAStg->GetError())
-         return false;
-@@ -133,6 +169,10 @@ bool SvxImportMSVBasic::ImportForms_Impl
-         DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
- 
-         String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-+
-+        if (rVBA.ProjectName().getLength() )
-+            aLibName = rVBA.ProjectName();
-+        OSL_TRACE( "userformage lib name %s", rtl::OUStringToOString( aLibName, RTL_TEXTENCODING_UTF8 ).getStr() );
-         Reference<XNameContainer> xLib;
-         if (xLibContainer.is())
-         {
-@@ -260,17 +300,55 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
- {
- 	BOOL bRet = FALSE;
- 	VBA_Impl aVBA( *xRoot, bAsComment );
-+        
- 	if( aVBA.Open(rStorageName,rSubStorageName) )
- 	{
-+        msProjectName = aVBA.ProjectName();
-+
-+        if ( msProjectName.getLength() )
-+            rDocSh.GetBasicManager()->SetName( msProjectName ); // set name of Project
-+
-+        bRet = ImportCode_Impl( aVBA, bAsComment, bStripped );
-+    	std::vector<rtl::OUString> sProjectRefs = aVBA.ProjectReferences();
-+    
-+    	for ( std::vector<rtl::OUString>::iterator it = sProjectRefs.begin(); it != sProjectRefs.end(); ++it )
-+        {
-+            rtl::OUString sFileName = *it;
-+#ifndef WIN 
-+#ifdef DEBUG
-+            // hacky test code to read referenced projects on linux
-+            sal_Int32 nPos = (*it).lastIndexOf('\\');
-+            sFileName = (*it).copy( nPos + 1 );
-+            sFileName =  rtl::OUString::createFromAscii("~/Documents/") + sFileName;
-+#endif
-+#endif
-+    		OSL_TRACE("referenced project %s ", rtl::OUStringToOString( sFileName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+            SotStorageRef rRoot = new SotStorage( sFileName, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
-+    	    VBA_Impl refVBA( *rRoot, bAsComment );
-+    	    if( refVBA.Open(rStorageName,rSubStorageName) && ImportCode_Impl( refVBA, bAsComment, bStripped ) )
-+                bRet = TRUE; // mark that some code was imported
-+        }
-+    }
-+    return bRet;
-+}
-+
-+BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, BOOL bAsComment, BOOL bStripped )
-+{
-+        BOOL bRet = FALSE;
- 		SFX_APP()->EnterBasicCall();
-         Reference<XLibraryContainer> xLibContainer = rDocSh.GetBasicContainer();
- 		DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
- 
-         UINT16 nStreamCount = aVBA.GetNoStreams();
- 		Reference<XNameContainer> xLib;
-+
-+        String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-+
-         if( xLibContainer.is() && nStreamCount )
-         {
--            String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-+            if ( aVBA.ProjectName().getLength() )
-+                aLibName = aVBA.ProjectName();
-+
- 		    if( !xLibContainer->hasByName( aLibName ) )
- 			    xLibContainer->createLibrary( aLibName );
- 
-@@ -282,7 +360,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
-             Reference< container::XNameAccess > xVBAObjectForCodeName;
- 			if ( !bAsComment )
-             {
--                rDocSh.GetBasic()->SetVBAEnabled( true );
-+                rDocSh.GetBasicManager()->GetLib( aLibName )->SetVBAEnabled( true );
-                 Reference< XMultiServiceFactory> xSF(rDocSh.GetModel(), UNO_QUERY);
-                 if ( xSF.is() )
-                 {
-@@ -483,7 +561,6 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
- 		}
-         if( bRet )
- 		SFX_APP()->LeaveBasicCall();
--	}
- 	return bRet;
- }
- 
---- sw/inc/unocoll.hxx.old	2009-04-02 10:50:57.000000000 +0000
-+++ sw/inc/unocoll.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -194,8 +194,10 @@ class SwUnoCollection
- #define SW_SERVICE_CHART2_DATA_PROVIDER                 106
- #define SW_SERVICE_TYPE_FIELDMARK                       107
- #define SW_SERVICE_TYPE_FORMFIELDMARK                   108
-+#define SW_SERVICE_VBAOBJECTPROVIDER                    109
-+#define SW_SERVICE_VBACODENAMEPROVIDER                  110
- 
--#define SW_SERVICE_LAST                 SW_SERVICE_TYPE_FORMFIELDMARK
-+#define SW_SERVICE_LAST                 SW_SERVICE_VBACODENAMEPROVIDER
- 
- #define SW_SERVICE_INVALID			USHRT_MAX
- 
---- sw/prj/build.lst
-+++ sw/prj/build.lst
-@@ -1,4 +1,4 @@
--sw	sw	:    l10n connectivity OOo:writerperfect OOo:lotuswordpro svx stoc uui writerfilter NULL
-+sw	sw	:    l10n connectivity OOo:writerperfect OOo:lotuswordpro svx stoc uui writerfilter vbahelper NULL
- sw	sw										usr1	-	all	sw_mkout NULL
- sw	sw\inc									nmake		-	all	sw_inc NULL
- sw	sw\uiconfig\layout									nmake	-	all	sw_layout NULL
-@@ -33,6 +33,7 @@ sw      sw\source\ui\smartmenu
- sw      sw\source\ui\table                                              nmake   -       all     sw_table sw_inc NULL
- sw	sw\source\ui\uiview						nmake	-	all	sw_uivw sw_sdi sw_inc NULL
- sw	sw\source\ui\uno						nmake	-	all	sw_uiuno sw_sdi sw_inc NULL
-+sw	sw\source\ui\vba						nmake	-	all	sw_vba sw_inc NULL
- sw	sw\source\ui\utlui						nmake	-	all	sw_utlui sw_inc NULL
- sw	sw\source\ui\web						nmake	-	all	sw_web sw_uinc sw_sdi sw_inc NULL
- sw	sw\source\ui\wrtsh						nmake	-	all	sw_wrtsh sw_inc NULL
-@@ -69,7 +70,7 @@ sw      sw\source\filter\writer
- sw      sw\source\filter\ww1                nmake   -       all     sw_ww1 sw_inc NULL
- sw      sw\source\filter\ww8                nmake   -       all     sw_ww8 sw_inc NULL
- sw      sw\source\filter\xml                nmake   -       all     sw_xml sw_inc NULL
--sw      sw\source\ui                        nmake   -       all     sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu NULL
-+sw      sw\source\ui                        nmake   -       all     sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu sw_vba NULL
- sw      sw\source\core                      nmake   -       all     sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL
- sw      sw\source\filter                    nmake   -       all     sw_flt sw_ascii sw_bsflt sw_html sw_rtf sw_wrtr sw_ww1 sw_ww8 sw_xml NULL
- sw      sw\util                             nmake   -       all     sw_util sw_core sw_flt sw_sdi sw_ui NULL
---- sw/prj/d.lst.old	2009-04-02 10:50:58.000000000 +0000
-+++ sw/prj/d.lst	2009-04-06 16:42:01.000000000 +0000
-@@ -63,6 +63,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\module
- ..\%__SRC%\bin\swd?????.dll %_DEST%\bin%_EXT%\swd?????.dll
- ..\%__SRC%\bin\swui?????.dll %_DEST%\bin%_EXT%\swui?????.dll
- ..\%__SRC%\bin\msword?????.dll %_DEST%\bin%_EXT%\msword?????.dll
-+..\%__SRC%\bin\vbaswobj*.dll %_DEST%\bin%_EXT%\vbaswobj*.dll
- ..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res
- ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
- 
---- sw/source/core/unocore/unocoll.cxx
-+++ sw/source/core/unocore/unocoll.cxx
-@@ -73,7 +73,14 @@
- #include <iterator>
- 
- #include "docsh.hxx"
--
-+#include <com/sun/star/document/XCodeNameQuery.hpp>
-+#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-+#include <com/sun/star/form/XFormsSupplier.hpp>
-+#include <com/sun/star/script/ModuleInfo.hpp>
-+#include <com/sun/star/script/ModuleType.hpp>
-+#include <com/sun/star/script/ScriptEventDescriptor.hpp>
-+#include <vbahelper/vbahelper.hxx>
-+#include <basic/basmgr.hxx>
- using ::rtl::OUString;
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::document;
-@@ -82,6 +89,119 @@ using namespace ::com::sun::star::text;
- using namespace ::com::sun::star::container;
- using namespace ::com::sun::star::lang;
- 
-+class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >
-+{
-+    SwDocShell* mpDocShell;
-+    rtl::OUString msThisDocumentCodeName;
-+public:
-+    SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {}
-+        // XCodeNameQuery
-+    rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
-+    {
-+        // Initialise the code name
-+        if ( msThisDocumentCodeName.getLength() == 0 )
-+        {
-+            try
-+            {
-+                uno::Reference< beans::XPropertySet > xProps( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
-+                uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
-+		rtl::OUString sProjectName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") ) );
-+                if ( mpDocShell->GetBasicManager()->GetName().Len() )
-+                    sProjectName =  mpDocShell->GetBasicManager()->GetName();
-+    
-+                uno::Reference< container::XNameAccess > xStandard( xLibContainer->getByName( sProjectName ), uno::UNO_QUERY_THROW );
-+                uno::Sequence< rtl::OUString > sModuleNames = xStandard->getElementNames();
-+                for ( sal_Int32 i=0; i < sModuleNames.getLength(); ++i )
-+                {
-+                    script::ModuleInfo mInfo;
-+                    if ( xStandard->getByName( sModuleNames[ i ] ) >>= mInfo )
-+                    {
-+                        if ( mInfo.ModuleType == script::ModuleType::Document )
-+                        {
-+                            msThisDocumentCodeName = sModuleNames[ i ];
-+                            break;
-+                        }
-+                    } 
-+                }
-+            }
-+            catch( uno::Exception& )
-+            {
-+            }
-+        }
-+        rtl::OUString sCodeName;
-+        if ( mpDocShell )
-+        {
-+            OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject");
-+            // need to find the page ( and index )  for this control
-+            uno::Reference< drawing::XDrawPageSupplier > xSupplier( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
-+            uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
-+            sal_Int32 nLen = xIndex->getCount();
-+            bool bMatched = false;
-+            uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;
-+                try
-+                {
-+                    uno::Reference< form::XFormsSupplier >  xFormSupplier( xIndex, uno::UNO_QUERY_THROW );
-+                    uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
-+                    // get the www-standard container
-+                    uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );
-+                    sal_Int32 nCntrls = xFormControls->getCount();
-+                    for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
-+                    {
-+                        uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );	
-+                        bMatched = ( xControl == xIf );
-+                        if ( bMatched )
-+                        {
-+                            sCodeName = msThisDocumentCodeName;
-+                            break;
-+                        }
-+                    }
-+                }
-+                catch( uno::Exception& ) {}
-+        }
-+        // Probably should throw here ( if !bMatched )
-+        return sCodeName;
-+    }
-+};
-+
-+class SwVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
-+{
-+    SwDocShell* mpDocShell;
-+public:
-+    SwVbaObjectForCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell )
-+    {
-+        // #FIXME #TODO is the code name for ThisDocument read anywhere?
-+    }
-+
-+    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
-+    {
-+        // #FIXME #TODO we really need to be checking against the codename for 
-+        // ThisDocument 
-+        if ( aName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisDocument" ) ) ) )
-+            return sal_True;
-+        return sal_False;
-+    }
-+    ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
-+    {
-+        if ( !hasByName( aName ) )
-+             throw container::NoSuchElementException();
-+	uno::Sequence< uno::Any > aArgs( 2 );
-+        aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
-+        aArgs[1] = uno::Any( mpDocShell->GetModel() );
-+        uno::Reference< uno::XInterface > xDocObj = ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.word.Document" , aArgs );
-+        OSL_TRACE("Creating Object ( ooo.vba.word.Document ) 0x%x", xDocObj.get() );
-+        return  uno::makeAny( xDocObj );
-+    }
-+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (::com::sun::star::uno::RuntimeException)
-+    {
-+        uno::Sequence< rtl::OUString > aNames;
-+        return aNames;
-+    }
-+    // XElemenAccess
-+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw (::com::sun::star::uno::RuntimeException){ return uno::Type(); }
-+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException ) { return sal_True; }
-+
-+};
-+
- /******************************************************************************
-  *
-  ******************************************************************************/
-@@ -203,6 +323,8 @@ const ProvNamesId_Type __FAR_DATA aProvN
-     { "com.sun.star.chart2.data.DataProvider",                SW_SERVICE_CHART2_DATA_PROVIDER },
-     { "com.sun.star.text.Fieldmark",                          SW_SERVICE_TYPE_FIELDMARK },
-     { "com.sun.star.text.FormFieldmark",                      SW_SERVICE_TYPE_FORMFIELDMARK },
-+    { "ooo.vba.VBAObjectModuleObjectProvider",                SW_SERVICE_VBAOBJECTPROVIDER },
-+    { "ooo.vba.VBACodeNameProvider",                          SW_SERVICE_VBACODENAMEPROVIDER },
- 
-     // case-correct versions of the service names (see #i67811)
-     { CSS_TEXT_TEXTFIELD_DATE_TIME,                   SW_SERVICE_FIELDTYPE_DATETIME },
-@@ -383,6 +505,18 @@ uno::Reference< uno::XInterface >   SwXS
-             xRet =  (cppu::OWeakObject*)pFieldmark;
-         }
-         break;
-+		case  SW_SERVICE_VBAOBJECTPROVIDER :
-+		{
-+			SwVbaObjectForCodeNameProvider* pObjProv = new SwVbaObjectForCodeNameProvider( pDoc->GetDocShell() );
-+			xRet =  (cppu::OWeakObject*)pObjProv;
-+		}
-+		break;
-+		case  SW_SERVICE_VBACODENAMEPROVIDER :
-+		{
-+			SwVbaCodeNameProvider* pObjProv = new SwVbaCodeNameProvider( pDoc->GetDocShell() );
-+			xRet =  (cppu::OWeakObject*)pObjProv;
-+		}
-+		break;
-         case  SW_SERVICE_TYPE_FOOTNOTE :
-             xRet =  (cppu::OWeakObject*)new SwXFootnote(sal_False);
-         break;
---- sw/source/filter/ww8/ww8par.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sw/source/filter/ww8/ww8par.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -132,6 +132,9 @@
- #include <svtools/itemiter.hxx>  //SfxItemIter
- 
- #include <stdio.h>
-+#include <comphelper/processfactory.hxx>
-+#include <basic/basmgr.hxx>
-+
- #include "ww8toolbar.hxx"
- #ifdef DEBUG
- #include <iostream>
-@@ -146,6 +149,76 @@ using namespace sw::util;
- using namespace sw::types;
- using namespace nsHdFtFlags;
- 
-+#include <vbahelper/vbahelper.hxx>
-+#include <com/sun/star/document/XEventsSupplier.hpp>
-+#include <com/sun/star/container/XNameReplace.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
-+const static String sModule( RTL_CONSTASCII_USTRINGPARAM("ThisDocument"));
-+
-+const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
-+const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
-+const static rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document"); 
-+
-+struct DocEventNameTable
-+{
-+    const sal_Char* sEventName;
-+    const sal_Char* sMacroName;
-+};
-+
-+const DocEventNameTable aEventNameTable[] = 
-+{
-+    {"OnNew", "Document_New"},
-+    {"OnLoad", "Document_Open"},
-+    {"OnPrepareUnload", "Document_Close"},
-+    {NULL, NULL}
-+};
-+
-+bool registerDocEvent( SfxObjectShell* pShell )
-+{
-+	bool result = false;
-+	const static rtl::OUString sEvtType( RTL_CONSTASCII_USTRINGPARAM("EventType") );
-+	const static rtl::OUString sScript( RTL_CONSTASCII_USTRINGPARAM("Script") );
-+    uno::Reference< document::XEventsSupplier > xEvtSupplier( pShell->GetModel(), uno::UNO_QUERY );
-+    if( !xEvtSupplier.is() )
-+        return result;
-+    uno::Reference< container::XNameReplace > xEvts( xEvtSupplier->getEvents(), uno::UNO_QUERY );     
-+	if ( xEvts.is() )
-+	{
-+        for( const DocEventNameTable* pTable = aEventNameTable; pTable->sEventName != NULL; pTable++ )
-+        {
-+            rtl::OUString sEvt = rtl::OUString::createFromAscii( pTable->sEventName );
-+            rtl::OUString sMacroName = rtl::OUString::createFromAscii( pTable->sMacroName );
-+            // fail to search the macro if the module is not specified.
-+            String sFullPath = ooo::vba::docMacroExists( pShell, sModule, sMacroName );
-+            if( sFullPath.Len() == 0 )
-+                continue;
-+
-+		    uno::Sequence< beans::PropertyValue > aEvents;
-+		    xEvts->getByName( sEvt ) >>= aEvents;
-+		    uno::Sequence< beans::PropertyValue > aOpenEvt( 2 );
-+		    aOpenEvt[ 0 ].Name = sEvtType;
-+		    aOpenEvt[ 0 ].Value = uno::makeAny(sScript);
-+		    aOpenEvt[ 1 ].Name = sScript;
-+            rtl::OUString sUrl = sUrlPart0.concat( sFullPath ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sUrlPart2 );
-+    		aOpenEvt[ 1 ].Value = uno::makeAny(sUrl);
-+	    	sal_Int32 nPos = aEvents.getLength();
-+
-+		    sal_Int32 nNewSize = aEvents.getLength() + aOpenEvt.getLength();
-+		    if ( nNewSize > aEvents.getLength() )
-+			    aEvents.realloc( nNewSize );
-+
-+	    	for ( sal_Int32 nIndex = nPos, nCpyIndex = 0; nIndex<nNewSize; nIndex++, nCpyIndex++ )
-+		    	aEvents[ nIndex ] = aOpenEvt[ nCpyIndex ];	
-+			
-+		    uno::Any aParam = uno::makeAny( aEvents );
-+
-+		    xEvts->replaceByName( sEvt, aParam ); 
-+		    result = true;
-+        }    
-+	}
-+	return result;
-+}
-+
- 
- SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr )
-     : SvxMSDffManager(*rRdr.pTableStream, rRdr.GetBaseURL(), rRdr.pWwFib->fcDggInfo,
-@@ -3904,7 +3977,52 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Gloss
-     }
-     else //ordinary case
-     {
-+        if (mbNewDoc && pStg && !pGloss) /*meaningless for a glossary, cmc*/
-+        {
-+            const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
-+            maTracer.EnterEnvironment(sw::log::eMacros);
-+            // Create and insert Excel vba Globals
-+            uno::Any aGlobs;
-+            aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals") );
-+            mpDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
-+            
-+            SvxImportMSVBasic aVBasic(*mpDocShell, *pStg,
-+                            pVBAFlags->IsLoadWordBasicCode(),
-+                            pVBAFlags->IsLoadWordBasicStorage() );
-+            String s1(CREATE_CONST_ASC("Macros"));
-+            String s2(CREATE_CONST_ASC("VBA"));
-+            int nRet = aVBasic.Import( s1, s2, ! pVBAFlags->IsLoadWordBasicCode() );
-+            // Read custom toolbars 
-+            if ( pWwFib->lcbCmds )
-+            {
-+                // there is a tgc255 structure
-+                long nCur = pTableStream->Tell();
-+                Tcg aTCG;
-+                pTableStream->Seek( pWwFib->fcCmds ); // point at tgc record
-+                if (!aTCG.Read( pTableStream ) )
-+                    OSL_TRACE("** Read of Customization data failed!!!! ");
-+                pTableStream->Seek( nCur ); // return to previous position, is that necessary?
-+#if DEBUG
-+                aTCG.Print( stderr );
-+#endif
-+                aTCG.ImportCustomToolBar( *mpDocShell );
-+            }
-+            if( 2 & nRet )
-+            {
-+                maTracer.Log(sw::log::eContainsVisualBasic);
-+                rDoc.SetContainsMSVBasic(true);
-+            }
-+
-+            StoreMacroCmds();
-+
-+            // Hackly to register the document event.
-+            // should be find a better solution to share the codes with Excel Workbook event. 
-+            registerDocEvent( mpDocShell );
-+
-+            maTracer.LeaveEnvironment(sw::log::eMacros);
-+        }
-         ReadText(0, pWwFib->ccpText, MAN_MAINTEXT);
-+
-     }
- 
-     ::SetProgressState(nProgress, mpDocShell);    // Update
-@@ -3978,41 +4096,6 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Gloss
-             eMode |= nsRedlineMode_t::REDLINE_ON;
-         if( pWDop->fRMView )
-             eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE;
--        if (pStg && !pGloss) /*meaningless for a glossary, cmc*/
--        {
--            // Read custom toolbars 
--            if ( pWwFib->lcbCmds )
--            {
--                // there is a tgc255 structure
--                long nCur = pTableStream->Tell();
--                Tcg aTCG;
--                pTableStream->Seek( pWwFib->fcCmds ); // point at tgc record
--                if (!aTCG.Read( pTableStream ) )
--                    OSL_TRACE("** Read of Customization data failed!!!! ");
--                pTableStream->Seek( nCur ); // return to previous position, is that necessary?
--#if DEBUG
--                aTCG.Print( stderr );
--#endif
--                aTCG.ImportCustomToolBar( mpDocShell->GetModel() );
--            }
--            const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
--            maTracer.EnterEnvironment(sw::log::eMacros);
--            SvxImportMSVBasic aVBasic(*mpDocShell, *pStg,
--                            pVBAFlags->IsLoadWordBasicCode(),
--                            pVBAFlags->IsLoadWordBasicStorage() );
--            String s1(CREATE_CONST_ASC("Macros"));
--            String s2(CREATE_CONST_ASC("VBA"));
--            int nRet = aVBasic.Import( s1, s2 );
--            if( 2 & nRet )
--            {
--                maTracer.Log(sw::log::eContainsVisualBasic);
--                rDoc.SetContainsMSVBasic(true);
--            }
--
--            StoreMacroCmds();
--
--            maTracer.LeaveEnvironment(sw::log::eMacros);
--        }
-     }
- 
-     maInsertedTables.DelAndMakeTblFrms();
---- sw/source/filter/ww8/ww8toolbar.cxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sw/source/filter/ww8/ww8toolbar.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -154,14 +154,14 @@ void CTBWrapper::Print( FILE* fp )
-     }
- }
- 
--bool CTBWrapper::ImportCustomToolBar( const uno::Reference< css::frame::XModel >& rxModel )
-+bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh )
- {
-     
-     for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it )
-     {
-         uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-         uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xAppCfgSupp( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) ) ), uno::UNO_QUERY_THROW ); 
--        CustomToolBarImportHelper helper( rxModel, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) );
-+        CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) );
-         helper.setMSOCommandMap( new  MSOWordCommandConvertor() );
-         if ( !(*it).ImportCustomToolBar( helper ) )
-             return false;
-@@ -538,9 +538,9 @@ void Tcg::Print( FILE* fp )
-     tcg->Print( fp );
- }
- 
--bool Tcg::ImportCustomToolBar( const uno::Reference< frame::XModel >& rxModel )
-+bool Tcg::ImportCustomToolBar( SfxObjectShell& rDocSh )
- {
--    return tcg->ImportCustomToolBar( rxModel );
-+    return tcg->ImportCustomToolBar( rDocSh );
- }
- 
- Tcg255::Tcg255()
-@@ -601,7 +601,7 @@ bool Tcg255::processSubStruct( sal_uInt8
-     return true;
- }
- 
--bool Tcg255::ImportCustomToolBar( const uno::Reference< css::frame::XModel >& rxModel )
-+bool Tcg255::ImportCustomToolBar( SfxObjectShell& rDocSh )
- {
-     // Find the CTBWrapper
-     for ( std::vector< Tcg255SubStruct* >::const_iterator it = rgtcgData.begin(); it != rgtcgData.end(); ++it )
-@@ -612,7 +612,7 @@ bool Tcg255::ImportCustomToolBar( const
-             CTBWrapper* pCTBWrapper =  dynamic_cast< CTBWrapper* > ( *it );
-             if ( pCTBWrapper )
-             {
--                if ( !pCTBWrapper->ImportCustomToolBar( rxModel ) )
-+                if ( !pCTBWrapper->ImportCustomToolBar( rDocSh ) )
-                     return false;
-             }
-         }
---- sw/source/filter/ww8/ww8toolbar.hxx.old	2009-04-06 16:42:00.000000000 +0000
-+++ sw/source/filter/ww8/ww8toolbar.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -117,6 +117,8 @@ public:
-     void Print( FILE* );
- };
- 
-+class SfxObjectShell; 
-+
- class CTBWrapper : public Tcg255SubStruct
- {
-     // reserved1 is the ch field of Tcg255SubStruct
-@@ -139,7 +141,7 @@ public:
-     CTBWrapper( bool bReadId = true );
-     ~CTBWrapper();
-     bool Read(SvStream *pS);
--    bool ImportCustomToolBar( const css::uno::Reference< css::frame::XModel >& rxModel );
-+    bool ImportCustomToolBar( SfxObjectShell& rDocSh );
-     void Print( FILE* );
- };
- 
-@@ -320,7 +322,7 @@ public:
-     ~Tcg255();
-     bool Read(SvStream *pS);
-     void Print( FILE* );
--    bool ImportCustomToolBar( const css::uno::Reference< css::frame::XModel >& rxModel );
-+    bool ImportCustomToolBar( SfxObjectShell& rDocSh );
- };
- 
- class Tcg: public TBBase
-@@ -333,7 +335,7 @@ public:
-     Tcg();
-     ~Tcg(){}
-     bool Read(SvStream *pS);
--    bool ImportCustomToolBar( const css::uno::Reference< css::frame::XModel >& rxModel );
-+    bool ImportCustomToolBar( SfxObjectShell& rDocSh );
-     void Print( FILE* );
- };
- 
---- sw/source/ui/uno/unotxdoc.cxx.old	2009-04-02 10:50:38.000000000 +0000
-+++ sw/source/ui/uno/unotxdoc.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -170,6 +170,7 @@ using ::osl::FileBase;
- #define SW_CREATE_MARKER_TABLE          0x06
- #define SW_CREATE_DRAW_DEFAULTS         0x07
- 
-+#include <comphelper/processfactory.hxx> 
- 
- /******************************************************************************
-  *
-@@ -362,6 +363,9 @@ SwXTextDocument::SwXTextDocument(SwDocSh
-     pxXRedlines(0),
-     m_pHiddenViewFrame(0)
- {
-+    uno::Reference< document::XDocumentProperties > xWriterProps( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.writer.DocumentProperties") ), uno::UNO_QUERY_THROW);
-+
-+    SfxBaseModel::setDocumentProperties( xWriterProps );
- }
- /*-- 18.12.98 11:53:00---------------------------------------------------
- 
-@@ -2883,6 +2887,7 @@ uno::Sequence< lang::Locale > SAL_CALL S
- {
- 	::vos::OGuard aGuard(Application::GetSolarMutex());
- 
-+
-     // possible canonical values for nScriptTypes
-     // any bit wise combination is allowed
-     const sal_Int16 nLatin   = 0x001;
---- sw/source/ui/vba/makefile.mk.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,85 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.6 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..
-+
-+PRJNAME=sw
-+TARGET=vbaswobj
-+ENABLE_EXCEPTIONS=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+DLLPRE =
-+
-+.IF "$(ENABLE_VBA)"!="YES"
-+dummy:
-+        @echo "not building vba..."
-+.ENDIF
-+ 
-+INCPRE=$(INCCOM)$/$(TARGET)
-+CDEFS+=-DVBA_OOBUILD_HACK
-+# ------------------------------------------------------------------
-+
-+SLOFILES= \
-+		$(SLO)$/vbaglobals.obj \
-+		$(SLO)$/vbaapplication.obj \
-+		$(SLO)$/vbadocument.obj \
-+		$(SLO)$/vbawindow.obj \
-+		$(SLO)$/vbasystem.obj \
-+		$(SLO)$/vbarangehelper.obj \
-+		$(SLO)$/vbarange.obj \
-+		$(SLO)$/vbabookmark.obj \
-+		$(SLO)$/vbabookmarks.obj \
-+		$(SLO)$/vbavariable.obj \
-+		$(SLO)$/vbavariables.obj \
-+		$(SLO)$/vbaview.obj \
-+		$(SLO)$/wordvbahelper.obj \
-+				$(SLO)$/service.obj \
-+				$(SLO)$/vbadocumentproperties.obj \
-+				$(SLO)$/vbapane.obj \
-+				$(SLO)$/vbapanes.obj \
-+				$(SLO)$/vbaoptions.obj \
-+				$(SLO)$/vbaselection.obj \
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :	target.mk
-+
-+ALLTAR : \
-+        $(MISC)$/$(TARGET).don \
-+
-+$(SLOFILES) : $(MISC)$/$(TARGET).don
-+
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+        echo $@
-+
---- sw/source/ui/vba/service.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/service.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,82 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: service.cxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "cppuhelper/implementationentry.hxx"
-+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-+#include "com/sun/star/registry/XRegistryKey.hpp"
-+#include "comphelper/servicedecl.hxx"
-+
-+// =============================================================================
-+// component exports
-+// =============================================================================
-+using namespace ::com::sun::star;
-+using namespace ::com::sun::star::uno;
-+
-+namespace sdecl = comphelper::service_decl;
-+
-+namespace globals
-+{
-+extern sdecl::ServiceDecl const serviceDecl;
-+}
-+
-+namespace document
-+{
-+extern sdecl::ServiceDecl const serviceDecl;
-+}
-+
-+extern "C"
-+{
-+    void SAL_CALL component_getImplementationEnvironment( 
-+        const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-+    {
-+		OSL_TRACE("In component_getImplementationEnv");
-+        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-+    }
-+
-+    sal_Bool SAL_CALL component_writeInfo( 
-+        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
-+    {
-+		OSL_TRACE("In component_writeInfo");
-+
-+	// Component registration
-+        return component_writeInfoHelper( pServiceManager, pRegistryKey, 
-+		globals::serviceDecl, document::serviceDecl ); 
-+    }
-+
-+    void * SAL_CALL component_getFactory( 
-+        const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
-+        registry::XRegistryKey * pRegistryKey )
-+    {
-+		OSL_TRACE("In component_getFactory for %s", pImplName );
-+	void* pRet =  component_getFactoryHelper(
-+        	pImplName, pServiceManager, pRegistryKey, globals::serviceDecl, document::serviceDecl );
-+	OSL_TRACE("Ret is 0x%x", pRet);
-+	return pRet;
-+    }
-+}
---- sw/source/ui/vba/vbaapplication.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbaapplication.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,135 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbaapplication.cxx,v $
-+ * $Revision: 1.7 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <stdio.h>
-+#include "vbaapplication.hxx"
-+#include "vbadocument.hxx"
-+#include <osl/file.hxx>
-+#include <vbahelper/vbahelper.hxx>
-+#include "vbawindow.hxx"
-+#include "vbasystem.hxx"
-+#include "vbaoptions.hxx"
-+#include "vbaselection.hxx"
-+
-+using namespace ::ooo;
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+using ::com::sun::star::uno::Reference;
-+using ::com::sun::star::uno::UNO_QUERY_THROW;
-+using ::com::sun::star::uno::UNO_QUERY;
-+using ::rtl::OUString;
-+
-+// Enable our own join detection for Intersection and Union
-+// should be more efficient than using ScRangeList::Join ( because
-+// we already are testing the same things )
-+
-+#define OWN_JOIN 1
-+
-+// #TODO is this defined somewhere else?
-+#if ( defined UNX ) || ( defined OS2 ) //unix
-+#define FILE_PATH_SEPERATOR "/"
-+#else // windows
-+#define FILE_PATH_SEPERATOR "\\"
-+#endif 
-+
-+#define EXCELVERSION "11.0"
-+
-+uno::Any sbxToUnoValue( SbxVariable* pVar );
-+
-+SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): SwVbaApplication_BASE( xContext )
-+{
-+}
-+
-+SwVbaApplication::~SwVbaApplication()
-+{
-+}
-+
-+rtl::OUString SAL_CALL
-+SwVbaApplication::getName() throw (uno::RuntimeException)
-+{
-+    static rtl::OUString appName( RTL_CONSTASCII_USTRINGPARAM("Microsoft Word" ) );
-+    return appName;
-+}
-+
-+uno::Reference< word::XDocument > SAL_CALL
-+SwVbaApplication::getActiveDocument() throw (uno::RuntimeException)
-+{
-+    return new SwVbaDocument( this, mxContext, getCurrentDocument() );
-+}
-+
-+uno::Reference< word::XWindow > SAL_CALL 
-+SwVbaApplication::getActiveWindow() throw (uno::RuntimeException)
-+{
-+	// #FIXME sofar can't determine Parent
-+	return new SwVbaWindow( uno::Reference< XHelperInterface >(), mxContext, getCurrentDocument() );
-+}
-+
-+uno::Reference<word::XSystem > SAL_CALL
-+SwVbaApplication::getSystem() throw (uno::RuntimeException)
-+{
-+    return uno::Reference< word::XSystem >( new SwVbaSystem( mxContext ) );
-+}
-+
-+uno::Reference<word::XOptions > SAL_CALL
-+SwVbaApplication::getOptions() throw (uno::RuntimeException)
-+{
-+    return uno::Reference< word::XOptions >( new SwVbaOptions( mxContext ) );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaApplication::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+    return VbaApplicationBase::CommandBars( aIndex );
-+}
-+
-+uno::Reference< word::XSelection > SAL_CALL
-+SwVbaApplication::getSelection() throw (uno::RuntimeException)
-+{
-+    return new SwVbaSelection( this, mxContext, getCurrentDocument() );
-+}
-+
-+rtl::OUString& 
-+SwVbaApplication::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaApplication") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaApplication::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Application" ) );
-+	}
-+	return aServiceNames;
-+}
---- sw/source/ui/vba/vbaapplication.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbaapplication.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,64 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbaapplication.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_APPLICATION_HXX
-+#define SW_VBA_APPLICATION_HXX
-+
-+#include <ooo/vba/word/XApplication.hpp>
-+#include <ooo/vba/word/XDocument.hpp>
-+#include <ooo/vba/word/XWindow.hpp>
-+#include <ooo/vba/word/XSystem.hpp>
-+#include <ooo/vba/word/XOptions.hpp>
-+#include <ooo/vba/word/XSelection.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbaapplicationbase.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+
-+//typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XApplication > SwVbaApplication_BASE;
-+typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ooo::vba::word::XApplication > SwVbaApplication_BASE;
-+
-+class SwVbaApplication : public SwVbaApplication_BASE
-+{
-+public:
-+	SwVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
-+	virtual ~SwVbaApplication();
-+
-+	// XApplication
-+    virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_APPLICATION_HXX */
---- sw/source/ui/vba/vbabookmark.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbabookmark.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,111 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbabookmark.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+#include <com/sun/star/text/XTextContent.hpp>
-+#include <com/sun/star/text/XTextViewCursor.hpp>
-+#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-+#include "vbarange.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaBookmark::SwVbaBookmark( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-+    const css::uno::Reference< frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ) :
-+    SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ), maName( rName ), mbValid( sal_True )
-+{
-+    uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( mxModel, uno::UNO_QUERY_THROW );
-+    mxBookmark.set( xBookmarksSupplier->getBookmarks()->getByName( maName ), uno::UNO_QUERY_THROW );
-+}
-+
-+SwVbaBookmark::~SwVbaBookmark()
-+{
-+}
-+
-+void SwVbaBookmark::checkVality() throw ( uno::RuntimeException )
-+{
-+    if( !mbValid )
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("The bookmark is not valid" ) ), uno::Reference< uno::XInterface >() );
-+}
-+
-+void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException )
-+{
-+    checkVality();
-+    uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
-+    xTextDocument->getText()->removeTextContent( mxBookmark );
-+    mbValid = sal_False;
-+}
-+
-+void SAL_CALL SwVbaBookmark::Select() throw ( uno::RuntimeException )
-+{
-+    checkVality();
-+    uno::Reference< text::XTextViewCursorSupplier > xViewCursorSupplier( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+    xViewCursorSupplier->getViewCursor()->gotoRange( mxBookmark->getAnchor(),sal_False );
-+}
-+
-+rtl::OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException )
-+{
-+    return maName;
-+}
-+
-+void SAL_CALL SwVbaBookmark::setName( const rtl::OUString& _name ) throw ( uno::RuntimeException )
-+{
-+    uno::Reference< container::XNamed > xNamed( mxBookmark, uno::UNO_QUERY_THROW );
-+    xNamed->setName( _name );
-+}
-+
-+uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XTextContent > xTextContent( mxBookmark, uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
-+    return uno::makeAny( uno::Reference< word::XRange>(  new SwVbaRange( this, mxContext, xTextDocument, xTextContent->getAnchor()->getStart(), xTextContent->getAnchor()->getEnd() ) ) );
-+}
-+
-+rtl::OUString& 
-+SwVbaBookmark::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmark") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaBookmark::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Bookmark" ) );
-+	}
-+	return aServiceNames;
-+}
-+
---- sw/source/ui/vba/vbabookmark.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbabookmark.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,68 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_BOOKMARK_HXX
-+#define SW_VBA_BOOKMARK_HXX
-+
-+#include <ooo/vba/word/XBookmark.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/text/XBookmarksSupplier.hpp>
-+#include <com/sun/star/text/XTextContent.hpp>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XBookmark > SwVbaBookmark_BASE;
-+
-+class SwVbaBookmark : public SwVbaBookmark_BASE
-+{
-+private:
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+    css::uno::Reference< css::text::XTextContent > mxBookmark;
-+    rtl::OUString maName;
-+    sal_Bool mbValid;
-+
-+private:
-+    void checkVality() throw ( css::uno::RuntimeException );
-+
-+public:
-+	SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
-+        const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaBookmark();
-+
-+   // Methods
-+    virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException );
-+    virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException );
-+    virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException );
-+    virtual void SAL_CALL Select() throw ( css::uno::RuntimeException );
-+    virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException );
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_BOOKMARK_HXX */
---- sw/source/ui/vba/vbabookmarks.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbabookmarks.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,193 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbabookmarks.hxx"
-+#include "vbabookmark.hxx"
-+#include <com/sun/star/container/XNamed.hpp>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+#include <com/sun/star/text/XTextViewCursor.hpp>
-+#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-+#include <ooo/vba/word/WdBookmarkSortBy.hpp>
-+#include "vbarange.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+class BookmarksEnumeration : public EnumerationHelperImpl
-+{
-+	uno::Reference< frame::XModel > mxModel;
-+	uno::WeakReference< XHelperInterface > mxParent;
-+public:
-+	BookmarksEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), mxModel( xModel ), mxParent( xParent ) {}
-+
-+	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
-+	{ 
-+		uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
-+        rtl::OUString aName = xNamed->getName();
-+		return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( mxParent, m_xContext, mxModel, aName ) ) );
-+	}
-+
-+};
-+
-+SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, xBookmarks ), mxModel( xModel ) 
-+{
-+    mxBookmarksSupplier.set( mxModel, uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
-+    mxText = xDocument->getText();
-+    
-+    // FIXME: fail to rename the bookmark
-+    // word doesn't distinguish cases, so set all bookmarknames to Lowercase
-+    //renameAllBookmarksToLowercase();
-+}
-+// XEnumerationAccess
-+uno::Type
-+SwVbaBookmarks::getElementType() throw (uno::RuntimeException)
-+{
-+	return word::XBookmark::static_type(0);
-+}
-+uno::Reference< container::XEnumeration >
-+SwVbaBookmarks::createEnumeration() throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+	return new BookmarksEnumeration( getParent(), mxContext,xEnumAccess->createEnumeration(), mxModel );
-+}
-+
-+uno::Any
-+SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource )
-+{
-+	uno::Reference< container::XNamed > xNamed( aSource, uno::UNO_QUERY_THROW );
-+    rtl::OUString aName = xNamed->getName();
-+    return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) );
-+}
-+
-+void SwVbaBookmarks::removeBookmarkByName( const rtl::OUString& rName ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< text::XTextContent > xBookmark( mxBookmarksSupplier->getBookmarks()->getByName( rName ), uno::UNO_QUERY_THROW );
-+    mxText->removeTextContent( xBookmark );
-+}
-+
-+void SwVbaBookmarks::addBookmarkByName( const rtl::OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxModel, uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmark")) ), uno::UNO_QUERY_THROW );
-+    uno::Reference< container::XNamed > xNamed( xBookmark, uno::UNO_QUERY_THROW );
-+    xNamed->setName( rName );
-+    mxText->insertTextContent( rTextRange, xBookmark, sal_False );
-+}
-+
-+void SwVbaBookmarks::renameAllBookmarksToLowercase() throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XIndexAccess > xBookmarks( mxBookmarksSupplier->getBookmarks(),uno::UNO_QUERY_THROW );
-+    for( sal_Int32 nIndex = 0; nIndex < xBookmarks->getCount(); nIndex++ )
-+    {
-+        uno::Reference< container::XNamed > xNamed( xBookmarks->getByIndex( nIndex ), uno::UNO_QUERY_THROW );
-+        rtl::OUString aName = xNamed->getName();
-+        rtl::OUString aNameLowerCase = aName.toAsciiLowerCase();
-+        if( !aName.equals( aNameLowerCase ) );
-+            xNamed->setName( aNameLowerCase );
-+    }
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< text::XTextRange > xTextRange;
-+    uno::Reference< word::XRange > xRange;
-+    if( rRange >>= xRange )
-+    {
-+        SwVbaRange* pRange = dynamic_cast< SwVbaRange* >( xRange.get() );
-+        if( pRange )
-+            xTextRange = pRange->getXTextRange();
-+    }
-+    else
-+    {
-+        // FIXME: insert the bookmark into current view cursor
-+        uno::Reference< text::XTextViewCursorSupplier > xViewCursorSupplier( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+        xTextRange.set( xViewCursorSupplier->getViewCursor(), uno::UNO_QUERY_THROW );
-+    }
-+
-+    // remove the exist bookmark
-+    rtl::OUString aName = rName.toAsciiLowerCase();
-+    if( mxBookmarksSupplier->getBookmarks()->hasByName( aName ) )
-+        removeBookmarkByName( aName );
-+    
-+    addBookmarkByName( aName, xTextRange );
-+
-+    return uno::makeAny( uno::Reference< word::XBookmark >( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) );
-+}
-+
-+sal_Int32 SAL_CALL 
-+SwVbaBookmarks::getDefaultSorting() throw (css::uno::RuntimeException)
-+{
-+    return word::WdBookmarkSortBy::wdSortByName;
-+}
-+
-+void SAL_CALL 
-+SwVbaBookmarks::setDefaultSorting( sal_Int32/* _type*/ ) throw (css::uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+sal_Bool SAL_CALL 
-+SwVbaBookmarks::getShowHidden() throw (css::uno::RuntimeException)
-+{
-+    return sal_True;
-+}
-+
-+void SAL_CALL 
-+SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+sal_Bool SAL_CALL 
-+SwVbaBookmarks::Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException)
-+{
-+    sal_Bool bExist = mxBookmarksSupplier->getBookmarks()->hasByName( rName.toAsciiLowerCase() );
-+    return bExist;
-+}
-+
-+rtl::OUString& 
-+SwVbaBookmarks::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmarks") );
-+	return sImplName;
-+}
-+
-+css::uno::Sequence<rtl::OUString> 
-+SwVbaBookmarks::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > sNames;
-+	if ( sNames.getLength() == 0 )
-+	{
-+		sNames.realloc( 1 );
-+		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Bookmarks") );
-+	}
-+	return sNames;
-+}
---- sw/source/ui/vba/vbabookmarks.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbabookmarks.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,79 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_BOOKMARKS_HXX
-+#define SW_VBA_BOOKMARKS_HXX
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <ooo/vba/word/XBookmarks.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <com/sun/star/container/XIndexAccess.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/text/XBookmarksSupplier.hpp>
-+#include <com/sun/star/text/XTextRange.hpp>
-+#include <com/sun/star/text/XText.hpp>
-+
-+typedef CollTestImplHelper< ooo::vba::word::XBookmarks > SwVbaBookmarks_BASE;
-+
-+class SwVbaBookmarks : public SwVbaBookmarks_BASE
-+{
-+private:
-+	css::uno::Reference< css::frame::XModel > mxModel;
-+    css::uno::Reference< css::text::XBookmarksSupplier > mxBookmarksSupplier;
-+    css::uno::Reference< css::text::XText > mxText;
-+
-+private:
-+    void removeBookmarkByName( const rtl::OUString& rName ) throw (css::uno::RuntimeException);
-+    void addBookmarkByName( const rtl::OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException);
-+    void renameAllBookmarksToLowercase() throw (css::uno::RuntimeException);
-+
-+public:
-+	SwVbaBookmarks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xBookmarks, const css::uno::Reference< css::frame::XModel >& xModel );
-+	virtual ~SwVbaBookmarks() {}
-+
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+
-+	// SwVbaBookmarks_BASE
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+
-+	// XBookmarks
-+    virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) throw (css::uno::RuntimeException);
-+    virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException);
-+
-+	virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException);
-+    virtual sal_Bool SAL_CALL Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException);
-+};    
-+
-+#endif /* SW_VBA_BOOKMARKS_HXX */
---- sw/source/ui/vba/vbadocument.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbadocument.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,186 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadocument.cxx,v $
-+ * $Revision: 1.7 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbadocument.hxx"
-+#include "vbarange.hxx"
-+#include "vbarangehelper.hxx"
-+#include "vbadocumentproperties.hxx"
-+#include "vbabookmarks.hxx"
-+#include "vbavariables.hxx"
-+#include <com/sun/star/text/XBookmarksSupplier.hpp>
-+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-+#include <com/sun/star/document/XDocumentProperties.hpp>
-+#include <vbahelper/helperdecl.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaDocument::SwVbaDocument( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< frame::XModel > xModel ): SwVbaDocument_BASE( xParent, xContext, xModel )
-+{
-+    Initialize();
-+}
-+SwVbaDocument::SwVbaDocument( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) : SwVbaDocument_BASE( aArgs, xContext )
-+{
-+    Initialize();
-+} 
-+
-+SwVbaDocument::~SwVbaDocument()
-+{
-+}
-+
-+void SwVbaDocument::Initialize()
-+{
-+    mxTextDocument.set( getModel(), uno::UNO_QUERY_THROW );    
-+}
-+
-+uno::Reference< word::XRange > SAL_CALL 
-+SwVbaDocument::getContent() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XTextRange > xStart = mxTextDocument->getText()->getStart();
-+    uno::Reference< text::XTextRange > xEnd;
-+    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd, sal_True ) );
-+}
-+
-+uno::Reference< word::XRange > SAL_CALL 
-+SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) throw ( uno::RuntimeException )
-+{
-+    if( !rStart.hasValue() && !rEnd.hasValue() )
-+        return getContent();
-+    
-+    sal_Int32 nStart = 0;
-+    sal_Int32 nEnd = 0;
-+    rStart >>= nStart;
-+    rEnd >>= nEnd;
-+    nStart--;
-+    nEnd--;
-+
-+    uno::Reference< text::XTextRange > xStart;
-+    uno::Reference< text::XTextRange > xEnd;
-+    if( nStart != -1 || nEnd != -1 )
-+    {
-+        if( nStart == -1 )
-+            xStart = mxTextDocument->getText()->getStart();
-+        else
-+            xStart = SwVbaRangeHelper::getRangeByPosition( mxTextDocument->getText(), nStart );
-+
-+        if( nEnd == -1 )
-+            xEnd = mxTextDocument->getText()->getEnd();
-+        else
-+            xEnd = SwVbaRangeHelper::getRangeByPosition( mxTextDocument->getText(), nEnd );
-+    }
-+
-+    if( !xStart.is() && !xEnd.is() )
-+    {
-+        try
-+        {
-+            // FIXME
-+            xStart = mxTextDocument->getText()->getStart();
-+            xEnd = mxTextDocument->getText()->getEnd();
-+        }
-+        catch( uno::Exception )
-+        {
-+            DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
-+        }    
-+    }
-+    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd ) );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaDocument::BuiltInDocumentProperties( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< XCollection > xCol( new SwVbaBuiltinDocumentProperties( mxParent, mxContext, getModel() ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaDocument::CustomDocumentProperties( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< XCollection > xCol( new SwVbaCustomDocumentProperties( mxParent, mxContext, getModel() ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaDocument::Bookmarks( const uno::Any& rIndex ) throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( getModel(),uno::UNO_QUERY_THROW );
-+    uno::Reference<container::XIndexAccess > xBookmarks( xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY_THROW );
-+    uno::Reference< XCollection > xBookmarksVba( new SwVbaBookmarks( this, mxContext, xBookmarks, getModel() ) );
-+    if (  rIndex.getValueTypeClass() == uno::TypeClass_VOID )
-+        return uno::makeAny( xBookmarksVba );
-+    
-+    return uno::Any( xBookmarksVba->Item( rIndex, uno::Any() ) );
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException )
-+{
-+    uno::Reference< document::XDocumentPropertiesSupplier > xDocumentPropertiesSupplier( getModel(),uno::UNO_QUERY_THROW );
-+    uno::Reference< document::XDocumentProperties > xDocumentProperties =  xDocumentPropertiesSupplier->getDocumentProperties();
-+    uno::Reference< beans::XPropertyAccess > xUserDefined( xDocumentProperties->getUserDefinedProperties(), uno::UNO_QUERY_THROW );
-+
-+    uno::Reference< XCollection > xVariables( new SwVbaVariables( this, mxContext, xUserDefined ) );
-+    if (  rIndex.getValueTypeClass() == uno::TypeClass_VOID )
-+        return uno::makeAny( xVariables );
-+    
-+    return uno::Any( xVariables->Item( rIndex, uno::Any() ) );
-+}
-+
-+rtl::OUString& 
-+SwVbaDocument::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocument") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaDocument::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Document" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+namespace document
-+{
-+namespace sdecl = comphelper::service_decl;
-+sdecl::vba_service_class_<SwVbaDocument, sdecl::with_args<true> > serviceImpl;
-+extern sdecl::ServiceDecl const serviceDecl(
-+    serviceImpl,
-+    "SwVbaDocument",
-+    "ooo.vba.word.Document" );
-+}
-+
---- sw/source/ui/vba/vbadocument.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbadocument.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,63 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadocument.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_DOCUMENT_HXX
-+#define SW_VBA_DOCUMENT_HXX
-+
-+#include <ooo/vba/word/XDocument.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbadocumentbase.hxx>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+
-+typedef cppu::ImplInheritanceHelper1< VbaDocumentBase, ooo::vba::word::XDocument > SwVbaDocument_BASE;
-+
-+class SwVbaDocument : public SwVbaDocument_BASE
-+{
-+private:
-+    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
-+
-+    void Initialize();
-+public:
-+	SwVbaDocument( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& m_xContext, css::uno::Reference< css::frame::XModel > xModel );
-+	SwVbaDocument(  css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
-+	virtual ~SwVbaDocument();
-+
-+    // XDocument
-+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException );
-+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd ) throw ( css::uno::RuntimeException );
-+    virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
-+    virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_DOCUMENT_HXX */
---- sw/source/ui/vba/vbadocumentproperties.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbadocumentproperties.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,798 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadocument.cxx,v $
-+ * $Revision: 1.7 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbadocumentproperties.hxx"
-+#include <cppuhelper/implbase1.hxx>
-+#include <cppuhelper/implbase3.hxx>
-+#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
-+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-+#include <com/sun/star/beans/NamedValue.hpp>
-+#include <com/sun/star/beans/XPropertyContainer.hpp>
-+#include <ooo/vba/word/WdBuiltInProperty.hpp>
-+#include <ooo/vba/office/MsoDocProperties.hpp>
-+#include <memory>
-+#include <boost/shared_ptr.hpp>
-+#include "wordvbahelper.hxx"
-+#include "fesh.hxx"
-+#include "docsh.hxx"
-+using namespace ::ooo::vba;
-+using namespace css;
-+
-+sal_Int8 lcl_toMSOPropType( const uno::Type& aType ) throw ( lang::IllegalArgumentException )
-+{
-+    sal_Int16 msoType = office::MsoDocProperties::msoPropertyTypeString;
-+
-+    switch ( aType.getTypeClass() )
-+    {
-+        case uno::TypeClass_BOOLEAN:       
-+            msoType =  office::MsoDocProperties::msoPropertyTypeBoolean;
-+            break;
-+        case uno::TypeClass_FLOAT:
-+            msoType =  office::MsoDocProperties::msoPropertyTypeFloat;
-+            break;
-+        case uno::TypeClass_STRUCT: // Assume date
-+            msoType =  office::MsoDocProperties::msoPropertyTypeDate;
-+            break;
-+        case  uno::TypeClass_BYTE:
-+        case  uno::TypeClass_SHORT:
-+        case  uno::TypeClass_LONG:
-+        case  uno::TypeClass_HYPER:
-+            msoType =  office::MsoDocProperties::msoPropertyTypeNumber;
-+            break;
-+        default:
-+            throw lang::IllegalArgumentException();
-+    }
-+    return msoType;
-+}
-+
-+class PropertGetSetHelper
-+{
-+protected:
-+    uno::Reference< frame::XModel > m_xModel;
-+    uno::Reference< beans::XPropertySet > mxProps;
-+public:
-+    PropertGetSetHelper( const uno::Reference< frame::XModel >& xModel ):m_xModel( xModel ) 
-+    {
-+        uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( m_xModel, uno::UNO_QUERY_THROW );
-+        mxProps.set( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
-+    }
-+    virtual ~PropertGetSetHelper() {}
-+    virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) = 0;
-+    virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue ) = 0;
-+    virtual uno::Reference< beans::XPropertySet > getUnoProperties() { return mxProps; }
-+
-+};
-+
-+class BuiltinPropertyGetSetHelper : public PropertGetSetHelper
-+{
-+public:
-+    BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) 
-+    {
-+    }
-+    virtual uno::Any getPropertyValue( const rtl::OUString& rPropName )
-+    {
-+        if ( rPropName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("EditingDuration" ) ) ) )
-+        {
-+            sal_Int32 nSecs = 0;
-+            mxProps->getPropertyValue( rPropName ) >>= nSecs;
-+            return uno::makeAny( nSecs/60 ); // minutes
-+        }
-+        return mxProps->getPropertyValue( rPropName );
-+    }
-+    virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue )
-+    {
-+        mxProps->setPropertyValue( rPropName, aValue );
-+    }
-+};
-+
-+class CustomPropertyGetSetHelper : public BuiltinPropertyGetSetHelper
-+{
-+public:
-+    CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel )
-+    {
-+        uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( mxProps, uno::UNO_QUERY_THROW );
-+        uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );  
-+        mxProps.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW );
-+    }
-+};
-+class StatisticPropertyGetSetHelper : public PropertGetSetHelper
-+{
-+    SwDocShell* mpDocShell;
-+    uno::Reference< beans::XPropertySet > mxModelProps;
-+public:
-+    StatisticPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) , mpDocShell( NULL )
-+    {
-+            mxModelProps.set( m_xModel, uno::UNO_QUERY_THROW );
-+            mpDocShell = word::getDocShell( xModel );
-+    }
-+    virtual uno::Any getPropertyValue( const rtl::OUString& rPropName )
-+    {
-+        uno::Sequence< beans::NamedValue > stats;
-+        try 
-+        {
-+            // Characters, ParagraphCount & WordCount are available from
-+            // the model ( and addtionally these also update the statics object )
-+            //return mxProps->getPropertyValue( rPropName );
-+            return mxModelProps->getPropertyValue( rPropName );
-+        }
-+        catch( uno::Exception& )
-+        {
-+            OSL_TRACE("Got exception");
-+        }
-+        uno::Any aReturn;
-+        if ( rPropName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LineCount")) ) ) // special processing needed
-+        {
-+            if ( mpDocShell )
-+            {
-+                SwFEShell* pFEShell = mpDocShell->GetFEShell();
-+                if(pFEShell)
-+                {
-+                    aReturn <<= pFEShell->GetLineCount(FALSE);
-+                }
-+            }
-+        }
-+        else
-+        {
-+            mxModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphCount") ) ) >>= stats;
-+            mxProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ) ) >>= stats;
-+  
-+            sal_Int32 nLen = stats.getLength();
-+            bool bFound = false;
-+            for ( sal_Int32 index = 0; index < nLen && !bFound ; ++index )
-+            {
-+                if ( rPropName.equals( stats[ index ].Name ) )
-+                {
-+                    aReturn = stats[ index ].Value;
-+                    bFound = true;
-+                }  
-+            }     
-+            if ( !bFound )
-+                throw uno::RuntimeException(); // bad Property
-+        }
-+        return aReturn;
-+    }
-+
-+    virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue )
-+    {
-+
-+        uno::Sequence< beans::NamedValue > stats;
-+        mxProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ) ) >>= stats;
-+  
-+        sal_Int32 nLen = stats.getLength();
-+        for ( sal_Int32 index = 0; index < nLen; ++index )
-+        {
-+            if ( rPropName.equals( stats[ index ].Name ) )
-+            {
-+                stats[ index ].Value = aValue;
-+                mxProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ), uno::makeAny( stats ) );
-+                break;
-+            }  
-+        }     
-+    }
-+};
-+
-+class DocPropInfo
-+{
-+public:
-+    rtl::OUString msMSODesc;
-+    rtl::OUString msOOOPropName;
-+    boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
-+    
-+    static DocPropInfo createDocPropInfo( const rtl::OUString& sDesc, const rtl::OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
-+    {
-+        return createDocPropInfo( rtl::OUStringToOString( sDesc, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( sPropName, RTL_TEXTENCODING_UTF8 ).getStr(), rHelper );
-+    }
-+
-+    static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
-+    {
-+        DocPropInfo aItem;
-+        aItem.msMSODesc = rtl::OUString::createFromAscii( sDesc );
-+        aItem.msOOOPropName = rtl::OUString::createFromAscii( sPropName );
-+        aItem.mpPropGetSetHelper = rHelper;
-+        return aItem;
-+    }
-+    uno::Any getValue() 
-+    {
-+        if ( mpPropGetSetHelper.get() )
-+            return mpPropGetSetHelper->getPropertyValue( msOOOPropName ); 
-+        return uno::Any();
-+    }
-+    void setValue( const uno::Any& rValue ) 
-+    {
-+        if ( mpPropGetSetHelper.get() )
-+            mpPropGetSetHelper->setPropertyValue( msOOOPropName, rValue ); 
-+    }
-+    uno::Reference< beans::XPropertySet > getUnoProperties() 
-+    { 
-+        
-+        uno::Reference< beans::XPropertySet > xProps;
-+        if ( mpPropGetSetHelper.get() )
-+            return mpPropGetSetHelper->getUnoProperties(); 
-+        return xProps; 
-+    }
-+};
-+
-+
-+typedef std::hash_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo;
-+
-+class BuiltInIndexHelper
-+{
-+    MSOIndexToOODocPropInfo m_docPropInfoMap;
-+    BuiltInIndexHelper();
-+public:
-+    BuiltInIndexHelper( const uno::Reference< frame::XModel >& xModel )
-+    {
-+        boost::shared_ptr< PropertGetSetHelper > aStandardHelper( new BuiltinPropertyGetSetHelper( xModel ) );
-+        boost::shared_ptr< PropertGetSetHelper > aUsingStatsHelper( new StatisticPropertyGetSetHelper( xModel ) );
-+/*
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTitle ] = DocPropInfo::createDocPropInfo( "Title", "Title", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySubject ] = DocPropInfo::createDocPropInfo( "Subject", "Subject", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAuthor ] = DocPropInfo::createDocPropInfo( "Author", "Author", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyKeywords ] = DocPropInfo::createDocPropInfo( "Keywords", "Keywords", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyComments ] = DocPropInfo::createDocPropInfo( "Comments", "Description", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTemplate ] = DocPropInfo::createDocPropInfo( "Template", "Template", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLastAuthor ] = DocPropInfo::createDocPropInfo( "Last author", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyRevision ] = DocPropInfo::createDocPropInfo( "Revision number", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAppName ] = DocPropInfo::createDocPropInfo( "Application name", "Generator", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastPrinted ] = DocPropInfo::createDocPropInfo( "Last print date", "PrintDate", office::MsoDocProperties::msoPropertyTypeDate, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeCreated ] = DocPropInfo::createDocPropInfo( "Creation date", "CreationDate", office::MsoDocProperties::msoPropertyTypeDate, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastSaved ] = DocPropInfo::createDocPropInfo( "Last save time", "ModifyDate", office::MsoDocProperties::msoPropertyTypeDate, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyVBATotalEdit ] = DocPropInfo::createDocPropInfo( "Total editing time", "EditingDuration", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // Not sure if this is correct 
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyPages ] = DocPropInfo::createDocPropInfo( "Number of pages", "PageCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling required
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyWords ] = DocPropInfo::createDocPropInfo( "Number of words", "WordCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling required
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharacters ] = DocPropInfo::createDocPropInfo( "Number of characters", "CharacterCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling required
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySecurity ] = DocPropInfo::createDocPropInfo( "Security", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCategory ] = DocPropInfo::createDocPropInfo( "Category", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyFormat ] = DocPropInfo::createDocPropInfo( "Format", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyManager ] = DocPropInfo::createDocPropInfo( "Manager", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCompany ] = DocPropInfo::createDocPropInfo( "Company", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyBytes ] = DocPropInfo::createDocPropInfo( "Number of bytes", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist - size on disk exists ( for an already saved document ) perhaps it will do ( or we need something else )
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLines ] = DocPropInfo::createDocPropInfo( "Number of lines", "LineCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyParas ] = DocPropInfo::createDocPropInfo( "Number of paragraphs", "", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySlides ] = DocPropInfo::createDocPropInfo( "Number of slides", "" , office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyNotes ] = DocPropInfo::createDocPropInfo( "Number of notes", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHiddenSlides ] = DocPropInfo::createDocPropInfo("Number of hidden Slides", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper  ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyMMClips ] = DocPropInfo::createDocPropInfo( "Number of multimedia clips", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHyperlinkBase ] = DocPropInfo::createDocPropInfo( "Hyperlink base", "AutoloadURL", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharsWSpaces ] = DocPropInfo::createDocPropInfo( "Number of characters (with spaces)", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to be supported
-+*/
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTitle ] = DocPropInfo::createDocPropInfo( "Title", "Title", aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySubject ] = DocPropInfo::createDocPropInfo( "Subject", "Subject", aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAuthor ] = DocPropInfo::createDocPropInfo( "Author", "Author", aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyKeywords ] = DocPropInfo::createDocPropInfo( "Keywords", "Keywords", aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyComments ] = DocPropInfo::createDocPropInfo( "Comments", "Description", aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTemplate ] = DocPropInfo::createDocPropInfo( "Template", "Template", aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLastAuthor ] = DocPropInfo::createDocPropInfo( "Last author", "ModifiedBy", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyRevision ] = DocPropInfo::createDocPropInfo( "Revision number", "EditingCycles", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAppName ] = DocPropInfo::createDocPropInfo( "Application name", "Generator", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastPrinted ] = DocPropInfo::createDocPropInfo( "Last print date", "PrintDate", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeCreated ] = DocPropInfo::createDocPropInfo( "Creation date", "CreationDate", aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastSaved ] = DocPropInfo::createDocPropInfo( "Last save time", "ModifyDate", aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyVBATotalEdit ] = DocPropInfo::createDocPropInfo( "Total editing time", "EditingDuration", aStandardHelper ); // Not sure if this is correct 
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyPages ] = DocPropInfo::createDocPropInfo( "Number of pages", "PageCount", aUsingStatsHelper ); // special handling required ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyWords ] = DocPropInfo::createDocPropInfo( "Number of words", "WordCount", aUsingStatsHelper ); // special handling require ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharacters ] = DocPropInfo::createDocPropInfo( "Number of characters", "CharacterCount", aUsingStatsHelper ); // special handling required ?
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySecurity ] = DocPropInfo::createDocPropInfo( "Security", "", aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCategory ] = DocPropInfo::createDocPropInfo( "Category", "Category", aStandardHelper ); // hacked in
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyFormat ] = DocPropInfo::createDocPropInfo( "Format", "", aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyManager ] = DocPropInfo::createDocPropInfo( "Manager", "Manager", aStandardHelper ); // hacked in
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCompany ] = DocPropInfo::createDocPropInfo( "Company", "Company", aStandardHelper ); // hacked in
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyBytes ] = DocPropInfo::createDocPropInfo( "Number of bytes", "", aStandardHelper ); // doesn't seem to exist - size on disk exists ( for an already saved document ) perhaps it will do ( or we need something else )
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLines ] = DocPropInfo::createDocPropInfo( "Number of lines", "LineCount", aUsingStatsHelper ); // special handling
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyParas ] = DocPropInfo::createDocPropInfo( "Number of paragraphs", "ParagraphCount", aUsingStatsHelper ); // special handling
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySlides ] = DocPropInfo::createDocPropInfo( "Number of slides", "" , aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyNotes ] = DocPropInfo::createDocPropInfo( "Number of notes", "", aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHiddenSlides ] = DocPropInfo::createDocPropInfo("Number of hidden Slides", "", aStandardHelper  ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyMMClips ] = DocPropInfo::createDocPropInfo( "Number of multimedia clips", "", aStandardHelper ); // doesn't seem to exist
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHyperlinkBase ] = DocPropInfo::createDocPropInfo( "Hyperlink base", "AutoloadURL", aStandardHelper );
-+        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharsWSpaces ] = DocPropInfo::createDocPropInfo( "Number of characters (with spaces)", "", aStandardHelper ); // doesn't seem to be supported
-+    }
-+
-+    MSOIndexToOODocPropInfo& getDocPropInfoMap() { return m_docPropInfoMap; }
-+};
-+
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentProperty > SwVbaDocumentProperty_BASE;
-+
-+class SwVbaBuiltInDocumentProperty : public SwVbaDocumentProperty_BASE
-+{
-+protected:
-+    DocPropInfo mPropInfo;
-+public:
-+    SwVbaBuiltInDocumentProperty(  const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo );
-+    // XDocumentProperty
-+    virtual void SAL_CALL Delete(  ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual ::rtl::OUString SAL_CALL getName(  ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual ::sal_Int8 SAL_CALL getType(  ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual uno::Any SAL_CALL getValue(  ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual rtl::OUString SAL_CALL getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException);
-+    //XDefaultProperty
-+    virtual ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (uno::RuntimeException) { return rtl::OUString::createFromAscii("Value"); }
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+class SwVbaCustomDocumentProperty : public SwVbaBuiltInDocumentProperty
-+{
-+public:
-+
-+    SwVbaCustomDocumentProperty(  const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo );
-+
-+    virtual ::sal_Bool SAL_CALL getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException);
-+
-+    virtual rtl::OUString SAL_CALL getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual void SAL_CALL Delete(  ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException);
-+    virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException);
-+
-+};
-+
-+
-+SwVbaCustomDocumentProperty::SwVbaCustomDocumentProperty(  const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ) : SwVbaBuiltInDocumentProperty( xParent, xContext, rInfo )
-+{
-+}
-+
-+sal_Bool
-+SwVbaCustomDocumentProperty::getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // #FIXME we need to store the link content somewhere
-+    return sal_False;
-+}
-+
-+void
-+SwVbaCustomDocumentProperty::setLinkToContent( sal_Bool /*bLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+}
-+
-+rtl::OUString
-+SwVbaCustomDocumentProperty::getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // #FIXME we need to store the link content somewhere
-+    return rtl::OUString();;
-+}
-+
-+void
-+SwVbaCustomDocumentProperty::setLinkSource( const rtl::OUString& /*rsLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // #FIXME we need to store the link source somewhere
-+}
-+
-+void SAL_CALL 
-+SwVbaCustomDocumentProperty::setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // setName on existing property ? 
-+    // #FIXME 
-+    // do we need to delete existing property and create a new one?
-+}
-+
-+void SAL_CALL 
-+SwVbaCustomDocumentProperty::setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // setType, do we need to do a conversion?
-+    // #FIXME the underlying value needs to be changed to the new type
-+}
-+
-+void SAL_CALL 
-+SwVbaCustomDocumentProperty::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    uno::Reference< beans::XPropertyContainer > xContainer( mPropInfo.getUnoProperties(), uno::UNO_QUERY_THROW );
-+    xContainer->removeProperty( getName() );
-+}
-+
-+SwVbaBuiltInDocumentProperty::SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ) : SwVbaDocumentProperty_BASE( xParent, xContext ), mPropInfo( rInfo )
-+{
-+} 
-+
-+void SAL_CALL 
-+SwVbaBuiltInDocumentProperty::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // not valid for Builtin
-+    throw uno::RuntimeException();
-+}
-+ 
-+::rtl::OUString SAL_CALL 
-+SwVbaBuiltInDocumentProperty::getName(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    return mPropInfo.msMSODesc;
-+}
-+
-+void SAL_CALL
-+SwVbaBuiltInDocumentProperty::setName( const rtl::OUString& ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // not valid for Builtin
-+    throw uno::RuntimeException();
-+}
-+
-+::sal_Int8 SAL_CALL 
-+SwVbaBuiltInDocumentProperty::getType(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    return lcl_toMSOPropType( getValue().getValueType() );
-+}
-+
-+void SAL_CALL 
-+SwVbaBuiltInDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // not valid for Builtin
-+    throw uno::RuntimeException();
-+}
-+
-+::sal_Bool SAL_CALL 
-+SwVbaBuiltInDocumentProperty::getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    return sal_False; // built-in always false
-+}
-+
-+void SAL_CALL 
-+SwVbaBuiltInDocumentProperty::setLinkToContent( ::sal_Bool /*LinkToContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // not valid for Builtin
-+    throw uno::RuntimeException();
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaBuiltInDocumentProperty::getValue(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    uno::Any aRet = mPropInfo.getValue();
-+    if ( !aRet.hasValue() )
-+        throw uno::RuntimeException();
-+    return aRet;
-+}
-+
-+void SAL_CALL 
-+SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    mPropInfo.setValue( Value );
-+}
-+
-+rtl::OUString SAL_CALL 
-+SwVbaBuiltInDocumentProperty::getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // not valid for Builtin
-+    throw uno::RuntimeException();
-+}
-+
-+void SAL_CALL 
-+SwVbaBuiltInDocumentProperty::setLinkSource( const rtl::OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // not valid for Builtin
-+    throw uno::RuntimeException();
-+}
-+
-+rtl::OUString& 
-+SwVbaBuiltInDocumentProperty::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperty") );
-+    return sImplName;    
-+}
-+
-+uno::Sequence<rtl::OUString> 
-+SwVbaBuiltInDocumentProperty::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.DocumentProperty" ) );
-+    }
-+    return aServiceNames;
-+}
-+typedef ::cppu::WeakImplHelper3< com::sun::star::container::XIndexAccess
-+        ,com::sun::star::container::XNameAccess
-+        ,com::sun::star::container::XEnumerationAccess
-+        > PropertiesImpl_BASE;
-+
-+typedef std::hash_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps;
-+
-+typedef ::cppu::WeakImplHelper1< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE;
-+class DocPropEnumeration : public DocPropEnumeration_BASE
-+{
-+    DocProps mDocProps;
-+    DocProps::iterator mIt;
-+public:
-+    
-+    DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.begin() ) {}
-+    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
-+    {
-+        return mIt != mDocProps.end();
-+    }
-+    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+        if ( !hasMoreElements() )
-+            throw container::NoSuchElementException();
-+        return uno::makeAny( mIt++->second );
-+    }
-+};
-+
-+typedef std::hash_map< rtl::OUString, uno::Reference< XDocumentProperty >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > DocPropsByName;
-+
-+class BuiltInPropertiesImpl : public PropertiesImpl_BASE
-+{
-+protected:
-+
-+    uno::Reference< XHelperInterface > m_xParent;
-+    uno::Reference< uno::XComponentContext > m_xContext;
-+    uno::Reference< frame::XModel > m_xModel;
-+    uno::Reference< document::XDocumentInfo > m_xOOOBuiltIns;
-+ 
-+    DocProps mDocProps;
-+    DocPropsByName mNamedDocProps;
-+      
-+    public:
-+    BuiltInPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel )
-+    {
-+    	BuiltInIndexHelper builtIns( m_xModel );
-+        for ( sal_Int32 index = word::WdBuiltInProperty::wdPropertyTitle; index <= word::WdBuiltInProperty::wdPropertyCharsWSpaces; ++index )
-+        {
-+            mDocProps[ index ] = new SwVbaBuiltInDocumentProperty( xParent, xContext, builtIns.getDocPropInfoMap()[ index ] );
-+            mNamedDocProps[ mDocProps[ index ]->getName() ] = mDocProps[ index ];
-+        } 
-+    }
-+// XIndexAccess
-+    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
-+    {
-+        return mDocProps.size();
-+    }
-+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException )
-+    {
-+        // correct the correct by the base class for 1 based indices
-+        DocProps::iterator it = mDocProps.find( ++Index );
-+        if ( it == mDocProps.end() )
-+            throw lang::IndexOutOfBoundsException();
-+        return uno::makeAny( it->second  );
-+    }
-+    virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+        if ( !hasByName( aName ) )
-+		throw container::NoSuchElementException();
-+        DocPropsByName::iterator it = mNamedDocProps.find( aName );
-+        return uno::Any( it->second );
-+        
-+    }
-+    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
-+    {
-+        uno::Sequence< rtl::OUString > aNames( getCount() );
-+        rtl::OUString* pName = aNames.getArray();
-+        DocPropsByName::iterator it_end = mNamedDocProps.end();
-+        for(  DocPropsByName::iterator it = mNamedDocProps.begin(); it != it_end; ++it, ++pName )
-+           *pName = it->first;
-+        return aNames; 
-+    }
-+
-+    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
-+    {
-+        DocPropsByName::iterator it = mNamedDocProps.find( aName );
-+        if ( it == mNamedDocProps.end() )
-+            return sal_False;
-+        return sal_True;
-+    }
-+// XElementAccess
-+    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) 
-+    {
-+        return  XDocumentProperty::static_type(0); 
-+    }
-+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
-+    {
-+        return mDocProps.size() > 0;
-+    }
-+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
-+    {
-+        return new DocPropEnumeration( mDocProps );
-+    }
-+};
-+
-+SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaDocumentproperties_BASE( xParent, xContext,  uno::Reference< container::XIndexAccess >( new BuiltInPropertiesImpl( xParent, xContext, xModel ) ) ), m_xModel( xModel )
-+{
-+} 
-+
-+uno::Reference< XDocumentProperty > SAL_CALL 
-+SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& value, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    throw uno::RuntimeException(
-+        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("not supported for Builtin properties") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+// XEnumerationAccess
-+uno::Type SAL_CALL 
-+SwVbaBuiltinDocumentProperties::getElementType() throw (uno::RuntimeException)
-+{
-+    return  XDocumentProperty::static_type(0); 
-+}
-+
-+uno::Reference< container::XEnumeration > SAL_CALL 
-+SwVbaBuiltinDocumentProperties::createEnumeration() throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+    return xEnumAccess->createEnumeration();
-+}
-+
-+// ScVbaCollectionBaseImpl      
-+uno::Any 
-+SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource )
-+{
-+    // pass through
-+    return aSource;
-+}
-+
-+// XHelperInterface
-+rtl::OUString& 
-+SwVbaBuiltinDocumentProperties::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperties") );
-+    return sImplName;    
-+}
-+
-+uno::Sequence<rtl::OUString> 
-+SwVbaBuiltinDocumentProperties::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.DocumentProperties" ) );
-+    }
-+    return aServiceNames;
-+}
-+
-+class CustomPropertiesImpl : public PropertiesImpl_BASE
-+{
-+    uno::Reference< XHelperInterface > m_xParent;
-+    uno::Reference< uno::XComponentContext > m_xContext;
-+    uno::Reference< frame::XModel > m_xModel;
-+    uno::Reference< beans::XPropertySet > mxUserDefinedProp;
-+    boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
-+public:
-+    CustomPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel )
-+    {
-+        // suck in the document( custom ) properties
-+        uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( m_xModel, uno::UNO_QUERY_THROW );
-+        uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );     
-+        uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );     
-+        mxUserDefinedProp.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW );     
-+        mpPropGetSetHelper.reset( new CustomPropertyGetSetHelper( m_xModel ) );
-+    }; 
-+    // XIndexAccess
-+    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
-+    {
-+        return mxUserDefinedProp->getPropertySetInfo()->getProperties().getLength();
-+    }
-+
-+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException )
-+    {
-+        uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties();
-+        if ( Index >= aProps.getLength() )
-+            throw lang::IndexOutOfBoundsException();
-+        // How to determine type e.g Date? ( com.sun.star.util.DateTime )
-+        DocPropInfo aPropInfo = DocPropInfo::createDocPropInfo( aProps[ Index ].Name, aProps[ Index ].Name, mpPropGetSetHelper );
-+        return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) );
-+    }
-+
-+    virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+        if ( !hasByName( aName ) )
-+            throw container::NoSuchElementException();
-+
-+        DocPropInfo aPropInfo = DocPropInfo::createDocPropInfo( aName, aName, mpPropGetSetHelper );
-+        return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) );
-+    }
-+
-+    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
-+    {
-+        uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties();
-+        uno::Sequence< rtl::OUString > aNames( aProps.getLength() );
-+        rtl::OUString* pString = aNames.getArray();
-+        rtl::OUString* pEnd = ( pString + aNames.getLength() );
-+        beans::Property* pProp = aProps.getArray();
-+        for ( ; pString != pEnd; ++pString, ++pProp )
-+            *pString = pProp->Name;
-+        return aNames;
-+    }
-+
-+    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
-+    {
-+        OSL_TRACE("hasByName(%s) returns %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) );
-+        return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName );
-+    }
-+
-+    // XElementAccess
-+    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) 
-+    {
-+        return  XDocumentProperty::static_type(0); 
-+    }
-+
-+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
-+    {
-+        return getCount() > 0;
-+    }
-+
-+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
-+    {
-+        // create a map of properties ( the key doesn't matter )
-+        OSL_TRACE("Creating an enumeration");
-+        sal_Int32 key = 0;
-+        sal_Int32 nElem =  getCount();
-+        DocProps simpleDocPropSnapShot;
-+        for ( ; key < nElem; ++key )
-+             simpleDocPropSnapShot[ key ].set( getByIndex( key ), uno::UNO_QUERY_THROW );
-+        OSL_TRACE("After creating the enumeration");
-+        return  new DocPropEnumeration( simpleDocPropSnapShot );
-+    }
-+
-+    void addProp( const ::rtl::OUString& Name, ::sal_Int8 Type, const uno::Any& Value )
-+    {
-+        sal_Int16 attributes = 128;
-+        uno::Reference< beans::XPropertyContainer > xContainer( mxUserDefinedProp, uno::UNO_QUERY_THROW );
-+        // TODO fixme, perform the necessary Type Value conversions
-+        xContainer->addProperty( Name, attributes, Value );
-+    }
-+
-+};
-+
-+
-+SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaBuiltinDocumentProperties( xParent, xContext, xModel )
-+{
-+    // replace the m_xIndexAccess implementation ( we need a virtual init )
-+    m_xIndexAccess.set( new CustomPropertiesImpl( xParent, xContext, xModel ) );
-+    m_xNameAccess.set( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+}
-+
-+uno::Reference< XDocumentProperty > SAL_CALL 
-+SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    CustomPropertiesImpl* pCustomProps = dynamic_cast< CustomPropertiesImpl* > ( m_xIndexAccess.get() );
-+    uno::Reference< XDocumentProperty > xDocProp;
-+    if ( pCustomProps )
-+    {
-+        rtl::OUString sLinkSource;
-+        pCustomProps->addProp( Name, Type, Value );
-+
-+        xDocProp.set( m_xNameAccess->getByName( Name ), uno::UNO_QUERY_THROW );
-+        xDocProp->setLinkToContent( LinkToContent );
-+
-+        if ( LinkSource >>= sLinkSource )
-+           xDocProp->setLinkSource( sLinkSource );
-+    }
-+    return xDocProp;
-+}
-+
-+// XHelperInterface
-+rtl::OUString& 
-+SwVbaCustomDocumentProperties::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaCustomDocumentProperties") );
-+    return sImplName;    
-+}
---- sw/source/ui/vba/vbadocumentproperties.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbadocumentproperties.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,70 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadocument.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_DOCUMENTPROPERTIES_HXX
-+#define SW_VBA_DOCUMENTPROPERTIES_HXX
-+
-+#include <ooo/vba/XDocumentProperties.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <hash_map>
-+
-+typedef CollTestImplHelper< ov::XDocumentProperties > SwVbaDocumentproperties_BASE;
-+
-+class SwVbaBuiltinDocumentProperties : public SwVbaDocumentproperties_BASE
-+{
-+protected:
-+    css::uno::Reference< css::frame::XModel > m_xModel;
-+public:
-+    SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
-+
-+    // XDocumentProperties
-+    virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    // XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+    // ScVbaCollectionBaseImpl      
-+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-+
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties
-+{
-+public:
-+    SwVbaCustomDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
-+// XDocumentProperties
-+    virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+};
-+
-+#endif /* SW_VBA_DOCUMENTPROPERTY_HXX */
---- sw/source/ui/vba/vbaglobals.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbaglobals.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,164 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbaglobals.cxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <vbahelper/helperdecl.hxx>
-+#include "vbaglobals.hxx"
-+
-+#include <comphelper/unwrapargs.hxx>
-+
-+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/container/XNameContainer.hpp>
-+#include <cppuhelper/bootstrap.hxx>
-+#include "vbaapplication.hxx"
-+using namespace ::com::sun::star;
-+using namespace ::com::sun::star::uno;
-+using namespace ::ooo::vba;
-+
-+
-+
-+// =============================================================================
-+// SwVbaGlobals
-+// =============================================================================
-+
-+SwVbaGlobals::SwVbaGlobals(  css::uno::Reference< css::uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext )
-+{
-+	OSL_TRACE("SwVbaGlobals::SwVbaGlobals()");
-+	init( rxContext, uno::makeAny( getApplication() ) );
-+}
-+
-+SwVbaGlobals::~SwVbaGlobals()
-+{
-+	OSL_TRACE("SwVbaGlobals::~SwVbaGlobals");
-+}
-+
-+// =============================================================================
-+// XGlobals
-+// =============================================================================
-+uno::Reference<word::XApplication >
-+SwVbaGlobals::getApplication() throw (uno::RuntimeException)
-+{
-+	OSL_TRACE("In SwVbaGlobals::getApplication");	
-+	static  uno::Reference< word::XApplication > WordApplication( new SwVbaApplication( mxContext) );
-+   	return WordApplication; 
-+}
-+
-+uno::Reference<word::XSystem > SAL_CALL
-+SwVbaGlobals::getSystem() throw (uno::RuntimeException)
-+{
-+	return getApplication()->getSystem();	
-+}
-+
-+uno::Reference< word::XDocument > SAL_CALL 
-+SwVbaGlobals::getActiveDocument() throw (uno::RuntimeException)
-+{
-+	return getApplication()->getActiveDocument();	
-+}
-+
-+uno::Reference< word::XWindow > SAL_CALL 
-+SwVbaGlobals::getActiveWindow() throw (uno::RuntimeException)
-+{
-+	return getApplication()->getActiveWindow();
-+}
-+
-+rtl::OUString SAL_CALL 
-+SwVbaGlobals::getName() throw (uno::RuntimeException)
-+{
-+	return getApplication()->getName();
-+}
-+
-+uno::Reference<word::XOptions > SAL_CALL
-+SwVbaGlobals::getOptions() throw (uno::RuntimeException)
-+{
-+	return getApplication()->getOptions();
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+    return getApplication()->CommandBars( aIndex );
-+}
-+
-+uno::Reference<word::XSelection > SAL_CALL
-+SwVbaGlobals::getSelection() throw (uno::RuntimeException)
-+{
-+	return getApplication()->getSelection();
-+}
-+
-+rtl::OUString&
-+SwVbaGlobals::getServiceImplName()
-+{
-+        static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaGlobals") );
-+        return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString >
-+SwVbaGlobals::getServiceNames()
-+{
-+        static uno::Sequence< rtl::OUString > aServiceNames;
-+        if ( aServiceNames.getLength() == 0 )
-+        {
-+                aServiceNames.realloc( 1 );
-+                aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Globals" ) );
-+        }
-+        return aServiceNames;
-+}
-+
-+uno::Sequence< rtl::OUString >
-+SwVbaGlobals::getAvailableServiceNames(  ) throw (uno::RuntimeException)
-+{
-+    static bool bInit = false;
-+    static uno::Sequence< rtl::OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() );
-+    if ( !bInit )
-+    {
-+         rtl::OUString names[] = { 
-+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Document" ) ),
-+//            #FIXME #TODO make Application a proper service
-+//            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Application" ) ),
-+        };
-+        sal_Int32 nWordServices = ( sizeof( names )/ sizeof( names[0] ) );
-+        sal_Int32 startIndex = serviceNames.getLength();
-+        serviceNames.realloc( serviceNames.getLength() + nWordServices );
-+        for ( sal_Int32 index = 0; index < nWordServices; ++index )
-+             serviceNames[ startIndex + index ] = names[ index ];
-+        bInit = true;
-+    }
-+    return serviceNames;
-+}
-+
-+namespace globals
-+{
-+namespace sdecl = comphelper::service_decl;
-+sdecl::vba_service_class_<SwVbaGlobals, sdecl::with_args<false> > serviceImpl;
-+extern sdecl::ServiceDecl const serviceDecl(
-+    serviceImpl,
-+    "SwVbaGlobals",
-+    "ooo.vba.word.Globals" );
-+}
-+
---- sw/source/ui/vba/vbaglobals.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbaglobals.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,80 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbaglobals.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_GLOBALS_HXX
-+#define SW_VBA_GLOBALS_HXX
-+
-+#include <com/sun/star/lang/XServiceInfo.hpp>
-+#include <com/sun/star/lang/XInitialization.hpp>
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+#include <ooo/vba/word/XGlobals.hpp>
-+#include <ooo/vba/word/XApplication.hpp>
-+#include <ooo/vba/word/XSystem.hpp>
-+#include <ooo/vba/word/XOptions.hpp>
-+#include <ooo/vba/word/XSelection.hpp>
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <vbahelper/vbahelper.hxx>
-+#include <vbahelper/vbaglobalbase.hxx>
-+
-+// =============================================================================
-+// class SwVbaGlobals
-+// =============================================================================
-+
-+
-+typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE;
-+
-+class SwVbaGlobals : public SwVbaGlobals_BASE 
-+{
-+private:
-+    css::uno::Reference< ooo::vba::word::XApplication > mxApplication;
-+
-+    virtual css::uno::Reference< ooo::vba::word::XApplication > getApplication() throw (css::uno::RuntimeException);
-+
-+public:
-+	
-+    SwVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext );
-+    virtual ~SwVbaGlobals();
-+
-+    // XGlobals
-+    virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+    // XMultiServiceFactory
-+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException);
-+
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_GLOBALS_HXX */ 
---- sw/source/ui/vba/vbaoptions.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbaoptions.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,148 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microoptionss, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaoptions.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <ooo/vba/word/WdDefaultFilePath.hpp>
-+#include <com/sun/star/util/XStringSubstitution.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <osl/file.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaOptions::SwVbaOptions( uno::Reference<uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) : SwVbaOptions_BASE( uno::Reference< XHelperInterface >(), xContext )
-+{
-+    mxFactory.set( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+}
-+
-+SwVbaOptions::~SwVbaOptions()
-+{
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException )
-+{
-+    switch( _path )
-+    {
-+        case word::WdDefaultFilePath::wdDocumentsPath:
-+        {
-+            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work") );
-+            break;
-+        }
-+        case word::WdDefaultFilePath::wdPicturesPath:
-+        {
-+            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Gallery") );
-+            break;
-+        }
-+        case word::WdDefaultFilePath::wdUserTemplatesPath:
-+        case word::WdDefaultFilePath::wdWorkgroupTemplatesPath:
-+        {
-+            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Template") );
-+            break;
-+        }
-+        case word::WdDefaultFilePath::wdUserOptionsPath:
-+        {
-+            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserConfig") );
-+            break;
-+        }
-+        case word::WdDefaultFilePath::wdToolsPath:
-+        case word::WdDefaultFilePath::wdProgramPath:
-+        {
-+            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Module") );
-+            break;
-+        }
-+        case word::WdDefaultFilePath::wdTempFilePath:
-+        {
-+            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Temp") );
-+            break;
-+        }
-+        default:
-+        {
-+            DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); 
-+            break;
-+        }
-+    }
-+    return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
-+}
-+
-+void SwVbaOptions::setValueEvent( const uno::Any& value )
-+{
-+    rtl::OUString sNewPath;
-+    value >>= sNewPath;
-+    rtl::OUString sNewPathUrl;
-+    ::osl::File::getFileURLFromSystemPath( sNewPath, sNewPathUrl );
-+    uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW );
-+    rtl::OUString sOldPathUrl;
-+    xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sOldPathUrl;
-+    // path could be a multipath, Microsoft doesn't support this feature in Word currently
-+    // only the last path is from interest.
-+    sal_Int32 nIndex = sOldPathUrl.lastIndexOf( sal_Unicode(';') );
-+    if( nIndex != -1 )
-+    {
-+        sNewPathUrl = sOldPathUrl.copy( 0, nIndex + 1 ).concat( sNewPathUrl );
-+    }
-+    xPathSettings->setPropertyValue( msDefaultFilePath, uno::makeAny( sNewPathUrl ) );
-+}
-+
-+uno::Any SwVbaOptions::getValueEvent()
-+{
-+    uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW );
-+    rtl::OUString sPathUrl;
-+    xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sPathUrl;
-+    // path could be a multipath, Microsoft doesn't support this feature in Word currently
-+    // only the last path is from interest.
-+    sal_Int32 nIndex = sPathUrl.lastIndexOf( sal_Unicode(';') );
-+    if( nIndex != -1 )
-+    {
-+        sPathUrl = sPathUrl.copy( nIndex + 1 );
-+    }
-+    rtl::OUString sPath;
-+    ::osl::File::getSystemPathFromFileURL( sPathUrl, sPath );
-+    return uno::makeAny( sPath );
-+}
-+
-+rtl::OUString& 
-+SwVbaOptions::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaOptions") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaOptions::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Options" ) );
-+	}
-+	return aServiceNames;
-+}
---- sw/source/ui/vba/vbaoptions.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbaoptions.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbasystem.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_OPTIONS_HXX
-+#define SW_VBA_OPTIONS_HXX
-+
-+#include <ooo/vba/word/XOptions.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <vbahelper/vbapropvalue.hxx>
-+#include <comphelper/processfactory.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XOptions > SwVbaOptions_BASE;
-+
-+class SwVbaOptions : public SwVbaOptions_BASE, 
-+                    public PropListener
-+{
-+private:
-+    rtl::OUString msDefaultFilePath;
-+    css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory;
-+public:
-+	SwVbaOptions( css::uno::Reference< css::uno::XComponentContext >& m_xContext ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaOptions();
-+
-+	// XOptions
-+    virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) throw ( css::uno::RuntimeException );
-+
-+    //PropListener
-+    virtual void setValueEvent( const css::uno::Any& value );
-+    virtual css::uno::Any getValueEvent();
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_OPTIONS_HXX */
---- sw/source/ui/vba/vbapane.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbapane.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,79 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbapane.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include "vbaview.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaPane::SwVbaPane( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-+    const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) :
-+    SwVbaPane_BASE( rParent, rContext ), mxModel( xModel )
-+{
-+}
-+
-+SwVbaPane::~SwVbaPane()
-+{
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaPane::View() throw ( css::uno::RuntimeException )
-+{
-+    return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this,  mxContext, mxModel ) ) );    
-+}
-+
-+void SAL_CALL
-+SwVbaPane::Close( ) throw ( css::uno::RuntimeException )
-+{
-+    rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseWin"));
-+    dispatchRequests( mxModel,url );
-+}
-+
-+rtl::OUString& 
-+SwVbaPane::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPane") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaPane::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Pane" ) );
-+	}
-+	return aServiceNames;
-+}
-+
---- sw/source/ui/vba/vbapane.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbapane.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,57 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_PANE_HXX
-+#define SW_VBA_PANE_HXX
-+
-+#include <ooo/vba/word/XPane.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XPane > SwVbaPane_BASE;
-+
-+class SwVbaPane : public SwVbaPane_BASE
-+{
-+private:
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+
-+public:
-+	SwVbaPane( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
-+        const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaPane();
-+
-+    // Methods
-+    virtual css::uno::Any SAL_CALL View(  ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL Close(  ) throw (css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_PANE_HXX */
---- sw/source/ui/vba/vbapanes.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbapanes.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,127 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbapanes.hxx"
-+#include "vbapane.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+// I assume there is only one pane in Writer
-+typedef ::cppu::WeakImplHelper1<container::XIndexAccess > PanesIndexAccess_Base;
-+class PanesIndexAccess : public PanesIndexAccess_Base
-+{
-+private:
-+    uno::Reference< XHelperInterface > mxParent;
-+    uno::Reference< uno::XComponentContext > mxContext;
-+    uno::Reference< frame::XModel > mxModel;
-+
-+public:
-+    PanesIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) {}
-+    ~PanesIndexAccess(){}
-+
-+    // XIndexAccess
-+    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
-+    {
-+        return 1;
-+    }
-+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+        if( Index != 1 )
-+            throw container::NoSuchElementException();
-+        return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent,  mxContext, mxModel ) ) );    
-+    }
-+    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
-+    {
-+        return word::XPane::static_type(0);
-+    }
-+    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
-+    {
-+        return sal_True;
-+    }
-+};
-+
-+class PanesEnumWrapper : public EnumerationHelper_BASE
-+{
-+	uno::Reference<container::XIndexAccess > m_xIndexAccess;
-+	sal_Int32 nIndex;
-+public:
-+	PanesEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
-+	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
-+	{
-+		return ( nIndex < m_xIndexAccess->getCount() );
-+	}
-+
-+	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+	{
-+		if ( nIndex < m_xIndexAccess->getCount() )
-+			return m_xIndexAccess->getByIndex( nIndex++ );
-+		throw container::NoSuchElementException();
-+	}
-+};
-+
-+SwVbaPanes::SwVbaPanes( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ): SwVbaPanes_BASE( xParent, xContext, new PanesIndexAccess( xParent, xContext, xModel ) ),  mxModel( xModel )
-+{
-+}
-+// XEnumerationAccess
-+uno::Type
-+SwVbaPanes::getElementType() throw (uno::RuntimeException)
-+{
-+	return word::XPane::static_type(0);
-+}
-+uno::Reference< container::XEnumeration >
-+SwVbaPanes::createEnumeration() throw (uno::RuntimeException)
-+{
-+    return new PanesEnumWrapper( m_xIndexAccess );
-+}
-+
-+uno::Any
-+SwVbaPanes::createCollectionObject( const css::uno::Any& aSource )
-+{
-+    return aSource;
-+}
-+
-+rtl::OUString& 
-+SwVbaPanes::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPanes") );
-+	return sImplName;
-+}
-+
-+css::uno::Sequence<rtl::OUString> 
-+SwVbaPanes::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > sNames;
-+	if ( sNames.getLength() == 0 )
-+	{
-+		sNames.realloc( 1 );
-+		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Panes") );
-+	}
-+	return sNames;
-+}
---- sw/source/ui/vba/vbapanes.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbapanes.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,60 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_PANES_HXX
-+#define SW_VBA_PANES_HXX
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <ooo/vba/word/XPanes.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <com/sun/star/container/XIndexAccess.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef CollTestImplHelper< ooo::vba::word::XPanes > SwVbaPanes_BASE;
-+
-+class SwVbaPanes : public SwVbaPanes_BASE
-+{
-+private:
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+
-+public:
-+	SwVbaPanes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
-+	virtual ~SwVbaPanes() {}
-+
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+
-+	// SwVbaPanes_BASE
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};    
-+
-+#endif /* SW_VBA_PANES_HXX */
---- sw/source/ui/vba/vbarange.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbarange.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,302 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbarange.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include "vbarangehelper.hxx"
-+#include <com/sun/star/text/XTextDocument.hpp>
-+#include <ooo/vba/word/WdBreakType.hpp>
-+#include <com/sun/star/style/BreakType.hpp>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XRange > SwVbaBaseRange_BASE;
-+
-+class SwVbaBaseRange : public SwVbaBaseRange_BASE
-+{
-+protected:
-+    uno::Reference< text::XTextDocument > mxTextDocument;
-+    uno::Reference< text::XTextCursor > mxTextCursor;
-+    uno::Reference< text::XText > mxText;
-+    sal_Bool mbMaySpanEndOfDocument;
-+
-+	SwVbaBaseRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext );
-+    virtual ~SwVbaBaseRange();
-+
-+public:
-+    uno::Reference< text::XTextRange > getXTextRange() throw (uno::RuntimeException);
-+
-+	// XRange
-+    virtual rtl::OUString SAL_CALL getText() throw (uno::RuntimeException);
-+    virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (uno::RuntimeException);
-+
-+   // Methods
-+   virtual void SAL_CALL InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+
-+SwVbaBaseRange::SwVbaBaseRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext )
-+    : SwVbaBaseRange_BASE( rParent, rContext )
-+{
-+}
-+
-+SwVbaBaseRange::~SwVbaBaseRange()
-+{
-+}
-+
-+uno::Reference< text::XTextRange >
-+SwVbaBaseRange::getXTextRange() throw (uno::RuntimeException)
-+{
-+    uno::Reference< text::XTextRange > xTextRange( mxTextCursor, uno::UNO_QUERY_THROW );
-+    return xTextRange;
-+}
-+
-+/**
-+* The complexity in this method is because we need to workaround
-+* an issue that the last paragraph in a document does not have a trailing CRLF.
-+* @return
-+*/
-+rtl::OUString SAL_CALL
-+SwVbaBaseRange::getText() throw ( uno::RuntimeException )
-+{
-+    rtl::OUString aText = mxTextCursor->getString();
-+    sal_Int32 nLen = aText.getLength();
-+
-+    // FIXME: should add a line separator if the range includes the last paragraph
-+    if( nLen == 0 )
-+    {
-+        if( mxTextCursor->isCollapsed() )
-+        {
-+            mxTextCursor->goRight( 1, sal_True );
-+            aText = mxTextCursor->getString();
-+            mxTextCursor->collapseToStart();
-+        }
-+        else
-+        {
-+            uno::Reference< text::XTextRange > xStart = mxTextCursor->getStart();
-+            uno::Reference< text::XTextRange > xEnd = mxTextCursor->getEnd();
-+            mxTextCursor->collapseToEnd();
-+            mxTextCursor->goRight( 1, sal_True );
-+            mxTextCursor->gotoRange( xStart, sal_False );
-+            mxTextCursor->gotoRange( xEnd, sal_True );
-+        }
-+    }
-+
-+    return aText;
-+}
-+
-+void SAL_CALL
-+SwVbaBaseRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
-+{
-+    if( rText.indexOf( '\n' )  != -1 )
-+    {
-+        mxTextCursor->setString( rtl::OUString() );
-+        // process CR in strings
-+        uno::Reference< text::XTextRange > xRange( mxTextCursor, uno::UNO_QUERY_THROW );
-+        SwVbaRangeHelper::insertString( xRange, mxText, rText, sal_True );
-+    }
-+    else
-+    {
-+        mxTextCursor->setString( rText );
-+    }
-+}
-+
-+// FIXME: test is not pass
-+void SAL_CALL SwVbaBaseRange::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException)
-+{
-+    // default type is wdPageBreak;
-+    sal_Int32 nBreakType = word::WdBreakType::wdPageBreak;
-+    if( _breakType.hasValue() )
-+        _breakType >>= nBreakType;
-+
-+    style::BreakType eBreakType = style::BreakType_NONE;
-+    switch( nBreakType )
-+    {
-+        case word::WdBreakType::wdPageBreak:
-+            eBreakType = style::BreakType_PAGE_AFTER;
-+            break;
-+        case word::WdBreakType::wdColumnBreak:
-+            eBreakType = style::BreakType_COLUMN_AFTER;
-+            break;
-+        case word::WdBreakType::wdLineBreak:
-+        case word::WdBreakType::wdLineBreakClearLeft:
-+        case word::WdBreakType::wdLineBreakClearRight:
-+        case word::WdBreakType::wdSectionBreakContinuous:
-+        case word::WdBreakType::wdSectionBreakEvenPage:
-+        case word::WdBreakType::wdSectionBreakNextPage:
-+        case word::WdBreakType::wdSectionBreakOddPage:
-+        case word::WdBreakType::wdTextWrappingBreak:
-+            DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
-+            break;
-+        default:
-+            DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
-+    }
-+
-+    if( eBreakType != style::BreakType_NONE )
-+    {
-+        if( !mxTextCursor->isCollapsed() )
-+        {
-+            mxTextCursor->setString( rtl::OUString() );
-+            mxTextCursor->collapseToStart();
-+        }
-+
-+        uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW );
-+        xProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ), uno::makeAny( eBreakType ) );
-+    }
-+}
-+
-+rtl::OUString& 
-+SwVbaBaseRange::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBaseRange") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaBaseRange::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.BaseRange" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+
-+/*
-+* class SwVbaDocRange
-+*/
-+class SwVbaDocRange : public SwVbaBaseRange
-+{
-+public:
-+	SwVbaDocRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-+        const uno::Reference< text::XTextDocument >& rDocument, const uno::Reference< text::XTextRange >& rStart, 
-+        const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument = sal_False ) 
-+        throw ( uno::RuntimeException );
-+    virtual ~SwVbaDocRange();
-+};
-+
-+SwVbaDocRange::SwVbaDocRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-+        const uno::Reference< text::XTextDocument >& rDocument, const uno::Reference< text::XTextRange >& rStart, 
-+        const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw ( uno::RuntimeException ) : SwVbaBaseRange( rParent, rContext )
-+{
-+    mxTextDocument = rDocument;
-+    mbMaySpanEndOfDocument = _bMaySpanEndOfDocument; 
-+
-+    if( rText.is() )
-+        mxText = rText;
-+    else
-+        mxText = mxTextDocument->getText();
-+    
-+    mxTextCursor = SwVbaRangeHelper::initCursor( rStart, mxText );
-+    mxTextCursor->collapseToStart();
-+
-+    if( rEnd.is() )
-+        mxTextCursor->gotoRange( rEnd, sal_True );
-+    else
-+        mxTextCursor->gotoEnd( sal_True );
-+}
-+
-+SwVbaDocRange::~SwVbaDocRange()
-+{
-+}
-+
-+/*
-+* class SwVbaRange
-+*/
-+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-+    const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument ) : SwVbaRange_BASE( rParent, rContext )
-+{
-+    uno::Reference< text::XText > xText;
-+    mxActualRange = uno::Reference< word::XRange > ( new SwVbaDocRange( rParent, rContext, rTextDocument, rStart, rEnd, xText, _bMaySpanEndOfDocument ) );
-+}
-+
-+SwVbaRange::~SwVbaRange()
-+{
-+}
-+
-+uno::Reference< text::XTextRange >
-+SwVbaRange::getXTextRange() throw (uno::RuntimeException)
-+{
-+    uno::Reference< text::XTextRange > xTextRange;
-+    SwVbaBaseRange* pBaseRange = dynamic_cast< SwVbaBaseRange* >( mxActualRange.get() );
-+    if( pBaseRange )
-+        xTextRange = pBaseRange->getXTextRange();
-+    return xTextRange;
-+}
-+
-+rtl::OUString SAL_CALL
-+SwVbaRange::getText() throw ( uno::RuntimeException )
-+{
-+    rtl::OUString aText;
-+    if( mxActualRange.is() )
-+        return mxActualRange->getText();
-+    return aText;
-+}
-+
-+void SAL_CALL
-+SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
-+{
-+    if( mxActualRange.is() )
-+        mxActualRange->setText( rText );
-+}
-+
-+void SAL_CALL SwVbaRange::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException)
-+{
-+    if( mxActualRange.is() )
-+        mxActualRange->InsertBreak( _breakType );
-+}
-+    
-+rtl::OUString& 
-+SwVbaRange::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaRange") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaRange::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Range" ) );
-+	}
-+	return aServiceNames;
-+}
-+
---- sw/source/ui/vba/vbarange.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbarange.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,65 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_RANGE_HXX
-+#define SW_VBA_RANGE_HXX
-+
-+#include <ooo/vba/word/XRange.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/text/XTextRange.hpp>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XRange > SwVbaRange_BASE;
-+
-+class SwVbaRange : public SwVbaRange_BASE
-+{
-+private:
-+    css::uno::Reference< ooo::vba::word::XRange > mxActualRange;
-+
-+public:
-+	SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
-+        const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument = sal_False );
-+	virtual ~SwVbaRange();
-+    
-+    css::uno::Reference< css::text::XTextRange > getXTextRange() throw (css::uno::RuntimeException);
-+
-+	// Attribute
-+    virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
-+
-+   // Methods
-+   virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException);
-+
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_RANGE_HXX */
---- sw/source/ui/vba/vbarangehelper.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbarangehelper.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,143 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbarangehelper.hxx"
-+#include <com/sun/star/text/ControlCharacter.hpp>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+/**
-+ * get a range in a xText by creating
-+ * a cursor that iterates over the text. If the iterating cursor is 
-+ * equal to the desired position, the range equivalent is returned.
-+ * Some special cases are tables that are inside of the text, because the
-+ * position has to be adjusted.
-+ * @param xText a text where a range position is searched
-+ * @param position a position inside o the text
-+ * @return a range for the postion; null is returned if no range can be
-+ * constructed.
-+ */
-+uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const uno::Reference< text::XText >& rText, sal_Int32 _position ) throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XTextRange > xRange;
-+    if( rText.is() )
-+    {
-+        sal_Int32 nPos = 0;
-+        uno::Reference< text::XTextCursor > xCursor = rText->createTextCursor();
-+        xCursor->collapseToStart();
-+        sal_Bool bCanGo = sal_True;
-+        while( !xRange.is() && bCanGo )
-+        {
-+            if( _position == nPos )
-+            {
-+                xRange = xCursor->getStart();
-+            }    
-+            else
-+            {
-+                bCanGo = xCursor->goRight( 1, sal_False );
-+                nPos++;
-+            }
-+        }
-+    }
-+    return xRange;
-+}
-+
-+
-+void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException )
-+{
-+    sal_Int32 nlastIndex = 0;
-+    sal_Int32 nIndex = 0;
-+    uno::Reference< text::XTextRange > xRange = rTextRange;
-+    
-+    while(( nIndex = rStr.indexOf('\n', nlastIndex)) >= 0  )
-+    {
-+        xRange = xRange->getEnd();
-+        if( nlastIndex < ( nIndex - 1 ) )
-+        {
-+            rText->insertString( xRange, rStr.copy( nlastIndex, ( nIndex - 1 - nlastIndex ) ), _bAbsorb );
-+            xRange = xRange->getEnd();
-+        }
-+
-+        rText->insertControlCharacter( xRange, text::ControlCharacter::PARAGRAPH_BREAK, _bAbsorb );
-+        nlastIndex = nIndex + 1;
-+    }
-+
-+    if( nlastIndex < rStr.getLength() )
-+    {
-+        xRange = xRange->getEnd();
-+
-+        rtl::OUString aWatt = rStr.copy( nlastIndex );
-+        rText->insertString( xRange, aWatt, _bAbsorb );
-+    }
-+}
-+
-+uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Reference< text::XTextRange >& rTextRange, const uno::Reference< text::XText >& rText ) throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XTextCursor > xTextCursor;
-+    sal_Bool bGotTextCursor = sal_False;
-+
-+    try
-+    {
-+        xTextCursor = rText->createTextCursorByRange( rTextRange );
-+        bGotTextCursor = sal_True;
-+    }
-+    catch (uno::Exception& e)
-+    {
-+        DebugHelper::exception(e);
-+    }
-+
-+    if( !bGotTextCursor )
-+    {
-+        try
-+        {
-+            uno::Reference< text::XText > xText = rTextRange->getText();
-+            xTextCursor = xText->createTextCursor();
-+            bGotTextCursor = sal_True;
-+        }
-+        catch( uno::Exception& e )
-+        {
-+            DebugHelper::exception(e);
-+        }
-+    }
-+
-+    if( !bGotTextCursor )
-+    {
-+        try
-+        {
-+            xTextCursor = rText->createTextCursor();
-+            bGotTextCursor = sal_True;
-+        }
-+        catch( uno::Exception& e )
-+        {
-+            DebugHelper::exception(e);
-+        }
-+    }
-+    return xTextCursor;
-+}
---- sw/source/ui/vba/vbarangehelper.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbarangehelper.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,45 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_RANGEHELPER_HXX
-+#define SW_VBA_RANGEHELPER_HXX
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/text/XTextViewCursor.hpp>
-+#include <com/sun/star/text/XText.hpp>
-+
-+class SwVbaRangeHelper
-+{
-+public:
-+    static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException );
-+    static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException );
-+    static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException );
-+
-+};
-+#endif /* SW_VBA_RANGEHELPER_HXX */
---- sw/source/ui/vba/vbaselection.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbaselection.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,75 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaselection.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaSelection::SwVbaSelection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException ) : SwVbaSelection_BASE( rParent, rContext ), mxModel( rModel )
-+{
-+}
-+
-+SwVbaSelection::~SwVbaSelection()
-+{
-+}
-+
-+rtl::OUString SAL_CALL
-+SwVbaSelection::getText() throw ( uno::RuntimeException )
-+{
-+    rtl::OUString aText;
-+    return aText;
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
-+{
-+}
-+
-+rtl::OUString& 
-+SwVbaSelection::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSelection") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaSelection::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Selection" ) );
-+	}
-+	return aServiceNames;
-+}
-+
---- sw/source/ui/vba/vbaselection.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbaselection.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,56 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_SELECTION_HXX
-+#define SW_VBA_SELECTION_HXX
-+
-+#include <ooo/vba/word/XSelection.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSelection > SwVbaSelection_BASE;
-+
-+class SwVbaSelection : public SwVbaSelection_BASE
-+{
-+private:
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+
-+public:
-+	SwVbaSelection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaSelection();
-+    
-+	// Attribute
-+    virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
-+
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_SELECTION_HXX */
---- sw/source/ui/vba/vbasystem.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbasystem.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,195 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbasystem.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <ooo/vba/word/WdCursorType.hpp>
-+#include <tools/diagnose_ex.h>
-+#include <tools/config.hxx>
-+#include <tools/string.hxx>
-+#include <osl/file.hxx>
-+#include <tools/urlobj.hxx>
-+#include <tools/string.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+PrivateProfileStringListener::PrivateProfileStringListener( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey )
-+    :maFileName( rFileName ), maGroupName( rGroupName ), maKey( rKey )
-+{
-+}
-+
-+PrivateProfileStringListener::~PrivateProfileStringListener()
-+{
-+}
-+
-+void PrivateProfileStringListener::Initialize( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey )
-+{
-+    maFileName = rFileName;
-+    maGroupName = rGroupName;
-+    maKey = rKey;
-+}
-+
-+uno::Any PrivateProfileStringListener::getValueEvent()
-+{
-+    // get the private profile string
-+    Config aCfg( maFileName );
-+    aCfg.SetGroup( maGroupName );
-+    rtl::OUString sValue = rtl::OUString( String( aCfg.ReadKey( maKey ), RTL_TEXTENCODING_UTF8 ) );
-+
-+    return uno::makeAny( sValue );
-+}
-+
-+void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value )
-+{
-+    // set the private profile string
-+    Config aCfg( maFileName );
-+    aCfg.SetGroup( maGroupName );
-+
-+    rtl::OUString aValue;
-+    value >>= aValue;
-+    aCfg.WriteKey( maKey, ByteString( aValue.getStr(), RTL_TEXTENCODING_UTF8 ) );
-+}
-+
-+SwVbaSystem::SwVbaSystem( uno::Reference<uno::XComponentContext >& xContext ): SwVbaSystem_BASE( uno::Reference< XHelperInterface >(), xContext )
-+{
-+}
-+
-+SwVbaSystem::~SwVbaSystem()
-+{
-+}
-+
-+sal_Int32 SAL_CALL
-+SwVbaSystem::getCursor() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nPointerStyle =  getPointerStyle();
-+
-+    switch( nPointerStyle )
-+    {
-+        case POINTER_ARROW:
-+            return word::WdCursorType::wdCursorNorthwestArrow;
-+        case POINTER_NULL:
-+            return word::WdCursorType::wdCursorNormal;
-+        case POINTER_WAIT:
-+            return word::WdCursorType::wdCursorWait;
-+        case POINTER_TEXT:
-+            return word::WdCursorType::wdCursorIBeam;
-+        default:
-+            return word::WdCursorType::wdCursorNormal;
-+    }
-+}
-+
-+void SAL_CALL 
-+SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
-+{
-+    try
-+    {
-+        switch( _cursor )
-+        {
-+            case word::WdCursorType::wdCursorNorthwestArrow:
-+            {
-+                const Pointer& rPointer( POINTER_ARROW );
-+                setCursorHelper( rPointer, sal_False );
-+                break;
-+            }
-+            case word::WdCursorType::wdCursorWait:
-+            {
-+                const Pointer& rPointer( static_cast< PointerStyle >( POINTER_WAIT ) );
-+                //It will set the edit window, toobar and statusbar's mouse pointer.
-+                setCursorHelper( rPointer, sal_True );
-+                break;
-+            }
-+            case word::WdCursorType::wdCursorIBeam:
-+            {
-+                const Pointer& rPointer( static_cast< PointerStyle >( POINTER_TEXT ) );
-+                //It will set the edit window, toobar and statusbar's mouse pointer.
-+                setCursorHelper( rPointer, sal_True );
-+                break;
-+            }
-+            case word::WdCursorType::wdCursorNormal:
-+            {
-+                const Pointer& rPointer( POINTER_NULL );
-+                setCursorHelper( rPointer, sal_False );
-+                break;
-+            }
-+            default:
-+                throw uno::RuntimeException( rtl::OUString( 
-+                        RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() );
-+                // TODO: isn't this a flaw in the API? It should be allowed to throw an
-+                // IllegalArgumentException, or so
-+        }        
-+    }
-+    catch( const uno::Exception& )
-+    {
-+    	DBG_UNHANDLED_EXCEPTION();
-+    }
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( uno::RuntimeException )
-+{
-+    if( rFilename.getLength() == 0 )
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
-+
-+    // FIXME: need to detect whether it is a relative file path
-+    // we need to detect if this is a URL, if not then assume its a file path
-+    rtl::OUString sFileUrl;
-+    INetURLObject aObj;
-+	aObj.SetURL( rFilename );
-+	bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
-+	if ( bIsURL )
-+		sFileUrl = rFilename;
-+	else
-+		osl::FileBase::getFileURLFromSystemPath( rFilename, sFileUrl);
-+
-+    ByteString aGroupName = ByteString( rSection.getStr(), RTL_TEXTENCODING_UTF8);
-+    ByteString aKey = ByteString( rKey.getStr(), RTL_TEXTENCODING_UTF8);
-+    maPrivateProfileStringListener.Initialize( sFileUrl, aGroupName, aKey );
-+
-+    return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( &maPrivateProfileStringListener ) ) );
-+}
-+
-+rtl::OUString& 
-+SwVbaSystem::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSystem") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaSystem::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.System" ) );
-+	}
-+	return aServiceNames;
-+}
---- sw/source/ui/vba/vbasystem.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbasystem.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,75 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbasystem.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_SYSTEM_HXX
-+#define SW_VBA_SYSTEM_HXX
-+
-+#include <ooo/vba/word/XSystem.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <vbahelper/vbapropvalue.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSystem > SwVbaSystem_BASE;
-+
-+class PrivateProfileStringListener : public PropListener
-+{
-+private:
-+    rtl::OUString maFileName;
-+    ByteString maGroupName;
-+    ByteString  maKey;
-+public:    
-+    PrivateProfileStringListener(){};
-+    PrivateProfileStringListener( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey );
-+    virtual ~PrivateProfileStringListener();
-+    void Initialize( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey );
-+
-+    //PropListener
-+    virtual void setValueEvent( const css::uno::Any& value );
-+    virtual css::uno::Any getValueEvent();
-+};
-+
-+class SwVbaSystem : public SwVbaSystem_BASE
-+{
-+private:
-+    PrivateProfileStringListener maPrivateProfileStringListener;
-+
-+public:
-+	SwVbaSystem( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
-+	virtual ~SwVbaSystem();
-+
-+	// XSystem
-+	virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException );
-+	virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException );
-+    virtual css::uno::Any SAL_CALL PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( css::uno::RuntimeException );
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_SYSTEM_HXX */
---- sw/source/ui/vba/vbavariable.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbavariable.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,108 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbavariable.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/beans/PropertyValue.hpp>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaVariable::SwVbaVariable( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-+    const uno::Reference< beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( uno::RuntimeException ) :
-+    SwVbaVariable_BASE( rParent, rContext ), mxUserDefined( rUserDefined ), maName( rName )
-+{
-+}
-+
-+SwVbaVariable::~SwVbaVariable()
-+{
-+}
-+
-+rtl::OUString SAL_CALL
-+SwVbaVariable::getName() throw ( css::uno::RuntimeException )
-+{
-+    return maName;
-+}
-+
-+void SAL_CALL
-+SwVbaVariable::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException )
-+{
-+    throw uno::RuntimeException( rtl::OUString(
-+            RTL_CONSTASCII_USTRINGPARAM(" Fail to set name")), uno::Reference< uno::XInterface >() );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaVariable::getValue() throw ( css::uno::RuntimeException )
-+{
-+    uno::Reference< beans::XPropertySet > xProp( mxUserDefined, uno::UNO_QUERY_THROW );
-+    return xProp->getPropertyValue( maName );
-+}
-+
-+void SAL_CALL
-+SwVbaVariable::setValue( const uno::Any& rValue ) throw ( css::uno::RuntimeException )
-+{
-+    // FIXME: fail to set the value if the new type of vaue is differenct from the original one.
-+    uno::Reference< beans::XPropertySet > xProp( mxUserDefined, uno::UNO_QUERY_THROW );
-+    xProp->setPropertyValue( maName, rValue );
-+}
-+
-+sal_Int32 SAL_CALL
-+SwVbaVariable::getIndex() throw ( css::uno::RuntimeException )
-+{
-+    const uno::Sequence< beans::PropertyValue > props = mxUserDefined->getPropertyValues();
-+    for (sal_Int32 i = 0; i < props.getLength(); ++i)
-+    {
-+        if( maName.equals( props[i].Name ) )
-+            return i+1;
-+    }
-+
-+    return 0;
-+}
-+
-+rtl::OUString& 
-+SwVbaVariable::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariable") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaVariable::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Variable" ) );
-+	}
-+	return aServiceNames;
-+}
-+
---- sw/source/ui/vba/vbavariable.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbavariable.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_VARIABLE_HXX
-+#define SW_VBA_VARIABLE_HXX
-+
-+#include <ooo/vba/word/XVariable.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/beans/XPropertyAccess.hpp>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XVariable > SwVbaVariable_BASE;
-+
-+class SwVbaVariable : public SwVbaVariable_BASE
-+{
-+private:
-+    css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined;
-+    rtl::OUString maName;
-+
-+public:
-+	SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
-+        const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaVariable();
-+
-+   // XVariable
-+    virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException );
-+    virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException );
-+    virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException );
-+    virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException );
-+    virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException );
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_VARIABLE_HXX */
---- sw/source/ui/vba/vbavariables.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbavariables.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,105 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbavariables.hxx"
-+#include "vbavariable.hxx"
-+#include <com/sun/star/beans/XPropertyContainer.hpp>
-+#include <com/sun/star/beans/PropertyAttribute.hpp>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+uno::Reference< container::XIndexAccess > createVariablesAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertyAccess >& xUserDefined ) throw ( uno::RuntimeException )
-+{
-+    // FIXME: the performance is poor?
-+    XNamedObjectCollectionHelper< word::XVariable >::XNamedVec mVariables;
-+    const uno::Sequence< beans::PropertyValue > props = xUserDefined->getPropertyValues();
-+    sal_Int32 nCount = props.getLength();
-+    mVariables.reserve( nCount );
-+    for( sal_Int32 i=0; i < nCount; i++ )
-+        mVariables.push_back( uno::Reference< word::XVariable > ( new SwVbaVariable( xParent, xContext, xUserDefined, props[i].Name ) ) );
-+
-+    uno::Reference< container::XIndexAccess > xVariables( new XNamedObjectCollectionHelper< word::XVariable >( mVariables ) );
-+    return xVariables;
-+}
-+
-+SwVbaVariables::SwVbaVariables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertyAccess >& rUserDefined ): SwVbaVariables_BASE( xParent, xContext, createVariablesAccess( xParent, xContext, rUserDefined ) ),  mxUserDefined( rUserDefined )
-+{
-+}
-+// XEnumerationAccess
-+uno::Type
-+SwVbaVariables::getElementType() throw (uno::RuntimeException)
-+{
-+	return word::XVariable::static_type(0);
-+}
-+uno::Reference< container::XEnumeration >
-+SwVbaVariables::createEnumeration() throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+    return xEnumerationAccess->createEnumeration();
-+}
-+
-+uno::Any
-+SwVbaVariables::createCollectionObject( const css::uno::Any& aSource )
-+{
-+    return aSource;
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaVariables::Add( const rtl::OUString& rName, const uno::Any& rValue ) throw (uno::RuntimeException)
-+{
-+    uno::Any aValue;
-+    if( rValue.hasValue() )
-+        aValue = rValue;
-+    else
-+        aValue <<= rtl::OUString();
-+    uno::Reference< beans::XPropertyContainer > xPropertyContainer( mxUserDefined, uno::UNO_QUERY_THROW );
-+    xPropertyContainer->addProperty( rName, beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::REMOVEABLE, aValue );
-+
-+    return uno::makeAny( uno::Reference< word::XVariable >( new SwVbaVariable( getParent(), mxContext, mxUserDefined, rName ) ) );
-+}
-+
-+rtl::OUString& 
-+SwVbaVariables::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariables") );
-+	return sImplName;
-+}
-+
-+css::uno::Sequence<rtl::OUString> 
-+SwVbaVariables::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > sNames;
-+	if ( sNames.getLength() == 0 )
-+	{
-+		sNames.realloc( 1 );
-+		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Variables") );
-+	}
-+	return sNames;
-+}
---- sw/source/ui/vba/vbavariables.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbavariables.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,64 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_VARIABLES_HXX
-+#define SW_VBA_VARIABLES_HXX
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <ooo/vba/word/XVariables.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <com/sun/star/container/XIndexAccess.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/beans/XPropertyAccess.hpp>
-+
-+typedef CollTestImplHelper< ooo::vba::word::XVariables > SwVbaVariables_BASE;
-+
-+class SwVbaVariables : public SwVbaVariables_BASE
-+{
-+private:
-+    css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined;
-+
-+public:
-+	SwVbaVariables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined );
-+	virtual ~SwVbaVariables() {}
-+
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+
-+	// SwVbaVariables_BASE
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+
-+	// XVariables
-+	virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException);
-+};    
-+
-+#endif /* SW_VBA_VARIABLES_HXX */
---- sw/source/ui/vba/vbaview.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbaview.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,384 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaview.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/view/XViewSettingsSupplier.hpp>
-+#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-+#include <com/sun/star/text/XText.hpp>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+#include <com/sun/star/text/XFootnotesSupplier.hpp>
-+#include <com/sun/star/text/XEndnotesSupplier.hpp>
-+#include <com/sun/star/container/XIndexAccess.hpp>
-+#include <com/sun/star/frame/XController.hpp>
-+#include <com/sun/star/lang/XServiceInfo.hpp>
-+#include <ooo/vba/word/WdSpecialPane.hpp>
-+#include <ooo/vba/word/WdViewType.hpp>
-+#include <ooo/vba/word/WdSeekView.hpp>
-+
-+#include "wordvbahelper.hxx"
-+#include <view.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+const sal_Int32 DEFAULT_BODY_DISTANCE = 500;
-+
-+SwVbaView::SwVbaView( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-+    const uno::Reference< frame::XModel >& rModel ) throw ( uno::RuntimeException ) :
-+    SwVbaView_BASE( rParent, rContext ), mxModel( rModel )
-+{
-+    uno::Reference< frame::XController > xController = mxModel->getCurrentController();
-+
-+    uno::Reference< text::XTextViewCursorSupplier > xTextViewCursorSupp( xController, uno::UNO_QUERY_THROW );
-+    mxViewCursor = xTextViewCursorSupp->getViewCursor();
-+
-+    uno::Reference< view::XViewSettingsSupplier > xViewSettingSupp( xController, uno::UNO_QUERY_THROW );
-+    mxViewSettings.set( xViewSettingSupp->getViewSettings(), uno::UNO_QUERY_THROW );
-+}
-+
-+SwVbaView::~SwVbaView()
-+{
-+}
-+
-+::sal_Int32 SAL_CALL 
-+SwVbaView::getSeekView() throw (css::uno::RuntimeException)
-+{
-+    uno::Reference< text::XText > xCurrentText = mxViewCursor->getText();
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( xCurrentText, uno::UNO_QUERY_THROW );
-+    rtl::OUString aImplName = xServiceInfo->getImplementationName();
-+    if( aImplName.equalsAscii("SwXBodyText") )
-+    {
-+        return word::WdSeekView::wdSeekMainDocument;
-+    }
-+    else if( aImplName.equalsAscii("SwXHeadFootText") )
-+    {
-+        if( word::HeaderFooterHelper::isHeader( mxModel, xCurrentText ) )
-+        {
-+            if( word::HeaderFooterHelper::isFirstPageHeader( mxModel, xCurrentText ) )
-+                return word::WdSeekView::wdSeekFirstPageHeader;
-+            else if( word::HeaderFooterHelper::isEvenPagesHeader( mxModel, xCurrentText ) )
-+                return word::WdSeekView::wdSeekEvenPagesHeader;
-+            else
-+                return word::WdSeekView::wdSeekPrimaryHeader;
-+        }
-+        else
-+        {
-+            if( word::HeaderFooterHelper::isFirstPageFooter( mxModel, xCurrentText ) )
-+                return word::WdSeekView::wdSeekFirstPageFooter;
-+            else if( word::HeaderFooterHelper::isEvenPagesFooter( mxModel, xCurrentText ) )
-+                return word::WdSeekView::wdSeekEvenPagesFooter;
-+            else
-+                return word::WdSeekView::wdSeekPrimaryFooter;
-+        }
-+    }
-+    else if( aImplName.equalsAscii("SwXFootnote") )
-+    {
-+        if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Endnote") ) ) )
-+            return word::WdSeekView::wdSeekEndnotes;
-+        else
-+            return word::WdSeekView::wdSeekFootnotes;
-+    }
-+
-+    return word::WdSeekView::wdSeekMainDocument;
-+}
-+
-+void SAL_CALL 
-+SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException)
-+{
-+    if( _seekview == getSeekView() )
-+        return;
-+
-+    switch( _seekview )
-+    {
-+        case word::WdSeekView::wdSeekFirstPageFooter:
-+        case word::WdSeekView::wdSeekFirstPageHeader:
-+        case word::WdSeekView::wdSeekCurrentPageFooter:
-+        case word::WdSeekView::wdSeekCurrentPageHeader:
-+        case word::WdSeekView::wdSeekPrimaryFooter:
-+        case word::WdSeekView::wdSeekPrimaryHeader:
-+        case word::WdSeekView::wdSeekEvenPagesFooter:
-+        case word::WdSeekView::wdSeekEvenPagesHeader:
-+        {
-+            // need to test
-+            mxViewCursor->gotoRange( getHFTextRange( _seekview ), sal_False );
-+            break;
-+        }
-+        case word::WdSeekView::wdSeekFootnotes:
-+        {
-+            uno::Reference< text::XFootnotesSupplier > xFootnotesSupp( mxModel, uno::UNO_QUERY_THROW );
-+            uno::Reference< container::XIndexAccess > xFootnotes( xFootnotesSupp->getFootnotes(), uno::UNO_QUERY_THROW );
-+            if( xFootnotes->getCount() > 0 )
-+            {
-+                uno::Reference< text::XText > xText( xFootnotes->getByIndex(0), uno::UNO_QUERY_THROW );
-+                mxViewCursor->gotoRange( xText->getStart(), sal_False );
-+            }
-+            else
-+            {
-+                DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() );
-+            }
-+            break;
-+        }
-+        case word::WdSeekView::wdSeekEndnotes:
-+        {
-+            uno::Reference< text::XEndnotesSupplier > xEndnotesSupp( mxModel, uno::UNO_QUERY_THROW );
-+            uno::Reference< container::XIndexAccess > xEndnotes( xEndnotesSupp->getEndnotes(), uno::UNO_QUERY_THROW );
-+            if( xEndnotes->getCount() > 0 )
-+            {
-+                uno::Reference< text::XText > xText( xEndnotes->getByIndex(0), uno::UNO_QUERY_THROW );
-+                mxViewCursor->gotoRange( xText->getStart(), sal_False );
-+            }
-+            else
-+            {
-+                DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() );
-+            }
-+            break;
-+        }
-+        case word::WdSeekView::wdSeekMainDocument:
-+        {
-+            uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
-+            uno::Reference< text::XText > xText = xTextDocument->getText();
-+            mxViewCursor->gotoRange( xText->getStart(), sal_False );
-+            break;
-+        }
-+    }
-+}
-+
-+::sal_Int32 SAL_CALL 
-+SwVbaView::getSplitSpecial() throw (css::uno::RuntimeException)
-+{
-+    return word::WdSpecialPane::wdPaneNone;
-+}
-+
-+void SAL_CALL 
-+SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+::sal_Bool SAL_CALL 
-+SwVbaView::getTableGridLines() throw (css::uno::RuntimeException)
-+{
-+    sal_Bool bShowTableGridLine = sal_False;
-+    mxViewSettings->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowTableBoundaries"))) >>= bShowTableGridLine;
-+    return bShowTableGridLine;
-+}
-+
-+void SAL_CALL 
-+SwVbaView::setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException)
-+{
-+    mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowTableBoundaries")), uno::makeAny( _tablegridlines ) );
-+}
-+
-+::sal_Int32 SAL_CALL 
-+SwVbaView::getType() throw (css::uno::RuntimeException)
-+{
-+    // FIXME: handle wdPrintPreview type
-+    sal_Bool bOnlineLayout = sal_False;
-+    mxViewSettings->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout"))) >>= bOnlineLayout;
-+    return bOnlineLayout ? word::WdViewType::wdWebView : word::WdViewType::wdPrintView;
-+}
-+
-+void SAL_CALL 
-+SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException)
-+{
-+    // FIXME: handle wdPrintPreview type
-+    switch( _type )
-+    {
-+        case word::WdViewType::wdPrintView:
-+        {
-+            mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout")), uno::makeAny( sal_False ) );
-+            break;
-+        }
-+        case word::WdViewType::wdWebView:
-+        {
-+            mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout")), uno::makeAny( sal_True ) );
-+            break;
-+        }
-+        case word::WdViewType::wdPrintPreview:
-+        {
-+            PrintPreviewHelper( uno::Any(),word::getView( mxModel ) ); 
-+            break;
-+        }
-+        default:
-+            DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
-+            
-+    }
-+}
-+
-+uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) throw (uno::RuntimeException)
-+{
-+    mxModel->lockControllers();
-+
-+    rtl::OUString aPropIsOn;
-+    rtl::OUString aPropIsShared;
-+    rtl::OUString aPropBodyDistance;
-+    rtl::OUString aPropText;
-+    
-+    switch( nType )
-+    {
-+        case word::WdSeekView::wdSeekCurrentPageFooter:
-+        case word::WdSeekView::wdSeekFirstPageFooter:
-+        case word::WdSeekView::wdSeekPrimaryFooter:
-+        case word::WdSeekView::wdSeekEvenPagesFooter:
-+        {
-+            aPropIsOn = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn") );
-+            aPropIsShared = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared") );
-+            aPropBodyDistance = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance") );
-+            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
-+            break;
-+        }
-+        case word::WdSeekView::wdSeekCurrentPageHeader:
-+        case word::WdSeekView::wdSeekFirstPageHeader:
-+        case word::WdSeekView::wdSeekPrimaryHeader:
-+        case word::WdSeekView::wdSeekEvenPagesHeader:
-+        {
-+            aPropIsOn = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn") );
-+            aPropIsShared = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared") );
-+            aPropBodyDistance = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance") );
-+            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") );
-+            break;
-+        }
-+    }
-+
-+    uno::Reference< text::XPageCursor > xPageCursor( mxViewCursor, uno::UNO_QUERY_THROW );
-+    
-+    if( nType == word::WdSeekView::wdSeekFirstPageFooter
-+        || nType == word::WdSeekView::wdSeekFirstPageHeader )
-+    {
-+        xPageCursor->jumpToFirstPage();
-+    }
-+
-+    uno::Reference< style::XStyle > xStyle;
-+    uno::Reference< text::XText > xText;
-+    switch( nType )
-+    {
-+        case word::WdSeekView::wdSeekPrimaryFooter:
-+        case word::WdSeekView::wdSeekPrimaryHeader:
-+        case word::WdSeekView::wdSeekEvenPagesFooter:
-+        case word::WdSeekView::wdSeekEvenPagesHeader:
-+        {
-+            // The primary header is the first header of the section.
-+            // If the header is not shared between odd and even pages
-+            // the odd page's header is the primary header. If the
-+            // first page's header is different from the rest of the
-+            // document, it is NOT the primary header ( the next primary
-+            // header would be on page 3 )
-+            // The even pages' header is only available if the header is
-+            // not shared and the current style is applied to a page with
-+            // an even page number
-+            uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW );
-+            rtl::OUString aPageStyleName;
-+            xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName;
-+            if( aPageStyleName.equalsAscii("First Page") )
-+            {
-+                // go to the beginning of where the next style is used
-+                sal_Bool hasNextPage = sal_False;
-+                xStyle = word::getCurrentPageStyle( mxModel );
-+                do
-+                {
-+                    hasNextPage = xPageCursor->jumpToNextPage();
-+                }
-+                while( hasNextPage && ( xStyle == word::getCurrentPageStyle( mxModel ) ) );
-+
-+                if( !hasNextPage )
-+                    DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() );
-+            }
-+            break;
-+        }    
-+        default:
-+        {
-+            break;
-+        }
-+    }    
-+
-+    xStyle = word::getCurrentPageStyle( mxModel );
-+    uno::Reference< beans::XPropertySet > xPageProps( xStyle, uno::UNO_QUERY_THROW );
-+    sal_Bool isOn = sal_False;
-+    xPageProps->getPropertyValue( aPropIsOn ) >>= isOn;
-+    sal_Bool isShared =  sal_False;
-+    xPageProps->getPropertyValue( aPropIsShared ) >>= isShared;
-+    if( !isOn )
-+    {
-+        xPageProps->setPropertyValue( aPropIsOn, uno::makeAny( sal_True ) );
-+        xPageProps->setPropertyValue( aPropBodyDistance, uno::makeAny( DEFAULT_BODY_DISTANCE ) );
-+    }
-+    if( !isShared )
-+    {
-+        rtl::OUString aTempPropText = aPropText;
-+        if( nType == word::WdSeekView::wdSeekEvenPagesFooter
-+            || nType == word::WdSeekView::wdSeekEvenPagesHeader )
-+        {
-+            aTempPropText += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left") );
-+        }
-+        else
-+        {
-+            aTempPropText += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Right") );
-+        }
-+        xText.set( xPageProps->getPropertyValue( aTempPropText), uno::UNO_QUERY_THROW );
-+    }
-+    else
-+    {
-+        if( nType == word::WdSeekView::wdSeekEvenPagesFooter
-+            || nType == word::WdSeekView::wdSeekEvenPagesHeader )
-+        {
-+            DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() );
-+        }
-+        xText.set( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
-+    }
-+
-+    mxModel->unlockControllers();
-+    if( !xText.is() )
-+    {
-+        DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
-+    }
-+    return xText->getStart();
-+}
-+
-+rtl::OUString& 
-+SwVbaView::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaView") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaView::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.View" ) );
-+	}
-+	return aServiceNames;
-+}
-+
---- sw/source/ui/vba/vbaview.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbaview.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,69 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_VIEW_HXX
-+#define SW_VBA_VIEW_HXX
-+
-+#include <ooo/vba/word/XView.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/text/XTextViewCursor.hpp>
-+#include <com/sun/star/text/XTextRange.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XView > SwVbaView_BASE;
-+
-+class SwVbaView : public SwVbaView_BASE
-+{
-+private:
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+    css::uno::Reference< css::text::XTextViewCursor > mxViewCursor;
-+    css::uno::Reference< css::beans::XPropertySet > mxViewSettings;
-+
-+    css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ) throw (css::uno::RuntimeException);
-+
-+public:
-+	SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
-+        const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaView();
-+
-+   // XView
-+    virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getSplitSpecial() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getTableGridLines() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_VIEW_HXX */
---- sw/source/ui/vba/vbawindow.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbawindow.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,116 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbawindow.cxx,v $
-+ * $Revision: 1.5 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <vbahelper/helperdecl.hxx>
-+#include "vbawindow.hxx"
-+#include "vbaglobals.hxx"
-+#include "vbadocument.hxx"
-+#include "vbaview.hxx"
-+#include "vbapanes.hxx"
-+#include "vbapane.hxx"
-+
-+using namespace ::com::sun::star;
-+using namespace ::ooo::vba;
-+
-+SwVbaWindow::SwVbaWindow( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowImpl_BASE( xParent, xContext, xModel )
-+{
-+}
-+
-+SwVbaWindow::SwVbaWindow( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext )  
-+        : WindowImpl_BASE( args, xContext )
-+{
-+}
-+
-+void
-+SwVbaWindow::Activate() throw (css::uno::RuntimeException)
-+{
-+	SwVbaDocument document( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
-+
-+	document.Activate();
-+}
-+
-+void
-+SwVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& RouteDocument ) throw (uno::RuntimeException)
-+{
-+    // FIXME: it is incorrect when there are more than 1 windows
-+	SwVbaDocument document( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
-+    uno::Any FileName;
-+	document.Close(SaveChanges, FileName, RouteDocument );
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaWindow::getView() throw (uno::RuntimeException)
-+{
-+    return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this,  mxContext, m_xModel ) ) );    
-+}
-+
-+void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nType = 0;
-+    if( _view >>= nType )
-+    {
-+        SwVbaView view( this,  mxContext, m_xModel );
-+        view.setType( nType );
-+    }    
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaWindow::Panes( const uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< XCollection > xPanes( new SwVbaPanes( this,  mxContext, m_xModel ) );
-+    if(  aIndex.getValueTypeClass() == uno::TypeClass_VOID )
-+        return uno::makeAny( xPanes );
-+
-+    return uno::Any( xPanes->Item( aIndex, uno::Any() ) );    
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaWindow::ActivePane() throw (uno::RuntimeException)
-+{
-+    return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this,  mxContext, m_xModel ) ) );    
-+}
-+
-+rtl::OUString& 
-+SwVbaWindow::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaWindow") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaWindow::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Window" ) );
-+	}
-+	return aServiceNames;
-+}
---- sw/source/ui/vba/vbawindow.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/vbawindow.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,61 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbawindow.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_WINDOW_HXX
-+#define SW_VBA_WINDOW_HXX
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/word/XWindow.hpp>
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbawindowbase.hxx>
-+
-+typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::word::XWindow > WindowImpl_BASE;
-+
-+class SwVbaWindow : public WindowImpl_BASE
-+{		
-+public:	
-+	SwVbaWindow( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel );
-+    SwVbaWindow( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
-+
-+
-+    // Attributes
-+    virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException);
-+	// Methods
-+	virtual void SAL_CALL Activate(  ) throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException);
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif //SW_VBA_WINDOW_HXX
---- sw/source/ui/vba/wordvbahelper.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/wordvbahelper.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,207 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbahelper.cxx,v $
-+ * $Revision: 1.5.32.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <docsh.hxx>
-+#include "wordvbahelper.hxx"
-+#include <comphelper/processfactory.hxx>
-+#include <com/sun/star/frame/XController.hpp>
-+#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-+#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-+#include <com/sun/star/container/XNameAccess.hpp>
-+#include <com/sun/star/lang/XUnoTunnel.hpp>
-+#include <unotxdoc.hxx>
-+
-+using namespace ::com::sun::star;
-+using namespace ::ooo::vba;
-+
-+#define FIRST_PAGE 1;
-+
-+namespace ooo
-+{
-+namespace vba
-+{
-+namespace word
-+{
-+
-+SwDocShell* getDocShell( const uno::Reference< frame::XModel>& xModel ) 
-+{
-+	uno::Reference< lang::XUnoTunnel > xTunnel( xModel, uno::UNO_QUERY_THROW );
-+    SwXTextDocument* pXDoc = reinterpret_cast< SwXTextDocument * >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SwXTextDocument::getUnoTunnelId())));
-+	return pXDoc ? pXDoc->GetDocShell() : 0;
-+}
-+
-+SwView* getView( const uno::Reference< frame::XModel>& xModel )
-+{
-+    SwDocShell* pDocShell = getDocShell( xModel );
-+    return pDocShell? pDocShell->GetView() : 0;
-+}
-+
-+uno::Reference< text::XTextViewCursor > getXTextViewCursor( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< frame::XController > xController = xModel->getCurrentController();
-+    uno::Reference< text::XTextViewCursorSupplier > xTextViewCursorSupp( xController, uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextViewCursor > xTextViewCursor = xTextViewCursorSupp->getViewCursor();
-+    return xTextViewCursor;
-+}
-+
-+uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< beans::XPropertySet > xCursorProps( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+    rtl::OUString aPageStyleName;
-+    xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName;
-+    uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW );
-+    uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
-+    uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles") ) ), uno::UNO_QUERY_THROW );
-+    uno::Reference< style::XStyle > xStyle( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW );
-+
-+    return xStyle;
-+}
-+
-+// Class HeaderFooterHelper 
-+
-+sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-+    
-+    sal_Bool isOn = sal_False;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isOn;
-+    if( !isOn )
-+        return sal_False;
-+
-+    sal_Bool isShared = sal_False;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared"))) >>= isShared;
-+
-+    rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") );
-+    if( !isShared )
-+    {
-+        if( 0 == xPageCursor->getPage() % 2 )
-+        {
-+            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextLeft") );
-+        }
-+        else
-+        {
-+            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextRight") );
-+        }
-+    }
-+    
-+    uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
-+    //FIXME: can not compare in this way?
-+    return ( xText == xCurrentText );
-+}
-+
-+sal_Bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    if( isHeader( xModel, xCurrentText ) )
-+    {
-+        uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+        // FIXME: getPage allways returns 1
-+        sal_Int32 nPage = xPageCursor->getPage();
-+        return nPage == FIRST_PAGE;
-+    }
-+    return sal_False;
-+}
-+
-+sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    if( isHeader( xModel, xCurrentText ) )
-+    {
-+        uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-+        sal_Bool isShared = sal_False;
-+        xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared"))) >>= isShared;
-+        if( !isShared )
-+        {
-+            uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+            return ( 0 == xPageCursor->getPage() % 2 );
-+        }    
-+    }
-+    return sal_False;
-+}
-+
-+sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-+    
-+    sal_Bool isOn = sal_False;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isOn;
-+    if( !isOn )
-+        return sal_False;
-+
-+    sal_Bool isShared = sal_False;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))) >>= isShared;
-+
-+    rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
-+    if( !isShared )
-+    {
-+        if( 0 == xPageCursor->getPage() % 2 )
-+        {
-+            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextLeft") );
-+        }
-+        else
-+        {
-+            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextRight") );
-+        }
-+    }
-+    
-+    uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
-+
-+    return ( xText == xCurrentText );
-+}
-+
-+sal_Bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    if( isFooter( xModel, xCurrentText ) )
-+    {
-+        uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+        sal_Int32 nPage = xPageCursor->getPage();
-+        return nPage == FIRST_PAGE;
-+    }
-+    return sal_False;
-+}
-+
-+sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    if( isFooter( xModel, xCurrentText ) )
-+    {
-+        uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-+        sal_Bool isShared = sal_False;
-+        xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))) >>= isShared;
-+        if( !isShared )
-+        {
-+            uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+            return ( 0 == xPageCursor->getPage() % 2 );
-+        }    
-+    }
-+    return sal_False;
-+}
-+
-+} // word
-+} // 
-+} //
---- sw/source/ui/vba/wordvbahelper.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/source/ui/vba/wordvbahelper.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,67 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbahelper.hxx,v $
-+ * $Revision: 1.5.32.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_WORD_VBA_HELPER_HXX
-+#define SW_WORD_VBA_HELPER_HXX
-+
-+#include <vbahelper/vbahelper.hxx>
-+#include <com/sun/star/text/XText.hpp>
-+#include <com/sun/star/text/XTextViewCursor.hpp>
-+#include <com/sun/star/text/XPageCursor.hpp>
-+#include <com/sun/star/style/XStyle.hpp>
-+
-+class SwDocShell;
-+class SwView;
-+namespace ooo 
-+{
-+	namespace vba 
-+	{
-+    namespace word
-+    {
-+		//css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
-+        SwDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel );
-+        SwView* getView( const css::uno::Reference< css::frame::XModel>& xModel );
-+        css::uno::Reference< css::text::XTextViewCursor > getXTextViewCursor( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-+        css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-+
-+class HeaderFooterHelper
-+{
-+public:
-+    static sal_Bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+};
-+
-+}; // word
-+}; // vba
-+}; // ooo
-+#endif
---- sw/util/makefile.mk.old	2009-04-06 16:41:40.000000000 +0000
-+++ sw/util/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -131,6 +131,7 @@ SHL1STDLIBS+= \
- 	$(SALHELPERLIB) \
-     $(ICUUCLIB) \
- 	$(I18NUTILLIB)	\
-+		        $(VBAHELPERLIB) \
- 	$(AVMEDIALIB)
- 
- .IF "$(GUI)"=="WNT"
-@@ -343,6 +344,37 @@ SHL4STDLIBS= \
- 	$(CPPUHELPERLIB) \
- 	$(SALLIB) \
- 	$(ICUUCLIB) \
-+    $(VBAHELPERLIB) \
-+    $(BASICLIB)     \
- 	$(I18NUTILLIB)
- 
-+#target vba
-+TARGET_VBA=vbaswobj
-+SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno
-+SHL5IMPLIB=     i$(TARGET_VBA)
-+
-+SHL5VERSIONMAP=$(TARGET_VBA).map
-+SHL5DEF=$(MISC)$/$(SHL5TARGET).def
-+DEF5NAME=$(SHL5TARGET)
-+SHL5STDLIBS= \
-+                $(ISWLIB) \
-+                $(CPPUHELPERLIB) \
-+                $(VCLLIB) \
-+                $(CPPULIB) \
-+                $(COMPHELPERLIB) \
-+                $(SVLIB) \
-+                $(TOOLSLIB) \
-+                $(SALLIB)\
-+		        $(VBAHELPERLIB) \
-+                $(BASICLIB)     \
-+                $(SFXLIB)       \
-+                $(SVXLIB)       \
-+                $(SVTOOLLIB)    \
-+                $(SVLLIB) \
-+        $(VCLLIB) \
-+        $(TKLIB) \
-+
-+SHL5DEPN=$(SHL1TARGETN)
-+SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib
-+
- .INCLUDE :  target.mk
---- sw/util/vbaswobj.map.old	1970-01-01 00:00:00.000000000 +0000
-+++ sw/util/vbaswobj.map	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,9 @@
-+OOO_1.1 {
-+	global:
-+		component_getImplementationEnvironment;
-+		component_getFactory;
-+		component_writeInfo;
-+
-+	local:
-+		*;
-+};
---- vbahelper/inc/vbahelper/helperdecl.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/inc/vbahelper/helperdecl.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: helperdecl.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef OOVBAAPI_SERV_DECL
-+#define OOVBAAPI_SERV_DECL
-+#include <comphelper/servicedecl.hxx>
-+#include <ooo/vba/XHelperInterface.hpp>
-+
-+namespace comphelper {
-+namespace service_decl {
-+template <typename ImplT_, typename WithArgsT = with_args<false> >
-+struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT >
-+{
-+    typedef serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT > baseT;
-+    /** Default ctor.  Implementation class without args, expecting
-+        component context as single argument.
-+    */
-+    vba_service_class_() : baseT() {}
-+    template <typename PostProcessFuncT>
-+    /** Ctor to pass a post processing function/functor.
-+        
-+        @tpl PostProcessDefaultT let your compiler deduce this
-+        @param postProcessFunc function/functor that gets the yet unacquired
-+                               ImplT_ pointer returning a
-+                               uno::Reference<uno::XInterface>
-+    */
-+    explicit vba_service_class_( PostProcessFuncT const& postProcessFunc ) : baseT( postProcessFunc ) {}
-+};
-+
-+} // namespace service_decl
-+} // namespace comphelper
-+#endif
---- vbahelper/inc/vbahelper/vbaapplicationbase.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/inc/vbahelper/vbaapplicationbase.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,59 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbaapplicationbase.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef VBA_APPLICATION_BASE_HXX
-+#define VBA_APPLICATION_BASE_HXX
-+
-+#include <ooo/vba/XHelperInterface.hpp>
-+#include <ooo/vba/XApplicationBase.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ov::XApplicationBase > ApplicationBase_BASE;
-+
-+class VbaApplicationBase : public ApplicationBase_BASE
-+{
-+protected:
-+    VbaApplicationBase( const css::uno::Reference< css::uno::XComponentContext >& xContext );
-+    virtual ~VbaApplicationBase();
-+
-+public:
-+	// XHelperInterface ( parent is itself )
-+	virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return this; }
-+
-+	virtual sal_Bool SAL_CALL getScreenUpdating() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException);
-+	virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif
---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,257 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbacollectionimpl.hxx,v $
-+ * $Revision: 1.5 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef OOVBAAPI_VBA_COLLECTION_IMPL_HXX
-+#define OOVBAAPI_VBA_COLLECTION_IMPL_HXX
-+
-+#include <ooo/vba/XCollection.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+#include <com/sun/star/script/XDefaultMethod.hpp>
-+#include <com/sun/star/container/XIndexAccess.hpp>
-+#include <com/sun/star/container/XNameAccess.hpp>
-+#include <com/sun/star/container/XNamed.hpp>
-+
-+#include <cppuhelper/implbase3.hxx>
-+#include <cppuhelper/implbase2.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+
-+#include "vbahelper/vbahelper.hxx"
-+#include "vbahelper/vbahelperinterface.hxx"
-+
-+#include <vector>
-+
-+typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumerationHelper_BASE;
-+
-+class EnumerationHelperImpl : public EnumerationHelper_BASE
-+{
-+protected:
-+	css::uno::Reference< css::uno::XComponentContext > m_xContext;
-+	css::uno::Reference< css::container::XEnumeration > m_xEnumeration;
-+public:
-+
-+	EnumerationHelperImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XEnumeration >& xEnumeration ) throw ( css::uno::RuntimeException ) : m_xContext( xContext ),  m_xEnumeration( xEnumeration ) { }
-+	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException) { return m_xEnumeration->hasMoreElements(); }
-+};
-+
-+// a wrapper class for a providing a XIndexAccess, XNameAccess, XEnumerationAccess impl based on providing a vector of interfaces 
-+// only requirement is the object needs to implement XName
-+
-+
-+
-+typedef ::cppu::WeakImplHelper3< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE;
-+
-+template< typename Ifc1 >
-+class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
-+{
-+public:
-+typedef std::vector< css::uno::Reference< Ifc1 > >  XNamedVec;
-+private:
-+
-+	class XNamedEnumerationHelper : public EnumerationHelper_BASE
-+	{
-+		XNamedVec mXNamedVec;
-+		typename XNamedVec::iterator mIt;
-+	public:
-+	        XNamedEnumerationHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), mIt( mXNamedVec.begin() ) {}
-+	
-+	        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException)
-+	        {
-+			return ( mIt != mXNamedVec.end() );
-+	        }
-+	
-+	        virtual css::uno::Any SAL_CALL nextElement(  ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
-+	        {
-+	                if ( hasMoreElements() )
-+				return css::uno::makeAny( *mIt++ );
-+	                throw css::container::NoSuchElementException();
-+	        }
-+	};
-+
-+protected:
-+	XNamedVec mXNamedVec;
-+	typename XNamedVec::iterator cachePos;
-+public:
-+	XNamedObjectCollectionHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), cachePos(mXNamedVec.begin()) {}
-+	// XElementAccess
-+	virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException) { return  Ifc1::static_type(0); }
-+	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException) { return ( mXNamedVec.size() > 0 ); }
-+	// XNameAcess 
-+	virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
-+	{
-+		if ( !hasByName(aName) )
-+			throw css::container::NoSuchElementException();
-+		return css::uno::makeAny( *cachePos );
-+	}
-+	virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException)
-+	{
-+		css::uno::Sequence< rtl::OUString > sNames( mXNamedVec.size() );
-+		rtl::OUString* pString = sNames.getArray();
-+		typename XNamedVec::iterator it = mXNamedVec.begin();
-+		typename XNamedVec::iterator it_end = mXNamedVec.end();
-+
-+		for ( ; it != it_end; ++it, ++pString )
-+		{
-+			css::uno::Reference< css::container::XNamed > xName( *it, css::uno::UNO_QUERY_THROW );	
-+			*pString = xName->getName();
-+		}
-+		return sNames;
-+	}
-+	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
-+	{
-+		cachePos = mXNamedVec.begin();
-+		typename XNamedVec::iterator it_end = mXNamedVec.end();
-+		for ( ; cachePos != it_end; ++cachePos )
-+		{
-+			css::uno::Reference< css::container::XNamed > xName( *cachePos, css::uno::UNO_QUERY_THROW );	
-+			if ( aName.equals( xName->getName() ) )
-+				break;
-+		}
-+		return ( cachePos != it_end );
-+	}
-+
-+	// XElementAccess
-+	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException) { return mXNamedVec.size(); }	
-+	virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException )
-+	{
-+		if ( Index < 0 || Index >= getCount() )
-+			throw css::lang::IndexOutOfBoundsException();
-+	
-+		return css::uno::makeAny( mXNamedVec[ Index ] );
-+
-+	}
-+	// XEnumerationAccess
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw (css::uno::RuntimeException)
-+	{
-+		return new XNamedEnumerationHelper( mXNamedVec );
-+	}
-+};
-+
-+// including a HelperInterface implementation
-+template< typename Ifc1 >
-+class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
-+{
-+typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
-+protected:
-+	css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess;
-+	css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
-+
-+	virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException)
-+	{
-+		if ( !m_xNameAccess.is() )
-+			throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase string index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
-+	
-+		return createCollectionObject( m_xNameAccess->getByName( sIndex ) );	
-+	}		
-+
-+	virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException)
-+	{
-+		if ( !m_xIndexAccess.is() )
-+			throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase numeric index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
-+		if ( nIndex <= 0 )
-+		{
-+			throw  css::lang::IndexOutOfBoundsException( 
-+				::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-+				"index is 0 or negative" ) ), 
-+				css::uno::Reference< css::uno::XInterface >() );
-+		}
-+		// need to adjust for vba index ( for which first element is 1 )
-+		return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) );		
-+	}
-+public:
-+	ScVbaCollectionBase( const css::uno::Reference< ov::XHelperInterface >& xParent,   const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) : BaseColBase( xParent, xContext ), m_xIndexAccess( xIndexAccess ){ m_xNameAccess.set(m_xIndexAccess, css::uno::UNO_QUERY); }
-+	//XCollection
-+	virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException)
-+	{
-+		return m_xIndexAccess->getCount();
-+	}
-+
-+	virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::uno::RuntimeException)
-+	{
-+		if ( Index1.getValueTypeClass() != css::uno::TypeClass_STRING )
-+		{
-+			sal_Int32 nIndex = 0;
-+	
-+			if ( ( Index1 >>= nIndex ) != sal_True )
-+			{
-+				rtl::OUString message;
-+				message = rtl::OUString::createFromAscii(
-+					"Couldn't convert index to Int32");
-+				throw  css::lang::IndexOutOfBoundsException( message,
-+					css::uno::Reference< css::uno::XInterface >() );
-+			}
-+			return 	getItemByIntIndex( nIndex );
-+		}
-+		rtl::OUString aStringSheet;
-+
-+		Index1 >>= aStringSheet;
-+		return getItemByStringIndex( aStringSheet );	
-+	}
-+	// XDefaultMethod
-+	::rtl::OUString SAL_CALL getDefaultMethodName(  ) throw (css::uno::RuntimeException)
-+	{
-+		const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
-+		return sName;
-+	}
-+	// XEnumerationAccess
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0;	
-+
-+	// XElementAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) = 0;
-+	// XElementAccess
-+	virtual ::sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException)
-+	{
-+		return ( m_xIndexAccess->getCount() > 0 );
-+	}
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0;
-+	
-+};
-+
-+typedef ::cppu::WeakImplHelper1<ov::XCollection> XCollection_InterfacesBASE;
-+
-+typedef ScVbaCollectionBase< XCollection_InterfacesBASE > CollImplBase1;
-+// compatible with the old collections ( pre XHelperInterface base class ) ( some internal objects still use this )
-+class ScVbaCollectionBaseImpl : public CollImplBase1
-+{
-+public:
-+	ScVbaCollectionBaseImpl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : CollImplBase1( xParent, xContext, xIndexAccess){}
-+
-+};
-+
-+template <typename Ifc> // where Ifc must implement XCollectionTest
-+class CollTestImplHelper :  public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
-+{
-+typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc >  > ImplBase1;
-+
-+public:
-+	CollTestImplHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,  const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : ImplBase1( xParent, xContext, xIndexAccess ) {}
-+};
-+
-+
-+#endif //SC_VBA_COLLECTION_IMPL_HXX
---- vbahelper/inc/vbahelper/vbadllapi.h.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/inc/vbahelper/vbadllapi.h	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,44 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: svldllapi.h,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef INCLUDED_VBADLLAPI_H
-+#define INCLUDED_VBADLLAPI_H
-+
-+#include "sal/types.h"
-+
-+#if defined(VBAHELPER_DLLIMPLEMENTATION)
-+#define VBAHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
-+#else
-+#define VBAHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
-+#endif
-+#define VBAHELPER_DLLPRIVATE SAL_DLLPRIVATE
-+
-+#endif /* INCLUDED_SVLDLLAPI_H */
-+
---- vbahelper/inc/vbahelper/vbadocumentbase.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/inc/vbahelper/vbadocumentbase.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,73 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef VBA_DOCUMENTBASE_HXX
-+#define VBA_DOCUMENTBASE_HXX
-+
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <ooo/vba/XDocumentBase.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentBase > VbaDocumentBase_BASE;
-+
-+class VbaDocumentBase : public VbaDocumentBase_BASE
-+{
-+protected:
-+	css::uno::Reference< css::frame::XModel > mxModel;
-+protected:
-+	virtual css::uno::Reference< css::frame::XModel >  getModel() { return mxModel; }
-+	VbaDocumentBase( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
-+public:
-+	VbaDocumentBase( 	const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
-+			css::uno::Reference< css::frame::XModel > xModel );
-+	VbaDocumentBase( 	css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
-+	virtual ~VbaDocumentBase() {}
-+
-+    // Attributes
-+	virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-+	virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
-+	virtual ::rtl::OUString SAL_CALL getFullName() throw (css::uno::RuntimeException);
-+	virtual sal_Bool SAL_CALL getSaved() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException);
-+
-+	// Methods
-+	virtual void SAL_CALL Close( const css::uno::Any &bSaveChanges,
-+								 const css::uno::Any &aFileName,
-+								 const css::uno::Any &bRouteWorkbook ) throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL Save() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
-+    
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif /* VBA_DOCUMENTBASE_HXX */
---- vbahelper/inc/vbahelper/vbaglobalbase.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/inc/vbahelper/vbaglobalbase.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,53 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbaapplicationbase.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef VBA_GLOBAL_BASE_HXX
-+#define VBA_GLOBAL_BASE_HXX
-+
-+#include "vbahelperinterface.hxx"
-+#include <ooo/vba/XGlobalsBase.hpp>
-+
-+typedef InheritedHelperInterfaceImpl1< ov::XGlobalsBase > Globals_BASE;
-+class VbaGlobalsBase : public Globals_BASE
-+
-+{
-+protected:
-+
-+    bool hasServiceName( const rtl::OUString& serviceName );
-+    void init(  const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any& aApplication );
-+
-+public:
-+    VbaGlobalsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
-+    virtual ~VbaGlobalsBase(){};
-+    // XMultiServiceFactory
-+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException);
-+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException);
-+};
-+#endif
---- vbahelper/inc/vbahelper/vbahelper.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/inc/vbahelper/vbahelper.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,224 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbahelper.hxx,v $
-+ * $Revision: 1.5.32.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef OOVBAAPI_VBA_HELPER_HXX
-+#define OOVBAAPI_VBA_HELPER_HXX
-+
-+#include <com/sun/star/drawing/XShape.hpp>
-+#include <com/sun/star/beans/XIntrospectionAccess.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/script/BasicErrorException.hpp>
-+#include <com/sun/star/script/XTypeConverter.hpp>
-+#include <com/sun/star/lang/IllegalArgumentException.hpp>
-+#include <com/sun/star/awt/XControl.hpp>
-+#include <com/sun/star/awt/XDevice.hpp>
-+#include <basic/sberrors.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <sfx2/dispatch.hxx>
-+//#include <ooo/vba/msforms/XShape.hpp>
-+#include <vcl/pointr.hxx>
-+#define VBAHELPER_DLLIMPLEMENTATION
-+#include <vbahelper/vbadllapi.h>
-+namespace css = ::com::sun::star;
-+
-+namespace ooo 
-+{
-+	namespace vba 
-+	{
-+		template < class T > 
-+		css::uno::Reference< T > getXSomethingFromArgs( css::uno::Sequence< css::uno::Any > const & args, sal_Int32 nPos, bool bCanBeNull = true ) throw (css::lang::IllegalArgumentException)
-+		{
-+			if ( args.getLength() < ( nPos + 1) )
-+				throw css::lang::IllegalArgumentException();
-+			css::uno::Reference< T > aSomething( args[ nPos ], css::uno::UNO_QUERY );
-+			if ( !bCanBeNull && !aSomething.is() )
-+				throw css::lang::IllegalArgumentException();
-+			return aSomething;
-+		}
-+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell,  const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException);
-+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell,  const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
-+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
-+		VBAHELPER_DLLPUBLIC css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException);
-+		VBAHELPER_DLLPUBLIC css::uno::Reference< css::script::XTypeConverter > getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
-+
-+		VBAHELPER_DLLPUBLIC void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl) ;
-+		VBAHELPER_DLLPUBLIC void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl, css::uno::Sequence< css::beans::PropertyValue >& sProps ) ;
-+		VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, USHORT nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
-+		VBAHELPER_DLLPUBLIC sal_Int32 OORGBToXLRGB( sal_Int32 );
-+		VBAHELPER_DLLPUBLIC sal_Int32 XLRGBToOORGB( sal_Int32 );
-+		VBAHELPER_DLLPUBLIC css::uno::Any OORGBToXLRGB( const css::uno::Any& );
-+		VBAHELPER_DLLPUBLIC css::uno::Any XLRGBToOORGB( const css::uno::Any& );
-+		// provide a NULL object that can be passed as variant so that 
-+		// the object when passed to IsNull will return true. aNULL 
-+		// contains an empty object reference
-+		VBAHELPER_DLLPUBLIC const css::uno::Any& aNULL();
-+		VBAHELPER_DLLPUBLIC void PrintOutHelper( SfxViewShell* pViewShell, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, sal_Bool bSelection  );
-+		VBAHELPER_DLLPUBLIC void PrintPreviewHelper( const css::uno::Any& EnableChanges,  SfxViewShell* );
-+
-+		VBAHELPER_DLLPUBLIC rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException );
-+		VBAHELPER_DLLPUBLIC rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic )
-+	    VBAHELPER_DLLPUBLIC double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical);
-+    	VBAHELPER_DLLPUBLIC double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
-+	    VBAHELPER_DLLPUBLIC double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
-+        VBAHELPER_DLLPUBLIC sal_Int32 getPointerStyle();
-+        VBAHELPER_DLLPUBLIC void setCursorHelper( const Pointer& rPointer, sal_Bool bOverWrite );
-+        VBAHELPER_DLLPUBLIC String docMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
-+
-+class VBAHELPER_DLLPUBLIC Millimeter
-+{
-+//Factor to translate between points and hundredths of millimeters:
-+private:
-+	static const double factor;
-+    
-+	double m_nMillimeter;
-+
-+public:
-+	Millimeter();
-+    
-+	Millimeter(double mm);
-+    
-+	void set(double mm);
-+	void setInPoints(double points) ;
-+	void setInHundredthsOfOneMillimeter(double hmm);
-+	double get();
-+	double getInHundredthsOfOneMillimeter();
-+	double getInPoints();
-+	static sal_Int32 getInHundredthsOfOneMillimeter(double points);
-+	static double getInPoints(int _hmm);
-+};
-+
-+class VBAHELPER_DLLPUBLIC AbstractGeometryAttributes // probably should replace the ShapeHelper below
-+{
-+public:
-+    virtual ~AbstractGeometryAttributes() {}
-+    virtual double getLeft() = 0;
-+    virtual void setLeft( double ) = 0;
-+    virtual double getTop() = 0;
-+    virtual void setTop( double ) = 0;
-+    virtual double getHeight() = 0;
-+    virtual void setHeight( double ) = 0;
-+    virtual double getWidth() = 0;
-+    virtual void setWidth( double ) = 0;
-+};
-+
-+namespace msforms {
-+    class XShape;
-+}
-+
-+class VBAHELPER_DLLPUBLIC ConcreteXShapeGeometryAttributes : public AbstractGeometryAttributes
-+{
-+public:
-+    css::uno::Reference< ooo::vba::msforms::XShape > m_xShape; 
-+    ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape );
-+    virtual double getLeft();
-+    virtual void setLeft( double nLeft );
-+    virtual double getTop();
-+    virtual void setTop( double nTop );
-+    virtual double getHeight();
-+    virtual void setHeight( double nHeight );
-+    virtual double getWidth();
-+    virtual void setWidth( double nWidth);
-+};
-+#define VBA_LEFT "PositionX"
-+#define VBA_TOP "PositionY"
-+class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttributes
-+{
-+
-+    css::uno::Reference< css::beans::XPropertySet > mxModel;
-+public:
-+    UserFormGeometryHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xControl );
-+    virtual double getLeft();
-+    virtual void setLeft( double nLeft );
-+    virtual double getTop();
-+    virtual void setTop( double nTop );
-+    virtual double getHeight();
-+    virtual void setHeight( double nHeight );
-+    virtual double getWidth();
-+    virtual void setWidth( double nWidth);
-+};
-+
-+class VBAHELPER_DLLPUBLIC ShapeHelper
-+{
-+protected:
-+	css::uno::Reference< css::drawing::XShape > xShape;
-+public:
-+	ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException );
-+    
-+	double getHeight();
-+
-+    	void setHeight(double _fheight) throw ( css::script::BasicErrorException );
-+    
-+	double getWidth();
-+
-+	void setWidth(double _fWidth) throw ( css::script::BasicErrorException );
-+    
-+	double getLeft();
-+    
-+	void setLeft(double _fLeft);
-+
-+	double getTop();
-+    
-+	void setTop(double _fTop);
-+};
-+
-+class VBAHELPER_DLLPUBLIC ContainerUtilities
-+{
-+
-+public: 
-+	static rtl::OUString getUniqueName( const css::uno::Sequence< ::rtl::OUString >&  _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator);
-+	static rtl::OUString getUniqueName( const css::uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix );
-+
-+	static sal_Int32 FieldInList( const css::uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString );
-+};
-+
-+// really just a a place holder to ease the porting pain
-+class VBAHELPER_DLLPUBLIC DebugHelper
-+{
-+public:
-+	static void exception( const rtl::OUString&  DetailedMessage, const css::uno::Exception& ex,  int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException );
-+
-+	static void exception( int err,  const rtl::OUString& additionalArgument ) throw( css::script::BasicErrorException );
-+
-+	static void exception( css::uno::Exception& ex ) throw( css::script::BasicErrorException );
-+};
-+	} // openoffice
-+} // org
-+
-+namespace ov = ooo::vba;
-+
-+#ifdef DEBUG
-+#  define SC_VBA_FIXME(a) OSL_TRACE( a )
-+#  define SC_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
-+#else
-+#  define SC_VBA_FIXME(a)
-+#  define SC_VBA_STUB()
-+#endif
-+
-+#endif
---- vbahelper/inc/vbahelper/vbahelperinterface.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/inc/vbahelper/vbahelperinterface.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,121 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbahelperinterface.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef OOVBAAPI_VBA_HELPERINTERFACE_HXX
-+#define OOVBAAPI_VBA_HELPERINTERFACE_HXX
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/XHelperInterface.hpp>
-+#include <vbahelper/vbahelper.hxx>
-+#include <com/sun/star/container/XNameAccess.hpp>
-+
-+// use this class when you have an a object like
-+// interface  XAnInterface which contains XHelperInterface in its inheritance hierarchy
-+// interface XAnInterface
-+// { 
-+//     interface XHelperInterface;
-+//     [attribute, string] name;
-+// }
-+// or
-+// interface XAnInterface : XHelperInterface;
-+// { 
-+//     [attribute, string] name;
-+// }
-+//
-+// then this class can provide a default implementation of XHelperInterface,
-+// you can use it like this
-+// typedef InheritedHelperInterfaceImpl< XAnInterface > > AnInterfaceImpl_BASE;
-+// class AnInterfaceImpl : public AnInterfaceImpl_BASE
-+// {
-+// public:
-+//     AnInterface( const Reference< HelperInterface >& xParent ) : AnInterfaceImpl_BASE( xParent ) {}
-+//     // implement XAnInterface methods only, no need to implement the XHelperInterface 
-+//     // methods
-+//     virtual void setName( const OUString& );  
-+//     virtual OUString getName();  
-+// }
-+//
-+const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) );
-+
-+template< typename Ifc1 >
-+class InheritedHelperInterfaceImpl : public Ifc1
-+{
-+protected: 
-+	css::uno::WeakReference< ov::XHelperInterface > mxParent;
-+	css::uno::Reference< css::uno::XComponentContext > mxContext;
-+public:
-+	InheritedHelperInterfaceImpl() {}
-+	InheritedHelperInterfaceImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxParent( xParent ), mxContext( xContext ) {}
-+	virtual rtl::OUString& getServiceImplName() = 0;
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames() = 0;
-+
-+	// XHelperInterface Methods
-+	virtual ::sal_Int32 SAL_CALL getCreator() throw (css::script::BasicErrorException, css::uno::RuntimeException)
-+	{
-+		return 0x53756E4F;
-+	}
-+	virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return mxParent; }
-+	
-+	virtual css::uno::Any SAL_CALL Application(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { 
-+            // The application could certainly be passed around in the context - seems
-+            // to make sense
-+            css::uno::Reference< css::container::XNameAccess > xNameAccess( mxContext, css::uno::UNO_QUERY_THROW );
-+            return xNameAccess->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Application" ) ) );
-+	}
-+
-+
-+	// XServiceInfo Methods
-+	virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) { return getServiceImplName(); }
-+	virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) 
-+	{ 
-+		css::uno::Sequence< rtl::OUString > sServices = getSupportedServiceNames();
-+		const rtl::OUString* pStart = sServices.getConstArray();
-+		const rtl::OUString* pEnd = pStart + sServices.getLength();
-+		for ( ; pStart != pEnd ; ++pStart )
-+			if ( (*pStart).equals( ServiceName ) )
-+				return sal_True;
-+		return sal_False;	
-+	}
-+	virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) 
-+	{ 
-+		css::uno::Sequence< rtl::OUString > aNames = getServiceNames();;
-+		return aNames;
-+	}
-+ };
-+
-+template< typename Ifc1 >
-+class InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
-+
-+{
-+typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base;
-+public:
-+	InheritedHelperInterfaceImpl1< Ifc1 > ( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}	
-+
-+};
-+#endif
---- vbahelper/inc/vbahelper/vbapropvalue.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/inc/vbahelper/vbapropvalue.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,60 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbapropvalue.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_PROPVALULE_HXX
-+#define SC_VBA_PROPVALULE_HXX
-+#include <ooo/vba/XPropValue.hpp>
-+#include <cppuhelper/implbase1.hxx>
-+
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE;
-+
-+class PropListener 
-+{
-+public:
-+    virtual void setValueEvent( const css::uno::Any& value ) = 0;
-+    virtual css::uno::Any getValueEvent() = 0; 
-+};
-+
-+
-+class ScVbaPropValue : public PropValueImpl_BASE 
-+{
-+    PropListener* m_pListener;
-+public:
-+    ScVbaPropValue( PropListener* pListener );
-+
-+    // Attributes
-+    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+
-+    rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
-+
-+};
-+#endif //SC_VBA_PROPVALULE_HXX
---- vbahelper/inc/vbahelper/vbawindowbase.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/inc/vbahelper/vbawindowbase.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,66 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef VBA_WINDOWBASE_HXX
-+#define VBA_WINDOWBASE_HXX
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/XWindowBase.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <com/sun/star/awt/XDevice.hpp>
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1<ov::XWindowBase > WindowBaseImpl_BASE;
-+
-+class VbaWindowBase : public WindowBaseImpl_BASE
-+{		
-+protected:		
-+	css::uno::Reference< css::frame::XModel > m_xModel;
-+public:
-+	VbaWindowBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel );
-+    VbaWindowBase( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
-+
-+	// XWindowBase
-+    virtual sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException) ;
-+    virtual void SAL_CALL setHeight( sal_Int32 _height ) throw (css::uno::RuntimeException) ;
-+    virtual sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException) ;
-+    virtual void SAL_CALL setLeft( sal_Int32 _left ) throw (css::uno::RuntimeException) ;
-+    virtual sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException) ;
-+    virtual void SAL_CALL setTop( sal_Int32 _top ) throw (css::uno::RuntimeException) ;
-+    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException) ;
-+    virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException) ;
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif //VBA_WINDOWBASE_HXX
---- vbahelper/prj/build.lst.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/prj/build.lst	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,6 @@
-+vba	vbahelper	:	oovbaapi basic sfx2 svx cppuhelper vcl comphelper svtools tools sal NULL
-+vba	vbahelper									usr1	-	all	  vba_mkout NULL
-+#vba	vbahelper\inc								nmake	-	all	vba_inc NULL
-+vba	vbahelper\source\vbahelper                        nmake	-	all	vba_vbahelper NULL
-+vba	vbahelper\source\msforms                        nmake	-	all	vba_msforms NULL
-+vba	vbahelper\util								nmake	-	all	vba_util vba_vbahelper vba_msforms NULL
---- vbahelper/prj/d.lst.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/prj/d.lst	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,18 @@
-+..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-+..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
-+..\%__SRC%\slb\vbahelper.lib %_DEST%\lib%_EXT%\vbahelper.lib
-+..\%__SRC%\lib\vbahelp*.* %_DEST%\lib%_EXT%\vba*.*
-+..\%__SRC%\bin\vbahelper*.* %_DEST%\bin%_EXT%\vbahelper*.*
-+..\%__SRC%\bin\msforms*.* %_DEST%\bin%_EXT%\msforms*.*
-+
-+mkdir: %_DEST%\inc%_EXT%\basic
-+..\inc\vbahelper\vbacollectionimpl.hxx %_DEST%\inc%_EXT%\vbahelper\vbacollectionimpl.hxx
-+..\inc\vbahelper\vbahelper.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelper.hxx
-+..\inc\vbahelper\helperdecl.hxx %_DEST%\inc%_EXT%\vbahelper\helperdecl.hxx
-+..\inc\vbahelper\vbahelperinterface.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelperinterface.hxx
-+..\inc\vbahelper\vbaapplicationbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaapplicationbase.hxx
-+..\inc\vbahelper\vbadllapi.h %_DEST%\inc%_EXT%\vbahelper\vbadllapi.h
-+..\inc\vbahelper\vbawindowbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbawindowbase.hxx
-+..\inc\vbahelper\vbadocumentbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentbase.hxx
-+..\inc\vbahelper\vbapropvalue.hxx %_DEST%\inc%_EXT%\vbahelper\vbapropvalue.hxx
-+..\inc\vbahelper\vbaglobalbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaglobalbase.hxx
---- vbahelper/source/msforms/makefile.mk.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,78 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.45 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..
-+PRJNAME=vbahelper
-+TARGET=msforms
-+
-+ENABLE_EXCEPTIONS := TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+SLOFILES=\
-+    $(SLO)$/vbacontrol.obj \
-+    $(SLO)$/vbacontrols.obj \
-+    $(SLO)$/vbabutton.obj \
-+    $(SLO)$/vbacombobox.obj \
-+    $(SLO)$/vbalabel.obj \
-+    $(SLO)$/vbatextbox.obj \
-+    $(SLO)$/vbaradiobutton.obj \
-+    $(SLO)$/vbalistbox.obj \
-+    $(SLO)$/vbatogglebutton.obj \
-+    $(SLO)$/vbacheckbox.obj \
-+    $(SLO)$/vbaframe.obj \
-+    $(SLO)$/vbascrollbar.obj \
-+    $(SLO)$/vbaprogressbar.obj \
-+    $(SLO)$/vbamultipage.obj \
-+    $(SLO)$/vbalistcontrolhelper.obj \
-+    $(SLO)$/vbaspinbutton.obj \
-+    $(SLO)$/vbaimage.obj \
-+    $(SLO)$/vbapages.obj \
-+    $(SLO)$/vbauserform.obj \
-+    $(SLO)$/service.obj \
-+
-+# #FIXME vbapropvalue needs to move to vbahelper
-+
-+# --- Targets -------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-+ALLTAR : \
-+        $(MISC)$/$(TARGET).don \
-+
-+$(SLOFILES) : $(MISC)$/$(TARGET).don
-+
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+        echo $@
-+
---- vbahelper/source/msforms/service.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/service.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,83 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: service.cxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "cppuhelper/implementationentry.hxx"
-+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-+#include "com/sun/star/registry/XRegistryKey.hpp"
-+#include "comphelper/servicedecl.hxx"
-+
-+// =============================================================================
-+// component exports
-+// =============================================================================
-+using namespace ::com::sun::star;
-+using namespace ::com::sun::star::uno;
-+
-+namespace sdecl = comphelper::service_decl;
-+
-+// reference service helper(s)
-+namespace  controlprovider
-+{
-+extern sdecl::ServiceDecl const serviceDecl;
-+}
-+
-+namespace  userform
-+{
-+extern sdecl::ServiceDecl const serviceDecl;
-+}
-+
-+extern "C"
-+{
-+    void SAL_CALL component_getImplementationEnvironment( 
-+        const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-+    {
-+		OSL_TRACE("In component_getImplementationEnv");
-+        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-+    }
-+
-+    sal_Bool SAL_CALL component_writeInfo( 
-+        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
-+    {
-+		OSL_TRACE("In component_writeInfo");
-+
-+	// Component registration
-+         return component_writeInfoHelper( pServiceManager, pRegistryKey, 
-+		controlprovider::serviceDecl, userform::serviceDecl );
-+    }
-+
-+    void * SAL_CALL component_getFactory( 
-+        const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
-+        registry::XRegistryKey * pRegistryKey )
-+    {
-+		OSL_TRACE("In component_getFactory for %s", pImplName );
-+	void* pRet =  component_getFactoryHelper(
-+        	pImplName, pServiceManager, pRegistryKey, controlprovider::serviceDecl, userform::serviceDecl );
-+	OSL_TRACE("Ret is 0x%x", pRet);
-+	return pRet;
-+    }
-+}
---- vbahelper/source/msforms/vbabutton.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbabutton.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,74 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbabutton.cxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbabutton.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
-+ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+}
-+
-+// Attributes
-+rtl::OUString SAL_CALL 
-+ScVbaButton::getCaption() throw (css::uno::RuntimeException)
-+{
-+    rtl::OUString Label;
-+    m_xProps->getPropertyValue( LABEL ) >>= Label;
-+    return Label;
-+}
-+
-+void SAL_CALL 
-+ScVbaButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
-+}
-+
-+rtl::OUString& 
-+ScVbaButton::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaButton") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaButton::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Button" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbabutton.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbabutton.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,51 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbabutton.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_BUTTON_HXX
-+#define SC_VBA_BUTTON_HXX
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/msforms/XButton.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XButton > ButtonImpl_BASE;
-+
-+class ScVbaButton : public ButtonImpl_BASE
-+{
-+public:
-+    ScVbaButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
-+   // Attributes
-+    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif //SC_VBA_BUTTON_HXX
---- vbahelper/source/msforms/vbacheckbox.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbacheckbox.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,112 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbacheckbox.hxx"
-+#include <vbahelper/helperdecl.hxx>
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
-+const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
-+ScVbaCheckbox::ScVbaCheckbox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : CheckBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+}
-+
-+// Attributes
-+rtl::OUString SAL_CALL 
-+ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException)
-+{
-+    rtl::OUString Label;
-+    m_xProps->getPropertyValue( LABEL ) >>= Label;
-+    return Label;
-+}
-+
-+void SAL_CALL 
-+ScVbaCheckbox::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaCheckbox::getValue() throw (css::uno::RuntimeException)
-+{
-+    sal_Int16 nValue = -1;
-+    m_xProps->getPropertyValue( STATE ) >>= nValue;
-+    if( nValue != 0 )
-+        nValue = -1;
-+//    return uno::makeAny( nValue ); 
-+// I must be missing something MSO says value should be -1 if selected, 0 if not
-+// selected
-+    return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); 
-+}
-+
-+void SAL_CALL 
-+ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
-+{
-+    sal_Int16 nValue = 0;
-+    sal_Bool bValue = false;
-+    if( _value >>= nValue )
-+    {
-+        if( nValue == -1)
-+            nValue = 1;
-+    }
-+    else if ( _value >>= bValue )
-+    {
-+        if ( bValue )
-+            nValue = 1;
-+    }
-+    m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
-+}
-+rtl::OUString& 
-+ScVbaCheckbox::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCheckbox") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaCheckbox::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.CheckBox" ) );
-+	}
-+	return aServiceNames;
-+}
-+
---- vbahelper/source/msforms/vbacheckbox.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbacheckbox.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,61 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_CHECKBOX_HXX
-+#define SC_VBA_CHECKBOX_HXX
-+#include <cppuhelper/implbase2.hxx>
-+#include <ooo/vba/msforms/XRadioButton.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > CheckBoxImpl_BASE;
-+
-+class ScVbaCheckbox : public CheckBoxImpl_BASE
-+{
-+public:
-+    ScVbaCheckbox(  const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
-+   // Attributes
-+    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+    // XDefaultProperty
-+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif //SC_VBA_CHECKBOX_HXX
---- vbahelper/source/msforms/vbacombobox.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbacombobox.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,175 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbacombobox.cxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbacombobox.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+//SelectedItems list of integer indexes
-+//StringItemList list of items
-+
-+const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
-+const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
-+const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
-+const static rtl::OUString CONTROLSOURCEPROP( RTL_CONSTASCII_USTRINGPARAM("DataFieldProperty") );
-+
-+ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialogType ) : ComboBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialogType( bDialogType )
-+{
-+    	mpListHelper.reset( new ListControlHelper( m_xProps ) );
-+	// grab the default value property name
-+	m_xProps->getPropertyValue( CONTROLSOURCEPROP ) >>= sSourceName;
-+}
-+
-+// Attributes
-+
-+
-+// Value, [read] e.g. getValue returns the value of ooo Text propery e.g. the value in
-+// the drop down
-+uno::Any SAL_CALL 
-+ScVbaComboBox::getValue() throw (uno::RuntimeException)
-+{
-+	return m_xProps->getPropertyValue( sSourceName );
-+}
-+
-+void SAL_CALL 
-+ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
-+{
-+    uno::Sequence< sal_Int16 > sSelection(1);
-+    _value >>= sSelection[ 0 ];
-+    m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( sSelection ) );
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaComboBox::getListIndex() throw (uno::RuntimeException)
-+{
-+	uno::Sequence< rtl::OUString > sItems;
-+	m_xProps->getPropertyValue( ITEMS ) >>= sItems;
-+	// should really return the item that has focus regardless of
-+	// it been selected
-+	if ( sItems.getLength() > 0 )
-+	{
-+		rtl::OUString sText = getText();
-+		sal_Int32 nLen = sItems.getLength();
-+		for ( sal_Int32 index = 0; sText.getLength() && index < nLen; ++index )
-+		{
-+			if ( sItems[ index ].equals( sText ) )
-+			{
-+				OSL_TRACE("getListIndex returning %d", index );
-+				return uno::makeAny( index );
-+			}
-+				
-+		} 
-+ 	} 
-+	OSL_TRACE("getListIndex returning %d", -1 );
-+	return uno::makeAny( sal_Int32( -1 ) );
-+}
-+
-+// Value, [write]e.g. setValue sets the value in the drop down, and if the value is one
-+// of the values in the list then the selection is also set
-+void SAL_CALL 
-+ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
-+{
-+	m_xProps->setPropertyValue( sSourceName, _value );
-+}
-+
-+// see Value
-+
-+::rtl::OUString SAL_CALL 
-+ScVbaComboBox::getText() throw (uno::RuntimeException)
-+{
-+	rtl::OUString result;
-+	getValue() >>= result;
-+	return result;
-+}
-+
-+void SAL_CALL 
-+ScVbaComboBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
-+{
-+	setValue( uno::makeAny( _text ) ); // seems the same
-+}
-+
-+// Methods
-+void SAL_CALL 
-+ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
-+{
-+	mpListHelper->AddItem( pvargItem, pvargIndex );
-+}
-+
-+void SAL_CALL 
-+ScVbaComboBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
-+	{
-+	mpListHelper->removeItem( index );
-+}
-+
-+void SAL_CALL 
-+ScVbaComboBox::Clear(  ) throw (uno::RuntimeException)
-+		{
-+	mpListHelper->Clear();
-+		}
-+
-+void SAL_CALL
-+ScVbaComboBox::setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException)
-+{
-+	ScVbaControl::setRowSource( _rowsource );
-+	mpListHelper->setRowSource( _rowsource );
-+		}
-+
-+sal_Int32 SAL_CALL
-+ScVbaComboBox::getListCount() throw (uno::RuntimeException)
-+{
-+	return mpListHelper->getListCount();
-+}
-+		
-+uno::Any SAL_CALL 
-+ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
-+{
-+	return mpListHelper->List( pvargIndex, pvarColumn );
-+	}
-+
-+rtl::OUString& 
-+ScVbaComboBox::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComboBox") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaComboBox::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ComboBox" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbacombobox.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbacombobox.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,80 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbacombobox.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_COMBOBOX_HXX
-+#define SC_VBA_COMBOBOX_HXX
-+#include <cppuhelper/implbase2.hxx>
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/script/XDefaultProperty.hpp>
-+#include <ooo/vba/msforms/XComboBox.hpp>
-+#include <comphelper/proparrhlp.hxx>
-+#include <comphelper/propertycontainer.hxx>
-+#include <com/sun/star/beans/PropertyAttribute.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include "vbalistcontrolhelper.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE;
-+class ScVbaComboBox : public ComboBoxImpl_BASE
-+{		
-+	std::auto_ptr< ListControlHelper > mpListHelper;
-+	rtl::OUString sSourceName; 
-+	rtl::OUString msDftPropName;
-+	bool mbDialogType;
-+	
-+public:
-+	ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialogType = false );
-+
-+	// Attributes
-+	virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
-+	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+	virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
-+
-+	// Methods
-+	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
-+	// XControl
-+    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
-+
-+	// XDefaultProperty
-+        ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
-+	//XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif //
---- vbahelper/source/msforms/vbacontrol.cxx
-+++ vbahelper/source/msforms/vbacontrol.cxx
-@@ -0,0 +1,520 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbacontrol.cxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <com/sun/star/form/FormComponentType.hpp>
-+#include <com/sun/star/awt/XControlModel.hpp>
-+#include <com/sun/star/awt/XControl.hpp>
-+#include <com/sun/star/awt/XWindow2.hpp>
-+#include <com/sun/star/lang/XEventListener.hpp>
-+#include <com/sun/star/drawing/XShape.hpp>
-+#include <com/sun/star/drawing/XControlShape.hpp>
-+#include <com/sun/star/awt/XControl.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <com/sun/star/view/XControlAccess.hpp>
-+#include <com/sun/star/container/XChild.hpp>
-+#include <com/sun/star/form/binding/XBindableValue.hpp>
-+#include <com/sun/star/form/binding/XListEntrySink.hpp>
-+#include <com/sun/star/table/CellAddress.hpp>
-+#include <com/sun/star/table/CellRangeAddress.hpp>
-+#include <ooo/vba/XControlProvider.hpp>
-+#ifdef VBA_OOBUILD_HACK
-+#include <svtools/bindablecontrolhelper.hxx>
-+#endif
-+#include"vbacontrol.hxx"
-+#include"vbacombobox.hxx"
-+#include "vbabutton.hxx"
-+#include "vbalabel.hxx"
-+#include "vbatextbox.hxx"
-+#include "vbaradiobutton.hxx"
-+#include "vbalistbox.hxx"
-+#include "vbatogglebutton.hxx"
-+#include "vbacheckbox.hxx"
-+#include "vbaframe.hxx"
-+#include "vbascrollbar.hxx"
-+#include "vbaprogressbar.hxx"
-+#include "vbamultipage.hxx"
-+#include "vbaspinbutton.hxx"
-+#include "vbaimage.hxx"
-+#include <vbahelper/helperdecl.hxx>
-+
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+uno::Reference< css::awt::XWindowPeer > 
-+ScVbaControl::getWindowPeer() throw (uno::RuntimeException)
-+{
-+    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
-+
-+    uno::Reference< awt::XControlModel > xControlModel;
-+    uno::Reference< css::awt::XWindowPeer >  xWinPeer;
-+    if ( !xControlShape.is() ) 
-+    { 
-+        // would seem to be a Userform control
-+        uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY_THROW );
-+        xWinPeer =  xControl->getPeer();
-+	return xWinPeer;
-+    }
-+    // form control
-+    xControlModel.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
-+
-+    uno::Reference< view::XControlAccess > xControlAccess( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+    try
-+    {
-+        uno::Reference< awt::XControl > xControl( xControlAccess->getControl( xControlModel ), uno::UNO_QUERY );
-+        xWinPeer =  xControl->getPeer();
-+    }
-+    catch( uno::Exception )
-+    {
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii( "The Control does not exsit" ),
-+                uno::Reference< uno::XInterface >() );
-+    }
-+    return xWinPeer;
-+}
-+
-+//ScVbaControlListener
-+class ScVbaControlListener: public cppu::WeakImplHelper1< lang::XEventListener >
-+{
-+private:
-+    ScVbaControl *pControl;
-+public:
-+    ScVbaControlListener( ScVbaControl *pTmpControl );
-+    virtual ~ScVbaControlListener();
-+    virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException );
-+};
-+
-+ScVbaControlListener::ScVbaControlListener( ScVbaControl *pTmpControl ): pControl( pTmpControl )
-+{
-+}
-+
-+ScVbaControlListener::~ScVbaControlListener()
-+{
-+}
-+
-+void SAL_CALL
-+ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeException )
-+{
-+    if( pControl )
-+    {
-+        pControl->removeResouce();
-+        pControl = NULL;
-+    }
-+}
-+
-+//ScVbaControl
-+
-+ScVbaControl::ScVbaControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< ::uno::XInterface >& xControl,  const css::uno::Reference< css::frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ControlImpl_BASE( xParent, xContext ),  m_xControl( xControl ), m_xModel( xModel )
-+{
-+    //add listener
-+    m_xEventListener.set( new ScVbaControlListener( this ) );
-+    setGeometryHelper( pGeomHelper );
-+    uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
-+    xComponent->addEventListener( m_xEventListener );
-+   
-+    //init m_xProps
-+    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ) ;
-+    uno::Reference< awt::XControl> xUserFormControl( m_xControl, uno::UNO_QUERY ) ;
-+    if ( xControlShape.is() ) // form control
-+        m_xProps.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
-+    else if ( xUserFormControl.is() ) // userform control
-+        m_xProps.set( xUserFormControl->getModel(), uno::UNO_QUERY_THROW );
-+}
-+
-+ScVbaControl::~ScVbaControl()
-+{
-+    if( m_xControl.is() )
-+{
-+        uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
-+    xComponent->removeEventListener( m_xEventListener );
-+}
-+}
-+
-+void 
-+ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
-+{
-+    mpGeometryHelper.reset( pHelper );
-+}
-+
-+void ScVbaControl::removeResouce() throw( uno::RuntimeException )
-+{
-+    uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
-+    xComponent->removeEventListener( m_xEventListener );
-+    m_xControl= NULL;
-+    m_xProps = NULL;
-+}
-+
-+//In design model has different behavior
-+sal_Bool SAL_CALL ScVbaControl::getEnabled() throw (uno::RuntimeException)
-+{
-+    uno::Any aValue = m_xProps->getPropertyValue
-+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ) );
-+    sal_Bool bRet = false;
-+    aValue >>= bRet;
-+    return bRet;
-+}
-+
-+void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeException)
-+{
-+    uno::Any aValue( bVisible );
-+    m_xProps->setPropertyValue
-+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ), aValue);
-+
-+}
-+
-+sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
-+{
-+    uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
-+    return xWindow2->isVisible();
-+}
-+
-+void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
-+    xWindow2->setVisible( bVisible );
-+}
-+double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException)
-+{
-+    return mpGeometryHelper->getHeight();
-+}
-+void SAL_CALL ScVbaControl::setHeight( double _height ) throw (uno::RuntimeException)
-+{
-+    mpGeometryHelper->setHeight( _height );
-+}
-+
-+double SAL_CALL ScVbaControl::getWidth() throw (uno::RuntimeException)
-+{
-+    return mpGeometryHelper->getWidth();
-+}
-+void SAL_CALL ScVbaControl::setWidth( double _width ) throw (uno::RuntimeException)
-+{
-+    mpGeometryHelper->setWidth( _width );
-+}
-+
-+double SAL_CALL
-+ScVbaControl::getLeft() throw (uno::RuntimeException)
-+{
-+    return mpGeometryHelper->getLeft();
-+}
-+
-+void SAL_CALL
-+ScVbaControl::setLeft( double _left ) throw (uno::RuntimeException)
-+{
-+    mpGeometryHelper->setLeft( _left );
-+
-+}
-+
-+double SAL_CALL
-+ScVbaControl::getTop() throw (uno::RuntimeException)
-+{
-+    return mpGeometryHelper->getTop();
-+}
-+
-+void SAL_CALL
-+ScVbaControl::setTop( double _top ) throw (uno::RuntimeException)
-+{
-+    mpGeometryHelper->setTop( _top );
-+}
-+
-+uno::Reference< uno::XInterface > SAL_CALL
-+ScVbaControl::getObject() throw (uno::RuntimeException)
-+{
-+	uno::Reference< msforms::XControl > xRet( this );
-+	return xRet;
-+}
-+
-+void SAL_CALL ScVbaControl::SetFocus() throw (uno::RuntimeException) 
-+{
-+    uno::Reference< awt::XWindow > xWin( m_xControl, uno::UNO_QUERY_THROW );
-+    xWin->setFocus();
-+}
-+
-+rtl::OUString SAL_CALL 
-+ScVbaControl::getControlSource() throw (uno::RuntimeException)
-+{
-+// #FIXME I *hate* having these upstream differences
-+// but this is necessary until I manage to upstream other
-+// dependant parts
-+#ifdef VBA_OOBUILD_HACK
-+	rtl::OUString sControlSource;
-+	uno::Reference< form::binding::XBindableValue > xBindable( m_xProps, uno::UNO_QUERY );
-+	if ( xBindable.is() )
-+	{
-+		try
-+		{
-+			uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
-+			uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellAddressConversion" ))), uno::UNO_QUERY );
-+			uno::Reference< beans::XPropertySet > xProps( xBindable->getValueBinding(), uno::UNO_QUERY_THROW );
-+			table::CellAddress aAddress;
-+			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BoundCell") ) ) >>= aAddress;
-+			xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address") ), uno::makeAny( aAddress ) );
-+                	xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sControlSource;
-+		}
-+		catch( uno::Exception& )
-+		{
-+		}	
-+	}
-+	return sControlSource;
-+#else
-+	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getControlSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
-+#endif
-+}
-+
-+void SAL_CALL 
-+ScVbaControl::setControlSource( const rtl::OUString& _controlsource ) throw (uno::RuntimeException)
-+{
-+#ifdef VBA_OOBUILD_HACK
-+    rtl::OUString sEmpty;
-+    svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, _controlsource, sEmpty );
-+#else
-+	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setControlSource not supported ") ).concat( _controlsource ), uno::Reference< uno::XInterface >()); // not supported
-+#endif
-+}
-+
-+rtl::OUString SAL_CALL 
-+ScVbaControl::getRowSource() throw (uno::RuntimeException)
-+{
-+#ifdef VBA_OOBUILD_HACK
-+	rtl::OUString sRowSource;
-+	uno::Reference< form::binding::XListEntrySink > xListSink( m_xProps, uno::UNO_QUERY );
-+	if ( xListSink.is() )
-+    {
-+		try
-+		{
-+			uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
-+			uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellRangeAddressConversion" ))), uno::UNO_QUERY );
-+
-+			uno::Reference< beans::XPropertySet > xProps( xListSink->getListEntrySource(), uno::UNO_QUERY_THROW );
-+			table::CellRangeAddress aAddress;
-+			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellRange") ) ) >>= aAddress;
-+			xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address")), uno::makeAny( aAddress ) );
-+			xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sRowSource;
-+		}
-+		catch( uno::Exception& )
-+		{
-+		}	
-+	}
-+	return sRowSource;
-+#else
-+	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getRowSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
-+#endif
-+}
-+
-+void SAL_CALL 
-+ScVbaControl::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
-+{
-+#ifdef VBA_OOBUILD_HACK
-+    rtl::OUString sEmpty;
-+    svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, sEmpty, _rowsource );
-+#else
-+	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setRowSource not supported ") ).concat( _rowsource ), uno::Reference< uno::XInterface >()); // not supported
-+#endif
-+}
-+
-+rtl::OUString SAL_CALL 
-+ScVbaControl::getName() throw (uno::RuntimeException)
-+{
-+	rtl::OUString sName;
-+	m_xProps->getPropertyValue
-+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
-+	return sName;
-+
-+}
-+
-+void SAL_CALL
-+ScVbaControl::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
-+{
-+	m_xProps->setPropertyValue
-+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), uno::makeAny( _name ) );
-+    }
-+//ScVbaControlFactory
-+
-+ScVbaControlFactory::ScVbaControlFactory( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel ): m_xContext( xContext ), m_xControl( xControl ), m_xModel( xModel )
-+{
-+}
-+
-+ScVbaControl* ScVbaControlFactory::createControl()  throw (uno::RuntimeException)
-+{
-+    return createControl( m_xModel );
-+}
-+ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< uno::XInterface >& xParent )  throw (uno::RuntimeException)
-+{
-+    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
-+    if ( xControlShape.is() ) // form controls
-+        return createControl( xControlShape, xParent );
-+    uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY );
-+    if ( !xControl.is() )
-+        throw uno::RuntimeException(); // really we should be more informative
-+    return createControl( xControl, xParent );
-+    
-+}
-+
-+ScVbaControl* ScVbaControlFactory::createControl(const uno::Reference< drawing::XControlShape >& xControlShape,  const uno::Reference< uno::XInterface >& /*xParent*/ )  throw (uno::RuntimeException)
-+{
-+    uno::Reference< beans::XPropertySet > xProps( xControlShape->getControl(), uno::UNO_QUERY_THROW );
-+    sal_Int32 nClassId = -1;
-+    const static rtl::OUString sClassId( RTL_CONSTASCII_USTRINGPARAM("ClassId") );
-+    xProps->getPropertyValue( sClassId ) >>= nClassId;
-+    uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
-+    switch( nClassId )
-+    {
-+        case form::FormComponentType::COMBOBOX:
-+            return new ScVbaComboBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-+        case form::FormComponentType::COMMANDBUTTON:
-+            return new ScVbaButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-+        case form::FormComponentType::FIXEDTEXT:
-+            return new ScVbaLabel( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-+        case form::FormComponentType::TEXTFIELD:
-+            return new ScVbaTextBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-+        case form::FormComponentType::RADIOBUTTON:
-+            return new ScVbaRadioButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-+        case form::FormComponentType::LISTBOX:
-+            return new ScVbaListBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-+        case form::FormComponentType::SPINBUTTON:
-+            return new ScVbaSpinButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-+        case form::FormComponentType::IMAGECONTROL:
-+            return new ScVbaImage( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-+        default:
-+            throw uno::RuntimeException( rtl::OUString::createFromAscii(
-+                    "Donot support this Control Type." ), uno::Reference< uno::XInterface >() );
-+    }
-+}
-+
-+ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XControl >& xControl,  const uno::Reference< uno::XInterface >& xParent  )  throw (uno::RuntimeException)
-+{
-+    uno::Reference< beans::XPropertySet > xProps( xControl->getModel(), uno::UNO_QUERY_THROW );
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( xProps, uno::UNO_QUERY_THROW );
-+    ScVbaControl* pControl = NULL;
-+    uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
-+    if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ) ) )
-+	pControl = new ScVbaCheckbox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );	
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) ) )
-+	pControl = new ScVbaRadioButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );	
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlEditModel") ) ) )
-+        pControl = new ScVbaTextBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ) ) )
-+    {
-+        sal_Bool bToggle = sal_False;
-+        xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toggle") ) ) >>= bToggle;
-+        if ( bToggle )
-+            pControl = new ScVbaToggleButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
-+        else
-+            pControl = new ScVbaButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
-+    }
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ) ) )
-+        pControl = new ScVbaComboBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ) )
-+	pControl = new ScVbaListBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) ) )
-+	pControl = new ScVbaLabel( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ) ) )
-+	pControl = new ScVbaImage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
-+	pControl = new ScVbaProgressBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
-+	pControl = new ScVbaFrame( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ) ) )
-+	pControl = new ScVbaScrollBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ) )
-+	pControl = new ScVbaMultiPage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), xParent );
-+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ) ) )
-+	pControl = new ScVbaSpinButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
-+    else
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii("Unsupported control " ), uno::Reference< uno::XInterface >() );
-+    return pControl;
-+}
-+
-+rtl::OUString& 
-+ScVbaControl::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControl") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaControl::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Control" ) );
-+    }
-+	return aServiceNames;
-+}
-+
-+
-+
-+typedef cppu::WeakImplHelper1< XControlProvider > ControlProvider_BASE;
-+class ControlProviderImpl : public ControlProvider_BASE
-+{
-+    uno::Reference< uno::XComponentContext > m_xCtx;
-+public:
-+    ControlProviderImpl( const uno::Reference< uno::XComponentContext >& xCtx ) : m_xCtx( xCtx ) {}
-+    virtual uno::Reference< msforms::XControl > SAL_CALL createControl( const uno::Reference< drawing::XControlShape >& xControl, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException);
-+    virtual uno::Reference< msforms::XControl > SAL_CALL createUserformControl( const uno::Reference< awt::XControl >& xControl, const uno::Reference< awt::XControl >& xDialog, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException);
-+};
-+
-+uno::Reference< msforms::XControl > SAL_CALL 
-+ControlProviderImpl::createControl( const uno::Reference< drawing::XControlShape >& xControlShape, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException)
-+{
-+	uno::Reference< msforms::XControl > xControlToReturn;
-+	if ( xControlShape.is() ) 
-+	{
-+		ScVbaControlFactory controlFactory( m_xCtx, xControlShape, xDocOwner );
-+		xControlToReturn.set( controlFactory.createControl( xDocOwner ) );
-+	}
-+	return xControlToReturn;
-+		
-+}
-+uno::Reference< msforms::XControl > SAL_CALL 
-+ControlProviderImpl::createUserformControl( const uno::Reference< awt::XControl >& xControl, const uno::Reference< awt::XControl >& xDialog, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException)
-+{
-+	uno::Reference< msforms::XControl > xControlToReturn;
-+	if ( xControl.is() && xDialog.is() ) 
-+	{ 
-+			
-+		ScVbaControlFactory controlFactory( m_xCtx, xControl, xDocOwner );
-+		xControlToReturn.set( controlFactory.createControl( xDialog->getModel() ) );
-+		ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xControlToReturn.get() );
-+		pControl->setGeometryHelper( new UserFormGeometryHelper( m_xCtx, xControl ) );
-+	}
-+	return xControlToReturn;
-+}
-+
-+namespace controlprovider
-+{
-+namespace sdecl = comphelper::service_decl;
-+sdecl::class_<ControlProviderImpl, sdecl::with_args<false> > serviceImpl;
-+extern sdecl::ServiceDecl const serviceDecl(
-+    serviceImpl,
-+    "ControlProviderImpl",
-+    "ooo.vba.ControlProvider" );
-+}
-+
-+
---- vbahelper/source/msforms/vbacontrol.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbacontrol.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,112 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbacontrol.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_CONTROL_HXX
-+#define SC_VBA_CONTROL_HXX
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+#include <com/sun/star/script/XDefaultProperty.hpp>
-+#include <com/sun/star/drawing/XControlShape.hpp>
-+#include <com/sun/star/awt/XControl.hpp>
-+#include <com/sun/star/awt/XWindowPeer.hpp>
-+#include <ooo/vba/msforms/XControl.hpp>
-+
-+#include <vbahelper/vbahelper.hxx>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <memory>
-+
-+//typedef ::cppu::WeakImplHelper1< ov::msforms::XControl > ControlImpl_BASE;
-+typedef InheritedHelperInterfaceImpl1< ov::msforms::XControl > ControlImpl_BASE;
-+
-+class ScVbaControl : public ControlImpl_BASE
-+{
-+private:
-+    com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > m_xEventListener;
-+protected:
-+    std::auto_ptr< ov::AbstractGeometryAttributes > mpGeometryHelper;
-+    css::uno::Reference< css::beans::XPropertySet > m_xProps;
-+    css::uno::Reference< css::uno::XInterface > m_xControl;
-+    css::uno::Reference< css::frame::XModel > m_xModel;
-+
-+    virtual css::uno::Reference< css::awt::XWindowPeer > getWindowPeer() throw (css::uno::RuntimeException);
-+public:
-+    ScVbaControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, 
-+                    const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pHelper );
-+    virtual ~ScVbaControl();
-+    // This class will own the helper, so make sure it is allocated from 
-+    // the heap
-+    void setGeometryHelper( ov::AbstractGeometryAttributes* pHelper );
-+    // XControl
-+    virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException);
-+    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL SetFocus(  ) throw (css::uno::RuntimeException);
-+
-+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException);
-+    virtual rtl::OUString SAL_CALL getControlSource() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setControlSource( const rtl::OUString& _controlsource ) throw (css::uno::RuntimeException);
-+    virtual rtl::OUString SAL_CALL getRowSource() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
-+    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
-+    //remove resouce because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape
-+    virtual void removeResouce() throw( css::uno::RuntimeException );
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+
-+class ScVbaControlFactory
-+{
-+public:
-+    ScVbaControlFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, 
-+                    const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel );
-+    ScVbaControl* createControl()  throw ( css::uno::RuntimeException );
-+    ScVbaControl* createControl( const css::uno::Reference< css::uno::XInterface >& xParent )  throw ( css::uno::RuntimeException );
-+private:
-+    ScVbaControl* createControl( const css::uno::Reference< css::awt::XControl >&, const css::uno::Reference< css::uno::XInterface >&  )  throw ( css::uno::RuntimeException );
-+    ScVbaControl* createControl( const css::uno::Reference< css::drawing::XControlShape >&, const css::uno::Reference< css::uno::XInterface >& )  throw ( css::uno::RuntimeException );
-+    css::uno::Reference< css::uno::XComponentContext > m_xContext;
-+    css::uno::Reference< css::uno::XInterface > m_xControl;
-+    css::uno::Reference< css::frame::XModel > m_xModel;
-+};
-+
-+#endif//SC_VBA_CONTROL_HXX
---- vbahelper/source/msforms/vbacontrols.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbacontrols.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,232 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#include "vbacontrols.hxx"
-+#include <cppuhelper/implbase2.hxx>
-+#include <com/sun/star/awt/XControlContainer.hpp>
-+#include <ooo/vba//XControlProvider.hpp>
-+#include <hash_map>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl;
-+
-+typedef  std::hash_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash,
-+    ::std::equal_to< ::rtl::OUString >  > ControlIndexMap;
-+typedef  std::vector< uno::Reference< awt::XControl > > ControlVec;
-+
-+class ControlArrayWrapper : public ArrayWrapImpl
-+{
-+    uno::Reference< awt::XControlContainer > mxDialog;
-+    uno::Sequence< ::rtl::OUString > msNames;
-+    ControlVec mControls;
-+    ControlIndexMap mIndices;
-+
-+    rtl::OUString getControlName( const uno::Reference< awt::XControl >& xCtrl )
-+    {
-+        uno::Reference< beans::XPropertySet > xProp( xCtrl->getModel(), uno::UNO_QUERY );
-+        rtl::OUString sName;
-+        xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
-+        return sName;
-+    }
-+
-+public:
-+
-+    ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
-+    {
-+        mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
-+        uno::Sequence< uno::Reference< awt::XControl > > sXControls = mxDialog->getControls();
-+    
-+        msNames.realloc( sXControls.getLength() );
-+        for ( sal_Int32 i = 0; i < sXControls.getLength(); ++i )
-+        {
-+            uno::Reference< awt::XControl > xCtrl = sXControls[ i ];
-+            msNames[ i ] = getControlName( xCtrl );
-+            mControls.push_back( xCtrl );
-+            mIndices[ msNames[ i ] ] = i;
-+        }
-+    }
-+    
-+    // XElementAccess
-+    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
-+    {
-+        return awt::XControl::static_type(0);
-+    }
-+    
-+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) 
-+    {
-+        return ( mControls.size() > 0 );
-+    }
-+    
-+    // XNameAcess 
-+    virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+        if ( !hasByName( aName ) )
-+            throw container::NoSuchElementException();
-+        return getByIndex( mIndices[ aName ] );
-+    }
-+    
-+    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
-+    {
-+        return msNames;
-+    }
-+    
-+    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
-+    {
-+        ControlIndexMap::iterator it = mIndices.find( aName );
-+        return it != mIndices.end();
-+    }
-+    
-+    // XElementAccess
-+    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException)
-+    {
-+        return mControls.size();
-+    }
-+    
-+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
-+    {
-+        if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) )
-+            throw lang::IndexOutOfBoundsException();
-+        return uno::makeAny( mControls[ Index ] );
-+    }
-+};
-+
-+
-+class ControlsEnumWrapper : public EnumerationHelper_BASE
-+{
-+    uno::Reference<XHelperInterface > m_xParent;
-+    uno::Reference<uno::XComponentContext > m_xContext;
-+    uno::Reference<container::XIndexAccess > m_xIndexAccess;
-+    uno::Reference<awt::XControl > m_xDlg;
-+    sal_Int32 nIndex;
-+
-+public:
-+
-+    ControlsEnumWrapper(  const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< awt::XControl >& xDlg ) :  m_xParent( xParent ), m_xContext( xContext), m_xIndexAccess( xIndexAccess ), m_xDlg( xDlg ), nIndex( 0 ) {}
-+
-+    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
-+    {
-+        return ( nIndex < m_xIndexAccess->getCount() );
-+    }
-+
-+    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+        if ( nIndex < m_xIndexAccess->getCount() )
-+        {
-+            uno::Reference< frame::XModel > xModel;
-+            uno::Reference< awt::XControl > xControl;
-+            m_xIndexAccess->getByIndex( nIndex++ ) >>= xControl;
-+
-+	uno::Reference<lang::XMultiComponentFactory > xServiceManager( m_xContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+	uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), m_xContext ), uno::UNO_QUERY_THROW );
-+
-+	uno::Reference< msforms::XControl > xVBAControl( xControlProvider->createUserformControl(  xControl, m_xDlg, xModel ) );
-+            return uno::makeAny( xVBAControl );
-+        }
-+        throw container::NoSuchElementException();
-+    }
-+
-+};
-+
-+
-+uno::Reference<container::XIndexAccess >
-+lcl_controlsWrapper( const uno::Reference< awt::XControl >& xDlg )
-+{
-+    return new ControlArrayWrapper( xDlg );
-+}
-+
-+ScVbaControls::ScVbaControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
-+                const css::uno::Reference< awt::XControl >& xDialog )
-+            : ControlsImpl_BASE( xParent, xContext, lcl_controlsWrapper( xDialog  ) )
-+{
-+    mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
-+}
-+
-+uno::Reference< container::XEnumeration >
-+ScVbaControls::createEnumeration() throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XEnumeration > xEnum( new ControlsEnumWrapper( mxParent, mxContext, m_xIndexAccess, mxDialog ) );
-+    if ( !xEnum.is() )
-+        throw uno::RuntimeException();
-+    return xEnum;
-+}
-+
-+uno::Any
-+ScVbaControls::createCollectionObject( const css::uno::Any& aSource )
-+{
-+    // Create control from awt::XControl
-+    uno::Reference< awt::XControl > xControl;
-+    aSource >>= xControl;
-+    uno::Reference< frame::XModel > xModel;
-+    uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+    uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
-+
-+    uno::Reference< msforms::XControl > xVBAControl( xControlProvider->createUserformControl(  xControl, mxDialog, xModel ) );
-+
-+    return uno::makeAny( xVBAControl );
-+}
-+
-+void SAL_CALL 
-+ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XEnumeration > xEnum( createEnumeration() );
-+    while ( xEnum->hasMoreElements() )
-+    {
-+        uno::Reference< msforms::XControl > xControl( xEnum->nextElement(), uno::UNO_QUERY_THROW );
-+        xControl->setLeft( xControl->getLeft() + cx );
-+        xControl->setTop( xControl->getTop() + cy ); 
-+    }
-+}
-+
-+uno::Type
-+ScVbaControls::getElementType() throw (uno::RuntimeException)
-+{
-+    return ooo::vba::msforms::XControl::static_type(0);
-+}
-+rtl::OUString& 
-+ScVbaControls::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControls") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaControls::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Controls" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbacontrols.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbacontrols.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_CONTROLS_HXX
-+#define SC_VBA_CONTROLS_HXX
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/msforms/XControls.hpp>
-+#include <com/sun/star/awt/XControl.hpp>
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef CollTestImplHelper< ov::msforms::XControls > ControlsImpl_BASE;
-+
-+class ScVbaControls : public ControlsImpl_BASE
-+{
-+	css::uno::Reference< css::awt::XControl > mxDialog;
-+protected:
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+public:
-+    ScVbaControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, 
-+                    const css::uno::Reference< css::awt::XControl >& xDialog );
-+    // XControls
-+     virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException);
-+    // XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+
-+    // ScVbaCollectionBaseImpl
-+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-+    
-+};
-+#endif //SC_VBA_OLEOBJECTS_HXX
-+
---- vbahelper/source/msforms/vbaframe.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbaframe.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,93 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbaframe.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
-+ScVbaFrame::ScVbaFrame( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : FrameImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+}
-+
-+// Attributes
-+rtl::OUString SAL_CALL 
-+ScVbaFrame::getCaption() throw (css::uno::RuntimeException)
-+{
-+    rtl::OUString Label;
-+    m_xProps->getPropertyValue( LABEL ) >>= Label;
-+    return Label;
-+}
-+
-+void SAL_CALL 
-+ScVbaFrame::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaFrame::getValue() throw (css::uno::RuntimeException)
-+{
-+    return uno::makeAny( getCaption() );
-+}
-+
-+void SAL_CALL 
-+ScVbaFrame::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    rtl::OUString sCaption;
-+    _value >>= sCaption;
-+    setCaption( sCaption ); 
-+}
-+
-+rtl::OUString& 
-+ScVbaFrame::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFrame") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaFrame::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbaframe.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbaframe.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_FRAME_HXX
-+#define SC_VBA_FRAME_HXX
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/msforms/XLabel.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XLabel > FrameImpl_BASE;
-+
-+class ScVbaFrame : public FrameImpl_BASE
-+{
-+public:
-+    ScVbaFrame(  const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
-+   // Attributes
-+    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif //SC_VBA_LABEL_HXX
---- vbahelper/source/msforms/vbaimage.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbaimage.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,59 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaimage.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
-+ScVbaImage::ScVbaImage( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ImageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+}
-+
-+rtl::OUString& 
-+ScVbaImage::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaImage") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaImage::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Image" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbaimage.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbaimage.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,48 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_IMAGE_HXX
-+#define SC_VBA_IMAGE_HXX
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/msforms/XImage.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XImage > ImageImpl_BASE;
-+
-+class ScVbaImage : public ImageImpl_BASE
-+{
-+public:
-+    ScVbaImage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif //SC_VBA_IMAGE_HXX
---- vbahelper/source/msforms/vbalabel.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbalabel.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,88 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbalabel.cxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbalabel.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
-+ScVbaLabel::ScVbaLabel(  const css::uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : LabelImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+}
-+
-+// Attributes
-+rtl::OUString SAL_CALL 
-+ScVbaLabel::getCaption() throw (css::uno::RuntimeException)
-+{
-+    rtl::OUString Label;
-+    m_xProps->getPropertyValue( LABEL ) >>= Label;
-+    return Label;
-+}
-+
-+void SAL_CALL 
-+ScVbaLabel::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
-+}
-+uno::Any SAL_CALL 
-+ScVbaLabel::getValue() throw (css::uno::RuntimeException)
-+{
-+    return uno::makeAny( getCaption() );
-+}
-+
-+void SAL_CALL 
-+ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    rtl::OUString sCaption;
-+    _value >>= sCaption;
-+    setCaption( sCaption ); 
-+}
-+
-+
-+rtl::OUString& 
-+ScVbaLabel::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLabel") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaLabel::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbalabel.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbalabel.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,56 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbalabel.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_LABEL_HXX
-+#define SC_VBA_LABEL_HXX
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/msforms/XLabel.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <cppuhelper/implbase2.hxx>
-+
-+typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XLabel, css::script::XDefaultProperty  > LabelImpl_BASE;
-+
-+class ScVbaLabel : public LabelImpl_BASE
-+{
-+public:
-+    ScVbaLabel( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
-+   // Attributes
-+    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+    // XDefaultProperty
-+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
-+};
-+#endif //SC_VBA_LABEL_HXX
---- vbahelper/source/msforms/vbalistbox.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbalistbox.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,288 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbalistbox.cxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
-+
-+#include "vbalistbox.hxx"
-+#include <vector>
-+#include <comphelper/anytostring.hxx>
-+#include <com/sun/star/script/ArrayWrapper.hpp>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
-+const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
-+const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
-+
-+
-+ScVbaListBox::ScVbaListBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ListBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+    mpListHelper.reset( new ListControlHelper( m_xProps ) );
-+}
-+
-+// Attributes
-+void SAL_CALL 
-+ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nIndex = 0;
-+    _value >>= nIndex;
-+    Selected( nIndex );
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaListBox::getListIndex() throw (uno::RuntimeException)
-+{
-+    uno::Sequence< sal_Int16 > sSelection;
-+    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
-+    if ( sSelection.getLength() == 0 )
-+        return uno::Any( sal_Int32( -1 ) );
-+    return uno::Any( sSelection[ 0 ] );
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaListBox::getValue() throw (uno::RuntimeException)
-+{
-+    uno::Sequence< sal_Int16 > sSelection;
-+    uno::Sequence< rtl::OUString > sItems;
-+    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
-+    m_xProps->getPropertyValue( ITEMS ) >>= sItems;
-+    if( getMultiSelect() )
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-+                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
-+    uno::Any aRet;
-+    if ( sSelection.getLength() )
-+        aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] ); 
-+    return aRet;
-+}
-+
-+void SAL_CALL 
-+ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
-+{
-+    if( getMultiSelect() )
-+    {	
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-+                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
-+    }
-+    rtl::OUString sValue = getAnyAsString( _value );
-+    uno::Sequence< rtl::OUString > sList;
-+    m_xProps->getPropertyValue( ITEMS ) >>= sList;
-+    uno::Sequence< sal_Int16 > nList;
-+    sal_Int16 nLength = static_cast<sal_Int16>( sList.getLength() );
-+    sal_Int16 nValue = -1;
-+    sal_Int16 i = 0;
-+    for( i = 0; i < nLength; i++ )
-+    {
-+        if( sList[i].equals( sValue ) )
-+        {
-+            nValue = i; 
-+            break;
-+        }
-+    }
-+    if( nValue == -1 )
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-+                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
-+
-+    uno::Sequence< sal_Int16 > nSelectedIndices(1);
-+    nSelectedIndices[ 0 ] = nValue;
-+    m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nSelectedIndices ) ); 
-+    m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) ); 
-+}
-+
-+::rtl::OUString SAL_CALL 
-+ScVbaListBox::getText() throw (uno::RuntimeException)
-+{
-+	rtl::OUString result;
-+	getValue() >>= result;
-+	return result;
-+}
-+
-+void SAL_CALL 
-+ScVbaListBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
-+{
-+	setValue( uno::makeAny( _text ) ); // seems the same
-+}
-+
-+sal_Bool SAL_CALL 
-+ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException)
-+{
-+    sal_Bool bMultiSelect = sal_False;
-+    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ) ) >>= bMultiSelect;
-+    return bMultiSelect;
-+}
-+
-+void SAL_CALL 
-+ScVbaListBox::setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ), uno::makeAny( _multiselect ) );
-+}
-+
-+css::uno::Any SAL_CALL 
-+ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException)
-+{
-+    uno::Sequence< rtl::OUString > sList;
-+    m_xProps->getPropertyValue( ITEMS ) >>= sList;
-+    sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
-+    // no choice but to do a horror cast as internally
-+    // the indices are but sal_Int16 
-+    sal_Int16 nIndex = static_cast< sal_Int16 >( index );
-+    if( nIndex < 0 || nIndex >= nLength )
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-+                    "Error Number." ), uno::Reference< uno::XInterface >() );
-+    m_nIndex = nIndex;
-+    return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
-+}
-+
-+// Methods
-+void SAL_CALL 
-+ScVbaListBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
-+{
-+	mpListHelper->AddItem( pvargItem, pvargIndex );
-+		}
-+
-+void SAL_CALL 
-+ScVbaListBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+	mpListHelper->removeItem( index );
-+}
-+
-+void SAL_CALL 
-+ScVbaListBox::Clear(  ) throw (uno::RuntimeException)
-+{
-+	mpListHelper->Clear();
-+}
-+
-+// this is called when something like the following vba code is used
-+// to set the selected state of particular entries in the Listbox
-+// ListBox1.Selected( 3 ) = false
-+//PropListener
-+void 
-+ScVbaListBox::setValueEvent( const uno::Any& value )
-+{
-+    sal_Bool bValue = sal_False;
-+    if( !(value >>= bValue) )
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-+                    "Invalid type\n. need boolean." ), uno::Reference< uno::XInterface >() );
-+    uno::Sequence< sal_Int16 > nList;
-+    m_xProps->getPropertyValue( SELECTEDITEMS ) >>= nList;
-+    sal_Int16 nLength = static_cast<sal_Int16>( nList.getLength() );
-+    sal_Int16 nIndex = m_nIndex;
-+    for( sal_Int16 i = 0; i < nLength; i++ )
-+    {
-+        if( nList[i] == nIndex )
-+        {
-+            if( bValue )
-+                return;
-+            else
-+            {
-+                for( ; i < nLength - 1; i++ )
-+                {
-+                    nList[i] = nList[i + 1];
-+                }
-+                nList.realloc( nLength - 1 );
-+                //m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
-+		m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nList ) );
-+                return;
-+            }
-+        }
-+    }
-+    if( bValue )
-+    {
-+        if( getMultiSelect() )
-+        {
-+            nList.realloc( nLength + 1 );
-+            nList[nLength] = nIndex;
-+        }
-+        else
-+        {
-+            nList.realloc( 1 );
-+            nList[0] = nIndex;
-+        }
-+        m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
-+    }
-+}
-+
-+// this is called when something like the following vba code is used
-+// to determine the selected state of particular entries in the Listbox
-+// msgbox ListBox1.Selected( 3 )
-+
-+css::uno::Any 
-+ScVbaListBox::getValueEvent()
-+{
-+    uno::Sequence< sal_Int16 > nList;
-+    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" ) ) ) >>= nList;
-+    sal_Int32 nLength = nList.getLength();
-+    sal_Int32 nIndex = m_nIndex;
-+    
-+    for( sal_Int32 i = 0; i < nLength; i++ )
-+    {
-+        if( nList[i] == nIndex )
-+            return uno::makeAny( sal_True );
-+    }
-+
-+    return uno::makeAny( sal_False );
-+}
-+
-+void SAL_CALL
-+ScVbaListBox::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
-+{
-+	ScVbaControl::setRowSource( _rowsource );
-+	mpListHelper->setRowSource( _rowsource );
-+}
-+
-+sal_Int32 SAL_CALL
-+ScVbaListBox::getListCount() throw (uno::RuntimeException)
-+{
-+	return mpListHelper->getListCount();
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
-+{
-+	return mpListHelper->List( pvargIndex, pvarColumn );
-+}
-+
-+rtl::OUString& 
-+ScVbaListBox::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaListBox") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaListBox::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ScVbaListBox" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbalistbox.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbalistbox.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,90 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbalistbox.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_LISTBOX_HXX
-+#define SC_VBA_LISTBOX_HXX
-+#include <cppuhelper/implbase2.hxx>
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+#include <com/sun/star/script/XDefaultProperty.hpp>
-+#include <ooo/vba/msforms/XListBox.hpp>
-+#include <com/sun/star/beans/PropertyAttribute.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbapropvalue.hxx>
-+#include "vbalistcontrolhelper.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::script::XDefaultProperty > ListBoxImpl_BASE;
-+class ScVbaListBox : public ListBoxImpl_BASE
-+    ,public PropListener
-+{		
-+	std::auto_ptr< ListControlHelper > mpListHelper;
-+	rtl::OUString sSourceName; 
-+	rtl::OUString msDftPropName;
-+
-+    sal_Int16 m_nIndex;
-+	
-+public:
-+	ScVbaListBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
-+
-+	// Attributes
-+	virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+	virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
-+    virtual sal_Bool SAL_CALL getMultiSelect() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException);
-+
-+	// Methods
-+	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
-+	// XControl
-+    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
-+
-+	// XDefaultProperty
-+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
-+    
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();    
-+
-+    //PropListener
-+    virtual void setValueEvent( const css::uno::Any& value );
-+    virtual css::uno::Any getValueEvent();
-+
-+
-+};
-+
-+#endif //
---- vbahelper/source/msforms/vbalistcontrolhelper.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbalistcontrolhelper.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,146 @@
-+#include <vbalistcontrolhelper.hxx>
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
-+
-+void SAL_CALL 
-+ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
-+{
-+	if ( pvargItem.hasValue()  )
-+	{
-+		uno::Sequence< rtl::OUString > sList;
-+		m_xProps->getPropertyValue( ITEMS ) >>= sList;
-+
-+		sal_Int32 nIndex = sList.getLength();
-+
-+		if ( pvargIndex.hasValue() )
-+			pvargIndex >>= nIndex;
-+
-+		rtl::OUString sString = getAnyAsString( pvargItem );
-+
-+		// if no index specified or item is to be appended to end of 
-+		// list just realloc the array and set the last item
-+		if ( nIndex  == sList.getLength() )
-+		{
-+			sal_Int32 nOldSize = sList.getLength();
-+			sList.realloc( nOldSize + 1 );
-+			sList[ nOldSize ] = sString; 
-+		}
-+		else
-+		{
-+			// just copy those elements above the one to be inserted
-+			std::vector< rtl::OUString > sVec;
-+			// reserve just the amount we need to copy
-+			sVec.reserve( sList.getLength() - nIndex );
-+
-+			// point at first element to copy
-+			rtl::OUString* pString = sList.getArray() + nIndex;
-+			const rtl::OUString* pEndString = sList.getArray() + sList.getLength();
-+			// insert the new element
-+			sVec.push_back( sString );
-+			// copy elements	
-+			for ( ; pString != pEndString; ++pString )
-+				sVec.push_back( *pString );
-+		
-+			sList.realloc(  sList.getLength() + 1 );
-+
-+			// point at first element to be overwritten
-+			pString = sList.getArray() + nIndex;
-+			pEndString = sList.getArray() + sList.getLength();
-+			std::vector< rtl::OUString >::iterator it = sVec.begin();
-+			for ( ; pString != pEndString; ++pString, ++it)
-+				*pString = *it;	
-+			//
-+		}
-+
-+		m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
-+		
-+	}
-+}
-+
-+void SAL_CALL 
-+ListControlHelper::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nIndex = 0;
-+    // for int index
-+	if ( index >>= nIndex  )
-+	{
-+		uno::Sequence< rtl::OUString > sList;
-+		m_xProps->getPropertyValue( ITEMS ) >>= sList;
-+        if( nIndex < 0 || nIndex > ( sList.getLength() - 1 ) )
-+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid index" ), uno::Reference< uno::XInterface > () );
-+        if( sList.hasElements() )
-+        {
-+            if( sList.getLength() == 1 )
-+            {
-+                Clear();
-+                return;
-+            }
-+            for( sal_Int32 i = nIndex; i < ( sList.getLength()-1 ); i++ )
-+            {
-+                sList[i] = sList[i+1];
-+            }
-+			sList.realloc(  sList.getLength() - 1 );
-+		}
-+
-+		m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
-+	}
-+}
-+
-+void SAL_CALL 
-+ListControlHelper::Clear(  ) throw (uno::RuntimeException)
-+{
-+	// urk, setValue doesn't seem to work !!
-+	//setValue( uno::makeAny( sal_Int16() ) );
-+	m_xProps->setPropertyValue( ITEMS, uno::makeAny( uno::Sequence< rtl::OUString >() ) );
-+}
-+
-+void SAL_CALL
-+ListControlHelper::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
-+{
-+	if ( _rowsource.getLength() == 0 )
-+		Clear();
-+}
-+
-+sal_Int32 SAL_CALL
-+ListControlHelper::getListCount() throw (uno::RuntimeException)
-+{
-+    uno::Sequence< rtl::OUString > sList;
-+    m_xProps->getPropertyValue( ITEMS ) >>= sList;
-+    return sList.getLength();
-+}
-+
-+uno::Any SAL_CALL 
-+ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
-+{
-+    uno::Sequence< rtl::OUString > sList;
-+    m_xProps->getPropertyValue( ITEMS ) >>= sList;
-+    sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
-+    uno::Any aRet;
-+    if ( pvargIndex.hasValue() )
-+    {
-+        sal_Int16 nIndex = -1;
-+        pvargIndex >>= nIndex;
-+        if( nIndex < 0 || nIndex >= nLength )
-+            throw uno::RuntimeException( rtl::OUString::createFromAscii(
-+                    "Bad row Index" ), uno::Reference< uno::XInterface >() );       
-+        aRet <<= sList[ nIndex ];
-+    }
-+    else if ( pvarColumn.hasValue() ) // pvarColumn on its own would be bad
-+            throw uno::RuntimeException( rtl::OUString::createFromAscii(
-+                    "Bad column Index" ), uno::Reference< uno::XInterface >() );       
-+    else // List() ( e.g. no args )
-+    {
-+        uno::Sequence< uno::Sequence< rtl::OUString > > sReturnArray( nLength );
-+        for ( sal_Int32 i = 0; i < nLength; ++i )
-+        {
-+            sReturnArray[ i ].realloc( 10 );
-+            sReturnArray[ i ][ 0 ] = sList[ i ];
-+        }        
-+        aRet = uno::makeAny( sReturnArray );
-+    }
-+    return aRet;
-+}
---- vbahelper/source/msforms/vbalistcontrolhelper.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbalistcontrolhelper.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,20 @@
-+#ifndef SC_VBA_LISTCONTROLHELPER
-+#define SC_VBA_LISTCONTROLHELPER
-+
-+#include <vbahelper/vbahelper.hxx>
-+
-+class ListControlHelper
-+{
-+	css::uno::Reference< css::beans::XPropertySet > m_xProps;
-+
-+public:
-+	ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){}
-+	virtual ~ListControlHelper() {}
-+	virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);   
-+    	virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
-+	virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
-+};
-+#endif
---- vbahelper/source/msforms/vbamultipage.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbamultipage.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,132 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbamultipage.hxx"
-+#include <ooo/vba/XCollection.hpp>
-+#include "vbapages.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+// uno servicename com.sun.star.awt.UnoControlProgressBarMode
-+const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
-+const rtl::OUString SVALUEMAX( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") );
-+const rtl::OUString SSTEP( RTL_CONSTASCII_USTRINGPARAM("Step") );
-+
-+typedef cppu::WeakImplHelper1< container::XIndexAccess > PagesImpl_Base;
-+class PagesImpl : public PagesImpl_Base
-+{
-+	sal_Int32 mnPages;
-+public:
-+	PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {}
-+	virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException) { return mnPages; }
-+	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException)
-+	{
-+		if ( Index < 0 || Index > mnPages )
-+			throw lang::IndexOutOfBoundsException();
-+		return uno::makeAny( uno::Reference< uno::XInterface >() );
-+	}
-+	// XElementAccess
-+	virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
-+	{
-+		// no Pages object yet #FIXME
-+		//return msforms::XPage::static_type(0);
-+		return uno::XInterface::static_type(0);
-+	}
-+	virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
-+	{
-+		return ( mnPages > 0 );
-+	}
-+};
-+uno::Reference< container::XIndexAccess > 
-+ScVbaMultiPage::getPages( sal_Int32 nPages )
-+{
-+	return new PagesImpl( nPages );
-+}
-+
-+ScVbaMultiPage::ScVbaMultiPage( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, const uno::Reference< uno::XInterface >& xDialog ) : MultiPageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+    mxDialogProps.set( xDialog, uno::UNO_QUERY_THROW );
-+    // set dialog step to value of multipage pseudo model
-+    setValue(getValue());
-+}
-+
-+// Attributes
-+sal_Int32 SAL_CALL 
-+ScVbaMultiPage::getValue() throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 nValue = 0;
-+    m_xProps->getPropertyValue( SVALUE ) >>= nValue;
-+    return nValue;
-+}
-+
-+void SAL_CALL 
-+ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    // track change in dialog ( dialog value is 1 based, 0 is a special value )
-+    m_xProps->setPropertyValue( SVALUE, uno::makeAny( _value ) );
-+    mxDialogProps->setPropertyValue( SSTEP, uno::makeAny( _value + 1) );
-+}
-+
-+
-+rtl::OUString& 
-+ScVbaMultiPage::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMultiPage") );
-+	return sImplName;
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nValue = 0;
-+	m_xProps->getPropertyValue( SVALUEMAX ) >>= nValue;
-+	uno::Reference< XCollection > xColl( new ScVbaPages( this, mxContext, getPages( nValue ) ) );
-+	if ( !index.hasValue() )
-+		return uno::makeAny( xColl );
-+	return xColl->Item( uno::makeAny( index ), uno::Any() );
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaMultiPage::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.MultiPage" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbamultipage.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbamultipage.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,65 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_MULTIPAGE_HXX
-+#define SC_VBA_MULTIPAGE_HXX
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/msforms/XMultiPage.hpp>
-+#include <com/sun/star/container/XIndexAccess.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+//#include <cppuhelper/implbase2.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+
-+typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XMultiPage > MultiPageImpl_BASE;
-+
-+class ScVbaMultiPage : public MultiPageImpl_BASE
-+{
-+    css::uno::Reference< css::container::XIndexAccess > getPages( sal_Int32 nPages );
-+    css::uno::Reference< css::beans::XPropertySet > mxDialogProps;
-+public:
-+    ScVbaMultiPage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, const css::uno::Reference< css::uno::XInterface >& xDialog );
-+   // Attributes
-+    virtual sal_Int32 SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( sal_Int32 _value ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) throw (css::uno::RuntimeException);
-+
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+    // XDefaultProperty
-+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
-+};
-+#endif //SC_VBA_LABEL_HXX
---- vbahelper/source/msforms/vbapages.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbapages.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,80 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbapages.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+ScVbaPages::ScVbaPages( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPages ) throw( lang::IllegalArgumentException ) : ScVbaPages_BASE( xParent, xContext, xPages )
-+{
-+}
-+
-+uno::Type SAL_CALL 
-+ScVbaPages::getElementType() throw (uno::RuntimeException)
-+{
-+	// return msforms::XPage::static_type(0); 
-+	return uno::XInterface::static_type(0); 
-+}
-+
-+uno::Any 
-+ScVbaPages::createCollectionObject( const css::uno::Any& aSource )
-+{
-+	return aSource;
-+}
-+
-+rtl::OUString& 
-+ScVbaPages::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPages") );
-+	return sImplName;
-+}
-+
-+uno::Reference< container::XEnumeration > SAL_CALL 
-+ScVbaPages::createEnumeration() throw (uno::RuntimeException)
-+{
-+	return uno::Reference< container::XEnumeration >();
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaPages::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Pages" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbapages.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbapages.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,64 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_PAGES_HXX
-+#define SC_VBA_PAGES_HXX
-+
-+#include <ooo/vba/office/MsoShapeType.hpp>
-+#include <com/sun/star/lang/XEventListener.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <ooo/vba/msforms/XPages.hpp>
-+#include <cppuhelper/implbase2.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+typedef CollTestImplHelper< 
-+ov::msforms::XPages > ScVbaPages_BASE;
-+
-+class ScVbaPages : public ScVbaPages_BASE
-+{
-+protected:
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+public:
-+    ScVbaPages( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPages ) throw ( css::lang::IllegalArgumentException );
-+    virtual ~ScVbaPages() {}
-+        // XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+     // ScVbaPages_BASE
-+     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-+
-+};
-+#endif//SC_VBA_SHAPE_HXX
---- vbahelper/source/msforms/vbaprogressbar.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbaprogressbar.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,78 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbaprogressbar.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+// uno servicename com.sun.star.awt.UnoControlProgressBarMode
-+const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
-+
-+ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ProgressBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+}
-+
-+// Attributes
-+uno::Any SAL_CALL 
-+ScVbaProgressBar::getValue() throw (css::uno::RuntimeException)
-+{
-+    return m_xProps->getPropertyValue( SVALUE );
-+}
-+
-+void SAL_CALL 
-+ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( SVALUE,  _value );
-+}
-+
-+rtl::OUString& 
-+ScVbaProgressBar::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaProgressBar") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaProgressBar::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbaprogressbar.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbaprogressbar.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,59 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_PROGRESSBAR_HXX
-+#define SC_VBA_PROGRESSBAR_HXX
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/msforms/XProgressBar.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <cppuhelper/implbase2.hxx>
-+
-+typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XProgressBar, css::script::XDefaultProperty  > ProgressBarImpl_BASE;
-+
-+class ScVbaProgressBar : public ProgressBarImpl_BASE
-+{
-+public:
-+    ScVbaProgressBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
-+   // Attributes
-+    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+    // XDefaultProperty
-+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
-+};
-+#endif //SC_VBA_LABEL_HXX
---- vbahelper/source/msforms/vbaradiobutton.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbaradiobutton.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,107 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbaradiobutton.cxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaradiobutton.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
-+const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
-+ScVbaRadioButton::ScVbaRadioButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : RadioButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+}
-+
-+// Attributes
-+rtl::OUString SAL_CALL 
-+ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException)
-+{
-+    rtl::OUString Label;
-+    m_xProps->getPropertyValue( LABEL ) >>= Label;
-+    return Label;
-+}
-+
-+void SAL_CALL 
-+ScVbaRadioButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaRadioButton::getValue() throw (css::uno::RuntimeException)
-+{
-+    sal_Int16 nValue = -1;
-+    m_xProps->getPropertyValue( STATE ) >>= nValue;
-+    if( nValue != 0 )
-+        nValue = -1;
-+//    return uno::makeAny( nValue ); 
-+// I must be missing something MSO says value should be -1 if selected, 0 if not
-+// selected
-+    return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); 
-+
-+}
-+
-+void SAL_CALL 
-+ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
-+{
-+    sal_Int16 nValue = 0;
-+    sal_Bool bValue = sal_False;
-+    if( _value >>= nValue )
-+    {
-+        if( nValue == -1)
-+        nValue = 1;
-+    }
-+    else if ( _value >>= bValue )
-+    {
-+        if ( bValue )
-+            nValue = 1;
-+    }
-+    m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
-+}
-+
-+rtl::OUString& 
-+ScVbaRadioButton::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRadioButton") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaRadioButton::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.RadioButton" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbaradiobutton.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbaradiobutton.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbaradiobutton.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_RADIOBUTTON_HXX
-+#define SC_VBA_RADIOBUTTON_HXX
-+#include <ooo/vba/msforms/XRadioButton.hpp>
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <cppuhelper/implbase2.hxx>
-+
-+typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > RadioButtonImpl_BASE;
-+
-+class ScVbaRadioButton : public RadioButtonImpl_BASE
-+{
-+public:
-+    ScVbaRadioButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
-+   // Attributes
-+    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue(const com::sun::star::uno::Any&) throw (css::uno::RuntimeException);
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+    // XDefaultProperty
-+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
-+
-+};
-+#endif //SC_VBA_RADIOBUTTON_HXX
---- vbahelper/source/msforms/vbascrollbar.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbascrollbar.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,139 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbascrollbar.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+const static rtl::OUString LARGECHANGE( RTL_CONSTASCII_USTRINGPARAM("BlockIncrement") );
-+const static rtl::OUString SMALLCHANGE( RTL_CONSTASCII_USTRINGPARAM("LineIncrement") );
-+const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
-+const static rtl::OUString SCROLLVALUE( RTL_CONSTASCII_USTRINGPARAM("ScrollValue") );
-+const static rtl::OUString SCROLLMAX( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMax") );
-+const static rtl::OUString SCROLLMIN( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMin") );
-+
-+ScVbaScrollBar::ScVbaScrollBar(  const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ScrollBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+}
-+
-+// Attributes
-+uno::Any SAL_CALL 
-+ScVbaScrollBar::getValue() throw (css::uno::RuntimeException)
-+{
-+    return  m_xProps->getPropertyValue( SCROLLVALUE );
-+}
-+
-+void SAL_CALL 
-+ScVbaScrollBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( SCROLLVALUE, _value );
-+}
-+
-+::sal_Int32 SAL_CALL 
-+ScVbaScrollBar::getMax() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nMax = 0;
-+    m_xProps->getPropertyValue( SCROLLMAX ) >>= nMax;
-+    return nMax;
-+}
-+
-+void SAL_CALL 
-+ScVbaScrollBar::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( SCROLLMAX, uno::makeAny( nVal ) ); 
-+}
-+
-+::sal_Int32 SAL_CALL 
-+ScVbaScrollBar::getMin() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nVal = 0;
-+    m_xProps->getPropertyValue( SCROLLMIN ) >>= nVal;
-+    return nVal;
-+}
-+
-+void SAL_CALL 
-+ScVbaScrollBar::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( SCROLLMIN, uno::makeAny( nVal ) ); 
-+}
-+
-+void SAL_CALL 
-+ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange ) throw (uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( LARGECHANGE, uno::makeAny( _largechange ) );
-+}
-+
-+::sal_Int32 SAL_CALL 
-+ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nVal = 0;
-+    m_xProps->getPropertyValue( LARGECHANGE ) >>= nVal;
-+    return nVal;
-+}
-+
-+::sal_Int32 SAL_CALL 
-+ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nSmallChange = 0;
-+    m_xProps->getPropertyValue( SMALLCHANGE ) >>= nSmallChange;
-+    return nSmallChange;
-+}
-+
-+void SAL_CALL 
-+ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( SMALLCHANGE, uno::makeAny( _smallchange ) );
-+}
-+
-+rtl::OUString& 
-+ScVbaScrollBar::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaScrollBar") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaScrollBar::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbascrollbar.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbascrollbar.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,66 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_SCROLLBAR_HXX
-+#define SC_VBA_SCROLLBAR_HXX
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/msforms/XScrollBar.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XScrollBar > ScrollBarImpl_BASE;
-+
-+class ScVbaScrollBar : public ScrollBarImpl_BASE
-+{
-+public:
-+    ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
-+   // Attributes
-+    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getLargeChange() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLargeChange( ::sal_Int32 _largechange ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getSmallChange() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setSmallChange( ::sal_Int32 _smallchange ) throw (css::uno::RuntimeException);
-+
-+
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif //SC_VBA_LABEL_HXX
---- vbahelper/source/msforms/vbaspinbutton.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbaspinbutton.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,109 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbaspinbutton.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
-+const static rtl::OUString SPINVALUE( RTL_CONSTASCII_USTRINGPARAM("SpinValue") );
-+const static rtl::OUString SPINMAX( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") );
-+const static rtl::OUString SPINMIN( RTL_CONSTASCII_USTRINGPARAM("SpinValueMin") );
-+
-+ScVbaSpinButton::ScVbaSpinButton(  const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : SpinButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+}
-+
-+// Attributes
-+uno::Any SAL_CALL 
-+ScVbaSpinButton::getValue() throw (css::uno::RuntimeException)
-+{
-+    return  m_xProps->getPropertyValue( SPINVALUE );
-+}
-+
-+void SAL_CALL 
-+ScVbaSpinButton::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( SPINVALUE, _value );
-+}
-+
-+::sal_Int32 SAL_CALL 
-+ScVbaSpinButton::getMax() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nMax = 0;
-+    m_xProps->getPropertyValue( SPINMAX ) >>= nMax;
-+    return nMax;
-+}
-+
-+void SAL_CALL 
-+ScVbaSpinButton::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( SPINMAX, uno::makeAny( nVal ) ); 
-+}
-+
-+::sal_Int32 SAL_CALL 
-+ScVbaSpinButton::getMin() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nVal = 0;
-+    m_xProps->getPropertyValue( SPINMIN ) >>= nVal;
-+    return nVal;
-+}
-+
-+void SAL_CALL 
-+ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) ); 
-+}
-+
-+rtl::OUString& 
-+ScVbaSpinButton::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaSpinButton") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaSpinButton::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbaspinbutton.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbaspinbutton.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,61 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_SPINBUTTON_HXX
-+#define SC_VBA_SPINBUTTON_HXX
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/msforms/XSpinButton.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XSpinButton > SpinButtonImpl_BASE;
-+
-+class ScVbaSpinButton : public SpinButtonImpl_BASE
-+{
-+public:
-+    ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
-+   // Attributes
-+    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
-+
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif //SC_VBA_SPINBUTTON_HXX
---- vbahelper/source/msforms/vbatextbox.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbatextbox.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,137 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbatextbox.cxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <com/sun/star/text/XTextRange.hpp>
-+
-+#include "vbatextbox.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+
-+ScVbaTextBox::ScVbaTextBox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialog ) : TextBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialog( bDialog )
-+{
-+}
-+
-+// Attributes
-+uno::Any SAL_CALL 
-+ScVbaTextBox::getValue() throw (css::uno::RuntimeException)
-+{
-+	return uno::makeAny( getText() );
-+}
-+
-+void SAL_CALL 
-+ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
-+{
-+	rtl::OUString sVal = getAnyAsString( _value );
-+	setText( sVal );
-+}
-+
-+//getString() will cause some imfo lose.
-+rtl::OUString SAL_CALL 
-+ScVbaTextBox::getText() throw (css::uno::RuntimeException)
-+{
-+    uno::Any aValue;
-+    aValue = m_xProps->getPropertyValue
-+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ) ) );
-+    rtl::OUString sString;
-+    aValue >>= sString;
-+    return sString;
-+}
-+
-+void SAL_CALL 
-+ScVbaTextBox::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException)
-+{
-+    if ( !mbDialog )
-+    {
-+    uno::Reference< text::XTextRange > xTextRange( m_xProps, uno::UNO_QUERY_THROW );
-+    xTextRange->setString( _text );
-+}
-+    else
-+        m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text") ), uno::makeAny( _text ) ); 
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException)
-+{
-+    uno::Any aValue;
-+    aValue = m_xProps->getPropertyValue
-+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ) );
-+    sal_Int32 nMaxLength = 0;
-+    aValue >>= nMaxLength;
-+    return nMaxLength;
-+}
-+
-+void SAL_CALL 
-+ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException)
-+{
-+    uno::Any aValue( _maxlength );
-+    m_xProps->setPropertyValue
-+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ), aValue);
-+}
-+
-+sal_Bool SAL_CALL 
-+ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException)
-+{
-+    uno::Any aValue;
-+    aValue = m_xProps->getPropertyValue
-+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ) );
-+    sal_Bool bRet = false;
-+    aValue >>= bRet;
-+    return bRet;
-+}
-+
-+void SAL_CALL 
-+ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException)
-+{
-+    uno::Any aValue( _multiline );
-+    m_xProps->setPropertyValue
-+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ), aValue);
-+}
-+
-+rtl::OUString& 
-+ScVbaTextBox::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaTextBox") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaTextBox::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.TextBox" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/msforms/vbatextbox.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbatextbox.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,57 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbatextbox.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_TEXTBOX_HXX
-+#define SC_VBA_TEXTBOX_HXX
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/msforms/XTextBox.hpp>
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XTextBox > TextBoxImpl_BASE;
-+
-+class ScVbaTextBox : public TextBoxImpl_BASE
-+{
-+    bool mbDialog;
-+public:
-+    ScVbaTextBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialog = false );
-+   // Attributes
-+    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+    virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getMaxLength() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException);
-+    virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException);
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif //SC_VBA_TEXTBOX_HXX
---- vbahelper/source/msforms/vbatogglebutton.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbatogglebutton.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,108 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbatogglebutton.hxx"
-+#include <vector>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
-+const static rtl::OUString TOGGLE( RTL_CONSTASCII_USTRINGPARAM("Toggle") );
-+const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
-+ScVbaToggleButton::ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : ToggleButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
-+{
-+    OSL_TRACE("ScVbaToggleButton(ctor)");
-+    m_xProps->setPropertyValue( TOGGLE, uno::makeAny( sal_True ) );
-+}
-+
-+ScVbaToggleButton::~ScVbaToggleButton()
-+{
-+    OSL_TRACE("~ScVbaToggleButton(dtor)");
-+}
-+
-+// Attributes
-+rtl::OUString SAL_CALL 
-+ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException)
-+{
-+    rtl::OUString Label;
-+    m_xProps->getPropertyValue( LABEL ) >>= Label;
-+    return Label;
-+}
-+
-+void SAL_CALL 
-+ScVbaToggleButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaToggleButton::getValue() throw (uno::RuntimeException)
-+{
-+	sal_Int16 nState = 0;
-+    	m_xProps->getPropertyValue( STATE ) >>= nState;
-+ 	return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) );
-+}
-+
-+void SAL_CALL 
-+ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
-+{
-+	sal_Int16 nState = 0;
-+	_value >>= nState;
-+        OSL_TRACE( "nState - %d", nState );
-+	nState = ( nState == -1 ) ?  1 : 0;
-+        OSL_TRACE( "nState - %d", nState );
-+	m_xProps->setPropertyValue( STATE, uno::makeAny(  nState ) );
-+}
-+
-+rtl::OUString& 
-+ScVbaToggleButton::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaToggleButton") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaToggleButton::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ToggleButton" ) );
-+	}
-+	return aServiceNames;
-+}
-+
---- vbahelper/source/msforms/vbatogglebutton.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbatogglebutton.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,63 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_TOGGLEBUTTON_HXX
-+#define SC_VBA_TOGGLEBUTTON_HXX
-+#include <cppuhelper/implbase2.hxx>
-+#include <ooo/vba/msforms/XToggleButton.hpp>
-+
-+#include "vbacontrol.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+
-+typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XToggleButton, css::script::XDefaultProperty  > ToggleButtonImpl_BASE;
-+
-+class ScVbaToggleButton : public ToggleButtonImpl_BASE
-+{
-+	rtl::OUString msDftPropName;
-+public:
-+    ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
-+    ~ScVbaToggleButton();
-+   // Attributes
-+    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
-+
-+    virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+    // XDefaultProperty
-+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
-+};
-+#endif //SC_VBA_TOGGLEBUTTON_HXX
---- vbahelper/source/msforms/vbauserform.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbauserform.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,226 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include <vbahelper/helperdecl.hxx>
-+#include "vbauserform.hxx"
-+#include <com/sun/star/awt/XControl.hpp>
-+#include <com/sun/star/awt/XControlContainer.hpp>
-+#include <com/sun/star/beans/PropertyConcept.hpp>
-+#include <basic/sbx.hxx>
-+#include <basic/sbstar.hxx>
-+#include <basic/sbmeth.hxx>
-+#include "vbacontrols.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+// some little notes
-+// XDialog implementation has the following interesting bits
-+// a Controls property ( which is an array of the container controls )
-+//   each item in the controls array is a XControl, where the model is 
-+//   basically a property bag
-+// additionally the XDialog instance has itself a model
-+//     this model has a ControlModels ( array of models ) property
-+//     the models in ControlModels can be accessed by name
-+// also the XDialog is a XControl ( to access the model above
-+
-+ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) throw ( lang::IllegalArgumentException ) :  ScVbaUserForm_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext, getXSomethingFromArgs< uno::XInterface >( aArgs, 1 ), getXSomethingFromArgs< frame::XModel >( aArgs, 2 ), static_cast< ooo::vba::AbstractGeometryAttributes* >(0) ),  mbDispose( true )
-+{
-+    m_xDialog.set( m_xControl, uno::UNO_QUERY_THROW );
-+    uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW );
-+    m_xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW );
-+    setGeometryHelper( new UserFormGeometryHelper( xContext, xControl ) );
-+}
-+
-+ScVbaUserForm::~ScVbaUserForm()
-+{
-+}
-+
-+void SAL_CALL 
-+ScVbaUserForm::Show(  ) throw (uno::RuntimeException)
-+{
-+	OSL_TRACE("ScVbaUserForm::Show(  )");
-+	short aRet = 0;
-+	if ( m_xDialog.is() )
-+		aRet = m_xDialog->execute();
-+	OSL_TRACE("ScVbaUserForm::Show() execute returned %d", aRet);
-+	if ( mbDispose )
-+	{
-+		try
-+		{
-+			uno::Reference< lang::XComponent > xComp( m_xDialog, uno::UNO_QUERY_THROW );
-+			m_xDialog = NULL;
-+			xComp->dispose();
-+			mbDispose = false; 
-+		}
-+		catch( uno::Exception& )
-+		{
-+		}
-+	}
-+}
-+
-+rtl::OUString SAL_CALL 
-+ScVbaUserForm::getCaption() throw (::com::sun::star::uno::RuntimeException)
-+{
-+    rtl::OUString sCaption;
-+    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ) ) >>= sCaption;
-+    return sCaption;
-+}
-+void
-+ScVbaUserForm::setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
-+{
-+    m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ), uno::makeAny( _caption ) );
-+}
-+
-+void SAL_CALL 
-+ScVbaUserForm::Hide(  ) throw (uno::RuntimeException)
-+{
-+	mbDispose = false;  // hide not dispose
-+	if ( m_xDialog.is() )
-+		m_xDialog->endExecute();
-+}
-+
-+void SAL_CALL 
-+ScVbaUserForm::RePaint(  ) throw (uno::RuntimeException)
-+{
-+	// do nothing
-+}
-+
-+void SAL_CALL 
-+ScVbaUserForm::UnloadObject(  ) throw (uno::RuntimeException)
-+{
-+	mbDispose = true;
-+	if ( m_xDialog.is() )
-+		m_xDialog->endExecute();
-+}
-+
-+rtl::OUString& 
-+ScVbaUserForm::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaUserForm") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaUserForm::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.UserForm" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+uno::Reference< beans::XIntrospectionAccess > SAL_CALL 
-+ScVbaUserForm::getIntrospection(  ) throw (uno::RuntimeException)
-+{
-+	return uno::Reference< beans::XIntrospectionAccess >();
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaUserForm::invoke( const ::rtl::OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
-+{
-+	throw uno::RuntimeException(); // unsupported operation
-+}
-+
-+void SAL_CALL 
-+ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
-+{
-+	uno::Any aObject = getValue( aPropertyName );
-+	// The Object *must* support XDefaultProperty here because getValue will
-+	// only return properties that are Objects ( e.g. controls )
-+	// e.g. Userform1.aControl = something
-+	// 'aControl' has to support XDefaultProperty to make sense here
-+	uno::Reference< script::XDefaultProperty > xDfltProp( aObject, uno::UNO_QUERY_THROW );
-+	rtl::OUString aDfltPropName = xDfltProp->getDefaultPropertyName();
-+	uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObject ) );
-+	uno::Reference< beans::XPropertySet > xPropSet( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY_THROW );
-+	xPropSet->setPropertyValue( aDfltPropName, aValue );
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
-+{
-+	uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
-+	uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
-+	uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
-+	ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
-+        uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
-+        ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
-+        pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
-+	return uno::makeAny( xVBAControl );
-+}
-+
-+::sal_Bool SAL_CALL 
-+ScVbaUserForm::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException)
-+{
-+	return sal_False;
-+}
-+uno::Any SAL_CALL 
-+ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+	uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
-+	uno::Reference< XCollection > xControls( new ScVbaControls( this, mxContext, xDialogControl ) );
-+	if ( index.hasValue() )
-+		return uno::makeAny( xControls->Item( index, uno::Any() ) );
-+	return uno::makeAny( xControls );
-+}
-+
-+::sal_Bool SAL_CALL 
-+ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
-+{
-+	uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY );
-+	OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is() );
-+	if ( xControl.is() )
-+	{
-+		uno::Reference< container::XNameAccess > xNameAccess( xControl->getModel(), uno::UNO_QUERY_THROW );	
-+		sal_Bool bRes =  xNameAccess->hasByName( aName );
-+	OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d ---> %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is(), bRes );
-+		return bRes;
-+	}
-+	return sal_False;
-+}
-+
-+namespace userform
-+{
-+namespace sdecl = comphelper::service_decl;
-+sdecl::vba_service_class_<ScVbaUserForm, sdecl::with_args<true> > serviceImpl;
-+extern sdecl::ServiceDecl const serviceDecl(
-+    serviceImpl,
-+    "ScVbaUserForm",
-+    "ooo.vba.msforms.UserForm" );
-+}
-+
---- vbahelper/source/msforms/vbauserform.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbauserform.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,77 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_USERFORM_HXX
-+#define SC_VBA_USERFORM_HXX
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/msforms/XUserForm.hpp>
-+#include <com/sun/star/awt/XDialog.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include "vbacontrol.hxx"
-+
-+//typedef InheritedHelperInterfaceImpl1< ov::msforms::XUserForm > ScVbaUserForm_BASE;
-+typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XUserForm > ScVbaUserForm_BASE;
-+
-+class ScVbaUserForm : public ScVbaUserForm_BASE
-+{
-+private:
-+    css::uno::Reference< css::awt::XDialog > m_xDialog;
-+    bool mbDispose;
-+protected:
-+public:
-+    ScVbaUserForm( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException );
-+    virtual ~ScVbaUserForm();
-+    // XUserForm
-+    virtual void SAL_CALL RePaint(  ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL Show(  ) throw (css::uno::RuntimeException);
-+    // XIntrospection
-+    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
-+    virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
-+    virtual ::rtl::OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException);
-+    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException);
-+    virtual void SAL_CALL Hide(  ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL UnloadObject(  ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) throw (css::uno::RuntimeException);
-+    //XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif
---- vbahelper/source/vbahelper/makefile.mk.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,66 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.45 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/../
-+PRJNAME=vbahelper
-+TARGET=vbahelper
-+
-+ENABLE_EXCEPTIONS := TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+SLOFILES=\
-+    $(SLO)$/vbahelper.obj \
-+    $(SLO)$/vbapropvalue.obj \
-+    $(SLO)$/vbacommandbars.obj \
-+    $(SLO)$/vbacommandbar.obj \
-+    $(SLO)$/vbacommandbarcontrols.obj \
-+    $(SLO)$/vbacommandbarcontrol.obj \
-+    $(SLO)$/vbaapplicationbase.obj \
-+    $(SLO)$/vbawindowbase.obj \
-+    $(SLO)$/vbadocumentbase.obj \
-+    $(SLO)$/vbaglobalbase.obj \
-+
-+# --- Targets -------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-+ALLTAR : \
-+        $(MISC)$/$(TARGET).don \
-+
-+$(SLOFILES) : $(MISC)$/$(TARGET).don
-+
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+        echo $@
-+
---- vbahelper/source/vbahelper/vbaapplicationbase.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbaapplicationbase.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,139 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbahelper/vbaapplicationbase.hxx"
-+#include <com/sun/star/container/XIndexAccess.hpp>
-+#include <com/sun/star/frame/XLayoutManager.hpp>
-+
-+#include "vbacommandbars.hxx"
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+VbaApplicationBase::VbaApplicationBase( const uno::Reference< css::uno::XComponentContext >& xContext )
-+                    : ApplicationBase_BASE( uno::Reference< XHelperInterface >(), xContext )
-+{
-+}
-+
-+VbaApplicationBase::~VbaApplicationBase()
-+{
-+}
-+
-+sal_Bool SAL_CALL
-+VbaApplicationBase::getScreenUpdating() throw (uno::RuntimeException)
-+{
-+	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+	return !xModel->hasControllersLocked();
-+}
-+
-+void SAL_CALL
-+VbaApplicationBase::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeException)
-+{
-+	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+	if (bUpdate)
-+		xModel->unlockControllers();
-+	else
-+		xModel->lockControllers();
-+}
-+
-+sal_Bool SAL_CALL
-+VbaApplicationBase::getDisplayStatusBar() throw (uno::RuntimeException)
-+{
-+	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+    uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
-+
-+    if( xProps.is() ){
-+        uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
-+        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
-+        if( xLayoutManager.is() && xLayoutManager->isElementVisible( url ) ){
-+            return sal_True;
-+        }
-+    }
-+    return sal_False;
-+}
-+
-+void SAL_CALL
-+VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno::RuntimeException)
-+{
-+	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+    uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
-+
-+    if( xProps.is() ){
-+        uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
-+        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
-+        if( xLayoutManager.is() ){
-+            if( bDisplayStatusBar && !xLayoutManager->isElementVisible( url ) ){
-+                if( !xLayoutManager->showElement( url ) )
-+                    xLayoutManager->createElement( url );
-+                return;
-+            }
-+            else if( !bDisplayStatusBar && xLayoutManager->isElementVisible( url ) ){
-+                xLayoutManager->hideElement( url ); 
-+                return;
-+            }
-+        }
-+    }
-+    return;
-+}
-+
-+uno::Any SAL_CALL
-+VbaApplicationBase::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< XCommandBars > xCommandBars( new ScVbaCommandBars( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
-+    if( aIndex.hasValue() )
-+        return uno::makeAny( xCommandBars->Item( aIndex, uno::Any() ) );
-+    return uno::makeAny( xCommandBars );
-+}
-+
-+rtl::OUString& 
-+VbaApplicationBase::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaApplicationBase") );
-+	return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+VbaApplicationBase::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VbaApplicationBase" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+
---- vbahelper/source/vbahelper/vbacommandbar.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbacommandbar.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,346 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
-+#include <com/sun/star/frame/XFrame.hpp>
-+#include <com/sun/star/frame/XDesktop.hpp>
-+#include <com/sun/star/frame/XLayoutManager.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/container/XNameContainer.hpp>
-+#include <ooo/vba/office/MsoBarType.hpp>
-+
-+#include "vbacommandbar.hxx"
-+#include "vbacommandbarcontrols.hxx"
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw (uno::RuntimeException) : CommandBar_BASE( xParent, xContext )
-+{
-+    // it's a menu bar
-+    // only supporting factory menus ( no custom menus )
-+    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
-+    initCommandBar();
-+    switch( nModuleType )
-+    {
-+        case 0:
-+            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" );
-+            break;
-+        case 1:
-+            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
-+            break;
-+        default:
-+            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
-+    }
-+    getMenuSettings();
-+    m_bIsMenu = sal_True;
-+    m_bCustom = sal_False;
-+}
-+ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw (uno::RuntimeException) :  CommandBar_BASE( xParent, xContext )
-+{
-+    // it's a tool bar
-+    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
-+    initCommandBar();
-+    m_bTemporary = bTemporary;
-+    m_bCreate = bCreate;
-+    // get OOo ToolBarName
-+    CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
-+    if( iter != mCommandBarNameMap.end() )
-+    {
-+        m_sToolBarName = iter->second;
-+    }
-+    else
-+    {
-+        m_sToolBarName = sToolBarName;
-+    }
-+    m_sUIName = m_sToolBarName;
-+    m_bIsMenu = sal_False;
-+    getToolBarSettings( m_sToolBarName );
-+}
-+void
-+ScVbaCommandBar::initCommandBar() throw (uno::RuntimeException)
-+{
-+    m_pScVbaCommandBars = dynamic_cast< ScVbaCommandBars* >( m_xParentHardRef.get() );
-+    if ( !m_pScVbaCommandBars )
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBars"), uno::Reference< uno::XInterface >() );
-+    m_bIsMenu = sal_False;
-+    m_bCustom = sal_False;
-+    m_bTemporary = sal_True;
-+    m_sToolBarName = rtl::OUString::createFromAscii("");
-+    m_sUIName = rtl::OUString::createFromAscii("");
-+    m_sMenuModuleName = m_pScVbaCommandBars->GetModuleName();
-+}
-+void
-+ScVbaCommandBar::getToolBarSettings( rtl::OUString sToolBarName ) throw( uno::RuntimeException )
-+{
-+    rtl::OUString sFactoryToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/") + sToolBarName.toAsciiLowerCase();
-+    rtl::OUString sCustomToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/custom_toolbar_") + sToolBarName;
-+    uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+    uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
-+    m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_pScVbaCommandBars->GetModuleName() ), uno::UNO_QUERY_THROW );
-+    m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
-+    if( m_xUICfgManager->hasSettings( sFactoryToolBar ) )
-+    {
-+        // exsiting standard ToolBar
-+        m_xBarSettings.set( m_xUICfgManager->getSettings( sFactoryToolBar, sal_True ), uno::UNO_QUERY_THROW );
-+        m_sToolBarName = sFactoryToolBar;
-+    }
-+    else if( m_xUICfgManager->hasSettings( sCustomToolBar ) )
-+    {
-+        // exisiting custom ToolBar
-+        m_xBarSettings.set( m_xUICfgManager->getSettings( sCustomToolBar, sal_True ), uno::UNO_QUERY_THROW );
-+        m_sToolBarName = sCustomToolBar;
-+        m_bCustom = sal_True;
-+    }
-+    else if( m_bCreate )
-+    {
-+        // new custom ToolBar
-+        m_xBarSettings.set( m_xUICfgManager->createSettings(), uno::UNO_QUERY_THROW );
-+        m_sToolBarName = sCustomToolBar;
-+        m_bCustom = sal_True;
-+        addCustomBar();
-+    }
-+    else
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii("ToolBar do not exist"), uno::Reference< uno::XInterface >() );
-+    if( m_pScVbaCommandBars->GetWindows()->hasByName( m_sToolBarName ) )
-+    {
-+        uno::Any aToolBar = m_pScVbaCommandBars->GetWindows()->getByName( m_sToolBarName );
-+        aToolBar >>= m_aToolBar; 
-+    }
-+}
-+void
-+ScVbaCommandBar::addCustomBar()
-+{
-+    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
-+    xPropertySet->setPropertyValue(rtl::OUString::createFromAscii("UIName"), uno::makeAny( m_sUIName ));
-+
-+    if( m_xUICfgManager->hasSettings(m_sToolBarName) )
-+    {
-+        m_xUICfgManager->replaceSettings( m_sToolBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+    }
-+    else
-+    {
-+        m_xUICfgManager->insertSettings( m_sToolBarName,  uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+    }
-+    if( !m_bTemporary )
-+    {
-+        m_xUICfgPers->store();
-+    }
-+}
-+void 
-+ScVbaCommandBar::getMenuSettings()
-+{
-+    try
-+    {
-+        rtl::OUString sMenuBar = rtl::OUString::createFromAscii( "private:resource/menubar/menubar" );
-+        uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+        uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
-+        m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_sMenuModuleName ), uno::UNO_QUERY_THROW );
-+        m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
-+        m_xBarSettings.set( m_xUICfgManager->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW );
-+    } 
-+    catch ( uno::Exception e)
-+    {
-+        OSL_TRACE( "getMenuSetting got a error\n" );
-+    }
-+}
-+::rtl::OUString SAL_CALL
-+ScVbaCommandBar::getName() throw ( uno::RuntimeException )
-+{
-+    // This will get a "NULL length string" when Name is not set. 
-+    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
-+    uno::Any aName = xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") );
-+    rtl::OUString sName;
-+    aName >>= sName;
-+    if( sName.getLength() < 1 && !m_bIsMenu )
-+    {
-+        uno::Reference< container::XNameAccess > xNameAccess( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
-+        if( xNameAccess->hasByName( m_sToolBarName ) )
-+        {
-+            beans::PropertyValues aToolBar; 
-+            xNameAccess->getByName( m_sToolBarName ) >>= aToolBar;
-+            sal_Int32 nCount = aToolBar.getLength();
-+            beans::PropertyValue aPropertyValue;
-+            for( sal_Int32 i = 0; i < nCount; i++ )
-+            {
-+                aPropertyValue = aToolBar[i];
-+                if( aPropertyValue.Name.equals( rtl::OUString::createFromAscii("UIName") ) )
-+                {
-+                    aPropertyValue.Value >>= sName;
-+                    return sName;
-+                }
-+            }
-+        }
-+    }
-+    return sName;
-+}
-+void SAL_CALL 
-+ScVbaCommandBar::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
-+    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("UIName"), uno::makeAny( _name ) );
-+    uno::Reference< container::XIndexAccess > xIndexAccess( m_xBarSettings, uno::UNO_QUERY_THROW );
-+    
-+    if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
-+    {
-+        m_xUICfgManager->replaceSettings( m_sToolBarName, xIndexAccess );
-+    }
-+    else
-+    {
-+        // toolbar not found
-+    }
-+    if( !m_bTemporary )
-+    {
-+        m_xUICfgPers->store();
-+    }
-+}
-+::sal_Bool SAL_CALL 
-+ScVbaCommandBar::getVisible() throw (uno::RuntimeException)
-+{
-+    sal_Bool bVisible = sal_False;
-+    try
-+    {
-+        sal_Int32 i = 0;
-+        while( !m_aToolBar[i].Name.equals( rtl::OUString::createFromAscii( "Visible" ) ) )
-+        {
-+            i++;
-+        }
-+        m_aToolBar[i].Value >>= bVisible;
-+    }
-+    catch ( uno::Exception e )
-+    {
-+    }
-+    return bVisible;
-+}
-+void SAL_CALL 
-+ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
-+{
-+    try
-+    {
-+        uno::Reference< frame::XFrame > xFrame( getCurrentDocument()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); 
-+        uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
-+        uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW );
-+        if( _visible )
-+        {
-+            xLayoutManager->createElement( m_sToolBarName );
-+            xLayoutManager->showElement( m_sToolBarName );
-+        }
-+        else
-+        {
-+            xLayoutManager->hideElement( m_sToolBarName );
-+            xLayoutManager->destroyElement( m_sToolBarName );
-+        }
-+    }
-+    catch( uno::Exception e )
-+    {
-+        OSL_TRACE( "SetVisible get an exception\n" );
-+    }
-+}
-+void SAL_CALL 
-+ScVbaCommandBar::Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
-+{
-+    if( m_bCustom )
-+    {
-+        if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
-+        {
-+            m_xUICfgManager->removeSettings(m_sToolBarName);
-+            // make it permanent
-+            if( !m_bTemporary )
-+            {
-+                m_xUICfgPers->store();
-+            }
-+        }
-+        else
-+        {
-+            // toolbar not found
-+            // TODO throw Error
-+        }
-+        uno::Reference< container::XNameContainer > xNameContainer( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
-+        if( xNameContainer->hasByName( m_sToolBarName ) )
-+        {
-+            xNameContainer->removeByName( m_sToolBarName );
-+        }
-+    }
-+}
-+uno::Any SAL_CALL 
-+ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    sal_Int32 nIndex;
-+    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
-+    if( aIndex.hasValue() )
-+    {
-+        if( aIndex >>= nIndex )
-+        {
-+            uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
-+            return uno::makeAny( xCommandBarControl );
-+        }
-+        else
-+            throw uno::RuntimeException( rtl::OUString::createFromAscii(  "invalid index" ), uno::Reference< uno::XInterface >() );
-+    }
-+    return uno::makeAny( xCommandBarControls );
-+}
-+
-+sal_Int32 SAL_CALL
-+ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // #FIXME support msoBarTypePopup
-+    sal_Int32 nType = office::MsoBarType::msoBarTypePopup;
-+    nType = m_bIsMenu? office::MsoBarType::msoBarTypeNormal : office::MsoBarType::msoBarTypeMenuBar;
-+    return nType;
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // alwayse fail to find control
-+    return uno::makeAny( uno::Reference< XCommandBarControl > () );
-+}
-+
-+rtl::OUString& 
-+ScVbaCommandBar::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBar") );
-+	return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaCommandBar::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBar" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/vbahelper/vbacommandbar.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbacommandbar.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,107 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_COMMANDBAR_HXX
-+#define SC_VBA_COMMANDBAR_HXX
-+
-+#include <ooo/vba/XCommandBar.hpp>
-+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
-+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-+#include <com/sun/star/container/XIndexContainer.hpp>
-+#include <com/sun/star/beans/PropertyValues.hpp>
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include "vbacommandbars.hxx"
-+
-+#include <map>
-+typedef std::map< const rtl::OUString, rtl::OUString > CommandBarNameMap;
-+typedef std::pair< const rtl::OUString, rtl::OUString > CommandBarNamePair;
-+const CommandBarNamePair namePair[] = { 
-+    CommandBarNamePair(  rtl::OUString::createFromAscii("standard"), rtl::OUString::createFromAscii("standardbar") ),
-+    CommandBarNamePair(  rtl::OUString::createFromAscii("formatting"), rtl::OUString::createFromAscii("formatobjectbar") ),
-+};
-+static const CommandBarNameMap mCommandBarNameMap( namePair, ( namePair + sizeof(namePair) / sizeof(namePair[0]) ) );
-+
-+
-+typedef InheritedHelperInterfaceImpl1< ov::XCommandBar > CommandBar_BASE;
-+
-+class ScVbaCommandBar : public CommandBar_BASE
-+{
-+private:
-+    rtl::OUString       m_sToolBarName;
-+    rtl::OUString       m_sMenuModuleName;
-+    rtl::OUString       m_sUIName;
-+    sal_Bool            m_bTemporary;
-+    sal_Bool            m_bIsMenu;
-+    sal_Bool            m_bCustom;
-+    sal_Bool            m_bCreate;
-+    ScVbaCommandBars*   m_pScVbaCommandBars;
-+    css::beans::PropertyValues  m_aToolBar;
-+    // hard reference for parent
-+    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
-+    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
-+    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
-+    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
-+    void initCommandBar() throw( css::uno::RuntimeException );
-+protected:
-+    void getToolBarSettings( rtl::OUString sToolBarName ) throw( css::uno::RuntimeException );
-+    void getMenuSettings();
-+    void addCustomBar();
-+public:
-+    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw( css::uno::RuntimeException );
-+    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw( css::uno::RuntimeException );
-+    
-+    sal_Bool IsMenu() { return m_bIsMenu; };
-+    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
-+    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
-+    css::uno::Reference< css::container::XIndexContainer > GetBarSettings() { return m_xBarSettings; };
-+    rtl::OUString GetToolBarName() { return m_sToolBarName; };
-+
-+    // Attributes
-+    virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setName( const ::rtl::OUString& _name ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
-+
-+    // Methods
-+    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL Type(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif//SC_VBA_COMMANDBAR_HXX
---- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbacommandbarcontrol.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,453 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbacommandbarcontrol.hxx"
-+#include <basic/sbstar.hxx>
-+#include <basic/sbmod.hxx>
-+#include <basic/sbmeth.hxx>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName )
-+{
-+    sal_Int32 nCount = aPropertyValues.getLength();
-+    for( sal_Int32 i = 0; i < nCount; i++ )
-+    {
-+        if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
-+        {
-+            return aPropertyValues[i].Value;
-+        }
-+    }
-+    return uno::Any();
-+}
-+
-+beans::PropertyValues lcl_repalcePropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName, uno::Any aValue )
-+{
-+    sal_Int32 nCount = aPropertyValues.getLength();
-+    for( sal_Int32 i = 0; i < nCount; i++ )
-+    {
-+        if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
-+        {
-+            aPropertyValues[i].Value = aValue;
-+            return aPropertyValues;
-+        }
-+    }
-+    return aPropertyValues;
-+}
-+
-+ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Int32 nType ) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_sName( sName ), m_nPosition( nPosition ), m_nType( nType )
-+{
-+    // exsiting CommandBarBarControl
-+    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
-+    initObjects();
-+    if( m_xBarSettings->hasElements() )
-+    {
-+        ScVbaCommandBarControl* pParentCommandBarControl = m_pCommandBarControls->GetParentCommandBarControl();
-+        if( pParentCommandBarControl )
-+        {
-+            beans::PropertyValues aPropertyValues;
-+            pParentCommandBarControl->GetCurrentSettings()->getByIndex( pParentCommandBarControl->GetPosition() ) >>= aPropertyValues;
-+            pParentCommandBarControl->SetPropertyValues( aPropertyValues );
-+            m_xCurrentSettings.set( lcl_getPropertyValue( pParentCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY_THROW );
-+        }
-+        if( !m_xCurrentSettings.is() )
-+        {
-+            m_xCurrentSettings.set( m_xUICfgManager->getSettings( m_pCommandBarControls->GetParentToolBarName(), sal_True ), uno::UNO_QUERY_THROW );
-+        }
-+    }
-+    if( m_bIsMenu )
-+    {
-+        m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
-+    }
-+    else
-+    {
-+        m_sBarName = m_pCommandBarControls->GetParentToolBarName();
-+    }
-+    m_bTemporary = sal_True;
-+}
-+ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType) throw (uno::RuntimeException) :  CommandBarControl_BASE( xParent, xContext ), m_nPosition( nPosition ), m_bTemporary( bTemporary ), m_nType( nType )
-+{
-+    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
-+    initObjects();
-+    if( sName.getLength() > 0 )
-+    {
-+        m_sName = sName;
-+    }
-+    m_sCommand = rtl::OUString::createFromAscii("vnd.openoffice.org:") + sName;
-+    if( m_bIsMenu )
-+    {
-+        m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
-+        createNewMenuBarControl();
-+    }
-+    else
-+    {
-+        m_sBarName = m_pCommandBarControls->GetParentToolBarName();
-+        createNewToolBarControl();
-+    }
-+}
-+
-+void
-+ScVbaCommandBarControl::initObjects() throw (uno::RuntimeException)
-+{
-+    m_pCommandBarControls = dynamic_cast< ScVbaCommandBarControls* >( m_xParentHardRef.get() );
-+    if( !m_pCommandBarControls )
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBarControls"), uno::Reference< uno::XInterface >() );
-+    m_xUICfgManager.set( m_pCommandBarControls->GetUICfgManager(), uno::UNO_QUERY_THROW );
-+    m_xUICfgPers.set( m_pCommandBarControls->GetUICfgPers(), uno::UNO_QUERY_THROW );
-+    m_xBarSettings.set( m_pCommandBarControls->GetBarSettings(), uno::UNO_QUERY_THROW );
-+    m_bIsMenu = m_pCommandBarControls->IsMenu();
-+    m_sName = rtl::OUString::createFromAscii( "Custom" );
-+}
-+
-+void
-+ScVbaCommandBarControl::createNewMenuBarControl()
-+{
-+    uno::Reference< lang::XSingleComponentFactory > xMenuMSF( m_xBarSettings, uno::UNO_QUERY_THROW );
-+
-+    uno::Sequence< beans::PropertyValue > aPropertys;
-+    if( m_nType == office::MsoControlType::msoControlPopup )
-+        aPropertys = uno::Sequence< beans::PropertyValue >( 4 );
-+    else
-+        aPropertys = uno::Sequence< beans::PropertyValue >( 3 );
-+
-+    aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
-+    aPropertys[0].Value <<= m_sCommand; 
-+    aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
-+    aPropertys[1].Value <<= m_sName; 
-+    aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
-+    aPropertys[2].Value <<= sal_Int32(0); 
-+
-+    if( m_nType == office::MsoControlType::msoControlPopup )
-+    {
-+        aPropertys[3].Name = rtl::OUString::createFromAscii("ItemDescriptorContainer");
-+        aPropertys[3].Value <<= xMenuMSF->createInstanceWithContext( mxContext );
-+    }    
-+
-+    if( m_pCommandBarControls->GetParentCommandBar() != NULL )
-+    {
-+        // create a new menu
-+        m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
-+        m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
-+    }
-+    else if( m_pCommandBarControls->GetParentCommandBarControl() != NULL )
-+    {
-+        // create a new menu entry
-+        ScVbaCommandBarControl* pPc = m_pCommandBarControls->GetParentCommandBarControl();
-+        beans::PropertyValues aPropertyValues;
-+        pPc->GetCurrentSettings()->getByIndex( pPc->GetPosition() ) >>= aPropertyValues;
-+        pPc->SetPropertyValues( aPropertyValues );
-+        
-+        // has the property already been set?
-+        if( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ).hasValue() )
-+        {
-+            lcl_repalcePropertyValue(  pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer"), uno::makeAny( xMenuMSF->createInstanceWithContext( mxContext ) ) );
-+            pPc->GetCurrentSettings()->replaceByIndex( pPc->GetPosition(), uno::makeAny( pPc->GetPropertyValues() ) );
-+        }
-+        m_xCurrentSettings.set( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY_THROW );
-+        m_xCurrentSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
-+    }
-+    if( m_xUICfgManager->hasSettings( m_sBarName ) )
-+    {
-+        m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+    }
-+    else
-+    {
-+        m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+    }
-+    if( !m_bTemporary )
-+    {
-+        m_xUICfgPers->store();
-+    }
-+}
-+
-+void
-+ScVbaCommandBarControl::createNewToolBarControl()
-+{
-+    uno::Sequence< beans::PropertyValue > aPropertys(4);
-+    aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
-+    aPropertys[0].Value <<= m_sCommand; 
-+    aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
-+    aPropertys[1].Value <<= m_sName; 
-+    aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
-+    aPropertys[2].Value <<= sal_Int32(0); 
-+    aPropertys[3].Name = rtl::OUString::createFromAscii("IsVisible");
-+    aPropertys[3].Value <<= sal_True; 
-+
-+    m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
-+    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
-+    rtl::OUString sUIName;
-+    xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") ) >>= sUIName;
-+
-+    m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
-+    if( m_xUICfgManager->hasSettings( m_sBarName ) )
-+    {
-+        m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+    }
-+    else
-+    {
-+        m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+    }
-+    if( !m_bTemporary )
-+    {
-+        m_xUICfgPers->store();
-+    }
-+}
-+
-+::rtl::OUString SAL_CALL
-+ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException )
-+{
-+    // "Label" always empty
-+    rtl::OUString sCaption;
-+    beans::PropertyValues aPropertyValues;
-+    if( m_xCurrentSettings.is() )
-+    {
-+        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
-+        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
-+    }
-+    else if( m_xBarSettings.is() )
-+    {
-+        m_xBarSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
-+        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
-+    }
-+    return sCaption;
-+}
-+void SAL_CALL 
-+ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
-+{
-+    if( m_xCurrentSettings.is() )
-+    {
-+        beans::PropertyValues aPropertyValues;
-+        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
-+        beans::PropertyValues aNewPropertyValues;
-+        aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label"), uno::makeAny( _caption ) );
-+        m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
-+        if( m_xUICfgManager->hasSettings( m_sBarName ) )
-+        {
-+            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+        }
-+        else
-+        {
-+            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+        }
-+        // make it permanent
-+        if( !m_bTemporary )
-+        {
-+            m_xUICfgPers->store();
-+        }
-+    }
-+}
-+::rtl::OUString SAL_CALL 
-+ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException)
-+{
-+    if( m_xCurrentSettings.is() )
-+    {
-+        beans::PropertyValues aPropertyValues;
-+        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
-+        rtl::OUString sCommandURL;
-+        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
-+        return sCommandURL;
-+    }
-+    return ::rtl::OUString();
-+}
-+void SAL_CALL 
-+ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException)
-+{
-+    if( m_xCurrentSettings.is() )
-+    {
-+        // convert the comand url into something like vnd.sun.star.script:Standard.testMacro.Macro1?language=Basic&location=document
-+        rtl::OUString aCommandURL;
-+        rtl::OUString sScheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
-+        SbModule* pModule = StarBASIC::GetActiveModule();
-+        if( pModule )
-+        {
-+            String sTmp = _onaction;
-+            if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pModule->Find( sTmp, SbxCLASS_METHOD ) ) )
-+            {
-+                if(  pMethod )
-+                {
-+                        sTmp.Insert( '.', 0 ).Insert( pModule->GetName(), 0 ).Insert( '.', 0 ).Insert( pModule->GetParent()->GetName(), 0 );
-+                }
-+            }
-+
-+            rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
-+            aCommandURL = sScheme.concat( sTmp ).concat( sUrlPart2 );
-+            OSL_TRACE("**** METHOD IS %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
-+        }
-+        else
-+        {
-+            aCommandURL = _onaction;
-+        }
-+		OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
-+        beans::PropertyValues aPropertyValues;
-+        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
-+        beans::PropertyValues aNewPropertyValues;
-+        aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
-+        m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
-+        if( m_xUICfgManager->hasSettings( m_sBarName ) )
-+        {
-+            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+        }
-+        else
-+        {
-+            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+        }
-+        // make it permanent
-+        if( !m_bTemporary )
-+        {
-+            m_xUICfgPers->store();
-+        }
-+    }
-+}
-+::sal_Bool SAL_CALL 
-+ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException)
-+{
-+    // not possible in UNO?
-+    return sal_True;
-+}
-+void SAL_CALL 
-+ScVbaCommandBarControl::setVisible( ::sal_Bool /*_visible*/ ) throw (uno::RuntimeException)
-+{
-+    // "IsVisilbe"
-+}
-+void SAL_CALL 
-+ScVbaCommandBarControl::Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
-+{
-+    if( m_xCurrentSettings.is() )
-+    {
-+        m_xCurrentSettings->removeByIndex( m_nPosition );
-+
-+        if( m_xUICfgManager->hasSettings( m_sBarName ) )
-+        {
-+            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+        }
-+        else
-+        {
-+            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+        }
-+        // make it permanent
-+        if( !m_bTemporary )
-+        {
-+            m_xUICfgPers->store();
-+        }
-+    }
-+}
-+uno::Any SAL_CALL 
-+ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    sal_Int32 nIndex;
-+    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
-+    if( aIndex.hasValue() )
-+    {
-+        if( aIndex >>= nIndex )
-+        {
-+            uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
-+            return uno::makeAny( xCommandBarControl );
-+        }
-+        else
-+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "invalid index" ), uno::Reference< uno::XInterface >() );
-+    }
-+    return uno::makeAny( xCommandBarControls );
-+}
-+rtl::OUString& 
-+ScVbaCommandBarControl::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControl") );
-+	return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaCommandBarControl::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControl" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+//////////// ScVbaCommandBarPopup //////////////////////////////
-+ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlPopup )
-+{
-+}
-+
-+ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlPopup) 
-+{
-+}
-+
-+rtl::OUString& 
-+ScVbaCommandBarPopup::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarPopup") );
-+	return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaCommandBarPopup::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarPopup" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+//////////// ScVbaCommandBarButton //////////////////////////////
-+ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlButton )
-+{
-+}
-+
-+ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlButton) 
-+{
-+}
-+
-+rtl::OUString& 
-+ScVbaCommandBarButton::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarButton") );
-+	return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaCommandBarButton::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarButton" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/source/vbahelper/vbacommandbarcontrol.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbacommandbarcontrol.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_COMMANDBARCONTROL_HXX
-+#define SC_VBA_COMMANDBARCONTROL_HXX
-+
-+#include <ooo/vba/XCommandBarControl.hpp>
-+#include <ooo/vba/XCommandBarPopup.hpp>
-+#include <ooo/vba/XCommandBarButton.hpp>
-+#include <ooo/vba/office/MsoControlType.hpp>
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include "vbacommandbarcontrols.hxx"
-+
-+typedef InheritedHelperInterfaceImpl1< ov::XCommandBarControl > CommandBarControl_BASE;
-+
-+class ScVbaCommandBarControl : public CommandBarControl_BASE
-+{
-+private:
-+    rtl::OUString       m_sName;
-+    rtl::OUString       m_sBarName;
-+    rtl::OUString       m_sCommand;
-+    sal_Int32           m_nType;
-+    sal_Int32           m_nPosition;
-+    sal_Bool            m_bTemporary;
-+    sal_Bool            m_bIsMenu;
-+    ScVbaCommandBarControls*        m_pCommandBarControls;
-+    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
-+    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
-+    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
-+    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
-+    css::uno::Reference< css::container::XIndexContainer >          m_xCurrentSettings;
-+    css::beans::PropertyValues                                      m_aPropertyValues;
-+    
-+    void initObjects() throw (css::uno::RuntimeException);
-+    void createNewMenuBarControl();
-+    void createNewToolBarControl();
-+public:
-+    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
-+    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
-+    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
-+    css::uno::Reference< css::container::XIndexContainer >  GetBarSettings() { return m_xBarSettings; };
-+    sal_Bool IsMenu() { return m_bIsMenu; };
-+    sal_Int32 GetPosition() { return m_nPosition; };
-+    css::uno::Reference< css::container::XIndexContainer > GetCurrentSettings() { return m_xCurrentSettings; };
-+    css::beans::PropertyValues GetPropertyValues() { return m_aPropertyValues; };
-+    void SetPropertyValues( css::beans::PropertyValues aPropertyValues ) { m_aPropertyValues = aPropertyValues; };
-+    
-+    // Attributes
-+    virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException);
-+    virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
-+
-+    // Methods
-+    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarPopup > CommandBarPopup_BASE;
-+class ScVbaCommandBarPopup : public CommandBarPopup_BASE
-+{
-+public:
-+    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarButton > CommandBarButton_BASE;
-+class ScVbaCommandBarButton : public CommandBarButton_BASE
-+{
-+public:
-+    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif//SC_VBA_COMMANDBARCONTROL_HXX
---- vbahelper/source/vbahelper/vbacommandbarcontrols.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbacommandbarcontrols.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,348 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbacommandbarcontrols.hxx"
-+#include "vbacommandbarcontrol.hxx"
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName );
-+
-+typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarControlEnumeration_BASE;
-+class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE
-+{
-+    //uno::Reference< uno::XComponentContext > m_xContext;
-+    ScVbaCommandBarControls* m_pCommandBarControls;
-+    sal_Int32 m_nCurrentPosition;
-+public:
-+    CommandBarControlEnumeration( ScVbaCommandBarControls* pCommandBarControls ) : m_pCommandBarControls( pCommandBarControls ), m_nCurrentPosition( 0 ) {}
-+    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
-+    {
-+        if( m_nCurrentPosition < m_pCommandBarControls->getCount() )
-+            return sal_True;
-+        return sal_False;
-+    }
-+    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
-+    {
-+        if( hasMoreElements() )
-+        {
-+            rtl::OUString sName = m_pCommandBarControls->GetControlNameByIndex( m_nCurrentPosition );
-+            m_nCurrentPosition = m_nCurrentPosition + 1;
-+            if( sName.getLength() > 0 )
-+                return m_pCommandBarControls->createCollectionObject( uno::makeAny( sName ) );
-+            else
-+                return nextElement();
-+        }
-+        else
-+            throw container::NoSuchElementException();
-+    }
-+};
-+
-+ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess> xIndexAccess ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess )
-+{
-+    m_bIsMenu = sal_False;
-+    m_bHasElements = sal_False;
-+    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
-+    m_pCommandBar = dynamic_cast< ScVbaCommandBar* >( m_xParentHardRef.get() );
-+    m_pCommandBarControl = dynamic_cast< ScVbaCommandBarControl* >( m_xParentHardRef.get() );
-+    if( m_pCommandBar )
-+    {
-+        m_xUICfgManager.set( m_pCommandBar->GetUICfgManager(), uno::UNO_QUERY_THROW );
-+        m_xUICfgPers.set( m_pCommandBar->GetUICfgPers(), uno::UNO_QUERY_THROW );
-+        m_xBarSettings.set( m_pCommandBar->GetBarSettings(), uno::UNO_QUERY_THROW );
-+        m_bIsMenu = m_pCommandBar->IsMenu();
-+        if( m_xBarSettings->hasElements() )
-+        {
-+            m_bHasElements = sal_True;
-+        }
-+    }
-+    else if( m_pCommandBarControl )
-+    {
-+        m_xUICfgManager.set( m_pCommandBarControl->GetUICfgManager(), uno::UNO_QUERY_THROW );
-+        m_xUICfgPers.set( m_pCommandBarControl->GetUICfgPers(), uno::UNO_QUERY_THROW );
-+        beans::PropertyValues aPropertyValues;
-+        m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
-+        m_pCommandBarControl->SetPropertyValues( aPropertyValues );
-+        m_xBarSettings.set( m_pCommandBarControl->GetCurrentSettings(), uno::UNO_QUERY_THROW );
-+
-+        uno::Any aValue = lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") );
-+        if( aValue.hasValue() )
-+        {
-+            m_xCurrentSettings = m_pCommandBarControl->GetCurrentSettings();
-+            m_bHasElements = sal_True;
-+        }
-+        else
-+        {
-+            m_bHasElements = sal_False;
-+        }
-+        m_bIsMenu = m_pCommandBarControl->IsMenu();
-+    }
-+    else
-+    {
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parent needs to be a ScVbaCommandBar or a ScVbaCommandBarControl"), uno::Reference< uno::XInterface >() );
-+    }
-+}
-+rtl::OUString
-+ScVbaCommandBarControls::GetControlNameByIndex( const sal_Int32 nIndex ) throw ( uno::RuntimeException )
-+{
-+    sal_Int32 nCount = 0;
-+    if( m_bHasElements )
-+    {
-+        sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
-+        for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
-+        {
-+            beans::PropertyValues aMenuValues;
-+            m_xBarSettings->getByIndex( i ) >>= aMenuValues;
-+            for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
-+            {
-+                if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
-+                {
-+                    nCount++;
-+                    if( nIndex == nCount )
-+                    {
-+                        rtl::OUString sCommandURL;
-+                        aMenuValues[j].Value >>= sCommandURL;
-+                        sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
-+                        if( ( nLastIndex != -1 ) && ( ( nLastIndex +1 ) < sCommandURL.getLength() ) )
-+                        {
-+                            sCommandURL = sCommandURL.copy( nLastIndex + 1 );
-+                            return sCommandURL;
-+                        }
-+                    }
-+                }
-+            }
-+        } 
-+    }
-+    else
-+        throw  uno::RuntimeException( rtl::OUString::createFromAscii( "Out of bound" ), uno::Reference< uno::XInterface >() );
-+    return rtl::OUString();
-+}
-+
-+// Attributes
-+sal_Int32 SAL_CALL 
-+ScVbaCommandBarControls::getCount() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nCount = 0;
-+    if( m_bHasElements )
-+    {
-+        sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
-+        for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
-+        {
-+            beans::PropertyValues aMenuValues;
-+            m_xBarSettings->getByIndex( i ) >>= aMenuValues;
-+            for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
-+            {
-+                if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
-+                {
-+                    nCount++;
-+                }
-+            }
-+        } 
-+    }
-+    return nCount;
-+}
-+// XEnumerationAccess
-+uno::Type SAL_CALL
-+ScVbaCommandBarControls::getElementType() throw ( uno::RuntimeException )
-+{
-+    return XCommandBarControls::static_type( 0 );
-+}
-+uno::Reference< container::XEnumeration >
-+ScVbaCommandBarControls::createEnumeration() throw ( uno::RuntimeException )
-+{
-+    return uno::Reference< container::XEnumeration >( new CommandBarControlEnumeration( this ) );
-+}
-+uno::Any
-+ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
-+{
-+    // only surport the aSource as a name string, because this class is a API wrapper
-+    rtl::OUString sName;
-+    if( aSource >>= sName )
-+    {
-+        uno::Reference< container::XIndexContainer > xCurrentSettings;
-+        beans::PropertyValues aPropertyValues;
-+        if( m_pCommandBarControl )
-+        {
-+            m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
-+            xCurrentSettings.set( lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY );
-+            if( !xCurrentSettings.is() )
-+            {
-+                xCurrentSettings.set( m_xUICfgManager->getSettings( GetParentToolBarName(), sal_True ), uno::UNO_QUERY );
-+            }
-+        }
-+
-+        sal_Int32 nPosition = -1;
-+        for( sal_Int32 i = 0; i < xCurrentSettings->getCount(); i++ )
-+        {
-+            xCurrentSettings->getByIndex( i ) >>= aPropertyValues;
-+            // Label always empty in OOo
-+            rtl::OUString sLabel;
-+            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
-+            if( sLabel.equalsIgnoreAsciiCase( sName ) )
-+            {
-+                nPosition = i;
-+                break;
-+            }
-+            // using CammandURL to find
-+            rtl::OUString sCommandURL;
-+            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
-+            sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
-+            if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sCommandURL.getLength() ) )
-+            {
-+                sCommandURL = sCommandURL.copy( nLastIndex + 1 );
-+            }
-+            if( sCommandURL.equalsIgnoreAsciiCase( sName ) )
-+            {
-+                nPosition = i;
-+                break;
-+            }
-+        }
-+
-+        if( nPosition  != -1 )
-+        {
-+            uno::Reference< container::XIndexContainer > xSubMenu;
-+            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ) >>= xSubMenu;
-+            ScVbaCommandBarControl* pNewCommandBarControl = NULL;
-+            if( xSubMenu.is() )
-+                pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sName, nPosition );
-+            else
-+                pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sName, nPosition );
-+
-+            return uno::makeAny( uno::Reference< XCommandBarControl > ( pNewCommandBarControl ) );
-+        }
-+        else
-+            throw uno::RuntimeException( rtl::OUString::createFromAscii("The CommandBarControl do not exist"), uno::Reference< uno::XInterface >() );
-+        
-+    }
-+    return uno::Any();
-+}
-+
-+// Methods
-+uno::Any SAL_CALL 
-+ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*/ ) throw (uno::RuntimeException)
-+{
-+    if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
-+    {
-+        return createCollectionObject( aIndex );
-+    } 
-+    sal_Int32 nIndex = 0;
-+    if( aIndex >>= nIndex )
-+    {
-+        return createCollectionObject( uno::makeAny( GetControlNameByIndex( nIndex ) ) );
-+    }
-+    
-+    return uno::Any();
-+}
-+uno::Reference< XCommandBarControl > SAL_CALL 
-+ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& /*Parameter*/, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // Parameter is not supported
-+    // the following name needs to be individually created;
-+    rtl::OUString sCaption( rtl::OUString::createFromAscii("custom Control") );
-+    rtl::OUString sCommand( rtl::OUString::createFromAscii("macro:///Standard.Module1.Test()") );
-+    sal_Int32 nType =0;
-+    sal_Int32 nPosition = 0;
-+    sal_Int32 nId;
-+    sal_Bool bTemporary = sal_True;
-+    
-+    if( Type.hasValue() )
-+        if( Type >>= nType )
-+        {
-+            // evalute the type of the new control
-+        }
-+    if( Id.hasValue() )
-+        if( Id >>= nId )
-+        {
-+            // evalute the action of the new control
-+        }
-+    if( Before.hasValue() )
-+        Before >>= nPosition;
-+    else
-+    {
-+        // if Before is ignore, the new control should be placed at the end of the commandbars;
-+        if( m_pCommandBar )
-+            nPosition = getCount();
-+        else if ( m_pCommandBarControl )
-+        {
-+            css::uno::Reference< css::container::XIndexContainer > xCurrentSettings;
-+            xCurrentSettings.set( lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY );
-+            if( xCurrentSettings.is() )
-+            {
-+                nPosition = xCurrentSettings->getCount();
-+            }
-+        }
-+    }
-+    if( Temporary.hasValue() )
-+        if( Temporary >>= bTemporary )
-+        {
-+            // evalute the temporary of the new Control
-+        }
-+    
-+    ScVbaCommandBarControl* pNewCommandBarControl = NULL;
-+    if( nType == office::MsoControlType::msoControlButton )
-+    {
-+        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sCaption, nPosition, bTemporary );
-+    }
-+    else if ( nType == office::MsoControlType::msoControlPopup )
-+    {
-+        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sCaption, nPosition, bTemporary );
-+    }
-+    else
-+    {
-+        pNewCommandBarControl = new ScVbaCommandBarControl( this, mxContext, sCaption, nPosition, bTemporary );
-+    }
-+
-+    return uno::Reference< XCommandBarControl >( pNewCommandBarControl );
-+}
-+   
-+// XHelperInterface
-+rtl::OUString& 
-+ScVbaCommandBarControls::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControls") );
-+    return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaCommandBarControls::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControls" ) );
-+    }
-+    return aServiceNames;
-+}
-+
---- vbahelper/source/vbahelper/vbacommandbarcontrols.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbacommandbarcontrols.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,91 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_COMMANDBARCONTROLS_HXX
-+#define SC_VBA_COMMANDBARCONTROLS_HXX
-+
-+#include <ooo/vba/XCommandBarControls.hpp>
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include "vbacommandbar.hxx"
-+#include <vbahelper/vbacollectionimpl.hxx>
-+
-+class ScVbaCommandBarControl;
-+
-+typedef CollTestImplHelper< ov::XCommandBarControls > CommandBarControls_BASE;
-+
-+class ScVbaCommandBarControls : public CommandBarControls_BASE
-+{
-+private:
-+    sal_Bool                    m_bIsMenu;
-+    sal_Bool                    m_bHasElements;
-+    ScVbaCommandBar*            m_pCommandBar; 
-+    ScVbaCommandBarControl*     m_pCommandBarControl; 
-+    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
-+    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
-+    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
-+    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
-+    css::uno::Reference< css::container::XIndexContainer >          m_xCurrentSettings;
-+
-+public:
-+    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess ) throw( css::uno::RuntimeException );
-+    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
-+    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
-+    css::uno::Reference< css::container::XIndexContainer >  GetBarSettings() { return m_xBarSettings; };
-+    sal_Bool IsMenu() { return m_bIsMenu; };
-+    ScVbaCommandBar* GetParentCommandBar() { return m_pCommandBar; };
-+    ScVbaCommandBarControl* GetParentCommandBarControl() { return m_pCommandBarControl; };
-+    rtl::OUString GetParentToolBarName() 
-+    { 
-+        if( m_pCommandBar ) return m_pCommandBar->GetToolBarName();
-+        else return rtl::OUString();
-+    }
-+    rtl::OUString GetControlNameByIndex( const sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
-+
-+    // Attributes
-+    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
-+    // XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-+
-+    // Methods     
-+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); 
-+    virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif//SC_VBA_COMMANDBARCONTROLS_HXX
---- vbahelper/source/vbahelper/vbacommandbars.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbacommandbars.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,261 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include <com/sun/star/lang/XServiceInfo.hpp>
-+#include <com/sun/star/frame/XDesktop.hpp>
-+#include <com/sun/star/container/XNameAccess.hpp>
-+
-+#include "vbacommandbars.hxx"
-+#include "vbacommandbar.hxx"
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarEnumeration_BASE;
-+
-+static rtl::OUString sSpreadsheetDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
-+static rtl::OUString sTextDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" ) );
-+static rtl::OUString sWindowStateConfUrl( rtl::OUString::createFromAscii( "com.sun.star.ui.WindowStateConfiguration" ) );
-+
-+class CommandBarEnumeration : public CommandBarEnumeration_BASE
-+{
-+    uno::Reference< uno::XComponentContext > m_xContext;
-+    uno::Reference< XCommandBars > m_xCommandBars;
-+    uno::Sequence< rtl::OUString > m_sNames;
-+    sal_Int32 m_nCurrentPosition;
-+public:
-+    CommandBarEnumeration( const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBars > xCommandBars, const uno::Sequence< rtl::OUString > sNames ) : m_xContext( xContext ), m_xCommandBars( xCommandBars ), m_sNames( sNames ), m_nCurrentPosition( 0 )
-+    {
-+    }
-+    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
-+    {
-+        if( m_nCurrentPosition < m_sNames.getLength() )
-+            return sal_True;
-+        return sal_False;
-+    }
-+    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
-+    {
-+        if( hasMoreElements() )
-+        {
-+            rtl::OUString sName( m_sNames[ m_nCurrentPosition ] );
-+            m_nCurrentPosition = m_nCurrentPosition + 1;
-+            if( sName.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 ) 
-+            {
-+                sal_Int32 nLastIndex = sName.lastIndexOf( rtl::OUString::createFromAscii( "/" ) );
-+                if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sName.getLength() ) )
-+                {
-+                   sName = sName.copy( nLastIndex + 1);
-+                   if( sName.getLength() > 0 )
-+                   {
-+                        uno::Reference< XHelperInterface > xHelperInterface( m_xCommandBars, uno::UNO_QUERY_THROW );
-+                        uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( xHelperInterface, m_xContext, sName, sal_True, sal_False ) );
-+                        if( xCommandBar.is() )
-+                            return uno::makeAny( xCommandBar );
-+                        else
-+                            return nextElement();
-+                    }
-+                    else
-+                        return nextElement();
-+                    }
-+             }
-+             else
-+                return nextElement();
-+        }
-+        else
-+            throw container::NoSuchElementException();
-+        return uno::Any();
-+    }
-+};
-+
-+
-+ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess > xIndexAccess ) : CommandBars_BASE( xParent, xContext, xIndexAccess )
-+{
-+    retrieveObjects();
-+}
-+void
-+ScVbaCommandBars::retrieveObjects() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+    if( xServiceInfo->supportsService( sSpreadsheetDocumentUrl ) )
-+    {
-+        m_sModuleName = sSpreadsheetDocumentUrl;
-+    }
-+    else if( xServiceInfo->supportsService( sTextDocumentUrl ) )
-+    {
-+        m_sModuleName = sTextDocumentUrl;
-+    }
-+    else
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Unsupported Document" ), uno::Reference< uno::XInterface >() );
-+    
-+    uno::Reference < lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+    uno::Reference < container::XNameAccess > xNameAccess( xMSF->createInstance( sWindowStateConfUrl ), uno::UNO_QUERY_THROW );
-+    m_xNameAccess.set( xNameAccess->getByName( m_sModuleName ), uno::UNO_QUERY_THROW );
-+}
-+
-+// XEnumerationAccess
-+uno::Type SAL_CALL 
-+ScVbaCommandBars::getElementType() throw ( uno::RuntimeException )
-+{
-+    return XCommandBars::static_type( 0 );
-+}
-+uno::Reference< container::XEnumeration >
-+ScVbaCommandBars::createEnumeration() throw ( uno::RuntimeException )
-+{
-+    return uno::Reference< container::XEnumeration >( new CommandBarEnumeration( mxContext, this, m_xNameAccess->getElementNames() ) );
-+}
-+
-+uno::Any
-+ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
-+{
-+    // aSource should be a name at this time, because of the class is API wrapper.
-+    rtl::OUString sToolBarName;
-+    if( aSource >>= sToolBarName )
-+    {
-+        sToolBarName = sToolBarName.toAsciiLowerCase();
-+        if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Worksheet Menu Bar") ) )
-+        {
-+            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 0 ) ) );
-+        }
-+        else if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Menu Bar") ) )
-+        {
-+            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 1 ) ) );
-+        }
-+        else if( checkToolBarExist( sToolBarName ) )
-+        {
-+            return uno::makeAny( uno::Reference< XCommandBar > (new ScVbaCommandBar( this, mxContext, sToolBarName, sal_True, sal_False ) ) );
-+        }
-+    }
-+    return uno::Any();
-+}
-+
-+// XCommandBars
-+uno::Reference< XCommandBar > SAL_CALL 
-+ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
-+{
-+    // Position - MsoBar MenuBar - sal_Bool
-+    // Currently only the Name is supported.
-+    rtl::OUString sName;
-+    if( !( Name >>= sName ) )
-+    {
-+        sName = rtl::OUString::createFromAscii("Custom1");
-+    }
-+    sal_Bool bTemporary = false;
-+    if( !( Temporary >>= bTemporary ) )
-+    {
-+        bTemporary = sal_True;
-+    }
-+    return uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, sName.toAsciiLowerCase(), bTemporary, sal_True ) );
-+}
-+sal_Int32 SAL_CALL 
-+ScVbaCommandBars::getCount() throw(css::uno::RuntimeException)
-+{
-+    // Filter out all toolbars from the window collection
-+    sal_Int32 nCount = 0;
-+    uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
-+    for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
-+    {
-+        if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
-+        {
-+            nCount++;
-+        }
-+    }
-+    return nCount;
-+}
-+
-+// ScVbaCollectionBaseImpl
-+uno::Any SAL_CALL
-+ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
-+{
-+    if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
-+    {
-+        return createCollectionObject( aIndex );    
-+    }
-+
-+    // hardcode if "aIndex = 1" that would return "main menu".
-+    sal_Int16 nIndex = 0;
-+    aIndex >>= nIndex;
-+    if( nIndex == 1 )
-+    {
-+        uno::Any aSource;
-+        if( m_sModuleName.equalsIgnoreAsciiCase( sSpreadsheetDocumentUrl ) )
-+            aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" );
-+        else if( m_sModuleName.equalsIgnoreAsciiCase( sTextDocumentUrl ) )
-+            aSource <<= rtl::OUString::createFromAscii( "Menu Bar" );
-+        if( aSource.hasValue() )    
-+            return createCollectionObject( aSource );
-+    }
-+    return uno::Any();
-+}
-+
-+sal_Bool
-+ScVbaCommandBars::checkToolBarExist( rtl::OUString sToolBarName )
-+{
-+    CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
-+    if( iter != mCommandBarNameMap.end() )
-+    {
-+        return sal_True;
-+    }    
-+    uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
-+    for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
-+    {
-+        if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
-+        {
-+            if( allNames[i].indexOf( sToolBarName ) != -1 )
-+            {
-+                return sal_True;
-+            }
-+        }
-+    }
-+    return sal_False;
-+}
-+    
-+// XHelperInterface
-+rtl::OUString& 
-+ScVbaCommandBars::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBars") );
-+    return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaCommandBars::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBars" ) );
-+    }
-+    return aServiceNames;
-+}
-+
---- vbahelper/source/vbahelper/vbacommandbars.hxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbacommandbars.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,79 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_COMMANDBARS_HXX
-+#define SC_VBA_COMMANDBARS_HXX
-+
-+#include <ooo/vba/XCommandBar.hpp>
-+#include <ooo/vba/XCommandBars.hpp>
-+#include <com/sun/star/container/XNameAccess.hpp>
-+
-+#include <cppuhelper/implbase1.hxx>
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbacollectionimpl.hxx>
-+
-+typedef CollTestImplHelper< ov::XCommandBars > CommandBars_BASE;
-+
-+class ScVbaCommandBars : public CommandBars_BASE
-+{
-+private:
-+    css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
-+    rtl::OUString m_sModuleName;
-+    void retrieveObjects() throw( css::uno::RuntimeException );
-+public:
-+    ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess );
-+
-+    sal_Bool checkToolBarExist( rtl::OUString sToolBarName );
-+    rtl::OUString GetModuleName(){ return m_sModuleName; };
-+    css::uno::Reference< css::container::XNameAccess > GetWindows() 
-+    { 
-+        retrieveObjects();
-+        return m_xNameAccess; 
-+    };
-+    // XCommandBars
-+    virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    // XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-+
-+    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException);
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif//SC_VBA_COMMANDBARS_HXX
---- vbahelper/source/vbahelper/vbadocumentbase.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbadocumentbase.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,223 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <vbahelper/vbadocumentbase.hxx>
-+#include <vbahelper/helperdecl.hxx>
-+#include <comphelper/unwrapargs.hxx>
-+
-+#include <com/sun/star/util/XModifiable.hpp>
-+#include <com/sun/star/util/XProtectable.hpp>
-+#include <com/sun/star/util/XCloseable.hpp>
-+#include <com/sun/star/frame/XStorable.hpp>
-+#include <com/sun/star/frame/XFrame.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+
-+#include <tools/urlobj.hxx>
-+#include <osl/file.hxx>
-+
-+using namespace ::com::sun::star;
-+using namespace ::ooo::vba;
-+
-+VbaDocumentBase::VbaDocumentBase( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext) :VbaDocumentBase_BASE( xParent, xContext ), mxModel(NULL)
-+{
-+}
-+
-+VbaDocumentBase::VbaDocumentBase( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< frame::XModel > xModel ) : VbaDocumentBase_BASE( xParent, xContext ),  mxModel( xModel ) 
-+{ 
-+}
-+
-+VbaDocumentBase::VbaDocumentBase( uno::Sequence< uno::Any> const & args,
-+    uno::Reference< uno::XComponentContext> const & xContext ) : VbaDocumentBase_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ),  mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ) 
-+{
-+}
-+
-+::rtl::OUString
-+VbaDocumentBase::getName() throw (uno::RuntimeException)
-+{
-+	rtl::OUString sName = getModel()->getURL();
-+	if ( sName.getLength() )
-+	{
-+
-+		INetURLObject aURL( getModel()->getURL() );
-+		::osl::File::getSystemPathFromFileURL( aURL.GetLastName(), sName );
-+	}
-+	else
-+	{
-+		const static rtl::OUString sTitle( RTL_CONSTASCII_USTRINGPARAM("Title" ) );
-+		// process "UntitledX - $(PRODUCTNAME)"
-+		uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
-+		uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
-+		xProps->getPropertyValue(sTitle ) >>= sName;
-+		sal_Int32 pos = 0;
-+		sName = sName.getToken(0,' ',pos);	
-+	}
-+	return sName;
-+}
-+::rtl::OUString
-+VbaDocumentBase::getPath() throw (uno::RuntimeException)
-+{
-+	INetURLObject aURL( getModel()->getURL() );
-+	aURL.CutLastName();
-+	return aURL.GetURLPath();
-+}
-+
-+::rtl::OUString
-+VbaDocumentBase::getFullName() throw (uno::RuntimeException)
-+{
-+	INetURLObject aURL( getModel()->getURL() );
-+	return aURL.GetURLPath();
-+}
-+void
-+VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
-+					  const uno::Any &rRouteArg ) throw (uno::RuntimeException)
-+{
-+	sal_Bool bSaveChanges = sal_False;
-+	rtl::OUString aFileName;
-+	sal_Bool bRouteWorkbook = sal_True;
-+
-+	rSaveArg >>= bSaveChanges;
-+	sal_Bool bFileName =  ( rFileArg >>= aFileName );
-+	rRouteArg >>= bRouteWorkbook;
-+	uno::Reference< frame::XStorable > xStorable( getModel(), uno::UNO_QUERY_THROW );
-+	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
-+
-+	if( bSaveChanges )
-+	{
-+		if( xStorable->isReadonly() )
-+		{	
-+			throw uno::RuntimeException(::rtl::OUString( 
-+				RTL_CONSTASCII_USTRINGPARAM( "Unable to save to a read only file ") ),
-+                        	uno::Reference< XInterface >() );
-+		}
-+		if( bFileName )
-+			xStorable->storeAsURL( aFileName, uno::Sequence< beans::PropertyValue >(0) ); 
-+		else
-+			xStorable->store();
-+	}	
-+	else
-+		xModifiable->setModified( false );		
-+
-+	uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY );
-+
-+	if( xCloseable.is() )
-+		// use close(boolean DeliverOwnership)
-+	
-+		// The boolean parameter DeliverOwnership tells objects vetoing the close process that they may
-+		// assume ownership if they object the closure by throwing a CloseVetoException
-+		// Here we give up ownership. To be on the safe side, catch possible veto exception anyway.
-+		xCloseable->close(sal_True);
-+	// If close is not supported by this model - try to dispose it.
-+	// But if the model disagree with a reset request for the modify state
-+	// we shouldn't do so. Otherwhise some strange things can happen.
-+	else
-+	{
-+		uno::Reference< lang::XComponent > xDisposable ( getCurrentDocument(), uno::UNO_QUERY );
-+		if ( xDisposable.is() )
-+			xDisposable->dispose();
-+	}
-+}
-+
-+void
-+VbaDocumentBase::Protect( const uno::Any &aPassword ) throw (uno::RuntimeException)
-+{
-+	rtl::OUString rPassword;
-+	uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
-+	SC_VBA_FIXME(("Workbook::Protect stub"));
-+	if(  aPassword >>= rPassword )
-+		xProt->protect( rPassword );
-+	else
-+		xProt->protect( rtl::OUString() );
-+}
-+
-+void 
-+VbaDocumentBase::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeException)
-+{
-+	rtl::OUString rPassword;
-+	uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
-+	if( !xProt->isProtected() )
-+		throw uno::RuntimeException(::rtl::OUString(
-+			RTL_CONSTASCII_USTRINGPARAM( "File is already unprotected" ) ),
-+			uno::Reference< XInterface >() );
-+	else
-+	{
-+		if( aPassword >>= rPassword )
-+			xProt->unprotect( rPassword );
-+		else
-+			xProt->unprotect( rtl::OUString() );
-+	}
-+}
-+		
-+void 
-+VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException)
-+{
-+	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
-+	xModifiable->setModified( bSave );
-+}
-+
-+sal_Bool
-+VbaDocumentBase::getSaved() throw (uno::RuntimeException)
-+{
-+	uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
-+	return xModifiable->isModified();
-+}
-+
-+void
-+VbaDocumentBase::Save() throw (uno::RuntimeException)
-+{
-+	rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));
-+	uno::Reference< frame::XModel > xModel = getModel();
-+	dispatchRequests(xModel,url);
-+}
-+
-+void 
-+VbaDocumentBase::Activate() throw (uno::RuntimeException)
-+{
-+	uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
-+	xFrame->activate();
-+}	
-+
-+rtl::OUString& 
-+VbaDocumentBase::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaDocumentBase") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+VbaDocumentBase::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VbaDocumentBase" ) );
-+	}
-+	return aServiceNames;
-+}
-+
---- vbahelper/source/vbahelper/vbaglobalbase.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbaglobalbase.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,113 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbahelper/vbaglobalbase.hxx"
-+
-+#include <cppuhelper/component_context.hxx>
-+#include <comphelper/processfactory.hxx>
-+#include <com/sun/star/container/XNameContainer.hpp>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+VbaGlobalsBase::VbaGlobalsBase( 
-+const uno::Reference< ov::XHelperInterface >& xParent, 
-+const uno::Reference< uno::XComponentContext >& xContext) 
-+:  Globals_BASE( xParent, xContext )
-+{
-+    // overwrite context with custom one ( that contains the application )
-+    ::cppu::ContextEntry_Init aHandlerContextInfo[] =
-+    {
-+        ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Application" ) ), uno::Any() ) 
-+    };
-+
-+    mxContext = ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), xContext );
-+
-+}
-+
-+void
-+VbaGlobalsBase::init(  uno::Reference< uno::XComponentContext >const& rxContext, const uno::Any& aApplication )
-+{
-+            uno::Reference< container::XNameContainer > xNameContainer( mxContext, uno::UNO_QUERY_THROW );
-+            xNameContainer->replaceByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Application") ), aApplication );
-+            uno::Reference< XHelperInterface > xParent( aApplication, uno::UNO_QUERY );
-+            mxParent = xParent;
-+}
-+
-+uno::Reference< uno::XInterface > SAL_CALL 
-+VbaGlobalsBase::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException)
-+{
-+    uno::Reference< uno::XInterface > xReturn;
-+
-+    if ( hasServiceName( aServiceSpecifier ) )
-+        xReturn = mxContext->getServiceManager()->createInstanceWithContext( aServiceSpecifier, mxContext );
-+    return xReturn;
-+}
-+
-+uno::Reference< uno::XInterface > SAL_CALL 
-+VbaGlobalsBase::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException)
-+{
-+    
-+    uno::Reference< uno::XInterface > xReturn;
-+
-+    if ( hasServiceName( ServiceSpecifier ) )
-+        xReturn = mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( ServiceSpecifier, Arguments, mxContext );
-+    return xReturn;
-+}
-+
-+uno::Sequence< ::rtl::OUString > SAL_CALL 
-+VbaGlobalsBase::getAvailableServiceNames(  ) throw (uno::RuntimeException)
-+{
-+    static const rtl::OUString names[] = { 
-+    // common
-+        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.msforms.UserForm" ) ),
-+      };
-+    static uno::Sequence< rtl::OUString > serviceNames( names, sizeof( names )/ sizeof( names[0] ) );
-+    return serviceNames;
-+}
-+
-+bool
-+VbaGlobalsBase::hasServiceName( const rtl::OUString& serviceName )
-+{
-+    uno::Sequence< rtl::OUString > sServiceNames( getAvailableServiceNames() );
-+    sal_Int32 nLen = sServiceNames.getLength();
-+    for ( sal_Int32 index = 0; index < nLen; ++index )
-+    {
-+        if ( sServiceNames[ index ].equals( serviceName ) )
-+            return true;
-+    }
-+    return false;
-+}
-+
-+
---- vbahelper/source/vbahelper/vbahelper.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbahelper.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,1170 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbahelper.cxx,v $
-+ * $Revision: 1.5.32.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <cppuhelper/bootstrap.hxx>
-+#include <com/sun/star/util/XURLTransformer.hpp>
-+#include <com/sun/star/frame/XDispatchProvider.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <com/sun/star/frame/XFrame.hpp>
-+#include <com/sun/star/frame/XDesktop.hpp>
-+#include <com/sun/star/frame/XController.hpp>
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/beans/XIntrospection.hpp>
-+#include <ooo/vba/msforms/XShape.hpp>
-+
-+#include <comphelper/processfactory.hxx>
-+
-+#include <sfx2/objsh.hxx>
-+#include <sfx2/viewfrm.hxx>
-+#include <sfx2/dispatch.hxx>
-+#include <sfx2/app.hxx>
-+#include <svtools/stritem.hxx>
-+#include <svtools/eitem.hxx>
-+#include <svtools/intitem.hxx>
-+#include <svtools/itemset.hxx>
-+//#include <svtools/itempool.hxx>
-+#include <sfx2/docfac.hxx>
-+#include <sfx2/viewfac.hxx>
-+
-+#include <basic/sbx.hxx>
-+#include <basic/sbstar.hxx>
-+#include <basic/basmgr.hxx>
-+#include <basic/sbmod.hxx>
-+#include <basic/sbmeth.hxx>
-+#include <rtl/math.hxx>
-+#include <sfx2/viewsh.hxx>
-+#include <math.h>
-+#include <tools/urlobj.hxx>
-+#include <osl/file.hxx>
-+#include <toolkit/awt/vclxwindow.hxx>
-+#include <toolkit/helper/vclunohelper.hxx>
-+#include <com/sun/star/frame/XModel2.hpp>
-+#include <vcl/window.hxx>
-+#include <vcl/syswin.hxx>
-+#include <tools/diagnose_ex.h>
-+
-+#ifndef OOVBA_DLLIMPLEMENTATION
-+#define OOVBA_DLLIMPLEMENTATION
-+#endif 
-+
-+#include <vbahelper/vbahelper.hxx>
-+#include <sfx2/app.hxx>
-+// #FIXME needs service
-+//#include "vbashape.hxx"
-+//#include "unonames.hxx"
-+
-+using namespace ::com::sun::star;
-+using namespace ::ooo::vba;
-+
-+#define NAME_HEIGHT "Height"
-+#define NAME_WIDTH "Width"
-+
-+#define POINTTO100THMILLIMETERFACTOR 35.27778
-+
-+void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue );
-+
-+uno::Any sbxToUnoValue( SbxVariable* pVar );
-+
-+
-+namespace ooo
-+{
-+namespace vba
-+{
-+
-+uno::Reference< lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell* pShell )
-+{
-+    uno::Any aUnoVar;
-+    if ( !pShell || ! pShell->GetBasicManager()->GetGlobalUNOConstant( "VBAGlobals", aUnoVar ) )
-+        throw lang::IllegalArgumentException();
-+    uno::Reference< lang::XMultiServiceFactory > xVBAFactory( aUnoVar, uno::UNO_QUERY_THROW );
-+    return xVBAFactory;
-+}
-+
-+css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell, const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException)
-+{
-+    OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" );
-+    ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
-+    return getVBAServiceFactory( pShell )->createInstance( sVarName );
-+}
-+
-+css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell, const sal_Char* _pAsciiName, const uno::Sequence< uno::Any >& aArgs ) throw ( css::uno::RuntimeException )
-+{
-+    OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" );
-+    ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
-+    uno::Reference< uno::XInterface > xIf = getVBAServiceFactory( pShell )->createInstanceWithArguments( sVarName, aArgs  );
-+    return xIf;
-+}
-+// helper method to determine if the view ( calc ) is in print-preview mode
-+bool isInPrintPreview( SfxViewFrame* pView )
-+{
-+	sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
-+	if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() >
-+nViewNo && !pView->GetObjectShell()->IsInPlaceActive() )
-+	{
-+		SfxViewFactory &rViewFactory =
-+			pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo);
-+		if (  pView->GetCurViewId() == rViewFactory.GetOrdinal() )
-+			return true;
-+	}
-+	return false;
-+}
-+#if 0
-+namespace excel // all in this namespace probably can be moved to sc
-+{
-+
-+
-+const ::rtl::OUString REPLACE_CELLS_WARNING(  RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning"));
-+class PasteCellsWarningReseter
-+{
-+private:
-+	bool bInitialWarningState;
-+	static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException )
-+	{
-+		static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+		static uno::Reference<uno::XComponentContext > xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
-+		static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
-+				xContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+		static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW );
-+		return xProps;
-+	}
-+
-+	bool getReplaceCellsWarning() throw ( uno::RuntimeException )
-+	{
-+		sal_Bool res = sal_False;
-+		getGlobalSheetSettings()->getPropertyValue( REPLACE_CELLS_WARNING ) >>= res;
-+		return ( res == sal_True );
-+	}
-+
-+	void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
-+	{
-+		getGlobalSheetSettings()->setPropertyValue( REPLACE_CELLS_WARNING, uno::makeAny( bState ) );
-+	}
-+public:
-+	PasteCellsWarningReseter() throw ( uno::RuntimeException )
-+	{
-+		bInitialWarningState = getReplaceCellsWarning();
-+		if ( bInitialWarningState )
-+			setReplaceCellsWarning( false );
-+	}
-+	~PasteCellsWarningReseter()
-+	{
-+		if ( bInitialWarningState )
-+		{
-+			// don't allow dtor to throw
-+			try
-+			{
-+				setReplaceCellsWarning( true );
-+			}
-+			catch ( uno::Exception& /*e*/ ){}
-+		}
-+	}
-+};
-+
-+void
-+implnPaste()
-+{
-+	PasteCellsWarningReseter resetWarningBox;
-+	ScTabViewShell* pViewShell = getCurrentBestViewShell();
-+	if ( pViewShell )
-+	{
-+		pViewShell->PasteFromSystem();
-+		pViewShell->CellContentChanged();
-+	}
-+}
-+
-+
-+void
-+implnCopy()
-+{
-+	ScTabViewShell* pViewShell = getCurrentBestViewShell();
-+	if ( pViewShell )
-+		pViewShell->CopyToClip(NULL,false,false,true);
-+}
-+
-+void 
-+implnCut()
-+{
-+	ScTabViewShell* pViewShell =  getCurrentBestViewShell();
-+	if ( pViewShell )
-+		pViewShell->CutToClip( NULL, TRUE );
-+}
-+void implnPasteSpecial(SfxViewShell* pViewShell, USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
-+{
-+	PasteCellsWarningReseter resetWarningBox;
-+	sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
-+	InsCellCmd eMoveMode = INS_NONE;
-+
-+	if ( !pTabViewShell ) 
-+		// none active, try next best
-+		pTabViewShell = getCurrentBestViewShell();
-+	if ( pTabViewShell )
-+	{
-+		ScViewData* pView = pTabViewShell->GetViewData();	
-+		Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
-+		if ( pView && pWin )
-+		{
-+			if ( bAsLink && bOtherDoc )
-+				pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
-+			else 
-+			{
-+				ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
-+				ScDocument* pDoc = NULL; 
-+				if ( pOwnClip )
-+					pDoc = pOwnClip->GetDocument();	
-+				pTabViewShell->PasteFromClip( nFlags, pDoc,
-+					nFunction, bSkipEmpty, bTranspose, bAsLink,
-+					eMoveMode, IDF_NONE, TRUE );
-+				pTabViewShell->CellContentChanged();
-+			}
-+		}
-+	}
-+
-+}
-+
-+ScDocShell* 
-+getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) 
-+{
-+	uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
-+	ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
-+	ScDocShell* pDocShell = NULL;
-+	if ( pModel )
-+		pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
-+	return pDocShell;
-+
-+}
-+
-+ScTabViewShell* 
-+getBestViewShell(  css::uno::Reference< css::frame::XModel>& xModel )
-+{
-+	ScDocShell* pDocShell = getDocShell( xModel );
-+	if ( pDocShell )
-+		return pDocShell->GetBestViewShell();
-+	return NULL;
-+}
-+
-+ScTabViewShell* 
-+getCurrentBestViewShell()
-+{ 
-+	uno::Reference< frame::XModel > xModel = getCurrentDocument();
-+	return getBestViewShell( xModel );
-+}
-+
-+SfxViewFrame* 
-+getCurrentViewFrame()
-+{
-+	ScTabViewShell* pViewShell = getCurrentBestViewShell();	
-+	if ( pViewShell )
-+		return pViewShell->GetViewFrame();
-+	return NULL;
-+}
-+};
-+
-+#endif
-+const double Millimeter::factor =  35.27778;
-+
-+uno::Reference< beans::XIntrospectionAccess >
-+getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException)
-+{
-+	static uno::Reference< beans::XIntrospection > xIntrospection;
-+	if( !xIntrospection.is() )
-+	{
-+		uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+		xIntrospection.set( xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") ), uno::UNO_QUERY_THROW );
-+	}
-+	return xIntrospection->inspect( aObject );
-+}
-+
-+uno::Reference< script::XTypeConverter >
-+getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
-+{
-+	static uno::Reference< script::XTypeConverter > xTypeConv( xContext->getServiceManager()->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter") ), xContext ), uno::UNO_QUERY_THROW );
-+	return xTypeConv;
-+}
-+const uno::Any&
-+aNULL()
-+{
-+ 	static  uno::Any aNULLL = uno::makeAny( uno::Reference< uno::XInterface >() );
-+	return aNULLL;
-+}
-+
-+void dispatchExecute(SfxViewShell* pViewShell, USHORT nSlot, SfxCallMode nCall)
-+{
-+	SfxViewFrame* pViewFrame = NULL;
-+	if ( pViewShell )
-+		pViewFrame = pViewShell->GetViewFrame();
-+	if ( pViewFrame )
-+	{
-+		SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
-+		if( pDispatcher )
-+		{
-+			pDispatcher->Execute( nSlot , nCall );
-+		}
-+	}	
-+}
-+	
-+void
-+dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl, uno::Sequence< beans::PropertyValue >& sProps )
-+{
-+
-+	util::URL  url ;
-+	url.Complete = aUrl;
-+	rtl::OUString emptyString = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ));
-+	uno::Reference<frame::XController> xController = xModel->getCurrentController();
-+	uno::Reference<frame::XFrame> xFrame = xController->getFrame();
-+	uno::Reference<frame::XDispatchProvider> xDispatchProvider (xFrame,uno::UNO_QUERY_THROW);
-+	try
-+	{
-+		uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+		uno::Reference<uno::XComponentContext > xContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW  );
-+		if ( !xContext.is() )
-+		{
-+			return ;
-+		}
-+
-+		uno::Reference<lang::XMultiComponentFactory > xServiceManager(
-+				xContext->getServiceManager() );
-+		if ( !xServiceManager.is() )
-+		{
-+			return ;
-+		}
-+		uno::Reference<util::XURLTransformer> xParser( xServiceManager->createInstanceWithContext(     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) )
-+			,xContext), uno::UNO_QUERY_THROW );
-+		if (!xParser.is())
-+			return;
-+		xParser->parseStrict (url);
-+	}
-+	catch ( uno::Exception & /*e*/ )
-+	{
-+		return ;
-+	}
-+
-+	uno::Reference<frame::XDispatch> xDispatcher = xDispatchProvider->queryDispatch(url,emptyString,0);
-+
-+	uno::Sequence<beans::PropertyValue> dispatchProps(1);
-+
-+	sal_Int32 nProps = sProps.getLength();
-+	beans::PropertyValue* pDest = dispatchProps.getArray();
-+	if ( nProps )
-+	{
-+		dispatchProps.realloc( nProps + 1 );
-+		// need to reaccquire pDest after realloc
-+		pDest = dispatchProps.getArray();
-+		beans::PropertyValue* pSrc = sProps.getArray();
-+		for ( sal_Int32 index=0; index<nProps; ++index, ++pSrc, ++pDest )
-+			*pDest = *pSrc;
-+	}
-+
-+	(*pDest).Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Silent" ));
-+	(*pDest).Value <<= (sal_Bool)sal_True;
-+
-+	if (xDispatcher.is())
-+		xDispatcher->dispatch( url, dispatchProps );
-+}
-+
-+void
-+dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl) 
-+{
-+	uno::Sequence<beans::PropertyValue> dispatchProps;
-+	dispatchRequests( xModel, aUrl, dispatchProps );
-+}
-+
-+
-+
-+ uno::Reference< frame::XModel > 
-+getCurrentDocument() throw (uno::RuntimeException)
-+{
-+	uno::Reference< frame::XModel > xModel;
-+	SbxObject* pBasic = dynamic_cast< SbxObject* > ( SFX_APP()->GetBasic() );
-+	SbxObject* basicChosen =  pBasic ;
-+	if ( basicChosen == NULL)
-+	{
-+		OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" );
-+		return xModel;
-+	}    
-+    SbxObject* p = pBasic;
-+    SbxObject* pParent = p->GetParent();
-+    SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL;
-+
-+    if( pParentParent )
-+    {
-+        basicChosen = pParentParent;
-+    }
-+    else if( pParent )
-+    {
-+        basicChosen = pParent;
-+    }
-+
-+
-+    uno::Any aModel; 
-+    SbxVariable *pCompVar = basicChosen->Find(  UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT );
-+
-+	if ( pCompVar )
-+	{
-+		aModel = sbxToUnoValue( pCompVar );
-+		if ( sal_False == ( aModel >>= xModel ) ||
-+			!xModel.is() )
-+		{
-+			// trying last gasp try the current component
-+			uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+			// test if vba service is present
-+			uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
-+			uno::Reference<lang::XMultiComponentFactory > xSMgr( xCtx->getServiceManager(), uno::UNO_QUERY_THROW );
-+			uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx), uno::UNO_QUERY_THROW );
-+			xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY );
-+			if ( !xModel.is() )
-+			{
-+				throw uno::RuntimeException( 
-+					rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the currently selected document") ), uno::Reference< uno::XInterface >() );
-+			}
-+			return xModel;
-+		}
-+		else
-+		{
-+			OSL_TRACE("Have model ThisComponent points to url %s",
-+			::rtl::OUStringToOString( xModel->getURL(),
-+				RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-+		}
-+	}
-+	else
-+	{
-+		OSL_TRACE("Failed to get ThisComponent");
-+		throw uno::RuntimeException( 
-+			rtl::OUString( 
-+				RTL_CONSTASCII_USTRINGPARAM(
-+					"Can't determine the currently selected document") ),
-+			uno::Reference< uno::XInterface >() );
-+	}
-+	return xModel;
-+}
-+
-+sal_Int32 
-+OORGBToXLRGB( sal_Int32 nCol )
-+{
-+	sal_Int32 nRed = nCol;
-+	nRed &= 0x00FF0000;
-+	nRed >>= 16;
-+	sal_Int32 nGreen = nCol;
-+	nGreen &= 0x0000FF00;
-+	nGreen >>= 8;
-+	sal_Int32 nBlue = nCol;
-+	nBlue &= 0x000000FF;
-+	sal_Int32 nRGB =  ( (nBlue << 16) | (nGreen << 8) | nRed );
-+	return nRGB;
-+}
-+sal_Int32 
-+XLRGBToOORGB( sal_Int32 nCol )
-+{
-+	sal_Int32 nBlue = nCol;
-+	nBlue &= 0x00FF0000;
-+	nBlue >>= 16;
-+	sal_Int32 nGreen = nCol;
-+	nGreen &= 0x0000FF00;
-+	nGreen >>= 8;
-+	sal_Int32 nRed = nCol;
-+	nRed &= 0x000000FF;
-+	sal_Int32 nRGB =  ( (nRed << 16) | (nGreen << 8) | nBlue );
-+	return nRGB;
-+}
-+uno::Any 
-+OORGBToXLRGB( const uno::Any& aCol )
-+{
-+	sal_Int32 nCol;
-+	aCol >>= nCol;
-+	nCol = OORGBToXLRGB( nCol );
-+	return uno::makeAny( nCol );
-+}
-+uno::Any 
-+XLRGBToOORGB(  const uno::Any& aCol )
-+{
-+	sal_Int32 nCol;
-+	aCol >>= nCol;
-+	nCol = XLRGBToOORGB( nCol );
-+	return uno::makeAny( nCol );
-+}
-+
-+void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& /*ActivePrinter*/, const uno::Any& /*PrintToFile*/, const uno::Any& Collate, const uno::Any& PrToFileName, sal_Bool bUseSelection  )
-+{
-+	sal_Int32 nTo = 0;
-+	sal_Int32 nFrom = 0;
-+	sal_Int16 nCopies = 1;
-+	sal_Bool bPreview = sal_False;
-+	sal_Bool bCollate = sal_False;
-+	sal_Bool bSelection = bUseSelection;
-+	From >>= nFrom;
-+	To >>= nTo;
-+	Copies >>= nCopies;
-+	Preview >>= bPreview;
-+	if ( nCopies > 1 ) // Collate only useful when more that 1 copy
-+		Collate >>= bCollate;
-+
-+	rtl::OUString sRange(  RTL_CONSTASCII_USTRINGPARAM( "-" ) );
-+	rtl::OUString sFileName;
-+	
-+	if (( nFrom || nTo ) )
-+	{
-+		if ( nFrom )
-+			sRange = ( ::rtl::OUString::valueOf( nFrom ) + sRange );
-+		if ( nTo )
-+			sRange += ::rtl::OUString::valueOf( nTo );
-+	}
-+
-+	if (  PrToFileName.getValue() )
-+	{
-+		PrToFileName >>= sFileName;
-+	}
-+	SfxViewFrame* pViewFrame = NULL;
-+	if ( pViewShell )
-+		pViewFrame = pViewShell->GetViewFrame();
-+	if ( pViewFrame )
-+	{
-+		SfxAllItemSet aArgs( SFX_APP()->GetPool() );
-+				
-+		SfxBoolItem sfxCollate( SID_PRINT_COLLATE, bCollate );
-+		aArgs.Put( sfxCollate, sfxCollate.Which() );
-+		SfxInt16Item sfxCopies( SID_PRINT_COPIES, nCopies );
-+		aArgs.Put( sfxCopies, sfxCopies.Which() );
-+		if ( sFileName.getLength() )
-+		{
-+			SfxStringItem sfxFileName( SID_FILE_NAME, sFileName);
-+			aArgs.Put( sfxFileName, sfxFileName.Which() );
-+		
-+		}
-+		if (  sRange.getLength() )
-+		{
-+			SfxStringItem sfxRange( SID_PRINT_PAGES, sRange );
-+			aArgs.Put( sfxRange, sfxRange.Which() );
-+		}
-+		SfxBoolItem sfxSelection( SID_SELECTION, bSelection );
-+		aArgs.Put( sfxSelection, sfxSelection.Which() );
-+		SfxBoolItem sfxAsync( SID_ASYNCHRON, sal_False );
-+		aArgs.Put( sfxAsync, sfxAsync.Which() );
-+		SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
-+
-+		if ( pDispatcher )
-+		{
-+			if ( bPreview )
-+			{
-+				if ( !pViewFrame->GetFrame()->IsInPlace() ) 	
-+				{
-+					// #TODO is this necessary ( calc specific )
-+//					SC_MOD()->InputEnterHandler();
-+					pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON );
-+					while ( isInPrintPreview( pViewFrame ) )
-+						Application::Yield();
-+				}
-+			}
-+			else
-+				pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
-+		}
-+			
-+	}
-+	
-+	// #FIXME #TODO
-+	// 1 ActivePrinter ( how/can we switch a printer via API? )
-+	// 2 PrintToFile ( ms behaviour if this option is specified but no 
-+	//   filename supplied 'PrToFileName' then the user will be prompted )
-+	// 3 Need to check behaviour of Selected sheets with range ( e.g. From & To
-+	//    values ) in oOO these options are mutually exclusive
-+	// 4 There is a pop up to do with transparent objects in the print source
-+	//   should be able to disable that via configuration for the duration
-+	//   of this method
-+}
-+
-+ void PrintPreviewHelper( const css::uno::Any& /*EnableChanges*/, SfxViewShell* pViewShell )
-+{
-+	dispatchExecute( pViewShell, SID_VIEWSHELL1 );
-+}
-+
-+rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
-+{
-+	uno::Type aType = pvargItem.getValueType();
-+	uno::TypeClass eTypeClass = aType.getTypeClass();
-+	rtl::OUString sString;
-+	switch ( eTypeClass )
-+	{
-+		case uno::TypeClass_BOOLEAN:
-+		{
-+			sal_Bool bBool = sal_False;
-+			pvargItem >>= bBool;
-+			sString = rtl::OUString::valueOf( bBool );
-+			break;
-+		}
-+		case uno::TypeClass_STRING:
-+			pvargItem >>= sString;
-+			break;
-+		case uno::TypeClass_FLOAT:
-+			{
-+				float aFloat = 0;
-+				pvargItem >>= aFloat;
-+				sString = rtl::OUString::valueOf( aFloat );
-+				break;
-+			}
-+		case uno::TypeClass_DOUBLE:
-+			{
-+				double aDouble = 0;
-+				pvargItem >>= aDouble;
-+				sString = rtl::OUString::valueOf( aDouble );
-+				break;
-+			}
-+		case uno::TypeClass_SHORT:
-+		case uno::TypeClass_LONG:
-+		case uno::TypeClass_BYTE:
-+			{
-+				sal_Int32 aNum = 0;
-+				pvargItem >>= aNum;
-+				sString = rtl::OUString::valueOf( aNum );
-+				break;
-+			}
-+
-+		case uno::TypeClass_HYPER:
-+			{
-+				sal_Int64 aHyper = 0;
-+				pvargItem >>= aHyper;
-+				sString = rtl::OUString::valueOf( aHyper );
-+				break;
-+			}
-+		default:
-+       			throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid type, can't convert" ), uno::Reference< uno::XInterface >() );
-+	}
-+	return sString;
-+}
-+
-+
-+rtl::OUString 
-+ContainerUtilities::getUniqueName( const uno::Sequence< ::rtl::OUString >&  _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator)
-+{
-+	return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2));
-+}
-+
-+rtl::OUString 
-+ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix)
-+{
-+	sal_Int32 a = _nStartSuffix;
-+	rtl::OUString scompname = _sElementName;
-+	bool bElementexists = true;
-+	sal_Int32 nLen = _slist.getLength();
-+	if ( nLen == 0 )
-+		return _sElementName;
-+
-+	while (bElementexists == true) 
-+	{
-+		for (sal_Int32 i = 0; i < nLen; i++)
-+		{
-+			if (FieldInList(_slist, scompname) == -1)
-+			{
-+				return scompname;
-+			}
-+		}
-+		scompname = _sElementName + _sSuffixSeparator + rtl::OUString::valueOf( a++ );
-+	}
-+	return rtl::OUString();
-+}
-+
-+sal_Int32 
-+ContainerUtilities::FieldInList( const uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString )
-+{
-+	sal_Int32 FieldLen = SearchList.getLength();
-+	sal_Int32 retvalue = -1;
-+	for (sal_Int32 i = 0; i < FieldLen; i++) 
-+	{
-+		// I wonder why comparing lexicographically is done
-+		// when its a match is whats interesting?
-+		//if (SearchList[i].compareTo(SearchString) == 0) 
-+		if ( SearchList[i].equals( SearchString ) ) 
-+		{
-+			retvalue = i;
-+			break;
-+		}
-+	}
-+	return retvalue;
-+
-+}
-+bool NeedEsc(sal_Unicode cCode)
-+{
-+	String sEsc(RTL_CONSTASCII_USTRINGPARAM(".^$+\\|{}()"));
-+	return (STRING_NOTFOUND != sEsc.Search(cCode));
-+}
-+
-+rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike )
-+{
-+	rtl::OUStringBuffer sResult;
-+	const sal_Unicode *start = rIn.getStr();
-+	const sal_Unicode *end = start + rIn.getLength();
-+
-+	int seenright = 0;
-+	if ( bForLike )
-+		sResult.append(static_cast<sal_Unicode>('^'));
-+
-+	while (start < end) 
-+	{
-+		switch (*start)
-+		{
-+			case '?':
-+				sResult.append(static_cast<sal_Unicode>('.'));
-+				start++;
-+				break;
-+			case '*':
-+				sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".*")));
-+				start++;
-+				break;
-+			case '#':
-+				sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[0-9]")));
-+				start++;
-+				break;
-+			case '~':
-+				sResult.append(static_cast<sal_Unicode>('\\'));
-+				sResult.append(*(++start));
-+				start++;
-+				break;
-+				// dump the ~ and escape the next characture
-+			case ']':
-+				sResult.append(static_cast<sal_Unicode>('\\'));
-+				sResult.append(*start++);
-+				break;
-+			case '[':
-+				sResult.append(*start++);
-+				seenright = 0;
-+				while (start < end && !seenright)
-+				{
-+					switch (*start)
-+					{
-+						case '[':
-+						case '?':
-+						case '*':
-+						sResult.append(static_cast<sal_Unicode>('\\'));
-+						sResult.append(*start);
-+							break;
-+						case ']':
-+						sResult.append(*start);
-+							seenright = 1;
-+							break;
-+						case '!':
-+							sResult.append(static_cast<sal_Unicode>('^'));
-+							break;
-+						default:
-+						if (NeedEsc(*start))
-+							sResult.append(static_cast<sal_Unicode>('\\'));
-+						sResult.append(*start);
-+							break;
-+					}
-+					start++;
-+				}
-+				break;
-+			default:
-+				if (NeedEsc(*start))
-+					sResult.append(static_cast<sal_Unicode>('\\'));
-+				sResult.append(*start++);
-+		}
-+	}
-+
-+	if ( bForLike )
-+		sResult.append(static_cast<sal_Unicode>('$'));
-+
-+	return sResult.makeStringAndClear( );
-+}
-+
-+double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical)
-+{
-+	double fConvertFactor = 1.0;
-+	if( bVertical )
-+	{
-+		fConvertFactor = xDevice->getInfo().PixelPerMeterY/100000;
-+	}
-+	else
-+	{
-+		fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000;	
-+	}
-+	return fConvertFactor;
-+}
-+
-+double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical)
-+{
-+	double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
-+	return fPoints * POINTTO100THMILLIMETERFACTOR * fConvertFactor;
-+}
-+double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, sal_Bool bVertical)
-+{
-+	double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
-+	return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR;
-+}
-+
-+ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape )
-+{
-+// #FIXME needs to be an instantiable service
-+//	m_xShape = new ScVbaShape( xContext, xShape );
-+}
-+
-+static uno::Reference< frame::XController > lcl_getCurrentController()
-+{
-+    const uno::Reference< frame::XModel > xWorkingDoc( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
-+    uno::Reference< frame::XController > xController;
-+    if ( xWorkingDoc.is() )
-+        xController.set( xWorkingDoc->getCurrentController(), uno::UNO_SET_THROW );
-+    else
-+        xController.set( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
-+    return xController;
-+}
-+
-+sal_Int32 getPointerStyle()
-+{
-+    sal_Int32 nPointerStyle( POINTER_ARROW );
-+    try
-+    {
-+        const uno::Reference< frame::XController > xController( lcl_getCurrentController(),     uno::UNO_SET_THROW );
-+        const uno::Reference< frame::XFrame >      xFrame     ( xController->getFrame(),        uno::UNO_SET_THROW );
-+        const uno::Reference< awt::XWindow >       xWindow    ( xFrame->getContainerWindow(),   uno::UNO_SET_THROW );
-+        // why the heck isn't there an XWindowPeer::getPointer, but a setPointer only?
-+        const Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-+        if ( pWindow )
-+            nPointerStyle = pWindow->GetSystemWindow()->GetPointer().GetStyle();
-+    }
-+    catch( const uno::Exception& )
-+    {
-+    	DBG_UNHANDLED_EXCEPTION();
-+    }
-+    return nPointerStyle;
-+}
-+
-+void setCursorHelper( const Pointer& rPointer, sal_Bool bOverWrite )
-+{
-+    ::std::vector< uno::Reference< frame::XController > > aControllers;
-+
-+    const uno::Reference< frame::XModel2 > xModel2( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
-+    if ( xModel2.is() )
-+    {
-+        const uno::Reference< container::XEnumeration > xEnumControllers( xModel2->getControllers(), uno::UNO_SET_THROW );
-+        while ( xEnumControllers->hasMoreElements() )
-+        {
-+            const uno::Reference< frame::XController > xController( xEnumControllers->nextElement(), uno::UNO_QUERY_THROW );
-+            aControllers.push_back( xController );
-+        }
-+    }
-+    else
-+    {
-+        const uno::Reference< frame::XModel > xModel( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
-+        if ( xModel.is() )
-+        {
-+            const uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
-+            aControllers.push_back( xController );
-+        }
-+        else
-+        {
-+            const uno::Reference< frame::XController > xController( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
-+            aControllers.push_back( xController );
-+        }
-+    }
-+
-+    for (   ::std::vector< uno::Reference< frame::XController > >::const_iterator controller = aControllers.begin();
-+            controller != aControllers.end();
-+            ++controller
-+        )
-+    {
-+        const uno::Reference< frame::XFrame >      xFrame     ( (*controller)->getFrame(),       uno::UNO_SET_THROW   );
-+        const uno::Reference< awt::XWindow >       xWindow    ( xFrame->getContainerWindow(),    uno::UNO_SET_THROW   );
-+
-+        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-+        OSL_ENSURE( pWindow, "ScVbaApplication::setCursor: no window!" );
-+        if ( !pWindow )
-+            continue;
-+
-+        pWindow->GetSystemWindow()->SetPointer( rPointer );
-+        pWindow->GetSystemWindow()->EnableChildPointerOverwrite( bOverWrite );
-+    }
-+}
-+
-+String docMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro )
-+{
-+	String sFullName;	
-+	// would use the script provider to see if the macro exists but
-+	// called at this stage tdoc content handler stuff is not set up
-+	// so it fails
-+
-+       String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
-+	BasicManager* pBasicMgr = pShell-> GetBasicManager();
-+	if ( pBasicMgr )
-+	{
-+		if ( pBasicMgr->GetName().Len() )
-+			sLibrary =  pBasicMgr->GetName();
-+		StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
-+		if ( !pBasic )
-+		{
-+			USHORT nId = pBasicMgr->GetLibId( sLibrary );
-+			pBasicMgr->LoadLib( nId );
-+			pBasic = pBasicMgr->GetLib( sLibrary );
-+		}
-+		if ( pBasic )
-+		{
-+			if ( sMod.Len() ) // we wish to find the macro is a specific module
-+			{
-+				SbModule* pModule = pBasic->FindModule( sMod );
-+				if ( pModule )
-+				{
-+					SbxArray* pMethods = pModule->GetMethods();
-+					if ( pMethods )
-+					{
-+						SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
-+						if ( pMethod )
-+						{
-+							sFullName = sMacro;
-+							sFullName.Insert( '.', 0 ).Insert( sMod, 0 ).Insert( '.', 0 ).Insert( sLibrary, 0 );
-+						}
-+					}
-+				}
-+			}
-+			else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
-+			{
-+					if( SbModule* pModule = pMethod->GetModule() )
-+					{
-+						sFullName = sMacro;
-+						sFullName.Insert( '.', 0 ).Insert( pModule->GetName(), 0).Insert( '.', 0 ).Insert( sLibrary, 0 );
-+					}
-+			}		
-+				
-+		}
-+	}
-+	return sFullName;
-+}
-+
-+#define VBA_LEFT "PositionX"
-+#define VBA_TOP "PositionY"
-+UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
-+{
-+    mxModel.set( xControl->getModel(), uno::UNO_QUERY_THROW );
-+}
-+    double UserFormGeometryHelper::getLeft()
-+    {
-+	sal_Int32 nLeft = 0;
-+	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;	
-+	return Millimeter::getInPoints( nLeft );
-+    }
-+    void UserFormGeometryHelper::setLeft( double nLeft )
-+    {
-+        mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nLeft ) ) );
-+    }
-+    double UserFormGeometryHelper::getTop()
-+    {
-+	sal_Int32 nTop = 0;
-+	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ) ) >>= nTop;	
-+	return Millimeter::getInPoints( nTop );
-+    }
-+    void UserFormGeometryHelper::setTop( double nTop )
-+    {
-+	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
-+    }
-+    double UserFormGeometryHelper::getHeight()
-+    {
-+	sal_Int32 nHeight = 0;
-+	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( NAME_HEIGHT ) ) ) >>= nHeight;	
-+	return Millimeter::getInPoints( nHeight );
-+    }
-+    void UserFormGeometryHelper::setHeight( double nHeight )
-+    {
-+	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	NAME_HEIGHT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
-+    }
-+    double UserFormGeometryHelper::getWidth()
-+    {
-+	sal_Int32 nWidth = 0;
-+	mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	NAME_WIDTH ) ) ) >>= nWidth;	
-+	return Millimeter::getInPoints( nWidth );
-+    }
-+    void UserFormGeometryHelper::setWidth( double nWidth)
-+    {
-+	mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 	NAME_WIDTH ) ), uno::makeAny(  Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
-+    }
-+
-+    double ConcreteXShapeGeometryAttributes::getLeft()
-+    {
-+        return m_xShape->getLeft();
-+    }
-+    void ConcreteXShapeGeometryAttributes::setLeft( double nLeft )
-+    {
-+        m_xShape->setLeft( nLeft );
-+    }
-+    double ConcreteXShapeGeometryAttributes::getTop()
-+    {
-+        return m_xShape->getTop();
-+    }
-+    void ConcreteXShapeGeometryAttributes::setTop( double nTop )
-+    {
-+        m_xShape->setTop( nTop );
-+    }
-+
-+    double ConcreteXShapeGeometryAttributes::getHeight()
-+    {
-+        return m_xShape->getHeight();
-+    }
-+    void ConcreteXShapeGeometryAttributes::setHeight( double nHeight )
-+    {
-+        m_xShape->setHeight( nHeight );
-+    }
-+    double ConcreteXShapeGeometryAttributes::getWidth()
-+    {
-+        return m_xShape->getWidth();
-+    }
-+    void ConcreteXShapeGeometryAttributes::setWidth( double nWidth)
-+    {
-+        m_xShape->setHeight( nWidth );
-+    }
-+
-+
-+	ShapeHelper::ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException ) : xShape( _xShape )
-+	{ 
-+		if( !xShape.is() ) 
-+			throw css::uno::RuntimeException( rtl::OUString::createFromAscii("No valid shape for helper"), css::uno::Reference< css::uno::XInterface >() );
-+	}
-+    
-+	double ShapeHelper::getHeight()
-+	{
-+        	return  Millimeter::getInPoints(xShape->getSize().Height);
-+    	}
-+
-+
-+    	void ShapeHelper::setHeight(double _fheight) throw ( css::script::BasicErrorException )
-+	{
-+		try
-+		{
-+			css::awt::Size aSize = xShape->getSize();
-+			aSize.Height = Millimeter::getInHundredthsOfOneMillimeter(_fheight);
-+			xShape->setSize(aSize);
-+		}
-+		catch ( css::uno::Exception& /*e*/)
-+		{
-+			throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
-+    		}
-+	}
-+    
-+    
-+	double ShapeHelper::getWidth()
-+	{ 
-+		return Millimeter::getInPoints(xShape->getSize().Width);
-+    	}
-+
-+	void ShapeHelper::setWidth(double _fWidth) throw ( css::script::BasicErrorException )
-+	{
-+		try
-+		{
-+			css::awt::Size aSize = xShape->getSize();
-+			aSize.Width = Millimeter::getInHundredthsOfOneMillimeter(_fWidth);
-+			xShape->setSize(aSize);
-+		}
-+		catch (css::uno::Exception& /*e*/)
-+		{
-+			throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
-+		}
-+	}
-+    
-+    
-+	double ShapeHelper::getLeft()
-+	{
-+		return Millimeter::getInPoints(xShape->getPosition().X);
-+	}
-+
-+    
-+	void ShapeHelper::setLeft(double _fLeft)
-+	{
-+		css::awt::Point aPoint = xShape->getPosition();
-+		aPoint.X = Millimeter::getInHundredthsOfOneMillimeter(_fLeft);
-+		xShape->setPosition(aPoint);
-+	}
-+    
-+
-+	double ShapeHelper::getTop()
-+	{
-+        	return Millimeter::getInPoints(xShape->getPosition().Y);
-+	}
-+
-+    
-+	void ShapeHelper::setTop(double _fTop)
-+	{
-+		css::awt::Point aPoint = xShape->getPosition();
-+		aPoint.Y = Millimeter::getInHundredthsOfOneMillimeter(_fTop);
-+		xShape->setPosition(aPoint);
-+	}
-+    
-+	void DebugHelper::exception( const rtl::OUString&  DetailedMessage, const css::uno::Exception& ex,  int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException )
-+	{
-+		// #TODO #FIXME ( do we want to support additionalArg here )
-+		throw css::script::BasicErrorException( DetailedMessage.concat( rtl::OUString::createFromAscii(" ") ).concat( ex.Message ), css::uno::Reference< css::uno::XInterface >(), err, rtl::OUString() );
-+	}
-+
-+	void DebugHelper::exception( int err,  const rtl::OUString& additionalArgument ) throw( css::script::BasicErrorException )
-+	{
-+		exception( rtl::OUString(), css::uno::Exception(), err, additionalArgument );
-+	}
-+	void DebugHelper::exception( css::uno::Exception& ex ) throw( css::script::BasicErrorException )
-+	{
-+		exception( rtl::OUString(), ex, SbERR_INTERNAL_ERROR, rtl::OUString() );
-+	}
-+
-+	Millimeter::Millimeter():m_nMillimeter(0) {}
-+    
-+	Millimeter::Millimeter(double mm):m_nMillimeter(mm) {}
-+    
-+	void Millimeter::set(double mm) { m_nMillimeter = mm; }
-+	void Millimeter::setInPoints(double points) 
-+	{ 
-+		m_nMillimeter = points * 0.352777778; 
-+		// 25.4mm / 72 
-+	}
-+      
-+	void Millimeter::setInHundredthsOfOneMillimeter(double hmm)
-+	{
-+		m_nMillimeter = hmm / 100;
-+	}
-+    
-+	double Millimeter::get()
-+	{
-+		return m_nMillimeter;
-+	}
-+	double Millimeter::getInHundredthsOfOneMillimeter()
-+	{
-+		return m_nMillimeter * 100;
-+	}
-+	double Millimeter::getInPoints()
-+	{
-+		return m_nMillimeter * 2.834645669; // 72 / 25.4mm
-+	}    
-+
-+	sal_Int32 Millimeter::getInHundredthsOfOneMillimeter(double points)
-+	{
-+		sal_Int32 mm = static_cast<sal_Int32>(points * factor);
-+		return mm;
-+	}
-+    
-+	double Millimeter::getInPoints(int _hmm)
-+	{
-+		double points = double( static_cast<double>(_hmm) / factor);
-+		return points;
-+	}
-+
-+
-+} // openoffice
-+} //org
---- vbahelper/source/vbahelper/vbapropvalue.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbapropvalue.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,48 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbapropvalue.cxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbahelper/vbapropvalue.hxx"
-+
-+using namespace com::sun::star;
-+ 
-+ScVbaPropValue::ScVbaPropValue( PropListener* pListener ) : m_pListener( pListener )
-+{
-+}
-+
-+css::uno::Any SAL_CALL 
-+ScVbaPropValue::getValue() throw (css::uno::RuntimeException)
-+{
-+    return m_pListener->getValueEvent();
-+}
-+
-+void SAL_CALL 
-+ScVbaPropValue::setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException)
-+{
-+    m_pListener->setValueEvent( _value );
-+}
---- vbahelper/source/vbahelper/vbawindowbase.cxx.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/vbahelper/vbawindowbase.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,180 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <vbahelper/helperdecl.hxx>
-+#include <vbahelper/vbawindowbase.hxx>
-+#include <com/sun/star/awt/XWindow.hpp>
-+#include <com/sun/star/awt/XWindow2.hpp>
-+#include <com/sun/star/awt/PosSize.hpp>
-+
-+using namespace ::com::sun::star;
-+using namespace ::ooo::vba;
-+
-+VbaWindowBase::VbaWindowBase( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowBaseImpl_BASE( xParent, xContext ), m_xModel( xModel ) 
-+{
-+}
-+
-+VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext )  
-+        : WindowBaseImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ),
-+          m_xModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) )
-+{
-+}
-+
-+sal_Bool SAL_CALL
-+VbaWindowBase::getVisible() throw (uno::RuntimeException)
-+{
-+	sal_Bool bVisible = sal_True;	
-+	uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
-+	uno::Reference< css::awt::XWindow2 > xWindow2 (xWindow, uno::UNO_QUERY_THROW );
-+	if( xWindow2.is() )
-+	{
-+		bVisible = xWindow2->isVisible();	
-+	}
-+	return bVisible;
-+}
-+
-+void SAL_CALL
-+VbaWindowBase::setVisible(sal_Bool _visible) throw (uno::RuntimeException)
-+{
-+	uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
-+	if( xWindow.is() )
-+	{
-+		xWindow->setVisible( _visible );	
-+	}
-+}
-+
-+css::awt::Rectangle getPosSize( const uno::Reference< frame::XModel >& xModel )
-+{
-+	css::awt::Rectangle aRect;
-+	uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
-+	if( xWindow.is() )
-+	{
-+		aRect = xWindow->getPosSize();
-+	}
-+	return aRect;
-+}
-+
-+void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, USHORT nFlag )
-+{
-+	uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+	uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
-+	if( xWindow.is() )
-+	{
-+		css::awt::Rectangle aRect = xWindow->getPosSize();
-+		switch( nFlag )
-+		{
-+			case css::awt::PosSize::X:
-+				xWindow->setPosSize( nValue, aRect.Y,	0, 0, css::awt::PosSize::X );
-+				break;
-+			case css::awt::PosSize::Y:
-+				xWindow->setPosSize( aRect.X, nValue,	0, 0, css::awt::PosSize::Y );
-+				break;
-+			case css::awt::PosSize::WIDTH:
-+				xWindow->setPosSize( 0, 0,	nValue, aRect.Height, css::awt::PosSize::WIDTH );
-+				break;
-+			case css::awt::PosSize::HEIGHT:
-+				xWindow->setPosSize( 0, 0,	aRect.Width, nValue, css::awt::PosSize::HEIGHT );
-+				break;
-+			default:
-+				break;
-+		}
-+	}
-+}	
-+
-+sal_Int32 SAL_CALL 
-+VbaWindowBase::getHeight() throw (uno::RuntimeException)
-+{
-+	css::awt::Rectangle aRect = getPosSize(m_xModel);
-+	return aRect.Height;
-+}
-+
-+void SAL_CALL 
-+VbaWindowBase::setHeight( sal_Int32 _height ) throw (uno::RuntimeException)
-+{
-+	setPosSize(m_xModel, _height, css::awt::PosSize::HEIGHT);
-+}
-+
-+sal_Int32 SAL_CALL 
-+VbaWindowBase::getLeft() throw (uno::RuntimeException)
-+{
-+	css::awt::Rectangle aRect = getPosSize(m_xModel);
-+	return aRect.X;
-+}
-+
-+void SAL_CALL 
-+VbaWindowBase::setLeft( sal_Int32 _left ) throw (uno::RuntimeException)
-+{
-+	setPosSize(m_xModel, _left, css::awt::PosSize::X);
-+}
-+sal_Int32 SAL_CALL 
-+VbaWindowBase::getTop() throw (uno::RuntimeException)
-+{
-+	css::awt::Rectangle aRect = getPosSize(m_xModel);
-+	return aRect.Y;
-+}
-+
-+void SAL_CALL 
-+VbaWindowBase::setTop( sal_Int32 _top ) throw (uno::RuntimeException)
-+{
-+	setPosSize(m_xModel, _top, css::awt::PosSize::Y);
-+}
-+sal_Int32 SAL_CALL 
-+VbaWindowBase::getWidth() throw (uno::RuntimeException)
-+{
-+	css::awt::Rectangle aRect = getPosSize(m_xModel);
-+	return aRect.Width;
-+}
-+
-+void SAL_CALL 
-+VbaWindowBase::setWidth( sal_Int32 _width ) throw (uno::RuntimeException)
-+{
-+	setPosSize(m_xModel, _width, css::awt::PosSize::WIDTH);
-+}
-+
-+rtl::OUString& 
-+VbaWindowBase::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaWindowBase") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+VbaWindowBase::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VbaWindowBase" ) );
-+	}
-+	return aServiceNames;
-+}
---- vbahelper/util/makefile.mk.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/util/makefile.mk	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,97 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.24 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..
-+
-+PRJNAME=vbahelper
-+TARGET=vbahelper
-+
-+# --- Settings ---------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+
-+TARGET_HELPER=vbahelper
-+SHL1TARGET= $(TARGET_HELPER)$(DLLPOSTFIX)
-+SHL1IMPLIB= i$(TARGET_HELPER)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+DEF1NAME=$(SHL1TARGET)
-+
-+LIB1FILES=$(SLB)$/$(TARGET_HELPER).lib
-+
-+# dynamic libraries
-+SHL1STDLIBS=       \
-+		$(CPPULIB) \
-+		$(COMPHELPERLIB) \
-+		$(CPPUHELPERLIB) \
-+		$(BASICLIB) \
-+		$(TOOLSLIB) \
-+		$(SALLIB)\
-+		$(SFXLIB)	\
-+		$(SVTOOLLIB)    \
-+		$(SVLLIB) \
-+        $(VCLLIB) \
-+		$(SVTOOLLIB)    \
-+        $(TKLIB) \
-+
-+#SHL4DEPN=$(SHL1TARGETN)
-+SHL1LIBS=$(LIB1FILES)
-+
-+TARGET_MSFORMS=msforms
-+SHL2TARGET=$(TARGET_MSFORMS)$(DLLPOSTFIX).uno
-+SHL2IMPLIB=     i$(TARGET_MSFORMS)
-+
-+SHL2VERSIONMAP=$(TARGET_MSFORMS).map
-+SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-+DEF2NAME=$(SHL2TARGET)
-+SHL2STDLIBS= \
-+                $(CPPUHELPERLIB) \
-+                $(CPPULIB) \
-+                $(COMPHELPERLIB) \
-+                $(SVLIB) \
-+                $(TOOLSLIB) \
-+                $(SALLIB)\
-+		$(VBAHELPERLIB) \
-+                $(SFXLIB)       \
-+                $(SVXLIB)       \
-+                $(SVTOOLLIB)    \
-+                $(SVLLIB) \
-+        $(VCLLIB) \
-+        $(TKLIB) \
-+                $(BASICLIB) \
-+
-+SHL2DEPN=$(SHL1TARGETN)
-+SHL2LIBS=$(SLB)$/$(TARGET_MSFORMS).lib
-+
-+# --- Targets -----------------------------------------------------------
-+
-+.INCLUDE :  target.mk
---- vbahelper/util/msforms.map.old	1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/util/msforms.map	2009-04-06 16:42:01.000000000 +0000
-@@ -0,0 +1,9 @@
-+OOO_1.1 {
-+	global:
-+		component_getImplementationEnvironment;
-+		component_getFactory;
-+		component_writeInfo;
-+
-+	local:
-+		*;
-+};
---- basic/source/uno/namecont.cxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ basic/source/uno/namecont.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -2730,6 +2730,10 @@ OUString SfxLibraryContainer::expand_url
- 	{
- 		// get the standard library
- 		String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-+
-+                if ( pBasMgr->GetName().Len() )
-+                    aLibName = pBasMgr->GetName();
-+
- 		StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
- 		if( pBasic )
- 			bVBACompat = pBasic->isVBAEnabled();
---- sc/inc/cellsuno.hxx.old	2009-04-02 10:45:43.000000000 +0000
-+++ sc/inc/cellsuno.hxx	2009-04-06 16:42:01.000000000 +0000
-@@ -152,8 +152,10 @@ public:
- namespace ooo
- {
-     namespace vba {
-+        namespace excel {
- 	class ScVbaCellRangeAccess;  // Vba Helper class 
-     }
-+    }
- }
- 
- class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet,
-@@ -175,7 +177,7 @@ class SC_DLLPUBLIC ScCellRangesBase : pu
- {
- 	friend class ScTabViewObj;		// fuer select()
- 	friend class ScTableSheetObj;	// fuer createCursorByRange()
-- 	friend class ooo::vba::ScVbaCellRangeAccess;
-+ 	friend class ooo::vba::excel::ScVbaCellRangeAccess;
- 
- private:
- 	SfxItemPropertySet		aPropSet;
---- sc/source/ui/vba/vbafont.cxx.old	2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbafont.cxx	2009-04-06 16:42:01.000000000 +0000
-@@ -76,7 +76,7 @@ ScVbaFont::ScVbaFont( const uno::Referen
- SfxItemSet*  
- ScVbaFont::GetDataSet()
- {
--    SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( mpRangeObj );
-+    SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( mpRangeObj );
-     return pDataSet;
- }
- 
diff --git a/applied_patches/0352-kde4-configure2.diff b/applied_patches/0352-kde4-configure2.diff
new file mode 100644
index 000000000..fde409814
--- /dev/null
+++ b/applied_patches/0352-kde4-configure2.diff
@@ -0,0 +1,74 @@
+--- configure.in.old	2009-08-26 12:25:16.000000000 +0200
++++ configure.in	2009-09-15 14:09:26.000000000 +0200
+@@ -6158,8 +6158,8 @@ KDE4_CFLAGS=""
+ KDE4_LIBS=""
+ MOC4="moc"
+ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
+-   qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+-   qt_libdirs="$QTLIB /usr/lib $x_libraries"
++   qt_incdirs="$QT4INC $QT4DIR $QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
++   qt_libdirs="$QT4LIB $QTLIB /usr/lib $x_libraries"
+    
+    kde_incdirs="/usr/include $x_includes"
+    kde_libdirs="/usr/lib $x_libraries"
+@@ -6169,6 +6169,15 @@ if test "$test_kde4" = "yes" -a "$ENABLE
+       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
+    fi
+ 
++   if test -n "$KDE4DIR" ; then
++      kde_incdirs="$KDE4DIR/include $kde_incdirs"
++      if test "$build_cpu" != "x86_64" ; then
++         kde_libdirs="$KDE4DIR/lib $kde_libdirs"
++      else
++         kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"
++      fi
++   fi
++
+    qt_test_include="Qt/qobject.h"
+    qt_test_library="libQtCore.so"
+    kde_test_include="ksharedptr.h"
+@@ -6185,7 +6194,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE
+    
+    AC_MSG_RESULT([$qt_header_dir])
+    if test "x$qt_header_dir" = "xno" ; then
+-      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
++      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
+    fi
+    
+    AC_MSG_CHECKING([for Qt4 libraries])
+@@ -6200,14 +6209,14 @@ if test "$test_kde4" = "yes" -a "$ENABLE
+    AC_MSG_RESULT([$qt_lib_dir])
+    
+    if test "x$qt_lib_dir" = "xno" ; then
+-      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
++      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
+    fi
+ 
+    dnl Check for Meta Object Compiler
+-   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] )
++   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
+    if test "$MOC4" = "no" ; then
+       AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+-the root of your Qt installation by exporting QTDIR before running "configure".])
++the root of your Qt installation by exporting QT4DIR before running "configure".])
+    fi
+ 
+    dnl Check for KDE4 headers
+@@ -6221,7 +6230,7 @@ the root of your Qt installation by expo
+    done
+    AC_MSG_RESULT([$kde_incdir])
+    if test "x$kde_incdir" = "xno" ; then
+-      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
++      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+    fi
+ 
+    dnl Check for KDE4 libraries
+@@ -6236,7 +6245,7 @@ the root of your Qt installation by expo
+    
+    AC_MSG_RESULT([$kde_libdir])
+    if test "x$kde_libdir" = "xno" ; then
+-      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
++      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+    fi
+ 
+    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
diff --git a/applied_patches/0352-vba-templateobject.diff b/applied_patches/0352-vba-templateobject.diff
deleted file mode 100644
index e90719043..000000000
--- a/applied_patches/0352-vba-templateobject.diff
+++ /dev/null
@@ -1,579 +0,0 @@
-diff --git oovbaapi/ooo/vba/word/XDocument.idl oovbaapi/ooo/vba/word/XDocument.idl
-index 32cf6d8..2502846 100644
---- oovbaapi/ooo/vba/word/XDocument.idl
-+++ oovbaapi/ooo/vba/word/XDocument.idl
-@@ -47,6 +47,7 @@ module ooo {  module vba {  module word {
- interface XDocument : com::sun::star::uno::XInterface
- {
-     [attribute, readonly] XRange Content;
-+    [attribute] any AttachedTemplate;
- 
-     XRange Range( [in] any Start, [in] any End );
-     any BuiltInDocumentProperties( [in] any index );
-diff --git oovbaapi/ooo/vba/word/XTemplate.idl oovbaapi/ooo/vba/word/XTemplate.idl
-new file mode 100644
-index 0000000..1913118
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XTemplate.idl
-@@ -0,0 +1,54 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XTemplate_idl__
-+#define __ooo_vba_word_XTemplate_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XTemplate
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute, readonly] string Name;
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/makefile.mk oovbaapi/ooo/vba/word/makefile.mk
-index 646e623..c638476 100644
---- oovbaapi/ooo/vba/word/makefile.mk
-+++ oovbaapi/ooo/vba/word/makefile.mk
-@@ -56,6 +56,7 @@ IDLFILES= XGlobals.idl\
- 	XPanes.idl \
- 	XOptions.idl \
- 	XSelection.idl \
-+	XTemplate.idl \
- 
- # ------------------------------------------------------------------
- 
---- sw/inc/docsh.hxx
-+++ sw/inc/docsh.hxx
-@@ -85,6 +85,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
-     comphelper::EmbeddedObjectContainer*    pOLEChildList;
-     sal_Int16               nUpdateDocMode; // contains the com::sun::star::document::UpdateDocMode
-     bool                    bInUpdateFontList; //prevent nested calls of UpdateFontList
-+    bool                    bIsATemplate; //prevent nested calls of UpdateFontList
- 	// Methoden fuer den Zugriff aufs Doc
- 	SW_DLLPRIVATE void					AddLink();
- 	SW_DLLPRIVATE void					RemoveLink();
-@@ -299,6 +300,8 @@ public:
-                                 GetController();
- 
-     SfxInPlaceClient* GetIPClient( const ::svt::EmbeddedObjectRef& xObjRef );
-+    SW_DLLPRIVATE sal_Bool IsTemplate() { return bIsATemplate; }
-+    SW_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; }
- 
-     virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const;
- };
-diff --git sw/inc/unomap.hxx sw/inc/unomap.hxx
-index 92feb78..1e842ab 100644
---- sw/inc/unomap.hxx
-+++ sw/inc/unomap.hxx
-@@ -262,6 +262,7 @@
- #define WID_DOC_LOCK_UPDATES                    1016
- #define WID_DOC_HAS_VALID_SIGNATURES            1017
- #define WID_DOC_BUILDID							1024
-+#define WID_DOC_ISTEMPLATEID						1025
- // --> OD 2006-03-21 #b6375613#
- #define WID_APPLY_WORKAROUND_FOR_B6375613       1070
- // <--
---- sw/inc/unoprnms.hxx
-+++ sw/inc/unoprnms.hxx
-@@ -804,7 +804,8 @@ enum SwPropNameIds
- // --> OD 2009-07-13 #i73249#
- /* 0737 */  UNO_NAME_DESCRIPTION,
- // <--
--/* 0738 */  SW_PROPNAME_END
-+/* 0738 */  UNO_NAME_IS_TEMPLATE,
-+/* 0739 */  SW_PROPNAME_END
- };
- 
- 
-diff --git sw/source/core/unocore/unomap.cxx sw/source/core/unocore/unomap.cxx
-index abc341b..14ff14e 100644
---- sw/source/core/unocore/unomap.cxx
-+++ sw/source/core/unocore/unomap.cxx
-@@ -1703,6 +1703,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
- 					{ SW_PROP_NMID(UNO_NAME_RECORD_CHANGES), WID_DOC_CHANGES_RECORD,		CPPU_E2T(CPPUTYPE_BOOLEAN),	PROPERTY_NONE,   0},
- 					{ SW_PROP_NMID(UNO_NAME_SHOW_CHANGES), WID_DOC_CHANGES_SHOW,		CPPU_E2T(CPPUTYPE_BOOLEAN),	PROPERTY_NONE,   0},
- 					{ SW_PROP_NMID(UNO_NAME_WORD_COUNT), WID_DOC_WORD_COUNT,			CPPU_E2T(CPPUTYPE_INT32),	PropertyAttribute::READONLY,   0},
-+					{ SW_PROP_NMID(UNO_NAME_IS_TEMPLATE), WID_DOC_ISTEMPLATEID,			CPPU_E2T(CPPUTYPE_BOOLEAN),	PropertyAttribute::READONLY,   0},
- 					{ SW_PROP_NMID(UNO_NAME_WORD_SEPARATOR), WID_DOC_WORD_SEPARATOR,		CPPU_E2T(CPPUTYPE_OUSTRING),	PROPERTY_NONE,   0},
- 					{ SW_PROP_NMID(UNO_NAME_HIDE_FIELD_TIPS), WID_DOC_HIDE_TIPS, 			CPPU_E2T(CPPUTYPE_BOOLEAN),	PROPERTY_NONE,   0},
- 					{ SW_PROP_NMID(UNO_NAME_REDLINE_DISPLAY_TYPE), WID_DOC_REDLINE_DISPLAY, 	CPPU_E2T(CPPUTYPE_INT16),	PROPERTY_NONE,   0},
---- sw/source/core/unocore/unoprnms.cxx
-+++ sw/source/core/unocore/unoprnms.cxx
-@@ -778,7 +778,8 @@ const SwPropNameTab aPropNameTab = {
- /* 0734 CHAR_OVERLINE_COLOR */         {MAP_CHAR_LEN("CharOverlineColor")},
- /* 0735 CHAR_OVERLINE_HAS_COLOR */     {MAP_CHAR_LEN("CharOverlineHasColor")},
- /* 0736 UNO_NAME_OUTLINE_LEVEL */       {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel
--/* 0737 UNO_NAME_DESCRIPTION */         {MAP_CHAR_LEN("Description")}
-+/* 0737 UNO_NAME_DESCRIPTION */         {MAP_CHAR_LEN("Description")},
-+/* 0738 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")}
- };
- 
- const SwPropNameLen& SwGetPropName( USHORT nId )
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index 714c63a..e6cca0f 100644
---- sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -140,6 +140,7 @@
- #include <iostream>
- #include <dbgoutsw.hxx>
- #endif
-+#include <unotools/localfilehelper.hxx>
- 
- #define MM_250 1417             // WW-Default fuer Hor. Seitenraender: 2.5 cm
- #define MM_200 1134             // WW-Default fuer u.Seitenrand: 2.0 cm
-@@ -219,6 +220,80 @@ bool registerDocEvent( SfxObjectShell* pShell )
- 	return result;
- }
- 
-+class Sttb : TBBase
-+{
-+struct SBBItem
-+{
-+    sal_uInt16 cchData;
-+    rtl::OUString data; 
-+    SBBItem() : cchData(0){}
-+};
-+    sal_uInt16 fExtend;
-+    sal_uInt16 cData;
-+    sal_uInt16 cbExtra;
-+
-+    std::vector< SBBItem > dataItems;
-+
-+    Sttb(const Sttb&);
-+    Sttb& operator = ( const Sttb&);
-+public:
-+    Sttb();
-+    ~Sttb();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* fp );
-+    rtl::OUString getStringAtIndex( sal_Int32 );
-+};
-+
-+Sttb::Sttb() : fExtend( 0 )
-+,cData( 0 )
-+,cbExtra( 0 )
-+{
-+}
-+
-+Sttb::~Sttb()
-+{
-+}
-+
-+bool Sttb::Read( SvStream* pS )
-+{
-+    OSL_TRACE("Sttb::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> fExtend >> cData >> cbExtra;
-+    if ( cData )
-+    {
-+        for ( sal_Int32 index = 0; index < cData; ++index )
-+        {
-+            SBBItem aItem;
-+            *pS >> aItem.cchData;
-+            aItem.data = readUnicodeString( pS, aItem.cchData );
-+            dataItems.push_back( aItem );
-+        }
-+    }
-+    return true;
-+}
-+
-+void Sttb::Print( FILE* fp )
-+{
-+    fprintf( fp, "[ 0x%x ] Sttb - dump\n", nOffSet);
-+    fprintf( fp, " fExtend 0x%x [expected 0xFFFF ]\n", fExtend );
-+    fprintf( fp, " cData no. or string data items %d (0x%x)\n", cData, cData );
-+    
-+    if ( cData )
-+    {
-+        for ( sal_Int32 index = 0; index < cData; ++index )
-+            fprintf(fp,"   string dataItem[ %d(0x%x) ] has name %s\n", static_cast< int >( index ), static_cast< unsigned int >( index ), rtl::OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    }
-+
-+}
-+
-+rtl::OUString 
-+Sttb::getStringAtIndex( sal_Int32 index )
-+{
-+    rtl::OUString aRet;
-+    if ( index < dataItems.size() )
-+        aRet = dataItems[ index ].data;
-+    return aRet;
-+}
- 
- SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr )
-     : SvxMSDffManager(*rRdr.pTableStream, rRdr.GetBaseURL(), rRdr.pWwFib->fcDggInfo,
-@@ -3725,6 +3800,41 @@ void SwWW8ImplReader::ReadDocInfo()
-         DBG_ASSERT(xDocProps.is(), "DocumentProperties is null");
- 
-         if (xDocProps.is()) {
-+            if ( pWwFib->fDot )
-+            {
-+                rtl::OUString sTemplateURL;
-+                SfxMedium* pMedium = mpDocShell->GetMedium();
-+                if ( pMedium )
-+                {
-+                    rtl::OUString aName = pMedium->GetName();
-+                    INetURLObject aURL( aName );
-+                    sTemplateURL = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI);
-+                    if ( sTemplateURL.getLength() > 0 )
-+                        xDocProps->setTemplateURL( sTemplateURL );
-+                }
-+            }
-+            else // not a template
-+            {
-+                long nCur = pTableStream->Tell();
-+                Sttb aSttb;
-+                pTableStream->Seek( pWwFib->fcSttbfAssoc ); // point at tgc record
-+                if (!aSttb.Read( pTableStream ) )
-+                    OSL_TRACE("** Read of SttbAssoc data failed!!!! ");
-+                pTableStream->Seek( nCur ); // return to previous position, is that necessary?
-+#if DEBUG
-+                aSttb.Print( stderr );
-+#endif
-+                String sPath = aSttb.getStringAtIndex( 0x1 );
-+                String aURL;
-+                // attempt to convert to url ( won't work for obvious reasons on  linux 
-+                if ( sPath.Len() )
-+	        	::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPath, aURL );
-+                if ( aURL.Len() )
-+                    xDocProps->setTemplateURL( aURL );
-+                else
-+                    xDocProps->setTemplateURL( sPath );
-+                
-+            }
-             sfx2::LoadOlePropertySet(xDocProps, pStg);
-         }
-     }
-@@ -3987,6 +3987,8 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
-     {
-         if (mbNewDoc && pStg && !pGloss) /*meaningless for a glossary, cmc*/
-         {
-+            
-+            mpDocShell->SetIsTemplate( pWwFib->fDot ); // point at tgc record
-             const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
-             maTracer.EnterEnvironment(sw::log::eMacros);
-             // Create and insert Excel vba Globals
-diff --git sw/source/ui/uno/unotxdoc.cxx sw/source/ui/uno/unotxdoc.cxx
-index fc3b8b9..356efaf 100644
---- sw/source/ui/uno/unotxdoc.cxx
-+++ sw/source/ui/uno/unotxdoc.cxx
-@@ -2147,6 +2147,9 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
- 	Any aAny;
- 	switch(pMap->nWID)
- 	{
-+		case WID_DOC_ISTEMPLATEID    :
-+			aAny <<= pDocShell->IsTemplate();
-+			break;
- 		case  WID_DOC_CHAR_COUNT     :
- 		case  WID_DOC_PARA_COUNT     :
- 		case  WID_DOC_WORD_COUNT     :
-diff --git sw/source/ui/vba/makefile.mk sw/source/ui/vba/makefile.mk
-index e789fde..42a9bbc 100644
---- sw/source/ui/vba/makefile.mk
-+++ sw/source/ui/vba/makefile.mk
-@@ -69,6 +69,7 @@ SLOFILES= \
- 				$(SLO)$/vbapanes.obj \
- 				$(SLO)$/vbaoptions.obj \
- 				$(SLO)$/vbaselection.obj \
-+				$(SLO)$/vbatemplate.obj \
- 
- # --- Targets ------------------------------------------------------
- 
-diff --git sw/source/ui/vba/vbadocument.cxx sw/source/ui/vba/vbadocument.cxx
-index c6b1c25..9e9fdc4 100644
---- sw/source/ui/vba/vbadocument.cxx
-+++ sw/source/ui/vba/vbadocument.cxx
-@@ -35,8 +35,12 @@
- #include "vbavariables.hxx"
- #include <com/sun/star/text/XBookmarksSupplier.hpp>
- #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-+#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
- #include <com/sun/star/document/XDocumentProperties.hpp>
- #include <vbahelper/helperdecl.hxx>
-+#include <wordvbahelper.hxx>
-+#include <docsh.hxx>
-+#include "vbatemplate.hxx"
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
-@@ -161,6 +165,25 @@ SwVbaDocument::getServiceImplName()
- 	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocument") );
- 	return sImplName;
- }
-+uno::Any SAL_CALL 
-+SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException)
-+{
-+    SwDocShell* pDocShell = word::getDocShell( getModel() );
-+    uno::Reference< word::XTemplate > xTemplate;
-+    uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( getModel(), uno::UNO_QUERY_THROW );
-+    uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
-+    uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
-+    rtl::OUString sTemplateName = xDocProps->getTemplateName();
-+
-+    xTemplate = new SwVbaTemplate( this, mxContext, getModel(), sTemplateName );
-+    return uno::makeAny( xTemplate );
-+}
-+
-+void SAL_CALL 
-+SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException();
-+}
- 
- uno::Sequence< rtl::OUString > 
- SwVbaDocument::getServiceNames()
-diff --git sw/source/ui/vba/vbadocument.hxx sw/source/ui/vba/vbadocument.hxx
-index 0f696ce..a82503b 100644
---- sw/source/ui/vba/vbadocument.hxx
-+++ sw/source/ui/vba/vbadocument.hxx
-@@ -55,6 +55,9 @@ public:
-     virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
-     virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
-+    virtual css::uno::Any SAL_CALL getAttachedTemplate() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (css::uno::RuntimeException);
-+
- 
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
-diff --git sw/source/ui/vba/vbatemplate.cxx sw/source/ui/vba/vbatemplate.cxx
-new file mode 100644
-index 0000000..11c1a59
---- /dev/null
-+++ sw/source/ui/vba/vbatemplate.cxx
-@@ -0,0 +1,70 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbatemplate.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include "wordvbahelper.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rName )
-+    : SwVbaTemplate_BASE( rParent, rContext ), mxModel( rModel ), msName( rName )
-+{
-+}
-+
-+
-+SwVbaTemplate::~SwVbaTemplate()
-+{
-+}
-+
-+rtl::OUString
-+SwVbaTemplate::getName() throw ( css::uno::RuntimeException )
-+{
-+    return msName;
-+}
-+rtl::OUString&
-+SwVbaTemplate::getServiceImplName()
-+{
-+        static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTemplate") );
-+        return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString >
-+SwVbaTemplate::getServiceNames()
-+{
-+        static uno::Sequence< rtl::OUString > aServiceNames;
-+        if ( aServiceNames.getLength() == 0 )
-+        {
-+                aServiceNames.realloc( 1 );
-+                aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Template" ) );
-+        }
-+        return aServiceNames;
-+}
-+
-diff --git sw/source/ui/vba/vbatemplate.hxx sw/source/ui/vba/vbatemplate.hxx
-new file mode 100644
-index 0000000..63a2f26
---- /dev/null
-+++ sw/source/ui/vba/vbatemplate.hxx
-@@ -0,0 +1,54 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_TEMPLATE_HXX
-+#define SW_VBA_TEMPLATE_HXX
-+
-+#include <ooo/vba/word/XTemplate.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XTemplate > SwVbaTemplate_BASE;
-+
-+class SwVbaTemplate : public SwVbaTemplate_BASE
-+{
-+private:
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+    rtl::OUString msName;
-+public:
-+	SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
-+        const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& );
-+	virtual ~SwVbaTemplate();
-+
-+   // XTemplate
-+    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_TEMPLATE_HXX */
-diff --git sfx2/source/doc/objcont.cxx sfx2/source/doc/objcont.cxx
-index 3d1668b..9bb525f 100644
---- sfx2/source/doc/objcont.cxx
-+++ sfx2/source/doc/objcont.cxx
-@@ -1471,31 +1471,35 @@ sal_Bool SfxObjectShell::IsHelpDocument() const
- 
- void SfxObjectShell::ResetFromTemplate( const String& rTemplateName, const String& rFileName )
- {
--    uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties());
--    xDocProps->setTemplateURL( ::rtl::OUString() );
--    xDocProps->setTemplateName( ::rtl::OUString() );
--    xDocProps->setTemplateDate( util::DateTime() );
--    xDocProps->resetUserData( ::rtl::OUString() );
--
--	// TODO/REFACTOR:
--	// Title?
--
--    if( ::utl::LocalFileHelper::IsLocalFile( rFileName ) )
--	{
--        String aFoundName;
--        if( SFX_APP()->Get_Impl()->GetDocumentTemplates()->GetFull( String(), rTemplateName, aFoundName ) )
--        {
--            INetURLObject aObj( rFileName );
--            xDocProps->setTemplateURL( aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) );
--            xDocProps->setTemplateName( rTemplateName );
--
--            ::DateTime now;
--            xDocProps->setTemplateDate( util::DateTime(
--                now.Get100Sec(), now.GetSec(), now.GetMin(),
--                now.GetHour(), now.GetDay(), now.GetMonth(),
--                now.GetYear() ) );
--
--			SetQueryLoadTemplate( sal_True );
-+    // only care about reseting this data for openoffice formats otherwise
-+    if ( IsOwnStorageFormat_Impl( *GetMedium())  )
-+    {
-+        uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties());
-+        xDocProps->setTemplateURL( ::rtl::OUString() );
-+        xDocProps->setTemplateName( ::rtl::OUString() );
-+        xDocProps->setTemplateDate( util::DateTime() );
-+        xDocProps->resetUserData( ::rtl::OUString() );
-+    
-+    	// TODO/REFACTOR:
-+    	// Title?
-+    
-+        if( ::utl::LocalFileHelper::IsLocalFile( rFileName ) )
-+    	{
-+            String aFoundName;
-+            if( SFX_APP()->Get_Impl()->GetDocumentTemplates()->GetFull( String(), rTemplateName, aFoundName ) )
-+            {
-+                INetURLObject aObj( rFileName );
-+                xDocProps->setTemplateURL( aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) );
-+                xDocProps->setTemplateName( rTemplateName );
-+    
-+                ::DateTime now;
-+                xDocProps->setTemplateDate( util::DateTime(
-+                    now.Get100Sec(), now.GetSec(), now.GetMin(),
-+                    now.GetHour(), now.GetDay(), now.GetMonth(),
-+                    now.GetYear() ) );
-+    
-+    			SetQueryLoadTemplate( sal_True );
-+            }
-         }
-     }
- }
diff --git a/applied_patches/0353-kde4_fpicker_fixes.diff b/applied_patches/0353-kde4_fpicker_fixes.diff
new file mode 100644
index 000000000..456796cb3
--- /dev/null
+++ b/applied_patches/0353-kde4_fpicker_fixes.diff
@@ -0,0 +1,204 @@
+diff --git fpicker/source/unx/kde4/KDE4FPEntry.cxx fpicker/source/unx/kde4/KDE4FPEntry.cxx
+index 9a75688..805e6cf 100644
+--- fpicker/source/unx/kde4/KDE4FPEntry.cxx
++++ fpicker/source/unx/kde4/KDE4FPEntry.cxx
+@@ -84,12 +84,12 @@ static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiS
+ // the three uno functions that will be exported
+ extern "C" 
+ {
+-	void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
++	void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+ 	{
+ 		*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+ 	}
+ 
+-	sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey )
++	sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
+ 	{
+ 		sal_Bool bRetVal = sal_True;
+ 
+@@ -110,7 +110,7 @@ extern "C"
+ 		return bRetVal;
+ 	}
+ 
+-	void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* pRegistryKey )
++	void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
+ 	{
+ 		void* pRet = 0;
+ 
+diff --git fpicker/source/unx/kde4/KDE4FilePicker.cxx fpicker/source/unx/kde4/KDE4FilePicker.cxx
+index b5cd83d..6c6db9e 100644
+--- fpicker/source/unx/kde4/KDE4FilePicker.cxx
++++ fpicker/source/unx/kde4/KDE4FilePicker.cxx
+@@ -118,6 +118,8 @@ using namespace ::com::sun::star::uno;
+ // helper functions
+ //////////////////////////////////////////////////////////////////////////
+ 
++#include <QDebug>
++
+ namespace
+ {
+     // controling event notifications    
+@@ -166,7 +168,7 @@ KDE4FilePicker::KDE4FilePicker( const uno::Reference<lang::XMultiServiceFactory>
+ 	
+ 	_layout = new QGridLayout(_extraControls);
+ 	
+-	_dialog = new KFileDialog(KUrl(""), QString(""), 0, _extraControls);
++	_dialog = new KFileDialog(KUrl("~"), QString(""), 0, _extraControls);
+ 	_dialog->setMode(KFile::File | KFile::LocalOnly);
+ 	
+ 	//default mode
+@@ -213,21 +215,19 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
+ 		}
+ 	}
+ 	
++	_dialog->clearFilter();
+ 	_dialog->setFilter(_filter);
++	
+ 	_dialog->exec();
+ 	
+ 	//nasty hack to get a local qt event loop going to process the dialog
+ 	//otherwise the dialog returns immediately
+ 	while (_dialog->isVisible())
+-	{
+ 		kapp->processEvents(QEventLoop::WaitForMoreEvents);
+-	}
+ 	
+ 	//block and wait for user input
+ 	if (_dialog->result() == KFileDialog::Accepted)
+-	{
+ 		return ExecutableDialogResults::OK;
+-	}
+ 	
+ 	return ExecutableDialogResults::CANCEL;
+ }
+@@ -236,13 +236,9 @@ void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect )
+     throw( uno::RuntimeException )
+ {
+ 	if (multiSelect)
+-	{
+ 		_dialog->setMode(KFile::Files | KFile::LocalOnly);
+-	}
+ 	else
+-	{
+ 		_dialog->setMode(KFile::File | KFile::LocalOnly);
+-	}
+ }
+ 
+ void SAL_CALL KDE4FilePicker::setDefaultName( const ::rtl::OUString &name )
+@@ -256,7 +252,7 @@ void SAL_CALL KDE4FilePicker::setDisplayDirectory( const rtl::OUString &dir )
+     throw( uno::RuntimeException )
+ {
+ 	const QString url = toQString(dir);
+-	_dialog->setStartDir(KUrl(url));
++	_dialog->setUrl(KUrl(url));
+ }
+ 
+ rtl::OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
+@@ -269,16 +265,54 @@ rtl::OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
+ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
+     throw( uno::RuntimeException )
+ {
+-	QStringList files = _dialog->selectedFiles();
++	QStringList rawFiles = _dialog->selectedFiles();
++	QStringList files;
+ 	
+-	uno::Sequence< ::rtl::OUString > seq(files.size());
++	// check if we need to add an extension
++	QString extension = "";
++	if ( _dialog->operationMode() == KFileDialog::Saving )
++	{
++		QCheckBox *cb = dynamic_cast<QCheckBox*> (
++			_customWidgets[ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION ]);
++			
++		if (cb->isChecked())
++		{
++			extension = _dialog->currentFilter(); // assuming filter value is like this *.ext
++			extension.replace("*","");
++		}
++	}
++	
++	// Workaround for the double click selection KDE4 bug 
++	// kde file picker returns the file and directories for selectedFiles()
++	// when a file is double clicked
++	// make a true list of files
++	const QString dir = "file://" + KUrl(rawFiles[0]).directory();
+ 	
+-	for (int i=0 ; i<files.size() ; ++i)
++	// by appending the dir, we make OO treat all opens like multifile opens
++	// this makes the code for adding the the OO sequence simpler
++	files.append(dir);
++	
++	for (USHORT i = 0; i < rawFiles.size(); ++i)
+ 	{
+-		const QString fileName = "file:" + files[i];
+-		seq[i] = toOUString(fileName);
++		// if the raw file is not the base directory (see above kde bug)
++		// we add the file to list of avail files
++		if ((dir + "/") != ("file://" + rawFiles[i]))
++		{
++			const QString filename = KUrl(rawFiles[i]).fileName();
++			
++			//prevent extension append if we already have one
++			if (filename.endsWith(extension))
++				files.append(filename);
++			else
++				files.append(filename + extension);
++		}
+ 	}
+ 	
++	// add all files and leading directory to outgoing OO sequence
++	uno::Sequence< ::rtl::OUString > seq(files.size());
++	for (int i = 0; i < files.size(); ++i)
++		seq[i] = toOUString(files[i]);
++	
+ 	return seq;
+ }
+ 
+@@ -289,9 +323,7 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const
+ 	QString f = toQString(filter);
+ 	
+ 	if (!_filter.isNull())
+-	{
+ 		_filter.append("\n");
+-	}
+ 	
+ 	//add to hash map for reverse lookup in getCurrentFilter
+ 	_filters.insert(f, t);
+@@ -318,17 +350,31 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
+ 	
+ 	//default if not found
+ 	if (filter.isNull())
+-	{
+ 		filter = "ODF Text Document (.odt)";
+-	}
+ 	
+ 	return toOUString(filter);
+ }
+ 
+-void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString&, const uno::Sequence<beans::StringPair>& )
++void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString&, const uno::Sequence<beans::StringPair>&)
+     throw( lang::IllegalArgumentException, uno::RuntimeException )
+-{
+-	//TODO
++{	
++	//TODO ... don't really like this behavior... Shtylman
++#if 0
++	if (!_filter.isNull())
++		_filter.append(QString("\n"));
++	
++	for (USHORT i = 0; i < filters.getLength(); ++i)
++	{
++		beans::StringPair aPair = filters[i];
++		
++		_filter.append(QString("%1|%2").arg(
++			toQString(aPair.Second).replace(";", " ")).arg(
++			toQString(aPair.First).replace("/","\\/") + "\n" ));
++	}
++	
++	if (filters.getLength() > 0)
++		_filter.append(QString("*.*|*.*"));
++#endif
+ }
+ 
+ void SAL_CALL KDE4FilePicker::setValue( sal_Int16 controlId, sal_Int16, const uno::Any &value )
diff --git a/applied_patches/0353-vba-vpagebreak-object.diff b/applied_patches/0353-vba-vpagebreak-object.diff
deleted file mode 100644
index ef609f5bd..000000000
--- a/applied_patches/0353-vba-vpagebreak-object.diff
+++ /dev/null
@@ -1,445 +0,0 @@
-diff --git oovbaapi/ooo/vba/excel/XVPageBreak.idl oovbaapi/ooo/vba/excel/XVPageBreak.idl
-new file mode 100755
-index 0000000..8dc9692
---- /dev/null
-+++ oovbaapi/ooo/vba/excel/XVPageBreak.idl
-@@ -0,0 +1,54 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XVPageBreak.idl,v $
-+ * $Revision: 1.0 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_excel_XVPageBreak_idl__
-+#define __ooo_vba_excel_XVPageBreak_idl__
-+
-+#ifndef __ooo_vba_excel_XPageBreak_idl__
-+#include <ooo/vba/excel/XPageBreak.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module excel { 
-+
-+//=============================================================================
-+
-+interface XVPageBreak
-+{
-+	interface ::ooo::vba::excel::XPageBreak;
-+};
-+
-+//=============================================================================
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/excel/XVPageBreaks.idl oovbaapi/ooo/vba/excel/XVPageBreaks.idl
-new file mode 100755
-index 0000000..91501db
---- /dev/null
-+++ oovbaapi/ooo/vba/excel/XVPageBreaks.idl
-@@ -0,0 +1,71 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XVPageBreaks.idl,v $
-+ * $Revision: 1.0 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_excel_XVPageBreaks_idl__
-+#define __ooo_vba_excel_XVPageBreaks_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
-+#include <com/sun/star/script/BasicErrorException.idl>
-+#endif
-+
-+#ifndef  __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module excel { 
-+
-+//=============================================================================
-+
-+//interface XVPageBreak;
-+
-+interface XVPageBreaks
-+{
-+	interface ooo::vba::XCollection;
-+	
-+	//Methods	
-+	any Add( [in] any Before ) raises( com::sun::star::script::BasicErrorException );
-+};
-+
-+//=============================================================================
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/excel/XWorksheet.idl oovbaapi/ooo/vba/excel/XWorksheet.idl
-index 03d2cc3..9e9b803 100644
---- oovbaapi/ooo/vba/excel/XWorksheet.idl
-+++ oovbaapi/ooo/vba/excel/XWorksheet.idl
-@@ -56,6 +56,7 @@ interface XRange;
- interface XOutline;
- interface XPageSetup;
- interface XHPageBreaks;
-+interface XVPageBreaks;
- interface XWorksheet
- {
- 	interface ::ooo::vba::XHelperInterface;
-@@ -92,6 +93,7 @@ interface XWorksheet
- 	XOutline Outline();
- 	XPageSetup PageSetup();
- 	any HPageBreaks([in] any Index);
-+	any VPageBreaks([in] any Index);
- 	any OLEObjects([in] any Index);
- 	void ShowDataForm();
- 	any Shapes([in] any Index);
-diff --git oovbaapi/ooo/vba/excel/makefile.mk oovbaapi/ooo/vba/excel/makefile.mk
-index 59333bf..2170810 100644
---- oovbaapi/ooo/vba/excel/makefile.mk
-+++ oovbaapi/ooo/vba/excel/makefile.mk
-@@ -98,6 +98,8 @@ IDLFILES= XApplication.idl\
-  	XPageBreak.idl \
-  	XHPageBreak.idl \
-  	XHPageBreaks.idl \
-+ 	XVPageBreak.idl \
-+ 	XVPageBreaks.idl \
- 
- 
- # ------------------------------------------------------------------
-diff --git sc/source/ui/vba/vbapagebreak.cxx sc/source/ui/vba/vbapagebreak.cxx
-old mode 100644
-new mode 100755
-index 581e5bd..13ad8b5
---- sc/source/ui/vba/vbapagebreak.cxx
-+++ sc/source/ui/vba/vbapagebreak.cxx
-@@ -139,3 +139,37 @@ ScVbaHPageBreak::getServiceNames()
- 	return aServiceNames;
- }
- 
-+template class ScVbaPageBreak< excel::XVPageBreak >;
-+
-+/* class ScVbaVPageBreak */
-+ScVbaVPageBreak::ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, 
-+								  const css::uno::Reference< css::uno::XComponentContext >& xContext,
-+								  css::uno::Reference< css::beans::XPropertySet >& xProps,
-+								  css::sheet::TablePageBreakData aTablePageBreakData ) throw ( css::uno::RuntimeException )
-+:   ScVbaVPageBreak_BASE( xParent, xContext, xProps, aTablePageBreakData )
-+{
-+}
-+            
-+ScVbaVPageBreak::~ScVbaVPageBreak()
-+{
-+}
-+
-+rtl::OUString& 
-+ScVbaVPageBreak::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreak") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaVPageBreak::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.VPageBreak" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-diff --git sc/source/ui/vba/vbapagebreak.hxx sc/source/ui/vba/vbapagebreak.hxx
-old mode 100644
-new mode 100755
-index a07cfda..04c8702
---- sc/source/ui/vba/vbapagebreak.hxx
-+++ sc/source/ui/vba/vbapagebreak.hxx
-@@ -33,6 +33,7 @@
- #include <cppuhelper/implbase1.hxx>
- #include <ooo/vba/excel/XPageBreak.hpp>
- #include <ooo/vba/excel/XHPageBreak.hpp>
-+#include <ooo/vba/excel/XVPageBreak.hpp>
- #include <ooo/vba/excel/XRange.hpp>
- #include <com/sun/star/uno/XComponentContext.hpp>
- #include <com/sun/star/script/BasicErrorException.hpp>
-@@ -84,4 +85,22 @@ public:
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
- };
- 
-+//VPageBreak
-+typedef ScVbaPageBreak < ov::excel::XVPageBreak > ScVbaVPageBreak_BASE;
-+
-+class ScVbaVPageBreak :  public ScVbaVPageBreak_BASE
-+{
-+public:
-+	ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, 
-+					 const css::uno::Reference< css::uno::XComponentContext >& xContext,
-+					 css::uno::Reference< css::beans::XPropertySet >& xProps,
-+					 css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException);
-+            
-+	virtual ~ScVbaVPageBreak();
-+	
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
- #endif
-diff --git sc/source/ui/vba/vbapagebreaks.cxx sc/source/ui/vba/vbapagebreaks.cxx
-old mode 100644
-new mode 100755
-index 8859ca6..51eaffb
---- sc/source/ui/vba/vbapagebreaks.cxx
-+++ sc/source/ui/vba/vbapagebreaks.cxx
-@@ -90,8 +90,8 @@ public:
- 	virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException);
- 	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
- 	{
--		//if( m_bColumn )
--			// return excel::XVPageBreak::static_type(0);
-+		if( m_bColumn )
-+			 return excel::XVPageBreak::static_type(0);
- 		return  excel::XHPageBreak::static_type(0);
- 	}
- 	virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
-@@ -137,8 +137,8 @@ uno::Any SAL_CALL RangePageBreaks::getByIndex( sal_Int32 Index ) throw (lang::In
-         if( (nPos < xIndexAccess->getCount()) && (nPos > -1) )
-         {
-             uno::Reference< beans::XPropertySet > xRowColPropertySet( xIndexAccess->getByIndex(nPos), uno::UNO_QUERY_THROW );
--			//if( m_bColumn )
--			//	return uno::makeAny( uno::Reference< excel::XVPageBreak >( new ScVbaVPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
-+			if( m_bColumn )
-+				return uno::makeAny( uno::Reference< excel::XVPageBreak >( new ScVbaVPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
- 			return uno::makeAny( uno::Reference< excel::XHPageBreak >( new ScVbaHPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
-         }
-     }
-@@ -187,8 +187,8 @@ uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script
- 	sheet::TablePageBreakData aTablePageBreakData;
- 	aTablePageBreakData.ManualBreak = sal_True;
- 	aTablePageBreakData.Position = nAPIRowColIndex;
--	//if( m_bColumn )
--	//	return uno::makeAny( uno::Reference< excel::XVPageBreak >( new ScVbaVPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
-+	if( m_bColumn )
-+		return uno::makeAny( uno::Reference< excel::XVPageBreak >( new ScVbaVPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
- 	return uno::makeAny( uno::Reference< excel::XHPageBreak >( new ScVbaHPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) ));
- }
- 
-@@ -267,3 +267,64 @@ ScVbaHPageBreaks::getServiceNames()
- 	return aServiceNames;
- }
- 
-+//VPageBreak
-+ScVbaVPageBreaks::ScVbaVPageBreaks( const uno::Reference< XHelperInterface >& xParent, 
-+                                    const uno::Reference< uno::XComponentContext >& xContext,
-+            		                uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( uno::RuntimeException )
-+:   ScVbaVPageBreaks_BASE( xParent, xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, sal_True ) ), 
-+	mxSheetPageBreak( xSheetPageBreak )
-+{
-+}
-+
-+ScVbaVPageBreaks::~ScVbaVPageBreaks()
-+{
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaVPageBreaks::Add( const uno::Any& Before ) throw ( script::BasicErrorException, uno::RuntimeException )
-+{
-+	RangePageBreaks* pPageBreaks = dynamic_cast< RangePageBreaks* >( m_xIndexAccess.get() );
-+	if( pPageBreaks )
-+	{
-+		return pPageBreaks->Add( Before );
-+	}
-+	return uno::Any();
-+}
-+
-+uno::Reference< container::XEnumeration >
-+ScVbaVPageBreaks::createEnumeration() throw ( uno::RuntimeException )
-+{
-+	return new RangePageBreaksEnumWrapper( m_xIndexAccess );
-+}
-+
-+uno::Any
-+ScVbaVPageBreaks::createCollectionObject( const css::uno::Any& aSource )
-+{
-+	return aSource; // its already a pagebreak object
-+}
-+
-+uno::Type 
-+ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException )
-+{
-+	return excel::XVPageBreak::static_type( 0 );
-+}
-+
-+rtl::OUString& 
-+ScVbaVPageBreaks::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM( "ScVbaVPageBreaks" ) );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaVPageBreaks::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.VPageBreaks" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-diff --git sc/source/ui/vba/vbapagebreaks.hxx sc/source/ui/vba/vbapagebreaks.hxx
-old mode 100644
-new mode 100755
-index 530d82a..cc2a642
---- sc/source/ui/vba/vbapagebreaks.hxx
-+++ sc/source/ui/vba/vbapagebreaks.hxx
-@@ -33,6 +33,8 @@
- #include <cppuhelper/implbase1.hxx>
- #include <ooo/vba/excel/XHPageBreaks.hpp>
- #include <ooo/vba/excel/XHPageBreak.hpp>
-+#include <ooo/vba/excel/XVPageBreaks.hpp>
-+#include <ooo/vba/excel/XVPageBreak.hpp>
- #include <ooo/vba/excel/XRange.hpp>
- #include <com/sun/star/uno/XComponentContext.hpp>
- #include <com/sun/star/script/BasicErrorException.hpp>
-@@ -68,4 +70,31 @@ public:
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
- };
- 
-+//VPageBreaks
-+typedef CollTestImplHelper< ov::excel::XVPageBreaks > ScVbaVPageBreaks_BASE;
-+
-+class ScVbaVPageBreaks : public ScVbaVPageBreaks_BASE
-+{
-+	css::uno::Reference< css::sheet::XSheetPageBreak > mxSheetPageBreak;
-+
-+public:
-+	ScVbaVPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent, 
-+					  const css::uno::Reference< css::uno::XComponentContext >& xContext,
-+            		  css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( css::uno::RuntimeException );
-+
-+	virtual ~ScVbaVPageBreaks();
-+
-+	// XVPageBreaks 
-+	virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
-+
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException );
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw ( css::uno::RuntimeException );	
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& );
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
- #endif
-diff --git sc/source/ui/vba/vbaworksheet.cxx sc/source/ui/vba/vbaworksheet.cxx
-old mode 100644
-new mode 100755
-index d687610..fddb886
---- sc/source/ui/vba/vbaworksheet.cxx
-+++ sc/source/ui/vba/vbaworksheet.cxx
-@@ -370,6 +370,16 @@ ScVbaWorksheet::HPageBreaks( const uno::Any& aIndex ) throw (uno::RuntimeExcepti
-    return uno::makeAny( xHPageBreaks );
- }
- 
-+uno::Any
-+ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex ) throw ( uno::RuntimeException )
-+{
-+	uno::Reference< sheet::XSheetPageBreak > xSheetPageBreak( getSheet(), uno::UNO_QUERY_THROW );
-+	uno::Reference< excel::XVPageBreaks > xVPageBreaks( new ScVbaVPageBreaks( this, mxContext, xSheetPageBreak ) ); 
-+	if( aIndex.hasValue() )
-+		return xVPageBreaks->Item( aIndex, uno::Any()); 
-+	return uno::makeAny( xVPageBreaks );
-+}
-+
- sal_Int32 
- ScVbaWorksheet::getStandardWidth() throw (uno::RuntimeException)
- {
-diff --git sc/source/ui/vba/vbaworksheet.hxx sc/source/ui/vba/vbaworksheet.hxx
-index e70b282..b275960 100644
---- sc/source/ui/vba/vbaworksheet.hxx
-+++ sc/source/ui/vba/vbaworksheet.hxx
-@@ -44,6 +44,7 @@
- #include <ooo/vba/excel/XOutline.hpp>
- #include <ooo/vba/excel/XPageSetup.hpp>
- #include <ooo/vba/excel/XHPageBreaks.hpp>
-+#include <ooo/vba/excel/XVPageBreaks.hpp>
- #include <ooo/vba/excel/XChartObjects.hpp>
- #include <com/sun/star/container/XNamed.hpp>
- 
-@@ -94,6 +95,7 @@ public:
- 	virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Reference< ov::excel::XPageSetup > SAL_CALL PageSetup( ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL HPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL VPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() throw (css::uno::RuntimeException);
- 	virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() throw (css::uno::RuntimeException);
-  	virtual sal_Int16 SAL_CALL getIndex() throw (css::uno::RuntimeException);
diff --git a/applied_patches/0472-transogl-transitions-sd.diff b/applied_patches/0354-transogl-transitions-sd.diff
similarity index 100%
rename from applied_patches/0472-transogl-transitions-sd.diff
rename to applied_patches/0354-transogl-transitions-sd.diff
diff --git a/applied_patches/0354-vba-combobox-listindex-fix.diff b/applied_patches/0354-vba-combobox-listindex-fix.diff
deleted file mode 100644
index fe961f663..000000000
--- a/applied_patches/0354-vba-combobox-listindex-fix.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git vbahelper/source/msforms/vbacombobox.cxx vbahelper/source/msforms/vbacombobox.cxx
-index f1ea440..7c27734 100644
---- vbahelper/source/msforms/vbacombobox.cxx
-+++ vbahelper/source/msforms/vbacombobox.cxx
-@@ -63,9 +63,17 @@ ScVbaComboBox::getValue() throw (uno::RuntimeException)
- void SAL_CALL 
- ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
- {
--    uno::Sequence< sal_Int16 > sSelection(1);
--    _value >>= sSelection[ 0 ];
--    m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( sSelection ) );
-+    sal_Int16 nIndex = 0;
-+    if( _value >>= nIndex )
-+    {
-+	    uno::Sequence< rtl::OUString > sItems;
-+    	m_xProps->getPropertyValue( ITEMS ) >>= sItems;
-+        if( ( nIndex >= 0 ) && ( sItems.getLength() > nIndex ) )
-+        {
-+            rtl::OUString sText = sItems[ nIndex ];
-+            m_xProps->setPropertyValue( TEXT, uno::makeAny( sText ) );
-+        }
-+    }
- }
- 
- uno::Any SAL_CALL 
diff --git a/applied_patches/0473-transogl-transitions-officecfg.diff b/applied_patches/0355-transogl-transitions-officecfg.diff
similarity index 100%
rename from applied_patches/0473-transogl-transitions-officecfg.diff
rename to applied_patches/0355-transogl-transitions-officecfg.diff
diff --git a/applied_patches/0355-vba-fix-copysheet-toend.diff b/applied_patches/0355-vba-fix-copysheet-toend.diff
deleted file mode 100644
index a88044f0a..000000000
--- a/applied_patches/0355-vba-fix-copysheet-toend.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git sc/source/ui/docshell/docsh5.cxx sc/source/ui/docshell/docsh5.cxx
-index 3b5986c..fe54573 100644
---- sc/source/ui/docshell/docsh5.cxx
-+++ sc/source/ui/docshell/docsh5.cxx
-@@ -69,6 +69,7 @@
- #include "waitoff.hxx"
- #include "sizedev.hxx"
- #include <basic/sbstar.hxx>
-+#include <basic/basmgr.hxx>
- 
- // defined in docfunc.cxx
- void lcl_InsertModule( ScDocShell& rDocSh, SCTAB nTab, String& sModuleName, String& sModuleSource );
-@@ -844,17 +845,27 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
- 			}
- 			
- 			StarBASIC* pStarBASIC = GetBasic();
-+        		String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-+                        if ( GetBasicManager()->GetName().Len() > 0 )
-+			{
-+				aLibName = GetBasicManager()->GetName();
-+				pStarBASIC = GetBasicManager()->GetLib( aLibName );
-+			}
- 			BOOL bVbaEnabled = pStarBASIC ? pStarBASIC->isVBAEnabled() : FALSE;
-+			SCTAB nTabToUse = nDestTab; 
-+
-+			if ( nDestTab == SC_TAB_APPEND )
-+				nTabToUse = aDocument.GetMaxTableNumber() - 1;
-+
- 			if ( bVbaEnabled )
- 			{
- 				String sCodeName;
- 				String sSource;
--				aDocument.GetCodeName( nDestTab, sCodeName );
-+				aDocument.GetCodeName( nTabToUse, sCodeName );
- 				com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > xLibContainer = GetBasicContainer();
- 				com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > xLib;
-     				if( xLibContainer.is() )
-     				{
--        				String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-         				com::sun::star::uno::Any aLibAny = xLibContainer->getByName( aLibName );
-         				aLibAny >>= xLib;
-     				}
-@@ -867,7 +878,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
- 					xLib->getByName( sModName ) >>= sModuleInfo;
- 					sSource = sModuleInfo.ModuleSource;
- 				} 
--				lcl_InsertModule( *this, nDestTab, sCodeName, sSource );
-+				lcl_InsertModule( *this, nTabToUse, sCodeName, sSource );
- 			}
- 		}
- 
diff --git a/applied_patches/0474-ooo67658.sfx2.reloadcrash.diff b/applied_patches/0356-ooo67658.sfx2.reloadcrash.diff
similarity index 100%
rename from applied_patches/0474-ooo67658.sfx2.reloadcrash.diff
rename to applied_patches/0356-ooo67658.sfx2.reloadcrash.diff
diff --git a/applied_patches/0356-vba-improve-toolbarapi-macro-search.diff b/applied_patches/0356-vba-improve-toolbarapi-macro-search.diff
deleted file mode 100644
index b09e92303..000000000
--- a/applied_patches/0356-vba-improve-toolbarapi-macro-search.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-index fdea661..718cdd0 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-@@ -290,19 +290,51 @@ ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (u
-         rtl::OUString aCommandURL;
-         rtl::OUString sScheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
-         SbModule* pModule = StarBASIC::GetActiveModule();
--        if( pModule )
-+        StarBASIC* pLib = pModule ? dynamic_cast< StarBASIC* >( pModule->GetParent() ) : NULL;
-+
-+        // Ok, we should be able to deal with the following params for onAction
-+        // a) macro ( we assume the macro lives in this Project ( that is not really a valid assumption but we can't currently search outside this Library yet )
-+        // b) module.macro ( again assume the macro is in this Project ) 
-+        // c) project.module.macro fully specified
-+
-+        if( pModule && pLib )
-         {
--            String sTmp = _onaction;
--            if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pModule->Find( sTmp, SbxCLASS_METHOD ) ) )
-+            String sProject; 
-+            String sModule;
-+            String sMacro = _onaction;
-+
-+            sal_Int32 nMacroDot = _onaction.lastIndexOf( '.' );
-+
-+            if ( nMacroDot != -1 )
-+            {
-+                sMacro = _onaction.copy( nMacroDot + 1 );
-+
-+                sal_Int32 nProjectDot = _onaction.lastIndexOf( '.',  nMacroDot - 1 );
-+                if ( nProjectDot != -1 )
-+                {
-+                    sModule = _onaction.copy( nProjectDot + 1, nMacroDot - nProjectDot - 1 );
-+                    pModule = NULL; // force full spec. no search
-+              
-+                } 
-+                else
-+                    sModule = _onaction.copy( 0, nMacroDot );
-+                pModule = pLib->FindModule( sModule );
-+            }
-+
-+            // Hopefully eventually if no project is specified 'Find' below
-+            // will do the right thing
-+            if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pModule ? pModule->Find( sMacro, SbxCLASS_METHOD ) : NULL ) )
-             {
-                 if(  pMethod )
-                 {
--                        sTmp.Insert( '.', 0 ).Insert( pModule->GetName(), 0 ).Insert( '.', 0 ).Insert( pModule->GetParent()->GetName(), 0 );
-+                    sModule = pModule->GetName();
-+                    sProject = pModule->GetParent()->GetName();
-                 }
-             }
-+            sMacro.Insert( '.', 0 ).Insert( sModule, 0 ).Insert( '.', 0 ).Insert( sProject, 0 );
- 
-             rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
--            aCommandURL = sScheme.concat( sTmp ).concat( sUrlPart2 );
-+            aCommandURL = sScheme.concat( sMacro ).concat( sUrlPart2 );
-             OSL_TRACE("**** METHOD IS %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
-         }
-         else
diff --git a/applied_patches/0357-fix-doc-exit-basic-error-core.diff b/applied_patches/0357-fix-doc-exit-basic-error-core.diff
deleted file mode 100644
index 48de34fcd..000000000
--- a/applied_patches/0357-fix-doc-exit-basic-error-core.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sfx2/source/appl/app.cxx
-===================================================================
---- sfx2/source/appl/app.cxx	(revision 268722)
-+++ sfx2/source/appl/app.cxx	(working copy)
-@@ -753,7 +753,7 @@
-     basicide_handle_basic_error pSymbol = (basicide_handle_basic_error) osl_getFunctionSymbol( handleMod, aSymbol.pData );
- 
-     // call basicide_handle_basic_error in basctl
--    long nRet = pSymbol( pStarBasic );
-+    long nRet = pSymbol ? pSymbol( pStarBasic ) : 0;
- 
- 	return nRet;
- }
diff --git a/applied_patches/0475-oooXXXXX.vcl.x86_64.impressatk.diff b/applied_patches/0357-oooXXXXX.vcl.x86_64.impressatk.diff
similarity index 100%
rename from applied_patches/0475-oooXXXXX.vcl.x86_64.impressatk.diff
rename to applied_patches/0357-oooXXXXX.vcl.x86_64.impressatk.diff
diff --git a/applied_patches/0476-ooo73201.sw.a11yloadcrash.diff b/applied_patches/0358-ooo73201.sw.a11yloadcrash.diff
similarity index 100%
rename from applied_patches/0476-ooo73201.sw.a11yloadcrash.diff
rename to applied_patches/0358-ooo73201.sw.a11yloadcrash.diff
diff --git a/applied_patches/0358-read-vba-dir-stream-fix.diff b/applied_patches/0358-read-vba-dir-stream-fix.diff
deleted file mode 100644
index 2a99b6322..000000000
--- a/applied_patches/0358-read-vba-dir-stream-fix.diff
+++ /dev/null
@@ -1,885 +0,0 @@
-diff --git svtools/inc/filterutils.hxx svtools/inc/filterutils.hxx
-new file mode 100644
-index 0000000..a05025f
---- /dev/null
-+++ svtools/inc/filterutils.hxx
-@@ -0,0 +1,22 @@
-+#ifndef SVTOOLS_INC_FILTERUTILS_HXX
-+#define SVTOOLS_INC_FILTERUTILS_HXX
-+
-+#include "svtools/svtdllapi.h"
-+#include <com/sun/star/uno/RuntimeException.hpp>
-+namespace svt
-+{
-+    class BinFilterUtils
-+    {
-+    private:
-+        BinFilterUtils();    // never implemented
-+
-+    public:
-+        SVT_DLLPUBLIC static  rtl::OUString CreateOUStringFromUniStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
-+        SVT_DLLPUBLIC static  rtl::OUString CreateOUStringFromStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
-+    };
-+
-+//........................................................................
-+} // namespace svt
-+//........................................................................
-+
-+#endif 
-diff --git svtools/prj/d.lst svtools/prj/d.lst
-index d0a7a98..7757b38 100644
---- svtools/prj/d.lst
-+++ svtools/prj/d.lst
-@@ -173,6 +173,7 @@ mkdir: %_DEST%\inc%_EXT%\svtools
- ..\inc\svtools\httpcook.hxx %_DEST%\inc%_EXT%\svtools\httpcook.hxx
- ..\inc\imageresourceaccess.hxx %_DEST%\inc%_EXT%\svtools\imageresourceaccess.hxx
- ..\inc\bindablecontrolhelper.hxx %_DEST%\inc%_EXT%\svtools\bindablecontrolhelper.hxx
-+..\inc\filterutils.hxx %_DEST%\inc%_EXT%\svtools\filterutils.hxx
- ..\inc\svtools\itemprop.hxx %_DEST%\inc%_EXT%\svtools\itemprop.hxx
- ..\inc\addresstemplate.hxx %_DEST%\inc%_EXT%\svtools\addresstemplate.hxx
- ..\inc\svtools\genericunodialog.hxx %_DEST%\inc%_EXT%\svtools\genericunodialog.hxx
-diff --git svtools/source/misc/filterutils.cxx svtools/source/misc/filterutils.cxx
-new file mode 100644
-index 0000000..91a6ca4
---- /dev/null
-+++ svtools/source/misc/filterutils.cxx
-@@ -0,0 +1,56 @@
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_svtools.hxx"
-+#include "filterutils.hxx"
-+#include <rtl/ustrbuf.hxx>
-+
-+namespace svt
-+{
-+//........................................................................
-+
-+    using namespace ::com::sun::star;
-+
-+    rtl::OUString lcl_createStringFromArray( const char* pcCharArr, sal_uInt32 nBufSize, bool bIsCompressed )
-+    {
-+        rtl::OUStringBuffer aBuffer;
-+        if( bIsCompressed )
-+        {
-+            // buffer contains compressed Unicode, not encoded bytestring
-+            sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize );
-+            aBuffer.setLength( nStrLen );
-+            const char* pcCurrChar = pcCharArr;
-+            for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar, ++pcCurrChar )
-+                /*  *pcCurrChar may contain negative values and therefore MUST be
-+                    casted to unsigned char, before assigned to a sal_Unicode. */
-+                aBuffer.setCharAt( nChar, static_cast< unsigned char >( *pcCurrChar ) );
-+        }
-+        else
-+        {
-+            // buffer contains Little-Endian Unicode
-+            sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize ) / 2;
-+            aBuffer.setLength( nStrLen );
-+            const char* pcCurrChar = pcCharArr;
-+            for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar )
-+            {
-+                /*  *pcCurrChar may contain negative values and therefore MUST be
-+                    casted to unsigned char, before assigned to a sal_Unicode. */
-+                sal_Unicode cChar = static_cast< unsigned char >( *pcCurrChar++ );
-+                cChar |= (static_cast< unsigned char >( *pcCurrChar++ ) << 8);
-+                aBuffer.setCharAt( nChar, cChar );
-+            }
-+        }
-+        return aBuffer.makeStringAndClear();
-+    }
-+
-+    rtl::OUString BinFilterUtils::CreateOUStringFromUniStringArray( const char* pcCharArr, sal_uInt32 nBufSize )
-+    {
-+        return lcl_createStringFromArray( pcCharArr, nBufSize, false );
-+    }
-+
-+    rtl::OUString BinFilterUtils::CreateOUStringFromStringArray( const char* pcCharArr, sal_uInt32 nBufSize )
-+    {
-+        return lcl_createStringFromArray( pcCharArr, nBufSize, true );
-+    }    
-+//........................................................................
-+} // namespace svt
-+//........................................................................
-+
-diff --git svtools/source/misc/makefile.mk svtools/source/misc/makefile.mk
-index 58943ad..e78ee40 100644
---- svtools/source/misc/makefile.mk
-+++ svtools/source/misc/makefile.mk
-@@ -86,6 +86,7 @@ SLOFILES=\
-     $(SLO)$/sharecontrolfile.obj   \
-     $(SLO)$/documentlockfile.obj   \
-     $(SLO)$/bindablecontrolhelper.obj   \
-+    $(SLO)$/filterutils.obj   \
-     $(SLO)$/langtab.obj
- 
- # --- Targets -------------------------------------------------------
-diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index c4f61b3..598e0ea 100644
---- svx/source/msfilter/msocximex.cxx
-+++ svx/source/msfilter/msocximex.cxx
-@@ -97,6 +97,7 @@
- #include <com/sun/star/sheet/XSpreadsheetView.hpp>
- #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
- #include <com/sun/star/sheet/XCellRangeReferrer.hpp>
-+#include <svtools/filterutils.hxx>
-  
- #ifndef C2S
- #define C2S(cChar)	String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
-@@ -354,35 +355,11 @@ void lclReadCharArray( SvStorageStream& rStrm, char*& rpcCharArr, sal_uInt32 nLe
-  */
- OUString lclCreateOUString( const char* pcCharArr, sal_uInt32 nLenFld )
- {
--    OUStringBuffer aBuffer;
-     sal_uInt32 nBufSize = lclGetBufferSize( nLenFld );
-     if( lclIsCompressed( nLenFld ) )
--    {
--        // buffer contains compressed Unicode, not encoded bytestring
--        sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize );
--        aBuffer.setLength( nStrLen );
--        const char* pcCurrChar = pcCharArr;
--        for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar, ++pcCurrChar )
--            /*  *pcCurrChar may contain negative values and therefore MUST be
--                casted to unsigned char, before assigned to a sal_Unicode. */
--            aBuffer.setCharAt( nChar, static_cast< unsigned char >( *pcCurrChar ) );
--    }
--    else
--    {
--        // buffer contains Little-Endian Unicode
--        sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize ) / 2;
--        aBuffer.setLength( nStrLen );
--        const char* pcCurrChar = pcCharArr;
--        for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar )
--        {
--            /*  *pcCurrChar may contain negative values and therefore MUST be
--                casted to unsigned char, before assigned to a sal_Unicode. */
--            sal_Unicode cChar = static_cast< unsigned char >( *pcCurrChar++ );
--            cChar |= (static_cast< unsigned char >( *pcCurrChar++ ) << 8);
--            aBuffer.setCharAt( nChar, cChar );
--        }
--    }
--    return aBuffer.makeStringAndClear();
-+        return svt::BinFilterUtils::CreateOUStringFromStringArray( pcCharArr, nBufSize );
-+
-+    return svt::BinFilterUtils::CreateOUStringFromUniStringArray( pcCharArr, nBufSize );
- }
- 
- // export ---------------------------------------------------------------------
-diff --git svx/source/msfilter/mstoolbar.cxx svx/source/msfilter/mstoolbar.cxx
-index 6e1dec0..2647c58 100644
---- svx/source/msfilter/mstoolbar.cxx
-+++ svx/source/msfilter/mstoolbar.cxx
-@@ -10,6 +10,8 @@
- #include <map>
- #include <sfx2/objsh.hxx>
- #include <basic/basmgr.hxx>
-+#include <svtools/filterutils.hxx>
-+#include <boost/scoped_array.hpp>
- 
- int TBBase::nIndent = 0;
- 
-@@ -26,7 +28,10 @@ void CustomToolBarImportHelper::applyIcons()
-         uno::Reference< ui::XImageManager > xImageManager( getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
-         // 1 seems to work best for MSO images, otherwise they don't get displayed ( I guess the default size
-         // in ooo is different )
--        xImageManager->insertImages( 1,  commands, images );
-+        //xImageManager->insertImages( 1,  commands, images ); // #FIXME and scale images based on default icon size
-+        xImageManager->replaceImages( 1,  commands, images );
-+        xImageManager->replaceImages( 2,  commands, images );
-+        xImageManager->replaceImages( 3,  commands, images );
-     }
- }
- 
-@@ -107,15 +112,10 @@ TBBase::indent_printf( FILE* fp, const char* format, ... )
- 
- rtl::OUString TBBase::readUnicodeString( SvStream* pS, sal_Int32 nChars )
- {
--    rtl::OUStringBuffer buf(40);
--    for ( sal_Int32 index = 0; index < nChars; ++index )
--    {
--        sal_uInt16 ch = 0;
--        *pS >> ch;
--        sal_Unicode uni = static_cast< sal_Unicode >( ch );
--        buf.append( &uni, 1 );
--    }
--    return buf.makeStringAndClear();
-+    sal_Int32 nBufSize = nChars * 2;
-+    boost::scoped_array< sal_uInt8 > pArray( new sal_uInt8[ nBufSize ] );
-+    pS->Read( pArray.get(), nBufSize );
-+    return svt::BinFilterUtils::CreateOUStringFromUniStringArray(  reinterpret_cast< const char* >( pArray.get() ), nBufSize );
- }
- 
- TBCHeader::TBCHeader() : bSignature( 0x3 )
-diff --git svx/source/msfilter/msvbasic.cxx svx/source/msfilter/msvbasic.cxx
-index a8aac8a..e040862 100644
---- svx/source/msfilter/msvbasic.cxx
-+++ svx/source/msfilter/msvbasic.cxx
-@@ -43,79 +43,13 @@
- #include <fstream>
- #include <memory>
- #include <rtl/ustrbuf.hxx>
-+#include <boost/shared_ptr.hpp>
-+#include <boost/scoped_array.hpp>
-+#include <boost/shared_array.hpp>
-+#include <svtools/filterutils.hxx>
- 
- using namespace ::com::sun::star::script;
- 
--// #FIXME this routine is stolen from msocximex ( needs to be somewhere central )
--
--const sal_uInt32 SVX_MSOCX_SIZEMASK     = 0x7FFFFFFF;   /// Mask for character buffer size.
--const sal_uInt32 SVX_MSOCX_COMPRESSED   = 0x80000000; 
--
--inline bool lclIsCompressed( sal_uInt32 nLenFld )
--{
--    return (nLenFld & SVX_MSOCX_COMPRESSED) != 0;
--}
--
--
--/** Extracts and returns the memory size of the character buffer.
--    @return  Character buffer size (may differ from resulting string length!).
-- */
--inline sal_uInt32 lclGetBufferSize( sal_uInt32 nLenFld )
--{
--    return nLenFld & SVX_MSOCX_SIZEMASK;
--}
--/** Creates an OUString from a character array created with lclReadCharArray().
--
--    The passed parameters must match, that means the length field must be the
--    same used to create the passed character array.
--
--    @param pcCharArr
--        The character array returned by lclReadCharArray(). May be compressed
--        or uncompressed, next parameter nLenFld will specify this.
--
--    @param nLenFld
--        MUST be the same string length field that has been passed to
--        lclReadCharArray() to create the character array in previous parameter
--        pcCharArr.
--
--    @return
--        An OUString containing the decoded string data. Will be empty if
--        pcCharArr is 0.
-- */
--rtl::OUString lclCreateOUString( const char* pcCharArr, sal_uInt32 nLenFld )
--{
--    rtl::OUStringBuffer aBuffer;
--    sal_uInt32 nBufSize = lclGetBufferSize( nLenFld );
--    if( lclIsCompressed( nLenFld ) )
--    {
--        // buffer contains compressed Unicode, not encoded bytestring
--        sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize );
--        aBuffer.setLength( nStrLen );
--        const char* pcCurrChar = pcCharArr;
--        for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar, ++pcCurrChar )
--            /*  *pcCurrChar may contain negative values and therefore MUST be
--                casted to unsigned char, before assigned to a sal_Unicode. */
--            aBuffer.setCharAt( nChar, static_cast< unsigned char >( *pcCurrChar ) );
--    }
--    else
--    {
--        // buffer contains Little-Endian Unicode
--        sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize ) / 2;
--        aBuffer.setLength( nStrLen );
--        const char* pcCurrChar = pcCharArr;
--        for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar )
--        {
--            /*  *pcCurrChar may contain negative values and therefore MUST be
--                casted to unsigned char, before assigned to a sal_Unicode. */
--            sal_Unicode cChar = static_cast< unsigned char >( *pcCurrChar++ );
--            cChar |= (static_cast< unsigned char >( *pcCurrChar++ ) << 8);
--            aBuffer.setCharAt( nChar, cChar );
--        }
--    }
--    return aBuffer.makeStringAndClear();
--}
--
--
- namespace MSLZSS {
- 
- static unsigned int getShift( sal_uInt32 nPos )
-@@ -238,23 +172,21 @@ sal_Int16 Reserved1;
- sal_Int16 Version;
- sal_Int8 Reserved2;
- sal_Int16 Reserved3;
--sal_uInt8* PerformanceCache;
-+boost::scoped_array< sal_uInt8 > PerformanceCache;
- sal_Int32 PerformanceCacheSize;
--_VBA_PROJECT_VDPI(): Reserved1( 0x61CC), Version( 0xFFFF ), Reserved2(0x0), Reserved3(0x0), PerformanceCache(0),  PerformanceCacheSize(0) {}
-+_VBA_PROJECT_VDPI(): Reserved1( 0x61CC), Version( 0xFFFF ), Reserved2(0x0), Reserved3(0x0), PerformanceCacheSize(0) {}
- ~_VBA_PROJECT_VDPI()
- {
--    if (  PerformanceCache )
--       delete [] PerformanceCache;
--    PerformanceCache = 0;
-     PerformanceCacheSize = 0;
- }
- void read(){}
- void write( SvStream* pStream )
- {
-     *pStream << Reserved1 << Version << Reserved2 << Reserved3;
--    for( sal_Int32 i = 0; PerformanceCache && i < PerformanceCacheSize; ++i )
-+    if ( PerformanceCacheSize )
-     {
--        *pStream >> PerformanceCache[ i ];
-+        PerformanceCache.reset( new sal_uInt8[ PerformanceCacheSize ] );
-+        pStream->Read( PerformanceCache.get(), PerformanceCacheSize );
-     }
- }
- };
-@@ -320,27 +252,22 @@ class ProjectNameRecord
- public:
- sal_Int16 Id;
- sal_Int32 SizeOfProjectName;
--sal_uInt8* ProjectName;
--rtl::OUString msProjectName;
--ProjectNameRecord() : Id( 0x04 ), SizeOfProjectName( 0x0 ), ProjectName(0) {}
-+rtl::OUString ProjectName;
-+ProjectNameRecord() : Id( 0x04 ), SizeOfProjectName( 0x0 ){}
- ~ProjectNameRecord()
- {
--    delete [] ProjectName;
--    ProjectName = 0;
- }
- void read( SvStream* pStream )
- {
-     OSL_TRACE("ProjectNameRecord [0x%x]", pStream->Tell() );
-     *pStream >> Id >> SizeOfProjectName;
--    if ( ProjectName )
--        delete [] ProjectName;
- 
-     if ( SizeOfProjectName ) 
-     {
--        ProjectName = new sal_uInt8[ SizeOfProjectName ];
-+        boost::scoped_array< sal_uInt8 > pProjectName( new sal_uInt8[ SizeOfProjectName ] );
-         OSL_TRACE("ProjectNameRecord about to read name from [0x%x], size %d", pStream->Tell(), SizeOfProjectName );
--        pStream->Read( ProjectName, SizeOfProjectName );
--        msProjectName = lclCreateOUString( reinterpret_cast< const char* >( ProjectName ), ( SVX_MSOCX_COMPRESSED |  SizeOfProjectName ) );
-+        pStream->Read( pProjectName.get(), SizeOfProjectName );
-+        ProjectName = svt::BinFilterUtils::CreateOUStringFromStringArray( reinterpret_cast< const char* >( pProjectName.get() ), SizeOfProjectName );
-     }
- }
- };
-@@ -350,42 +277,34 @@ class ProjectDocStringRecord
- public:
- sal_Int16 Id;
- sal_Int32 SizeOfDocString;
--sal_uInt8* DocString;
- sal_Int16 Reserved;
- sal_Int32 SizeOfDocStringUnicode;
--sal_uInt8* DocStringUnicode;
-+rtl::OUString DocString;
-+rtl::OUString DocStringUnicode; 
- 
--ProjectDocStringRecord() : Id( 0x5 ), SizeOfDocString( 0x0 ), DocString( 0 ), Reserved( 0x0 ), SizeOfDocStringUnicode( 0 ), DocStringUnicode( 0 ) {}
-+ProjectDocStringRecord() : Id( 0x5 ), SizeOfDocString( 0x0 ), Reserved( 0x0 ), SizeOfDocStringUnicode( 0 ){}
- 
- ~ProjectDocStringRecord()
- {
--    delete [] DocString;
--    delete [] DocStringUnicode;
--    DocString = 0;
--    DocStringUnicode = 0;
- }
- void read( SvStream* pStream )
- {
-     OSL_TRACE("ProjectDocStringRecord [0x%x]", pStream->Tell() );
-     *pStream >> Id >> SizeOfDocString;
- 
--    if ( DocString )
--        delete [] DocString;
- 
--    DocString = new sal_uInt8[ SizeOfDocString ];
--    pStream->Read( DocString, SizeOfDocString );
--
--    if ( SizeOfDocStringUnicode )
--        delete [] DocStringUnicode;
-+    boost::scoped_array< sal_uInt8 > pDocString( new sal_uInt8[ SizeOfDocString ] );
-+    pStream->Read( pDocString.get(), SizeOfDocString );
-+ 
-+    DocString = svt::BinFilterUtils::CreateOUStringFromStringArray( reinterpret_cast< const char* >( pDocString.get() ), SizeOfDocString );
- 
-     *pStream >> Reserved >> SizeOfDocStringUnicode;
- 
--    if ( DocStringUnicode )
--        delete [] DocStringUnicode;
-+    boost::scoped_array< sal_uInt8 > pDocStringUnicode( new sal_uInt8[ SizeOfDocStringUnicode ] );
- 
--    DocStringUnicode =  new sal_uInt8[ SizeOfDocStringUnicode ];
-+    pStream->Read( pDocStringUnicode.get(), SizeOfDocStringUnicode );
-+    DocStringUnicode = svt::BinFilterUtils::CreateOUStringFromUniStringArray( reinterpret_cast< const char* >( pDocStringUnicode.get() ), SizeOfDocString );
- 
--    pStream->Read( DocStringUnicode, SizeOfDocStringUnicode );
- }
- 
- };
-@@ -395,39 +314,28 @@ class ProjectHelpFilePath
- public:
- sal_Int16 Id;
- sal_Int32 SizeOfHelpFile1;
--sal_uInt8* HelpFile1;
-+boost::scoped_array< sal_uInt8 > HelpFile1;
- sal_Int16 Reserved;
- sal_Int32 SizeOfHelpFile2;
--sal_uInt8* HelpFile2;
-+boost::scoped_array< sal_uInt8 > HelpFile2;
- 
--ProjectHelpFilePath() : Id( 0x06 ), SizeOfHelpFile1(0), HelpFile1(0), Reserved(0x0), SizeOfHelpFile2(0), HelpFile2(0) {}
-+ProjectHelpFilePath() : Id( 0x06 ), SizeOfHelpFile1(0), Reserved(0x0), SizeOfHelpFile2(0) {}
- ~ProjectHelpFilePath()
- {
--    if ( HelpFile1 )
--        delete [] HelpFile1;
--    if ( HelpFile2 )
--        delete [] HelpFile2;
--    HelpFile1 = 0;
--    HelpFile2 = 0;
- }
-+
- void read( SvStream* pStream )
- {
-     OSL_TRACE("ProjectHelpFilePath [0x%x]", pStream->Tell() );
-     *pStream >> Id >> SizeOfHelpFile1;
- 
--    if ( HelpFile1 )
--        delete HelpFile1;
--
--    HelpFile1 = new sal_uInt8[ SizeOfHelpFile1 ];
--    pStream->Read( HelpFile1, SizeOfHelpFile1 );
-+    HelpFile1.reset( new sal_uInt8[ SizeOfHelpFile1 ] );
-+    pStream->Read( HelpFile1.get(), SizeOfHelpFile1 );
- 
-     *pStream >> Reserved >> SizeOfHelpFile2;
- 
--    if ( HelpFile2 )
--        delete HelpFile2;
--
--    HelpFile2 = new sal_uInt8[ SizeOfHelpFile2 ];
--    pStream->Read( HelpFile2, SizeOfHelpFile2 );
-+    HelpFile2.reset( new sal_uInt8[ SizeOfHelpFile2 ] );
-+    pStream->Read( HelpFile2.get(), SizeOfHelpFile2 );
-   
- }
- };
-@@ -483,40 +391,31 @@ class ProjectConstantsRecord
- {
- sal_Int16 Id;
- sal_Int32 SizeOfConstants;
--sal_uInt8* Constants;
-+boost::scoped_array< sal_uInt8 > Constants;
- sal_Int16 Reserved;
- sal_Int32 SizeOfConstantsUnicode;
--sal_uInt8* ConstantsUnicode;
-+boost::scoped_array< sal_uInt8 > ConstantsUnicode;
- public:
- ProjectConstantsRecord() : Id( 0xC ), SizeOfConstants( 0 ), Constants( 0 ), Reserved( 0x3C ), SizeOfConstantsUnicode( 0 ), ConstantsUnicode(0) {}
- 
- ~ProjectConstantsRecord()
- {
--    delete [] Constants;
--    Constants = 0;
--    delete [] ConstantsUnicode;
--    ConstantsUnicode = 0;
- }
- 
- void read( SvStream* pStream )
- {
-     OSL_TRACE("ProjectConstantsRecord [0x%x]", pStream->Tell() );
-    *pStream >> Id >> SizeOfConstants;
--    if ( Constants )
--        delete [] Constants;
--    Constants = new sal_uInt8[ SizeOfConstants ];
-+    Constants.reset( new sal_uInt8[ SizeOfConstants ] );
- 
--    pStream->Read( Constants, SizeOfConstants );
-+    pStream->Read( Constants.get(), SizeOfConstants );
- 
-     *pStream >> Reserved;
- 
--    if ( ConstantsUnicode )
--        delete [] ConstantsUnicode;
--
-     *pStream >> SizeOfConstantsUnicode;
- 
--    ConstantsUnicode = new sal_uInt8[ SizeOfConstantsUnicode ];
--    pStream->Read( ConstantsUnicode, SizeOfConstantsUnicode );
-+    ConstantsUnicode.reset( new sal_uInt8[ SizeOfConstantsUnicode ] );
-+    pStream->Read( ConstantsUnicode.get(), SizeOfConstantsUnicode );
- }
- 
- };
-@@ -526,18 +425,14 @@ class ReferenceNameRecord
- public:
- sal_Int16 Id;
- sal_Int32 SizeOfName;
--sal_uInt8* Name;
-+rtl::OUString Name;
- sal_Int16 Reserved;
- sal_Int32 SizeOfNameUnicode;
--sal_uInt8* NameUnicode;
-+rtl::OUString NameUnicode;
- 
--ReferenceNameRecord() : Id( 0x16 ), SizeOfName( 0 ), Name( 0 ), Reserved( 0x3E ), SizeOfNameUnicode( 0 ), NameUnicode( 0 ) {}
-+ReferenceNameRecord() : Id( 0x16 ), SizeOfName( 0 ), Reserved( 0x3E ), SizeOfNameUnicode( 0 ){}
- ~ReferenceNameRecord()
- {
--    delete [] Name;
--    Name = 0;
--    delete [] NameUnicode;
--    NameUnicode = 0;
- }
- 
- void read( SvStream* pStream )
-@@ -545,20 +440,16 @@ void read( SvStream* pStream )
-     OSL_TRACE("NameRecord [0x%x]", pStream->Tell() );
-     *pStream >> Id >> SizeOfName;
-  
--    if ( Name )
--        delete [] Name;
-+    boost::scoped_array< sal_uInt8 > pName( new sal_uInt8[ SizeOfName ] );
- 
--    Name = new sal_uInt8[ SizeOfName ];
--
--    pStream->Read( Name, SizeOfName );
-+    pStream->Read( pName.get(), SizeOfName );
-+    Name = svt::BinFilterUtils::CreateOUStringFromStringArray( reinterpret_cast< const char* >( pName.get() ), SizeOfName );
- 
-     *pStream >> Reserved >> SizeOfNameUnicode;
- 
--    if ( NameUnicode )
--        delete [] Name;
--
--    NameUnicode = new sal_uInt8[ SizeOfNameUnicode ];
--    pStream->Read( NameUnicode, SizeOfNameUnicode );
-+    boost::scoped_array< sal_uInt8 > pNameUnicode( new sal_uInt8[ SizeOfNameUnicode ] );
-+    pStream->Read( pNameUnicode.get(), SizeOfNameUnicode );
-+    NameUnicode = svt::BinFilterUtils::CreateOUStringFromUniStringArray( reinterpret_cast< const char* >( pNameUnicode.get() ), SizeOfName );
- }
- 
- };
-@@ -581,13 +472,11 @@ public:
-     sal_uInt16 Id;
-     sal_uInt32 Size;
-     sal_uInt32 SizeOfLibidAbsolute;
--    sal_uInt8* pLibidAbsolute;
-     sal_uInt32 SizeOfLibidRelative; 
--    sal_uInt8* pLibidRelative;
-     sal_uInt32 MajorVersion;
-     sal_uInt16 MinorVersion;
--    rtl::OUString msAbsoluteLibid; 
--    rtl::OUString msRelativeLibid; 
-+    rtl::OUString AbsoluteLibid; 
-+    rtl::OUString RelativeLibid; 
- 
-     virtual bool read( SvStream* pStream );
-     virtual void import( VBA_Impl& rDir );
-@@ -595,16 +484,12 @@ public:
-     ~ReferenceProjectRecord();
- };
- 
--ReferenceProjectRecord::ReferenceProjectRecord() : Id( 0x000E ), Size( 0 ), SizeOfLibidAbsolute( 0 ), pLibidAbsolute( NULL ), SizeOfLibidRelative( 0 ), pLibidRelative( 0 ), MajorVersion( 0 ), MinorVersion( 0 )
-+ReferenceProjectRecord::ReferenceProjectRecord() : Id( 0x000E ), Size( 0 ), SizeOfLibidAbsolute( 0 ), SizeOfLibidRelative( 0 ), MajorVersion( 0 ), MinorVersion( 0 )
- {
- }
- 
- ReferenceProjectRecord::~ReferenceProjectRecord()
- {
--    if ( pLibidAbsolute )
--        delete[] pLibidAbsolute;
--    if ( pLibidRelative )
--        delete[] pLibidRelative;
- }
- 
- bool ReferenceProjectRecord::read( SvStream* pStream )
-@@ -612,21 +497,15 @@ bool ReferenceProjectRecord::read( SvStream* pStream )
-     OSL_TRACE("ReferenceProjectRecord [0x%x]", pStream->Tell() ); 
-     *pStream >> Id >> Size >> SizeOfLibidAbsolute;
- 
--    if ( SizeOfLibidAbsolute )
--    {
--        pLibidAbsolute = new sal_uInt8[ SizeOfLibidAbsolute ];
--        OSL_TRACE("ReferenceProjectRecord about to read LibidAbsolute at [0x%x]", pStream->Tell() );
--        pStream->Read( pLibidAbsolute, SizeOfLibidAbsolute );
--    }
-+    boost::scoped_array< sal_uInt8 > pLibidAbsolute( new sal_uInt8[ SizeOfLibidAbsolute ] );
-+    OSL_TRACE("ReferenceProjectRecord about to read LibidAbsolute at [0x%x]", pStream->Tell() );
-+    pStream->Read( pLibidAbsolute.get(), SizeOfLibidAbsolute );
- 
-     *pStream >> SizeOfLibidRelative; 
- 
--    if ( SizeOfLibidRelative )
--    {
--        pLibidRelative = new sal_uInt8[ SizeOfLibidRelative ];
--        OSL_TRACE("ReferenceProjectRecord about to read LibidRelative at [0x%x]", pStream->Tell() );
--        pStream->Read( pLibidRelative, SizeOfLibidRelative );
--    }
-+    boost::scoped_array< sal_uInt8 > pLibidRelative( new sal_uInt8[ SizeOfLibidRelative ] );
-+    OSL_TRACE("ReferenceProjectRecord about to read LibidRelative at [0x%x]", pStream->Tell() );
-+    pStream->Read( pLibidRelative.get(), SizeOfLibidRelative );
- 
-     *pStream >> MajorVersion >> MinorVersion;
- 
-@@ -634,17 +513,17 @@ bool ReferenceProjectRecord::read( SvStream* pStream )
-     // 16 bit unicode )
-     // the offset of 3 is needed to skip the ProjectReference "*\" and project kind ( 0x4[1-4] ) info.
- 
--    msAbsoluteLibid = lclCreateOUString( reinterpret_cast< const char* >( pLibidAbsolute + 3 ), ( SVX_MSOCX_COMPRESSED | (SizeOfLibidAbsolute - 3 )));
--    msRelativeLibid = lclCreateOUString( reinterpret_cast< const char* >( pLibidRelative + 3 ), ( SVX_MSOCX_COMPRESSED | ( SizeOfLibidRelative -3 )));
-+    AbsoluteLibid = svt::BinFilterUtils::CreateOUStringFromStringArray( reinterpret_cast< const char* >( pLibidAbsolute.get() + 3 ), (SizeOfLibidAbsolute - 3 ) );
-+    RelativeLibid = svt::BinFilterUtils::CreateOUStringFromStringArray( reinterpret_cast< const char* >( pLibidRelative.get() + 3 ), ( SizeOfLibidRelative -3 ) );
- 
--    OSL_TRACE("ReferenceProjectRecord - absolute path %s", rtl::OUStringToOString( msAbsoluteLibid, RTL_TEXTENCODING_UTF8 ).getStr() );
--    OSL_TRACE("ReferenceProjectRecord - relative path %s", rtl::OUStringToOString( msRelativeLibid, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    OSL_TRACE("ReferenceProjectRecord - absolute path %s", rtl::OUStringToOString( AbsoluteLibid, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    OSL_TRACE("ReferenceProjectRecord - relative path %s", rtl::OUStringToOString( RelativeLibid, RTL_TEXTENCODING_UTF8 ).getStr() );
-     return true;
- }
- 
- void ReferenceProjectRecord::import( VBA_Impl& rDir )
- {
--    rDir.AddProjectReference( msAbsoluteLibid );
-+    rDir.AddProjectReference( AbsoluteLibid );
- }
- 
- class ReferenceRegisteredRecord : public BaseReferenceRecord
-@@ -653,7 +532,7 @@ public:
-     sal_uInt16 Id;
-     sal_uInt32 Size;
-     sal_uInt32 SizeOfLibid;
--    sal_uInt8* pLibid;
-+    boost::scoped_array< sal_uInt8> pLibid;
-     sal_Int32 Reserved1;
-     sal_Int16 Reserved2;
- 
-@@ -662,16 +541,12 @@ public:
-     bool read( SvStream* pStream );
- };
- 
--ReferenceRegisteredRecord::ReferenceRegisteredRecord() : Id( 0x000D ), Size( 0 ), SizeOfLibid( 0 ), pLibid( NULL ), Reserved1( 0 ), Reserved2( 0 )
-+ReferenceRegisteredRecord::ReferenceRegisteredRecord() : Id( 0x000D ), Size( 0 ), SizeOfLibid( 0 ), Reserved1( 0 ), Reserved2( 0 )
- {
- }
- 
- ReferenceRegisteredRecord::~ReferenceRegisteredRecord()
- {
--    if ( pLibid )
--    {
--        delete[] pLibid;
--    }
- }
- 
- bool 
-@@ -681,9 +556,8 @@ ReferenceRegisteredRecord::read( SvStream* pStream )
-     *pStream >> Id >> Size >> SizeOfLibid;
-     if ( SizeOfLibid )
-     {
--        pLibid = new sal_uInt8[ SizeOfLibid ];
--        OSL_TRACE("ReferenceRegisteredRecord about to read Libid [0x%x]", pStream->Tell() ); 
--        pStream->Read( pLibid, SizeOfLibid );
-+        pLibid.reset( new sal_uInt8[ SizeOfLibid] );
-+        pStream->Read( pLibid.get(), SizeOfLibid );
-     }
-     *pStream >> Reserved1 >> Reserved2;
-     return true;
-@@ -694,17 +568,15 @@ class ReferenceOriginalRecord
- public:
-     sal_uInt16 Id;
-     sal_uInt32 SizeOfLibOriginal;
--    sal_uInt8* pLibidOriginal;
-+    boost::scoped_array< sal_uInt8 > pLibidOriginal;
- 
- 
--ReferenceOriginalRecord() : Id( 0x033 ), SizeOfLibOriginal( 0 ), pLibidOriginal( NULL )
-+ReferenceOriginalRecord() : Id( 0x033 ), SizeOfLibOriginal( 0 )
- {
- }
- 
- ~ReferenceOriginalRecord()
- {
--    if ( pLibidOriginal )
--        delete[] pLibidOriginal;
- }
- 
- void read( SvStream* pStream )
-@@ -712,8 +584,8 @@ void read( SvStream* pStream )
-     *pStream >> Id >> SizeOfLibOriginal;
-     if ( SizeOfLibOriginal )
-     {
--        pLibidOriginal = new sal_uInt8[ SizeOfLibOriginal ];
--        pStream->Read( pLibidOriginal, SizeOfLibOriginal );
-+        pLibidOriginal.reset( new sal_uInt8[ SizeOfLibOriginal ] );
-+        pStream->Read( pLibidOriginal.get(), SizeOfLibOriginal );
-     }
- }
- 
-@@ -722,24 +594,24 @@ void read( SvStream* pStream )
- class ReferenceControlRecord : public BaseReferenceRecord
- {
- public:
--ReferenceOriginalRecord OriginalRecord;
-+std::auto_ptr< ReferenceOriginalRecord > OriginalRecord;
- sal_Int16 Id;
- sal_uInt32 SizeTwiddled;
- sal_uInt32 SizeOfLibidTwiddled;
--sal_uInt8* LibidTwiddled;
-+boost::shared_array< sal_uInt8 > LibidTwiddled;
- sal_uInt32 Reserved1;
- sal_uInt16 Reserved2;
--ReferenceNameRecord* NameRecordExtended;// Optional
-+std::auto_ptr< ReferenceNameRecord > NameRecordExtended;// Optional
- sal_uInt16 Reserved3;
- sal_uInt32 SizeExtended;
- sal_uInt32 SizeOfLibidExtended;
--sal_uInt8* LibidExtended;
-+boost::shared_array< sal_uInt8 > LibidExtended;
- sal_uInt32 Reserved4;
- sal_uInt16 Reserved5;
- sal_uInt8  OriginalTypeLib[ 16 ];
- sal_uInt32 Cookie;
- 
--ReferenceControlRecord() : Id( 0x2F ), SizeTwiddled( 0 ), SizeOfLibidTwiddled( 0 ), LibidTwiddled( 0 ), Reserved1( 0 ), Reserved2( 0 ), NameRecordExtended( 0 ), Reserved3( 0x30 ), SizeExtended( 0 ), SizeOfLibidExtended( 0 ), LibidExtended( 0 ), Reserved4( 0 ), Reserved5( 0 ), Cookie( 0 )
-+ReferenceControlRecord() : Id( 0x2F ), SizeTwiddled( 0 ), SizeOfLibidTwiddled( 0 ), Reserved1( 0 ), Reserved2( 0 ), Reserved3( 0x30 ), SizeExtended( 0 ), SizeOfLibidExtended( 0 ), Reserved4( 0 ), Reserved5( 0 ), Cookie( 0 )
- {
-     for( int i = 0; i < 16; ++i )
-         OriginalTypeLib[ i ] = 0;
-@@ -747,29 +619,31 @@ ReferenceControlRecord() : Id( 0x2F ), SizeTwiddled( 0 ), SizeOfLibidTwiddled( 0
- 
- ~ReferenceControlRecord()
- {
--    delete LibidTwiddled;
--    delete NameRecordExtended;
--    delete [] LibidExtended;
--    LibidTwiddled = 0;
--    NameRecordExtended = 0;
--    LibidExtended = 0;
- }
- 
- bool read( SvStream* pStream )
- {
-     OSL_TRACE("ReferenceControlRecord [0x%x]", pStream->Tell() ); 
--    OriginalRecord.read( pStream );
-+    long nPos = pStream->Tell();
-+
-+    *pStream >> Id;
-+    pStream->Seek( nPos ); // point before the peeked Id
-+    if ( Id == 0x33 ) // we have an OriginalRecord
-+    {
-+        OriginalRecord.reset( new ReferenceOriginalRecord() );
-+        OriginalRecord->read( pStream );
-+    }
-     *pStream >> Id >> SizeTwiddled >> SizeOfLibidTwiddled;
- 
-     if ( SizeOfLibidTwiddled )
-     {
--        LibidTwiddled = new sal_uInt8[ SizeOfLibidTwiddled ];
--        pStream->Read( LibidTwiddled,  SizeOfLibidTwiddled );
-+        LibidTwiddled.reset( new sal_uInt8[ SizeOfLibidTwiddled ] );
-+        pStream->Read( LibidTwiddled.get(),  SizeOfLibidTwiddled );
-     }
- 
-     *pStream >> Reserved1 >> Reserved2;
- 
--    long nPos = pStream->Tell();
-+    nPos = pStream->Tell();
-     // peek at the id for optional NameRecord
-     sal_Int16 nTmpId;
-     *pStream >> nTmpId;
-@@ -780,7 +654,7 @@ bool read( SvStream* pStream )
-     else
-     {
-         pStream->Seek( nPos );
--        NameRecordExtended = new ReferenceNameRecord();
-+        NameRecordExtended.reset( new ReferenceNameRecord() );
-         NameRecordExtended->read( pStream );
-         *pStream >> Reserved3;
-     }
-@@ -788,8 +662,8 @@ bool read( SvStream* pStream )
- 
-     if ( SizeExtended )
-     {
--        LibidExtended = new sal_uInt8[ SizeOfLibidExtended ]; 
--        pStream->Read( LibidExtended, SizeOfLibidExtended );
-+        LibidExtended.reset( new sal_uInt8[ SizeOfLibidExtended ] ); 
-+        pStream->Read( LibidExtended.get(), SizeOfLibidExtended );
-     } 
- 
-     *pStream >> Reserved4;
-@@ -806,15 +680,12 @@ class ReferenceRecord : public BaseReferenceRecord
- {
- public:
- // NameRecord is Optional
--ReferenceNameRecord* NameRecord;
--BaseReferenceRecord*  aReferenceRecord;
--ReferenceRecord(): NameRecord(0), aReferenceRecord(0) {}
-+std::auto_ptr< ReferenceNameRecord > NameRecord;
-+std::auto_ptr< BaseReferenceRecord >  aReferenceRecord;
-+
-+ReferenceRecord(){}
- ~ReferenceRecord()
- {
--    if ( NameRecord )
--        delete NameRecord;       
--    if ( aReferenceRecord )
--        delete aReferenceRecord;       
- }
- 
- // false return would mean failed to read Record e.g. end of array encountered
-@@ -833,7 +704,7 @@ bool read( SvStream* pStream )
-     pStream->Seek( nPos ); // place back before Id
-     if ( Id == 0x16 ) // Optional NameRecord
-     {
--        NameRecord = new ReferenceNameRecord();
-+        NameRecord.reset( new ReferenceNameRecord() );
-         NameRecord->read( pStream ); 
-     }
-     else if ( Id == 0x0f )
-@@ -850,14 +721,14 @@ bool read( SvStream* pStream )
-     switch( Id )
-     {
-         case 0x0D:
--            aReferenceRecord = new ReferenceRegisteredRecord();
-+            aReferenceRecord.reset( new ReferenceRegisteredRecord() );
-             break; 
-         case 0x0E:
--            aReferenceRecord = new ReferenceProjectRecord();
-+            aReferenceRecord.reset( new ReferenceProjectRecord() );
-             break; 
-         case 0x2F:
-         case 0x33:
--            aReferenceRecord = new ReferenceControlRecord();
-+            aReferenceRecord.reset( new ReferenceControlRecord() );
-             break; 
-         default:
-             bRead = false;
-@@ -871,7 +742,7 @@ bool read( SvStream* pStream )
- 
- void import( VBA_Impl& rVBA )
- {
--    if ( aReferenceRecord )
-+    if ( aReferenceRecord.get() )
-         aReferenceRecord->import( rVBA );
- }
- 
-@@ -904,6 +775,7 @@ DirDumper() {}
- void read( SvStream* pStream )
- {
-     sal_Int32 nPos = pStream->Tell();
-+#ifdef DEBUG
-     std::ofstream aDump("dir.dump");
-     while ( !pStream->IsEof() ) 
-     {
-@@ -912,6 +784,7 @@ void read( SvStream* pStream )
-         aDump << aByte;
-     }
-     aDump.flush();
-+#endif
-     pStream->Seek( nPos );
-     readProjectInformation( pStream );
-     readProjectReferenceInformation( pStream );
-@@ -957,7 +830,7 @@ void import( VBA_Impl& rVBA )
-     // get project references
-     for ( std::vector< ReferenceRecord* >::iterator it = ReferenceArray.begin(); it != ReferenceArray.end(); ++it )
-         (*it)->import( rVBA );
--    rVBA.SetProjectName( mProjectNameRec.msProjectName );
-+    rVBA.SetProjectName( mProjectNameRec.ProjectName );
-     
- }
- };
diff --git a/applied_patches/0477-ooo86080.unopkg.bodge.diff b/applied_patches/0359-ooo86080.unopkg.bodge.diff
similarity index 100%
rename from applied_patches/0477-ooo86080.unopkg.bodge.diff
rename to applied_patches/0359-ooo86080.unopkg.bodge.diff
diff --git a/applied_patches/0359-vba-commandbar-enabled.diff b/applied_patches/0359-vba-commandbar-enabled.diff
deleted file mode 100644
index 7eb582a17..000000000
--- a/applied_patches/0359-vba-commandbar-enabled.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git oovbaapi/ooo/vba/XCommandBar.idl oovbaapi/ooo/vba/XCommandBar.idl
-index 5e27c6b..13d54da 100644
---- oovbaapi/ooo/vba/XCommandBar.idl
-+++ oovbaapi/ooo/vba/XCommandBar.idl
-@@ -54,6 +54,7 @@ interface XCommandBar
- 
-     [attribute] string Name;
-     [attribute] boolean Visible;
-+    [attribute] boolean Enabled;
-     
-     void Delete() raises ( com::sun::star::script::BasicErrorException );
-     any Controls( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
-diff --git vbahelper/source/vbahelper/vbacommandbar.cxx vbahelper/source/vbahelper/vbacommandbar.cxx
-index 55ba7b6..ba9f49b 100644
---- vbahelper/source/vbahelper/vbacommandbar.cxx
-+++ vbahelper/source/vbahelper/vbacommandbar.cxx
-@@ -267,6 +267,22 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
-         OSL_TRACE( "SetVisible get an exception\n" );
-     }
- }
-+
-+::sal_Bool SAL_CALL 
-+ScVbaCommandBar::getEnabled() throw (uno::RuntimeException)
-+{
-+    // #FIXME: seems tha main menu is alwayse enabled.
-+    // for the toolbar, need to investigate
-+    return sal_True;
-+}
-+
-+void SAL_CALL
-+ScVbaCommandBar::setEnabled( sal_Bool/* _enabled */ ) throw (uno::RuntimeException)
-+{
-+    // #FIXME: seems tha main menu is alwayse enabled.
-+    // for the toolbar, need to investigate
-+}
-+
- void SAL_CALL 
- ScVbaCommandBar::Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
- {
-diff --git vbahelper/source/vbahelper/vbacommandbar.hxx vbahelper/source/vbahelper/vbacommandbar.hxx
-index 0b830b2..c53a5cd 100644
---- vbahelper/source/vbahelper/vbacommandbar.hxx
-+++ vbahelper/source/vbahelper/vbacommandbar.hxx
-@@ -93,6 +93,8 @@ public:
-     virtual void SAL_CALL setName( const ::rtl::OUString& _name ) throw (css::uno::RuntimeException);
-     virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException);
- 
-     // Methods
-     virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
diff --git a/applied_patches/0478-oooXXXX.partial-revert-ooo95118.diff b/applied_patches/0360-oooXXXX.partial-revert-ooo95118.diff
similarity index 100%
rename from applied_patches/0478-oooXXXX.partial-revert-ooo95118.diff
rename to applied_patches/0360-oooXXXX.partial-revert-ooo95118.diff
diff --git a/applied_patches/0360-vba-worksheet-change-event-fix.diff b/applied_patches/0360-vba-worksheet-change-event-fix.diff
deleted file mode 100644
index f94845cc6..000000000
--- a/applied_patches/0360-vba-worksheet-change-event-fix.diff
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git sc/source/ui/vba/vbaeventshelper.cxx sc/source/ui/vba/vbaeventshelper.cxx
-index 8248d48..794cb84 100644
---- sc/source/ui/vba/vbaeventshelper.cxx
-+++ sc/source/ui/vba/vbaeventshelper.cxx
-@@ -56,8 +56,12 @@
- #include <com/sun/star/util/XCloseBroadcaster.hpp>
- #include <com/sun/star/frame/XControllerBorder.hpp>
- #include <com/sun/star/frame/XBorderResizeListener.hpp>
--#include "cellsuno.hxx" 
--
-+#include <com/sun/star/util/XChangesListener.hpp>
-+#include <com/sun/star/util/ElementChange.hpp>
-+#include <com/sun/star/util/XChangesNotifier.hpp>
-+#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
-+#include <cellsuno.hxx> 
-+#include <convuno.hxx>
- #include <map>
- 
- using namespace std;
-@@ -69,6 +73,70 @@ const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.
- const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
- const static rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document"); 
- 
-+typedef ::cppu::WeakImplHelper1< util::XChangesListener > WorksheetChangeListener_BASE;
-+
-+class WorksheetChangeListener : public WorksheetChangeListener_BASE
-+{
-+private:
-+    ScVbaEventsHelper* pVbaEventsHelper;
-+public:
-+    WorksheetChangeListener(ScVbaEventsHelper* pHelper ) : pVbaEventsHelper( pHelper ){}
-+    virtual void SAL_CALL changesOccurred(const util::ChangesEvent& aEvent) throw (uno::RuntimeException);
-+    virtual void SAL_CALL disposing(const lang::EventObject& aSource) throw(uno::RuntimeException){}
-+};
-+
-+void WorksheetChangeListener::changesOccurred(const util::ChangesEvent& aEvent) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nCount = aEvent.Changes.getLength();
-+    if( nCount == 0 )
-+        return;
-+    
-+    util::ElementChange aChange = aEvent.Changes[ 0 ];
-+    rtl::OUString sOperation;
-+    aChange.Accessor >>= sOperation;
-+    if( !sOperation.equalsIgnoreAsciiCaseAscii("cell-change") )
-+        return;
-+
-+    if( nCount == 1 )
-+    {
-+        uno::Reference< table::XCellRange > xRangeObj;
-+        aChange.ReplacedElement >>= xRangeObj;
-+        if( xRangeObj.is() )
-+        {
-+            uno::Sequence< uno::Any > aArgs(1);
-+            aArgs[0] <<= xRangeObj;
-+            pVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_CHANGE, aArgs );
-+        }    
-+        return;
-+    }
-+
-+    ScRangeList aRangeList;
-+    for( sal_Int32 nIndex = 0; nIndex < nCount; ++nIndex )
-+    {
-+        aChange = aEvent.Changes[ nIndex ];
-+        aChange.Accessor >>= sOperation;
-+        uno::Reference< table::XCellRange > xRangeObj;
-+        aChange.ReplacedElement >>= xRangeObj;
-+        if( xRangeObj.is() && sOperation.equalsIgnoreAsciiCaseAscii("cell-change") )
-+        {
-+            uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable( xRangeObj, uno::UNO_QUERY );
-+            if( xCellRangeAddressable.is() )
-+            {
-+                ScRange aRange;
-+                ScUnoConversion::FillScRange( aRange, xCellRangeAddressable->getRangeAddress() );
-+                aRangeList.Append( aRange );
-+            }
-+        }
-+    }
-+    
-+    if( aRangeList.Count() > 0 )
-+    {
-+        uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pVbaEventsHelper->getDocumentShell(), aRangeList ) );
-+        uno::Sequence< uno::Any > aArgs(1);
-+        aArgs[0] <<= xRanges;
-+        pVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_CHANGE, aArgs );
-+    }
-+}
- 
- typedef ::cppu::WeakImplHelper3< awt::XWindowListener, util::XCloseListener, frame::XBorderResizeListener > WindowListener_BASE;
- 
-@@ -394,8 +462,12 @@ ScVbaEventsHelper::ScVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArg
-     : m_xContext( xContext ), mpVbaEventsListener( NULL ), mbOpened( sal_False ), mbIgnoreEvents( sal_False )
- {
-     uno::Reference< frame::XModel > xModel ( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ), uno::UNO_QUERY );
--    ScDocShell* pDocShell = excel::getDocShell( xModel );
-+    pDocShell = excel::getDocShell( xModel );
-     pDoc = pDocShell->GetDocument();
-+    // Add worksheet change listener
-+    uno::Reference< util::XChangesNotifier > xChangesNotifier( xModel, uno::UNO_QUERY );
-+    if( xChangesNotifier.is() )
-+        xChangesNotifier->addChangesListener( uno::Reference< util::XChangesListener >( new WorksheetChangeListener( this ) ) );
- }
- 
- ScVbaEventsHelper::~ScVbaEventsHelper()
-@@ -782,6 +854,18 @@ SCTAB ScVbaEventsHelper::getTabFromArgs( const uno::Sequence< uno::Any > aArgs,
-         table::CellRangeAddress aAddress = xCellRangeAddressable->getRangeAddress();
-         nTab = aAddress.Sheet;
-     }
-+    else
-+    {
-+        uno::Reference< sheet::XSheetCellRangeContainer > xRanges( getXSomethingFromArgs< sheet::XSheetCellRangeContainer >( aArgs, nPos ), uno::UNO_QUERY );
-+        if( xRanges.is() )
-+        {
-+            uno::Sequence< table::CellRangeAddress > aRangeAddresses = xRanges->getRangeAddresses();
-+            if( aRangeAddresses.getLength() > 0 )
-+            {
-+                nTab = aRangeAddresses[ 0 ].Sheet;
-+            }
-+        }
-+    }
-     return nTab;
- }
- 
-diff --git sc/source/ui/vba/vbaeventshelper.hxx sc/source/ui/vba/vbaeventshelper.hxx
-index e8c41d3..e812aa0 100644
---- sc/source/ui/vba/vbaeventshelper.hxx
-+++ sc/source/ui/vba/vbaeventshelper.hxx
-@@ -47,10 +47,12 @@
- typedef ::cppu::WeakImplHelper1< com::sun::star::document::XVbaEventsHelper > VBAWorkbookEvent_BASE;
- 
- class VbaEventsListener;
-+class ScDocShell;
- class ScVbaEventsHelper : public VBAWorkbookEvent_BASE
- {
- private:
- 	ScDocument* pDoc;
-+	ScDocShell* pDocShell;
-     css::uno::Reference< css::uno::XComponentContext > m_xContext;
-     VbaEventsListener* mpVbaEventsListener;
-     sal_Bool mbOpened;
-@@ -72,6 +74,7 @@ public:
-     ScVbaEventsHelper( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
-     ~ScVbaEventsHelper();
- 	ScDocument* getDocument() { return pDoc; };
-+	ScDocShell* getDocumentShell() { return pDocShell; };
-     // XVBAWorkbookEventHelper
-     virtual sal_Bool SAL_CALL ProcessCompatibleVbaEvent( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setIgnoreEvents( ::sal_Bool _ignoreevents ) throw (css::uno::RuntimeException);
diff --git a/applied_patches/0479-ooo83878.unopkg.enablelinking.diff b/applied_patches/0361-ooo83878.unopkg.enablelinking.diff
similarity index 100%
rename from applied_patches/0479-ooo83878.unopkg.enablelinking.diff
rename to applied_patches/0361-ooo83878.unopkg.enablelinking.diff
diff --git a/applied_patches/0361-vba-toolbar-menufilter-core-fix.diff b/applied_patches/0361-vba-toolbar-menufilter-core-fix.diff
deleted file mode 100644
index d683cfec9..000000000
--- a/applied_patches/0361-vba-toolbar-menufilter-core-fix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git sw/source/filter/ww8/ww8toolbar.cxx sw/source/filter/ww8/ww8toolbar.cxx
-index facc7a9..216ac28 100644
---- sw/source/filter/ww8/ww8toolbar.cxx
-+++ sw/source/filter/ww8/ww8toolbar.cxx
-@@ -184,7 +184,7 @@ bool Customization::Read( SvStream *pS)
-     OSL_TRACE("Custimization::Read() stream pos 0x%x", pS->Tell() );
-     nOffSet = pS->Tell();
-     *pS >> tbidForTBD >> reserved1 >> ctbds;
--    if ( tbidForTBD && ctbds )
-+    if ( tbidForTBD )
-     {
-         TBDelta aTBDelta;
-         for ( sal_Int32 index = 0; index < ctbds; ++index )
-@@ -972,7 +972,7 @@ Kme::Read(SvStream *pS)
- {
-     OSL_TRACE("Kme::Read() stream pos 0x%x", pS->Tell() );
-     nOffSet = pS->Tell();
--    *pS >> reserved1 >> reserved2 >> kcm1 >> kcm2 >> param;
-+    *pS >> reserved1 >> reserved2 >> kcm1 >> kcm2 >> kt >> param;
-     return true;
- }
- 
diff --git a/applied_patches/0480-gstreamer-avmedia.diff b/applied_patches/0362-gstreamer-avmedia.diff
similarity index 100%
rename from applied_patches/0480-gstreamer-avmedia.diff
rename to applied_patches/0362-gstreamer-avmedia.diff
diff --git a/applied_patches/0362-word-read-builtinmenubar-filter.diff b/applied_patches/0362-word-read-builtinmenubar-filter.diff
deleted file mode 100644
index c80ba600f..000000000
--- a/applied_patches/0362-word-read-builtinmenubar-filter.diff
+++ /dev/null
@@ -1,442 +0,0 @@
-diff --git svx/inc/svx/mstoolbar.hxx svx/inc/svx/mstoolbar.hxx
-index 1e28ded..b3667a8 100644
---- svx/inc/svx/mstoolbar.hxx
-+++ svx/inc/svx/mstoolbar.hxx
-@@ -71,6 +71,7 @@ public:
- 
-     virtual bool Read(SvStream *pS) = 0;
-     virtual void Print( FILE* ) {} // #FIXME remove this an implement the debug routines in all the classes below to enable some sort of readable output
-+    sal_uInt32 GetOffset() { return nOffSet; }
- };
- 
- class Indent
-@@ -133,6 +134,9 @@ public:
-     bool Read(SvStream *pS);
-     void Print( FILE* );
-     bool ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& );
-+    rtl::OUString CustomText() { return customText.getString(); }
-+    rtl::OUString DescriptionText() { return descriptionText.getString(); }
-+    rtl::OUString Tooltip() { return tooltip.getString(); }
- };
- 
- class SVX_DLLPUBLIC TBCBitMap : public TBBase
-@@ -263,6 +267,7 @@ public:
-     bool Read(SvStream *pS);
-     void Print( FILE* );
-     bool ImportToolBarControl(  const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& );
-+    TBCGeneralInfo& getGeneralInfo() { return controlGeneralInfo; }
- };
- 
- #endif
-diff --git svx/source/msfilter/mstoolbar.cxx svx/source/msfilter/mstoolbar.cxx
-index 1f51eb1..9579db7 100644
---- svx/source/msfilter/mstoolbar.cxx
-+++ svx/source/msfilter/mstoolbar.cxx
-@@ -266,7 +266,8 @@ void TBCData::Print( FILE* fp )
-     indent_printf(fp,"[ 0x%x ] TBCData -- dump\n", nOffSet );
-     indent_printf(fp,"  dumping controlGeneralInfo( TBCGeneralInfo )\n");
-     controlGeneralInfo.Print( fp );
--    if ( rHeader.getTct() == 1 )
-+    //if ( rHeader.getTct() == 1 )
-+    if ( controlSpecificInfo.get() )
-     {
-         indent_printf(fp,"  dumping controlSpecificInfo( TBCBSpecificInfo )\n");
-         controlSpecificInfo->Print( fp );
-@@ -381,7 +382,7 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
-         }
- 
-         aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Label") );
--        aProp.Value = uno::makeAny( customText.getString() );
-+        aProp.Value = uno::makeAny( customText.getString().replace('&','~') );
-         sControlData.push_back( aProp );
- 
-         aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") );
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index ea3831c..80d5549 100644
---- sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -4122,7 +4122,7 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
-                 if (!aTCG.Read( pTableStream ) )
-                     OSL_TRACE("** Read of Customization data failed!!!! ");
-                 pTableStream->Seek( nCur ); // return to previous position, is that necessary?
--#if DEBUG
-+#if 1
-                 aTCG.Print( stderr );
- #endif
-                 aTCG.ImportCustomToolBar( *mpDocShell );
-diff --git sw/source/filter/ww8/ww8toolbar.cxx sw/source/filter/ww8/ww8toolbar.cxx
-index 216ac28..d30856a 100644
---- sw/source/filter/ww8/ww8toolbar.cxx
-+++ sw/source/filter/ww8/ww8toolbar.cxx
-@@ -5,6 +5,8 @@
- #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
- #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
- #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
- #include <com/sun/star/ui/XImageManager.hpp>
- #include <com/sun/star/ui/ItemType.hpp>
- #include <fstream>
-@@ -72,6 +74,13 @@ CTBWrapper::~CTBWrapper()
- {
- }
- 
-+Customization* CTBWrapper::GetCustomizaton( sal_Int16 index )
-+{
-+    if ( index < 0 || index >= rCustomizations.size() )
-+        return NULL;
-+    return &rCustomizations[ index ]; 
-+}
-+
- bool CTBWrapper::Read( SvStream* pS )
- {
-     OSL_TRACE("CTBWrapper::Read() stream pos 0x%x", pS->Tell() );
-@@ -83,8 +92,6 @@ bool CTBWrapper::Read( SvStream* pS )
-     {
-         // cbDTBC is the size in bytes of the TBC array
-         // but the size of a TBC element is dynamic ( and this relates to TBDelta's
--        // which we don't read right now )
--        //pS->SeekRel( cbDTBC );
-         int nStart = pS->Tell();
- 
-         int bytesRead = 0;
-@@ -105,15 +112,30 @@ bool CTBWrapper::Read( SvStream* pS )
-     {
-         for ( sal_Int32 index = 0; index < cCust; ++index )
-         {
--            Customization aCust;
-+            Customization aCust( this );
-             if ( !aCust.Read( pS ) )
-                 return false;
-             rCustomizations.push_back( aCust );
-         } 
-     } 
-+    std::vector< sal_Int16 >::iterator it_end = dropDownMenuIndices.end();
-+    for ( std::vector< sal_Int16 >::iterator it = dropDownMenuIndices.begin(); it != it_end; ++it )
-+    {
-+        rCustomizations[ *it ].bIsDroppedMenuTB = true;
-+    }
-     return true;
- }
- 
-+TBC* CTBWrapper::GetTBCAtOffset( sal_uInt32 nStreamOffset )
-+{
-+    for ( std::vector< TBC >::iterator it = rtbdc.begin(); it != rtbdc.end(); ++it )
-+    {
-+        if ( (*it).GetOffset() == nStreamOffset )
-+            return &(*it);
-+    }
-+    return NULL;
-+}
-+
- void CTBWrapper::Print( FILE* fp )
- {
-     Indent a;
-@@ -169,9 +191,11 @@ bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh )
-     return false;
- }
- 
--Customization::Customization() : tbidForTBD( 0 )
-+Customization::Customization( CTBWrapper* wrapper ) : tbidForTBD( 0 )
- ,reserved1( 0 )
- , ctbds( 0 )
-+, pWrapper( wrapper )
-+, bIsDroppedMenuTB( false )
- {
- }
- 
-@@ -186,12 +210,14 @@ bool Customization::Read( SvStream *pS)
-     *pS >> tbidForTBD >> reserved1 >> ctbds;
-     if ( tbidForTBD )
-     {
--        TBDelta aTBDelta;
-         for ( sal_Int32 index = 0; index < ctbds; ++index )
-         {
-+            TBDelta aTBDelta;
-             if (!aTBDelta.Read( pS ) )
-                 return false;
-             customizationDataTBDelta.push_back( aTBDelta );
-+            if ( aTBDelta.ControlDropsToolBar() )
-+                pWrapper->InsertDropIndex( aTBDelta.CustomizationIndex() );
-         }
-     }
-     else
-@@ -214,6 +240,21 @@ void Customization::Print( FILE* fp )
-         customizationDataCTB->Print( fp );
-     else
-     {
-+        const char* pToolBar = NULL;
-+        switch ( tbidForTBD )
-+        {
-+            case 0x9:
-+                pToolBar = "Standard";
-+                break;
-+            case 0x25:
-+                pToolBar = "Builtin-Menu";
-+                break;
-+            default:
-+                pToolBar = "Unknown toolbar";
-+                break;
-+        }
-+        
-+        indent_printf( fp,"  TBDelta(s) are associated with %s toolbar.\n", pToolBar);
-         std::vector< TBDelta >::iterator it = customizationDataTBDelta.begin();
-         for ( sal_Int32 index = 0; index < ctbds; ++it,++index )
-             it->Print( fp );
-@@ -221,8 +262,79 @@ void Customization::Print( FILE* fp )
-     
- }
- 
-+bool Customization::ImportMenu( const uno::Reference< container::XIndexContainer >& xIndexContainer, CustomToolBarImportHelper& helper )
-+{
-+    if ( !customizationDataCTB.get() )
-+        return false;
-+    return customizationDataCTB->ImportMenu( xIndexContainer, helper );
-+}
-+
- bool Customization::ImportCustomToolBar( CustomToolBarImportHelper& helper )
- {
-+    if ( bIsDroppedMenuTB )
-+        return true; // ignore ( will be processed by the ImportMenu )
-+    if ( tbidForTBD == 0x25 && customizationDataTBDelta.size() )  // we can handle in a limited way additions the built-in menu bar
-+    {
-+        for ( std::vector< TBDelta >::iterator it = customizationDataTBDelta.begin(); it != customizationDataTBDelta.end(); ++it )
-+        {
-+            // for each new menu ( control that drops a toolbar )
-+            // import a toolbar
-+            if ( it->ControlIsInserted() && it->ControlDropsToolBar() )
-+            {
-+                Customization* pCust = pWrapper->GetCustomizaton( it->CustomizationIndex() );
-+                if ( pCust )
-+                {
-+                    // currently only support built-in menu
-+                    rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") );
-+                    if ( tbidForTBD != 0x25 )
-+                        return false;
-+
-+                    sMenuBar = sMenuBar.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("menubar") ) );
-+                    // Get menu name
-+                    TBC* pTBC = pWrapper->GetTBCAtOffset( it->TBCStreamOffset() );
-+                    if ( !pTBC )
-+                        return false;
-+                    rtl::OUString sMenuName = pTBC->GetCustomText();
-+                    sMenuName = sMenuName.replace('&','~');
-+
-+                    // see if the document has already setting for the menubar
-+                
-+                    uno::Reference< container::XIndexContainer > xIndexContainer;
-+                    if ( helper.getCfgManager()->hasSettings( sMenuBar ) )
-+                        xIndexContainer.set( helper.getCfgManager()->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW );
-+                    else
-+                    {
-+                        if ( helper.getAppCfgManager()->hasSettings( sMenuBar ) )
-+                            xIndexContainer.set( helper.getAppCfgManager()->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW );
-+                        else 
-+                            xIndexContainer.set( helper.getAppCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
-+                    }
-+               
-+                    uno::Reference< lang::XSingleComponentFactory > xSCF( xIndexContainer, uno::UNO_QUERY_THROW );
-+                    uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+                    uno::Reference< uno::XComponentContext > xContext(  xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
-+                    // create the popup menu
-+                    uno::Sequence< beans::PropertyValue > aPopupMenu( 4 );
-+                    aPopupMenu[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
-+                    aPopupMenu[0].Value = uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("vnd.openoffice.org:") ) + sMenuName );
-+                    aPopupMenu[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Label") );
-+                    aPopupMenu[1].Value <<= sMenuName;
-+                    aPopupMenu[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type" ) );
-+                    aPopupMenu[2].Value <<= sal_Int32( 0 );
-+                    aPopupMenu[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") );
-+                    uno::Reference< container::XIndexContainer > xMenuContainer( xSCF->createInstanceWithContext( xContext ), uno::UNO_QUERY_THROW );
-+                    aPopupMenu[3].Value <<= xMenuContainer;
-+                    if ( !pCust->ImportMenu( xMenuContainer, helper ) )
-+                        return false;
-+                    OSL_TRACE("** there are %d menu items on the bar, inserting after that", xIndexContainer->getCount() );
-+                    xIndexContainer->insertByIndex( xIndexContainer->getCount(), uno::makeAny( aPopupMenu ) );
-+
-+                    helper.getCfgManager()->insertSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xIndexContainer, uno::UNO_QUERY_THROW ) );
-+                }
-+            }
-+        }
-+        return true;
-+    }
-     if ( !customizationDataCTB.get() )
-         return false;
-     return customizationDataCTB->ImportCustomToolBar( helper );
-@@ -237,6 +349,39 @@ TBDelta::TBDelta() : doprfatendFlags(0)
- {
- }
- 
-+bool TBDelta::ControlIsModified()
-+{
-+    return ( ( doprfatendFlags & 0x3 ) == 0x2 );
-+}
-+
-+bool TBDelta::ControlIsInserted()
-+{
-+    return ( ( doprfatendFlags & 0x3 ) == 0x1 );
-+}
-+
-+bool TBDelta::ControlIsChanged()
-+{
-+    return ( ( doprfatendFlags & 0x3 ) == 0x1 );
-+}
-+
-+bool TBDelta::ControlDropsToolBar()
-+{
-+    return !( CiTBDE & 0x8000 );
-+}
-+
-+sal_Int32 TBDelta::TBCStreamOffset()
-+{
-+    return fc;
-+}
-+
-+sal_Int16 TBDelta::CustomizationIndex()
-+{
-+    sal_Int16 nIndex = CiTBDE;
-+    nIndex = nIndex >> 1;
-+    nIndex &= 0x1ff; // only 13 bits are relevant
-+    return nIndex;
-+}
-+
- bool TBDelta::Read(SvStream *pS)
- {
-     OSL_TRACE("TBDelta::Read() stream pos 0x%x", pS->Tell() );
-@@ -259,6 +404,11 @@ void TBDelta::Print( FILE* fp )
-     indent_printf( fp, " fc 0x%x\n", static_cast< unsigned int >( fc ) );
-     indent_printf( fp, " CiTBDE 0x%x\n",CiTBDE );
-     indent_printf( fp, " cbTBC 0x%x\n", cbTBC );
-+    if ( ControlDropsToolBar() )
-+    {
-+        indent_printf( fp, " this delta is associated with a control that drops a menu toolbar\n", cbTBC );
-+        indent_printf( fp, " the menu toolbar drops the toolbar defined at index[%d] in the rCustomizations array of the CTBWRAPPER that contains this TBDelta\n", CustomizationIndex() );
-+    }
- }
- 
- CTB::CTB() : cbTBData( 0 )
-@@ -356,6 +506,17 @@ bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
-     return true;
- }
- 
-+bool CTB::ImportMenu( const css::uno::Reference< css::container::XIndexContainer >& xIndexContainer, CustomToolBarImportHelper& rHelper )
-+{
-+    for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
-+    {
-+        // createToolBar item for control
-+        if ( !it->ImportToolBarControl( xIndexContainer, rHelper ) )
-+            return false;
-+    }
-+    return true;
-+}
-+
- TB::TB() : bSignature( 0 )
- ,bVersion( 0 )
- ,cCL( 0 )
-@@ -496,6 +657,17 @@ TBC::ImportToolBarControl( const css::uno::Reference< css::container::XIndexCont
-     return true;
- }
- 
-+rtl::OUString 
-+TBC::GetCustomText()
-+{
-+    rtl::OUString sCustomText;
-+    if ( tbcd.get() )
-+        sCustomText = tbcd->getGeneralInfo().CustomText();
-+    return sCustomText;
-+   
-+    
-+}
-+
- bool 
- Xst::Read( SvStream* pS )
- {
-diff --git sw/source/filter/ww8/ww8toolbar.hxx sw/source/filter/ww8/ww8toolbar.hxx
-index 675a16e..c3e57ed 100644
---- sw/source/filter/ww8/ww8toolbar.hxx
-+++ sw/source/filter/ww8/ww8toolbar.hxx
-@@ -26,6 +26,7 @@ public:
-     bool Read(SvStream *pS);
-     void Print( FILE* );
-     bool ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
-+    rtl::OUString GetCustomText();
- };
- 
- class TB : public TBBase
-@@ -67,11 +68,13 @@ public:
-     bool Read(SvStream *pS);
-     void Print( FILE* fp );
-     bool ImportCustomToolBar( CustomToolBarImportHelper& );
-+    bool ImportMenu( const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
- };
- 
- class TBDelta : public TBBase
- {
-     sal_uInt8 doprfatendFlags;
-+
-     sal_uInt8 ibts;
-     sal_Int32 cidNext; 
-     sal_Int32 cid;
-@@ -83,6 +86,13 @@ public:
-     ~TBDelta(){}
-     bool Read(SvStream *pS);
-     void Print( FILE* );
-+    bool ControlIsModified();
-+    bool ControlIsInserted();
-+    bool ControlIsChanged();
-+    bool ControlDropsToolBar();
-+    sal_Int32 TBCStreamOffset();
-+    sal_Int16 CustomizationIndex();
-+    
- };
- 
- class Tcg255SubStruct : public TBBase
-@@ -100,20 +110,23 @@ public:
-     bool Read(SvStream *pS);
- };
- 
-+class CTBWrapper;
- class Customization : public TBBase
- {
-+friend class CTBWrapper;
-     sal_Int32 tbidForTBD;
-     sal_uInt16 reserved1;
-     sal_Int16 ctbds;
--
-+    CTBWrapper* pWrapper;
-     boost::shared_ptr< CTB > customizationDataCTB;
-     std::vector< TBDelta > customizationDataTBDelta; 
--    
-+    bool bIsDroppedMenuTB; 
- public:    
--    Customization();
-+    Customization( CTBWrapper* rapper );
-     ~Customization();
-     bool Read(SvStream *pS);
-     bool ImportCustomToolBar( CustomToolBarImportHelper& );
-+    bool ImportMenu( const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
-     void Print( FILE* );
- };
- 
-@@ -132,16 +145,19 @@ class CTBWrapper : public Tcg255SubStruct
- 
-     sal_Int32 cbDTBC;
- 
--    std::vector< TBC > rtbdc; // array of TBC's - we don't read these yet 
-+    std::vector< TBC > rtbdc; // 
-     std::vector< Customization > rCustomizations; // array of Customizations
--
-+    std::vector< sal_Int16 > dropDownMenuIndices; // array of indexes of Customization toolbars that are dropped by a menu
-     CTBWrapper(const CTBWrapper&);
-     CTBWrapper& operator = ( const CTBWrapper&);
- public:
-     CTBWrapper( bool bReadId = true );
-     ~CTBWrapper();
-+    void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); }
-+    TBC* GetTBCAtOffset( sal_uInt32 nStreamOffset );
-     bool Read(SvStream *pS);
-     bool ImportCustomToolBar( SfxObjectShell& rDocSh );
-+    Customization* GetCustomizaton( sal_Int16 index );
-     void Print( FILE* );
- };
- 
diff --git a/applied_patches/0481-gstreamer-scp2.diff b/applied_patches/0363-gstreamer-scp2.diff
similarity index 100%
rename from applied_patches/0481-gstreamer-scp2.diff
rename to applied_patches/0363-gstreamer-scp2.diff
diff --git a/applied_patches/0363-vba-fix-private-declare.diff b/applied_patches/0363-vba-fix-private-declare.diff
deleted file mode 100644
index 9e9c011b4..000000000
--- a/applied_patches/0363-vba-fix-private-declare.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git basic/source/comp/dim.cxx basic/source/comp/dim.cxx
-index 01c23e8..3e46579 100644
---- basic/source/comp/dim.cxx
-+++ basic/source/comp/dim.cxx
-@@ -214,7 +214,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
- 		Next(), bConst = TRUE;
- 
- 	// #110004 It can also be a sub/function
--	if( !bConst && (eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ||
-+	if( !bConst && (eCurTok == DECLARE || eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ||
- 					eCurTok == STATIC || eCurTok == ENUM ) )
- 	{
- 		// Next token is read here, because !bConst
-@@ -225,6 +225,12 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
- 			Next();
- 			DefStatic( bPrivate );
- 		}
-+		else if( eCurTok == DECLARE )
-+                {
-+			Next();
-+                        DefDeclare( bPrivate ); 
-+                        return;
-+                }
- 		else if( eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY )
- 		{
- 			// End global chain if necessary (not done in 
-@@ -875,6 +881,11 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
- 
- void SbiParser::Declare()
- {
-+	DefDeclare( FALSE );
-+}
-+
-+void SbiParser::DefDeclare( BOOL bPrivate )
-+{
- 	Next();
- 	if( eCurTok != SUB && eCurTok != FUNCTION )
- 	  Error( SbERR_UNEXPECTED, eCurTok );
-@@ -901,6 +912,9 @@ void SbiParser::Declare()
- 			}
- 			else
- 				aPublics.Add( pDef );
-+			if ( pDef )
-+				pDef->SetPublic( !bPrivate );
-+			
- 		}
- 	}
- }
-diff --git basic/source/inc/parser.hxx basic/source/inc/parser.hxx
-index d13b8ac..d5afbea 100644
---- basic/source/inc/parser.hxx
-+++ basic/source/inc/parser.hxx
-@@ -68,6 +68,7 @@ class SbiParser : public SbiTokenizer
- 	void StmntBlock( SbiToken ); 	// Statement-Block abarbeiten
- 	void DefType( BOOL bPrivate );	// Parse type declaration
- 	void DefEnum( BOOL bPrivate );	// Parse enum declaration
-+	void DefDeclare( BOOL bPrivate );
- 	void EnableCompatibility();	
- public:
- 	SbxArrayRef	  rTypeArray;		// das Type-Array
diff --git a/applied_patches/0482-gstreamer-config-office.diff b/applied_patches/0364-gstreamer-config-office.diff
similarity index 100%
rename from applied_patches/0482-gstreamer-config-office.diff
rename to applied_patches/0364-gstreamer-config-office.diff
diff --git a/applied_patches/0364-vba-import-globaltemplate-customizations.diff b/applied_patches/0364-vba-import-globaltemplate-customizations.diff
deleted file mode 100644
index 348702dd9..000000000
--- a/applied_patches/0364-vba-import-globaltemplate-customizations.diff
+++ /dev/null
@@ -1,231 +0,0 @@
-diff --git officecfg/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs
-index b578c56..666a69f 100644
---- officecfg/registry/schema/org/openoffice/Office/Writer.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs
-@@ -749,6 +749,17 @@
- 		</group>
- 	</templates>
- 	<component>
-+        <group oor:name="GlobalTemplateList">
-+            <info>
-+               <desc>Contains the most recently opened documents.</desc>
-+            </info>
-+            <prop oor:name="Paths" oor:type="oor:string-list">
-+                <info>
-+                    <desc>Lists the file global templates loaded when importing writer documents.</desc>
-+                </info>
-+                <value oor:separator=";"></value> 
-+            </prop>
-+        </group>
-         <group oor:name="MailMergeWizard">
-             <info>
-                 <desc>Settings of the mail merge wizard.</desc>
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index 80d5549..2d55a70 100644
---- sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -136,11 +136,15 @@
- #include <basic/basmgr.hxx>
- 
- #include "ww8toolbar.hxx"
-+#include <osl/file.hxx>
-+#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
-+
- #ifdef DEBUG
- #include <iostream>
- #include <dbgoutsw.hxx>
- #endif
- #include <unotools/localfilehelper.hxx>
-+#include <comphelper/configurationhelper.hxx>
- 
- #define MM_250 1417             // WW-Default fuer Hor. Seitenraender: 2.5 cm
- #define MM_200 1134             // WW-Default fuer u.Seitenrand: 2.0 cm
-@@ -241,7 +245,7 @@ public:
-     ~Sttb();
-     bool Read(SvStream *pS);
-     void Print( FILE* fp );
--    rtl::OUString getStringAtIndex( sal_Int32 );
-+    rtl::OUString getStringAtIndex( sal_uInt32 );
- };
- 
- Sttb::Sttb() : fExtend( 0 )
-@@ -287,7 +291,7 @@ void Sttb::Print( FILE* fp )
- }
- 
- rtl::OUString 
--Sttb::getStringAtIndex( sal_Int32 index )
-+Sttb::getStringAtIndex( sal_uInt32 index )
- {
-     rtl::OUString aRet;
-     if ( index < dataItems.size() )
-@@ -3840,6 +3844,91 @@ void SwWW8ImplReader::ReadDocInfo()
-     }
- }
- 
-+class WW8Customizations
-+{
-+    SvStream* mpTableStream;
-+    WW8Fib mWw8Fib;
-+public:
-+    WW8Customizations( SvStream*, WW8Fib& );
-+    bool  Import( SwDocShell* pShell );
-+};
-+
-+WW8Customizations::WW8Customizations( SvStream* pTableStream, WW8Fib& rFib ) : mpTableStream(pTableStream), mWw8Fib( rFib )
-+{
-+}
-+
-+bool WW8Customizations::Import( SwDocShell* pShell ) 
-+{
-+    if ( mWw8Fib.lcbCmds == 0 )
-+        return false;
-+    Tcg aTCG;
-+    long nCur = mpTableStream->Tell();
-+    mpTableStream->Seek( mWw8Fib.fcCmds ); // point at tgc record
-+    if (!aTCG.Read( mpTableStream ) )
-+        OSL_TRACE("** Read of Customization data failed!!!! ");
-+    mpTableStream->Seek( nCur ); // return to previous position, is that necessary?
-+#if 1
-+    aTCG.Print( stderr );
-+#endif
-+    return aTCG.ImportCustomToolBar( *pShell );
-+}
-+
-+bool SwWW8ImplReader::ReadGlobalTemplateSettings()
-+{
-+    uno::Sequence< rtl::OUString > sGlobalTemplates;
-+    rtl::OUString sNode = rtl::OUString::createFromAscii( "org.openoffice.Office.Writer/GlobalTemplateList" );
-+    try
-+    {
-+        css::uno::Reference< css::container::XNameAccess > xCfg( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessServiceFactory(), sNode, ::comphelper::ConfigurationHelper::E_STANDARD), uno::UNO_QUERY_THROW);
-+        xCfg->getByName( rtl::OUString::createFromAscii("Paths") ) >>= sGlobalTemplates;
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+    sal_Int32 nEntries = sGlobalTemplates.getLength();
-+    bool bRes = true;
-+    const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
-+    uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
-+    uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
-+    uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
-+
-+    rtl::OUString sCreatedFrom = xDocProps->getTemplateURL();
-+    for ( sal_Int32 i=0; i<nEntries; ++i )
-+    {
-+        INetURLObject aObj;
-+        aObj.SetURL( sGlobalTemplates[ i ] );
-+        bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
-+        rtl::OUString aURL;
-+        if ( bIsURL )
-+                aURL = sGlobalTemplates[ i ];
-+        else
-+                osl::FileBase::getFileURLFromSystemPath( sGlobalTemplates[ i ], aURL );        
-+        if ( sCreatedFrom.getLength() && sCreatedFrom.equals( aURL ) )
-+            continue; // don't try and read the same document as ourselves
-+        SotStorageRef rRoot = new SotStorage( aURL, STREAM_STD_READWRITE, STORAGE_TRANSACTED ); 
-+        // Read Macro Projects
-+        SvxImportMSVBasic aVBasic(*mpDocShell, *rRoot,
-+            pVBAFlags->IsLoadWordBasicCode(),
-+            pVBAFlags->IsLoadWordBasicStorage() );
-+        String s1(CREATE_CONST_ASC("Macros"));
-+        String s2(CREATE_CONST_ASC("VBA"));
-+        int nRet = aVBasic.Import( s1, s2, ! pVBAFlags->IsLoadWordBasicCode() );
-+        // Read toolbars & menus
-+        SvStorageStreamRef refMainStream = rRoot->OpenSotStream( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WordDocument") ) );
-+        refMainStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
-+        WW8Fib aWwFib( *refMainStream, 8 );       
-+        SvStorageStreamRef xTableStream = rRoot->OpenSotStream(String::CreateFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
-+
-+        if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
-+        {
-+            xTableStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
-+            WW8Customizations aGblCustomisations( xTableStream, aWwFib ); 
-+            aGblCustomisations.Import( mpDocShell );
-+        }
-+    }
-+    return bRes;
-+}
-+
- ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
- {
-     ULONG nErrRet = 0;
-@@ -4097,10 +4184,11 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
-     {
-         if (mbNewDoc && pStg && !pGloss) /*meaningless for a glossary, cmc*/
-         {
--            
-             mpDocShell->SetIsTemplate( pWwFib->fDot ); // point at tgc record
-             const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
-             maTracer.EnterEnvironment(sw::log::eMacros);
-+            // Read Global templates 
-+            ReadGlobalTemplateSettings();
-             // Create and insert Excel vba Globals
-             uno::Any aGlobs;
-             aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals") );
-@@ -4112,21 +4200,8 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
-             String s1(CREATE_CONST_ASC("Macros"));
-             String s2(CREATE_CONST_ASC("VBA"));
-             int nRet = aVBasic.Import( s1, s2, ! pVBAFlags->IsLoadWordBasicCode() );
--            // Read custom toolbars 
--            if ( pWwFib->lcbCmds )
--            {
--                // there is a tgc255 structure
--                long nCur = pTableStream->Tell();
--                Tcg aTCG;
--                pTableStream->Seek( pWwFib->fcCmds ); // point at tgc record
--                if (!aTCG.Read( pTableStream ) )
--                    OSL_TRACE("** Read of Customization data failed!!!! ");
--                pTableStream->Seek( nCur ); // return to previous position, is that necessary?
--#if 1
--                aTCG.Print( stderr );
--#endif
--                aTCG.ImportCustomToolBar( *mpDocShell );
--            }
-+            WW8Customizations aCustomisations( pTableStream, *pWwFib ); 
-+            aCustomisations.Import( mpDocShell );
-             if( 2 & nRet )
-             {
-                 maTracer.Log(sw::log::eContainsVisualBasic);
-diff --git sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par.hxx
-index 69f8e36..840dfdf 100644
---- sw/source/filter/ww8/ww8par.hxx
-+++ sw/source/filter/ww8/ww8par.hxx
-@@ -1424,7 +1424,7 @@ private:
-     // determine object attribute "Layout in Table Cell"
-     bool IsObjectLayoutInTableCell( const UINT32 nLayoutInTableCell ) const;
-     // <--
--
-+    bool ReadGlobalTemplateSettings();
-     //No copying
-     SwWW8ImplReader(const SwWW8ImplReader &);
-     SwWW8ImplReader& operator=(const SwWW8ImplReader&);
-diff --git sw/source/filter/ww8/ww8toolbar.cxx sw/source/filter/ww8/ww8toolbar.cxx
-index d30856a..d63fd77 100644
---- sw/source/filter/ww8/ww8toolbar.cxx
-+++ sw/source/filter/ww8/ww8toolbar.cxx
-@@ -300,8 +300,12 @@ bool Customization::ImportCustomToolBar( CustomToolBarImportHelper& helper )
-                     // see if the document has already setting for the menubar
-                 
-                     uno::Reference< container::XIndexContainer > xIndexContainer;
-+                    bool bHasSettings = false;
-                     if ( helper.getCfgManager()->hasSettings( sMenuBar ) )
-+                    {
-                         xIndexContainer.set( helper.getCfgManager()->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW );
-+                        bHasSettings = true;
-+                    }
-                     else
-                     {
-                         if ( helper.getAppCfgManager()->hasSettings( sMenuBar ) )
-@@ -329,7 +333,10 @@ bool Customization::ImportCustomToolBar( CustomToolBarImportHelper& helper )
-                     OSL_TRACE("** there are %d menu items on the bar, inserting after that", xIndexContainer->getCount() );
-                     xIndexContainer->insertByIndex( xIndexContainer->getCount(), uno::makeAny( aPopupMenu ) );
- 
--                    helper.getCfgManager()->insertSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xIndexContainer, uno::UNO_QUERY_THROW ) );
-+                    if ( bHasSettings )
-+                        helper.getCfgManager()->replaceSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xIndexContainer, uno::UNO_QUERY_THROW ) );
-+                    else
-+                        helper.getCfgManager()->insertSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xIndexContainer, uno::UNO_QUERY_THROW ) );
-                 }
-             }
-         }
diff --git a/applied_patches/0483-gstreamer-slideshow.diff b/applied_patches/0365-gstreamer-slideshow.diff
similarity index 100%
rename from applied_patches/0483-gstreamer-slideshow.diff
rename to applied_patches/0365-gstreamer-slideshow.diff
diff --git a/applied_patches/0365-vba-basic-if-compare-fix.diff b/applied_patches/0365-vba-basic-if-compare-fix.diff
deleted file mode 100644
index 31e6e731a..000000000
--- a/applied_patches/0365-vba-basic-if-compare-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- basic/source/comp/exprtree.cxx.orig	2009-04-02 08:36:25.476773500 -0700
-+++ basic/source/comp/exprtree.cxx	2009-04-02 08:36:49.703573500 -0700
-@@ -702,7 +702,7 @@ SbiExprNode* SbiExpression::Comp()
- 			nCount++;
- 		}
- 		// Mehrere Operatoren hintereinander gehen nicht
--		if( nCount > 1 )
-+		if( nCount > 1 && !pParser->IsVBASupportOn() )
- 		{
- 			pParser->Error( SbERR_SYNTAX );
- 			bError = TRUE;
diff --git a/applied_patches/0484-gstreamer-solenv.diff b/applied_patches/0366-gstreamer-solenv.diff
similarity index 100%
rename from applied_patches/0484-gstreamer-solenv.diff
rename to applied_patches/0366-gstreamer-solenv.diff
diff --git a/applied_patches/0366-vba-basic-parallel-build.diff b/applied_patches/0366-vba-basic-parallel-build.diff
deleted file mode 100644
index ddc4a6dc3..000000000
--- a/applied_patches/0366-vba-basic-parallel-build.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- basic/source/classes/makefile.mk	2009-04-03 09:19:00.000000000 +0200
-+++ basic/source/classes/makefile.mk	2009-04-03 09:14:42.000000000 +0200
-@@ -41,17 +41,20 @@ ENABLE_EXCEPTIONS=TRUE
- 
- .INCLUDE :  settings.mk
- 
--ALLTAR : \
-+ALLTAR .SEQUENTIAL : \
-         $(MISC)$/$(TARGET).don \
--        $(SLOTARGET)
-+        $(MISC)$/$(TARGET).slo
- 
- $(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-         +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-         echo $@
- 
-+$(MISC)$/$(TARGET).slo : $(SLOTARGET)
-+        echo $@
-+
- # --- Allgemein -----------------------------------------------------------
- 
--COMMON_SLOFILES=	\
-+SLOFILES=	\
- 	$(SLO)$/sb.obj       \
- 	$(SLO)$/sbxmod.obj	\
- 	$(SLO)$/image.obj	\
-@@ -60,8 +63,6 @@ COMMON_SLOFILES=	\
- 	$(SLO)$/propacc.obj	\
- 	$(SLO)$/disas.obj \
- 	$(SLO)$/errobject.obj \
--
--SLOFILES=	$(COMMON_SLOFILES)	\
- 	$(SLO)$/eventatt.obj
- 
- OBJFILES=	\
diff --git a/applied_patches/0485-gstreamer-svtools-content-types.diff b/applied_patches/0367-gstreamer-svtools-content-types.diff
similarity index 100%
rename from applied_patches/0485-gstreamer-svtools-content-types.diff
rename to applied_patches/0367-gstreamer-svtools-content-types.diff
diff --git a/applied_patches/0367-vba-oovbaapi-parallel-build.diff b/applied_patches/0367-vba-oovbaapi-parallel-build.diff
deleted file mode 100644
index 6ee63b2e7..000000000
--- a/applied_patches/0367-vba-oovbaapi-parallel-build.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- oovbaapi/genconstidl/makefile.mk	2009-04-06 23:28:54.000000000 +0200
-+++ oovbaapi/genconstidl/makefile.mk	2009-04-06 23:30:06.000000000 +0200
-@@ -49,18 +49,16 @@ MYDONEFILES += $(foreach,i,$(MYSYMFILES)
- 
- ALLTAR: GENIDL
- 
--GENIDL : $(MY_GEN_IDL_PATH) $(MYDONEFILES)
-+GENIDL : $(MYDONEFILES)
- 
- GENRDB : GENIDL $(MYURDFILES)
- 
- $(MISC)$/%.done : %.api
-+    @@-$(MKDIR) $(MY_GEN_IDL_PATH)
-     @echo Processing $?
-     $(PERL) api-to-idl.pl $? $(MY_GEN_IDL_PATH)
-     @$(TOUCH) $@
- 
--$(MY_GEN_IDL_PATH) : 
--    @@-$(MKDIR) $@
--
- CLEAN :
-     @$(RM) $(MY_GEN_IDL_PATH)$/*.idl
-     @$(RM) $(foreach,i,$(MYSYMFILES) $(MISC)$/$(i:b).done)
diff --git a/applied_patches/0368-basic-allow-objectforerror-symbol.diff b/applied_patches/0368-basic-allow-objectforerror-symbol.diff
deleted file mode 100644
index 0501d3c2e..000000000
--- a/applied_patches/0368-basic-allow-objectforerror-symbol.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git basic/source/comp/exprtree.cxx basic/source/comp/exprtree.cxx
-index 88b51d1..8e78aba 100644
---- basic/source/comp/exprtree.cxx
-+++ basic/source/comp/exprtree.cxx
-@@ -378,8 +378,12 @@ SbiExprNode* SbiExpression::Term( void )
- 		// Typ SbxOBJECT sein
- 		if( pDef->GetType() != SbxOBJECT && pDef->GetType() != SbxVARIANT )
- 		{
--			pParser->Error( SbERR_BAD_DECLARATION, aSym );
--			bError = TRUE;
-+			// defer error until runtime if in vba mode
-+			if ( !pParser->IsVBASupportOn() )
-+                        {
-+				pParser->Error( SbERR_BAD_DECLARATION, aSym );
-+				bError = TRUE;
-+			}
- 		}
- 		if( !bError )
- 			pNd->aVar.pNext = ObjTerm( *pDef );
-diff --git basic/source/comp/parser.cxx basic/source/comp/parser.cxx
-index 1a4dc06..dea8d79 100644
---- basic/source/comp/parser.cxx
-+++ basic/source/comp/parser.cxx
-@@ -405,6 +405,18 @@ BOOL SbiParser::Parse()
- 		Next(); return TRUE;
- 	}
- 
-+        // In vba it's possible to do Error.foobar ( even if it results in
-+	// a runtime error
-+        if ( eCurTok == _ERROR_ && IsVBASupportOn() ) // we probably need to define a subset of keywords where this madness applies e.g. if ( IsVBASupportOn() && SymbolCanBeRedined( eCurTok ) )
-+        {
-+            SbiTokenizer tokens( *(SbiTokenizer*)this );
-+            tokens.Next();
-+            if ( tokens.Peek()  == DOT )
-+            {
-+                eCurTok = SYMBOL;
-+		ePush = eCurTok;
-+            }
-+	}
- 	// Kommt ein Symbol, ist es entweder eine Variable( LET )
- 	// oder eine SUB-Prozedur( CALL ohne Klammern )
- 	// DOT fuer Zuweisungen im WITH-Block: .A=5
diff --git a/applied_patches/0486-gstreamer-avmedia-file-types.diff b/applied_patches/0368-gstreamer-avmedia-file-types.diff
similarity index 100%
rename from applied_patches/0486-gstreamer-avmedia-file-types.diff
rename to applied_patches/0368-gstreamer-avmedia-file-types.diff
diff --git a/applied_patches/0487-gstreamer-vcl.diff b/applied_patches/0369-gstreamer-vcl.diff
similarity index 100%
rename from applied_patches/0487-gstreamer-vcl.diff
rename to applied_patches/0369-gstreamer-vcl.diff
diff --git a/applied_patches/0369-vba-fix-named-any-para-pass.diff b/applied_patches/0369-vba-fix-named-any-para-pass.diff
deleted file mode 100644
index 1cf75763c..000000000
--- a/applied_patches/0369-vba-fix-named-any-para-pass.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git basic/source/runtime/step1.cxx basic/source/runtime/step1.cxx
-index 7997feb..1b28f61 100644
---- basic/source/runtime/step1.cxx
-+++ basic/source/runtime/step1.cxx
-@@ -94,6 +94,15 @@ void SbiRuntime::StepARGN( UINT32 nOp1 )
- 	{
- 		String aAlias( pImg->GetString( static_cast<short>( nOp1 ) ) );
- 		SbxVariableRef pVal = PopVar();
-+		if( bVBAEnabled && ( pVal->ISA(SbxMethod) || pVal->ISA(SbUnoProperty) || pVal->ISA(SbProcedureProperty) ) )
-+		{
-+			// named variables ( that are Any especially properties ) can be empty at this point and need a broadcast
-+			if ( pVal->GetType() == SbxEMPTY )
-+				pVal->Broadcast( SBX_HINT_DATAWANTED );
-+			// Methoden und Properties evaluieren!
-+			SbxVariable* pRes = new SbxVariable( *pVal );
-+			pVal = pRes;
-+		}
- 		refArgv->Put( pVal, nArgc );
- 		refArgv->PutAlias( aAlias, nArgc++ );
- 	}
diff --git a/applied_patches/0488-avmedia-source-gstreamer-ChangeLog.diff b/applied_patches/0370-avmedia-source-gstreamer-ChangeLog.diff
similarity index 100%
rename from applied_patches/0488-avmedia-source-gstreamer-ChangeLog.diff
rename to applied_patches/0370-avmedia-source-gstreamer-ChangeLog.diff
diff --git a/applied_patches/0370-vba-allow-arrays-in-usertypes.diff b/applied_patches/0370-vba-allow-arrays-in-usertypes.diff
deleted file mode 100644
index 1cd4b84e4..000000000
--- a/applied_patches/0370-vba-allow-arrays-in-usertypes.diff
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git basic/source/classes/sb.cxx basic/source/classes/sb.cxx
-index 6cce61d..7a66707 100644
---- basic/source/classes/sb.cxx
-+++ basic/source/classes/sb.cxx
-@@ -340,6 +340,32 @@ SbxObject* SbTypeFactory::cloneTypeObjectImpl( const SbxObject& rTypeObj )
- 		if( pProp )
- 		{
- 			SbxProperty* pNewProp = new SbxProperty( *pProp );
-+			if( pVar->GetType() & SbxARRAY )
-+			{
-+		                SbxBase* pParObj = pVar->GetObject();
-+               			SbxDimArray* pSource = PTR_CAST(SbxDimArray,pParObj);
-+				SbxDimArray* pDest = new SbxDimArray( pVar->GetType() );
-+                               	INT32 lb = 0;
-+	                        INT32 ub = 0;
-+
-+				pDest->setHasFixedSize( pSource->hasFixedSize() );
-+				if ( pSource->GetDims() && pSource->hasFixedSize() )
-+				{
-+					for ( INT32 i=1; i <= pSource->GetDims(); ++i )
-+	                                {
-+					    pSource->GetDim32( (INT32)i, lb, ub );
-+					    pDest->AddDim32( lb, ub );
-+					}
-+				}
-+				else 
-+					pDest->unoAddDim( 0, -1 ); // variant array
-+				USHORT nSavFlags = pVar->GetFlags();
-+				pNewProp->ResetFlag( SBX_FIXED );
-+				// need to reset the FIXED flag 
-+				// when calling PutObject ( because the type will not match Object ) 	
-+				pNewProp->PutObject( pDest );
-+				pNewProp->SetFlags( nSavFlags );
-+			}
- 			pProps->PutDirect( pNewProp, i );
- 		}
- 	}
-diff --git basic/source/comp/dim.cxx basic/source/comp/dim.cxx
-index 3e46579..b37ff96 100644
---- basic/source/comp/dim.cxx
-+++ basic/source/comp/dim.cxx
-@@ -579,13 +579,6 @@ void SbiParser::DefType( BOOL bPrivate )
- 				pElem = VarDecl(&pDim,FALSE,FALSE);
- 				if( !pElem )
- 					bDone = TRUE;	// Error occured
--				if( pDim )
--				{
--					// HOT FIX, to be updated
--					delete pDim;
--					Error( SbERR_NO_STRINGS_ARRAYS );
--				}
--
- 		}
- 		if( pElem )
- 		{
-@@ -595,6 +588,44 @@ void SbiParser::DefType( BOOL bPrivate )
- 			else
- 			{
- 				SbxProperty *pTypeElem = new SbxProperty (pElem->GetName(),pElem->GetType());
-+				if( pDim )
-+				{
-+					SbxDimArray* pArray = new SbxDimArray( pElem->GetType() );	
-+					if ( pDim->GetSize() )
-+					{
-+						// Dimension the target array
-+						
-+						for ( int i=0; i<pDim->GetSize();++i )
-+						{
-+
-+							INT32 ub = -1;
-+							INT32 lb = nBase;
-+							SbiExprNode* pNode =  pDim->Get(i)->GetExprNode();
-+							ub = pNode->GetNumber();
-+							if ( !pDim->Get( i )->IsBased() ) // each dim is low/up
-+							{
-+								if (  ++i >= pDim->GetSize() ) // trouble
-+									StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
-+								pNode =  pDim->Get(i)->GetExprNode();
-+								lb = ub;
-+								ub = pNode->GetNumber();
-+							}
-+							else if ( !bCompatible )
-+								ub += nBase;
-+							pArray->AddDim32( lb, ub );      
-+						}
-+						pArray->setHasFixedSize( true );
-+					}
-+					else
-+						pArray->unoAddDim( 0, -1 ); // variant array
-+					USHORT nSavFlags = pTypeElem->GetFlags();
-+					// need to reset the FIXED flag 
-+					// when calling PutObject ( because the type will not match Object ) 	
-+					pTypeElem->ResetFlag( SBX_FIXED );
-+					pTypeElem->PutObject( pArray );
-+					pTypeElem->SetFlags( nSavFlags );
-+				}
-+				delete pDim;
- 				pTypeMembers->Insert( pTypeElem, pTypeMembers->Count() );
- 			}
- 			delete pElem;
-diff --git basic/source/inc/expr.hxx basic/source/inc/expr.hxx
-index d31e741..c87b2e5 100644
---- basic/source/inc/expr.hxx
-+++ basic/source/inc/expr.hxx
-@@ -144,6 +144,7 @@ public:
- 	SbiExprNode* GetRealNode();		// letzter Knoten in x.y.z
- 	short GetDepth();               // Tiefe eines Baumes berechnen
- 	const String& GetString() 		{ return aStrVal; }
-+	short GetNumber() 		{ return (short)nVal; }
- 	SbiExprList* GetParameters()	{ return aVar.pPar; }
- 	SbiExprListVector* GetMoreParameters()	{ return aVar.pvMorePar; }
- 
diff --git a/applied_patches/0489-avmedia-source-gstreamer-exports.dxp.diff b/applied_patches/0371-avmedia-source-gstreamer-exports.dxp.diff
similarity index 100%
rename from applied_patches/0489-avmedia-source-gstreamer-exports.dxp.diff
rename to applied_patches/0371-avmedia-source-gstreamer-exports.dxp.diff
diff --git a/applied_patches/0371-vba-disable-toolbar+customizationimport.diff b/applied_patches/0371-vba-disable-toolbar+customizationimport.diff
deleted file mode 100644
index d13cd2672..000000000
--- a/applied_patches/0371-vba-disable-toolbar+customizationimport.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git svx/inc/svx/xflbmsxy.hxx svx/inc/svx/xflbmsxy.hxx
-index 39f1f67..1b09bb6 100644
-diff --git svx/source/msfilter/msvbasic.cxx svx/source/msfilter/msvbasic.cxx
-index e25ff74..60667ed 100644
---- svx/source/msfilter/msvbasic.cxx
-+++ svx/source/msfilter/msvbasic.cxx
-@@ -952,6 +952,9 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage)
-     SvStorageStreamRef xDir = rxVBAStorage->OpenSotStream(
-                     String( RTL_CONSTASCII_USTRINGPARAM( "dir" ) ),
- 					STREAM_STD_READ | STREAM_NOCREATE );
-+// disable read and import of Dir stream bits, e.g. project references and
-+// project name for 3.1 ( a bit unstable yet )
-+#if 0
-     // decompress the stream
-     std::auto_ptr< SvMemoryStream > xCmpDir;
-     xCmpDir.reset( MSLZSS::decompressAsStream( xDir, 0 ) );
-@@ -959,6 +962,7 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage)
-     DirDumper dDump;
-     dDump.read( xCmpDir.get() );
-     dDump.import( *this );
-+#endif
- 	if( !xVBAProject.Is() || SVSTREAM_OK != xVBAProject->GetError() )
- 	{
- 		DBG_WARNING("Not able to find vba project, cannot find macros");
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index c8ecc43..385de9b 100644
---- sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -4189,8 +4189,12 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
-             mpDocShell->SetIsTemplate( pWwFib->fDot ); // point at tgc record
-             const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
-             maTracer.EnterEnvironment(sw::log::eMacros);
-+// dissable below for 3.1 at the moment, 'cause it's kinda immature
-+// similarly the project reference in svx/source/msvba
-+#if 0
-             // Read Global templates 
-             ReadGlobalTemplateSettings();
-+#endif 
-             // Create and insert Excel vba Globals
-             uno::Any aGlobs;
-             aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals") );
-@@ -4202,8 +4206,12 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
-             String s1(CREATE_CONST_ASC("Macros"));
-             String s2(CREATE_CONST_ASC("VBA"));
-             int nRet = aVBasic.Import( s1, s2, ! pVBAFlags->IsLoadWordBasicCode() );
-+// dissable below for 3.1 at the moment, 'cause it's kinda immature
-+// similarly the project reference in svx/source/msvba
-+#if 0
-             WW8Customizations aCustomisations( pTableStream, *pWwFib ); 
-             aCustomisations.Import( mpDocShell );
-+#endif 
-             if( 2 & nRet )
-             {
-                 maTracer.Log(sw::log::eContainsVisualBasic);
diff --git a/applied_patches/0490-avmedia-source-gstreamer-gstcommon.hxx.diff b/applied_patches/0372-avmedia-source-gstreamer-gstcommon.hxx.diff
similarity index 100%
rename from applied_patches/0490-avmedia-source-gstreamer-gstcommon.hxx.diff
rename to applied_patches/0372-avmedia-source-gstreamer-gstcommon.hxx.diff
diff --git a/applied_patches/0372-vba-fix-IsEmpty-api-object.diff b/applied_patches/0372-vba-fix-IsEmpty-api-object.diff
deleted file mode 100644
index 2f9e961fa..000000000
--- a/applied_patches/0372-vba-fix-IsEmpty-api-object.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git basic/source/runtime/methods.cxx basic/source/runtime/methods.cxx
-index 72219ee..50dcf6b 100644
---- basic/source/runtime/methods.cxx
-+++ basic/source/runtime/methods.cxx
-@@ -108,6 +108,8 @@ using namespace com::sun::star::script;
- #include <stdlib.h>
- #include <ctype.h>
- 
-+SbxVariable* getDefaultProp( SbxVariable* pRef );
-+
- #if defined (WIN) || defined (WNT) || defined (OS2)
- #include <direct.h>   // _getdcwd get current work directory, _chdrive
- #endif
-@@ -2426,7 +2429,18 @@ RTLFUNC(IsEmpty)
- 	if ( rPar.Count() < 2 )
- 		StarBASIC::Error( SbERR_BAD_ARGUMENT );
- 	else
--		rPar.Get( 0 )->PutBool( rPar.Get(1)->IsEmpty() );
-+	{
-+		SbxVariable* pVar = NULL;
-+		if( SbiRuntime::isVBAEnabled() )
-+			pVar = getDefaultProp( rPar.Get(1) );
-+		if ( pVar )
-+		{
-+			pVar->Broadcast( SBX_HINT_DATAWANTED );
-+			rPar.Get( 0 )->PutBool( pVar->IsEmpty() );
-+		}
-+		else
-+			rPar.Get( 0 )->PutBool( rPar.Get(1)->IsEmpty() );
-+	}
- }
- 
- RTLFUNC(IsError)
diff --git a/applied_patches/0491-avmedia-source-gstreamer-gstframegrabber.cxx.diff b/applied_patches/0373-avmedia-source-gstreamer-gstframegrabber.cxx.diff
similarity index 100%
rename from applied_patches/0491-avmedia-source-gstreamer-gstframegrabber.cxx.diff
rename to applied_patches/0373-avmedia-source-gstreamer-gstframegrabber.cxx.diff
diff --git a/applied_patches/0373-vba-fix-control-shape-geom-fix.diff b/applied_patches/0373-vba-fix-control-shape-geom-fix.diff
deleted file mode 100644
index 038dbdd12..000000000
--- a/applied_patches/0373-vba-fix-control-shape-geom-fix.diff
+++ /dev/null
@@ -1,233 +0,0 @@
-diff --git sc/source/ui/vba/vbashape.cxx sc/source/ui/vba/vbashape.cxx
-index a8d9e82..eb31a64 100644
---- sc/source/ui/vba/vbashape.cxx
-+++ sc/source/ui/vba/vbashape.cxx
-@@ -53,6 +53,7 @@ using namespace ::vos;
- ScVbaShape::ScVbaShape( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, sal_Int32 nType ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( xParent, xContext ), m_xShape( xShape ), m_xShapes( xShapes ), m_nType( nType )
- {
-     m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
-+    m_pShapeHelper.reset( new ShapeHelper( m_xShape ) );
-     addListeners();
- }
- 
-@@ -179,59 +180,49 @@ ScVbaShape::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
- double SAL_CALL 
- ScVbaShape::getHeight() throw (uno::RuntimeException)
- {
--    return Millimeter::getInPoints( m_xShape->getSize().Height );
-+    return m_pShapeHelper->getHeight();
- }
- 
- void SAL_CALL 
- ScVbaShape::setHeight( double _height ) throw (uno::RuntimeException)
- {
--    awt::Size aSize( m_xShape->getSize() );
--    aSize.Height = Millimeter::getInHundredthsOfOneMillimeter( _height );
--    m_xShape->setSize( aSize );
-+    m_pShapeHelper->setHeight( _height );
- }
- 
- double SAL_CALL 
- ScVbaShape::getWidth() throw (uno::RuntimeException)
- {
--    return Millimeter::getInPoints( m_xShape->getSize().Width );
-+    return m_pShapeHelper->getWidth();
- }
- 
- void SAL_CALL 
- ScVbaShape::setWidth( double _width ) throw (uno::RuntimeException)
- {
--    awt::Size aSize( m_xShape->getSize() );
--    aSize.Width = Millimeter::getInHundredthsOfOneMillimeter( _width );
--    m_xShape->setSize( aSize );
-+    m_pShapeHelper->setWidth( _width );
- }
- 
- double SAL_CALL 
- ScVbaShape::getLeft() throw (uno::RuntimeException)
- {
--    return Millimeter::getInPoints( m_xShape->getPosition().X );
-+    return m_pShapeHelper->getLeft();
- }
- 
- void SAL_CALL 
- ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException)
- {
--    awt::Point oldPosition;
--    oldPosition = m_xShape->getPosition();
--    oldPosition.X = Millimeter::getInHundredthsOfOneMillimeter( _left );
--    m_xShape->setPosition( oldPosition );
-+    m_pShapeHelper->setLeft( _left );
- }
- 
- double SAL_CALL 
- ScVbaShape::getTop() throw (uno::RuntimeException)
- {
--    return Millimeter::getInPoints( m_xShape->getPosition().Y );
-+    return m_pShapeHelper->getTop();
- }
- 
- void SAL_CALL 
- ScVbaShape::setTop( double _top ) throw (uno::RuntimeException)
- {
--    awt::Point oldPosition;
--    oldPosition = m_xShape->getPosition();
--    oldPosition.Y = Millimeter::getInHundredthsOfOneMillimeter( _top );
--    m_xShape->setPosition( oldPosition );
-+    return m_pShapeHelper->setTop( _top );
- }
- 
- sal_Bool SAL_CALL 
-diff --git sc/source/ui/vba/vbashape.hxx sc/source/ui/vba/vbashape.hxx
-index d896a3d..eb48b93 100644
---- sc/source/ui/vba/vbashape.hxx
-+++ sc/source/ui/vba/vbashape.hxx
-@@ -47,9 +47,9 @@ typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE;
- 
- class ScVbaShape : public ScVbaShape_BASE
- {
--friend class ConcreteXShapeHelper; // perhaps an accessor would be better
- private:
- protected:
-+    std::auto_ptr< ov::ShapeHelper > m_pShapeHelper;
-     css::uno::Reference< css::drawing::XShape > m_xShape;
-     css::uno::Reference< css::drawing::XShapes > m_xShapes;
-     css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
-diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx
-index cfc8ee0..5749839 100644
---- vbahelper/inc/vbahelper/vbahelper.hxx
-+++ vbahelper/inc/vbahelper/vbahelper.hxx
-@@ -46,6 +46,7 @@
- #include <vcl/pointr.hxx>
- #define VBAHELPER_DLLIMPLEMENTATION
- #include <vbahelper/vbadllapi.h>
-+#include <memory>
- namespace css = ::com::sun::star;
- 
- namespace ooo 
-@@ -132,10 +133,34 @@ namespace msforms {
-     class XShape;
- }
- 
-+class VBAHELPER_DLLPUBLIC ShapeHelper
-+{
-+protected:
-+	css::uno::Reference< css::drawing::XShape > xShape;
-+public:
-+	ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException );
-+    
-+	double getHeight();
-+
-+    	void setHeight(double _fheight) throw ( css::script::BasicErrorException );
-+    
-+	double getWidth();
-+
-+	void setWidth(double _fWidth) throw ( css::script::BasicErrorException );
-+    
-+	double getLeft();
-+    
-+	void setLeft(double _fLeft);
-+
-+	double getTop();
-+    
-+	void setTop(double _fTop);
-+};
-+
- class VBAHELPER_DLLPUBLIC ConcreteXShapeGeometryAttributes : public AbstractGeometryAttributes
- {
-+    std::auto_ptr< ShapeHelper > m_pShapeHelper;
- public:
--    css::uno::Reference< ooo::vba::msforms::XShape > m_xShape; 
-     ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape );
-     virtual double getLeft();
-     virtual void setLeft( double nLeft );
-@@ -164,30 +189,6 @@ public:
-     virtual void setWidth( double nWidth);
- };
- 
--class VBAHELPER_DLLPUBLIC ShapeHelper
--{
--protected:
--	css::uno::Reference< css::drawing::XShape > xShape;
--public:
--	ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException );
--    
--	double getHeight();
--
--    	void setHeight(double _fheight) throw ( css::script::BasicErrorException );
--    
--	double getWidth();
--
--	void setWidth(double _fWidth) throw ( css::script::BasicErrorException );
--    
--	double getLeft();
--    
--	void setLeft(double _fLeft);
--
--	double getTop();
--    
--	void setTop(double _fTop);
--};
--
- class VBAHELPER_DLLPUBLIC ContainerUtilities
- {
- 
-diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx
-index bc66be6..b95ccf1 100644
---- vbahelper/source/vbahelper/vbahelper.cxx
-+++ vbahelper/source/vbahelper/vbahelper.cxx
-@@ -818,8 +818,7 @@ double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double
- 
- ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape )
- {
--// #FIXME needs to be an instantiable service
--//	m_xShape = new ScVbaShape( xContext, xShape );
-+    m_pShapeHelper.reset( new ShapeHelper( xShape ) );
- }
- 
- static uno::Reference< frame::XController > lcl_getCurrentController()
-@@ -1002,36 +1001,36 @@ UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComp
- 
-     double ConcreteXShapeGeometryAttributes::getLeft()
-     {
--        return m_xShape->getLeft();
-+        return m_pShapeHelper->getLeft();
-     }
-     void ConcreteXShapeGeometryAttributes::setLeft( double nLeft )
-     {
--        m_xShape->setLeft( nLeft );
-+        m_pShapeHelper->setLeft( nLeft );
-     }
-     double ConcreteXShapeGeometryAttributes::getTop()
-     {
--        return m_xShape->getTop();
-+        return m_pShapeHelper->getTop();
-     }
-     void ConcreteXShapeGeometryAttributes::setTop( double nTop )
-     {
--        m_xShape->setTop( nTop );
-+        m_pShapeHelper->setTop( nTop );
-     }
- 
-     double ConcreteXShapeGeometryAttributes::getHeight()
-     {
--        return m_xShape->getHeight();
-+        return m_pShapeHelper->getHeight();
-     }
-     void ConcreteXShapeGeometryAttributes::setHeight( double nHeight )
-     {
--        m_xShape->setHeight( nHeight );
-+        m_pShapeHelper->setHeight( nHeight );
-     }
-     double ConcreteXShapeGeometryAttributes::getWidth()
-     {
--        return m_xShape->getWidth();
-+        return m_pShapeHelper->getWidth();
-     }
-     void ConcreteXShapeGeometryAttributes::setWidth( double nWidth)
-     {
--        m_xShape->setHeight( nWidth );
-+        m_pShapeHelper->setWidth( nWidth );
-     }
- 
- 
diff --git a/applied_patches/0492-avmedia-source-gstreamer-gstframegrabber.hxx.diff b/applied_patches/0374-avmedia-source-gstreamer-gstframegrabber.hxx.diff
similarity index 100%
rename from applied_patches/0492-avmedia-source-gstreamer-gstframegrabber.hxx.diff
rename to applied_patches/0374-avmedia-source-gstreamer-gstframegrabber.hxx.diff
diff --git a/applied_patches/0374-basic-public-dim-fix.diff b/applied_patches/0374-basic-public-dim-fix.diff
deleted file mode 100644
index d0a42e57f..000000000
--- a/applied_patches/0374-basic-public-dim-fix.diff
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git basic/inc/basic/sbmod.hxx basic/inc/basic/sbmod.hxx
-index ab496bc..d92bb84 100644
---- basic/inc/basic/sbmod.hxx
-+++ basic/inc/basic/sbmod.hxx
-@@ -38,6 +38,7 @@
- #include <rtl/ustring.hxx>
- #endif
- #include <com/sun/star/script/ModuleType.hpp>
-+#include <vector>
- class SbMethod;
- class SbProperty;
- class SbiRuntime;
-@@ -59,6 +60,7 @@ class SbModule : public SbxObject
- 	friend class	SbClassModuleObject;
- 
- 	SbModuleImpl*	mpSbModuleImpl;		// Impl data
-+	std::vector< String > mModuleVariableNames;
- 	SbModule();
- 	SbModule(const SbModule&);
- 
-@@ -138,6 +140,8 @@ public:
-         INT32 GetModuleType() { return mnType; }
-         void SetModuleType( INT32 nType ) { mnType = nType; }
- 	bool GetIsProxyModule() { return bIsProxyModule; }
-+        void AddVarName( const String& aName );
-+        void RemoveVars();
- };
- 
- #ifndef __SB_SBMODULEREF_HXX
-diff --git basic/source/classes/sbxmod.cxx basic/source/classes/sbxmod.cxx
-index cf5b5a5..36eb266 100644
---- basic/source/classes/sbxmod.cxx
-+++ basic/source/classes/sbxmod.cxx
-@@ -822,6 +822,33 @@ void SbModule::RunInit()
- }
- 
- // Mit private/dim deklarierte Variablen loeschen
-+
-+void SbModule::AddVarName( const String& aName ) 
-+{ 
-+	// see if the name is added allready
-+	std::vector< String >::iterator it_end = mModuleVariableNames.end();
-+	for ( std::vector< String >::iterator it = mModuleVariableNames.begin(); it != it_end; ++it )
-+	{
-+		if ( aName == *it )
-+			return;	
-+	}
-+	mModuleVariableNames.push_back( aName ); 
-+}
-+
-+void SbModule::RemoveVars()
-+{
-+    std::vector< String >::iterator it_end = mModuleVariableNames.end();
-+    for ( std::vector< String >::iterator it = mModuleVariableNames.begin(); it != it_end; ++it )
-+    {
-+	// We don't want a Find being called in a derived class ( e.g. 
-+	// SbUserform because it could trigger say an initialise event  
-+	// which would cause basic to be re-run in the middle of the init ( and remember RemoveVars is called from compile and we don't want code to run as part of the compile )
-+	SbxVariableRef p = SbModule::Find( *it, SbxCLASS_PROPERTY );
-+	if( p.Is() )
-+		Remove (p);
-+    }
-+}
-+
- void SbModule::ClearPrivateVars()
- {
- 	for( USHORT i = 0 ; i < pProps->Count() ; i++ )
-diff --git basic/source/comp/sbcomp.cxx basic/source/comp/sbcomp.cxx
-index 8af8285..047f30e 100644
---- basic/source/comp/sbcomp.cxx
-+++ basic/source/comp/sbcomp.cxx
-@@ -134,6 +134,7 @@ BOOL SbModule::Compile()
- 	if( bRet )
- 	{
- 		pBasic->ClearAllModuleVars();
-+		RemoveVars(); // remove 'this' Modules variables
- 		// clear all method statics
- 		for( USHORT i = 0; i < pMethods->Count(); i++ )
- 		{
-diff --git basic/source/runtime/step2.cxx basic/source/runtime/step2.cxx
-index 38e794d..644ecdb 100644
---- basic/source/runtime/step2.cxx
-+++ basic/source/runtime/step2.cxx
-@@ -1131,16 +1131,26 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
- 	if( pImg->GetFlag( SBIMG_CLASSMODULE ) )
- 		StepPUBLIC_Impl( nOp1, nOp2, true );
- 
-+        SbxObject* pStorage = &rBasic;
- 	String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
-+	// Store module scope variables at module scope 
-+	// in non vba mode these are stored at the library level :/
-+	// not sure if this really should not be enabled for ALL basic
-+	if ( SbiRuntime::isVBAEnabled() ) 
-+        {
-+            pStorage = pMod;
-+            pMod->AddVarName( aName );
-+        }
-+
- 	SbxDataType t = (SbxDataType) nOp2;
--	BOOL bFlag = rBasic.IsSet( SBX_NO_MODIFY );
-+	BOOL bFlag = pStorage->IsSet( SBX_NO_MODIFY );
- 	rBasic.SetFlag( SBX_NO_MODIFY );
--	SbxVariableRef p = rBasic.Find( aName, SbxCLASS_PROPERTY );
-+	SbxVariableRef p = pStorage->Find( aName, SbxCLASS_PROPERTY );
- 	if( p.Is() )
--		rBasic.Remove (p);
--	p = rBasic.Make( aName, SbxCLASS_PROPERTY, t );
-+		pStorage->Remove (p);
-+	p = pStorage->Make( aName, SbxCLASS_PROPERTY, t );
- 	if( !bFlag )
--		rBasic.ResetFlag( SBX_NO_MODIFY );
-+		pStorage->ResetFlag( SBX_NO_MODIFY );
- 	if( p )
- 	{
- 		p->SetFlag( SBX_DONTSTORE );
diff --git a/applied_patches/0493-avmedia-source-gstreamer-gstmanager.cxx.diff b/applied_patches/0375-avmedia-source-gstreamer-gstmanager.cxx.diff
similarity index 100%
rename from applied_patches/0493-avmedia-source-gstreamer-gstmanager.cxx.diff
rename to applied_patches/0375-avmedia-source-gstreamer-gstmanager.cxx.diff
diff --git a/applied_patches/0375-vba-fix-optionalparam-assigment.diff b/applied_patches/0375-vba-fix-optionalparam-assigment.diff
deleted file mode 100644
index f671a5d62..000000000
--- a/applied_patches/0375-vba-fix-optionalparam-assigment.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git basic/source/runtime/step2.cxx basic/source/runtime/step2.cxx
-index 644ecdb..5606274 100644
---- basic/source/runtime/step2.cxx
-+++ basic/source/runtime/step2.cxx
-@@ -723,6 +723,8 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
- 		SaveRef( q );
- 		*q = *p;
- 		p = q;
-+		if ( i ) 
-+                	refParams->Put( p, i );
- 	}
- 	SetupArgs( p, nOp1 );
- 	PushVar( CheckArray( p ) );
diff --git a/applied_patches/0494-avmedia-source-gstreamer-gstmanager.hxx.diff b/applied_patches/0376-avmedia-source-gstreamer-gstmanager.hxx.diff
similarity index 100%
rename from applied_patches/0494-avmedia-source-gstreamer-gstmanager.hxx.diff
rename to applied_patches/0376-avmedia-source-gstreamer-gstmanager.hxx.diff
diff --git a/applied_patches/0376-vba-reset-screenupdateing.diff b/applied_patches/0376-vba-reset-screenupdateing.diff
deleted file mode 100644
index 582e6a7b4..000000000
--- a/applied_patches/0376-vba-reset-screenupdateing.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git basic/source/classes/.sbxmod.cxx.swp basic/source/classes/.sbxmod.cxx.swp
-deleted file mode 100644
-index cf9f771..0000000
-Binary files basic/source/classes/.sbxmod.cxx.swp and /dev/null differ
-diff --git basic/source/classes/sbxmod.cxx basic/source/classes/sbxmod.cxx
-index cf5b5a5..7e42498 100644
---- basic/source/classes/sbxmod.cxx
-+++ basic/source/classes/sbxmod.cxx
-@@ -98,7 +98,31 @@ SV_IMPL_VARARR(SbiBreakpoints,USHORT)
- 
- SV_IMPL_VARARR(HighlightPortions, HighlightPortion)
- 
--
-+bool UnlockControllerHack( StarBASIC* pBasic )
-+{
-+    bool bRes = false;
-+    if ( pBasic && pBasic->IsDocBasic() )
-+    {
-+        uno::Any aUnoVar;
-+        ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( "ThisComponent" ) );
-+        SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( pBasic->Find( sVarName, SbxCLASS_DONTCARE ) );
-+        if ( pGlobs )
-+            aUnoVar = pGlobs->getUnoAny(); 
-+        uno::Reference< frame::XModel > xModel( aUnoVar, uno::UNO_QUERY);
-+        if ( xModel.is() )
-+        {
-+            try
-+            {
-+                xModel->unlockControllers();
-+                bRes = true;
-+            }
-+            catch( uno::Exception& )
-+            {
-+            }
-+        }
-+    }
-+    return bRes;
-+}
- /////////////////////////////////////////////////////////////////////////////
- 
- // Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen
-@@ -750,6 +774,15 @@ USHORT SbModule::Run( SbMethod* pMeth )
- 
- 			delete pRt;
- 			pMOD = pOldMod;
-+			if ( pINST->nCallLvl == 0 && IsVBACompat() )
-+			{
-+				// VBA always ensure screenupdating is enabled after completing
-+				StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
-+				if ( pBasic && pBasic->IsDocBasic() )
-+				{
-+					UnlockControllerHack( pBasic );
-+				}
-+			}
- 			if( bDelInst )
- 			{
- 				// #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
-@@ -774,6 +807,11 @@ USHORT SbModule::Run( SbMethod* pMeth )
- 		pINST->nCallLvl--;			// Call-Level wieder runter
- 		StarBASIC::FatalError( SbERR_STACK_OVERFLOW );
-     }
-+		
-+	// VBA always ensure screenupdating is enabled after completing
-+	StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
-+	if ( pBasic && pBasic->IsDocBasic() && !pINST )
-+		UnlockControllerHack( pBasic );
- 	if( bDelInst )
- 	{
- 		// #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
diff --git a/applied_patches/0495-avmedia-source-gstreamer-gstplayer.cxx.diff b/applied_patches/0377-avmedia-source-gstreamer-gstplayer.cxx.diff
similarity index 100%
rename from applied_patches/0495-avmedia-source-gstreamer-gstplayer.cxx.diff
rename to applied_patches/0377-avmedia-source-gstreamer-gstplayer.cxx.diff
diff --git a/applied_patches/0377-vba-redim-array-fix.diff b/applied_patches/0377-vba-redim-array-fix.diff
deleted file mode 100644
index 232c91fbd..000000000
--- a/applied_patches/0377-vba-redim-array-fix.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git basic/source/inc/runtime.hxx basic/source/inc/runtime.hxx
-index 5a1bff2..6384306 100644
---- basic/source/inc/runtime.hxx
-+++ basic/source/inc/runtime.hxx
-@@ -315,6 +315,7 @@ class SbiRuntime
- 	SbxArrayRef   refExprStk;       // expression stack
- 	SbxArrayRef   refCaseStk;       // CASE expression stack
- 	SbxArrayRef   refRedimpArray;   // Array saved to use for REDIM PRESERVE
-+	SbxVariableRef   refRedim;   // Array saved to use for REDIM
- 	SbxVariableRef xDummyVar;		// Ersatz fuer nicht gefundene Variablen
- 	SbxVariable* mpExtCaller;		// Caller ( external - e.g. button name, shape, range object etc. - only in vba mode )
- 	SbiArgvStack*  pArgvStk;		// ARGV-Stack
-diff --git basic/source/runtime/step0.cxx basic/source/runtime/step0.cxx
-index a2df718..fa66194 100644
---- basic/source/runtime/step0.cxx
-+++ basic/source/runtime/step0.cxx
-@@ -48,6 +48,11 @@
- 
- #include <algorithm>
- 
-+// for a patch forward declaring these methods below makes sense
-+// but, #FIXME lets really just move the methods to the top
-+void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType );
-+void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled );
-+
- SbxVariable* getDefaultProp( SbxVariable* pRef );
- 
- void SbiRuntime::StepNOP()
-@@ -637,6 +642,17 @@ void SbiRuntime::StepDIM()
- // #56204 DIM-Funktionalitaet in Hilfsmethode auslagern (step0.cxx)
- void SbiRuntime::DimImpl( SbxVariableRef refVar )
- {
-+	// If refDim then this DIM statement is terminating a ReDIM and
-+	// previous StepERASE_CLEAR for an array, the following actions have 
-+	// been delayed from ( StepERASE_CLEAR ) 'till here
-+	if ( refRedim ) 
-+	{
-+		if ( !refRedimpArray ) // only erase the array not ReDim Preserve
-+			lcl_eraseImpl( refVar, bVBAEnabled );
-+		SbxDataType eType = refVar->GetType();
-+		lcl_clearImpl( refVar, eType );
-+		refRedim = NULL;
-+	}
- 	SbxArray* pDims = refVar->GetParameters();
- 	// Muss eine gerade Anzahl Argumente haben
- 	// Man denke daran, dass Arg[0] nicht zaehlt!
-@@ -802,6 +818,7 @@ void SbiRuntime::StepREDIMP()
- void SbiRuntime::StepREDIMP_ERASE()
- {
- 	SbxVariableRef refVar = PopVar();
-+	refRedim = refVar;
- 	SbxDataType eType = refVar->GetType();
- 	if( eType & SbxARRAY )
- 	{
-@@ -812,12 +829,6 @@ void SbiRuntime::StepREDIMP_ERASE()
- 			refRedimpArray = pDimArray;
- 		}
- 
--		// As in ERASE
--		USHORT nSavFlags = refVar->GetFlags();
--		refVar->ResetFlag( SBX_FIXED );
--		refVar->SetType( SbxDataType(eType & 0x0FFF) );
--		refVar->SetFlags( nSavFlags );
--		refVar->Clear();
- 	}
- 	else
- 	if( refVar->IsFixed() )
-@@ -890,10 +901,7 @@ void SbiRuntime::StepERASE()
- 
- void SbiRuntime::StepERASE_CLEAR()
- {
--	SbxVariableRef refVar = PopVar();
--	lcl_eraseImpl( refVar, bVBAEnabled );
--	SbxDataType eType = refVar->GetType();
--	lcl_clearImpl( refVar, eType );
-+	refRedim = PopVar();
- }
- 
- void SbiRuntime::StepARRAYACCESS()
-diff --git basic/source/runtime/step2.cxx basic/source/runtime/step2.cxx
-index 5606274..8e82cbf 100644
---- basic/source/runtime/step2.cxx
-+++ basic/source/runtime/step2.cxx
-@@ -458,7 +458,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
- {
- 	// Falls wir ein Array haben, wollen wir bitte das Array-Element!
- 	SbxArray* pPar;
--	if( pElem->GetType() & SbxARRAY )
-+	if( ( pElem->GetType() & SbxARRAY ) && (SbxVariable*)refRedim != pElem )
- 	{
- 		SbxBase* pElemObj = pElem->GetObject();
- 		SbxDimArray* pDimArray = PTR_CAST(SbxDimArray,pElemObj);
diff --git a/applied_patches/0496-avmedia-source-gstreamer-gstplayer.hxx.diff b/applied_patches/0378-avmedia-source-gstreamer-gstplayer.hxx.diff
similarity index 100%
rename from applied_patches/0496-avmedia-source-gstreamer-gstplayer.hxx.diff
rename to applied_patches/0378-avmedia-source-gstreamer-gstplayer.hxx.diff
diff --git a/applied_patches/0378-vba-fix-userform-init.diff b/applied_patches/0378-vba-fix-userform-init.diff
deleted file mode 100644
index 182d7a72e..000000000
--- a/applied_patches/0378-vba-fix-userform-init.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git basic/source/classes/sbxmod.cxx basic/source/classes/sbxmod.cxx
-index cf5b5a5..44a8ff2 100644
---- basic/source/classes/sbxmod.cxx
-+++ basic/source/classes/sbxmod.cxx
-@@ -1824,7 +1824,7 @@ void SbUserFormModule::InitObject()
- SbxVariable*
- SbUserFormModule::Find( const XubString& rName, SbxClassType t )
- {
--    if ( !pDocObject && !GetSbData()->bRunInit  )
-+    if ( !pDocObject && !GetSbData()->bRunInit && pINST )
-         InitObject();
-     return SbObjModule::Find( rName, t );
- }
diff --git a/applied_patches/0497-avmedia-source-gstreamer-gstuno.cxx.diff b/applied_patches/0379-avmedia-source-gstreamer-gstuno.cxx.diff
similarity index 100%
rename from applied_patches/0497-avmedia-source-gstreamer-gstuno.cxx.diff
rename to applied_patches/0379-avmedia-source-gstreamer-gstuno.cxx.diff
diff --git a/applied_patches/0379-vba-fix-Range-Insert-CopyOrigin.diff b/applied_patches/0379-vba-fix-Range-Insert-CopyOrigin.diff
deleted file mode 100644
index 9484b6c76..000000000
--- a/applied_patches/0379-vba-fix-Range-Insert-CopyOrigin.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- sc/source/ui/vba/vbarange.cxx	2009-04-27 18:35:48.000000000 +0100
-+++ sc/source/ui/vba/vbarange.cxx	2009-04-27 19:41:46.000000000 +0100
-@@ -4340,8 +4340,10 @@ ScVbaRange::AutoFilter( const uno::Any&
- }
- 
- void SAL_CALL 
--ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) throw (uno::RuntimeException)
-+ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (uno::RuntimeException)
- {
-+	sal_Bool bCopyOrigin = sal_True;
-+	CopyOrigin >>= bCopyOrigin;
- 	// It appears ( from the web ) that the undocumented CopyOrigin
- 	// param should contain member of enum XlInsertFormatOrigin
- 	// which can have values xlFormatFromLeftOrAbove or xlFormatFromRightOrBelow
-@@ -4373,8 +4375,17 @@ ScVbaRange::Insert( const uno::Any& Shif
- 			mode = sheet::CellInsertMode_RIGHT;
- 	}
- 	RangeHelper thisRange( mxRange );
-+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();	
- 	uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );	
--	xCellRangeMove->insertCells( thisRange.getCellRangeAddressable()->getRangeAddress(), mode );
-+	xCellRangeMove->insertCells( thisAddress, mode );
-+	if ( bCopyOrigin )
-+	{
-+		// After the insert ( this range ) actually has moved
-+		ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
-+	 	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getDocShellFromRange( mxRange ) , aRange ) );
-+		uno::Reference< excel::XRange > xVbaRange( new ScVbaRange( getParent(), mxContext, xRange, mbIsRows, mbIsColumns ) );	
-+		xVbaRange->PasteSpecial( uno::Any(), uno::Any(), uno::Any(), uno::Any() );
-+	}
- }
- 
- void SAL_CALL
diff --git a/applied_patches/0498-avmedia-source-gstreamer-gstwindow.cxx.diff b/applied_patches/0380-avmedia-source-gstreamer-gstwindow.cxx.diff
similarity index 100%
rename from applied_patches/0498-avmedia-source-gstreamer-gstwindow.cxx.diff
rename to applied_patches/0380-avmedia-source-gstreamer-gstwindow.cxx.diff
diff --git a/applied_patches/0380-calc-vba-volatile-user-func.diff b/applied_patches/0380-calc-vba-volatile-user-func.diff
deleted file mode 100644
index 685b6d9a0..000000000
--- a/applied_patches/0380-calc-vba-volatile-user-func.diff
+++ /dev/null
@@ -1,904 +0,0 @@
-diff --git formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/FormulaCompiler.hxx
-index d5c3410..a388926 100644
---- formula/inc/formula/FormulaCompiler.hxx
-+++ formula/inc/formula/FormulaCompiler.hxx
-@@ -219,6 +219,8 @@ public:
-      */
-     OpCode GetEnglishOpCode( const String& rName ) const;
- 
-+    static bool IsOpCodeVolatile( OpCode eOp );
-+
-     static BOOL DeQuote( String& rStr );
- 
-     static const String&    GetNativeSymbol( OpCode eOp );
-diff --git formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/FormulaCompiler.cxx
-index a0a1c1a..72e6409 100644
---- formula/source/core/api/FormulaCompiler.cxx
-+++ formula/source/core/api/FormulaCompiler.cxx
-@@ -744,6 +744,30 @@ OpCode FormulaCompiler::GetEnglishOpCode( const String& rName ) const
-     return bFound ? (*iLook).second : OpCode(ocNone);
- }
- 
-+bool FormulaCompiler::IsOpCodeVolatile( OpCode eOp )
-+{
-+    switch (eOp)
-+    {
-+        // no parameters:
-+        case ocRandom:
-+        case ocGetActDate:
-+        case ocGetActTime:
-+        // one parameter:
-+        case ocFormula:
-+        case ocInfo:
-+        // more than one parameters:
-+            // ocIndirect/ocIndirectXL otherwise would have to do
-+            // StopListening and StartListening on a reference for every
-+            // interpreted value.
-+        case ocIndirect:
-+        case ocIndirectXL:
-+            // ocOffset results in indirect references.
-+        case ocOffset:
-+            return true;
-+    }
-+    return false;
-+}
-+
- // Remove quotes, escaped quotes are unescaped.
- BOOL FormulaCompiler::DeQuote( String& rStr )
- {
-@@ -960,44 +984,32 @@ void FormulaCompiler::Factor()
-     {
-         if( nNumFmt == NUMBERFORMAT_UNDEFINED )
-             nNumFmt = lcl_GetRetFormat( eOp );
--        // Functions that have to be always recalculated
--        switch( eOp )
-+
-+        if ( IsOpCodeVolatile(eOp) )
-+            pArr->SetRecalcModeAlways();
-+        else
-         {
--            // no parameters:
--            case ocRandom:
--            case ocGetActDate:
--            case ocGetActTime:
--            // one parameter:
--            case ocFormula:
--            case ocInfo:
--            // more than one parameters:
--                // ocIndirect/ocIndirectXL otherwise would have to do
--                // StopListening and StartListening on a reference for every
--                // interpreted value.
--            case ocIndirect:
--            case ocIndirectXL:
--                // ocOffset results in indirect references.
--            case ocOffset:
--                pArr->SetRecalcModeAlways();
--            break;
--                // Functions recalculated on every document load.
--                // Don't use SetRecalcModeOnLoad() which would override
--                // ModeAlways.
--            case ocConvert :
--                pArr->AddRecalcMode( RECALCMODE_ONLOAD );
--            break;
--                // If the referred cell is moved the value changes.
--            case ocColumn :
--            case ocRow :
--                // ocCell needs recalc on move for some possible type values.
--            case ocCell :
--                pArr->SetRecalcModeOnRefMove();
--            break;
--            case ocHyperLink :
--                pArr->SetHyperLink(TRUE);
--            break;
--            default:
--                ;   // nothing
-+            switch( eOp )
-+            {
-+                    // Functions recalculated on every document load.
-+                    // Don't use SetRecalcModeOnLoad() which would override
-+                    // ModeAlways.
-+                case ocConvert :
-+                    pArr->AddRecalcMode( RECALCMODE_ONLOAD );
-+                break;
-+                    // If the referred cell is moved the value changes.
-+                case ocColumn :
-+                case ocRow :
-+                    // ocCell needs recalc on move for some possible type values.
-+                case ocCell :
-+                    pArr->SetRecalcModeOnRefMove();
-+                break;
-+                case ocHyperLink :
-+                    pArr->SetHyperLink(TRUE);
-+                break;
-+                default:
-+                    ;   // nothing
-+            }
-         }
-         if (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR)
-         {
---- sc/inc/document.hxx
-+++ sc/inc/document.hxx
-@@ -96,6 +96,7 @@ class ScDrawLayer;
- class ScExtDocOptions;
- class ScExternalRefManager;
- class ScFormulaCell;
-+class ScMacroManager;
- class ScMarkData;
- class ScOutlineTable;
- class ScPatternAttr;
-@@ -294,6 +295,8 @@ private:
-     ::std::auto_ptr<ScClipParam>     mpClipParam;
- 
-     ::std::auto_ptr<ScExternalRefManager> pExternalRefMgr;
-+    ::std::auto_ptr<ScMacroManager> mpMacroMgr;
-+
- 
-     // mutable for lazy construction
-     mutable ::std::auto_ptr< ScFormulaParserPool >
-@@ -1510,6 +1513,7 @@ public:
- 	SC_DLLPUBLIC ScLkUpdMode		GetLinkMode() const				{ return eLinkMode ;}
- 	void			SetLinkMode( ScLkUpdMode nSet )	{ 	eLinkMode  = nSet;}
- 
-+    SC_DLLPUBLIC ScMacroManager* GetMacroManager();
- 
- private:
-     ScDocument(const ScDocument& r); // disabled with no definition
-diff --git sc/inc/macromgr.hxx sc/inc/macromgr.hxx
-new file mode 100644
-index 0000000..35a3b2d
---- /dev/null
-+++ sc/inc/macromgr.hxx
-@@ -0,0 +1,70 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: document.hxx,v $
-+ * $Revision: 1.115.36.9 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SC_MACROMGR_HXX
-+#define SC_MACROMGR_HXX
-+
-+#include <com/sun/star/container/XContainerListener.hpp>
-+
-+#include "rtl/ustring.hxx"
-+#include "scdllapi.h"
-+
-+#include <hash_map>
-+#include <memory>
-+
-+class ScDocument;
-+class ScFormulaCell;
-+class ScUserMacroDepTracker;
-+
-+class ScMacroManager
-+{
-+public:
-+    explicit ScMacroManager(ScDocument* pDoc);
-+    ~ScMacroManager();
-+
-+    SC_DLLPUBLIC void InitUserFuncData();
-+    SC_DLLPUBLIC void SetUserFuncVolatile( const rtl::OUString& sName, bool isVolatile );
-+    SC_DLLPUBLIC bool GetUserFuncVolatile( const rtl::OUString& sName );
-+
-+    void AddDependentCell(const ::rtl::OUString& aModuleName, ScFormulaCell* pCell);
-+    void RemoveDependentCell(ScFormulaCell* pCell);
-+    void BroadcastModuleUpdate(const ::rtl::OUString& aModuleName);
-+
-+private:
-+    typedef std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameBoolMap;
-+    NameBoolMap mhFuncToVolatile;
-+    com::sun::star::uno::Reference< com::sun::star::container::XContainerListener > mxContainerListener;
-+
-+    ::std::auto_ptr<ScUserMacroDepTracker> mpDepTracker;
-+    ScDocument* mpDoc;
-+};
-+
-+#endif
-+
---- sc/source/core/data/cell.cxx
-+++ sc/source/core/data/cell.cxx
-@@ -54,6 +54,7 @@
- #include "recursionhelper.hxx"
- #include "postit.hxx"
- #include "externalrefmgr.hxx"
-+#include "macromgr.hxx"
- #include <svx/editobj.hxx>
- #include <svtools/intitem.hxx>
- #include <svx/flditem.hxx>
-@@ -855,6 +856,9 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons
- ScFormulaCell::~ScFormulaCell()
- {
- 	pDocument->RemoveFromFormulaTree( this );
-+    if (pCode->HasOpCode(ocMacro))
-+        pDocument->GetMacroManager()->RemoveDependentCell(this);
-+
- 	delete pCode;
- #ifdef DBG_UTIL
- 	eCellType = CELLTYPE_DESTROYED;
-@@ -1721,6 +1725,36 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
-         // Reschedule verlangsamt das ganze erheblich, nur bei Prozentaenderung ausfuehren
-         ScProgress::GetInterpretProgress()->SetStateCountDownOnPercent(
-             pDocument->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE );
-+
-+        switch (p->GetVolatileType())
-+        {
-+            case ScInterpreter::VOLATILE:
-+                // Volatile via built-in volatile functions.  No actions needed.
-+            break;
-+            case ScInterpreter::VOLATILE_MACRO:
-+                // The formula contains a volatile macro.
-+                pCode->SetRecalcModeAlways();
-+                pDocument->PutInFormulaTree(this);
-+                StartListeningTo(pDocument);
-+            break;
-+            case ScInterpreter::NOT_VOLATILE:
-+                if (pCode->IsRecalcModeAlways())
-+                {
-+                    // The formula was previously volatile, but no more.
-+                    EndListeningTo(pDocument);
-+                    pCode->SetRecalcModeNormal();
-+                }
-+                else
-+                {    
-+                    // non-volatile formula.  End listening to the area in case 
-+                    // it's listening due to macro module change.
-+                    pDocument->EndListeningArea(BCA_LISTEN_ALWAYS, this);
-+                }
-+                pDocument->RemoveFromFormulaTree(this);
-+            break;
-+            default:
-+                ;
-+        }
-     }
-     else
-     {
---- sc/source/core/data/documen2.cxx
-+++ sc/source/core/data/documen2.cxx
-@@ -96,6 +96,7 @@
- #include "externalrefmgr.hxx"
- #include "tabprotection.hxx"
- #include "clipparam.hxx"
-+#include "macromgr.hxx"
- #include <com/sun/star/document/XVbaEventsHelper.hpp>
- #include "formulaparserpool.hxx"
- 
-@@ -157,6 +158,7 @@ ScDocument::ScDocument( ScDocumentMode	eMode,
-         pCacheFieldEditEngine( NULL ),
-         pDocProtection( NULL ),
-         mpClipParam( NULL ),
-+        mpMacroMgr( NULL ), 
- 		pViewOptions( NULL ),
- 		pDocOptions( NULL ),
- 		pExtDocOptions( NULL ),
-diff --git sc/source/core/data/documen8.cxx sc/source/core/data/documen8.cxx
-index 077b6fa..f1b608c 100644
---- sc/source/core/data/documen8.cxx
-+++ sc/source/core/data/documen8.cxx
-@@ -96,6 +96,7 @@
- #include "globstr.hrc"
- #include "sc.hrc"
- #include "charthelper.hxx"
-+#include "macromgr.hxx"
- 
- #define GET_SCALEVALUE(set,id) 	((const SfxUInt16Item&)(set.Get( id ))).GetValue()
- 
-@@ -427,6 +428,13 @@ BYTE ScDocument::GetEditTextDirection(SCTAB nTab) const
-     return sal::static_int_cast<BYTE>(eRet);
- }
- 
-+ScMacroManager* ScDocument::GetMacroManager()
-+{
-+    if (!mpMacroMgr.get())
-+        mpMacroMgr.reset(new ScMacroManager(this));
-+    return mpMacroMgr.get();
-+}
-+
- //------------------------------------------------------------------------
- 
- void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo,
-diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index 11af993..676883e 100644
---- sc/source/core/data/document.cxx
-+++ sc/source/core/data/document.cxx
-@@ -95,9 +95,13 @@
- #include "externalrefmgr.hxx"
- #include "tabprotection.hxx"
- #include "clipparam.hxx"
-+#include <basic/basmgr.hxx>
-+#include <com/sun/star/container/XContainer.hpp>
- 
- #include <map>
- 
-+using namespace ::com::sun::star;
-+
- namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
- 
- struct ScDefaultAttr
-diff --git sc/source/core/inc/interpre.hxx sc/source/core/inc/interpre.hxx
-index a72775d..3a45be6 100644
---- sc/source/core/inc/interpre.hxx
-+++ sc/source/core/inc/interpre.hxx
-@@ -128,6 +128,15 @@ public:
-     static inline double div( const double& fNumerator, const double& fDenominator );
- 
-     ScMatrixRef GetNewMat(SCSIZE nC, SCSIZE nR);
-+
-+    enum VolatileType { 
-+        VOLATILE,   
-+        VOLATILE_MACRO,
-+        NOT_VOLATILE
-+    };
-+
-+    VolatileType GetVolatileType() const;
-+
- private:
-     static ScTokenStack*    pGlobalStack;
-     static BOOL             bGlobalStackInUse;
-@@ -161,6 +170,8 @@ private:
-     BOOL        bCalcAsShown;           // precision as shown
-     BOOL        bMatrixFormula;         // formula cell is a matrix formula
- 
-+    VolatileType meVolaileType;
-+
- //---------------------------------Funktionen in interpre.cxx---------
- // nMust <= nAct <= nMax ? ok : PushError
- inline BOOL MustHaveParamCount( short nAct, short nMust );
-diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
-index baa5152..7fccd66 100644
---- sc/source/core/tool/interpr4.cxx
-+++ sc/source/core/tool/interpr4.cxx
-@@ -41,6 +41,7 @@
- #include <basic/sbmod.hxx>
- #include <basic/sbstar.hxx>
- #include <basic/sbx.hxx>
-+#include <basic/sbxobj.hxx>
- #include <basic/sbuno.hxx>
- #include <svtools/zforlist.hxx>
- #include <tools/urlobj.hxx>
-@@ -71,6 +72,8 @@
- #include "jumpmatrix.hxx"
- #include "parclass.hxx"
- #include "externalrefmgr.hxx"
-+#include "formula/FormulaCompiler.hxx"
-+#include "macromgr.hxx"
- 
- #include <math.h>
- #include <float.h>
-@@ -78,6 +81,7 @@
- #include <algorithm>
- #include <functional>
- #include <vbahelper/vbahelper.hxx>
-+#include <basic/basmgr.hxx>
- 
- using namespace com::sun::star;
- using namespace formula;
-@@ -2751,7 +2755,9 @@ void ScInterpreter::ScMacro()
-         return;
-     }
- 
-+    bool bVolatileMacro = false; 
-     SbMethod* pMethod = (SbMethod*)pVar;
-+
-     SbModule* pModule = pMethod->GetModule();
- 	bool bUseVBAObjects = pModule->IsVBACompat();
-     SbxObject* pObject = pModule->GetParent();
-@@ -2891,6 +2897,13 @@ void ScInterpreter::ScMacro()
-         pDok->DecMacroInterpretLevel();
-         pDok->UnlockTable( aPos.Tab() );
- 
-+        ScMacroManager* pMacroMgr = pDok->GetMacroManager();
-+        if (pMacroMgr)
-+        {
-+            bVolatileMacro = pMacroMgr->GetUserFuncVolatile( pMethod->GetName() );
-+            pMacroMgr->AddDependentCell(pModule->GetName(), pMyFormulaCell);
-+        }
-+
-         SbxDataType eResType = refRes->GetType();
-         if( pVar->GetError() )
-             SetError( errNoValue);
-@@ -2962,6 +2975,9 @@ void ScInterpreter::ScMacro()
-     }
- 
-     pSfxApp->LeaveBasicCall();
-+
-+    if (bVolatileMacro && meVolaileType == NOT_VOLATILE)
-+        meVolaileType = VOLATILE_MACRO;
- }
- 
- 
-@@ -3619,7 +3635,8 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc,
-     pTokenMatrixMap( NULL ),
-     pMyFormulaCell( pCell ),
-     pFormatter( pDoc->GetFormatTable() ),
--    bCalcAsShown( pDoc->GetDocOptions().IsCalcAsShown() )
-+    bCalcAsShown( pDoc->GetDocOptions().IsCalcAsShown() ),
-+    meVolaileType(NOT_VOLATILE)
- {
-     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScTTT" );
- //  pStack = new ScToken*[ MAXSTACK ];
-@@ -4060,6 +4077,9 @@ StackVar ScInterpreter::Interpret()
-                 default : PushError( errUnknownOpCode);                 break;
-             }
- 
-+            if (FormulaCompiler::IsOpCodeVolatile(eOp))
-+                meVolaileType = VOLATILE;
-+
-             // Remember result matrix in case it could be reused.
-             if (pTokenMatrixMap && sp && GetStackType() == svMatrix)
-                 pTokenMatrixMap->insert( ScTokenMatrixMap::value_type( pCur,
-diff --git sc/source/core/tool/interpr5.cxx sc/source/core/tool/interpr5.cxx
-index c5b4770..854c25d 100644
---- sc/source/core/tool/interpr5.cxx
-+++ sc/source/core/tool/interpr5.cxx
-@@ -324,6 +324,11 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR)
-     return pMat;
- }
- 
-+ScInterpreter::VolatileType ScInterpreter::GetVolatileType() const
-+{
-+    return meVolaileType;
-+}
-+
- ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken,
-         SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
-         SCCOL nCol2, SCROW nRow2, SCTAB nTab2 )
-diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
-index 60c2f6d..846682b 100644
---- sc/source/filter/excel/excimp8.cxx
-+++ sc/source/filter/excel/excimp8.cxx
-@@ -99,6 +99,7 @@
- #include "stlpool.hxx"
- #include "stlsheet.hxx"
- #include "detfunc.hxx"
-+#include "macromgr.hxx"
- 
- #include <com/sun/star/document/XDocumentProperties.hpp>
- #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-@@ -107,6 +108,7 @@
- #include <cppuhelper/component_context.hxx>
- 
- #include <com/sun/star/container/XNameContainer.hpp>
-+#include <sfx2/app.hxx>
-  
- using namespace com::sun::star;
- 
-@@ -279,7 +281,24 @@ void ImportExcel8::ReadBasic( void )
-             SvxImportMSVBasic aBasicImport( *pShell, *xRootStrg, bLoadCode, bLoadStrg );
- 	    bool bAsComment = !bLoadExecutable || !aGlobs.hasValue();
-             aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, bAsComment );
--            GetObjectManager().SetOleNameOverrideInfo( aBasicImport.ControlNameForObjectId() );
-+            if ( !bAsComment )
-+            {
-+                GetObjectManager().SetOleNameOverrideInfo( aBasicImport.ControlNameForObjectId() );
-+                ScDocument& rDoc = GetDoc();
-+                rDoc.GetMacroManager()->InitUserFuncData();
-+                // Fake ThisComponent being setup by Activate ( which is a view 
-+                // related thing ), 
-+                //  a) if another document is opened then in theory  ThisComponent
-+                //     will be reset as before, 
-+                //  b) when this document is  'really' Activated then ThisComponent
-+                //     again will be set as before
-+                // The only wrinkle seems if this document is loaded 'InVisible'
-+                // but.. I don't see that this is possible from the vba API 
-+                // I could be wrong though
-+                BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
-+                if ( pAppMgr )
-+                    pAppMgr->SetGlobalUNOConstant( "ThisComponent", makeAny( pShell->GetModel() ) );
-+            }
-         }
-     }
- }
-diff --git sc/source/ui/docshell/macromgr.cxx sc/source/ui/docshell/macromgr.cxx
-new file mode 100644
-index 0000000..97623f3
---- /dev/null
-+++ sc/source/ui/docshell/macromgr.cxx
-@@ -0,0 +1,217 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: document.hxx,v $
-+ * $Revision: 1.115.36.9 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_sc.hxx"
-+
-+// INCLUDE ---------------------------------------------------------------
-+
-+#include "macromgr.hxx"
-+#include "document.hxx"
-+
-+#include "basic/basmgr.hxx"
-+#include "cppuhelper/implbase1.hxx"
-+#include "sfx2/objsh.hxx"
-+#include "cell.hxx"
-+#include <com/sun/star/container/XContainer.hpp>
-+
-+#include <list>
-+
-+using namespace ::com::sun::star;
-+using ::com::sun::star::uno::RuntimeException;
-+using ::com::sun::star::uno::Reference;
-+using ::rtl::OUString;
-+using ::rtl::OUStringHash;
-+using ::std::hash_map;
-+using ::std::list;
-+using ::std::for_each;
-+using ::std::pair;
-+
-+// ============================================================================
-+
-+/** 
-+ * A simple container to keep track of cells that depend on basic modules 
-+ * changes.  We don't check for duplicates at insertion time; instead, we 
-+ * remove duplicates at query time. 
-+ */
-+class ScUserMacroDepTracker
-+{
-+public:
-+    void addCell(const OUString& rModuleName, ScFormulaCell* pCell)
-+    {
-+        ModuleCellMap::iterator itr = maCells.find(rModuleName);
-+        if (itr == maCells.end())
-+        {
-+            pair<ModuleCellMap::iterator, bool> r = maCells.insert(
-+                ModuleCellMap::value_type(rModuleName, list<ScFormulaCell*>()));
-+
-+            if (!r.second)
-+                // insertion failed.
-+                return;
-+
-+            itr = r.first;
-+        }
-+        itr->second.push_back(pCell);
-+    }
-+
-+    void removeCell(ScFormulaCell* pCell)
-+    {
-+        ModuleCellMap::iterator itr = maCells.begin(), itrEnd = maCells.end();
-+        for (; itr != itrEnd; ++itr)
-+            itr->second.remove(pCell);
-+    }
-+
-+    void getCellsByModule(const OUString& rModuleName, list<ScFormulaCell*>& rCells)
-+    {
-+        ModuleCellMap::iterator itr = maCells.find(rModuleName);
-+        if (itr == maCells.end())
-+            return;
-+
-+        list<ScFormulaCell*>& rCellList = itr->second;
-+
-+        // Remove duplicates.
-+        rCellList.sort();
-+        rCellList.unique();
-+        // exception safe copy
-+        list<ScFormulaCell*> temp(rCellList);
-+        rCells.swap(temp);
-+    }
-+
-+private:
-+    typedef hash_map<OUString, list<ScFormulaCell*>, OUStringHash> ModuleCellMap;
-+    ModuleCellMap maCells;
-+};
-+
-+
-+// ============================================================================
-+
-+ScMacroManager::ScMacroManager(ScDocument* pDoc) :
-+    mpDepTracker(new ScUserMacroDepTracker),
-+    mpDoc(pDoc)
-+{
-+}
-+
-+ScMacroManager::~ScMacroManager()
-+{
-+}
-+
-+typedef ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener > ContainerListenerHelper;
-+
-+class VBAProjectListener : public ContainerListenerHelper
-+{
-+    ScMacroManager* mpMacroMgr;
-+public:
-+    VBAProjectListener( ScMacroManager* pMacroMgr ) : mpMacroMgr( pMacroMgr ) {}
-+    // XEventListener
-+    virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException) {}
-+
-+    // XContainerListener
-+    virtual void SAL_CALL elementInserted( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException){}
-+    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) throw(RuntimeException)
-+    {
-+        rtl::OUString sModuleName;
-+        Event.Accessor >>= sModuleName;
-+        OSL_TRACE("VBAProjectListener::elementReplaced(%s)", rtl::OUStringToOString( sModuleName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+        mpMacroMgr->InitUserFuncData();
-+        mpMacroMgr->BroadcastModuleUpdate(sModuleName);
-+    }
-+    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException){}
-+
-+};
-+
-+void ScMacroManager::InitUserFuncData()
-+{
-+    // Clear hash_map
-+    mhFuncToVolatile.clear();
-+    String sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
-+
-+    Reference< container::XContainer > xModuleContainer;
-+    SfxObjectShell* pShell = mpDoc->GetDocumentShell();
-+    if ( pShell && pShell->GetBasicManager()->GetName().Len() > 0 )
-+        sProjectName = pShell->GetBasicManager()->GetName();
-+    try
-+    { 
-+        Reference< script::XLibraryContainer > xLibraries( pShell->GetBasicContainer(), uno::UNO_QUERY_THROW );
-+        xModuleContainer.set( xLibraries->getByName( sProjectName ), uno::UNO_QUERY_THROW );
-+        
-+        if ( xModuleContainer.is() )
-+        {
-+            // remove old listener ( if there was one )
-+            if ( mxContainerListener.is() )
-+                xModuleContainer->removeContainerListener( mxContainerListener );
-+            // Create listener
-+            mxContainerListener = new VBAProjectListener( this );
-+            xModuleContainer->addContainerListener( mxContainerListener );
-+        }
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+}
-+
-+void ScMacroManager::SetUserFuncVolatile( const OUString& sName, bool isVolatile )
-+{
-+    mhFuncToVolatile[ sName ] = isVolatile;
-+}
-+
-+bool ScMacroManager::GetUserFuncVolatile( const OUString& sName )
-+{
-+    NameBoolMap::iterator it = mhFuncToVolatile.find( sName );
-+    if ( it == mhFuncToVolatile.end() )
-+        return false;
-+    return it->second;
-+}
-+
-+void ScMacroManager::AddDependentCell(const OUString& aModuleName, ScFormulaCell* pCell)
-+{
-+    mpDepTracker->addCell(aModuleName, pCell);
-+}
-+
-+void ScMacroManager::RemoveDependentCell(ScFormulaCell* pCell)
-+{
-+    mpDepTracker->removeCell(pCell);
-+}
-+
-+void ScMacroManager::BroadcastModuleUpdate(const OUString& aModuleName)
-+{
-+    list<ScFormulaCell*> aCells;
-+    mpDepTracker->getCellsByModule(aModuleName, aCells);
-+    list<ScFormulaCell*>::iterator itr = aCells.begin(), itrEnd = aCells.end();
-+    for (; itr != itrEnd; ++itr)
-+    {   
-+        ScFormulaCell* pCell = *itr; 
-+        mpDoc->PutInFormulaTree(pCell); // for F9 recalc
-+
-+        // for recalc on cell value change.  If the cell is not volatile, the
-+        // cell stops listening right away after it gets re-interpreted.
-+        mpDoc->StartListeningArea(BCA_LISTEN_ALWAYS, pCell);
-+    }
-+}
-+
-diff --git sc/source/ui/docshell/makefile.mk sc/source/ui/docshell/makefile.mk
-index b48627e..e96d750 100644
---- sc/source/ui/docshell/makefile.mk
-+++ sc/source/ui/docshell/makefile.mk
-@@ -95,7 +95,8 @@ SLOFILES =  \
-         $(SLO)$/hiranges.obj \
-         $(SLO)$/pntlock.obj \
-         $(SLO)$/sizedev.obj \
--        $(SLO)$/editable.obj
-+        $(SLO)$/editable.obj \
-+	$(SLO)$/macromgr.obj
- 
- 
- EXCEPTIONSFILES= \
-@@ -105,7 +106,8 @@ EXCEPTIONSFILES= \
-         $(SLO)$/docsh8.obj \
-         $(SLO)$/externalrefmgr.obj \
-         $(SLO)$/dbdocimp.obj \
--        $(SLO)$/docfunc.obj
-+        $(SLO)$/docfunc.obj \
-+	$(SLO)$/macromgr.obj
- 
- SRS1NAME=$(TARGET)
- SRC1FILES =  tpstat.src
-@@ -135,7 +137,8 @@ LIB1OBJFILES =  \
-         $(SLO)$/hiranges.obj \
-         $(SLO)$/pntlock.obj \
-         $(SLO)$/sizedev.obj \
--        $(SLO)$/editable.obj
-+        $(SLO)$/editable.obj \
-+	$(SLO)$/macromgr.obj
- 
- # --- Tagets -------------------------------------------------------
- 
-diff --git sc/source/ui/vba/vbaapplication.cxx sc/source/ui/vba/vbaapplication.cxx
-index 69121a0..c26a61d 100644
---- sc/source/ui/vba/vbaapplication.cxx
-+++ sc/source/ui/vba/vbaapplication.cxx
-@@ -61,6 +61,7 @@
- #include "vbatextboxshape.hxx"
- #include "vbaassistant.hxx"
- #include "sc.hrc"
-+#include "macromgr.hxx"
- 
- #include <osl/file.hxx>
- 
-@@ -87,7 +88,12 @@
- #include "unonames.hxx"
- #include "docsh.hxx"
- #include <vbahelper/helperdecl.hxx>
--
-+#include <basic/sbmeth.hxx>
-+#include <basic/sbmod.hxx>
-+#include <basic/sbstar.hxx>
-+#include <basic/sbx.hxx>
-+#include <basic/sbxobj.hxx>
-+#include <basic/sbuno.hxx>
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
- using ::com::sun::star::uno::Reference;
-@@ -1111,6 +1117,16 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile )  throw ( uno::RuntimeExc
- {
- 	sal_Bool bVolatile = sal_True;
- 	aVolatile >>= bVolatile;
-+    SbMethod* pMeth = StarBASIC::GetActiveMethod();
-+    if ( pMeth )
-+    {
-+        OSL_TRACE("ScVbaApplication::Volatile() In method ->%s<-", rtl::OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+        uno::Reference< frame::XModel > xModel( getCurrentDocument() );
-+        ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
-+        pDoc->GetMacroManager()->SetUserFuncVolatile( pMeth->GetName(), bVolatile);
-+    }
-+
-+// this is bound to break when loading the document
- 	return; 
- /*
- 	if ( bVolatile )
-diff --git sc/source/ui/vba/vbadialog.cxx sc/source/ui/vba/vbadialog.cxx
-index 7383f5d..abfa6d3 100644
---- sc/source/ui/vba/vbadialog.cxx
-+++ sc/source/ui/vba/vbadialog.cxx
-@@ -47,6 +47,7 @@ void
- ScVbaDialog::Show() throw(uno::RuntimeException)
- {
- 	rtl::OUString aURL;
-+	// #FIXME - should this really use the current document?
-         uno::Reference< frame::XModel > xModel = getCurrentDocument();
- 	if ( xModel.is() )
- 	{
-diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index 7a31267..5f62736 100644
---- sc/source/ui/vba/vbarange.cxx
-+++ sc/source/ui/vba/vbarange.cxx
-@@ -1976,6 +1976,7 @@ ScVbaRange::Select() throw (uno::RuntimeException)
- 		// ThisComponent.CurrentController.Frame.getContainerWindow.SetFocus
- 		try
- 		{
-+			// #FIXME don't use current document
- 			uno::Reference< frame::XController > xController( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
- 			uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_QUERY_THROW );
- 			uno::Reference< awt::XWindow > xWin( xFrame->getContainerWindow(), uno::UNO_QUERY_THROW );
-@@ -2026,8 +2027,10 @@ ScVbaRange::Activate() throw (uno::RuntimeException)
- 	table::CellRangeAddress thisRangeAddress = xThisRangeAddress->getRangeAddress();
- 	
- 	// get current selection
-+	// #FIXME don't use getCurrentDocument
- 	uno::Reference< sheet::XCellRangeAddressable > xRange( getCurrentDocument()->getCurrentSelection(), ::uno::UNO_QUERY);
- 
-+	// #FIXME don't use getCurrentDocument
- 	uno::Reference< sheet::XSheetCellRanges > xRanges( getCurrentDocument()->getCurrentSelection(), ::uno::UNO_QUERY);
- 
- 	if ( xRanges.is() )
-@@ -2541,8 +2544,10 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
- {
- 	if ( m_Areas->getCount() > 1 )
- 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
-+	// #FIXME doen't use current document
- 	uno::Reference< view::XSelectionSupplier > xSelection( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
- 	// save old selection
-+	// #FIXME doen't use current document
- 	uno::Reference< uno::XInterface > xSel(  getCurrentDocument()->getCurrentSelection() );
- 	// select this range
- 	xSelection->select( uno::makeAny( mxRange ) );
-@@ -3900,6 +3905,7 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC
- 			}
- 		}
- 	}
-+	// #FIXME don't use current document
- 	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY );
- 	uno::Reference< table::XCellRange > xSheetRange( xView->getActiveSheet(), uno::UNO_QUERY_THROW ); 
- 	ScVbaRange* pRange = new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xSheetRange );
-diff --git sc/source/ui/vba/vbashape.cxx sc/source/ui/vba/vbashape.cxx
-index a8d9e82..a231cad 100644
---- sc/source/ui/vba/vbashape.cxx
-+++ sc/source/ui/vba/vbashape.cxx
-@@ -431,6 +431,7 @@ ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_
- void SAL_CALL
- ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException )
- {
-+	// #FIXME don't use getCurrentDocument
-     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-     uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-     xSelectSupp->select( uno::makeAny( m_xShape ) );
-diff --git sc/source/ui/vba/vbashaperange.cxx sc/source/ui/vba/vbashaperange.cxx
-index 8aebaea..5890e43 100644
---- sc/source/ui/vba/vbashaperange.cxx
-+++ sc/source/ui/vba/vbashaperange.cxx
-@@ -66,6 +66,7 @@ ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xPar
- void SAL_CALL 
- ScVbaShapeRange::Select(  ) throw (uno::RuntimeException)
- {
-+	// #FIXME don't use getCurrentDocument
-     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-     uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-     xSelectSupp->select( uno::makeAny( getShapes() ) );
-diff --git sc/source/ui/vba/vbashapes.cxx sc/source/ui/vba/vbashapes.cxx
-index 80c1e8f..c1013ba 100644
---- sc/source/ui/vba/vbashapes.cxx
-+++ sc/source/ui/vba/vbashapes.cxx
-@@ -219,6 +219,7 @@ ScVbaShapes::SelectAll() throw (uno::RuntimeException)
- uno::Reference< drawing::XShape > 
- ScVbaShapes::createShape( rtl::OUString service ) throw (css::uno::RuntimeException)
- {
-+	// #FIXME don't use getCurrentDocument
-     uno::Reference< lang::XMultiServiceFactory > xMSF( getCurrentDocument(), uno::UNO_QUERY_THROW );
-     uno::Reference< drawing::XShape > xShape( xMSF->createInstance( service ), uno::UNO_QUERY_THROW );
-     return xShape;
diff --git a/applied_patches/0499-avmedia-source-gstreamer-gstwindow.hxx.diff b/applied_patches/0381-avmedia-source-gstreamer-gstwindow.hxx.diff
similarity index 100%
rename from applied_patches/0499-avmedia-source-gstreamer-gstwindow.hxx.diff
rename to applied_patches/0381-avmedia-source-gstreamer-gstwindow.hxx.diff
diff --git a/applied_patches/0381-vba-documentcontext.diff b/applied_patches/0381-vba-documentcontext.diff
deleted file mode 100644
index 32904e63b..000000000
--- a/applied_patches/0381-vba-documentcontext.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git basic/inc/basic/sbstar.hxx basic/inc/basic/sbstar.hxx
-index 5f2d594..ea7e75e 100644
---- basic/inc/basic/sbstar.hxx
-+++ basic/inc/basic/sbstar.hxx
-@@ -204,6 +204,7 @@ public:
- 	SbxObjectRef getRTL( void ) { return pRtl; }
- 	BOOL IsDocBasic() { return bDocBasic; }
- 	SbxVariable* VBAFind( const String& rName, SbxClassType t );
-+	bool GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
- };
- 
- #ifndef __SB_SBSTARBASICREF_HXX
-diff --git basic/source/basmgr/basmgr.cxx basic/source/basmgr/basmgr.cxx
-index 63c4376..1b25f42 100644
---- basic/source/basmgr/basmgr.cxx
-+++ basic/source/basmgr/basmgr.cxx
-@@ -1840,15 +1840,7 @@ bool BasicManager::GetGlobalUNOConstant( const sal_Char* _pAsciiName, ::com::sun
-     StarBASIC* pStandardLib = GetStdLib();
-     OSL_PRECOND( pStandardLib, "BasicManager::SetGlobalUNOConstant: no lib to insert into!" );
-     if ( pStandardLib )
--    {
--        ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
--        SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( pStandardLib->Find( sVarName, SbxCLASS_DONTCARE ) );
--        if ( pGlobs )
--        {
--            aOut = pGlobs->getUnoAny(); 
--            bRes = true;
--        } 
--    }
-+        bRes = pStandardLib->GetUNOConstant( _pAsciiName, aOut );
-     return bRes;
- }
- 
-diff --git basic/source/classes/sb.cxx basic/source/classes/sb.cxx
-index 302a2ed..de99045 100644
---- basic/source/classes/sb.cxx
-+++ basic/source/classes/sb.cxx
-@@ -1547,6 +1547,18 @@ BOOL StarBASIC::LoadOldModules( SvStream& )
- 	return FALSE;
- }
- 
-+bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
-+{
-+    bool bRes = false;
-+    ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
-+    SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( Find( sVarName, SbxCLASS_DONTCARE ) );
-+    if ( pGlobs )
-+    {
-+        aOut = pGlobs->getUnoAny();
-+        bRes = true;
-+    }
-+    return bRes;
-+}
- 
- //========================================================================
- // #118116 Implementation Collection object
-diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index 5f62736..6f303f0 100644
---- sc/source/ui/vba/vbarange.cxx
-+++ sc/source/ui/vba/vbarange.cxx
-@@ -1976,8 +1976,7 @@ ScVbaRange::Select() throw (uno::RuntimeException)
- 		// ThisComponent.CurrentController.Frame.getContainerWindow.SetFocus
- 		try
- 		{
--			// #FIXME don't use current document
--			uno::Reference< frame::XController > xController( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
-+			uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
- 			uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_QUERY_THROW );
- 			uno::Reference< awt::XWindow > xWin( xFrame->getContainerWindow(), uno::UNO_QUERY_THROW );
- 			xWin->setFocus();
-@@ -2547,8 +2546,7 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
- 	// #FIXME doen't use current document
- 	uno::Reference< view::XSelectionSupplier > xSelection( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
- 	// save old selection
--	// #FIXME doen't use current document
--	uno::Reference< uno::XInterface > xSel(  getCurrentDocument()->getCurrentSelection() );
-+	uno::Reference< uno::XInterface > xSel( getScDocShell()->GetModel()->getCurrentSelection() );
- 	// select this range
- 	xSelection->select( uno::makeAny( mxRange ) );
- 	// set up defaults	
-@@ -3905,7 +3903,6 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC
- 			}
- 		}
- 	}
--	// #FIXME don't use current document
- 	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY );
- 	uno::Reference< table::XCellRange > xSheetRange( xView->getActiveSheet(), uno::UNO_QUERY_THROW ); 
- 	ScVbaRange* pRange = new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xSheetRange );
-diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx
-index cfc8ee0..29e8236 100644
---- vbahelper/inc/vbahelper/vbahelper.hxx
-+++ vbahelper/inc/vbahelper/vbahelper.hxx
-@@ -65,6 +65,8 @@ namespace ooo
-         VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell,  const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException);
-         VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell,  const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
-         VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
-+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getDocumentContext() throw (css::uno::RuntimeException);
-+
- 		VBAHELPER_DLLPUBLIC css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException);
- 		VBAHELPER_DLLPUBLIC css::uno::Reference< css::script::XTypeConverter > getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
- 
diff --git a/applied_patches/0500-avmedia-source-gstreamer-makefile.mk.diff b/applied_patches/0382-avmedia-source-gstreamer-makefile.mk.diff
similarity index 100%
rename from applied_patches/0500-avmedia-source-gstreamer-makefile.mk.diff
rename to applied_patches/0382-avmedia-source-gstreamer-makefile.mk.diff
diff --git a/applied_patches/0382-fix-read-disabled-toolbarimport.diff b/applied_patches/0382-fix-read-disabled-toolbarimport.diff
deleted file mode 100644
index 8d40a4bc9..000000000
--- a/applied_patches/0382-fix-read-disabled-toolbarimport.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git sw/source/filter/ww8/ww8toolbar.cxx sw/source/filter/ww8/ww8toolbar.cxx
-index d63fd77..dfcaa17 100644
---- sw/source/filter/ww8/ww8toolbar.cxx
-+++ sw/source/filter/ww8/ww8toolbar.cxx
-@@ -273,7 +273,7 @@ bool Customization::ImportCustomToolBar( CustomToolBarImportHelper& helper )
- {
-     if ( bIsDroppedMenuTB )
-         return true; // ignore ( will be processed by the ImportMenu )
--    if ( tbidForTBD == 0x25 && customizationDataTBDelta.size() )  // we can handle in a limited way additions the built-in menu bar
-+    if ( tbidForTBD == 0x25 )  // we can handle in a limited way additions the built-in menu bar
-     {
-         for ( std::vector< TBDelta >::iterator it = customizationDataTBDelta.begin(); it != customizationDataTBDelta.end(); ++it )
-         {
-@@ -481,7 +481,8 @@ CTB::Print( FILE* fp )
- bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
- {
-     static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) );
--    
-+    if ( !tb.IsEnabled() )
-+        return true;  // didn't fail, just ignoring
-     // Create default setting
-     uno::Reference< container::XIndexContainer > xIndexContainer( helper.getCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
-     uno::Reference< container::XIndexAccess > xIndexAccess( xIndexContainer, uno::UNO_QUERY_THROW );
-@@ -491,7 +492,6 @@ bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
-     xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( name.getString() ) ); 
- 
-     rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() );
--
-     for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
-     {
-         // createToolBar item for control
-@@ -542,12 +542,17 @@ bool TB::Read( SvStream* pS )
-     return name.Read( pS );
- }
- 
-+bool TB::IsEnabled()
-+{
-+    return ( bFlags & 0x10 ) != 0x10;
-+}
-+
- void TB::Print( FILE* fp )
- {
-     Indent a;
-     indent_printf( fp, "[ 0x%x ] TB -- dump\n", nOffSet );
-     indent_printf( fp, "  bSignature (0x%x), bVersion(0x%x), cCL(0x%x), ltbid(0x%x), cRowsDefault (0x%x), ltbtr(0x%x), bFlags(0x%x)\n", bSignature, bVersion, cCL, static_cast< unsigned int >( ltbid ), static_cast< unsigned int >( ltbtr ), cRowsDefault, bFlags );
--    indent_printf( fp, "  name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+    indent_printf( fp, "  name %s state - %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr(), IsEnabled() ? "true" : "false" );
- 
- }
- 
-diff --git sw/source/filter/ww8/ww8toolbar.hxx sw/source/filter/ww8/ww8toolbar.hxx
-index c3e57ed..ae23835 100644
---- sw/source/filter/ww8/ww8toolbar.hxx
-+++ sw/source/filter/ww8/ww8toolbar.hxx
-@@ -46,6 +46,7 @@ public:
-     ~TB(){}
-     bool Read(SvStream *pS);
-     void Print( FILE* );
-+    bool IsEnabled();
- };
- 
- class CTB : public TBBase
diff --git a/applied_patches/0501-letter-wizard-resource-id.diff b/applied_patches/0383-letter-wizard-resource-id.diff
similarity index 100%
rename from applied_patches/0501-letter-wizard-resource-id.diff
rename to applied_patches/0383-letter-wizard-resource-id.diff
diff --git a/applied_patches/0383-vba-word-support-part2.diff b/applied_patches/0383-vba-word-support-part2.diff
deleted file mode 100644
index d3cf7d3a4..000000000
--- a/applied_patches/0383-vba-word-support-part2.diff
+++ /dev/null
@@ -1,23674 +0,0 @@
---- forms/source/component/ListBox.cxx
-+++ forms/source/component/ListBox.cxx
-@@ -1514,6 +1514,8 @@ namespace frm
-     void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent) throw(RuntimeException)
-     {
-         // forward this to our listeners
-+        Reference< XChild > xChild( getModel(), UNO_QUERY );
-+        if ( xChild.is() && xChild->getParent().is() )
-         {
-             ::osl::MutexGuard aGuard( m_aMutex );
-             if ( m_aItemListeners.getLength() )
-@@ -1526,6 +1528,8 @@ namespace frm
- 		        m_pItemBroadcaster->addEvent( new ItemEventDescription( _rEvent ), this );
-             }
-         }
-+        else
-+            m_aItemListeners.notifyEach( &XItemListener::itemStateChanged, _rEvent );
- 
-         // and do the handling for the ChangeListeners
-         ::osl::ClearableMutexGuard aGuard(m_aMutex);
-diff --git oovbaapi/ooo/vba/XApplicationBase.idl oovbaapi/ooo/vba/XApplicationBase.idl
-index bd2fa27..38efadd 100644
---- oovbaapi/ooo/vba/XApplicationBase.idl
-+++ oovbaapi/ooo/vba/XApplicationBase.idl
-@@ -52,8 +52,11 @@ interface XApplicationBase
- 
- 	[attribute] boolean ScreenUpdating;
- 	[attribute] boolean DisplayStatusBar;
-+	[attribute, readonly] string Version;
- 
-     any CommandBars( [in] any aIndex );
-+	void Run([in] string MacroName, [in] /*Optional*/ any varg1, [in] /*Optional*/ any varg2, [in] /*Optional*/ any varg3, [in] /*Optional*/ any varg4, [in] /*Optional*/ any varg5, [in] /*Optional*/ any varg6, [in] /*Optional*/ any varg7, [in] /*Optional*/ any varg8, [in] /*Optional*/ any varg9, [in] /*Optional*/ any varg10, [in] /*Optional*/ any varg11, [in] /*Optional*/ any varg12, [in] /*Optional*/ any varg13, [in] /*Optional*/ any varg14, [in] /*Optional*/ any varg15, [in] /*Optional*/ any varg16, [in] /*Optional*/ any varg17, [in] /*Optional*/ any varg18, [in] /*Optional*/ any varg19, [in] /*Optional*/ any varg20, [in] /*Optional*/ any varg21, [in] /*Optional*/ any varg22, [in] /*Optional*/ any varg23, [in] /*Optional*/ any varg24, [in] /*Optional*/ any varg25, [in] /*Optional*/ any varg26, [in] /*Optional*/ any varg27, [in] /*Optional*/ any varg28, [in] /*Optional*/ any varg29, [in] /*Optional*/ any varg30);
-+    float CentimetersToPoints([in] float Centimeters );
- };
- 
- }; };
-diff --git oovbaapi/ooo/vba/XDialogBase.idl oovbaapi/ooo/vba/XDialogBase.idl
-new file mode 100644
-index 0000000..550c50f
---- /dev/null
-+++ oovbaapi/ooo/vba/XDialogBase.idl
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XDialog.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XDialog_idl__
-+#define __ooo_vba_XDialog_idl__
-+                                                                                                                             
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+
-+//=============================================================================
-+                                                                                                                             
-+module ooo {  module vba {
-+                                                                                                                             
-+//=============================================================================
-+
-+interface XDialogBase 
-+{
-+	interface ::ooo::vba::XHelperInterface;
-+
-+	void Show();
-+};
-+                                                                                                                             
-+}; };
-+                                                                                                                             
-+#endif
-+
-diff --git oovbaapi/ooo/vba/XDialogsBase.idl oovbaapi/ooo/vba/XDialogsBase.idl
-new file mode 100644
-index 0000000..14feec4
---- /dev/null
-+++ oovbaapi/ooo/vba/XDialogsBase.idl
-@@ -0,0 +1,60 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XDialogs.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XDialogs_idl__
-+#define __ooo_vba_XDialogs_idl__
-+                                                                                                                             
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+//=============================================================================
-+                                                                                                                             
-+module ooo {  module vba {
-+                                                                                                                             
-+//interface XDialogs : ::ooo::vba::XCollection
-+interface XDialogsBase 
-+{
-+	interface ::ooo::vba::XHelperInterface;
-+
-+    [attribute, readonly] long Count;
-+	any Item( [in] any Index );
-+};
-+                                                                                                                             
-+}; };
-+                                                                                                                             
-+#endif
-+
-diff --git oovbaapi/ooo/vba/XDocumentsBase.idl oovbaapi/ooo/vba/XDocumentsBase.idl
-new file mode 100644
-index 0000000..33de551
---- /dev/null
-+++ oovbaapi/ooo/vba/XDocumentsBase.idl
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XDocumentsBase.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XDocumentsBase_idl__
-+#define __ooo_vba_XDocumentsBase_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+
-+//=============================================================================
-+
-+module ooo {  module vba {
-+
-+//=============================================================================
-+
-+interface XDocumentsBase 
-+{
-+	interface ::ooo::vba::XCollection;
-+};
-+
-+}; };
-+
-+#endif
-diff --git oovbaapi/ooo/vba/XFontBase.idl oovbaapi/ooo/vba/XFontBase.idl
-new file mode 100644
-index 0000000..c2fe1c5
---- /dev/null
-+++ oovbaapi/ooo/vba/XFontBase.idl
-@@ -0,0 +1,71 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XFont.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XFont_idl__
-+#define __ooo_vba_XFont_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-+#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module ooo {  module vba {
-+
-+interface XFontBase
-+{
-+	interface ::ooo::vba::XHelperInterface;
-+
-+	[attribute] any   Size;
-+	[attribute] any    ColorIndex;
-+	[attribute] any    Color;
-+	[attribute] any Bold;
-+	[attribute] any Underline;
-+	[attribute] any Strikethrough;
-+	[attribute] any Shadow;
-+	[attribute] any Italic;
-+	[attribute] any Subscript;
-+	[attribute] any Superscript;
-+	[attribute] any  Name;
-+};
-+
-+//=============================================================================
-+
-+}; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/XPageSetupBase.idl oovbaapi/ooo/vba/XPageSetupBase.idl
-new file mode 100644
-index 0000000..c79f831
---- /dev/null
-+++ oovbaapi/ooo/vba/XPageSetupBase.idl
-@@ -0,0 +1,67 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_XPageSetupBase_idl__
-+#define __ooo_vba_XPageSetupBase_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module ooo {  module vba {
-+
-+//=============================================================================
-+
-+
-+interface XPageSetupBase
-+{
-+
-+	interface ::ooo::vba::XHelperInterface;
-+
-+	//Attributes
-+    [attribute] double TopMargin;
-+    [attribute] double BottomMargin;
-+    [attribute] double RightMargin;
-+    [attribute] double LeftMargin;
-+    [attribute] long Orientation;
-+};
-+
-+//=============================================================================
-+
-+}; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/excel/TextFrame.idl oovbaapi/ooo/vba/excel/TextFrame.idl
-new file mode 100644
-index 0000000..f6fb5cb
---- /dev/null
-+++ oovbaapi/ooo/vba/excel/TextFrame.idl
-@@ -0,0 +1,53 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef __ooo_vba_excel_TextFrame_idl__
-+#define __ooo_vba_excel_TextFrame_idl__
-+
-+#ifndef __ooo_vba_excel_XTextFrame_idl__
-+#include <ooo/vba/excel/XTextFrame.idl>
-+#endif
-+
-+#include <com/sun/star/uno/XComponentContext.idl>
-+
-+module ooo {  module vba { module excel {
-+service TextFrame : XTextFrame
-+{
-+  	//createTextFrame(  [in] ::ooo::vba::XHelperInterface Parent, [in] ::com::sun::star::frame::XModel xModel );
-+};
-+
-+}; }; };
-+
-+#endif
-diff --git oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/excel/XApplication.idl
-index 35c4852..2d903de 100644
---- oovbaapi/ooo/vba/excel/XApplication.idl
-+++ oovbaapi/ooo/vba/excel/XApplication.idl
-@@ -75,7 +75,6 @@ interface XApplication : com::sun::star::uno::XInterface
- 	[attribute] any CutCopyMode;
- 	[attribute] any StatusBar;
- 	[attribute] long Cursor; 
--	[attribute, readonly] string Version;
- 
- 	void setDefaultFilePath([in] string DefaultFilePath) raises(com::sun::star::script::BasicErrorException);
- 
-diff --git oovbaapi/ooo/vba/excel/XDialog.idl oovbaapi/ooo/vba/excel/XDialog.idl
-index da45681..c9900f4 100644
---- oovbaapi/ooo/vba/excel/XDialog.idl
-+++ oovbaapi/ooo/vba/excel/XDialog.idl
-@@ -45,13 +45,8 @@ module ooo {  module vba {  module excel {
-                                                                                                                              
- //=============================================================================
- 
--interface XApplication;
--                                                                                                                             
--interface XDialog 
-+interface XDialog : com::sun::star::uno::XInterface
- {
--	interface ::ooo::vba::XHelperInterface;
--
--	void Show();
- };
-                                                                                                                              
- }; }; };
-diff --git oovbaapi/ooo/vba/excel/XDialogs.idl oovbaapi/ooo/vba/excel/XDialogs.idl
-index 0610c44..4632e38 100644
---- oovbaapi/ooo/vba/excel/XDialogs.idl
-+++ oovbaapi/ooo/vba/excel/XDialogs.idl
-@@ -33,9 +33,6 @@
- #ifndef __com_sun_star_uno_XInterface_idl__
- #include <com/sun/star/uno/XInterface.idl>
- #endif
--#ifndef __ooo_vba_XCollection_idl__
--#include <ooo/vba/XCollection.idl>
--#endif
- 
- #ifndef __ooo_vba_XHelperInterface_idl__
- #include <ooo/vba/XHelperInterface.idl>
-@@ -44,15 +41,9 @@
- //=============================================================================
-                                                                                                                              
- module ooo {  module vba {  module excel {
--interface XApplication;                                                                                                                             
--//=============================================================================
-                                                                                                                              
--//interface XDialogs : ::ooo::vba::XCollection
--interface XDialogs 
-+interface XDialogs : com::sun::star::uno::XInterface
- {
--	interface ::ooo::vba::XHelperInterface;
--
--        [attribute, readonly] long Count;
- 
- 	any Item( [in] any Index );
- };
-diff --git oovbaapi/ooo/vba/excel/XFont.idl oovbaapi/ooo/vba/excel/XFont.idl
-index c03d84a..40396b8 100644
---- oovbaapi/ooo/vba/excel/XFont.idl
-+++ oovbaapi/ooo/vba/excel/XFont.idl
-@@ -47,22 +47,9 @@ module ooo {  module vba {  module excel {
- 
- interface XFont
- {
--	interface ::ooo::vba::XHelperInterface;
--
--	[attribute] any   Size;
- 	[attribute] any StandardFontSize;
- 	[attribute] any  StandardFont;
- 	[attribute] any  FontStyle;
--	[attribute] any    ColorIndex;
--	[attribute] any    Color;
--	[attribute] any Bold;
--	[attribute] any Underline;
--	[attribute] any Strikethrough;
--	[attribute] any Shadow;
--	[attribute] any Italic;
--	[attribute] any Subscript;
--	[attribute] any Superscript;
--	[attribute] any  Name;
- 	[attribute] any  OutlineFont;
- };
- 
-diff --git oovbaapi/ooo/vba/excel/XPageSetup.idl oovbaapi/ooo/vba/excel/XPageSetup.idl
-index cd15e79..ca210c4 100644
---- oovbaapi/ooo/vba/excel/XPageSetup.idl
-+++ oovbaapi/ooo/vba/excel/XPageSetup.idl
-@@ -45,20 +45,15 @@ module ooo {  module vba {  module excel {
- //=============================================================================
- 
- 
--interface XPageSetup
-+interface XPageSetup : com::sun::star::uno::XInterface
- {
- 
--	interface ::ooo::vba::XHelperInterface;
-+//	interface ::ooo::vba::XHelperInterface;
- 
- 	//Attributes
-     [attribute] string PrintArea;
--    [attribute] double TopMargin;
--    [attribute] double BottomMargin;
--    [attribute] double RightMargin;
--    [attribute] double LeftMargin;
-     [attribute] double HeaderMargin;
-     [attribute] double FooterMargin;
--    [attribute] long Orientation;
-     [attribute] any FitToPagesTall;
-     [attribute] any FitToPagesWide;
-     [attribute] any Zoom;
-diff --git oovbaapi/ooo/vba/excel/XTextFrame.idl oovbaapi/ooo/vba/excel/XTextFrame.idl
-index 534b256..4962be5 100644
---- oovbaapi/ooo/vba/excel/XTextFrame.idl
-+++ oovbaapi/ooo/vba/excel/XTextFrame.idl
-@@ -34,21 +34,9 @@
- #include <ooo/vba/XHelperInterface.idl>
- #endif
- 
--#ifndef __ooo_vba_excel_XCharacters_idl__
--#include <ooo/vba/excel/XCharacters.idl>
--#endif
--
- module ooo {  module vba {  module excel {
--interface XTextFrame : ooo::vba::XHelperInterface
-+interface XTextFrame : com::sun::star::uno::XInterface
- {
--    [attribute] boolean AutoSize;
--    [attribute] float MarginBottom;
--    [attribute] float MarginTop;
--    [attribute] float MarginLeft;
--    [attribute] float MarginRight;
--    XCharacters Characters();
--    /*I don't find it in msdn
--    Range TextRange();*/
- };
- }; }; };
- #endif
-diff --git oovbaapi/ooo/vba/excel/XWorkbooks.idl oovbaapi/ooo/vba/excel/XWorkbooks.idl
-index 5521257..77a3020 100644
---- oovbaapi/ooo/vba/excel/XWorkbooks.idl
-+++ oovbaapi/ooo/vba/excel/XWorkbooks.idl
-@@ -45,9 +45,8 @@ module ooo {  module vba {  module excel {
- 
- //=============================================================================
- 
--interface XWorkbooks 
-+interface XWorkbooks : com::sun::star::uno::XInterface
- {
--	interface ::ooo::vba::XCollection;
- 	any Add();
- 	any Open([in] string Filename, [in] any UpdateLinks, [in] any ReadOnly, [in] any Format, [in] any Password, [in] any WriteResPassword, [in] any IgnoreReadOnlyRecommended, [in] any Origin, [in] any Delimiter, [in] any Editable, [in] any Notify, [in] any Converter, [in] any AddToMru);
- 
-diff --git oovbaapi/ooo/vba/excel/makefile.mk oovbaapi/ooo/vba/excel/makefile.mk
-index 8ef4294..232f83c 100644
---- oovbaapi/ooo/vba/excel/makefile.mk
-+++ oovbaapi/ooo/vba/excel/makefile.mk
-@@ -102,6 +102,7 @@ IDLFILES= XGlobals.idl\
-  	XHPageBreaks.idl \
-  	XVPageBreak.idl \
-  	XVPageBreaks.idl \
-+ 	TextFrame.idl \
- 
- 
- # ------------------------------------------------------------------
-diff --git oovbaapi/ooo/vba/makefile.mk oovbaapi/ooo/vba/makefile.mk
-index 2dcc035..f246ce5 100644
---- oovbaapi/ooo/vba/makefile.mk
-+++ oovbaapi/ooo/vba/makefile.mk
-@@ -58,9 +58,14 @@ IDLFILES=\
- 	XApplicationBase.idl\
- 	XWindowBase.idl\
- 	XDocumentBase.idl\
-+	XDocumentsBase.idl\
- 	XGlobalsBase.idl\
- 	XDocumentProperty.idl\
- 	XDocumentProperties.idl\
-+	XFontBase.idl\
-+	XDialogsBase.idl\
-+	XDialogBase.idl\
-+    XPageSetupBase.idl  \
- 
- # ------------------------------------------------------------------
- 
-diff --git oovbaapi/ooo/vba/msforms/XControl.idl oovbaapi/ooo/vba/msforms/XControl.idl
-index 086b646..6e08891 100644
---- oovbaapi/ooo/vba/msforms/XControl.idl
-+++ oovbaapi/ooo/vba/msforms/XControl.idl
-@@ -61,6 +61,7 @@ interface XControl
-     [attribute] double  Left;
-     [attribute] double  Top;
- 	[attribute] string Name;
-+	[attribute] string ControlTipText;
- };
- 
- //=============================================================================
-diff --git oovbaapi/ooo/vba/msforms/XShape.idl oovbaapi/ooo/vba/msforms/XShape.idl
-index a1ac36d..90047e6 100644
---- oovbaapi/ooo/vba/msforms/XShape.idl
-+++ oovbaapi/ooo/vba/msforms/XShape.idl
-@@ -34,10 +34,6 @@
- #include <ooo/vba/XHelperInterface.idl>
- #endif
- 
--#ifndef __ooo_vba_excel_XTextFrame_idl__
--#include <ooo/vba/excel/XTextFrame.idl>
--#endif
--
- #ifndef __ooo_vba_msforms_XLineFormat_idl__
- #include <ooo/vba/msforms/XLineFormat.idl>
- #endif
-@@ -66,14 +62,13 @@ interface XShape : ooo::vba::XHelperInterface
-     [attribute, readonly] XLineFormat Line;
-     [attribute, readonly] XFillFormat Fill;
-     [attribute, readonly] XPictureFormat PictureFormat;
-+    [attribute] boolean LockAspectRatio;
-+    [attribute] boolean LockAnchor;
-+    [attribute] long RelativeHorizontalPosition;
-+    [attribute] long RelativeVerticalPosition;
- 
--    /*
--    using in word
--    [attribute] RelativeHorizontalPosition
--    [attribute] RelativeVerticalPosition
--    [attribute] XWrapFormat WrapFormat;
--    */
--    ooo::vba::excel::XTextFrame TextFrame();
-+    any TextFrame();
-+    any WrapFormat();
-     void Delete();
-     void ZOrder( [in] long ZOrderCmd );
-     void IncrementRotation( [in] double Increment );
-diff --git oovbaapi/ooo/vba/msforms/XShapeRange.idl oovbaapi/ooo/vba/msforms/XShapeRange.idl
-index 1b39485..0ae1883 100644
---- oovbaapi/ooo/vba/msforms/XShapeRange.idl
-+++ oovbaapi/ooo/vba/msforms/XShapeRange.idl
-@@ -44,9 +44,25 @@
- 
- module ooo {  module vba { module msforms {
- 
-+interface XLineFormat;
-+interface XFillFormat;
- interface XShapeRange 
- {
-     interface ooo::vba::XCollection;
-+
-+    [attribute] double Height;
-+    [attribute] double Width;
-+    [attribute] double Left;
-+    [attribute] double Top;
-+    [attribute, readonly] XLineFormat Line;
-+    [attribute, readonly] XFillFormat Fill;
-+    [attribute] boolean LockAspectRatio;
-+    [attribute] boolean LockAnchor;
-+    [attribute] long RelativeHorizontalPosition;
-+    [attribute] long RelativeVerticalPosition;
-+
-+    any TextFrame();
-+    any WrapFormat();
-     void Select();
-     XShape Group();
-     void IncrementRotation( [in] double Increment );
-diff --git oovbaapi/ooo/vba/msforms/XShapes.idl oovbaapi/ooo/vba/msforms/XShapes.idl
-index 3ba31ab..7d7e26d 100644
---- oovbaapi/ooo/vba/msforms/XShapes.idl
-+++ oovbaapi/ooo/vba/msforms/XShapes.idl
-@@ -51,6 +51,7 @@ interface XShapes
-     */
-     any AddLine( [in] long StartX, [in] long StartY, [in] long endX, [in] long endY );
-     any AddShape([in] long ShapeType, [in] long StartX, [in] long StartY, [in] long endX, [in] long endY );
-+    any AddTextbox([in] long Orientation, [in] long Left, [in] long Top, [in] long Width, [in] long Height );
- };
- }; }; };
- 
-diff --git oovbaapi/ooo/vba/msforms/XTextFrame.idl oovbaapi/ooo/vba/msforms/XTextFrame.idl
-new file mode 100644
-index 0000000..b702ecf
---- /dev/null
-+++ oovbaapi/ooo/vba/msforms/XTextFrame.idl
-@@ -0,0 +1,50 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XTextFrame.idl,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_msforms_XTextFrame_idl__
-+#define __ooo_vba_msforms_XTextFrame_idl__
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module msforms {
-+interface XTextFrame : ooo::vba::XHelperInterface
-+{
-+    [attribute] boolean AutoSize;
-+    [attribute] float MarginBottom;
-+    [attribute] float MarginTop;
-+    [attribute] float MarginLeft;
-+    [attribute] float MarginRight;
-+    any Characters();
-+    /*I don't find it in msdn
-+    Range TextRange();*/
-+};
-+}; }; };
-+#endif
-diff --git oovbaapi/ooo/vba/msforms/makefile.mk oovbaapi/ooo/vba/msforms/makefile.mk
-index cd2aa3b..6610d33 100644
---- oovbaapi/ooo/vba/msforms/makefile.mk
-+++ oovbaapi/ooo/vba/msforms/makefile.mk
-@@ -66,6 +66,7 @@ IDLFILES=\
- 	XSpinButton.idl \
- 	XImage.idl \
- 	XControls.idl \
-+	XTextFrame.idl \
- 
- # ------------------------------------------------------------------
- 
-diff --git oovbaapi/ooo/vba/word/XAddin.idl oovbaapi/ooo/vba/word/XAddin.idl
-new file mode 100644
-index 0000000..9854e27
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XAddin.idl
-@@ -0,0 +1,61 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XAddin_idl__
-+#define __ooo_vba_word_XAddin_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+#ifndef __com_sun_star_container_XNamed_idl__
-+#include <com/sun/star/container/XNamed.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XAddin
-+{
-+    interface ooo::vba::XHelperInterface;
-+	interface ::com::sun::star::container::XNamed;
-+
-+    [attribute, readonly] string Path;
-+    [attribute, readonly] boolean Autoload;
-+    [attribute] boolean Installed;
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XAddins.idl oovbaapi/ooo/vba/word/XAddins.idl
-new file mode 100644
-index 0000000..d4b4d1a
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XAddins.idl
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XAddins_idl__
-+#define __ooo_vba_word_XAddins_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+
-+interface XAddins 
-+{
-+	interface ::ooo::vba::XCollection;
-+};
-+
-+}; }; };
-+
-+#endif
-diff --git oovbaapi/ooo/vba/word/XApplication.idl oovbaapi/ooo/vba/word/XApplication.idl
-index ae1835b..b3623e4 100644
---- oovbaapi/ooo/vba/word/XApplication.idl
-+++ oovbaapi/ooo/vba/word/XApplication.idl
-@@ -53,7 +53,14 @@ interface XApplication : com::sun::star::uno::XInterface
- 	[attribute, readonly] ooo::vba::word::XSystem System;
- 	[attribute, readonly] ooo::vba::word::XOptions Options;
- 	[attribute, readonly] ooo::vba::word::XSelection Selection;
-+	[attribute] boolean DisplayAutoCompleteTips;
-+	[attribute] long EnableCancelKey;
-+
-     any CommandBars( [in] any aIndex );
-+    any Documents( [in] any aIndex );
-+    any Addins( [in] any aIndex );
-+    any Dialogs( [in] any aIndex );
-+    float CentimetersToPoints([in] float Centimeters );
- };
- 
- }; }; };
-diff --git oovbaapi/ooo/vba/word/XAutoTextEntries.idl oovbaapi/ooo/vba/word/XAutoTextEntries.idl
-new file mode 100644
-index 0000000..b4bc1e5
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XAutoTextEntries.idl
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XAutoTextEntries_idl__
-+#define __ooo_vba_word_XAutoTextEntries_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+
-+interface XAutoTextEntries 
-+{
-+	interface ::ooo::vba::XCollection;
-+};
-+
-+}; }; };
-+
-+#endif
-diff --git oovbaapi/ooo/vba/word/XAutoTextEntry.idl oovbaapi/ooo/vba/word/XAutoTextEntry.idl
-new file mode 100644
-index 0000000..37ce701
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XAutoTextEntry.idl
-@@ -0,0 +1,59 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XAutoTextEntry_idl__
-+#define __ooo_vba_word_XAutoTextEntry_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+#ifndef __com_sun_star_container_XNamed_idl__
-+#include <com/sun/star/container/XNamed.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XRange;
-+interface XAutoTextEntry
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    XRange Insert([in] XRange Where, [in] /*Optional*/ any RichText);
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XBorder.idl oovbaapi/ooo/vba/word/XBorder.idl
-new file mode 100644
-index 0000000..8944bdd
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XBorder.idl
-@@ -0,0 +1,59 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XBorder.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XBorder_idl__
-+#define __ooo_vba_word_XBorder_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+
-+//=============================================================================
-+interface XBorder
-+{
-+	interface ::ooo::vba::XHelperInterface;
-+
-+	[attribute] any LineStyle;
-+};
-+
-+//=============================================================================
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XBorders.idl oovbaapi/ooo/vba/word/XBorders.idl
-new file mode 100644
-index 0000000..5956fc3
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XBorders.idl
-@@ -0,0 +1,59 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XBorders.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XBorders_idl__
-+#define __ooo_vba_word_XBorders_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+#ifndef  __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+interface XBorders
-+{
-+	interface ooo::vba::XCollection;
-+
-+    [attribute] boolean Shadow;
-+};
-+
-+//=============================================================================
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XDialog.idl oovbaapi/ooo/vba/word/XDialog.idl
-new file mode 100644
-index 0000000..9c31fa7
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XDialog.idl
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XDialog.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XDialog_idl__
-+#define __ooo_vba_word_XDialog_idl__
-+                                                                                                                             
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+
-+//=============================================================================
-+                                                                                                                             
-+module ooo {  module vba {  module word {
-+                                                                                                                             
-+//=============================================================================
-+
-+interface XDialog : com::sun::star::uno::XInterface
-+{
-+};
-+                                                                                                                             
-+}; }; };
-+                                                                                                                             
-+#endif
-+
-diff --git oovbaapi/ooo/vba/word/XDialogs.idl oovbaapi/ooo/vba/word/XDialogs.idl
-new file mode 100644
-index 0000000..b68848d
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XDialogs.idl
-@@ -0,0 +1,54 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XDialogs.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XDialogs_idl__
-+#define __ooo_vba_word_XDialogs_idl__
-+                                                                                                                             
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+//=============================================================================
-+                                                                                                                             
-+module ooo {  module vba {  module word {
-+                                                                                                                             
-+interface XDialogs : com::sun::star::uno::XInterface
-+{
-+
-+	any Item( [in] any Index );
-+};
-+                                                                                                                             
-+}; }; };
-+                                                                                                                             
-+#endif
-+
-diff --git oovbaapi/ooo/vba/word/XDocument.idl oovbaapi/ooo/vba/word/XDocument.idl
-index 2502846..a7ceb18 100644
---- oovbaapi/ooo/vba/word/XDocument.idl
-+++ oovbaapi/ooo/vba/word/XDocument.idl
-@@ -42,9 +42,13 @@
- #include <ooo/vba/word/XRange.idl>
- #endif
- 
-+#ifndef __com_sun_star_script_XInvocation_idl__
-+#include <com/sun/star/script/XInvocation.idl>
-+#endif
-+
- module ooo {  module vba {  module word { 
- 
--interface XDocument : com::sun::star::uno::XInterface
-+interface XDocument : com::sun::star::script::XInvocation
- {
-     [attribute, readonly] XRange Content;
-     [attribute] any AttachedTemplate;
-@@ -54,6 +58,14 @@ interface XDocument : com::sun::star::uno::XInterface
-     any CustomDocumentProperties( [in] any index );
-     any Bookmarks( [in] any aIndex );
-     any Variables( [in] any aIndex );
-+    any Paragraphs( [in] any aIndex );
-+    any Styles( [in] any aIndex );
-+    any Tables( [in] any aIndex );
-+    any Fields( [in] any aIndex );
-+    any Shapes([in] any Index);
-+    any Sections([in] any Index);
-+	void Activate();
-+    any PageSetup();
- };
- 
- }; }; };
-diff --git oovbaapi/ooo/vba/word/XDocuments.idl oovbaapi/ooo/vba/word/XDocuments.idl
-new file mode 100644
-index 0000000..c45b9ae
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XDocuments.idl
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XDocuments_idl__
-+#define __ooo_vba_word_XDocuments_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+
-+interface XDocuments : com::sun::star::uno::XInterface
-+{
-+	any Add([in] any Template, [in] any NewTemplate, [in] any DocumentType, [in] any Visible);
-+	any Open([in] string Filename, [in] any ConfirmConversions, [in] any ReadOnly, [in] any AddToRecentFiles, [in] any PasswordDocument, [in] any PasswordTemplate, [in] any Revert, [in] any WritePasswordDocument, [in] any WritePasswordTemplate, [in] any Format, [in] any Encoding, [in] any Visible, [in] any OpenAndRepair, [in] any DocumentDirection, [in] any NoEncodingDialog, [in] any XMLTransform);
-+
-+	void Close([in] any SaveChanges,[in] any OriginalFormat,[in] any RouteDocument);
-+};
-+
-+}; }; };
-+
-+#endif
-diff --git oovbaapi/ooo/vba/word/XField.idl oovbaapi/ooo/vba/word/XField.idl
-new file mode 100644
-index 0000000..19d3d3b
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XField.idl
-@@ -0,0 +1,52 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: XField.idl,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: jsc $ $Date: 2007/02/09 08:35:01 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef __ooo_vba_word_XField_idl__
-+#define __ooo_vba_word_XField_idl__
-+
-+#ifndef  __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+module ooo { module vba { module word {
-+
-+interface XField 
-+{
-+    interface ::ooo::vba::XHelperInterface;
-+};
-+
-+}; }; };
-+
-+#endif
-+
-diff --git oovbaapi/ooo/vba/word/XFields.idl oovbaapi/ooo/vba/word/XFields.idl
-new file mode 100644
-index 0000000..78266ac
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XFields.idl
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: XFields.idl,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: jsc $ $Date: 2007/02/09 08:45:13 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef __ooo_vba_word__XFields_idl__
-+#define __ooo_vba_word__XFields_idl__
-+
-+#ifndef  __ooo_vba_HelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+module ooo { module vba { module word {
-+
-+interface XRange;
-+interface XField;
-+interface XFields
-+{
-+    interface ooo::vba::XCollection;
-+
-+    XField Add([in] XRange Range, [in] any Type, [in] any Text,[in] any PreserveFormatting);
-+    long Update();
-+};
-+
-+}; }; };
-+
-+#endif
-+
-diff --git oovbaapi/ooo/vba/word/XFind.idl oovbaapi/ooo/vba/word/XFind.idl
-new file mode 100644
-index 0000000..e42ac6f
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XFind.idl
-@@ -0,0 +1,87 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XFind_idl__
-+#define __ooo_vba_word_XFind_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XFind
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute] string Text;
-+    [attribute] any Replacement;
-+    [attribute] boolean Forward;
-+    [attribute] long Wrap;
-+    [attribute] boolean Format;
-+    [attribute] boolean MatchCase;
-+    [attribute] boolean MatchWholeWord;
-+    [attribute] boolean MatchWildcards;
-+    [attribute] boolean MatchSoundsLike;
-+    [attribute] boolean MatchAllWordForms;
-+    [attribute] any Style;
-+
-+    boolean Execute([in] /* string */ any FindText,
-+        [in] /* boolean */ any MatchCase,
-+        [in] /* boolean */ any MatchWholeWord,
-+        [in] /* boolean */ any MatchWildcards,
-+        [in] /* boolean */ any MatchSoundsLike,
-+        [in] /* boolean */ any MatchAllWordForms,
-+        [in] /* boolean */ any Forward,
-+        [in] /* long */ any Wrap,
-+        [in] /* boolean */ any Format,
-+        [in] /* string */ any ReplaceWith,
-+        [in] /* boolean */ any Replace,
-+        [in] /* boolean */ any MatchKashida,
-+        [in] /* boolean */ any MatchDiacritics,
-+        [in] /* boolean */ any MatchAlefHamza,
-+        [in] /* boolean */ any MatchControl,
-+        [in] /* boolean */ any MatchPrefix,
-+        [in] /* boolean */ any MatchSuffix,
-+        [in] /* boolean */ any MatchPhrase,
-+        [in] /* boolean */ any IgnoreSpace,
-+        [in] /* boolean */ any IgnorePunct );
-+    void ClearFormatting();
-+
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XFont.idl oovbaapi/ooo/vba/word/XFont.idl
-new file mode 100644
-index 0000000..53fc1bb
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XFont.idl
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XFont.idl,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XFont_idl__
-+#define __ooo_vba_word_XFont_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-+#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XFont : com::sun::star::uno::XInterface
-+{
-+};
-+
-+//=============================================================================
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XGlobals.idl oovbaapi/ooo/vba/word/XGlobals.idl
-index 3305e93..519499c 100644
---- oovbaapi/ooo/vba/word/XGlobals.idl
-+++ oovbaapi/ooo/vba/word/XGlobals.idl
-@@ -49,6 +49,10 @@ interface XGlobals : com::sun::star::uno::XInterface
- 	[attribute, readonly] ooo::vba::word::XOptions Options;
- 	[attribute, readonly] ooo::vba::word::XSelection Selection;
-     any CommandBars( [in] any aIndex );
-+    any Documents( [in] any aIndex );
-+    any Addins( [in] any aIndex );
-+    any Dialogs( [in] any aIndex );
-+    float CentimetersToPoints([in] float Centimeters );
- };
- 
- }; }; };
-diff --git oovbaapi/ooo/vba/word/XHeaderFooter.idl oovbaapi/ooo/vba/word/XHeaderFooter.idl
-new file mode 100644
-index 0000000..7dd1a39
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XHeaderFooter.idl
-@@ -0,0 +1,59 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XHeaderFooter_idl__
-+#define __ooo_vba_word_XHeaderFooter_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XRange;
-+interface XHeaderFooter
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute, readonly] boolean IsHeader;
-+    [attribute] boolean LinkToPrevious;
-+    [attribute, readonly] XRange Range;
-+    //[attribute, readonly] XShapers Shapes ;
-+    any Shapes([in] any Index);
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XOptions.idl oovbaapi/ooo/vba/word/XOptions.idl
-index 75b1064..13bb65e 100644
---- oovbaapi/ooo/vba/word/XOptions.idl
-+++ oovbaapi/ooo/vba/word/XOptions.idl
-@@ -44,6 +44,20 @@ interface XOptions
- {
-     interface ooo::vba::XHelperInterface;
- 
-+    [attribute] long DefaultBorderLineStyle;
-+    [attribute] long DefaultBorderLineWidth;
-+    [attribute] long DefaultBorderColorIndex;
-+    [attribute] boolean ReplaceSelection;
-+    [attribute] boolean MapPaperSize;
-+    [attribute] boolean AutoFormatAsYouTypeApplyHeadings;
-+    [attribute] boolean AutoFormatAsYouTypeApplyBulletedLists;
-+    [attribute] boolean AutoFormatAsYouTypeApplyNumberedLists;
-+    [attribute] boolean AutoFormatAsYouTypeFormatListItemBeginning;
-+    [attribute] boolean AutoFormatAsYouTypeDefineStyles;
-+    [attribute] boolean AutoFormatApplyHeadings;
-+    [attribute] boolean AutoFormatApplyLists;
-+    [attribute] boolean AutoFormatApplyBulletedLists;
-+
-     any DefaultFilePath( [in] long Path );
- };
- 
-diff --git oovbaapi/ooo/vba/word/XPageSetup.idl oovbaapi/ooo/vba/word/XPageSetup.idl
-new file mode 100644
-index 0000000..ca8e944
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XPageSetup.idl
-@@ -0,0 +1,63 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XPageSetup_idl__
-+#define __ooo_vba_word_XPageSetup_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+
-+
-+interface XPageSetup : com::sun::star::uno::XInterface
-+{
-+    [attribute] double Gutter;
-+    [attribute] double HeaderDistance;
-+    [attribute] double FooterDistance;
-+    [attribute] boolean DifferentFirstPageHeaderFooter;
-+    [attribute] long SectionStart;
-+};
-+
-+//=============================================================================
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XParagraph.idl oovbaapi/ooo/vba/word/XParagraph.idl
-new file mode 100644
-index 0000000..79ad7ae
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XParagraph.idl
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XParagraph_idl__
-+#define __ooo_vba_word_XParagraph_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XRange;
-+interface XParagraph
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute, readonly] XRange Range;
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XParagraphFormat.idl oovbaapi/ooo/vba/word/XParagraphFormat.idl
-new file mode 100644
-index 0000000..df6d584
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XParagraphFormat.idl
-@@ -0,0 +1,70 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XParagraphFormat_idl__
-+#define __ooo_vba_word_XParagraphFormat_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XParagraphFormat
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute] long Alignment;
-+    [attribute] float FirstLineIndent;
-+    [attribute] any KeepTogether;
-+    [attribute] any KeepWithNext;
-+    [attribute] any Hyphenation;
-+    [attribute] float LineSpacing;
-+    [attribute] long LineSpacingRule;
-+    [attribute] any NoLineNumber;
-+    [attribute] long OutlineLevel;
-+    [attribute] any PageBreakBefore;
-+    [attribute] float SpaceBefore;
-+    [attribute] float SpaceAfter;
-+    [attribute] float LeftIndent;
-+    [attribute] float RightIndent;
-+    [attribute] any TabStops;
-+    [attribute] any WidowControl;
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XParagraphs.idl oovbaapi/ooo/vba/word/XParagraphs.idl
-new file mode 100644
-index 0000000..d392528
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XParagraphs.idl
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XParagraphs_idl__
-+#define __ooo_vba_word_XParagraphs_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+
-+interface XParagraphs 
-+{
-+	interface ::ooo::vba::XCollection;
-+};
-+
-+}; }; };
-+
-+#endif
-diff --git oovbaapi/ooo/vba/word/XRange.idl oovbaapi/ooo/vba/word/XRange.idl
-index 4ce9b79..47e688e 100644
---- oovbaapi/ooo/vba/word/XRange.idl
-+++ oovbaapi/ooo/vba/word/XRange.idl
-@@ -34,6 +34,10 @@
- #include <com/sun/star/uno/XInterface.idl>
- #endif
- 
-+#ifndef __com_sun_star_text_XTextRange_idl__
-+#include <com/sun/star/text/XTextRange.idl>
-+#endif
-+
- #ifndef __ooo_vba_XHelperInterface_idl__
- #include <ooo/vba/XHelperInterface.idl>
- #endif
-@@ -41,13 +45,30 @@
- 
- module ooo {  module vba {  module word { 
- 
-+interface XParagraphFormat;
-+interface XStyle;
-+interface XFont;
- interface XRange
- {
-     interface ooo::vba::XHelperInterface;
- 
-     [attribute] string Text;
-+    [attribute] XParagraphFormat ParagraphFormat;
-+    [attribute] XStyle Style;
-+    [attribute,readonly] ::com::sun::star::text::XTextRange XTextRange;
-+    // Of course Font is NOT readonly, #FIXME #TODO
-+    // readonly though will force an error attempting to write
-+    [attribute, readonly] XFont Font;
-+    [attribute] long LanguageID;
-+    [attribute] long Start;
-+    [attribute] long End;
- 
-     void InsertBreak( [in] any Type );
-+    void Select();
-+    void InsertParagraph();
-+    void InsertParagraphBefore();
-+    void InsertParagraphAfter();
-+    any PageSetup();
- };
- 
- }; }; };
-diff --git oovbaapi/ooo/vba/word/XReplacement.idl oovbaapi/ooo/vba/word/XReplacement.idl
-new file mode 100644
-index 0000000..daae501
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XReplacement.idl
-@@ -0,0 +1,54 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XReplacement_idl__
-+#define __ooo_vba_word_XReplacement_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XReplacement
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute] string Text;
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XSection.idl oovbaapi/ooo/vba/word/XSection.idl
-new file mode 100644
-index 0000000..c79a24b
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XSection.idl
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XSection_idl__
-+#define __ooo_vba_word_XSection_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XSection
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute] boolean ProtectedForForms;
-+
-+    any Headers();
-+    any Footers();
-+    any PageSetup();
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XSections.idl oovbaapi/ooo/vba/word/XSections.idl
-new file mode 100644
-index 0000000..a941285
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XSections.idl
-@@ -0,0 +1,57 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XSections_idl__
-+#define __ooo_vba_word_XSections_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+
-+interface XSections 
-+{
-+	interface ::ooo::vba::XCollection;
-+    
-+    any PageSetup();
-+};
-+
-+}; }; };
-+
-+#endif
-diff --git oovbaapi/ooo/vba/word/XSelection.idl oovbaapi/ooo/vba/word/XSelection.idl
-index 2142fb4..44026da 100644
---- oovbaapi/ooo/vba/word/XSelection.idl
-+++ oovbaapi/ooo/vba/word/XSelection.idl
-@@ -41,11 +41,45 @@
- 
- module ooo {  module vba {  module word { 
- 
-+interface XRange;
-+interface XParagraphFormat;
-+interface XFind;
-+interface XFont;
-+interface XStyle;
-+interface XHeaderFooter;
- interface XSelection
- {
-     interface ooo::vba::XHelperInterface;
- 
-     [attribute] string Text;
-+    [attribute, readonly] XRange Range;
-+    [attribute] XParagraphFormat ParagraphFormat;
-+    [attribute, readonly] XFind Find;
-+    [attribute] XStyle Style;
-+    [attribute, readonly] XFont Font;
-+    [attribute, readonly] XHeaderFooter HeaderFooter;
-+    [attribute] long LanguageID;
-+    [attribute] long Start;
-+    [attribute] long End;
-+
-+    any Tables( [in] any aIndex );
-+    any Fields( [in] any aIndex );
-+    void TypeText( [in] string Text );
-+    void HomeKey( [in] any Unit, [in] any Extend );
-+    void EndKey( [in] any Unit, [in] any Extend );
-+    void Delete( [in] any Unit, [in] any Count );
-+    void MoveRight( [in] any Unit, [in] any Count, [in] any Extend );
-+    void MoveLeft( [in] any Unit, [in] any Count, [in] any Extend );
-+    void MoveDown( [in] any Unit, [in] any Count, [in] any Extend );
-+    void TypeParagraph();
-+    void InsertParagraph();
-+    void InsertParagraphBefore();
-+    void InsertParagraphAfter();
-+    void TypeBackspace();
-+    XRange GoTo( [in] any What, [in] any Which, [in] any Count, [in] any Name );
-+    any Information( [in] long Type );
-+    void InsertBreak( [in] any Type );
-+    any ShapeRange();
- };
- 
- }; }; };
-diff --git oovbaapi/ooo/vba/word/XStyle.idl oovbaapi/ooo/vba/word/XStyle.idl
-new file mode 100644
-index 0000000..af19517
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XStyle.idl
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XStyle_idl__
-+#define __ooo_vba_word_XStyle_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word { 
-+
-+interface XFont;
-+interface XStyle
-+{
-+    interface ooo::vba::XHelperInterface;
-+
-+    [attribute] string Name;
-+    [attribute] long LanguageID;
-+    [attribute, readonly] long Type;
-+    [attribute, readonly] XFont Font;
-+};
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/word/XStyles.idl oovbaapi/ooo/vba/word/XStyles.idl
-new file mode 100644
-index 0000000..dd6f2b4
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XStyles.idl
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XStyles_idl__
-+#define __ooo_vba_word_XStyles_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module word { 
-+
-+//=============================================================================
-+
-+interface XStyles 
-+{
-+	interface ::ooo::vba::XCollection;
-+};
-+
-+}; }; };
-+
-+#endif
-diff --git oovbaapi/ooo/vba/word/XTable.idl oovbaapi/ooo/vba/word/XTable.idl
-new file mode 100644
-index 0000000..f677da6
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XTable.idl
-@@ -0,0 +1,86 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: XTable.idl,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: jsc $ $Date: 2007/02/09 08:35:01 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef __ooo_vba_word_XTable_idl__
-+#define __ooo_vba_word_XTable_idl__
-+
-+#ifndef  __com_sun_star_script_BasicErrorException_idl__
-+#include <com/sun/star/script/BasicErrorException.idl>
-+#endif
-+
-+#ifndef  __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+module ooo { module vba { module word {
-+
-+interface XRange;
-+
-+interface XTable 
-+{
-+    interface ::ooo::vba::XHelperInterface;
-+    [attribute, readonly ] string Name; // for debug only
-+
-+    XRange Range() raises (com::sun::star::script::BasicErrorException);
-+
-+    /**
-+     select the table
-+     */
-+    void Select()
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    /**
-+     delete the table
-+     */
-+    void Delete()
-+        raises (com::sun::star::script::BasicErrorException);
-+
-+    /**
-+     convert the table to text
-+     @param Separator the separator used for the text where cell separation was
-+     @return XRange a range containing the text
-+     @throw BasicErrorException when the conversion cannot be done
-+     */
-+/*
-+    XRange ConvertToText([in] any Separator, [in] any NestedTables)
-+        raises(com::sun::star::script::BasicErrorException);
-+*/
-+    any Borders( [in] any aIndex );
-+
-+};
-+
-+}; }; };
-+
-+#endif
-+
-diff --git oovbaapi/ooo/vba/word/XTables.idl oovbaapi/ooo/vba/word/XTables.idl
-new file mode 100644
-index 0000000..f09f27f
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XTables.idl
-@@ -0,0 +1,79 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: XTables.idl,v $
-+ *
-+ *  $Revision: 1.1 $
-+ *
-+ *  last change: $Author: jsc $ $Date: 2007/02/09 08:45:13 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef __ooo_vba_word__XTables_idl__
-+#define __ooo_vba_word__XTables_idl__
-+
-+#ifndef  __ooo_vba_HelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+#ifndef __ooo_vba_word_XTable_idl__
-+#include <ooo/vba/word/XTable.idl>
-+#endif
-+
-+#ifndef __com_sun_star_script_BasicErrorException_idl__
-+#include <com/sun/star/script/BasicErrorException.idl>
-+#endif
-+
-+module ooo { module vba { module word {
-+
-+interface XRange;
-+
-+interface XTables
-+{
-+    interface ooo::vba::XCollection;
-+    /** Creates a new Table, optionally with a name.
-+     <p>Creates a new table at the current cursor position. </p>
-+     @param range
-+     @returns
-+     reference to the new table.
-+     */
-+    XTable Add([in] XRange Range, [in] any NumRows, [in] any NumColumns,
-+    /*optional*/ [in] any DefaultTableBehavior,
-+    /*optional*/ [in] any AutoFitBehavior)
-+        raises(com::sun::star::script::BasicErrorException);
-+
-+
-+};
-+
-+}; }; };
-+
-+#endif
-+
-diff --git oovbaapi/ooo/vba/word/XTemplate.idl oovbaapi/ooo/vba/word/XTemplate.idl
-index 1913118..a2bd1d7 100644
---- oovbaapi/ooo/vba/word/XTemplate.idl
-+++ oovbaapi/ooo/vba/word/XTemplate.idl
-@@ -45,6 +45,8 @@ interface XTemplate
-     interface ooo::vba::XHelperInterface;
- 
-     [attribute, readonly] string Name;
-+
-+    any AutoTextEntries( [in] any aIndex );
- };
- 
- }; }; };
-diff --git oovbaapi/ooo/vba/word/XWrapFormat.idl oovbaapi/ooo/vba/word/XWrapFormat.idl
-new file mode 100644
-index 0000000..386feb3
---- /dev/null
-+++ oovbaapi/ooo/vba/word/XWrapFormat.idl
-@@ -0,0 +1,48 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XWrapFormat.idl,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_word_XWrapFormat_idl__
-+#define __ooo_vba_word_XWrapFormat_idl__
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+module ooo {  module vba {  module word {
-+interface XWrapFormat : ooo::vba::XHelperInterface
-+{
-+    [attribute] long Type;
-+    [attribute] long Side;
-+    [attribute] float DistanceTop;
-+    [attribute] float DistanceBottom;
-+    [attribute] float DistanceLeft;
-+    [attribute] float DistanceRight;
-+};
-+}; }; };
-+#endif
-diff --git oovbaapi/ooo/vba/word/makefile.mk oovbaapi/ooo/vba/word/makefile.mk
-index c638476..8126587 100644
---- oovbaapi/ooo/vba/word/makefile.mk
-+++ oovbaapi/ooo/vba/word/makefile.mk
-@@ -56,7 +56,33 @@ IDLFILES= XGlobals.idl\
- 	XPanes.idl \
- 	XOptions.idl \
- 	XSelection.idl \
--	XTemplate.idl \
-+ 	XTemplate.idl \
-+	XParagraphFormat.idl \
-+	XAutoTextEntries.idl \
-+	XAutoTextEntry.idl \
-+	XParagraphs.idl \
-+	XParagraph.idl \
-+	XFind.idl \
-+	XReplacement.idl \
-+	XStyle.idl \
-+	XStyles.idl \
-+    XFont.idl \
-+    XTable.idl \
-+    XTables.idl \
-+    XField.idl \
-+    XFields.idl \
-+    XBorder.idl \
-+    XBorders.idl \
-+    XDocuments.idl \
-+    XHeaderFooter.idl \
-+    XAddins.idl \
-+    XAddin.idl \
-+    XDialogs.idl \
-+    XDialog.idl \
-+	XWrapFormat.idl \
-+	XPageSetup.idl \
-+	XSection.idl \
-+	XSections.idl \
- 
- # ------------------------------------------------------------------
- 
-diff --git sc/source/ui/vba/excelvbahelper.cxx sc/source/ui/vba/excelvbahelper.cxx
-index ba1bdc8..795ec5a 100644
---- sc/source/ui/vba/excelvbahelper.cxx
-+++ sc/source/ui/vba/excelvbahelper.cxx
-@@ -170,7 +170,7 @@ void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_B
- }
- 
- ScDocShell* 
--getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) 
-+getDocShell( const css::uno::Reference< css::frame::XModel>& xModel ) 
- {
- 	uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
- 	ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
-@@ -182,7 +182,7 @@ getDocShell( css::uno::Reference< css::frame::XModel>& xModel )
- }
- 
- ScTabViewShell* 
--getBestViewShell(  css::uno::Reference< css::frame::XModel>& xModel )
-+getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel )
- {
- 	ScDocShell* pDocShell = getDocShell( xModel );
- 	if ( pDocShell )
-diff --git sc/source/ui/vba/excelvbahelper.hxx sc/source/ui/vba/excelvbahelper.hxx
-index 7c156df..3a3b7f8 100644
---- sc/source/ui/vba/excelvbahelper.hxx
-+++ sc/source/ui/vba/excelvbahelper.hxx
-@@ -45,8 +45,8 @@ namespace ooo
- 		void implnPaste();
- 		void implnCut();
- 		void implnPasteSpecial(sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
--		ScTabViewShell* getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
--		ScDocShell* getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
-+		ScTabViewShell* getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
-+		ScDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
- 		ScTabViewShell* getCurrentBestViewShell();
- 		SfxViewFrame* getCurrentViewFrame();
-             class ScVbaCellRangeAccess
-diff --git sc/source/ui/vba/makefile.mk sc/source/ui/vba/makefile.mk
-index 1f861e6..9350a3b 100644
---- sc/source/ui/vba/makefile.mk
-+++ sc/source/ui/vba/makefile.mk
-@@ -86,13 +86,6 @@ SLOFILES= \
-                 $(SLO)$/vbaoleobjects.obj \
-                 $(SLO)$/vbatextboxshape.obj \
-                 $(SLO)$/vbapane.obj \
--                $(SLO)$/vbashape.obj \
--                $(SLO)$/vbacolorformat.obj \
--                $(SLO)$/vbashapes.obj \
--                $(SLO)$/vbalineformat.obj \
--                $(SLO)$/vbafillformat.obj \
--                $(SLO)$/vbapictureformat.obj \
--                $(SLO)$/vbashaperange.obj \
-                 $(SLO)$/vbatextframe.obj \
-                 $(SLO)$/vbacharttitle.obj \
-                 $(SLO)$/vbacharts.obj \
-diff --git sc/source/ui/vba/service.cxx sc/source/ui/vba/service.cxx
-index 06629e7..37b6fb3 100644
---- sc/source/ui/vba/service.cxx
-+++ sc/source/ui/vba/service.cxx
-@@ -73,6 +73,10 @@ namespace vbaeventshelper
- {
- extern sdecl::ServiceDecl const serviceDecl;
- }
-+namespace textframe 
-+{
-+extern sdecl::ServiceDecl const serviceDecl;
-+}
- 
- extern "C"
- {
-@@ -113,7 +117,7 @@ extern "C"
- #else
- 	// Component registration
-         return component_writeInfoHelper( pServiceManager, pRegistryKey, 
--		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl );
-+		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl, textframe::serviceDecl );
- #endif
- 	
-     }
-@@ -126,7 +130,7 @@ extern "C"
- 	void* pRet =  component_getFactoryHelper(
-         	pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl );
-     if( !pRet )
--        pRet = component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl );
-+        pRet = component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl, textframe::serviceDecl );
- 	OSL_TRACE("Ret is 0x%x", pRet);
- 	return pRet;
-     }
-diff --git sc/source/ui/vba/vbaapplication.cxx sc/source/ui/vba/vbaapplication.cxx
-index c26a61d..9088dc9 100644
---- sc/source/ui/vba/vbaapplication.cxx
-+++ sc/source/ui/vba/vbaapplication.cxx
-@@ -57,7 +57,7 @@
- #include "tabvwsh.hxx"
- #include "gridwin.hxx"
- #include "vbanames.hxx"
--#include "vbashape.hxx"
-+#include <vbahelper/vbashape.hxx>
- #include "vbatextboxshape.hxx"
- #include "vbaassistant.hxx"
- #include "sc.hrc"
-@@ -88,6 +88,8 @@
- #include "unonames.hxx"
- #include "docsh.hxx"
- #include <vbahelper/helperdecl.hxx>
-+#include "excelvbahelper.hxx"
-+
- #include <basic/sbmeth.hxx>
- #include <basic/sbmod.hxx>
- #include <basic/sbstar.hxx>
-@@ -114,8 +116,6 @@ using ::rtl::OUString;
- #define FILE_PATH_SEPERATOR "\\"
- #endif 
- 
--#define EXCELVERSION "11.0"
--
- uno::Any sbxToUnoValue( SbxVariable* pVar );
- 
- class ActiveWorkbook : public ScVbaWorkbook
-@@ -137,7 +137,10 @@ ScVbaApplication::~ScVbaApplication()
- {
- }
- 	
--
-+SfxObjectShell* ScVbaApplication::GetDocShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
-+{
-+    return static_cast< SfxObjectShell* >( excel::getDocShell( xModel ) );
-+}
- 
- uno::Reference< excel::XWorkbook >
- ScVbaApplication::getActiveWorkbook() throw (uno::RuntimeException)
-@@ -307,12 +310,6 @@ ScVbaApplication::getCutCopyMode() throw (uno::RuntimeException)
- 	return result;
- }
- 
--::rtl::OUString
--ScVbaApplication::getVersion() throw (uno::RuntimeException)
--{
--	return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(EXCELVERSION));
--}
--
- void SAL_CALL 
- ScVbaApplication::setCutCopyMode( const uno::Any& /*_cutcopymode*/ ) throw (uno::RuntimeException)
- {
-diff --git sc/source/ui/vba/vbaapplication.hxx sc/source/ui/vba/vbaapplication.hxx
-index 9435282..67b6ba9 100644
---- sc/source/ui/vba/vbaapplication.hxx
-+++ sc/source/ui/vba/vbaapplication.hxx
-@@ -51,6 +51,8 @@ public:
- 	ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext );
- 	virtual ~ScVbaApplication();
- 
-+    virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-+
- 	// XApplication
- 	virtual ::rtl::OUString SAL_CALL PathSeparator(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- 	virtual void SAL_CALL setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-@@ -80,7 +82,6 @@ public:
- 	virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException);
- 	virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException);
--	virtual ::rtl::OUString SAL_CALL getVersion() throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL getStatusBar() throw (css::uno::RuntimeException);
- 	virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException);
- 	virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException);
-diff --git sc/source/ui/vba/vbacolorformat.cxx sc/source/ui/vba/vbacolorformat.cxx
-deleted file mode 100644
-index d2ce12b..0000000
---- sc/source/ui/vba/vbacolorformat.cxx
-+++ /dev/null
-@@ -1,190 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbacolorformat.cxx,v $
-- * $Revision: 1.3.146.1 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include <com/sun/star/beans/XPropertySet.hpp>
--#include <ooo/vba/msforms/XLineFormat.hpp>
--#include "vbacolorformat.hxx"
--
--using namespace ooo::vba;
--using namespace com::sun::star;
--
--sal_Int32
--MsoColorIndizes::getColorIndex( sal_Int32 nIndex )
--{
--    const static sal_Int32 COLORINDIZES[56] =
--    {   HAPICOLOR_BLACK, HAPICOLOR_WITHE, HAPICOLOR_RED, HAPICOLOR_BRIGHTGREEN, HAPICOLOR_BLUE, HAPICOLOR_YELLOW, HAPICOLOR_PINK,
--        HAPICOLOR_TURQUOISE, HAPICOLOR_DARKRED, HAPICOLOR_GREEN, HAPICOLOR_DARKBLUE, HAPICOLOR_DARKYELLOW, HAPICOLOR_VIOLET,
--        HAPICOLOR_TEAL, HAPICOLOR_GRAY_25_PERCENT, HAPICOLOR_GRAY_50_PERCENT, HAPICOLOR_PERIWINCKLE, HAPICOLOR_PLUM,
--        HAPICOLOR_IVORY, HAPICOLOR_LIGHTTURQUOISE, HAPICOLOR_DARKPRUPLE, HAPICOLOR_CORAL, HAPICOLOR_OCEANBLUE, HAPICOLOR_ICEBLUE,
--        HAPICOLOR_GREEN, HAPICOLOR_PINK, HAPICOLOR_YELLOW, HAPICOLOR_TURQUOISE, HAPICOLOR_VIOLET, HAPICOLOR_DARKRED, HAPICOLOR_TEAL,
--        HAPICOLOR_BLUE, HAPICOLOR_SKYBLUE, HAPICOLOR_LIGHTTURQUOISE, HAPICOLOR_LIGHTGREEN, HAPICOLOR_LIGHTYELLOW, HAPICOLOR_PALEBLUE,
--        HAPICOLOR_ROSE, HAPICOLOR_LAVENDER, HAPICOLOR_TAN, HAPICOLOR_LIGHTBLUE, HAPICOLOR_AQUA, HAPICOLOR_LIME, HAPICOLOR_GOLD,
--        HAPICOLOR_LIGHTORANGE, HAPICOLOR_ORANGE, HAPICOLOR_BLUEGRAY, HAPICOLOR_GRAY_40_PERCENT, HAPICOLOR_DARKTEAL,
--        HAPICOLOR_SEAGREEN, HAPICOLOR_NONAME, HAPICOLOR_OLIVEGREEN, HAPICOLOR_BROWN, HAPICOLOR_PLUM, HAPICOLOR_INDIGO,
--        HAPICOLOR_GRAY_80_PERCENT
--    };
--    return COLORINDIZES[nIndex];
--}
--ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XHelperInterface > xInternalParent, const uno::Reference< drawing::XShape > xShape, const sal_Int16 nColorFormatType ) : ScVbaColorFormat_BASE( xParent, xContext ), m_xInternalParent( xInternalParent ), m_xShape( xShape ), m_nColorFormatType( nColorFormatType )
--{
--    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
--    m_nFillFormatBackColor = 0;
--    try
--    {
--        uno::Reference< ov::msforms::XFillFormat > xFillFormat( xInternalParent, uno::UNO_QUERY_THROW );
--        m_pFillFormat = ( ScVbaFillFormat* )( xFillFormat.get() );
--    }catch ( uno::RuntimeException  e )
--    {
--        m_pFillFormat = NULL;
--    }
--}
--
--void
--ScVbaColorFormat::setColorFormat( sal_Int16 _ntype )
--{
--    m_nColorFormatType = _ntype;
--}
--
--// Attribute
--sal_Int32 SAL_CALL 
--ScVbaColorFormat::getRGB() throw (uno::RuntimeException)
--{
--    sal_Int32 nRGB = 0;
--    switch( m_nColorFormatType )
--    {
--    case ColorFormatType::LINEFORMAT_FORECOLOR:
--        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LineColor") ) >>= nRGB;
--        break;
--    case ColorFormatType::LINEFORMAT_BACKCOLOR:
--        //TODO BackColor not supported
--        // m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("Color"), uno::makeAny( nRGB ) );
--        break;
--    case ColorFormatType::FILLFORMAT_FORECOLOR:
--        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillColor") ) >>= nRGB;
--        break;
--    case ColorFormatType::FILLFORMAT_BACKCOLOR:
--        nRGB = m_nFillFormatBackColor;
--        break;
--    default:
--        throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() );
--    }
--    nRGB = OORGBToXLRGB( nRGB );
--    return nRGB;
--}
--
--void SAL_CALL 
--ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException)
--{
--    sal_Int32 nRGB = XLRGBToOORGB( _rgb );
--    switch( m_nColorFormatType )
--    {
--    case ColorFormatType::LINEFORMAT_FORECOLOR:
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineColor" ), uno::makeAny( nRGB ) );
--        break;
--    case ColorFormatType::LINEFORMAT_BACKCOLOR:
--        // TODO BackColor not supported
--        break;
--    case ColorFormatType::FILLFORMAT_FORECOLOR:
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillColor" ), uno::makeAny( nRGB ) );
--        if( m_pFillFormat )
--        {
--            m_pFillFormat->setForeColorAndInternalStyle(nRGB);
--        }
--        break;
--    case ColorFormatType::FILLFORMAT_BACKCOLOR:
--        m_nFillFormatBackColor = nRGB;
--        if( m_pFillFormat )
--        {
--            m_pFillFormat->setForeColorAndInternalStyle(nRGB);
--        }
--        break;
--    default:    
--        throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() );
--    }
--}
--
--sal_Int32 SAL_CALL 
--ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException)
--{
--    sal_Int32 nColor = getRGB();
--    // #TODO I guess the number of elements is determined by the correct scheme
--    // the implementation here seems to be a rehash of color index ( which seems to be a 
--    // different thing ) - I would guess we need to know/import etc. the correct color scheme
--    // or at least find out a little more
--    sal_Int32 i = 0;
--    for( ; i < 56; i++ )
--    {
--        if( nColor == MsoColorIndizes::getColorIndex(i) )
--	   break;
--    }
--
--    if( i == 56 ) // this is most likely an error condition
--        --i;
--    return i; 
--    // #TODO figure out what craziness is this, 
--    // the 56 colors seems incorrect, as in default XL ( 2003 ) there are 80 colors
--/*
--    if( i == 56 )
--    {
--        i = -2;
--    }
--
--    return ( i + 2 );
--*/
--}
--
--void SAL_CALL 
--ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor ) throw (uno::RuntimeException)
--{
--    // the table is 0 based
--    sal_Int32 nColor = MsoColorIndizes::getColorIndex( _schemecolor );
--    // nColor is already xl RGB
--    setRGB( nColor );
--}
--
--
--rtl::OUString&
--ScVbaColorFormat::getServiceImplName()
--{
--    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaColorFormat") );
--    return sImplName;
--}
--
--uno::Sequence< rtl::OUString >
--ScVbaColorFormat::getServiceNames()
--{
--    static uno::Sequence< rtl::OUString > aServiceNames;
--    if ( aServiceNames.getLength() == 0 )
--    {
--        aServiceNames.realloc( 1 );
--        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ColorFormat" ) );
--    }
--    return aServiceNames;
--}
--
-diff --git sc/source/ui/vba/vbacolorformat.hxx sc/source/ui/vba/vbacolorformat.hxx
-deleted file mode 100644
-index a45d5d8..0000000
---- sc/source/ui/vba/vbacolorformat.hxx
-+++ /dev/null
-@@ -1,128 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbacolorformat.hxx,v $
-- * $Revision: 1.3.146.1 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_XCOLORFORMAT_HXX
--#define SC_VBA_XCOLORFORMAT_HXX
--
--#include <com/sun/star/drawing/XShape.hpp>
--#include <ooo/vba/msforms/XColorFormat.hpp>
--#include <ooo/vba/msforms/XFillFormat.hpp>
--#include <vbahelper/vbahelperinterface.hxx>
--#include "vbafillformat.hxx"
--
--typedef InheritedHelperInterfaceImpl1< ov::msforms::XColorFormat > ScVbaColorFormat_BASE;
--
--class ColorFormatType
--{
--public:
--    const static sal_Int16 LINEFORMAT_FORECOLOR = 1;
--    const static sal_Int16 LINEFORMAT_BACKCOLOR = 2;
--    const static sal_Int16 FILLFORMAT_FORECOLOR = 3;
--    const static sal_Int16 FILLFORMAT_BACKCOLOR = 4;
--    const static sal_Int16 THREEDFORMAT_EXTRUSIONCOLOR = 5;
--};
--
--struct MsoColorIndizes
--{
--    const static sal_Int32 HAPICOLOR_BLACK = 0;
--    const static sal_Int32 HAPICOLOR_WITHE = 16777215;
--    const static sal_Int32 HAPICOLOR_RED = 16711680;
--    const static sal_Int32 HAPICOLOR_BRIGHTGREEN = 65280;
--    const static sal_Int32 HAPICOLOR_BLUE = 255;
--    const static sal_Int32 HAPICOLOR_YELLOW = 16776960;
--    const static sal_Int32 HAPICOLOR_PINK = 16711935;
--    const static sal_Int32 HAPICOLOR_TURQUOISE = 65535;
--    const static sal_Int32 HAPICOLOR_DARKRED = 8388608;
--    const static sal_Int32 HAPICOLOR_GREEN = 32768;
--    const static sal_Int32 HAPICOLOR_DARKBLUE = 128;
--    const static sal_Int32 HAPICOLOR_DARKYELLOW = 8421376;
--    const static sal_Int32 HAPICOLOR_VIOLET = 8388736;
--    const static sal_Int32 HAPICOLOR_TEAL = 32896;
--    const static sal_Int32 HAPICOLOR_GRAY_25_PERCENT = 12632256;
--    const static sal_Int32 HAPICOLOR_GRAY_50_PERCENT = 8421504;
--    const static sal_Int32 HAPICOLOR_PERIWINCKLE = 10066431;
--    const static sal_Int32 HAPICOLOR_PLUM = 10040166;
--    const static sal_Int32 HAPICOLOR_IVORY = 16777164;
--    const static sal_Int32 HAPICOLOR_LIGHTTURQUOISE = 13434879;
--    const static sal_Int32 HAPICOLOR_DARKPRUPLE = 6684774;
--    const static sal_Int32 HAPICOLOR_CORAL = 16744576;
--    const static sal_Int32 HAPICOLOR_OCEANBLUE = 26316;
--    const static sal_Int32 HAPICOLOR_ICEBLUE = 13421823;
--    const static sal_Int32 HAPICOLOR_SKYBLUE = 52479;
--    const static sal_Int32 HAPICOLOR_LIGHTGREEN = 13434828;
--    const static sal_Int32 HAPICOLOR_LIGHTYELLOW = 16777113;
--    const static sal_Int32 HAPICOLOR_PALEBLUE = 10079487;
--    const static sal_Int32 HAPICOLOR_ROSE = 16751052;
--    const static sal_Int32 HAPICOLOR_LAVENDER = 13408767;
--    const static sal_Int32 HAPICOLOR_TAN = 16764057;
--    const static sal_Int32 HAPICOLOR_LIGHTBLUE = 3368703;
--    const static sal_Int32 HAPICOLOR_AQUA = 3394764;
--    const static sal_Int32 HAPICOLOR_LIME = 10079232;
--    const static sal_Int32 HAPICOLOR_GOLD = 16763904;
--    const static sal_Int32 HAPICOLOR_LIGHTORANGE = 16750848;
--    const static sal_Int32 HAPICOLOR_ORANGE = 16737792;
--    const static sal_Int32 HAPICOLOR_BLUEGRAY = 6710937;
--    const static sal_Int32 HAPICOLOR_GRAY_40_PERCENT = 9868950;
--    const static sal_Int32 HAPICOLOR_DARKTEAL = 13158;
--    const static sal_Int32 HAPICOLOR_SEAGREEN = 3381606;
--    const static sal_Int32 HAPICOLOR_NONAME = 13056;
--    const static sal_Int32 HAPICOLOR_OLIVEGREEN = 3355392;
--    const static sal_Int32 HAPICOLOR_BROWN = 10040064;
--    const static sal_Int32 HAPICOLOR_INDIGO = 3355545;
--    const static sal_Int32 HAPICOLOR_GRAY_80_PERCENT = 3355443;
--
--    static sal_Int32 getColorIndex( sal_Int32 nIndex );
--    
--};
--
--class ScVbaColorFormat : public ScVbaColorFormat_BASE
--{
--private:
--    css::uno::Reference< ov::XHelperInterface > m_xInternalParent;
--    css::uno::Reference< css::drawing::XShape > m_xShape;
--    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
--    ScVbaFillFormat *m_pFillFormat;
--    sal_Int16 m_nColorFormatType;
--    sal_Int32 m_nFillFormatBackColor;
--protected:
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--    void setColorFormat( sal_Int16 nType );
--public:
--    ScVbaColorFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XHelperInterface > xInternalParent, const css::uno::Reference< css::drawing::XShape > xShape, const sal_Int16 nColorFormatType );
--
--    // Attributes
--    virtual sal_Int32 SAL_CALL getRGB() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setRGB( sal_Int32 _rgb ) throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getSchemeColor() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setSchemeColor( sal_Int32 _schemecolor ) throw (css::uno::RuntimeException);
--
--};
--
--#endif//SC_VBA_XCOLORFORMAT_HXX
-diff --git sc/source/ui/vba/vbadialog.cxx sc/source/ui/vba/vbadialog.cxx
-index abfa6d3..4adfc4c 100644
---- sc/source/ui/vba/vbadialog.cxx
-+++ sc/source/ui/vba/vbadialog.cxx
-@@ -27,40 +27,11 @@
-  * for a copy of the LGPLv3 License.
-  *
-  ************************************************************************/
--#include <comphelper/processfactory.hxx>
--
--#include <com/sun/star/lang/XMultiComponentFactory.hpp>
--#include <com/sun/star/frame/XModel.hpp>
--#include <ooo/vba/excel/XApplication.hpp>
--
--#include <tools/string.hxx>
--
--#include "excelvbahelper.hxx"
- #include "vbadialog.hxx"
--#include "vbaglobals.hxx"
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
- 
--// fails silently
--void
--ScVbaDialog::Show() throw(uno::RuntimeException)
--{
--	rtl::OUString aURL;
--	// #FIXME - should this really use the current document?
--        uno::Reference< frame::XModel > xModel = getCurrentDocument();
--	if ( xModel.is() )
--	{
--		aURL = mapIndexToName( mnIndex );
--		if( aURL.getLength()  )
--			throw uno::RuntimeException(
--				::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " Unable to open the specified dialog " ) ),
--				uno::Reference< XInterface > () );
--		dispatchRequests( xModel, aURL );
--	}
--}	
--
--
- static const rtl::OUString aStringList[]=
- {
- 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Open" ) ),
-@@ -103,7 +74,7 @@ ScVbaDialog::mapIndexToName( sal_Int32 nIndex )
- rtl::OUString& 
- ScVbaDialog::getServiceImplName()
- {
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTable") );
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog") );
- 	return sImplName;
- }
- 
-@@ -114,7 +85,7 @@ ScVbaDialog::getServiceNames()
- 	if ( aServiceNames.getLength() == 0 )
- 	{
- 		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.PivotTable" ) );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Dialog" ) );
- 	}
- 	return aServiceNames;
- }
-diff --git sc/source/ui/vba/vbadialog.hxx sc/source/ui/vba/vbadialog.hxx
-index 583969e..8625166 100644
---- sc/source/ui/vba/vbadialog.hxx
-+++ sc/source/ui/vba/vbadialog.hxx
-@@ -31,26 +31,20 @@
- #define SC_VBA_DIALOG_HXX
- 
- #include <cppuhelper/implbase1.hxx>
--
--#include <com/sun/star/uno/XComponentContext.hpp>
--#include <ooo/vba/excel/XApplication.hpp>
- #include <ooo/vba/excel/XDialog.hpp>
-- 
- #include <vbahelper/vbahelperinterface.hxx>
--#include "vbadialog.hxx"
-+#include <vbahelper/vbadialogbase.hxx>
- 
--typedef InheritedHelperInterfaceImpl1< ov::excel::XDialog > ScVbaDialog_BASE;
-+typedef cppu::ImplInheritanceHelper1< VbaDialogBase, ov::excel::XDialog > ScVbaDialog_BASE;
- 
- class ScVbaDialog : public ScVbaDialog_BASE
- {
--	sal_Int32 mnIndex;
- public:
--	ScVbaDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, sal_Int32 nIndex, const css::uno::Reference< css::uno::XComponentContext > xContext ):ScVbaDialog_BASE( xParent, xContext ), mnIndex( nIndex ) {}
-+	ScVbaDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nIndex ):ScVbaDialog_BASE( xParent, xContext, nIndex ) {}
- 	virtual ~ScVbaDialog() {}
- 
- 	// Methods
--	virtual void SAL_CALL Show() throw (css::uno::RuntimeException);
--	rtl::OUString mapIndexToName( sal_Int32 nIndex );
-+	virtual rtl::OUString mapIndexToName( sal_Int32 nIndex );
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-diff --git sc/source/ui/vba/vbadialogs.cxx sc/source/ui/vba/vbadialogs.cxx
-index c76a0b5..c0c8bf7 100644
---- sc/source/ui/vba/vbadialogs.cxx
-+++ sc/source/ui/vba/vbadialogs.cxx
-@@ -27,18 +27,8 @@
-  * for a copy of the LGPLv3 License.
-  *
-  ************************************************************************/
--#include <comphelper/processfactory.hxx>
--
--#include <com/sun/star/lang/XMultiComponentFactory.hpp>
--#include <com/sun/star/frame/XModel.hpp>
--#include <ooo/vba/excel/XApplication.hpp>
- #include <ooo/vba/excel/XDialog.hpp>
--
--#include <tools/string.hxx>
--
--#include "excelvbahelper.hxx"
- #include "vbadialogs.hxx"
--#include "vbaglobals.hxx"
- #include "vbadialog.hxx"
- 
- using namespace ::ooo::vba;
-@@ -49,26 +39,19 @@ ScVbaDialogs::Dummy() throw (uno::RuntimeException)
- {
- }
- 
--::sal_Int32
--ScVbaDialogs::getCount() throw (uno::RuntimeException)
--{
--	//#TODO #FIXEME
--	//SC_VBA_STUB();
--	return 0;
--}
--
- uno::Any
- ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
- {
- 	sal_Int32 nIndex = 0;
- 	aItem >>= nIndex;
--	uno::Reference< excel::XDialog > aDialog( new ScVbaDialog( uno::Reference< XHelperInterface >( Application(),uno::UNO_QUERY_THROW ), nIndex, mxContext ) );
-+	uno::Reference< excel::XDialog > aDialog( new ScVbaDialog( uno::Reference< XHelperInterface >( Application(),uno::UNO_QUERY_THROW ), mxContext, nIndex ) );
- 	return uno::Any( aDialog );
- }
-+
- rtl::OUString& 
- ScVbaDialogs::getServiceImplName()
- {
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheet") );
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs") );
- 	return sImplName;
- }
- 
-@@ -79,7 +62,7 @@ ScVbaDialogs::getServiceNames()
- 	if ( aServiceNames.getLength() == 0 )
- 	{
- 		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheet" ) );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Dialogs" ) );
- 	}
- 	return aServiceNames;
- }
-diff --git sc/source/ui/vba/vbadialogs.hxx sc/source/ui/vba/vbadialogs.hxx
-index a0b2b24..ab53253 100644
---- sc/source/ui/vba/vbadialogs.hxx
-+++ sc/source/ui/vba/vbadialogs.hxx
-@@ -30,16 +30,14 @@
- #ifndef SC_VBA_DIALOGS_HXX
- #define SC_VBA_DIALOGS_HXX
- 
--#include <cppuhelper/implbase1.hxx>
--
- #include <com/sun/star/uno/XComponentContext.hpp>
- #include <ooo/vba/excel/XDialogs.hpp>
- #include <ooo/vba/XCollection.hpp>
- #include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbadialogsbase.hxx>
-+#include <cppuhelper/implbase1.hxx>
- 
--class ScModelObj;
--
--typedef InheritedHelperInterfaceImpl1< ov::excel::XDialogs > ScVbaDialogs_BASE;
-+typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::excel::XDialogs > ScVbaDialogs_BASE;
- 
- class ScVbaDialogs : public ScVbaDialogs_BASE
- {
-@@ -48,7 +46,6 @@ public:
- 	virtual ~ScVbaDialogs() {}
- 
- 	// XCollection
--	virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
- 
- 	// XDialogs
-diff --git sc/source/ui/vba/vbaeventshelper.cxx sc/source/ui/vba/vbaeventshelper.cxx
-index 794cb84..3948ac6 100644
---- sc/source/ui/vba/vbaeventshelper.cxx
-+++ sc/source/ui/vba/vbaeventshelper.cxx
-@@ -63,16 +63,13 @@
- #include <cellsuno.hxx> 
- #include <convuno.hxx>
- #include <map>
-+#include <svx/msvbahelper.hxx>
- 
- using namespace std;
- using namespace com::sun::star;
- using namespace ooo::vba;
- using namespace com::sun::star::document::VbaEventId;
- 
--const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
--const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
--const static rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document"); 
--
- typedef ::cppu::WeakImplHelper1< util::XChangesListener > WorksheetChangeListener_BASE;
- 
- class WorksheetChangeListener : public WorksheetChangeListener_BASE
-@@ -488,37 +485,6 @@ ScVbaEventsHelper::getEventName( const sal_Int32 nId )
-     return sEventName;
- }
- 
--// Treat the args as possible inouts ( convertion at bottom of method )
--sal_Bool ScVbaEventsHelper::executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet )
--{
--	// until ObjectModules ( and persisting of codenames ) is supported, if this is a
--	// document saved from XL then we won't be able to determine the codename for the Workbook
--	// Module, so... we have no choice but to search all modules for the moment, thus the macro
--	// passed in should be the fully specified name. 	
--	rtl::OUString sUrl = sUrlPart0.concat( sMacroName ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sUrlPart2 ) ;
--	uno::Sequence< sal_Int16 > aOutArgsIndex;
--	uno::Sequence< uno::Any > aOutArgs;
--	ErrCode nErr = pShell->CallXScript( sUrl,  aArgs, aRet,
--			aOutArgsIndex, aOutArgs, sal_False );
--
--	// Script Executed?
--	if ( nErr != ERRCODE_NONE )
--		return sal_False;
--
--	sal_Int32 nLen = aOutArgs.getLength();
--	// convert any out params to seem like they were inouts
--	if ( nLen )
--	{
--		for ( sal_Int32 index=0; index < nLen; ++index )
--		{
--			sal_Int32 nOutIndex = aOutArgsIndex[ index ];
--			aArgs[ nOutIndex ] = aOutArgs[ index ];
--		}
--
--	}
--	return sal_True;
--}
--
- uno::Any ScVbaEventsHelper::createWorkSheet( SfxObjectShell* pShell, SCTAB nTab )
- {
- 	uno::Any aRet;
-@@ -664,7 +630,7 @@ ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
-     	case VBAEVENT_WORKSHEET_SELECTIONCHANGE               :
-         {
-             rtl::OUString  aSheetModuleName = getSheetModuleName( nTab );
--            sMacroPath = docMacroExists( pShell, aSheetModuleName, sMacroName );
-+            sMacroPath = findVBAMacro( pShell, aSheetModuleName, sMacroName );
-             break;
-         }
-         // Workbook
-@@ -698,7 +664,7 @@ ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
-                 sWorkbookModuleName = aExtDocSettings.maGlobCodeName;
-             }
-            
--            sMacroPath = docMacroExists( pShell, sWorkbookModuleName, sMacroName );
-+            sMacroPath = findVBAMacro( pShell, sWorkbookModuleName, sMacroName );
-             break;
-         }
-         default:
-diff --git sc/source/ui/vba/vbaeventshelper.hxx sc/source/ui/vba/vbaeventshelper.hxx
-index e812aa0..d165695 100644
---- sc/source/ui/vba/vbaeventshelper.hxx
-+++ sc/source/ui/vba/vbaeventshelper.hxx
-@@ -63,7 +63,6 @@ private:
- 	css::uno::Any createRange( const css::uno::Any& aRange );
- 	css::uno::Any createHyperlink( const css::uno::Any& rCell );
- 	css::uno::Any createWindow( SfxObjectShell* pShell );
--	sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, css::uno::Sequence< css::uno::Any >& aArgs, css::uno::Any& aRet );
-     SCTAB getTabFromArgs( const css::uno::Sequence< css::uno::Any > aArgs, const sal_Int32 nPos = 0 );
-     rtl::OUString getEventName( const sal_Int32 nEventId );
-     rtl::OUString getMacroPath( const sal_Int32 nEventId, const SCTAB nTab = INVALID_TAB );
-diff --git sc/source/ui/vba/vbafillformat.cxx sc/source/ui/vba/vbafillformat.cxx
-deleted file mode 100644
-index ed7fcd2..0000000
---- sc/source/ui/vba/vbafillformat.cxx
-+++ /dev/null
-@@ -1,202 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbafillformat.cxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include <com/sun/star/beans/XPropertySet.hpp>
--#include <com/sun/star/awt/Gradient.hpp>
--#include <com/sun/star/awt/GradientStyle.hpp>
--#include <ooo/vba/office/MsoGradientStyle.hpp>
--#include "vbafillformat.hxx"
--#include "vbacolorformat.hxx"
--
--using namespace ooo::vba;
--using namespace com::sun::star;
--
--ScVbaFillFormat::ScVbaFillFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaFillFormat_BASE( xParent, xContext ), m_xShape( xShape )
--{
--    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
--    m_nFillStyle = drawing::FillStyle_SOLID;
--    m_nForeColor = 0;
--    m_nBackColor = 0;
--    m_nGradientAngle = 0;
--}
--
--void
--ScVbaFillFormat::setFillStyle( drawing::FillStyle nFillStyle ) throw (uno::RuntimeException)
--{
--    m_nFillStyle = nFillStyle;
--    if( m_nFillStyle == drawing::FillStyle_GRADIENT )
--    {
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny( drawing::FillStyle_GRADIENT ) );
--        awt::Gradient aGradient;
--        // AXIAL
--        // RADIAL
--        // ELLIPTICAL
--        // SQUARE
--        // RECT
--        aGradient.Style = awt::GradientStyle_LINEAR;
--        aGradient.StartColor = ForeColor()->getRGB();
--        aGradient.EndColor = BackColor()->getRGB();
--        aGradient.Angle = m_nGradientAngle;
--        aGradient.Border = 0;
--        aGradient.XOffset = 0;
--        aGradient.YOffset = 0;
--        aGradient.StartIntensity = 100;
--        aGradient.EndIntensity = 100;
--        aGradient.StepCount = 1;
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillGradient"), uno::makeAny( aGradient ) );
--    }
--    else if( m_nFillStyle == drawing::FillStyle_SOLID )
--    {
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny(drawing::FillStyle_SOLID) );
--    }
--}
--
--void
--ScVbaFillFormat::setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css::uno::RuntimeException)
--{
--    m_nForeColor = nForeColor;
--    setFillStyle( m_nFillStyle );
--}
--
--// Attributes
--sal_Bool SAL_CALL 
--ScVbaFillFormat::getVisible() throw (uno::RuntimeException)
--{
--    drawing::FillStyle nFillStyle;
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillStyle") ) >>= nFillStyle;
--    if( nFillStyle == drawing::FillStyle_NONE )
--        return sal_False;
--    return sal_True;
--}
--
--void SAL_CALL 
--ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
--{
--    drawing::FillStyle aFillStyle;
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillStyle") ) >>= aFillStyle;
--    if( !_visible )
--    {
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny( drawing::FillStyle_NONE ) );
--    }
--    else
--    {
--        if( aFillStyle == drawing::FillStyle_NONE )
--        {
--            setFillStyle( m_nFillStyle );
--        }
--    }
--}
--
--double SAL_CALL 
--ScVbaFillFormat::getTransparency() throw (uno::RuntimeException)
--{
--    sal_Int16 nTransparence = 0;
--    double dTransparence = 0;
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "FillTransparence" ) ) >>= nTransparence;
--    dTransparence = static_cast<double>( nTransparence );
--    dTransparence /= 100;
--    return dTransparence;
--}
--
--void SAL_CALL 
--ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeException)
--{
--    sal_Int16 nTransparence = static_cast< sal_Int16 >( _transparency * 100 );
--    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillTransparence" ), uno::makeAny( nTransparence ) );
--}
--
--
--// Methods
--void SAL_CALL 
--ScVbaFillFormat::Solid() throw (uno::RuntimeException)
--{
--    setFillStyle( drawing::FillStyle_SOLID );
--}
--
--void SAL_CALL 
--ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) throw (uno::RuntimeException)
--{
--    if( style == office::MsoGradientStyle::msoGradientHorizontal )
--    {
--        m_nGradientAngle = 0;
--        setFillStyle( drawing::FillStyle_GRADIENT );
--    }
--    else if( style == office::MsoGradientStyle::msoGradientVertical )
--    {
--        m_nGradientAngle = 900;
--        setFillStyle( drawing::FillStyle_GRADIENT );
--    }
--    else if( style == office::MsoGradientStyle::msoGradientDiagonalDown )
--    {
--        m_nGradientAngle = 450;
--        setFillStyle( drawing::FillStyle_GRADIENT );
--    }
--    else if( style == office::MsoGradientStyle::msoGradientDiagonalUp )
--    {
--        m_nGradientAngle = 900 + 450;
--        setFillStyle( drawing::FillStyle_GRADIENT );
--    }
--}
--
--uno::Reference< msforms::XColorFormat > SAL_CALL 
--ScVbaFillFormat::BackColor() throw (uno::RuntimeException)
--{
--    if( !m_xColorFormat.is() )
--        m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_BACKCOLOR ) );
--    return m_xColorFormat;
--}
--
--uno::Reference< msforms::XColorFormat > SAL_CALL 
--ScVbaFillFormat::ForeColor() throw (uno::RuntimeException)
--{
--    if( !m_xColorFormat.is() )
--        m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_FORECOLOR ) );
--    return m_xColorFormat;
--}
--
--
--rtl::OUString&
--ScVbaFillFormat::getServiceImplName()
--{
--    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFillFormat") );
--    return sImplName;
--}
--
--uno::Sequence< rtl::OUString >
--ScVbaFillFormat::getServiceNames()
--{
--    static uno::Sequence< rtl::OUString > aServiceNames;
--    if ( aServiceNames.getLength() == 0 )
--    {
--        aServiceNames.realloc( 1 );
--        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.FillFormat" ) );
--    }
--    return aServiceNames;
--}
--
-diff --git sc/source/ui/vba/vbafillformat.hxx sc/source/ui/vba/vbafillformat.hxx
-deleted file mode 100644
-index 047af92..0000000
---- sc/source/ui/vba/vbafillformat.hxx
-+++ /dev/null
-@@ -1,74 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbafillformat.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_XFILLFORMAT_HXX
--#define SC_VBA_XFILLFORMAT_HXX
--
--#include <com/sun/star/drawing/XShape.hpp>
--#include <com/sun/star/drawing/FillStyle.hpp>
--#include <ooo/vba/msforms/XFillFormat.hpp>
--#include <vbahelper/vbahelperinterface.hxx>
--
--typedef InheritedHelperInterfaceImpl1< ov::msforms::XFillFormat > ScVbaFillFormat_BASE;
--
--class ScVbaFillFormat : public ScVbaFillFormat_BASE
--{
--private:
--    css::uno::Reference< css::drawing::XShape > m_xShape;
--    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
--    css::uno::Reference< ov::msforms::XColorFormat > m_xColorFormat;
--    css::drawing::FillStyle m_nFillStyle;
--    sal_Int32 m_nForeColor;
--    sal_Int32 m_nBackColor;
--    sal_Int16 m_nGradientAngle;
--private:
--    void setFillStyle( css::drawing::FillStyle nFillStyle ) throw (css::uno::RuntimeException);
--protected:
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--
--public:
--    ScVbaFillFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape );
--
--    void setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css::uno::RuntimeException);
--    // Attributes
--    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException);
--
--    // Methods
--    virtual void SAL_CALL Solid() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL TwoColorGradient( sal_Int32 style, sal_Int32 variant ) throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException);
--
--};
--
--#endif//SC_VBA_XFILLFORMAT_HXX
-diff --git sc/source/ui/vba/vbafont.cxx sc/source/ui/vba/vbafont.cxx
-index 41d09e9..49ebf63 100644
---- sc/source/ui/vba/vbafont.cxx
-+++ sc/source/ui/vba/vbafont.cxx
-@@ -46,30 +46,7 @@
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
- 
--// use local constants there is no need to expose these constants
--// externally. Looking at the Format->Character dialog it seem that
--// these may infact be even be calculated. Leave hardcoded for now
--// #FIXEME #TBD investigate the code for dialog mentioned above
--
--// The font baseline is not specified.
--const short NORMAL = 0;
--
--// specifies a superscripted.
--const short SUPERSCRIPT = 33;
--
--// specifies a subscripted.
--const short SUBSCRIPT = -33;
--
--// specifies a hight of superscripted font
-- const sal_Int8 SUPERSCRIPTHEIGHT = 58;
--
--// specifies a hight of subscripted font
--const sal_Int8 SUBSCRIPTHEIGHT = 58;
--
--// specifies a hight of normal font
--const short NORMALHEIGHT = 100;
--
--ScVbaFont::ScVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, uno::Reference< beans::XPropertySet > xPropertySet, ScCellRangeObj* pRangeObj  ) throw ( uno::RuntimeException ) : ScVbaFont_BASE( xParent, xContext ), mxFont( xPropertySet, css::uno::UNO_QUERY_THROW ), mPalette( dPalette ),  mpRangeObj( pRangeObj )
-+ScVbaFont::ScVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, uno::Reference< beans::XPropertySet > xPropertySet, ScCellRangeObj* pRangeObj  ) throw ( uno::RuntimeException ) : ScVbaFont_BASE( xParent, xContext, dPalette.getPalette(), xPropertySet ), mPalette( dPalette ),  mpRangeObj( pRangeObj )
- {
- }
- 
-@@ -243,19 +220,13 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeException )
- 	return uno::makeAny( ( nValue == SUBSCRIPT ) );
- }
- 
--void SAL_CALL
--ScVbaFont::setSize( const uno::Any& aValue ) throw( uno::RuntimeException )
--{
--	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ), aValue );
--}
--
- uno::Any SAL_CALL
- ScVbaFont::getSize() throw ( uno::RuntimeException )
- {
- 	if ( GetDataSet() )
- 		if (  GetDataSet()->GetItemState( ATTR_FONT_HEIGHT, TRUE, NULL) == SFX_ITEM_DONTCARE )
- 			return aNULL();
--        return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ) );
-+        return ScVbaFont_BASE::getSize();
- }
- 
- void SAL_CALL
-@@ -267,13 +238,12 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep
- 	// handled properly here
- 
- 	if ( !nIndex || ( nIndex == excel::XlColorIndex::xlColorIndexAutomatic ) )
-+        {
- 		nIndex = 1;  // check defualt ( assume black )
--	--nIndex; // OOo indices are zero bases
--	uno::Reference< container::XIndexAccess > xIndex = mPalette.getPalette();
--	// setColor expects colors in XL RGB values
--	// #FIXME this is daft we convert OO RGB val to XL RGB val and
--	// then back again to OO RGB value
--	setColor( OORGBToXLRGB(xIndex->getByIndex( nIndex )) );
-+                ScVbaFont_BASE::setColorIndex( uno::makeAny( nIndex ) );
-+        }
-+        else
-+            ScVbaFont_BASE::setColorIndex( _colorindex );
- }
- 
- 
-@@ -284,26 +254,7 @@ ScVbaFont::getColorIndex() throw ( uno::RuntimeException )
- 	if ( GetDataSet() )
- 		if (  GetDataSet()->GetItemState( ATTR_FONT_COLOR, TRUE, NULL) == SFX_ITEM_DONTCARE )
- 			return aNULL();
--
--	// getColor returns Xl ColorValue, need to convert it to OO val
--	// as the palette deals with OO RGB values
--	// #FIXME this is daft in getColor we convert OO RGB val to XL RGB val
--	// and then back again to OO RGB value
--	XLRGBToOORGB( getColor() ) >>= nColor;
--	uno::Reference< container::XIndexAccess > xIndex = mPalette.getPalette();
--	sal_Int32 nElems = xIndex->getCount();
--	sal_Int32 nIndex = -1;
--	for ( sal_Int32 count=0; count<nElems; ++count )
--       	{
--		sal_Int32 nPaletteColor = 0;
--		xIndex->getByIndex( count ) >>= nPaletteColor;
--		if ( nPaletteColor == nColor )
--		{
--			nIndex = count + 1; // 1 based
--			break;
--		}
--	}
--	return uno::makeAny( nIndex );
-+	return ScVbaFont_BASE::getColorIndex();
- }
- 
- //////////////////////////////////////////////////////////////////////////////////////////
-@@ -396,28 +347,13 @@ ScVbaFont::getFontStyle() throw ( uno::RuntimeException )
-     return uno::makeAny( aStyles.makeStringAndClear() );
- }
- 
--void SAL_CALL
--ScVbaFont::setBold( const uno::Any& aValue ) throw( uno::RuntimeException )
--{
--	sal_Bool bValue = sal_False;
--	aValue >>= bValue;
--	double fBoldValue = awt::FontWeight::NORMAL;
--	if( bValue )
--		fBoldValue = awt::FontWeight::BOLD;
--	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ), ( uno::Any )fBoldValue );
--
--}
--
- uno::Any SAL_CALL
- ScVbaFont::getBold() throw ( uno::RuntimeException )
- {
- 	if ( GetDataSet() )
- 		if (  GetDataSet()->GetItemState( ATTR_FONT_WEIGHT, TRUE, NULL) == SFX_ITEM_DONTCARE )
- 			return aNULL();
--
--	double fValue = 0.0;
--	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ) ) >>= fValue;
--	return uno::makeAny( fValue == awt::FontWeight::BOLD );
-+	return ScVbaFont_BASE::getBold();
- }
- 
- void SAL_CALL
-@@ -481,32 +417,13 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException )
- 	return uno::makeAny( nValue );
- }
- 
--void SAL_CALL
--ScVbaFont::setStrikethrough( const uno::Any& aValue ) throw ( uno::RuntimeException )
--{
--	sal_Bool bValue = sal_False;
--	aValue >>= bValue;
--	short nValue = awt::FontStrikeout::NONE;
--	if( bValue )
--		nValue = awt::FontStrikeout::SINGLE;
--	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharStrikeout" ) ), ( uno::Any )nValue );
--}
--
- uno::Any SAL_CALL
- ScVbaFont::getStrikethrough() throw ( uno::RuntimeException )
- {
- 	if ( GetDataSet() )
- 		if (  GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT, TRUE, NULL) == SFX_ITEM_DONTCARE )
- 			return aNULL();
--	short nValue = 0;
--	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharStrikeout" ) ) ) >>= nValue;
--	return uno::Any( nValue == awt::FontStrikeout::SINGLE );
--}
--
--void  SAL_CALL
--ScVbaFont::setShadow( const uno::Any& aValue ) throw ( uno::RuntimeException )
--{
--	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ), aValue );
-+	return ScVbaFont_BASE::getStrikethrough();
- }
- 
- uno::Any SAL_CALL
-@@ -515,18 +432,7 @@ ScVbaFont::getShadow() throw (uno::RuntimeException)
- 	if ( GetDataSet() )
- 		if (  GetDataSet()->GetItemState( ATTR_FONT_SHADOWED, TRUE, NULL) == SFX_ITEM_DONTCARE )
- 			return aNULL();
--	return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ) );
--}
--
--void  SAL_CALL
--ScVbaFont::setItalic( const uno::Any& aValue ) throw ( uno::RuntimeException )
--{
--	sal_Bool bValue = sal_False;
--	aValue >>= bValue;
--	short nValue = awt::FontSlant_NONE;
--	if( bValue )
--		nValue = awt::FontSlant_ITALIC;
--    mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ), ( uno::Any )nValue );
-+	return ScVbaFont_BASE::getShadow();
- }
- 
- uno::Any SAL_CALL
-@@ -536,17 +442,7 @@ ScVbaFont::getItalic() throw ( uno::RuntimeException )
- 		if (  GetDataSet()->GetItemState( ATTR_FONT_POSTURE, TRUE, NULL) == SFX_ITEM_DONTCARE )
- 			return aNULL();
- 
--    awt::FontSlant aFS;
--	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ) ) >>= aFS;
--	return uno::makeAny( aFS == awt::FontSlant_ITALIC );
--}
--
--void  SAL_CALL
--ScVbaFont::setName( const uno::Any& aValue ) throw ( uno::RuntimeException )
--{
--	rtl::OUString sString;
--	aValue >>= sString;
--	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ), aValue);
-+	return ScVbaFont_BASE::getItalic();
- }
- 
- uno::Any SAL_CALL
-@@ -555,22 +451,17 @@ ScVbaFont::getName() throw ( uno::RuntimeException )
- 	if ( GetDataSet() )
- 		if (  GetDataSet()->GetItemState( ATTR_FONT, TRUE, NULL) == SFX_ITEM_DONTCARE )
- 			return aNULL();
--	return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ) );
-+	return ScVbaFont_BASE::getName();
- }
- uno::Any
- ScVbaFont::getColor() throw (uno::RuntimeException)
- {
-+	// #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet )
- 	uno::Any aAny;
- 	aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) ) );
- 	return aAny;
- }
- 
--void
--ScVbaFont::setColor( const uno::Any& _color  ) throw (uno::RuntimeException)
--{
--	mxFont->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) , XLRGBToOORGB(_color));
--}
--
- void  SAL_CALL
- ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException )
- {
-diff --git sc/source/ui/vba/vbafont.hxx sc/source/ui/vba/vbafont.hxx
-index efca63c..16f70ea 100644
---- sc/source/ui/vba/vbafont.hxx
-+++ sc/source/ui/vba/vbafont.hxx
-@@ -32,19 +32,19 @@
- 
- #include <cppuhelper/implbase1.hxx>
- 
--#include <ooo/vba/excel/XFont.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
-+#include <ooo/vba/excel/XFont.hpp>
- #include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbafontbase.hxx>
- #include "vbapalette.hxx"
- 
- class ScTableSheetsObj;
- class ScCellRangeObj;
- 
--typedef  InheritedHelperInterfaceImpl1< ov::excel::XFont > ScVbaFont_BASE;
-+typedef cppu::ImplInheritanceHelper1< VbaFontBase, ov::excel::XFont > ScVbaFont_BASE;
- 
- class ScVbaFont : public ScVbaFont_BASE
- {
--    css::uno::Reference< css::beans::XPropertySet > mxFont;
-     ScVbaPalette mPalette;
-     ScCellRangeObj* mpRangeObj;
-     SfxItemSet*  GetDataSet();
-@@ -54,7 +54,6 @@ public:
- 
- 	// Attributes
-     virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setSize( const css::uno::Any& _size ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getStandardFontSize() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setStandardFontSize( const css::uno::Any& _standardfontsize ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getStandardFont() throw (css::uno::RuntimeException);
-@@ -64,23 +63,17 @@ public:
-     virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setBold( const css::uno::Any& _bold ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setStrikethrough( const css::uno::Any& _strikethrough ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setShadow( const css::uno::Any& _shadow ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setItalic( const css::uno::Any& _italic ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setName( const css::uno::Any& _name ) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException) ;
--    virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException) ;
-     virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException) ;
-     virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException) ;
-     // XHelperInterface
---- sc/source/ui/vba/vbalineformat.cxx
-+++ /dev/null
-@@ -1,458 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbalineformat.cxx,v $
-- * $Revision: 1.4 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include <ooo/vba/office/MsoArrowheadStyle.hpp>
--#include <ooo/vba/office/MsoArrowheadLength.hpp>
--#include <ooo/vba/office/MsoArrowheadWidth.hpp>
--#include <ooo/vba/office/MsoLineDashStyle.hpp>
--#include <com/sun/star/drawing/LineStyle.hpp>
--#include <com/sun/star/drawing/LineDash.hpp>
--#include "vbalineformat.hxx"
--#include "vbacolorformat.hxx"
--
--using namespace ooo::vba;
--using namespace com::sun::star;
--
--ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaLineFormat_BASE( xParent, xContext ), m_xShape( xShape ) 
--{
--    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
--    m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid;
--    m_nLineWeight = 1;
--}
--
--sal_Int32
--ScVbaLineFormat::calculateArrowheadSize()
--{
--    return 0;
--}
--
--sal_Int32
--ScVbaLineFormat::convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName )
--{
--    sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
--    if (sLineName.equals(rtl::OUString::createFromAscii("Small Arrow")) ||
--        sLineName.equals(rtl::OUString::createFromAscii("Arrow")) ||
--        sLineName.equals(rtl::OUString::createFromAscii("msArrowEnd")) ||
--        sLineName.equals(rtl::OUString::createFromAscii("Double Arrow")))
--    {
--        // msoArrowheadTriangle
--        nLineType = office::MsoArrowheadStyle::msoArrowheadTriangle;
--    }
--    else if (sLineName.equals(rtl::OUString::createFromAscii("Square 45")) ||
--             sLineName.equals(rtl::OUString::createFromAscii("Square")) ||
--             sLineName.equals(rtl::OUString::createFromAscii("msArrowDiamondEnd")))
--    {
--        // msoArrowheadDiamond
--        nLineType = office::MsoArrowheadStyle::msoArrowheadDiamond;
--    }
--    else if (sLineName.equals(rtl::OUString::createFromAscii("Circle")) ||
--             sLineName.equals(rtl::OUString::createFromAscii("msArrowOvalEnd")) ||
--             sLineName.equals(rtl::OUString::createFromAscii("Dimension Lines")) )
--    {
--        // msoArrowheadOval
--        nLineType = office::MsoArrowheadStyle::msoArrowheadOval;
--    }
--    else if (sLineName.equals(rtl::OUString::createFromAscii("Arrow concave")) ||
--             sLineName.equals(rtl::OUString::createFromAscii("msArrowStealthEnd")))
--    {
--        // msoArrowheadStealth
--        nLineType = office::MsoArrowheadStyle::msoArrowheadStealth;
--    }
--    else if (sLineName.equals(rtl::OUString::createFromAscii("Rounded short Arrow")) ||
--             sLineName.equals(rtl::OUString::createFromAscii("Rounded large Arrow")) ||
--             sLineName.equals(rtl::OUString::createFromAscii("Symmetric Arrow")) ||
--             sLineName.equals(rtl::OUString::createFromAscii("msArrowOpenEnd")) ||
--             sLineName.equals(rtl::OUString::createFromAscii("Line Arrow")))
--    {
--        // msoArrowheadOpen
--        nLineType = office::MsoArrowheadStyle::msoArrowheadOpen;
--    }
--    else
--    {
--        // msoArrowheadNone
--        nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
--    }
--    return nLineType;
--}
--
--rtl::OUString 
--ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (uno::RuntimeException)
--{
--    switch( nArrowheadStyle )
--    {
--        case office::MsoArrowheadStyle::msoArrowheadNone:
--            return rtl::OUString(rtl::OUString::createFromAscii( "" ) );
--        case office::MsoArrowheadStyle::msoArrowheadStealth:
--            return rtl::OUString::createFromAscii( "Arrow concave" );
--        case office::MsoArrowheadStyle::msoArrowheadOpen:
--            return rtl::OUString::createFromAscii("Line Arrow" );
--        case office::MsoArrowheadStyle::msoArrowheadOval:
--            return  rtl::OUString::createFromAscii("Circle" );
--        case office::MsoArrowheadStyle::msoArrowheadDiamond:
--            return rtl::OUString::createFromAscii( "Square 45" );
--        case office::MsoArrowheadStyle::msoArrowheadTriangle:
--            return rtl::OUString::createFromAscii( "Arrow" );
--        default:
--            throw uno::RuntimeException( rtl::OUString::createFromAscii("Invalid Arrow Style!"), uno::Reference< uno::XInterface >() );
--    }
--}
--
--// Attributes
--sal_Int32 SAL_CALL 
--ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException)
--{
--    sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
--    rtl::OUString sLineName;
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ) ) >>= sLineName;
--    if( ( sLineName.getLength() > 7 ) && ( sLineName.indexOf( rtl::OUString::createFromAscii( "msArray" ) ) ) != -1 )
--    {
--        sal_Int32 nIndex = sLineName.indexOf( rtl::OUString::createFromAscii(" ") );
--        rtl::OUString sName = sLineName.copy( 0, nIndex );
--        //sal_Int32 nSize = sLineName.copy( nIndex + 1 ).toInt32();
--        nLineType = convertLineStartEndNameToArrowheadStyle( sName );
--    }
--    else
--    {
--        nLineType = convertLineStartEndNameToArrowheadStyle( sLineName );
--    }
--    return nLineType;
--}
--
--void SAL_CALL 
--ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (uno::RuntimeException)
--{
--    rtl::OUString sArrayName = convertArrowheadStyleToLineStartEndName( _beginarrowheadstyle );
--    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ), uno::makeAny( sArrayName ) );
--}
--
--sal_Int32 SAL_CALL 
--ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException)
--{
--    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
--}
--
--void SAL_CALL 
--ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) throw (uno::RuntimeException)
--{
--    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
--}
--
--sal_Int32 SAL_CALL 
--ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException)
--{
--    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
--}
--
--void SAL_CALL 
--ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) throw (uno::RuntimeException)
--{
--    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
--}
--
--sal_Int32 SAL_CALL 
--ScVbaLineFormat::getEndArrowheadStylel() throw (uno::RuntimeException)
--{
--    return 0;
--}
--
--void SAL_CALL 
--ScVbaLineFormat::setEndArrowheadStylel( sal_Int32 /*_endarrowheadstylel*/ ) throw (uno::RuntimeException)
--{
--}
--
--sal_Int32 SAL_CALL 
--ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException)
--{
--    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
--}
--
--void SAL_CALL 
--ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ ) throw (uno::RuntimeException)
--{
--    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
--}
--
--sal_Int32 SAL_CALL 
--ScVbaLineFormat::getEndArrowheadWidth() throw (uno::RuntimeException)
--{
--    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
--}
--
--void SAL_CALL 
--ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ ) throw (uno::RuntimeException)
--{
--    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
--}
--
--double SAL_CALL 
--ScVbaLineFormat::getWeight() throw (uno::RuntimeException)
--{
--    sal_Int32 nLineWidth=0;
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineWidth") ) >>= nLineWidth;
--    double dLineWidth = Millimeter::getInPoints( nLineWidth );
--    return dLineWidth;
--}
--
--void SAL_CALL 
--ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException)
--{
--    if( _weight < 0 )
--        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter: Must be positv."), uno::Reference< uno::XInterface >() );
--    if( _weight == 0 )
--        _weight = 0.5;
--    m_nLineWeight = _weight;
--    Millimeter aMillimeter;
--    aMillimeter.setInPoints( _weight );
--        
--    sal_Int32 nLineWidth = static_cast<sal_Int32>( aMillimeter.getInHundredthsOfOneMillimeter() );
--    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineWidth" ), uno::makeAny( nLineWidth ) );
--    setDashStyle( m_nLineDashStyle );
--}
--
--sal_Bool SAL_CALL 
--ScVbaLineFormat::getVisible() throw (uno::RuntimeException)
--{
--    drawing::LineStyle aLineStyle;
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= aLineStyle;
--    if( aLineStyle == drawing::LineStyle_NONE )
--    {
--        return sal_False;
--    }
--    return sal_True;
--}
--
--void SAL_CALL 
--ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
--{
--    drawing::LineStyle aLineStyle;
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= aLineStyle;
--    if( !_visible )
--    {
--        aLineStyle = drawing::LineStyle_NONE;
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( aLineStyle ) );
--    }
--    else
--    {
--        if( aLineStyle == drawing::LineStyle_NONE )
--        {
--            setDashStyle( m_nLineDashStyle );
--        }
--    }
--}
--
--double SAL_CALL 
--ScVbaLineFormat::getTransparency() throw (uno::RuntimeException)
--{
--    sal_Int16 nTransparency = 0;
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ) ) >>= nTransparency;
--    double fTransparency = static_cast<double>( nTransparency );
--    return fTransparency / 100;
--}
--
--void SAL_CALL 
--ScVbaLineFormat::setTransparency( double _transparency ) throw (uno::RuntimeException)
--{
--    sal_Int16 nTransparency = static_cast<sal_Int16>( _transparency * 100 );
--    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ), uno::makeAny( nTransparency ) );
--}
--
--sal_Int16 SAL_CALL 
--ScVbaLineFormat::getStyle() throw (uno::RuntimeException)
--{
--    //OpenOffice.org only supports one LineStyle (other than the DashStyles)
--    //Therefore we can only return the SingleLine
--    return 1;
--}
--
--void SAL_CALL 
--ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException)
--{
--    //OpenOffice.org only supports one LineStyle (other than the DashStyles)
--    //Therefore we do not set the LineStyle, because it maybe is already set
--    //to Dashed or Single Line. Setting the 'Visible' or 'DashStyle' properties
--    //will be done with the according methods.
--}
--
--sal_Int32 SAL_CALL 
--ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException)
--{
--    drawing::LineStyle eLineStyle;
--    //LineStyle integer in Xray
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= eLineStyle;
--    if( eLineStyle == drawing::LineStyle_SOLID )
--        m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid;
--    else
--    {
--        drawing::LineDash aLineDash;
--        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineDash" ) ) >>= aLineDash;
--        if( aLineDash.Dots == 0 )
--        {
--            //LineDash
--            //LineLongDash
--            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDash;
--            if( aLineDash.Distance > 0 && ( aLineDash.DashLen / aLineDash.Distance > 1 ) )
--            {
--                m_nLineDashStyle = office::MsoLineDashStyle::msoLineLongDash;
--            }
--        }
--        else if( aLineDash.Dots == 1 )
--        {
--            // LineDashDot
--            // LineLongDashDot
--            // LineSquareDot
--            // LineRoundDot ! not supported
--            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDashDot;
--            if( aLineDash.Dashes == 0 )
--            {
--                m_nLineDashStyle = office::MsoLineDashStyle::msoLineSquareDot;
--            }
--            else
--            {
--                if( aLineDash.Distance > 0 && ( aLineDash.DashLen / aLineDash.Distance > 1 ) )
--                {
--                    m_nLineDashStyle = office::MsoLineDashStyle::msoLineLongDashDot;
--                }
--            }
--        }
--        else if( aLineDash.Dots == 2 )
--        {
--            // LineDashDotDot
--            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDashDotDot;
--        }
--    }
--
--    return m_nLineDashStyle;
--}
--
--void SAL_CALL 
--ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeException)
--{
--    m_nLineDashStyle = _dashstyle;
--    if( _dashstyle == office::MsoLineDashStyle::msoLineSolid )
--    {
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID  ));
--    }
--    else
--    {
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( drawing::LineStyle_DASH ) );
--        drawing::LineDash  pLineDash;
--        Millimeter aMillimeter( m_nLineWeight );
--        sal_Int32 nPixel = static_cast< sal_Int32 >( aMillimeter.getInHundredthsOfOneMillimeter() );
--        switch( _dashstyle )
--        {
--        case office::MsoLineDashStyle::msoLineDashDot:
--            pLineDash.Dots = 1;
--            pLineDash.DotLen = nPixel;
--            pLineDash.Dashes = 1;
--            pLineDash.DashLen = 5 * nPixel;
--            pLineDash.Distance = 4 * nPixel;
--            break;
--        case office::MsoLineDashStyle::msoLineLongDashDot:
--            pLineDash.Dots = 1;
--            pLineDash.DotLen = nPixel;
--            pLineDash.Dashes = 1;
--            pLineDash.DashLen = 10 * nPixel;
--            pLineDash.Distance = 4 * nPixel;
--            break;
--        case office::MsoLineDashStyle::msoLineDash:
--            pLineDash.Dots = 0;
--            pLineDash.DotLen = 0;
--            pLineDash.Dashes = 1;
--            pLineDash.DashLen = 6 * nPixel;
--            pLineDash.Distance = 4 * nPixel;
--            break;
--        case office::MsoLineDashStyle::msoLineDashDotDot:
--            pLineDash.Dots = 2;
--            pLineDash.DotLen = nPixel;
--            pLineDash.Dashes = 1;
--            pLineDash.DashLen = 10 * nPixel;
--            pLineDash.Distance = 3 * nPixel;
--            break;
--        case office::MsoLineDashStyle::msoLineLongDash:
--            pLineDash.Dots = 0;
--            pLineDash.DotLen = 0;
--            pLineDash.Dashes = 1;
--            pLineDash.DashLen = 10 * nPixel;
--            pLineDash.Distance = 4 * nPixel;
--            break;
--        case office::MsoLineDashStyle::msoLineSquareDot:
--            pLineDash.Dots = 1;
--            pLineDash.DotLen = nPixel;
--            pLineDash.Dashes = 0;
--            pLineDash.DashLen = 0;
--            pLineDash.Distance = nPixel;
--            break;
--        case office::MsoLineDashStyle::msoLineRoundDot:
--            pLineDash.Dots = 1;
--            pLineDash.DotLen = nPixel;
--            pLineDash.Dashes = 0;
--            pLineDash.DashLen = 0;
--            pLineDash.Distance = nPixel;
--            break;
--        default:
--            throw uno::RuntimeException( rtl::OUString::createFromAscii("this MsoLineDashStyle is not supported."), uno::Reference< uno::XInterface >() );
--        }
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineDash" ), uno::makeAny( pLineDash ) );
--    }
--}
--
--// Methods
--uno::Reference< msforms::XColorFormat > SAL_CALL
--ScVbaLineFormat::BackColor() throw (uno::RuntimeException)
--{
--    return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_BACKCOLOR ) );
--}
--
--uno::Reference< msforms::XColorFormat > SAL_CALL
--ScVbaLineFormat::ForeColor() throw (uno::RuntimeException)
--{
--    return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_FORECOLOR ) );
--}
--
--
--rtl::OUString& 
--ScVbaLineFormat::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLineFormat") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaLineFormat::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.LineFormat" ) );
--	}
--	return aServiceNames;
--}
--
--
-diff --git sc/source/ui/vba/vbalineformat.hxx sc/source/ui/vba/vbalineformat.hxx
-deleted file mode 100644
-index a6287e4..0000000
---- sc/source/ui/vba/vbalineformat.hxx
-+++ /dev/null
-@@ -1,85 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbalineformat.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_XLINEFORMAT_HXX
--#define SC_VBA_XLINEFORMAT_HXX
--
--#include <com/sun/star/drawing/XShape.hpp>
--#include <com/sun/star/beans/XPropertySet.hpp>
--#include <ooo/vba/msforms/XLineFormat.hpp>
--#include <vbahelper/vbahelperinterface.hxx>
--
--typedef InheritedHelperInterfaceImpl1< ov::msforms::XLineFormat > ScVbaLineFormat_BASE;
--
--class ScVbaLineFormat : public ScVbaLineFormat_BASE
--{
--private:
--    css::uno::Reference< css::drawing::XShape > m_xShape;
--    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
--    sal_Int32 m_nLineDashStyle;
--    double m_nLineWeight;
--protected:
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--    sal_Int32 convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName );
--    rtl::OUString convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (css::uno::RuntimeException);
--    sal_Int32 calculateArrowheadSize();
--public:
--    ScVbaLineFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape );
--
--    // Attributes
--    virtual sal_Int32 SAL_CALL getBeginArrowheadStyle() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getBeginArrowheadLength() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setBeginArrowheadLength( sal_Int32 _beginarrowheadlength ) throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getBeginArrowheadWidth() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setBeginArrowheadWidth( sal_Int32 _beginarrowheadwidth ) throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getEndArrowheadStylel() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setEndArrowheadStylel( sal_Int32 _endarrowheadstylel ) throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getEndArrowheadLength() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setEndArrowheadLength( sal_Int32 _endarrowheadlength ) throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getEndArrowheadWidth() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setEndArrowheadWidth( sal_Int32 _endarrowheadwidth ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getWeight() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setWeight( double _weight ) throw (css::uno::RuntimeException);
--    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException);
--    virtual sal_Int16 SAL_CALL getStyle() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setStyle( sal_Int16 _style ) throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getDashStyle() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setDashStyle( sal_Int32 _dashstyle ) throw (css::uno::RuntimeException);
--
--    // Methods
--    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException);
--};
--
--#endif//SC_VBA_XLINEFORMAT_HXX
-diff --git sc/source/ui/vba/vbaoleobject.cxx sc/source/ui/vba/vbaoleobject.cxx
-index cbd1669..3819656 100644
---- sc/source/ui/vba/vbaoleobject.cxx
-+++ sc/source/ui/vba/vbaoleobject.cxx
-@@ -33,6 +33,7 @@
- #include <com/sun/star/view/XControlAccess.hpp>
- #include <com/sun/star/container/XChild.hpp>
- #include <com/sun/star/drawing/XShape.hpp>
-+#include <ooo/vba/XControlProvider.hpp>
- 
- #include "vbaoleobject.hxx"
- 
-@@ -61,8 +62,9 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen
-     xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW );
-     xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW );
-     css::uno::Reference< css::frame::XModel > xModel( xChild->getParent(), uno::UNO_QUERY_THROW );
--    css::uno::Reference< css::view::XControlAccess > xControlAccess( xModel->getCurrentController(), css::uno::UNO_QUERY_THROW );
--    m_xWindowPeer = xControlAccess->getControl( xControlModel )->getPeer();
-+    uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+    uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
-+    m_xControl.set( xControlProvider->createControl(  xControlShape, xModel ) );
- }
- 
- uno::Reference< uno::XInterface > SAL_CALL 
-@@ -74,98 +76,76 @@ ScVbaOLEObject::getObject() throw (uno::RuntimeException)
- sal_Bool SAL_CALL 
- ScVbaOLEObject::getEnabled() throw (uno::RuntimeException)
- {
--    uno::Reference< css::awt::XWindow2 > xWindow2( m_xWindowPeer, css::uno::UNO_QUERY_THROW );
--    return xWindow2->isEnabled();
-+    return m_xControl->getEnabled();
- }
- 
- void SAL_CALL 
- ScVbaOLEObject::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException)
- {
--    uno::Reference< css::awt::XWindow2 > xWindow2( m_xWindowPeer, css::uno::UNO_QUERY_THROW );
--    xWindow2->setEnable( _enabled );
-+    m_xControl->setEnabled( _enabled );
- }
- 
- sal_Bool SAL_CALL 
- ScVbaOLEObject::getVisible() throw (uno::RuntimeException)
- {
--    uno::Reference< css::awt::XWindow2 > xWindow2( m_xWindowPeer, css::uno::UNO_QUERY_THROW );
--    return xWindow2->isVisible();
-+    OSL_TRACE("OleObject %s returning visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), m_xControl->getVisible() ? "true" : "false" );
-+    return m_xControl->getVisible();
- }
- 
- void SAL_CALL 
- ScVbaOLEObject::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
- {
--    uno::Reference< css::awt::XWindow2 > xWindow2( m_xWindowPeer, css::uno::UNO_QUERY_THROW );
--    xWindow2->setVisible( _visible );
-+    OSL_TRACE("OleObject %s set visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), _visible ? "true" : "false" );
-+    m_xControl->setVisible( _visible );
- }
- 
- double SAL_CALL 
- ScVbaOLEObject::getLeft() throw (uno::RuntimeException)
- {
--    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
--    return mm2pt( xShape->getPosition().X / 100 );
-+    return m_xControl->getLeft();
- }
- 
- void SAL_CALL 
- ScVbaOLEObject::setLeft( double _left ) throw (uno::RuntimeException)
- {
--    awt::Point oldPosition;
--    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
--    oldPosition = xShape->getPosition();
--    oldPosition.X = pt2mm( _left ) * 100;
--    xShape->setPosition( oldPosition );
-+    m_xControl->setLeft( _left );
- 
- }
- 
- double SAL_CALL 
- ScVbaOLEObject::getTop() throw (uno::RuntimeException)
- {
--    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
--    return mm2pt( xShape->getPosition().Y / 100 );
-+    return m_xControl->getTop();
- }
- 
- void SAL_CALL 
- ScVbaOLEObject::setTop( double _top ) throw (uno::RuntimeException)
- {
--    awt::Point oldPosition;
--    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
--    oldPosition = xShape->getPosition();
--    oldPosition.Y = pt2mm( _top ) * 100;;
--    xShape->setPosition( oldPosition );
-+    m_xControl->setTop( _top );
- }
- 
- double SAL_CALL 
- ScVbaOLEObject::getHeight() throw (uno::RuntimeException)
- {
--    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
--    return mm2pt( xShape->getSize().Height / 100 );//1pt = 1/72in
-+    return m_xControl->getHeight();
- }
- 
- void SAL_CALL 
- ScVbaOLEObject::setHeight( double _height ) throw (uno::RuntimeException)
- {
--    awt::Size oldSize;
--    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
--    oldSize = xShape->getSize();
--    oldSize.Height = pt2mm( _height ) * 100;
--    xShape->setSize( oldSize );
-+    m_xControl->setHeight( _height );
- }
- 
- double SAL_CALL 
- ScVbaOLEObject::getWidth() throw (uno::RuntimeException)
- {
--    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
--    return mm2pt ( xShape->getSize().Width / 100 );
-+    return m_xControl->getWidth();
- }
- 
- void SAL_CALL 
- ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException)
- {
--    awt::Size oldSize;
--    uno::Reference< drawing::XShape > xShape( m_xControlShape, uno::UNO_QUERY_THROW );
--    oldSize = xShape->getSize();
--    oldSize.Width = pt2mm( _width ) * 100;
--    xShape->setSize( oldSize );
-+    m_xControl->setWidth( _width );
- }
- rtl::OUString& 
- ScVbaOLEObject::getServiceImplName()
-diff --git sc/source/ui/vba/vbaoleobject.hxx sc/source/ui/vba/vbaoleobject.hxx
-index 297fcbf..10133aa 100644
---- sc/source/ui/vba/vbaoleobject.hxx
-+++ sc/source/ui/vba/vbaoleobject.hxx
-@@ -32,8 +32,8 @@
- 
- #include <cppuhelper/implbase1.hxx>
- #include <com/sun/star/drawing/XControlShape.hpp>
--#include <com/sun/star/awt/XWindowPeer.hpp>
- #include <ooo/vba/excel/XOLEObject.hpp>
-+#include <ooo/vba/msforms/XControl.hpp>
- 
- #include <vbahelper/vbahelperinterface.hxx>
- 
-@@ -41,11 +41,11 @@ typedef InheritedHelperInterfaceImpl1< ov::excel::XOLEObject > OLEObjectImpl_BAS
- 
- class ScVbaOLEObject : public OLEObjectImpl_BASE
- {
--    css::uno::Reference< css::awt::XWindowPeer > m_xWindowPeer;
- protected:
-     css::uno::Reference< css::drawing::XControlShape > m_xControlShape;
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+    css::uno::Reference< ov::msforms::XControl> m_xControl;
- public:
-     ScVbaOLEObject( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
-             css::uno::Reference< css::drawing::XControlShape > xControlShape );
-diff --git sc/source/ui/vba/vbapagesetup.cxx sc/source/ui/vba/vbapagesetup.cxx
-index a859e74..6ce04c5 100644
---- sc/source/ui/vba/vbapagesetup.cxx
-+++ sc/source/ui/vba/vbapagesetup.cxx
-@@ -53,10 +53,10 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent
- 				const uno::Reference< uno::XComponentContext >& xContext,
- 				const uno::Reference< sheet::XSpreadsheet >& xSheet,
- 				const uno::Reference< frame::XModel >& xModel) throw (uno::RuntimeException):
--	   	ScVbaPageSetup_BASE( xParent, xContext ),
--		mxSheet( xSheet ), mxModel( xModel )
-+	   	ScVbaPageSetup_BASE( xParent, xContext ), mxSheet( xSheet )
- {
-     // query for current page style
-+    mxModel.set( xModel, uno::UNO_QUERY_THROW );
-     uno::Reference< beans::XPropertySet > xSheetProps( mxSheet, uno::UNO_QUERY_THROW );
-     uno::Any aValue = xSheetProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageStyle" )));
-     rtl::OUString aStyleName;
-@@ -66,6 +66,8 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent
-     uno::Reference< container::XNameAccess > xStyleFamilies = xStyleFamiliesSup->getStyleFamilies();
-     uno::Reference< container::XNameAccess > xPageStyle( xStyleFamilies->getByName(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles"))), uno::UNO_QUERY_THROW );
-     mxPageProps.set( xPageStyle->getByName(aStyleName), uno::UNO_QUERY_THROW );
-+    mnOrientLandscape = excel::XlPageOrientation::xlLandscape;
-+    mnOrientPortrait = excel::XlPageOrientation::xlPortrait;
- }		
- 
- rtl::OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException)
-@@ -122,290 +124,24 @@ void SAL_CALL ScVbaPageSetup::setPrintArea( const rtl::OUString& rAreas ) throw
-     }
- }
- 
--double SAL_CALL ScVbaPageSetup::getTopMargin() throw (css::uno::RuntimeException)
--{
--    sal_Bool headerOn = sal_False;
--    sal_Int32 topMargin = 0;
--    sal_Int32 headerHeight = 0;
--
--    try
--    {
--        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")));
--        aValue >>= headerOn;
--
--        aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")));
--        aValue >>= topMargin;
--
--        if( headerOn )
--        {
--            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")));
--            aValue >>= headerHeight;
--            topMargin += headerHeight;
--        }
--    }
--    catch( uno::Exception& )
--    {
--    }
--    
--    return Millimeter::getInPoints( topMargin );
--}
--
--void SAL_CALL ScVbaPageSetup::setTopMargin( double margin ) throw (css::uno::RuntimeException)
--{
--    sal_Int32 topMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
--    sal_Bool headerOn = sal_False;
--    sal_Int32 headerHeight = 0;
--
--    try
--    {
--        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")));
--        aValue >>= headerOn;
--        
--        if( headerOn )
--        {
--            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")));
--            aValue >>= headerHeight;
--            topMargin -= headerHeight;
--        }
--
--        aValue <<= topMargin;
--        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")), aValue );
--    }
--    catch( uno::Exception& )
--    {
--    }
--}
--
--double SAL_CALL ScVbaPageSetup::getBottomMargin() throw (css::uno::RuntimeException)
--{
--    sal_Bool footerOn = sal_False;
--    sal_Int32 bottomMargin = 0;
--    sal_Int32 footerHeight = 0;
--
--    try
--    {
--        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")));
--        aValue >>= footerOn;
--
--        aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")));
--        aValue >>= bottomMargin;
--
--        if( footerOn )
--        {
--            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight")));
--            aValue >>= footerHeight;
--            bottomMargin += footerHeight;
--        }
--    }
--    catch( uno::Exception& )
--    {
--    }
--    
--    return Millimeter::getInPoints( bottomMargin );
--}
--
--void SAL_CALL ScVbaPageSetup::setBottomMargin( double margin ) throw (css::uno::RuntimeException)
--{
--    sal_Int32 bottomMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
--    sal_Bool footerOn = sal_False;
--    sal_Int32 footerHeight = 0;
--
--    try
--    {
--        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")));
--        aValue >>= footerOn;
--        
--        if( footerOn )
--        {
--            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight")));
--            aValue >>= footerHeight;
--            bottomMargin -= footerHeight;
--        }
--
--        aValue <<= bottomMargin;
--        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), aValue );
--    }
--    catch( uno::Exception& )
--    {
--    }
--}
--
--double SAL_CALL ScVbaPageSetup::getRightMargin() throw (css::uno::RuntimeException)
--{
--    sal_Int32 rightMargin = 0;
--    try
--    {
--        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin")));
--        aValue >>= rightMargin;
--    }
--    catch( uno::Exception& )
--    {
--    }
--    
--    return Millimeter::getInPoints( rightMargin );;
--}
--
--void SAL_CALL ScVbaPageSetup::setRightMargin( double margin ) throw (css::uno::RuntimeException)
--{
--    sal_Int32 rightMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
--    try
--    {
--        uno::Any aValue;
--        aValue <<= rightMargin;
--        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin")), aValue );
--    }
--    catch( uno::Exception& )
--    {
--    }
--
--}
--
--double SAL_CALL ScVbaPageSetup::getLeftMargin() throw (css::uno::RuntimeException)
--{
--    sal_Int32 leftMargin = 0;
--    try
--    {
--        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin")));
--        aValue >>= leftMargin;
--    }
--    catch( uno::Exception& )
--    {
--    }
--    
--    return Millimeter::getInPoints( leftMargin );;
--}
--
--void SAL_CALL ScVbaPageSetup::setLeftMargin( double margin ) throw (css::uno::RuntimeException)
--{
--    sal_Int32 leftMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
--    try
--    {
--        uno::Any aValue;
--        aValue <<= leftMargin;
--        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin")), aValue );
--    }
--    catch( uno::Exception& )
--    {
--    }
--}
--
- double SAL_CALL ScVbaPageSetup::getHeaderMargin() throw (css::uno::RuntimeException)
- {
--    sal_Int32 headerMargin = 0;
--    try
--    {
--        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")));
--        aValue >>= headerMargin;
--    }
--    catch( uno::Exception& )
--    {
--    }
--    
--    return Millimeter::getInPoints( headerMargin );;
-+    return VbaPageSetupBase::getHeaderMargin();
- }
- 
- void SAL_CALL ScVbaPageSetup::setHeaderMargin( double margin ) throw (css::uno::RuntimeException)
- {
--    sal_Int32 headerMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
--    try
--    {
--        uno::Any aValue;
--        aValue <<= headerMargin;
--        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")), aValue );
--    }
--    catch( uno::Exception& )
--    {
--    }
-+    VbaPageSetupBase::setHeaderMargin( margin );
- }
- 
- double SAL_CALL ScVbaPageSetup::getFooterMargin() throw (css::uno::RuntimeException)
- {
--    sal_Int32 footerMargin = 0;
--    try
--    {
--        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")));
--        aValue >>= footerMargin;
--    }
--    catch( uno::Exception& )
--    {
--    }
--    
--    return Millimeter::getInPoints( footerMargin );;
-+    return VbaPageSetupBase::getFooterMargin();
- }
- 
- void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) throw (css::uno::RuntimeException)
- {
--    sal_Int32 footerMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
--    try
--    {
--        uno::Any aValue;
--        aValue <<= footerMargin;
--        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), aValue );
--    }
--    catch( uno::Exception& )
--    {
--    }
--}
--
--sal_Int32 SAL_CALL ScVbaPageSetup::getOrientation() throw (css::uno::RuntimeException)
--{
--    sal_Int32 orientation = excel::XlPageOrientation::xlPortrait;
--    try
--    {
--        sal_Bool isLandscape = sal_False;
--        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")));
--        aValue >>= isLandscape;
--
--        if( isLandscape )
--        {
--            orientation = excel::XlPageOrientation::xlLandscape;
--        }
--    }
--    catch( uno::Exception& )
--    {
--    }
--    return orientation;
--}
--
--void SAL_CALL ScVbaPageSetup::setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException)
--{
--    if( ( orientation != excel::XlPageOrientation::xlPortrait ) &&
--        ( orientation != excel::XlPageOrientation::xlLandscape ) )
--    {
--        DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
--    }
--
--    try
--    {
--        sal_Bool isLandscape = sal_False;
--        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")));
--        aValue >>= isLandscape;
--
--        sal_Bool switchOrientation = sal_False;
--        if(( isLandscape && orientation != excel::XlPageOrientation::xlLandscape ) || 
--            ( !isLandscape && orientation != excel::XlPageOrientation::xlPortrait ))
--        {
--            switchOrientation = sal_True;
--        }
--
--        if( switchOrientation )
--        {
--            aValue <<= !isLandscape;
--            uno::Any aHeight = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height")));
--            uno::Any aWidth = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width")));
--            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")), aValue );
--            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width")),  aHeight );
--            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height")), aWidth );
--        }
--
--        if( isLandscape )
--        {
--            orientation = excel::XlPageOrientation::xlLandscape;
--        }
--    }
--    catch( uno::Exception& )
--    {
--    }
-+    VbaPageSetupBase::setFooterMargin( margin );
- }
- 
- uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() throw (css::uno::RuntimeException)
-diff --git sc/source/ui/vba/vbapagesetup.hxx sc/source/ui/vba/vbapagesetup.hxx
-index 0026197..59608cf 100644
---- sc/source/ui/vba/vbapagesetup.hxx
-+++ sc/source/ui/vba/vbapagesetup.hxx
-@@ -36,38 +36,27 @@
- #include <com/sun/star/sheet/XSpreadsheet.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbapagesetupbase.hxx>
- 
--typedef InheritedHelperInterfaceImpl1< ov::excel::XPageSetup > ScVbaPageSetup_BASE;
-+typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ov::excel::XPageSetup > ScVbaPageSetup_BASE;
- 
- class ScVbaPageSetup :  public ScVbaPageSetup_BASE 
- {
-     css::uno::Reference< css::sheet::XSpreadsheet > mxSheet;
--    css::uno::Reference< css::beans::XPropertySet > mxPageProps;
--    css::uno::Reference< css::frame::XModel > mxModel;
- public:
- 	ScVbaPageSetup( const css::uno::Reference< ov::XHelperInterface >& xParent, 
-                     const css::uno::Reference< css::uno::XComponentContext >& xContext,
- 		            const css::uno::Reference< css::sheet::XSpreadsheet>& xSheet,
--                    const css::uno::Reference< css::frame::XModel >& xModlel) throw (css::uno::RuntimeException); 
-+                    const css::uno::Reference< css::frame::XModel >& xModel) throw (css::uno::RuntimeException); 
- 	virtual ~ScVbaPageSetup(){}
-     
-     // Attribute
- 	virtual rtl::OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException);
- 	virtual void SAL_CALL setPrintArea( const rtl::OUString& rAreas ) throw (css::uno::RuntimeException);
--	virtual double SAL_CALL getTopMargin() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setTopMargin( double margin ) throw (css::uno::RuntimeException);
--	virtual double SAL_CALL getBottomMargin() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setBottomMargin( double margin ) throw (css::uno::RuntimeException);
--	virtual double SAL_CALL getRightMargin() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setRightMargin( double margin ) throw (css::uno::RuntimeException);
--	virtual double SAL_CALL getLeftMargin() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setLeftMargin( double margin ) throw (css::uno::RuntimeException);
--	virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException);
--	virtual double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException);
--	virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException);
--	virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException);
-+    void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException);
-+    double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException);
-+    void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL getFitToPagesTall() throw (css::uno::RuntimeException);
- 	virtual void SAL_CALL setFitToPagesTall( const css::uno::Any& fitToPagesTall ) throw (css::uno::RuntimeException);
- 	virtual css::uno::Any SAL_CALL getFitToPagesWide() throw (css::uno::RuntimeException);
-diff --git sc/source/ui/vba/vbapalette.cxx sc/source/ui/vba/vbapalette.cxx
-index 8f32414..d5764e5 100644
---- sc/source/ui/vba/vbapalette.cxx
-+++ sc/source/ui/vba/vbapalette.cxx
-@@ -92,7 +92,7 @@ ScVbaPalette::getDefaultPalette()
- }
- 
- uno::Reference< container::XIndexAccess >
--ScVbaPalette::getPalette()
-+ScVbaPalette::getPalette() const
- {
- 	uno::Reference< container::XIndexAccess > xIndex;
- 	uno::Reference< beans::XPropertySet > xProps;
-diff --git sc/source/ui/vba/vbapalette.hxx sc/source/ui/vba/vbapalette.hxx
-index af41d2f..dc740ce 100644
---- sc/source/ui/vba/vbapalette.hxx
-+++ sc/source/ui/vba/vbapalette.hxx
-@@ -42,7 +42,7 @@ public:
- 	ScVbaPalette(  SfxObjectShell* pShell = NULL ) : m_pShell( pShell ){}
- 	// if no palette available e.g. because the document doesn't have a 
- 	// palette defined then a default palette will be returned.
--	css::uno::Reference< css::container::XIndexAccess > getPalette();
-+	css::uno::Reference< css::container::XIndexAccess > getPalette() const;
- 	static css::uno::Reference< css::container::XIndexAccess > getDefaultPalette();
- };
- 
-diff --git sc/source/ui/vba/vbapictureformat.cxx sc/source/ui/vba/vbapictureformat.cxx
-deleted file mode 100644
-index 2663682..0000000
---- sc/source/ui/vba/vbapictureformat.cxx
-+++ /dev/null
-@@ -1,147 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbapictureformat.cxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include "vbapictureformat.hxx"
--
--using namespace ooo::vba;
--using namespace com::sun::star;
--
--ScVbaPictureFormat::ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent,
--    const css::uno::Reference< css::uno::XComponentContext >& xContext,
--    uno::Reference< drawing::XShape > xShape ) 
--    throw( lang::IllegalArgumentException ) : ScVbaPictureFormat_BASE( xParent, xContext ), m_xShape( xShape )
--{
--    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
--}
--
--void
--ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException)
--{
--    if( nRange < nMin )
--    {
--        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter out of range, value is too small.") , uno::Reference< uno::XInterface >() );
--    }
--    if( nRange > nMax )
--    {
--        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter out of range, value is too high.") , uno::Reference< uno::XInterface >() );
--    }
--}
--
--// Attributes
--double SAL_CALL 
--ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException)
--{
--    sal_Int16 nLuminance = 0;
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance") ) >>= nLuminance;
--    double fBrightness = static_cast< double >( nLuminance );
--    fBrightness = ( fBrightness +100 ) / 200;
--    return fBrightness; 
--}
--
--void SAL_CALL 
--ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeException)
--{
--    checkParameterRangeInDouble( _brightness, 0.0, 1.0 );
--    double fLuminance = _brightness * 200 - 100;
--    sal_Int16 nLuminance = static_cast< sal_Int16 >( fLuminance );
--    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance"), uno::makeAny( nLuminance ) ); 
--}
--
--double SAL_CALL 
--ScVbaPictureFormat::getContrast() throw (uno::RuntimeException)
--{
--    sal_Int16 nContrast = 0;
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustContrast") ) >>= nContrast;
--    double fContrast = static_cast< double >( nContrast );
--    fContrast = ( fContrast + 100 ) / 200;
--    return fContrast;
--}
--
--void SAL_CALL 
--ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException)
--{
--    checkParameterRangeInDouble( _contrast, 0.0, 1.0 );
--    double fContrast = _contrast * 200 - 100;
--    sal_Int16 nContrast = static_cast< sal_Int16 >( fContrast );
--    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustContrast"), uno::makeAny( nContrast ) );
--}
--
--
--// Methods
--void SAL_CALL 
--ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeException)
--{
--    double fBrightness = getBrightness();
--    fBrightness += increment;
--    if( fBrightness < 0 )
--    {
--        fBrightness = 0.0;
--    }
--    if( fBrightness > 1 )
--    {
--        fBrightness = 1;
--    }
--    setBrightness( fBrightness );
--}
--
--void SAL_CALL 
--ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeException)
--{
--    double nContrast = getContrast();
--    nContrast += increment;
--    if( increment < 0 )
--    {
--        increment = 0.0;
--    }
--    if( increment > 1 )
--    {
--        increment = 1.0;
--    }
--    setContrast( nContrast );
--}
--
--
--rtl::OUString&
--ScVbaPictureFormat::getServiceImplName()
--{
--    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPictureFormat") );
--    return sImplName;
--}
--
--uno::Sequence< rtl::OUString >
--ScVbaPictureFormat::getServiceNames()
--{
--    static uno::Sequence< rtl::OUString > aServiceNames;
--    if ( aServiceNames.getLength() == 0 )
--    {
--        aServiceNames.realloc( 1 );
--        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.PictureFormat" ) );
--    }
--    return aServiceNames;
--}
-diff --git sc/source/ui/vba/vbapictureformat.hxx sc/source/ui/vba/vbapictureformat.hxx
-deleted file mode 100644
-index a549b88..0000000
---- sc/source/ui/vba/vbapictureformat.hxx
-+++ /dev/null
-@@ -1,64 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbapictureformat.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_PICTUREFORMAT_HXX
--#define SC_VBA_PICTUREFORMAT_HXX
--
--#include <com/sun/star/drawing/XShape.hpp>
--#include <com/sun/star/beans/XPropertySet.hpp>
--#include <ooo/vba/msforms/XPictureFormat.hpp>
--#include <vbahelper/vbahelperinterface.hxx>
--
--typedef InheritedHelperInterfaceImpl1< ov::msforms::XPictureFormat > ScVbaPictureFormat_BASE;
--
--class ScVbaPictureFormat : public ScVbaPictureFormat_BASE
--{
--private:
--    css::uno::Reference< css::drawing::XShape > m_xShape;
--    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
--protected:
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--private:
--    void checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException);
--public:
--    ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::drawing::XShape > xShape ) throw( css::lang::IllegalArgumentException );
--
--    // Attributes
--    virtual double SAL_CALL getBrightness() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setBrightness( double _brightness ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getContrast() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setContrast( double _contrast ) throw (css::uno::RuntimeException);
--
--    // Methods
--    virtual void SAL_CALL IncrementBrightness( double increment ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL IncrementContrast( double increment ) throw (css::uno::RuntimeException);
--};
--
--#endif//SC_VBA_PICTUREFORMAT_HXX
-diff --git sc/source/ui/vba/vbashape.cxx sc/source/ui/vba/vbashape.cxx
-deleted file mode 100644
-index ec13479..0000000
---- sc/source/ui/vba/vbashape.cxx
-+++ /dev/null
-@@ -1,472 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbashape.cxx,v $
-- * $Revision: 1.4 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include<ooo/vba/office/MsoZOrderCmd.hpp>
--#include<ooo/vba/office/MsoScaleFrom.hpp>
--#include<com/sun/star/container/XNamed.hpp>
--#include<com/sun/star/drawing/ConnectorType.hpp>
--#include <com/sun/star/lang/XEventListener.hpp>
--#include<com/sun/star/drawing/XDrawPagesSupplier.hpp>
--#include<com/sun/star/drawing/XDrawPages.hpp>
--
--#include <vos/mutex.hxx>
--#include <vcl/svapp.hxx>
--#include <svx/unopage.hxx>
--#include <svx/unoshape.hxx>
--
--#include "vbashape.hxx"
--#include "vbatextframe.hxx"
--#include "vbalineformat.hxx"
--#include "vbafillformat.hxx"
--#include "vbapictureformat.hxx"
--
--using namespace ::ooo::vba;
--using namespace ::com::sun::star;
--using namespace ::vos;
--
--ScVbaShape::ScVbaShape( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, sal_Int32 nType ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( xParent, xContext ), m_xShape( xShape ), m_xShapes( xShapes ), m_nType( nType )
--{
--    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
--    m_pShapeHelper.reset( new ShapeHelper( m_xShape ) );
--    addListeners();
--}
--
--ScVbaShape::ScVbaShape( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( uno::Reference< XHelperInterface >(), xContext ), m_xShape( xShape )
--{
--    // add listener
--    addListeners();
--}
--
--ScVbaShape::~ScVbaShape()
--{ 
--    // dtor must never ever throw
--    try
--    {
--        removeShapeListener();
--        removeShapesListener();
--    }
--    catch( uno::Exception& )
--    {
--    }    
--}
--
--void SAL_CALL 
--ScVbaShape::disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException )
--{
--    uno::Reference< drawing::XShapes > xShapes( rEventObject.Source, uno::UNO_QUERY );
--    uno::Reference< drawing::XShape > xShape( rEventObject.Source, uno::UNO_QUERY );
--    if ( xShapes.is() )
--        removeShapesListener();
--    if ( xShape.is() )
--        removeShapeListener();
--}
--
--
--void ScVbaShape::addListeners()
--{
--    uno::Reference< lang::XComponent > xComponent( m_xShape, uno::UNO_QUERY );
--    if ( xComponent.is() )
--    	xComponent->addEventListener( this );
--
--    xComponent.set( m_xShapes, uno::UNO_QUERY );
--    if ( xComponent.is() )
--    	xComponent->addEventListener( this );
--}
--
--void
--ScVbaShape::removeShapeListener() throw( uno::RuntimeException )
--{
--    if( m_xShape.is() )
--    {
--        uno::Reference< lang::XComponent > xComponent( m_xShape, uno::UNO_QUERY_THROW );
--        xComponent->removeEventListener( this );
--    }
--    m_xShape = NULL;
--    m_xPropertySet = NULL;
--}
--
--void
--ScVbaShape::removeShapesListener() throw( uno::RuntimeException )
--{
--    if( m_xShapes.is() )
--    {
--        uno::Reference< lang::XComponent > xComponent( m_xShapes, uno::UNO_QUERY_THROW );
--        xComponent->removeEventListener( this );
--    }
--    m_xShapes = NULL;
--}
--
--sal_Int32 
--ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw (uno::RuntimeException)
--{
--    rtl::OUString sShapeType;
--    uno::Reference< drawing::XShapeDescriptor > xShapeDescriptor( xShape, uno::UNO_QUERY_THROW );
--    sShapeType = xShapeDescriptor->getShapeType();
--    // office::MsoShapeType::msoDiagram to "com.sun.star.drawing.GroupShape"
--    if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.GroupShape" ) ) )
--        return office::MsoShapeType::msoGroup;
--    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) ) )
--        return office::MsoShapeType::msoPicture;
--    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ControlShape" ) ) )
--        return office::MsoShapeType::msoOLEControlObject;
--    // OOo don't support office::MsoShapeType::msoComment as a Shape.
--    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.OLE2Shape" ) ) )
--        return office::MsoShapeType::msoChart;
--    // Art characters office::MsoShapeType::msoTextEffect, in OOo corresponding to "com.sun.star.drawing.CustomShape"
--    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ConnectorShape" ) ) )
--    {
--        enum drawing::ConnectorType connectorType;
--        uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
--        xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("EdgeKind")) >>= connectorType;
--        if( connectorType == drawing::ConnectorType_CURVE )
--            return office::MsoShapeType::msoFreeform;
--        else if( connectorType == drawing::ConnectorType_LINE )
--            return office::MsoShapeType::msoLine;
--        else 
--            return office::MsoShapeType::msoAutoShape;
--    }
--    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.LineShape" ) ) )
--        return office::MsoShapeType::msoLine;
--    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.CustomShape" ) ) ||
--            sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape") ) )
--        return office::MsoShapeType::msoAutoShape;
--    else
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "the shape type do not be surppored: " ) + sShapeType, uno::Reference< uno::XInterface >() );
--}
--
--// Attributes
--rtl::OUString SAL_CALL 
--ScVbaShape::getName() throw (uno::RuntimeException)
--{
--    rtl::OUString sName;
--    uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW );
--    sName = xNamed->getName();
--    return sName;
--}
--
--void SAL_CALL 
--ScVbaShape::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
--{
--    uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW );
--    xNamed->setName( _name );
--}
--
--double SAL_CALL 
--ScVbaShape::getHeight() throw (uno::RuntimeException)
--{
--    return m_pShapeHelper->getHeight();
--}
--
--void SAL_CALL 
--ScVbaShape::setHeight( double _height ) throw (uno::RuntimeException)
--{
--    m_pShapeHelper->setHeight( _height );
--}
--
--double SAL_CALL 
--ScVbaShape::getWidth() throw (uno::RuntimeException)
--{
--    return m_pShapeHelper->getWidth();
--}
--
--void SAL_CALL 
--ScVbaShape::setWidth( double _width ) throw (uno::RuntimeException)
--{
--    m_pShapeHelper->setWidth( _width );
--}
--
--double SAL_CALL 
--ScVbaShape::getLeft() throw (uno::RuntimeException)
--{
--    return m_pShapeHelper->getLeft();
--}
--
--void SAL_CALL 
--ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException)
--{
--    m_pShapeHelper->setLeft( _left );
--}
--
--double SAL_CALL 
--ScVbaShape::getTop() throw (uno::RuntimeException)
--{
--    return m_pShapeHelper->getTop();
--}
--
--void SAL_CALL 
--ScVbaShape::setTop( double _top ) throw (uno::RuntimeException)
--{
--    return m_pShapeHelper->setTop( _top );
--}
--
--sal_Bool SAL_CALL 
--ScVbaShape::getVisible() throw (uno::RuntimeException)
--{
--    //UNO Shapes are always visible
--    return sal_True;
--}
--
--void SAL_CALL 
--ScVbaShape::setVisible( sal_Bool /*_visible*/ ) throw (uno::RuntimeException)
--{
--    //UNO Shapes are always visible
--}
--
--sal_Int32 SAL_CALL 
--ScVbaShape::getZOrderPosition() throw (uno::RuntimeException)
--{
--    sal_Int32 nZOrderPosition = 0;
--    uno::Any aZOrderPosition =  m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ) );
--    aZOrderPosition >>= nZOrderPosition;
--    return nZOrderPosition + 1;
--}
--
--sal_Int32 SAL_CALL 
--ScVbaShape::getType() throw (uno::RuntimeException)
--{
--    return m_nType;
--}
--
--double SAL_CALL 
--ScVbaShape::getRotation() throw (uno::RuntimeException)
--{
--    double dRotation = 0;
--    sal_Int32 nRotation = 0;
--    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "RotateAngle" ) ) >>= nRotation;
--    dRotation = static_cast< double >( nRotation /100 );
--    return dRotation;
--}
--
--void SAL_CALL 
--ScVbaShape::setRotation( double _rotation ) throw (uno::RuntimeException)
--{
--    sal_Int32 nRotation = static_cast < sal_Int32 > ( _rotation * 100 );
--    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "RotateAngle" ), uno::makeAny( nRotation ) );
--}
--
--uno::Reference< msforms::XLineFormat > SAL_CALL 
--ScVbaShape::getLine() throw (uno::RuntimeException)
--{
--    // TODO should ongly return line
--    return uno::Reference< msforms::XLineFormat >( new ScVbaLineFormat( this, mxContext, m_xShape ) );
--}
--
--uno::Reference< msforms::XFillFormat > SAL_CALL
--ScVbaShape::getFill() throw (uno::RuntimeException)
--{
--    return uno::Reference< msforms::XFillFormat >( new ScVbaFillFormat( this, mxContext, m_xShape ) );
--}
--
--uno::Reference<  msforms::XPictureFormat > SAL_CALL
--ScVbaShape::getPictureFormat() throw (uno::RuntimeException)
--{
--    return uno::Reference< msforms::XPictureFormat >( new ScVbaPictureFormat( this, mxContext, m_xShape ) );
--}
--
--// Methods
--uno::Reference< excel::XTextFrame > SAL_CALL 
--ScVbaShape::TextFrame() throw (uno::RuntimeException)
--{
--    return uno::Reference< excel::XTextFrame >(new ScVbaTextFrame( getParent(), mxContext, m_xShape ) );
--}
--
--void SAL_CALL 
--ScVbaShape::Delete() throw (uno::RuntimeException)
--{
--    OGuard aGuard( Application::GetSolarMutex() );
--    m_xShapes->remove( m_xShape );
--}
--
--void SAL_CALL 
--ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException)
--{
--    sal_Int32 nOrderPositon;
--    uno::Any aOrderPostion = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ) );
--    aOrderPostion >>= nOrderPositon;
--    switch( ZOrderCmd )
--    {
--    case office::MsoZOrderCmd::msoBringToFront:
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( SAL_MAX_INT32 ) );
--        break;
--    case office::MsoZOrderCmd::msoSendToBack:
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( (sal_Int32)0 ) );
--        break;
--    case office::MsoZOrderCmd::msoBringForward:
--        nOrderPositon += 1;
--        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( nOrderPositon ) );
--        break;
--    case office::MsoZOrderCmd::msoSendBackward:
--        if( nOrderPositon > 0 )
--        {
--            nOrderPositon -= 1;
--            m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( nOrderPositon ) );
--        }
--        break;
--    // below two commands use with Writer for text and image object.
--    case office::MsoZOrderCmd::msoBringInFrontOfText:
--    case office::MsoZOrderCmd::msoSendBehindText:
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "This ZOrderCmd is not implemented, it is use with writer." ), uno::Reference< uno::XInterface >() );
--    default:
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Parameter." ), uno::Reference< uno::XInterface >() );
--    }
--}
--
--void SAL_CALL 
--ScVbaShape::IncrementRotation( double Increment ) throw (uno::RuntimeException)
--{
--    double nCurrentRotation = getRotation();
--    nCurrentRotation += Increment;
--    setRotation(nCurrentRotation);
--}
--
--void SAL_CALL 
--ScVbaShape::IncrementLeft( double Increment ) throw (uno::RuntimeException)
--{
--    double nCurrentLeft = getLeft();
--    nCurrentLeft += Increment;
--    setLeft(nCurrentLeft);
--}
--
--void SAL_CALL 
--ScVbaShape::IncrementTop( double Increment ) throw (uno::RuntimeException)
--{
--    double nCurrentTop = getTop();
--    nCurrentTop += Increment;
--    setTop(nCurrentTop);
--}
--
--void SAL_CALL 
--ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException)
--{
--    double nHeight = getHeight();
--    double nNewHeight = nHeight * Factor;
--    if( Scale == office::MsoScaleFrom::msoScaleFromTopLeft )
--    {
--        setHeight(nNewHeight);
--    }
--    else if( Scale == office::MsoScaleFrom::msoScaleFromBottomRight )
--    {
--        double nDeltaHeight = nNewHeight - nHeight;
--        double nNewTop = getTop() - nDeltaHeight;
--        setTop(nNewTop);
--        setHeight(nNewHeight);
--    }
--    else if( Scale == office::MsoScaleFrom::msoScaleFromMiddle )
--    {
--        double nDeltaHeight = (nNewHeight - nHeight) / 2;
--        double nNewTop = getTop() - nDeltaHeight;
--        setTop(nNewTop);
--        setHeight(nNewHeight);
--    }
--    else
--    {
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "ScaleHeight.Scale wrong value is given." ) , uno::Reference< uno::XInterface >() );
--    }
--}
--
--void SAL_CALL 
--ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException)
--{
--    double nWidth = getWidth();
--    double nNewWidth = nWidth * Factor;
--    if( Scale == office::MsoScaleFrom::msoScaleFromTopLeft )
--    {
--        setWidth(nNewWidth);
--    }
--    else if( Scale == office::MsoScaleFrom::msoScaleFromBottomRight )
--    {
--        double nDeltaWidth = nNewWidth - nWidth;
--        double nNewLeft = getLeft() - nDeltaWidth;
--        setLeft(nNewLeft);
--        setWidth(nNewWidth);
--    }
--    else if( Scale == office::MsoScaleFrom::msoScaleFromMiddle )
--    {
--        double nDeltaWidth = (nNewWidth - nWidth) / 2;
--        double nNewLeft = getLeft() - nDeltaWidth;
--        setLeft(nNewLeft);
--        setWidth(nNewWidth);
--    }
--    else
--    {
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "ScaleHeight.Scale wrong value is given." ) , uno::Reference< uno::XInterface >() );
--    }
--}
--
--void SAL_CALL
--ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException )
--{
--	// #FIXME don't use getCurrentDocument
--    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
--    xSelectSupp->select( uno::makeAny( m_xShape ) );
--}
--
--// This method should not be part of Shape, what we reall need to do is...
--// dynamically create the appropriate objects e.g. TextBox, Oval, Picture etc. 
--// ( e.g. the ones that really do have ShapeRange as an attribute )
--#include "vbashaperange.hxx"
--
--uno::Any SAL_CALL 
--ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException )
--{
--	// perhaps we should store a reference to the Shapes Collection 
--	// in this class
--	// but anyway this method should not even be in this class
--	// #TODO not sure what the parent of the Shapes collection should be
--	
--	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec aVec;
--	aVec.push_back( m_xShape );
--	uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( aVec ) );
--	uno::Reference< container::XChild > xChild( m_xShape, uno::UNO_QUERY_THROW );	
--	// #FIXME for want of a better parent, setting this
--	uno::Reference< msforms::XShapeRange > xShapeRange( new ScVbaShapeRange( mxParent, mxContext, xIndexAccess,  uno::Reference< drawing::XDrawPage >( xChild->getParent(), uno::UNO_QUERY_THROW ) ) );
--	if ( index.hasValue() )
--		return xShapeRange->Item( index, uno::Any() );
--	return uno::makeAny( xShapeRange );
--}
--
--rtl::OUString& 
--ScVbaShape::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShape") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaShape::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Shape" ) );
--	}
--	return aServiceNames;
--}
-diff --git sc/source/ui/vba/vbashape.hxx sc/source/ui/vba/vbashape.hxx
-deleted file mode 100644
-index eb48b93..0000000
---- sc/source/ui/vba/vbashape.hxx
-+++ /dev/null
-@@ -1,108 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbashape.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_SHAPE_HXX
--#define SC_VBA_SHAPE_HXX
--
--#include <ooo/vba/office/MsoShapeType.hpp>
--#include <com/sun/star/drawing/XShape.hpp>
--#include <com/sun/star/drawing/XShapes.hpp>
--#include <com/sun/star/lang/XEventListener.hpp>
--#include <com/sun/star/beans/XPropertySet.hpp>
--#include <ooo/vba/msforms/XShape.hpp>
--#include <ooo/vba/msforms/XLineFormat.hpp>
--#include <cppuhelper/implbase2.hxx>
--
--#include <vbahelper/vbahelperinterface.hxx>
--
--typedef  ::cppu::WeakImplHelper2< ov::msforms::XShape, css::lang::XEventListener > ListeningShape;
--
--typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE;
--
--class ScVbaShape : public ScVbaShape_BASE
--{
--private:
--protected:
--    std::auto_ptr< ov::ShapeHelper > m_pShapeHelper;
--    css::uno::Reference< css::drawing::XShape > m_xShape;
--    css::uno::Reference< css::drawing::XShapes > m_xShapes;
--    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
--    sal_Int32 m_nType;
--    css::uno::Any m_aRange;
--	virtual void addListeners();
--	virtual void removeShapeListener() throw( css::uno::RuntimeException );
--	virtual void removeShapesListener() throw( css::uno::RuntimeException );
--	virtual rtl::OUString& getServiceImplName();
--	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--public:
--    ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, sal_Int32 nType ) throw ( css::lang::IllegalArgumentException );
--    ScVbaShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape ) throw ( css::lang::IllegalArgumentException );
--    virtual ~ScVbaShape();
--    css::uno::Any getRange() { return m_aRange; };
--    void setRange( css::uno::Any aRange ) { m_aRange = aRange; };
--
--    static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException);
--
--    // Attributes
--    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
--    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getZOrderPosition() throw (css::uno::RuntimeException);
--    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
--    virtual double SAL_CALL getRotation() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setRotation( double _rotation ) throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< ov::msforms::XPictureFormat > SAL_CALL getPictureFormat() throw (css::uno::RuntimeException);
--
--    // Methods
--    virtual css::uno::Reference< ov::excel::XTextFrame > SAL_CALL TextFrame(  ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL Delete() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL ScaleHeight( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL ScaleWidth( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException);
--    // Replace??
--    virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL ShapeRange( const css::uno::Any& index ) throw ( css::uno::RuntimeException );
--    // XEventListener
--    virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) throw( css::uno::RuntimeException );
--};
--#endif//SC_VBA_SHAPE_HXX
-diff --git sc/source/ui/vba/vbashaperange.cxx sc/source/ui/vba/vbashaperange.cxx
-deleted file mode 100644
-index 5890e43..0000000
---- sc/source/ui/vba/vbashaperange.cxx
-+++ /dev/null
-@@ -1,172 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbashaperange.cxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include <com/sun/star/drawing/XShapeGrouper.hpp>
--#include <com/sun/star/drawing/XDrawPage.hpp>
--
--#include "excelvbahelper.hxx"
--#include "vbashaperange.hxx"
--#include "vbashape.hxx"
--
--using namespace ::ooo::vba;
--using namespace ::com::sun::star;
--
--class VbShapeRangeEnumHelper : public EnumerationHelper_BASE
--{
--        uno::Reference< XCollection > m_xParent;
--        uno::Reference<container::XIndexAccess > m_xIndexAccess;
--        sal_Int32 nIndex;
--public:
--	VbShapeRangeEnumHelper( const uno::Reference< XCollection >& xParent,  const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
--        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
--        {
--                return ( nIndex < m_xIndexAccess->getCount() );
--        }
--        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
--        {
--                ScVbaShapeRange* pCollectionImpl = dynamic_cast< ScVbaShapeRange* >(m_xParent.get());
--                if ( pCollectionImpl && hasMoreElements() )
--                    return pCollectionImpl->createCollectionObject(  m_xIndexAccess->getByIndex( nIndex++ ) );
--                throw container::NoSuchElementException();
--        }
--
--};
--
--ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xShapes, const uno::Reference< drawing::XDrawPage >& xDrawPage ) : ScVbaShapeRange_BASE( xParent, xContext, xShapes ), m_xDrawPage( xDrawPage ), m_nShapeGroupCount(0)
--{
--}
--
--// Methods
--void SAL_CALL 
--ScVbaShapeRange::Select(  ) throw (uno::RuntimeException)
--{
--	// #FIXME don't use getCurrentDocument
--    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
--    xSelectSupp->select( uno::makeAny( getShapes() ) );
--}
--
--uno::Reference< msforms::XShape > SAL_CALL 
--ScVbaShapeRange::Group() throw (uno::RuntimeException)
--{
--    uno::Reference< drawing::XShapeGrouper > xShapeGrouper( m_xDrawPage, uno::UNO_QUERY_THROW );
--    uno::Reference< drawing::XShapeGroup > xShapeGroup( xShapeGrouper->group( getShapes() ), uno::UNO_QUERY_THROW );
--    uno::Reference< drawing::XShape > xShape( xShapeGroup, uno::UNO_QUERY_THROW );
--    return uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, getShapes(), office::MsoShapeType::msoGroup ) );
--}
--
--uno::Reference< drawing::XShapes > 
--ScVbaShapeRange::getShapes() throw (uno::RuntimeException)
--{
--	if ( !m_xShapes.is() )
--	{
--		uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
--		m_xShapes.set( xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.drawing.ShapeCollection" ) ), uno::UNO_QUERY_THROW );
--		sal_Int32 nLen = m_xIndexAccess->getCount();
--		for ( sal_Int32 index = 0; index < nLen; ++index )
--			m_xShapes->add( uno::Reference< drawing::XShape >( m_xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW ) );
--
--	}
--	return m_xShapes;
--}
--
--
--void SAL_CALL 
--ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeException)
--{
--	sal_Int32 nLen = getCount();
--	for ( sal_Int32 index = 1; index <= nLen; ++index )
--	{
--		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
--		xShape->IncrementRotation( Increment );
--	}
--}
--
--void SAL_CALL 
--ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException)
--{
--	sal_Int32 nLen = getCount();
--	for ( sal_Int32 index = 1; index <= nLen; ++index )
--	{
--		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
--		xShape->IncrementLeft( Increment );
--	}
--}
--
--void SAL_CALL 
--ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException)
--{
--	sal_Int32 nLen = getCount();
--	for ( sal_Int32 index = 1; index <= nLen; ++index )
--	{
--		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
--		xShape->IncrementTop( Increment );
--	}
--}
--
--uno::Type SAL_CALL
--ScVbaShapeRange::getElementType() throw (uno::RuntimeException)
--{
--    return msforms::XShape::static_type(0);
--}
--
--uno::Reference< container::XEnumeration > SAL_CALL 
--ScVbaShapeRange::createEnumeration() throw (uno::RuntimeException)
--{
--	return new VbShapeRangeEnumHelper( this, m_xIndexAccess );
--}
--
--uno::Any
--ScVbaShapeRange:: createCollectionObject( const css::uno::Any& aSource )
--{
--	uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW );
--	// #TODO  #FIXME Shape parent should always be the sheet the shapes belong 
--	// to 
--	uno::Reference< msforms::XShape > xVbShape( new ScVbaShape( uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), ScVbaShape::getType( xShape ) ) ); 
--        return uno::makeAny( xVbShape );
--}
--
--rtl::OUString& 
--ScVbaShapeRange::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapeRange") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaShapeRange::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.ShapeRange" ) );
--	}
--	return aServiceNames;
--}
-diff --git sc/source/ui/vba/vbashaperange.hxx sc/source/ui/vba/vbashaperange.hxx
-deleted file mode 100644
-index 540f33d..0000000
---- sc/source/ui/vba/vbashaperange.hxx
-+++ /dev/null
-@@ -1,66 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbashaperange.hxx,v $
-- * $Revision: 1.3 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_SHAPERANGE_HXX
--#define SC_VBA_SHAPERANGE_HXX
--
--#include <com/sun/star/drawing/XShapes.hpp>
--#include <ooo/vba/msforms/XShapeRange.hpp>
--
--#include <vbahelper/vbacollectionimpl.hxx>
--
--typedef CollTestImplHelper< ov::msforms::XShapeRange > ScVbaShapeRange_BASE;
--
--class ScVbaShapeRange : public ScVbaShapeRange_BASE
--{
--private:
--    css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage;
--    css::uno::Reference< css::drawing::XShapes > m_xShapes;
--    sal_Int32 m_nShapeGroupCount;
--protected:
--	virtual rtl::OUString& getServiceImplName();
--	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--	css::uno::Reference< css::drawing::XShapes > getShapes() throw (css::uno::RuntimeException) ;
--public:
--    ScVbaShapeRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XDrawPage>& xDrawShape );
--
--    // Methods
--    virtual void SAL_CALL Select(  ) throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< ::ooo::vba::msforms::XShape > SAL_CALL Group() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException);
--    virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException) ;
--    virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException);
--    //XEnumerationAccess
--    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); 
--    // ScVbaCollectionBaseImpl
--    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
--};
--
--#endif//SC_VBA_SHAPERANGE_HXX
-diff --git sc/source/ui/vba/vbashapes.cxx sc/source/ui/vba/vbashapes.cxx
-deleted file mode 100644
-index c1013ba..0000000
---- sc/source/ui/vba/vbashapes.cxx
-+++ /dev/null
-@@ -1,396 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbashapes.cxx,v $
-- * $Revision: 1.3.32.1 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#include <com/sun/star/container/XNamed.hpp>
--#include <com/sun/star/view/XSelectionSupplier.hpp>
--#include <com/sun/star/text/WrapTextMode.hpp>
--#include <ooo/vba/msforms/XShapeRange.hpp>
--#include <ooo/vba/office/MsoAutoShapeType.hpp>
--
--#include "excelvbahelper.hxx"
--#include "vbashapes.hxx"
--#include "vbashape.hxx"
--#include "vbashaperange.hxx"
--
--using namespace ::ooo::vba;
--using namespace ::com::sun::star;
--
--class VbShapeEnumHelper : public EnumerationHelper_BASE
--{
--        uno::Reference<msforms::XShapes > m_xParent;
--        uno::Reference<container::XIndexAccess > m_xIndexAccess;
--        sal_Int32 nIndex;
--public:
--	VbShapeEnumHelper( const uno::Reference< msforms::XShapes >& xParent,  const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
--        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
--        {
--                return ( nIndex < m_xIndexAccess->getCount() );
--        }
--        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
--        {
--                ScVbaShapes* pShapes = dynamic_cast< ScVbaShapes* >(m_xParent.get());
--                if ( pShapes && hasMoreElements() )
--                    return pShapes->createCollectionObject(  m_xIndexAccess->getByIndex( nIndex++ ) );
--                throw container::NoSuchElementException();
--        }
--
--};
--
--void ScVbaShapes::initBaseCollection()
--{
--	if ( m_xNameAccess.is() ) // already has NameAccess
--		return;
--	// no NameAccess then use ShapeCollectionHelper
--	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec mShapes;
--	sal_Int32 nLen = m_xIndexAccess->getCount();
--	mShapes.reserve( nLen );
--	for ( sal_Int32 index=0; index<nLen; ++index )
--		mShapes.push_back( uno::Reference< drawing::XShape >( m_xIndexAccess->getByIndex( index ) , uno::UNO_QUERY ) );
--	uno::Reference< container::XIndexAccess > xShapes( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) );
--	m_xIndexAccess.set( xShapes, uno::UNO_QUERY );
--	m_xNameAccess.set( xShapes, uno::UNO_QUERY );
--}
--
--ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes ): ScVbaShapes_BASE( xParent, xContext, xShapes ), m_nNewShapeCount(0)
--{
--    m_xShapes.set( xShapes, uno::UNO_QUERY_THROW );
--    m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); 
--    initBaseCollection();
--}
--
--uno::Reference< container::XEnumeration >
--ScVbaShapes::createEnumeration() throw (uno::RuntimeException)
--{
--    return new VbShapeEnumHelper( this,  m_xIndexAccess );
--}
--
--uno::Any
--ScVbaShapes::createCollectionObject( const css::uno::Any& aSource )
--{
--    if( aSource.hasValue() )
--    {
--        uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW );
--        return uno::makeAny( uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) ) ) );
--    }
--    return uno::Any();
--}
--
--uno::Type
--ScVbaShapes::getElementType() throw (uno::RuntimeException)
--{
--    return ooo::vba::msforms::XShape::static_type(0);
--}
--rtl::OUString& 
--ScVbaShapes::getServiceImplName()
--{
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapes") );
--	return sImplName;
--}
--
--uno::Sequence< rtl::OUString > 
--ScVbaShapes::getServiceNames()
--{
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Shapes" ) );
--	}
--	return aServiceNames;
--}
--
--css::uno::Reference< css::container::XIndexAccess > 
--ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index  ) throw (uno::RuntimeException)
--{
--	if ( Index.getValueTypeClass() != uno::TypeClass_SEQUENCE )
--		throw uno::RuntimeException();
--	
--	uno::Reference< script::XTypeConverter > xConverter = getTypeConverter(mxContext);
--	uno::Any aConverted;
--	aConverted = xConverter->convertTo( Index, getCppuType((uno::Sequence< uno::Any >*)0) );
--
--	uno::Sequence< uno::Any > sIndices;
--	aConverted >>= sIndices;
--	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec mShapes;
--	sal_Int32 nElems = sIndices.getLength();
--	for( sal_Int32 index = 0; index < nElems; ++index )
--	{
--		uno::Reference< drawing::XShape > xShape;
--		if ( sIndices[ index ].getValueTypeClass() == uno::TypeClass_STRING )
--		{
--			rtl::OUString sName;
--			sIndices[ index ] >>= sName;
--			xShape.set( m_xNameAccess->getByName( sName ), uno::UNO_QUERY );
--		}
--		else
--		{
--			sal_Int32 nIndex = 0;
--			sIndices[ index ] >>= nIndex;
--			// adjust for 1 based mso indexing
--			xShape.set( m_xIndexAccess->getByIndex( nIndex - 1 ), uno::UNO_QUERY );		
--			
--		}
--		// populate map with drawing::XShapes
--		if ( xShape.is() )
--			mShapes.push_back( xShape );
--	}  
--	uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) );
--	return xIndexAccess;
--}
--
--uno::Any SAL_CALL 
--ScVbaShapes::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::RuntimeException)
--{
--	// I don't think we need to support Array of indices for shapes	
--/*
--	if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE )
--	{
--		uno::Reference< container::XIndexAccess > xIndexAccess( getShapesByArrayIndices( Index ) );
--		// return new collection instance
--		uno::Reference< XCollection > xShapesCollection(  new ScVbaShapes( this->getParent(), mxContext, xIndexAccess ) );
--		return uno::makeAny( xShapesCollection );
--	}
--*/
--	return 	ScVbaShapes_BASE::Item( Index, Index2 );
--}
--
--uno::Reference< msforms::XShapeRange > SAL_CALL 
--ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException)
--{
--	// shapes, can be an index or an array of indices
--	uno::Reference< container::XIndexAccess > xShapes;
--	if ( shapes.getValueTypeClass() == uno::TypeClass_SEQUENCE )
--		xShapes = getShapesByArrayIndices( shapes );
--	else
--	{
--		// wrap single index into a sequence
--		uno::Sequence< uno::Any > sIndices(1);
--		sIndices[ 0 ] = shapes;
--		uno::Any aIndex;
--		aIndex <<= sIndices;
--		xShapes = getShapesByArrayIndices( aIndex );
--	}
--	return new ScVbaShapeRange(  getParent(), mxContext, xShapes, m_xDrawPage );
--}
--
--void SAL_CALL 
--ScVbaShapes::SelectAll() throw (uno::RuntimeException)
--{
--    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
--    try
--    {
--        xSelectSupp->select( uno::makeAny( m_xShapes ) );
--    }
--    // viewuno.cxx ScTabViewObj::select will throw IllegalArgumentException
--    // if one of the shapes is no 'markable' e.g. a button 
--    // the method still works
--    catch( lang::IllegalArgumentException& )
--    {
--    }
--}
--
--uno::Reference< drawing::XShape > 
--ScVbaShapes::createShape( rtl::OUString service ) throw (css::uno::RuntimeException)
--{
--	// #FIXME don't use getCurrentDocument
--    uno::Reference< lang::XMultiServiceFactory > xMSF( getCurrentDocument(), uno::UNO_QUERY_THROW );
--    uno::Reference< drawing::XShape > xShape( xMSF->createInstance( service ), uno::UNO_QUERY_THROW );
--    return xShape;
--}
--
--uno::Any 
--ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException)
--{
--    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape" ) );
--    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
--    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( startY );
--    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
--    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
--
--    uno::Reference< drawing::XShape > xShape( createShape( sCreateShapeName ), uno::UNO_QUERY_THROW );
--    m_xShapes->add( xShape );
--
--    rtl::OUString sName = createName( rtl::OUString::createFromAscii( "Rectangle" ) );
--    setDefaultShapeProperties( xShape );
--    setShape_NameProperty( xShape, sName );
--
--    awt::Point aMovePositionIfRange(0, 0);
--    awt::Point position;
--    position.X = nXPos - aMovePositionIfRange.X;
--    position.Y = nYPos - aMovePositionIfRange.Y;
--    xShape->setPosition( position );
--
--    awt::Size size;
--    size.Height = nHeight;
--    size.Width = nWidth;
--    xShape->setSize( size );
--
--    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
--    pScVbaShape->setRange( aRange ); 
--    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
--}
--
--uno::Any 
--ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException)
--{
--    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.EllipseShape" ) );
--    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
--    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( startY );
--    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
--    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
--
--    uno::Reference< drawing::XShape > xShape( createShape( sCreateShapeName ), uno::UNO_QUERY_THROW );
--    m_xShapes->add( xShape );
--
--    awt::Point aMovePositionIfRange( 0, 0 );
--    //TODO helperapi using a writer document
--    /*
--    XDocument xDocument = (XDocument)getParent();
--    if (AnyConverter.isVoid(_aRange))
--    {
--        _aRange = xDocument.Range(new Integer(0), new Integer(1));
--        // Top&Left in Word is Top&Left of the paper and not the writeable area.
--        aMovePositionIfRange = calculateTopLeftMargin((HelperInterfaceAdaptor)xDocument);
--    }
--
--    setShape_AnchorTypeAndRangeProperty(xShape, _aRange);
--    */
--    rtl::OUString name = createName( rtl::OUString::createFromAscii( "Oval" ));
--    setDefaultShapeProperties(xShape);
--    setShape_NameProperty(xShape, name);
--
--    awt::Point position;
--    position.X = nXPos - aMovePositionIfRange.X;
--    position.Y = nYPos - aMovePositionIfRange.Y;
--    xShape->setPosition(position);
--
--    awt::Size size;
--    size.Height = nHeight;
--    size.Width = nWidth;
--    xShape->setSize(size);
--
--    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
--    pScVbaShape->setRange( aRange ); 
--    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
--}
--
--//helpeapi calc
--uno::Any SAL_CALL
--ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (uno::RuntimeException)
--{
--    sal_Int32 nLineWidth = endX - StartX;
--    sal_Int32 nLineHeight = endY - StartY;
--
--    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
--    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
--    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( StartX );
--    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( StartY );
--    
--    uno::Reference< drawing::XShape > xShape( createShape( rtl::OUString::createFromAscii("com.sun.star.drawing.LineShape") ), uno::UNO_QUERY_THROW );
--    m_xShapes->add( xShape );
--
--    awt::Point aMovePositionIfRange( 0, 0 );
--    
--    rtl::OUString name = createName( rtl::OUString::createFromAscii( "Line" ) );
--    setDefaultShapeProperties(xShape);
--    setShape_NameProperty(xShape, name);
--
--    awt::Point position;
--    position.X = nXPos - aMovePositionIfRange.X;
--    position.Y = nYPos - aMovePositionIfRange.Y;
--    xShape->setPosition(position);
--
--    awt::Size size;
--    size.Height = nHeight;
--    size.Width = nWidth;
--    xShape->setSize(size);
--
--    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
--    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
--}
--
--uno::Any SAL_CALL
--ScVbaShapes::AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
--{
--    uno::Any _aAnchor;
--    if (_nType == office::MsoAutoShapeType::msoShapeRectangle)
--    {
--        return AddRectangle(_nLeft, _nTop, _nWidth, _nHeight, _aAnchor);
--    }
--    else if (_nType == office::MsoAutoShapeType::msoShapeOval)
--    {
--        return AddEllipse(_nLeft, _nTop, _nWidth, _nHeight, _aAnchor);
--    }
--    return uno::Any();
--}
--
--void
--ScVbaShapes::setDefaultShapeProperties( uno::Reference< drawing::XShape > xShape ) throw (uno::RuntimeException)
--{
--    uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
--    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillStyle" ), uno::makeAny( rtl::OUString::createFromAscii( "SOLID" ) ) );
--    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillColor"), uno::makeAny( sal_Int32(0xFFFFFF) )  );
--    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextWordWrap"), uno::makeAny( text::WrapTextMode_THROUGHT )  );
--    //not find in OOo2.3
--    //xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "Opaque"), uno::makeAny( sal_True )  );
--}
--
--void
--ScVbaShapes::setShape_NameProperty( uno::Reference< css::drawing::XShape > xShape, rtl::OUString sName )
--{
--    uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
--    try
--    {
--        xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "Name" ), uno::makeAny( sName ) );
--    }
--    catch( script::BasicErrorException e )
--    {
--    }
--}
--
--rtl::OUString
--ScVbaShapes::createName( rtl::OUString sName )
--{
--    sal_Int32 nActNumber = 1 + m_nNewShapeCount;
--    m_nNewShapeCount++; 
--    sName += rtl::OUString::valueOf( nActNumber );
--    return sName;
--}
--
--#if 0
--//TODO helperapi using a writer document
--awt::Point
--calculateTopLeftMargin( uno::Reference< XHelperInterface > xDocument )
--{
--    awt::Point aPoint( 0, 0 );
--    uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW );
--    return awt::Point();
--}
--#endif
-diff --git sc/source/ui/vba/vbashapes.hxx sc/source/ui/vba/vbashapes.hxx
-deleted file mode 100644
-index c29f56b..0000000
---- sc/source/ui/vba/vbashapes.hxx
-+++ /dev/null
-@@ -1,80 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- * 
-- * Copyright 2008 by Sun Microsystems, Inc.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: vbashapes.hxx,v $
-- * $Revision: 1.3.32.1 $
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org.  If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--#ifndef SC_VBA_SHAPES_HXX
--#define SC_VBA_SHAPES_HXX
--
--#include <com/sun/star/drawing/XShapes.hpp>
--#include <com/sun/star/drawing/XDrawPage.hpp>
--#include <com/sun/star/container/XIndexAccess.hpp>
--#include <ooo/vba/msforms/XShapes.hpp>
--
--#include <vbahelper/vbahelperinterface.hxx>
--
--#include <vbahelper/vbacollectionimpl.hxx>
--
--typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE;
--
--class ScVbaShapes : public ScVbaShapes_BASE
--{
--private: 
--    css::uno::Reference< css::drawing::XShapes > m_xShapes;
--    css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage;
--    sal_Int32 m_nNewShapeCount;
--    void initBaseCollection();
--protected:
--	virtual rtl::OUString& getServiceImplName();
--	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--	virtual css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
--    css::uno::Reference< css::drawing::XShape > createShape( rtl::OUString service ) throw (css::uno::RuntimeException);
--    css::uno::Any AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException);
--    css::uno::Any AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException);
--    rtl::OUString createName( rtl::OUString sName );
--    //TODO helperapi using a writer document
--    //css::awt::Point calculateTopLeftMargin( css::uno::Reference< ov::XHelperInterface > xDocument );
--    
--public:
--    ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes );
--    static void setDefaultShapeProperties( css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException);
--    static void setShape_NameProperty( css::uno::Reference< css::drawing::XShape > xShape, rtl::OUString sName );
--    //XEnumerationAccess
--    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
--
--    virtual void SAL_CALL SelectAll() throw (css::uno::RuntimeException);
--    //helper::calc
--    virtual css::uno::Any SAL_CALL AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (css::uno::RuntimeException);
--    virtual css::uno::Any SAL_CALL AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException);
--    virtual css::uno::Reference< ov::msforms::XShapeRange > SAL_CALL Range( const css::uno::Any& shapes ) throw (css::uno::RuntimeException);
--    // ScVbaCollectionBaseImpl
--    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
--    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException);
--};
--
--#endif//SC_VBA_SHAPES_HXX
-diff --git sc/source/ui/vba/vbatextboxshape.hxx sc/source/ui/vba/vbatextboxshape.hxx
-index c923329..993d045 100644
---- sc/source/ui/vba/vbatextboxshape.hxx
-+++ sc/source/ui/vba/vbatextboxshape.hxx
-@@ -37,7 +37,7 @@
- #include <cppuhelper/implbase1.hxx>
- #include <com/sun/star/text/XTextRange.hpp>
- #include <ooo/vba/msforms/XTextBoxShape.hpp>
--#include "vbashape.hxx"
-+#include <vbahelper/vbashape.hxx>
- #include "excelvbahelper.hxx"
- #include "vbacharacters.hxx"
- 
-diff --git sc/source/ui/vba/vbatextframe.cxx sc/source/ui/vba/vbatextframe.cxx
-index fa3980d..1a0f588 100644
---- sc/source/ui/vba/vbatextframe.cxx
-+++ sc/source/ui/vba/vbatextframe.cxx
-@@ -27,6 +27,7 @@
-  * for a copy of the LGPLv3 License.
-  *
-  ************************************************************************/
-+#include <vbahelper/helperdecl.hxx>
- #include <com/sun/star/drawing/TextFitToSizeType.hpp>
- #include <com/sun/star/text/XText.hpp>
- #include "vbatextframe.hxx"
-@@ -35,121 +36,19 @@
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
- 
--ScVbaTextFrame::ScVbaTextFrame( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< drawing::XShape > xShape ) : ScVbaTextFrame_BASE( xParent, xContext ), m_xShape( xShape )
-+ScVbaTextFrame::ScVbaTextFrame( uno::Sequence< uno::Any> const & args, uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException ) :  ScVbaTextFrame_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< drawing::XShape >( args, 1, false ) )
- {
--    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
- }
- 
--void
--ScVbaTextFrame::setAsMSObehavior()
--{
--    //set property TextWordWrap default as False.
--    // TextFitToSize control the text content. it seems we should set the default as False.
--    // com.sun.star.drawing.TextFitToSizeType.NONE
--    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextWordWrap" ), uno::makeAny( sal_False ) );
--    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextFitToSize" ), uno::makeAny( drawing::TextFitToSizeType_NONE ) );
--}
--
--sal_Int32 ScVbaTextFrame::getMargin( rtl::OUString sMarginType )
--{
--    sal_Int32 nMargin = 0;
--    uno::Any aMargin = m_xPropertySet->getPropertyValue( sMarginType );
--    aMargin >>= nMargin;
--    return nMargin;
--}
--
--void ScVbaTextFrame::setMargin( rtl::OUString sMarginType, float fMargin )
--{
--    sal_Int32 nMargin = Millimeter::getInHundredthsOfOneMillimeter( fMargin );
--    m_xPropertySet->setPropertyValue( sMarginType, uno::makeAny( nMargin ) );
--}
--
--// Attributes
--sal_Bool SAL_CALL 
--ScVbaTextFrame::getAutoSize() throw (uno::RuntimeException)
--{
--    // I don't know why, but in OOo, TextAutoGrowHeight is the property control autosize. not TextFitToSize.
--    // TextFitToSize control the text content. 
--    // and in mso, there isnot option TextWordWrap which means auto wrap. the default is False.
--    sal_Bool bAutosize = sal_False;
--    uno::Any aTextAutoGrowHeight = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ) );
--    aTextAutoGrowHeight >>= bAutosize;
--    return bAutosize;
--}
--
--void SAL_CALL 
--ScVbaTextFrame::setAutoSize( sal_Bool _autosize ) throw (uno::RuntimeException)
--{
--    setAsMSObehavior();
--    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ), uno::makeAny( _autosize ) );
--}
--
--float SAL_CALL 
--ScVbaTextFrame::getMarginBottom() throw (uno::RuntimeException)
--{
--    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ) );
--    float fMargin = (float)Millimeter::getInPoints( nMargin );
--    return fMargin;
--}
--
--void SAL_CALL 
--ScVbaTextFrame::setMarginBottom( float _marginbottom ) throw (uno::RuntimeException)
--{
--    setMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ), _marginbottom );
--}
--
--float SAL_CALL 
--ScVbaTextFrame::getMarginTop() throw (uno::RuntimeException)
--{
--    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ) );
--    float fMargin = (float)Millimeter::getInPoints( nMargin );
--    return fMargin;
--}
--
--void SAL_CALL 
--ScVbaTextFrame::setMarginTop( float _margintop ) throw (uno::RuntimeException)
--{
--    setMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ), _margintop );
--}
--
--float SAL_CALL 
--ScVbaTextFrame::getMarginLeft() throw (uno::RuntimeException)
--{
--    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ) );
--    float fMargin = (float)Millimeter::getInPoints( nMargin );
--    return fMargin;
--}
--
--void SAL_CALL 
--ScVbaTextFrame::setMarginLeft( float _marginleft ) throw (uno::RuntimeException)
--{
--    setMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ), _marginleft );
--}
--
--float SAL_CALL 
--ScVbaTextFrame::getMarginRight() throw (uno::RuntimeException)
--{
--    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextRightDistance" ) );
--    float fMargin = (float)Millimeter::getInPoints( nMargin );
--    return fMargin;
--}
--
--void SAL_CALL 
--ScVbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException)
--{
--    setMargin( rtl::OUString::createFromAscii( "TextRightDistance" ), _marginright );
--}
--
--
- // Methods
--uno::Reference< ov::excel::XCharacters > SAL_CALL 
-+uno::Any SAL_CALL 
- ScVbaTextFrame::Characters() throw (uno::RuntimeException)
- {
-     uno::Reference< text::XSimpleText > xSimpleText( m_xShape, uno::UNO_QUERY_THROW );
-     ScVbaPalette aPalette( SfxObjectShell::Current() );
-     uno::Any aStart( sal_Int32( 1 ) );
-     uno::Any aLength(sal_Int32( -1 ) );
--    return uno::Reference< ov::excel::XCharacters >( new ScVbaCharacters( this, mxContext, aPalette, xSimpleText, aStart, aLength, sal_True ) );
-+    return uno::makeAny( uno::Reference< ov::excel::XCharacters >( new ScVbaCharacters( this, mxContext, aPalette, xSimpleText, aStart, aLength, sal_True ) ) );
- }
- 
- rtl::OUString&
-@@ -171,3 +70,12 @@ ScVbaTextFrame::getServiceNames()
-     return aServiceNames;
- }
- 
-+namespace textframe 
-+{
-+namespace sdecl = comphelper::service_decl;
-+sdecl::vba_service_class_<ScVbaTextFrame, sdecl::with_args<true> > serviceImpl;
-+extern sdecl::ServiceDecl const serviceDecl(
-+    serviceImpl,
-+    "ScVbaTextFrame",
-+    "ooo.vba.excel.TextFrame" );
-+}
-diff --git sc/source/ui/vba/vbatextframe.hxx sc/source/ui/vba/vbatextframe.hxx
-index 4787ddc..71e36bf 100644
---- sc/source/ui/vba/vbatextframe.hxx
-+++ sc/source/ui/vba/vbatextframe.hxx
-@@ -29,45 +29,23 @@
-  ************************************************************************/
- #ifndef SC_VBA_TEXTFRAME_HXX
- #define SC_VBA_TEXTFRAME_HXX
--#include <com/sun/star/drawing/XShape.hpp>
--#include <com/sun/star/beans/XPropertySet.hpp>
--#include <ooo/vba/excel/XCharacters.hpp>
- #include <ooo/vba/excel/XTextFrame.hpp>
--
- #include <vbahelper/vbahelperinterface.hxx>
--#include "vbapalette.hxx"
-+#include <vbahelper/vbatextframe.hxx>
- 
--typedef InheritedHelperInterfaceImpl1< ov::excel::XTextFrame > ScVbaTextFrame_BASE;
-+//typedef InheritedHelperInterfaceImpl1< ov::excel::XTextFrame > ScVbaTextFrame_BASE;
-+typedef cppu::ImplInheritanceHelper1< VbaTextFrame, ov::excel::XTextFrame > ScVbaTextFrame_BASE;
- 
- class ScVbaTextFrame : public ScVbaTextFrame_BASE
- {
--private:
--    css::uno::Reference< ov::excel::XCharacters > m_xCharacters;
--    css::uno::Reference< css::drawing::XShape > m_xShape;
--    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
--protected:
--    virtual rtl::OUString& getServiceImplName();
--    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
--    virtual void setAsMSObehavior();
--    sal_Int32 getMargin( rtl::OUString sMarginType );
--    void setMargin( rtl::OUString sMarginType, float fMargin );
- public:
--    ScVbaTextFrame( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext , css::uno::Reference< css::drawing::XShape > xShape);
-+	ScVbaTextFrame( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext ) throw ( css::lang::IllegalArgumentException );
-     virtual ~ScVbaTextFrame() {}
--    // Attributes
--    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setAutoSize( sal_Bool _autosize ) throw (css::uno::RuntimeException);
--    virtual float SAL_CALL getMarginBottom() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setMarginBottom( float _marginbottom ) throw (css::uno::RuntimeException);
--    virtual float SAL_CALL getMarginTop() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setMarginTop( float _margintop ) throw (css::uno::RuntimeException);
--    virtual float SAL_CALL getMarginLeft() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setMarginLeft( float _marginleft ) throw (css::uno::RuntimeException);
--    virtual float SAL_CALL getMarginRight() throw (css::uno::RuntimeException);
--    virtual void SAL_CALL setMarginRight( float _marginright ) throw (css::uno::RuntimeException);
--
-     // Methods
--    virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL Characters(  ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Characters(  ) throw (css::uno::RuntimeException);
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
- 
- };
- 
-diff --git sc/source/ui/vba/vbaworkbooks.cxx sc/source/ui/vba/vbaworkbooks.cxx
-index acb9cfc..2f8325f 100644
---- sc/source/ui/vba/vbaworkbooks.cxx
-+++ sc/source/ui/vba/vbaworkbooks.cxx
-@@ -65,14 +65,6 @@ using namespace ::com::sun::star;
- 
- const sal_Int16 CUSTOM_CHAR = 5;
- 
--typedef  std::hash_map< rtl::OUString,
--sal_Int32, ::rtl::OUStringHash,
--::std::equal_to< ::rtl::OUString > > NameIndexHash;
--
--typedef std::vector < uno::Reference< sheet::XSpreadsheetDocument > > WorkBooks;
--
--typedef ::cppu::WeakImplHelper1< container::XEnumeration > SpreadSheetDocEnumImpl_BASE;
--
- static uno::Any
- getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheetDocument > &xDoc, const uno::Any& aApplication )
- {
-@@ -85,53 +77,6 @@ getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Refe
- 	return uno::Any( uno::Reference< excel::XWorkbook > (pWb) );
- }
- 
--
--// #FIXME clearly this is a candidate for some sort of helper base class as
--// this is a copy of SelectedSheetsEnum ( vbawindow.cxx )
--
--class SpreadSheetDocEnumImpl : public SpreadSheetDocEnumImpl_BASE
--{
--	uno::Reference< uno::XComponentContext > m_xContext;
--	WorkBooks m_books;
--	WorkBooks::const_iterator m_it;
--
--public:
--	SpreadSheetDocEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const WorkBooks& books ) throw ( uno::RuntimeException ) :  m_xContext( xContext ), m_books( books )
--	{
--		m_it = m_books.begin();
--	}
--	SpreadSheetDocEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) :  m_xContext( xContext )
--	{
--		uno::Reference< lang::XMultiComponentFactory > xSMgr(
--			m_xContext->getServiceManager(), uno::UNO_QUERY_THROW );
--
--		uno::Reference< frame::XDesktop > xDesktop
--			(xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), m_xContext), uno::UNO_QUERY_THROW );
--		uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration();
--		while( mxComponents->hasMoreElements() )
--		{
--			uno::Reference< sheet::XSpreadsheetDocument > xNext( mxComponents->nextElement(), uno::UNO_QUERY );
--			if ( xNext.is() )
--				m_books.push_back( xNext );
--		}
--		m_it = m_books.begin();
--	}
--	// XEnumeration
--	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException) 
--	{ 
--		return m_it != m_books.end();
--	}
--
--	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
--	{ 
--		if ( !hasMoreElements() )
--		{
--			throw container::NoSuchElementException();
--		}
--		return makeAny( *(m_it++) );
--	}
--};
--
- class WorkBookEnumImpl : public EnumerationHelperImpl
- {
- 	uno::Any m_aApplication;
-@@ -146,100 +91,7 @@ public:
- 
- };
- 
--// #FIXME clearly this is also a candidate for some sort of helper base class as
--// a very similar one is used in vbawindow ( SelectedSheetsEnumAccess )
--// Maybe a template base class that does all of the operations on the hashmap
--// and vector only, and the sub-class does everything else
--// => ctor, createEnumeration & factory method need be defined ( to be called 
--// by getByIndex, getByName )
--typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess 
--	, com::sun::star::container::XIndexAccess
--	, com::sun::star::container::XNameAccess
--	> WorkBooksAccessImpl_BASE;
--
--class WorkBooksAccessImpl : public WorkBooksAccessImpl_BASE
--{
--	uno::Reference< uno::XComponentContext > m_xContext;
--	WorkBooks m_books;
--	NameIndexHash namesToIndices;
--public:	
--	WorkBooksAccessImpl( const uno::Reference< uno::XComponentContext >& xContext ):m_xContext( xContext )
--	{
--		uno::Reference< container::XEnumeration > xEnum = new SpreadSheetDocEnumImpl( m_xContext );
--		sal_Int32 nIndex=0;
--		while( xEnum->hasMoreElements() )
--		{
--			uno::Reference< sheet::XSpreadsheetDocument > xNext( xEnum->nextElement(), uno::UNO_QUERY );
--			if ( xNext.is() )
--			{
--				m_books.push_back( xNext );
--				uno::Reference< frame::XModel > xModel( xNext, uno::UNO_QUERY_THROW ); // that the spreadsheetdocument is a xmodel is a given
--				INetURLObject aURL( xModel->getURL() );
--				namesToIndices[ aURL.GetLastName() ] = nIndex++;
--			}
--		}
--			
--	}
--	
--	//XEnumerationAccess
--	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
--	{
--		return new SpreadSheetDocEnumImpl( m_xContext, m_books ); 
--	}
--	// XIndexAccess
--	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException) 
--	{ 
--		return m_books.size();
--	}
--	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) 
--	{ 
--		if ( Index < 0 
--			|| static_cast< WorkBooks::size_type >(Index) >= m_books.size() ) 
--			throw lang::IndexOutOfBoundsException();
--		return makeAny( m_books[ Index ] ); // returns xspreadsheetdoc
--	}
--
--	//XElementAccess
--	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
--	{ 
--		return sheet::XSpreadsheetDocument::static_type(0); 
--	}
--
--	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) 
--	{ 
--		return (m_books.size() > 0);
--	}
--
--	//XNameAccess
--	virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
--	{ 
--		NameIndexHash::const_iterator it = namesToIndices.find( aName );
--		if ( it == namesToIndices.end() )
--			throw container::NoSuchElementException();
--		return makeAny( m_books[ it->second ] );
--		
--	}
--
--	virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException) 
--	{ 
--		uno::Sequence< ::rtl::OUString > names( namesToIndices.size() );
--		::rtl::OUString* pString = names.getArray();
--		NameIndexHash::const_iterator it = namesToIndices.begin();
--		NameIndexHash::const_iterator it_end = namesToIndices.end();
--		for ( ; it != it_end; ++it, ++pString )
--			*pString = it->first;	
--		return names;	
--	}
--
--	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) 
--	{ 
--		NameIndexHash::const_iterator it = namesToIndices.find( aName );
--		return (it != namesToIndices.end());
--	}
--
--};
--
--ScVbaWorkbooks::ScVbaWorkbooks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext ) : ScVbaWorkbooks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new WorkBooksAccessImpl( xContext ) ) )
-+ScVbaWorkbooks::ScVbaWorkbooks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext ) : ScVbaWorkbooks_BASE( xParent, xContext, VbaDocumentsBase::EXCEL_DOCUMENT )
- {
- }
- // XEnumerationAccess
-@@ -255,13 +107,14 @@ ScVbaWorkbooks::createEnumeration() throw (uno::RuntimeException)
- 	// the state of this object ( although it should ) would be 
- 	// safer to create an enumeration based on this objects state
- 	// rather than one effectively based of the desktop component
--	return new WorkBookEnumImpl( mxContext, uno::Reference< container::XEnumeration >( new SpreadSheetDocEnumImpl(mxContext) ), Application() );
-+    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+	return new WorkBookEnumImpl( mxContext, xEnumerationAccess->createEnumeration(), Application() );
- }
- 
- uno::Any
- ScVbaWorkbooks::createCollectionObject( const css::uno::Any& aSource )
- {
--	uno::Reference< sheet::XSpreadsheetDocument > xDoc( aSource, uno::UNO_QUERY );
-+	uno::Reference< sheet::XSpreadsheetDocument > xDoc( aSource, uno::UNO_QUERY_THROW );
- 	return getWorkbook( mxContext, xDoc, Application() );
- }
- 
-@@ -269,18 +122,7 @@ ScVbaWorkbooks::createCollectionObject( const css::uno::Any& aSource )
- uno::Any SAL_CALL
- ScVbaWorkbooks::Add() throw (uno::RuntimeException)
- {
--	uno::Reference< lang::XMultiComponentFactory > xSMgr(
--        mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
--
--	 uno::Reference< frame::XComponentLoader > xLoader(
--        xSMgr->createInstanceWithContext(
--            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),
--                mxContext), uno::UNO_QUERY_THROW );
--	uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL(
--									   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc") ),
--									   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, 
--									   uno::Sequence< beans::PropertyValue >(0) );			   
--    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW );
-+    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( VbaDocumentsBase::Add() , uno::UNO_QUERY_THROW );
-                                                                                                                              
-     if( xSpreadDoc.is() )
-         return getWorkbook( mxContext, xSpreadDoc, Application() );
-@@ -290,11 +132,7 @@ ScVbaWorkbooks::Add() throw (uno::RuntimeException)
- void
- ScVbaWorkbooks::Close() throw (uno::RuntimeException)
- {
--	uno::Reference< lang::XMultiComponentFactory > xSMgr(
--		mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
--	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--	rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseDoc"));
--	dispatchRequests(xModel,url);
-+    VbaDocumentsBase::Close();
- }
- 
- bool 
-@@ -338,24 +176,15 @@ uno::Any
- ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException)
- {
- 	// we need to detect if this is a URL, if not then assume its a file path
--        rtl::OUString aURL;
--        INetURLObject aObj;
-+    rtl::OUString aURL;
-+    INetURLObject aObj;
- 	aObj.SetURL( rFileName );
- 	bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
- 	if ( bIsURL )
- 		aURL = rFileName;
- 	else
- 		osl::FileBase::getFileURLFromSystemPath( rFileName, aURL );
--	uno::Reference< lang::XMultiComponentFactory > xSMgr(
--		mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
--	uno::Reference< frame::XDesktop > xDesktop
--		(xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")                    , mxContext),
--		uno::UNO_QUERY_THROW );
--	uno::Reference< frame::XComponentLoader > xLoader(
--		xSMgr->createInstanceWithContext(
--		::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),
--		mxContext),
--		uno::UNO_QUERY_THROW );
-+
- 	uno::Sequence< beans::PropertyValue > sProps(0);
- 	sal_Int32 nIndex = 0;
- 	
-@@ -422,23 +251,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi
- 	else if ( !isSpreadSheetFile( sType ) )
- 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Bad Format")), uno::Reference< uno::XInterface >() );
- 	
--	if ( ReadOnly.hasValue()  )
--	{
--		sal_Bool bIsReadOnly = sal_False; ReadOnly >>= bIsReadOnly;
--		if ( bIsReadOnly )
--		{
--			static const rtl::OUString sReadOnly( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
--			sProps.realloc( sProps.getLength() + 1 );
--			sProps[ nIndex ].Name = sReadOnly;
--			sProps[ nIndex++ ].Value = uno::makeAny( (sal_Bool)sal_True );
--		}
--	}
--
--	uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL( aURL,
--		rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_default") ),
--		frame::FrameSearchFlag::CREATE,
--		sProps);
--	uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW );
-+	uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( VbaDocumentsBase::Open( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW );
- 	uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, Application() );
- 	uno::Reference< excel::XWorkbook > xWBook( aRet, uno::UNO_QUERY );
- 	if ( xWBook.is() )
-diff --git sc/source/ui/vba/vbaworkbooks.hxx sc/source/ui/vba/vbaworkbooks.hxx
-index b66d294..182a5da 100644
---- sc/source/ui/vba/vbaworkbooks.hxx
-+++ sc/source/ui/vba/vbaworkbooks.hxx
-@@ -34,12 +34,13 @@
- #include <vbahelper/vbacollectionimpl.hxx>
- #include <ooo/vba/excel/XWorkbooks.hpp>
- #include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <vbahelper/vbadocumentsbase.hxx>
- #include "excelvbahelper.hxx"
- 
- 
- class ScModelObj;
- 
--typedef CollTestImplHelper< ov::excel::XWorkbooks > ScVbaWorkbooks_BASE;
-+typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::excel::XWorkbooks > ScVbaWorkbooks_BASE;
- 
- class ScVbaWorkbooks : public ScVbaWorkbooks_BASE
- {
-diff --git sc/source/ui/vba/vbaworksheet.cxx sc/source/ui/vba/vbaworksheet.cxx
-index 310f81e..ddd5111 100644
---- sc/source/ui/vba/vbaworksheet.cxx
-+++ sc/source/ui/vba/vbaworksheet.cxx
-@@ -86,7 +86,7 @@
- #include "vbapivottables.hxx"
- #include "vbaoleobject.hxx"
- #include "vbaoleobjects.hxx"
--#include "vbashapes.hxx"
-+#include <vbahelper/vbashapes.hxx>
- #include "vbapagesetup.hxx"
- #include "vbapagebreaks.hxx"
- 
-diff --git sc/util/makefile.mk sc/util/makefile.mk
-index b3e30f1..442814d 100644
---- sc/util/makefile.mk
-+++ sc/util/makefile.mk
-@@ -373,6 +373,7 @@ SHL9STDLIBS= \
- 		$(ISCLIB) \
-         $(VCLLIB) \
-         $(TKLIB) \
-+	    $(SVXMSFILTERLIB)		\
-         $(FORLIB)
- 
- SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN)
-diff --git scripting/source/dlgprov/dlgevtatt.cxx scripting/source/dlgprov/dlgevtatt.cxx
-index 93409b3..958e854 100644
---- scripting/source/dlgprov/dlgevtatt.cxx
-+++ scripting/source/dlgprov/dlgevtatt.cxx
-@@ -112,13 +112,14 @@ namespace dlgprov
-     {
-         protected:
-         rtl::OUString msDialogCodeName;
-+        rtl::OUString msDialogLibName;
-         Reference<  script::XScriptListener > mxListener;
-         virtual void firing_impl( const script::ScriptEvent& aScriptEvent, uno::Any* pRet );
-         public:
--        DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel );
-+        DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const rtl::OUString& sDialogLibName );
-     };
- 
--    DialogVBAScriptListenerImpl::DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel ) : DialogScriptListenerImpl( rxContext )
-+    DialogVBAScriptListenerImpl::DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const rtl::OUString& sDialogLibName ) : DialogScriptListenerImpl( rxContext ), msDialogLibName( sDialogLibName )
-     {
-         Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() );
-         Sequence< Any > args(1);
-@@ -146,7 +147,7 @@ namespace dlgprov
-         if ( aScriptEvent.ScriptType.equals( rtl::OUString::createFromAscii("VBAInterop") ) && mxListener.is() )
-         {
-             ScriptEvent aScriptEventCopy( aScriptEvent );
--            aScriptEventCopy.ScriptCode = msDialogCodeName;
-+            aScriptEventCopy.ScriptCode = msDialogLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ).concat( msDialogCodeName );
-             try
-             {
-                 mxListener->firing( aScriptEventCopy );
-@@ -162,7 +163,7 @@ namespace dlgprov
-     // DialogEventsAttacherImpl
-     // =============================================================================
- 
--    DialogEventsAttacherImpl::DialogEventsAttacherImpl( const Reference< XComponentContext >& rxContext, const Reference< frame::XModel >& rxModel, const Reference< awt::XControl >& rxControl, const Reference< XInterface >& rxHandler, const Reference< beans::XIntrospectionAccess >& rxIntrospect, bool bProviderMode, const Reference< script::XScriptListener >& rxRTLListener   )
-+    DialogEventsAttacherImpl::DialogEventsAttacherImpl( const Reference< XComponentContext >& rxContext, const Reference< frame::XModel >& rxModel, const Reference< awt::XControl >& rxControl, const Reference< XInterface >& rxHandler, const Reference< beans::XIntrospectionAccess >& rxIntrospect, bool bProviderMode, const Reference< script::XScriptListener >& rxRTLListener, const rtl::OUString& sDialogLibName  )
-         :m_xContext( rxContext )
-     {
-         // key listeners by protocol when ScriptType = 'Script'
-@@ -175,7 +176,7 @@ namespace dlgprov
-         listernersForTypes[ rtl::OUString::createFromAscii("vnd.sun.star.UNO") ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode );
-         listernersForTypes[ rtl::OUString::createFromAscii("vnd.sun.star.script") ] = new DialogSFScriptListenerImpl( rxContext, rxModel );
- #ifdef FAKE_VBA_EVENT_SUPPORT
--        listernersForTypes[ rtl::OUString::createFromAscii("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel );
-+        listernersForTypes[ rtl::OUString::createFromAscii("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName );
- #endif
-     }
- 
-diff --git scripting/source/dlgprov/dlgevtatt.hxx scripting/source/dlgprov/dlgevtatt.hxx
-index ca1c7a3..d06489d 100644
---- scripting/source/dlgprov/dlgevtatt.hxx
-+++ scripting/source/dlgprov/dlgevtatt.hxx
-@@ -84,7 +84,7 @@ namespace dlgprov
-         	 const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler, 
-         	 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >& xIntrospect, 
-              bool bProviderMode, 
--        	 const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xRTLListener );
-+        	 const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xRTLListener ,const rtl::OUString& sDialogLibName );
-         virtual ~DialogEventsAttacherImpl();
- 
-         // XScriptEventsAttacher
-diff --git scripting/source/dlgprov/dlgprov.cxx scripting/source/dlgprov/dlgprov.cxx
-index a1ae5b7..2754bc1 100644
---- scripting/source/dlgprov/dlgprov.cxx
-+++ scripting/source/dlgprov/dlgprov.cxx
-@@ -418,6 +418,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
- 
- 			if ( xISP.is() )
- 				xInput = xISP->createInputStream();
-+            msDialogLibName = sLibName;
- 		}
- 
-         // import dialog model
-@@ -535,7 +536,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
- 		const Reference< XControl >& rxControl,
- 		const Reference< XInterface >& rxHandler,
- 		const Reference< XIntrospectionAccess >& rxIntrospectionAccess,
--		bool bDialogProviderMode )
-+		bool bDialogProviderMode, const rtl::OUString& sDialogLibName )
-     {
-         if ( rxControl.is() )
-         {
-@@ -559,7 +560,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
- 
- 				Reference< XScriptEventsAttacher > xScriptEventsAttacher = new DialogEventsAttacherImpl
- 					( m_xContext, m_xModel, rxControl, rxHandler, rxIntrospectionAccess, 
--					  bDialogProviderMode, ( m_BasicInfo.get() ? m_BasicInfo->mxBasicRTLListener : NULL ) );
-+					  bDialogProviderMode, ( m_BasicInfo.get() ? m_BasicInfo->mxBasicRTLListener : NULL ), msDialogLibName );
- 
-                 Any aHelper;
-                 xScriptEventsAttacher->attachEvents( aObjects, Reference< XScriptListener >(), aHelper );
-@@ -742,7 +743,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
-             {
-                 //xDialog = Reference< XDialog >( xCtrl, UNO_QUERY );
- 	            Reference< XIntrospectionAccess > xIntrospectionAccess = inspectHandler( xHandler );
--                attachControlEvents( xCtrl, xHandler, xIntrospectionAccess, bDialogProviderMode );
-+                attachControlEvents( xCtrl, xHandler, xIntrospectionAccess, bDialogProviderMode, msDialogLibName );
-             }
-         }
- 
-diff --git scripting/source/dlgprov/dlgprov.hxx scripting/source/dlgprov/dlgprov.hxx
-index 559c686..b4c8181 100644
---- scripting/source/dlgprov/dlgprov.hxx
-+++ scripting/source/dlgprov/dlgprov.hxx
-@@ -84,9 +84,9 @@ namespace dlgprov
-         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;
-         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >                 m_xModel;
- 
--
-+	rtl::OUString msDialogLibName;
-         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModel( const ::rtl::OUString& sURL );
--
-+     
-         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > createDialogControl( 
-             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxDialogModel,
- 			const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent );
-@@ -94,7 +94,7 @@ namespace dlgprov
-         void attachControlEvents( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxControlContainer,
- 			const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler,
- 			const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >& rxIntrospectionAccess,
--			bool bDialogProviderMode );
-+			bool bDialogProviderMode, const rtl::OUString& );
- 		::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > inspectHandler( 
- 			const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler );
- 	// helper methods
-diff --git scripting/source/vbaevents/eventhelper.cxx scripting/source/vbaevents/eventhelper.cxx
-index 5433c7e..84dc900 100644
---- scripting/source/vbaevents/eventhelper.cxx
-+++ scripting/source/vbaevents/eventhelper.cxx
-@@ -52,6 +52,14 @@
- #include <set>
- #include <list>
- #include <hash_map>
-+#define ASYNC 0
-+
-+// primitive support for asynchronous handling of 
-+// events from controls ( all event will be processed asynchronously 
-+// in the application thread )
-+#if ASYNC
-+#include <vcl/svapp.hxx>
-+#endif
- 
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::script;
-@@ -251,6 +259,12 @@ EventInfoHash& getEventTransInfo()
-         info.toVBA = NULL;
-         actionInfos.push_back( info );
-         eventTransInfo[ rtl::OUString::createFromAscii("actionPerformed") ] = actionInfos;
-+        // itemStateChanged ooo event
-+        std::list< TranslateInfo > stateChangedInfos;
-+        info.sVBAName = rtl::OUString::createFromAscii("_Change");
-+        info.toVBA = NULL;
-+        stateChangedInfos.push_back( info );
-+        eventTransInfo[ rtl::OUString::createFromAscii("itemStateChanged") ] = stateChangedInfos;
-         // changed ooo event
-         std::list< TranslateInfo > changeInfos;
-         info.sVBAName = rtl::OUString::createFromAscii("_Change");
-@@ -621,6 +635,9 @@ protected:
-     virtual ::cppu::IPropertyArrayHelper* createArrayHelper(  ) const;
- 
- private:
-+#if ASYNC
-+    DECL_LINK( OnAsyncScriptEvent, ScriptEvent* );
-+#endif
-     void setShellFromModel();
-     void firing_Impl( const  ScriptEvent& evt, Any *pSyncRet=NULL ) throw( RuntimeException );
- 
-@@ -666,9 +683,39 @@ EventListener::disposing(const lang::EventObject&)  throw( RuntimeException )
- void SAL_CALL 
- EventListener::firing(const ScriptEvent& evt) throw(RuntimeException)
- {
-+#if ASYNC
-+    // needs some logic to check if the event handler is oneway or not
-+    // if not oneway then firing_Impl otherwise... as below
-+    acquire();
-+    Application::PostUserEvent( LINK( this, EventListener, OnAsyncScriptEvent ), new ScriptEvent( evt ) );
-+#else
-     firing_Impl( evt );
-+#endif
- }
- 
-+#if ASYNC
-+IMPL_LINK( EventListener, OnAsyncScriptEvent, ScriptEvent*, _pEvent )
-+{
-+	if ( !_pEvent )
-+		return 1L;
-+
-+	{
-+		// #FIXME if we enable ASYNC we probably need something like 
-+		// below
-+		//::osl::ClearableMutexGuard aGuard( m_aMutex );
-+
-+		//if ( !impl_isDisposed_nothrow() )
-+		//	impl_doFireScriptEvent_nothrow( aGuard, *_pEvent, NULL );
-+		firing_Impl( *_pEvent, NULL );
-+	}
-+
-+	delete _pEvent;
-+	// we acquired ourself immediately before posting the event
-+	release();
-+	return 0L;
-+ }
-+#endif 
-+
- Any SAL_CALL 
- EventListener::approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException)
- {
-@@ -735,6 +782,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* /*pRet*/ ) throw(Runtime
-         return;
-     lang::EventObject aEvent;
-     evt.Arguments[ 0 ] >>= aEvent;
-+	OSL_TRACE("evt.MethodName is  %s", rtl::OUStringToOString( evt.MethodName, RTL_TEXTENCODING_UTF8 ).getStr() );
- 	OSL_TRACE("Argument[0] is  %s", rtl::OUStringToOString( comphelper::anyToString( evt.Arguments[0] ), RTL_TEXTENCODING_UTF8 ).getStr() );
- 	OSL_TRACE("Getting Control");
-     uno::Reference< awt::XControl > xControl( aEvent.Source, uno::UNO_QUERY_THROW );
-@@ -771,23 +819,34 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* /*pRet*/ ) throw(Runtime
-        
-         StarBASIC* pBasic = mpShell->GetBasic();
-         BasicManager* pBasicManager = mpShell->GetBasicManager();
--        //'Project' is a better default but I want to force failures
--        //rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Project");
--        rtl::OUString sProject = rtl::OUString::createFromAscii("Standard");
--
--        if ( pBasicManager->GetName().Len() > 0 )
--            sProject =  pBasicManager->GetName();
--
-+        rtl::OUString sProject;
-+        rtl::OUString sScriptCode( evt.ScriptCode );
-+	// dialogs pass their own library, presence of Dot determines that
-+	if ( sScriptCode.indexOf( '.' ) == -1 )
-+	{
-+        	//'Project' is a better default but I want to force failures
-+	        //rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Project");
-+        	sProject = rtl::OUString::createFromAscii("Standard");
-+
-+        	if ( pBasicManager->GetName().Len() > 0 )
-+            		sProject =  pBasicManager->GetName();
-+	}
-+	else
-+	{
-+		sal_Int32 nIndex = sScriptCode.indexOf( '.' );
-+		sProject = sScriptCode.copy( 0, nIndex );
-+                sScriptCode = sScriptCode.copy( nIndex + 1 );
-+	}
-         rtl::OUString sMacroLoc = sProject;
-         sMacroLoc = sMacroLoc.concat(  rtl::OUString::createFromAscii(".") );
--        sMacroLoc = sMacroLoc.concat( evt.ScriptCode ).concat( rtl::OUString::createFromAscii(".") );
-+        sMacroLoc = sMacroLoc.concat( sScriptCode ).concat( rtl::OUString::createFromAscii(".") );
-         
-         OSL_TRACE("sMacroLoc is %s", rtl::OUStringToOString( sMacroLoc, RTL_TEXTENCODING_UTF8 ).getStr() );
- 
-         // find library
-         pBasic = pBasicManager->GetLib( sProject );
-         
--        SbModule* pModule = pBasic->FindModule( evt.ScriptCode );
-+        SbModule* pModule = pBasic ? pBasic->FindModule( sScriptCode ) : NULL;
- 
-         for ( ; pModule && txInfo != txInfo_end; ++txInfo )
-         {
-diff --git svx/inc/svx/msvbahelper.hxx svx/inc/svx/msvbahelper.hxx
-new file mode 100644
-index 0000000..8be6901
---- /dev/null
-+++ svx/inc/svx/msvbahelper.hxx
-@@ -0,0 +1,43 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef _MSVBAHELPER_HXX
-+#define _MSVBAHELPER_HXX
-+
-+#include <sfx2/objsh.hxx>
-+#include "svx/svxdllapi.h"
-+
-+namespace ooo { namespace vba 
-+{
-+    SVX_DLLPUBLIC String makeMacroURL( const String& sMacroName );
-+    SVX_DLLPUBLIC String findVBAMacro( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
-+    SVX_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet );
-+} }
-+
-+#endif
-diff --git svx/prj/d.lst svx/prj/d.lst
-index 119a6ea..37c75fb 100644
---- svx/prj/d.lst
-+++ svx/prj/d.lst
-@@ -657,5 +657,6 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
- ..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx
- ..\inc\svx\optimprove.hxx %_DEST%\inc%_EXT%\svx\optimprove.hxx
- ..\inc\svx\mstoolbar.hxx %_DEST%\inc%_EXT%\svx\mstoolbar.hxx
-+..\inc\svx\msvbahelper.hxx %_DEST%\inc%_EXT%\svx\msvbahelper.hxx
- 
- ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
---- svx/source/msfilter/makefile.mk
-+++ svx/source/msfilter/makefile.mk
-@@ -58,6 +58,7 @@ LIB1OBJFILES= \
- 	$(SLO)$/mscodec.obj		\
- 	$(SLO)$/msfiltertracer.obj\
- 	$(SLO)$/mstoolbar.obj\
-+	$(SLO)$/msvbahelper.obj\
- 
- EXCEPTIONSFILES= \
- 	$(SLO)$/eschesdo.obj	\
-@@ -76,6 +77,7 @@ EXCEPTIONSFILES= \
- 	$(SLO)$/svxmsbas.obj	\
- 	$(SLO)$/msfiltertracer.obj\
- 	$(SLO)$/mstoolbar.obj\
-+	$(SLO)$/msvbahelper.obj\
- 
- .INCLUDE :  target.mk
- 
-diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index 53e8f82..44a200e 100644
---- svx/source/msfilter/msocximex.cxx
-+++ svx/source/msfilter/msocximex.cxx
-@@ -1749,18 +1749,18 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
- 	rtl::OUString sParentName = msParentName;
-         sGroupName = sParentName.concat( C2U( ":" ) ).concat( sGroupName );
-     }
--    if ( sGroupName.getLength() > 0 )
--    {
-+    if ( sGroupName.getLength() == 0 )
-+        sGroupName = rtl::OUString::createFromAscii("DefaultGroup");
- 	OSL_TRACE("RadioButton %s has groupname %s", 
- 		rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr(),  rtl::OUStringToOString( sGroupName, RTL_TEXTENCODING_UTF8 ).getStr() );
-         try
-         {
-+            aTmp <<= sGroupName;
-             rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
-         }
-         catch( uno::Exception& )
-         {
-         }
--    }
- 
- 	if (pCaption)
- 	{
-@@ -1772,11 +1772,6 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
-     aTmp <<= ::com::sun::star::style::VerticalAlignment_MIDDLE;
-     rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp );
- 
--    if ( pGroupName )
--    {
--        aTmp <<= lclCreateOUString( pGroupName, nGroupNameLen );
--        rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
--    }
- 	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
- 	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
-     if ( sImageUrl.getLength() )
-@@ -3791,7 +3786,8 @@ OCX_MultiPage::OCX_MultiPage( SotStorageRef& parent,
- 		nScrollWidth(0), nScrollHeight(0), nIconLen(0), pIcon(0), nPictureLen(0),
- 		pPicture(0)
- {
--    msDialogType = C2U("NotSupported");
-+    //msDialogType = C2U("NotSupported");
-+    msDialogType = C2U("com.sun.star.awt.UnoMultiPageModel");
-     mnForeColor = 0x80000012L,
-     mnBackColor = 0x8000000FL;
-     bSetInDialog = true;// UserForm control only
-@@ -3855,7 +3851,6 @@ sal_Bool OCX_MultiPage::Read(SvStorageStream *pS)
- sal_Bool OCX_MultiPage::Import(com::sun::star::uno::Reference<
-     com::sun::star::beans::XPropertySet> &rPropSet)
- {
--    // Calls import on contained controls
-     OCX_ContainerControl::Import( rPropSet );
-     return sal_True;
- }
-@@ -3876,6 +3871,43 @@ sal_Bool OCX_MultiPage::Import(com::sun::star::uno::Reference<
- 
-     if ( xPropSet.is() )
-     {
-+        uno::Reference<lang::XMultiServiceFactory>
-+            xFactory(rDialog, uno::UNO_QUERY);
-+	OSL_TRACE("** MultiPage creating control %s", rtl::OUStringToOString( msDialogType, RTL_TEXTENCODING_UTF8 ).getStr() );
-+	uno::Reference<uno::XInterface> xCreate = xFactory->createInstance(msDialogType);
-+	if (!xCreate.is())
-+		return sal_False;
-+
-+	uno::Reference<awt::XControlModel> xModel(xCreate, uno::UNO_QUERY);
-+	if (!xModel.is())
-+		return sal_False;
-+
-+        try
-+        {
-+		// we should just call MultiPage::Import( XPropertySet )
-+    		OSL_TRACE("********* MULTIPAGE cName %s", rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+		uno::Any aTmp(&sName,getCppuType((OUString *)0));
-+		uno::Reference<beans::XPropertySet> xPrps(xModel, uno::UNO_QUERY);
-+		xPrps->setPropertyValue( WW8_ASCII2STR("Name"), aTmp );
-+		aTmp = uno::makeAny( mnCurrentPageStep );
-+		xPrps->setPropertyValue( WW8_ASCII2STR("ProgressValueMax"), aTmp );
-+		// default current page to 0 ( #FIXME, we need to read this value )
-+		aTmp = uno::makeAny( sal_Int32(0) );
-+		xPrps->setPropertyValue( WW8_ASCII2STR("ProgressValue"), aTmp );
-+    		OSL_TRACE("********* MULTIPAGE vomitted out properties");
-+
-+    // Calls import on contained controls
-+            rDialog->insertByName(sName, uno::makeAny(xModel));
-+            OSL_TRACE("*** inserted ***");
-+        }
-+        catch( uno::Exception& )
-+        {
-+            DBG_ERRORFILE(
-+                ByteString( "OCX_Control::Import - cannot insert control \"" ).
-+                Append( ByteString( sName, RTL_TEXTENCODING_UTF8 ) ).
-+                Append( '"' ).GetBuffer() );
-+        }
-+
-         // Calls import on contained pages
-         return OCX_ContainerControl::Import( xPropSet );
-     }
-diff --git svx/source/msfilter/msvbahelper.cxx svx/source/msfilter/msvbahelper.cxx
-new file mode 100644
-index 0000000..5875cf7
---- /dev/null
-+++ svx/source/msfilter/msvbahelper.cxx
-@@ -0,0 +1,134 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#include <svx/msvbahelper.hxx>
-+#include <basic/sbx.hxx>
-+#include <basic/sbstar.hxx>
-+#include <basic/basmgr.hxx>
-+#include <basic/sbmod.hxx>
-+#include <basic/sbmeth.hxx>
-+
-+using namespace ::com::sun::star;
-+
-+const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
-+const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "?language=Basic&location=document"); 
-+
-+namespace ooo { namespace vba {
-+
-+String makeMacroURL( const String& sMacroName )
-+{
-+	return sUrlPart0.concat( sMacroName ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sUrlPart1 ) ;
-+}
-+
-+String findVBAMacro( SfxObjectShell* pShell, const String& sMod, const String& sMacro )
-+{
-+	String sFullName;	
-+	// would use the script provider to see if the macro exists but
-+	// called at this stage tdoc content handler stuff is not set up
-+	// so it fails
-+
-+    String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
-+	BasicManager* pBasicMgr = pShell-> GetBasicManager();
-+	if ( pBasicMgr )
-+	{
-+		if ( pBasicMgr->GetName().Len() )
-+			sLibrary =  pBasicMgr->GetName();
-+		StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
-+		if ( !pBasic )
-+		{
-+			USHORT nId = pBasicMgr->GetLibId( sLibrary );
-+			pBasicMgr->LoadLib( nId );
-+			pBasic = pBasicMgr->GetLib( sLibrary );
-+		}
-+		if ( pBasic )
-+		{
-+			if ( sMod.Len() ) // we wish to find the macro is a specific module
-+			{
-+				SbModule* pModule = pBasic->FindModule( sMod );
-+				if ( pModule )
-+				{
-+					SbxArray* pMethods = pModule->GetMethods();
-+					if ( pMethods )
-+					{
-+						SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
-+						if ( pMethod )
-+						{
-+							sFullName = sMacro;
-+							sFullName.Insert( '.', 0 ).Insert( sMod, 0 ).Insert( '.', 0 ).Insert( sLibrary, 0 );
-+						}
-+					}
-+				}
-+			}
-+			else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
-+			{
-+					if( SbModule* pModule = pMethod->GetModule() )
-+					{
-+						sFullName = sMacro;
-+						sFullName.Insert( '.', 0 ).Insert( pModule->GetName(), 0).Insert( '.', 0 ).Insert( sLibrary, 0 );
-+					}
-+			}		
-+				
-+		}
-+	}
-+	return sFullName;
-+}
-+
-+// Treat the args as possible inouts ( convertion at bottom of method )
-+sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet )
-+{
-+	// until ObjectModules ( and persisting of codenames ) is supported, if this is a
-+	// document saved from XL then we won't be able to determine the codename for the Workbook
-+	// Module, so... we have no choice but to search all modules for the moment, thus the macro
-+	// passed in should be the fully specified name. 	
-+	rtl::OUString sUrl = makeMacroURL( sMacroName );
-+	uno::Sequence< sal_Int16 > aOutArgsIndex;
-+	uno::Sequence< uno::Any > aOutArgs;
-+	ErrCode nErr = pShell->CallXScript( sUrl,  aArgs, aRet,
-+			aOutArgsIndex, aOutArgs, sal_False );
-+
-+	// Script Executed?
-+	if ( nErr != ERRCODE_NONE )
-+		return sal_False;
-+
-+	sal_Int32 nLen = aOutArgs.getLength();
-+	// convert any out params to seem like they were inouts
-+	if ( nLen )
-+	{
-+		for ( sal_Int32 index=0; index < nLen; ++index )
-+		{
-+			sal_Int32 nOutIndex = aOutArgsIndex[ index ];
-+			aArgs[ nOutIndex ] = aOutArgs[ index ];
-+		}
-+
-+	}
-+	return sal_True;
-+}
-+
-+} } // vba // ooo
-diff --git svx/source/msfilter/msvbasic.cxx svx/source/msfilter/msvbasic.cxx
-index 60667ed..cfe547a 100644
---- svx/source/msfilter/msvbasic.cxx
-+++ svx/source/msfilter/msvbasic.cxx
-@@ -954,7 +954,7 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage)
- 					STREAM_STD_READ | STREAM_NOCREATE );
- // disable read and import of Dir stream bits, e.g. project references and
- // project name for 3.1 ( a bit unstable yet )
--#if 0
-+#if 1
-     // decompress the stream
-     std::auto_ptr< SvMemoryStream > xCmpDir;
-     xCmpDir.reset( MSLZSS::decompressAsStream( xDir, 0 ) );
---- sw/inc/unocoll.hxx
-+++ sw/inc/unocoll.hxx
-@@ -40,6 +40,7 @@
- #include <cppuhelper/implbase4.hxx>	// helper for implementations
- #include <IMark.hxx>
- #include <unobaseclass.hxx>
-+#include "swdllapi.h"
- /***************************************************
-  ***************************************************
-  *
-@@ -283,7 +284,7 @@ cppu::WeakImplHelper3
- 	::com::sun::star::lang::XServiceInfo
- >
- SwCollectionBaseClass;
--class SwXTextTables : public SwCollectionBaseClass,
-+class SW_DLLPUBLIC SwXTextTables : public SwCollectionBaseClass,
- 	public SwUnoCollection
- {
- protected:
---- sw/inc/unotbl.hxx
-+++ sw/inc/unotbl.hxx
-@@ -214,14 +214,13 @@ typedef cppu::WeakImplHelper3<
- 								::com::sun::star::lang::XServiceInfo,
- 								::com::sun::star::beans::XPropertySet
- 							> SwXTextTableCursor_Base;
--class SwXTextTableCursor : public SwXTextTableCursor_Base
-+class SW_DLLPUBLIC SwXTextTableCursor : public SwXTextTableCursor_Base
- 	,public SwClient
- 	,public OTextCursorHelper
- {
- 	SwDepend 				aCrsrDepend;
-     const SfxItemPropertySet*   m_pPropSet;
- 
--	SwFrmFmt* 		GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
- 	//	SwUnoCrsr* 		GetCrsr() const { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
- 
- protected:
-@@ -271,6 +270,7 @@ public:
- 
- 	const SwUnoCrsr*			GetCrsr() const;
- 	SwUnoCrsr*					GetCrsr();
-+	SwFrmFmt* 		GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
- };
- 
- /*-----------------11.12.97 09:38-------------------
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index 65da983..90efd7b 100644
---- sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -154,15 +154,14 @@ using namespace sw::util;
- using namespace sw::types;
- using namespace nsHdFtFlags;
- 
--#include <vbahelper/vbahelper.hxx>
- #include <com/sun/star/document/XEventsSupplier.hpp>
- #include <com/sun/star/container/XNameReplace.hpp>
- #include <com/sun/star/frame/XModel.hpp>
--const static String sModule( RTL_CONSTASCII_USTRINGPARAM("ThisDocument"));
-+#include <svx/msvbahelper.hxx>
-+#include <svtools/pathoptions.hxx>
-+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
- 
--const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
--const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
--const static rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document"); 
-+const static String sModule( RTL_CONSTASCII_USTRINGPARAM("ThisDocument"));
- 
- struct DocEventNameTable
- {
-@@ -194,7 +193,7 @@ bool registerDocEvent( SfxObjectShell* pShell )
-             rtl::OUString sEvt = rtl::OUString::createFromAscii( pTable->sEventName );
-             rtl::OUString sMacroName = rtl::OUString::createFromAscii( pTable->sMacroName );
-             // fail to search the macro if the module is not specified.
--            String sFullPath = ooo::vba::docMacroExists( pShell, sModule, sMacroName );
-+            String sFullPath = ooo::vba::findVBAMacro( pShell, sModule, sMacroName );
-             if( sFullPath.Len() == 0 )
-                 continue;
- 
-@@ -204,7 +203,7 @@ bool registerDocEvent( SfxObjectShell* pShell )
- 		    aOpenEvt[ 0 ].Name = sEvtType;
- 		    aOpenEvt[ 0 ].Value = uno::makeAny(sScript);
- 		    aOpenEvt[ 1 ].Name = sScript;
--            rtl::OUString sUrl = sUrlPart0.concat( sFullPath ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sUrlPart2 );
-+            rtl::OUString sUrl = ooo::vba::makeMacroURL( sFullPath );
-     		aOpenEvt[ 1 ].Value = uno::makeAny(sUrl);
- 	    	sal_Int32 nPos = aEvents.getLength();
- 
-@@ -3866,16 +3865,16 @@ bool WW8Customizations::Import( SwDocShell* pShell )
- 
- bool SwWW8ImplReader::ReadGlobalTemplateSettings()
- {
-+    SvtPathOptions aPathOpt;
-+    String aAddinPath = aPathOpt.GetAddinPath();
-     uno::Sequence< rtl::OUString > sGlobalTemplates;
--    rtl::OUString sNode = rtl::OUString::createFromAscii( "org.openoffice.Office.Writer/GlobalTemplateList" );
--    try
--    {
--        css::uno::Reference< css::container::XNameAccess > xCfg( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessServiceFactory(), sNode, ::comphelper::ConfigurationHelper::E_STANDARD), uno::UNO_QUERY_THROW);
--        xCfg->getByName( rtl::OUString::createFromAscii("Paths") ) >>= sGlobalTemplates;
--    }
--    catch( uno::Exception& )
--    {
--    }
-+
-+    // first get the autoload addins in the directory STARTUP
-+    uno::Reference< ucb::XSimpleFileAccess > xSFA( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), uno::UNO_QUERY_THROW );
-+
-+    if( xSFA->isFolder( aAddinPath ) )
-+        sGlobalTemplates = xSFA->getFolderContents( aAddinPath, sal_False );
-+
-     sal_Int32 nEntries = sGlobalTemplates.getLength();
-     bool bRes = true;
-     const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
-@@ -3894,8 +3893,9 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings()
-                 aURL = sGlobalTemplates[ i ];
-         else
-                 osl::FileBase::getFileURLFromSystemPath( sGlobalTemplates[ i ], aURL );        
--        if ( sCreatedFrom.getLength() && sCreatedFrom.equals( aURL ) )
-+        if ( !aURL.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) || ( sCreatedFrom.getLength() && sCreatedFrom.equals( aURL ) ) )
-             continue; // don't try and read the same document as ourselves
-+
-         SotStorageRef rRoot = new SotStorage( aURL, STREAM_STD_READWRITE, STORAGE_TRANSACTED ); 
-         // Read Macro Projects
-         SvxImportMSVBasic aVBasic(*mpDocShell, *rRoot,
-@@ -4182,7 +4182,7 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
-             maTracer.EnterEnvironment(sw::log::eMacros);
- // dissable below for 3.1 at the moment, 'cause it's kinda immature
- // similarly the project reference in svx/source/msvba
--#if 0
-+#if 1
-             // Read Global templates 
-             ReadGlobalTemplateSettings();
- #endif 
-@@ -4199,7 +4199,7 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
-             int nRet = aVBasic.Import( s1, s2, ! pVBAFlags->IsLoadWordBasicCode() );
- // dissable below for 3.1 at the moment, 'cause it's kinda immature
- // similarly the project reference in svx/source/msvba
--#if 0
-+#if 1
-             WW8Customizations aCustomisations( pTableStream, *pWwFib ); 
-             aCustomisations.Import( mpDocShell );
- #endif 
-diff --git sw/source/ui/vba/makefile.mk sw/source/ui/vba/makefile.mk
-index 42a9bbc..f51ef26 100644
---- sw/source/ui/vba/makefile.mk
-+++ sw/source/ui/vba/makefile.mk
-@@ -69,7 +69,32 @@ SLOFILES= \
- 				$(SLO)$/vbapanes.obj \
- 				$(SLO)$/vbaoptions.obj \
- 				$(SLO)$/vbaselection.obj \
--				$(SLO)$/vbatemplate.obj \
-+ 				$(SLO)$/vbatemplate.obj \
-+				$(SLO)$/vbaparagraphformat.obj \
-+				$(SLO)$/vbaautotextentry.obj \
-+				$(SLO)$/vbaparagraph.obj \
-+				$(SLO)$/vbafind.obj \
-+				$(SLO)$/vbareplacement.obj \
-+				$(SLO)$/vbastyle.obj \
-+				$(SLO)$/vbastyles.obj \
-+				$(SLO)$/vbafont.obj \
-+				$(SLO)$/vbapalette.obj \
-+				$(SLO)$/vbainformationhelper.obj \
-+				$(SLO)$/vbatable.obj \
-+				$(SLO)$/vbatables.obj \
-+				$(SLO)$/vbafield.obj \
-+				$(SLO)$/vbaborders.obj \
-+				$(SLO)$/vbadocuments.obj \
-+				$(SLO)$/vbaheaderfooter.obj \
-+				$(SLO)$/vbaheaderfooterhelper.obj \
-+				$(SLO)$/vbaaddin.obj \
-+				$(SLO)$/vbaaddins.obj \
-+				$(SLO)$/vbadialogs.obj \
-+				$(SLO)$/vbadialog.obj \
-+				$(SLO)$/vbawrapformat.obj \
-+				$(SLO)$/vbapagesetup.obj \
-+				$(SLO)$/vbasection.obj \
-+				$(SLO)$/vbasections.obj \
- 
- # --- Targets ------------------------------------------------------
- 
-diff --git sw/source/ui/vba/service.cxx sw/source/ui/vba/service.cxx
-index 009f440..0ed9492 100644
---- sw/source/ui/vba/service.cxx
-+++ sw/source/ui/vba/service.cxx
-@@ -50,6 +50,11 @@ namespace document
- extern sdecl::ServiceDecl const serviceDecl;
- }
- 
-+namespace wrapformat
-+{
-+extern sdecl::ServiceDecl const serviceDecl;
-+}
-+
- extern "C"
- {
-     void SAL_CALL component_getImplementationEnvironment( 
-@@ -66,7 +71,7 @@ extern "C"
- 
- 	// Component registration
-         return component_writeInfoHelper( pServiceManager, pRegistryKey, 
--		globals::serviceDecl, document::serviceDecl ); 
-+		globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl  ); 
-     }
- 
-     void * SAL_CALL component_getFactory( 
-@@ -75,7 +80,7 @@ extern "C"
-     {
- 		OSL_TRACE("In component_getFactory for %s", pImplName );
- 	void* pRet =  component_getFactoryHelper(
--        	pImplName, pServiceManager, pRegistryKey, globals::serviceDecl, document::serviceDecl );
-+        	pImplName, pServiceManager, pRegistryKey, globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl );
- 	OSL_TRACE("Ret is 0x%x", pRet);
- 	return pRet;
-     }
-diff --git sw/source/ui/vba/vbaaddin.cxx sw/source/ui/vba/vbaaddin.cxx
-new file mode 100644
-index 0000000..559643f
---- /dev/null
-+++ sw/source/ui/vba/vbaaddin.cxx
-@@ -0,0 +1,107 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaaddin.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include <tools/urlobj.hxx>
-+#include <osl/file.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const rtl::OUString& rFileURL, sal_Bool bAutoload ) throw ( uno::RuntimeException ) :
-+    SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbAutoload( bAutoload ), mbInstalled( bAutoload )
-+{
-+}
-+
-+SwVbaAddin::~SwVbaAddin()
-+{
-+}
-+
-+::rtl::OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException)
-+{
-+    rtl::OUString sName;
-+    INetURLObject aURL( msFileURL );
-+    ::osl::File::getSystemPathFromFileURL( aURL.GetLastName(), sName );
-+    return sName;
-+}
-+
-+void SAL_CALL
-+SwVbaAddin::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException )
-+{
-+    throw uno::RuntimeException( rtl::OUString(
-+            RTL_CONSTASCII_USTRINGPARAM(" Fail to set name")), uno::Reference< uno::XInterface >() );
-+}
-+
-+::rtl::OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException)
-+{
-+    INetURLObject aURL( msFileURL );
-+    aURL.CutLastName();
-+    return aURL.GetURLPath();
-+}
-+
-+::sal_Bool SAL_CALL SwVbaAddin::getAutoload() throw (uno::RuntimeException)
-+{
-+    return mbAutoload;
-+}
-+
-+::sal_Bool SAL_CALL SwVbaAddin::getInstalled() throw (uno::RuntimeException)
-+{
-+    return mbInstalled;
-+}
-+
-+void SAL_CALL SwVbaAddin::setInstalled( ::sal_Bool _installed ) throw (uno::RuntimeException)
-+{
-+    if( _installed != mbInstalled )
-+    {
-+        mbInstalled = _installed;
-+        // TODO: should call AutoExec and AutoExit etc.
-+    }
-+}
-+
-+rtl::OUString& 
-+SwVbaAddin::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAddin") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaAddin::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Addin" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-diff --git sw/source/ui/vba/vbaaddin.hxx sw/source/ui/vba/vbaaddin.hxx
-new file mode 100644
-index 0000000..8ddb120
---- /dev/null
-+++ sw/source/ui/vba/vbaaddin.hxx
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_ADDIN_HXX
-+#define SW_VBA_ADDIN_HXX
-+
-+#include <ooo/vba/word/XAddin.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XAddin > SwVbaAddin_BASE;
-+
-+class SwVbaAddin : public SwVbaAddin_BASE
-+{
-+private:
-+    rtl::OUString msFileURL;
-+    sal_Bool mbAutoload;
-+    sal_Bool mbInstalled;
-+
-+public:
-+	SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const rtl::OUString& rFileURL, sal_Bool bAutoload ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaAddin();
-+
-+    // Attributes
-+    virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
-+    virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setInstalled( ::sal_Bool _installed ) throw (css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_ADDIN_HXX */
-diff --git sw/source/ui/vba/vbaaddins.cxx sw/source/ui/vba/vbaaddins.cxx
-new file mode 100644
-index 0000000..17dbed8
---- /dev/null
-+++ sw/source/ui/vba/vbaaddins.cxx
-@@ -0,0 +1,110 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaaddins.hxx"
-+#include "vbaaddin.hxx"
-+#include <cppuhelper/implbase3.hxx>
-+#include <svtools/pathoptions.hxx>
-+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext )
-+{
-+    XNamedObjectCollectionHelper< word::XAddin >::XNamedVec maAddins;
-+
-+    // first get the autoload addins in the directory STARTUP
-+    uno::Reference< lang::XMultiComponentFactory > xMCF( xContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+    uno::Reference< ucb::XSimpleFileAccess > xSFA( xMCF->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), xContext), uno::UNO_QUERY_THROW );
-+    SvtPathOptions aPathOpt;
-+    // FIXME: temporary the STARTUP path is located in $OO/basic3.1/program/addin
-+    String aAddinPath = aPathOpt.GetAddinPath();
-+    OSL_TRACE("lcl_getAddinCollection: %s", rtl::OUStringToOString( aAddinPath, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    if( xSFA->isFolder( aAddinPath ) )
-+    {
-+        uno::Sequence< rtl::OUString > sEntries = xSFA->getFolderContents( aAddinPath, sal_False );
-+        sal_Int32 nEntry = sEntries.getLength();
-+        for( sal_Int32 index = 0; index < nEntry; ++index )
-+        {
-+            rtl::OUString sUrl = sEntries[ index ];
-+            if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) )
-+            {
-+                maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl, sal_True ) ) );
-+            }
-+        }
-+    }
-+
-+    // TODO: second get the customize addins in the org.openoffice.Office.Writer/GlobalTemplateList
-+
-+    uno::Reference< container::XIndexAccess > xAddinsAccess( new XNamedObjectCollectionHelper< word::XAddin >( maAddins ) );
-+    return xAddinsAccess;
-+}
-+
-+SwVbaAddins::SwVbaAddins( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext ) throw (uno::RuntimeException): SwVbaAddins_BASE( xParent, xContext, lcl_getAddinCollection( xParent,xContext ) )
-+{
-+}
-+// XEnumerationAccess
-+uno::Type
-+SwVbaAddins::getElementType() throw (uno::RuntimeException)
-+{
-+	return word::XAddin::static_type(0);
-+}
-+uno::Reference< container::XEnumeration >
-+SwVbaAddins::createEnumeration() throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+    return xEnumerationAccess->createEnumeration();
-+}
-+
-+uno::Any
-+SwVbaAddins::createCollectionObject( const css::uno::Any& aSource )
-+{
-+    return aSource;
-+}
-+
-+rtl::OUString& 
-+SwVbaAddins::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAddins") );
-+	return sImplName;
-+}
-+
-+css::uno::Sequence<rtl::OUString> 
-+SwVbaAddins::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > sNames;
-+	if ( sNames.getLength() == 0 )
-+	{
-+		sNames.realloc( 1 );
-+		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Addins") );
-+	}
-+	return sNames;
-+}
-diff --git sw/source/ui/vba/vbaaddins.hxx sw/source/ui/vba/vbaaddins.hxx
-new file mode 100644
-index 0000000..6efa97e
---- /dev/null
-+++ sw/source/ui/vba/vbaaddins.hxx
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_ADDINS_HXX
-+#define SW_VBA_ADDINS_HXX
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <ooo/vba/word/XAddins.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef CollTestImplHelper< ooo::vba::word::XAddins > SwVbaAddins_BASE;
-+
-+class SwVbaAddins : public SwVbaAddins_BASE
-+{
-+public:
-+	SwVbaAddins( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext ) throw (css::uno::RuntimeException);
-+	virtual ~SwVbaAddins() {}
-+
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+
-+	// SwVbaAddins_BASE
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};    
-+
-+#endif /* SW_VBA_ADDINS_HXX */
-diff --git sw/source/ui/vba/vbaapplication.cxx sw/source/ui/vba/vbaapplication.cxx
-index 0d580e3..4117688 100644
---- sw/source/ui/vba/vbaapplication.cxx
-+++ sw/source/ui/vba/vbaapplication.cxx
-@@ -36,6 +36,13 @@
- #include "vbasystem.hxx"
- #include "vbaoptions.hxx"
- #include "vbaselection.hxx"
-+#include "vbadocuments.hxx"
-+#include "vbaaddins.hxx"
-+#include "vbadialogs.hxx"
-+#include <ooo/vba/word/WdEnableCancelKey.hpp>
-+#include <svx/acorrcfg.hxx>
-+#include "wordvbahelper.hxx"
-+#include <docsh.hxx>
- 
- using namespace ::ooo;
- using namespace ::ooo::vba;
-@@ -71,6 +78,11 @@ SwVbaApplication::~SwVbaApplication()
- {
- }
- 
-+SfxObjectShell* SwVbaApplication::GetDocShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
-+{
-+    return static_cast< SfxObjectShell* >( word::getDocShell( xModel ) );
-+}
-+
- rtl::OUString SAL_CALL
- SwVbaApplication::getName() throw (uno::RuntimeException)
- {
-@@ -115,6 +127,59 @@ SwVbaApplication::getSelection() throw (uno::RuntimeException)
-     return new SwVbaSelection( this, mxContext, getCurrentDocument() );
- }
- 
-+uno::Any SAL_CALL
-+SwVbaApplication::Documents( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< XCollection > xCol( new SwVbaDocuments( this, mxContext ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaApplication::Addins( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    static uno::Reference< XCollection > xCol( new SwVbaAddins( this, mxContext ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaApplication::Dialogs( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< word::XDialogs > xCol( new SwVbaDialogs( this, mxContext ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index );
-+    return uno::makeAny( xCol );
-+}
-+
-+sal_Bool SAL_CALL SwVbaApplication::getDisplayAutoCompleteTips() throw (css::uno::RuntimeException)
-+{
-+    return SvxAutoCorrCfg::Get()->IsAutoTextTip();
-+}
-+
-+void SAL_CALL SwVbaApplication::setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException)
-+{
-+    SvxAutoCorrCfg::Get()->SetAutoTextTip( _displayAutoCompleteTips );
-+}
-+
-+sal_Int32 SAL_CALL SwVbaApplication::getEnableCancelKey() throw (css::uno::RuntimeException)
-+{
-+    // the default value is wdCancelInterrupt in Word
-+    return word::WdEnableCancelKey::wdCancelInterrupt;
-+}
-+
-+void SAL_CALL SwVbaApplication::setEnableCancelKey( sal_Int32/* _enableCancelKey */) throw (css::uno::RuntimeException)
-+{
-+    // seems not supported in Writer
-+}
-+
-+float SAL_CALL SwVbaApplication::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException)
-+{
-+    return VbaApplicationBase::CentimetersToPoints( _Centimeters );
-+}
-+
- rtl::OUString& 
- SwVbaApplication::getServiceImplName()
- {
-diff --git sw/source/ui/vba/vbaapplication.hxx sw/source/ui/vba/vbaapplication.hxx
-index fbb7221..e896e02 100644
---- sw/source/ui/vba/vbaapplication.hxx
-+++ sw/source/ui/vba/vbaapplication.hxx
-@@ -36,6 +36,7 @@
- #include <ooo/vba/word/XSystem.hpp>
- #include <ooo/vba/word/XOptions.hpp>
- #include <ooo/vba/word/XSelection.hpp>
-+#include <ooo/vba/word/XAddins.hpp>
- #include <vbahelper/vbahelperinterface.hxx>
- #include <vbahelper/vbaapplicationbase.hxx>
- #include <cppuhelper/implbase1.hxx>
-@@ -49,6 +50,8 @@ public:
- 	SwVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
- 	virtual ~SwVbaApplication();
- 
-+    virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-+
- 	// XApplication
-     virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-     virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException);
-@@ -57,6 +60,14 @@ public:
-     virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException);
-     virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+    virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+    virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+    virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+    virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException);
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-diff --git sw/source/ui/vba/vbaautotextentry.cxx sw/source/ui/vba/vbaautotextentry.cxx
-new file mode 100644
-index 0000000..2cab994
---- /dev/null
-+++ sw/source/ui/vba/vbaautotextentry.cxx
-@@ -0,0 +1,129 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaautotextentry.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include "vbarange.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaAutoTextEntry::SwVbaAutoTextEntry( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XAutoTextEntry >& xEntry ) throw ( uno::RuntimeException ) :
-+    SwVbaAutoTextEntry_BASE( rParent, rContext ), mxEntry( xEntry )
-+{
-+}
-+
-+SwVbaAutoTextEntry::~SwVbaAutoTextEntry()
-+{
-+}
-+
-+uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& _richtext ) throw ( uno::RuntimeException )
-+{
-+    SwVbaRange* pWhere = dynamic_cast<SwVbaRange*>( _where.get() );
-+    if( pWhere )
-+    {
-+        uno::Reference< text::XTextRange > xTextRange = pWhere->getXTextRange();
-+        xTextRange->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("x") ) ); // set marker
-+        uno::Reference< text::XTextRange > xEndMarker = xTextRange->getEnd();
-+        xEndMarker->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("x") ) ); // set marker
-+        uno::Reference< text::XText > xText = pWhere->getXText();
-+        mxEntry->applyTo( xEndMarker->getStart() );
-+        uno::Reference< text::XTextCursor > xTC = xText->createTextCursorByRange( xTextRange->getStart() );
-+        xTC->goRight( 1, sal_True );
-+        xTC->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("") ) ); // remove marker
-+        xEndMarker->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("") ) ); // remove marker
-+        xTC->gotoRange( xEndMarker, sal_True );
-+        pWhere->setXTextCursor( xTC );
-+    }
-+    return uno::Reference< word::XRange >( pWhere );
-+}
-+
-+rtl::OUString& 
-+SwVbaAutoTextEntry::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntry") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaAutoTextEntry::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.AutoTextEntry" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+
-+SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ), mxAutoTextEntryAccess( xIndexAccess )
-+{
-+}
-+
-+// XEnumerationAccess
-+uno::Type
-+SwVbaAutoTextEntries::getElementType() throw (uno::RuntimeException)
-+{
-+	return word::XAutoTextEntry::static_type(0);
-+}
-+uno::Reference< container::XEnumeration >
-+SwVbaAutoTextEntries::createEnumeration() throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+    return xEnumerationAccess->createEnumeration();
-+}
-+
-+uno::Any
-+SwVbaAutoTextEntries::createCollectionObject( const css::uno::Any& aSource )
-+{
-+    uno::Reference< text::XAutoTextEntry > xEntry( aSource, uno::UNO_QUERY_THROW );
-+    return uno::makeAny( uno::Reference< word::XAutoTextEntry >( new SwVbaAutoTextEntry( this, mxContext, xEntry ) ) );
-+}
-+
-+rtl::OUString& 
-+SwVbaAutoTextEntries::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntries") );
-+	return sImplName;
-+}
-+
-+css::uno::Sequence<rtl::OUString> 
-+SwVbaAutoTextEntries::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > sNames;
-+	if ( sNames.getLength() == 0 )
-+	{
-+		sNames.realloc( 1 );
-+		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.AutoTextEntries") );
-+	}
-+	return sNames;
-+}
-diff --git sw/source/ui/vba/vbaautotextentry.hxx sw/source/ui/vba/vbaautotextentry.hxx
-new file mode 100644
-index 0000000..01d12b9
---- /dev/null
-+++ sw/source/ui/vba/vbaautotextentry.hxx
-@@ -0,0 +1,83 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_AUTOTEXTENTRY_HXX
-+#define SW_VBA_AUTOTEXTENTRY_HXX
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <ooo/vba/word/XAutoTextEntries.hpp>
-+#include <ooo/vba/word/XAutoTextEntry.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/word/XRange.hpp>
-+#include <com/sun/star/text/XAutoTextEntry.hpp>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XAutoTextEntry > SwVbaAutoTextEntry_BASE;
-+
-+class SwVbaAutoTextEntry : public SwVbaAutoTextEntry_BASE
-+{
-+private:
-+    css::uno::Reference< css::text::XAutoTextEntry > mxEntry;
-+
-+public:
-+	SwVbaAutoTextEntry( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XAutoTextEntry >& xEntry ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaAutoTextEntry();
-+
-+    // XAutoTextEntry
-+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException );
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+
-+/* class SwVbaAutoTextEntries */
-+typedef CollTestImplHelper< ooo::vba::word::XAutoTextEntries > SwVbaAutoTextEntries_BASE;
-+
-+class SwVbaAutoTextEntries : public SwVbaAutoTextEntries_BASE
-+{
-+private:
-+    css::uno::Reference< css::container::XIndexAccess > mxAutoTextEntryAccess;
-+
-+public:
-+	SwVbaAutoTextEntries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw (css::uno::RuntimeException);
-+	virtual ~SwVbaAutoTextEntries() {}
-+
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+
-+	// SwVbaAutoTextEntries_BASE
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};    
-+
-+#endif /* SW_VBA_AUTOTEXTENTRY_HXX */
-diff --git sw/source/ui/vba/vbabookmark.cxx sw/source/ui/vba/vbabookmark.cxx
-index e05476e..0c7bacf 100644
---- sw/source/ui/vba/vbabookmark.cxx
-+++ sw/source/ui/vba/vbabookmark.cxx
-@@ -87,7 +87,8 @@ uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException )
- {
-     uno::Reference< text::XTextContent > xTextContent( mxBookmark, uno::UNO_QUERY_THROW );
-     uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
--    return uno::makeAny( uno::Reference< word::XRange>(  new SwVbaRange( this, mxContext, xTextDocument, xTextContent->getAnchor()->getStart(), xTextContent->getAnchor()->getEnd() ) ) );
-+    uno::Reference< text::XTextRange > xTextRange( xTextContent->getAnchor(), uno::UNO_QUERY_THROW );
-+    return uno::makeAny( uno::Reference< word::XRange>(  new SwVbaRange( this, mxContext, xTextDocument, xTextRange->getStart(), xTextRange->getEnd(), xTextRange->getText() ) ) );
- }
- 
- rtl::OUString& 
-diff --git sw/source/ui/vba/vbabookmarks.cxx sw/source/ui/vba/vbabookmarks.cxx
-index 3ff2bf3..e7d73cf 100644
---- sw/source/ui/vba/vbabookmarks.cxx
-+++ sw/source/ui/vba/vbabookmarks.cxx
-@@ -35,6 +35,8 @@
- #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
- #include <ooo/vba/word/WdBookmarkSortBy.hpp>
- #include "vbarange.hxx"
-+#include "wordvbahelper.hxx"
-+#include <cppuhelper/implbase2.hxx>
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
-@@ -55,15 +57,73 @@ public:
- 
- };
- 
--SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, xBookmarks ), mxModel( xModel ) 
-+// Bookmarks use case-insensitive name lookup in MS Word.
-+typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > BookmarkCollectionHelper_BASE;
-+class BookmarkCollectionHelper : public BookmarkCollectionHelper_BASE
-+{
-+private:
-+    uno::Reference< container::XNameAccess > mxNameAccess;
-+    uno::Reference< container::XIndexAccess > mxIndexAccess;
-+    uno::Any cachePos;
-+public:
-+    BookmarkCollectionHelper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : mxIndexAccess( xIndexAccess )
-+    {
-+        mxNameAccess.set( mxIndexAccess, uno::UNO_QUERY_THROW );
-+    }
-+	// XElementAccess
-+	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) { return  mxIndexAccess->getElementType(); }
-+	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) { return mxIndexAccess->hasElements(); }
-+	// XNameAcess 
-+	virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+		if ( !hasByName(aName) )
-+			throw container::NoSuchElementException();
-+		return cachePos;
-+    }
-+	virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
-+	{
-+        return mxNameAccess->getElementNames();
-+    }
-+	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
-+	{
-+        if( mxNameAccess->hasByName( aName ) )
-+        {
-+            cachePos = mxNameAccess->getByName( aName );
-+            return sal_True;
-+        }
-+        else
-+        {
-+            for( sal_Int32 nIndex = 0; nIndex < mxIndexAccess->getCount(); nIndex++ )
-+            {
-+                uno::Reference< container::XNamed > xNamed( mxIndexAccess->getByIndex( nIndex ), uno::UNO_QUERY_THROW );
-+                rtl::OUString aBookmarkName = xNamed->getName();
-+                if( aName.equalsIgnoreAsciiCase( aBookmarkName ) )
-+                {
-+                    cachePos <<= xNamed;
-+                    return sal_True;
-+                }
-+            }
-+        }
-+        return sal_False;
-+    }
-+	// XIndexAccess
-+	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
-+    {
-+        return mxIndexAccess->getCount();
-+    }
-+	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
-+	{
-+        return mxIndexAccess->getByIndex( Index );
-+    }
-+};
-+
-+SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BookmarkCollectionHelper( xBookmarks ) ) ), mxModel( xModel ) 
- {
-     mxBookmarksSupplier.set( mxModel, uno::UNO_QUERY_THROW );
-     uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
--    mxText = xDocument->getText();
--    
--    // FIXME: fail to rename the bookmark
--    // word doesn't distinguish cases, so set all bookmarknames to Lowercase
--    //renameAllBookmarksToLowercase();
-+    // use view cursor to insert bookmark, or it will fail if insert bookmark in table
-+    // mxText = xDocument->getText();
-+    mxText = word::getXTextViewCursor( mxModel )->getText();
- }
- // XEnumerationAccess
- uno::Type
-@@ -88,7 +148,7 @@ SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource )
- 
- void SwVbaBookmarks::removeBookmarkByName( const rtl::OUString& rName ) throw (uno::RuntimeException)
- {
--    uno::Reference< text::XTextContent > xBookmark( mxBookmarksSupplier->getBookmarks()->getByName( rName ), uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextContent > xBookmark( m_xNameAccess->getByName( rName ), uno::UNO_QUERY_THROW );
-     mxText->removeTextContent( xBookmark );
- }
- 
-@@ -101,19 +161,6 @@ void SwVbaBookmarks::addBookmarkByName( const rtl::OUString& rName, const uno::R
-     mxText->insertTextContent( rTextRange, xBookmark, sal_False );
- }
- 
--void SwVbaBookmarks::renameAllBookmarksToLowercase() throw (uno::RuntimeException)
--{
--    uno::Reference< container::XIndexAccess > xBookmarks( mxBookmarksSupplier->getBookmarks(),uno::UNO_QUERY_THROW );
--    for( sal_Int32 nIndex = 0; nIndex < xBookmarks->getCount(); nIndex++ )
--    {
--        uno::Reference< container::XNamed > xNamed( xBookmarks->getByIndex( nIndex ), uno::UNO_QUERY_THROW );
--        rtl::OUString aName = xNamed->getName();
--        rtl::OUString aNameLowerCase = aName.toAsciiLowerCase();
--        if( !aName.equals( aNameLowerCase ) );
--            xNamed->setName( aNameLowerCase );
--    }
--}
--
- uno::Any SAL_CALL
- SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException)
- {
-@@ -128,13 +175,13 @@ SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw
-     else
-     {
-         // FIXME: insert the bookmark into current view cursor
--        uno::Reference< text::XTextViewCursorSupplier > xViewCursorSupplier( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
--        xTextRange.set( xViewCursorSupplier->getViewCursor(), uno::UNO_QUERY_THROW );
-+        xTextRange.set( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW );
-     }
- 
-     // remove the exist bookmark
--    rtl::OUString aName = rName.toAsciiLowerCase();
--    if( mxBookmarksSupplier->getBookmarks()->hasByName( aName ) )
-+    // rtl::OUString aName = rName.toAsciiLowerCase();
-+    rtl::OUString aName = rName;
-+    if( m_xNameAccess->hasByName( aName ) )
-         removeBookmarkByName( aName );
-     
-     addBookmarkByName( aName, xTextRange );
-@@ -169,7 +216,7 @@ SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeEx
- sal_Bool SAL_CALL 
- SwVbaBookmarks::Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException)
- {
--    sal_Bool bExist = mxBookmarksSupplier->getBookmarks()->hasByName( rName.toAsciiLowerCase() );
-+    sal_Bool bExist = m_xNameAccess->hasByName( rName );
-     return bExist;
- }
- 
-diff --git sw/source/ui/vba/vbabookmarks.hxx sw/source/ui/vba/vbabookmarks.hxx
-index 7fe5ffe..6047788 100644
---- sw/source/ui/vba/vbabookmarks.hxx
-+++ sw/source/ui/vba/vbabookmarks.hxx
-@@ -51,7 +51,6 @@ private:
- private:
-     void removeBookmarkByName( const rtl::OUString& rName ) throw (css::uno::RuntimeException);
-     void addBookmarkByName( const rtl::OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException);
--    void renameAllBookmarksToLowercase() throw (css::uno::RuntimeException);
- 
- public:
- 	SwVbaBookmarks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xBookmarks, const css::uno::Reference< css::frame::XModel >& xModel );
-diff --git sw/source/ui/vba/vbaborders.cxx sw/source/ui/vba/vbaborders.cxx
-new file mode 100644
-index 0000000..44ed6eb
---- /dev/null
-+++ sw/source/ui/vba/vbaborders.cxx
-@@ -0,0 +1,381 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbaborders.cxx,v $
-+ * $Revision: 1.6 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaborders.hxx"
-+#include <ooo/vba/word/XBorder.hpp>
-+#include <ooo/vba/word/WdBorderType.hpp>
-+#include <ooo/vba/word/WdLineStyle.hpp>
-+#include <cppuhelper/implbase3.hxx>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/table/TableBorder.hpp>
-+#include <com/sun/star/table/ShadowFormat.hpp>
-+#include <com/sun/star/table/ShadowLocation.hpp>
-+#include "vbapalette.hxx"
-+
-+using namespace ::com::sun::star;
-+using namespace ::ooo::vba;
-+
-+
-+typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangeBorders_Base;
-+typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base;
-+
-+// #TODO sort these indexes to match the order in which Word iterates over the
-+// borders, the enumeration will match the order in this list
-+static const sal_Int16 supportedIndexTable[] = { word::WdBorderType::wdBorderBottom, word::WdBorderType::wdBorderDiagonalDown, word::WdBorderType::wdBorderDiagonalUp, word::WdBorderType::wdBorderHorizontal, word::WdBorderType::wdBorderLeft, word::WdBorderType::wdBorderRight, word::WdBorderType::wdBorderTop, word::WdBorderType::wdBorderVertical };
-+
-+const static rtl::OUString sTableBorder( RTL_CONSTASCII_USTRINGPARAM("TableBorder") );
-+
-+//  Equiv widths in in 1/100 mm
-+const static sal_Int32 OOLineThin = 35;
-+const static sal_Int32 OOLineMedium = 88;
-+const static sal_Int32 OOLineThick = 141;
-+const static sal_Int32 OOLineHairline = 2;
-+
-+class SwVbaBorder : public SwVbaBorder_Base
-+{
-+private:
-+	uno::Reference< beans::XPropertySet > m_xProps;
-+	sal_Int32 m_LineType;	
-+	VbaPalette m_Palette;
-+	bool setBorderLine( table::BorderLine& rBorderLine )
-+	{
-+		table::TableBorder aTableBorder;
-+		m_xProps->getPropertyValue( sTableBorder ) >>= aTableBorder;
-+
-+		switch ( m_LineType )
-+		{
-+			case word::WdBorderType::wdBorderLeft:
-+				aTableBorder.IsLeftLineValid = sal_True;
-+				aTableBorder.LeftLine= rBorderLine;
-+				break;
-+			case word::WdBorderType::wdBorderTop:
-+				aTableBorder.IsTopLineValid = sal_True;
-+				aTableBorder.TopLine = rBorderLine;
-+				break;
-+			
-+			case word::WdBorderType::wdBorderBottom:
-+				aTableBorder.IsBottomLineValid = sal_True;
-+				aTableBorder.BottomLine = rBorderLine;
-+				break;
-+			case word::WdBorderType::wdBorderRight:
-+				aTableBorder.IsRightLineValid = sal_True;
-+				aTableBorder.RightLine = rBorderLine;
-+				break;
-+			case word::WdBorderType::wdBorderVertical:
-+				aTableBorder.IsVerticalLineValid = sal_True;
-+				aTableBorder.VerticalLine = rBorderLine;
-+				break;
-+			case word::WdBorderType::wdBorderHorizontal:
-+				aTableBorder.IsHorizontalLineValid = sal_True;
-+				aTableBorder.HorizontalLine = rBorderLine;
-+				break;
-+			case word::WdBorderType::wdBorderDiagonalDown:
-+			case word::WdBorderType::wdBorderDiagonalUp:
-+				// #TODO have to ignore at the momement, would be
-+				// nice to investigate what we can do here
-+				break; 
-+			default:
-+					return false;
-+		}
-+		m_xProps->setPropertyValue( sTableBorder, uno::makeAny(aTableBorder) );
-+		return true;
-+	}	
-+
-+	bool getBorderLine( table::BorderLine& rBorderLine )
-+	{
-+		table::TableBorder aTableBorder;
-+		m_xProps->getPropertyValue( sTableBorder ) >>= aTableBorder;
-+		switch ( m_LineType )
-+		{
-+			case word::WdBorderType::wdBorderLeft:
-+				if ( aTableBorder.IsLeftLineValid )
-+					rBorderLine = aTableBorder.LeftLine;
-+				break;
-+			case word::WdBorderType::wdBorderTop:
-+				if ( aTableBorder.IsTopLineValid )
-+					rBorderLine = aTableBorder.TopLine;
-+				break;
-+			case word::WdBorderType::wdBorderBottom:
-+				if ( aTableBorder.IsBottomLineValid )
-+					rBorderLine = aTableBorder.BottomLine;
-+				break;
-+			case word::WdBorderType::wdBorderRight:
-+				if ( aTableBorder.IsRightLineValid )
-+					rBorderLine = aTableBorder.RightLine;
-+				break;
-+			case word::WdBorderType::wdBorderVertical:
-+                if ( aTableBorder.IsVerticalLineValid )
-+                    rBorderLine = aTableBorder.VerticalLine;
-+				break;
-+			case word::WdBorderType::wdBorderHorizontal:
-+                if ( aTableBorder.IsHorizontalLineValid )
-+                    rBorderLine = aTableBorder.HorizontalLine;
-+				break;
-+
-+			case word::WdBorderType::wdBorderDiagonalDown:
-+			case word::WdBorderType::wdBorderDiagonalUp:
-+				// #TODO have to ignore at the momement, would be
-+				// nice to investigate what we can do here
-+				break; 
-+			default:
-+					return false;
-+		}
-+		return true;
-+	}	
-+	SwVbaBorder(); // no impl
-+protected: 
-+	virtual rtl::OUString& getServiceImplName()
-+	{
-+		static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBorder") );
-+	return sImplName;		
-+	}
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames()
-+	{
-+		static uno::Sequence< rtl::OUString > aServiceNames;
-+		if ( aServiceNames.getLength() == 0 )
-+		{
-+			aServiceNames.realloc( 1 );
-+			aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Border" ) );
-+		}
-+		return aServiceNames;		
-+	}
-+public:
-+	SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, VbaPalette& rPalette) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {}  	
-+
-+	uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException)
-+	{
-+        sal_Int32 nLineStyle = word::WdLineStyle::wdLineStyleNone;
-+        table::BorderLine aBorderLine;
-+        if ( getBorderLine( aBorderLine ) )
-+        {
-+            if( aBorderLine.InnerLineWidth !=0 && aBorderLine.OuterLineWidth !=0 )
-+            {
-+                nLineStyle = word::WdLineStyle::wdLineStyleDouble;
-+            }
-+            else if( aBorderLine.InnerLineWidth !=0 || aBorderLine.OuterLineWidth !=0 )
-+            {
-+                nLineStyle = word::WdLineStyle::wdLineStyleSingle;
-+            }
-+            else
-+            {
-+                nLineStyle = word::WdLineStyle::wdLineStyleNone;
-+            }
-+        }
-+		return uno::makeAny( nLineStyle );
-+	}
-+	void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException) 
-+	{
-+		// Urk no choice but to silently ignore we don't support this attribute
-+		// #TODO would be nice to support the word line styles
-+        sal_Int32 nLineStyle = 0;
-+        _linestyle >>= nLineStyle;
-+        table::BorderLine aBorderLine;
-+		if ( getBorderLine( aBorderLine ) )
-+		{
-+			switch ( nLineStyle )
-+			{
-+                case word::WdLineStyle::wdLineStyleNone:
-+                {
-+                    aBorderLine.InnerLineWidth = 0;
-+                    aBorderLine.OuterLineWidth = 0;
-+                    break;
-+                }
-+                case word::WdLineStyle::wdLineStyleDashDot:
-+                case word::WdLineStyle::wdLineStyleDashDotDot:
-+                case word::WdLineStyle::wdLineStyleDashDotStroked:
-+                case word::WdLineStyle::wdLineStyleDashLargeGap:
-+                case word::WdLineStyle::wdLineStyleDashSmallGap:
-+                case word::WdLineStyle::wdLineStyleDot:
-+                case word::WdLineStyle::wdLineStyleDouble:
-+                case word::WdLineStyle::wdLineStyleDoubleWavy:
-+                case word::WdLineStyle::wdLineStyleEmboss3D:
-+                case word::WdLineStyle::wdLineStyleEngrave3D:
-+                case word::WdLineStyle::wdLineStyleInset:
-+                case word::WdLineStyle::wdLineStyleOutset:
-+                case word::WdLineStyle::wdLineStyleSingle:
-+                case word::WdLineStyle::wdLineStyleSingleWavy:
-+                case word::WdLineStyle::wdLineStyleThickThinLargeGap:
-+                case word::WdLineStyle::wdLineStyleThickThinMedGap:
-+                case word::WdLineStyle::wdLineStyleThickThinSmallGap:
-+                case word::WdLineStyle::wdLineStyleThinThickLargeGap:
-+                case word::WdLineStyle::wdLineStyleThinThickMedGap:
-+                case word::WdLineStyle::wdLineStyleThinThickSmallGap:
-+                case word::WdLineStyle::wdLineStyleThinThickThinLargeGap:
-+                case word::WdLineStyle::wdLineStyleThinThickThinMedGap:
-+                case word::WdLineStyle::wdLineStyleThinThickThinSmallGap:
-+                case word::WdLineStyle::wdLineStyleTriple:
-+                {
-+                    aBorderLine.InnerLineWidth = 0;
-+                    aBorderLine.OuterLineWidth = OOLineHairline;
-+                    break;
-+                }
-+                default:
-+                    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bad param" ) ), uno::Reference< uno::XInterface >() );
-+            }
-+			setBorderLine( aBorderLine );
-+        }
-+		else
-+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() );
-+	}
-+};
-+
-+class RangeBorders : public RangeBorders_Base
-+{
-+private:
-+	uno::Reference< table::XCellRange > m_xRange;
-+	uno::Reference< uno::XComponentContext > m_xContext;
-+	VbaPalette m_Palette;
-+	sal_Int32 getTableIndex( sal_Int32 nConst )
-+	{
-+		// hokay return position of the index in the table
-+		sal_Int32 nIndexes = getCount();
-+		sal_Int32 realIndex = 0;
-+		const sal_Int16* pTableEntry = supportedIndexTable;
-+		for ( ; realIndex < nIndexes; ++realIndex, ++pTableEntry )
-+		{
-+			if ( *pTableEntry == nConst )
-+				return realIndex;
-+		}
-+		return getCount(); // error condition
-+	}
-+public:
-+	RangeBorders(  const uno::Reference< table::XCellRange >& xRange,  const uno::Reference< uno::XComponentContext > & xContext, VbaPalette& rPalette ) : m_xRange( xRange ), m_xContext( xContext ), m_Palette( rPalette )
-+	{
-+	}
-+	// XIndexAccess 
-+	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
-+	{
-+		return sizeof( supportedIndexTable ) / sizeof( supportedIndexTable[0] );
-+	}
-+	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) 
-+	{
-+			
-+		sal_Int32 nIndex = getTableIndex( Index );
-+		if ( nIndex >= 0 && nIndex < getCount() )
-+		{
-+			uno::Reference< beans::XPropertySet > xProps( m_xRange, uno::UNO_QUERY_THROW );
-+			return uno::makeAny( uno::Reference< word::XBorder >( new SwVbaBorder( xProps, m_xContext, supportedIndexTable[ nIndex ], m_Palette )) );
-+		}
-+		throw lang::IndexOutOfBoundsException();
-+	}
-+	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
-+	{
-+		return  word::XBorder::static_type(0);
-+	}
-+	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
-+	{
-+		return sal_True;
-+	}
-+};
-+
-+uno::Reference< container::XIndexAccess > 
-+rangeToBorderIndexAccess( const uno::Reference< table::XCellRange >& xRange,  const uno::Reference< uno::XComponentContext > & xContext, VbaPalette& rPalette )
-+{
-+	return new RangeBorders( xRange, xContext, rPalette );
-+}
-+
-+class RangeBorderEnumWrapper : public EnumerationHelper_BASE
-+{
-+	uno::Reference<container::XIndexAccess > m_xIndexAccess;
-+	sal_Int32 nIndex;
-+public:
-+	RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
-+	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
-+	{
-+		return ( nIndex < m_xIndexAccess->getCount() );
-+	}
-+
-+	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+	{
-+		if ( nIndex < m_xIndexAccess->getCount() )
-+			return m_xIndexAccess->getByIndex( nIndex++ );
-+		throw container::NoSuchElementException();
-+	}
-+};
-+
-+// for Table borders
-+SwVbaBorders::SwVbaBorders( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< table::XCellRange >& xRange, VbaPalette& rPalette  ):  SwVbaBorders_BASE( xParent, xContext, rangeToBorderIndexAccess( xRange ,xContext, rPalette ) )
-+{
-+	m_xProps.set( xRange, uno::UNO_QUERY_THROW );
-+}
-+
-+uno::Reference< container::XEnumeration >
-+SwVbaBorders::createEnumeration() throw (uno::RuntimeException)
-+{
-+	return new RangeBorderEnumWrapper( m_xIndexAccess );
-+}
-+
-+uno::Any
-+SwVbaBorders::createCollectionObject( const css::uno::Any& aSource )
-+{
-+	return aSource; // its already a Border object
-+}
-+
-+uno::Type 
-+SwVbaBorders::getElementType() throw (uno::RuntimeException)
-+{
-+	return word::XBorders::static_type(0);
-+}
-+
-+uno::Any
-+SwVbaBorders::getItemByIntIndex( const sal_Int32 nIndex )  throw (uno::RuntimeException)
-+{
-+	return createCollectionObject( m_xIndexAccess->getByIndex( nIndex ) );
-+}
-+
-+sal_Bool SAL_CALL SwVbaBorders::getShadow() throw (uno::RuntimeException)
-+{
-+    table::ShadowFormat aShadowFormat;
-+    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShadowFormat") ) ) >>= aShadowFormat;
-+    return ( aShadowFormat.Location != table::ShadowLocation_NONE );
-+}
-+
-+void SAL_CALL SwVbaBorders::setShadow( sal_Bool _shadow ) throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+rtl::OUString& 
-+SwVbaBorders::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBorders") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaBorders::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Borders" ) );
-+	}
-+	return aServiceNames;
-+}
-diff --git sw/source/ui/vba/vbaborders.hxx sw/source/ui/vba/vbaborders.hxx
-new file mode 100644
-index 0000000..b0cf517
---- /dev/null
-+++ sw/source/ui/vba/vbaborders.hxx
-@@ -0,0 +1,66 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbaborders.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_BORDERS_HXX
-+#define SW_VBA_BORDERS_HXX
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/word/XBorders.hpp>
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+#include <com/sun/star/table/XCellRange.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <vbahelper/vbacollectionimpl.hxx>
-+
-+typedef CollTestImplHelper< ov::word::XBorders > SwVbaBorders_BASE;
-+class VbaPalette;
-+class SwVbaBorders : public SwVbaBorders_BASE
-+{
-+	// XEnumerationAccess
-+	virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException);
-+	css::uno::Reference< css::beans::XPropertySet > m_xProps;
-+public:
-+	SwVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, VbaPalette& rPalette );
-+	virtual ~SwVbaBorders() {}
-+
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+
-+	// SwVbaCollectionBaseImpl	
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
-+	
-+	virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException);
-+
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif //SW_VBA_BORDERS_HXX
-+
-diff --git sw/source/ui/vba/vbadialog.cxx sw/source/ui/vba/vbadialog.cxx
-new file mode 100644
-index 0000000..df35a1a
---- /dev/null
-+++ sw/source/ui/vba/vbadialog.cxx
-@@ -0,0 +1,81 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadialog.cxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbadialog.hxx"
-+#include <ooo/vba/word/WdWordDialog.hpp>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+struct WordDialogTable
-+{
-+    sal_Int32 wdDialog;
-+    const sal_Char* ooDialog;
-+};
-+
-+static const WordDialogTable aWordDialogTable[] =
-+{
-+    { word::WdWordDialog::wdDialogFileNew, ".uno:NewDoc" },
-+    { word::WdWordDialog::wdDialogFileOpen, ".uno:Open" },
-+    { word::WdWordDialog::wdDialogFilePrint, ".uno:Print" },
-+    { word::WdWordDialog::wdDialogFileSaveAs, ".uno:SaveAs" },
-+    { 0, 0 }
-+};
-+
-+rtl::OUString 
-+SwVbaDialog::mapIndexToName( sal_Int32 nIndex )
-+{
-+    for( const WordDialogTable* pTable = aWordDialogTable; pTable->wdDialog != NULL; pTable++ )
-+    {
-+        if( nIndex == pTable->wdDialog )
-+        {
-+            return rtl::OUString::createFromAscii( pTable->ooDialog );
-+        }
-+    }
-+	return rtl::OUString();
-+}
-+
-+rtl::OUString& 
-+SwVbaDialog::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDialog") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaDialog::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Dialog" ) );
-+	}
-+	return aServiceNames;
-+}
-diff --git sw/source/ui/vba/vbadialog.hxx sw/source/ui/vba/vbadialog.hxx
-new file mode 100644
-index 0000000..9090f15
---- /dev/null
-+++ sw/source/ui/vba/vbadialog.hxx
-@@ -0,0 +1,53 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadialog.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_DIALOG_HXX
-+#define SW_VBA_DIALOG_HXX
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/word/XDialog.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbadialogbase.hxx>
-+
-+typedef cppu::ImplInheritanceHelper1< VbaDialogBase, ov::word::XDialog > SwVbaDialog_BASE;
-+
-+class SwVbaDialog : public SwVbaDialog_BASE
-+{
-+public:
-+	SwVbaDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nIndex ):SwVbaDialog_BASE( xParent, xContext, nIndex ) {}
-+	virtual ~SwVbaDialog() {}
-+
-+	// Methods
-+	virtual rtl::OUString mapIndexToName( sal_Int32 nIndex );
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif /* SW_VBA_DIALOG_HXX */
-diff --git sw/source/ui/vba/vbadialogs.cxx sw/source/ui/vba/vbadialogs.cxx
-new file mode 100644
-index 0000000..26dd7f1
---- /dev/null
-+++ sw/source/ui/vba/vbadialogs.cxx
-@@ -0,0 +1,64 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadialogs.cxx,v $
-+ * $Revision: 1.5 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <ooo/vba/word/XDialog.hpp>
-+#include "vbadialogs.hxx"
-+#include "vbadialog.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+uno::Any
-+SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nIndex = 0;
-+	aItem >>= nIndex;
-+	uno::Reference< word::XDialog > aDialog( new SwVbaDialog( uno::Reference< XHelperInterface >( Application(),uno::UNO_QUERY_THROW ), mxContext, nIndex ) );
-+	return uno::Any( aDialog );
-+}
-+
-+rtl::OUString& 
-+SwVbaDialogs::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDialogs") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaDialogs::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Dialogs" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-diff --git sw/source/ui/vba/vbadialogs.hxx sw/source/ui/vba/vbadialogs.hxx
-new file mode 100644
-index 0000000..ef36067
---- /dev/null
-+++ sw/source/ui/vba/vbadialogs.hxx
-@@ -0,0 +1,56 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadialogs.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_DIALOGS_HXX
-+#define SW_VBA_DIALOGS_HXX
-+
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+#include <ooo/vba/word/XDialogs.hpp>
-+#include <ooo/vba/XCollection.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbadialogsbase.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+
-+typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::word::XDialogs > SwVbaDialogs_BASE;
-+
-+class SwVbaDialogs : public SwVbaDialogs_BASE
-+{
-+public:
-+	SwVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext ): SwVbaDialogs_BASE( xParent, xContext ) {} 
-+	virtual ~SwVbaDialogs() {}
-+
-+	// XCollection
-+	virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif /* SW_VBA_DIALOGS_HXX */
-diff --git sw/source/ui/vba/vbadocument.cxx sw/source/ui/vba/vbadocument.cxx
-index bb03373..906a617 100644
---- sw/source/ui/vba/vbadocument.cxx
-+++ sw/source/ui/vba/vbadocument.cxx
-@@ -37,10 +37,23 @@
- #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
- #include <com/sun/star/document/XDocumentInfoSupplier.hpp>
- #include <com/sun/star/document/XDocumentProperties.hpp>
-+#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-+#include <com/sun/star/drawing/XControlShape.hpp>
-+#include <com/sun/star/drawing/XControlShape.hpp>
-+#include <com/sun/star/form/XFormsSupplier.hpp>
-+#include <ooo/vba/XControlProvider.hpp>
-+
- #include <vbahelper/helperdecl.hxx>
- #include <wordvbahelper.hxx>
- #include <docsh.hxx>
- #include "vbatemplate.hxx"
-+#include "vbaparagraph.hxx"
-+#include "vbastyles.hxx"
-+#include "vbatables.hxx"
-+#include "vbafield.hxx"
-+#include "vbapagesetup.hxx"
-+#include "vbasections.hxx"
-+#include <vbahelper/vbashapes.hxx>
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
-@@ -159,6 +172,61 @@ SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException
-     return uno::Any( xVariables->Item( rIndex, uno::Any() ) );
- }
- 
-+uno::Any SAL_CALL
-+SwVbaDocument::Paragraphs( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< XCollection > xCol( new SwVbaParagraphs( mxParent, mxContext, mxTextDocument ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaDocument::Styles( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< XCollection > xCol( new SwVbaStyles( mxParent, mxContext, getModel() ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaDocument::Fields( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< XCollection > xCol( new SwVbaFields( mxParent, mxContext, getModel() ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaDocument::Shapes( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( getModel(), uno::UNO_QUERY_THROW );
-+    //uno::Reference< drawing::XShapes > xShapes( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
-+    uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
-+    uno::Reference< XCollection > xCol( new ScVbaShapes( this, mxContext, xIndexAccess ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaDocument::Sections( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< XCollection > xCol( new SwVbaSections( mxParent, mxContext, getModel() ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaDocument::PageSetup( ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< beans::XPropertySet > xPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
-+    return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) );
-+}
-+
- rtl::OUString& 
- SwVbaDocument::getServiceImplName()
- {
-@@ -185,6 +253,112 @@ SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) thr
-     throw uno::RuntimeException();
- }
- 
-+uno::Any SAL_CALL 
-+SwVbaDocument::Tables( const css::uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
-+    uno::Reference< XCollection > xColl( new SwVbaTables( mxParent, mxContext, xModel ) );
-+    
-+    if ( aIndex.hasValue() )
-+        return xColl->Item( aIndex, uno::Any() );
-+    return uno::makeAny( xColl );
-+}
-+
-+void SAL_CALL SwVbaDocument::Activate() throw (uno::RuntimeException)
-+{
-+    VbaDocumentBase::Activate();
-+}
-+
-+uno::Any
-+SwVbaDocument::getControlShape( const ::rtl::OUString& sName )
-+{
-+    uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxTextDocument, uno::UNO_QUERY_THROW );
-+    uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
-+
-+    sal_Int32 nCount = xIndexAccess->getCount();
-+    for( int index = 0; index < nCount; index++ )
-+    {
-+        uno::Any aUnoObj =  xIndexAccess->getByIndex( index );
-+        // It seems there are some drawing objects that can not query into Control shapes?
-+        uno::Reference< drawing::XControlShape > xControlShape( aUnoObj, uno::UNO_QUERY );
-+        if( xControlShape.is() )
-+        {
-+     	    uno::Reference< container::XNamed > xNamed( xControlShape->getControl(), uno::UNO_QUERY_THROW );
-+            if( sName.equals( xNamed->getName() ))
-+            {
-+                return aUnoObj;
-+            }
-+        }
-+    }
-+    return uno::Any();
-+}
-+
-+uno::Reference< beans::XIntrospectionAccess > SAL_CALL 
-+SwVbaDocument::getIntrospection(  ) throw (uno::RuntimeException)
-+{
-+	return uno::Reference< beans::XIntrospectionAccess >();
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaDocument::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
-+{
-+	OSL_TRACE("** SwVbaDocument::invoke( %s ), will barf",
-+		rtl::OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+	
-+	throw uno::RuntimeException(); // unsupported operation
-+}
-+
-+void SAL_CALL 
-+SwVbaDocument::setValue( const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
-+{
-+	throw uno::RuntimeException(); // unsupported operation
-+}
-+uno::Any SAL_CALL 
-+SwVbaDocument::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
-+{
-+    uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW );
-+    
-+    uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+    uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
-+    uno::Reference< msforms::XControl > xControl( xControlProvider->createControl(  xControlShape, getModel() ) );
-+    return uno::makeAny( xControl );
-+}
-+
-+::sal_Bool SAL_CALL 
-+SwVbaDocument::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException)
-+{
-+	return sal_False;
-+}
-+
-+::sal_Bool SAL_CALL 
-+SwVbaDocument::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
-+{
-+	uno::Reference< container::XNameAccess > xFormControls( getFormControls() );
-+	if ( xFormControls.is() )
-+		return xFormControls->hasByName( aName );
-+	return sal_False;
-+}
-+
-+uno::Reference< container::XNameAccess > 
-+SwVbaDocument::getFormControls()
-+{
-+	uno::Reference< container::XNameAccess > xFormControls;
-+	try
-+	{
-+		uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxTextDocument, uno::UNO_QUERY_THROW );
-+		uno::Reference< form::XFormsSupplier >  xFormSupplier( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
-+    		uno::Reference< container::XIndexAccess > xIndexAccess( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
-+		// get the www-standard container ( maybe we should access the 
-+		// 'www-standard' by name rather than index, this seems an
-+		// implementation detail
-+		xFormControls.set( xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW );
-+	}
-+	catch( uno::Exception& )
-+	{
-+	}
-+	return xFormControls;
-+}
-+
- uno::Sequence< rtl::OUString > 
- SwVbaDocument::getServiceNames()
- {
-diff --git sw/source/ui/vba/vbadocument.hxx sw/source/ui/vba/vbadocument.hxx
-index a82503b..651b06c 100644
---- sw/source/ui/vba/vbadocument.hxx
-+++ sw/source/ui/vba/vbadocument.hxx
-@@ -43,6 +43,9 @@ private:
-     css::uno::Reference< css::text::XTextDocument > mxTextDocument;
- 
-     void Initialize();
-+    css::uno::Any getControlShape( const rtl::OUString& sName );
-+    css::uno::Reference< css::container::XNameAccess > getFormControls();
-+
- public:
- 	SwVbaDocument( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& m_xContext, css::uno::Reference< css::frame::XModel > xModel );
- 	SwVbaDocument(  css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
-@@ -57,7 +60,21 @@ public:
-     virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
-     virtual css::uno::Any SAL_CALL getAttachedTemplate() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (css::uno::RuntimeException);
--
-+    virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
-+    virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
-+    virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException);
-+	// XInvocation
-+	virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
-+	virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
-+	virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
-+	virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
- 
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
-diff --git sw/source/ui/vba/vbadocumentproperties.cxx sw/source/ui/vba/vbadocumentproperties.cxx
-index 74470f9..f07b978 100644
---- sw/source/ui/vba/vbadocumentproperties.cxx
-+++ sw/source/ui/vba/vbadocumentproperties.cxx
-@@ -250,38 +250,7 @@ public:
-     {
-         boost::shared_ptr< PropertGetSetHelper > aStandardHelper( new BuiltinPropertyGetSetHelper( xModel ) );
-         boost::shared_ptr< PropertGetSetHelper > aUsingStatsHelper( new StatisticPropertyGetSetHelper( xModel ) );
--/*
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTitle ] = DocPropInfo::createDocPropInfo( "Title", "Title", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySubject ] = DocPropInfo::createDocPropInfo( "Subject", "Subject", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAuthor ] = DocPropInfo::createDocPropInfo( "Author", "Author", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyKeywords ] = DocPropInfo::createDocPropInfo( "Keywords", "Keywords", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyComments ] = DocPropInfo::createDocPropInfo( "Comments", "Description", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTemplate ] = DocPropInfo::createDocPropInfo( "Template", "Template", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLastAuthor ] = DocPropInfo::createDocPropInfo( "Last author", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyRevision ] = DocPropInfo::createDocPropInfo( "Revision number", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAppName ] = DocPropInfo::createDocPropInfo( "Application name", "Generator", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastPrinted ] = DocPropInfo::createDocPropInfo( "Last print date", "PrintDate", office::MsoDocProperties::msoPropertyTypeDate, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeCreated ] = DocPropInfo::createDocPropInfo( "Creation date", "CreationDate", office::MsoDocProperties::msoPropertyTypeDate, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastSaved ] = DocPropInfo::createDocPropInfo( "Last save time", "ModifyDate", office::MsoDocProperties::msoPropertyTypeDate, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyVBATotalEdit ] = DocPropInfo::createDocPropInfo( "Total editing time", "EditingDuration", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // Not sure if this is correct 
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyPages ] = DocPropInfo::createDocPropInfo( "Number of pages", "PageCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling required
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyWords ] = DocPropInfo::createDocPropInfo( "Number of words", "WordCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling required
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharacters ] = DocPropInfo::createDocPropInfo( "Number of characters", "CharacterCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling required
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySecurity ] = DocPropInfo::createDocPropInfo( "Security", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCategory ] = DocPropInfo::createDocPropInfo( "Category", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyFormat ] = DocPropInfo::createDocPropInfo( "Format", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyManager ] = DocPropInfo::createDocPropInfo( "Manager", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCompany ] = DocPropInfo::createDocPropInfo( "Company", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyBytes ] = DocPropInfo::createDocPropInfo( "Number of bytes", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist - size on disk exists ( for an already saved document ) perhaps it will do ( or we need something else )
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLines ] = DocPropInfo::createDocPropInfo( "Number of lines", "LineCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyParas ] = DocPropInfo::createDocPropInfo( "Number of paragraphs", "", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySlides ] = DocPropInfo::createDocPropInfo( "Number of slides", "" , office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyNotes ] = DocPropInfo::createDocPropInfo( "Number of notes", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHiddenSlides ] = DocPropInfo::createDocPropInfo("Number of hidden Slides", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper  ); // doesn't seem to exist
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyMMClips ] = DocPropInfo::createDocPropInfo( "Number of multimedia clips", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHyperlinkBase ] = DocPropInfo::createDocPropInfo( "Hyperlink base", "AutoloadURL", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
--        m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharsWSpaces ] = DocPropInfo::createDocPropInfo( "Number of characters (with spaces)", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to be supported
--*/
-+
-         m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTitle ] = DocPropInfo::createDocPropInfo( "Title", "Title", aStandardHelper );
-         m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySubject ] = DocPropInfo::createDocPropInfo( "Subject", "Subject", aStandardHelper );
-         m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAuthor ] = DocPropInfo::createDocPropInfo( "Author", "Author", aStandardHelper );
-@@ -393,7 +362,7 @@ SwVbaCustomDocumentProperty::setLinkSource( const rtl::OUString& /*rsLinkContent
- }
- 
- void SAL_CALL 
--SwVbaCustomDocumentProperty::setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException)
-+SwVbaCustomDocumentProperty::setName( const ::rtl::OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException)
- {
-     // setName on existing property ? 
-     // #FIXME 
-@@ -401,7 +370,7 @@ SwVbaCustomDocumentProperty::setName( const ::rtl::OUString& Name ) throw (scrip
- }
- 
- void SAL_CALL 
--SwVbaCustomDocumentProperty::setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException)
-+SwVbaCustomDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException)
- {
-     // setType, do we need to do a conversion?
-     // #FIXME the underlying value needs to be changed to the new type
-@@ -620,7 +589,7 @@ SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Refer
- } 
- 
- uno::Reference< XDocumentProperty > SAL_CALL 
--SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& value, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
-+SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
- {
-     throw uno::RuntimeException(
-         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("not supported for Builtin properties") ), uno::Reference< uno::XInterface >() );
-@@ -752,7 +721,7 @@ public:
-         return  new DocPropEnumeration( simpleDocPropSnapShot );
-     }
- 
--    void addProp( const ::rtl::OUString& Name, ::sal_Int8 Type, const uno::Any& Value )
-+    void addProp( const ::rtl::OUString& Name, ::sal_Int8 /*Type*/, const uno::Any& Value )
-     {
-         sal_Int16 attributes = 128;
-         uno::Reference< beans::XPropertyContainer > xContainer( mxUserDefinedProp, uno::UNO_QUERY_THROW );
-diff --git sw/source/ui/vba/vbadocuments.cxx sw/source/ui/vba/vbadocuments.cxx
-new file mode 100644
-index 0000000..c8934b4
---- /dev/null
-+++ sw/source/ui/vba/vbadocuments.cxx
-@@ -0,0 +1,181 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadocuments.cxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <comphelper/processfactory.hxx>
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <cppuhelper/implbase3.hxx>
-+
-+#include <com/sun/star/frame/XDesktop.hpp>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <com/sun/star/frame/XComponentLoader.hpp>
-+#include <com/sun/star/lang/XComponent.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <com/sun/star/frame/XFrame.hpp>
-+#include <com/sun/star/frame/FrameSearchFlag.hpp>
-+#include <com/sun/star/util/XModifiable.hpp>
-+#include <com/sun/star/frame/XStorable.hpp>
-+#include <com/sun/star/lang/DisposedException.hpp>
-+#include <com/sun/star/beans/PropertyVetoException.hpp>
-+#include <com/sun/star/util/XCloseable.hpp>
-+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-+#include <com/sun/star/document/XTypeDetection.hpp>
-+#include <com/sun/star/uri/XUriReference.hpp>
-+#include <com/sun/star/uri/XUriReferenceFactory.hpp>
-+
-+#include <sfx2/objsh.hxx>
-+#include <tools/urlobj.hxx>
-+
-+#include "vbaglobals.hxx"
-+#include "vbadocument.hxx"
-+#include "vbadocuments.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+
-+#include <hash_map>
-+#include <osl/file.hxx>
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+static uno::Any
-+getDocument( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< text::XTextDocument > &xDoc, const uno::Any& aApplication )
-+{
-+	// FIXME: fine as long as SwVbaDocument is stateless ...
-+	uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY );
-+	if( !xModel.is() )
-+		return uno::Any();
-+	
-+	SwVbaDocument *pWb = new SwVbaDocument(  uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext, xModel );
-+	return uno::Any( uno::Reference< word::XDocument > (pWb) );
-+}
-+
-+class DocumentEnumImpl : public EnumerationHelperImpl
-+{
-+	uno::Any m_aApplication;
-+public:
-+	DocumentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), m_aApplication( aApplication ) {}
-+
-+	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
-+	{ 
-+		uno::Reference< text::XTextDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
-+		return getDocument( m_xContext, xDoc, m_aApplication );
-+	}
-+};
-+
-+SwVbaDocuments::SwVbaDocuments( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) : SwVbaDocuments_BASE( xParent, xContext, VbaDocumentsBase::WORD_DOCUMENT )
-+{
-+}
-+// XEnumerationAccess
-+uno::Type
-+SwVbaDocuments::getElementType() throw (uno::RuntimeException)
-+{
-+	return word::XDocument::static_type(0);
-+}
-+uno::Reference< container::XEnumeration >
-+SwVbaDocuments::createEnumeration() throw (uno::RuntimeException)
-+{
-+	// #FIXME its possible the DocumentEnumImpl here doens't reflect
-+	// the state of this object ( although it should ) would be 
-+	// safer to create an enumeration based on this objects state
-+	// rather than one effectively based of the desktop component
-+    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+	return new DocumentEnumImpl( mxContext, xEnumerationAccess->createEnumeration(), Application() );
-+}
-+
-+uno::Any
-+SwVbaDocuments::createCollectionObject( const uno::Any& aSource )
-+{
-+	uno::Reference< text::XTextDocument > xDoc( aSource, uno::UNO_QUERY_THROW );
-+	return getDocument( mxContext, xDoc, Application() );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& NewTemplate, const uno::Any& DocumentType, const uno::Any& Visible ) throw (uno::RuntimeException)
-+{
-+    rtl::OUString sFileName;
-+    if( Template.hasValue() && ( Template >>= sFileName ) )
-+    {
-+        return  Open( sFileName, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any());
-+    }
-+    uno::Reference <text::XTextDocument> xTextDoc( VbaDocumentsBase::Add() , uno::UNO_QUERY_THROW );
-+
-+    if( xTextDoc.is() )
-+        return getDocument( mxContext, xTextDoc, Application() );
-+    return uno::Any();
-+}
-+
-+// #TODO# #FIXME# can any of the unused params below be used?
-+void SAL_CALL
-+SwVbaDocuments::Close( const uno::Any& SaveChanges, const uno::Any& OriginalFormat, const uno::Any& RouteDocument ) throw (uno::RuntimeException)
-+{
-+    VbaDocumentsBase::Close();
-+}
-+
-+// #TODO# #FIXME# can any of the unused params below be used?
-+uno::Any SAL_CALL
-+SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToRecentFiles, const uno::Any& PasswordDocument, const uno::Any& PasswordTemplate, const uno::Any& Revert, const uno::Any& WritePasswordDocument, const uno::Any& WritePasswordTemplate, const uno::Any& Format, const uno::Any& Encoding, const uno::Any& Visible, const uno::Any& OpenAndRepair, const uno::Any& DocumentDirection, const uno::Any& NoEncodingDialog, const uno::Any& XMLTransform ) throw (uno::RuntimeException)
-+{
-+	// we need to detect if this is a URL, if not then assume its a file path
-+    rtl::OUString aURL;
-+    INetURLObject aObj;
-+	aObj.SetURL( Filename );
-+	bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
-+	if ( bIsURL )
-+		aURL = Filename;
-+	else
-+		osl::FileBase::getFileURLFromSystemPath( Filename, aURL );
-+
-+	uno::Sequence< beans::PropertyValue > sProps(0);
-+
-+	uno::Reference <text::XTextDocument> xSpreadDoc( VbaDocumentsBase::Open( Filename, ReadOnly, sProps ), uno::UNO_QUERY_THROW );
-+	uno::Any aRet = getDocument( mxContext, xSpreadDoc, Application() );
-+	uno::Reference< word::XDocument > xDocument( aRet, uno::UNO_QUERY );
-+	if ( xDocument.is() )
-+		xDocument->Activate();
-+	return aRet;
-+}
-+
-+rtl::OUString& 
-+SwVbaDocuments::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocuments") );
-+	return sImplName;
-+}
-+
-+uno::Sequence<rtl::OUString> 
-+SwVbaDocuments::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > sNames;
-+	if ( sNames.getLength() == 0 )
-+	{
-+		sNames.realloc( 1 );
-+		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Documents") );
-+	}
-+	return sNames;
-+}
-diff --git sw/source/ui/vba/vbadocuments.hxx sw/source/ui/vba/vbadocuments.hxx
-new file mode 100644
-index 0000000..e27a3c6
---- /dev/null
-+++ sw/source/ui/vba/vbadocuments.hxx
-@@ -0,0 +1,65 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_DOCUMENTS_HXX
-+#define SW_VBA_DOCUMENTS_HXX
-+
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <ooo/vba/word/XDocuments.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <vbahelper/vbadocumentsbase.hxx>
-+#include "wordvbahelper.hxx"
-+
-+
-+typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::word::XDocuments > SwVbaDocuments_BASE;
-+
-+class SwVbaDocuments : public SwVbaDocuments_BASE
-+{
-+public:
-+	SwVbaDocuments( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext );
-+	virtual ~SwVbaDocuments() {}
-+
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+
-+	// SwVbaDocuments_BASE
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+
-+	// Methods
-+    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException);
-+
-+};
-+
-+#endif /* SW_VBA_DOCUMENTS_HXX */
-diff --git sw/source/ui/vba/vbafield.cxx sw/source/ui/vba/vbafield.cxx
-new file mode 100644
-index 0000000..6effe4d
---- /dev/null
-+++ sw/source/ui/vba/vbafield.cxx
-@@ -0,0 +1,481 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile:  $
-+ * $Revision:  $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbafield.hxx"
-+#include "vbarange.hxx"
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-+#include <com/sun/star/view/XSelectionSupplier.hpp>
-+#include <com/sun/star/text/XTextFieldsSupplier.hpp>
-+#include <ooo/vba/word/WdFieldType.hpp>
-+#include <com/sun/star/text/FilenameDisplayFormat.hpp>
-+#include <com/sun/star/util/XRefreshable.hpp>
-+#include <swtypes.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+// *** SwVbaField ***********************************************
-+
-+SwVbaField::SwVbaField(  const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const  uno::Reference< css::text::XTextField >& xTextField) throw ( uno::RuntimeException ) : SwVbaField_BASE( rParent, rContext ), mxTextDocument( rDocument )
-+{
-+    mxTextField.set( xTextField, uno::UNO_QUERY_THROW );
-+}
-+
-+// XHelperInterface
-+rtl::OUString& 
-+SwVbaField::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaField") );
-+    return sImplName;    
-+}
-+
-+uno::Sequence<rtl::OUString> 
-+SwVbaField::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Field" ) );
-+    }
-+    return aServiceNames;
-+}
-+
-+// *** _ReadFieldParams ***********************************************
-+// the codes are copied from ww8par5.cxx
-+class _ReadFieldParams
-+{
-+private:
-+    String aData;
-+    xub_StrLen nLen, nFnd, nNext, nSavPtr;
-+    String aFieldName;
-+public:
-+    _ReadFieldParams( const String& rData );
-+    ~_ReadFieldParams();
-+
-+    xub_StrLen GoToTokenParam();
-+    long SkipToNextToken();
-+    xub_StrLen GetTokenSttPtr() const   { return nFnd;  }
-+
-+    xub_StrLen FindNextStringPiece( xub_StrLen _nStart = STRING_NOTFOUND );
-+    bool GetTokenSttFromTo(xub_StrLen* _pFrom, xub_StrLen* _pTo,
-+        xub_StrLen _nMax);
-+
-+    String GetResult() const;
-+    String GetFieldName()const { return aFieldName; }
-+};
-+
-+
-+_ReadFieldParams::_ReadFieldParams( const String& _rData )
-+    : aData( _rData ), nLen( _rData.Len() ), nNext( 0 )
-+{
-+    /*
-+        erstmal nach einer oeffnenden Klammer oder einer Leerstelle oder einem
-+        Anfuehrungszeichen oder einem Backslash suchen, damit der Feldbefehl
-+        (also INCLUDEPICTURE bzw EINFUeGENGRAFIK bzw ...) ueberlesen wird
-+    */
-+    while( (nLen > nNext) && (aData.GetChar( nNext ) == ' ') )
-+        ++nNext;
-+
-+    sal_Unicode c;
-+    while(     nLen > nNext
-+            && (c = aData.GetChar( nNext )) != ' '
-+            && c != '"'
-+            && c != '\\'
-+            && c != 132
-+            && c != 0x201c )
-+        ++nNext;
-+
-+    nFnd      = nNext;
-+    nSavPtr   = nNext;
-+    aFieldName = aData.Copy( 0, nFnd );
-+//  cLastChar = aData.GetChar( nSavPtr );
-+}
-+
-+
-+_ReadFieldParams::~_ReadFieldParams()
-+{
-+//  aData.SetChar( nSavPtr, cLastChar );
-+}
-+
-+
-+String _ReadFieldParams::GetResult() const
-+{
-+    return    (STRING_NOTFOUND == nFnd)
-+            ? aEmptyStr
-+            : aData.Copy( nFnd, (nSavPtr - nFnd) );
-+}
-+
-+
-+xub_StrLen _ReadFieldParams::GoToTokenParam()
-+{
-+    xub_StrLen nOld = nNext;
-+    if( -2 == SkipToNextToken() )
-+        return GetTokenSttPtr();
-+    nNext = nOld;
-+    return STRING_NOTFOUND;
-+}
-+
-+// ret: -2: NOT a '\' parameter but normal Text
-+long _ReadFieldParams::SkipToNextToken()
-+{
-+    long nRet = -1;     // Ende
-+    if (
-+         (STRING_NOTFOUND != nNext) && (nLen > nNext) &&
-+         STRING_NOTFOUND != (nFnd = FindNextStringPiece(nNext))
-+       )
-+    {
-+        nSavPtr = nNext;
-+
-+        if ('\\' == aData.GetChar(nFnd) && '\\' != aData.GetChar(nFnd + 1))
-+        {
-+            nRet = aData.GetChar(++nFnd);
-+            nNext = ++nFnd;             // und dahinter setzen
-+        }
-+        else
-+        {
-+            nRet = -2;
-+            if (
-+                 (STRING_NOTFOUND != nSavPtr ) &&
-+                 (
-+                   ('"' == aData.GetChar(nSavPtr - 1)) ||
-+                   (0x201d == aData.GetChar(nSavPtr - 1))
-+                 )
-+               )
-+            {
-+                --nSavPtr;
-+            }
-+        }
-+    }
-+    return nRet;
-+}
-+
-+// FindNextPara sucht naechsten Backslash-Parameter oder naechste Zeichenkette
-+// bis zum Blank oder naechsten "\" oder zum schliessenden Anfuehrungszeichen
-+// oder zum String-Ende von pStr.
-+//
-+// Ausgabe ppNext (falls ppNext != 0) Suchbeginn fuer naechsten Parameter bzw. 0
-+//
-+// Returnwert: 0 falls String-Ende erreicht,
-+//             ansonsten Anfang des Paramters bzw. der Zeichenkette
-+//
-+xub_StrLen _ReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
-+{
-+    xub_StrLen  n = ( STRING_NOTFOUND == nStart ) ? nFnd : nStart;  // Anfang
-+    xub_StrLen n2;          // Ende
-+
-+    nNext = STRING_NOTFOUND;        // Default fuer nicht gefunden
-+
-+    while( (nLen > n) && (aData.GetChar( n ) == ' ') )
-+        ++n;
-+
-+    if( nLen == n )
-+        return STRING_NOTFOUND;     // String End reached!
-+
-+    if(     (aData.GetChar( n ) == '"')     // Anfuehrungszeichen vor Para?
-+        ||  (aData.GetChar( n ) == 0x201c)
-+        ||  (aData.GetChar( n ) == 132) )
-+    {
-+        n++;                        // Anfuehrungszeichen ueberlesen
-+        n2 = n;                     // ab hier nach Ende suchen
-+        while(     (nLen > n2)
-+                && (aData.GetChar( n2 ) != '"')
-+                && (aData.GetChar( n2 ) != 0x201d)
-+                && (aData.GetChar( n2 ) != 147) )
-+            n2++;                   // Ende d. Paras suchen
-+    }
-+    else                        // keine Anfuehrungszeichen
-+    {
-+        n2 = n;                     // ab hier nach Ende suchen
-+        while( (nLen > n2) && (aData.GetChar( n2 ) != ' ') ) // Ende d. Paras suchen
-+        {
-+            if( aData.GetChar( n2 ) == '\\' )
-+            {
-+                if( aData.GetChar( n2+1 ) == '\\' )
-+                    n2 += 2;        // Doppel-Backslash -> OK
-+                else
-+                {
-+                    if( n2 > n )
-+                        n2--;
-+                    break;          // einfach-Backslash -> Ende
-+                }
-+            }
-+            else
-+                n2++;               // kein Backslash -> OK
-+        }
-+    }
-+    if( nLen > n2 )
-+    {
-+        if(aData.GetChar( n2 ) != ' ') n2++;
-+        nNext = n2;
-+    }
-+    return n;
-+}
-+
-+
-+
-+// read parameters "1-3" or 1-3 with both values between 1 and nMax
-+bool _ReadFieldParams::GetTokenSttFromTo(USHORT* pFrom, USHORT* pTo, USHORT nMax)
-+{
-+    USHORT nStart = 0;
-+    USHORT nEnd   = 0;
-+    xub_StrLen n = GoToTokenParam();
-+    if( STRING_NOTFOUND != n )
-+    {
-+
-+        String sParams( GetResult() );
-+
-+        xub_StrLen nIndex = 0;
-+        String sStart( sParams.GetToken(0, '-', nIndex) );
-+        if( STRING_NOTFOUND != nIndex )
-+        {
-+            nStart = static_cast<USHORT>(sStart.ToInt32());
-+            nEnd   = static_cast<USHORT>(sParams.Copy(nIndex).ToInt32());
-+        }
-+    }
-+    if( pFrom ) *pFrom = nStart;
-+    if( pTo )   *pTo   = nEnd;
-+
-+    return nStart && nEnd && (nMax >= nStart) && (nMax >= nEnd);
-+}
-+
-+// *** SwVbaFields ***********************************************
-+
-+uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Any& aSource )
-+{
-+    uno::Reference< text::XTextField > xTextField( aSource, uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextDocument > xTextDocument( xModel, uno::UNO_QUERY_THROW );
-+    uno::Reference< word::XField > xField( new SwVbaField( xParent, xContext, xTextDocument, xTextField ) );
-+    return uno::makeAny( xField );
-+}
-+
-+typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > FieldEnumeration_BASE;
-+typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > FieldCollectionHelper_BASE;
-+
-+class FieldEnumeration : public FieldEnumeration_BASE 
-+{
-+    uno::Reference< XHelperInterface > mxParent;
-+    uno::Reference< uno::XComponentContext > mxContext;
-+    uno::Reference< frame::XModel > mxModel;
-+    uno::Reference< container::XEnumeration > mxEnumeration;
-+public:
-+    FieldEnumeration(  const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< container::XEnumeration >& xEnumeration ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxEnumeration( xEnumeration )
-+    {
-+    }
-+    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException) 
-+    { 
-+        return mxEnumeration->hasMoreElements();
-+    }
-+    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+        if ( !hasMoreElements() )
-+            throw container::NoSuchElementException();
-+        return lcl_createField( mxParent, mxContext, mxModel, mxEnumeration->nextElement() );
-+    }
-+};
-+
-+class FieldCollectionHelper : public FieldCollectionHelper_BASE
-+{
-+    uno::Reference< XHelperInterface > mxParent;
-+    uno::Reference< uno::XComponentContext > mxContext;
-+    uno::Reference< frame::XModel > mxModel;
-+    uno::Reference< container::XEnumerationAccess > mxEnumerationAccess;
-+public:
-+    FieldCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) throw (css::uno::RuntimeException) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel )
-+    {
-+        uno::Reference< text::XTextFieldsSupplier > xSupp( xModel, uno::UNO_QUERY_THROW );
-+        mxEnumerationAccess.set( xSupp->getTextFields(), uno::UNO_QUERY_THROW );
-+    }
-+	// XElementAccess
-+	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) { return  mxEnumerationAccess->getElementType(); }
-+	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) { return mxEnumerationAccess->hasElements(); }
-+	// XIndexAccess
-+	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
-+    { 
-+        uno::Reference< container::XEnumeration > xEnumeration =  mxEnumerationAccess->createEnumeration();
-+        sal_Int32 nCount = 0;
-+        while( xEnumeration->hasMoreElements() )
-+        {
-+            ++nCount;
-+            xEnumeration->nextElement();
-+        }    
-+        return nCount;    
-+    }
-+	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
-+	{
-+        if( Index < 0 || Index >= getCount() )
-+            throw lang::IndexOutOfBoundsException();
-+
-+        uno::Reference< container::XEnumeration > xEnumeration =  mxEnumerationAccess->createEnumeration();
-+        sal_Int32 nCount = 0;
-+        while( xEnumeration->hasMoreElements() )
-+        {
-+            if( nCount == Index )
-+            {
-+                return xEnumeration->nextElement();
-+            }
-+            ++nCount;
-+        }
-+        throw lang::IndexOutOfBoundsException();
-+    }
-+	// XEnumerationAccess
-+	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
-+    {
-+        uno::Reference< container::XEnumeration > xEnumeration =  mxEnumerationAccess->createEnumeration();
-+        return uno::Reference< container::XEnumeration >( new FieldEnumeration( mxParent, mxContext, mxModel, xEnumeration ) );
-+    }
-+};
-+ 
-+SwVbaFields::SwVbaFields( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaFields_BASE( xParent, xContext , uno::Reference< container::XIndexAccess >( new FieldCollectionHelper( xParent, xContext, xModel ) ) ), mxModel( xModel )
-+{
-+    mxMSF.set( mxModel, uno::UNO_QUERY_THROW );
-+}
-+
-+uno::Reference< word::XField > SAL_CALL 
-+SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& /*PreserveFormatting*/ ) throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 nType = word::WdFieldType::wdFieldEmpty;
-+    Type >>= nType;
-+    rtl::OUString sText;
-+    Text >>= sText;
-+
-+    String sFieldName;
-+    if( ( nType == word::WdFieldType::wdFieldEmpty ) && ( sText.getLength() > 0 ) )
-+    {
-+        _ReadFieldParams aReadParam(sText);
-+        sFieldName = aReadParam.GetFieldName();
-+    }
-+
-+    uno::Reference< text::XTextContent > xTextField;
-+    if( nType == word::WdFieldType::wdFieldFileName || sFieldName.EqualsIgnoreCaseAscii("FILENAME") )
-+    {
-+        xTextField.set( Create_Field_FileName( sText ), uno::UNO_QUERY_THROW );
-+    }
-+    else
-+    {
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+    }
-+
-+    SwVbaRange* pVbaRange = dynamic_cast< SwVbaRange* >( Range.get() );
-+    uno::Reference< text::XTextRange > xTextRange = pVbaRange->getXTextRange();
-+    uno::Reference< text::XText > xText = xTextRange->getText();
-+    xText->insertTextContent( xTextRange, xTextField, true );
-+    return uno::Reference< word::XField >( new SwVbaField( mxParent, mxContext, uno::Reference< text::XTextDocument >( mxModel, uno::UNO_QUERY_THROW ), uno::Reference< text::XTextField >( xTextField, uno::UNO_QUERY_THROW ) ) );
-+}
-+
-+uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl::OUString _text ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( rtl::OUString::createFromAscii("com.sun.star.text.TextField.FileName") ), uno::UNO_QUERY_THROW );
-+    sal_Int16 nFileFormat = text::FilenameDisplayFormat::NAME_AND_EXT;
-+    if( _text.getLength() > 0 )
-+    {
-+        long nRet;
-+        _ReadFieldParams aReadParam( _text );
-+        while (-1 != (nRet = aReadParam.SkipToNextToken()))
-+        {
-+            switch (nRet)
-+            {
-+                case 'p':
-+                    nFileFormat = text::FilenameDisplayFormat::FULL;
-+                    break;
-+                case '*':
-+                    //Skip over MERGEFORMAT
-+                    aReadParam.SkipToNextToken();
-+                    break;
-+                default:
-+                    DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
-+                    break;
-+            }
-+        }
-+    }
-+
-+    uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW );
-+    xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FileFormat") ), uno::makeAny( nFileFormat ) );
-+
-+    return xTextField;
-+}
-+
-+uno::Reference< container::XEnumeration > SAL_CALL 
-+SwVbaFields::createEnumeration() throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+    return xEnumerationAccess->createEnumeration();
-+}
-+
-+// ScVbaCollectionBaseImpl      
-+uno::Any 
-+SwVbaFields::createCollectionObject( const uno::Any& aSource )
-+{
-+    return lcl_createField( mxParent, mxContext, mxModel, aSource );
-+} 
-+
-+sal_Int32 SAL_CALL SwVbaFields::Update() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nUpdate = 1;
-+    try
-+    {
-+        uno::Reference< text::XTextFieldsSupplier > xSupp( mxModel, uno::UNO_QUERY_THROW );
-+        uno::Reference< util::XRefreshable > xRef( xSupp->getTextFields(), uno::UNO_QUERY_THROW );
-+        xRef->refresh();
-+        nUpdate = 0;
-+    }catch( uno::Exception )
-+    {
-+        nUpdate = 1;
-+    }
-+    return nUpdate;
-+}
-+
-+// XHelperInterface
-+rtl::OUString& 
-+SwVbaFields::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFields") );
-+    return sImplName;    
-+}
-+
-+// XEnumerationAccess
-+uno::Type SAL_CALL 
-+SwVbaFields::getElementType() throw (uno::RuntimeException)
-+{
-+    return  word::XField::static_type(0); 
-+}
-+
-+uno::Sequence<rtl::OUString> 
-+SwVbaFields::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Fields" ) );
-+    }
-+    return aServiceNames;
-+}
-+
-diff --git sw/source/ui/vba/vbafield.hxx sw/source/ui/vba/vbafield.hxx
-new file mode 100644
-index 0000000..20d0499
---- /dev/null
-+++ sw/source/ui/vba/vbafield.hxx
-@@ -0,0 +1,80 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile:  $
-+ * $Revision:  $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_FIELD_HXX
-+#define SW_VBA_FIELD_HXX
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+#include <com/sun/star/text/XTextField.hpp>
-+#include <ooo/vba/word/XField.hpp>
-+#include <ooo/vba/word/XFields.hpp>
-+#include <vbahelper/vbacollectionimpl.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XField > SwVbaField_BASE;
-+
-+class SwVbaField : public SwVbaField_BASE
-+{
-+    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
-+    css::uno::Reference< css::text::XTextField > mxTextField;
-+public:
-+    SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException);;
-+
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();  
-+};
-+
-+// *** SwVbaFields ***********************************************
-+
-+typedef CollTestImplHelper< ov::word::XFields > SwVbaFields_BASE;
-+
-+class SwVbaFields : public SwVbaFields_BASE
-+{
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+    css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF;
-+private:
-+    css::uno::Reference< css::text::XTextField > Create_Field_FileName( const rtl::OUString _text ) throw (css::uno::RuntimeException);
-+
-+public:
-+    SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
-+    // XFields
-+    virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL Update() throw (css::uno::RuntimeException);
-+    // XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+    // ScVbaCollectionBaseImpl      
-+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-+
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();    
-+};
-+
-+#endif
-diff --git sw/source/ui/vba/vbafind.cxx sw/source/ui/vba/vbafind.cxx
-new file mode 100644
-index 0000000..22d9a1f
---- /dev/null
-+++ sw/source/ui/vba/vbafind.cxx
-@@ -0,0 +1,431 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbafind.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include "vbareplacement.hxx"
-+#include <ooo/vba/word/WdFindWrap.hpp>
-+#include <ooo/vba/word/WdReplace.hpp>
-+#include <com/sun/star/text/XTextRangeCompare.hpp>
-+#include "wordvbahelper.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaFind::SwVbaFind( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw ( uno::RuntimeException ) :
-+    SwVbaFind_BASE( rParent, rContext ), mxModel( xModel ), mxTextRange( xTextRange ), mbReplace( sal_False ), mnReplaceType( word::WdReplace::wdReplaceOne ), mnWrap( word::WdFindWrap::wdFindStop )
-+{
-+    mxReplaceable.set( mxModel, uno::UNO_QUERY_THROW );
-+    mxPropertyReplace.set( mxReplaceable->createReplaceDescriptor(), uno::UNO_QUERY_THROW );
-+    mxTVC = word::getXTextViewCursor( mxModel );
-+    mxSelSupp.set( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+}
-+
-+SwVbaFind::~SwVbaFind()
-+{
-+}
-+
-+sal_Bool SwVbaFind::InRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XTextRangeCompare > xTRC( mxTextRange->getText(), uno::UNO_QUERY_THROW );
-+    if( xTRC->compareRegionStarts( mxTextRange, xCurrentRange ) >= 0 && xTRC->compareRegionEnds( mxTextRange, xCurrentRange ) <= 0 )
-+        return sal_True;
-+    return sal_False;
-+}
-+
-+sal_Bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XTextRangeCompare > xTRC( mxTextRange->getText(), uno::UNO_QUERY_THROW );
-+    if( xTRC->compareRegionStarts( mxTextRange, xCurrentRange ) == 0 && xTRC->compareRegionEnds( mxTextRange, xCurrentRange ) == 0 )
-+        return sal_True;
-+    return sal_False;
-+}
-+
-+void SwVbaFind::SetReplaceWith( const rtl::OUString& rText ) throw (uno::RuntimeException)
-+{
-+    mxPropertyReplace->setReplaceString( rText );
-+    mbReplace = sal_True;
-+}
-+
-+rtl::OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException)
-+{
-+    return mxPropertyReplace->getReplaceString();
-+}
-+void SwVbaFind::SetReplace( sal_Int32 type )
-+{
-+    mnReplaceType = type;
-+    mbReplace = sal_True;
-+}
-+
-+rtl::OUString SwVbaFind::ReplaceWildcards( const rtl::OUString& rText ) throw ( uno::RuntimeException )
-+{
-+    // TODO:
-+    return rtl::OUString();
-+}
-+
-+uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XTextRange > xFoundOne;
-+    if( mxTVC->getString().getLength() > 0 )
-+    {
-+        if( getForward() )
-+        {
-+            xFoundOne.set( mxReplaceable->findNext( mxTextRange->getStart(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
-+        }
-+        else
-+        {
-+            xFoundOne.set( mxReplaceable->findNext( mxTextRange->getEnd(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
-+        }
-+
-+        if( xFoundOne.is() && InEqualRange( xFoundOne ) )
-+        {
-+            xFoundOne.set( mxReplaceable->findNext( xFoundOne, uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
-+        }
-+        else if( xFoundOne.is() && !InRange( xFoundOne ) )
-+        {
-+            xFoundOne = uno::Reference< text::XTextRange >();
-+        }
-+    }
-+    else
-+    {
-+        xFoundOne.set( mxReplaceable->findNext( mxTextRange, uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
-+    }
-+
-+    if( !xFoundOne.is() && ( getWrap() == word::WdFindWrap::wdFindContinue || getWrap() == word::WdFindWrap::wdFindAsk ) )
-+    {
-+        if( getForward() )
-+        {
-+            mxTVC->gotoStart(sal_False);
-+            xFoundOne.set( mxReplaceable->findNext( mxTextRange->getStart(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
-+        }    
-+        else
-+        {
-+            mxTVC->gotoEnd( sal_False );
-+            xFoundOne.set( mxReplaceable->findNext( mxTextRange->getEnd(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
-+
-+        }
-+    }
-+    return xFoundOne;
-+}
-+
-+sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
-+{
-+    sal_Bool result = sal_False;
-+
-+    // TODO: map wildcards in area to OOo wildcards
-+
-+    if( mbReplace )
-+    {
-+        switch( mnReplaceType )
-+        {
-+            case word::WdReplace::wdReplaceNone:
-+            {
-+                result = sal_True;
-+                break;
-+            }
-+            case word::WdReplace::wdReplaceOne:
-+            {
-+                uno::Reference< text::XTextRange > xFindOne = FindOneElement();
-+                if( xFindOne.is() )
-+                {
-+                    xFindOne->setString( GetReplaceWith() );
-+                    result = mxSelSupp->select( uno::makeAny( xFindOne ) );
-+                }
-+                break;
-+            }
-+            case word::WdReplace::wdReplaceAll:
-+            {
-+                uno::Reference< container::XIndexAccess > xIndexAccess = mxReplaceable->findAll( uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) );
-+                if( xIndexAccess->getCount() > 0 )
-+                {
-+                    for( sal_Int32 i = 0; i < xIndexAccess->getCount(); i++ )
-+                    {
-+                        uno::Reference< text::XTextRange > xTextRange( xIndexAccess->getByIndex( i ), uno::UNO_QUERY_THROW );
-+                        if( mnWrap == word::WdFindWrap::wdFindContinue || mnWrap == word::WdFindWrap::wdFindAsk || InRange( xTextRange ) )
-+                        {
-+                            xTextRange->setString( GetReplaceWith() );
-+                            result = sal_True;
-+                        }
-+                    }
-+                }
-+                break;
-+            }
-+            defalut:
-+            {
-+                result = sal_False;
-+            }
-+        }
-+    }
-+    else
-+    {
-+        uno::Reference< text::XTextRange > xFindOne = FindOneElement();
-+        if( xFindOne.is() )
-+            result = mxSelSupp->select( uno::makeAny( xFindOne ) );
-+    }
-+
-+    return result;
-+}
-+
-+::rtl::OUString SAL_CALL SwVbaFind::getText() throw (uno::RuntimeException)
-+{
-+    return mxPropertyReplace->getSearchString();
-+}
-+
-+void SAL_CALL SwVbaFind::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
-+{
-+    mxPropertyReplace->setSearchString( _text );
-+}
-+
-+uno::Any SAL_CALL SwVbaFind::getReplacement() throw (uno::RuntimeException)
-+{
-+    return uno::makeAny( uno::Reference< word::XReplacement >( new SwVbaReplacement( this, mxContext, mxPropertyReplace ) ) );
-+}
-+
-+void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+::sal_Bool SAL_CALL SwVbaFind::getForward() throw (uno::RuntimeException)
-+{
-+    sal_Bool bBackward = sal_False;
-+    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ) ) >>= bBackward;
-+    return !bBackward;
-+}
-+
-+void SAL_CALL SwVbaFind::setForward( ::sal_Bool _forward ) throw (uno::RuntimeException)
-+{
-+    sal_Bool bBackward = !_forward;
-+    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ), uno::makeAny( bBackward ) );
-+}
-+
-+::sal_Int32 SAL_CALL SwVbaFind::getWrap() throw (uno::RuntimeException)
-+{
-+    // seems not supported in Writer
-+    return mnWrap;
-+}
-+
-+void SAL_CALL SwVbaFind::setWrap( ::sal_Int32 _wrap ) throw (uno::RuntimeException)
-+{
-+    // seems not supported in Writer
-+    mnWrap = _wrap;
-+}
-+
-+::sal_Bool SAL_CALL SwVbaFind::getFormat() throw (uno::RuntimeException)
-+{
-+    return mxPropertyReplace->getValueSearch();
-+}
-+
-+void SAL_CALL SwVbaFind::setFormat( ::sal_Bool _format ) throw (uno::RuntimeException)
-+{
-+    mxPropertyReplace->setValueSearch( _format );
-+}
-+
-+::sal_Bool SAL_CALL SwVbaFind::getMatchCase() throw (uno::RuntimeException)
-+{
-+    sal_Bool value = sal_False;
-+    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ) ) >>= value;
-+    return value;
-+}
-+
-+void SAL_CALL SwVbaFind::setMatchCase( ::sal_Bool _matchcase ) throw (uno::RuntimeException)
-+{
-+    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ), uno::makeAny( _matchcase ) );
-+}
-+
-+::sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() throw (uno::RuntimeException)
-+{
-+    sal_Bool value = sal_False;
-+    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ) ) >>= value;
-+    return value;
-+}
-+
-+void SAL_CALL SwVbaFind::setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (uno::RuntimeException)
-+{
-+    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ), uno::makeAny( _matchwholeword ) );
-+}
-+
-+::sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() throw (uno::RuntimeException)
-+{
-+    sal_Bool value = sal_False;
-+    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ) ) >>= value;
-+    return value;
-+}
-+
-+void SAL_CALL SwVbaFind::setMatchWildcards( ::sal_Bool _matchwildcards ) throw (uno::RuntimeException)
-+{
-+    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ), uno::makeAny( _matchwildcards ) );
-+}
-+
-+::sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() throw (uno::RuntimeException)
-+{
-+    sal_Bool value = sal_False;
-+    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ) ) >>= value;
-+    return value;
-+}
-+
-+void SAL_CALL SwVbaFind::setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (uno::RuntimeException)
-+{
-+    // seems not accurate
-+    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ), uno::makeAny( _matchsoundslike ) );
-+}
-+
-+::sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException)
-+{
-+    sal_Bool value = sal_False;
-+    mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ) ) >>= value;
-+    if( value )
-+        mxPropertyReplace->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ) ) >>= value;
-+    return value;
-+}
-+
-+void SAL_CALL SwVbaFind::setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (uno::RuntimeException)
-+{
-+    // seems not accurate
-+    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ), uno::makeAny( _matchallwordforms ) );
-+    mxPropertyReplace->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ), uno::makeAny( _matchallwordforms ) );
-+}
-+
-+uno::Any SAL_CALL SwVbaFind::getStyle() throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+sal_Bool SAL_CALL 
-+SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const uno::Any& MatchWholeWord, const uno::Any& MatchWildcards, const uno::Any& MatchSoundsLike, const uno::Any& MatchAllWordForms, const uno::Any& Forward, const uno::Any& Wrap, const uno::Any& Format, const uno::Any& ReplaceWith, const uno::Any& Replace, const uno::Any& /*MatchKashida*/, const uno::Any& /*MatchDiacritics*/, const uno::Any& /*MatchAlefHamza*/, const uno::Any& /*MatchControl*/, const uno::Any& /*MatchPrefix*/, const uno::Any& /*MatchSuffix*/, const uno::Any& /*MatchPhrase*/, const uno::Any& /*IgnoreSpace*/, const uno::Any& /*IgnorePunct*/ ) throw (uno::RuntimeException)
-+{
-+    sal_Bool result = sal_False;
-+    if( FindText.hasValue() )
-+    {
-+        rtl::OUString sText;
-+        FindText >>= sText;
-+        setText( sText );
-+    }
-+
-+    sal_Bool bValue = sal_False;
-+    if( MatchCase.hasValue() )
-+    {
-+        MatchCase >>= bValue;
-+        setMatchCase( bValue );
-+    }
-+
-+    if( MatchWholeWord.hasValue() )
-+    {
-+        MatchWholeWord >>= bValue;
-+        setMatchWholeWord( bValue );
-+    }
-+
-+    if( MatchWildcards.hasValue() )
-+    {
-+        MatchWildcards >>= bValue;
-+        setMatchWildcards( bValue );
-+    }
-+
-+    if( MatchSoundsLike.hasValue() )
-+    {
-+        MatchSoundsLike >>= bValue;
-+        setMatchSoundsLike( bValue );
-+    }
-+
-+    if( MatchAllWordForms.hasValue() )
-+    {
-+        MatchAllWordForms >>= bValue;
-+        setMatchAllWordForms( bValue );
-+    }
-+
-+    if( Forward.hasValue() )
-+    {
-+        Forward >>= bValue;
-+        setForward( bValue );
-+    }
-+
-+    if( Wrap.hasValue() )
-+    {
-+        sal_Int32 nWrapType = 0;
-+        Wrap >>= nWrapType;
-+        setWrap( nWrapType );
-+    }
-+
-+    if( Format.hasValue() )
-+    {
-+        Format >>= bValue;
-+        setFormat( bValue );
-+    }
-+
-+    if( ReplaceWith.hasValue() )
-+    {
-+        rtl::OUString sValue;
-+        ReplaceWith >>= sValue;
-+        SetReplaceWith( sValue );
-+    }
-+
-+    if( Replace.hasValue() )
-+    {
-+        sal_Int32 nValue;
-+        Replace >>= nValue;
-+        SetReplace( nValue );
-+    }
-+
-+    result = SearchReplace();
-+
-+    return result;
-+}
-+
-+void SAL_CALL 
-+SwVbaFind::ClearFormatting(  ) throw (uno::RuntimeException)
-+{
-+    uno::Sequence< beans::PropertyValue >  aSearchAttribs;
-+    mxPropertyReplace->setSearchAttributes( aSearchAttribs );
-+}
-+
-+rtl::OUString& 
-+SwVbaFind::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFind") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaFind::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Find" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-diff --git sw/source/ui/vba/vbafind.hxx sw/source/ui/vba/vbafind.hxx
-new file mode 100644
-index 0000000..76988ca
---- /dev/null
-+++ sw/source/ui/vba/vbafind.hxx
-@@ -0,0 +1,104 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_FIND_HXX
-+#define SW_VBA_FIND_HXX
-+
-+#include <ooo/vba/word/XFind.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/text/XTextRange.hpp>
-+#include <com/sun/star/util/XReplaceable.hpp>
-+#include <com/sun/star/util/XPropertyReplace.hpp>
-+#include <com/sun/star/text/XTextViewCursor.hpp>
-+#include <com/sun/star/text/XTextCursor.hpp>
-+#include <com/sun/star/view/XSelectionSupplier.hpp>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XFind > SwVbaFind_BASE;
-+
-+class SwVbaFind : public SwVbaFind_BASE
-+{
-+private:
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+    css::uno::Reference< css::text::XTextRange > mxTextRange;
-+    css::uno::Reference< css::util::XReplaceable > mxReplaceable;
-+    css::uno::Reference< css::util::XPropertyReplace> mxPropertyReplace;
-+    css::uno::Reference< css::text::XTextViewCursor> mxTVC;
-+    css::uno::Reference< css::view::XSelectionSupplier> mxSelSupp;
-+    sal_Bool mbReplace;
-+    sal_Int32 mnReplaceType;
-+    sal_Int32 mnWrap;
-+
-+private:
-+    sal_Bool InRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException );
-+    sal_Bool InEqualRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException );
-+    void SetReplace( sal_Int32 type );
-+    void SetReplaceWith( const rtl::OUString& rText ) throw ( css::uno::RuntimeException );
-+    rtl::OUString GetReplaceWith() throw ( css::uno::RuntimeException );
-+    rtl::OUString ReplaceWildcards( const rtl::OUString& rText ) throw ( css::uno::RuntimeException );
-+    css::uno::Reference< css::text::XTextRange > FindOneElement() throw ( css::uno::RuntimeException );
-+    sal_Bool SearchReplace() throw ( css::uno::RuntimeException );
-+
-+public:
-+	SwVbaFind( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaFind();
-+
-+    // Attributes
-+    virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setForward( ::sal_Bool _forward ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getWrap() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getFormat() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setFormat( ::sal_Bool _format ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getMatchCase() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMatchCase( ::sal_Bool _matchcase ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getMatchWholeWord() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getMatchWildcards() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMatchWildcards( ::sal_Bool _matchwildcards ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getMatchSoundsLike() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getMatchAllWordForms() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException);
-+
-+    // Methods
-+    virtual ::sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL ClearFormatting(  ) throw (css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_FIND_HXX */
-diff --git sw/source/ui/vba/vbafont.cxx sw/source/ui/vba/vbafont.cxx
-new file mode 100644
-index 0000000..58fe73e
---- /dev/null
-+++ sw/source/ui/vba/vbafont.cxx
-@@ -0,0 +1,216 @@
-+#include "vbafont.hxx"
-+#include <com/sun/star/awt/FontUnderline.hpp>
-+#include <ooo/vba/word/WdUnderline.hpp>
-+#include <hash_map>
-+#include <ooo/vba/word/WdColorIndex.hpp>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+const uno::Any aLongAnyTrue( sal_Int16(-1) );
-+const uno::Any aLongAnyFalse( sal_Int16( 0 ) );
-+
-+struct MapPair
-+{
-+    sal_Int32 nMSOConst;
-+    sal_Int32 nOOOConst;
-+};
-+
-+static MapPair UnderLineTable[] = {
-+        { word::WdUnderline::wdUnderlineNone, com::sun::star::awt::FontUnderline::NONE },
-+        { word::WdUnderline::wdUnderlineSingle, com::sun::star::awt::FontUnderline::SINGLE },
-+        { word::WdUnderline::wdUnderlineWords, com::sun::star::awt::FontUnderline::SINGLE },
-+        { word::WdUnderline::wdUnderlineDouble, com::sun::star::awt::FontUnderline::DOUBLE },
-+        { word::WdUnderline::wdUnderlineDotted, com::sun::star::awt::FontUnderline::DOTTED },
-+        { word::WdUnderline::wdUnderlineThick, com::sun::star::awt::FontUnderline::BOLDDASH },
-+        { word::WdUnderline::wdUnderlineDash, com::sun::star::awt::FontUnderline::DASH }, 
-+	{ word::WdUnderline::wdUnderlineDotDash, com::sun::star::awt::FontUnderline::DASHDOT }, 
-+	{ word::WdUnderline::wdUnderlineDotDotDash, com::sun::star::awt::FontUnderline::DASHDOTDOT },
-+        { word::WdUnderline::wdUnderlineWavy, com::sun::star::awt::FontUnderline::WAVE },
-+        { word::WdUnderline::wdUnderlineDottedHeavy, com::sun::star::awt::FontUnderline::BOLDDOTTED },
-+        { word::WdUnderline::wdUnderlineDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASH },
-+        { word::WdUnderline::wdUnderlineDotDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASHDOT },
-+        { word::WdUnderline::wdUnderlineDotDotDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASHDOTDOT },
-+        { word::WdUnderline::wdUnderlineWavyHeavy, com::sun::star::awt::FontUnderline::BOLDWAVE },
-+        { word::WdUnderline::wdUnderlineDashLong, com::sun::star::awt::FontUnderline::LONGDASH },
-+        { word::WdUnderline::wdUnderlineWavyDouble, com::sun::star::awt::FontUnderline::DOUBLEWAVE },
-+        { word::WdUnderline::wdUnderlineDashLongHeavy, com::sun::star::awt::FontUnderline::BOLDLONGDASH },
-+};
-+
-+typedef std::hash_map< sal_Int32, sal_Int32 > ConstToConst;
-+class UnderLineMapper
-+{
-+    ConstToConst MSO2OOO;
-+    ConstToConst OOO2MSO;
-+private:
-+    UnderLineMapper()
-+    {
-+        sal_Int32 nLen = sizeof( UnderLineTable )/ sizeof( UnderLineTable[0] );
-+
-+        for ( sal_Int32 index=0; index<nLen; ++index )
-+        {
-+            MSO2OOO[ UnderLineTable[ index ].nMSOConst ] = UnderLineTable[ index ].nOOOConst;
-+            OOO2MSO[ UnderLineTable[ index ].nOOOConst ] = UnderLineTable[ index ].nMSOConst;
-+        }
-+    }
-+public:
-+    static rtl::OUString propName()
-+    {
-+        static rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("CharUnderline") );
-+        return sPropName;
-+    }
-+
-+    static UnderLineMapper& instance()
-+    {
-+        static  UnderLineMapper theMapper;
-+        return theMapper; 
-+    }
-+
-+    sal_Int32 getOOOFromMSO( sal_Int32 nMSOConst ) throw( lang::IllegalArgumentException )
-+    {
-+        ConstToConst::iterator it = MSO2OOO.find( nMSOConst );
-+        if ( it == MSO2OOO.end() )
-+            throw lang::IllegalArgumentException();
-+        return it->second;
-+    }
-+    sal_Int32 getMSOFromOOO( sal_Int32 nOOOConst ) throw( lang::IllegalArgumentException )
-+    {
-+        ConstToConst::iterator it = OOO2MSO.find( nOOOConst );
-+        if ( it == OOO2MSO.end() )
-+            throw lang::IllegalArgumentException();
-+        return it->second;
-+    }
-+};
-+
-+SwVbaFont::SwVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPalette, uno::Reference< css::beans::XPropertySet > xPropertySet ) throw ( css::uno::RuntimeException ) : SwVbaFont_BASE( xParent, xContext, xPalette, xPropertySet )
-+{
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaFont::getUnderline() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nOOVal = 0;
-+    mxFont->getPropertyValue(  UnderLineMapper::propName() ) >>= nOOVal;
-+    return uno::makeAny( UnderLineMapper::instance().getMSOFromOOO( nOOVal ) );
-+}
-+
-+void SAL_CALL 
-+SwVbaFont::setUnderline( const uno::Any& _underline ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nMSOVal = 0;
-+
-+    if ( _underline >>= nMSOVal )
-+    {
-+        sal_Int32 nOOVal =  UnderLineMapper::instance().getOOOFromMSO( nMSOVal );
-+        mxFont->setPropertyValue(  UnderLineMapper::propName(), uno::makeAny( nOOVal ) );
-+    }
-+}
-+
-+rtl::OUString&
-+SwVbaFont::getServiceImplName()
-+{
-+        static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFont") );
-+        return sImplName;
-+}
-+
-+void SAL_CALL
-+SwVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException )
-+{
-+        sal_Int32 nIndex = 0;
-+        _colorindex >>= nIndex;
-+        return setColor( OORGBToXLRGB(mxPalette->getByIndex( nIndex )) );
-+} 
-+
-+uno::Any SAL_CALL
-+SwVbaFont::getColorIndex() throw ( uno::RuntimeException )
-+{
-+    	sal_Int32 nColor = 0;
-+
-+	XLRGBToOORGB( getColor() ) >>= nColor;
-+	sal_Int32 nElems = mxPalette->getCount();
-+	sal_Int32 nIndex = 0;
-+	for ( sal_Int32 count=0; count<nElems; ++count )
-+       	{
-+		sal_Int32 nPaletteColor = 0;
-+		mxPalette->getByIndex( count ) >>= nPaletteColor;
-+		if ( nPaletteColor == nColor )
-+		{
-+			nIndex = count;
-+			break;
-+		}
-+	}
-+	return uno::makeAny( nIndex );
-+}	
-+uno::Any SAL_CALL 
-+SwVbaFont::getSubscript() throw ( uno::RuntimeException )
-+{
-+    sal_Bool bRes = sal_False;
-+    SwVbaFont_BASE::getSubscript() >>= bRes;
-+    if ( bRes )
-+        return aLongAnyTrue;
-+    return aLongAnyFalse;
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaFont::getSuperscript() throw ( uno::RuntimeException )
-+{
-+    sal_Bool bRes = sal_False;
-+    SwVbaFont_BASE::getSuperscript() >>= bRes;
-+    if ( bRes )
-+        return aLongAnyTrue;
-+    return aLongAnyFalse;
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaFont::getBold() throw (uno::RuntimeException)
-+{
-+    sal_Bool bRes = sal_False;
-+    SwVbaFont_BASE::getBold() >>= bRes;
-+    if ( bRes )
-+        return aLongAnyTrue;
-+    return aLongAnyFalse;
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaFont::getItalic() throw (uno::RuntimeException)
-+{
-+    sal_Bool bRes = sal_False;
-+    SwVbaFont_BASE::getItalic() >>= bRes;
-+    if ( bRes )
-+        return aLongAnyTrue;
-+    return aLongAnyFalse;
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException)
-+{
-+    sal_Bool bRes = sal_False;
-+    SwVbaFont_BASE::getStrikethrough() >>= bRes;
-+    if ( bRes )
-+        return aLongAnyTrue;
-+    return aLongAnyFalse;
-+}
-+
-+uno::Any SAL_CALL 
-+SwVbaFont::getShadow() throw (uno::RuntimeException)
-+{
-+    sal_Bool bRes = sal_False;
-+    SwVbaFont_BASE::getShadow() >>= bRes;
-+    if ( bRes )
-+        return aLongAnyTrue;
-+    return aLongAnyFalse;
-+}
-+
-+uno::Sequence< rtl::OUString >
-+SwVbaFont::getServiceNames()
-+{
-+        static uno::Sequence< rtl::OUString > aServiceNames;
-+        if ( aServiceNames.getLength() == 0 )
-+        {
-+                aServiceNames.realloc( 1 );
-+                aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Font" ) );
-+        }
-+        return aServiceNames;
-+}
-+
-+
-diff --git sw/source/ui/vba/vbafont.hxx sw/source/ui/vba/vbafont.hxx
-new file mode 100644
-index 0000000..85262ac
---- /dev/null
-+++ sw/source/ui/vba/vbafont.hxx
-@@ -0,0 +1,31 @@
-+#ifndef VBA_FONT_HXX
-+#define VBA_FONT_HXX
-+
-+#include <vbahelper/vbafontbase.hxx>
-+#include <ooo/vba/word/XFont.hpp>
-+
-+typedef cppu::ImplInheritanceHelper1< VbaFontBase, ov::word::XFont > SwVbaFont_BASE;
-+
-+class SwVbaFont : public SwVbaFont_BASE
-+{
-+public:
-+	SwVbaFont( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPalette, css::uno::Reference< css::beans::XPropertySet > xPropertySet ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaFont(){}
-+
-+    // Attributes
-+    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getSubscript() throw ( css::uno::RuntimeException );
-+    virtual css::uno::Any SAL_CALL getSuperscript() throw ( css::uno::RuntimeException );
-+
-+    virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException);
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();   
-+};
-+#endif
-diff --git sw/source/ui/vba/vbaglobals.cxx sw/source/ui/vba/vbaglobals.cxx
-index 38818fa..acf6b06 100644
---- sw/source/ui/vba/vbaglobals.cxx
-+++ sw/source/ui/vba/vbaglobals.cxx
-@@ -105,12 +105,35 @@ SwVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException
-     return getApplication()->CommandBars( aIndex );
- }
- 
-+uno::Any SAL_CALL
-+SwVbaGlobals::Documents( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    return getApplication()->Documents( index );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaGlobals::Addins( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    return getApplication()->Addins( index );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaGlobals::Dialogs( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    return getApplication()->Dialogs( index );
-+}
-+
- uno::Reference<word::XSelection > SAL_CALL
- SwVbaGlobals::getSelection() throw (uno::RuntimeException)
- {
- 	return getApplication()->getSelection();
- }
- 
-+float SAL_CALL SwVbaGlobals::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException)
-+{
-+    return getApplication()->CentimetersToPoints( _Centimeters );
-+}
-+
- rtl::OUString&
- SwVbaGlobals::getServiceImplName()
- {
-diff --git sw/source/ui/vba/vbaglobals.hxx sw/source/ui/vba/vbaglobals.hxx
-index 5c216b1..267b1ed 100644
---- sw/source/ui/vba/vbaglobals.hxx
-+++ sw/source/ui/vba/vbaglobals.hxx
-@@ -38,7 +38,6 @@
- #include <ooo/vba/word/XSystem.hpp>
- #include <ooo/vba/word/XOptions.hpp>
- #include <ooo/vba/word/XSelection.hpp>
--
- #include <cppuhelper/implbase1.hxx>
- #include <vbahelper/vbahelper.hxx>
- #include <vbahelper/vbaglobalbase.hxx>
-@@ -70,6 +69,10 @@ public:
-     virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException);
-     virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+    virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+    virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+    virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+    virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException);
-     // XMultiServiceFactory
-     virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException);
- 
-diff --git sw/source/ui/vba/vbaheaderfooter.cxx sw/source/ui/vba/vbaheaderfooter.cxx
-new file mode 100644
-index 0000000..c1eb4ec
---- /dev/null
-+++ sw/source/ui/vba/vbaheaderfooter.cxx
-@@ -0,0 +1,114 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaheaderfooter.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include <ooo/vba/word/WdHeaderFooterIndex.hpp>
-+#include <com/sun/star/text/XText.hpp>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-+#include "vbarange.hxx"
-+#include <vbahelper/vbashapes.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaHeaderFooter::SwVbaHeaderFooter( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rProps, sal_Bool isHeader, sal_Int32 index ) throw ( uno::RuntimeException ) : SwVbaHeaderFooter_BASE( rParent, rContext ), mxModel( xModel ), mxPageStyleProps( rProps ), mbHeader( isHeader ), mnIndex( index )
-+{
-+}
-+
-+sal_Bool SAL_CALL SwVbaHeaderFooter::getIsHeader() throw (uno::RuntimeException)
-+{
-+    return mbHeader;
-+}
-+
-+sal_Bool SAL_CALL SwVbaHeaderFooter::getLinkToPrevious() throw (uno::RuntimeException)
-+{
-+    // seems always false
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( ::sal_Bool _linktoprevious ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno::RuntimeException)
-+{
-+    rtl::OUString sPropsNameText;
-+    if( mbHeader )
-+    {
-+        sPropsNameText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") );
-+    }
-+    else
-+    {
-+        sPropsNameText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
-+    }
-+    if( mnIndex = word::WdHeaderFooterIndex::wdHeaderFooterEvenPages )
-+    {
-+        sPropsNameText.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left") ) );
-+    }
-+
-+    uno::Reference< text::XText > xText( mxPageStyleProps->getPropertyValue( sPropsNameText ), uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
-+    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, xDocument, xText->getStart(), xText->getEnd(), xText ) );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW );
-+    //uno::Reference< drawing::XShapes > xShapes( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
-+    uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
-+    uno::Reference< XCollection > xCol( new ScVbaShapes( this, mxContext, xIndexAccess ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+rtl::OUString& 
-+SwVbaHeaderFooter::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaHeaderFooter") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaHeaderFooter::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Pane" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-diff --git sw/source/ui/vba/vbaheaderfooter.hxx sw/source/ui/vba/vbaheaderfooter.hxx
-new file mode 100644
-index 0000000..4715994
---- /dev/null
-+++ sw/source/ui/vba/vbaheaderfooter.hxx
-@@ -0,0 +1,63 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_HEADERFOOTER_HXX
-+#define SW_VBA_HEADERFOOTER_HXX
-+
-+#include <ooo/vba/word/XHeaderFooter.hpp>
-+#include <ooo/vba/word/XRange.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XHeaderFooter > SwVbaHeaderFooter_BASE;
-+
-+class SwVbaHeaderFooter : public SwVbaHeaderFooter_BASE
-+{
-+private:
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+    css::uno::Reference< css::beans::XPropertySet > mxPageStyleProps;
-+    sal_Bool mbHeader;
-+    sal_Int32 mnIndex;
-+
-+public:
-+	SwVbaHeaderFooter( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, sal_Bool isHeader, sal_Int32 index ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaHeaderFooter(){}
-+
-+    // Attributes
-+    virtual ::sal_Bool SAL_CALL getIsHeader() throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getLinkToPrevious() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLinkToPrevious( ::sal_Bool _linktoprevious ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_HEADERFOOTER_HXX */
-diff --git sw/source/ui/vba/vbaheaderfooterhelper.cxx sw/source/ui/vba/vbaheaderfooterhelper.cxx
-new file mode 100644
-index 0000000..4069b85
---- /dev/null
-+++ sw/source/ui/vba/vbaheaderfooterhelper.cxx
-@@ -0,0 +1,178 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaheaderfooterhelper.hxx"
-+#include "wordvbahelper.hxx"
-+#include <comphelper/processfactory.hxx>
-+#include <com/sun/star/frame/XController.hpp>
-+#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-+#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-+#include <com/sun/star/container/XNameAccess.hpp>
-+
-+using namespace ::com::sun::star;
-+using namespace ::ooo::vba;
-+
-+#define FIRST_PAGE 1;
-+
-+// Class HeaderFooterHelper 
-+
-+sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-+    
-+    sal_Bool isOn = sal_False;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isOn;
-+    if( !isOn )
-+        return sal_False;
-+
-+    sal_Bool isShared = sal_False;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared"))) >>= isShared;
-+
-+    rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") );
-+    if( !isShared )
-+    {
-+        if( 0 == xPageCursor->getPage() % 2 )
-+        {
-+            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextLeft") );
-+        }
-+        else
-+        {
-+            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextRight") );
-+        }
-+    }
-+    
-+    uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
-+    //FIXME: can not compare in this way?
-+    return ( xText == xCurrentText );
-+}
-+
-+sal_Bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    if( isHeader( xModel, xCurrentText ) )
-+    {
-+        uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+        // FIXME: getPage allways returns 1
-+        sal_Int32 nPage = xPageCursor->getPage();
-+        return nPage == FIRST_PAGE;
-+    }
-+    return sal_False;
-+}
-+
-+sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    if( isHeader( xModel, xCurrentText ) )
-+    {
-+        uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-+        sal_Bool isShared = sal_False;
-+        xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared"))) >>= isShared;
-+        if( !isShared )
-+        {
-+            uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+            return ( 0 == xPageCursor->getPage() % 2 );
-+        }    
-+    }
-+    return sal_False;
-+}
-+
-+sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-+    
-+    sal_Bool isOn = sal_False;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isOn;
-+    if( !isOn )
-+        return sal_False;
-+
-+    sal_Bool isShared = sal_False;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))) >>= isShared;
-+
-+    rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
-+    if( !isShared )
-+    {
-+        if( 0 == xPageCursor->getPage() % 2 )
-+        {
-+            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextLeft") );
-+        }
-+        else
-+        {
-+            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextRight") );
-+        }
-+    }
-+    
-+    uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
-+
-+    return ( xText == xCurrentText );
-+}
-+
-+sal_Bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    if( isFooter( xModel, xCurrentText ) )
-+    {
-+        uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+        sal_Int32 nPage = xPageCursor->getPage();
-+        return nPage == FIRST_PAGE;
-+    }
-+    return sal_False;
-+}
-+
-+sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    if( isFooter( xModel, xCurrentText ) )
-+    {
-+        uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-+        sal_Bool isShared = sal_False;
-+        xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))) >>= isShared;
-+        if( !isShared )
-+        {
-+            uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
-+            return ( 0 == xPageCursor->getPage() % 2 );
-+        }    
-+    }
-+    return sal_False;
-+}
-+
-+sal_Bool HeaderFooterHelper::isPrimaryHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    if( isHeader( xModel, xCurrentText ) )
-+    {
-+        return( !( isFirstPageHeader( xModel, xCurrentText ) && isEvenPagesHeader( xModel, xCurrentText ) ) );
-+    }
-+    return sal_False;
-+}
-+
-+sal_Bool HeaderFooterHelper::isPrimaryFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+{
-+    if( isHeader( xModel, xCurrentText ) )
-+    {
-+        return( !( isFirstPageFooter( xModel, xCurrentText ) && isEvenPagesFooter( xModel, xCurrentText ) ) );
-+    }
-+    return sal_False;
-+}
-diff --git sw/source/ui/vba/vbaheaderfooterhelper.hxx sw/source/ui/vba/vbaheaderfooterhelper.hxx
-new file mode 100644
-index 0000000..2dffc59
---- /dev/null
-+++ sw/source/ui/vba/vbaheaderfooterhelper.hxx
-@@ -0,0 +1,52 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbahelper.hxx,v $
-+ * $Revision: 1.5.32.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_WORD_VBA_HEADERFOOTERHELPER_HXX
-+#define SW_WORD_VBA_HEADERFOOTERHELPER_HXX
-+
-+#include <vbahelper/vbahelper.hxx>
-+#include <com/sun/star/text/XText.hpp>
-+#include <com/sun/star/text/XTextViewCursor.hpp>
-+#include <com/sun/star/text/XPageCursor.hpp>
-+#include <com/sun/star/style/XStyle.hpp>
-+
-+class HeaderFooterHelper
-+{
-+public:
-+    static sal_Bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isPrimaryHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+    static sal_Bool isPrimaryFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
-+};
-+
-+#endif
-diff --git sw/source/ui/vba/vbainformationhelper.cxx sw/source/ui/vba/vbainformationhelper.cxx
-new file mode 100644
-index 0000000..e062ed0
---- /dev/null
-+++ sw/source/ui/vba/vbainformationhelper.cxx
-@@ -0,0 +1,71 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbainformationhelper.hxx"
-+#include <com/sun/star/text/XPageCursor.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include "wordvbahelper.hxx"
-+#include <docsh.hxx>
-+#include <doc.hxx>
-+#include <vbahelper/vbahelper.hxx>
-+#include <swtypes.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+static const sal_Int32 DEFAULT_PAGE_DISTANCE = 500;
-+
-+sal_Int32 SwVbaInformationHelper::handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException )
-+{
-+    uno::Reference< text::XPageCursor > xPageCursor( xTVCursor, uno::UNO_QUERY_THROW );
-+    return xPageCursor->getPage();
-+}
-+
-+sal_Int32 SwVbaInformationHelper::handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException )
-+{
-+    return word::getPageCount( xModel );
-+}
-+
-+double SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException )
-+{
-+    xTVCursor->collapseToStart();
-+    uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-+    sal_Int32 nTopMargin = 0;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin") ) ) >>= nTopMargin;
-+    sal_Int32 nCurrentPos = xTVCursor->getPosition().Y;
-+
-+    sal_Int32 nCurrentPage = handleWdActiveEndPageNumber( xTVCursor );
-+    sal_Int32 nPageHeight = word::getDocShell( xModel )->GetDoc()->GetPageSize( nCurrentPage, sal_False ).Height();
-+    // FIXME: handle multipul page style
-+    // it is very strange that the curros position is incorrect when open Word file.
-+    // e.g. if current cursor in the top left of the text body of the first page without header,
-+    // the top value of current position should be 0, but is 201 when open a Word file. 
-+    nCurrentPos = nCurrentPos + nTopMargin - ( DEFAULT_PAGE_DISTANCE + TWIP_TO_MM100( nPageHeight ) ) * (  nCurrentPage - 1  );
-+    return Millimeter::getInPoints( nCurrentPos );
-+}
-diff --git sw/source/ui/vba/vbainformationhelper.hxx sw/source/ui/vba/vbainformationhelper.hxx
-new file mode 100644
-index 0000000..96241bb
---- /dev/null
-+++ sw/source/ui/vba/vbainformationhelper.hxx
-@@ -0,0 +1,46 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_INFORMATIONHELPER_HXX
-+#define SW_VBA_INFORMATIONHELPER_HXX
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/text/XTextViewCursor.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+
-+class SwVbaInformationHelper
-+{
-+public:
-+    static sal_Int32 handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException );
-+    static sal_Int32 handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException );
-+    static double handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException );
-+    //static double verticalPositionRelativeToPageBoundary( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor, const css::uno::Reference< css::beans::XPropertySet >& xStyleProps ) throw( css::uno::RuntimeException );
-+
-+};
-+#endif /* SW_VBA_INFORMATIONHELPER_HXX */
-diff --git sw/source/ui/vba/vbaoptions.cxx sw/source/ui/vba/vbaoptions.cxx
-index 9066a76..eac6da7 100644
---- sw/source/ui/vba/vbaoptions.cxx
-+++ sw/source/ui/vba/vbaoptions.cxx
-@@ -30,6 +30,9 @@
- #include "vbaoptions.hxx"
- #include <vbahelper/vbahelper.hxx>
- #include <ooo/vba/word/WdDefaultFilePath.hpp>
-+#include <ooo/vba/word/WdLineStyle.hpp>
-+#include <ooo/vba/word/WdLineWidth.hpp>
-+#include <ooo/vba/word/WdColorIndex.hpp>
- #include <com/sun/star/util/XStringSubstitution.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <osl/file.hxx>
-@@ -67,6 +70,11 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException )
-             msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Template") );
-             break;
-         }
-+        case word::WdDefaultFilePath::wdStartupPath:
-+        {
-+            msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Addin") );
-+            break;
-+        }
-         case word::WdDefaultFilePath::wdUserOptionsPath:
-         {
-             msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserConfig") );
-@@ -128,6 +136,137 @@ uno::Any SwVbaOptions::getValueEvent()
-     return uno::makeAny( sPath );
- }
- 
-+sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineStyle() throw (uno::RuntimeException)
-+{
-+    return word::WdLineStyle::wdLineStyleSingle;
-+}
-+
-+void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineWidth() throw (uno::RuntimeException)
-+{
-+    return word::WdLineWidth::wdLineWidth050pt;
-+}
-+
-+void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderColorIndex() throw (uno::RuntimeException)
-+{
-+    return word::WdColorIndex::wdAuto;
-+}
-+
-+void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+::sal_Bool SAL_CALL SwVbaOptions::getReplaceSelection() throw (uno::RuntimeException)
-+{
-+    return sal_True;
-+}
-+
-+void SAL_CALL SwVbaOptions::setReplaceSelection( ::sal_Bool _replaceselection ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+::sal_Bool SAL_CALL SwVbaOptions::getMapPaperSize() throw (uno::RuntimeException)
-+{
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaOptions::setMapPaperSize( ::sal_Bool _mappapersize ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyHeadings() throw (uno::RuntimeException)
-+{
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _autoformatasyoutypeapplyheadings ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyBulletedLists() throw (uno::RuntimeException)
-+{
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyNumberedLists() throw (uno::RuntimeException)
-+{
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeFormatListItemBeginning() throw (uno::RuntimeException)
-+{
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeDefineStyles() throw (uno::RuntimeException)
-+{
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _autoformatasyoutypedefinestyles ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyHeadings() throw (uno::RuntimeException)
-+{
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( ::sal_Bool _autoformatapplyheadings ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyLists() throw (uno::RuntimeException)
-+{
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( ::sal_Bool _autoformatapplylists ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+::sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyBulletedLists() throw (uno::RuntimeException)
-+{
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool _autoformatapplybulletedlists ) throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+}
-+
-+
- rtl::OUString& 
- SwVbaOptions::getServiceImplName()
- {
-diff --git sw/source/ui/vba/vbaoptions.hxx sw/source/ui/vba/vbaoptions.hxx
-index a03b581..6ef6e44 100644
---- sw/source/ui/vba/vbaoptions.hxx
-+++ sw/source/ui/vba/vbaoptions.hxx
-@@ -48,7 +48,35 @@ public:
- 	SwVbaOptions( css::uno::Reference< css::uno::XComponentContext >& m_xContext ) throw ( css::uno::RuntimeException );
- 	virtual ~SwVbaOptions();
- 
--	// XOptions
-+    // Attributes
-+    virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getReplaceSelection() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setReplaceSelection( ::sal_Bool _replaceselection ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getMapPaperSize() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMapPaperSize( ::sal_Bool _mappapersize ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _autoformatasyoutypeapplyheadings ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _autoformatasyoutypedefinestyles ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getAutoFormatApplyHeadings() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setAutoFormatApplyHeadings( ::sal_Bool _autoformatapplyheadings ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getAutoFormatApplyLists() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setAutoFormatApplyLists( ::sal_Bool _autoformatapplylists ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setAutoFormatApplyBulletedLists( ::sal_Bool _autoformatapplybulletedlists ) throw (css::uno::RuntimeException);
-+
-+    // Methods
-     virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) throw ( css::uno::RuntimeException );
- 
-     //PropListener
-diff --git sw/source/ui/vba/vbapagesetup.cxx sw/source/ui/vba/vbapagesetup.cxx
-new file mode 100644
-index 0000000..96760e8
---- /dev/null
-+++ sw/source/ui/vba/vbapagesetup.cxx
-@@ -0,0 +1,275 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbapagesetup.hxx"
-+#include <com/sun/star/text/XText.hpp>
-+#include <com/sun/star/text/XPageCursor.hpp>
-+#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-+#include <com/sun/star/container/XNameAccess.hpp>
-+#include <ooo/vba/word/WdSectionStart.hpp>
-+#include <ooo/vba/word/WdOrientation.hpp>
-+#include "wordvbahelper.hxx"
-+
-+using namespace ::com::sun::star;
-+using namespace ::ooo::vba;
-+
-+SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent, 
-+				const uno::Reference< uno::XComponentContext >& xContext,
-+				const uno::Reference< frame::XModel >& xModel,
-+                const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException):
-+	   	SwVbaPageSetup_BASE( xParent, xContext )
-+{
-+    mxModel.set( xModel, uno::UNO_QUERY_THROW );
-+    mxPageProps.set( xProps, uno::UNO_QUERY_THROW );
-+    mnOrientPortrait = word::WdOrientation::wdOrientPortrait;
-+    mnOrientLandscape = word::WdOrientation::wdOrientLandscape;
-+}		
-+
-+double SAL_CALL SwVbaPageSetup::getGutter() throw (uno::RuntimeException)
-+{
-+    // not support in Writer
-+    return 0;
-+}
-+
-+void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeException)
-+{
-+    // default add gutter into left margin
-+    if( _gutter != 0 )
-+    {
-+        double margin = VbaPageSetupBase::getLeftMargin() + _gutter;
-+        VbaPageSetupBase::setLeftMargin( margin );
-+    }
-+}
-+
-+double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException)
-+{
-+    sal_Bool isHeaderOn = sal_False;
-+    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isHeaderOn;
-+    if( !isHeaderOn )
-+        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")), uno::makeAny( sal_True ) );
-+    return VbaPageSetupBase::getHeaderMargin();
-+}
-+
-+    /**
-+     * changes the value of TopMargin to the value of new MS-Word-HeaderDistance. Subtracts the difference
-+     * between old TopMargin and the new headerDistance from the value of HeaderSpacing (which defines the
-+     * space between the header and the body of the text). calculates the new HeaderHeight (= height of the
-+     * header + headerBodyDistance).
-+     *
-+     * @param: headerDistance is the value that is set in MS Word for the distance from the top of the page
-+     *          to the header
-+     */
-+void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 newHeaderDistance = Millimeter::getInHundredthsOfOneMillimeter( _headerdistance );
-+    sal_Bool isHeaderOn = sal_False;
-+    sal_Int32 aktTopMargin = 0;
-+    sal_Int32 aktSpacing = 0;
-+    sal_Int32 aktHeaderHeight = 0;
-+
-+    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isHeaderOn;
-+    if( !isHeaderOn )
-+        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")), uno::makeAny( sal_True ) );
-+        
-+    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin"))) >>= aktTopMargin;
-+    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance"))) >>= aktSpacing;
-+    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight"))) >>= aktHeaderHeight;
-+
-+    sal_Int32 newSpacing = aktSpacing - ( newHeaderDistance - aktTopMargin );
-+    sal_Int32 height = aktHeaderHeight - aktSpacing;
-+    sal_Int32 newHeaderHeight = newSpacing + height;
-+
-+    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")), uno::makeAny( newHeaderDistance ) );
-+    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance")), uno::makeAny( newSpacing ) );
-+    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")), uno::makeAny( newHeaderHeight ) );
-+}
-+
-+double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException)
-+{
-+    sal_Bool isFooterOn = sal_False;
-+    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isFooterOn;
-+    if( !isFooterOn )
-+        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")), uno::makeAny( sal_True ) );
-+    return VbaPageSetupBase::getFooterMargin();
-+}
-+
-+void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 newFooterDistance = Millimeter::getInHundredthsOfOneMillimeter( _footerdistance );
-+    sal_Bool isFooterOn = sal_False;
-+    sal_Int32 aktBottomMargin = 0;
-+    sal_Int32 aktSpacing = 0;
-+    sal_Int32 aktFooterHeight = 0;
-+
-+    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isFooterOn;
-+    if( !isFooterOn )
-+        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")), uno::makeAny( sal_True ) );
-+        
-+    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin"))) >>= aktBottomMargin;
-+    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance"))) >>= aktSpacing;
-+    mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight"))) >>= aktFooterHeight;
-+
-+    sal_Int32 newSpacing = aktSpacing - ( newFooterDistance - aktBottomMargin );
-+    sal_Int32 height = aktFooterHeight - aktSpacing;
-+    sal_Int32 newFooterHeight = newSpacing + height;
-+
-+    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), uno::makeAny( newFooterDistance ) );
-+    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance")), uno::makeAny( newSpacing ) );
-+    mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight")), uno::makeAny( newFooterHeight ) );
-+}
-+
-+sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() throw (uno::RuntimeException)
-+{
-+    rtl::OUString pageStyle = getStyleOfFirstPage();
-+    if( pageStyle.equalsAscii( "First Page" ) )
-+        return sal_True;
-+
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (uno::RuntimeException)
-+{
-+    if( status == getDifferentFirstPageHeaderFooter() )
-+        return;
-+
-+    rtl::OUString newStyle;
-+    if( status )
-+        newStyle = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("First Page") );
-+    else
-+        newStyle = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") );
-+
-+    uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
-+    sal_Int32 nTopMargin = 0;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin"))) >>= nTopMargin;
-+    sal_Int32 nBottomMargin = 0;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin"))) >>= nBottomMargin;
-+    sal_Int32 nLeftMargin = 0;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin"))) >>= nLeftMargin;
-+    sal_Int32 nRightMargin = 0;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin"))) >>= nRightMargin;
-+    sal_Int32 nHeaderHeight = 0;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight"))) >>= nHeaderHeight;
-+    sal_Int32 nFooterHeight = 0;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight"))) >>= nFooterHeight;
-+
-+    sal_Bool isHeaderOn = sal_False;
-+    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isHeaderOn;
-+    if( isHeaderOn )
-+    {
-+        nTopMargin += nHeaderHeight;
-+        nBottomMargin += nFooterHeight;
-+        xStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")), uno::makeAny( sal_False ) );
-+        xStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")), uno::makeAny( sal_False ) );
-+    }
-+    uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW );
-+    if( xPageCursor->getPage() != 1 )
-+    {
-+        xPageCursor->jumpToFirstPage();
-+    }
-+
-+    uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ), uno::UNO_QUERY );
-+    if( xTableProps.is() )
-+    {
-+        xTableProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ), uno::makeAny( newStyle ) );
-+    }
-+    else
-+    {
-+        xCursorProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ), uno::makeAny( newStyle ) );
-+    }
-+
-+    uno::Reference< beans::XPropertySet > xFirstPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
-+    xFirstPageProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin") ), uno::makeAny( nTopMargin ) );
-+    xFirstPageProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin") ), uno::makeAny( nBottomMargin ) );
-+    xFirstPageProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin") ), uno::makeAny( nLeftMargin ) );
-+    xFirstPageProps->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ), uno::makeAny( nRightMargin ) );
-+}
-+
-+rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException)
-+{
-+    rtl::OUString styleFirstPage;
-+    uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW );
-+    if( xPageCursor->getPage() != 1 )
-+    {
-+        xPageCursor->jumpToFirstPage();
-+    }
-+
-+    uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ), uno::UNO_QUERY );
-+    if( xTableProps.is() )
-+    {
-+        xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ) ) >>= styleFirstPage;
-+    }
-+    else
-+    {
-+        xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageDescName") ) ) >>= styleFirstPage;
-+    }
-+    return styleFirstPage;
-+}
-+
-+::sal_Int32 SAL_CALL SwVbaPageSetup::getSectionStart() throw (uno::RuntimeException)
-+{
-+    // FIXME:
-+    sal_Int32 wdSectionStart = word::WdSectionStart::wdSectionNewPage;
-+    uno::Reference< container::XNamed > xNamed( mxPageProps, uno::UNO_QUERY_THROW );
-+    rtl::OUString sStyleName = xNamed->getName();
-+    //mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= sStyleName;
-+    if( sStyleName.equalsAscii("Left Page") )
-+        wdSectionStart = word::WdSectionStart::wdSectionEvenPage;
-+    else if( sStyleName.equalsAscii("Right Page") )
-+        wdSectionStart = word::WdSectionStart::wdSectionOddPage;
-+    else
-+        wdSectionStart = word::WdSectionStart::wdSectionNewPage;
-+    return wdSectionStart;    
-+}
-+
-+void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 _sectionstart ) throw (uno::RuntimeException)
-+{
-+    // fail to find corresponding feature in Writer
-+    // #FIXME:
-+}
-+
-+rtl::OUString& 
-+SwVbaPageSetup::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPageSetup") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaPageSetup::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.PageSetup" ) );
-+	}
-+	return aServiceNames;
-+}
-diff --git sw/source/ui/vba/vbapagesetup.hxx sw/source/ui/vba/vbapagesetup.hxx
-new file mode 100644
-index 0000000..db621ba
---- /dev/null
-+++ sw/source/ui/vba/vbapagesetup.hxx
-@@ -0,0 +1,70 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_PAGESETUP_HXX
-+#define SW_VBA_PAGESETUP_HXX
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/word/XPageSetup.hpp>
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbapagesetupbase.hxx>
-+
-+typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ooo::vba::word::XPageSetup > SwVbaPageSetup_BASE;
-+
-+class SwVbaPageSetup :  public SwVbaPageSetup_BASE 
-+{
-+private:
-+    rtl::OUString getStyleOfFirstPage() throw (css::uno::RuntimeException);
-+
-+public:
-+	SwVbaPageSetup( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, 
-+                    const css::uno::Reference< css::uno::XComponentContext >& xContext,
-+                    const css::uno::Reference< css::frame::XModel >& xModel, 
-+                    const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw (css::uno::RuntimeException); 
-+	virtual ~SwVbaPageSetup(){}
-+
-+    // Attributes
-+    virtual double SAL_CALL getGutter() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setGutter( double _gutter ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getHeaderDistance() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setHeaderDistance( double _headerdistance ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getFooterDistance() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setFooterDistance( double _footerdistance ) throw (css::uno::RuntimeException);
-+    virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getSectionStart() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif
-diff --git sw/source/ui/vba/vbapalette.cxx sw/source/ui/vba/vbapalette.cxx
-new file mode 100644
-index 0000000..9c7427d
---- /dev/null
-+++ sw/source/ui/vba/vbapalette.cxx
-@@ -0,0 +1,75 @@
-+#include "vbapalette.hxx"
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <ooo/vba/word/WdColor.hpp>
-+#include <ooo/vba/word/WdColorIndex.hpp>
-+
-+using namespace ::ooo::vba;
-+using namespace ::ooo::vba::word;
-+using namespace ::com::sun::star;
-+
-+static const sal_Int32 ColorTable[] =
-+{
-+WdColor::wdColorAutomatic, // 0
-+WdColor::wdColorBlack,             // 1
-+WdColor::wdColorBlue,               // 2 
-+WdColor::wdColorTurquoise,     // 3
-+WdColor::wdColorBrightGreen, // 4
-+WdColor::wdColorPink,               // 5
-+WdColor::wdColorRed,                 // 6
-+WdColor::wdColorYellow,           // 7
-+WdColor::wdColorWhite,             // 8
-+WdColor::wdColorDarkBlue,       // 9
-+WdColor::wdColorTeal,               // 10
-+WdColor::wdColorGreen,             // 11
-+WdColor::wdColorViolet,           // 12
-+WdColor::wdColorDarkRed,         // 13
-+WdColor::wdColorDarkYellow,   // 14
-+WdColor::wdColorGray50,           // 15
-+WdColor::wdColorGray25,           // 16
-+};
-+
-+typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE;
-+
-+class DefaultPalette : public XIndexAccess_BASE
-+{
-+public:
-+   DefaultPalette(){}
-+
-+    // Methods XIndexAccess
-+    virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException)
-+    {
-+        return sizeof(ColorTable) / sizeof(ColorTable[0]);
-+    }
-+
-+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+	if ( Index < 0 || Index >= getCount() )
-+		throw lang::IndexOutOfBoundsException();
-+        return uno::makeAny( sal_Int32( ColorTable[ Index ] ) );
-+    }
-+
-+    // Methods XElementAcess
-+    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
-+    {
-+        return ::getCppuType( (sal_Int32*)0 );
-+    }
-+    virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException)
-+    {
-+        return sal_True;
-+    }
-+
-+};
-+
-+VbaPalette::VbaPalette()
-+{
-+    mxPalette = new DefaultPalette();
-+}
-+
-+uno::Reference< container::XIndexAccess >
-+VbaPalette::getPalette() const
-+{
-+
-+	return mxPalette;	
-+}
-+
-diff --git sw/source/ui/vba/vbapalette.hxx sw/source/ui/vba/vbapalette.hxx
-new file mode 100644
-index 0000000..130e405
---- /dev/null
-+++ sw/source/ui/vba/vbapalette.hxx
-@@ -0,0 +1,15 @@
-+#ifndef VBAPALETTE_HXX
-+#define VBAPALETTE_HXX
-+#include <vbahelper/vbahelper.hxx>
-+
-+class VbaPalette
-+{
-+        css::uno::Reference< css::container::XIndexAccess > mxPalette;
-+public:
-+        VbaPalette();
-+        // if no palette available e.g. because the document doesn't have a 
-+        // palette defined then a default palette will be returned.
-+        css::uno::Reference< css::container::XIndexAccess > getPalette() const;
-+};
-+
-+#endif
-diff --git sw/source/ui/vba/vbaparagraph.cxx sw/source/ui/vba/vbaparagraph.cxx
-new file mode 100644
-index 0000000..107ff33
---- /dev/null
-+++ sw/source/ui/vba/vbaparagraph.cxx
-@@ -0,0 +1,177 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaparagraph.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include "vbarange.hxx"
-+#include <com/sun/star/lang/XServiceInfo.hpp>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaParagraph::SwVbaParagraph( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xDocument, const uno::Reference< text::XTextRange >& xTextRange ) throw ( uno::RuntimeException ) :
-+    SwVbaParagraph_BASE( rParent, rContext ), mxTextDocument( xDocument ), mxTextRange( xTextRange )
-+{
-+}
-+
-+SwVbaParagraph::~SwVbaParagraph()
-+{
-+}
-+
-+uno::Reference< word::XRange > SAL_CALL 
-+SwVbaParagraph::getRange( ) throw ( uno::RuntimeException )
-+{
-+    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText(), sal_True ) );
-+}
-+
-+rtl::OUString& 
-+SwVbaParagraph::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraph") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaParagraph::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Paragraph" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+
-+//typedef ::cppu::WeakImplHelper1< container::XEnumeration > ParagraphEnumeration_BASE;
-+typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > ParagraphCollectionHelper_BASE;
-+
-+class ParagraphCollectionHelper : public ParagraphCollectionHelper_BASE
-+{
-+private:
-+    uno::Reference< text::XTextDocument > mxTextDocument;
-+    
-+    uno::Reference< container::XEnumeration > getEnumeration() throw (uno::RuntimeException)
-+    {
-+        uno::Reference< container::XEnumerationAccess > xParEnumAccess( mxTextDocument->getText(), uno::UNO_QUERY_THROW );
-+        return xParEnumAccess->createEnumeration();
-+    }
-+
-+public:
-+    ParagraphCollectionHelper( const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException): mxTextDocument( xDocument )
-+    {
-+    }
-+	// XElementAccess
-+	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) { return  text::XTextRange::static_type(0); }
-+	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) { return sal_True; }
-+	// XIndexAccess
-+	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
-+    {
-+        sal_Int32 nCount = 0;
-+        uno::Reference< container::XEnumeration > xParEnum = getEnumeration();
-+        while( xParEnum->hasMoreElements() )
-+        {
-+            uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW );
-+            if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Paragraph") ) ) )
-+            {
-+                nCount++;
-+            }
-+        }
-+        return nCount;
-+    }	
-+	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
-+	{
-+        if( Index < getCount() )
-+        {
-+            sal_Int32 nCount = 0;
-+            uno::Reference< container::XEnumeration > xParEnum = getEnumeration();
-+            while( xParEnum->hasMoreElements() )
-+            {
-+                uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW );
-+                if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Paragraph") ) ) )
-+                {
-+                    if( Index == nCount )
-+                        return uno::makeAny( xServiceInfo );
-+                    nCount++;
-+                }        
-+            }
-+        }
-+        throw lang::IndexOutOfBoundsException();
-+    }
-+	// XEnumerationAccess
-+	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
-+	{
-+		return getEnumeration();
-+    }    
-+};
-+
-+SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument )
-+{
-+}
-+
-+// XEnumerationAccess
-+uno::Type
-+SwVbaParagraphs::getElementType() throw (uno::RuntimeException)
-+{
-+	return word::XParagraph::static_type(0);
-+}
-+uno::Reference< container::XEnumeration >
-+SwVbaParagraphs::createEnumeration() throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+    return xEnumerationAccess->createEnumeration();
-+}
-+
-+uno::Any
-+SwVbaParagraphs::createCollectionObject( const css::uno::Any& aSource )
-+{
-+    uno::Reference< text::XTextRange > xTextRange( aSource, uno::UNO_QUERY_THROW );
-+    return uno::makeAny( uno::Reference< word::XParagraph >( new SwVbaParagraph( this, mxContext, mxTextDocument, xTextRange ) ) );
-+}
-+
-+rtl::OUString& 
-+SwVbaParagraphs::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphs") );
-+	return sImplName;
-+}
-+
-+css::uno::Sequence<rtl::OUString> 
-+SwVbaParagraphs::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > sNames;
-+	if ( sNames.getLength() == 0 )
-+	{
-+		sNames.realloc( 1 );
-+		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Paragraphs") );
-+	}
-+	return sNames;
-+}
-diff --git sw/source/ui/vba/vbaparagraph.hxx sw/source/ui/vba/vbaparagraph.hxx
-new file mode 100644
-index 0000000..979116d
---- /dev/null
-+++ sw/source/ui/vba/vbaparagraph.hxx
-@@ -0,0 +1,84 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_PARAGRAPH_HXX
-+#define SW_VBA_PARAGRAPH_HXX
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <ooo/vba/word/XParagraphs.hpp>
-+#include <ooo/vba/word/XParagraph.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/text/XTextRange.hpp>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XParagraph > SwVbaParagraph_BASE;
-+
-+class SwVbaParagraph : public SwVbaParagraph_BASE
-+{
-+private:
-+    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
-+    css::uno::Reference< css::text::XTextRange > mxTextRange;
-+
-+public:
-+	SwVbaParagraph( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDocument, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaParagraph();
-+
-+    // XParagraph
-+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw ( css::uno::RuntimeException );
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+
-+/* class SwVbaParagraphs */
-+typedef CollTestImplHelper< ooo::vba::word::XParagraphs > SwVbaParagraphs_BASE;
-+
-+class SwVbaParagraphs : public SwVbaParagraphs_BASE
-+{
-+private:
-+    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
-+public:
-+	SwVbaParagraphs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDocument ) throw (css::uno::RuntimeException);
-+	virtual ~SwVbaParagraphs() {}
-+
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+
-+	// SwVbaParagraphs_BASE
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};    
-+
-+#endif /* SW_VBA_PARAGRAPH_HXX */
-diff --git sw/source/ui/vba/vbaparagraphformat.cxx sw/source/ui/vba/vbaparagraphformat.cxx
-new file mode 100644
-index 0000000..7726d48
---- /dev/null
-+++ sw/source/ui/vba/vbaparagraphformat.cxx
-@@ -0,0 +1,576 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbaparagraphformat.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include "wordvbahelper.hxx"
-+#include <com/sun/star/style/LineSpacingMode.hpp>
-+#include <ooo/vba/word/WdLineSpacing.hpp>
-+#include <ooo/vba/word/WdParagraphAlignment.hpp>
-+#include <ooo/vba/word/WdOutlineLevel.hpp>
-+#include <com/sun/star/style/ParagraphAdjust.hpp>
-+#include <com/sun/star/style/BreakType.hpp>
-+
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+static const sal_Int16 CHARACTER_INDENT_FACTOR = 12;
-+static const sal_Int16 PERCENT100 = 100;
-+static const sal_Int16 PERCENT150 = 150;
-+static const sal_Int16 PERCENT200 = 200;
-+
-+SwVbaParagraphFormat::SwVbaParagraphFormat( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< beans::XPropertySet >& rParaProps ) : SwVbaParagraphFormat_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mxParaProps( rParaProps )
-+{
-+}
-+
-+SwVbaParagraphFormat::~SwVbaParagraphFormat()
-+{
-+}
-+
-+sal_Int32 SAL_CALL SwVbaParagraphFormat::getAlignment() throw (uno::RuntimeException)
-+{
-+    style::ParagraphAdjust aParaAdjust = style::ParagraphAdjust_LEFT;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaAdjust") ) ) >>= aParaAdjust;
-+    return getMSWordAlignment( aParaAdjust );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setAlignment( sal_Int32 _alignment ) throw (uno::RuntimeException)
-+{
-+    style::ParagraphAdjust aParaAdjust = ( style::ParagraphAdjust ) getOOoAlignment( _alignment );
-+    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaAdjust") ), uno::makeAny( aParaAdjust ) );
-+}
-+
-+float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() throw (uno::RuntimeException)
-+{
-+    sal_Int32 indent = 0;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaFirstLineIndent") ) ) >>= indent;
-+    return (float)( Millimeter::getInPoints( indent ) );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 indent = Millimeter::getInHundredthsOfOneMillimeter( _firstlineindent );
-+    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaFirstLineIndent") ), uno::makeAny( indent ) );
-+}
-+
-+uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() throw (uno::RuntimeException)
-+{
-+    sal_Bool bKeep = sal_False;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaKeepTogether") ) ) >>= bKeep;
-+    return uno::makeAny ( bKeep );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogether ) throw (uno::RuntimeException)
-+{
-+    sal_Bool bKeep = sal_False;
-+    if( _keeptogether >>= bKeep )
-+    {
-+        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaKeepTogether") ), uno::makeAny( bKeep ) );
-+    }    
-+    else
-+    {
-+        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
-+    }
-+}
-+
-+uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() throw (uno::RuntimeException)
-+{
-+    sal_Bool bKeep = sal_False;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaSplit") ) ) >>= bKeep;
-+    return uno::makeAny ( bKeep );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithnext ) throw (uno::RuntimeException)
-+{
-+    sal_Bool bKeep = sal_False;
-+    if( _keepwithnext >>= bKeep )
-+    {
-+        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaSplit") ), uno::makeAny( bKeep ) );
-+    }    
-+    else
-+    {
-+        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
-+    }
-+}
-+
-+uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() throw (uno::RuntimeException)
-+{
-+    sal_Bool bHypn = sal_False;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation") ) ) >>= bHypn;
-+    return uno::makeAny ( bHypn );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation ) throw (uno::RuntimeException)
-+{
-+    sal_Bool bHypn = sal_False;
-+    if( _hyphenation >>= bHypn )
-+    {
-+        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation") ), uno::makeAny( bHypn ) );
-+    }    
-+    else
-+    {
-+        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
-+    }
-+}
-+
-+float SAL_CALL SwVbaParagraphFormat::getLineSpacing() throw (uno::RuntimeException)
-+{
-+    style::LineSpacing aLineSpacing;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ) ) >>= aLineSpacing;
-+    return getMSWordLineSpacing( aLineSpacing );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) throw (uno::RuntimeException)
-+{
-+    style::LineSpacing aLineSpacing;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ) ) >>= aLineSpacing;
-+    aLineSpacing = getOOoLineSpacing( _linespacing, aLineSpacing.Mode );
-+    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ), uno::makeAny( aLineSpacing ) );
-+}
-+
-+sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule() throw (uno::RuntimeException)
-+{
-+    style::LineSpacing aLineSpacing;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ) ) >>= aLineSpacing;
-+    return getMSWordLineSpacingRule( aLineSpacing );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingrule ) throw (uno::RuntimeException)
-+{
-+    style::LineSpacing aLineSpacing = getOOoLineSpacingFromRule( _linespacingrule );
-+    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineSpacing") ), uno::makeAny( aLineSpacing ) );
-+}
-+
-+uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() throw (uno::RuntimeException)
-+{
-+    sal_Bool noLineNum = sal_False;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberCount") ) ) >>= noLineNum;
-+    return uno::makeAny ( noLineNum );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumber ) throw (uno::RuntimeException)
-+{
-+    sal_Bool noLineNum = sal_False;
-+    if( _nolinenumber >>= noLineNum )
-+    {
-+        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberCount") ), uno::makeAny( noLineNum ) );
-+    }    
-+    else
-+    {
-+        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
-+    }
-+}
-+
-+sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nLevel = word::WdOutlineLevel::wdOutlineLevelBodyText;
-+    rtl::OUString aHeading;
-+    const rtl::OUString HEADING = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Heading") );
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName") ) ) >>= aHeading;
-+    if( aHeading.indexOf( HEADING ) == 0 )
-+    {
-+        // get the sub string after "Heading"
-+        nLevel = aHeading.copy( HEADING.getLength() ).toInt32();
-+    }
-+    return nLevel;
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::RuntimeException)
-+{
-+    style::BreakType aBreakType;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ) ) >>= aBreakType;
-+    sal_Bool bBreakBefore = ( aBreakType == style::BreakType_PAGE_BEFORE || aBreakType == style::BreakType_PAGE_BOTH );
-+    return uno::makeAny( bBreakBefore );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbefore ) throw (uno::RuntimeException)
-+{
-+    sal_Bool bBreakBefore = sal_False;
-+    if( _breakbefore >>= bBreakBefore )
-+    {
-+        style::BreakType aBreakType;
-+        mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ) ) >>= aBreakType;
-+        if( bBreakBefore )
-+        {
-+            if( aBreakType == style::BreakType_NONE )
-+                aBreakType = style::BreakType_PAGE_BEFORE;
-+            else if ( aBreakType == style::BreakType_PAGE_AFTER )
-+                aBreakType = style::BreakType_PAGE_BOTH;
-+        }
-+        else
-+        {
-+            if( aBreakType == style::BreakType_PAGE_BOTH )
-+                aBreakType = style::BreakType_PAGE_AFTER;
-+            else if ( aBreakType == style::BreakType_PAGE_BEFORE )
-+                aBreakType = style::BreakType_PAGE_AFTER;
-+        }
-+        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ), uno::makeAny( aBreakType ) );
-+    }    
-+    else
-+    {
-+        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
-+    }
-+}
-+
-+float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nSpace;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin") ) ) >>= nSpace;
-+    return (float)( Millimeter::getInPoints( nSpace ) );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space );
-+    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin") ), uno::makeAny( nSpace ) );
-+}
-+
-+float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nSpace = 0;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaBottomMargin") ) ) >>= nSpace;
-+    return (float)( Millimeter::getInPoints( nSpace ) );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space );
-+    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaBottomMargin") ), uno::makeAny( nSpace ) );
-+}
-+
-+float SAL_CALL SwVbaParagraphFormat::getLeftIndent() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nIndent = 0;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLeftMargin") ) ) >>= nIndent;
-+    return (float)( Millimeter::getInPoints( nIndent ) );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _leftindent );
-+    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLeftMargin") ), uno::makeAny( nIndent ) );
-+}
-+
-+float SAL_CALL SwVbaParagraphFormat::getRightIndent() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nIndent = 0;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaRightMargin") ) ) >>= nIndent;
-+    return (float)( Millimeter::getInPoints( nIndent ) );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _rightindent );
-+    mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaRightMargin") ), uno::makeAny( nIndent ) );
-+}
-+
-+uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& _tabstops ) throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeException)
-+{
-+    sal_Bool bWidow = sal_False;
-+    sal_Int8 nWidow = 0;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaWidows") ) ) >>= nWidow;
-+    sal_Int8 nOrphan = 0;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaOrphans") ) ) >>= nOrphan;
-+    // if the amount of single lines on one page > 1 and the same of start and end of the paragraph,
-+    // true is retured.
-+    bWidow = ( nWidow > 1 && nOrphan == nWidow );
-+    return uno::makeAny( bWidow );
-+}
-+
-+void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontrol ) throw (uno::RuntimeException)
-+{
-+    // if we get true, the part of the paragraph on one page has to be
-+    // at least two lines
-+    sal_Bool bWidow = sal_False;
-+    if( _widowcontrol >>= bWidow )
-+    {
-+        sal_Int8 nControl = bWidow? 2:1;
-+        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaWidows") ), uno::makeAny( nControl ) );
-+        mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaOrphans") ), uno::makeAny( nControl ) );
-+    }
-+    else
-+    {
-+        DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
-+    }
-+}
-+
-+style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacing( float _lineSpace, sal_Int16 mode )
-+{
-+    style::LineSpacing aLineSpacing;
-+    if( mode != style::LineSpacingMode::MINIMUM && mode != style::LineSpacingMode::FIX )
-+    {
-+        // special behaviour of word: if the space is set to these values, the rule and 
-+        // the height are changed accordingly
-+        if( _lineSpace == CHARACTER_INDENT_FACTOR )
-+        {
-+            aLineSpacing.Mode = style::LineSpacingMode::PROP;
-+            aLineSpacing.Height = PERCENT100;
-+        }
-+        else if( _lineSpace == ( sal_Int16 )( CHARACTER_INDENT_FACTOR * 1.5 ) )
-+        {
-+            aLineSpacing.Mode = style::LineSpacingMode::PROP;
-+            aLineSpacing.Height = PERCENT150;
-+        }
-+        else if( _lineSpace == ( sal_Int16 )( ( CHARACTER_INDENT_FACTOR ) * 2 ) )
-+        {
-+            aLineSpacing.Mode = style::LineSpacingMode::PROP;
-+            aLineSpacing.Height = PERCENT200;
-+        }
-+        else
-+        {
-+            aLineSpacing.Mode = style::LineSpacingMode::FIX;
-+            aLineSpacing.Height = ( sal_Int16 )( Millimeter::getInHundredthsOfOneMillimeter( _lineSpace ) );
-+        }
-+    }
-+    else
-+    {
-+        aLineSpacing.Mode = mode;
-+        aLineSpacing.Height = ( sal_Int16 )( Millimeter::getInHundredthsOfOneMillimeter( _lineSpace ) );
-+    }
-+    return aLineSpacing;
-+}
-+
-+style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacingFromRule( sal_Int32 _linespacingrule )
-+{
-+    style::LineSpacing aLineSpacing;
-+    switch( _linespacingrule )
-+    {
-+        case word::WdLineSpacing::wdLineSpace1pt5:
-+        {
-+            aLineSpacing.Mode = style::LineSpacingMode::PROP;
-+            aLineSpacing.Height = PERCENT150;
-+            break;
-+        }
-+        case word::WdLineSpacing::wdLineSpaceAtLeast:
-+        {
-+            aLineSpacing.Mode = style::LineSpacingMode::MINIMUM;
-+            aLineSpacing.Height = getCharHeight();
-+            break;
-+        }
-+        case word::WdLineSpacing::wdLineSpaceDouble:
-+        {
-+            aLineSpacing.Mode = style::LineSpacingMode::PROP;
-+            aLineSpacing.Height = getCharHeight();
-+            break;
-+        }
-+        case word::WdLineSpacing::wdLineSpaceExactly:
-+        case word::WdLineSpacing::wdLineSpaceMultiple:
-+        {
-+            aLineSpacing.Mode = style::LineSpacingMode::FIX;
-+            aLineSpacing.Height = getCharHeight();
-+            break;
-+        }
-+        case word::WdLineSpacing::wdLineSpaceSingle:
-+        {
-+            aLineSpacing.Mode = style::LineSpacingMode::PROP;
-+            aLineSpacing.Height = PERCENT100;
-+            break;
-+        }
-+        default:
-+        {
-+            DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
-+            break;
-+        }
-+    }
-+    return aLineSpacing;
-+}
-+
-+float SwVbaParagraphFormat::getMSWordLineSpacing( style::LineSpacing& rLineSpacing )
-+{
-+    float wdLineSpacing = 0;
-+    if( rLineSpacing.Mode != style::LineSpacingMode::PROP )
-+    {
-+        wdLineSpacing = (float)( Millimeter::getInPoints( rLineSpacing.Height ) );
-+    }
-+    else
-+    {
-+        wdLineSpacing = (float)( CHARACTER_INDENT_FACTOR * rLineSpacing.Height ) / PERCENT100;
-+    }
-+    return wdLineSpacing;
-+}
-+
-+sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rLineSpacing )
-+{
-+    sal_Int32 wdLineSpacing = word::WdLineSpacing::wdLineSpaceSingle;
-+    switch( rLineSpacing.Mode )
-+    {
-+        case style::LineSpacingMode::PROP:
-+        {
-+            switch( rLineSpacing.Height )
-+            {
-+                case PERCENT100:
-+                {
-+                    wdLineSpacing = word::WdLineSpacing::wdLineSpaceSingle;
-+                    break;
-+                }
-+                case PERCENT150:
-+                {
-+                    wdLineSpacing = word::WdLineSpacing::wdLineSpace1pt5;
-+                    break;
-+                }
-+                case PERCENT200:
-+                {
-+                    wdLineSpacing = word::WdLineSpacing::wdLineSpaceDouble;
-+                    break;
-+                }
-+                default:
-+                {
-+                    wdLineSpacing = word::WdLineSpacing::wdLineSpaceMultiple;
-+                }
-+            }
-+            break;
-+        }
-+        case style::LineSpacingMode::MINIMUM:
-+        {
-+            wdLineSpacing = word::WdLineSpacing::wdLineSpaceAtLeast;
-+            break;
-+        }
-+        case style::LineSpacingMode::FIX:
-+        case style::LineSpacingMode::LEADING:
-+        {
-+            wdLineSpacing = word::WdLineSpacing::wdLineSpaceExactly;
-+            break;
-+        }
-+        default:
-+        {
-+            DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
-+        }
-+    }
-+    return wdLineSpacing;
-+}
-+
-+sal_Int16 SwVbaParagraphFormat::getCharHeight() throw (uno::RuntimeException)
-+{
-+    float fCharHeight;
-+    mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharHeight") ) ) >>= fCharHeight;
-+    return (sal_Int16)( Millimeter::getInHundredthsOfOneMillimeter( fCharHeight ) );
-+}
-+
-+sal_Int32 SwVbaParagraphFormat::getOOoAlignment( sal_Int32 _alignment )
-+{
-+    sal_Int32 nParaAjust = style::ParagraphAdjust_LEFT;
-+    switch( _alignment )
-+    {
-+        case word::WdParagraphAlignment::wdAlignParagraphCenter:
-+        {
-+            nParaAjust = style::ParagraphAdjust_CENTER;
-+            break;
-+        }
-+        case word::WdParagraphAlignment::wdAlignParagraphJustify:
-+        {
-+            nParaAjust = style::ParagraphAdjust_BLOCK;
-+            break;
-+        }
-+        case word::WdParagraphAlignment::wdAlignParagraphLeft:
-+        {
-+            nParaAjust = style::ParagraphAdjust_LEFT;
-+            break;
-+        }
-+        case word::WdParagraphAlignment::wdAlignParagraphRight:
-+        {
-+            nParaAjust = style::ParagraphAdjust_RIGHT;
-+            break;
-+        }
-+        default:
-+        {
-+            DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
-+        }
-+    }
-+    return nParaAjust;
-+}
-+
-+sal_Int32 SwVbaParagraphFormat::getMSWordAlignment( sal_Int32 _alignment )
-+{
-+    sal_Int32 wdAlignment = word::WdParagraphAlignment::wdAlignParagraphLeft;
-+    switch( _alignment )
-+    {
-+        case style::ParagraphAdjust_CENTER:
-+        {
-+            wdAlignment = word::WdParagraphAlignment::wdAlignParagraphCenter;
-+            break;
-+        }
-+        case style::ParagraphAdjust_LEFT:
-+        {
-+            wdAlignment = word::WdParagraphAlignment::wdAlignParagraphLeft;
-+            break;
-+        }
-+        case style::ParagraphAdjust_BLOCK:
-+        {
-+            wdAlignment = word::WdParagraphAlignment::wdAlignParagraphJustify;
-+            break;
-+        }
-+        case style::ParagraphAdjust_RIGHT:
-+        {
-+            wdAlignment = word::WdParagraphAlignment::wdAlignParagraphRight;
-+            break;
-+        }
-+        default:
-+        {
-+            DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
-+        }
-+    }
-+    return wdAlignment;
-+}
-+
-+rtl::OUString& 
-+SwVbaParagraphFormat::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphFormat") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaParagraphFormat::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.ParagraphFormat" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-diff --git sw/source/ui/vba/vbaparagraphformat.hxx sw/source/ui/vba/vbaparagraphformat.hxx
-new file mode 100644
-index 0000000..d4d9795
---- /dev/null
-+++ sw/source/ui/vba/vbaparagraphformat.hxx
-@@ -0,0 +1,98 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_PARAGRAPHFORMAT_HXX
-+#define SW_VBA_PARAGRAPHFORMAT_HXX
-+
-+#include <ooo/vba/word/XParagraphFormat.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+#include <com/sun/star/style/LineSpacing.hpp>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XParagraphFormat > SwVbaParagraphFormat_BASE;
-+
-+class SwVbaParagraphFormat : public SwVbaParagraphFormat_BASE
-+{
-+private:
-+    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
-+    css::uno::Reference< css::beans::XPropertySet > mxParaProps;
-+
-+private:
-+    css::style::LineSpacing getOOoLineSpacing( float _lineSpace, sal_Int16 mode );
-+    css::style::LineSpacing getOOoLineSpacingFromRule( sal_Int32 _linespacingrule );
-+    float getMSWordLineSpacing( css::style::LineSpacing& rLineSpacing );
-+    sal_Int32 getMSWordLineSpacingRule( css::style::LineSpacing& rLineSpacing );
-+    sal_Int16 getCharHeight() throw (css::uno::RuntimeException);
-+    sal_Int32 getOOoAlignment( sal_Int32 _alignment );
-+    sal_Int32 getMSWordAlignment( sal_Int32 _alignment );
-+
-+public:
-+	SwVbaParagraphFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::beans::XPropertySet >& rParaProps );
-+	virtual ~SwVbaParagraphFormat();
-+    
-+    // Attributes
-+    virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getFirstLineIndent() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getKeepTogether() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getKeepWithNext() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getHyphenation() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getLineSpacing() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLineSpacing( float _linespacing ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getLineSpacingRule() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getNoLineNumber() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getOutlineLevel() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getPageBreakBefore() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getSpaceBefore() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setSpaceBefore( float _spacebefore ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getSpaceAfter() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setSpaceAfter( float _spaceafter ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getLeftIndent() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLeftIndent( float _leftindent ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getRightIndent() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setRightIndent( float _rightindent ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getTabStops() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getWidowControl() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_PARAGRAPHFORMAT_HXX */
-diff --git sw/source/ui/vba/vbarange.cxx sw/source/ui/vba/vbarange.cxx
-index 39c93b9..283162a 100644
---- sw/source/ui/vba/vbarange.cxx
-+++ sw/source/ui/vba/vbarange.cxx
-@@ -31,65 +31,76 @@
- #include <vbahelper/vbahelper.hxx>
- #include <tools/diagnose_ex.h>
- #include "vbarangehelper.hxx"
--#include <com/sun/star/text/XTextDocument.hpp>
- #include <ooo/vba/word/WdBreakType.hpp>
- #include <com/sun/star/style/BreakType.hpp>
-+#include <com/sun/star/text/ControlCharacter.hpp>
-+#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-+#include "wordvbahelper.hxx"
-+#include "vbaparagraphformat.hxx"
-+#include "vbastyle.hxx"
-+#include "vbafont.hxx"
-+#include "vbapalette.hxx"
-+#include "vbapagesetup.hxx"
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
- 
--typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XRange > SwVbaBaseRange_BASE;
--
--class SwVbaBaseRange : public SwVbaBaseRange_BASE
-+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
- {
--protected:
--    uno::Reference< text::XTextDocument > mxTextDocument;
--    uno::Reference< text::XTextCursor > mxTextCursor;
--    uno::Reference< text::XText > mxText;
--    sal_Bool mbMaySpanEndOfDocument;
--
--	SwVbaBaseRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext );
--    virtual ~SwVbaBaseRange();
--
--public:
--    uno::Reference< text::XTextRange > getXTextRange() throw (uno::RuntimeException);
--
--	// XRange
--    virtual rtl::OUString SAL_CALL getText() throw (uno::RuntimeException);
--    virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (uno::RuntimeException);
--
--   // Methods
--   virtual void SAL_CALL InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException);
-+    uno::Reference< text::XTextRange > xEnd;
-+    initialize( rStart, xEnd );
-+}
- 
--	// XHelperInterface
--	virtual rtl::OUString& getServiceImplName();
--	virtual uno::Sequence<rtl::OUString> getServiceNames();
--};
-+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
-+{
-+    initialize( rStart, rEnd );
-+}
- 
-+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument ), mxText( rText )
-+{
-+    initialize( rStart, rEnd );
-+}
- 
--SwVbaBaseRange::SwVbaBaseRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext )
--    : SwVbaBaseRange_BASE( rParent, rContext )
-+SwVbaRange::~SwVbaRange()
- {
- }
- 
--SwVbaBaseRange::~SwVbaBaseRange()
-+void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) throw (uno::RuntimeException)
- {
-+    if( !mxText.is() )
-+    {
-+        mxText = mxTextDocument->getText();
-+    }    
-+    
-+    mxTextCursor = SwVbaRangeHelper::initCursor( rStart, mxText );
-+    mxTextCursor->collapseToStart();
-+
-+    if( rEnd.is() )
-+        mxTextCursor->gotoRange( rEnd, sal_True );
-+    else
-+        mxTextCursor->gotoEnd( sal_True );
- }
- 
--uno::Reference< text::XTextRange >
--SwVbaBaseRange::getXTextRange() throw (uno::RuntimeException)
-+uno::Reference< text::XTextRange > SAL_CALL
-+SwVbaRange::getXTextRange() throw (uno::RuntimeException)
- {
-     uno::Reference< text::XTextRange > xTextRange( mxTextCursor, uno::UNO_QUERY_THROW );
-     return xTextRange;
- }
- 
-+void SwVbaRange::setXTextRange( const uno::Reference< text::XTextRange >& xRange ) throw (uno::RuntimeException)
-+{
-+    mxTextCursor->gotoRange( xRange->getStart(), sal_False );
-+    mxTextCursor->gotoRange( xRange->getEnd(), sal_True );
-+}
-+
- /**
- * The complexity in this method is because we need to workaround
- * an issue that the last paragraph in a document does not have a trailing CRLF.
- * @return
- */
- rtl::OUString SAL_CALL
--SwVbaBaseRange::getText() throw ( uno::RuntimeException )
-+SwVbaRange::getText() throw ( uno::RuntimeException )
- {
-     rtl::OUString aText = mxTextCursor->getString();
-     sal_Int32 nLen = aText.getLength();
-@@ -118,7 +129,7 @@ SwVbaBaseRange::getText() throw ( uno::RuntimeException )
- }
- 
- void SAL_CALL
--SwVbaBaseRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
-+SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
- {
-     if( rText.indexOf( '\n' )  != -1 )
-     {
-@@ -134,7 +145,7 @@ SwVbaBaseRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeExcept
- }
- 
- // FIXME: test is not pass
--void SAL_CALL SwVbaBaseRange::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException)
-+void SAL_CALL SwVbaRange::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException)
- {
-     // default type is wdPageBreak;
-     sal_Int32 nBreakType = word::WdBreakType::wdPageBreak;
-@@ -145,7 +156,7 @@ void SAL_CALL SwVbaBaseRange::InsertBreak( const uno::Any& _breakType ) throw (u
-     switch( nBreakType )
-     {
-         case word::WdBreakType::wdPageBreak:
--            eBreakType = style::BreakType_PAGE_AFTER;
-+            eBreakType = style::BreakType_PAGE_BEFORE;
-             break;
-         case word::WdBreakType::wdColumnBreak:
-             eBreakType = style::BreakType_COLUMN_AFTER;
-@@ -177,110 +188,145 @@ void SAL_CALL SwVbaBaseRange::InsertBreak( const uno::Any& _breakType ) throw (u
-     }
- }
- 
--rtl::OUString& 
--SwVbaBaseRange::getServiceImplName()
-+void SAL_CALL
-+SwVbaRange::Select() throw ( uno::RuntimeException )
- {
--	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBaseRange") );
--	return sImplName;
-+    uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextViewCursor > xTextViewCursor = word::getXTextViewCursor( xModel );
-+    xTextViewCursor->gotoRange( mxTextCursor->getStart(), sal_False );
-+    xTextViewCursor->gotoRange( mxTextCursor->getEnd(), sal_True );
- }
- 
--uno::Sequence< rtl::OUString > 
--SwVbaBaseRange::getServiceNames()
-+void SAL_CALL
-+SwVbaRange::InsertParagraph() throw ( uno::RuntimeException )
- {
--	static uno::Sequence< rtl::OUString > aServiceNames;
--	if ( aServiceNames.getLength() == 0 )
--	{
--		aServiceNames.realloc( 1 );
--		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.BaseRange" ) );
--	}
--	return aServiceNames;
-+    mxTextCursor->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("") ) );
-+    InsertParagraphBefore();
- }
- 
-+void SAL_CALL
-+SwVbaRange::InsertParagraphBefore() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XTextRange > xTextRange = mxTextCursor->getStart();
-+    mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, sal_True );
-+    mxTextCursor->gotoRange( xTextRange, sal_True );
-+}
- 
--/*
--* class SwVbaDocRange
--*/
--class SwVbaDocRange : public SwVbaBaseRange
-+void SAL_CALL
-+SwVbaRange::InsertParagraphAfter() throw ( uno::RuntimeException )
- {
--public:
--	SwVbaDocRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
--        const uno::Reference< text::XTextDocument >& rDocument, const uno::Reference< text::XTextRange >& rStart, 
--        const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument = sal_False ) 
--        throw ( uno::RuntimeException );
--    virtual ~SwVbaDocRange();
--};
--
--SwVbaDocRange::SwVbaDocRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
--        const uno::Reference< text::XTextDocument >& rDocument, const uno::Reference< text::XTextRange >& rStart, 
--        const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw ( uno::RuntimeException ) : SwVbaBaseRange( rParent, rContext )
-+    uno::Reference< text::XTextRange > xTextRange = mxTextCursor->getEnd();
-+    mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, sal_True );
-+}
-+
-+uno::Reference< word::XParagraphFormat > SAL_CALL
-+SwVbaRange::getParagraphFormat() throw ( uno::RuntimeException )
- {
--    mxTextDocument = rDocument;
--    mbMaySpanEndOfDocument = _bMaySpanEndOfDocument; 
-+    uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
-+    return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, mxTextDocument, xParaProps ) );
-+}
- 
--    if( rText.is() )
--        mxText = rText;
--    else
--        mxText = mxTextDocument->getText();
--    
--    mxTextCursor = SwVbaRangeHelper::initCursor( rStart, mxText );
--    mxTextCursor->collapseToStart();
-+void SAL_CALL
-+SwVbaRange::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& /*rParagraphFormat*/ ) throw ( uno::RuntimeException )
-+{
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
- 
--    if( rEnd.is() )
--        mxTextCursor->gotoRange( rEnd, sal_True );
--    else
--        mxTextCursor->gotoEnd( sal_True );
-+uno::Reference< word::XStyle > SAL_CALL
-+SwVbaRange::getStyle() throw ( uno::RuntimeException )
-+{
-+    rtl::OUString aStyleName;
-+    rtl::OUString aStyleType;
-+    uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW );
-+    if( ( xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharStyleName") ) ) >>= aStyleName ) && aStyleName.getLength() )
-+    {
-+        aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharacterStyles") );
-+    }
-+    else if( ( xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName") ) ) >>= aStyleName ) && aStyleName.getLength() )
-+    {
-+        aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") );
-+    }
-+    if( aStyleType.getLength() == 0 )
-+    {
-+        DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
-+    }
-+    uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW);
-+    uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xStyleProps( xStylesAccess->getByName( aStyleName ), uno::UNO_QUERY_THROW );
-+    return uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xStyleProps ) ); 
- }
- 
--SwVbaDocRange::~SwVbaDocRange()
-+void SAL_CALL
-+SwVbaRange::setStyle( const uno::Reference< word::XStyle >& rStyle ) throw ( uno::RuntimeException )
- {
-+    uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
-+    SwVbaStyle::setStyle( xParaProps, rStyle );
- }
- 
--/*
--* class SwVbaRange
--*/
--SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
--    const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument ) : SwVbaRange_BASE( rParent, rContext )
-+uno::Reference< word::XFont > SAL_CALL
-+SwVbaRange::getFont() throw ( uno::RuntimeException )
- {
--    uno::Reference< text::XText > xText;
--    mxActualRange = uno::Reference< word::XRange > ( new SwVbaDocRange( rParent, rContext, rTextDocument, rStart, rEnd, xText, _bMaySpanEndOfDocument ) );
-+    VbaPalette aColors;
-+    return new SwVbaFont( mxParent, mxContext, aColors.getPalette(), uno::Reference< beans::XPropertySet >( getXTextRange(), uno::UNO_QUERY_THROW ) );
- }
- 
--SwVbaRange::~SwVbaRange()
-+::sal_Int32 SAL_CALL SwVbaRange::getLanguageID() throw (uno::RuntimeException)
- {
-+    uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
-+    return SwVbaStyle::getLanguageID( xParaProps );
- }
- 
--uno::Reference< text::XTextRange >
--SwVbaRange::getXTextRange() throw (uno::RuntimeException)
-+void SAL_CALL SwVbaRange::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException)
- {
--    uno::Reference< text::XTextRange > xTextRange;
--    SwVbaBaseRange* pBaseRange = dynamic_cast< SwVbaBaseRange* >( mxActualRange.get() );
--    if( pBaseRange )
--        xTextRange = pBaseRange->getXTextRange();
--    return xTextRange;
-+    uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
-+    SwVbaStyle::setLanguageID( xParaProps, _languageid );
- }
- 
--rtl::OUString SAL_CALL
--SwVbaRange::getText() throw ( uno::RuntimeException )
-+uno::Any SAL_CALL
-+SwVbaRange::PageSetup( ) throw (uno::RuntimeException)
- {
--    rtl::OUString aText;
--    if( mxActualRange.is() )
--        return mxActualRange->getText();
--    return aText;
-+    uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
-+    uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
-+    rtl::OUString aPageStyleName;
-+    xParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName;
-+    uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW );
-+    uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
-+    uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles") ) ), uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xPageProps( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW );
-+    return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, xModel, xPageProps ) ) );
- }
- 
--void SAL_CALL
--SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
-+::sal_Int32 SAL_CALL SwVbaRange::getStart() throw (uno::RuntimeException)
- {
--    if( mxActualRange.is() )
--        mxActualRange->setText( rText );
-+    uno::Reference< text::XText > xText = mxTextDocument->getText();
-+    return SwVbaRangeHelper::getPosition( xText, mxTextCursor->getStart() );
- }
- 
--void SAL_CALL SwVbaRange::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException)
-+void SAL_CALL SwVbaRange::setStart( ::sal_Int32 _start ) throw (uno::RuntimeException)
- {
--    if( mxActualRange.is() )
--        mxActualRange->InsertBreak( _breakType );
-+    uno::Reference< text::XText > xText = mxTextDocument->getText();
-+    uno::Reference< text::XTextRange > xStart = SwVbaRangeHelper::getRangeByPosition( xText, _start );
-+    uno::Reference< text::XTextRange > xEnd = mxTextCursor->getEnd();
-+
-+    mxTextCursor->gotoRange( xStart, sal_False );
-+    mxTextCursor->gotoRange( xEnd, sal_True );
- }
--    
-+
-+::sal_Int32 SAL_CALL SwVbaRange::getEnd() throw (uno::RuntimeException)
-+{
-+    uno::Reference< text::XText > xText = mxTextDocument->getText();
-+    return SwVbaRangeHelper::getPosition( xText, mxTextCursor->getEnd() );
-+}
-+
-+void SAL_CALL SwVbaRange::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< text::XText > xText = mxTextDocument->getText();
-+    uno::Reference< text::XTextRange > xEnd = SwVbaRangeHelper::getRangeByPosition( xText, _end );
-+
-+    mxTextCursor->collapseToStart();
-+    mxTextCursor->gotoRange( xEnd, sal_True );
-+}
-+
- rtl::OUString& 
- SwVbaRange::getServiceImplName()
- {
-diff --git sw/source/ui/vba/vbarange.hxx sw/source/ui/vba/vbarange.hxx
-index f126527..abce5b7 100644
---- sw/source/ui/vba/vbarange.hxx
-+++ sw/source/ui/vba/vbarange.hxx
-@@ -31,32 +31,60 @@
- #define SW_VBA_RANGE_HXX
- 
- #include <ooo/vba/word/XRange.hpp>
-+#include <ooo/vba/word/XParagraphFormat.hpp>
-+#include <ooo/vba/word/XFont.hpp>
- #include <vbahelper/vbahelperinterface.hxx>
- #include <cppuhelper/implbase1.hxx>
- #include <com/sun/star/text/XTextRange.hpp>
- #include <com/sun/star/text/XTextDocument.hpp>
-+#include <ooo/vba/word/XStyle.hpp>
- 
- typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XRange > SwVbaRange_BASE;
- 
- class SwVbaRange : public SwVbaRange_BASE
- {
- private:
--    css::uno::Reference< ooo::vba::word::XRange > mxActualRange;
-+    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
-+    css::uno::Reference< css::text::XTextCursor > mxTextCursor;
-+    css::uno::Reference< css::text::XText > mxText;
-+    sal_Bool mbMaySpanEndOfDocument;
- 
-+private:
-+    void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::uno::RuntimeException);
- public:
--	SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
--        const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument = sal_False );
-+	SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
-+	SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
-+	SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
- 	virtual ~SwVbaRange();
-+   css::uno::Reference< css::text::XTextDocument > getDocument() { return mxTextDocument; }
-     
--    css::uno::Reference< css::text::XTextRange > getXTextRange() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException);
-+    void setXTextRange( const css::uno::Reference< css::text::XTextRange >& xRange ) throw (css::uno::RuntimeException);
-+    css::uno::Reference< css::text::XText > getXText() { return mxText; }
-+    void setXTextCursor( const css::uno::Reference< css::text::XTextCursor >& xTextCursor ) { mxTextCursor = xTextCursor; }
- 
- 	// Attribute
-     virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XStyle > SAL_CALL getStyle() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setStyle( const css::uno::Reference< ooo::vba::word::XStyle >& _xStyle ) throw (css::uno::RuntimeException);
- 
--   // Methods
--   virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException);
--
-+    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException);
-+    // Methods
-+    virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL Select() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getLanguageID() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException);
- 
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
-diff --git sw/source/ui/vba/vbarangehelper.cxx sw/source/ui/vba/vbarangehelper.cxx
-index 61ced2c..5df01b8 100644
---- sw/source/ui/vba/vbarangehelper.cxx
-+++ sw/source/ui/vba/vbarangehelper.cxx
-@@ -29,6 +29,7 @@
-  ************************************************************************/
- #include "vbarangehelper.hxx"
- #include <com/sun/star/text/ControlCharacter.hpp>
-+#include <com/sun/star/text/XTextRangeCompare.hpp>
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
-@@ -141,3 +142,33 @@ uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Ref
-     }
-     return xTextCursor;
- }
-+
-+sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rText, const uno::Reference< text::XTextRange >& rTextRange ) throw ( uno::RuntimeException )
-+{
-+    sal_Int32 nPosition = -1;
-+    if( rText.is() && rTextRange.is() )
-+    {
-+        nPosition = 0;
-+        uno::Reference< text::XTextCursor > xCursor = rText->createTextCursor();
-+        xCursor->collapseToStart();
-+        uno::Reference< text::XTextRangeCompare > xCompare( rText, uno::UNO_QUERY_THROW );
-+        // compareValue is 0 if the ranges are equal
-+        sal_Int32 nCompareValue = xCompare->compareRegionStarts( xCursor->getStart(), rTextRange );
-+        sal_Bool canGo = sal_True;
-+
-+        while( nCompareValue !=0 && canGo )
-+        {
-+            canGo = xCursor->goRight( 1, sal_False );
-+            nCompareValue = xCompare->compareRegionStarts( xCursor->getStart(), rTextRange );
-+            nPosition++;
-+        }
-+
-+        // check fails: no correct position found
-+        if( !canGo && nCompareValue != 0 )
-+        {
-+            nPosition = -1;
-+        }
-+    }
-+
-+    return nPosition;
-+}
-diff --git sw/source/ui/vba/vbarangehelper.hxx sw/source/ui/vba/vbarangehelper.hxx
-index 3e5a281..5e47899 100644
---- sw/source/ui/vba/vbarangehelper.hxx
-+++ sw/source/ui/vba/vbarangehelper.hxx
-@@ -40,6 +40,7 @@ public:
-     static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException );
-     static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException );
-     static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException );
-+    static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw ( css::uno::RuntimeException );
- 
- };
- #endif /* SW_VBA_RANGEHELPER_HXX */
-diff --git sw/source/ui/vba/vbareplacement.cxx sw/source/ui/vba/vbareplacement.cxx
-new file mode 100644
-index 0000000..abf85f3
---- /dev/null
-+++ sw/source/ui/vba/vbareplacement.cxx
-@@ -0,0 +1,74 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbareplacement.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaReplacement::SwVbaReplacement( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< util::XPropertyReplace >& xPropertyReplace ) throw ( uno::RuntimeException ) :
-+    SwVbaReplacement_BASE( rParent, rContext ), mxPropertyReplace( xPropertyReplace )
-+{
-+}
-+
-+SwVbaReplacement::~SwVbaReplacement()
-+{
-+}
-+
-+::rtl::OUString SAL_CALL SwVbaReplacement::getText() throw (uno::RuntimeException)
-+{
-+    return mxPropertyReplace->getReplaceString();
-+}
-+
-+void SAL_CALL SwVbaReplacement::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
-+{
-+    mxPropertyReplace->setReplaceString( _text );
-+}
-+
-+rtl::OUString& 
-+SwVbaReplacement::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaReplacement") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaReplacement::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Replacement" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-diff --git sw/source/ui/vba/vbareplacement.hxx sw/source/ui/vba/vbareplacement.hxx
-new file mode 100644
-index 0000000..d590a1d
---- /dev/null
-+++ sw/source/ui/vba/vbareplacement.hxx
-@@ -0,0 +1,57 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_REPLACEMENT_HXX
-+#define SW_VBA_REPLACEMENT_HXX
-+
-+#include <ooo/vba/word/XReplacement.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <com/sun/star/util/XPropertyReplace.hpp>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XReplacement > SwVbaReplacement_BASE;
-+
-+class SwVbaReplacement : public SwVbaReplacement_BASE
-+{
-+private:
-+    css::uno::Reference< css::util::XPropertyReplace> mxPropertyReplace;
-+
-+public:
-+	SwVbaReplacement( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::util::XPropertyReplace >& xPropertyReplace ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaReplacement();
-+
-+    // Attributes
-+    virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_REPLACEMENT_HXX */
-diff --git sw/source/ui/vba/vbasection.cxx sw/source/ui/vba/vbasection.cxx
-new file mode 100644
-index 0000000..306ed26
---- /dev/null
-+++ sw/source/ui/vba/vbasection.cxx
-@@ -0,0 +1,90 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbasection.hxx"
-+#include <vbahelper/vbahelper.hxx>
-+#include <tools/diagnose_ex.h>
-+#include "vbapagesetup.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaSection::SwVbaSection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) throw ( uno::RuntimeException ) :
-+    SwVbaSection_BASE( rParent, rContext ), mxModel( xModel ), mxPageProps( xProps )
-+{
-+}
-+
-+SwVbaSection::~SwVbaSection()
-+{
-+}
-+
-+::sal_Bool SAL_CALL SwVbaSection::getProtectedForForms() throw (uno::RuntimeException)
-+{
-+    return sal_False;
-+}
-+
-+void SAL_CALL SwVbaSection::setProtectedForForms( ::sal_Bool _protectedforforms ) throw (uno::RuntimeException)
-+{
-+}
-+
-+uno::Any SAL_CALL SwVbaSection::Headers(  ) throw (uno::RuntimeException)
-+{
-+    return uno::Any();
-+}
-+
-+uno::Any SAL_CALL SwVbaSection::Footers(  ) throw (uno::RuntimeException)
-+{
-+    return uno::Any();
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaSection::PageSetup( ) throw (uno::RuntimeException)
-+{
-+    return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) );
-+}
-+
-+rtl::OUString& 
-+SwVbaSection::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSection") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaSection::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Section" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-diff --git sw/source/ui/vba/vbasection.hxx sw/source/ui/vba/vbasection.hxx
-new file mode 100644
-index 0000000..92a65f3
---- /dev/null
-+++ sw/source/ui/vba/vbasection.hxx
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_SECTION_HXX
-+#define SW_VBA_SECTION_HXX
-+
-+#include <ooo/vba/word/XSection.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSection > SwVbaSection_BASE;
-+
-+class SwVbaSection : public SwVbaSection_BASE
-+{
-+private:
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+    css::uno::Reference< css::beans::XPropertySet > mxPageProps;
-+
-+public:
-+	SwVbaSection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw ( css::uno::RuntimeException );
-+	virtual ~SwVbaSection();
-+
-+    // Attributes
-+    virtual ::sal_Bool SAL_CALL getProtectedForForms() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setProtectedForForms( ::sal_Bool _protectedforforms ) throw (css::uno::RuntimeException);
-+
-+    // Methods
-+    virtual css::uno::Any SAL_CALL Headers(  ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Footers(  ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL PageSetup(  ) throw (css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif /* SW_VBA_SECTION_HXX */
-diff --git sw/source/ui/vba/vbasections.cxx sw/source/ui/vba/vbasections.cxx
-new file mode 100644
-index 0000000..8fca880
---- /dev/null
-+++ sw/source/ui/vba/vbasections.cxx
-@@ -0,0 +1,190 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbasections.hxx"
-+#include "vbasection.hxx"
-+#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-+#include <com/sun/star/style/XStyle.hpp>
-+#include <docsh.hxx>
-+#include <doc.hxx>
-+#include "wordvbahelper.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+typedef ::cppu::WeakImplHelper1< container::XEnumeration > SectionEnumeration_BASE;
-+typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > SectionCollectionHelper_Base;
-+typedef std::vector< uno::Reference< beans::XPropertySet > > XSectionVec;
-+
-+class SectionEnumeration : public SectionEnumeration_BASE
-+{
-+    XSectionVec mxSections;
-+    XSectionVec::iterator mIt;
-+
-+public:
-+	SectionEnumeration( const XSectionVec& rVec ) : mxSections( rVec ), mIt( mxSections.begin() ) {}
-+	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
-+	{
-+		return ( mIt != mxSections.end() );
-+	}
-+
-+	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+	{
-+		if ( hasMoreElements() )
-+			return uno::makeAny( *mIt++ );
-+		throw container::NoSuchElementException();
-+	}
-+};
-+
-+// here I regard pagestyle as section
-+class SectionCollectionHelper : public SectionCollectionHelper_Base
-+{
-+private:
-+    uno::Reference< XHelperInterface > mxParent;
-+    uno::Reference< uno::XComponentContext > mxContext;
-+    uno::Reference< frame::XModel > mxModel;
-+    XSectionVec mxSections;
-+
-+public:
-+    SectionCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel )
-+    {
-+        uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( mxModel, uno::UNO_QUERY_THROW );
-+        uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
-+        uno::Reference< container::XIndexAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles") ) ), uno::UNO_QUERY_THROW );
-+        sal_Int32 nCount = xPageStyles->getCount();
-+        for( sal_Int32 index = 0; index < nCount; ++index )
-+        {
-+            uno::Reference< style::XStyle > xStyle( xPageStyles->getByIndex( index ), uno::UNO_QUERY_THROW );
-+            // only the pagestyles in using are considered
-+            if( xStyle->isInUse( ) )
-+            {
-+                uno::Reference< beans::XPropertySet > xPageProps( xStyle, uno::UNO_QUERY_THROW );
-+                mxSections.push_back( xPageProps );
-+            }
-+        }
-+    }
-+
-+    ~SectionCollectionHelper(){}
-+
-+    // XIndexAccess
-+    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
-+    {
-+        return mxSections.size();
-+    }
-+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+        if ( Index < 0 || Index >= getCount() )    
-+            throw css::lang::IndexOutOfBoundsException();
-+
-+        uno::Reference< beans::XPropertySet > xPageProps( mxSections[ Index ], uno::UNO_QUERY_THROW );
-+        return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent,  mxContext, mxModel, xPageProps ) ) );    
-+    }
-+    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
-+    {
-+        return word::XSection::static_type(0);
-+    }
-+    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
-+    {
-+        return sal_True;
-+    }
-+    // XEnumerationAccess
-+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
-+    {
-+        return new SectionEnumeration( mxSections );
-+    }
-+};
-+
-+class SectionsEnumWrapper : public EnumerationHelperImpl
-+{
-+	uno::Reference< frame::XModel > mxModel;
-+	uno::WeakReference< XHelperInterface > mxParent;
-+public:
-+	SectionsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), mxModel( xModel ), mxParent( xParent ) {}
-+
-+	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
-+	{ 
-+		uno::Reference< beans::XPropertySet > xPageProps( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
-+		return uno::makeAny( uno::Reference< word::XSection > ( new SwVbaSection( mxParent, m_xContext, mxModel, xPageProps ) ) );
-+	}
-+};
-+
-+SwVbaSections::SwVbaSections( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ): SwVbaSections_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new SectionCollectionHelper( xParent, xContext, xModel ) ) ),  mxModel( xModel )
-+{
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaSections::PageSetup( ) throw (uno::RuntimeException)
-+{
-+    if( m_xIndexAccess->getCount() )
-+    {
-+        // check if the first section is our want
-+        uno::Reference< word::XSection > xSection( m_xIndexAccess->getByIndex( 0 ), uno::UNO_QUERY_THROW );
-+        return xSection->PageSetup();
-+    }
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("There is no section") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+// XEnumerationAccess
-+uno::Type SAL_CALL
-+SwVbaSections::getElementType() throw (uno::RuntimeException)
-+{
-+	return word::XSection::static_type(0);
-+}
-+
-+uno::Reference< container::XEnumeration > SAL_CALL
-+SwVbaSections::createEnumeration() throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+    return new SectionsEnumWrapper( this, mxContext, xEnumAccess->createEnumeration(), mxModel );
-+}
-+
-+uno::Any
-+SwVbaSections::createCollectionObject( const css::uno::Any& aSource )
-+{
-+    return aSource;
-+}
-+
-+rtl::OUString& 
-+SwVbaSections::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSections") );
-+	return sImplName;
-+}
-+
-+css::uno::Sequence<rtl::OUString> 
-+SwVbaSections::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > sNames;
-+	if ( sNames.getLength() == 0 )
-+	{
-+		sNames.realloc( 1 );
-+		sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Sections") );
-+	}
-+	return sNames;
-+}
-diff --git sw/source/ui/vba/vbasections.hxx sw/source/ui/vba/vbasections.hxx
-new file mode 100644
-index 0000000..1ff9e9e
---- /dev/null
-+++ sw/source/ui/vba/vbasections.hxx
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_SECTIONS_HXX
-+#define SW_VBA_SECTIONS_HXX
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <ooo/vba/word/XSections.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <com/sun/star/container/XIndexAccess.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef CollTestImplHelper< ooo::vba::word::XSections > SwVbaSections_BASE;
-+
-+class SwVbaSections : public SwVbaSections_BASE
-+{
-+private:
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+
-+public:
-+	SwVbaSections( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
-+	virtual ~SwVbaSections() {}
-+
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+
-+    virtual css::uno::Any SAL_CALL PageSetup(  ) throw (css::uno::RuntimeException);
-+
-+	// SwVbaSections_BASE
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); 
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};    
-+
-+#endif /* SW_VBA_SECTIONS_HXX */
-diff --git sw/source/ui/vba/vbaselection.cxx sw/source/ui/vba/vbaselection.cxx
-index ceb7bb1..b85c2d7 100644
---- sw/source/ui/vba/vbaselection.cxx
-+++ sw/source/ui/vba/vbaselection.cxx
-@@ -30,28 +30,635 @@
- #include "vbaselection.hxx"
- #include <vbahelper/vbahelper.hxx>
- #include <tools/diagnose_ex.h>
-+#include "vbarange.hxx"
-+#include "vbafind.hxx"
-+#include "wordvbahelper.hxx"
-+#include <com/sun/star/text/XTextRange.hpp>
-+#include <com/sun/star/text/XTextTable.hpp>
-+#include <com/sun/star/text/XTextTableCursor.hpp>
-+#include <com/sun/star/text/ControlCharacter.hpp>
-+#include <com/sun/star/table/XCell.hpp>
-+#include <ooo/vba/word/WdUnits.hpp>
-+#include <ooo/vba/word/WdMovementType.hpp>
-+#include <ooo/vba/word/WdGoToItem.hpp>
-+#include <ooo/vba/word/WdGoToDirection.hpp>
-+#include <ooo/vba/word/XBookmark.hpp>
-+#include <ooo/vba/word/XApplication.hpp>
-+#include <com/sun/star/text/XPageCursor.hpp>
-+#include "unotbl.hxx"
-+#include "unocoll.hxx"
-+#include "vbatable.hxx"
-+#include <com/sun/star/view/XSelectionSupplier.hpp>
-+#include <com/sun/star/view/XViewCursor.hpp>
-+#include <ooo/vba/word/WdInformation.hpp>
-+#include <ooo/vba/word/WdHeaderFooterIndex.hpp>
-+#include "vbainformationhelper.hxx"
-+#include "vbafield.hxx"
-+#include "vbaheaderfooter.hxx"
-+#include "vbaheaderfooterhelper.hxx"
-+#include <vbahelper/vbashaperange.hxx>
-+#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-+#include <com/sun/star/drawing/XDrawPage.hpp>
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
- 
--SwVbaSelection::SwVbaSelection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException ) : SwVbaSelection_BASE( rParent, rContext ), mxModel( rModel )
-+SwVbaSelection::SwVbaSelection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& rModel ) throw ( uno::RuntimeException ) : SwVbaSelection_BASE( rParent, rContext ), mxModel( rModel )
- {
-+    mxTextViewCursor = word::getXTextViewCursor( mxModel );
- }
- 
- SwVbaSelection::~SwVbaSelection()
- {
- }
- 
-+uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XTextRange > xTextRange;
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel->getCurrentSelection(), uno::UNO_QUERY_THROW );
-+    if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextRanges") ) ) ) 
-+    {
-+        uno::Reference< container::XIndexAccess > xTextRanges( xServiceInfo, uno::UNO_QUERY_THROW );
-+        if( xTextRanges->getCount() > 0 )
-+        {
-+            // if there are multipul selection, just return the last selected Range.
-+            xTextRange.set( xTextRanges->getByIndex( xTextRanges->getCount()-1 ), uno::UNO_QUERY_THROW );
-+        }
-+    }
-+    else
-+    {
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+    }
-+    return xTextRange;
-+}
-+
-+uno::Reference< word::XRange > SAL_CALL 
-+SwVbaSelection::getRange() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XTextRange > xTextRange = GetSelectedRange();
-+    uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
-+    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, xDocument, xTextRange->getStart(), xTextRange->getEnd(), mxTextViewCursor->getText() ) );
-+}
-+
- rtl::OUString SAL_CALL
- SwVbaSelection::getText() throw ( uno::RuntimeException )
- {
--    rtl::OUString aText;
--    return aText;
-+    return getRange()->getText();
- }
- 
- void SAL_CALL
- SwVbaSelection::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
- {
-+    getRange()->setText( rText );
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::TypeText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
-+{
-+    // FIXME: handle the property Options.ReplaceSelection, the default value is TRUE
-+    setText( rText );
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( uno::RuntimeException )
-+{
-+    sal_Int32 nUnit = word::WdUnits::wdLine;
-+    sal_Int32 nExtend = word::WdMovementType::wdMove;
-+    _unit >>= nUnit;
-+    _extend >>= nExtend;
-+
-+    switch( nUnit )
-+    {
-+        case word::WdUnits::wdStory:
-+        {
-+            // go to the begin of the document
-+            rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfDoc"));
-+            dispatchRequests( mxModel,url );
-+            // If something is selected, it needs to go twice
-+            dispatchRequests( mxModel,url );
-+            break;
-+        }
-+        case word::WdUnits::wdLine:
-+        {
-+            // go to the begin of the Line
-+            rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfLine"));
-+            dispatchRequests( mxModel,url );
-+            break;
-+        }
-+        default:
-+        {
-+            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+            break;
-+        }
-+    }
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( uno::RuntimeException )
-+{
-+    sal_Int32 nUnit = word::WdUnits::wdLine;
-+    sal_Int32 nExtend = word::WdMovementType::wdMove;
-+    _unit >>= nUnit;
-+    _extend >>= nExtend;
-+
-+    switch( nUnit )
-+    {
-+        case word::WdUnits::wdStory:
-+        {
-+            // go to the end of the document
-+            rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfDoc"));
-+            dispatchRequests( mxModel,url );
-+            // If something is selected, it needs to go twice
-+            dispatchRequests( mxModel,url );
-+            break;
-+        }
-+        case word::WdUnits::wdLine:
-+        {
-+            // go to the end of the Line
-+            rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfLine"));
-+            dispatchRequests( mxModel,url );
-+            break;
-+        }
-+        default:
-+        {
-+            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+            break;
-+        }
-+    }
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( uno::RuntimeException )
-+{
-+    // FIXME: handle the arguments: _unit and _count 
-+    rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Delete"));
-+    dispatchRequests( mxModel,url );
-+}
-+
-+void SwVbaSelection::NextCell( sal_Int32 nCount, E_DIRECTION eDirection ) throw ( uno::RuntimeException )
-+{
-+    uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextTable > xTextTable;
-+    uno::Reference< table::XCell > xCell;
-+    xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextTable;
-+    xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Cell") ) ) >>= xCell;
-+    if( !xTextTable.is() || !xCell.is() )
-+    {
-+        DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
-+        return;
-+    }
-+    uno::Reference< beans::XPropertySet > xCellProps( xCell, uno::UNO_QUERY_THROW );
-+    rtl::OUString aCellName;
-+    xCellProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellName") ) ) >>= aCellName;
-+    uno::Reference< text::XTextTableCursor > xTextTableCursor = xTextTable->createCursorByCellName( aCellName );
-+    // move the table cursor 
-+    switch( eDirection )
-+    {
-+        case MOVE_LEFT:
-+        {
-+            xTextTableCursor->goLeft( nCount, sal_False );
-+            break;
-+        }
-+        case MOVE_RIGHT:
-+        {
-+            xTextTableCursor->goRight( nCount, sal_False );
-+            break;
-+        }
-+        case MOVE_UP:
-+        {
-+            xTextTableCursor->goUp( nCount, sal_False );
-+            break;
-+        }
-+        case MOVE_DOWN:
-+        {
-+            xTextTableCursor->goDown( nCount, sal_False );
-+            break;
-+        }
-+        default:
-+        {
-+            DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
-+            return;
-+        }
-+    }
-+    // move the view cursor
-+    xCell = xTextTable->getCellByName( xTextTableCursor->getRangeName() );
-+    mxTextViewCursor->gotoRange( uno::Reference< text::XTextRange >( xCell, uno::UNO_QUERY_THROW ), sal_False );
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::MoveRight( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend ) throw ( uno::RuntimeException )
-+{
-+    sal_Int32 nUnit = word::WdUnits::wdCharacter;
-+    sal_Int32 nCount = 1;
-+    sal_Int32 nExtend = word::WdMovementType::wdMove;
-+
-+    if( _unit.hasValue() )
-+        _unit >>= nUnit;
-+    if( _count.hasValue() )
-+        _count >>= nCount;
-+    if( _extend.hasValue() )
-+        _extend >>= nExtend;
-+    
-+    if( nCount == 0 )
-+        return;
-+    
-+    if( nCount < 0 )
-+    {
-+        // TODO: call MoveLeft;
-+        MoveLeft( _unit, uno::makeAny( -nCount ), _extend );
-+        return;
-+    }
-+    
-+    switch( nUnit )
-+    {
-+        case word::WdUnits::wdCell:
-+        {
-+            if(  nExtend == word::WdMovementType::wdExtend )
-+            {
-+                DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
-+                return;
-+            }
-+            NextCell( nCount, MOVE_RIGHT );
-+            break;
-+        }
-+        default:
-+        {
-+            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+            break;
-+        }
-+    }
-+
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::MoveLeft( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend ) throw ( uno::RuntimeException )
-+{
-+    sal_Int32 nUnit = word::WdUnits::wdCharacter;
-+    sal_Int32 nCount = 1;
-+    sal_Int32 nExtend = word::WdMovementType::wdMove;
-+
-+    if( _unit.hasValue() )
-+        _unit >>= nUnit;
-+    if( _count.hasValue() )
-+        _count >>= nCount;
-+    if( _extend.hasValue() )
-+        _extend >>= nExtend;
-+    
-+    if( nCount == 0 )
-+        return;
-+    
-+    if( nCount < 0 )
-+    {
-+        MoveRight( _unit, uno::makeAny( -nCount ), _extend );
-+        return;
-+    }
-+    
-+    switch( nUnit )
-+    {
-+        case word::WdUnits::wdCell:
-+        {
-+            if(  nExtend == word::WdMovementType::wdExtend )
-+            {
-+                DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
-+                return;
-+            }
-+            NextCell( nCount, MOVE_LEFT );
-+            break;
-+        }
-+        default:
-+        {
-+            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+            break;
-+        }
-+    }
-+
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::MoveDown( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend ) throw ( uno::RuntimeException )
-+{
-+    sal_Int32 nUnit = word::WdUnits::wdCharacter;
-+    sal_Int32 nCount = 1;
-+    sal_Int32 nExtend = word::WdMovementType::wdMove;
-+
-+    if( _unit.hasValue() )
-+        _unit >>= nUnit;
-+    if( _count.hasValue() )
-+        _count >>= nCount;
-+    if( _extend.hasValue() )
-+        _extend >>= nExtend;
-+    
-+    if( nCount == 0 )
-+        return;
-+    
-+    if( nCount < 0 )
-+    {
-+        // TODO: call MoveLeft;
-+        //MoveUp( _unit, uno::makeAny( -nCount ), _extend );
-+        return;
-+    }
-+    
-+    switch( nUnit )
-+    {
-+        case word::WdUnits::wdLine:
-+        {
-+            uno::Reference< view::XViewCursor > xViewCursor( mxTextViewCursor, uno::UNO_QUERY_THROW );
-+            sal_Bool bExpand = ( nExtend == word::WdMovementType::wdMove ) ? sal_False : sal_True;
-+            xViewCursor->goDown( nCount, bExpand );
-+            break;
-+        }
-+        default:
-+        {
-+            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+            break;
-+        }
-+    }
-+
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::TypeParagraph() throw ( uno::RuntimeException )
-+{
-+    // #FIXME: if the selection is an entire paragraph, it's replaced 
-+    // by the new paragraph
-+    sal_Bool isCollapsed = mxTextViewCursor->isCollapsed();
-+    InsertParagraph();
-+    if( isCollapsed )
-+        mxTextViewCursor->collapseToStart();
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::InsertParagraph() throw ( uno::RuntimeException )
-+{
-+    // #FIME: the selection should include the new paragraph.
-+    getRange()->InsertParagraph();
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::InsertParagraphBefore() throw ( uno::RuntimeException )
-+{
-+    getRange()->InsertParagraphBefore();
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::InsertParagraphAfter() throw ( uno::RuntimeException )
-+{
-+    getRange()->InsertParagraphAfter();
-+}
-+
-+uno::Reference< word::XParagraphFormat > SAL_CALL
-+SwVbaSelection::getParagraphFormat() throw ( uno::RuntimeException )
-+{
-+    return getRange()->getParagraphFormat();
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& rParagraphFormat ) throw ( uno::RuntimeException )
-+{
-+    return getRange()->setParagraphFormat( rParagraphFormat );
-+}
-+
-+uno::Reference< word::XFind > SAL_CALL 
-+SwVbaSelection::getFind() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XTextRange > xTextRange = GetSelectedRange();
-+    return uno::Reference< word::XFind >( new SwVbaFind( this, mxContext, mxModel, xTextRange ) );
-+}
-+
-+uno::Reference< word::XStyle > SAL_CALL
-+SwVbaSelection::getStyle() throw ( uno::RuntimeException )
-+{
-+    return getRange()->getStyle();
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::setStyle( const uno::Reference< word::XStyle >& rStyle ) throw ( uno::RuntimeException )
-+{
-+    return getRange()->setStyle( rStyle );
-+}
-+
-+uno::Reference< word::XFont > SAL_CALL
-+SwVbaSelection::getFont() throw ( uno::RuntimeException )
-+{
-+    return getRange()->getFont();
-+}
-+
-+void SAL_CALL
-+SwVbaSelection::TypeBackspace() throw ( uno::RuntimeException )
-+{
-+    rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SwBackspace"));
-+    dispatchRequests( mxModel,url );
-+}
-+
-+uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _what, const uno::Any& _which, const uno::Any& _count, const uno::Any& _name ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nWhat;
-+    if( ( _what >>= nWhat ) != sal_True )
-+         DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
-+    switch( nWhat )
-+    {
-+        case word::WdGoToItem::wdGoToBookmark:
-+        {
-+            rtl::OUString sName;
-+            uno::Reference< word::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
-+            uno::Reference< word::XBookmark > xBookmark( xApplication->getActiveDocument()->Bookmarks(_name), uno::UNO_QUERY_THROW );
-+            xBookmark->Select();
-+            //return uno::Reference< word::XRange >( xBookmark->Range(), uno::UNO_QUERY_THROW );
-+            break;
-+        }
-+        case word::WdGoToItem::wdGoToPage:
-+        {
-+            uno::Reference< text::XPageCursor > xPageCursor( mxTextViewCursor, uno::UNO_QUERY_THROW );
-+            sal_Int32 nCurrPage = xPageCursor->getPage();
-+            sal_Int32 nLastPage = word::getPageCount( mxModel );
-+            sal_Int32 nCount = 0;
-+            if( _count.hasValue() )
-+                _count >>= nCount;
-+            sal_Int32 nWhich = 0;
-+            if( _which.hasValue() )
-+                _which >>= nWhich;
-+             sal_Int32 nPage = 0;
-+             switch( nWhich )
-+             {
-+                case word::WdGoToDirection::wdGoToLast:
-+                {
-+                    nPage = nLastPage;
-+                    break;
-+                }
-+                case word::WdGoToDirection::wdGoToNext:
-+                {
-+                    nPage = nCurrPage + 1;
-+                    break;
-+                }
-+                case word::WdGoToDirection::wdGoToPrevious:
-+                {
-+                    nPage = nCurrPage - 1;
-+                    break;
-+                }
-+                default:
-+                {
-+                    nPage = nCount;
-+                }
-+             }
-+             if( nPage <= 0 )
-+                nPage = 1;
-+             if( nPage > nLastPage )
-+                nPage = nLastPage;
-+             xPageCursor->jumpToPage( ( sal_Int16 )( nPage ) );
-+             break;
-+        }
-+        case word::WdGoToItem::wdGoToSection:
-+        {
-+            // TODO: implement Section object
-+        }
-+        default:
-+            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+    }
-+    return getRange();
-+}
-+
-+::sal_Int32 SAL_CALL SwVbaSelection::getLanguageID() throw (uno::RuntimeException)
-+{
-+    return getRange()->getLanguageID();
-+}
-+
-+void SAL_CALL SwVbaSelection::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException)
-+{
-+    getRange()->setLanguageID( _languageid );
-+}
-+
-+uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::RuntimeException)
-+{
-+    uno::Any result;
-+    //uno::Reference< view::XSelectionSupplier > xSel( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+    //uno::Any aSelectedObject = xSel->getSelection();
-+    switch( _type )
-+    {
-+        case word::WdInformation::wdActiveEndPageNumber:
-+        {
-+            result = uno::makeAny( SwVbaInformationHelper::handleWdActiveEndPageNumber( mxTextViewCursor ) );
-+            break;
-+        }
-+        case word::WdInformation::wdNumberOfPagesInDocument:
-+        {
-+            result = uno::makeAny( SwVbaInformationHelper::handleWdNumberOfPagesInDocument( mxModel ) );
-+            break;
-+        }
-+        case word::WdInformation::wdVerticalPositionRelativeToPage:
-+        {
-+            result = uno::makeAny( SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( mxModel, mxTextViewCursor ) );
-+            break;
-+        }
-+        default:
-+            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+    }
-+    // This method fails to restore the previouse selection
-+    //xSel->select( aSelectedObject );
-+    return result;
-+}
-+
-+void SAL_CALL SwVbaSelection::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException)
-+{
-+    getRange()->InsertBreak( _breakType );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+    // Hacky implementation due to missing api ( and lack of knowledge )
-+    // we can only support a selection that is a single table
-+    if ( !aIndex.hasValue() ) // currently we can't support multiple tables in a selection
-+       throw uno::RuntimeException(); 
-+    // if the current selection is a XTextTableCursor and the index is 1 then we can service this request, otherwise we just have to throw
-+    uno::Reference< text::XTextTableCursor > xTextTableCursor( mxModel->getCurrentSelection(), uno::UNO_QUERY );
-+
-+    if ( !xTextTableCursor.is() )
-+       throw uno::RuntimeException(); 
-+
-+    sal_Int32 nIndex = 0;
-+    aIndex >>= nIndex;
-+
-+    uno::Any aRet;
-+
-+    if ( nIndex != 1 )
-+       throw uno::RuntimeException(); 
-+    SwXTextTableCursor* pTTCursor = dynamic_cast< SwXTextTableCursor* >( xTextTableCursor.get() );
-+    if ( pTTCursor )
-+    {
-+        SwFrmFmt* pFmt = pTTCursor->GetFrmFmt();
-+        rtl::OUString sTableName;
-+        if ( pFmt )
-+        {
-+            uno::Reference< text::XTextTable > xTbl = SwXTextTables::GetObject(*pFmt);
-+            uno::Reference< css::text::XTextDocument > xTextDoc( mxModel, uno::UNO_QUERY_THROW );
-+            uno::Reference< word::XTable > xVBATbl = new SwVbaTable( mxParent, mxContext, xTextDoc, xTbl ); 
-+            aRet <<= xVBATbl;
-+        }
-+    }
-+    return aRet;
-+    
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaSelection::Fields( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< XCollection > xCol( new SwVbaFields( mxParent, mxContext, mxModel ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+uno::Reference< word::XHeaderFooter > SAL_CALL
-+SwVbaSelection::getHeaderFooter() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< text::XText > xCurrentText = word::getXTextViewCursor( mxModel )->getText();
-+    if( HeaderFooterHelper::isHeader( mxModel, xCurrentText ) || HeaderFooterHelper::isFooter( mxModel, xCurrentText ) )
-+    {
-+        uno::Reference< beans::XPropertySet > xPageStyleProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
-+        sal_Int32 nIndex = word::WdHeaderFooterIndex::wdHeaderFooterPrimary;
-+        sal_Bool isHeader = HeaderFooterHelper::isHeader( mxModel, xCurrentText );
-+        if( HeaderFooterHelper::isEvenPagesHeader( mxModel, xCurrentText ) || HeaderFooterHelper::isEvenPagesFooter( mxModel, xCurrentText ) )
-+            nIndex = word::WdHeaderFooterIndex::wdHeaderFooterEvenPages;
-+        else if( HeaderFooterHelper::isFirstPageHeader( mxModel, xCurrentText ) || HeaderFooterHelper::isFirstPageFooter( mxModel, xCurrentText ) )
-+            nIndex = word::WdHeaderFooterIndex::wdHeaderFooterFirstPage;
-+        
-+        return uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( this, mxContext, mxModel, xPageStyleProps, isHeader, nIndex ) );
-+
-+    }
-+    return uno::Reference< word::XHeaderFooter >();
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaSelection::ShapeRange( ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< drawing::XShapes > xShapes( mxModel->getCurrentSelection(), uno::UNO_QUERY );
-+
-+    if ( !xShapes.is() )
-+       throw uno::RuntimeException(); 
-+
-+    uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW );
-+    uno::Reference< drawing::XDrawPage > xDrawPage = xDrawPageSupplier->getDrawPage();
-+    uno::Reference< container::XIndexAccess > xShapesAccess( xShapes, uno::UNO_QUERY_THROW );
-+    return uno::makeAny( uno::Reference< msforms::XShapeRange >( new ScVbaShapeRange( this, mxContext, xShapesAccess, xDrawPage ) ) );
-+}
-+
-+::sal_Int32 SAL_CALL SwVbaSelection::getStart() throw (uno::RuntimeException)
-+{
-+    return getRange()->getStart();
-+}
-+
-+void SAL_CALL SwVbaSelection::setStart( ::sal_Int32 _start ) throw (uno::RuntimeException)
-+{
-+    getRange()->setStart( _start );
-+}
-+::sal_Int32 SAL_CALL SwVbaSelection::getEnd() throw (uno::RuntimeException)
-+{
-+    return getRange()->getEnd();
-+}
-+
-+void SAL_CALL SwVbaSelection::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeException)
-+{
-+    getRange()->setEnd( _end );
- }
- 
- rtl::OUString& 
-diff --git sw/source/ui/vba/vbaselection.hxx sw/source/ui/vba/vbaselection.hxx
-index 4d48068..83994f6 100644
---- sw/source/ui/vba/vbaselection.hxx
-+++ sw/source/ui/vba/vbaselection.hxx
-@@ -31,7 +31,14 @@
- #define SW_VBA_SELECTION_HXX
- 
- #include <ooo/vba/word/XSelection.hpp>
-+#include <ooo/vba/word/XRange.hpp>
- #include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/text/XTextViewCursor.hpp>
-+#include <ooo/vba/word/XParagraphFormat.hpp>
-+#include <ooo/vba/word/XFind.hpp>
-+#include <ooo/vba/word/XStyle.hpp>
-+#include <ooo/vba/word/XFont.hpp>
-+#include <ooo/vba/word/XHeaderFooter.hpp>
- 
- typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSelection > SwVbaSelection_BASE;
- 
-@@ -39,6 +46,20 @@ class SwVbaSelection : public SwVbaSelection_BASE
- {
- private:
-     css::uno::Reference< css::frame::XModel > mxModel;
-+    css::uno::Reference< css::text::XTextViewCursor > mxTextViewCursor;
-+    css::uno::Reference< ooo::vba::word::XRange > mxRange;
-+
-+    enum E_DIRECTION
-+    {
-+        MOVE_LEFT = 1,
-+        MOVE_RIGHT,
-+        MOVE_UP,
-+        MOVE_DOWN
-+    };
-+
-+private:
-+    void NextCell( sal_Int32 nCount, E_DIRECTION eDirection ) throw ( css::uno::RuntimeException );
-+    css::uno::Reference< css::text::XTextRange > GetSelectedRange() throw ( css::uno::RuntimeException );
- 
- public:
- 	SwVbaSelection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
-@@ -47,7 +68,38 @@ public:
- 	// Attribute
-     virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
--
-+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL TypeText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XStyle > SAL_CALL getStyle() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setStyle( const css::uno::Reference< ooo::vba::word::XStyle >& _xStyle ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL TypeBackspace() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL GoTo( const css::uno::Any& _what, const css::uno::Any& _which, const css::uno::Any& _count, const css::uno::Any& _name ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL ShapeRange( ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException);
- 
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
-diff --git sw/source/ui/vba/vbastyle.cxx sw/source/ui/vba/vbastyle.cxx
-new file mode 100644
-index 0000000..f75c16b
---- /dev/null
-+++ sw/source/ui/vba/vbastyle.cxx
-@@ -0,0 +1,152 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile:
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#include "vbastyle.hxx"
-+#include <ooo/vba/word/WdStyleType.hpp>
-+#include <com/sun/star/lang/Locale.hpp>
-+#include <i18npool/mslangid.hxx>
-+#include "vbafont.hxx"
-+#include "vbapalette.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+
-+SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet ) throw ( script::BasicErrorException, uno::RuntimeException ) : SwVbaStyle_BASE( xParent, xContext ) , mxStyleProps( _xPropertySet )
-+{
-+    mxStyle.set( _xPropertySet, uno::UNO_QUERY_THROW );
-+}
-+
-+void SAL_CALL 
-+SwVbaStyle::setName( const ::rtl::OUString& Name ) throw (uno::RuntimeException)
-+{
-+	mxStyle->setName(Name);
-+}
-+
-+::rtl::OUString SAL_CALL 
-+SwVbaStyle::getName() throw (uno::RuntimeException)
-+{
-+	return mxStyle->getName();
-+}
-+
-+sal_Int32 SwVbaStyle::getLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps ) throw (uno::RuntimeException)
-+{
-+    lang::Locale aLocale;
-+    xTCProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharLocale") ) ) >>= aLocale;
-+    return MsLangId::convertLocaleToLanguage( aLocale );
-+}
-+
-+void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (uno::RuntimeException)
-+{
-+    lang::Locale aLocale = MsLangId::convertLanguageToLocale( _languageid );
-+    xTCProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharLocale") ), uno::makeAny( aLocale ) ) ;
-+}
-+
-+::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID() throw (uno::RuntimeException)
-+{
-+    return getLanguageID( mxStyleProps );
-+}
-+
-+void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException)
-+{
-+    setLanguageID( mxStyleProps, _languageid );
-+}
-+
-+::sal_Int32 SAL_CALL SwVbaStyle::getType() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nType = word::WdStyleType::wdStyleTypeParagraph;
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( mxStyle, uno::UNO_QUERY_THROW );
-+    if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.ParagraphStyle") ) ) )
-+        nType = word::WdStyleType::wdStyleTypeParagraph;
-+    else if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CharacterStyle") ) ) )    
-+        nType = word::WdStyleType::wdStyleTypeCharacter;
-+    else // if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.NumberingStyle") ) ) )    
-+        nType = word::WdStyleType::wdStyleTypeList;
-+    return nType;
-+}
-+
-+uno::Reference< word::XFont > SAL_CALL
-+SwVbaStyle::getFont() throw ( uno::RuntimeException )
-+{
-+    VbaPalette aColors;
-+    return new SwVbaFont( mxParent, mxContext, aColors.getPalette(), mxStyleProps );
-+}
-+
-+void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xTCProps, const uno::Reference< ooo::vba::word::XStyle >& xStyle )throw (uno::RuntimeException)
-+{
-+    rtl::OUString aStyleType = getOOoStyleTypeFromMSWord( xStyle->getType() );
-+    xTCProps->setPropertyValue( aStyleType, uno::makeAny( xStyle->getName() ) );
-+}
-+
-+rtl::OUString SwVbaStyle::getOOoStyleTypeFromMSWord( sal_Int32 _wdStyleType )
-+{
-+    rtl::OUString aStyleType;
-+    switch( _wdStyleType )
-+    {
-+        case word::WdStyleType::wdStyleTypeParagraph:
-+        case word::WdStyleType::wdStyleTypeTable:
-+        {
-+            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName") );
-+            break;
-+        }
-+        case word::WdStyleType::wdStyleTypeCharacter:
-+        {
-+            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharStyleName") );
-+            break;
-+        }
-+        case word::WdStyleType::wdStyleTypeList:
-+        {
-+            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingStyleName") );
-+            break;
-+        }
-+        default:
-+            DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
-+    }
-+    return aStyleType;
-+}
-+
-+rtl::OUString&
-+SwVbaStyle::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaStyle") );
-+    return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString >
-+SwVbaStyle::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.XStyle" ) );
-+    }
-+    return aServiceNames;
-+}
-diff --git sw/source/ui/vba/vbastyle.hxx sw/source/ui/vba/vbastyle.hxx
-new file mode 100644
-index 0000000..9a7f349
---- /dev/null
-+++ sw/source/ui/vba/vbastyle.hxx
-@@ -0,0 +1,70 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile:  $
-+ * $Revision:  $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_STYLE_HXX
-+#define SW_VBA_STYLE_HXX
-+#include <ooo/vba/word/XStyle.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <com/sun/star/container/XNameContainer.hpp>
-+#include <com/sun/star/style/XStyle.hpp>
-+#include <ooo/vba/word/XFont.hpp>
-+
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XStyle > SwVbaStyle_BASE;
-+
-+class SwVbaStyle : public SwVbaStyle_BASE
-+{
-+private:
-+	css::uno::Reference< css::beans::XPropertySet > mxStyleProps;
-+	css::uno::Reference< css::style::XStyle > mxStyle;
-+public:
-+	SwVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
-+	virtual ~SwVbaStyle(){}
-+
-+    static void setStyle( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, const css::uno::Reference< ooo::vba::word::XStyle >& xStyle ) throw (css::uno::RuntimeException);
-+    static rtl::OUString getOOoStyleTypeFromMSWord( sal_Int32 _wdStyleType );
-+    static sal_Int32 getLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps ) throw (css::uno::RuntimeException);
-+    static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException);
-+
-+    // Attributes
-+    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setName( const rtl::OUString& Name ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif //SW_VBA_AXIS_HXX
-diff --git sw/source/ui/vba/vbastyles.cxx sw/source/ui/vba/vbastyles.cxx
-new file mode 100644
-index 0000000..c178fe1
---- /dev/null
-+++ sw/source/ui/vba/vbastyles.cxx
-@@ -0,0 +1,380 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbastyles.cxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbastyles.hxx"
-+#include "vbastyle.hxx"
-+#include <cppuhelper/implbase3.hxx>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-+#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-+#include <com/sun/star/style/XStyle.hpp>
-+#include <ooo/vba/word/WdBuiltinStyle.hpp>
-+#include <ooo/vba/word/WdStyleType.hpp>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+struct BuiltinStyleTable
-+{
-+    sal_Int32 wdBuiltinStyle;
-+    const sal_Char* pOOoStyleName;
-+    sal_Int32 wdStyleType;
-+};
-+
-+const BuiltinStyleTable aBuiltinStyleTable[] =
-+{
-+    { word::WdBuiltinStyle::wdStyleBlockQuotation, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleBodyText, "Text body", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleBodyText2, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleBodyText3, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleBodyTextFirstIndent, "First line indent", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleBodyTextFirstIndent2, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleBodyTextIndent, "Text body indent", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleBodyTextIndent2, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleBodyTextIndent3, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleCaption, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleClosing, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleCommentReference, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleCommentText, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleDate, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleDefaultParagraphFont, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleEmphasis, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleEndnoteReference, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleEndnoteText, "Endnote", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleEnvelopeAddress, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleEnvelopeReturn, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleFooter, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleFootnoteReference, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleFootnoteText, "Footnote", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHeader, "Header", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHeading1, "Heading 1", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHeading2, "Heading 2", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHeading3, "Heading 3", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHeading4, "Heading 4", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHeading5, "Heading 5", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHeading6, "Heading 6", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHeading7, "Heading 7", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHeading8, "Heading 8", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHeading9, "Heading 9", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHtmlAcronym, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHtmlAddress, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHtmlCite, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHtmlCode, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHtmlDfn, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHtmlKbd, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHtmlNormal, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHtmlPre, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHtmlSamp, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHtmlTt, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHtmlVar, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHyperlink, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleHyperlinkFollowed, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleIndex1, "Index 1", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleIndex2, "Index 2", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleIndex3, "Index 3", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleIndex4, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleIndex5, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleIndex6, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleIndex7, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleIndex8, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleIndex9, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleIndexHeading, "Index Heading", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleLineNumber, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleList, "List", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleList2, "List 2", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleList3, "List 3", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleList4, "List 4", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleList5, "List 5", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleListBullet, "List 1", word::WdStyleType::wdStyleTypeList },
-+    { word::WdBuiltinStyle::wdStyleListBullet2, "List 2", word::WdStyleType::wdStyleTypeList },
-+    { word::WdBuiltinStyle::wdStyleListBullet3, "List 3", word::WdStyleType::wdStyleTypeList },
-+    { word::WdBuiltinStyle::wdStyleListBullet4, "List 4", word::WdStyleType::wdStyleTypeList },
-+    { word::WdBuiltinStyle::wdStyleListBullet5, "List 5", word::WdStyleType::wdStyleTypeList },
-+    { word::WdBuiltinStyle::wdStyleListContinue, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleListContinue2, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleListContinue3, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleListContinue4, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleListContinue5, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleListNumber, "Numbering 1", word::WdStyleType::wdStyleTypeList },
-+    { word::WdBuiltinStyle::wdStyleListNumber2, "Numbering 2", word::WdStyleType::wdStyleTypeList },
-+    { word::WdBuiltinStyle::wdStyleListNumber3, "Numbering 3", word::WdStyleType::wdStyleTypeList },
-+    { word::WdBuiltinStyle::wdStyleListNumber4, "Numbering 4", word::WdStyleType::wdStyleTypeList },
-+    { word::WdBuiltinStyle::wdStyleListNumber5, "Numbering 5", word::WdStyleType::wdStyleTypeList },
-+    { word::WdBuiltinStyle::wdStyleMacroText, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleMessageHeader, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleNavPane, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleNormal, "Default", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleNormalIndent, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleNormalTable, "Table", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleNoteHeading, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStylePageNumber, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStylePlainText, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleSalutation, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleSignature, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleStrong, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleSubtitle, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTableOfAuthorities, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTableOfFigures, "", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTitle, "Title", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTOAHeading, "Contents Heading", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTOC1, "Contents 1", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTOC2, "Contents 2", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTOC3, "Contents 3", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTOC4, "Contents 4", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTOC5, "Contents 5", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTOC6, "Contents 6", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTOC7, "Contents 7", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTOC8, "Contents 8", word::WdStyleType::wdStyleTypeParagraph },
-+    { word::WdBuiltinStyle::wdStyleTOC9, "Contents 9", word::WdStyleType::wdStyleTypeParagraph },
-+    { 0, 0, 0 }
-+};
-+
-+
-+static uno::Sequence< rtl::OUString > getStyleTypes()
-+{
-+    uno::Sequence< rtl::OUString > aRet(3);
-+    rtl::OUString* pArray = aRet.getArray();
-+    pArray[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") );
-+    pArray[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharacterStyles") );
-+    pArray[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingStyles") );
-+    return aRet;
-+}
-+
-+typedef ::cppu::WeakImplHelper1< container::XEnumeration > StyleEnumeration_BASE;
-+typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > StyleCollectionHelper_BASE;
-+/*
-+class StylesEnumeration : public StyleEnumeration_BASE
-+{
-+public:
-+	StylesEnumeration( const SheetMap& sMap ) : mSheetMap( sMap ), mIt( mSheetMap.begin() ) {}
-+	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
-+	{
-+		return ( mIt != mSheetMap.end() );
-+	}
-+	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+	{
-+		if ( !hasMoreElements() )
-+			throw container::NoSuchElementException();
-+		uno::Reference< sheet::XSpreadsheet > xSheet( *mIt++ );
-+		return uno::makeAny( xSheet ) ;
-+	}
-+};
-+*/
-+class StyleCollectionHelper : public StyleCollectionHelper_BASE
-+{
-+private:
-+    uno::Reference< frame::XModel > mxModel;
-+    uno::Reference< container::XNameAccess > mxStyleFamilies;
-+    uno::Reference< container::XNameContainer > mxCurrentStyleFamily;
-+    uno::Any cachePos;
-+public:
-+	StyleCollectionHelper( const uno::Reference< frame::XModel >& _xModel ) : mxModel( _xModel )
-+    {
-+        uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( _xModel, uno::UNO_QUERY_THROW);
-+        mxStyleFamilies = xStyleSupplier->getStyleFamilies();
-+    }
-+    uno::Reference< container::XNameContainer > getCurrentStyleFamily(){ return mxCurrentStyleFamily; }
-+	// XElementAccess
-+	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) { return  style::XStyle::static_type(0); }
-+	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) { return getCount() > 0; }
-+	// XNameAcess 
-+	virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+	{
-+		if ( !hasByName(aName) )
-+			throw container::NoSuchElementException();
-+		return cachePos;
-+	}
-+	virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
-+	{
-+		uno::Sequence< rtl::OUString > sNames( getCount() );
-+		rtl::OUString* pString = sNames.getArray();
-+        uno::Sequence< rtl::OUString > aStyleTypes = getStyleTypes();
-+        sal_Int32 nCount = 0;
-+        for( sal_Int32 i = 0; i < aStyleTypes.getLength(); i++ )
-+        {
-+            uno::Reference< container::XNameAccess > xNameAccess( mxStyleFamilies->getByName( aStyleTypes[i] ), uno::UNO_QUERY_THROW );
-+            uno::Sequence< rtl::OUString > sElementNames = xNameAccess->getElementNames();
-+            for( sal_Int32 j = 0; j < sElementNames.getLength(); j++ )
-+            {
-+                pString[nCount++] = sElementNames[j];
-+            }
-+        }
-+		return sNames;
-+	}
-+	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
-+	{
-+        uno::Sequence< rtl::OUString > aStyleTypes = getStyleTypes();
-+        for( sal_Int32 i = 0; i < aStyleTypes.getLength(); i++ )
-+        {
-+            uno::Reference< container::XNameAccess > xNameAccess( mxStyleFamilies->getByName( aStyleTypes[i] ), uno::UNO_QUERY_THROW );
-+            if( xNameAccess->hasByName( aName ) )
-+            {
-+                cachePos = xNameAccess->getByName( aName );
-+                mxCurrentStyleFamily.set( xNameAccess, uno::UNO_QUERY_THROW );
-+                return sal_True;
-+            }
-+        }
-+        return sal_False;
-+	}
-+
-+	// XIndexAccess
-+	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
-+    { 
-+        uno::Sequence< rtl::OUString > aStyleTypes = getStyleTypes();
-+        sal_Int32 nCount = 0;
-+        for( sal_Int32 i = 0; i < aStyleTypes.getLength(); i++ )
-+        {
-+            uno::Reference< container::XIndexAccess > xIndexAccess( mxStyleFamilies->getByName( aStyleTypes[i] ), uno::UNO_QUERY_THROW );
-+            nCount += xIndexAccess->getCount();
-+        }
-+        return nCount;
-+    }	
-+	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
-+	{
-+		if ( Index < 0 || Index >= getCount() )
-+			throw lang::IndexOutOfBoundsException();
-+	
-+        // FIXME: need to make a alphabetically sorted list of style names
-+        uno::Sequence< rtl::OUString > aStyleTypes = getStyleTypes();
-+        for( sal_Int32 i = 0; i < aStyleTypes.getLength(); i++ )
-+        {
-+            uno::Reference< container::XIndexAccess > xIndexAccess( mxStyleFamilies->getByName( aStyleTypes[i] ), uno::UNO_QUERY_THROW );
-+            sal_Int32 nCount = xIndexAccess->getCount();
-+            if( Index >= nCount )
-+                Index -= nCount;
-+            else
-+            {
-+                mxCurrentStyleFamily.set( xIndexAccess, uno::UNO_QUERY_THROW );
-+                return xIndexAccess->getByIndex( Index );
-+            }
-+        }
-+		throw lang::IndexOutOfBoundsException();
-+	}
-+	// XEnumerationAccess
-+	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
-+	{
-+        // FIXME:
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+	}
-+};
-+
-+SwVbaStyles::SwVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException ) : SwVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new StyleCollectionHelper( xModel )  ) ), mxModel( xModel )
-+{
-+    mxMSF.set( mxModel, uno::UNO_QUERY_THROW );
-+}
-+
-+uno::Any 
-+SwVbaStyles::createCollectionObject(const uno::Any& aObject)
-+{
-+    uno::Reference< beans::XPropertySet > xStyleProp( aObject, uno::UNO_QUERY_THROW );
-+    return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xStyleProp ) ) );
-+}
-+
-+uno::Type SAL_CALL 
-+SwVbaStyles::getElementType() throw (uno::RuntimeException)
-+{
-+	return word::XStyle::static_type(0);
-+}
-+
-+uno::Reference< container::XEnumeration > SAL_CALL 
-+SwVbaStyles::createEnumeration() throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno::RuntimeException)
-+{
-+    //handle WdBuiltinStyle
-+    sal_Int32 nIndex = 0;
-+    if( ( Index1 >>= nIndex ) && ( nIndex < 0 ) )
-+    {
-+        for( const BuiltinStyleTable* pTable = aBuiltinStyleTable; pTable->wdBuiltinStyle != NULL; pTable++ )
-+        {
-+            if( nIndex == pTable->wdBuiltinStyle )
-+            {
-+                rtl::OUString aStyleName = rtl::OUString::createFromAscii( pTable->pOOoStyleName );
-+                if( aStyleName.getLength() > 0 )
-+                {
-+                    rtl::OUString aStyleType = SwVbaStyle::getOOoStyleTypeFromMSWord( pTable->wdStyleType );
-+                    switch( pTable->wdStyleType )
-+                    {
-+                        case word::WdStyleType::wdStyleTypeParagraph:
-+                        case word::WdStyleType::wdStyleTypeTable:
-+                        {
-+                            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") );
-+                            break;
-+                        }
-+                        case word::WdStyleType::wdStyleTypeCharacter:
-+                        {
-+                            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharacterStyles") );
-+                            break;
-+                        }
-+                        case word::WdStyleType::wdStyleTypeList:
-+                        {
-+                            aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingStyles") );
-+                            break;
-+                        }
-+                        default:
-+                            DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
-+                    }
-+                    uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxModel, uno::UNO_QUERY_THROW);
-+                    uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW );
-+                    uno::Reference< beans::XPropertySet > xStyleProps( xStylesAccess->getByName( aStyleName ), uno::UNO_QUERY_THROW );
-+                    return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xStyleProps ) ) );
-+                }
-+                else
-+                {
-+                    OSL_TRACE("SwVbaStyles::Item: the builtin style type is not implemented");
-+                    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+                }
-+            }
-+        }
-+    }
-+    return SwVbaStyles_BASE::Item( Index1, Index2 );
-+}
-+
-+rtl::OUString&
-+SwVbaStyles::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaStyles") );
-+    return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString >
-+SwVbaStyles::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.XStyles" ) );
-+    }
-+    return aServiceNames;
-+}
-diff --git sw/source/ui/vba/vbastyles.hxx sw/source/ui/vba/vbastyles.hxx
-new file mode 100644
-index 0000000..50f20d2
---- /dev/null
-+++ sw/source/ui/vba/vbastyles.hxx
-@@ -0,0 +1,54 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbastyles.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_STYLES_HXX
-+#define SW_VBA_STYLES_HXX
-+
-+#include <ooo/vba/word/XStyles.hpp>
-+#include <vbahelper/vbacollectionimpl.hxx>
-+
-+typedef CollTestImplHelper< ooo::vba::word::XStyles > SwVbaStyles_BASE;
-+class SwVbaStyles: public SwVbaStyles_BASE
-+{
-+	css::uno::Reference< css::frame::XModel > mxModel;
-+	css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF;
-+public:
-+	SwVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::script::BasicErrorException );
-+
-+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException);
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);	
-+	virtual css::uno::Any createCollectionObject(const css::uno::Any&);
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif 
-diff --git sw/source/ui/vba/vbasystem.cxx sw/source/ui/vba/vbasystem.cxx
-index 29ea2e5..0b233a4 100644
---- sw/source/ui/vba/vbasystem.cxx
-+++ sw/source/ui/vba/vbasystem.cxx
-@@ -61,7 +61,7 @@ uno::Any PrivateProfileStringListener::getValueEvent()
-     // get the private profile string
-     Config aCfg( maFileName );
-     aCfg.SetGroup( maGroupName );
--    rtl::OUString sValue = rtl::OUString( String( aCfg.ReadKey( maKey ), RTL_TEXTENCODING_UTF8 ) );
-+    rtl::OUString sValue = String( aCfg.ReadKey( maKey ), RTL_TEXTENCODING_DONTKNOW );
- 
-     return uno::makeAny( sValue );
- }
-@@ -74,7 +74,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value )
- 
-     rtl::OUString aValue;
-     value >>= aValue;
--    aCfg.WriteKey( maKey, ByteString( aValue.getStr(), RTL_TEXTENCODING_UTF8 ) );
-+    aCfg.WriteKey( maKey, ByteString( aValue.getStr(), RTL_TEXTENCODING_DONTKNOW ) );
- }
- 
- SwVbaSystem::SwVbaSystem( uno::Reference<uno::XComponentContext >& xContext ): SwVbaSystem_BASE( uno::Reference< XHelperInterface >(), xContext )
-@@ -168,8 +168,8 @@ SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OU
- 	else
- 		osl::FileBase::getFileURLFromSystemPath( rFilename, sFileUrl);
- 
--    ByteString aGroupName = ByteString( rSection.getStr(), RTL_TEXTENCODING_UTF8);
--    ByteString aKey = ByteString( rKey.getStr(), RTL_TEXTENCODING_UTF8);
-+    ByteString aGroupName = ByteString( rSection.getStr(), RTL_TEXTENCODING_DONTKNOW);
-+    ByteString aKey = ByteString( rKey.getStr(), RTL_TEXTENCODING_DONTKNOW);
-     maPrivateProfileStringListener.Initialize( sFileUrl, aGroupName, aKey );
- 
-     return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( &maPrivateProfileStringListener ) ) );
-diff --git sw/source/ui/vba/vbatable.cxx sw/source/ui/vba/vbatable.cxx
-new file mode 100644
-index 0000000..3a4ead5
---- /dev/null
-+++ sw/source/ui/vba/vbatable.cxx
-@@ -0,0 +1,97 @@
-+#include "vbatable.hxx"
-+#include "vbarange.hxx"
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-+#include <com/sun/star/view/XSelectionSupplier.hpp>
-+#include <com/sun/star/text/XTextTable.hpp>
-+#include <com/sun/star/text/XTextTablesSupplier.hpp>
-+#include <com/sun/star/table/XTableRows.hpp>
-+#include <com/sun/star/container/XNamed.hpp>
-+#include "vbaborders.hxx"
-+#include "vbapalette.hxx"
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+SwVbaTable::SwVbaTable(  const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const  uno::Reference< css::text::XTextTable >& xTextTable) throw ( uno::RuntimeException ) : SwVbaTable_BASE( rParent, rContext ), mxTextDocument( rDocument )
-+{
-+    mxTextTable.set( xTextTable, uno::UNO_QUERY_THROW );
-+}
-+
-+uno::Reference< word::XRange > SAL_CALL 
-+SwVbaTable::Range(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    return new SwVbaRange( mxParent, mxContext, mxTextDocument, mxTextTable->getAnchor() );
-+}
-+
-+void SAL_CALL 
-+SwVbaTable::Select(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );    
-+    uno::Reference< frame::XController > xController = xModel->getCurrentController();
-+
-+    uno::Reference< text::XTextViewCursorSupplier > xViewCursorSupplier( xController, uno::UNO_QUERY_THROW );
-+    uno::Reference< view::XSelectionSupplier > xSelectionSupplier( xController, uno::UNO_QUERY_THROW );
-+
-+    // set the view cursor to the start of the table.
-+    xSelectionSupplier->select( uno::makeAny( mxTextTable ) );
-+
-+    // go to the end of the table and span the view
-+    uno::Reference< text::XTextViewCursor > xCursor = xViewCursorSupplier->getViewCursor();
-+    xCursor->gotoEnd(sal_True);
-+    
-+}
-+
-+void SAL_CALL 
-+SwVbaTable::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    uno::Reference< table::XTableRows > xRows( mxTextTable->getRows() );
-+    xRows->removeByIndex( 0, xRows->getCount() );
-+}
-+
-+uno::Reference< word::XRange > SAL_CALL 
-+SwVbaTable::ConvertToText( const uno::Any& Separator, const uno::Any& NestedTables ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    // #FIXME the helper api uses the dreaded dispatch mechanism, holding off 
-+    // implementation while I look for alternative solution
-+    throw uno::RuntimeException();
-+}
-+
-+rtl::OUString SAL_CALL
-+SwVbaTable::getName() throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XNamed > xNamed( mxTextTable, uno::UNO_QUERY_THROW );
-+    return xNamed->getName();
-+}
-+
-+uno::Any SAL_CALL
-+SwVbaTable::Borders( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< table::XCellRange > aCellRange( mxTextTable, uno::UNO_QUERY_THROW );
-+    VbaPalette aPalette;
-+    uno::Reference< XCollection > xCol( new SwVbaBorders( this, mxContext, aCellRange, aPalette ) );
-+    if ( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
-+// XHelperInterface
-+rtl::OUString& 
-+SwVbaTable::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTable") );
-+    return sImplName;    
-+}
-+
-+uno::Sequence<rtl::OUString> 
-+SwVbaTable::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Table" ) );
-+    }
-+    return aServiceNames;
-+}
-+
-diff --git sw/source/ui/vba/vbatable.hxx sw/source/ui/vba/vbatable.hxx
-new file mode 100644
-index 0000000..3376007
---- /dev/null
-+++ sw/source/ui/vba/vbatable.hxx
-@@ -0,0 +1,28 @@
-+#ifndef SW_VBA_TABLE_HXX
-+#define SW_VBA_TABLE_HXX
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+#include <com/sun/star/text/XTextTable.hpp>
-+#include <ooo/vba/word/XRange.hpp>
-+#include <ooo/vba/word/XTable.hpp>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XTable > SwVbaTable_BASE;
-+
-+class SwVbaTable : public SwVbaTable_BASE
-+{
-+    css::uno::Reference< css::text::XTextDocument > mxTextDocument;
-+    css::uno::Reference< css::text::XTextTable > mxTextTable;
-+public:
-+    SwVbaTable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextTable >& xTextTable) throw ( css::uno::RuntimeException);;
-+    css::uno::Reference< css::text::XTextDocument > getDocument() { return mxTextDocument; };
-+    virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
-+    virtual void SAL_CALL Select(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    virtual rtl::OUString SAL_CALL getName( ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();  
-+};
-+#endif
-diff --git sw/source/ui/vba/vbatables.cxx sw/source/ui/vba/vbatables.cxx
-new file mode 100644
-index 0000000..d6ea709
---- /dev/null
-+++ sw/source/ui/vba/vbatables.cxx
-@@ -0,0 +1,131 @@
-+#include "vbatables.hxx"
-+#include "vbatable.hxx"
-+#include "vbarange.hxx"
-+#include <com/sun/star/text/XTextTable.hpp>
-+#include <com/sun/star/text/XTextTablesSupplier.hpp>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+#include <comphelper/componentcontext.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace css;
-+
-+uno::Reference< container::XIndexAccess > lcl_getTables( const uno::Reference< frame::XModel >& xDoc )
-+{
-+    uno::Reference< container::XIndexAccess > xTables;
-+    uno::Reference< text::XTextTablesSupplier > xSupp( xDoc, uno::UNO_QUERY );
-+    if ( xSupp.is() )
-+        xTables.set( xSupp->getTextTables(), uno::UNO_QUERY_THROW );
-+    return xTables;
-+}
-+
-+uno::Any lcl_createTable( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Any& aSource )
-+{
-+    uno::Reference< text::XTextTable > xTextTable( aSource, uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextDocument > xTextDocument( xDocument, uno::UNO_QUERY_THROW );
-+    uno::Reference< word::XTable > xTable( new SwVbaTable( xParent, xContext, xTextDocument, xTextTable ) );
-+    return uno::makeAny( xTable );
-+}
-+
-+typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumBase;
-+
-+class TableEnumerationImpl : public EnumBase
-+{
-+    uno::Reference< XHelperInterface > mxParent;
-+    uno::Reference< uno::XComponentContext > mxContext;
-+    uno::Reference< frame::XModel > mxDocument;
-+    uno::Reference< container::XIndexAccess > mxIndexAccess;
-+    sal_Int32 mnCurIndex;
-+public:
-+    TableEnumerationImpl(  const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxParent( xParent ), mxContext( xContext ), mxDocument( xDocument ), mxIndexAccess( xIndexAccess ), mnCurIndex(0)
-+    {
-+    }
-+    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException) 
-+    { 
-+        return ( mnCurIndex < mxIndexAccess->getCount() );
-+    }
-+    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+    {
-+        if ( !hasMoreElements() )
-+            throw container::NoSuchElementException();
-+        return lcl_createTable( mxParent, mxContext, mxDocument, mxIndexAccess->getByIndex( mnCurIndex++ ) );
-+    }
-+    
-+};
-+ 
-+SwVbaTables::SwVbaTables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xDocument ) : SwVbaTables_BASE( xParent, xContext , lcl_getTables( xDocument ) ), mxDocument( xDocument )
-+{
-+}
-+
-+
-+uno::Reference< word::XTable > SAL_CALL 
-+SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& DefaultTableBehavior, const uno::Any& AutoFitBehavior ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    sal_Int32 nCols = 0;
-+    sal_Int32 nRows = 0;
-+    SwVbaRange* pVbaRange = dynamic_cast< SwVbaRange* >( Range.get() );
-+    // Preconditions
-+    if ( !( pVbaRange && ( NumRows >>= nRows ) && ( NumColumns >>= nCols ) ) )
-+        throw uno::RuntimeException(); // #FIXME better exception??
-+    if ( nCols <= 0 || nRows <= 0 ) 
-+        throw uno::RuntimeException(); // #FIXME better exception??
-+
-+    uno::Reference< frame::XModel > xModel( pVbaRange->getDocument(), uno::UNO_QUERY_THROW );
-+    uno::Reference< lang::XMultiServiceFactory > xMsf( xModel, uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextRange > xTextRange = pVbaRange->getXTextRange();
-+
-+    uno::Reference< text::XTextTable > xTable;
-+    xTable.set( xMsf->createInstance( rtl::OUString::createFromAscii("com.sun.star.text.TextTable") ), uno::UNO_QUERY_THROW );
-+/*
-+    comphelper::ComponentContext aCtx( xMsf );
-+    if ( !aCtx.createComponent( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextTable") ), xTable ) );
-+        throw uno::RuntimeException(); // #FIXME better exception??
-+*/
-+    xTable->initialize( nRows, nCols );
-+    uno::Reference< text::XText > xText = xTextRange->getText();
-+    uno::Reference< text::XTextContent > xContext( xTable, uno::UNO_QUERY_THROW );     
-+    
-+    xText->insertTextContent( xTextRange, xContext, true );
-+    uno::Reference< word::XTable > xVBATable( new SwVbaTable( mxParent, mxContext,  pVbaRange->getDocument(), xTable ) );
-+    return xVBATable;
-+}
-+
-+uno::Reference< container::XEnumeration > SAL_CALL 
-+SwVbaTables::createEnumeration() throw (uno::RuntimeException)
-+{
-+    return new TableEnumerationImpl( mxParent, mxContext, mxDocument, m_xIndexAccess );
-+}
-+
-+// ScVbaCollectionBaseImpl      
-+uno::Any 
-+SwVbaTables::createCollectionObject( const uno::Any& aSource )
-+{
-+    return lcl_createTable( mxParent, mxContext, mxDocument, aSource );
-+} 
-+
-+// XHelperInterface
-+rtl::OUString& 
-+SwVbaTables::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTables") );
-+    return sImplName;    
-+}
-+
-+// XEnumerationAccess
-+uno::Type SAL_CALL 
-+SwVbaTables::getElementType() throw (uno::RuntimeException)
-+{
-+    return  word::XTable::static_type(0); 
-+}
-+
-+uno::Sequence<rtl::OUString> 
-+SwVbaTables::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Tables" ) );
-+    }
-+    return aServiceNames;
-+}
-+
-diff --git sw/source/ui/vba/vbatables.hxx sw/source/ui/vba/vbatables.hxx
-new file mode 100644
-index 0000000..79df2f9
---- /dev/null
-+++ sw/source/ui/vba/vbatables.hxx
-@@ -0,0 +1,28 @@
-+#ifndef SW_VBA_TABLES_HXX
-+#define SW_VBA_TABLES_HXX
-+
-+#include <ooo/vba/word/XTables.hpp>
-+#include <vbahelper/vbacollectionimpl.hxx>
-+
-+
-+typedef CollTestImplHelper< ov::word::XTables > SwVbaTables_BASE;
-+
-+class SwVbaTables : public SwVbaTables_BASE
-+{
-+    css::uno::Reference< css::frame::XModel > mxDocument;
-+public:
-+    SwVbaTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
-+    // XTables
-+    virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    // XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+    // ScVbaCollectionBaseImpl      
-+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-+
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();    
-+};
-+
-+#endif
-diff --git sw/source/ui/vba/vbatemplate.cxx sw/source/ui/vba/vbatemplate.cxx
-index 11c1a59..9413428 100644
---- sw/source/ui/vba/vbatemplate.cxx
-+++ sw/source/ui/vba/vbatemplate.cxx
-@@ -30,6 +30,9 @@
- #include "vbatemplate.hxx"
- #include <vbahelper/vbahelper.hxx>
- #include "wordvbahelper.hxx"
-+#include "vbaautotextentry.hxx"
-+#include <comphelper/processfactory.hxx>
-+#include <com/sun/star/text/XAutoTextContainer.hpp>
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
-@@ -49,6 +52,38 @@ SwVbaTemplate::getName() throw ( css::uno::RuntimeException )
- {
-     return msName;
- }
-+
-+uno::Any SAL_CALL
-+SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< lang::XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory();
-+    uno::Reference< text::XAutoTextContainer > xAutoTextContainer( xMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.AutoTextContainer") ) ), uno::UNO_QUERY_THROW );
-+
-+    // the default template is "Normal.dot" in Word.
-+    rtl::OUString sGroup( RTL_CONSTASCII_USTRINGPARAM("Normal") );
-+    if( sal_Int32 nIndex = msName.lastIndexOf( sal_Unicode('.') ) > 0 )
-+    {
-+        sGroup = msName.copy( 0, msName.lastIndexOf( sal_Unicode('.') ) );
-+       // OSL_TRACE("SwVbaTemplate::AutoTextEntries: %s", rtl::OUStringToOString( sGroup, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    }
-+    
-+    uno::Reference< container::XIndexAccess > xGroup;
-+    if( xAutoTextContainer->hasByName( sGroup ) )
-+    {
-+        xGroup.set( xAutoTextContainer->getByName( sGroup ), uno::UNO_QUERY_THROW );
-+    }
-+    else
-+    {
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Auto Text Entry doesn't exist") ), uno::Reference< uno::XInterface >() );
-+        //xGroup.set( xAutoTextContainer->insertNewByName( sGroup ), uno::UNO_QUERY_THROW );
-+    }
-+
-+    uno::Reference< XCollection > xCol( new SwVbaAutoTextEntries( this, mxContext, xGroup ) );
-+    if( index.hasValue() )
-+        return xCol->Item( index, uno::Any() );
-+    return uno::makeAny( xCol );
-+}
-+
- rtl::OUString&
- SwVbaTemplate::getServiceImplName()
- {
-diff --git sw/source/ui/vba/vbatemplate.hxx sw/source/ui/vba/vbatemplate.hxx
-index 63a2f26..df8848b 100644
---- sw/source/ui/vba/vbatemplate.hxx
-+++ sw/source/ui/vba/vbatemplate.hxx
-@@ -47,6 +47,7 @@ public:
- 
-    // XTemplate
-     virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException);
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-diff --git sw/source/ui/vba/vbaview.cxx sw/source/ui/vba/vbaview.cxx
-index b9b52f4..bc7b9b4 100644
---- sw/source/ui/vba/vbaview.cxx
-+++ sw/source/ui/vba/vbaview.cxx
-@@ -34,10 +34,14 @@
- #include <com/sun/star/view/XViewSettingsSupplier.hpp>
- #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
- #include <com/sun/star/text/XText.hpp>
-+#include <com/sun/star/text/XTextTable.hpp>
-+#include <com/sun/star/table/XCellRange.hpp>
- #include <com/sun/star/text/XTextDocument.hpp>
- #include <com/sun/star/text/XFootnotesSupplier.hpp>
- #include <com/sun/star/text/XEndnotesSupplier.hpp>
- #include <com/sun/star/container/XIndexAccess.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <com/sun/star/container/XEnumeration.hpp>
- #include <com/sun/star/frame/XController.hpp>
- #include <com/sun/star/lang/XServiceInfo.hpp>
- #include <ooo/vba/word/WdSpecialPane.hpp>
-@@ -45,12 +49,13 @@
- #include <ooo/vba/word/WdSeekView.hpp>
- 
- #include "wordvbahelper.hxx"
-+#include "vbaheaderfooterhelper.hxx"
- #include <view.hxx>
- 
- using namespace ::ooo::vba;
- using namespace ::com::sun::star;
- 
--const sal_Int32 DEFAULT_BODY_DISTANCE = 500;
-+static const sal_Int32 DEFAULT_BODY_DISTANCE = 500;
- 
- SwVbaView::SwVbaView( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-     const uno::Reference< frame::XModel >& rModel ) throw ( uno::RuntimeException ) :
-@@ -72,7 +77,16 @@ SwVbaView::~SwVbaView()
- ::sal_Int32 SAL_CALL 
- SwVbaView::getSeekView() throw (css::uno::RuntimeException)
- {
-+    // FIXME: if the view cursor is in table, field, section and frame
-+    // handle if the cursor is in table
-     uno::Reference< text::XText > xCurrentText = mxViewCursor->getText();
-+    uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW );
-+    uno::Reference< text::XTextContent > xTextContent;
-+    while( xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextTable") ) ) >>= xTextContent )
-+    {
-+        xCurrentText = xTextContent->getAnchor()->getText();
-+        xCursorProps.set( xCurrentText->createTextCursor(), uno::UNO_QUERY_THROW );
-+    }
-     uno::Reference< lang::XServiceInfo > xServiceInfo( xCurrentText, uno::UNO_QUERY_THROW );
-     rtl::OUString aImplName = xServiceInfo->getImplementationName();
-     if( aImplName.equalsAscii("SwXBodyText") )
-@@ -81,20 +95,20 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException)
-     }
-     else if( aImplName.equalsAscii("SwXHeadFootText") )
-     {
--        if( word::HeaderFooterHelper::isHeader( mxModel, xCurrentText ) )
-+        if( HeaderFooterHelper::isHeader( mxModel, xCurrentText ) )
-         {
--            if( word::HeaderFooterHelper::isFirstPageHeader( mxModel, xCurrentText ) )
-+            if( HeaderFooterHelper::isFirstPageHeader( mxModel, xCurrentText ) )
-                 return word::WdSeekView::wdSeekFirstPageHeader;
--            else if( word::HeaderFooterHelper::isEvenPagesHeader( mxModel, xCurrentText ) )
-+            else if( HeaderFooterHelper::isEvenPagesHeader( mxModel, xCurrentText ) )
-                 return word::WdSeekView::wdSeekEvenPagesHeader;
-             else
-                 return word::WdSeekView::wdSeekPrimaryHeader;
-         }
-         else
-         {
--            if( word::HeaderFooterHelper::isFirstPageFooter( mxModel, xCurrentText ) )
-+            if( HeaderFooterHelper::isFirstPageFooter( mxModel, xCurrentText ) )
-                 return word::WdSeekView::wdSeekFirstPageFooter;
--            else if( word::HeaderFooterHelper::isEvenPagesFooter( mxModel, xCurrentText ) )
-+            else if( HeaderFooterHelper::isEvenPagesFooter( mxModel, xCurrentText ) )
-                 return word::WdSeekView::wdSeekEvenPagesFooter;
-             else
-                 return word::WdSeekView::wdSeekPrimaryFooter;
-@@ -114,8 +128,12 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException)
- void SAL_CALL 
- SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException)
- {
--    if( _seekview == getSeekView() )
--        return;
-+    // FIXME: save the current cursor position, if the cursor is in the main
-+    // document, so we can jump back to this position, if the macro sets
-+    // the ViewMode back to wdSeekMainDocument
-+
-+    // if( _seekview == getSeekView() )
-+    //    return;
- 
-     switch( _seekview )
-     {
-@@ -166,7 +184,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio
-         {
-             uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
-             uno::Reference< text::XText > xText = xTextDocument->getText();
--            mxViewCursor->gotoRange( xText->getStart(), sal_False );
-+            mxViewCursor->gotoRange( getFirstObjectPosition( xText ), sal_False );
-             break;
-         }
-     }
-@@ -214,6 +232,7 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException)
-     switch( _type )
-     {
-         case word::WdViewType::wdPrintView:
-+        case word::WdViewType::wdNormalView:
-         {
-             mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout")), uno::makeAny( sal_False ) );
-             break;
-@@ -360,7 +379,29 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
-     {
-         DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
-     }
--    return xText->getStart();
-+    uno::Reference< text::XTextRange > xTextRange = getFirstObjectPosition( xText );
-+    return xTextRange;
-+}
-+
-+uno::Reference< text::XTextRange > SwVbaView::getFirstObjectPosition( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException)
-+{
-+    // if the first object is table, get the position of first cell 
-+    uno::Reference< text::XTextRange > xTextRange;
-+    uno::Reference< container::XEnumerationAccess > xParaAccess( xText, uno::UNO_QUERY_THROW );
-+    uno::Reference< container::XEnumeration> xParaEnum = xParaAccess->createEnumeration();
-+    if( xParaEnum->hasMoreElements() )
-+    {
-+        uno::Reference< lang::XServiceInfo > xServiceInfo( xParaEnum->nextElement(), uno::UNO_QUERY_THROW );
-+        if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextTable") ) ) )
-+        {
-+            uno::Reference< table::XCellRange > xCellRange( xServiceInfo, uno::UNO_QUERY_THROW );
-+            uno::Reference< text::XText> xFirstCellText( xCellRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
-+            xTextRange = xFirstCellText->getStart();
-+        }
-+    }
-+    if( !xTextRange.is() )
-+        xTextRange = xText->getStart();
-+    return xTextRange;
- }
- 
- rtl::OUString& 
-diff --git sw/source/ui/vba/vbaview.hxx sw/source/ui/vba/vbaview.hxx
-index 4aa07a3..47675a5 100644
---- sw/source/ui/vba/vbaview.hxx
-+++ sw/source/ui/vba/vbaview.hxx
-@@ -34,6 +34,7 @@
- #include <vbahelper/vbahelperinterface.hxx>
- #include <com/sun/star/text/XTextViewCursor.hpp>
- #include <com/sun/star/text/XTextRange.hpp>
-+#include <com/sun/star/text/XText.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
- 
- typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XView > SwVbaView_BASE;
-@@ -46,6 +47,7 @@ private:
-     css::uno::Reference< css::beans::XPropertySet > mxViewSettings;
- 
-     css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ) throw (css::uno::RuntimeException);
-+    css::uno::Reference< css::text::XTextRange > getFirstObjectPosition( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
- 
- public:
- 	SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, 
-diff --git sw/source/ui/vba/vbawrapformat.cxx sw/source/ui/vba/vbawrapformat.cxx
-new file mode 100644
-index 0000000..a169e95
---- /dev/null
-+++ sw/source/ui/vba/vbawrapformat.cxx
-@@ -0,0 +1,260 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbawrapformat.cxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbawrapformat.hxx"
-+#include <ooo/vba/word/WdWrapSideType.hpp>
-+#include <ooo/vba/word/WdWrapType.hpp>
-+#include <com/sun/star/text/WrapTextMode.hpp>
-+#include <vbahelper/vbahelper.hxx>
-+#include <vbahelper/helperdecl.hxx>
-+
-+using namespace ooo::vba;
-+using namespace com::sun::star;
-+
-+SwVbaWrapFormat::SwVbaWrapFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : SwVbaWrapFormat_BASE( xParent, xContext ), m_xShape( xShape ), mnWrapFormatType( 0 ), mnSide( word::WdWrapSideType::wdWrapBoth ) 
-+{
-+    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
-+}
-+
-+SwVbaWrapFormat::SwVbaWrapFormat( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) : SwVbaWrapFormat_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext ), m_xShape( getXSomethingFromArgs< drawing::XShape >( aArgs, 1, false ) ), mnWrapFormatType( 0 ), mnSide( word::WdWrapSideType::wdWrapBoth )
-+{
-+    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
-+}
-+
-+void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
-+{
-+    text::WrapTextMode eTextMode = text::WrapTextMode_NONE;
-+    if( mnSide == word::WdWrapSideType::wdWrapLeft )
-+    {
-+        eTextMode = text::WrapTextMode_LEFT;
-+    }
-+    else if(  mnSide == word::WdWrapSideType::wdWrapRight )
-+    {
-+        eTextMode = text::WrapTextMode_RIGHT;
-+    }
-+    else if( mnSide == word::WdWrapSideType::wdWrapBoth ||
-+            mnSide == word::WdWrapSideType::wdWrapLargest )
-+    {
-+        switch( mnWrapFormatType )
-+        {
-+            case word::WdWrapType::wdWrapNone:
-+            case word::WdWrapType::wdWrapThrough:
-+            {
-+                eTextMode = text::WrapTextMode_THROUGHT;
-+                break;
-+            }
-+            case word::WdWrapType::wdWrapInline:
-+            case word::WdWrapType::wdWrapTopBottom:
-+            {
-+                eTextMode = text::WrapTextMode_NONE;
-+                break;
-+            }
-+            case word::WdWrapType::wdWrapSquare:
-+            {
-+                eTextMode = text::WrapTextMode_PARALLEL;
-+                m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SurroundContour") ), uno::makeAny( sal_False ) );
-+                break;
-+            }
-+            case word::WdWrapType::wdWrapTight:
-+            {
-+                eTextMode = text::WrapTextMode_PARALLEL;
-+                m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SurroundContour") ), uno::makeAny( sal_True ) );
-+                break;
-+            }
-+            default:
-+            {
-+                DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
-+            }
-+        }
-+    }
-+    m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextWrap") ), uno::makeAny( eTextMode ) );
-+}
-+
-+::sal_Int32 SAL_CALL SwVbaWrapFormat::getType() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nType = word::WdWrapType::wdWrapSquare;
-+    text::WrapTextMode eTextMode;
-+    m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextWrap") )) >>= eTextMode;
-+    switch( eTextMode )
-+    {
-+        case text::WrapTextMode_NONE:
-+        {
-+            nType = word::WdWrapType::wdWrapTopBottom;
-+            break;
-+        }
-+        case text::WrapTextMode_THROUGHT:
-+        {
-+            nType = word::WdWrapType::wdWrapNone;
-+            break;
-+        }
-+        case text::WrapTextMode_PARALLEL:
-+        {
-+            sal_Bool bContour = sal_False;
-+            m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SurroundContour") )) >>= bContour;
-+            if( bContour )
-+                nType = word::WdWrapType::wdWrapTight;
-+            else    
-+                nType = word::WdWrapType::wdWrapSquare;
-+            break;
-+        }
-+        case text::WrapTextMode_DYNAMIC:
-+        case text::WrapTextMode_LEFT:
-+        case text::WrapTextMode_RIGHT:
-+        {
-+            nType = word::WdWrapType::wdWrapThrough;
-+            break;
-+        }
-+        default:
-+        {
-+            nType = word::WdWrapType::wdWrapSquare;
-+        }
-+    }
-+    return nType;
-+}
-+
-+void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type ) throw (uno::RuntimeException)
-+{
-+    mnWrapFormatType = _type;
-+    makeWrap();
-+}
-+
-+::sal_Int32 SAL_CALL SwVbaWrapFormat::getSide() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nSide = word::WdWrapSideType::wdWrapBoth;
-+    text::WrapTextMode eTextMode;
-+    m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextWrap") )) >>= eTextMode;
-+    switch( eTextMode )
-+    {
-+        case text::WrapTextMode_LEFT:
-+        {
-+            nSide = word::WdWrapSideType::wdWrapLeft;
-+            break;
-+        }
-+        case text::WrapTextMode_RIGHT:
-+        {
-+            nSide = word::WdWrapSideType::wdWrapRight;
-+            break;
-+        }
-+        default:
-+        {
-+            nSide = word::WdWrapSideType::wdWrapBoth;
-+        }
-+    }
-+    return nSide;
-+}
-+
-+void SAL_CALL SwVbaWrapFormat::setSide( ::sal_Int32 _side ) throw (uno::RuntimeException)
-+{
-+    mnSide = _side;
-+    makeWrap();
-+}
-+
-+float SwVbaWrapFormat::getDistance( const rtl::OUString& sName ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nDistance = 0;
-+    m_xPropertySet->getPropertyValue( sName ) >>= nDistance;
-+    return static_cast< float >( Millimeter::getInPoints( nDistance ) );
-+}
-+
-+void SwVbaWrapFormat::setDistance( const rtl::OUString& sName, float _distance ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nDistance = Millimeter::getInHundredthsOfOneMillimeter( _distance );
-+    m_xPropertySet->setPropertyValue( sName, uno::makeAny( nDistance ) );
-+}
-+
-+float SAL_CALL SwVbaWrapFormat::getDistanceTop() throw (uno::RuntimeException)
-+{
-+    return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin") ) );
-+}
-+
-+void SAL_CALL SwVbaWrapFormat::setDistanceTop( float _distancetop ) throw (uno::RuntimeException)
-+{
-+    setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin") ), _distancetop );
-+}
-+
-+float SAL_CALL SwVbaWrapFormat::getDistanceBottom() throw (uno::RuntimeException)
-+{
-+    return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin") ) );
-+}
-+
-+void SAL_CALL SwVbaWrapFormat::setDistanceBottom( float _distancebottom ) throw (uno::RuntimeException)
-+{
-+    setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin") ), _distancebottom );
-+}
-+
-+float SAL_CALL SwVbaWrapFormat::getDistanceLeft() throw (uno::RuntimeException)
-+{
-+    return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin") ) );
-+}
-+
-+void SAL_CALL SwVbaWrapFormat::setDistanceLeft( float _distanceleft ) throw (uno::RuntimeException)
-+{
-+    setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin") ), _distanceleft );
-+}
-+
-+float SAL_CALL SwVbaWrapFormat::getDistanceRight() throw (uno::RuntimeException)
-+{
-+    return getDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ) );
-+}
-+
-+void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) throw (uno::RuntimeException)
-+{
-+    setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ), _distanceright );
-+}
-+
-+rtl::OUString& 
-+SwVbaWrapFormat::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaWrapFormat") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+SwVbaWrapFormat::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.WrapFormat" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+namespace wrapformat
-+{
-+namespace sdecl = comphelper::service_decl;
-+sdecl::vba_service_class_<SwVbaWrapFormat, sdecl::with_args<true> > serviceImpl;
-+extern sdecl::ServiceDecl const serviceDecl(
-+    serviceImpl,
-+    "SwVbaWrapFormat",
-+    "ooo.vba.word.WrapFormat" );
-+}
-+
-+
-diff --git sw/source/ui/vba/vbawrapformat.hxx sw/source/ui/vba/vbawrapformat.hxx
-new file mode 100644
-index 0000000..6ef75ba
---- /dev/null
-+++ sw/source/ui/vba/vbawrapformat.hxx
-@@ -0,0 +1,73 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbafillformat.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SW_VBA_XWRAPFORMAT_HXX
-+#define SW_VBA_XWRAPFORMAT_HXX
-+
-+#include <com/sun/star/drawing/XShape.hpp>
-+#include <ooo/vba/word/XWrapFormat.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XWrapFormat > SwVbaWrapFormat_BASE;
-+
-+class SwVbaWrapFormat : public SwVbaWrapFormat_BASE
-+{
-+private:
-+    css::uno::Reference< css::drawing::XShape > m_xShape;
-+    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
-+    sal_Int32 mnWrapFormatType;
-+    sal_Int32 mnSide;
-+
-+private:
-+    void makeWrap() throw (css::uno::RuntimeException);
-+    float getDistance( const rtl::OUString& sName ) throw (css::uno::RuntimeException);
-+    void setDistance( const rtl::OUString& sName, float _distance ) throw (css::uno::RuntimeException);
-+
-+public:
-+    SwVbaWrapFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape );
-+	SwVbaWrapFormat(  css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
-+
-+    virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getSide() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setSide( ::sal_Int32 _side ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getDistanceTop() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setDistanceTop( float _distancetop ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getDistanceBottom() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setDistanceBottom( float _distancebottom ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getDistanceLeft() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setDistanceLeft( float _distanceleft ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException);
-+
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif//SW_VBA_XWRAPFORMAT_HXX
-diff --git sw/source/ui/vba/wordvbahelper.cxx sw/source/ui/vba/wordvbahelper.cxx
-index 00f40fd..409b8bd 100644
---- sw/source/ui/vba/wordvbahelper.cxx
-+++ sw/source/ui/vba/wordvbahelper.cxx
-@@ -36,6 +36,7 @@
- #include <com/sun/star/container/XNameAccess.hpp>
- #include <com/sun/star/lang/XUnoTunnel.hpp>
- #include <unotxdoc.hxx>
-+#include <doc.hxx>
- 
- using namespace ::com::sun::star;
- using namespace ::ooo::vba;
-@@ -83,123 +84,10 @@ uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame
-     return xStyle;
- }
- 
--// Class HeaderFooterHelper 
--
--sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
--{
--    uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
--    uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
--    
--    sal_Bool isOn = sal_False;
--    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isOn;
--    if( !isOn )
--        return sal_False;
--
--    sal_Bool isShared = sal_False;
--    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared"))) >>= isShared;
--
--    rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") );
--    if( !isShared )
--    {
--        if( 0 == xPageCursor->getPage() % 2 )
--        {
--            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextLeft") );
--        }
--        else
--        {
--            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextRight") );
--        }
--    }
--    
--    uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
--    //FIXME: can not compare in this way?
--    return ( xText == xCurrentText );
--}
--
--sal_Bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
--{
--    if( isHeader( xModel, xCurrentText ) )
--    {
--        uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
--        // FIXME: getPage allways returns 1
--        sal_Int32 nPage = xPageCursor->getPage();
--        return nPage == FIRST_PAGE;
--    }
--    return sal_False;
--}
--
--sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
--{
--    if( isHeader( xModel, xCurrentText ) )
--    {
--        uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
--        sal_Bool isShared = sal_False;
--        xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared"))) >>= isShared;
--        if( !isShared )
--        {
--            uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
--            return ( 0 == xPageCursor->getPage() % 2 );
--        }    
--    }
--    return sal_False;
--}
--
--sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
-+sal_Int32 getPageCount( const uno::Reference< frame::XModel>& xModel ) throw (uno::RuntimeException)
- {
--    uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
--    uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
--    
--    sal_Bool isOn = sal_False;
--    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isOn;
--    if( !isOn )
--        return sal_False;
--
--    sal_Bool isShared = sal_False;
--    xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))) >>= isShared;
--
--    rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
--    if( !isShared )
--    {
--        if( 0 == xPageCursor->getPage() % 2 )
--        {
--            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextLeft") );
--        }
--        else
--        {
--            aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextRight") );
--        }
--    }
--    
--    uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
--
--    return ( xText == xCurrentText );
--}
--
--sal_Bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
--{
--    if( isFooter( xModel, xCurrentText ) )
--    {
--        uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
--        sal_Int32 nPage = xPageCursor->getPage();
--        return nPage == FIRST_PAGE;
--    }
--    return sal_False;
--}
--
--sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
--{
--    if( isFooter( xModel, xCurrentText ) )
--    {
--        uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
--        sal_Bool isShared = sal_False;
--        xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))) >>= isShared;
--        if( !isShared )
--        {
--            uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
--            return ( 0 == xPageCursor->getPage() % 2 );
--        }    
--    }
--    return sal_False;
-+    SwDocShell* pDocShell = getDocShell( xModel );
-+    return pDocShell ? pDocShell->GetDoc()->GetPageCount() : 0;
- }
- 
- } // word
-diff --git sw/source/ui/vba/wordvbahelper.hxx sw/source/ui/vba/wordvbahelper.hxx
-index aecae44..98afd00 100644
---- sw/source/ui/vba/wordvbahelper.hxx
-+++ sw/source/ui/vba/wordvbahelper.hxx
-@@ -49,17 +49,7 @@ namespace ooo
-         SwView* getView( const css::uno::Reference< css::frame::XModel>& xModel );
-         css::uno::Reference< css::text::XTextViewCursor > getXTextViewCursor( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-         css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
--
--class HeaderFooterHelper
--{
--public:
--    static sal_Bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
--    static sal_Bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
--    static sal_Bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
--    static sal_Bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
--    static sal_Bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
--    static sal_Bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
--};
-+        sal_Int32 getPageCount( const css::uno::Reference< css::frame::XModel>& xModel ) throw (css::uno::RuntimeException);
- 
- }; // word
- }; // vba
-diff --git sw/util/makefile.mk sw/util/makefile.mk
-index d12cd60..1181815 100644
---- sw/util/makefile.mk
-+++ sw/util/makefile.mk
-@@ -349,7 +349,6 @@ SHL4STDLIBS= \
- 	$(CPPUHELPERLIB) \
- 	$(SALLIB) \
- 	$(ICUUCLIB) \
--    $(VBAHELPERLIB) \
-     $(BASICLIB)     \
- 	$(I18NUTILLIB)
- 
-@@ -368,6 +367,7 @@ SHL5STDLIBS= \
-                 $(CPPULIB) \
-                 $(COMPHELPERLIB) \
-                 $(SVLIB) \
-+	            $(UNOTOOLSLIB) \
-                 $(TOOLSLIB) \
-                 $(SALLIB)\
- 		        $(VBAHELPERLIB) \
-@@ -376,8 +376,11 @@ SHL5STDLIBS= \
-                 $(SVXLIB)       \
-                 $(SVTOOLLIB)    \
-                 $(SVLLIB) \
--        $(VCLLIB) \
--        $(TKLIB) \
-+                $(VCLLIB) \
-+                $(TKLIB) \
-+                $(I18NISOLANGLIB) \
-+	            $(SVXCORELIB) \
-+                $(SVXMSFILTERLIB) \
- 
- SHL5DEPN=$(SHL1TARGETN)
- SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib
-diff --git toolkit/inc/toolkit/controls/unocontrols.hxx toolkit/inc/toolkit/controls/unocontrols.hxx
-index b22e5b4..a5eb2e6 100644
---- toolkit/inc/toolkit/controls/unocontrols.hxx
-+++ toolkit/inc/toolkit/controls/unocontrols.hxx
-@@ -669,6 +669,44 @@ public:
- 
- };
- 
-+class UnoMultiPageModel : public UnoControlModel
-+{
-+protected:
-+	::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-+	::cppu::IPropertyArrayHelper& 	SAL_CALL getInfoHelper();
-+
-+public:
-+						UnoMultiPageModel();
-+						UnoMultiPageModel( const UnoMultiPageModel& rModel ) : UnoControlModel( rModel ) {;}
-+
-+	UnoControlModel*	Clone() const { return new UnoMultiPageModel( *this ); }
-+
-+	// ::com::sun::star::io::XPersistObject
-+    ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
-+
-+	// ::com::sun::star::beans::XMultiPropertySet
-+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-+
-+	// ::com::sun::star::lang::XServiceInfo
-+	DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, UnoControlModel, szServiceName_UnoMultiPageModel )
-+
-+};
-+//	----------------------------------------------------
-+//	class UnoGroupBoxControl
-+//	----------------------------------------------------
-+class UnoMultiPageControl :	public UnoControlBase
-+{
-+public:
-+						UnoMultiPageControl();
-+	::rtl::OUString		GetComponentServiceName();
-+
-+    sal_Bool SAL_CALL isTransparent(  ) throw(::com::sun::star::uno::RuntimeException);
-+
-+	// ::com::sun::star::lang::XServiceInfo
-+	DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, UnoControlBase, szServiceName_UnoMultiPageControl )
-+
-+};
-+
- //  ----------------------------------------------------
- //  class UnoFixedTextControl
- //  ----------------------------------------------------
-diff --git toolkit/inc/toolkit/helper/servicenames.hxx toolkit/inc/toolkit/helper/servicenames.hxx
-index 78a507a..a0dec29 100644
---- toolkit/inc/toolkit/helper/servicenames.hxx
-+++ toolkit/inc/toolkit/helper/servicenames.hxx
-@@ -40,6 +40,8 @@ extern const sal_Char __FAR_DATA szServiceName_PopupMenu[], szServiceName2_Popup
- extern const sal_Char __FAR_DATA szServiceName_MenuBar[], szServiceName2_MenuBar[];
- extern const sal_Char __FAR_DATA szServiceName_Pointer[], szServiceName2_Pointer[];
- extern const sal_Char __FAR_DATA szServiceName_UnoControlContainer[], szServiceName2_UnoControlContainer[];
-+extern const sal_Char __FAR_DATA szServiceName_UnoMultiPageControl[], szServiceName2_UnoMultiPageControl[];
-+extern const sal_Char __FAR_DATA szServiceName_UnoMultiPageModel[], szServiceName2_UnoMultiPageModel[];
- extern const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[], szServiceName2_UnoControlContainerModel[];
- extern const sal_Char __FAR_DATA szServiceName_TabController[], szServiceName2_TabController[];
- extern const sal_Char __FAR_DATA szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[];
-diff --git toolkit/source/awt/vclxwindows.cxx toolkit/source/awt/vclxwindows.cxx
-index 1b23f37..bc673cf 100644
---- toolkit/source/awt/vclxwindows.cxx
-+++ toolkit/source/awt/vclxwindows.cxx
-@@ -1179,6 +1179,16 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const ::
- 						pButton->Check( b );
- 					else
- 						pButton->SetState( b );
-+					// If VBA - need to be able to test
-+					// simulate click event
-+					if ( maActionListeners.getLength() )
-+					{
-+						::com::sun::star::awt::ActionEvent aEvent;
-+						aEvent.Source = (::cppu::OWeakObject*)this;
-+						aEvent.ActionCommand = maActionCommand;
-+						maActionListeners.actionPerformed( aEvent );
-+					}
-+					
- 				}
- 			}
- 			break;
-@@ -1937,8 +1947,11 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com:
- 				::com::sun::star::uno::Sequence< ::rtl::OUString> aItems;
- 				if ( Value >>= aItems )
- 				{
-+					sal_Int16 nElem  = pListBox->GetEntryCount();
- 					pListBox->Clear();
- 					addItems( aItems, 0 );
-+					if ( aItems.getLength() == 0 && nElem && maItemListeners.getLength() )
-+						ImplCallItemListeners();
- 				}
- 			}
- 			break;
-@@ -1951,7 +1964,11 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com:
- 						pListBox->SelectEntryPos( --n, sal_False );
- 
-                     if ( aItems.getLength() )
-+                    {			
- 					    selectItemsPos( aItems, sal_True );
-+                       if ( maItemListeners.getLength() )
-+                           ImplCallItemListeners();
-+                    }
-                     else
-                         pListBox->SetNoSelection();
- 
-diff --git toolkit/source/controls/unocontrols.cxx toolkit/source/controls/unocontrols.cxx
-index 2cfa89f..b8ca5f1 100644
---- toolkit/source/controls/unocontrols.cxx
-+++ toolkit/source/controls/unocontrols.cxx
-@@ -1852,6 +1852,77 @@ sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException)
- 	return sal_True;
- }
- 
-+// MultiPage
-+
-+UnoMultiPageModel::UnoMultiPageModel()
-+{
-+	ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
-+	ImplRegisterProperty( BASEPROPERTY_ENABLED );
-+	ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
-+	ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
-+	ImplRegisterProperty( BASEPROPERTY_HELPURL );
-+	ImplRegisterProperty( BASEPROPERTY_LABEL );
-+	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
-+	ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE );
-+	ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE_MAX );
-+}
-+
-+::rtl::OUString UnoMultiPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
-+{
-+	return ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel );
-+}
-+
-+uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
-+{
-+	if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
-+	{
-+		uno::Any aAny;
-+		aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlGroupBox );
-+		//aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageControl );
-+		return aAny;
-+	}
-+	return UnoControlModel::ImplGetDefaultValue( nPropId );
-+}
-+
-+::cppu::IPropertyArrayHelper& UnoMultiPageModel::getInfoHelper()
-+{
-+	static UnoPropertyArrayHelper* pHelper = NULL;
-+	if ( !pHelper )
-+	{
-+		uno::Sequence<sal_Int32>	aIDs = ImplGetPropertyIds();
-+		pHelper = new UnoPropertyArrayHelper( aIDs );
-+	}
-+	return *pHelper;
-+}
-+
-+// beans::XMultiPropertySet
-+uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo(  ) throw(uno::RuntimeException)
-+{
-+	static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
-+	return xInfo;
-+}
-+
-+//	----------------------------------------------------
-+//	class MultiPageControl
-+//	----------------------------------------------------
-+UnoMultiPageControl::UnoMultiPageControl()
-+{
-+	maComponentInfos.nWidth = 100;
-+	maComponentInfos.nHeight = 100;
-+}
-+
-+::rtl::OUString UnoMultiPageControl::GetComponentServiceName()
-+{
-+	return ::rtl::OUString::createFromAscii( "multipage" );
-+}
-+
-+sal_Bool UnoMultiPageControl::isTransparent() throw(uno::RuntimeException)
-+{
-+	return sal_True;
-+}
-+
-+
-+
- //	----------------------------------------------------
- //	class UnoControlListBoxModel
- //	----------------------------------------------------
-diff --git toolkit/source/helper/registerservices.cxx toolkit/source/helper/registerservices.cxx
-index 6bbc5eb..cb48a95 100644
---- toolkit/source/helper/registerservices.cxx
-+++ toolkit/source/helper/registerservices.cxx
-@@ -168,6 +168,7 @@ IMPL_CREATEINSTANCE( UnoControlTimeFieldModel )
- IMPL_CREATEINSTANCE( UnoControlProgressBarModel )
- IMPL_CREATEINSTANCE( UnoControlScrollBarModel )
- IMPL_CREATEINSTANCE( UnoSpinButtonModel )
-+IMPL_CREATEINSTANCE( UnoMultiPageModel )
- IMPL_CREATEINSTANCE( UnoControlFixedLineModel )
- IMPL_CREATEINSTANCE( UnoCurrencyFieldControl )
- IMPL_CREATEINSTANCE( UnoDateFieldControl )
-@@ -187,6 +188,7 @@ IMPL_CREATEINSTANCE( UnoTimeFieldControl )
- IMPL_CREATEINSTANCE( UnoProgressBarControl )
- IMPL_CREATEINSTANCE( UnoScrollBarControl )
- IMPL_CREATEINSTANCE( UnoSpinButtonControl )
-+IMPL_CREATEINSTANCE( UnoMultiPageControl )
- IMPL_CREATEINSTANCE( UnoFixedLineControl )
- IMPL_CREATEINSTANCE( VCLXMenuBar )
- IMPL_CREATEINSTANCE( VCLXPointer )
-@@ -273,6 +275,8 @@ TOOLKIT_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void* _pServiceManager,
- 		registerServices( xRegistryKey, "UnoControlScrollBarModel", szServiceName_UnoControlScrollBarModel, szServiceName2_UnoControlScrollBarModel );
-         registerServices( xRegistryKey, "UnoSpinButtonModel", szServiceName_UnoSpinButtonModel );
-         registerServices( xRegistryKey, "UnoSpinButtonControl", szServiceName_UnoSpinButtonControl );
-+        registerServices( xRegistryKey, "UnoMultiPageModel", szServiceName_UnoMultiPageModel );
-+        registerServices( xRegistryKey, "UnoMultiPageControl", szServiceName_UnoMultiPageControl );
-         registerServices( xRegistryKey, "UnoFixedLineControl", szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine );
- 		registerServices( xRegistryKey, "UnoControlFixedLineModel", szServiceName_UnoControlFixedLineModel, szServiceName2_UnoControlFixedLineModel );
- 		registerServices( xRegistryKey, "VCLXPrinterServer", szServiceName_PrinterServer, szServiceName2_PrinterServer );
-@@ -358,6 +362,8 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplemen
- 		CHECKANDCREATEFACTORY( VCLXPrinterServer, szServiceName_PrinterServer, szServiceName2_PrinterServer )
- 		CHECKANDCREATEFACTORY( UnoRoadmapControl, szServiceName_UnoControlRoadmap, szServiceName2_UnoControlRoadmap )
- 		CHECKANDCREATEFACTORY( UnoControlRoadmapModel, szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel )
-+        CHECKANDCREATEFACTORY( UnoMultiPageModel, szServiceName_UnoMultiPageModel, NULL )
-+        CHECKANDCREATEFACTORY( UnoMultiPageControl, szServiceName_UnoMultiPageControl, NULL )
-         CHECKANDCREATEFACTORY( UnoSpinButtonModel, szServiceName_UnoSpinButtonModel, NULL )
-         CHECKANDCREATEFACTORY( UnoSpinButtonControl, szServiceName_UnoSpinButtonControl, NULL )
- 		CHECKANDCREATEFACTORY( TreeControl, szServiceName_TreeControl, NULL )
-diff --git toolkit/source/helper/servicenames.cxx toolkit/source/helper/servicenames.cxx
-index 3b27e91..e03808d 100644
---- toolkit/source/helper/servicenames.cxx
-+++ toolkit/source/helper/servicenames.cxx
-@@ -40,6 +40,8 @@ const sal_Char __FAR_DATA szServiceName_PopupMenu[] = "stardiv.vcl.PopupMenu", s
- const sal_Char __FAR_DATA szServiceName_MenuBar[] = "stardiv.vcl.MenuBar", szServiceName2_MenuBar[] = "com.sun.star.awt.MenuBar";
- const sal_Char __FAR_DATA szServiceName_Pointer[] = "stardiv.vcl.Pointer", szServiceName2_Pointer[] = "com.sun.star.awt.Pointer";
- const sal_Char __FAR_DATA szServiceName_UnoControlContainer[] = "stardiv.vcl.control.ControlContainer", szServiceName2_UnoControlContainer[] = "com.sun.star.awt.UnoControlContainer";
-+
-+
- const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[] = "stardiv.vcl.controlmodel.ControlContainer", szServiceName2_UnoControlContainerModel[] = "com.sun.star.awt.UnoControlContainerModel";
- const sal_Char __FAR_DATA szServiceName_TabController[] = "stardiv.vcl.control.TabController", szServiceName2_TabController[] = "com.sun.star.awt.TabController";
- const sal_Char __FAR_DATA szServiceName_TabControllerModel[] = "stardiv.vcl.controlmodel.TabController", szServiceName2_TabControllerModel[] = "com.sun.star.awt.TabControllerModel";
-@@ -92,6 +94,8 @@ const sal_Char __FAR_DATA szServiceName_UnoControlRoadmap[] = "stardiv.vcl.contr
- const sal_Char __FAR_DATA szServiceName_UnoControlRoadmapModel[] = "stardiv.vcl.controlmodel.Roadmap", szServiceName2_UnoControlRoadmapModel[] = "com.sun.star.awt.UnoControlRoadmapModel";
- const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[] = "com.sun.star.awt.UnoControlSpinButton";
- const sal_Char __FAR_DATA szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel";
-+const sal_Char __FAR_DATA szServiceName_UnoMultiPageControl[] = "com.sun.star.awt.UnoControlMultiPage";
-+const sal_Char __FAR_DATA szServiceName_UnoMultiPageModel[] = "com.sun.star.awt.UnoMultiPageModel";
- const sal_Char __FAR_DATA szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
- const sal_Char __FAR_DATA szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
- const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel";
-diff --git vbahelper/inc/vbahelper/vbaapplicationbase.hxx vbahelper/inc/vbahelper/vbaapplicationbase.hxx
-index aff57d0..a4d550b 100644
---- vbahelper/inc/vbahelper/vbaapplicationbase.hxx
-+++ vbahelper/inc/vbahelper/vbaapplicationbase.hxx
-@@ -33,14 +33,16 @@
- #include <ooo/vba/XHelperInterface.hpp>
- #include <ooo/vba/XApplicationBase.hpp>
- #include <vbahelper/vbahelperinterface.hxx>
-+#include <sfx2/objsh.hxx>
- 
- typedef InheritedHelperInterfaceImpl1< ov::XApplicationBase > ApplicationBase_BASE;
- 
--class VbaApplicationBase : public ApplicationBase_BASE
-+class VBAHELPER_DLLPUBLIC VbaApplicationBase : public ApplicationBase_BASE
- {
- protected:
-     VbaApplicationBase( const css::uno::Reference< css::uno::XComponentContext >& xContext );
-     virtual ~VbaApplicationBase();
-+    virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& /*xModel*/ ) throw (css::uno::RuntimeException) { return NULL; }
- 
- public:
- 	// XHelperInterface ( parent is itself )
-@@ -51,6 +53,9 @@ public:
- 	virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException);
- 	virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (css::uno::RuntimeException);
-     virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);  
-+	virtual ::rtl::OUString SAL_CALL getVersion() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL Run( const ::rtl::OUString& MacroName, const css::uno::Any& varg1, const css::uno::Any& varg2, const css::uno::Any& varg3, const css::uno::Any& varg4, const css::uno::Any& varg5, const css::uno::Any& varg6, const css::uno::Any& varg7, const css::uno::Any& varg8, const css::uno::Any& varg9, const css::uno::Any& varg10, const css::uno::Any& varg11, const css::uno::Any& varg12, const css::uno::Any& varg13, const css::uno::Any& varg14, const css::uno::Any& varg15, const css::uno::Any& varg16, const css::uno::Any& varg17, const css::uno::Any& varg18, const css::uno::Any& varg19, const css::uno::Any& varg20, const css::uno::Any& varg21, const css::uno::Any& varg22, const css::uno::Any& varg23, const css::uno::Any& varg24, const css::uno::Any& varg25, const css::uno::Any& varg26, const css::uno::Any& varg27, const css::uno::Any& varg28, const css::uno::Any& varg29, const css::uno::Any& varg30 ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException);
- 
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
-diff --git vbahelper/inc/vbahelper/vbacollectionimpl.hxx vbahelper/inc/vbahelper/vbacollectionimpl.hxx
-index fec7b92..bc60cf1 100644
---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx
-+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx
-@@ -49,7 +49,7 @@
- 
- typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumerationHelper_BASE;
- 
--class EnumerationHelperImpl : public EnumerationHelper_BASE
-+class VBAHELPER_DLLPUBLIC EnumerationHelperImpl : public EnumerationHelper_BASE
- {
- protected:
- 	css::uno::Reference< css::uno::XComponentContext > m_xContext;
-@@ -68,7 +68,7 @@ public:
- typedef ::cppu::WeakImplHelper3< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE;
- 
- template< typename Ifc1 >
--class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
-+class VBAHELPER_DLLPUBLIC XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
- {
- public:
- typedef std::vector< css::uno::Reference< Ifc1 > >  XNamedVec;
-@@ -237,7 +237,7 @@ typedef ::cppu::WeakImplHelper1<ov::XCollection> XCollection_InterfacesBASE;
- 
- typedef ScVbaCollectionBase< XCollection_InterfacesBASE > CollImplBase1;
- // compatible with the old collections ( pre XHelperInterface base class ) ( some internal objects still use this )
--class ScVbaCollectionBaseImpl : public CollImplBase1
-+class VBAHELPER_DLLPUBLIC ScVbaCollectionBaseImpl : public CollImplBase1
- {
- public:
- 	ScVbaCollectionBaseImpl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : CollImplBase1( xParent, xContext, xIndexAccess){}
-@@ -245,7 +245,7 @@ public:
- };
- 
- template <typename Ifc> // where Ifc must implement XCollectionTest
--class CollTestImplHelper :  public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
-+class VBAHELPER_DLLPUBLIC CollTestImplHelper :  public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
- {
- typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc >  > ImplBase1;
- 
-diff --git vbahelper/inc/vbahelper/vbadialogbase.hxx vbahelper/inc/vbahelper/vbadialogbase.hxx
-new file mode 100644
-index 0000000..4b3e2a2
---- /dev/null
-+++ vbahelper/inc/vbahelper/vbadialogbase.hxx
-@@ -0,0 +1,52 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadialog.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef VBA_DIALOG_BASE_HXX
-+#define VBA_DIALOG_BASE_HXX
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/XDialogBase.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ov::XDialogBase > VbaDialogBase_BASE;
-+
-+class VBAHELPER_DLLPUBLIC VbaDialogBase : public VbaDialogBase_BASE
-+{
-+protected:
-+	sal_Int32 mnIndex;
-+public:
-+	VbaDialogBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nIndex ):VbaDialogBase_BASE( xParent, xContext ), mnIndex( nIndex ) {}
-+	virtual ~VbaDialogBase() {}
-+
-+	// Methods
-+	virtual void SAL_CALL Show() throw (css::uno::RuntimeException);
-+	virtual rtl::OUString mapIndexToName( sal_Int32 nIndex ) = 0;
-+};
-+
-+#endif /* VBA_DIALOG_BASE_HXX */
-diff --git vbahelper/inc/vbahelper/vbadialogsbase.hxx vbahelper/inc/vbahelper/vbadialogsbase.hxx
-new file mode 100644
-index 0000000..e8b1b2e
---- /dev/null
-+++ vbahelper/inc/vbahelper/vbadialogsbase.hxx
-@@ -0,0 +1,51 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadialogs.hxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef VBA_DIALOGS_BASE_HXX
-+#define VBA_DIALOGS_BASE_HXX
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/XHelperInterface.hpp>
-+#include <ooo/vba/XDialogsBase.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ov::XDialogsBase > VbaDialogsBase_BASE;
-+
-+class VBAHELPER_DLLPUBLIC VbaDialogsBase : public VbaDialogsBase_BASE
-+{
-+public:
-+	VbaDialogsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext ): VbaDialogsBase_BASE( xParent, xContext ) {} 
-+	virtual ~VbaDialogsBase() {}
-+
-+	// XCollection
-+	virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
-+};
-+
-+#endif /* VBA_DIALOGS_BASE_HXX */
-diff --git vbahelper/inc/vbahelper/vbadocumentbase.hxx vbahelper/inc/vbahelper/vbadocumentbase.hxx
-index 985cd25..9576510 100644
---- vbahelper/inc/vbahelper/vbadocumentbase.hxx
-+++ vbahelper/inc/vbahelper/vbadocumentbase.hxx
-@@ -36,7 +36,7 @@
- 
- typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentBase > VbaDocumentBase_BASE;
- 
--class VbaDocumentBase : public VbaDocumentBase_BASE
-+class VBAHELPER_DLLPUBLIC VbaDocumentBase : public VbaDocumentBase_BASE
- {
- protected:
- 	css::uno::Reference< css::frame::XModel > mxModel;
-diff --git vbahelper/inc/vbahelper/vbadocumentsbase.hxx vbahelper/inc/vbahelper/vbadocumentsbase.hxx
-new file mode 100644
-index 0000000..cc8c1b3
---- /dev/null
-+++ vbahelper/inc/vbahelper/vbadocumentsbase.hxx
-@@ -0,0 +1,69 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef VBA_WORKBOOKS_HXX
-+#define VBA_WORKBOOKS_HXX
-+
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <ooo/vba/XDocumentsBase.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+
-+typedef CollTestImplHelper< ooo::vba::XDocumentsBase > VbaDocumentsBase_BASE;
-+
-+class VBAHELPER_DLLPUBLIC VbaDocumentsBase : public VbaDocumentsBase_BASE
-+{
-+public:
-+    enum DOCUMENT_TYPE
-+    {
-+        WORD_DOCUMENT = 1,
-+        EXCEL_DOCUMENT
-+    };
-+
-+private:
-+    DOCUMENT_TYPE meDocType;
-+
-+public:
-+	VbaDocumentsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, DOCUMENT_TYPE eDocType ) throw (css::uno::RuntimeException);
-+	virtual ~VbaDocumentsBase() {}
-+
-+	// XEnumerationAccess
-+	virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) = 0;
-+	virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0;
-+
-+	// VbaDocumentsBase_BASE
-+	virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0;
-+
-+	// XDocumentsBase
-+	virtual css::uno::Any SAL_CALL Add() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL Close(  ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
-+};
-+
-+#endif /* SC_VBA_WORKBOOKS_HXX */
-diff --git vbahelper/inc/vbahelper/vbafontbase.hxx vbahelper/inc/vbahelper/vbafontbase.hxx
-new file mode 100644
-index 0000000..be30554
---- /dev/null
-+++ vbahelper/inc/vbahelper/vbafontbase.hxx
-@@ -0,0 +1,99 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbafont.hxx,v $
-+ * $Revision: 1.5 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef VBAHELPER_FONTBASE_HXX
-+#define VBAHELPER_FONTBASE_HXX
-+
-+#include <cppuhelper/implbase1.hxx>
-+
-+#include <ooo/vba/XFontBase.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+// use local constants there is no need to expose these constants
-+// externally. Looking at the Format->Character dialog it seem that
-+// these may infact be even be calculated. Leave hardcoded for now
-+// #FIXEME #TBD investigate the code for dialog mentioned above
-+
-+// The font baseline is not specified.
-+const short NORMAL = 0;
-+
-+// specifies a superscripted.
-+const short SUPERSCRIPT = 33;
-+
-+// specifies a subscripted.
-+const short SUBSCRIPT = -33;
-+
-+// specifies a hight of superscripted font
-+ const sal_Int8 SUPERSCRIPTHEIGHT = 58;
-+
-+// specifies a hight of subscripted font
-+const sal_Int8 SUBSCRIPTHEIGHT = 58;
-+
-+// specifies a hight of normal font
-+const short NORMALHEIGHT = 100;
-+
-+typedef  InheritedHelperInterfaceImpl1< ov::XFontBase > VbaFontBase_BASE;
-+
-+class VBAHELPER_DLLPUBLIC VbaFontBase : public VbaFontBase_BASE
-+{
-+protected:
-+    css::uno::Reference< css::beans::XPropertySet > mxFont;
-+    css::uno::Reference< css::container::XIndexAccess > mxPalette;
-+public:
-+	VbaFontBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPalette, css::uno::Reference< css::beans::XPropertySet > xPropertySet ) throw ( css::uno::RuntimeException );
-+	virtual ~VbaFontBase();// {}
-+
-+	// Attributes
-+    virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setSize( const css::uno::Any& _size ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setBold( const css::uno::Any& _bold ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException) = 0;
-+    virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException) = 0;
-+    virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setStrikethrough( const css::uno::Any& _strikethrough ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setShadow( const css::uno::Any& _shadow ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setItalic( const css::uno::Any& _italic ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setName( const css::uno::Any& _name ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException) ;
-+    virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException) ;
-+};
-+
-+#endif
-+
-diff --git vbahelper/inc/vbahelper/vbaglobalbase.hxx vbahelper/inc/vbahelper/vbaglobalbase.hxx
-index 43c8286..f9c0d25 100644
---- vbahelper/inc/vbahelper/vbaglobalbase.hxx
-+++ vbahelper/inc/vbahelper/vbaglobalbase.hxx
-@@ -34,7 +34,7 @@
- #include <ooo/vba/XGlobalsBase.hpp>
- 
- typedef InheritedHelperInterfaceImpl1< ov::XGlobalsBase > Globals_BASE;
--class VbaGlobalsBase : public Globals_BASE
-+class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE
- 
- {
- protected:
-diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx
-index a333cf0..1849437 100644
---- vbahelper/inc/vbahelper/vbahelper.hxx
-+++ vbahelper/inc/vbahelper/vbahelper.hxx
-@@ -92,7 +92,6 @@ namespace ooo
- 	    VBAHELPER_DLLPUBLIC double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
-         VBAHELPER_DLLPUBLIC sal_Int32 getPointerStyle();
-         VBAHELPER_DLLPUBLIC void setCursorHelper( const Pointer& rPointer, sal_Bool bOverWrite );
--        VBAHELPER_DLLPUBLIC String docMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
- 
- class VBAHELPER_DLLPUBLIC Millimeter
- {
-diff --git vbahelper/inc/vbahelper/vbahelperinterface.hxx vbahelper/inc/vbahelper/vbahelperinterface.hxx
-index 389a825..3d82aaa 100644
---- vbahelper/inc/vbahelper/vbahelperinterface.hxx
-+++ vbahelper/inc/vbahelper/vbahelperinterface.hxx
-@@ -64,7 +64,7 @@
- const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) );
- 
- template< typename Ifc1 >
--class InheritedHelperInterfaceImpl : public Ifc1
-+class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl : public Ifc1
- {
- protected: 
- 	css::uno::WeakReference< ov::XHelperInterface > mxParent;
-@@ -110,7 +110,7 @@ public:
-  };
- 
- template< typename Ifc1 >
--class InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
-+class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
- 
- {
- typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base;
-diff --git vbahelper/inc/vbahelper/vbapagesetupbase.hxx vbahelper/inc/vbahelper/vbapagesetupbase.hxx
-new file mode 100644
-index 0000000..4c8a4bc
---- /dev/null
-+++ vbahelper/inc/vbahelper/vbapagesetupbase.hxx
-@@ -0,0 +1,70 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef VBA_PAGESETUPBASE_HXX
-+#define VBA_PAGESETUPBASE_HXX
-+
-+#include <cppuhelper/implbase1.hxx>
-+#include <ooo/vba/XPageSetupBase.hpp>
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ooo::vba::XPageSetupBase > VbaPageSetupBase_BASE;
-+
-+class VBAHELPER_DLLPUBLIC VbaPageSetupBase :  public VbaPageSetupBase_BASE 
-+{
-+protected:
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+    css::uno::Reference< css::beans::XPropertySet > mxPageProps;
-+    sal_Int32 mnOrientLandscape;
-+    sal_Int32 mnOrientPortrait;
-+
-+	VbaPageSetupBase( const css::uno::Reference< ov::XHelperInterface >& xParent, 
-+                    const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); 
-+public:
-+	virtual ~VbaPageSetupBase(){}
-+    
-+    // Attribute
-+	virtual double SAL_CALL getTopMargin() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setTopMargin( double margin ) throw (css::uno::RuntimeException);
-+	virtual double SAL_CALL getBottomMargin() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setBottomMargin( double margin ) throw (css::uno::RuntimeException);
-+	virtual double SAL_CALL getRightMargin() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setRightMargin( double margin ) throw (css::uno::RuntimeException);
-+	virtual double SAL_CALL getLeftMargin() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setLeftMargin( double margin ) throw (css::uno::RuntimeException);
-+	virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException);
-+	virtual double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException);
-+	virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException);
-+};
-+#endif
-diff --git vbahelper/inc/vbahelper/vbapropvalue.hxx vbahelper/inc/vbahelper/vbapropvalue.hxx
-index c782f5b..d56d799 100644
---- vbahelper/inc/vbahelper/vbapropvalue.hxx
-+++ vbahelper/inc/vbahelper/vbapropvalue.hxx
-@@ -36,7 +36,7 @@
- 
- typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE;
- 
--class PropListener 
-+class VBAHELPER_DLLPUBLIC PropListener 
- {
- public:
-     virtual void setValueEvent( const css::uno::Any& value ) = 0;
-@@ -44,7 +44,7 @@ public:
- };
- 
- 
--class ScVbaPropValue : public PropValueImpl_BASE 
-+class VBAHELPER_DLLPUBLIC ScVbaPropValue : public PropValueImpl_BASE 
- {
-     PropListener* m_pListener;
- public:
-diff --git vbahelper/inc/vbahelper/vbashape.hxx vbahelper/inc/vbahelper/vbashape.hxx
-new file mode 100644
-index 0000000..7893905
---- /dev/null
-+++ vbahelper/inc/vbahelper/vbashape.hxx
-@@ -0,0 +1,117 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbashape.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_SHAPE_HXX
-+#define SC_VBA_SHAPE_HXX
-+
-+#include <ooo/vba/office/MsoShapeType.hpp>
-+#include <com/sun/star/drawing/XShape.hpp>
-+#include <com/sun/star/drawing/XShapes.hpp>
-+#include <com/sun/star/lang/XEventListener.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <ooo/vba/msforms/XShape.hpp>
-+#include <ooo/vba/msforms/XLineFormat.hpp>
-+#include <cppuhelper/implbase2.hxx>
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef  ::cppu::WeakImplHelper2< ov::msforms::XShape, css::lang::XEventListener > ListeningShape;
-+
-+typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE;
-+
-+class VBAHELPER_DLLPUBLIC ScVbaShape : public ScVbaShape_BASE
-+{
-+private:
-+protected:
-+    std::auto_ptr< ov::ShapeHelper > m_pShapeHelper;
-+    css::uno::Reference< css::drawing::XShape > m_xShape;
-+    css::uno::Reference< css::drawing::XShapes > m_xShapes;
-+    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
-+    sal_Int32 m_nType;
-+    css::uno::Any m_aRange;
-+	virtual void addListeners();
-+	virtual void removeShapeListener() throw( css::uno::RuntimeException );
-+	virtual void removeShapesListener() throw( css::uno::RuntimeException );
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+public:
-+    ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, sal_Int32 nType ) throw ( css::lang::IllegalArgumentException );
-+    ScVbaShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape ) throw ( css::lang::IllegalArgumentException );
-+    virtual ~ScVbaShape();
-+    css::uno::Any getRange() { return m_aRange; };
-+    void setRange( css::uno::Any aRange ) { m_aRange = aRange; };
-+
-+    static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException);
-+
-+    // Attributes
-+    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
-+    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getZOrderPosition() throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getRotation() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setRotation( double _rotation ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::msforms::XPictureFormat > SAL_CALL getPictureFormat() throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getLockAspectRatio() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getLockAnchor() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLockAnchor( ::sal_Bool _lockanchor ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (css::uno::RuntimeException);
-+
-+    // Methods
-+    virtual css::uno::Any SAL_CALL SAL_CALL TextFrame(  ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat(  ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL Delete() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL ScaleHeight( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL ScaleWidth( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException);
-+    // Replace??
-+    virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL ShapeRange( const css::uno::Any& index ) throw ( css::uno::RuntimeException );
-+    // XEventListener
-+    virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) throw( css::uno::RuntimeException );
-+};
-+#endif//SC_VBA_SHAPE_HXX
-diff --git vbahelper/inc/vbahelper/vbashaperange.hxx vbahelper/inc/vbahelper/vbashaperange.hxx
-new file mode 100644
-index 0000000..af39456
---- /dev/null
-+++ vbahelper/inc/vbahelper/vbashaperange.hxx
-@@ -0,0 +1,88 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbashaperange.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_SHAPERANGE_HXX
-+#define SC_VBA_SHAPERANGE_HXX
-+
-+#include <com/sun/star/drawing/XShapes.hpp>
-+#include <ooo/vba/msforms/XShapeRange.hpp>
-+#include <com/sun/star/drawing/XDrawPage.hpp>
-+#include <vbahelper/vbacollectionimpl.hxx>
-+#include <ooo/vba/msforms/XLineFormat.hpp>
-+#include <ooo/vba/msforms/XFillFormat.hpp>
-+
-+typedef CollTestImplHelper< ov::msforms::XShapeRange > ScVbaShapeRange_BASE;
-+
-+class VBAHELPER_DLLPUBLIC ScVbaShapeRange : public ScVbaShapeRange_BASE
-+{
-+private:
-+    css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage;
-+    css::uno::Reference< css::drawing::XShapes > m_xShapes;
-+    sal_Int32 m_nShapeGroupCount;
-+protected:
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+	css::uno::Reference< css::drawing::XShapes > getShapes() throw (css::uno::RuntimeException) ;
-+public:
-+    ScVbaShapeRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XDrawPage>& xDrawShape );
-+
-+    // Methods
-+    virtual void SAL_CALL Select(  ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ::ooo::vba::msforms::XShape > SAL_CALL Group() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException) ;
-+    virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getLockAspectRatio() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getLockAnchor() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setLockAnchor( ::sal_Bool _lockanchor ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL SAL_CALL TextFrame(  ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat(  ) throw (css::uno::RuntimeException);
-+    //XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); 
-+    // ScVbaCollectionBaseImpl
-+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-+};
-+
-+#endif//SC_VBA_SHAPERANGE_HXX
-diff --git vbahelper/inc/vbahelper/vbashapes.hxx vbahelper/inc/vbahelper/vbashapes.hxx
-new file mode 100644
-index 0000000..597f97b
---- /dev/null
-+++ vbahelper/inc/vbahelper/vbashapes.hxx
-@@ -0,0 +1,83 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbashapes.hxx,v $
-+ * $Revision: 1.3.32.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_SHAPES_HXX
-+#define SC_VBA_SHAPES_HXX
-+
-+#include <com/sun/star/drawing/XShapes.hpp>
-+#include <com/sun/star/drawing/XDrawPage.hpp>
-+#include <com/sun/star/container/XIndexAccess.hpp>
-+#include <ooo/vba/msforms/XShapes.hpp>
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+#include <vbahelper/vbacollectionimpl.hxx>
-+
-+typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE;
-+
-+class VBAHELPER_DLLPUBLIC ScVbaShapes : public ScVbaShapes_BASE
-+{
-+private: 
-+    css::uno::Reference< css::drawing::XShapes > m_xShapes;
-+    css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage;
-+    sal_Int32 m_nNewShapeCount;
-+    void initBaseCollection();
-+protected:
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+	virtual css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
-+    css::uno::Reference< css::drawing::XShape > createShape( rtl::OUString service ) throw (css::uno::RuntimeException);
-+    css::uno::Any AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException);
-+    css::uno::Any AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException);
-+    css::uno::Any AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException);
-+    rtl::OUString createName( rtl::OUString sName );
-+    css::uno::Any AddShape( const rtl::OUString& sService, const rtl::OUString& sName, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException);
-+    //TODO helperapi using a writer document
-+    //css::awt::Point calculateTopLeftMargin( css::uno::Reference< ov::XHelperInterface > xDocument );
-+    
-+public:
-+    ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes );
-+    static void setDefaultShapeProperties( css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException);
-+    static void setShape_NameProperty( css::uno::Reference< css::drawing::XShape > xShape, rtl::OUString sName );
-+    //XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+
-+    virtual void SAL_CALL SelectAll() throw (css::uno::RuntimeException);
-+    //helper::calc
-+    virtual css::uno::Any SAL_CALL AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::msforms::XShapeRange > SAL_CALL Range( const css::uno::Any& shapes ) throw (css::uno::RuntimeException);
-+    // ScVbaCollectionBaseImpl
-+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException);
-+};
-+
-+#endif//SC_VBA_SHAPES_HXX
-diff --git vbahelper/inc/vbahelper/vbatextframe.hxx vbahelper/inc/vbahelper/vbatextframe.hxx
-new file mode 100644
-index 0000000..0b7d9ec
---- /dev/null
-+++ vbahelper/inc/vbahelper/vbatextframe.hxx
-@@ -0,0 +1,70 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbatextframe.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef VBA_TEXTFRAME_HXX
-+#define VBA_TEXTFRAME_HXX
-+#include <ooo/vba/msforms/XTextFrame.hpp>
-+#include <com/sun/star/drawing/XShape.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ov::msforms::XTextFrame > VbaTextFrame_BASE;
-+
-+class VBAHELPER_DLLPUBLIC VbaTextFrame : public VbaTextFrame_BASE
-+{
-+protected:    
-+    css::uno::Reference< css::drawing::XShape > m_xShape;
-+    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
-+protected:
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+    virtual void setAsMSObehavior();
-+    sal_Int32 getMargin( rtl::OUString sMarginType );
-+    void setMargin( rtl::OUString sMarginType, float fMargin );
-+public:
-+    VbaTextFrame( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext , css::uno::Reference< css::drawing::XShape > xShape);
-+    virtual ~VbaTextFrame() {}
-+    // Attributes
-+    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setAutoSize( sal_Bool _autosize ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getMarginBottom() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMarginBottom( float _marginbottom ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getMarginTop() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMarginTop( float _margintop ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getMarginLeft() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMarginLeft( float _marginleft ) throw (css::uno::RuntimeException);
-+    virtual float SAL_CALL getMarginRight() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setMarginRight( float _marginright ) throw (css::uno::RuntimeException);
-+
-+    // Methods
-+    virtual css::uno::Any SAL_CALL Characters(  ) throw (css::uno::RuntimeException);
-+
-+};
-+
-+#endif//SC_VBA_TEXTFRAME_HXX
-diff --git vbahelper/inc/vbahelper/vbawindowbase.hxx vbahelper/inc/vbahelper/vbawindowbase.hxx
-index ad35a98..508f9d2 100644
---- vbahelper/inc/vbahelper/vbawindowbase.hxx
-+++ vbahelper/inc/vbahelper/vbawindowbase.hxx
-@@ -38,7 +38,7 @@
- 
- typedef InheritedHelperInterfaceImpl1<ov::XWindowBase > WindowBaseImpl_BASE;
- 
--class VbaWindowBase : public WindowBaseImpl_BASE
-+class VBAHELPER_DLLPUBLIC VbaWindowBase : public WindowBaseImpl_BASE
- {		
- protected:		
- 	css::uno::Reference< css::frame::XModel > m_xModel;
-diff --git vbahelper/prj/d.lst vbahelper/prj/d.lst
-index e06c9d1..d7b61d1 100644
---- vbahelper/prj/d.lst
-+++ vbahelper/prj/d.lst
-@@ -1,6 +1,6 @@
- ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
- ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
--..\%__SRC%\slb\vbahelper.lib %_DEST%\lib%_EXT%\vbahelper.lib
-+..\%__SRC%\lib\ivbahelper.lib %_DEST%\lib%_EXT%\vbahelper.lib
- ..\%__SRC%\lib\vbahelp*.* %_DEST%\lib%_EXT%\vba*.*
- ..\%__SRC%\bin\vbahelper*.* %_DEST%\bin%_EXT%\vbahelper*.*
- ..\%__SRC%\bin\msforms*.* %_DEST%\bin%_EXT%\msforms*.*
-@@ -11,8 +11,17 @@ mkdir: %_DEST%\inc%_EXT%\basic
- ..\inc\vbahelper\helperdecl.hxx %_DEST%\inc%_EXT%\vbahelper\helperdecl.hxx
- ..\inc\vbahelper\vbahelperinterface.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelperinterface.hxx
- ..\inc\vbahelper\vbaapplicationbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaapplicationbase.hxx
-+..\inc\vbahelper\vbafontbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbafontbase.hxx
- ..\inc\vbahelper\vbadllapi.h %_DEST%\inc%_EXT%\vbahelper\vbadllapi.h
- ..\inc\vbahelper\vbawindowbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbawindowbase.hxx
- ..\inc\vbahelper\vbadocumentbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentbase.hxx
-+..\inc\vbahelper\vbadocumentsbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentsbase.hxx
- ..\inc\vbahelper\vbapropvalue.hxx %_DEST%\inc%_EXT%\vbahelper\vbapropvalue.hxx
- ..\inc\vbahelper\vbaglobalbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaglobalbase.hxx
-+..\inc\vbahelper\vbadialogbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadialogbase.hxx
-+..\inc\vbahelper\vbadialogsbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadialogsbase.hxx
-+..\inc\vbahelper\vbashape.hxx %_DEST%\inc%_EXT%\vbahelper\vbashape.hxx
-+..\inc\vbahelper\vbashapes.hxx %_DEST%\inc%_EXT%\vbahelper\vbashapes.hxx
-+..\inc\vbahelper\vbatextframe.hxx %_DEST%\inc%_EXT%\vbahelper\vbatextframe.hxx
-+..\inc\vbahelper\vbashaperange.hxx %_DEST%\inc%_EXT%\vbahelper\vbashaperange.hxx
-+..\inc\vbahelper\vbapagesetupbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbapagesetupbase.hxx
-diff --git vbahelper/source/msforms/vbacontrol.cxx vbahelper/source/msforms/vbacontrol.cxx
-index 100c2b3..3503631 100644
---- vbahelper/source/msforms/vbacontrol.cxx
-+++ vbahelper/source/msforms/vbacontrol.cxx
-@@ -361,6 +361,22 @@ ScVbaControl::setName( const rtl::OUString& _name ) throw (uno::RuntimeException
- 	m_xProps->setPropertyValue
-             (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), uno::makeAny( _name ) );
-     }
-+
-+rtl::OUString SAL_CALL 
-+ScVbaControl::getControlTipText() throw (css::uno::RuntimeException)
-+{
-+	rtl::OUString sName;
-+	m_xProps->getPropertyValue
-+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) ) ) >>= sName;
-+	return sName;
-+}
-+
-+void SAL_CALL 
-+ScVbaControl::setControlTipText( const rtl::OUString& rsToolTip ) throw (css::uno::RuntimeException)
-+{
-+	m_xProps->setPropertyValue
-+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) ), uno::makeAny( rsToolTip ) );
-+}
- //ScVbaControlFactory
- 
- ScVbaControlFactory::ScVbaControlFactory( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel ): m_xContext( xContext ), m_xControl( xControl ), m_xModel( xModel )
-diff --git vbahelper/source/msforms/vbacontrol.hxx vbahelper/source/msforms/vbacontrol.hxx
-index e7593e8..3c9a128 100644
---- vbahelper/source/msforms/vbacontrol.hxx
-+++ vbahelper/source/msforms/vbacontrol.hxx
-@@ -86,6 +86,8 @@ public:
-     virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
-     virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
-+    virtual rtl::OUString SAL_CALL getControlTipText() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setControlTipText( const rtl::OUString& ) throw (css::uno::RuntimeException);
-     //remove resouce because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape
-     virtual void removeResouce() throw( css::uno::RuntimeException );
-     //XHelperInterface
-diff --git vbahelper/source/msforms/vbalistbox.cxx vbahelper/source/msforms/vbalistbox.cxx
-index 39eb251..47f9847 100644
---- vbahelper/source/msforms/vbalistbox.cxx
-+++ vbahelper/source/msforms/vbalistbox.cxx
-@@ -53,7 +53,8 @@ ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeExceptio
- {
-     sal_Int32 nIndex = 0;
-     _value >>= nIndex;
--    Selected( nIndex );
-+    uno::Reference< XPropValue > xPropVal( Selected( nIndex ), uno::UNO_QUERY_THROW );
-+    xPropVal->setValue( uno::makeAny( sal_True ) ); 
- }
- 
- uno::Any SAL_CALL 
-@@ -224,7 +225,8 @@ ScVbaListBox::setValueEvent( const uno::Any& value )
-             nList.realloc( 1 );
-             nList[0] = nIndex;
-         }
--        m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
-+        //m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
-+        m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nList ) );
-     }
- }
- 
-diff --git vbahelper/source/msforms/vbatextbox.hxx vbahelper/source/msforms/vbatextbox.hxx
-index 3abe491..4e26f6f 100644
---- vbahelper/source/msforms/vbatextbox.hxx
-+++ vbahelper/source/msforms/vbatextbox.hxx
-@@ -29,12 +29,12 @@
-  ************************************************************************/
- #ifndef SC_VBA_TEXTBOX_HXX
- #define SC_VBA_TEXTBOX_HXX
--#include <cppuhelper/implbase1.hxx>
-+#include <cppuhelper/implbase2.hxx>
- #include <ooo/vba/msforms/XTextBox.hpp>
- #include "vbacontrol.hxx"
- #include <vbahelper/vbahelper.hxx>
- 
--typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XTextBox > TextBoxImpl_BASE;
-+typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XTextBox, css::script::XDefaultProperty > TextBoxImpl_BASE;
- 
- class ScVbaTextBox : public TextBoxImpl_BASE
- {
-@@ -50,6 +50,8 @@ public:
-     virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException);
-     virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException);
-+    // XDefaultProperty
-+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
-     //XHelperInterface
-     virtual rtl::OUString& getServiceImplName();
-     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-diff --git vbahelper/source/msforms/vbauserform.cxx vbahelper/source/msforms/vbauserform.cxx
-index 775b539..fef36db 100644
---- vbahelper/source/msforms/vbauserform.cxx
-+++ vbahelper/source/msforms/vbauserform.cxx
-@@ -72,6 +72,7 @@ ScVbaUserForm::Show(  ) throw (uno::RuntimeException)
- {
- 	OSL_TRACE("ScVbaUserForm::Show(  )");
- 	short aRet = 0;
-+        mbDispose = true;
- 	if ( m_xDialog.is() )
- 		aRet = m_xDialog->execute();
- 	OSL_TRACE("ScVbaUserForm::Show() execute returned %d", aRet);
-diff --git vbahelper/source/vbahelper/makefile.mk vbahelper/source/vbahelper/makefile.mk
-index 8f5862a..61155e6 100644
---- vbahelper/source/vbahelper/makefile.mk
-+++ vbahelper/source/vbahelper/makefile.mk
-@@ -31,7 +31,7 @@
- 
- PRJ=..$/../
- PRJNAME=vbahelper
--TARGET=vbahelper
-+TARGET=vbahelperbits
- 
- ENABLE_EXCEPTIONS := TRUE
- 
-@@ -49,7 +49,20 @@ SLOFILES=\
-     $(SLO)$/vbaapplicationbase.obj \
-     $(SLO)$/vbawindowbase.obj \
-     $(SLO)$/vbadocumentbase.obj \
-+    $(SLO)$/vbadocumentsbase.obj \
-     $(SLO)$/vbaglobalbase.obj \
-+    $(SLO)$/vbafontbase.obj \
-+    $(SLO)$/vbadialogbase.obj \
-+    $(SLO)$/vbadialogsbase.obj \
-+    $(SLO)$/vbashape.obj \
-+    $(SLO)$/vbacolorformat.obj \
-+    $(SLO)$/vbashapes.obj \
-+    $(SLO)$/vbalineformat.obj \
-+    $(SLO)$/vbafillformat.obj \
-+    $(SLO)$/vbapictureformat.obj \
-+    $(SLO)$/vbashaperange.obj \
-+    $(SLO)$/vbatextframe.obj \
-+    $(SLO)$/vbapagesetupbase.obj \
- 
- # --- Targets -------------------------------------------------------
- 
-diff --git vbahelper/source/vbahelper/vbaapplicationbase.cxx vbahelper/source/vbahelper/vbaapplicationbase.cxx
-index b6a8dee..a424b35 100644
---- vbahelper/source/vbahelper/vbaapplicationbase.cxx
-+++ vbahelper/source/vbahelper/vbaapplicationbase.cxx
-@@ -35,13 +35,21 @@
- #include "vbahelper/vbaapplicationbase.hxx"
- #include <com/sun/star/container/XIndexAccess.hpp>
- #include <com/sun/star/frame/XLayoutManager.hpp>
-+#include <com/sun/star/frame/XDesktop.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
-+#include <com/sun/star/document/XDocumentProperties.hpp>
-+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
- 
- #include "vbacommandbars.hxx"
-+#include <svx/msvbahelper.hxx>
- 
- using namespace com::sun::star;
- using namespace ooo::vba;
- 
--VbaApplicationBase::VbaApplicationBase( const uno::Reference< css::uno::XComponentContext >& xContext )
-+#define OFFICEVERSION "11.0"
-+
-+VbaApplicationBase::VbaApplicationBase( const uno::Reference< uno::XComponentContext >& xContext )
-                     : ApplicationBase_BASE( uno::Reference< XHelperInterface >(), xContext )
- {
- }
-@@ -118,6 +126,251 @@ VbaApplicationBase::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeExc
-     return uno::makeAny( xCommandBars );
- }
- 
-+::rtl::OUString SAL_CALL
-+VbaApplicationBase::getVersion() throw (uno::RuntimeException)
-+{
-+	return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(OFFICEVERSION));
-+}
-+
-+void SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException)
-+{
-+    // parse the macro name
-+    sal_Int32 nDocSepIndex = MacroName.indexOfAsciiL( "!", 1 );
-+    String sMacroUrl = MacroName;
-+    uno::Reference< frame::XModel > xModel;
-+    if( nDocSepIndex > 0 )
-+    {
-+        rtl::OUString sTemplate = MacroName.copy( 0, nDocSepIndex );
-+        OSL_TRACE("VbaApplicationBase::Run, template name: %s", rtl::OUStringToOString( sTemplate, RTL_TEXTENCODING_UTF8 ).getStr() );
-+        sMacroUrl = MacroName.copy( nDocSepIndex + 1 );
-+        OSL_TRACE("VbaApplicationBase::Run, macro name: %s", rtl::OUStringToOString( sMacroUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-+        // get the template model
-+		uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+
-+		uno::Reference< frame::XDesktop > xDesktop
-+			(xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), mxContext), uno::UNO_QUERY_THROW );
-+		uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration();
-+        sal_Int32 nCount = 0;
-+		while( mxComponents->hasMoreElements() )
-+		{
-+            uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( mxComponents->nextElement(), uno::UNO_QUERY );
-+            if( xDocInfoSupp.is() )
-+            {
-+                uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
-+                uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
-+                rtl::OUString sCurrName = xDocProps->getTemplateName();
-+                OSL_TRACE("VbaApplicationBase::Run, current template %d name: %s", ++nCount, rtl::OUStringToOString( sCurrName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+                // FIXME: should be check the full path of the template
-+                if( sTemplate.lastIndexOf( sCurrName ) >= 0 )
-+                {
-+                    xModel.set( xDocInfoSupp, uno::UNO_QUERY_THROW );
-+                    break;
-+                }
-+            }
-+        }
-+    }
-+    else
-+    {
-+        xModel = getCurrentDocument();
-+    }
-+
-+    if( !xModel.is() )
-+    {
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Fail to find the template in Application.Run") ), uno::Reference< uno::XInterface >() );
-+    }
-+
-+    String sMacro;
-+    String sModule;
-+    sal_Int32 nTokens = sMacroUrl.GetTokenCount( '.' );
-+    xub_StrLen nToken = 0;
-+    xub_StrLen nIndex = 0;
-+    // only support ThisModule.ThisMacro
-+    if( nTokens == 2 )
-+    {
-+        sModule = sMacroUrl.GetToken( nToken, '.', nIndex );
-+        sMacro = sMacroUrl.GetToken( nToken, '.', nIndex );
-+    }
-+    else
-+    {
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("The macro doesn't exist") ), uno::Reference< uno::XInterface >() );
-+    }
-+
-+    SfxObjectShell* pShell = GetDocShell( xModel );
-+    if( pShell )
-+    {
-+        sMacroUrl = findVBAMacro( pShell, sModule, sMacro );
-+        if( sMacroUrl.Len() )
-+        {
-+            // handle the arguments
-+            uno::Sequence< uno::Any > aArgs;
-+            if( varg1.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg1;
-+            }
-+            if( varg2.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg2;
-+            }
-+            if( varg3.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg3;
-+            }
-+            if( varg4.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg4;
-+            }
-+            if( varg5.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg5;
-+            }
-+            if( varg6.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg6;
-+            }
-+            if( varg7.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg7;
-+            }
-+            if( varg8.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg8;
-+            }
-+            if( varg9.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg9;
-+            }
-+            if( varg10.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg10;
-+            }
-+            if( varg11.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg11;
-+            }
-+            if( varg12.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg12;
-+            }
-+            if( varg13.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg13;
-+            }
-+            if( varg14.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg14;
-+            }
-+            if( varg15.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg15;
-+            }
-+            if( varg16.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg16;
-+            }
-+            if( varg17.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg17;
-+            }
-+            if( varg18.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg18;
-+            }
-+            if( varg19.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg19;
-+            }
-+            if( varg20.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg20;
-+            }
-+            if( varg21.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg21;
-+            }
-+            if( varg22.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg22;
-+            }
-+            if( varg23.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg23;
-+            }
-+            if( varg24.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg24;
-+            }
-+            if( varg25.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg25;
-+            }
-+            if( varg26.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg26;
-+            }
-+            if( varg27.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg27;
-+            }
-+            if( varg28.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg28;
-+            }
-+            if( varg29.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg29;
-+            }
-+            if( varg30.hasValue() )
-+            {
-+                aArgs.realloc( aArgs.getLength() + 1 );
-+                aArgs[ aArgs.getLength() ] =  varg30;
-+            }
-+            uno::Any aRet;
-+            executeMacro( pShell, sMacroUrl, aArgs, aRet );
-+        }
-+        else
-+        {
-+            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("The macro doesn't exist") ), uno::Reference< uno::XInterface >() );
-+        }
-+    }
-+}
-+
-+float SAL_CALL VbaApplicationBase::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException)
-+{
-+    // i cm = 28.35 points
-+    static const float rate = 28.35;
-+    return ( _Centimeters * rate );
-+}
-+
- rtl::OUString& 
- VbaApplicationBase::getServiceImplName()
- {
-diff --git vbahelper/source/vbahelper/vbacolorformat.cxx vbahelper/source/vbahelper/vbacolorformat.cxx
-new file mode 100644
-index 0000000..d2ce12b
---- /dev/null
-+++ vbahelper/source/vbahelper/vbacolorformat.cxx
-@@ -0,0 +1,190 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbacolorformat.cxx,v $
-+ * $Revision: 1.3.146.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <ooo/vba/msforms/XLineFormat.hpp>
-+#include "vbacolorformat.hxx"
-+
-+using namespace ooo::vba;
-+using namespace com::sun::star;
-+
-+sal_Int32
-+MsoColorIndizes::getColorIndex( sal_Int32 nIndex )
-+{
-+    const static sal_Int32 COLORINDIZES[56] =
-+    {   HAPICOLOR_BLACK, HAPICOLOR_WITHE, HAPICOLOR_RED, HAPICOLOR_BRIGHTGREEN, HAPICOLOR_BLUE, HAPICOLOR_YELLOW, HAPICOLOR_PINK,
-+        HAPICOLOR_TURQUOISE, HAPICOLOR_DARKRED, HAPICOLOR_GREEN, HAPICOLOR_DARKBLUE, HAPICOLOR_DARKYELLOW, HAPICOLOR_VIOLET,
-+        HAPICOLOR_TEAL, HAPICOLOR_GRAY_25_PERCENT, HAPICOLOR_GRAY_50_PERCENT, HAPICOLOR_PERIWINCKLE, HAPICOLOR_PLUM,
-+        HAPICOLOR_IVORY, HAPICOLOR_LIGHTTURQUOISE, HAPICOLOR_DARKPRUPLE, HAPICOLOR_CORAL, HAPICOLOR_OCEANBLUE, HAPICOLOR_ICEBLUE,
-+        HAPICOLOR_GREEN, HAPICOLOR_PINK, HAPICOLOR_YELLOW, HAPICOLOR_TURQUOISE, HAPICOLOR_VIOLET, HAPICOLOR_DARKRED, HAPICOLOR_TEAL,
-+        HAPICOLOR_BLUE, HAPICOLOR_SKYBLUE, HAPICOLOR_LIGHTTURQUOISE, HAPICOLOR_LIGHTGREEN, HAPICOLOR_LIGHTYELLOW, HAPICOLOR_PALEBLUE,
-+        HAPICOLOR_ROSE, HAPICOLOR_LAVENDER, HAPICOLOR_TAN, HAPICOLOR_LIGHTBLUE, HAPICOLOR_AQUA, HAPICOLOR_LIME, HAPICOLOR_GOLD,
-+        HAPICOLOR_LIGHTORANGE, HAPICOLOR_ORANGE, HAPICOLOR_BLUEGRAY, HAPICOLOR_GRAY_40_PERCENT, HAPICOLOR_DARKTEAL,
-+        HAPICOLOR_SEAGREEN, HAPICOLOR_NONAME, HAPICOLOR_OLIVEGREEN, HAPICOLOR_BROWN, HAPICOLOR_PLUM, HAPICOLOR_INDIGO,
-+        HAPICOLOR_GRAY_80_PERCENT
-+    };
-+    return COLORINDIZES[nIndex];
-+}
-+ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XHelperInterface > xInternalParent, const uno::Reference< drawing::XShape > xShape, const sal_Int16 nColorFormatType ) : ScVbaColorFormat_BASE( xParent, xContext ), m_xInternalParent( xInternalParent ), m_xShape( xShape ), m_nColorFormatType( nColorFormatType )
-+{
-+    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
-+    m_nFillFormatBackColor = 0;
-+    try
-+    {
-+        uno::Reference< ov::msforms::XFillFormat > xFillFormat( xInternalParent, uno::UNO_QUERY_THROW );
-+        m_pFillFormat = ( ScVbaFillFormat* )( xFillFormat.get() );
-+    }catch ( uno::RuntimeException  e )
-+    {
-+        m_pFillFormat = NULL;
-+    }
-+}
-+
-+void
-+ScVbaColorFormat::setColorFormat( sal_Int16 _ntype )
-+{
-+    m_nColorFormatType = _ntype;
-+}
-+
-+// Attribute
-+sal_Int32 SAL_CALL 
-+ScVbaColorFormat::getRGB() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nRGB = 0;
-+    switch( m_nColorFormatType )
-+    {
-+    case ColorFormatType::LINEFORMAT_FORECOLOR:
-+        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LineColor") ) >>= nRGB;
-+        break;
-+    case ColorFormatType::LINEFORMAT_BACKCOLOR:
-+        //TODO BackColor not supported
-+        // m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("Color"), uno::makeAny( nRGB ) );
-+        break;
-+    case ColorFormatType::FILLFORMAT_FORECOLOR:
-+        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillColor") ) >>= nRGB;
-+        break;
-+    case ColorFormatType::FILLFORMAT_BACKCOLOR:
-+        nRGB = m_nFillFormatBackColor;
-+        break;
-+    default:
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() );
-+    }
-+    nRGB = OORGBToXLRGB( nRGB );
-+    return nRGB;
-+}
-+
-+void SAL_CALL 
-+ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nRGB = XLRGBToOORGB( _rgb );
-+    switch( m_nColorFormatType )
-+    {
-+    case ColorFormatType::LINEFORMAT_FORECOLOR:
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineColor" ), uno::makeAny( nRGB ) );
-+        break;
-+    case ColorFormatType::LINEFORMAT_BACKCOLOR:
-+        // TODO BackColor not supported
-+        break;
-+    case ColorFormatType::FILLFORMAT_FORECOLOR:
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillColor" ), uno::makeAny( nRGB ) );
-+        if( m_pFillFormat )
-+        {
-+            m_pFillFormat->setForeColorAndInternalStyle(nRGB);
-+        }
-+        break;
-+    case ColorFormatType::FILLFORMAT_BACKCOLOR:
-+        m_nFillFormatBackColor = nRGB;
-+        if( m_pFillFormat )
-+        {
-+            m_pFillFormat->setForeColorAndInternalStyle(nRGB);
-+        }
-+        break;
-+    default:    
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() );
-+    }
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nColor = getRGB();
-+    // #TODO I guess the number of elements is determined by the correct scheme
-+    // the implementation here seems to be a rehash of color index ( which seems to be a 
-+    // different thing ) - I would guess we need to know/import etc. the correct color scheme
-+    // or at least find out a little more
-+    sal_Int32 i = 0;
-+    for( ; i < 56; i++ )
-+    {
-+        if( nColor == MsoColorIndizes::getColorIndex(i) )
-+	   break;
-+    }
-+
-+    if( i == 56 ) // this is most likely an error condition
-+        --i;
-+    return i; 
-+    // #TODO figure out what craziness is this, 
-+    // the 56 colors seems incorrect, as in default XL ( 2003 ) there are 80 colors
-+/*
-+    if( i == 56 )
-+    {
-+        i = -2;
-+    }
-+
-+    return ( i + 2 );
-+*/
-+}
-+
-+void SAL_CALL 
-+ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor ) throw (uno::RuntimeException)
-+{
-+    // the table is 0 based
-+    sal_Int32 nColor = MsoColorIndizes::getColorIndex( _schemecolor );
-+    // nColor is already xl RGB
-+    setRGB( nColor );
-+}
-+
-+
-+rtl::OUString&
-+ScVbaColorFormat::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaColorFormat") );
-+    return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString >
-+ScVbaColorFormat::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ColorFormat" ) );
-+    }
-+    return aServiceNames;
-+}
-+
-diff --git vbahelper/source/vbahelper/vbacolorformat.hxx vbahelper/source/vbahelper/vbacolorformat.hxx
-new file mode 100644
-index 0000000..a45d5d8
---- /dev/null
-+++ vbahelper/source/vbahelper/vbacolorformat.hxx
-@@ -0,0 +1,128 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbacolorformat.hxx,v $
-+ * $Revision: 1.3.146.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_XCOLORFORMAT_HXX
-+#define SC_VBA_XCOLORFORMAT_HXX
-+
-+#include <com/sun/star/drawing/XShape.hpp>
-+#include <ooo/vba/msforms/XColorFormat.hpp>
-+#include <ooo/vba/msforms/XFillFormat.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include "vbafillformat.hxx"
-+
-+typedef InheritedHelperInterfaceImpl1< ov::msforms::XColorFormat > ScVbaColorFormat_BASE;
-+
-+class ColorFormatType
-+{
-+public:
-+    const static sal_Int16 LINEFORMAT_FORECOLOR = 1;
-+    const static sal_Int16 LINEFORMAT_BACKCOLOR = 2;
-+    const static sal_Int16 FILLFORMAT_FORECOLOR = 3;
-+    const static sal_Int16 FILLFORMAT_BACKCOLOR = 4;
-+    const static sal_Int16 THREEDFORMAT_EXTRUSIONCOLOR = 5;
-+};
-+
-+struct MsoColorIndizes
-+{
-+    const static sal_Int32 HAPICOLOR_BLACK = 0;
-+    const static sal_Int32 HAPICOLOR_WITHE = 16777215;
-+    const static sal_Int32 HAPICOLOR_RED = 16711680;
-+    const static sal_Int32 HAPICOLOR_BRIGHTGREEN = 65280;
-+    const static sal_Int32 HAPICOLOR_BLUE = 255;
-+    const static sal_Int32 HAPICOLOR_YELLOW = 16776960;
-+    const static sal_Int32 HAPICOLOR_PINK = 16711935;
-+    const static sal_Int32 HAPICOLOR_TURQUOISE = 65535;
-+    const static sal_Int32 HAPICOLOR_DARKRED = 8388608;
-+    const static sal_Int32 HAPICOLOR_GREEN = 32768;
-+    const static sal_Int32 HAPICOLOR_DARKBLUE = 128;
-+    const static sal_Int32 HAPICOLOR_DARKYELLOW = 8421376;
-+    const static sal_Int32 HAPICOLOR_VIOLET = 8388736;
-+    const static sal_Int32 HAPICOLOR_TEAL = 32896;
-+    const static sal_Int32 HAPICOLOR_GRAY_25_PERCENT = 12632256;
-+    const static sal_Int32 HAPICOLOR_GRAY_50_PERCENT = 8421504;
-+    const static sal_Int32 HAPICOLOR_PERIWINCKLE = 10066431;
-+    const static sal_Int32 HAPICOLOR_PLUM = 10040166;
-+    const static sal_Int32 HAPICOLOR_IVORY = 16777164;
-+    const static sal_Int32 HAPICOLOR_LIGHTTURQUOISE = 13434879;
-+    const static sal_Int32 HAPICOLOR_DARKPRUPLE = 6684774;
-+    const static sal_Int32 HAPICOLOR_CORAL = 16744576;
-+    const static sal_Int32 HAPICOLOR_OCEANBLUE = 26316;
-+    const static sal_Int32 HAPICOLOR_ICEBLUE = 13421823;
-+    const static sal_Int32 HAPICOLOR_SKYBLUE = 52479;
-+    const static sal_Int32 HAPICOLOR_LIGHTGREEN = 13434828;
-+    const static sal_Int32 HAPICOLOR_LIGHTYELLOW = 16777113;
-+    const static sal_Int32 HAPICOLOR_PALEBLUE = 10079487;
-+    const static sal_Int32 HAPICOLOR_ROSE = 16751052;
-+    const static sal_Int32 HAPICOLOR_LAVENDER = 13408767;
-+    const static sal_Int32 HAPICOLOR_TAN = 16764057;
-+    const static sal_Int32 HAPICOLOR_LIGHTBLUE = 3368703;
-+    const static sal_Int32 HAPICOLOR_AQUA = 3394764;
-+    const static sal_Int32 HAPICOLOR_LIME = 10079232;
-+    const static sal_Int32 HAPICOLOR_GOLD = 16763904;
-+    const static sal_Int32 HAPICOLOR_LIGHTORANGE = 16750848;
-+    const static sal_Int32 HAPICOLOR_ORANGE = 16737792;
-+    const static sal_Int32 HAPICOLOR_BLUEGRAY = 6710937;
-+    const static sal_Int32 HAPICOLOR_GRAY_40_PERCENT = 9868950;
-+    const static sal_Int32 HAPICOLOR_DARKTEAL = 13158;
-+    const static sal_Int32 HAPICOLOR_SEAGREEN = 3381606;
-+    const static sal_Int32 HAPICOLOR_NONAME = 13056;
-+    const static sal_Int32 HAPICOLOR_OLIVEGREEN = 3355392;
-+    const static sal_Int32 HAPICOLOR_BROWN = 10040064;
-+    const static sal_Int32 HAPICOLOR_INDIGO = 3355545;
-+    const static sal_Int32 HAPICOLOR_GRAY_80_PERCENT = 3355443;
-+
-+    static sal_Int32 getColorIndex( sal_Int32 nIndex );
-+    
-+};
-+
-+class ScVbaColorFormat : public ScVbaColorFormat_BASE
-+{
-+private:
-+    css::uno::Reference< ov::XHelperInterface > m_xInternalParent;
-+    css::uno::Reference< css::drawing::XShape > m_xShape;
-+    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
-+    ScVbaFillFormat *m_pFillFormat;
-+    sal_Int16 m_nColorFormatType;
-+    sal_Int32 m_nFillFormatBackColor;
-+protected:
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+    void setColorFormat( sal_Int16 nType );
-+public:
-+    ScVbaColorFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XHelperInterface > xInternalParent, const css::uno::Reference< css::drawing::XShape > xShape, const sal_Int16 nColorFormatType );
-+
-+    // Attributes
-+    virtual sal_Int32 SAL_CALL getRGB() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setRGB( sal_Int32 _rgb ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getSchemeColor() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setSchemeColor( sal_Int32 _schemecolor ) throw (css::uno::RuntimeException);
-+
-+};
-+
-+#endif//SC_VBA_XCOLORFORMAT_HXX
-diff --git vbahelper/source/vbahelper/vbadialogbase.cxx vbahelper/source/vbahelper/vbadialogbase.cxx
-new file mode 100644
-index 0000000..205442e
---- /dev/null
-+++ vbahelper/source/vbahelper/vbadialogbase.cxx
-@@ -0,0 +1,52 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadialog.cxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <vbahelper/vbadialogbase.hxx>
-+#include <vbahelper/vbahelper.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+// fails silently
-+void
-+VbaDialogBase::Show() throw(uno::RuntimeException)
-+{
-+	rtl::OUString aURL;
-+    uno::Reference< frame::XModel > xModel = getCurrentDocument();
-+	if ( xModel.is() )
-+	{
-+		aURL = mapIndexToName( mnIndex );
-+		if( aURL.getLength() == 0  )
-+			throw uno::RuntimeException(
-+				::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " Unable to open the specified dialog " ) ),
-+				uno::Reference< XInterface > () );
-+		dispatchRequests( xModel, aURL );
-+	}
-+}	
-+
-diff --git vbahelper/source/vbahelper/vbadialogsbase.cxx vbahelper/source/vbahelper/vbadialogsbase.cxx
-new file mode 100644
-index 0000000..f3679d6
---- /dev/null
-+++ vbahelper/source/vbahelper/vbadialogsbase.cxx
-@@ -0,0 +1,47 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbadialogs.cxx,v $
-+ * $Revision: 1.5 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <vbahelper/vbadialogsbase.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+::sal_Int32
-+VbaDialogsBase::getCount() throw (uno::RuntimeException)
-+{
-+	//#TODO #FIXEME
-+	return 0;
-+}
-+
-+uno::Any
-+VbaDialogsBase::Item( const uno::Any& /* &aItem */) throw (uno::RuntimeException)
-+{
-+	return uno::Any();
-+}
-+
-diff --git vbahelper/source/vbahelper/vbadocumentsbase.cxx vbahelper/source/vbahelper/vbadocumentsbase.cxx
-new file mode 100644
-index 0000000..813e084
---- /dev/null
-+++ vbahelper/source/vbahelper/vbadocumentsbase.cxx
-@@ -0,0 +1,295 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: 
-+ * $Revision: 
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <vbahelper/vbadocumentsbase.hxx>
-+#include <comphelper/processfactory.hxx>
-+#include <cppuhelper/implbase1.hxx>
-+#include <cppuhelper/implbase3.hxx>
-+#include <com/sun/star/frame/XDesktop.hpp>
-+#include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <com/sun/star/frame/XComponentLoader.hpp>
-+#include <com/sun/star/lang/XComponent.hpp>
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <com/sun/star/frame/XFrame.hpp>
-+#include <com/sun/star/frame/FrameSearchFlag.hpp>
-+#include <com/sun/star/util/XModifiable.hpp>
-+#include <com/sun/star/frame/XStorable.hpp>
-+#include <com/sun/star/lang/DisposedException.hpp>
-+#include <com/sun/star/beans/PropertyVetoException.hpp>
-+#include <com/sun/star/util/XCloseable.hpp>
-+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-+#include <com/sun/star/document/XTypeDetection.hpp>
-+#include <com/sun/star/uri/XUriReference.hpp>
-+#include <com/sun/star/uri/XUriReferenceFactory.hpp>
-+#include <com/sun/star/lang/XServiceInfo.hpp>
-+#include <sfx2/objsh.hxx>
-+#include <tools/urlobj.hxx>
-+#include <vbahelper/vbahelper.hxx>
-+#include <hash_map>
-+#include <osl/file.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+static const rtl::OUString sSpreadsheetDocument( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
-+static const rtl::OUString sTextDocument( rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" ) );
-+
-+typedef  std::hash_map< rtl::OUString,
-+sal_Int32, ::rtl::OUStringHash,
-+::std::equal_to< ::rtl::OUString > > NameIndexHash;
-+
-+typedef std::vector < uno::Reference< frame::XModel > > Documents;
-+
-+typedef ::cppu::WeakImplHelper1< container::XEnumeration > DocumentsEnumImpl_BASE;
-+
-+// #FIXME clearly this is a candidate for some sort of helper base class as
-+// this is a copy of SelectedSheetsEnum ( vbawindow.cxx )
-+
-+class DocumentsEnumImpl : public DocumentsEnumImpl_BASE
-+{
-+	uno::Reference< uno::XComponentContext > m_xContext;
-+	Documents m_documents;
-+	Documents::const_iterator m_it;
-+
-+public:
-+	DocumentsEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const Documents& docs ) throw ( uno::RuntimeException ) :  m_xContext( xContext ), m_documents( docs )
-+	{
-+		m_it = m_documents.begin();
-+	}
-+	DocumentsEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) :  m_xContext( xContext )
-+	{
-+		uno::Reference< lang::XMultiComponentFactory > xSMgr(
-+			m_xContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+
-+		uno::Reference< frame::XDesktop > xDesktop
-+			(xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), m_xContext), uno::UNO_QUERY_THROW );
-+		uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration();
-+		while( mxComponents->hasMoreElements() )
-+		{
-+			uno::Reference< frame::XModel > xNext( mxComponents->nextElement(), uno::UNO_QUERY );
-+			if ( xNext.is() )
-+				m_documents.push_back( xNext );
-+		}
-+		m_it = m_documents.begin();
-+	}
-+	// XEnumeration
-+	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException) 
-+	{ 
-+		return m_it != m_documents.end();
-+	}
-+
-+	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
-+	{ 
-+		if ( !hasMoreElements() )
-+		{
-+			throw container::NoSuchElementException();
-+		}
-+		return makeAny( *(m_it++) );
-+	}
-+};
-+
-+// #FIXME clearly this is also a candidate for some sort of helper base class as
-+// a very similar one is used in vbawindow ( SelectedSheetsEnumAccess )
-+// Maybe a template base class that does all of the operations on the hashmap
-+// and vector only, and the sub-class does everything else
-+// => ctor, createEnumeration & factory method need be defined ( to be called 
-+// by getByIndex, getByName )
-+typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess 
-+	, com::sun::star::container::XIndexAccess
-+	, com::sun::star::container::XNameAccess
-+	> DocumentsAccessImpl_BASE;
-+
-+class DocumentsAccessImpl : public DocumentsAccessImpl_BASE
-+{
-+	uno::Reference< uno::XComponentContext > m_xContext;
-+	Documents m_documents;
-+	NameIndexHash namesToIndices;
-+    VbaDocumentsBase::DOCUMENT_TYPE meDocType;
-+public:	
-+	DocumentsAccessImpl( const uno::Reference< uno::XComponentContext >& xContext, VbaDocumentsBase::DOCUMENT_TYPE eDocType ) throw (uno::RuntimeException) :m_xContext( xContext ), meDocType( eDocType )
-+	{
-+		uno::Reference< container::XEnumeration > xEnum = new DocumentsEnumImpl( m_xContext );
-+		sal_Int32 nIndex=0;
-+		while( xEnum->hasMoreElements() )
-+		{
-+            uno::Reference< lang::XServiceInfo > xServiceInfo( xEnum->nextElement(), uno::UNO_QUERY );
-+			if ( xServiceInfo.is() 
-+                && (  ( xServiceInfo->supportsService( sSpreadsheetDocument ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT )
-+                || ( xServiceInfo->supportsService( sTextDocument ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) )
-+			{
-+				uno::Reference< frame::XModel > xModel( xServiceInfo, uno::UNO_QUERY_THROW ); // that the spreadsheetdocument is a xmodel is a given
-+				m_documents.push_back( xModel );
-+				INetURLObject aURL( xModel->getURL() );
-+				namesToIndices[ aURL.GetLastName() ] = nIndex++;
-+			}
-+		}
-+			
-+	}
-+	
-+	//XEnumerationAccess
-+	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException)
-+	{
-+		return new DocumentsEnumImpl( m_xContext, m_documents ); 
-+	}
-+	// XIndexAccess
-+	virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException) 
-+	{ 
-+		return m_documents.size();
-+	}
-+	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) 
-+	{ 
-+		if ( Index < 0 
-+			|| static_cast< Documents::size_type >(Index) >= m_documents.size() ) 
-+			throw lang::IndexOutOfBoundsException();
-+		return makeAny( m_documents[ Index ] ); // returns xspreadsheetdoc
-+	}
-+
-+	//XElementAccess
-+	virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
-+	{ 
-+		return frame::XModel::static_type(0); 
-+	}
-+
-+	virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) 
-+	{ 
-+		return (m_documents.size() > 0);
-+	}
-+
-+	//XNameAccess
-+	virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
-+	{ 
-+		NameIndexHash::const_iterator it = namesToIndices.find( aName );
-+		if ( it == namesToIndices.end() )
-+			throw container::NoSuchElementException();
-+		return makeAny( m_documents[ it->second ] );
-+		
-+	}
-+
-+	virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException) 
-+	{ 
-+		uno::Sequence< ::rtl::OUString > names( namesToIndices.size() );
-+		::rtl::OUString* pString = names.getArray();
-+		NameIndexHash::const_iterator it = namesToIndices.begin();
-+		NameIndexHash::const_iterator it_end = namesToIndices.end();
-+		for ( ; it != it_end; ++it, ++pString )
-+			*pString = it->first;	
-+		return names;	
-+	}
-+
-+	virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) 
-+	{ 
-+		NameIndexHash::const_iterator it = namesToIndices.find( aName );
-+		return (it != namesToIndices.end());
-+	}
-+
-+};
-+
-+VbaDocumentsBase::VbaDocumentsBase( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext, DOCUMENT_TYPE eDocType ) throw (uno::RuntimeException) : VbaDocumentsBase_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new DocumentsAccessImpl( xContext, eDocType ) ) ), meDocType( eDocType )
-+{
-+}
-+
-+uno::Any SAL_CALL
-+VbaDocumentsBase::Add() throw (uno::RuntimeException)
-+{
-+	uno::Reference< lang::XMultiComponentFactory > xSMgr(
-+        mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+
-+	 uno::Reference< frame::XComponentLoader > xLoader(
-+        xSMgr->createInstanceWithContext(
-+            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),
-+                mxContext), uno::UNO_QUERY_THROW );
-+    rtl::OUString sURL;
-+    if( meDocType == WORD_DOCUMENT )
-+        sURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:factory/swriter") );
-+    else if( meDocType == EXCEL_DOCUMENT )
-+        sURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc") );
-+    else
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+	uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL(
-+									   sURL ,
-+									   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, 
-+									   uno::Sequence< beans::PropertyValue >(0) );			   
-+    return uno::makeAny( xComponent );
-+}
-+
-+void
-+VbaDocumentsBase::Close() throw (uno::RuntimeException)
-+{
-+	uno::Reference< lang::XMultiComponentFactory > xSMgr(
-+		mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+	rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseDoc"));
-+	dispatchRequests(xModel,url);
-+}
-+
-+// #TODO# #FIXME# can any of the unused params below be used?
-+uno::Any
-+VbaDocumentsBase::Open( const rtl::OUString& rFileName, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (uno::RuntimeException)
-+{
-+	// we need to detect if this is a URL, if not then assume its a file path
-+        rtl::OUString aURL;
-+        INetURLObject aObj;
-+	aObj.SetURL( rFileName );
-+	bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
-+	if ( bIsURL )
-+		aURL = rFileName;
-+	else
-+		osl::FileBase::getFileURLFromSystemPath( rFileName, aURL );
-+	uno::Reference< lang::XMultiComponentFactory > xSMgr(
-+		mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+	uno::Reference< frame::XDesktop > xDesktop
-+		(xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")                    , mxContext),
-+		uno::UNO_QUERY_THROW );
-+	uno::Reference< frame::XComponentLoader > xLoader(
-+		xSMgr->createInstanceWithContext(
-+		::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),
-+		mxContext),
-+		uno::UNO_QUERY_THROW );
-+	uno::Sequence< beans::PropertyValue > sProps( rProps );
-+	sal_Int32 nIndex = 0;
-+	
-+	if ( ReadOnly.hasValue()  )
-+	{
-+		sal_Bool bIsReadOnly = sal_False; ReadOnly >>= bIsReadOnly;
-+		if ( bIsReadOnly )
-+		{
-+			static const rtl::OUString sReadOnly( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
-+			sProps.realloc( sProps.getLength() + 1 );
-+			sProps[ nIndex ].Name = sReadOnly;
-+			sProps[ nIndex++ ].Value = uno::makeAny( (sal_Bool)sal_True );
-+		}
-+	}
-+
-+	uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL( aURL,
-+		rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_default") ),
-+		frame::FrameSearchFlag::CREATE,
-+		sProps);
-+    return uno::makeAny( xComponent );
-+}
-+
-diff --git vbahelper/source/vbahelper/vbafillformat.cxx vbahelper/source/vbahelper/vbafillformat.cxx
-new file mode 100644
-index 0000000..ed7fcd2
---- /dev/null
-+++ vbahelper/source/vbahelper/vbafillformat.cxx
-@@ -0,0 +1,202 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbafillformat.cxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <com/sun/star/awt/Gradient.hpp>
-+#include <com/sun/star/awt/GradientStyle.hpp>
-+#include <ooo/vba/office/MsoGradientStyle.hpp>
-+#include "vbafillformat.hxx"
-+#include "vbacolorformat.hxx"
-+
-+using namespace ooo::vba;
-+using namespace com::sun::star;
-+
-+ScVbaFillFormat::ScVbaFillFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaFillFormat_BASE( xParent, xContext ), m_xShape( xShape )
-+{
-+    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
-+    m_nFillStyle = drawing::FillStyle_SOLID;
-+    m_nForeColor = 0;
-+    m_nBackColor = 0;
-+    m_nGradientAngle = 0;
-+}
-+
-+void
-+ScVbaFillFormat::setFillStyle( drawing::FillStyle nFillStyle ) throw (uno::RuntimeException)
-+{
-+    m_nFillStyle = nFillStyle;
-+    if( m_nFillStyle == drawing::FillStyle_GRADIENT )
-+    {
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny( drawing::FillStyle_GRADIENT ) );
-+        awt::Gradient aGradient;
-+        // AXIAL
-+        // RADIAL
-+        // ELLIPTICAL
-+        // SQUARE
-+        // RECT
-+        aGradient.Style = awt::GradientStyle_LINEAR;
-+        aGradient.StartColor = ForeColor()->getRGB();
-+        aGradient.EndColor = BackColor()->getRGB();
-+        aGradient.Angle = m_nGradientAngle;
-+        aGradient.Border = 0;
-+        aGradient.XOffset = 0;
-+        aGradient.YOffset = 0;
-+        aGradient.StartIntensity = 100;
-+        aGradient.EndIntensity = 100;
-+        aGradient.StepCount = 1;
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillGradient"), uno::makeAny( aGradient ) );
-+    }
-+    else if( m_nFillStyle == drawing::FillStyle_SOLID )
-+    {
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny(drawing::FillStyle_SOLID) );
-+    }
-+}
-+
-+void
-+ScVbaFillFormat::setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css::uno::RuntimeException)
-+{
-+    m_nForeColor = nForeColor;
-+    setFillStyle( m_nFillStyle );
-+}
-+
-+// Attributes
-+sal_Bool SAL_CALL 
-+ScVbaFillFormat::getVisible() throw (uno::RuntimeException)
-+{
-+    drawing::FillStyle nFillStyle;
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillStyle") ) >>= nFillStyle;
-+    if( nFillStyle == drawing::FillStyle_NONE )
-+        return sal_False;
-+    return sal_True;
-+}
-+
-+void SAL_CALL 
-+ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
-+{
-+    drawing::FillStyle aFillStyle;
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillStyle") ) >>= aFillStyle;
-+    if( !_visible )
-+    {
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny( drawing::FillStyle_NONE ) );
-+    }
-+    else
-+    {
-+        if( aFillStyle == drawing::FillStyle_NONE )
-+        {
-+            setFillStyle( m_nFillStyle );
-+        }
-+    }
-+}
-+
-+double SAL_CALL 
-+ScVbaFillFormat::getTransparency() throw (uno::RuntimeException)
-+{
-+    sal_Int16 nTransparence = 0;
-+    double dTransparence = 0;
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "FillTransparence" ) ) >>= nTransparence;
-+    dTransparence = static_cast<double>( nTransparence );
-+    dTransparence /= 100;
-+    return dTransparence;
-+}
-+
-+void SAL_CALL 
-+ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeException)
-+{
-+    sal_Int16 nTransparence = static_cast< sal_Int16 >( _transparency * 100 );
-+    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillTransparence" ), uno::makeAny( nTransparence ) );
-+}
-+
-+
-+// Methods
-+void SAL_CALL 
-+ScVbaFillFormat::Solid() throw (uno::RuntimeException)
-+{
-+    setFillStyle( drawing::FillStyle_SOLID );
-+}
-+
-+void SAL_CALL 
-+ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) throw (uno::RuntimeException)
-+{
-+    if( style == office::MsoGradientStyle::msoGradientHorizontal )
-+    {
-+        m_nGradientAngle = 0;
-+        setFillStyle( drawing::FillStyle_GRADIENT );
-+    }
-+    else if( style == office::MsoGradientStyle::msoGradientVertical )
-+    {
-+        m_nGradientAngle = 900;
-+        setFillStyle( drawing::FillStyle_GRADIENT );
-+    }
-+    else if( style == office::MsoGradientStyle::msoGradientDiagonalDown )
-+    {
-+        m_nGradientAngle = 450;
-+        setFillStyle( drawing::FillStyle_GRADIENT );
-+    }
-+    else if( style == office::MsoGradientStyle::msoGradientDiagonalUp )
-+    {
-+        m_nGradientAngle = 900 + 450;
-+        setFillStyle( drawing::FillStyle_GRADIENT );
-+    }
-+}
-+
-+uno::Reference< msforms::XColorFormat > SAL_CALL 
-+ScVbaFillFormat::BackColor() throw (uno::RuntimeException)
-+{
-+    if( !m_xColorFormat.is() )
-+        m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_BACKCOLOR ) );
-+    return m_xColorFormat;
-+}
-+
-+uno::Reference< msforms::XColorFormat > SAL_CALL 
-+ScVbaFillFormat::ForeColor() throw (uno::RuntimeException)
-+{
-+    if( !m_xColorFormat.is() )
-+        m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_FORECOLOR ) );
-+    return m_xColorFormat;
-+}
-+
-+
-+rtl::OUString&
-+ScVbaFillFormat::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFillFormat") );
-+    return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString >
-+ScVbaFillFormat::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.FillFormat" ) );
-+    }
-+    return aServiceNames;
-+}
-+
-diff --git vbahelper/source/vbahelper/vbafillformat.hxx vbahelper/source/vbahelper/vbafillformat.hxx
-new file mode 100644
-index 0000000..047af92
---- /dev/null
-+++ vbahelper/source/vbahelper/vbafillformat.hxx
-@@ -0,0 +1,74 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbafillformat.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_XFILLFORMAT_HXX
-+#define SC_VBA_XFILLFORMAT_HXX
-+
-+#include <com/sun/star/drawing/XShape.hpp>
-+#include <com/sun/star/drawing/FillStyle.hpp>
-+#include <ooo/vba/msforms/XFillFormat.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ov::msforms::XFillFormat > ScVbaFillFormat_BASE;
-+
-+class ScVbaFillFormat : public ScVbaFillFormat_BASE
-+{
-+private:
-+    css::uno::Reference< css::drawing::XShape > m_xShape;
-+    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
-+    css::uno::Reference< ov::msforms::XColorFormat > m_xColorFormat;
-+    css::drawing::FillStyle m_nFillStyle;
-+    sal_Int32 m_nForeColor;
-+    sal_Int32 m_nBackColor;
-+    sal_Int16 m_nGradientAngle;
-+private:
-+    void setFillStyle( css::drawing::FillStyle nFillStyle ) throw (css::uno::RuntimeException);
-+protected:
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+
-+public:
-+    ScVbaFillFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape );
-+
-+    void setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css::uno::RuntimeException);
-+    // Attributes
-+    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException);
-+
-+    // Methods
-+    virtual void SAL_CALL Solid() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL TwoColorGradient( sal_Int32 style, sal_Int32 variant ) throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException);
-+
-+};
-+
-+#endif//SC_VBA_XFILLFORMAT_HXX
-diff --git vbahelper/source/vbahelper/vbafontbase.cxx vbahelper/source/vbahelper/vbafontbase.cxx
-new file mode 100644
-index 0000000..26da500
---- /dev/null
-+++ vbahelper/source/vbahelper/vbafontbase.cxx
-@@ -0,0 +1,309 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbafont.cxx,v $
-+ * $Revision: 1.7 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <com/sun/star/beans/XProperty.hpp>
-+#include <com/sun/star/awt/FontWeight.hpp>
-+#include <com/sun/star/awt/FontUnderline.hpp>
-+#include <com/sun/star/awt/FontStrikeout.hpp>
-+#include <com/sun/star/awt/FontSlant.hpp>
-+#include <com/sun/star/text/XSimpleText.hpp>
-+#include <vbahelper/vbafontbase.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+VbaFontBase::VbaFontBase( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::container::XIndexAccess >& xPalette, uno::Reference< beans::XPropertySet > xPropertySet  ) throw ( uno::RuntimeException ) : VbaFontBase_BASE( xParent, xContext ), mxFont( xPropertySet, css::uno::UNO_QUERY_THROW ), mxPalette( xPalette )
-+{
-+}
-+
-+VbaFontBase::~VbaFontBase()
-+{
-+}
-+
-+
-+void SAL_CALL
-+VbaFontBase::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeException )
-+{
-+	sal_Bool bValue = sal_False;
-+	aValue >>= bValue;
-+	sal_Int16 nValue = NORMAL;
-+	sal_Int8 nValue2 = NORMALHEIGHT;
-+
-+        if( bValue )
-+	{
-+		nValue = SUPERSCRIPT;
-+	        nValue2 = SUPERSCRIPTHEIGHT;
-+	}
-+	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), ( uno::Any )nValue );
-+ 	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapementHeight" ) ), ( uno::Any )nValue2 );
-+}
-+
-+uno::Any SAL_CALL
-+VbaFontBase::getSuperscript() throw ( uno::RuntimeException )
-+{
-+	short nValue = 0;
-+	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ) ) >>= nValue;
-+	return uno::makeAny( ( nValue == SUPERSCRIPT ) );
-+}
-+
-+void SAL_CALL
-+VbaFontBase::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException )
-+{
-+	sal_Bool bValue = sal_False;
-+	aValue >>= bValue;
-+	sal_Int16 nValue = NORMAL;
-+	sal_Int8 nValue2 = NORMALHEIGHT;
-+
-+        if( bValue )
-+	{
-+		nValue= SUBSCRIPT;
-+	        nValue2 = SUBSCRIPTHEIGHT;
-+	}
-+
-+ 	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapementHeight" ) ), ( uno::Any )nValue2 );
-+	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), ( uno::Any )nValue );
-+
-+}
-+
-+uno::Any SAL_CALL
-+VbaFontBase::getSubscript() throw ( uno::RuntimeException )
-+{
-+	short nValue = NORMAL;
-+	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ) ) >>= nValue;
-+	return uno::makeAny( ( nValue == SUBSCRIPT ) );
-+}
-+
-+void SAL_CALL
-+VbaFontBase::setSize( const uno::Any& aValue ) throw( uno::RuntimeException )
-+{
-+	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ), aValue );
-+}
-+
-+uno::Any SAL_CALL
-+VbaFontBase::getSize() throw ( uno::RuntimeException )
-+{
-+        return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ) );
-+}
-+
-+void SAL_CALL
-+VbaFontBase::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException )
-+{
-+	sal_Int32 nIndex = 0;
-+	_colorindex >>= nIndex;
-+
-+	--nIndex; // OOo indices are zero bases
-+
-+	// setColor expects colors in XL RGB values
-+	// #FIXME this is daft we convert OO RGB val to XL RGB val and
-+	// then back again to OO RGB value
-+	setColor( OORGBToXLRGB(mxPalette->getByIndex( nIndex )) );
-+}
-+
-+
-+uno::Any SAL_CALL
-+VbaFontBase::getColorIndex() throw ( uno::RuntimeException )
-+{
-+	sal_Int32 nColor = 0;
-+
-+	XLRGBToOORGB( getColor() ) >>= nColor;
-+	sal_Int32 nElems = mxPalette->getCount();
-+	sal_Int32 nIndex = -1;
-+	for ( sal_Int32 count=0; count<nElems; ++count )
-+       	{
-+		sal_Int32 nPaletteColor = 0;
-+		mxPalette->getByIndex( count ) >>= nPaletteColor;
-+		if ( nPaletteColor == nColor )
-+		{
-+			nIndex = count + 1; // 1 based
-+			break;
-+		}
-+	}
-+	return uno::makeAny( nIndex );
-+}
-+
-+void SAL_CALL
-+VbaFontBase::setBold( const uno::Any& aValue ) throw( uno::RuntimeException )
-+{
-+	sal_Bool bValue = sal_False;
-+	aValue >>= bValue;
-+	double fBoldValue = awt::FontWeight::NORMAL;
-+	if( bValue )
-+		fBoldValue = awt::FontWeight::BOLD;
-+	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ), ( uno::Any )fBoldValue );
-+
-+}
-+
-+uno::Any SAL_CALL
-+VbaFontBase::getBold() throw ( uno::RuntimeException )
-+{
-+	double fValue = 0.0;
-+	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ) ) >>= fValue;
-+	return uno::makeAny( fValue == awt::FontWeight::BOLD );
-+}
-+
-+void SAL_CALL
-+VbaFontBase::setStrikethrough( const uno::Any& aValue ) throw ( uno::RuntimeException )
-+{
-+	sal_Bool bValue = sal_False;
-+	aValue >>= bValue;
-+	short nValue = awt::FontStrikeout::NONE;
-+	if( bValue )
-+		nValue = awt::FontStrikeout::SINGLE;
-+	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharStrikeout" ) ), ( uno::Any )nValue );
-+}
-+
-+uno::Any SAL_CALL
-+VbaFontBase::getStrikethrough() throw ( uno::RuntimeException )
-+{
-+	short nValue = 0;
-+	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharStrikeout" ) ) ) >>= nValue;
-+	return uno::Any( nValue == awt::FontStrikeout::SINGLE );
-+}
-+
-+void  SAL_CALL
-+VbaFontBase::setShadow( const uno::Any& aValue ) throw ( uno::RuntimeException )
-+{
-+	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ), aValue );
-+}
-+
-+uno::Any SAL_CALL
-+VbaFontBase::getShadow() throw (uno::RuntimeException)
-+{
-+	return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ) );
-+}
-+
-+void  SAL_CALL
-+VbaFontBase::setItalic( const uno::Any& aValue ) throw ( uno::RuntimeException )
-+{
-+	sal_Bool bValue = sal_False;
-+	aValue >>= bValue;
-+	short nValue = awt::FontSlant_NONE;
-+	if( bValue )
-+		nValue = awt::FontSlant_ITALIC;
-+    mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ), ( uno::Any )nValue );
-+}
-+
-+uno::Any SAL_CALL
-+VbaFontBase::getItalic() throw ( uno::RuntimeException )
-+{
-+
-+    awt::FontSlant aFS;
-+	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) ) ) >>= aFS;
-+	return uno::makeAny( aFS == awt::FontSlant_ITALIC );
-+}
-+
-+void  SAL_CALL
-+VbaFontBase::setName( const uno::Any& aValue ) throw ( uno::RuntimeException )
-+{
-+	rtl::OUString sString;
-+	aValue >>= sString;
-+	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ), aValue);
-+}
-+
-+uno::Any SAL_CALL
-+VbaFontBase::getName() throw ( uno::RuntimeException )
-+{
-+	return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ) );
-+}
-+uno::Any
-+VbaFontBase::getColor() throw (uno::RuntimeException)
-+{
-+	uno::Any aAny;
-+	aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) ) );
-+	return aAny;
-+}
-+
-+void
-+VbaFontBase::setColor( const uno::Any& _color  ) throw (uno::RuntimeException)
-+{
-+	mxFont->setPropertyValue(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) , XLRGBToOORGB(_color));
-+}
-+
-+void SAL_CALL
-+VbaFontBase::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException )
-+{
-+/*
-+	// default
-+	sal_Int32 nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone;
-+	aValue >>= nValue;
-+	switch ( nValue )
-+	{
-+// NOTE:: #TODO #FIMXE
-+// xlUnderlineStyleDoubleAccounting & xlUnderlineStyleSingleAccounting
-+// don't seem to be supported in Openoffice.
-+// The import filter converts them to single or double underlines as appropriate
-+// So, here at the moment we are similarly silently converting
-+// xlUnderlineStyleSingleAccounting to xlUnderlineStyleSingle.
-+
-+		case excel::XlUnderlineStyle::xlUnderlineStyleNone:
-+			nValue = awt::FontUnderline::NONE;
-+			break;
-+		case excel::XlUnderlineStyle::xlUnderlineStyleSingle:
-+		case excel::XlUnderlineStyle::xlUnderlineStyleSingleAccounting:
-+			nValue = awt::FontUnderline::SINGLE;
-+			break;
-+		case excel::XlUnderlineStyle::xlUnderlineStyleDouble:
-+		case excel::XlUnderlineStyle::xlUnderlineStyleDoubleAccounting:
-+			nValue = awt::FontUnderline::DOUBLE;
-+			break;
-+		default:
-+			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown value for Underline")), uno::Reference< uno::XInterface >() );
-+	}
-+
-+	mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ), ( uno::Any )nValue );
-+*/
-+
-+}
-+
-+uno::Any SAL_CALL
-+VbaFontBase::getUnderline() throw ( uno::RuntimeException )
-+{
-+	sal_Int32 nValue = awt::FontUnderline::NONE;
-+	mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ) ) >>= nValue;
-+/*
-+	switch ( nValue )
-+	{
-+		case  awt::FontUnderline::DOUBLE:
-+			nValue = excel::XlUnderlineStyle::xlUnderlineStyleDouble;
-+			break;
-+		case  awt::FontUnderline::SINGLE:
-+			nValue = excel::XlUnderlineStyle::xlUnderlineStyleSingle;
-+			break;
-+		case  awt::FontUnderline::NONE:
-+			nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone;
-+			break;
-+		default:
-+			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown value retrieved for Underline") ), uno::Reference< uno::XInterface >() );
-+
-+	}
-+*/
-+	return uno::makeAny( nValue );
-+}
-+
-+
-diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx
-index b95ccf1..57bca7c 100644
---- vbahelper/source/vbahelper/vbahelper.cxx
-+++ vbahelper/source/vbahelper/vbahelper.cxx
-@@ -89,6 +89,7 @@ using namespace ::ooo::vba;
- 
- #define POINTTO100THMILLIMETERFACTOR 35.27778
- 
-+
- void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue );
- 
- uno::Any sbxToUnoValue( SbxVariable* pVar );
-@@ -468,6 +469,8 @@ getCurrentDocument() throw (uno::RuntimeException)
- sal_Int32 
- OORGBToXLRGB( sal_Int32 nCol )
- {
-+        sal_Int32 nAutoBits = nCol;
-+        nAutoBits &= 0xFF000000;
- 	sal_Int32 nRed = nCol;
- 	nRed &= 0x00FF0000;
- 	nRed >>= 16;
-@@ -476,12 +479,15 @@ OORGBToXLRGB( sal_Int32 nCol )
- 	nGreen >>= 8;
- 	sal_Int32 nBlue = nCol;
- 	nBlue &= 0x000000FF;
--	sal_Int32 nRGB =  ( (nBlue << 16) | (nGreen << 8) | nRed );
-+	sal_Int32 nRGB =  ( nAutoBits | (nBlue << 16) | (nGreen << 8) | nRed );
- 	return nRGB;
- }
- sal_Int32 
- XLRGBToOORGB( sal_Int32 nCol )
- {
-+        sal_Int32 nAutoBits = nCol;
-+        nAutoBits &= 0xFF000000;
-+
- 	sal_Int32 nBlue = nCol;
- 	nBlue &= 0x00FF0000;
- 	nBlue >>= 16;
-@@ -490,7 +496,7 @@ XLRGBToOORGB( sal_Int32 nCol )
- 	nGreen >>= 8;
- 	sal_Int32 nRed = nCol;
- 	nRed &= 0x000000FF;
--	sal_Int32 nRGB =  ( (nRed << 16) | (nGreen << 8) | nBlue );
-+	sal_Int32 nRGB =  ( nAutoBits | (nRed << 16) | (nGreen << 8) | nBlue );
- 	return nRGB;
- }
- uno::Any 
-@@ -899,59 +905,6 @@ void setCursorHelper( const Pointer& rPointer, sal_Bool bOverWrite )
-     }
- }
- 
--String docMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro )
--{
--	String sFullName;	
--	// would use the script provider to see if the macro exists but
--	// called at this stage tdoc content handler stuff is not set up
--	// so it fails
--
--       String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
--	BasicManager* pBasicMgr = pShell-> GetBasicManager();
--	if ( pBasicMgr )
--	{
--		if ( pBasicMgr->GetName().Len() )
--			sLibrary =  pBasicMgr->GetName();
--		StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
--		if ( !pBasic )
--		{
--			USHORT nId = pBasicMgr->GetLibId( sLibrary );
--			pBasicMgr->LoadLib( nId );
--			pBasic = pBasicMgr->GetLib( sLibrary );
--		}
--		if ( pBasic )
--		{
--			if ( sMod.Len() ) // we wish to find the macro is a specific module
--			{
--				SbModule* pModule = pBasic->FindModule( sMod );
--				if ( pModule )
--				{
--					SbxArray* pMethods = pModule->GetMethods();
--					if ( pMethods )
--					{
--						SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
--						if ( pMethod )
--						{
--							sFullName = sMacro;
--							sFullName.Insert( '.', 0 ).Insert( sMod, 0 ).Insert( '.', 0 ).Insert( sLibrary, 0 );
--						}
--					}
--				}
--			}
--			else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
--			{
--					if( SbModule* pModule = pMethod->GetModule() )
--					{
--						sFullName = sMacro;
--						sFullName.Insert( '.', 0 ).Insert( pModule->GetName(), 0).Insert( '.', 0 ).Insert( sLibrary, 0 );
--					}
--			}		
--				
--		}
--	}
--	return sFullName;
--}
--
- #define VBA_LEFT "PositionX"
- #define VBA_TOP "PositionY"
- UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
-diff --git vbahelper/source/vbahelper/vbalineformat.cxx vbahelper/source/vbahelper/vbalineformat.cxx
-new file mode 100644
-index 0000000..7c9610f
---- /dev/null
-+++ vbahelper/source/vbahelper/vbalineformat.cxx
-@@ -0,0 +1,458 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbalineformat.cxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <ooo/vba/office/MsoArrowheadStyle.hpp>
-+#include <ooo/vba/office/MsoArrowheadLength.hpp>
-+#include <ooo/vba/office/MsoArrowheadWidth.hpp>
-+#include <ooo/vba/office/MsoLineDashStyle.hpp>
-+#include <com/sun/star/drawing/LineStyle.hpp>
-+#include <com/sun/star/drawing/LineDash.hpp>
-+#include "vbalineformat.hxx"
-+#include "vbacolorformat.hxx"
-+
-+using namespace ooo::vba;
-+using namespace com::sun::star;
-+
-+ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaLineFormat_BASE( xParent, xContext ), m_xShape( xShape ) 
-+{
-+    m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW );
-+    m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid;
-+    m_nLineWeight = 1;
-+}
-+
-+sal_Int32
-+ScVbaLineFormat::calculateArrowheadSize()
-+{
-+    return 0;
-+}
-+
-+sal_Int32
-+ScVbaLineFormat::convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName )
-+{
-+    sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
-+    if (sLineName.equals(rtl::OUString::createFromAscii("Small Arrow")) ||
-+        sLineName.equals(rtl::OUString::createFromAscii("Arrow")) ||
-+        sLineName.equals(rtl::OUString::createFromAscii("msArrowEnd")) ||
-+        sLineName.equals(rtl::OUString::createFromAscii("Double Arrow")))
-+    {
-+        // msoArrowheadTriangle
-+        nLineType = office::MsoArrowheadStyle::msoArrowheadTriangle;
-+    }
-+    else if (sLineName.equals(rtl::OUString::createFromAscii("Square 45")) ||
-+             sLineName.equals(rtl::OUString::createFromAscii("Square")) ||
-+             sLineName.equals(rtl::OUString::createFromAscii("msArrowDiamondEnd")))
-+    {
-+        // msoArrowheadDiamond
-+        nLineType = office::MsoArrowheadStyle::msoArrowheadDiamond;
-+    }
-+    else if (sLineName.equals(rtl::OUString::createFromAscii("Circle")) ||
-+             sLineName.equals(rtl::OUString::createFromAscii("msArrowOvalEnd")) ||
-+             sLineName.equals(rtl::OUString::createFromAscii("Dimension Lines")) )
-+    {
-+        // msoArrowheadOval
-+        nLineType = office::MsoArrowheadStyle::msoArrowheadOval;
-+    }
-+    else if (sLineName.equals(rtl::OUString::createFromAscii("Arrow concave")) ||
-+             sLineName.equals(rtl::OUString::createFromAscii("msArrowStealthEnd")))
-+    {
-+        // msoArrowheadStealth
-+        nLineType = office::MsoArrowheadStyle::msoArrowheadStealth;
-+    }
-+    else if (sLineName.equals(rtl::OUString::createFromAscii("Rounded short Arrow")) ||
-+             sLineName.equals(rtl::OUString::createFromAscii("Rounded large Arrow")) ||
-+             sLineName.equals(rtl::OUString::createFromAscii("Symmetric Arrow")) ||
-+             sLineName.equals(rtl::OUString::createFromAscii("msArrowOpenEnd")) ||
-+             sLineName.equals(rtl::OUString::createFromAscii("Line Arrow")))
-+    {
-+        // msoArrowheadOpen
-+        nLineType = office::MsoArrowheadStyle::msoArrowheadOpen;
-+    }
-+    else
-+    {
-+        // msoArrowheadNone
-+        nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
-+    }
-+    return nLineType;
-+}
-+
-+rtl::OUString 
-+ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (uno::RuntimeException)
-+{
-+    switch( nArrowheadStyle )
-+    {
-+        case office::MsoArrowheadStyle::msoArrowheadNone:
-+            return rtl::OUString(rtl::OUString::createFromAscii( "" ) );
-+        case office::MsoArrowheadStyle::msoArrowheadStealth:
-+            return rtl::OUString::createFromAscii( "Arrow concave" );
-+        case office::MsoArrowheadStyle::msoArrowheadOpen:
-+            return rtl::OUString::createFromAscii("Line Arrow" );
-+        case office::MsoArrowheadStyle::msoArrowheadOval:
-+            return  rtl::OUString::createFromAscii("Circle" );
-+        case office::MsoArrowheadStyle::msoArrowheadDiamond:
-+            return rtl::OUString::createFromAscii( "Square 45" );
-+        case office::MsoArrowheadStyle::msoArrowheadTriangle:
-+            return rtl::OUString::createFromAscii( "Arrow" );
-+        default:
-+            throw uno::RuntimeException( rtl::OUString::createFromAscii("Invalid Arrow Style!"), uno::Reference< uno::XInterface >() );
-+    }
-+}
-+
-+// Attributes
-+sal_Int32 SAL_CALL 
-+ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
-+    rtl::OUString sLineName;
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ) ) >>= sLineName;
-+    if( ( sLineName.getLength() > 7 ) && ( sLineName.indexOf( rtl::OUString::createFromAscii( "msArray" ) ) ) != -1 )
-+    {
-+        sal_Int32 nIndex = sLineName.indexOf( rtl::OUString::createFromAscii(" ") );
-+        rtl::OUString sName = sLineName.copy( 0, nIndex );
-+        //sal_Int32 nSize = sLineName.copy( nIndex + 1 ).toInt32();
-+        nLineType = convertLineStartEndNameToArrowheadStyle( sName );
-+    }
-+    else
-+    {
-+        nLineType = convertLineStartEndNameToArrowheadStyle( sLineName );
-+    }
-+    return nLineType;
-+}
-+
-+void SAL_CALL 
-+ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (uno::RuntimeException)
-+{
-+    rtl::OUString sArrayName = convertArrowheadStyleToLineStartEndName( _beginarrowheadstyle );
-+    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ), uno::makeAny( sArrayName ) );
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
-+}
-+
-+void SAL_CALL 
-+ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
-+}
-+
-+void SAL_CALL 
-+ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaLineFormat::getEndArrowheadStylel() throw (uno::RuntimeException)
-+{
-+    return 0;
-+}
-+
-+void SAL_CALL 
-+ScVbaLineFormat::setEndArrowheadStylel( sal_Int32 /*_endarrowheadstylel*/ ) throw (uno::RuntimeException)
-+{
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
-+}
-+
-+void SAL_CALL 
-+ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ ) throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaLineFormat::getEndArrowheadWidth() throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
-+}
-+
-+void SAL_CALL 
-+ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ ) throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
-+}
-+
-+double SAL_CALL 
-+ScVbaLineFormat::getWeight() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nLineWidth=0;
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineWidth") ) >>= nLineWidth;
-+    double dLineWidth = Millimeter::getInPoints( nLineWidth );
-+    return dLineWidth;
-+}
-+
-+void SAL_CALL 
-+ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException)
-+{
-+    if( _weight < 0 )
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter: Must be positv."), uno::Reference< uno::XInterface >() );
-+    if( _weight == 0 )
-+        _weight = 0.5;
-+    m_nLineWeight = _weight;
-+    Millimeter aMillimeter;
-+    aMillimeter.setInPoints( _weight );
-+        
-+    sal_Int32 nLineWidth = static_cast<sal_Int32>( aMillimeter.getInHundredthsOfOneMillimeter() );
-+    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineWidth" ), uno::makeAny( nLineWidth ) );
-+    setDashStyle( m_nLineDashStyle );
-+}
-+
-+sal_Bool SAL_CALL 
-+ScVbaLineFormat::getVisible() throw (uno::RuntimeException)
-+{
-+    drawing::LineStyle aLineStyle;
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= aLineStyle;
-+    if( aLineStyle == drawing::LineStyle_NONE )
-+    {
-+        return sal_False;
-+    }
-+    return sal_True;
-+}
-+
-+void SAL_CALL 
-+ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
-+{
-+    drawing::LineStyle aLineStyle;
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= aLineStyle;
-+    if( !_visible )
-+    {
-+        aLineStyle = drawing::LineStyle_NONE;
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( aLineStyle ) );
-+    }
-+    else
-+    {
-+        if( aLineStyle == drawing::LineStyle_NONE )
-+        {
-+            setDashStyle( m_nLineDashStyle );
-+        }
-+    }
-+}
-+
-+double SAL_CALL 
-+ScVbaLineFormat::getTransparency() throw (uno::RuntimeException)
-+{
-+    sal_Int16 nTransparency = 0;
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ) ) >>= nTransparency;
-+    double fTransparency = static_cast<double>( nTransparency );
-+    return fTransparency / 100;
-+}
-+
-+void SAL_CALL 
-+ScVbaLineFormat::setTransparency( double _transparency ) throw (uno::RuntimeException)
-+{
-+    sal_Int16 nTransparency = static_cast<sal_Int16>( _transparency * 100 );
-+    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ), uno::makeAny( nTransparency ) );
-+}
-+
-+sal_Int16 SAL_CALL 
-+ScVbaLineFormat::getStyle() throw (uno::RuntimeException)
-+{
-+    //OpenOffice.org only supports one LineStyle (other than the DashStyles)
-+    //Therefore we can only return the SingleLine
-+    return 1;
-+}
-+
-+void SAL_CALL 
-+ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException)
-+{
-+    //OpenOffice.org only supports one LineStyle (other than the DashStyles)
-+    //Therefore we do not set the LineStyle, because it maybe is already set
-+    //to Dashed or Single Line. Setting the 'Visible' or 'DashStyle' properties
-+    //will be done with the according methods.
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException)
-+{
-+    drawing::LineStyle eLineStyle;
-+    //LineStyle integer in Xray
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= eLineStyle;
-+    if( eLineStyle == drawing::LineStyle_SOLID )
-+        m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid;
-+    else
-+    {
-+        drawing::LineDash aLineDash;
-+        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineDash" ) ) >>= aLineDash;
-+        if( aLineDash.Dots == 0 )
-+        {
-+            //LineDash
-+            //LineLongDash
-+            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDash;
-+            if( aLineDash.Distance > 0 && ( aLineDash.DashLen / aLineDash.Distance > 1 ) )
-+            {
-+                m_nLineDashStyle = office::MsoLineDashStyle::msoLineLongDash;
-+            }
-+        }
-+        else if( aLineDash.Dots == 1 )
-+        {
-+            // LineDashDot
-+            // LineLongDashDot
-+            // LineSquareDot
-+            // LineRoundDot ! not supported
-+            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDashDot;
-+            if( aLineDash.Dashes == 0 )
-+            {
-+                m_nLineDashStyle = office::MsoLineDashStyle::msoLineSquareDot;
-+            }
-+            else
-+            {
-+                if( aLineDash.Distance > 0 && ( aLineDash.DashLen / aLineDash.Distance > 1 ) )
-+                {
-+                    m_nLineDashStyle = office::MsoLineDashStyle::msoLineLongDashDot;
-+                }
-+            }
-+        }
-+        else if( aLineDash.Dots == 2 )
-+        {
-+            // LineDashDotDot
-+            m_nLineDashStyle = office::MsoLineDashStyle::msoLineDashDotDot;
-+        }
-+    }
-+
-+    return m_nLineDashStyle;
-+}
-+
-+void SAL_CALL 
-+ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeException)
-+{
-+    m_nLineDashStyle = _dashstyle;
-+    if( _dashstyle == office::MsoLineDashStyle::msoLineSolid )
-+    {
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID  ));
-+    }
-+    else
-+    {
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( drawing::LineStyle_DASH ) );
-+        drawing::LineDash  pLineDash;
-+        Millimeter aMillimeter( m_nLineWeight );
-+        sal_Int32 nPixel = static_cast< sal_Int32 >( aMillimeter.getInHundredthsOfOneMillimeter() );
-+        switch( _dashstyle )
-+        {
-+        case office::MsoLineDashStyle::msoLineDashDot:
-+            pLineDash.Dots = 1;
-+            pLineDash.DotLen = nPixel;
-+            pLineDash.Dashes = 1;
-+            pLineDash.DashLen = 5 * nPixel;
-+            pLineDash.Distance = 4 * nPixel;
-+            break;
-+        case office::MsoLineDashStyle::msoLineLongDashDot:
-+            pLineDash.Dots = 1;
-+            pLineDash.DotLen = nPixel;
-+            pLineDash.Dashes = 1;
-+            pLineDash.DashLen = 10 * nPixel;
-+            pLineDash.Distance = 4 * nPixel;
-+            break;
-+        case office::MsoLineDashStyle::msoLineDash:
-+            pLineDash.Dots = 0;
-+            pLineDash.DotLen = 0;
-+            pLineDash.Dashes = 1;
-+            pLineDash.DashLen = 6 * nPixel;
-+            pLineDash.Distance = 4 * nPixel;
-+            break;
-+        case office::MsoLineDashStyle::msoLineDashDotDot:
-+            pLineDash.Dots = 2;
-+            pLineDash.DotLen = nPixel;
-+            pLineDash.Dashes = 1;
-+            pLineDash.DashLen = 10 * nPixel;
-+            pLineDash.Distance = 3 * nPixel;
-+            break;
-+        case office::MsoLineDashStyle::msoLineLongDash:
-+            pLineDash.Dots = 0;
-+            pLineDash.DotLen = 0;
-+            pLineDash.Dashes = 1;
-+            pLineDash.DashLen = 10 * nPixel;
-+            pLineDash.Distance = 4 * nPixel;
-+            break;
-+        case office::MsoLineDashStyle::msoLineSquareDot:
-+            pLineDash.Dots = 1;
-+            pLineDash.DotLen = nPixel;
-+            pLineDash.Dashes = 0;
-+            pLineDash.DashLen = 0;
-+            pLineDash.Distance = nPixel;
-+            break;
-+        case office::MsoLineDashStyle::msoLineRoundDot:
-+            pLineDash.Dots = 1;
-+            pLineDash.DotLen = nPixel;
-+            pLineDash.Dashes = 0;
-+            pLineDash.DashLen = 0;
-+            pLineDash.Distance = nPixel;
-+            break;
-+        default:
-+            throw uno::RuntimeException( rtl::OUString::createFromAscii("this MsoLineDashStyle is not supported."), uno::Reference< uno::XInterface >() );
-+        }
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineDash" ), uno::makeAny( pLineDash ) );
-+    }
-+}
-+
-+// Methods
-+uno::Reference< msforms::XColorFormat > SAL_CALL
-+ScVbaLineFormat::BackColor() throw (uno::RuntimeException)
-+{
-+    return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_BACKCOLOR ) );
-+}
-+
-+uno::Reference< msforms::XColorFormat > SAL_CALL
-+ScVbaLineFormat::ForeColor() throw (uno::RuntimeException)
-+{
-+    return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_FORECOLOR ) );
-+}
-+
-+
-+rtl::OUString& 
-+ScVbaLineFormat::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLineFormat") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaLineFormat::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.LineFormat" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+
-diff --git vbahelper/source/vbahelper/vbalineformat.hxx vbahelper/source/vbahelper/vbalineformat.hxx
-new file mode 100644
-index 0000000..a6287e4
---- /dev/null
-+++ vbahelper/source/vbahelper/vbalineformat.hxx
-@@ -0,0 +1,85 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbalineformat.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_XLINEFORMAT_HXX
-+#define SC_VBA_XLINEFORMAT_HXX
-+
-+#include <com/sun/star/drawing/XShape.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <ooo/vba/msforms/XLineFormat.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ov::msforms::XLineFormat > ScVbaLineFormat_BASE;
-+
-+class ScVbaLineFormat : public ScVbaLineFormat_BASE
-+{
-+private:
-+    css::uno::Reference< css::drawing::XShape > m_xShape;
-+    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
-+    sal_Int32 m_nLineDashStyle;
-+    double m_nLineWeight;
-+protected:
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+    sal_Int32 convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName );
-+    rtl::OUString convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (css::uno::RuntimeException);
-+    sal_Int32 calculateArrowheadSize();
-+public:
-+    ScVbaLineFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape );
-+
-+    // Attributes
-+    virtual sal_Int32 SAL_CALL getBeginArrowheadStyle() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getBeginArrowheadLength() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setBeginArrowheadLength( sal_Int32 _beginarrowheadlength ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getBeginArrowheadWidth() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setBeginArrowheadWidth( sal_Int32 _beginarrowheadwidth ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getEndArrowheadStylel() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setEndArrowheadStylel( sal_Int32 _endarrowheadstylel ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getEndArrowheadLength() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setEndArrowheadLength( sal_Int32 _endarrowheadlength ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getEndArrowheadWidth() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setEndArrowheadWidth( sal_Int32 _endarrowheadwidth ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getWeight() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setWeight( double _weight ) throw (css::uno::RuntimeException);
-+    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException);
-+    virtual sal_Int16 SAL_CALL getStyle() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setStyle( sal_Int16 _style ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getDashStyle() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setDashStyle( sal_Int32 _dashstyle ) throw (css::uno::RuntimeException);
-+
-+    // Methods
-+    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException);
-+};
-+
-+#endif//SC_VBA_XLINEFORMAT_HXX
-diff --git vbahelper/source/vbahelper/vbapagesetupbase.cxx vbahelper/source/vbahelper/vbapagesetupbase.cxx
-new file mode 100644
-index 0000000..569b204
---- /dev/null
-+++ vbahelper/source/vbahelper/vbapagesetupbase.cxx
-@@ -0,0 +1,325 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <vbahelper/vbapagesetupbase.hxx>
-+
-+using namespace ::com::sun::star;
-+using namespace ::ooo::vba;
-+
-+VbaPageSetupBase::VbaPageSetupBase(const uno::Reference< XHelperInterface >& xParent, 
-+				const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException): VbaPageSetupBase_BASE( xParent, xContext )
-+{
-+}		
-+
-+double SAL_CALL VbaPageSetupBase::getTopMargin() throw (css::uno::RuntimeException)
-+{
-+    sal_Bool headerOn = sal_False;
-+    sal_Int32 topMargin = 0;
-+    sal_Int32 headerHeight = 0;
-+
-+    try
-+    {
-+        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")));
-+        aValue >>= headerOn;
-+
-+        aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")));
-+        aValue >>= topMargin;
-+
-+        if( headerOn )
-+        {
-+            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")));
-+            aValue >>= headerHeight;
-+            topMargin = topMargin + headerHeight;
-+        }
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+    
-+    return Millimeter::getInPoints( topMargin );
-+}
-+
-+void SAL_CALL VbaPageSetupBase::setTopMargin( double margin ) throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 topMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
-+    sal_Bool headerOn = sal_False;
-+    sal_Int32 headerHeight = 0;
-+
-+    try
-+    {
-+        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")));
-+        aValue >>= headerOn;
-+        
-+        if( headerOn )
-+        {
-+            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight")));
-+            aValue >>= headerHeight;
-+            topMargin -= headerHeight;
-+        }
-+
-+        aValue <<= topMargin;
-+        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")), aValue );
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+}
-+
-+double SAL_CALL VbaPageSetupBase::getBottomMargin() throw (css::uno::RuntimeException)
-+{
-+    sal_Bool footerOn = sal_False;
-+    sal_Int32 bottomMargin = 0;
-+    sal_Int32 footerHeight = 0;
-+
-+    try
-+    {
-+        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")));
-+        aValue >>= footerOn;
-+
-+        aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")));
-+        aValue >>= bottomMargin;
-+
-+        if( footerOn )
-+        {
-+            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight")));
-+            aValue >>= footerHeight;
-+            bottomMargin += footerHeight;
-+        }
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+    
-+    return Millimeter::getInPoints( bottomMargin );
-+}
-+
-+void SAL_CALL VbaPageSetupBase::setBottomMargin( double margin ) throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 bottomMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
-+    sal_Bool footerOn = sal_False;
-+    sal_Int32 footerHeight = 0;
-+
-+    try
-+    {
-+        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")));
-+        aValue >>= footerOn;
-+        
-+        if( footerOn )
-+        {
-+            aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight")));
-+            aValue >>= footerHeight;
-+            bottomMargin -= footerHeight;
-+        }
-+
-+        aValue <<= bottomMargin;
-+        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), aValue );
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+}
-+
-+double SAL_CALL VbaPageSetupBase::getRightMargin() throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 rightMargin = 0;
-+    try
-+    {
-+        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin")));
-+        aValue >>= rightMargin;
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+    
-+    return Millimeter::getInPoints( rightMargin );;
-+}
-+
-+void SAL_CALL VbaPageSetupBase::setRightMargin( double margin ) throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 rightMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
-+    try
-+    {
-+        uno::Any aValue;
-+        aValue <<= rightMargin;
-+        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin")), aValue );
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+
-+}
-+
-+double SAL_CALL VbaPageSetupBase::getLeftMargin() throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 leftMargin = 0;
-+    try
-+    {
-+        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin")));
-+        aValue >>= leftMargin;
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+    
-+    return Millimeter::getInPoints( leftMargin );;
-+}
-+
-+void SAL_CALL VbaPageSetupBase::setLeftMargin( double margin ) throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 leftMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
-+    try
-+    {
-+        uno::Any aValue;
-+        aValue <<= leftMargin;
-+        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LeftMargin")), aValue );
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+}
-+
-+double SAL_CALL VbaPageSetupBase::getHeaderMargin() throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 headerMargin = 0;
-+    try
-+    {
-+        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")));
-+        aValue >>= headerMargin;
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+    
-+    return Millimeter::getInPoints( headerMargin );;
-+}
-+
-+void SAL_CALL VbaPageSetupBase::setHeaderMargin( double margin ) throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 headerMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
-+    try
-+    {
-+        uno::Any aValue;
-+        aValue <<= headerMargin;
-+        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin")), aValue );
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+}
-+
-+double SAL_CALL VbaPageSetupBase::getFooterMargin() throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 footerMargin = 0;
-+    try
-+    {
-+        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")));
-+        aValue >>= footerMargin;
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+    
-+    return Millimeter::getInPoints( footerMargin );;
-+}
-+
-+void SAL_CALL VbaPageSetupBase::setFooterMargin( double margin ) throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 footerMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
-+    try
-+    {
-+        uno::Any aValue;
-+        aValue <<= footerMargin;
-+        mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), aValue );
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+}
-+
-+sal_Int32 SAL_CALL VbaPageSetupBase::getOrientation() throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 orientation = mnOrientPortrait;
-+    try
-+    {
-+        sal_Bool isLandscape = sal_False;
-+        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")));
-+        aValue >>= isLandscape;
-+
-+        if( isLandscape )
-+        {
-+            orientation = mnOrientLandscape;
-+        }
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+    return orientation;
-+}
-+
-+void SAL_CALL VbaPageSetupBase::setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException)
-+{
-+    if( ( orientation != mnOrientPortrait ) &&
-+        ( orientation != mnOrientLandscape ) )
-+    {
-+        DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
-+    }
-+
-+    try
-+    {
-+        sal_Bool isLandscape = sal_False;
-+        uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")));
-+        aValue >>= isLandscape;
-+
-+        sal_Bool switchOrientation = sal_False;
-+        if(( isLandscape && orientation != mnOrientLandscape ) || 
-+            ( !isLandscape && orientation != mnOrientPortrait ))
-+        {
-+            switchOrientation = sal_True;
-+        }
-+
-+        if( switchOrientation )
-+        {
-+            aValue <<= !isLandscape;
-+            uno::Any aHeight = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height")));
-+            uno::Any aWidth = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width")));
-+            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IsLandscape")), aValue );
-+            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width")),  aHeight );
-+            mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height")), aWidth );
-+        }
-+
-+        if( isLandscape )
-+        {
-+            orientation = mnOrientLandscape;
-+        }
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }
-+}
-+
-diff --git vbahelper/source/vbahelper/vbapictureformat.cxx vbahelper/source/vbahelper/vbapictureformat.cxx
-new file mode 100644
-index 0000000..2663682
---- /dev/null
-+++ vbahelper/source/vbahelper/vbapictureformat.cxx
-@@ -0,0 +1,147 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbapictureformat.cxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include "vbapictureformat.hxx"
-+
-+using namespace ooo::vba;
-+using namespace com::sun::star;
-+
-+ScVbaPictureFormat::ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent,
-+    const css::uno::Reference< css::uno::XComponentContext >& xContext,
-+    uno::Reference< drawing::XShape > xShape ) 
-+    throw( lang::IllegalArgumentException ) : ScVbaPictureFormat_BASE( xParent, xContext ), m_xShape( xShape )
-+{
-+    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
-+}
-+
-+void
-+ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException)
-+{
-+    if( nRange < nMin )
-+    {
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter out of range, value is too small.") , uno::Reference< uno::XInterface >() );
-+    }
-+    if( nRange > nMax )
-+    {
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter out of range, value is too high.") , uno::Reference< uno::XInterface >() );
-+    }
-+}
-+
-+// Attributes
-+double SAL_CALL 
-+ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException)
-+{
-+    sal_Int16 nLuminance = 0;
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance") ) >>= nLuminance;
-+    double fBrightness = static_cast< double >( nLuminance );
-+    fBrightness = ( fBrightness +100 ) / 200;
-+    return fBrightness; 
-+}
-+
-+void SAL_CALL 
-+ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeException)
-+{
-+    checkParameterRangeInDouble( _brightness, 0.0, 1.0 );
-+    double fLuminance = _brightness * 200 - 100;
-+    sal_Int16 nLuminance = static_cast< sal_Int16 >( fLuminance );
-+    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance"), uno::makeAny( nLuminance ) ); 
-+}
-+
-+double SAL_CALL 
-+ScVbaPictureFormat::getContrast() throw (uno::RuntimeException)
-+{
-+    sal_Int16 nContrast = 0;
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustContrast") ) >>= nContrast;
-+    double fContrast = static_cast< double >( nContrast );
-+    fContrast = ( fContrast + 100 ) / 200;
-+    return fContrast;
-+}
-+
-+void SAL_CALL 
-+ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException)
-+{
-+    checkParameterRangeInDouble( _contrast, 0.0, 1.0 );
-+    double fContrast = _contrast * 200 - 100;
-+    sal_Int16 nContrast = static_cast< sal_Int16 >( fContrast );
-+    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustContrast"), uno::makeAny( nContrast ) );
-+}
-+
-+
-+// Methods
-+void SAL_CALL 
-+ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeException)
-+{
-+    double fBrightness = getBrightness();
-+    fBrightness += increment;
-+    if( fBrightness < 0 )
-+    {
-+        fBrightness = 0.0;
-+    }
-+    if( fBrightness > 1 )
-+    {
-+        fBrightness = 1;
-+    }
-+    setBrightness( fBrightness );
-+}
-+
-+void SAL_CALL 
-+ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeException)
-+{
-+    double nContrast = getContrast();
-+    nContrast += increment;
-+    if( increment < 0 )
-+    {
-+        increment = 0.0;
-+    }
-+    if( increment > 1 )
-+    {
-+        increment = 1.0;
-+    }
-+    setContrast( nContrast );
-+}
-+
-+
-+rtl::OUString&
-+ScVbaPictureFormat::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPictureFormat") );
-+    return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString >
-+ScVbaPictureFormat::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.PictureFormat" ) );
-+    }
-+    return aServiceNames;
-+}
-diff --git vbahelper/source/vbahelper/vbapictureformat.hxx vbahelper/source/vbahelper/vbapictureformat.hxx
-new file mode 100644
-index 0000000..a549b88
---- /dev/null
-+++ vbahelper/source/vbahelper/vbapictureformat.hxx
-@@ -0,0 +1,64 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbapictureformat.hxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_PICTUREFORMAT_HXX
-+#define SC_VBA_PICTUREFORMAT_HXX
-+
-+#include <com/sun/star/drawing/XShape.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <ooo/vba/msforms/XPictureFormat.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ov::msforms::XPictureFormat > ScVbaPictureFormat_BASE;
-+
-+class ScVbaPictureFormat : public ScVbaPictureFormat_BASE
-+{
-+private:
-+    css::uno::Reference< css::drawing::XShape > m_xShape;
-+    css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
-+protected:
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+private:
-+    void checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException);
-+public:
-+    ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::drawing::XShape > xShape ) throw( css::lang::IllegalArgumentException );
-+
-+    // Attributes
-+    virtual double SAL_CALL getBrightness() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setBrightness( double _brightness ) throw (css::uno::RuntimeException);
-+    virtual double SAL_CALL getContrast() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setContrast( double _contrast ) throw (css::uno::RuntimeException);
-+
-+    // Methods
-+    virtual void SAL_CALL IncrementBrightness( double increment ) throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL IncrementContrast( double increment ) throw (css::uno::RuntimeException);
-+};
-+
-+#endif//SC_VBA_PICTUREFORMAT_HXX
-diff --git vbahelper/source/vbahelper/vbashape.cxx vbahelper/source/vbahelper/vbashape.cxx
-new file mode 100644
-index 0000000..5a8dbd6
---- /dev/null
-+++ vbahelper/source/vbahelper/vbashape.cxx
-@@ -0,0 +1,679 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbashape.cxx,v $
-+ * $Revision: 1.4 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include<ooo/vba/office/MsoZOrderCmd.hpp>
-+#include<ooo/vba/office/MsoScaleFrom.hpp>
-+#include<com/sun/star/container/XNamed.hpp>
-+#include<com/sun/star/drawing/ConnectorType.hpp>
-+#include <com/sun/star/lang/XEventListener.hpp>
-+#include<com/sun/star/drawing/XDrawPagesSupplier.hpp>
-+#include<com/sun/star/drawing/XDrawPages.hpp>
-+#include<com/sun/star/view/XSelectionSupplier.hpp>
-+#include <com/sun/star/lang/XServiceInfo.hpp>
-+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#include <com/sun/star/text/TextContentAnchorType.hpp>
-+#include <ooo/vba/word/WdRelativeHorizontalPosition.hpp>
-+#include <ooo/vba/word/WdRelativeVerticalPosition.hpp>
-+
-+#include <comphelper/processfactory.hxx>
-+#include <vos/mutex.hxx>
-+#include <vcl/svapp.hxx>
-+#include <svx/unopage.hxx>
-+#include <svx/unoshape.hxx>
-+
-+#include <vbahelper/vbashape.hxx>
-+#include <vbahelper/vbatextframe.hxx>
-+#include "vbalineformat.hxx"
-+#include "vbafillformat.hxx"
-+#include "vbapictureformat.hxx"
-+#include <vbahelper/vbashaperange.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+using namespace ::vos;
-+
-+ScVbaShape::ScVbaShape( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, sal_Int32 nType ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( xParent, xContext ), m_xShape( xShape ), m_xShapes( xShapes ), m_nType( nType )
-+{
-+    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
-+    m_pShapeHelper.reset( new ShapeHelper( m_xShape ) );
-+    addListeners();
-+}
-+
-+ScVbaShape::ScVbaShape( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( uno::Reference< XHelperInterface >(), xContext ), m_xShape( xShape )
-+{
-+    // add listener
-+    addListeners();
-+}
-+
-+ScVbaShape::~ScVbaShape()
-+{ 
-+    // dtor must never ever throw
-+    /*try
-+    {
-+        removeShapeListener();
-+        removeShapesListener();
-+    }
-+    catch( uno::Exception& )
-+    {
-+    }*/   
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException )
-+{
-+    try
-+    {
-+    uno::Reference< drawing::XShapes > xShapes( rEventObject.Source, uno::UNO_QUERY );
-+    uno::Reference< drawing::XShape > xShape( rEventObject.Source, uno::UNO_QUERY );
-+    if ( xShapes.is() )
-+        removeShapesListener();
-+    if ( xShape.is() )
-+        removeShapeListener();
-+    }    
-+    catch( uno::Exception& )
-+    {
-+    }
-+}
-+
-+
-+void ScVbaShape::addListeners()
-+{
-+    uno::Reference< lang::XComponent > xComponent( m_xShape, uno::UNO_QUERY );
-+    if ( xComponent.is() )
-+    	xComponent->addEventListener( this );
-+
-+    xComponent.set( m_xShapes, uno::UNO_QUERY );
-+    if ( xComponent.is() )
-+    	xComponent->addEventListener( this );
-+}
-+
-+void
-+ScVbaShape::removeShapeListener() throw( uno::RuntimeException )
-+{
-+    if( m_xShape.is() )
-+    {
-+        uno::Reference< lang::XComponent > xComponent( m_xShape, uno::UNO_QUERY_THROW );
-+        xComponent->removeEventListener( this );
-+    }
-+    m_xShape = NULL;
-+    m_xPropertySet = NULL;
-+}
-+
-+void
-+ScVbaShape::removeShapesListener() throw( uno::RuntimeException )
-+{
-+    if( m_xShapes.is() )
-+    {
-+        uno::Reference< lang::XComponent > xComponent( m_xShapes, uno::UNO_QUERY_THROW );
-+        xComponent->removeEventListener( this );
-+    }
-+    m_xShapes = NULL;
-+}
-+
-+sal_Int32 
-+ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw (uno::RuntimeException)
-+{
-+    rtl::OUString sShapeType;
-+    uno::Reference< drawing::XShapeDescriptor > xShapeDescriptor( xShape, uno::UNO_QUERY_THROW );
-+    sShapeType = xShapeDescriptor->getShapeType();
-+    OSL_TRACE("ScVbaShape::getType: %s", rtl::OUStringToOString( sShapeType, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    // office::MsoShapeType::msoDiagram to "com.sun.star.drawing.GroupShape"
-+    if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.GroupShape" ) ) )
-+        return office::MsoShapeType::msoGroup;
-+    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) ) )
-+        return office::MsoShapeType::msoPicture;
-+    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ControlShape" ) ) || 
-+            sShapeType.equals( rtl::OUString::createFromAscii( "FrameShape" ) ) )
-+        return office::MsoShapeType::msoOLEControlObject;
-+    // OOo don't support office::MsoShapeType::msoComment as a Shape.
-+    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.OLE2Shape" ) ) )
-+        return office::MsoShapeType::msoChart;
-+    // Art characters office::MsoShapeType::msoTextEffect, in OOo corresponding to "com.sun.star.drawing.CustomShape"
-+    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ConnectorShape" ) ) )
-+    {
-+        enum drawing::ConnectorType connectorType;
-+        uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
-+        xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("EdgeKind")) >>= connectorType;
-+        if( connectorType == drawing::ConnectorType_CURVE )
-+            return office::MsoShapeType::msoFreeform;
-+        else if( connectorType == drawing::ConnectorType_LINE )
-+            return office::MsoShapeType::msoLine;
-+        else 
-+            return office::MsoShapeType::msoAutoShape;
-+    }
-+    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.LineShape" ) ) )
-+        return office::MsoShapeType::msoLine;
-+    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.CustomShape" ) ) ||
-+            sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape") ) )
-+        return office::MsoShapeType::msoAutoShape;
-+    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.TextShape" ) ) )
-+        return office::MsoShapeType::msoTextBox;
-+    else
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii( "the shape type do not be supported: " ) + sShapeType, uno::Reference< uno::XInterface >() );
-+}
-+
-+// Attributes
-+rtl::OUString SAL_CALL 
-+ScVbaShape::getName() throw (uno::RuntimeException)
-+{
-+    rtl::OUString sName;
-+    uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW );
-+    sName = xNamed->getName();
-+    return sName;
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW );
-+    xNamed->setName( _name );
-+}
-+
-+double SAL_CALL 
-+ScVbaShape::getHeight() throw (uno::RuntimeException)
-+{
-+    return m_pShapeHelper->getHeight();
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::setHeight( double _height ) throw (uno::RuntimeException)
-+{
-+    m_pShapeHelper->setHeight( _height );
-+}
-+
-+double SAL_CALL 
-+ScVbaShape::getWidth() throw (uno::RuntimeException)
-+{
-+    return m_pShapeHelper->getWidth();
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::setWidth( double _width ) throw (uno::RuntimeException)
-+{
-+    m_pShapeHelper->setWidth( _width );
-+}
-+
-+double SAL_CALL 
-+ScVbaShape::getLeft() throw (uno::RuntimeException)
-+{
-+    return m_pShapeHelper->getLeft();
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException)
-+{
-+    m_pShapeHelper->setLeft( _left );
-+}
-+
-+double SAL_CALL 
-+ScVbaShape::getTop() throw (uno::RuntimeException)
-+{
-+    return m_pShapeHelper->getTop();
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::setTop( double _top ) throw (uno::RuntimeException)
-+{
-+    return m_pShapeHelper->setTop( _top );
-+}
-+
-+sal_Bool SAL_CALL 
-+ScVbaShape::getVisible() throw (uno::RuntimeException)
-+{
-+    //UNO Shapes are always visible
-+    return sal_True;
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::setVisible( sal_Bool /*_visible*/ ) throw (uno::RuntimeException)
-+{
-+    //UNO Shapes are always visible
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaShape::getZOrderPosition() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nZOrderPosition = 0;
-+    uno::Any aZOrderPosition =  m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ) );
-+    aZOrderPosition >>= nZOrderPosition;
-+    return nZOrderPosition + 1;
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaShape::getType() throw (uno::RuntimeException)
-+{
-+    return m_nType;
-+}
-+
-+double SAL_CALL 
-+ScVbaShape::getRotation() throw (uno::RuntimeException)
-+{
-+    double dRotation = 0;
-+    sal_Int32 nRotation = 0;
-+    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "RotateAngle" ) ) >>= nRotation;
-+    dRotation = static_cast< double >( nRotation /100 );
-+    return dRotation;
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::setRotation( double _rotation ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nRotation = static_cast < sal_Int32 > ( _rotation * 100 );
-+    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "RotateAngle" ), uno::makeAny( nRotation ) );
-+}
-+
-+uno::Reference< msforms::XLineFormat > SAL_CALL 
-+ScVbaShape::getLine() throw (uno::RuntimeException)
-+{
-+    // TODO should ongly return line
-+    return uno::Reference< msforms::XLineFormat >( new ScVbaLineFormat( this, mxContext, m_xShape ) );
-+}
-+
-+uno::Reference< msforms::XFillFormat > SAL_CALL
-+ScVbaShape::getFill() throw (uno::RuntimeException)
-+{
-+    return uno::Reference< msforms::XFillFormat >( new ScVbaFillFormat( this, mxContext, m_xShape ) );
-+}
-+
-+uno::Reference<  msforms::XPictureFormat > SAL_CALL
-+ScVbaShape::getPictureFormat() throw (uno::RuntimeException)
-+{
-+    return uno::Reference< msforms::XPictureFormat >( new ScVbaPictureFormat( this, mxContext, m_xShape ) );
-+}
-+
-+// Methods
-+uno::Any SAL_CALL 
-+ScVbaShape::TextFrame() throw (uno::RuntimeException)
-+{
-+    uno::Reference< frame::XModel > xModel = getCurrentDocument();
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( xModel, uno::UNO_QUERY_THROW );
-+    if( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument" ) ) ) )
-+    {
-+        uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+        uno::Sequence< uno::Any > aArgs(2);
-+        aArgs[0] = uno::makeAny( getParent() );
-+        aArgs[1] <<= m_xShape;
-+        uno::Reference< uno::XInterface > xTextFrame( xSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.TextFrame") ) , aArgs ) , uno::UNO_QUERY_THROW );
-+        return uno::makeAny( xTextFrame );
-+    }
-+
-+    return uno::makeAny( uno::Reference< msforms::XTextFrame >( new VbaTextFrame( this, mxContext, m_xShape ) ) );
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::Delete() throw (uno::RuntimeException)
-+{
-+    OGuard aGuard( Application::GetSolarMutex() );
-+    m_xShapes->remove( m_xShape );
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nOrderPositon;
-+    uno::Any aOrderPostion = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ) );
-+    aOrderPostion >>= nOrderPositon;
-+    switch( ZOrderCmd )
-+    {
-+    case office::MsoZOrderCmd::msoBringToFront:
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( SAL_MAX_INT32 ) );
-+        break;
-+    case office::MsoZOrderCmd::msoSendToBack:
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( (sal_Int32)0 ) );
-+        break;
-+    case office::MsoZOrderCmd::msoBringForward:
-+        nOrderPositon += 1;
-+        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( nOrderPositon ) );
-+        break;
-+    case office::MsoZOrderCmd::msoSendBackward:
-+        if( nOrderPositon > 0 )
-+        {
-+            nOrderPositon -= 1;
-+            m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( nOrderPositon ) );
-+        }
-+        break;
-+    // below two commands use with Writer for text and image object.
-+    case office::MsoZOrderCmd::msoBringInFrontOfText:
-+    case office::MsoZOrderCmd::msoSendBehindText:
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii( "This ZOrderCmd is not implemented, it is use with writer." ), uno::Reference< uno::XInterface >() );
-+    default:
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Parameter." ), uno::Reference< uno::XInterface >() );
-+    }
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::IncrementRotation( double Increment ) throw (uno::RuntimeException)
-+{
-+    double nCurrentRotation = getRotation();
-+    nCurrentRotation += Increment;
-+    setRotation(nCurrentRotation);
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::IncrementLeft( double Increment ) throw (uno::RuntimeException)
-+{
-+    double nCurrentLeft = getLeft();
-+    nCurrentLeft += Increment;
-+    setLeft(nCurrentLeft);
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::IncrementTop( double Increment ) throw (uno::RuntimeException)
-+{
-+    double nCurrentTop = getTop();
-+    nCurrentTop += Increment;
-+    setTop(nCurrentTop);
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException)
-+{
-+    double nHeight = getHeight();
-+    double nNewHeight = nHeight * Factor;
-+    if( Scale == office::MsoScaleFrom::msoScaleFromTopLeft )
-+    {
-+        setHeight(nNewHeight);
-+    }
-+    else if( Scale == office::MsoScaleFrom::msoScaleFromBottomRight )
-+    {
-+        double nDeltaHeight = nNewHeight - nHeight;
-+        double nNewTop = getTop() - nDeltaHeight;
-+        setTop(nNewTop);
-+        setHeight(nNewHeight);
-+    }
-+    else if( Scale == office::MsoScaleFrom::msoScaleFromMiddle )
-+    {
-+        double nDeltaHeight = (nNewHeight - nHeight) / 2;
-+        double nNewTop = getTop() - nDeltaHeight;
-+        setTop(nNewTop);
-+        setHeight(nNewHeight);
-+    }
-+    else
-+    {
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii( "ScaleHeight.Scale wrong value is given." ) , uno::Reference< uno::XInterface >() );
-+    }
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException)
-+{
-+    double nWidth = getWidth();
-+    double nNewWidth = nWidth * Factor;
-+    if( Scale == office::MsoScaleFrom::msoScaleFromTopLeft )
-+    {
-+        setWidth(nNewWidth);
-+    }
-+    else if( Scale == office::MsoScaleFrom::msoScaleFromBottomRight )
-+    {
-+        double nDeltaWidth = nNewWidth - nWidth;
-+        double nNewLeft = getLeft() - nDeltaWidth;
-+        setLeft(nNewLeft);
-+        setWidth(nNewWidth);
-+    }
-+    else if( Scale == office::MsoScaleFrom::msoScaleFromMiddle )
-+    {
-+        double nDeltaWidth = (nNewWidth - nWidth) / 2;
-+        double nNewLeft = getLeft() - nDeltaWidth;
-+        setLeft(nNewLeft);
-+        setWidth(nNewWidth);
-+    }
-+    else
-+    {
-+        throw uno::RuntimeException( rtl::OUString::createFromAscii( "ScaleHeight.Scale wrong value is given." ) , uno::Reference< uno::XInterface >() );
-+    }
-+}
-+
-+void SAL_CALL
-+ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException )
-+{
-+    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+    xSelectSupp->select( uno::makeAny( m_xShape ) );
-+}
-+
-+// This method should not be part of Shape, what we reall need to do is...
-+// dynamically create the appropriate objects e.g. TextBox, Oval, Picture etc. 
-+// ( e.g. the ones that really do have ShapeRange as an attribute )
-+uno::Any SAL_CALL 
-+ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException )
-+{
-+	// perhaps we should store a reference to the Shapes Collection 
-+	// in this class
-+	// but anyway this method should not even be in this class
-+	// #TODO not sure what the parent of the Shapes collection should be
-+	
-+	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec aVec;
-+	aVec.push_back( m_xShape );
-+	uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( aVec ) );
-+	uno::Reference< container::XChild > xChild( m_xShape, uno::UNO_QUERY_THROW );	
-+	// #FIXME for want of a better parent, setting this
-+	uno::Reference< msforms::XShapeRange > xShapeRange( new ScVbaShapeRange( mxParent, mxContext, xIndexAccess,  uno::Reference< drawing::XDrawPage >( xChild->getParent(), uno::UNO_QUERY_THROW ) ) );
-+	if ( index.hasValue() )
-+		return xShapeRange->Item( index, uno::Any() );
-+	return uno::makeAny( xShapeRange );
-+}
-+
-+sal_Bool SAL_CALL 
-+ScVbaShape::getLockAspectRatio() throw (uno::RuntimeException)
-+{
-+    // FIXME:
-+    return sal_False;
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::setLockAspectRatio( sal_Bool /*_lockaspectratio*/ ) throw (uno::RuntimeException)
-+{
-+    // FIXME:
-+}
-+
-+sal_Bool SAL_CALL 
-+ScVbaShape::getLockAnchor() throw (uno::RuntimeException)
-+{
-+    // FIXME:
-+    return sal_True;
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::setLockAnchor( sal_Bool /*_lockanchor*/ ) throw (uno::RuntimeException)
-+{
-+    // FIXME:
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionMargin;
-+    text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH;
-+    m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ) ) >>= eType;
-+    
-+    switch( eType )
-+    {
-+        case text::TextContentAnchorType_AT_PARAGRAPH:
-+        {
-+            nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionColumn;
-+            break;
-+        }
-+        case text::TextContentAnchorType_AT_PAGE:
-+        {
-+            nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionPage;
-+            break;
-+        }
-+        case text::TextContentAnchorType_AT_CHARACTER:
-+        {
-+            nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionCharacter;
-+            break;
-+        }
-+        case text::TextContentAnchorType_AT_FRAME:
-+        case text::TextContentAnchorType_AS_CHARACTER:
-+        {
-+            nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionMargin;
-+            break;
-+        }
-+        default:
-+        {
-+            nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionMargin;
-+        }
-+    }
-+    return nRelativeHorizontalPosition;
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException)
-+{
-+    text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH;
-+    switch( _relativehorizontalposition )
-+    {
-+        case word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionCharacter:
-+        {
-+            eType = text::TextContentAnchorType_AT_CHARACTER;
-+            break;
-+        }
-+        case word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionColumn:
-+        case word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionMargin:
-+        {
-+            eType = text::TextContentAnchorType_AT_PARAGRAPH;
-+            break;
-+        }
-+        case word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionPage:
-+        {
-+            eType = text::TextContentAnchorType_AT_PAGE;
-+            break;
-+        }
-+        default:
-+        {
-+            DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
-+        }
-+    }
-+    m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ), uno::makeAny( eType ) );
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionMargin;
-+    text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH;
-+    m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ) ) >>= eType;
-+    
-+    switch( eType )
-+    {
-+        case text::TextContentAnchorType_AT_PARAGRAPH:
-+        {
-+            nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionParagraph;
-+            break;
-+        }
-+        case text::TextContentAnchorType_AT_PAGE:
-+        {
-+            nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionPage;
-+            break;
-+        }
-+        case text::TextContentAnchorType_AT_CHARACTER:
-+        {
-+            nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionLine;
-+            break;
-+        }
-+        case text::TextContentAnchorType_AT_FRAME:
-+        case text::TextContentAnchorType_AS_CHARACTER:
-+        {
-+            nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionMargin;
-+            break;
-+        }
-+        default:
-+        {
-+            nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionMargin;
-+        }
-+    }
-+    return nRelativeVerticalPosition;
-+}
-+
-+void SAL_CALL 
-+ScVbaShape::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException)
-+{
-+    text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH;
-+    switch( _relativeverticalposition )
-+    {
-+        case word::WdRelativeVerticalPosition::wdRelativeVerticalPositionLine:
-+        {
-+            eType = text::TextContentAnchorType_AT_CHARACTER;
-+            break;
-+        }
-+        case word::WdRelativeVerticalPosition::wdRelativeVerticalPositionParagraph:
-+        case word::WdRelativeVerticalPosition::wdRelativeVerticalPositionMargin:
-+        {
-+            eType = text::TextContentAnchorType_AT_PARAGRAPH;
-+            break;
-+        }
-+        case word::WdRelativeVerticalPosition::wdRelativeVerticalPositionPage:
-+        {
-+            eType = text::TextContentAnchorType_AT_PAGE;
-+            break;
-+        }
-+        default:
-+        {
-+            DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
-+        }
-+    }
-+    m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ), uno::makeAny( eType ) );
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaShape::WrapFormat() throw (uno::RuntimeException)
-+{
-+    uno::Reference< frame::XModel > xModel = getCurrentDocument();
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( xModel, uno::UNO_QUERY_THROW );
-+    if( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) )
-+    {
-+        uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+        uno::Sequence< uno::Any > aArgs(2);
-+        aArgs[0] = uno::makeAny( getParent() );
-+        aArgs[1] <<= m_xShape;
-+        uno::Reference< uno::XInterface > xWrapFormat( xSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.WrapFormat") ) , aArgs ) , uno::UNO_QUERY_THROW );
-+        return uno::makeAny( xWrapFormat );
-+    }
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+
-+rtl::OUString& 
-+ScVbaShape::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShape") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaShape::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Shape" ) );
-+	}
-+	return aServiceNames;
-+}
-diff --git vbahelper/source/vbahelper/vbashaperange.cxx vbahelper/source/vbahelper/vbashaperange.cxx
-new file mode 100644
-index 0000000..ae1a1fb
---- /dev/null
-+++ vbahelper/source/vbahelper/vbashaperange.cxx
-@@ -0,0 +1,383 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbashaperange.cxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <com/sun/star/drawing/XShapeGrouper.hpp>
-+#include <com/sun/star/drawing/XDrawPage.hpp>
-+#include<com/sun/star/view/XSelectionSupplier.hpp>
-+
-+#include <vbahelper/vbahelper.hxx>
-+#include <vbahelper/vbashaperange.hxx>
-+#include <vbahelper/vbashape.hxx>
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+class VbShapeRangeEnumHelper : public EnumerationHelper_BASE
-+{
-+        uno::Reference< XCollection > m_xParent;
-+        uno::Reference<container::XIndexAccess > m_xIndexAccess;
-+        sal_Int32 nIndex;
-+public:
-+	VbShapeRangeEnumHelper( const uno::Reference< XCollection >& xParent,  const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
-+        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
-+        {
-+                return ( nIndex < m_xIndexAccess->getCount() );
-+        }
-+        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+        {
-+                ScVbaShapeRange* pCollectionImpl = dynamic_cast< ScVbaShapeRange* >(m_xParent.get());
-+                if ( pCollectionImpl && hasMoreElements() )
-+                    return pCollectionImpl->createCollectionObject(  m_xIndexAccess->getByIndex( nIndex++ ) );
-+                throw container::NoSuchElementException();
-+        }
-+
-+};
-+
-+ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xShapes, const uno::Reference< drawing::XDrawPage >& xDrawPage ) : ScVbaShapeRange_BASE( xParent, xContext, xShapes ), m_xDrawPage( xDrawPage ), m_nShapeGroupCount(0)
-+{
-+}
-+
-+// Methods
-+void SAL_CALL 
-+ScVbaShapeRange::Select(  ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+    xSelectSupp->select( uno::makeAny( getShapes() ) );
-+}
-+
-+uno::Reference< msforms::XShape > SAL_CALL 
-+ScVbaShapeRange::Group() throw (uno::RuntimeException)
-+{
-+    uno::Reference< drawing::XShapeGrouper > xShapeGrouper( m_xDrawPage, uno::UNO_QUERY_THROW );
-+    uno::Reference< drawing::XShapeGroup > xShapeGroup( xShapeGrouper->group( getShapes() ), uno::UNO_QUERY_THROW );
-+    uno::Reference< drawing::XShape > xShape( xShapeGroup, uno::UNO_QUERY_THROW );
-+    return uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, getShapes(), office::MsoShapeType::msoGroup ) );
-+}
-+
-+uno::Reference< drawing::XShapes > 
-+ScVbaShapeRange::getShapes() throw (uno::RuntimeException)
-+{
-+	if ( !m_xShapes.is() )
-+	{
-+		uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+		m_xShapes.set( xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.drawing.ShapeCollection" ) ), uno::UNO_QUERY_THROW );
-+		sal_Int32 nLen = m_xIndexAccess->getCount();
-+		for ( sal_Int32 index = 0; index < nLen; ++index )
-+			m_xShapes->add( uno::Reference< drawing::XShape >( m_xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW ) );
-+
-+	}
-+	return m_xShapes;
-+}
-+
-+
-+void SAL_CALL 
-+ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		xShape->IncrementRotation( Increment );
-+	}
-+}
-+
-+void SAL_CALL 
-+ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		xShape->IncrementLeft( Increment );
-+	}
-+}
-+
-+void SAL_CALL 
-+ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		xShape->IncrementTop( Increment );
-+	}
-+}
-+
-+double SAL_CALL ScVbaShapeRange::getHeight() throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->getHeight( );
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+void SAL_CALL ScVbaShapeRange::setHeight( double _height ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		xShape->setHeight( _height );
-+	}
-+}
-+
-+double SAL_CALL ScVbaShapeRange::getWidth() throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->getWidth( );
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+void SAL_CALL ScVbaShapeRange::setWidth( double _width ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		xShape->setWidth( _width );
-+	}
-+}
-+
-+double SAL_CALL ScVbaShapeRange::getLeft() throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->getLeft();
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+void SAL_CALL ScVbaShapeRange::setLeft( double _left ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		xShape->setLeft( _left );
-+	}
-+}
-+
-+double SAL_CALL ScVbaShapeRange::getTop() throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->getTop();
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+void SAL_CALL ScVbaShapeRange::setTop( double _top ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		xShape->setTop( _top );
-+	}
-+}
-+
-+uno::Reference< ov::msforms::XLineFormat > SAL_CALL ScVbaShapeRange::getLine() throw (css::uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->getLine();
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+uno::Reference< ov::msforms::XFillFormat > SAL_CALL ScVbaShapeRange::getFill() throw (css::uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->getFill();
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+::sal_Bool SAL_CALL ScVbaShapeRange::getLockAspectRatio() throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->getLockAspectRatio();
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+void SAL_CALL ScVbaShapeRange::setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		xShape->setLockAspectRatio( _lockaspectratio );
-+	}
-+}
-+
-+::sal_Bool SAL_CALL ScVbaShapeRange::getLockAnchor() throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->getLockAnchor();
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+void SAL_CALL ScVbaShapeRange::setLockAnchor( ::sal_Bool _lockanchor ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		xShape->setLockAnchor( _lockanchor );
-+	}
-+}
-+
-+::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeHorizontalPosition() throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->getRelativeHorizontalPosition();
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+void SAL_CALL ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		xShape->setRelativeHorizontalPosition( _relativehorizontalposition );
-+	}
-+}
-+
-+::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeVerticalPosition() throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->getRelativeVerticalPosition();
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+void SAL_CALL ScVbaShapeRange::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		xShape->setRelativeVerticalPosition( _relativeverticalposition );
-+	}
-+}
-+
-+uno::Any SAL_CALL ScVbaShapeRange::TextFrame(  ) throw (css::uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->TextFrame();
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+uno::Any SAL_CALL ScVbaShapeRange::WrapFormat(  ) throw (css::uno::RuntimeException)
-+{
-+	sal_Int32 nLen = getCount();
-+	for ( sal_Int32 index = 1; index <= nLen; ++index )
-+	{
-+		uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
-+		return xShape->WrapFormat();
-+	}
-+    throw uno::RuntimeException();
-+}
-+
-+uno::Type SAL_CALL
-+ScVbaShapeRange::getElementType() throw (uno::RuntimeException)
-+{
-+    return msforms::XShape::static_type(0);
-+}
-+
-+uno::Reference< container::XEnumeration > SAL_CALL 
-+ScVbaShapeRange::createEnumeration() throw (uno::RuntimeException)
-+{
-+	return new VbShapeRangeEnumHelper( this, m_xIndexAccess );
-+}
-+
-+uno::Any
-+ScVbaShapeRange:: createCollectionObject( const css::uno::Any& aSource )
-+{
-+	uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW );
-+	// #TODO  #FIXME Shape parent should always be the sheet the shapes belong 
-+	// to 
-+	uno::Reference< msforms::XShape > xVbShape( new ScVbaShape( uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), ScVbaShape::getType( xShape ) ) ); 
-+        return uno::makeAny( xVbShape );
-+}
-+
-+rtl::OUString& 
-+ScVbaShapeRange::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapeRange") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaShapeRange::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.ShapeRange" ) );
-+	}
-+	return aServiceNames;
-+}
-diff --git vbahelper/source/vbahelper/vbashapes.cxx vbahelper/source/vbahelper/vbashapes.cxx
-new file mode 100644
-index 0000000..6515c6e
---- /dev/null
-+++ vbahelper/source/vbahelper/vbashapes.cxx
-@@ -0,0 +1,493 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbashapes.cxx,v $
-+ * $Revision: 1.3.32.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <com/sun/star/container/XNamed.hpp>
-+#include <com/sun/star/view/XSelectionSupplier.hpp>
-+#include <com/sun/star/text/WrapTextMode.hpp>
-+#include <ooo/vba/msforms/XShapeRange.hpp>
-+#include <ooo/vba/office/MsoAutoShapeType.hpp>
-+#include <ooo/vba/office/MsoTextOrientation.hpp>
-+#include <com/sun/star/lang/XServiceInfo.hpp>
-+#include <com/sun/star/text/XText.hpp>
-+#include <com/sun/star/text/XTextDocument.hpp>
-+#include <com/sun/star/text/XTextContent.hpp>
-+#include <com/sun/star/text/TextContentAnchorType.hpp>
-+#include <com/sun/star/text/HoriOrientation.hpp>
-+#include <com/sun/star/text/VertOrientation.hpp>
-+#include <com/sun/star/text/RelOrientation.hpp>
-+#include <com/sun/star/text/SizeType.hpp>
-+#include <com/sun/star/text/WritingMode.hpp>
-+#include <com/sun/star/drawing/LineStyle.hpp>
-+
-+#include <vbahelper/vbahelper.hxx>
-+#include <vbahelper/vbashape.hxx>
-+#include <vbahelper/vbashapes.hxx>
-+#include <vbahelper/vbashaperange.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+class VbShapeEnumHelper : public EnumerationHelper_BASE
-+{
-+        uno::Reference<msforms::XShapes > m_xParent;
-+        uno::Reference<container::XIndexAccess > m_xIndexAccess;
-+        sal_Int32 nIndex;
-+public:
-+	VbShapeEnumHelper( const uno::Reference< msforms::XShapes >& xParent,  const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
-+        virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
-+        {
-+                return ( nIndex < m_xIndexAccess->getCount() );
-+        }
-+        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-+        {
-+                ScVbaShapes* pShapes = dynamic_cast< ScVbaShapes* >(m_xParent.get());
-+                if ( pShapes && hasMoreElements() )
-+                    return pShapes->createCollectionObject(  m_xIndexAccess->getByIndex( nIndex++ ) );
-+                throw container::NoSuchElementException();
-+        }
-+
-+};
-+
-+void ScVbaShapes::initBaseCollection()
-+{
-+	if ( m_xNameAccess.is() ) // already has NameAccess
-+		return;
-+	// no NameAccess then use ShapeCollectionHelper
-+	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec mShapes;
-+	sal_Int32 nLen = m_xIndexAccess->getCount();
-+	mShapes.reserve( nLen );
-+	for ( sal_Int32 index=0; index<nLen; ++index )
-+		mShapes.push_back( uno::Reference< drawing::XShape >( m_xIndexAccess->getByIndex( index ) , uno::UNO_QUERY ) );
-+	uno::Reference< container::XIndexAccess > xShapes( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) );
-+	m_xIndexAccess.set( xShapes, uno::UNO_QUERY );
-+	m_xNameAccess.set( xShapes, uno::UNO_QUERY );
-+}
-+
-+ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes ): ScVbaShapes_BASE( xParent, xContext, xShapes ), m_nNewShapeCount(0)
-+{
-+    m_xShapes.set( xShapes, uno::UNO_QUERY_THROW );
-+    m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); 
-+    initBaseCollection();
-+}
-+
-+uno::Reference< container::XEnumeration >
-+ScVbaShapes::createEnumeration() throw (uno::RuntimeException)
-+{
-+    return new VbShapeEnumHelper( this,  m_xIndexAccess );
-+}
-+
-+uno::Any
-+ScVbaShapes::createCollectionObject( const css::uno::Any& aSource ) throw (uno::RuntimeException)
-+{
-+    if( aSource.hasValue() )
-+    {
-+        uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW );
-+        return uno::makeAny( uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) ) ) );
-+    }
-+    return uno::Any();
-+}
-+
-+uno::Type
-+ScVbaShapes::getElementType() throw (uno::RuntimeException)
-+{
-+    return ooo::vba::msforms::XShape::static_type(0);
-+}
-+rtl::OUString& 
-+ScVbaShapes::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapes") );
-+	return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString > 
-+ScVbaShapes::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Shapes" ) );
-+	}
-+	return aServiceNames;
-+}
-+
-+css::uno::Reference< css::container::XIndexAccess > 
-+ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index  ) throw (uno::RuntimeException)
-+{
-+	if ( Index.getValueTypeClass() != uno::TypeClass_SEQUENCE )
-+		throw uno::RuntimeException();
-+	
-+	uno::Reference< script::XTypeConverter > xConverter = getTypeConverter(mxContext);
-+	uno::Any aConverted;
-+	aConverted = xConverter->convertTo( Index, getCppuType((uno::Sequence< uno::Any >*)0) );
-+
-+	uno::Sequence< uno::Any > sIndices;
-+	aConverted >>= sIndices;
-+	XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec mShapes;
-+	sal_Int32 nElems = sIndices.getLength();
-+	for( sal_Int32 index = 0; index < nElems; ++index )
-+	{
-+		uno::Reference< drawing::XShape > xShape;
-+		if ( sIndices[ index ].getValueTypeClass() == uno::TypeClass_STRING )
-+		{
-+			rtl::OUString sName;
-+			sIndices[ index ] >>= sName;
-+			xShape.set( m_xNameAccess->getByName( sName ), uno::UNO_QUERY );
-+		}
-+		else
-+		{
-+			sal_Int32 nIndex = 0;
-+			sIndices[ index ] >>= nIndex;
-+			// adjust for 1 based mso indexing
-+			xShape.set( m_xIndexAccess->getByIndex( nIndex - 1 ), uno::UNO_QUERY );		
-+			
-+		}
-+		// populate map with drawing::XShapes
-+		if ( xShape.is() )
-+			mShapes.push_back( xShape );
-+	}  
-+	uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) );
-+	return xIndexAccess;
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaShapes::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::RuntimeException)
-+{
-+	// I don't think we need to support Array of indices for shapes	
-+/*
-+	if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE )
-+	{
-+		uno::Reference< container::XIndexAccess > xIndexAccess( getShapesByArrayIndices( Index ) );
-+		// return new collection instance
-+		uno::Reference< XCollection > xShapesCollection(  new ScVbaShapes( this->getParent(), mxContext, xIndexAccess ) );
-+		return uno::makeAny( xShapesCollection );
-+	}
-+*/
-+	return 	ScVbaShapes_BASE::Item( Index, Index2 );
-+}
-+
-+uno::Reference< msforms::XShapeRange > SAL_CALL 
-+ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException)
-+{
-+	// shapes, can be an index or an array of indices
-+	uno::Reference< container::XIndexAccess > xShapes;
-+	if ( shapes.getValueTypeClass() == uno::TypeClass_SEQUENCE )
-+		xShapes = getShapesByArrayIndices( shapes );
-+	else
-+	{
-+		// wrap single index into a sequence
-+		uno::Sequence< uno::Any > sIndices(1);
-+		sIndices[ 0 ] = shapes;
-+		uno::Any aIndex;
-+		aIndex <<= sIndices;
-+		xShapes = getShapesByArrayIndices( aIndex );
-+	}
-+	return new ScVbaShapeRange(  getParent(), mxContext, xShapes, m_xDrawPage );
-+}
-+
-+void SAL_CALL 
-+ScVbaShapes::SelectAll() throw (uno::RuntimeException)
-+{
-+    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+    try
-+    {
-+        xSelectSupp->select( uno::makeAny( m_xShapes ) );
-+    }
-+    // viewuno.cxx ScTabViewObj::select will throw IllegalArgumentException
-+    // if one of the shapes is no 'markable' e.g. a button 
-+    // the method still works
-+    catch( lang::IllegalArgumentException& )
-+    {
-+    }
-+}
-+
-+uno::Reference< drawing::XShape > 
-+ScVbaShapes::createShape( rtl::OUString service ) throw (css::uno::RuntimeException)
-+{
-+	// #FIXME don't use getCurrentDocument
-+    uno::Reference< lang::XMultiServiceFactory > xMSF( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+    uno::Reference< drawing::XShape > xShape( xMSF->createInstance( service ), uno::UNO_QUERY_THROW );
-+    return xShape;
-+}
-+
-+uno::Any 
-+ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException)
-+{
-+    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape" ) );
-+    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
-+    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( startY );
-+    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
-+    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
-+
-+    uno::Reference< drawing::XShape > xShape( createShape( sCreateShapeName ), uno::UNO_QUERY_THROW );
-+    m_xShapes->add( xShape );
-+
-+    rtl::OUString sName = createName( rtl::OUString::createFromAscii( "Rectangle" ) );
-+    setDefaultShapeProperties( xShape );
-+    setShape_NameProperty( xShape, sName );
-+
-+    awt::Point aMovePositionIfRange(0, 0);
-+    awt::Point position;
-+    position.X = nXPos - aMovePositionIfRange.X;
-+    position.Y = nYPos - aMovePositionIfRange.Y;
-+    xShape->setPosition( position );
-+
-+    awt::Size size;
-+    size.Height = nHeight;
-+    size.Width = nWidth;
-+    xShape->setSize( size );
-+
-+    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
-+    pScVbaShape->setRange( aRange ); 
-+    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
-+}
-+
-+uno::Any 
-+ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException)
-+{
-+    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.EllipseShape" ) );
-+    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
-+    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( startY );
-+    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
-+    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
-+
-+    uno::Reference< drawing::XShape > xShape( createShape( sCreateShapeName ), uno::UNO_QUERY_THROW );
-+    m_xShapes->add( xShape );
-+
-+    awt::Point aMovePositionIfRange( 0, 0 );
-+    //TODO helperapi using a writer document
-+    /*
-+    XDocument xDocument = (XDocument)getParent();
-+    if (AnyConverter.isVoid(_aRange))
-+    {
-+        _aRange = xDocument.Range(new Integer(0), new Integer(1));
-+        // Top&Left in Word is Top&Left of the paper and not the writeable area.
-+        aMovePositionIfRange = calculateTopLeftMargin((HelperInterfaceAdaptor)xDocument);
-+    }
-+
-+    setShape_AnchorTypeAndRangeProperty(xShape, _aRange);
-+    */
-+    rtl::OUString name = createName( rtl::OUString::createFromAscii( "Oval" ));
-+    setDefaultShapeProperties(xShape);
-+    setShape_NameProperty(xShape, name);
-+
-+    awt::Point position;
-+    position.X = nXPos - aMovePositionIfRange.X;
-+    position.Y = nYPos - aMovePositionIfRange.Y;
-+    xShape->setPosition(position);
-+
-+    awt::Size size;
-+    size.Height = nHeight;
-+    size.Width = nWidth;
-+    xShape->setSize(size);
-+
-+    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
-+    pScVbaShape->setRange( aRange ); 
-+    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
-+}
-+
-+//helpeapi calc
-+uno::Any SAL_CALL
-+ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nLineWidth = endX - StartX;
-+    sal_Int32 nLineHeight = endY - StartY;
-+
-+    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( nLineHeight );
-+    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
-+    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( StartX );
-+    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( StartY );
-+    
-+    uno::Reference< drawing::XShape > xShape( createShape( rtl::OUString::createFromAscii("com.sun.star.drawing.LineShape") ), uno::UNO_QUERY_THROW );
-+    m_xShapes->add( xShape );
-+
-+    awt::Point aMovePositionIfRange( 0, 0 );
-+    
-+    rtl::OUString name = createName( rtl::OUString::createFromAscii( "Line" ) );
-+    setDefaultShapeProperties(xShape);
-+    setShape_NameProperty(xShape, name);
-+
-+    awt::Point position;
-+    position.X = nXPos - aMovePositionIfRange.X;
-+    position.Y = nYPos - aMovePositionIfRange.Y;
-+    xShape->setPosition(position);
-+
-+    awt::Size size;
-+    size.Height = nHeight;
-+    size.Width = nWidth;
-+    xShape->setSize(size);
-+
-+    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
-+    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
-+}
-+
-+uno::Any SAL_CALL
-+ScVbaShapes::AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
-+{
-+    uno::Any _aAnchor;
-+    if (_nType == office::MsoAutoShapeType::msoShapeRectangle)
-+    {
-+        return AddRectangle(_nLeft, _nTop, _nWidth, _nHeight, _aAnchor);
-+    }
-+    else if (_nType == office::MsoAutoShapeType::msoShapeOval)
-+    {
-+        return AddEllipse(_nLeft, _nTop, _nWidth, _nHeight, _aAnchor);
-+    }
-+    return uno::Any();
-+}
-+
-+uno::Any SAL_CALL
-+ScVbaShapes::AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+    if( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) )
-+    {
-+        return AddTextboxInWriter( _nOrientation, _nLeft, _nTop, _nWidth, _nHeight );
-+    }
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+uno::Any
-+ScVbaShapes::AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
-+{
-+    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.TextShape" ) );
-+    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( _nLeft );
-+    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( _nTop );
-+    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( _nWidth );
-+    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( _nHeight );
-+
-+    uno::Reference< drawing::XShape > xShape( createShape( sCreateShapeName ), uno::UNO_QUERY_THROW );
-+    m_xShapes->add( xShape );
-+
-+    setDefaultShapeProperties(xShape);
-+
-+    rtl::OUString sName =  createName( rtl::OUString::createFromAscii( "Text Box") );
-+    setShape_NameProperty( xShape, sName );
-+
-+    awt::Size size;
-+    size.Height = nHeight;
-+    size.Width = nWidth;
-+    xShape->setSize(size);
-+
-+    uno::Reference< beans::XPropertySet > xShapeProps( xShape, uno::UNO_QUERY_THROW );
-+    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "AnchorType" ), uno::makeAny( text::TextContentAnchorType_AT_PAGE ) );
-+    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "HoriOrientRelation" ), uno::makeAny( text::RelOrientation::PAGE_LEFT ) );
-+    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "HoriOrient" ), uno::makeAny( text::HoriOrientation::NONE ) );
-+    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "HoriOrientPosition" ), uno::makeAny( nXPos ) );
-+
-+    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "VertOrientRelation" ), uno::makeAny( text::RelOrientation::PAGE_FRAME ) );
-+    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "VertOrient" ), uno::makeAny( text::VertOrientation::NONE ) );
-+    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "VertOrientPosition" ), uno::makeAny( nYPos ) );
-+
-+    // set to visible
-+    drawing::LineStyle aLineStyle = drawing::LineStyle_SOLID;
-+    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( aLineStyle ) );
-+    // set to font
-+    sal_Int16 nLayerId = 1;
-+    rtl::OUString sLayerName = rtl::OUString::createFromAscii("Heaven");
-+    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "LayerID" ), uno::makeAny( nLayerId ) );
-+    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "LayerName" ), uno::makeAny( sLayerName ) );
-+
-+
-+    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
-+    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
-+}
-+
-+uno::Any
-+ScVbaShapes::AddShape( const rtl::OUString& sService, const rtl::OUString& sName, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
-+{
-+    sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( _nLeft );
-+    sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( _nTop );
-+    sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( _nWidth );
-+    sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( _nHeight );
-+
-+    uno::Reference< drawing::XShape > xShape( createShape( sService ), uno::UNO_QUERY_THROW );
-+    m_xShapes->add( xShape );
-+
-+    setDefaultShapeProperties(xShape);
-+    setShape_NameProperty( xShape, sName );
-+
-+    awt::Point aMovePositionIfRange( 0, 0 );
-+    awt::Point position;
-+    position.X = nXPos - aMovePositionIfRange.X;
-+    position.Y = nYPos - aMovePositionIfRange.Y;
-+    xShape->setPosition(position);
-+
-+    awt::Size size;
-+    size.Height = nHeight;
-+    size.Width = nWidth;
-+    xShape->setSize(size);
-+
-+    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
-+    return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
-+}
-+void
-+ScVbaShapes::setDefaultShapeProperties( uno::Reference< drawing::XShape > xShape ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
-+    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillStyle" ), uno::makeAny( rtl::OUString::createFromAscii( "SOLID" ) ) );
-+    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillColor"), uno::makeAny( sal_Int32(0xFFFFFF) )  );
-+    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextWordWrap"), uno::makeAny( text::WrapTextMode_THROUGHT )  );
-+    //not find in OOo2.3
-+    //xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "Opaque"), uno::makeAny( sal_True )  );
-+}
-+
-+void
-+ScVbaShapes::setShape_NameProperty( uno::Reference< css::drawing::XShape > xShape, rtl::OUString sName )
-+{
-+    uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
-+    try
-+    {
-+        xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "Name" ), uno::makeAny( sName ) );
-+    }
-+    catch( script::BasicErrorException e )
-+    {
-+    }
-+}
-+
-+rtl::OUString
-+ScVbaShapes::createName( rtl::OUString sName )
-+{
-+    sal_Int32 nActNumber = 1 + m_nNewShapeCount;
-+    m_nNewShapeCount++; 
-+    sName += rtl::OUString::valueOf( nActNumber );
-+    return sName;
-+}
-+
-+#if 0
-+//TODO helperapi using a writer document
-+awt::Point
-+calculateTopLeftMargin( uno::Reference< XHelperInterface > xDocument )
-+{
-+    awt::Point aPoint( 0, 0 );
-+    uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW );
-+    return awt::Point();
-+}
-+#endif
-diff --git vbahelper/source/vbahelper/vbatextframe.cxx vbahelper/source/vbahelper/vbatextframe.cxx
-new file mode 100644
-index 0000000..a461c54
---- /dev/null
-+++ vbahelper/source/vbahelper/vbatextframe.cxx
-@@ -0,0 +1,169 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: vbatextframe.cxx,v $
-+ * $Revision: 1.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#include <vbahelper/helperdecl.hxx>
-+#include <com/sun/star/drawing/TextFitToSizeType.hpp>
-+#include <com/sun/star/text/XText.hpp>
-+#include <vbahelper/vbatextframe.hxx>
-+
-+using namespace ::ooo::vba;
-+using namespace ::com::sun::star;
-+
-+VbaTextFrame::VbaTextFrame( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< drawing::XShape > xShape ) : VbaTextFrame_BASE( xParent, xContext ), m_xShape( xShape )
-+{
-+    m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
-+}
-+
-+void
-+VbaTextFrame::setAsMSObehavior()
-+{
-+    //set property TextWordWrap default as False.
-+    // TextFitToSize control the text content. it seems we should set the default as False.
-+    // com.sun.star.drawing.TextFitToSizeType.NONE
-+    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextWordWrap" ), uno::makeAny( sal_False ) );
-+    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextFitToSize" ), uno::makeAny( drawing::TextFitToSizeType_NONE ) );
-+}
-+
-+sal_Int32 VbaTextFrame::getMargin( rtl::OUString sMarginType )
-+{
-+    sal_Int32 nMargin = 0;
-+    uno::Any aMargin = m_xPropertySet->getPropertyValue( sMarginType );
-+    aMargin >>= nMargin;
-+    return nMargin;
-+}
-+
-+void VbaTextFrame::setMargin( rtl::OUString sMarginType, float fMargin )
-+{
-+    sal_Int32 nMargin = Millimeter::getInHundredthsOfOneMillimeter( fMargin );
-+    m_xPropertySet->setPropertyValue( sMarginType, uno::makeAny( nMargin ) );
-+}
-+
-+// Attributes
-+sal_Bool SAL_CALL 
-+VbaTextFrame::getAutoSize() throw (uno::RuntimeException)
-+{
-+    // I don't know why, but in OOo, TextAutoGrowHeight is the property control autosize. not TextFitToSize.
-+    // TextFitToSize control the text content. 
-+    // and in mso, there isnot option TextWordWrap which means auto wrap. the default is False.
-+    sal_Bool bAutosize = sal_False;
-+    uno::Any aTextAutoGrowHeight = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ) );
-+    aTextAutoGrowHeight >>= bAutosize;
-+    return bAutosize;
-+}
-+
-+void SAL_CALL 
-+VbaTextFrame::setAutoSize( sal_Bool _autosize ) throw (uno::RuntimeException)
-+{
-+    setAsMSObehavior();
-+    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ), uno::makeAny( _autosize ) );
-+}
-+
-+float SAL_CALL 
-+VbaTextFrame::getMarginBottom() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ) );
-+    float fMargin = (float)Millimeter::getInPoints( nMargin );
-+    return fMargin;
-+}
-+
-+void SAL_CALL 
-+VbaTextFrame::setMarginBottom( float _marginbottom ) throw (uno::RuntimeException)
-+{
-+    setMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ), _marginbottom );
-+}
-+
-+float SAL_CALL 
-+VbaTextFrame::getMarginTop() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ) );
-+    float fMargin = (float)Millimeter::getInPoints( nMargin );
-+    return fMargin;
-+}
-+
-+void SAL_CALL 
-+VbaTextFrame::setMarginTop( float _margintop ) throw (uno::RuntimeException)
-+{
-+    setMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ), _margintop );
-+}
-+
-+float SAL_CALL 
-+VbaTextFrame::getMarginLeft() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ) );
-+    float fMargin = (float)Millimeter::getInPoints( nMargin );
-+    return fMargin;
-+}
-+
-+void SAL_CALL 
-+VbaTextFrame::setMarginLeft( float _marginleft ) throw (uno::RuntimeException)
-+{
-+    setMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ), _marginleft );
-+}
-+
-+float SAL_CALL 
-+VbaTextFrame::getMarginRight() throw (uno::RuntimeException)
-+{
-+    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextRightDistance" ) );
-+    float fMargin = (float)Millimeter::getInPoints( nMargin );
-+    return fMargin;
-+}
-+
-+void SAL_CALL 
-+VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException)
-+{
-+    setMargin( rtl::OUString::createFromAscii( "TextRightDistance" ), _marginright );
-+}
-+
-+
-+// Methods
-+uno::Any SAL_CALL 
-+VbaTextFrame::Characters() throw (uno::RuntimeException)
-+{
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+}
-+
-+rtl::OUString&
-+VbaTextFrame::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaTextFrame") );
-+    return sImplName;
-+}
-+
-+uno::Sequence< rtl::OUString >
-+VbaTextFrame::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.TextFrame" ) );
-+    }
-+    return aServiceNames;
-+}
-+
-diff --git vbahelper/util/makefile.mk vbahelper/util/makefile.mk
-index 7835a0c..796af0a 100644
---- vbahelper/util/makefile.mk
-+++ vbahelper/util/makefile.mk
-@@ -40,13 +40,12 @@ TARGET=vbahelper
- 
- 
- TARGET_HELPER=vbahelper
--SHL1TARGET= $(TARGET_HELPER)$(DLLPOSTFIX)
--SHL1IMPLIB= i$(TARGET_HELPER)
- 
--SHL1DEF=$(MISC)$/$(SHL1TARGET).def
--DEF1NAME=$(SHL1TARGET)
-+LIB1TARGET=     $(SLB)$/$(TARGET).lib
-+LIB1FILES=$(SLB)$/$(TARGET)bits.lib
-+
-+SHL1TARGET= $(TARGET_HELPER)$(DLLPOSTFIX)
- 
--LIB1FILES=$(SLB)$/$(TARGET_HELPER).lib
- 
- # dynamic libraries
- SHL1STDLIBS=       \
-@@ -62,9 +61,17 @@ SHL1STDLIBS=       \
-         $(VCLLIB) \
- 		$(SVTOOLLIB)    \
-         $(TKLIB) \
-+        $(SVXMSFILTERLIB) \
- 
--#SHL4DEPN=$(SHL1TARGETN)
--SHL1LIBS=$(LIB1FILES)
-+SHL1DEPN=
-+SHL1IMPLIB= i$(TARGET_HELPER)
-+SHL1USE_EXPORTS=name
-+SHL1LIBS=$(LIB1TARGET)
-+
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+
-+DEF1NAME=$(SHL1TARGET)
-+DEFLIB1NAME=$(TARGET)
- 
- TARGET_MSFORMS=msforms
- SHL2TARGET=$(TARGET_MSFORMS)$(DLLPOSTFIX).uno
-diff --git xmlscript/source/xmldlg_imexp/exp_share.hxx xmlscript/source/xmldlg_imexp/exp_share.hxx
-index 2007522..2685f32 100644
---- xmlscript/source/xmldlg_imexp/exp_share.hxx
-+++ xmlscript/source/xmldlg_imexp/exp_share.hxx
-@@ -174,6 +174,8 @@ public:
-     //
-     void readDialogModel( StyleBag * all_styles )
-         SAL_THROW( (css::uno::Exception) );
-+    void readMultiPageModel( StyleBag * all_styles )
-+        SAL_THROW( (css::uno::Exception) );
-     void readButtonModel( StyleBag * all_styles )
-         SAL_THROW( (css::uno::Exception) );
-     void readEditModel( StyleBag * all_styles )
-diff --git xmlscript/source/xmldlg_imexp/imp_share.hxx xmlscript/source/xmldlg_imexp/imp_share.hxx
-index bf3ea5f..bf83523 100644
---- xmlscript/source/xmldlg_imexp/imp_share.hxx
-+++ xmlscript/source/xmldlg_imexp/imp_share.hxx
-@@ -1028,6 +1028,27 @@ public:
- };
- 
- //==============================================================================
-+class MultiPage
-+    : public ControlElement
-+{
-+public:
-+    virtual css::uno::Reference< css::xml::input::XElement >
-+    SAL_CALL startChildElement(
-+        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
-+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-+    virtual void SAL_CALL endElement()
-+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-+    
-+    inline MultiPage(
-+        ::rtl::OUString const & rLocalName,
-+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
-+        ElementBase * pParent, DialogImport * pImport )
-+        SAL_THROW( () )
-+        : ControlElement( rLocalName, xAttributes, pParent, pImport )
-+        {}
-+};
-+
- class ProgressBarElement
-     : public ControlElement
- {
-diff --git xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
-index 4f87c16..8559984 100644
---- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
-+++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
-@@ -137,6 +137,42 @@ static inline bool readFontProps( ElementDescriptor * element, Style & style )
- }
- 
- //__________________________________________________________________________________________________
-+void ElementDescriptor::readMultiPageModel( StyleBag * all_styles )
-+{
-+    // collect styles
-+    Style aStyle( 0x2 | 0x8 | 0x20 );
-+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
-+        aStyle._set |= 0x2;
-+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
-+        aStyle._set |= 0x20;
-+    if (readFontProps( this, aStyle ))
-+        aStyle._set |= 0x8;
-+    if (aStyle._set)
-+    {
-+        addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
-+                      all_styles->getStyleId( aStyle ) );
-+    }
-+
-+    // collect elements
-+    readDefaults();
-+    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") ),
-+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );
-+    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") ),
-+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value-max") ) );
-+
-+    OUString aTitle;
-+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ) ) >>= aTitle)
-+    {
-+        ElementDescriptor * title = new ElementDescriptor(
-+            _xProps, _xPropState,
-+            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":title") ) );
-+        title->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ),
-+                             aTitle );
-+        addSubElement( title );
-+    }
-+
-+    readEvents();
-+}
- void ElementDescriptor::readButtonModel( StyleBag * all_styles )
-     SAL_THROW( (Exception) )
- {
-diff --git xmlscript/source/xmldlg_imexp/xmldlg_export.cxx xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
-index b5c223d..223e803 100644
---- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
-+++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
-@@ -1420,6 +1420,14 @@ void SAL_CALL exportDialogModel(
-                 xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                 pElem->readGroupBoxModel( &all_styles );
-             }
-+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ) )
-+            {
-+                pElem = new ElementDescriptor(
-+                    xProps, xPropState,
-+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multipage") ) );
-+                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-+                pElem->readMultiPageModel( &all_styles );
-+            }
-             else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) ) )
-             {
-                 pElem = new ElementDescriptor(
-diff --git xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
-index 92c1a09..d5a82ab 100644
---- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
-+++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
-@@ -51,6 +51,69 @@ using ::rtl::OUString;
- 
- namespace xmlscript
- {
-+Reference< xml::input::XElement > MultiPage::startChildElement(
-+	sal_Int32 nUid, OUString const & rLocalName,
-+	Reference< xml::input::XAttributes > const & xAttributes )
-+	throw (xml::sax::SAXException, RuntimeException)
-+{
-+	// event
-+rtl::OUString _label = rtl::OUString::createFromAscii("foo");
-+    if (_pImport->isEventElement( nUid, rLocalName ))
-+	{
-+		return new EventElement(
-+            nUid, rLocalName, xAttributes, this, _pImport );
-+	}
-+	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("title") ))
-+	{
-+		getStringAttr( &_label,
-+                       OUString( RTL_CONSTASCII_USTRINGPARAM("value") ),
-+                       xAttributes,
-+                       _pImport->XMLNS_DIALOGS_UID );
-+		
-+		return new ElementBase(
-+            _pImport->XMLNS_DIALOGS_UID,
-+            rLocalName, xAttributes, this, _pImport );
-+	}
-+	else
-+	{
-+		
-+		throw xml::sax::SAXException(
-+			OUString( RTL_CONSTASCII_USTRINGPARAM("expected event element!") ),
-+			Reference< XInterface >(), Any() );
-+	}
-+}
-+//__________________________________________________________________________________________________
-+
-+void MultiPage::endElement()
-+	throw (xml::sax::SAXException, RuntimeException)
-+{
-+	ControlImportContext ctx(
-+		_pImport, getControlId( _xAttributes ),
-+		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) );
-+//		OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) );
-+	Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
-+	
-+	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
-+	if (xStyle.is())
-+	{
-+		StyleElement * pStyle = static_cast< StyleElement * >( xStyle.get () );
-+		pStyle->importTextColorStyle( xControlModel );
-+		pStyle->importTextLineColorStyle( xControlModel );
-+		pStyle->importFontStyle( xControlModel );
-+	}
-+	
-+	ctx.importDefaults( 0, 0, _xAttributes ); // inherited from BulletinBoardElement
-+	ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") ),
-+                            OUString( RTL_CONSTASCII_USTRINGPARAM("value") ),
-+                            _xAttributes );
-+	ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") ),
-+                            OUString( RTL_CONSTASCII_USTRINGPARAM("value-max") ),
-+                            _xAttributes );
-+	ctx.importEvents( _events );
-+    // avoid ring-reference:
-+    // vector< event elements > holding event elements holding this (via _pParent)
-+    _events.clear();
-+}
- 
- // #FIXME cut'n'pasted from xmloff/source/core/xmlimp.cxx:1251 
- // of course we need to find a common home for this helper
-@@ -2422,6 +2485,10 @@ Reference< xml::input::XElement > BulletinBoardElement::startChildElement(
- 	{
- 		return new ProgressBarElement( rLocalName, xAttributes, this, _pImport );
- 	}
-+	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("multipage") ))
-+	{
-+		return new MultiPage( rLocalName, xAttributes, this, _pImport );
-+	}
- 	// bulletinboard
- 	else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
- 	{
diff --git a/applied_patches/0502-gstreamer-avmedia-loopingetc.diff b/applied_patches/0384-gstreamer-avmedia-loopingetc.diff
similarity index 100%
rename from applied_patches/0502-gstreamer-avmedia-loopingetc.diff
rename to applied_patches/0384-gstreamer-avmedia-loopingetc.diff
diff --git a/applied_patches/0384-vba-only-import-std-menutoolbar.diff b/applied_patches/0384-vba-only-import-std-menutoolbar.diff
deleted file mode 100644
index a1e656a9b..000000000
--- a/applied_patches/0384-vba-only-import-std-menutoolbar.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git sw/source/filter/ww8/ww8toolbar.cxx sw/source/filter/ww8/ww8toolbar.cxx
-index dfcaa17..b5648bf 100644
---- sw/source/filter/ww8/ww8toolbar.cxx
-+++ sw/source/filter/ww8/ww8toolbar.cxx
-@@ -216,7 +216,8 @@ bool Customization::Read( SvStream *pS)
-             if (!aTBDelta.Read( pS ) )
-                 return false;
-             customizationDataTBDelta.push_back( aTBDelta );
--            if ( aTBDelta.ControlDropsToolBar() )
-+            // Only set the drop down for menu's associated with standard toolbar
-+            if ( aTBDelta.ControlDropsToolBar() && tbidForTBD == 0x25 )
-                 pWrapper->InsertDropIndex( aTBDelta.CustomizationIndex() );
-         }
-     }
diff --git a/applied_patches/0503-size-sal-textenc.diff b/applied_patches/0385-size-sal-textenc.diff
similarity index 100%
rename from applied_patches/0503-size-sal-textenc.diff
rename to applied_patches/0385-size-sal-textenc.diff
diff --git a/applied_patches/0385-vba-fix-workbook-resize-core.diff b/applied_patches/0385-vba-fix-workbook-resize-core.diff
deleted file mode 100644
index 11797641a..000000000
--- a/applied_patches/0385-vba-fix-workbook-resize-core.diff
+++ /dev/null
@@ -1,234 +0,0 @@
-Index: sc/source/ui/vba/vbaeventshelper.hxx
-===================================================================
---- sc/source/ui/vba/vbaeventshelper.hxx	(revision 271848)
-+++ sc/source/ui/vba/vbaeventshelper.hxx	(working copy)
-@@ -40,6 +40,7 @@
- #include <cppuhelper/implbase1.hxx>
- #include <com/sun/star/document/VbaEventId.hpp>
- #include <com/sun/star/document/XVbaEventsHelper.hpp>
-+#include <com/sun/star/awt/XWindowListener.hpp>
- #include "excelvbahelper.hxx"
- 
- #define INVALID_TAB -1
-@@ -54,7 +55,7 @@
- 	ScDocument* pDoc;
- 	ScDocShell* pDocShell;
-     css::uno::Reference< css::uno::XComponentContext > m_xContext;
--    VbaEventsListener* mpVbaEventsListener;
-+    css::uno::Reference< css::awt::XWindowListener > m_xVbaEventsListener;
-     sal_Bool mbOpened;
-     sal_Bool mbIgnoreEvents;
- 
-@@ -69,7 +70,7 @@
-     sal_Bool processVbaEvent( const sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs, const SCTAB nTab = INVALID_TAB );
- 
- public:
--	ScVbaEventsHelper( ScDocument* pDocument ):pDoc( pDocument ), mpVbaEventsListener( NULL ), mbOpened( sal_False ){};
-+	ScVbaEventsHelper( ScDocument* pDocument ):pDoc( pDocument ), mbOpened( sal_False ){};
-     ScVbaEventsHelper( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
-     ~ScVbaEventsHelper();
- 	ScDocument* getDocument() { return pDoc; };
-Index: sc/source/ui/vba/vbaeventshelper.cxx
-===================================================================
---- sc/source/ui/vba/vbaeventshelper.cxx	(revision 271848)
-+++ sc/source/ui/vba/vbaeventshelper.cxx	(working copy)
-@@ -49,7 +49,6 @@
- #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
- #include <com/sun/star/sheet/XSpreadsheet.hpp>
- #include <com/sun/star/container/XNamed.hpp>
--#include <com/sun/star/awt/XWindowListener.hpp>
- #include <com/sun/star/awt/WindowEvent.hpp>
- #include <com/sun/star/lang/EventObject.hpp>
- #include <com/sun/star/util/XCloseListener.hpp>
-@@ -64,6 +63,7 @@
- #include <convuno.hxx>
- #include <map>
- #include <svx/msvbahelper.hxx>
-+#include <vcl/svapp.hxx>
- 
- using namespace std;
- using namespace com::sun::star;
-@@ -140,19 +140,20 @@
- // This class is to process Workbook window related event
- class VbaEventsListener : public WindowListener_BASE
- {
-+    ::osl::Mutex m_aMutex;
-     ScVbaEventsHelper* pVbaEventsHelper;
-     uno::Reference< frame::XModel > m_xModel;
--    sal_Bool m_bPrepare;
-     sal_Bool m_bWindowResized;
-     sal_Bool m_bBorderChanged;
- protected :
-     uno::Reference< awt::XWindow > GetContainerWindow();
-     uno::Reference< frame::XFrame > GetFrame();
-     sal_Bool IsMouseReleased();
--    DECL_LINK( fireResizeMacro, Timer* );
-+    DECL_LINK( fireResizeMacro, void* );
-     void processWindowResizeMacro();
- public :
-     VbaEventsListener( ScVbaEventsHelper* pHelper );
-+    ~VbaEventsListener();
-     void startEventsLinstener();
-     void stopEventsLinstener();
-     // XWindowListener
-@@ -169,11 +170,16 @@
- };
- VbaEventsListener::VbaEventsListener( ScVbaEventsHelper* pHelper ) : pVbaEventsHelper( pHelper )
- {
-+    OSL_TRACE("VbaEventsListener::VbaEventsListener( 0x%x ) - ctor ", this );
-     m_xModel.set( pVbaEventsHelper->getDocument()->GetDocumentShell()->GetModel(), uno::UNO_QUERY );
--    m_bPrepare = sal_False;
-     m_bWindowResized = sal_False;
-     m_bBorderChanged = sal_False;
- }
-+
-+VbaEventsListener::~VbaEventsListener()
-+{
-+    OSL_TRACE("VbaEventsListener::~VbaEventsListener( 0x%x ) - dtor ", this );
-+}
- uno::Reference< frame::XFrame > 
- VbaEventsListener::GetFrame()
- {
-@@ -286,41 +292,39 @@
-         pVbaEventsHelper = NULL;
-     }
- }
-+
- void
- VbaEventsListener::processWindowResizeMacro()
- {
-+    OSL_TRACE("**** Attempt to FIRE MACRO **** ");
-     if( pVbaEventsHelper )
-         pVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWRESIZE, uno::Sequence< uno::Any >() );
- }
--IMPL_LINK( VbaEventsListener, fireResizeMacro, Timer*, pTimer )
-+
-+IMPL_LINK( VbaEventsListener, fireResizeMacro, void*, pParam )
- {
--    if( pVbaEventsHelper && m_bPrepare && pTimer )
-+    if ( pVbaEventsHelper ) 
-     {
-         if( IsMouseReleased() )
--        {
--            pTimer->Stop();
--            delete pTimer;
--            pTimer = 0;
--            m_bPrepare = sal_False;
--            processWindowResizeMacro();
--        }
-+                processWindowResizeMacro();
-     }
-+    release();
-     return 0;
- }
-+
- void SAL_CALL
- VbaEventsListener::windowResized(  const awt::WindowEvent& /*aEvent*/ ) throw ( uno::RuntimeException )
- {
-+    ::osl::MutexGuard aGuard( m_aMutex );
-     // Workbook_window_resize event
--    OSL_TRACE("VbaEventsListener::windowResized");
-     m_bWindowResized = sal_True;
-     Window* pWindow = (VCLUnoHelper::GetWindow(  GetContainerWindow() ) );
--    if( pWindow && !m_bPrepare && m_bBorderChanged )
-+
-+    if( pWindow && m_bBorderChanged )
-     {
--        m_bPrepare = sal_True;
-         m_bBorderChanged = m_bWindowResized = sal_False;
--        AutoTimer* pTimer = new AutoTimer();
--        pTimer->SetTimeoutHdl( LINK( this, VbaEventsListener, fireResizeMacro ) );
--        pTimer->Start();
-+        acquire(); // ensure we don't get deleted before the event is handled
-+        Application::PostUserEvent( LINK( this, VbaEventsListener, fireResizeMacro ), NULL );
-     }
- }
- void SAL_CALL
-@@ -341,6 +345,8 @@
- void SAL_CALL
- VbaEventsListener::disposing(  const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
- {
-+    ::osl::MutexGuard aGuard( m_aMutex );
-+    OSL_TRACE("VbaEventsListener::disposing(0x%x)", this);
-     pVbaEventsHelper = NULL;
- }
- void SAL_CALL 
-@@ -351,23 +357,21 @@
- void SAL_CALL 
- VbaEventsListener::notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException)
- {
--    OSL_TRACE("VbaEventsListener::notifyClosing");
-+    ::osl::MutexGuard aGuard( m_aMutex );
-     stopEventsLinstener();
- }
- void SAL_CALL 
- VbaEventsListener::borderWidthsChanged( const uno::Reference< uno::XInterface >& aObject, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException)
- {
-+    ::osl::MutexGuard aGuard( m_aMutex );
-     // work with WindowResized event to guard Window Resize event.
--    OSL_TRACE("VbaEventsListener::borderWidthsChanged");
-     m_bBorderChanged = sal_True;
-     Window* pWindow = (VCLUnoHelper::GetWindow(  GetContainerWindow() ) );
--    if( pWindow && !m_bPrepare && m_bWindowResized )
-+    if( pWindow && m_bWindowResized )
-     {
--        m_bPrepare = sal_True;
-         m_bWindowResized = m_bBorderChanged = sal_False;
--        AutoTimer* pTimer = new AutoTimer();
--        pTimer->SetTimeoutHdl( LINK( this, VbaEventsListener, fireResizeMacro ) );
--        pTimer->Start();
-+        acquire(); // ensure we don't get deleted before the timer fires.
-+        Application::PostUserEvent( LINK( this, VbaEventsListener, fireResizeMacro ), NULL );
-     }
- }
- 
-@@ -456,7 +460,7 @@
- }
- 
- ScVbaEventsHelper::ScVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArgs, uno::Reference< uno::XComponentContext > const& xContext )
--    : m_xContext( xContext ), mpVbaEventsListener( NULL ), mbOpened( sal_False ), mbIgnoreEvents( sal_False )
-+    : m_xContext( xContext ), mbOpened( sal_False ), mbIgnoreEvents( sal_False )
- {
-     uno::Reference< frame::XModel > xModel ( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ), uno::UNO_QUERY );
-     pDocShell = excel::getDocShell( xModel );
-@@ -469,10 +473,6 @@
- 
- ScVbaEventsHelper::~ScVbaEventsHelper()
- {
--    if( mpVbaEventsListener )
--    {
--        mpVbaEventsListener = NULL;
--    }
- }
- 
- rtl::OUString
-@@ -993,10 +993,11 @@
-                 ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_ACTIVATE, aArgs );
-             }
-             // register the window listener.
--            if( !mpVbaEventsListener )
-+            if( !m_xVbaEventsListener.is() )
-             {
--                mpVbaEventsListener = new VbaEventsListener( this );
--                mpVbaEventsListener->startEventsLinstener();
-+                m_xVbaEventsListener = new VbaEventsListener( this );
-+                VbaEventsListener* pEventsListener = dynamic_cast< VbaEventsListener* >( m_xVbaEventsListener.get() );
-+                pEventsListener->startEventsLinstener();
-             }
-             break;
-         }
-@@ -1006,10 +1007,11 @@
- 		case VBAEVENT_WORKBOOK_BEFORECLOSE:
-         {
-             sal_Bool bCancel = processVbaEvent( nEventId, aArgs ); 
--            if( mpVbaEventsListener && !bCancel )
-+            if( m_xVbaEventsListener.is() && !bCancel )
-             {
--                mpVbaEventsListener->stopEventsLinstener();
--                mpVbaEventsListener = NULL;
-+                VbaEventsListener* pEventsListener = dynamic_cast< VbaEventsListener* >( m_xVbaEventsListener.get() );
-+                pEventsListener->stopEventsLinstener();
-+                m_xVbaEventsListener = NULL;
-             }
-             return bCancel;
-         }
diff --git a/applied_patches/0504-jvmfwk-gij32.diff b/applied_patches/0386-jvmfwk-gij32.diff
similarity index 100%
rename from applied_patches/0504-jvmfwk-gij32.diff
rename to applied_patches/0386-jvmfwk-gij32.diff
diff --git a/applied_patches/0386-vba-fix-macromode-api-docopen.diff b/applied_patches/0386-vba-fix-macromode-api-docopen.diff
deleted file mode 100644
index 434387d72..000000000
--- a/applied_patches/0386-vba-fix-macromode-api-docopen.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git vbahelper/source/vbahelper/vbadocumentsbase.cxx vbahelper/source/vbahelper/vbadocumentsbase.cxx
-index 813e084..6d5ddb3 100644
---- vbahelper/source/vbahelper/vbadocumentsbase.cxx
-+++ vbahelper/source/vbahelper/vbadocumentsbase.cxx
-@@ -45,6 +45,7 @@
- #include <com/sun/star/util/XCloseable.hpp>
- #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
- #include <com/sun/star/document/XTypeDetection.hpp>
-+#include <com/sun/star/document/MacroExecMode.hpp>
- #include <com/sun/star/uri/XUriReference.hpp>
- #include <com/sun/star/uri/XUriReferenceFactory.hpp>
- #include <com/sun/star/lang/XServiceInfo.hpp>
-@@ -271,8 +272,13 @@ VbaDocumentsBase::Open( const rtl::OUString& rFileName, const uno::Any& ReadOnly
- 		::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),
- 		mxContext),
- 		uno::UNO_QUERY_THROW );
-+
- 	uno::Sequence< beans::PropertyValue > sProps( rProps );
--	sal_Int32 nIndex = 0;
-+	sProps.realloc( sProps.getLength() + 1 );
-+	sProps[ sProps.getLength() - 1 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode") );
-+	sProps[ sProps.getLength() - 1 ].Value <<= uno::makeAny( document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN );
-+
-+	sal_Int32 nIndex = sProps.getLength() - 1;
- 	
- 	if ( ReadOnly.hasValue()  )
- 	{
diff --git a/applied_patches/0505-svg-import-filter.diff b/applied_patches/0387-svg-import-filter.diff
similarity index 100%
rename from applied_patches/0505-svg-import-filter.diff
rename to applied_patches/0387-svg-import-filter.diff
diff --git a/applied_patches/0387-vba-fixup-macrosearch.diff b/applied_patches/0387-vba-fixup-macrosearch.diff
deleted file mode 100644
index 79c1f87ba..000000000
--- a/applied_patches/0387-vba-fixup-macrosearch.diff
+++ /dev/null
@@ -1,1581 +0,0 @@
-diff --git sc/source/filter/excel/xlescher.cxx sc/source/filter/excel/xlescher.cxx
-index 2109a0a..88eb9d0 100644
---- sc/source/filter/excel/xlescher.cxx
-+++ sc/source/filter/excel/xlescher.cxx
-@@ -45,6 +45,7 @@
- #include <basic/sbmod.hxx>
- #include <basic/sbmeth.hxx>
- #include <basic/basmgr.hxx>
-+#include <svx/msvbahelper.hxx>
- 
- using ::rtl::OUString;
- using ::com::sun::star::uno::Reference;
-@@ -306,7 +307,6 @@ Reference< XControlModel > XclControlHelper::GetControlModel( Reference< XShape
- }
- 
- #define EXC_MACRONAME_PRE "vnd.sun.star.script:Standard."
--#define EXC_MACRO_SCHEME "vnd.sun.star.script:"
- #define EXC_MACRONAME_SUF "?language=Basic&location=document"
- 
- OUString XclControlHelper::GetScMacroName( const String& rXclMacroName, SfxObjectShell* pDocShell )
-@@ -314,27 +314,10 @@ OUString XclControlHelper::GetScMacroName( const String& rXclMacroName, SfxObjec
-     String sTmp( rXclMacroName );
-     if( rXclMacroName.Len() > 0 )
-     {
--        String sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
-+        ooo::vba::VBAMacroResolvedInfo aMacro = ooo::vba::resolveVBAMacro( pDocShell, rXclMacroName, false );
-+        if ( aMacro.IsResolved() )
-+            return ooo::vba::makeMacroURL( aMacro.ResolvedMacro() );
- 
--        if ( pDocShell && pDocShell->GetBasicManager()->GetName().Len() > 0 )
--            sProjectName = pDocShell->GetBasicManager()->GetName();
--
--        if ( ( sTmp.Search( '.' ) == STRING_NOTFOUND) && pDocShell )
--        {
--            if( StarBASIC* pBasic = pDocShell->GetBasicManager()->GetLib( sProjectName ) )
--            {
--                if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sTmp, SbxCLASS_METHOD ) ) )
--                {
--                    if( SbModule* pModule = pMethod->GetModule() )
--                    {
--                        sTmp.Insert( '.', 0 ).Insert( pModule->GetName(), 0 );
--                    }
--                }
--            }
--        }
--        sProjectName.Append( '.' ); 
--        sTmp.Insert( sProjectName, 0 );
--        return CREATE_OUSTRING( EXC_MACRO_SCHEME ) + sTmp + CREATE_OUSTRING( EXC_MACRONAME_SUF );
-     }
-     return OUString();
- }
-diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx
-index af78648..16a1c03 100644
---- sc/source/ui/unoobj/docuno.cxx
-+++ sc/source/ui/unoobj/docuno.cxx
-@@ -1793,6 +1793,12 @@ sal_Int64 SAL_CALL ScModelObj::getSomething(
-         return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
- 	}
- 
-+	if ( rId.getLength() == 16 &&
-+          0 == rtl_compareMemory( SfxObjectShell::getUnoTunnelId().getConstArray(),
-+									rId.getConstArray(), 16 ) )
-+        {
-+            return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell ));
-+        }
- 	//	aggregated number formats supplier has XUnoTunnel, too
- 	//	interface from aggregated object must be obtained via queryAggregation
- 
-diff --git sc/source/ui/vba/vbaeventshelper.cxx sc/source/ui/vba/vbaeventshelper.cxx
-index 3948ac6..36e1115 100644
---- sc/source/ui/vba/vbaeventshelper.cxx
-+++ sc/source/ui/vba/vbaeventshelper.cxx
-@@ -614,8 +614,8 @@ rtl::OUString
- ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
- {
- 	SfxObjectShell* pShell = pDoc->GetDocumentShell();
--    rtl::OUString sMacroPath;
--    rtl::OUString sMacroName = getEventName( nEventId );
-+    String sMacroName = getEventName( nEventId );
-+    VBAMacroResolvedInfo sMacroResolvedInfo;
-     switch( nEventId )
-     {
-         // Worksheet
-@@ -629,8 +629,9 @@ ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
-     	case VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE              :
-     	case VBAEVENT_WORKSHEET_SELECTIONCHANGE               :
-         {
--            rtl::OUString  aSheetModuleName = getSheetModuleName( nTab );
--            sMacroPath = findVBAMacro( pShell, aSheetModuleName, sMacroName );
-+            String  aSheetModuleName = getSheetModuleName( nTab );
-+            sMacroName.Insert( '.', 0 ).Insert( aSheetModuleName, 0);
-+            sMacroResolvedInfo = resolveVBAMacro( pShell, sMacroName );
-             break;
-         }
-         // Workbook
-@@ -664,13 +665,14 @@ ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
-                 sWorkbookModuleName = aExtDocSettings.maGlobCodeName;
-             }
-            
--            sMacroPath = findVBAMacro( pShell, sWorkbookModuleName, sMacroName );
-+            sMacroName.Insert( '.', 0 ).Insert( sWorkbookModuleName, 0);
-+            sMacroResolvedInfo = resolveVBAMacro( pShell, sMacroName );
-             break;
-         }
-         default:
-             break;
-     }
--    return sMacroPath;
-+    return sMacroResolvedInfo.ResolvedMacro();
- }
- 
- sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs, const SCTAB nTab )
-@@ -681,6 +683,7 @@ sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno
-     sal_Bool bCancel = sal_False;
- 	uno::Sequence< uno::Any > aArgs;
- 	uno::Any aRet;
-+	uno::Any aDummyCaller;
-     
-     // For most cases, there is no corresponsible event macro in the document. 
-     // It is better fo check if the event macro exists before process the arguments to improve performance.
-@@ -777,7 +780,7 @@ sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno
-                 // process Cancel argument
-                 aArgs = uno::Sequence< uno::Any >(1);
-                 aArgs[0] <<= bCancel;
--                executeMacro( pShell, sMacroPath, aArgs, aRet );
-+                executeMacro( pShell, sMacroPath, aArgs, aRet, aDummyCaller );
-                 aArgs[0] >>= bCancel;
-                 return bCancel;
-             }
-@@ -787,7 +790,7 @@ sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno
-                 aArgs = uno::Sequence< uno::Any >(2);
-                 aArgs[0] = rArgs[0];
-                 aArgs[1] <<= bCancel;
--                executeMacro( pShell, sMacroPath, aArgs, aRet );
-+                executeMacro( pShell, sMacroPath, aArgs, aRet, aDummyCaller );
-                 aArgs[1] >>= bCancel;
-                 return bCancel;
-             }
-@@ -805,7 +808,7 @@ sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno
- 		}
-     
-         // excute the macro
--        result = executeMacro( pShell, sMacroPath, aArgs, aRet );
-+        result = executeMacro( pShell, sMacroPath, aArgs, aRet, aDummyCaller );
- 	}
-     
- 	return result;
-diff --git scripting/prj/build.lst scripting/prj/build.lst
-index fc33238..f216009 100644
---- scripting/prj/build.lst
-+++ scripting/prj/build.lst
-@@ -1,4 +1,4 @@
--tc	scripting	:	oovbaapi bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
-+tc	scripting	:	oovbaapi svx bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
- tc	scripting									usr1	-	all	tc1_mkout NULL
- tc	scripting\inc								nmake	-	all	tc1_inc NULL
- tc	scripting\source\provider				nmake	-	all	tc1_scriptingprovider tc1_inc NULL
-diff --git scripting/source/vbaevents/eventhelper.cxx scripting/source/vbaevents/eventhelper.cxx
-index 84dc900..f85ac51 100644
---- scripting/source/vbaevents/eventhelper.cxx
-+++ scripting/source/vbaevents/eventhelper.cxx
-@@ -35,14 +35,11 @@
- #include <basic/sbmeth.hxx>
- #include <basic/sbmod.hxx>
- #include <basic/sbx.hxx>
--
--
--
-+#include <svx/msvbahelper.hxx>
- 
- // for debug
- #include <comphelper/anytostring.hxx>
- 
--
- #include <com/sun/star/lang/XMultiComponentFactory.hpp>
- #include <com/sun/star/script/XScriptListener.hpp>
- #include <cppuhelper/implbase1.hxx>
-@@ -771,7 +768,7 @@ EventListener::getPropertySetInfo(  ) throw (RuntimeException)
- // EventListener
- 
- void
--EventListener::firing_Impl(const ScriptEvent& evt, Any* /*pRet*/ ) throw(RuntimeException)
-+EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeException)
- {
- 	OSL_TRACE("EventListener::firing_Impl( FAKE VBA_EVENTS )");
-     static const ::rtl::OUString vbaInterOp =
-@@ -842,22 +839,16 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* /*pRet*/ ) throw(Runtime
-         sMacroLoc = sMacroLoc.concat( sScriptCode ).concat( rtl::OUString::createFromAscii(".") );
-         
-         OSL_TRACE("sMacroLoc is %s", rtl::OUStringToOString( sMacroLoc, RTL_TEXTENCODING_UTF8 ).getStr() );
--
--        // find library
--        pBasic = pBasicManager->GetLib( sProject );
--        
--        SbModule* pModule = pBasic ? pBasic->FindModule( sScriptCode ) : NULL;
--
--        for ( ; pModule && txInfo != txInfo_end; ++txInfo )
-+        for ( ; txInfo != txInfo_end; ++txInfo )
-         {
-+            rtl::OUString sTemp = sName.concat( (*txInfo).sVBAName ); 
-             // see if we have a match for the handlerextension
-             // where ScriptCode is methodname_handlerextension 
--            rtl::OUString sTemp = sName.concat( (*txInfo).sVBAName ); 
--            
-+            rtl::OUString sToResolve = sMacroLoc.concat( sTemp );
-             OSL_TRACE("*** trying to invoke %s ",
--                rtl::OUStringToOString( sTemp, RTL_TEXTENCODING_UTF8 ).getStr() );
--            SbMethod* pMeth = static_cast< SbMethod* >( pModule->Find( sTemp, SbxCLASS_METHOD ) );
--            if ( pMeth )
-+                rtl::OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() );
-+            ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve ); 
-+            if ( aMacroResolvedInfo.IsResolved() )
-             {
-                 // !! translate arguments & emulate events where necessary 
-                 Sequence< Any > aArguments;
-@@ -869,31 +860,22 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* /*pRet*/ ) throw(Runtime
-                 {
-                     // call basic event handlers for event
- 
--                    static rtl::OUString part1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
--                    static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document"); 
--
-                     // create script url
--                    rtl::OUString url = part1 + sMacroLoc + sTemp + part2;
-+                    rtl::OUString url = aMacroResolvedInfo.ResolvedMacro();
-                  
--                    OSL_TRACE("script url = %s",
-+                    OSL_TRACE("resolved script = %s",
-                         rtl::OUStringToOString( url, 
-                             RTL_TEXTENCODING_UTF8 ).getStr() );
--                    Sequence< sal_Int16 > aOutArgsIndex;
--                    Sequence< Any > aOutArgs;
-                     try
-                     {
--                        uno::Reference< script::provider::XScript > xScript = xScriptProvider->getScript( url );
--                        if ( xScript.is() )
--                         {
--                            uno::Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY );
--                            if ( xProps.is() )
--                            {
--                                Sequence< Any > aCallerHack(1);
--                                aCallerHack[ 0 ] = uno::makeAny( rtl::OUString::createFromAscii("Error") );
--                                xProps->setPropertyValue( rtl::OUString::createFromAscii( "Caller" ), uno::makeAny( aCallerHack ) );
--                            }
--                            xScript->invoke( aArguments, aOutArgsIndex, aOutArgs  );
--                         }
-+                        uno::Any aDummyCaller = uno::makeAny( rtl::OUString::createFromAscii("Error") );
-+                        if ( pRet )
-+                            ooo::vba::executeMacro( mpShell, url, aArguments, *pRet, aDummyCaller ); 
-+                        else
-+                        {
-+                            uno::Any aRet;
-+                            ooo::vba::executeMacro( mpShell, url, aArguments, aRet, aDummyCaller ); 
-+                        }
-                     }
-                     catch ( uno::Exception& e )
-                     {
-diff --git scripting/source/vbaevents/makefile.mk scripting/source/vbaevents/makefile.mk
-index eabb67e..96f4e3d 100644
---- scripting/source/vbaevents/makefile.mk
-+++ scripting/source/vbaevents/makefile.mk
-@@ -46,6 +46,7 @@ SHL1STDLIBS= \
- 		$(BASICLIB) \
- 		$(COMPHELPERLIB) \
- 		$(SFXLIB) \
-+		$(SVXMSFILTERLIB) \
-                 $(CPPULIB) \
-                 $(TOOLSLIB) \
-                 $(SALLIB)
-diff --git sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/objsh.hxx
-index c65280b..3f2d197 100644
---- sfx2/inc/sfx2/objsh.hxx
-+++ sfx2/inc/sfx2/objsh.hxx
-@@ -265,6 +265,7 @@ public:
- 								TYPEINFO();
- 								SFX_DECL_INTERFACE(SFX_INTERFACE_SFXDOCSH)
- 
-+    static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
-     /* Stampit disable/enable cancel button for print jobs
-        default = true = enable! */
-     void                        Stamp_SetPrintCancelState(sal_Bool bState);
-@@ -885,6 +886,7 @@ public:
- 	virtual	sal_Bool		PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
- 	SfxObjectShell* 		GetObjectShell() const
- 							{ return pObjSh; }
-+
- };
- 
- #endif
-diff --git sfx2/source/doc/objserv.cxx sfx2/source/doc/objserv.cxx
-index d16f0c8..dd4f044 100644
---- sfx2/source/doc/objserv.cxx
-+++ sfx2/source/doc/objserv.cxx
-@@ -1480,3 +1480,19 @@ void SfxObjectShell::SignScriptingContent()
-     ImplSign( TRUE );
- }
- 
-+// static
-+const uno::Sequence<sal_Int8>& SfxObjectShell::getUnoTunnelId()
-+{
-+	static uno::Sequence<sal_Int8> * pSeq = 0;
-+	if( !pSeq )
-+	{
-+		osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
-+		if( !pSeq )
-+		{
-+			static uno::Sequence< sal_Int8 > aSeq( 16 );
-+			rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
-+			pSeq = &aSeq;
-+		}
-+	}
-+	return *pSeq;
-+}
-diff --git svx/inc/svx/mstoolbar.hxx svx/inc/svx/mstoolbar.hxx
-index b3667a8..5d76eaf 100644
---- svx/inc/svx/mstoolbar.hxx
-+++ svx/inc/svx/mstoolbar.hxx
-@@ -55,6 +55,7 @@ public:
-     void applyIcons();
-     rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
-     rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID );
-+    SfxObjectShell& GetDocShell() { return mrDocSh; }
- };
- 
- class SVX_DLLPUBLIC TBBase
-diff --git svx/inc/svx/msvbahelper.hxx svx/inc/svx/msvbahelper.hxx
-index 8be6901..294f26e 100644
---- svx/inc/svx/msvbahelper.hxx
-+++ svx/inc/svx/msvbahelper.hxx
-@@ -35,9 +35,24 @@
- 
- namespace ooo { namespace vba 
- {
-+    class SVX_DLLPUBLIC VBAMacroResolvedInfo
-+    {
-+        SfxObjectShell* mpDocContext;
-+        bool mbFound;
-+        String msResolvedMacro;
-+        public:
-+        VBAMacroResolvedInfo() : mpDocContext(NULL), mbFound( false ){}
-+        void SetResolved( bool bRes ) { mbFound = bRes; }
-+        bool IsResolved() { return mbFound; }
-+        void SetMacroDocContext(SfxObjectShell* pShell )  { mpDocContext = pShell; }
-+        SfxObjectShell* MacroDocContext() { return mpDocContext; }
-+        String ResolvedMacro() { return msResolvedMacro; }
-+        void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; }
-+    };
-+
-     SVX_DLLPUBLIC String makeMacroURL( const String& sMacroName );
--    SVX_DLLPUBLIC String findVBAMacro( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
--    SVX_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet );
-+    SVX_DLLPUBLIC  VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false );
-+    SVX_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
- } }
- 
- #endif
-diff --git svx/inc/svxmsbas.hxx svx/inc/svxmsbas.hxx
-index a777795..fab5faf 100644
---- svx/inc/svxmsbas.hxx
-+++ svx/inc/svxmsbas.hxx
-@@ -91,6 +91,7 @@ public:
- 	static ULONG GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS );
- 
- 	static String GetMSBasicStorageName();
-+        rtl::OUString GetVBAProjectName() { return msProjectName; }
- private:
- 	SotStorageRef xRoot;
- 	SfxObjectShell &rDocSh;
-diff --git svx/source/msfilter/mstoolbar.cxx svx/source/msfilter/mstoolbar.cxx
-index 9579db7..fa66fe5 100644
---- svx/source/msfilter/mstoolbar.cxx
-+++ svx/source/msfilter/mstoolbar.cxx
-@@ -12,6 +12,7 @@
- #include <basic/basmgr.hxx>
- #include <svtools/filterutils.hxx>
- #include <boost/scoped_array.hpp>
-+#include <svx/msvbahelper.hxx>
- 
- int TBBase::nIndent = 0;
- 
-@@ -67,16 +68,8 @@ CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd )
- //"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"    
-     static rtl::OUString scheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
-     static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document");
--    rtl::OUString sProject( RTL_CONSTASCII_USTRINGPARAM("Standard") );
--    if ( mrDocSh.GetBasicManager()->GetName().Len() )
--        sProject = mrDocSh.GetBasicManager()->GetName();
--    sProject += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") );
--
--    // #TODO #FIXME a script can also be loosly defined ( e.g. with no module 
--    // spec )
--
-     // create script url
--    rtl::OUString scriptURL = scheme + sProject + sCmd + part2;
-+    rtl::OUString scriptURL = scheme + sCmd + part2;
-     return uno::makeAny( scriptURL );
- }
- 
-@@ -377,7 +370,9 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
-         if ( extraInfo.getOnAction().getLength() )
-         {
-             aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
--            aProp.Value = helper.createCommandFromMacro( extraInfo.getOnAction() );
-+            ooo::vba::VBAMacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true );
-+            if ( aMacroInf.IsResolved() )
-+                aProp.Value = helper.createCommandFromMacro( aMacroInf.ResolvedMacro() );
-             sControlData.push_back( aProp );
-         }
- 
-@@ -390,7 +385,7 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
-         sControlData.push_back( aProp );
- 
-         aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HelpURL") );
--        aProp.Value = uno::makeAny( helper.createCommandFromMacro( tooltip.getString() ) ); 
-+        aProp.Value = uno::makeAny( tooltip.getString() ); 
-         sControlData.push_back( aProp );
- 
-         // #TODO find out what is the property for tooltip?
-diff --git svx/source/msfilter/msvbahelper.cxx svx/source/msfilter/msvbahelper.cxx
-index 5875cf7..d02746f 100644
---- svx/source/msfilter/msvbahelper.cxx
-+++ svx/source/msfilter/msvbahelper.cxx
-@@ -34,6 +34,11 @@
- #include <basic/basmgr.hxx>
- #include <basic/sbmod.hxx>
- #include <basic/sbmeth.hxx>
-+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-+#include <com/sun/star/document/XDocumentProperties.hpp>
-+#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
-+#include <tools/urlobj.hxx>
-+#include <osl/file.hxx>
- 
- using namespace ::com::sun::star;
- 
-@@ -44,91 +49,335 @@ namespace ooo { namespace vba {
- 
- String makeMacroURL( const String& sMacroName )
- {
--	return sUrlPart0.concat( sMacroName ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sUrlPart1 ) ;
-+	return sUrlPart0.concat( sMacroName ).concat( sUrlPart1 ) ;
- }
- 
--String findVBAMacro( SfxObjectShell* pShell, const String& sMod, const String& sMacro )
-+SfxObjectShell* findShellForUrl( const rtl::OUString& sMacroURLOrPath )
- {
--	String sFullName;	
--	// would use the script provider to see if the macro exists but
--	// called at this stage tdoc content handler stuff is not set up
--	// so it fails
--
--    String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
--	BasicManager* pBasicMgr = pShell-> GetBasicManager();
--	if ( pBasicMgr )
--	{
--		if ( pBasicMgr->GetName().Len() )
--			sLibrary =  pBasicMgr->GetName();
--		StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
--		if ( !pBasic )
--		{
--			USHORT nId = pBasicMgr->GetLibId( sLibrary );
--			pBasicMgr->LoadLib( nId );
--			pBasic = pBasicMgr->GetLib( sLibrary );
--		}
--		if ( pBasic )
--		{
--			if ( sMod.Len() ) // we wish to find the macro is a specific module
--			{
--				SbModule* pModule = pBasic->FindModule( sMod );
--				if ( pModule )
--				{
--					SbxArray* pMethods = pModule->GetMethods();
--					if ( pMethods )
--					{
--						SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
--						if ( pMethod )
--						{
--							sFullName = sMacro;
--							sFullName.Insert( '.', 0 ).Insert( sMod, 0 ).Insert( '.', 0 ).Insert( sLibrary, 0 );
--						}
--					}
--				}
--			}
--			else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
--			{
--					if( SbModule* pModule = pMethod->GetModule() )
--					{
--						sFullName = sMacro;
--						sFullName.Insert( '.', 0 ).Insert( pModule->GetName(), 0).Insert( '.', 0 ).Insert( sLibrary, 0 );
--					}
--			}		
--				
--		}
--	}
--	return sFullName;
-+    SfxObjectShell* pFoundShell=NULL;
-+    SfxObjectShell* pShell = SfxObjectShell::GetFirst();
-+    INetURLObject aObj;
-+    aObj.SetURL( sMacroURLOrPath );
-+    bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
-+    rtl::OUString aURL;
-+    if ( bIsURL )
-+        aURL = sMacroURLOrPath;
-+    else
-+    {
-+        osl::FileBase::getFileURLFromSystemPath( sMacroURLOrPath, aURL );
-+        aObj.SetURL( aURL );
-+    }    
-+    OSL_TRACE("Trying to find shell for url %s", rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    while ( pShell )
-+    {
-+
-+        uno::Reference< frame::XModel > xModel = pShell->GetModel();
-+        // are we searching for a template? if so we have to cater for the
-+        // fact that in openoffice a document opened from a template is always
-+        // a new document :/
-+        if ( xModel.is() )
-+        {
-+            OSL_TRACE("shell 0x%x has model with url %s and we look for %s", pShell
-+                , rtl::OUStringToOString( xModel->getURL(), RTL_TEXTENCODING_UTF8 ).getStr() 
-+                , rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() 
-+            );
-+            if ( sMacroURLOrPath.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) )
-+            {
-+                uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( xModel, uno::UNO_QUERY );
-+                if( xDocInfoSupp.is() )
-+                {
-+                    uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
-+                    uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
-+                    rtl::OUString sCurrName = xDocProps->getTemplateName();
-+                    if( sMacroURLOrPath.lastIndexOf( sCurrName ) >= 0 )
-+                    {
-+                        pFoundShell = pShell; 
-+                        break;
-+                    }
-+                }
-+            }
-+            else
-+            {
-+                if ( aURL.equals( xModel->getURL() ) )
-+                {
-+                    pFoundShell = pShell; 
-+                    break;
-+                }
-+            }
-+        }
-+        pShell = SfxObjectShell::GetNext( *pShell );
-+    }
-+    return pFoundShell;
- }
- 
--// Treat the args as possible inouts ( convertion at bottom of method )
--sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet )
-+// sMod can be empty ( but we really need the library to search in )
-+// if sMod is empty and a macro is found then sMod is updated
-+bool hasMacro( SfxObjectShell* pShell, const String& sLibrary, String& sMod, const String& sMacro )
-+{
-+    bool bFound = false;
-+    if ( sLibrary.Len() && sMacro.Len() )
-+    {
-+        OSL_TRACE("** Searching for %s.%s in library %s"
-+            ,rtl::OUStringToOString( sMod, RTL_TEXTENCODING_UTF8 ).getStr()
-+            ,rtl::OUStringToOString( sMacro, RTL_TEXTENCODING_UTF8 ).getStr()
-+            ,rtl::OUStringToOString( sLibrary, RTL_TEXTENCODING_UTF8 ).getStr() );
-+        BasicManager* pBasicMgr = pShell-> GetBasicManager();
-+        if ( pBasicMgr )
-+        {
-+            StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
-+            if ( !pBasic )
-+            {
-+                USHORT nId = pBasicMgr->GetLibId( sLibrary );
-+                pBasicMgr->LoadLib( nId );
-+                pBasic = pBasicMgr->GetLib( sLibrary );
-+            }
-+            if ( pBasic )
-+            {
-+                if ( sMod.Len() ) // we wish to find the macro is a specific module
-+                {
-+                    SbModule* pModule = pBasic->FindModule( sMod );
-+                    if ( pModule )
-+                    {
-+                        SbxArray* pMethods = pModule->GetMethods();
-+                        if ( pMethods )
-+                        {
-+                            SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
-+                            if ( pMethod )
-+                              bFound = true;
-+                        }
-+                    }
-+                }
-+                else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
-+                {
-+                    if( SbModule* pModule = pMethod->GetModule() )
-+                    {
-+                        sMod = pModule->GetName();
-+                        bFound = true;
-+                    }
-+                }
-+            }
-+        }
-+    }
-+    return bFound;
-+}
-+void parseMacro( const rtl::OUString& sMacro, String& sContainer, String& sModule, String& sProcedure )
- {
--	// until ObjectModules ( and persisting of codenames ) is supported, if this is a
--	// document saved from XL then we won't be able to determine the codename for the Workbook
--	// Module, so... we have no choice but to search all modules for the moment, thus the macro
--	// passed in should be the fully specified name. 	
--	rtl::OUString sUrl = makeMacroURL( sMacroName );
--	uno::Sequence< sal_Int16 > aOutArgsIndex;
--	uno::Sequence< uno::Any > aOutArgs;
--	ErrCode nErr = pShell->CallXScript( sUrl,  aArgs, aRet,
--			aOutArgsIndex, aOutArgs, sal_False );
--
--	// Script Executed?
--	if ( nErr != ERRCODE_NONE )
--		return sal_False;
--
--	sal_Int32 nLen = aOutArgs.getLength();
--	// convert any out params to seem like they were inouts
--	if ( nLen )
--	{
--		for ( sal_Int32 index=0; index < nLen; ++index )
--		{
--			sal_Int32 nOutIndex = aOutArgsIndex[ index ];
--			aArgs[ nOutIndex ] = aOutArgs[ index ];
--		}
--
--	}
--	return sal_True;
-+    sal_Int32 nMacroDot = sMacro.lastIndexOf( '.' );
-+    
-+    if ( nMacroDot != -1 )
-+    {
-+        sProcedure = sMacro.copy( nMacroDot + 1 );
-+ 
-+        sal_Int32 nContainerDot = sMacro.lastIndexOf( '.',  nMacroDot - 1 );
-+        if ( nContainerDot != -1 )
-+        {
-+            sModule = sMacro.copy( nContainerDot + 1, nMacroDot - nContainerDot - 1 );
-+            sContainer = sMacro.copy( 0, nContainerDot );
-+        }
-+        else
-+            sModule = sMacro.copy( 0, nMacroDot );
-+    }
-+    else
-+       sProcedure = sMacro;
-+}
-+
-+VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& MacroName, bool bSearchGlobalTemplates )
-+{
-+    VBAMacroResolvedInfo aRes;
-+    if ( !pShell )
-+        return aRes;
-+    aRes.SetMacroDocContext( pShell );
-+    // parse the macro name
-+    sal_Int32 nDocSepIndex = MacroName.indexOfAsciiL( "!", 1 );
-+    String sMacroUrl = MacroName;
-+
-+    String sContainer;
-+    String sModule;
-+    String sProcedure;
-+    
-+    if( nDocSepIndex > 0 )
-+    {
-+        // macro specified by document name
-+        // find document shell for document name and call ourselves 
-+        // recursively
-+
-+        // assume for now that the document name is *this* document
-+        String sDocUrlOrPath = MacroName.copy( 0, nDocSepIndex );
-+        sMacroUrl = MacroName.copy( nDocSepIndex + 1 );
-+        OSL_TRACE("doc search, current shell is 0x%x", pShell );
-+        SfxObjectShell* pFoundShell = findShellForUrl( sDocUrlOrPath );
-+        OSL_TRACE("doc search, after find, found shell is 0x%x", pFoundShell );
-+        aRes = resolveVBAMacro( pFoundShell, sMacroUrl ); 
-+    }    
-+    else
-+    {
-+        // macro is contained in 'this' document ( or code imported from a template
-+        // where that template is a global template or perhaps the template this
-+        // document is created from ) 
-+    
-+        // macro format = Container.Module.Procedure
-+        parseMacro( MacroName, sContainer, sModule, sProcedure ); 
-+        uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY);
-+        uno::Reference< container::XNameContainer > xPrjNameCache;
-+        if ( xSF.is() )
-+            xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY );
-+    
-+        std::vector< rtl::OUString > sSearchList; 
-+
-+        if ( sContainer.Len() > 0 )
-+        { 
-+            // get the Project associated with the Container
-+            if ( xPrjNameCache.is() )
-+            {
-+                if ( xPrjNameCache->hasByName( sContainer ) )
-+                {
-+                    rtl::OUString sProject;
-+                    xPrjNameCache->getByName( sContainer ) >>= sProject;
-+                    sContainer = sProject;
-+                }
-+            }
-+            sSearchList.push_back( sContainer ); // First Lib to search
-+        }
-+        else
-+        {
-+            // Ok, if we have no Container specified then we need to search them in order, this document, template this document created from, global templates, 
-+            // get the name of Project/Library for 'this' document
-+            rtl::OUString sThisProject;
-+            BasicManager* pBasicMgr = pShell-> GetBasicManager();
-+            if ( pBasicMgr )
-+            {
-+                if ( pBasicMgr->GetName().Len() )
-+                   sThisProject = pBasicMgr->GetName();
-+                else // cater for the case where VBA is not enabled
-+                   sThisProject = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") );
-+            }
-+            sSearchList.push_back( sThisProject ); // First Lib to search
-+            if ( xPrjNameCache.is() )
-+            {
-+                // is this document created from a template?
-+                uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( pShell->GetModel(), uno::UNO_QUERY_THROW );
-+                uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
-+                uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
-+            
-+                rtl::OUString sCreatedFrom = xDocProps->getTemplateURL();
-+                if ( sCreatedFrom.getLength() )
-+                {
-+                    INetURLObject aObj;
-+                    aObj.SetURL( sCreatedFrom );
-+                    bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
-+                    rtl::OUString aURL;
-+                    if ( bIsURL )
-+                        aURL = sCreatedFrom;
-+                    else
-+                    {
-+                        osl::FileBase::getFileURLFromSystemPath( sCreatedFrom, aURL );
-+                        aObj.SetURL( aURL );
-+                    }        
-+                    sCreatedFrom =  aObj.GetLastName();
-+                } 
-+                
-+                sal_Int32 nIndex =  sCreatedFrom.lastIndexOf( '.' );
-+                if ( nIndex != -1 )
-+                    sCreatedFrom = sCreatedFrom.copy( 0, nIndex );
-+        
-+                rtl::OUString sPrj;
-+                if ( sCreatedFrom.getLength() && xPrjNameCache->hasByName( sCreatedFrom ) )
-+                {
-+                    xPrjNameCache->getByName( sCreatedFrom ) >>= sPrj;
-+                    // Make sure we don't double up with this project
-+                    if ( !sPrj.equals( sThisProject ) )
-+                        sSearchList.push_back( sPrj );
-+                }
-+        
-+                // get list of global template Names
-+                uno::Sequence< rtl::OUString > sTemplateNames = xPrjNameCache->getElementNames();
-+                sal_Int32 nLen = sTemplateNames.getLength();
-+                for ( sal_Int32 index = 0; ( bSearchGlobalTemplates && index < nLen ); ++index )
-+                {
-+                    
-+                    if ( !sCreatedFrom.equals( sTemplateNames[ index ] ) )
-+                    {
-+                        if ( xPrjNameCache->hasByName( sTemplateNames[ index ] ) )
-+                        {
-+                            xPrjNameCache->getByName( sTemplateNames[ index ] ) >>= sPrj;
-+                            // Make sure we don't double up with this project
-+                            if ( !sPrj.equals( sThisProject ) )
-+                                sSearchList.push_back( sPrj );
-+                        }
-+                    }
-+        
-+                }
-+            }
-+        }
-+        std::vector< rtl::OUString >::iterator it_end = sSearchList.end();
-+        for ( std::vector< rtl::OUString >::iterator it = sSearchList.begin(); it != it_end; ++it )
-+        {
-+            bool bRes = hasMacro( pShell, *it, sModule, sProcedure );
-+            if ( bRes )
-+            {
-+                aRes.SetResolved( true );
-+                aRes.SetMacroDocContext( pShell );
-+                sContainer = *it;
-+                break;
-+            }
-+        }
-+    }
-+    aRes.SetResolvedMacro( sProcedure.Insert( '.', 0 ).Insert( sModule, 0).Insert( '.', 0 ).Insert( sContainer, 0 ) );
-+
-+    return aRes;
- }
- 
-+// Treat the args as possible inouts ( convertion at bottom of method )
-+sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& /*aRet*/, const uno::Any& aCaller )
-+{
-+    sal_Bool bRes = sal_False;
-+    if ( !pShell )
-+        return bRes;
-+    rtl::OUString sUrl = makeMacroURL( sMacroName );
-+
-+    uno::Sequence< sal_Int16 > aOutArgsIndex;
-+    uno::Sequence< uno::Any > aOutArgs;
-+
-+    try
-+    {    
-+        uno::Reference< script::provider::XScriptProvider > xScriptProvider;
-+        uno::Reference< script::provider::XScriptProviderSupplier > xSPS( pShell->GetModel(), uno::UNO_QUERY_THROW );
-+
-+        xScriptProvider.set( xSPS->getScriptProvider(), uno::UNO_QUERY_THROW );
-+
-+        uno::Reference< script::provider::XScript > xScript( xScriptProvider->getScript( sUrl ), uno::UNO_QUERY_THROW );
-+
-+        if ( aCaller.hasValue() )
-+        {
-+            uno::Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY );
-+            if ( xProps.is() )
-+            {
-+                uno::Sequence< uno::Any > aCallerHack(1);
-+                aCallerHack[ 0 ] = aCaller;
-+                xProps->setPropertyValue( rtl::OUString::createFromAscii( "Caller" ), uno::makeAny( aCallerHack ) );
-+            }
-+        }
-+
-+
-+        xScript->invoke( aArgs, aOutArgsIndex, aOutArgs  );
-+        
-+        sal_Int32 nLen = aOutArgs.getLength();
-+        // convert any out params to seem like they were inouts
-+        if ( nLen )
-+        {
-+            for ( sal_Int32 index=0; index < nLen; ++index )
-+            {
-+                sal_Int32 nOutIndex = aOutArgsIndex[ index ];
-+                aArgs[ nOutIndex ] = aOutArgs[ index ];
-+           }
-+        }
-+
-+        bRes = sal_True;
-+    }
-+    catch ( uno::Exception& e )
-+    {
-+       bRes = sal_False;
-+    }
-+    return bRes; 
-+}
- } } // vba // ooo
---- sw/inc/doc.hxx
-+++ sw/inc/doc.hxx
-@@ -417,6 +417,7 @@ class SW_DLLPUBLIC SwDoc :
- 
- 	// table of forbidden characters of this document
- 	vos::ORef<SvxForbiddenCharactersTable>	xForbiddenCharsTable;
-+   com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache;
- 
-     // --> OD 2007-10-26 #i83479#
- public:
-@@ -2127,6 +2128,8 @@ public:
- 	{
- 		return n32DummyCompatabilityOptions2;
- 	}
-+        void SetVBATemplateToProjectCache( com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xCache ) { m_xTemplateToProjectCache = xCache; };
-+        com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; };
- 
-     ::sfx2::IXmlIdRegistry& GetXmlIdRegistry();
-     SwDoc* CreateCopy() const;
-diff --git sw/inc/unocoll.hxx sw/inc/unocoll.hxx
-index e9da66c..2c6bd02 100644
---- sw/inc/unocoll.hxx
-+++ sw/inc/unocoll.hxx
-@@ -197,8 +197,9 @@ class SwUnoCollection
- #define SW_SERVICE_TYPE_FORMFIELDMARK                   108
- #define SW_SERVICE_VBAOBJECTPROVIDER                    109
- #define SW_SERVICE_VBACODENAMEPROVIDER                  110
-+#define SW_SERVICE_VBAPROJECTNAMEPROVIDER               111
- 
--#define SW_SERVICE_LAST                 SW_SERVICE_VBACODENAMEPROVIDER
-+#define SW_SERVICE_LAST                 SW_SERVICE_VBAPROJECTNAMEPROVIDER
- 
- #define SW_SERVICE_INVALID			USHRT_MAX
- 
-diff --git sw/source/core/unocore/unocoll.cxx sw/source/core/unocore/unocoll.cxx
-index 54797da..e3cded8 100644
---- sw/source/core/unocore/unocoll.cxx
-+++ sw/source/core/unocore/unocoll.cxx
-@@ -163,6 +163,71 @@ public:
-     }
- };
- 
-+typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > StringHashMap;
-+class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer >
-+{
-+    SwDocShell* mpDocShell;
-+    StringHashMap mTemplateToProject; 
-+public:
-+    SwVbaProjectNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell )
-+    {
-+    }
-+    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
-+    {
-+        return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() );
-+    }
-+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
-+    {
-+        if ( !hasByName( aName ) )
-+            throw container::NoSuchElementException();
-+        return uno::makeAny( mTemplateToProject.find( aName )->second );
-+    }
-+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (::com::sun::star::uno::RuntimeException)
-+    {
-+        uno::Sequence< rtl::OUString > aElements( mTemplateToProject.size() );
-+        StringHashMap::iterator it_end = mTemplateToProject.end();
-+        sal_Int32 index = 0;
-+        for ( StringHashMap::iterator it = mTemplateToProject.begin(); it != it_end; ++it, ++index )
-+            aElements[ index ] = it->first;
-+        return aElements;
-+    }
-+
-+    virtual void SAL_CALL insertByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException )
-+    {
-+        
-+        rtl::OUString sProjectName;
-+        aElement >>= sProjectName;
-+        OSL_TRACE("** Template cache inserting template name %s with project %s"
-+            , rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr()
-+            , rtl::OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+        mTemplateToProject[ aName ] = sProjectName;
-+    }
-+
-+    virtual void SAL_CALL removeByName( const rtl::OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException )
-+    {
-+        if ( !hasByName( Name ) )
-+            throw container::NoSuchElementException();
-+        mTemplateToProject.erase( Name );
-+    }
-+    virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException )
-+    {
-+        if ( !hasByName( aName ) )
-+            throw container::NoSuchElementException();
-+        insertByName( aName, aElement ); // insert will overwrite
-+    }
-+    // XElemenAccess
-+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw (::com::sun::star::uno::RuntimeException)
-+    { 
-+        return ::getCppuType((const rtl::OUString*)0); 
-+    }
-+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException ) 
-+    { 
-+        
-+        return ( mTemplateToProject.size() > 0 );
-+    }
-+
-+};
-+
- class SwVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
- {
-     SwDocShell* mpDocShell;
-@@ -325,6 +390,7 @@ const ProvNamesId_Type __FAR_DATA aProvNamesId[] =
-     { "com.sun.star.chart2.data.DataProvider",                SW_SERVICE_CHART2_DATA_PROVIDER },
-     { "ooo.vba.VBAObjectModuleObjectProvider",                SW_SERVICE_VBAOBJECTPROVIDER },
-     { "ooo.vba.VBACodeNameProvider",                          SW_SERVICE_VBACODENAMEPROVIDER },
-+    { "ooo.vba.VBAProjectNameProvider",                       SW_SERVICE_VBAPROJECTNAMEPROVIDER },
- 
-     // case-correct versions of the service names (see #i67811)
-     { CSS_TEXT_TEXTFIELD_DATE_TIME,                   SW_SERVICE_FIELDTYPE_DATETIME },
-@@ -517,6 +583,18 @@ uno::Reference< uno::XInterface >   SwXServiceProvider::MakeInstance(sal_uInt16
- 			xRet =  (cppu::OWeakObject*)pObjProv;
- 		}
- 		break;
-+		case  SW_SERVICE_VBAPROJECTNAMEPROVIDER :
-+		{
-+                        uno::Reference< container::XNameContainer > xProjProv = pDoc->GetVBATemplateToProjectCache();
-+                        if ( !xProjProv.is() )
-+                        {
-+			    xProjProv = new SwVbaProjectNameProvider( pDoc->GetDocShell() );
-+                            pDoc->SetVBATemplateToProjectCache( xProjProv );
-+                        }
-+			//xRet =  (cppu::OWeakObject*)xProjProv;
-+			xRet = xProjProv;
-+		}
-+		break;
-         case  SW_SERVICE_TYPE_FOOTNOTE :
-             xRet =  (cppu::OWeakObject*)new SwXFootnote(sal_False);
-         break;
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index 90efd7b..e1366a2 100644
---- sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -161,7 +161,7 @@ using namespace nsHdFtFlags;
- #include <svtools/pathoptions.hxx>
- #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
- 
--const static String sModule( RTL_CONSTASCII_USTRINGPARAM("ThisDocument"));
-+const static String sThisDocument( RTL_CONSTASCII_USTRINGPARAM("ThisDocument"));
- 
- struct DocEventNameTable
- {
-@@ -191,10 +191,10 @@ bool registerDocEvent( SfxObjectShell* pShell )
-         for( const DocEventNameTable* pTable = aEventNameTable; pTable->sEventName != NULL; pTable++ )
-         {
-             rtl::OUString sEvt = rtl::OUString::createFromAscii( pTable->sEventName );
--            rtl::OUString sMacroName = rtl::OUString::createFromAscii( pTable->sMacroName );
-+            String sMacroName = String::CreateFromAscii( pTable->sMacroName ).Insert( '.', 0 ).Insert( sThisDocument, 0);
-             // fail to search the macro if the module is not specified.
--            String sFullPath = ooo::vba::findVBAMacro( pShell, sModule, sMacroName );
--            if( sFullPath.Len() == 0 )
-+            ooo::vba::VBAMacroResolvedInfo aMacroInfo = ooo::vba::resolveVBAMacro( pShell, sMacroName );
-+            if( !aMacroInfo.IsResolved() )
-                 continue;
- 
- 		    uno::Sequence< beans::PropertyValue > aEvents;
-@@ -203,7 +203,7 @@ bool registerDocEvent( SfxObjectShell* pShell )
- 		    aOpenEvt[ 0 ].Name = sEvtType;
- 		    aOpenEvt[ 0 ].Value = uno::makeAny(sScript);
- 		    aOpenEvt[ 1 ].Name = sScript;
--            rtl::OUString sUrl = ooo::vba::makeMacroURL( sFullPath );
-+            rtl::OUString sUrl = ooo::vba::makeMacroURL( aMacroInfo.ResolvedMacro() );
-     		aOpenEvt[ 1 ].Value = uno::makeAny(sUrl);
- 	    	sal_Int32 nPos = aEvents.getLength();
- 
-@@ -3834,6 +3834,39 @@ void SwWW8ImplReader::ReadDocInfo()
-     }
- }
- 
-+void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameContainer >& xPrjNameCache, const rtl::OUString& sTemplatePathOrURL, const rtl::OUString& sVBAProjName )
-+{
-+    if ( xPrjNameCache.is() )
-+    {
-+        INetURLObject aObj;
-+        aObj.SetURL( sTemplatePathOrURL );
-+        bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
-+        rtl::OUString aURL;
-+        if ( bIsURL )
-+            aURL = sTemplatePathOrURL;
-+        else
-+        {
-+            osl::FileBase::getFileURLFromSystemPath( sTemplatePathOrURL, aURL );
-+            aObj.SetURL( aURL );
-+        }
-+        try
-+        {
-+            rtl::OUString templateNameWithExt = aObj.GetLastName();
-+            rtl::OUString templateName;
-+            sal_Int32 nIndex =  templateNameWithExt.lastIndexOf( '.' );
-+            //xPrjNameCache->insertByName( templateNameWithExt, uno::makeAny( sVBAProjName ) );    
-+            if ( nIndex != -1 )
-+            {
-+                templateName = templateNameWithExt.copy( 0, nIndex );
-+                xPrjNameCache->insertByName( templateName, uno::makeAny( sVBAProjName ) );    
-+            }
-+        }
-+        catch( uno::Exception& )
-+        {
-+        }
-+    }
-+}
-+
- class WW8Customizations
- {
-     SvStream* mpTableStream;
-@@ -3863,7 +3896,7 @@ bool WW8Customizations::Import( SwDocShell* pShell )
-     return aTCG.ImportCustomToolBar( *pShell );
- }
- 
--bool SwWW8ImplReader::ReadGlobalTemplateSettings()
-+bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const uno::Reference< container::XNameContainer >& xPrjNameCache )
- {
-     SvtPathOptions aPathOpt;
-     String aAddinPath = aPathOpt.GetAddinPath();
-@@ -3878,11 +3911,6 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings()
-     sal_Int32 nEntries = sGlobalTemplates.getLength();
-     bool bRes = true;
-     const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
--    uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
--    uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
--    uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
--
--    rtl::OUString sCreatedFrom = xDocProps->getTemplateURL();
-     for ( sal_Int32 i=0; i<nEntries; ++i )
-     {
-         INetURLObject aObj;
-@@ -3897,13 +3925,17 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings()
-             continue; // don't try and read the same document as ourselves
- 
-         SotStorageRef rRoot = new SotStorage( aURL, STREAM_STD_READWRITE, STORAGE_TRANSACTED ); 
-+
-         // Read Macro Projects
-         SvxImportMSVBasic aVBasic(*mpDocShell, *rRoot,
-             pVBAFlags->IsLoadWordBasicCode(),
-             pVBAFlags->IsLoadWordBasicStorage() );
-+
-+
-         String s1(CREATE_CONST_ASC("Macros"));
-         String s2(CREATE_CONST_ASC("VBA"));
-         int nRet = aVBasic.Import( s1, s2, ! pVBAFlags->IsLoadWordBasicCode() );
-+        lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aVBasic.GetVBAProjectName() );
-         // Read toolbars & menus
-         SvStorageStreamRef refMainStream = rRoot->OpenSotStream( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WordDocument") ) );
-         refMainStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
-@@ -4183,10 +4215,20 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
- // dissable below for 3.1 at the moment, 'cause it's kinda immature
- // similarly the project reference in svx/source/msvba
- #if 1
-+            uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
-+            uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
-+            uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
-+    
-+            rtl::OUString sCreatedFrom = xDocProps->getTemplateURL();
-+            uno::Reference< container::XNameContainer > xPrjNameCache;
-+            uno::Reference< lang::XMultiServiceFactory> xSF(mpDocShell->GetModel(), uno::UNO_QUERY);
-+            if ( xSF.is() )
-+                xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY );
-+
-             // Read Global templates 
--            ReadGlobalTemplateSettings();
-+            ReadGlobalTemplateSettings( sCreatedFrom, xPrjNameCache );
- #endif 
--            // Create and insert Excel vba Globals
-+            // Create and insert Word vba Globals
-             uno::Any aGlobs;
-             aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals") );
-             mpDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
-@@ -4200,6 +4242,7 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
- // dissable below for 3.1 at the moment, 'cause it's kinda immature
- // similarly the project reference in svx/source/msvba
- #if 1
-+            lcl_createTemplateToProjectEntry( xPrjNameCache, sCreatedFrom, aVBasic.GetVBAProjectName() );
-             WW8Customizations aCustomisations( pTableStream, *pWwFib ); 
-             aCustomisations.Import( mpDocShell );
- #endif 
-diff --git sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par.hxx
-index 89ab0d6..9389568 100644
---- sw/source/filter/ww8/ww8par.hxx
-+++ sw/source/filter/ww8/ww8par.hxx
-@@ -1415,7 +1415,7 @@ private:
-     // determine object attribute "Layout in Table Cell"
-     bool IsObjectLayoutInTableCell( const UINT32 nLayoutInTableCell ) const;
-     // <--
--    bool ReadGlobalTemplateSettings();
-+    bool ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap );
-     //No copying
-     SwWW8ImplReader(const SwWW8ImplReader &);
-     SwWW8ImplReader& operator=(const SwWW8ImplReader&);
-diff --git sw/source/ui/uno/unotxdoc.cxx sw/source/ui/uno/unotxdoc.cxx
-index 0aacbda..9bc3d85 100644
---- sw/source/ui/uno/unotxdoc.cxx
-+++ sw/source/ui/uno/unotxdoc.cxx
-@@ -225,6 +225,12 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI
-     {
-             return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ));
-     }
-+    if( rId.getLength() == 16
-+        && 0 == rtl_compareMemory( SfxObjectShell::getUnoTunnelId().getConstArray(),
-+										rId.getConstArray(), 16 ) )
-+    {
-+        return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell ));
-+    }
- 
- 	sal_Int64 nRet = SfxBaseModel::getSomething( rId );
- 	if ( nRet )
-diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx
-index 1849437..77eb2a3 100644
---- vbahelper/inc/vbahelper/vbahelper.hxx
-+++ vbahelper/inc/vbahelper/vbahelper.hxx
-@@ -63,6 +63,7 @@ namespace ooo
- 				throw css::lang::IllegalArgumentException();
- 			return aSomething;
- 		}
-+        VBAHELPER_DLLPUBLIC SfxObjectShell* getSfxObjShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException);
-         VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell,  const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException);
-         VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell,  const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
-         VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
-diff --git vbahelper/source/vbahelper/vbaapplicationbase.cxx vbahelper/source/vbahelper/vbaapplicationbase.cxx
-index a424b35..0d9f52e 100644
---- vbahelper/source/vbahelper/vbaapplicationbase.cxx
-+++ vbahelper/source/vbahelper/vbaapplicationbase.cxx
-@@ -134,234 +134,39 @@ VbaApplicationBase::getVersion() throw (uno::RuntimeException)
- 
- void SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException)
- {
--    // parse the macro name
--    sal_Int32 nDocSepIndex = MacroName.indexOfAsciiL( "!", 1 );
--    String sMacroUrl = MacroName;
--    uno::Reference< frame::XModel > xModel;
--    if( nDocSepIndex > 0 )
-+    VBAMacroResolvedInfo aMacroInfo = resolveVBAMacro( GetDocShell( getCurrentDocument() ), MacroName );
-+    if( aMacroInfo.IsResolved() )
-     {
--        rtl::OUString sTemplate = MacroName.copy( 0, nDocSepIndex );
--        OSL_TRACE("VbaApplicationBase::Run, template name: %s", rtl::OUStringToOString( sTemplate, RTL_TEXTENCODING_UTF8 ).getStr() );
--        sMacroUrl = MacroName.copy( nDocSepIndex + 1 );
--        OSL_TRACE("VbaApplicationBase::Run, macro name: %s", rtl::OUStringToOString( sMacroUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
-+        // handle the arguments
-+        const uno::Any* aArgsPtrArray[] = { &varg1, &varg2, &varg3, &varg4, &varg5, &varg6, &varg7, &varg8, &varg9, &varg10, &varg11, &varg12, &varg13, &varg14, &varg15, &varg16, &varg17, &varg18, &varg19, &varg20, &varg21, &varg22, &varg23, &varg24, &varg25, &varg26, &varg27, &varg28, &varg29, &varg30 };
- 
--        // get the template model
--		uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+        int nArg = sizeof( aArgsPtrArray ) / sizeof( aArgsPtrArray[0] );
-+        uno::Sequence< uno::Any > aArgs( nArg );
- 
--		uno::Reference< frame::XDesktop > xDesktop
--			(xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), mxContext), uno::UNO_QUERY_THROW );
--		uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration();
--        sal_Int32 nCount = 0;
--		while( mxComponents->hasMoreElements() )
--		{
--            uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( mxComponents->nextElement(), uno::UNO_QUERY );
--            if( xDocInfoSupp.is() )
--            {
--                uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
--                uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
--                rtl::OUString sCurrName = xDocProps->getTemplateName();
--                OSL_TRACE("VbaApplicationBase::Run, current template %d name: %s", ++nCount, rtl::OUStringToOString( sCurrName, RTL_TEXTENCODING_UTF8 ).getStr() );
--                // FIXME: should be check the full path of the template
--                if( sTemplate.lastIndexOf( sCurrName ) >= 0 )
--                {
--                    xModel.set( xDocInfoSupp, uno::UNO_QUERY_THROW );
--                    break;
--                }
--            }
-+        const uno::Any** pArg = aArgsPtrArray;
-+        const uno::Any** pArgEnd = ( aArgsPtrArray + nArg );
-+
-+        sal_Int32 nLastArgWithValue = 0;
-+        sal_Int32 nArgProcessed = 0;
-+
-+        for ( ; pArg != pArgEnd; ++pArg, ++nArgProcessed )
-+        {
-+            aArgs[ nArgProcessed ] =  **pArg;
-+            if( (*pArg)->hasValue() )
-+                nLastArgWithValue = nArgProcessed;
-         }
--    }
--    else
--    {
--        xModel = getCurrentDocument();
--    }
- 
--    if( !xModel.is() )
--    {
--        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Fail to find the template in Application.Run") ), uno::Reference< uno::XInterface >() );
--    }
-+        // resize array to position of last param with value
-+        aArgs.realloc( nArgProcessed + 1 );
- 
--    String sMacro;
--    String sModule;
--    sal_Int32 nTokens = sMacroUrl.GetTokenCount( '.' );
--    xub_StrLen nToken = 0;
--    xub_StrLen nIndex = 0;
--    // only support ThisModule.ThisMacro
--    if( nTokens == 2 )
--    {
--        sModule = sMacroUrl.GetToken( nToken, '.', nIndex );
--        sMacro = sMacroUrl.GetToken( nToken, '.', nIndex );
-+        uno::Any aRet;
-+        uno::Any aDummyCaller;
-+        executeMacro( aMacroInfo.MacroDocContext(), aMacroInfo.ResolvedMacro(), aArgs, aRet, aDummyCaller );
-     }
-     else
-     {
-         throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("The macro doesn't exist") ), uno::Reference< uno::XInterface >() );
-     }
--
--    SfxObjectShell* pShell = GetDocShell( xModel );
--    if( pShell )
--    {
--        sMacroUrl = findVBAMacro( pShell, sModule, sMacro );
--        if( sMacroUrl.Len() )
--        {
--            // handle the arguments
--            uno::Sequence< uno::Any > aArgs;
--            if( varg1.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg1;
--            }
--            if( varg2.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg2;
--            }
--            if( varg3.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg3;
--            }
--            if( varg4.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg4;
--            }
--            if( varg5.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg5;
--            }
--            if( varg6.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg6;
--            }
--            if( varg7.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg7;
--            }
--            if( varg8.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg8;
--            }
--            if( varg9.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg9;
--            }
--            if( varg10.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg10;
--            }
--            if( varg11.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg11;
--            }
--            if( varg12.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg12;
--            }
--            if( varg13.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg13;
--            }
--            if( varg14.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg14;
--            }
--            if( varg15.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg15;
--            }
--            if( varg16.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg16;
--            }
--            if( varg17.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg17;
--            }
--            if( varg18.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg18;
--            }
--            if( varg19.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg19;
--            }
--            if( varg20.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg20;
--            }
--            if( varg21.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg21;
--            }
--            if( varg22.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg22;
--            }
--            if( varg23.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg23;
--            }
--            if( varg24.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg24;
--            }
--            if( varg25.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg25;
--            }
--            if( varg26.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg26;
--            }
--            if( varg27.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg27;
--            }
--            if( varg28.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg28;
--            }
--            if( varg29.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg29;
--            }
--            if( varg30.hasValue() )
--            {
--                aArgs.realloc( aArgs.getLength() + 1 );
--                aArgs[ aArgs.getLength() ] =  varg30;
--            }
--            uno::Any aRet;
--            executeMacro( pShell, sMacroUrl, aArgs, aRet );
--        }
--        else
--        {
--            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("The macro doesn't exist") ), uno::Reference< uno::XInterface >() );
--        }
--    }
- }
- 
- float SAL_CALL VbaApplicationBase::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException)
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-index 718cdd0..2fcce8a 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-@@ -36,6 +36,8 @@
- #include <basic/sbstar.hxx>
- #include <basic/sbmod.hxx>
- #include <basic/sbmeth.hxx>
-+#include <vbahelper/vbahelper.hxx>
-+#include <svx/msvbahelper.hxx>
- 
- using namespace com::sun::star;
- using namespace ooo::vba;
-@@ -286,79 +288,31 @@ ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (u
- {
-     if( m_xCurrentSettings.is() )
-     {
--        // convert the comand url into something like vnd.sun.star.script:Standard.testMacro.Macro1?language=Basic&location=document
--        rtl::OUString aCommandURL;
--        rtl::OUString sScheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
--        SbModule* pModule = StarBASIC::GetActiveModule();
--        StarBASIC* pLib = pModule ? dynamic_cast< StarBASIC* >( pModule->GetParent() ) : NULL;
--
--        // Ok, we should be able to deal with the following params for onAction
--        // a) macro ( we assume the macro lives in this Project ( that is not really a valid assumption but we can't currently search outside this Library yet )
--        // b) module.macro ( again assume the macro is in this Project ) 
--        // c) project.module.macro fully specified
--
--        if( pModule && pLib )
-+        // get the current model
-+        uno::Reference< frame::XModel > xModel( getCurrentDocument() ); 
-+        VBAMacroResolvedInfo aResolvedMacro = ooo::vba::resolveVBAMacro( getSfxObjShell( xModel ), _onaction, true );
-+        if ( aResolvedMacro.IsResolved() )
-         {
--            String sProject; 
--            String sModule;
--            String sMacro = _onaction;
--
--            sal_Int32 nMacroDot = _onaction.lastIndexOf( '.' );
--
--            if ( nMacroDot != -1 )
-+            rtl::OUString aCommandURL = ooo::vba::makeMacroURL( aResolvedMacro.ResolvedMacro() );
-+		OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
-+            beans::PropertyValues aPropertyValues;
-+            m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
-+            beans::PropertyValues aNewPropertyValues;
-+            aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
-+            m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
-+            if( m_xUICfgManager->hasSettings( m_sBarName ) )
-             {
--                sMacro = _onaction.copy( nMacroDot + 1 );
--
--                sal_Int32 nProjectDot = _onaction.lastIndexOf( '.',  nMacroDot - 1 );
--                if ( nProjectDot != -1 )
--                {
--                    sModule = _onaction.copy( nProjectDot + 1, nMacroDot - nProjectDot - 1 );
--                    pModule = NULL; // force full spec. no search
--              
--                } 
--                else
--                    sModule = _onaction.copy( 0, nMacroDot );
--                pModule = pLib->FindModule( sModule );
-+                m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-             }
--
--            // Hopefully eventually if no project is specified 'Find' below
--            // will do the right thing
--            if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pModule ? pModule->Find( sMacro, SbxCLASS_METHOD ) : NULL ) )
-+            else
-             {
--                if(  pMethod )
--                {
--                    sModule = pModule->GetName();
--                    sProject = pModule->GetParent()->GetName();
--                }
-+                m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+            }
-+            // make it permanent
-+            if( !m_bTemporary )
-+            {
-+                m_xUICfgPers->store();
-             }
--            sMacro.Insert( '.', 0 ).Insert( sModule, 0 ).Insert( '.', 0 ).Insert( sProject, 0 );
--
--            rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
--            aCommandURL = sScheme.concat( sMacro ).concat( sUrlPart2 );
--            OSL_TRACE("**** METHOD IS %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
--        }
--        else
--        {
--            aCommandURL = _onaction;
--        }
--		OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
--        beans::PropertyValues aPropertyValues;
--        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
--        beans::PropertyValues aNewPropertyValues;
--        aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
--        m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
--        if( m_xUICfgManager->hasSettings( m_sBarName ) )
--        {
--            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        else
--        {
--            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        // make it permanent
--        if( !m_bTemporary )
--        {
--            m_xUICfgPers->store();
-         }
-     }
- }
-diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx
-index 57bca7c..97ebb3b 100644
---- vbahelper/source/vbahelper/vbahelper.cxx
-+++ vbahelper/source/vbahelper/vbahelper.cxx
-@@ -67,6 +67,7 @@
- #include <toolkit/awt/vclxwindow.hxx>
- #include <toolkit/helper/vclunohelper.hxx>
- #include <com/sun/star/frame/XModel2.hpp>
-+#include <com/sun/star/lang/XUnoTunnel.hpp>
- #include <vcl/window.hxx>
- #include <vcl/syswin.hxx>
- #include <tools/diagnose_ex.h>
-@@ -1116,7 +1117,19 @@ UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComp
- 		double points = double( static_cast<double>(_hmm) / factor);
- 		return points;
- 	}
--
-+        
-+        SfxObjectShell* getSfxObjShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
-+        {
-+            SfxObjectShell* pFoundShell = NULL;
-+            if ( xModel.is() )
-+            {
-+                uno::Reference< lang::XUnoTunnel >  xObjShellTunnel( xModel, uno::UNO_QUERY_THROW );
-+                pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId()));
-+            }
-+            if ( !pFoundShell )
-+                throw uno::RuntimeException();
-+            return pFoundShell;
-+        }
- 
- } // openoffice
- } //org
diff --git a/applied_patches/0506-svg-import-filter-gfxfilter.diff b/applied_patches/0388-svg-import-filter-gfxfilter.diff
similarity index 100%
rename from applied_patches/0506-svg-import-filter-gfxfilter.diff
rename to applied_patches/0388-svg-import-filter-gfxfilter.diff
diff --git a/applied_patches/0388-vba-currentcomponent-rework.diff b/applied_patches/0388-vba-currentcomponent-rework.diff
deleted file mode 100644
index ef07d9be8..000000000
--- a/applied_patches/0388-vba-currentcomponent-rework.diff
+++ /dev/null
@@ -1,1553 +0,0 @@
-diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
-index 846682b..4d1db8b 100644
---- sc/source/filter/excel/excimp8.cxx
-+++ sc/source/filter/excel/excimp8.cxx
-@@ -295,9 +295,16 @@ void ImportExcel8::ReadBasic( void )
-                 // The only wrinkle seems if this document is loaded 'InVisible'
-                 // but.. I don't see that this is possible from the vba API 
-                 // I could be wrong though
-+                // There may be implications setting the current component
-+                // too early :-/ so I will just manually set the Basic Variables
-+                //SfxObjectShell::SetCurrentComponent( pShell->GetModel() );
-                 BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
-                 if ( pAppMgr )
--                    pAppMgr->SetGlobalUNOConstant( "ThisComponent", makeAny( pShell->GetModel() ) );
-+                {
-+                    uno::Any aModel = uno::makeAny( pShell->GetModel() );
-+                    pAppMgr->SetGlobalUNOConstant( "ThisExcelDoc", aModel );
-+                }
-+
-             }
-         }
-     }
---- sc/source/ui/unoobj/docuno.cxx
-+++ sc/source/ui/unoobj/docuno.cxx
-@@ -102,6 +102,7 @@
- using namespace com::sun::star;
- using namespace com::sun::star::document::VbaEventId;
- 
-+#define SC_UNO_VBADOCOBJ "ThisVBADocObj" // perhaps we want to actually make this ThisWorkbook ?
- //------------------------------------------------------------------------
- 
- //	alles ohne Which-ID, Map nur fuer PropertySetInfo
-@@ -116,6 +117,7 @@ const SfxItemPropertyMap* lcl_GetDocOptPropertyMap()
-         {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC),       0, &getBooleanCppuType(),                                    0, 0},
-         {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES),    0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0},
-         {MAP_CHAR_LEN(SC_UNO_DIALOGLIBRARIES),   0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0},
-+        {MAP_CHAR_LEN(SC_UNO_VBADOCOBJ),   0, &getCppuType((beans::PropertyValue*)0), beans::PropertyAttribute::READONLY, 0},
-         {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN),       PROP_UNO_CALCASSHOWN, &getBooleanCppuType(),                                    0, 0},
-         {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),        0, &getCppuType((lang::Locale*)0),                           0, 0},
-         {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),        0, &getCppuType((lang::Locale*)0),                           0, 0},
-@@ -1555,6 +1557,13 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa
-         {
-             aRet <<= pDocShell->GetDialogContainer();
-         }
-+        else if ( aString.EqualsAscii( SC_UNO_VBADOCOBJ ) )
-+        {
-+            beans::PropertyValue aProp;
-+            aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisExcelDoc") );
-+            aProp.Value <<= pDocShell->GetModel();
-+            aRet <<= aProp;
-+        }
-         else if ( aString.EqualsAscii( SC_UNO_RUNTIMEUID ) )
-         {
-             aRet <<= getRuntimeUID();
-diff --git sc/source/ui/vba/excelvbahelper.cxx sc/source/ui/vba/excelvbahelper.cxx
-index 795ec5a..5f133d9 100644
---- sc/source/ui/vba/excelvbahelper.cxx
-+++ sc/source/ui/vba/excelvbahelper.cxx
-@@ -193,7 +193,7 @@ getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel )
- ScTabViewShell* 
- getCurrentBestViewShell()
- { 
--	uno::Reference< frame::XModel > xModel = getCurrentDocument();
-+	uno::Reference< frame::XModel > xModel = getCurrentExcelDoc();
- 	return getBestViewShell( xModel );
- }
- 
-diff --git sc/source/ui/vba/vbaapplication.cxx sc/source/ui/vba/vbaapplication.cxx
-index 9088dc9..c06f3bd 100644
---- sc/source/ui/vba/vbaapplication.cxx
-+++ sc/source/ui/vba/vbaapplication.cxx
-@@ -123,7 +123,7 @@ class ActiveWorkbook : public ScVbaWorkbook
- protected:
- 	virtual uno::Reference< frame::XModel > getModel()
- 	{ 	
--		return getCurrentDocument(); 
-+		return getCurrentExcelDoc(); 
- 	}
- public:
- 	ActiveWorkbook( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext) : ScVbaWorkbook(  xParent, xContext ){}
-@@ -163,8 +163,9 @@ uno::Any SAL_CALL
- ScVbaApplication::getSelection() throw (uno::RuntimeException)
- {
-     OSL_TRACE("** ScVbaApplication::getSelection() ** ");
-+    uno::Reference< frame::XModel > xModel( getCurrentDocument() );
- 
--    Reference< view::XSelectionSupplier > xSelSupp( getCurrentDocument()->getCurrentController(), UNO_QUERY_THROW );
-+    Reference< view::XSelectionSupplier > xSelSupp( xModel->getCurrentController(), UNO_QUERY_THROW );
-     Reference< beans::XPropertySet > xPropSet( xSelSupp, UNO_QUERY_THROW );
-     OUString aPropName = OUString::createFromAscii( SC_UNO_FILTERED_RANGE_SELECTION );
-     uno::Any aOldVal = xPropSet->getPropertyValue( aPropName );
-@@ -198,10 +199,10 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
- 		uno::Reference< lang::XServiceInfo > xShapeServiceInfo( xShape, uno::UNO_QUERY_THROW );
- 		if ( xShapeServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.Text" ) ) )  )
- 		{
--                return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, getCurrentDocument() ) ) );
-+                return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, xModel ) ) );
- 		}
- 	}
--        return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, ScVbaShape::getType( xShape ) ) ) );
-+        return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape ) ) ) );
-     }
-     else if( xServiceInfo->supportsService( rtl::OUString::createFromAscii("com.sun.star.sheet.SheetCellRange")) ||
-              xServiceInfo->supportsService( rtl::OUString::createFromAscii("com.sun.star.sheet.SheetCellRanges")))
-@@ -288,7 +289,7 @@ ScVbaApplication::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeExc
- uno::Any 
- ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException)
- {
--	uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( this ), mxContext ) );
-+	uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( this ), mxContext, getCurrentDocument() ) );
- 	if( !aIndex.hasValue() )
- 		return uno::Any( xDialogs );
- 	return uno::Any( xDialogs->Item( aIndex ) );
-@@ -581,7 +582,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
- sal_Int32 SAL_CALL
- ScVbaApplication::getCursor() throw (uno::RuntimeException)
- {
--    sal_Int32 nPointerStyle =  getPointerStyle();
-+    sal_Int32 nPointerStyle =  getPointerStyle(getCurrentDocument());
- 
-     switch( nPointerStyle )
-     {
-@@ -603,12 +604,13 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
- {
-     try
-     {
-+	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-         switch( _cursor )
-         {
-             case excel::XlMousePointer::xlNorthwestArrow:
-             {
-                 const Pointer& rPointer( POINTER_ARROW );
--                setCursorHelper( rPointer, sal_False );
-+                setCursorHelper( xModel, rPointer, sal_False );
-                 break;
-             }
-             case excel::XlMousePointer::xlWait:
-@@ -616,13 +618,13 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
-             {
-                 const Pointer& rPointer( static_cast< PointerStyle >( _cursor ) );
-                 //It will set the edit window, toobar and statusbar's mouse pointer.
--                setCursorHelper( rPointer, sal_True );
-+                setCursorHelper( xModel, rPointer, sal_True );
-                 break;
-             }
-             case excel::XlMousePointer::xlDefault:
-             {
-                 const Pointer& rPointer( POINTER_NULL );
--                setCursorHelper( rPointer, sal_False );
-+                setCursorHelper( xModel, rPointer, sal_False );
-                 break;
-             }
-             default:
-@@ -1125,17 +1127,6 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile )  throw ( uno::RuntimeExc
- 
- // this is bound to break when loading the document
- 	return; 
--/*
--	if ( bVolatile )
--		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Volatile - not supported" ) ), uno::Reference< uno::XInterface >() );
--	// bVoloatile is false - currently this only would make sense if 
--	// the autocalculate mode is set to be true.
--
--	// so really this is crap, #TODO try and understand how ( or if ) 
--	// the calculation mode and volatile interoperate
--	if ( ! getCalculation() == excel::XlCalculation::xlCalculationAutomatic )
--		setCalculation(  excel::XlCalculation::xlCalculationAutomatic );
--*/
- }
- 
- ::sal_Bool SAL_CALL 
-@@ -1189,6 +1180,12 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep
- 	return aRet;
- }
- 
-+uno::Reference< frame::XModel > 
-+ScVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
-+{
-+    return getCurrentExcelDoc();
-+}
-+
- rtl::OUString& 
- ScVbaApplication::getServiceImplName()
- {
-diff --git sc/source/ui/vba/vbaapplication.hxx sc/source/ui/vba/vbaapplication.hxx
-index 67b6ba9..d7098b4 100644
---- sc/source/ui/vba/vbaapplication.hxx
-+++ sc/source/ui/vba/vbaapplication.hxx
-@@ -47,6 +47,8 @@ class ScVbaApplication : public ScVbaApplication_BASE
- private:
- 	sal_Int32 m_xCalculation;
- 	rtl::OUString getOfficePath( const rtl::OUString& sPath ) throw ( css::uno::RuntimeException );
-+protected:
-+        virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
- public:
- 	ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext );
- 	virtual ~ScVbaApplication();
-diff --git sc/source/ui/vba/vbachartobject.cxx sc/source/ui/vba/vbachartobject.cxx
-index c87e356..71942f1 100644
---- sc/source/ui/vba/vbachartobject.cxx
-+++ sc/source/ui/vba/vbachartobject.cxx
-@@ -120,10 +120,11 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException )
- {
- 	try
- 	{
--		// #TODO #FIXME should be ThisWorkbook or equivelant
--		// XModel
-+		// #TODO #FIXME should be ThisWorkbook or equivelant, or in
-+		// fact probably the chart object should be created with 
-+		// the XModel owner
- 		//uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getXModel().getCurrentController());
--		uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
-+		uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getCurrentExcelDoc()->getCurrentController(), uno::UNO_QUERY_THROW );
- 		xSelectionSupplier->select(uno::makeAny(xShape));
- 	}
- 	catch (uno::Exception& )
-diff --git sc/source/ui/vba/vbacharts.cxx sc/source/ui/vba/vbacharts.cxx
-index 3c87bb5..7dc8cbc 100644
---- sc/source/ui/vba/vbacharts.cxx
-+++ sc/source/ui/vba/vbacharts.cxx
-@@ -35,11 +35,9 @@ using namespace ::com::sun::star;
- using namespace ::ooo::vba;
- 
- 
--ScVbaCharts::ScVbaCharts( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext ) : Charts_BASE(_xParent, _xContext, uno::Reference< container::XIndexAccess >() )
-+ScVbaCharts::ScVbaCharts( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const uno::Reference< frame::XModel >& xModel ) : Charts_BASE(_xParent, _xContext, uno::Reference< container::XIndexAccess >())
- {
--	// #TODO #FIXME surely this is wrong, you should never use the 
--	// currently documement ( it could be anything )
--	xComponent.set( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+	xComponent.set( xModel, uno::UNO_QUERY_THROW );
- 	xSpreadsheetDocument.set( xComponent, uno::UNO_QUERY_THROW );
- }
- 
-diff --git sc/source/ui/vba/vbacharts.hxx sc/source/ui/vba/vbacharts.hxx
-index cedfeaa..fc227ba 100644
---- sc/source/ui/vba/vbacharts.hxx
-+++ sc/source/ui/vba/vbacharts.hxx
-@@ -43,7 +43,7 @@ class ScVbaCharts : public Charts_BASE
- 	css::uno::Reference< css::sheet::XSpreadsheetDocument > xSpreadsheetDocument;
- 	css::uno::Reference< css::lang::XComponent > xComponent;
- public:
--	ScVbaCharts( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext );
-+	ScVbaCharts( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::frame::XModel >& xModel );
- 	// XCharts
- 	virtual css::uno::Any SAL_CALL Add() throw (css::script::BasicErrorException, css::uno::RuntimeException);
- 	virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getActiveChart(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-diff --git sc/source/ui/vba/vbadialog.hxx sc/source/ui/vba/vbadialog.hxx
-index 8625166..648f038 100644
---- sc/source/ui/vba/vbadialog.hxx
-+++ sc/source/ui/vba/vbadialog.hxx
-@@ -40,7 +40,7 @@ typedef cppu::ImplInheritanceHelper1< VbaDialogBase, ov::excel::XDialog > ScVbaD
- class ScVbaDialog : public ScVbaDialog_BASE
- {
- public:
--	ScVbaDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nIndex ):ScVbaDialog_BASE( xParent, xContext, nIndex ) {}
-+	ScVbaDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nIndex ):ScVbaDialog_BASE( xParent, xContext, xModel, nIndex ) {}
- 	virtual ~ScVbaDialog() {}
- 
- 	// Methods
-diff --git sc/source/ui/vba/vbadialogs.cxx sc/source/ui/vba/vbadialogs.cxx
-index c0c8bf7..6f90e4b 100644
---- sc/source/ui/vba/vbadialogs.cxx
-+++ sc/source/ui/vba/vbadialogs.cxx
-@@ -44,7 +44,7 @@ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
- {
- 	sal_Int32 nIndex = 0;
- 	aItem >>= nIndex;
--	uno::Reference< excel::XDialog > aDialog( new ScVbaDialog( uno::Reference< XHelperInterface >( Application(),uno::UNO_QUERY_THROW ), mxContext, nIndex ) );
-+	uno::Reference< excel::XDialog > aDialog( new ScVbaDialog( uno::Reference< XHelperInterface >( Application(),uno::UNO_QUERY_THROW ), mxContext, m_xModel, nIndex ) );
- 	return uno::Any( aDialog );
- }
- 
-diff --git sc/source/ui/vba/vbadialogs.hxx sc/source/ui/vba/vbadialogs.hxx
-index ab53253..c902b7a 100644
---- sc/source/ui/vba/vbadialogs.hxx
-+++ sc/source/ui/vba/vbadialogs.hxx
-@@ -42,7 +42,7 @@ typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::excel::XDialogs > ScVb
- class ScVbaDialogs : public ScVbaDialogs_BASE
- {
- public:
--	ScVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext ): ScVbaDialogs_BASE( xParent, xContext ) {} 
-+	ScVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): ScVbaDialogs_BASE( xParent, xContext, xModel ) {} 
- 	virtual ~ScVbaDialogs() {}
- 
- 	// XCollection
-diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index 927152b..986c376 100644
---- sc/source/ui/vba/vbarange.cxx
-+++ sc/source/ui/vba/vbarange.cxx
-@@ -2024,13 +2024,19 @@ ScVbaRange::Activate() throw (uno::RuntimeException)
- 	RangeHelper thisRange( xCellRange );
- 	uno::Reference< sheet::XCellRangeAddressable > xThisRangeAddress = thisRange.getCellRangeAddressable();
- 	table::CellRangeAddress thisRangeAddress = xThisRangeAddress->getRangeAddress();
--	
-+        uno::Reference< frame::XModel > xModel;	
-+        ScDocShell* pShell = getScDocShell();
-+
-+        if ( pShell )
-+            xModel = pShell->GetModel();
-+
-+        if ( !xModel.is() )
-+            throw uno::RuntimeException(); 
-+
- 	// get current selection
--	// #FIXME don't use getCurrentDocument
--	uno::Reference< sheet::XCellRangeAddressable > xRange( getCurrentDocument()->getCurrentSelection(), ::uno::UNO_QUERY);
-+	uno::Reference< sheet::XCellRangeAddressable > xRange( xModel->getCurrentSelection(), ::uno::UNO_QUERY);
- 
--	// #FIXME don't use getCurrentDocument
--	uno::Reference< sheet::XSheetCellRanges > xRanges( getCurrentDocument()->getCurrentSelection(), ::uno::UNO_QUERY);
-+	uno::Reference< sheet::XSheetCellRanges > xRanges( xModel->getCurrentSelection(), ::uno::UNO_QUERY);
- 
- 	if ( xRanges.is() )
- 	{
-@@ -2543,10 +2549,12 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
- {
- 	if ( m_Areas->getCount() > 1 )
- 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
--	// #FIXME doen't use current document
--	uno::Reference< view::XSelectionSupplier > xSelection( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
-+        ScDocShell* pShell = getScDocShell(); 
-+  
-+        uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW );
-+	uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
- 	// save old selection
--	uno::Reference< uno::XInterface > xSel( getScDocShell()->GetModel()->getCurrentSelection() );
-+	uno::Reference< uno::XInterface > xSel( xModel->getCurrentSelection() );
- 	// select this range
- 	xSelection->select( uno::makeAny( mxRange ) );
- 	// set up defaults	
-@@ -3880,7 +3888,7 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC
- 	if ( Cell1.hasValue() && !Cell2.hasValue() && sRangeName.getLength() )
- 	{
- 		const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
--		uno::Reference< beans::XPropertySet > xPropSet( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+		uno::Reference< beans::XPropertySet > xPropSet( getCurrentExcelDoc(), uno::UNO_QUERY_THROW );
- 		
- 		uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW );
- 		uno::Reference< sheet::XCellRangeReferrer > xReferrer;
-@@ -3903,7 +3911,7 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC
- 			}
- 		}
- 	}
--	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY );
-+	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentExcelDoc()->getCurrentController(), uno::UNO_QUERY );
- 	uno::Reference< table::XCellRange > xSheetRange( xView->getActiveSheet(), uno::UNO_QUERY_THROW ); 
- 	ScVbaRange* pRange = new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xSheetRange );
- 	uno::Reference< excel::XRange > xVbSheetRange( pRange );
-diff --git sc/source/ui/vba/vbatextboxshape.cxx sc/source/ui/vba/vbatextboxshape.cxx
-index 49600d3..954521b 100644
---- sc/source/ui/vba/vbatextboxshape.cxx
-+++ sc/source/ui/vba/vbatextboxshape.cxx
-@@ -41,7 +41,7 @@
- using namespace com::sun::star;
- using namespace ooo::vba;
- 
--ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, const uno::Reference< frame::XModel >& xModel ) : TextBoxShapeImpl_BASE( uno::Reference< XHelperInterface >(), xContext, xShape, xShapes, ScVbaShape::getType( xShape )  )
-+ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, const uno::Reference< frame::XModel >& xModel ) : TextBoxShapeImpl_BASE( uno::Reference< XHelperInterface >(), xContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape )  )
- {
-     m_xTextRange.set( xShape , uno::UNO_QUERY_THROW );
-     m_xModel.set( xModel );
-diff --git sc/source/ui/vba/vbaworkbook.cxx sc/source/ui/vba/vbaworkbook.cxx
-index ded6aad..1c60441 100644
---- sc/source/ui/vba/vbaworkbook.cxx
-+++ sc/source/ui/vba/vbaworkbook.cxx
-@@ -64,7 +64,7 @@ class ActiveSheet : public ScVbaWorksheet
- protected:
- 	virtual uno::Reference< frame::XModel > getModel()
- 	{ 	
--		return getCurrentDocument(); 
-+		return getCurrentExcelDoc(); 
- 	}
- 	virtual uno::Reference< sheet::XSpreadsheet > getSheet()
- 	{ 
-diff --git sc/source/ui/vba/vbaworksheet.cxx sc/source/ui/vba/vbaworksheet.cxx
-index ddd5111..7922782 100644
---- sc/source/ui/vba/vbaworksheet.cxx
-+++ sc/source/ui/vba/vbaworksheet.cxx
-@@ -712,7 +712,7 @@ ScVbaWorksheet::Shapes( const uno::Any& aIndex ) throw (uno::RuntimeException)
-     uno::Reference< drawing::XShapes > xShapes( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
-     uno::Reference< container::XIndexAccess > xIndexAccess( xShapes, uno::UNO_QUERY_THROW );
- 
--   uno::Reference< msforms::XShapes> xVbaShapes( new ScVbaShapes( this, mxContext, xIndexAccess ) );
-+   uno::Reference< msforms::XShapes> xVbaShapes( new ScVbaShapes( this, mxContext, xIndexAccess, getModel() ) );
-    if ( aIndex.hasValue() )
-       return xVbaShapes->Item( aIndex, uno::Any() ); 
-    return uno::makeAny( xVbaShapes );
-diff --git sfx2/source/doc/objxtor.cxx sfx2/source/doc/objxtor.cxx
-index 3421628..43c7458 100644
---- sfx2/source/doc/objxtor.cxx
-+++ sfx2/source/doc/objxtor.cxx
-@@ -136,6 +136,33 @@ DBG_NAME(SfxObjectShell)
- extern svtools::AsynchronLink* pPendingCloser;
- static WeakReference< XInterface > s_xCurrentComponent;
- 
-+void lcl_UpdateAppBasicDocVars(  const Reference< XInterface >& _rxComponent, bool bClear = false )
-+{
-+    BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
-+    if ( pAppMgr )
-+    {
-+        uno::Reference< beans::XPropertySet > xProps( _rxComponent, uno::UNO_QUERY );
-+        if ( xProps.is() )
-+        {
-+            try
-+            {
-+                beans::PropertyValue aProp;
-+                xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisVBADocObj") ) ) >>= aProp;
-+                rtl::OString sTmp( rtl::OUStringToOString( aProp.Name, RTL_TEXTENCODING_UTF8 ) );
-+                const char* pAscii = sTmp.getStr();
-+                if ( bClear )
-+                    pAppMgr->SetGlobalUNOConstant( pAscii, uno::makeAny( uno::Reference< uno::XInterface >() ) );
-+                else
-+                    pAppMgr->SetGlobalUNOConstant( pAscii, aProp.Value );
-+    
-+            }
-+            catch( uno::Exception& e )
-+            {
-+            }
-+        }
-+    }
-+}
-+
- //=========================================================================
- 
- /** This Listener is used to get notified when the XDocumentProperties of the
-@@ -211,6 +237,7 @@ void SAL_CALL SfxModelListener_Impl::disposing( const com::sun::star::lang::Even
-     ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-     if ( SfxObjectShell::GetCurrentComponent() == _rEvent.Source )
-     {
-+        lcl_UpdateAppBasicDocVars( SfxObjectShell::GetCurrentComponent(), true );
-         // remove ThisComponent reference from AppBasic
-         SfxObjectShell::SetCurrentComponent( Reference< XInterface >() );
-     }
-@@ -1095,7 +1122,10 @@ void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComp
- 
-     BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
-     if ( pAppMgr )
-+    {
-+        lcl_UpdateAppBasicDocVars( _rxComponent );
-         pAppMgr->SetGlobalUNOConstant( "ThisComponent", makeAny( _rxComponent ) );
-+    }
- 
- #if OSL_DEBUG_LEVEL > 0
-     const char* pComponentImplName = _rxComponent.get() ? typeid( *_rxComponent.get() ).name() : "void";
-diff --git sw/inc/unomap.hxx sw/inc/unomap.hxx
-index 1e842ab..9e928cb 100644
---- sw/inc/unomap.hxx
-+++ sw/inc/unomap.hxx
-@@ -307,6 +307,7 @@
- 
- #define WID_LAYOUT_SIZE                         1104
- #define WID_DOC_DIALOG_LIBRARIES                1105
-+#define WID_DOC_VBA_DOCOBJ                      1106
- 
- 
- //AutoText
---- sw/inc/unoprnms.hxx
-+++ sw/inc/unoprnms.hxx
-@@ -805,7 +805,8 @@ enum SwPropNameIds
- /* 0737 */  UNO_NAME_DESCRIPTION,
- // <--
- /* 0738 */  UNO_NAME_IS_TEMPLATE,
--/* 0739 */  SW_PROPNAME_END
-+/* 0739 */  UNO_NAME_VBA_DOCOBJ,
-+/* 0740 */  SW_PROPNAME_END
- };
- 
- 
-diff --git sw/source/core/unocore/unomap.cxx sw/source/core/unocore/unomap.cxx
-index 14ff14e..1430c12 100644
---- sw/source/core/unocore/unomap.cxx
-+++ sw/source/core/unocore/unomap.cxx
-@@ -1698,6 +1698,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP
- 					{ SW_PROP_NMID(UNO_NAME_CHAR_LOCALE), RES_CHRATR_LANGUAGE ,   CPPU_E2T(CPPUTYPE_LOCALE), PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
- 					{ SW_PROP_NMID(UNO_NAME_CHARACTER_COUNT), WID_DOC_CHAR_COUNT,			CPPU_E2T(CPPUTYPE_INT32),	PropertyAttribute::READONLY,   0},
-                     { SW_PROP_NMID(UNO_NAME_DIALOG_LIBRARIES), WID_DOC_DIALOG_LIBRARIES,  CPPU_E2T(CPPUTYPE_REFLIBCONTAINER), PropertyAttribute::READONLY, 0},
-+                    { SW_PROP_NMID(UNO_NAME_VBA_DOCOBJ), WID_DOC_VBA_DOCOBJ,  CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PropertyAttribute::READONLY, 0},
- 					{ SW_PROP_NMID(UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L), WID_DOC_AUTO_MARK_URL, CPPU_E2T(CPPUTYPE_OUSTRING),	PROPERTY_NONE,   0},
- 					{ SW_PROP_NMID(UNO_NAME_PARAGRAPH_COUNT), WID_DOC_PARA_COUNT,			CPPU_E2T(CPPUTYPE_INT32),	PropertyAttribute::READONLY,   0},
- 					{ SW_PROP_NMID(UNO_NAME_RECORD_CHANGES), WID_DOC_CHANGES_RECORD,		CPPU_E2T(CPPUTYPE_BOOLEAN),	PROPERTY_NONE,   0},
---- sw/source/core/unocore/unoprnms.cxx
-+++ sw/source/core/unocore/unoprnms.cxx
-@@ -779,7 +779,8 @@ const SwPropNameTab aPropNameTab = {
- /* 0735 CHAR_OVERLINE_HAS_COLOR */     {MAP_CHAR_LEN("CharOverlineHasColor")},
- /* 0736 UNO_NAME_OUTLINE_LEVEL */       {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel
- /* 0737 UNO_NAME_DESCRIPTION */         {MAP_CHAR_LEN("Description")},
--/* 0738 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")}
-+/* 0738 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")},
-+/* 0739 UNO_NAME_VBA_DOCOBJ */       {MAP_CHAR_LEN("ThisVBADocObj")},
- };
- 
- const SwPropNameLen& SwGetPropName( USHORT nId )
-diff --git sw/source/ui/uno/unotxdoc.cxx sw/source/ui/uno/unotxdoc.cxx
-index 9bc3d85..c22a03b 100644
---- sw/source/ui/uno/unotxdoc.cxx
-+++ sw/source/ui/uno/unotxdoc.cxx
-@@ -2264,6 +2264,14 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
-         case WID_DOC_DIALOG_LIBRARIES:
-             aAny <<= pDocShell->GetDialogContainer();
-         break;
-+        case WID_DOC_VBA_DOCOBJ:
-+        {
-+            beans::PropertyValue aProp;
-+            aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisWordDoc") );
-+            aProp.Value <<= pDocShell->GetModel();
-+            aAny <<= aProp;
-+        }
-+        break;
-         case WID_DOC_RUNTIME_UID:
-             aAny <<= getRuntimeUID();
-         break;
-diff --git sw/source/ui/vba/vbaapplication.cxx sw/source/ui/vba/vbaapplication.cxx
-index 4117688..9c70772 100644
---- sw/source/ui/vba/vbaapplication.cxx
-+++ sw/source/ui/vba/vbaapplication.cxx
-@@ -148,7 +148,7 @@ SwVbaApplication::Addins( const uno::Any& index ) throw (uno::RuntimeException)
- uno::Any SAL_CALL
- SwVbaApplication::Dialogs( const uno::Any& index ) throw (uno::RuntimeException)
- {
--    uno::Reference< word::XDialogs > xCol( new SwVbaDialogs( this, mxContext ) );
-+    uno::Reference< word::XDialogs > xCol( new SwVbaDialogs( this, mxContext, getCurrentDocument() ));
-     if ( index.hasValue() )
-         return xCol->Item( index );
-     return uno::makeAny( xCol );
-@@ -180,6 +180,12 @@ float SAL_CALL SwVbaApplication::CentimetersToPoints( float _Centimeters ) throw
-     return VbaApplicationBase::CentimetersToPoints( _Centimeters );
- }
- 
-+uno::Reference< frame::XModel > 
-+SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
-+{
-+    return getCurrentWordDoc();
-+}
-+
- rtl::OUString& 
- SwVbaApplication::getServiceImplName()
- {
-diff --git sw/source/ui/vba/vbaapplication.hxx sw/source/ui/vba/vbaapplication.hxx
-index e896e02..935a03c 100644
---- sw/source/ui/vba/vbaapplication.hxx
-+++ sw/source/ui/vba/vbaapplication.hxx
-@@ -71,5 +71,7 @@ public:
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+protected:
-+    virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
- };
- #endif /* SW_VBA_APPLICATION_HXX */
-diff --git sw/source/ui/vba/vbadialog.hxx sw/source/ui/vba/vbadialog.hxx
-index 9090f15..b320a18 100644
---- sw/source/ui/vba/vbadialog.hxx
-+++ sw/source/ui/vba/vbadialog.hxx
-@@ -40,7 +40,7 @@ typedef cppu::ImplInheritanceHelper1< VbaDialogBase, ov::word::XDialog > SwVbaDi
- class SwVbaDialog : public SwVbaDialog_BASE
- {
- public:
--	SwVbaDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nIndex ):SwVbaDialog_BASE( xParent, xContext, nIndex ) {}
-+	SwVbaDialog( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nIndex ):SwVbaDialog_BASE( xParent, xContext, xModel, nIndex ) {}
- 	virtual ~SwVbaDialog() {}
- 
- 	// Methods
-diff --git sw/source/ui/vba/vbadialogs.cxx sw/source/ui/vba/vbadialogs.cxx
-index 26dd7f1..e905442 100644
---- sw/source/ui/vba/vbadialogs.cxx
-+++ sw/source/ui/vba/vbadialogs.cxx
-@@ -39,7 +39,7 @@ SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
- {
- 	sal_Int32 nIndex = 0;
- 	aItem >>= nIndex;
--	uno::Reference< word::XDialog > aDialog( new SwVbaDialog( uno::Reference< XHelperInterface >( Application(),uno::UNO_QUERY_THROW ), mxContext, nIndex ) );
-+	uno::Reference< word::XDialog > aDialog( new SwVbaDialog( uno::Reference< XHelperInterface >( Application(),uno::UNO_QUERY_THROW ), mxContext, m_xModel, nIndex ) );
- 	return uno::Any( aDialog );
- }
- 
-diff --git sw/source/ui/vba/vbadialogs.hxx sw/source/ui/vba/vbadialogs.hxx
-index ef36067..63e45f5 100644
---- sw/source/ui/vba/vbadialogs.hxx
-+++ sw/source/ui/vba/vbadialogs.hxx
-@@ -42,7 +42,7 @@ typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::word::XDialogs > SwVba
- class SwVbaDialogs : public SwVbaDialogs_BASE
- {
- public:
--	SwVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext ): SwVbaDialogs_BASE( xParent, xContext ) {} 
-+	SwVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): SwVbaDialogs_BASE( xParent, xContext, xModel ) {} 
- 	virtual ~SwVbaDialogs() {}
- 
- 	// XCollection
-diff --git sw/source/ui/vba/vbadocument.cxx sw/source/ui/vba/vbadocument.cxx
-index 906a617..1090a8b 100644
---- sw/source/ui/vba/vbadocument.cxx
-+++ sw/source/ui/vba/vbadocument.cxx
-@@ -205,7 +205,9 @@ SwVbaDocument::Shapes( const uno::Any& index ) throw (uno::RuntimeException)
-     uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( getModel(), uno::UNO_QUERY_THROW );
-     //uno::Reference< drawing::XShapes > xShapes( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
-     uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
--    uno::Reference< XCollection > xCol( new ScVbaShapes( this, mxContext, xIndexAccess ) );
-+    uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
-+    uno::Reference< XCollection > xCol( new ScVbaShapes( this, mxContext, xIndexAccess, xModel ) );
-+
-     if ( index.hasValue() )
-         return xCol->Item( index, uno::Any() );
-     return uno::makeAny( xCol );
-diff --git sw/source/ui/vba/vbaheaderfooter.cxx sw/source/ui/vba/vbaheaderfooter.cxx
-index c1eb4ec..a08c155 100644
---- sw/source/ui/vba/vbaheaderfooter.cxx
-+++ sw/source/ui/vba/vbaheaderfooter.cxx
-@@ -87,7 +87,7 @@ SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException)
-     uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW );
-     //uno::Reference< drawing::XShapes > xShapes( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
-     uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
--    uno::Reference< XCollection > xCol( new ScVbaShapes( this, mxContext, xIndexAccess ) );
-+    uno::Reference< XCollection > xCol( new ScVbaShapes( this, mxContext, xIndexAccess, mxModel ) );
-     if ( index.hasValue() )
-         return xCol->Item( index, uno::Any() );
-     return uno::makeAny( xCol );
-diff --git sw/source/ui/vba/vbaselection.cxx sw/source/ui/vba/vbaselection.cxx
-index b85c2d7..167838f 100644
---- sw/source/ui/vba/vbaselection.cxx
-+++ sw/source/ui/vba/vbaselection.cxx
-@@ -639,7 +639,7 @@ SwVbaSelection::ShapeRange( ) throw (uno::RuntimeException)
-     uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW );
-     uno::Reference< drawing::XDrawPage > xDrawPage = xDrawPageSupplier->getDrawPage();
-     uno::Reference< container::XIndexAccess > xShapesAccess( xShapes, uno::UNO_QUERY_THROW );
--    return uno::makeAny( uno::Reference< msforms::XShapeRange >( new ScVbaShapeRange( this, mxContext, xShapesAccess, xDrawPage ) ) );
-+    return uno::makeAny( uno::Reference< msforms::XShapeRange >( new ScVbaShapeRange( this, mxContext, xShapesAccess, xDrawPage, mxModel ) ) );
- }
- 
- ::sal_Int32 SAL_CALL SwVbaSelection::getStart() throw (uno::RuntimeException)
-diff --git sw/source/ui/vba/vbasystem.cxx sw/source/ui/vba/vbasystem.cxx
-index 0b233a4..c68a7c0 100644
---- sw/source/ui/vba/vbasystem.cxx
-+++ sw/source/ui/vba/vbasystem.cxx
-@@ -88,7 +88,7 @@ SwVbaSystem::~SwVbaSystem()
- sal_Int32 SAL_CALL
- SwVbaSystem::getCursor() throw (uno::RuntimeException)
- {
--    sal_Int32 nPointerStyle =  getPointerStyle();
-+    sal_Int32 nPointerStyle =  getPointerStyle( getCurrentWordDoc() );
- 
-     switch( nPointerStyle )
-     {
-@@ -115,27 +115,27 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
-             case word::WdCursorType::wdCursorNorthwestArrow:
-             {
-                 const Pointer& rPointer( POINTER_ARROW );
--                setCursorHelper( rPointer, sal_False );
-+                setCursorHelper( getCurrentWordDoc(), rPointer, sal_False );
-                 break;
-             }
-             case word::WdCursorType::wdCursorWait:
-             {
-                 const Pointer& rPointer( static_cast< PointerStyle >( POINTER_WAIT ) );
-                 //It will set the edit window, toobar and statusbar's mouse pointer.
--                setCursorHelper( rPointer, sal_True );
-+                setCursorHelper( getCurrentWordDoc(), rPointer, sal_True );
-                 break;
-             }
-             case word::WdCursorType::wdCursorIBeam:
-             {
-                 const Pointer& rPointer( static_cast< PointerStyle >( POINTER_TEXT ) );
-                 //It will set the edit window, toobar and statusbar's mouse pointer.
--                setCursorHelper( rPointer, sal_True );
-+                setCursorHelper( getCurrentWordDoc(), rPointer, sal_True );
-                 break;
-             }
-             case word::WdCursorType::wdCursorNormal:
-             {
-                 const Pointer& rPointer( POINTER_NULL );
--                setCursorHelper( rPointer, sal_False );
-+                setCursorHelper( getCurrentWordDoc(), rPointer, sal_False );
-                 break;
-             }
-             default:
-diff --git vbahelper/inc/vbahelper/vbaapplicationbase.hxx vbahelper/inc/vbahelper/vbaapplicationbase.hxx
-index a4d550b..e100387 100644
---- vbahelper/inc/vbahelper/vbaapplicationbase.hxx
-+++ vbahelper/inc/vbahelper/vbaapplicationbase.hxx
-@@ -42,8 +42,8 @@ class VBAHELPER_DLLPUBLIC VbaApplicationBase : public ApplicationBase_BASE
- protected:
-     VbaApplicationBase( const css::uno::Reference< css::uno::XComponentContext >& xContext );
-     virtual ~VbaApplicationBase();
--    virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& /*xModel*/ ) throw (css::uno::RuntimeException) { return NULL; }
- 
-+    virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) = 0;
- public:
- 	// XHelperInterface ( parent is itself )
- 	virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return this; }
-diff --git vbahelper/inc/vbahelper/vbadialogbase.hxx vbahelper/inc/vbahelper/vbadialogbase.hxx
-index 4b3e2a2..a36c056 100644
---- vbahelper/inc/vbahelper/vbadialogbase.hxx
-+++ vbahelper/inc/vbahelper/vbadialogbase.hxx
-@@ -33,6 +33,7 @@
- #include <cppuhelper/implbase1.hxx>
- #include <ooo/vba/XDialogBase.hpp>
- #include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/frame/XModel.hpp>
- 
- typedef InheritedHelperInterfaceImpl1< ov::XDialogBase > VbaDialogBase_BASE;
- 
-@@ -40,8 +41,9 @@ class VBAHELPER_DLLPUBLIC VbaDialogBase : public VbaDialogBase_BASE
- {
- protected:
- 	sal_Int32 mnIndex;
-+        css::uno::Reference< css::frame::XModel > m_xModel;
- public:
--	VbaDialogBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nIndex ):VbaDialogBase_BASE( xParent, xContext ), mnIndex( nIndex ) {}
-+	VbaDialogBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nIndex ):VbaDialogBase_BASE( xParent, xContext ), mnIndex( nIndex ), m_xModel( xModel ) {}
- 	virtual ~VbaDialogBase() {}
- 
- 	// Methods
-diff --git vbahelper/inc/vbahelper/vbadialogsbase.hxx vbahelper/inc/vbahelper/vbadialogsbase.hxx
-index e8b1b2e..dc5d389 100644
---- vbahelper/inc/vbahelper/vbadialogsbase.hxx
-+++ vbahelper/inc/vbahelper/vbadialogsbase.hxx
-@@ -34,13 +34,16 @@
- #include <ooo/vba/XHelperInterface.hpp>
- #include <ooo/vba/XDialogsBase.hpp>
- #include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/frame/XModel.hpp>
- 
- typedef InheritedHelperInterfaceImpl1< ov::XDialogsBase > VbaDialogsBase_BASE;
- 
- class VBAHELPER_DLLPUBLIC VbaDialogsBase : public VbaDialogsBase_BASE
- {
-+protected:
-+        css::uno::Reference< css::frame::XModel > m_xModel;
- public:
--	VbaDialogsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext ): VbaDialogsBase_BASE( xParent, xContext ) {} 
-+	VbaDialogsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): VbaDialogsBase_BASE( xParent, xContext ), m_xModel( xModel ) {} 
- 	virtual ~VbaDialogsBase() {}
- 
- 	// XCollection
-diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx
-index 77eb2a3..047019c 100644
---- vbahelper/inc/vbahelper/vbahelper.hxx
-+++ vbahelper/inc/vbahelper/vbahelper.hxx
-@@ -66,8 +66,9 @@ namespace ooo
-         VBAHELPER_DLLPUBLIC SfxObjectShell* getSfxObjShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException);
-         VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell,  const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException);
-         VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell,  const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
--        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
--        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getDocumentContext() throw (css::uno::RuntimeException);
-+        css::uno::Reference< css::frame::XModel > getCurrentDoc( const rtl::OUString& sKey ) throw (css::uno::RuntimeException);
-+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentExcelDoc() throw (css::uno::RuntimeException);
-+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentWordDoc() throw (css::uno::RuntimeException);
- 
- 		VBAHELPER_DLLPUBLIC css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException);
- 		VBAHELPER_DLLPUBLIC css::uno::Reference< css::script::XTypeConverter > getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
-@@ -91,8 +92,8 @@ namespace ooo
- 	    VBAHELPER_DLLPUBLIC double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical);
-     	VBAHELPER_DLLPUBLIC double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
- 	    VBAHELPER_DLLPUBLIC double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
--        VBAHELPER_DLLPUBLIC sal_Int32 getPointerStyle();
--        VBAHELPER_DLLPUBLIC void setCursorHelper( const Pointer& rPointer, sal_Bool bOverWrite );
-+        VBAHELPER_DLLPUBLIC sal_Int32 getPointerStyle( const css::uno::Reference< css::frame::XModel >& );
-+        VBAHELPER_DLLPUBLIC void setCursorHelper( const css::uno::Reference< css::frame::XModel >& xModel, const Pointer& rPointer, sal_Bool bOverWrite );
- 
- class VBAHELPER_DLLPUBLIC Millimeter
- {
-diff --git vbahelper/inc/vbahelper/vbashape.hxx vbahelper/inc/vbahelper/vbashape.hxx
-index 7893905..14debe4 100644
---- vbahelper/inc/vbahelper/vbashape.hxx
-+++ vbahelper/inc/vbahelper/vbashape.hxx
-@@ -54,6 +54,7 @@ protected:
-     css::uno::Reference< css::drawing::XShapes > m_xShapes;
-     css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
-     sal_Int32 m_nType;
-+    css::uno::Reference< css::frame::XModel > m_xModel;
-     css::uno::Any m_aRange;
- 	virtual void addListeners();
- 	virtual void removeShapeListener() throw( css::uno::RuntimeException );
-@@ -61,8 +62,8 @@ protected:
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
- public:
--    ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, sal_Int32 nType ) throw ( css::lang::IllegalArgumentException );
--    ScVbaShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape ) throw ( css::lang::IllegalArgumentException );
-+    ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nType ) throw ( css::lang::IllegalArgumentException );
-+    ScVbaShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::lang::IllegalArgumentException );
-     virtual ~ScVbaShape();
-     css::uno::Any getRange() { return m_aRange; };
-     void setRange( css::uno::Any aRange ) { m_aRange = aRange; };
-diff --git vbahelper/inc/vbahelper/vbashaperange.hxx vbahelper/inc/vbahelper/vbashaperange.hxx
-index af39456..0d29c3a 100644
---- vbahelper/inc/vbahelper/vbashaperange.hxx
-+++ vbahelper/inc/vbahelper/vbashaperange.hxx
-@@ -46,11 +46,12 @@ private:
-     css::uno::Reference< css::drawing::XShapes > m_xShapes;
-     sal_Int32 m_nShapeGroupCount;
- protected:
-+    css::uno::Reference< css::frame::XModel > m_xModel;
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
- 	css::uno::Reference< css::drawing::XShapes > getShapes() throw (css::uno::RuntimeException) ;
- public:
--    ScVbaShapeRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XDrawPage>& xDrawShape );
-+    ScVbaShapeRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XDrawPage>& xDrawShape, const css::uno::Reference< css::frame::XModel >& xModel );
- 
-     // Methods
-     virtual void SAL_CALL Select(  ) throw (css::uno::RuntimeException);
-diff --git vbahelper/inc/vbahelper/vbashapes.hxx vbahelper/inc/vbahelper/vbashapes.hxx
-index 597f97b..dfbe5b1 100644
---- vbahelper/inc/vbahelper/vbashapes.hxx
-+++ vbahelper/inc/vbahelper/vbashapes.hxx
-@@ -49,6 +49,7 @@ private:
-     sal_Int32 m_nNewShapeCount;
-     void initBaseCollection();
- protected:
-+    css::uno::Reference< css::frame::XModel > m_xModel;
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
- 	virtual css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
-@@ -62,7 +63,7 @@ protected:
-     //css::awt::Point calculateTopLeftMargin( css::uno::Reference< ov::XHelperInterface > xDocument );
-     
- public:
--    ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes );
-+    ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const css::uno::Reference< css::frame::XModel >& xModel );
-     static void setDefaultShapeProperties( css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException);
-     static void setShape_NameProperty( css::uno::Reference< css::drawing::XShape > xShape, rtl::OUString sName );
-     //XEnumerationAccess
-diff --git vbahelper/source/vbahelper/vbaapplicationbase.cxx vbahelper/source/vbahelper/vbaapplicationbase.cxx
-index 0d9f52e..b73013f 100644
---- vbahelper/source/vbahelper/vbaapplicationbase.cxx
-+++ vbahelper/source/vbahelper/vbaapplicationbase.cxx
-@@ -120,7 +120,7 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno::
- uno::Any SAL_CALL
- VbaApplicationBase::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
- {
--    uno::Reference< XCommandBars > xCommandBars( new ScVbaCommandBars( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
-+    uno::Reference< XCommandBars > xCommandBars( new ScVbaCommandBars( this, mxContext, uno::Reference< container::XIndexAccess >(), getCurrentDocument() ) );
-     if( aIndex.hasValue() )
-         return uno::makeAny( xCommandBars->Item( aIndex, uno::Any() ) );
-     return uno::makeAny( xCommandBars );
-@@ -134,7 +134,7 @@ VbaApplicationBase::getVersion() throw (uno::RuntimeException)
- 
- void SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException)
- {
--    VBAMacroResolvedInfo aMacroInfo = resolveVBAMacro( GetDocShell( getCurrentDocument() ), MacroName );
-+    VBAMacroResolvedInfo aMacroInfo = resolveVBAMacro( getSfxObjShell( getCurrentDocument() ), MacroName );
-     if( aMacroInfo.IsResolved() )
-     {
-         // handle the arguments
-diff --git vbahelper/source/vbahelper/vbacommandbar.cxx vbahelper/source/vbahelper/vbacommandbar.cxx
-index ba9f49b..a74ccd5 100644
---- vbahelper/source/vbahelper/vbacommandbar.cxx
-+++ vbahelper/source/vbahelper/vbacommandbar.cxx
-@@ -46,7 +46,7 @@
- using namespace com::sun::star;
- using namespace ooo::vba;
- 
--ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw (uno::RuntimeException) : CommandBar_BASE( xParent, xContext )
-+ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< frame::XModel >& xModel, sal_Int32 nModuleType ) throw (uno::RuntimeException) : CommandBar_BASE( xParent, xContext ), m_xModel( xModel )
- {
-     // it's a menu bar
-     // only supporting factory menus ( no custom menus )
-@@ -67,7 +67,7 @@ ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xPare
-     m_bIsMenu = sal_True;
-     m_bCustom = sal_False;
- }
--ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw (uno::RuntimeException) :  CommandBar_BASE( xParent, xContext )
-+ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< frame::XModel >& xModel, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw (uno::RuntimeException) :  CommandBar_BASE( xParent, xContext ), m_xModel( xModel )
- {
-     // it's a tool bar
-     m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
-@@ -248,7 +248,7 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
- {
-     try
-     {
--        uno::Reference< frame::XFrame > xFrame( getCurrentDocument()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); 
-+        uno::Reference< frame::XFrame > xFrame( m_xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); 
-         uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
-         uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW );
-         if( _visible )
-@@ -313,7 +313,7 @@ uno::Any SAL_CALL
- ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
- {
-     sal_Int32 nIndex;
--    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
-+    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >(), m_xModel ) );
-     if( aIndex.hasValue() )
-     {
-         if( aIndex >>= nIndex )
-diff --git vbahelper/source/vbahelper/vbacommandbar.hxx vbahelper/source/vbahelper/vbacommandbar.hxx
-index c53a5cd..52f63bc 100644
---- vbahelper/source/vbahelper/vbacommandbar.hxx
-+++ vbahelper/source/vbahelper/vbacommandbar.hxx
-@@ -78,9 +78,10 @@ protected:
-     void getToolBarSettings( rtl::OUString sToolBarName ) throw( css::uno::RuntimeException );
-     void getMenuSettings();
-     void addCustomBar();
-+    css::uno::Reference< css::frame::XModel > m_xModel;
- public:
--    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw( css::uno::RuntimeException );
--    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw( css::uno::RuntimeException );
-+    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nModuleType ) throw( css::uno::RuntimeException );
-+    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::frame::XModel >& xModel, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw( css::uno::RuntimeException );
-     
-     sal_Bool IsMenu() { return m_bIsMenu; };
-     css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-index 2fcce8a..1bea689 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-@@ -69,7 +69,7 @@ beans::PropertyValues lcl_repalcePropertyValue( beans::PropertyValues aPropertyV
-     return aPropertyValues;
- }
- 
--ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Int32 nType ) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_sName( sName ), m_nPosition( nPosition ), m_nType( nType )
-+ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Int32 nType ) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_sName( sName ), m_nPosition( nPosition ), m_nType( nType )
- {
-     // exsiting CommandBarBarControl
-     m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
-@@ -99,7 +99,7 @@ ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInt
-     }
-     m_bTemporary = sal_True;
- }
--ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType) throw (uno::RuntimeException) :  CommandBarControl_BASE( xParent, xContext ), m_nPosition( nPosition ), m_bTemporary( bTemporary ), m_nType( nType )
-+ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType) throw (uno::RuntimeException) :  CommandBarControl_BASE( xParent, xContext ), m_nPosition( nPosition ), m_bTemporary( bTemporary ), m_nType( nType )
- {
-     m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
-     initObjects();
-@@ -289,8 +289,7 @@ ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (u
-     if( m_xCurrentSettings.is() )
-     {
-         // get the current model
--        uno::Reference< frame::XModel > xModel( getCurrentDocument() ); 
--        VBAMacroResolvedInfo aResolvedMacro = ooo::vba::resolveVBAMacro( getSfxObjShell( xModel ), _onaction, true );
-+        VBAMacroResolvedInfo aResolvedMacro = ooo::vba::resolveVBAMacro( getSfxObjShell( m_pCommandBarControls->GetModel() ), _onaction, true );
-         if ( aResolvedMacro.IsResolved() )
-         {
-             rtl::OUString aCommandURL = ooo::vba::makeMacroURL( aResolvedMacro.ResolvedMacro() );
-@@ -353,7 +352,7 @@ uno::Any SAL_CALL
- ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
- {
-     sal_Int32 nIndex;
--    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
-+    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >(), m_pCommandBarControls->GetModel() ) );
-     if( aIndex.hasValue() )
-     {
-         if( aIndex >>= nIndex )
-@@ -385,11 +384,11 @@ ScVbaCommandBarControl::getServiceNames()
- }
- 
- //////////// ScVbaCommandBarPopup //////////////////////////////
--ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlPopup )
-+ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlPopup )
- {
- }
- 
--ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlPopup) 
-+ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlPopup ) 
- {
- }
- 
-@@ -412,11 +411,11 @@ ScVbaCommandBarPopup::getServiceNames()
- }
- 
- //////////// ScVbaCommandBarButton //////////////////////////////
--ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlButton )
-+ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlButton )
- {
- }
- 
--ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlButton) 
-+ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlButton) 
- {
- }
- 
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrol.hxx vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
-index 4d7d133..c1a8b07 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
-@@ -51,9 +51,9 @@ private:
-     rtl::OUString       m_sName;
-     rtl::OUString       m_sBarName;
-     rtl::OUString       m_sCommand;
--    sal_Int32           m_nType;
-     sal_Int32           m_nPosition;
-     sal_Bool            m_bTemporary;
-+    sal_Int32           m_nType;
-     sal_Bool            m_bIsMenu;
-     ScVbaCommandBarControls*        m_pCommandBarControls;
-     css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
-@@ -67,8 +67,8 @@ private:
-     void createNewMenuBarControl();
-     void createNewToolBarControl();
- public:
--    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
--    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition = 0, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
-     css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
-     css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
-     css::uno::Reference< css::container::XIndexContainer >  GetBarSettings() { return m_xBarSettings; };
-@@ -99,8 +99,8 @@ typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarPop
- class ScVbaCommandBarPopup : public CommandBarPopup_BASE
- {
- public:
--    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
--    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-@@ -110,8 +110,8 @@ typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarBut
- class ScVbaCommandBarButton : public CommandBarButton_BASE
- {
- public:
--    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
--    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrols.cxx vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-index 1d01405..c6adbc2 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-@@ -70,7 +70,7 @@ public:
-     }
- };
- 
--ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess> xIndexAccess ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess )
-+ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess> xIndexAccess, const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess ), m_xModel( xModel )
- {
-     m_bIsMenu = sal_False;
-     m_bHasElements = sal_False;
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrols.hxx vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
-index ff00609..f9ebe25 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
-@@ -57,9 +57,10 @@ private:
-     css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
-     css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
-     css::uno::Reference< css::container::XIndexContainer >          m_xCurrentSettings;
-+    css::uno::Reference< css::frame::XModel >          m_xModel;
- 
- public:
--    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess ) throw( css::uno::RuntimeException );
-+    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess, const  css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException );
-     css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
-     css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
-     css::uno::Reference< css::container::XIndexContainer >  GetBarSettings() { return m_xBarSettings; };
-@@ -73,6 +74,7 @@ public:
-     }
-     rtl::OUString GetControlNameByIndex( const sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
- 
-+    css::uno::Reference< css::frame::XModel > GetModel() { return m_xModel; }
-     // Attributes
-     virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
-     // XEnumerationAccess
-diff --git vbahelper/source/vbahelper/vbacommandbars.cxx vbahelper/source/vbahelper/vbacommandbars.cxx
-index 66a1652..3aae99b 100644
---- vbahelper/source/vbahelper/vbacommandbars.cxx
-+++ vbahelper/source/vbahelper/vbacommandbars.cxx
-@@ -54,8 +54,9 @@ class CommandBarEnumeration : public CommandBarEnumeration_BASE
-     uno::Reference< XCommandBars > m_xCommandBars;
-     uno::Sequence< rtl::OUString > m_sNames;
-     sal_Int32 m_nCurrentPosition;
-+    uno::Reference< frame::XModel > m_xModel;
- public:
--    CommandBarEnumeration( const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBars > xCommandBars, const uno::Sequence< rtl::OUString > sNames ) : m_xContext( xContext ), m_xCommandBars( xCommandBars ), m_sNames( sNames ), m_nCurrentPosition( 0 )
-+    CommandBarEnumeration( const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBars > xCommandBars, const uno::Sequence< rtl::OUString > sNames, const uno::Reference< frame::XModel >& xModel ) : m_xContext( xContext ), m_xCommandBars( xCommandBars ), m_sNames( sNames ), m_nCurrentPosition( 0 ), m_xModel( xModel )
-     {
-     }
-     virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
-@@ -79,7 +80,7 @@ public:
-                    if( sName.getLength() > 0 )
-                    {
-                         uno::Reference< XHelperInterface > xHelperInterface( m_xCommandBars, uno::UNO_QUERY_THROW );
--                        uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( xHelperInterface, m_xContext, sName, sal_True, sal_False ) );
-+                        uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( xHelperInterface, m_xContext, m_xModel,  sName, sal_True, sal_False ) );
-                         if( xCommandBar.is() )
-                             return uno::makeAny( xCommandBar );
-                         else
-@@ -99,14 +100,14 @@ public:
- };
- 
- 
--ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess > xIndexAccess ) : CommandBars_BASE( xParent, xContext, xIndexAccess )
-+ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess > xIndexAccess, const uno::Reference< frame::XModel >& xModel ) : CommandBars_BASE( xParent, xContext, xIndexAccess ), m_xModel( xModel )
- {
-     retrieveObjects();
- }
- void
- ScVbaCommandBars::retrieveObjects() throw ( uno::RuntimeException )
- {
--    uno::Reference< lang::XServiceInfo > xServiceInfo( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
-     if( xServiceInfo->supportsService( sSpreadsheetDocumentUrl ) )
-     {
-         m_sModuleName = sSpreadsheetDocumentUrl;
-@@ -132,7 +133,7 @@ ScVbaCommandBars::getElementType() throw ( uno::RuntimeException )
- uno::Reference< container::XEnumeration >
- ScVbaCommandBars::createEnumeration() throw ( uno::RuntimeException )
- {
--    return uno::Reference< container::XEnumeration >( new CommandBarEnumeration( mxContext, this, m_xNameAccess->getElementNames() ) );
-+    return uno::Reference< container::XEnumeration >( new CommandBarEnumeration( mxContext, this, m_xNameAccess->getElementNames(), m_xModel ) );
- }
- 
- uno::Any
-@@ -145,15 +146,15 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
-         sToolBarName = sToolBarName.toAsciiLowerCase();
-         if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Worksheet Menu Bar") ) )
-         {
--            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 0 ) ) );
-+            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, m_xModel, 0 ) ) );
-         }
-         else if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Menu Bar") ) )
-         {
--            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 1 ) ) );
-+            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, m_xModel, 1 ) ) );
-         }
-         else if( checkToolBarExist( sToolBarName ) )
-         {
--            return uno::makeAny( uno::Reference< XCommandBar > (new ScVbaCommandBar( this, mxContext, sToolBarName, sal_True, sal_False ) ) );
-+            return uno::makeAny( uno::Reference< XCommandBar > (new ScVbaCommandBar( this, mxContext, m_xModel, sToolBarName, sal_True, sal_False ) ) );
-         }
-     }
-     return uno::Any();
-@@ -175,7 +176,7 @@ ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Positio
-     {
-         bTemporary = sal_True;
-     }
--    return uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, sName.toAsciiLowerCase(), bTemporary, sal_True ) );
-+    return uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, m_xModel, sName.toAsciiLowerCase(), bTemporary, sal_True ) );
- }
- sal_Int32 SAL_CALL 
- ScVbaCommandBars::getCount() throw(css::uno::RuntimeException)
-diff --git vbahelper/source/vbahelper/vbacommandbars.hxx vbahelper/source/vbahelper/vbacommandbars.hxx
-index 7442002..d1ebf4b 100644
---- vbahelper/source/vbahelper/vbacommandbars.hxx
-+++ vbahelper/source/vbahelper/vbacommandbars.hxx
-@@ -52,8 +52,10 @@ private:
-     css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
-     rtl::OUString m_sModuleName;
-     void retrieveObjects() throw( css::uno::RuntimeException );
-+protected:
-+    css::uno::Reference< css::frame::XModel > m_xModel;
- public:
--    ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess );
-+    ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess, const css::uno::Reference< css::frame::XModel >& xModel );
- 
-     sal_Bool checkToolBarExist( rtl::OUString sToolBarName );
-     rtl::OUString GetModuleName(){ return m_sModuleName; };
-diff --git vbahelper/source/vbahelper/vbadialogbase.cxx vbahelper/source/vbahelper/vbadialogbase.cxx
-index 205442e..6294fc7 100644
---- vbahelper/source/vbahelper/vbadialogbase.cxx
-+++ vbahelper/source/vbahelper/vbadialogbase.cxx
-@@ -38,15 +38,14 @@ void
- VbaDialogBase::Show() throw(uno::RuntimeException)
- {
- 	rtl::OUString aURL;
--    uno::Reference< frame::XModel > xModel = getCurrentDocument();
--	if ( xModel.is() )
-+	if ( m_xModel.is() )
- 	{
- 		aURL = mapIndexToName( mnIndex );
- 		if( aURL.getLength() == 0  )
- 			throw uno::RuntimeException(
- 				::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " Unable to open the specified dialog " ) ),
- 				uno::Reference< XInterface > () );
--		dispatchRequests( xModel, aURL );
-+		dispatchRequests( m_xModel, aURL );
- 	}
- }	
- 
-diff --git vbahelper/source/vbahelper/vbadocumentbase.cxx vbahelper/source/vbahelper/vbadocumentbase.cxx
-index e53279e..339e454 100644
---- vbahelper/source/vbahelper/vbadocumentbase.cxx
-+++ vbahelper/source/vbahelper/vbadocumentbase.cxx
-@@ -137,7 +137,7 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
- 	// we shouldn't do so. Otherwhise some strange things can happen.
- 	else
- 	{
--		uno::Reference< lang::XComponent > xDisposable ( getCurrentDocument(), uno::UNO_QUERY );
-+		uno::Reference< lang::XComponent > xDisposable ( getModel(), uno::UNO_QUERY );
- 		if ( xDisposable.is() )
- 			xDisposable->dispose();
- 	}
-diff --git vbahelper/source/vbahelper/vbadocumentsbase.cxx vbahelper/source/vbahelper/vbadocumentsbase.cxx
-index 6d5ddb3..e7907b7 100644
---- vbahelper/source/vbahelper/vbadocumentsbase.cxx
-+++ vbahelper/source/vbahelper/vbadocumentsbase.cxx
-@@ -242,11 +242,15 @@ VbaDocumentsBase::Add() throw (uno::RuntimeException)
- void
- VbaDocumentsBase::Close() throw (uno::RuntimeException)
- {
-+// #FIXME this *MUST* be wrong documents::close surely closes ALL documents
-+// in the collection, use of getCurrentDocument here is totally wrong
-+/*
- 	uno::Reference< lang::XMultiComponentFactory > xSMgr(
- 		mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
- 	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
- 	rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseDoc"));
- 	dispatchRequests(xModel,url);
-+*/
- }
- 
- // #TODO# #FIXME# can any of the unused params below be used?
-diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx
-index 97ebb3b..c8c96cc 100644
---- vbahelper/source/vbahelper/vbahelper.cxx
-+++ vbahelper/source/vbahelper/vbahelper.cxx
-@@ -400,8 +400,9 @@ dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl)
- 
- 
- 
-+
-  uno::Reference< frame::XModel > 
--getCurrentDocument() throw (uno::RuntimeException)
-+getCurrentDoc( const rtl::OUString& sKey ) throw (uno::RuntimeException)
- {
- 	uno::Reference< frame::XModel > xModel;
- 	SbxObject* pBasic = dynamic_cast< SbxObject* > ( SFX_APP()->GetBasic() );
-@@ -426,7 +427,7 @@ getCurrentDocument() throw (uno::RuntimeException)
- 
- 
-     uno::Any aModel; 
--    SbxVariable *pCompVar = basicChosen->Find(  UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT );
-+    SbxVariable *pCompVar = basicChosen->Find(  sKey, SbxCLASS_OBJECT );
- 
- 	if ( pCompVar )
- 	{
-@@ -434,30 +435,19 @@ getCurrentDocument() throw (uno::RuntimeException)
- 		if ( sal_False == ( aModel >>= xModel ) ||
- 			!xModel.is() )
- 		{
--			// trying last gasp try the current component
--			uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
--			// test if vba service is present
--			uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
--			uno::Reference<lang::XMultiComponentFactory > xSMgr( xCtx->getServiceManager(), uno::UNO_QUERY_THROW );
--			uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx), uno::UNO_QUERY_THROW );
--			xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY );
--			if ( !xModel.is() )
--			{
--				throw uno::RuntimeException( 
--					rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the currently selected document") ), uno::Reference< uno::XInterface >() );
--			}
--			return xModel;
-+			throw uno::RuntimeException( 
-+				rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the current documet context") ), uno::Reference< uno::XInterface >() );
- 		}
- 		else
- 		{
--			OSL_TRACE("Have model ThisComponent points to url %s",
-+			OSL_TRACE("Have model points to url %s",
- 			::rtl::OUStringToOString( xModel->getURL(),
- 				RTL_TEXTENCODING_ASCII_US ).pData->buffer );
- 		}
- 	}
- 	else
- 	{
--		OSL_TRACE("Failed to get ThisComponent");
-+		OSL_TRACE("Failed to get %s", rtl::OUStringToOString( sKey, RTL_TEXTENCODING_UTF8 ).getStr() );
- 		throw uno::RuntimeException( 
- 			rtl::OUString( 
- 				RTL_CONSTASCII_USTRINGPARAM(
-@@ -467,6 +457,21 @@ getCurrentDocument() throw (uno::RuntimeException)
- 	return xModel;
- }
- 
-+
-+ uno::Reference< frame::XModel > 
-+getCurrentExcelDoc() throw (uno::RuntimeException)
-+{
-+   static const rtl::OUString sThisExcelDoc( RTL_CONSTASCII_USTRINGPARAM("ThisExcelDoc" ) );
-+   return getCurrentDoc( sThisExcelDoc ); 
-+}
-+
-+ uno::Reference< frame::XModel > 
-+getCurrentWordDoc() throw (uno::RuntimeException)
-+{
-+   static const rtl::OUString sThisWordDoc( RTL_CONSTASCII_USTRINGPARAM("ThisWordDoc" ) );
-+   return getCurrentDoc( sThisWordDoc ); 
-+}
-+
- sal_Int32 
- OORGBToXLRGB( sal_Int32 nCol )
- {
-@@ -828,23 +833,13 @@ ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::u
-     m_pShapeHelper.reset( new ShapeHelper( xShape ) );
- }
- 
--static uno::Reference< frame::XController > lcl_getCurrentController()
--{
--    const uno::Reference< frame::XModel > xWorkingDoc( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
--    uno::Reference< frame::XController > xController;
--    if ( xWorkingDoc.is() )
--        xController.set( xWorkingDoc->getCurrentController(), uno::UNO_SET_THROW );
--    else
--        xController.set( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
--    return xController;
--}
--
--sal_Int32 getPointerStyle()
-+sal_Int32 getPointerStyle( const uno::Reference< frame::XModel >& xModel )
- {
-+    
-     sal_Int32 nPointerStyle( POINTER_ARROW );
-     try
-     {
--        const uno::Reference< frame::XController > xController( lcl_getCurrentController(),     uno::UNO_SET_THROW );
-+        const uno::Reference< frame::XController > xController( xModel->getCurrentController(),     uno::UNO_SET_THROW );
-         const uno::Reference< frame::XFrame >      xFrame     ( xController->getFrame(),        uno::UNO_SET_THROW );
-         const uno::Reference< awt::XWindow >       xWindow    ( xFrame->getContainerWindow(),   uno::UNO_SET_THROW );
-         // why the heck isn't there an XWindowPeer::getPointer, but a setPointer only?
-@@ -859,11 +854,14 @@ sal_Int32 getPointerStyle()
-     return nPointerStyle;
- }
- 
--void setCursorHelper( const Pointer& rPointer, sal_Bool bOverWrite )
-+// #FIXME this method looks wrong, shouldn't it just affect calc *or* writer
-+// document/frame/window(s) but not both ( and depending on what api called 
-+// this )
-+void setCursorHelper( const uno::Reference< frame::XModel >& xModel, const Pointer& rPointer, sal_Bool bOverWrite )
- {
-     ::std::vector< uno::Reference< frame::XController > > aControllers;
- 
--    const uno::Reference< frame::XModel2 > xModel2( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
-+    uno::Reference< frame::XModel2 > xModel2( xModel, uno::UNO_QUERY );
-     if ( xModel2.is() )
-     {
-         const uno::Reference< container::XEnumeration > xEnumControllers( xModel2->getControllers(), uno::UNO_SET_THROW );
-@@ -875,17 +873,12 @@ void setCursorHelper( const Pointer& rPointer, sal_Bool bOverWrite )
-     }
-     else
-     {
--        const uno::Reference< frame::XModel > xModel( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
-+        const uno::Reference< frame::XModel > xModel( xModel2, uno::UNO_QUERY );
-         if ( xModel.is() )
-         {
-             const uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
-             aControllers.push_back( xController );
-         }
--        else
--        {
--            const uno::Reference< frame::XController > xController( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
--            aControllers.push_back( xController );
--        }
-     }
- 
-     for (   ::std::vector< uno::Reference< frame::XController > >::const_iterator controller = aControllers.begin();
-diff --git vbahelper/source/vbahelper/vbashape.cxx vbahelper/source/vbahelper/vbashape.cxx
-index 5a8dbd6..c35745b 100644
---- vbahelper/source/vbahelper/vbashape.cxx
-+++ vbahelper/source/vbahelper/vbashape.cxx
-@@ -58,14 +58,14 @@ using namespace ::ooo::vba;
- using namespace ::com::sun::star;
- using namespace ::vos;
- 
--ScVbaShape::ScVbaShape( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, sal_Int32 nType ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( xParent, xContext ), m_xShape( xShape ), m_xShapes( xShapes ), m_nType( nType )
-+ScVbaShape::ScVbaShape( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, const uno::Reference< frame::XModel >& xModel, sal_Int32 nType ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( xParent, xContext ), m_xShape( xShape ), m_xShapes( xShapes ), m_nType( nType ), m_xModel( xModel )
- {
-     m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
-     m_pShapeHelper.reset( new ShapeHelper( m_xShape ) );
-     addListeners();
- }
- 
--ScVbaShape::ScVbaShape( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( uno::Reference< XHelperInterface >(), xContext ), m_xShape( xShape )
-+ScVbaShape::ScVbaShape( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< frame::XModel >& xModel ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( uno::Reference< XHelperInterface >(), xContext ), m_xShape( xShape ), m_xModel( xModel )
- {
-     // add listener
-     addListeners();
-@@ -311,8 +311,7 @@ ScVbaShape::getPictureFormat() throw (uno::RuntimeException)
- uno::Any SAL_CALL 
- ScVbaShape::TextFrame() throw (uno::RuntimeException)
- {
--    uno::Reference< frame::XModel > xModel = getCurrentDocument();
--    uno::Reference< lang::XServiceInfo > xServiceInfo( xModel, uno::UNO_QUERY_THROW );
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
-     if( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument" ) ) ) )
-     {
-         uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-@@ -452,8 +451,7 @@ ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_
- void SAL_CALL
- ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException )
- {
--    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+    uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-     xSelectSupp->select( uno::makeAny( m_xShape ) );
- }
- 
-@@ -473,7 +471,7 @@ ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException )
- 	uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( aVec ) );
- 	uno::Reference< container::XChild > xChild( m_xShape, uno::UNO_QUERY_THROW );	
- 	// #FIXME for want of a better parent, setting this
--	uno::Reference< msforms::XShapeRange > xShapeRange( new ScVbaShapeRange( mxParent, mxContext, xIndexAccess,  uno::Reference< drawing::XDrawPage >( xChild->getParent(), uno::UNO_QUERY_THROW ) ) );
-+	uno::Reference< msforms::XShapeRange > xShapeRange( new ScVbaShapeRange( mxParent, mxContext, xIndexAccess,  uno::Reference< drawing::XDrawPage >( xChild->getParent(), uno::UNO_QUERY_THROW ), m_xModel ) );
- 	if ( index.hasValue() )
- 		return xShapeRange->Item( index, uno::Any() );
- 	return uno::makeAny( xShapeRange );
-@@ -644,8 +642,7 @@ ScVbaShape::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition )
- uno::Any SAL_CALL 
- ScVbaShape::WrapFormat() throw (uno::RuntimeException)
- {
--    uno::Reference< frame::XModel > xModel = getCurrentDocument();
--    uno::Reference< lang::XServiceInfo > xServiceInfo( xModel, uno::UNO_QUERY_THROW );
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
-     if( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) )
-     {
-         uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-diff --git vbahelper/source/vbahelper/vbashaperange.cxx vbahelper/source/vbahelper/vbashaperange.cxx
-index ae1a1fb..0c3535b 100644
---- vbahelper/source/vbahelper/vbashaperange.cxx
-+++ vbahelper/source/vbahelper/vbashaperange.cxx
-@@ -58,7 +58,7 @@ public:
- 
- };
- 
--ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xShapes, const uno::Reference< drawing::XDrawPage >& xDrawPage ) : ScVbaShapeRange_BASE( xParent, xContext, xShapes ), m_xDrawPage( xDrawPage ), m_nShapeGroupCount(0)
-+ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xShapes, const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Reference< frame::XModel >& xModel  ) : ScVbaShapeRange_BASE( xParent, xContext, xShapes ), m_xDrawPage( xDrawPage ), m_nShapeGroupCount(0), m_xModel( xModel )
- {
- }
- 
-@@ -66,8 +66,7 @@ ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xPar
- void SAL_CALL 
- ScVbaShapeRange::Select(  ) throw (uno::RuntimeException)
- {
--    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+    uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-     xSelectSupp->select( uno::makeAny( getShapes() ) );
- }
- 
-@@ -77,7 +76,7 @@ ScVbaShapeRange::Group() throw (uno::RuntimeException)
-     uno::Reference< drawing::XShapeGrouper > xShapeGrouper( m_xDrawPage, uno::UNO_QUERY_THROW );
-     uno::Reference< drawing::XShapeGroup > xShapeGroup( xShapeGrouper->group( getShapes() ), uno::UNO_QUERY_THROW );
-     uno::Reference< drawing::XShape > xShape( xShapeGroup, uno::UNO_QUERY_THROW );
--    return uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, getShapes(), office::MsoShapeType::msoGroup ) );
-+    return uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, getShapes(), m_xModel, office::MsoShapeType::msoGroup ) );
- }
- 
- uno::Reference< drawing::XShapes > 
-@@ -359,7 +358,7 @@ ScVbaShapeRange:: createCollectionObject( const css::uno::Any& aSource )
- 	uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW );
- 	// #TODO  #FIXME Shape parent should always be the sheet the shapes belong 
- 	// to 
--	uno::Reference< msforms::XShape > xVbShape( new ScVbaShape( uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), ScVbaShape::getType( xShape ) ) ); 
-+	uno::Reference< msforms::XShape > xVbShape( new ScVbaShape( uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), m_xModel, ScVbaShape::getType( xShape ) ) ); 
-         return uno::makeAny( xVbShape );
- }
- 
-diff --git vbahelper/source/vbahelper/vbashapes.cxx vbahelper/source/vbahelper/vbashapes.cxx
-index 6515c6e..ee5cf91 100644
---- vbahelper/source/vbahelper/vbashapes.cxx
-+++ vbahelper/source/vbahelper/vbashapes.cxx
-@@ -89,7 +89,7 @@ void ScVbaShapes::initBaseCollection()
- 	m_xNameAccess.set( xShapes, uno::UNO_QUERY );
- }
- 
--ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes ): ScVbaShapes_BASE( xParent, xContext, xShapes ), m_nNewShapeCount(0)
-+ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const uno::Reference< frame::XModel>& xModel ): ScVbaShapes_BASE( xParent, xContext, xShapes ), m_nNewShapeCount(0), m_xModel( xModel )
- {
-     m_xShapes.set( xShapes, uno::UNO_QUERY_THROW );
-     m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); 
-@@ -108,7 +108,7 @@ ScVbaShapes::createCollectionObject( const css::uno::Any& aSource ) throw (uno::
-     if( aSource.hasValue() )
-     {
-         uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW );
--        return uno::makeAny( uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) ) ) );
-+        return uno::makeAny( uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) ) ) );
-     }
-     return uno::Any();
- }
-@@ -208,14 +208,13 @@ ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException)
- 		aIndex <<= sIndices;
- 		xShapes = getShapesByArrayIndices( aIndex );
- 	}
--	return new ScVbaShapeRange(  getParent(), mxContext, xShapes, m_xDrawPage );
-+	return new ScVbaShapeRange(  getParent(), mxContext, xShapes, m_xDrawPage, m_xModel );
- }
- 
- void SAL_CALL 
- ScVbaShapes::SelectAll() throw (uno::RuntimeException)
- {
--    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
--    uno::Reference< view::XSelectionSupplier > xSelectSupp( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+    uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-     try
-     {
-         xSelectSupp->select( uno::makeAny( m_xShapes ) );
-@@ -231,8 +230,7 @@ ScVbaShapes::SelectAll() throw (uno::RuntimeException)
- uno::Reference< drawing::XShape > 
- ScVbaShapes::createShape( rtl::OUString service ) throw (css::uno::RuntimeException)
- {
--	// #FIXME don't use getCurrentDocument
--    uno::Reference< lang::XMultiServiceFactory > xMSF( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+    uno::Reference< lang::XMultiServiceFactory > xMSF( m_xModel, uno::UNO_QUERY_THROW );
-     uno::Reference< drawing::XShape > xShape( xMSF->createInstance( service ), uno::UNO_QUERY_THROW );
-     return xShape;
- }
-@@ -264,7 +262,7 @@ ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWi
-     size.Width = nWidth;
-     xShape->setSize( size );
- 
--    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
-+    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
-     pScVbaShape->setRange( aRange ); 
-     return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
- }
-@@ -308,7 +306,7 @@ ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidt
-     size.Width = nWidth;
-     xShape->setSize(size);
- 
--    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
-+    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
-     pScVbaShape->setRange( aRange ); 
-     return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
- }
-@@ -344,7 +342,7 @@ ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_In
-     size.Width = nWidth;
-     xShape->setSize(size);
- 
--    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
-+    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
-     return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
- }
- 
-@@ -366,7 +364,7 @@ ScVbaShapes::AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_
- uno::Any SAL_CALL
- ScVbaShapes::AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
- {
--    uno::Reference< lang::XServiceInfo > xServiceInfo( getCurrentDocument(), uno::UNO_QUERY_THROW );
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
-     if( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) )
-     {
-         return AddTextboxInWriter( _nOrientation, _nLeft, _nTop, _nWidth, _nHeight );
-@@ -416,7 +414,7 @@ ScVbaShapes::AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_
-     xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "LayerName" ), uno::makeAny( sLayerName ) );
- 
- 
--    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
-+    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
-     return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
- }
- 
-@@ -445,7 +443,7 @@ ScVbaShapes::AddShape( const rtl::OUString& sService, const rtl::OUString& sName
-     size.Width = nWidth;
-     xShape->setSize(size);
- 
--    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, ScVbaShape::getType( xShape ) );
-+    ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
-     return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
- }
- void
diff --git a/applied_patches/0507-svg-import-viewbox-fix.diff b/applied_patches/0389-svg-import-viewbox-fix.diff
similarity index 100%
rename from applied_patches/0507-svg-import-viewbox-fix.diff
rename to applied_patches/0389-svg-import-viewbox-fix.diff
diff --git a/applied_patches/0389-vba-testclient-fix-project.diff b/applied_patches/0389-vba-testclient-fix-project.diff
deleted file mode 100644
index 06f061da4..000000000
--- a/applied_patches/0389-vba-testclient-fix-project.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git sc/source/ui/vba/testvba/testvba.cxx sc/source/ui/vba/testvba/testvba.cxx
-index b25997e..efb74b2 100644
---- sc/source/ui/vba/testvba/testvba.cxx
-+++ sc/source/ui/vba/testvba/testvba.cxx
-@@ -159,15 +159,15 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath  ) )
-                         Reference< script::provider::XScript > xScript;
- 						try
-                         {
--						    xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.TestMacros.Main?language=Basic&location=document" ));
-+						    xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document" ));
-                         } catch ( uno::Exception& e )
-                         {
-                             try
-                             {
--						        xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.testMacro.Main?language=Basic&location=document" ));
-+						        xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" ));
-                             } catch ( uno::Exception& e2 )
-                             {
--						        xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.testMain.Main?language=Basic&location=document" ));
-+						        xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" ));
-                             }
-                         }
- 						OSL_TRACE("Got script for doc %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
diff --git a/applied_patches/0508-svg-import-painturi-fix.diff b/applied_patches/0390-svg-import-painturi-fix.diff
similarity index 100%
rename from applied_patches/0508-svg-import-painturi-fix.diff
rename to applied_patches/0390-svg-import-painturi-fix.diff
diff --git a/applied_patches/0390-vba-fix-checkbox-ole-access.diff b/applied_patches/0390-vba-fix-checkbox-ole-access.diff
deleted file mode 100644
index 6c9094ef9..000000000
--- a/applied_patches/0390-vba-fix-checkbox-ole-access.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git vbahelper/source/msforms/vbacontrol.cxx vbahelper/source/msforms/vbacontrol.cxx
-index 3503631..623b0cd 100644
---- vbahelper/source/msforms/vbacontrol.cxx
-+++ vbahelper/source/msforms/vbacontrol.cxx
-@@ -416,6 +416,8 @@ ScVbaControl* ScVbaControlFactory::createControl(const uno::Reference< drawing::
-             return new ScVbaLabel( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-         case form::FormComponentType::TEXTFIELD:
-             return new ScVbaTextBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-+        case form::FormComponentType::CHECKBOX:
-+            return new ScVbaCheckbox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-         case form::FormComponentType::RADIOBUTTON:
-             return new ScVbaRadioButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-         case form::FormComponentType::LISTBOX:
diff --git a/applied_patches/0509-svg-import-textimport.diff b/applied_patches/0391-svg-import-textimport.diff
similarity index 100%
rename from applied_patches/0509-svg-import-textimport.diff
rename to applied_patches/0391-svg-import-textimport.diff
diff --git a/applied_patches/0391-vba-fix-path-fullname.diff b/applied_patches/0391-vba-fix-path-fullname.diff
deleted file mode 100644
index 5c2e7c6f1..000000000
--- a/applied_patches/0391-vba-fix-path-fullname.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git vbahelper/source/vbahelper/vbadocumentbase.cxx vbahelper/source/vbahelper/vbadocumentbase.cxx
-index e53279e..b8054cc 100644
---- vbahelper/source/vbahelper/vbadocumentbase.cxx
-+++ vbahelper/source/vbahelper/vbadocumentbase.cxx
-@@ -82,17 +82,22 @@ VbaDocumentBase::getName() throw (uno::RuntimeException)
- ::rtl::OUString
- VbaDocumentBase::getPath() throw (uno::RuntimeException)
- {
--	INetURLObject aURL( getModel()->getURL() );
--	aURL.CutLastName();
--	return aURL.GetURLPath();
-+       INetURLObject aURL( getModel()->getURL() );
-+	rtl::OUString sURL( aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
-+	sURL = sURL.copy( 0, sURL.getLength() - aURL.GetLastName().getLength() - 1 );
-+        rtl::OUString sPath;
-+	::osl::File::getSystemPathFromFileURL( sURL, sPath );
-+	return sPath;
- }
- 
- ::rtl::OUString
- VbaDocumentBase::getFullName() throw (uno::RuntimeException)
- {
--	INetURLObject aURL( getModel()->getURL() );
--	return aURL.GetURLPath();
-+        rtl::OUString sPath;
-+	::osl::File::getSystemPathFromFileURL( getModel()->getURL(), sPath );
-+	return sPath;
- }
-+
- void
- VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
- 					  const uno::Any &rRouteArg ) throw (uno::RuntimeException)
diff --git a/applied_patches/0392-fix-sheet-control-valueset.diff b/applied_patches/0392-fix-sheet-control-valueset.diff
deleted file mode 100644
index 7a1c875ce..000000000
--- a/applied_patches/0392-fix-sheet-control-valueset.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git sc/source/ui/vba/vbaworksheet.cxx sc/source/ui/vba/vbaworksheet.cxx
-index 310f81e..166abfe 100644
---- sc/source/ui/vba/vbaworksheet.cxx
-+++ sc/source/ui/vba/vbaworksheet.cxx
-@@ -32,6 +32,7 @@
- 
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <com/sun/star/beans/XIntrospectionAccess.hpp>
-+#include <com/sun/star/beans/XIntrospection.hpp>
- #include <com/sun/star/container/XNamed.hpp>
- #include <com/sun/star/util/XProtectable.hpp>
- #include <com/sun/star/table/XCellRange.hpp>
-@@ -764,9 +765,9 @@ ScVbaWorksheet::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequenc
- }
- 
- void SAL_CALL 
--ScVbaWorksheet::setValue( const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
-+ScVbaWorksheet::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
- {
--	throw uno::RuntimeException(); // unsupported operation
-+    setDefaultPropByIntrospection( uno::makeAny( getValue( aPropertyName ) ), aValue );
- }
- uno::Any SAL_CALL 
- ScVbaWorksheet::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
-diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx
-index 5749839..3fc1a62 100644
---- vbahelper/inc/vbahelper/vbahelper.hxx
-+++ vbahelper/inc/vbahelper/vbahelper.hxx
-@@ -91,6 +91,7 @@ namespace ooo
- 	    VBAHELPER_DLLPUBLIC double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
-         VBAHELPER_DLLPUBLIC sal_Int32 getPointerStyle( const css::uno::Reference< css::frame::XModel >& );
-         VBAHELPER_DLLPUBLIC void setCursorHelper( const css::uno::Reference< css::frame::XModel >& xModel, const Pointer& rPointer, sal_Bool bOverWrite );
-+        VBAHELPER_DLLPUBLIC void setDefaultPropByIntrospection( const css::uno::Any& aObj, const css::uno::Any& aValue  ) throw ( css::uno::RuntimeException );
- 
- class VBAHELPER_DLLPUBLIC Millimeter
- {
-diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx
-index b95ccf1..acdfb9e 100644
---- vbahelper/source/vbahelper/vbahelper.cxx
-+++ vbahelper/source/vbahelper/vbahelper.cxx
-@@ -34,6 +34,7 @@
- #include <com/sun/star/frame/XFrame.hpp>
- #include <com/sun/star/frame/XDesktop.hpp>
- #include <com/sun/star/frame/XController.hpp>
-+#include <com/sun/star/script/XDefaultProperty.hpp>
- #include <com/sun/star/uno/XComponentContext.hpp>
- #include <com/sun/star/lang/XMultiComponentFactory.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
-@@ -952,6 +953,23 @@ String docMacroExists( SfxObjectShell* pShell, const String& sMod, const String&
- 	return sFullName;
- }
- 
-+void setDefaultPropByIntrospection( const uno::Any& aObj, const uno::Any& aValue  ) throw ( uno::RuntimeException )
-+{
-+    uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObj ) );
-+
-+    // #MAYBE #FIXME sort of a bit of a hack, 
-+    uno::Reference<  script::XDefaultProperty > xDflt( aObj, uno::UNO_QUERY_THROW );
-+    uno::Reference< beans::XPropertySet > xPropSet;
-+
-+    if ( xUnoAccess.is() )
-+        xPropSet.set( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY);
-+           
-+    if ( xPropSet.is() )
-+        xPropSet->setPropertyValue( xDflt->getDefaultPropertyName(), aValue );
-+    else
-+        throw uno::RuntimeException();
-+}
-+
- #define VBA_LEFT "PositionX"
- #define VBA_TOP "PositionY"
- UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
diff --git a/applied_patches/0510-svg-import-convlength-fix.diff b/applied_patches/0392-svg-import-convlength-fix.diff
similarity index 100%
rename from applied_patches/0510-svg-import-convlength-fix.diff
rename to applied_patches/0392-svg-import-convlength-fix.diff
diff --git a/applied_patches/0393-svg-import-opacity-fix.diff b/applied_patches/0393-svg-import-opacity-fix.diff
new file mode 100644
index 000000000..9389b6705
--- /dev/null
+++ b/applied_patches/0393-svg-import-opacity-fix.diff
@@ -0,0 +1,153 @@
+Actually handling global svg opacity now
+
+From: Thorsten Behrens <thb@openoffice.org>
+
+
+---
+
+ filter/source/svg/gfxtypes.hxx  |    2 ++
+ filter/source/svg/svgreader.cxx |   38 ++++++++++++++++++++++----------------
+ 2 files changed, 24 insertions(+), 16 deletions(-)
+
+
+diff --git filter/source/svg/gfxtypes.hxx filter/source/svg/gfxtypes.hxx
+index bdf66af..79d73d4 100644
+--- filter/source/svg/gfxtypes.hxx
++++ filter/source/svg/gfxtypes.hxx
+@@ -174,6 +174,7 @@ struct State
+         mbVisibility(true),
+         meFillType(SOLID),
+         mnFillOpacity(1.0),
++        mnOpacity(1.0),
+         meStrokeType(NONE),
+         mnStrokeOpacity(1.0),
+         meViewportFillType(NONE),
+@@ -220,6 +221,7 @@ struct State
+ 
+     PaintType                   meFillType;
+     double                      mnFillOpacity;
++    double                      mnOpacity;
+     PaintType                   meStrokeType;
+     double                      mnStrokeOpacity;
+     PaintType                   meViewportFillType;
+diff --git filter/source/svg/svgreader.cxx filter/source/svg/svgreader.cxx
+index 1e4570c..8a33745 100644
+--- filter/source/svg/svgreader.cxx
++++ filter/source/svg/svgreader.cxx
+@@ -519,12 +519,12 @@ struct AnnotatingVisitor
+                                       rtl::OUString::valueOf(
+                                           maGradientStopVector[
+                                               rState.maFillGradient.maStops[0]].maStopColor.a*
+-                                          maCurrState.mnFillOpacity*100.0)+USTR("%" ) );
++                                          maCurrState.mnFillOpacity*maCurrState.mnOpacity*100.0)+USTR("%" ) );
+                 xAttrs->AddAttribute( USTR( "draw:start" ), 
+                                       rtl::OUString::valueOf(
+                                           maGradientStopVector[
+                                               rState.maFillGradient.maStops[1]].maStopColor.a*
+-                                          maCurrState.mnFillOpacity*100.0)+USTR("%" ) );
++                                          maCurrState.mnFillOpacity*maCurrState.mnOpacity*100.0)+USTR("%" ) );
+                 xAttrs->AddAttribute( USTR( "draw:border" ), USTR("0%") );
+                 mxDocumentHandler->startElement( USTR("draw:opacity"), 
+                                                  xUnoAttrs );
+@@ -616,17 +616,17 @@ struct AnnotatingVisitor
+                         xAttrs->AddAttribute( USTR( "draw:opacity-name" ), 
+                                               getStyleName("svgopacity", rState.maFillGradient.mnId) );
+                     }
+-                    else if( maCurrState.mnFillOpacity != 1.0 )
++                    else if( maCurrState.mnFillOpacity*maCurrState.mnOpacity != 1.0 )
+                         xAttrs->AddAttribute( USTR( "draw:opacity" ), 
+-                                              rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity)+USTR("%") );
++                                              rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+USTR("%") );
+                 }
+                 else
+                 {
+                     xAttrs->AddAttribute( USTR( "draw:fill" ), USTR("solid"));
+                     xAttrs->AddAttribute( USTR( "draw:fill-color" ), getOdfColor(rState.maFillColor));
+-                    if( maCurrState.mnFillOpacity != 1.0 )
++                    if( maCurrState.mnFillOpacity*maCurrState.mnOpacity != 1.0 )
+                         xAttrs->AddAttribute( USTR( "draw:opacity" ), 
+-                                              rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity)+USTR("%") );
++                                              rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+USTR("%") );
+                 }
+             }
+             else
+@@ -652,9 +652,9 @@ struct AnnotatingVisitor
+                 xAttrs->AddAttribute( USTR( "draw:stroke-linejoin"), USTR("round"));
+             else if( maCurrState.meLineJoin == basegfx::B2DLINEJOIN_BEVEL )
+                 xAttrs->AddAttribute( USTR( "draw:stroke-linejoin"), USTR("bevel"));
+-            if( maCurrState.mnStrokeOpacity != 1.0 )
++            if( maCurrState.mnStrokeOpacity*maCurrState.mnOpacity != 1.0 )
+                 xAttrs->AddAttribute( USTR("svg:stroke-opacity"), 
+-                                      rtl::OUString::valueOf(100.0*maCurrState.mnStrokeOpacity)+USTR("%"));
++                                      rtl::OUString::valueOf(100.0*maCurrState.mnStrokeOpacity*maCurrState.mnOpacity)+USTR("%"));
+         }
+ 
+         mxDocumentHandler->startElement( USTR("style:graphic-properties"), 
+@@ -876,6 +876,12 @@ struct AnnotatingVisitor
+                     maCurrState.meFillRule = maParentStates.back().meFillRule;
+                 break;
+             }
++            case XML_OPACITY:
++                if( aValueUtf8 == "inherit" )
++                    maCurrState.mnOpacity = maParentStates.back().mnOpacity;
++                else
++                    maCurrState.mnOpacity = aValueUtf8.toDouble();
++                break;
+             case XML_FILL_OPACITY:
+                 if( aValueUtf8 == "inherit" )
+                     maCurrState.mnFillOpacity = maParentStates.back().mnFillOpacity;
+@@ -2540,13 +2546,13 @@ struct ShapeRenderingVisitor
+                 const BYTE	cTransStart( 255-
+                     basegfx::fround(mrGradientStopVector[
+                                         aState.maFillGradient.maStops[1]].maStopColor.a*
+-                                    aState.mnFillOpacity*255.0));
++                                    aState.mnFillOpacity*maCurrState.mnOpacity*255.0));
+                 const Color aTransStart( cTransStart, cTransStart, cTransStart );
+ 
+                 const BYTE	cTransEnd( 255-
+                     basegfx::fround(mrGradientStopVector[
+                                         aState.maFillGradient.maStops[0]].maStopColor.a*
+-                                    aState.mnFillOpacity*255.0));
++                                    aState.mnFillOpacity*maCurrState.mnOpacity*255.0));
+                 const Color aTransEnd( cTransEnd, cTransEnd, cTransEnd );
+ 
+                 // modulate gradient opacity with overall fill opacity
+@@ -2594,10 +2600,10 @@ struct ShapeRenderingVisitor
+             else
+                 mrOutDev.SetFillColor(getVclColor(aState.maFillColor));
+ 
+-            if( aState.mnFillOpacity != 1.0 )
++            if( aState.mnFillOpacity*maCurrState.mnOpacity != 1.0 )
+                 mrOutDev.DrawTransparent(::PolyPolygon(aPoly),
+                                          basegfx::fround(
+-                                             (1.0-aState.mnFillOpacity)*100.0));
++                                             (1.0-(aState.mnFillOpacity*maCurrState.mnOpacity))*100.0));
+             else
+                 mrOutDev.DrawPolyPolygon(::PolyPolygon(aPoly));
+         }
+@@ -2652,10 +2658,10 @@ struct ShapeRenderingVisitor
+ 
+             for( sal_uInt32 i=0; i<aPolys.size(); ++i )
+             {
+-                if( aState.mnStrokeOpacity != 1.0 )
++                if( aState.mnStrokeOpacity*maCurrState.mnOpacity != 1.0 )
+                     mrOutDev.DrawTransparent(::PolyPolygon(aPolys[i]),
+                                              basegfx::fround(
+-                                                 (1.0-aState.mnStrokeOpacity)*100.0));
++                                                 (1.0-(aState.mnStrokeOpacity*maCurrState.mnOpacity))*100.0));
+                 else
+                     mrOutDev.DrawPolyPolygon(::PolyPolygon(aPolys[i]));
+ 
+@@ -2675,10 +2681,10 @@ struct ShapeRenderingVisitor
+             else
+                 mrOutDev.SetLineColor(getVclColor(aState.maStrokeColor));
+ 
+-            if( aState.mnStrokeOpacity != 1.0 )
++            if( aState.mnStrokeOpacity*maCurrState.mnOpacity != 1.0 )
+                 mrOutDev.DrawTransparent(::PolyPolygon(aPoly),
+                                          basegfx::fround(
+-                                             (1.0-aState.mnStrokeOpacity)*100.0));
++                                             (1.0-(aState.mnStrokeOpacity*maCurrState.mnOpacity))*100.0));
+             else
+                 mrOutDev.DrawPolyPolygon(::PolyPolygon(aPoly));
+         }
diff --git a/applied_patches/0393-vba-fix-range-delete-shift.diff b/applied_patches/0393-vba-fix-range-delete-shift.diff
deleted file mode 100644
index 16679b2f4..000000000
--- a/applied_patches/0393-vba-fix-range-delete-shift.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index 19bf089..9743989 100644
---- sc/source/ui/vba/vbarange.cxx
-+++ sc/source/ui/vba/vbarange.cxx
-@@ -3317,7 +3317,6 @@ ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (u
-  void SAL_CALL 
- ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException)
- {
--	
- 	if ( m_Areas->getCount() > 1 )
- 	{
- 		sal_Int32 nItems = m_Areas->getCount();
-@@ -3329,6 +3328,8 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException)
- 		return;
- 	}
- 	sheet::CellDeleteMode mode = sheet::CellDeleteMode_NONE ; 
-+	RangeHelper thisRange( mxRange );
-+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
- 	if ( Shift.hasValue() )		
- 	{
- 		sal_Int32 nShift = 0;
-@@ -3346,13 +3347,17 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException)
- 		}
- 	}
- 	else
--		if ( getRow() >  getColumn() )
-+        {
-+		bool bFullRow = ( thisAddress.StartColumn == 0 && thisAddress.EndColumn == MAXCOL );
-+	        sal_Int32 nCols = thisAddress.EndColumn - thisAddress.StartColumn;
-+	        sal_Int32 nRows = thisAddress.EndRow - thisAddress.StartRow;
-+		if ( mbIsRows || bFullRow || ( nCols >=  nRows ) )
- 			mode = sheet::CellDeleteMode_UP;
- 		else
- 			mode = sheet::CellDeleteMode_LEFT;
--	RangeHelper thisRange( mxRange );
-+	}
- 	uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
--	xCellRangeMove->removeRange( thisRange.getCellRangeAddressable()->getRangeAddress(), mode ); 
-+	xCellRangeMove->removeRange( thisAddress, mode ); 
- 	
- }
- 
diff --git a/applied_patches/0511-speed-store.diff b/applied_patches/0394-speed-store.diff
similarity index 100%
rename from applied_patches/0511-speed-store.diff
rename to applied_patches/0394-speed-store.diff
diff --git a/applied_patches/0394-vba-fix-worksheet-add-before-param-object.diff b/applied_patches/0394-vba-fix-worksheet-add-before-param-object.diff
deleted file mode 100644
index c0f868220..000000000
--- a/applied_patches/0394-vba-fix-worksheet-add-before-param-object.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git sc/source/ui/vba/vbaworksheets.cxx sc/source/ui/vba/vbaworksheets.cxx
-index f2c0312..a927236 100644
---- sc/source/ui/vba/vbaworksheets.cxx
-+++ sc/source/ui/vba/vbaworksheets.cxx
-@@ -209,10 +209,23 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
- 	Count >>= nNewSheets;
- 	Type >>= nType;
- 	SCTAB nCount = 0;
--	Before >>= aStringSheet;
--	if (!aStringSheet.getLength())
-+
-+	uno::Reference< excel::XWorksheet > xBeforeAfterSheet;
-+
-+	if ( Before.hasValue() )
- 	{
--		After >>= aStringSheet;
-+        	if ( Before >>= xBeforeAfterSheet )
-+			aStringSheet = xBeforeAfterSheet->getName();
-+		else
-+			Before >>= aStringSheet;
-+	}
-+
-+	if (!aStringSheet.getLength() && After.hasValue() )
-+	{
-+        	if ( After >>= xBeforeAfterSheet )
-+			aStringSheet = xBeforeAfterSheet->getName();
-+		else
-+			After >>= aStringSheet;
- 		bBefore = sal_False;
- 	}
- 	if (!aStringSheet.getLength())
diff --git a/applied_patches/0395-vba-fix-worksheet-add-activate.diff b/applied_patches/0395-vba-fix-worksheet-add-activate.diff
deleted file mode 100644
index 0f9a83b65..000000000
--- a/applied_patches/0395-vba-fix-worksheet-add-activate.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git sc/source/ui/vba/vbaworksheets.cxx sc/source/ui/vba/vbaworksheets.cxx
-index f2c0312..a927236 100644
---- sc/source/ui/vba/vbaworksheets.cxx
-+++ sc/source/ui/vba/vbaworksheets.cxx
-@@ -252,7 +265,9 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
- 		m_xSheets->insertNewByName(aStringName, nSheetIndex + i);
- 		result = getItemByStringIndex( aStringName );
- 	}
--	
-+	uno::Reference< excel::XWorksheet > xNewSheet( result, uno::UNO_QUERY );
-+	if ( xNewSheet.is() )
-+		xNewSheet->Activate();	
- 	return  result;
- }
- 
diff --git a/applied_patches/0512-wmf-pattern-brush.diff b/applied_patches/0395-wmf-pattern-brush.diff
similarity index 100%
rename from applied_patches/0512-wmf-pattern-brush.diff
rename to applied_patches/0395-wmf-pattern-brush.diff
diff --git a/applied_patches/0513-toolkit-layout-gcc-4.3.2-hack.diff b/applied_patches/0396-toolkit-layout-gcc-4.3.2-hack.diff
similarity index 100%
rename from applied_patches/0513-toolkit-layout-gcc-4.3.2-hack.diff
rename to applied_patches/0396-toolkit-layout-gcc-4.3.2-hack.diff
diff --git a/applied_patches/0396-vba-application-quit.diff b/applied_patches/0396-vba-application-quit.diff
deleted file mode 100644
index 6d2bad1bf..000000000
--- a/applied_patches/0396-vba-application-quit.diff
+++ /dev/null
@@ -1,183 +0,0 @@
---- basic/inc/basic/sbstar.hxx
-+++ basic/inc/basic/sbstar.hxx
-@@ -75,6 +75,7 @@ class StarBASIC : public SbxObject
-     BOOL            bVBAEnabled;
- 	BasicLibInfo*	pLibInfo;			// Info block for basic manager
- 	SbLanguageMode	eLanguageMode;		// LanguageMode of the basic object
-+	BOOL			bQuit;
- 
- 	SbxObjectRef pVBAGlobals; 
- 	SbxObject* getVBAGlobals( );
-@@ -205,6 +206,8 @@ public:
- 	BOOL IsDocBasic() { return bDocBasic; }
- 	SbxVariable* VBAFind( const String& rName, SbxClassType t );
- 	bool GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
-+	void QuitAndExitApplication();
-+	BOOL IsQuitApplication() { return bQuit; };
- };
- 
- #ifndef __SB_SBSTARBASICREF_HXX
-diff --git basic/source/classes/sb.cxx basic/source/classes/sb.cxx
-index de99045..6b96c4f 100644
---- basic/source/classes/sb.cxx
-+++ basic/source/classes/sb.cxx
-@@ -658,6 +658,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic  )
- 	// Suche ueber StarBASIC ist immer global
- 	SetFlag( SBX_GBLSEARCH );
- 	pVBAGlobals = NULL;
-+	bQuit = FALSE;
- }
- 
- // #51727 SetModified ueberladen, damit der Modified-
-@@ -1013,6 +1014,12 @@ SbxVariable* StarBASIC::FindVarInCurrentScopy
- 	return pVar;
- }
- 
-+void StarBASIC::QuitAndExitApplication()
-+{
-+    Stop();
-+    bQuit = TRUE;
-+}
-+
- void StarBASIC::Stop()
- {
- 	SbiInstance* p = pINST;
-diff --git basic/source/classes/sbxmod.cxx basic/source/classes/sbxmod.cxx
-index d82b9d0..3646b7c 100644
---- basic/source/classes/sbxmod.cxx
-+++ basic/source/classes/sbxmod.cxx
-@@ -81,6 +81,8 @@
- #include <cppuhelper/implbase1.hxx>
- #include <comphelper/anytostring.hxx>
- 
-+#include <com/sun/star/frame/XDesktop.hpp>
-+#include <vcl/svapp.hxx>
- using namespace ::com::sun::star; 
- 
- TYPEINIT1(SbModule,SbxObject)
-@@ -98,6 +100,36 @@ SV_IMPL_VARARR(SbiBreakpoints,USHORT)
- 
- SV_IMPL_VARARR(HighlightPortions, HighlightPortion)
- 
-+class AsyncQuitHandler
-+{
-+    AsyncQuitHandler() {}
-+    AsyncQuitHandler( const AsyncQuitHandler&);
-+public:
-+    static AsyncQuitHandler& instance() 
-+    {
-+        static AsyncQuitHandler dInst;
-+        return dInst;
-+    }
-+
-+    void QuitApplication()
-+    {
-+        uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
-+        if ( xFactory.is() )
-+	{
-+            uno::Reference< frame::XDesktop > xDeskTop( xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ) ), uno::UNO_QUERY );
-+           if ( xDeskTop.is() )
-+               xDeskTop->terminate(); 
-+        }
-+    }
-+    DECL_LINK( OnAsyncQuit, void* );
-+};
-+
-+IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, pNull )
-+{
-+    QuitApplication();
-+    return 0L;
-+}
-+
- bool UnlockControllerHack( StarBASIC* pBasic )
- {
-     bool bRes = false;
-@@ -654,6 +686,8 @@ USHORT SbModule::Run( SbMethod* pMeth )
- 
- 	USHORT nRes = 0;
- 	BOOL bDelInst = BOOL( pINST == NULL );
-+        bool bQuit = false;
-+{
- 	StarBASICRef xBasic;
- 	if( bDelInst )
- 	{
-@@ -821,6 +855,15 @@ USHORT SbModule::Run( SbMethod* pMeth )
- 		delete pINST;
- 		pINST = NULL;
- 	}
-+	if ( pBasic && pBasic->IsDocBasic() && pBasic->IsQuitApplication() && !pINST )
-+            bQuit = true;
-+}
-+        if ( bQuit )
-+        {
-+            //QuitApplicationHack();
-+            Application::PostUserEvent( LINK( &AsyncQuitHandler::instance(), AsyncQuitHandler, OnAsyncQuit ), NULL );
-+
-+        }
- 	return nRes;
- }
- 
-diff --git oovbaapi/ooo/vba/XApplicationBase.idl oovbaapi/ooo/vba/XApplicationBase.idl
-index 38efadd..f6c6bf0 100644
---- oovbaapi/ooo/vba/XApplicationBase.idl
-+++ oovbaapi/ooo/vba/XApplicationBase.idl
-@@ -54,6 +54,8 @@ interface XApplicationBase
- 	[attribute] boolean DisplayStatusBar;
- 	[attribute, readonly] string Version;
- 
-+	void Quit();
-+
-     any CommandBars( [in] any aIndex );
- 	void Run([in] string MacroName, [in] /*Optional*/ any varg1, [in] /*Optional*/ any varg2, [in] /*Optional*/ any varg3, [in] /*Optional*/ any varg4, [in] /*Optional*/ any varg5, [in] /*Optional*/ any varg6, [in] /*Optional*/ any varg7, [in] /*Optional*/ any varg8, [in] /*Optional*/ any varg9, [in] /*Optional*/ any varg10, [in] /*Optional*/ any varg11, [in] /*Optional*/ any varg12, [in] /*Optional*/ any varg13, [in] /*Optional*/ any varg14, [in] /*Optional*/ any varg15, [in] /*Optional*/ any varg16, [in] /*Optional*/ any varg17, [in] /*Optional*/ any varg18, [in] /*Optional*/ any varg19, [in] /*Optional*/ any varg20, [in] /*Optional*/ any varg21, [in] /*Optional*/ any varg22, [in] /*Optional*/ any varg23, [in] /*Optional*/ any varg24, [in] /*Optional*/ any varg25, [in] /*Optional*/ any varg26, [in] /*Optional*/ any varg27, [in] /*Optional*/ any varg28, [in] /*Optional*/ any varg29, [in] /*Optional*/ any varg30);
-     float CentimetersToPoints([in] float Centimeters );
-diff --git vbahelper/inc/vbahelper/vbaapplicationbase.hxx vbahelper/inc/vbahelper/vbaapplicationbase.hxx
-index e100387..eb292f3 100644
---- vbahelper/inc/vbahelper/vbaapplicationbase.hxx
-+++ vbahelper/inc/vbahelper/vbaapplicationbase.hxx
-@@ -56,7 +56,7 @@ public:
- 	virtual ::rtl::OUString SAL_CALL getVersion() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL Run( const ::rtl::OUString& MacroName, const css::uno::Any& varg1, const css::uno::Any& varg2, const css::uno::Any& varg3, const css::uno::Any& varg4, const css::uno::Any& varg5, const css::uno::Any& varg6, const css::uno::Any& varg7, const css::uno::Any& varg8, const css::uno::Any& varg9, const css::uno::Any& varg10, const css::uno::Any& varg11, const css::uno::Any& varg12, const css::uno::Any& varg13, const css::uno::Any& varg14, const css::uno::Any& varg15, const css::uno::Any& varg16, const css::uno::Any& varg17, const css::uno::Any& varg18, const css::uno::Any& varg19, const css::uno::Any& varg20, const css::uno::Any& varg21, const css::uno::Any& varg22, const css::uno::Any& varg23, const css::uno::Any& varg24, const css::uno::Any& varg25, const css::uno::Any& varg26, const css::uno::Any& varg27, const css::uno::Any& varg28, const css::uno::Any& varg29, const css::uno::Any& varg30 ) throw (css::uno::RuntimeException);
-     virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException);
--
-+    virtual void SAL_CALL Quit(  ) throw (::com::sun::star::uno::RuntimeException);
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-diff --git vbahelper/source/vbahelper/vbaapplicationbase.cxx vbahelper/source/vbahelper/vbaapplicationbase.cxx
-index b73013f..73e7db2 100644
---- vbahelper/source/vbahelper/vbaapplicationbase.cxx
-+++ vbahelper/source/vbahelper/vbaapplicationbase.cxx
-@@ -44,6 +44,13 @@
- #include "vbacommandbars.hxx"
- #include <svx/msvbahelper.hxx>
- 
-+// start basic includes
-+#include <basic/sbx.hxx>
-+#include <basic/sbstar.hxx>
-+#include <basic/sbuno.hxx>
-+#include <basic/sbmeth.hxx>
-+#include <basic/sbmod.hxx>
-+// end basic includes
- using namespace com::sun::star;
- using namespace ooo::vba;
- 
-@@ -194,4 +201,18 @@ VbaApplicationBase::getServiceNames()
- 	return aServiceNames;
- }
- 
--
-+void VbaApplicationBase::Quit() throw (uno::RuntimeException)
-+{
-+    // need to stop basic
-+    SbMethod* pMeth = StarBASIC::GetActiveMethod();
-+    if ( pMeth )
-+    {
-+        SbModule* pMod = dynamic_cast< SbModule* >( pMeth->GetParent() );
-+        if ( pMod )
-+        { 
-+            StarBASIC* pBasic = dynamic_cast< StarBASIC* >( pMod->GetParent() );
-+            if ( pBasic )
-+                pBasic->QuitAndExitApplication();
-+        }
-+    }
-+}
diff --git a/applied_patches/0514-layout-accessibility-dispose-only-once.diff b/applied_patches/0397-layout-accessibility-dispose-only-once.diff
similarity index 100%
rename from applied_patches/0514-layout-accessibility-dispose-only-once.diff
rename to applied_patches/0397-layout-accessibility-dispose-only-once.diff
diff --git a/applied_patches/0397-vba-commandbar-rework.diff b/applied_patches/0397-vba-commandbar-rework.diff
deleted file mode 100644
index 96b3bbc4e..000000000
--- a/applied_patches/0397-vba-commandbar-rework.diff
+++ /dev/null
@@ -1,2079 +0,0 @@
-diff --git oovbaapi/ooo/vba/XCommandBarControl.idl oovbaapi/ooo/vba/XCommandBarControl.idl
-index ea0c612..167bce8 100644
---- oovbaapi/ooo/vba/XCommandBarControl.idl
-+++ oovbaapi/ooo/vba/XCommandBarControl.idl
-@@ -54,6 +54,7 @@ interface XCommandBarControl
-     [attribute] string Caption;
-     [attribute] string OnAction;
-     [attribute] boolean Visible;
-+    [attribute, readonly] long Type;
-     
-     void Delete() raises ( com::sun::star::script::BasicErrorException );
-     any Controls( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
-diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx
-index d8e5a22..3773474 100644
---- vbahelper/inc/vbahelper/vbahelper.hxx
-+++ vbahelper/inc/vbahelper/vbahelper.hxx
-@@ -95,6 +95,8 @@ namespace ooo
-         VBAHELPER_DLLPUBLIC sal_Int32 getPointerStyle( const css::uno::Reference< css::frame::XModel >& );
-         VBAHELPER_DLLPUBLIC void setCursorHelper( const css::uno::Reference< css::frame::XModel >& xModel, const Pointer& rPointer, sal_Bool bOverWrite );
-         VBAHELPER_DLLPUBLIC void setDefaultPropByIntrospection( const css::uno::Any& aObj, const css::uno::Any& aValue  ) throw ( css::uno::RuntimeException );
-+        VBAHELPER_DLLPUBLIC css::uno::Any getPropertyValue( const css::uno::Sequence< css::beans::PropertyValue >& aProp, const rtl::OUString& aName );
-+        VBAHELPER_DLLPUBLIC sal_Bool setPropertyValue( css::uno::Sequence< css::beans::PropertyValue >& aProp, const rtl::OUString& aName, const css::uno::Any& aValue );
- 
- class VBAHELPER_DLLPUBLIC Millimeter
- {
-diff --git vbahelper/source/vbahelper/makefile.mk vbahelper/source/vbahelper/makefile.mk
-index 61155e6..bd57415 100644
---- vbahelper/source/vbahelper/makefile.mk
-+++ vbahelper/source/vbahelper/makefile.mk
-@@ -46,6 +46,7 @@ SLOFILES=\
-     $(SLO)$/vbacommandbar.obj \
-     $(SLO)$/vbacommandbarcontrols.obj \
-     $(SLO)$/vbacommandbarcontrol.obj \
-+    $(SLO)$/vbacommandbarhelper.obj \
-     $(SLO)$/vbaapplicationbase.obj \
-     $(SLO)$/vbawindowbase.obj \
-     $(SLO)$/vbadocumentbase.obj \
-diff --git vbahelper/source/vbahelper/vbacommandbar.cxx vbahelper/source/vbahelper/vbacommandbar.cxx
-index a74ccd5..43abe41 100644
---- vbahelper/source/vbahelper/vbacommandbar.cxx
-+++ vbahelper/source/vbahelper/vbacommandbar.cxx
-@@ -32,6 +32,8 @@
-  *    MA  02111-1307  USA
-  *
-  ************************************************************************/
-+#include "vbacommandbar.hxx" 
-+#include "vbacommandbarcontrols.hxx" 
- #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
- #include <com/sun/star/frame/XFrame.hpp>
- #include <com/sun/star/frame/XDesktop.hpp>
-@@ -40,141 +42,13 @@
- #include <com/sun/star/container/XNameContainer.hpp>
- #include <ooo/vba/office/MsoBarType.hpp>
- 
--#include "vbacommandbar.hxx"
--#include "vbacommandbarcontrols.hxx"
--
- using namespace com::sun::star;
- using namespace ooo::vba;
- 
--ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< frame::XModel >& xModel, sal_Int32 nModuleType ) throw (uno::RuntimeException) : CommandBar_BASE( xParent, xContext ), m_xModel( xModel )
--{
--    // it's a menu bar
--    // only supporting factory menus ( no custom menus )
--    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
--    initCommandBar();
--    switch( nModuleType )
--    {
--        case 0:
--            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" );
--            break;
--        case 1:
--            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
--            break;
--        default:
--            m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
--    }
--    getMenuSettings();
--    m_bIsMenu = sal_True;
--    m_bCustom = sal_False;
--}
--ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< frame::XModel >& xModel, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw (uno::RuntimeException) :  CommandBar_BASE( xParent, xContext ), m_xModel( xModel )
-+ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const uno::Reference< container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Bool bIsMenu, sal_Bool bTemporary ) throw( uno::RuntimeException ) : CommandBar_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl ), m_bIsMenu( bIsMenu ), m_bTemporary( bTemporary )
- {
--    // it's a tool bar
--    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
--    initCommandBar();
--    m_bTemporary = bTemporary;
--    m_bCreate = bCreate;
--    // get OOo ToolBarName
--    CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
--    if( iter != mCommandBarNameMap.end() )
--    {
--        m_sToolBarName = iter->second;
--    }
--    else
--    {
--        m_sToolBarName = sToolBarName;
--    }
--    m_sUIName = m_sToolBarName;
--    m_bIsMenu = sal_False;
--    getToolBarSettings( m_sToolBarName );
--}
--void
--ScVbaCommandBar::initCommandBar() throw (uno::RuntimeException)
--{
--    m_pScVbaCommandBars = dynamic_cast< ScVbaCommandBars* >( m_xParentHardRef.get() );
--    if ( !m_pScVbaCommandBars )
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBars"), uno::Reference< uno::XInterface >() );
--    m_bIsMenu = sal_False;
--    m_bCustom = sal_False;
--    m_bTemporary = sal_True;
--    m_sToolBarName = rtl::OUString::createFromAscii("");
--    m_sUIName = rtl::OUString::createFromAscii("");
--    m_sMenuModuleName = m_pScVbaCommandBars->GetModuleName();
--}
--void
--ScVbaCommandBar::getToolBarSettings( rtl::OUString sToolBarName ) throw( uno::RuntimeException )
--{
--    rtl::OUString sFactoryToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/") + sToolBarName.toAsciiLowerCase();
--    rtl::OUString sCustomToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/custom_toolbar_") + sToolBarName;
--    uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
--    uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
--    m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_pScVbaCommandBars->GetModuleName() ), uno::UNO_QUERY_THROW );
--    m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
--    if( m_xUICfgManager->hasSettings( sFactoryToolBar ) )
--    {
--        // exsiting standard ToolBar
--        m_xBarSettings.set( m_xUICfgManager->getSettings( sFactoryToolBar, sal_True ), uno::UNO_QUERY_THROW );
--        m_sToolBarName = sFactoryToolBar;
--    }
--    else if( m_xUICfgManager->hasSettings( sCustomToolBar ) )
--    {
--        // exisiting custom ToolBar
--        m_xBarSettings.set( m_xUICfgManager->getSettings( sCustomToolBar, sal_True ), uno::UNO_QUERY_THROW );
--        m_sToolBarName = sCustomToolBar;
--        m_bCustom = sal_True;
--    }
--    else if( m_bCreate )
--    {
--        // new custom ToolBar
--        m_xBarSettings.set( m_xUICfgManager->createSettings(), uno::UNO_QUERY_THROW );
--        m_sToolBarName = sCustomToolBar;
--        m_bCustom = sal_True;
--        addCustomBar();
--    }
--    else
--        throw uno::RuntimeException( rtl::OUString::createFromAscii("ToolBar do not exist"), uno::Reference< uno::XInterface >() );
--    if( m_pScVbaCommandBars->GetWindows()->hasByName( m_sToolBarName ) )
--    {
--        uno::Any aToolBar = m_pScVbaCommandBars->GetWindows()->getByName( m_sToolBarName );
--        aToolBar >>= m_aToolBar; 
--    }
- }
--void
--ScVbaCommandBar::addCustomBar()
--{
--    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
--    xPropertySet->setPropertyValue(rtl::OUString::createFromAscii("UIName"), uno::makeAny( m_sUIName ));
- 
--    if( m_xUICfgManager->hasSettings(m_sToolBarName) )
--    {
--        m_xUICfgManager->replaceSettings( m_sToolBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
--    else
--    {
--        m_xUICfgManager->insertSettings( m_sToolBarName,  uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
--    if( !m_bTemporary )
--    {
--        m_xUICfgPers->store();
--    }
--}
--void 
--ScVbaCommandBar::getMenuSettings()
--{
--    try
--    {
--        rtl::OUString sMenuBar = rtl::OUString::createFromAscii( "private:resource/menubar/menubar" );
--        uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
--        uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
--        m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_sMenuModuleName ), uno::UNO_QUERY_THROW );
--        m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
--        m_xBarSettings.set( m_xUICfgManager->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW );
--    } 
--    catch ( uno::Exception e)
--    {
--        OSL_TRACE( "getMenuSetting got a error\n" );
--    }
--}
- ::rtl::OUString SAL_CALL
- ScVbaCommandBar::getName() throw ( uno::RuntimeException )
- {
-@@ -183,25 +57,27 @@ ScVbaCommandBar::getName() throw ( uno::RuntimeException )
-     uno::Any aName = xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") );
-     rtl::OUString sName;
-     aName >>= sName;
--    if( sName.getLength() < 1 && !m_bIsMenu )
-+    if( sName.getLength() < 1 )
-     {
--        uno::Reference< container::XNameAccess > xNameAccess( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
--        if( xNameAccess->hasByName( m_sToolBarName ) )
-+        if( m_bIsMenu )
-         {
--            beans::PropertyValues aToolBar; 
--            xNameAccess->getByName( m_sToolBarName ) >>= aToolBar;
--            sal_Int32 nCount = aToolBar.getLength();
--            beans::PropertyValue aPropertyValue;
--            for( sal_Int32 i = 0; i < nCount; i++ )
-+            if( m_sResourceUrl.equals( VbaCommandBarHelper::getMenuBarUrl() ) )
-             {
--                aPropertyValue = aToolBar[i];
--                if( aPropertyValue.Name.equals( rtl::OUString::createFromAscii("UIName") ) )
--                {
--                    aPropertyValue.Value >>= sName;
--                    return sName;
--                }
-+                if( pCBarHelper->getModuleId().equalsAscii("com.sun.star.sheet.SpreadsheetDocument") )
-+                    sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Worksheet Menu Bar") );
-+                else if( pCBarHelper->getModuleId().equalsAscii("com.sun.star.text.TextDocument") )
-+                    sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Menu Bar") );
-+                return sName;    
-             }
-         }
-+        // Toolbar name
-+        uno::Reference< container::XNameAccess > xNameAccess = pCBarHelper->getPersistentWindowState();
-+        if( xNameAccess->hasByName( m_sResourceUrl ) )
-+        {
-+            uno::Sequence< beans::PropertyValue > aToolBar; 
-+            xNameAccess->getByName( m_sResourceUrl ) >>= aToolBar;
-+            getPropertyValue( aToolBar, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ) ) >>= sName;
-+        }
-     }
-     return sName;
- }
-@@ -210,33 +86,37 @@ ScVbaCommandBar::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeExce
- {
-     uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
-     xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("UIName"), uno::makeAny( _name ) );
--    uno::Reference< container::XIndexAccess > xIndexAccess( m_xBarSettings, uno::UNO_QUERY_THROW );
-     
--    if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
-+    if( pCBarHelper->getAppCfgManager()->hasSettings( m_sResourceUrl ) )
-     {
--        m_xUICfgManager->replaceSettings( m_sToolBarName, xIndexAccess );
-+        pCBarHelper->getAppCfgManager()->replaceSettings( m_sResourceUrl, m_xBarSettings );
-     }
-     else
-     {
--        // toolbar not found
-+        pCBarHelper->getAppCfgManager()->insertSettings( m_sResourceUrl, m_xBarSettings );
-     }
-     if( !m_bTemporary )
-     {
--        m_xUICfgPers->store();
-+        pCBarHelper->persistChanges();
-     }
- }
- ::sal_Bool SAL_CALL 
- ScVbaCommandBar::getVisible() throw (uno::RuntimeException)
- {
-+    // menu bar is allways visible in OOo 
-+    if( m_bIsMenu )
-+        return sal_True;
-+
-     sal_Bool bVisible = sal_False;
-     try
-     {
--        sal_Int32 i = 0;
--        while( !m_aToolBar[i].Name.equals( rtl::OUString::createFromAscii( "Visible" ) ) )
-+        uno::Reference< container::XNameAccess > xNameAccess = pCBarHelper->getPersistentWindowState();
-+        if( xNameAccess->hasByName( m_sResourceUrl ) )
-         {
--            i++;
-+            uno::Sequence< beans::PropertyValue > aToolBar; 
-+            xNameAccess->getByName( m_sResourceUrl ) >>= aToolBar;
-+            getPropertyValue( aToolBar, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ) >>= bVisible;
-         }
--        m_aToolBar[i].Value >>= bVisible;
-     }
-     catch ( uno::Exception e )
-     {
-@@ -248,18 +128,18 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
- {
-     try
-     {
--        uno::Reference< frame::XFrame > xFrame( m_xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); 
-+        uno::Reference< frame::XFrame > xFrame( pCBarHelper->getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); 
-         uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
-         uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW );
-         if( _visible )
-         {
--            xLayoutManager->createElement( m_sToolBarName );
--            xLayoutManager->showElement( m_sToolBarName );
-+            xLayoutManager->createElement( m_sResourceUrl );
-+            xLayoutManager->showElement( m_sResourceUrl );
-         }
-         else
-         {
--            xLayoutManager->hideElement( m_sToolBarName );
--            xLayoutManager->destroyElement( m_sToolBarName );
-+            xLayoutManager->hideElement( m_sResourceUrl );
-+            xLayoutManager->destroyElement( m_sResourceUrl );
-         }
-     }
-     catch( uno::Exception e )
-@@ -284,45 +164,35 @@ ScVbaCommandBar::setEnabled( sal_Bool/* _enabled */ ) throw (uno::RuntimeExcepti
- }
- 
- void SAL_CALL 
--ScVbaCommandBar::Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
-+ScVbaCommandBar::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
- {
--    if( m_bCustom )
-+    if( pCBarHelper->getAppCfgManager()->hasSettings( m_sResourceUrl ) )
-     {
--        if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
--        {
--            m_xUICfgManager->removeSettings(m_sToolBarName);
--            // make it permanent
--            if( !m_bTemporary )
--            {
--                m_xUICfgPers->store();
--            }
--        }
--        else
-+        pCBarHelper->getAppCfgManager()->removeSettings(m_sResourceUrl);
-+        // make it permanent
-+        if( !m_bTemporary )
-         {
--            // toolbar not found
--            // TODO throw Error
--        }
--        uno::Reference< container::XNameContainer > xNameContainer( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
--        if( xNameContainer->hasByName( m_sToolBarName ) )
--        {
--            xNameContainer->removeByName( m_sToolBarName );
-+            pCBarHelper->persistChanges();
-         }
-     }
-+    else
-+    {
-+        // toolbar not found
-+        // TODO throw Error
-+    }
-+    uno::Reference< container::XNameContainer > xNameContainer( pCBarHelper->getPersistentWindowState(), uno::UNO_QUERY_THROW );
-+    if( xNameContainer->hasByName( m_sResourceUrl ) )
-+    {
-+        xNameContainer->removeByName( m_sResourceUrl );
-+    }
- }
- uno::Any SAL_CALL 
- ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
- {
--    sal_Int32 nIndex;
--    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >(), m_xModel ) );
-+    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, m_xBarSettings, pCBarHelper, m_xBarSettings, m_sResourceUrl ) );
-     if( aIndex.hasValue() )
-     {
--        if( aIndex >>= nIndex )
--        {
--            uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
--            return uno::makeAny( xCommandBarControl );
--        }
--        else
--            throw uno::RuntimeException( rtl::OUString::createFromAscii(  "invalid index" ), uno::Reference< uno::XInterface >() );
-+        return xCommandBarControls->Item( aIndex, uno::Any() );
-     }
-     return uno::makeAny( xCommandBarControls );
- }
-diff --git vbahelper/source/vbahelper/vbacommandbar.hxx vbahelper/source/vbahelper/vbacommandbar.hxx
-index 52f63bc..5c9b13e 100644
---- vbahelper/source/vbahelper/vbacommandbar.hxx
-+++ vbahelper/source/vbahelper/vbacommandbar.hxx
-@@ -42,52 +42,25 @@
- #include <com/sun/star/beans/PropertyValues.hpp>
- 
- #include <vbahelper/vbahelperinterface.hxx>
--#include "vbacommandbars.hxx"
-+#include "vbacommandbarhelper.hxx"
- 
- #include <map>
--typedef std::map< const rtl::OUString, rtl::OUString > CommandBarNameMap;
--typedef std::pair< const rtl::OUString, rtl::OUString > CommandBarNamePair;
--const CommandBarNamePair namePair[] = { 
--    CommandBarNamePair(  rtl::OUString::createFromAscii("standard"), rtl::OUString::createFromAscii("standardbar") ),
--    CommandBarNamePair(  rtl::OUString::createFromAscii("formatting"), rtl::OUString::createFromAscii("formatobjectbar") ),
--};
--static const CommandBarNameMap mCommandBarNameMap( namePair, ( namePair + sizeof(namePair) / sizeof(namePair[0]) ) );
--
- 
- typedef InheritedHelperInterfaceImpl1< ov::XCommandBar > CommandBar_BASE;
- 
- class ScVbaCommandBar : public CommandBar_BASE
- {
- private:
--    rtl::OUString       m_sToolBarName;
--    rtl::OUString       m_sMenuModuleName;
--    rtl::OUString       m_sUIName;
--    sal_Bool            m_bTemporary;
--    sal_Bool            m_bIsMenu;
--    sal_Bool            m_bCustom;
--    sal_Bool            m_bCreate;
--    ScVbaCommandBars*   m_pScVbaCommandBars;
--    css::beans::PropertyValues  m_aToolBar;
--    // hard reference for parent
--    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
--    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
--    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
--    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
--    void initCommandBar() throw( css::uno::RuntimeException );
--protected:
--    void getToolBarSettings( rtl::OUString sToolBarName ) throw( css::uno::RuntimeException );
--    void getMenuSettings();
--    void addCustomBar();
--    css::uno::Reference< css::frame::XModel > m_xModel;
-+    VbaCommandBarHelperRef pCBarHelper;
-+    css::uno::Reference< css::container::XIndexAccess > m_xBarSettings;
-+    rtl::OUString   m_sResourceUrl;
-+    sal_Bool        m_bIsMenu;
-+    sal_Bool        m_bTemporary;
-+
- public:
--    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nModuleType ) throw( css::uno::RuntimeException );
--    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::frame::XModel >& xModel, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw( css::uno::RuntimeException );
-+    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Bool bIsMenu, sal_Bool bTemporary = sal_True ) throw( css::uno::RuntimeException );
-     
--    sal_Bool IsMenu() { return m_bIsMenu; };
--    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
--    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
--    css::uno::Reference< css::container::XIndexContainer > GetBarSettings() { return m_xBarSettings; };
--    rtl::OUString GetToolBarName() { return m_sToolBarName; };
-+    sal_Bool IsMenu() { return m_bIsMenu; }
- 
-     // Attributes
-     virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-index 1bea689..dd20256 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-@@ -33,198 +33,29 @@
-  *
-  ************************************************************************/
- #include "vbacommandbarcontrol.hxx"
--#include <basic/sbstar.hxx>
--#include <basic/sbmod.hxx>
--#include <basic/sbmeth.hxx>
-+#include "vbacommandbarcontrols.hxx"
- #include <vbahelper/vbahelper.hxx>
- #include <svx/msvbahelper.hxx>
- 
- using namespace com::sun::star;
- using namespace ooo::vba;
- 
--uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName )
-+ScVbaCommandBarControl::ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_sResourceUrl( sResourceUrl ), m_xCurrentSettings( xSettings ), m_xBarSettings( xBarSettings ), m_nPosition( 0 ), m_bTemporary( sal_True )
- {
--    sal_Int32 nCount = aPropertyValues.getLength();
--    for( sal_Int32 i = 0; i < nCount; i++ )
--    {
--        if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
--        {
--            return aPropertyValues[i].Value;
--        }
--    }
--    return uno::Any();
--}
--
--beans::PropertyValues lcl_repalcePropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName, uno::Any aValue )
--{
--    sal_Int32 nCount = aPropertyValues.getLength();
--    for( sal_Int32 i = 0; i < nCount; i++ )
--    {
--        if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
--        {
--            aPropertyValues[i].Value = aValue;
--            return aPropertyValues;
--        }
--    }
--    return aPropertyValues;
--}
--
--ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Int32 nType ) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_sName( sName ), m_nPosition( nPosition ), m_nType( nType )
--{
--    // exsiting CommandBarBarControl
--    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
--    initObjects();
--    if( m_xBarSettings->hasElements() )
--    {
--        ScVbaCommandBarControl* pParentCommandBarControl = m_pCommandBarControls->GetParentCommandBarControl();
--        if( pParentCommandBarControl )
--        {
--            beans::PropertyValues aPropertyValues;
--            pParentCommandBarControl->GetCurrentSettings()->getByIndex( pParentCommandBarControl->GetPosition() ) >>= aPropertyValues;
--            pParentCommandBarControl->SetPropertyValues( aPropertyValues );
--            m_xCurrentSettings.set( lcl_getPropertyValue( pParentCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY_THROW );
--        }
--        if( !m_xCurrentSettings.is() )
--        {
--            m_xCurrentSettings.set( m_xUICfgManager->getSettings( m_pCommandBarControls->GetParentToolBarName(), sal_True ), uno::UNO_QUERY_THROW );
--        }
--    }
--    if( m_bIsMenu )
--    {
--        m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
--    }
--    else
--    {
--        m_sBarName = m_pCommandBarControls->GetParentToolBarName();
--    }
--    m_bTemporary = sal_True;
--}
--ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType) throw (uno::RuntimeException) :  CommandBarControl_BASE( xParent, xContext ), m_nPosition( nPosition ), m_bTemporary( bTemporary ), m_nType( nType )
--{
--    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
--    initObjects();
--    if( sName.getLength() > 0 )
--    {
--        m_sName = sName;
--    }
--    m_sCommand = rtl::OUString::createFromAscii("vnd.openoffice.org:") + sName;
--    if( m_bIsMenu )
--    {
--        m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
--        createNewMenuBarControl();
--    }
--    else
--    {
--        m_sBarName = m_pCommandBarControls->GetParentToolBarName();
--        createNewToolBarControl();
--    }
- }
- 
--void
--ScVbaCommandBarControl::initObjects() throw (uno::RuntimeException)
-+ScVbaCommandBarControl::ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_sResourceUrl( sResourceUrl ), m_xCurrentSettings( xSettings ), m_xBarSettings( xBarSettings ), m_nPosition( nPosition ), m_bTemporary( bTemporary )
- {
--    m_pCommandBarControls = dynamic_cast< ScVbaCommandBarControls* >( m_xParentHardRef.get() );
--    if( !m_pCommandBarControls )
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBarControls"), uno::Reference< uno::XInterface >() );
--    m_xUICfgManager.set( m_pCommandBarControls->GetUICfgManager(), uno::UNO_QUERY_THROW );
--    m_xUICfgPers.set( m_pCommandBarControls->GetUICfgPers(), uno::UNO_QUERY_THROW );
--    m_xBarSettings.set( m_pCommandBarControls->GetBarSettings(), uno::UNO_QUERY_THROW );
--    m_bIsMenu = m_pCommandBarControls->IsMenu();
--    m_sName = rtl::OUString::createFromAscii( "Custom" );
--}
--
--void
--ScVbaCommandBarControl::createNewMenuBarControl()
--{
--    uno::Reference< lang::XSingleComponentFactory > xMenuMSF( m_xBarSettings, uno::UNO_QUERY_THROW );
--
--    uno::Sequence< beans::PropertyValue > aPropertys;
--    if( m_nType == office::MsoControlType::msoControlPopup )
--        aPropertys = uno::Sequence< beans::PropertyValue >( 4 );
--    else
--        aPropertys = uno::Sequence< beans::PropertyValue >( 3 );
--
--    aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
--    aPropertys[0].Value <<= m_sCommand; 
--    aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
--    aPropertys[1].Value <<= m_sName; 
--    aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
--    aPropertys[2].Value <<= sal_Int32(0); 
--
--    if( m_nType == office::MsoControlType::msoControlPopup )
--    {
--        aPropertys[3].Name = rtl::OUString::createFromAscii("ItemDescriptorContainer");
--        aPropertys[3].Value <<= xMenuMSF->createInstanceWithContext( mxContext );
--    }    
--
--    if( m_pCommandBarControls->GetParentCommandBar() != NULL )
--    {
--        // create a new menu
--        m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
--        m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
--    }
--    else if( m_pCommandBarControls->GetParentCommandBarControl() != NULL )
--    {
--        // create a new menu entry
--        ScVbaCommandBarControl* pPc = m_pCommandBarControls->GetParentCommandBarControl();
--        beans::PropertyValues aPropertyValues;
--        pPc->GetCurrentSettings()->getByIndex( pPc->GetPosition() ) >>= aPropertyValues;
--        pPc->SetPropertyValues( aPropertyValues );
--        
--        // has the property already been set?
--        if( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ).hasValue() )
--        {
--            lcl_repalcePropertyValue(  pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer"), uno::makeAny( xMenuMSF->createInstanceWithContext( mxContext ) ) );
--            pPc->GetCurrentSettings()->replaceByIndex( pPc->GetPosition(), uno::makeAny( pPc->GetPropertyValues() ) );
--        }
--        m_xCurrentSettings.set( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY_THROW );
--        m_xCurrentSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
--    }
--    if( m_xUICfgManager->hasSettings( m_sBarName ) )
--    {
--        m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
--    else
--    {
--        m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
--    if( !m_bTemporary )
--    {
--        m_xUICfgPers->store();
--    }
-+    m_xCurrentSettings->getByIndex( nPosition ) >>= m_aPropertyValues;
- }
- 
--void
--ScVbaCommandBarControl::createNewToolBarControl()
-+void ScVbaCommandBarControl::ApplyChange() throw ( uno::RuntimeException )
- {
--    uno::Sequence< beans::PropertyValue > aPropertys(4);
--    aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
--    aPropertys[0].Value <<= m_sCommand; 
--    aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
--    aPropertys[1].Value <<= m_sName; 
--    aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
--    aPropertys[2].Value <<= sal_Int32(0); 
--    aPropertys[3].Name = rtl::OUString::createFromAscii("IsVisible");
--    aPropertys[3].Value <<= sal_True; 
--
--    m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
--    uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
--    rtl::OUString sUIName;
--    xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") ) >>= sUIName;
--
--    m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
--    if( m_xUICfgManager->hasSettings( m_sBarName ) )
--    {
--        m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
--    else
--    {
--        m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--    }
-+    uno::Reference< container::XIndexContainer > xIndexContainer( m_xCurrentSettings, uno::UNO_QUERY_THROW );
-+    xIndexContainer->replaceByIndex( m_nPosition, uno::makeAny( m_aPropertyValues ) );
-+    pCBarHelper->getAppCfgManager()->replaceSettings( m_sResourceUrl, m_xBarSettings );
-     if( !m_bTemporary )
--    {
--        m_xUICfgPers->store();
--    }
-+        pCBarHelper->persistChanges();
- }
- 
- ::rtl::OUString SAL_CALL
-@@ -232,145 +63,109 @@ ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException )
- {
-     // "Label" always empty
-     rtl::OUString sCaption;
--    beans::PropertyValues aPropertyValues;
--    if( m_xCurrentSettings.is() )
--    {
--        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
--        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
--    }
--    else if( m_xBarSettings.is() )
--    {
--        m_xBarSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
--        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
--    }
-+    getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
-     return sCaption;
- }
-+
- void SAL_CALL 
- ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
- {
--    if( m_xCurrentSettings.is() )
--    {
--        beans::PropertyValues aPropertyValues;
--        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
--        beans::PropertyValues aNewPropertyValues;
--        aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label"), uno::makeAny( _caption ) );
--        m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
--        if( m_xUICfgManager->hasSettings( m_sBarName ) )
--        {
--            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        else
--        {
--            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        // make it permanent
--        if( !m_bTemporary )
--        {
--            m_xUICfgPers->store();
--        }
--    }
-+    rtl::OUString sCaption = _caption.replace('&','~');
-+    setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("Label"), uno::makeAny( sCaption ) );
-+    ApplyChange();
- }
-+
- ::rtl::OUString SAL_CALL 
- ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException)
- {
--    if( m_xCurrentSettings.is() )
--    {
--        beans::PropertyValues aPropertyValues;
--        m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
--        rtl::OUString sCommandURL;
--        lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
--        return sCommandURL;
--    }
--    return ::rtl::OUString();
-+    rtl::OUString sCommandURL;
-+    getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL") ) >>= sCommandURL;
-+    return sCommandURL;
- }
-+
- void SAL_CALL 
- ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException)
- {
--    if( m_xCurrentSettings.is() )
-+    // get the current model
-+    uno::Reference< frame::XModel > xModel( pCBarHelper->getModel() ); 
-+    VBAMacroResolvedInfo aResolvedMacro = ooo::vba::resolveVBAMacro( getSfxObjShell( xModel ), _onaction, true );
-+    if ( aResolvedMacro.IsResolved() )
-     {
--        // get the current model
--        VBAMacroResolvedInfo aResolvedMacro = ooo::vba::resolveVBAMacro( getSfxObjShell( m_pCommandBarControls->GetModel() ), _onaction, true );
--        if ( aResolvedMacro.IsResolved() )
--        {
--            rtl::OUString aCommandURL = ooo::vba::makeMacroURL( aResolvedMacro.ResolvedMacro() );
-+        rtl::OUString aCommandURL = ooo::vba::makeMacroURL( aResolvedMacro.ResolvedMacro() );
- 		OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
--            beans::PropertyValues aPropertyValues;
--            m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
--            beans::PropertyValues aNewPropertyValues;
--            aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
--            m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
--            if( m_xUICfgManager->hasSettings( m_sBarName ) )
--            {
--                m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--            }
--            else
--            {
--                m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--            }
--            // make it permanent
--            if( !m_bTemporary )
--            {
--                m_xUICfgPers->store();
--            }
--        }
-+        setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
-+        ApplyChange();
-     }
- }
-+
- ::sal_Bool SAL_CALL 
- ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException)
- {
--    // not possible in UNO?
--    return sal_True;
-+    sal_Bool bVisible = sal_True;
-+    uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible") );
-+    if( aValue.hasValue() )
-+        aValue >>= bVisible;
-+    return bVisible;
- }
- void SAL_CALL 
--ScVbaCommandBarControl::setVisible( ::sal_Bool /*_visible*/ ) throw (uno::RuntimeException)
-+ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
- {
--    // "IsVisilbe"
-+    uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible") );
-+    if( aValue.hasValue() )
-+    {
-+        setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible"), uno::makeAny( _visible ) );
-+        ApplyChange();
-+    }
- }
-+
- void SAL_CALL 
--ScVbaCommandBarControl::Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
-+ScVbaCommandBarControl::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
- {
-     if( m_xCurrentSettings.is() )
-     {
--        m_xCurrentSettings->removeByIndex( m_nPosition );
-+        uno::Reference< container::XIndexContainer > xIndexContainer( m_xCurrentSettings, uno::UNO_QUERY_THROW );
-+        xIndexContainer->removeByIndex( m_nPosition );
- 
--        if( m_xUICfgManager->hasSettings( m_sBarName ) )
-+        if( pCBarHelper->getAppCfgManager()->hasSettings( m_sResourceUrl ) )
-         {
--            m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+            pCBarHelper->getAppCfgManager()->replaceSettings( m_sResourceUrl, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-         }
-         else
-         {
--            m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-+            pCBarHelper->getAppCfgManager()->insertSettings( m_sResourceUrl, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
-         }
-         // make it permanent
-         if( !m_bTemporary )
-         {
--            m_xUICfgPers->store();
-+            pCBarHelper->persistChanges();
-         }
-     }
- }
-+
- uno::Any SAL_CALL 
- ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
- {
--    sal_Int32 nIndex;
--    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >(), m_pCommandBarControls->GetModel() ) );
-+    // only Popup Menu has controls
-+    uno::Reference< container::XIndexAccess > xSubMenu;
-+    getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER ) ) >>= xSubMenu;
-+    if( !xSubMenu.is() )
-+        throw uno::RuntimeException();
-+
-+    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, xSubMenu, pCBarHelper, m_xBarSettings, m_sResourceUrl ) );
-     if( aIndex.hasValue() )
-     {
--        if( aIndex >>= nIndex )
--        {
--            uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
--            return uno::makeAny( xCommandBarControl );
--        }
--        else
--            throw uno::RuntimeException( rtl::OUString::createFromAscii( "invalid index" ), uno::Reference< uno::XInterface >() );
-+        return xCommandBarControls->Item( aIndex, uno::Any() );
-     }
-     return uno::makeAny( xCommandBarControls );
- }
-+
- rtl::OUString& 
- ScVbaCommandBarControl::getServiceImplName()
- {
- 	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControl") );
- 	return sImplName;
- }
-+
- uno::Sequence<rtl::OUString> 
- ScVbaCommandBarControl::getServiceNames()
- {
-@@ -384,12 +179,11 @@ ScVbaCommandBarControl::getServiceNames()
- }
- 
- //////////// ScVbaCommandBarPopup //////////////////////////////
--ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlPopup )
--{
--}
--
--ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlPopup ) 
-+ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
- {
-+    m_nPosition = nPosition;
-+    m_bTemporary = bTemporary;
-+    m_xCurrentSettings->getByIndex( m_nPosition ) >>= m_aPropertyValues;
- }
- 
- rtl::OUString& 
-@@ -411,12 +205,11 @@ ScVbaCommandBarPopup::getServiceNames()
- }
- 
- //////////// ScVbaCommandBarButton //////////////////////////////
--ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlButton )
--{
--}
--
--ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlButton) 
-+ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
- {
-+    m_nPosition = nPosition;
-+    m_bTemporary = bTemporary;
-+    m_xCurrentSettings->getByIndex( m_nPosition ) >>= m_aPropertyValues;
- }
- 
- rtl::OUString& 
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrol.hxx vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
-index c1a8b07..f40ad82 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
-@@ -39,44 +39,30 @@
- #include <ooo/vba/XCommandBarPopup.hpp>
- #include <ooo/vba/XCommandBarButton.hpp>
- #include <ooo/vba/office/MsoControlType.hpp>
--
- #include <vbahelper/vbahelperinterface.hxx>
--#include "vbacommandbarcontrols.hxx"
-+#include "vbacommandbarhelper.hxx"
-+#include <cppuhelper/implbase1.hxx>
- 
- typedef InheritedHelperInterfaceImpl1< ov::XCommandBarControl > CommandBarControl_BASE;
- 
- class ScVbaCommandBarControl : public CommandBarControl_BASE
- {
--private:
--    rtl::OUString       m_sName;
--    rtl::OUString       m_sBarName;
--    rtl::OUString       m_sCommand;
-+protected:
-+    VbaCommandBarHelperRef pCBarHelper;
-+    rtl::OUString       m_sResourceUrl;
-+    css::uno::Reference< css::container::XIndexAccess >          m_xCurrentSettings;
-+    css::uno::Reference< css::container::XIndexAccess >          m_xBarSettings;
-+    css::uno::Sequence< css::beans::PropertyValue >              m_aPropertyValues;
-+
-     sal_Int32           m_nPosition;
-     sal_Bool            m_bTemporary;
--    sal_Int32           m_nType;
--    sal_Bool            m_bIsMenu;
--    ScVbaCommandBarControls*        m_pCommandBarControls;
--    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
--    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
--    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
--    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
--    css::uno::Reference< css::container::XIndexContainer >          m_xCurrentSettings;
--    css::beans::PropertyValues                                      m_aPropertyValues;
--    
--    void initObjects() throw (css::uno::RuntimeException);
--    void createNewMenuBarControl();
--    void createNewToolBarControl();
-+
-+private:
-+    void ApplyChange() throw (css::uno::RuntimeException);
-+
- public:
--    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition = 0, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
--    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
--    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
--    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
--    css::uno::Reference< css::container::XIndexContainer >  GetBarSettings() { return m_xBarSettings; };
--    sal_Bool IsMenu() { return m_bIsMenu; };
--    sal_Int32 GetPosition() { return m_nPosition; };
--    css::uno::Reference< css::container::XIndexContainer > GetCurrentSettings() { return m_xCurrentSettings; };
--    css::beans::PropertyValues GetPropertyValues() { return m_aPropertyValues; };
--    void SetPropertyValues( css::beans::PropertyValues aPropertyValues ) { m_aPropertyValues = aPropertyValues; };
-+    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-     
-     // Attributes
-     virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
-@@ -85,6 +71,10 @@ public:
-     virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException);
-     virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
-+    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException)
-+    {
-+        return ov::office::MsoControlType::msoControlButton;
-+    }
- 
-     // Methods
-     virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-@@ -99,8 +89,12 @@ typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarPop
- class ScVbaCommandBarPopup : public CommandBarPopup_BASE
- {
- public:
--    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
--    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+
-+    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException)
-+    {
-+        return ov::office::MsoControlType::msoControlPopup;
-+    }
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-@@ -110,8 +104,12 @@ typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarBut
- class ScVbaCommandBarButton : public CommandBarButton_BASE
- {
- public:
--    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
--    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+
-+    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException)
-+    {
-+        return ov::office::MsoControlType::msoControlButton;
-+    }
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrols.cxx vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-index c6adbc2..ea56a09 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-@@ -38,8 +38,6 @@
- using namespace com::sun::star;
- using namespace ooo::vba;
- 
--uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName );
--
- typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarControlEnumeration_BASE;
- class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE
- {
-@@ -58,272 +56,183 @@ public:
-     {
-         if( hasMoreElements() )
-         {
--            rtl::OUString sName = m_pCommandBarControls->GetControlNameByIndex( m_nCurrentPosition );
--            m_nCurrentPosition = m_nCurrentPosition + 1;
--            if( sName.getLength() > 0 )
--                return m_pCommandBarControls->createCollectionObject( uno::makeAny( sName ) );
--            else
--                return nextElement();
-+            return m_pCommandBarControls->createCollectionObject( uno::makeAny( m_nCurrentPosition++ ) );
-         }
-         else
-             throw container::NoSuchElementException();
-     }
- };
- 
--ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess> xIndexAccess, const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess ), m_xModel( xModel )
-+ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess>& xIndexAccess, VbaCommandBarHelperRef pHelper, const uno::Reference< container::XIndexAccess>& xBarSettings, const rtl::OUString& sResourceUrl ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl )
- {
--    m_bIsMenu = sal_False;
--    m_bHasElements = sal_False;
--    m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
--    m_pCommandBar = dynamic_cast< ScVbaCommandBar* >( m_xParentHardRef.get() );
--    m_pCommandBarControl = dynamic_cast< ScVbaCommandBarControl* >( m_xParentHardRef.get() );
--    if( m_pCommandBar )
--    {
--        m_xUICfgManager.set( m_pCommandBar->GetUICfgManager(), uno::UNO_QUERY_THROW );
--        m_xUICfgPers.set( m_pCommandBar->GetUICfgPers(), uno::UNO_QUERY_THROW );
--        m_xBarSettings.set( m_pCommandBar->GetBarSettings(), uno::UNO_QUERY_THROW );
--        m_bIsMenu = m_pCommandBar->IsMenu();
--        if( m_xBarSettings->hasElements() )
--        {
--            m_bHasElements = sal_True;
--        }
--    }
--    else if( m_pCommandBarControl )
--    {
--        m_xUICfgManager.set( m_pCommandBarControl->GetUICfgManager(), uno::UNO_QUERY_THROW );
--        m_xUICfgPers.set( m_pCommandBarControl->GetUICfgPers(), uno::UNO_QUERY_THROW );
--        beans::PropertyValues aPropertyValues;
--        m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
--        m_pCommandBarControl->SetPropertyValues( aPropertyValues );
--        m_xBarSettings.set( m_pCommandBarControl->GetCurrentSettings(), uno::UNO_QUERY_THROW );
--
--        uno::Any aValue = lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") );
--        if( aValue.hasValue() )
--        {
--            m_xCurrentSettings = m_pCommandBarControl->GetCurrentSettings();
--            m_bHasElements = sal_True;
--        }
--        else
--        {
--            m_bHasElements = sal_False;
--        }
--        m_bIsMenu = m_pCommandBarControl->IsMenu();
--    }
--    else
--    {
--        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parent needs to be a ScVbaCommandBar or a ScVbaCommandBarControl"), uno::Reference< uno::XInterface >() );
--    }
-+    m_bIsMenu = sResourceUrl.equalsAscii( ITEM_MENUBAR_URL ) ? sal_True : sal_False;
- }
--rtl::OUString
--ScVbaCommandBarControls::GetControlNameByIndex( const sal_Int32 nIndex ) throw ( uno::RuntimeException )
-+
-+uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateMenuItemData( const rtl::OUString& sCommandURL, const rtl::OUString& sHelpURL, const rtl::OUString& sLabel, sal_uInt16 nType, const uno::Any& aSubMenu )
- {
--    sal_Int32 nCount = 0;
--    if( m_bHasElements )
--    {
--        sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
--        for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
--        {
--            beans::PropertyValues aMenuValues;
--            m_xBarSettings->getByIndex( i ) >>= aMenuValues;
--            for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
--            {
--                if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
--                {
--                    nCount++;
--                    if( nIndex == nCount )
--                    {
--                        rtl::OUString sCommandURL;
--                        aMenuValues[j].Value >>= sCommandURL;
--                        sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
--                        if( ( nLastIndex != -1 ) && ( ( nLastIndex +1 ) < sCommandURL.getLength() ) )
--                        {
--                            sCommandURL = sCommandURL.copy( nLastIndex + 1 );
--                            return sCommandURL;
--                        }
--                    }
--                }
--            }
--        } 
--    }
--    else
--        throw  uno::RuntimeException( rtl::OUString::createFromAscii( "Out of bound" ), uno::Reference< uno::XInterface >() );
--    return rtl::OUString();
-+    uno::Sequence< beans::PropertyValue > aProps(5);
-+
-+    aProps[0].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_COMMANDURL );
-+    aProps[0].Value <<= sCommandURL;
-+    aProps[1].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_HELPURL );
-+    aProps[1].Value <<= sHelpURL;
-+    aProps[2].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_LABEL );
-+    aProps[2].Value <<= sLabel;
-+    aProps[3].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_TYPE );
-+    aProps[3].Value <<= nType;
-+    aProps[4].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER );
-+    aProps[4].Value = aSubMenu;
-+
-+    return aProps;
- }
- 
--// Attributes
--sal_Int32 SAL_CALL 
--ScVbaCommandBarControls::getCount() throw (uno::RuntimeException)
-+uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateToolbarItemData( const rtl::OUString& sCommandURL, const rtl::OUString& sHelpURL, const rtl::OUString& sLabel, sal_uInt16 nType, const uno::Any& aSubMenu, sal_Bool isVisible, sal_Int32 nStyle )
- {
--    sal_Int32 nCount = 0;
--    if( m_bHasElements )
--    {
--        sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
--        for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
--        {
--            beans::PropertyValues aMenuValues;
--            m_xBarSettings->getByIndex( i ) >>= aMenuValues;
--            for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
--            {
--                if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
--                {
--                    nCount++;
--                }
--            }
--        } 
--    }
--    return nCount;
-+    uno::Sequence< beans::PropertyValue > aProps(7);
-+
-+    aProps[0].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_COMMANDURL );
-+    aProps[0].Value <<= sCommandURL;
-+    aProps[1].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_HELPURL );
-+    aProps[1].Value <<= sHelpURL;
-+    aProps[2].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_LABEL );
-+    aProps[2].Value <<= sLabel;
-+    aProps[3].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_TYPE );
-+    aProps[3].Value <<= nType;
-+    aProps[4].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER );
-+    aProps[4].Value = aSubMenu;
-+    aProps[5].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_ISVISIBLE );
-+    aProps[5].Value <<= isVisible;
-+    aProps[6].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_STYLE );
-+    aProps[6].Value <<= nStyle;
-+
-+    return aProps;
- }
-+
- // XEnumerationAccess
- uno::Type SAL_CALL
- ScVbaCommandBarControls::getElementType() throw ( uno::RuntimeException )
- {
--    return XCommandBarControls::static_type( 0 );
-+    return XCommandBarControl::static_type( 0 );
- }
-+
- uno::Reference< container::XEnumeration >
- ScVbaCommandBarControls::createEnumeration() throw ( uno::RuntimeException )
- {
-     return uno::Reference< container::XEnumeration >( new CommandBarControlEnumeration( this ) );
- }
-+
- uno::Any
- ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
- {
--    // only surport the aSource as a name string, because this class is a API wrapper
--    rtl::OUString sName;
--    if( aSource >>= sName )
--    {
--        uno::Reference< container::XIndexContainer > xCurrentSettings;
--        beans::PropertyValues aPropertyValues;
--        if( m_pCommandBarControl )
--        {
--            m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
--            xCurrentSettings.set( lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY );
--            if( !xCurrentSettings.is() )
--            {
--                xCurrentSettings.set( m_xUICfgManager->getSettings( GetParentToolBarName(), sal_True ), uno::UNO_QUERY );
--            }
--        }
--
--        sal_Int32 nPosition = -1;
--        for( sal_Int32 i = 0; i < xCurrentSettings->getCount(); i++ )
--        {
--            xCurrentSettings->getByIndex( i ) >>= aPropertyValues;
--            // Label always empty in OOo
--            rtl::OUString sLabel;
--            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
--            if( sLabel.equalsIgnoreAsciiCase( sName ) )
--            {
--                nPosition = i;
--                break;
--            }
--            // using CammandURL to find
--            rtl::OUString sCommandURL;
--            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
--            sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
--            if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sCommandURL.getLength() ) )
--            {
--                sCommandURL = sCommandURL.copy( nLastIndex + 1 );
--            }
--            if( sCommandURL.equalsIgnoreAsciiCase( sName ) )
--            {
--                nPosition = i;
--                break;
--            }
--        }
--
--        if( nPosition  != -1 )
--        {
--            uno::Reference< container::XIndexContainer > xSubMenu;
--            lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ) >>= xSubMenu;
--            ScVbaCommandBarControl* pNewCommandBarControl = NULL;
--            if( xSubMenu.is() )
--                pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sName, nPosition );
--            else
--                pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sName, nPosition );
-+    sal_Int32 nPosition = -1;
-+    aSource >>= nPosition;
-+    uno::Sequence< beans::PropertyValue > aProps;
-+    m_xIndexAccess->getByIndex( nPosition ) >>= aProps;
-+    uno::Reference< container::XIndexAccess > xSubMenu;
-+    getPropertyValue( aProps, rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER ) ) >>= xSubMenu;
-+    ScVbaCommandBarControl* pNewCommandBarControl = NULL;
-+    if( xSubMenu.is() )
-+        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, sal_True );
-+    else
-+        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, sal_True );
- 
--            return uno::makeAny( uno::Reference< XCommandBarControl > ( pNewCommandBarControl ) );
--        }
--        else
--            throw uno::RuntimeException( rtl::OUString::createFromAscii("The CommandBarControl do not exist"), uno::Reference< uno::XInterface >() );
--        
--    }
--    return uno::Any();
-+    return uno::makeAny( uno::Reference< XCommandBarControl > ( pNewCommandBarControl ) );
- }
- 
- // Methods
- uno::Any SAL_CALL 
- ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*/ ) throw (uno::RuntimeException)
- {
-+    sal_Int32 nPosition = -1;
-     if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
-     {
--        return createCollectionObject( aIndex );
-+        rtl::OUString sName;
-+        aIndex >>= sName;
-+        nPosition = VbaCommandBarHelper::findControlByName( m_xIndexAccess, sName );
-     } 
--    sal_Int32 nIndex = 0;
--    if( aIndex >>= nIndex )
-+    else
-+    {
-+        aIndex >>= nPosition;
-+    }
-+
-+    if( nPosition < 0 || nPosition >= getCount() )
-     {
--        return createCollectionObject( uno::makeAny( GetControlNameByIndex( nIndex ) ) );
-+        throw uno::RuntimeException();
-     }
-     
--    return uno::Any();
-+    return createCollectionObject( uno::makeAny( nPosition ) ); 
- }
-+
- uno::Reference< XCommandBarControl > SAL_CALL 
--ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& /*Parameter*/, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException)
-+ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& Parameter, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException)
- {
-     // Parameter is not supported
-     // the following name needs to be individually created;
--    rtl::OUString sCaption( rtl::OUString::createFromAscii("custom Control") );
--    rtl::OUString sCommand( rtl::OUString::createFromAscii("macro:///Standard.Module1.Test()") );
--    sal_Int32 nType =0;
-+    rtl::OUString sLabel( rtl::OUString::createFromAscii("Custom") );
-+    rtl::OUString sCommandUrl = rtl::OUString::createFromAscii( CUSTOM_MENU_STR ) + sLabel;
-+    sal_Int32 nType = office::MsoControlType::msoControlButton;
-     sal_Int32 nPosition = 0;
--    sal_Int32 nId;
-     sal_Bool bTemporary = sal_True;
-     
-     if( Type.hasValue() )
--        if( Type >>= nType )
--        {
--            // evalute the type of the new control
--        }
--    if( Id.hasValue() )
--        if( Id >>= nId )
--        {
--            // evalute the action of the new control
--        }
-+    {
-+        Type >>= nType;
-+    }
-+
-+    if( nType != office::MsoControlType::msoControlButton &&
-+        nType != office::MsoControlType::msoControlPopup )
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+
-+    if( Id.hasValue() || Parameter.hasValue( ) )
-+    {
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+    }
-+
-     if( Before.hasValue() )
-         Before >>= nPosition;
-     else
--    {
--        // if Before is ignore, the new control should be placed at the end of the commandbars;
--        if( m_pCommandBar )
--            nPosition = getCount();
--        else if ( m_pCommandBarControl )
--        {
--            css::uno::Reference< css::container::XIndexContainer > xCurrentSettings;
--            xCurrentSettings.set( lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY );
--            if( xCurrentSettings.is() )
--            {
--                nPosition = xCurrentSettings->getCount();
--            }
--        }
--    }
-+        nPosition = m_xIndexAccess->getCount();
-+
-     if( Temporary.hasValue() )
--        if( Temporary >>= bTemporary )
--        {
--            // evalute the temporary of the new Control
--        }
-+        Temporary >>= bTemporary;
-     
--    ScVbaCommandBarControl* pNewCommandBarControl = NULL;
--    if( nType == office::MsoControlType::msoControlButton )
-+    uno::Any aSubMenu;
-+    if( nType == office::MsoControlType::msoControlPopup )
-     {
--        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sCaption, nPosition, bTemporary );
-+        // it is a Popmenu
-+        uno::Reference< lang::XSingleComponentFactory > xSCF( m_xBarSettings, uno::UNO_QUERY_THROW );
-+        aSubMenu <<= xSCF->createInstanceWithContext( mxContext );
-     }
--    else if ( nType == office::MsoControlType::msoControlPopup )
-+
-+    // create control 
-+    uno::Sequence< beans::PropertyValue > aProps;
-+    rtl::OUString sHelpUrl;
-+    sal_Int32 nItemType = 0;
-+    if( IsMenu() )
-     {
--        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sCaption, nPosition, bTemporary );
-+        aProps = CreateMenuItemData( sCommandUrl, sHelpUrl, sLabel, nItemType, aSubMenu );
-     }
-     else
-     {
--        pNewCommandBarControl = new ScVbaCommandBarControl( this, mxContext, sCaption, nPosition, bTemporary );
-+        sal_Bool isVisible = sal_True;
-+        sal_Int32 nStyle = 0;
-+        aProps = CreateToolbarItemData( sCommandUrl, sHelpUrl, sLabel, nItemType, aSubMenu, isVisible, nStyle );
-     }
- 
-+
-+    uno::Reference< container::XIndexContainer > xIndexContainer( m_xIndexAccess, uno::UNO_QUERY_THROW );
-+    xIndexContainer->insertByIndex( nPosition, uno::makeAny( aProps ) );
-+
-+    pCBarHelper->getAppCfgManager()->replaceSettings( m_sResourceUrl, m_xBarSettings );
-+    if( !bTemporary )
-+        pCBarHelper->persistChanges();
-+
-+    ScVbaCommandBarControl* pNewCommandBarControl = NULL;
-+    if( nType == office::MsoControlType::msoControlPopup )
-+        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary );
-+    else
-+        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary );
-+
-     return uno::Reference< XCommandBarControl >( pNewCommandBarControl );
- }
-    
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrols.hxx vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
-index f9ebe25..fa37f10 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
-@@ -36,47 +36,27 @@
- #define SC_VBA_COMMANDBARCONTROLS_HXX
- 
- #include <ooo/vba/XCommandBarControls.hpp>
--
- #include <vbahelper/vbahelperinterface.hxx>
--#include "vbacommandbar.hxx"
- #include <vbahelper/vbacollectionimpl.hxx>
--
--class ScVbaCommandBarControl;
-+#include "vbacommandbarhelper.hxx"
- 
- typedef CollTestImplHelper< ov::XCommandBarControls > CommandBarControls_BASE;
- 
- class ScVbaCommandBarControls : public CommandBarControls_BASE
- {
- private:
--    sal_Bool                    m_bIsMenu;
--    sal_Bool                    m_bHasElements;
--    ScVbaCommandBar*            m_pCommandBar; 
--    ScVbaCommandBarControl*     m_pCommandBarControl; 
--    css::uno::Reference< ov::XHelperInterface >               m_xParentHardRef;
--    css::uno::Reference< css::ui::XUIConfigurationManager >         m_xUICfgManager;
--    css::uno::Reference< css::ui::XUIConfigurationPersistence >     m_xUICfgPers;
--    css::uno::Reference< css::container::XIndexContainer >          m_xBarSettings;
--    css::uno::Reference< css::container::XIndexContainer >          m_xCurrentSettings;
--    css::uno::Reference< css::frame::XModel >          m_xModel;
-+    VbaCommandBarHelperRef pCBarHelper;
-+    css::uno::Reference< css::container::XIndexAccess >          m_xBarSettings;
-+    rtl::OUString       m_sResourceUrl;
-+    sal_Bool m_bIsMenu;
-+
-+    css::uno::Sequence< css::beans::PropertyValue > CreateMenuItemData( const rtl::OUString& sCommandURL, const rtl::OUString& sHelpURL, const rtl::OUString& sLabel, sal_uInt16 nType, const css::uno::Any& aSubMenu );
-+    css::uno::Sequence< css::beans::PropertyValue > CreateToolbarItemData( const rtl::OUString& sCommandURL, const rtl::OUString& sHelpURL, const rtl::OUString& sLabel, sal_uInt16 nType, const css::uno::Any& aSubMenu, sal_Bool isVisible, sal_Int32 nStyle );
- 
- public:
--    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess, const  css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException );
--    css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
--    css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
--    css::uno::Reference< css::container::XIndexContainer >  GetBarSettings() { return m_xBarSettings; };
--    sal_Bool IsMenu() { return m_bIsMenu; };
--    ScVbaCommandBar* GetParentCommandBar() { return m_pCommandBar; };
--    ScVbaCommandBarControl* GetParentCommandBarControl() { return m_pCommandBarControl; };
--    rtl::OUString GetParentToolBarName() 
--    { 
--        if( m_pCommandBar ) return m_pCommandBar->GetToolBarName();
--        else return rtl::OUString();
--    }
--    rtl::OUString GetControlNameByIndex( const sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
-+    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl ) throw( css::uno::RuntimeException );
-+    sal_Bool IsMenu(){ return m_bIsMenu; }
- 
--    css::uno::Reference< css::frame::XModel > GetModel() { return m_xModel; }
--    // Attributes
--    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
-     // XEnumerationAccess
-     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-diff --git vbahelper/source/vbahelper/vbacommandbarhelper.cxx vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-new file mode 100644
-index 0000000..7c59107
---- /dev/null
-+++ vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-@@ -0,0 +1,175 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbacommandbarhelper.hxx" 
-+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-+#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
-+#include <com/sun/star/ui/XModuleUIConfigurationManager.hpp>
-+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-+#include <com/sun/star/ui/XUIElement.hpp>
-+#ifndef _COM_SUN_STAR_UI_UIElementType_HPP_
-+#include <com/sun/star/ui/UIElementType.hpp>
-+#endif
-+#include <comphelper/processfactory.hxx>
-+#include <vbahelper/vbahelper.hxx>
-+#include <time.h>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+VbaCommandBarHelper::VbaCommandBarHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException) : mxContext( xContext ), mxModel( xModel )
-+{
-+    Init();
-+}
-+
-+void VbaCommandBarHelper::Init( ) throw (css::uno::RuntimeException)
-+{
-+    uno::Reference< css::ui::XUIConfigurationManagerSupplier > xUICfgSupplier( mxModel, uno::UNO_QUERY_THROW );
-+    m_xDocCfgMgr = xUICfgSupplier->getUIConfigurationManager();
-+
-+    uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel, uno::UNO_QUERY_THROW );
-+    if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") ) ) )
-+    {
-+        maModuleId = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") );
-+    }
-+    else if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) )
-+    {
-+        maModuleId = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument") );
-+    }
-+
-+    if( maModuleId.getLength() == 0 )
-+    {
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+    }
-+
-+	uno::Reference< lang::XMultiServiceFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-+        
-+	css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUICfgMgrSupp( xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ))), uno::UNO_QUERY_THROW );
-+
-+    m_xAppCfgMgr.set( xUICfgMgrSupp->getUIConfigurationManager( maModuleId ), uno::UNO_QUERY_THROW );
-+
-+	css::uno::Reference< css::container::XNameAccess > xNameAccess( xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.WindowStateConfiguration" ))), uno::UNO_QUERY_THROW );
-+
-+    m_xWindowState.set( xNameAccess->getByName( maModuleId ), uno::UNO_QUERY_THROW );
-+}
-+
-+css::uno::Reference< css::container::XIndexAccess > VbaCommandBarHelper::getMenuBarSettings() throw (css::uno::RuntimeException)
-+{
-+    return m_xAppCfgMgr->getSettings( getMenuBarUrl(), sal_True );
-+}
-+
-+sal_Bool VbaCommandBarHelper::persistChanges() throw (css::uno::RuntimeException)
-+{
-+    uno::Reference< css::ui::XUIConfigurationPersistence > xConfigPersistence( m_xAppCfgMgr, uno::UNO_QUERY_THROW );
-+    sal_Bool result = sal_False;
-+    if( xConfigPersistence->isModified() )
-+    {
-+        xConfigPersistence->store();
-+        result = sal_True;
-+    }
-+    return result;
-+}
-+
-+rtl::OUString VbaCommandBarHelper::getMenuBarUrl()
-+{
-+    static const rtl::OUString sMenuBarUrl( RTL_CONSTASCII_USTRINGPARAM( ITEM_MENUBAR_URL ) );
-+    return sMenuBarUrl;
-+}
-+
-+// return the resource url if found
-+rtl::OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException)
-+{
-+    rtl::OUString sUIName;
-+    rtl::OUString sResourceUrl;
-+    uno::Sequence< ::rtl::OUString > allNames = xNameAccess->getElementNames();
-+    for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
-+    {
-+        sResourceUrl = allNames[i];
-+        if(sResourceUrl.indexOf( rtl::OUString::createFromAscii( ITEM_TOOLBAR_URL ) ) == 0 )
-+        {
-+            //OSL_TRACE("VbaCommandBarHelper::findToolbarByName, toolbar resource url: %s", rtl::OUStringToOString( sResourceUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
-+            if( m_xAppCfgMgr->hasSettings( sResourceUrl ) )
-+            {
-+                uno::Reference< beans::XPropertySet > xPropertySet( m_xAppCfgMgr->getSettings( sResourceUrl, sal_False ), uno::UNO_QUERY_THROW );
-+                xPropertySet->getPropertyValue( rtl::OUString::createFromAscii(ITEM_DESCRIPTOR_UINAME) ) >>= sUIName;
-+              //  OSL_TRACE("VbaCommandBarHelper::findToolbarByName, toolbar ui name: %s", rtl::OUStringToOString( sUIName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+                if( sName.equalsIgnoreAsciiCase( sUIName ) )
-+                    return sResourceUrl;
-+            }
-+        }
-+    }
-+    return rtl::OUString();
-+}
-+
-+// if found, return the position of the control. if not found, return -1
-+sal_Int32 VbaCommandBarHelper::findControlByName( const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException)
-+{
-+    sal_Int32 nCount = xIndexAccess->getCount();
-+    css::uno::Sequence< css::beans::PropertyValue > aProps;
-+    for( sal_Int32 i = 0; i < nCount; i++ )
-+    {
-+        rtl::OUString sLabel;
-+        xIndexAccess->getByIndex( i ) >>= aProps;
-+        getPropertyValue( aProps, rtl::OUString::createFromAscii(ITEM_DESCRIPTOR_LABEL) ) >>= sLabel;
-+        // handle the hotkey character '~'
-+        rtl::OUString sNewLabel;
-+        sal_Int32 index = sLabel.indexOf( sal_Unicode('~') );
-+        if( index < 0 )
-+            sNewLabel = sLabel;
-+        else if( index == 0 )
-+            sNewLabel = sLabel.copy( index + 1);
-+        else if( index == sNewLabel.getLength() - 1 )
-+            sNewLabel = sLabel.copy(0, index );
-+        else
-+            sNewLabel = sLabel.copy( 0, index ) + sLabel.copy( index + 1 ); 
-+        OSL_TRACE("VbaCommandBarHelper::findControlByName, control name: %s", rtl::OUStringToOString( sNewLabel, RTL_TEXTENCODING_UTF8 ).getStr() );
-+        if( sName.equalsIgnoreAsciiCase( sNewLabel ) )
-+            return i;
-+    }
-+
-+    // not found
-+    return -1;
-+}
-+
-+rtl::OUString VbaCommandBarHelper::generateCustomURL()
-+{
-+    rtl::OUString url = rtl::OUString::createFromAscii( ITEM_TOOLBAR_URL );
-+    url += rtl::OUString::createFromAscii( CUSTOM_TOOLBAR_STR );
-+
-+    // use a random number to minimize possible clash with existing custom toolbars
-+    srand( unsigned( time( NULL ) ));
-+    url += rtl::OUString::valueOf( sal_Int64( rand() ), 16 );
-+    return url;
-+}
-diff --git vbahelper/source/vbahelper/vbacommandbarhelper.hxx vbahelper/source/vbahelper/vbacommandbarhelper.hxx
-new file mode 100644
-index 0000000..a6304bc
---- /dev/null
-+++ vbahelper/source/vbahelper/vbacommandbarhelper.hxx
-@@ -0,0 +1,105 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef VBA_COMMANDBARHELPER_HXX
-+#define VBA_COMMANDBARHELPER_HXX
-+
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <com/sun/star/frame/XModel.hpp>
-+#include <com/sun/star/uno/XComponentContext.hpp>
-+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
-+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
-+#include <com/sun/star/container/XIndexAccess.hpp>
-+#include <com/sun/star/container/XNameAccess.hpp>
-+#include <boost/shared_ptr.hpp>
-+
-+
-+static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
-+static const char ITEM_DESCRIPTOR_HELPURL[]     = "HelpURL";
-+static const char ITEM_DESCRIPTOR_CONTAINER[]   = "ItemDescriptorContainer";
-+static const char ITEM_DESCRIPTOR_LABEL[]       = "Label";
-+static const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
-+static const char ITEM_DESCRIPTOR_STYLE[]       = "Style";
-+static const char ITEM_DESCRIPTOR_ISVISIBLE[]   = "IsVisible";
-+static const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL";
-+static const char ITEM_DESCRIPTOR_UINAME[]		= "UIName";
-+
-+static const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar";
-+static const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/";
-+
-+static const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_";
-+static const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu";
-+
-+class VbaCommandBarHelper;
-+typedef ::boost::shared_ptr< VbaCommandBarHelper > VbaCommandBarHelperRef;
-+
-+class VbaCommandBarHelper
-+{
-+private:
-+    css::uno::Reference< css::uno::XComponentContext > mxContext;
-+    css::uno::Reference< css::frame::XModel > mxModel;
-+    css::uno::Reference< css::ui::XUIConfigurationManager > m_xDocCfgMgr; // current document
-+    css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr;
-+    css::uno::Reference< css::container::XNameAccess > m_xWindowState;
-+    rtl::OUString maModuleId;
-+
-+    void Init() throw (css::uno::RuntimeException);
-+public:
-+    VbaCommandBarHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException );
-+
-+    css::uno::Reference< css::frame::XModel > getModel() { return mxModel; }
-+
-+    css::uno::Reference< css::ui::XUIConfigurationManager > getDocCfgManager() throw (css::uno::RuntimeException)
-+    {
-+        return m_xDocCfgMgr;
-+    }
-+    css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager() throw (css::uno::RuntimeException)
-+    {
-+        return m_xAppCfgMgr;
-+    }
-+    css::uno::Reference< css::container::XIndexAccess > getMenuBarSettings() throw (css::uno::RuntimeException);
-+    css::uno::Reference< css::container::XNameAccess > getPersistentWindowState() throw (css::uno::RuntimeException)
-+    {
-+        return m_xWindowState;
-+    }
-+    sal_Bool persistChanges() throw (css::uno::RuntimeException);
-+
-+    const rtl::OUString getModuleId(){ return maModuleId; }
-+    static rtl::OUString getMenuBarUrl();
-+    rtl::OUString findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException);
-+    static sal_Int32 findControlByName( const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException);
-+    static rtl::OUString generateCustomURL();
-+};
-+
-+#endif//VBA_COMMANDBARHELPER_HXX
-diff --git vbahelper/source/vbahelper/vbacommandbars.cxx vbahelper/source/vbahelper/vbacommandbars.cxx
-index 3aae99b..0f7881e 100644
---- vbahelper/source/vbahelper/vbacommandbars.cxx
-+++ vbahelper/source/vbahelper/vbacommandbars.cxx
-@@ -35,6 +35,10 @@
- #include <com/sun/star/lang/XServiceInfo.hpp>
- #include <com/sun/star/frame/XDesktop.hpp>
- #include <com/sun/star/container/XNameAccess.hpp>
-+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-+#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
-+#include <com/sun/star/ui/XModuleUIConfigurationManager.hpp>
-+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
- 
- #include "vbacommandbars.hxx"
- #include "vbacommandbar.hxx"
-@@ -42,22 +46,21 @@
- using namespace com::sun::star;
- using namespace ooo::vba;
- 
--typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarEnumeration_BASE;
- 
--static rtl::OUString sSpreadsheetDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
--static rtl::OUString sTextDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" ) );
--static rtl::OUString sWindowStateConfUrl( rtl::OUString::createFromAscii( "com.sun.star.ui.WindowStateConfiguration" ) );
-+typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarEnumeration_BASE;
- 
- class CommandBarEnumeration : public CommandBarEnumeration_BASE
- {
-+    uno::Reference< XHelperInterface > m_xParent;
-     uno::Reference< uno::XComponentContext > m_xContext;
--    uno::Reference< XCommandBars > m_xCommandBars;
-+    VbaCommandBarHelperRef pCBarHelper;
-     uno::Sequence< rtl::OUString > m_sNames;
-     sal_Int32 m_nCurrentPosition;
--    uno::Reference< frame::XModel > m_xModel;
- public:
--    CommandBarEnumeration( const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBars > xCommandBars, const uno::Sequence< rtl::OUString > sNames, const uno::Reference< frame::XModel >& xModel ) : m_xContext( xContext ), m_xCommandBars( xCommandBars ), m_sNames( sNames ), m_nCurrentPosition( 0 ), m_xModel( xModel )
-+    CommandBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, VbaCommandBarHelperRef pHelper) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), pCBarHelper( pHelper ) , m_nCurrentPosition( 0 )
-     {
-+        uno::Reference< container::XNameAccess > xNameAccess = pCBarHelper->getPersistentWindowState();
-+        m_sNames = xNameAccess->getElementNames();
-     }
-     virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
-     {
-@@ -67,28 +70,14 @@ public:
-     }
-     virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
-     {
-+        // FIXME: should be add menubar
-         if( hasMoreElements() )
-         {
--            rtl::OUString sName( m_sNames[ m_nCurrentPosition ] );
--            m_nCurrentPosition = m_nCurrentPosition + 1;
--            if( sName.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 ) 
-+            rtl::OUString sResourceUrl( m_sNames[ m_nCurrentPosition++ ] );
-+            if( sResourceUrl.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 ) 
-             {
--                sal_Int32 nLastIndex = sName.lastIndexOf( rtl::OUString::createFromAscii( "/" ) );
--                if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sName.getLength() ) )
--                {
--                   sName = sName.copy( nLastIndex + 1);
--                   if( sName.getLength() > 0 )
--                   {
--                        uno::Reference< XHelperInterface > xHelperInterface( m_xCommandBars, uno::UNO_QUERY_THROW );
--                        uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( xHelperInterface, m_xContext, m_xModel,  sName, sal_True, sal_False ) );
--                        if( xCommandBar.is() )
--                            return uno::makeAny( xCommandBar );
--                        else
--                            return nextElement();
--                    }
--                    else
--                        return nextElement();
--                    }
-+                uno::Reference< container::XIndexAccess > xCBarSetting = pCBarHelper->getAppCfgManager()->getSettings( sResourceUrl, sal_True );
-+                uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, pCBarHelper, xCBarSetting, sResourceUrl, sal_False, sal_False ) );
-              }
-              else
-                 return nextElement();
-@@ -99,90 +88,99 @@ public:
-     }
- };
- 
--
--ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess > xIndexAccess, const uno::Reference< frame::XModel >& xModel ) : CommandBars_BASE( xParent, xContext, xIndexAccess ), m_xModel( xModel )
-+ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : CommandBars_BASE( xParent, xContext, xIndexAccess )
- {
--    retrieveObjects();
-+    pCBarHelper.reset( new VbaCommandBarHelper( mxContext, xModel ) );
-+    m_xNameAccess = pCBarHelper->getPersistentWindowState();
- }
--void
--ScVbaCommandBars::retrieveObjects() throw ( uno::RuntimeException )
-+
-+ScVbaCommandBars::~ScVbaCommandBars()
- {
--    uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
--    if( xServiceInfo->supportsService( sSpreadsheetDocumentUrl ) )
--    {
--        m_sModuleName = sSpreadsheetDocumentUrl;
--    }
--    else if( xServiceInfo->supportsService( sTextDocumentUrl ) )
--    {
--        m_sModuleName = sTextDocumentUrl;
--    }
--    else
--        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Unsupported Document" ), uno::Reference< uno::XInterface >() );
--    
--    uno::Reference < lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
--    uno::Reference < container::XNameAccess > xNameAccess( xMSF->createInstance( sWindowStateConfUrl ), uno::UNO_QUERY_THROW );
--    m_xNameAccess.set( xNameAccess->getByName( m_sModuleName ), uno::UNO_QUERY_THROW );
- }
- 
- // XEnumerationAccess
- uno::Type SAL_CALL 
- ScVbaCommandBars::getElementType() throw ( uno::RuntimeException )
- {
--    return XCommandBars::static_type( 0 );
-+    return XCommandBar::static_type( 0 );
- }
-+
- uno::Reference< container::XEnumeration >
- ScVbaCommandBars::createEnumeration() throw ( uno::RuntimeException )
- {
--    return uno::Reference< container::XEnumeration >( new CommandBarEnumeration( mxContext, this, m_xNameAccess->getElementNames(), m_xModel ) );
-+    return uno::Reference< container::XEnumeration >( new CommandBarEnumeration( this, mxContext, pCBarHelper ) );
- }
- 
- uno::Any
- ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
- {
-     // aSource should be a name at this time, because of the class is API wrapper.
--    rtl::OUString sToolBarName;
--    if( aSource >>= sToolBarName )
-+    rtl::OUString sResourceUrl;
-+    uno::Reference< container::XIndexAccess > xBarSettings;
-+    rtl::OUString sBarName;
-+    sal_Bool bMenu = sal_False;
-+    if( aSource >>= sBarName )
-     {
--        sToolBarName = sToolBarName.toAsciiLowerCase();
--        if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Worksheet Menu Bar") ) )
--        {
--            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, m_xModel, 0 ) ) );
--        }
--        else if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Menu Bar") ) )
-+        if( sBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Worksheet Menu Bar") )
-+            || sBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Menu Bar") ) )
-         {
--            return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, m_xModel, 1 ) ) );
-+            // menu bar
-+            sResourceUrl = pCBarHelper->getMenuBarUrl();
-+            bMenu = sal_True;
-         }
--        else if( checkToolBarExist( sToolBarName ) )
-+        else
-         {
--            return uno::makeAny( uno::Reference< XCommandBar > (new ScVbaCommandBar( this, mxContext, m_xModel, sToolBarName, sal_True, sal_False ) ) );
-+            sResourceUrl = pCBarHelper->findToolbarByName( m_xNameAccess, sBarName );
-+            bMenu = sal_False;
-         }
-     }
--    return uno::Any();
-+
-+    if( sResourceUrl.getLength() )
-+        xBarSettings = pCBarHelper->getAppCfgManager()->getSettings( sResourceUrl, sal_True );
-+    else
-+        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toolbar do not exist") ), uno::Reference< uno::XInterface >() );
-+
-+    return uno::Any( uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, pCBarHelper, xBarSettings, sResourceUrl, bMenu, sal_False ) ) );
- }
- 
- // XCommandBars
- uno::Reference< XCommandBar > SAL_CALL 
- ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
- {
-+    // FIXME: only support to add Toolbar
-     // Position - MsoBar MenuBar - sal_Bool
-     // Currently only the Name is supported.
-     rtl::OUString sName;
--    if( !( Name >>= sName ) )
-+    if( Name.hasValue() )
-+        Name >>= sName;
-+
-+    rtl::OUString sResourceUrl;
-+    if( sName.getLength() )
-     {
--        sName = rtl::OUString::createFromAscii("Custom1");
-+        sResourceUrl = pCBarHelper->findToolbarByName( m_xNameAccess, sName );
-+        if( sResourceUrl.getLength() )
-+            throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toolbar exists") ), uno::Reference< uno::XInterface >() );
-     }
--    sal_Bool bTemporary = false;
--    if( !( Temporary >>= bTemporary ) )
-+    else
-     {
--        bTemporary = sal_True;
--    }
--    return uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, m_xModel, sName.toAsciiLowerCase(), bTemporary, sal_True ) );
-+        sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Custom1") );
-+    }    
-+
-+    sal_Bool bTemporary = sal_False;
-+    if( Temporary.hasValue() )
-+        Temporary >>= bTemporary;
-+    
-+    sResourceUrl = VbaCommandBarHelper::generateCustomURL();
-+    uno::Reference< container::XIndexAccess > xBarSettings( pCBarHelper->getAppCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
-+    uno::Reference< XCommandBar > xCBar( new ScVbaCommandBar( this, mxContext, pCBarHelper, xBarSettings, sResourceUrl, sal_False, bTemporary ) );
-+    xCBar->setName( sName );
-+    return xCBar;
- }
- sal_Int32 SAL_CALL 
- ScVbaCommandBars::getCount() throw(css::uno::RuntimeException)
- {
-     // Filter out all toolbars from the window collection
--    sal_Int32 nCount = 0;
-+    sal_Int32 nCount = 1; // there is a Menubar in OOo
-     uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
-     for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
-     {
-@@ -209,9 +207,9 @@ ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) th
-     if( nIndex == 1 )
-     {
-         uno::Any aSource;
--        if( m_sModuleName.equalsIgnoreAsciiCase( sSpreadsheetDocumentUrl ) )
-+        if( pCBarHelper->getModuleId().equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ) )
-             aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" );
--        else if( m_sModuleName.equalsIgnoreAsciiCase( sTextDocumentUrl ) )
-+        else if( pCBarHelper->getModuleId().equalsAscii("com.sun.star.text.TextDocument") )
-             aSource <<= rtl::OUString::createFromAscii( "Menu Bar" );
-         if( aSource.hasValue() )    
-             return createCollectionObject( aSource );
-@@ -219,28 +217,6 @@ ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) th
-     return uno::Any();
- }
- 
--sal_Bool
--ScVbaCommandBars::checkToolBarExist( rtl::OUString sToolBarName )
--{
--    CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
--    if( iter != mCommandBarNameMap.end() )
--    {
--        return sal_True;
--    }    
--    uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
--    for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
--    {
--        if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
--        {
--            if( allNames[i].indexOf( sToolBarName ) != -1 )
--            {
--                return sal_True;
--            }
--        }
--    }
--    return sal_False;
--}
--    
- // XHelperInterface
- rtl::OUString& 
- ScVbaCommandBars::getServiceImplName()
-diff --git vbahelper/source/vbahelper/vbacommandbars.hxx vbahelper/source/vbahelper/vbacommandbars.hxx
-index d1ebf4b..2c0cc3f 100644
---- vbahelper/source/vbahelper/vbacommandbars.hxx
-+++ vbahelper/source/vbahelper/vbacommandbars.hxx
-@@ -38,32 +38,22 @@
- #include <ooo/vba/XCommandBar.hpp>
- #include <ooo/vba/XCommandBars.hpp>
- #include <com/sun/star/container/XNameAccess.hpp>
--
- #include <cppuhelper/implbase1.hxx>
--
- #include <vbahelper/vbahelperinterface.hxx>
- #include <vbahelper/vbacollectionimpl.hxx>
-+#include "vbacommandbarhelper.hxx"
- 
- typedef CollTestImplHelper< ov::XCommandBars > CommandBars_BASE;
- 
- class ScVbaCommandBars : public CommandBars_BASE
- {
- private:
--    css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
--    rtl::OUString m_sModuleName;
--    void retrieveObjects() throw( css::uno::RuntimeException );
--protected:
--    css::uno::Reference< css::frame::XModel > m_xModel;
-+    VbaCommandBarHelperRef pCBarHelper;
-+
- public:
--    ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess, const css::uno::Reference< css::frame::XModel >& xModel );
-+    ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-+    virtual ~ScVbaCommandBars();
- 
--    sal_Bool checkToolBarExist( rtl::OUString sToolBarName );
--    rtl::OUString GetModuleName(){ return m_sModuleName; };
--    css::uno::Reference< css::container::XNameAccess > GetWindows() 
--    { 
--        retrieveObjects();
--        return m_xNameAccess; 
--    };
-     // XCommandBars
-     virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-     // XEnumerationAccess
-diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx
-index 2a51ee4..8290f66 100644
---- vbahelper/source/vbahelper/vbahelper.cxx
-+++ vbahelper/source/vbahelper/vbahelper.cxx
-@@ -917,6 +917,33 @@ void setDefaultPropByIntrospection( const uno::Any& aObj, const uno::Any& aValue
-         throw uno::RuntimeException();
- }
- 
-+uno::Any getPropertyValue( const uno::Sequence< beans::PropertyValue >& aProp, const rtl::OUString& aName )
-+{
-+    uno::Any result;
-+    for ( sal_Int32 i = 0; i < aProp.getLength(); i++ )
-+    {
-+        if ( aProp[i].Name.equals(aName) )
-+        {
-+            aProp[i].Value >>= result;
-+            return result;
-+        }
-+    }
-+    return result;
-+}
-+
-+sal_Bool setPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, const rtl::OUString& aName, const uno::Any& aValue )
-+{
-+    for ( sal_Int32 i = 0; i < aProp.getLength(); i++ )
-+    {
-+        if ( aProp[i].Name.equals(aName) )
-+        {
-+            aProp[i].Value = aValue;
-+            return sal_True;
-+        }
-+    }
-+    return sal_False;
-+}
-+
- #define VBA_LEFT "PositionX"
- #define VBA_TOP "PositionY"
- UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
diff --git a/applied_patches/0515-buildfix-toolkit-workben-layout.diff b/applied_patches/0398-buildfix-toolkit-workben-layout.diff
similarity index 100%
rename from applied_patches/0515-buildfix-toolkit-workben-layout.diff
rename to applied_patches/0398-buildfix-toolkit-workben-layout.diff
diff --git a/applied_patches/0398-vba-menubar-objects.diff b/applied_patches/0398-vba-menubar-objects.diff
deleted file mode 100644
index 1dd20c951..000000000
--- a/applied_patches/0398-vba-menubar-objects.diff
+++ /dev/null
@@ -1,1732 +0,0 @@
-diff --git oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/excel/XApplication.idl
-index 2d903de..cf758f3 100644
---- oovbaapi/ooo/vba/excel/XApplication.idl
-+++ oovbaapi/ooo/vba/excel/XApplication.idl
-@@ -103,6 +103,7 @@ interface XApplication : com::sun::star::uno::XInterface
-         raises(com::sun::star::script::BasicErrorException);
- 	void Volatile([in] any Volatile);
- 	any Caller( [in] any aIndex );
-+	any MenuBars( [in] any aIndex );
- };
- 
- }; }; };
-diff --git oovbaapi/ooo/vba/excel/XGlobals.idl oovbaapi/ooo/vba/excel/XGlobals.idl
-index b21e902..782da39 100644
---- oovbaapi/ooo/vba/excel/XGlobals.idl
-+++ oovbaapi/ooo/vba/excel/XGlobals.idl
-@@ -76,6 +76,7 @@ XRange Intersect([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3,
- 	any Names( [in] any Index );
- 	XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
-         raises(com::sun::star::script::BasicErrorException);
-+	any MenuBars( [in] any aIndex );
- 
- };
- 
-diff --git oovbaapi/ooo/vba/excel/XMenu.idl oovbaapi/ooo/vba/excel/XMenu.idl
-new file mode 100644
-index 0000000..cb3698b
---- /dev/null
-+++ oovbaapi/ooo/vba/excel/XMenu.idl
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_excel_XMenu_idl__
-+#define __ooo_vba_excel_XMenu_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+//=============================================================================
-+
-+module ooo {  module vba {  module excel { 
-+//=============================================================================
-+
-+interface XMenu
-+{
-+	interface XHelperInterface;
-+
-+    [attribute] string Caption;
-+
-+    void Delete() raises ( com::sun::star::script::BasicErrorException );
-+    any MenuItems( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
-+};
-+
-+}; }; };
-+
-+#endif
-diff --git oovbaapi/ooo/vba/excel/XMenuBar.idl oovbaapi/ooo/vba/excel/XMenuBar.idl
-new file mode 100644
-index 0000000..3ead272
---- /dev/null
-+++ oovbaapi/ooo/vba/excel/XMenuBar.idl
-@@ -0,0 +1,59 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_excel_XMenuBar_idl__
-+#define __ooo_vba_excel_XMenuBar_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+//=============================================================================
-+
-+module ooo {  module vba {  module excel { 
-+//=============================================================================
-+
-+interface XMenuBar
-+{
-+	interface XHelperInterface;
-+
-+    any Menus( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
-+};
-+
-+}; }; };
-+
-+#endif
-diff --git oovbaapi/ooo/vba/excel/XMenuBars.idl oovbaapi/ooo/vba/excel/XMenuBars.idl
-new file mode 100644
-index 0000000..3a46c3b
---- /dev/null
-+++ oovbaapi/ooo/vba/excel/XMenuBars.idl
-@@ -0,0 +1,66 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XMenuBars.idl,v $
-+ * $Revision: 1.0 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_excel_XMenuBars_idl__
-+#define __ooo_vba_excel_XMenuBars_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
-+#include <com/sun/star/script/BasicErrorException.idl>
-+#endif
-+
-+#ifndef  __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module excel { 
-+
-+//=============================================================================
-+
-+interface XMenuBars
-+{
-+	interface ooo::vba::XCollection;
-+};
-+
-+//=============================================================================
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/excel/XMenuItem.idl oovbaapi/ooo/vba/excel/XMenuItem.idl
-new file mode 100644
-index 0000000..2dcfb2f
---- /dev/null
-+++ oovbaapi/ooo/vba/excel/XMenuItem.idl
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_excel_XMenuItem_idl__
-+#define __ooo_vba_excel_XMenuItem_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+//=============================================================================
-+
-+module ooo {  module vba {  module excel { 
-+//=============================================================================
-+
-+interface XMenuItem
-+{
-+	interface XHelperInterface;
-+
-+    [attribute] string Caption;
-+    [attribute] string OnAction;
-+
-+    void Delete() raises ( com::sun::star::script::BasicErrorException );
-+};
-+
-+}; }; };
-+
-+#endif
-diff --git oovbaapi/ooo/vba/excel/XMenuItems.idl oovbaapi/ooo/vba/excel/XMenuItems.idl
-new file mode 100644
-index 0000000..9ba7b38
---- /dev/null
-+++ oovbaapi/ooo/vba/excel/XMenuItems.idl
-@@ -0,0 +1,70 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XMenuItems.idl,v $
-+ * $Revision: 1.0 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_excel_XMenuItems_idl__
-+#define __ooo_vba_excel_XMenuItems_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
-+#include <com/sun/star/script/BasicErrorException.idl>
-+#endif
-+
-+#ifndef  __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module excel { 
-+
-+//=============================================================================
-+
-+interface XMenuItem;
-+
-+interface XMenuItems
-+{
-+	interface ooo::vba::XCollection;
-+
-+    XMenuItem Add( [in] string Caption, [in] any OnAction, [in] any ShortcutKey, [in] any Before, [in] any Restore, [in] any StatusBar, [in] any HelpFile, [in] any HelpContextID ) raises ( com::sun::star::script::BasicErrorException );
-+};
-+
-+//=============================================================================
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/excel/XMenus.idl oovbaapi/ooo/vba/excel/XMenus.idl
-new file mode 100644
-index 0000000..c8e4ea2
---- /dev/null
-+++ oovbaapi/ooo/vba/excel/XMenus.idl
-@@ -0,0 +1,70 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: XMenus.idl,v $
-+ * $Revision: 1.0 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __ooo_vba_excel_XMenus_idl__
-+#define __ooo_vba_excel_XMenus_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+#ifndef __ooo_vba_XHelperInterface_idl__
-+#include <ooo/vba/XHelperInterface.idl>
-+#endif
-+
-+#ifndef __com_sun_star_helper_script_BasicErrorException_idl__
-+#include <com/sun/star/script/BasicErrorException.idl>
-+#endif
-+
-+#ifndef  __ooo_vba_XCollection_idl__
-+#include <ooo/vba/XCollection.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module ooo {  module vba {  module excel { 
-+
-+//=============================================================================
-+
-+interface XMenu;
-+
-+interface XMenus
-+{
-+	interface ooo::vba::XCollection;
-+
-+    XMenu Add( [in] string Caption, [in] any Before, [in] any Restore ) raises ( com::sun::star::script::BasicErrorException );
-+};
-+
-+//=============================================================================
-+
-+}; }; };
-+
-+#endif
-+
-+
-diff --git oovbaapi/ooo/vba/excel/makefile.mk oovbaapi/ooo/vba/excel/makefile.mk
-index 232f83c..f3ad793 100644
---- oovbaapi/ooo/vba/excel/makefile.mk
-+++ oovbaapi/ooo/vba/excel/makefile.mk
-@@ -103,6 +103,12 @@ IDLFILES= XGlobals.idl\
-  	XVPageBreak.idl \
-  	XVPageBreaks.idl \
-  	TextFrame.idl \
-+ 	XMenuBar.idl \
-+ 	XMenuBars.idl \
-+ 	XMenu.idl \
-+ 	XMenus.idl \
-+ 	XMenuItem.idl \
-+ 	XMenuItems.idl \
- 
- 
- # ------------------------------------------------------------------
-diff --git sc/source/ui/vba/makefile.mk sc/source/ui/vba/makefile.mk
-index 9350a3b..2f8a16f 100644
---- sc/source/ui/vba/makefile.mk
-+++ sc/source/ui/vba/makefile.mk
-@@ -104,7 +104,13 @@ SLOFILES= \
- 		        $(SLO)$/vbapagebreak.obj \
-         		$(SLO)$/vbapagebreaks.obj \
- 				$(SLO)$/service.obj \
--        $(SLO)$/vbaeventshelper.obj
-+        $(SLO)$/vbaeventshelper.obj \
-+        $(SLO)$/vbamenubar.obj  \
-+        $(SLO)$/vbamenubars.obj \
-+        $(SLO)$/vbamenu.obj \
-+        $(SLO)$/vbamenus.obj \
-+        $(SLO)$/vbamenuitem.obj \
-+        $(SLO)$/vbamenuitems.obj \
- 
- # --- Targets ------------------------------------------------------
- 
-diff --git sc/source/ui/vba/vbaapplication.cxx sc/source/ui/vba/vbaapplication.cxx
-index c06f3bd..68d0834 100644
---- sc/source/ui/vba/vbaapplication.cxx
-+++ sc/source/ui/vba/vbaapplication.cxx
-@@ -43,6 +43,7 @@
- #include <ooo/vba/excel/XlMousePointer.hpp>
- #include <com/sun/star/sheet/XNamedRanges.hpp>
- #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
-+#include<ooo/vba/XCommandBars.hpp>
- 
- #include "vbaapplication.hxx"
- #include "vbaworkbooks.hxx"
-@@ -54,6 +55,7 @@
- #include "vbawindow.hxx"
- #include "vbawindows.hxx"
- #include "vbaglobals.hxx"
-+#include "vbamenubars.hxx"
- #include "tabvwsh.hxx"
- #include "gridwin.hxx"
- #include "vbanames.hxx"
-@@ -1186,6 +1188,19 @@ ScVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
-     return getCurrentExcelDoc();
- }
- 
-+uno::Any SAL_CALL
-+ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< XCommandBars > xCommandBars( CommandBars( uno::Any() ), uno::UNO_QUERY_THROW );
-+	uno::Reference< XCollection > xMenuBars( new ScVbaMenuBars( this, mxContext, xCommandBars ) );
-+	if (  aIndex.hasValue() )
-+	{
-+	    return uno::Any ( xMenuBars->Item( aIndex, uno::Any() ) );
-+	}
-+
-+	return uno::Any( xMenuBars );
-+}
-+
- rtl::OUString& 
- ScVbaApplication::getServiceImplName()
- {
-diff --git sc/source/ui/vba/vbaapplication.hxx sc/source/ui/vba/vbaapplication.hxx
-index d7098b4..8e5da56 100644
---- sc/source/ui/vba/vbaapplication.hxx
-+++ sc/source/ui/vba/vbaapplication.hxx
-@@ -101,6 +101,7 @@ public:
- 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- 	virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException );
- 	virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+	virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- 	// XHelperInterface
- 	virtual rtl::OUString& getServiceImplName();
- 	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-diff --git sc/source/ui/vba/vbaglobals.cxx sc/source/ui/vba/vbaglobals.cxx
-index d32eb78..ac5e4f5 100644
---- sc/source/ui/vba/vbaglobals.cxx
-+++ sc/source/ui/vba/vbaglobals.cxx
-@@ -211,6 +211,12 @@ ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException)
- 	
- }
- 
-+uno::Any SAL_CALL 
-+ScVbaGlobals::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
-+{
-+	return uno::Any( getApplication()->MenuBars(aIndex) );
-+}
-+
- uno::Sequence< ::rtl::OUString > SAL_CALL 
- ScVbaGlobals::getAvailableServiceNames(  ) throw (uno::RuntimeException)
- {
-diff --git sc/source/ui/vba/vbaglobals.hxx sc/source/ui/vba/vbaglobals.hxx
-index 89861ee..66dd1fa 100644
---- sc/source/ui/vba/vbaglobals.hxx
-+++ sc/source/ui/vba/vbaglobals.hxx
-@@ -83,6 +83,8 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc
- 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- 
-+    virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+
- 
- 
-     // XMultiServiceFactory
-diff --git sc/source/ui/vba/vbamenu.cxx sc/source/ui/vba/vbamenu.cxx
-new file mode 100644
-index 0000000..58972b0
---- /dev/null
-+++ sc/source/ui/vba/vbamenu.cxx
-@@ -0,0 +1,91 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbamenu.hxx" 
-+#include "vbamenuitems.hxx"
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+ScVbaMenu::ScVbaMenu( const uno::Reference< ov::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBarControl >& xCommandBarControl ) throw( uno::RuntimeException ) : Menu_BASE( xParent, xContext ), m_xCommandBarControl( xCommandBarControl )
-+{
-+}
-+
-+::rtl::OUString SAL_CALL
-+ScVbaMenu::getCaption() throw ( uno::RuntimeException )
-+{
-+    return m_xCommandBarControl->getCaption();
-+}
-+
-+void SAL_CALL
-+ScVbaMenu::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
-+{
-+    m_xCommandBarControl->setCaption( _caption );
-+}
-+
-+void SAL_CALL
-+ScVbaMenu::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    m_xCommandBarControl->Delete();
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    uno::Reference< XCommandBarControls > xCommandBarControls( m_xCommandBarControl->Controls( uno::Any() ), uno::UNO_QUERY_THROW );
-+    uno::Reference< excel::XMenuItems > xMenuItems( new ScVbaMenuItems( this, mxContext, xCommandBarControls ) );
-+    if( aIndex.hasValue() )
-+    {
-+        return xMenuItems->Item( aIndex, uno::Any() );
-+    }
-+    return uno::makeAny( xMenuItems );
-+}
-+
-+rtl::OUString& 
-+ScVbaMenu::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenu") );
-+	return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaMenu::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Menu" ) );
-+	}
-+	return aServiceNames;
-+}
-diff --git sc/source/ui/vba/vbamenu.hxx sc/source/ui/vba/vbamenu.hxx
-new file mode 100644
-index 0000000..cd96857
---- /dev/null
-+++ sc/source/ui/vba/vbamenu.hxx
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_MENU_HXX
-+#define SC_VBA_MENU_HXX
-+
-+#include <ooo/vba/excel/XMenu.hpp>
-+#include <ooo/vba/XCommandBarControl.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ov::excel::XMenu > Menu_BASE;
-+
-+class ScVbaMenu : public Menu_BASE
-+{
-+private:
-+    css::uno::Reference< ov::XCommandBarControl > m_xCommandBarControl;
-+
-+public:
-+    ScVbaMenu( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException );
-+    
-+    virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException);
-+
-+    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif//SC_VBA_MENU_HXX
-diff --git sc/source/ui/vba/vbamenubar.cxx sc/source/ui/vba/vbamenubar.cxx
-new file mode 100644
-index 0000000..9386028
---- /dev/null
-+++ sc/source/ui/vba/vbamenubar.cxx
-@@ -0,0 +1,74 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbamenubar.hxx" 
-+#include "vbamenus.hxx"
-+#include <ooo/vba/XCommandBarControls.hpp>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+ScVbaMenuBar::ScVbaMenuBar( const uno::Reference< ov::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBar >& xCommandBar ) throw( uno::RuntimeException ) : MenuBar_BASE( xParent, xContext ), m_xCommandBar( xCommandBar )
-+{
-+}
-+
-+uno::Any SAL_CALL 
-+ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    uno::Reference< XCommandBarControls > xCommandBarControls( m_xCommandBar->Controls( uno::Any() ), uno::UNO_QUERY_THROW );
-+    uno::Reference< excel::XMenus > xMenus( new ScVbaMenus( this, mxContext, xCommandBarControls ) );
-+    if( aIndex.hasValue() )
-+    {
-+        return xMenus->Item( aIndex, uno::Any() );
-+    }
-+    return uno::makeAny( xMenus );
-+}
-+
-+rtl::OUString& 
-+ScVbaMenuBar::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBar") );
-+	return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaMenuBar::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuBar" ) );
-+	}
-+	return aServiceNames;
-+}
-diff --git sc/source/ui/vba/vbamenubar.hxx sc/source/ui/vba/vbamenubar.hxx
-new file mode 100644
-index 0000000..fa39054
---- /dev/null
-+++ sc/source/ui/vba/vbamenubar.hxx
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_MENUBAR_HXX
-+#define SC_VBA_MENUBAR_HXX
-+
-+#include <ooo/vba/excel/XMenuBar.hpp>
-+#include <ooo/vba/XCommandBar.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ov::excel::XMenuBar > MenuBar_BASE;
-+
-+class ScVbaMenuBar : public MenuBar_BASE
-+{
-+private:
-+    css::uno::Reference< ov::XCommandBar > m_xCommandBar;
-+
-+public:
-+    ScVbaMenuBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBar >& xCommandBar ) throw( css::uno::RuntimeException );
-+    
-+    virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif//SC_VBA_MENUBAR_HXX
-diff --git sc/source/ui/vba/vbamenubars.cxx sc/source/ui/vba/vbamenubars.cxx
-new file mode 100644
-index 0000000..a5f9e9b
---- /dev/null
-+++ sc/source/ui/vba/vbamenubars.cxx
-@@ -0,0 +1,146 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbamenubars.hxx"
-+#include "vbamenubar.hxx"
-+#include <ooo/vba/excel/XlSheetType.hpp>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuBarEnumeration_BASE;
-+
-+class MenuBarEnumeration : public MenuBarEnumeration_BASE
-+{
-+    uno::Reference< XHelperInterface > m_xParent;
-+    uno::Reference< uno::XComponentContext > m_xContext;
-+    uno::Reference< container::XEnumeration > m_xEnumeration;
-+public:
-+    MenuBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
-+    {
-+    }
-+    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
-+    {
-+        return m_xEnumeration->hasMoreElements();
-+    }
-+    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
-+    {
-+        // FIXME: should be add menubar
-+        if( hasMoreElements() )
-+        {
-+            uno::Reference< XCommandBar > xCommandBar( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
-+            uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( m_xParent, m_xContext, xCommandBar ) );
-+            return uno::makeAny( xMenuBar );
-+        }
-+        else
-+            throw container::NoSuchElementException();
-+        return uno::Any();
-+    }
-+};
-+
-+ScVbaMenuBars::ScVbaMenuBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBars >& xCommandBars ) throw ( uno::RuntimeException ) : MenuBars_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBars( xCommandBars )
-+{
-+}
-+
-+ScVbaMenuBars::~ScVbaMenuBars()
-+{
-+}
-+
-+// XEnumerationAccess
-+uno::Type SAL_CALL 
-+ScVbaMenuBars::getElementType() throw ( uno::RuntimeException )
-+{
-+    return excel::XMenuBar::static_type( 0 );
-+}
-+
-+uno::Reference< container::XEnumeration >
-+ScVbaMenuBars::createEnumeration() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBars, uno::UNO_QUERY_THROW );
-+    return uno::Reference< container::XEnumeration >( new MenuBarEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) );
-+}
-+
-+uno::Any
-+ScVbaMenuBars::createCollectionObject( const uno::Any& aSource )
-+{
-+    // make no sense
-+    return aSource;
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaMenuBars::getCount() throw(css::uno::RuntimeException)
-+{
-+    return m_xCommandBars->getCount();
-+}
-+
-+// ScVbaCollectionBaseImpl
-+uno::Any SAL_CALL
-+ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
-+{
-+    sal_Int16 nIndex = 0;
-+    aIndex >>= nIndex;
-+    if( nIndex == excel::XlSheetType::xlWorksheet )
-+    {
-+        uno::Any aSource;
-+        aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" );
-+        uno::Reference< XCommandBar > xCommandBar( m_xCommandBars->Item( aSource, uno::Any() ), uno::UNO_QUERY_THROW );
-+        uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( this, mxContext, xCommandBar ) );
-+        return uno::makeAny( xMenuBar );
-+    }
-+
-+    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
-+    
-+    return uno::Any();
-+}
-+
-+// XHelperInterface
-+rtl::OUString& 
-+ScVbaMenuBars::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBars") );
-+    return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaMenuBars::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuBars" ) );
-+    }
-+    return aServiceNames;
-+}
-+
-diff --git sc/source/ui/vba/vbamenubars.hxx sc/source/ui/vba/vbamenubars.hxx
-new file mode 100644
-index 0000000..0d8ea58
---- /dev/null
-+++ sc/source/ui/vba/vbamenubars.hxx
-@@ -0,0 +1,69 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_MENUBARS_HXX
-+#define SC_VBA_MENUBARS_HXX
-+
-+#include <ooo/vba/excel/XMenuBars.hpp>
-+#include <ooo/vba/excel/XMenuBar.hpp>
-+#include <ooo/vba/XCommandBars.hpp>
-+#include <com/sun/star/container/XNameAccess.hpp>
-+#include <cppuhelper/implbase1.hxx>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbacollectionimpl.hxx>
-+
-+typedef CollTestImplHelper< ov::excel::XMenuBars > MenuBars_BASE;
-+
-+class ScVbaMenuBars : public MenuBars_BASE
-+{
-+private:
-+    css::uno::Reference< ov::XCommandBars > m_xCommandBars;
-+
-+public:
-+    ScVbaMenuBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBars >& xCommandBars ) throw (css::uno::RuntimeException);
-+    virtual ~ScVbaMenuBars();
-+
-+    // XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-+
-+    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException);
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif//SC_VBA_MENUBARS_HXX
-diff --git sc/source/ui/vba/vbamenuitem.cxx sc/source/ui/vba/vbamenuitem.cxx
-new file mode 100644
-index 0000000..48254cc
---- /dev/null
-+++ sc/source/ui/vba/vbamenuitem.cxx
-@@ -0,0 +1,90 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbamenuitem.hxx" 
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+ScVbaMenuItem::ScVbaMenuItem( const uno::Reference< ov::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBarControl >& xCommandBarControl ) throw( uno::RuntimeException ) : MenuItem_BASE( xParent, xContext ), m_xCommandBarControl( xCommandBarControl )
-+{
-+}
-+
-+::rtl::OUString SAL_CALL
-+ScVbaMenuItem::getCaption() throw ( uno::RuntimeException )
-+{
-+    return m_xCommandBarControl->getCaption();
-+}
-+
-+void SAL_CALL
-+ScVbaMenuItem::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
-+{
-+    m_xCommandBarControl->setCaption( _caption );
-+}
-+
-+::rtl::OUString SAL_CALL
-+ScVbaMenuItem::getOnAction() throw ( uno::RuntimeException )
-+{
-+    return m_xCommandBarControl->getOnAction();
-+}
-+
-+void SAL_CALL
-+ScVbaMenuItem::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException)
-+{
-+    m_xCommandBarControl->setOnAction( _onaction );
-+}
-+
-+void SAL_CALL
-+ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
-+{
-+    m_xCommandBarControl->Delete();
-+}
-+
-+rtl::OUString& 
-+ScVbaMenuItem::getServiceImplName()
-+{
-+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItem") );
-+	return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaMenuItem::getServiceNames()
-+{
-+	static uno::Sequence< rtl::OUString > aServiceNames;
-+	if ( aServiceNames.getLength() == 0 )
-+	{
-+		aServiceNames.realloc( 1 );
-+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuItem" ) );
-+	}
-+	return aServiceNames;
-+}
-diff --git sc/source/ui/vba/vbamenuitem.hxx sc/source/ui/vba/vbamenuitem.hxx
-new file mode 100644
-index 0000000..bf4c087
---- /dev/null
-+++ sc/source/ui/vba/vbamenuitem.hxx
-@@ -0,0 +1,63 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_MENUITEM_HXX
-+#define SC_VBA_MENUITEM_HXX
-+
-+#include <ooo/vba/excel/XMenuItem.hpp>
-+#include <ooo/vba/XCommandBarControl.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+
-+typedef InheritedHelperInterfaceImpl1< ov::excel::XMenuItem > MenuItem_BASE;
-+
-+class ScVbaMenuItem : public MenuItem_BASE
-+{
-+private:
-+    css::uno::Reference< ov::XCommandBarControl > m_xCommandBarControl;
-+
-+public:
-+    ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException );
-+    
-+    virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException);
-+    virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException);
-+
-+    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+
-+	// XHelperInterface
-+	virtual rtl::OUString& getServiceImplName();
-+	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+#endif//SC_VBA_MENUITEM_HXX
-diff --git sc/source/ui/vba/vbamenuitems.cxx sc/source/ui/vba/vbamenuitems.cxx
-new file mode 100644
-index 0000000..3a5cd79
---- /dev/null
-+++ sc/source/ui/vba/vbamenuitems.cxx
-@@ -0,0 +1,159 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbamenuitems.hxx"
-+#include "vbamenuitem.hxx"
-+#include "vbamenu.hxx"
-+#include <ooo/vba/office/MsoControlType.hpp>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE;
-+
-+class MenuEnumeration : public MenuEnumeration_BASE
-+{
-+    uno::Reference< XHelperInterface > m_xParent;
-+    uno::Reference< uno::XComponentContext > m_xContext;
-+    uno::Reference< container::XEnumeration > m_xEnumeration;
-+public:
-+    MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
-+    {
-+    }
-+    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
-+    {
-+        return m_xEnumeration->hasMoreElements();
-+    }
-+    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
-+    {
-+        // FIXME: should be add menu
-+        if( hasMoreElements() )
-+        {
-+            uno::Reference< XCommandBarControl > xCommandBarControl( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
-+            if( xCommandBarControl->getType() == office::MsoControlType::msoControlPopup )
-+            {
-+                uno::Reference< excel::XMenu > xMenu( new ScVbaMenu( m_xParent, m_xContext, xCommandBarControl ) );
-+                return uno::makeAny( xMenu );
-+            }
-+            else if( xCommandBarControl->getType() == office::MsoControlType::msoControlButton )
-+            {
-+                uno::Reference< excel::XMenuItem > xMenuItem( new ScVbaMenuItem( m_xParent, m_xContext, xCommandBarControl ) );
-+                return uno::makeAny( xMenuItem );
-+            }
-+            nextElement();
-+        }
-+        else
-+            throw container::NoSuchElementException();
-+        return uno::Any();
-+    }
-+};
-+
-+ScVbaMenuItems::ScVbaMenuItems( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) throw ( uno::RuntimeException ) : MenuItems_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls )
-+{
-+}
-+
-+// XEnumerationAccess
-+uno::Type SAL_CALL 
-+ScVbaMenuItems::getElementType() throw ( uno::RuntimeException )
-+{
-+    return excel::XMenuItem::static_type( 0 );
-+}
-+
-+uno::Reference< container::XEnumeration >
-+ScVbaMenuItems::createEnumeration() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBarControls, uno::UNO_QUERY_THROW );
-+    return uno::Reference< container::XEnumeration >( new MenuEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) );
-+}
-+
-+uno::Any
-+ScVbaMenuItems::createCollectionObject( const uno::Any& aSource )
-+{
-+    // make no sense
-+    return aSource;
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaMenuItems::getCount() throw(css::uno::RuntimeException)
-+{
-+    // FIXME: should check if it is a popup menu
-+    return m_xCommandBarControls->getCount();
-+}
-+
-+// ScVbaCollectionBaseImpl
-+uno::Any SAL_CALL
-+ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
-+{
-+    uno::Reference< XCommandBarControl > xCommandBarControl( m_xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
-+    if( xCommandBarControl->getType() == office::MsoControlType::msoControlPopup )
-+        return uno::makeAny( uno::Reference< excel::XMenu > ( new ScVbaMenu( this, mxContext, xCommandBarControl ) ) );
-+    else if( xCommandBarControl->getType() == office::MsoControlType::msoControlButton )
-+        return uno::makeAny( uno::Reference< excel::XMenuItem > ( new ScVbaMenuItem( this, mxContext, xCommandBarControl ) ) );
-+    throw uno::RuntimeException();    
-+}
-+
-+uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
-+{
-+    sal_Int32 nType = office::MsoControlType::msoControlButton;
-+    uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore );
-+    xCommandBarControl->setCaption( Caption );
-+    if( OnAction.hasValue() )
-+    {
-+        rtl::OUString sAction;
-+        OnAction >>= sAction;
-+        xCommandBarControl->setOnAction( sAction );
-+    }
-+    return uno::Reference< excel::XMenuItem >( new ScVbaMenuItem( this, mxContext, xCommandBarControl ) );
-+}
-+
-+// XHelperInterface
-+rtl::OUString& 
-+ScVbaMenuItems::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItems") );
-+    return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaMenuItems::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuItems" ) );
-+    }
-+    return aServiceNames;
-+}
-+
-diff --git sc/source/ui/vba/vbamenuitems.hxx sc/source/ui/vba/vbamenuitems.hxx
-new file mode 100644
-index 0000000..8aeb931
---- /dev/null
-+++ sc/source/ui/vba/vbamenuitems.hxx
-@@ -0,0 +1,68 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_MENUITEMS_HXX
-+#define SC_VBA_MENUITEMS_HXX
-+
-+#include <ooo/vba/excel/XMenuItems.hpp>
-+#include <ooo/vba/excel/XMenuItem.hpp>
-+#include <ooo/vba/XCommandBarControls.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbacollectionimpl.hxx>
-+
-+typedef CollTestImplHelper< ov::excel::XMenuItems > MenuItems_BASE;
-+
-+class ScVbaMenuItems : public MenuItems_BASE
-+{
-+private:
-+    css::uno::Reference< ov::XCommandBarControls > m_xCommandBarControls;
-+
-+public:
-+    ScVbaMenuItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException );
-+
-+    // XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-+
-+    // Methods     
-+    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); 
-+    virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif//SC_VBA_MENUITEMS_HXX
-diff --git sc/source/ui/vba/vbamenus.cxx sc/source/ui/vba/vbamenus.cxx
-new file mode 100644
-index 0000000..7d5a21b
---- /dev/null
-+++ sc/source/ui/vba/vbamenus.cxx
-@@ -0,0 +1,145 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#include "vbamenus.hxx"
-+#include "vbamenu.hxx"
-+#include <ooo/vba/office/MsoControlType.hpp>
-+
-+using namespace com::sun::star;
-+using namespace ooo::vba;
-+
-+
-+typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE;
-+
-+class MenuEnumeration : public MenuEnumeration_BASE
-+{
-+    uno::Reference< XHelperInterface > m_xParent;
-+    uno::Reference< uno::XComponentContext > m_xContext;
-+    uno::Reference< container::XEnumeration > m_xEnumeration;
-+public:
-+    MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
-+    {
-+    }
-+    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
-+    {
-+        return m_xEnumeration->hasMoreElements();
-+    }
-+    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
-+    {
-+        // FIXME: should be add menu
-+        if( hasMoreElements() )
-+        {
-+            uno::Reference< XCommandBarControl > xCommandBarControl( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
-+            if( xCommandBarControl->getType() == office::MsoControlType::msoControlPopup )
-+            {
-+                uno::Reference< excel::XMenu > xMenu( new ScVbaMenu( m_xParent, m_xContext, xCommandBarControl ) );
-+                return uno::makeAny( xMenu );
-+            }
-+            nextElement();
-+        }
-+        else
-+            throw container::NoSuchElementException();
-+        return uno::Any();
-+    }
-+};
-+
-+ScVbaMenus::ScVbaMenus( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) throw ( uno::RuntimeException ) : Menus_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls )
-+{
-+}
-+
-+// XEnumerationAccess
-+uno::Type SAL_CALL 
-+ScVbaMenus::getElementType() throw ( uno::RuntimeException )
-+{
-+    return excel::XMenu::static_type( 0 );
-+}
-+
-+uno::Reference< container::XEnumeration >
-+ScVbaMenus::createEnumeration() throw ( uno::RuntimeException )
-+{
-+    uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBarControls, uno::UNO_QUERY_THROW );
-+    return uno::Reference< container::XEnumeration >( new MenuEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) );
-+}
-+
-+uno::Any
-+ScVbaMenus::createCollectionObject( const uno::Any& aSource )
-+{
-+    // make no sense
-+    return aSource;
-+}
-+
-+sal_Int32 SAL_CALL 
-+ScVbaMenus::getCount() throw(css::uno::RuntimeException)
-+{
-+    // FIXME: should check if it is a popup menu
-+    return m_xCommandBarControls->getCount();
-+}
-+
-+// ScVbaCollectionBaseImpl
-+uno::Any SAL_CALL
-+ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
-+{
-+    uno::Reference< XCommandBarControl > xCommandBarControl( m_xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
-+    if( xCommandBarControl->getType() != office::MsoControlType::msoControlPopup )
-+        throw uno::RuntimeException();
-+    return uno::makeAny( uno::Reference< excel::XMenu > ( new ScVbaMenu( this, mxContext, xCommandBarControl ) ) );
-+}
-+
-+uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
-+{
-+    sal_Int32 nType = office::MsoControlType::msoControlPopup;
-+    uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore );
-+    xCommandBarControl->setCaption( Caption );
-+    return uno::Reference< excel::XMenu >( new ScVbaMenu( this, mxContext, xCommandBarControl ) );
-+}
-+
-+// XHelperInterface
-+rtl::OUString& 
-+ScVbaMenus::getServiceImplName()
-+{
-+    static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenus") );
-+    return sImplName;
-+}
-+uno::Sequence<rtl::OUString> 
-+ScVbaMenus::getServiceNames()
-+{
-+    static uno::Sequence< rtl::OUString > aServiceNames;
-+    if ( aServiceNames.getLength() == 0 )
-+    {
-+        aServiceNames.realloc( 1 );
-+        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Menus" ) );
-+    }
-+    return aServiceNames;
-+}
-+
-diff --git sc/source/ui/vba/vbamenus.hxx sc/source/ui/vba/vbamenus.hxx
-new file mode 100644
-index 0000000..596127e
---- /dev/null
-+++ sc/source/ui/vba/vbamenus.hxx
-@@ -0,0 +1,68 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#ifndef SC_VBA_MENUS_HXX
-+#define SC_VBA_MENUS_HXX
-+
-+#include <ooo/vba/excel/XMenus.hpp>
-+#include <ooo/vba/excel/XMenu.hpp>
-+#include <ooo/vba/XCommandBarControls.hpp>
-+#include <vbahelper/vbahelperinterface.hxx>
-+#include <vbahelper/vbacollectionimpl.hxx>
-+
-+typedef CollTestImplHelper< ov::excel::XMenus > Menus_BASE;
-+
-+class ScVbaMenus : public Menus_BASE
-+{
-+private:
-+    css::uno::Reference< ov::XCommandBarControls > m_xCommandBarControls;
-+
-+public:
-+    ScVbaMenus( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException );
-+
-+    // XEnumerationAccess
-+    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-+
-+    // Methods     
-+    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
-+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); 
-+    virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-+    // XHelperInterface
-+    virtual rtl::OUString& getServiceImplName();
-+    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-+};
-+
-+#endif//SC_VBA_MENUS_HXX
diff --git a/applied_patches/0516-layout-parallel-build.diff b/applied_patches/0399-layout-parallel-build.diff
similarity index 100%
rename from applied_patches/0516-layout-parallel-build.diff
rename to applied_patches/0399-layout-parallel-build.diff
diff --git a/applied_patches/0399-vba-fix-missing-codename.diff b/applied_patches/0399-vba-fix-missing-codename.diff
deleted file mode 100644
index 4d38930d2..000000000
--- a/applied_patches/0399-vba-fix-missing-codename.diff
+++ /dev/null
@@ -1,424 +0,0 @@
-diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
-index 4d1db8b..d4953f8 100644
---- sc/source/filter/excel/excimp8.cxx
-+++ sc/source/filter/excel/excimp8.cxx
-@@ -249,7 +249,7 @@ void ImportExcel8::Codename( BOOL bWorkbookGlobals )
-             else
-             {
-                 GetExtDocOptions().AppendCodeName( aName );
--                GetDoc().SetCodeName( mnTab++, aName );
-+                GetDoc().SetCodeName( GetCurrScTab(), aName );
-             }
-         }
- 	}
-@@ -280,7 +280,7 @@ void ImportExcel8::ReadBasic( void )
-             pShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
-             SvxImportMSVBasic aBasicImport( *pShell, *xRootStrg, bLoadCode, bLoadStrg );
- 	    bool bAsComment = !bLoadExecutable || !aGlobs.hasValue();
--            aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, bAsComment );
-+            aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, AutoGeneratedCodeNames, bAsComment );
-             if ( !bAsComment )
-             {
-                 GetObjectManager().SetOleNameOverrideInfo( aBasicImport.ControlNameForObjectId() );
-diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
-index aa2b377..3ceabf1 100644
---- sc/source/filter/excel/read.cxx
-+++ sc/source/filter/excel/read.cxx
-@@ -809,6 +809,12 @@ FltError ImportExcel8::Read( void )
-     ::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
-         aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
- 
-+    bool bSheetHasCodeName = false;
-+
-+    std::vector< String > CodeNames;
-+
-+    std::vector < SCTAB > nTabsWithNoCodeName;
-+
-     while( eAkt != EXC_STATE_END )
- 	{
- 		aIn.StartNextRecord();
-@@ -876,6 +882,7 @@ FltError ImportExcel8::Read( void )
-                         // #i62752# possible to have BIFF8 sheet without globals
-                         NeueTabelle();
-                         eAkt = EXC_STATE_SHEET_PRE;  // Shrfmla Prefetch, Row-Prefetch
-+                        bSheetHasCodeName = false; // reset
-                         aIn.StoreGlobalPosition();
-                     }
-                 }
-@@ -1047,9 +1054,30 @@ FltError ImportExcel8::Read( void )
-                     case EXC_ID3_DIMENSIONS:    ReadDimensions();                       break;
- 
-                     case 0x0A:                          // EOF          [ 2345   ]
-+                    {
-                         eAkt = EXC_STATE_SHEET;
-+                        String sName;
-+                        GetDoc().GetName( GetCurrScTab(), sName );
-+                        if ( !bSheetHasCodeName )
-+                        {
-+                            nTabsWithNoCodeName.push_back( GetCurrScTab() );
-+                            OSL_TRACE("No Codename for %d", GetCurrScTab() );
-+                        }
-+                        else
-+                        {
-+                            String sCodeName;
-+                            GetDoc().GetCodeName( GetCurrScTab(), sCodeName );
-+                            OSL_TRACE("Have CodeName %s for SheetName %s",
-+                                rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(),  rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+                            CodeNames.push_back( sCodeName );
-+                        }
-+
-+                        bSheetHasCodeName = false; // reset
-+
-+
-                         aIn.SeekGlobalPosition();         // und zurueck an alte Position
-                         break;
-+                    }
-                     case 0x12:  SheetProtect(); break;
-                     case 0x13:  SheetPassword(); break;
-                     case 0x42:  Codepage(); break;      // CODEPAGE     [ 2345   ]
-@@ -1061,7 +1089,7 @@ FltError ImportExcel8::Read( void )
-                     case 0x9B:  FilterMode(); break;    // FILTERMODE
-                     case 0x9D:  AutoFilterInfo(); break;// AUTOFILTERINFO
-                     case 0x9E:  AutoFilter(); break;    // AUTOFILTER
--                    case 0x01BA: Codename( FALSE ); break;
-+                    case 0x01BA: Codename( FALSE ); bSheetHasCodeName = true; break;
-                     case 0x0208: Row34(); break;        // ROW          [  34    ]
-                     case 0x0021:
-                     case 0x0221: Array34(); break;      // ARRAY        [  34    ]
-@@ -1171,6 +1199,42 @@ FltError ImportExcel8::Read( void )
- 
-     if( eLastErr == eERR_OK )
-     {
-+        // In some strange circumstances a the codename might be missing
-+        // # Create any missing Sheet CodeNames
-+        std::vector < SCTAB >::iterator it_end = nTabsWithNoCodeName.end();
-+        for ( std::vector < SCTAB >::iterator it = nTabsWithNoCodeName.begin(); it != it_end; ++it )
-+        {
-+            bool bGotCodeName = false;
-+            SCTAB nTab = 1;
-+            OSL_TRACE("Trying to find suitable codename for %d", *it );
-+            while ( true )
-+            {
-+                String sTmpName( RTL_CONSTASCII_USTRINGPARAM("Sheet" ) );
-+                sTmpName += String::CreateFromInt32( sal_Int32(nTab++) );
-+                std::vector< String >::iterator codeName_It = CodeNames.begin();
-+                std::vector< String >::iterator codeName_It_end = CodeNames.end();
-+                // search for codename
-+                for ( ; codeName_It != codeName_It_end; ++codeName_It )
-+                {
-+                    if ( *codeName_It == sTmpName )
-+                        break;
-+                }
-+
-+                if ( codeName_It == codeName_It_end ) // generated codename not found
-+                {
-+                    OSL_TRACE("Using generated codename %s", rtl::OUStringToOString( sTmpName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+                    // Set new codename
-+                    GetDoc().SetCodeName( *it, sTmpName );
-+                    // Record newly used codename
-+                    CodeNames.push_back( sTmpName );
-+                    // Record those we have created so they can be created in
-+                    // basic
-+                    AutoGeneratedCodeNames.push_back( sTmpName );
-+                    break;
-+                }
-+            }
-+            
-+        }
-         // #i45843# Convert pivot tables before calculation, so they are available
-         // for the GETPIVOTDATA function.
-         if( GetBiff() == EXC_BIFF8 )
-diff --git sc/source/filter/inc/excimp8.hxx sc/source/filter/inc/excimp8.hxx
-index f35faef..226ec6b 100644
---- sc/source/filter/inc/excimp8.hxx
-+++ sc/source/filter/inc/excimp8.hxx
-@@ -54,6 +54,9 @@ class ImportExcel8 : public ImportExcel
- {
-         SCTAB mnTab;
- 	protected:
-+        // represents codename ( and associated modules ) 
-+        // not speficied directly in the binary format
-+        std::vector< String > AutoGeneratedCodeNames; 
-         ExcScenarioList         aScenList;
- 
- 		BOOL					bHasBasic;
-diff --git svx/inc/svxmsbas.hxx svx/inc/svxmsbas.hxx
-index fab5faf..f1a4c44 100644
---- svx/inc/svxmsbas.hxx
-+++ svx/inc/svxmsbas.hxx
-@@ -76,8 +76,10 @@ public:
- 	// 0 - nothing has done
- 	// bit 0 = 1 -> any code is imported to the SO-Basic
- 	// bit 1 = 1 -> the VBA - storage is copy to the ObjectShell storage
--	int Import( const String& rStorageName, const String &rSubStorageName,
-+	int Import( const String& rStorageName, const String &rSubStorageName, 
- 				BOOL bAsComment=TRUE, BOOL bStripped=TRUE );
-+	int Import( const String& rStorageName, const String &rSubStorageName, 
-+				const std::vector< String >& codeNames, BOOL bAsComment=TRUE, BOOL bStripped=TRUE );
- 
- 	// only for the export - copy or delete the saved VBA-macro-storage
- 	// form the ObjectShell
-@@ -98,15 +100,16 @@ private:
- 	BOOL bImport;
- 	BOOL bCopy;
- 
--	SVX_DLLPRIVATE BOOL ImportCode_Impl( const String& rStorageName,
--						  const String &rSubStorageName,
--						  BOOL bAsComment, BOOL bStripped );
-+    SVX_DLLPRIVATE BOOL ImportCode_Impl( const String& rStorageName,
-+                                                  const String &rSubStorageName,
-+	                                              const std::vector< String >&,
-+                                                  BOOL bAsComment, BOOL bStripped );
- 	SVX_DLLPRIVATE bool ImportForms_Impl(const String& rStorageName, 
- 		const String &rSubStorageName, BOOL bVBAMode );
- 	SVX_DLLPRIVATE BOOL CopyStorage_Impl( const String& rStorageName,
- 						   const String &rSubStorageName);
-         rtl::OUString msProjectName;
--	SVX_DLLPRIVATE BOOL ImportCode_Impl( VBA_Impl&, BOOL, BOOL );
-+	SVX_DLLPRIVATE BOOL ImportCode_Impl( VBA_Impl&, const std::vector< String >&, BOOL, BOOL );
- 	SVX_DLLPRIVATE bool ImportForms_Impl( VBA_Impl&, const String&, const String&, BOOL);
- };
- 
-diff --git svx/source/msfilter/svxmsbas.cxx svx/source/msfilter/svxmsbas.cxx
-index d4d6838..0ebc074 100644
---- svx/source/msfilter/svxmsbas.cxx
-+++ svx/source/msfilter/svxmsbas.cxx
-@@ -62,6 +62,8 @@ using namespace com::sun::star;
- 
- using rtl::OUString;
- 
-+static ::rtl::OUString sVBAOption( RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ); 
-+
- void SvxImportMSVBasic::extractAttribute( const String& rAttribute, const String& rModName )
- {
-     // format of the attribute we are interested in is
-@@ -83,9 +85,17 @@ int SvxImportMSVBasic::Import( const String& rStorageName,
- 								const String &rSubStorageName,
- 								BOOL bAsComment, BOOL bStripped )
- {
-+    std::vector< String > codeNames;
-+    return Import(  rStorageName, rSubStorageName, codeNames, bAsComment, bStripped );
-+}
-+int SvxImportMSVBasic::Import( const String& rStorageName,
-+								const String &rSubStorageName,
-+								const std::vector< String >& codeNames,
-+								BOOL bAsComment, BOOL bStripped )
-+{
-         msProjectName = rtl::OUString();
- 	int nRet = 0;
--	if( bImport && ImportCode_Impl( rStorageName, rSubStorageName,
-+	if( bImport && ImportCode_Impl( rStorageName, rSubStorageName, codeNames, 
- 									bAsComment, bStripped ))
- 		nRet |= 1;
- 
-@@ -296,6 +306,7 @@ BOOL SvxImportMSVBasic::CopyStorage_Impl( const String& rStorageName,
- 
- BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
- 										const String &rSubStorageName,
-+										const std::vector< String >& codeNames,
- 										BOOL bAsComment, BOOL bStripped )
- {
- 	BOOL bRet = FALSE;
-@@ -308,31 +319,24 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
-         if ( msProjectName.getLength() )
-             rDocSh.GetBasicManager()->SetName( msProjectName ); // set name of Project
- 
--        bRet = ImportCode_Impl( aVBA, bAsComment, bStripped );
-+        bRet = ImportCode_Impl( aVBA, codeNames, bAsComment, bStripped );
-     	std::vector<rtl::OUString> sProjectRefs = aVBA.ProjectReferences();
-     
-     	for ( std::vector<rtl::OUString>::iterator it = sProjectRefs.begin(); it != sProjectRefs.end(); ++it )
-         {
-             rtl::OUString sFileName = *it;
--#ifndef WIN 
--#ifdef DEBUG
--            // hacky test code to read referenced projects on linux
--            sal_Int32 nPos = (*it).lastIndexOf('\\');
--            sFileName = (*it).copy( nPos + 1 );
--            sFileName =  rtl::OUString::createFromAscii("~/Documents/") + sFileName;
--#endif
--#endif
-     		OSL_TRACE("referenced project %s ", rtl::OUStringToOString( sFileName, RTL_TEXTENCODING_UTF8 ).getStr() );
-             SotStorageRef rRoot = new SotStorage( sFileName, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
-     	    VBA_Impl refVBA( *rRoot, bAsComment );
--    	    if( refVBA.Open(rStorageName,rSubStorageName) && ImportCode_Impl( refVBA, bAsComment, bStripped ) )
-+			std::vector< String > codeNamesNone;
-+    	    if( refVBA.Open(rStorageName,rSubStorageName) && ImportCode_Impl( refVBA, codeNamesNone, bAsComment, bStripped ) )
-                 bRet = TRUE; // mark that some code was imported
-         }
-     }
-     return bRet;
- }
- 
--BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, BOOL bAsComment, BOOL bStripped )
-+BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< String >& codeNames, BOOL bAsComment, BOOL bStripped )
- {
-         BOOL bRet = FALSE;
- 		SFX_APP()->EnterBasicCall();
-@@ -357,7 +361,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, BOOL bAsComment, BOOL b
-         }
- 		if( xLib.is()  )
- 		{
--            Reference< container::XNameAccess > xVBAObjectForCodeName;
-+            Reference< container::XNameAccess > xVBACodeNamedObjectAccess;
- 			if ( !bAsComment )
-             {
-                 rDocSh.GetBasicManager()->GetLib( aLibName )->SetVBAEnabled( true );
-@@ -366,11 +370,16 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, BOOL bAsComment, BOOL b
-                 {
-                     try
-                     {
--                        xVBAObjectForCodeName.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), UNO_QUERY );
-+                        xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), UNO_QUERY );
-                     }
-                     catch( Exception& ) { }
-                 }
-             }
-+            typedef  std::hash_map< rtl::OUString, uno::Any, ::rtl::OUStringHash,
-+::std::equal_to< ::rtl::OUString > > NameModuleDataHash;
-+
-+            NameModuleDataHash moduleData;
-+
- 			for( UINT16 i=0; i<nStreamCount;i++)
- 			{
- 				StringArray aDecompressed = aVBA.Decompress(i);
-@@ -436,7 +445,6 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, BOOL bAsComment, BOOL b
-                         DBG_ERRORFILE( "SvxImportMSVBasic::ImportCode_Impl - unknown module type" );
-                         break;
-                 }
--				static ::rtl::OUString sVBAOption( RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ); 
- 				static ::rtl::OUString sClassOption( RTL_CONSTASCII_USTRINGPARAM( "Option ClassModule\n" ) ); 
- 				if ( !bAsComment /*&& !rDocSh.GetBasic()->isVBAEnabled() */)
- 				{
-@@ -508,60 +516,79 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, BOOL bAsComment, BOOL b
- 						aSource += rtl::OUString::createFromAscii("\nEnd Sub");
- 				}
- 				::rtl::OUString aModName( sModule );
--				{
--					aSource = modeTypeComment + aSource;
-+				aSource = modeTypeComment + aSource;
- 
--					Any aSourceAny;
--                    OSL_TRACE("erm %d", mType );
--                    if (  !bAsComment )
--                    {
--                        OSL_TRACE("vba processing  %d", mType );
--                        script::ModuleInfo sModuleInfo;
--                        sModuleInfo.ModuleName = aModName;
--                        sModuleInfo.ModuleSource = aSource;
--                        sModuleInfo.ModuleType = mType;
--                       if ( mType == ModuleType::Form )
--                            // hack, the module ( imo document basic should...
--                            // know the XModel... ) but it doesn't
--                            sModuleInfo.ModuleObject.set( rDocSh.GetModel(), UNO_QUERY );
--			//  document modules, we should be able to access
--			//  the api objects at this time
--                        else if ( mType == ModuleType::Document )
--			{
--				uno::Reference< lang::XMultiServiceFactory> xSF( rDocSh.GetModel(), uno::UNO_QUERY);
--				uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess;
--    				if ( xSF.is() )
--				        xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY );    
--				// get the api object for the codename
--				if ( xVBACodeNamedObjectAccess.is() )
--				{
--					try
--					{
--						sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );    
--						OSL_TRACE("** Straight up creation of Module");
--					}
--					catch(uno::Exception& e)
--					{
--						OSL_TRACE("Failed to get documument object for %s", rtl::OUStringToOString( sModuleInfo.ModuleName, RTL_TEXTENCODING_UTF8 ).getStr() );
--					}
--				}
--			}
--                        aSourceAny <<= sModuleInfo;
--                    }
--                    else
--					    aSourceAny <<= aSource;
--					if( xLib->hasByName( aModName ) )
--						xLib->replaceByName( aModName, aSourceAny );
--					else
--						xLib->insertByName( aModName, aSourceAny );
--				}                                
--
--				bRet = true;
--			}
--		}
-+				Any aSourceAny;
-+                OSL_TRACE("erm %d", mType );
-+                if (  !bAsComment )
-+                {
-+                    OSL_TRACE("vba processing  %d", mType );
-+                    script::ModuleInfo sModuleInfo;
-+                    sModuleInfo.ModuleName = aModName;
-+                    sModuleInfo.ModuleSource = aSource;
-+                    sModuleInfo.ModuleType = mType;
-+                    aSourceAny <<= sModuleInfo;
-+                }
-+                else
-+                    aSourceAny <<= aSource;
-+                moduleData[ aModName ] = aSourceAny;
-+            }
-+
-+            // Hack for missing codenames ( only know to happen in excel but... )
-+            // only makes sense to do this if we are importing non-commented basic
-+            if ( !bAsComment )
-+            {
-+                for ( std::vector< String >::const_iterator it =  codeNames.begin(); it != codeNames.end(); ++it )
-+                {
-+                    script::ModuleInfo sModuleInfo;
-+                    sModuleInfo.ModuleName = *it;
-+                    sModuleInfo.ModuleType = ModuleType::Document ;
-+                    sModuleInfo.ModuleSource = sVBAOption;
-+                    moduleData[ *it ] = uno::makeAny( sModuleInfo );
-+                }
-+            }
-+            NameModuleDataHash::iterator it_end = moduleData.end();
-+            for ( NameModuleDataHash::iterator it = moduleData.begin(); it != it_end; ++it )
-+            {
-+                script::ModuleInfo sModuleInfo;
-+                if ( it->second >>=sModuleInfo )
-+                {
-+            
-+                    if ( sModuleInfo.ModuleType == ModuleType::Form )
-+                        // hack, the module ( imo document basic should...
-+                        // know the XModel... ) but it doesn't
-+                        sModuleInfo.ModuleObject.set( rDocSh.GetModel(), UNO_QUERY );
-+                    //  document modules, we should be able to access
-+			        //  the api objects at this time
-+                    else if ( sModuleInfo.ModuleType == ModuleType::Document )
-+			        {
-+                        if ( xVBACodeNamedObjectAccess.is() )
-+                        {
-+                            try
-+                            {
-+                                sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );    
-+                                OSL_TRACE("** Straight up creation of Module");
-+                            }
-+                            catch(uno::Exception& e)
-+                            {
-+    						    OSL_TRACE("Failed to get documument object for %s", rtl::OUStringToOString( sModuleInfo.ModuleName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    					    }
-+    				    }
-+    			    }
-+                    it->second = uno::makeAny( sModuleInfo );
-+                }
-+                     
-+                if( xLib->hasByName( it->first ) )
-+                    xLib->replaceByName( it->first, it->second );
-+                else
-+                    xLib->insertByName( it->first, it->second );
-+                bRet = true;
-+            }                                
-+
-+        }
-         if( bRet )
--		SFX_APP()->LeaveBasicCall();
--	return bRet;
-+            SFX_APP()->LeaveBasicCall();
-+	    return bRet;
- }
- 
- /* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/applied_patches/0517-autocorrect-accidental-caps-lock-offapi.diff b/applied_patches/0400-autocorrect-accidental-caps-lock-offapi.diff
similarity index 100%
rename from applied_patches/0517-autocorrect-accidental-caps-lock-offapi.diff
rename to applied_patches/0400-autocorrect-accidental-caps-lock-offapi.diff
diff --git a/applied_patches/0400-vba-zoom-per-sheet.diff b/applied_patches/0400-vba-zoom-per-sheet.diff
deleted file mode 100644
index 2cb61a857..000000000
--- a/applied_patches/0400-vba-zoom-per-sheet.diff
+++ /dev/null
@@ -1,273 +0,0 @@
-diff --git sc/source/ui/inc/tabview.hxx sc/source/ui/inc/tabview.hxx
-index 882c88b..95a5663 100644
---- sc/source/ui/inc/tabview.hxx
-+++ sc/source/ui/inc/tabview.hxx
-@@ -298,7 +298,7 @@ public:
- 
- 	void			TabChanged();
- 	void			SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
--    void            RefreshZoom();
-+	SC_DLLPUBLIC void            RefreshZoom();
- 	void			SetPagebreakMode( BOOL bSet );
- 
- 	void			UpdateLayerLocks();
-diff --git sc/source/ui/inc/viewdata.hxx sc/source/ui/inc/viewdata.hxx
-index 27e6821..8557dc9 100644
---- sc/source/ui/inc/viewdata.hxx
-+++ sc/source/ui/inc/viewdata.hxx
-@@ -239,6 +239,7 @@ private:
- 
- 	SC_DLLPRIVATE void			CalcPPT();
-     SC_DLLPRIVATE void          CreateTabData( SCTAB nNewTab );
-+    SC_DLLPRIVATE void          CreateTabData( std::vector< SCTAB >& rvTabs );
-     SC_DLLPRIVATE void          CreateSelectedTabData();
- 
- public:
-@@ -332,6 +333,8 @@ public:
- 	void			SetPasteMode ( ScPasteFlags nFlags )            { nPasteFlags = nFlags; }
- 
-     void            SetZoomType( SvxZoomType eNew, BOOL bAll );
-+    void            SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs );
-+    void            SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vector< SCTAB >& tabs );
-     void            SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
-     void            RefreshZoom();
- 
-diff --git sc/source/ui/vba/excelvbahelper.cxx sc/source/ui/vba/excelvbahelper.cxx
-index 5f133d9..c98cab0 100644
---- sc/source/ui/vba/excelvbahelper.cxx
-+++ sc/source/ui/vba/excelvbahelper.cxx
-@@ -44,6 +44,13 @@ namespace vba
- {
- namespace excel
- {
-+void implSetZoom( const uno::Reference< frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs )
-+{
-+    ScTabViewShell* pViewSh = excel::getBestViewShell( xModel );
-+    Fraction aFract( nZoom, 100 );
-+    pViewSh->GetViewData()->SetZoom( aFract, aFract, nTabs );
-+    pViewSh->RefreshZoom();
-+}
- bool isInPrintPreview( SfxViewFrame* pView )
- {
- 	sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
-diff --git sc/source/ui/vba/excelvbahelper.hxx sc/source/ui/vba/excelvbahelper.hxx
-index 3a3b7f8..af3e0bb 100644
---- sc/source/ui/vba/excelvbahelper.hxx
-+++ sc/source/ui/vba/excelvbahelper.hxx
-@@ -41,6 +41,8 @@ namespace ooo
- 	{
- 	namespace excel
-         { 
-+                // nTabs empty means apply zoom to all sheets
-+                void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs );
- 		void implnCopy();
- 		void implnPaste();
- 		void implnCut();
-diff --git sc/source/ui/vba/vbawindow.cxx sc/source/ui/vba/vbawindow.cxx
-index c64e156..ea93022 100644
---- sc/source/ui/vba/vbawindow.cxx
-+++ sc/source/ui/vba/vbawindow.cxx
-@@ -58,6 +58,9 @@ using namespace ::com::sun::star;
- using namespace ::ooo::vba;
- using namespace ::ooo::vba::excel::XlWindowState;
- 
-+// nameExists defined in vbaworksheet.cxx
-+bool nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, ::rtl::OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException );
-+
- typedef  std::hash_map< rtl::OUString,
- SCTAB, ::rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > NameIndexHash;
-@@ -735,24 +738,18 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException)
- void SAL_CALL 
- ScVbaWindow::setZoom( const uno::Any& _zoom ) throw (uno::RuntimeException)
- {
--	uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
--	rtl::OUString sZoomType( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) );
--	sal_Int16 nZoomType = view::DocumentZoomType::PAGE_WIDTH;
--	if( _zoom.getValueTypeClass() == uno::TypeClass_BOOLEAN )
--	{		
--		//zoom type is PAGE_WIDTH_EXACT in helperapi, it seems that there is a issue for this zoom type in current OOo.
--		// so PAGE_WIDTH is used.   	
--		xProps->setPropertyValue(sZoomType, uno::makeAny( nZoomType ));
--	}					
--	else
--	{
--		nZoomType = view::DocumentZoomType::BY_VALUE;
--		rtl::OUString sZoomValue( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMVALUE ));
--		sal_Int16 nZoomValue = 100;
--		_zoom >>= nZoomValue;
--		xProps->setPropertyValue( sZoomType, uno::makeAny( nZoomType ));
--		xProps->setPropertyValue( sZoomValue, uno::makeAny( nZoomValue ));
--	}			
-+    sal_Int16 nZoom = 100;
-+    _zoom >>= nZoom;
-+    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( m_xModel, uno::UNO_QUERY_THROW );
-+    uno::Reference< excel::XWorksheet > xActiveSheet = ActiveSheet();
-+    SCTAB nTab = 0;
-+    rtl::OUString sName = xActiveSheet->getName();
-+    bool bSheetExists = nameExists (xSpreadDoc, sName, nTab);
-+    if ( !bSheetExists )
-+        throw uno::RuntimeException();
-+    std::vector< SCTAB > vTabs;
-+    vTabs.push_back( nTab );
-+    excel::implSetZoom( m_xModel, nZoom, vTabs );
- }
- 
- uno::Reference< excel::XWorksheet > SAL_CALL 
-diff --git sc/source/ui/vba/vbaworksheet.cxx sc/source/ui/vba/vbaworksheet.cxx
-index a416c8c..76c2f21 100644
---- sc/source/ui/vba/vbaworksheet.cxx
-+++ sc/source/ui/vba/vbaworksheet.cxx
-@@ -96,7 +96,7 @@
- #define DOESNOTEXIST -1
- using namespace com::sun::star;
- using namespace ooo::vba;
--static bool
-+bool
- nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, ::rtl::OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException )
- {
- 	if (!xSpreadDoc.is())
-diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
-index ea04a47..1b2a7b8 100644
---- sc/source/ui/view/viewdata.cxx
-+++ sc/source/ui/view/viewdata.cxx
-@@ -650,66 +650,103 @@ void ScViewData::SetViewShell( ScTabViewShell* pViewSh )
- 		pView		= NULL;
- 	}
- }
-+void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs )
-+{
-+    std::vector< SCTAB >::iterator it_end = rvTabs.end();
-+    for ( std::vector< SCTAB >::iterator it = rvTabs.begin(); it != it_end; ++it )
-+        if ( !pTabData[*it] )
-+            CreateTabData( *it );
-+}
- 
--void ScViewData::SetZoomType( SvxZoomType eNew, BOOL bAll )
-+void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs )
- {
--    if ( !bAll )
--        CreateSelectedTabData();    // if zoom is set for a table, it must be stored
-+    BOOL bAll = ( tabs.size() == 0 );
-+
-+    if ( !bAll ) // create associated table data
-+        CreateTabData( tabs );
- 
--    for ( SCTAB i = 0; i <= MAXTAB; i++ )
--        if ( pTabData[i] && ( bAll || aMarkData.GetTableSelect(i) ) )
-+    std::vector< SCTAB >::iterator it_end = tabs.end();
-+    std::vector< SCTAB >::iterator it = tabs.begin();
-+    for ( SCTAB i = ( bAll ? 0 : *it ); ( bAll ? i <= MAXTAB :  it != it_end  ); ++i , ++it )
-+    {
-+        if ( pTabData[i] )
-             pTabData[i]->eZoomType = eNew;
-+    } 
- 
-     if ( bAll )
-         eDefZoomType = eNew;
- }
- 
--void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll )
-+void ScViewData::SetZoomType( SvxZoomType eNew, BOOL bAll )
-+{
-+    std::vector< SCTAB > vTabs; // Empty for all tabs
-+    if ( !bAll ) // get selected tabs
-+    {
-+        SCTAB nTabCount = pDoc->GetTableCount();
-+        for (SCTAB i=0; i<nTabCount; i++)
-+        {
-+            if ( aMarkData.GetTableSelect(i)  )
-+                vTabs.push_back( i );
-+        }
-+    } 
-+    SetZoomType( eNew, vTabs );
-+}
-+
-+void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vector< SCTAB >& tabs )
- {
--    if ( !bAll )
--        CreateSelectedTabData();    // if zoom is set for a table, it must be stored
-+    BOOL bAll = ( tabs.size() == 0 );
-+    if ( !bAll ) // create associated table data
-+        CreateTabData( tabs );
-+    Fraction aFrac20( 1,5 );
-+    Fraction aFrac400( 4,1 );
- 
--	Fraction aFrac20( 1,5 );
--	Fraction aFrac400( 4,1 );
-+    Fraction aValidX = rNewX;
-+    if (aValidX<aFrac20)
-+        aValidX = aFrac20;
-+    if (aValidX>aFrac400)
-+        aValidX = aFrac400;
- 
--	Fraction aValidX = rNewX;
--	if (aValidX<aFrac20) aValidX = aFrac20;
--	if (aValidX>aFrac400) aValidX = aFrac400;
-+    Fraction aValidY = rNewY;
-+    if (aValidY<aFrac20)
-+        aValidY = aFrac20;
-+    if (aValidY>aFrac400)
-+        aValidY = aFrac400;
- 
--	Fraction aValidY = rNewY;
--	if (aValidY<aFrac20) aValidY = aFrac20;
--	if (aValidY>aFrac400) aValidY = aFrac400;
-+    std::vector< SCTAB >::iterator it_end = tabs.end();
-+    std::vector< SCTAB >::iterator it = tabs.begin();
- 
--	if ( bPagebreak )
--	{
--        for ( SCTAB i = 0; i <= MAXTAB; i++ )
--            if ( pTabData[i] && ( bAll || aMarkData.GetTableSelect(i) ) )
-+    for ( SCTAB i = ( bAll ? 0 : *it ); ( bAll ? i <= MAXTAB :  it != it_end  ); ++i , ++it )
-+    {
-+        if ( pTabData[i] )
-+        {
-+            if ( bPagebreak )
-             {
-                 pTabData[i]->aPageZoomX = aValidX;
-                 pTabData[i]->aPageZoomY = aValidY;
-             }
--        if ( bAll )
--        {
--            aDefPageZoomX = aValidX;
--            aDefPageZoomY = aValidY;
--        }
--	}
--	else
--	{
--        for ( SCTAB i = 0; i <= MAXTAB; i++ )
--            if ( pTabData[i] && ( bAll || aMarkData.GetTableSelect(i) ) )
-+            else
-             {
-                 pTabData[i]->aZoomX = aValidX;
-                 pTabData[i]->aZoomY = aValidY;
-             }
--        if ( bAll )
--        {
--            aDefZoomX = aValidX;
--            aDefZoomY = aValidY;
-         }
--	}
-+    }
-+    RefreshZoom();
-+}
- 
--	RefreshZoom();
-+void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll )
-+{
-+    std::vector< SCTAB > vTabs;
-+    if ( !bAll ) // get selected tabs
-+    {
-+        SCTAB nTabCount = pDoc->GetTableCount();
-+        for (SCTAB i=0; i<nTabCount; i++)
-+        {
-+            if ( aMarkData.GetTableSelect(i)  )
-+                vTabs.push_back( i );
-+        }
-+    } 
-+    SetZoom( rNewX, rNewY, vTabs );
- }
- 
- void ScViewData::SetShowGrid( bool bShow )
diff --git a/applied_patches/0518-autocorrect-accidental-caps-lock-officecfg.diff b/applied_patches/0401-autocorrect-accidental-caps-lock-officecfg.diff
similarity index 100%
rename from applied_patches/0518-autocorrect-accidental-caps-lock-officecfg.diff
rename to applied_patches/0401-autocorrect-accidental-caps-lock-officecfg.diff
diff --git a/applied_patches/0401-vba-fallback-to-calling-doc-context.diff b/applied_patches/0401-vba-fallback-to-calling-doc-context.diff
deleted file mode 100644
index 2f761cfde..000000000
--- a/applied_patches/0401-vba-fallback-to-calling-doc-context.diff
+++ /dev/null
@@ -1,735 +0,0 @@
-diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
-index 4d1db8b..e064e41 100644
---- sc/source/filter/excel/excimp8.cxx
-+++ sc/source/filter/excel/excimp8.cxx
-@@ -276,7 +276,9 @@ void ImportExcel8::ReadBasic( void )
-         if( bLoadCode || bLoadStrg )
-         {
-             uno::Any aGlobs;
--            aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.excel.Globals") );
-+            uno::Sequence< uno::Any > aArgs(1);
-+            aArgs[ 0 ] <<= pShell->GetModel();
-+            aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "ooo.vba.excel.Globals"), aArgs );
-             pShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
-             SvxImportMSVBasic aBasicImport( *pShell, *xRootStrg, bLoadCode, bLoadStrg );
- 	    bool bAsComment = !bLoadExecutable || !aGlobs.hasValue();
-diff --git sc/source/ui/vba/excelvbahelper.cxx sc/source/ui/vba/excelvbahelper.cxx
-index 5f133d9..d4f8967 100644
---- sc/source/ui/vba/excelvbahelper.cxx
-+++ sc/source/ui/vba/excelvbahelper.cxx
-@@ -107,10 +107,10 @@ public:
- };
- 
- void
--implnPaste()
-+implnPaste( const uno::Reference< frame::XModel>& xModel )
- {
- 	PasteCellsWarningReseter resetWarningBox;
--	ScTabViewShell* pViewShell = getCurrentBestViewShell();
-+	ScTabViewShell* pViewShell = getBestViewShell( xModel );
- 	if ( pViewShell )
- 	{
- 		pViewShell->PasteFromSystem();
-@@ -120,31 +120,28 @@ implnPaste()
- 
- 
- void
--implnCopy()
-+implnCopy( const uno::Reference< frame::XModel>& xModel )
- {
--	ScTabViewShell* pViewShell = getCurrentBestViewShell();
-+	ScTabViewShell* pViewShell = getBestViewShell( xModel );
- 	if ( pViewShell )
- 		pViewShell->CopyToClip(NULL,false,false,true);
- }
- 
- void 
--implnCut()
-+implnCut( const uno::Reference< frame::XModel>& xModel )
- {
--	ScTabViewShell* pViewShell =  getCurrentBestViewShell();
-+	ScTabViewShell* pViewShell =  getBestViewShell( xModel );
- 	if ( pViewShell )
- 		pViewShell->CutToClip( NULL, TRUE );
- }
- 
--void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
-+void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
- {
- 	PasteCellsWarningReseter resetWarningBox;
- 	sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
- 	InsCellCmd eMoveMode = INS_NONE;
- 
--	ScTabViewShell* pTabViewShell = ScTabViewShell::GetActiveViewShell();
--	if ( !pTabViewShell ) 
--		// none active, try next best
--		pTabViewShell = getCurrentBestViewShell();
-+	ScTabViewShell* pTabViewShell = getBestViewShell( xModel );
- 	if ( pTabViewShell )
- 	{
- 		ScViewData* pView = pTabViewShell->GetViewData();	
-@@ -191,16 +188,16 @@ getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel )
- }
- 
- ScTabViewShell* 
--getCurrentBestViewShell()
-+getCurrentBestViewShell(  const uno::Reference< uno::XComponentContext >& xContext )
- { 
--	uno::Reference< frame::XModel > xModel = getCurrentExcelDoc();
-+	uno::Reference< frame::XModel > xModel = getCurrentExcelDoc( xContext );
- 	return getBestViewShell( xModel );
- }
- 
- SfxViewFrame* 
--getCurrentViewFrame()
-+getViewFrame( const uno::Reference< frame::XModel >& xModel )
- {
--	ScTabViewShell* pViewShell = getCurrentBestViewShell();	
-+	ScTabViewShell* pViewShell = getBestViewShell( xModel );	
- 	if ( pViewShell )
- 		return pViewShell->GetViewFrame();
- 	return NULL;
-diff --git sc/source/ui/vba/excelvbahelper.hxx sc/source/ui/vba/excelvbahelper.hxx
-index 3a3b7f8..8c7c430 100644
---- sc/source/ui/vba/excelvbahelper.hxx
-+++ sc/source/ui/vba/excelvbahelper.hxx
-@@ -41,15 +41,15 @@ namespace ooo
- 	namespace excel
-         { 
-                 // nTabs empty means apply zoom to all sheets
-                 void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs );
--		void implnCopy();
--		void implnPaste();
--		void implnCut();
--		void implnPasteSpecial(sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
-+		void implnCopy( const css::uno::Reference< css::frame::XModel>& xModel );
-+		void implnPaste ( const css::uno::Reference< css::frame::XModel>& xModel );
-+		void implnCut( const css::uno::Reference< css::frame::XModel>& xModel );
-+		void implnPasteSpecial( const css::uno::Reference< css::frame::XModel>& xModel, sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
- 		ScTabViewShell* getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
- 		ScDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel ) ;
--		ScTabViewShell* getCurrentBestViewShell();
--		SfxViewFrame* getCurrentViewFrame();
-+		ScTabViewShell* getCurrentBestViewShell( const css::uno::Reference< css::uno::XComponentContext >& xContext );
-+		SfxViewFrame* getViewFrame( const css::uno::Reference< css::frame::XModel >& xModel );
-             class ScVbaCellRangeAccess
-             {
-             public:
-diff --git sc/source/ui/vba/vbaapplication.cxx sc/source/ui/vba/vbaapplication.cxx
-index 68d0834..68dff2f 100644
---- sc/source/ui/vba/vbaapplication.cxx
-+++ sc/source/ui/vba/vbaapplication.cxx
-@@ -125,7 +125,7 @@ class ActiveWorkbook : public ScVbaWorkbook
- protected:
- 	virtual uno::Reference< frame::XModel > getModel()
- 	{ 	
--		return getCurrentExcelDoc(); 
-+		return getCurrentExcelDoc(mxContext); 
- 	}
- public:
- 	ActiveWorkbook( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext) : ScVbaWorkbook(  xParent, xContext ){}
-@@ -230,7 +230,7 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException )
- {
- 	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
- 	uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW);
--	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell();
-+	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell(mxContext);
- 	if ( !pViewShell )
- 		throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewShell available"), uno::Reference< uno::XInterface >() );
- 	ScViewData* pTabView = pViewShell->GetViewData();
-@@ -509,7 +509,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
-                 xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-         uno::Reference< sheet::XSpreadsheet > xDoc = xSpreadsheet->getActiveSheet();
- 
--        ScTabViewShell* pShell = excel::getCurrentBestViewShell();
-+        ScTabViewShell* pShell = excel::getCurrentBestViewShell( mxContext );
-         ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow(); 
-         try
-         {
-@@ -551,7 +551,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
-     if( Reference >>= xRange )
-     {
-         uno::Reference< excel::XRange > xVbaRange( Reference, uno::UNO_QUERY );
--        ScTabViewShell* pShell = excel::getCurrentBestViewShell();
-+        ScTabViewShell* pShell = excel::getCurrentBestViewShell( mxContext );
-         ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow(); 
-         if ( xVbaRange.is() )
-         {
-@@ -1135,7 +1135,7 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile )  throw ( uno::RuntimeExc
- ScVbaApplication::getDisplayFormulaBar() throw ( css::uno::RuntimeException )
- {
- 	sal_Bool bRes = sal_False;
--	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell();
-+	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext );
- 	if ( pViewShell )
- 	{
- 		SfxBoolItem sfxFormBar( FID_TOGGLEINPUTLINE);
-@@ -1153,7 +1153,7 @@ ScVbaApplication::getDisplayFormulaBar() throw ( css::uno::RuntimeException )
- void SAL_CALL 
- ScVbaApplication::setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw ( css::uno::RuntimeException )
- {
--	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell();
-+	ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext );
- 	if ( pViewShell && ( _displayformulabar !=  getDisplayFormulaBar() ) )
- 	{
- 		SfxBoolItem sfxFormBar( FID_TOGGLEINPUTLINE, _displayformulabar);
-@@ -1185,7 +1185,7 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep
- uno::Reference< frame::XModel > 
- ScVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
- {
--    return getCurrentExcelDoc();
-+    return getCurrentExcelDoc(mxContext);
- }
- 
- uno::Any SAL_CALL
-diff --git sc/source/ui/vba/vbachartobject.cxx sc/source/ui/vba/vbachartobject.cxx
-index 71942f1..2a2899e 100644
---- sc/source/ui/vba/vbachartobject.cxx
-+++ sc/source/ui/vba/vbachartobject.cxx
-@@ -124,7 +124,7 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException )
- 		// fact probably the chart object should be created with 
- 		// the XModel owner
- 		//uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getXModel().getCurrentController());
--		uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getCurrentExcelDoc()->getCurrentController(), uno::UNO_QUERY_THROW );
-+		uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getCurrentExcelDoc(mxContext)->getCurrentController(), uno::UNO_QUERY_THROW );
- 		xSelectionSupplier->select(uno::makeAny(xShape));
- 	}
- 	catch (uno::Exception& )
-diff --git sc/source/ui/vba/vbaglobals.cxx sc/source/ui/vba/vbaglobals.cxx
-index ac5e4f5..6181cf0 100644
---- sc/source/ui/vba/vbaglobals.cxx
-+++ sc/source/ui/vba/vbaglobals.cxx
-@@ -50,10 +50,20 @@ using namespace ::ooo::vba;
- // ScVbaGlobals
- // =============================================================================
- 
--ScVbaGlobals::ScVbaGlobals(  css::uno::Reference< css::uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext )
-+//ScVbaGlobals::ScVbaGlobals(  css::uno::Reference< css::uno::XComponentContext >const& rxContext,  ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext )
-+rtl::OUString sDocCtxName( RTL_CONSTASCII_USTRINGPARAM("ExcelDocumentContext") );
-+
-+ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, sDocCtxName )
- {
- 	OSL_TRACE("ScVbaGlobals::ScVbaGlobals()");
--        init( rxContext, uno::Any( getApplication() ) );
-+
-+        uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
-+        aInitArgs[ 0 ].Name = rtl::OUString::createFromAscii("Application");
-+        aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
-+        aInitArgs[ 1 ].Name = sDocCtxName;
-+        aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
-+        
-+        init( aInitArgs );
- }
- 
- ScVbaGlobals::~ScVbaGlobals()
-@@ -68,8 +78,9 @@ uno::Reference<excel::XApplication >
- ScVbaGlobals::getApplication() throw (uno::RuntimeException)
- {
- //	OSL_TRACE("In ScVbaGlobals::getApplication");	
--	static  uno::Reference< excel::XApplication > ExcelApplication( new ScVbaApplication( mxContext) );
--   	return ExcelApplication; 
-+        if ( !mxApplication.is() )
-+	    mxApplication.set( new ScVbaApplication( mxContext) );
-+   	return mxApplication; 
- }
- 
- uno::Reference< excel::XWorkbook > SAL_CALL 
-@@ -264,7 +275,7 @@ ScVbaGlobals::getServiceNames()
- namespace globals
- {
- namespace sdecl = comphelper::service_decl;
--sdecl::vba_service_class_<ScVbaGlobals, sdecl::with_args<false> > serviceImpl;
-+sdecl::vba_service_class_<ScVbaGlobals, sdecl::with_args<true> > serviceImpl;
- extern sdecl::ServiceDecl const serviceDecl(
-     serviceImpl,
-     "ScVbaGlobals",
-diff --git sc/source/ui/vba/vbaglobals.hxx sc/source/ui/vba/vbaglobals.hxx
-index 66dd1fa..53838b9 100644
---- sc/source/ui/vba/vbaglobals.hxx
-+++ sc/source/ui/vba/vbaglobals.hxx
-@@ -48,13 +48,16 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc
- 
-     class ScVbaGlobals : public ScVbaGlobals_BASE
-     {
-+        css::uno::Reference< ov::excel::XApplication > mxApplication;
-         virtual css::uno::Reference<
-  ov::excel::XApplication > SAL_CALL getApplication()
-                         throw (css::uno::RuntimeException);
-     public:
- 	
--        ScVbaGlobals(
-+        ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs,
-             css::uno::Reference< css::uno::XComponentContext >const& rxContext );
-+        //ScVbaGlobals(
-+        //    css::uno::Reference< css::uno::XComponentContext >const& rxContext,  );
-         virtual ~ScVbaGlobals();
- 
-         // XGlobals
-diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index 4512c46..a3907a7 100644
---- sc/source/ui/vba/vbarange.cxx
-+++ sc/source/ui/vba/vbarange.cxx
-@@ -1996,9 +1996,9 @@ bool cellInRange( const table::CellRangeAddress& rAddr, const sal_Int32& nCol, c
- 	return false;
- }
- 
--void setCursor(  const SCCOL& nCol, const SCROW& nRow, bool bInSel = true )
-+void setCursor(  const SCCOL& nCol, const SCROW& nRow, const uno::Reference< frame::XModel >& xModel,  bool bInSel = true )
- {
--	ScTabViewShell* pShell = excel::getCurrentBestViewShell();
-+	ScTabViewShell* pShell = excel::getBestViewShell( xModel );
- 	if ( pShell )
- 	{
- 		if ( bInSel )
-@@ -2045,7 +2045,7 @@ ScVbaRange::Activate() throw (uno::RuntimeException)
- 		{
- 			if ( cellInRange( nAddrs[index], thisRangeAddress.StartColumn, thisRangeAddress.StartRow ) )
- 			{
--				setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ) );
-+				setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel );
- 				return;
- 			}
- 			
-@@ -2053,7 +2053,7 @@ ScVbaRange::Activate() throw (uno::RuntimeException)
- 	}	
- 
- 	if ( xRange.is() && cellInRange( xRange->getRangeAddress(), thisRangeAddress.StartColumn, thisRangeAddress.StartRow ) )
--		setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ) );
-+		setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel );
- 	else
- 	{
- 		// if this range is multi cell select the range other
-@@ -2061,7 +2061,7 @@ ScVbaRange::Activate() throw (uno::RuntimeException)
- 		if ( isSingleCellRange() ) 
- 			// This top-leftmost cell of this Range is not in the current
- 			// selection so just select this range
--			setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), false  );
-+			setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel, false  );
- 		else
- 			Select();
- 	}
-@@ -2216,8 +2216,9 @@ ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException)
- 	}
- 	else
- 	{
-+		uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
- 		Select();
--		excel::implnCopy();
-+		excel::implnCopy( xModel );
- 	}
- }
- 
-@@ -2240,8 +2241,9 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException)
- 		xMover->moveRange( xDestination->getCellAddress(), xSource->getRangeAddress() );
- 	}
- 	{
-+		uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
- 		Select();
--		excel::implnCut();
-+		excel::implnCut( xModel );
- 	}
- }
-                                                                                                                              
-@@ -2574,7 +2576,7 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
- 
- 	USHORT nFlags = getPasteFlags(nPaste);
- 	USHORT nFormulaBits = getPasteFormulaBits(nOperation);
--	excel::implnPasteSpecial(nFlags,nFormulaBits,bSkipBlanks,bTranspose);
-+	excel::implnPasteSpecial(pShell->GetModel(), nFlags,nFormulaBits,bSkipBlanks,bTranspose);
- 	// restore selection
- 	xSelection->select( uno::makeAny( xSel ) );
- }
-@@ -3249,7 +3251,9 @@ ScVbaRange::End( ::sal_Int32 Direction )  throw (uno::RuntimeException)
- 	// position current cell upper left of this range
- 	Cells( uno::makeAny( (sal_Int32) 1 ), uno::makeAny( (sal_Int32) 1 ) )->Select();
- 
--	SfxViewFrame* pViewFrame = excel::getCurrentViewFrame();
-+        uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
-+
-+	SfxViewFrame* pViewFrame = excel::getViewFrame( xModel );
- 	if ( pViewFrame )
- 	{
- 		SfxAllItemSet aArgs( SFX_APP()->GetPool() );
-@@ -3893,7 +3897,7 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC
- 	if ( Cell1.hasValue() && !Cell2.hasValue() && sRangeName.getLength() )
- 	{
- 		const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
--		uno::Reference< beans::XPropertySet > xPropSet( getCurrentExcelDoc(), uno::UNO_QUERY_THROW );
-+		uno::Reference< beans::XPropertySet > xPropSet( getCurrentExcelDoc(xContext), uno::UNO_QUERY_THROW );
- 		
- 		uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW );
- 		uno::Reference< sheet::XCellRangeReferrer > xReferrer;
-@@ -3916,7 +3920,7 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC
- 			}
- 		}
- 	}
--	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentExcelDoc()->getCurrentController(), uno::UNO_QUERY );
-+	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentExcelDoc(xContext)->getCurrentController(), uno::UNO_QUERY );
- 	uno::Reference< table::XCellRange > xSheetRange( xView->getActiveSheet(), uno::UNO_QUERY_THROW ); 
- 	ScVbaRange* pRange = new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xSheetRange );
- 	uno::Reference< excel::XRange > xVbSheetRange( pRange );
-diff --git sc/source/ui/vba/vbaworkbook.cxx sc/source/ui/vba/vbaworkbook.cxx
-index 1c60441..5b6e277 100644
---- sc/source/ui/vba/vbaworkbook.cxx
-+++ sc/source/ui/vba/vbaworkbook.cxx
-@@ -64,7 +64,7 @@ class ActiveSheet : public ScVbaWorksheet
- protected:
- 	virtual uno::Reference< frame::XModel > getModel()
- 	{ 	
--		return getCurrentExcelDoc(); 
-+		return getCurrentExcelDoc( mxContext ); 
- 	}
- 	virtual uno::Reference< sheet::XSpreadsheet > getSheet()
- 	{ 
-@@ -218,7 +218,12 @@ ScVbaWorkbook::ScVbaWorkbook( uno::Sequence< uno::Any> const & args,
- uno::Reference< excel::XWorksheet >
- ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException)
- {
--	return new ActiveSheet( this, mxContext );
-+	uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ) );	
-+	uno::Reference< sheet::XSpreadsheet > xSheet;
-+	uno::Reference< sheet::XSpreadsheetView > xView( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
-+	if ( xView.is() )
-+		xSheet = xView->getActiveSheet();
-+	return new ScVbaWorksheet( this, mxContext, xSheet, xModel );
- }
- uno::Any SAL_CALL
- ScVbaWorkbook::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException)
-diff --git sc/source/ui/vba/vbaworksheet.cxx sc/source/ui/vba/vbaworksheet.cxx
-index a416c8c..0323c4f 100644
---- sc/source/ui/vba/vbaworksheet.cxx
-+++ sc/source/ui/vba/vbaworksheet.cxx
-@@ -442,11 +442,11 @@ ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno
- 		uno::Reference<excel::XRange> xRange =  new ScVbaRange( this, mxContext, xRange1);
- 		if (xRange.is())
- 			xRange->Select();
--		excel::implnCopy();
-+		excel::implnCopy(mxModel);
- 		uno::Reference<frame::XModel> xModel = openNewDoc(aCurrSheetName);
- 		if (xModel.is()) 
- 		{
--			excel::implnPaste();
-+			excel::implnPaste(xModel);
- 			Delete();
- 		}
- 		return ;
-@@ -480,11 +480,11 @@ ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno
- 		uno::Reference<excel::XRange> xRange =  new ScVbaRange( this, mxContext, xRange1);
- 		if (xRange.is())
- 			xRange->Select();
--		excel::implnCopy();
-+		excel::implnCopy(mxModel);
- 		uno::Reference<frame::XModel> xModel = openNewDoc(aCurrSheetName);
- 		if (xModel.is())
- 		{
--			excel::implnPaste();
-+			excel::implnPaste(xModel);
- 		}
- 		return;
- 	}
-@@ -513,7 +513,7 @@ ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) t
- 	uno::Reference<excel::XRange> xRange( Destination, uno::UNO_QUERY );
- 	if ( xRange.is() )
- 		xRange->Select();
--	excel::implnPaste();
-+	excel::implnPaste( mxModel );
- }
- 
- void 
-diff --git sc/source/ui/view/.tabview5.cxx.swp sc/source/ui/view/.tabview5.cxx.swp
-deleted file mode 100644
-index e3ca8cb..0000000
-Binary files sc/source/ui/view/.tabview5.cxx.swp and /dev/null differ
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index e1366a2..21a8014 100644
---- sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -4230,7 +4230,9 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
- #endif 
-             // Create and insert Word vba Globals
-             uno::Any aGlobs;
--            aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals") );
-+            uno::Sequence< uno::Any > aArgs(1);
-+            aArgs[ 0 ] <<= mpDocShell->GetModel();
-+            aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals"), aArgs );
-             mpDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
-             
-             SvxImportMSVBasic aVBasic(*mpDocShell, *pStg,
-diff --git sw/source/ui/vba/vbaapplication.cxx sw/source/ui/vba/vbaapplication.cxx
-index 9c70772..ba57192 100644
---- sw/source/ui/vba/vbaapplication.cxx
-+++ sw/source/ui/vba/vbaapplication.cxx
-@@ -183,7 +183,7 @@ float SAL_CALL SwVbaApplication::CentimetersToPoints( float _Centimeters ) throw
- uno::Reference< frame::XModel > 
- SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
- {
--    return getCurrentWordDoc();
-+    return getCurrentWordDoc( mxContext );
- }
- 
- rtl::OUString& 
-diff --git sw/source/ui/vba/vbaglobals.cxx sw/source/ui/vba/vbaglobals.cxx
-index acf6b06..935a95c 100644
---- sw/source/ui/vba/vbaglobals.cxx
-+++ sw/source/ui/vba/vbaglobals.cxx
-@@ -42,15 +42,22 @@ using namespace ::com::sun::star::uno;
- using namespace ::ooo::vba;
- 
- 
-+rtl::OUString sDocCtxName( RTL_CONSTASCII_USTRINGPARAM("WordDocumentContext") );
- 
- // =============================================================================
- // SwVbaGlobals
- // =============================================================================
- 
--SwVbaGlobals::SwVbaGlobals(  css::uno::Reference< css::uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext )
-+SwVbaGlobals::SwVbaGlobals(  uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, sDocCtxName )
- {
- 	OSL_TRACE("SwVbaGlobals::SwVbaGlobals()");
--	init( rxContext, uno::makeAny( getApplication() ) );
-+        uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
-+        aInitArgs[ 0 ].Name = rtl::OUString::createFromAscii("Application");
-+        aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
-+        aInitArgs[ 1 ].Name = sDocCtxName;
-+        aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
-+        
-+        init( aInitArgs );
- }
- 
- SwVbaGlobals::~SwVbaGlobals()
-@@ -65,8 +72,10 @@ uno::Reference<word::XApplication >
- SwVbaGlobals::getApplication() throw (uno::RuntimeException)
- {
- 	OSL_TRACE("In SwVbaGlobals::getApplication");	
--	static  uno::Reference< word::XApplication > WordApplication( new SwVbaApplication( mxContext) );
--   	return WordApplication; 
-+	if ( !mxApplication.is() )
-+		 mxApplication.set( new SwVbaApplication( mxContext) );
-+        
-+   	return mxApplication; 
- }
- 
- uno::Reference<word::XSystem > SAL_CALL
-@@ -178,7 +187,7 @@ SwVbaGlobals::getAvailableServiceNames(  ) throw (uno::RuntimeException)
- namespace globals
- {
- namespace sdecl = comphelper::service_decl;
--sdecl::vba_service_class_<SwVbaGlobals, sdecl::with_args<false> > serviceImpl;
-+sdecl::vba_service_class_<SwVbaGlobals, sdecl::with_args<true> > serviceImpl;
- extern sdecl::ServiceDecl const serviceDecl(
-     serviceImpl,
-     "SwVbaGlobals",
-diff --git sw/source/ui/vba/vbaglobals.hxx sw/source/ui/vba/vbaglobals.hxx
-index 267b1ed..066282e 100644
---- sw/source/ui/vba/vbaglobals.hxx
-+++ sw/source/ui/vba/vbaglobals.hxx
-@@ -58,7 +58,7 @@ private:
- 
- public:
- 	
--    SwVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext );
-+    SwVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& rxContext );
-     virtual ~SwVbaGlobals();
- 
-     // XGlobals
-diff --git sw/source/ui/vba/vbasystem.cxx sw/source/ui/vba/vbasystem.cxx
-index c68a7c0..3a16e23 100644
---- sw/source/ui/vba/vbasystem.cxx
-+++ sw/source/ui/vba/vbasystem.cxx
-@@ -88,7 +88,7 @@ SwVbaSystem::~SwVbaSystem()
- sal_Int32 SAL_CALL
- SwVbaSystem::getCursor() throw (uno::RuntimeException)
- {
--    sal_Int32 nPointerStyle =  getPointerStyle( getCurrentWordDoc() );
-+    sal_Int32 nPointerStyle =  getPointerStyle( getCurrentWordDoc(mxContext) );
- 
-     switch( nPointerStyle )
-     {
-@@ -115,27 +115,27 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
-             case word::WdCursorType::wdCursorNorthwestArrow:
-             {
-                 const Pointer& rPointer( POINTER_ARROW );
--                setCursorHelper( getCurrentWordDoc(), rPointer, sal_False );
-+                setCursorHelper( getCurrentWordDoc(mxContext), rPointer, sal_False );
-                 break;
-             }
-             case word::WdCursorType::wdCursorWait:
-             {
-                 const Pointer& rPointer( static_cast< PointerStyle >( POINTER_WAIT ) );
-                 //It will set the edit window, toobar and statusbar's mouse pointer.
--                setCursorHelper( getCurrentWordDoc(), rPointer, sal_True );
-+                setCursorHelper( getCurrentWordDoc(mxContext), rPointer, sal_True );
-                 break;
-             }
-             case word::WdCursorType::wdCursorIBeam:
-             {
-                 const Pointer& rPointer( static_cast< PointerStyle >( POINTER_TEXT ) );
-                 //It will set the edit window, toobar and statusbar's mouse pointer.
--                setCursorHelper( getCurrentWordDoc(), rPointer, sal_True );
-+                setCursorHelper( getCurrentWordDoc( mxContext ), rPointer, sal_True );
-                 break;
-             }
-             case word::WdCursorType::wdCursorNormal:
-             {
-                 const Pointer& rPointer( POINTER_NULL );
--                setCursorHelper( getCurrentWordDoc(), rPointer, sal_False );
-+                setCursorHelper( getCurrentWordDoc( mxContext ), rPointer, sal_False );
-                 break;
-             }
-             default:
-diff --git vbahelper/inc/vbahelper/vbaglobalbase.hxx vbahelper/inc/vbahelper/vbaglobalbase.hxx
-index f9c0d25..d12040d 100644
---- vbahelper/inc/vbahelper/vbaglobalbase.hxx
-+++ vbahelper/inc/vbahelper/vbaglobalbase.hxx
-@@ -40,10 +40,10 @@ class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE
- protected:
- 
-     bool hasServiceName( const rtl::OUString& serviceName );
--    void init(  const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any& aApplication );
-+    void init(  const css::uno::Sequence< css::beans::PropertyValue >& aInitArgs );
- 
- public:
--    VbaGlobalsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
-+    VbaGlobalsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sDocCtxName );
-     virtual ~VbaGlobalsBase(){};
-     // XMultiServiceFactory
-     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException);
-diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx
-index 3773474..5d97b81 100644
---- vbahelper/inc/vbahelper/vbahelper.hxx
-+++ vbahelper/inc/vbahelper/vbahelper.hxx
-@@ -67,8 +67,8 @@ namespace ooo
-         VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell,  const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException);
-         VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell,  const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
-         css::uno::Reference< css::frame::XModel > getCurrentDoc( const rtl::OUString& sKey ) throw (css::uno::RuntimeException);
--        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentExcelDoc() throw (css::uno::RuntimeException);
--        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentWordDoc() throw (css::uno::RuntimeException);
-+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentExcelDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
-+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentWordDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
- 
- 		VBAHELPER_DLLPUBLIC css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException);
- 		VBAHELPER_DLLPUBLIC css::uno::Reference< css::script::XTypeConverter > getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
-diff --git vbahelper/source/vbahelper/vbaglobalbase.cxx vbahelper/source/vbahelper/vbaglobalbase.cxx
-index 3ce0f72..bc0eda2 100644
---- vbahelper/source/vbahelper/vbaglobalbase.cxx
-+++ vbahelper/source/vbahelper/vbaglobalbase.cxx
-@@ -41,28 +41,41 @@
- using namespace com::sun::star;
- using namespace ooo::vba;
- 
-+rtl::OUString sApplication( RTL_CONSTASCII_USTRINGPARAM("Application") );
-+
- VbaGlobalsBase::VbaGlobalsBase( 
- const uno::Reference< ov::XHelperInterface >& xParent, 
--const uno::Reference< uno::XComponentContext >& xContext) 
-+const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sDocCtxName ) 
- :  Globals_BASE( xParent, xContext )
- {
-     // overwrite context with custom one ( that contains the application )
-     ::cppu::ContextEntry_Init aHandlerContextInfo[] =
-     {
--        ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Application" ) ), uno::Any() ) 
-+        ::cppu::ContextEntry_Init( sApplication, uno::Any() ), 
-+        ::cppu::ContextEntry_Init( sDocCtxName, uno::Any() ), 
-     };
- 
-     mxContext = ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), xContext );
- 
- }
- 
-+
- void
--VbaGlobalsBase::init(  uno::Reference< uno::XComponentContext >const& rxContext, const uno::Any& aApplication )
-+VbaGlobalsBase::init(  const uno::Sequence< beans::PropertyValue >& aInitArgs )
- {
--            uno::Reference< container::XNameContainer > xNameContainer( mxContext, uno::UNO_QUERY_THROW );
--            xNameContainer->replaceByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Application") ), aApplication );
--            uno::Reference< XHelperInterface > xParent( aApplication, uno::UNO_QUERY );
-+    sal_Int32 nLen = aInitArgs.getLength();
-+    for ( sal_Int32 nIndex = 0; nIndex < nLen; ++nIndex )
-+    {
-+        uno::Reference< container::XNameContainer > xNameContainer( mxContext, uno::UNO_QUERY_THROW );
-+        if ( aInitArgs[ nIndex ].Name.equals( sApplication ) )
-+        {
-+            xNameContainer->replaceByName( sApplication, aInitArgs[ nIndex ].Value );
-+            uno::Reference< XHelperInterface > xParent( aInitArgs[ nIndex ].Value, uno::UNO_QUERY );
-             mxParent = xParent;
-+        }
-+        else 
-+            xNameContainer->replaceByName( aInitArgs[ nIndex ].Name, aInitArgs[ nIndex ].Value );
-+    }
- }
- 
- uno::Reference< uno::XInterface > SAL_CALL 
-diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx
-index 8290f66..110d15f 100644
---- vbahelper/source/vbahelper/vbahelper.cxx
-+++ vbahelper/source/vbahelper/vbahelper.cxx
-@@ -458,19 +458,46 @@ getCurrentDoc( const rtl::OUString& sKey ) throw (uno::RuntimeException)
- 	return xModel;
- }
- 
-+ uno::Reference< frame::XModel > 
-+getCurrentDocCtx( const rtl::OUString& ctxName, const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< frame::XModel > xModel;
-+     // try fallback to calling doc
-+     css::uno::Reference< css::container::XNameAccess > xNameAccess( xContext, css::uno::UNO_QUERY_THROW );
-+     xModel.set( xNameAccess->getByName( ctxName ), uno::UNO_QUERY_THROW );
-+     return xModel;
-+}
- 
-  uno::Reference< frame::XModel > 
--getCurrentExcelDoc() throw (uno::RuntimeException)
-+getCurrentExcelDoc( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
- {
--   static const rtl::OUString sThisExcelDoc( RTL_CONSTASCII_USTRINGPARAM("ThisExcelDoc" ) );
--   return getCurrentDoc( sThisExcelDoc ); 
-+    static const rtl::OUString sThisExcelDoc( RTL_CONSTASCII_USTRINGPARAM("ThisExcelDoc" ) );
-+    uno::Reference< frame::XModel > xModel;
-+    try
-+    {
-+        xModel = getCurrentDoc( sThisExcelDoc ); 
-+    }
-+    catch( uno::Exception& e )
-+    {
-+        xModel = getCurrentDocCtx( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ExcelDocumentContext" ) ), xContext );
-+    }
-+    return xModel;
- }
- 
-  uno::Reference< frame::XModel > 
--getCurrentWordDoc() throw (uno::RuntimeException)
-+getCurrentWordDoc( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
- {
--   static const rtl::OUString sThisWordDoc( RTL_CONSTASCII_USTRINGPARAM("ThisWordDoc" ) );
--   return getCurrentDoc( sThisWordDoc ); 
-+    static const rtl::OUString sThisWordDoc( RTL_CONSTASCII_USTRINGPARAM("ThisWordDoc" ) );
-+    uno::Reference< frame::XModel > xModel;
-+    try
-+    {
-+        xModel = getCurrentDoc( sThisWordDoc ); 
-+    }
-+    catch( uno::Exception& e )
-+    {
-+        xModel = getCurrentDocCtx( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WordDocumentContext" ) ), xContext );
-+    }
-+    return xModel;
- }
- 
- sal_Int32 
-diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
-index 337ceb3..72d92cf 100644
---- sc/source/ui/docshell/docsh.cxx
-+++ sc/source/ui/docshell/docsh.cxx
-@@ -376,7 +376,9 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
- 	if ( pShell )
- 	{
- 		uno::Any aGlobs;
--		aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ) );
-+                uno::Sequence< uno::Any > aArgs(1);
-+                aArgs[ 0 ] <<= pShell->GetModel();
-+		aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs );
- 		pShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
- 	}
-         // suppress VBA events when loading the xml
diff --git a/applied_patches/0519-autocorrect-accidental-caps-lock-sc.diff b/applied_patches/0402-autocorrect-accidental-caps-lock-sc.diff
similarity index 100%
rename from applied_patches/0519-autocorrect-accidental-caps-lock-sc.diff
rename to applied_patches/0402-autocorrect-accidental-caps-lock-sc.diff
diff --git a/applied_patches/0402-vba-cursor-pos-for-selected-maxrange.diff b/applied_patches/0402-vba-cursor-pos-for-selected-maxrange.diff
deleted file mode 100644
index 88e5a5231..000000000
--- a/applied_patches/0402-vba-cursor-pos-for-selected-maxrange.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
-index c71049a..1a87bfb 100644
---- sc/source/ui/view/tabview3.cxx
-+++ sc/source/ui/view/tabview3.cxx
-@@ -1439,10 +1439,15 @@ void ScTabView::MarkRange( const ScRange& rRange, BOOL bSetCursor, BOOL bContinu
- 	{
- 		SCCOL nAlignX = rRange.aStart.Col();
- 		SCROW nAlignY = rRange.aStart.Row();
--		if ( rRange.aStart.Col() == 0 && rRange.aEnd.Col() == MAXCOL )
--			nAlignX = aViewData.GetPosX(WhichH(aViewData.GetActivePart()));
--		if ( rRange.aStart.Row() == 0 && rRange.aEnd.Row() == MAXROW )
--			nAlignY = aViewData.GetPosY(WhichV(aViewData.GetActivePart()));
-+		bool bCol = ( rRange.aStart.Col() == 0 && rRange.aEnd.Col() == MAXCOL );
-+		bool bRow = ( rRange.aStart.Row() == 0 && rRange.aEnd.Row() == MAXROW );
-+		if ( !bCol && !bRow )
-+		{
-+			if ( bCol ) 
-+				nAlignX = aViewData.GetPosX(WhichH(aViewData.GetActivePart()));
-+			if ( bRow )
-+				nAlignY = aViewData.GetPosY(WhichV(aViewData.GetActivePart()));
-+		}
- 		AlignToCursor( nAlignX, nAlignY, SC_FOLLOW_JUMP );
- 	}
- 	InitBlockMode( rRange.aStart.Col(), rRange.aStart.Row(), nTab );
diff --git a/applied_patches/0520-autocorrect-accidental-caps-lock-sw.diff b/applied_patches/0403-autocorrect-accidental-caps-lock-sw.diff
similarity index 100%
rename from applied_patches/0520-autocorrect-accidental-caps-lock-sw.diff
rename to applied_patches/0403-autocorrect-accidental-caps-lock-sw.diff
diff --git a/applied_patches/0403-vba-combobox-rowsource-fix.diff b/applied_patches/0403-vba-combobox-rowsource-fix.diff
deleted file mode 100644
index 7851e40b0..000000000
--- a/applied_patches/0403-vba-combobox-rowsource-fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index f1e9ff3..c7b1082 100644
---- svx/source/msfilter/msocximex.cxx
-+++ svx/source/msfilter/msocximex.cxx
-@@ -2677,6 +2677,8 @@ sal_Bool OCX_ComboBox::Import(com::sun::star::uno::Reference<
- 	rPropSet->setPropertyValue( WW8_ASCII2STR("MaxTextLen"), aTmp);
- 
- 	aFontData.Import(rPropSet);
-+	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
-+	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
- 	return sal_True;
- }
- 
diff --git a/applied_patches/0404-autocorrect-accidental-caps-lock-svx.diff b/applied_patches/0404-autocorrect-accidental-caps-lock-svx.diff
new file mode 100644
index 000000000..0478fbb13
--- /dev/null
+++ b/applied_patches/0404-autocorrect-accidental-caps-lock-svx.diff
@@ -0,0 +1,536 @@
+--- svx/inc/svx/editeng.hxx.old	2009-04-02 11:03:40.000000000 +0000
++++ svx/inc/svx/editeng.hxx	2009-04-06 16:42:14.000000000 +0000
+@@ -56,6 +56,7 @@ class Rectangle;
+ class SvStream;
+ class Link;
+ class OutputDevice;
++class Window;
+ class SvUShorts;
+ class SfxPoolItem;
+ class SvxNumBulletItem;
+@@ -127,7 +128,7 @@ private:
+ 	SVX_DLLPRIVATE EditEngine&		operator=( const EditEngine& );
+ 
+ //#if 0 // _SOLAR__PRIVATE
+-	SVX_DLLPRIVATE BOOL				PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
++	SVX_DLLPRIVATE BOOL				PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL );
+ //#endif
+ 
+ protected:
+--- svx/inc/svx/editview.hxx.old	2009-04-02 11:03:40.000000000 +0000
++++ svx/inc/svx/editview.hxx	2009-04-06 16:42:14.000000000 +0000
+@@ -145,7 +145,7 @@ public:
+ 
+ 	void			InsertText( const String& rNew, BOOL bSelect = FALSE );
+ 
+-	BOOL			PostKeyEvent( const KeyEvent& rKeyEvent );
++	BOOL			PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
+ 
+ 	BOOL			MouseButtonUp( const MouseEvent& rMouseEvent );
+ 	BOOL			MouseButtonDown( const MouseEvent& rMouseEvent );
+@@ -208,7 +208,7 @@ public:
+ 
+ 	BOOL			MatchGroup();
+ 
+-	void			CompleteAutoCorrect();
++	void			CompleteAutoCorrect( Window* pFrameWin = NULL );
+ 
+ 	EESpellState	StartSpeller( BOOL bMultipleDoc = FALSE );
+ 	EESpellState	StartThesaurus();
+--- svx/inc/svx/outliner.hxx.old	2009-04-02 11:03:40.000000000 +0000
++++ svx/inc/svx/outliner.hxx	2009-04-06 16:42:14.000000000 +0000
+@@ -265,7 +265,7 @@ public:
+ 	void        Scroll( long nHorzScroll, long nVertScroll );
+ 
+ 	void        Paint( const Rectangle& rRect );
+-	BOOL        PostKeyEvent( const KeyEvent& rKEvt );
++	BOOL        PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL );
+ 	BOOL        MouseButtonDown( const MouseEvent& );
+ 	BOOL        MouseButtonUp( const MouseEvent& );
+ 	BOOL        MouseMove( const MouseEvent& );
+--- svx/inc/svx/svxacorr.hxx.old	2009-04-02 11:03:40.000000000 +0000
++++ svx/inc/svx/svxacorr.hxx	2009-04-06 16:42:14.000000000 +0000
+@@ -50,6 +50,7 @@ class SvxAutoCorrLanguageTable_Impl;
+ class SvxAutoCorrLastFileAskTable_Impl;
+ class SotStorageRef;
+ class SotStorage;
++class Window;
+ 
+ // Flags fuer die AutoKorrekt-Flags
+ const long CptlSttSntnc		= 0x00000001;	// Gross-Buchstaben am SatzAnfang
+@@ -65,6 +66,7 @@ const long SaveWordCplSttLst= 0x00000200
+ const long SaveWordWrdSttLst= 0x00000400;	// 2 GrB. am WortAnf. auto. aufnehmen
+ const long IngnoreDoubleSpace= 0x00000800;	// 2 Spaces ignorieren
+ const long ChgSglQuotes		= 0x00001000;	// einfache Quotes ersetzen
++const long CorrectCapsLock  = 0x00002000;   // Correct accidental use of cAPS LOCK key
+ 
+ const long ChgWordLstLoad	= 0x20000000;	// Ersetzungsliste geladen
+ const long CplSttLstLoad	= 0x40000000;	// Exceptionlist fuer CplStart geladen
+@@ -252,7 +254,7 @@ public:
+ 	// fuehre eine AutoKorrektur aus.
+ 	// returnt was ausgefuehrt wurde; entsprechend den obigen Flags
+ 	ULONG AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
+-						xub_StrLen nPos, sal_Unicode cInsChar, BOOL bInsert );
++						xub_StrLen nPos, sal_Unicode cInsChar, BOOL bInsert, Window* pFrameWin = NULL );
+ 
+ 	// return fuer die Autotext Expandierung das vorherige Wort, was dem
+ 	// AutoCorrect - Algorythmus entspricht.
+@@ -377,6 +379,10 @@ public:
+ 								xub_StrLen nSttPos, xub_StrLen nEndPos,
+ 								LanguageType eLang  = LANGUAGE_SYSTEM);
+ 
++    bool FnCorrectCapsLock( SvxAutoCorrDoc&, const String&, 
++                            xub_StrLen nSttPos, xub_StrLen nEndPos,
++                            LanguageType eLang  = LANGUAGE_SYSTEM );
++
+ 	static long			GetDefaultFlags();
+ 
+ // returns TRUE for charcters where the function
+--- svx/source/cui/autocdlg.cxx
++++ svx/source/cui/autocdlg.cxx
+@@ -233,7 +233,8 @@ OfaAutocorrOptionsPage::OfaAutocorrOptio
+     sNoDblSpaces        (SVX_RES(STR_NO_DBL_SPACES    )),
+     sHalf               (SVX_RES(ST_FRACTION          )),
+ 	sDash    			(SVX_RES(ST_DASH	         	)),
+-    sFirst              (SVX_RES(ST_ORDINAL           ))
++    sFirst              (SVX_RES(ST_ORDINAL           )),
++    sAccidentalCaps     (SVX_RES(ST_CORRECT_ACCIDENTAL_CAPS_LOCK))
+ {
+ 	FreeResource();
+ 
+@@ -279,6 +280,7 @@ BOOL OfaAutocorrOptionsPage::FillItemSet
+ 	pAutoCorrect->SetAutoCorrFlag(ChgFractionSymbol,	aCheckLB.IsChecked(nPos++));
+ 	pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash,		aCheckLB.IsChecked(nPos++));
+ 	pAutoCorrect->SetAutoCorrFlag(IngnoreDoubleSpace,	aCheckLB.IsChecked(nPos++));
++    pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock,      aCheckLB.IsChecked(nPos++));
+ 
+ 	BOOL bReturn = nFlags != pAutoCorrect->GetFlags();
+ 	if(bReturn )
+@@ -320,6 +322,7 @@ void OfaAutocorrOptionsPage::Reset( cons
+ 	aCheckLB.InsertEntry(sHalf);
+ 	aCheckLB.InsertEntry(sDash);
+ 	aCheckLB.InsertEntry(sNoDblSpaces);
++    aCheckLB.InsertEntry(sAccidentalCaps);
+ 
+ 	USHORT nPos = 0;
+ 	aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & Autocorrect) );
+@@ -331,6 +334,7 @@ void OfaAutocorrOptionsPage::Reset( cons
+ 	aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgFractionSymbol) );
+ 	aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgToEnEmDash) );
+ 	aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & IngnoreDoubleSpace) );
++    aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & CorrectCapsLock) );
+ 
+ 	aCheckLB.SetUpdateMode(TRUE);
+ }
+@@ -463,6 +467,7 @@ enum OfaAutoFmtOptions
+ 	DEL_SPACES_AT_STT_END,
+ 	DEL_SPACES_BETWEEN_LINES,
+ 	IGNORE_DBLSPACE,
++    CORRECT_CAPS_LOCK,
+ 	APPLY_NUMBERING,
+ 	INSERT_BORDER,
+ 	CREATE_TABLE,
+@@ -492,6 +497,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOpt
+ 	sBullet				(SVX_RES(	ST_BULLET       )),
+ 	sBoldUnder			(SVX_RES(	ST_BOLD_UNDER   )),
+ 	sNoDblSpaces		(SVX_RES(	STR_NO_DBL_SPACES)),
++    sCorrectCapsLock    (SVX_RES(   ST_CORRECT_ACCIDENTAL_CAPS_LOCK)),
+ 	sFraction			(SVX_RES(	ST_FRACTION     )),
+ 	sDetectURL			(SVX_RES(	ST_DETECT_URL   )),
+ 	sDash				(SVX_RES(	ST_DASH         )),
+@@ -632,6 +638,9 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSe
+ 	pAutoCorrect->SetAutoCorrFlag(IngnoreDoubleSpace,
+ 						aCheckLB.IsChecked(IGNORE_DBLSPACE, CBCOL_SECOND));
+ 
++    pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock,
++                        aCheckLB.IsChecked(CORRECT_CAPS_LOCK, CBCOL_SECOND));
++
+ 	bCheck = aCheckLB.IsChecked(DETECT_URL, CBCOL_FIRST);
+ 	bModified |= pOpt->bSetINetAttr != bCheck;
+ 	pOpt->bSetINetAttr = bCheck;
+@@ -763,6 +772,7 @@ void OfaSwAutoFmtOptionsPage::Reset( con
+ 	aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH  ));
+ 
+ 	aCheckLB.GetModel()->Insert(CreateEntry(sNoDblSpaces,		CBCOL_SECOND));
++    aCheckLB.GetModel()->Insert(CreateEntry(sCorrectCapsLock,   CBCOL_SECOND));
+ 	aCheckLB.GetModel()->Insert(CreateEntry(sNum,				CBCOL_SECOND));
+ 	aCheckLB.GetModel()->Insert(CreateEntry(sBorder,			CBCOL_SECOND));
+ 	aCheckLB.GetModel()->Insert(CreateEntry(sTable,				CBCOL_SECOND));
+@@ -782,6 +792,7 @@ void OfaSwAutoFmtOptionsPage::Reset( con
+ 	aCheckLB.CheckEntryPos( BOLD_UNDERLINE,		CBCOL_FIRST,	pOpt->bChgWeightUnderl );
+ 	aCheckLB.CheckEntryPos( BOLD_UNDERLINE,		CBCOL_SECOND,	0 != (nFlags & ChgWeightUnderl) );
+ 	aCheckLB.CheckEntryPos( IGNORE_DBLSPACE,	CBCOL_SECOND,	0 != (nFlags & IngnoreDoubleSpace) );
++    aCheckLB.CheckEntryPos( CORRECT_CAPS_LOCK,  CBCOL_SECOND,   0 != (nFlags & CorrectCapsLock) );
+ 	aCheckLB.CheckEntryPos( DETECT_URL,			CBCOL_FIRST,	pOpt->bSetINetAttr );
+ 	aCheckLB.CheckEntryPos( DETECT_URL,			CBCOL_SECOND,	0 != (nFlags & SetINetAttr) );
+ 	aCheckLB.CheckEntryPos( REPLACE_1ST,		CBCOL_FIRST,	pOpt->bChgOrdinalNumber );
+--- svx/source/cui/autocdlg.hrc
++++ svx/source/cui/autocdlg.hrc
+@@ -152,6 +152,7 @@
+ #define ST_DASH                         208
+ #define FT_LANG                         209
+ #define LB_LANG                         210
++#define ST_CORRECT_ACCIDENTAL_CAPS_LOCK 211
+ 
+ #define CB_SMARTTAGS                    220
+ #define FT_SMARTTAGS                    221
+--- svx/source/cui/autocdlg.hxx
++++ svx/source/cui/autocdlg.hxx
+@@ -119,6 +119,7 @@ private:
+ 	String		sHalf;
+ 	String		sDash;
+ 	String		sFirst;
++    String      sAccidentalCaps;
+ 
+ public:
+ 						OfaAutocorrOptionsPage( Window* pParent, const SfxItemSet& rSet );
+@@ -157,6 +158,7 @@ class OfaSwAutoFmtOptionsPage : public S
+ 	String			sByInputBullet;
+ 	String			sBoldUnder;
+ 	String			sNoDblSpaces;
++    String          sCorrectCapsLock;
+ 	String			sFraction;
+ 	String			sDetectURL;
+ 	String          sDash;
+--- svx/source/cui/autocdlg.src
++++ svx/source/cui/autocdlg.src
+@@ -140,7 +140,11 @@ TabDialog RID_OFA_AUTOCORR_DLG
+     String ST_DASH \
+     { \
+         Text [ en-US ] = "Replace dashes" ; \
+-	};
++    }; \
++    String ST_CORRECT_ACCIDENTAL_CAPS_LOCK \
++    { \
++        Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ; \
++    };
+ 
+ /**************************************************************************/
+ /*                                                                        */
+--- svx/source/editeng/acorrcfg.cxx.old	2009-04-02 11:03:02.000000000 +0000
++++ svx/source/editeng/acorrcfg.cxx	2009-04-06 16:42:14.000000000 +0000
+@@ -127,9 +127,10 @@ Sequence<OUString> 	SvxBaseAutoCorrCfg::
+ 		"SingleQuoteAtEnd",						// 13
+ 		"ReplaceDoubleQuote",					// 14
+ 		"DoubleQuoteAtStart",					// 15
+-		"DoubleQuoteAtEnd"						// 16
++		"DoubleQuoteAtEnd",						// 16
++        "CorrectAccidentalCapsLock"             // 17
+ 	};
+-	const int nCount = 17;
++	const int nCount = 18;
+ 	Sequence<OUString> aNames(nCount);
+ 	OUString* pNames = aNames.getArray();
+ 	for(int i = 0; i < nCount; i++)
+@@ -229,6 +230,10 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool b
+ 						rParent.pAutoCorrect->SetEndDoubleQuote(
+                             sal::static_int_cast< sal_Unicode >( nTemp ) );
+ 					break;//"DoubleQuoteAtEnd"
++                    case 17:
++                        if(*(sal_Bool*)pValues[nProp].getValue())
++                            nFlags |= CorrectCapsLock;
++                    break;//"CorrectAccidentalCapsLock"
+ 				}
+ 			}
+ 		}
+@@ -333,6 +338,10 @@ void SvxBaseAutoCorrCfg::Commit()
+ 			case 16:
+ 				pValues[nProp] <<= (sal_Int32) rParent.pAutoCorrect->GetEndDoubleQuote();
+ 			break;//"DoubleQuoteAtEnd"
++            case 17:
++                bVal = 0 != (nFlags & CorrectCapsLock);
++                pValues[nProp].setValue(&bVal, rType);
++            break;//"CorrectAccidentalCapsLock"
+ 		}
+ 	}
+ 	PutProperties(aNames, aValues);
+--- svx/source/editeng/editeng.cxx.old	2009-04-02 11:03:02.000000000 +0000
++++ svx/source/editeng/editeng.cxx	2009-04-06 16:42:14.000000000 +0000
+@@ -802,7 +802,7 @@ ESelection EditEngine::CursorRight( cons
+ 	return pE->pImpEditEngine->CreateESel( aSel );
+ }
+ 
+-sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView )
++sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, Window* pFrameWin )
+ {
+ 	DBG_CHKTHIS( EditEngine, 0 );
+ 	DBG_CHKOBJ( pEditView, EditView, 0 );
+@@ -1062,7 +1062,7 @@ sal_Bool EditEngine::PostKeyEvent( const
+ 						if ( bSel )
+ 							pImpEditEngine->UndoActionStart( EDITUNDO_INSERT );
+ 						if ( pImpEditEngine->GetStatus().DoAutoCorrect() )
+-							aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode() );
++							aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode(), pFrameWin );
+ 						aCurSel = pImpEditEngine->InsertTab( aCurSel );
+ 						if ( bSel )
+ 							pImpEditEngine->UndoActionEnd( EDITUNDO_INSERT );
+@@ -1083,7 +1083,7 @@ sal_Bool EditEngine::PostKeyEvent( const
+ 						pImpEditEngine->UndoActionStart( EDITUNDO_INSERT );
+ 						if ( rKeyEvent.GetKeyCode().IsShift() )
+                         {
+-                            aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode() );
++                            aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode(), pFrameWin );
+ 							aCurSel = pImpEditEngine->InsertLineBreak( aCurSel );
+                         }
+ 						else
+@@ -1091,7 +1091,7 @@ sal_Bool EditEngine::PostKeyEvent( const
+ 							if ( !aAutoText.Len() )
+ 							{
+ 								if ( pImpEditEngine->GetStatus().DoAutoCorrect() )
+-									aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode() );
++									aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode(), pFrameWin );
+ 								aCurSel = pImpEditEngine->InsertParaBreak( aCurSel );
+ 							}
+ 							else
+@@ -1139,7 +1139,8 @@ sal_Bool EditEngine::PostKeyEvent( const
+ 						 	( nCharCode == '\"' ) || ( nCharCode == '\'' ) ||
+ 							( nCharCode == '_' )  ))
+ 					{
+-						aCurSel = pImpEditEngine->AutoCorrect( aCurSel, nCharCode, !pEditView->IsInsertMode() );
++						aCurSel = pImpEditEngine->AutoCorrect( 
++                            aCurSel, nCharCode, !pEditView->IsInsertMode(), pFrameWin );
+ 					}
+ 					else
+ 					{
+--- svx/source/editeng/editview.cxx.old	2009-04-02 11:03:02.000000000 +0000
++++ svx/source/editeng/editview.cxx	2009-04-06 16:42:14.000000000 +0000
+@@ -60,6 +60,7 @@
+ #include <helpid.hrc>
+ #include <i18npool/lang.h>
+ #include <vcl/menu.hxx>
++#include <vcl/window.hxx>
+ #include <acorrcfg.hxx>
+ #include <unolingu.hxx>
+ #include <fontitem.hxx>
+@@ -418,11 +419,11 @@ void EditView::InsertText( const XubStri
+ 	pImpEE->FormatAndUpdate( this );
+ }
+ 
+-sal_Bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent )
++sal_Bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
+ {
+ 	DBG_CHKTHIS( EditView, 0 );
+ 	DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
+-	return pImpEditView->PostKeyEvent( rKeyEvent );
++	return pImpEditView->PostKeyEvent( rKeyEvent, pFrameWin );
+ }
+ 
+ sal_Bool EditView::MouseButtonUp( const MouseEvent& rMouseEvent )
+@@ -919,7 +920,7 @@ sal_Bool EditView::MatchGroup()
+ 	return sal_False;
+ }
+ 
+-void EditView::CompleteAutoCorrect()
++void EditView::CompleteAutoCorrect( Window* pFrameWin )
+ {
+ 	DBG_CHKTHIS( EditView, 0 );
+ 	DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
+@@ -929,7 +930,7 @@ void EditView::CompleteAutoCorrect()
+ 		EditSelection aSel = pImpEditView->GetEditSelection();
+ 		aSel = PIMPEE->EndOfWord( aSel.Max() );
+ 		// MT 06/00: Why pass EditSelection to AutoCorrect, not EditPaM?!
+-		aSel = PIMPEE->AutoCorrect( aSel, 0, !IsInsertMode() );
++		aSel = PIMPEE->AutoCorrect( aSel, 0, !IsInsertMode(), pFrameWin );
+ 		pImpEditView->SetEditSelection( aSel );
+ 		if ( PIMPEE->IsModified() )
+ 			PIMPEE->FormatAndUpdate( this );
+--- svx/source/editeng/impedit2.cxx.old	2009-04-02 11:03:02.000000000 +0000
++++ svx/source/editeng/impedit2.cxx	2009-04-06 16:42:14.000000000 +0000
+@@ -2540,7 +2540,8 @@ void ImpEditEngine::ImpRemoveParagraph(
+ 	}
+ }
+ 
+-EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, BOOL bOverwrite )
++EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, 
++                                    bool bOverwrite, Window* pFrameWin )
+ {
+ 	EditSelection aSel( rCurSel );
+ #ifndef SVX_LIGHT
+@@ -2590,7 +2591,7 @@ EditPaM ImpEditEngine::AutoCorrect( cons
+ 		ContentNode* pNode = aSel.Max().GetNode();
+ 		USHORT nIndex = aSel.Max().GetIndex();
+ 		EdtAutoCorrDoc aAuto( this, pNode, nIndex, c );
+-		pAutoCorrect->AutoCorrect( aAuto, *pNode, nIndex, c, !bOverwrite );
++		pAutoCorrect->AutoCorrect( aAuto, *pNode, nIndex, c, !bOverwrite, pFrameWin );
+ 		aSel.Max().SetIndex( aAuto.GetCursor() );
+ 
+ 		// #i78661 since the SvxAutoCorrect object used here is
+--- svx/source/editeng/impedit.cxx.old	2009-04-02 11:03:02.000000000 +0000
++++ svx/source/editeng/impedit.cxx	2009-04-06 16:42:14.000000000 +0000
+@@ -1001,7 +1001,7 @@ Pair ImpEditView::Scroll( long ndX, long
+ 	return Pair( nRealDiffX, nRealDiffY );
+ }
+ 
+-sal_Bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent )
++sal_Bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
+ {
+     BOOL bDone = FALSE;
+ 
+@@ -1045,7 +1045,7 @@ sal_Bool ImpEditView::PostKeyEvent( cons
+     }
+ 
+     if( !bDone )
+-	    bDone = pEditEngine->PostKeyEvent( rKeyEvent, GetEditViewPtr() );
++	    bDone = pEditEngine->PostKeyEvent( rKeyEvent, GetEditViewPtr(), pFrameWin );
+ 
+     return bDone;
+ }
+--- svx/source/editeng/impedit.hxx.old	2009-04-02 11:03:02.000000000 +0000
++++ svx/source/editeng/impedit.hxx	2009-04-06 16:42:14.000000000 +0000
+@@ -101,6 +101,8 @@ class TextRanger;
+ class SvKeyValueIterator;
+ class SvxForbiddenCharactersTable;
+ class SvtCTLOptions;
++class Window;
++
+ #include <svx/SpellPortions.hxx>
+ 
+ #include <svx/eedata.hxx>
+@@ -297,7 +299,7 @@ public:
+ 
+ 	BOOL			IsVertical() const;
+ 
+-	BOOL			PostKeyEvent( const KeyEvent& rKeyEvent );
++	BOOL			PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
+ 
+ 	BOOL			MouseButtonUp( const MouseEvent& rMouseEvent );
+ 	BOOL			MouseButtonDown( const MouseEvent& rMouseEvent );
+@@ -787,7 +789,7 @@ public:
+ 	EditPaM			DeleteSelected( EditSelection aEditSelection);
+     EditPaM         InsertText( const EditSelection& rCurEditSelection, sal_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput = sal_False );
+ 	EditPaM			InsertText( EditSelection aCurEditSelection, const String& rStr );
+-	EditPaM			AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, sal_Bool bOverwrite );
++	EditPaM			AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, Window* pFrameWin = NULL );
+ 	EditPaM			DeleteLeftOrRight( const EditSelection& rEditSelection, BYTE nMode, BYTE nDelMode = DELMODE_SIMPLE );
+ 	EditPaM			InsertParaBreak( EditSelection aEditSelection );
+ 	EditPaM			InsertLineBreak( EditSelection aEditSelection );
+--- svx/source/editeng/svxacorr.cxx.old	2009-04-02 11:03:02.000000000 +0000
++++ svx/source/editeng/svxacorr.cxx	2009-04-06 16:42:14.000000000 +0000
+@@ -81,6 +81,7 @@
+ #include <svx/escpitem.hxx>
+ #include <svx/svxacorr.hxx>
+ #include "unolingu.hxx"
++#include "vcl/window.hxx"
+ 
+ #ifndef _SVX_HELPID_HRC
+ #include <helpid.hrc>
+@@ -351,7 +352,8 @@ long SvxAutoCorrect::GetDefaultFlags()
+ 					| SetINetAttr
+ 					| ChgQuotes
+ 					| SaveWordCplSttLst
+-					| SaveWordWrdSttLst;
++					| SaveWordWrdSttLst
++                    | CorrectCapsLock;
+ 	LanguageType eLang = GetAppLang();
+ 	switch( eLang )
+ 	{
+@@ -1052,6 +1054,49 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( Svx
+ 
+ 	return bRet;
+ }
++
++bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt,
++                                        xub_StrLen nSttPos, xub_StrLen nEndPos,
++                                        LanguageType eLang )
++{
++    if (nEndPos - nSttPos < 2)
++        // string must be at least 2-character long.
++        return false;
++
++    CharClass& rCC = GetCharClass( eLang );
++
++    // Check the first 2 letters.
++    if ( !IsLowerLetter(rCC.getCharacterType(rTxt, nSttPos)) )
++        return false;
++
++    if ( !IsUpperLetter(rCC.getCharacterType(rTxt, nSttPos+1)) )
++        return false;
++
++    String aConverted;
++    aConverted.Append( rCC.upper(rTxt.GetChar(nSttPos)) );
++    aConverted.Append( rCC.lower(rTxt.GetChar(nSttPos+1)) );
++
++    for (xub_StrLen i = nSttPos+2; i < nEndPos; ++i)
++    {
++        if ( IsLowerLetter(rCC.getCharacterType(rTxt, i)) )
++            // A lowercase letter disqualifies the whole text.
++            return false;
++
++        if ( IsUpperLetter(rCC.getCharacterType(rTxt, i)) )
++            // Another uppercase letter.  Convert it.
++            aConverted.Append( rCC.lower(rTxt.GetChar(i)) );
++        else
++            // This is not an alphabetic letter.  Leave it as-is.
++            aConverted.Append(rTxt.GetChar(i));
++    }
++
++    // Replace the word.
++    rDoc.Delete(nSttPos, nEndPos);
++    rDoc.Insert(nSttPos, aConverted);
++
++    return true;
++}
++
+ //The method below is renamed from _GetQuote to GetQuote by BerryJia for Bug95846 Time:2002-8-13 15:50
+ sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, BOOL bSttQuote,
+ 										LanguageType eLang ) const
+@@ -1165,7 +1210,7 @@ String SvxAutoCorrect::GetQuote( SvxAuto
+ 
+ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
+ 									xub_StrLen nInsPos, sal_Unicode cChar,
+-									BOOL bInsert )
++									BOOL bInsert, Window* pFrameWin )
+ {
+ 	ULONG nRet = 0;
+ 	do{		                            // only for middle check loop !!
+@@ -1308,7 +1353,19 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAu
+ 			;
+ 		else
+ 		{
++            bool bLockKeyOn = pFrameWin && (pFrameWin->GetIndicatorState() & INDICATOR_CAPSLOCK);
++
+ 			nRet = 0;
++            if ( bLockKeyOn && IsAutoCorrFlag( CorrectCapsLock ) &&
++                 FnCorrectCapsLock( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) )
++            {
++                // Correct accidental use of cAPS LOCK key (do this only when 
++                // the caps or shift lock key is pressed).  Turn off the caps
++                // lock afterwords.
++                nRet |= CorrectCapsLock;
++                pFrameWin->SimulateKeyPress( KEY_CAPSLOCK );
++            }
++
+ 			// Grossbuchstabe am Satz-Anfang ??
+ 			if( IsAutoCorrFlag( CptlSttSntnc ) &&
+ 				FnCptlSttSntnc( rDoc, rTxt, TRUE, nCapLttrPos, nInsPos, eLang ) )
+--- svx/source/outliner/outlvw.cxx.old	2009-04-02 11:02:55.000000000 +0000
++++ svx/source/outliner/outlvw.cxx	2009-04-06 16:42:14.000000000 +0000
+@@ -92,7 +92,7 @@ void OutlinerView::Paint( const Rectangl
+ 	pEditView->Paint( rRect );
+ }
+ 
+-BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
++BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
+ {
+ 	DBG_CHKTHIS( OutlinerView, 0 );
+ 
+@@ -257,7 +257,7 @@ BOOL OutlinerView::PostKeyEvent( const K
+ 		}
+ 	}
+ 
+-	return bKeyProcessed ? TRUE : pEditView->PostKeyEvent( rKEvt );
++	return bKeyProcessed ? TRUE : pEditView->PostKeyEvent( rKEvt, pFrameWin );
+ }
+ 
+ 
+--- svx/source/svdraw/svdedxv.cxx.old	2009-04-02 11:03:00.000000000 +0000
++++ svx/source/svdraw/svdedxv.cxx	2009-04-06 16:42:14.000000000 +0000
+@@ -1178,7 +1178,7 @@ BOOL SdrObjEditView::KeyInput(const KeyE
+ 				ShowItemBrowser();
+         }
+ #endif
+-		if (pTextEditOutlinerView->PostKeyEvent(rKEvt))
++		if (pTextEditOutlinerView->PostKeyEvent(rKEvt, pWin))
+ 		{
+ 			if( pMod && !pMod->IsChanged() )
+ 			{
diff --git a/applied_patches/0404-vba-workbook-auto-open-event.diff b/applied_patches/0404-vba-workbook-auto-open-event.diff
deleted file mode 100644
index f54130d64..000000000
--- a/applied_patches/0404-vba-workbook-auto-open-event.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git sc/source/ui/vba/vbaeventshelper.cxx sc/source/ui/vba/vbaeventshelper.cxx
-index eba8a1f..78b3ede 100644
---- sc/source/ui/vba/vbaeventshelper.cxx
-+++ sc/source/ui/vba/vbaeventshelper.cxx
-@@ -384,7 +384,7 @@ protected:
-     static ImplVbaEventNameInfo* pImplVbaEventNameInfo;
-     ImplVbaEventNameInfo() { InitImplVbaEventNameInfo(); }
- private:
--    void insert( const sal_Int32 nId, const rtl::OUString sEventName )
-+    void insert( const sal_Int32 nId, const rtl::OUString& sEventName )
-     {
-         m_aEventNameMap.insert( make_pair( nId, sEventName ) );
-     }
-@@ -450,6 +450,7 @@ void ImplVbaEventNameInfo::InitImplVbaEventNameInfo()
-     INSERT_WORKBOOK_EVENT_INFO( DEACTIVATE, "Deactivate" );
-     INSERT_WORKBOOK_EVENT_INFO( OPEN, "Open" );
-     // AUTOOPEN doesn't be used. TODO, this should be "auto_open"
-+    insert( VBAEVENT_WORKBOOK_AUTOOPEN, CREATEOUSTRING("Auto_Open") );                       
-     INSERT_WORKBOOK_EVENT_INFO( BEFORECLOSE, "BeforeClose" );
-     INSERT_WORKBOOK_EVENT_INFO( BEFOREPRINT, "BeforePrint" );
-     INSERT_WORKBOOK_EVENT_INFO( BEFORESAVE, "BeforeSave" );
-@@ -638,7 +639,6 @@ ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
-     	case VBAEVENT_WORKBOOK_ACTIVATE                       :
-     	case VBAEVENT_WORKBOOK_DEACTIVATE                     :
-     	case VBAEVENT_WORKBOOK_OPEN                           :
--    	case VBAEVENT_WORKBOOK_AUTOOPEN                       :
-     	case VBAEVENT_WORKBOOK_BEFORECLOSE                    :
-     	case VBAEVENT_WORKBOOK_BEFOREPRINT                    :
-     	case VBAEVENT_WORKBOOK_BEFORESAVE                     :
-@@ -669,6 +669,11 @@ ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
-             sMacroResolvedInfo = resolveVBAMacro( pShell, sMacroName );
-             break;
-         }
-+    	case VBAEVENT_WORKBOOK_AUTOOPEN                       :
-+        {
-+            sMacroResolvedInfo = resolveVBAMacro( pShell, sMacroName );
-+            break;
-+        }
-         default:
-             break;
-     }
-@@ -698,6 +703,7 @@ sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno
-             case VBAEVENT_WORKBOOK_ACTIVATE:
-             case VBAEVENT_WORKBOOK_DEACTIVATE:
-             case VBAEVENT_WORKBOOK_OPEN:
-+    	    case VBAEVENT_WORKBOOK_AUTOOPEN:
- 			{
- 				// no arguments
- 				break;
-@@ -992,6 +998,7 @@ ScVbaEventsHelper::ProcessCompatibleVbaEvent( sal_Int32 nEventId, const uno::Seq
-             if( !mbOpened )
-             {
-                 processVbaEvent( nEventId, aArgs );
-+                processVbaEvent( VBAEVENT_WORKBOOK_AUTOOPEN, aArgs );
-                 mbOpened = sal_True;
-                 ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_ACTIVATE, aArgs );
-             }
-@@ -1004,9 +1011,6 @@ ScVbaEventsHelper::ProcessCompatibleVbaEvent( sal_Int32 nEventId, const uno::Seq
-             }
-             break;
-         }
--		case VBAEVENT_WORKBOOK_AUTOOPEN:
--            // TODO
--            break;
- 		case VBAEVENT_WORKBOOK_BEFORECLOSE:
-         {
-             sal_Bool bCancel = processVbaEvent( nEventId, aArgs ); 
diff --git a/applied_patches/0522-autocorrect-accidental-caps-lock-vcl.diff b/applied_patches/0405-autocorrect-accidental-caps-lock-vcl.diff
similarity index 100%
rename from applied_patches/0522-autocorrect-accidental-caps-lock-vcl.diff
rename to applied_patches/0405-autocorrect-accidental-caps-lock-vcl.diff
diff --git a/applied_patches/0405-vba-buildin-toolbar-fix.diff b/applied_patches/0405-vba-buildin-toolbar-fix.diff
deleted file mode 100644
index 222fb2ba0..000000000
--- a/applied_patches/0405-vba-buildin-toolbar-fix.diff
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git vbahelper/source/vbahelper/vbacommandbarhelper.cxx vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-index 7c59107..b4515b6 100644
---- vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-@@ -44,10 +44,63 @@
- #include <comphelper/processfactory.hxx>
- #include <vbahelper/vbahelper.hxx>
- #include <time.h>
-+#include <map>
- 
- using namespace com::sun::star;
- using namespace ooo::vba;
- 
-+#define CREATEOUSTRING(asciistr) rtl::OUString::createFromAscii(asciistr)
-+
-+typedef std::map< rtl::OUString, rtl::OUString > MSO2OOCommandbarMap;
-+
-+class MSO2OOCommandbarHelper
-+{
-+private:
-+    static MSO2OOCommandbarHelper* pMSO2OOCommandbarHelper;
-+    MSO2OOCommandbarMap maBuildinToolbarMap;
-+
-+    MSO2OOCommandbarHelper()
-+    {
-+        // Buildin toolbars
-+        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Standard"),CREATEOUSTRING("private:resource/toolbar/standardbar") ) );
-+        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Formatting"),CREATEOUSTRING("private:resource/toolbar/formatobjectbar") ) );
-+        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Drawing"),CREATEOUSTRING("private:resource/toolbar/drawbar") ) );
-+        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Toolbar List"),CREATEOUSTRING("private:resource/toolbar/toolbar") ) );
-+        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Forms"),CREATEOUSTRING("private:resource/toolbar/formcontrols") ) );
-+        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Form Controls"),CREATEOUSTRING("private:resource/toolbar/formcontrols") ) );
-+        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Full Screen"),CREATEOUSTRING("private:resource/toolbar/fullscreenbar") ) );
-+        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Chart"),CREATEOUSTRING("private:resource/toolbar/flowchartshapes") ) );
-+        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("Picture"),CREATEOUSTRING("private:resource/toolbar/graphicobjectbar") ) );
-+        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("WordArt"),CREATEOUSTRING("private:resource/toolbar/fontworkobjectbar") ) );
-+        maBuildinToolbarMap.insert( std::make_pair( CREATEOUSTRING("3-D Settings"),CREATEOUSTRING("private:resource/toolbar/extrusionobjectbar") ) );
-+    }
-+
-+public:
-+    virtual ~MSO2OOCommandbarHelper() {};
-+    static MSO2OOCommandbarHelper* getMSO2OOCommandbarHelper()
-+    {
-+        if( pMSO2OOCommandbarHelper == NULL )
-+        {
-+            pMSO2OOCommandbarHelper = new MSO2OOCommandbarHelper();
-+        }
-+        return pMSO2OOCommandbarHelper;
-+    }
-+
-+    rtl::OUString findBuildinToolbar( const rtl::OUString& sToolbarName )
-+    {
-+        MSO2OOCommandbarMap::iterator it = maBuildinToolbarMap.begin();
-+        for(; it != maBuildinToolbarMap.end(); it++ )
-+        {
-+            rtl::OUString sName = it->first;
-+            if( sName.equalsIgnoreAsciiCase( sToolbarName ) )
-+                return it->second;
-+        }
-+        return rtl::OUString();
-+    }
-+};
-+
-+MSO2OOCommandbarHelper* MSO2OOCommandbarHelper::pMSO2OOCommandbarHelper = NULL;
-+
- 
- VbaCommandBarHelper::VbaCommandBarHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException) : mxContext( xContext ), mxModel( xModel )
- {
-@@ -113,6 +166,12 @@ rtl::OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference<
- {
-     rtl::OUString sUIName;
-     rtl::OUString sResourceUrl;
-+
-+    // check if it is an buildin toolbar
-+    sResourceUrl = MSO2OOCommandbarHelper::getMSO2OOCommandbarHelper()->findBuildinToolbar( sName );
-+    if( sResourceUrl.getLength() > 0 )
-+        return sResourceUrl;
-+
-     uno::Sequence< ::rtl::OUString > allNames = xNameAccess->getElementNames();
-     for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
-     {
diff --git a/applied_patches/0406-cws-cbosdo01.diff b/applied_patches/0406-cws-cbosdo01.diff
new file mode 100644
index 000000000..5c9301dfc
--- /dev/null
+++ b/applied_patches/0406-cws-cbosdo01.diff
@@ -0,0 +1,385 @@
+diff --git svx/inc/svx/svxacorr.hxx svx/inc/svx/svxacorr.hxx
+index 6771086..d414aed 100644
+--- svx/inc/svx/svxacorr.hxx
++++ svx/inc/svx/svxacorr.hxx
+@@ -67,6 +67,7 @@ const long SaveWordWrdSttLst= 0x00000400;	// 2 GrB. am WortAnf. auto. aufnehmen
+ const long IngnoreDoubleSpace= 0x00000800;	// 2 Spaces ignorieren
+ const long ChgSglQuotes		= 0x00001000;	// einfache Quotes ersetzen
+ const long CorrectCapsLock  = 0x00002000;   // Correct accidental use of cAPS LOCK key
++const long AddNonBrkSpace	= 0x00004000;	// Add non breaking space before :;?!
+ 
+ const long ChgWordLstLoad	= 0x20000000;	// Ersetzungsliste geladen
+ const long CplSttLstLoad	= 0x40000000;	// Exceptionlist fuer CplStart geladen
+@@ -369,6 +370,9 @@ public:
+     BOOL FnChgToEnEmDash( SvxAutoCorrDoc&, const String&,
+                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
+                                 LanguageType eLang = LANGUAGE_SYSTEM );
++    BOOL FnAddNonBrkSpace( SvxAutoCorrDoc&, const String&,
++                                xub_StrLen nSttPos, xub_StrLen nEndPos,
++                                LanguageType eLang = LANGUAGE_SYSTEM );
+     BOOL FnSetINetAttr( SvxAutoCorrDoc&, const String&,
+                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
+                                 LanguageType eLang = LANGUAGE_SYSTEM );
+diff --git svx/inc/svx/swafopt.hxx svx/inc/svx/swafopt.hxx
+index 18ae7e0..eb557ea 100644
+--- svx/inc/svx/swafopt.hxx
++++ svx/inc/svx/swafopt.hxx
+@@ -68,6 +68,7 @@ struct SVX_DLLPUBLIC SvxSwAutoFmtFlags
+     BOOL bChgFracionSymbol : 1;
+     BOOL bChgOrdinalNumber : 1;
+     BOOL bChgToEnEmDash : 1;
++    BOOL bAddNonBrkSpace : 1;
+     BOOL bChgWeightUnderl : 1;
+     BOOL bSetINetAttr : 1;
+ 
+diff --git svx/source/cui/autocdlg.cxx svx/source/cui/autocdlg.cxx
+index f4c0a21..a517c98 100644
+--- svx/source/cui/autocdlg.cxx
++++ svx/source/cui/autocdlg.cxx
+@@ -233,6 +233,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent,
+     sNoDblSpaces        (SVX_RES(STR_NO_DBL_SPACES    )),
+     sHalf               (SVX_RES(ST_FRACTION          )),
+     sDash    			(SVX_RES(ST_DASH	         	)),
++    sNonBrkSpace		(SVX_RES(ST_NON_BREAK_SPACE   )),
+     sFirst              (SVX_RES(ST_ORDINAL           )),
+     sAccidentalCaps     (SVX_RES(ST_CORRECT_ACCIDENTAL_CAPS_LOCK))
+ {
+@@ -279,6 +280,7 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& )
+     pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber,		aCheckLB.IsChecked(nPos++));
+     pAutoCorrect->SetAutoCorrFlag(ChgFractionSymbol,	aCheckLB.IsChecked(nPos++));
+     pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash,		aCheckLB.IsChecked(nPos++));
++    pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace,		aCheckLB.IsChecked(nPos++));
+     pAutoCorrect->SetAutoCorrFlag(IngnoreDoubleSpace,	aCheckLB.IsChecked(nPos++));
+     pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock,      aCheckLB.IsChecked(nPos++));
+ 
+@@ -321,6 +323,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& )
+     aCheckLB.InsertEntry(sFirst);
+     aCheckLB.InsertEntry(sHalf);
+     aCheckLB.InsertEntry(sDash);
++    aCheckLB.InsertEntry(sNonBrkSpace);
+     aCheckLB.InsertEntry(sNoDblSpaces);
+     aCheckLB.InsertEntry(sAccidentalCaps);
+ 
+@@ -333,6 +336,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& )
+     aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgOrdinalNumber) );
+     aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgFractionSymbol) );
+     aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgToEnEmDash) );
++    aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & AddNonBrkSpace) );
+     aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & IngnoreDoubleSpace) );
+     aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & CorrectCapsLock) );
+ 
+@@ -464,6 +468,7 @@ enum OfaAutoFmtOptions
+     REPLACE_1ST,
+     REPLACE_HALF,
+     REPLACE_DASHES,
++    ADD_NON_BRK_SPACE,
+     DEL_SPACES_AT_STT_END,
+     DEL_SPACES_BETWEEN_LINES,
+     IGNORE_DBLSPACE,
+@@ -501,6 +506,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
+     sFraction			(SVX_RES(	ST_FRACTION     )),
+     sDetectURL			(SVX_RES(	ST_DETECT_URL   )),
+     sDash				(SVX_RES(	ST_DASH         )),
++    sNonBrkSpace        (SVX_RES(   ST_NON_BREAK_SPACE )),
+     sOrdinal			(SVX_RES(	ST_ORDINAL      )),
+     sRightMargin		(SVX_RES(	ST_RIGHT_MARGIN	)),
+     sNum				(SVX_RES(	STR_NUM			)),
+@@ -711,6 +717,12 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet&  )
+     pOpt->bChgToEnEmDash = bCheck;
+     pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash,
+                         aCheckLB.IsChecked(REPLACE_DASHES, CBCOL_SECOND));
++    
++    bCheck = aCheckLB.IsChecked(ADD_NON_BRK_SPACE, CBCOL_FIRST);
++    bModified |= pOpt->bAddNonBrkSpace != bCheck;
++    pOpt->bAddNonBrkSpace = bCheck;
++    pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace,
++                        aCheckLB.IsChecked(ADD_NON_BRK_SPACE, CBCOL_SECOND));
+ 
+     bCheck = aCheckLB.IsChecked(DEL_SPACES_AT_STT_END, CBCOL_FIRST);
+     bModified |= pOpt->bAFmtDelSpacesAtSttEnd != bCheck;
+@@ -768,6 +780,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
+     aCheckLB.GetModel()->Insert(CreateEntry(sOrdinal,			CBCOL_BOTH	));
+     aCheckLB.GetModel()->Insert(CreateEntry(sFraction,			CBCOL_BOTH  ));
+     aCheckLB.GetModel()->Insert(CreateEntry(sDash,				CBCOL_BOTH  ));
++    aCheckLB.GetModel()->Insert(CreateEntry(sNonBrkSpace,       CBCOL_BOTH  ));
+     aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd,	CBCOL_BOTH  ));
+     aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH  ));
+ 
+@@ -801,6 +814,8 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
+     aCheckLB.CheckEntryPos( REPLACE_HALF,		CBCOL_SECOND,	0 != (nFlags & ChgFractionSymbol) );
+     aCheckLB.CheckEntryPos( REPLACE_DASHES,		CBCOL_FIRST,	pOpt->bChgToEnEmDash );
+     aCheckLB.CheckEntryPos( REPLACE_DASHES,		CBCOL_SECOND,	0 != (nFlags & ChgToEnEmDash) );
++    aCheckLB.CheckEntryPos( ADD_NON_BRK_SPACE,  CBCOL_FIRST,	0 != (nFlags & AddNonBrkSpace) );
++    aCheckLB.CheckEntryPos( ADD_NON_BRK_SPACE,	CBCOL_SECOND,	0 != (nFlags & AddNonBrkSpace) );
+     aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END,		CBCOL_FIRST,	pOpt->bAFmtDelSpacesAtSttEnd );
+     aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END,		CBCOL_SECOND,	pOpt->bAFmtByInpDelSpacesAtSttEnd );
+     aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES,	CBCOL_FIRST,	pOpt->bAFmtDelSpacesBetweenLines );
+diff --git svx/source/cui/autocdlg.hrc svx/source/cui/autocdlg.hrc
+index 38b3507..7aef1e4 100644
+--- svx/source/cui/autocdlg.hrc
++++ svx/source/cui/autocdlg.hrc
+@@ -153,6 +153,7 @@
+ #define FT_LANG                         209
+ #define LB_LANG                         210
+ #define ST_CORRECT_ACCIDENTAL_CAPS_LOCK 211
++#define ST_NON_BREAK_SPACE              212
+ 
+ #define CB_SMARTTAGS                    220
+ #define FT_SMARTTAGS                    221
+diff --git svx/source/cui/autocdlg.hxx svx/source/cui/autocdlg.hxx
+index ea5ee11..e3d1d3f 100644
+--- svx/source/cui/autocdlg.hxx
++++ svx/source/cui/autocdlg.hxx
+@@ -118,6 +118,7 @@ private:
+     String		sNoDblSpaces;
+     String		sHalf;
+     String		sDash;
++    String      sNonBrkSpace;
+     String		sFirst;
+     String      sAccidentalCaps;
+ 
+@@ -162,6 +163,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
+     String			sFraction;
+     String			sDetectURL;
+     String          sDash;
++    String          sNonBrkSpace;
+     String			sOrdinal;
+     String			sRightMargin;
+     String			sNum;
+diff --git svx/source/cui/autocdlg.src svx/source/cui/autocdlg.src
+index 099f63a..47f6c62 100644
+--- svx/source/cui/autocdlg.src
++++ svx/source/cui/autocdlg.src
+@@ -144,6 +144,10 @@ TabDialog RID_OFA_AUTOCORR_DLG
+     String ST_CORRECT_ACCIDENTAL_CAPS_LOCK \
+     { \
+         Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ; \
++    }; \
++    String ST_NON_BREAK_SPACE \
++    { \
++       Text [ en-US ] = "Add non breaking space before : ; ? ! in french text" ; \
+     };
+ 
+ /**************************************************************************/
+diff --git svx/source/editeng/acorrcfg.cxx svx/source/editeng/acorrcfg.cxx
+index 95ecf61..9a794c2 100644
+--- svx/source/editeng/acorrcfg.cxx
++++ svx/source/editeng/acorrcfg.cxx
+@@ -128,9 +128,10 @@ Sequence<OUString> 	SvxBaseAutoCorrCfg::GetPropertyNames()
+         "ReplaceDoubleQuote",					// 14
+         "DoubleQuoteAtStart",					// 15
+ 		"DoubleQuoteAtEnd",						// 16
+-        "CorrectAccidentalCapsLock"             // 17
++        "CorrectAccidentalCapsLock",            // 17
++        "AddNonBreakingSpace"                   // 18
+     };
+-	const int nCount = 18;
++	const int nCount = 19;
+     Sequence<OUString> aNames(nCount);
+     OUString* pNames = aNames.getArray();
+     for(int i = 0; i < nCount; i++)
+@@ -234,6 +235,10 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit)
+                         if(*(sal_Bool*)pValues[nProp].getValue())
+                             nFlags |= CorrectCapsLock;
+                     break;//"CorrectAccidentalCapsLock"
++                    case 18:
++                        if(*(sal_Bool*)pValues[nProp].getValue())
++                             nFlags |= AddNonBrkSpace;
++                     break;//"AddNonBreakingSpace"
+                 }
+             }
+         }
+@@ -408,8 +413,10 @@ Sequence<OUString> 	SvxSwAutoCorrCfg::GetPropertyNames()
+         "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily",    //45
+         "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset",   //46
+         "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch",     //47
++        "Format/Option/AddNonBreakSpace",                               //48
++        "Format/ByInput/AddNonBreakSpace",                              //49
+     };
+-    const int nCount = 48;
++    const int nCount = 50;
+     Sequence<OUString> aNames(nCount);
+     OUString* pNames = aNames.getArray();
+     for(int i = 0; i < nCount; i++)
+@@ -561,6 +568,8 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
+                         rSwFlags.aByInputBulletFont.SetPitch(FontPitch(nVal));
+                     }
+                     break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch",
++                    case 48 : rSwFlags.bAddNonBrkSpace = *(sal_Bool*)pValues[nProp].getValue( ); break;// "Format/Output/AddNonBreakingSpace",
++                    case 49 : rSwFlags.bAddNonBrkSpace = *(sal_Bool*)pValues[nProp].getValue( ); break;// "Format/ByInput/AddNonBreakingSpace",
+                 }
+             }
+         }
+@@ -676,6 +685,12 @@ void SvxSwAutoCorrCfg::Commit()
+             case 47 :
+                 pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetPitch();
+             break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch",
++            case  48:
++                bVal = rSwFlags.bAddNonBrkSpace;  pValues[nProp].setValue(&bVal, rType);
++            break; // "Format/Option/AddNonBreakingSpace",
++            case  49:
++                bVal = rSwFlags.bAddNonBrkSpace;  pValues[nProp].setValue(&bVal, rType);
++            break; // "Format/ByInput/AddNonBreakingSpace",
+         }
+     }
+     PutProperties(aNames, aValues);
+diff --git svx/source/editeng/svxacorr.cxx svx/source/editeng/svxacorr.cxx
+index a6e7401..fd7b093 100644
+--- svx/source/editeng/svxacorr.cxx
++++ svx/source/editeng/svxacorr.cxx
+@@ -33,6 +33,7 @@
+ 
+ 
+ #include <com/sun/star/io/XStream.hpp>
++#include <com/sun/star/lang/Locale.hpp>
+ #include <tools/urlobj.hxx>
+ #include <tools/table.hxx>
+ #include <i18npool/mslangid.hxx>
+@@ -98,6 +99,8 @@
+ #include <com/sun/star/ucb/NameClash.hpp>
+ #include <xmloff/xmltoken.hxx>
+ 
++#define CHAR_HARDBLANK		((sal_Unicode)0x00A0)
++
+ using namespace ::com::sun::star::ucb;
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star;
+@@ -348,6 +351,7 @@ long SvxAutoCorrect::GetDefaultFlags()
+                     | ChgFractionSymbol
+                     | ChgOrdinalNumber
+                     | ChgToEnEmDash
++                    | AddNonBrkSpace
+                     | ChgWeightUnderl
+                     | SetINetAttr
+                     | ChgQuotes
+@@ -694,6 +698,50 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash(
+     return bRet;
+ }
+ 
++BOOL SvxAutoCorrect::FnAddNonBrkSpace(
++                                SvxAutoCorrDoc& rDoc, const String& rTxt,
++                                xub_StrLen , xub_StrLen nEndPos,
++                                LanguageType eLang )
++{
++    bool bRet = false;
++    
++    CharClass& rCC = GetCharClass( eLang );
++    const lang::Locale rLocale = rCC.getLocale( );
++
++    if ( rLocale.Language == OUString::createFromAscii( "fr" ) )
++    {
++        sal_Unicode cChar = rTxt.GetChar( nEndPos );
++        if ( cChar == ':' || cChar == ';' || cChar == '!' || cChar == '?' )
++        {
++            // Check the previous char
++            sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 );
++            if ( cPrevChar != ':' && cPrevChar != ';' && cPrevChar != '!' && cPrevChar != '?' )
++            { 
++                // Remove any previous normal space
++                xub_StrLen nPos = nEndPos - 1;
++                while ( cPrevChar == ' ' || cPrevChar == CHAR_HARDBLANK )
++                {
++                    if ( nPos == 0 ) break;
++                    nPos--;
++                    cPrevChar = rTxt.GetChar( nPos );
++                }
++
++                if ( nPos != 0 )
++                {
++                    nPos++;
++                    if ( nEndPos - nPos > 0 )
++                        rDoc.Delete( nPos, nEndPos );
++
++                    // Add the non-breaking space at the end pos
++                    rDoc.Insert( nPos, CHAR_HARDBLANK );
++                    bRet = true;
++                }
++            }
++        }
++    }
++
++    return bRet;
++}
+ 
+ BOOL SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const String& rTxt,
+                                     xub_StrLen nSttPos, xub_StrLen nEndPos,
+@@ -1347,6 +1395,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
+                 FnChgFractionSymbol( rDoc, rTxt, nCapLttrPos, nInsPos ) ) ||
+             ( IsAutoCorrFlag( nRet = ChgOrdinalNumber ) &&
+                 FnChgOrdinalNumber( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) ) ||
++            ( IsAutoCorrFlag( nRet = AddNonBrkSpace ) &&
++                FnAddNonBrkSpace( rDoc, rTxt, nCapLttrPos, nInsPos - 1, eLang ) ) ||
+             ( IsAutoCorrFlag( nRet = SetINetAttr ) &&
+                 ( ' ' == cChar || '\t' == cChar || 0x0a == cChar || !cChar ) &&
+                 FnSetINetAttr( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) ) )
+diff --git sw/inc/comcore.hrc sw/inc/comcore.hrc
+index 8260814..9122841 100644
+--- sw/inc/comcore.hrc
++++ sw/inc/comcore.hrc
+@@ -115,8 +115,9 @@
+ #define STR_AUTOFMTREDL_SET_TMPL_HEADLINE		18
+ #define STR_AUTOFMTREDL_SET_NUMBULET			19
+ #define STR_AUTOFMTREDL_DEL_MORELINES			20
++#define STR_AUTOFMTREDL_NON_BREAK_SPACE         21
+ // !!!!!!!!!!!!!!!!!!!!!!!!!!  das Ende immer richtig setzen !!!!!!!!!!!!
+-#define STR_AUTOFMTREDL_END						21
++#define STR_AUTOFMTREDL_END						22
+ 
+ 
+ #endif
+diff --git sw/source/core/edit/autofmt.cxx sw/source/core/edit/autofmt.cxx
+index 9622075..f4499b2 100644
+--- sw/source/core/edit/autofmt.cxx
++++ sw/source/core/edit/autofmt.cxx
+@@ -319,6 +319,7 @@ void SwAutoFormat::_SetRedlineTxt( USHORT nActionId )
+         case STR_AUTOFMTREDL_FRACTION:
+         case STR_AUTOFMTREDL_DASH:
+         case STR_AUTOFMTREDL_ORDINAL:
++        case STR_AUTOFMTREDL_NON_BREAK_SPACE:
+             nSeqNo = ++nRedlAutoFmtSeqId;
+             break;
+         }
+@@ -1885,7 +1886,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
+         !aFlags.bCptlSttSntnc && !aFlags.bCptlSttWrd &&
+         !aFlags.bChgFracionSymbol && !aFlags.bChgOrdinalNumber &&
+         !aFlags.bChgToEnEmDash && !aFlags.bSetINetAttr &&
+-        !aFlags.bChgWeightUnderl) )
++		!aFlags.bChgWeightUnderl && !aFlags.bAddNonBrkSpace) )
+         return;
+ 
+     const String* pTxt = &pAktTxtNd->GetTxt();
+@@ -1894,7 +1895,8 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
+ 
+     BOOL bGetLanguage = aFlags.bChgOrdinalNumber ||
+                         aFlags.bChgToEnEmDash || aFlags.bSetINetAttr ||
+-                        aFlags.bCptlSttWrd || aFlags.bCptlSttSntnc;
++						aFlags.bCptlSttWrd || aFlags.bCptlSttSntnc ||
++                        aFlags.bAddNonBrkSpace;
+ 
+ 
+     aDelPam.DeleteMark();
+@@ -2123,6 +2125,9 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
+                 ( aFlags.bChgToEnEmDash &&
+                     SetRedlineTxt( STR_AUTOFMTREDL_DASH ) &&
+                     pATst->FnChgToEnEmDash( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) ) ||
++                ( aFlags.bAddNonBrkSpace &&
++                    SetRedlineTxt( STR_AUTOFMTREDL_NON_BREAK_SPACE ) &&
++                    pATst->FnAddNonBrkSpace( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) ) ||
+                 ( aFlags.bSetINetAttr &&
+                     ( nPos == pTxt->Len() || IsSpace( pTxt->GetChar( nPos )) ) &&
+                     SetRedlineTxt( STR_AUTOFMTREDL_DETECT_URL ) &&
+diff --git sw/source/ui/utlui/utlui.src sw/source/ui/utlui/utlui.src
+index 7a45772..3aad027 100644
+--- sw/source/ui/utlui/utlui.src
++++ sw/source/ui/utlui/utlui.src
+@@ -122,6 +122,10 @@ Resource RID_SHELLRES_AUTOFMTSTRS
+     {
+         Text [ en-US ] = "Combine paragraphs";
+     };
++    String STR_AUTOFMTREDL_NON_BREAK_SPACE +1
++    {
++        Text [ en-US ] = "Add non breaking space";
++    };
+ 
+ };
+ 
diff --git a/applied_patches/0406-vba-workbook-precisionasdisplayed.diff b/applied_patches/0406-vba-workbook-precisionasdisplayed.diff
deleted file mode 100644
index c846531c6..000000000
--- a/applied_patches/0406-vba-workbook-precisionasdisplayed.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git oovbaapi/ooo/vba/excel/XWorkbook.idl oovbaapi/ooo/vba/excel/XWorkbook.idl
-index 66a6380..d72940c 100644
---- oovbaapi/ooo/vba/excel/XWorkbook.idl
-+++ oovbaapi/ooo/vba/excel/XWorkbook.idl
-@@ -53,6 +53,7 @@ interface XWorkbook : com::sun::star::uno::XInterface
- 	[attribute, readonly] boolean ProtectStructure; 
- 	[attribute, readonly] XWorksheet ActiveSheet;
- 	[attribute, readonly] string  CodeName;
-+	[attribute] boolean  PrecisionAsDisplayed;
- 
- 	any  Worksheets([in] any sheet);
- 	any  Styles([in] any Index );
-diff --git sc/source/ui/vba/vbaworkbook.cxx sc/source/ui/vba/vbaworkbook.cxx
-index 5b6e277..7438065 100644
---- sc/source/ui/vba/vbaworkbook.cxx
-+++ sc/source/ui/vba/vbaworkbook.cxx
-@@ -52,6 +52,7 @@
- #include <stdio.h>
- #include "vbanames.hxx"  // Amelia Wang
- #include "nameuno.hxx"
-+#include "docoptio.hxx"
- 
- // Much of the impl. for the equivalend UNO module is
- // sc/source/ui/unoobj/docuno.cxx, viewuno.cxx
-@@ -270,6 +271,22 @@ ScVbaWorkbook::getProtectStructure() throw (uno::RuntimeException)
- 	return xProt->isProtected();
- }
- 
-+::sal_Bool SAL_CALL ScVbaWorkbook::getPrecisionAsDisplayed() throw (uno::RuntimeException)
-+{
-+    uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
-+    ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
-+    return pDoc->GetDocOptions().IsCalcAsShown();
-+}
-+
-+void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (uno::RuntimeException)
-+{
-+    uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
-+    ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
-+    ScDocOptions aOpt = pDoc->GetDocOptions();
-+    aOpt.SetCalcAsShown( _precisionAsDisplayed );
-+    pDoc->SetDocOptions( aOpt );
-+}
-+
- void
- ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::RuntimeException)
- {
-diff --git sc/source/ui/vba/vbaworkbook.hxx sc/source/ui/vba/vbaworkbook.hxx
-index 1ce5de5..05a0d52 100644
---- sc/source/ui/vba/vbaworkbook.hxx
-+++ sc/source/ui/vba/vbaworkbook.hxx
-@@ -56,6 +56,8 @@ public:
-     // Attributes
- 	virtual ::sal_Bool SAL_CALL getProtectStructure() throw (css::uno::RuntimeException);
- 	virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
-+	virtual ::sal_Bool SAL_CALL getPrecisionAsDisplayed() throw (css::uno::RuntimeException);
-+	virtual void SAL_CALL setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (css::uno::RuntimeException);
- 
- 	// Methods
- 	virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
diff --git a/applied_patches/0523-statusbar-fancy-modified-status-sc.diff b/applied_patches/0407-statusbar-fancy-modified-status-sc.diff
similarity index 100%
rename from applied_patches/0523-statusbar-fancy-modified-status-sc.diff
rename to applied_patches/0407-statusbar-fancy-modified-status-sc.diff
diff --git a/applied_patches/0407-uno-xmenu-getpopupMenu-fix.diff b/applied_patches/0407-uno-xmenu-getpopupMenu-fix.diff
deleted file mode 100644
index 32bd06e5e..000000000
--- a/applied_patches/0407-uno-xmenu-getpopupMenu-fix.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git toolkit/inc/toolkit/awt/vclxmenu.hxx toolkit/inc/toolkit/awt/vclxmenu.hxx
-index 2f2d6c6..84ca639 100644
---- toolkit/inc/toolkit/awt/vclxmenu.hxx
-+++ toolkit/inc/toolkit/awt/vclxmenu.hxx
-@@ -48,6 +48,7 @@
- class Menu;
- class MenuBar;
- class VclSimpleEvent;
-+class PopupMenu;
- 
- DECLARE_LIST( PopupMenuRefList, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >* )
- 
-@@ -184,6 +185,7 @@ class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCLXMenu
- {
- public:
- 		VCLXPopupMenu();
-+		VCLXPopupMenu( PopupMenu* pPopMenu );
- };
- 
- #endif // _TOOLKIT_AWT_VCLXMENU_HXX_
-diff --git toolkit/source/awt/vclxmenu.cxx toolkit/source/awt/vclxmenu.cxx
-index 192beab..7bbfa60 100644
---- toolkit/source/awt/vclxmenu.cxx
-+++ toolkit/source/awt/vclxmenu.cxx
-@@ -529,6 +529,14 @@ void VCLXMenu::setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Ref
- 				break;
- 			}
- 		}
-+        // it seems the popup menu is not insert into maPopupMenueRefs
-+        // if the popup men is not created by stardiv.Toolkit.VCLXPopupMenu
-+        if( !aRef.is() )
-+        {
-+		    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pNewRef = new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > ;
-+            *pNewRef = new VCLXPopupMenu( (PopupMenu*)pMenu );
-+            aRef = *pNewRef;
-+        }
- 	}
- 	return aRef;
- }
-@@ -1057,3 +1065,8 @@ VCLXPopupMenu::VCLXPopupMenu()
-     DBG_CTOR( VCLXPopupMenu, 0 );
-     ImplCreateMenu( TRUE );
- }
-+
-+VCLXPopupMenu::VCLXPopupMenu( PopupMenu* pPopMenu ) : VCLXMenu( (Menu *)pPopMenu )
-+{
-+    DBG_CTOR( VCLXPopupMenu, 0 );
-+}
diff --git a/applied_patches/0524-statusbar-fancy-modified-status-sd.diff b/applied_patches/0408-statusbar-fancy-modified-status-sd.diff
similarity index 100%
rename from applied_patches/0524-statusbar-fancy-modified-status-sd.diff
rename to applied_patches/0408-statusbar-fancy-modified-status-sd.diff
diff --git a/applied_patches/0408-vba-commandbarcontrol-enabled.diff b/applied_patches/0408-vba-commandbarcontrol-enabled.diff
deleted file mode 100644
index d65a3d650..000000000
--- a/applied_patches/0408-vba-commandbarcontrol-enabled.diff
+++ /dev/null
@@ -1,309 +0,0 @@
-diff --git oovbaapi/ooo/vba/XCommandBarControl.idl oovbaapi/ooo/vba/XCommandBarControl.idl
-index 167bce8..b10750e 100644
---- oovbaapi/ooo/vba/XCommandBarControl.idl
-+++ oovbaapi/ooo/vba/XCommandBarControl.idl
-@@ -55,6 +55,7 @@ interface XCommandBarControl
-     [attribute] string OnAction;
-     [attribute] boolean Visible;
-     [attribute, readonly] long Type;
-+    [attribute] boolean Enabled;
-     
-     void Delete() raises ( com::sun::star::script::BasicErrorException );
-     any Controls( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
-diff --git vbahelper/source/vbahelper/vbacommandbar.cxx vbahelper/source/vbahelper/vbacommandbar.cxx
-index 43abe41..8c10277 100644
---- vbahelper/source/vbahelper/vbacommandbar.cxx
-+++ vbahelper/source/vbahelper/vbacommandbar.cxx
-@@ -128,9 +128,7 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
- {
-     try
-     {
--        uno::Reference< frame::XFrame > xFrame( pCBarHelper->getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); 
--        uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
--        uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW );
-+        uno::Reference< frame::XLayoutManager > xLayoutManager = pCBarHelper->getLayoutManager();
-         if( _visible )
-         {
-             xLayoutManager->createElement( m_sResourceUrl );
-@@ -151,16 +149,15 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
- ::sal_Bool SAL_CALL 
- ScVbaCommandBar::getEnabled() throw (uno::RuntimeException)
- {
--    // #FIXME: seems tha main menu is alwayse enabled.
--    // for the toolbar, need to investigate
--    return sal_True;
-+    // emulated with Visible
-+    return getVisible();
- }
- 
- void SAL_CALL
--ScVbaCommandBar::setEnabled( sal_Bool/* _enabled */ ) throw (uno::RuntimeException)
-+ScVbaCommandBar::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException)
- {
--    // #FIXME: seems tha main menu is alwayse enabled.
--    // for the toolbar, need to investigate
-+    // emulated with Visible
-+    setVisible( _enabled );
- }
- 
- void SAL_CALL 
-@@ -189,7 +186,14 @@ ScVbaCommandBar::Delete(  ) throw (script::BasicErrorException, uno::RuntimeExce
- uno::Any SAL_CALL 
- ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
- {
--    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, m_xBarSettings, pCBarHelper, m_xBarSettings, m_sResourceUrl ) );
-+    uno::Reference< awt::XMenu > xMenu;
-+    if( m_bIsMenu )
-+    {
-+        uno::Reference< frame::XLayoutManager > xLayoutManager = pCBarHelper->getLayoutManager();
-+        uno::Reference< beans::XPropertySet > xPropertySet( xLayoutManager->getElement( m_sResourceUrl ), uno::UNO_QUERY_THROW );
-+        xMenu.set( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("XMenuBar") ), uno::UNO_QUERY );
-+    }
-+    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, m_xBarSettings, pCBarHelper, m_xBarSettings, m_sResourceUrl, xMenu ) );
-     if( aIndex.hasValue() )
-     {
-         return xCommandBarControls->Item( aIndex, uno::Any() );
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-index dd20256..050af79 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-@@ -118,6 +118,39 @@ ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeExc
-     }
- }
- 
-+::sal_Bool SAL_CALL 
-+ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException)
-+{
-+    sal_Bool bEnabled = sal_True;
-+    if( m_xParentMenu.is() )
-+    {
-+        // currently only the menu in the MenuBat support Enable/Disable
-+        // FIXME: how to support the menu item in Toolbar
-+        bEnabled = m_xParentMenu->isItemEnabled( m_xParentMenu->getItemId( m_nPosition ) );
-+    }
-+    else
-+    {
-+        // emulated with Visible
-+        bEnabled = getVisible();
-+    }    
-+    return bEnabled;
-+}
-+
-+void SAL_CALL
-+ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException)
-+{
-+    if( m_xParentMenu.is() )
-+    {
-+        // currently only the menu in the MenuBat support Enable/Disable
-+        m_xParentMenu->enableItem( m_xParentMenu->getItemId( m_nPosition ), _enabled );
-+    }
-+    else
-+    {
-+        // emulated with Visible
-+        setVisible( _enabled );
-+    }    
-+}
-+
- void SAL_CALL 
- ScVbaCommandBarControl::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
- {
-@@ -150,8 +183,15 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicE
-     getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER ) ) >>= xSubMenu;
-     if( !xSubMenu.is() )
-         throw uno::RuntimeException();
-+    
-+    uno::Reference< awt::XMenu > xMenu;
-+    if( m_xParentMenu.is() )
-+    {
-+        sal_Int32 nItemId = m_xParentMenu->getItemId( m_nPosition );
-+        xMenu.set( m_xParentMenu->getPopupMenu( nItemId ), uno::UNO_QUERY );
-+    }    
- 
--    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, xSubMenu, pCBarHelper, m_xBarSettings, m_sResourceUrl ) );
-+    uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, xSubMenu, pCBarHelper, m_xBarSettings, m_sResourceUrl, xMenu ) );
-     if( aIndex.hasValue() )
-     {
-         return xCommandBarControls->Item( aIndex, uno::Any() );
-@@ -179,11 +219,12 @@ ScVbaCommandBarControl::getServiceNames()
- }
- 
- //////////// ScVbaCommandBarPopup //////////////////////////////
--ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
-+ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary, const css::uno::Reference< css::awt::XMenu >& xMenu ) throw (css::uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
- {
-     m_nPosition = nPosition;
-     m_bTemporary = bTemporary;
-     m_xCurrentSettings->getByIndex( m_nPosition ) >>= m_aPropertyValues;
-+    m_xParentMenu = xMenu;
- }
- 
- rtl::OUString& 
-@@ -205,11 +246,12 @@ ScVbaCommandBarPopup::getServiceNames()
- }
- 
- //////////// ScVbaCommandBarButton //////////////////////////////
--ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
-+ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary, const css::uno::Reference< css::awt::XMenu >& xMenu ) throw (css::uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
- {
-     m_nPosition = nPosition;
-     m_bTemporary = bTemporary;
-     m_xCurrentSettings->getByIndex( m_nPosition ) >>= m_aPropertyValues;
-+    m_xParentMenu = xMenu;
- }
- 
- rtl::OUString& 
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrol.hxx vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
-index f40ad82..0d2d30b 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
-@@ -39,6 +39,7 @@
- #include <ooo/vba/XCommandBarPopup.hpp>
- #include <ooo/vba/XCommandBarButton.hpp>
- #include <ooo/vba/office/MsoControlType.hpp>
-+#include <com/sun/star/awt/XMenu.hpp>
- #include <vbahelper/vbahelperinterface.hxx>
- #include "vbacommandbarhelper.hxx"
- #include <cppuhelper/implbase1.hxx>
-@@ -53,6 +54,7 @@ protected:
-     css::uno::Reference< css::container::XIndexAccess >          m_xCurrentSettings;
-     css::uno::Reference< css::container::XIndexAccess >          m_xBarSettings;
-     css::uno::Sequence< css::beans::PropertyValue >              m_aPropertyValues;
-+    css::uno::Reference< css::awt::XMenu >                        m_xParentMenu;
- 
-     sal_Int32           m_nPosition;
-     sal_Bool            m_bTemporary;
-@@ -71,6 +73,8 @@ public:
-     virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException);
-     virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
-     virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
-+    virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
-+    virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException);
-     virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException)
-     {
-         return ov::office::MsoControlType::msoControlButton;
-@@ -89,7 +93,7 @@ typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarPop
- class ScVbaCommandBarPopup : public CommandBarPopup_BASE
- {
- public:
--    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary, const css::uno::Reference< css::awt::XMenu >& xMenu ) throw (css::uno::RuntimeException);
- 
-     virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException)
-     {
-@@ -104,7 +108,7 @@ typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarBut
- class ScVbaCommandBarButton : public CommandBarButton_BASE
- {
- public:
--    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
-+    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary, const css::uno::Reference< css::awt::XMenu >& xMenu ) throw (css::uno::RuntimeException);
- 
-     virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException)
-     {
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrols.cxx vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-index ea56a09..488b56a 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-@@ -63,7 +63,7 @@ public:
-     }
- };
- 
--ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess>& xIndexAccess, VbaCommandBarHelperRef pHelper, const uno::Reference< container::XIndexAccess>& xBarSettings, const rtl::OUString& sResourceUrl ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl )
-+ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess>& xIndexAccess, VbaCommandBarHelperRef pHelper, const uno::Reference< container::XIndexAccess>& xBarSettings, const rtl::OUString& sResourceUrl, const uno::Reference< awt::XMenu >& xMenu  ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl ), m_xMenu( xMenu )
- {
-     m_bIsMenu = sResourceUrl.equalsAscii( ITEM_MENUBAR_URL ) ? sal_True : sal_False;
- }
-@@ -132,9 +132,9 @@ ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
-     getPropertyValue( aProps, rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER ) ) >>= xSubMenu;
-     ScVbaCommandBarControl* pNewCommandBarControl = NULL;
-     if( xSubMenu.is() )
--        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, sal_True );
-+        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, sal_True, m_xMenu );
-     else
--        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, sal_True );
-+        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, sal_True, m_xMenu );
- 
-     return uno::makeAny( uno::Reference< XCommandBarControl > ( pNewCommandBarControl ) );
- }
-@@ -227,11 +227,12 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un
-     if( !bTemporary )
-         pCBarHelper->persistChanges();
- 
-+    // sometimes it would crash if passing m_xMenu instead of uno::Reference< awt::XMenu >() in Linux. 
-     ScVbaCommandBarControl* pNewCommandBarControl = NULL;
-     if( nType == office::MsoControlType::msoControlPopup )
--        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary );
-+        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary, uno::Reference< awt::XMenu >() );
-     else
--        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary );
-+        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary, uno::Reference< awt::XMenu >() );
- 
-     return uno::Reference< XCommandBarControl >( pNewCommandBarControl );
- }
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrols.hxx vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
-index fa37f10..ce89794 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
-@@ -36,6 +36,7 @@
- #define SC_VBA_COMMANDBARCONTROLS_HXX
- 
- #include <ooo/vba/XCommandBarControls.hpp>
-+#include <com/sun/star/awt/XMenu.hpp>
- #include <vbahelper/vbahelperinterface.hxx>
- #include <vbahelper/vbacollectionimpl.hxx>
- #include "vbacommandbarhelper.hxx"
-@@ -48,13 +49,14 @@ private:
-     VbaCommandBarHelperRef pCBarHelper;
-     css::uno::Reference< css::container::XIndexAccess >          m_xBarSettings;
-     rtl::OUString       m_sResourceUrl;
-+    css::uno::Reference< css::awt::XMenu >                        m_xMenu;
-     sal_Bool m_bIsMenu;
- 
-     css::uno::Sequence< css::beans::PropertyValue > CreateMenuItemData( const rtl::OUString& sCommandURL, const rtl::OUString& sHelpURL, const rtl::OUString& sLabel, sal_uInt16 nType, const css::uno::Any& aSubMenu );
-     css::uno::Sequence< css::beans::PropertyValue > CreateToolbarItemData( const rtl::OUString& sCommandURL, const rtl::OUString& sHelpURL, const rtl::OUString& sLabel, sal_uInt16 nType, const css::uno::Any& aSubMenu, sal_Bool isVisible, sal_Int32 nStyle );
- 
- public:
--    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl ) throw( css::uno::RuntimeException );
-+    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, const css::uno::Reference< css::awt::XMenu >& xMenu ) throw( css::uno::RuntimeException );
-     sal_Bool IsMenu(){ return m_bIsMenu; }
- 
-     // XEnumerationAccess
-diff --git vbahelper/source/vbahelper/vbacommandbarhelper.cxx vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-index b4515b6..034e506 100644
---- vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-@@ -155,6 +155,14 @@ sal_Bool VbaCommandBarHelper::persistChanges() throw (css::uno::RuntimeException
-     return result;
- }
- 
-+uno::Reference< frame::XLayoutManager > VbaCommandBarHelper::getLayoutManager() throw (uno::RuntimeException)
-+{
-+    uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); 
-+    uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
-+    uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW );
-+    return xLayoutManager;
-+}
-+
- rtl::OUString VbaCommandBarHelper::getMenuBarUrl()
- {
-     static const rtl::OUString sMenuBarUrl( RTL_CONSTASCII_USTRINGPARAM( ITEM_MENUBAR_URL ) );
-diff --git vbahelper/source/vbahelper/vbacommandbarhelper.hxx vbahelper/source/vbahelper/vbacommandbarhelper.hxx
-index a6304bc..64a808d 100644
---- vbahelper/source/vbahelper/vbacommandbarhelper.hxx
-+++ vbahelper/source/vbahelper/vbacommandbarhelper.hxx
-@@ -42,6 +42,7 @@
- #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
- #include <com/sun/star/container/XIndexAccess.hpp>
- #include <com/sun/star/container/XNameAccess.hpp>
-+#include <com/sun/star/frame/XLayoutManager.hpp>
- #include <boost/shared_ptr.hpp>
- 
- 
-@@ -95,6 +96,8 @@ public:
-     }
-     sal_Bool persistChanges() throw (css::uno::RuntimeException);
- 
-+    css::uno::Reference< css::frame::XLayoutManager > getLayoutManager() throw (css::uno::RuntimeException);
-+
-     const rtl::OUString getModuleId(){ return maModuleId; }
-     static rtl::OUString getMenuBarUrl();
-     rtl::OUString findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException);
diff --git a/applied_patches/0525-statusbar-fancy-modified-status-sfx2.diff b/applied_patches/0409-statusbar-fancy-modified-status-sfx2.diff
similarity index 100%
rename from applied_patches/0525-statusbar-fancy-modified-status-sfx2.diff
rename to applied_patches/0409-statusbar-fancy-modified-status-sfx2.diff
diff --git a/applied_patches/0409-vba-commandbar-document-scope.diff b/applied_patches/0409-vba-commandbar-document-scope.diff
deleted file mode 100644
index 5ed8e8789..000000000
--- a/applied_patches/0409-vba-commandbar-document-scope.diff
+++ /dev/null
@@ -1,252 +0,0 @@
-diff --git vbahelper/source/vbahelper/vbacommandbar.cxx vbahelper/source/vbahelper/vbacommandbar.cxx
-index 8c10277..63af635 100644
---- vbahelper/source/vbahelper/vbacommandbar.cxx
-+++ vbahelper/source/vbahelper/vbacommandbar.cxx
-@@ -61,7 +61,7 @@ ScVbaCommandBar::getName() throw ( uno::RuntimeException )
-     {
-         if( m_bIsMenu )
-         {
--            if( m_sResourceUrl.equals( VbaCommandBarHelper::getMenuBarUrl() ) )
-+            if( m_sResourceUrl.equalsAscii( ITEM_MENUBAR_URL ) )
-             {
-                 if( pCBarHelper->getModuleId().equalsAscii("com.sun.star.sheet.SpreadsheetDocument") )
-                     sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Worksheet Menu Bar") );
-@@ -87,18 +87,7 @@ ScVbaCommandBar::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeExce
-     uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
-     xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("UIName"), uno::makeAny( _name ) );
-     
--    if( pCBarHelper->getAppCfgManager()->hasSettings( m_sResourceUrl ) )
--    {
--        pCBarHelper->getAppCfgManager()->replaceSettings( m_sResourceUrl, m_xBarSettings );
--    }
--    else
--    {
--        pCBarHelper->getAppCfgManager()->insertSettings( m_sResourceUrl, m_xBarSettings );
--    }
--    if( !m_bTemporary )
--    {
--        pCBarHelper->persistChanges();
--    }
-+    pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings );
- }
- ::sal_Bool SAL_CALL 
- ScVbaCommandBar::getVisible() throw (uno::RuntimeException)
-@@ -163,20 +152,7 @@ ScVbaCommandBar::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException)
- void SAL_CALL 
- ScVbaCommandBar::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException)
- {
--    if( pCBarHelper->getAppCfgManager()->hasSettings( m_sResourceUrl ) )
--    {
--        pCBarHelper->getAppCfgManager()->removeSettings(m_sResourceUrl);
--        // make it permanent
--        if( !m_bTemporary )
--        {
--            pCBarHelper->persistChanges();
--        }
--    }
--    else
--    {
--        // toolbar not found
--        // TODO throw Error
--    }
-+    pCBarHelper->removeSettings( m_sResourceUrl );
-     uno::Reference< container::XNameContainer > xNameContainer( pCBarHelper->getPersistentWindowState(), uno::UNO_QUERY_THROW );
-     if( xNameContainer->hasByName( m_sResourceUrl ) )
-     {
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-index 050af79..f6eb381 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
-@@ -53,9 +53,7 @@ void ScVbaCommandBarControl::ApplyChange() throw ( uno::RuntimeException )
- {
-     uno::Reference< container::XIndexContainer > xIndexContainer( m_xCurrentSettings, uno::UNO_QUERY_THROW );
-     xIndexContainer->replaceByIndex( m_nPosition, uno::makeAny( m_aPropertyValues ) );
--    pCBarHelper->getAppCfgManager()->replaceSettings( m_sResourceUrl, m_xBarSettings );
--    if( !m_bTemporary )
--        pCBarHelper->persistChanges();
-+    pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings );
- }
- 
- ::rtl::OUString SAL_CALL
-@@ -159,19 +157,7 @@ ScVbaCommandBarControl::Delete(  ) throw (script::BasicErrorException, uno::Runt
-         uno::Reference< container::XIndexContainer > xIndexContainer( m_xCurrentSettings, uno::UNO_QUERY_THROW );
-         xIndexContainer->removeByIndex( m_nPosition );
- 
--        if( pCBarHelper->getAppCfgManager()->hasSettings( m_sResourceUrl ) )
--        {
--            pCBarHelper->getAppCfgManager()->replaceSettings( m_sResourceUrl, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        else
--        {
--            pCBarHelper->getAppCfgManager()->insertSettings( m_sResourceUrl, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
--        }
--        // make it permanent
--        if( !m_bTemporary )
--        {
--            pCBarHelper->persistChanges();
--        }
-+        pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings );
-     }
- }
- 
-diff --git vbahelper/source/vbahelper/vbacommandbarcontrols.cxx vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-index 488b56a..1aa7d7e 100644
---- vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-@@ -223,9 +223,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un
-     uno::Reference< container::XIndexContainer > xIndexContainer( m_xIndexAccess, uno::UNO_QUERY_THROW );
-     xIndexContainer->insertByIndex( nPosition, uno::makeAny( aProps ) );
- 
--    pCBarHelper->getAppCfgManager()->replaceSettings( m_sResourceUrl, m_xBarSettings );
--    if( !bTemporary )
--        pCBarHelper->persistChanges();
-+    pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings );
- 
-     // sometimes it would crash if passing m_xMenu instead of uno::Reference< awt::XMenu >() in Linux. 
-     ScVbaCommandBarControl* pNewCommandBarControl = NULL;
-diff --git vbahelper/source/vbahelper/vbacommandbarhelper.cxx vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-index 034e506..3cf12f6 100644
---- vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-@@ -138,14 +138,48 @@ void VbaCommandBarHelper::Init( ) throw (css::uno::RuntimeException)
-     m_xWindowState.set( xNameAccess->getByName( maModuleId ), uno::UNO_QUERY_THROW );
- }
- 
--css::uno::Reference< css::container::XIndexAccess > VbaCommandBarHelper::getMenuBarSettings() throw (css::uno::RuntimeException)
-+css::uno::Reference< css::container::XIndexAccess > VbaCommandBarHelper::getSettings( const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException)
- {
--    return m_xAppCfgMgr->getSettings( getMenuBarUrl(), sal_True );
-+    if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
-+        return m_xDocCfgMgr->getSettings( sResourceUrl, sal_True );
-+    else if( m_xAppCfgMgr->hasSettings( sResourceUrl ) )
-+        return m_xAppCfgMgr->getSettings( sResourceUrl, sal_True );
-+    else
-+    {
-+        css::uno::Reference< css::container::XIndexAccess > xSettings( m_xAppCfgMgr->createSettings( ), uno::UNO_QUERY_THROW );
-+        return xSettings;
-+    }
-+}
-+
-+void VbaCommandBarHelper::removeSettings( const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException)
-+{
-+    if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
-+        m_xDocCfgMgr->removeSettings( sResourceUrl );
-+    else if( m_xAppCfgMgr->hasSettings( sResourceUrl ) )
-+        m_xAppCfgMgr->removeSettings( sResourceUrl );
-+    
-+    // persistChanges();
-+}
-+
-+void VbaCommandBarHelper::ApplyChange( const rtl::OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings, sal_Bool bTemporary ) throw (css::uno::RuntimeException)
-+{
-+    if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
-+    {
-+        m_xDocCfgMgr->replaceSettings( sResourceUrl, xSettings );
-+    }
-+    else
-+    {
-+        m_xDocCfgMgr->insertSettings( sResourceUrl, xSettings );
-+    }
-+    if( !bTemporary )
-+    {
-+        persistChanges();
-+    }
- }
- 
- sal_Bool VbaCommandBarHelper::persistChanges() throw (css::uno::RuntimeException)
- {
--    uno::Reference< css::ui::XUIConfigurationPersistence > xConfigPersistence( m_xAppCfgMgr, uno::UNO_QUERY_THROW );
-+    uno::Reference< css::ui::XUIConfigurationPersistence > xConfigPersistence( m_xDocCfgMgr, uno::UNO_QUERY_THROW );
-     sal_Bool result = sal_False;
-     if( xConfigPersistence->isModified() )
-     {
-@@ -163,12 +197,6 @@ uno::Reference< frame::XLayoutManager > VbaCommandBarHelper::getLayoutManager()
-     return xLayoutManager;
- }
- 
--rtl::OUString VbaCommandBarHelper::getMenuBarUrl()
--{
--    static const rtl::OUString sMenuBarUrl( RTL_CONSTASCII_USTRINGPARAM( ITEM_MENUBAR_URL ) );
--    return sMenuBarUrl;
--}
--
- // return the resource url if found
- rtl::OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException)
- {
-@@ -187,9 +215,9 @@ rtl::OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference<
-         if(sResourceUrl.indexOf( rtl::OUString::createFromAscii( ITEM_TOOLBAR_URL ) ) == 0 )
-         {
-             //OSL_TRACE("VbaCommandBarHelper::findToolbarByName, toolbar resource url: %s", rtl::OUStringToOString( sResourceUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
--            if( m_xAppCfgMgr->hasSettings( sResourceUrl ) )
-+            if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
-             {
--                uno::Reference< beans::XPropertySet > xPropertySet( m_xAppCfgMgr->getSettings( sResourceUrl, sal_False ), uno::UNO_QUERY_THROW );
-+                uno::Reference< beans::XPropertySet > xPropertySet( m_xDocCfgMgr->getSettings( sResourceUrl, sal_False ), uno::UNO_QUERY_THROW );
-                 xPropertySet->getPropertyValue( rtl::OUString::createFromAscii(ITEM_DESCRIPTOR_UINAME) ) >>= sUIName;
-               //  OSL_TRACE("VbaCommandBarHelper::findToolbarByName, toolbar ui name: %s", rtl::OUStringToOString( sUIName, RTL_TEXTENCODING_UTF8 ).getStr() );
-                 if( sName.equalsIgnoreAsciiCase( sUIName ) )
-diff --git vbahelper/source/vbahelper/vbacommandbarhelper.hxx vbahelper/source/vbahelper/vbacommandbarhelper.hxx
-index 64a808d..10ed441 100644
---- vbahelper/source/vbahelper/vbacommandbarhelper.hxx
-+++ vbahelper/source/vbahelper/vbacommandbarhelper.hxx
-@@ -89,17 +89,18 @@ public:
-     {
-         return m_xAppCfgMgr;
-     }
--    css::uno::Reference< css::container::XIndexAccess > getMenuBarSettings() throw (css::uno::RuntimeException);
-     css::uno::Reference< css::container::XNameAccess > getPersistentWindowState() throw (css::uno::RuntimeException)
-     {
-         return m_xWindowState;
-     }
-     sal_Bool persistChanges() throw (css::uno::RuntimeException);
-+    css::uno::Reference< css::container::XIndexAccess > getSettings( const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException);
-+    void removeSettings( const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException);
-+    void ApplyChange( const rtl::OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings, sal_Bool bTemporary = sal_True ) throw (css::uno::RuntimeException);
- 
-     css::uno::Reference< css::frame::XLayoutManager > getLayoutManager() throw (css::uno::RuntimeException);
- 
-     const rtl::OUString getModuleId(){ return maModuleId; }
--    static rtl::OUString getMenuBarUrl();
-     rtl::OUString findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException);
-     static sal_Int32 findControlByName( const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException);
-     static rtl::OUString generateCustomURL();
-diff --git vbahelper/source/vbahelper/vbacommandbars.cxx vbahelper/source/vbahelper/vbacommandbars.cxx
-index 0f7881e..e87e4a3 100644
---- vbahelper/source/vbahelper/vbacommandbars.cxx
-+++ vbahelper/source/vbahelper/vbacommandbars.cxx
-@@ -76,7 +76,7 @@ public:
-             rtl::OUString sResourceUrl( m_sNames[ m_nCurrentPosition++ ] );
-             if( sResourceUrl.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 ) 
-             {
--                uno::Reference< container::XIndexAccess > xCBarSetting = pCBarHelper->getAppCfgManager()->getSettings( sResourceUrl, sal_True );
-+                uno::Reference< container::XIndexAccess > xCBarSetting = pCBarHelper->getSettings( sResourceUrl );
-                 uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, pCBarHelper, xCBarSetting, sResourceUrl, sal_False, sal_False ) );
-              }
-              else
-@@ -125,7 +125,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
-             || sBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Menu Bar") ) )
-         {
-             // menu bar
--            sResourceUrl = pCBarHelper->getMenuBarUrl();
-+            sResourceUrl = rtl::OUString::createFromAscii( ITEM_MENUBAR_URL );
-             bMenu = sal_True;
-         }
-         else
-@@ -136,7 +136,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
-     }
- 
-     if( sResourceUrl.getLength() )
--        xBarSettings = pCBarHelper->getAppCfgManager()->getSettings( sResourceUrl, sal_True );
-+        xBarSettings = pCBarHelper->getSettings( sResourceUrl );
-     else
-         throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toolbar do not exist") ), uno::Reference< uno::XInterface >() );
- 
-@@ -171,7 +171,7 @@ ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Positio
-         Temporary >>= bTemporary;
-     
-     sResourceUrl = VbaCommandBarHelper::generateCustomURL();
--    uno::Reference< container::XIndexAccess > xBarSettings( pCBarHelper->getAppCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
-+    uno::Reference< container::XIndexAccess > xBarSettings( pCBarHelper->getSettings( sResourceUrl ), uno::UNO_QUERY_THROW );
-     uno::Reference< XCommandBar > xCBar( new ScVbaCommandBar( this, mxContext, pCBarHelper, xBarSettings, sResourceUrl, sal_False, bTemporary ) );
-     xCBar->setName( sName );
-     return xCBar;
diff --git a/applied_patches/0526-statusbar-fancy-modified-status-starmath.diff b/applied_patches/0410-statusbar-fancy-modified-status-starmath.diff
similarity index 100%
rename from applied_patches/0526-statusbar-fancy-modified-status-starmath.diff
rename to applied_patches/0410-statusbar-fancy-modified-status-starmath.diff
diff --git a/applied_patches/0410-vba-dim-as-contants-fix.diff b/applied_patches/0410-vba-dim-as-contants-fix.diff
deleted file mode 100644
index 0642b785b..000000000
--- a/applied_patches/0410-vba-dim-as-contants-fix.diff
+++ /dev/null
@@ -1,193 +0,0 @@
-diff --git basic/source/classes/sbunoobj.cxx basic/source/classes/sbunoobj.cxx
-index 18e1cce..ccf20e6 100644
---- basic/source/classes/sbunoobj.cxx
-+++ basic/source/classes/sbunoobj.cxx
-@@ -3170,11 +3170,16 @@ getTypeDescriptorEnumeration( const ::rtl::OUString& sSearchRoot,
- 
- typedef std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
- 
--SbxVariable* getVBAConstant( const String& rName )
-+VBAConstantHelper&
-+VBAConstantHelper::instance()
-+{
-+    static VBAConstantHelper aHelper;
-+    return aHelper;
-+}
-+
-+void
-+VBAConstantHelper::init()
- {
--    SbxVariable* pConst = NULL;
--    static VBAConstantsHash aConstCache;
--    static bool isInited = false;
-     if ( !isInited )
-     {
-         Sequence< TypeClass > types(1);
-@@ -3182,39 +3187,77 @@ SbxVariable* getVBAConstant( const String& rName )
-         Reference< XTypeDescriptionEnumeration > xEnum = getTypeDescriptorEnumeration( defaultNameSpace, types, TypeDescriptionSearchDepth_INFINITE  );
- 
-         if ( !xEnum.is() )
--            return NULL;
-+            return; //NULL;
- 
-         while ( xEnum->hasMoreElements() )
-         {
-             Reference< XConstantsTypeDescription > xConstants( xEnum->nextElement(), UNO_QUERY );
-             if ( xConstants.is() )
-             {
-+                // store constant group name 
-+                ::rtl::OUString sFullName = xConstants->getName();
-+                sal_Int32 indexLastDot = sFullName.lastIndexOf('.');
-+                ::rtl::OUString sLeafName( sFullName );
-+                if ( indexLastDot > -1 )
-+                    sLeafName = sFullName.copy( indexLastDot + 1);
-+                aConstCache.push_back( sLeafName ); // assume constant group names are unique
-                 Sequence< Reference< XConstantTypeDescription > > aConsts = xConstants->getConstants();
-                 Reference< XConstantTypeDescription >* pSrc = aConsts.getArray();
-                 sal_Int32 nLen = aConsts.getLength();
-                 for ( sal_Int32 index =0;  index<nLen; ++pSrc, ++index )
-                 {
-+                    // store constant member name
-                     Reference< XConstantTypeDescription >& rXConst =
-                         *pSrc;
--                    ::rtl::OUString sFullName = rXConst->getName();
--                    sal_Int32 indexLastDot = sFullName.lastIndexOf('.');
--                    ::rtl::OUString sLeafName;
-+                    sFullName = rXConst->getName();
-+                    indexLastDot = sFullName.lastIndexOf('.');
-+                    sLeafName = sFullName;
-                     if ( indexLastDot > -1 )
-                         sLeafName = sFullName.copy( indexLastDot + 1);
--                    aConstCache[ sLeafName.toAsciiLowerCase() ] = rXConst->getConstantValue();
-+                    aConstHash[ sLeafName.toAsciiLowerCase() ] = rXConst->getConstantValue();
-                 }
-             }
-         }
-         isInited = true;
-     }
-+}
-+
-+bool
-+VBAConstantHelper::isVBAConstantType( const String& rName )
-+{
-+    init();
-+    bool bConstant = false;
-+    ::rtl::OUString sKey( rName );
-+    VBAConstantsVector::const_iterator it = aConstCache.begin();
-+
-+    for( ; it != aConstCache.end(); it++ )
-+    {
-+        if( sKey.equalsIgnoreAsciiCase( *it ) )
-+        {
-+            bConstant = true;
-+            break;
-+        }
-+    }
-+    return bConstant; 
-+}
-+
-+SbxVariable* 
-+VBAConstantHelper::getVBAConstant( const String& rName )
-+{
-+    SbxVariable* pConst = NULL;
-+    init();
-+
-     ::rtl::OUString sKey( rName );
--    VBAConstantsHash::const_iterator it = aConstCache.find( sKey.toAsciiLowerCase() );
--    if ( it != aConstCache.end() )
-+
-+    VBAConstantsHash::const_iterator it = aConstHash.find( sKey.toAsciiLowerCase() );
-+
-+    if ( it != aConstHash.end() )
-     {
-         pConst = new SbxVariable( SbxVARIANT );
-         pConst->SetName( rName );
-         unoToSbxValue( pConst, it->second );
-     }
-+
-     return pConst;
- }
- 
-diff --git basic/source/comp/dim.cxx basic/source/comp/dim.cxx
-index d23175e..b8b6a54 100644
---- basic/source/comp/dim.cxx
-+++ basic/source/comp/dim.cxx
-@@ -32,6 +32,8 @@
- #include "precompiled_basic.hxx"
- #include <basic/sbx.hxx>
- #include "sbcomp.hxx"
-+#include "sbunoobj.hxx"
-+
- 
- // Deklaration einer Variablen
- // Bei Fehlern wird bis zum Komma oder Newline geparst.
-@@ -147,7 +149,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
-                             }
-                         }
-                     }
--					else if( rEnumArray->Find( aCompleteName, SbxCLASS_OBJECT ) )
-+					else if( rEnumArray->Find( aCompleteName, SbxCLASS_OBJECT ) || ( IsVBASupportOn() && VBAConstantHelper::instance().isVBAConstantType( aCompleteName ) ) )
-                     {
-                         eType = SbxLONG;
-                         break;
-diff --git basic/source/inc/sbunoobj.hxx basic/source/inc/sbunoobj.hxx
-index dc2cfef..6fff986 100644
---- basic/source/inc/sbunoobj.hxx
-+++ basic/source/inc/sbunoobj.hxx
-@@ -44,6 +44,7 @@
- #include <com/sun/star/script/XInvocation.hpp>
- #include <com/sun/star/reflection/XIdlClass.hpp>
- #include <rtl/ustring.hxx>
-+#include <hash_map>
- 
- class SbUnoObject: public SbxObject
- {
-@@ -256,6 +257,26 @@ public:
-     virtual void Clear();
- };
- 
-+typedef std::hash_map< ::rtl::OUString, ::com::sun::star::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
-+
-+typedef std::vector< rtl::OUString > VBAConstantsVector;
-+
-+class VBAConstantHelper
-+{
-+private:
-+
-+    VBAConstantsVector aConstCache;
-+    VBAConstantsHash aConstHash;
-+    bool isInited;
-+    VBAConstantHelper():isInited( false ) {}
-+    VBAConstantHelper(const VBAConstantHelper&);
-+    void init();
-+public:    
-+    static VBAConstantHelper& instance(); 
-+    SbxVariable* getVBAConstant( const String& rName );
-+    bool isVBAConstantType( const String& rName );
-+};
-+
- #endif
- 
- 
-diff --git basic/source/runtime/step2.cxx basic/source/runtime/step2.cxx
-index 89b02c0..571e8cd 100644
---- basic/source/runtime/step2.cxx
-+++ basic/source/runtime/step2.cxx
-@@ -54,8 +54,6 @@ using namespace com::sun::star::script;
- 
- using com::sun::star::uno::Reference;
- 
--SbxVariable* getVBAConstant( const String& rName );
--
- // Suchen eines Elements
- // Die Bits im String-ID:
- // 0x8000 - Argv ist belegt
-@@ -144,7 +142,7 @@ SbxVariable* SbiRuntime::FindElement
-                     if ( pElem )
-                         bSetName = false; // don't overwrite uno name
-                     else
--                        pElem = getVBAConstant( aName );
-+                        pElem = VBAConstantHelper::instance().getVBAConstant( aName );
-                 }
-                 // #72382 VORSICHT! Liefert jetzt wegen unbekannten
-                 // Modulen IMMER ein Ergebnis!
diff --git a/applied_patches/0527-statusbar-fancy-modified-status-svx.diff b/applied_patches/0411-statusbar-fancy-modified-status-svx.diff
similarity index 100%
rename from applied_patches/0527-statusbar-fancy-modified-status-svx.diff
rename to applied_patches/0411-statusbar-fancy-modified-status-svx.diff
diff --git a/applied_patches/0411-vba-commandbar-toolbar-fix.diff b/applied_patches/0411-vba-commandbar-toolbar-fix.diff
deleted file mode 100644
index 712905f28..000000000
--- a/applied_patches/0411-vba-commandbar-toolbar-fix.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git vbahelper/source/vbahelper/vbacommandbarhelper.cxx vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-index cb87814..b82578d 100644
---- vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-+++ vbahelper/source/vbahelper/vbacommandbarhelper.cxx
-@@ -197,10 +197,22 @@ uno::Reference< frame::XLayoutManager > VbaCommandBarHelper::getLayoutManager()
-     return xLayoutManager;
- }
- 
-+sal_Bool VbaCommandBarHelper::hasToolbar( const rtl::OUString& sResourceUrl, const rtl::OUString& sName ) throw (css::uno::RuntimeException)
-+{
-+    if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
-+    {
-+        rtl::OUString sUIName;
-+        uno::Reference< beans::XPropertySet > xPropertySet( m_xDocCfgMgr->getSettings( sResourceUrl, sal_False ), uno::UNO_QUERY_THROW );
-+        xPropertySet->getPropertyValue( rtl::OUString::createFromAscii(ITEM_DESCRIPTOR_UINAME) ) >>= sUIName;
-+        if( sName.equalsIgnoreAsciiCase( sUIName ) )
-+            return sal_True;
-+    }
-+    return sal_False;
-+}
-+
- // return the resource url if found
- rtl::OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const rtl::OUString& sName ) throw (css::uno::RuntimeException)
- {
--    rtl::OUString sUIName;
-     rtl::OUString sResourceUrl;
- 
-     // check if it is an buildin toolbar
-@@ -214,17 +226,17 @@ rtl::OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference<
-         sResourceUrl = allNames[i];
-         if(sResourceUrl.indexOf( rtl::OUString::createFromAscii( ITEM_TOOLBAR_URL ) ) == 0 )
-         {
--            //OSL_TRACE("VbaCommandBarHelper::findToolbarByName, toolbar resource url: %s", rtl::OUStringToOString( sResourceUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
--            if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
--            {
--                uno::Reference< beans::XPropertySet > xPropertySet( m_xDocCfgMgr->getSettings( sResourceUrl, sal_False ), uno::UNO_QUERY_THROW );
--                xPropertySet->getPropertyValue( rtl::OUString::createFromAscii(ITEM_DESCRIPTOR_UINAME) ) >>= sUIName;
--              //  OSL_TRACE("VbaCommandBarHelper::findToolbarByName, toolbar ui name: %s", rtl::OUStringToOString( sUIName, RTL_TEXTENCODING_UTF8 ).getStr() );
--                if( sName.equalsIgnoreAsciiCase( sUIName ) )
--                    return sResourceUrl;
--            }
-+            if( hasToolbar( sResourceUrl, sName ) )
-+                return sResourceUrl;
-         }
-     }
-+    
-+    // the customize toolbars creating during importing, shoud found there.
-+    static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) );
-+    sResourceUrl = sToolbarPrefix.concat( sName );
-+    if( hasToolbar( sResourceUrl, sName ) )
-+        return sResourceUrl;
-+
-     return rtl::OUString();
- }
- 
-diff --git vbahelper/source/vbahelper/vbacommandbarhelper.hxx vbahelper/source/vbahelper/vbacommandbarhelper.hxx
-index 22ea158..e6b0358 100644
---- vbahelper/source/vbahelper/vbacommandbarhelper.hxx
-+++ vbahelper/source/vbahelper/vbacommandbarhelper.hxx
-@@ -76,6 +76,7 @@ private:
-     rtl::OUString maModuleId;
- 
-     void Init() throw (css::uno::RuntimeException);
-+    sal_Bool hasToolbar( const rtl::OUString& sResourceUrl, const rtl::OUString& sName )  throw (css::uno::RuntimeException);
- public:
-     VbaCommandBarHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException );
- 
diff --git a/applied_patches/0528-statusbar-fancy-modified-status-sw.diff b/applied_patches/0412-statusbar-fancy-modified-status-sw.diff
similarity index 100%
rename from applied_patches/0528-statusbar-fancy-modified-status-sw.diff
rename to applied_patches/0412-statusbar-fancy-modified-status-sw.diff
diff --git a/applied_patches/0412-vba-automation-set-fix.diff b/applied_patches/0412-vba-automation-set-fix.diff
deleted file mode 100644
index a2b74d9dd..000000000
--- a/applied_patches/0412-vba-automation-set-fix.diff
+++ /dev/null
@@ -1,85 +0,0 @@
---- basic/source/classes/sbunoobj.cxx	2009-06-23 05:13:01.671875000 +0100
-+++ basic/source/classes/sbunoobj.cxx	2009-07-16 22:12:04.187500000 +0100
-@@ -1616,6 +1616,23 @@ bool checkUnoObjectType( SbUnoObject* pU
- 				break;
- 			}
- 			::rtl::OUString sClassName = xClass->getName();
-+			if ( sClassName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.oleautomation.XAutomationObject" ) ) ) )
-+			{
-+				// there is a hack in the extensions/source/ole/oleobj.cxx  to return the typename of the automation object, lets check if it
-+				// matches
-+				Reference< XInvocation > xInv( aToInspectObj, UNO_QUERY );
-+				if ( xInv.is() )
-+				{
-+					rtl::OUString sTypeName;
-+					xInv->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$GetTypeName") ) ) >>= sTypeName;
-+					if ( sTypeName.getLength() == 0 || sTypeName.equals(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") ) ) )
-+						// can't check type, leave it pass
-+						result = true;	
-+					else
-+						result = sTypeName.equals( aClass );
-+				}
-+				break; // finished checking automation object
-+			}
- 			OSL_TRACE("Checking if object implements %s",
- 				OUStringToOString( defaultNameSpace + aClass,
- 					RTL_TEXTENCODING_UTF8 ).getStr() );
---- extensions/source/ole/oleobjw.cxx	2008-11-11 10:00:41.000000000 +0000
-+++ extensions/source/ole/oleobjw.cxx	2009-07-16 21:37:49.890625000 +0100
-@@ -425,6 +425,46 @@ Any SAL_CALL IUnknownWrapper_Impl::getVa
-     {
-         o2u_attachCurrentThread();
-         ITypeInfo * pInfo = getTypeInfo();
-+        // I was going to implement an XServiceInfo interface to allow the type
-+        // of the automation object to be exposed.. but it seems
-+        // from looking at comments in the code that it is possible for a 
-+        // this object to actually wrap an UNO object ( I guess if automation is
-+        // used from MSO to create Openoffice objects ) Therefore, those objects
-+        // will more than likely already have an XServiceInfo interface.
-+        // Instead here I chose a name that should be illegal both in COM and
-+        // UNO ( from an IDL point of view ) therefore I think this is a safe
-+        // hack
-+        if ( aPropertyName.equals( rtl::OUString::createFromAscii("$GetTypeName") )) 
-+        {
-+            if ( pInfo && m_sTypeName.getLength() == 0 )
-+            {
-+            	 m_sTypeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") );
-+                CComBSTR sName;
-+                
-+                if ( SUCCEEDED( pInfo->GetDocumentation( -1, &sName, NULL, NULL, NULL  ) ) )
-+                {
-+                    rtl::OUString sTmp( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName)));
-+                    if ( sTmp.indexOf('_')  == 0 )
-+                       sTmp = sTmp.copy(1);
-+                    // do we own the memory for pTypeLib, msdn doco is vague
-+                    // I'll assume we do 
-+                    CComPtr< ITypeLib > pTypeLib;
-+                    unsigned int index;
-+                    if ( SUCCEEDED(  pInfo->GetContainingTypeLib(  &pTypeLib.p, &index )) )
-+                    {
-+                        if ( SUCCEEDED( pTypeLib->GetDocumentation( -1, &sName, NULL, NULL, NULL  ) ) )
-+                        {
-+                            rtl::OUString sLibName( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName)));
-+                            m_sTypeName = sLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sTmp );
-+                            
-+                        }
-+                    }
-+                }
-+                
-+            }
-+            ret <<= m_sTypeName;
-+            return ret;
-+        }
-         FuncDesc aDescGet(pInfo);
-         FuncDesc aDescPut(pInfo);
-         VarDesc aVarDesc(pInfo);
---- extensions/source/ole/oleobjw.hxx	2008-04-11 11:14:30.000000000 +0100
-+++ extensions/source/ole/oleobjw.hxx	2009-07-16 19:46:02.750000000 +0100
-@@ -233,6 +235,7 @@ protected:
- 	Sequence<Type> m_seqTypes;
- 	CComPtr<IUnknown> m_spUnknown;
- 	CComPtr<IDispatch> m_spDispatch;
-+        rtl::OUString m_sTypeName; // is "" ( not initialised ), "IDispatch" ( we have no idea ) or "SomeLibrary.SomeTypeName" if we managed to get a type
-     /** This value is set dureing XInitialization::initialize. It indicates that the COM interface
-     was transported as VT_DISPATCH in a VARIANT rather then a VT_UNKNOWN
-     */
diff --git a/applied_patches/0413-tool-menu-bar-improvements.diff b/applied_patches/0413-tool-menu-bar-improvements.diff
deleted file mode 100644
index 6d3f97473..000000000
--- a/applied_patches/0413-tool-menu-bar-improvements.diff
+++ /dev/null
@@ -1,1014 +0,0 @@
-diff --git framework/source/uielement/toolbarmanager.cxx framework/source/uielement/toolbarmanager.cxx
-index a4de9c1..38d6324 100644
---- framework/source/uielement/toolbarmanager.cxx
-+++ framework/source/uielement/toolbarmanager.cxx
-@@ -122,6 +122,7 @@ namespace framework
- 
- static const char   ITEM_DESCRIPTOR_COMMANDURL[]    = "CommandURL";
- static const char   ITEM_DESCRIPTOR_HELPURL[]       = "HelpURL";
-+static const char   ITEM_DESCRIPTOR_TOOLTIP[]       = "Tooltip";
- static const char   ITEM_DESCRIPTOR_CONTAINER[]     = "ItemDescriptorContainer";
- static const char   ITEM_DESCRIPTOR_LABEL[]         = "Label";
- static const char   ITEM_DESCRIPTOR_TYPE[]          = "Type";
-@@ -131,6 +132,7 @@ static const char   ITEM_DESCRIPTOR_STYLE[]         = "Style";
- 
- static const sal_Int32 ITEM_DESCRIPTOR_COMMANDURL_LEN  = 10;
- static const sal_Int32 ITEM_DESCRIPTOR_HELPURL_LEN     = 7;
-+static const sal_Int32 ITEM_DESCRIPTOR_TOOLTIP_LEN     = 7;
- static const sal_Int32 ITEM_DESCRIPTOR_CONTAINER_LEN   = 23;
- static const sal_Int32 ITEM_DESCRIPTOR_LABEL_LEN       = 5;
- static const sal_Int32 ITEM_DESCRIPTOR_TYPE_LEN        = 4;
-@@ -1250,6 +1252,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
-         rtl::OUString               aCommandURL;
-         rtl::OUString               aLabel;
-         rtl::OUString               aHelpURL;
-+        rtl::OUString               aTooltip;
-         sal_uInt16                  nType( ::com::sun::star::ui::ItemType::DEFAULT );
-         sal_uInt16                  nWidth( 0 );
-         sal_Bool                    bIsVisible( sal_True );
-@@ -1265,6 +1268,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
-                         aProp[i].Value >>= aCommandURL;
-                     else if (  aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_HELPURL, ITEM_DESCRIPTOR_HELPURL_LEN ))
-                         aProp[i].Value >>= aHelpURL;
-+                    else if (  aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TOOLTIP, ITEM_DESCRIPTOR_TOOLTIP_LEN ))
-+                        aProp[i].Value >>= aTooltip;
-                     else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_LABEL, ITEM_DESCRIPTOR_LABEL_LEN ))
-                         aProp[i].Value >>= aLabel;
-                     else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TYPE, ITEM_DESCRIPTOR_TYPE_LEN ))
-@@ -1282,9 +1287,13 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
-                     ::rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL ));
- 
-                     sal_uInt16 nItemBits = ConvertStyleToToolboxItemBits( nStyle );
-+                    OSL_TRACE("** style for command url %s is 0x%x", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8  ).getStr(), nItemBits );
-                     m_pToolBar->InsertItem( nId, aString, nItemBits );
-                     m_pToolBar->SetItemCommand( nId, aCommandURL );
--                    m_pToolBar->SetQuickHelpText( nId, aString );
-+                    if ( aTooltip.getLength() )
-+                        m_pToolBar->SetQuickHelpText( nId, aTooltip );
-+                    else
-+                        m_pToolBar->SetQuickHelpText( nId, aString );
-                     if ( aLabel.getLength() > 0 )
-                         m_pToolBar->SetItemText( nId, aLabel );
-                     else
-diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
-index 07394d8..e5eb48a 100644
---- sc/source/filter/excel/excimp8.cxx
-+++ sc/source/filter/excel/excimp8.cxx
-@@ -109,7 +109,7 @@
- 
- #include <com/sun/star/container/XNameContainer.hpp>
- #include <sfx2/app.hxx>
-- 
-+#include "xltoolbar.hxx"
- using namespace com::sun::star;
- 
- 
-@@ -306,6 +306,21 @@ void ImportExcel8::ReadBasic( void )
-                     uno::Any aModel = uno::makeAny( pShell->GetModel() );
-                     pAppMgr->SetGlobalUNOConstant( "ThisExcelDoc", aModel );
-                 }
-+#if 0
-+                // see if we have the XCB stream
-+                SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "XCB" ) ), STREAM_STD_READ | STREAM_NOCREATE  );
-+                if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() )
-+                {
-+                    CTBWrapper wrapper;
-+                    if ( wrapper.Read( xXCB ) )
-+                    {
-+#if DEBUG
-+                        wrapper.Print( stderr ); 
-+#endif
-+                        wrapper.ImportCustomToolBar( *pShell );
-+                    }
-+                }
-+#endif
- 
-             }
-         }
-diff --git sc/source/filter/excel/makefile.mk sc/source/filter/excel/makefile.mk
-index 6ecc0ef..385b552 100644
---- sc/source/filter/excel/makefile.mk
-+++ sc/source/filter/excel/makefile.mk
-@@ -106,7 +106,8 @@ SLOFILES =	\
- 		$(SLO)$/xlstyle.obj					\
- 		$(SLO)$/xltools.obj					\
- 		$(SLO)$/xltracer.obj				\
--		$(SLO)$/xlview.obj
-+		$(SLO)$/xlview.obj \
-+		$(SLO)$/xltoolbar.obj \
- 
- .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCSPARC"
- NOOPTFILES = \
-@@ -153,7 +154,8 @@ EXCEPTIONSFILES = \
- 		$(SLO)$/xlformula.obj				\
- 		$(SLO)$/xlpivot.obj					\
- 		$(SLO)$/xlstyle.obj					\
--		$(SLO)$/xlview.obj
-+		$(SLO)$/xlview.obj \
-+		$(SLO)$/xltoolbar.obj \
- 
- # --- Targets -------------------------------------------------------
- 
-diff --git sc/source/filter/excel/xltoolbar.cxx sc/source/filter/excel/xltoolbar.cxx
-new file mode 100644
-index 0000000..6591539
---- /dev/null
-+++ sc/source/filter/excel/xltoolbar.cxx
-@@ -0,0 +1,365 @@
-+#include "xltoolbar.hxx"
-+#include <rtl/ustrbuf.hxx>
-+#include <stdarg.h>
-+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
-+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-+#include <com/sun/star/ui/XImageManager.hpp>
-+#include <com/sun/star/ui/ItemType.hpp>
-+#include <fstream>
-+#include <comphelper/processfactory.hxx>
-+#include <vcl/graph.hxx>
-+#include <map>
-+using namespace com::sun::star;
-+
-+typedef std::map< sal_Int16, rtl::OUString > IdToString;
-+
-+class MSOExcelCommandConvertor : public MSOCommandConvertor
-+{
-+   IdToString msoToOOcmd;
-+   IdToString tcidToOOcmd;
-+public:
-+    MSOExcelCommandConvertor();
-+    virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
-+    virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 key );
-+};
-+
-+MSOExcelCommandConvertor::MSOExcelCommandConvertor()
-+{
-+/*
-+    // mso command id to ooo command string
-+    // #FIXME and *HUNDREDS* of id's to added here
-+    msoToOOcmd[ 0x20b ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc") );
-+    msoToOOcmd[ 0x50 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Open") );
-+
-+   // mso tcid to ooo command string
-+    // #FIXME and *HUNDREDS* of id's to added here
-+   tcidToOOcmd[ 0x9d9 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Print") );
-+*/
-+}
-+
-+rtl::OUString MSOExcelCommandConvertor::MSOCommandToOOCommand( sal_Int16 key )
-+{
-+    rtl::OUString sResult;
-+    IdToString::iterator it = msoToOOcmd.find( key );
-+    if ( it != msoToOOcmd.end() )
-+        sResult = it->second;
-+    return sResult;
-+}
-+
-+rtl::OUString MSOExcelCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key )
-+{
-+    rtl::OUString sResult;
-+    IdToString::iterator it = tcidToOOcmd.find( key );
-+    if ( it != tcidToOOcmd.end() )
-+        sResult = it->second;
-+    return sResult;
-+}
-+
-+
-+
-+CTBS::CTBS() : bSignature(0), bVersion(0), reserved1(0), reserved2(0), reserved3(0), ctb(0), ctbViews(0), ictbView(0)
-+{
-+}
-+
-+CTB::CTB() : nViews( 0 ), ectbid(0)
-+{
-+}
-+
-+CTB::CTB(sal_uInt16 nNum ) : nViews( nNum ), ectbid(0)
-+{
-+}
-+
-+bool CTB::Read( SvStream *pS )
-+{
-+    OSL_TRACE("CTB::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();   
-+    tb.Read( pS );
-+    for ( sal_uInt16 index = 0; index < nViews; ++index )
-+    {
-+        TBVisualData aVisData;
-+        aVisData.Read( pS );
-+        rVisualData.push_back( aVisData );
-+    }
-+    *pS >> ectbid;
-+  
-+    for ( sal_Int16 index = 0; index < tb.getcCL(); ++index )
-+    {
-+        TBC aTBC;
-+        aTBC.Read( pS );
-+        rTBC.push_back( aTBC ); 
-+    }
-+    return true;
-+}
-+
-+void CTB::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] CTB -- dump\n", nOffSet );
-+    indent_printf( fp, "  nViews 0x%x\n", nViews);
-+    tb.Print( fp );
-+
-+    std::vector<TBVisualData>::iterator visData_end = rVisualData.end();
-+    sal_Int32 counter = 0;
-+    for ( std::vector<TBVisualData>::iterator it = rVisualData.begin(); it != visData_end; ++it )
-+    {
-+        
-+        indent_printf( fp, "  TBVisualData [%d]\n", counter++ );
-+        Indent b;
-+        it->Print( fp );
-+    } 
-+    indent_printf( fp, "  ectbid 0x%x\n", ectbid);
-+    std::vector<TBC>::iterator it_end = rTBC.end();
-+    counter = 0;
-+    for ( std::vector<TBC>::iterator it = rTBC.begin(); it != it_end; ++it )
-+    {
-+        indent_printf( fp, "  TBC [%d]\n", counter++);
-+        Indent c;
-+        it->Print( fp );
-+    }
-+}
-+
-+bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
-+{
-+    static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) );
-+    bool bRes = false;
-+    try
-+    {
-+        // #Fixme same issue here as in word, some deleted data
-+        // seems to still exist
-+        if ( !tb.IsEnabled() )
-+            return true;  // didn't fail, just ignoring
-+        // Create default setting
-+        uno::Reference< container::XIndexContainer > xIndexContainer( helper.getCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
-+        uno::Reference< container::XIndexAccess > xIndexAccess( xIndexContainer, uno::UNO_QUERY_THROW );
-+        uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); 
-+        WString& name = tb.getName();
-+        // set UI name for toolbar
-+        xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( name.getString() ) ); 
-+    
-+        rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() );
-+        for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
-+        {
-+            // createToolBar item for control
-+            if ( !it->ImportToolBarControl( xIndexContainer, helper ) )
-+                return false;
-+        }
-+
-+        OSL_TRACE("Name of toolbar :-/ %s", rtl::OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-+        helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess );
-+        helper.applyIcons();
-+
-+        uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
-+        xPersistence->store();
-+
-+        xPersistence.set( helper.getCfgManager(), uno::UNO_QUERY_THROW );
-+        xPersistence->store();
-+    
-+        bRes = true;
-+    }
-+    catch( uno::Exception& )
-+    {
-+       bRes = false; 
-+    }
-+    return bRes;
-+}
-+bool CTBS::Read( SvStream *pS )
-+{
-+    OSL_TRACE("CTBS::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();    
-+    *pS >> bSignature >> bVersion >> reserved1 >> reserved2 >> reserved3 >> ctb >> ctbViews >> ictbView;
-+    return true;
-+}
-+
-+void CTBS::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] CTBS -- dump\n", nOffSet );
-+
-+    indent_printf( fp, "  bSignature 0x%x\n", bSignature);
-+    indent_printf( fp, "  bVersion 0x%x\n", bVersion);
-+
-+    indent_printf( fp, "  reserved1 0x%x\n", reserved1 );
-+    indent_printf( fp, "  reserved2 0x%x\n", reserved2 );
-+    indent_printf( fp, "  reserved3 0x%x\n", reserved3 );
-+
-+    indent_printf( fp, "  ctb 0x%x\n", ctb );
-+    indent_printf( fp, "  ctbViews 0x%x\n", ctbViews );
-+    indent_printf( fp, "  ictbView 0x%x\n", ictbView );
-+}
-+
-+TBC::TBC()
-+{
-+}
-+
-+bool 
-+TBC::Read(SvStream *pS)
-+{
-+    OSL_TRACE("TBC::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();    
-+    if ( !tbch.Read( pS ) )
-+        return false;
-+    sal_uInt16 tcid = tbch.getTcID();
-+    sal_uInt8 tct = tbch.getTct();
-+    if (  ( tcid != 0x0001 && tcid != 0x06CC && tcid != 0x03D8 && tcid != 0x03EC && tcid != 0x1051 ) && ( ( tct > 0 && tct < 0x0B ) || ( ( tct > 0x0B && tct < 0x10 ) || tct == 0x15 ) ) )
-+    {
-+        tbcCmd.reset( new TBCCmd );
-+        if ( !  tbcCmd->Read( pS ) )
-+            return false;
-+    }
-+    if ( tct != 0x16 )
-+    {
-+        tbcd.reset( new TBCData( tbch ) );
-+        if ( !tbcd->Read( pS ) )
-+            return false;
-+    }
-+    return true;
-+}
-+
-+
-+void
-+TBC::Print(FILE* fp)
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] TBC -- dump\n", nOffSet );
-+    tbch.Print( fp );
-+    if ( tbcCmd.get() )
-+        tbcCmd->Print( fp );    
-+    if ( tbcd.get() )
-+        tbcd->Print( fp );    
-+}
-+
-+bool TBC::ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper )
-+{
-+    // how to identify built-in-command ?
-+//    bool bBuiltin = false;
-+    if ( tbcd.get() )
-+    {
-+        std::vector< css::beans::PropertyValue > props;
-+/*
-+        if ( bBuiltin )
-+        {
-+            rtl::OUString sCommand = helper.MSOCommandToOOCommand( cmdId );
-+            if ( sCommand.getLength() > 0 )
-+            {
-+                beans::PropertyValue aProp;
-+ 
-+                aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
-+                aProp.Value <<= sCommand;
-+                props.push_back( aProp ); 
-+            }
-+         
-+        }
-+*/
-+        bool bBeginGroup = false;
-+        if ( ! tbcd->ImportToolBarControl( toolbarcontainer, helper, props, bBeginGroup ) )
-+            return false;
-+
-+        if ( bBeginGroup )
-+        {
-+            // insert spacer
-+            uno::Sequence< beans::PropertyValue > sProps( 1 );
-+            sProps[ 0 ].Name =  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") );
-+            sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE ); 
-+            toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );        
-+        }
-+        uno::Sequence< beans::PropertyValue > sProps( props.size() );
-+        beans::PropertyValue* pProp = sProps.getArray();
-+   
-+        for ( std::vector< css::beans::PropertyValue >::iterator it = props.begin(); it != props.end(); ++it, ++pProp )
-+            *pProp = *it;
-+
-+        toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );        
-+    }
-+    return true;
-+}
-+
-+void
-+TBCCmd::Print(FILE* fp)
-+{
-+    Indent a;
-+    indent_printf( fp, " TBCCmd -- dump\n" );
-+    indent_printf( fp, "   cmdID 0x%x\n", cmdID );
-+    indent_printf( fp, "   A ( fHideDrawing ) %s\n", A ? "true" : "false" );
-+    indent_printf( fp, "   B ( reserved - ignored ) %s\n", A ? "true" : "false" );
-+    indent_printf( fp, "   cmdType 0x%x\n", cmdType );
-+    indent_printf( fp, "   C ( reserved - ignored ) %s\n", A ? "true" : "false" );
-+    indent_printf( fp, "   reserved3 0x%x\n", reserved3 );
-+}
-+
-+bool TBCCmd::Read( SvStream *pS )
-+{
-+    OSL_TRACE("TBCCmd::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();    
-+    *pS >> cmdID;
-+    sal_uInt16 temp;
-+    *pS >> temp;
-+    OSL_TRACE("TBCmd temp = 0x%x", temp );
-+    A = (temp & 0x8000 ) == 0x8000; 
-+    B = (temp & 0x4000) == 0x4000; 
-+    cmdType = ( temp & 0x3E00 ) >> 9;
-+    C = ( temp & 0x100 ) == 0x100; 
-+    reserved3 = ( temp & 0xFF ); 
-+    return true;
-+}
-+
-+CTBWrapper::CTBWrapper()
-+{
-+}
-+
-+CTBWrapper::~CTBWrapper()
-+{
-+}
-+
-+bool 
-+CTBWrapper::Read( SvStream *pS)
-+{
-+    OSL_TRACE("CTBWrapper::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();   
-+    if ( !ctbSet.Read( pS ) )
-+        return false;
-+    for ( sal_uInt16 index = 0; index < ctbSet.ctb; ++index )
-+    {
-+        CTB aCTB( ctbSet.ctbViews );
-+        if ( !aCTB.Read( pS ) )
-+            return false;
-+        rCTB.push_back( aCTB ); 
-+    }
-+    return true;
-+}
-+
-+void 
-+CTBWrapper::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] CTBWrapper -- dump\n", nOffSet );
-+    ctbSet.Print( fp );
-+    std::vector<CTB>::iterator it_end = rCTB.end();
-+    for ( std::vector<CTB>::iterator it = rCTB.begin(); it != it_end; ++it )
-+    {
-+        Indent b;
-+        it->Print( fp );
-+    } 
-+}
-+
-+bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh )
-+{
-+    std::vector<CTB>::iterator it_end = rCTB.end();
-+    for ( std::vector<CTB>::iterator it = rCTB.begin(); it != it_end; ++it )
-+    {
-+        // for each customtoolbar
-+        uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-+        uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xAppCfgSupp( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) ) ), uno::UNO_QUERY_THROW ); 
-+        CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument" ) ) ) );
-+        helper.setMSOCommandMap( new  MSOExcelCommandConvertor() );
-+        if ( !(*it).ImportCustomToolBar( helper ) )
-+            return false;
-+    } 
-+    return true;
-+}
-+
-+
-diff --git sc/source/filter/excel/xltoolbar.hxx sc/source/filter/excel/xltoolbar.hxx
-new file mode 100644
-index 0000000..af986c7
---- /dev/null
-+++ sc/source/filter/excel/xltoolbar.hxx
-@@ -0,0 +1,87 @@
-+#ifndef _XLTOOLBAR_HXX
-+#define _XLTOOLBAR_HXX
-+
-+#include <svx/mstoolbar.hxx>
-+
-+namespace css = ::com::sun::star;
-+
-+// hmm I don't normally use these packed structures
-+// but.. hey always good to do something different
-+class TBCCmd : public TBBase
-+{
-+public:
-+    TBCCmd() : cmdID(0), A(0), B(0), cmdType(0), C(0), reserved3(0) {}
-+    sal_uInt16 cmdID;
-+    sal_uInt16 A:1;
-+    sal_uInt16 B:1;
-+    sal_uInt16 cmdType:5;
-+    sal_uInt16 C:1;
-+    sal_uInt16 reserved3:8;
-+    bool Read( SvStream* pS );
-+    void Print(FILE* fp);
-+};
-+
-+class TBC : public TBBase
-+{
-+    TBCHeader tbch;
-+    boost::shared_ptr<TBCCmd> tbcCmd; // optional
-+    boost::shared_ptr<TBCData> tbcd;
-+public:
-+    TBC();
-+    ~TBC(){}
-+    void Print( FILE* );
-+    bool Read(SvStream *pS);
-+    bool ImportToolBarControl( const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper );
-+};
-+ 
-+class CTB : public TBBase
-+{
-+    sal_uInt16 nViews;
-+    TB tb;
-+    std::vector<TBVisualData> rVisualData;
-+    sal_uInt32 ectbid;
-+    std::vector< TBC > rTBC;
-+public:
-+    CTB();
-+    CTB(sal_uInt16);
-+    ~CTB(){}
-+    void Print( FILE* );
-+    bool Read(SvStream *pS);
-+    bool ImportCustomToolBar( CustomToolBarImportHelper& );
-+};
-+
-+class CTBS : public TBBase
-+{
-+public:
-+    sal_uInt8 bSignature;
-+    sal_uInt8 bVersion;
-+    sal_uInt16 reserved1;
-+    sal_uInt16 reserved2;
-+    sal_uInt16 reserved3;
-+    sal_uInt16 ctb;
-+    sal_uInt16 ctbViews;
-+    sal_uInt16 ictbView;
-+    CTBS(const CTBS&);
-+    CTBS& operator = ( const CTBS&);
-+    CTBS();
-+    ~CTBS(){}
-+    void Print( FILE* );
-+    bool Read(SvStream *pS);
-+};
-+
-+class CTBWrapper : public TBBase
-+{
-+    CTBS ctbSet;
-+
-+    std::vector< CTB > rCTB; 
-+
-+public:
-+    CTBWrapper();
-+    ~CTBWrapper();
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+    bool ImportCustomToolBar( SfxObjectShell& rDocSh );
-+};
-+
-+
-+#endif //_XLTOOLBAR_HXX
-diff --git svx/inc/svx/mstoolbar.hxx svx/inc/svx/mstoolbar.hxx
-index 5d76eaf..c102ade 100644
---- svx/inc/svx/mstoolbar.hxx
-+++ svx/inc/svx/mstoolbar.hxx
-@@ -250,6 +250,7 @@ public:
-     sal_uInt8 getTct() const { return tct; }
-     sal_uInt16 getTcID() const { return tcid; }
-     bool isVisible() { return !( bFlagsTCR & 0x1 ); }
-+    bool isBeginGroup() { return ( bFlagsTCR & 0x2 ); }
-     bool Read(SvStream *pS);
-     void Print( FILE* );
-     sal_uInt32 getTbct() { return tbct; };
-@@ -267,8 +268,57 @@ public:
-     ~TBCData(){}
-     bool Read(SvStream *pS);
-     void Print( FILE* );
--    bool ImportToolBarControl(  const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& );
-+    bool ImportToolBarControl(  const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >&, bool& bBeginGroup );
-     TBCGeneralInfo& getGeneralInfo() { return controlGeneralInfo; }
- };
- 
-+class SVX_DLLPUBLIC TB : public TBBase
-+{
-+    sal_uInt8 bSignature;// Signed integer that specifies the toolbar signature number. MUST be 0x02.
-+    sal_uInt8 bVersion; // Signed integer that specifies the toolbar version number. MUST be 0x01.
-+    sal_Int16 cCL; // Signed integer that SHOULD  specify the number of toolbar controls contained in this toolbar.
-+    sal_Int32 ltbid;// Signed integer that specifies the toolbar ID. MUST be 0x0001 (custom toolbar ID).
-+    sal_uInt32 ltbtr;// Unsigned integer of type TBTRFlags that specifies the toolbar type and toolbar restrictions.
-+    sal_uInt16 cRowsDefault;// Unsigned integer that specifies the number of preferred rows for the toolbar when the toolbar is not docked. MUST be less than or equal to 255.
-+    sal_uInt16 bFlags; //Unsigned integer of type TBFlags.
-+    WString name; //Structure of type WString that specifies the toolbar name
-+public:
-+    TB();
-+    ~TB(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+    sal_Int16 getcCL(){ return cCL; }
-+    WString& getName(){ return name; }
-+    bool IsEnabled();
-+    bool NeedsPositioning();
-+};
-+
-+class SVX_DLLPUBLIC SRECT : public TBBase
-+{
-+public:
-+    SRECT() : left(0), top(0), right(0), bottom(0) {}
-+    sal_Int16 left;
-+    sal_Int16 top;
-+    sal_Int16 right;
-+    sal_Int16 bottom;
-+    bool Read( SvStream* pS ) { *pS >> left >> top >> right >> bottom; return true; }
-+    void Print( FILE* fo );
-+};
-+
-+class SVX_DLLPUBLIC TBVisualData : public TBBase
-+{
-+    sal_Int8 tbds;
-+    sal_Int8 tbv;
-+    sal_Int8 tbdsDock;
-+    sal_Int8 iRow;
-+
-+    SRECT rcDock;
-+    SRECT rcFloat;
-+
-+public:
-+    TBVisualData();
-+    ~TBVisualData(){}
-+    bool Read(SvStream *pS);
-+    void Print( FILE* );
-+};
- #endif
-diff --git svx/source/msfilter/mstoolbar.cxx svx/source/msfilter/mstoolbar.cxx
-index fa66fe5..1d5c801 100644
---- svx/source/msfilter/mstoolbar.cxx
-+++ svx/source/msfilter/mstoolbar.cxx
-@@ -25,7 +25,7 @@ void CustomToolBarImportHelper::applyIcons()
-         commands[ 0 ] = it->sCommand;
-         uno::Sequence< uno::Reference< graphic::XGraphic > > images(1);
-         images[ 0 ] = it->image;
--
-+        OSL_TRACE("About to applyIcons for command %s, have image ? %s", rtl::OUStringToOString( commands[ 0 ], RTL_TEXTENCODING_UTF8 ).getStr(), images[ 0 ].is() ? "yes" : "no" );
-         uno::Reference< ui::XImageManager > xImageManager( getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
-         // 1 seems to work best for MSO images, otherwise they don't get displayed ( I guess the default size
-         // in ooo is different )
-@@ -144,7 +144,7 @@ void TBCHeader::Print( FILE* fp )
- {
-     Indent a;
-     indent_printf(fp,"[ 0x%x ] TBCHeader -- dump\n", nOffSet );
--    indent_printf(fp,"  bSignature 0x%xn", bSignature );
-+    indent_printf(fp,"  bSignature 0x%x\n", bSignature );
-     indent_printf(fp,"  bVersion 0x%x\n", bVersion );
-     indent_printf(fp,"  bFlagsTCR 0x%x\n", bFlagsTCR );
-     indent_printf(fp,"  tct 0x%x\n", tct );
-@@ -192,14 +192,13 @@ bool TBCData::Read(SvStream *pS)
-     }
-     if ( controlSpecificInfo.get() )
-         return controlSpecificInfo->Read( pS );
-+    //#FIXME I need to be able to handle different controlSpecificInfo types.
-     return true;
--
--    OSL_TRACE("#FIXME I need to be able to handle different controlSpecificInfo types.");
--    return false;
- }
- 
--bool TBCData::ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >& /*toolbarcontainer*/, CustomToolBarImportHelper& helper, std::vector< css::beans::PropertyValue >& props )
-+bool TBCData::ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >& /*toolbarcontainer*/, CustomToolBarImportHelper& helper, std::vector< css::beans::PropertyValue >& props, bool& bBeginGroup )
- {
-+    bBeginGroup = rHeader.isBeginGroup();
-     controlGeneralInfo.ImportToolBarControlData( helper, props );
-     beans::PropertyValue aProp;
-     aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ;
-@@ -222,16 +221,19 @@ bool TBCData::ImportToolBarControl( const css::uno::Reference< css::container::X
-             }
-             if ( TBCBitMap* pIcon = pSpecificInfo->getIcon() )
-             {
--           
--                BitmapEx aBitEx( pIcon->getBitMap() );
--                if ( pSpecificInfo->getIconMask() )
--                     // according to the spec:
--                     // "the iconMask is white in all the areas in which the icon is
--                     // displayed as transparent and is black in all other areas."
--                     aBitEx = BitmapEx( aBitEx.GetBitmap(), pSpecificInfo->getIconMask()->getBitMap().CreateMask( Color( COL_WHITE ) ) );
--
--                Graphic aGraphic( aBitEx );
--                helper.addIcon( aGraphic.GetXGraphic(), sCommand );
-+                // Without a command openoffice won't display the icon
-+                if ( sCommand.getLength() )
-+                {    
-+                    BitmapEx aBitEx( pIcon->getBitMap() );
-+                    if ( pSpecificInfo->getIconMask() )
-+                         // according to the spec:
-+                         // "the iconMask is white in all the areas in which the icon is
-+                         // displayed as transparent and is black in all other areas."
-+                         aBitEx = BitmapEx( aBitEx.GetBitmap(), pSpecificInfo->getIconMask()->getBitMap().CreateMask( Color( COL_WHITE ) ) );
-+    
-+                    Graphic aGraphic( aBitEx );
-+                    helper.addIcon( aGraphic.GetXGraphic(), sCommand );
-+                }
-             }
-             else if ( pSpecificInfo->getBtnFace() )
-             {
-@@ -373,6 +375,8 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
-             ooo::vba::VBAMacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true );
-             if ( aMacroInf.IsResolved() )
-                 aProp.Value = helper.createCommandFromMacro( aMacroInf.ResolvedMacro() );
-+            else
-+                aProp.Value <<= rtl::OUString::createFromAscii("UnResolvedMacro[").concat( extraInfo.getOnAction() ).concat( rtl::OUString::createFromAscii("]") );
-             sControlData.push_back( aProp );
-         }
- 
-@@ -384,7 +388,7 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
-         aProp.Value = uno::makeAny( ui::ItemType::DEFAULT ); 
-         sControlData.push_back( aProp );
- 
--        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HelpURL") );
-+        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Tooltip") );
-         aProp.Value = uno::makeAny( tooltip.getString() ); 
-         sControlData.push_back( aProp );
- 
-@@ -429,7 +433,7 @@ TBCMenuSpecific::Print( FILE* fp )
-     indent_printf( fp, "[ 0x%x ] TBCMenuSpecific -- dump\n", nOffSet );
-     indent_printf( fp, "  tbid 0x%x\n", static_cast< unsigned int >( tbid ) );
-     if ( tbid == 1 )
--        indent_printf( fp, "  name %s", rtl::OUStringToOString( name->getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+        indent_printf( fp, "  name %s\n", rtl::OUStringToOString( name->getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
- 
- }
- 
-@@ -611,3 +615,83 @@ void TBCBitMap::Print( FILE* fp )
-     indent_printf(fp, "[ 0x%x ] TBCBitMap -- dump\n", nOffSet );
-     indent_printf(fp, "  TBCBitMap size of bitmap data 0x%x\n", static_cast< unsigned int > ( cbDIB ) );
- }
-+
-+TB::TB() : bSignature(0x2),
-+bVersion(0x1),
-+cCL(0),
-+ltbid( 0x1 ),
-+ltbtr(0),
-+cRowsDefault( 0 ),
-+bFlags( 0 )
-+{
-+}
-+
-+bool TB::Read(SvStream *pS)
-+{
-+    OSL_TRACE("TB::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> bSignature >> bVersion >> cCL >> ltbid >> ltbtr >> cRowsDefault >> bFlags;
-+    name.Read( pS );
-+    return true;
-+ 
-+}
-+
-+bool TB::IsEnabled()
-+{
-+    return ( bFlags & 0x01 ) != 0x01;
-+}
-+
-+bool TB::NeedsPositioning()
-+{
-+    return ( bFlags & 0x10 ) == 0x10;
-+}
-+
-+void TB::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf(fp,"[ 0x%x ] TB -- dump\n", nOffSet );
-+    indent_printf(fp,"  bSignature 0x%x\n", bSignature );
-+    indent_printf(fp,"  bVersion 0x%x\n", bVersion );
-+    indent_printf(fp,"  cCL 0x%x\n", cCL );
-+    indent_printf(fp,"  ltbid 0x%x\n", ltbid );
-+    indent_printf(fp,"  ltbtr 0x%x\n", ltbtr );
-+    indent_printf(fp,"  cRowsDefault 0x%x\n", cRowsDefault );
-+    indent_printf(fp,"  bFlags 0x%x\n", bFlags );
-+    indent_printf(fp, "  name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+}
-+
-+TBVisualData::TBVisualData() : tbds(0), tbv(0), tbdsDock(0), iRow(0)
-+{
-+}
-+
-+bool TBVisualData::Read( SvStream* pS )
-+{
-+    OSL_TRACE("TBVisualData::Read() stream pos 0x%x", pS->Tell() );
-+    nOffSet = pS->Tell();
-+    *pS >> tbds >> tbv >> tbdsDock >> iRow;
-+    rcDock.Read( pS );
-+    rcFloat.Read( pS );
-+    return true;
-+}
-+
-+void SRECT::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "  left 0x%x\n", left);
-+    indent_printf( fp, "  top 0x%x\n", top);
-+    indent_printf( fp, "  right 0x%x\n", right);
-+    indent_printf( fp, "  bottom 0x%x\n", bottom);
-+}
-+
-+void TBVisualData::Print( FILE* fp )
-+{
-+    Indent a;
-+    indent_printf( fp, "[ 0x%x ] TBVisualData -- dump\n", nOffSet );
-+    indent_printf( fp, "  tbds 0x%x\n", tbds);
-+    indent_printf( fp, "  tbv  0x%x\n", tbv);
-+    indent_printf( fp, "  tbdsDoc  0x%x\n", tbdsDock);
-+    indent_printf( fp, "  iRow  0x%x\n", iRow);
-+    rcDock.Print( fp );
-+    rcFloat.Print( fp );
-+}
-+
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index 21a8014..a8a1348 100644
---- sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -3890,7 +3890,7 @@ bool WW8Customizations::Import( SwDocShell* pShell )
-     if (!aTCG.Read( mpTableStream ) )
-         OSL_TRACE("** Read of Customization data failed!!!! ");
-     mpTableStream->Seek( nCur ); // return to previous position, is that necessary?
--#if 1
-+#if DEBUG
-     aTCG.Print( stderr );
- #endif
-     return aTCG.ImportCustomToolBar( *pShell );
-diff --git sw/source/filter/ww8/ww8toolbar.cxx sw/source/filter/ww8/ww8toolbar.cxx
-index bb3fc2e..22581ea 100644
---- sw/source/filter/ww8/ww8toolbar.cxx
-+++ sw/source/filter/ww8/ww8toolbar.cxx
-@@ -482,36 +482,49 @@ CTB::Print( FILE* fp )
- bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
- {
-     static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) );
--    if ( !tb.IsEnabled() )
--        return true;  // didn't fail, just ignoring
--    // Create default setting
--    uno::Reference< container::XIndexContainer > xIndexContainer( helper.getCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
--    uno::Reference< container::XIndexAccess > xIndexAccess( xIndexContainer, uno::UNO_QUERY_THROW );
--    uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); 
--
--    // set UI name for toolbar
--    xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( name.getString() ) ); 
--
--    rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() );
--    for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
-+    bool bRes = false;
-+    try
-     {
--        // createToolBar item for control
--        if ( !it->ImportToolBarControl( xIndexContainer, helper ) )
--            return false;
--    }
--
--    OSL_TRACE("Name of toolbar :-/ %s", rtl::OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() );
--
--    helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess );
--    helper.applyIcons();
--
--    uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
--    xPersistence->store();
--
--    xPersistence.set( helper.getCfgManager(), uno::UNO_QUERY_THROW );
--    xPersistence->store();
-+        // #FIXME this is a bogus check ( but is seems to work )
-+        // the fNeedsPositioning seems always to be set for toolbars that
-+        // have been deleted ( sofar I fail to find something else to indicate
-+        // not to read them ) - e.g. We can have CTB records which relate to
-+        // deleted items ( usually associated with popups )
-+        if ( !tb.IsEnabled() || tb.NeedsPositioning() )
-+            return true;  // didn't fail, just ignoring
-+        // Create default setting
-+        uno::Reference< container::XIndexContainer > xIndexContainer( helper.getCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
-+        uno::Reference< container::XIndexAccess > xIndexAccess( xIndexContainer, uno::UNO_QUERY_THROW );
-+        uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); 
-+        
-+        // set UI name for toolbar
-+        xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( name.getString() ) ); 
-     
--    return true;
-+        rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() );
-+        for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
-+        {
-+            // createToolBar item for control
-+            if ( !it->ImportToolBarControl( xIndexContainer, helper ) )
-+                return false;
-+        }
-+    
-+        OSL_TRACE("Name of toolbar :-/ %s", rtl::OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+    
-+        helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess );
-+        helper.applyIcons();
-+    
-+        uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
-+        xPersistence->store();
-+    
-+        xPersistence.set( helper.getCfgManager(), uno::UNO_QUERY_THROW );
-+        xPersistence->store();
-+        bRes = true;
-+    }
-+    catch( uno::Exception& )
-+    {
-+        bRes = false;
-+    }
-+    return bRes;
- }
- 
- bool CTB::ImportMenu( const css::uno::Reference< css::container::XIndexContainer >& xIndexContainer, CustomToolBarImportHelper& rHelper )
-@@ -525,38 +538,6 @@ bool CTB::ImportMenu( const css::uno::Reference< css::container::XIndexContainer
-     return true;
- }
- 
--TB::TB() : bSignature( 0 )
--,bVersion( 0 )
--,cCL( 0 )
--,ltbid( 0 )
--,ltbtr( 0 )
--,cRowsDefault( 0 )
--,bFlags( 0 )
--{
--}
--
--bool TB::Read( SvStream* pS )
--{
--    OSL_TRACE("TB::Read() stream pos 0x%x", pS->Tell() );
--    nOffSet = pS->Tell();
--    *pS >> bSignature >> bVersion >> cCL >> ltbid >> ltbtr >> cRowsDefault >> bFlags;
--    return name.Read( pS );
--}
--
--bool TB::IsEnabled()
--{
--    return ( bFlags & 0x10 ) != 0x10;
--}
--
--void TB::Print( FILE* fp )
--{
--    Indent a;
--    indent_printf( fp, "[ 0x%x ] TB -- dump\n", nOffSet );
--    indent_printf( fp, "  bSignature (0x%x), bVersion(0x%x), cCL(0x%x), ltbid(0x%x), cRowsDefault (0x%x), ltbtr(0x%x), bFlags(0x%x)\n", bSignature, bVersion, cCL, static_cast< unsigned int >( ltbid ), static_cast< unsigned int >( ltbtr ), cRowsDefault, bFlags );
--    indent_printf( fp, "  name %s state - %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr(), IsEnabled() ? "true" : "false" );
--
--}
--
- TBC::TBC()
- {
- }
-@@ -655,10 +636,19 @@ TBC::ImportToolBarControl( const css::uno::Reference< css::container::XIndexCont
-             }
-          
-         }
--        if ( ! tbcd->ImportToolBarControl( toolbarcontainer, helper, props ) )
-+        bool bBeginGroup = false;
-+        if ( ! tbcd->ImportToolBarControl( toolbarcontainer, helper, props, bBeginGroup ) )
-             return false;
- 
--
-+        if ( bBeginGroup )
-+        {
-+            // insert spacer
-+            uno::Sequence< beans::PropertyValue > sProps( 1 );
-+            sProps[ 0 ].Name =  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") );
-+            sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE ); 
-+            toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );       
-+        }
-+ 
-         uno::Sequence< beans::PropertyValue > sProps( props.size() );
-         beans::PropertyValue* pProp = sProps.getArray();
-    
-diff --git sw/source/filter/ww8/ww8toolbar.hxx sw/source/filter/ww8/ww8toolbar.hxx
-index ae23835..b533cbf 100644
---- sw/source/filter/ww8/ww8toolbar.hxx
-+++ sw/source/filter/ww8/ww8toolbar.hxx
-@@ -29,26 +29,6 @@ public:
-     rtl::OUString GetCustomText();
- };
- 
--class TB : public TBBase
--{
--    sal_Int8 bSignature; //Signed integer that specifies the toolbar signature number. MUST be 0x02.
--    sal_Int8 bVersion; //Signed integer that specifies the toolbar version number. MUST be 0x01.
--    sal_Int16 cCL; //Signed integer that SHOULD  specify the number of toolbar controls contained in this toolbar.
--    sal_Int32 ltbid; //Signed integer that specifies the toolbar ID. MUST be 0x0001 (custom toolbar ID).
--    sal_uInt32 ltbtr; //Unsigned integer of type TBTRFlags that specifies the toolbar type and toolbar restrictions.
--    sal_uInt16 cRowsDefault; //Unsigned integer that specifies the number of preferred rows for the toolbar when the toolbar is not docked. MUST be less than or equal to 255.
--    sal_uInt16 bFlags; //Unsigned integer of type TBFlags.
--    WString name; //Structure of type WString that specifies the toolbar name.
--    TB(const TB&);
--    TB& operator = ( const TB&);
--public:
--    TB();
--    ~TB(){}
--    bool Read(SvStream *pS);
--    void Print( FILE* );
--    bool IsEnabled();
--};
--
- class CTB : public TBBase
- {
-     Xst name;
diff --git a/applied_patches/0529-unittesting-basebmp.diff b/applied_patches/0413-unittesting-basebmp.diff
similarity index 100%
rename from applied_patches/0529-unittesting-basebmp.diff
rename to applied_patches/0413-unittesting-basebmp.diff
diff --git a/applied_patches/0530-unittesting-basegfx.diff b/applied_patches/0414-unittesting-basegfx.diff
similarity index 100%
rename from applied_patches/0530-unittesting-basegfx.diff
rename to applied_patches/0414-unittesting-basegfx.diff
diff --git a/applied_patches/0414-vba-styles-add-fix.diff b/applied_patches/0414-vba-styles-add-fix.diff
deleted file mode 100644
index 301b74aff..000000000
--- a/applied_patches/0414-vba-styles-add-fix.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index a3907a7..61d2f35 100644
---- sc/source/ui/vba/vbarange.cxx
-+++ sc/source/ui/vba/vbarange.cxx
-@@ -5054,6 +5054,7 @@ ScVbaRange::getStyle() throw (uno::RuntimeException)
- 	}
- 	uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW );
- 	rtl::OUString sStyleName;
-+    xProps->getPropertyValue(CELLSTYLE) >>= sStyleName;
- 	ScDocShell* pShell = getScDocShell();
- 	uno::Reference< frame::XModel > xModel( pShell->GetModel() ); 
- 	uno::Reference< excel::XStyle > xStyle = new ScVbaStyle( this, mxContext,  sStyleName, xModel );
-diff --git sc/source/ui/vba/vbastyle.cxx sc/source/ui/vba/vbastyle.cxx
-index 5081858..7c6e677 100644
---- sc/source/ui/vba/vbastyle.cxx
-+++ sc/source/ui/vba/vbastyle.cxx
-@@ -71,7 +71,7 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException )
- 
- }
- 
--ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) :  ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false )
-+ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) :  ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel )
- {
- 	try
- 	{
-@@ -83,7 +83,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, c
- 	}
- }
- 
--ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false )
-+ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false ),  mxModel( _xModel )
- {
- 	try
- 	{
diff --git a/applied_patches/0531-unittesting-basic.diff b/applied_patches/0415-unittesting-basic.diff
similarity index 100%
rename from applied_patches/0531-unittesting-basic.diff
rename to applied_patches/0415-unittesting-basic.diff
diff --git a/applied_patches/0415-vba-financial-functions.diff b/applied_patches/0415-vba-financial-functions.diff
deleted file mode 100644
index 842c8e2cc..000000000
--- a/applied_patches/0415-vba-financial-functions.diff
+++ /dev/null
@@ -1,813 +0,0 @@
-diff --git basic/source/runtime/methods1.cxx basic/source/runtime/methods1.cxx
-index 6917e1b..1f87c04 100644
---- basic/source/runtime/methods1.cxx
-+++ basic/source/runtime/methods1.cxx
-@@ -82,11 +82,15 @@
- #include <com/sun/star/uno/Sequence.hxx>
- #include <com/sun/star/lang/XMultiServiceFactory.hpp>
- #include <com/sun/star/i18n/XCalendar.hpp>
-+#include <com/sun/star/sheet/XFunctionAccess.hpp>
- 
- using namespace comphelper;
-+using namespace com::sun::star::sheet;
- using namespace com::sun::star::uno;
- using namespace com::sun::star::i18n;
- 
-+void unoToSbxValue( SbxVariable* pVar, const Any& aValue );
-+Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, com::sun::star::beans::Property* pUnoProperty = NULL );
- 
- static Reference< XCalendar > getLocaleCalendar( void )
- {
-@@ -2508,6 +2512,546 @@ RTLFUNC(Round)
-     rPar.Get(0)->PutDouble( dRes );
- }
- 
-+void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const rtl::OUString& sFuncName, SbxVariable* pRet )
-+{
-+    static Reference< XFunctionAccess > xFunc;
-+    Any aRes;
-+    try
-+    {
-+        if ( !xFunc.is() )
-+        {
-+            Reference< XMultiServiceFactory > xFactory( getProcessServiceFactory() );
-+            if( xFactory.is() )
-+            {
-+                xFunc.set( xFactory->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.sheet.FunctionAccess")), UNO_QUERY_THROW); 
-+            }
-+        }
-+        Any aRet = xFunc->callFunction( sFuncName, aArgs );
-+     
-+        unoToSbxValue( pRet, aRet );
-+
-+    }
-+    catch( Exception& )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+    }
-+}
-+
-+RTLFUNC(SYD)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 4 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+
-+    // retrieve non-optional params
-+
-+    Sequence< Any > aParams( 4 );
-+    aParams[ 0 ] <<= makeAny( rPar.Get(1)->GetDouble() );
-+    aParams[ 1 ] <<= makeAny( rPar.Get(2)->GetDouble() );
-+    aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
-+    aParams[ 3 ] <<= makeAny( rPar.Get(4)->GetDouble() );
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYD") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(SLN)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 3 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+
-+    // retrieve non-optional params
-+
-+    Sequence< Any > aParams( 3 );
-+    aParams[ 0 ] <<= makeAny( rPar.Get(1)->GetDouble() );
-+    aParams[ 1 ] <<= makeAny( rPar.Get(2)->GetDouble() );
-+    aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SLN") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(Pmt)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 3 || nArgCount > 5 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+    // retrieve non-optional params
-+
-+    double rate = rPar.Get(1)->GetDouble();
-+    double nper = rPar.Get(2)->GetDouble();
-+    double pmt = rPar.Get(3)->GetDouble();
-+
-+    // set default values for Optional args
-+    double fv = 0;    
-+    double type = 0;    
-+    
-+    // fv
-+    if ( nArgCount >= 4 )
-+    {
-+        if( rPar.Get(4)->GetType() != SbxEMPTY )
-+            fv = rPar.Get(4)->GetDouble();
-+    }
-+    // type
-+    if ( nArgCount >= 5 )
-+    {
-+        if( rPar.Get(5)->GetType() != SbxEMPTY )
-+            type = rPar.Get(5)->GetDouble();
-+    }
-+
-+    Sequence< Any > aParams( 5 );
-+    aParams[ 0 ] <<= rate;
-+    aParams[ 1 ] <<= nper;
-+    aParams[ 2 ] <<= pmt;
-+    aParams[ 3 ] <<= fv;
-+    aParams[ 4 ] <<= type;
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Pmt") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(PPmt)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 4 || nArgCount > 6 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+    // retrieve non-optional params
-+
-+    double rate = rPar.Get(1)->GetDouble();
-+    double per = rPar.Get(2)->GetDouble();
-+    double nper = rPar.Get(3)->GetDouble();
-+    double pv = rPar.Get(4)->GetDouble();
-+
-+    // set default values for Optional args
-+    double fv = 0;    
-+    double type = 0;    
-+    
-+    // fv
-+    if ( nArgCount >= 5 )
-+    {
-+        if( rPar.Get(5)->GetType() != SbxEMPTY )
-+            fv = rPar.Get(5)->GetDouble();
-+    }
-+    // type
-+    if ( nArgCount >= 6 )
-+    {
-+        if( rPar.Get(6)->GetType() != SbxEMPTY )
-+            type = rPar.Get(6)->GetDouble();
-+    }
-+
-+    Sequence< Any > aParams( 6 );
-+    aParams[ 0 ] <<= rate;
-+    aParams[ 1 ] <<= per;
-+    aParams[ 2 ] <<= nper;
-+    aParams[ 3 ] <<= pv;
-+    aParams[ 4 ] <<= fv;
-+    aParams[ 5 ] <<= type;
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PPmt") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(PV)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 3 || nArgCount > 5 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+    // retrieve non-optional params
-+
-+    double rate = rPar.Get(1)->GetDouble();
-+    double nper = rPar.Get(2)->GetDouble();
-+    double pmt = rPar.Get(3)->GetDouble();
-+
-+    // set default values for Optional args
-+    double fv = 0;    
-+    double type = 0;    
-+    
-+    // fv
-+    if ( nArgCount >= 4 )
-+    {
-+        if( rPar.Get(4)->GetType() != SbxEMPTY )
-+            fv = rPar.Get(4)->GetDouble();
-+    }
-+    // type
-+    if ( nArgCount >= 5 )
-+    {
-+        if( rPar.Get(5)->GetType() != SbxEMPTY )
-+            type = rPar.Get(5)->GetDouble();
-+    }
-+
-+    Sequence< Any > aParams( 5 );
-+    aParams[ 0 ] <<= rate;
-+    aParams[ 1 ] <<= nper;
-+    aParams[ 2 ] <<= pmt;
-+    aParams[ 3 ] <<= fv;
-+    aParams[ 4 ] <<= type;
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PV") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(NPV)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 1 || nArgCount > 2 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+
-+    Sequence< Any > aParams( 2 );
-+    aParams[ 0 ] <<= makeAny( rPar.Get(1)->GetDouble() );
-+    Any aValues = sbxToUnoValue( rPar.Get(2),
-+                getCppuType( (Sequence<double>*)0 ) );
-+
-+    // convert for calc functions
-+    Sequence< Sequence< double > > sValues(1);
-+    aValues >>= sValues[ 0 ];
-+    aValues <<= sValues;
-+
-+    aParams[ 1 ] <<= aValues;
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NPV") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(NPer)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 3 || nArgCount > 5 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+    // retrieve non-optional params
-+
-+    double rate = rPar.Get(1)->GetDouble();
-+    double pmt = rPar.Get(2)->GetDouble();
-+    double pv = rPar.Get(3)->GetDouble();
-+
-+    // set default values for Optional args
-+    double fv = 0;    
-+    double type = 0;    
-+    
-+    // fv
-+    if ( nArgCount >= 4 )
-+    {
-+        if( rPar.Get(4)->GetType() != SbxEMPTY )
-+            fv = rPar.Get(4)->GetDouble();
-+    }
-+    // type
-+    if ( nArgCount >= 5 )
-+    {
-+        if( rPar.Get(5)->GetType() != SbxEMPTY )
-+            type = rPar.Get(5)->GetDouble();
-+    }
-+
-+    Sequence< Any > aParams( 5 );
-+    aParams[ 0 ] <<= rate;
-+    aParams[ 1 ] <<= pmt;
-+    aParams[ 2 ] <<= pv;
-+    aParams[ 3 ] <<= fv;
-+    aParams[ 4 ] <<= type;
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NPer") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(MIRR)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 3 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+
-+    // retrieve non-optional params
-+
-+    Sequence< Any > aParams( 3 );
-+    Any aValues = sbxToUnoValue( rPar.Get(1),
-+                getCppuType( (Sequence<double>*)0 ) );
-+
-+    // convert for calc functions
-+    Sequence< Sequence< double > > sValues(1);
-+    aValues >>= sValues[ 0 ];
-+    aValues <<= sValues;
-+
-+    aParams[ 0 ] <<= aValues;
-+    aParams[ 1 ] <<= makeAny( rPar.Get(2)->GetDouble() );
-+    aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MIRR") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(IRR)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 1 || nArgCount > 2 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+    // retrieve non-optional params
-+    Any aValues = sbxToUnoValue( rPar.Get(1),
-+                getCppuType( (Sequence<double>*)0 ) );
-+
-+    // convert for calc functions
-+    Sequence< Sequence< double > > sValues(1);
-+    aValues >>= sValues[ 0 ];
-+    aValues <<= sValues;
-+
-+    // set default values for Optional args
-+    double guess = 0.1;    
-+    // guess
-+    if ( nArgCount >= 2 )
-+    {
-+        if( rPar.Get(2)->GetType() != SbxEMPTY )
-+            guess = rPar.Get(2)->GetDouble();
-+    }
-+
-+    Sequence< Any > aParams( 2 );
-+    aParams[ 0 ] <<= aValues;
-+    aParams[ 1 ] <<= guess;
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IRR") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(IPmt)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 4 || nArgCount > 6 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+    // retrieve non-optional params
-+
-+    double rate = rPar.Get(1)->GetDouble();
-+    double per = rPar.Get(2)->GetInteger();
-+    double nper = rPar.Get(3)->GetDouble();
-+    double pv = rPar.Get(4)->GetDouble();
-+
-+    // set default values for Optional args
-+    double fv = 0;    
-+    double type = 0;    
-+    
-+    // fv
-+    if ( nArgCount >= 5 )
-+    {
-+        if( rPar.Get(5)->GetType() != SbxEMPTY )
-+            fv = rPar.Get(5)->GetDouble();
-+    }
-+    // type
-+    if ( nArgCount >= 6 )
-+    {
-+        if( rPar.Get(6)->GetType() != SbxEMPTY )
-+            type = rPar.Get(6)->GetDouble();
-+    }
-+
-+    Sequence< Any > aParams( 6 );
-+    aParams[ 0 ] <<= rate;
-+    aParams[ 1 ] <<= per;
-+    aParams[ 2 ] <<= nper;
-+    aParams[ 3 ] <<= pv;
-+    aParams[ 4 ] <<= fv;
-+    aParams[ 5 ] <<= type;
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IPmt") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(FV)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 3 || nArgCount > 5 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+    // retrieve non-optional params
-+
-+    double rate = rPar.Get(1)->GetDouble();
-+    double nper = rPar.Get(2)->GetDouble();
-+    double pmt = rPar.Get(3)->GetDouble();
-+
-+    // set default values for Optional args
-+    double pv = 0;    
-+    double type = 0;    
-+    
-+    // pv
-+    if ( nArgCount >= 4 )
-+    {
-+        if( rPar.Get(4)->GetType() != SbxEMPTY )
-+            pv = rPar.Get(4)->GetDouble();
-+    }
-+    // type
-+    if ( nArgCount >= 5 )
-+    {
-+        if( rPar.Get(5)->GetType() != SbxEMPTY )
-+            type = rPar.Get(5)->GetDouble();
-+    }
-+
-+    Sequence< Any > aParams( 5 );
-+    aParams[ 0 ] <<= rate;
-+    aParams[ 1 ] <<= nper;
-+    aParams[ 2 ] <<= pmt;
-+    aParams[ 3 ] <<= pv;
-+    aParams[ 4 ] <<= type;
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FV") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(DDB)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 4 || nArgCount > 5 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+    // retrieve non-optional params
-+
-+    double cost = rPar.Get(1)->GetDouble();
-+    double salvage = rPar.Get(2)->GetDouble();
-+    double life = rPar.Get(3)->GetDouble();
-+    double period = rPar.Get(4)->GetDouble();
-+
-+    // set default values for Optional args
-+    double factor = 2;    
-+    
-+    // factor
-+    if ( nArgCount >= 5 )
-+    {
-+        if( rPar.Get(5)->GetType() != SbxEMPTY )
-+            factor = rPar.Get(5)->GetDouble();
-+    }
-+
-+    Sequence< Any > aParams( 5 );
-+    aParams[ 0 ] <<= cost;
-+    aParams[ 1 ] <<= salvage;
-+    aParams[ 2 ] <<= life;
-+    aParams[ 3 ] <<= period;
-+    aParams[ 4 ] <<= factor;
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DDB") ), rPar.Get( 0 ) );
-+}
-+
-+RTLFUNC(Rate)
-+{
-+    (void)pBasic;
-+    (void)bWrite;
-+
-+    ULONG nArgCount = rPar.Count()-1;
-+
-+    if ( nArgCount < 3 || nArgCount > 6 )
-+    {
-+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-+        return;
-+    }
-+    // retrieve non-optional params
-+
-+    double nper = 0;    
-+    double pmt = 0;    
-+    double pv = 0;
-+
-+    nper = rPar.Get(1)->GetDouble();
-+    pmt = rPar.Get(2)->GetDouble();
-+    pv = rPar.Get(3)->GetDouble();
-+
-+    // set default values for Optional args
-+    double fv = 0;    
-+    double type = 0;    
-+    double guess = 0.1;    
-+    
-+    // fv
-+    if ( nArgCount >= 4 )
-+    {
-+        if( rPar.Get(4)->GetType() != SbxEMPTY )
-+            fv = rPar.Get(4)->GetDouble();
-+    }
-+
-+    // type
-+    if ( nArgCount >= 5 )
-+    {
-+        if( rPar.Get(5)->GetType() != SbxEMPTY )
-+            type = rPar.Get(5)->GetDouble();
-+    }
-+
-+    // guess
-+    if ( nArgCount >= 6 )
-+    {
-+        if( rPar.Get(6)->GetType() != SbxEMPTY )
-+            type = rPar.Get(6)->GetDouble();
-+    }
-+
-+    Sequence< Any > aParams( 6 );
-+    aParams[ 0 ] <<= nper;
-+    aParams[ 1 ] <<= pmt;
-+    aParams[ 2 ] <<= pv;
-+    aParams[ 3 ] <<= fv;
-+    aParams[ 4 ] <<= type;
-+    aParams[ 5 ] <<= guess;
-+    
-+    CallFunctionAccessFunction( aParams, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Rate") ), rPar.Get( 0 ) );
-+}
-+
- RTLFUNC(StrReverse)
- {
-     (void)pBasic;
-diff --git basic/source/runtime/rtlproto.hxx basic/source/runtime/rtlproto.hxx
-index 3564a46..7f4df3c 100644
---- basic/source/runtime/rtlproto.hxx
-+++ basic/source/runtime/rtlproto.hxx
-@@ -167,29 +167,41 @@ extern RTLFUNC(Kill); // JSM
- extern RTLFUNC(MkDir); // JSM
- extern RTLFUNC(RmDir); // JSM
- extern RTLFUNC(SendKeys); // JSM
-+extern RTLFUNC(DDB);
- extern RTLFUNC(DoEvents);
- extern RTLFUNC(DimArray);
- extern RTLFUNC(Dir);
- extern RTLFUNC(Exp);
- extern RTLFUNC(FileLen);
- extern RTLFUNC(Fix);
-+extern RTLFUNC(FV);
- extern RTLFUNC(Hex);
- extern RTLFUNC(Input);
- extern RTLFUNC(InStr);
- extern RTLFUNC(InStrRev);
- extern RTLFUNC(Int);
-+extern RTLFUNC(IPmt);
-+extern RTLFUNC(IRR);
- extern RTLFUNC(Join);
- extern RTLFUNC(LCase);
- extern RTLFUNC(Left);
- extern RTLFUNC(Log);
- extern RTLFUNC(LTrim);
- extern RTLFUNC(Mid);
-+extern RTLFUNC(MIRR);
-+extern RTLFUNC(NPer);
-+extern RTLFUNC(NPV);
- extern RTLFUNC(Oct);
-+extern RTLFUNC(Pmt);
-+extern RTLFUNC(PPmt);
-+extern RTLFUNC(PV);
-+extern RTLFUNC(Rate);
- extern RTLFUNC(Replace);
- extern RTLFUNC(Right);
- extern RTLFUNC(RTrim);
- extern RTLFUNC(RTL);
- extern RTLFUNC(Sgn);
-+extern RTLFUNC(SLN);
- extern RTLFUNC(Space);
- extern RTLFUNC(Split);
- extern RTLFUNC(Sqr);
-@@ -197,6 +209,7 @@ extern RTLFUNC(Str);
- extern RTLFUNC(StrComp);
- extern RTLFUNC(String);
- extern RTLFUNC(StrReverse);
-+extern RTLFUNC(SYD);
- extern RTLFUNC(Tan);
- extern RTLFUNC(UCase);
- extern RTLFUNC(Val);
-diff --git basic/source/runtime/stdobj.cxx basic/source/runtime/stdobj.cxx
-index f997065..38ba7cd 100644
---- basic/source/runtime/stdobj.cxx
-+++ basic/source/runtime/stdobj.cxx
-@@ -175,7 +175,12 @@ static Methods aMethods[] = {
-   { "expression",   SbxVARIANT, 0,NULL,0 },
- { "CVErr",          SbxVARIANT,   1 | _FUNCTION, RTLNAME(CVErr),0           },
-   { "expression",   SbxVARIANT, 0,NULL,0 },
--
-+{ "DDB",      SbxDOUBLE,      5 | _FUNCTION | _COMPTMASK, RTLNAME(DDB),0       },
-+  { "Cost",       SbxDOUBLE,  0, NULL,0 },
-+  { "Salvage",       SbxDOUBLE,  0, NULL,0 },
-+  { "Life",       SbxDOUBLE,  0, NULL,0 },
-+  { "Period",       SbxDOUBLE,  0, NULL,0 },
-+  { "Factor",     SbxVARIANT,  _OPT, NULL,0 },
- { "Date",           SbxDATE,          _LFUNCTION,RTLNAME(Date),0            },
- { "DateAdd",        SbxDATE,	  3 | _FUNCTION, RTLNAME(DateAdd),0         },
-   { "Interval",     SbxSTRING, 0,NULL,0 },
-@@ -273,6 +278,12 @@ static Methods aMethods[] = {
- { "FreeLibrary",    SbxNULL,      1 | _FUNCTION, RTLNAME(FreeLibrary),0     },
-   { "Modulename",   SbxSTRING, 0,NULL,0 },
- 
-+{ "FV",      SbxDOUBLE,      5 | _FUNCTION | _COMPTMASK, RTLNAME(FV),0       },
-+  { "Rate",       SbxDOUBLE,  0, NULL,0 },
-+  { "NPer",       SbxDOUBLE,  0, NULL,0 },
-+  { "Pmt",       SbxDOUBLE,  0, NULL,0 },
-+  { "PV",     SbxVARIANT,  _OPT, NULL,0 },
-+  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
- { "Get",            SbxNULL,   3 | _FUNCTION, RTLNAME(Get),0                },
-   { "filenumber",   SbxINTEGER, 0,NULL,0 },
-   { "recordnumber", SbxLONG, 0,NULL,0 },
-@@ -333,6 +344,16 @@ static Methods aMethods[] = {
-   { "Compare",      SbxINTEGER,       _OPT, NULL,0 },
- { "Int",            SbxDOUBLE,    1 | _FUNCTION, RTLNAME(Int),0             },
-   { "number",       SbxDOUBLE, 0,NULL,0 },
-+{ "IPmt",      SbxDOUBLE,      6 | _FUNCTION | _COMPTMASK, RTLNAME(IPmt),0       },
-+  { "Rate",       SbxDOUBLE,  0, NULL,0 },
-+  { "Per",       SbxDOUBLE,  0, NULL,0 },
-+  { "NPer",       SbxDOUBLE,  0, NULL,0 },
-+  { "PV",     SbxDOUBLE,  0, NULL,0 },
-+  { "FV",     SbxVARIANT,  _OPT, NULL,0 },
-+  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
-+{ "IRR",      SbxDOUBLE,      2 | _FUNCTION | _COMPTMASK, RTLNAME(IRR),0       },
-+  { "ValueArray",       SbxARRAY,  0, NULL,0 },
-+  { "Guess",       SbxVARIANT,  _OPT, NULL,0 },
- { "IsArray",        SbxBOOL,      1 | _FUNCTION, RTLNAME(IsArray),0         },
-   { "Variant",      SbxVARIANT, 0,NULL,0 },
- { "IsDate",         SbxBOOL,      1 | _FUNCTION, RTLNAME(IsDate),0          },
-@@ -401,6 +422,10 @@ static Methods aMethods[] = {
-   { "Length",       SbxLONG,          _OPT, NULL,0 },
- { "Minute",         SbxINTEGER,   1 | _FUNCTION, RTLNAME(Minute),0          },
-   { "Date",         SbxDATE, 0,NULL,0 },
-+{ "MIRR",      SbxDOUBLE,      2 | _FUNCTION | _COMPTMASK, RTLNAME(MIRR),0       },
-+  { "ValueArray",       SbxARRAY,  0, NULL,0 },
-+  { "FinanceRate",       SbxDOUBLE,  0, NULL,0 },
-+  { "ReinvestRate",       SbxDOUBLE,  0, NULL,0 },
- { "MkDir",          SbxNULL,      1 | _FUNCTION, RTLNAME(MkDir),0           },
-   { "pathname",     SbxSTRING, 0,NULL,0 },
- { "Month",          SbxINTEGER,   1 | _FUNCTION, RTLNAME(Month),0           },
-@@ -417,6 +442,15 @@ static Methods aMethods[] = {
- 
- { "Nothing",        SbxOBJECT,        _CPROP,    RTLNAME(Nothing),0         },
- { "Now",            SbxDATE,          _FUNCTION, RTLNAME(Now),0             },
-+{ "NPer",      SbxDOUBLE,      5 | _FUNCTION | _COMPTMASK, RTLNAME(NPer),0       },
-+  { "Rate",       SbxDOUBLE,  0, NULL,0 },
-+  { "Pmt",       SbxDOUBLE,  0, NULL,0 },
-+  { "PV",       SbxDOUBLE,  0, NULL,0 },
-+  { "FV",     SbxVARIANT,  _OPT, NULL,0 },
-+  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
-+{ "NPV",      SbxDOUBLE,      2 | _FUNCTION | _COMPTMASK, RTLNAME(NPV),0       },
-+  { "Rate",       SbxDOUBLE,  0, NULL,0 },
-+  { "ValueArray",       SbxARRAY,  0, NULL,0 },
- { "Null",			SbxNULL,          _CPROP,    RTLNAME(Null),0			},
- 
- { "Oct",            SbxSTRING,    1 | _FUNCTION, RTLNAME(Oct),0             },
-@@ -428,16 +462,46 @@ static Methods aMethods[] = {
-   { "stop",  	    SbxLONG, 	0,NULL,0 },
-   { "interval",     SbxLONG, 	0,NULL,0 },
- { "Pi",				SbxDOUBLE,		  _CPROP,    RTLNAME(PI),0		      	},
-+
-+{ "Pmt",      SbxDOUBLE,      5 | _FUNCTION | _COMPTMASK, RTLNAME(Pmt),0       },
-+  { "Rate",       SbxDOUBLE,  0, NULL,0 },
-+  { "NPer",       SbxDOUBLE,  0, NULL,0 },
-+  { "PV",     SbxDOUBLE,  0, NULL,0 },
-+  { "FV",     SbxVARIANT,  _OPT, NULL,0 },
-+  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
-+
-+{ "PPmt",      SbxDOUBLE,      6 | _FUNCTION | _COMPTMASK, RTLNAME(PPmt),0       },
-+  { "Rate",       SbxDOUBLE,  0, NULL,0 },
-+  { "Per",       SbxDOUBLE,  0, NULL,0 },
-+  { "NPer",       SbxDOUBLE,  0, NULL,0 },
-+  { "PV",     SbxDOUBLE,  0, NULL,0 },
-+  { "FV",     SbxVARIANT,  _OPT, NULL,0 },
-+  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
-+
- { "Put",            SbxNULL,   3 | _FUNCTION, RTLNAME(Put),0                },
-   { "filenumber",   SbxINTEGER, 0,NULL,0 },
-   { "recordnumber", SbxLONG, 0,NULL,0 },
-   { "variablename",	SbxVARIANT, 0,NULL,0 },
- 
-+{ "PV",      SbxDOUBLE,      5 | _FUNCTION | _COMPTMASK, RTLNAME(PV),0       },
-+  { "Rate",       SbxDOUBLE,  0, NULL,0 },
-+  { "NPer",       SbxDOUBLE,  0, NULL,0 },
-+  { "Pmt",     SbxDOUBLE,  0, NULL,0 },
-+  { "FV",     SbxVARIANT,  _OPT, NULL,0 },
-+  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
-+
- { "QBColor",		SbxLONG,	  1 | _FUNCTION, RTLNAME(QBColor),0			},
-   { "number",		SbxINTEGER, 0,NULL,0 },
- 
- { "Randomize",      SbxNULL,      1 | _FUNCTION, RTLNAME(Randomize),0       },
-   { "Number",       SbxDOUBLE,        _OPT, NULL,0 },
-+{ "Rate",      SbxDOUBLE,      6 | _FUNCTION | _COMPTMASK, RTLNAME(Rate),0       },
-+  { "NPer",       SbxDOUBLE,  0, NULL,0 },
-+  { "Pmt",       SbxDOUBLE,  0, NULL,0 },
-+  { "PV",       SbxDOUBLE,  0, NULL,0 },
-+  { "FV",       SbxVARIANT,  _OPT, NULL,0 },
-+  { "Due",     SbxVARIANT,  _OPT, NULL,0 },
-+  { "Guess",    SbxVARIANT,  _OPT, NULL,0 },
- { "Red",        SbxINTEGER,   1 | _FUNCTION, RTLNAME(Red),0                 },
-   { "RGB-Value",     SbxLONG, 0,NULL,0 },
- { "Reset",          SbxNULL,      0 | _FUNCTION, RTLNAME(Reset),0           },
-@@ -492,6 +556,15 @@ static Methods aMethods[] = {
-   { "WindowStyle",  SbxINTEGER,       _OPT, NULL,0 },
- { "Sin",            SbxDOUBLE,    1 | _FUNCTION, RTLNAME(Sin),0             },
-   { "number",       SbxDOUBLE, 0,NULL,0 },
-+{ "SLN",            SbxDOUBLE,    2 |  _FUNCTION | _COMPTMASK, RTLNAME(SLN),0             },
-+  { "Cost",       SbxDOUBLE, 0,NULL,0 },
-+  { "Double",       SbxDOUBLE, 0,NULL,0 },
-+  { "Life",       SbxDOUBLE, 0,NULL,0 },
-+{ "SYD",            SbxDOUBLE,    2 |  _FUNCTION | _COMPTMASK, RTLNAME(SYD),0             },
-+  { "Cost",       SbxDOUBLE, 0,NULL,0 },
-+  { "Salvage",       SbxDOUBLE, 0,NULL,0 },
-+  { "Life",       SbxDOUBLE, 0,NULL,0 },
-+  { "Period",       SbxDOUBLE, 0,NULL,0 },
- { "Space",          SbxSTRING,      1 | _FUNCTION, RTLNAME(Space),0         },
-   { "string",       SbxLONG, 0,NULL,0 },
- { "Spc",          	SbxSTRING,      1 | _FUNCTION, RTLNAME(Spc),0           },
-diff --git sc/source/ui/vba/vbawsfunction.cxx sc/source/ui/vba/vbawsfunction.cxx
-index 6d6629b..101e1c9 100644
---- sc/source/ui/vba/vbawsfunction.cxx
-+++ sc/source/ui/vba/vbawsfunction.cxx
-@@ -74,13 +74,48 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence<
- 
-     for (int i=0; i < Params.getLength();i++) 
-     {
-+        aArrayTemp[i]= aArray[i];
-         uno::Reference<excel::XRange> myRange( aArray[ i ], uno::UNO_QUERY );
-         if ( myRange.is() ) 
-         {
-             aArrayTemp[i] = myRange->getCellRange();
-             continue;
-         }
--        aArrayTemp[i]= aArray[i];
-+        else if ( aArray[ i ].getValueType().getTypeClass() == uno::TypeClass_SEQUENCE )
-+        {
-+            // the sheet.FunctionAccess service doesn't deal with Sequences, only Sequences of Sequence
-+            uno::Type aType = aArray[ i ].getValueType();
-+            if ( aType.equals( getCppuType( (uno::Sequence<sal_Int16>*)0 ) ) )
-+            {
-+                uno::Sequence< uno::Sequence< sal_Int16 > >  aTmp(1);
-+                aArray[ i ] >>= aTmp[ 0 ];
-+                aArrayTemp[i] <<= aTmp;
-+            }
-+            else if ( aType.equals( getCppuType( (uno::Sequence<sal_Int32>*)0 ) ) )
-+            {
-+                uno::Sequence< uno::Sequence< sal_Int32 > > aTmp(1);
-+                aArray[ i ] >>= aTmp[ 0 ];
-+                aArrayTemp[i] <<= aTmp;
-+            }
-+            else if ( aType.equals( getCppuType( (uno::Sequence<double>*)0 ) ) )
-+            {
-+                uno::Sequence< uno::Sequence< double > > aTmp(1);
-+                aArray[ i ] >>= aTmp[ 0 ];
-+                aArrayTemp[i] <<= aTmp;
-+            }
-+            else if ( aType.equals( getCppuType( (uno::Sequence<rtl::OUString>*)0 ) ) )
-+            {
-+                uno::Sequence< uno::Sequence< rtl::OUString > > aTmp(1);
-+                aArray[ i ] >>= aTmp[ 0 ];
-+                aArrayTemp[i] <<= aTmp;
-+            }
-+            else if ( aType.equals( getCppuType( (uno::Sequence<uno::Any>*)0 ) ) )
-+            {
-+                uno::Sequence< uno::Sequence<uno::Any > > aTmp(1);
-+                aArray[ i ] >>= aTmp[ 0 ];
-+                aArrayTemp[i] <<= aTmp;
-+            }
-+        }
-     }
- 
-     for ( int count=0; count < aParamTemp.getLength(); ++count )
diff --git a/applied_patches/0532-unittesting-bean.diff b/applied_patches/0416-unittesting-bean.diff
similarity index 100%
rename from applied_patches/0532-unittesting-bean.diff
rename to applied_patches/0416-unittesting-bean.diff
diff --git a/applied_patches/0416-vba-typename-fix.diff b/applied_patches/0416-vba-typename-fix.diff
deleted file mode 100644
index ca117e864..000000000
--- a/applied_patches/0416-vba-typename-fix.diff
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git basic/source/runtime/methods.cxx basic/source/runtime/methods.cxx
-index 2c5dab3..5b239a6 100644
---- basic/source/runtime/methods.cxx
-+++ basic/source/runtime/methods.cxx
-@@ -79,7 +79,8 @@
- #include <com/sun/star/io/XStream.hpp>
- #include <com/sun/star/io/XSeekable.hpp>
- #include <com/sun/star/script/XErrorQuery.hpp>
--
-+#include <ooo/vba/XHelperInterface.hpp>
-+#include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
- using namespace comphelper;
- using namespace osl;
- using namespace com::sun::star::uno;
-@@ -3670,6 +3671,65 @@ String getBasicTypeName( SbxDataType eType )
-     return aRetStr;
- }
- 
-+String getObjectTypeName( SbxVariable* pVar )
-+{
-+    rtl::OUString sRet( RTL_CONSTASCII_USTRINGPARAM("Object") );
-+    if ( pVar )
-+    {
-+        SbxBase* pObj = pVar->GetObject();
-+        if( !pObj )
-+           sRet = String( RTL_CONSTASCII_USTRINGPARAM("Nothing") );
-+        else
-+        {
-+            SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,pVar );
-+            if ( !pUnoObj )
-+            { 
-+                if ( SbxBase* pBaseObj = pVar->GetObject() )
-+                    pUnoObj = PTR_CAST(SbUnoObject, pBaseObj );
-+            }
-+            if ( pUnoObj )
-+            { 
-+                Any aObj = pUnoObj->getUnoAny();
-+                // For upstreaming unless we start to build oovbaapi by default
-+                // we need to get detect the vba-ness of the object in some
-+                // other way        
-+                // note: Automation objects do not support XServiceInfo
-+                Reference< XServiceInfo > xServInfo( aObj, UNO_QUERY );
-+                if ( xServInfo.is() )
-+                {
-+                    // is this a VBA object ?
-+                    Reference< ooo::vba::XHelperInterface > xVBA( aObj, UNO_QUERY );
-+                    Sequence< rtl::OUString > sServices = xServInfo->getSupportedServiceNames();
-+                    if ( sServices.getLength() )
-+                        sRet = sServices[ 0 ];
-+                }
-+                else
-+                {
-+                    Reference< com::sun::star::bridge::oleautomation::XAutomationObject > xAutoMation( aObj, UNO_QUERY );
-+                    if ( xAutoMation.is() )
-+                    {
-+                        Reference< XInvocation > xInv( aObj, UNO_QUERY );
-+                        if ( xInv.is() )
-+                        {
-+                            try
-+                            {
-+                                xInv->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$GetTypeName") ) ) >>= sRet;
-+                            }
-+                            catch( Exception& )
-+                            {
-+                            }
-+                        }
-+                    }
-+                }
-+                sal_Int32 nDot = sRet.lastIndexOf( '.' );
-+                if ( nDot != -1 && nDot < sRet.getLength() )
-+                       sRet = sRet.copy( nDot + 1 );
-+            }
-+        }
-+    }         
-+    return sRet;
-+}
-+
- RTLFUNC(TypeName)
- {
-     (void)pBasic;
-@@ -3681,7 +3741,12 @@ RTLFUNC(TypeName)
-     {
-         SbxDataType eType = rPar.Get(1)->GetType();
-         BOOL bIsArray = ( ( eType & SbxARRAY ) != 0 );
--        String aRetStr = getBasicTypeName( eType );
-+
-+        String aRetStr;
-+        if ( SbiRuntime::isVBAEnabled() && eType == SbxOBJECT )
-+            aRetStr = getObjectTypeName( rPar.Get(1) );
-+        else
-+            aRetStr = getBasicTypeName( eType );
-         if( bIsArray )
-             aRetStr.AppendAscii( "()" );
-         rPar.Get(0)->PutString( aRetStr );
diff --git a/applied_patches/0533-unittesting-bridges.diff b/applied_patches/0417-unittesting-bridges.diff
similarity index 100%
rename from applied_patches/0533-unittesting-bridges.diff
rename to applied_patches/0417-unittesting-bridges.diff
diff --git a/applied_patches/0534-unittesting-canvas.diff b/applied_patches/0418-unittesting-canvas.diff
similarity index 100%
rename from applied_patches/0534-unittesting-canvas.diff
rename to applied_patches/0418-unittesting-canvas.diff
diff --git a/applied_patches/0535-unittesting-cli_ure.diff b/applied_patches/0419-unittesting-cli_ure.diff
similarity index 100%
rename from applied_patches/0535-unittesting-cli_ure.diff
rename to applied_patches/0419-unittesting-cli_ure.diff
diff --git a/applied_patches/0536-unittesting-codemaker.diff b/applied_patches/0420-unittesting-codemaker.diff
similarity index 100%
rename from applied_patches/0536-unittesting-codemaker.diff
rename to applied_patches/0420-unittesting-codemaker.diff
diff --git a/applied_patches/0537-unittesting-configmgr.diff b/applied_patches/0421-unittesting-configmgr.diff
similarity index 100%
rename from applied_patches/0537-unittesting-configmgr.diff
rename to applied_patches/0421-unittesting-configmgr.diff
diff --git a/applied_patches/0422-buildfix-oox-depends-on-unotools.diff b/applied_patches/0422-buildfix-oox-depends-on-unotools.diff
deleted file mode 100644
index 731a0104c..000000000
--- a/applied_patches/0422-buildfix-oox-depends-on-unotools.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- oox/prj/build.lst-old	2008-03-16 10:41:32.000000000 +0100
-+++ oox/prj/build.lst	2008-03-16 10:41:45.000000000 +0100
-@@ -1,4 +1,4 @@
--oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl BOOST:boost NULL
-+oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl unotools BOOST:boost NULL
- oox	oox					usr1	-   all	oox_mkout NULL
- oox	oox\prj					get	-   all	oox_prj NULL
- oox	oox\source\token			nmake	-   all	oox_token NULL
diff --git a/applied_patches/0538-unittesting-connectivity.diff b/applied_patches/0422-unittesting-connectivity.diff
similarity index 100%
rename from applied_patches/0538-unittesting-connectivity.diff
rename to applied_patches/0422-unittesting-connectivity.diff
diff --git a/applied_patches/0539-unittesting-cppu.diff b/applied_patches/0423-unittesting-cppu.diff
similarity index 100%
rename from applied_patches/0539-unittesting-cppu.diff
rename to applied_patches/0423-unittesting-cppu.diff
diff --git a/applied_patches/0540-unittesting-cppuhelper.diff b/applied_patches/0424-unittesting-cppuhelper.diff
similarity index 100%
rename from applied_patches/0540-unittesting-cppuhelper.diff
rename to applied_patches/0424-unittesting-cppuhelper.diff
diff --git a/applied_patches/0541-unittesting-dbaccess.diff b/applied_patches/0425-unittesting-dbaccess.diff
similarity index 100%
rename from applied_patches/0541-unittesting-dbaccess.diff
rename to applied_patches/0425-unittesting-dbaccess.diff
diff --git a/applied_patches/0542-unittesting-desktop.diff b/applied_patches/0426-unittesting-desktop.diff
similarity index 100%
rename from applied_patches/0542-unittesting-desktop.diff
rename to applied_patches/0426-unittesting-desktop.diff
diff --git a/applied_patches/0543-unittesting-dtrans.diff b/applied_patches/0427-unittesting-dtrans.diff
similarity index 100%
rename from applied_patches/0543-unittesting-dtrans.diff
rename to applied_patches/0427-unittesting-dtrans.diff
diff --git a/applied_patches/0428-calc-formula-asian-phonetic.diff b/applied_patches/0428-calc-formula-asian-phonetic.diff
deleted file mode 100644
index f3e6ab7d8..000000000
--- a/applied_patches/0428-calc-formula-asian-phonetic.diff
+++ /dev/null
@@ -1,2715 +0,0 @@
-diff --git formula/inc/formula/compiler.hrc formula/inc/formula/compiler.hrc
-index 8c402c2..9aea242 100644
---- formula/inc/formula/compiler.hrc
-+++ formula/inc/formula/compiler.hrc
-@@ -193,7 +193,8 @@
- #define SC_OPCODE_UNICODE           155
- #define SC_OPCODE_UNICHAR           156
- #define SC_OPCODE_GAMMA             157
--#define SC_OPCODE_STOP_1_PAR        158
-+#define SC_OPCODE_PHONETIC          158
-+#define SC_OPCODE_STOP_1_PAR        159
- 
- /*** Functions with more than one parameters ***/
- #define SC_OPCODE_START_2_PAR       201
-diff --git formula/inc/formula/opcode.hxx formula/inc/formula/opcode.hxx
-index 4b93aab..6171a59 100644
---- formula/inc/formula/opcode.hxx
-+++ formula/inc/formula/opcode.hxx
-@@ -186,6 +186,7 @@ enum OpCodeEnum
-         ocAsc               = SC_OPCODE_ASC,
-         ocUnicode           = SC_OPCODE_UNICODE,
-         ocUnichar           = SC_OPCODE_UNICHAR,
-+        ocPhonetic          = SC_OPCODE_PHONETIC,
- 	// Functions with more than one parameters
- 		ocArcTan2			= SC_OPCODE_ARC_TAN_2,
- 		ocCeil				= SC_OPCODE_CEIL,
-diff --git formula/source/core/resource/core_resource.src formula/source/core/resource/core_resource.src
-index b1b79a5..0aa767c 100644
---- formula/source/core/resource/core_resource.src
-+++ formula/source/core/resource/core_resource.src
-@@ -337,6 +337,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
- 	String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
-     String SC_OPCODE_INFO { Text = "INFO" ; };
-     String SC_OPCODE_BAHTTEXT { Text = "COM.MICROSOFT.BAHTTEXT" ; };
-+    String SC_OPCODE_PHONETIC { Text = "PHONETIC" ; };
-     String SC_OPCODE_GET_PIVOT_DATA { Text = "GETPIVOTDATA" ; };
- 	String SC_OPCODE_EUROCONVERT { Text = "EUROCONVERT" ; };
- 	String SC_OPCODE_NUMBERVALUE { Text = "NUMBERVALUE" ; };
-@@ -661,6 +662,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
- 	String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
-     String SC_OPCODE_INFO { Text = "INFO" ; };
-     String SC_OPCODE_BAHTTEXT { Text = "BAHTTEXT" ; };
-+    String SC_OPCODE_PHONETIC { Text = "PHONETIC" ; };
-     String SC_OPCODE_GET_PIVOT_DATA { Text = "GETPIVOTDATA" ; };
- 	String SC_OPCODE_EUROCONVERT { Text = "EUROCONVERT" ; };
- 	String SC_OPCODE_NUMBERVALUE { Text = "NUMBERVALUE" ; };
-@@ -1815,6 +1817,10 @@ Resource RID_STRLIST_FUNCTION_NAMES
-     {
-         Text [ en-US ] = "BAHTTEXT";
-     };
-+    String SC_OPCODE_PHONETIC
-+    {
-+        Text [ en-US ] = "PHONETIC";
-+    };
-     String SC_OPCODE_GET_PIVOT_DATA
-     {
-         Text [ en-US ] = "GETPIVOTDATA";
-diff --git sc/inc/cell.hxx sc/inc/cell.hxx
-index 5b95f8f..d240861 100644
---- sc/inc/cell.hxx
-+++ sc/inc/cell.hxx
-@@ -43,6 +43,7 @@
- #include "formula/grammar.hxx"
- #include "tokenarray.hxx"
- #include "formularesult.hxx"
-+#include "phonetic.hxx"
- #include <rtl/ustrbuf.hxx>
- #include <vcl/fontcvt.hxx>
- #include "scdllapi.h"
-@@ -62,6 +63,7 @@ class ScCodeArray;
- class ScProgress;
- class ScPostIt;
- class ScPatternAttr;
-+class ScPhonetic;
- 
- class ScMultipleReadHeader;
- class ScMultipleWriteHeader;
-@@ -250,12 +252,64 @@ public:
-     inline void		GetString( String& rString ) const { rString = maString; }
- 	inline const String& GetString() const { return maString; }
- 
-+    virtual bool    HasPhonetic() const;
-+
- private:
- 	String		    maString;
- };
- 
- // ============================================================================
- 
-+/**
-+ * A class for representing of Asian phonetic guide.
-+ */
-+class SC_DLLPUBLIC ScAsianStringCell : public ScStringCell
-+{
-+private:
-+    ScPhonetic      aPhonetic;
-+
-+public:
-+
-+#ifdef USE_MEMPOOL
-+    DECL_FIXEDMEMPOOL_NEWDEL( ScAsianStringCell )
-+#endif
-+#ifdef DBG_UTIL
-+    ~ScAsianStringCell();
-+#endif
-+
-+    ScAsianStringCell();
-+
-+    /**
-+     * A constructor of ScAsianStringCell
-+     * @param rString the text of the cell.
-+     * @param rPhonetic a reference of ScPhonetic.
-+     */
-+    ScAsianStringCell( const String& rString, const ScPhonetic& rPhonetic );
-+
-+    /**
-+     * A constructor of ScAsianStringCell
-+     * @param rStream a reference of SvStream.
-+     * @param nVer the number of vesion.
-+     */
-+    ScAsianStringCell( SvStream& rStream, USHORT nVer );
-+
-+    /**
-+     * Sets ScPhonetic:
-+     * @param rPhonetic a reference of ScPhonetic.
-+     */
-+    void            SetPhonetic( const ScPhonetic& rPhonetic );
-+
-+    /**
-+     * Gets ScPhonetic:
-+     * @param rPhonetic a reference of ScPhonetic.
-+     */
-+    void            GetPhonetic( ScPhonetic& rPhonetic ) const;
-+
-+    virtual bool    HasPhonetic() const;
-+};
-+
-+// ============================================================================
-+
- class SC_DLLPUBLIC ScEditCell : public ScBaseCell
- {
- private:
-@@ -288,6 +359,8 @@ public:
- 	void			GetData( const EditTextObject*& rpObject ) const;
- 	void			GetString( String& rString ) const;
- 
-+    virtual bool    HasPhonetic() const;
-+
- 	const EditTextObject* GetData() const	{ return pData; }
- 
-     /** Removes character attribute based on new pattern attributes. */
-@@ -340,6 +413,60 @@ private:
- 
- // ============================================================================
- 
-+
-+/**
-+ * A class for representing of Asian phonetic guide.
-+ * It is derived from ScStringCell.
-+ */
-+class SC_DLLPUBLIC ScAsianEditCell : public ScEditCell
-+{
-+private:
-+    ScPhonetic      aPhonetic;
-+
-+public:
-+
-+#ifdef USE_MEMPOOL
-+    DECL_FIXEDMEMPOOL_NEWDEL( ScAsianStringCell )
-+#endif
-+#ifdef DBG_UTIL
-+    ~ScAsianEditCell();
-+#endif
-+
-+    /**
-+     * A constructor of ScAsianEditCell
-+     * @param rEditCell a reference of ScEditCell.
-+     * @param pDoc a pointer of ScDocument.
-+     * @param rPhonetic a reference of ScPhonetic.
-+     */
-+    ScAsianEditCell( const ScEditCell& rEditCell, ScDocument& rDoc, const ScPhonetic& rPhonetic );
-+
-+    /**
-+     * A constructor of ScAsianEditCell
-+     * @param pObject a pointer of EditTextObject.
-+     * @param pDoc a pointer of ScDocument.
-+     * @param pFromPool a pointer of SfxItemPool.
-+     * @param rPhonetic a reference of ScPhonetic.
-+     */
-+    ScAsianEditCell( const EditTextObject* pObject, ScDocument* pDoc,
-+                     const SfxItemPool* pFromPool, const ScPhonetic& rPhonetic );
-+
-+    /**
-+     * Sets ScPhonetic:
-+     * @param rPhonetic a reference of ScPhonetic.
-+     */
-+    void            SetPhonetic( const ScPhonetic& rPhonetic );
-+
-+    /**
-+     * Gets ScPhonetic:
-+     * @param rPhonetic a reference of ScPhonetic.
-+     */
-+    void            GetPhonetic( ScPhonetic& rPhonetic ) const;
-+
-+    virtual bool    HasPhonetic() const;
-+};
-+
-+// ----------------------------------------------------------------------------
-+
- enum ScMatrixMode {
-     MM_NONE      = 0,                   // No matrix formula
-     MM_FORMULA   = 1,                   // Upper left matrix formula cell
-@@ -553,5 +693,67 @@ public:
- 
- // ============================================================================
- 
-+inline bool ScStringCell::HasPhonetic() const
-+{
-+    return false;
-+}
-+
-+// ScAsianStringCell
-+
-+inline ScAsianStringCell::ScAsianStringCell()
-+{
-+}
-+
-+inline ScAsianStringCell::ScAsianStringCell( const String& rString, const ScPhonetic& rPhonetic ) :
-+    ScStringCell ( rString ),
-+    aPhonetic ( rPhonetic )
-+{
-+}
-+
-+inline void ScAsianStringCell::GetPhonetic( ScPhonetic& rPhonetic ) const
-+{
-+    rPhonetic = aPhonetic;
-+}
-+
-+inline bool ScAsianStringCell::HasPhonetic() const
-+{
-+    return true;
-+}
-+
-+inline void ScAsianStringCell::SetPhonetic( const ScPhonetic& rPhonetic )
-+{
-+    aPhonetic = rPhonetic;
-+}
-+
-+//      ScAsianEditCell
-+
-+inline ScAsianEditCell::ScAsianEditCell( const ScEditCell& rEditCell, ScDocument& rDoc, const ScPhonetic& rPhonetic ) :
-+    ScEditCell( rEditCell, rDoc ),
-+    aPhonetic( rPhonetic )
-+{
-+}
-+
-+inline ScAsianEditCell::ScAsianEditCell( const EditTextObject* pObject, ScDocument* pDocP,
-+                                         const SfxItemPool* pFromPool, const ScPhonetic& rPhonetic ) :
-+    ScEditCell( pObject, pDocP, pFromPool ),
-+    aPhonetic( rPhonetic )
-+{
-+}
-+
-+inline void ScAsianEditCell::GetPhonetic( ScPhonetic& rPhonetic ) const
-+{
-+    rPhonetic = aPhonetic;
-+}
-+
-+inline void ScAsianEditCell::SetPhonetic( const ScPhonetic& rPhonetic )
-+{
-+    aPhonetic = rPhonetic;
-+}
-+
-+inline bool ScAsianEditCell::HasPhonetic() const
-+{
-+    return true;
-+}
-+
- #endif
- 
-diff --git sc/inc/cellsuno.hxx sc/inc/cellsuno.hxx
-index b48590f..ed38458 100644
---- sc/inc/cellsuno.hxx
-+++ sc/inc/cellsuno.hxx
-@@ -984,6 +984,14 @@ public:
- 
- 	static String		GetInputString_Impl(ScDocument* pDoc, const ScAddress& aPos, BOOL bEnglish);
- 	static String		GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aPos);
-+
-+    /**
-+     * Gets phonetic text from a cell. 
-+     *  
-+     * @param pDoc A pointer of ScDocument.
-+     * @param aPos A reference of ScAdress.
-+     */
-+    static String GetOutputPhoneticString_Impl(ScDocument* pDoc, const ScAddress& aPos);
- };
- 
- 
-diff --git sc/inc/phonetic.hxx sc/inc/phonetic.hxx
-new file mode 100644
-index 0000000..3d7d542
---- /dev/null
-+++ sc/inc/phonetic.hxx
-@@ -0,0 +1,107 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: global.hxx,v $
-+ * $Revision: 1.53 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SC_PHONETIC_HXX
-+#define SC_PHONETIC_HXX
-+
-+
-+#include "tools/string.hxx"
-+#include "scdllapi.h"
-+
-+#include <vector>
-+
-+struct PhoneticPortion
-+{
-+    sal_uInt16          mncpa;  /// position of the first character in the phonetic text
-+    sal_uInt16          mncpm;  /// position of the first character in the base text
-+    sal_uInt16          mnccm;  /// length of the characters in the base text
-+    explicit inline     PhoneticPortion() : mncpa( 0 ), mncpm( 0 ), mnccm( 0 ) {}
-+    explicit inline     PhoneticPortion( sal_uInt16 ncpa, sal_uInt16 ncpm, sal_uInt16 nccm ) :
-+                            mncpa( ncpa ), mncpm( ncpm ), mnccm ( nccm ) {}
-+};
-+
-+inline bool operator==( const PhoneticPortion& rLeft, const PhoneticPortion& rRight )
-+{
-+    return
-+        ( rLeft.mncpa == rRight.mncpa ) &&
-+        ( rLeft.mncpm == rRight.mncpm ) &&
-+        ( rLeft.mnccm == rRight.mnccm );
-+}
-+
-+typedef ::std::vector< PhoneticPortion > PhoneticPortionVec;
-+
-+/*
-+ * A class for store Asian phonetic guide information.
-+ */
-+class SC_DLLPUBLIC ScPhonetic
-+{
-+public:
-+	ScPhonetic() : mnFontIdx( 0 ), mnAdditionalSettings( 0 ), mnRepeatedTotalLength ( 0 ) {}
-+	/** A constructor of ScPhonetic.
-+	 * @param nFontIdx font index.
-+	 * @param nAdditionalSettings an additional settings.
-+	 * @param nRepeatedTotalLength the number of repeated total length.
-+	 * @param rPhoneticString phonetic text.
-+	 * @param rPhoneticPortions the portion of phonetic text.
-+	 */
-+	ScPhonetic( sal_uInt16 nFontIdx, sal_uInt16 nAdditionalSettings,
-+					sal_uInt16 nRepeatedTotalLength, const String& rPhoneticString,
-+					const PhoneticPortionVec& rPhoneticPortions) :
-+		mnFontIdx( nFontIdx ), mnAdditionalSettings( nAdditionalSettings ),
-+		mnRepeatedTotalLength ( nRepeatedTotalLength ),
-+		maPhoneticString ( rPhoneticString ), maPhoneticPortions ( rPhoneticPortions ) {}
-+	virtual ~ScPhonetic();
-+
-+	virtual int             operator==( const ScPhonetic& ) const;
-+
-+	/** Returns True if no phonetic information. */
-+	inline BOOL IsEmpty() const { return maPhoneticString.Len() == 0; }
-+	/** Returns the text for phonetic information. */
-+	inline const String& GetString() const { return maPhoneticString; }
-+    /** Returns the portion for phonetic information. */
-+	inline const PhoneticPortionVec& GetPortions() const { return maPhoneticPortions; }
-+    /** Returns font index of phonetic information. */
-+	inline sal_uInt16 GetFontIndex() const { return mnFontIdx; }
-+    /** Returns additional settings of phonetic information. */
-+	inline sal_uInt16 GetAdditionalSettings() const { return mnAdditionalSettings; }
-+    /** Returns repeated length of phonetic information. */
-+	inline sal_uInt16 GetRepeatedTotalLength() const { return mnRepeatedTotalLength; }
-+    /** Returns the size of phonetic information. */
-+	inline sal_uInt32 GetSize() const { return 14 + ( maPhoneticString.Len() ? maPhoneticString.Len() * 2 : 2 ) + maPhoneticPortions.size() * 6; }
-+
-+private:
-+	sal_uInt16         mnFontIdx;            /// Index to FONT record
-+	sal_uInt16         mnAdditionalSettings; /// Additional settings for the Asian phonetic text
-+	sal_uInt16         mnRepeatedTotalLength;
-+	String             maPhoneticString;
-+	PhoneticPortionVec maPhoneticPortions;
-+};
-+
-+#endif
-diff --git sc/inc/scfuncs.hrc sc/inc/scfuncs.hrc
-index d0ca82f..24fa7f8 100644
---- sc/inc/scfuncs.hrc
-+++ sc/inc/scfuncs.hrc
-@@ -333,3 +333,4 @@
- #define HID_FUNC_UNICODE            (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+31)
- #define HID_FUNC_UNICHAR            (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+32)
- #define HID_FUNC_NUMBERVALUE        (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+33)
-+#define HID_FUNC_PHONETIC           (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+34)
-diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx
-index abe319f..f26401e 100644
---- sc/source/core/data/cell.cxx
-+++ sc/source/core/data/cell.cxx
-@@ -76,10 +76,14 @@ const USHORT nMemPoolValueCell = (0x8000 - 64) / sizeof(ScValueCell);
- const USHORT nMemPoolFormulaCell = (0x8000 - 64) / sizeof(ScFormulaCell);
- const USHORT nMemPoolStringCell = (0x4000 - 64) / sizeof(ScStringCell);
- const USHORT nMemPoolNoteCell = (0x1000 - 64) / sizeof(ScNoteCell);
-+const USHORT nMemPoolAsianStringCell = (0x4000 - 64) / sizeof(ScAsianStringCell);
-+const USHORT nMemPoolAsianEditCell = (0x4000 - 64) / sizeof(ScAsianEditCell);
- IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell,   nMemPoolValueCell, nMemPoolValueCell )
- IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell, nMemPoolFormulaCell, nMemPoolFormulaCell )
- IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell,  nMemPoolStringCell, nMemPoolStringCell )
- IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell,	 nMemPoolNoteCell, nMemPoolNoteCell )
-+IMPL_FIXEDMEMPOOL_NEWDEL( ScAsianStringCell, nMemPoolAsianStringCell, nMemPoolAsianStringCell )
-+IMPL_FIXEDMEMPOOL_NEWDEL( ScAsianEditCell, nMemPoolAsianEditCell, nMemPoolAsianEditCell )
- #endif
- 
- // ============================================================================
-@@ -512,19 +516,31 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 )
- 			return ( ((const ScValueCell*)pCell1)->GetValue() ==
- 					 ((const ScValueCell*)pCell2)->GetValue() );
- 		case CELLTYPE_STRING:		// String oder Edit
--			{
--				String aText1;
--				if ( pCell1->GetCellType() == CELLTYPE_STRING )
--					((const ScStringCell*)pCell1)->GetString(aText1);
--				else
--					((const ScEditCell*)pCell1)->GetString(aText1);
--				String aText2;
--				if ( pCell2->GetCellType() == CELLTYPE_STRING )
--					((const ScStringCell*)pCell2)->GetString(aText2);
--				else
--					((const ScEditCell*)pCell2)->GetString(aText2);
--				return ( aText1 == aText2 );
--			}
-+        {
-+            String aText1, aText2;
-+            const ScStringCell* pStrCell1 = static_cast<const ScStringCell*>(pCell1);
-+            const ScStringCell* pStrCell2 = static_cast<const ScStringCell*>(pCell2);
-+            pStrCell1->GetString( aText1 );
-+            pStrCell2->GetString( aText2 );
-+            if (aText1 != aText2)
-+                return false;
-+
-+            ScPhonetic aPhonetic1, aPhonetic2;
-+            if (pStrCell1->HasPhonetic())
-+            {
-+                const ScAsianStringCell* pPhoCell1 = 
-+                    static_cast<const ScAsianStringCell*>(pStrCell1);
-+                pPhoCell1->GetPhonetic(aPhonetic1);
-+            }
-+            if (pStrCell2->HasPhonetic())
-+            {
-+                const ScAsianStringCell* pPhoCell2 = 
-+                    static_cast<const ScAsianStringCell*>(pStrCell2);
-+                pPhoCell2->GetPhonetic(aPhonetic2);
-+            }
-+
-+            return aPhonetic1 == aPhonetic2;
-+        }
- 		case CELLTYPE_FORMULA:
- 			{
- 				//!	eingefuegte Zeilen / Spalten beruecksichtigen !!!!!
-diff --git sc/source/core/data/cell2.cxx sc/source/core/data/cell2.cxx
-index 7e29ed7..ddd2bef 100644
---- sc/source/core/data/cell2.cxx
-+++ sc/source/core/data/cell2.cxx
-@@ -140,6 +140,11 @@ void ScEditCell::GetString( String& rString ) const
-         rString.Erase();
- }
- 
-+bool ScEditCell::HasPhonetic() const
-+{
-+    return false;
-+}
-+
- void ScEditCell::RemoveCharAttribs( const ScPatternAttr& rAttr )
- {
-     const struct {
-diff --git sc/source/core/data/makefile.mk sc/source/core/data/makefile.mk
-index 63b1f73..bd0ded7 100644
---- sc/source/core/data/makefile.mk
-+++ sc/source/core/data/makefile.mk
-@@ -97,6 +97,7 @@ SLOFILES =  \
- 	$(SLO)$/patattr.obj \
- 	$(SLO)$/pivot.obj \
- 	$(SLO)$/pivot2.obj \
-+	$(SLO)$/phonetic.obj \
- 	$(SLO)$/poolhelp.obj \
- 	$(SLO)$/scimpexpmsg.obj \
- 	$(SLO)$/sortparam.obj \
-diff --git sc/source/core/data/phonetic.cxx sc/source/core/data/phonetic.cxx
-new file mode 100644
-index 0000000..1bd10fa
---- /dev/null
-+++ sc/source/core/data/phonetic.cxx
-@@ -0,0 +1,72 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: global.hxx,v $
-+ * $Revision: 1.53 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_sc.hxx"
-+
-+// INCLUDE ---------------------------------------------------------------
-+
-+#if 1
-+#ifndef _COM_SUN_STAR_UTIL_CELLPROTECTION_HPP_
-+#include <com/sun/star/util/CellProtection.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UTIL_XPROTECTABLE_HPP_
-+#include <com/sun/star/util/XProtectable.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_TEXT_XTEXT_HPP_
-+#include <com/sun/star/text/XText.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#endif
-+#endif
-+
-+#include "phonetic.hxx"
-+
-+using namespace com::sun::star;
-+
-+
-+//------------------------------------------------------------------------
-+
-+ScPhonetic::~ScPhonetic()
-+{
-+}
-+
-+//------------------------------------------------------------------------
-+
-+int ScPhonetic::operator==( const ScPhonetic& rItem ) const
-+{
-+	return ((mnFontIdx == rItem.mnFontIdx)
-+			 && (mnAdditionalSettings == rItem.mnAdditionalSettings)
-+			 && (mnRepeatedTotalLength == rItem.mnRepeatedTotalLength)
-+			 && (maPhoneticString == rItem.maPhoneticString)
-+			 && (maPhoneticPortions == rItem.maPhoneticPortions));
-+}
-+
-diff --git sc/source/core/inc/interpre.hxx sc/source/core/inc/interpre.hxx
-index 681766d..fb5331d 100644
---- sc/source/core/inc/interpre.hxx
-+++ sc/source/core/inc/interpre.hxx
-@@ -194,6 +194,7 @@ double GetValueCellValue( const ScAddress&, const ScValueCell* );
- ScBaseCell* GetCell( const ScAddress& rPos )
-     { return pDok->GetCell( rPos ); }
- void GetCellString( String& rStr, const ScBaseCell* pCell );
-+void GetCellPhoneticString( String& rStr, const ScBaseCell* pCell );
- inline USHORT GetCellErrCode( const ScBaseCell* pCell )
-     { return pCell ? pCell->GetErrorCode() : 0; }
- inline CellType GetCellType( const ScBaseCell* pCell )
-@@ -523,6 +524,7 @@ void ScExternalRef();
- void ScGetPivotData();
- void ScHyperLink();
- void ScBahtText();
-+void ScPhoneticString();
- void ScCalcTeam();
- void ScAnswer();
- void ScTTT();
-diff --git sc/source/core/tool/interpr2.cxx sc/source/core/tool/interpr2.cxx
-index e27c631..3fa563f 100644
---- sc/source/core/tool/interpr2.cxx
-+++ sc/source/core/tool/interpr2.cxx
-@@ -2848,6 +2848,76 @@ void ScInterpreter::ScBahtText()
- 
- // ============================================================================
- 
-+void ScInterpreter::ScPhoneticString()
-+{
-+    BYTE nParamCount = GetByte();
-+    if ( MustHaveParamCountMin( nParamCount, 1 ) )
-+    {
-+        String aPhoneticText;
-+        while( nParamCount-- )
-+        {
-+            if ( nGlobalError )
-+            {
-+                PushError(nGlobalError);
-+                return;
-+            }
-+
-+            switch ( GetStackType() )
-+            {
-+                case svSingleRef :
-+                {
-+                    ScAddress aAdr;
-+                    PopSingleRef( aAdr );
-+                    if (nGlobalError)
-+                    {
-+                        PushError(nGlobalError);
-+                        return;
-+                    }
-+
-+                    ScBaseCell* pCell = GetCell( aAdr );
-+                    if ( HasCellStringData( pCell ) )
-+                    {
-+                        String aStr;
-+                        GetCellPhoneticString( aStr, pCell );
-+                        aPhoneticText += aStr;
-+                    }
-+                }
-+                break;
-+                case svDoubleRef:
-+                {
-+                    ScRange aRange;
-+                    PopDoubleRef( aRange );
-+                    if (nGlobalError)
-+                    {
-+                        PushError(nGlobalError);
-+                        return;
-+                    }
-+
-+                    ScCellIterator aIter( pDok, aRange );
-+                    ScBaseCell *pCell = aIter.GetFirst();
-+                    while ( pCell )
-+                    {
-+                        if ( HasCellStringData( pCell ) )
-+                        {
-+                            String aStr;
-+                            GetCellPhoneticString( aStr, pCell );
-+                            aPhoneticText += aStr;
-+                        }
-+                        pCell = aIter.GetNext();
-+                    }
-+                }
-+                break;
-+                default:
-+                    PushError(errIllegalParameter);
-+                    return;
-+            }
-+        }
-+        PushString( aPhoneticText );
-+    }
-+}
-+
-+// ============================================================================
-+
- void ScInterpreter::ScGetPivotData()
- {
-     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScGetPivotData" );
-diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
-index ccc2b01..baa5152 100644
---- sc/source/core/tool/interpr4.cxx
-+++ sc/source/core/tool/interpr4.cxx
-@@ -360,6 +360,189 @@ void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
-     SetError(nErr);
- }
- 
-+static sal_Bool lcl_IsHalfWidthKatakana ( const String& rString )
-+{
-+    sal_Int32 nLen = rString.Len();
-+
-+    for ( sal_Int32 i = 0; i < nLen; ++i )
-+    {
-+        if ( rString.GetChar(i) < 0xFF00 || rString.GetChar(i) > 0xFFEF )
-+            return sal_False;
-+    }
-+
-+    return sal_True;
-+}
-+
-+static sal_Bool lcl_IsFullWidthKatakana ( const String& rString )
-+{
-+    sal_Int32 nLen = rString.Len();
-+
-+    for ( sal_Int32 i = 0; i < nLen; ++i )
-+    {
-+        if ( rString.GetChar(i) < 0x30A0 || rString.GetChar(i) > 0x30FF )
-+            return sal_False;
-+    }
-+
-+    return sal_True;
-+}
-+
-+static sal_Bool lcl_IsFullWidthHiragana ( const String& rString )
-+{
-+    sal_Int32 nLen = rString.Len();
-+
-+    for ( sal_Int32 i = 0; i < nLen; ++i )
-+    {
-+        if ( rString.GetChar(i) < 0x3040 || rString.GetChar(i) > 0x309F )
-+            return sal_False;
-+    }
-+
-+    return sal_True;
-+}
-+
-+static sal_uInt16 lcl_GetKanaType ( const String rText )
-+{
-+    sal_uInt16 aKanaType = 0;
-+
-+    if ( lcl_IsHalfWidthKatakana ( rText ) )
-+        aKanaType = 0x00;
-+    else if ( lcl_IsFullWidthKatakana ( rText ) )
-+        aKanaType = 0x01;
-+    else if ( lcl_IsFullWidthHiragana ( rText ) )
-+        aKanaType = 0x02;
-+
-+    return aKanaType;
-+}
-+
-+static void lcl_ConvertToKatakana( ScDocument* pDoc, String& rStr )
-+{
-+    sal_uInt16 nKanaType = lcl_GetKanaType(rStr);
-+    sal_Int32 nType = com::sun::star::i18n::TransliterationModules_HIRAGANA_KATAKANA;
-+    switch (nKanaType)
-+    {
-+        case 0x00:
-+            // half-width katakana or full-width alphabet.
-+            nType = com::sun::star::i18n::TransliterationModules_HALFWIDTH_FULLWIDTH;
-+        break;
-+        case 0x02:
-+            // full-width hiragana.
-+            nType = com::sun::star::i18n::TransliterationModules_HIRAGANA_KATAKANA;
-+        break;
-+        case 0x01:
-+        default:
-+            // full-width katakana.  no need to convert this.
-+            return;
-+    }
-+    utl::TransliterationWrapper aTranslitarationWrapper( pDoc->GetServiceManager(), nType );
-+    com::sun::star::uno::Sequence<sal_Int32> aOffsets;
-+    rStr = aTranslitarationWrapper.transliterate( rStr, LANGUAGE_JAPANESE, 0, rStr.Len(), &aOffsets );
-+}
-+
-+static void lcl_GetPhoneticString ( ScDocument *pDoc, String& rStr, const ScBaseCell* pCell )
-+{
-+    ScPhonetic aPhonetic;
-+    String aBaseString;
-+    switch (pCell->GetCellType())
-+    {
-+        case CELLTYPE_STRING:
-+            static_cast<const ScStringCell*>(pCell)->GetString(aBaseString);
-+            static_cast<const ScAsianStringCell*>(pCell)->GetPhonetic(aPhonetic);
-+        break;
-+        case CELLTYPE_EDIT:
-+            static_cast<const ScEditCell*>(pCell)->GetString(aBaseString);
-+            static_cast<const ScAsianEditCell*>(pCell)->GetPhonetic(aPhonetic);
-+        break;
-+        default:
-+            // Not a supported cell type.
-+            return;
-+    }
-+    
-+    if (aPhonetic.IsEmpty())
-+        // No phonetic string exists.  Bail out.
-+        return;
-+
-+    const String& rPhoneticString = aPhonetic.GetString();
-+    PhoneticPortionVec portions = aPhonetic.GetPortions();
-+    sal_uInt16 nPortionCount = portions.size();
-+
-+    String tmpString;
-+    if ( nPortionCount > 0 )
-+    {
-+        sal_uInt16 pos = 0;
-+        for ( sal_uInt16 idx = 0; idx < nPortionCount; ++idx )
-+        {
-+            const PhoneticPortion& portion = portions[idx];
-+
-+            // Get the end position in the phonetic text.
-+            sal_uInt16 nPhEndPos = idx < nPortionCount-1 ? portions[idx+1].mncpa : rPhoneticString.Len();
-+
-+            tmpString += aBaseString.Copy(pos, portion.mncpm - pos);
-+            pos = portion.mncpm + portion.mnccm;
-+            tmpString += rPhoneticString.Copy(portion.mncpa, nPhEndPos - portion.mncpa);
-+        }
-+        if ( pos < aBaseString.Len() )
-+            tmpString += aBaseString.Copy(pos, aBaseString.Len() - pos);
-+    }
-+    else
-+    {
-+        tmpString = rPhoneticString;
-+    }
-+
-+    sal_Int32 nType;
-+    switch ( lcl_GetKanaType ( rPhoneticString ))
-+    {
-+        case 0x00:
-+            nType = com::sun::star::i18n::TransliterationModules_FULLWIDTH_HALFWIDTH;
-+            break;
-+        case 0x01:
-+            nType = com::sun::star::i18n::TransliterationModules_HIRAGANA_KATAKANA;
-+            break;
-+        case 0x02:
-+            nType = com::sun::star::i18n::TransliterationModules_KATAKANA_HIRAGANA;
-+            break;
-+        default:
-+            nType = com::sun::star::i18n::TransliterationModules_HIRAGANA_KATAKANA;
-+            break;
-+    }
-+
-+    utl::TransliterationWrapper aTranslitarationWrapper( pDoc->GetServiceManager(), nType );
-+    com::sun::star::uno::Sequence<sal_Int32> aOffsets;
-+    rStr = aTranslitarationWrapper.transliterate( tmpString, LANGUAGE_JAPANESE, 0, tmpString.Len(), &aOffsets );
-+}
-+
-+void ScInterpreter::GetCellPhoneticString( String& rStr, const ScBaseCell* pCell )
-+{
-+    USHORT nErr = 0;
-+    if ( pCell )
-+    {
-+        switch ( pCell->GetCellType() )
-+        {
-+            case CELLTYPE_STRING:
-+                if ( static_cast<const ScStringCell*>(pCell)->HasPhonetic() )
-+                    lcl_GetPhoneticString(pDok, rStr, pCell);
-+                else
-+                {    
-+                    static_cast<const ScStringCell*>(pCell)->GetString(rStr);
-+                    lcl_ConvertToKatakana(pDok, rStr);
-+                }
-+            break;
-+            case CELLTYPE_EDIT:
-+                if ( static_cast<const ScEditCell*>(pCell)->HasPhonetic() )
-+                    lcl_GetPhoneticString(pDok, rStr, pCell);
-+                else
-+                {    
-+                    static_cast<const ScEditCell*>(pCell)->GetString(rStr);
-+                    lcl_ConvertToKatakana(pDok, rStr);
-+                }
-+            break;
-+            default:
-+                rStr = ScGlobal::GetEmptyString();
-+            break;
-+        }
-+    }
-+    else
-+        rStr = ScGlobal::GetEmptyString();
-+    SetError(nErr);
-+}
- 
- BOOL ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
-                             SCCOL nCol2, SCROW nRow2, SCTAB nTab2, BYTE* pCellArr)
-@@ -3864,6 +4047,7 @@ StackVar ScInterpreter::Interpret()
-                 case ocInfo             : ScInfo();                     break;
-                 case ocHyperLink        : ScHyperLink();                break;
-                 case ocBahtText         : ScBahtText();                 break;
-+                case ocPhonetic         : ScPhoneticString();           break;
-                 case ocGetPivotData     : ScGetPivotData();             break;
-                 case ocJis              : ScJis();                      break;
-                 case ocAsc              : ScAsc();                      break;
-diff --git sc/source/filter/excel/xehelper.cxx sc/source/filter/excel/xehelper.cxx
-index 54043ce..7dbe4b8 100644
---- sc/source/filter/excel/xehelper.cxx
-+++ sc/source/filter/excel/xehelper.cxx
-@@ -600,7 +600,16 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
- {
-     String aCellText;
-     rStringCell.GetString( aCellText );
--    return lclCreateFormattedString( rRoot, aCellText, pCellAttr, nFlags, nMaxLen );
-+    XclExpStringRef xString = lclCreateFormattedString( rRoot, aCellText, pCellAttr, nFlags, nMaxLen );
-+    if (rStringCell.HasPhonetic())
-+    {
-+        ScPhonetic aPhonetic;
-+        static_cast<const ScAsianStringCell&>(rStringCell).GetPhonetic(aPhonetic);
-+        if ( !aPhonetic.IsEmpty() )
-+            xString->SetPhoneticSettings(aPhonetic);
-+    }
-+
-+    return xString;
- }
- 
- XclExpStringRef XclExpStringHelper::CreateCellString(
-@@ -631,6 +640,15 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
-         rEditCell.GetString( aCellText );
-         xString = lclCreateFormattedString( rRoot, aCellText, pCellAttr, nFlags, nMaxLen );
-     }
-+
-+    if (rEditCell.HasPhonetic())
-+    {
-+        ScPhonetic aPhonetic;
-+        static_cast<const ScAsianEditCell&>(rEditCell).GetPhonetic(aPhonetic);
-+        if ( !aPhonetic.IsEmpty() )
-+            xString->SetPhoneticSettings(aPhonetic);
-+    }
-+
-     return xString;
- }
- 
-diff --git sc/source/filter/excel/xestring.cxx sc/source/filter/excel/xestring.cxx
-index c210911..afcd334 100644
---- sc/source/filter/excel/xestring.cxx
-+++ sc/source/filter/excel/xestring.cxx
-@@ -296,7 +296,8 @@ bool XclExpString::IsEqual( const XclExpString& rCmp ) const
-             ( mbIsBiff8 && (maUniBuffer  == rCmp.maUniBuffer)) ||
-             (!mbIsBiff8 && (maCharBuffer == rCmp.maCharBuffer))
-         ) &&
--        (maFormats      == rCmp.maFormats);
-+        (maFormats   == rCmp.maFormats)      &&
-+        (maPhonetic  == rCmp.maPhonetic);
- }
- 
- bool XclExpString::IsLessThan( const XclExpString& rCmp ) const
-@@ -307,6 +308,18 @@ bool XclExpString::IsLessThan( const XclExpString& rCmp ) const
-     return (nResult != 0) ? (nResult < 0) : (maFormats < rCmp.maFormats);
- }
- 
-+bool XclExpString::HasPhonetic() const
-+{
-+    return !maPhonetic.IsEmpty();
-+}
-+
-+// formatting runs ------------------------------------------------------------
-+
-+void XclExpString::SetPhoneticSettings( const ScPhonetic& rPhonetic )
-+{
-+    maPhonetic = rPhonetic;
-+}
-+
- // get data -------------------------------------------------------------------
- 
- sal_uInt16 XclExpString::GetFormatsCount() const
-@@ -314,17 +327,25 @@ sal_uInt16 XclExpString::GetFormatsCount() const
-     return static_cast< sal_uInt16 >( maFormats.size() );
- }
- 
-+sal_uInt32 XclExpString::GetPhoneticSettingsCount() const
-+{
-+    return maPhonetic.GetSize();
-+}
-+
- sal_uInt8 XclExpString::GetFlagField() const
- {
--    return (mbIsUnicode ? EXC_STRF_16BIT : 0) | (IsWriteFormats() ? EXC_STRF_RICH : 0);
-+    return (mbIsUnicode ? EXC_STRF_16BIT : 0) |
-+           (IsWritePhoneticSettings() ? EXC_STRF_FAREAST : 0 ) |
-+           (IsWriteFormats() ? EXC_STRF_RICH : 0);
- }
- 
- sal_uInt16 XclExpString::GetHeaderSize() const
- {
-     return
--        (mb8BitLen ? 1 : 2) +           // length field
--        (IsWriteFlags() ? 1 : 0) +      // flag field
--        (IsWriteFormats() ? 2 : 0);     // richtext formattting count
-+        (mb8BitLen ? 1 : 2) +                   // length field
-+        (IsWriteFlags() ? 1 : 0) +              // flag field
-+        (IsWriteFormats() ? 2 : 0) +            // richtext formattting count
-+        (IsWritePhoneticSettings() ? 4 : 0);    // phonetic settings  count
- }
- 
- sal_Size XclExpString::GetBufferSize() const
-@@ -335,9 +356,10 @@ sal_Size XclExpString::GetBufferSize() const
- sal_Size XclExpString::GetSize() const
- {
-     return
--        GetHeaderSize() +                                   // header
--        GetBufferSize() +                                   // character buffer
--        (IsWriteFormats() ? (4 * GetFormatsCount()) : 0);   // richtext formattting
-+        GetHeaderSize() +                                              // header
-+        GetBufferSize() +                                              // character buffer
-+        (IsWriteFormats() ? (4 * GetFormatsCount()) : 0) +             // richtext formattting
-+        (IsWritePhoneticSettings() ? GetPhoneticSettingsCount() : 0);  // phonetic settings
- }
- 
- sal_uInt16 XclExpString::GetChar( sal_uInt16 nCharIdx ) const
-@@ -385,6 +407,10 @@ void XclExpString::WriteHeader( XclExpStream& rStrm ) const
-     // format run count
-     if( IsWriteFormats() )
-         rStrm << GetFormatsCount();
-+    // format phonetic settings
-+    if( IsWritePhoneticSettings() )
-+        rStrm << GetPhoneticSettingsCount();
-+
-     rStrm.SetSliceSize( 0 );
- }
- 
-@@ -421,6 +447,46 @@ void XclExpString::WriteFormats( XclExpStream& rStrm, bool bWriteSize ) const
-     }
- }
- 
-+void XclExpString::WritePhoneticSettings( XclExpStream& rStrm ) const
-+{
-+    if( HasPhonetic() )
-+    {
-+        sal_uInt16 nLen = maPhonetic.GetString().Len();
-+        sal_uInt16 nPortions = maPhonetic.GetPortions().size();
-+        rStrm << static_cast< sal_uInt16 > ( 1 );
-+        rStrm << static_cast< sal_uInt16 > ( 10 + 2 * nLen + 6 * nPortions );
-+        rStrm << static_cast< sal_uInt16 > ( maPhonetic.GetFontIndex() );
-+        rStrm << static_cast< sal_uInt16 > ( maPhonetic.GetAdditionalSettings() );
-+        rStrm << static_cast< sal_uInt16 > ( nPortions );
-+        rStrm << static_cast< sal_uInt16 > ( nLen );
-+        rStrm << static_cast< sal_uInt16 > ( maPhonetic.GetRepeatedTotalLength() );
-+
-+        if ( nLen > 0 )
-+        {
-+            ScfUInt16Vec buffer ( nLen );
-+            ScfUInt16Vec::iterator aBeg = buffer.begin();
-+            ScfUInt16Vec::iterator aEnd = aBeg + nLen;
-+            const sal_Unicode* pcSrcChar = maPhonetic.GetString().GetBuffer();
-+            for( ScfUInt16Vec::iterator aIt = aBeg; aIt != aEnd; ++aIt, ++pcSrcChar )
-+            {
-+                *aIt = static_cast< sal_uInt16 >( *pcSrcChar );
-+            }
-+            rStrm.WriteUnicodeBuffer( buffer, EXC_STRF_16BIT);
-+        }
-+        else
-+        {
-+            rStrm << static_cast< sal_uInt16 > ( 0 );
-+        }
-+
-+        PhoneticPortionVec portions = maPhonetic.GetPortions();
-+        for ( sal_uInt16 idx = 0; idx < nPortions; ++idx)
-+        {
-+            PhoneticPortion portion = portions[idx];
-+            rStrm << portion.mncpa << portion.mncpm << portion.mnccm;
-+        }
-+    }
-+}
-+
- void XclExpString::Write( XclExpStream& rStrm ) const
- {
-     if (!mbSkipHeader)
-@@ -428,6 +494,8 @@ void XclExpString::Write( XclExpStream& rStrm ) const
-     WriteBuffer( rStrm );
-     if( IsWriteFormats() )      // only in BIFF8 included in string
-         WriteFormats( rStrm );
-+    if( IsWritePhoneticSettings() )
-+        WritePhoneticSettings( rStrm );
- }
- 
- void XclExpString::WriteHeaderToMem( sal_uInt8* pnMem ) const
-@@ -545,6 +613,11 @@ bool XclExpString::IsWriteFormats() const
-     return mbIsBiff8 && !mbSkipFormats && IsRich();
- }
- 
-+bool XclExpString::IsWritePhoneticSettings() const
-+{
-+    return mbIsBiff8 && !mbSkipFormats && HasPhonetic();
-+}
-+
- void XclExpString::SetStrLen( sal_Int32 nNewLen )
- {
-     sal_uInt16 nAllowedLen = (mb8BitLen && (mnMaxLen > 255)) ? 255 : mnMaxLen;
-diff --git sc/source/filter/excel/xihelper.cxx sc/source/filter/excel/xihelper.cxx
-index 1a38697..0e44ba6 100644
---- sc/source/filter/excel/xihelper.cxx
-+++ sc/source/filter/excel/xihelper.cxx
-@@ -271,10 +271,20 @@ ScBaseCell* XclImpStringHelper::CreateCell(
-         ScDocument& rDoc = rRoot.GetDoc();
- 
-         if( pTextObj.get() )
--            // ScEditCell creates own copy of text object
--            pCell = new ScEditCell( pTextObj.get(), &rDoc, rRoot.GetEditEngine().GetEditTextObjectPool() );
-+        {
-+            if ( rString.HasPhonetic() )
-+                pCell = new ScAsianEditCell( pTextObj.get(), &rDoc, rRoot.GetEditEngine().GetEditTextObjectPool(), rString.GetPhonetic() );
-+            else
-+                // ScEditCell creates own copy of text object
-+                pCell = new ScEditCell( pTextObj.get(), &rDoc, rRoot.GetEditEngine().GetEditTextObjectPool() );
-+        }
-         else
--            pCell = ScBaseCell::CreateTextCell( rString.GetText(), &rDoc );
-+        {
-+            if ( rString.HasPhonetic() )
-+                pCell = new ScAsianStringCell( rString.GetText(), rString.GetPhonetic() );
-+            else
-+                pCell = ScBaseCell::CreateTextCell( rString.GetText(), &rDoc );
-+        }
-     }
- 
-     return pCell;
-diff --git sc/source/filter/excel/xistring.cxx sc/source/filter/excel/xistring.cxx
-index d6e0b31..45834b1 100644
---- sc/source/filter/excel/xistring.cxx
-+++ sc/source/filter/excel/xistring.cxx
-@@ -94,7 +94,8 @@ void XclImpString::Read( XclImpStream& rStrm, XclStrFlags nFlags )
-                 ReadFormats( rStrm, nRunCount );
- 
-             // --- extended (FarEast) information ---
--            rStrm.Ignore( nExtInf );
-+            if( nExtInf > 0 )
-+                ReadPhoneticSettings( rStrm, nExtInf );
-         }
-         break;
- 
-@@ -161,6 +162,31 @@ void XclImpString::ReadObjFormats( XclImpStream& rStrm, XclFormatRunVec& rFormat
-     }
- }
- 
-+void XclImpString::ReadPhoneticSettings( XclImpStream& rStrm, sal_uInt32 /*nExtInf*/ )
-+{
-+    PhoneticPortionVec xPortions;
-+
-+    rStrm.Ignore( 2 ); // Unknown indentifier 0001
-+
-+    sal_uInt16 nSize, nFontIdx, nAdditional, nPortions, nLength, nRepeatedLength;
-+    rStrm >> nSize >> nFontIdx >> nAdditional >> nPortions >> nLength >> nRepeatedLength;
-+
-+    if ( nLength == 0 )
-+        rStrm.Ignore( 2 );
-+    else
-+        maPhoneticString = rStrm.ReadRawUniString( nLength, true );
-+    
-+    for ( sal_uInt16 nIdx = 0; nIdx < nPortions; ++nIdx )
-+    {
-+        sal_uInt16 ncpa, ncpm, nccm;
-+        rStrm >> ncpa >> ncpm >> nccm;
-+        xPortions.push_back ( PhoneticPortion( ncpa, ncpm, nccm ) );
-+    }
-+
-+    maPhonetic = ScPhonetic ( nFontIdx, nAdditional, nRepeatedLength,
-+                              maPhoneticString, xPortions );
-+}
-+
- // String iterator ============================================================
- 
- XclImpStringIterator::XclImpStringIterator( const XclImpString& rString ) :
-diff --git sc/source/filter/excel/xlformula.cxx sc/source/filter/excel/xlformula.cxx
-index 7ca2f80..94b3951 100644
---- sc/source/filter/excel/xlformula.cxx
-+++ sc/source/filter/excel/xlformula.cxx
-@@ -327,12 +327,12 @@ static const XclFunctionInfo saFuncTable_5[] =
- 
- const sal_Char* const EXC_FUNCNAME_BAHTTEXT = EXC_FUNCNAME_PREFIX "BAHTTEXT";
- 
--/** Functions new in BIFF8. Unsupported functions: PHONETIC. */
-+/** Functions new in BIFF8. */
- static const XclFunctionInfo saFuncTable_8[] =
- {
-     { ocGetPivotData,       358,    2,  30, V, { V, R, V }, 0, 0 },
-     { ocHyperLink,          359,    1,  2,  V, { V }, 0, 0 },
--    { ocNoName,             360,    1,  1,  V, { R }, EXC_FUNCFLAG_IMPORTONLY, 0 },    // PHONETIC
-+    { ocPhonetic,           360,    1,  1,  V, { R }, 0, 0 },    // PHONETIC
-     { ocAverageA,           361,    1,  30, V, { R }, 0, 0 },
-     { ocMaxA,               362,    1,  30, V, { R }, 0, 0 },
-     { ocMinA,               363,    1,  30, V, { R }, 0, 0 },
-diff --git sc/source/filter/inc/xestring.hxx sc/source/filter/inc/xestring.hxx
-index 706b12c..8851736 100644
---- sc/source/filter/inc/xestring.hxx
-+++ sc/source/filter/inc/xestring.hxx
-@@ -32,11 +32,13 @@
- #define SC_XESTRING_HXX
- 
- #include "xlstring.hxx"
-+#include "phonetic.hxx"
- 
- // ============================================================================
- 
- class ScEditCell;
- class ScPatternAttr;
-+class ScPhonetic;
- class EditTextObject;
- class XclExpStream;
- class XclExpXmlStream;
-@@ -195,6 +197,12 @@ public:
-     /** Removes and returns the font index for the first char from the formatting runs, otherwise EXC_FONT_NOTFOUND. */
-     sal_uInt16          RemoveLeadingFont();
- 
-+    // phonetic settings --------------------------------------------------------
-+
-+    /** Sets new phonetic settings for the current text.
-+        @param rPhonetic a reference of ScPhonetic.*/
-+    void                SetPhoneticSettings( const ScPhonetic& rPhonetic );
-+
-     // get data ---------------------------------------------------------------
- 
-     /** Returns the character count of the string. */
-@@ -215,6 +223,11 @@ public:
-     /** Returns the vector with all formatting runs. */
-     inline const XclFormatRunVec& GetFormats() const { return maFormats; }
- 
-+    /** Returns the current count of phonetic settings */
-+    sal_uInt32          GetPhoneticSettingsCount() const;
-+    /** Returns true, if the string contains phonetic information. */
-+    inline bool         HasPhonetic() const;
-+
-     /** Returns the current string flags field to export. */
-     sal_uInt8           GetFlagField() const;
-     /** Returns the byte count the header will take on export. */
-@@ -243,6 +256,8 @@ public:
-     void                WriteBuffer( XclExpStream& rStrm ) const;
-     /** Writes the raw formatting run buffer. */
-     void                WriteFormats( XclExpStream& rStrm, bool bWriteSize = false ) const;
-+    /** Writes the raw phonetic settings. */
-+    void                WritePhoneticSettings( XclExpStream& rStrm ) const;
-     /** Writes the complete Unicode string. */
-     void                Write( XclExpStream& rStrm ) const;
- 
-@@ -261,6 +276,8 @@ private:
-     bool                IsWriteFlags() const;
-     /** Returns true, if the formatting run vector should be written. */
-     bool                IsWriteFormats() const;
-+    /** Returns true, if phonetic settings of the text should be written. */
-+    bool                IsWritePhoneticSettings() const;
- 
-     /** Sets the string length but regards the limit given in mnMaxLen. */
-     void                SetStrLen( sal_Int32 nNewLen );
-@@ -315,6 +332,7 @@ private:
-     ScfUInt16Vec        maUniBuffer;    /// The Unicode character buffer.
-     ScfUInt8Vec         maCharBuffer;   /// The byte character buffer.
-     XclFormatRunVec     maFormats;      /// All formatting runs.
-+    ScPhonetic          maPhonetic;
-     sal_uInt16          mnLen;          /// Character count to export.
-     sal_uInt16          mnMaxLen;       /// Maximum allowed number of characters.
-     bool                mbIsBiff8;      /// true = BIFF8 Unicode string, false = BIFF2-7 bytestring.
-diff --git sc/source/filter/inc/xistring.hxx sc/source/filter/inc/xistring.hxx
-index 66bc885..a46564f 100644
---- sc/source/filter/inc/xistring.hxx
-+++ sc/source/filter/inc/xistring.hxx
-@@ -32,6 +32,7 @@
- #define SC_XISTRING_HXX
- 
- #include "xlstring.hxx"
-+#include "phonetic.hxx"
- 
- // Byte/Unicode strings =======================================================
- 
-@@ -83,9 +84,19 @@ public:
-     /** Reads and appends formatting runs from an OBJ or TXO record. */
-     static void         ReadObjFormats( XclImpStream& rStrm, XclFormatRunVec& rFormats, sal_uInt16 nFormatSize );
- 
-+    /** Returns true, if the string has phonetic information. */
-+    inline bool         HasPhonetic() const { return !maPhonetic.IsEmpty(); }
-+    /** Returns the text for phonetic information. */
-+    inline const ScPhonetic& GetPhonetic() const { return maPhonetic; }
-+
-+    /** Reads phonetic settings from stream. */
-+    void                ReadPhoneticSettings( XclImpStream& rStrm, sal_uInt32 nExtInf );
-+
- private:
-     String              maString;       /// The text data of the string.
-     XclFormatRunVec     maFormats;      /// All formatting runs.
-+    String              maPhoneticString;
-+    ScPhonetic          maPhonetic;
- };
- 
- // String iterator ============================================================
-diff --git sc/source/filter/inc/xlstring.hxx sc/source/filter/inc/xlstring.hxx
-index 0a078a4..89f8275 100644
---- sc/source/filter/inc/xlstring.hxx
-+++ sc/source/filter/inc/xlstring.hxx
-@@ -94,7 +94,68 @@ inline bool operator<( const XclFormatRun& rLeft, const XclFormatRun& rRight )
- /** A vector with all formatting runs for a rich-string. */
- typedef ::std::vector< XclFormatRun > XclFormatRunVec;
- 
--// ============================================================================
-+// Phonetic settings for Asian text ===========================================
-+
-+struct XclPhoneticPortion
-+{
-+    sal_uInt16          mncpa;
-+    sal_uInt16          mncpm;
-+    sal_uInt16          mnccm;
-+    explicit inline     XclPhoneticPortion() : mncpa( 0 ), mncpm( 0 ), mnccm( 0 ) {}
-+    explicit inline     XclPhoneticPortion( sal_uInt16 ncpa, sal_uInt16 ncpm, sal_uInt16 nccm ) :
-+                            mncpa( ncpa ), mncpm( ncpm ), mnccm ( nccm ) {}
-+};
-+
-+inline bool operator==( const XclPhoneticPortion& rLeft, const XclPhoneticPortion& rRight )
-+{
-+    return
-+        ( rLeft.mncpa == rRight.mncpa ) &&
-+        ( rLeft.mncpm == rRight.mncpm ) &&
-+        ( rLeft.mnccm == rRight.mnccm );
-+}
-+
-+typedef ::std::vector< XclPhoneticPortion > XclPhoneticPortionVec;
-+
-+class XclPhoneticSettings
-+{
-+public:
-+    explicit inline     XclPhoneticSettings() : mnFontIdx( 0 ), mnAdditionalSettings( 0 ), mnRepeatedTotalLength ( 0 ) {}
-+    explicit inline     XclPhoneticSettings( sal_uInt16 nFontIdx, sal_uInt16 nAdditionalSettings,
-+                                             sal_uInt16 nRepeatedTotalLength, const String& rPhoneticString,
-+                                             const XclPhoneticPortionVec& rPhoneticPortions) : 
-+                                             mnFontIdx( nFontIdx ), mnAdditionalSettings( nAdditionalSettings ),
-+                                             mnRepeatedTotalLength ( nRepeatedTotalLength ),
-+                                             maPhoneticString ( rPhoneticString ), maPhoneticPortions ( rPhoneticPortions ) {}
-+
-+    /** Returns the text for phonetic information. */
-+    inline const String& GetString() const { return maPhoneticString; }
-+    /** Returns the portion for phonetic information. */
-+    inline const XclPhoneticPortionVec& GetPortions() const { return maPhoneticPortions; }
-+    /** Returns font index of phonetic information. */
-+    inline sal_uInt16 GetFontIndex() const { return mnFontIdx; }
-+    /** Returns additional settings of phonetic information. */
-+    inline sal_uInt16 GetAdditionalSettings() const { return mnAdditionalSettings; }
-+    /** Returns repeated length of phonetic information. */
-+    inline sal_uInt16 GetRepeatedTotalLength() const { return mnRepeatedTotalLength; }
-+    /** Returns the size of phonetic information. */
-+    inline sal_uInt32 GetSize() const { return 14 + ( maPhoneticString.Len() ? maPhoneticString.Len() * 2 : 2 ) + maPhoneticPortions.size() * 6; }
-+
-+private:
-+    sal_uInt16            mnFontIdx;          /// Index to FONT record
-+    sal_uInt16            mnAdditionalSettings; /// Additional settings for the Asian phonetic text
-+    sal_uInt16            mnRepeatedTotalLength;
-+    String                maPhoneticString;
-+    XclPhoneticPortionVec maPhoneticPortions;
-+};
-+inline bool operator==( const XclPhoneticSettings& rLeft, const XclPhoneticSettings& rRight )
-+{
-+    return 
-+        ( rLeft.GetString() == rRight.GetString() )                         &&
-+        ( rLeft.GetPortions() == rRight.GetPortions() )                     && 
-+        ( rLeft.GetFontIndex() == rRight.GetFontIndex() )                   && 
-+        ( rLeft.GetAdditionalSettings() == rRight.GetAdditionalSettings() ) && 
-+        ( rLeft.GetRepeatedTotalLength() == rRight.GetRepeatedTotalLength() );
-+}
- 
- #endif
- 
-diff --git sc/source/filter/xml/XMLExportIterator.cxx sc/source/filter/xml/XMLExportIterator.cxx
-index 8a7e52b..29a2e2c 100644
---- sc/source/filter/xml/XMLExportIterator.cxx
-+++ sc/source/filter/xml/XMLExportIterator.cxx
-@@ -584,7 +584,8 @@ ScMyCell::ScMyCell() :
- 	bHasXText( sal_False ),
- 	bIsMatrixBase( sal_False ),
- 	bIsMatrixCovered( sal_False ),
--	bHasAnnotation( sal_False )
-+    bHasAnnotation( sal_False ),
-+    bHasPhonetic( sal_False )
- {
- }
- 
-diff --git sc/source/filter/xml/XMLExportIterator.hxx sc/source/filter/xml/XMLExportIterator.hxx
-index 0b0d51c..9d1834c 100644
---- sc/source/filter/xml/XMLExportIterator.hxx
-+++ sc/source/filter/xml/XMLExportIterator.hxx
-@@ -301,6 +301,7 @@ struct ScMyCell
- 
- 	rtl::OUString				sStringValue;
- 	rtl::OUString				sAnnotationText;
-+    rtl::OUString               sPhoneticText;
- 
- 	ScMyAreaLink				aAreaLink;
- 	ScMyShapeList				aShapeList;
-@@ -334,6 +335,7 @@ struct ScMyCell
- 	sal_Bool					bIsMatrixBase;
- 	sal_Bool					bIsMatrixCovered;
- 	sal_Bool					bHasAnnotation;
-+    sal_Bool                    bHasPhonetic;
- 
- 								ScMyCell();
- 								~ScMyCell();
-diff --git sc/source/filter/xml/XMLTextPContext.cxx sc/source/filter/xml/XMLTextPContext.cxx
-index c4464b3..40f5e0b 100644
---- sc/source/filter/xml/XMLTextPContext.cxx
-+++ sc/source/filter/xml/XMLTextPContext.cxx
-@@ -37,6 +37,7 @@
- #include "XMLTextPContext.hxx"
- #include "xmlimprt.hxx"
- #include "xmlcelli.hxx"
-+#include "xmlrubyi.hxx"
- #include <xmloff/xmlnmspe.hxx>
- #include <xmloff/xmltoken.hxx>
- #include <xmloff/nmspmap.hxx>
-@@ -137,52 +138,61 @@ SvXMLImportContext *ScXMLTextPContext::CreateChildContext( USHORT nTempPrefix,
- 									  	::com::sun::star::xml::sax::XAttributeList>& xTempAttrList )
- {
- 	SvXMLImportContext *pContext(NULL);
--	if (!pTextPContext &&
--		(nTempPrefix == XML_NAMESPACE_TEXT) &&
--		IsXMLToken(rLName, XML_S))
--		pContext = new ScXMLTextTContext( GetScImport(), nTempPrefix, rLName, xTempAttrList, this);
--	else
-+
-+    if ( !pTextPContext )
- 	{
--		if (!pTextPContext)
-+        const SvXMLTokenMap& rTokenMap = GetScImport().GetTableRowCellElemTextTokenMap();
-+        switch( rTokenMap.Get( nTempPrefix, rLName ) )
- 		{
--            rtl::OUString sSetString;
--            if ( pContentBuffer )
--                sSetString = pContentBuffer->makeStringAndClear();
--            else
--                sSetString = sSimpleContent;
--
--            sal_Unicode cNonSpace(0);
--            
--            sal_Int32 nLength = sSetString.getLength();
--            if ( nLength > 0 )
-+        case XML_TOK_TABLE_ROW_CELL_TEXT_S:
-+            pContext = new ScXMLTextTContext( GetScImport(), nTempPrefix, rLName, xTempAttrList, this);
-+            break;
-+        case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY:
-+            pContext = new ScXMLRubyContext( GetScImport(), nTempPrefix, rLName, xTempAttrList, this );
-+            break;
-+        default:
-             {
--                sal_Unicode cLast = sSetString.getStr()[ nLength - 1 ];
--                if ( cLast != (sal_Unicode)' ' )
-+                rtl::OUString sSetString;
-+                if ( pContentBuffer )
-+                    sSetString = pContentBuffer->makeStringAndClear();
-+                else
-+                    sSetString = sSimpleContent;
-+
-+                sal_Unicode cNonSpace(0);
-+
-+                sal_Int32 nLength = sSetString.getLength();
-+                if ( nLength > 0 )
-                 {
--                    // #i53253# To keep XMLParaContext's whitespace handling in sync,
--                    // if there's a non-space character at the end of the existing string,
--                    // it has to be processed by XMLParaContext.
-+                    sal_Unicode cLast = sSetString.getStr()[ nLength - 1 ];
-+                    if ( cLast != (sal_Unicode)' ' )
-+                    {
-+                        // #i53253# To keep XMLParaContext's whitespace handling in sync,
-+                        // if there's a non-space character at the end of the existing string,
-+                        // it has to be processed by XMLParaContext.
- 
--                    cNonSpace = cLast;
--                    sSetString = sSetString.copy( 0, nLength - 1 );  // remove from the string for SetCursorOnTextImport
-+                        cNonSpace = cLast;
-+                        sSetString = sSetString.copy( 0, nLength - 1 );  // remove from the string for SetCursorOnTextImport
-+                    }
-                 }
--            }
- 
--            pCellContext->SetCursorOnTextImport( sSetString );
-+                pCellContext->SetCursorOnTextImport( sSetString );
- 
--			pTextPContext = GetScImport().GetTextImport()->CreateTextChildContext(
--									GetScImport(), nPrefix, sLName, xAttrList);
-+                pTextPContext = GetScImport().GetTextImport()->CreateTextChildContext(
-+                        GetScImport(), nPrefix, sLName, xAttrList);
- 
--            if ( cNonSpace != 0 )
--            {
--                // pass non-space character through XMLParaContext, so a following space isn't ignored
--                pTextPContext->Characters( rtl::OUString( cNonSpace ) );
-+                if ( cNonSpace != 0 )
-+                {
-+                    // pass non-space character through XMLParaContext, so a following space isn't ignored
-+                    pTextPContext->Characters( rtl::OUString( cNonSpace ) );
-+                }
-             }
-+            break;
- 		}
--		if (pTextPContext)
--			pContext = pTextPContext->CreateChildContext(nTempPrefix, rLName, xTempAttrList);
- 	}
- 
-+    if ( pTextPContext )
-+        pContext = pTextPContext->CreateChildContext(nTempPrefix, rLName, xTempAttrList);
-+
- 	if( !pContext )
- 		pContext = new SvXMLImportContext( GetScImport(), nTempPrefix, rLName );
- 
-@@ -223,5 +233,38 @@ void ScXMLTextPContext::EndElement()
- 		pTextPContext->EndElement();
- 		GetScImport().SetRemoveLastChar(sal_True);
- 	}
-+    if ( sOURubyText )
-+        pCellContext->SetPhoneticText( sOURubyText.makeStringAndClear() );
-+}
-+
-+void ScXMLTextPContext::GetContent( rtl::OUString& rContent )
-+{
-+    if (!pTextPContext)
-+    {
-+        if ( pContentBuffer )
-+        {
-+            rtl::OUStringBuffer tmpBuffer( *pContentBuffer );
-+            rContent = tmpBuffer.makeStringAndClear();
-+        }
-+        else
-+        {
-+            rContent = sSimpleContent;
-+        }
-+    }
-+}
-+
-+void ScXMLTextPContext::AddRubyText( const ::rtl::OUString &rBaseText, const ::rtl::OUString& rRubyText )
-+{
-+    rtl::OUString aContent;
-+    GetContent( aContent );
-+
-+    sal_uInt16 startIdx = aContent.getLength();
-+    sal_uInt16 endIdx = rBaseText.getLength();
-+
-+    PhoneticPortion portion( sOURubyText.getLength(), startIdx, endIdx );
-+    sOURubyText.append( rRubyText );
-+    aPhoneticPortions.push_back( portion );
-+
-+    Characters ( rBaseText );
- }
- 
-diff --git sc/source/filter/xml/XMLTextPContext.hxx sc/source/filter/xml/XMLTextPContext.hxx
-index eb759e7..3235159 100644
---- sc/source/filter/xml/XMLTextPContext.hxx
-+++ sc/source/filter/xml/XMLTextPContext.hxx
-@@ -34,6 +34,8 @@
- #include <xmloff/xmlictxt.hxx>
- #include <rtl/ustrbuf.hxx>
- 
-+#include "phonetic.hxx"
-+
- class ScXMLImport;
- class ScXMLTableRowCellContext;
- 
-@@ -47,9 +49,12 @@ class ScXMLTextPContext : public SvXMLImportContext
-     rtl::OUStringBuffer*        pContentBuffer;     // used if there's more than one string
- 	USHORT						nPrefix;
- 	sal_Bool					bIsOwn;
-+    rtl::OUStringBuffer         sOURubyText;
-+    PhoneticPortionVec          aPhoneticPortions;
- 
- 	const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- 	ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-+    void GetContent( rtl::OUString& rContent );
- 
- public:
- 	ScXMLTextPContext( ScXMLImport& rImport, USHORT nPrfx,
-@@ -70,6 +75,14 @@ public:
- 	virtual void EndElement();
- 
- 	void AddSpaces(sal_Int32 nSpaceCount);
-+
-+    /**
-+     * Add phonetic and base text into cell. 
-+     *  
-+     * @param rBaseText the base string.
-+     * @param rRubyText the phonetic text.
-+     */
-+    void AddRubyText( const ::rtl::OUString& rBaseText, const ::rtl::OUString& rRubyText );
- };
- 
- #endif
-diff --git sc/source/filter/xml/makefile.mk sc/source/filter/xml/makefile.mk
-index 7c4006e..da2d12e 100644
---- sc/source/filter/xml/makefile.mk
-+++ sc/source/filter/xml/makefile.mk
-@@ -73,6 +73,7 @@ CXXFILES = \
- 		xmlannoi.cxx \
- 		xmlsceni.cxx \
- 		xmlcvali.cxx \
-+		xmlrubyi.cxx \
- 		XMLTableMasterPageExport.cxx \
- 		xmllabri.cxx \
- 		XMLTableHeaderFooterContext.cxx \
-@@ -123,6 +124,7 @@ SLOFILES =  \
- 		$(SLO)$/xmlannoi.obj \
- 		$(SLO)$/xmlsceni.obj \
- 		$(SLO)$/xmlcvali.obj \
-+		$(SLO)$/xmlrubyi.obj \
- 		$(SLO)$/XMLTableMasterPageExport.obj \
- 		$(SLO)$/xmllabri.obj \
- 		$(SLO)$/XMLTableHeaderFooterContext.obj \
-diff --git sc/source/filter/xml/xmlcelli.cxx sc/source/filter/xml/xmlcelli.cxx
-index 45ca0c3..0c08fd6 100644
---- sc/source/filter/xml/xmlcelli.cxx
-+++ sc/source/filter/xml/xmlcelli.cxx
-@@ -38,6 +38,7 @@
- #include "xmltabi.hxx"
- #include "xmlstyli.hxx"
- #include "xmlannoi.hxx"
-+#include "xmlrubyi.hxx"
- #include "global.hxx"
- #include "document.hxx"
- #include "cellsuno.hxx"
-@@ -447,6 +448,12 @@ SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( USHORT nPrefix
- 				rXMLImport, nPrefix, rLName, xAttrList, pCellRangeSource );
- 		}
- 		break;
-+    case XML_TOK_TABLE_ROW_CELL_RUBY:
-+        {
-+            bIsEmpty = sal_False;
-+            pContext = new ScXMLRubyContext( rXMLImport, nPrefix, rLName, xAttrList, this );
-+        }
-+        break;
- 	}
- 
- 	if (!pContext && !bTextP)
-@@ -726,6 +733,82 @@ bool lcl_IsEmptyOrNote( ScDocument* pDoc, const table::CellAddress& rCurrentPos
-     return ( !pCell || pCell->GetCellType() == CELLTYPE_NOTE );
- }
- 
-+static sal_Bool lcl_IsHalfWidthKatakana ( const ::rtl::OUString& rString )
-+{
-+    const sal_Unicode *pString = rString.getStr();
-+    sal_Int32 nLen = rString.getLength();
-+
-+    for ( sal_Int32 i = 0; i < nLen; ++i )
-+    {
-+        if ( pString[i] < 0xFF00 || pString[i] > 0xFFEF )
-+            return sal_False;
-+    }
-+
-+    return sal_True;
-+}
-+
-+static sal_Bool lcl_IsFullWidthKatakana ( const ::rtl::OUString& rString )
-+{
-+    const sal_Unicode *pString = rString.getStr();
-+    sal_Int32 nLen = rString.getLength();
-+
-+    for ( sal_Int32 i = 0; i < nLen; ++i )
-+    {
-+        if ( pString[i] < 0x30A0 || pString[i] > 0x30FF )
-+            return sal_False;
-+    }
-+
-+    return sal_True;
-+}
-+
-+static sal_Bool lcl_IsFullWidthHiragana ( const ::rtl::OUString& rString )
-+{
-+    const sal_Unicode *pString = rString.getStr();
-+    sal_Int32 nLen = rString.getLength();
-+
-+    for ( sal_Int32 i = 0; i < nLen; ++i )
-+    {
-+        if ( pString[i] < 0x3040 || pString[i] > 0x309F )
-+            return sal_False;
-+    }
-+
-+    return sal_True;
-+}
-+
-+static sal_uInt16 lcl_GetKanaType ( const ::boost::optional< ::rtl::OUString >& pText )
-+{
-+    sal_uInt16 aKanaType = 0;
-+
-+    if ( lcl_IsHalfWidthKatakana ( *pText ) )
-+        aKanaType = 0x00;
-+    else if ( lcl_IsFullWidthKatakana ( *pText ) )
-+        aKanaType = 0x01;
-+    else if ( lcl_IsFullWidthHiragana ( *pText ) )
-+        aKanaType = 0x02;
-+
-+    return aKanaType;
-+}
-+
-+static ScBaseCell* lcl_CreateTextCell ( const String& rString, ScDocument* pDoc, 
-+                                        const ::boost::optional< ::rtl::OUString >& pPhoneticText )
-+{
-+    ScBaseCell *pCell = 0;
-+
-+    if ( pPhoneticText && pPhoneticText->getLength() )
-+    {
-+        PhoneticPortionVec xPortions;
-+        sal_uInt16 aKanaType = lcl_GetKanaType ( pPhoneticText );
-+        ScPhonetic aPhonetic ( 0, 0x30 | aKanaType , 0, *pPhoneticText, xPortions );
-+        pCell = new ScAsianStringCell( rString, aPhonetic );
-+    }
-+    else
-+    {
-+        pCell = ScBaseCell::CreateTextCell( rString, pDoc );
-+    }
-+
-+    return pCell;
-+}
-+
- void ScXMLTableRowCellContext::EndElement()
- {
- 	if (!bHasSubTable)
-@@ -896,11 +979,11 @@ void ScXMLTableRowCellContext::EndElement()
-                                                 ScBaseCell* pNewCell = NULL;
-                                                 ScDocument* pDoc = rXMLImport.GetDocument();
-                                                 if (pOUTextValue && pOUTextValue->getLength())
--                                                    pNewCell = ScBaseCell::CreateTextCell( *pOUTextValue, pDoc );
-+                                                    pNewCell = lcl_CreateTextCell( *pOUTextValue, pDoc, pOUPhoneticText );
-                                                 else if (pOUTextContent && pOUTextContent->getLength())
--                                                    pNewCell = ScBaseCell::CreateTextCell( *pOUTextContent, pDoc );
-+                                                    pNewCell = lcl_CreateTextCell( *pOUTextContent, pDoc, pOUPhoneticText );
-                                                 else if ( i > 0 && pOUText && pOUText->getLength() )
--                                                    pNewCell = ScBaseCell::CreateTextCell( *pOUText, pDoc );
-+                                                    pNewCell = lcl_CreateTextCell( *pOUText, pDoc, pOUPhoneticText );
- 
-                                                 bDoIncrement = pNewCell != NULL;
-                                                 if ( bDoIncrement )
-@@ -987,6 +1070,18 @@ void ScXMLTableRowCellContext::EndElement()
- 					}
- 					else
- 					{
-+                        if ( pOUPhoneticText && pOUPhoneticText->getLength() )
-+                        {
-+                            ScAddress aScAddress;
-+                            ScDocument* pDoc = rXMLImport.GetDocument();
-+                            ScUnoConversion::FillScAddress( aScAddress, aCurrentPos );
-+                            ScBaseCell *pBaseCell = pDoc->GetCell( aScAddress );
-+                            PhoneticPortionVec xPortions;
-+                            sal_uInt16 aKanaType = lcl_GetKanaType ( pOUPhoneticText );
-+                            ScPhonetic aPhonetic ( 0, 0x30 | aKanaType , 0, *pOUPhoneticText, xPortions );
-+                            ScBaseCell *pNewCell = new ScAsianEditCell( (const ScEditCell&) *pBaseCell, *pDoc, aPhonetic );
-+                            pDoc->PutCell( aScAddress, pNewCell );
-+                        }
-                         // #i56027# If the child context put formatted text into the cell,
-                         // bIsEmpty is TRUE and ProgressBarIncrement has to be called
-                         // with bEditCell = TRUE.
-@@ -1091,3 +1186,9 @@ void ScXMLTableRowCellContext::EndElement()
- 	nMergedRows = 1;
- 	nCellsRepeated = 1;
- }
-+
-+void ScXMLTableRowCellContext::SetPhoneticText(const rtl::OUString& rOUPhoneticText)
-+{
-+    pOUPhoneticText.reset(rOUPhoneticText);
-+}
-+
-diff --git sc/source/filter/xml/xmlcelli.hxx sc/source/filter/xml/xmlcelli.hxx
-index 960a317..c643ba8 100644
---- sc/source/filter/xml/xmlcelli.hxx
-+++ sc/source/filter/xml/xmlcelli.hxx
-@@ -71,6 +71,7 @@ class ScXMLTableRowCellContext : public SvXMLImportContext
- 	::boost::optional< rtl::OUString > pOUTextValue;
- 	::boost::optional< rtl::OUString > pOUTextContent;
-     ::boost::optional< FormulaWithNamespace > pOUFormula;
-+	::boost::optional< rtl::OUString > pOUPhoneticText;
- 	rtl::OUString* pContentValidationName;
-     ::std::auto_ptr< ScXMLAnnotationData > mxAnnotationData;
- 	ScMyImpDetectiveObjVec*	pDetectiveObjVec;
-@@ -142,6 +143,13 @@ public:
- 	void SetCellRangeSource( const ::com::sun::star::table::CellAddress& rPosition );
- 
- 	virtual void EndElement();
-+
-+    /**
-+     * Set phonetic text. 
-+     *  
-+     * @param rOUPhoneticText the phonetic text
-+     */
-+    void SetPhoneticText(const rtl::OUString& rOUPhoneticText);
- };
- 
- #endif
-diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
-index d5088ae..cd2d911 100644
---- sc/source/filter/xml/xmlexprt.cxx
-+++ sc/source/filter/xml/xmlexprt.cxx
-@@ -2295,11 +2295,27 @@ sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) con
- //		{
-             rMyCell.sStringValue = ScCellObj::GetOutputString_Impl(pDoc, aPos);
- 			rMyCell.bHasStringValue = sal_True;
-+            rMyCell.sPhoneticText = ScCellObj::GetOutputPhoneticString_Impl(pDoc, aPos);
-+            rMyCell.bHasPhonetic = sal_True;
- 			return sal_True;
- //		}
- 	}
- }
- 
-+void ScXMLExport::WriteRubyText (ScMyCell& rMyCell)
-+{
-+    if ( !rMyCell.sPhoneticText.getLength() )
-+        return;
-+    StartElement( XML_NAMESPACE_TEXT, XML_RUBY, sal_False);
-+    StartElement( XML_NAMESPACE_TEXT, XML_RUBY_BASE, sal_False );
-+    Characters( rMyCell.sStringValue );
-+    EndElement( XML_NAMESPACE_TEXT, XML_RUBY_BASE, sal_False );
-+    StartElement( XML_NAMESPACE_TEXT, XML_RUBY_TEXT, sal_False );
-+    Characters( rMyCell.sPhoneticText );
-+    EndElement( XML_NAMESPACE_TEXT, XML_RUBY_TEXT, sal_False );
-+    EndElement( XML_NAMESPACE_TEXT, XML_RUBY, sal_False);
-+}
-+
- void ScXMLExport::WriteCell (ScMyCell& aCell)
- {
-     ScAddress aCellPos;
-@@ -2443,13 +2459,20 @@ void ScXMLExport::WriteCell (ScMyCell& aCell)
-             uno::Reference<text::XText> xText(xCurrentTableCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row), uno::UNO_QUERY);
- 			if ( xText.is())
- 				GetTextParagraphExport()->exportText(xText, sal_False, sal_False);
-+            if (GetCellText( aCell, aCellPos ) && aCell.sPhoneticText.getLength())
-+                WriteRubyText( aCell );
- 		}
- 		else
- 		{
- 			SvXMLElementExport aElemP(*this, sElemP, sal_True, sal_False);
- 			sal_Bool bPrevCharWasSpace(sal_True);
- 	  		if (GetCellText(aCell, aCellPos))
--				GetTextParagraphExport()->exportText(aCell.sStringValue, bPrevCharWasSpace);
-+            {
-+                if ( aCell.sPhoneticText.getLength() )
-+                    WriteRubyText( aCell );
-+                else 
-+                    GetTextParagraphExport()->exportText( aCell.sStringValue, bPrevCharWasSpace );
-+           }
- 		}
- 	}
- 	WriteShapes(aCell);
-diff --git sc/source/filter/xml/xmlexprt.hxx sc/source/filter/xml/xmlexprt.hxx
-index 5bd2db4..d98151c 100644
---- sc/source/filter/xml/xmlexprt.hxx
-+++ sc/source/filter/xml/xmlexprt.hxx
-@@ -185,6 +185,12 @@ class ScXMLExport : public SvXMLExport
- 	void ExportShape(const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape, com::sun::star::awt::Point* pPoint);
- 	void WriteShapes(const ScMyCell& rMyCell);
- 	void WriteTableShapes();
-+
-+    /**
-+     * Write phonetic text
-+     * @param aCell the cell reference which has phonetic text.
-+     */
-+    void WriteRubyText (ScMyCell& aCell);
- 	void SetRepeatAttribute (const sal_Int32 nEqualCellCount);
- 
- 	sal_Bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const;
-diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
-index d424b8f..b9eee05 100644
---- sc/source/filter/xml/xmlimprt.cxx
-+++ sc/source/filter/xml/xmlimprt.cxx
-@@ -812,6 +812,55 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap()
-     return *pTableRowCellElemTokenMap;
- }
- 
-+    SvXMLTokenMap           *pTableRowCellElemTextRubyAttrTokenMap;
-+
-+const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTextTokenMap()
-+{
-+    if (!pTableRowCellElemTextTokenMap)
-+    {
-+        static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTextTokenMap[] =
-+        {
-+            { XML_NAMESPACE_TEXT, XML_S,    XML_TOK_TABLE_ROW_CELL_TEXT_S    },
-+            { XML_NAMESPACE_TEXT, XML_RUBY, XML_TOK_TABLE_ROW_CELL_TEXT_RUBY },
-+            XML_TOKEN_MAP_END
-+        };
-+        pTableRowCellElemTextTokenMap = new SvXMLTokenMap(aTableRowCellTextTokenMap);
-+    }
-+
-+    return *pTableRowCellElemTextTokenMap;
-+}
-+
-+const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTextRubyTokenMap()
-+{
-+    if (!pTableRowCellElemTextRubyTokenMap)
-+    {
-+        static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTextRubyAttrTokenMap[] =
-+        {
-+            { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME },
-+            XML_TOKEN_MAP_END
-+        };
-+        pTableRowCellElemTextRubyTokenMap = new SvXMLTokenMap(aTableRowCellTextRubyAttrTokenMap);
-+    }
-+
-+    return *pTableRowCellElemTextRubyTokenMap;
-+}
-+
-+const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTextRubyAttrTokenMap()
-+{
-+    if (!pTableRowCellElemTextRubyAttrTokenMap)
-+    {
-+        static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTextRubyTokenMap[] =
-+        {
-+            { XML_NAMESPACE_TEXT, XML_RUBY_BASE, XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_BASE },
-+            { XML_NAMESPACE_TEXT, XML_RUBY_TEXT, XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_TEXT },
-+            XML_TOKEN_MAP_END
-+        }; 
-+        pTableRowCellElemTextRubyAttrTokenMap = new SvXMLTokenMap(aTableRowCellTextRubyTokenMap);
-+    }
-+
-+    return *pTableRowCellElemTextRubyAttrTokenMap;
-+}
-+
- const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap()
- {
-     if( !pTableAnnotationAttrTokenMap )
-@@ -1643,6 +1692,9 @@ ScXMLImport::ScXMLImport(
- 	pTableRowElemTokenMap( 0 ),
- 	pTableRowAttrTokenMap( 0 ),
- 	pTableRowCellElemTokenMap( 0 ),
-+	pTableRowCellElemTextTokenMap( 0 ),
-+	pTableRowCellElemTextRubyTokenMap( 0 ),
-+	pTableRowCellElemTextRubyAttrTokenMap( 0 ),
- 	pTableRowCellAttrTokenMap( 0 ),
- 	pTableAnnotationAttrTokenMap( 0 ),
- 	pDetectiveElemTokenMap( 0 ),
-@@ -1766,6 +1818,9 @@ ScXMLImport::~ScXMLImport() throw()
-     delete pTableRowElemTokenMap;
-     delete pTableRowAttrTokenMap;
-     delete pTableRowCellElemTokenMap;
-+    delete pTableRowCellElemTextTokenMap;
-+    delete pTableRowCellElemTextRubyTokenMap;
-+    delete pTableRowCellElemTextRubyAttrTokenMap;
-     delete pTableRowCellAttrTokenMap;
-     delete pTableAnnotationAttrTokenMap;
-     delete pDetectiveElemTokenMap;
-diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx
-index 7239222..093846a 100644
---- sc/source/filter/xml/xmlimprt.hxx
-+++ sc/source/filter/xml/xmlimprt.hxx
-@@ -248,7 +248,25 @@ enum ScXMLTableRowCellTokens
- 	XML_TOK_TABLE_ROW_CELL_TABLE,
- 	XML_TOK_TABLE_ROW_CELL_ANNOTATION,
- 	XML_TOK_TABLE_ROW_CELL_DETECTIVE,
--	XML_TOK_TABLE_ROW_CELL_CELL_RANGE_SOURCE
-+    XML_TOK_TABLE_ROW_CELL_CELL_RANGE_SOURCE,
-+    XML_TOK_TABLE_ROW_CELL_RUBY
-+};
-+
-+enum ScXMLTableRowCellTextTokens
-+{
-+    XML_TOK_TABLE_ROW_CELL_TEXT_S,
-+    XML_TOK_TABLE_ROW_CELL_TEXT_RUBY
-+};
-+
-+enum ScXMLTableRowCellTextRubyTokens
-+{
-+    XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_BASE,
-+    XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_TEXT
-+};
-+
-+enum ScXMLTableRowCellTextRubyAttrTokens
-+{
-+    XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME
- };
- 
- enum ScXMLTableRowCellAttrTokens
-@@ -689,6 +707,9 @@ class ScXMLImport: public SvXMLImport
- 	SvXMLTokenMap			*pTableRowElemTokenMap;
- 	SvXMLTokenMap			*pTableRowAttrTokenMap;
- 	SvXMLTokenMap			*pTableRowCellElemTokenMap;
-+    SvXMLTokenMap           *pTableRowCellElemTextTokenMap;
-+    SvXMLTokenMap           *pTableRowCellElemTextRubyTokenMap;
-+    SvXMLTokenMap           *pTableRowCellElemTextRubyAttrTokenMap;
- 	SvXMLTokenMap			*pTableRowCellAttrTokenMap;
- 	SvXMLTokenMap			*pTableAnnotationAttrTokenMap;
- 	SvXMLTokenMap			*pDetectiveElemTokenMap;
-@@ -852,6 +873,9 @@ public:
- 	const SvXMLTokenMap& GetTableRowElemTokenMap();
- 	const SvXMLTokenMap& GetTableRowAttrTokenMap();
- 	const SvXMLTokenMap& GetTableRowCellElemTokenMap();
-+    const SvXMLTokenMap& GetTableRowCellElemTextTokenMap();
-+    const SvXMLTokenMap& GetTableRowCellElemTextRubyTokenMap();
-+    const SvXMLTokenMap& GetTableRowCellElemTextRubyAttrTokenMap();
-     const SvXMLTokenMap& GetTableRowCellAttrTokenMap();
- 	const SvXMLTokenMap& GetTableAnnotationAttrTokenMap();
- 	const SvXMLTokenMap& GetDetectiveElemTokenMap();
-diff --git sc/source/filter/xml/xmlrubyi.cxx sc/source/filter/xml/xmlrubyi.cxx
-new file mode 100644
-index 0000000..571243d
---- /dev/null
-+++ sc/source/filter/xml/xmlrubyi.cxx
-@@ -0,0 +1,207 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: global.hxx,v $
-+ * $Revision: 1.53 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_sc.hxx"
-+
-+
-+
-+// INCLUDE ---------------------------------------------------------------
-+
-+#ifndef _SC_XMLRUBYI_HXX
-+#include "xmlrubyi.hxx"
-+#endif
-+#ifndef SC_XMLIMPRT_HXX
-+#include "xmlimprt.hxx"
-+#endif
-+#ifndef SC_XMLCELLI_HXX
-+#include "xmlcelli.hxx"
-+#endif
-+#ifndef _SC_XMLTEXTPCONTEXT_HXX
-+#include "XMLTextPContext.hxx"
-+#endif
-+#ifndef _XMLSTYLI_HXX
-+#include "xmlstyli.hxx"
-+#endif
-+
-+#ifndef _XMLOFF_XMLNMSPE_HXX
-+#include <xmloff/xmlnmspe.hxx>
-+#endif
-+#ifndef _XMLOFF_XMLTOKEN_HXX
-+#include <xmloff/xmltoken.hxx>
-+#endif
-+#ifndef _XMLOFF_NMSPMAP_HXX
-+#include <xmloff/nmspmap.hxx>
-+#endif
-+#ifndef _TOOLS_DEBUG_HXX
-+#include <tools/debug.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_TEXT_XTEXT_HPP_
-+#include <com/sun/star/text/XText.hpp>
-+#endif
-+
-+using namespace com::sun::star;
-+using namespace xmloff::token;
-+
-+ScXMLRubyContext::ScXMLRubyContext( ScXMLImport& rImport,
-+                                      USHORT nPrfx,
-+                                      const ::rtl::OUString& rLName,
-+                                      const ::com::sun::star::uno::Reference<
-+                                      ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
-+                                      ScXMLTextPContext* pTempTextContext) :
-+    SvXMLImportContext( rImport, nPrfx, rLName ),
-+    pCellContext( NULL ),
-+    pTextContext( pTempTextContext )
-+{
-+    sal_Int16 nAttrCount(xTempAttrList.is() ? xTempAttrList->getLength() : 0);
-+    const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableRowCellElemTextRubyAttrTokenMap();
-+    for( sal_Int16 i=0; i < nAttrCount; ++i )
-+    {
-+        const rtl::OUString& sAttrName(xTempAttrList->getNameByIndex( i ));
-+        rtl::OUString aLocalName;
-+        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
-+                       sAttrName, &aLocalName ));
-+        const rtl::OUString& sValue(xTempAttrList->getValueByIndex( i ));
-+
-+        switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
-+        {
-+        case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME:
-+            sStyleName = sValue;
-+            break;
-+        }
-+    }
-+}
-+
-+ScXMLRubyContext::ScXMLRubyContext( ScXMLImport& rImport,
-+                                      USHORT nPrfx,
-+                                      const ::rtl::OUString& rLName,
-+                                      const ::com::sun::star::uno::Reference<
-+                                      ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
-+                                      ScXMLTableRowCellContext* pTempContext) :
-+    SvXMLImportContext( rImport, nPrfx, rLName ),
-+    pCellContext( pTempContext ),
-+    pTextContext( NULL )
-+{
-+    sal_Int16 nAttrCount(xTempAttrList.is() ? xTempAttrList->getLength() : 0);
-+    const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableRowCellElemTextRubyAttrTokenMap();
-+    for( sal_Int16 i=0; i < nAttrCount; ++i )
-+    {
-+        const rtl::OUString& sAttrName(xTempAttrList->getNameByIndex( i ));
-+        rtl::OUString aLocalName;
-+        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
-+                       sAttrName, &aLocalName ));
-+        const rtl::OUString& sValue(xTempAttrList->getValueByIndex( i ));
-+
-+        switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
-+        {
-+        case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME:
-+            sStyleName = sValue;
-+            break;
-+        }
-+    }
-+}
-+
-+SvXMLImportContext *ScXMLRubyContext::CreateChildContext( USHORT nPrefix,
-+                                            const ::rtl::OUString& rLName,
-+                                            const ::com::sun::star::uno::Reference<
-+                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
-+{
-+    SvXMLImportContext *pContext(NULL);
-+
-+    const SvXMLTokenMap& rTokenMap = GetScImport().GetTableRowCellElemTextRubyTokenMap();
-+    switch( rTokenMap.Get( nPrefix, rLName ) )
-+    {
-+    case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_BASE:
-+        pContext = new ScXMLRubyBaseContext( GetScImport(), nPrefix, rLName, xAttrList, this);
-+        break;
-+    case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_TEXT:
-+        pContext = new ScXMLRubyTextContext( GetScImport(), nPrefix, rLName, xAttrList, this);
-+        break;
-+    }
-+
-+    if( !pContext )
-+        pContext = new SvXMLImportContext( GetScImport(), nPrefix, rLName );
-+
-+    return pContext;
-+}
-+
-+void ScXMLRubyContext::EndElement()
-+{
-+    if ( pTextContext )
-+        pTextContext->AddRubyText( sBaseText.makeStringAndClear(), sRubyText.makeStringAndClear() );
-+    else if ( pCellContext )
-+        pCellContext->SetPhoneticText( sRubyText.makeStringAndClear() );
-+}
-+
-+void ScXMLRubyContext::AddBaseText( const ::rtl::OUString& rText )
-+{
-+    sBaseText.append( rText );
-+}
-+
-+void ScXMLRubyContext::AddRubyText( const ::rtl::OUString& rText )
-+{
-+    sRubyText.append( rText );
-+}
-+
-+ScXMLRubyBaseContext::ScXMLRubyBaseContext( ScXMLImport& rImport,
-+                                      USHORT nPrfx,
-+                                      const ::rtl::OUString& rLName,
-+                                      const ::com::sun::star::uno::Reference<
-+                                      ::com::sun::star::xml::sax::XAttributeList>& /*xTempAttrList*/,
-+                                      ScXMLRubyContext* pTempRubyContext) :
-+    SvXMLImportContext( rImport, nPrfx, rLName ),
-+    pRubyContext( pTempRubyContext )
-+{
-+    // here are no attributes
-+}
-+
-+void ScXMLRubyBaseContext::Characters( const ::rtl::OUString& rChars )
-+{
-+    pRubyContext->AddBaseText( rChars );
-+}
-+
-+ScXMLRubyTextContext::ScXMLRubyTextContext( ScXMLImport& rImport,
-+                                      USHORT nPrfx,
-+                                      const ::rtl::OUString& rLName,
-+                                      const ::com::sun::star::uno::Reference<
-+                                      ::com::sun::star::xml::sax::XAttributeList>& /*xTempAttrList*/,
-+                                      ScXMLRubyContext* pTempRubyContext) :
-+    SvXMLImportContext( rImport, nPrfx, rLName ),
-+    pRubyContext( pTempRubyContext )
-+{
-+    // here are no attributes
-+}
-+
-+void ScXMLRubyTextContext::Characters( const ::rtl::OUString& rChars )
-+{
-+    pRubyContext->AddRubyText( rChars );
-+}
-+
-+
-diff --git sc/source/filter/xml/xmlrubyi.hxx sc/source/filter/xml/xmlrubyi.hxx
-new file mode 100644
-index 0000000..ada14fc
---- /dev/null
-+++ sc/source/filter/xml/xmlrubyi.hxx
-@@ -0,0 +1,191 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: global.hxx,v $
-+ * $Revision: 1.53 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef _SC_XMLRUBYI_HXX
-+#define _SC_XMLRUBYI_HXX
-+
-+#ifndef _XMLOFF_XMLICTXT_HXX
-+#include <xmloff/xmlictxt.hxx>
-+#endif
-+#ifndef _RTL_USTRBUF_HXX_
-+#include <rtl/ustrbuf.hxx>
-+#endif
-+
-+class ScXMLImport;
-+class ScXMLTextPContext;
-+class ScXMLTableRowCellContext;
-+
-+/**
-+ * A class for representing Asian phonetic guide information while loading ODF file.
-+ */
-+class ScXMLRubyContext : public SvXMLImportContext
-+{
-+    rtl::OUString       sStyleName;
-+    rtl::OUStringBuffer sBaseText;
-+    rtl::OUStringBuffer sRubyText;
-+    ScXMLTableRowCellContext*   pCellContext;
-+    ScXMLTextPContext*  pTextContext;
-+
-+    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-+    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-+
-+public:
-+
-+    /**
-+     * A constructor of ScXMLRubyContext.
-+     * @param rImport a reference of ScXMLImport.
-+     * @param nPrfx the number of the element prefix.
-+     * @param rLName the string of the element.
-+     * @param xAttrList attribute list of the element.
-+     * @param pContext a pointer of ScXMLTextPContext.
-+     */
-+    ScXMLRubyContext( ScXMLImport& rImport, USHORT nPrfx,
-+                        const ::rtl::OUString& rLName,
-+                        const ::com::sun::star::uno::Reference<
-+                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-+                        ScXMLTextPContext* pContext);
-+    /**
-+     * A constructor of ScXMLRubyContext.
-+     * @param rImport a reference of ScXMLImport.
-+     * @param nPrfx the number of the element prefix.
-+     * @param rLName the string of the element.
-+     * @param xAttrList attribute list of the element.
-+     * @param pContext a pointer of ScXMLTableRowCellContext.
-+     */
-+    ScXMLRubyContext( ScXMLImport& rImport, USHORT nPrfx,
-+                        const ::rtl::OUString& rLName,
-+                        const ::com::sun::star::uno::Reference<
-+                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-+                        ScXMLTableRowCellContext* pContext);
-+
-+    virtual ~ScXMLRubyContext() {};
-+
-+    /**
-+     * Create a childs element context. By default, the import's
-+     * CreateContext method is called to create a new default context.
-+     * @return a new default context.
-+     */
-+    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
-+                                     const ::rtl::OUString& rLocalName,
-+                                     const ::com::sun::star::uno::Reference<
-+                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
-+    /**
-+     * EndElement is called before a context will be destructed, but
-+     * after a elements context has been parsed. It may be used for actions
-+     * that require virtual methods. The default is to do nothing.
-+     */
-+    virtual void EndElement();
-+
-+    /**
-+     * Adds string into cell string as base string of phonetic infrmation
-+     * @param rText the base string.
-+     */
-+    void AddBaseText(const ::rtl::OUString& rText);
-+    /**
-+     * Adds string into cell string as phonetic text
-+     * @param rText the phonetic text.
-+     */
-+    void AddRubyText(const ::rtl::OUString& rText);
-+};
-+
-+/**
-+ * A class for representing base text of phonetic guide information while loading ODF file.
-+ */
-+class ScXMLRubyBaseContext : public SvXMLImportContext
-+{
-+    ScXMLRubyContext*   pRubyContext;
-+
-+    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-+    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-+
-+public:
-+
-+    /**
-+     * A constructor of ScXMLRubyBaseContext.
-+     * @param rImport a reference of ScXMLImport.
-+     * @param nPrfx the number of the element prefix.
-+     * @param rLName the string of the element.
-+     * @param xAttrList attribute list of the element.
-+     * @param pContext a pointer of ScXMLRubyContext.
-+     */
-+    ScXMLRubyBaseContext( ScXMLImport& rImport, USHORT nPrfx,
-+                        const ::rtl::OUString& rLName,
-+                        const ::com::sun::star::uno::Reference<
-+                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-+                        ScXMLRubyContext* pContext);
-+
-+    virtual ~ScXMLRubyBaseContext() {};
-+
-+    /**
-+     * This method is called for all characters that are contained in the
-+     * current element. The default is to ignore them.
-+     * @param rChars the character reference
-+     */ 
-+    virtual void Characters( const ::rtl::OUString& rChars );
-+};
-+
-+
-+/**
-+ * A class for representing phonetic text of phonetic guide information while loading ODF file.
-+ */
-+class ScXMLRubyTextContext : public SvXMLImportContext
-+{
-+    ScXMLRubyContext*   pRubyContext;
-+
-+    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-+    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-+
-+public:
-+
-+    /**
-+     * A constructor of ScXMLRubyTextContext.
-+     * @param rImport a reference of ScXMLImport.
-+     * @param nPrfx the number of the element prefix.
-+     * @param rLName the string of the element.
-+     * @param xAttrList attribute list of the element.
-+     * @param pContext a pointer of ScXMLRubyContext.
-+     */
-+    ScXMLRubyTextContext( ScXMLImport& rImport, USHORT nPrfx,
-+                        const ::rtl::OUString& rLName,
-+                        const ::com::sun::star::uno::Reference<
-+                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-+                        ScXMLRubyContext* pContext);
-+
-+    virtual ~ScXMLRubyTextContext() {};
-+
-+    /**
-+     * This method is called for all characters that are contained in the
-+     * current element. The default is to ignore them.
-+     * @param rChars the character reference
-+     */ 
-+    virtual void Characters( const ::rtl::OUString& rChars );
-+};
-+
-+#endif
-diff --git sc/source/filter/xml/xmlstyle.cxx sc/source/filter/xml/xmlstyle.cxx
-index d12b7a2..555962d 100644
---- sc/source/filter/xml/xmlstyle.cxx
-+++ sc/source/filter/xml/xmlstyle.cxx
-@@ -140,6 +140,7 @@ const XMLPropertyMapEntry aXMLScRowStylesImportProperties[] =
-     MAP( "IsCellBackgroundTransparent", XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, XML_TYPE_PROP_TABLE_ROW|XML_TYPE_ISTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
-     MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, XML_TYPE_PROP_TABLE_ROW|XML_SC_TYPE_BREAKBEFORE, CTF_SC_ROWBREAKBEFORE),
-     MAP( "OptimalHeight", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_ROW_HEIGHT, XML_TYPE_PROP_TABLE_ROW|XML_TYPE_BOOL, CTF_SC_ROWOPTIMALHEIGHT),
-+    MAP( "RubyText", XML_NAMESPACE_TEXT, XML_RUBY_TEXT, XML_TYPE_PROP_RUBY, 0 ),
-     MAP_END()
- };
- 
-diff --git sc/source/filter/xml/xmlstyli.cxx sc/source/filter/xml/xmlstyli.cxx
-index 95f9b2b..733a50c 100644
---- sc/source/filter/xml/xmlstyli.cxx
-+++ sc/source/filter/xml/xmlstyli.cxx
-@@ -64,8 +64,9 @@
- #define XML_LINE_BLTR 1
- 
- using ::rtl::OUString;
-+using ::com::sun::star::uno::UNO_QUERY;
-+using ::com::sun::star::uno::Reference;
- using namespace ::com::sun::star;
--using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::xml::sax;
- using namespace ::com::sun::star::style;
- using namespace ::com::sun::star::frame;
-@@ -693,22 +694,30 @@ SvXMLStyleContext *XMLTableStylesContext::CreateStyleStyleChildContext(
- 		sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
- 		const uno::Reference< xml::sax::XAttributeList > & xAttrList )
- {
--	SvXMLStyleContext *pStyle(SvXMLStylesContext::CreateStyleStyleChildContext( nFamily, nPrefix,
--															rLocalName,
--															xAttrList ));
--	if (!pStyle)
--	{
--		switch( nFamily )
--		{
--		case XML_STYLE_FAMILY_TABLE_CELL:
--		case XML_STYLE_FAMILY_TABLE_COLUMN:
--		case XML_STYLE_FAMILY_TABLE_ROW:
--		case XML_STYLE_FAMILY_TABLE_TABLE:
--			pStyle = new XMLTableStyleContext( GetScImport(), nPrefix, rLocalName,
--			   								xAttrList, *this, nFamily );
--			break;
--		}
--	}
-+    SvXMLStyleContext *pStyle(NULL);
-+    if ( nFamily == XML_STYLE_FAMILY_TEXT_RUBY )
-+    {
-+        pStyle = new XMLRubyStyleContext ( GetScImport(), nPrefix, rLocalName,
-+                                           xAttrList, *this, nFamily );
-+    }
-+    else 
-+    {
-+        pStyle = SvXMLStylesContext::CreateStyleStyleChildContext( 
-+            nFamily, nPrefix, rLocalName, xAttrList );
-+        if (!pStyle)
-+        {
-+            switch( nFamily )
-+            {
-+                case XML_STYLE_FAMILY_TABLE_CELL:
-+                case XML_STYLE_FAMILY_TABLE_COLUMN:
-+                case XML_STYLE_FAMILY_TABLE_ROW:
-+                case XML_STYLE_FAMILY_TABLE_TABLE:
-+                    pStyle = new XMLTableStyleContext( GetScImport(), nPrefix, rLocalName,
-+                                                       xAttrList, *this, nFamily );
-+                    break;
-+            }
-+        }
-+    }
- 
- 	return pStyle;
- }
-@@ -1082,3 +1091,102 @@ void ScMasterPageContext::Finish( sal_Bool bOverwrite )
- 		ClearContent(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON)));
- }
- 
-+class ScXMLRubyStyleContext : public SvXMLImportContext
-+{
-+    rtl::OUString sPosition;
-+    rtl::OUString sAlign;
-+public:
-+
-+    ScXMLRubyStyleContext(
-+            SvXMLImport& rImport, sal_uInt16 nPrfx,
-+            const rtl::OUString& rLName,
-+            const Reference< XAttributeList > & xAttrList );
-+    virtual ~ScXMLRubyStyleContext();
-+
-+    const rtl::OUString& GetPosition() const { return sPosition; }
-+    const rtl::OUString& GetAlign() const { return sAlign; }
-+};
-+
-+ScXMLRubyStyleContext::ScXMLRubyStyleContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
-+            const OUString& rLName, const Reference< XAttributeList > & xAttrList )
-+    : SvXMLImportContext( rImport, nPrfx, rLName ),
-+    sPosition(),
-+    sAlign()
-+{
-+    sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
-+    for( sal_Int16 i=0; i < nAttrCount; ++i )
-+    {
-+        const OUString& rAttrName(xAttrList->getNameByIndex( i ));
-+        OUString aLocalName;
-+        sal_uInt16 nPrefix(GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName ));
-+        const OUString& rValue(xAttrList->getValueByIndex( i ));
-+
-+        if( XML_NAMESPACE_STYLE == nPrefix )
-+        {
-+            if( IsXMLToken(aLocalName, XML_RUBY_ALIGN ) )
-+                sPosition = rValue;
-+            else if( IsXMLToken(aLocalName, XML_RUBY_POSITION ) )
-+                sAlign = rValue;
-+        }
-+    }
-+}
-+
-+ScXMLRubyStyleContext::~ScXMLRubyStyleContext()
-+{
-+}
-+
-+TYPEINIT1( XMLRubyStyleContext, XMLPropStyleContext );
-+
-+XMLRubyStyleContext::XMLRubyStyleContext( ScXMLImport& rImport,
-+        sal_uInt16 nPrfx, const OUString& rLName,
-+        const Reference< XAttributeList > & xAttrList,
-+        SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) :
-+    XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ),
-+    pStyles(&rStyles)
-+{
-+}
-+
-+XMLRubyStyleContext::~XMLRubyStyleContext()
-+{
-+}
-+
-+SvXMLImportContext *XMLRubyStyleContext::CreateChildContext(
-+        sal_uInt16 nPrefix,
-+        const OUString& rLocalName,
-+        const Reference< XAttributeList > & xAttrList )
-+{
-+    SvXMLImportContext *pContext(NULL);
-+
-+    if( (XML_NAMESPACE_STYLE == nPrefix) &&
-+        IsXMLToken(rLocalName, XML_RUBY_PROPERTIES ) )
-+    {
-+        pContext = new ScXMLRubyStyleContext(GetImport(), nPrefix, rLocalName, xAttrList);
-+        sPosition = ((ScXMLRubyStyleContext*)pContext)->GetPosition();
-+        sAlign = ((ScXMLRubyStyleContext*)pContext)->GetAlign();
-+    }
-+    if (!pContext)
-+        pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
-+                                                           xAttrList );
-+    return pContext;
-+}
-+
-+void XMLRubyStyleContext::FillPropertySet( const Reference< XPropertySet > & rPropSet )
-+{
-+    XMLPropStyleContext::FillPropertySet(rPropSet);
-+}
-+
-+void XMLRubyStyleContext::SetDefaults()
-+{
-+    if ((GetFamily() == XML_STYLE_FAMILY_TEXT_RUBY) && GetImport().GetModel().is())
-+    {
-+        uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetImport().GetModel(), uno::UNO_QUERY);
-+        if (xMultiServiceFactory.is())
-+        {
-+            uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.Defaults"))), uno::UNO_QUERY);
-+            if (xProperties.is())
-+                FillPropertySet(xProperties);
-+        }
-+    }
-+}
-+
-+
-diff --git sc/source/filter/xml/xmlstyli.hxx sc/source/filter/xml/xmlstyli.hxx
-index bd42e17..732f4f6 100644
---- sc/source/filter/xml/xmlstyli.hxx
-+++ sc/source/filter/xml/xmlstyli.hxx
-@@ -258,6 +258,59 @@ public:
- 	virtual void EndElement();
- };
- 
-+/**
-+ * A class for representing ruby style while loading ODF file.
-+ */
-+class XMLRubyStyleContext : public XMLPropStyleContext
-+{
-+    SvXMLStylesContext*         pStyles;
-+    rtl::OUString sPosition;
-+    rtl::OUString sAlign;
-+
-+    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-+    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-+
-+public:
-+
-+    TYPEINFO();
-+
-+    /**
-+     * A constructor of XMLRubyStyleContext.
-+     * @param rImport a reference of ScXMLImport.
-+     * @param nPrfx the number of the element prefix.
-+     * @param rLName the string of the element.
-+     * @param xAttrList attribute list of the element.
-+     * @param rStyles a reference of SvXMLStylesContext.
-+     * @param bDefaultStyle a flag of use of default style.
-+     */
-+    XMLRubyStyleContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
-+            const ::rtl::OUString& rLName,
-+            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
-+            SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle = sal_False );
-+    virtual ~XMLRubyStyleContext();
-+
-+    /**
-+     * Create a childs element context. By default, the import's
-+     * CreateContext method is called to create a new default context.
-+     * @param nPrefix
-+     * @param rLocalName
-+     * @param xAttrList
-+     * @return a new default context.
-+     */
-+    virtual SvXMLImportContext *CreateChildContext(
-+            sal_uInt16 nPrefix,
-+            const ::rtl::OUString& rLocalName,
-+            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
-+
-+    virtual void FillPropertySet(const ::com::sun::star::uno::Reference<
-+                ::com::sun::star::beans::XPropertySet > & rPropSet );
-+
-+    virtual void SetDefaults();
-+
-+private:
-+    using XMLPropStyleContext::SetStyle;
-+};
-+
- namespace com { namespace sun { namespace star {
- 	namespace style { class XStyle; }
- } } }
-diff --git sc/source/ui/src/scfuncs.src sc/source/ui/src/scfuncs.src
-index 747f43b..a64f6f9 100644
---- sc/source/ui/src/scfuncs.src
-+++ sc/source/ui/src/scfuncs.src
-@@ -7995,6 +7995,33 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
-             Text [ en-US ] = "The text to convert.";
-         };
-     };
-+     // -=*# Resource for function PHONETIC #*=-
-+    Resource SC_OPCODE_PHONETIC
-+    {
-+        String 1 // Description
-+        {
-+            Text [ en-US ] = "Returns a phonetic guide text." ;
-+            Text [ ja ] = "ふりがな文字列を返します。" ;
-+        };
-+        ExtraData =
-+        {
-+            0;
-+            ID_FUNCTION_GRP_TEXT;
-+            U2S( HID_FUNC_PHONETIC );
-+            1;  0;
-+            0;
-+        };
-+        String 2 // Name of Parameter 1
-+        {
-+            Text [ en-US ] = "range" ;
-+            Text [ ja ] = "範囲" ;
-+        };
-+        String 3 // Description of Parameter 1
-+        {
-+            Text [ en-US ] = "The cell range from which phonetic guide texts are retrieved." ;
-+            Text [ ja ] = "ふりがな文字列を取り出すセル範囲。" ;
-+        };
-+    };
- 	 // -=*# Resource for function CODE #*=-
- 	Resource SC_OPCODE_CODE
- 	{
-diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx
-index 353c2c3..c2eb810 100644
---- sc/source/ui/unoobj/cellsuno.cxx
-+++ sc/source/ui/unoobj/cellsuno.cxx
-@@ -6258,6 +6258,32 @@ String ScCellObj::GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aCellP
- 	return aVal;
- }
- 
-+String ScCellObj::GetOutputPhoneticString_Impl(ScDocument* pDoc, const ScAddress& aCellPos)
-+{
-+    String aVal;
-+    if ( pDoc )
-+    {
-+        ScBaseCell* pCell = pDoc->GetCell( aCellPos );
-+        if ( pCell && pCell->GetCellType() == CELLTYPE_STRING &&
-+             static_cast<const ScStringCell*>(pCell)->HasPhonetic() )
-+        {
-+            ScPhonetic aPhonetic;
-+            static_cast<const ScAsianStringCell*>(pCell)->GetPhonetic(aPhonetic);
-+            if ( !aPhonetic.IsEmpty() )
-+                aVal = aPhonetic.GetString();
-+        }
-+        else if ( pCell && pCell->GetCellType() == CELLTYPE_EDIT && 
-+                  static_cast<const ScEditCell*>(pCell)->HasPhonetic() )
-+        {
-+            ScPhonetic aPhonetic;
-+            static_cast<const ScAsianEditCell*>(pCell)->GetPhonetic(aPhonetic);
-+            if ( !aPhonetic.IsEmpty() )
-+                aVal = aPhonetic.GetString();
-+        }
-+    }
-+    return aVal;
-+}
-+
- String ScCellObj::GetOutputString_Impl() const
- {
- 	ScDocShell* pDocSh = GetDocShell();
-diff --git sc/util/hidother.src sc/util/hidother.src
-index 8d21ed1..041a1bd 100644
---- sc/util/hidother.src
-+++ sc/util/hidother.src
-@@ -392,6 +392,7 @@ hidspecial HID_FUNC_NUMBERVALUE     { HelpID = HID_FUNC_NUMBERVALUE; };
- hidspecial HID_FUNC_GAMMA           { HelpID = HID_FUNC_GAMMA; };
- hidspecial HID_FUNC_CHISQDIST       { HelpID = HID_FUNC_CHISQDIST; };
- hidspecial HID_FUNC_CHISQINV        { HelpID = HID_FUNC_CHISQINV; };
-+hidspecial HID_FUNC_PHONETIC        { HelpID = HID_FUNC_PHONETIC; };
- 
- // ... and from Analysis Addin
- 
diff --git a/applied_patches/0544-unittesting-embeddedobj.diff b/applied_patches/0428-unittesting-embeddedobj.diff
similarity index 100%
rename from applied_patches/0544-unittesting-embeddedobj.diff
rename to applied_patches/0428-unittesting-embeddedobj.diff
diff --git a/applied_patches/0429-sc-sheet-gridline-toggle.diff b/applied_patches/0429-sc-sheet-gridline-toggle.diff
deleted file mode 100644
index e4a50461e..000000000
--- a/applied_patches/0429-sc-sheet-gridline-toggle.diff
+++ /dev/null
@@ -1,309 +0,0 @@
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/scextopt.hxx sc/inc/scextopt.hxx
---- sc.clean/inc/scextopt.hxx	2008-04-01 12:26:30.000000000 -0400
-+++ sc/inc/scextopt.hxx	2008-04-21 13:29:55.000000000 -0400
-@@ -97,6 +97,7 @@ struct ScExtTabSettings
-     bool                mbSelected;         /// true = Sheet is selected.
-     bool                mbFrozenPanes;      /// true = Frozen panes; false = Normal splits.
-     bool                mbPageMode;         /// true = Pagebreak mode; false = Normal view mode.
-+    bool                mbShowGrid;         /// Whether or not to display gridlines.
- 
-     explicit            ScExtTabSettings();
- };
---- sc.clean/inc/sc.hrc	2008-04-01 12:26:30.000000000 -0400
-+++ sc/inc/sc.hrc	2008-04-21 13:29:55.000000000 -0400
-@@ -833,6 +833,7 @@
- #define FID_TAB_INDEX			(TAB_POPUP_START+6)
- #define FID_TAB_RTL				(TAB_POPUP_START+7)
- #define FID_TAB_DESELECTALL     (TAB_POPUP_START+8)
-+#define FID_TAB_TOGGLE_GRID     (TAB_POPUP_START+9)
- 
- #define TAB_POPUP_END			(DATA_MENU_END + 20)
- 
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/ViewSettingsSequenceDefines.hxx sc/inc/ViewSettingsSequenceDefines.hxx
---- sc.clean/inc/ViewSettingsSequenceDefines.hxx	2008-04-01 12:26:30.000000000 -0400
-+++ sc/inc/ViewSettingsSequenceDefines.hxx	2008-04-21 13:29:55.000000000 -0400
-@@ -69,7 +69,7 @@
- // this are the defines for the position of the settings in the
- // TableViewSettingsSequence
- 
--#define SC_TABLE_VIEWSETTINGS_COUNT         14
-+#define SC_TABLE_VIEWSETTINGS_COUNT         15
- 
- #define SC_CURSOR_X							0
- #define SC_CURSOR_Y							1
-@@ -85,6 +85,7 @@
- #define SC_TABLE_ZOOM_TYPE                  11
- #define SC_TABLE_ZOOM_VALUE                 12
- #define SC_TABLE_PAGE_VIEW_ZOOM_VALUE       13
-+#define SC_TABLE_SHOWGRID                   14
- 
- #define SC_CURSORPOSITIONX					"CursorPositionX"
- #define SC_CURSORPOSITIONY					"CursorPositionY"
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/sdi/docsh.sdi sc/sdi/docsh.sdi
---- sc.clean/sdi/docsh.sdi	2008-04-01 12:26:30.000000000 -0400
-+++ sc/sdi/docsh.sdi	2008-04-21 13:29:55.000000000 -0400
-@@ -68,6 +68,7 @@ interface TableSelection
- 	FID_DELETE_TABLE	[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
- 	FID_TAB_RENAME		[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
- 	FID_TAB_RTL			[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
-+    FID_TAB_TOGGLE_GRID [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
- 
- 	SID_TABLE_ACTIVATE	[ ExecMethod = Execute; ]
- }
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/sdi/scalc.sdi sc/sdi/scalc.sdi
---- sc.clean/sdi/scalc.sdi	2008-04-01 12:26:30.000000000 -0400
-+++ sc/sdi/scalc.sdi	2008-04-21 13:31:28.000000000 -0400
-@@ -7780,3 +7780,30 @@ SfxVoidItem ShareDocument SID_SHARE_DOC
-     ToolBoxConfig = FALSE,
-     GroupId = GID_OPTIONS;
- ]
-+
-+//--------------------------------------------------------------------------
-+SfxBoolItem ToggleSheetGrid FID_TAB_TOGGLE_GRID
-+
-+[
-+    /* flags: */
-+    AutoUpdate = FALSE,
-+    Cachable = Cachable,
-+    FastCall = FALSE,
-+    HasCoreId = FALSE,
-+    HasDialog = FALSE,
-+    ReadOnlyDoc = TRUE,
-+    Toggle = FALSE,
-+    Container = FALSE,
-+    RecordAbsolute = FALSE,
-+    RecordPerSet;
-+    Synchron;
-+    
-+    /* config: */
-+    AccelConfig = TRUE,
-+    MenuConfig = TRUE,
-+    StatusBarConfig = FALSE,
-+    ToolBoxConfig = TRUE,
-+    GroupId = GID_FORMAT;
-+]
-+
-+
-Only in sc/sdi: scalc.sdi.orig
-Only in sc/sdi: scalc.sdi.rej
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/filter/excel/xeview.cxx sc/source/filter/excel/xeview.cxx
---- sc.clean/source/filter/excel/xeview.cxx	2008-04-01 12:26:37.000000000 -0400
-+++ sc/source/filter/excel/xeview.cxx	2008-04-21 13:29:55.000000000 -0400
-@@ -249,7 +249,6 @@ XclExpTabViewSettings::XclExpTabViewSett
- 
-     const ScViewOptions& rViewOpt = GetDoc().GetViewOptions();
-     maData.mbShowFormulas   = rViewOpt.GetOption( VOPT_FORMULAS );
--    maData.mbShowGrid       = rViewOpt.GetOption( VOPT_GRID );
-     maData.mbShowHeadings   = rViewOpt.GetOption( VOPT_HEADER );
-     maData.mbShowZeros      = rViewOpt.GetOption( VOPT_NULLVALS );
-     maData.mbShowOutline    = rViewOpt.GetOption( VOPT_OUTLINER );
-@@ -324,6 +323,7 @@ XclExpTabViewSettings::XclExpTabViewSett
-             else
-                 maData.maGridColor = rGridColor;
-         }
-+        maData.mbShowGrid       = rTabSett.mbShowGrid;
- 
-         // view mode and zoom
-         maData.mbPageMode       = (GetBiff() == EXC_BIFF8) && rTabSett.mbPageMode;
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/filter/excel/xiview.cxx sc/source/filter/excel/xiview.cxx
---- sc.clean/source/filter/excel/xiview.cxx	2008-04-01 12:26:38.000000000 -0400
-+++ sc/source/filter/excel/xiview.cxx	2008-04-21 13:29:55.000000000 -0400
-@@ -281,6 +281,9 @@ void XclImpTabViewSettings::Finalize()
-     else
-         rTabSett.maGridColor = maData.maGridColor;
- 
-+    // show grid option
-+    rTabSett.mbShowGrid      = maData.mbShowGrid;
-+
-     // view mode and zoom
-     if( maData.mnCurrentZoom != 0 )
-         (maData.mbPageMode ? maData.mnPageZoom : maData.mnNormalZoom) = maData.mnCurrentZoom;
-@@ -295,7 +298,6 @@ void XclImpTabViewSettings::Finalize()
-         // set Excel sheet settings globally at Calc document, take settings from displayed sheet
-         ScViewOptions aViewOpt( rDoc.GetViewOptions() );
-         aViewOpt.SetOption( VOPT_FORMULAS, maData.mbShowFormulas );
--        aViewOpt.SetOption( VOPT_GRID,     maData.mbShowGrid );
-         aViewOpt.SetOption( VOPT_HEADER,   maData.mbShowHeadings );
-         aViewOpt.SetOption( VOPT_NULLVALS, maData.mbShowZeros );
-         aViewOpt.SetOption( VOPT_OUTLINER, maData.mbShowOutline );
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/viewdata.hxx sc/source/ui/inc/viewdata.hxx
---- sc.clean/source/ui/inc/viewdata.hxx	2008-04-01 12:26:30.000000000 -0400
-+++ sc/source/ui/inc/viewdata.hxx	2008-04-21 13:29:55.000000000 -0400
-@@ -136,6 +136,8 @@ private:
- 	SCCOL			nPosX[2];
- 	SCROW			nPosY[2];
- 
-+    bool            bShowGrid;                  // per-sheet show grid-lines option.
-+
- 	BOOL			bOldCurValid;				// "virtuelle" Cursorpos. bei zusammengefassten
- 
- 					ScViewDataTable();
-@@ -314,6 +316,9 @@ public:
-     const Fraction&	GetZoomX() const        { return bPagebreak ? pThisTab->aPageZoomX : pThisTab->aZoomX; }
-     const Fraction&	GetZoomY() const        { return bPagebreak ? pThisTab->aPageZoomY : pThisTab->aZoomY; }
- 
-+    void            SetShowGrid( bool bShow );
-+    bool            GetShowGrid() const { return pThisTab->bShowGrid; }
-+
- 	const MapMode&	GetLogicMode( ScSplitPos eWhich );
- 	const MapMode&	GetLogicMode();						// Offset 0
- 
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx
---- sc.clean/source/ui/view/gridwin4.cxx	2008-04-01 12:26:33.000000000 -0400
-+++ sc/source/ui/view/gridwin4.cxx	2008-04-21 13:29:55.000000000 -0400
-@@ -564,7 +564,8 @@ void ScGridWindow::Draw( SCCOL nX1, SCRO
- 	aOutputData.SetEditObject( GetEditObject() );
- 	aOutputData.SetViewShell( pViewData->GetViewShell() );
- 
--	BOOL bGrid = rOpts.GetOption( VOPT_GRID );
-+    BOOL bGrid = rOpts.GetOption( VOPT_GRID ) && pViewData->GetShowGrid();
-+
- 	BOOL bPage = rOpts.GetOption( VOPT_PAGEBREAKS );
- 
- 	if ( eMode == SC_UPDATE_CHANGED )
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/scextopt.cxx sc/source/ui/view/scextopt.cxx
---- sc.clean/source/ui/view/scextopt.cxx	2008-04-01 12:26:33.000000000 -0400
-+++ sc/source/ui/view/scextopt.cxx	2008-04-21 13:29:55.000000000 -0400
-@@ -70,7 +70,8 @@ ScExtTabSettings::ScExtTabSettings() :
-     mnPageZoom( 0 ),
-     mbSelected( false ),
-     mbFrozenPanes( false ),
--    mbPageMode( false )
-+    mbPageMode( false ),
-+    mbShowGrid( true )
- {
- }
- 
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/tabvwshf.cxx sc/source/ui/view/tabvwshf.cxx
---- sc.clean/source/ui/view/tabvwshf.cxx	2008-04-01 12:26:33.000000000 -0400
-+++ sc/source/ui/view/tabvwshf.cxx	2008-04-21 13:29:55.000000000 -0400
-@@ -42,6 +42,8 @@
- 
- #include "scitems.hxx"
- #include <sfx2/request.hxx>
-+#include <sfx2/bindings.hxx>
-+#include <sfx2/viewfrm.hxx>
- #include <basic/sbstar.hxx>
- #include <svtools/languageoptions.hxx>
- #include <svtools/stritem.hxx>
-@@ -685,6 +687,17 @@ void ScTabViewShell::ExecuteTable( SfxRe
- 			}
- 			break;
- 
-+        case FID_TAB_TOGGLE_GRID:
-+            {
-+                bool bShowGrid = pViewData->GetShowGrid();
-+                pViewData->SetShowGrid(!bShowGrid);
-+                SfxBindings& rBindings = GetViewFrame()->GetBindings();
-+                rBindings.Invalidate( FID_TAB_TOGGLE_GRID );
-+                PaintGrid();
-+                rReq.Done();
-+            }
-+            break;
-+
- 		default:
- 			DBG_ERROR("Unbekannte Message bei ViewShell");
- 			break;
-@@ -800,6 +813,10 @@ void ScTabViewShell::GetStateTable( SfxI
- 						rSet.Put( SfxBoolItem( nWhich, pDoc->IsLayoutRTL( nTab ) ) );
- 				}
- 				break;
-+
-+            case FID_TAB_TOGGLE_GRID:
-+                rSet.Put( SfxBoolItem(nWhich, pViewData->GetShowGrid()) );
-+                break;
- 		}
- 		nWhich = aIter.NextWhich();
- 	}
-Only in sc/source/ui/view: tabvwshf.cxx.orig
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
---- sc.clean/source/ui/view/viewdata.cxx	2008-04-01 12:26:33.000000000 -0400
-+++ sc/source/ui/view/viewdata.cxx	2008-04-21 13:29:55.000000000 -0400
-@@ -121,6 +121,7 @@ ScViewDataTable::ScViewDataTable() :
- 				nFixPosY( 0 ),
- 				nCurX( 0 ),
- 				nCurY( 0 ),
-+                bShowGrid( true ),
-                 bOldCurValid( FALSE )
- {
- 	nPosX[0]=nPosX[1]=0;
-@@ -181,6 +182,9 @@ void ScViewDataTable::WriteUserDataSeque
-         pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE));
-         pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue;
- 
-+        pSettings[SC_TABLE_SHOWGRID].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID));
-+        pSettings[SC_TABLE_SHOWGRID].Value <<= static_cast<sal_Bool>(bShowGrid);
-+
- //        pSettings[SC_TABLE_SELECTED].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_TABLESELECTED));
- //        pSettings[SC_TABLE_SELECTED].Value <<= bool(rViewData.GetMarkData().GetTableSelect( nTab ));
- 	}
-@@ -287,6 +291,10 @@ void ScViewDataTable::ReadUserDataSequen
-             aPageZoomX = aPageZoomY = aZoom;
-             rHasZoom = true;
-         }
-+        else if (sName.compareToAscii(SC_UNO_SHOWGRID) == 0)
-+        {
-+            aSettings[i].Value >>= bShowGrid;
-+        }
-         else if (sName.compareToAscii(SC_TABLESELECTED) == 0)
-         {
-             bool bSelected = false;
-@@ -677,6 +685,12 @@ void ScViewData::SetZoom( const Fraction
- 	RefreshZoom();
- }
- 
-+void ScViewData::SetShowGrid( bool bShow )
-+{
-+    CreateSelectedTabData();
-+    pTabData[nTabNo]->bShowGrid = bShow;
-+}
-+
- void ScViewData::RefreshZoom()
- {
-     // recalculate zoom-dependent values (only for current sheet)
-@@ -2476,6 +2490,7 @@ void ScViewData::WriteExtOptions( ScExtD
-                 if( rGridColor.GetColor() != SC_STD_GRIDCOLOR )
-                     rTabSett.maGridColor = rGridColor;
-             }
-+            rTabSett.mbShowGrid = pViewTab->bShowGrid;
- 
-             // view mode and zoom
-             rTabSett.mbPageMode = bPagebreak;
-@@ -2608,6 +2623,8 @@ void ScViewData::ReadExtOptions( const S
-             if( rTabSett.mnPageZoom )
-                 rViewTab.aPageZoomX = rViewTab.aPageZoomY = Fraction( rTabSett.mnPageZoom, 100L );
- 
-+            rViewTab.bShowGrid = rTabSett.mbShowGrid;
-+
-             // get some settings from displayed Excel sheet, set at Calc document
-             if( nTab == GetTabNo() )
-             {
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/uiconfig/scalc/toolbar/formatobjectbar.xml sc/uiconfig/scalc/toolbar/formatobjectbar.xml
---- sc.clean/uiconfig/scalc/toolbar/formatobjectbar.xml	2008-04-01 12:26:30.000000000 -0400
-+++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml	2008-04-21 13:29:55.000000000 -0400
-@@ -50,4 +50,6 @@
-  <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:26268"  toolbar:visible="false" />
-  <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:26236"  toolbar:visible="false" />
-  <toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:26237"  toolbar:visible="false" />
-+ <toolbar:toolbarseparator/>
-+ <toolbar:toolbaritem xlink:href=".uno:ToggleSheetGrid" toolbar:helpid="helpid:26238"  toolbar:visible="true" />
- </toolbar:toolbar>
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=officecfg.vpj officecfg.clean/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
---- officecfg.clean/registry/data/org/openoffice/Office/UI/CalcCommands.xcu	2008-04-21 13:22:35.000000000 -0400
-+++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu	2008-04-21 13:29:55.000000000 -0400
-@@ -1454,6 +1454,14 @@
-                     <value xml:lang="en-US">S~hare Document...</value>
-                 </prop>
-             </node>
-+            <node oor:name=".uno:ToggleSheetGrid" oor:op="replace">
-+                <prop oor:name="Label" oor:type="xs:string">
-+                    <value xml:lang="en-US">Toggle Grid Lines for Current Sheet</value>
-+                </prop>
-+                <prop oor:name="Properties" oor:type="xs:int">
-+                    <value>1</value>
-+                </prop>
-+            </node>
-         </node>
- 		<node oor:name="Popups">
- 			<node oor:name=".uno:AuditMenu" oor:op="replace">
-Only in officecfg/registry/data/org/openoffice/Office/UI: CalcCommands.xcu.orig
diff --git a/applied_patches/0545-unittesting-extensions.diff b/applied_patches/0429-unittesting-extensions.diff
similarity index 100%
rename from applied_patches/0545-unittesting-extensions.diff
rename to applied_patches/0429-unittesting-extensions.diff
diff --git a/applied_patches/0430-calc-formula-variable-separators-sc.diff b/applied_patches/0430-calc-formula-variable-separators-sc.diff
deleted file mode 100644
index f6c4424b6..000000000
--- a/applied_patches/0430-calc-formula-variable-separators-sc.diff
+++ /dev/null
@@ -1,1048 +0,0 @@
-diff --git formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/FormulaCompiler.hxx
-index 7da03fd..6df4898 100644
---- formula/inc/formula/FormulaCompiler.hxx
-+++ formula/inc/formula/FormulaCompiler.hxx
-@@ -237,6 +237,8 @@ public:
-         including an address reference convention. */
-     inline  FormulaGrammar::Grammar   GetGrammar() const { return meGrammar; }
- 
-+    static void UpdateSeparatorsNative( const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep );
-+
- protected:
-     virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const;
-     virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const;
-diff --git formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/FormulaCompiler.cxx
-index d031c9a..5834e9e 100644
---- formula/source/core/api/FormulaCompiler.cxx
-+++ formula/source/core/api/FormulaCompiler.cxx
-@@ -1681,6 +1681,17 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String &
-         rBuffer.append(sal_Unicode('"'));
-     }
- }
-+
-+void FormulaCompiler::UpdateSeparatorsNative( 
-+    const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep )
-+{
-+    NonConstOpCodeMapPtr xSymbolsNative;
-+    lcl_fillNativeSymbols(xSymbolsNative);
-+    xSymbolsNative->putOpCode(rSep, ocSep);
-+    xSymbolsNative->putOpCode(rArrayColSep, ocArrayColSep);
-+    xSymbolsNative->putOpCode(rArrayRowSep, ocArrayRowSep);
-+}
-+
- // -----------------------------------------------------------------------------
- OpCode FormulaCompiler::NextToken()
- {
-diff --git sc/inc/docoptio.hxx sc/inc/docoptio.hxx
-index 51a6405..bbd92e8 100644
---- sc/inc/docoptio.hxx
-+++ sc/inc/docoptio.hxx
-@@ -36,6 +36,8 @@
- #include "scdllapi.h"
- #include "optutil.hxx"
- 
-+#include "formula/grammar.hxx"
-+
- class SC_DLLPUBLIC ScDocOptions
- {
- 	double fIterEps;				// Epsilon-Wert dazu
-@@ -53,6 +55,11 @@ class SC_DLLPUBLIC ScDocOptions
- 	BOOL   bDoAutoSpell;			// Auto-Spelling
- 	BOOL   bLookUpColRowNames;		// Spalten-/Zeilenbeschriftungen automagisch suchen
-     BOOL   bFormulaRegexEnabled;    // regular expressions in formulas enabled
-+    ::formula::FormulaGrammar::Grammar eFormulaGrammar;  // formula grammar used to switch different formula syntax
-+
-+    ::rtl::OUString aFormulaSepArg;
-+    ::rtl::OUString aFormulaSepArrayRow;
-+    ::rtl::OUString aFormulaSepArrayCol;
- 
- public:
- 				ScDocOptions();
-@@ -99,6 +106,20 @@ public:
- 
-     void    SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; }
-     BOOL    IsFormulaRegexEnabled() const       { return bFormulaRegexEnabled; }
-+
-+    void SetFormulaSyntax( ::formula::FormulaGrammar::Grammar eGram ) { eFormulaGrammar = eGram; }
-+    ::formula::FormulaGrammar::Grammar GetFormulaSyntax() const { return eFormulaGrammar; }
-+
-+    void SetFormulaSepArg(const ::rtl::OUString& rSep) { aFormulaSepArg = rSep; }
-+    ::rtl::OUString GetFormulaSepArg() const { return aFormulaSepArg; }
-+
-+    void SetFormulaSepArrayRow(const ::rtl::OUString& rSep) { aFormulaSepArrayRow = rSep; }
-+    ::rtl::OUString GetFormulaSepArrayRow() const { return aFormulaSepArrayRow; }
-+
-+    void SetFormulaSepArrayCol(const ::rtl::OUString& rSep) { aFormulaSepArrayCol = rSep; }
-+    ::rtl::OUString GetFormulaSepArrayCol() const { return aFormulaSepArrayCol; }
-+
-+    const LocaleDataWrapper& GetLocaleDataWrapper() const;
- };
- 
- 
-@@ -119,6 +140,10 @@ inline void ScDocOptions::CopyTo(ScDocOptions& rOpt)
- 	rOpt.bDoAutoSpell			= bDoAutoSpell;
- 	rOpt.bLookUpColRowNames		= bLookUpColRowNames;
-     rOpt.bFormulaRegexEnabled   = bFormulaRegexEnabled;
-+    rOpt.eFormulaGrammar        = eFormulaGrammar;
-+    rOpt.aFormulaSepArg         = aFormulaSepArg;
-+    rOpt.aFormulaSepArrayRow    = aFormulaSepArrayRow;
-+    rOpt.aFormulaSepArrayCol    = aFormulaSepArrayCol;
- }
- 
- inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
-@@ -138,6 +163,10 @@ inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
- 	bDoAutoSpell		= rCpy.bDoAutoSpell;
- 	bLookUpColRowNames	= rCpy.bLookUpColRowNames;
-     bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled;
-+    eFormulaGrammar     = rCpy.eFormulaGrammar;
-+    aFormulaSepArg      = rCpy.aFormulaSepArg;
-+    aFormulaSepArrayRow = rCpy.aFormulaSepArrayRow;
-+    aFormulaSepArrayCol = rCpy.aFormulaSepArrayCol;
- 
- 	return *this;
- }
-@@ -160,6 +189,10 @@ inline int ScDocOptions::operator==( const ScDocOptions& rOpt ) const
- 			&&	rOpt.bDoAutoSpell			== bDoAutoSpell
- 			&&	rOpt.bLookUpColRowNames		== bLookUpColRowNames
-             &&  rOpt.bFormulaRegexEnabled   == bFormulaRegexEnabled
-+            &&  rOpt.eFormulaGrammar        == eFormulaGrammar
-+            &&  rOpt.aFormulaSepArg         == aFormulaSepArg
-+            &&  rOpt.aFormulaSepArrayRow    == aFormulaSepArrayRow
-+            &&  rOpt.aFormulaSepArrayCol    == aFormulaSepArrayCol
- 			);
- }
- 
-@@ -199,12 +232,15 @@ private:
- class ScDocCfg : public ScDocOptions
- {
- 	ScLinkConfigItem	aCalcItem;
-+    ScLinkConfigItem    aFormulaItem;
- 	ScLinkConfigItem	aLayoutItem;
- 
- 	DECL_LINK( CalcCommitHdl, void* );
-+    DECL_LINK( FormulaCommitHdl, void* );
- 	DECL_LINK( LayoutCommitHdl, void* );
- 
- 	com::sun::star::uno::Sequence<rtl::OUString> GetCalcPropertyNames();
-+	com::sun::star::uno::Sequence<rtl::OUString> GetFormulaPropertyNames();
- 	com::sun::star::uno::Sequence<rtl::OUString> GetLayoutPropertyNames();
- 
- public:
-diff --git sc/inc/sc.hrc sc/inc/sc.hrc
-index 7301766..2eba0d8 100644
---- sc/inc/sc.hrc
-+++ sc/inc/sc.hrc
-@@ -1660,5 +1660,9 @@
- // Autoformat for DataPilot
- #define SID_PIVOT_AFMT              (SC_OOO_BUILD_START + 4)
- 
-+// Formula options page
-+#define RID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 5)
-+#define HID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 6)
-+
- #endif
- 
-diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
-index ec6c46c..27f9d36 100644
---- sc/source/core/data/documen3.cxx
-+++ sc/source/core/data/documen3.cxx
-@@ -54,6 +54,7 @@
- #include "rangelst.hxx"
- #include "chartarr.hxx"
- #include "chartlock.hxx"
-+#include "compiler.hxx"
- #include "refupdat.hxx"
- #include "docoptio.hxx"
- #include "viewopti.hxx"
-@@ -1771,6 +1772,11 @@ void ScDocument::SetDocOptions( const ScDocOptions& rOpt )
- 	pFormatter->ChangeNullDate( d,m,y );
- 	pFormatter->ChangeStandardPrec( (USHORT)rOpt.GetStdPrecision() );
- 	pFormatter->SetYear2000( rOpt.GetYear2000() );
-+    SetGrammar( rOpt.GetFormulaSyntax() );
-+
-+    // Update the separators.
-+    ScCompiler::UpdateSeparatorsNative(
-+        rOpt.GetFormulaSepArg(), rOpt.GetFormulaSepArrayCol(), rOpt.GetFormulaSepArrayRow());
- }
- 
- const ScViewOptions& ScDocument::GetViewOptions() const
-diff --git sc/source/core/tool/docoptio.cxx sc/source/core/tool/docoptio.cxx
-index ffbb2d9..4338af6 100644
---- sc/source/core/tool/docoptio.cxx
-+++ sc/source/core/tool/docoptio.cxx
-@@ -38,6 +38,8 @@
- 
- #include <com/sun/star/uno/Any.hxx>
- #include <com/sun/star/uno/Sequence.hxx>
-+#include <com/sun/star/lang/Locale.hpp>
-+#include <com/sun/star/i18n/LocaleDataItem.hpp>
- 
- #include "cfgids.hxx"
- #include "docoptio.hxx"
-@@ -45,10 +47,13 @@
- #include "scresid.hxx"
- #include "sc.hrc"
- #include "miscuno.hxx"
-+#include "global.hxx"
- 
- using namespace utl;
- using namespace rtl;
- using namespace com::sun::star::uno;
-+using ::com::sun::star::lang::Locale;
-+using ::com::sun::star::i18n::LocaleDataItem;
- 
- //------------------------------------------------------------------------
- 
-@@ -100,7 +105,11 @@ ScDocOptions::ScDocOptions( const ScDocOptions& rCpy )
- 			bMatchWholeCell( rCpy.bMatchWholeCell ),
- 			bDoAutoSpell( rCpy.bDoAutoSpell ),
-             bLookUpColRowNames( rCpy.bLookUpColRowNames ),
--            bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled )
-+            bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled ),
-+            eFormulaGrammar( rCpy.eFormulaGrammar ),
-+            aFormulaSepArg( rCpy.aFormulaSepArg ),
-+            aFormulaSepArrayRow( rCpy.aFormulaSepArrayRow ),
-+            aFormulaSepArrayCol( rCpy.aFormulaSepArrayCol )
- {
- }
- 
-@@ -129,6 +138,67 @@ void ScDocOptions::ResetDocOptions()
- 	bDoAutoSpell		= FALSE;
- 	bLookUpColRowNames	= TRUE;
-     bFormulaRegexEnabled= TRUE;
-+    eFormulaGrammar     = ::formula::FormulaGrammar::GRAM_NATIVE;
-+
-+    do
-+    {
-+        const Locale& rLocale = *ScGlobal::pLocale;
-+        const OUString& rLang = rLocale.Language;
-+        if (rLang.equalsAscii("ru"))
-+            // Don't do automatic guess for these languages, and fall back to 
-+            // the old separator set.
-+            break;
-+
-+        const LocaleDataWrapper& rLocaleData = GetLocaleDataWrapper();
-+        const OUString& rDecSep  = rLocaleData.getNumDecimalSep();
-+        const OUString& rListSep = rLocaleData.getListSep();
-+
-+        if (!rDecSep.getLength() || !rListSep.getLength())
-+            // Something is wrong.  Stick with the default separators.
-+            break;
-+
-+        sal_Unicode cDecSep  = rDecSep.getStr()[0];
-+        sal_Unicode cListSep = rListSep.getStr()[0];
-+        
-+        // Excel by default uses system's list separator as the parameter
-+        // separator, which in English locales is a comma.  However, OOo's list
-+        // separator value is set to ';' for all English locales.  Because of this
-+        // discrepancy, we will hardcode the separator value here, for now.
-+        if (cDecSep == sal_Unicode('.'))
-+            cListSep = sal_Unicode(',');
-+
-+        // Special case for de_CH locale.
-+        if (rLocale.Language.equalsAsciiL("de", 2) && rLocale.Country.equalsAsciiL("CH", 2))
-+            cListSep = sal_Unicode(';');
-+
-+        // by default, the parameter separator equals the locale-specific
-+        // list separator.
-+        aFormulaSepArg = OUString(cListSep);
-+
-+        if (cDecSep == cListSep && cDecSep != sal_Unicode(';'))
-+            // if the decimal and list separators are equal, set the
-+            // parameter separator to be ';', unless they are both
-+            // semicolon in which case don't change the decimal separator.
-+            aFormulaSepArg = OUString::createFromAscii(";");
-+
-+        aFormulaSepArrayCol = OUString::createFromAscii(",");
-+        if (cDecSep == sal_Unicode(','))
-+            aFormulaSepArrayCol = OUString::createFromAscii(".");
-+        aFormulaSepArrayRow = OUString::createFromAscii(";");
-+
-+        return;
-+    }
-+    while (false);
-+
-+    // Defaults to the old separator values.
-+    aFormulaSepArg      = OUString::createFromAscii(";");
-+    aFormulaSepArrayCol = OUString::createFromAscii(";");
-+    aFormulaSepArrayRow = OUString::createFromAscii("|");
-+}
-+
-+const LocaleDataWrapper& ScDocOptions::GetLocaleDataWrapper() const
-+{
-+    return *ScGlobal::pLocaleData;
- }
- 
- //========================================================================
-@@ -206,6 +276,13 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clone( SfxItemPool * ) const
- #define SCCALCOPT_REGEX             11
- #define SCCALCOPT_COUNT             12
- 
-+#define CFGPATH_FORMULA     "Office.Calc/Formula"
-+#define SCFORMULAOPT_GRAMMAR           0
-+#define SCFORMULAOPT_SEP_ARG           1
-+#define SCFORMULAOPT_SEP_ARRAY_ROW     2
-+#define SCFORMULAOPT_SEP_ARRAY_COL     3
-+#define SCFORMULAOPT_COUNT             4
-+
- #define CFGPATH_DOCLAYOUT	"Office.Calc/Layout/Other"
- 
- #define SCDOCLAYOUTOPT_TABSTOP		0
-@@ -227,7 +304,7 @@ Sequence<OUString> ScDocCfg::GetCalcPropertyNames()
- 		"Other/Precision",					// SCCALCOPT_PRECISION
- 		"Other/SearchCriteria",				// SCCALCOPT_SEARCHCRIT
-         "Other/FindLabel",                  // SCCALCOPT_FINDLABEL
--        "Other/RegularExpressions"          // SCCALCOPT_REGEX
-+        "Other/RegularExpressions",         // SCCALCOPT_REGEX
- 	};
- 	Sequence<OUString> aNames(SCCALCOPT_COUNT);
- 	OUString* pNames = aNames.getArray();
-@@ -237,6 +314,23 @@ Sequence<OUString> ScDocCfg::GetCalcPropertyNames()
- 	return aNames;
- }
- 
-+Sequence<OUString> ScDocCfg::GetFormulaPropertyNames()
-+{
-+	static const char* aPropNames[] =
-+	{
-+        "Syntax/Grammar",             // SCFORMULAOPT_GRAMMAR       
-+        "Syntax/SeparatorArg",        // SCFORMULAOPT_SEP_ARG      
-+        "Syntax/SeparatorArrayRow",   // SCFORMULAOPT_SEP_ARRAY_ROW
-+        "Syntax/SeparatorArrayCol",   // SCFORMULAOPT_SEP_ARRAY_COL
-+	};
-+	Sequence<OUString> aNames(SCFORMULAOPT_COUNT);
-+	OUString* pNames = aNames.getArray();
-+	for (int i = 0; i < SCFORMULAOPT_COUNT; ++i)
-+		pNames[i] = OUString::createFromAscii(aPropNames[i]);
-+
-+	return aNames;
-+}
-+
- Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
- {
- 	static const char* aPropNames[] =
-@@ -257,6 +351,7 @@ Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
- 
- ScDocCfg::ScDocCfg() :
- 	aCalcItem( OUString::createFromAscii( CFGPATH_CALC ) ),
-+    aFormulaItem(OUString::createFromAscii(CFGPATH_FORMULA)),
- 	aLayoutItem( OUString::createFromAscii( CFGPATH_DOCLAYOUT ) )
- {
- 	sal_Int32 nIntVal = 0;
-@@ -328,6 +423,69 @@ ScDocCfg::ScDocCfg() :
- 
- 	SetDate( nDateDay, nDateMonth, nDateYear );
- 
-+    aNames = GetFormulaPropertyNames();
-+    aValues = aFormulaItem.GetProperties(aNames);
-+    aFormulaItem.EnableNotification(aNames);
-+    pValues = aValues.getConstArray();
-+    if (aValues.getLength() == aNames.getLength())
-+    {
-+        for (int nProp = 0; nProp < aNames.getLength(); ++nProp)
-+        {
-+            switch (nProp)
-+            {
-+                case SCFORMULAOPT_GRAMMAR:
-+                {
-+                    ::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
-+
-+                    do
-+                    {
-+                        if (!(pValues[nProp] >>= nIntVal))
-+                            // extractino failed.
-+                            break;
-+
-+                        switch (nIntVal)
-+                        {
-+                            case 0: // Calc A1
-+                                eGram = ::formula::FormulaGrammar::GRAM_NATIVE;
-+                            break;
-+                            case 1: // Excel A1
-+                                eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1;
-+                            break;
-+                            case 2: // Excel R1C1
-+                                eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1;
-+                            break;
-+                        }
-+                    }
-+                    while (false);
-+                    SetFormulaSyntax(eGram);
-+                }
-+                break;
-+                case SCFORMULAOPT_SEP_ARG:
-+                {
-+                    OUString aSep;
-+                    if ((pValues[nProp] >>= aSep) && aSep.getLength())
-+                        SetFormulaSepArg(aSep);
-+                }
-+                break;
-+                case SCFORMULAOPT_SEP_ARRAY_ROW:
-+                {
-+                    OUString aSep;
-+                    if ((pValues[nProp] >>= aSep) && aSep.getLength())
-+                        SetFormulaSepArrayRow(aSep);
-+                }
-+                break;
-+                case SCFORMULAOPT_SEP_ARRAY_COL:
-+                {
-+                    OUString aSep;
-+                    if ((pValues[nProp] >>= aSep) && aSep.getLength())
-+                        SetFormulaSepArrayCol(aSep);
-+                }
-+                break;
-+            }
-+        }
-+    }
-+    aFormulaItem.SetCommitLink( LINK(this, ScDocCfg, FormulaCommitHdl) );
-+
- 	aNames = GetLayoutPropertyNames();
- 	aValues = aLayoutItem.GetProperties(aNames);
- 	aLayoutItem.EnableNotification(aNames);
-@@ -410,6 +568,43 @@ IMPL_LINK( ScDocCfg, CalcCommitHdl, void *, EMPTYARG )
- 	return 0;
- }
- 
-+IMPL_LINK( ScDocCfg, FormulaCommitHdl, void *, EMPTYARG )
-+{
-+    Sequence<OUString> aNames = GetFormulaPropertyNames();
-+    Sequence<Any> aValues(aNames.getLength());
-+    Any* pValues = aValues.getArray();
-+
-+    for (int nProp = 0; nProp < aNames.getLength(); ++nProp)
-+    {
-+        switch (nProp)
-+        {
-+            case SCFORMULAOPT_GRAMMAR :
-+            {
-+                sal_Int32 nVal = 0;
-+                switch (GetFormulaSyntax())
-+                {
-+                    case ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1:    nVal = 1; break;
-+                    case ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1:  nVal = 2; break;
-+                }
-+                pValues[nProp] <<= nVal;
-+            }
-+            break;
-+            case SCFORMULAOPT_SEP_ARG:
-+                pValues[nProp] <<= GetFormulaSepArg();
-+            break;
-+            case SCFORMULAOPT_SEP_ARRAY_ROW:
-+                pValues[nProp] <<= GetFormulaSepArrayRow();
-+            break;
-+            case SCFORMULAOPT_SEP_ARRAY_COL:
-+                pValues[nProp] <<= GetFormulaSepArrayCol();
-+            break;
-+        }
-+    }
-+    aFormulaItem.PutProperties(aNames, aValues);
-+
-+    return 0;
-+}
-+
- IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG )
- {
- 	Sequence<OUString> aNames = GetLayoutPropertyNames();
-@@ -439,6 +634,7 @@ void ScDocCfg::SetOptions( const ScDocOptions& rNew )
- 	*(ScDocOptions*)this = rNew;
- 
- 	aCalcItem.SetModified();
-+    aFormulaItem.SetModified();
- 	aLayoutItem.SetModified();
- }
- 
-diff --git sc/source/ui/app/scmod.cxx sc/source/ui/app/scmod.cxx
-index bc0a91f..2362c23 100644
---- sc/source/ui/app/scmod.cxx
-+++ sc/source/ui/app/scmod.cxx
-@@ -2134,6 +2134,13 @@ SfxTabPage*	 ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem
- 														pRet = (*ScTpCalcOptionsCreate)(pParent, rSet);
- 								}
- 								break;
-+        case SID_SC_TP_FORMULA:
-+        {
-+            ::CreateTabPage ScTpFormulaOptionsCreate = pFact->GetTabPageCreatorFunc (RID_SCPAGE_FORMULA);
-+            if (ScTpFormulaOptionsCreate)
-+                pRet = (*ScTpFormulaOptionsCreate)(pParent, rSet);
-+        }
-+        break;
- 		case SID_SC_TP_CHANGES:
- 								{			//CHINA001 pRet = ScRedlineOptionsTabPage::Create(pParent, rSet);
- 											::CreateTabPage ScRedlineOptionsTabPageCreate =	pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE );
-diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx
-index de9b284..7e6e248 100644
---- sc/source/ui/attrdlg/scdlgfact.cxx
-+++ sc/source/ui/attrdlg/scdlgfact.cxx
-@@ -76,6 +76,7 @@
- #include "tpstat.hxx" //add for ScDocStatPage
- #include "tpusrlst.hxx" //add for ScTpUserLists
- #include "tpview.hxx" //add for ScTpContentOptions
-+#include "tpformula.hxx"
- //for dataform
- #include "datafdlg.hxx" //add for ScDataFormDlg
- 
-@@ -1432,6 +1433,8 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
- 		case	RID_SCPAGE_CALC :
- 			return ScTpCalcOptions::Create;
-             //break;
-+        case RID_SCPAGE_FORMULA:
-+            return ScTpFormulaOptions::Create;
- 		case	RID_SCPAGE_PRINT :
- 			return ScTpPrintOptions::Create;
-             //break;
-diff --git sc/source/ui/inc/optdlg.hrc sc/source/ui/inc/optdlg.hrc
-index e834a11..aaeb33d 100644
---- sc/source/ui/inc/optdlg.hrc
-+++ sc/source/ui/inc/optdlg.hrc
-@@ -52,6 +52,7 @@
- #define TP_LAYOUT           12
- #define TP_INPUT            13
- #define TP_CHANGES			14
-+#define TP_FORMULA          15
- 
- // TP_CALC:
- #define BTN_ITERATE			1
-@@ -192,3 +193,16 @@
- #define CB_TEXTFMT		78
- #define CB_REPLWARN     79
- 
-+
-+// TP_FORMULA
-+#define FL_FORMULA_OPTIONS        80
-+#define FT_FORMULA_SYNTAX         81
-+#define LB_FORMULA_SYNTAX         82
-+#define FL_FORMULA_SEPS           83
-+#define FT_FORMULA_SEP_ARG        84
-+#define ED_FORMULA_SEP_ARG        85
-+#define FT_FORMULA_SEP_ARRAY_R    86
-+#define ED_FORMULA_SEP_ARRAY_R    87
-+#define FT_FORMULA_SEP_ARRAY_C    88
-+#define ED_FORMULA_SEP_ARRAY_C    89
-+#define BTN_FORMULA_SEP_RESET     90
-diff --git sc/source/ui/inc/tpformula.hxx sc/source/ui/inc/tpformula.hxx
-new file mode 100644
-index 0000000..054655e
---- /dev/null
-+++ sc/source/ui/inc/tpformula.hxx
-@@ -0,0 +1,96 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: tpcalc.hxx,v $
-+ * $Revision: 1.9 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SC_TPFORMULA_HXX
-+#define SC_TPFORMULA_HXX
-+
-+#include <sfx2/tabdlg.hxx>
-+#include <vcl/fixed.hxx>
-+#include <vcl/lstbox.hxx>
-+#include <vcl/edit.hxx>
-+#include <vcl/button.hxx>
-+
-+#include <memory>
-+
-+class ScDocOptions;
-+class SfxItemSet;
-+class Window;
-+
-+class ScTpFormulaOptions : public SfxTabPage
-+{
-+public:
-+    static  SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet);
-+
-+//  static  USHORT*     GetRanges();
-+    virtual BOOL FillItemSet(SfxItemSet& rCoreSet);
-+    virtual void Reset( const SfxItemSet& rCoreSet );
-+    virtual int DeactivatePage(SfxItemSet* pSet = NULL);
-+
-+private:
-+    explicit ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreSet);
-+    virtual ~ScTpFormulaOptions();
-+
-+    void Init();
-+    void ResetSeparators();
-+    void OnFocusSeparatorInput(Edit* pEdit);
-+
-+    bool IsValidSeparator(const ::rtl::OUString& rSep) const;
-+    bool IsValidSeparatorSet() const;
-+
-+    DECL_LINK( ButtonHdl, PushButton* );
-+    DECL_LINK( SepModifyHdl, Edit* );
-+    DECL_LINK( SepEditOnFocusHdl, Edit* );
-+
-+private:
-+    FixedLine maFlFormulaOpt;
-+    FixedText maFtFormulaSyntax;
-+    ListBox   maLbFormulaSyntax;
-+
-+    FixedLine  maFlFormulaSeps;
-+    FixedText  maFtSepFuncArg;  
-+    Edit       maEdSepFuncArg;
-+    FixedText  maFtSepArrayCol;
-+    Edit       maEdSepArrayCol;
-+    FixedText  maFtSepArrayRow;
-+    Edit       maEdSepArrayRow;
-+    PushButton maBtnSepReset;
-+
-+    ::std::auto_ptr<ScDocOptions> mpOldOptions;
-+    ::std::auto_ptr<ScDocOptions> mpNewOptions;
-+
-+    /** Stores old separator value of currently focused separator edit box.
-+        This value is used to revert undesired value change. */
-+    ::rtl::OUString maOldSepValue;
-+
-+    sal_Unicode mnDecSep;
-+};
-+
-+
-+#endif
-diff --git sc/source/ui/optdlg/makefile.mk sc/source/ui/optdlg/makefile.mk
-index e8a6d20..cb43db7 100644
---- sc/source/ui/optdlg/makefile.mk
-+++ sc/source/ui/optdlg/makefile.mk
-@@ -47,6 +47,7 @@ CXXFILES = \
-         tpusrlst.cxx    \
-         tpview.cxx      \
-         tpcalc.cxx      \
-+        tpformula.cxx   \
-         tpprint.cxx     \
-         opredlin.cxx
- 
-@@ -54,6 +55,7 @@ SLOFILES =  \
-         $(SLO)$/tpusrlst.obj \
-         $(SLO)$/tpview.obj   \
-         $(SLO)$/tpcalc.obj	\
-+        $(SLO)$/tpformula.obj	\
-         $(SLO)$/tpprint.obj	\
-         $(SLO)$/opredlin.obj
- 
-diff --git sc/source/ui/optdlg/tpformula.cxx sc/source/ui/optdlg/tpformula.cxx
-new file mode 100644
-index 0000000..a27d5a7
---- /dev/null
-+++ sc/source/ui/optdlg/tpformula.cxx
-@@ -0,0 +1,289 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: tpcalc.hxx,v $
-+ * $Revision: 1.9 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_sc.hxx"
-+
-+#undef SC_DLLIMPLEMENTATION
-+
-+
-+
-+//------------------------------------------------------------------
-+
-+#include "tpformula.hxx"
-+#include "optdlg.hrc"
-+#include "scresid.hxx"
-+#include "formula/grammar.hxx"
-+#include "docoptio.hxx"
-+#include "global.hxx"
-+
-+#include <unotools/localedatawrapper.hxx>
-+
-+#include <com/sun/star/lang/Locale.hpp>
-+#include <com/sun/star/i18n/LocaleDataItem.hpp>
-+
-+using ::rtl::OUString;
-+using ::com::sun::star::lang::Locale;
-+using ::com::sun::star::i18n::LocaleDataItem;
-+
-+ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreAttrs) :
-+    SfxTabPage(pParent, ScResId(RID_SCPAGE_FORMULA), rCoreAttrs),
-+
-+    maFlFormulaOpt(this, ScResId(FL_FORMULA_OPTIONS)),
-+    maFtFormulaSyntax(this, ScResId(FT_FORMULA_SYNTAX)),
-+    maLbFormulaSyntax(this, ScResId(LB_FORMULA_SYNTAX)),
-+    maFlFormulaSeps(this, ScResId(FL_FORMULA_SEPS)),
-+    maFtSepFuncArg(this, ScResId(FT_FORMULA_SEP_ARG)),
-+    maEdSepFuncArg(this, ScResId(ED_FORMULA_SEP_ARG)),
-+    maFtSepArrayCol(this, ScResId(FT_FORMULA_SEP_ARRAY_C)),
-+    maEdSepArrayCol(this, ScResId(ED_FORMULA_SEP_ARRAY_C)),
-+    maFtSepArrayRow(this, ScResId(FT_FORMULA_SEP_ARRAY_R)),
-+    maEdSepArrayRow(this, ScResId(ED_FORMULA_SEP_ARRAY_R)),
-+    maBtnSepReset(this, ScResId(BTN_FORMULA_SEP_RESET)),
-+
-+    mpOldOptions(NULL),
-+    mpNewOptions(NULL),
-+    mnDecSep(0)
-+{
-+    FreeResource();
-+
-+    const ScTpCalcItem& rItem = static_cast<const ScTpCalcItem&>(
-+        rCoreAttrs.Get(GetWhich(SID_SCDOCOPTIONS)));
-+    mpOldOptions.reset(new ScDocOptions(rItem.GetDocOptions()));
-+    mpNewOptions.reset(new ScDocOptions(rItem.GetDocOptions()));
-+
-+    Init();
-+}
-+
-+ScTpFormulaOptions::~ScTpFormulaOptions()
-+{
-+}
-+
-+void ScTpFormulaOptions::Init()
-+{
-+    Link aLink = LINK( this, ScTpFormulaOptions, ButtonHdl );
-+    maBtnSepReset.SetClickHdl(aLink);
-+
-+    aLink = LINK( this, ScTpFormulaOptions, SepModifyHdl );
-+    maEdSepFuncArg.SetModifyHdl(aLink);
-+    maEdSepArrayCol.SetModifyHdl(aLink);
-+    maEdSepArrayRow.SetModifyHdl(aLink);
-+
-+    aLink = LINK( this, ScTpFormulaOptions, SepEditOnFocusHdl );
-+    maEdSepFuncArg.SetGetFocusHdl(aLink);
-+    maEdSepArrayCol.SetGetFocusHdl(aLink);
-+    maEdSepArrayRow.SetGetFocusHdl(aLink);
-+
-+    // Get the decimal separator for current locale.
-+    String aSep = mpOldOptions->GetLocaleDataWrapper().getNumDecimalSep();
-+    mnDecSep = aSep.Len() ? aSep.GetChar(0) : sal_Unicode('.');
-+}
-+
-+void ScTpFormulaOptions::ResetSeparators()
-+{
-+    ScDocOptions aOpt;
-+    maEdSepFuncArg.SetText(aOpt.GetFormulaSepArg());
-+    maEdSepArrayCol.SetText(aOpt.GetFormulaSepArrayCol());
-+    maEdSepArrayRow.SetText(aOpt.GetFormulaSepArrayRow());
-+}
-+
-+void ScTpFormulaOptions::OnFocusSeparatorInput(Edit* pEdit)
-+{
-+    if (!pEdit)
-+        return;
-+
-+    // Make sure the entire text is selected.
-+    xub_StrLen nLen = pEdit->GetText().Len();
-+    Selection aSel(0, nLen);
-+    pEdit->SetSelection(aSel);
-+    maOldSepValue = pEdit->GetText();
-+}
-+
-+bool ScTpFormulaOptions::IsValidSeparator(const OUString& rSep) const
-+{
-+    if (rSep.getLength() != 1)
-+        // Must be one-character long.
-+        return false;
-+
-+    if (rSep.compareToAscii("a") >= 0 && rSep.compareToAscii("z") <= 0)
-+        return false;
-+
-+    if (rSep.compareToAscii("A") >= 0 && rSep.compareToAscii("Z") <= 0)
-+        return false;
-+
-+    sal_Unicode c = rSep.getStr()[0];
-+    switch (c)
-+    {
-+        case '+':
-+        case '-':
-+        case '/':
-+        case '*':
-+        case '<':
-+        case '>':
-+        case '[':
-+        case ']':
-+        case '(':
-+        case ')':
-+        case '"':
-+        case '\'':
-+            // Disallowed characters.  Anything else we want to disallow ?
-+            return false;
-+    }
-+
-+    if (c == mnDecSep)
-+        // decimal separator is not allowed.
-+        return false;
-+
-+    return true;
-+}
-+
-+bool ScTpFormulaOptions::IsValidSeparatorSet() const
-+{
-+    // Make sure the column and row separators are different.
-+    String aColStr = maEdSepArrayCol.GetText();
-+    String aRowStr = maEdSepArrayRow.GetText();
-+    if (aColStr == aRowStr)
-+        return false;
-+
-+    return true;
-+}
-+
-+IMPL_LINK( ScTpFormulaOptions, ButtonHdl, PushButton*, pBtn )
-+{
-+    if (pBtn == &maBtnSepReset)
-+        ResetSeparators();
-+
-+    return 0;
-+}
-+
-+IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, Edit*, pEdit )
-+{
-+    if (!pEdit)
-+        return 0;
-+
-+    String aStr = pEdit->GetText();
-+    if (aStr.Len() > 1)
-+    {
-+        // In case the string is more than one character long, only grab the 
-+        // first character.
-+        aStr = aStr.Copy(0, 1);
-+        pEdit->SetText(aStr);
-+    }
-+
-+    if ((!IsValidSeparator(aStr) || !IsValidSeparatorSet()) && maOldSepValue.getLength())
-+        // Invalid separator.  Restore the old value.
-+        pEdit->SetText(maOldSepValue);
-+
-+    OnFocusSeparatorInput(pEdit);
-+    return 0;
-+}
-+
-+IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Edit*, pEdit )
-+{
-+    OnFocusSeparatorInput(pEdit);
-+    return 0;
-+}
-+
-+// static
-+SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreSet)
-+{
-+    return new ScTpFormulaOptions(pParent, rCoreSet);
-+}
-+
-+BOOL ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet)
-+{
-+    ::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
-+    switch (maLbFormulaSyntax.GetSelectEntryPos())
-+    {
-+        case 0:
-+            eGram = ::formula::FormulaGrammar::GRAM_NATIVE;
-+        break;
-+        case 1:
-+            eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1;
-+        break;
-+        case 2:
-+            eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1;
-+        break;
-+    }
-+
-+    mpNewOptions->SetFormulaSyntax(eGram);
-+
-+    mpNewOptions->SetFormulaSepArg(maEdSepFuncArg.GetText());
-+    mpNewOptions->SetFormulaSepArrayCol(maEdSepArrayCol.GetText());
-+    mpNewOptions->SetFormulaSepArrayRow(maEdSepArrayRow.GetText());
-+
-+    if (*mpNewOptions != *mpOldOptions)
-+    {
-+        rCoreSet.Put(ScTpCalcItem(GetWhich(SID_SCDOCOPTIONS), *mpNewOptions));
-+        return true;
-+    }
-+    else 
-+        return false;
-+}
-+
-+void ScTpFormulaOptions::Reset(const SfxItemSet& /*rCoreSet*/)
-+{
-+    ::formula::FormulaGrammar::Grammar eGram = mpNewOptions->GetFormulaSyntax();
-+    switch (eGram)
-+    {
-+        case ::formula::FormulaGrammar::GRAM_NATIVE:
-+            maLbFormulaSyntax.SelectEntryPos(0);
-+        break;
-+        case ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1:
-+            maLbFormulaSyntax.SelectEntryPos(1);
-+        break;
-+        case ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1:
-+            maLbFormulaSyntax.SelectEntryPos(2);
-+        break;
-+        default:
-+            maLbFormulaSyntax.SelectEntryPos(0);
-+    }
-+    
-+    OUString aSep = mpNewOptions->GetFormulaSepArg();
-+    OUString aSepArrayRow = mpNewOptions->GetFormulaSepArrayRow();
-+    OUString aSepArrayCol = mpNewOptions->GetFormulaSepArrayCol();
-+
-+    if (aSep.getLength() == 1 && aSepArrayRow.getLength() == 1 && aSepArrayCol.getLength() == 1)
-+    {
-+        // Each separator must be one character long.
-+        maEdSepFuncArg.SetText(aSep);
-+        maEdSepArrayCol.SetText(aSepArrayCol);
-+        maEdSepArrayRow.SetText(aSepArrayRow);
-+    }
-+    else
-+        ResetSeparators();    
-+}
-+
-+int ScTpFormulaOptions::DeactivatePage(SfxItemSet* /*pSet*/)
-+{
-+    // What's this method for ?
-+    return KEEP_PAGE;
-+}
-+
-diff --git sc/source/ui/src/optdlg.src sc/source/ui/src/optdlg.src
-index 82a1161..2ea00b8 100644
---- sc/source/ui/src/optdlg.src
-+++ sc/source/ui/src/optdlg.src
-@@ -176,6 +176,105 @@ TabPage RID_SCPAGE_CALC
- /*                                                                        */
- /**************************************************************************/
- 
-+TabPage RID_SCPAGE_FORMULA
-+{
-+    HelpId = HID_SCPAGE_FORMULA ;
-+    SVLook = TRUE ;
-+    Hide = TRUE ;
-+    Pos = MAP_APPFONT ( 0 , 0 ) ;
-+    Size = MAP_APPFONT ( 260 , 185 ) ;
-+
-+    FixedLine FL_FORMULA_OPTIONS
-+    {
-+        Pos = MAP_APPFONT ( 6 , 3 ) ;
-+        Size = MAP_APPFONT ( 248 , 8 ) ;
-+        Text [ en-US ] = "Formula options";
-+    };
-+
-+    FixedText FT_FORMULA_SYNTAX
-+    {
-+        Pos = MAP_APPFONT ( 21, 16 ) ;
-+        Size = MAP_APPFONT ( 80, 8 ) ;
-+        Text [ en-US ] = "Formula ~syntax" ;
-+    };
-+
-+    ListBox LB_FORMULA_SYNTAX
-+    {
-+        Border = TRUE ;
-+        Pos = MAP_APPFONT ( 85, 14 ) ;
-+        Size = MAP_APPFONT ( 60, 46 ) ;
-+        DropDown = TRUE ;
-+        StringList [ en-US ] =
-+        {
-+            < "Calc A1" ; Default ; > ;
-+            < "Excel A1" ; Default ; > ;
-+            < "Excel R1C1" ; Default ; > ;
-+        };
-+    };
-+
-+    FixedLine FL_FORMULA_SEPS
-+    {
-+        Pos = MAP_APPFONT ( 6 , 32 ) ;
-+        Size = MAP_APPFONT ( 248 , 8 ) ;
-+        Text [ en-US ] = "Separators";
-+    };
-+
-+    FixedText FT_FORMULA_SEP_ARG
-+    {
-+        Pos = MAP_APPFONT ( 21, 45 );
-+        Size = MAP_APPFONT ( 40, 8 );
-+        Text [ en-US ] = "~Function";
-+    };
-+
-+    Edit ED_FORMULA_SEP_ARG
-+    {
-+        Border = TRUE;
-+        Pos = MAP_APPFONT ( 65, 43 );
-+        Size = MAP_APPFONT ( 10, 12 );
-+    };
-+
-+    FixedText FT_FORMULA_SEP_ARRAY_C
-+    {
-+        Pos = MAP_APPFONT ( 21, 63 );
-+        Size = MAP_APPFONT ( 40, 8 );
-+        Text [ en-US ] = "Array co~lumn";
-+    };
-+
-+    Edit ED_FORMULA_SEP_ARRAY_C
-+    {
-+        Border = TRUE;
-+        Pos = MAP_APPFONT ( 65, 61 );
-+        Size = MAP_APPFONT ( 10, 12 );
-+    };
-+
-+    FixedText FT_FORMULA_SEP_ARRAY_R
-+    {
-+        Pos = MAP_APPFONT ( 21, 81 );
-+        Size = MAP_APPFONT ( 40, 8 );
-+        Text [ en-US ] = "Array ~row";
-+    };
-+
-+    Edit ED_FORMULA_SEP_ARRAY_R
-+    {
-+        Border = TRUE;
-+        Pos = MAP_APPFONT ( 65, 79 );
-+        Size = MAP_APPFONT ( 10, 12 );
-+    };
-+
-+    PushButton BTN_FORMULA_SEP_RESET
-+    {
-+        Pos = MAP_APPFONT ( 21, 99 );
-+        Size = MAP_APPFONT ( 40, 14 );
-+        Text [ en-US ] = "Rese~t";
-+    };
-+};
-+
-+/**************************************************************************/
-+/*                                                                        */
-+/*                                                                        */
-+/*                                                                        */
-+/**************************************************************************/
-+
- TabPage RID_SCPAGE_USERLISTS
- {
- 	HelpId = HID_SCPAGE_USERLISTS ;
diff --git a/applied_patches/0546-unittesting-filter.diff b/applied_patches/0430-unittesting-filter.diff
similarity index 100%
rename from applied_patches/0546-unittesting-filter.diff
rename to applied_patches/0430-unittesting-filter.diff
diff --git a/applied_patches/0547-unittesting-forms.diff b/applied_patches/0431-unittesting-forms.diff
similarity index 100%
rename from applied_patches/0547-unittesting-forms.diff
rename to applied_patches/0431-unittesting-forms.diff
diff --git a/applied_patches/0548-unittesting-fpicker.diff b/applied_patches/0432-unittesting-fpicker.diff
similarity index 100%
rename from applied_patches/0548-unittesting-fpicker.diff
rename to applied_patches/0432-unittesting-fpicker.diff
diff --git a/applied_patches/0549-unittesting-framework.diff b/applied_patches/0433-unittesting-framework.diff
similarity index 100%
rename from applied_patches/0549-unittesting-framework.diff
rename to applied_patches/0433-unittesting-framework.diff
diff --git a/applied_patches/0550-unittesting-chart2.diff b/applied_patches/0434-unittesting-chart2.diff
similarity index 100%
rename from applied_patches/0550-unittesting-chart2.diff
rename to applied_patches/0434-unittesting-chart2.diff
diff --git a/applied_patches/0551-unittesting-idlc.diff b/applied_patches/0435-unittesting-idlc.diff
similarity index 100%
rename from applied_patches/0551-unittesting-idlc.diff
rename to applied_patches/0435-unittesting-idlc.diff
diff --git a/applied_patches/0552-unittesting-io.diff b/applied_patches/0436-unittesting-io.diff
similarity index 100%
rename from applied_patches/0552-unittesting-io.diff
rename to applied_patches/0436-unittesting-io.diff
diff --git a/applied_patches/0553-unittesting-javaunohelper.diff b/applied_patches/0437-unittesting-javaunohelper.diff
similarity index 100%
rename from applied_patches/0553-unittesting-javaunohelper.diff
rename to applied_patches/0437-unittesting-javaunohelper.diff
diff --git a/applied_patches/0438-calc-sheet-tab-color-officecfg.diff b/applied_patches/0438-calc-sheet-tab-color-officecfg.diff
deleted file mode 100644
index 53b7f5f42..000000000
--- a/applied_patches/0438-calc-sheet-tab-color-officecfg.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-index d32c182..3df357d 100644
---- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-+++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-@@ -1252,6 +1252,19 @@
- 					<value xml:lang="en-US">Rename Sheet</value>
- 				</prop>
- 			</node>
-+            <node oor:name=".uno:SetTabBgColor" oor:op="replace">
-+                <prop oor:name="Label" oor:type="xs:string">
-+                    <value xml:lang="en-US">~Tab Color...</value>
-+                </prop>
-+                <prop oor:name="ContextLabel" oor:type="xs:string">
-+                    <value xml:lang="en-US">~Tab Color...</value>
-+                </prop>
-+            </node>
-+            <node oor:name=".uno:TabBgColor" oor:op="replace">
-+                <prop oor:name="Label" oor:type="xs:string">
-+                    <value xml:lang="en-US">Tab Color</value>
-+                </prop>
-+            </node>
- 			<node oor:name=".uno:Move" oor:op="replace">
- 				<prop oor:name="Label" oor:type="xs:string">
- 					<value xml:lang="en-US">~Move/Copy Sheet...</value>
diff --git a/applied_patches/0554-unittesting-jurt.diff b/applied_patches/0438-unittesting-jurt.diff
similarity index 100%
rename from applied_patches/0554-unittesting-jurt.diff
rename to applied_patches/0438-unittesting-jurt.diff
diff --git a/applied_patches/0439-calc-find-replace-empty-cells-sc.diff b/applied_patches/0439-calc-find-replace-empty-cells-sc.diff
deleted file mode 100644
index 4d20135c6..000000000
--- a/applied_patches/0439-calc-find-replace-empty-cells-sc.diff
+++ /dev/null
@@ -1,388 +0,0 @@
---- sc/inc/table.hxx.old	2009-04-06 16:41:59.000000000 +0000
-+++ sc/inc/table.hxx	2009-04-06 16:42:06.000000000 +0000
-@@ -272,6 +272,7 @@ public:
- 					{ return aCol[rPos.Col()].GetCell( rPos.Row() ); }
- 	ScBaseCell*	GetCell( SCCOL nCol, SCROW nRow ) const;
- 
-+    void        GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const;
- 	void		GetLastDataPos(SCCOL& rCol, SCROW& rRow) const;
- 
-     /** Returns the pointer to a cell note object at the passed cell address. */
-@@ -669,6 +670,16 @@ private:
- 	BOOL		SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark);
- 	BOOL		ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
- 								ScDocument* pUndoDoc);
-+    bool        SearchAndReplaceEmptyCells(
-+                    const SvxSearchItem& rSearchItem,
-+                    SCCOL& rCol, SCROW& rRow, ScMarkData& rMark,
-+                    String& rUndoStr, ScDocument* pUndoDoc);
-+    bool        SearchRangeForEmptyCell(const ScRange& rRange,
-+                    const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, 
-+                    String& rUndoStr, ScDocument* pUndoDoc);
-+    bool        SearchRangeForAllEmptyCells(const ScRange& rRange, 
-+                    const SvxSearchItem& rSearchItem, ScMarkData& rMark,
-+                    String& rUndoStr, ScDocument* pUndoDoc);
- 
- 								// benutzen globalen SortParam:
- 	BOOL		IsSorted(SCCOLROW nStart, SCCOLROW nEnd);
---- sc/source/core/data/column.cxx.old	2009-04-06 16:41:50.000000000 +0000
-+++ sc/source/core/data/column.cxx	2009-04-06 16:42:06.000000000 +0000
-@@ -1370,7 +1370,24 @@ void ScColumn::CopyToColumn(SCROW nRow1,
-                     CloneCell( i, nFlags, *rColumn.pDocument, aDestPos );
- 
- 				if (pNew)
--					rColumn.Insert(pItems[i].nRow, pNew);
-+                {
-+                    // Special case to allow removing of cell instances.  A 
-+                    // string cell with empty content is used to indicate an
-+                    // empty cell.
-+                    if (pNew->GetCellType() == CELLTYPE_STRING)
-+                    {
-+                        String aStr;
-+                        static_cast<ScStringCell*>(pNew)->GetString(aStr);
-+                        if (aStr.Len() == 0)
-+                            // A string cell with empty string.  Delete the cell itself.
-+                            rColumn.Delete(pItems[i].nRow);
-+                        else
-+                            // non-empty string cell
-+                            rColumn.Insert(pItems[i].nRow, pNew);
-+                    }
-+                    else
-+                        rColumn.Insert(pItems[i].nRow, pNew);
-+                }
- 			}
- 		}
- 	}
---- sc/source/core/data/table2.cxx.old	2009-04-06 16:41:51.000000000 +0000
-+++ sc/source/core/data/table2.cxx	2009-04-06 16:42:06.000000000 +0000
-@@ -938,6 +938,11 @@ ScBaseCell* ScTable::GetCell( SCCOL nCol
- 	return NULL;
- }
- 
-+void ScTable::GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const
-+{
-+    rCol = 0;
-+    rRow = 0;
-+}
- 
- void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const
- {
---- sc/source/core/data/table6.cxx.old	2009-04-02 10:45:01.000000000 +0000
-+++ sc/source/core/data/table6.cxx	2009-04-06 16:42:06.000000000 +0000
-@@ -52,6 +52,8 @@
- //--------------------------------------------------------------------------
- 
- 
-+using ::com::sun::star::util::SearchOptions;
-+
- BOOL lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& rVal )
- {
- 	//	TRUE = more than 1 paragraph
-@@ -660,6 +662,12 @@ BOOL ScTable::SearchAndReplace(const Svx
- 			com::sun::star::util::SearchOptions aSearchOptions = rSearchItem.GetSearchOptions();
- 			aSearchOptions.Locale = *ScGlobal::pLocale;
- 
-+            if (!aSearchOptions.searchString.getLength())
-+            {
-+                // Search for empty cells.
-+                return SearchAndReplaceEmptyCells(rSearchItem, rCol, rRow, rMark, rUndoStr, pUndoDoc);
-+            }
-+
- 			//	#107259# reflect UseAsianOptions flag in SearchOptions
- 			//	(use only ignore case and width if asian options are disabled).
- 			//	This is also done in SvxSearchDialog CommandHdl, but not in API object.
-@@ -686,6 +694,274 @@ BOOL ScTable::SearchAndReplace(const Svx
- 	return bFound;
- }
- 
-+bool ScTable::SearchAndReplaceEmptyCells(
-+    const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark,
-+    String& rUndoStr, ScDocument* pUndoDoc)
-+{
-+    SCCOL nColStart, nColEnd;
-+    SCROW nRowStart, nRowEnd;
-+    GetFirstDataPos(nColStart, nRowStart);
-+    GetLastDataPos(nColEnd, nRowEnd);
-+
-+    ScRangeList aRanges;
-+    aRanges.Append(ScRange(nColStart, nRowStart, nTab, nColEnd, nRowEnd, nTab));
-+
-+    if (rSearchItem.GetSelection())
-+    {
-+        // current selection only.
-+        if (!rMark.IsMarked() && !rMark.IsMultiMarked())
-+            // There is no selection.  Bail out.
-+            return false;
-+
-+        ScRangeList aMarkedRanges, aNewRanges;
-+        rMark.FillRangeListWithMarks(&aMarkedRanges, true);
-+        for (ScRangePtr p = aMarkedRanges.First(); p; p = aMarkedRanges.Next())
-+        {
-+            if (p->aStart.Col() > nColEnd || p->aStart.Row() > nRowEnd)
-+                // This range is outside the data area.  Skip it.
-+                continue;
-+
-+            // Shrink the range into data area only.
-+            if (p->aStart.Col() < nColStart)
-+                p->aStart.SetCol(rCol);
-+            if (p->aStart.Row() < nRowStart)
-+                p->aStart.SetRow(rRow);
-+
-+            if (p->aEnd.Col() > nColEnd)
-+                p->aEnd.SetCol(nColEnd);
-+            if (p->aEnd.Row() > nRowEnd)
-+                p->aEnd.SetRow(nRowEnd);
-+            
-+            aNewRanges.Append(*p);
-+        }
-+        aRanges = aNewRanges;
-+    }
-+
-+    sal_uInt16 nCommand = rSearchItem.GetCommand();
-+    if (nCommand == SVX_SEARCHCMD_FIND || nCommand == SVX_SEARCHCMD_REPLACE)
-+    {
-+        if (rSearchItem.GetBackward())
-+        {
-+            for (ScRangePtr p = aRanges.Last(); p; p = aRanges.Prev())
-+            {
-+                if (SearchRangeForEmptyCell(*p, rSearchItem, rCol, rRow, rUndoStr, pUndoDoc))
-+                    return true;
-+            }
-+        }
-+        else
-+        {
-+            for (ScRangePtr p = aRanges.First(); p; p = aRanges.Next())
-+            {
-+                if (SearchRangeForEmptyCell(*p, rSearchItem, rCol, rRow, rUndoStr, pUndoDoc))
-+                    return true;
-+            }
-+        }
-+    }
-+    else if (nCommand == SVX_SEARCHCMD_FIND_ALL || nCommand == SVX_SEARCHCMD_REPLACE_ALL)
-+    {
-+        bool bFound = false;
-+        ScMarkData aNewMark(rMark);
-+        aNewMark.ResetMark();
-+        for (ScRangePtr p = aRanges.First(); p; p = aRanges.Next())
-+            bFound |= SearchRangeForAllEmptyCells(*p, rSearchItem, aNewMark, rUndoStr, pUndoDoc);
-+        rMark = aNewMark;
-+        return bFound;
-+    }
-+    return false;
-+}
-+
-+bool ScTable::SearchRangeForEmptyCell(
-+    const ScRange& rRange, const SvxSearchItem& rSearchItem, 
-+    SCCOL& rCol, SCROW& rRow, String& rUndoStr, ScDocument* /*pUndoDoc*/)
-+{
-+    sal_uInt16 nCmd = rSearchItem.GetCommand();
-+    if (rSearchItem.GetBackward())
-+    {
-+        // backward search
-+        if (rSearchItem.GetRowDirection())
-+        {
-+            // row direction.
-+            SCROW nBeginRow = rRange.aEnd.Row() > rRow ? rRow : rRange.aEnd.Row();
-+            for (SCROW nRow = nBeginRow; nRow >= rRange.aStart.Row(); --nRow)
-+            {
-+                SCCOL nBeginCol = rRange.aEnd.Col();
-+                if (nRow == rRow && nBeginCol >= rCol)
-+                    // always start from one cell before the cursor.
-+                    nBeginCol = rCol - (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
-+
-+                for (SCCOL nCol = nBeginCol; nCol >= rRange.aStart.Col(); --nCol)
-+                {
-+                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
-+                    if (!pCell)
-+                    {
-+                        // empty cell found.
-+                        rCol = nCol;
-+                        rRow = nRow;
-+                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
-+                            rSearchItem.GetReplaceString().Len())
-+                        {
-+                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
-+                            rUndoStr = String();
-+                        }
-+                        return true;
-+                    }
-+                }
-+            }
-+        }
-+        else
-+        {
-+            // column direction.
-+            SCCOL nBeginCol = rRange.aEnd.Col() > rCol ? rCol : rRange.aEnd.Col();
-+            for (SCCOL nCol = nBeginCol; nCol >= rRange.aStart.Col(); --nCol)
-+            {
-+                SCROW nBeginRow = rRange.aEnd.Row();
-+                if (nCol == rCol && nBeginRow >= rRow)
-+                    // always start from one cell before the cursor.
-+                    nBeginRow = rRow - (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
-+                for (SCROW nRow = nBeginRow; nRow >= rRange.aStart.Row(); --nRow)
-+                {   
-+                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
-+                    if (!pCell)
-+                    {
-+                        // empty cell found.
-+                        rCol = nCol;
-+                        rRow = nRow;
-+                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
-+                            rSearchItem.GetReplaceString().Len())
-+                        {
-+                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
-+                            rUndoStr = String();
-+                        }
-+                        return true;
-+                    }
-+                }
-+            }
-+        }
-+    }
-+    else
-+    {
-+        // forward search
-+        if (rSearchItem.GetRowDirection())
-+        {
-+            // row direction.
-+            SCROW nBeginRow = rRange.aStart.Row() < rRow ? rRow : rRange.aStart.Row();
-+            for (SCROW nRow = nBeginRow; nRow <= rRange.aEnd.Row(); ++nRow)
-+            {
-+                SCCOL nBeginCol = rRange.aStart.Col();
-+                if (nRow == rRow && nBeginCol <= rCol)
-+                    // always start from one cell past the cursor.
-+                    nBeginCol = rCol + (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
-+                for (SCCOL nCol = nBeginCol; nCol <= rRange.aEnd.Col(); ++nCol)
-+                {
-+                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
-+                    if (!pCell)
-+                    {
-+                        // empty cell found.
-+                        rCol = nCol;
-+                        rRow = nRow;
-+                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
-+                            rSearchItem.GetReplaceString().Len())
-+                        {
-+                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
-+                            rUndoStr = String();
-+                        }
-+                        return true;
-+                    }
-+                }
-+            }
-+        }
-+        else
-+        {
-+            // column direction.
-+            SCCOL nBeginCol = rRange.aStart.Col() < rCol ? rCol : rRange.aStart.Col();
-+            for (SCCOL nCol = nBeginCol; nCol <= rRange.aEnd.Col(); ++nCol)
-+            {
-+                SCROW nBeginRow = rRange.aStart.Row();
-+                if (nCol == rCol && nBeginRow <= rRow)
-+                    // always start from one cell past the cursor.
-+                    nBeginRow = rRow + (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
-+                for (SCROW nRow = nBeginRow; nRow <= rRange.aEnd.Row(); ++nRow)
-+                {   
-+                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
-+                    if (!pCell)
-+                    {
-+                        // empty cell found.
-+                        rCol = nCol;
-+                        rRow = nRow;
-+                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
-+                            rSearchItem.GetReplaceString().Len())
-+                        {
-+                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
-+                            rUndoStr = String();
-+                        }
-+                        return true;
-+                    }
-+                }
-+            }
-+        }
-+    }
-+    return false;
-+}
-+
-+bool ScTable::SearchRangeForAllEmptyCells(
-+    const ScRange& rRange, const SvxSearchItem& rSearchItem, ScMarkData& rMark,
-+    String& rUndoStr, ScDocument* pUndoDoc)
-+{
-+    bool bFound = false;
-+    bool bReplace = (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL) &&
-+                    (rSearchItem.GetReplaceString().Len() > 0);
-+
-+    for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
-+    {
-+        if (aCol[nCol].IsEmptyData())
-+        {
-+            // The entire column is empty.  Add the whole column and move on.
-+            rMark.SetMultiMarkArea(
-+                ScRange(nCol, rRange.aStart.Row(), nTab, nCol, rRange.aEnd.Row(), nTab));
-+            bFound = true;
-+
-+            if (bReplace)
-+            {
-+                const String& rNewStr = rSearchItem.GetReplaceString();
-+                for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
-+                {    
-+                    aCol[nCol].Insert(nRow, new ScStringCell(rNewStr));
-+                    if (pUndoDoc)
-+                        // TODO: I'm using a string cell with empty content to 
-+                        // trigger deletion of cell instance on undo.  Maybe I
-+                        // should create a new cell type for this?
-+                        pUndoDoc->PutCell(nCol, nRow, nTab, new ScStringCell(String()));
-+                }
-+                rUndoStr = String();
-+            }
-+            continue;
-+        }
-+
-+        for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
-+        {
-+            ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
-+            if (!pCell)
-+            {    
-+                // empty cell found
-+                rMark.SetMultiMarkArea(ScRange(nCol, nRow, nTab));
-+                bFound = true;
-+
-+                if (bReplace)
-+                {    
-+                    aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
-+                    if (pUndoDoc)
-+                        // TODO: I'm using a string cell with empty content to 
-+                        // trigger deletion of cell instance on undo.  Maybe I
-+                        // should create a new cell type for this?
-+                        pUndoDoc->PutCell(nCol, nRow, nTab, new ScStringCell(String()));
-+                }
-+            }
-+        }
-+    }
-+    return bFound;
-+}
-+
-+
- 
- 
- 
---- sc/source/ui/view/tabvwsha.cxx.old	2009-04-06 16:41:51.000000000 +0000
-+++ sc/source/ui/view/tabvwsha.cxx	2009-04-06 16:42:06.000000000 +0000
-@@ -223,9 +223,14 @@ void __EXPORT ScTabViewShell::GetState(
- 				GetViewData()->GetDocShell()->GetStatePageStyle( *this, rSet, nTab );
- 				break;
- 
--			case SID_SEARCH_ITEM:
--				rSet.Put( ScGlobal::GetSearchItem() );
--				break;
-+            case SID_SEARCH_ITEM:
-+            {
-+                SvxSearchItem aItem(ScGlobal::GetSearchItem()); // make a copy.
-+                // Search on current selection if a range is marked.
-+                aItem.SetSelection(rMark.IsMarked());
-+                rSet.Put(aItem);
-+                break;
-+            }
- 
- 			case SID_SEARCH_OPTIONS:
- 				{
diff --git a/applied_patches/0555-unittesting-jvmaccess.diff b/applied_patches/0439-unittesting-jvmaccess.diff
similarity index 100%
rename from applied_patches/0555-unittesting-jvmaccess.diff
rename to applied_patches/0439-unittesting-jvmaccess.diff
diff --git a/applied_patches/0440-calc-find-replace-empty-cells-svx.diff b/applied_patches/0440-calc-find-replace-empty-cells-svx.diff
deleted file mode 100644
index cc22d748a..000000000
--- a/applied_patches/0440-calc-find-replace-empty-cells-svx.diff
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git svx/inc/srchdlg.hxx svx/inc/srchdlg.hxx
-index 69b5315..5cf88d0 100644
---- svx/inc/srchdlg.hxx
-+++ svx/inc/srchdlg.hxx
-@@ -177,6 +177,8 @@ public:
- 
- 	INT32			GetTransliterationFlags() const;
- 
-+    void            SetSaveToModule(bool b);
-+    
- private:
- 	FixedText       aSearchText;
- 	ComboBox        aSearchLB;
-diff --git svx/source/dialog/srchdlg.cxx svx/source/dialog/srchdlg.cxx
-index d57c0a1..ddceeab 100644
---- svx/source/dialog/srchdlg.cxx
-+++ svx/source/dialog/srchdlg.cxx
-@@ -704,6 +704,11 @@ INT32 SvxSearchDialog::GetTransliterationFlags() const
- 	return nTransliterationFlags;
- }
- 
-+void SvxSearchDialog::SetSaveToModule(bool b)
-+{
-+    pImpl->bSaveToModule = b;
-+}
-+
- // -----------------------------------------------------------------------
- 
- void SvxSearchDialog::ApplyTransliterationFlags_Impl( INT32 nSettings )
-@@ -956,9 +961,36 @@ void SvxSearchDialog::CalculateDelta_Impl()
- 
- // -----------------------------------------------------------------------
- 
-+namespace {
-+
-+class ToggleSaveToModule
-+{
-+public:
-+    ToggleSaveToModule(SvxSearchDialog& rDialog, bool bValue) :
-+        mrDialog(rDialog), mbValue(bValue)
-+    {
-+        mrDialog.SetSaveToModule(mbValue);
-+    }
-+
-+    ~ToggleSaveToModule()
-+    {
-+        mrDialog.SetSaveToModule(!mbValue);
-+    }
-+private:
-+    SvxSearchDialog& mrDialog;
-+    bool mbValue;
-+};
-+
-+}
-+
- void SvxSearchDialog::Init_Impl( int bSearchPattern )
- {
- 	DBG_ASSERT( pSearchItem, "SearchItem == 0" );
-+
-+    // We don't want to save any intermediate state to the module while the 
-+    // dialog is being initialized.
-+    ToggleSaveToModule aNoModuleSave(*this, false);
-+
- 	bWriter = ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_WRITER );
- 
- 	pImpl->bMultiLineEdit = FALSE;
-@@ -1106,10 +1138,8 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
- 		aSimilarityBox.Check( pSearchItem->IsLevenshtein() );
- 	bSet = TRUE;
- 
--	pImpl->bSaveToModule = FALSE;
- 	FlagHdl_Impl( &aSimilarityBox );
- 	FlagHdl_Impl( &aJapOptionsCB );
--	pImpl->bSaveToModule = TRUE;
- 
- 	FASTBOOL bDisableSearch = FALSE;
- 	SfxViewShell* pViewShell = SfxViewShell::Current();
-@@ -1638,16 +1668,23 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd )
- 	else
- 		bSet = FALSE;
- 
-+    // Calc allows searching for empty cells.
-+    bool bAllowEmptySearch = (pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC);
-+
- 	if ( pEd == &aSearchLB || pEd == &aReplaceLB )
- 	{
--		xub_StrLen nLBTxtLen = aSearchLB.GetText().Len(), nTxtLen;
-+		xub_StrLen nSrchTxtLen = aSearchLB.GetText().Len();
-+        xub_StrLen nReplTxtLen = 0;
-+        if (bAllowEmptySearch)
-+            nReplTxtLen = aReplaceLB.GetText().Len();
-+        xub_StrLen nAttrTxtLen = 0;
- 
- 		if ( !pImpl->bMultiLineEdit )
--		   nTxtLen = aSearchAttrText.GetText().Len();
-+		   nAttrTxtLen = aSearchAttrText.GetText().Len();
- 		else
--			nTxtLen = pImpl->aSearchFormats.GetText().Len();
-+			nAttrTxtLen = pImpl->aSearchFormats.GetText().Len();
- 
--		if ( nLBTxtLen || nTxtLen )
-+		if (nSrchTxtLen || nReplTxtLen || nAttrTxtLen)
- 		{
- 			EnableControl_Impl( &aSearchBtn );
- 			EnableControl_Impl( &aReplaceBtn );
diff --git a/applied_patches/0556-unittesting-linguistic.diff b/applied_patches/0440-unittesting-linguistic.diff
similarity index 100%
rename from applied_patches/0556-unittesting-linguistic.diff
rename to applied_patches/0440-unittesting-linguistic.diff
diff --git a/applied_patches/0441-calc-enhanced-merge-cells-sc.diff b/applied_patches/0441-calc-enhanced-merge-cells-sc.diff
deleted file mode 100644
index 2e7a45945..000000000
--- a/applied_patches/0441-calc-enhanced-merge-cells-sc.diff
+++ /dev/null
@@ -1,1078 +0,0 @@
-diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
-index 123a716..fde95e5 100644
---- sc/source/ui/docshell/docfunc.cxx
-+++ sc/source/ui/docshell/docfunc.cxx
-@@ -67,6 +67,7 @@
- #include "attrib.hxx"
- #include "autoform.hxx"
- #include "cell.hxx"
-+#include "cellmergeoption.hxx"
- #include "detdata.hxx"
- #include "detfunc.hxx"
- #include "docpool.hxx"
-@@ -101,6 +102,7 @@
- #include "tabprotection.hxx"
- 
- #include <memory>
-+#include <set>
- 
- using namespace com::sun::star;
- using ::com::sun::star::uno::Sequence;
-@@ -3974,86 +3976,110 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
- 
- //------------------------------------------------------------------------
- 
--BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord, BOOL bApi )
-+BOOL ScDocFunc::MergeCells( const ScCellMergeOption& rOption, BOOL bContents, BOOL bRecord, BOOL bApi )
- {
-+    using ::std::set;
-+
- 	ScDocShellModificator aModificator( rDocShell );
- 
--	ScDocument* pDoc = rDocShell.GetDocument();
--	SCCOL nStartCol = rRange.aStart.Col();
--	SCROW nStartRow = rRange.aStart.Row();
--	SCCOL nEndCol = rRange.aEnd.Col();
--	SCROW nEndRow = rRange.aEnd.Row();
--	SCTAB nTab = rRange.aStart.Tab();
-+    SCCOL nStartCol = rOption.mnStartCol;
-+    SCROW nStartRow = rOption.mnStartRow;
-+    SCCOL nEndCol = rOption.mnEndCol;
-+    SCROW nEndRow = rOption.mnEndRow;
-+    if ((nStartCol == nEndCol && nStartRow == nEndRow) || rOption.maTabs.empty())
-+    {
-+        // Nothing to do.  Bail out quick.
-+        return TRUE;
-+    }
-+
-+    ScDocument* pDoc = rDocShell.GetDocument();
-+    set<SCTAB>::const_iterator itrBeg = rOption.maTabs.begin(), itrEnd = rOption.maTabs.end();
-+    SCTAB nTab1 = *itrBeg, nTab2 = *rOption.maTabs.rbegin();
- 
- 	if (bRecord && !pDoc->IsUndoEnabled())
- 		bRecord = FALSE;
- 
--	ScEditableTester aTester( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow );
--	if (!aTester.IsEditable())
--	{
--		if (!bApi)
--			rDocShell.ErrorMessage(aTester.GetMessageId());
--		return FALSE;
--	}
-+    for (set<SCTAB>::const_iterator itr = itrBeg; itr != itrEnd; ++itr)
-+    {
-+        ScEditableTester aTester( pDoc, *itr, nStartCol, nStartRow, nEndCol, nEndRow );
-+        if (!aTester.IsEditable())
-+        {
-+            if (!bApi)
-+                rDocShell.ErrorMessage(aTester.GetMessageId());
-+            return FALSE;
-+        }
- 
--	if ( nStartCol == nEndCol && nStartRow == nEndRow )
--	{
--		// nichts zu tun
--		return TRUE;
--	}
-+        if ( pDoc->HasAttrib( nStartCol, nStartRow, *itr, nEndCol, nEndRow, *itr,
-+                                HASATTR_MERGED | HASATTR_OVERLAPPED ) )
-+        {
-+            // "Zusammenfassen nicht verschachteln !"
-+            if (!bApi)
-+                rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0);
-+            return FALSE;
-+        }
-+    }
- 
--	if ( pDoc->HasAttrib( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab,
--							HASATTR_MERGED | HASATTR_OVERLAPPED ) )
--	{
--		// "Zusammenfassen nicht verschachteln !"
--		if (!bApi)
--			rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0);
--		return FALSE;
--	}
-+    ScDocument* pUndoDoc = NULL;
-+    bool bNeedContentsUndo = false;
-+    for (set<SCTAB>::const_iterator itr = itrBeg; itr != itrEnd; ++itr)
-+    {
-+        SCTAB nTab = *itr;
-+        bool bNeedContents = bContents &&
-+                ( !pDoc->IsBlockEmpty( nTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) ||
-+                  !pDoc->IsBlockEmpty( nTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) );
-+    
-+        if (bRecord)
-+        {
-+            // test if the range contains other notes which also implies that we need an undo document
-+            bool bHasNotes = false;
-+            for( ScAddress aPos( nStartCol, nStartRow, nTab ); !bHasNotes && (aPos.Col() <= nEndCol); aPos.IncCol() )
-+                for( aPos.SetRow( nStartRow ); !bHasNotes && (aPos.Row() <= nEndRow); aPos.IncRow() )
-+                    bHasNotes = ((aPos.Col() != nStartCol) || (aPos.Row() != nStartRow)) && (pDoc->GetNote( aPos ) != 0);
- 
--	BOOL bNeedContents = bContents &&
--			( !pDoc->IsBlockEmpty( nTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) ||
--			  !pDoc->IsBlockEmpty( nTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) );
-+            if (bNeedContents || bHasNotes || rOption.mbCenter)
-+            {
-+                if (!pUndoDoc)
-+                {
-+                    pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-+                    pUndoDoc->InitUndo(pDoc, nTab1, nTab2);
-+                }
-+                // note captions are collected by drawing undo
-+                pDoc->CopyToDocument( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab,
-+                                      IDF_ALL|IDF_NOCAPTIONS, FALSE, pUndoDoc );
-+            }
-+            if( bHasNotes )
-+                pDoc->BeginDrawUndo();
-+        }
- 
--    ScDocument* pUndoDoc = 0;
--	if (bRecord)
--	{
--        // test if the range contains other notes which also implies that we need an undo document
--        bool bHasNotes = false;
--        for( ScAddress aPos( nStartCol, nStartRow, nTab ); !bHasNotes && (aPos.Col() <= nEndCol); aPos.IncCol() )
--            for( aPos.SetRow( nStartRow ); !bHasNotes && (aPos.Row() <= nEndRow); aPos.IncRow() )
--                bHasNotes = ((aPos.Col() != nStartCol) || (aPos.Row() != nStartRow)) && (pDoc->GetNote( aPos ) != 0);
-+        if (bNeedContents)
-+            pDoc->DoMergeContents( nTab, nStartCol,nStartRow, nEndCol,nEndRow );
-+        pDoc->DoMerge( nTab, nStartCol,nStartRow, nEndCol,nEndRow );
-+	
-+        if (rOption.mbCenter)
-+        {
-+            pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) );
-+            pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER, ATTR_VER_JUSTIFY ) );
-+        }
- 
--		if (bNeedContents || bHasNotes)
--		{
--			pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
--			pUndoDoc->InitUndo( pDoc, nTab, nTab );
--            // note captions are collected by drawing undo
--			pDoc->CopyToDocument( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab,
--                                    IDF_ALL|IDF_NOCAPTIONS, FALSE, pUndoDoc );
--		}
--        if( bHasNotes )
--            pDoc->BeginDrawUndo();
--	}
-+        if ( !AdjustRowHeight( ScRange( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab ) ) )
-+            rDocShell.PostPaint( nStartCol, nStartRow, nTab,
-+                                 nEndCol, nEndRow, nTab, PAINT_GRID );
-+        if (bNeedContents || rOption.mbCenter)
-+        {    
-+            ScRange aRange(nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab);
-+            pDoc->SetDirty(aRange);
-+        }
- 
--	if (bNeedContents)
--		pDoc->DoMergeContents( nTab, nStartCol,nStartRow, nEndCol,nEndRow );
--	pDoc->DoMerge( nTab, nStartCol,nStartRow, nEndCol,nEndRow );
-+        bNeedContentsUndo |= bNeedContents;
-+    }
- 
--    if( bRecord )
-+    if (pUndoDoc)
-     {
--        SdrUndoGroup* pDrawUndo = pDoc->GetDrawLayer() ? pDoc->GetDrawLayer()->GetCalcUndo() : 0;
-+        SdrUndoGroup* pDrawUndo = pDoc->GetDrawLayer() ? pDoc->GetDrawLayer()->GetCalcUndo() : NULL;
-         rDocShell.GetUndoManager()->AddUndoAction(
--            new ScUndoMerge( &rDocShell,
--                            nStartCol, nStartRow, nTab,
--                            nEndCol, nEndRow, nTab, bNeedContents, pUndoDoc, pDrawUndo ) );
-+            new ScUndoMerge(&rDocShell, rOption, bNeedContentsUndo, pUndoDoc, pDrawUndo) );
-     }
- 
--	if ( !AdjustRowHeight( ScRange( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab ) ) )
--		rDocShell.PostPaint( nStartCol, nStartRow, nTab,
--											nEndCol, nEndRow, nTab, PAINT_GRID );
--	if (bNeedContents)
--		pDoc->SetDirty( rRange );
- 	aModificator.SetDocumentModified();
- 
- 	SfxBindings* pBindings = rDocShell.GetViewBindings();
-@@ -4069,49 +4095,81 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
- 
- BOOL ScDocFunc::UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi )
- {
--	ScDocShellModificator aModificator( rDocShell );
-+    ScCellMergeOption aOption(rRange.aStart.Col(), rRange.aStart.Row(), rRange.aEnd.Col(), rRange.aEnd.Row());
-+    SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
-+    for (SCTAB i = nTab1; i <= nTab2; ++i)
-+        aOption.maTabs.insert(i);
- 
-+    return UnmergeCells(aOption, bRecord, bApi);
-+}
-+
-+bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BOOL bApi )
-+{
-+    using ::std::set;
-+
-+    if (rOption.maTabs.empty())
-+        // Nothing to unmerge.
-+        return true;
-+
-+	ScDocShellModificator aModificator( rDocShell );
- 	ScDocument* pDoc = rDocShell.GetDocument();
--	SCTAB nTab = rRange.aStart.Tab();
- 
- 	if (bRecord && !pDoc->IsUndoEnabled())
- 		bRecord = FALSE;
- 
--	if ( pDoc->HasAttrib( rRange, HASATTR_MERGED ) )
--	{
--		ScRange aExtended = rRange;
--		pDoc->ExtendMerge( aExtended );
--		ScRange aRefresh = aExtended;
--		pDoc->ExtendOverlapped( aRefresh );
-+    ScDocument* pUndoDoc = NULL;
-+    bool bBeep = false;
-+    for (set<SCTAB>::const_iterator itr = rOption.maTabs.begin(), itrEnd = rOption.maTabs.end();
-+          itr != itrEnd; ++itr)
-+    {
-+        SCTAB nTab = *itr;
-+        ScRange aRange = rOption.getSingleRange(nTab);
-+        if ( !pDoc->HasAttrib(aRange, HASATTR_MERGED) )
-+        {
-+            bBeep = true;
-+            continue;
-+        }
- 
--		if (bRecord)
--		{
--			ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
--			pUndoDoc->InitUndo( pDoc, nTab, nTab );
--			pDoc->CopyToDocument( aExtended, IDF_ATTRIB, FALSE, pUndoDoc );
--			rDocShell.GetUndoManager()->AddUndoAction(
--				new ScUndoRemoveMerge( &rDocShell, rRange, pUndoDoc ) );
--		}
-+        ScRange aExtended = aRange;
-+        pDoc->ExtendMerge(aExtended);
-+        ScRange aRefresh = aExtended;
-+        pDoc->ExtendOverlapped(aRefresh);
- 
--		const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE );
--		ScPatternAttr aPattern( pDoc->GetPool() );
--		aPattern.GetItemSet().Put( rDefAttr );
--		pDoc->ApplyPatternAreaTab( rRange.aStart.Col(), rRange.aStart.Row(),
--									rRange.aEnd.Col(), rRange.aEnd.Row(), nTab,
--									aPattern );
-+        if (bRecord)
-+        {
-+            if (!pUndoDoc)
-+            {
-+                pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-+                pUndoDoc->InitUndo(pDoc, *rOption.maTabs.begin(), *rOption.maTabs.rbegin());
-+            }
-+            pDoc->CopyToDocument(aExtended, IDF_ATTRIB, FALSE, pUndoDoc);
-+        }
- 
--		pDoc->RemoveFlagsTab( aExtended.aStart.Col(), aExtended.aStart.Row(),
--								aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab,
--								SC_MF_HOR | SC_MF_VER );
-+        const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE );
-+        ScPatternAttr aPattern( pDoc->GetPool() );
-+        aPattern.GetItemSet().Put( rDefAttr );
-+        pDoc->ApplyPatternAreaTab( aRange.aStart.Col(), aRange.aStart.Row(),
-+                                   aRange.aEnd.Col(), aRange.aEnd.Row(), nTab,
-+                                   aPattern );
- 
--		pDoc->ExtendMerge( aRefresh, TRUE, FALSE );
-+        pDoc->RemoveFlagsTab( aExtended.aStart.Col(), aExtended.aStart.Row(),
-+                              aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab,
-+                              SC_MF_HOR | SC_MF_VER );
- 
--		if ( !AdjustRowHeight( aExtended ) )
--			rDocShell.PostPaint( aExtended, PAINT_GRID );
--		aModificator.SetDocumentModified();
--	}
--	else if (!bApi)
--		Sound::Beep();		//! FALSE zurueck???
-+        pDoc->ExtendMerge( aRefresh, TRUE, FALSE );
-+
-+        if ( !AdjustRowHeight( aExtended ) )
-+            rDocShell.PostPaint( aExtended, PAINT_GRID );
-+    }
-+    if (bBeep && !bApi)
-+        Sound::Beep();
-+
-+    if (bRecord)
-+    {
-+        rDocShell.GetUndoManager()->AddUndoAction(
-+            new ScUndoRemoveMerge( &rDocShell, rOption, pUndoDoc ) );
-+    }
-+    aModificator.SetDocumentModified();
- 
- 	return TRUE;
- }
-diff --git sc/source/ui/inc/cellmergeoption.hxx sc/source/ui/inc/cellmergeoption.hxx
-new file mode 100644
-index 0000000..2e2dff2
---- /dev/null
-+++ sc/source/ui/inc/cellmergeoption.hxx
-@@ -0,0 +1,60 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: docfunc.hxx,v $
-+ * $Revision: 1.18.30.2 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SC_CELLMERGEOPTION_HXX
-+#define SC_CELLMERGEOPTION_HXX
-+
-+#include "address.hxx"
-+
-+#include <set>
-+
-+class ScRange;
-+
-+struct ScCellMergeOption
-+{
-+    ::std::set<SCTAB> maTabs;
-+    SCCOL mnStartCol;
-+    SCROW mnStartRow;
-+    SCCOL mnEndCol;
-+    SCROW mnEndRow;
-+    bool mbCenter;
-+
-+    explicit ScCellMergeOption();
-+    explicit ScCellMergeOption(SCCOL nStartCol, SCROW nStartRow, 
-+                               SCCOL nEndCol, SCROW nEndRow, 
-+                               bool bCenter = false);
-+    explicit ScCellMergeOption(const ScCellMergeOption& r);
-+
-+    ScRange getSingleRange(SCTAB nTab) const;
-+    ScRange getFirstSingleRange() const;
-+};
-+
-+
-+#endif
-diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx
-index 8490bab..9976230 100644
---- sc/source/ui/inc/docfunc.hxx
-+++ sc/source/ui/inc/docfunc.hxx
-@@ -49,6 +49,7 @@ class ScBaseCell;
- class ScTokenArray;
- struct ScTabOpParam;
- class ScTableProtection;
-+struct ScCellMergeOption;
- 
- // ---------------------------------------------------------------------------
- 
-@@ -172,9 +173,10 @@ public:
- 
- 	BOOL			ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, BOOL bApi );
- 
--	BOOL			MergeCells( const ScRange& rRange, BOOL bContents,
-+	BOOL			MergeCells( const ScCellMergeOption& rOption, BOOL bContents,
- 								BOOL bRecord, BOOL bApi );
--	BOOL			UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi );
-+ 	BOOL			UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi );
-+	bool			UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BOOL bApi );
- 
-     BOOL            SetNewRangeNames( ScRangeName* pNewRanges, BOOL bApi );     // takes ownership of pNewRanges
- 	BOOL			ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi );
-diff --git sc/source/ui/inc/undoblk.hxx sc/source/ui/inc/undoblk.hxx
-index 31932fd..2320502 100644
---- sc/source/ui/inc/undoblk.hxx
-+++ sc/source/ui/inc/undoblk.hxx
-@@ -34,6 +34,7 @@
- #include "markdata.hxx"
- #include "viewutil.hxx"
- #include "spellparam.hxx"
-+#include "cellmergeoption.hxx"
- 
- #include "cell.hxx"
- 
-@@ -454,10 +455,8 @@ class ScUndoMerge: public ScSimpleUndo
- {
- public:
- 					TYPEINFO();
--					ScUndoMerge( ScDocShell* pNewDocShell,
--								 SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
--								 SCCOL nEndX,   SCROW nEndY,   SCTAB nEndZ,
--                                 bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo );
-+                    ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption,
-+                                 bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo);
- 	virtual 		~ScUndoMerge();
- 
- 	virtual void	Undo();
-@@ -468,7 +467,7 @@ public:
- 	virtual String	GetComment() const;
- 
- private:
--    ScRange         maRange;
-+    ScCellMergeOption maOption;
-     bool            mbMergeContents;        // Merge contents in Redo().
-     ScDocument*		mpUndoDoc;              // wenn Daten zusammengefasst
-     SdrUndoAction*  mpDrawUndo;
-@@ -920,7 +919,7 @@ class ScUndoRemoveMerge: public ScBlockUndo
- public:
- 					TYPEINFO();
- 					ScUndoRemoveMerge( ScDocShell* pNewDocShell,
--									   const ScRange& rArea,
-+									   const ScCellMergeOption& rOption,
- 									   ScDocument* pNewUndoDoc );
- 	virtual 		~ScUndoRemoveMerge();
- 
-@@ -932,6 +931,9 @@ public:
- 	virtual String	GetComment() const;
- 
- private:
-+    void            SetCurTab();
-+
-+    ScCellMergeOption maOption;
- 	ScDocument*		pUndoDoc;
- };
- 
-diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
-index 1f5102e..051a705 100644
---- sc/source/ui/inc/viewfunc.hxx
-+++ sc/source/ui/inc/viewfunc.hxx
-@@ -242,7 +242,7 @@ public:
- 	BOOL			TestMergeCells();
- 	BOOL			TestRemoveMerge();
- 
--	BOOL			MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE );
-+	BOOL			MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE, BOOL bCenter = FALSE );
- 	BOOL			RemoveMerge( BOOL bRecord = TRUE );
- 
- 	void			FillSimple( FillDir eDir, BOOL bRecord = TRUE );
-diff --git sc/source/ui/undo/undoblk.cxx sc/source/ui/undo/undoblk.cxx
-index 5b3e219..fe2c7bc 100644
---- sc/source/ui/undo/undoblk.cxx
-+++ sc/source/ui/undo/undoblk.cxx
-@@ -66,6 +66,7 @@
- #include "undoolk.hxx"
- #include "sc.hrc"
- 
-+#include <set>
- 
- // STATIC DATA -----------------------------------------------------------
- 
-@@ -2066,8 +2067,9 @@ BOOL __EXPORT ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const
- //
- 
- ScUndoRemoveMerge::ScUndoRemoveMerge( ScDocShell* pNewDocShell,
--									   const ScRange& rArea, ScDocument* pNewUndoDoc ) :
--	ScBlockUndo( pNewDocShell, rArea, SC_UNDO_SIMPLE ),
-+                                      const ScCellMergeOption& rOption, ScDocument* pNewUndoDoc ) :
-+	ScBlockUndo( pNewDocShell, rOption.getFirstSingleRange(), SC_UNDO_SIMPLE ),
-+    maOption(rOption),
- 	pUndoDoc( pNewUndoDoc )
- {
- }
-@@ -2084,66 +2086,78 @@ String __EXPORT ScUndoRemoveMerge::GetComment() const
- 
- void __EXPORT ScUndoRemoveMerge::Undo()
- {
--	BeginUndo();
--
--	ScDocument* pDoc = pDocShell->GetDocument();
-+    using ::std::set;
- 
--	ScRange aExtended = aBlockRange;
--	pUndoDoc->ExtendMerge( aExtended );
-+    SetCurTab();
-+    BeginUndo();
- 
--	pDoc->DeleteAreaTab( aExtended, IDF_ATTRIB );
--	pUndoDoc->CopyToDocument( aExtended, IDF_ATTRIB, FALSE, pDoc );
-+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- 
--	BOOL bDidPaint = FALSE;
--	ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
--	if ( pViewShell )
--	{
--		pViewShell->SetTabNo( aExtended.aStart.Tab() );
--		bDidPaint = pViewShell->AdjustRowHeight( aExtended.aStart.Row(), aExtended.aEnd.Row() );
--	}
--	if (!bDidPaint)
--		ScUndoUtil::PaintMore( pDocShell, aExtended );
-+	ScDocument* pDoc = pDocShell->GetDocument();
-+    for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end();
-+          itr != itrEnd; ++itr)
-+    {
-+        // There is no need to extend merge area because it's already been extended.
-+        ScRange aRange = maOption.getSingleRange(*itr);    
-+        pDoc->DeleteAreaTab(aRange, IDF_ATTRIB);
-+        pUndoDoc->CopyToDocument(aRange, IDF_ATTRIB, FALSE, pDoc);
-+    
-+        bool bDidPaint = false;
-+        if ( pViewShell )
-+        {
-+            pViewShell->SetTabNo(*itr);
-+            bDidPaint = pViewShell->AdjustRowHeight(maOption.mnStartRow, maOption.mnEndRow);
-+        }
-+        if (!bDidPaint)
-+            ScUndoUtil::PaintMore(pDocShell, aRange);
-+    }
- 
- 	EndUndo();
- }
- 
- void __EXPORT ScUndoRemoveMerge::Redo()
- {
-+    using ::std::set;
-+
-+    SetCurTab();
- 	BeginRedo();
- 
--	SCTAB nTab = aBlockRange.aStart.Tab();
- 	ScDocument* pDoc = pDocShell->GetDocument();
--	ScRange aExtended = aBlockRange;
--	pDoc->ExtendMerge( aExtended );
--	ScRange aRefresh = aExtended;
--	pDoc->ExtendOverlapped( aRefresh );
--
--	//	ausfuehren
--
--	const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE );
--	ScPatternAttr aPattern( pDoc->GetPool() );
--	aPattern.GetItemSet().Put( rDefAttr );
--	pDoc->ApplyPatternAreaTab( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
--								aBlockRange.aEnd.Col(), aBlockRange.aEnd.Row(), nTab,
--								aPattern );
--
--	pDoc->RemoveFlagsTab( aExtended.aStart.Col(), aExtended.aStart.Row(),
--							aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab,
--							SC_MF_HOR | SC_MF_VER );
--
--	pDoc->ExtendMerge( aRefresh, TRUE, FALSE );
--
--	//	Paint
-+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- 
--	BOOL bDidPaint = FALSE;
--	ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
--	if ( pViewShell )
--	{
--		pViewShell->SetTabNo( aExtended.aStart.Tab() );
--		bDidPaint = pViewShell->AdjustRowHeight( aExtended.aStart.Row(), aExtended.aEnd.Row() );
--	}
--	if (!bDidPaint)
--		ScUndoUtil::PaintMore( pDocShell, aExtended );
-+    for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end();
-+          itr != itrEnd; ++itr)
-+    {
-+        SCTAB nTab = *itr;
-+        // There is no need to extend merge area because it's already been extended.
-+        ScRange aRange = maOption.getSingleRange(nTab);
-+    
-+        //	ausfuehren
-+    
-+        const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE );
-+        ScPatternAttr aPattern( pDoc->GetPool() );
-+        aPattern.GetItemSet().Put( rDefAttr );
-+        pDoc->ApplyPatternAreaTab( maOption.mnStartCol, maOption.mnStartRow,
-+                                   maOption.mnEndCol, maOption.mnEndRow, nTab,
-+                                   aPattern );
-+    
-+        pDoc->RemoveFlagsTab( maOption.mnStartCol, maOption.mnStartRow,
-+                              maOption.mnEndCol, maOption.mnEndRow, nTab,
-+                              SC_MF_HOR | SC_MF_VER );
-+    
-+        pDoc->ExtendMerge(aRange, TRUE, FALSE);
-+
-+        //	Paint
-+
-+        BOOL bDidPaint = FALSE;
-+        if ( pViewShell )
-+        {
-+            pViewShell->SetTabNo(nTab);
-+            bDidPaint = pViewShell->AdjustRowHeight(maOption.mnStartRow, maOption.mnEndRow);
-+        }
-+        if (!bDidPaint)
-+            ScUndoUtil::PaintMore(pDocShell, aRange);
-+    }
- 
- 	EndRedo();
- }
-@@ -2159,6 +2173,13 @@ BOOL __EXPORT ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const
- 	return (rTarget.ISA(ScTabViewTarget));
- }
- 
-+void ScUndoRemoveMerge::SetCurTab()
-+{
-+    SCTAB nCurTab = pDocShell->GetCurTab();
-+    aBlockRange.aStart.SetTab(nCurTab);
-+    aBlockRange.aEnd.SetTab(nCurTab);
-+}
-+
- // -----------------------------------------------------------------------
- //
- //		nur Umrandung setzen, per ScRangeList (StarOne)
-diff --git sc/source/ui/undo/undoblk3.cxx sc/source/ui/undo/undoblk3.cxx
-index 5521813..f3f006c 100644
---- sc/source/ui/undo/undoblk3.cxx
-+++ sc/source/ui/undo/undoblk3.cxx
-@@ -34,6 +34,7 @@
- // INCLUDE -------------------------------------------------------------------
- 
- #include "scitems.hxx"
-+#include <svx/algitem.hxx>
- #include <svx/boxitem.hxx>
- #include <svx/srchitem.hxx>
- #include <svx/linkmgr.hxx>
-@@ -814,14 +815,12 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
- 
- //----------------------------------------------------------------------------
- 
--ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell,
--							SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
--							SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
--                            bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo )
-+ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption,
-+                          bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo )
- 		//
- 	:	ScSimpleUndo( pNewDocShell ),
- 		//
--		maRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
-+        maOption(rOption),
-         mbMergeContents( bMergeContents ),
-         mpUndoDoc( pUndoDoc ),
-         mpDrawUndo( pDrawUndo )
-@@ -850,51 +849,77 @@ String ScUndoMerge::GetComment() const
- 
- void ScUndoMerge::DoChange( bool bUndo ) const
- {
--	ScDocument* pDoc = pDocShell->GetDocument();
-+    using ::std::set;
- 
--	ScUndoUtil::MarkSimpleBlock( pDocShell, maRange );
-+    if (maOption.maTabs.empty())
-+        // Nothing to do.
-+        return;
- 
--	if (bUndo)
--        // remove merge (contents are copied back below from undo document)
--		pDoc->RemoveMerge( maRange.aStart.Col(), maRange.aStart.Row(), maRange.aStart.Tab() );
--	else
--        // repeat merge, but do not remove note captions (will be done by drawing redo below)
--/*!*/	pDoc->DoMerge( maRange.aStart.Tab(),
--					   maRange.aStart.Col(), maRange.aStart.Row(),
--                       maRange.aEnd.Col(),   maRange.aEnd.Row(), false );
-+    ScDocument* pDoc = pDocShell->GetDocument();
-+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- 
--    // undo -> copy back deleted contents
--	if (bUndo && mpUndoDoc)
--    {
--        pDoc->DeleteAreaTab( maRange, IDF_CONTENTS|IDF_NOCAPTIONS );
--        mpUndoDoc->CopyToDocument( maRange, IDF_ALL|IDF_NOCAPTIONS, FALSE, pDoc );
--    }
-+    ScRange aCurRange = maOption.getSingleRange(pDocShell->GetCurTab());                          
-+    ScUndoUtil::MarkSimpleBlock(pDocShell, aCurRange);                                            
-+                                                                                                  
-+    for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end();
-+          itr != itrEnd; ++itr)                                                                   
-+    {                                                                                             
-+        SCTAB nTab = *itr;                                                                        
-+        ScRange aRange = maOption.getSingleRange(nTab);                                           
- 
--    // redo -> merge contents again
--    else if (!bUndo && mbMergeContents)
--    {
--/*!*/   pDoc->DoMergeContents( maRange.aStart.Tab(),
--							   maRange.aStart.Col(), maRange.aStart.Row(),
--							   maRange.aEnd.Col(),   maRange.aEnd.Row()   );
-+        if (bUndo)
-+            // remove merge (contents are copied back below from undo document)
-+            pDoc->RemoveMerge( aRange.aStart.Col(), aRange.aStart.Row(), aRange.aStart.Tab() );
-+        else
-+        {    
-+            // repeat merge, but do not remove note captions (will be done by drawing redo below)
-+            pDoc->DoMerge( aRange.aStart.Tab(),
-+                           aRange.aStart.Col(), aRange.aStart.Row(),
-+                           aRange.aEnd.Col(),   aRange.aEnd.Row(), false );
-+    
-+            if (maOption.mbCenter)
-+            {
-+                pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
-+                                 aRange.aStart.Tab(),
-+                                 SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) );
-+                pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
-+                                 aRange.aStart.Tab(),
-+                                 SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER, ATTR_VER_JUSTIFY ) );
-+            }
-+        }
-+    
-+        // undo -> copy back deleted contents
-+        if (bUndo && mpUndoDoc)
-+        {
-+            pDoc->DeleteAreaTab( aRange, IDF_CONTENTS|IDF_NOCAPTIONS );
-+            mpUndoDoc->CopyToDocument( aRange, IDF_ALL|IDF_NOCAPTIONS, FALSE, pDoc );
-+        }
-+    
-+        // redo -> merge contents again
-+        else if (!bUndo && mbMergeContents)
-+        {
-+            pDoc->DoMergeContents( aRange.aStart.Tab(),
-+                                   aRange.aStart.Col(), aRange.aStart.Row(),
-+                                   aRange.aEnd.Col(), aRange.aEnd.Row() );
-+        }
-+    
-+        if (bUndo)
-+            DoSdrUndoAction( mpDrawUndo, pDoc );
-+        else
-+            RedoSdrUndoAction( mpDrawUndo );
-+    
-+        bool bDidPaint = false;
-+        if ( pViewShell )
-+        {
-+            pViewShell->SetTabNo(nTab);
-+            bDidPaint = pViewShell->AdjustRowHeight(maOption.mnStartRow, maOption.mnEndRow);
-+        }
-+    
-+        if (!bDidPaint)
-+            ScUndoUtil::PaintMore(pDocShell, aRange);
-     }
- 
--    if (bUndo)
--        DoSdrUndoAction( mpDrawUndo, pDoc );
--    else
--        RedoSdrUndoAction( mpDrawUndo );
--
--	BOOL bDidPaint = FALSE;
--	ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
--	if ( pViewShell )
--	{
--		pViewShell->SetTabNo( maRange.aStart.Tab() );
--		bDidPaint = pViewShell->AdjustRowHeight( maRange.aStart.Row(), maRange.aEnd.Row() );
--	}
--
--	if (!bDidPaint)
--		ScUndoUtil::PaintMore( pDocShell, maRange );
--
--	ShowTable( maRange );
-+	ShowTable(aCurRange);
- }
- 
- 
-diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx
-index c2eb810..d4cfb42 100644
---- sc/source/ui/unoobj/cellsuno.cxx
-+++ sc/source/ui/unoobj/cellsuno.cxx
-@@ -71,6 +71,7 @@
- #include <com/sun/star/text/WritingMode2.hpp>
- 
- #include "autoform.hxx"
-+#include "cellmergeoption.hxx"
- #include "cellsuno.hxx"
- #include "cursuno.hxx"
- #include "textuno.hxx"
-@@ -5404,10 +5405,14 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti
- 	if ( pDocSh )
- 	{
- 		ScDocFunc aFunc(*pDocSh);
-+        ScCellMergeOption aMergeOption(
-+            aRange.aStart.Col(), aRange.aStart.Row(), 
-+            aRange.aEnd.Col(), aRange.aEnd.Row(), false);
-+        aMergeOption.maTabs.insert(aRange.aStart.Tab());
- 		if ( bMerge )
--			aFunc.MergeCells( aRange, FALSE, TRUE, TRUE );
-+			aFunc.MergeCells( aMergeOption, FALSE, TRUE, TRUE );
- 		else
--			aFunc.UnmergeCells( aRange, TRUE, TRUE );
-+			aFunc.UnmergeCells( aMergeOption, TRUE, TRUE );
- 
- 		//!	Fehler abfangen?
- 	}
-diff --git sc/source/ui/view/cellmergeoption.cxx sc/source/ui/view/cellmergeoption.cxx
-new file mode 100644
-index 0000000..ed6b8cb
---- /dev/null
-+++ sc/source/ui/view/cellmergeoption.cxx
-@@ -0,0 +1,74 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: docfunc.hxx,v $
-+ * $Revision: 1.18.30.2 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#include "cellmergeoption.hxx"
-+#include "address.hxx"
-+
-+ScCellMergeOption::ScCellMergeOption() :
-+    mnStartCol(0),
-+    mnStartRow(0),
-+    mnEndCol(0),
-+    mnEndRow(0),
-+    mbCenter(false)
-+{
-+}
-+
-+ScCellMergeOption::ScCellMergeOption(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bCenter) :
-+    mnStartCol(nStartCol),
-+    mnStartRow(nStartRow),
-+    mnEndCol(nEndCol),
-+    mnEndRow(nEndRow),
-+    mbCenter(bCenter)
-+{
-+}
-+
-+ScCellMergeOption::ScCellMergeOption(const ScCellMergeOption& r) :
-+    maTabs(r.maTabs),
-+    mnStartCol(r.mnStartCol),
-+    mnStartRow(r.mnStartRow),
-+    mnEndCol(r.mnEndCol),
-+    mnEndRow(r.mnEndRow),
-+    mbCenter(r.mbCenter)
-+{
-+}
-+
-+ScRange ScCellMergeOption::getSingleRange(SCTAB nTab) const
-+{
-+    return ScRange(mnStartCol, mnStartRow, nTab, mnEndCol, mnEndRow, nTab);
-+}
-+
-+ScRange ScCellMergeOption::getFirstSingleRange() const
-+{
-+    SCTAB nTab = 0;
-+    if (!maTabs.empty())
-+        nTab = *maTabs.begin();
-+
-+    return getSingleRange(nTab);
-+}
-diff --git sc/source/ui/view/cellsh3.cxx sc/source/ui/view/cellsh3.cxx
-index 57309e3..c689fa1 100644
---- sc/source/ui/view/cellsh3.cxx
-+++ sc/source/ui/view/cellsh3.cxx
-@@ -772,6 +772,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
-             {
-                 // test whether to merge or to split
-                 bool bMerge = false;
-+                BOOL bCenter = FALSE;
-                 switch( nSlot )
-                 {
-                     case FID_MERGE_ON:
-@@ -782,6 +783,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
-                     break;
-                     case FID_MERGE_TOGGLE:
-                     {
-+                        bCenter = TRUE;
-                         SfxPoolItem* pItem = 0;
-                         if( rBindings.QueryState( nSlot, pItem ) >= SFX_ITEM_DEFAULT )
-                             bMerge = !static_cast< SfxBoolItem* >( pItem )->GetValue();
-@@ -802,7 +804,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
-                         bMoveContents = ((const SfxBoolItem*)pItem)->GetValue();
-                     }
- 
--                    if (pTabViewShell->MergeCells( bApi, bMoveContents ))
-+                    if (pTabViewShell->MergeCells( bApi, bMoveContents, TRUE, bCenter ))
-                     {
-                         if (!bApi && bMoveContents)             // "ja" im Dialog geklickt
-                             rReq.AppendItem( SfxBoolItem( nSlot, bMoveContents ) );
-diff --git sc/source/ui/view/makefile.mk sc/source/ui/view/makefile.mk
-index 48395f3..46b8122 100644
---- sc/source/ui/view/makefile.mk
-+++ sc/source/ui/view/makefile.mk
-@@ -100,6 +100,7 @@ SLOFILES =  \
-         $(SLO)$/output3.obj \
-         $(SLO)$/gridmerg.obj \
-         $(SLO)$/invmerge.obj \
-+        $(SLO)$/cellmergeoption.obj \
-         $(SLO)$/select.obj \
-         $(SLO)$/olinewin.obj \
-         $(SLO)$/hintwin.obj \
-diff --git sc/source/ui/view/viewfun2.cxx sc/source/ui/view/viewfun2.cxx
-index c563b9a..d6fd25d 100644
---- sc/source/ui/view/viewfun2.cxx
-+++ sc/source/ui/view/viewfun2.cxx
-@@ -70,6 +70,7 @@ using namespace com::sun::star;
- #include "attrib.hxx"
- #include "autoform.hxx"
- #include "cell.hxx"					// EnterAutoSum
-+#include "cellmergeoption.hxx"
- #include "compiler.hxx"
- #include "docfunc.hxx"
- #include "docpool.hxx"
-@@ -1087,7 +1088,7 @@ BOOL ScViewFunc::TestMergeCells()			// Vorab-Test (fuer Menue)
- 
- //----------------------------------------------------------------------------
- 
--BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
-+BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord, BOOL bCenter )
- {
- 	//	Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc),
- 	//	damit dann nicht die Inhalte-QueryBox kommt
-@@ -1130,10 +1131,26 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
- 		return FALSE;
- 	}
- 
-+    // Check for the contents of all selected tables.
-+    bool bAskDialog = false;
-+    SCTAB nTabCount = pDoc->GetTableCount();
-+    ScCellMergeOption aMergeOption(nStartCol, nStartRow, nEndCol, nEndRow, bCenter);
-+    for (SCTAB i = 0; i < nTabCount; ++i)
-+    {
-+        if (!rMark.GetTableSelect(i))
-+            // this table is not selected.
-+            continue;
-+
-+        aMergeOption.maTabs.insert(i);
-+
-+        if (!pDoc->IsBlockEmpty(i, nStartCol, nStartRow+1, nStartCol, nEndRow) ||
-+            !pDoc->IsBlockEmpty(i, nStartCol+1, nStartRow, nEndCol, nEndRow))
-+            bAskDialog = true;
-+    }
-+
- 	BOOL bOk = TRUE;
- 
--	if ( !pDoc->IsBlockEmpty( nStartTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) ||
--		 !pDoc->IsBlockEmpty( nStartTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) )
-+    if (bAskDialog)
- 	{
- 		if (!bApi)
- 		{
-@@ -1153,7 +1170,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
- 	if (bOk)
- 	{
- 		HideCursor();
--		bOk = pDocSh->GetDocFunc().MergeCells( aMarkRange, rDoContents, bRecord, bApi );
-+		bOk = pDocSh->GetDocFunc().MergeCells( aMergeOption, rDoContents, bRecord, bApi );
- 		ShowCursor();
- 
- 		if (bOk)
-@@ -1189,6 +1206,32 @@ BOOL ScViewFunc::TestRemoveMerge()
- 
- //----------------------------------------------------------------------------
- 
-+static bool lcl_extendMergeRange(ScCellMergeOption& rOption, const ScRange& rRange)
-+{
-+    bool bExtended = false;
-+    if (rOption.mnStartCol > rRange.aStart.Col())
-+    {    
-+        rOption.mnStartCol = rRange.aStart.Col();
-+        bExtended = true;
-+    }
-+    if (rOption.mnStartRow > rRange.aStart.Row())
-+    {    
-+        rOption.mnStartRow = rRange.aStart.Row();
-+        bExtended = true;
-+    }
-+    if (rOption.mnEndCol < rRange.aEnd.Col())
-+    {    
-+        rOption.mnEndCol = rRange.aEnd.Col();
-+        bExtended = true;
-+    }
-+    if (rOption.mnEndRow < rRange.aEnd.Row())
-+    {    
-+        rOption.mnEndRow = rRange.aEnd.Row();
-+        bExtended = true;
-+    }
-+    return bExtended;
-+}
-+
- BOOL ScViewFunc::RemoveMerge( BOOL bRecord )
- {
- 	ScRange aRange;
-@@ -1200,12 +1243,39 @@ BOOL ScViewFunc::RemoveMerge( BOOL bRecord )
-     }
- 	else if (GetViewData()->GetSimpleArea( aRange ) == SC_MARK_SIMPLE)
- 	{
-+        ScDocument* pDoc = GetViewData()->GetDocument();
-         ScRange aExtended( aRange );
--        GetViewData()->GetDocument()->ExtendMerge( aExtended );
-+        pDoc->ExtendMerge( aExtended );
- 		ScDocShell* pDocSh = GetViewData()->GetDocShell();
-+        const ScMarkData& rMark = GetViewData()->GetMarkData();
-+        SCTAB nTabCount = pDoc->GetTableCount();
-+        ScCellMergeOption aOption(aRange.aStart.Col(), aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row());
-+        bool bExtended = false;
-+        do
-+        {
-+            bExtended = false;
-+            for (SCTAB i = 0; i < nTabCount; ++i)
-+            {
-+                if (!rMark.GetTableSelect(i))
-+                    // This table is not selected.
-+                    continue;
-+    
-+                aOption.maTabs.insert(i);
-+                aExtended.aStart.SetTab(i);
-+                aExtended.aEnd.SetTab(i);
-+                pDoc->ExtendMerge(aExtended);
-+                pDoc->ExtendOverlapped(aExtended);
-+    
-+                // Expand the current range to be inclusive of all merged
-+                // areas on all sheets.
-+                bExtended = lcl_extendMergeRange(aOption, aExtended);
-+            }
-+        }
-+        while (bExtended);
- 
- 		HideCursor();
--		BOOL bOk = pDocSh->GetDocFunc().UnmergeCells( aRange, bRecord, FALSE );
-+		BOOL bOk = pDocSh->GetDocFunc().UnmergeCells(aOption, bRecord, FALSE );
-+        aExtended = aOption.getFirstSingleRange();
-         MarkRange( aExtended );
- 		ShowCursor();
- 
-diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
-index 118fac7..322d448 100644
---- sc/uiconfig/scalc/menubar/menubar.xml
-+++ sc/uiconfig/scalc/menubar/menubar.xml
-@@ -218,7 +218,13 @@
-                     <menu:menuitem menu:id=".uno:SetTabBgColor"/>
-                 </menu:menupopup>
-             </menu:menu>
--            <menu:menuitem menu:id=".uno:ToggleMergeCells"/>
-+            <menu:menu menu:id=".uno:MergeCellsMenu">
-+                <menu:menupopup>
-+                    <menu:menuitem menu:id=".uno:ToggleMergeCells"/>
-+                    <menu:menuitem menu:id=".uno:MergeCells"/>
-+                    <menu:menuitem menu:id=".uno:SplitCell"/>
-+                </menu:menupopup>
-+            </menu:menu>
-             <menu:menuseparator/>
-             <menu:menuitem menu:id=".uno:PageFormatDialog"/>
-             <menu:menu menu:id=".uno:PrintRangesMenu">
diff --git a/applied_patches/0557-unittesting-offapi.diff b/applied_patches/0441-unittesting-offapi.diff
similarity index 100%
rename from applied_patches/0557-unittesting-offapi.diff
rename to applied_patches/0441-unittesting-offapi.diff
diff --git a/applied_patches/0558-unittesting-o3tl.diff b/applied_patches/0442-unittesting-o3tl.diff
similarity index 100%
rename from applied_patches/0558-unittesting-o3tl.diff
rename to applied_patches/0442-unittesting-o3tl.diff
diff --git a/applied_patches/0559-unittesting-package.diff b/applied_patches/0443-unittesting-package.diff
similarity index 100%
rename from applied_patches/0559-unittesting-package.diff
rename to applied_patches/0443-unittesting-package.diff
diff --git a/applied_patches/0560-unittesting-qadevOOo.diff b/applied_patches/0444-unittesting-qadevOOo.diff
similarity index 100%
rename from applied_patches/0560-unittesting-qadevOOo.diff
rename to applied_patches/0444-unittesting-qadevOOo.diff
diff --git a/applied_patches/0445-calc-html-import-custom-lang-filter.diff b/applied_patches/0445-calc-html-import-custom-lang-filter.diff
deleted file mode 100644
index 47e7f37a4..000000000
--- a/applied_patches/0445-calc-html-import-custom-lang-filter.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
-index 55d3ba4..7e98666 100644
---- filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
-+++ filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
-@@ -1,6 +1,6 @@
- 	<node oor:name="calc_HTML_WebQuery" oor:op="replace">
--		<prop oor:name="Flags"><value>IMPORT ALIEN</value></prop>
--		<prop oor:name="UIComponent"/>
-+		<prop oor:name="Flags"><value>IMPORT ALIEN USEOPTIONS</value></prop>
-+		<prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop>
- 		<prop oor:name="FilterService"/>
- 		<prop oor:name="UserData"><value></value></prop>
- 		<prop oor:name="FileFormatVersion"><value>0</value></prop>
-diff --git filter/source/config/fragments/filters/HTML__StarCalc_.xcu filter/source/config/fragments/filters/HTML__StarCalc_.xcu
-index 78c7daf..d90d22a 100644
---- filter/source/config/fragments/filters/HTML__StarCalc_.xcu
-+++ filter/source/config/fragments/filters/HTML__StarCalc_.xcu
-@@ -1,6 +1,6 @@
- 	<node oor:name="HTML (StarCalc)" oor:op="replace">
--		<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN</value></prop>
--		<prop oor:name="UIComponent"/>
-+		<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN USEOPTIONS</value></prop>
-+		<prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop>
- 		<prop oor:name="FilterService"/>
- 		<prop oor:name="UserData"><value></value></prop>
- 		<prop oor:name="FileFormatVersion"><value>0</value></prop>
diff --git a/applied_patches/0561-unittesting-registry.diff b/applied_patches/0445-unittesting-registry.diff
similarity index 100%
rename from applied_patches/0561-unittesting-registry.diff
rename to applied_patches/0445-unittesting-registry.diff
diff --git a/applied_patches/0446-calc-html-import-custom-lang-sc.diff b/applied_patches/0446-calc-html-import-custom-lang-sc.diff
deleted file mode 100644
index 7d0d4081b..000000000
--- a/applied_patches/0446-calc-html-import-custom-lang-sc.diff
+++ /dev/null
@@ -1,1319 +0,0 @@
-diff --git sc/inc/column.hxx sc/inc/column.hxx
-index 7d297e1..babda9e 100644
---- sc/inc/column.hxx
-+++ sc/inc/column.hxx
-@@ -243,7 +243,9 @@ public:
- 
- 				//	TRUE = Zahlformat gesetzt
- 	BOOL		SetString( SCROW nRow, SCTAB nTab, const String& rString,
--						   formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO );
-+						   formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO,
-+                           SvNumberFormatter* pFormatter = NULL,
-+                           bool bDetectNumberFormat = true );
- 	void		SetValue( SCROW nRow, const double& rVal);
- 	void		SetError( SCROW nRow, const USHORT nError);
- 
-diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 528ef96..0da5a7a 100644
---- sc/inc/document.hxx
-+++ sc/inc/document.hxx
-@@ -736,7 +736,9 @@ public:
- 	SC_DLLPUBLIC void			PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell,
- 							ULONG nFormatIndex, BOOL bForceTab = FALSE);
- 					//	return TRUE = Zahlformat gesetzt
--    SC_DLLPUBLIC BOOL           SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString );
-+    SC_DLLPUBLIC BOOL           SetString(
-+        SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
-+        SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
-     SC_DLLPUBLIC void           SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal );
- 	void 			SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError);
- 
-diff --git sc/inc/filter.hxx sc/inc/filter.hxx
-index 82a2b84..63c9ec6 100644
---- sc/inc/filter.hxx
-+++ sc/inc/filter.hxx
-@@ -42,6 +42,7 @@ class SvStream;
- class ScAddress;
- class ScDocument;
- class ScRange;
-+class SvNumberFormatter;
- 
- // Return-Werte Im-/Exportfilter	(ULONG)
- 
-@@ -92,7 +93,9 @@ class ScEEAbsImport {
-     virtual ~ScEEAbsImport() {}
-     virtual ULONG   Read( SvStream& rStream, const String& rBaseURL ) = 0;
-     virtual ScRange GetRange() = 0;
--    virtual void    WriteToDocument( BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0 ) = 0;
-+    virtual void    WriteToDocument( 
-+        BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, 
-+        SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
- };
- 
- class ScFormatFilterPlugin {
-@@ -109,7 +112,8 @@ class ScFormatFilterPlugin {
-     virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos,
- 				 const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
-     virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange ) = 0;
--    virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE ) = 0;
-+    virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, 
-+                                   BOOL bCalcWidthHeight = TRUE, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
- 
-     // various import helpers
-     virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) = 0;
-diff --git sc/inc/sc.hrc sc/inc/sc.hrc
-index 2c7ad7b..cf99a55 100644
---- sc/inc/sc.hrc
-+++ sc/inc/sc.hrc
-@@ -1673,6 +1673,9 @@
- 
- #define RID_SCDLG_TAB_BG_COLOR          (SC_OOO_BUILD_START + 11)
- 
-+// Language chooser for text import filters.
-+#define RID_SCDLG_LANG_CHOOSER           (SC_OOO_BUILD_START + 12)
-+
- #endif
- 
- 
-diff --git sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx
-index 637682d..1c9f587 100644
---- sc/inc/scabstdlg.hxx
-+++ sc/inc/scabstdlg.hxx
-@@ -41,6 +41,7 @@
- #include "sc.hrc"
- #include "global.hxx"
- #include "pivot.hxx"
-+#include "i18npool/lang.h"
- 
- #include <tabvwsh.hxx>
- 
-@@ -303,6 +304,14 @@ class AbstractScImportOptionsDlg : public VclAbstractDialog  //add for ScImportO
- public:
- 	virtual void GetImportOptions( ScImportOptions& rOptions ) const = 0;
- };
-+
-+class AbstractScLangChooserDlg : public VclAbstractDialog //add for ScLangChooserDlg
-+{
-+public:
-+    virtual LanguageType GetLanguageType() const = 0;
-+    virtual bool IsDateConversionSet() const = 0;
-+};
-+
- //-------Scabstract fractory ---------------------------
- class ScAbstractDialogFactory
- {
-@@ -313,6 +322,8 @@ public:
- 																	SvStream* pInStream, int nId,
- 																	sal_Unicode cSep = '\t') = 0;
- 
-+    virtual     AbstractScLangChooserDlg * CreateScLangChooserDlg( Window* pParent, int nId ) = 0;
-+
- 	virtual		AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window*					pParent, //add for ScAutoFormatDlg
- 																ScAutoFormat*				pAutoFormat,
- 																const ScAutoFormatData*    pSelFormatData,
-diff --git sc/inc/stringutil.hxx sc/inc/stringutil.hxx
-new file mode 100644
-index 0000000..4ca8629
---- /dev/null
-+++ sc/inc/stringutil.hxx
-@@ -0,0 +1,56 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: table.hxx,v $
-+ * $Revision: 1.35 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SC_STRINGUTIL_HXX
-+#define SC_STRINGUTIL_HXX
-+
-+#include "rtl/ustring.hxx"
-+
-+class ScStringUtil
-+{
-+public:
-+    /** 
-+     * Check if a given string is a simple decimal number (e.g. 12.345). We 
-+     * don't do any elaborate parsing here; we only check for the simplest 
-+     * case of decimal number format. 
-+     *
-+     * @param rStr string to parse
-+     * @param dsep decimal separator
-+     * @param gsep group separator (aka thousands separator)
-+     * @param rVal value of successfully parsed number
-+     * 
-+     * @return true if the string is a valid number, false otherwise.
-+     */
-+    static bool parseSimpleNumber(
-+        const ::rtl::OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal);
-+};
-+
-+
-+#endif
-diff --git sc/inc/table.hxx sc/inc/table.hxx
-index b95c40c..ea24628 100644
---- sc/inc/table.hxx
-+++ sc/inc/table.hxx
-@@ -253,7 +253,8 @@ public:
- 	void		PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell );
- 	void		PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell);
- 				//	TRUE = Zahlformat gesetzt
--	BOOL		SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString );
-+	BOOL		SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
-+                           SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
- 	void		SetValue( SCCOL nCol, SCROW nRow, const double& rVal );
- 	void 		SetError( SCCOL nCol, SCROW nRow, USHORT nError);
- 
-diff --git sc/source/core/data/column3.cxx sc/source/core/data/column3.cxx
-index b1fac42..40f6370 100644
---- sc/source/core/data/column3.cxx
-+++ sc/source/core/data/column3.cxx
-@@ -54,6 +54,13 @@
- #include "markdata.hxx"
- #include "detfunc.hxx"			// fuer Notizen bei DeleteRange
- #include "postit.hxx"
-+#include "stringutil.hxx"
-+
-+#include <com/sun/star/i18n/LocaleDataItem.hpp>
-+
-+using ::com::sun::star::i18n::LocaleDataItem;
-+using ::rtl::OUString;
-+using ::rtl::OUStringBuffer;
- 
- // Err527 Workaround
- extern const ScFormulaCell* pLastFormulaTreeTop;	// in cellform.cxx
-@@ -1218,7 +1225,8 @@ void ScColumn::StartListeningInArea( SCROW nRow1, SCROW nRow2 )
- 
- //	TRUE = Zahlformat gesetzt
- BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
--						  formula::FormulaGrammar::AddressConvention eConv )
-+                          formula::FormulaGrammar::AddressConvention eConv,
-+                          SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
- {
- 	BOOL bNumFmtSet = FALSE;
- 	if (VALIDROW(nRow))
-@@ -1230,7 +1238,8 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
- 			double nVal;
-             sal_uInt32 nIndex, nOldIndex = 0;
- 			sal_Unicode cFirstChar;
--			SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
-+            if (!pFormatter)
-+                pFormatter = pDocument->GetFormatTable();
- 			SfxObjectShell* pDocSh = pDocument->GetDocumentShell();
- 			if ( pDocSh )
- 				bIsLoading = pDocSh->IsLoading();
-@@ -1297,48 +1306,80 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
- 					if ( !bIsText )
- 						nIndex = nOldIndex = pFormatter->GetStandardIndex();
- 				}
--				if ( !bIsText &&
--						pFormatter->IsNumberFormat(rString, nIndex, nVal) )
--				{												// Zahl
--					pNewCell = new ScValueCell( nVal );
--					if ( nIndex != nOldIndex)
--					{
--                        // #i22345# New behavior: Apply the detected number format only if
--                        // the old one was the default number, date, time or boolean format.
--                        // Exception: If the new format is boolean, always apply it.
- 
--                        BOOL bOverwrite = FALSE;
--                        const SvNumberformat* pOldFormat = pFormatter->GetEntry( nOldIndex );
--                        if ( pOldFormat )
-+                do
-+                {
-+                    if (bIsText)
-+                        break;
-+
-+                    if (bDetectNumberFormat)
-+                    {
-+                        if (!pFormatter->IsNumberFormat(rString, nIndex, nVal))
-+                            break;
-+
-+                        pNewCell = new ScValueCell( nVal );
-+                        if ( nIndex != nOldIndex)
-                         {
--                            short nOldType = pOldFormat->GetType() & ~NUMBERFORMAT_DEFINED;
--                            if ( nOldType == NUMBERFORMAT_NUMBER || nOldType == NUMBERFORMAT_DATE ||
--                                 nOldType == NUMBERFORMAT_TIME || nOldType == NUMBERFORMAT_LOGICAL )
-+                            // #i22345# New behavior: Apply the detected number format only if
-+                            // the old one was the default number, date, time or boolean format.
-+                            // Exception: If the new format is boolean, always apply it.
-+
-+                            BOOL bOverwrite = FALSE;
-+                            const SvNumberformat* pOldFormat = pFormatter->GetEntry( nOldIndex );
-+                            if ( pOldFormat )
-                             {
--                                if ( nOldIndex == pFormatter->GetStandardFormat(
--                                                    nOldType, pOldFormat->GetLanguage() ) )
-+                                short nOldType = pOldFormat->GetType() & ~NUMBERFORMAT_DEFINED;
-+                                if ( nOldType == NUMBERFORMAT_NUMBER || nOldType == NUMBERFORMAT_DATE ||
-+                                     nOldType == NUMBERFORMAT_TIME || nOldType == NUMBERFORMAT_LOGICAL )
-                                 {
--                                    bOverwrite = TRUE;      // default of these types can be overwritten
-+                                    if ( nOldIndex == pFormatter->GetStandardFormat(
-+                                                        nOldType, pOldFormat->GetLanguage() ) )
-+                                    {
-+                                        bOverwrite = TRUE;      // default of these types can be overwritten
-+                                    }
-                                 }
-                             }
--                        }
--                        if ( !bOverwrite && pFormatter->GetType( nIndex ) == NUMBERFORMAT_LOGICAL )
--                        {
--                            bOverwrite = TRUE;              // overwrite anything if boolean was detected
--                        }
-+                            if ( !bOverwrite && pFormatter->GetType( nIndex ) == NUMBERFORMAT_LOGICAL )
-+                            {
-+                                bOverwrite = TRUE;              // overwrite anything if boolean was detected
-+                            }
- 
--                        if ( bOverwrite )
--                        {
--                            ApplyAttr( nRow, SfxUInt32Item( ATTR_VALUE_FORMAT,
--                                (UINT32) nIndex) );
--                            bNumFmtSet = TRUE;
-+                            if ( bOverwrite )
-+                            {
-+                                ApplyAttr( nRow, SfxUInt32Item( ATTR_VALUE_FORMAT,
-+                                    (UINT32) nIndex) );
-+                                bNumFmtSet = TRUE;
-+                            }
-                         }
--					}
--				}
--				else											// Text
--					pNewCell = new ScStringCell( rString );
--			}
--		}
-+                    }
-+                    else
-+                    {
-+                        // Only check if the string is a regular number.
-+                        const LocaleDataWrapper* pLocale = pFormatter->GetLocaleData();
-+                        if (!pLocale)
-+                            break;
-+                        
-+                        LocaleDataItem aLocaleItem = pLocale->getLocaleItem();
-+                        const OUString& rDecSep = aLocaleItem.decimalSeparator;
-+                        const OUString& rGroupSep = aLocaleItem.thousandSeparator;
-+                        if (rDecSep.getLength() != 1 || rGroupSep.getLength() != 1)
-+                            break;
-+
-+                        sal_Unicode dsep = rDecSep.getStr()[0];
-+                        sal_Unicode gsep = rGroupSep.getStr()[0];
-+
-+                        if (!ScStringUtil::parseSimpleNumber(rString, dsep, gsep, nVal))
-+                            break;
-+
-+                        pNewCell = new ScValueCell(nVal);
-+                    }
-+                }
-+                while (false);
-+
-+                if (!pNewCell)
-+                    pNewCell = new ScStringCell(rString);
-+            }
-+        }
- 
- 		if ( bIsLoading && (!nCount || nRow > pItems[nCount-1].nRow) )
- 		{	// Search einsparen und ohne Umweg ueber Insert, Listener aufbauen
-diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index 6c96215..a3b7e49 100644
---- sc/source/core/data/document.cxx
-+++ sc/source/core/data/document.cxx
-@@ -2451,10 +2451,11 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT
- }
- 
- 
--BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString )
-+BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
-+                            SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
- {
- 	if ( ValidTab(nTab) && pTab[nTab] )
--		return pTab[nTab]->SetString( nCol, nRow, nTab, rString );
-+		return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pFormatter, bDetectNumberFormat );
- 	else
- 		return FALSE;
- }
-diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index d2f8710..8cb6f7a 100644
---- sc/source/core/data/table2.cxx
-+++ sc/source/core/data/table2.cxx
-@@ -841,10 +841,12 @@ void ScTable::PutCell( const ScAddress& rPos, ULONG nFormatIndex, ScBaseCell* pC
- }
- 
- 
--BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString )
-+BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString, 
-+                         SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
- {
- 	if (ValidColRow(nCol,nRow))
--        return aCol[nCol].SetString( nRow, nTabP, rString );
-+        return aCol[nCol].SetString( 
-+            nRow, nTabP, rString, pDocument->GetAddressConvention(), pFormatter, bDetectNumberFormat );
- 	else
- 		return FALSE;
- }
-diff --git sc/source/core/tool/makefile.mk sc/source/core/tool/makefile.mk
-index 1bf94ea..b54c041 100644
---- sc/source/core/tool/makefile.mk
-+++ sc/source/core/tool/makefile.mk
-@@ -107,6 +107,7 @@ SLOFILES =  \
- 		$(SLO)$/refupdat.obj \
- 		$(SLO)$/scmatrix.obj \
- 		$(SLO)$/sctictac.obj \
-+		$(SLO)$/stringutil.obj \
- 		$(SLO)$/subtotal.obj \
- 		$(SLO)$/token.obj \
- 		$(SLO)$/unitconv.obj \
-@@ -130,6 +131,7 @@ EXCEPTIONSFILES= \
- 		$(SLO)$/lookupcache.obj \
-         $(SLO)$/prnsave.obj \
- 		$(SLO)$/reftokenhelper.obj \
-+		$(SLO)$/stringutil.obj \
- 		$(SLO)$/token.obj
- 
- # [kh] POWERPC compiler problem
-diff --git sc/source/core/tool/stringutil.cxx sc/source/core/tool/stringutil.cxx
-new file mode 100644
-index 0000000..eaf756e
---- /dev/null
-+++ sc/source/core/tool/stringutil.cxx
-@@ -0,0 +1,101 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: table.hxx,v $
-+ * $Revision: 1.35 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_sc.hxx"
-+
-+// System - Includes -----------------------------------------------------
-+
-+#include "stringutil.hxx"
-+#include "rtl/ustrbuf.hxx"
-+
-+using ::rtl::OUString;
-+using ::rtl::OUStringBuffer;
-+
-+bool ScStringUtil::parseSimpleNumber(
-+    const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal)
-+{
-+    OUStringBuffer aBuf;
-+    sal_Int32 n = rStr.getLength();
-+    const sal_Unicode* p = rStr.getStr();
-+    sal_Int32 nPosDSep = -1, nPosGSep = -1;
-+    for (sal_Int32 i = 0; i < n; ++i)
-+    {
-+        sal_Unicode c = p[i];
-+        if (sal_Unicode('0') <= c && c <= sal_Unicode('9'))
-+        {
-+            // this is a digit.
-+            aBuf.append(c);
-+        }
-+        else if (c == dsep)
-+        {
-+            // this is a decimal separator.
-+
-+            if (nPosDSep >= 0)
-+                // a second decimal separator -> not a valid number.
-+                return false;
-+            if (nPosGSep >= 0 && i - nPosGSep != 4)
-+                // the number has a group separator and the decimal sep is not
-+                // positioned correctly.
-+                return false;
-+
-+            nPosDSep = i;
-+            aBuf.append(c);
-+        }
-+        else if (c == gsep)
-+        {
-+            // this is a group (thousand) separator.
-+            if (i == 0)
-+                return false;
-+
-+            if (nPosGSep >= 0 && i - nPosGSep != 4)
-+            {    
-+                // this group separator is not positioned correctly relative
-+                // to the last group separator.
-+                return false;
-+            }
-+
-+            nPosGSep = i;
-+        }
-+        else if (c == sal_Unicode('-') || c == sal_Unicode('+'))
-+        {
-+            // A sign must be the first character if it's given.
-+            if (i == 0)
-+                aBuf.append(c);
-+            else
-+                return false;
-+        }
-+        else
-+            return false;
-+    }
-+
-+    rVal = aBuf.makeStringAndClear().toDouble();
-+    return true;
-+}
-diff --git sc/source/filter/html/htmlimp.cxx sc/source/filter/html/htmlimp.cxx
-index 8c92f3d..8fbd9aa 100644
---- sc/source/filter/html/htmlimp.cxx
-+++ sc/source/filter/html/htmlimp.cxx
-@@ -63,13 +63,14 @@
- //------------------------------------------------------------------------
- 
- FltError ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const String& rBaseURL, ScDocument *pDoc,
--		ScRange& rRange, double nOutputFactor, BOOL bCalcWidthHeight )
-+		ScRange& rRange, double nOutputFactor, BOOL bCalcWidthHeight, SvNumberFormatter* pFormatter,
-+        bool bConvertDate )
- {
-     ScHTMLImport aImp( pDoc, rBaseURL, rRange, bCalcWidthHeight );
-     FltError nErr = (FltError) aImp.Read( rStream, rBaseURL );
- 	ScRange aR = aImp.GetRange();
- 	rRange.aEnd = aR.aEnd;
--	aImp.WriteToDocument( TRUE, nOutputFactor );
-+	aImp.WriteToDocument( TRUE, nOutputFactor, pFormatter, bConvertDate );
- 	return nErr;
- }
- 
-@@ -137,9 +138,10 @@ void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const String& rName, const
- 		delete pRangeData;
- }
- 
--void ScHTMLImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor )
-+void ScHTMLImport::WriteToDocument( 
-+    BOOL bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate )
- {
--	ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor );
-+	ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor, pFormatter, bConvertDate );
- 
-     const ScHTMLParser* pParser = GetParser();
-     const ScHTMLTable* pGlobTable = pParser->GetGlobalTable();
-diff --git sc/source/filter/inc/eeimport.hxx sc/source/filter/inc/eeimport.hxx
-index fef4486..32d7d0a 100644
---- sc/source/filter/inc/eeimport.hxx
-+++ sc/source/filter/inc/eeimport.hxx
-@@ -63,7 +63,9 @@ public:
-     virtual ULONG    Read( SvStream& rStream, const String& rBaseURL );
-     virtual ScRange  GetRange() { return maRange; }
-     virtual void     WriteToDocument( BOOL bSizeColsRows = FALSE,
--                                      double nOutputFactor = 1.0 );
-+                                      double nOutputFactor = 1.0,
-+                                      SvNumberFormatter* pFormatter = NULL,
-+                                      bool bConvertDate = true );
- };
- 
- #endif
-diff --git sc/source/filter/inc/ftools.hxx sc/source/filter/inc/ftools.hxx
-index b670900..79c698e 100644
---- sc/source/filter/inc/ftools.hxx
-+++ sc/source/filter/inc/ftools.hxx
-@@ -522,7 +522,9 @@ class ScFormatFilterPluginImpl : public ScFormatFilterPlugin {
-     virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos,
- 				 const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL );
-     virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange );
--    virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE );
-+    virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, 
-+                                   double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE, 
-+                                   SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true );
- 
-     virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange );
-     virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, BOOL bCalcWidthHeight );
-diff --git sc/source/filter/inc/htmlimp.hxx sc/source/filter/inc/htmlimp.hxx
-index 96ce225..aafe91b 100644
---- sc/source/filter/inc/htmlimp.hxx
-+++ sc/source/filter/inc/htmlimp.hxx
-@@ -45,7 +45,8 @@ public:
-     virtual ~ScHTMLImport();
-     const ScHTMLParser* GetParser() const { return (ScHTMLParser*)mpParser; }
- 
--	virtual void		WriteToDocument( BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0 );
-+	virtual void		WriteToDocument( BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, 
-+                                         SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true );
- 
- 	static String		GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName );
- };
-diff --git sc/source/filter/rtf/eeimpars.cxx sc/source/filter/rtf/eeimpars.cxx
-index 3f813a1..e4b28a7 100644
---- sc/source/filter/rtf/eeimpars.cxx
-+++ sc/source/filter/rtf/eeimpars.cxx
-@@ -129,7 +129,7 @@ ULONG ScEEImport::Read( SvStream& rStream, const String& rBaseURL )
- }
- 
- 
--void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor )
-+void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate )
- {
-     ScProgress* pProgress = new ScProgress( mpDoc->GetDocumentShell(),
-         ScGlobal::GetRscString( STR_LOAD_DOC ), mpParser->Count() );
-@@ -150,7 +150,8 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor )
- 	nLastMergedRow = SCROW_MAX;
- 	BOOL bHasGraphics = FALSE;
- 	ScEEParseEntry* pE;
--    SvNumberFormatter* pFormatter = mpDoc->GetFormatTable();
-+    if (!pFormatter)
-+        pFormatter = mpDoc->GetFormatTable();
-     bool bNumbersEnglishUS = (pFormatter->GetLanguage() != LANGUAGE_ENGLISH_US);
-     if (bNumbersEnglishUS)
-     {
-@@ -335,7 +336,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor )
- 				else if ( !pE->aSel.HasRange() )
- 				{
- 					// maybe ALT text of IMG or similar
--                    mpDoc->SetString( nCol, nRow, nTab, pE->aAltText );
-+                    mpDoc->SetString( nCol, nRow, nTab, pE->aAltText, pFormatter );
- 					// wenn SelRange komplett leer kann nachfolgender Text im gleichen Absatz liegen!
- 				}
- 				else
-@@ -380,7 +381,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor )
-                     if (bNumbersEnglishUS && !bEnUsRecognized)
-                         mpDoc->PutCell( nCol, nRow, nTab, new ScStringCell( aStr));
-                     else
--                        mpDoc->SetString( nCol, nRow, nTab, aStr );
-+                        mpDoc->SetString( nCol, nRow, nTab, aStr, pFormatter, bConvertDate );
- 				}
- 			}
- 			else
-diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx
-index fe6cf52..0d1330e 100644
---- sc/source/ui/attrdlg/scdlgfact.cxx
-+++ sc/source/ui/attrdlg/scdlgfact.cxx
-@@ -71,6 +71,7 @@
- #include "validate.hxx" //add for ScValidationDlg
- #include "validate.hrc" //add for ScValidationDlg
- #include "sortdlg.hxx" //add for ScSortDlg
-+#include "langchooser.hxx"
- #include "opredlin.hxx" //add for  ScRedlineOptionsTabPage
- #include "tpcalc.hxx" //add for ScTpCalcOptions
- #include "tpprint.hxx" //add for ScTpPrintOptions
-@@ -117,6 +118,7 @@ IMPL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl); //add for ScShowTabDlg
- IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl); //add for ScStringInputDlg
- IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl); //add for ScTabBgColorDlg
- IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl); //add for ScImportOptionsDlg
-+IMPL_ABSTDLG_BASE(AbstractScLangChooserDlg_Impl);
- IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
- 
- 
-@@ -594,6 +596,20 @@ void AbstractScImportOptionsDlg_Impl::GetImportOptions( ScImportOptions& rOption
- 	pDlg->GetImportOptions(rOptions);
- }
- // add for AbstractScImportOptionsDlg_Impl end
-+
-+//add for AbstractScLangChooserDlg_Impl begin
-+LanguageType AbstractScLangChooserDlg_Impl::GetLanguageType() const
-+{
-+    return pDlg->getLanguageType();
-+}
-+
-+bool AbstractScLangChooserDlg_Impl::IsDateConversionSet() const
-+{
-+    return pDlg->isDateConversionSet();
-+}
-+
-+//add for AbstractScLangChooserDlg_Impl end
-+
- // =========================Factories  for createdialog ===================
- 
- //add for ScImportAsciiDlg begin
-@@ -616,6 +632,21 @@ AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg
- }
- // ScImportAsciiDlg end
- 
-+AbstractScLangChooserDlg * ScAbstractDialogFactory_Impl::CreateScLangChooserDlg( Window* pParent, int nId )
-+{
-+    ScLangChooserDlg* pDlg = NULL;
-+    switch (nId)
-+    {
-+        case RID_SCDLG_LANG_CHOOSER:
-+            pDlg = new ScLangChooserDlg(pParent);
-+        break;
-+        default:
-+            ;
-+    }
-+
-+    return pDlg ? new AbstractScLangChooserDlg_Impl(pDlg) : NULL;
-+}
-+
- //add for ScAutoFormatDlg begin
- 
- AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window*					pParent, //add for ScAutoFormatDlg
---- sc/source/ui/attrdlg/scdlgfact.hxx
-+++ sc/source/ui/attrdlg/scdlgfact.hxx
-@@ -65,6 +65,7 @@ class ScStringInputDlg;
- class ScImportOptionsDlg;
- class SfxTabDialog;
- class ScSortWarningDlg;
-+class ScLangChooserDlg;
- 
- #define DECL_ABSTDLG_BASE(Class,DialogClass)		\
- 	DialogClass* 		pDlg;                   	\
-@@ -356,6 +357,13 @@ class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg  //add
- 	virtual void GetImportOptions( ScImportOptions& rOptions ) const;
- };
- 
-+class AbstractScLangChooserDlg_Impl : public AbstractScLangChooserDlg
-+{
-+    DECL_ABSTDLG_BASE( AbstractScLangChooserDlg_Impl, ScLangChooserDlg)
-+    virtual LanguageType GetLanguageType() const;
-+    virtual bool IsDateConversionSet() const;
-+};
-+
- //add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
- class AbstractTabDialog_Impl : public SfxAbstractTabDialog
- {
-@@ -380,6 +388,8 @@ public:
- 																	SvStream* pInStream, int nId,
- 																	sal_Unicode cSep = '\t');
- 
-+    virtual AbstractScLangChooserDlg * CreateScLangChooserDlg( Window* pParent, int nId );
-+
- 	virtual		AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window*					pParent, //add for ScAutoFormatDlg
- 																ScAutoFormat*				pAutoFormat,
- 																const ScAutoFormatData*    pSelFormatData,
-diff --git sc/source/ui/dbgui/langchooser.cxx sc/source/ui/dbgui/langchooser.cxx
-new file mode 100644
-index 0000000..d5fd72b
---- /dev/null
-+++ sc/source/ui/dbgui/langchooser.cxx
-@@ -0,0 +1,120 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: langbox.hxx,v $
-+ * $Revision: 1.4.242.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_sc.hxx"
-+
-+#undef SC_DLLIMPLEMENTATION
-+
-+//------------------------------------------------------------------------
-+
-+#include "langchooser.hxx"
-+#include "langchooser.hrc"
-+
-+#include "scresid.hxx"
-+#include "vcl/window.hxx"
-+#include "vcl/msgbox.hxx"
-+#include "vcl/svapp.hxx"
-+
-+ScLangChooserDlg::ScLangChooserDlg(Window* pParent) :
-+    ModalDialog(pParent, ScResId(RID_SCDLG_LANG_CHOOSER)),
-+
-+    maBtnOk(this, ScResId(BTN_OK)),
-+    maBtnCancel(this, ScResId(BTN_CANCEL)),
-+    maBtnHelp(this, ScResId(BTN_HELP)),
-+    maFlChooseLang(this, ScResId(FL_CHOOSE_LANG)),
-+    maRbAutomatic(this, ScResId(RB_AUTOMATIC)), 
-+    maRbCustom(this, ScResId(RB_CUSTOM)),
-+    maLbCustomLang(this, ScResId(LB_CUSTOM_LANG)),
-+    maFlOption(this, ScResId(FL_OPTION)),
-+    maBtnConvertDate(this, ScResId(BTN_CONVERT_DATE))
-+{
-+    init();
-+}
-+
-+ScLangChooserDlg::~ScLangChooserDlg()
-+{
-+}
-+
-+short ScLangChooserDlg::Execute()
-+{
-+    return ModalDialog::Execute();
-+}
-+
-+LanguageType ScLangChooserDlg::getLanguageType() const
-+{
-+    if (maRbAutomatic.IsChecked())
-+        return LANGUAGE_SYSTEM;
-+
-+    return maLbCustomLang.GetSelectLanguage();
-+}
-+
-+bool ScLangChooserDlg::isDateConversionSet() const
-+{
-+    return maBtnConvertDate.IsChecked();
-+}
-+
-+void ScLangChooserDlg::init()
-+{
-+    Link aLink = LINK( this, ScLangChooserDlg, OKHdl );
-+    maBtnOk.SetClickHdl(aLink);
-+    aLink = LINK( this, ScLangChooserDlg, RadioHdl );
-+    maRbAutomatic.SetClickHdl(aLink);
-+    maRbCustom.SetClickHdl(aLink);
-+
-+    maRbAutomatic.Check(true);
-+
-+    maLbCustomLang.SetLanguageList(
-+        LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, false, false);
-+
-+    LanguageType eLang = Application::GetSettings().GetLanguage();
-+    maLbCustomLang.SelectLanguage(eLang);
-+    maLbCustomLang.Disable();
-+}
-+
-+IMPL_LINK( ScLangChooserDlg, OKHdl, OKButton*, EMPTYARG )
-+{
-+    EndDialog(RET_OK);
-+    return 0;
-+}
-+
-+IMPL_LINK( ScLangChooserDlg, RadioHdl, RadioButton*, pBtn )
-+{
-+    if (pBtn == &maRbAutomatic)
-+    {
-+        maLbCustomLang.Disable();
-+    }
-+    else if (pBtn == &maRbCustom)
-+    {
-+        maLbCustomLang.Enable();
-+    }
-+    return 0;
-+}
-+
-diff --git sc/source/ui/dbgui/langchooser.src sc/source/ui/dbgui/langchooser.src
-new file mode 100644
-index 0000000..1e121de
---- /dev/null
-+++ sc/source/ui/dbgui/langchooser.src
-@@ -0,0 +1,112 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: retypepassdlg.src,v $
-+ * $Revision: 1.1.2.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#include "langchooser.hrc"
-+
-+ModalDialog RID_SCDLG_LANG_CHOOSER
-+{
-+    Text [ en-US ] = "Select Language" ;
-+    Size = MAP_APPFONT ( 190 , 101 ) ;
-+    Moveable = TRUE ;
-+    Closeable = TRUE ;
-+    OutputSize = TRUE ;
-+
-+    OKButton BTN_OK
-+    {
-+        Pos = MAP_APPFONT ( 135, 6 ) ;
-+        Size = MAP_APPFONT ( 50, 14 ) ;
-+        DefButton = TRUE ;
-+    };
-+
-+    CancelButton BTN_CANCEL
-+    {
-+        Pos = MAP_APPFONT ( 135, 23 ) ;
-+        Size = MAP_APPFONT ( 50, 14 ) ;
-+    };
-+
-+    HelpButton BTN_HELP
-+    {
-+        Pos = MAP_APPFONT ( 135, 43 ) ;
-+        Size = MAP_APPFONT ( 50, 14 ) ;
-+    };
-+
-+    FixedLine FL_CHOOSE_LANG
-+    {
-+        Pos = MAP_APPFONT( 6, 3 ) ;
-+        Size = MAP_APPFONT( 125, 14 ) ;
-+
-+        Text [ en-US ] = "Select the language to use for import" ; 
-+    };
-+
-+    RadioButton RB_AUTOMATIC
-+    {
-+        Pos = MAP_APPFONT( 12, 20 ) ;
-+        Size = MAP_APPFONT( 50, 10 ) ;
-+        TabStop = TRUE ;
-+
-+        Text [ en-US ] = "Automatic" ; 
-+    };
-+
-+    RadioButton RB_CUSTOM
-+    {
-+        Pos = MAP_APPFONT( 12, 34 ) ;
-+        Size = MAP_APPFONT( 50, 10 ) ;
-+        TabStop = TRUE ;
-+
-+        Text [ en-US ] = "Custom" ; 
-+    };
-+
-+    ListBox LB_CUSTOM_LANG
-+    {
-+        Pos = MAP_APPFONT( 20, 50 ) ;
-+        Size = MAP_APPFONT( 100, 55 ) ;
-+        TabStop = TRUE ;
-+        DropDown = TRUE ;
-+        Sort = TRUE ;
-+    };
-+
-+    FixedLine FL_OPTION
-+    {
-+	Pos = MAP_APPFONT( 6, 70 );
-+	Size = MAP_APPFONT( 125, 14 );
-+
-+	Text [ en-US ] = "Options" ;
-+    };
-+
-+    CheckBox BTN_CONVERT_DATE
-+    {
-+    	Pos = MAP_APPFONT( 12, 86 );
-+	Size = MAP_APPFONT( 125, 10 );
-+	TabStop = TRUE ;
-+
-+	Text [ en-US ] = "Detect special numbers (such as dates)." ;
-+    };
-+};
-+
-diff --git sc/source/ui/dbgui/makefile.mk sc/source/ui/dbgui/makefile.mk
-index 0a95138..8df758d 100644
---- sc/source/ui/dbgui/makefile.mk
-+++ sc/source/ui/dbgui/makefile.mk
-@@ -53,6 +53,7 @@ SLOFILES =	\
-     $(SLO)$/pfiltdlg.obj	\
-     $(SLO)$/dbnamdlg.obj	\
- 	$(SLO)$/expftext.obj	\
-+    $(SLO)$/langchooser.obj \
-     $(SLO)$/subtdlg.obj		\
-     $(SLO)$/tpsubt.obj		\
-     $(SLO)$/fieldwnd.obj	\
-@@ -85,6 +86,7 @@ EXCEPTIONSFILES= \
- 
- SRS1NAME=$(TARGET)
- SRC1FILES =  \
-+	langchooser.src		\
-         pivot.src		\
-         pvfundlg.src	\
-         dpgroupdlg.src	\
-@@ -114,7 +116,8 @@ LIB1OBJFILES =  \
- 	$(SLO)$/csvruler.obj	\
- 	$(SLO)$/csvgrid.obj		\
- 	$(SLO)$/csvtablebox.obj	\
--    $(SLO)$/asciiopt.obj
-+    $(SLO)$/asciiopt.obj \
-+    $(SLO)$/langchooser.obj
- 
- # --- Tagets -------------------------------------------------------
- 
-diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
-index 3dfbf19..66a91b8 100644
---- sc/source/ui/docshell/docsh.cxx
-+++ sc/source/ui/docshell/docsh.cxx
-@@ -137,6 +137,8 @@ using namespace com::sun::star;
- using namespace com::sun::star::document::VbaEventId;
- 
- using namespace com::sun::star;
-+using ::rtl::OUString;
-+using ::rtl::OUStringBuffer;
- 
- // STATIC DATA -----------------------------------------------------------
- 
-@@ -899,6 +901,34 @@ BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
- 	return bRet;
- }
- 
-+static void lcl_parseHtmlFilterOption(const OUString& rOption, LanguageType& rLang, bool& rDateConvert)
-+{
-+    OUStringBuffer aBuf;
-+    OUString aTokens[2];
-+    sal_Int32 n = rOption.getLength();
-+    const sal_Unicode* p = rOption.getStr();
-+    sal_Int32 nTokenId = 0;
-+    for (sal_Int32 i = 0; i < n; ++i)
-+    {
-+        const sal_Unicode c = p[i];
-+        if (c == sal_Unicode(' '))
-+        {
-+            if (aBuf.getLength())
-+                aTokens[nTokenId++] = aBuf.makeStringAndClear();
-+        }
-+        else
-+            aBuf.append(c);
-+
-+        if (nTokenId >= 2)
-+            break;
-+    }
-+
-+    if (aBuf.getLength())
-+        aTokens[nTokenId] = aBuf.makeStringAndClear();
-+
-+    rLang = static_cast<LanguageType>(aTokens[0].toInt32());
-+    rDateConvert = static_cast<bool>(aTokens[1].toInt32());
-+}
- 
- BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
- {
-@@ -1273,12 +1303,24 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
- 				SvStream* pInStream = rMedium.GetInStream();
- 				if (pInStream)
- 				{
-+                    LanguageType eLang = LANGUAGE_SYSTEM;
-+                    bool bDateConvert = false;
-+                    SfxItemSet*	 pSet = rMedium.GetItemSet();
-+                    const SfxPoolItem* pItem;
-+                    if ( pSet && SFX_ITEM_SET ==
-+                         pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
-+                    {
-+                        String aFilterOption = (static_cast<const SfxStringItem*>(pItem))->GetValue();
-+                        lcl_parseHtmlFilterOption(aFilterOption, eLang, bDateConvert);
-+                    }
-+
- 					pInStream->Seek( 0 );
- 					ScRange aRange;
- 					// HTML macht eigenes ColWidth/RowHeight
- 					CalcOutputFactor();
-+                    SvNumberFormatter aNumFormatter(aDocument.GetServiceManager(), eLang);
-                     eError = ScFormatFilter::Get().ScImportHTML( *pInStream, rMedium.GetBaseURL(), &aDocument, aRange,
--											GetOutputFactor(), !bWebQuery );
-+											GetOutputFactor(), !bWebQuery, &aNumFormatter, bDateConvert );
- 					if (eError != eERR_OK)
- 					{
- 						if (!GetError())
-@@ -2266,6 +2308,11 @@ String ScDocShell::GetOwnFilterName()			// static
- 	return String::CreateFromAscii(pFilterSc50);
- }
- 
-+String ScDocShell::GetHtmlFilterName()
-+{
-+    return String::CreateFromAscii(pFilterHtml);
-+}
-+
- String ScDocShell::GetWebQueryFilterName()		// static
- {
- 	return String::CreateFromAscii(pFilterHtmlWebQ);
-diff --git sc/source/ui/docshell/impex.cxx sc/source/ui/docshell/impex.cxx
-index cc51d67..e2ccdf5 100644
---- sc/source/ui/docshell/impex.cxx
-+++ sc/source/ui/docshell/impex.cxx
-@@ -1943,7 +1943,7 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin {
-     virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress&,
- 				 const CharSet, UINT32 ) RETURN_ERROR
-     virtual FltError ScImportRTF( SvStream&, const String&, ScDocument*, ScRange& ) RETURN_ERROR
--    virtual FltError ScImportHTML( SvStream&, const String&, ScDocument*, ScRange&, double, BOOL ) RETURN_ERROR
-+    virtual FltError ScImportHTML( SvStream&, const String&, ScDocument*, ScRange&, double, BOOL, SvNumberFormatter*, bool ) RETURN_ERROR
- 
-     virtual ScEEAbsImport *CreateRTFImport( ScDocument*, const ScRange& ) { return NULL; }
-     virtual ScEEAbsImport *CreateHTMLImport( ScDocument*, const String&, const ScRange&, BOOL ) { return NULL; }
-diff --git sc/source/ui/inc/docsh.hxx sc/source/ui/inc/docsh.hxx
-index 1126a95..7620368 100644
---- sc/source/ui/inc/docsh.hxx
-+++ sc/source/ui/inc/docsh.hxx
-@@ -409,6 +409,7 @@ public:
- 
- 	static ScDocShell* GetShellByNum( USHORT nDocNo );
- 	static String	GetOwnFilterName();
-+        static String   GetHtmlFilterName();
- 	static String	GetWebQueryFilterName();
- 	static String	GetAsciiFilterName();
- 	static String	GetLotusFilterName();
-diff --git sc/source/ui/inc/langchooser.hrc sc/source/ui/inc/langchooser.hrc
-new file mode 100644
-index 0000000..eb981c1
---- /dev/null
-+++ sc/source/ui/inc/langchooser.hrc
-@@ -0,0 +1,42 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: retypepassdlg.src,v $
-+ * $Revision: 1.1.2.3 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#include <sc.hrc>
-+
-+#define BTN_OK                   1
-+#define BTN_CANCEL               2
-+#define BTN_HELP                 3
-+
-+#define FL_CHOOSE_LANG           4
-+#define RB_AUTOMATIC             5
-+#define RB_CUSTOM                6
-+#define LB_CUSTOM_LANG           7
-+#define FL_OPTION                8
-+#define BTN_CONVERT_DATE         9
-diff --git sc/source/ui/inc/langchooser.hxx sc/source/ui/inc/langchooser.hxx
-new file mode 100644
-index 0000000..7106ab2
---- /dev/null
-+++ sc/source/ui/inc/langchooser.hxx
-@@ -0,0 +1,76 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: langbox.hxx,v $
-+ * $Revision: 1.4.242.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SC_UI_LANGCHOOSER_HXX
-+#define SC_UI_LANGCHOOSER_HXX
-+
-+#include "vcl/dialog.hxx"
-+#include "vcl/button.hxx"
-+#include "vcl/fixed.hxx"
-+#include "i18npool/lang.h"
-+#include "svx/langbox.hxx"
-+
-+class ScLangChooserDlg : public ModalDialog
-+{
-+public:
-+    ScLangChooserDlg(Window* pParent);
-+    virtual ~ScLangChooserDlg();
-+
-+    virtual short Execute();
-+
-+    LanguageType getLanguageType() const;
-+    bool isDateConversionSet() const;
-+
-+private:
-+    void init();
-+
-+private:
-+    OKButton        maBtnOk;
-+    CancelButton    maBtnCancel;
-+    HelpButton      maBtnHelp;
-+
-+    FixedLine       maFlChooseLang;
-+
-+    RadioButton     maRbAutomatic;
-+    RadioButton     maRbCustom;
-+
-+    SvxLanguageBox  maLbCustomLang;
-+
-+    FixedLine       maFlOption;
-+
-+    CheckBox        maBtnConvertDate;
-+
-+    DECL_LINK( OKHdl, OKButton* );
-+
-+    DECL_LINK( RadioHdl, RadioButton* );
-+};
-+
-+
-+#endif
-diff --git sc/source/ui/unoobj/filtuno.cxx sc/source/ui/unoobj/filtuno.cxx
-index 81efc76..406255e 100644
---- sc/source/ui/unoobj/filtuno.cxx
-+++ sc/source/ui/unoobj/filtuno.cxx
-@@ -51,7 +51,12 @@
- 
- #include "sc.hrc" //CHINA001
- #include "scabstdlg.hxx" //CHINA001
-+#include "i18npool/lang.h"
-+
-+#include <memory>
-+
- using namespace ::com::sun::star;
-+using ::rtl::OUStringBuffer;
- 
- //------------------------------------------------------------------------
- 
-@@ -146,6 +151,10 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
- 	sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
- 
- 	String aFilterString( aFilterName );
-+
-+    ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-+    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
-+
- 	if ( !bExport && aFilterString == ScDocShell::GetAsciiFilterName() )
- 	{
- 		//	ascii import is special...
-@@ -164,8 +173,6 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
- 			pInStream = utl::UcbStreamHelper::CreateStream( xInputStream );
- 
- 		//CHINA001 ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( NULL, aPrivDatName, pInStream, cAsciiDel );
--		ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
--		DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
- 		AbstractScImportAsciiDlg* pDlg = pFact->CreateScImportAsciiDlg( NULL, aPrivDatName, pInStream, RID_SCDLG_ASCII, cAsciiDel);
- 		DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
- 		if ( pDlg->Execute() == RET_OK )
-@@ -178,6 +185,24 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
- 		delete pDlg;
- 		delete pInStream;
- 	}
-+    else if ( aFilterString == ScDocShell::GetWebQueryFilterName() || aFilterString == ScDocShell::GetHtmlFilterName() )
-+    {
-+        // HTML import.
-+        ::std::auto_ptr<AbstractScLangChooserDlg> pDlg(
-+            pFact->CreateScLangChooserDlg(NULL, RID_SCDLG_LANG_CHOOSER));
-+
-+        if (pDlg->Execute() == RET_OK)
-+        {
-+            LanguageType eLang = pDlg->GetLanguageType();
-+            OUStringBuffer aBuf;
-+
-+            aBuf.append(String::CreateFromInt32(static_cast<sal_Int32>(eLang)));
-+            aBuf.append(sal_Unicode(' '));
-+            aBuf.append(pDlg->IsDateConversionSet() ? sal_Unicode('1') : sal_Unicode('0'));
-+            aFilterOptions = aBuf.makeStringAndClear();
-+            nRet = ui::dialogs::ExecutableDialogResults::OK;
-+        }
-+    }
- 	else
- 	{
- 		sal_Bool bMultiByte = sal_True;
-@@ -249,8 +274,6 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
- //CHINA001		&aOptions, &aTitle, bMultiByte, bDBEnc,
- //CHINA001		!bExport );
- //CHINA001 
--		ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
--		DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
- 
- 		AbstractScImportOptionsDlg* pDlg = pFact->CreateScImportOptionsDlg( NULL, RID_SCDLG_IMPORTOPT,
- 																			bAscii, &aOptions, &aTitle, bMultiByte, bDBEnc,
-diff --git sc/util/makefile.mk sc/util/makefile.mk
-index 855d560..0da917b 100644
---- sc/util/makefile.mk
-+++ sc/util/makefile.mk
-@@ -281,6 +281,7 @@ LIB8OBJFILES = \
- 		$(SLO)$/dapidata.obj	\
- 		$(SLO)$/crdlg.obj			\
- 		$(SLO)$/scuiasciiopt.obj	\
-+		$(SLO)$/langchooser.obj	\
- 		$(SLO)$/scuiautofmt.obj	\
- 	    $(SLO)$/dpgroupdlg.obj	\
- 		$(SLO)$/editfield.obj
diff --git a/applied_patches/0562-unittesting-ridljar.diff b/applied_patches/0446-unittesting-ridljar.diff
similarity index 100%
rename from applied_patches/0562-unittesting-ridljar.diff
rename to applied_patches/0446-unittesting-ridljar.diff
diff --git a/applied_patches/0447-calc-csv-import-custom-lang-sc.diff b/applied_patches/0447-calc-csv-import-custom-lang-sc.diff
deleted file mode 100644
index cb3ef2a14..000000000
--- a/applied_patches/0447-calc-csv-import-custom-lang-sc.diff
+++ /dev/null
@@ -1,1071 +0,0 @@
-diff --git sc/source/core/tool/stringutil.cxx sc/source/core/tool/stringutil.cxx
-index eaf756e..ae6247f 100644
---- sc/source/core/tool/stringutil.cxx
-+++ sc/source/core/tool/stringutil.cxx
-@@ -35,6 +35,7 @@
- 
- #include "stringutil.hxx"
- #include "rtl/ustrbuf.hxx"
-+#include "rtl/math.hxx"
- 
- using ::rtl::OUString;
- using ::rtl::OUStringBuffer;
-@@ -42,17 +43,28 @@ using ::rtl::OUStringBuffer;
- bool ScStringUtil::parseSimpleNumber(
-     const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal)
- {
-+    if (gsep == 0x00A0)
-+        // unicode space to ascii space
-+        gsep = 0x0020;
-+
-     OUStringBuffer aBuf;
-     sal_Int32 n = rStr.getLength();
-     const sal_Unicode* p = rStr.getStr();
-     sal_Int32 nPosDSep = -1, nPosGSep = -1;
-+    sal_uInt32 nDigitCount = 0;
-+
-     for (sal_Int32 i = 0; i < n; ++i)
-     {
-         sal_Unicode c = p[i];
-+        if (c == 0x00A0)
-+            // unicode space to ascii space
-+            c = 0x0020;
-+
-         if (sal_Unicode('0') <= c && c <= sal_Unicode('9'))
-         {
-             // this is a digit.
-             aBuf.append(c);
-+            ++nDigitCount;
-         }
-         else if (c == dsep)
-         {
-@@ -61,28 +73,35 @@ bool ScStringUtil::parseSimpleNumber(
-             if (nPosDSep >= 0)
-                 // a second decimal separator -> not a valid number.
-                 return false;
-+
-             if (nPosGSep >= 0 && i - nPosGSep != 4)
-                 // the number has a group separator and the decimal sep is not
-                 // positioned correctly.
-                 return false;
- 
-             nPosDSep = i;
-+            nPosGSep = -1;
-             aBuf.append(c);
-+            nDigitCount = 0;
-         }
-         else if (c == gsep)
-         {
-             // this is a group (thousand) separator.
-+
-             if (i == 0)
-+                // not allowed as the first character.
-                 return false;
- 
--            if (nPosGSep >= 0 && i - nPosGSep != 4)
--            {    
--                // this group separator is not positioned correctly relative
--                // to the last group separator.
-+            if (nPosDSep >= 0)
-+                // not allowed after the decimal separator.
-+                return false;
-+
-+            if (nPosGSep >= 0 && nDigitCount != 3)
-+                // must be exactly 3 digits since the last group separator.
-                 return false;
--            }
- 
-             nPosGSep = i;
-+            nDigitCount = 0;
-         }
-         else if (c == sal_Unicode('-') || c == sal_Unicode('+'))
-         {
-@@ -96,6 +115,17 @@ bool ScStringUtil::parseSimpleNumber(
-             return false;
-     }
- 
--    rVal = aBuf.makeStringAndClear().toDouble();
-+    // finished parsing the number.
-+
-+    if (nPosGSep >= 0 && nDigitCount != 3)
-+        // must be exactly 3 digits since the last group separator.
-+        return false;
-+
-+    rtl_math_ConversionStatus eStatus = rtl_math_ConversionStatus_Ok;
-+    sal_Int32 nParseEnd = 0;
-+    rVal = ::rtl::math::stringToDouble(aBuf.makeStringAndClear(), dsep, gsep, &eStatus, &nParseEnd);
-+    if (eStatus != rtl_math_ConversionStatus_Ok)
-+        return false;
-+
-     return true;
- }
-diff --git sc/source/ui/dbgui/asciiopt.cxx sc/source/ui/dbgui/asciiopt.cxx
-index 1e439d6..6b26dee 100644
---- sc/source/ui/dbgui/asciiopt.cxx
-+++ sc/source/ui/dbgui/asciiopt.cxx
-@@ -57,8 +57,10 @@ ScAsciiOptions::ScAsciiOptions() :
-     aFieldSeps		( ';' ),
-     bMergeFieldSeps	( FALSE ),
-     bQuotedFieldAsText(false),
-+    bDetectSpecialNumber(false),
-     cTextSep		( cDefaultTextSep ),
-     eCharSet		( gsl_getSystemTextEncoding() ),
-+    eLang           ( LANGUAGE_SYSTEM ),
-     bCharSetSystem	( FALSE ),
-     nStartRow		( 1 ),
-     nInfoCount		( 0 ),
-@@ -73,8 +75,10 @@ ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) :
-     aFieldSeps		( rOpt.aFieldSeps ),
-     bMergeFieldSeps	( rOpt.bMergeFieldSeps ),
-     bQuotedFieldAsText(rOpt.bQuotedFieldAsText),
-+    bDetectSpecialNumber(rOpt.bDetectSpecialNumber),
-     cTextSep		( rOpt.cTextSep ),
-     eCharSet		( rOpt.eCharSet ),
-+    eLang           ( rOpt.eLang ),
-     bCharSetSystem	( rOpt.bCharSetSystem ),
-     nStartRow		( rOpt.nStartRow ),
-     nInfoCount		( rOpt.nInfoCount )
-@@ -252,13 +256,20 @@ void ScAsciiOptions::ReadFromString( const String& rString )
-         eCharSet = ScGlobal::GetCharsetValue( aToken );
-     }
- 
-+    // Language
-+    if (nCount >= 4)
-+    {    
-+        aToken = rString.GetToken(3, ',');
-+        eLang = static_cast<LanguageType>(aToken.ToInt32());
-+    }
-+
-         //
-         //	Startzeile
-         //
- 
--    if ( nCount >= 4 )
-+    if ( nCount >= 5 )
-     {
--        aToken = rString.GetToken(3,',');
-+        aToken = rString.GetToken(4,',');
-         nStartRow = aToken.ToInt32();
-     }
- 
-@@ -266,12 +277,12 @@ void ScAsciiOptions::ReadFromString( const String& rString )
-         //	Spalten-Infos
-         //
- 
--    if ( nCount >= 5 )
-+    if ( nCount >= 6 )
-     {
-         delete[] pColStart;
-         delete[] pColFormat;
- 
--        aToken = rString.GetToken(4,',');
-+        aToken = rString.GetToken(5,',');
-         nSub = aToken.GetTokenCount('/');
-         nInfoCount = nSub / 2;
-         if (nInfoCount)
-@@ -292,11 +303,18 @@ void ScAsciiOptions::ReadFromString( const String& rString )
-     }
- 
-     // Import quoted field as text.
--    if (nCount >= 6)
-+    if (nCount >= 7)
-     {
--        aToken = rString.GetToken(5, ',');
-+        aToken = rString.GetToken(6, ',');
-         bQuotedFieldAsText = aToken.EqualsAscii("true") ? true : false;
-     }
-+
-+    // Detect special nubmers.
-+    if (nCount >= 8)
-+    {
-+        aToken = rString.GetToken(7, ',');
-+        bDetectSpecialNumber = aToken.EqualsAscii("true") ? true : false;
-+    }
- }
- 
- 
-@@ -347,6 +365,10 @@ String ScAsciiOptions::WriteToString() const
-         aOutStr += ScGlobal::GetCharsetString( eCharSet );
-     aOutStr += ',';					// Token-Ende
- 
-+    // Language
-+    aOutStr += String::CreateFromInt32(eLang);
-+    aOutStr += ',';
-+
-         //
-         //	Startzeile
-         //
-@@ -372,6 +394,10 @@ String ScAsciiOptions::WriteToString() const
- 
-     // Import quoted field as text.
-     aOutStr += String::CreateFromAscii(bQuotedFieldAsText ? "true" : "false");
-+    aOutStr += ',';
-+
-+    // Detect special nubmers.
-+    aOutStr += String::CreateFromAscii(bDetectSpecialNumber ? "true" : "false");
- 
-     return aOutStr;
- }
-diff --git sc/source/ui/dbgui/asciiopt.hrc sc/source/ui/dbgui/asciiopt.hrc
-index 60c8500..6fde4ee 100644
---- sc/source/ui/dbgui/asciiopt.hrc
-+++ sc/source/ui/dbgui/asciiopt.hrc
-@@ -29,32 +29,46 @@
-  ************************************************************************/
- #include "sc.hrc"
- //#define RID_SCDLG_ASCII 256
--#define RB_SEPARATED 1
--#define RB_FIXED 2
--#define FT_CHARSET 3
--#define LB_CHARSET 4
--#define FL_SEPOPT 5
--#define FT_FIELDSEP 6
--#define CB_FIELDSEP 7
--#define FT_TEXTSEP 8
--#define CB_TEXTSEP 9
--#define FL_FIELDOPT 10
--#define FT_TYPE 12
--#define FT_PREVIEW 13
--#define LB_TYPE1 23
--#define FL_WIDTH 30
--#define BTN_OK 31
--#define BTN_CANCEL 32
--#define BTN_HELP 33
--#define CTR_TABLEBOX 41
--#define CKB_TAB 51
--#define CKB_SPACE 52
--#define CKB_SEMICOLON 53
--#define CKB_COMMA 54
--#define CKB_OTHER 55
--#define ED_OTHER 56
--#define FT_AT_ROW 59
--#define NF_AT_ROW 60
--#define CB_ASONCE 90
--#define CB_QUOTED_AS_TEXT 91
--#define STR_TEXTTOCOLUMNS 100
-+#define BTN_OK                      1 
-+#define BTN_CANCEL                  2 
-+#define BTN_HELP                    3 
-+
-+#define FL_FIELDOPT                 4 
-+#define FT_CHARSET                  5 
-+#define LB_CHARSET                  6 
-+#define FT_CUSTOMLANG               7 
-+#define LB_CUSTOMLANG               8 
-+#define FT_AT_ROW                   9 
-+#define NF_AT_ROW                   10
-+
-+#define FL_SEPOPT                   11
-+#define RB_FIXED                    12
-+#define RB_SEPARATED                13
-+#define CKB_TAB                     14
-+#define CKB_COMMA                   15
-+#define CKB_OTHER                   16
-+#define ED_OTHER                    17
-+#define CKB_SEMICOLON               18
-+#define CKB_SPACE                   19
-+#define CB_ASONCE                   20
-+#define CB_TEXTSEP                  21
-+#define FT_TEXTSEP                  22
-+
-+#define FL_OTHER_OPTIONS            23
-+#define CB_QUOTED_AS_TEXT           24
-+#define CB_DETECT_SPECIAL_NUMBER    25
-+
-+#define FL_WIDTH                    26
-+#define FT_TYPE                     27
-+#define LB_TYPE1                    28
-+#define CTR_TABLEBOX                29
-+#define STR_TEXTTOCOLUMNS           30
-+                                    
-+                                    
-+                                    
-+                                    
-+                                    
-+                                    
-+                                    
-+                                    
-+                                    
-diff --git sc/source/ui/dbgui/asciiopt.src sc/source/ui/dbgui/asciiopt.src
-index 5e9ba11..d08eedf 100644
---- sc/source/ui/dbgui/asciiopt.src
-+++ sc/source/ui/dbgui/asciiopt.src
-@@ -34,55 +34,44 @@ ModalDialog RID_SCDLG_ASCII
- {
-     OutputSize = TRUE ;
-     SVLook = TRUE ;
--    Size = MAP_APPFONT ( 320 , 264 ) ;
-+    Size = MAP_APPFONT ( 320 , 305 ) ;
-     Text [ en-US ] = "Text Import" ;
-     Moveable = TRUE ;
--    FixedLine FL_WIDTH
--    {
--        Pos = MAP_APPFONT ( 6 , 147 ) ;
--        Size = MAP_APPFONT ( 252 , 8 ) ;
--        Text [ en-US ] = "Fields" ;
--    };
--    FixedText FT_TYPE
--    {
--        Pos = MAP_APPFONT ( 12 , 160 ) ;
--        Size = MAP_APPFONT ( 60 , 8 ) ;
--        Text [ en-US ] = "Column t~ype";
--    };
--    ListBox LB_TYPE1
-+
-+    OKButton BTN_OK
-     {
--        Pos = MAP_APPFONT ( 76 , 158 ) ;
--        Size = MAP_APPFONT ( 60 , 68 ) ;
-+        Pos = MAP_APPFONT ( 264 , 6 ) ;
-+        Size = MAP_APPFONT ( 50 , 14 ) ;
-         TabStop = TRUE ;
--        DropDown = TRUE ;
-+        DefButton = TRUE ;
-     };
--    FixedLine FL_SEPOPT
-+    CancelButton BTN_CANCEL
-     {
--        Pos = MAP_APPFONT ( 6 , 48 ) ;
--        Size = MAP_APPFONT ( 252 , 8 ) ;
--        Text [ en-US ] = "Separator options" ;
-+        Pos = MAP_APPFONT ( 264 , 23 ) ;
-+        Size = MAP_APPFONT ( 50 , 14 ) ;
-+        TabStop = TRUE ;
-     };
--    RadioButton RB_FIXED
-+    HelpButton BTN_HELP
-     {
--        Pos = MAP_APPFONT ( 12 , 59 ) ;
--        Size = MAP_APPFONT ( 243 , 10 ) ;
--        Text [ en-US ] = "~Fixed width" ;
-+        Pos = MAP_APPFONT ( 264 , 43 ) ;
-+        Size = MAP_APPFONT ( 50 , 14 ) ;
-         TabStop = TRUE ;
-     };
--    RadioButton RB_SEPARATED
-+
-+    FixedLine FL_FIELDOPT
-     {
--        Pos = MAP_APPFONT ( 12 , 73 ) ;
--        Size = MAP_APPFONT ( 243 , 10 ) ;
--        Text [ en-US ] = "~Separated by" ;
--        TabStop = TRUE ;
--        Check = TRUE ;
-+        Pos = MAP_APPFONT ( 6 , 3 ) ;
-+        Size = MAP_APPFONT ( 252 , 8 ) ;
-+        Text [ en-US ] = "Import" ;
-     };
-+
-     FixedText FT_CHARSET
-     {
-         Pos = MAP_APPFONT ( 12 , 16 ) ;
-         Size = MAP_APPFONT ( 60 , 8 ) ;
-         Text [ en-US ] = "Ch~aracter set" ;
-     };
-+
-     ListBox LB_CHARSET
-     {
-         Pos = MAP_APPFONT ( 76 , 14 ) ;
-@@ -91,75 +80,81 @@ ModalDialog RID_SCDLG_ASCII
-         DropDown = TRUE ;
-         Sort = TRUE;
-     };
--    FixedLine FL_FIELDOPT
--    {
--        Pos = MAP_APPFONT ( 6 , 3 ) ;
--        Size = MAP_APPFONT ( 252 , 8 ) ;
--        Text [ en-US ] = "Import" ;
--    };
--    FixedText FT_TEXTSEP
-+
-+    FixedText FT_CUSTOMLANG
-     {
--        Pos = MAP_APPFONT ( 156 , 114 ) ;
-+        Pos = MAP_APPFONT ( 12 , 32 ) ;
-         Size = MAP_APPFONT ( 60 , 8 ) ;
--        Text [ en-US ] = "Te~xt delimiter" ;
-+        Text [ en-US ] = "Language" ;
-     };
--    ComboBox CB_TEXTSEP
-+
-+    ListBox LB_CUSTOMLANG
-     {
--        Pos = MAP_APPFONT ( 218 , 112 ) ;
--        Size = MAP_APPFONT ( 37 , 94 ) ;
-+        Pos = MAP_APPFONT ( 76 , 30 ) ;
-+        Size = MAP_APPFONT ( 130 , 61 ) ;
-         TabStop = TRUE ;
-         DropDown = TRUE ;
-+        Sort = TRUE;
-     };
--    OKButton BTN_OK
-+
-+    FixedText FT_AT_ROW
-     {
--        Pos = MAP_APPFONT ( 264 , 6 ) ;
--        Size = MAP_APPFONT ( 50 , 14 ) ;
--        TabStop = TRUE ;
--        DefButton = TRUE ;
-+        Pos = MAP_APPFONT ( 12 , 48 ) ;
-+        Size = MAP_APPFONT ( 60 , 8 ) ;
-+        Text [ en-US ] = "From ro~w" ;
-     };
--    CancelButton BTN_CANCEL
-+
-+    NumericField NF_AT_ROW
-     {
--        Pos = MAP_APPFONT ( 264 , 23 ) ;
--        Size = MAP_APPFONT ( 50 , 14 ) ;
-+        Border = TRUE ;
-+        SVLook = TRUE ;
-+        Pos = MAP_APPFONT ( 76 , 46 ) ;
-+        Size = MAP_APPFONT ( 30 , 12 ) ;
-         TabStop = TRUE ;
-+        Spin = TRUE ;
-+        Repeat = TRUE ;
-+        Minimum = 1 ;
-     };
--    HelpButton BTN_HELP
-+
-+    FixedLine FL_SEPOPT
-     {
--        Pos = MAP_APPFONT ( 264 , 43 ) ;
--        Size = MAP_APPFONT ( 50 , 14 ) ;
--        TabStop = TRUE ;
-+        Pos = MAP_APPFONT ( 6 , 63 ) ;
-+        Size = MAP_APPFONT ( 252 , 8 ) ;
-+        Text [ en-US ] = "Separator options" ;
-     };
--    CheckBox CKB_TAB
-+    RadioButton RB_FIXED
-     {
--        Pos = MAP_APPFONT ( 20 , 86 ) ;
--        Size = MAP_APPFONT ( 68 , 10 ) ;
-+        Pos = MAP_APPFONT ( 12 , 75 ) ;
-+        Size = MAP_APPFONT ( 243 , 10 ) ;
-+        Text [ en-US ] = "~Fixed width" ;
-         TabStop = TRUE ;
--        Text [ en-US ] = "~Tab" ;
-     };
--    CheckBox CKB_SEMICOLON
-+    RadioButton RB_SEPARATED
-     {
--        Pos = MAP_APPFONT ( 20 , 99 ) ;
--        Size = MAP_APPFONT ( 68 , 10 ) ;
-+        Pos = MAP_APPFONT ( 12 , 89 ) ;
-+        Size = MAP_APPFONT ( 243 , 10 ) ;
-+        Text [ en-US ] = "~Separated by" ;
-         TabStop = TRUE ;
--        Text [ en-US ] = "S~emicolon" ;
-+        Check = TRUE ;
-     };
--    CheckBox CKB_COMMA
-+
-+    CheckBox CKB_TAB
-     {
--        Pos = MAP_APPFONT ( 92 , 86 ) ;
-+        Pos = MAP_APPFONT ( 20 , 102 ) ;
-         Size = MAP_APPFONT ( 68 , 10 ) ;
-         TabStop = TRUE ;
--        Text [ en-US ] = "~Comma" ;
-+        Text [ en-US ] = "~Tab" ;
-     };
--    CheckBox CKB_SPACE
-+    CheckBox CKB_COMMA
-     {
--        Pos = MAP_APPFONT ( 92 , 99 ) ;
-+        Pos = MAP_APPFONT ( 92 , 102 ) ;
-         Size = MAP_APPFONT ( 68 , 10 ) ;
-         TabStop = TRUE ;
--        Text [ en-US ] = "S~pace" ;
-+        Text [ en-US ] = "~Comma" ;
-     };
-     CheckBox CKB_OTHER
-     {
--        Pos = MAP_APPFONT ( 164 , 86 ) ;
-+        Pos = MAP_APPFONT ( 164 , 102 ) ;
-         Size = MAP_APPFONT ( 50 , 10 ) ;
-         TabStop = TRUE ;
-         Text [ en-US ] = "~Other" ;
-@@ -167,50 +162,100 @@ ModalDialog RID_SCDLG_ASCII
-     Edit ED_OTHER
-     {
-         Border = TRUE ;
--        Pos = MAP_APPFONT ( 218 , 84 ) ;
-+        Pos = MAP_APPFONT ( 218 , 100 ) ;
-         Size = MAP_APPFONT ( 37 , 12 ) ;
-         TabStop = TRUE ;
-         MaxTextLength = 10 ;
-     };
--    FixedText FT_AT_ROW
--    {
--        Pos = MAP_APPFONT ( 12 , 32 ) ;
--        Size = MAP_APPFONT ( 60 , 8 ) ;
--        Text [ en-US ] = "From ro~w" ;
--    };
--    NumericField NF_AT_ROW
-+
-+    CheckBox CKB_SEMICOLON
-     {
--        Border = TRUE ;
--        SVLook = TRUE ;
--        Pos = MAP_APPFONT ( 76 , 30 ) ;
--        Size = MAP_APPFONT ( 30 , 12 ) ;
-+        Pos = MAP_APPFONT ( 20 , 115 ) ;
-+        Size = MAP_APPFONT ( 68 , 10 ) ;
-         TabStop = TRUE ;
--        Spin = TRUE ;
--        Repeat = TRUE ;
--        Minimum = 1 ;
-+        Text [ en-US ] = "S~emicolon" ;
-     };
--    Control CTR_TABLEBOX
-+    CheckBox CKB_SPACE
-     {
--        HelpId = HID_SC_ASCII_TABCTR ;
--        Border = TRUE ;
--        DialogControl = TRUE ;
--        Pos = MAP_APPFONT ( 12 , 176 ) ;
--        Size = MAP_APPFONT ( 243 , 82 ) ;
-+        Pos = MAP_APPFONT ( 92 , 115 ) ;
-+        Size = MAP_APPFONT ( 68 , 10 ) ;
-+        TabStop = TRUE ;
-+        Text [ en-US ] = "S~pace" ;
-     };
-+
-     CheckBox CB_ASONCE
-     {
--        Pos = MAP_APPFONT ( 20 , 114 ) ;
-+        Pos = MAP_APPFONT ( 20 , 130 ) ;
-         Size = MAP_APPFONT ( 130 , 10 ) ;
-         TabStop = TRUE ;
-         Text [ en-US ] = "Merge ~delimiters" ;
-     };
-+
-+    ComboBox CB_TEXTSEP
-+    {
-+        Pos = MAP_APPFONT ( 218 , 128 ) ;
-+        Size = MAP_APPFONT ( 37 , 94 ) ;
-+        TabStop = TRUE ;
-+        DropDown = TRUE ;
-+    };
-+    FixedText FT_TEXTSEP
-+    {
-+        Pos = MAP_APPFONT ( 156 , 130 ) ;
-+        Size = MAP_APPFONT ( 60 , 8 ) ;
-+        Text [ en-US ] = "Te~xt delimiter" ;
-+    };
-+
-+    FixedLine FL_OTHER_OPTIONS
-+    {
-+        Pos = MAP_APPFONT ( 6 , 146 ) ;
-+        Size = MAP_APPFONT ( 252 , 8 ) ;
-+        Text [ en-US ] = "Other options" ;
-+    };
-+
-     CheckBox CB_QUOTED_AS_TEXT
-     {
--        Pos = MAP_APPFONT ( 20 , 129 ) ;
-+        Pos = MAP_APPFONT ( 20 , 158 ) ;
-         Size = MAP_APPFONT ( 130 , 10 ) ;
-         TabStop = TRUE ;
-         Text [ en-US ] = "~Quoted field as text" ;
-     };
-+
-+    CheckBox CB_DETECT_SPECIAL_NUMBER
-+    {
-+        Pos = MAP_APPFONT ( 20 , 171 ) ;
-+        Size = MAP_APPFONT ( 130 , 10 ) ;
-+        TabStop = TRUE ;
-+        Text [ en-US ] = "Detect special numbers" ;
-+    };
-+
-+    FixedLine FL_WIDTH
-+    {
-+        Pos = MAP_APPFONT ( 6 , 187 ) ;
-+        Size = MAP_APPFONT ( 252 , 8 ) ;
-+        Text [ en-US ] = "Fields" ;
-+    };
-+    FixedText FT_TYPE
-+    {
-+        Pos = MAP_APPFONT ( 12 , 200 ) ;
-+        Size = MAP_APPFONT ( 60 , 8 ) ;
-+        Text [ en-US ] = "Column t~ype";
-+    };
-+    ListBox LB_TYPE1
-+    {
-+        Pos = MAP_APPFONT ( 76 , 198 ) ;
-+        Size = MAP_APPFONT ( 60 , 68 ) ;
-+        TabStop = TRUE ;
-+        DropDown = TRUE ;
-+    };
-+    Control CTR_TABLEBOX
-+    {
-+        HelpId = HID_SC_ASCII_TABCTR ;
-+        Border = TRUE ;
-+        DialogControl = TRUE ;
-+        Pos = MAP_APPFONT ( 12 , 216 ) ;
-+        Size = MAP_APPFONT ( 243 , 82 ) ;
-+    };
-+
-     String STR_TEXTTOCOLUMNS
-     {
-         Text [ en-US ] = "Text to Columns" ;
-diff --git sc/source/ui/dbgui/scuiasciiopt.cxx sc/source/ui/dbgui/scuiasciiopt.cxx
-index 83f051d..c2a75b2 100644
---- sc/source/ui/dbgui/scuiasciiopt.cxx
-+++ sc/source/ui/dbgui/scuiasciiopt.cxx
-@@ -69,6 +69,8 @@ using namespace com::sun::star::uno;
- #define TEXT_SEPARATORS     "TextSeparators"
- #define MERGE_DELIMITERS    "MergeDelimiters"
- #define QUOTED_AS_TEXT      "QuotedFieldAsText"
-+#define DETECT_SPECIAL_NUM  "DetectSpecialNumbers"
-+#define LANGUAGE            "Language"
- #define SEP_PATH            "Office.Calc/Dialogs/CSVImport"
- 
- // ============================================================================
-@@ -119,12 +121,13 @@ sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList )
- }
- 
- static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparators, 
--                             bool &bMergeDelimiters, bool& bQuotedAsText, bool &bFixedWidth, 
--                             sal_Int32 &nFromRow, sal_Int32 &nCharSet )
-+                             bool &bMergeDelimiters, bool& bQuotedAsText, bool& bDetectSpecialNum, 
-+                             bool &bFixedWidth, sal_Int32 &nFromRow, sal_Int32 &nCharSet,
-+                             sal_Int32& nLanguage )
- {
-     Sequence<Any>aValues;
-     const Any *pProperties;
--    Sequence<OUString> aNames(7);
-+    Sequence<OUString> aNames(9);
-     OUString* pNames = aNames.getArray();
-     ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
- 
-@@ -135,6 +138,8 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato
-     pNames[4] = OUString::createFromAscii( FROM_ROW );
-     pNames[5] = OUString::createFromAscii( CHAR_SET );
-     pNames[6] = OUString::createFromAscii( QUOTED_AS_TEXT );
-+    pNames[7] = OUString::createFromAscii( DETECT_SPECIAL_NUM );
-+    pNames[8] = OUString::createFromAscii( LANGUAGE );
-     aValues = aItem.GetProperties( aNames );
-     pProperties = aValues.getConstArray();
-     if( pProperties[1].hasValue() )
-@@ -157,16 +162,23 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato
-  
-     if ( pProperties[6].hasValue() )
-         pProperties[6] >>= bQuotedAsText;
-+
-+    if ( pProperties[7].hasValue() )
-+        pProperties[7] >>= bDetectSpecialNum;
-+
-+    if ( pProperties[8].hasValue() )
-+        pProperties[8] >>= nLanguage;
- }
- 
--static void save_Separators( String maSeparators, String maTxtSep, bool bMergeDelimiters, bool bQuotedAsText,
--                             bool bFixedWidth, sal_Int32 nFromRow, sal_Int32 nCharSet )
-+static void save_Separators( 
-+    String maSeparators, String maTxtSep, bool bMergeDelimiters, bool bQuotedAsText,
-+    bool bDetectSpecialNum, bool bFixedWidth, sal_Int32 nFromRow, sal_Int32 nCharSet, sal_Int32 nLanguage )
- {
-     OUString sFieldSeparators = OUString( maSeparators );
-     OUString sTextSeparators = OUString( maTxtSep );
-     Sequence<Any> aValues;
-     Any *pProperties;
--    Sequence<OUString> aNames(7);
-+    Sequence<OUString> aNames(9);
-     OUString* pNames = aNames.getArray();
-     ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
- 
-@@ -177,6 +189,8 @@ static void save_Separators( String maSeparators, String maTxtSep, bool bMergeDe
-     pNames[4] = OUString::createFromAscii( FROM_ROW );
-     pNames[5] = OUString::createFromAscii( CHAR_SET );
-     pNames[6] = OUString::createFromAscii( QUOTED_AS_TEXT );
-+    pNames[7] = OUString::createFromAscii( DETECT_SPECIAL_NUM );
-+    pNames[8] = OUString::createFromAscii( LANGUAGE );
-     aValues = aItem.GetProperties( aNames );
-     pProperties = aValues.getArray();
-     pProperties[1] <<= sFieldSeparators;
-@@ -186,6 +200,8 @@ static void save_Separators( String maSeparators, String maTxtSep, bool bMergeDe
-     pProperties[4] <<= nFromRow;
-     pProperties[5] <<= nCharSet;
-     pProperties[6] <<= static_cast<sal_Bool>(bQuotedAsText);
-+    pProperties[7] <<= static_cast<sal_Bool>(bDetectSpecialNum);
-+    pProperties[8] <<= nLanguage;
- 
-     aItem.PutProperties(aNames, aValues);
- }
-@@ -204,6 +220,8 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
-         aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ),
-         aFtCharSet	( this, ScResId( FT_CHARSET ) ),
-         aLbCharSet	( this, ScResId( LB_CHARSET ) ),
-+        aFtCustomLang( this, ScResId( FT_CUSTOMLANG ) ),
-+        aLbCustomLang( this, ScResId( LB_CUSTOMLANG ) ), 
- 
-         aFtRow		( this, ScResId( FT_AT_ROW	) ),
-         aNfRow		( this,	ScResId( NF_AT_ROW	) ),
-@@ -219,7 +237,10 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
-         aCkbOther	( this, ScResId( CKB_OTHER ) ),
-         aEdOther	( this, ScResId( ED_OTHER ) ),
-         aCkbAsOnce	( this, ScResId( CB_ASONCE) ),
-+        aFlOtherOpt ( this, ScResId( FL_OTHER_OPTIONS ) ), 
-+
-         aCkbQuotedAsText( this, ScResId(CB_QUOTED_AS_TEXT) ),
-+        aCkbDetectNumber( this, ScResId(CB_DETECT_SPECIAL_NUMBER) ),
-         aFtTextSep	( this, ScResId( FT_TEXTSEP ) ),
-         aCbTextSep	( this, ScResId( CB_TEXTSEP ) ),
- 
-@@ -260,18 +281,22 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
-     bool bMergeDelimiters = false;
-     bool bFixedWidth = false;
-     bool bQuotedFieldAsText = true;
-+    bool bDetectSpecialNum = false;
-     sal_Int32 nFromRow = 1;
-     sal_Int32 nCharSet = -1;
-+    sal_Int32 nLanguage = 0;
-     if (mbFileImport)
-         // load separators only when importing csv files.
-         load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters, 
--                         bQuotedFieldAsText, bFixedWidth, nFromRow, nCharSet);
-+                         bQuotedFieldAsText, bDetectSpecialNum, bFixedWidth, nFromRow, nCharSet, nLanguage);
-     maFieldSeparators = String(sFieldSeparators);
- 
-     if( bMergeDelimiters )
-         aCkbAsOnce.Check();
-     if (bQuotedFieldAsText)
-         aCkbQuotedAsText.Check();
-+    if (bDetectSpecialNum)
-+        aCkbDetectNumber.Check();
-     if( bFixedWidth )
-         aRbFixed.Check();
-     if( nFromRow != 1 )
-@@ -344,6 +369,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
-     aCkbComma.SetClickHdl( aSeparatorHdl );
-     aCkbAsOnce.SetClickHdl( aSeparatorHdl );
-     aCkbQuotedAsText.SetClickHdl( aSeparatorHdl );
-+    aCkbDetectNumber.SetClickHdl( aSeparatorHdl );
-     aCkbSpace.SetClickHdl( aSeparatorHdl );
-     aCkbOther.SetClickHdl( aSeparatorHdl );
-     aEdOther.SetModifyHdl( aSeparatorHdl );
-@@ -363,6 +389,11 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
-     SetSelectedCharSet();
-     aLbCharSet.SetSelectHdl( LINK( this, ScImportAsciiDlg, CharSetHdl ) );
- 
-+    aLbCustomLang.SetLanguageList(
-+        LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, false, false);
-+    aLbCustomLang.InsertLanguage(LANGUAGE_SYSTEM);
-+    aLbCustomLang.SelectLanguage(static_cast<LanguageType>(nLanguage), true);
-+
-     // *** column type ListBox ***
-     xub_StrLen nCount = aColumnUser.GetTokenCount();
-     for (xub_StrLen i=0; i<nCount; i++)
-@@ -393,8 +424,9 @@ ScImportAsciiDlg::~ScImportAsciiDlg()
- {
-     if (mbFileImport)
-         save_Separators( maFieldSeparators, aCbTextSep.GetText(), aCkbAsOnce.IsChecked(), 
--                         aCkbQuotedAsText.IsChecked(), aRbFixed.IsChecked(), 
--                         aNfRow.GetValue(), aLbCharSet.GetSelectEntryPos());
-+                         aCkbQuotedAsText.IsChecked(), aCkbDetectNumber.IsChecked(), 
-+                         aRbFixed.IsChecked(), aNfRow.GetValue(), aLbCharSet.GetSelectEntryPos(),
-+                         static_cast<sal_Int32>(aLbCustomLang.GetSelectLanguage()) );
-     delete[] mpRowPosArray;
- }
- 
-@@ -473,6 +505,7 @@ void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt )
- {
-     rOpt.SetCharSet( meCharSet );
-     rOpt.SetCharSetSystem( mbCharSetSystem );
-+    rOpt.SetLanguage(aLbCustomLang.GetSelectLanguage());
-     rOpt.SetFixedLen( aRbFixed.IsChecked() );
-     rOpt.SetStartRow( (long)aNfRow.GetValue() );
-     maTableBox.FillColumnData( rOpt );
-@@ -480,9 +513,11 @@ void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt )
-     {
-         rOpt.SetFieldSeps( GetSeparators() );
-         rOpt.SetMergeSeps( aCkbAsOnce.IsChecked() );
--        rOpt.SetQuotedAsText(aCkbQuotedAsText.IsChecked());
-         rOpt.SetTextSep( lcl_CharFromCombo( aCbTextSep, aTextSepList ) );
-     }
-+
-+    rOpt.SetQuotedAsText(aCkbQuotedAsText.IsChecked());
-+    rOpt.SetDetectSpecialNumber(aCkbDetectNumber.IsChecked());
- }
- 
- void ScImportAsciiDlg::SetTextToColumnsMode()
-@@ -490,12 +525,19 @@ void ScImportAsciiDlg::SetTextToColumnsMode()
-     SetText( maStrTextToColumns );
-     aFtCharSet.Disable();
-     aLbCharSet.Disable();
-+    aFtCustomLang.Disable();
-+    aLbCustomLang.SelectLanguage(LANGUAGE_SYSTEM);
-+    aLbCustomLang.Disable();
-     aFtRow.Disable();
-     aNfRow.Disable();
- 
--    // Quoted field as text option is not used for text to columns mode.
-+    // Quoted field as text option is not used for text-to-columns mode.
-     aCkbQuotedAsText.Check(false);
-     aCkbQuotedAsText.Disable();
-+
-+    // Always detect special numbers for text-to-columns mode.
-+    aCkbDetectNumber.Check();
-+    aCkbDetectNumber.Disable();
- }
- 
- void ScImportAsciiDlg::SetSelectedCharSet()
-@@ -532,7 +574,6 @@ void ScImportAsciiDlg::SetupSeparatorCtrls()
-     aCkbOther.Enable( bEnable );
-     aEdOther.Enable( bEnable );
-     aCkbAsOnce.Enable( bEnable );
--    aCkbQuotedAsText.Enable( bEnable );
-     aFtTextSep.Enable( bEnable );
-     aCbTextSep.Enable( bEnable );
- }
-diff --git sc/source/ui/docshell/impex.cxx sc/source/ui/docshell/impex.cxx
-index 15894a3..612ec41 100644
---- sc/source/ui/docshell/impex.cxx
-+++ sc/source/ui/docshell/impex.cxx
-@@ -794,6 +794,7 @@ BOOL ScImportExport::Text2Doc( SvStream& rStrm )
- 
- static bool lcl_PutString( 
-     ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rStr, BYTE nColFormat,
-+    SvNumberFormatter* pFormatter, bool bDetectNumFormat,
-     ::utl::TransliterationWrapper& rTransliteration, CalendarWrapper& rCalendar,
-     ::utl::TransliterationWrapper* pSecondTransliteration, CalendarWrapper* pSecondCalendar )
- {
-@@ -811,10 +812,10 @@ static bool lcl_PutString(
-     {
-         //!	SetString mit Extra-Flag ???
- 
--        SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
--        sal_uInt32 nEnglish = pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
-+        SvNumberFormatter* pDocFormatter = pDoc->GetFormatTable();
-+        sal_uInt32 nEnglish = pDocFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
-         double fVal;
--        if ( pFormatter->IsNumberFormat( rStr, nEnglish, fVal ) )
-+        if ( pDocFormatter->IsNumberFormat( rStr, nEnglish, fVal ) )
-         {
-             //	Zahlformat wird nicht auf englisch gesetzt
-             pDoc->SetValue( nCol, nRow, nTab, fVal );
-@@ -950,9 +951,9 @@ static bool lcl_PutString(
-                 }
-             }
- 
--            SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
-+            SvNumberFormatter* pDocFormatter = pDoc->GetFormatTable();
-             if ( nYear < 100 )
--                nYear = pFormatter->ExpandTwoDigitYear( nYear );
-+                nYear = pDocFormatter->ExpandTwoDigitYear( nYear );
- 
-             CalendarWrapper* pCalendar = (bSecondCal ? pSecondCalendar : &rCalendar);
-             sal_Int16 nNumMonths = pCalendar->getNumberOfMonthsInYear();
-@@ -988,7 +989,7 @@ static bool lcl_PutString(
-                 pCalendar->setValue( i18n::CalendarFieldIndex::MILLISECOND, nMilli );
-                 if ( pCalendar->isValid() )
-                 {
--                    double fDiff = DateTime(*pFormatter->GetNullDate()) -
-+                    double fDiff = DateTime(*pDocFormatter->GetNullDate()) -
-                         pCalendar->getEpochStart();
-                     // #i14974# must use getLocalDateTime to get the same
-                     // date values as set above
-@@ -1000,10 +1001,10 @@ static bool lcl_PutString(
-                     LanguageType eDocLang = eLatin;     //! which language for date formats?
- 
-                     short nType = (nFound > 3 ? NUMBERFORMAT_DATETIME : NUMBERFORMAT_DATE);
--                    ULONG nFormat = pFormatter->GetStandardFormat( nType, eDocLang );
-+                    ULONG nFormat = pDocFormatter->GetStandardFormat( nType, eDocLang );
-                     // maybe there is a special format including seconds or milliseconds
-                     if (nFound > 5)
--                        nFormat = pFormatter->GetStandardFormat( fDays, nFormat, nType, eDocLang);
-+                        nFormat = pDocFormatter->GetStandardFormat( fDays, nFormat, nType, eDocLang);
- 
-                     pDoc->PutCell( nCol, nRow, nTab, new ScValueCell(fDays), nFormat, FALSE );
- 
-@@ -1015,7 +1016,7 @@ static bool lcl_PutString(
- 
-     // Standard or date not determined -> SetString / EditCell
-     if( rStr.Search( _LF ) == STRING_NOTFOUND )
--        pDoc->SetString( nCol, nRow, nTab, rStr );
-+        pDoc->SetString( nCol, nRow, nTab, rStr, pFormatter, bDetectNumFormat );
-     else 
-     {
-         bMultiLine = true;
-@@ -1025,7 +1026,7 @@ static bool lcl_PutString(
- }
- 
- 
--String lcl_GetFixed( const String& rLine, xub_StrLen nStart, xub_StrLen nNext )
-+String lcl_GetFixed( const String& rLine, xub_StrLen nStart, xub_StrLen nNext, bool& rbIsQuoted )
- {
-     xub_StrLen nLen = rLine.Len();
-     if (nNext > nLen)
-@@ -1039,7 +1040,11 @@ String lcl_GetFixed( const String& rLine, xub_StrLen nStart, xub_StrLen nNext )
-     while ( nSpace > nStart && pStr[nSpace-1] == ' ' )
-         --nSpace;
- 
--    return rLine.Copy( nStart, nSpace-nStart );
-+    rbIsQuoted = (pStr[nStart] == sal_Unicode('"') && pStr[nSpace-1] == sal_Unicode('"'));
-+    if (rbIsQuoted)
-+        return rLine.Copy(nStart+1, nSpace-nStart-2);
-+    else
-+        return rLine.Copy(nStart, nSpace-nStart);
- }
- 
- BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
-@@ -1072,9 +1082,9 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
-     const BYTE* pColFormat  = pExtOptions->GetColFormat();
-     long nSkipLines	= pExtOptions->GetStartRow();
- 
--    LanguageType eLatin, eCjk, eCtl;
--    pDoc->GetLanguage( eLatin, eCjk, eCtl );
--    LanguageType eDocLang = eLatin;					//! which language for date formats?
-+    LanguageType eDocLang = pExtOptions->GetLanguage();
-+    SvNumberFormatter aNumFormatter(pDoc->GetServiceManager(), eDocLang);
-+    bool bDetectNumFormat = pExtOptions->IsDetectSpecialNumber();
- 
-     // For date recognition
-     ::utl::TransliterationWrapper aTransliteration(
-@@ -1116,6 +1126,8 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
-     // survives the toggle of bDetermineRange down at the end of the do{} loop.
-     bool bRangeIsDetermined = bDetermineRange;
- 
-+    bool bQuotedAsText = pExtOptions && pExtOptions->IsQuotedAsText();
-+
-     ULONG nOriginalStreamPos = rStrm.Tell();
-  
-     do
-@@ -1137,7 +1149,8 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
-                 // SC_COL_SKIP.
-                 for ( i=0; i<nInfoCount && nCol <= MAXCOL+1; i++ )
-                 {
--                    if ( pColFormat[i] != SC_COL_SKIP )		// sonst auch nCol nicht hochzaehlen
-+                    BYTE nFmt = pColFormat[i];
-+                    if (nFmt != SC_COL_SKIP)        // sonst auch nCol nicht hochzaehlen
-                     {
-                         if (nCol > MAXCOL)
-                             bOverflow = TRUE;       // display warning on import
-@@ -1145,11 +1158,15 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
-                         {
-                             xub_StrLen nStart = pColStart[i];
-                             xub_StrLen nNext = ( i+1 < nInfoCount ) ? pColStart[i+1] : nLineLen;
--                            aCell = lcl_GetFixed( aLine, nStart, nNext );
--                            bMultiLine |= lcl_PutString( pDoc, nCol, nRow,
--                                    nTab, aCell, pColFormat[i],
--                                    aTransliteration, aCalendar,
--                                    pEnglishTransliteration, pEnglishCalendar);
-+                            bool bIsQuoted = false;
-+                            aCell = lcl_GetFixed( aLine, nStart, nNext, bIsQuoted );
-+                            if (bIsQuoted && bQuotedAsText)
-+                                nFmt = SC_COL_TEXT;
-+
-+                            bMultiLine |= lcl_PutString( 
-+                                pDoc, nCol, nRow, nTab, aCell, nFmt,
-+                                &aNumFormatter, bDetectNumFormat, aTransliteration, aCalendar,
-+                                pEnglishTransliteration, pEnglishCalendar);
-                         }
-                         ++nCol;
-                     }
-@@ -1185,13 +1202,13 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
-                             bOverflow = TRUE;       // display warning on import
-                         else if (!bDetermineRange)
-                         {
--                            if (bIsQuoted && pExtOptions && pExtOptions->IsQuotedAsText())
-+                            if (bIsQuoted && bQuotedAsText)
-                                 nFmt = SC_COL_TEXT;
- 
--                            bMultiLine |= lcl_PutString( pDoc, nCol, nRow,
--                                    nTab, aCell, nFmt, aTransliteration,
--                                    aCalendar, pEnglishTransliteration,
--                                    pEnglishCalendar);
-+                            bMultiLine |= lcl_PutString( 
-+                                pDoc, nCol, nRow, nTab, aCell, nFmt, 
-+                                &aNumFormatter, bDetectNumFormat, aTransliteration,
-+                                aCalendar, pEnglishTransliteration, pEnglishCalendar);
-                         }
-                         ++nCol;
-                     }
-diff --git sc/source/ui/inc/asciiopt.hxx sc/source/ui/inc/asciiopt.hxx
-index 8edd920..d3f9ba4 100644
---- sc/source/ui/inc/asciiopt.hxx
-+++ sc/source/ui/inc/asciiopt.hxx
-@@ -55,7 +55,7 @@
- #include <tools/stream.hxx>
- #include <svx/txencbox.hxx>
- #include "csvtablebox.hxx"
--
-+#include "i18npool/lang.h"
- 
- // ============================================================================
- 
-@@ -66,8 +66,10 @@ private:
-     String		aFieldSeps;
-     BOOL		bMergeFieldSeps;
-     bool        bQuotedFieldAsText;
-+    bool        bDetectSpecialNumber;
-     sal_Unicode	cTextSep;
-     CharSet		eCharSet;
-+    LanguageType eLang;
-     BOOL		bCharSetSystem;
-     long		nStartRow;
-     USHORT		nInfoCount;
-@@ -95,12 +97,14 @@ public:
-     const String&		GetFieldSeps() const	{ return aFieldSeps; }
-     BOOL				IsMergeSeps() const		{ return bMergeFieldSeps; }
-     bool                IsQuotedAsText() const  { return bQuotedFieldAsText; }
-+    bool                IsDetectSpecialNumber() const { return bDetectSpecialNumber; }
-     sal_Unicode			GetTextSep() const		{ return cTextSep; }
-     BOOL				IsFixedLen() const		{ return bFixedLen; }
-     USHORT				GetInfoCount() const	{ return nInfoCount; }
-     const xub_StrLen*	GetColStart() const		{ return pColStart; }
-     const BYTE*			GetColFormat() const	{ return pColFormat; }
-     long				GetStartRow() const		{ return nStartRow; }
-+    LanguageType        GetLanguage() const     { return eLang; }
- 
-     void	SetCharSet( CharSet eNew )			{ eCharSet = eNew; }
-     void	SetCharSetSystem( BOOL bSet )		{ bCharSetSystem = bSet; }
-@@ -108,8 +112,10 @@ public:
-     void	SetFieldSeps( const String& rStr )	{ aFieldSeps = rStr; }
-     void	SetMergeSeps( BOOL bSet )			{ bMergeFieldSeps = bSet; }
-     void    SetQuotedAsText(bool bSet)          { bQuotedFieldAsText = bSet; }
-+    void    SetDetectSpecialNumber(bool bSet)   { bDetectSpecialNumber = bSet; }
-     void	SetTextSep( sal_Unicode c )			{ cTextSep = c; }
-     void	SetStartRow( long nRow)				{ nStartRow= nRow; }
-+    void    SetLanguage(LanguageType e)         { eLang = e; }
- 
-     void	SetColInfo( USHORT nCount, const xub_StrLen* pStart, const BYTE* pFormat );
-     void    SetColumnInfo( const ScCsvExpDataVec& rDataVec );
-diff --git sc/source/ui/inc/scuiasciiopt.hxx sc/source/ui/inc/scuiasciiopt.hxx
-index 7097838..4515a86 100644
---- sc/source/ui/inc/scuiasciiopt.hxx
-+++ sc/source/ui/inc/scuiasciiopt.hxx
-@@ -35,6 +35,8 @@
- 
- 
- #include "asciiopt.hxx"
-+#include "svx/langbox.hxx"
-+
- // ============================================================================
- 
- class ScImportAsciiDlg : public ModalDialog
-@@ -49,6 +51,8 @@ class ScImportAsciiDlg : public ModalDialog
-     FixedLine                   aFlFieldOpt;
-     FixedText                   aFtCharSet;
-     SvxTextEncodingBox          aLbCharSet;
-+    FixedText                   aFtCustomLang;
-+    SvxLanguageBox              aLbCustomLang;
- 
-     FixedText                   aFtRow;
-     NumericField                aNfRow;
-@@ -64,7 +68,12 @@ class ScImportAsciiDlg : public ModalDialog
-     CheckBox                    aCkbOther;
-     Edit                        aEdOther;
-     CheckBox                    aCkbAsOnce;
-+
-+    FixedLine                   aFlOtherOpt;
-+
-     CheckBox                    aCkbQuotedAsText;
-+    CheckBox                    aCkbDetectNumber;
-+
-     FixedText                   aFtTextSep;
-     ComboBox                    aCbTextSep;
- 
diff --git a/applied_patches/0563-unittesting-sal.diff b/applied_patches/0447-unittesting-sal.diff
similarity index 100%
rename from applied_patches/0563-unittesting-sal.diff
rename to applied_patches/0447-unittesting-sal.diff
diff --git a/applied_patches/0448-calc-csv-import-custom-lang-officecfg.diff b/applied_patches/0448-calc-csv-import-custom-lang-officecfg.diff
deleted file mode 100644
index 4a42f00e0..000000000
--- a/applied_patches/0448-calc-csv-import-custom-lang-officecfg.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git officecfg/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-index ef0bd3d..2f811b6 100644
---- officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-@@ -1044,6 +1044,22 @@
-                     </info>
-                     <value>true</value>
-                 </prop>
-+                <prop oor:name="DetectSpecialNumbers" oor:type="xs:boolean">
-+                    <info>
-+                        <author>kyoshida</author>
-+                        <desc>If true, Calc tries to detect special number format, such as date and scientific notation.</desc>
-+                        <label>DetectSpecialNumbers</label>
-+                    </info>
-+                    <value>false</value>
-+                </prop>
-+                <prop oor:name="Language" oor:type="xs:int">
-+                    <info>
-+                        <author>kyoshida</author>
-+                        <desc>Language to use for CSV import.  This determines how the numbers are parsed.</desc>
-+                        <label>Language</label>
-+                    </info>
-+                    <value>0</value>
-+                </prop>
-                 <prop oor:name="Separators" oor:type="xs:string">
-                     <info>
-                         <author>muthusuba</author>
diff --git a/applied_patches/0564-unittesting-salhelper.diff b/applied_patches/0448-unittesting-salhelper.diff
similarity index 100%
rename from applied_patches/0564-unittesting-salhelper.diff
rename to applied_patches/0448-unittesting-salhelper.diff
diff --git a/applied_patches/0449-calc-dp-hide-list-menu.diff b/applied_patches/0449-calc-dp-hide-list-menu.diff
deleted file mode 100644
index 3c3562676..000000000
--- a/applied_patches/0449-calc-dp-hide-list-menu.diff
+++ /dev/null
@@ -1,2457 +0,0 @@
-diff --git sc/inc/attrib.hxx sc/inc/attrib.hxx
-index 3fed033..22e7d27 100644
---- sc/inc/attrib.hxx
-+++ sc/inc/attrib.hxx
-@@ -42,13 +42,16 @@
- 
- 										// Flags fuer durch Merge verdeckte Zellen
- 										// und Control fuer Auto-Filter
--#define SC_MF_HOR				1
--#define SC_MF_VER				2
--#define SC_MF_AUTO				4
--#define SC_MF_BUTTON			8
--#define SC_MF_SCENARIO			16
--
--#define SC_MF_ALL				31
-+#define SC_MF_HOR               0x0001
-+#define SC_MF_VER               0x0002
-+#define SC_MF_AUTO              0x0004  /// autofilter arrow
-+#define SC_MF_BUTTON            0x0008  /// field button for datapilot
-+#define SC_MF_SCENARIO          0x0010
-+#define SC_MF_BUTTON_POPUP      0x0020  /// dp button with popup arrow
-+#define SC_MF_HIDDEN_MEMBER     0x0040  /// dp field button with presence of hidden member 
-+#define SC_MF_DP_TABLE          0x0080  /// dp table output
-+
-+#define SC_MF_ALL               0x00FF
- 
- 
- class EditTextObject;
-diff --git sc/inc/dpoutput.hxx sc/inc/dpoutput.hxx
-index 025e62d..90c0062 100644
---- sc/inc/dpoutput.hxx
-+++ sc/inc/dpoutput.hxx
-@@ -94,6 +94,7 @@ private:
- 		com::sun::star::uno::Sequence<
- 			com::sun::star::sheet::DataResult> > aData;
- 	BOOL					bResultsError;
-+    bool                    mbHasDataLayout;
- 	String					aDataDescription;
- 
-     // Number format related parameters
-@@ -124,8 +125,8 @@ private:
- 	void			HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
- 								const com::sun::star::sheet::MemberResult& rData,
- 								BOOL bColHeader, long nLevel );
--	void			FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption,
--								BOOL bFrame = TRUE );
-+    void            FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, 
-+                               bool bInTable, bool bPopup, bool bHasHiddenMember );
- 	void			CalcSizes();
- 
-     /** Query which sub-area of the table the cell is in. See
-diff --git sc/inc/dpoutputgeometry.hxx sc/inc/dpoutputgeometry.hxx
-new file mode 100644
-index 0000000..aae3271
---- /dev/null
-+++ sc/inc/dpoutputgeometry.hxx
-@@ -0,0 +1,75 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: xmldpimp.cxx,v $
-+ * $Revision: 1.27.134.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SC_DPOUTPUTGEOMETRY_HXX
-+#define SC_DPOUTPUTGEOMETRY_HXX
-+
-+#include "address.hxx"
-+#include <vector>
-+
-+class ScAddress;
-+
-+class SC_DLLPUBLIC ScDPOutputGeometry
-+{
-+public:
-+    enum FieldType { Column, Row, Page, Data, None };
-+
-+    ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter);
-+    ~ScDPOutputGeometry();
-+
-+    /** 
-+     * @param nCount number of row fields, <b>excluding the data layout 
-+     *               field if exists</b>.
-+     */
-+    void setRowFieldCount(sal_uInt32 nCount);
-+    void setColumnFieldCount(sal_uInt32 nCount);
-+    void setPageFieldCount(sal_uInt32 nCount);
-+    void setDataFieldCount(sal_uInt32 nCount);
-+
-+    void getColumnFieldPositions(::std::vector<ScAddress>& rAddrs) const;
-+    void getRowFieldPositions(::std::vector<ScAddress>& rAddrs) const;
-+    void getPageFieldPositions(::std::vector<ScAddress>& rAddrs) const;
-+
-+    FieldType getFieldButtonType(const ScAddress& rPos) const;
-+
-+private:
-+    ScDPOutputGeometry(); // disabled
-+
-+private:
-+    ScRange     maOutRange;
-+    sal_uInt32  mnRowFields;
-+    sal_uInt32  mnColumnFields;
-+    sal_uInt32  mnPageFields;
-+    sal_uInt32  mnDataFields;
-+
-+    bool        mbShowFilter;
-+};
-+
-+#endif
-diff --git sc/inc/dpsave.hxx sc/inc/dpsave.hxx
-index cb381fb..d1d961a 100644
---- sc/inc/dpsave.hxx
-+++ sc/inc/dpsave.hxx
-@@ -179,6 +179,10 @@ public:
- 
- 	void					WriteToSource( const com::sun::star::uno::Reference<
- 											com::sun::star::uno::XInterface>& xDim );
-+
-+    void                    UpdateMemberVisibility(const ::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rData);
-+
-+    bool                    HasInvisibleMember() const;
- };
- 
- 
-@@ -222,7 +226,7 @@ public:
- 	ScDPSaveDimension*		DuplicateDimension(const String& rName);
-     SC_DLLPUBLIC ScDPSaveDimension&      DuplicateDimension(const ScDPSaveDimension& rDim);
- 
--    SC_DLLPUBLIC ScDPSaveDimension*		GetExistingDimensionByName(const String& rName);
-+    SC_DLLPUBLIC ScDPSaveDimension*		GetExistingDimensionByName(const String& rName) const;
-     SC_DLLPUBLIC ScDPSaveDimension*		GetNewDimensionByName(const String& rName);
- 
-     void                    RemoveDimensionByName(const String& rName);
-@@ -256,6 +260,13 @@ public:
-     SC_DLLPUBLIC ScDPDimensionSaveData*  GetDimensionData();     // create if not there
-     void                    SetDimensionData( const ScDPDimensionSaveData* pNew );      // copied
-     void                    BuildAllDimensionMembers(ScDPTableData* pData);
-+
-+    /** 
-+     * Check whether a dimension has one or more invisible members.
-+     *
-+     * @param rDimName dimension name
-+     */
-+    SC_DLLPUBLIC bool       HasInvisibleMember(const ::rtl::OUString& rDimName) const;
- };
- 
- 
-diff --git sc/inc/dptabsrc.hxx sc/inc/dptabsrc.hxx
-index 9d6e8e4..22492d5 100644
---- sc/inc/dptabsrc.hxx
-+++ sc/inc/dptabsrc.hxx
-@@ -348,6 +348,7 @@ private:
- 	BOOL				bHasSelectedPage;
- 	String				aSelectedPage;
- 	ScDPItemData*		pSelectedData;		// internal, temporary, created from aSelectedPage
-+    sal_Bool            mbHasHiddenMember;
- 
- public:
- 							ScDPDimension( ScDPSource* pSrc, long nD );
-diff --git sc/inc/fillinfo.hxx sc/inc/fillinfo.hxx
-index c9bfc1d..7f8bd54 100644
---- sc/inc/fillinfo.hxx
-+++ sc/inc/fillinfo.hxx
-@@ -99,6 +99,8 @@ struct CellInfo
-     BOOL                        bVOverlapped : 1;
-     BOOL                        bAutoFilter : 1;
-     BOOL                        bPushButton : 1;
-+    bool                        bPopupButton: 1;
-+    bool                        bFilterActive:1;
- 
-     BOOL                        bPrinted : 1;               // bei Bedarf (Pagebreak-Modus)
- 
-diff --git sc/inc/global.hxx sc/inc/global.hxx
-index a64dd1c..b2d6e50 100644
---- sc/inc/global.hxx
-+++ sc/inc/global.hxx
-@@ -94,8 +94,6 @@ extern "C" {
- #define OLD_PIVOT_IMPLEMENTATION 0
- 
- //------------------------------------------------------------------------
--struct LabelData;
--//------------------------------------------------------------------------
- 
- //	die 1000 Namen des Calc...
- //	Clipboard-Namen sind jetzt in so3/soapp.hxx
---- sc/inc/pivot.hxx
-+++ sc/inc/pivot.hxx
-@@ -53,6 +53,7 @@
- #include "address.hxx"
- 
- #include <vector>
-+#include <boost/shared_ptr.hpp>
- 
- class SubTotal;
- #include "collect.hxx"
-@@ -80,7 +81,9 @@ class ScUserListData;
- class ScDocument;
- class ScUserListData;
- class ScProgress;
--struct LabelData;
-+struct ScDPLabelData;
-+
-+typedef ::boost::shared_ptr<ScDPLabelData> ScDPLabelDataRef;
- 
- // -----------------------------------------------------------------------
- 
-@@ -104,8 +107,7 @@ struct ScPivotParam
-     SCCOL           nCol;           // Cursor Position /
-     SCROW           nRow;           // bzw. Anfang des Zielbereiches
-     SCTAB           nTab;
--    LabelData**     ppLabelArr;
--    SCSIZE          nLabels;
-+    ::std::vector<ScDPLabelDataRef> maLabelArray;
-     PivotField      aPageArr[PIVOT_MAXPAGEFIELD];
-     PivotField      aColArr[PIVOT_MAXFIELD];
-     PivotField      aRowArr[PIVOT_MAXFIELD];
-@@ -126,10 +128,8 @@ struct ScPivotParam
-     ScPivotParam&   operator=       ( const ScPivotParam& r );
-     BOOL            operator==      ( const ScPivotParam& r ) const;
- //UNUSED2009-05 void            Clear           ();
--    void            ClearLabelData  ();
-     void            ClearPivotArrays();
--    void            SetLabelData    ( LabelData**   ppLabArr,
--                                      SCSIZE        nLab );
-+    void            SetLabelData    (const ::std::vector<ScDPLabelDataRef>& r);
-     void            SetPivotArrays  ( const PivotField* pPageArr,
-                                       const PivotField* pColArr,
-                                       const PivotField* pRowArr,
-@@ -366,7 +366,7 @@ public:
- 
- //------------------------------------------------------------------------
- 
--struct LabelData
-+struct ScDPLabelData
- {
-     String              maName;         /// Visible name of the dimension.
-     SCsCOL              mnCol;
-@@ -383,7 +383,7 @@ struct LabelData
-     ::com::sun::star::sheet::DataPilotFieldLayoutInfo   maLayoutInfo;   /// Layout info.
-     ::com::sun::star::sheet::DataPilotFieldAutoShowInfo maShowInfo;     /// AutoShow info.
- 
--    explicit            LabelData( const String& rName, short nCol, bool bIsValue );
-+    explicit            ScDPLabelData( const String& rName, short nCol, bool bIsValue );
- };
- 
- // ============================================================================
-@@ -401,7 +401,6 @@ struct ScDPFuncData
- 
- // ============================================================================
- 
--typedef LabelData ScDPLabelData;
- typedef std::vector< ScDPLabelData > ScDPLabelDataVec;
- typedef std::vector< String > ScDPNameVec;
- 
-diff --git sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx
-index 1a2b9a2..2c7f1e0 100644
---- sc/inc/scabstdlg.hxx
-+++ sc/inc/scabstdlg.hxx
-@@ -244,7 +244,7 @@ class AbstractScDPSubtotalDlg : public VclAbstractDialog  //add for ScDPSubtotal
- {
- public:
-     virtual USHORT  GetFuncMask() const = 0;
--    virtual void    FillLabelData( LabelData& rLabelData ) const = 0;
-+    virtual void    FillLabelData( ScDPLabelData& rLabelData ) const = 0;
- };
- 
- class AbstractScDPNumGroupDlg : public VclAbstractDialog
-diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
-index 6afb1a3..89b3a94 100644
---- sc/inc/unonames.hxx
-+++ sc/inc/unonames.hxx
-@@ -566,6 +566,7 @@
- #define SC_UNO_LAYOUTNAME           "LayoutName"
- #define SC_UNO_FIELD_SUBTOTALNAME   "FieldSubtotalName"
- #define SC_UNO_GRANDTOTAL_NAME      "GrandTotalName"
-+#define SC_UNO_HAS_HIDDEN_MEMBER    "HasHiddenMember"
- 
- //  (preliminary:)
- #define SC_UNO_REFVALUE				"ReferenceValue"
-diff --git sc/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
-index afa90e9..7e977f0 100644
---- sc/source/core/data/dpobject.cxx
-+++ sc/source/core/data/dpobject.cxx
-@@ -1807,7 +1807,7 @@ BOOL ScDPObject::FillOldParam(ScPivotParam& rParam, BOOL bForFile) const
- 	return TRUE;
- }
- 
--void lcl_FillLabelData( LabelData& rData, const uno::Reference< beans::XPropertySet >& xDimProp )
-+void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans::XPropertySet >& xDimProp )
- {
- 	uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDimProp, uno::UNO_QUERY );
- 	if ( xDimProp.is() && xDimSupp.is() )
-@@ -1853,6 +1853,8 @@ void lcl_FillLabelData( LabelData& rData, const uno::Reference< beans::XProperty
- 
- BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
- {
-+    rParam.maLabelArray.clear();
-+
- 	((ScDPObject*)this)->CreateObjects();
- 
- 	uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
-@@ -1863,8 +1865,6 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
- 	if (!nDimCount)
- 		return FALSE;
- 
--	SCSIZE nOutCount = 0;
--	LabelData** aLabelArr = new LabelData*[nDimCount];
- 	for (long nDim=0; nDim < nDimCount; nDim++)
- 	{
- 		String aFieldName;
-@@ -1899,24 +1899,15 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
-                 SCsCOL nCol = static_cast< SCsCOL >( nDim );           //! ???
-                 bool bIsValue = true;                               //! check
- 
--                aLabelArr[nOutCount] = new LabelData( aFieldName, nCol, bIsValue );
--
--                LabelData& rLabelData = *aLabelArr[nOutCount];
--                GetHierarchies( nDim, rLabelData.maHiers );
--                GetMembers( nDim, rLabelData.maMembers, &rLabelData.maVisible, &rLabelData.maShowDet );
--                lcl_FillLabelData( rLabelData, xDimProp );
--
--				++nOutCount;
-+                ScDPLabelDataRef pNewLabel(new ScDPLabelData(aFieldName, nCol, bIsValue));
-+                GetHierarchies(nDim, pNewLabel->maHiers);
-+                GetMembers(nDim, pNewLabel->maMembers, &pNewLabel->maVisible, &pNewLabel->maShowDet);
-+                lcl_FillLabelData(*pNewLabel, xDimProp);
-+                rParam.maLabelArray.push_back(pNewLabel);
- 			}
- 		}
- 	}
- 
--	rParam.SetLabelData( aLabelArr, nOutCount );
--
--	for (SCSIZE i=0; i<nOutCount; i++)
--		delete aLabelArr[i];
--	delete[] aLabelArr;
--
- 	return TRUE;
- }
- 
-diff --git sc/source/core/data/dpoutput.cxx sc/source/core/data/dpoutput.cxx
-index de9c898..431cf47 100644
---- sc/source/core/data/dpoutput.cxx
-+++ sc/source/core/data/dpoutput.cxx
-@@ -121,8 +121,13 @@ struct ScDPOutLevelData
- 	uno::Sequence<sheet::MemberResult>	aResult;
-     String                              maName;   /// Name is the internal field name.
-     String                              aCaption; /// Caption is the name visible in the output table.
-+    bool                                mbHasHiddenMember;
- 
--	ScDPOutLevelData() { nDim = nHier = nLevel = nDimPos = -1; }
-+	ScDPOutLevelData()
-+    { 
-+        nDim = nHier = nLevel = nDimPos = -1; 
-+        mbHasHiddenMember = false;
-+    }
- 
- 	BOOL operator<(const ScDPOutLevelData& r) const
- 		{ return nDimPos<r.nDimPos || ( nDimPos==r.nDimPos && nHier<r.nHier ) ||
-@@ -371,6 +376,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 	aStartPos( rPos ),
- 	bDoFilter( bFilter ),
- 	bResultsError( FALSE ),
-+    mbHasDataLayout(false),
- 	pColNumFmt( NULL ),
- 	pRowNumFmt( NULL ),
- 	nColFmtCount( 0 ),
-@@ -415,6 +421,8 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 				BOOL bIsDataLayout = ScUnoHelpFunctions::GetBoolProperty(
- 												xDimProp,
- 												rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
-+                bool bHasHiddenMember = ScUnoHelpFunctions::GetBoolProperty(
-+                    xDimProp, OUString::createFromAscii(SC_UNO_HAS_HIDDEN_MEMBER));
- 
- 				if ( eDimOrient != sheet::DataPilotFieldOrientation_HIDDEN )
- 				{
-@@ -454,6 +462,8 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
-                                         OUString::createFromAscii(SC_UNO_LAYOUTNAME));
-                                     any >>= aCaption;
-                                 }
-+
-+                                bool bRowFieldHasMember = false;
- 								switch ( eDimOrient )
- 								{
- 									case sheet::DataPilotFieldOrientation_COLUMN:
-@@ -464,6 +474,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 										pColFields[nColFieldCount].aResult = xLevRes->getResults();
-                                         pColFields[nColFieldCount].maName  = aName;
- 										pColFields[nColFieldCount].aCaption= aCaption;
-+										pColFields[nColFieldCount].mbHasHiddenMember = bHasHiddenMember;
- 										if (!lcl_MemberEmpty(pColFields[nColFieldCount].aResult))
- 											++nColFieldCount;
- 										break;
-@@ -475,8 +486,12 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 										pRowFields[nRowFieldCount].aResult = xLevRes->getResults();
-                                         pRowFields[nRowFieldCount].maName  = aName;
- 										pRowFields[nRowFieldCount].aCaption= aCaption;
-+										pRowFields[nRowFieldCount].mbHasHiddenMember = bHasHiddenMember;
- 										if (!lcl_MemberEmpty(pRowFields[nRowFieldCount].aResult))
-+                                        {    
- 											++nRowFieldCount;
-+                                            bRowFieldHasMember = true;
-+                                        }
- 										break;
- 									case sheet::DataPilotFieldOrientation_PAGE:
- 										pPageFields[nPageFieldCount].nDim    = nDim;
-@@ -486,6 +501,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 										pPageFields[nPageFieldCount].aResult = lcl_GetSelectedPageAsResult(xDimProp);
-                                         pPageFields[nPageFieldCount].maName  = aName;
- 										pPageFields[nPageFieldCount].aCaption= aCaption;
-+										pPageFields[nPageFieldCount].mbHasHiddenMember = bHasHiddenMember;
- 										// no check on results for page fields
- 										++nPageFieldCount;
- 										break;
-@@ -498,6 +514,9 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
- 								// get number formats from data dimensions
- 								if ( bIsDataLayout )
- 								{
-+                                    if (bRowFieldHasMember)
-+                                        mbHasDataLayout = true;
-+
- 									DBG_ASSERT( nLevCount == 1, "data layout: multiple levels?" );
- 									if ( eDimOrient == sheet::DataPilotFieldOrientation_COLUMN )
- 										lcl_FillNumberFormats( pColNumFmt, nColFmtCount, xLevRes, xDims );
-@@ -658,14 +677,20 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
- 	}
- }
- 
--void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, BOOL bFrame )
-+void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, 
-+                            bool bInTable, bool bPopup, bool bHasHiddenMember )
- {
- 	pDoc->SetString( nCol, nRow, nTab, rCaption );
--	if (bFrame)
--		lcl_SetFrame( pDoc,nTab, nCol,nRow, nCol,nRow, 20 );
-+    if (bInTable)
-+        lcl_SetFrame( pDoc,nTab, nCol,nRow, nCol,nRow, 20 );
- 
- 	//	Button
--	pDoc->ApplyAttr( nCol, nRow, nTab, ScMergeFlagAttr(SC_MF_BUTTON) );
-+    sal_uInt16 nMergeFlag = SC_MF_BUTTON;
-+    if (bPopup)
-+        nMergeFlag |= SC_MF_BUTTON_POPUP;
-+    if (bHasHiddenMember)
-+        nMergeFlag |= SC_MF_HIDDEN_MEMBER;
-+    pDoc->ApplyAttr( nCol, nRow, nTab, ScMergeFlagAttr(nMergeFlag) );
- 
- 	lcl_SetStyleById( pDoc,nTab, nCol,nRow, nCol,nRow, STR_PIVOT_STYLE_FIELDNAME );
- }
-@@ -799,7 +824,7 @@ void ScDPOutput::Output()
- 		SCCOL nHdrCol = aStartPos.Col();
- 		SCROW nHdrRow = aStartPos.Row() + nField + ( bDoFilter ? 1 : 0 );
- 		// draw without frame for consistency with filter button:
--		FieldCell( nHdrCol, nHdrRow, nTab, pPageFields[nField].aCaption, FALSE );
-+        FieldCell( nHdrCol, nHdrRow, nTab, pPageFields[nField].aCaption, false, false, pPageFields[nField].mbHasHiddenMember );
- 		SCCOL nFldCol = nHdrCol + 1;
- 
- 		String aPageValue;
-@@ -838,7 +863,7 @@ void ScDPOutput::Output()
- 	for (nField=0; nField<nColFieldCount; nField++)
- 	{
- 		SCCOL nHdrCol = nDataStartCol + (SCCOL)nField;				//! check for overflow
--		FieldCell( nHdrCol, nTabStartRow, nTab, pColFields[nField].aCaption );
-+        FieldCell( nHdrCol, nTabStartRow, nTab, pColFields[nField].aCaption, true, true, pColFields[nField].mbHasHiddenMember );
- 
- 		SCROW nRowPos = nMemberStartRow + (SCROW)nField;				//! check for overflow
- 		const uno::Sequence<sheet::MemberResult> rSequence = pColFields[nField].aResult;
-@@ -873,9 +898,12 @@ void ScDPOutput::Output()
- 
- 	for (nField=0; nField<nRowFieldCount; nField++)
- 	{
-+        bool bDataLayout = mbHasDataLayout && (nField == nRowFieldCount-1);
-+
- 		SCCOL nHdrCol = nTabStartCol + (SCCOL)nField;					//! check for overflow
- 		SCROW nHdrRow = nDataStartRow - 1;
--		FieldCell( nHdrCol, nHdrRow, nTab, pRowFields[nField].aCaption );
-+        FieldCell( nHdrCol, nHdrRow, nTab, pRowFields[nField].aCaption, true, !bDataLayout, 
-+                   pRowFields[nField].mbHasHiddenMember );
- 
- 		SCCOL nColPos = nMemberStartCol + (SCCOL)nField;				//! check for overflow
- 		const uno::Sequence<sheet::MemberResult> rSequence = pRowFields[nField].aResult;
-diff --git sc/source/core/data/dpoutputgeometry.cxx sc/source/core/data/dpoutputgeometry.cxx
-new file mode 100644
-index 0000000..4d6996b
---- /dev/null
-+++ sc/source/core/data/dpoutputgeometry.cxx
-@@ -0,0 +1,204 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: xmldpimp.cxx,v $
-+ * $Revision: 1.27.134.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_sc.hxx"
-+
-+
-+
-+// INCLUDE ---------------------------------------------------------------
-+
-+#include "dpoutputgeometry.hxx"
-+#include "address.hxx"
-+
-+#include <vector>
-+
-+using ::std::vector;
-+
-+ScDPOutputGeometry::ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter) :
-+    maOutRange(rOutRange),
-+    mnRowFields(0),
-+    mnColumnFields(0),
-+    mnPageFields(0),
-+    mnDataFields(0),
-+    mbShowFilter(bShowFilter)
-+{
-+}
-+
-+ScDPOutputGeometry::~ScDPOutputGeometry()
-+{
-+}
-+
-+void ScDPOutputGeometry::setRowFieldCount(sal_uInt32 nCount)
-+{
-+    mnRowFields = nCount;
-+}
-+
-+void ScDPOutputGeometry::setColumnFieldCount(sal_uInt32 nCount)
-+{
-+    mnColumnFields = nCount;
-+}
-+
-+void ScDPOutputGeometry::setPageFieldCount(sal_uInt32 nCount)
-+{
-+    mnPageFields = nCount;
-+}
-+
-+void ScDPOutputGeometry::setDataFieldCount(sal_uInt32 nCount)
-+{
-+    mnDataFields = nCount;
-+}
-+
-+void ScDPOutputGeometry::getColumnFieldPositions(vector<ScAddress>& rAddrs) const
-+{
-+    vector<ScAddress> aAddrs;
-+    if (!mnColumnFields)
-+    {
-+        rAddrs.swap(aAddrs);
-+        return;
-+    }
-+
-+    bool bDataLayout = mnDataFields > 1;
-+
-+    SCROW nCurRow = maOutRange.aStart.Row();
-+
-+    if (mnPageFields)
-+    {
-+        SCROW nRowStart = maOutRange.aStart.Row() + mbShowFilter;
-+        SCROW nRowEnd   = nRowStart + static_cast<SCCOL>(mnPageFields-1);
-+        nCurRow = nRowEnd + 2;
-+    }
-+    else if (mbShowFilter)
-+        nCurRow += 2;
-+
-+    SCROW nRow = nCurRow;
-+    SCTAB nTab = maOutRange.aStart.Tab();
-+    SCCOL nColStart = maOutRange.aStart.Col() + mnRowFields + bDataLayout;
-+    SCCOL nColEnd = nColStart + static_cast<SCCOL>(mnColumnFields-1);
-+
-+    for (SCCOL nCol = nColStart; nCol <= nColEnd; ++nCol)
-+        aAddrs.push_back(ScAddress(nCol, nRow, nTab));
-+    rAddrs.swap(aAddrs);
-+}
-+
-+void ScDPOutputGeometry::getRowFieldPositions(vector<ScAddress>& rAddrs) const
-+{
-+    vector<ScAddress> aAddrs;
-+    if (!mnRowFields)
-+    {
-+        rAddrs.swap(aAddrs);
-+        return;
-+    }
-+
-+    SCROW nCurRow = maOutRange.aStart.Row();
-+
-+    if (mnPageFields)
-+    {
-+        SCROW nRowStart = maOutRange.aStart.Row() + mbShowFilter;
-+        SCROW nRowEnd   = nRowStart + static_cast<SCCOL>(mnPageFields-1);
-+        nCurRow = nRowEnd + 2;
-+    }
-+    else if (mbShowFilter)
-+        nCurRow += 2;
-+
-+    nCurRow += static_cast<SCROW>(mnColumnFields);
-+
-+    SCROW nRow = nCurRow;
-+    SCTAB nTab = maOutRange.aStart.Tab();
-+    SCCOL nColStart = maOutRange.aStart.Col();
-+    SCCOL nColEnd = nColStart + static_cast<SCCOL>(mnRowFields-1);
-+
-+    for (SCCOL nCol = nColStart; nCol <= nColEnd; ++nCol)
-+        aAddrs.push_back(ScAddress(nCol, nRow, nTab));
-+    rAddrs.swap(aAddrs);
-+}
-+
-+void ScDPOutputGeometry::getPageFieldPositions(vector<ScAddress>& rAddrs) const
-+{
-+    vector<ScAddress> aAddrs;
-+    if (!mnPageFields)
-+    {
-+        rAddrs.swap(aAddrs);
-+        return;
-+    }
-+
-+    SCTAB nTab = maOutRange.aStart.Tab();
-+    SCCOL nCol = maOutRange.aStart.Col();
-+
-+    SCROW nRowStart = maOutRange.aStart.Row() + mbShowFilter;
-+    SCROW nRowEnd   = nRowStart + static_cast<SCCOL>(mnPageFields-1);
-+
-+    for (SCROW nRow = nRowStart; nRow <= nRowEnd; ++nRow)
-+        aAddrs.push_back(ScAddress(nCol, nRow, nTab));
-+    rAddrs.swap(aAddrs);
-+}
-+
-+ScDPOutputGeometry::FieldType ScDPOutputGeometry::getFieldButtonType(const ScAddress& rPos) const
-+{
-+    // We will ignore the table position for now.
-+
-+    bool bDataLayout = mnDataFields > 1;
-+
-+    SCROW nCurRow = maOutRange.aStart.Row();
-+
-+    if (mnPageFields)
-+    {
-+        SCCOL nCol = maOutRange.aStart.Col();
-+        SCROW nRowStart = maOutRange.aStart.Row() + mbShowFilter;
-+        SCROW nRowEnd   = nRowStart + static_cast<SCCOL>(mnPageFields-1);
-+        if (rPos.Col() == nCol && nRowStart <= rPos.Row() && rPos.Row() <= nRowEnd)
-+            return Page;
-+
-+        nCurRow = nRowEnd + 2;
-+    }
-+    else if (mbShowFilter)
-+        nCurRow += 2;
-+
-+    if (mnColumnFields)
-+    {
-+        SCROW nRow = nCurRow;
-+        SCCOL nColStart = maOutRange.aStart.Col() + mnRowFields + bDataLayout;
-+        SCCOL nColEnd = nColStart + static_cast<SCCOL>(mnColumnFields-1);
-+        if (rPos.Row() == nRow && nColStart <= rPos.Col() && rPos.Col() <= nColEnd)
-+            return Column;
-+
-+        nCurRow += static_cast<SCROW>(mnColumnFields);
-+    }
-+
-+    if (mnRowFields)
-+    {
-+        SCCOL nColStart = maOutRange.aStart.Col();
-+        SCCOL nColEnd = nColStart + static_cast<SCCOL>(mnRowFields-1);
-+        if (rPos.Row() == nCurRow && nColStart <= rPos.Col() && rPos.Col() <= nColEnd)
-+            return Row;
-+    }
-+
-+    return None;
-+}
-diff --git sc/source/core/data/dpsave.cxx sc/source/core/data/dpsave.cxx
-index f41ea2c..4432eb9 100644
---- sc/source/core/data/dpsave.cxx
-+++ sc/source/core/data/dpsave.cxx
-@@ -62,6 +62,7 @@
- 
- using namespace com::sun::star;
- using ::rtl::OUString;
-+using ::rtl::OUStringHash;
- using ::std::hash_map;
- using ::std::auto_ptr;
- 
-@@ -642,6 +643,8 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
- 		nHierCount = xHiers->getCount();
- 	}
- 
-+    sal_Bool bHasHiddenMember = false;
-+
- 	for (long nHier=0; nHier<nHierCount; nHier++)
- 	{
- 		uno::Reference<uno::XInterface> xHierarchy = ScUnoHelpFunctions::AnyToInterface( xHiers->getByIndex(nHier) );
-@@ -734,12 +737,15 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
- 
- 						for (MemberList::const_iterator i=maMemberList.begin(); i != maMemberList.end() ; i++)
- 						{
--                            rtl::OUString aMemberName = (*i)->GetName();
-+                            ScDPSaveMember* pMember = *i;
-+                            if (!pMember->GetIsVisible())
-+                                bHasHiddenMember = true;
-+                            rtl::OUString aMemberName = pMember->GetName();
-                             if ( xMembers->hasByName( aMemberName ) )
- 							{
- 								uno::Reference<uno::XInterface> xMemberInt = ScUnoHelpFunctions::AnyToInterface(
-                                     xMembers->getByName( aMemberName ) );
--								(*i)->WriteToSource( xMemberInt, nPosition );
-+								pMember->WriteToSource( xMemberInt, nPosition );
- 
- 								if ( nPosition >= 0 )
-     								++nPosition;            // increase if initialized
-@@ -751,6 +757,40 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
- 			}
- 		}
- 	}
-+
-+    if (xDimProp.is())
-+    {
-+        uno::Any any;
-+        any <<= bHasHiddenMember;    
-+        xDimProp->setPropertyValue(
-+            OUString::createFromAscii(SC_UNO_HAS_HIDDEN_MEMBER), any);
-+    }
-+}
-+
-+void ScDPSaveDimension::UpdateMemberVisibility(const hash_map<OUString, bool, OUStringHash>& rData)
-+{
-+    typedef hash_map<OUString, bool, OUStringHash> DataMap;
-+    MemberList::iterator itrMem = maMemberList.begin(), itrMemEnd = maMemberList.end();
-+    for (; itrMem != itrMemEnd; ++itrMem)
-+    {
-+        ScDPSaveMember* pMem = *itrMem;
-+        const String& rMemName = pMem->GetName();
-+        DataMap::const_iterator itr = rData.find(rMemName);
-+        if (itr != rData.end())
-+            pMem->SetIsVisible(itr->second);
-+    }
-+}
-+
-+bool ScDPSaveDimension::HasInvisibleMember() const
-+{
-+    MemberList::const_iterator itrMem = maMemberList.begin(), itrMemEnd = maMemberList.end();
-+    for (; itrMem != itrMemEnd; ++itrMem)
-+    {
-+        const ScDPSaveMember* pMem = *itrMem;
-+        if (!pMem->GetIsVisible())
-+            return true;
-+    }
-+    return false;
- }
- 
- // -----------------------------------------------------------------------
-@@ -907,7 +947,7 @@ ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const String& rName)
- 	return pNew;
- }
- 
--ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const String& rName)
-+ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const String& rName) const
- {
- 	long nCount = aDimList.Count();
- 	for (long i=0; i<nCount; i++)
-@@ -1304,3 +1344,11 @@ void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
-     mbDimensionMembersBuilt = true;
- }
- 
-+bool ScDPSaveData::HasInvisibleMember(const OUString& rDimName) const
-+{
-+    ScDPSaveDimension* pDim = GetExistingDimensionByName(rDimName);
-+    if (!pDim)
-+        return false;
-+
-+    return pDim->HasInvisibleMember();
-+}
-diff --git sc/source/core/data/dptabsrc.cxx sc/source/core/data/dptabsrc.cxx
-index 04e75ba..2f581c0 100644
---- sc/source/core/data/dptabsrc.cxx
-+++ sc/source/core/data/dptabsrc.cxx
-@@ -1371,7 +1371,8 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
-     mpSubtotalName(NULL),
- 	nSourceDim( -1 ),
- 	bHasSelectedPage( FALSE ),
--	pSelectedData( NULL )
-+	pSelectedData( NULL ),
-+    mbHasHiddenMember(false)
- {
- 	//!	hold pSource
- }
-@@ -1567,6 +1568,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
- 		{MAP_CHAR_LEN(SC_UNO_USEDHIER),	0,	&getCppuType((sal_Int32*)0),				0, 0 },
-         {MAP_CHAR_LEN(SC_UNO_LAYOUTNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
-         {MAP_CHAR_LEN(SC_UNO_FIELD_SUBTOTALNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
-+        {MAP_CHAR_LEN(SC_UNO_HAS_HIDDEN_MEMBER), 0, &getBooleanCppuType(), 0, 0 },
-         {0,0,0,0,0,0}
- 	};
- 	static uno::Reference<beans::XPropertySetInfo> aRef =
-@@ -1649,6 +1651,8 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
-         if (aValue >>= aName)
-             mpSubtotalName.reset(new OUString(aName));
-     }
-+    else if (aNameStr.EqualsAscii(SC_UNO_HAS_HIDDEN_MEMBER))
-+        aValue >>= mbHasHiddenMember;
- 	else
- 	{
- 		DBG_ERROR("unknown property");
-@@ -1712,6 +1716,8 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert
-         aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString::createFromAscii("");
-     else if (aNameStr.EqualsAscii(SC_UNO_FIELD_SUBTOTALNAME))
-         aRet <<= mpSubtotalName.get() ? *mpSubtotalName : OUString::createFromAscii("");
-+    else if (aNameStr.EqualsAscii(SC_UNO_HAS_HIDDEN_MEMBER))
-+        aRet <<= mbHasHiddenMember;
- 	else
- 	{
- 		DBG_ERROR("unknown property");
-diff --git sc/source/core/data/fillinfo.cxx sc/source/core/data/fillinfo.cxx
-index 9fbeb09..53abf3e 100644
---- sc/source/core/data/fillinfo.cxx
-+++ sc/source/core/data/fillinfo.cxx
-@@ -332,6 +332,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
- 			pInfo->bVOverlapped = FALSE;
- 			pInfo->bAutoFilter	= FALSE;
- 			pInfo->bPushButton	= FALSE;
-+            pInfo->bPopupButton = false;
-+            pInfo->bFilterActive = false;
- 			pInfo->nRotateDir	= SC_ROTDIR_NONE;
- 
- 			pInfo->bPrinted		= FALSE;					//	view-intern
-@@ -458,6 +460,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
- 						BOOL bAutoFilter  = ((nOverlap & SC_MF_AUTO) != 0);
- 						BOOL bPushButton  = ((nOverlap & SC_MF_BUTTON) != 0);
- 						BOOL bScenario	  = ((nOverlap & SC_MF_SCENARIO) != 0);
-+                        bool bPopupButton = ((nOverlap & SC_MF_BUTTON_POPUP) != 0);
-+                        bool bFilterActive = ((nOverlap & SC_MF_HIDDEN_MEMBER) != 0);
- 						if (bMerged||bHOverlapped||bVOverlapped)
- 							bAnyMerged = TRUE;								// intern
- 
-@@ -498,6 +502,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
- 								pInfo->bVOverlapped	= bVOverlapped;
- 								pInfo->bAutoFilter	= bAutoFilter;
- 								pInfo->bPushButton	= bPushButton;
-+                                pInfo->bPopupButton = bPopupButton;
-+                                pInfo->bFilterActive = bFilterActive;
- 								pInfo->pLinesAttr	= pLinesAttr;
-                                 pInfo->mpTLBRLine   = pTLBRLine;
-                                 pInfo->mpBLTRLine   = pBLTRLine;
-@@ -512,7 +518,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
- 										nCurRow >= aEmbedRange.aStart.Row() &&
- 										nCurRow <= aEmbedRange.aEnd.Row();
- 
--								if (bPushButton || bScenario)
-+								if (bScenario)
- 								{
- 									pInfo->pBackground = ScGlobal::GetButtonBrushItem();
- 									pThisRowInfo->bEmptyBack = FALSE;
---- sc/source/core/data/global2.cxx
-+++ sc/source/core/data/global2.cxx
-@@ -56,6 +56,7 @@
- #include "sc.hrc"
- #include "globstr.hrc"
- 
-+using ::std::vector;
- 
- // -----------------------------------------------------------------------
- 
-@@ -825,7 +826,6 @@ bool PivotField::operator==( const PivotField& r ) const
- 
- ScPivotParam::ScPivotParam()
- 	:	nCol(0), nRow(0), nTab(0),
--		ppLabelArr( NULL ), nLabels(0),
-         nPageCount(0), nColCount(0), nRowCount(0), nDataCount(0),
- 		bIgnoreEmptyRows(FALSE), bDetectCategories(FALSE),
- 		bMakeTotalCol(TRUE), bMakeTotalRow(TRUE)
-@@ -836,23 +836,22 @@ ScPivotParam::ScPivotParam()
- 
- ScPivotParam::ScPivotParam( const ScPivotParam& r )
- 	:	nCol( r.nCol ), nRow( r.nRow ), nTab( r.nTab ),
--		ppLabelArr( NULL ), nLabels(0),
-         nPageCount(0), nColCount(0), nRowCount(0), nDataCount(0),
- 		bIgnoreEmptyRows(r.bIgnoreEmptyRows),
- 		bDetectCategories(r.bDetectCategories),
- 		bMakeTotalCol(r.bMakeTotalCol),
- 		bMakeTotalRow(r.bMakeTotalRow)
- {
--	SetLabelData	( r.ppLabelArr, r.nLabels );
-     SetPivotArrays  ( r.aPageArr, r.aColArr, r.aRowArr, r.aDataArr,
-                       r.nPageCount, r.nColCount, r.nRowCount, r.nDataCount );
-+
-+    SetLabelData(r.maLabelArray);
- }
- 
- //------------------------------------------------------------------------
- 
- __EXPORT ScPivotParam::~ScPivotParam()
- {
--	ClearLabelData();
- }
- 
- //------------------------------------------------------------------------
-@@ -864,26 +863,10 @@ void __EXPORT ScPivotParam::Clear()
- //UNUSED2009-05     nTab = 0;
- //UNUSED2009-05     bIgnoreEmptyRows = bDetectCategories = FALSE;
- //UNUSED2009-05     bMakeTotalCol = bMakeTotalRow = TRUE;
--//UNUSED2009-05     ClearLabelData();
- //UNUSED2009-05     ClearPivotArrays();
-+//UNUSED2009-05     maLabelArray.clear();
- //UNUSED2009-05 }
- 
--//------------------------------------------------------------------------
--
--void __EXPORT ScPivotParam::ClearLabelData()
--{
--    if ( (nLabels > 0) && ppLabelArr )
--    {
--        for ( SCSIZE i=0; i<nLabels; i++ )
--            delete ppLabelArr[i];
--        delete [] ppLabelArr;
--        ppLabelArr = NULL;
--        nLabels = 0;
--    }
--}
--
--//------------------------------------------------------------------------
--
- void __EXPORT ScPivotParam::ClearPivotArrays()
- {
-     memset( aPageArr, 0, PIVOT_MAXPAGEFIELD * sizeof(PivotField) );
-@@ -896,20 +879,17 @@ void __EXPORT ScPivotParam::ClearPivotArrays()
- 	nDataCount = 0;
- }
- 
--//------------------------------------------------------------------------
--
--void __EXPORT ScPivotParam::SetLabelData( LabelData**	pLabArr,
--										  SCSIZE		nLab )
-+void ScPivotParam::SetLabelData(const vector<ScDPLabelDataRef>& r)
- {
--	ClearLabelData();
--
--	if ( (nLab > 0) && pLabArr )
--	{
--		nLabels = (nLab>MAX_LABELS) ? MAX_LABELS : nLab;
--		ppLabelArr = new LabelData*[nLabels];
--		for ( SCSIZE i=0; i<nLabels; i++ )
--			ppLabelArr[i] = new LabelData( *(pLabArr[i]) );
--	}
-+    vector<ScDPLabelDataRef> aNewArray;
-+    aNewArray.reserve(r.size());
-+    for (vector<ScDPLabelDataRef>::const_iterator itr = r.begin(), itrEnd = r.end();
-+          itr != itrEnd; ++itr)
-+    {
-+        ScDPLabelDataRef p(new ScDPLabelData(**itr));
-+        aNewArray.push_back(p);
-+    }
-+    maLabelArray.swap(aNewArray);
- }
- 
- //------------------------------------------------------------------------
-@@ -951,10 +931,9 @@ ScPivotParam& __EXPORT ScPivotParam::operator=( const ScPivotParam& r )
- 	bMakeTotalCol	  = r.bMakeTotalCol;
- 	bMakeTotalRow	  = r.bMakeTotalRow;
- 
--	SetLabelData	( r.ppLabelArr, r.nLabels );
-     SetPivotArrays  ( r.aPageArr, r.aColArr, r.aRowArr, r.aDataArr,
-                       r.nPageCount, r.nColCount, r.nRowCount, r.nDataCount );
--
-+    SetLabelData(r.maLabelArray);
- 	return *this;
- }
- 
-@@ -969,7 +948,7 @@ BOOL __EXPORT ScPivotParam::operator==( const ScPivotParam& r ) const
- 				 && (bDetectCategories == r.bDetectCategories)
- 				 && (bMakeTotalCol == r.bMakeTotalCol)
- 				 && (bMakeTotalRow == r.bMakeTotalRow)
--				 && (nLabels 	== r.nLabels)
-+                 && (maLabelArray.size() == r.maLabelArray.size())
-                  && (nPageCount == r.nPageCount)
- 				 && (nColCount	== r.nColCount)
- 				 && (nRowCount	== r.nRowCount)
-diff --git sc/source/core/data/makefile.mk sc/source/core/data/makefile.mk
-index 2abd0d8..c631bb4 100644
---- sc/source/core/data/makefile.mk
-+++ sc/source/core/data/makefile.mk
-@@ -79,6 +79,7 @@ SLOFILES =  \
-         $(SLO)$/dpgroup.obj \
- 	$(SLO)$/dpobject.obj \
- 	$(SLO)$/dpoutput.obj \
-+	$(SLO)$/dpoutputgeometry.obj \
- 	$(SLO)$/dpsave.obj \
- 	$(SLO)$/dpsdbtab.obj \
- 	$(SLO)$/dpshttab.obj \
-@@ -141,6 +142,7 @@ EXCEPTIONSFILES= \
- 	$(SLO)$/dpsdbtab.obj \
- 	$(SLO)$/dpobject.obj \
- 	$(SLO)$/dpoutput.obj \
-+	$(SLO)$/dpoutputgeometry.obj \
- 	$(SLO)$/dpsave.obj \
- 	$(SLO)$/dbdocutl.obj \
- 	$(SLO)$/dptabsrc.obj \
-diff --git sc/source/core/data/pivot2.cxx sc/source/core/data/pivot2.cxx
-index d45cebf..924a5cd 100644
---- sc/source/core/data/pivot2.cxx
-+++ sc/source/core/data/pivot2.cxx
-@@ -492,7 +492,7 @@ ScDataObject*	ScPivotCollection::Clone() const
- 
- // ============================================================================
- 
--LabelData::LabelData( const String& rName, short nCol, bool bIsValue ) :
-+ScDPLabelData::ScDPLabelData( const String& rName, short nCol, bool bIsValue ) :
-     maName( rName ),
-     mnCol( nCol ),
-     mnFuncMask( PIVOT_FUNC_NONE ),
-diff --git sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx
-index cc449b9..f225c67 100644
---- sc/source/filter/excel/xipivot.cxx
-+++ sc/source/filter/excel/xipivot.cxx
-@@ -48,7 +48,9 @@
- #include "dpdimsave.hxx"
- #include "dpobject.hxx"
- #include "dpshttab.hxx"
-+#include "dpoutputgeometry.hxx"
- #include "scitems.hxx"
-+#include "attrib.hxx"
- 
- #include "xltracer.hxx"
- #include "xistream.hxx"
-@@ -60,6 +62,8 @@
- #include "excform.hxx"
- #include "xltable.hxx"
- 
-+#include <vector>
-+
- using ::rtl::OUString;
- using ::com::sun::star::sheet::DataPilotFieldOrientation;
- using ::com::sun::star::sheet::DataPilotFieldOrientation_DATA;
-@@ -67,6 +71,7 @@ using ::com::sun::star::sheet::DataPilotFieldSortInfo;
- using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo;
- using ::com::sun::star::sheet::DataPilotFieldLayoutInfo;
- using ::com::sun::star::sheet::DataPilotFieldReference;
-+using ::std::vector;
- 
- // ============================================================================
- // Pivot cache
-@@ -1393,6 +1398,8 @@ void XclImpPivotTable::Convert()
- 
-     GetDoc().GetDPCollection()->Insert( pDPObj );
-     mpDPObj = pDPObj;
-+
-+    ApplyMergeFlags(aOutRange, aSaveData);
- }
- 
- void XclImpPivotTable::MaybeRefresh()
-@@ -1405,6 +1412,76 @@ void XclImpPivotTable::MaybeRefresh()
-     }
- }
- 
-+void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveData& rSaveData)
-+{
-+    // Apply merge flags for varoius datapilot controls.
-+
-+    ScDPOutputGeometry aGeometry(rOutRange, false);
-+    aGeometry.setColumnFieldCount(maPTInfo.mnColFields);
-+    aGeometry.setPageFieldCount(maPTInfo.mnPageFields);
-+    aGeometry.setDataFieldCount(maPTInfo.mnDataFields);
-+
-+    // Excel includes data layout field in the row field count.  We need to 
-+    // subtract it.
-+    bool bDataLayout = maPTInfo.mnDataFields > 1;
-+    aGeometry.setRowFieldCount(maPTInfo.mnRowFields - static_cast<sal_uInt32>(bDataLayout));
-+
-+    ScDocument& rDoc = GetDoc();
-+
-+    vector<ScAddress> aPageBtns;
-+    aGeometry.getPageFieldPositions(aPageBtns);
-+    vector<ScAddress>::const_iterator itr = aPageBtns.begin(), itrEnd = aPageBtns.end();
-+    for (; itr != itrEnd; ++itr)
-+    {
-+        sal_uInt16 nMFlag = SC_MF_BUTTON;
-+        String aName;
-+        rDoc.GetString(itr->Col(), itr->Row(), itr->Tab(), aName);
-+        if (rSaveData.HasInvisibleMember(aName))
-+            nMFlag |= SC_MF_HIDDEN_MEMBER;
-+
-+        ScMergeFlagAttr aAttr(nMFlag);
-+        rDoc.ApplyAttr(itr->Col(), itr->Row(), itr->Tab(), aAttr);
-+        ScMergeFlagAttr aAttr2(SC_MF_AUTO);
-+        rDoc.ApplyAttr(itr->Col()+1, itr->Row(), itr->Tab(), aAttr2);
-+    }
-+
-+    vector<ScAddress> aColBtns;
-+    aGeometry.getColumnFieldPositions(aColBtns);
-+    itr    = aColBtns.begin();
-+    itrEnd = aColBtns.end();
-+    for (; itr != itrEnd; ++itr)
-+    {
-+        sal_Int16 nMFlag = SC_MF_BUTTON | SC_MF_BUTTON_POPUP;
-+        String aName;
-+        rDoc.GetString(itr->Col(), itr->Row(), itr->Tab(), aName);
-+        if (rSaveData.HasInvisibleMember(aName))
-+            nMFlag |= SC_MF_HIDDEN_MEMBER;
-+        ScMergeFlagAttr aAttr(nMFlag);
-+        rDoc.ApplyAttr(itr->Col(), itr->Row(), itr->Tab(), aAttr);
-+    }
-+
-+    vector<ScAddress> aRowBtns;
-+    aGeometry.getRowFieldPositions(aRowBtns);
-+    itr    = aRowBtns.begin();
-+    itrEnd = aRowBtns.end();
-+    for (; itr != itrEnd; ++itr)
-+    {
-+        sal_Int16 nMFlag = SC_MF_BUTTON | SC_MF_BUTTON_POPUP;
-+        String aName;
-+        rDoc.GetString(itr->Col(), itr->Row(), itr->Tab(), aName);
-+        if (rSaveData.HasInvisibleMember(aName))
-+            nMFlag |= SC_MF_HIDDEN_MEMBER;
-+        ScMergeFlagAttr aAttr(nMFlag);
-+        rDoc.ApplyAttr(itr->Col(), itr->Row(), itr->Tab(), aAttr);
-+    }
-+    if (bDataLayout)
-+    {
-+        --itr; // move back to the last row field position.
-+        ScMergeFlagAttr aAttr(SC_MF_BUTTON);
-+        rDoc.ApplyAttr(itr->Col()+1, itr->Row(), itr->Tab(), aAttr);
-+    }
-+}
-+
- // ============================================================================
- // ============================================================================
- 
-diff --git sc/source/filter/inc/xipivot.hxx sc/source/filter/inc/xipivot.hxx
-index 813963c..d043a95 100644
---- sc/source/filter/inc/xipivot.hxx
-+++ sc/source/filter/inc/xipivot.hxx
-@@ -363,6 +363,8 @@ public:
- 
-     void                MaybeRefresh();
- 
-+    void                ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveData& rSaveData);
-+
-     // ------------------------------------------------------------------------
- private:
-     typedef ::std::vector< XclImpPTFieldRef > XclImpPTFieldVec;
-diff --git sc/source/filter/xml/xmldpimp.cxx sc/source/filter/xml/xmldpimp.cxx
-index 9dfcd8c..3214942 100644
---- sc/source/filter/xml/xmldpimp.cxx
-+++ sc/source/filter/xml/xmldpimp.cxx
-@@ -48,6 +48,7 @@
- #include "dpgroup.hxx"
- #include "dpdimsave.hxx"
- #include "rangeutl.hxx"
-+#include "dpoutputgeometry.hxx"
- 
- #include <xmloff/xmltkmap.hxx>
- #include <xmloff/nmspmap.hxx>
-@@ -126,6 +127,10 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
- 	sDataPilotTableName(),
- 	sApplicationData(),
- 	sGrandTotal(GetXMLToken(XML_BOTH)),
-+    mnRowFieldCount(0),
-+    mnColFieldCount(0),
-+    mnPageFieldCount(0),
-+    mnDataFieldCount(0),
- 	bIsNative(sal_True),
- 	bIgnoreEmptyRows(sal_False),
- 	bIdentifyCategories(sal_False),
-@@ -262,7 +267,13 @@ SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( USHORT nPref
- }
- 
- void ScXMLDataPilotTableContext::SetButtons()
--{
-+{    
-+    ScDPOutputGeometry aGeometry(aTargetRangeAddress, bShowFilter);
-+    aGeometry.setColumnFieldCount(mnColFieldCount);
-+    aGeometry.setRowFieldCount(mnRowFieldCount);
-+    aGeometry.setPageFieldCount(mnPageFieldCount);
-+    aGeometry.setDataFieldCount(mnDataFieldCount);
-+
- 	OUString sAddress;
- 	sal_Int32 nOffset = 0;
- 	while( nOffset >= 0 )
-@@ -274,7 +285,21 @@ void ScXMLDataPilotTableContext::SetButtons()
-             sal_Int32 nAddrOffset(0);
-             if (pDoc && ScRangeStringConverter::GetAddressFromString( aScAddress, sAddress, pDoc, ::formula::FormulaGrammar::CONV_OOO, nAddrOffset ))
- 			{
--				ScMergeFlagAttr aAttr( SC_MF_BUTTON );
-+                ScDPOutputGeometry::FieldType eType = aGeometry.getFieldButtonType(aScAddress);
-+
-+                sal_Int16 nMFlag = SC_MF_BUTTON;
-+                if (eType == ScDPOutputGeometry::Column || eType == ScDPOutputGeometry::Row)
-+                    nMFlag |= SC_MF_BUTTON_POPUP;
-+
-+                // Use the cell's string value to see if this field contains a 
-+                // hidden member.  Isn't there a better way?  GetString() is
-+                // quite expensive...
-+                String aCellStr;
-+                pDoc->GetString(aScAddress.Col(), aScAddress.Row(), aScAddress.Tab(), aCellStr);
-+                if (maHiddenMemberFields.count(aCellStr))
-+                    nMFlag |= SC_MF_HIDDEN_MEMBER;
-+
-+				ScMergeFlagAttr aAttr(nMFlag);
- 				pDoc->ApplyAttr( aScAddress.Col(), aScAddress.Row(), aScAddress.Tab(), aAttr );
- 			}
- 		}
-@@ -284,7 +309,7 @@ void ScXMLDataPilotTableContext::SetButtons()
- 		pDPObject->RefreshAfterLoad();
- }
- 
--void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim)
-+void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHasHiddenMember)
- {
- 	if (pDPSave)
- 	{
-@@ -294,6 +319,30 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim)
- 				pDPSave->GetExistingDimensionByName(pDim->GetName()) )
- 			pDim->SetDupFlag( TRUE );
- 
-+        if (!pDim->IsDataLayout())
-+        {
-+            switch (pDim->GetOrientation())
-+            {
-+                case sheet::DataPilotFieldOrientation_ROW:
-+                    ++mnRowFieldCount;
-+                break;
-+                case sheet::DataPilotFieldOrientation_COLUMN:
-+                    ++mnColFieldCount;
-+                break;
-+                case sheet::DataPilotFieldOrientation_PAGE:
-+                    ++mnPageFieldCount;
-+                break;
-+                case sheet::DataPilotFieldOrientation_DATA:
-+                    ++mnDataFieldCount;
-+                break;
-+                case sheet::DataPilotFieldOrientation_HIDDEN:
-+                default:
-+                    ;
-+            }
-+
-+            if (bHasHiddenMember)
-+                maHiddenMemberFields.insert(pDim->GetName());
-+        }
- 		pDPSave->AddDimension(pDim);
- 	}
- }
-@@ -730,7 +779,8 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport,
-     bIsGroupField(sal_False),
-     bDateValue(sal_False),
-     bAutoStart(sal_False),
--    bAutoEnd(sal_False)
-+    bAutoEnd(sal_False),
-+    mbHasHiddenMember(false)
- {
- 	sal_Bool bHasName(sal_False);
- 	sal_Bool bDataLayout(sal_False);
-@@ -815,6 +865,16 @@ SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( USHORT nPref
- 	return pContext;
- }
- 
-+void ScXMLDataPilotFieldContext::AddMember(ScDPSaveMember* pMember)
-+{
-+    if (pDim)
-+        pDim->AddMember(pMember);
-+
-+    if (!pMember->GetIsVisible())
-+        // This member is hidden.
-+        mbHasHiddenMember = true;
-+}
-+
- void ScXMLDataPilotFieldContext::AddGroup(const ::std::vector<rtl::OUString>& rMembers, const rtl::OUString& rName)
- {
-     ScXMLDataPilotGroup aGroup;
-@@ -835,7 +895,7 @@ void ScXMLDataPilotFieldContext::EndElement()
-             String sPage(sSelectedPage);
-             pDim->SetCurrentPage(&sPage);
-         }
--		pDataPilotTable->AddDimension(pDim);
-+		pDataPilotTable->AddDimension(pDim, mbHasHiddenMember);
-         if (bIsGroupField)
-         {            
-             ScDPNumGroupInfo aInfo;
-diff --git sc/source/filter/xml/xmldpimp.hxx sc/source/filter/xml/xmldpimp.hxx
-index 25450c3..ac52bc3 100644
---- sc/source/filter/xml/xmldpimp.hxx
-+++ sc/source/filter/xml/xmldpimp.hxx
-@@ -41,6 +41,8 @@
- #include "dpobject.hxx"
- #include "dpsave.hxx"
- 
-+#include <hash_set>
-+
- class ScXMLImport;
- class ScDPSaveNumGroupDimension;
- class ScDPSaveGroupDimension;
-@@ -79,6 +81,8 @@ public:
- 
- class ScXMLDataPilotTableContext : public SvXMLImportContext
- {
-+    typedef ::std::hash_set< ::rtl::OUString, ::rtl::OUStringHash > StringSet;
-+    StringSet       maHiddenMemberFields;
- 	ScDocument*		pDoc;
- 	ScDPObject*		pDPObject;
- 	ScDPSaveData*	pDPSave;
-@@ -100,6 +104,10 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext
- 	ScAddress		aFilterOutputPosition;
- 	ScQueryParam	aSourceQueryParam;
- 	ScMySourceType	nSourceType;
-+    sal_uInt32      mnRowFieldCount;
-+    sal_uInt32      mnColFieldCount;
-+    sal_uInt32      mnPageFieldCount;
-+    sal_uInt32      mnDataFieldCount;
- 	sal_Bool		bIsNative;
- 	sal_Bool		bIgnoreEmptyRows;
- 	sal_Bool		bIdentifyCategories;
-@@ -148,7 +156,7 @@ public:
- 	void SetFilterSourceRange(const ScRange& aValue) { aFilterSourceRange = aValue; }
- //	void SetFilterIsCaseSensitive(const sal_Bool bValue) { aSourceQueryParam.bCaseSens = bValue; }
- //	void SetFilterSkipDuplicates(const sal_Bool bValue) { aSourceQueryParam.bDuplicate = !bValue; }
--	void AddDimension(ScDPSaveDimension* pDim);
-+	void AddDimension(ScDPSaveDimension* pDim, bool bHasHiddenMember);
-     void AddGroupDim(const ScDPSaveNumGroupDimension& aNumGroupDim);
-     void AddGroupDim(const ScDPSaveGroupDimension& aGroupDim);
- 	void SetButtons();
-@@ -301,12 +309,13 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext
-     sal_Int32                   nGroupPart;
- 	sal_Int16					nFunction;
- 	sal_Int16					nOrientation;
--	sal_Bool					bShowEmpty;
--    sal_Bool                    bSelectedPage;
--    sal_Bool                    bIsGroupField;
--    sal_Bool                    bDateValue;
--    sal_Bool                    bAutoStart;
--    sal_Bool                    bAutoEnd;
-+	sal_Bool					bShowEmpty:1;
-+    sal_Bool                    bSelectedPage:1;
-+    sal_Bool                    bIsGroupField:1;
-+    sal_Bool                    bDateValue:1;
-+    sal_Bool                    bAutoStart:1;
-+    sal_Bool                    bAutoEnd:1;
-+    bool                        mbHasHiddenMember:1;
- 
- 	const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- 	ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-@@ -330,7 +339,7 @@ public:
- 
- 	void SetShowEmpty(const sal_Bool bValue) { if (pDim) pDim->SetShowEmpty(bValue); }
- 	void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); }
--	void AddMember(ScDPSaveMember* pMember) { if (pDim) pDim->AddMember(pMember); }
-+	void AddMember(ScDPSaveMember* pMember);
-     void SetFieldReference(const com::sun::star::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); }
-     void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); }
-     void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); }
-diff --git sc/source/ui/cctrl/dpcontrol.cxx sc/source/ui/cctrl/dpcontrol.cxx
-new file mode 100644
-index 0000000..e188ab3
---- /dev/null
-+++ sc/source/ui/cctrl/dpcontrol.cxx
-@@ -0,0 +1,479 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: document.hxx,v $
-+ * $Revision: 1.115.36.9 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_sc.hxx"
-+
-+// INCLUDE ---------------------------------------------------------------
-+
-+#include "dpcontrol.hxx"
-+
-+#include "vcl/outdev.hxx"
-+#include "vcl/settings.hxx"
-+#include "vcl/wintypes.hxx"
-+
-+using ::rtl::OUString;
-+using ::rtl::OUStringHash;
-+using ::std::vector;
-+using ::std::hash_map;
-+
-+ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle) :
-+    mpOutDev(pOutDev),
-+    mpStyle(pStyle),
-+    mbPopupButton(false),
-+    mbHasHiddenMember(false)
-+{
-+}
-+
-+ScDPFieldButton::~ScDPFieldButton()
-+{
-+}
-+
-+void ScDPFieldButton::setText(const OUString& rText)
-+{
-+    maText = rText;
-+}
-+
-+void ScDPFieldButton::setBoundingBox(const Point& rPos, const Size& rSize)
-+{
-+    maPos = rPos;
-+    maSize = rSize;
-+}
-+
-+void ScDPFieldButton::setDrawPopupButton(bool b)
-+{
-+    mbPopupButton = b;
-+}
-+
-+void ScDPFieldButton::setHasHiddenMember(bool b)
-+{
-+    mbHasHiddenMember = b;
-+}
-+
-+void ScDPFieldButton::draw()
-+{
-+    const long nMargin = 2;
-+    
-+    // Background
-+    Rectangle aRect(maPos, maSize);
-+    mpOutDev->SetLineColor(mpStyle->GetFaceColor());
-+    mpOutDev->SetFillColor(mpStyle->GetFaceColor());
-+    mpOutDev->DrawRect(aRect);
-+
-+    // Border lines
-+    mpOutDev->SetLineColor(mpStyle->GetLightColor());
-+    mpOutDev->DrawLine(Point(maPos), Point(maPos.X(), maPos.Y()+maSize.Height()-1));
-+    mpOutDev->DrawLine(Point(maPos), Point(maPos.X()+maSize.Width()-1, maPos.Y()));
-+
-+    mpOutDev->SetLineColor(mpStyle->GetShadowColor());
-+    mpOutDev->DrawLine(Point(maPos.X(), maPos.Y()+maSize.Height()-1),
-+                       Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
-+    mpOutDev->DrawLine(Point(maPos.X()+maSize.Width()-1, maPos.Y()),
-+                       Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
-+
-+    // Field name
-+    Font aTextFont( mpStyle->GetLabelFont() );
-+    aTextFont.SetHeight(12);
-+    mpOutDev->SetFont(aTextFont);
-+
-+    Point aTextPos = maPos;
-+    long nTHeight = mpOutDev->GetTextHeight();
-+    aTextPos.setX(maPos.getX() + nMargin);
-+    aTextPos.setY(maPos.getY() + (maSize.Height()-nTHeight)/2);
-+    mpOutDev->DrawText(aTextPos, maText);
-+
-+    if (mbPopupButton)
-+        drawPopupButton();
-+}
-+
-+void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const
-+{
-+    long nW = maSize.getWidth()*0.5;
-+    long nH = maSize.getHeight();
-+    if (nW > 16) 
-+        nW = 16;
-+    if (nH > 18)
-+        nH = 18;
-+
-+    rPos.setX(maPos.getX() + maSize.getWidth() - nW);
-+    rPos.setY(maPos.getY() + maSize.getHeight() - nH);
-+    rSize.setWidth(nW);
-+    rSize.setHeight(nH);
-+}
-+
-+bool ScDPFieldButton::isPopupButton() const
-+{
-+    return mbPopupButton;
-+}
-+
-+void ScDPFieldButton::drawPopupButton()
-+{
-+    Point aPos;
-+    Size aSize;
-+    getPopupBoundingBox(aPos, aSize);
-+
-+    // border lines
-+    mpOutDev->SetLineColor(mpStyle->GetLightColor());
-+    mpOutDev->DrawLine(aPos, Point(aPos.X(), aPos.Y()+aSize.Height()-1));
-+    mpOutDev->DrawLine(aPos, Point(aPos.X()+aSize.Width()-1, aPos.Y()));
-+
-+    mpOutDev->SetLineColor(mpStyle->GetShadowColor());
-+    mpOutDev->DrawLine(Point(aPos.X(), aPos.Y()+aSize.Height()-1),
-+                       Point(aPos.X()+aSize.Width()-1, aPos.Y()+aSize.Height()-1));
-+    mpOutDev->DrawLine(Point(aPos.X()+aSize.Width()-1, aPos.Y()),
-+                       Point(aPos.X()+aSize.Width()-1, aPos.Y()+aSize.Height()-1));
-+
-+    // the arrowhead
-+    Color aArrowColor = mbHasHiddenMember ? mpStyle->GetHighlightLinkColor() : mpStyle->GetButtonTextColor();
-+    mpOutDev->SetLineColor(aArrowColor);
-+    mpOutDev->SetFillColor(aArrowColor);
-+    Point aCenter(aPos.X() + (aSize.Width() >> 1), aPos.Y() + (aSize.Height() >> 1));
-+    Point aPos1, aPos2;
-+    aPos1.X() = aCenter.X() - 4;
-+    aPos2.X() = aCenter.X() + 4;
-+    aPos1.Y() = aCenter.Y() - 3;
-+    aPos2.Y() = aCenter.Y() - 3;
-+
-+    do
-+    {
-+        ++aPos1.X();
-+        --aPos2.X();
-+        ++aPos1.Y();
-+        ++aPos2.Y();
-+        mpOutDev->DrawLine(aPos1, aPos2);
-+    }
-+    while (aPos1 != aPos2);
-+
-+    if (mbHasHiddenMember)
-+    {
-+        // tiny little box to display in presence of hidden member(s).
-+        Point aBoxPos(aPos.X() + aSize.Width() - 5, aPos.Y() + aSize.Height() - 5);
-+        Size aBoxSize(3, 3);
-+        mpOutDev->DrawRect(Rectangle(aBoxPos, aBoxSize));
-+    }
-+}
-+
-+// ============================================================================
-+
-+ScDPFieldPopupWindow::Member::Member() :
-+    mbVisible(true)
-+{
-+}
-+
-+// ----------------------------------------------------------------------------
-+
-+ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent) :
-+    FloatingWindow(pParent, (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER)),
-+    maCheck0(this, 0),
-+    maCheck1(this, 0),
-+    maCheck2(this, 0),
-+    maCheck3(this, 0),
-+    maCheck4(this, 0),
-+    maCheck5(this, 0),
-+    maCheck6(this, 0),
-+    maCheck7(this, 0),
-+    maCheck8(this, 0),
-+    maCheck9(this, 0),
-+    maCheck10(this, 0),
-+    maCheck11(this, 0),
-+    maScrollBar(this, WB_VERT),
-+    maBtnOk(this),
-+    maBtnCancel(this),
-+    mpExtendedData(NULL),
-+    mpOKAction(NULL),
-+    mnScrollPos(0)
-+{
-+    SetOutputSizePixel(Size(150, 280));
-+    Size aOutSize = GetOutputSizePixel();
-+
-+    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
-+
-+    mpCheckPtr.reserve(12);
-+    mpCheckPtr.push_back(&maCheck0);
-+    mpCheckPtr.push_back(&maCheck1);
-+    mpCheckPtr.push_back(&maCheck2);
-+    mpCheckPtr.push_back(&maCheck3);
-+    mpCheckPtr.push_back(&maCheck4);
-+    mpCheckPtr.push_back(&maCheck5);
-+    mpCheckPtr.push_back(&maCheck6);
-+    mpCheckPtr.push_back(&maCheck7);
-+    mpCheckPtr.push_back(&maCheck8);
-+    mpCheckPtr.push_back(&maCheck9);
-+    mpCheckPtr.push_back(&maCheck10);
-+    mpCheckPtr.push_back(&maCheck11);
-+    
-+    Point aPos;
-+    Size aSize;
-+    getSectionPosSize(aPos, aSize, FIRST_LISTITEM);    
-+    Font aMemFont(rStyle.GetLabelFont());
-+    aMemFont.SetHeight(11);
-+    for (vector<CheckBox*>::iterator itr = mpCheckPtr.begin(), itrEnd = mpCheckPtr.end();
-+          itr != itrEnd; ++itr)
-+    {
-+        CheckBox* p = *itr;
-+        p->SetPosSizePixel(aPos, aSize);
-+        p->SetFont(aMemFont);
-+        p->SetClickHdl( LINK(this, ScDPFieldPopupWindow, CheckBoxHdl) );
-+        aPos.Y() += 18;
-+    }
-+
-+    getSectionPosSize(aPos, aSize, BTN_OK);
-+    maBtnOk.SetPosSizePixel(aPos, aSize);
-+    maBtnOk.SetFont(aMemFont);
-+    maBtnOk.SetClickHdl( LINK(this, ScDPFieldPopupWindow, OKButtonHdl) );
-+    maBtnOk.Show();
-+
-+    getSectionPosSize(aPos, aSize, BTN_CANCEL);
-+    maBtnCancel.SetPosSizePixel(aPos, aSize);
-+    maBtnCancel.SetFont(aMemFont);
-+    maBtnCancel.Show();
-+
-+    getSectionPosSize(aPos, aSize, SCROLL_BAR_V);
-+    maScrollBar.SetPosSizePixel(aPos, aSize);
-+    maScrollBar.SetPageSize(mpCheckPtr.size());
-+    maScrollBar.SetVisibleSize(mpCheckPtr.size());
-+    maScrollBar.SetLineSize(1);
-+    maScrollBar.SetScrollHdl( LINK(this, ScDPFieldPopupWindow, ScrollHdl) );
-+    maScrollBar.EnableDrag(true);
-+}
-+
-+vector<ScDPFieldPopupWindow::Member>& ScDPFieldPopupWindow::getMembers()
-+{
-+    return maMembers;
-+}
-+
-+void ScDPFieldPopupWindow::getSectionPosSize(Point& rPos, Size& rSize, SectionType eType) const
-+{
-+    static const long nListBoxMargin = 5;
-+    static const long nBottomBtnAreaHeight = 50;
-+    static const long nInnerItemMargin = 5;
-+    static const long nScrollBarWidth = 17;
-+    static const long nBtnWidth = 60;
-+    static const long nBtnHeight = 22;
-+    static const long nBottomMargin = 10;
-+
-+    const Size& rWndSize = GetSizePixel();
-+
-+    switch (eType)
-+    {
-+        case WHOLE:
-+            rPos  = Point(0, 0);
-+            rSize = rWndSize;
-+        break;
-+        case LISTBOX_AREA:
-+        {
-+            rPos = Point(nListBoxMargin, nListBoxMargin);
-+            rSize = Size(
-+                rWndSize.Width() -  nListBoxMargin*2, 
-+                rWndSize.Height() - nListBoxMargin - nBottomBtnAreaHeight);
-+        }
-+        break;
-+        case FIRST_LISTITEM:
-+        {
-+            rPos = Point(nListBoxMargin + nInnerItemMargin,
-+                         nListBoxMargin + nInnerItemMargin);
-+            rSize = Size(
-+                rWndSize.Width() - nListBoxMargin*2 - nInnerItemMargin - nScrollBarWidth - 10,
-+                17);
-+        }
-+        break;
-+        case BTN_OK:
-+        {
-+            long x = (rWndSize.Width() - nBtnWidth*2)/3;
-+            long y = rWndSize.Height() - nBottomMargin - nBtnHeight;
-+            rPos = Point(x, y);
-+            rSize = Size(nBtnWidth, nBtnHeight);
-+        }
-+        break;
-+        case BTN_CANCEL:
-+        {
-+            long x = (rWndSize.Width() - nBtnWidth*2)/3*2 + nBtnWidth;
-+            long y = rWndSize.Height() - nBottomMargin - nBtnHeight;
-+            rPos = Point(x, y);
-+            rSize = Size(nBtnWidth, nBtnHeight);
-+        }
-+        break;
-+        case SCROLL_BAR_V:
-+        {
-+            long x = rWndSize.Width() - nListBoxMargin - nInnerItemMargin - nScrollBarWidth;
-+            long y = nListBoxMargin + nInnerItemMargin;
-+            rPos = Point(x, y);
-+            long h = rWndSize.Height() - nListBoxMargin - nBottomBtnAreaHeight - nInnerItemMargin*2;
-+            rSize = Size(nScrollBarWidth, h);
-+        }
-+        break;
-+        default:
-+            ;
-+    }
-+}
-+
-+void ScDPFieldPopupWindow::resetDisplayedItems()
-+{
-+    long nScrollPos = maScrollBar.GetThumbPos();
-+    if (nScrollPos < 0)
-+        return;
-+
-+    mnScrollPos = static_cast<size_t>(nScrollPos);
-+    size_t nCheckCount = mpCheckPtr.size();
-+    for (size_t i = 0; i < nCheckCount; ++i)
-+    {
-+        CheckBox* p = mpCheckPtr[i];
-+        p->SetText(maMembers[i+mnScrollPos].maName);
-+        TriState nNewState = maMembers[i+mnScrollPos].mbVisible ? STATE_CHECK : STATE_NOCHECK;
-+        p->SetState(nNewState);
-+    }
-+}
-+
-+IMPL_LINK( ScDPFieldPopupWindow, CheckBoxHdl, CheckBox*, pCheck )
-+{
-+    vector<CheckBox*>::const_iterator itr, itrBeg = mpCheckPtr.begin(), itrEnd = mpCheckPtr.end();
-+    for (itr = itrBeg; itr != itrEnd; ++itr)
-+    {
-+        if (*itr == pCheck)
-+        {
-+            size_t nIndex = ::std::distance(itrBeg, itr);
-+            maMembers[nIndex+mnScrollPos].mbVisible = !maMembers[nIndex+mnScrollPos].mbVisible;
-+        }
-+    }
-+    return 0;
-+}
-+
-+IMPL_LINK( ScDPFieldPopupWindow, OKButtonHdl, OKButton*, EMPTYARG )
-+{
-+    close(true);
-+    return 0;
-+}
-+
-+IMPL_LINK( ScDPFieldPopupWindow, ScrollHdl, ScrollBar*, EMPTYARG )
-+{
-+    resetDisplayedItems();
-+    return 0;
-+}
-+
-+ScDPFieldPopupWindow::~ScDPFieldPopupWindow()
-+{
-+    EndPopupMode();
-+}
-+
-+void ScDPFieldPopupWindow::Paint(const Rectangle& rRect)
-+{
-+    Window::Paint(rRect);
-+
-+    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
-+    Color aBackColor = rStyle.GetMenuColor();
-+    Color aBorderColor = rStyle.GetShadowColor();
-+    Color aMemberBackColor = rStyle.GetFieldColor();
-+
-+    Point aPos;
-+    Size aSize;
-+
-+    // Window background
-+    SetFillColor(aBackColor);
-+    SetLineColor(aBorderColor);
-+    getSectionPosSize(aPos, aSize, WHOLE);
-+    DrawRect(Rectangle(aPos,aSize));
-+
-+    // Member list box background
-+    SetFillColor(aMemberBackColor);
-+    getSectionPosSize(aPos, aSize, LISTBOX_AREA);
-+    DrawRect(Rectangle(aPos,aSize));
-+}
-+
-+void ScDPFieldPopupWindow::setMemberSize(size_t n)
-+{
-+    maMembers.reserve(n);
-+}
-+
-+void ScDPFieldPopupWindow::addMember(const OUString& rName, bool bVisible)
-+{
-+    Member aMember;
-+    aMember.maName = rName;
-+    aMember.mbVisible = bVisible;
-+    maMembers.push_back(aMember);
-+}
-+
-+void ScDPFieldPopupWindow::initMembers()
-+{
-+    size_t nMemCount = maMembers.size();
-+    size_t nCheckCount = mpCheckPtr.size();
-+    bool bNeedsScroll = false;
-+    if (nMemCount > nCheckCount)
-+    {    
-+        nMemCount = nCheckCount;
-+        bNeedsScroll = true;
-+    }
-+
-+    for (size_t i = 0; i < nMemCount; ++i)
-+    {
-+        CheckBox* p = mpCheckPtr[i];
-+        p->SetText(maMembers[i].maName);
-+        p->Show();
-+        p->SetState(maMembers[i].mbVisible ? STATE_CHECK : STATE_NOCHECK);
-+    }
-+    if (bNeedsScroll)
-+    {
-+        maScrollBar.SetRange(Range(0, maMembers.size()));
-+        maScrollBar.Show();
-+    }
-+}
-+
-+void ScDPFieldPopupWindow::getResult(hash_map<OUString, bool, OUStringHash>& rResult)
-+{
-+    typedef hash_map<OUString, bool, OUStringHash> ResultMap;
-+    ResultMap aResult;
-+    vector<Member>::const_iterator itr = maMembers.begin(), itrEnd = maMembers.end();
-+    for (; itr != itrEnd; ++itr)
-+        aResult.insert(ResultMap::value_type(itr->maName, itr->mbVisible));
-+    rResult.swap(aResult);
-+}
-+
-+void ScDPFieldPopupWindow::close(bool bOK)
-+{
-+    if (bOK && mpOKAction.get())
-+        mpOKAction->execute();
-+
-+    EndPopupMode();
-+}
-+
-+void ScDPFieldPopupWindow::setExtendedData(ExtendedData* p)
-+{
-+    mpExtendedData.reset(p);
-+}
-+
-+ScDPFieldPopupWindow::ExtendedData* ScDPFieldPopupWindow::getExtendedData()
-+{
-+    return mpExtendedData.get();
-+}
-+
-+void ScDPFieldPopupWindow::setOKAction(OKAction* p)
-+{
-+    mpOKAction.reset(p);
-+}
-+
-diff --git sc/source/ui/cctrl/makefile.mk sc/source/ui/cctrl/makefile.mk
-index 4cce7f6..8e8add3 100644
---- sc/source/ui/cctrl/makefile.mk
-+++ sc/source/ui/cctrl/makefile.mk
-@@ -51,6 +51,7 @@ SLOFILES =	\
- 		$(SLO)$/popmenu.obj		\
- 		$(SLO)$/tbinsert.obj	\
- 		$(SLO)$/cbuttonw.obj	\
-+		$(SLO)$/dpcontrol.obj	\
- 		$(SLO)$/editfield.obj	\
- 		$(EXCEPTIONSFILES)
- 
-@@ -59,6 +60,7 @@ LIB1OBJFILES= \
- 		$(SLO)$/popmenu.obj		\
- 		$(SLO)$/tbinsert.obj	\
- 		$(SLO)$/cbuttonw.obj	\
-+		$(SLO)$/dpcontrol.obj	\
- 		$(SLO)$/tbzoomsliderctrl.obj
- 
- # --- Tagets -------------------------------------------------------
-diff --git sc/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
-index 4dee615..588a290 100644
---- sc/source/ui/dbgui/pvlaydlg.cxx
-+++ sc/source/ui/dbgui/pvlaydlg.cxx
-@@ -64,6 +64,7 @@
- #include "scabstdlg.hxx" //CHINA001
- using namespace com::sun::star;
- using ::rtl::OUString;
-+using ::std::vector;
- 
- //----------------------------------------------------------------------------
- 
-@@ -391,26 +392,25 @@ void ScDPLayoutDlg::StateChanged( StateChangedType nStateChange )
- 
- //----------------------------------------------------------------------------
- 
--void ScDPLayoutDlg::InitWndSelect( LabelData** ppLabelArr, long nLabels )
-+void ScDPLayoutDlg::InitWndSelect( const vector<ScDPLabelDataRef>& rLabels )
- {
--	if ( ppLabelArr )
--	{
--        size_t nLabelCount = static_cast< size_t >( (nLabels > MAX_LABELS) ? MAX_LABELS : nLabels );
--        size_t nLast = (nLabelCount > PAGE_SIZE) ? (PAGE_SIZE - 1) : (nLabelCount - 1);
-+    size_t nLabelCount = rLabels.size();
-+    if (nLabelCount > MAX_LABELS)
-+        nLabelCount = MAX_LABELS;
-+    size_t nLast = (nLabelCount > PAGE_SIZE) ? (PAGE_SIZE - 1) : (nLabelCount - 1);
- 
--        aLabelDataArr.clear();
--        aLabelDataArr.reserve( nLabelCount );
--        for ( size_t i=0; i < nLabelCount; i++ )
--		{
--            aLabelDataArr.push_back( *ppLabelArr[i] );
-+    aLabelDataArr.clear();
-+    aLabelDataArr.reserve( nLabelCount );
-+    for ( size_t i=0; i < nLabelCount; i++ )
-+    {
-+        aLabelDataArr.push_back(*rLabels[i]);
- 
--			if ( i <= nLast )
--			{
--                aWndSelect.AddField( aLabelDataArr[i].maName, i );
--                aSelectArr[i].reset( new ScDPFuncData( aLabelDataArr[i].mnCol, aLabelDataArr[i].mnFuncMask ) );
--			}
--		}
--	}
-+        if ( i <= nLast )
-+        {
-+            aWndSelect.AddField( aLabelDataArr[i].maName, i );
-+            aSelectArr[i].reset( new ScDPFuncData( aLabelDataArr[i].mnCol, aLabelDataArr[i].mnFuncMask ) );
-+        }
-+    }
- }
- 
- 
-@@ -506,18 +506,19 @@ void ScDPLayoutDlg::InitFocus()
- 
- void ScDPLayoutDlg::InitFields()
- {
--    InitWndSelect( thePivotData.ppLabelArr, static_cast<long>(thePivotData.nLabels) );
-+    InitWndSelect(thePivotData.maLabelArray);
-     InitWnd( thePivotData.aPageArr, static_cast<long>(thePivotData.nPageCount), TYPE_PAGE );
-     InitWnd( thePivotData.aColArr,  static_cast<long>(thePivotData.nColCount),  TYPE_COL );
-     InitWnd( thePivotData.aRowArr,  static_cast<long>(thePivotData.nRowCount),  TYPE_ROW );
-     InitWnd( thePivotData.aDataArr, static_cast<long>(thePivotData.nDataCount), TYPE_DATA );
- 
-+    size_t nLabels = thePivotData.maLabelArray.size();
-     aSlider.SetPageSize( PAGE_SIZE );
-     aSlider.SetVisibleSize( PAGE_SIZE );
-     aSlider.SetLineSize( LINE_SIZE );
--    aSlider.SetRange( Range( 0, static_cast<long>(((thePivotData.nLabels+LINE_SIZE-1)/LINE_SIZE)*LINE_SIZE) ) );
-+    aSlider.SetRange( Range( 0, static_cast<long>(((nLabels+LINE_SIZE-1)/LINE_SIZE)*LINE_SIZE) ) );
- 
--    if ( thePivotData.nLabels > PAGE_SIZE )
-+    if ( nLabels > PAGE_SIZE )
-     {
-         aSlider.SetEndScrollHdl( LINK( this, ScDPLayoutDlg, ScrollHdl ) );
-         aSlider.Show();
-diff --git sc/source/ui/inc/dpcontrol.hxx sc/source/ui/inc/dpcontrol.hxx
-new file mode 100644
-index 0000000..6a28354
---- /dev/null
-+++ sc/source/ui/inc/dpcontrol.hxx
-@@ -0,0 +1,193 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: document.hxx,v $
-+ * $Revision: 1.115.36.9 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SC_DPCONTROL_HXX
-+#define SC_DPCONTROL_HXX
-+
-+#include "rtl/ustring.hxx"
-+#include "tools/gen.hxx"
-+#include "vcl/floatwin.hxx"
-+#include "vcl/button.hxx"
-+#include "vcl/scrbar.hxx"
-+
-+#include <memory>
-+#include <hash_map>
-+
-+class OutputDevice;
-+class Point;
-+class Size;
-+class StyleSettings;
-+class Window;
-+
-+/** 
-+ * This class takes care of physically drawing field button controls inside 
-+ * data pilot tables. 
-+ */
-+class ScDPFieldButton
-+{
-+public:
-+    ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle);
-+    ~ScDPFieldButton();
-+
-+    void setText(const ::rtl::OUString& rText);
-+    void setBoundingBox(const Point& rPos, const Size& rSize);
-+    void setDrawPopupButton(bool b);
-+    void setHasHiddenMember(bool b);
-+    void draw();
-+
-+    void getPopupBoundingBox(Point& rPos, Size& rSize) const;
-+    bool isPopupButton() const;
-+
-+private:
-+    void drawPopupButton();
-+
-+private:
-+    Point                   maPos;
-+    Size                    maSize;
-+    ::rtl::OUString         maText;
-+    OutputDevice*           mpOutDev;
-+    const StyleSettings*    mpStyle;
-+    bool                    mbPopupButton;
-+    bool                    mbHasHiddenMember;
-+};
-+
-+// ============================================================================
-+
-+/** 
-+ * This class implements a popup window for field button, for quick access 
-+ * of hide-item list, and possibly more stuff related to field options. 
-+ */
-+class ScDPFieldPopupWindow : public FloatingWindow
-+{
-+public:
-+    class ButtonEvent
-+    {
-+    public:
-+        virtual void execute() = 0;
-+    };
-+
-+    /** 
-+     * Extended data that the client code may need to store.  Create a 
-+     * sub-class of this and store data there. 
-+     */ 
-+    struct ExtendedData {};
-+
-+    /** 
-+     * Action to perform when the OK button is pressed.  Create a sub-class of 
-+     * this to implement the desired action.
-+     */
-+    class OKAction
-+    {
-+    public:
-+        virtual void execute() = 0;
-+    };
-+
-+    explicit ScDPFieldPopupWindow(Window* pParent);
-+    virtual ~ScDPFieldPopupWindow();
-+
-+    virtual void Paint(const Rectangle& rRect);
-+
-+    void setMemberSize(size_t n);
-+    void addMember(const ::rtl::OUString& rName, bool bVisible);
-+    void initMembers();
-+    void getResult(::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rResult);
-+    void close(bool bOK);
-+
-+    /** 
-+     * Set auxiliary data that the client code might need.  Note that this 
-+     * popup window class manages its life time; no explicit deletion of the 
-+     * instance is needed in the client code.
-+     */
-+    void setExtendedData(ExtendedData* p);
-+
-+    /** 
-+     * Get the store auxiliary data, or NULL if no such data is stored.
-+     */
-+    ExtendedData* getExtendedData();
-+
-+    void setOKAction(OKAction* p);
-+
-+private:
-+    struct Member
-+    {
-+        ::rtl::OUString maName;
-+        bool            mbVisible;
-+
-+        Member();
-+    };
-+
-+    ::std::vector<Member>& getMembers();
-+
-+    enum SectionType {
-+        WHOLE,          // entire window
-+        LISTBOX_AREA,   // box enclosing the check box items.
-+        FIRST_LISTITEM, // first list item at the top
-+        BTN_OK,         // OK button
-+        BTN_CANCEL,     // Cancel button
-+        SCROLL_BAR_V,   // vertical scroll bar along the right edge of the list box.
-+    };
-+    void getSectionPosSize(Point& rPos, Size& rSize, SectionType eType) const;
-+
-+    void resetDisplayedItems();
-+
-+    DECL_LINK( CheckBoxHdl, CheckBox* );
-+    DECL_LINK( OKButtonHdl, OKButton* );
-+    DECL_LINK( ScrollHdl, ScrollBar* );
-+
-+private:
-+
-+    CheckBox maCheck0;
-+    CheckBox maCheck1;
-+    CheckBox maCheck2;
-+    CheckBox maCheck3;
-+    CheckBox maCheck4;
-+    CheckBox maCheck5;
-+    CheckBox maCheck6;
-+    CheckBox maCheck7;
-+    CheckBox maCheck8;
-+    CheckBox maCheck9;
-+    CheckBox maCheck10;
-+    CheckBox maCheck11;
-+
-+    ScrollBar   maScrollBar;
-+
-+    OKButton        maBtnOk;
-+    CancelButton    maBtnCancel;
-+
-+    ::std::vector<CheckBox*> mpCheckPtr;
-+
-+    ::std::vector<Member>           maMembers;
-+    ::std::auto_ptr<ExtendedData>   mpExtendedData;
-+    ::std::auto_ptr<OKAction>       mpOKAction;
-+
-+    size_t mnScrollPos;
-+};
-+
-+#endif
-diff --git sc/source/ui/inc/gridwin.hxx sc/source/ui/inc/gridwin.hxx
-index 2946c39..30b563b 100644
---- sc/source/ui/inc/gridwin.hxx
-+++ sc/source/ui/inc/gridwin.hxx
-@@ -39,6 +39,7 @@
- #include <svx/sdr/overlay/overlayobject.hxx>
- 
- #include <vector>
-+#include <memory>
- 
- // ---------------------------------------------------------------------------
- 
-@@ -48,6 +49,7 @@ class ScViewSelectionEngine;
- class ScPivot;
- #endif
- class ScDPObject;
-+class ScDPFieldPopupWindow;
- class ScOutputData;
- class ScFilterListBox;
- class AutoFilterPopup;
-@@ -160,6 +162,7 @@ private:
- 
- 	ScFilterListBox*		pFilterBox;
- 	FloatingWindow*			pFilterFloat;
-+    ::std::auto_ptr<ScDPFieldPopupWindow> mpDPFieldPopup;
- 
- 	USHORT					nCursorHideCount;
- 
-@@ -246,6 +249,16 @@ private:
- 	void			DPMouseButtonUp( const MouseEvent& rMEvt );
- 	void			DPTestMouse( const MouseEvent& rMEvt, BOOL bMove );
- 
-+    /** 
-+     * Check if the mouse click is on a field popup button. 
-+     *  
-+     * @return bool true if the field popup menu has been launched and no 
-+     *         further mouse event handling is necessary, false otherwise.
-+     */
-+    bool            DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, ScDPObject* pDPObj);
-+    void            DPLaunchFieldPopupMenu(
-+        const Point& rSrcPos, const Size& rSrcSize, const ScAddress& rPos, ScDPObject* pDPObj);
-+
- 	void			RFMouseMove( const MouseEvent& rMEvt, BOOL bUp );
- 
- 	void			PagebreakMove( const MouseEvent& rMEvt, BOOL bUp );
-@@ -419,6 +432,8 @@ public:
- 
- 	void			CheckNeedsRepaint();
- 
-+    void            UpdateDPFromFieldPopupMenu();
-+
- 	// #114409#
- 	void CursorChanged();
- 	void DrawLayerCreated();
-diff --git sc/source/ui/inc/pvlaydlg.hxx sc/source/ui/inc/pvlaydlg.hxx
-index a3e08cb..ed388d4 100644
---- sc/source/ui/inc/pvlaydlg.hxx
-+++ sc/source/ui/inc/pvlaydlg.hxx
-@@ -192,7 +192,7 @@ private:
- private:
-     ScDPFieldWindow&        GetFieldWindow  ( ScDPFieldType eType );
-     void                    Init            (bool bNewOutput);
--    void                    InitWndSelect   ( LabelData** ppLabelArr, long nLabels );
-+    void                    InitWndSelect   ( const ::std::vector<ScDPLabelDataRef>& rLabels );
-     void                    InitWnd         ( PivotField* pArr, long nCount, ScDPFieldType eType );
-     void                    InitFocus       ();
-     void                    InitFields      ();
---- sc/source/ui/view/gridwin.cxx
-+++ sc/source/ui/view/gridwin.cxx
-@@ -121,6 +121,7 @@
- #include "tabprotection.hxx"
- #include "clipparam.hxx"
- #include "postit.hxx"
-+#include "dpcontrol.hxx"
- 
- // #114409#
- #include <vcl/salbtype.hxx>		// FRound
-@@ -407,6 +408,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic
- 			pNoteMarker( NULL ),
- 			pFilterBox( NULL ),
- 			pFilterFloat( NULL ),
-+            mpDPFieldPopup(NULL),
- 			nCursorHideCount( 0 ),
- 			bMarking( FALSE ),
- 			nButtonDown( 0 ),
-diff --git sc/source/ui/view/gridwin2.cxx sc/source/ui/view/gridwin2.cxx
-index c6f589e..40af470 100644
---- sc/source/ui/view/gridwin2.cxx
-+++ sc/source/ui/view/gridwin2.cxx
-@@ -55,11 +55,20 @@
- #include "dpoutput.hxx"		// ScDPPositionData
- #include "dpshttab.hxx"
- #include "dbdocfun.hxx"
-+#include "dpcontrol.hxx"
- 
- #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
- #include "scabstdlg.hxx" //CHINA001
--using namespace com::sun::star;
- 
-+#include <vector>
-+#include <hash_map>
-+
-+using namespace com::sun::star;
-+using ::std::vector;
-+using ::std::auto_ptr;
-+using ::std::hash_map;
-+using ::rtl::OUString;
-+using ::rtl::OUStringHash;
- 
- // STATIC DATA -----------------------------------------------------------
- 
-@@ -199,6 +208,15 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
- 			bDPMouse   = TRUE;
- 			nDPField   = nField;
- 			pDragDPObj = pDPObj;
-+
-+            if (DPTestFieldPopupArrow(rMEvt, aPos, pDPObj))
-+            {    
-+                // field name pop up menu has been launched.  Don't activate 
-+                // field move.
-+                bDPMouse = false;
-+                return;
-+            }
-+
- 			DPTestMouse( rMEvt, TRUE );
- 			StartTracking();
- 		}
-@@ -726,6 +744,115 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
- 		pViewData->GetView()->ResetTimer();
- }
- 
-+bool ScGridWindow::DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, ScDPObject* pDPObj)
-+{
-+    // Get the geometry of the cell.
-+    Point aSrcPos = pViewData->GetScrPos(rPos.Col(), rPos.Row(), eWhich);
-+    long nSizeX, nSizeY;
-+    pViewData->GetMergeSizePixel(rPos.Col(), rPos.Row(), nSizeX, nSizeY);
-+    Size aSrcSize(nSizeX-1, nSizeY-1);
-+
-+    // Check if the mouse cursor is clicking on the popup arrow box.
-+    ScDPFieldButton aBtn(this, &GetSettings().GetStyleSettings());
-+    aBtn.setBoundingBox(aSrcPos, aSrcSize);
-+    Point aPopupPos;
-+    Size aPopupSize;
-+    aBtn.getPopupBoundingBox(aPopupPos, aPopupSize);
-+    Rectangle aRec(aPopupPos, aPopupSize);
-+    if (aRec.IsInside(rMEvt.GetPosPixel()))
-+    {
-+        // Mouse cursor inside the popup arrow box.  Launch the field menu.
-+        DPLaunchFieldPopupMenu(OutputToScreenPixel(aSrcPos), aSrcSize, rPos, pDPObj);
-+        return true;
-+    }
-+
-+    return false;
-+}
-+
-+namespace {
-+
-+struct DPFieldPopupData : public ScDPFieldPopupWindow::ExtendedData
-+{
-+    ScPivotParam    maDPParam;
-+    ScDPObject*     mpDPObj;
-+    long            mnDim;
-+};
-+
-+class DPFieldPopupOKAction : public ScDPFieldPopupWindow::OKAction
-+{
-+public:
-+    explicit DPFieldPopupOKAction(ScGridWindow* p) : 
-+        mpGridWindow(p) {}
-+
-+    virtual void execute()
-+    {
-+        mpGridWindow->UpdateDPFromFieldPopupMenu();
-+    }
-+private:
-+    ScGridWindow* mpGridWindow;
-+};
-+
-+}
-+
-+void ScGridWindow::DPLaunchFieldPopupMenu(
-+    const Point& rSrcPos, const Size& rSrcSize, const ScAddress& rPos, ScDPObject* pDPObj)
-+{
-+    // We need to get the list of field members.
-+    auto_ptr<DPFieldPopupData> pDPData(new DPFieldPopupData);
-+    pDPObj->FillLabelData(pDPData->maDPParam);
-+    pDPData->mpDPObj = pDPObj;
-+
-+    USHORT nOrient;
-+    pDPData->mnDim = pDPObj->GetHeaderDim(rPos, nOrient);
-+
-+    if (pDPData->maDPParam.maLabelArray.size() <= static_cast<size_t>(pDPData->mnDim))
-+        // out-of-bound dimension ID.  This should never happen!
-+        return;
-+
-+    const ScDPLabelData& rLabelData = *pDPData->maDPParam.maLabelArray[pDPData->mnDim];
-+
-+    mpDPFieldPopup.reset(new ScDPFieldPopupWindow(this));
-+    mpDPFieldPopup->setExtendedData(pDPData.release());
-+    mpDPFieldPopup->setOKAction(new DPFieldPopupOKAction(this));
-+    sal_Int32 n = rLabelData.maMembers.getLength();
-+    mpDPFieldPopup->setMemberSize(n);
-+    for (sal_Int32 i = 0; i < n; ++i)
-+        mpDPFieldPopup->addMember(rLabelData.maMembers[i], rLabelData.maVisible[i]);
-+    mpDPFieldPopup->initMembers();
-+
-+    mpDPFieldPopup->SetPopupModeEndHdl( LINK(this, ScGridWindow, PopupModeEndHdl) );
-+    Rectangle aCellRect(rSrcPos, rSrcSize);
-+    mpDPFieldPopup->StartPopupMode(aCellRect, (FLOATWIN_POPUPMODE_DOWN | FLOATWIN_POPUPMODE_GRABFOCUS));
-+}
-+
-+void ScGridWindow::UpdateDPFromFieldPopupMenu()
-+{
-+    if (!mpDPFieldPopup.get())
-+        return;
-+
-+    DPFieldPopupData* pDPData = static_cast<DPFieldPopupData*>(mpDPFieldPopup->getExtendedData());
-+    if (!pDPData)
-+        return;
-+
-+    ScDPObject* pDPObj = pDPData->mpDPObj;
-+    ScDPObject aNewDPObj(*pDPObj);
-+    aNewDPObj.BuildAllDimensionMembers();
-+    ScDPSaveData* pSaveData = aNewDPObj.GetSaveData();
-+
-+    BOOL bIsDataLayout;
-+    String aDimName = pDPObj->GetDimName(pDPData->mnDim, bIsDataLayout);
-+    ScDPSaveDimension* pDim = pSaveData->GetDimensionByName(aDimName);
-+    if (!pDim)
-+        return;
-+
-+    hash_map<OUString, bool, OUStringHash> aResult;
-+    mpDPFieldPopup->getResult(aResult);
-+    pDim->UpdateMemberVisibility(aResult);
-+
-+    ScDBDocFunc aFunc(*pViewData->GetDocShell());
-+    aFunc.DataPilotUpdate(pDPObj, &aNewDPObj, true, false);
-+}
-+
- void ScGridWindow::DPMouseMove( const MouseEvent& rMEvt )
- {
- 	DPTestMouse( rMEvt, TRUE );
-diff --git sc/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx
-index 97f04ad..0e0742a 100644
---- sc/source/ui/view/gridwin4.cxx
-+++ sc/source/ui/view/gridwin4.cxx
-@@ -73,6 +73,7 @@
- #include "editutil.hxx"
- #include "inputopt.hxx"
- #include "fillinfo.hxx"
-+#include "dpcontrol.hxx"
- #include "sc.hrc"
- #include <vcl/virdev.hxx>
- 
-@@ -1205,6 +1206,8 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
- {
-     aComboButton.SetOutputDevice( pContentDev );
- 
-+    ScDPFieldButton aDPFieldBtn(pContentDev, &GetSettings().GetStyleSettings());
-+
- 	SCCOL nCol;
- 	SCROW nRow;
- 	SCSIZE nArrY;
-@@ -1320,13 +1323,13 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
- 						nPosX -= nSizeX - 2;
- 					}
- 
--                    pContentDev->SetLineColor( GetSettings().GetStyleSettings().GetLightColor() );
--					pContentDev->DrawLine( Point(nPosX,nPosY), Point(nPosX,nPosY+nSizeY-1) );
--					pContentDev->DrawLine( Point(nPosX,nPosY), Point(nPosX+nSizeX-1,nPosY) );
--                    pContentDev->SetLineColor( GetSettings().GetStyleSettings().GetDarkShadowColor() );
--					pContentDev->DrawLine( Point(nPosX,nPosY+nSizeY-1), Point(nPosX+nSizeX-1,nPosY+nSizeY-1) );
--					pContentDev->DrawLine( Point(nPosX+nSizeX-1,nPosY), Point(nPosX+nSizeX-1,nPosY+nSizeY-1) );
--					pContentDev->SetLineColor( COL_BLACK );
-+                    String aStr;
-+                    pDoc->GetString(nCol, nRow, nTab, aStr);
-+                    aDPFieldBtn.setText(aStr);
-+                    aDPFieldBtn.setBoundingBox(Point(nPosX,nPosY), Size(nSizeX-1, nSizeY-1));
-+                    aDPFieldBtn.setDrawPopupButton(pInfo->bPopupButton);
-+                    aDPFieldBtn.setHasHiddenMember(pInfo->bFilterActive);
-+                    aDPFieldBtn.draw();
- 				}
- 			}
- 		}
diff --git a/applied_patches/0565-unittesting-sandbox.diff b/applied_patches/0449-unittesting-sandbox.diff
similarity index 100%
rename from applied_patches/0565-unittesting-sandbox.diff
rename to applied_patches/0449-unittesting-sandbox.diff
diff --git a/applied_patches/0566-unittesting-sax.diff b/applied_patches/0450-unittesting-sax.diff
similarity index 100%
rename from applied_patches/0566-unittesting-sax.diff
rename to applied_patches/0450-unittesting-sax.diff
diff --git a/applied_patches/0567-unittesting-sc.diff b/applied_patches/0451-unittesting-sc.diff
similarity index 100%
rename from applied_patches/0567-unittesting-sc.diff
rename to applied_patches/0451-unittesting-sc.diff
diff --git a/applied_patches/0452-calc-jump-on-formula-ref-sc.diff b/applied_patches/0452-calc-jump-on-formula-ref-sc.diff
deleted file mode 100644
index dcb49c976..000000000
--- a/applied_patches/0452-calc-jump-on-formula-ref-sc.diff
+++ /dev/null
@@ -1,617 +0,0 @@
-diff --git sc/inc/cell.hxx sc/inc/cell.hxx
-index 45d0de2..714fb1e 100644
---- sc/inc/cell.hxx
-+++ sc/inc/cell.hxx
-@@ -662,6 +662,7 @@ private:
- public:
- 				ScDetectiveRefIter( ScFormulaCell* pCell );
- 	BOOL		GetNextRef( ScRange& rRange );
-+    ScToken*    GetNextRefToken();
- };
- 
- // ============================================================================
-diff --git sc/inc/detfunc.hxx sc/inc/detfunc.hxx
-index 0b07af8..ca3ffc8 100644
---- sc/inc/detfunc.hxx
-+++ sc/inc/detfunc.hxx
-@@ -35,6 +35,9 @@
- #include <tools/gen.hxx>
- #include <tools/color.hxx>
- #include "scdllapi.h"
-+#include "token.hxx"
-+
-+#include <vector>
- 
- class SdrObject;
- class SdrPage;
-@@ -46,6 +49,7 @@ class ScDetectiveData;
- class ScDocument;
- class ScAddress;
- class ScRange;
-+class ScRangeList;
- 
- #define SC_DET_MAXCIRCLE	1000
- 
-@@ -146,6 +150,9 @@ public:
- 
- 	BOOL		MarkInvalid(BOOL& rOverflow);
- 
-+    void        GetAllPreds(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ::std::vector<ScSharedTokenRef>& rRefTokens);
-+    void        GetAllSuccs(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ::std::vector<ScSharedTokenRef>& rRefTokens);
-+
-     static void UpdateAllComments( ScDocument& rDoc );        // on all tables
- 	void		UpdateAllArrowColors();		// on all tables
- 
-diff --git sc/inc/reftokenhelper.hxx sc/inc/reftokenhelper.hxx
-index d7b335f..44619ab 100644
---- sc/inc/reftokenhelper.hxx
-+++ sc/inc/reftokenhelper.hxx
-@@ -78,6 +78,9 @@ public:
-     static void join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
- 
-     static bool getDoubleRefDataFromToken(ScComplexRefData& rData, const ScSharedTokenRef& pToken);
-+
-+    static ScSharedTokenRef createRefToken(const ScAddress& rAddr);
-+    static ScSharedTokenRef createRefToken(const ScRange& rRange);
- };
- 
- #endif
-diff --git sc/inc/sc.hrc sc/inc/sc.hrc
-index ec16438..3ecd9ba 100644
---- sc/inc/sc.hrc
-+++ sc/inc/sc.hrc
-@@ -902,6 +902,9 @@
- #define SID_DETECTIVE_REFRESH   (DETECTIVE_START+14)
- #define SID_DETECTIVE_AUTO      (DETECTIVE_START+15)
- 
-+#define SID_DETECTIVE_MARK_PRED (DETECTIVE_START+16)
-+#define SID_DETECTIVE_MARK_SUCC (DETECTIVE_START+17)
-+
- #define DETECTIVE_END			(DETECTIVE_START+20)
- 
- #define SID_API_SLOTS			(DETECTIVE_END)
-diff --git sc/sdi/cellsh.sdi sc/sdi/cellsh.sdi
-index baec475..3a4047c 100644
---- sc/sdi/cellsh.sdi
-+++ sc/sdi/cellsh.sdi
-@@ -113,6 +113,8 @@ interface CellSelection
- 	SID_DETECTIVE_ADD_ERR	[ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
- 	SID_DETECTIVE_INVALID	[ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
- 	SID_DETECTIVE_REFRESH	[ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
-+	SID_DETECTIVE_MARK_PRED	[ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
-+	SID_DETECTIVE_MARK_SUCC	[ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
- 	FID_INS_ROW				[ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
- 	FID_INS_COLUMN			[ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
- 	FID_INS_CELLSDOWN		[ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
-diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
-index 430d474..77fc5b7 100644
---- sc/sdi/scalc.sdi
-+++ sc/sdi/scalc.sdi
-@@ -7977,4 +7977,53 @@ SfxBoolItem ToggleSheetGrid FID_TAB_TOGGLE_GRID
-     GroupId = GID_FORMAT;
- ]
- 
-+//--------------------------------------------------------------------------
-+SfxVoidItem MarkPrecedents SID_DETECTIVE_MARK_PRED
-+()
-+[
-+    /* flags: */
-+    AutoUpdate = FALSE,
-+    Cachable = Cachable,
-+    FastCall = FALSE,
-+    HasCoreId = FALSE,
-+    HasDialog = FALSE,
-+    ReadOnlyDoc = TRUE,
-+    Toggle = FALSE,
-+    Container = FALSE,
-+    RecordAbsolute = FALSE,
-+    RecordPerSet;
-+    Synchron;
-+    
-+    /* config: */
-+    AccelConfig = TRUE,
-+    MenuConfig = TRUE,
-+    StatusBarConfig = FALSE,
-+    ToolBoxConfig = FALSE,
-+    GroupId = GID_OPTIONS;
-+]
-+
-+//--------------------------------------------------------------------------
-+SfxVoidItem MarkDependents SID_DETECTIVE_MARK_SUCC
-+()
-+[
-+    /* flags: */
-+    AutoUpdate = FALSE,
-+    Cachable = Cachable,
-+    FastCall = FALSE,
-+    HasCoreId = FALSE,
-+    HasDialog = FALSE,
-+    ReadOnlyDoc = TRUE,
-+    Toggle = FALSE,
-+    Container = FALSE,
-+    RecordAbsolute = FALSE,
-+    RecordPerSet;
-+    Synchron;
-+    
-+    /* config: */
-+    AccelConfig = TRUE,
-+    MenuConfig = TRUE,
-+    StatusBarConfig = FALSE,
-+    ToolBoxConfig = FALSE,
-+    GroupId = GID_OPTIONS;
-+]
- 
-diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx
-index b181e4c..d28de5e 100644
---- sc/source/core/data/cell.cxx
-+++ sc/source/core/data/cell.cxx
-@@ -1981,7 +1981,7 @@ BOOL lcl_ScDetectiveRefIter_SkipRef( ScToken* p )
- 	if ( rRef1.IsColDeleted() || rRef1.IsRowDeleted() || rRef1.IsTabDeleted()
- 			|| !rRef1.Valid() )
- 		return TRUE;
--	if ( p->GetType() == svDoubleRef )
-+	if ( p->GetType() == svDoubleRef || p->GetType() == svExternalDoubleRef )
- 	{
- 		ScSingleRefData& rRef2 = p->GetDoubleRef().Ref2;
- 		if ( rRef2.IsColDeleted() || rRef2.IsRowDeleted() || rRef2.IsTabDeleted()
-@@ -1994,18 +1994,7 @@ BOOL lcl_ScDetectiveRefIter_SkipRef( ScToken* p )
- BOOL ScDetectiveRefIter::GetNextRef( ScRange& rRange )
- {
- 	BOOL bRet = FALSE;
--
--	ScToken* p = static_cast<ScToken*>(pCode->GetNextReferenceRPN());
--	if (p)
--		p->CalcAbsIfRel( aPos );
--
--	while ( p && lcl_ScDetectiveRefIter_SkipRef( p ) )
--	{
--		p = static_cast<ScToken*>(pCode->GetNextReferenceRPN());
--		if (p)
--			p->CalcAbsIfRel( aPos );
--	}
--
-+    ScToken* p = GetNextRefToken();
- 	if( p )
- 	{
- 		SingleDoubleRefProvider aProv( *p );
-@@ -2017,4 +2006,19 @@ BOOL ScDetectiveRefIter::GetNextRef( ScRange& rRange )
- 	return bRet;
- }
- 
-+ScToken* ScDetectiveRefIter::GetNextRefToken()
-+{
-+    ScToken* p = static_cast<ScToken*>(pCode->GetNextReferenceRPN());
-+    if (p)
-+        p->CalcAbsIfRel( aPos );
-+
-+    while ( p && lcl_ScDetectiveRefIter_SkipRef( p ) )
-+    {
-+        p = static_cast<ScToken*>(pCode->GetNextReferenceRPN());
-+        if (p)
-+            p->CalcAbsIfRel( aPos );
-+    }
-+    return p;
-+}
-+
- // ============================================================================
-diff --git sc/source/core/tool/detfunc.cxx sc/source/core/tool/detfunc.cxx
-index f2a2a42..7251a1d 100644
---- sc/source/core/tool/detfunc.cxx
-+++ sc/source/core/tool/detfunc.cxx
-@@ -80,6 +80,12 @@
- #include "attrib.hxx"
- #include "scmod.hxx"
- #include "postit.hxx"
-+#include "rangelst.hxx"
-+#include "reftokenhelper.hxx"
-+
-+#include <vector>
-+
-+using ::std::vector;
- 
- //------------------------------------------------------------------------
- 
-@@ -1407,6 +1413,52 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow)
- 	return ( bDeleted || nInsCount != 0 );
- }
- 
-+void ScDetectiveFunc::GetAllPreds(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-+                                  vector<ScSharedTokenRef>& rRefTokens)
-+{
-+    ScCellIterator aCellIter(pDoc, nCol1, nRow1, nTab, nCol2, nRow2, nTab);
-+    for (ScBaseCell* pCell = aCellIter.GetFirst(); pCell; pCell = aCellIter.GetNext())
-+    {
-+        if (pCell->GetCellType() != CELLTYPE_FORMULA)
-+            continue;
-+
-+        ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
-+        ScDetectiveRefIter aRefIter(pFCell);
-+        for (ScToken* p = aRefIter.GetNextRefToken(); p; p = aRefIter.GetNextRefToken())
-+        {
-+            ScSharedTokenRef pRef(static_cast<ScToken*>(p->Clone()));
-+            ScRefTokenHelper::join(rRefTokens, pRef);
-+        }
-+    }
-+}
-+
-+void ScDetectiveFunc::GetAllSuccs(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, 
-+                                  vector<ScSharedTokenRef>& rRefTokens)
-+{
-+    vector<ScSharedTokenRef> aSrcRange;
-+    aSrcRange.push_back(
-+        ScRefTokenHelper::createRefToken(ScRange(nCol1, nRow1, nTab, nCol2, nRow2, nTab)));
-+
-+    ScCellIterator aCellIter(pDoc, 0, 0, nTab, MAXCOL, MAXROW, nTab);
-+    for (ScBaseCell* pCell = aCellIter.GetFirst(); pCell; pCell = aCellIter.GetNext())
-+    {
-+        if (pCell->GetCellType() != CELLTYPE_FORMULA)
-+            continue;
-+
-+        ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
-+        ScDetectiveRefIter aRefIter(pFCell);
-+        for (ScToken* p = aRefIter.GetNextRefToken(); p; p = aRefIter.GetNextRefToken())
-+        {
-+            ScSharedTokenRef pRef(static_cast<ScToken*>(p->Clone()));
-+            if (ScRefTokenHelper::intersects(aSrcRange, pRef))
-+            {
-+                pRef = ScRefTokenHelper::createRefToken(aCellIter.GetPos());
-+                ScRefTokenHelper::join(rRefTokens, pRef);
-+            }
-+        }
-+    }
-+}
-+
- void ScDetectiveFunc::UpdateAllComments( ScDocument& rDoc )
- {
- 	//	for all caption objects, update attributes and SpecialTextBoxShadow flag
-diff --git sc/source/core/tool/reftokenhelper.cxx sc/source/core/tool/reftokenhelper.cxx
-index 0e07819..6a46f9c 100644
---- sc/source/core/tool/reftokenhelper.cxx
-+++ sc/source/core/tool/reftokenhelper.cxx
-@@ -436,3 +436,19 @@ bool ScRefTokenHelper::getDoubleRefDataFromToken(ScComplexRefData& rData, const
-     }
-     return true;
- }
-+
-+ScSharedTokenRef ScRefTokenHelper::createRefToken(const ScAddress& rAddr)
-+{
-+    ScSingleRefData aRefData;
-+    aRefData.InitAddress(rAddr);
-+    ScSharedTokenRef pRef(new ScSingleRefToken(aRefData));
-+    return pRef;
-+}
-+
-+ScSharedTokenRef ScRefTokenHelper::createRefToken(const ScRange& rRange)
-+{
-+    ScComplexRefData aRefData;
-+    aRefData.InitRange(rRange);
-+    ScSharedTokenRef pRef(new ScDoubleRefToken(aRefData));
-+    return pRef;
-+}
-diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
-index fde95e5..2326d92 100644
---- sc/source/ui/docshell/docfunc.cxx
-+++ sc/source/ui/docshell/docfunc.cxx
-@@ -106,7 +106,7 @@
- 
- using namespace com::sun::star;
- using ::com::sun::star::uno::Sequence;
--
-+using ::std::vector;
- 
- // STATIC DATA -----------------------------------------------------------
- 
-@@ -524,6 +524,44 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic )
- 	return bDone;
- }
- 
-+static void lcl_collectAllPredOrSuccRanges(
-+    const ScRangeList& rSrcRanges, vector<ScSharedTokenRef>& rRefTokens, ScDocShell& rDocShell,
-+    bool bPred)
-+{
-+    ScDocument* pDoc = rDocShell.GetDocument();
-+    vector<ScSharedTokenRef> aRefTokens;
-+    ScRangeList aSrcRanges(rSrcRanges);
-+    ScRange* p = aSrcRanges.First();
-+    if (!p)
-+        return;
-+    ScDetectiveFunc aDetFunc(pDoc, p->aStart.Tab());
-+    ScRangeList aDestRanges;
-+    for (; p; p = aSrcRanges.Next())
-+    {
-+        if (bPred)
-+        {    
-+            aDetFunc.GetAllPreds(
-+                p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(), aRefTokens);
-+        }
-+        else
-+        {    
-+            aDetFunc.GetAllSuccs(
-+                p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(), aRefTokens);
-+        }
-+    }
-+    rRefTokens.swap(aRefTokens);
-+}
-+
-+void ScDocFunc::DetectiveCollectAllPreds(const ScRangeList& rSrcRanges, vector<ScSharedTokenRef>& rRefTokens)
-+{
-+    lcl_collectAllPredOrSuccRanges(rSrcRanges, rRefTokens, rDocShell, true);
-+}
-+
-+void ScDocFunc::DetectiveCollectAllSuccs(const ScRangeList& rSrcRanges, vector<ScSharedTokenRef>& rRefTokens)
-+{
-+    lcl_collectAllPredOrSuccRanges(rSrcRanges, rRefTokens, rDocShell, false);
-+}
-+
- //------------------------------------------------------------------------
- 
- BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
-diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx
-index 9976230..753e761 100644
---- sc/source/ui/inc/docfunc.hxx
-+++ sc/source/ui/inc/docfunc.hxx
-@@ -36,6 +36,9 @@
- #include <tools/link.hxx>
- #include "global.hxx"
- #include "formula/grammar.hxx"
-+#include "token.hxx"
-+
-+#include <vector>
- 
- class ScEditEngineDefaulter;
- class SfxUndoAction;
-@@ -44,6 +47,7 @@ class ScDocShell;
- class ScMarkData;
- class ScPatternAttr;
- class ScRange;
-+class ScRangeList;
- class ScRangeName;
- class ScBaseCell;
- class ScTokenArray;
-@@ -79,6 +83,8 @@ public:
- 	BOOL			DetectiveMarkInvalid(SCTAB nTab);
- 	BOOL			DetectiveDelAll(SCTAB nTab);
- 	BOOL			DetectiveRefresh(BOOL bAutomatic = FALSE);
-+    void            DetectiveCollectAllPreds(const ScRangeList& rSrcRanges, ::std::vector<ScSharedTokenRef>& rRefTokens);
-+    void            DetectiveCollectAllSuccs(const ScRangeList& rSrcRanges, ::std::vector<ScSharedTokenRef>& rRefTokens);
- 
- 	BOOL			DeleteContents( const ScMarkData& rMark, USHORT nFlags,
- 									BOOL bRecord, BOOL bApi );
-diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
-index 3f99bde..d227c16 100644
---- sc/source/ui/inc/viewfunc.hxx
-+++ sc/source/ui/inc/viewfunc.hxx
-@@ -330,6 +330,8 @@ public:
- 	void			DetectiveMarkInvalid();
- 	void			DetectiveDelAll();
- 	void			DetectiveRefresh();
-+    void            DetectiveMarkPred();
-+    void            DetectiveMarkSucc();
- 
- 	void			ShowNote( bool bShow = true );
- 	inline void		HideNote() { ShowNote( false ); }
-@@ -370,6 +372,8 @@ private:
- 	BOOL			TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged );
- 	void			DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
- 										BOOL bAttrChanged, BOOL bAddUndo );
-+
-+    void            MarkAndJumpToRanges(const ScRangeList& rRanges);
- };
- 
- 
-diff --git sc/source/ui/view/cellsh1.cxx sc/source/ui/view/cellsh1.cxx
-index ce1010e..8a46b55 100644
---- sc/source/ui/view/cellsh1.cxx
-+++ sc/source/ui/view/cellsh1.cxx
-@@ -1592,6 +1592,13 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
- 			rReq.Done();
- 			break;
- 
-+        case SID_DETECTIVE_MARK_PRED:
-+            pTabViewShell->DetectiveMarkPred();
-+            break;
-+        case SID_DETECTIVE_MARK_SUCC:
-+            pTabViewShell->DetectiveMarkSucc();
-+            break;
-+
-         case SID_SPELL_DIALOG:
- //           pTabViewShell->DoSpellingChecker();
-             {
-diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
-index 078c55a..67107db 100644
---- sc/source/ui/view/gridwin.cxx
-+++ sc/source/ui/view/gridwin.cxx
-@@ -3108,6 +3108,17 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
- 				ShowNoteMarker( pViewData->GetCurX(), pViewData->GetCurY(), TRUE );
- 			return;
- 		}
-+        if (aCode.GetCode() == KEY_BRACKETLEFT && aCode.GetModifier() == KEY_MOD1)
-+        {
-+            pViewSh->DetectiveMarkPred();
-+            return;
-+        }
-+        if (aCode.GetCode() == KEY_BRACKETRIGHT && aCode.GetModifier() == KEY_MOD1)
-+        {
-+            pViewSh->DetectiveMarkSucc();
-+            return;
-+        }
-+        
- 	}
- 
- 	Window::KeyInput(rKEvt);
-diff --git sc/source/ui/view/tabvwsh3.cxx sc/source/ui/view/tabvwsh3.cxx
-index 836f359..81c2e1b 100644
---- sc/source/ui/view/tabvwsh3.cxx
-+++ sc/source/ui/view/tabvwsh3.cxx
-@@ -414,13 +414,15 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
- 					{
- 						pViewData->ResetOldCursor();
- 						SetCursor( nCol, nRow );
--						AlignToCursor( nCol, nRow, SC_FOLLOW_JUMP );
- 						rBindings.Invalidate( SID_CURRENTCELL );
- 						rBindings.Update( nSlot );
- 
- 						if (!rReq.IsAPI())
- 							rReq.Done();
- 					}
-+                    // align to cursor even if the cursor position hasn't changed, 
-+                    // because the cursor may be set outside the visible area.
-+                    AlignToCursor( nCol, nRow, SC_FOLLOW_JUMP );
- 
- 					rReq.SetReturnValue( SfxStringItem( SID_CURRENTCELL, aAddress ) );
- 				}
-diff --git sc/source/ui/view/viewfun6.cxx sc/source/ui/view/viewfun6.cxx
-index bd3ccdf..19d19ba 100644
---- sc/source/ui/view/viewfun6.cxx
-+++ sc/source/ui/view/viewfun6.cxx
-@@ -50,6 +50,13 @@
- #include "globstr.hrc"
- #include "sc.hrc"
- #include "fusel.hxx"
-+#include "reftokenhelper.hxx"
-+#include "externalrefmgr.hxx"
-+
-+#include <vector>
-+
-+using ::rtl::OUStringBuffer;
-+using ::std::vector;
- 
- //==================================================================
- 
-@@ -140,6 +147,136 @@ void ScViewFunc::DetectiveRefresh()
- 	RecalcPPT();
- }
- 
-+static void lcl_jumpToRange(const ScRange& rRange, ScViewData* pView, ScDocument* pDoc)
-+{
-+    String aAddrText;
-+    rRange.Format(aAddrText, SCR_ABS_3D, pDoc);
-+    SfxStringItem aPosItem(SID_CURRENTCELL, aAddrText);
-+    SfxBoolItem aUnmarkItem(FN_PARAM_1, TRUE);        // remove existing selection
-+    pView->GetDispatcher().Execute(
-+        SID_CURRENTCELL, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
-+        &aPosItem, &aUnmarkItem, 0L);
-+}
-+
-+void ScViewFunc::MarkAndJumpToRanges(const ScRangeList& rRanges)
-+{
-+    ScViewData* pView = GetViewData();
-+    ScDocShell* pDocSh = pView->GetDocShell();
-+
-+    ScRangeList aRanges(rRanges);
-+    ScRange* p = aRanges.First();
-+    ScRangeList aRangesToMark;
-+    ScAddress aCurPos = pView->GetCurPos();
-+    for (; p; p = aRanges.Next())
-+    {
-+        // Collect only those ranges that are on the same sheet as the current
-+        // cursor.
-+
-+        if (p->aStart.Tab() == aCurPos.Tab())
-+            aRangesToMark.Append(*p);
-+    }
-+
-+    if (!aRangesToMark.Count())
-+        return;
-+
-+    // Jump to the first range of all precedent ranges.
-+    p = aRangesToMark.First();
-+    lcl_jumpToRange(*p, pView, pDocSh->GetDocument());
-+
-+    for (; p; p = aRangesToMark.Next())
-+        MarkRange(*p, false, true);
-+}
-+
-+void ScViewFunc::DetectiveMarkPred()
-+{
-+    ScViewData* pView = GetViewData();
-+    ScDocShell* pDocSh = pView->GetDocShell();
-+    ScDocument* pDoc = pDocSh->GetDocument();
-+    ScMarkData& rMarkData = pView->GetMarkData();
-+    ScAddress aCurPos = pView->GetCurPos();
-+    ScRangeList aRanges;
-+    if (rMarkData.IsMarked() || rMarkData.IsMultiMarked())
-+        rMarkData.FillRangeListWithMarks(&aRanges, false);
-+    else
-+        aRanges.Append(aCurPos);
-+
-+    vector<ScSharedTokenRef> aRefTokens;
-+    pDocSh->GetDocFunc().DetectiveCollectAllPreds(aRanges, aRefTokens);
-+
-+    if (aRefTokens.empty())
-+        // No precedents found.  Nothing to do.
-+        return;
-+
-+    ScSharedTokenRef p = aRefTokens.front();
-+    if (ScRefTokenHelper::isExternalRef(p))
-+    {
-+        // This is external.  Open the external document if available, and 
-+        // jump to the destination.
-+
-+        sal_uInt16 nFileId = p->GetIndex();
-+        ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
-+        const String* pPath = pRefMgr->getExternalFileName(nFileId);
-+
-+        ScRange aRange;
-+        if (pPath && ScRefTokenHelper::getRangeFromToken(aRange, p, true))
-+        {
-+            const String& rTabName = p->GetString();
-+            OUStringBuffer aBuf;
-+            aBuf.append(*pPath);
-+            aBuf.append(sal_Unicode('#'));
-+            aBuf.append(rTabName);
-+            aBuf.append(sal_Unicode('.'));
-+
-+            String aRangeStr;
-+            aRange.Format(aRangeStr, SCA_VALID); 
-+            aBuf.append(aRangeStr);
-+
-+            ScGlobal::OpenURL(aBuf.makeStringAndClear(), String());
-+        }
-+        return;
-+    }
-+    else
-+    {
-+        ScRange aRange;
-+        ScRefTokenHelper::getRangeFromToken(aRange, p, false);
-+        if (aRange.aStart.Tab() != aCurPos.Tab())
-+        {
-+            // The first precedent range is on a different sheet.  Jump to it 
-+            // immediately and forget the rest.
-+            lcl_jumpToRange(aRange, pView, pDoc);
-+            return;
-+        }
-+    }
-+
-+    ScRangeList aDestRanges;
-+    ScRefTokenHelper::getRangeListFromTokens(aDestRanges, aRefTokens);
-+    MarkAndJumpToRanges(aDestRanges);
-+}
-+
-+void ScViewFunc::DetectiveMarkSucc()
-+{
-+    ScViewData* pView = GetViewData();
-+    ScDocShell* pDocSh = pView->GetDocShell();
-+    ScMarkData& rMarkData = pView->GetMarkData();
-+    ScAddress aCurPos = pView->GetCurPos();
-+    ScRangeList aRanges;
-+    if (rMarkData.IsMarked() || rMarkData.IsMultiMarked())
-+        rMarkData.FillRangeListWithMarks(&aRanges, false);
-+    else
-+        aRanges.Append(aCurPos);
-+
-+    vector<ScSharedTokenRef> aRefTokens;
-+    pDocSh->GetDocFunc().DetectiveCollectAllSuccs(aRanges, aRefTokens);
-+
-+    if (aRefTokens.empty())
-+        // No dependants found.  Nothing to do.
-+        return;
-+
-+    ScRangeList aDestRanges;
-+    ScRefTokenHelper::getRangeListFromTokens(aDestRanges, aRefTokens);
-+    MarkAndJumpToRanges(aDestRanges);
-+}
-+
- //---------------------------------------------------------------------------
- 
- void ScViewFunc::ShowNote( bool bShow )
diff --git a/applied_patches/0568-unittesting-scripting.diff b/applied_patches/0452-unittesting-scripting.diff
similarity index 100%
rename from applied_patches/0568-unittesting-scripting.diff
rename to applied_patches/0452-unittesting-scripting.diff
diff --git a/applied_patches/0569-unittesting-sd.diff b/applied_patches/0453-unittesting-sd.diff
similarity index 100%
rename from applied_patches/0569-unittesting-sd.diff
rename to applied_patches/0453-unittesting-sd.diff
diff --git a/applied_patches/0570-unittesting-sfx2.diff b/applied_patches/0454-unittesting-sfx2.diff
similarity index 100%
rename from applied_patches/0570-unittesting-sfx2.diff
rename to applied_patches/0454-unittesting-sfx2.diff
diff --git a/applied_patches/0455-calc-dp-custom-sort.diff b/applied_patches/0455-calc-dp-custom-sort.diff
deleted file mode 100644
index 85173af52..000000000
--- a/applied_patches/0455-calc-dp-custom-sort.diff
+++ /dev/null
@@ -1,1439 +0,0 @@
-diff --git sc/inc/sc.hrc sc/inc/sc.hrc
-index 3ecd9ba..32f883a 100644
---- sc/inc/sc.hrc
-+++ sc/inc/sc.hrc
-@@ -1682,6 +1682,9 @@
- // Language chooser for text import filters.
- #define RID_SCDLG_LANG_CHOOSER           (SC_OOO_BUILD_START + 12)
- 
-+// Datapilot controls
-+#define RID_SC_DPCONTROL                 (SC_OOO_BUILD_START + 13)
-+
- #endif
- 
- 
-diff --git sc/source/ui/cctrl/dpcontrol.cxx sc/source/ui/cctrl/dpcontrol.cxx
-index e188ab3..02fb0b9 100644
---- sc/source/ui/cctrl/dpcontrol.cxx
-+++ sc/source/ui/cctrl/dpcontrol.cxx
-@@ -38,6 +38,9 @@
- #include "vcl/outdev.hxx"
- #include "vcl/settings.hxx"
- #include "vcl/wintypes.hxx"
-+#include "vcl/decoview.hxx"
-+
-+#define MENU_NOT_SELECTED 999
- 
- using ::rtl::OUString;
- using ::rtl::OUStringHash;
-@@ -182,6 +185,525 @@ void ScDPFieldButton::drawPopupButton()
- 
- // ============================================================================
- 
-+ScMenuFloatingWindow::MenuItem::MenuItem() :
-+    mbEnabled(true),
-+    mpAction(static_cast<ScDPFieldPopupWindow::Action*>(NULL)),
-+    mpSubMenuWin(static_cast<ScMenuFloatingWindow*>(NULL))
-+{
-+}
-+
-+// ----------------------------------------------------------------------------
-+
-+ScMenuFloatingWindow::SubMenuItem::SubMenuItem(ScMenuFloatingWindow* pParent) :
-+    mpSubMenu(NULL),
-+    mnMenuPos(MENU_NOT_SELECTED),
-+    mpParent(pParent)
-+{
-+    maTimer.SetTimeoutHdl( LINK(this, ScMenuFloatingWindow::SubMenuItem, TimeoutHdl) );
-+    maTimer.SetTimeout(mpParent->GetSettings().GetMouseSettings().GetMenuDelay());
-+}
-+
-+void ScMenuFloatingWindow::SubMenuItem::reset()
-+{
-+    mpSubMenu = NULL;
-+    mnMenuPos = MENU_NOT_SELECTED;
-+    maTimer.Stop();
-+}
-+
-+IMPL_LINK( ScMenuFloatingWindow::SubMenuItem, TimeoutHdl, void*, EMPTYARG )
-+{
-+    mpParent->handleMenuTimeout(this);
-+    return 0;
-+}
-+
-+// ----------------------------------------------------------------------------
-+
-+ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent) :
-+    FloatingWindow(pParent, (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER)),
-+    maOpenTimer(this),
-+    maCloseTimer(this),
-+    mnSelectedMenu(MENU_NOT_SELECTED),
-+    mnClickedMenu(MENU_NOT_SELECTED),
-+    mpParentMenu(dynamic_cast<ScMenuFloatingWindow*>(pParent)),
-+    mpActiveSubMenu(NULL),
-+    mbActionFired(false)
-+{
-+    // TODO: How do we get the right font to use here ?
-+    const sal_uInt16 nPopupFontHeight = 12;
-+    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
-+    maLabelFont = rStyle.GetLabelFont();
-+    maLabelFont.SetHeight(nPopupFontHeight);
-+    SetFont(maLabelFont);
-+
-+    SetPopupModeEndHdl( LINK(this, ScMenuFloatingWindow, EndPopupHdl) );
-+}
-+
-+ScMenuFloatingWindow::~ScMenuFloatingWindow()
-+{
-+    EndPopupMode();
-+}
-+
-+void ScMenuFloatingWindow::MouseMove(const MouseEvent& rMEvt)
-+{
-+    const Point& rPos = rMEvt.GetPosPixel();
-+    size_t nSelectedMenu = getEnclosingMenuItem(rPos);
-+    setSelectedMenuItem(nSelectedMenu);
-+
-+    Window::MouseMove(rMEvt);
-+}
-+
-+void ScMenuFloatingWindow::MouseButtonDown(const MouseEvent& rMEvt)
-+{
-+    const Point& rPos = rMEvt.GetPosPixel();
-+    mnClickedMenu = getEnclosingMenuItem(rPos);
-+    Window::MouseButtonDown(rMEvt);
-+}
-+
-+void ScMenuFloatingWindow::MouseButtonUp(const MouseEvent& rMEvt)
-+{
-+    executeMenu(mnClickedMenu);
-+    mnClickedMenu = MENU_NOT_SELECTED;
-+    Window::MouseButtonUp(rMEvt);
-+}
-+
-+void ScMenuFloatingWindow::KeyInput(const KeyEvent& rKEvt)
-+{
-+    const KeyCode& rKeyCode = rKEvt.GetKeyCode();
-+    bool bHandled = true;
-+    size_t nSelectedMenu = mnSelectedMenu;
-+    size_t nLastMenuPos = maMenuItems.size() - 1;
-+    switch (rKeyCode.GetCode())
-+    {
-+        case KEY_UP:
-+            if (nSelectedMenu == MENU_NOT_SELECTED || nSelectedMenu == 0)
-+                nSelectedMenu = nLastMenuPos;
-+            else
-+                --nSelectedMenu;
-+            setSelectedMenuItem(nSelectedMenu, false);
-+        break;
-+        case KEY_DOWN:
-+            if (nSelectedMenu == MENU_NOT_SELECTED || nSelectedMenu == nLastMenuPos)
-+                nSelectedMenu = 0;
-+            else
-+                ++nSelectedMenu;
-+            setSelectedMenuItem(nSelectedMenu, false);
-+        break;
-+        case KEY_LEFT:
-+            if (mpParentMenu)
-+                mpParentMenu->endSubMenu();
-+        break;
-+        case KEY_RIGHT:
-+        {
-+            if (mnSelectedMenu >= maMenuItems.size() || mnSelectedMenu == MENU_NOT_SELECTED)
-+                break;
-+
-+            const MenuItem& rMenu = maMenuItems[mnSelectedMenu];
-+            if (!rMenu.mbEnabled || !rMenu.mpSubMenuWin)
-+                break;
-+
-+            maOpenTimer.mnMenuPos = mnSelectedMenu;
-+            maOpenTimer.mpSubMenu = rMenu.mpSubMenuWin.get();
-+            launchSubMenu(true);
-+        }
-+        break;
-+        case KEY_RETURN:
-+            if (nSelectedMenu != MENU_NOT_SELECTED)
-+                executeMenu(nSelectedMenu);
-+        break;
-+        default:
-+            bHandled = false;
-+    }
-+
-+    if (!bHandled)
-+        Window::KeyInput(rKEvt);
-+}
-+
-+void ScMenuFloatingWindow::Paint(const Rectangle& /*rRect*/)
-+{
-+    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
-+    Color aBackColor = rStyle.GetMenuColor();
-+    Color aBorderColor = rStyle.GetShadowColor();
-+
-+    Rectangle aCtrlRect(Point(0, 0), GetOutputSizePixel());
-+
-+    // Window background
-+    bool bNativeDrawn = true;
-+    if (IsNativeControlSupported(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL))
-+    {
-+        SetClipRegion();
-+        bNativeDrawn = DrawNativeControl(
-+            CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, Region(aCtrlRect), CTRL_STATE_ENABLED,
-+            ImplControlValue(), OUString());
-+    }
-+    else
-+        bNativeDrawn = false;
-+
-+    if (!bNativeDrawn)
-+    {
-+        SetFillColor(aBackColor);
-+        SetLineColor(aBorderColor);
-+        DrawRect(aCtrlRect);
-+    }
-+
-+    // Menu items
-+    SetTextColor(rStyle.GetMenuTextColor());
-+    drawAllMenuItems();
-+}
-+
-+void ScMenuFloatingWindow::addMenuItem(const OUString& rText, bool bEnabled, Action* pAction)
-+{
-+    MenuItem aItem;
-+    aItem.maText = rText;
-+    aItem.mbEnabled = bEnabled;
-+    aItem.mpAction.reset(pAction);
-+    maMenuItems.push_back(aItem);
-+}
-+
-+ScMenuFloatingWindow* ScMenuFloatingWindow::addSubMenuItem(const OUString& rText, bool bEnabled)
-+{
-+    MenuItem aItem;
-+    aItem.maText = rText;
-+    aItem.mbEnabled = bEnabled;
-+    aItem.mpSubMenuWin.reset(new ScMenuFloatingWindow(this));
-+    maMenuItems.push_back(aItem);
-+    return aItem.mpSubMenuWin.get();
-+}
-+
-+void ScMenuFloatingWindow::drawMenuItem(size_t nPos)
-+{
-+    if (nPos >= maMenuItems.size())
-+        return;
-+
-+    Point aPos;
-+    Size aSize;
-+    getMenuItemPosSize(aPos, aSize, nPos);
-+
-+    DecorationView aDecoView(this);
-+    long nXOffset = 5;
-+    long nYOffset = (aSize.Height() - maLabelFont.GetHeight())/2;
-+    DrawCtrlText(Point(aPos.X()+nXOffset, aPos.Y() + nYOffset), maMenuItems[nPos].maText, 0, STRING_LEN,
-+                 maMenuItems[nPos].mbEnabled ? TEXT_DRAW_MNEMONIC : TEXT_DRAW_DISABLE);
-+
-+    if (maMenuItems[nPos].mpSubMenuWin)
-+    {
-+        long nFontHeight = maLabelFont.GetHeight();
-+        Point aMarkerPos = aPos;
-+        aMarkerPos.Y() += aSize.Height()/2 - nFontHeight/4 + 1;
-+        aMarkerPos.X() += aSize.Width() - nFontHeight + nFontHeight/4;
-+        Size aMarkerSize(nFontHeight/2, nFontHeight/2);
-+        aDecoView.DrawSymbol(Rectangle(aMarkerPos, aMarkerSize),
-+                             SYMBOL_SPIN_RIGHT, GetTextColor(), 0);
-+    }
-+}
-+
-+void ScMenuFloatingWindow::drawAllMenuItems()
-+{
-+    size_t n = maMenuItems.size();
-+    for (size_t i = 0; i < n; ++i)
-+        highlightMenuItem(i, i == mnSelectedMenu);    
-+}
-+
-+const Font& ScMenuFloatingWindow::getLabelFont() const
-+{
-+    return maLabelFont;
-+}
-+
-+void ScMenuFloatingWindow::executeMenu(size_t nPos)
-+{
-+    if (nPos >= maMenuItems.size())
-+        return;
-+
-+    if (!maMenuItems[nPos].mpAction)
-+        // no action is defined.
-+        return;
-+
-+    maMenuItems[nPos].mpAction->execute();
-+    mbActionFired = true;
-+    EndPopupMode();
-+}
-+
-+void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer)
-+{
-+    if (mnSelectedMenu != nPos)
-+    {
-+        selectMenuItem(mnSelectedMenu, false, bSubMenuTimer);
-+        selectMenuItem(nPos, true, bSubMenuTimer);
-+        mnSelectedMenu = nPos;
-+    }
-+}
-+
-+size_t ScMenuFloatingWindow::getSelectedMenuItem() const
-+{
-+    return mnSelectedMenu;
-+}
-+
-+void ScMenuFloatingWindow::handleMenuTimeout(SubMenuItem* pTimer)
-+{
-+    if (pTimer == &maOpenTimer)
-+    {
-+        // Close any open submenu immediately.
-+        if (maCloseTimer.mpSubMenu)
-+        {
-+            maCloseTimer.mpSubMenu->EndPopupMode();
-+            maCloseTimer.mpSubMenu = NULL;
-+            maCloseTimer.maTimer.Stop();
-+        }
-+
-+        launchSubMenu(false);
-+    }
-+    else if (pTimer == &maCloseTimer)
-+    {
-+        // end submenu.
-+        if (maCloseTimer.mpSubMenu)
-+        {
-+            maOpenTimer.mpSubMenu = NULL;
-+
-+            maCloseTimer.mpSubMenu->EndPopupMode();
-+            maCloseTimer.mpSubMenu = NULL;
-+
-+            highlightMenuItem(maOpenTimer.mnMenuPos, false);
-+            maOpenTimer.mnMenuPos = MENU_NOT_SELECTED;
-+        }
-+    }
-+}
-+
-+void ScMenuFloatingWindow::queueLaunchSubMenu(size_t nPos, ScMenuFloatingWindow* pMenu)
-+{
-+    if (!pMenu)
-+        return;
-+
-+    // Set the submenu on launch queue.
-+    if (maOpenTimer.mpSubMenu)
-+    {
-+        if (maOpenTimer.mpSubMenu == pMenu)
-+        {
-+            if (pMenu == maCloseTimer.mpSubMenu)
-+                maCloseTimer.reset();
-+            return;
-+        }
-+
-+        // new submenu is being requested.
-+        queueCloseSubMenu();
-+    }
-+
-+    maOpenTimer.mpSubMenu = pMenu;
-+    maOpenTimer.mnMenuPos = nPos;
-+    maOpenTimer.maTimer.Start();
-+}
-+
-+void ScMenuFloatingWindow::queueCloseSubMenu()
-+{
-+    if (!maOpenTimer.mpSubMenu)
-+        // There is no submenu to close.
-+        return;
-+
-+    // Stop any submenu on queue for opening.
-+    maOpenTimer.maTimer.Stop();
-+
-+    maCloseTimer.mpSubMenu = maOpenTimer.mpSubMenu;
-+    maCloseTimer.mnMenuPos = maOpenTimer.mnMenuPos;
-+    maCloseTimer.maTimer.Start();
-+}
-+
-+void ScMenuFloatingWindow::launchSubMenu(bool bSetMenuPos)
-+{
-+    Point aPos;
-+    Size aSize;
-+    getMenuItemPosSize(aPos, aSize, maOpenTimer.mnMenuPos);
-+    ScMenuFloatingWindow* pSubMenu = maOpenTimer.mpSubMenu;
-+
-+    if (!pSubMenu)
-+        return;
-+
-+    sal_uInt32 nOldFlags = GetPopupModeFlags();
-+    SetPopupModeFlags(nOldFlags | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE);
-+    pSubMenu->resetMenu(bSetMenuPos);
-+    pSubMenu->StartPopupMode(
-+        Rectangle(aPos,aSize), (FLOATWIN_POPUPMODE_RIGHT | FLOATWIN_POPUPMODE_GRABFOCUS));
-+    pSubMenu->AddPopupModeWindow(this);
-+    SetPopupModeFlags(nOldFlags);
-+}
-+
-+void ScMenuFloatingWindow::endSubMenu()
-+{
-+    if (maOpenTimer.mpSubMenu)
-+    {
-+        maOpenTimer.mpSubMenu->EndPopupMode();
-+        maOpenTimer.mpSubMenu = NULL;
-+        highlightMenuItem(maOpenTimer.mnMenuPos, true);
-+    }
-+}
-+
-+void ScMenuFloatingWindow::notify(NotificationType eType)
-+{
-+    switch (eType)
-+    {
-+        case SUBMENU_FOCUSED:
-+            // Cancel any request for ending submenu.
-+            maCloseTimer.reset();
-+            if (mnSelectedMenu != maOpenTimer.mnMenuPos)
-+            {
-+                highlightMenuItem(maOpenTimer.mnMenuPos, true);
-+                mnSelectedMenu = maOpenTimer.mnMenuPos;
-+            }
-+        break;
-+        default:
-+            ;
-+    }
-+}
-+
-+void ScMenuFloatingWindow::resetMenu(bool bSetMenuPos)
-+{
-+    mnSelectedMenu = bSetMenuPos ? 0 : MENU_NOT_SELECTED;
-+    resizeToFitMenuItems();
-+}
-+
-+void ScMenuFloatingWindow::resizeToFitMenuItems()
-+{
-+    if (maMenuItems.empty())
-+        return;
-+
-+    vector<MenuItem>::const_iterator itr = maMenuItems.begin(), itrEnd = maMenuItems.end();
-+    long nTextWidth = 0;
-+    for (; itr != itrEnd; ++itr)
-+        nTextWidth = ::std::max(GetTextWidth(itr->maText), nTextWidth);
-+
-+    size_t nLastPos = maMenuItems.size()-1;
-+    Point aPos;
-+    Size aSize;
-+    getMenuItemPosSize(aPos, aSize, nLastPos);
-+    aPos.X() += nTextWidth + 15;
-+    aPos.Y() += aSize.Height() + 5;
-+    SetOutputSizePixel(Size(aPos.X(), aPos.Y()));
-+}
-+
-+void ScMenuFloatingWindow::selectMenuItem(size_t nPos, bool bSelected, bool bSubMenuTimer)
-+{
-+    if (nPos >= maMenuItems.size() || nPos == MENU_NOT_SELECTED)
-+    {
-+        queueCloseSubMenu();
-+        return;
-+    }
-+
-+    if (!maMenuItems[nPos].mbEnabled)
-+    {    
-+        queueCloseSubMenu();
-+        return;
-+    }
-+
-+    highlightMenuItem(nPos, bSelected);
-+
-+    if (bSelected)
-+    {
-+        if (mpParentMenu)
-+            mpParentMenu->notify(SUBMENU_FOCUSED);
-+
-+        if (bSubMenuTimer)
-+        {
-+            if (maMenuItems[nPos].mpSubMenuWin)
-+            {
-+                ScMenuFloatingWindow* pSubMenu = maMenuItems[nPos].mpSubMenuWin.get();
-+                queueLaunchSubMenu(nPos, pSubMenu);
-+            }
-+            else
-+                queueCloseSubMenu();
-+        }
-+    }
-+}
-+
-+void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected)
-+{
-+    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
-+    Color aBackColor = rStyle.GetMenuColor();
-+    SetFillColor(aBackColor);
-+    SetLineColor(aBackColor);
-+
-+    Point aPos;
-+    Size aSize;
-+    getMenuItemPosSize(aPos, aSize, nPos);
-+    Region aRegion(Rectangle(aPos,aSize));
-+
-+    if (IsNativeControlSupported(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL))
-+    {
-+        Push(PUSH_CLIPREGION);
-+        IntersectClipRegion(Rectangle(aPos, aSize));
-+        Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel()); 
-+        DrawNativeControl(
-+            CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, Region(aCtrlRect), CTRL_STATE_ENABLED,
-+            ImplControlValue(), OUString());
-+
-+        Pop();
-+    }
-+
-+    bool bNativeDrawn = true;
-+    if (IsNativeControlSupported(CTRL_MENU_POPUP, PART_MENU_ITEM))
-+    {
-+        ControlState nState = bSelected ? CTRL_STATE_SELECTED : 0;
-+        if (maMenuItems[nPos].mbEnabled)
-+            nState |= CTRL_STATE_ENABLED;
-+        bNativeDrawn = DrawNativeControl(
-+            CTRL_MENU_POPUP, PART_MENU_ITEM, aRegion, nState, ImplControlValue(), OUString());
-+    }
-+    else
-+        bNativeDrawn = false;
-+
-+    if (!bNativeDrawn)
-+    {
-+        if (bSelected)
-+        {
-+            aBackColor = rStyle.GetMenuHighlightColor();
-+            SetFillColor(aBackColor);
-+            SetLineColor(aBackColor);
-+        }
-+        DrawRect(Rectangle(aPos,aSize));
-+    }
-+
-+    Color aTextColor = bSelected ? rStyle.GetMenuHighlightTextColor() : rStyle.GetMenuTextColor();
-+    SetTextColor(aTextColor);
-+    drawMenuItem(nPos);
-+}
-+
-+void ScMenuFloatingWindow::getMenuItemPosSize(Point& rPos, Size& rSize, size_t nPos) const
-+{
-+    const sal_uInt16 nLeftMargin = 5;
-+    const sal_uInt16 nTopMargin = 5;
-+    const sal_uInt16 nMenuItemHeight = maLabelFont.GetHeight()*1.8;
-+
-+    Size aWndSize = GetSizePixel();
-+
-+    Point aPos1(nLeftMargin, nTopMargin);
-+    Size aSize1(aWndSize.Width() - nLeftMargin*2, nMenuItemHeight);
-+
-+    rPos = aPos1;
-+    rPos.Y() += aSize1.Height()*nPos;
-+    rSize = aSize1;
-+}
-+
-+size_t ScMenuFloatingWindow::getEnclosingMenuItem(const Point& rPos) const
-+{
-+    size_t n = maMenuItems.size();
-+    for (size_t i = 0; i < n; ++i)
-+    {
-+        Point aPos;
-+        Size aSize;
-+        getMenuItemPosSize(aPos, aSize, i);
-+        Rectangle aRect(aPos, aSize);
-+        if (aRect.IsInside(rPos))
-+            return i;
-+    }
-+    return MENU_NOT_SELECTED;
-+}
-+
-+IMPL_LINK( ScMenuFloatingWindow, EndPopupHdl, void*, EMPTYARG )
-+{
-+    if (mbActionFired && mpParentMenu)
-+        mpParentMenu->EndPopupMode();
-+
-+    return 0;
-+}
-+
-+// ============================================================================
-+
- ScDPFieldPopupWindow::Member::Member() :
-     mbVisible(true)
- {
-@@ -189,8 +711,19 @@ ScDPFieldPopupWindow::Member::Member() :
- 
- // ----------------------------------------------------------------------------
- 
-+ScDPFieldPopupWindow::CancelButton::CancelButton(ScDPFieldPopupWindow* pParent) :
-+    ::CancelButton(pParent), mpParent(pParent) {}
-+
-+void ScDPFieldPopupWindow::CancelButton::Click()
-+{
-+    mpParent->EndPopupMode();
-+    ::CancelButton::Click();
-+}
-+
-+// ----------------------------------------------------------------------------
-+
- ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent) :
--    FloatingWindow(pParent, (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER)),
-+    ScMenuFloatingWindow(pParent),
-     maCheck0(this, 0),
-     maCheck1(this, 0),
-     maCheck2(this, 0),
-@@ -201,8 +734,6 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent) :
-     maCheck7(this, 0),
-     maCheck8(this, 0),
-     maCheck9(this, 0),
--    maCheck10(this, 0),
--    maCheck11(this, 0),
-     maScrollBar(this, WB_VERT),
-     maBtnOk(this),
-     maBtnCancel(this),
-@@ -210,12 +741,13 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent) :
-     mpOKAction(NULL),
-     mnScrollPos(0)
- {
--    SetOutputSizePixel(Size(150, 280));
-+    Point aPos;
-+    Size aSize;
-+    getSectionPosSize(aPos, aSize, WHOLE);
-+    SetOutputSizePixel(aSize);
-     Size aOutSize = GetOutputSizePixel();
- 
--    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
--
--    mpCheckPtr.reserve(12);
-+    mpCheckPtr.reserve(10);
-     mpCheckPtr.push_back(&maCheck0);
-     mpCheckPtr.push_back(&maCheck1);
-     mpCheckPtr.push_back(&maCheck2);
-@@ -226,33 +758,27 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent) :
-     mpCheckPtr.push_back(&maCheck7);
-     mpCheckPtr.push_back(&maCheck8);
-     mpCheckPtr.push_back(&maCheck9);
--    mpCheckPtr.push_back(&maCheck10);
--    mpCheckPtr.push_back(&maCheck11);
-     
--    Point aPos;
--    Size aSize;
-     getSectionPosSize(aPos, aSize, FIRST_LISTITEM);    
--    Font aMemFont(rStyle.GetLabelFont());
--    aMemFont.SetHeight(11);
-     for (vector<CheckBox*>::iterator itr = mpCheckPtr.begin(), itrEnd = mpCheckPtr.end();
-           itr != itrEnd; ++itr)
-     {
-         CheckBox* p = *itr;
-         p->SetPosSizePixel(aPos, aSize);
--        p->SetFont(aMemFont);
-+        p->SetFont(getLabelFont());
-         p->SetClickHdl( LINK(this, ScDPFieldPopupWindow, CheckBoxHdl) );
--        aPos.Y() += 18;
-+        aPos.Y() += aSize.Height() + 1;
-     }
- 
-     getSectionPosSize(aPos, aSize, BTN_OK);
-     maBtnOk.SetPosSizePixel(aPos, aSize);
--    maBtnOk.SetFont(aMemFont);
-+    maBtnOk.SetFont(getLabelFont());
-     maBtnOk.SetClickHdl( LINK(this, ScDPFieldPopupWindow, OKButtonHdl) );
-     maBtnOk.Show();
- 
-     getSectionPosSize(aPos, aSize, BTN_CANCEL);
-     maBtnCancel.SetPosSizePixel(aPos, aSize);
--    maBtnCancel.SetFont(aMemFont);
-+    maBtnCancel.SetFont(getLabelFont());
-     maBtnCancel.Show();
- 
-     getSectionPosSize(aPos, aSize, SCROLL_BAR_V);
-@@ -264,6 +790,10 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent) :
-     maScrollBar.EnableDrag(true);
- }
- 
-+ScDPFieldPopupWindow::~ScDPFieldPopupWindow()
-+{
-+}
-+
- vector<ScDPFieldPopupWindow::Member>& ScDPFieldPopupWindow::getMembers()
- {
-     return maMembers;
-@@ -271,61 +801,66 @@ vector<ScDPFieldPopupWindow::Member>& ScDPFieldPopupWindow::getMembers()
- 
- void ScDPFieldPopupWindow::getSectionPosSize(Point& rPos, Size& rSize, SectionType eType) const
- {
--    static const long nListBoxMargin = 5;
--    static const long nBottomBtnAreaHeight = 50;
--    static const long nInnerItemMargin = 5;
--    static const long nScrollBarWidth = 17;
--    static const long nBtnWidth = 60;
--    static const long nBtnHeight = 22;
--    static const long nBottomMargin = 10;
--
--    const Size& rWndSize = GetSizePixel();
-+    const sal_uInt16 nListBoxMargin = 5;
-+    const sal_uInt16 nTopMargin = 5;
-+    const sal_uInt16 nMenuHeight = 60;
-+    const sal_uInt16 nBottomBtnAreaHeight = 50;
-+    const sal_uInt16 nInnerItemMargin = 5;
-+    const sal_uInt16 nScrollBarWidth = 17;
-+    const sal_uInt16 nBtnWidth = 60;
-+    const sal_uInt16 nBtnHeight = getLabelFont().GetHeight()*2;
-+    const sal_uInt16 nBottomMargin = 10;
-+    const sal_uInt16 nMenuListMargin = 20;
-+
-+    Size aWndSize = Size(160, 330);
- 
-     switch (eType)
-     {
-         case WHOLE:
-+        {
-             rPos  = Point(0, 0);
--            rSize = rWndSize;
-+            rSize = aWndSize;
-+        }
-         break;
-         case LISTBOX_AREA:
-         {
--            rPos = Point(nListBoxMargin, nListBoxMargin);
-+            rPos = Point(nListBoxMargin, nTopMargin + nMenuHeight + nMenuListMargin);
-             rSize = Size(
--                rWndSize.Width() -  nListBoxMargin*2, 
--                rWndSize.Height() - nListBoxMargin - nBottomBtnAreaHeight);
-+                aWndSize.Width() - nListBoxMargin*2, 
-+                aWndSize.Height() - nTopMargin - nMenuHeight - nMenuListMargin - nBottomBtnAreaHeight);
-         }
-         break;
-         case FIRST_LISTITEM:
-         {
-             rPos = Point(nListBoxMargin + nInnerItemMargin,
--                         nListBoxMargin + nInnerItemMargin);
-+                         nTopMargin + nMenuHeight + nMenuListMargin + nInnerItemMargin);
-             rSize = Size(
--                rWndSize.Width() - nListBoxMargin*2 - nInnerItemMargin - nScrollBarWidth - 10,
-+                aWndSize.Width() - nListBoxMargin*2 - nInnerItemMargin - nScrollBarWidth - 10,
-                 17);
-         }
-         break;
-         case BTN_OK:
-         {
--            long x = (rWndSize.Width() - nBtnWidth*2)/3;
--            long y = rWndSize.Height() - nBottomMargin - nBtnHeight;
-+            long x = (aWndSize.Width() - nBtnWidth*2)/3;
-+            long y = aWndSize.Height() - nBottomMargin - nBtnHeight;
-             rPos = Point(x, y);
-             rSize = Size(nBtnWidth, nBtnHeight);
-         }
-         break;
-         case BTN_CANCEL:
-         {
--            long x = (rWndSize.Width() - nBtnWidth*2)/3*2 + nBtnWidth;
--            long y = rWndSize.Height() - nBottomMargin - nBtnHeight;
-+            long x = (aWndSize.Width() - nBtnWidth*2)/3*2 + nBtnWidth;
-+            long y = aWndSize.Height() - nBottomMargin - nBtnHeight;
-             rPos = Point(x, y);
-             rSize = Size(nBtnWidth, nBtnHeight);
-         }
-         break;
-         case SCROLL_BAR_V:
-         {
--            long x = rWndSize.Width() - nListBoxMargin - nInnerItemMargin - nScrollBarWidth;
--            long y = nListBoxMargin + nInnerItemMargin;
-+            long x = aWndSize.Width() - nListBoxMargin - nInnerItemMargin - nScrollBarWidth;
-+            long y = nTopMargin + nMenuHeight + nMenuListMargin + nInnerItemMargin;
-             rPos = Point(x, y);
--            long h = rWndSize.Height() - nListBoxMargin - nBottomBtnAreaHeight - nInnerItemMargin*2;
-+            long h = aWndSize.Height() - nTopMargin - nMenuHeight - nMenuListMargin - nBottomBtnAreaHeight - nInnerItemMargin*2;
-             rSize = Size(nScrollBarWidth, h);
-         }
-         break;
-@@ -377,31 +912,26 @@ IMPL_LINK( ScDPFieldPopupWindow, ScrollHdl, ScrollBar*, EMPTYARG )
-     return 0;
- }
- 
--ScDPFieldPopupWindow::~ScDPFieldPopupWindow()
-+void ScDPFieldPopupWindow::MouseMove(const MouseEvent& rMEvt)
- {
--    EndPopupMode();
-+    ScMenuFloatingWindow::MouseMove(rMEvt);
-+
-+    size_t nSelectedMenu = getSelectedMenuItem();
-+    if (nSelectedMenu == MENU_NOT_SELECTED)
-+        queueCloseSubMenu();
- }
- 
- void ScDPFieldPopupWindow::Paint(const Rectangle& rRect)
- {
--    Window::Paint(rRect);
-+    ScMenuFloatingWindow::Paint(rRect);
- 
-     const StyleSettings& rStyle = GetSettings().GetStyleSettings();
--    Color aBackColor = rStyle.GetMenuColor();
--    Color aBorderColor = rStyle.GetShadowColor();
-     Color aMemberBackColor = rStyle.GetFieldColor();
- 
--    Point aPos;
--    Size aSize;
--
--    // Window background
--    SetFillColor(aBackColor);
--    SetLineColor(aBorderColor);
--    getSectionPosSize(aPos, aSize, WHOLE);
--    DrawRect(Rectangle(aPos,aSize));
--
-     // Member list box background
-     SetFillColor(aMemberBackColor);
-+    Point aPos;
-+    Size aSize;
-     getSectionPosSize(aPos, aSize, LISTBOX_AREA);
-     DrawRect(Rectangle(aPos,aSize));
- }
-@@ -472,7 +1002,7 @@ ScDPFieldPopupWindow::ExtendedData* ScDPFieldPopupWindow::getExtendedData()
-     return mpExtendedData.get();
- }
- 
--void ScDPFieldPopupWindow::setOKAction(OKAction* p)
-+void ScDPFieldPopupWindow::setOKAction(Action* p)
- {
-     mpOKAction.reset(p);
- }
-diff --git sc/source/ui/cctrl/dpcontrol.src sc/source/ui/cctrl/dpcontrol.src
-new file mode 100644
-index 0000000..6c5fffe
---- /dev/null
-+++ sc/source/ui/cctrl/dpcontrol.src
-@@ -0,0 +1,49 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: globstr.src,v $
-+ * $Revision: 1.74.96.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#include "dpcontrol.hrc"
-+
-+Resource RID_SC_DPCONTROL
-+{
-+    String STR_MENU_SORT_ASC
-+    {
-+        Text [ en-US ] = "Sort Ascending" ;
-+    };
-+
-+    String STR_MENU_SORT_DESC
-+    {
-+        Text [ en-US ] = "Sort Descending" ;
-+    };
-+
-+    String STR_MENU_SORT_CUSTOM
-+    {
-+        Text [ en-US ] = "Custom Sort" ;
-+    };
-+};
-diff --git sc/source/ui/cctrl/makefile.mk sc/source/ui/cctrl/makefile.mk
-index 8e8add3..70095d8 100644
---- sc/source/ui/cctrl/makefile.mk
-+++ sc/source/ui/cctrl/makefile.mk
-@@ -45,7 +45,8 @@ LIBTARGET=NO
- # --- Files --------------------------------------------------------
- 
- EXCEPTIONSFILES= \
--    $(SLO)$/tbzoomsliderctrl.obj
-+    $(SLO)$/tbzoomsliderctrl.obj \
-+    $(SLO)$/dpcontrol.obj
- 
- SLOFILES =	\
- 		$(SLO)$/popmenu.obj		\
-@@ -55,6 +56,10 @@ SLOFILES =	\
- 		$(SLO)$/editfield.obj	\
- 		$(EXCEPTIONSFILES)
- 
-+SRS1NAME=$(TARGET)
-+SRC1FILES = \
-+	dpcontrol.src
-+
- LIB1TARGET=$(SLB)$/$(TARGET).lib
- LIB1OBJFILES= \
- 		$(SLO)$/popmenu.obj		\
-@@ -63,6 +68,7 @@ LIB1OBJFILES= \
- 		$(SLO)$/dpcontrol.obj	\
- 		$(SLO)$/tbzoomsliderctrl.obj
- 
-+
- # --- Tagets -------------------------------------------------------
- 
- .INCLUDE :  target.mk
-diff --git sc/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
-index d894e48..b494ae6 100644
---- sc/source/ui/inc/dbfunc.hxx
-+++ sc/source/ui/inc/dbfunc.hxx
-@@ -101,6 +101,7 @@ public:
-     void            UngroupDataPilot();
-     void            DataPilotInput( const ScAddress& rPos, const String& rString );
- 
-+    bool            DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16* pUserListId = NULL );
-     BOOL            DataPilotMove( const ScRange& rSource, const ScAddress& rDest );
- 
-     BOOL            HasSelectionForDrillDown( USHORT& rOrientation );
-diff --git sc/source/ui/inc/dpcontrol.hrc sc/source/ui/inc/dpcontrol.hrc
-new file mode 100644
-index 0000000..2ca698d
---- /dev/null
-+++ sc/source/ui/inc/dpcontrol.hrc
-@@ -0,0 +1,40 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: protectiondlg.hrc,v $
-+ * $Revision: 1.1.2.1 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __DPCONTROL_HRC__
-+#define __DPCONTROL_HRC__
-+
-+#include <sc.hrc>
-+
-+#define STR_MENU_SORT_ASC       1
-+#define STR_MENU_SORT_DESC      2
-+#define STR_MENU_SORT_CUSTOM    3
-+
-+#endif
-diff --git sc/source/ui/inc/dpcontrol.hxx sc/source/ui/inc/dpcontrol.hxx
-index 6a28354..64d56d3 100644
---- sc/source/ui/inc/dpcontrol.hxx
-+++ sc/source/ui/inc/dpcontrol.hxx
-@@ -36,7 +36,9 @@
- #include "vcl/floatwin.hxx"
- #include "vcl/button.hxx"
- #include "vcl/scrbar.hxx"
-+#include "vcl/timer.hxx"
- 
-+#include <boost/shared_ptr.hpp>
- #include <memory>
- #include <hash_map>
- 
-@@ -80,43 +82,128 @@ private:
- 
- // ============================================================================
- 
--/** 
-- * This class implements a popup window for field button, for quick access 
-- * of hide-item list, and possibly more stuff related to field options. 
-- */
--class ScDPFieldPopupWindow : public FloatingWindow
-+class ScMenuFloatingWindow : public FloatingWindow
- {
- public:
--    class ButtonEvent
-+    /** 
-+     * Action to perform when an event takes place.  Create a sub-class of 
-+     * this to implement the desired action. 
-+     */
-+    class Action
-     {
-     public:
-         virtual void execute() = 0;
-     };
- 
-+    explicit ScMenuFloatingWindow(Window* pParent);
-+    virtual ~ScMenuFloatingWindow();
-+
-+    virtual void MouseMove(const MouseEvent& rMEvt);
-+    virtual void MouseButtonDown(const MouseEvent& rMEvt);
-+    virtual void MouseButtonUp(const MouseEvent& rMEvt);
-+    virtual void KeyInput(const KeyEvent& rKEvt);
-+    virtual void Paint(const Rectangle& rRect);
-+
-+    void addMenuItem(const ::rtl::OUString& rText, bool bEnabled, Action* pAction);
-+    ScMenuFloatingWindow* addSubMenuItem(const ::rtl::OUString& rText, bool bEnabled);
-+
-+protected:
-+    void drawMenuItem(size_t nPos);
-+    void drawAllMenuItems();
-+    const Font& getLabelFont() const;
-+
-+    void executeMenu(size_t nPos);
-+    void setSelectedMenuItem(size_t nPos, bool bSubMenuTimer = true);
-+    size_t getSelectedMenuItem() const;
-+    void queueLaunchSubMenu(size_t nPos, ScMenuFloatingWindow* pMenu);
-+    void queueCloseSubMenu();
-+    void launchSubMenu(bool bSetMenuPos);
-+    void endSubMenu();
-+
-+private:
-+    struct SubMenuItem;
-+    void handleMenuTimeout(SubMenuItem* pTimer);
-+
-+    enum NotificationType { SUBMENU_FOCUSED };
-+    void notify(NotificationType eType);
-+
-+    void resetMenu(bool bSetMenuPos);
-+    void resizeToFitMenuItems();
-+    void selectMenuItem(size_t nPos, bool bSelected, bool bSubMenuTimer);
-+    void highlightMenuItem(size_t nPos, bool bSelected);
-+
-+    void getMenuItemPosSize(Point& rPos, Size& rSize, size_t nPos) const;
-+    size_t getEnclosingMenuItem(const Point& rPos) const;
-+
-+    DECL_LINK( EndPopupHdl, void* );
-+
-+private:
-+    struct MenuItem
-+    {
-+        ::rtl::OUString maText;
-+        bool            mbEnabled;
-+
-+        ::boost::shared_ptr<Action> mpAction;
-+        ::boost::shared_ptr<ScMenuFloatingWindow> mpSubMenuWin;
-+
-+        MenuItem();
-+    };
-+
-+    ::std::vector<MenuItem>         maMenuItems;
-+
-+    struct SubMenuItem
-+    {
-+        Timer                   maTimer;
-+        ScMenuFloatingWindow*   mpSubMenu;
-+        size_t                  mnMenuPos;
-+
-+        DECL_LINK( TimeoutHdl, void* );
-+
-+        SubMenuItem(ScMenuFloatingWindow* pParent);
-+        void reset();
-+
-+    private:
-+        ScMenuFloatingWindow* mpParent;
-+    };
-+    SubMenuItem   maOpenTimer;
-+    SubMenuItem   maCloseTimer;
-+
-+    Font    maLabelFont;
-+
-+    size_t  mnSelectedMenu;
-+    size_t  mnClickedMenu;
-+
-+    ScMenuFloatingWindow* mpParentMenu;
-+    ScMenuFloatingWindow* mpActiveSubMenu;
-+
-+    bool    mbActionFired;
-+};
-+
-+// ============================================================================
-+
-+/** 
-+ * This class implements a popup window for field button, for quick access 
-+ * of hide-item list, and possibly more stuff related to field options. 
-+ */
-+class ScDPFieldPopupWindow : public ScMenuFloatingWindow
-+{
-+public:
-     /** 
-      * Extended data that the client code may need to store.  Create a 
-      * sub-class of this and store data there. 
-      */ 
-     struct ExtendedData {};
- 
--    /** 
--     * Action to perform when the OK button is pressed.  Create a sub-class of 
--     * this to implement the desired action.
--     */
--    class OKAction
--    {
--    public:
--        virtual void execute() = 0;
--    };
--
-     explicit ScDPFieldPopupWindow(Window* pParent);
-     virtual ~ScDPFieldPopupWindow();
- 
-+    virtual void MouseMove(const MouseEvent& rMEvt);
-     virtual void Paint(const Rectangle& rRect);
- 
-     void setMemberSize(size_t n);
-     void addMember(const ::rtl::OUString& rName, bool bVisible);
-     void initMembers();
-+
-     void getResult(::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rResult);
-     void close(bool bOK);
- 
-@@ -132,7 +219,7 @@ public:
-      */
-     ExtendedData* getExtendedData();
- 
--    void setOKAction(OKAction* p);
-+    void setOKAction(Action* p);
- 
- private:
-     struct Member
-@@ -143,6 +230,17 @@ private:
-         Member();
-     };
- 
-+    class CancelButton : public ::CancelButton
-+    {
-+    public:
-+        CancelButton(ScDPFieldPopupWindow* pParent);
-+
-+        virtual void Click();
-+
-+    private:
-+        ScDPFieldPopupWindow* mpParent;
-+    };
-+
-     ::std::vector<Member>& getMembers();
- 
-     enum SectionType {
-@@ -173,8 +271,6 @@ private:
-     CheckBox maCheck7;
-     CheckBox maCheck8;
-     CheckBox maCheck9;
--    CheckBox maCheck10;
--    CheckBox maCheck11;
- 
-     ScrollBar   maScrollBar;
- 
-@@ -185,9 +281,9 @@ private:
- 
-     ::std::vector<Member>           maMembers;
-     ::std::auto_ptr<ExtendedData>   mpExtendedData;
--    ::std::auto_ptr<OKAction>       mpOKAction;
-+    ::std::auto_ptr<Action>         mpOKAction;
- 
--    size_t mnScrollPos;
-+    size_t  mnScrollPos;
- };
- 
- #endif
-diff --git sc/source/ui/view/dbfunc3.cxx sc/source/ui/view/dbfunc3.cxx
-index d83add1..f58d9b5 100644
---- sc/source/ui/view/dbfunc3.cxx
-+++ sc/source/ui/view/dbfunc3.cxx
-@@ -81,9 +81,13 @@
- #include "patattr.hxx"
- #include "unonames.hxx"
- #include "cell.hxx"
-+#include "userlist.hxx"
- 
- #include <hash_set>
-+#include <hash_map>
- #include <memory>
-+#include <list>
-+#include <vector>
- 
- using namespace com::sun::star;
- using ::com::sun::star::uno::Any;
-@@ -94,8 +98,13 @@ using ::com::sun::star::beans::XPropertySet;
- using ::com::sun::star::container::XNameAccess;
- using ::com::sun::star::sheet::XDimensionsSupplier;
- using ::rtl::OUString;
-+using ::rtl::OUStringHash;
- using ::rtl::OUStringBuffer;
- using ::std::auto_ptr;
-+using ::std::list;
-+using ::std::vector;
-+using ::std::hash_map;
-+using ::std::hash_set;
- 
- // STATIC DATA -----------------------------------------------------------
- 
-@@ -1695,6 +1704,134 @@ void lcl_MoveToEnd( ScDPSaveDimension& rDim, const String& rItemName )
-     // puts it to the end of the list even if it was in the list before.
- }
- 
-+bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16* pUserListId )
-+{
-+    ScDocument* pDoc = GetViewData()->GetDocument();
-+    ScDPObject* pDPObj = pDoc->GetDPAtCursor(rPos.Col(), rPos.Row(), rPos.Tab());
-+    if (!pDPObj)
-+        return false;
-+
-+    // We need to run this to get all members later.
-+    pDPObj->BuildAllDimensionMembers();
-+
-+    USHORT nOrientation;
-+    long nDimIndex = pDPObj->GetHeaderDim(rPos, nOrientation);
-+    if (nDimIndex < 0)
-+        // Invalid dimension index.  Bail out.
-+        return false;
-+
-+    BOOL bDataLayout;
-+    ScDPSaveData* pSaveData = pDPObj->GetSaveData();
-+    if (!pSaveData)
-+        return false;
-+
-+    ScDPSaveData aNewSaveData(*pSaveData);
-+    String aDimName = pDPObj->GetDimName(nDimIndex, bDataLayout);
-+    ScDPSaveDimension* pSaveDim = aNewSaveData.GetDimensionByName(aDimName);
-+    if (!pSaveDim)
-+        return false;
-+
-+    typedef ScDPSaveDimension::MemberList MemList;
-+    const MemList& rDimMembers = pSaveDim->GetMembers();
-+    list<OUString> aMembers;
-+    hash_set<OUString, ::rtl::OUStringHash> aMemberSet;
-+    size_t nMemberCount = 0;
-+    for (MemList::const_iterator itr = rDimMembers.begin(), itrEnd = rDimMembers.end();
-+          itr != itrEnd; ++itr)
-+    {
-+        ScDPSaveMember* pMem = *itr;
-+        aMembers.push_back(pMem->GetName());
-+        aMemberSet.insert(pMem->GetName());
-+        ++nMemberCount;
-+    }
-+
-+    // Sort the member list in ascending order.
-+    aMembers.sort();
-+
-+    // Collect and rank those custom sort strings that also exist in the member name list.
-+
-+    typedef hash_map<OUString, sal_uInt16, OUStringHash> UserSortMap;
-+    UserSortMap aSubStrs;
-+    sal_uInt16 nSubCount = 0;
-+    if (pUserListId)
-+    {
-+        ScUserList* pUserList = ScGlobal::GetUserList();
-+        if (!pUserList)
-+            return false;
-+    
-+        {
-+            sal_uInt16 n = pUserList->GetCount();
-+            if (!n || *pUserListId >= n)
-+                return false;
-+        }
-+        
-+        ScUserListData* pData = static_cast<ScUserListData*>((*pUserList)[*pUserListId]);
-+        if (pData)
-+        {
-+            sal_uInt16 n = pData->GetSubCount();
-+            for (sal_uInt16 i = 0; i < n; ++i)
-+            {
-+                OUString aSub = pData->GetSubStr(i);
-+                if (!aMemberSet.count(aSub))
-+                    // This string doesn't exist in the member name set.  Don't add this.
-+                    continue;
-+
-+                aSubStrs.insert(UserSortMap::value_type(aSub, nSubCount++));
-+            }
-+        }
-+    }
-+
-+    // Rank all members.
-+
-+    vector<OUString> aRankedNames(nMemberCount);
-+    sal_uInt16 nCurStrId = 0;
-+    for (list<OUString>::const_iterator itr = aMembers.begin(), itrEnd = aMembers.end(); 
-+          itr != itrEnd; ++itr)
-+    {
-+        OUString aName = *itr;
-+        sal_uInt16 nRank = 0;
-+        UserSortMap::const_iterator itrSub = aSubStrs.find(aName);
-+        if (itrSub == aSubStrs.end())
-+            nRank = nSubCount + nCurStrId++;
-+        else
-+            nRank = itrSub->second;
-+
-+        if (!bAscending)
-+            nRank = nMemberCount - nRank - 1;
-+
-+        aRankedNames[nRank] = aName;
-+    }
-+
-+    // Re-order ScDPSaveMember instances with the new ranks.
-+
-+    for (vector<OUString>::const_iterator itr = aRankedNames.begin(), itrEnd = aRankedNames.end();
-+          itr != itrEnd; ++itr)
-+    {
-+        const ScDPSaveMember* pOldMem = pSaveDim->GetExistingMemberByName(*itr);
-+        if (!pOldMem)
-+            // All members are supposed to be present.
-+            continue;
-+
-+        ScDPSaveMember* pNewMem = new ScDPSaveMember(*pOldMem);
-+        pSaveDim->AddMember(pNewMem);
-+    }
-+
-+    // Set the sorting mode to manual for now.  We may introduce a new sorting
-+    // mode later on.
-+
-+    sheet::DataPilotFieldSortInfo aSortInfo;
-+    aSortInfo.Mode = sheet::DataPilotFieldSortMode::MANUAL;
-+    pSaveDim->SetSortInfo(&aSortInfo);
-+
-+    // Update the datapilot with the newly sorted field members.
-+
-+    auto_ptr<ScDPObject> pNewObj(new ScDPObject(*pDPObj));
-+    pNewObj->SetSaveData(aNewSaveData);
-+    ScDBDocFunc aFunc(*GetViewData()->GetDocShell());
-+
-+    return aFunc.DataPilotUpdate(pDPObj, pNewObj.get(), true, false);
-+}
-+
- BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
- {
-     BOOL bRet = FALSE;
-diff --git sc/source/ui/view/gridwin2.cxx sc/source/ui/view/gridwin2.cxx
-index 63ce024..72a6606 100644
---- sc/source/ui/view/gridwin2.cxx
-+++ sc/source/ui/view/gridwin2.cxx
-@@ -56,6 +56,9 @@
- #include "dpshttab.hxx"
- #include "dbdocfun.hxx"
- #include "dpcontrol.hxx"
-+#include "dpcontrol.hrc"
-+#include "strload.hxx"
-+#include "userlist.hxx"
- 
- #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
- #include "scabstdlg.hxx" //CHINA001
-@@ -778,7 +781,7 @@ struct DPFieldPopupData : public ScDPFieldPopupWindow::ExtendedData
-     long            mnDim;
- };
- 
--class DPFieldPopupOKAction : public ScDPFieldPopupWindow::OKAction
-+class DPFieldPopupOKAction : public ScMenuFloatingWindow::Action
- {
- public:
-     explicit DPFieldPopupOKAction(ScGridWindow* p) : 
-@@ -792,6 +795,39 @@ private:
-     ScGridWindow* mpGridWindow;
- };
- 
-+class PopupSortAction : public ScMenuFloatingWindow::Action
-+{
-+public:
-+    enum SortType { ASCENDING, DESCENDING, CUSTOM };
-+
-+    explicit PopupSortAction(const ScAddress& rPos, SortType eType, sal_uInt16 nUserListIndex, ScTabViewShell* pViewShell) :
-+        maPos(rPos), meType(eType), mnUserListIndex(nUserListIndex), mpViewShell(pViewShell) {}
-+
-+    virtual void execute()
-+    {
-+        switch (meType)
-+        {
-+            case ASCENDING:
-+                mpViewShell->DataPilotSort(maPos, true);
-+            break;
-+            case DESCENDING:
-+                mpViewShell->DataPilotSort(maPos, false);
-+            break;
-+            case CUSTOM:
-+                mpViewShell->DataPilotSort(maPos, true, &mnUserListIndex);
-+            break;
-+            default:
-+                ;
-+        }
-+    }
-+
-+private:
-+    ScAddress       maPos;
-+    SortType        meType;
-+    sal_uInt16      mnUserListIndex;
-+    ScTabViewShell* mpViewShell;
-+};
-+
- }
- 
- void ScGridWindow::DPLaunchFieldPopupMenu(
-@@ -814,11 +850,48 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
-     mpDPFieldPopup.reset(new ScDPFieldPopupWindow(this));
-     mpDPFieldPopup->setExtendedData(pDPData.release());
-     mpDPFieldPopup->setOKAction(new DPFieldPopupOKAction(this));
--    sal_Int32 n = rLabelData.maMembers.getLength();
--    mpDPFieldPopup->setMemberSize(n);
--    for (sal_Int32 i = 0; i < n; ++i)
--        mpDPFieldPopup->addMember(rLabelData.maMembers[i], rLabelData.maVisible[i]);
--    mpDPFieldPopup->initMembers();
-+    {
-+        sal_Int32 n = rLabelData.maMembers.getLength();
-+        mpDPFieldPopup->setMemberSize(n);
-+        for (sal_Int32 i = 0; i < n; ++i)
-+            mpDPFieldPopup->addMember(rLabelData.maMembers[i], rLabelData.maVisible[i]);
-+        mpDPFieldPopup->initMembers();
-+    }
-+
-+    vector<OUString> aUserSortNames;
-+    ScUserList* pUserList = ScGlobal::GetUserList();
-+    if (pUserList)
-+    {
-+        sal_uInt16 n = pUserList->GetCount();
-+        aUserSortNames.reserve(n);
-+        for (sal_uInt16 i = 0; i < n; ++i)
-+        {
-+            ScUserListData* pData = static_cast<ScUserListData*>((*pUserList)[i]);
-+            aUserSortNames.push_back(pData->GetString());
-+        }
-+    }
-+
-+    // Populate the menus.
-+    ScTabViewShell* pViewShell = pViewData->GetViewShell();
-+    mpDPFieldPopup->addMenuItem(
-+        ScRscStrLoader(RID_SC_DPCONTROL, STR_MENU_SORT_ASC).GetString(), true, 
-+        new PopupSortAction(rPos, PopupSortAction::ASCENDING, 0, pViewShell));
-+    mpDPFieldPopup->addMenuItem(
-+        ScRscStrLoader(RID_SC_DPCONTROL, STR_MENU_SORT_DESC).GetString(), true,
-+        new PopupSortAction(rPos, PopupSortAction::DESCENDING, 0, pViewShell));
-+    ScMenuFloatingWindow* pSubMenu = mpDPFieldPopup->addSubMenuItem(
-+        ScRscStrLoader(RID_SC_DPCONTROL, STR_MENU_SORT_CUSTOM).GetString(), !aUserSortNames.empty());
-+
-+    if (pSubMenu && !aUserSortNames.empty())
-+    {
-+        size_t n = aUserSortNames.size();
-+        for (size_t i = 0; i < n; ++i)
-+        {    
-+            pSubMenu->addMenuItem(
-+                aUserSortNames[i], true, 
-+                new PopupSortAction(rPos, PopupSortAction::CUSTOM, i, pViewShell));
-+        }
-+    }
- 
-     mpDPFieldPopup->SetPopupModeEndHdl( LINK(this, ScGridWindow, PopupModeEndHdl) );
-     Rectangle aCellRect(rSrcPos, rSrcSize);
-diff --git sc/util/makefile.mk sc/util/makefile.mk
-index 88e0594..bdf4954 100644
---- sc/util/makefile.mk
-+++ sc/util/makefile.mk
-@@ -58,6 +58,7 @@ RESLIB1LIST=\
- 	$(SRS)$/formdlgs.srs \
- 	$(SRS)$/pagedlg.srs	\
- 	$(SRS)$/navipi.srs	\
-+	$(SRS)$/cctrl.srs	\
- 	$(SOLARCOMMONRESDIR)$/sfx.srs
- 
- RESLIB1NAME=sc
diff --git a/applied_patches/0571-unittesting-shell.diff b/applied_patches/0455-unittesting-shell.diff
similarity index 100%
rename from applied_patches/0571-unittesting-shell.diff
rename to applied_patches/0455-unittesting-shell.diff
diff --git a/applied_patches/0456-calc-ods-sheet-protection-sc.diff b/applied_patches/0456-calc-ods-sheet-protection-sc.diff
deleted file mode 100644
index 77602f945..000000000
--- a/applied_patches/0456-calc-ods-sheet-protection-sc.diff
+++ /dev/null
@@ -1,1032 +0,0 @@
-diff --git sc/inc/tabprotection.hxx sc/inc/tabprotection.hxx
-index 99fec7b..b986070 100644
---- sc/inc/tabprotection.hxx
-+++ sc/inc/tabprotection.hxx
-@@ -35,7 +35,6 @@
- #include <com/sun/star/uno/Sequence.hxx>
- 
- #include "global.hxx"
--#include <vector>
- #include <boost/shared_ptr.hpp>
- 
- #define ENABLE_SHEET_PROTECTION 1
-@@ -45,8 +44,9 @@ class ScTableProtectionImpl;
- 
- enum ScPasswordHash
- {
--    PASSHASH_OOO = 0,
--    PASSHASH_XL
-+    PASSHASH_SHA1 = 0,
-+    PASSHASH_XL,
-+    PASSHASH_UNSPECIFIED
- };
- 
- class ScPassHashHelper
-@@ -56,7 +56,11 @@ public:
-         least one hash that needs to be regenerated, it returns true.  If all
-         hash values are compatible with the specified hash type, then it
-         returns false. */
--    static bool needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash);
-+    static bool needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED);
-+
-+    static ::rtl::OUString getHashURI(ScPasswordHash eHash);
-+
-+    static ScPasswordHash getHashTypeFromURI(const ::rtl::OUString& rURI);
- 
- private:
-     ScPassHashHelper();
-@@ -75,11 +79,13 @@ public:
-     virtual void setProtected(bool bProtected) = 0;
- 
-     virtual bool isPasswordEmpty() const = 0;
--    virtual bool hasPasswordHash(ScPasswordHash eHash) const = 0;
-+    virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const = 0;
-     virtual void setPassword(const String& aPassText) = 0;
--    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(ScPasswordHash eHash) const = 0;
--    virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
--                                 ScPasswordHash eHash = PASSHASH_OOO) = 0;
-+    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(
-+        ScPasswordHash eHash, ScPasswordHash eHas2 = PASSHASH_UNSPECIFIED) const = 0;
-+    virtual void setPasswordHash(
-+        const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
-+        ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) = 0;
-     virtual bool verifyPassword(const String& aPassText) const = 0;
- };
- 
-@@ -105,11 +111,13 @@ public:
-     virtual void setProtected(bool bProtected);
-             
-     virtual bool isPasswordEmpty() const;
--    virtual bool hasPasswordHash(ScPasswordHash eHash) const;
-+    virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
-     virtual void setPassword(const String& aPassText);
--    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(ScPasswordHash eHash) const;
--    virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
--                                 ScPasswordHash eHash = PASSHASH_OOO);
-+    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(
-+        ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
-+    virtual void setPasswordHash(
-+        const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
-+        ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED);
-     virtual bool verifyPassword(const String& aPassText) const;
-     
-     bool isOptionEnabled(Option eOption) const;
-@@ -162,11 +170,13 @@ public:
-     virtual void setProtected(bool bProtected);
-             
-     virtual bool isPasswordEmpty() const;
--    virtual bool hasPasswordHash(ScPasswordHash eHash) const;
-+    virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
-     virtual void setPassword(const String& aPassText);
--    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(ScPasswordHash eHash) const;
--    virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
--                                 ScPasswordHash eHash = PASSHASH_OOO);
-+    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(
-+        ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
-+    virtual void setPasswordHash(
-+        const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
-+        ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED);
-     virtual bool verifyPassword(const String& aPassText) const;
-     
-     bool isOptionEnabled(Option eOption) const;
-diff --git sc/source/core/data/tabprotection.cxx sc/source/core/data/tabprotection.cxx
-index 2e51a33..463e6a8 100644
---- sc/source/core/data/tabprotection.cxx
-+++ sc/source/core/data/tabprotection.cxx
-@@ -38,20 +38,27 @@
- #include "svtools/PasswordHelper.hxx"
- #include "document.hxx"
- 
-+#include <vector>
-+
- #define DEBUG_TAB_PROTECTION 0
- 
-+#define URI_SHA1 "http://www.w3.org/2000/09/xmldsig#sha1"
-+#define URI_XLS_LEGACY "http://docs.oasis-open.org/office/ns/table/legacy-hash-excel"
-+
- using namespace ::com::sun::star;
- using ::com::sun::star::uno::Sequence;
- using ::rtl::OUString;
-+using ::rtl::OUStringBuffer;
-+using ::std::vector;
- 
- // ============================================================================
- 
--bool ScPassHashHelper::needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash)
-+bool ScPassHashHelper::needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash1, ScPasswordHash eHash2)
- {
-     if (rDoc.IsDocProtected())
-     {
-         const ScDocProtection* p = rDoc.GetDocProtection();
--        if (!p->isPasswordEmpty() && !p->hasPasswordHash(eHash))
-+        if (!p->isPasswordEmpty() && !p->hasPasswordHash(eHash1, eHash2))
-             return true;
-     }
- 
-@@ -63,13 +70,37 @@ bool ScPassHashHelper::needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash
-             // Sheet not protected.  Skip it.
-             continue;
- 
--        if (!p->isPasswordEmpty() && !p->hasPasswordHash(eHash))
-+        if (!p->isPasswordEmpty() && !p->hasPasswordHash(eHash1, eHash2))
-             return true;
-     }
- 
-     return false;
- }
- 
-+OUString ScPassHashHelper::getHashURI(ScPasswordHash eHash)
-+{
-+    switch (eHash)
-+    {
-+        case PASSHASH_SHA1:
-+            return OUString::createFromAscii(URI_SHA1);
-+        case PASSHASH_XL:
-+            return OUString::createFromAscii(URI_XLS_LEGACY);
-+        case PASSHASH_UNSPECIFIED:
-+        default:
-+            ;
-+    }
-+    return OUString();
-+}
-+
-+ScPasswordHash ScPassHashHelper::getHashTypeFromURI(const OUString& rURI)
-+{
-+    if (rURI.equalsAscii(URI_SHA1))
-+        return PASSHASH_SHA1;
-+    else if (rURI.equalsAscii(URI_XLS_LEGACY))
-+        return PASSHASH_XL;
-+    return PASSHASH_UNSPECIFIED;
-+}
-+
- // ============================================================================
- 
- ScPassHashProtectable::~ScPassHashProtectable()
-@@ -115,7 +146,8 @@ static Sequence<sal_Int8> lcl_getXLHash(const String& aPassText)
- class ScTableProtectionImpl
- {
- public:
--    static ::com::sun::star::uno::Sequence<sal_Int8> hashPassword(const String& aPassText, ScPasswordHash eHash = PASSHASH_OOO);
-+    static Sequence<sal_Int8> hashPassword(const String& aPassText, ScPasswordHash eHash = PASSHASH_SHA1);
-+    static Sequence<sal_Int8> hashPassword(const Sequence<sal_Int8>& rPassHash, ScPasswordHash eHash = PASSHASH_SHA1);
- 
-     explicit ScTableProtectionImpl(SCSIZE nOptSize);
-     explicit ScTableProtectionImpl(const ScTableProtectionImpl& r);
-@@ -125,10 +157,13 @@ public:
-     void setProtected(bool bProtected);
- 
-     bool isPasswordEmpty() const;
--    bool hasPasswordHash(ScPasswordHash eHash) const;
-+    bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
-     void setPassword(const String& aPassText);
--    ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(ScPasswordHash eHash) const;
--    void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash = PASSHASH_OOO);
-+    ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(
-+        ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
-+    void setPasswordHash(
-+        const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
-+        ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED);
-     bool verifyPassword(const String& aPassText) const;
-     
-     bool isOptionEnabled(SCSIZE nOptId) const;
-@@ -140,7 +175,8 @@ private:
-     ::std::vector<bool> maOptions;
-     bool mbEmptyPass;
-     bool mbProtected;
--    ScPasswordHash meHash;
-+    ScPasswordHash meHash1;
-+    ScPasswordHash meHash2;
- };
- 
- Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(const String& aPassText, ScPasswordHash eHash)
-@@ -151,19 +187,44 @@ Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(const String& aPassText,
-         case PASSHASH_XL:
-             aHash = lcl_getXLHash(aPassText);
-         break;
--        case PASSHASH_OOO:
--        default:            
-+        case PASSHASH_SHA1:
-             SvPasswordHelper::GetHashPassword(aHash, aPassText);
-         break;
-+        default:
-+            ;
-     }
-     return aHash;
- }
- 
-+Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(
-+    const Sequence<sal_Int8>& rPassHash, ScPasswordHash eHash)
-+{
-+    if (!rPassHash.getLength() || eHash == PASSHASH_UNSPECIFIED)
-+        return rPassHash;
-+
-+    // TODO: Right now, we only support double-hash by SHA1.
-+    if (eHash == PASSHASH_SHA1)
-+    {
-+        vector<sal_Char> aChars;
-+        sal_Int32 n = rPassHash.getLength();
-+        aChars.reserve(n);
-+        for (sal_Int32 i = 0; i < n; ++i)
-+            aChars.push_back(static_cast<sal_Char>(rPassHash[i]));
-+
-+        Sequence<sal_Int8> aNewHash;
-+        SvPasswordHelper::GetHashPassword(aNewHash, &aChars[0], aChars.size());
-+        return aNewHash;
-+    }
-+
-+    return rPassHash;
-+}
-+
- ScTableProtectionImpl::ScTableProtectionImpl(SCSIZE nOptSize) :
-     maOptions(nOptSize),
-     mbEmptyPass(true),
-     mbProtected(false),
--    meHash(PASSHASH_OOO)
-+    meHash1(PASSHASH_SHA1),
-+    meHash2(PASSHASH_UNSPECIFIED)
- {
- }
- 
-@@ -173,7 +234,8 @@ ScTableProtectionImpl::ScTableProtectionImpl(const ScTableProtectionImpl& r) :
-     maOptions(r.maOptions),
-     mbEmptyPass(r.mbEmptyPass),
-     mbProtected(r.mbProtected),
--    meHash(r.meHash)
-+    meHash1(r.meHash1),
-+    meHash2(r.meHash2)
- {
- }
- 
-@@ -217,7 +279,7 @@ bool ScTableProtectionImpl::isPasswordEmpty() const
-     return mbEmptyPass;
- }
- 
--bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash) const
-+bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const
- {
-     if (mbEmptyPass)
-         return true;
-@@ -225,35 +287,65 @@ bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash) const
-     if (maPassText.Len())
-         return true;
- 
--    if (meHash == eHash)
--        return true;
-+    if (meHash1 == eHash)
-+    {
-+        if (meHash2 == PASSHASH_UNSPECIFIED)
-+            // single hash.
-+            return true;
-+
-+        return meHash2 == eHash2;
-+    }
- 
-     return false;
- }
- 
--Sequence<sal_Int8> ScTableProtectionImpl::getPasswordHash(ScPasswordHash eHash) const
-+Sequence<sal_Int8> ScTableProtectionImpl::getPasswordHash(
-+    ScPasswordHash eHash, ScPasswordHash eHash2) const
- {
-+    Sequence<sal_Int8> aPassHash;
-+
-     if (mbEmptyPass)
-         // Flaged as empty.
--        return Sequence<sal_Int8>();
-+        return aPassHash;
- 
-     if (maPassText.Len())
-+    {    
-         // Cleartext password exists.  Hash it.
--        return hashPassword(maPassText, eHash);
-+        aPassHash = hashPassword(maPassText, eHash);
-+        if (eHash2 != PASSHASH_UNSPECIFIED)
-+            // Double-hash it.
-+            aPassHash = hashPassword(aPassHash, eHash2);
- 
--    if (meHash == eHash)
--        // Stored hash exists.
--        return maPassHash;
-+        return aPassHash;
-+    }
-+    else
-+    {
-+        // No clear text password.  Check if we have a hash value of the right hash type.
-+        if (meHash1 == eHash)
-+        {
-+            aPassHash = maPassHash;
-+
-+            if (meHash2 == eHash2)
-+                // Matching double-hash requested.
-+                return aPassHash;
-+            else if (meHash2 == PASSHASH_UNSPECIFIED)
-+                // primary hashing type match.  Double hash it by the requested 
-+                // double-hash type.
-+                return hashPassword(aPassHash, eHash2);
-+        }
-+    }
- 
--    // Failed to find a matching hash.
-+    // failed.
-     return Sequence<sal_Int8>();
- }
- 
--void ScTableProtectionImpl::setPasswordHash(const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash)
-+void ScTableProtectionImpl::setPasswordHash(
-+    const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash, ScPasswordHash eHash2)
- {
-     sal_Int32 nLen = aPassword.getLength();
-     mbEmptyPass = nLen <= 0 ? true : false;
--    meHash = eHash;
-+    meHash1 = eHash;
-+    meHash2 = eHash2;
-     maPassHash = aPassword;
- 
- #if DEBUG_TAB_PROTECTION
-@@ -277,7 +369,8 @@ bool ScTableProtectionImpl::verifyPassword(const String& aPassText) const
-         // Clear text password exists, and this one takes precedence.
-         return aPassText.Equals(maPassText);
- 
--    Sequence<sal_Int8> aHash = hashPassword(aPassText, meHash);
-+    Sequence<sal_Int8> aHash = hashPassword(aPassText, meHash1);
-+    aHash = hashPassword(aHash, meHash2);
- 
- #if DEBUG_TAB_PROTECTION    
-     fprintf(stdout, "ScTableProtectionImpl::verifyPassword: hash = ");
-@@ -353,9 +446,9 @@ bool ScDocProtection::isPasswordEmpty() const
-     return mpImpl->isPasswordEmpty();
- }
- 
--bool ScDocProtection::hasPasswordHash(ScPasswordHash eHash) const
-+bool ScDocProtection::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const
- {
--    return mpImpl->hasPasswordHash(eHash);
-+    return mpImpl->hasPasswordHash(eHash, eHash2);
- }
- 
- void ScDocProtection::setPassword(const String& aPassText)
-@@ -363,14 +456,15 @@ void ScDocProtection::setPassword(const String& aPassText)
-     mpImpl->setPassword(aPassText);
- }
- 
--uno::Sequence<sal_Int8> ScDocProtection::getPasswordHash(ScPasswordHash eHash) const
-+uno::Sequence<sal_Int8> ScDocProtection::getPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const
- {
--    return mpImpl->getPasswordHash(eHash);
-+    return mpImpl->getPasswordHash(eHash, eHash2);
- }
- 
--void ScDocProtection::setPasswordHash(const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash)
-+void ScDocProtection::setPasswordHash(
-+    const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash, ScPasswordHash eHash2)
- {
--    mpImpl->setPasswordHash(aPassword, eHash);
-+    mpImpl->setPasswordHash(aPassword, eHash, eHash2);
- }
- 
- bool ScDocProtection::verifyPassword(const String& aPassText) const
-@@ -428,9 +522,9 @@ bool ScTableProtection::isPasswordEmpty() const
-     return mpImpl->isPasswordEmpty();
- }
- 
--bool ScTableProtection::hasPasswordHash(ScPasswordHash eHash) const
-+bool ScTableProtection::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const
- {
--    return mpImpl->hasPasswordHash(eHash);
-+    return mpImpl->hasPasswordHash(eHash, eHash2);
- }
- 
- void ScTableProtection::setPassword(const String& aPassText)
-@@ -438,14 +532,15 @@ void ScTableProtection::setPassword(const String& aPassText)
-     mpImpl->setPassword(aPassText);
- }
- 
--Sequence<sal_Int8> ScTableProtection::getPasswordHash(ScPasswordHash eHash) const
-+Sequence<sal_Int8> ScTableProtection::getPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const
- {
--    return mpImpl->getPasswordHash(eHash);
-+    return mpImpl->getPasswordHash(eHash, eHash2);
- }
- 
--void ScTableProtection::setPasswordHash(const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash)
-+void ScTableProtection::setPasswordHash(
-+    const uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash, ScPasswordHash eHash2)
- {
--    mpImpl->setPasswordHash(aPassword, eHash);
-+    mpImpl->setPasswordHash(aPassword, eHash, eHash2);
- }
- 
- bool ScTableProtection::verifyPassword(const String& aPassText) const
-diff --git sc/source/filter/xml/xmlbodyi.cxx sc/source/filter/xml/xmlbodyi.cxx
-index fa993ef..c118998 100644
---- sc/source/filter/xml/xmlbodyi.cxx
-+++ sc/source/filter/xml/xmlbodyi.cxx
-@@ -77,6 +77,8 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
- 											  const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
- 	SvXMLImportContext( rImport, nPrfx, rLName ),
- 	sPassword(),
-+    meHash1(PASSHASH_UNSPECIFIED),
-+    meHash2(PASSHASH_UNSPECIFIED),
- 	bProtected(sal_False),
-     bHadCalculationSettings(sal_False),
- 	pChangeTrackingImportHelper(NULL)
-@@ -122,6 +124,10 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
- 				bProtected = IsXMLToken(sValue, XML_TRUE);
- 			else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY))
- 				sPassword = sValue;
-+            else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY_DIGEST_ALGORITHM))
-+                meHash1 = ScPassHashHelper::getHashTypeFromURI(sValue);
-+            else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2))
-+                meHash2 = ScPassHashHelper::getHashTypeFromURI(sValue);
- 		}
- 	}
- }
-@@ -291,7 +297,7 @@ void ScXMLBodyContext::EndElement()
- 			if (sPassword.getLength())
-             {
- 				SvXMLUnitConverter::decodeBase64(aPass, sPassword);
--                pProtection->setPasswordHash(aPass, PASSHASH_OOO);
-+                pProtection->setPasswordHash(aPass, meHash1, meHash2);
-             }
- 
-             pDoc->SetDocProtection(pProtection.get());
-diff --git sc/source/filter/xml/xmlbodyi.hxx sc/source/filter/xml/xmlbodyi.hxx
-index 483741e..69d5407 100644
---- sc/source/filter/xml/xmlbodyi.hxx
-+++ sc/source/filter/xml/xmlbodyi.hxx
-@@ -34,12 +34,16 @@
- #include <xmloff/xmlictxt.hxx>
- #include <xmloff/xmlimp.hxx>
- 
-+#include "tabprotection.hxx"
-+
- class ScXMLImport;
- class ScXMLChangeTrackingImportHelper;
- 
- class ScXMLBodyContext : public SvXMLImportContext
- {
- 	rtl::OUString	sPassword;
-+    ScPasswordHash  meHash1;
-+    ScPasswordHash  meHash2;
- 	sal_Bool		bProtected;
-     sal_Bool        bHadCalculationSettings;
- 
-diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
-index 3658d78..089f12d 100644
---- sc/source/filter/xml/xmlexprt.cxx
-+++ sc/source/filter/xml/xmlexprt.cxx
-@@ -1441,12 +1441,36 @@ void ScXMLExport::SetBodyAttributes()
- 		AddAttribute(XML_NAMESPACE_TABLE, XML_STRUCTURE_PROTECTED, XML_TRUE);
- 		rtl::OUStringBuffer aBuffer;
-         uno::Sequence<sal_Int8> aPassHash;
-+        ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED;
-         const ScDocProtection* p = pDoc->GetDocProtection();
-         if (p)
--            aPassHash = p->getPasswordHash(PASSHASH_OOO);
-+        {
-+            if (p->hasPasswordHash(PASSHASH_SHA1))
-+            {    
-+                aPassHash = p->getPasswordHash(PASSHASH_SHA1);
-+                eHashUsed = PASSHASH_SHA1;
-+            }
-+            else if (p->hasPasswordHash(PASSHASH_XL, PASSHASH_SHA1))
-+            {    
-+                aPassHash = p->getPasswordHash(PASSHASH_XL, PASSHASH_SHA1);
-+                eHashUsed = PASSHASH_XL;
-+            }
-+        }
- 		SvXMLUnitConverter::encodeBase64(aBuffer, aPassHash);
- 		if (aBuffer.getLength())
-+        {    
- 			AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
-+            if (eHashUsed == PASSHASH_XL)
-+            {
-+                AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, 
-+                             ScPassHashHelper::getHashURI(PASSHASH_XL));
-+                AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
-+                             ScPassHashHelper::getHashURI(PASSHASH_SHA1));
-+            }
-+            else if (eHashUsed == PASSHASH_SHA1)
-+                AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, 
-+                             ScPassHashHelper::getHashURI(PASSHASH_SHA1));
-+        }
- 	}
- }
- 
-@@ -1513,18 +1537,46 @@ void ScXMLExport::_ExportContent()
-                     AddAttribute(sAttrName, sOUTableName);
-                     AddAttribute(sAttrStyleName, aTableStyles[nTable]);
-                     uno::Reference<util::XProtectable> xProtectable (xTable, uno::UNO_QUERY);
-+                    ScTableProtection* pProtect = NULL;
-                     if (xProtectable.is() && xProtectable->isProtected())
-                     {
-                         AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TRUE);
--                        rtl::OUStringBuffer aBuffer;
-                         if (pDoc)
-                         {
--                            ScTableProtection* pProtect = pDoc->GetTabProtection(static_cast<SCTAB>(nTable));
-+                            pProtect = pDoc->GetTabProtection(static_cast<SCTAB>(nTable));
-                             if (pProtect)
--                                SvXMLUnitConverter::encodeBase64(aBuffer, pProtect->getPasswordHash(PASSHASH_OOO));
-+                            {    
-+                                rtl::OUStringBuffer aBuffer;
-+                                ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED;
-+                                if (pProtect->hasPasswordHash(PASSHASH_SHA1))
-+                                {    
-+                                    SvXMLUnitConverter::encodeBase64(aBuffer, pProtect->getPasswordHash(PASSHASH_SHA1));
-+                                    eHashUsed = PASSHASH_SHA1;
-+                                }
-+                                else if (pProtect->hasPasswordHash(PASSHASH_XL, PASSHASH_SHA1))
-+                                {
-+                                    // Double-hash this by SHA1 on top of the legacy xls hash.
-+                                    uno::Sequence<sal_Int8> aHash = pProtect->getPasswordHash(PASSHASH_XL, PASSHASH_SHA1);
-+                                    SvXMLUnitConverter::encodeBase64(aBuffer, aHash);
-+                                    eHashUsed = PASSHASH_XL;
-+                                }
-+                                if (aBuffer.getLength())
-+                                {    
-+                                    AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
-+                                    if (eHashUsed == PASSHASH_XL)
-+                                    {
-+                                        AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, 
-+                                                     ScPassHashHelper::getHashURI(PASSHASH_XL));
-+                                        AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
-+                                                     ScPassHashHelper::getHashURI(PASSHASH_SHA1));
-+                                    }
-+                                    else if (eHashUsed == PASSHASH_SHA1)
-+                                        AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, 
-+                                                     ScPassHashHelper::getHashURI(PASSHASH_SHA1));
-+
-+                                }
-+                            }
-                         }
--                        if (aBuffer.getLength())
--                            AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
-                     }
-                     rtl::OUString sPrintRanges;
-                     table::CellRangeAddress aColumnHeaderRange;
-@@ -1535,6 +1587,20 @@ void ScXMLExport::_ExportContent()
-                     else if (!pDoc->IsPrintEntireSheet(static_cast<SCTAB>(nTable)))
-                         AddAttribute( XML_NAMESPACE_TABLE, XML_PRINT, XML_FALSE);
-                     SvXMLElementExport aElemT(*this, sElemTab, sal_True, sal_True);
-+                    
-+                    if (pProtect && pProtect->isProtected())
-+                    {
-+                        if (pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS))
-+                            AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS, XML_TRUE);
-+                        if (pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS))
-+                            AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS, XML_TRUE);
-+
-+                        rtl::OUString aElemName = GetNamespaceMap().GetQNameByKey(
-+                            XML_NAMESPACE_TABLE, GetXMLToken(XML_TABLE_PROTECTION));
-+
-+                        SvXMLElementExport aElemProtected(*this, aElemName, true, true);
-+                    }
-+
-                     CheckAttrList();
-                     WriteTableSource();
-                     WriteScenario();
-diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
-index 4517591..728373e 100644
---- sc/source/filter/xml/xmlimprt.cxx
-+++ sc/source/filter/xml/xmlimprt.cxx
-@@ -637,6 +637,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
-             { XML_NAMESPACE_TABLE,	XML_TABLE_HEADER_COLUMNS,		XML_TOK_TABLE_HEADER_COLS	},
-             { XML_NAMESPACE_TABLE,	XML_TABLE_COLUMNS,				XML_TOK_TABLE_COLS			},
-             { XML_NAMESPACE_TABLE,	XML_TABLE_COLUMN,				XML_TOK_TABLE_COL			},
-+            { XML_NAMESPACE_TABLE,  XML_TABLE_PROTECTION,           XML_TOK_TABLE_PROTECTION    },
-             { XML_NAMESPACE_TABLE,	XML_TABLE_ROW_GROUP,			XML_TOK_TABLE_ROW_GROUP		},
-             { XML_NAMESPACE_TABLE,	XML_TABLE_HEADER_ROWS,			XML_TOK_TABLE_HEADER_ROWS	},
-             { XML_NAMESPACE_TABLE,	XML_TABLE_ROWS, 				XML_TOK_TABLE_ROWS			},
-@@ -654,6 +655,22 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
-     return *pTableElemTokenMap;
- }
- 
-+const SvXMLTokenMap& ScXMLImport::GetTableProtectionAttrTokenMap()
-+{
-+    if (!pTableProtectionElemTokenMap)
-+    {
-+        static __FAR_DATA SvXMLTokenMapEntry aTableProtectionTokenMap[] =
-+        {
-+            { XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS,      XML_TOK_TABLE_SELECT_PROTECTED_CELLS    },
-+            { XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS,    XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS  },
-+            XML_TOKEN_MAP_END
-+        };
-+        pTableProtectionElemTokenMap = new SvXMLTokenMap(aTableProtectionTokenMap);
-+    }
-+
-+    return *pTableProtectionElemTokenMap;
-+}
-+
- const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap()
- {
-     if( !pTableRowsElemTokenMap )
-@@ -700,9 +717,11 @@ const SvXMLTokenMap& ScXMLImport::GetTableAttrTokenMap()
-         {
-             { XML_NAMESPACE_TABLE, XML_NAME,						XML_TOK_TABLE_NAME				},
-             { XML_NAMESPACE_TABLE, XML_STYLE_NAME,					XML_TOK_TABLE_STYLE_NAME		},
--            { XML_NAMESPACE_TABLE, XML_PROTECTED,					XML_TOK_TABLE_PROTECTION		},
-+            { XML_NAMESPACE_TABLE, XML_PROTECTED,                   XML_TOK_TABLE_PROTECTED         },
-             { XML_NAMESPACE_TABLE, XML_PRINT_RANGES,				XML_TOK_TABLE_PRINT_RANGES		},
-             { XML_NAMESPACE_TABLE, XML_PROTECTION_KEY,				XML_TOK_TABLE_PASSWORD			},
-+            { XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, XML_TOK_TABLE_PASSHASH      },
-+            { XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2, XML_TOK_TABLE_PASSHASH_2  },
-             { XML_NAMESPACE_TABLE, XML_PRINT,               		XML_TOK_TABLE_PRINT             },
-             XML_TOKEN_MAP_END
-         };
-@@ -1685,6 +1704,7 @@ ScXMLImport::ScXMLImport(
- 	pLabelRangesElemTokenMap( 0 ),
- 	pLabelRangeAttrTokenMap( 0 ),
- 	pTableElemTokenMap( 0 ),
-+    pTableProtectionElemTokenMap(NULL),
- 	pTableRowsElemTokenMap( 0 ),
- 	pTableColsElemTokenMap( 0 ),
- 	pTableScenarioAttrTokenMap( 0 ),
-@@ -1811,6 +1831,7 @@ ScXMLImport::~ScXMLImport() throw()
-     delete pLabelRangesElemTokenMap;
-     delete pLabelRangeAttrTokenMap;
-     delete pTableElemTokenMap;
-+    delete pTableProtectionElemTokenMap;
-     delete pTableRowsElemTokenMap;
-     delete pTableColsElemTokenMap;
-     delete pTableAttrTokenMap;
-diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx
-index 093846a..8ff4178 100644
---- sc/source/filter/xml/xmlimprt.hxx
-+++ sc/source/filter/xml/xmlimprt.hxx
-@@ -172,6 +172,7 @@ enum ScXMLTableTokens
- 	XML_TOK_TABLE_COL,
- 	XML_TOK_TABLE_ROW_GROUP,
- 	XML_TOK_TABLE_HEADER_ROWS,
-+    XML_TOK_TABLE_PROTECTION,
- 	XML_TOK_TABLE_ROWS,
- 	XML_TOK_TABLE_ROW,
- 	XML_TOK_TABLE_SOURCE,
-@@ -180,6 +181,12 @@ enum ScXMLTableTokens
- 	XML_TOK_TABLE_FORMS
- };
- 
-+enum ScXMLTokenProtectionTokens
-+{
-+    XML_TOK_TABLE_SELECT_PROTECTED_CELLS,
-+    XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS
-+};
-+
- enum ScXMLTableRowsTokens
- {
- 	XML_TOK_TABLE_ROWS_ROW_GROUP,
-@@ -200,9 +207,11 @@ enum ScXMLTableAttrTokens
- {
- 	XML_TOK_TABLE_NAME,
- 	XML_TOK_TABLE_STYLE_NAME,
--	XML_TOK_TABLE_PROTECTION,
-+	XML_TOK_TABLE_PROTECTED,
- 	XML_TOK_TABLE_PRINT_RANGES,
- 	XML_TOK_TABLE_PASSWORD,
-+	XML_TOK_TABLE_PASSHASH,
-+	XML_TOK_TABLE_PASSHASH_2,
-     XML_TOK_TABLE_PRINT
- };
- 
-@@ -699,6 +708,7 @@ class ScXMLImport: public SvXMLImport
- 	SvXMLTokenMap			*pLabelRangesElemTokenMap;
- 	SvXMLTokenMap			*pLabelRangeAttrTokenMap;
- 	SvXMLTokenMap			*pTableElemTokenMap;
-+    SvXMLTokenMap           *pTableProtectionElemTokenMap;
- 	SvXMLTokenMap			*pTableRowsElemTokenMap;
- 	SvXMLTokenMap			*pTableColsElemTokenMap;
- 	SvXMLTokenMap			*pTableScenarioAttrTokenMap;
-@@ -865,6 +875,7 @@ public:
- 	const SvXMLTokenMap& GetLabelRangesElemTokenMap();
- 	const SvXMLTokenMap& GetLabelRangeAttrTokenMap();
- 	const SvXMLTokenMap& GetTableElemTokenMap();
-+    const SvXMLTokenMap& GetTableProtectionAttrTokenMap();
- 	const SvXMLTokenMap& GetTableRowsElemTokenMap();
- 	const SvXMLTokenMap& GetTableColsElemTokenMap();
- 	const SvXMLTokenMap& GetTableAttrTokenMap();
-diff --git sc/source/filter/xml/xmlsubti.cxx sc/source/filter/xml/xmlsubti.cxx
-index 72ddec3..3a001e9 100644
---- sc/source/filter/xml/xmlsubti.cxx
-+++ sc/source/filter/xml/xmlsubti.cxx
-@@ -148,6 +148,15 @@ void ScMyTableData::SetChangedCols(const sal_Int32 nValue)
- 
- /*******************************************************************************************************************************/
- 
-+ScXMLTabProtectionData::ScXMLTabProtectionData() :
-+    meHash1(PASSHASH_UNSPECIFIED), 
-+    meHash2(PASSHASH_UNSPECIFIED),
-+    mbProtected(false), 
-+    mbSelectProtectedCells(false), 
-+    mbSelectUnprotectedCells(false)
-+{
-+}
-+
- ScMyTables::ScMyTables(ScXMLImport& rTempImport)
- 	: rImport(rTempImport),
- 	aResizeShapes(rTempImport),
-@@ -173,7 +182,7 @@ ScMyTables::~ScMyTables()
- }
- 
- void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName,
--						const sal_Bool bTempProtection, const rtl::OUString& sTempPassword)
-+                          const ScXMLTabProtectionData& rProtectData)
- {
- 	if (rImport.GetModel().is())
- 	{
-@@ -189,8 +198,7 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString&
- 		}
-         ++nCurrentSheet;
- 
--		bProtection = bTempProtection;
--		sPassword = sTempPassword;
-+        maProtectionData = rProtectData;
- 		uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( rImport.GetModel(), uno::UNO_QUERY );
- 		if ( xSpreadDoc.is() )
- 		{
-@@ -617,13 +625,16 @@ void ScMyTables::DeleteTable()
-         aMatrixRangeList.clear();
-     }
- 
--	if (rImport.GetDocument() && bProtection)
-+	if (rImport.GetDocument() && maProtectionData.mbProtected)
- 	{
--		uno::Sequence<sal_Int8> aPass;
--		SvXMLUnitConverter::decodeBase64(aPass, sPassword);
-+		uno::Sequence<sal_Int8> aHash;
-+		SvXMLUnitConverter::decodeBase64(aHash, maProtectionData.maPassword);
-+
-         auto_ptr<ScTableProtection> pProtect(new ScTableProtection);
--        pProtect->setProtected(bProtection);
--        pProtect->setPasswordHash(aPass, PASSHASH_OOO);
-+        pProtect->setProtected(maProtectionData.mbProtected);
-+        pProtect->setPasswordHash(aHash, maProtectionData.meHash1, maProtectionData.meHash2);
-+        pProtect->setOption(ScTableProtection::SELECT_LOCKED_CELLS,   maProtectionData.mbSelectProtectedCells);
-+        pProtect->setOption(ScTableProtection::SELECT_UNLOCKED_CELLS, maProtectionData.mbSelectUnprotectedCells);
-         rImport.GetDocument()->SetTabProtection(static_cast<SCTAB>(nCurrentSheet), pProtect.get());
- 	}
- 
-diff --git sc/source/filter/xml/xmlsubti.hxx sc/source/filter/xml/xmlsubti.hxx
-index 23dc5db..349b395 100644
---- sc/source/filter/xml/xmlsubti.hxx
-+++ sc/source/filter/xml/xmlsubti.hxx
-@@ -43,6 +43,7 @@
- #include <list>
- #include "XMLTableShapeResizer.hxx"
- #include "formula/grammar.hxx"
-+#include "tabprotection.hxx"
- 
- class ScXMLImport;
- 
-@@ -107,6 +108,18 @@ struct ScMatrixRange
-     }
- };
- 
-+struct ScXMLTabProtectionData
-+{
-+    ::rtl::OUString maPassword;
-+    ScPasswordHash  meHash1;
-+    ScPasswordHash  meHash2;
-+    bool            mbProtected;
-+    bool            mbSelectProtectedCells;
-+    bool            mbSelectUnprotectedCells;
-+
-+    ScXMLTabProtectionData();
-+};
-+
- class ScMyTables
- {
- private:
-@@ -121,8 +134,8 @@ private:
- 	::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage;
- 	::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes;
- 	rtl::OUString						sCurrentSheetName;
--	rtl::OUString						sPassword;
- 	std::vector<ScMyTableData*>			aTableVec;
-+    ScXMLTabProtectionData              maProtectionData;
-     ScMyMatrixRangeList                 aMatrixRangeList;
- 	com::sun::star::table::CellAddress	aRealCellPos;
- 	sal_Int32							nCurrentColStylePos;
-@@ -130,7 +143,6 @@ private:
- 	sal_Int16							nCurrentXShapes;
- 	sal_Int32							nTableCount;
- 	sal_Int32							nCurrentSheet;
--	sal_Bool							bProtection;
- 
- 	sal_Bool 							IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange,
- 												const sal_Int32 nCol, const sal_Int32 nRow,
-@@ -145,7 +157,7 @@ public:
- 										ScMyTables(ScXMLImport& rImport);
- 										~ScMyTables();
- 	void   								NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName,
--												const sal_Bool bProtection, const rtl::OUString& sPassword);
-+                                                 const ScXMLTabProtectionData& rProtectData);
- 	void								AddRow();
- 	void								SetRowStyle(const rtl::OUString& rCellStyleName);
- 	void								AddColumn(sal_Bool bIsCovered);
-@@ -156,6 +168,7 @@ public:
- 	com::sun::star::table::CellAddress	GetRealCellPos();
- 	void								AddColCount(sal_Int32 nTempColCount);
- 	void								AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName);
-+    ScXMLTabProtectionData&             GetCurrentProtectionData() { return maProtectionData; }
- 	rtl::OUString						GetCurrentSheetName() const { return sCurrentSheetName; }
- 	sal_Int32							GetCurrentSheet() const { return nCurrentSheet; }
- 	sal_Int32							GetCurrentColumn() const { return aTableVec[nTableCount - 1]->GetColCount(); }
-diff --git sc/source/filter/xml/xmltabi.cxx sc/source/filter/xml/xmltabi.cxx
-index fc09927..5229085 100644
---- sc/source/filter/xml/xmltabi.cxx
-+++ sc/source/filter/xml/xmltabi.cxx
-@@ -64,6 +64,9 @@
- 
- using namespace com::sun::star;
- using namespace xmloff::token;
-+using ::com::sun::star::uno::Reference;
-+using ::com::sun::star::xml::sax::XAttributeList;
-+using ::rtl::OUString;
- 
- /** 
-  * Determine whether this table is an external reference cache from its 
-@@ -152,10 +155,9 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
- {
- 	if (!bTempIsSubTable)
- 	{
--		sal_Bool bProtection(sal_False);
-+        ScXMLTabProtectionData aProtectData;
- 		rtl::OUString sName;
- 		rtl::OUString sStyleName;
--		rtl::OUString sPassword;
- 		sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
- 		const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableAttrTokenMap();
- 		for( sal_Int16 i=0; i < nAttrCount; ++i )
-@@ -174,15 +176,21 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
- 				case XML_TOK_TABLE_STYLE_NAME:
- 						sStyleName = sValue;
- 					break;
--				case XML_TOK_TABLE_PROTECTION:
--						bProtection = IsXMLToken(sValue, XML_TRUE);
--					break;
-+				case XML_TOK_TABLE_PROTECTED:
-+                    aProtectData.mbProtected = IsXMLToken(sValue, XML_TRUE);
-+                break;
- 				case XML_TOK_TABLE_PRINT_RANGES:
- 						sPrintRanges = sValue;
- 					break;
- 				case XML_TOK_TABLE_PASSWORD:
--						sPassword = sValue;
--					break;
-+                    aProtectData.maPassword = sValue;
-+                break;
-+                case XML_TOK_TABLE_PASSHASH:
-+                    aProtectData.meHash1 = ScPassHashHelper::getHashTypeFromURI(sValue);
-+                break;
-+                case XML_TOK_TABLE_PASSHASH_2:
-+                    aProtectData.meHash2 = ScPassHashHelper::getHashTypeFromURI(sValue);
-+                break;
-                 case XML_TOK_TABLE_PRINT:
-                     {
-                         if (IsXMLToken(sValue, XML_FALSE))
-@@ -209,7 +217,7 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
-         else
-         {
-             // This is a regular table.
--            GetScImport().GetTables().NewSheet(sName, sStyleName, bProtection, sPassword);
-+            GetScImport().GetTables().NewSheet(sName, sStyleName, aProtectData);
-         }
- 	}
- 	else
-@@ -271,6 +279,9 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( USHORT nPrefix,
- 			pContext = new ScXMLTableColContext( GetScImport(), nPrefix,
- 													  rLName, xAttrList );
- 		break;
-+    case XML_TOK_TABLE_PROTECTION:
-+        pContext = new ScXMLTableProtectionContext( GetScImport(), nPrefix, rLName, xAttrList );
-+        break;
- 	case XML_TOK_TABLE_ROW_GROUP:
- 		pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix,
- 												   rLName, xAttrList,
-@@ -384,3 +395,61 @@ void ScXMLTableContext::EndElement()
- 	GetScImport().UnlockSolarMutex();
- }
- 
-+// ============================================================================
-+
-+ScXMLImport& ScXMLTableProtectionContext::GetScImport()
-+{
-+    return static_cast<ScXMLImport&>(GetImport());
-+}
-+
-+ScXMLTableProtectionContext::ScXMLTableProtectionContext(
-+    ScXMLImport& rImport, USHORT nPrefix, const OUString& rLName, 
-+    const Reference<XAttributeList>& xAttrList ) :
-+    SvXMLImportContext( rImport, nPrefix, rLName )
-+{
-+    const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableProtectionAttrTokenMap();
-+    bool bSelectProtectedCells = false;
-+    bool bSelectUnprotectedCells = false;
-+
-+    sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-+
-+    for (sal_Int16 i = 0; i < nAttrCount; ++i)
-+    {
-+        const OUString& aAttrName = xAttrList->getNameByIndex(i);
-+        const OUString aValue = xAttrList->getValueByIndex(i);
-+
-+        OUString aLocalName;
-+        USHORT nLocalPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
-+            aAttrName, &aLocalName);
-+    
-+        switch (rAttrTokenMap.Get(nLocalPrefix, aLocalName))
-+        {
-+            case XML_TOK_TABLE_SELECT_PROTECTED_CELLS:
-+                bSelectProtectedCells = IsXMLToken(aValue, XML_TRUE);
-+            break;
-+            case XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS:
-+                bSelectUnprotectedCells = IsXMLToken(aValue, XML_TRUE);
-+            break;
-+            default:
-+                ;
-+        }
-+    }
-+
-+    ScXMLTabProtectionData& rProtectData = GetScImport().GetTables().GetCurrentProtectionData();
-+    rProtectData.mbSelectProtectedCells   = bSelectProtectedCells;
-+    rProtectData.mbSelectUnprotectedCells = bSelectUnprotectedCells;
-+}
-+
-+ScXMLTableProtectionContext::~ScXMLTableProtectionContext()
-+{
-+}
-+
-+SvXMLImportContext* ScXMLTableProtectionContext::CreateChildContext(
-+    USHORT /*nPrefix*/, const OUString& /*rLocalName*/, const Reference<XAttributeList>& /*xAttrList*/ )
-+{
-+    return NULL;
-+}
-+
-+void ScXMLTableProtectionContext::EndElement()
-+{
-+}
-diff --git sc/source/filter/xml/xmltabi.hxx sc/source/filter/xml/xmltabi.hxx
-index 7fc6031..bd3482c 100644
---- sc/source/filter/xml/xmltabi.hxx
-+++ sc/source/filter/xml/xmltabi.hxx
-@@ -77,4 +77,26 @@ public:
- 	virtual void EndElement();
- };
- 
-+// ============================================================================
-+
-+class ScXMLTableProtectionContext : public SvXMLImportContext
-+{
-+    ScXMLImport& GetScImport();
-+
-+public:
-+    ScXMLTableProtectionContext( ScXMLImport& rImport, USHORT nPrefix,
-+                        const ::rtl::OUString& rLName,
-+                        const ::com::sun::star::uno::Reference<
-+                                 ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
-+
-+    virtual ~ScXMLTableProtectionContext();
-+
-+    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
-+                                     const ::rtl::OUString& rLocalName,
-+                                     const ::com::sun::star::uno::Reference<
-+                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
-+
-+    virtual void EndElement();
-+};
-+
- #endif
-diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
-index 04825b9..9caaf5f 100644
---- sc/source/ui/docshell/docsh.cxx
-+++ sc/source/ui/docshell/docsh.cxx
-@@ -1440,9 +1440,14 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
- 
- #if ENABLE_SHEET_PROTECTION
-     ScTabViewShell* pViewShell = GetBestViewShell();
--    if (pViewShell && ScPassHashHelper::needsPassHashRegen(aDocument, PASSHASH_OOO))
-+    bool bNeedsRehash = ScPassHashHelper::needsPassHashRegen(aDocument, PASSHASH_SHA1);
-+    if (bNeedsRehash)
-+        // legacy xls hash double-hashed by SHA1 is also supported.
-+        bNeedsRehash = ScPassHashHelper::needsPassHashRegen(aDocument, PASSHASH_XL, PASSHASH_SHA1);
-+
-+    if (pViewShell && bNeedsRehash)
-     {
--        if (!pViewShell->ExecuteRetypePassDlg(PASSHASH_OOO))
-+        if (!pViewShell->ExecuteRetypePassDlg(PASSHASH_SHA1))
-             // password re-type cancelled.  Don't save the document.
-             return false;
-     }
-diff --git sc/source/ui/miscdlgs/retypepassdlg.cxx sc/source/ui/miscdlgs/retypepassdlg.cxx
-index 7786115..899ae0d 100644
---- sc/source/ui/miscdlgs/retypepassdlg.cxx
-+++ sc/source/ui/miscdlgs/retypepassdlg.cxx
-@@ -77,7 +77,7 @@ ScRetypePassDlg::ScRetypePassDlg(Window* pParent) :
- 
-     mpDocItem(static_cast<ScDocProtection*>(NULL)),
-     mnCurScrollPos(0),
--    meDesiredHash(PASSHASH_OOO)
-+    meDesiredHash(PASSHASH_SHA1)
- {
-     Init();
- }
diff --git a/applied_patches/0572-unittesting-slideshow.diff b/applied_patches/0456-unittesting-slideshow.diff
similarity index 100%
rename from applied_patches/0572-unittesting-slideshow.diff
rename to applied_patches/0456-unittesting-slideshow.diff
diff --git a/applied_patches/0573-unittesting-sot.diff b/applied_patches/0457-unittesting-sot.diff
similarity index 100%
rename from applied_patches/0573-unittesting-sot.diff
rename to applied_patches/0457-unittesting-sot.diff
diff --git a/applied_patches/0574-unittesting-starmath.diff b/applied_patches/0458-unittesting-starmath.diff
similarity index 100%
rename from applied_patches/0574-unittesting-starmath.diff
rename to applied_patches/0458-unittesting-starmath.diff
diff --git a/applied_patches/0459-calc-dp-custom-names-ods-sc.diff b/applied_patches/0459-calc-dp-custom-names-ods-sc.diff
deleted file mode 100644
index 6158b6f6d..000000000
--- a/applied_patches/0459-calc-dp-custom-names-ods-sc.diff
+++ /dev/null
@@ -1,818 +0,0 @@
-diff --git sc/source/core/data/dptabres.cxx sc/source/core/data/dptabres.cxx
-index e53ecb9..3e8fa12 100644
---- sc/source/core/data/dptabres.cxx
-+++ sc/source/core/data/dptabres.cxx
-@@ -1186,20 +1186,28 @@ void ScDPResultMember::ProcessData( const vector<ScDPItemData>& aChildMembers, c
- }
- 
- /** 
-- * Parse subtotal string and replace all occurrences of '?' with the 
-- * caption string. 
-+ * Parse subtotal string and replace all occurrences of '?' with the caption
-+ * string.  Do ensure that escaped characters are not translated.
-  */ 
- static String lcl_parseSubtotalName(const String& rSubStr, const String& rCaption)
- {
-     String aNewStr;
-     xub_StrLen n = rSubStr.Len();
-+    bool bEscaped = false;
-     for (xub_StrLen i = 0; i < n; ++i)
-     {
-         sal_Unicode c = rSubStr.GetChar(i);
--        if (c == sal_Unicode('?'))
-+        if (!bEscaped && c == sal_Unicode('\\'))
-+        {
-+            bEscaped = true;
-+            continue;
-+        }
-+
-+        if (!bEscaped && c == sal_Unicode('?'))
-             aNewStr.Append(rCaption);
-         else
-             aNewStr.Append(c);
-+        bEscaped = false;
-     }
-     return aNewStr;
- }
-diff --git sc/source/filter/excel/xepivot.cxx sc/source/filter/excel/xepivot.cxx
-index 0d43d06..043db4d 100644
---- sc/source/filter/excel/xepivot.cxx
-+++ sc/source/filter/excel/xepivot.cxx
-@@ -1035,6 +1035,31 @@ sal_uInt16 XclExpPTField::GetItemIndex( const String& rName, sal_uInt16 nDefault
- 
- // fill data --------------------------------------------------------------
- 
-+/** 
-+ * Calc's subtotal names are escaped with backslashes ('\'), while Excel's 
-+ * are not escaped at all. 
-+ */
-+static OUString lcl_convertCalcSubtotalName(const OUString& rName)
-+{
-+    OUStringBuffer aBuf;
-+    const sal_Unicode* p = rName.getStr();
-+    sal_Int32 n = rName.getLength();
-+    bool bEscaped = false;
-+    for (sal_Int32 i = 0; i < n; ++i)
-+    {
-+        const sal_Unicode c = p[i];
-+        if (!bEscaped && c == sal_Unicode('\\'))
-+        {
-+            bEscaped = true;
-+            continue;
-+        }
-+
-+        aBuf.append(c);
-+        bEscaped = false;
-+    }
-+    return aBuf.makeStringAndClear();
-+}
-+
- void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
- {
-     // orientation
-@@ -1052,7 +1077,10 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
- 
-     const rtl::OUString* pSubtotalName = rSaveDim.GetSubtotalName();
-     if (pSubtotalName)
--        maFieldExtInfo.mpFieldTotalName.reset(new rtl::OUString(*pSubtotalName));
-+    {
-+        OUString aSubName = lcl_convertCalcSubtotalName(*pSubtotalName);
-+        maFieldExtInfo.mpFieldTotalName.reset(new rtl::OUString(aSubName));
-+    }
- 
-     // subtotals
-     XclPTSubtotalVec aSubtotals;
-diff --git sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx
-index fd85060..8f290c8 100644
---- sc/source/filter/excel/xipivot.cxx
-+++ sc/source/filter/excel/xipivot.cxx
-@@ -65,6 +65,7 @@
- #include <vector>
- 
- using ::rtl::OUString;
-+using ::rtl::OUStringBuffer;
- using ::com::sun::star::sheet::DataPilotFieldOrientation;
- using ::com::sun::star::sheet::DataPilotFieldOrientation_DATA;
- using ::com::sun::star::sheet::DataPilotFieldSortInfo;
-@@ -1034,6 +1035,28 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& rSaveData ) const
- 
- // private --------------------------------------------------------------------
- 
-+/** 
-+ * Convert Excel-encoded subtotal name to a Calc-encoded one.  
-+ */
-+static OUString lcl_convertExcelSubtotalName(const OUString& rName)
-+{
-+    OUStringBuffer aBuf;
-+    const sal_Unicode* p = rName.getStr();
-+    sal_Int32 n = rName.getLength();
-+    for (sal_Int32 i = 0; i < n; ++i)
-+    {
-+        const sal_Unicode c = p[i];
-+        if (c == sal_Unicode('\\'))
-+        {
-+            aBuf.append(c);
-+            aBuf.append(c);
-+        }
-+        else
-+            aBuf.append(c);
-+    }
-+    return aBuf.makeStringAndClear();
-+}
-+
- ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) const
- {
-     const String& rFieldName = GetFieldName();
-@@ -1089,7 +1112,10 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con
- 
-     // custom subtotal name
-     if (maFieldExtInfo.mpFieldTotalName.get())
--        rSaveDim.SetSubtotalName(*maFieldExtInfo.mpFieldTotalName);
-+    {
-+        OUString aSubName = lcl_convertExcelSubtotalName(*maFieldExtInfo.mpFieldTotalName);
-+        rSaveDim.SetSubtotalName(aSubName);
-+    }
- 
-     return &rSaveDim;
- }
-diff --git sc/source/filter/xml/XMLExportDataPilot.cxx sc/source/filter/xml/XMLExportDataPilot.cxx
-index 0227b44..a06ddb2 100644
---- sc/source/filter/xml/XMLExportDataPilot.cxx
-+++ sc/source/filter/xml/XMLExportDataPilot.cxx
-@@ -68,6 +68,7 @@
- 
- using namespace com::sun::star;
- using namespace xmloff::token;
-+using ::rtl::OUString;
- 
- ScXMLExportDataPilot::ScXMLExportDataPilot(ScXMLExport& rTempExport)
- 	: rExport(rTempExport),
-@@ -456,7 +457,10 @@ void ScXMLExportDataPilot::WriteLayoutInfo(ScDPSaveDimension* pDim)
- 
- void ScXMLExportDataPilot::WriteSubTotals(ScDPSaveDimension* pDim)
- {
-+    using sheet::GeneralFunction;
-+
- 	sal_Int32 nSubTotalCount = pDim->GetSubTotalsCount();
-+    const OUString* pLayoutName = pDim->GetSubtotalName();
- 	if (nSubTotalCount > 0)
- 	{
- 		SvXMLElementExport aElemSTs(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, sal_True, sal_True);
-@@ -464,8 +468,11 @@ void ScXMLExportDataPilot::WriteSubTotals(ScDPSaveDimension* pDim)
- 		for (sal_Int32 nSubTotal = 0; nSubTotal < nSubTotalCount; nSubTotal++)
- 		{
- 			rtl::OUString sFunction;
--			ScXMLConverter::GetStringFromFunction( sFunction, (sheet::GeneralFunction)pDim->GetSubTotalFunc(nSubTotal) );
-+            GeneralFunction nFunc = static_cast<GeneralFunction>(pDim->GetSubTotalFunc(nSubTotal));
-+			ScXMLConverter::GetStringFromFunction( sFunction, nFunc);
- 			rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sFunction);
-+            if (pLayoutName && nFunc == sheet::GeneralFunction_AUTO)
-+                rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, *pLayoutName);
- 			SvXMLElementExport aElemST(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, sal_True, sal_True);
- 		}
- 	}
-@@ -481,6 +488,9 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim)
- 		for (ScDPSaveDimension::MemberList::const_iterator i=rMembers.begin(); i != rMembers.end() ; i++)
- 		{
- 			rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, rtl::OUString((*i)->GetName()));
-+            const OUString* pLayoutName = (*i)->GetLayoutName();
-+            if (pLayoutName)
-+                rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, *pLayoutName);
- 			rtl::OUStringBuffer sBuffer;
- 			SvXMLUnitConverter::convertBool(sBuffer, (*i)->GetIsVisible());
- 			rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, sBuffer.makeStringAndClear());
-@@ -678,6 +688,10 @@ void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const
- void ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDimensionSaveData* pDimData)
- {
- 	rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, rtl::OUString(pDim->GetName()));
-+    const OUString* pLayoutName = pDim->GetLayoutName();
-+    if (pLayoutName)
-+        rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, *pLayoutName);
-+
- 	if (pDim->IsDataLayout())
- 		rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_DATA_LAYOUT_FIELD, XML_TRUE);
- 	rtl::OUString sValueStr;
-@@ -714,6 +728,15 @@ void ScXMLExportDataPilot::WriteDimensions(ScDPSaveData* pDPSave)
- 	}
- }
- 
-+void ScXMLExportDataPilot::WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient, bool bVisible, const OUString* pGrandTotal)
-+{
-+    rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, bVisible ? XML_TRUE : XML_FALSE);
-+    rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORIENTATION, eOrient);
-+    if (pGrandTotal)
-+        rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, *pGrandTotal);
-+    SvXMLElementExport aElemGrandTotal(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_GRAND_TOTAL, sal_True, sal_True);
-+}
-+
- void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreadsheetDocument>& /* xSpreadDoc */)
- {
- 	pDoc = rExport.GetDocument();
-@@ -784,6 +807,20 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads
-                         if ((*pDPs)[i]->GetHeaderLayout ())
-                             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT, XML_TRUE);
- 						SvXMLElementExport aElemDP(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, sal_True, sal_True);
-+
-+                        // grand total elements.
-+
-+                        const OUString* pGrandTotalName = pDPSave->GetGrandTotalName();
-+                        if (bRowGrand && bColumnGrand)
-+                        {
-+                            WriteGrandTotal(XML_BOTH, true, pGrandTotalName);
-+                        }
-+                        else
-+                        {
-+                            WriteGrandTotal(XML_ROW, bRowGrand, pGrandTotalName);
-+                            WriteGrandTotal(XML_COLUMN, bColumnGrand, pGrandTotalName);
-+                        }
-+
- 						rExport.CheckAttrList();
- 						if ((*pDPs)[i]->IsSheetData())
- 						{
-diff --git sc/source/filter/xml/XMLExportDataPilot.hxx sc/source/filter/xml/XMLExportDataPilot.hxx
-index 2274d8c..881e29b 100644
---- sc/source/filter/xml/XMLExportDataPilot.hxx
-+++ sc/source/filter/xml/XMLExportDataPilot.hxx
-@@ -34,6 +34,7 @@
- #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
- #include <rtl/ustring.hxx>
- #include "global.hxx"
-+#include "xmloff/xmltoken.hxx"
- 
- class ScXMLExport;
- class ScDocument;
-@@ -69,6 +70,8 @@ class ScXMLExportDataPilot
-     void WriteDimension(ScDPSaveDimension* pDim, const ScDPDimensionSaveData* pDimData);
-     void WriteDimensions(ScDPSaveData* pDPSave);
- 
-+    void WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient, bool bVisible, const ::rtl::OUString* pGrandTotal);
-+
- public:
- 	ScXMLExportDataPilot(ScXMLExport& rExport);
- 	~ScXMLExportDataPilot();
-diff --git sc/source/filter/xml/xmldpimp.cxx sc/source/filter/xml/xmldpimp.cxx
-index de4c7ca..cc51364 100644
---- sc/source/filter/xml/xmldpimp.cxx
-+++ sc/source/filter/xml/xmldpimp.cxx
-@@ -66,6 +66,8 @@
- 
- using namespace com::sun::star;
- using namespace xmloff::token;
-+using ::com::sun::star::uno::Reference;
-+using ::com::sun::star::xml::sax::XAttributeList;
- using ::rtl::OUString;
- 
- //------------------------------------------------------------------
-@@ -114,6 +116,9 @@ void ScXMLDataPilotTablesContext::EndElement()
- {
- }
- 
-+ScXMLDataPilotTableContext::GrandTotalItem::GrandTotalItem() :
-+    mbVisible(false) {}
-+
- ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
- 									  USHORT nPrfx,
- 									  const ::rtl::OUString& rLName,
-@@ -165,6 +170,19 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
- 			case XML_TOK_DATA_PILOT_TABLE_ATTR_GRAND_TOTAL :
- 			{
- 				sGrandTotal = sValue;
-+                if (IsXMLToken(sValue, XML_BOTH))
-+                {    
-+                    maRowGrandTotal.mbVisible = true;
-+                    maColGrandTotal.mbVisible = true;
-+                }
-+                else if (IsXMLToken(sValue, XML_ROW))
-+                {    
-+                    maRowGrandTotal.mbVisible = true;
-+                }
-+                else if (IsXMLToken(sValue, XML_COLUMN))
-+                {    
-+                    maColGrandTotal.mbVisible = true;
-+                }
- 			}
- 			break;
- 			case XML_TOK_DATA_PILOT_TABLE_ATTR_IGNORE_EMPTY_ROWS :
-@@ -249,6 +267,11 @@ SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( USHORT nPref
- 			nSourceType = SERVICE;
- 		}
- 		break;
-+        case XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL:
-+        {
-+            pContext = new ScXMLDataPilotGrandTotalContext(GetScImport(), nPrefix, rLName, xAttrList, this);
-+        }
-+        break;
- 		case XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE :
- 		{
- 			pContext = new ScXMLSourceCellRangeContext(GetScImport(), nPrefix, rLName, xAttrList, this);
-@@ -417,26 +440,15 @@ void ScXMLDataPilotTableContext::EndElement()
- 			}
- 			break;
- 		}
--		if (IsXMLToken(sGrandTotal, XML_BOTH))
--		{
--			pDPSave->SetRowGrand(sal_True);
--			pDPSave->SetColumnGrand(sal_True);
--		}
--		else if (IsXMLToken(sGrandTotal, XML_ROW))
--		{
--			pDPSave->SetRowGrand(sal_True);
--			pDPSave->SetColumnGrand(sal_False);
--		}
--		else if (IsXMLToken(sGrandTotal, XML_COLUMN))
--		{
--			pDPSave->SetRowGrand(sal_False);
--			pDPSave->SetColumnGrand(sal_True);
--		}
--		else
--		{
--			pDPSave->SetRowGrand(sal_False);
--			pDPSave->SetColumnGrand(sal_False);
--		}
-+
-+        pDPSave->SetRowGrand(maRowGrandTotal.mbVisible);
-+        pDPSave->SetColumnGrand(maColGrandTotal.mbVisible);
-+        if (maRowGrandTotal.maDisplayName.getLength())
-+            // TODO: Right now, we only support one grand total name for both 
-+            // column and row totals.  Take the value from the row total for
-+            // now.
-+            pDPSave->SetGrandTotalName(maRowGrandTotal.maDisplayName);
-+
- 		pDPSave->SetIgnoreEmptyRows(bIgnoreEmptyRows);
- 		pDPSave->SetRepeatIfEmpty(bIdentifyCategories);
-         pDPSave->SetFilterButton(bShowFilter);
-@@ -454,6 +466,30 @@ void ScXMLDataPilotTableContext::EndElement()
- 	}
- }
- 
-+void ScXMLDataPilotTableContext::SetGrandTotal(
-+    XMLTokenEnum eOrientation, bool bVisible, const OUString& rDisplayName)
-+{
-+    switch (eOrientation)
-+    {
-+        case XML_BOTH:
-+            maRowGrandTotal.mbVisible     = bVisible;
-+            maRowGrandTotal.maDisplayName = rDisplayName;
-+            maColGrandTotal.mbVisible     = bVisible;
-+            maColGrandTotal.maDisplayName = rDisplayName;
-+        break;
-+        case XML_ROW:
-+            maRowGrandTotal.mbVisible     = bVisible;
-+            maRowGrandTotal.maDisplayName = rDisplayName;
-+        break;
-+        case XML_COLUMN:
-+            maColGrandTotal.mbVisible     = bVisible;
-+            maColGrandTotal.maDisplayName = rDisplayName;
-+        break;
-+        default:
-+            ;
-+    }
-+}
-+
- ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport,
- 									  USHORT nPrfx,
- 									  const ::rtl::OUString& rLName,
-@@ -698,6 +734,80 @@ void ScXMLSourceServiceContext::EndElement()
- {
- }
- 
-+ScXMLImport& ScXMLDataPilotGrandTotalContext::GetScImport()
-+{
-+    return static_cast<ScXMLImport&>(GetImport());
-+}
-+
-+ScXMLDataPilotGrandTotalContext::ScXMLDataPilotGrandTotalContext(
-+    ScXMLImport& rImport, USHORT nPrefix, const OUString& rLName, const Reference<XAttributeList>& xAttrList,
-+    ScXMLDataPilotTableContext* pTableContext ) :
-+    SvXMLImportContext( rImport, nPrefix, rLName ),
-+    mpTableContext(pTableContext),
-+    meOrientation(NONE),
-+    mbVisible(false)
-+{
-+    sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-+    const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotGrandTotalAttrTokenMap();
-+    for (sal_Int16 i = 0; i < nAttrCount; ++i)
-+    {
-+        const OUString& rAttrName  = xAttrList->getNameByIndex(i);
-+        const OUString& rAttrValue = xAttrList->getValueByIndex(i);
-+
-+        OUString aLocalName;
-+        USHORT nLocalPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
-+        switch (rAttrTokenMap.Get(nLocalPrefix, aLocalName))
-+        {
-+            case XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY:
-+                mbVisible = IsXMLToken(rAttrValue, XML_TRUE);
-+            break;
-+            case XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_ORIENTATION:
-+                if (IsXMLToken(rAttrValue, XML_BOTH))
-+                    meOrientation = BOTH;
-+                else if (IsXMLToken(rAttrValue, XML_ROW))
-+                    meOrientation = ROW;
-+                else if (IsXMLToken(rAttrValue, XML_COLUMN))
-+                    meOrientation = COLUMN;
-+            break;
-+            case XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME:
-+                maDisplayName = rAttrValue;
-+            break;
-+            default:
-+                ;
-+        }
-+    }
-+}
-+
-+ScXMLDataPilotGrandTotalContext::~ScXMLDataPilotGrandTotalContext()
-+{
-+}
-+
-+SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext( 
-+    USHORT nPrefix, const ::rtl::OUString& rLocalName, const Reference<XAttributeList>& xAttrList )
-+{
-+    return NULL;
-+}
-+
-+void ScXMLDataPilotGrandTotalContext::EndElement()
-+{
-+    XMLTokenEnum eOrient = XML_NONE;
-+    switch (meOrientation)
-+    {
-+        case BOTH:
-+            eOrient = XML_BOTH;
-+        break;
-+        case ROW:
-+            eOrient = XML_ROW;
-+        break;
-+        case COLUMN:
-+            eOrient = XML_COLUMN;
-+        break;
-+        default:
-+            ;
-+    }
-+    mpTableContext->SetGrandTotal(eOrient, mbVisible, maDisplayName);
-+}
-+
- ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport,
- 									  USHORT nPrfx,
- 									  const ::rtl::OUString& rLName,
-@@ -783,6 +893,7 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport,
- {
- 	sal_Bool bHasName(sal_False);
- 	sal_Bool bDataLayout(sal_False);
-+    OUString aDisplayName;
- 	sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
- 	const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotFieldAttrTokenMap();
- 	for( sal_Int16 i=0; i < nAttrCount; ++i )
-@@ -801,6 +912,11 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport,
- 				bHasName = sal_True;
- 			}
- 			break;
-+            case XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME:
-+            {
-+                aDisplayName = sValue;
-+            }
-+            break;
- 			case XML_TOK_DATA_PILOT_FIELD_ATTR_IS_DATA_LAYOUT_FIELD :
- 			{
- 				bDataLayout = IsXMLToken(sValue, XML_TRUE);
-@@ -830,7 +946,11 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport,
- 		}
- 	}
- 	if (bHasName)
-+    {    
- 		pDim = new ScDPSaveDimension(String(sName), bDataLayout);
-+        if (aDisplayName.getLength())
-+            pDim->SetLayoutName(aDisplayName);
-+    }
- }
- 
- ScXMLDataPilotFieldContext::~ScXMLDataPilotFieldContext()
-@@ -864,6 +984,12 @@ SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( USHORT nPref
- 	return pContext;
- }
- 
-+void ScXMLDataPilotFieldContext::SetSubTotalName(const OUString& rName)
-+{
-+    if (pDim)
-+        pDim->SetSubtotalName(rName);
-+}
-+
- void ScXMLDataPilotFieldContext::AddMember(ScDPSaveMember* pMember)
- {
-     if (pDim)
-@@ -1265,6 +1391,8 @@ SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( USHORT n
- void ScXMLDataPilotSubTotalsContext::EndElement()
- {
- 	pDataPilotField->SetSubTotals(pFunctions, nFunctionCount);
-+    if (maDisplayName.getLength())
-+        pDataPilotField->SetSubTotalName(maDisplayName);
- }
- 
- void ScXMLDataPilotSubTotalsContext::AddFunction(sal_Int16 nFunction)
-@@ -1287,6 +1415,11 @@ void ScXMLDataPilotSubTotalsContext::AddFunction(sal_Int16 nFunction)
- 	}
- }
- 
-+void ScXMLDataPilotSubTotalsContext::SetDisplayName(const OUString& rName)
-+{
-+    maDisplayName = rName;
-+}
-+
- ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImport,
- 									  USHORT nPrfx,
- 									  const ::rtl::OUString& rLName,
-@@ -1313,6 +1446,8 @@ ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImpo
-                 pDataPilotSubTotals->AddFunction( sal::static_int_cast<sal_Int16>(
-                                 ScXMLConverter::GetFunctionFromString( sValue ) ) );
- 			}
-+            case XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME:
-+                pDataPilotSubTotals->SetDisplayName(sValue);
- 			break;
- 		}
- 	}
-@@ -1410,6 +1545,10 @@ ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport,
-                 bHasName = sal_True;
- 			}
- 			break;
-+            case XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME:
-+            {
-+                maDisplayName = sValue;
-+            }
- 			case XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY :
- 			{
- 				bDisplay = IsXMLToken(sValue, XML_TRUE);
-@@ -1446,6 +1585,8 @@ void ScXMLDataPilotMemberContext::EndElement()
-     if (bHasName)   // #i53407# don't check sName, empty name is allowed
- 	{
- 		ScDPSaveMember* pMember = new ScDPSaveMember(String(sName));
-+        if (maDisplayName.getLength())
-+            pMember->SetLayoutName(maDisplayName);
- 		pMember->SetIsVisible(bDisplay);
- 		pMember->SetShowDetails(bDisplayDetails);
- 		pDataPilotField->AddMember(pMember);
-diff --git sc/source/filter/xml/xmldpimp.hxx sc/source/filter/xml/xmldpimp.hxx
-index ac52bc3..8f42bf1 100644
---- sc/source/filter/xml/xmldpimp.hxx
-+++ sc/source/filter/xml/xmldpimp.hxx
-@@ -83,10 +83,19 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext
- {
-     typedef ::std::hash_set< ::rtl::OUString, ::rtl::OUStringHash > StringSet;
-     StringSet       maHiddenMemberFields;
-+
-+    struct GrandTotalItem
-+    {
-+        ::rtl::OUString maDisplayName;
-+        bool            mbVisible;
-+        GrandTotalItem();
-+    };
- 	ScDocument*		pDoc;
- 	ScDPObject*		pDPObject;
- 	ScDPSaveData*	pDPSave;
-     ScDPDimensionSaveData* pDPDimSaveData;
-+    GrandTotalItem  maRowGrandTotal;
-+    GrandTotalItem  maColGrandTotal;
- 	rtl::OUString	sDataPilotTableName;
- 	rtl::OUString	sApplicationData;
- 	rtl::OUString	sGrandTotal;
-@@ -140,6 +149,7 @@ public:
- 
- 	virtual void EndElement();
- 
-+    void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const ::rtl::OUString& rDisplayName);
- 	void SetDatabaseName(const rtl::OUString& sValue) { sDatabaseName = sValue; }
- 	void SetSourceObject(const rtl::OUString& sValue) { sSourceObject = sValue; }
- 	void SetNative(const sal_Bool bValue) { bIsNative = bValue; }
-@@ -262,6 +272,34 @@ public:
- 	virtual void EndElement();
- };
- 
-+class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext
-+{
-+    enum Orientation { COLUMN, ROW, BOTH, NONE };
-+
-+    ScXMLImport& GetScImport();
-+
-+    ScXMLDataPilotTableContext* mpTableContext;
-+    ::rtl::OUString             maDisplayName;
-+    Orientation                 meOrientation;
-+    bool                        mbVisible;
-+    
-+public:
-+    ScXMLDataPilotGrandTotalContext( 
-+        ScXMLImport& rImport, USHORT nPrefix, const ::rtl::OUString& rLName,
-+        const ::com::sun::star::uno::Reference< 
-+            ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-+        ScXMLDataPilotTableContext* pTableContext );
-+
-+    virtual ~ScXMLDataPilotGrandTotalContext();
-+
-+    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
-+                                     const ::rtl::OUString& rLocalName,
-+                                     const ::com::sun::star::uno::Reference<
-+                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
-+
-+    virtual void EndElement();
-+};
-+
- class ScXMLSourceCellRangeContext : public SvXMLImportContext
- {
- 	ScXMLDataPilotTableContext*	pDataPilotTable;
-@@ -339,6 +377,7 @@ public:
- 
- 	void SetShowEmpty(const sal_Bool bValue) { if (pDim) pDim->SetShowEmpty(bValue); }
- 	void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); }
-+    void SetSubTotalName(const ::rtl::OUString& rName);
- 	void AddMember(ScDPSaveMember* pMember);
-     void SetFieldReference(const com::sun::star::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); }
-     void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); }
-@@ -463,6 +502,7 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext
- 
- 	sal_Int16	nFunctionCount;
- 	sal_uInt16*	pFunctions;
-+    ::rtl::OUString maDisplayName;
- 
- 	const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- 	ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-@@ -486,6 +526,7 @@ public:
- 
- 	virtual void EndElement();
- 	void AddFunction(sal_Int16 nFunction);
-+    void SetDisplayName(const ::rtl::OUString& rName);
- };
- 
- class ScXMLDataPilotSubTotalContext : public SvXMLImportContext
-@@ -543,6 +584,7 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext
- 	ScXMLDataPilotFieldContext*	pDataPilotField;
- 
- 	rtl::OUString sName;
-+    rtl::OUString maDisplayName;
- 	sal_Bool	bDisplay;
- 	sal_Bool	bDisplayDetails;
-     sal_Bool    bHasName;
-diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
-index 728373e..952afcd 100644
---- sc/source/filter/xml/xmlimprt.cxx
-+++ sc/source/filter/xml/xmlimprt.cxx
-@@ -1413,6 +1413,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableElemTokenMap()
-         {
-             { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL,	XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL		},
-             { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE,	XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE		},
-+            { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GRAND_TOTAL,  XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL       },
-             { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY,	XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY		},
-             { XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE,			XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE	},
-             { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE,		XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE	},
-@@ -1446,6 +1447,24 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceServiceAttrTokenMap()
-     return *pDataPilotTableSourceServiceAttrTokenMap;
- }
- 
-+const SvXMLTokenMap& ScXMLImport::GetDataPilotGrandTotalAttrTokenMap()
-+{
-+    if (!pDataPilotGrandTotalAttrTokenMap)
-+    {
-+        static __FAR_DATA SvXMLTokenMapEntry aDataPilotGrandTotalAttrTokenMap[] =
-+        {
-+            { XML_NAMESPACE_TABLE, XML_DISPLAY,      XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY      },
-+            { XML_NAMESPACE_TABLE, XML_ORIENTATION,  XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_ORIENTATION  },
-+            { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME },
-+            XML_TOKEN_MAP_END
-+        };
-+
-+        pDataPilotGrandTotalAttrTokenMap = new SvXMLTokenMap( aDataPilotGrandTotalAttrTokenMap );
-+    }
-+
-+    return *pDataPilotGrandTotalAttrTokenMap;
-+}
-+
- const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeAttrTokenMap()
- {
-     if( !pDataPilotTableSourceCellRangeAttrTokenMap )
-@@ -1485,6 +1504,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldAttrTokenMap()
-         static __FAR_DATA SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] =
-         {
-             { XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME,		XML_TOK_DATA_PILOT_FIELD_ATTR_SOURCE_FIELD_NAME		},
-+            { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,            XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME          },
-             { XML_NAMESPACE_TABLE, XML_IS_DATA_LAYOUT_FIELD,	XML_TOK_DATA_PILOT_FIELD_ATTR_IS_DATA_LAYOUT_FIELD	},
-             { XML_NAMESPACE_TABLE, XML_FUNCTION,				XML_TOK_DATA_PILOT_FIELD_ATTR_FUNCTION				},
-             { XML_NAMESPACE_TABLE, XML_ORIENTATION,			    XML_TOK_DATA_PILOT_FIELD_ATTR_ORIENTATION			},
-@@ -1576,6 +1596,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalAttrTokenMap()
-         static __FAR_DATA SvXMLTokenMapEntry aDataPilotSubTotalAttrTokenMap[] =
-         {
-             { XML_NAMESPACE_TABLE, XML_FUNCTION,				XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION			},
-+            { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,            XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME       },
-             XML_TOKEN_MAP_END
-         };
- 
-@@ -1608,6 +1629,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMemberAttrTokenMap()
-         static __FAR_DATA SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] =
-         {
-             { XML_NAMESPACE_TABLE, XML_NAME,					XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME					},
-+            { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,        XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME         },
-             { XML_NAMESPACE_TABLE, XML_DISPLAY,				XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY				},
-             { XML_NAMESPACE_TABLE, XML_SHOW_DETAILS,		XML_TOK_DATA_PILOT_MEMBER_ATTR_SHOW_DETAILS		},
-             XML_TOKEN_MAP_END
-@@ -1747,6 +1769,7 @@ ScXMLImport::ScXMLImport(
- 	pDataPilotTableAttrTokenMap( 0 ),
- 	pDataPilotTableElemTokenMap( 0 ),
- 	pDataPilotTableSourceServiceAttrTokenMap( 0 ),
-+    pDataPilotGrandTotalAttrTokenMap(NULL),
- 	pDataPilotTableSourceCellRangeElemTokenMap( 0 ),
- 	pDataPilotTableSourceCellRangeAttrTokenMap( 0 ),
- 	pDataPilotFieldAttrTokenMap( 0 ),
-diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx
-index 8ff4178..c441fd2 100644
---- sc/source/filter/xml/xmlimprt.hxx
-+++ sc/source/filter/xml/xmlimprt.hxx
-@@ -517,6 +517,7 @@ enum ScXMLDataPilotTableElemTokens
- {
- 	XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL,
- 	XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE,
-+    XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL,
- 	XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY,
- 	XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE,
- 	XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE,
-@@ -532,6 +533,13 @@ enum ScXMLDataPilotTableSourceServiceAttrTokens
- 	XML_TOK_SOURCE_SERVICE_ATTR_PASSWORD
- };
- 
-+enum ScXMLDataPilotGrandTotalAttrTokens
-+{
-+    XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY,
-+    XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_ORIENTATION,
-+    XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME
-+};
-+
- enum ScXMLDataPilotTableSourceCellRangeElemTokens
- {
- 	XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER
-@@ -545,6 +553,7 @@ enum ScXMLDataPilotTableSourceCellRangeAttrTokens
- enum ScXMLDataPilotFieldAttrTokens
- {
- 	XML_TOK_DATA_PILOT_FIELD_ATTR_SOURCE_FIELD_NAME,
-+    XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME,
- 	XML_TOK_DATA_PILOT_FIELD_ATTR_IS_DATA_LAYOUT_FIELD,
- 	XML_TOK_DATA_PILOT_FIELD_ATTR_FUNCTION,
- 	XML_TOK_DATA_PILOT_FIELD_ATTR_ORIENTATION,
-@@ -580,7 +589,8 @@ enum ScXMLDataPilotSubTotalsElemTokens
- 
- enum ScXMLDataPilotSubTotalAttrTokens
- {
--	XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION
-+    XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION,
-+    XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME
- };
- 
- enum ScXMLDataPilotMembersElemTokens
-@@ -591,6 +601,7 @@ enum ScXMLDataPilotMembersElemTokens
- enum ScXMLDataPilotMemberAttrTokens
- {
- 	XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME,
-+    XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME,
- 	XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY,
- 	XML_TOK_DATA_PILOT_MEMBER_ATTR_SHOW_DETAILS
- };
-@@ -751,6 +762,7 @@ class ScXMLImport: public SvXMLImport
- 	SvXMLTokenMap 			*pDataPilotTableAttrTokenMap;
- 	SvXMLTokenMap 			*pDataPilotTableElemTokenMap;
- 	SvXMLTokenMap 			*pDataPilotTableSourceServiceAttrTokenMap;
-+    SvXMLTokenMap           *pDataPilotGrandTotalAttrTokenMap;
- 	SvXMLTokenMap 			*pDataPilotTableSourceCellRangeElemTokenMap;
- 	SvXMLTokenMap 			*pDataPilotTableSourceCellRangeAttrTokenMap;
- 	SvXMLTokenMap 			*pDataPilotFieldAttrTokenMap;
-@@ -918,6 +930,7 @@ public:
- 	const SvXMLTokenMap& GetDataPilotTableAttrTokenMap();
- 	const SvXMLTokenMap& GetDataPilotTableElemTokenMap();
- 	const SvXMLTokenMap& GetDataPilotTableSourceServiceAttrTokenMap();
-+    const SvXMLTokenMap& GetDataPilotGrandTotalAttrTokenMap();
- 	const SvXMLTokenMap& GetDataPilotTableSourceCellRangeElemTokenMap();
- 	const SvXMLTokenMap& GetDataPilotTableSourceCellRangeAttrTokenMap();
- 	const SvXMLTokenMap& GetDataPilotFieldAttrTokenMap();
-diff --git sc/source/ui/view/dbfunc3.cxx sc/source/ui/view/dbfunc3.cxx
-index f58d9b5..c879c67 100644
---- sc/source/ui/view/dbfunc3.cxx
-+++ sc/source/ui/view/dbfunc3.cxx
-@@ -1390,7 +1390,7 @@ void ScDBFunc::UngroupDataPilot()
-     }
- }
- 
--OUString lcl_replaceMemberNameInSubtotal(const OUString& rSubtotal, const OUString& rMemberName)
-+static OUString lcl_replaceMemberNameInSubtotal(const OUString& rSubtotal, const OUString& rMemberName)
- {
-     sal_Int32 n = rSubtotal.getLength();
-     const sal_Unicode* p = rSubtotal.getStr();
-@@ -1407,6 +1407,18 @@ OUString lcl_replaceMemberNameInSubtotal(const OUString& rSubtotal, const OUStri
-                 aBuf.append(aWord);
-             aBuf.append(c);
-         }
-+        else if (c == sal_Unicode('\\'))
-+        {
-+            // Escape a backslash character.
-+            aWordBuf.append(c);
-+            aWordBuf.append(c);
-+        }
-+        else if (c == sal_Unicode('?'))
-+        {
-+            // A literal '?' must be escaped with a backslash ('\');
-+            aWordBuf.append(sal_Unicode('\\'));
-+            aWordBuf.append(c);
-+        }
-         else
-             aWordBuf.append(c);
-     }
diff --git a/applied_patches/0575-unittesting-stoc.diff b/applied_patches/0459-unittesting-stoc.diff
similarity index 100%
rename from applied_patches/0575-unittesting-stoc.diff
rename to applied_patches/0459-unittesting-stoc.diff
diff --git a/applied_patches/0460-calc-dp-custom-names-ods-xmloff.diff b/applied_patches/0460-calc-dp-custom-names-ods-xmloff.diff
deleted file mode 100644
index 63a3260e7..000000000
--- a/applied_patches/0460-calc-dp-custom-names-ods-xmloff.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
-index e2efd25..1bd90a9 100644
---- xmloff/inc/xmloff/xmltoken.hxx
-+++ xmloff/inc/xmloff/xmltoken.hxx
-@@ -520,6 +520,7 @@ namespace xmloff { namespace token {
-         XML_DATA_LABEL_SYMBOL,
-         XML_DATA_LABEL_TEXT,
-         XML_DATA_PILOT_FIELD,
-+        XML_DATA_PILOT_GRAND_TOTAL,
-         XML_DATA_PILOT_LEVEL,
-         XML_DATA_PILOT_MEMBER,
-         XML_DATA_PILOT_MEMBERS,
-diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
-index 4c16ec6..ef13e57 100644
---- xmloff/source/core/xmltoken.cxx
-+++ xmloff/source/core/xmltoken.cxx
-@@ -528,6 +528,7 @@ namespace xmloff { namespace token {
-         TOKEN( "data-label-symbol",               XML_DATA_LABEL_SYMBOL ),
-         TOKEN( "data-label-text",                 XML_DATA_LABEL_TEXT ),
-         TOKEN( "data-pilot-field",                XML_DATA_PILOT_FIELD ),
-+        TOKEN( "data-pilot-grand-total",          XML_DATA_PILOT_GRAND_TOTAL ),
-         TOKEN( "data-pilot-level",                XML_DATA_PILOT_LEVEL ),
-         TOKEN( "data-pilot-member",               XML_DATA_PILOT_MEMBER ),
-         TOKEN( "data-pilot-members",              XML_DATA_PILOT_MEMBERS ),
diff --git a/applied_patches/0576-unittesting-store.diff b/applied_patches/0460-unittesting-store.diff
similarity index 100%
rename from applied_patches/0576-unittesting-store.diff
rename to applied_patches/0460-unittesting-store.diff
diff --git a/applied_patches/0461-calc-selection-fixed-cursor.diff b/applied_patches/0461-calc-selection-fixed-cursor.diff
deleted file mode 100644
index a4dccaf86..000000000
--- a/applied_patches/0461-calc-selection-fixed-cursor.diff
+++ /dev/null
@@ -1,877 +0,0 @@
-diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 96b6809..cc91c1a 100644
---- sc/inc/document.hxx
-+++ sc/inc/document.hxx
-@@ -824,6 +824,7 @@ public:
-                                                 ScRange* pLastRange = NULL,
-                                                 Rectangle* pLastMM = NULL ) const;
- 
-+    void            SkipOverlapped( SCCOL& rCol, SCROW& rRow, SCTAB nTab ) const;
-     BOOL			IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
-     BOOL			IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
- 
-diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index de89b1b..8ba6dfa 100644
---- sc/source/core/data/document.cxx
-+++ sc/source/core/data/document.cxx
-@@ -4534,6 +4534,13 @@ BOOL ScDocument::RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow,
-     return bChange;
- }
- 
-+void ScDocument::SkipOverlapped( SCCOL& rCol, SCROW& rRow, SCTAB nTab ) const
-+{
-+    while (IsHorOverlapped(rCol, rRow, nTab))
-+        --rCol;
-+    while (IsVerOverlapped(rCol, rRow, nTab))
-+        --rRow;
-+}
- 
- BOOL ScDocument::IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
- {
-diff --git sc/source/ui/inc/cellsh.hxx sc/source/ui/inc/cellsh.hxx
-index 97f6d0d..a42a336 100644
---- sc/source/ui/inc/cellsh.hxx
-+++ sc/source/ui/inc/cellsh.hxx
-@@ -37,6 +37,7 @@
- #include <svx/svdmark.hxx>
- #include <tools/link.hxx>
- #include "formatsh.hxx"
-+#include "address.hxx"
- 
- class SvxClipboardFmtItem;
- class TransferableDataHelper;
-diff --git sc/source/ui/inc/tabview.hxx sc/source/ui/inc/tabview.hxx
-index 437b95b..804fbff 100644
---- sc/source/ui/inc/tabview.hxx
-+++ sc/source/ui/inc/tabview.hxx
-@@ -179,7 +179,6 @@ private:
-     BOOL				bInActivatePart;
-     BOOL				bInZoomUpdate;
-     BOOL				bMoveIsShift;
--    BOOL				bNewStartIfMarking;
- 
-     BOOL                bOldSelection;          // old style (inverting) of selection
- 
-@@ -203,6 +202,10 @@ private:
-     static void		SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL );
-     static long		GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL );
- 
-+    void            GetPageMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, SCsCOL& rPageX, SCsROW& rPageY);
-+    void            GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, 
-+                                           SCsCOL& rAreaX, SCsROW& rAreaY, ScFollowMode& rMode);
-+
- protected:
-     void			UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL,
-                                         const SCROW* pPosY = NULL );
-@@ -391,8 +394,6 @@ public:
- 
-     void			FindNextUnprot( BOOL bShift, BOOL bInSelection = TRUE );
- 
--    void			SetNewStartIfMarking();
--
-     void            SetTabNo( SCTAB nTab, BOOL bNew = FALSE, BOOL bExtendSelection = FALSE );
-     void            SelectNextTab( short nDir, BOOL bExtendSelection = FALSE );
- 
-@@ -483,6 +484,10 @@ public:
- 
-     BOOL			IsBlockMode() const		{ return bIsBlockMode; }
- 
-+    void            ExpandBlock(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode);
-+    void            ExpandBlockPage(SCsCOL nMovX, SCsROW nMovY);
-+    void            ExpandBlockArea(SCsCOL nMovX, SCsROW nMovY);
-+
-     void			MarkColumns();
-     void			MarkRows();
-     void			MarkDataArea( BOOL bIncludeCursor = TRUE );
-diff --git sc/source/ui/view/cellsh4.cxx sc/source/ui/view/cellsh4.cxx
-index 4cb00fb..3f80397 100644
---- sc/source/ui/view/cellsh4.cxx
-+++ sc/source/ui/view/cellsh4.cxx
-@@ -88,10 +88,56 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
-         {
-             // ADD mode: keep the selection, start a new block when marking with shift again
-             bKeep = TRUE;
--            pTabViewShell->SetNewStartIfMarking();
-         }
-     }
- 
-+    if (bSel)
-+    {
-+        switch (nSlotId)
-+        {
-+            case SID_CURSORDOWN:
-+                rReq.SetSlot(SID_CURSORDOWN_SEL);
-+            break;
-+            case SID_CURSORUP:
-+                rReq.SetSlot(SID_CURSORUP_SEL);
-+            break;
-+            case SID_CURSORRIGHT:
-+                rReq.SetSlot(SID_CURSORRIGHT_SEL);
-+            break;
-+            case SID_CURSORLEFT:
-+                rReq.SetSlot(SID_CURSORLEFT_SEL);
-+            break;
-+            case SID_CURSORPAGEDOWN:
-+                rReq.SetSlot(SID_CURSORPAGEDOWN_SEL);
-+            break;
-+            case SID_CURSORPAGEUP:
-+                rReq.SetSlot(SID_CURSORPAGEUP_SEL);
-+            break;
-+            case SID_CURSORPAGERIGHT:
-+                rReq.SetSlot(SID_CURSORPAGERIGHT_SEL);
-+            break;
-+            case SID_CURSORPAGELEFT:
-+                rReq.SetSlot(SID_CURSORPAGELEFT_SEL);
-+            break;
-+            case SID_CURSORBLKDOWN:
-+                rReq.SetSlot(SID_CURSORBLKDOWN_SEL);
-+            break;
-+            case SID_CURSORBLKUP:
-+                rReq.SetSlot(SID_CURSORBLKUP_SEL);
-+            break;
-+            case SID_CURSORBLKRIGHT:
-+                rReq.SetSlot(SID_CURSORBLKRIGHT_SEL);
-+            break;
-+            case SID_CURSORBLKLEFT:
-+                rReq.SetSlot(SID_CURSORBLKLEFT_SEL);
-+            break;
-+            default:
-+                ;
-+        }
-+        ExecuteCursorSel(rReq);
-+        return;
-+    }
-+
-     SCsCOLROW nRTLSign = 1;
-     if ( pData->GetDocument()->IsLayoutRTL( pData->GetTabNo() ) )
-     {
-@@ -172,38 +218,50 @@ void ScCellShell::GetStateCursor( SfxItemSet& /* rSet */ )
- 
- void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
- {
--    const SfxItemSet*	pReqArgs = rReq.GetArgs();
--    USHORT				nSlotId  = rReq.GetSlot();
--    short				nRepeat = 1;
--
--    if ( pReqArgs != NULL )
--    {
--        const	SfxPoolItem* pItem;
--        if( IS_AVAILABLE( FN_PARAM_1, &pItem ) )
--            nRepeat = ((const SfxInt16Item*)pItem)->GetValue();
--    }
-+    sal_uInt16 nSlotId  = rReq.GetSlot();
-+    ScTabViewShell* pViewShell = GetViewData()->GetViewShell();
- 
--    switch ( nSlotId )
-+    switch (nSlotId)
-     {
--        case SID_CURSORDOWN_SEL:		rReq.SetSlot( SID_CURSORDOWN );  break;
--        case SID_CURSORBLKDOWN_SEL:		rReq.SetSlot( SID_CURSORBLKDOWN );  break;
--        case SID_CURSORUP_SEL:			rReq.SetSlot( SID_CURSORUP );  break;
--        case SID_CURSORBLKUP_SEL:		rReq.SetSlot( SID_CURSORBLKUP );  break;
--        case SID_CURSORLEFT_SEL:		rReq.SetSlot( SID_CURSORLEFT );  break;
--        case SID_CURSORBLKLEFT_SEL:		rReq.SetSlot( SID_CURSORBLKLEFT );  break;
--        case SID_CURSORRIGHT_SEL:		rReq.SetSlot( SID_CURSORRIGHT );  break;
--        case SID_CURSORBLKRIGHT_SEL:	rReq.SetSlot( SID_CURSORBLKRIGHT );  break;
--        case SID_CURSORPAGEDOWN_SEL:	rReq.SetSlot( SID_CURSORPAGEDOWN );  break;
--        case SID_CURSORPAGEUP_SEL:		rReq.SetSlot( SID_CURSORPAGEUP );  break;
--        case SID_CURSORPAGERIGHT_SEL:	rReq.SetSlot( SID_CURSORPAGERIGHT_ );  break;
--        case SID_CURSORPAGELEFT_SEL:	rReq.SetSlot( SID_CURSORPAGELEFT_ );  break;
-+        case SID_CURSORDOWN_SEL:
-+            pViewShell->ExpandBlock(0, 1, SC_FOLLOW_LINE);
-+        break;
-+        case SID_CURSORUP_SEL:
-+            pViewShell->ExpandBlock(0, -1, SC_FOLLOW_LINE);
-+        break;
-+        case SID_CURSORRIGHT_SEL:
-+            pViewShell->ExpandBlock(1, 0, SC_FOLLOW_LINE);
-+        break;
-+        case SID_CURSORLEFT_SEL:
-+            pViewShell->ExpandBlock(-1, 0, SC_FOLLOW_LINE);
-+        break;
-+        case SID_CURSORPAGEUP_SEL:
-+            pViewShell->ExpandBlockPage(0, -1);
-+        break;
-+        case SID_CURSORPAGEDOWN_SEL:
-+            pViewShell->ExpandBlockPage(0, 1);
-+        break;
-+        case SID_CURSORPAGERIGHT_SEL:
-+            pViewShell->ExpandBlockPage(1, 0);
-+        break;
-+        case SID_CURSORPAGELEFT_SEL:
-+            pViewShell->ExpandBlockPage(-1, 0);
-+        break;
-+        case SID_CURSORBLKDOWN_SEL:
-+            pViewShell->ExpandBlockArea(0, 1);
-+        break;
-+        case SID_CURSORBLKUP_SEL:
-+            pViewShell->ExpandBlockArea(0, -1);
-+        break;
-+        case SID_CURSORBLKRIGHT_SEL:
-+            pViewShell->ExpandBlockArea(1, 0);
-+        break;
-+        case SID_CURSORBLKLEFT_SEL:
-+            pViewShell->ExpandBlockArea(-1, 0);
-+        break;
-         default:
--            DBG_ERROR("Unbekannte Message bei ViewShell (CursorSel)");
--            return;
-+            ;
-     }
--    rReq.AppendItem( SfxInt16Item(FN_PARAM_1, nRepeat ) );
--    rReq.AppendItem( SfxBoolItem(FN_PARAM_2, TRUE) );
--    ExecuteSlot( rReq, GetInterface() );
- }
- 
- void ScCellShell::ExecuteMove( SfxRequest& rReq )
-@@ -348,7 +406,6 @@ void ScCellShell::ExecutePage( SfxRequest& rReq )
-         {
-             // ADD mode: keep the selection, start a new block when marking with shift again
-             bKeep = TRUE;
--            pTabViewShell->SetNewStartIfMarking();
-         }
-     }
- 
-diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
-index ad12e86..b5bb7c6 100644
---- sc/source/ui/view/gridwin.cxx
-+++ sc/source/ui/view/gridwin.cxx
-@@ -2200,8 +2200,12 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
-             }
- 
-             SfxStringItem aPosItem( SID_CURRENTCELL, aAddr );
-+            // We don't want to align to the cursor position because if the 
-+            // cell cursor isn't visible after making selection, it would jump
-+            // back to the origin of the selection where the cell cursor is.
-+            SfxBoolItem aAlignCursorItem( FN_PARAM_2, false );
-             pDisp->Execute( SID_CURRENTCELL, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
--                                        &aPosItem, (void*)0L );
-+                                        &aPosItem, &aAlignCursorItem, (void*)0L );
- 
-             pViewData->GetView()->InvalidateAttribs();
-         }
-@@ -3960,7 +3960,10 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
-                 if ( bDone )
-                 {
-                     pView->MarkRange( aDest, FALSE, FALSE );
--                    pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
-+
-+                    SCCOL nDCol = pViewData->GetCurX() - aSource.aStart.Col();
-+                    SCROW nDRow = pViewData->GetCurY() - aSource.aStart.Row();
-+                    pView->SetCursor( aDest.aStart.Col() + nDCol, aDest.aStart.Row() + nDRow );
-                 }
- 
-                 pDocSh->GetUndoManager()->LeaveListAction();
-@@ -4068,7 +4071,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
-                     pView->EnterMatrix( aFormula );
- 
-                     pView->MarkRange( aDest, FALSE, FALSE );
--                    pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
-+                    pView->SetCursor( aDest.aStart.Col(), aDest.aStart.Row() );
-                 }
- 
-                 pDocSh->GetUndoManager()->LeaveListAction();
-@@ -4102,7 +4105,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
-                 if ( bDone )
-                 {
-                     pView->MarkRange( aDest, FALSE, FALSE );
--                    pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
-+                    pView->SetCursor( aDest.aStart.Col(), aDest.aStart.Row() );
-                 }
-             }
- 
-diff --git sc/source/ui/view/select.cxx sc/source/ui/view/select.cxx
-index d41fe45..e983ca9 100644
---- sc/source/ui/view/select.cxx
-+++ sc/source/ui/view/select.cxx
-@@ -667,7 +667,10 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
-                 }
-             }
-             if (bStarted)
-+                // If the selection is already started, don't set the cursor.
-                 pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab, FALSE, FALSE, TRUE );
-+            else
-+                pView->SetCursor( (SCCOL) nPosX, (SCROW) nPosY );
-         }
-         else
-         {
-@@ -703,9 +706,9 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
-                 
-                 bStarted = TRUE;
-             }
-+            pView->SetCursor( (SCCOL) nPosX, (SCROW) nPosY );
-         }
- 
--        pView->SetCursor( (SCCOL) nPosX, (SCROW) nPosY );
-         pViewData->SetRefStart( nPosX, nPosY, nTab );
-         if (bHideCur)
-             pView->ShowAllCursors();
-diff --git sc/source/ui/view/tabview.cxx sc/source/ui/view/tabview.cxx
-index dacaee8..5274b50 100644
---- sc/source/ui/view/tabview.cxx
-+++ sc/source/ui/view/tabview.cxx
-@@ -384,7 +384,6 @@ BOOL lcl_HasRowOutline( const ScViewData& rViewData )
-             bInActivatePart( FALSE ),										\
-             bInZoomUpdate( FALSE ),											\
--             bMoveIsShift( FALSE ),											\
--            bNewStartIfMarking( FALSE )
-+             bMoveIsShift( FALSE )
- 
- 
- ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) :
-diff --git sc/source/ui/view/tabview2.cxx sc/source/ui/view/tabview2.cxx
-index bd9515c..bd744e4 100644
---- sc/source/ui/view/tabview2.cxx
-+++ sc/source/ui/view/tabview2.cxx
-@@ -62,6 +62,7 @@
- #include "waitoff.hxx"
- #include "globstr.hrc"
- #include "scmod.hxx"
-+#include "tabprotection.hxx"
- 
- #define SC_BLOCKMODE_NONE		0
- #define SC_BLOCKMODE_NORMAL		1
-@@ -178,16 +179,9 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
-         InvertBlockMark( nBlockStartX,nBlockStartY,nBlockEndX,nBlockEndY );
- #endif
-         UpdateSelectionOverlay();
--
--        bNewStartIfMarking = FALSE;		// use only once
-     }
- }
- 
--void ScTabView::SetNewStartIfMarking()
--{
--    bNewStartIfMarking = TRUE;
--}
--
- void ScTabView::DoneBlockMode( BOOL bContinue )            // Default FALSE
- {
-     //	Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird,
-@@ -414,6 +408,297 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
-         aHdrFunc.SetAnchorFlag( FALSE );
- }
- 
-+void ScTabView::GetPageMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, SCsCOL& rPageX, SCsROW& rPageY)
-+{
-+    SCCOL nCurX;
-+    SCROW nCurY;
-+    aViewData.GetMoveCursor( nCurX,nCurY );
-+
-+    ScSplitPos eWhich = aViewData.GetActivePart();
-+    ScHSplitPos eWhichX = WhichH( eWhich );
-+    ScVSplitPos eWhichY = WhichV( eWhich );
-+
-+    SCsCOL nPageX;
-+    SCsROW nPageY;
-+    if (nMovX >= 0)
-+        nPageX = ((SCsCOL) aViewData.CellsAtX( nCurX, 1, eWhichX )) * nMovX;
-+    else
-+        nPageX = ((SCsCOL) aViewData.CellsAtX( nCurX, -1, eWhichX )) * nMovX;
-+
-+    if (nMovY >= 0)
-+        nPageY = ((SCsROW) aViewData.CellsAtY( nCurY, 1, eWhichY )) * nMovY;
-+    else
-+        nPageY = ((SCsROW) aViewData.CellsAtY( nCurY, -1, eWhichY )) * nMovY;
-+
-+    if (nMovX != 0 && nPageX == 0) nPageX = (nMovX>0) ? 1 : -1;
-+    if (nMovY != 0 && nPageY == 0) nPageY = (nMovY>0) ? 1 : -1;
-+
-+    rPageX = nPageX;
-+    rPageY = nPageY;
-+}
-+
-+void ScTabView::GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, 
-+                                       SCsCOL& rAreaX, SCsROW& rAreaY, ScFollowMode& rMode)
-+{
-+    SCCOL nNewX = -1;
-+    SCROW nNewY = -1;
-+    SCCOL nCurX = -1;
-+    SCROW nCurY = -1;
-+
-+    if (aViewData.IsRefMode())
-+    {
-+        nNewX = aViewData.GetRefEndX();
-+        nNewY = aViewData.GetRefEndY();
-+    }
-+    else if (IsBlockMode())
-+    {
-+        nNewX = nBlockEndX;
-+        nNewY = nBlockEndY;
-+    }
-+    else
-+    {
-+        nNewX = nCurX = aViewData.GetCurX();
-+        nNewY = nCurY = aViewData.GetCurY();
-+    }
-+
-+    ScDocument* pDoc = aViewData.GetDocument();
-+    SCTAB nTab = aViewData.GetTabNo();
-+
-+    //  FindAreaPos kennt nur -1 oder 1 als Richtung
-+
-+    SCsCOLROW i;
-+    if ( nMovX > 0 )
-+        for ( i=0; i<nMovX; i++ )
-+            pDoc->FindAreaPos( nNewX, nNewY, nTab,  1,  0 );
-+    if ( nMovX < 0 )
-+        for ( i=0; i<-nMovX; i++ )
-+            pDoc->FindAreaPos( nNewX, nNewY, nTab, -1,  0 );
-+    if ( nMovY > 0 )
-+        for ( i=0; i<nMovY; i++ )
-+            pDoc->FindAreaPos( nNewX, nNewY, nTab,  0,  1 );
-+    if ( nMovY < 0 )
-+        for ( i=0; i<-nMovY; i++ )
-+            pDoc->FindAreaPos( nNewX, nNewY, nTab,  0, -1 );
-+
-+    if (eMode==SC_FOLLOW_JUMP)                  // unten/rechts nicht zuviel grau anzeigen
-+    {
-+        if (nMovX != 0 && nNewX == MAXCOL)
-+            eMode = SC_FOLLOW_LINE;
-+        if (nMovY != 0 && nNewY == MAXROW)
-+            eMode = SC_FOLLOW_LINE;
-+    }
-+
-+    if (aViewData.IsRefMode())
-+    {
-+        rAreaX = nNewX - aViewData.GetRefEndX();
-+        rAreaY = nNewY - aViewData.GetRefEndY();
-+    }
-+    else if (IsBlockMode())
-+    {
-+        rAreaX = nNewX - nBlockEndX;
-+        rAreaY = nNewY - nBlockEndY;
-+    }
-+    else
-+    {
-+        rAreaX = nNewX - nCurX;
-+        rAreaY = nNewY - nCurY;
-+    }
-+    rMode = eMode;
-+}
-+
-+namespace {
-+
-+bool lcl_isCellQualified(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, bool bSelectLocked, bool bSelectUnlocked)
-+{
-+    bool bCellProtected = pDoc->HasAttrib(
-+        nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_PROTECTED);
-+
-+    if (bCellProtected && !bSelectLocked)
-+        return false;
-+
-+    if (!bCellProtected && !bSelectUnlocked)
-+        return false;
-+
-+    return true;
-+}
-+
-+void lcl_moveCursorByProtRule(
-+    SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, SCTAB nTab, ScDocument* pDoc)
-+{
-+    bool bSelectLocked = true;
-+    bool bSelectUnlocked = true;
-+    ScTableProtection* pTabProtection = pDoc->GetTabProtection(nTab);
-+    if (pTabProtection && pTabProtection->isProtected())
-+    {
-+        bSelectLocked   = pTabProtection->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS);
-+        bSelectUnlocked = pTabProtection->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);
-+    }
-+
-+    if (nMovX > 0)
-+    {
-+        if (rCol < MAXCOL)
-+        {
-+            for (SCCOL i = 0; i < nMovX; ++i)
-+            {
-+                if (!lcl_isCellQualified(pDoc, rCol+1, rRow, nTab, bSelectLocked, bSelectUnlocked))
-+                    break;
-+                ++rCol;
-+            }
-+        }
-+    }
-+    else if (nMovX < 0)
-+    {
-+        if (rCol > 0)
-+        {
-+            nMovX = -nMovX;
-+            for (SCCOL i = 0; i < nMovX; ++i)
-+            {
-+                if (!lcl_isCellQualified(pDoc, rCol-1, rRow, nTab, bSelectLocked, bSelectUnlocked))
-+                    break;
-+                --rCol;
-+            }
-+        }
-+    }
-+
-+    if (nMovY > 0)
-+    {
-+        if (rRow < MAXROW)
-+        {
-+            for (SCROW i = 0; i < nMovY; ++i)
-+            {
-+                if (!lcl_isCellQualified(pDoc, rCol, rRow+1, nTab, bSelectLocked, bSelectUnlocked))
-+                    break;
-+                ++rRow;
-+            }
-+        }
-+    }
-+    else if (nMovY < 0)
-+    {
-+        if (rRow > 0)
-+        {
-+            nMovY = -nMovY;
-+            for (SCROW i = 0; i < nMovY; ++i)
-+            {
-+                if (!lcl_isCellQualified(pDoc, rCol, rRow-1, nTab, bSelectLocked, bSelectUnlocked))
-+                    break;
-+                --rRow;
-+            }
-+        }
-+    }
-+}
-+
-+}
-+
-+void ScTabView::ExpandBlock(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode)
-+{
-+    if (!nMovX && !nMovY)
-+        // Nothing to do.  Bail out.
-+        return;
-+
-+    ScTabViewShell* pViewShell = aViewData.GetViewShell();
-+    bool bRefInputMode = pViewShell && pViewShell->IsRefInputMode();
-+    if (bRefInputMode && !aViewData.IsRefMode())
-+        // initialize formula reference mode if it hasn't already.
-+        InitRefMode(aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo(), SC_REFTYPE_REF);
-+
-+    ScDocument* pDoc = aViewData.GetDocument();
-+
-+    if (aViewData.IsRefMode())
-+    {
-+        // formula reference mode
-+
-+        SCCOL nNewX = aViewData.GetRefEndX();
-+        SCROW nNewY = aViewData.GetRefEndY();
-+        SCTAB nRefTab = aViewData.GetRefEndZ();
-+
-+        bool bSelectLocked = true;
-+        bool bSelectUnlocked = true;
-+        ScTableProtection* pTabProtection = pDoc->GetTabProtection(nRefTab);
-+        if (pTabProtection && pTabProtection->isProtected())
-+        {
-+            bSelectLocked   = pTabProtection->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS);
-+            bSelectUnlocked = pTabProtection->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);
-+        }
-+
-+        lcl_moveCursorByProtRule(nNewX, nNewY, nMovX, nMovY, nRefTab, pDoc);
-+
-+        if (nMovX)
-+        {
-+            SCCOL nTempX = nNewX;
-+            while (pDoc->IsHorOverlapped(nTempX, nNewY, nRefTab))
-+            {
-+                if (nMovX > 0)
-+                    ++nTempX;
-+                else
-+                    --nTempX;
-+            }
-+            if (lcl_isCellQualified(pDoc, nTempX, nNewY, nRefTab, bSelectLocked, bSelectUnlocked))
-+                nNewX = nTempX;
-+        }
-+
-+        if (nMovY)
-+        {
-+            SCROW nTempY = nNewY;
-+            while (pDoc->IsVerOverlapped(nNewX, nTempY, nRefTab))
-+            {
-+                if (nMovY > 0)
-+                    ++nTempY;
-+                else
-+                    --nTempY;
-+            }
-+            if (lcl_isCellQualified(pDoc, nNewX, nTempY, nRefTab, bSelectLocked, bSelectUnlocked))
-+                nNewY = nTempY;
-+        }
-+
-+        pDoc->SkipOverlapped(nNewX, nNewY, nRefTab);
-+        UpdateRef(nNewX, nNewY, nRefTab);
-+        AlignToCursor(nNewX, nNewY, eMode);
-+    }
-+    else
-+    {
-+        // normal selection mode
-+
-+        SCTAB nTab = aViewData.GetTabNo();
-+
-+        if (!IsBlockMode())
-+            InitBlockMode(aViewData.GetCurX(), aViewData.GetCurY(), nTab, true);
-+
-+        lcl_moveCursorByProtRule(nBlockEndX, nBlockEndY, nMovX, nMovY, nTab, pDoc);
-+    
-+        if (nBlockEndX < 0)
-+            nBlockEndX = 0;
-+        else if (nBlockEndX > MAXCOL) 
-+            nBlockEndX = MAXCOL;
-+    
-+        if (nBlockEndY < 0)
-+            nBlockEndY = 0;
-+        else if (nBlockEndY > MAXROW)
-+            nBlockEndY = MAXROW;
-+    
-+        pDoc->SkipOverlapped(nBlockEndX, nBlockEndY, nTab);
-+        MarkCursor(nBlockEndX, nBlockEndY, nTab, false, false, true);
-+        AlignToCursor(nBlockEndX, nBlockEndY, eMode);
-+        UpdateAutoFillMark();
-+    }
-+}
-+
-+void ScTabView::ExpandBlockPage(SCsCOL nMovX, SCsROW nMovY)
-+{
-+    SCsCOL nPageX;
-+    SCsROW nPageY;
-+    GetPageMoveEndPosition(nMovX, nMovY, nPageX, nPageY);
-+    ExpandBlock(nPageX, nPageY, SC_FOLLOW_FIX);
-+}
-+
-+void ScTabView::ExpandBlockArea(SCsCOL nMovX, SCsROW nMovY)
-+{
-+    SCsCOL nAreaX;
-+    SCsROW nAreaY;
-+    ScFollowMode eMode;
-+    GetAreaMoveEndPosition(nMovX, nMovY, SC_FOLLOW_JUMP, nAreaX, nAreaY, eMode);
-+    ExpandBlock(nAreaX, nAreaY, eMode);
-+}
-+
- void ScTabView::UpdateSelectionOverlay()
- {
-     for (USHORT i=0; i<4; i++)
-diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
-index 1b4879c..da85e44 100644
---- sc/source/ui/view/tabview3.cxx
-+++ sc/source/ui/view/tabview3.cxx
-@@ -125,10 +125,7 @@ void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl )
- {
-     ScDocument* pDoc = aViewData.GetDocument();
-     SCTAB nTab = aViewData.GetTabNo();
--    while (pDoc->IsHorOverlapped( nPosX, nPosY, nTab ))		//! ViewData !!!
--        --nPosX;
--    while (pDoc->IsVerOverlapped( nPosX, nPosY, nTab ))
--        --nPosY;
-+	pDoc->SkipOverlapped(nPosX, nPosY, nTab);
- 
-     BOOL bRefMode = SC_MOD()->IsFormulaMode();
- 
-@@ -921,22 +918,36 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
- 
-     HideAllCursors();
- 
--    if ( bShift && bNewStartIfMarking && IsBlockMode() )
--    {
--        //	used for ADD selection mode: start a new block from the cursor position
--        DoneBlockMode( TRUE );
--        InitBlockMode( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo(), TRUE );
--    }
--
-         //	aktiven Teil umschalten jetzt in AlignToCursor
- 
-     AlignToCursor( nCurX, nCurY, eMode );
-     //!		auf OS/2: SC_FOLLOW_JUMP statt SC_FOLLOW_LINE, um Nachlaufen zu verhindern ???
- 
-     if (bKeepSel)
-+    {    
-         SetCursor( nCurX, nCurY );		// Markierung stehenlassen
-+
-+        // If the cursor is in existing selection, it's a cursor movement by 
-+        // ENTER or TAB.  If not, then it's a new selection during ADD
-+        // selection mode.
-+
-+        const ScMarkData& rMark = aViewData.GetMarkData();
-+        ScRangeList aSelList;
-+        rMark.FillRangeListWithMarks(&aSelList, false);
-+        if (!aSelList.In(ScRange(nCurX, nCurY, aViewData.GetTabNo())))
-+            // Cursor not in existing selection.  Start a new selection.
-+            DoneBlockMode(true);
-+    }
-     else
-     {
-+        if (!bShift)
-+        {
-+            // Remove all marked data on cursor movement unless the Shift is locked.
-+            ScMarkData aData(aViewData.GetMarkData());
-+            aData.ResetMark();
-+            SetMarkData(aData);
-+        }
-+
-         BOOL bSame = ( nCurX == aViewData.GetCurX() && nCurY == aViewData.GetCurY() );
-         bMoveIsShift = bShift;
-         pSelEngine->CursorPosChanging( bShift, bControl );
-@@ -1080,68 +1091,18 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
- 
- void ScTabView::MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel )
- {
--    SCCOL nCurX;
--    SCROW nCurY;
--    aViewData.GetMoveCursor( nCurX,nCurY );
--
--    ScSplitPos eWhich = aViewData.GetActivePart();
--    ScHSplitPos eWhichX = WhichH( eWhich );
--    ScVSplitPos eWhichY = WhichV( eWhich );
--
-     SCsCOL nPageX;
-     SCsROW nPageY;
--    if (nMovX >= 0)
--        nPageX = ((SCsCOL) aViewData.CellsAtX( nCurX, 1, eWhichX )) * nMovX;
--    else
--        nPageX = ((SCsCOL) aViewData.CellsAtX( nCurX, -1, eWhichX )) * nMovX;
--
--    if (nMovY >= 0)
--        nPageY = ((SCsROW) aViewData.CellsAtY( nCurY, 1, eWhichY )) * nMovY;
--    else
--        nPageY = ((SCsROW) aViewData.CellsAtY( nCurY, -1, eWhichY )) * nMovY;
--
--    if (nMovX != 0 && nPageX == 0) nPageX = (nMovX>0) ? 1 : -1;
--    if (nMovY != 0 && nPageY == 0) nPageY = (nMovY>0) ? 1 : -1;
--
-+    GetPageMoveEndPosition(nMovX, nMovY, nPageX, nPageY);
-     MoveCursorRel( nPageX, nPageY, eMode, bShift, bKeepSel );
- }
- 
- void ScTabView::MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel )
- {
--    SCCOL nCurX;
--    SCROW nCurY;
--    aViewData.GetMoveCursor( nCurX,nCurY );
--    SCCOL nNewX = nCurX;
--    SCROW nNewY = nCurY;
--
--    ScDocument* pDoc = aViewData.GetDocument();
--    SCTAB nTab = aViewData.GetTabNo();
--
--    //	FindAreaPos kennt nur -1 oder 1 als Richtung
--
--    SCsCOLROW i;
--    if ( nMovX > 0 )
--        for ( i=0; i<nMovX; i++ )
--            pDoc->FindAreaPos( nNewX, nNewY, nTab,  1,  0 );
--    if ( nMovX < 0 )
--        for ( i=0; i<-nMovX; i++ )
--            pDoc->FindAreaPos( nNewX, nNewY, nTab, -1,  0 );
--    if ( nMovY > 0 )
--        for ( i=0; i<nMovY; i++ )
--            pDoc->FindAreaPos( nNewX, nNewY, nTab,  0,  1 );
--    if ( nMovY < 0 )
--        for ( i=0; i<-nMovY; i++ )
--            pDoc->FindAreaPos( nNewX, nNewY, nTab,  0, -1 );
--
--    if (eMode==SC_FOLLOW_JUMP)					// unten/rechts nicht zuviel grau anzeigen
--    {
--        if (nMovX != 0 && nNewX == MAXCOL)
--            eMode = SC_FOLLOW_LINE;
--        if (nMovY != 0 && nNewY == MAXROW)
--            eMode = SC_FOLLOW_LINE;
--    }
--
--    MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, eMode, bShift, bKeepSel );
-+    SCsCOL nNewX;
-+    SCsROW nNewY;
-+    GetAreaMoveEndPosition(nMovX, nMovY, eMode, nNewX, nNewY, eMode);
-+    MoveCursorRel(nNewX, nNewY, eMode, bShift, bKeepSel);
- }
- 
- void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel )
-@@ -1206,14 +1167,8 @@ void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode
-     else if (nMovY>0)
-         nNewY=nPosY+nAddY;
- 
--//	aViewData.ResetOldCursor();
-     aViewData.SetOldCursor( nNewX,nNewY );
--
--    while (pDoc->IsHorOverlapped( nNewX, nNewY, nTab ))
--        --nNewX;
--    while (pDoc->IsVerOverlapped( nNewX, nNewY, nTab ))
--        --nNewY;
--
-+	pDoc->SkipOverlapped(nNewX, nNewY, nTab);
-     MoveCursorAbs( nNewX, nNewY, eMode, bShift, FALSE, TRUE );
- }
- 
-@@ -1497,11 +1452,7 @@ void ScTabView::MarkRange( const ScRange& rRange, BOOL bSetCursor, BOOL bContinu
-         SCCOL nPosX = rRange.aStart.Col();
-         SCROW nPosY = rRange.aStart.Row();
-         ScDocument* pDoc = aViewData.GetDocument();
--
--        while (pDoc->IsHorOverlapped( nPosX, nPosY, nTab ))		//! ViewData !!!
--            --nPosX;
--        while (pDoc->IsVerOverlapped( nPosX, nPosY, nTab ))
--            --nPosY;
-+		pDoc->SkipOverlapped(nPosX, nPosY, nTab);
- 
-         aViewData.ResetOldCursor();
-         SetCursor( nPosX, nPosY );
-diff --git sc/source/ui/view/tabvwsh3.cxx sc/source/ui/view/tabvwsh3.cxx
-index caea267..74505f4 100644
---- sc/source/ui/view/tabvwsh3.cxx
-+++ sc/source/ui/view/tabvwsh3.cxx
-@@ -276,6 +276,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
-                 if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET )
-                     bUnmark = ((const SfxBoolItem*)pItem)->GetValue();
- 
-+                bool bAlignToCursor = true;
-+                if (pReqArgs->GetItemState(FN_PARAM_2, true, &pItem) == SFX_ITEM_SET)
-+                    bAlignToCursor = static_cast<const SfxBoolItem*>(pItem)->GetValue();
-+
-                 if ( nSlot == SID_JUMPTOMARK )
-                 {
-                     //	#106586# URL has to be decoded for escaped characters (%20)
-@@ -396,10 +396,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
-                     // und Cursor setzen
- 
-                     // zusammengefasste Zellen beruecksichtigen:
--                    while ( pDoc->IsHorOverlapped( nCol, nRow, nTab ) )		//! ViewData !!!
--                        --nCol;
--                    while ( pDoc->IsVerOverlapped( nCol, nRow, nTab ) )
--                        --nRow;
-+                    pDoc->SkipOverlapped(nCol, nRow, nTab);
- 
-                     //	Navigator-Aufrufe sind nicht API!!!
- 
-@@ -417,9 +421,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
-                         if (!rReq.IsAPI())
-                             rReq.Done();
-                     }
--                    // align to cursor even if the cursor position hasn't changed, 
--                    // because the cursor may be set outside the visible area.
--                    AlignToCursor( nCol, nRow, SC_FOLLOW_JUMP );
-+
-+                    if (bAlignToCursor)
-+                    {
-+                        // align to cursor even if the cursor position hasn't changed, 
-+                        // because the cursor may be set outside the visible area.
-+                        AlignToCursor( nCol, nRow, SC_FOLLOW_JUMP );
-+                    }
- 
-                     rReq.SetReturnValue( SfxStringItem( SID_CURRENTCELL, aAddress ) );
-                 }
-diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
-index f69ab24..66c07c4 100644
---- sc/source/ui/view/viewdata.cxx
-+++ sc/source/ui/view/viewdata.cxx
-@@ -1891,12 +1891,11 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
-     {
-         //!	public Methode um Position anzupassen
- 
--        BOOL bHOver = FALSE;
--        while (pDoc->IsHorOverlapped( rPosX, rPosY, nTabNo ))
--            { --rPosX; bHOver=TRUE; }
--        BOOL bVOver = FALSE;
--        while (pDoc->IsVerOverlapped( rPosX, rPosY, nTabNo ))
--            { --rPosY; bVOver=TRUE; }
-+        SCCOL nOrigX = rPosX;
-+        SCROW nOrigY = rPosY;
-+        pDoc->SkipOverlapped(rPosX, rPosY, nTabNo);
-+        bool bHOver = (nOrigX != rPosX);
-+        bool bVOver = (nOrigY != rPosY);
- 
-         if ( bRepair && ( bHOver || bVOver ) )
-         {
diff --git a/applied_patches/0577-unittesting-svtools.diff b/applied_patches/0461-unittesting-svtools.diff
similarity index 100%
rename from applied_patches/0577-unittesting-svtools.diff
rename to applied_patches/0461-unittesting-svtools.diff
diff --git a/applied_patches/0578-unittesting-svx.diff b/applied_patches/0462-unittesting-svx.diff
similarity index 100%
rename from applied_patches/0578-unittesting-svx.diff
rename to applied_patches/0462-unittesting-svx.diff
diff --git a/applied_patches/0463-calc-autofilter-shrink-selection.diff b/applied_patches/0463-calc-autofilter-shrink-selection.diff
deleted file mode 100644
index 1f7f14391..000000000
--- a/applied_patches/0463-calc-autofilter-shrink-selection.diff
+++ /dev/null
@@ -1,156 +0,0 @@
-diff --git sc/inc/document.hxx sc/inc/document.hxx
-index fe64a22..862682c 100644
---- sc/inc/document.hxx
-+++ sc/inc/document.hxx
-@@ -880,6 +880,8 @@ public:
- 
-     USHORT			GetErrCode( const ScAddress& ) const;
- 
-+    bool            ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow) const;
-+
-     void			GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
- 									SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld ) const;
-     SC_DLLPUBLIC BOOL			GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
-diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index ea3f282..c69dc5c 100644
---- sc/source/core/data/document.cxx
-+++ sc/source/core/data/document.cxx
-@@ -642,6 +642,32 @@ BOOL ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) cons
-     return FALSE;
- }
- 
-+bool ScDocument::ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow) const
-+{
-+    if (!ValidTab(nTab) || !pTab[nTab])
-+        return false;
-+
-+    SCCOL nCol1, nCol2;
-+    SCROW nRow1, nRow2;
-+    pTab[nTab]->GetFirstDataPos(nCol1, nRow1);
-+    pTab[nTab]->GetLastDataPos(nCol2, nRow2);
-+
-+    if (nCol1 > nCol2 || nRow1 > nRow2)
-+        // invalid range.
-+        return false;
-+
-+    // Make sure the area only shrinks, and doesn't grow.
-+    if (rStartCol < nCol1)
-+        rStartCol = nCol1;
-+    if (nCol2 < rEndCol)
-+        rEndCol = nCol2;
-+    if (rStartRow < nRow1)
-+        rStartRow = nRow1;
-+    if (nRow2 < rEndRow)
-+        rEndRow = nRow2;
-+
-+    return true;  // success!
-+}
- 
- //	zusammenhaengender Bereich
- 
-diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index 4274be7..7907caa 100644
---- sc/source/core/data/table2.cxx
-+++ sc/source/core/data/table2.cxx
-@@ -978,6 +978,9 @@ void ScTable::GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const
- {
-     rCol = 0;
-     rRow = 0;
-+    while (aCol[rCol].IsEmptyData() && rCol < MAXCOL)
-+        ++rCol;
-+    rRow = aCol[rCol].GetFirstDataPos();
- }
- 
- void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const
---- sc/inc/column.hxx
-+++ sc/inc/column.hxx
-@@ -164,7 +164,7 @@
-     SCSIZE	    GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const;
-     BOOL		HasDataAt(SCROW nRow) const;
-     BOOL		HasVisibleDataAt(SCROW nRow) const;
--//UNUSED2009-05 SCROW		GetFirstDataPos() const;
-+    SCROW		GetFirstDataPos() const;
-     SCROW		GetLastDataPos() const;
-     SCROW		GetLastVisDataPos(BOOL bNotes) const;				// ohne Broadcaster
-     SCROW		GetFirstVisDataPos(BOOL bNotes) const;
---- sc/source/core/data/column2.cxx
-+++ sc/source/core/data/column2.cxx
-@@ -1380,13 +1380,13 @@
-     return nLines;
- }
- 
--//UNUSED2009-05 SCROW ScColumn::GetFirstDataPos() const
--//UNUSED2009-05 {
--//UNUSED2009-05     if (nCount)
--//UNUSED2009-05         return pItems[0].nRow;
--//UNUSED2009-05     else
--//UNUSED2009-05         return 0;
--//UNUSED2009-05 }
-+SCROW ScColumn::GetFirstDataPos() const
-+{
-+    if (nCount)
-+        return pItems[0].nRow;
-+    else
-+        return 0;
-+}
- 
- SCROW ScColumn::GetLastDataPos() const
- {
-diff --git sc/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
-index 3f25558..8dfafd9 100644
---- sc/source/ui/inc/dbfunc.hxx
-+++ sc/source/ui/inc/dbfunc.hxx
-@@ -80,7 +80,7 @@ public:
-     void			GotoDBArea( const String& rDBName );
- 
-                     // DB-Bereich vom Cursor
--    ScDBData* 		GetDBData( bool bMarkArea = true, ScGetDBMode eMode = SC_DB_MAKE, bool bExpandRows = false );
-+    ScDBData* 		GetDBData( bool bMarkArea = true, ScGetDBMode eMode = SC_DB_MAKE, bool bExpandRows = false, bool bShrinkToData = false );
- 
-     void			NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList );
- 
-diff --git sc/source/ui/view/dbfunc.cxx sc/source/ui/view/dbfunc.cxx
-index b985912..ce3dede 100644
---- sc/source/ui/view/dbfunc.cxx
-+++ sc/source/ui/view/dbfunc.cxx
-@@ -108,14 +108,30 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
- 
- //	aktuellen Datenbereich fuer Sortieren / Filtern suchen
- 
--ScDBData* ScDBFunc::GetDBData( bool bMark, ScGetDBMode eMode, bool bExpandRows )
-+ScDBData* ScDBFunc::GetDBData( bool bMark, ScGetDBMode eMode, bool bExpandRows, bool bShrinkToData )
- {
- 	ScDocShell* pDocSh = GetViewData()->GetDocShell();
- 	ScDBData* pData = NULL;
- 	ScRange aRange;
- 	ScMarkType eMarkType = GetViewData()->GetSimpleArea(aRange);
- 	if ( eMarkType == SC_MARK_SIMPLE || eMarkType == SC_MARK_SIMPLE_FILTERED )
-+    {
-+        if (bShrinkToData)
-+        {
-+            // Shrink the range to only include data area.
-+            ScDocument* pDoc = pDocSh->GetDocument();
-+            SCCOL nCol1 = aRange.aStart.Col(), nCol2 = aRange.aEnd.Col();
-+            SCROW nRow1 = aRange.aStart.Row(), nRow2 = aRange.aEnd.Row();
-+            if (pDoc->ShrinkToDataArea(aRange.aStart.Tab(), nCol1, nRow1, nCol2, nRow2))
-+            {
-+                aRange.aStart.SetCol(nCol1);
-+                aRange.aEnd.SetCol(nCol2);
-+                aRange.aStart.SetRow(nRow1);
-+                aRange.aEnd.SetRow(nRow2);
-+            }
-+        }
-         pData = pDocSh->GetDBData( aRange, eMode, FALSE );
-+    }
-     else if ( eMode != SC_DB_OLD )
-         pData = pDocSh->GetDBData(
-                     ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(),
-@@ -286,7 +302,7 @@ void ScDBFunc::ToggleAutoFilter()
- 
-     ScQueryParam	aParam;
-     ScDocument*		pDoc	= GetViewData()->GetDocument();
--    ScDBData*		pDBData = GetDBData( FALSE );
-+    ScDBData*		pDBData = GetDBData(false, SC_DB_MAKE, false, true);
- 
-     pDBData->SetByRow( TRUE );				//! Undo, vorher abfragen ??
-     pDBData->GetQueryParam( aParam );
diff --git a/applied_patches/0579-unittesting-sw.diff b/applied_patches/0463-unittesting-sw.diff
similarity index 100%
rename from applied_patches/0579-unittesting-sw.diff
rename to applied_patches/0463-unittesting-sw.diff
diff --git a/applied_patches/0580-unittesting-testshl2.diff b/applied_patches/0464-unittesting-testshl2.diff
similarity index 100%
rename from applied_patches/0580-unittesting-testshl2.diff
rename to applied_patches/0464-unittesting-testshl2.diff
diff --git a/applied_patches/0581-unittesting-testtools.diff b/applied_patches/0465-unittesting-testtools.diff
similarity index 100%
rename from applied_patches/0581-unittesting-testtools.diff
rename to applied_patches/0465-unittesting-testtools.diff
diff --git a/applied_patches/0582-unittesting-toolkit.diff b/applied_patches/0466-unittesting-toolkit.diff
similarity index 100%
rename from applied_patches/0582-unittesting-toolkit.diff
rename to applied_patches/0466-unittesting-toolkit.diff
diff --git a/applied_patches/0583-unittesting-tools.diff b/applied_patches/0467-unittesting-tools.diff
similarity index 100%
rename from applied_patches/0583-unittesting-tools.diff
rename to applied_patches/0467-unittesting-tools.diff
diff --git a/applied_patches/0584-unittesting-ucbhelper.diff b/applied_patches/0468-unittesting-ucbhelper.diff
similarity index 100%
rename from applied_patches/0584-unittesting-ucbhelper.diff
rename to applied_patches/0468-unittesting-ucbhelper.diff
diff --git a/applied_patches/0585-unittesting-ucb.diff b/applied_patches/0469-unittesting-ucb.diff
similarity index 100%
rename from applied_patches/0585-unittesting-ucb.diff
rename to applied_patches/0469-unittesting-ucb.diff
diff --git a/applied_patches/0586-unittesting-udkapi.diff b/applied_patches/0470-unittesting-udkapi.diff
similarity index 100%
rename from applied_patches/0586-unittesting-udkapi.diff
rename to applied_patches/0470-unittesting-udkapi.diff
diff --git a/applied_patches/0587-unittesting-vcl.diff b/applied_patches/0471-unittesting-vcl.diff
similarity index 100%
rename from applied_patches/0587-unittesting-vcl.diff
rename to applied_patches/0471-unittesting-vcl.diff
diff --git a/applied_patches/0588-unittesting-writerfilter.diff b/applied_patches/0472-unittesting-writerfilter.diff
similarity index 100%
rename from applied_patches/0588-unittesting-writerfilter.diff
rename to applied_patches/0472-unittesting-writerfilter.diff
diff --git a/applied_patches/0589-unittesting-xmerge.diff b/applied_patches/0473-unittesting-xmerge.diff
similarity index 100%
rename from applied_patches/0589-unittesting-xmerge.diff
rename to applied_patches/0473-unittesting-xmerge.diff
diff --git a/applied_patches/0590-unittesting-xmlhelp.diff b/applied_patches/0474-unittesting-xmlhelp.diff
similarity index 100%
rename from applied_patches/0590-unittesting-xmlhelp.diff
rename to applied_patches/0474-unittesting-xmlhelp.diff
diff --git a/applied_patches/0591-unittesting-xmloff.diff b/applied_patches/0475-unittesting-xmloff.diff
similarity index 100%
rename from applied_patches/0591-unittesting-xmloff.diff
rename to applied_patches/0475-unittesting-xmloff.diff
diff --git a/applied_patches/0592-unittesting-xmlscript.diff b/applied_patches/0476-unittesting-xmlscript.diff
similarity index 100%
rename from applied_patches/0592-unittesting-xmlscript.diff
rename to applied_patches/0476-unittesting-xmlscript.diff
diff --git a/applied_patches/0593-unittesting-xmlsecurity.diff b/applied_patches/0477-unittesting-xmlsecurity.diff
similarity index 100%
rename from applied_patches/0593-unittesting-xmlsecurity.diff
rename to applied_patches/0477-unittesting-xmlsecurity.diff
diff --git a/applied_patches/0594-novell-win32-odma.diff b/applied_patches/0478-novell-win32-odma.diff
similarity index 100%
rename from applied_patches/0594-novell-win32-odma.diff
rename to applied_patches/0478-novell-win32-odma.diff
diff --git a/applied_patches/0595-svx-sdrobjeditview-update-edit-area.diff b/applied_patches/0479-svx-sdrobjeditview-update-edit-area.diff
similarity index 100%
rename from applied_patches/0595-svx-sdrobjeditview-update-edit-area.diff
rename to applied_patches/0479-svx-sdrobjeditview-update-edit-area.diff
diff --git a/applied_patches/0596-goodies-eps-filter-unix.diff b/applied_patches/0480-goodies-eps-filter-unix.diff
similarity index 100%
rename from applied_patches/0596-goodies-eps-filter-unix.diff
rename to applied_patches/0480-goodies-eps-filter-unix.diff
diff --git a/applied_patches/0597-emf+-cppcanvas-renderer.diff b/applied_patches/0481-emf+-cppcanvas-renderer.diff
similarity index 100%
rename from applied_patches/0597-emf+-cppcanvas-renderer.diff
rename to applied_patches/0481-emf+-cppcanvas-renderer.diff
diff --git a/applied_patches/0598-emf+-cppcanvas-emfplus.diff b/applied_patches/0482-emf+-cppcanvas-emfplus.diff
similarity index 100%
rename from applied_patches/0598-emf+-cppcanvas-emfplus.diff
rename to applied_patches/0482-emf+-cppcanvas-emfplus.diff
diff --git a/applied_patches/0599-emf+-offapi-renderer.diff b/applied_patches/0483-emf+-offapi-renderer.diff
similarity index 100%
rename from applied_patches/0599-emf+-offapi-renderer.diff
rename to applied_patches/0483-emf+-offapi-renderer.diff
diff --git a/applied_patches/0600-emf+-vcl-bitmap.diff b/applied_patches/0484-emf+-vcl-bitmap.diff
similarity index 100%
rename from applied_patches/0600-emf+-vcl-bitmap.diff
rename to applied_patches/0484-emf+-vcl-bitmap.diff
diff --git a/applied_patches/0601-emf+-vcl-renderer.diff b/applied_patches/0485-emf+-vcl-renderer.diff
similarity index 100%
rename from applied_patches/0601-emf+-vcl-renderer.diff
rename to applied_patches/0485-emf+-vcl-renderer.diff
diff --git a/applied_patches/0602-emf+-svtools.diff b/applied_patches/0486-emf+-svtools.diff
similarity index 100%
rename from applied_patches/0602-emf+-svtools.diff
rename to applied_patches/0486-emf+-svtools.diff
diff --git a/applied_patches/0603-emf+-scp2-renderer.diff b/applied_patches/0487-emf+-scp2-renderer.diff
similarity index 100%
rename from applied_patches/0603-emf+-scp2-renderer.diff
rename to applied_patches/0487-emf+-scp2-renderer.diff
diff --git a/applied_patches/0604-emf+-crash-fix.diff b/applied_patches/0488-emf+-crash-fix.diff
similarity index 100%
rename from applied_patches/0604-emf+-crash-fix.diff
rename to applied_patches/0488-emf+-crash-fix.diff
diff --git a/applied_patches/0605-vcl-grey-alpha-unix-sal-bitmap.diff b/applied_patches/0489-vcl-grey-alpha-unix-sal-bitmap.diff
similarity index 100%
rename from applied_patches/0605-vcl-grey-alpha-unix-sal-bitmap.diff
rename to applied_patches/0489-vcl-grey-alpha-unix-sal-bitmap.diff
diff --git a/applied_patches/0606-emf+-multipart-objects.diff b/applied_patches/0490-emf+-multipart-objects.diff
similarity index 100%
rename from applied_patches/0606-emf+-multipart-objects.diff
rename to applied_patches/0490-emf+-multipart-objects.diff
diff --git a/applied_patches/0607-emf+-use-canvas-only-for-emf+.diff b/applied_patches/0491-emf+-use-canvas-only-for-emf+.diff
similarity index 100%
rename from applied_patches/0607-emf+-use-canvas-only-for-emf+.diff
rename to applied_patches/0491-emf+-use-canvas-only-for-emf+.diff
diff --git a/applied_patches/0608-emf+-embedded-mf-image.diff b/applied_patches/0492-emf+-embedded-mf-image.diff
similarity index 100%
rename from applied_patches/0608-emf+-embedded-mf-image.diff
rename to applied_patches/0492-emf+-embedded-mf-image.diff
diff --git a/applied_patches/0609-vcl-pluggable-mtf-renderer.diff b/applied_patches/0493-vcl-pluggable-mtf-renderer.diff
similarity index 100%
rename from applied_patches/0609-vcl-pluggable-mtf-renderer.diff
rename to applied_patches/0493-vcl-pluggable-mtf-renderer.diff
diff --git a/applied_patches/0610-emf+-cppcanvas-input-validation.diff b/applied_patches/0494-emf+-cppcanvas-input-validation.diff
similarity index 100%
rename from applied_patches/0610-emf+-cppcanvas-input-validation.diff
rename to applied_patches/0494-emf+-cppcanvas-input-validation.diff
diff --git a/applied_patches/0611-linkwarn-dlg-in-apps.diff b/applied_patches/0495-linkwarn-dlg-in-apps.diff
similarity index 100%
rename from applied_patches/0611-linkwarn-dlg-in-apps.diff
rename to applied_patches/0495-linkwarn-dlg-in-apps.diff
diff --git a/applied_patches/0612-linkwarn-sfx2-disable-cb-persistency.diff b/applied_patches/0496-linkwarn-sfx2-disable-cb-persistency.diff
similarity index 100%
rename from applied_patches/0612-linkwarn-sfx2-disable-cb-persistency.diff
rename to applied_patches/0496-linkwarn-sfx2-disable-cb-persistency.diff
diff --git a/applied_patches/0613-linkwarn-svtools-miscopts-bits.diff b/applied_patches/0497-linkwarn-svtools-miscopts-bits.diff
similarity index 100%
rename from applied_patches/0613-linkwarn-svtools-miscopts-bits.diff
rename to applied_patches/0497-linkwarn-svtools-miscopts-bits.diff
diff --git a/applied_patches/0614-linkwarn-officecfg-disable-msgbox.diff b/applied_patches/0498-linkwarn-officecfg-disable-msgbox.diff
similarity index 100%
rename from applied_patches/0614-linkwarn-officecfg-disable-msgbox.diff
rename to applied_patches/0498-linkwarn-officecfg-disable-msgbox.diff
diff --git a/applied_patches/0615-linkwarn-svx-warning-dlg.diff b/applied_patches/0499-linkwarn-svx-warning-dlg.diff
similarity index 100%
rename from applied_patches/0615-linkwarn-svx-warning-dlg.diff
rename to applied_patches/0499-linkwarn-svx-warning-dlg.diff
diff --git a/applied_patches/0616-linkwarn-sd-no-dnd-links.diff b/applied_patches/0500-linkwarn-sd-no-dnd-links.diff
similarity index 100%
rename from applied_patches/0616-linkwarn-sd-no-dnd-links.diff
rename to applied_patches/0500-linkwarn-sd-no-dnd-links.diff
diff --git a/applied_patches/0617-fix-ppt-linespacing-import-export.diff b/applied_patches/0501-fix-ppt-linespacing-import-export.diff
similarity index 100%
rename from applied_patches/0617-fix-ppt-linespacing-import-export.diff
rename to applied_patches/0501-fix-ppt-linespacing-import-export.diff
diff --git a/applied_patches/0618-sw-section-import-fix.diff b/applied_patches/0502-sw-section-import-fix.diff
similarity index 100%
rename from applied_patches/0618-sw-section-import-fix.diff
rename to applied_patches/0502-sw-section-import-fix.diff
diff --git a/applied_patches/0619-sw-allow-negative-spacing.diff b/applied_patches/0503-sw-allow-negative-spacing.diff
similarity index 100%
rename from applied_patches/0619-sw-allow-negative-spacing.diff
rename to applied_patches/0503-sw-allow-negative-spacing.diff
diff --git a/applied_patches/0504-field-patch.diff b/applied_patches/0504-field-patch.diff
new file mode 100644
index 000000000..742f1ad5e
--- /dev/null
+++ b/applied_patches/0504-field-patch.diff
@@ -0,0 +1,2696 @@
+diff --git offapi/com/sun/star/text/XFormField.idl offapi/com/sun/star/text/XFormField.idl
+index b8d6023..772d7eb 100644
+--- offapi/com/sun/star/text/XFormField.idl
++++ offapi/com/sun/star/text/XFormField.idl
+@@ -11,14 +11,13 @@
+  */
+  interface XFormField: com::sun::star::uno::XInterface
+  {
+-     short getType();
+-     short getRes();
+-     string getDescription( ); 	
+- 
+-     void setType([in] short fieldType );
+-     void setRes([in] short res );
+-     void setDescription([in] string description );
+- 
++     string getFieldType();
++     void setFieldType([in] string fieldType);     
++
++     short getParamCount();
++     string getParamName([in] short i);
++     string getParamValue([in] short i);
++     void addParam([in] string name, [in] string value, [in] boolean replaceExisting);
+  };
+  
+  }; }; }; }; 
+diff --git svtools/source/config/fltrcfg.cxx svtools/source/config/fltrcfg.cxx
+index 09b7a95..529e72b 100644
+--- svtools/source/config/fltrcfg.cxx
++++ svtools/source/config/fltrcfg.cxx
+@@ -312,7 +312,7 @@ const Sequence<OUString>& SvtFilterOptions::GetPropertyNames()
+             "Export/EnablePowerPointPreview",	//	8
+             "Export/EnableExcelPreview",		//	9
+             "Export/EnableWordPreview",			// 10
+-            "Import/ImportWWFieldsAsEnhancedFields" // 11
++			"Import/ImportWWFieldsAsEnhancedFields" // 11
+         };
+         OUString* pNames = aNames.getArray();
+         for(int i = 0; i < nCount; i++)
+@@ -525,8 +525,7 @@ void SvtFilterOptions::SetWriter2WinWord( BOOL bFlag )
+ 
+ BOOL SvtFilterOptions::IsUseEnhancedFields() const
+ {
+-    return false; // disable for now;
+-//	return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
++    return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
+ }
+ 
+ void SvtFilterOptions::SetUseEnhancedFields( BOOL bFlag )
+diff --git sw/inc/IDocumentMarkAccess.hxx sw/inc/IDocumentMarkAccess.hxx
+index e31eec0..e5a0112 100644
+--- sw/inc/IDocumentMarkAccess.hxx
++++ sw/inc/IDocumentMarkAccess.hxx
+@@ -86,6 +86,13 @@ class IDocumentMarkAccess
+             const ::rtl::OUString& rProposedName,
+             MarkType eMark) =0;
+ 
++        virtual sw::mark::IMark* makeFieldBookmark( const SwPaM& rPaM, 
++            const rtl::OUString& rName, 
++            const rtl::OUString& rType) = 0;
++        virtual sw::mark::IMark* makeNoTextFieldBookmark( const SwPaM& rPaM, 
++            const rtl::OUString& rName, 
++            const rtl::OUString& rType) = 0;
++
+         /** Returns a mark in the document for a paragraph.
+             If there is none, a mark will be created.
+ 
+diff --git sw/inc/IMark.hxx sw/inc/IMark.hxx
+index 8507b1d..5143843 100644
+--- sw/inc/IMark.hxx
++++ sw/inc/IMark.hxx
+@@ -51,12 +51,12 @@ namespace sw { namespace mark
+     {
+         public:
+             //getters
+-            virtual const SwPosition& GetMarkPos() const =0;
++            virtual SwPosition& GetMarkPos() const =0;
+             // GetOtherMarkPos() is only guaranteed to return a valid
+             // reference if IsExpanded() returned true
+-            virtual const SwPosition& GetOtherMarkPos() const =0;
+-            virtual const SwPosition& GetMarkStart() const =0;
+-            virtual const SwPosition& GetMarkEnd() const =0;
++            virtual SwPosition& GetOtherMarkPos() const =0;
++            virtual SwPosition& GetMarkStart() const =0;
++            virtual SwPosition& GetMarkEnd() const =0;
+             virtual const ::rtl::OUString& GetName() const =0;
+             virtual bool IsExpanded() const =0;
+             virtual bool IsCoveringPosition(const SwPosition& rPos) const =0;
+@@ -79,6 +79,9 @@ namespace sw { namespace mark
+                 { return GetMarkEnd() < rPos; }
+             bool EndsAfter(const SwPosition& rPos) const
+                 { return GetMarkEnd() > rPos; }
++
++            // Use for debugging purpose
++            virtual rtl::OUString toString( ) const = 0;
+     };
+ 
+     class IBookmark
+@@ -95,13 +98,25 @@ namespace sw { namespace mark
+         : virtual public IMark
+     {
+         public:
++            typedef  std::pair< ::rtl::OUString, ::rtl::OUString > ParamPair_t;
++
+             //getters
+             virtual ::rtl::OUString GetFieldname() const =0;
+             virtual ::rtl::OUString GetFieldHelptext() const =0;
+ 
++            virtual void addParam( rtl::OUString rParamName, 
++                    rtl::OUString rParamValue,
++                    bool bReplaceExisting = true ) = 0;
++            virtual void addParam( const char* paramName, int value ) = 0;
++            virtual void addParams( std::vector<ParamPair_t>& params ) = 0;
++            virtual int  getNumOfParams() const = 0;
++            virtual ParamPair_t getParam( int pos ) const = 0;
++            virtual ParamPair_t getParam( const char *name, const char *defaultValue = NULL ) const = 0;
++
+             //setters
+             virtual void SetFieldname(const ::rtl::OUString& rFieldname) =0;
+             virtual void SetFieldHelptext(const ::rtl::OUString& rFieldHelptext) =0;
++            virtual void invalidate( ) = 0;
+     };
+ 
+     class ICheckboxFieldmark
+diff --git sw/inc/bookmrk.hxx sw/inc/bookmrk.hxx
+index 991b401..fc082e5 100644
+--- sw/inc/bookmrk.hxx
++++ sw/inc/bookmrk.hxx
+@@ -62,7 +62,7 @@ protected:
+     String		aName;
+     String		aShortName;
+     KeyCode		aCode;
+-    IDocumentBookmarkAccess::BookmarkType eMarkType;
++    IDocumentMarkAccess::BookmarkType eMarkType;
+ 
+     SwBookmark( const SwPosition& aPos,
+                 const KeyCode& rCode,
+@@ -170,7 +170,7 @@ public:
+     SwFieldBookmark(const SwPosition& aPos,
+            const KeyCode& rCode,
+            const String& rName, const String& rShortName,
+-           IDocumentBookmarkAccess::BookmarkType eMark);
++           IDocumentMarkAccess::BookmarkType eMark);
+ 
+     void SetFieldType(int fftype);
+     int GetFieldType();
+diff --git sw/inc/crsrsh.hxx sw/inc/crsrsh.hxx
+index 692184b..186f94f 100644
+--- sw/inc/crsrsh.hxx
++++ sw/inc/crsrsh.hxx
+@@ -45,6 +45,7 @@
+ #include <node.hxx>
+ #include <tblsel.hxx>
+ #include <IDocumentMarkAccess.hxx>
++#include <IMark.hxx>
+ 
+ 
+ // einige Forward Deklarationen
+@@ -110,7 +111,8 @@ struct SwContentAtPos
+         SW_REFMARK          = 0x0100,
+         SW_NUMLABEL         = 0x0200, // #i23726#
+         SW_CONTENT_CHECK    = 0x0400, // --> FME 2005-05-13 #i43742# <--
+-        SW_SMARTTAG         = 0x0800
++        SW_SMARTTAG         = 0x0800,
++	SW_FORMCTRL         = 0x1000
+ #ifndef PRODUCT
+         ,SW_CURR_ATTRS 		= 0x4000		// nur zum Debuggen
+         ,SW_TABLEBOXVALUE	= 0x8000		// nur zum Debuggen
+@@ -122,6 +124,7 @@ struct SwContentAtPos
+         const SfxPoolItem* pAttr;
+         const SwRedline* pRedl;
+         SwCntntNode * pNode; // #i23726#
++	    const sw::mark::IFieldmark* pFldmark;
+     } aFnd;
+ 
+     int nDist; // #i23726#
+diff --git sw/inc/ecmaflds.hxx sw/inc/ecmaflds.hxx
+new file mode 100644
+index 0000000..23276b1
+--- /dev/null
++++ sw/inc/ecmaflds.hxx
+@@ -0,0 +1,68 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: $
++ * $Revision: $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++/* and also:
++ * Author: Florian Reuter <freuter@novell.com>
++ * Copyright 2008 by Novell, Inc.
++*/
++#ifndef _ECMAFLDS_HXX
++#define _ECMAFLDS_HXX
++
++
++#define ECMA_FORMTEXT "ecma.office-open-xml.field.FORMTEXT"
++#define ECMA_FORMTEXT_NAME "name"
++#define ECMA_FORMTEXT_HELPTEXT "helpText"
++#define ECMA_FORMTEXT_STATUSTEXT "statusText"
++#define ECMA_FORMTEXT_DEFAULT "default"
++#define ECMA_FORMTEXT_FORMAT "format"
++#define ECMA_FORMTEXT_MAXLENGTH "maxLength"
++#define ECMA_FORMTEXT_TYPE "type"
++
++#define ECMA_FORMCHECKBOX "ecma.office-open-xml.field.FORMCHECKBOX"
++#define ECMA_FORMCHECKBOX_NAME "name"
++#define ECMA_FORMCHECKBOX_HELPTEXT "helpText"
++#define ECMA_FORMCHECKBOX_STATUSTEXT "statusText"
++#define ECMA_FORMCHECKBOX_CHECKED "checked"
++#define ECMA_FORMCHECKBOX_DEFAULT "default"
++#define ECMA_FORMCHECKBOX_SIZE "size"
++#define ECMA_FORMCHECKBOX_SIZEAUTO "sizeAuto"
++
++
++#define ECMA_FORMDROPDOWN "ecma.office-open-xml.field.FORMDROPDOWN"
++#define ECMA_FORMDROPDOWN_DEFAULT "default"
++#define ECMA_FORMDROPDOWN_LISTENTRY "listEntry"
++#define ECMA_FORMDROPDOWN_RESULT "result"
++
++#define ECMA_TOC "ecma.office-open-xml.field.TOC"
++
++#define ECMA_HYPERLINK "ecma.office-open-xml.field.HYPERLINK"
++
++#define ECMA_PAGEREF "ecma.office-open-xml.field.PAGEREF"
++
++#endif /*  _ECMAFLDS_HXX */
+diff --git sw/inc/editsh.hxx sw/inc/editsh.hxx
+index 8109e6f..be3dbe7 100644
+--- sw/inc/editsh.hxx
++++ sw/inc/editsh.hxx
+@@ -44,6 +44,7 @@
+ #include <com/sun/star/linguistic2/ProofreadingResult.hpp>
+ #include <fldupde.hxx>
+ #include <tblenum.hxx>
++#include <IMark.hxx>
+ 
+ #include <vector>
+ #include <swundo.hxx>
+@@ -415,6 +416,9 @@ public:
+     const SwTOXType* 	GetTOXType(TOXTypes eTyp, USHORT nId) const;
+     void			 	InsertTOXType(const SwTOXType& rTyp);
+ 
++    // new field stuff
++    BOOL	            UpdateField(sw::mark::IFieldmark &fieldBM);
++
+     //AutoMark file
+     const String&	GetTOIAutoMarkURL() const;
+     void			SetTOIAutoMarkURL(const String& rSet);
+diff --git sw/inc/hintids.hxx sw/inc/hintids.hxx
+index 1ab379d..180f3ee 100644
+--- sw/inc/hintids.hxx
++++ sw/inc/hintids.hxx
+@@ -44,12 +44,8 @@
+ #define CH_TXT_ATR_FIELDEND ((sal_Unicode)0x05)
+ #define CH_TXT_ATR_SUBST_FIELDSTART ("[")
+ #define CH_TXT_ATR_SUBST_FIELDEND ("]")
+-//#define CH_TXT_ATR_FORMELEMENT ((sal_Unicode)'#')
+ #define CH_TXT_ATR_FORMELEMENT ((sal_Unicode)0x06)
+-/*
+-#define FIELD_BOOKMARK_PREFIX "__"
+-#define FIELD_FORM_BOOKMARK_PREFIX "__FORM"
+-*/
++
+ /*
+  * Hier kommen erst mal die enums fuer die Hints
+  */
+diff --git sw/inc/pam.hxx sw/inc/pam.hxx
+index 1a1cb98..3042786 100644
+--- sw/inc/pam.hxx
++++ sw/inc/pam.hxx
+@@ -272,6 +272,7 @@ public:
+     DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
+ 
+     String GetTxt() const;
++    void Invalidate();
+ };
+ 
+ 
+diff --git sw/inc/unoobj.hxx sw/inc/unoobj.hxx
+index 43dbfff..e74aa50 100644
+--- sw/inc/unoobj.hxx
++++ sw/inc/unoobj.hxx
+@@ -650,6 +650,7 @@ class SwXFieldmark : public SwXFieldmark_BASE
+         SwXFieldmark(bool isReplacementObject, ::sw::mark::IMark* pBkm = 0, SwDoc* pDoc = 0);
+ 
+         virtual void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
++#if 0
+         virtual ::rtl::OUString SAL_CALL getDescription(void) throw( ::com::sun::star::uno::RuntimeException );
+         virtual ::sal_Int16 SAL_CALL getType(  ) throw (::com::sun::star::uno::RuntimeException);
+         virtual ::sal_Int16 SAL_CALL getRes(  ) throw (::com::sun::star::uno::RuntimeException);
+@@ -657,6 +658,14 @@ class SwXFieldmark : public SwXFieldmark_BASE
+         virtual void SAL_CALL setType( ::sal_Int16 fieldType ) throw (::com::sun::star::uno::RuntimeException);
+         virtual void SAL_CALL setRes( ::sal_Int16 res ) throw (::com::sun::star::uno::RuntimeException);
+         virtual void SAL_CALL setDescription( const ::rtl::OUString& description ) throw (::com::sun::star::uno::RuntimeException);
++#endif
++        virtual ::rtl::OUString SAL_CALL getFieldType(void)  throw( ::com::sun::star::uno::RuntimeException );
++        virtual void SAL_CALL setFieldType( const ::rtl::OUString& description ) throw (::com::sun::star::uno::RuntimeException);
++
++        virtual ::sal_Int16 SAL_CALL getParamCount(  ) throw (::com::sun::star::uno::RuntimeException);
++        virtual ::rtl::OUString SAL_CALL getParamName(::sal_Int16 i)  throw( ::com::sun::star::uno::RuntimeException );
++        virtual ::rtl::OUString SAL_CALL getParamValue(::sal_Int16 i)  throw( ::com::sun::star::uno::RuntimeException );
++        virtual void SAL_CALL addParam( const ::rtl::OUString& name, const ::rtl::OUString& value, ::sal_Bool replaceExisting ) throw (::com::sun::star::uno::RuntimeException);
+ };
+ 
+ /*-----------------23.02.98 10:45-------------------
+diff --git sw/source/core/crsr/bookmrk.cxx sw/source/core/crsr/bookmrk.cxx
+index 5e9c7aa..5658e41 100644
+--- sw/source/core/crsr/bookmrk.cxx
++++ sw/source/core/crsr/bookmrk.cxx
+@@ -75,19 +75,23 @@ namespace
+         const sal_Unicode aStartMark,
+         const sal_Unicode aEndMark)
+     {
+-        const SwPosition& rStart = pField->GetMarkStart();
+-        const SwPosition& rEnd = pField->GetMarkEnd();
++        SwPosition& rStart = pField->GetMarkStart();
++        SwPosition& rEnd = pField->GetMarkEnd();
+         SwTxtNode const * const pStartTxtNode = io_pDoc->GetNodes()[rStart.nNode]->GetTxtNode();
+         SwTxtNode const * const pEndTxtNode = io_pDoc->GetNodes()[rEnd.nNode]->GetTxtNode();
+         const sal_Unicode ch_start=pStartTxtNode->GetTxt().GetChar(rStart.nContent.GetIndex());
+         const sal_Unicode ch_end=pEndTxtNode->GetTxt().GetChar(rEnd.nContent.GetIndex()-1);
+-        const SwPaM aStartPaM(rStart);
+-        const SwPaM aEndPaM(rEnd);
++        SwPaM aStartPaM(rStart);
++        SwPaM aEndPaM(rEnd);
+         io_pDoc->StartUndo(UNDO_UI_REPLACE, NULL);
+         if(ch_start != aStartMark)
++        {
+             io_pDoc->Insert(aStartPaM, aStartMark);
+-        if(aEndMark && ch_end != aEndMark)
++        }
++        if(aEndMark && ( ch_end != aEndMark ) && ( rStart != rEnd ) )
++        {
+             io_pDoc->Insert(aEndPaM, aEndMark);
++        }
+         io_pDoc->EndUndo(UNDO_UI_REPLACE, NULL);
+     };
+ }
+@@ -108,6 +112,11 @@ namespace sw { namespace mark
+         }
+     }
+ 
++    bool MarkBase::IsCoveringPosition(const SwPosition& rPos) const
++    {
++        return GetMarkStart() <= rPos && rPos <= GetMarkEnd(); 
++    }
++
+     void MarkBase::SetMarkPos(const SwPosition& rNewPos)
+     {
+         ::boost::scoped_ptr<SwPosition>(new SwPosition(rNewPos)).swap(m_pPos1);
+@@ -120,6 +129,17 @@ namespace sw { namespace mark
+         //lcl_FixPosition(*m_pPos2);
+     }
+ 
++    rtl::OUString MarkBase::toString( ) const
++    {
++        rtl::OUStringBuffer buf;
++        buf.appendAscii( "Mark: ( Name, [ Node1, Index1 ] ): ( " );
++        buf.append( m_aName ).appendAscii( ", [ " );
++        buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " );
++        buf.append( sal_Int32( GetMarkPos().nContent.GetIndex( ) ) ).appendAscii( " ] )" );
++
++        return buf.makeStringAndClear( );
++    }
++
+     MarkBase::~MarkBase()
+     { }
+ 
+@@ -212,6 +232,96 @@ namespace sw { namespace mark
+         if(!IsExpanded())
+             SetOtherMarkPos(GetMarkPos());
+     }
++    
++    rtl::OUString Fieldmark::toString( ) const 
++    {
++        rtl::OUStringBuffer buf;
++        buf.appendAscii( "Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( " );
++        buf.append( m_aName ).appendAscii( ", " );
++        buf.append( m_aFieldname ).appendAscii( ", [ " );
++        buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " );
++        buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) ).appendAscii( " ], [" );
++        buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " );
++        buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) ).appendAscii( " ] ) " );
++
++        return buf.makeStringAndClear( );
++    }
++
++    void Fieldmark::addParam( ::rtl::OUString paramName,
++                              ::rtl::OUString paramValue,
++                              bool replaceExisting )
++    {
++        if ( replaceExisting )
++        {
++            bool replaced = false;
++            const int len = m_params.size(  );
++            for ( int i = 0; i < len; i++ )
++            {
++                if ( m_params[i].first.compareTo( paramName ) == 0 )
++                {
++                    m_params[i] = ParamPair_t( paramName, paramValue );
++                    replaced = true;
++                }
++            }
++            if ( !replaced )
++            {
++                m_params.push_back( ParamPair_t( paramName, paramValue ) );
++            }
++        }
++        else
++        {
++            m_params.push_back( ParamPair_t( paramName, paramValue ) );
++        }
++    }
++
++    void Fieldmark::addParam( const char *paramName, int value )
++    {
++        rtl::OUString sName = rtl::OUString::createFromAscii( paramName );
++        rtl::OUString sValue =::rtl::OUString::valueOf( ( sal_Int32 ) value );
++        addParam( sName, sValue );
++    }
++
++    void Fieldmark::addParams( std::vector < ParamPair_t > &params )
++    {
++        for ( std::vector < ParamPair_t >::iterator i = params.begin(  );
++              i != params.end(  ); i++ )
++        {
++            m_params.push_back( *i );
++        }
++    }
++
++    int Fieldmark::getNumOfParams(  ) const
++    {
++        return m_params.size(  );
++    }
++
++    Fieldmark::ParamPair_t Fieldmark::getParam( int pos ) const
++    {
++        return m_params[pos];
++    }
++
++    Fieldmark::ParamPair_t Fieldmark::getParam( const char *name,
++                                                const char *defaultValue ) const
++    {
++        for ( std::vector < ParamPair_t >::iterator i = const_cast< Fieldmark* >( this )->m_params.begin(  );
++              i != m_params.end(  ); i++ )
++        {
++            if ( i->first.compareToAscii( name ) == 0 )
++            {
++                return *i;
++            }
++        }
++        return ParamPair_t( rtl::OUString(  ),
++                            ( defaultValue ? 
++                                rtl::OUString::createFromAscii( defaultValue ) :
++                                rtl::OUString(  ) ) );
++    }
++
++    void Fieldmark::invalidate( )
++    {
++        SwPaM aPaM( this->GetMarkPos(), this->GetOtherMarkPos() );
++        aPaM.Invalidate();
++    }
+ 
+     const ::rtl::OUString Fieldmark::our_sNamePrefix = ::rtl::OUString::createFromAscii("__Fieldmark__");
+ 
+@@ -230,7 +340,11 @@ namespace sw { namespace mark
+ 
+     void CheckboxFieldmark::InitDoc(SwDoc* const io_pDoc)
+     {
+-        lcl_AssureFieldMarksSet(this, io_pDoc, CH_TXT_ATR_FIELDSTART, CH_TXT_ATR_FIELDEND);
++        lcl_AssureFieldMarksSet(this, io_pDoc, CH_TXT_ATR_FORMELEMENT, CH_TXT_ATR_FIELDEND);
++
++        // For some reason the end mark is moved from 1 by the Insert: we don't 
++        // want this for checkboxes
++        this->GetMarkEnd( ).nContent--;
+     }
+ 
+     void CheckboxFieldmark::SetChecked(bool checked)
+diff --git sw/source/core/crsr/crossrefbookmark.cxx sw/source/core/crsr/crossrefbookmark.cxx
+index 8ae112a..0a8929d 100644
+--- sw/source/core/crsr/crossrefbookmark.cxx
++++ sw/source/core/crsr/crossrefbookmark.cxx
+@@ -67,7 +67,7 @@ namespace sw { namespace mark
+         MarkBase::SetMarkPos(rNewPos);
+     }
+ 
+-    const SwPosition& CrossRefBookmark::GetOtherMarkPos() const
++    SwPosition& CrossRefBookmark::GetOtherMarkPos() const
+     {
+         OSL_PRECOND(false,
+             "<SwCrossRefBookmark::GetOtherMarkPos(..)>"
+diff --git sw/source/core/crsr/crstrvl.cxx sw/source/core/crsr/crstrvl.cxx
+index 0504672..9ff996a 100644
+--- sw/source/core/crsr/crstrvl.cxx
++++ sw/source/core/crsr/crstrvl.cxx
+@@ -1175,6 +1175,17 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
+                     }
+                 }
+ 
++		if( !bRet && SwContentAtPos::SW_FORMCTRL & rCntntAtPos.eCntntAtPos )
++		{
++            IDocumentMarkAccess* pMarksAccess = GetDoc()->getIDocumentMarkAccess( );
++            sw::mark::IFieldmark* pFldBookmark = pMarksAccess->getFieldmarkFor( aPos );
++		    if( bCrsrFoundExact && pTxtNd && pFldBookmark) {
++			    rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FORMCTRL;
++    			rCntntAtPos.aFnd.pFldmark = pFldBookmark;
++	    		bRet=TRUE;
++		    }
++		}
++
+                 if( !bRet && SwContentAtPos::SW_FTN & rCntntAtPos.eCntntAtPos )
+                 {
+                     if( aTmpState.bFtnNoInfo )
+diff --git sw/source/core/crsr/pam.cxx sw/source/core/crsr/pam.cxx
+index 7a8a83e..c5a7344 100644
+--- sw/source/core/crsr/pam.cxx
++++ sw/source/core/crsr/pam.cxx
+@@ -56,6 +56,7 @@
+ #include <ndtxt.hxx> // #111827#
+ 
+ #include <IMark.hxx>
++#include <hints.hxx>
+ 
+ // fuer den dummen ?MSC-? Compiler
+ inline xub_StrLen GetSttOrEnd( BOOL bCondition, const SwCntntNode& rNd )
+@@ -817,16 +818,21 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
+     }
+     //FIXME FieldBk
+     // TODO: Form Protection when Enhanced Fields are enabled
+-//	if( !bRet )
+-//    {
+-//	    const SwDoc *pDoc=GetDoc();
+-//	    SwBookmark *pA = ( pDoc && pPoint ? pDoc->getFieldmarkFor( *pPoint ) : NULL );
+-//	    SwBookmark *pB = ( pDoc && pMark ? pDoc->getFieldmarkFor( *pMark ) : pA );
+-//	    bRet = ( pA != pB );
+-//	    bool bProtectForm = pDoc->get( IDocumentSettingAccess::PROTECT_FORM );
+-//	    if( bProtectForm )
+-//            bRet |= ( pA==NULL || pB==NULL );
+-//	}
++ 	if (!bRet) {
++ 	    const SwDoc *pDoc = GetDoc();
++        sw::mark::IMark* pA = NULL;
++        sw::mark::IMark* pB = NULL;
++        if ( pDoc )
++        {
++            const IDocumentMarkAccess* pMarksAccess = pDoc->getIDocumentMarkAccess( );
++ 	        pA = GetPoint() ? pMarksAccess->getFieldmarkFor( *GetPoint( ) ) : NULL;
++ 	        pB = GetMark( ) ? pMarksAccess->getFieldmarkFor( *GetMark( ) ) : pA;
++     	    bRet = ( pA != pB );
++        }
++ 	    bool bProtectForm = pDoc->get( IDocumentSettingAccess::PROTECT_FORM );
++ 	    if ( bProtectForm )
++     		bRet |= ( pA == NULL || pB == NULL );
++ 	}
+     return bRet;
+ }
+ 
+@@ -1213,6 +1219,18 @@ BOOL SwPaM::Overlap(const SwPaM & a, const SwPaM & b)
+     return !(*b.End() <= *a.Start() || *a.End() <= *b.End());
+ }
+ 
++void SwPaM::Invalidate()
++{
++    const SwNode *_pNd=this->GetNode();
++    const SwTxtNode *_pTxtNd=(_pNd!=NULL?_pNd->GetTxtNode():NULL);
++    if (_pTxtNd!=NULL) {
++	//pretent we've added a char to force layout to recalc the portion...
++	SwInsChr aHint(_pTxtNd->GetIndex());
++	SwModify *_pModify=(SwModify*)_pTxtNd;
++	_pModify->Modify( 0, &aHint);
++    }
++}
++
+ BOOL SwPaM::LessThan(const SwPaM & a, const SwPaM & b)
+ {
+     return (*a.Start() < *b.Start()) || (*a.Start() == *b.Start() && *a.End() < *b.End()); 
+diff --git sw/source/core/doc/docbm.cxx sw/source/core/doc/docbm.cxx
+index 836cbf0..752b58c 100644
+--- sw/source/core/doc/docbm.cxx
++++ sw/source/core/doc/docbm.cxx
+@@ -41,6 +41,7 @@
+ #include <dcontact.hxx>
+ #include <doc.hxx>
+ #include <docary.hxx>
++#include <ecmaflds.hxx>
+ #include <editsh.hxx>
+ #include <errhdl.hxx>
+ #include <fmtanchr.hxx>
+@@ -66,6 +67,23 @@
+ #include <viscrs.hxx>
+ #include <stdio.h>
+ 
++static void lcl_docbm_FixPosition( SwPosition& rPos )
++{
++    // make sure the position has 1) the proper node, and 2) a proper index
++    SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
++
++    if( rPos.nContent.GetIndex() > ( pTxtNode == NULL ? 0 : pTxtNode->Len() ) )
++    {
++        DBG_ERROR( "illegal position" );
++        xub_StrLen nLen = rPos.nContent.GetIndex();
++        if( pTxtNode == NULL )
++            nLen = 0;
++        else if( nLen >= pTxtNode->Len() )
++            nLen = pTxtNode->Len();
++        rPos.nContent.Assign( pTxtNode, nLen );
++    }
++}
++
+ 
+ using namespace ::std;
+ using namespace ::boost;
+@@ -309,6 +327,17 @@ namespace sw { namespace mark
+         : m_pDoc(&rDoc)
+     { }
+ 
++    void MarkManager::dumpFieldmarks( ) const
++    {
++        const_iterator_t pIt = m_vFieldmarks.begin( );
++        for ( ; pIt != m_vFieldmarks.end( ); pIt++ )
++        {
++            rtl::OUString str = ( *pIt )->toString( );
++            fprintf( stderr, "%s\n", 
++                  rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr( ) );
++        }
++    }
++
+     ::sw::mark::IMark* MarkManager::makeMark(const SwPaM& rPaM,
+         const ::rtl::OUString& rName,
+         const IDocumentMarkAccess::MarkType eType)
+@@ -414,6 +443,30 @@ namespace sw { namespace mark
+         return pMark.get();
+     }
+ 
++    ::sw::mark::IMark* MarkManager::makeFieldBookmark( const SwPaM& rPaM,
++        const rtl::OUString& rName,
++        const rtl::OUString& rType )
++    {
++        sw::mark::IMark* pMark = makeMark( rPaM, rName, 
++                IDocumentMarkAccess::TEXT_FIELDMARK );
++        sw::mark::IFieldmark* pFieldMark = dynamic_cast<sw::mark::IFieldmark*>( pMark );
++        pFieldMark->SetFieldname( rType );
++
++        return pMark;
++    }
++            
++    ::sw::mark::IMark* MarkManager::makeNoTextFieldBookmark( const SwPaM& rPaM, 
++        const rtl::OUString& rName, 
++        const rtl::OUString& rType)
++    {
++        sw::mark::IMark* pMark = makeMark( rPaM, rName, 
++                IDocumentMarkAccess::CHECKBOX_FIELDMARK );
++        sw::mark::IFieldmark* pFieldMark = dynamic_cast<sw::mark::IFieldmark*>( pMark );
++        pFieldMark->SetFieldname( rType );
++
++        return pMark;
++    }
++
+     ::sw::mark::IMark* MarkManager::getMarkForTxtNode(const SwTxtNode& rTxtNode,
+         const IDocumentMarkAccess::MarkType eType)
+     {
+@@ -767,12 +820,7 @@ namespace sw { namespace mark
+     {
+         const_iterator_t pFieldmark = find_if(
+             m_vFieldmarks.begin(),
+-            // we do not need to check marks starting behind the positon
+-            lower_bound(
+-                m_vFieldmarks.begin(),
+-                m_vFieldmarks.end(),
+-                rPos,
+-                bind(&IMark::StartsAfter, _1, _2)),
++            m_vFieldmarks.end( ),
+             bind(&IMark::IsCoveringPosition, _1, rPos));
+         if(pFieldmark == m_vFieldmarks.end()) return NULL;
+         return dynamic_cast<IFieldmark*>(pFieldmark->get());
+diff --git sw/source/core/edit/edtox.cxx sw/source/core/edit/edtox.cxx
+index 0b72c6f..76e9e32 100644
+--- sw/source/core/edit/edtox.cxx
++++ sw/source/core/edit/edtox.cxx
+@@ -60,6 +60,9 @@
+ #ifndef _STATSTR_HRC
+ #include <statstr.hrc>
+ #endif
++#include <bookmrk.hxx>
++#include <ecmaflds.hxx>
++ 
+ 
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::i18n;
+@@ -232,6 +235,25 @@ BOOL SwEditShell::UpdateTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
+     return bRet;
+ }
+ 
++BOOL SwEditShell::UpdateField( sw::mark::IFieldmark &fieldBM) 
++{
++//    SwDocShell* pDocSh = pDoc->GetDocShell();
++    //@TODO implement me...; add undo etc...
++    if ( pDoc && fieldBM.IsExpanded( ) ) {
++        SwPosition aSttPos = fieldBM.GetMarkStart( );
++        aSttPos.nContent++;
++
++        SwPosition aEndPos = fieldBM.GetMarkEnd( );
++        aEndPos.nContent--;
++
++    	SwPaM aPaM( aSttPos, aEndPos );
++	    pDoc->Delete(aPaM);
++        pDoc->Insert(aPaM, String::CreateFromAscii("Implement me ;-)"), false);
++    }
++    return TRUE;
++}
++
++
+ /*--------------------------------------------------------------------
+      Beschreibung: Aktuelles Verzeichnis vor oder in dem der Cursor
+                                    steht
+diff --git sw/source/core/inc/MarkManager.hxx sw/source/core/inc/MarkManager.hxx
+index 605b15d..fd20406 100644
+--- sw/source/core/inc/MarkManager.hxx
++++ sw/source/core/inc/MarkManager.hxx
+@@ -43,8 +43,18 @@ namespace sw { namespace mark
+         public:
+             MarkManager(/*[in/out]*/ SwDoc& rDoc);
+ 
++            void dumpFieldmarks( ) const;
++
+             // IDocumentMarkAccess
+             virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const ::rtl::OUString& rName, IDocumentMarkAccess::MarkType eMark);
++        
++            virtual sw::mark::IMark* makeFieldBookmark( const SwPaM& rPaM, 
++                const rtl::OUString& rName, 
++                const rtl::OUString& rType);
++            virtual sw::mark::IMark* makeNoTextFieldBookmark( const SwPaM& rPaM, 
++                const rtl::OUString& rName, 
++                const rtl::OUString& rType);
++
+             virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark);
+ 
+             virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM);
+diff --git sw/source/core/inc/bookmrk.hxx sw/source/core/inc/bookmrk.hxx
+index ef1cc12..bd62abe 100644
+--- sw/source/core/inc/bookmrk.hxx
++++ sw/source/core/inc/bookmrk.hxx
+@@ -46,26 +46,31 @@ namespace sw { namespace mark
+     {
+         public:
+             //getters
+-            virtual const SwPosition& GetMarkPos() const
++            virtual SwPosition& GetMarkPos() const
+                 { return *m_pPos1; }
+             virtual const ::rtl::OUString& GetName() const
+                 { return m_aName; }
+-            virtual bool IsCoveringPosition(const SwPosition& rPos) const
+-                { return GetMarkStart() <= rPos && rPos <= GetMarkEnd(); };
+-            virtual const SwPosition& GetOtherMarkPos() const
++            virtual bool IsCoveringPosition(const SwPosition& rPos) const;
++            virtual SwPosition& GetOtherMarkPos() const
+             {
+                 OSL_PRECOND(IsExpanded(), "<SwPosition::GetOtherMarkPos(..)> - I have no other Pos set." );
+                 return *m_pPos2;
+             }
+-            virtual const SwPosition& GetMarkStart() const
++            virtual SwPosition& GetMarkStart() const
+             {
+-                if(!m_pPos2 /* !IsExpanded()*/) return *m_pPos1;
+-                return *m_pPos1 < *m_pPos2 ? *m_pPos1 : *m_pPos2;
++                if( !IsExpanded() ) return GetMarkPos( );
++                if ( GetMarkPos( ) < GetOtherMarkPos( ) )
++                    return GetMarkPos();
++                else
++                    return GetOtherMarkPos( );
+             }
+-            virtual const SwPosition& GetMarkEnd() const
++            virtual SwPosition& GetMarkEnd() const
+             {
+-                if(!m_pPos2 /* !IsExpanded()*/ ) return *m_pPos1;
+-                return *m_pPos1 > *m_pPos2 ? *m_pPos1 : *m_pPos2;
++                if( !IsExpanded() ) return GetMarkPos();
++                if ( GetMarkPos( ) > GetOtherMarkPos( ) )
++                    return GetMarkPos( );
++                else
++                    return GetOtherMarkPos( );
+             }
+             virtual bool IsExpanded() const
+                 { return m_pPos2; }
+@@ -78,6 +83,8 @@ namespace sw { namespace mark
+             virtual void ClearOtherMarkPos()
+                 { m_pPos2.reset(); }
+ 
++            virtual rtl::OUString toString( ) const;
++
+             virtual void Swap()
+             {
+                 if(m_pPos2)
+@@ -171,18 +178,30 @@ namespace sw { namespace mark
+     {
+         public:
+             Fieldmark(const SwPaM& rPaM);
+-
++            
+             // getters
+             ::rtl::OUString GetFieldname() const
+                 { return m_aFieldname; }
+             ::rtl::OUString GetFieldHelptext() const
+                 { return m_aFieldHelptext; }
++            
++            void addParam( rtl::OUString rParamName, 
++                           rtl::OUString rParamValue,
++                           bool bReplaceExisting = true );
++            void addParam( const char* paramName, int value );
++            void addParams(std::vector<ParamPair_t>& params);
++            int  getNumOfParams() const;
++            ParamPair_t getParam(int pos) const;
++            ParamPair_t getParam(const char *name, const char *defaultValue) const;
+ 
+             // setters
+             void SetFieldname(const ::rtl::OUString& aFieldname)
+                 { m_aFieldname = aFieldname; }
+             void SetFieldHelptext(const ::rtl::OUString& aFieldHelptext)
+                 { m_aFieldHelptext = aFieldHelptext; }
++            void invalidate( );
++            
++            virtual rtl::OUString toString( ) const;
+         private:
+             //int fftype; // Type: 0 = Text, 1 = Check Box, 2 = List
+             //bool ffprot;
+@@ -190,7 +209,7 @@ namespace sw { namespace mark
+             ::rtl::OUString m_aFieldname;
+             ::rtl::OUString m_aFieldHelptext;
+             static const ::rtl::OUString our_sNamePrefix;
+-
++            std::vector<ParamPair_t> m_params;
+     };
+ 
+     class TextFieldmark
+diff --git sw/source/core/inc/crossrefbookmark.hxx sw/source/core/inc/crossrefbookmark.hxx
+index d175b21..e560a29 100644
+--- sw/source/core/inc/crossrefbookmark.hxx
++++ sw/source/core/inc/crossrefbookmark.hxx
+@@ -48,10 +48,10 @@ namespace sw { namespace mark
+                 const ::rtl::OUString& rPrefix);
+ 
+             // getters
+-            virtual const SwPosition& GetOtherMarkPos() const;
+-            virtual const SwPosition& GetMarkStart() const
++            virtual SwPosition& GetOtherMarkPos() const;
++            virtual SwPosition& GetMarkStart() const
+                 { return *m_pPos1; }
+-            virtual const SwPosition& GetMarkEnd() const
++            virtual SwPosition& GetMarkEnd() const
+                 { return *m_pPos1; }
+             virtual bool IsExpanded() const
+                 { return false; }
+diff --git sw/source/core/text/inftxt.cxx sw/source/core/text/inftxt.cxx
+index 13a05d1..1838124 100644
+--- sw/source/core/text/inftxt.cxx
++++ sw/source/core/text/inftxt.cxx
+@@ -1145,27 +1145,30 @@ void SwTxtPaintInfo::DrawCheckBox( const SwFieldFormPortion &rPor, bool checked)
+ {
+     SwRect aIntersect;
+     CalcRect( rPor, &aIntersect, 0 );
+-    if ( aIntersect.HasArea() ) {
+-    if (OnWin()) {
+-        OutputDevice* pOutDev = (OutputDevice*)GetOut();
+-        pOutDev->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
+-        pOutDev->SetLineColor( Color(220, 233, 245));
+-        pOutDev->SetFillColor( Color(220, 233, 245));
+-        pOutDev->DrawRect( aIntersect.SVRect() );
+-        pOutDev->Pop();
+-    }
+-    const int delta=10;
+-    Rectangle r(aIntersect.Left()+delta, aIntersect.Top()+delta, aIntersect.Right()-delta, aIntersect.Bottom()-delta);
+-    pOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );	    
+-    pOut->SetLineColor( Color(0, 0, 0));
+-    pOut->SetFillColor();
+-    pOut->DrawRect( r );
+-    if (checked) {
+-        pOut->DrawLine(r.TopLeft(), r.BottomRight());
+-        pOut->DrawLine(r.TopRight(), r.BottomLeft());
++    if ( aIntersect.HasArea() ) 
++    {
++	    if (OnWin() && SwViewOption::IsFieldShadings() && 
++                !GetOpt().IsPagePreview()) 
++        {
++    	    OutputDevice* pOut_ = (OutputDevice*)GetOut();
++	        pOut_->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
++    	    pOut_->SetFillColor( SwViewOption::GetFieldShadingsColor() );
++	        pOut_->SetLineColor();
++	        pOut_->DrawRect( aIntersect.SVRect() );
++    	    pOut_->Pop();
++        }
++        const int delta=10;
++        Rectangle r(aIntersect.Left()+delta, aIntersect.Top()+delta, aIntersect.Right()-delta, aIntersect.Bottom()-delta);
++        pOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );	    
++        pOut->SetLineColor( Color(0, 0, 0));
++        pOut->SetFillColor();
++        pOut->DrawRect( r );
++        if (checked) {
++            pOut->DrawLine(r.TopLeft(), r.BottomRight());
++            pOut->DrawLine(r.TopRight(), r.BottomLeft());
++        }
+         pOut->Pop();
+     }
+-    }
+ }
+ 
+ /*************************************************************************
+@@ -1219,14 +1222,22 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const
+                 }
+             }
+             bool bIsStartMark=(1==GetLen() && CH_TXT_ATR_FIELDSTART==GetTxt().GetChar(GetIdx()));
+-            if(pFieldmark) OSL_TRACE("Found Fieldmark");
++            if(pFieldmark) {
++                OSL_TRACE("Found Fieldmark");
++#if DEBUG
++                rtl::OUString str = pFieldmark->toString( );
++                fprintf( stderr, "%s\n", rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr( ) );
++#endif
++            }
+             if(bIsStartMark) OSL_TRACE("Found StartMark");
+-            if (OnWin() && (pFieldmark!=NULL || bIsStartMark))
++            if (OnWin() && (pFieldmark!=NULL || bIsStartMark) && 
++                    SwViewOption::IsFieldShadings() && 
++                    !GetOpt().IsPagePreview())
+             {
+                 OutputDevice* pOutDev = (OutputDevice*)GetOut();
+                 pOutDev->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
+-                pOutDev->SetLineColor( Color(220, 233, 245));
+-                pOutDev->SetFillColor( Color(220, 233, 245));
++         		pOutDev->SetFillColor( SwViewOption::GetFieldShadingsColor() );
++                pOutDev->SetLineColor( );
+                 pOutDev->DrawRect( aIntersect.SVRect() );
+                 pOutDev->Pop();
+             }
+diff --git sw/source/core/text/portxt.cxx sw/source/core/text/portxt.cxx
+index 6eeb549..9b24e31 100644
+--- sw/source/core/text/portxt.cxx
++++ sw/source/core/text/portxt.cxx
+@@ -55,11 +55,13 @@
+ #include <IMark.hxx>
+ #include <pam.hxx>
+ #include <doc.hxx>
++#include <ecmaflds.hxx>
+ 
+ #if OSL_DEBUG_LEVEL > 1
+ const sal_Char *GetLangName( const MSHORT nLang );
+ #endif
+ 
++using namespace ::sw::mark;
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::i18n::ScriptType;
+ 
+@@ -769,9 +771,10 @@ void SwHolePortion::HandlePortion( SwPortionHandler& rPH ) const
+     rPH.Text( GetLen(), GetWhichPor() );
+ }
+ 
+-void SwFieldMarkPortion::Paint( const SwTxtPaintInfo & rInf) const
++void SwFieldMarkPortion::Paint( const SwTxtPaintInfo & /*rInf*/) const
+ {
+-    SwTxtPortion::Paint(rInf);
++    // These shouldn't be painted!
++    // SwTxtPortion::Paint(rInf);
+ }
+ 
+ sal_Bool SwFieldMarkPortion::Format( SwTxtFormatInfo & )
+@@ -781,38 +784,95 @@ sal_Bool SwFieldMarkPortion::Format( SwTxtFormatInfo & )
+     return ret;
+ }
+ 
++namespace ecma {
++    static int getCurrentListIndex( IFieldmark* pBM, 
++            ::rtl::OUString *currentText = NULL )
++    {
++        int currentIndex = pBM->getParam( ECMA_FORMDROPDOWN_RESULT, "0" ).second.toInt32();
++        int idx = 0;
++        for( int i = 0; i < pBM->getNumOfParams(); i++ ) 
++        {
++            IFieldmark::ParamPair_t p = pBM->getParam( i );
++            if ( p.first.compareToAscii( ECMA_FORMDROPDOWN_LISTENTRY ) == 0 )
++            {
++ 	            if ( idx == currentIndex )
++                {
++ 	                if ( currentText!=NULL ) *currentText=p.second;
++ 	                    break;
++ 	            } 
++                else
++             	    idx++;
++            }			       
++        }	
++        return idx;
++    }
++} /* ecma */
+ 
+ //FIXME Fieldbk
+-//void SwFieldFormPortion::Paint( const SwTxtPaintInfo& rInf ) const
+-void SwFieldFormPortion::Paint( const SwTxtPaintInfo& ) const
++void SwFieldFormPortion::Paint( const SwTxtPaintInfo& rInf ) const
+ {
+-//    SwTxtNode *pNd=const_cast<SwTxtNode*>(rInf.GetTxtFrm()->GetTxtNode());
+-//    const SwDoc *doc=pNd->GetDoc();
+-//    SwIndex aIndex( pNd, rInf.GetIdx() );
+-//    SwPosition aPosition(*pNd, aIndex);
+-//    pMark = dynamic_cast< doc->getFieldmarkFor(aPosition);
+-//    OSL_ENSURE(pMark,
+-//        "SwFieldFormPortion::Paint(..)"
+-//        " - Where is my form field bookmark???");
+-
+-//    bool checked=(pBM!=NULL?pBM->IsChecked():false);
+-//    rInf.DrawCheckBox(*this , checked);
+-}
++    SwTxtNode* pNd = const_cast<SwTxtNode*>(rInf.GetTxtFrm()->GetTxtNode());
++    const SwDoc *doc=pNd->GetDoc();
++    SwIndex aIndex( pNd, rInf.GetIdx() );
++    SwPosition aPosition(*pNd, aIndex);
+ 
+-sal_Bool SwFieldFormPortion::Format( SwTxtFormatInfo &rInf )
+-{
+-    sal_Bool ret=0;
+-//	ret=SwTxtPortion::Format(rInf);
++    IFieldmark* pBM = doc->getIDocumentMarkAccess( )->getFieldmarkFor( aPosition );
+ 
+-    Width(rInf.GetTxtHeight());
+-    Height(rInf.GetTxtHeight());
+-    SetAscent(rInf.GetAscent());
+-    //int h=rInf.GetTxtHeight();
++    OSL_ENSURE( pBM,
++        "SwFieldFormPortion::Paint(..)"
++        " - Where is my form field bookmark???");
+ 
+-/*
+-    Height(100);
+-    SetAscent(100);
+-*/
++    if ( pBM != NULL ) 
++    {
++        if ( pBM->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX ) )
++        { // a checkbox...
++        	bool checked = pBM->getParam( ECMA_FORMCHECKBOX_CHECKED ).second.compareToAscii("on") == 0;
++        	rInf.DrawCheckBox( *this , checked);
++        } 
++        else if ( pBM->GetFieldname( ).equalsAscii(  ECMA_FORMDROPDOWN ) )
++        { // a list...
++         	rtl::OUString aTxt;
++         	rInf.DrawViewOpt( *this, POR_FLD );
++         	rInf.DrawText( aTxt, *this, 0, aTxt.getLength(), false );	  
++        } 
++        else 
++        {
++         	assert(0); // unknown type...
++        }
++    }
++}
++
++sal_Bool SwFieldFormPortion::Format( SwTxtFormatInfo & rInf )
++{
++    sal_Bool ret = 0;
++    SwTxtNode *pNd = const_cast < SwTxtNode * >( rInf.GetTxtFrm(  )->GetTxtNode(  ) );
++    const SwDoc *doc = pNd->GetDoc(  );
++    SwIndex aIndex( pNd, rInf.GetIdx(  ) );
++    SwPosition aPosition( *pNd, aIndex );
++    IFieldmark *pBM = doc->getIDocumentMarkAccess( )->getFieldmarkFor( aPosition );
++    ASSERT( pBM != NULL, "Where is my form field bookmark???" );
++    if ( pBM != NULL )
++    {
++        if ( pBM->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX ) )
++        {
++            Width( rInf.GetTxtHeight(  ) );
++            Height( rInf.GetTxtHeight(  ) );
++            SetAscent( rInf.GetAscent(  ) );
++        }
++        else if ( pBM->GetFieldname( ).equalsAscii( ECMA_FORMDROPDOWN ) )
++        {
++            ::rtl::OUString aTxt;
++            ecma::getCurrentListIndex( pBM, &aTxt );
++            SwPosSize aPosSize = rInf.GetTxtSize( aTxt );
++            Width( aPosSize.Width(  ) );
++            Height( aPosSize.Height(  ) );
++            SetAscent( rInf.GetAscent(  ) );
++        }
++        else
++        {
++            assert( 0 );        // unknown type...
++        }
++    }
+     return ret;
+ }
+ 
+diff --git sw/source/core/unocore/unobkm.cxx sw/source/core/unocore/unobkm.cxx
+index ca27062..519f70d 100644
+--- sw/source/core/unocore/unobkm.cxx
++++ sw/source/core/unocore/unobkm.cxx
+@@ -7,7 +7,7 @@
+  * OpenOffice.org - a multi-platform office productivity suite
+  *
+  * $RCSfile: unobkm.cxx,v $
+- * $Revision: 1.17 $
++ * $Revision: 1.16 $
+  *
+  * This file is part of OpenOffice.org.
+  *
+@@ -47,6 +47,7 @@
+ #endif
+ #include <undobj.hxx>
+ 
++using namespace ::sw::mark;
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::uno;
+@@ -338,66 +339,85 @@ SwXFieldmark::SwXFieldmark(bool _isReplacementObject, ::sw::mark::IMark* pBkm, S
+     , isReplacementObject(_isReplacementObject)
+ { }
+ 
+-void SwXFieldmark::attachToRange(const uno::Reference< text::XTextRange > & xTextRange)
++void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTextRange ) 
+     throw( lang::IllegalArgumentException, uno::RuntimeException )
+ {
+-    attachToRangeEx(xTextRange, (isReplacementObject?IDocumentMarkAccess::CHECKBOX_FIELDMARK:IDocumentMarkAccess::TEXT_FIELDMARK));
++    attachToRangeEx( xTextRange,
++                     ( isReplacementObject ? IDocumentMarkAccess::CHECKBOX_FIELDMARK : IDocumentMarkAccess::TEXT_FIELDMARK ) );
+ }
+ 
+-::rtl::OUString SwXFieldmark::getDescription(void) throw( ::com::sun::star::uno::RuntimeException )
++::rtl::OUString SwXFieldmark::getFieldType( void ) 
++    throw( ::com::sun::star::uno::RuntimeException )
+ {
+-    vos::OGuard aGuard(Application::GetSolarMutex());
+-//        TODO implement...
+-//        if(!GetBookmark())
+-    ::sw::mark::IFieldmark const * const pMark =
+-        dynamic_cast< ::sw::mark::IFieldmark const * const>(GetBookmark());
+-    if(!pMark)
+-        throw uno::RuntimeException();
+-    return pMark->GetFieldHelptext();
++    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
++    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
++    IFieldmark *pBkm = dynamic_cast< IFieldmark* > ( pMark );
++    if ( pBkm )
++        return pBkm->GetFieldname( );
++    else
++        throw uno::RuntimeException(  );
+ }
+ 
+-::sal_Int16 SAL_CALL SwXFieldmark::getType() throw (::com::sun::star::uno::RuntimeException)
++void SwXFieldmark::setFieldType( const::rtl::OUString & fieldType ) 
++    throw( ::com::sun::star::uno::RuntimeException )
+ {
+-    vos::OGuard aGuard(Application::GetSolarMutex());
+-    ::sw::mark::ICheckboxFieldmark const * const pAsCheckbox =
+-        dynamic_cast< ::sw::mark::ICheckboxFieldmark const * const>(GetBookmark());
+-    if(pAsCheckbox)
+-        return 1;
+-    return 0;
++    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
++    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
++    IFieldmark *pBkm = dynamic_cast< IFieldmark* >( pMark );
++    if ( pBkm )
++        pBkm->SetFieldname( fieldType );
++    else
++        throw uno::RuntimeException(  );
+ }
+ 
+-::sal_Int16 SAL_CALL SwXFieldmark::getRes() throw (::com::sun::star::uno::RuntimeException)
++sal_Int16 SwXFieldmark::getParamCount(  )
++    throw( ::com::sun::star::uno::RuntimeException )
+ {
+-    vos::OGuard aGuard(Application::GetSolarMutex());
+-    ::sw::mark::ICheckboxFieldmark const * const pAsCheckbox =
+-        dynamic_cast< ::sw::mark::ICheckboxFieldmark const * const>(GetBookmark());
+-    if(pAsCheckbox && pAsCheckbox->IsChecked())
+-        return 1;
+-    return 0;
++    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
++    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
++    IFieldmark *pBkm = dynamic_cast< IFieldmark* >( pMark );
++    if ( pBkm )
++        return pBkm->getNumOfParams(  );
++    else
++        throw uno::RuntimeException(  );
+ }
+ 
+-//FIXME Remove Method
+-void SAL_CALL SwXFieldmark::setType( ::sal_Int16 ) throw (::com::sun::star::uno::RuntimeException)
++rtl::OUString SwXFieldmark::getParamName( sal_Int16 i ) 
++    throw( ::com::sun::star::uno::RuntimeException )
+ {
+-    vos::OGuard aGuard(Application::GetSolarMutex());
+-    throw uno::RuntimeException();
++    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
++    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
++    IFieldmark *pBkm = dynamic_cast< IFieldmark* >( pMark );
++    if ( pBkm )
++        return pBkm->getParam( i ).first;
++    else
++        throw uno::RuntimeException(  );
+ }
+ 
+-//FIXME Remove Method
+-void SAL_CALL SwXFieldmark::setRes( ::sal_Int16  ) throw (::com::sun::star::uno::RuntimeException)
++::rtl::OUString SwXFieldmark::getParamValue( ::sal_Int16 i ) 
++    throw( ::com::sun::star::uno::RuntimeException )
+ {
+-    vos::OGuard aGuard(Application::GetSolarMutex());
+-    throw uno::RuntimeException();
++    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
++    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
++    IFieldmark *pBkm = dynamic_cast< IFieldmark* >( pMark );
++    if ( pBkm )
++        return pBkm->getParam( i ).second;
++    else
++        throw uno::RuntimeException(  );
+ }
+ 
+-void SAL_CALL SwXFieldmark::setDescription( const ::rtl::OUString& description )
+-    throw (::com::sun::star::uno::RuntimeException)
++void SwXFieldmark::addParam( const ::rtl::OUString & name,
++                             const ::rtl::OUString & value,
++                             sal_Bool replaceExisting ) 
++    throw( ::com::sun::star::uno::RuntimeException )
+ {
+-    vos::OGuard aGuard(Application::GetSolarMutex());
+-    const ::sw::mark::IFieldmark* pMark =
+-        dynamic_cast<const ::sw::mark::IFieldmark*>(GetBookmark());
+-    if(pMark)
+-        const_cast< ::sw::mark::IFieldmark*>(pMark)->SetFieldHelptext(description);
++    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
++    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
++    IFieldmark *pBkm = dynamic_cast< IFieldmark* >( pMark );
++    if ( pBkm )
++        pBkm->addParam( const_cast< rtl::OUString& >( name ), 
++                const_cast< rtl::OUString& >( value ), 
++                replaceExisting );
+     else
+-        throw uno::RuntimeException();
++        throw uno::RuntimeException(  );
+ }
+diff --git sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/wrtw8nds.cxx
+index 1d36d8e..fd65fac 100644
+--- sw/source/filter/ww8/wrtw8nds.cxx
++++ sw/source/filter/ww8/wrtw8nds.cxx
+@@ -110,8 +110,48 @@ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::i18n;
+ using namespace sw::util;
+ using namespace sw::types;
++using namespace sw::mark;
+ using namespace nsFieldFlags;
+ 
++
++static String lcl_getFieldCode( const IFieldmark* pFieldmark ) {
++    ASSERT(pFieldmark!=NULL, "where is my fieldmark???");
++    if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMTEXT ) ) {
++    	return String::CreateFromAscii(" FORMTEXT ");
++    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMDROPDOWN ) ) {
++	    return String::CreateFromAscii(" FORMDROPDOWN ");
++    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX ) ) {
++    	return String::CreateFromAscii(" FORMCHECKBOX ");
++    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_TOC ) ) {
++	    return String::CreateFromAscii(" TOC ");
++    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_HYPERLINK ) ) {
++    	return String::CreateFromAscii(" HYPERLINK ");
++    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_PAGEREF ) ) {
++	    return String::CreateFromAscii(" PAGEREF ");
++    } else {
++    	return pFieldmark->GetFieldname();
++    }
++}
++
++ww::eField lcl_getFieldId( const IFieldmark* pFieldmark ) {
++    ASSERT(pFieldmark!=NULL, "where is my fieldmark???");
++    if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMTEXT ) ) {
++    	return ww::eFORMTEXT;
++    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMDROPDOWN ) ) {
++	    return ww::eFORMDROPDOWN;
++    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX ) ) {
++    	return ww::eFORMCHECKBOX;
++    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_TOC ) ) {
++	    return ww::eTOC;
++    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_HYPERLINK ) ) {
++    	return ww::eHYPERLINK;
++    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_PAGEREF ) ) {
++	    return ww::ePAGEREF;
++    } else {
++    	return ww::eUNKNOWN;
++    }    
++}
++
+ /*  */
+ 
+ MSWordAttrIter::MSWordAttrIter( MSWordExportBase& rExport )
+@@ -266,19 +306,17 @@ xub_StrLen SwAttrIter::SearchNext( xub_StrLen nStartPos )
+ {
+     xub_StrLen nPos;
+     xub_StrLen nMinPos = STRING_MAXLEN;
++    xub_StrLen i=0;
++
+     const String aTxt = rNd.GetTxt();
+     xub_StrLen pos = aTxt.Search(CH_TXT_ATR_FIELDSTART, nStartPos);
+-    if( pos==STRING_NOTFOUND )
+-    {
+-        pos = aTxt.Search(CH_TXT_ATR_FIELDEND, nStartPos);
+-        if( pos==STRING_NOTFOUND )
+-            pos = aTxt.Search(CH_TXT_ATR_FORMELEMENT, nStartPos);
+-    }
+-    if( pos!=STRING_NOTFOUND )
++	if (pos==STRING_NOTFOUND) 
++		pos=aTxt.Search(CH_TXT_ATR_FIELDEND, nStartPos);
++	if (pos==STRING_NOTFOUND) 
++		pos=aTxt.Search(CH_TXT_ATR_FORMELEMENT, nStartPos);
++	if (pos!=STRING_NOTFOUND)  
+         nMinPos=pos;
+ 
+-    xub_StrLen i=0;
+-
+     // first the redline, then the attributes
+     if( pCurRedline )
+     {
+@@ -1704,12 +1742,14 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
+                 ::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
+                 OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
+ 
+-                if ( pFieldmark )
+-                    AppendBookmark( pFieldmark->GetName(), true );
+-                OutputField( NULL, ww::eFORMTEXT, String::CreateFromAscii( " FORMTEXT " ), WRITEFIELD_START | WRITEFIELD_CMD_START );
+-                if ( pFieldmark )
++                if ( pFieldmark->GetFieldname().equalsAscii( ECMA_FORMTEXT ) )
++                    AppendBookmark( pFieldmark->GetName(), false );
++                OutputField( NULL, lcl_getFieldId( pFieldmark ), lcl_getFieldCode( pFieldmark ), WRITEFIELD_START | WRITEFIELD_CMD_START );
++                if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMTEXT ) )
+                     WriteFormData( *pFieldmark );
+-                OutputField( NULL, ww::eFORMTEXT, String(), WRITEFIELD_CMD_END );
++                else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_HYPERLINK ) )
++                    WriteHyperlinkData( *pFieldmark );
++                OutputField( NULL, lcl_getFieldId( pFieldmark ), String(), WRITEFIELD_CMD_END );
+             }
+             else if ( ch == CH_TXT_ATR_FIELDEND )
+             {
+@@ -1717,8 +1757,8 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
+                 ::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
+                 OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
+ 
+-                OutputField( NULL, ww::eFORMTEXT, String(), WRITEFIELD_CLOSE );
+-                if ( pFieldmark )
++                OutputField( NULL, lcl_getFieldId( pFieldmark ), String(), WRITEFIELD_CLOSE );
++                if ( pFieldmark->GetFieldname().equalsAscii( ECMA_FORMTEXT ) )
+                     AppendBookmark( pFieldmark->GetName(), false );
+             }
+             else if ( ch == CH_TXT_ATR_FORMELEMENT )
+@@ -1727,13 +1767,18 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
+                 ::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
+                 OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
+ 
+-                if ( pFieldmark )
+-                    AppendBookmark( pFieldmark->GetName(), true );
+-                OutputField( NULL, ww::eFORMCHECKBOX, String::CreateFromAscii( " FORMCHECKBOX " ), WRITEFIELD_START | WRITEFIELD_CMD_START );
+-                if ( pFieldmark )
++                bool isEcma = pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMDROPDOWN ) || 
++                    pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX );
++
++                if ( isEcma )
++                    AppendBookmark( pFieldmark->GetName(), 0 );
++                OutputField( NULL, lcl_getFieldId( pFieldmark ), 
++                        lcl_getFieldCode( pFieldmark ), 
++                        WRITEFIELD_START | WRITEFIELD_CMD_START );
++                if ( isEcma )
+                     WriteFormData( *pFieldmark );
+-                OutputField( NULL, ww::eFORMCHECKBOX, String(), WRITEFIELD_CMD_END | WRITEFIELD_CLOSE );
+-                if ( pFieldmark )
++                OutputField( NULL, lcl_getFieldId( pFieldmark ), String(), WRITEFIELD_CMD_END | WRITEFIELD_CLOSE );
++                if ( isEcma )
+                     AppendBookmark( pFieldmark->GetName(), false );
+             }
+             nLen -= static_cast< USHORT >( ofs );
+diff --git sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/wrtww8.cxx
+index adbe1db..42934c8 100644
+--- sw/source/filter/ww8/wrtww8.cxx
++++ sw/source/filter/ww8/wrtww8.cxx
+@@ -105,6 +105,7 @@
+ #include "ww8attributeoutput.hxx"
+ 
+ #include <IDocumentMarkAccess.hxx>
++#include <ecmaflds.hxx>
+ 
+ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+ #include <com/sun/star/document/XDocumentProperties.hpp>
+@@ -3437,11 +3438,20 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
+     const ::sw::mark::IFieldmark* pFieldmark = &rFieldmark;
+     const ::sw::mark::ICheckboxFieldmark* pAsCheckbox = dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( pFieldmark );
+ 
++
++    ASSERT(rFieldmark.GetFieldname().equalsAscii( ECMA_FORMTEXT ) || rFieldmark.GetFieldname().equalsAscii( ECMA_FORMDROPDOWN ) || rFieldmark.GetFieldname().equalsAscii( ECMA_FORMCHECKBOX ), "Unknown field type!!!");
++    if ( ! ( rFieldmark.GetFieldname().equalsAscii( ECMA_FORMTEXT ) || 
++                rFieldmark.GetFieldname().equalsAscii( ECMA_FORMDROPDOWN ) ||
++                rFieldmark.GetFieldname().equalsAscii( ECMA_FORMCHECKBOX ) ) )
++        return;
++
+     int type = 0; // TextFieldmark
+     if ( pAsCheckbox )
+         type = 1;
++    if ( rFieldmark.GetFieldname().equalsAscii( ECMA_FORMDROPDOWN ) )
++        type=2;
+ 
+-    const ::rtl::OUString ffname = rFieldmark.GetFieldname(); 
++    const String ffname = rFieldmark.getParam("name").second;
+ 
+     ULONG nDataStt = pDataStrm->Tell();
+     pChpPlc->AppendFkpEntry(Strm().Tell());
+@@ -3463,14 +3473,27 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
+     sal_uInt8 aFldHeader[] = 
+     {
+         0xFF, 0xFF, 0xFF, 0xFF, // Unicode Marker...
+-        0, 0, 0, 0//, 0, 0, 0, 0
++        0, 0, 0, 0, 0, 0 //, 0, 0
+     };
+ 
+     aFldHeader[4] |= (type & 0x03);
+     int ffres = 0; // rFieldmark.GetFFRes();
+     if ( pAsCheckbox && pAsCheckbox->IsChecked() )
+         ffres = 1;
++    else if ( type == 2 )
++        ffres = rFieldmark.getParam( ECMA_FORMDROPDOWN_RESULT, "0" ).second.toInt32();
+     aFldHeader[4] |= ( (ffres<<2) & 0x7C );
++ 
++    std::vector< ::rtl::OUString > aListItems;
++    if (type==2) 
++    {
++        aFldHeader[5] |= 0x80; // ffhaslistbox
++        for ( int i = 0; i < rFieldmark.getNumOfParams() ; i++ ) 
++        {
++            if (rFieldmark.getParam(i).first.compareToAscii(ECMA_FORMDROPDOWN_LISTENTRY)==0)
++                aListItems.push_back(rFieldmark.getParam(i).second);
++        }
++    }
+ 
+     const ::rtl::OUString ffdeftext;
+     const ::rtl::OUString ffformat;
+@@ -3479,6 +3502,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
+     const ::rtl::OUString ffentrymcr;
+     const ::rtl::OUString ffexitmcr;
+ 
++
+     const sal_uInt8 aFldData[] =
+     {
+         0,0,0,0,        // len of struct
+@@ -3491,13 +3515,22 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
+     };
+     int slen = sizeof( aFldData )
+         + sizeof( aFldHeader )
+-        + 2*ffname.getLength() + 4
++        + 2*ffname.Len() + 4
+         + 2*ffdeftext.getLength() + 4
+         + 2*ffformat.getLength() + 4
+         + 2*ffhelptext.getLength() + 4
+         + 2*ffstattext.getLength() + 4
+         + 2*ffentrymcr.getLength() + 4
+         + 2*ffexitmcr.getLength() + 4;
++    if ( type==2 ) {
++        slen += 2; // for 0xFF, 0xFF
++        slen += 4; // for num of list items
++        const int items = aListItems.size();
++        for( int i = 0; i < items; i++ ) {
++            rtl::OUString item = aListItems[i];
++            slen += 2 * item.getLength() + 2;
++        }
++    }
+ #ifdef OSL_BIGENDIAN
+     slen = SWAPLONG( slen );
+ #endif // OSL_BIGENDIAN
+@@ -3508,6 +3541,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
+ 
+     len = sizeof( aFldHeader );
+     OSL_ENSURE( len == 8, "SwWW8Writer::WriteFormData(..) - wrong aFldHeader length" );
++
+     pDataStrm->Write( aFldHeader, len );
+ 
+     SwWW8Writer::WriteString_xstz( *pDataStrm, ffname, true ); // Form field name
+@@ -3522,11 +3556,20 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
+     SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffstattext ), true );
+     SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffentrymcr ), true );
+     SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffexitmcr ), true );
+-//    if (type==2) {
+-//        // 0xFF, 0xFF
+-//        // sal_uInt32 number of strings
+-//        // (sal_uInt16 len; sal_uInt16 unicode char[len])*num of strings
+-//    }
++    if (type==2) {
++        *pDataStrm<<(sal_uInt16)0xFFFF;
++        const int items=aListItems.size();
++        *pDataStrm<<(sal_uInt32)items;
++        for(int i=0;i<items;i++) {
++            rtl::OUString item=aListItems[i];
++            SwWW8Writer::WriteString_xstz( *pDataStrm, item, false );
++        }
++    }
++}
++
++void WW8Export::WriteHyperlinkData( const sw::mark::IFieldmark& rFieldmark )
++{
++    //@TODO implement me !!!
+ }
+ 
+ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner )
+diff --git sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/wrtww8.hxx
+index a96a2e5..1f3e9f2 100644
+--- sw/source/filter/ww8/wrtww8.hxx
++++ sw/source/filter/ww8/wrtww8.hxx
+@@ -709,6 +709,7 @@ public:
+ 
+     /// Write the data of the form field
+     virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) = 0;
++    virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) = 0;
+     
+     virtual void DoComboBox(const rtl::OUString &rName,
+                     const rtl::OUString &rHelp,
+@@ -1076,6 +1077,7 @@ public:
+ 
+     /// Write the data of the form field
+     virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark );
++    virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark );
+ 
+     /// Fields.
+     WW8_WrPlcFld* CurrentFieldPlc() const;
+diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
+index 2a0dc6d..cb1a3c2 100644
+--- sw/source/filter/ww8/ww8par.cxx
++++ sw/source/filter/ww8/ww8par.cxx
+@@ -1663,7 +1663,6 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) :
+     maOldApos.push_back(false);
+     maOldApos.swap(pRdr->maApos);
+     maOldFieldStack.swap(pRdr->maFieldStack);
+-    maFieldCtxStack.swap(pRdr->maNewFieldCtxStack);
+ }
+ 
+ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr )
+@@ -1710,7 +1709,6 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr )
+         pRdr->pPlcxMan->RestoreAllPLCFx(maPLCFxSave);
+     pRdr->maApos.swap(maOldApos);
+     pRdr->maFieldStack.swap(maOldFieldStack);
+-    pRdr->maNewFieldCtxStack.swap(maFieldCtxStack);
+ }
+ 
+ void SwWW8ImplReader::Read_HdFtFtnText( const SwNodeIndex* pSttIdx,
+@@ -2766,29 +2764,6 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
+         case 0x15:
+             if( !bSpec )        // Juristenparagraph
+                 cInsert = '\xa7';
+-            else
+-            {
+-                // 0x15 is special --> so it's our field end mark...;
+-                // hmmm what about field marks not handled by us??, maybe a problem with nested fields;
+-                // probably an area of bugs... [well release quick and release often....]
+-                if (!maNewFieldCtxStack.empty() && pPaM!=NULL && pPaM->GetPoint()!=NULL)
+-                {
+-                    ::boost::scoped_ptr<WW8NewFieldCtx> pFieldCtx(maNewFieldCtxStack.back());
+-                    maNewFieldCtxStack.pop_back();
+-                    SwPosition aEndPos = *pPaM->GetPoint();
+-                    SwPaM aFldPam(pFieldCtx->GetPtNode(), pFieldCtx->GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
+-                    IDocumentMarkAccess* const pMarkAccess = rDoc.getIDocumentMarkAccess();
+-                    ::sw::mark::IFieldmark* pFieldmark =
+-                        dynamic_cast< ::sw::mark::IFieldmark*>(pMarkAccess->makeMark(
+-                            aFldPam,
+-                            pFieldCtx->GetBookmarkName(),
+-                            IDocumentMarkAccess::TEXT_FIELDMARK));
+-                    OSL_ENSURE(pFieldmark!=NULL,
+-                        "hmmm; why was the bookmark not created?");
+-                    if (pFieldmark)
+-                        pFieldCtx->SetCurrentFieldParamsTo(pFieldmark);
+-                }
+-            }
+             break;
+         case 0x9:
+             cInsert = '\x9';    // Tab
+@@ -3599,7 +3574,14 @@ void wwSectionManager::InsertSegments()
+ 
+         bool bInsertSection = (aIter != aStart) ? (aIter->IsContinous() &&  bThisAndPreviousAreCompatible): false;
+         bool bInsertPageDesc = !bInsertSection;
+-        bool bProtected = !bUseEnhFields && SectionIsProtected(*aIter); // do we really  need this ?? I guess I have a different logic in editshell which disales this...
++        bool bProtected = SectionIsProtected(*aIter); // do we really  need this ?? I guess I have a different logic in editshell which disales this...
++	if (bUseEnhFields && mrReader.pWDop->fProtEnabled && aIter->IsNotProtected()) {
++	    // here we have the special case that the whole document is protected, with the execption of this section.
++	    // I want to address this when I do the section rework, so for the moment we disable the overall protection then...
++	    mrReader.rDoc.set(IDocumentSettingAccess::PROTECT_FORM, false );
++	}
++
++
+         if (bInsertPageDesc)
+         {
+             /*
+diff --git sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par.hxx
+index 525deb7..dfd6842 100644
+--- sw/source/filter/ww8/ww8par.hxx
++++ sw/source/filter/ww8/ww8par.hxx
+@@ -60,6 +60,8 @@
+ #include "ww8glsy.hxx"
+ #include "wrtww8.hxx"
+ #include "../inc/msfilter.hxx"
++#include <ecmaflds.hxx>
++#include <IMark.hxx>
+ 
+ class SwDoc;
+ class SwPaM;
+@@ -362,6 +364,8 @@ namespace sw
+             Position(const SwPosition &rPos);
+             Position(const Position &rPos);
+             operator SwPosition() const;
++	    SwNodeIndex GetPtNode() { return maPtNode; };
++	    xub_StrLen GetPtCntnt() { return mnPtCntnt; };        
+         };
+     }
+ }
+@@ -369,36 +373,30 @@ namespace sw
+ class FieldEntry
+ {
+ public:
+-    sw::hack::Position maStartPos;
+-    sal_uInt16 mnFieldId;
+-    FieldEntry(SwPosition &rPos, sal_uInt16 nFieldId) throw();
+-    FieldEntry(const FieldEntry &rOther) throw();
+-    FieldEntry &operator=(const FieldEntry &rOther) throw();
+-    void Swap(FieldEntry &rOther) throw();
+-};
++ 	typedef ::std::vector<sw::mark::IFieldmark::ParamPair_t> Params_t;
+ 
+-class WW8NewFieldCtx
+-{
+ private:
+-    SwNodeIndex maPtNode;
+-    xub_StrLen mnPtCntnt;
+     ::rtl::OUString msBookmarkName;
+     ::rtl::OUString msMarkType;
+-    typedef ::std::pair< ::rtl::OUString, ::rtl::OUString> Param_t;
+-    typedef ::std::vector< Param_t > Params_t;
+     Params_t maParams;
+-  SwPaM * mpPaM;
+ 
+ public:
+-    WW8NewFieldCtx(SwPosition &aStartPos, ::rtl::OUString sBookmarkName, ::rtl::OUString sMarkType);
+-    ~WW8NewFieldCtx();
++    sw::hack::Position maStartPos;
++    sal_uInt16 mnFieldId;
++    FieldEntry(SwPosition &rPos, sal_uInt16 nFieldId) throw();
++    FieldEntry(const FieldEntry &rOther) throw();
++    FieldEntry &operator=(const FieldEntry &rOther) throw();
++    void Swap(FieldEntry &rOther) throw();
++
++    SwNodeIndex GetPtNode() { return maStartPos.GetPtNode(); };
++    xub_StrLen GetPtCntnt() { return maStartPos.GetPtCntnt(); };
+ 
+-    SwNodeIndex GetPtNode() { return maPtNode; };
+-    xub_StrLen GetPtCntnt() { return mnPtCntnt; };
+     ::rtl::OUString GetBookmarkName();
+-    ::rtl::OUString GetMarkType();
++    ::rtl::OUString GetBookmarkType();
++    void SetBookmarkName(::rtl::OUString bookmarkName);
++    void SetBookmarkType(::rtl::OUString bookmarkType);
+     void AddParam(::rtl::OUString name, ::rtl::OUString value);
+-    void SetCurrentFieldParamsTo(::sw::mark::IFieldmark* pFieldmark);
++    Params_t &getParams();
+ };
+ 
+ 
+@@ -434,7 +432,6 @@ private:
+     bool mbWasParaEnd;
+     bool mbHasBorder;
+     bool mbFirstPara;
+-    std::deque<WW8NewFieldCtx *> maFieldCtxStack;
+ public:
+     WW8ReaderSave(SwWW8ImplReader* pRdr, WW8_CP nStart=-1);
+     void Restore(SwWW8ImplReader* pRdr);
+@@ -889,9 +886,6 @@ private:
+     std::deque<FieldEntry> maFieldStack;
+     typedef std::deque<FieldEntry>::const_iterator mycFieldIter;
+ 
+-    typedef std::deque<WW8NewFieldCtx *> WW8NewFieldCtxStack_t;
+-    WW8NewFieldCtxStack_t maNewFieldCtxStack;
+-
+     /*
+     A stack of open footnotes. Should only be one in it at any time.
+     */
+diff --git sw/source/filter/ww8/ww8par3.cxx sw/source/filter/ww8/ww8par3.cxx
+index 7b9945a..bc24b73 100644
+--- sw/source/filter/ww8/ww8par3.cxx
++++ sw/source/filter/ww8/ww8par3.cxx
+@@ -96,66 +96,14 @@
+ 
+ #include <IMark.hxx>
+ #include <svtools/fltrcfg.hxx>
++#include <ecmaflds.hxx>
+ 
+ #include <stdio.h>
+ 
+ using namespace com::sun::star;
+ using namespace sw::util;
+ using namespace sw::types;
+-
+-WW8NewFieldCtx::WW8NewFieldCtx(SwPosition &aStartPos, ::rtl::OUString sBookmarkName, ::rtl::OUString sMarkType)
+-    : maPtNode(aStartPos.nNode)
+-    , mnPtCntnt(aStartPos.nContent.GetIndex())
+-    , msBookmarkName(sBookmarkName)
+-    , msMarkType(sMarkType)
+-    , mpPaM(NULL)
+-{
+-}
+-
+-
+-WW8NewFieldCtx::~WW8NewFieldCtx()
+-{
+-    if (mpPaM) delete mpPaM;
+-}
+-
+-::rtl::OUString WW8NewFieldCtx::GetBookmarkName()
+-{
+-    return msBookmarkName;
+-}
+-
+-::rtl::OUString WW8NewFieldCtx::GetMarkType()
+-{
+-    return msMarkType;
+-}
+-
+-void WW8NewFieldCtx::AddParam(::rtl::OUString name, ::rtl::OUString value)
+-{
+-    maParams.push_back( Param_t(name, value) );
+-}
+-
+-void WW8NewFieldCtx::SetCurrentFieldParamsTo(::sw::mark::IFieldmark* pFieldmark)
+-{
+-    for(Params_t::iterator i=maParams.begin();i!=maParams.end();i++)
+-    {
+-        ::rtl::OUString aName=i->first;
+-        ::rtl::OUString aValue=i->second;
+-        if(aName.compareToAscii("Description")==0)
+-        {
+-            pFieldmark->SetFieldHelptext(aValue);
+-        }
+-        else if(aName.compareToAscii("Name")==0)
+-        {
+-            pFieldmark->SetFieldname(aValue);
+-        }
+-        else if(aName.compareToAscii("Result")==0)
+-        {
+-            ::sw::mark::ICheckboxFieldmark* pAsCheckbox =
+-                dynamic_cast< ::sw::mark::ICheckboxFieldmark* >(pFieldmark);
+-            if(pAsCheckbox)
+-                pAsCheckbox->SetChecked(aValue.toInt32()==0);
+-        }
+-    }
+-}
++using namespace sw::mark;
+ 
+ //-----------------------------------------
+ //            UNO-Controls
+@@ -233,10 +181,10 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr )
+ 
+ 
+     if (aBookmarkName.Len()>0) {
+-        WW8NewFieldCtx *pFieldCtx=new WW8NewFieldCtx(*pPaM->GetPoint(), aBookmarkName, ::rtl::OUString::createFromAscii("ecma.office-open-xml.field.FORMTEXT"));
+-        maNewFieldCtxStack.push_back(pFieldCtx);
+-        pFieldCtx->AddParam(::rtl::OUString::createFromAscii("Description"), aFormula.sToolTip);
+-        pFieldCtx->AddParam(::rtl::OUString::createFromAscii("Name"), aFormula.sTitle);
++	    maFieldStack.back().SetBookmarkName(aBookmarkName);
++	    maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ECMA_FORMTEXT));
++	    maFieldStack.back().AddParam(::rtl::OUString::createFromAscii("Description"), aFormula.sToolTip);
++	    maFieldStack.back().AddParam(::rtl::OUString::createFromAscii("Name"), aFormula.sTitle);
+     }
+     return FLD_TEXT;
+     }
+@@ -279,19 +227,22 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, String& rStr )
+         aBookmarkName=pB->GetUniqueBookmarkName(aFormula.sTitle);
+     }
+ 
+-    if (aBookmarkName.Len()>0) {
+-        ::sw::mark::ICheckboxFieldmark* pFieldmark = 
+-            dynamic_cast< ::sw::mark::ICheckboxFieldmark*>(rDoc.getIDocumentMarkAccess()->makeMark(
+-                *pPaM,
+-                aBookmarkName,
+-                IDocumentMarkAccess::CHECKBOX_FIELDMARK));
+-        OSL_ENSURE(pFieldmark,
+-            "hmmm; why was the bookmark not created?");
+-        if(pFieldmark)
+-        {
+-            pFieldmark->SetFieldname(aFormula.sTitle);
+-            pFieldmark->SetFieldHelptext(aFormula.sToolTip);
+-            pFieldmark->SetChecked(aFormula.nChecked!=0);
++    if (aBookmarkName.Len()>0) 
++    {
++        IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
++        IFieldmark* pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeNoTextFieldBookmark(
++                *pPaM, aBookmarkName, 
++                rtl::OUString::createFromAscii( ECMA_FORMCHECKBOX ) ) );
++        ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
++        if (pFieldmark!=NULL) {
++            pFieldmark->addParam(
++                    rtl::OUString::createFromAscii(ECMA_FORMCHECKBOX_NAME), 
++                    rtl::OUString( aFormula.sTitle ) );
++            pFieldmark->addParam(
++                    rtl::OUString::createFromAscii(ECMA_FORMCHECKBOX_HELPTEXT),                     aFormula.sToolTip);
++            pFieldmark->addParam(
++                    rtl::OUString::createFromAscii(ECMA_FORMCHECKBOX_CHECKED), 
++                    ::rtl::OUString::createFromAscii(aFormula.nChecked!=0?"on":"off"));
+             // set field data here...
+         }
+     }
+@@ -306,24 +257,73 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr)
+     if (0x01 == rStr.GetChar(writer_cast<xub_StrLen>(pF->nLCode-1)))
+         ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_DROPDOWN);
+ 
+-    SwDropDownField aFld(
+-        (SwDropDownFieldType*)rDoc.GetSysFldType(RES_DROPDOWN));
+-
+-    aFld.SetName(aFormula.sTitle);
+-    aFld.SetHelp(aFormula.sHelp);
+-    aFld.SetToolTip(aFormula.sToolTip);
++    const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
++    sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
+ 
+-    if (!aFormula.maListEntries.empty())
++    if (!bUseEnhFields) {
++	SwDropDownField aFld(
++	    (SwDropDownFieldType*)rDoc.GetSysFldType(RES_DROPDOWN));
++
++	aFld.SetName(aFormula.sTitle);
++	aFld.SetHelp(aFormula.sHelp);
++	aFld.SetToolTip(aFormula.sToolTip);
++	
++	if (!aFormula.maListEntries.empty())
++	{
++	    aFld.SetItems(aFormula.maListEntries);
++	    int nIndex = aFormula.fDropdownIndex  < aFormula.maListEntries.size()
++		? aFormula.fDropdownIndex : 0;
++	    aFld.SetSelectedItem(aFormula.maListEntries[nIndex]);
++	}
++	
++	rDoc.Insert(*pPaM, SwFmtFld(aFld), 0);
++	return FLD_OK;
++    } else {
++	//@TODO fix: copy pasting here!!!!!!!!!!!!!!
++	//REVIEW: don't let this throught.... sometime I forget to get rid of my proof of concept stuff. Please kindly remind me!!!!!
++
++	String aBookmarkName;
++	WW8PLCFx_Book* pB = pPlcxMan->GetBook();
++	if (pB!=NULL) {
++		WW8_CP currentCP=pF->nSCode;
++		WW8_CP currentLen=pF->nLen;
++
++		USHORT bkmFindIdx;
++		String aBookmarkFind=pB->GetBookmark(currentCP-1, currentCP+currentLen-1, bkmFindIdx);
++
++		if (aBookmarkFind.Len()>0) { 
++			pB->SetStatus(bkmFindIdx, BOOK_FIELD); // mark as consumed by field
++			if (aBookmarkFind.Len()>0) {
++				aBookmarkName=aBookmarkFind;
++			}
++		}
++	}
++
++	if (pB!=NULL && aBookmarkName.Len()==0) {
++		aBookmarkName=pB->GetUniqueBookmarkName(aFormula.sTitle);
++	}
++
++	if (aBookmarkName.Len()>0) 
+     {
+-        aFld.SetItems(aFormula.maListEntries);
+-        int nIndex = aFormula.fDropdownIndex  < aFormula.maListEntries.size()
+-            ? aFormula.fDropdownIndex : 0;
+-        aFld.SetSelectedItem(aFormula.maListEntries[nIndex]);
+-    }
++        IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
++	    IFieldmark *pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeNoTextFieldBookmark(
++                    *pPaM, aBookmarkName, ::rtl::OUString::createFromAscii( ECMA_FORMDROPDOWN ) ) );
++	    ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
++	    if ( pFieldmark != NULL ) {
++    		rtl::OUString sListEntry=rtl::OUString::createFromAscii( ECMA_FORMDROPDOWN_LISTENTRY );
++	    	std::vector<String>::iterator it = aFormula.maListEntries.begin();
++		    for( ; it != aFormula.maListEntries.end(); it++ )
++		        pFieldmark->addParam(sListEntry, *it, false);
+ 
+-    rDoc.Insert(*pPaM, SwFmtFld(aFld), 0);
++	    	int nIndex = aFormula.fDropdownIndex  < aFormula.maListEntries.size() ? aFormula.fDropdownIndex : 0;
++		    pFieldmark->addParam(ECMA_FORMDROPDOWN_RESULT, nIndex);
++    		// set field data here...
++	    }
++	}
++
++	return FLD_OK;
++    }
+ 
+-    return FLD_OK;
+ }
+ 
+ eF_ResT SwWW8ImplReader::Read_F_HTMLControl( WW8FieldDesc* pF, String& rStr)
+@@ -2148,11 +2148,18 @@ bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula,
+ 
+     if((aPic.lcb > 0x3A) && !pDataStream->GetError() )
+     {
+-        pDataStream->Seek( nPicLocFc + aPic.cbHeader );
++#if 0 // some debug fun; remove this later...
+         int len=aPic.lcb-aPic.cbHeader;
+         char *pBuf=(char*)malloc(len);
+         pDataStream->Read( pBuf, len);
++	static int _h=0;
++	char fname[255];
++	sprintf(fname, "data%03i.data", _h++);
++	FILE *out=fopen(fname, "wb");
++	fwrite(pBuf, len, 1, out);
++	fclose(out);
+         pDataStream->Seek( nPicLocFc + aPic.cbHeader );
++#endif
+         aFormula.FormulaRead(nWhich,pDataStream);
+         bRet = true;
+     }
+diff --git sw/source/filter/ww8/ww8par5.cxx sw/source/filter/ww8/ww8par5.cxx
+index 2cc2fd4..95cafa0 100644
+--- sw/source/filter/ww8/ww8par5.cxx
++++ sw/source/filter/ww8/ww8par5.cxx
+@@ -89,22 +89,26 @@
+ #include <fmtclds.hxx>
+ #include <pagedesc.hxx>
+ #include <SwStyleNameMapper.hxx>
+-
++#include <IMark.hxx>
+ 
+ #include "ww8scan.hxx"          // WW8FieldDesc
+ #include "ww8par.hxx"
+ #include "ww8par2.hxx"
+ #include "writerhelper.hxx"
+ #include "fields.hxx"
++#include <svtools/fltrcfg.hxx>
+ 
+ #include <algorithm> // #i24377#
+ 
++//#define WW_NATIVE_TOC 0
++
+ #define MAX_FIELDLEN 64000
+ 
+ #define WW8_TOX_LEVEL_DELIM     ':'
+ 
+ using namespace ::com::sun::star;
+ using namespace sw::util;
++using namespace sw::mark;
+ using namespace std; // #i24377#
+ using namespace nsSwDocInfoSubType;
+ 
+@@ -329,9 +333,11 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
+ 
+     //"_Toc*" and "_Hlt*" are unnecessary
+     const String* pName = pB->GetName();
++#if !defined(WW_NATIVE_TOC)
+     if(    !pName || pName->EqualsIgnoreCaseAscii( "_Toc", 0, 4 )
+         || pName->EqualsIgnoreCaseAscii( "_Hlt", 0, 4 ) )
+         return 0;
++#endif 
+ 
+     //JP 16.11.98: ToUpper darf auf keinen Fall gemacht werden, weil der
+     //Bookmark- name ein Hyperlink-Ziel sein kann!
+@@ -673,6 +679,9 @@ sal_uInt16 SwWW8ImplReader::End_Field()
+     if (!pF || !pF->EndPosIsFieldEnd())
+         return nRet;
+ 
++    const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
++    sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
++
+     ASSERT(!maFieldStack.empty(), "Empty field stack\n");
+     if (!maFieldStack.empty())
+     {
+@@ -684,9 +693,40 @@ sal_uInt16 SwWW8ImplReader::End_Field()
+         nRet = maFieldStack.back().mnFieldId;
+         switch (nRet)
+         {
++	    case 70:
++		if (bUseEnhFields && pPaM!=NULL && pPaM->GetPoint()!=NULL) {
++		    SwPosition aEndPos = *pPaM->GetPoint();
++		    SwPaM aFldPam( maFieldStack.back().GetPtNode(), maFieldStack.back().GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
++            IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
++            IFieldmark *pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeFieldBookmark(
++                        aFldPam, maFieldStack.back().GetBookmarkName(), ::rtl::OUString::createFromAscii(ECMA_FORMTEXT ) ) );
++		    ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
++		    if (pFieldmark!=NULL) {
++			pFieldmark->addParams(maFieldStack.back().getParams());
++		    }
++		}
++		break;
++#if defined(WW_NATIVE_TOC)
++	    case 8: // TOX_INDEX
++	    case 13: // TOX_CONTENT
++	    case 88: // HYPERLINK
++	    case 37: // REF
++		if (pPaM!=NULL && pPaM->GetPoint()!=NULL) {
++		    
++		    SwPosition aEndPos = *pPaM->GetPoint();
++		    SwPaM aFldPam( maFieldStack.back().GetPtNode(), maFieldStack.back().GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
++		    SwFieldBookmark *pFieldmark=(SwFieldBookmark*)rDoc.makeFieldBookmark(aFldPam, maFieldStack.back().GetBookmarkName(), maFieldStack.back().GetBookmarkType());
++		    ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
++		    if (pFieldmark!=NULL) {
++			pFieldmark->addParams(maFieldStack.back().getParams());
++		    }
++		}
++		break;	  
++#else     
+             case 88:
+                 pCtrlStck->SetAttr(*pPaM->GetPoint(),RES_TXTATR_INETFMT);
+             break;
++#endif
+             case 36:
+             case 68:
+                 //Move outside the section associated with this type of field
+@@ -704,6 +744,10 @@ bool AcceptableNestedField(sal_uInt16 nFieldCode)
+ {
+     switch (nFieldCode)
+     {
++#if defined(WW_NATIVE_TOC)
++	case 8:  // allow recursive field in TOC...
++	case 13: // allow recursive field in TOC...
++#endif
+         case 36:
+         case 68:
+         case 79:
+@@ -742,6 +786,36 @@ FieldEntry &FieldEntry::operator=(const FieldEntry &rOther) throw()
+     return *this;
+ }
+ 
++::rtl::OUString FieldEntry::GetBookmarkName()
++{
++	return msBookmarkName;
++}
++
++::rtl::OUString FieldEntry::GetBookmarkType()
++{
++	return msMarkType;
++}
++
++void FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName) 
++{
++    msBookmarkName=bookmarkName;
++}
++
++void FieldEntry::SetBookmarkType(::rtl::OUString bookmarkType)
++{
++    msMarkType=bookmarkType;
++}
++
++void FieldEntry::AddParam(::rtl::OUString name, ::rtl::OUString value)
++{
++    maParams.push_back( IFieldmark::ParamPair_t( name, value ) );
++}
++
++FieldEntry::Params_t &FieldEntry::getParams() {
++    return maParams;
++}
++
++
+ // Read_Field liest ein Feld ein oder, wenn es nicht gelesen werden kann,
+ // wird 0 zurueckgegeben, so dass das Feld vom Aufrufer textuell gelesen wird.
+ // Returnwert: Gesamtlaenge des Feldes ( zum UEberlesen )
+@@ -2069,6 +2143,17 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, String& rStr )
+ 
+     String sName(GetMappedBookmark(sOrigName));
+ 
++#if defined(WW_NATIVE_TOC)
++    if (1) {
++	::rtl::OUString aBookmarkName=::rtl::OUString::createFromAscii("_REF");
++	maFieldStack.back().SetBookmarkName(aBookmarkName);
++	maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ECMA_PAGEREF));
++	maFieldStack.back().AddParam(rtl::OUString(), sName);
++	return FLD_TEXT;
++    }
++#endif
++
++
+     SwGetRefField aFld(
+         (SwGetRefFieldType*)rDoc.GetSysFldType( RES_GETREFFLD ), sName,
+         REF_BOOKMARK, 0, REF_PAGE );
+@@ -2767,6 +2852,16 @@ USHORT lcl_GetMaxValidWordTOCLevel(const SwForm &rForm)
+ 
+ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
+ {
++#if defined(WW_NATIVE_TOC)
++    if (1) {
++	::rtl::OUString aBookmarkName=::rtl::OUString::createFromAscii("_TOC");
++	maFieldStack.back().SetBookmarkName(aBookmarkName);
++	maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ECMA_TOC));
++//     maFieldStack.back().AddParam(::rtl::OUString::createFromAscii("Description"), aFormula.sToolTip);
++	return FLD_TEXT;
++    }
++#endif
++
+     if (pF->nLRes < 3)
+         return FLD_TEXT;      // ignore (#i25440#)
+ 
+@@ -3285,6 +3380,16 @@ eF_ResT SwWW8ImplReader::Read_F_Shape(WW8FieldDesc* /*pF*/, String& /*rStr*/)
+ 
+ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr )
+ {
++#if defined(WW_NATIVE_TOC)
++    if (1) {
++	::rtl::OUString aBookmarkName=::rtl::OUString::createFromAscii("_HYPERLINK");
++	maFieldStack.back().SetBookmarkName(aBookmarkName);
++	maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ECMA_HYPERLINK));
++//     maFieldStack.back().AddParam(::rtl::OUString::createFromAscii("Description"), aFormula.sToolTip);
++	return FLD_TEXT;
++    }
++#endif
++
+     String sURL, sTarget, sMark;
+     bool bDataImport = false;
+     //HYPERLINk "filename" [switches]
+diff --git sw/source/ui/docvw/edtwin.cxx sw/source/ui/docvw/edtwin.cxx
+index 2306214..6baa2d6 100644
+--- sw/source/ui/docvw/edtwin.cxx
++++ sw/source/ui/docvw/edtwin.cxx
+@@ -152,6 +152,7 @@
+ 
+ #include <IMark.hxx>
+ #include <doc.hxx>
++#include <ecmaflds.hxx>
+ 
+ #include "PostItMgr.hxx"
+ #include "postit.hxx"
+@@ -161,6 +162,7 @@
+ //#define TEST_FOR_BUG91313
+ #endif
+ 
++using namespace sw::mark;
+ using namespace ::com::sun::star;
+ 
+ /*--------------------------------------------------------------------
+@@ -4199,7 +4201,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
+ 
+                         SwContentAtPos aCntntAtPos( SwContentAtPos::SW_CLICKFIELD |
+                                                     SwContentAtPos::SW_INETATTR |
+-                                                    SwContentAtPos::SW_SMARTTAG );
++                                                    SwContentAtPos::SW_SMARTTAG  | SwContentAtPos::SW_FORMCTRL);
+ 
+                         if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, TRUE ) )
+                         {
+@@ -4220,7 +4222,33 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
+                                     if ( bExecSmarttags && SwSmartTagMgr::Get().IsSmartTagsEnabled() )
+                                         rView.ExecSmartTagPopup( aDocPt );
+                             }
+-                            else // if ( SwContentAtPos::SW_INETATTR == aCntntAtPos.eCntntAtPos )
++                            else if ( SwContentAtPos::SW_FORMCTRL == aCntntAtPos.eCntntAtPos )
++                            {
++                				ASSERT( aCntntAtPos.aFnd.pFldmark != NULL, "where is my field ptr???");
++				                if ( aCntntAtPos.aFnd.pFldmark != NULL) 
++                                {
++				                    IFieldmark *fieldBM = const_cast< IFieldmark* > ( aCntntAtPos.aFnd.pFldmark );
++                				    SwDocShell* pDocSh = rView.GetDocShell();
++				                    SwDoc *pDoc=pDocSh->GetDoc();
++                				    if (fieldBM->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX ) ) 
++                                    {
++    			                		bool isChecked = fieldBM->getParam( ECMA_FORMCHECKBOX_CHECKED ).second.compareToAscii("on") == 0;
++                	    				isChecked = !isChecked; // swap it...
++		    	                		fieldBM->addParam( 
++                                                rtl::OUString::createFromAscii( ECMA_FORMCHECKBOX_CHECKED ),
++                                                rtl::OUString::createFromAscii( isChecked?"on":"off" ) );
++                			    		fieldBM->invalidate();
++				                    	rSh.InvalidateWindows( rView.GetVisArea() );
++                				    } else if (fieldBM->GetFieldname().equalsAscii( ECMA_FORMDROPDOWN) ) {
++				                	    rView.ExecFieldPopup( aDocPt, fieldBM );
++                    					fieldBM->invalidate();
++	    		                		rSh.InvalidateWindows( rView.GetVisArea() );
++                				    } else {
++		    	                		// unknown type..
++                				    }
++				                }
++            			    }
++			    else // if ( SwContentAtPos::SW_INETATTR == aCntntAtPos.eCntntAtPos )
+                             {
+                                 if ( bExecHyperlinks )
+                                     rSh.ClickToINetAttr( *(SwFmtINetFmt*)aCntntAtPos.aFnd.pAttr, nFilter );
+diff --git sw/source/ui/inc/view.hxx sw/source/ui/inc/view.hxx
+index 459346d..75e5b6e 100644
+--- sw/source/ui/inc/view.hxx
++++ sw/source/ui/inc/view.hxx
+@@ -42,6 +42,7 @@
+ #include <swtypes.hxx>
+ #include <shellid.hxx>
+ #include <layout/layout.hxx>
++#include <IMark.hxx>
+ 
+ class SwBaseShell;
+ class Button;
+@@ -94,6 +95,7 @@ struct SwConversionArgs;
+ class Graphic;
+ class GraphicFilter;
+ class SwPostItMgr;
++class SwFieldBookmark;
+ 
+ namespace com{ namespace sun { namespace star {
+     namespace view{ class XSelectionSupplier; }
+@@ -465,7 +467,7 @@ public:
+ 
+     DECL_LINK( SpellError, LanguageType * );
+     BOOL 			ExecSpellPopup( const Point& rPt );
+-
++    BOOL            ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM );
+     // SMARTTAGS
+     BOOL            ExecSmartTagPopup( const Point& rPt );
+ 
+diff --git sw/source/ui/inc/wrtsh.hxx sw/source/ui/inc/wrtsh.hxx
+index f9d49cd..b68e16d 100644
+--- sw/source/ui/inc/wrtsh.hxx
++++ sw/source/ui/inc/wrtsh.hxx
+@@ -35,6 +35,7 @@
+ #include <fesh.hxx>
+ #include <sortopt.hxx>
+ #include <swurl.hxx>
++#include <IMark.hxx>
+ 
+ class Window;
+ class OutputDevice;
+@@ -320,6 +321,9 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
+     void	InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
+     BOOL	UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
+ 
++        //  new fields
++	BOOL	UpdateField( sw::mark::IFieldmark &fieldBM);
++
+     // Numerierung und Bullets
+     /**
+        Turns on numbering or bullets.
+diff --git sw/source/ui/uiview/viewling.cxx sw/source/ui/uiview/viewling.cxx
+index 304457a..39d1595 100644
+--- sw/source/ui/uiview/viewling.cxx
++++ sw/source/ui/uiview/viewling.cxx
+@@ -114,9 +114,12 @@
+ #include <svx/dialogs.hrc>
+ 
+ #include <unomid.h>
++#include <IMark.hxx>
++#include <ecmaflds.hxx>
+ 
+ #include <memory>
+ 
++using namespace sw::mark;
+ using ::rtl::OUString;
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::beans;
+@@ -931,3 +934,136 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt )
+     return bRet;
+ }
+ 
++
++
++class SwFieldPopup : public PopupMenu
++{
++public:
++    SwFieldPopup()  {
++	InsertItem(1, ::rtl::OUString::createFromAscii("Hello"));
++    }
++};
++
++class SwFieldListBox : public ListBox
++{
++public:
++    SwFieldListBox(Window* pParent) : ListBox(pParent /*, WB_DROPDOWN*/) {
++    }
++
++    void *GetImplWin() {
++	return NULL; //FIXME!!!
++//	return mpImplWin;
++    }
++
++protected:
++    virtual void LoseFocus() {
++//	printf("ListBox: lose focus!!\n");
++	ListBox::LoseFocus();
++    }    
++
++    virtual void Select() {
++//	printf("SELECT!!! IsTravelSelect=%i\n", IsTravelSelect());
++	ListBox::Select();
++    }
++};
++
++class SwFieldDialog : public Dialog
++{
++private:
++    SwFieldListBox aListBox;
++    Edit aText;
++    int selection;
++
++    DECL_LINK( MyListBoxHandler, ListBox * );
++
++public:
++    SwFieldDialog(Window* parent, IFieldmark *fieldBM) : Dialog(parent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ), aListBox(this), aText(this, WB_RIGHT | WB_READONLY), selection(-1) {
++
++	assert(fieldBM!=NULL);
++	if (fieldBM!=NULL) {
++	    int items=fieldBM->getNumOfParams();	    
++	    for(int i=0;i<items;i++) {
++		IFieldmark::ParamPair_t p=fieldBM->getParam(i);
++		if (p.first.compareToAscii(ECMA_FORMDROPDOWN_LISTENTRY)==0) {
++		    aListBox.InsertEntry(p.second);
++		}
++	    }
++	}
++	Size lbSize=aListBox.GetOptimalSize(WINDOWSIZE_PREFERRED);
++	lbSize.Width()+=50;
++	lbSize.Height()+=20;
++	aListBox.SetSizePixel(lbSize);
++	aListBox.SetSelectHdl( LINK( this, SwFieldDialog, MyListBoxHandler ) );
++	aListBox.Show();
++	aText.SetText(rtl::OUString::createFromAscii("Cancel"));
++	Size tSize=aText.GetOptimalSize(WINDOWSIZE_PREFERRED);
++	aText.SetSizePixel(Size(lbSize.Width(), tSize.Height()));
++	aText.SetPosPixel(Point(0, lbSize.Height()));     	
++	aText.Show();
++	SetSizePixel(Size(lbSize.Width(), lbSize.Height()+tSize.Height()));	
++//	SetSizePixel(Size(200, 200));
++    }
++
++    int getSelection() {
++	return selection;
++    }
++protected:
++    /*
++    virtual void LoseFocus() {
++	printf("lose focus!!\n");
++	Dialog::LoseFocus();
++	printf("close:\n");
++	EndDialog(8);
++    }
++    */
++
++    virtual long PreNotify( NotifyEvent& rNEvt ) {
++	if (rNEvt.GetType() == EVENT_LOSEFOCUS && aListBox.GetImplWin()==rNEvt.GetWindow()) {
++	    EndDialog(8);
++	    return 1;	   
++	}
++	if (rNEvt.GetType() == EVENT_KEYINPUT) {
++//	    printf("PreNotify::KEYINPUT\n");
++	}
++	return Dialog::PreNotify(rNEvt);
++    }
++};
++
++IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox )
++{
++//    printf("### DROP DOWN SELECT... IsTravelSelect=%i\n", pBox->IsTravelSelect());
++    if (pBox->IsTravelSelect()) {
++	return 0;
++    } else {
++	this->selection=pBox->GetSelectEntryPos();
++	EndDialog(9); //@TODO have meaningfull returns...
++	return 1;
++    }
++}
++
++
++BOOL SwView::ExecFieldPopup( const Point& rPt, IFieldmark *fieldBM )
++{
++    sal_Bool bRet = sal_False;
++    const sal_Bool bOldViewLock = pWrtShell->IsViewLocked();
++    pWrtShell->LockView( sal_True );
++    pWrtShell->Push();
++
++	bRet=sal_True;
++	const Point aPixPos = GetEditWin().LogicToPixel( rPt );
++
++	SwFieldDialog aFldDlg(pEditWin, fieldBM);
++	aFldDlg.SetPosPixel(pEditWin->OutputToScreenPixel(aPixPos));
++
++	short ret=aFldDlg.Execute();
++	int selection=aFldDlg.getSelection();
++	if (selection>=0) {
++	    fieldBM->addParam(ECMA_FORMDROPDOWN_RESULT, selection);
++	}
++
++    pWrtShell->Pop( sal_False );
++    pWrtShell->LockView( bOldViewLock );
++
++    return bRet;
++}
++
+diff --git sw/source/ui/wrtsh/wrtsh1.cxx sw/source/ui/wrtsh/wrtsh1.cxx
+index 75a0bd1..3b9e43b 100644
+--- sw/source/ui/wrtsh/wrtsh1.cxx
++++ sw/source/ui/wrtsh/wrtsh1.cxx
+@@ -113,6 +113,7 @@
+ #include <paratr.hxx>
+ #include <ndtxt.hxx>
+ #include <svx/acorrcfg.hxx>
++#include <IMark.hxx>
+ 
+ // -> #111827#
+ #include <SwRewriter.hxx>
+@@ -127,6 +128,7 @@
+ 
+ #include "PostItMgr.hxx"
+ 
++using namespace sw::mark;
+ using namespace com::sun::star;
+ 
+ #define COMMON_INI_LIST \
+@@ -1755,6 +1757,12 @@ SwWrtShell::SwWrtShell( SwWrtShell& rSh, Window *_pWin, SwView &rShell )
+ 
+     SetSfxViewShell( (SfxViewShell *)&rShell );
+     SetFlyMacroLnk( LINK(this, SwWrtShell, ExecFlyMac) );
++
++	// place the cursor on the first field...
++	IFieldmark *pBM = NULL;
++	if ( IsFormProtected() && ( pBM = GetFieldmarkAfter( ) ) !=NULL ) {
++	    GotoFieldmark(pBM);
++	}
+ }
+ 
+ 
+diff --git sw/source/ui/wrtsh/wrtsh2.cxx sw/source/ui/wrtsh/wrtsh2.cxx
+index 28fd1b6..093f084 100644
+--- sw/source/ui/wrtsh/wrtsh2.cxx
++++ sw/source/ui/wrtsh/wrtsh2.cxx
+@@ -239,6 +239,13 @@ BOOL SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
+     return bResult;
+ }
+ 
++BOOL SwWrtShell::UpdateField( sw::mark::IFieldmark &fieldBM )
++{
++    return SwEditShell::UpdateField(fieldBM);
++}
++
++
++
+     // ein Klick aus das angegebene Feld. Der Cursor steht auf diesem.
+     // Fuehre die vor definierten Aktionen aus.
+ 
+diff --git xmloff/inc/xmloff/ecmaflds.hxx xmloff/inc/xmloff/ecmaflds.hxx
+new file mode 100644
+index 0000000..23276b1
+--- /dev/null
++++ xmloff/inc/xmloff/ecmaflds.hxx
+@@ -0,0 +1,68 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: $
++ * $Revision: $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++/* and also:
++ * Author: Florian Reuter <freuter@novell.com>
++ * Copyright 2008 by Novell, Inc.
++*/
++#ifndef _ECMAFLDS_HXX
++#define _ECMAFLDS_HXX
++
++
++#define ECMA_FORMTEXT "ecma.office-open-xml.field.FORMTEXT"
++#define ECMA_FORMTEXT_NAME "name"
++#define ECMA_FORMTEXT_HELPTEXT "helpText"
++#define ECMA_FORMTEXT_STATUSTEXT "statusText"
++#define ECMA_FORMTEXT_DEFAULT "default"
++#define ECMA_FORMTEXT_FORMAT "format"
++#define ECMA_FORMTEXT_MAXLENGTH "maxLength"
++#define ECMA_FORMTEXT_TYPE "type"
++
++#define ECMA_FORMCHECKBOX "ecma.office-open-xml.field.FORMCHECKBOX"
++#define ECMA_FORMCHECKBOX_NAME "name"
++#define ECMA_FORMCHECKBOX_HELPTEXT "helpText"
++#define ECMA_FORMCHECKBOX_STATUSTEXT "statusText"
++#define ECMA_FORMCHECKBOX_CHECKED "checked"
++#define ECMA_FORMCHECKBOX_DEFAULT "default"
++#define ECMA_FORMCHECKBOX_SIZE "size"
++#define ECMA_FORMCHECKBOX_SIZEAUTO "sizeAuto"
++
++
++#define ECMA_FORMDROPDOWN "ecma.office-open-xml.field.FORMDROPDOWN"
++#define ECMA_FORMDROPDOWN_DEFAULT "default"
++#define ECMA_FORMDROPDOWN_LISTENTRY "listEntry"
++#define ECMA_FORMDROPDOWN_RESULT "result"
++
++#define ECMA_TOC "ecma.office-open-xml.field.TOC"
++
++#define ECMA_HYPERLINK "ecma.office-open-xml.field.HYPERLINK"
++
++#define ECMA_PAGEREF "ecma.office-open-xml.field.PAGEREF"
++
++#endif /*  _ECMAFLDS_HXX */
+diff --git xmloff/source/text/XMLTextMarkImportContext.cxx xmloff/source/text/XMLTextMarkImportContext.cxx
+index 75bc4c8..6d1b7fe 100644
+--- xmloff/source/text/XMLTextMarkImportContext.cxx
++++ xmloff/source/text/XMLTextMarkImportContext.cxx
+@@ -41,6 +41,7 @@
+ #include <xmloff/xmltoken.hxx>
+ #include <xmloff/xmlimp.hxx>
+ #include <xmloff/nmspmap.hxx>
++#include <xmloff/ecmaflds.hxx>
+ #include "xmlnmspe.hxx"
+ #include <com/sun/star/xml/sax/XAttributeList.hpp>
+ #include <com/sun/star/text/XTextContent.hpp>
+@@ -136,6 +137,33 @@ static SvXMLEnumMapEntry __READONLY_DATA lcl_aMarkTypeMap[] =
+     { XML_TOKEN_INVALID,    		0 },
+ };
+ 
++
++static const char *lcl_getFormFieldmarkName(rtl::OUString &name) 
++{
++    static const char sCheckbox[]=ECMA_FORMCHECKBOX;
++    static const char sFormDropDown[]=ECMA_FORMDROPDOWN;
++    if (name.compareToAscii("msoffice.field.FORMCHECKBOX")==0)
++	return sCheckbox;
++    else if (name.compareToAscii(ECMA_FORMCHECKBOX)==0)
++	return sCheckbox;
++    if (name.compareToAscii(ECMA_FORMDROPDOWN)==0)
++	return sFormDropDown;
++    else
++	return NULL;
++}
++
++static rtl::OUString lcl_getFieldmarkName(rtl::OUString &name) 
++{
++    static const char sFormtext[]=ECMA_FORMTEXT;
++    if (name.compareToAscii("msoffice.field.FORMTEXT")==0)
++	return rtl::OUString::createFromAscii(sFormtext);
++    else if (name.compareToAscii(ECMA_FORMTEXT)==0)
++	return rtl::OUString::createFromAscii(sFormtext);
++    else
++	return name;
++}
++
++
+ void XMLTextMarkImportContext::StartElement(
+     const Reference<XAttributeList> & xAttrList)
+ {
+@@ -187,7 +215,8 @@ void XMLTextMarkImportContext::EndElement()
+                 case TypeFieldmark:
+                 case TypeBookmark:
+                     {
+-                        bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmark && sFieldName.compareToAscii("msoffice.field.FORMCHECKBOX")==0); // for now only import FORMCHECKBOX boxes
++					        const char *formFieldmarkName=lcl_getFormFieldmarkName(sFieldName);
++						bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmark && formFieldmarkName!=NULL); //@TODO handle abbreviation cases..
+                         // export point bookmark
+                         Reference<XInterface> xIfc=CreateAndInsertMark(GetImport(),
+                                         (bImportAsField?sAPI_formfieldmark:sAPI_bookmark),
+@@ -198,10 +227,8 @@ void XMLTextMarkImportContext::EndElement()
+                             if (xIfc.is() && bImportAsField) {
+                                 // setup fieldmark...
+                                 Reference< ::com::sun::star::text::XFormField> xFormField(xIfc, UNO_QUERY);
+-                                xFormField->setType(1); // Checkbox...
++								xFormField->setFieldType(rtl::OUString::createFromAscii(formFieldmarkName)); 
+                                 if (xFormField.is() && rHelper.hasCurrentFieldCtx()) {
+-//									xFormField->setDescription(::rtl::OUString::createFromAscii("HELLO CHECKBOX"));
+-//									xFormField->setRes(1); 
+                                     rHelper.setCurrentFieldParamsTo(xFormField);
+                                 }
+                             }
+@@ -248,10 +275,6 @@ void XMLTextMarkImportContext::EndElement()
+                                 xInsertionCursor, UNO_QUERY);
+ 
+                             bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmarkEnd && rHelper.hasCurrentFieldCtx());
+-                            if (bImportAsField) {
+-                                ::rtl::OUString currentFieldType=rHelper.getCurrentFieldType();
+-                                bImportAsField=currentFieldType.compareToAscii("msoffice.field.FORMTEXT")==0; // for now only import FORMTEXT boxes
+-                            }
+ 
+                             // insert reference
+                             Reference<XInterface> xIfc=CreateAndInsertMark(GetImport(),
+@@ -264,10 +287,12 @@ void XMLTextMarkImportContext::EndElement()
+                                 if (xIfc.is() && bImportAsField) {
+                                     // setup fieldmark...
+                                     Reference< ::com::sun::star::text::XFormField> xFormField(xIfc, UNO_QUERY);
+-                                    xFormField->setType(0); // Text
+                                     if (xFormField.is() && rHelper.hasCurrentFieldCtx()) {
+-                                        rHelper.setCurrentFieldParamsTo(xFormField);
+-//									xFormField->setDescription(::rtl::OUString::createFromAscii("HELLO"));
++									    rtl::OUString givenTypeName=rHelper.getCurrentFieldType();
++									    rtl::OUString fieldmarkTypeName=lcl_getFieldmarkName(givenTypeName);
++									    
++									    xFormField->setFieldType(fieldmarkTypeName); 
++									    rHelper.setCurrentFieldParamsTo(xFormField);
+                                     }
+                                 }
+                                 rHelper.popFieldCtx();
+diff --git xmloff/source/text/txtimp.cxx xmloff/source/text/txtimp.cxx
+index 2c214fc..18f7e55 100644
+--- xmloff/source/text/txtimp.cxx
++++ xmloff/source/text/txtimp.cxx
+@@ -2310,14 +2310,10 @@ void XMLTextImportHelper::setCurrentFieldParamsTo(::com::sun::star::uno::Referen
+     if (!aFieldStack.empty() && xFormField.is()) {
+         field_params_t &params=aFieldStack.top().second;
+         for (field_params_t::iterator i=params.begin();i!=params.end();i++) {
+-            rtl::OUString name=i->first;
+-            rtl::OUString value=i->second;
+-            if (name.compareToAscii("Description")==0){
+-                xFormField->setDescription(value);
+-            } else if (name.compareToAscii("Result")==0){
+-                xFormField->setRes((sal_Int16)value.toInt32());
+-            }
+-
++		    rtl::OString aOString1 = ::rtl::OUStringToOString (i->first, RTL_TEXTENCODING_UTF8);
++		    rtl::OString aOString2 = ::rtl::OUStringToOString (i->second, RTL_TEXTENCODING_UTF8);
++		    /* printf("param[\"%s\"]=\"%s\"\n", aOString1.getStr(), aOString2.getStr()); */
++		    xFormField->addParam(i->first, i->second, false);
+         }
+     }
+ }
+diff --git xmloff/source/text/txtparae.cxx xmloff/source/text/txtparae.cxx
+index 3fe4ffd..85ade59 100644
+--- xmloff/source/text/txtparae.cxx
++++ xmloff/source/text/txtparae.cxx
+@@ -2239,14 +2239,16 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
+                 }
+                 Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
+                 if (xFormField.is()) {
+-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, ::rtl::OUString::createFromAscii("msoffice.field.FORMTEXT"));
++					GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType());
+                 }
+                 GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, sal_False);
+                 if (xFormField.is()) {
+-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, ::rtl::OUString::createFromAscii("Description"));
+-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, xFormField->getDescription());
++				    for(sal_Int16 i=0;i<xFormField->getParamCount();i++) {
++					GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, xFormField->getParamName(i));
++					GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, xFormField->getParamValue(i));
+                     GetExport().StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
+                     GetExport().EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
++				    }
+                 }
+                 GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, sal_False);
+             }
+@@ -2263,27 +2265,16 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
+                 }
+                 Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
+                 if (xFormField.is()) {
+-                    sal_Int16 fftype=xFormField->getType();
+-                    switch (fftype) {
+-                        case 1:
+-                            GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, ::rtl::OUString::createFromAscii("msoffice.field.FORMCHECKBOX"));
+-                        break;
+-                        default:
+-                            DBG_ASSERT(false, "hey ---- add your export stuff here!!");
+-                        break;
+-                    }
++				    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType());
+                 }
+                 GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, sal_False);
+                 if (xFormField.is()) {
+-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, ::rtl::OUString::createFromAscii("Description"));
+-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, xFormField->getDescription());
+-                    GetExport().StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
+-                    GetExport().EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
+-
+-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, ::rtl::OUString::createFromAscii("Result"));
+-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, ::rtl::OUString::valueOf((sal_Int32 )xFormField->getRes()));
++				    for(sal_Int16 i=0;i<xFormField->getParamCount();i++) {
++					GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, xFormField->getParamName(i));
++					GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, xFormField->getParamValue(i));
+                     GetExport().StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
+                     GetExport().EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
++				    }
+                 }
+                 GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, sal_False);
+             }
diff --git a/applied_patches/0620-sw-import-html-controls.diff b/applied_patches/0505-sw-import-html-controls.diff
similarity index 100%
rename from applied_patches/0620-sw-import-html-controls.diff
rename to applied_patches/0505-sw-import-html-controls.diff
diff --git a/applied_patches/0621-svx-hacky-htmlselect-control-import.diff b/applied_patches/0506-svx-hacky-htmlselect-control-import.diff
similarity index 100%
rename from applied_patches/0621-svx-hacky-htmlselect-control-import.diff
rename to applied_patches/0506-svx-hacky-htmlselect-control-import.diff
diff --git a/applied_patches/0622-sd-slideshow-slideshowview-transformation-fix.diff b/applied_patches/0507-sd-slideshow-slideshowview-transformation-fix.diff
similarity index 100%
rename from applied_patches/0622-sd-slideshow-slideshowview-transformation-fix.diff
rename to applied_patches/0507-sd-slideshow-slideshowview-transformation-fix.diff
diff --git a/applied_patches/0623-sd-view-zoom-fix.diff b/applied_patches/0508-sd-view-zoom-fix.diff
similarity index 100%
rename from applied_patches/0623-sd-view-zoom-fix.diff
rename to applied_patches/0508-sd-view-zoom-fix.diff
diff --git a/applied_patches/0624-sd-custom-show-fix.diff b/applied_patches/0509-sd-custom-show-fix.diff
similarity index 100%
rename from applied_patches/0624-sd-custom-show-fix.diff
rename to applied_patches/0509-sd-custom-show-fix.diff
diff --git a/applied_patches/0625-fit-list-to-size.diff b/applied_patches/0510-fit-list-to-size.diff
similarity index 100%
rename from applied_patches/0625-fit-list-to-size.diff
rename to applied_patches/0510-fit-list-to-size.diff
diff --git a/applied_patches/0626-fit-list-to-size-ui.diff b/applied_patches/0511-fit-list-to-size-ui.diff
similarity index 100%
rename from applied_patches/0626-fit-list-to-size-ui.diff
rename to applied_patches/0511-fit-list-to-size-ui.diff
diff --git a/applied_patches/0627-fit-list-to-size-style-defaults.diff b/applied_patches/0512-fit-list-to-size-style-defaults.diff
similarity index 100%
rename from applied_patches/0627-fit-list-to-size-style-defaults.diff
rename to applied_patches/0512-fit-list-to-size-style-defaults.diff
diff --git a/applied_patches/0513-fit-list-to-size-popup.diff b/applied_patches/0513-fit-list-to-size-popup.diff
new file mode 100644
index 000000000..a18a9e49c
--- /dev/null
+++ b/applied_patches/0513-fit-list-to-size-popup.diff
@@ -0,0 +1,288 @@
+ sd/inc/app.hrc                                     |    1 
+ sd/sdi/_drvwsh.sdi                                 |    5 ++
+ sd/sdi/sdraw.sdi                                   |   27 +++++++++++++
+ sd/source/ui/app/menuids_tmpl.src                  |    8 ++++
+ sd/source/ui/app/popup2_tmpl.src                   |   43 ++++++++++++++++++++
+ sd/source/ui/inc/res_bmp.hrc                       |    2 +
+ sd/source/ui/view/drviews2.cxx                     |   25 ++++++++++++
+ sd/source/ui/view/drviews4.cxx                     |    6 ++-
+ sd/source/ui/view/drviewsj.cxx                     |   19 ++++++---
+ .../Linux_X86_64rc                                 |    2 -
+ .../unorc                                          |    2 -
+ 11 files changed, 130 insertions(+), 10 deletions(-)
+
+
+diff --git sd/inc/app.hrc sd/inc/app.hrc
+index 83cfa86..9bd8aee 100644
+--- sd/inc/app.hrc
++++ sd/inc/app.hrc
+@@ -459,11 +459,12 @@
+ #define SID_DISPLAY_MASTER_OBJECTS          (SID_SD_START+437)
+ #define SID_INSERTPAGE_LAYOUT_MENU          (SID_SD_START+438)
+ #define SID_TP_EDIT_MASTER					(SID_SD_START+439)
++#define SID_OUTLINE_TEXT_AUTOFIT            (SID_SD_START+440)
+ 
+ // Add companion for the SID_HIDE_SLIDE (that is defined in svx)
+-#define SID_SHOW_SLIDE                      (SID_SD_START+440)
++#define SID_SHOW_SLIDE                      (SID_SD_START+441)
+ 
+-#define SID_ADD_MOTION_PATH					(SID_SD_START+441)
+-#define SID_TABLE_TOOLBOX					(SID_SD_START+442)
++#define SID_ADD_MOTION_PATH					(SID_SD_START+442)
++#define SID_TABLE_TOOLBOX					(SID_SD_START+443)
+ 
+ #endif
+diff --git sd/sdi/_drvwsh.sdi sd/sdi/_drvwsh.sdi
+index c895d2e..44a6ae0 100644
+--- sd/sdi/_drvwsh.sdi
++++ sd/sdi/_drvwsh.sdi
+@@ -665,6 +665,11 @@ interface DrawView
+         ExecMethod = FuPermanent ;
+         StateMethod = GetMenuState ;
+     ]
++    SID_OUTLINE_TEXT_AUTOFIT // ole : no, status : ?
++    [
++        ExecMethod = FuTemporary ;
++        StateMethod = GetMenuState ;
++    ]
+     SID_TEXT_FITTOSIZE_VERTICAL // ole : no, status : ?
+     [
+         ExecMethod = FuPermanent ;
+diff --git sd/sdi/sdraw.sdi sd/sdi/sdraw.sdi
+index c4d7bad..fae94ab 100644
+--- sd/sdi/sdraw.sdi
++++ sd/sdi/sdraw.sdi
+@@ -6377,6 +6377,33 @@ SfxBoolItem TextFitToSizeTool SID_TEXT_FITTOSIZE
+ ]
+ 
+ //--------------------------------------------------------------------------
++SfxBoolItem TextAutoFitToSize SID_OUTLINE_TEXT_AUTOFIT
++
++[
++	/* flags: */  
++	AutoUpdate = TRUE, 
++	Cachable = Cachable, 
++	FastCall = FALSE, 
++	HasCoreId = FALSE, 
++	HasDialog = FALSE, 
++	ReadOnlyDoc = FALSE, 
++	Toggle = FALSE, 
++	Container = FALSE, 
++	RecordAbsolute = FALSE, 
++	RecordPerSet;
++	Synchron;
++
++	Readonly = FALSE, 
++
++	/* config: */ 
++	AccelConfig = TRUE, 
++	MenuConfig = TRUE, 
++	StatusBarConfig = FALSE, 
++	ToolBoxConfig = TRUE, 
++	GroupId = GID_FORMAT;
++]
++
++//--------------------------------------------------------------------------
+ TbxImageItem TextToolbox SID_DRAWTBX_TEXT
+ 
+ [
+diff --git sd/source/ui/app/menuids_tmpl.src sd/source/ui/app/menuids_tmpl.src
+index feb34df..d35dc60 100644
+--- sd/source/ui/app/menuids_tmpl.src
++++ sd/source/ui/app/menuids_tmpl.src
+@@ -307,6 +307,14 @@
+         Text [ en-US ] = "~Text..." ; \
+ 	};
+ 
++#define MN_OUTLINE_TEXT_AUTOFIT \
++    MenuItem\
++    {\
++        Identifier = SID_OUTLINE_TEXT_AUTOFIT ; \
++        HelpID = SID_OUTLINE_TEXT_AUTOFIT ; \
++        Text [ en-US ] = "~Autofit Text" ; \
++	};
++
+ #define MN_CONNECTION \
+     MenuItem\
+     {\
+diff --git sd/source/ui/app/popup2_tmpl.src sd/source/ui/app/popup2_tmpl.src
+index 63ad153..c5340a9 100644
+--- sd/source/ui/app/popup2_tmpl.src
++++ sd/source/ui/app/popup2_tmpl.src
+@@ -82,6 +82,49 @@
+ };
+ 
+ //
++// OUTLINETEXTOBJ_POPUP
++//
++#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
++	Menu RID_DRAW_OUTLINETEXTOBJ_POPUP
++#elif  SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
++	Menu RID_GRAPHIC_OUTLINETEXTOBJ_POPUP
++#endif
++{
++	ItemList =
++	{
++		MN_SET_DEFAULT
++		SEPARATOR
++		MN_LINE
++		MN_AREA
++		MN_TEXTATTR
++		MN_OUTLINE_TEXT_AUTOFIT
++		MN_TRANSFORM
++		MN_FONTWORK
++		SEPARATOR
++		MN_CHAR_PARAGRAPH
++		SEPARATOR
++		MN_POSITION
++		MN_OBJECT_ALIGN
++		MN_DISTRIBUTE
++		MNSUB_CONVERT
++
++		//-#i68101#----------------------
++		SEPARATOR
++		MN_OBJECT_TITLE_DESCRIPTION
++		MN_NAME_GROUP
++		//-#i68101#----------------------
++
++#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
++		SEPARATOR
++		MN_EFFECT
++		MN_ACTION
++#endif
++		SEPARATOR
++		MN_STYLEDT
++	};
++};
++
++//
+ // GEOMOBJ_POPUP
+ //
+ #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
+diff --git sd/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc
+index d4914a3..8565e1b 100644
+--- sd/source/ui/inc/res_bmp.hrc
++++ sd/source/ui/inc/res_bmp.hrc
+@@ -301,6 +301,9 @@
+ 
+ #define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP	RID_APP_START+93
+ 
++#define RID_DRAW_OUTLINETEXTOBJ_POPUP		RID_APP_START+95
++#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP	RID_APP_START+96
++
+ /*
+  * Pointer (Mauszeiger)
+  */
+diff --git sd/source/ui/view/drviews2.cxx sd/source/ui/view/drviews2.cxx
+index f55b303..605716f 100644
+--- sd/source/ui/view/drviews2.cxx
++++ sd/source/ui/view/drviews2.cxx
+@@ -175,6 +175,31 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
+ 
+ 	switch ( nSId )
+ 	{
++        case SID_OUTLINE_TEXT_AUTOFIT:
++        {
++            SfxUndoManager* pUndoManager = GetDocSh()->GetUndoManager();
++            SdrObject* pObj = NULL;
++            const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
++            if( rMarkList.GetMarkCount() == 1 )
++            {
++                pUndoManager->EnterListAction( String(), String() );
++                mpDrawView->BegUndo();
++
++                pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
++                bool bSet = ((const SdrTextFitToSizeTypeItem*)pObj->GetMergedItemSet().GetItem(SDRATTR_TEXT_FITTOSIZE))->GetValue() != SDRTEXTFIT_NONE;
++
++                mpDrawView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj));
++
++                pObj->SetMergedItem(SdrTextFitToSizeTypeItem(bSet ? SDRTEXTFIT_NONE : SDRTEXTFIT_AUTOFIT));
++				
++                mpDrawView->EndUndo();
++                pUndoManager->LeaveListAction();
++            }
++            Cancel();
++            rReq.Done();
++        }
++        break;
++
+ 		// Flaechen und Linien-Attribute:
+ 		// Sollten (wie StateMethode) eine eigene
+ 		// Execute-Methode besitzen
+diff --git sd/source/ui/view/drviews4.cxx sd/source/ui/view/drviews4.cxx
+index 66482d4..8a9b122 100644
+--- sd/source/ui/view/drviews4.cxx
++++ sd/source/ui/view/drviews4.cxx
+@@ -669,9 +669,13 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
+ 							{
+ 								switch ( nId )
+ 								{
++									case OBJ_OUTLINETEXT:
++										nSdResId = bGraphicShell ? RID_GRAPHIC_OUTLINETEXTOBJ_POPUP :
++																	RID_DRAW_OUTLINETEXTOBJ_POPUP;
++										break;
++
+ 									case OBJ_CAPTION:
+ 									case OBJ_TITLETEXT:
+-									case OBJ_OUTLINETEXT:
+ 									case OBJ_TEXT:
+ 										nSdResId = bGraphicShell ? RID_GRAPHIC_TEXTOBJ_POPUP :
+ 																	RID_DRAW_TEXTOBJ_POPUP;
+diff --git sd/source/ui/view/drviewsj.cxx sd/source/ui/view/drviewsj.cxx
+index 5892f63..eceea7a 100644
+--- sd/source/ui/view/drviewsj.cxx
++++ sd/source/ui/view/drviewsj.cxx
+@@ -213,9 +213,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
+ 				rSet.DisableItem( SID_CHANGEPOLYGON );
+ 			}
+ 
+-			if(nInv == SdrInventor && (nId == OBJ_TITLETEXT || nId == OBJ_OUTLINETEXT))
+-				rSet.DisableItem( SID_TEXTATTR_DLG );
+-
+ 			if(nInv == SdrInventor && nId == OBJ_TABLE )
+ 			{
+ 				rSet.DisableItem( SID_TEXTATTR_DLG );
+@@ -308,6 +305,17 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
+ 			else
+ 				rSet.DisableItem( SID_MODIFY_FIELD );
+ 		}
++		if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTLINE_TEXT_AUTOFIT ) )
++		{
++            bool bSet = false;
++            const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
++            if( rMarkList.GetMarkCount() == 1 )
++            {
++                SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
++                bSet = ((const SdrTextFitToSizeTypeItem*)pObj->GetMergedItemSet().GetItem(SDRATTR_TEXT_FITTOSIZE))->GetValue() != SDRTEXTFIT_NONE;
++            }
++            rSet.Put(SfxBoolItem(SID_OUTLINE_TEXT_AUTOFIT, bSet));
++		}
+ 
+ 		rSet.DisableItem( SID_GROUP );
+ 		rSet.DisableItem( SID_COMBINE );
+@@ -357,7 +365,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
+ 			BOOL bGraf = FALSE;
+ 			BOOL bDrawObj = FALSE;
+ 			BOOL b3dObj = FALSE;
+-			BOOL bTitOutText = FALSE;
+ 			bool bTable = false;
+ 			BOOL bMeasureObj = FALSE;
+ 			BOOL bEdgeObj = FALSE; // Connector
+@@ -397,8 +404,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
+ 
+ 						case OBJ_GRAF: bGraf = TRUE; break;
+ 
+-						case OBJ_TITLETEXT:
+-						case OBJ_OUTLINETEXT: bTitOutText = TRUE; break;
+ 						case OBJ_TABLE: bTable = true; break;
+ 					}
+ 				}
+@@ -446,7 +451,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
+ 			{
+ 				rSet.DisableItem( SID_UNGROUP );
+ 			}
+-			if( bTitOutText || bTable )
++			if( bTable )
+ 				rSet.DisableItem( SID_TEXTATTR_DLG );
+ 
+ 			if( !bMeasureObj )
diff --git a/applied_patches/0514-fit-list-to-size-build-fix.diff b/applied_patches/0514-fit-list-to-size-build-fix.diff
new file mode 100644
index 000000000..981f53f92
--- /dev/null
+++ b/applied_patches/0514-fit-list-to-size-build-fix.diff
@@ -0,0 +1,17 @@
+diff --git svx/source/svdraw/svdotextdecomposition.cxx svx/source/svdraw/svdotextdecomposition.cxx
+index 2cc2385..2905cab 100644
+--- svx/source/svdraw/svdotextdecomposition.cxx
++++ svx/source/svdraw/svdotextdecomposition.cxx
+@@ -1179,9 +1179,11 @@ bool SdrTextObj::impDecomposeAutoFitTextPrimitive(
+ 	aNewTransformB.rotate(fRotate);
+ 	aNewTransformB.translate(aTranslate.getX(), aTranslate.getY());
+ 
++    basegfx::B2DRange aClipRange;
++
+ 	// now break up text primitives.
+ 	impTextBreakupHandler aConverter(rOutliner);
+-	aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB);
++	aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB, aClipRange);
+ 
+ 	// cleanup outliner
+ 	rOutliner.Clear();
diff --git a/applied_patches/0629-sw-nested-positionned-tables-ww8-import-fix.diff b/applied_patches/0515-sw-nested-positionned-tables-ww8-import-fix.diff
similarity index 100%
rename from applied_patches/0629-sw-nested-positionned-tables-ww8-import-fix.diff
rename to applied_patches/0515-sw-nested-positionned-tables-ww8-import-fix.diff
diff --git a/applied_patches/0630-xmloff_dis26300_conformance.diff b/applied_patches/0516-xmloff_dis26300_conformance.diff
similarity index 100%
rename from applied_patches/0630-xmloff_dis26300_conformance.diff
rename to applied_patches/0516-xmloff_dis26300_conformance.diff
diff --git a/applied_patches/0631-lockfile-dont-do-dns-lookup.diff b/applied_patches/0517-lockfile-dont-do-dns-lookup.diff
similarity index 100%
rename from applied_patches/0631-lockfile-dont-do-dns-lookup.diff
rename to applied_patches/0517-lockfile-dont-do-dns-lookup.diff
diff --git a/applied_patches/0632-lockfile-less-symbols.diff b/applied_patches/0518-lockfile-less-symbols.diff
similarity index 100%
rename from applied_patches/0632-lockfile-less-symbols.diff
rename to applied_patches/0518-lockfile-less-symbols.diff
diff --git a/applied_patches/0633-internal-mesa-headers-config_office.diff b/applied_patches/0519-internal-mesa-headers-config_office.diff
similarity index 100%
rename from applied_patches/0633-internal-mesa-headers-config_office.diff
rename to applied_patches/0519-internal-mesa-headers-config_office.diff
diff --git a/applied_patches/0634-internal-mesa-headers-slideshow.diff b/applied_patches/0520-internal-mesa-headers-slideshow.diff
similarity index 100%
rename from applied_patches/0634-internal-mesa-headers-slideshow.diff
rename to applied_patches/0520-internal-mesa-headers-slideshow.diff
diff --git a/applied_patches/0521-autocorrect-accidental-caps-lock-svx.diff b/applied_patches/0521-autocorrect-accidental-caps-lock-svx.diff
deleted file mode 100644
index ec371b170..000000000
--- a/applied_patches/0521-autocorrect-accidental-caps-lock-svx.diff
+++ /dev/null
@@ -1,536 +0,0 @@
---- svx/inc/svx/editeng.hxx.old	2009-04-02 11:03:40.000000000 +0000
-+++ svx/inc/svx/editeng.hxx	2009-04-06 16:42:14.000000000 +0000
-@@ -56,6 +56,7 @@ class Rectangle;
- class SvStream;
- class Link;
- class OutputDevice;
-+class Window;
- class SvUShorts;
- class SfxPoolItem;
- class SvxNumBulletItem;
-@@ -127,7 +128,7 @@ private:
- 	SVX_DLLPRIVATE EditEngine&		operator=( const EditEngine& );
- 
- //#if 0 // _SOLAR__PRIVATE
--	SVX_DLLPRIVATE BOOL				PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
-+	SVX_DLLPRIVATE BOOL				PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL );
- //#endif
- 
- protected:
---- svx/inc/svx/editview.hxx.old	2009-04-02 11:03:40.000000000 +0000
-+++ svx/inc/svx/editview.hxx	2009-04-06 16:42:14.000000000 +0000
-@@ -145,7 +145,7 @@ public:
- 
- 	void			InsertText( const String& rNew, BOOL bSelect = FALSE );
- 
--	BOOL			PostKeyEvent( const KeyEvent& rKeyEvent );
-+	BOOL			PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
- 
- 	BOOL			MouseButtonUp( const MouseEvent& rMouseEvent );
- 	BOOL			MouseButtonDown( const MouseEvent& rMouseEvent );
-@@ -208,7 +208,7 @@ public:
- 
- 	BOOL			MatchGroup();
- 
--	void			CompleteAutoCorrect();
-+	void			CompleteAutoCorrect( Window* pFrameWin = NULL );
- 
- 	EESpellState	StartSpeller( BOOL bMultipleDoc = FALSE );
- 	EESpellState	StartThesaurus();
---- svx/inc/svx/outliner.hxx.old	2009-04-02 11:03:40.000000000 +0000
-+++ svx/inc/svx/outliner.hxx	2009-04-06 16:42:14.000000000 +0000
-@@ -265,7 +265,7 @@ public:
- 	void        Scroll( long nHorzScroll, long nVertScroll );
- 
- 	void        Paint( const Rectangle& rRect );
--	BOOL        PostKeyEvent( const KeyEvent& rKEvt );
-+	BOOL        PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL );
- 	BOOL        MouseButtonDown( const MouseEvent& );
- 	BOOL        MouseButtonUp( const MouseEvent& );
- 	BOOL        MouseMove( const MouseEvent& );
---- svx/inc/svx/svxacorr.hxx.old	2009-04-02 11:03:40.000000000 +0000
-+++ svx/inc/svx/svxacorr.hxx	2009-04-06 16:42:14.000000000 +0000
-@@ -50,6 +50,7 @@ class SvxAutoCorrLanguageTable_Impl;
- class SvxAutoCorrLastFileAskTable_Impl;
- class SotStorageRef;
- class SotStorage;
-+class Window;
- 
- // Flags fuer die AutoKorrekt-Flags
- const long CptlSttSntnc		= 0x00000001;	// Gross-Buchstaben am SatzAnfang
-@@ -65,6 +66,7 @@ const long SaveWordCplSttLst= 0x00000200
- const long SaveWordWrdSttLst= 0x00000400;	// 2 GrB. am WortAnf. auto. aufnehmen
- const long IngnoreDoubleSpace= 0x00000800;	// 2 Spaces ignorieren
- const long ChgSglQuotes		= 0x00001000;	// einfache Quotes ersetzen
-+const long CorrectCapsLock  = 0x00002000;   // Correct accidental use of cAPS LOCK key
- 
- const long ChgWordLstLoad	= 0x20000000;	// Ersetzungsliste geladen
- const long CplSttLstLoad	= 0x40000000;	// Exceptionlist fuer CplStart geladen
-@@ -252,7 +254,7 @@ public:
- 	// fuehre eine AutoKorrektur aus.
- 	// returnt was ausgefuehrt wurde; entsprechend den obigen Flags
- 	ULONG AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
--						xub_StrLen nPos, sal_Unicode cInsChar, BOOL bInsert );
-+						xub_StrLen nPos, sal_Unicode cInsChar, BOOL bInsert, Window* pFrameWin = NULL );
- 
- 	// return fuer die Autotext Expandierung das vorherige Wort, was dem
- 	// AutoCorrect - Algorythmus entspricht.
-@@ -377,6 +379,10 @@ public:
- 								xub_StrLen nSttPos, xub_StrLen nEndPos,
- 								LanguageType eLang  = LANGUAGE_SYSTEM);
- 
-+    bool FnCorrectCapsLock( SvxAutoCorrDoc&, const String&, 
-+                            xub_StrLen nSttPos, xub_StrLen nEndPos,
-+                            LanguageType eLang  = LANGUAGE_SYSTEM );
-+
- 	static long			GetDefaultFlags();
- 
- // returns TRUE for charcters where the function
---- svx/source/cui/autocdlg.cxx
-+++ svx/source/cui/autocdlg.cxx
-@@ -233,7 +233,8 @@ OfaAutocorrOptionsPage::OfaAutocorrOptio
-     sNoDblSpaces        (SVX_RES(STR_NO_DBL_SPACES    )),
-     sHalf               (SVX_RES(ST_FRACTION          )),
- 	sDash    			(SVX_RES(ST_DASH	         	)),
--    sFirst              (SVX_RES(ST_ORDINAL           ))
-+    sFirst              (SVX_RES(ST_ORDINAL           )),
-+    sAccidentalCaps     (SVX_RES(ST_CORRECT_ACCIDENTAL_CAPS_LOCK))
- {
- 	FreeResource();
- 
-@@ -279,6 +280,7 @@ BOOL OfaAutocorrOptionsPage::FillItemSet
- 	pAutoCorrect->SetAutoCorrFlag(ChgFractionSymbol,	aCheckLB.IsChecked(nPos++));
- 	pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash,		aCheckLB.IsChecked(nPos++));
- 	pAutoCorrect->SetAutoCorrFlag(IngnoreDoubleSpace,	aCheckLB.IsChecked(nPos++));
-+    pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock,      aCheckLB.IsChecked(nPos++));
- 
- 	BOOL bReturn = nFlags != pAutoCorrect->GetFlags();
- 	if(bReturn )
-@@ -320,6 +322,7 @@ void OfaAutocorrOptionsPage::Reset( cons
- 	aCheckLB.InsertEntry(sHalf);
- 	aCheckLB.InsertEntry(sDash);
- 	aCheckLB.InsertEntry(sNoDblSpaces);
-+    aCheckLB.InsertEntry(sAccidentalCaps);
- 
- 	USHORT nPos = 0;
- 	aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & Autocorrect) );
-@@ -331,6 +334,7 @@ void OfaAutocorrOptionsPage::Reset( cons
- 	aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgFractionSymbol) );
- 	aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgToEnEmDash) );
- 	aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & IngnoreDoubleSpace) );
-+    aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & CorrectCapsLock) );
- 
- 	aCheckLB.SetUpdateMode(TRUE);
- }
-@@ -463,6 +467,7 @@ enum OfaAutoFmtOptions
- 	DEL_SPACES_AT_STT_END,
- 	DEL_SPACES_BETWEEN_LINES,
- 	IGNORE_DBLSPACE,
-+    CORRECT_CAPS_LOCK,
- 	APPLY_NUMBERING,
- 	INSERT_BORDER,
- 	CREATE_TABLE,
-@@ -492,6 +497,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOpt
- 	sBullet				(SVX_RES(	ST_BULLET       )),
- 	sBoldUnder			(SVX_RES(	ST_BOLD_UNDER   )),
- 	sNoDblSpaces		(SVX_RES(	STR_NO_DBL_SPACES)),
-+    sCorrectCapsLock    (SVX_RES(   ST_CORRECT_ACCIDENTAL_CAPS_LOCK)),
- 	sFraction			(SVX_RES(	ST_FRACTION     )),
- 	sDetectURL			(SVX_RES(	ST_DETECT_URL   )),
- 	sDash				(SVX_RES(	ST_DASH         )),
-@@ -632,6 +638,9 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSe
- 	pAutoCorrect->SetAutoCorrFlag(IngnoreDoubleSpace,
- 						aCheckLB.IsChecked(IGNORE_DBLSPACE, CBCOL_SECOND));
- 
-+    pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock,
-+                        aCheckLB.IsChecked(CORRECT_CAPS_LOCK, CBCOL_SECOND));
-+
- 	bCheck = aCheckLB.IsChecked(DETECT_URL, CBCOL_FIRST);
- 	bModified |= pOpt->bSetINetAttr != bCheck;
- 	pOpt->bSetINetAttr = bCheck;
-@@ -763,6 +772,7 @@ void OfaSwAutoFmtOptionsPage::Reset( con
- 	aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH  ));
- 
- 	aCheckLB.GetModel()->Insert(CreateEntry(sNoDblSpaces,		CBCOL_SECOND));
-+    aCheckLB.GetModel()->Insert(CreateEntry(sCorrectCapsLock,   CBCOL_SECOND));
- 	aCheckLB.GetModel()->Insert(CreateEntry(sNum,				CBCOL_SECOND));
- 	aCheckLB.GetModel()->Insert(CreateEntry(sBorder,			CBCOL_SECOND));
- 	aCheckLB.GetModel()->Insert(CreateEntry(sTable,				CBCOL_SECOND));
-@@ -782,6 +792,7 @@ void OfaSwAutoFmtOptionsPage::Reset( con
- 	aCheckLB.CheckEntryPos( BOLD_UNDERLINE,		CBCOL_FIRST,	pOpt->bChgWeightUnderl );
- 	aCheckLB.CheckEntryPos( BOLD_UNDERLINE,		CBCOL_SECOND,	0 != (nFlags & ChgWeightUnderl) );
- 	aCheckLB.CheckEntryPos( IGNORE_DBLSPACE,	CBCOL_SECOND,	0 != (nFlags & IngnoreDoubleSpace) );
-+    aCheckLB.CheckEntryPos( CORRECT_CAPS_LOCK,  CBCOL_SECOND,   0 != (nFlags & CorrectCapsLock) );
- 	aCheckLB.CheckEntryPos( DETECT_URL,			CBCOL_FIRST,	pOpt->bSetINetAttr );
- 	aCheckLB.CheckEntryPos( DETECT_URL,			CBCOL_SECOND,	0 != (nFlags & SetINetAttr) );
- 	aCheckLB.CheckEntryPos( REPLACE_1ST,		CBCOL_FIRST,	pOpt->bChgOrdinalNumber );
---- svx/source/cui/autocdlg.hrc
-+++ svx/source/cui/autocdlg.hrc
-@@ -152,6 +152,7 @@
- #define ST_DASH                         208
- #define FT_LANG                         209
- #define LB_LANG                         210
-+#define ST_CORRECT_ACCIDENTAL_CAPS_LOCK 211
- 
- #define CB_SMARTTAGS                    220
- #define FT_SMARTTAGS                    221
---- svx/source/cui/autocdlg.hxx
-+++ svx/source/cui/autocdlg.hxx
-@@ -119,6 +119,7 @@ private:
- 	String		sHalf;
- 	String		sDash;
- 	String		sFirst;
-+    String      sAccidentalCaps;
- 
- public:
- 						OfaAutocorrOptionsPage( Window* pParent, const SfxItemSet& rSet );
-@@ -157,6 +158,7 @@ class OfaSwAutoFmtOptionsPage : public S
- 	String			sByInputBullet;
- 	String			sBoldUnder;
- 	String			sNoDblSpaces;
-+    String          sCorrectCapsLock;
- 	String			sFraction;
- 	String			sDetectURL;
- 	String          sDash;
---- svx/source/cui/autocdlg.src
-+++ svx/source/cui/autocdlg.src
-@@ -140,7 +140,11 @@ TabDialog RID_OFA_AUTOCORR_DLG
-     String ST_DASH \
-     { \
-         Text [ en-US ] = "Replace dashes" ; \
--	};
-+	}; \
-+    String ST_CORRECT_ACCIDENTAL_CAPS_LOCK \
-+    { \
-+        Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ; \
-+    };
- 
- /**************************************************************************/
- /*                                                                        */
---- svx/source/editeng/acorrcfg.cxx.old	2009-04-02 11:03:02.000000000 +0000
-+++ svx/source/editeng/acorrcfg.cxx	2009-04-06 16:42:14.000000000 +0000
-@@ -127,9 +127,10 @@ Sequence<OUString> 	SvxBaseAutoCorrCfg::
- 		"SingleQuoteAtEnd",						// 13
- 		"ReplaceDoubleQuote",					// 14
- 		"DoubleQuoteAtStart",					// 15
--		"DoubleQuoteAtEnd"						// 16
-+		"DoubleQuoteAtEnd",						// 16
-+        "CorrectAccidentalCapsLock"             // 17
- 	};
--	const int nCount = 17;
-+	const int nCount = 18;
- 	Sequence<OUString> aNames(nCount);
- 	OUString* pNames = aNames.getArray();
- 	for(int i = 0; i < nCount; i++)
-@@ -229,6 +230,10 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool b
- 						rParent.pAutoCorrect->SetEndDoubleQuote(
-                             sal::static_int_cast< sal_Unicode >( nTemp ) );
- 					break;//"DoubleQuoteAtEnd"
-+                    case 17:
-+                        if(*(sal_Bool*)pValues[nProp].getValue())
-+                            nFlags |= CorrectCapsLock;
-+                    break;//"CorrectAccidentalCapsLock"
- 				}
- 			}
- 		}
-@@ -333,6 +338,10 @@ void SvxBaseAutoCorrCfg::Commit()
- 			case 16:
- 				pValues[nProp] <<= (sal_Int32) rParent.pAutoCorrect->GetEndDoubleQuote();
- 			break;//"DoubleQuoteAtEnd"
-+            case 17:
-+                bVal = 0 != (nFlags & CorrectCapsLock);
-+                pValues[nProp].setValue(&bVal, rType);
-+            break;//"CorrectAccidentalCapsLock"
- 		}
- 	}
- 	PutProperties(aNames, aValues);
---- svx/source/editeng/editeng.cxx.old	2009-04-02 11:03:02.000000000 +0000
-+++ svx/source/editeng/editeng.cxx	2009-04-06 16:42:14.000000000 +0000
-@@ -802,7 +802,7 @@ ESelection EditEngine::CursorRight( cons
- 	return pE->pImpEditEngine->CreateESel( aSel );
- }
- 
--sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView )
-+sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, Window* pFrameWin )
- {
- 	DBG_CHKTHIS( EditEngine, 0 );
- 	DBG_CHKOBJ( pEditView, EditView, 0 );
-@@ -1062,7 +1062,7 @@ sal_Bool EditEngine::PostKeyEvent( const
- 						if ( bSel )
- 							pImpEditEngine->UndoActionStart( EDITUNDO_INSERT );
- 						if ( pImpEditEngine->GetStatus().DoAutoCorrect() )
--							aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode() );
-+							aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode(), pFrameWin );
- 						aCurSel = pImpEditEngine->InsertTab( aCurSel );
- 						if ( bSel )
- 							pImpEditEngine->UndoActionEnd( EDITUNDO_INSERT );
-@@ -1083,7 +1083,7 @@ sal_Bool EditEngine::PostKeyEvent( const
- 						pImpEditEngine->UndoActionStart( EDITUNDO_INSERT );
- 						if ( rKeyEvent.GetKeyCode().IsShift() )
-                         {
--                            aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode() );
-+                            aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode(), pFrameWin );
- 							aCurSel = pImpEditEngine->InsertLineBreak( aCurSel );
-                         }
- 						else
-@@ -1091,7 +1091,7 @@ sal_Bool EditEngine::PostKeyEvent( const
- 							if ( !aAutoText.Len() )
- 							{
- 								if ( pImpEditEngine->GetStatus().DoAutoCorrect() )
--									aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode() );
-+									aCurSel = pImpEditEngine->AutoCorrect( aCurSel, 0, !pEditView->IsInsertMode(), pFrameWin );
- 								aCurSel = pImpEditEngine->InsertParaBreak( aCurSel );
- 							}
- 							else
-@@ -1139,7 +1139,8 @@ sal_Bool EditEngine::PostKeyEvent( const
- 						 	( nCharCode == '\"' ) || ( nCharCode == '\'' ) ||
- 							( nCharCode == '_' )  ))
- 					{
--						aCurSel = pImpEditEngine->AutoCorrect( aCurSel, nCharCode, !pEditView->IsInsertMode() );
-+						aCurSel = pImpEditEngine->AutoCorrect( 
-+                            aCurSel, nCharCode, !pEditView->IsInsertMode(), pFrameWin );
- 					}
- 					else
- 					{
---- svx/source/editeng/editview.cxx.old	2009-04-02 11:03:02.000000000 +0000
-+++ svx/source/editeng/editview.cxx	2009-04-06 16:42:14.000000000 +0000
-@@ -60,6 +60,7 @@
- #include <helpid.hrc>
- #include <i18npool/lang.h>
- #include <vcl/menu.hxx>
-+#include <vcl/window.hxx>
- #include <acorrcfg.hxx>
- #include <unolingu.hxx>
- #include <fontitem.hxx>
-@@ -418,11 +419,11 @@ void EditView::InsertText( const XubStri
- 	pImpEE->FormatAndUpdate( this );
- }
- 
--sal_Bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent )
-+sal_Bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
- {
- 	DBG_CHKTHIS( EditView, 0 );
- 	DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
--	return pImpEditView->PostKeyEvent( rKeyEvent );
-+	return pImpEditView->PostKeyEvent( rKeyEvent, pFrameWin );
- }
- 
- sal_Bool EditView::MouseButtonUp( const MouseEvent& rMouseEvent )
-@@ -919,7 +920,7 @@ sal_Bool EditView::MatchGroup()
- 	return sal_False;
- }
- 
--void EditView::CompleteAutoCorrect()
-+void EditView::CompleteAutoCorrect( Window* pFrameWin )
- {
- 	DBG_CHKTHIS( EditView, 0 );
- 	DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-@@ -929,7 +930,7 @@ void EditView::CompleteAutoCorrect()
- 		EditSelection aSel = pImpEditView->GetEditSelection();
- 		aSel = PIMPEE->EndOfWord( aSel.Max() );
- 		// MT 06/00: Why pass EditSelection to AutoCorrect, not EditPaM?!
--		aSel = PIMPEE->AutoCorrect( aSel, 0, !IsInsertMode() );
-+		aSel = PIMPEE->AutoCorrect( aSel, 0, !IsInsertMode(), pFrameWin );
- 		pImpEditView->SetEditSelection( aSel );
- 		if ( PIMPEE->IsModified() )
- 			PIMPEE->FormatAndUpdate( this );
---- svx/source/editeng/impedit2.cxx.old	2009-04-02 11:03:02.000000000 +0000
-+++ svx/source/editeng/impedit2.cxx	2009-04-06 16:42:14.000000000 +0000
-@@ -2540,7 +2540,8 @@ void ImpEditEngine::ImpRemoveParagraph(
- 	}
- }
- 
--EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, BOOL bOverwrite )
-+EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, 
-+                                    bool bOverwrite, Window* pFrameWin )
- {
- 	EditSelection aSel( rCurSel );
- #ifndef SVX_LIGHT
-@@ -2590,7 +2591,7 @@ EditPaM ImpEditEngine::AutoCorrect( cons
- 		ContentNode* pNode = aSel.Max().GetNode();
- 		USHORT nIndex = aSel.Max().GetIndex();
- 		EdtAutoCorrDoc aAuto( this, pNode, nIndex, c );
--		pAutoCorrect->AutoCorrect( aAuto, *pNode, nIndex, c, !bOverwrite );
-+		pAutoCorrect->AutoCorrect( aAuto, *pNode, nIndex, c, !bOverwrite, pFrameWin );
- 		aSel.Max().SetIndex( aAuto.GetCursor() );
- 
- 		// #i78661 since the SvxAutoCorrect object used here is
---- svx/source/editeng/impedit.cxx.old	2009-04-02 11:03:02.000000000 +0000
-+++ svx/source/editeng/impedit.cxx	2009-04-06 16:42:14.000000000 +0000
-@@ -1001,7 +1001,7 @@ Pair ImpEditView::Scroll( long ndX, long
- 	return Pair( nRealDiffX, nRealDiffY );
- }
- 
--sal_Bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent )
-+sal_Bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
- {
-     BOOL bDone = FALSE;
- 
-@@ -1045,7 +1045,7 @@ sal_Bool ImpEditView::PostKeyEvent( cons
-     }
- 
-     if( !bDone )
--	    bDone = pEditEngine->PostKeyEvent( rKeyEvent, GetEditViewPtr() );
-+	    bDone = pEditEngine->PostKeyEvent( rKeyEvent, GetEditViewPtr(), pFrameWin );
- 
-     return bDone;
- }
---- svx/source/editeng/impedit.hxx.old	2009-04-02 11:03:02.000000000 +0000
-+++ svx/source/editeng/impedit.hxx	2009-04-06 16:42:14.000000000 +0000
-@@ -101,6 +101,8 @@ class TextRanger;
- class SvKeyValueIterator;
- class SvxForbiddenCharactersTable;
- class SvtCTLOptions;
-+class Window;
-+
- #include <svx/SpellPortions.hxx>
- 
- #include <svx/eedata.hxx>
-@@ -297,7 +299,7 @@ public:
- 
- 	BOOL			IsVertical() const;
- 
--	BOOL			PostKeyEvent( const KeyEvent& rKeyEvent );
-+	BOOL			PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
- 
- 	BOOL			MouseButtonUp( const MouseEvent& rMouseEvent );
- 	BOOL			MouseButtonDown( const MouseEvent& rMouseEvent );
-@@ -787,7 +789,7 @@ public:
- 	EditPaM			DeleteSelected( EditSelection aEditSelection);
-     EditPaM         InsertText( const EditSelection& rCurEditSelection, sal_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput = sal_False );
- 	EditPaM			InsertText( EditSelection aCurEditSelection, const String& rStr );
--	EditPaM			AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, sal_Bool bOverwrite );
-+	EditPaM			AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, Window* pFrameWin = NULL );
- 	EditPaM			DeleteLeftOrRight( const EditSelection& rEditSelection, BYTE nMode, BYTE nDelMode = DELMODE_SIMPLE );
- 	EditPaM			InsertParaBreak( EditSelection aEditSelection );
- 	EditPaM			InsertLineBreak( EditSelection aEditSelection );
---- svx/source/editeng/svxacorr.cxx.old	2009-04-02 11:03:02.000000000 +0000
-+++ svx/source/editeng/svxacorr.cxx	2009-04-06 16:42:14.000000000 +0000
-@@ -81,6 +81,7 @@
- #include <svx/escpitem.hxx>
- #include <svx/svxacorr.hxx>
- #include "unolingu.hxx"
-+#include "vcl/window.hxx"
- 
- #ifndef _SVX_HELPID_HRC
- #include <helpid.hrc>
-@@ -351,7 +352,8 @@ long SvxAutoCorrect::GetDefaultFlags()
- 					| SetINetAttr
- 					| ChgQuotes
- 					| SaveWordCplSttLst
--					| SaveWordWrdSttLst;
-+					| SaveWordWrdSttLst
-+                    | CorrectCapsLock;
- 	LanguageType eLang = GetAppLang();
- 	switch( eLang )
- 	{
-@@ -1052,6 +1054,49 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( Svx
- 
- 	return bRet;
- }
-+
-+bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt,
-+                                        xub_StrLen nSttPos, xub_StrLen nEndPos,
-+                                        LanguageType eLang )
-+{
-+    if (nEndPos - nSttPos < 2)
-+        // string must be at least 2-character long.
-+        return false;
-+
-+    CharClass& rCC = GetCharClass( eLang );
-+
-+    // Check the first 2 letters.
-+    if ( !IsLowerLetter(rCC.getCharacterType(rTxt, nSttPos)) )
-+        return false;
-+
-+    if ( !IsUpperLetter(rCC.getCharacterType(rTxt, nSttPos+1)) )
-+        return false;
-+
-+    String aConverted;
-+    aConverted.Append( rCC.upper(rTxt.GetChar(nSttPos)) );
-+    aConverted.Append( rCC.lower(rTxt.GetChar(nSttPos+1)) );
-+
-+    for (xub_StrLen i = nSttPos+2; i < nEndPos; ++i)
-+    {
-+        if ( IsLowerLetter(rCC.getCharacterType(rTxt, i)) )
-+            // A lowercase letter disqualifies the whole text.
-+            return false;
-+
-+        if ( IsUpperLetter(rCC.getCharacterType(rTxt, i)) )
-+            // Another uppercase letter.  Convert it.
-+            aConverted.Append( rCC.lower(rTxt.GetChar(i)) );
-+        else
-+            // This is not an alphabetic letter.  Leave it as-is.
-+            aConverted.Append(rTxt.GetChar(i));
-+    }
-+
-+    // Replace the word.
-+    rDoc.Delete(nSttPos, nEndPos);
-+    rDoc.Insert(nSttPos, aConverted);
-+
-+    return true;
-+}
-+
- //The method below is renamed from _GetQuote to GetQuote by BerryJia for Bug95846 Time:2002-8-13 15:50
- sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, BOOL bSttQuote,
- 										LanguageType eLang ) const
-@@ -1165,7 +1210,7 @@ String SvxAutoCorrect::GetQuote( SvxAuto
- 
- ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
- 									xub_StrLen nInsPos, sal_Unicode cChar,
--									BOOL bInsert )
-+									BOOL bInsert, Window* pFrameWin )
- {
- 	ULONG nRet = 0;
- 	do{		                            // only for middle check loop !!
-@@ -1308,7 +1353,19 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAu
- 			;
- 		else
- 		{
-+            bool bLockKeyOn = pFrameWin && (pFrameWin->GetIndicatorState() & INDICATOR_CAPSLOCK);
-+
- 			nRet = 0;
-+            if ( bLockKeyOn && IsAutoCorrFlag( CorrectCapsLock ) &&
-+                 FnCorrectCapsLock( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) )
-+            {
-+                // Correct accidental use of cAPS LOCK key (do this only when 
-+                // the caps or shift lock key is pressed).  Turn off the caps
-+                // lock afterwords.
-+                nRet |= CorrectCapsLock;
-+                pFrameWin->SimulateKeyPress( KEY_CAPSLOCK );
-+            }
-+
- 			// Grossbuchstabe am Satz-Anfang ??
- 			if( IsAutoCorrFlag( CptlSttSntnc ) &&
- 				FnCptlSttSntnc( rDoc, rTxt, TRUE, nCapLttrPos, nInsPos, eLang ) )
---- svx/source/outliner/outlvw.cxx.old	2009-04-02 11:02:55.000000000 +0000
-+++ svx/source/outliner/outlvw.cxx	2009-04-06 16:42:14.000000000 +0000
-@@ -92,7 +92,7 @@ void OutlinerView::Paint( const Rectangl
- 	pEditView->Paint( rRect );
- }
- 
--BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
-+BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
- {
- 	DBG_CHKTHIS( OutlinerView, 0 );
- 
-@@ -257,7 +257,7 @@ BOOL OutlinerView::PostKeyEvent( const K
- 		}
- 	}
- 
--	return bKeyProcessed ? TRUE : pEditView->PostKeyEvent( rKEvt );
-+	return bKeyProcessed ? TRUE : pEditView->PostKeyEvent( rKEvt, pFrameWin );
- }
- 
- 
---- svx/source/svdraw/svdedxv.cxx.old	2009-04-02 11:03:00.000000000 +0000
-+++ svx/source/svdraw/svdedxv.cxx	2009-04-06 16:42:14.000000000 +0000
-@@ -1178,7 +1178,7 @@ BOOL SdrObjEditView::KeyInput(const KeyE
- 				ShowItemBrowser();
-         }
- #endif
--		if (pTextEditOutlinerView->PostKeyEvent(rKEvt))
-+		if (pTextEditOutlinerView->PostKeyEvent(rKEvt, pWin))
- 		{
- 			if( pMod && !pMod->IsChanged() )
- 			{
diff --git a/applied_patches/0635-internal-mesa-headers-mesa.diff b/applied_patches/0521-internal-mesa-headers-mesa.diff
similarity index 100%
rename from applied_patches/0635-internal-mesa-headers-mesa.diff
rename to applied_patches/0521-internal-mesa-headers-mesa.diff
diff --git a/applied_patches/0522-ui-desktop-integration.diff b/applied_patches/0522-ui-desktop-integration.diff
new file mode 100644
index 000000000..5be08a4eb
--- /dev/null
+++ b/applied_patches/0522-ui-desktop-integration.diff
@@ -0,0 +1,224 @@
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old	2009-04-06 16:42:16.000000000 +0000
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2009-04-06 16:42:19.000000000 +0000
+@@ -5653,6 +5653,13 @@ Dymamic border coloring means that when
+ 				</info>
+ 				<value>false</value>
+ 			</prop>
++			<prop oor:name="DisableUICustomization" oor:type="xs:boolean">
++				<info>
++					<author>RSiddhartha</author>
++					<desc>Disables the customization of the UI elements.</desc>
++				</info>
++				<value>false</value>
++			</prop>
+ 			<prop oor:name="SymbolSet" oor:type="xs:short">
+ 				<!-- UIHints: Tools  Options General View -->
+ 				<info>
+--- svtools/inc/svtools/miscopt.hxx.old	2009-04-06 16:42:16.000000000 +0000
++++ svtools/inc/svtools/miscopt.hxx	2009-04-06 16:42:19.000000000 +0000
+@@ -117,6 +117,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: publ
+         void        SetTryODMADialog( sal_Bool bSet );
+         sal_Bool    IsTryUseODMADialogReadOnly() const;
+ 
++        sal_Bool    DisableUICustomization() const;
++
+         sal_Bool    IsPluginsEnabled() const;
+         void        SetPluginsEnabled( sal_Bool bEnable );
+         sal_Bool    IsPluginsEnabledReadOnly() const;
+--- svtools/source/config/miscopt.cxx.old	2009-04-06 16:42:16.000000000 +0000
++++ svtools/source/config/miscopt.cxx	2009-04-06 16:42:19.000000000 +0000
+@@ -89,8 +89,10 @@ using namespace ::com::sun::star;
+ #define PROPERTYHANDLE_TRYODMADIALOG	6
+ #define PROPERTYNAME_SHOWLINKWARNINGDIALOG	ASCII_STR("ShowLinkWarningDialog")
+ #define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
++#define PROPERTYNAME_DISABLEUICUSTOMIZATION	ASCII_STR("DisableUICustomization")
++#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION			8
+ 
+-#define PROPERTYCOUNT						8
++#define PROPERTYCOUNT						9
+ 
+ #define VCL_TOOLBOX_STYLE_FLAT				((USHORT)0x0004) // from <vcl/toolbox.hxx>
+ 
+@@ -123,6 +125,7 @@ class SvtMiscOptions_Impl : public Confi
+     sal_Bool    m_bIsUseSystemPrintDialogRO;
+     sal_Bool    m_bShowLinkWarningDialog;
+     sal_Bool    m_bIsShowLinkWarningDialogRO;
++    sal_Bool    m_bDisableUICustomization;
+ 
+     //-------------------------------------------------------------------------------------------------------------
+ 	//	public methods
+@@ -200,6 +203,9 @@ class SvtMiscOptions_Impl : public Confi
+         inline sal_Bool IsTryUseODMADialogReadOnly() const
+         { return m_bIsTryODMADialogRO; }
+ 
++        inline sal_Bool DisableUICustomization() const
++        { return m_bDisableUICustomization; }
++
+         inline sal_Bool IsPluginsEnabled() const
+         { return m_bPluginsEnabled; }
+ 
+@@ -448,6 +454,13 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl
+                 m_bIsSymbolsStyleRO = seqRO[nProperty];
+                 break;
+             }
++	    
++            case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : 
++            {
++                if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
++                    DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
++                    break;
++            }
+         }
+ 	}
+ 
+@@ -563,6 +576,11 @@ void SvtMiscOptions_Impl::Load( const Se
+                                                             }
+                                                         }
+                                                     break;
++            case PROPERTYHANDLE_DISABLEUICUSTOMIZATION      :   {
++                                                            if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
++                                                                DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
++                                                        }
++                                                    break;
+         }
+     }
+ }
+@@ -726,6 +744,12 @@ void SvtMiscOptions_Impl::Commit()
+                     seqValues[nProperty] <<= m_bShowLinkWarningDialog;
+                 break;
+             }
++
++            case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
++            {
++                seqValues[nProperty] <<= m_bDisableUICustomization;
++                break;
++            }
+         }
+ 	}
+ 	// Set properties in configuration.
+@@ -747,7 +771,8 @@ Sequence< OUString > SvtMiscOptions_Impl
+         PROPERTYNAME_SYMBOLSTYLE,
+         PROPERTYNAME_USESYSTEMPRINTDIALOG,
+         PROPERTYNAME_TRYODMADIALOG,
+-        PROPERTYNAME_SHOWLINKWARNINGDIALOG
++        PROPERTYNAME_SHOWLINKWARNINGDIALOG,
++        PROPERTYNAME_DISABLEUICUSTOMIZATION
+ 	};
+ 
+ 	// Initialize return sequence with these list ...
+@@ -908,6 +933,11 @@ sal_Bool SvtMiscOptions::IsGetSymbolsSty
+     return m_pDataContainer->IsGetSymbolsStyleReadOnly();
+ }
+ 
++sal_Bool SvtMiscOptions::DisableUICustomization() const
++{
++    return m_pDataContainer->DisableUICustomization();
++}
++
+ sal_Int16 SvtMiscOptions::GetToolboxStyle() const
+ {
+     return m_pDataContainer->GetToolboxStyle();
+--- sfx2/sdi/appslots.sdi.old	2009-04-02 10:43:51.000000000 +0000
++++ sfx2/sdi/appslots.sdi	2009-04-06 16:42:19.000000000 +0000
+@@ -188,6 +188,7 @@ interface Application
+ 	SID_AVAILABLE_TOOLBARS
+ 	[
+ 		ExecMethod = MiscExec_Impl ;
++		StateMethod = MiscState_Impl ;
+ 	]
+ 	SID_HELP_TUTORIALS
+ 	[
+--- sfx2/source/appl/appserv.cxx.old	2009-04-06 16:41:54.000000000 +0000
++++ sfx2/source/appl/appserv.cxx	2009-04-06 16:42:19.000000000 +0000
+@@ -90,6 +90,7 @@
+ #include <svtools/moduleoptions.hxx>
+ #include <svtools/regoptions.hxx>
+ #include <svtools/helpopt.hxx>
++#include <svtools/miscopt.hxx>
+ #include <toolkit/helper/vclunohelper.hxx>
+ #include <tools/shl.hxx>
+ #include <unotools/bootstrap.hxx>
+@@ -680,6 +681,18 @@ void SfxApplication::MiscState_Impl(SfxI
+ 					break;
+ 				}
+ 
++				case SID_CONFIG:
++				case SID_TOOLBOXOPTIONS:
++				case SID_CONFIGSTATUSBAR:
++				case SID_CONFIGMENU:
++				case SID_CONFIGACCEL:
++				case SID_CONFIGEVENT:
++				{
++					if( SvtMiscOptions().DisableUICustomization() )
++						rSet.DisableItem(nWhich);
++					break;
++				}
++
+ 				case SID_BASICSTOP:
+ 					if ( !StarBASIC::IsRunning() )
+ 						rSet.DisableItem(nWhich);
+--- framework/source/uielement/toolbarmanager.cxx.old	2009-04-02 10:56:25.000000000 +0000
++++ framework/source/uielement/toolbarmanager.cxx	2009-04-06 16:42:19.000000000 +0000
+@@ -252,7 +252,7 @@ ToolBarManager::ToolBarManager( const Re
+     m_bUpdateControllers( sal_False ),
+     m_bImageOrientationRegistered( sal_False ),
+     m_bImageMirrored( sal_False ),
+-    m_bCanBeCustomized( sal_True ),
++    m_bCanBeCustomized( !SvtMiscOptions().DisableUICustomization() ),
+     m_lImageRotation( 0 ),
+     m_pToolBar( pToolBar ),
+     m_aResourceName( rResourceName ),
+@@ -473,6 +473,24 @@ void ToolBarManager::UpdateControllers()
+ {
+     RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" );
+ 
++    if( !m_bCanBeCustomized )
++    {
++        Any a;
++        Reference< XLayoutManager > xLayoutManager;
++        Reference< XPropertySet > xFramePropSet( m_xFrame, UNO_QUERY );
++        if ( xFramePropSet.is() )
++            a = xFramePropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
++        a >>= xLayoutManager;
++        Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
++        if ( xLayoutManager.is() && xDockable.is() )
++        {
++            ::com::sun::star::awt::Point aPoint;
++            aPoint.X = aPoint.Y = LONG_MAX;
++            xLayoutManager->dockWindow( m_aResourceName, DockingArea_DOCKINGAREA_DEFAULT, aPoint );
++            xLayoutManager->lockWindow( m_aResourceName );
++        }
++    }
++
+     if ( !m_bUpdateControllers )
+     {
+         m_bUpdateControllers = sal_True;
+@@ -1701,6 +1719,7 @@ PopupMenu * ToolBarManager::GetToolBarCu
+             // Non-configurable toolbars should disable configuration menu items
+             aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, sal_False );
+             aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, sal_False );
++            aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, sal_False );
+         }
+ 
+         // Disable menu item CLOSE if the toolbar has no closer
+--- framework/source/uielement/toolbarsmenucontroller.cxx.old	2009-04-02 10:56:25.000000000 +0000
++++ framework/source/uielement/toolbarsmenucontroller.cxx	2009-04-06 16:42:19.000000000 +0000
+@@ -85,7 +85,8 @@
+ #include <svtools/menuoptions.hxx>
+ #include <svtools/cmdoptions.hxx>
+ #include <dispatch/uieventloghelper.hxx>
+ #include <rtl/logfile.hxx>
++#include <svtools/miscopt.hxx>
+ 
+ //_________________________________________________________________________________________________________________
+ //	Defines
+@@ -384,6 +385,9 @@ sal_Bool ToolbarsMenuController::isConte
+ 
+ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
+ {
++    if( SvtMiscOptions().DisableUICustomization() )
++        return;
++
+     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+     resetPopupMenu( rPopupMenu );
+ 
diff --git a/applied_patches/0637-cairo-pixman-makefile-mk.diff b/applied_patches/0523-cairo-pixman-makefile-mk.diff
similarity index 100%
rename from applied_patches/0637-cairo-pixman-makefile-mk.diff
rename to applied_patches/0523-cairo-pixman-makefile-mk.diff
diff --git a/applied_patches/0638-cairo-cairo-makefile-mk.diff b/applied_patches/0524-cairo-cairo-makefile-mk.diff
similarity index 100%
rename from applied_patches/0638-cairo-cairo-makefile-mk.diff
rename to applied_patches/0524-cairo-cairo-makefile-mk.diff
diff --git a/applied_patches/0639-internal-cairo-configure.diff b/applied_patches/0525-internal-cairo-configure.diff
similarity index 100%
rename from applied_patches/0639-internal-cairo-configure.diff
rename to applied_patches/0525-internal-cairo-configure.diff
diff --git a/applied_patches/0526-package-pixman-scp2-source-ooo-file_library_ooo_scp.diff b/applied_patches/0526-package-pixman-scp2-source-ooo-file_library_ooo_scp.diff
new file mode 100644
index 000000000..fb1fd93d1
--- /dev/null
+++ b/applied_patches/0526-package-pixman-scp2-source-ooo-file_library_ooo_scp.diff
@@ -0,0 +1,24 @@
+--- scp2/source/ooo/file_library_ooo.scp	2009-09-17 10:28:37.000000000 +0200
++++ scp2/source/ooo/file_library_ooo.scp	2009-09-17 10:27:52.000000000 +0200
+@@ -698,6 +698,21 @@
+   #endif
+ End
+ 
++File gid_File_Lib_Pixman
++    TXT_FILE_BODY;
++    Styles = (PACKED);
++    Dir = gid_Dir_Program;
++  #ifdef UNX
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libpixman-1,.0,UNXSUFFIX));
++    #else
++       Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
++    #endif
++  #elif defined(WNT)
++    Name = "libpixman-1-0.dll";
++  #endif
++End
++
+ #endif
+ 
+ STD_UNO_LIB_FILE( gid_File_Lib_Frm , frm)
diff --git a/applied_patches/0640-cppcanvas-fix-roundcorners.diff b/applied_patches/0527-cppcanvas-fix-roundcorners.diff
similarity index 100%
rename from applied_patches/0640-cppcanvas-fix-roundcorners.diff
rename to applied_patches/0527-cppcanvas-fix-roundcorners.diff
diff --git a/applied_patches/0641-officecfg-bighandles-default.diff b/applied_patches/0528-officecfg-bighandles-default.diff
similarity index 100%
rename from applied_patches/0641-officecfg-bighandles-default.diff
rename to applied_patches/0528-officecfg-bighandles-default.diff
diff --git a/applied_patches/0642-slideshow-cutblack.diff b/applied_patches/0529-slideshow-cutblack.diff
similarity index 100%
rename from applied_patches/0642-slideshow-cutblack.diff
rename to applied_patches/0529-slideshow-cutblack.diff
diff --git a/applied_patches/0643-canvas-colorspace-fix.diff b/applied_patches/0530-canvas-colorspace-fix.diff
similarity index 100%
rename from applied_patches/0643-canvas-colorspace-fix.diff
rename to applied_patches/0530-canvas-colorspace-fix.diff
diff --git a/applied_patches/0644-unoxml-boost-workaround.diff b/applied_patches/0531-unoxml-boost-workaround.diff
similarity index 100%
rename from applied_patches/0644-unoxml-boost-workaround.diff
rename to applied_patches/0531-unoxml-boost-workaround.diff
diff --git a/applied_patches/0645-sw-source-filter-xml-xmltbli-uninitializedvalue.diff b/applied_patches/0532-sw-source-filter-xml-xmltbli-uninitializedvalue.diff
similarity index 100%
rename from applied_patches/0645-sw-source-filter-xml-xmltbli-uninitializedvalue.diff
rename to applied_patches/0532-sw-source-filter-xml-xmltbli-uninitializedvalue.diff
diff --git a/applied_patches/0646-svtools-update-ole.diff b/applied_patches/0533-svtools-update-ole.diff
similarity index 100%
rename from applied_patches/0646-svtools-update-ole.diff
rename to applied_patches/0533-svtools-update-ole.diff
diff --git a/applied_patches/0647-jurt-jnilib-deliver.diff b/applied_patches/0534-jurt-jnilib-deliver.diff
similarity index 100%
rename from applied_patches/0647-jurt-jnilib-deliver.diff
rename to applied_patches/0534-jurt-jnilib-deliver.diff
diff --git a/applied_patches/0648-timely-canvas-disposing.diff b/applied_patches/0535-timely-canvas-disposing.diff
similarity index 100%
rename from applied_patches/0648-timely-canvas-disposing.diff
rename to applied_patches/0535-timely-canvas-disposing.diff
diff --git a/applied_patches/0649-instset-prefer-langpacks.diff b/applied_patches/0536-instset-prefer-langpacks.diff
similarity index 100%
rename from applied_patches/0649-instset-prefer-langpacks.diff
rename to applied_patches/0536-instset-prefer-langpacks.diff
diff --git a/applied_patches/0650-solenv-installer-unopkg-call.diff b/applied_patches/0537-solenv-installer-unopkg-call.diff
similarity index 100%
rename from applied_patches/0650-solenv-installer-unopkg-call.diff
rename to applied_patches/0537-solenv-installer-unopkg-call.diff
diff --git a/applied_patches/0651-svx-debug-sdrolestreams.diff b/applied_patches/0538-svx-debug-sdrolestreams.diff
similarity index 100%
rename from applied_patches/0651-svx-debug-sdrolestreams.diff
rename to applied_patches/0538-svx-debug-sdrolestreams.diff
diff --git a/applied_patches/0652-instset-macos-langpacks.diff b/applied_patches/0539-instset-macos-langpacks.diff
similarity index 100%
rename from applied_patches/0652-instset-macos-langpacks.diff
rename to applied_patches/0539-instset-macos-langpacks.diff
diff --git a/applied_patches/0653-sal-disable-backtrace.diff b/applied_patches/0540-sal-disable-backtrace.diff
similarity index 100%
rename from applied_patches/0653-sal-disable-backtrace.diff
rename to applied_patches/0540-sal-disable-backtrace.diff
diff --git a/applied_patches/0654-sw-invert-border-spacing.diff b/applied_patches/0541-sw-invert-border-spacing.diff
similarity index 100%
rename from applied_patches/0654-sw-invert-border-spacing.diff
rename to applied_patches/0541-sw-invert-border-spacing.diff
diff --git a/applied_patches/0655-sw-collapse-empty-table-par-like-html.diff b/applied_patches/0542-sw-collapse-empty-table-par-like-html.diff
similarity index 100%
rename from applied_patches/0655-sw-collapse-empty-table-par-like-html.diff
rename to applied_patches/0542-sw-collapse-empty-table-par-like-html.diff
diff --git a/applied_patches/0656-canvas-directx-lostdevice-fix.diff b/applied_patches/0543-canvas-directx-lostdevice-fix.diff
similarity index 100%
rename from applied_patches/0656-canvas-directx-lostdevice-fix.diff
rename to applied_patches/0543-canvas-directx-lostdevice-fix.diff
diff --git a/applied_patches/0657-sw-table-join-fix-i99267.diff b/applied_patches/0544-sw-table-join-fix-i99267.diff
similarity index 100%
rename from applied_patches/0657-sw-table-join-fix-i99267.diff
rename to applied_patches/0544-sw-table-join-fix-i99267.diff
diff --git a/applied_patches/0658-svtools-svrtf-token-ignore-case.diff b/applied_patches/0545-svtools-svrtf-token-ignore-case.diff
similarity index 100%
rename from applied_patches/0658-svtools-svrtf-token-ignore-case.diff
rename to applied_patches/0545-svtools-svrtf-token-ignore-case.diff
diff --git a/applied_patches/0659-fix-sd-accelerators.diff b/applied_patches/0546-fix-sd-accelerators.diff
similarity index 100%
rename from applied_patches/0659-fix-sd-accelerators.diff
rename to applied_patches/0546-fix-sd-accelerators.diff
diff --git a/applied_patches/0660-sw-outline-numbering-broken-fix.diff b/applied_patches/0547-sw-outline-numbering-broken-fix.diff
similarity index 100%
rename from applied_patches/0660-sw-outline-numbering-broken-fix.diff
rename to applied_patches/0547-sw-outline-numbering-broken-fix.diff
diff --git a/applied_patches/0661-sw-insert-pagebreak-in-numbered-paragraph.diff b/applied_patches/0548-sw-insert-pagebreak-in-numbered-paragraph.diff
similarity index 100%
rename from applied_patches/0661-sw-insert-pagebreak-in-numbered-paragraph.diff
rename to applied_patches/0548-sw-insert-pagebreak-in-numbered-paragraph.diff
diff --git a/applied_patches/0662-win32-tooltips.diff b/applied_patches/0549-win32-tooltips.diff
similarity index 100%
rename from applied_patches/0662-win32-tooltips.diff
rename to applied_patches/0549-win32-tooltips.diff
diff --git a/applied_patches/0550-win32-cygwin-1.7.diff b/applied_patches/0550-win32-cygwin-1.7.diff
new file mode 100644
index 000000000..7368108e1
--- /dev/null
+++ b/applied_patches/0550-win32-cygwin-1.7.diff
@@ -0,0 +1,61 @@
+--- solenv/bin/deliver.pl
++++ solenv/bin/deliver.pl
+@@ -113,9 +113,11 @@
+ 
+ if ($^O ne 'cygwin') {              # iz59477 - cygwin needes a dot "." at the end of filenames to disable
+   $maybedot     = '';               # some .exe transformation magic.
+-} else {
++} elsif ( `uname -r` lt '1.7') {    # but not in cygwin 1.7 it seems
+   $maybedot     = '.';
+-}
++} else {
++  $maybedot     = '';
++}
+ 
+ ($gui		= lc($ENV{GUI})) 		|| die "Can't determine 'GUI'. Please set environment.\n";
+ $tempcounter        = 0;
+@@ -840,6 +840,15 @@
+             sleep $try;
+             $try ++;
+             $success = rename($temp_file, $to);
++            # handle Cygwin crack: when renaming soffice.bin.2900-1253705626
++            # to soffice.bin, Cygwin 1.7 silently appends an .exe
++            # giving soffice.bin.exe.
++            if ( $success &&
++                 $^O eq 'cygwin' && 
++                 -f $to.".exe" )
++            {
++                $success = rename ($to.".exe", $to);
++            }
+         }
+         if ( $success ) {
+             # handle special packaging of *.dylib files for Mac OS X
+--- packimages/pack/makefile.mk
++++ packimages/pack/makefile.mk
+@@ -91,7 +91,7 @@
+ 
+ # unpack the classic icon set
+ $(MISC)$/classic.flag : $(CLASSIC_TARBALL)
+-    cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
++    cd $(MISC) && gunzip -d -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
+ .IF "$(GUI)"=="UNX"
+     chmod -R g+w $(MISC)$/classic
+ .ENDIF
+--- solenv/bin/modules/installer/control.pm
++++ solenv/bin/modules/installer/control.pm
+@@ -91,9 +91,14 @@
+     
+     if( $^O =~ /cygwin/i )
+     {	# When using cygwin's perl the PATH variable is POSIX style and ...
+-        $pathvariable = qx{cygpath -mp "$pathvariable"} ;
++        my $temparrayref = installer::converter::convert_stringlist_into_array_without_newline(\$pathvariable, $local_pathseparator);
++        foreach $i (0..$#$temparrayref) {
++            $$temparrayref[$i] = qx{cygpath -m "$$temparrayref[$i]"};
++            chomp($$temparrayref[$i]);
++        }
+         # has to be converted to DOS style for further use.
+         $local_pathseparator = ';';
++        $pathvariable = join($local_pathseparator, @$temparrayref);
+     }
+     my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
+ 
diff --git a/applied_patches/0551-win32-sdk7.diff b/applied_patches/0551-win32-sdk7.diff
new file mode 100644
index 000000000..118a44b2e
--- /dev/null
+++ b/applied_patches/0551-win32-sdk7.diff
@@ -0,0 +1,13 @@
+--- configure.in
++++ configure.in
+@@ -5193,6 +5193,9 @@
+     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" >/dev/null 2>/dev/null; then
++        AC_MSG_RESULT([Found Windows SDK 7 ($PSDK_HOME)])
++        WINDOWS_VISTA_PSDK=TRUE
+     else
+         AC_MSG_RESULT([Found Legacy Windows Platform SDK ($PSDK_HOME)])
+     fi
+
diff --git a/applied_patches/0552-win32-dxsdk-200908.diff b/applied_patches/0552-win32-dxsdk-200908.diff
new file mode 100644
index 000000000..3d17909ec
--- /dev/null
+++ b/applied_patches/0552-win32-dxsdk-200908.diff
@@ -0,0 +1,18 @@
+--- canvas/source/directx/dx_winstuff.hxx
++++ canvas/source/directx/dx_winstuff.hxx
+@@ -89,9 +89,14 @@
+ 
+ #else
+ 
++    #include <dxsdkver.h>
+     #include <d3d9.h>
+     #include <d3dx9.h>
++    #if _DXSDK_BUILD_MAJOR < 1734 /* Earlier than the August 2009 DXSDK */
+-    #include <dxerr9.h>
++        #include <dxerr9.h>
++    #else
++        #include <dxerr.h>
++    #endif
+ 
+     typedef IDirect3DSurface9 surface_type;
+ 
diff --git a/applied_patches/0553-win32-interix.diff b/applied_patches/0553-win32-interix.diff
new file mode 100644
index 000000000..e5d981705
--- /dev/null
+++ b/applied_patches/0553-win32-interix.diff
@@ -0,0 +1,22 @@
+--- config.guess
++++ config.guess
+@@ -789,7 +789,7 @@
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit 0 ;;
+-    x86:Interix*:[34]*)
++    x86:Interix*:[3-6]*)
+ 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ 	exit 0 ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+--- configure.in
++++ configure.in
+@@ -987,7 +987,7 @@
+ 		test_cups=no
+ 		_os=GNU
+ 		;;
+-	cygwin*) # Windows
++	cygwin*|interix*) # Windows
+ 		test_cups=no
+ 		test_cairo=yes
+ 		test_freetype=no
diff --git a/applied_patches/0663-sfx2-privateprotectedpublic.diff b/applied_patches/0554-sfx2-privateprotectedpublic.diff
similarity index 100%
rename from applied_patches/0663-sfx2-privateprotectedpublic.diff
rename to applied_patches/0554-sfx2-privateprotectedpublic.diff
diff --git a/applied_patches/0664-optional-outplace-ole.diff b/applied_patches/0555-optional-outplace-ole.diff
similarity index 100%
rename from applied_patches/0664-optional-outplace-ole.diff
rename to applied_patches/0555-optional-outplace-ole.diff
diff --git a/applied_patches/0665-slideshow-configurable-paintoverlay.diff b/applied_patches/0556-slideshow-configurable-paintoverlay.diff
similarity index 100%
rename from applied_patches/0665-slideshow-configurable-paintoverlay.diff
rename to applied_patches/0556-slideshow-configurable-paintoverlay.diff
diff --git a/applied_patches/0666-vcl-permit-global-shortcuts.diff b/applied_patches/0557-vcl-permit-global-shortcuts.diff
similarity index 100%
rename from applied_patches/0666-vcl-permit-global-shortcuts.diff
rename to applied_patches/0557-vcl-permit-global-shortcuts.diff
diff --git a/applied_patches/0667-sd-customanimation-defbutton.diff b/applied_patches/0558-sd-customanimation-defbutton.diff
similarity index 100%
rename from applied_patches/0667-sd-customanimation-defbutton.diff
rename to applied_patches/0558-sd-customanimation-defbutton.diff
diff --git a/applied_patches/0668-sd-ruler-fix.diff b/applied_patches/0559-sd-ruler-fix.diff
similarity index 100%
rename from applied_patches/0668-sd-ruler-fix.diff
rename to applied_patches/0559-sd-ruler-fix.diff
diff --git a/applied_patches/0669-sd-odf-relaxed-listlevel.diff b/applied_patches/0560-sd-odf-relaxed-listlevel.diff
similarity index 100%
rename from applied_patches/0669-sd-odf-relaxed-listlevel.diff
rename to applied_patches/0560-sd-odf-relaxed-listlevel.diff
diff --git a/applied_patches/0670-sd-animation-ui-fix.diff b/applied_patches/0561-sd-animation-ui-fix.diff
similarity index 100%
rename from applied_patches/0670-sd-animation-ui-fix.diff
rename to applied_patches/0561-sd-animation-ui-fix.diff
diff --git a/applied_patches/0671-slideshow-mute-sound.diff b/applied_patches/0562-slideshow-mute-sound.diff
similarity index 100%
rename from applied_patches/0671-slideshow-mute-sound.diff
rename to applied_patches/0562-slideshow-mute-sound.diff
diff --git a/applied_patches/0672-base64.diff b/applied_patches/0563-base64.diff
similarity index 100%
rename from applied_patches/0672-base64.diff
rename to applied_patches/0563-base64.diff
diff --git a/applied_patches/0673-sfx2-qstart-nocrashhack.diff b/applied_patches/0564-sfx2-qstart-nocrashhack.diff
similarity index 100%
rename from applied_patches/0673-sfx2-qstart-nocrashhack.diff
rename to applied_patches/0564-sfx2-qstart-nocrashhack.diff
diff --git a/applied_patches/0674-slideshow-effect-rewind.diff b/applied_patches/0565-slideshow-effect-rewind.diff
similarity index 100%
rename from applied_patches/0674-slideshow-effect-rewind.diff
rename to applied_patches/0565-slideshow-effect-rewind.diff
diff --git a/applied_patches/0675-svx-ppt-tablerow-height-fix.diff b/applied_patches/0566-svx-ppt-tablerow-height-fix.diff
similarity index 100%
rename from applied_patches/0675-svx-ppt-tablerow-height-fix.diff
rename to applied_patches/0566-svx-ppt-tablerow-height-fix.diff
diff --git a/applied_patches/0676-mail-document-subject.diff b/applied_patches/0567-mail-document-subject.diff
similarity index 100%
rename from applied_patches/0676-mail-document-subject.diff
rename to applied_patches/0567-mail-document-subject.diff
diff --git a/applied_patches/0677-pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff b/applied_patches/0568-pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
similarity index 100%
rename from applied_patches/0677-pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
rename to applied_patches/0568-pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
diff --git a/applied_patches/0678-pptx-gfx-layout-fix.diff b/applied_patches/0569-pptx-gfx-layout-fix.diff
similarity index 100%
rename from applied_patches/0678-pptx-gfx-layout-fix.diff
rename to applied_patches/0569-pptx-gfx-layout-fix.diff
diff --git a/applied_patches/0679-xlsx-export-notes-avoid-dereferencing-0-svx.diff b/applied_patches/0570-xlsx-export-notes-avoid-dereferencing-0-svx.diff
similarity index 100%
rename from applied_patches/0679-xlsx-export-notes-avoid-dereferencing-0-svx.diff
rename to applied_patches/0570-xlsx-export-notes-avoid-dereferencing-0-svx.diff
diff --git a/applied_patches/0680-odf-converter-ignore-writerfilter.diff b/applied_patches/0571-odf-converter-ignore-writerfilter.diff
similarity index 100%
rename from applied_patches/0680-odf-converter-ignore-writerfilter.diff
rename to applied_patches/0571-odf-converter-ignore-writerfilter.diff
diff --git a/applied_patches/0572-external-apm-header.diff b/applied_patches/0572-external-apm-header.diff
new file mode 100644
index 000000000..2319c46d5
--- /dev/null
+++ b/applied_patches/0572-external-apm-header.diff
@@ -0,0 +1,246 @@
+diff --git svtools/inc/svtools/filter.hxx svtools/inc/svtools/filter.hxx
+index 4f33b66..177db61 100644
+--- svtools/inc/svtools/filter.hxx
++++ svtools/inc/svtools/filter.hxx
+@@ -41,6 +41,7 @@
+ #include <com/sun/star/uno/Sequence.h>
+ #include <com/sun/star/beans/PropertyValue.hpp>
+ 
++struct WMF_APMFILEHEADER;
+ // -----------------------
+ // - GraphicFilter-Types -
+ // -----------------------
+@@ -392,13 +393,15 @@ public:
+ 	USHORT          ImportGraphic( Graphic& rGraphic, const String& rPath,
+ 								   SvStream& rStream,
+ 								   USHORT nFormat = GRFILTER_FORMAT_DONTKNOW,
+-								   USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 );
++								   USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0
++				       , WMF_APMFILEHEADER *pAPMHeader = NULL);
+ 
+ 	USHORT          ImportGraphic( Graphic& rGraphic, const String& rPath,
+ 								   SvStream& rStream,
+ 								   USHORT nFormat,
+ 								   USHORT * pDeterminedFormat, sal_uInt32 nImportFlags,
+-								   com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData );
++								   com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData
++				       , WMF_APMFILEHEADER *pAPMHeader = NULL);
+ 
+ 	BOOL            Setup( USHORT nFormat );
+ 
+diff --git svtools/inc/svtools/wmf.hxx svtools/inc/svtools/wmf.hxx
+index 68a4c4f..d3dc61d 100644
+--- svtools/inc/svtools/wmf.hxx
++++ svtools/inc/svtools/wmf.hxx
+@@ -34,7 +34,30 @@
+ #include "svtools/svtdllapi.h"
+ #include <svtools/fltcall.hxx>
+ 
+-BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL );
++struct WMF_APMFILEHEADER {
++  sal_uInt32 key;
++  sal_uInt16 hmf;
++  sal_uInt16 left;
++  sal_uInt16 top;
++  sal_uInt16 right;
++  sal_uInt16 bottom;
++  sal_uInt16 inch;
++  sal_uInt32 reserved;
++  sal_uInt16 checksum;
++
++  WMF_APMFILEHEADER() : key(0x9ac6cdd7L),
++		    hmf(0),
++		    left(0),
++		    top(0),
++		    right(0),
++		    bottom(0),
++		    inch(96),
++		    reserved(0),
++		    checksum(0) {
++  }
++};
++
++BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_APMFILEHEADER *pAPMHeader = NULL );
+ 
+ SVT_DLLPUBLIC BOOL ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem );
+ 
+diff --git svtools/source/filter.vcl/filter/filter.cxx svtools/source/filter.vcl/filter/filter.cxx
+index db14402..14c9ea4 100644
+--- svtools/source/filter.vcl/filter/filter.cxx
++++ svtools/source/filter.vcl/filter/filter.cxx
+@@ -1276,17 +1276,17 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject& rPa
+ 	return nRetValue;
+ }
+ 
+-USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream,
+-									 USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags )
++USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream, USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags, WMF_APMFILEHEADER *pAPMHeader )
+ {
+-	return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL );
++  return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL, pAPMHeader );
+ }
+ 
+ //-------------------------------------------------------------------------
+ 
+ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream,
+ 									 USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags,
+-									 com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
++									 com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData 
++				     , WMF_APMFILEHEADER *pAPMHeader)
+ {
+ 	String					aFilterName;
+ 	ULONG					nStmBegin;
+@@ -1483,7 +1483,7 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
+ 				aFilterName.EqualsIgnoreCaseAscii( IMP_EMF ) )
+ 		{
+ 			GDIMetaFile aMtf;
+-			if( !ConvertWMFToGDIMetaFile( rIStream, aMtf, NULL ) )
++			if( !ConvertWMFToGDIMetaFile( rIStream, aMtf, NULL, pAPMHeader ) )
+ 				nStatus = GRFILTER_FORMATERROR;
+ 			else
+ 			{
+diff --git svtools/source/filter.vcl/wmf/winmtf.hxx svtools/source/filter.vcl/wmf/winmtf.hxx
+index f4ac2d4..9253169 100644
+--- svtools/source/filter.vcl/wmf/winmtf.hxx
++++ svtools/source/filter.vcl/wmf/winmtf.hxx
+@@ -162,6 +162,7 @@ struct LOGFONTW
+ 	BYTE		lfPitchAndFamily;
+ 	String		alfFaceName;
+ };
++struct WMF_APMFILEHEADER;
+ 
+ #define TA_NOUPDATECP			0x0000
+ #define TA_UPDATECP				0x0001
+@@ -765,7 +766,7 @@ private:
+ 	sal_uInt32		nUnicodeEscapeAction;
+ 
+ 	// Liesst den Kopf der WMF-Datei
+-	BOOL			ReadHeader();
++	BOOL			ReadHeader(WMF_APMFILEHEADER *pAPMHeader);
+ 
+ 	// Liesst die Parameter des Rocords mit der Funktionsnummer nFunction.
+ 	void			ReadRecordParams( USHORT nFunction );
+@@ -782,7 +783,7 @@ public:
+ 						: WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem ) {};
+ 
+ 	// Liesst aus dem Stream eine WMF-Datei und fuellt das GDIMetaFile
+-	void			ReadWMF();
++	void			ReadWMF(WMF_APMFILEHEADER *pAPMHeader=NULL);
+ };
+ 
+ #endif
+diff --git svtools/source/filter.vcl/wmf/winwmf.cxx svtools/source/filter.vcl/wmf/winwmf.cxx
+index 9db828c..fda0b81 100644
+--- svtools/source/filter.vcl/wmf/winwmf.cxx
++++ svtools/source/filter.vcl/wmf/winwmf.cxx
+@@ -32,6 +32,7 @@
+ #include "precompiled_svtools.hxx"
+ 
+ #include "winmtf.hxx"
++#include <svtools/wmf.hxx>
+ #include <rtl/crc.h>
+ #include <rtl/tencinfo.h>
+ #include <osl/endian.h>
+@@ -938,7 +939,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
+ 
+ // ------------------------------------------------------------------------
+ 
+-BOOL WMFReader::ReadHeader()
++BOOL WMFReader::ReadHeader(WMF_APMFILEHEADER *pAPMHeader)
+ {
+ 	Rectangle	aPlaceableBound;
+ 	sal_uInt32  nl, nStrmPos = pWMF->Tell();
+@@ -971,11 +972,18 @@ BOOL WMFReader::ReadHeader()
+     }
+ 	else
+ 	{
+-		nUnitsPerInch = 96;       
+-        pWMF->Seek( nStrmPos + 18 );    // set the streampos to the start of the the metaactions
+-        GetPlaceableBound( aPlaceableBound, pWMF );
+-        pWMF->Seek( nStrmPos );
+-	}
++	  nUnitsPerInch = (pAPMHeader!=NULL?pAPMHeader->inch:96);
++	  pWMF->Seek( nStrmPos + 18 );    // set the streampos to the start of the the metaactions
++	  GetPlaceableBound( aPlaceableBound, pWMF );
++	  pWMF->Seek( nStrmPos );
++	  if (pAPMHeader!=NULL) { 
++	    // #n417818#: If we have an external header then overwrite the bounds!
++	    aPlaceableBound=Rectangle(pAPMHeader->left*567*nUnitsPerInch/1440/1000,
++				      pAPMHeader->top*567*nUnitsPerInch/1440/1000,
++				      pAPMHeader->right*567*nUnitsPerInch/1440/1000, 
++				      pAPMHeader->bottom*567*nUnitsPerInch/1440/1000);
++	  }
++	}	
+ 
+ 	pOut->SetUnitsPerInch( nUnitsPerInch );
+     pOut->SetWinOrg( aPlaceableBound.TopLeft() );
+@@ -1010,7 +1018,7 @@ BOOL WMFReader::ReadHeader()
+ 	return TRUE;
+ }
+ 
+-void WMFReader::ReadWMF()
++void WMFReader::ReadWMF(WMF_APMFILEHEADER *pAPMHeader)
+ {
+ 	USHORT	nFunction;
+ 	ULONG	nPos, nPercent, nLastPercent;
+@@ -1028,7 +1036,7 @@ void WMFReader::ReadWMF()
+ 	pWMF->Seek( nStartPos );
+ 	Callback( (USHORT) ( nLastPercent = 0 ) );
+ 
+-	if ( ReadHeader() )
++	if ( ReadHeader( pAPMHeader ) )
+ 	{
+ 
+ 		nPos = pWMF->Tell();
+diff --git svtools/source/filter.vcl/wmf/wmf.cxx svtools/source/filter.vcl/wmf/wmf.cxx
+index 4654864..9e3e258 100644
+--- svtools/source/filter.vcl/wmf/wmf.cxx
++++ svtools/source/filter.vcl/wmf/wmf.cxx
+@@ -38,7 +38,7 @@
+ 
+ // -----------------------------------------------------------------------------
+ 
+-BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem )
++BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem, WMF_APMFILEHEADER *pAPMHeader )
+ {
+ 	UINT32 nMetaType;
+ 	UINT32 nOrgPos = rStreamWMF.Tell();
+@@ -54,7 +54,7 @@ BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile,
+ 	}
+ 	else
+ 	{
+-		WMFReader( rStreamWMF, rGDIMetaFile, pConfigItem ).ReadWMF();
++		WMFReader( rStreamWMF, rGDIMetaFile, pConfigItem ).ReadWMF( pAPMHeader );
+ 	}
+ 	rStreamWMF.SetNumberFormatInt( nOrigNumberFormat );
+ 	return !rStreamWMF.GetError();
+diff --git svx/source/svrtf/rtfgrf.cxx svx/source/svrtf/rtfgrf.cxx
+index ddddab8..587a4ce 100644
+--- svx/source/svrtf/rtfgrf.cxx
++++ svx/source/svrtf/rtfgrf.cxx
+@@ -39,6 +39,7 @@
+ #include <svtools/rtfkeywd.hxx>
+ #include <svtools/rtftoken.h>
+ #include <svtools/filter.hxx>
++#include <svtools/wmf.hxx>
+ 
+ #include "impgrf.hxx"
+ #include "svxrtf.hxx"
+@@ -508,9 +509,15 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
+ 			}
+ 
+ 			String sTmpStr;
++			WMF_APMFILEHEADER aAPMHeader;
++			aAPMHeader.left=0;
++			aAPMHeader.top=0;
++			aAPMHeader.right=rPicType.nWidth;
++			aAPMHeader.bottom=rPicType.nHeight;
++			
++			WMF_APMFILEHEADER *pAPMHeader=(aAPMHeader.right>0 && aAPMHeader.bottom>0?&aAPMHeader:NULL);
+ 			pTmpFile->Seek( STREAM_SEEK_TO_BEGIN );
+-			bValidBmp = 0 == pGF->ImportGraphic( rGrf, sTmpStr, *pTmpFile,
+-												nImportFilter );
++			bValidBmp = 0 == pGF->ImportGraphic( rGrf, sTmpStr, *pTmpFile, nImportFilter, NULL, 0, pAPMHeader );
+ 		}
+ 		delete pTmpFile;
+ 	}
diff --git a/applied_patches/0692-wmf-mm-text.diff b/applied_patches/0573-wmf-mm-text.diff
similarity index 100%
rename from applied_patches/0692-wmf-mm-text.diff
rename to applied_patches/0573-wmf-mm-text.diff
diff --git a/applied_patches/0693-wmf-mm-text-1.diff b/applied_patches/0574-wmf-mm-text-1.diff
similarity index 100%
rename from applied_patches/0693-wmf-mm-text-1.diff
rename to applied_patches/0574-wmf-mm-text-1.diff
diff --git a/applied_patches/0694-sd-create-table-height-fix.diff b/applied_patches/0575-sd-create-table-height-fix.diff
similarity index 100%
rename from applied_patches/0694-sd-create-table-height-fix.diff
rename to applied_patches/0575-sd-create-table-height-fix.diff
diff --git a/applied_patches/0695-pptx-autoplay-fix.diff b/applied_patches/0576-pptx-autoplay-fix.diff
similarity index 100%
rename from applied_patches/0695-pptx-autoplay-fix.diff
rename to applied_patches/0576-pptx-autoplay-fix.diff
diff --git a/applied_patches/0696-configmgr-validate-removedtree.diff b/applied_patches/0577-configmgr-validate-removedtree.diff
similarity index 100%
rename from applied_patches/0696-configmgr-validate-removedtree.diff
rename to applied_patches/0577-configmgr-validate-removedtree.diff
diff --git a/applied_patches/0697-svx-fix-fit-to-frame-crash.diff b/applied_patches/0578-svx-fix-fit-to-frame-crash.diff
similarity index 100%
rename from applied_patches/0697-svx-fix-fit-to-frame-crash.diff
rename to applied_patches/0578-svx-fix-fit-to-frame-crash.diff
diff --git a/applied_patches/0699-svx-fontwork-crash-fix.diff b/applied_patches/0579-svx-fontwork-crash-fix.diff
similarity index 100%
rename from applied_patches/0699-svx-fontwork-crash-fix.diff
rename to applied_patches/0579-svx-fontwork-crash-fix.diff
diff --git a/applied_patches/0700-svx-autoshape-cache-purge.diff b/applied_patches/0580-svx-autoshape-cache-purge.diff
similarity index 100%
rename from applied_patches/0700-svx-autoshape-cache-purge.diff
rename to applied_patches/0580-svx-autoshape-cache-purge.diff
diff --git a/applied_patches/0701-normalize-template-paths-fix.diff b/applied_patches/0581-normalize-template-paths-fix.diff
similarity index 100%
rename from applied_patches/0701-normalize-template-paths-fix.diff
rename to applied_patches/0581-normalize-template-paths-fix.diff
diff --git a/applied_patches/0702-edit-links-decode-unicode-uri.diff b/applied_patches/0582-edit-links-decode-unicode-uri.diff
similarity index 100%
rename from applied_patches/0702-edit-links-decode-unicode-uri.diff
rename to applied_patches/0582-edit-links-decode-unicode-uri.diff
diff --git a/applied_patches/0703-fontconfig-cache-pre-substitution.diff b/applied_patches/0583-fontconfig-cache-pre-substitution.diff
similarity index 100%
rename from applied_patches/0703-fontconfig-cache-pre-substitution.diff
rename to applied_patches/0583-fontconfig-cache-pre-substitution.diff
diff --git a/applied_patches/0704-link-with-uno-cppu.diff b/applied_patches/0584-link-with-uno-cppu.diff
similarity index 100%
rename from applied_patches/0704-link-with-uno-cppu.diff
rename to applied_patches/0584-link-with-uno-cppu.diff
diff --git a/applied_patches/0708-oox-pptx-import-fix-placeholder-text-style.diff b/applied_patches/0585-oox-pptx-import-fix-placeholder-text-style.diff
similarity index 100%
rename from applied_patches/0708-oox-pptx-import-fix-placeholder-text-style.diff
rename to applied_patches/0585-oox-pptx-import-fix-placeholder-text-style.diff
diff --git a/applied_patches/0586-build-fix-linux.diff b/applied_patches/0586-build-fix-linux.diff
new file mode 100644
index 000000000..36bfe8295
--- /dev/null
+++ b/applied_patches/0586-build-fix-linux.diff
@@ -0,0 +1,19 @@
+diff --git sd/prj/build.lst sd/prj/build.lst
+index 52734f4..ef69a6a 100644
+--- sd/prj/build.lst
++++ sd/prj/build.lst
+@@ -30,7 +30,6 @@ sd	sd\source\filter\ppt					nmake	-	all	sd_ppt sd_inc NULL
+ sd	sd\source\filter						nmake	-	all	sd_filt sd_sdi sd_ppt sd_inc NULL
+ sd	sd\source\filter\cgm					nmake	-	all	sd_cgm sd_inc NULL
+ sd	sd\source\filter\eppt					nmake	-	all	sd_eppt sd_inc NULL
+-sd	sd\source\filter\pptx					nmake	-	all	sd_pptx sd_inc NULL
+ sd	sd\source\filter\grf					nmake	-	all	sd_grf sd_inc NULL
+ sd	sd\source\filter\xml					nmake	-	all	sd_filter_xml sd_inc NULL
+ sd	sd\source\filter\html					nmake	-	all	sd_html sd_inc NULL
+@@ -41,5 +40,4 @@ sd	sd\source\ui\framework\configuration	nmake	-	all sd_framework_configuration s
+ sd	sd\source\ui\framework\module       	nmake	-	all sd_framework_module sd_inc NULL
+ sd	sd\source\ui\framework\factories       	nmake	-	all sd_framework_factories sd_inc NULL
+ sd	sd\source\ui\framework\tools           	nmake	-	all sd_framework_tools sd_inc NULL
+-sd	sd\util									nmake	-	all	sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_pptx sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories NULL
+-sd	sd\xml									nmake	-	all	sd_xml NULL
++sd	sd\util									nmake	-	all	sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories NULL
diff --git a/applied_patches/0587-emf+-driver-string.diff b/applied_patches/0587-emf+-driver-string.diff
new file mode 100644
index 000000000..295ab7546
--- /dev/null
+++ b/applied_patches/0587-emf+-driver-string.diff
@@ -0,0 +1,208 @@
+diff --git build/ooo310-m16/cppcanvas/source/mtfrenderer/emfplus.cxx build/ooo310-m16/cppcanvas/source/mtfrenderer/emfplus.cxx
+index a35dbef..3194009 100644
+--- cppcanvas/source/mtfrenderer/emfplus.cxx
++++ cppcanvas/source/mtfrenderer/emfplus.cxx
+@@ -12,6 +12,7 @@
+ #include <basegfx/polygon/b2dpolypolygon.hxx>
+ #include <basegfx/polygon/b2dpolypolygontools.hxx>
+ #include <vcl/canvastools.hxx>
++#include <rtl/ustring.hxx>
+ 
+ #include <com/sun/star/rendering/XCanvas.hpp>
+ #include <com/sun/star/rendering/TexturingMode.hpp>
+@@ -21,6 +22,7 @@
+ #include <implrenderer.hxx>
+ #include <outdevstate.hxx>
+ #include <polypolyaction.hxx>
++#include <textaction.hxx>
+ 
+ #define EmfPlusRecordTypeHeader 16385
+ #define EmfPlusRecordTypeEndOfFile 16386
+@@ -700,6 +702,39 @@ namespace cppcanvas
+             }
+         };
+ 
++        struct EMFPFont : public EMFPObject
++        {
++            sal_uInt32 version;
++	    float emSize;
++	    sal_uInt32 sizeUnit;
++	    sal_Int32 fontFlags;
++	    rtl::OUString family;
++
++            void Read (SvMemoryStream &s)
++            {
++                sal_uInt32 header;
++		sal_uInt32 reserved;
++		sal_uInt32 length;
++
++                s >> header >> emSize >> sizeUnit >> fontFlags >> reserved >> length;
++
++		OSL_ASSERT( ( header >> 12 ) == 0xdbc01 );
++
++                EMFP_DEBUG (printf ("EMF+\tfont\nEMF+\theader: 0x%08x version: 0x%08x size: %f unit: 0x%08x\n", header >> 12, header & 0x1fff, emSize, sizeUnit));
++                EMFP_DEBUG (printf ("EMF+\tflags: 0x%08x reserved: 0x%08x length: 0x%08x\n", fontFlags, reserved, length));
++
++		if( length > 0 && length < 0x4000 ) {
++		    sal_Unicode chars[ length ];
++
++		    for( int i = 0; i < length; i++ )
++			s >> chars[ i ];
++
++		    family = ::rtl::OUString( chars, length );
++		    EMFP_DEBUG (printf ("EMF+\tfamily: %s\n", rtl::OUStringToOString( family, RTL_TEXTENCODING_UTF8).getStr()));
++		}
++            }
++        };
++
+         void ImplRenderer::ReadRectangle (SvStream& s, float& x, float& y, float &width, float& height, sal_uInt32 flags)
+         {
+             if (flags & 0x4000) {
+@@ -796,10 +831,22 @@ namespace cppcanvas
+             return ::basegfx::B2DRange (x, y, x + w, y + h);
+         }
+ 
++#define COLOR(x) \
++	::vcl::unotools::colorToDoubleSequence( ::Color (0xff - (x >> 24), \
++							 (x >> 16) & 0xff, \
++							 (x >> 8) & 0xff, \
++							 x & 0xff),	\
++						rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
++#define SET_FILL_COLOR(x) \
++	rState.fillColor = COLOR(x);
++#define SET_LINE_COLOR(x) \
++	rState.lineColor = COLOR(x);
++#define SET_TEXT_COLOR(x) \
++	rState.textColor = COLOR(x);
++
+         void ImplRenderer::EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms,
+                                                 OutDevState& rState, const CanvasSharedPtr& rCanvas, bool isColor, sal_uInt32 brushIndexOrColor)
+         {
+-            sal_uInt8 transparency;
+             ::basegfx::B2DPolyPolygon localPolygon (polygon);
+ 
+             EMFP_DEBUG (printf ("EMF+\tfill polygon\n"));
+@@ -811,15 +858,9 @@ namespace cppcanvas
+             if (isColor) {
+                 EMFP_DEBUG (printf ("EMF+\t\tcolor fill\n"));
+ 
+-                transparency = 0xff - (brushIndexOrColor >> 24);
+-
+                 rState.isFillColorSet = true;
+                 rState.isLineColorSet = false;
+-                rState.fillColor = ::vcl::unotools::colorToDoubleSequence( ::Color (transparency,
+-                                                                                    (brushIndexOrColor >> 16) & 0xff,
+-                                                                                    (brushIndexOrColor >> 8) & 0xff,
+-                                                                                    brushIndexOrColor & 0xff),
+- 																			rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
++		SET_FILL_COLOR(brushIndexOrColor);
+ 
+                 pPolyAction = ActionSharedPtr ( internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon, rParms.mrCanvas, rState ) );
+ 
+@@ -1053,6 +1094,14 @@ namespace cppcanvas
+ 
+                     break;
+                 }
++            case EmfPlusObjectTypeFont:
++                {
++                    EMFPFont *font;
++                    aObjects [index] = font = new EMFPFont ();
++                    font->Read (rObjectStream);
++
++                    break;
++                }
+             default:
+                 EMFP_DEBUG (printf ("EMF+\tObject unhandled flags: 0x%04x\n", flags & 0xff00));
+                 break;
+@@ -1411,10 +1460,89 @@ namespace cppcanvas
+                         EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+                     break;
+                 }
+-                case EmfPlusRecordTypeDrawDriverString:
++	        case EmfPlusRecordTypeDrawDriverString: {
+                     EMFP_DEBUG (printf ("EMF+ DrawDriverString, flags: 0x%04x\n", flags));
+-                    EMFP_DEBUG (printf ("EMF+\tTODO\n"));
++		    sal_uInt32 brushIndexOrColor;
++		    sal_uInt32 optionFlags;
++		    sal_uInt32 hasMatrix;
++		    sal_uInt32 glyphsCount;
++
++		    rMF >> brushIndexOrColor >> optionFlags >> hasMatrix >> glyphsCount;
++
++		    EMFP_DEBUG (printf ("EMF+\t%s: 0x%08x\n", (flags & 0x8000) ? "color" : "brush index", brushIndexOrColor));
++		    EMFP_DEBUG (printf ("EMF+\toption flags: 0x%08x\n", optionFlags));
++		    EMFP_DEBUG (printf ("EMF+\thas matrix: %d\n", hasMatrix));
++		    EMFP_DEBUG (printf ("EMF+\tglyphs: %d\n", glyphsCount));
++
++		    if( ( optionFlags & 1 ) && glyphsCount > 0 ) {
++			sal_uInt16 chars[ glyphsCount ];
++			float charsPosX[ glyphsCount ];
++			float charsPosY[ glyphsCount ];
++
++			for( int i=0; i<glyphsCount; i++) {
++			    rMF >> chars[i];
++			    EMFP_DEBUG (printf ("EMF+\tglyph[%d]: 0x%04x\n",
++			    i, chars[i]));
++			}
++			for( int i=0; i<glyphsCount; i++) {
++			    rMF >> charsPosX[i] >> charsPosY[i];
++			    EMFP_DEBUG (printf ("EMF+\tglyphPosition[%d]: %f, %f\n", i, charsPosX[i], charsPosY[i]));
++			}
++
++			XForm transform;
++			if( hasMatrix ) {
++			    rMF >> transform;
++			    EMFP_DEBUG (printf ("EMF+\tmatrix:: %f, %f, %f, %f, %f, %f\n", transform.eM11, transform.eM12, transform.eM21, transform.eM22, transform.eDx, transform.eDy));
++			}
++
++			// create and add the text action
++			XubString text( chars, glyphsCount );
++
++                        EMFPFont *font = (EMFPFont*) aObjects[ flags & 0xff ];
++
++			rendering::FontRequest aFontRequest;
++			aFontRequest.FontDescription.FamilyName = font->family;
++			aFontRequest.CellSize = (rState.mapModeTransform*MapSize( font->emSize, 0 )).getX();
++			rState.xFont = rFactoryParms.mrCanvas->getUNOCanvas()->createFont( aFontRequest,
++											   uno::Sequence< beans::PropertyValue >(),
++											   geometry::Matrix2D() );
++			if( flags & 0x8000 )
++ 			    SET_TEXT_COLOR(brushIndexOrColor);
++
++			ActionSharedPtr pTextAction( 
++			    TextActionFactory::createTextAction(
++				::vcl::unotools::pointFromB2DPoint ( Map( charsPosX[0], charsPosY[0] ) ),
++				::Size(),
++				::Color(),
++				::Size(),
++				::Color(),
++				text,
++				0,
++				glyphsCount,
++				NULL,
++				rFactoryParms.mrVDev,
++				rFactoryParms.mrCanvas,
++				rState,
++				rFactoryParms.mrParms,
++				false ) );
++
++			if( pTextAction )
++			{
++			    EMFP_DEBUG (printf ("EMF+\t\tadd text action\n"));
++
++			    maActions.push_back(
++				MtfAction(
++				    pTextAction,
++				    rFactoryParms.mrCurrActionIndex ) );
++                
++			    rFactoryParms.mrCurrActionIndex += pTextAction->getActionCount()-1;
++			}
++		    } else {
++			EMFP_DEBUG (printf ("EMF+\tTODO: fonts (non-unicode glyphs chars)\n"));
++		    }
++
+                     break;
++		}
+                 default:
+                     EMFP_DEBUG (printf ("EMF+ unhandled record type: %d\n", type));
+                     EMFP_DEBUG (printf ("EMF+\tTODO\n"));
diff --git a/applied_patches/0588-sd-print-fix-pageoffset.diff b/applied_patches/0588-sd-print-fix-pageoffset.diff
new file mode 100644
index 000000000..52a33d843
--- /dev/null
+++ b/applied_patches/0588-sd-print-fix-pageoffset.diff
@@ -0,0 +1,27 @@
+diff -rup sd/source/ui/view-orig//PrintManager.cxx sd/source/ui/view/PrintManager.cxx
+--- sd/source/ui/view-orig//PrintManager.cxx	2009-09-17 15:45:07.000000000 +0200
++++ sd/source/ui/view/PrintManager.cxx	2009-09-17 17:43:47.000000000 +0200
+@@ -1610,15 +1610,18 @@ void PrintManager::PrintStdOrNotes (
+                             }
+                             else
+                             {
++				Point aOrigin;
++
++				// if the printable area is bigger than page size, center the page
++				if( aPageSize.Width() < aPrintWidth )
++				    aOrigin.X() = ( aPrintWidth - aPageSize.Width() )/2;
++				if( aPageSize.Height() < aPrintHeight )
++				    aOrigin.Y() = ( aPrintHeight - aPageSize.Height() )/2;
++
+                                 // Handle 3.  Print parts of the page in the
+                                 // size of the printable area until the
+                                 // whole page is covered.
+ 
+-                                // keep the page content at its
+-                                // position if it fits, otherwise move
+-                                // it to the printable area
+-                                Point aOrigin (aPageWidth < aPrintWidth ? -aPageOfs.X() : 0, aPageHeight < aPrintHeight ? -aPageOfs.Y() : 0);
+-
+                                 for (aPageOrigin = aOrigin;
+                                      -aPageOrigin.Y()<aPageHeight;
+                                          aPageOrigin.Y() -= aPrintHeight)
diff --git a/applied_patches/0589-svx-ppt-import-fix-bullet-size.diff b/applied_patches/0589-svx-ppt-import-fix-bullet-size.diff
new file mode 100644
index 000000000..e87148c78
--- /dev/null
+++ b/applied_patches/0589-svx-ppt-import-fix-bullet-size.diff
@@ -0,0 +1,12 @@
+diff -rup svx-orig/source/svdraw/svdfppt.cxx svx/source/svdraw/svdfppt.cxx
+--- svx-orig/source/svdraw/svdfppt.cxx	2009-09-23 11:36:41.000000000 +0200
++++ svx/source/svdraw/svdfppt.cxx	2009-09-23 11:36:51.000000000 +0200
+@@ -5021,7 +5021,7 @@ void PPTStyleTextPropReader::ReadParaPro
+             {
+                 rIn >> aSet.mpArry[ PPT_ParaAttr_BulletHeight ];
+                 if ( ! ( ( nMask & ( 1 << PPT_ParaAttr_BuHardHeight ) )
+-                         && ( nBulFlg && ( 1 << PPT_ParaAttr_BuHardHeight ) ) ) )
++                         && ( nBulFlg & ( 1 << PPT_ParaAttr_BuHardHeight ) ) ) )
+                     aSet.mnAttrSet ^= 0x40;
+             }
+             if ( nMask & 0x0020 )	// buColor
diff --git a/applied_patches/0710-binfilter-stl.diff b/applied_patches/0590-binfilter-stl.diff
similarity index 100%
rename from applied_patches/0710-binfilter-stl.diff
rename to applied_patches/0590-binfilter-stl.diff
diff --git a/applied_patches/0711-link-as-needed-bf.diff b/applied_patches/0591-link-as-needed-bf.diff
similarity index 100%
rename from applied_patches/0711-link-as-needed-bf.diff
rename to applied_patches/0591-link-as-needed-bf.diff
diff --git a/applied_patches/0712-binfilter-dont-extern-sRTF-sHTML.diff b/applied_patches/0592-binfilter-dont-extern-sRTF-sHTML.diff
similarity index 100%
rename from applied_patches/0712-binfilter-dont-extern-sRTF-sHTML.diff
rename to applied_patches/0592-binfilter-dont-extern-sRTF-sHTML.diff
diff --git a/applied_patches/0713-fit-list-to-size-binfilter.diff b/applied_patches/0593-fit-list-to-size-binfilter.diff
similarity index 100%
rename from applied_patches/0713-fit-list-to-size-binfilter.diff
rename to applied_patches/0593-fit-list-to-size-binfilter.diff
diff --git a/applied_patches/0714-reportdesigner-no-license.diff b/applied_patches/0594-reportdesigner-no-license.diff
similarity index 100%
rename from applied_patches/0714-reportdesigner-no-license.diff
rename to applied_patches/0594-reportdesigner-no-license.diff
diff --git a/applied_patches/0715-presenterscreen-no-license.diff b/applied_patches/0595-presenterscreen-no-license.diff
similarity index 100%
rename from applied_patches/0715-presenterscreen-no-license.diff
rename to applied_patches/0595-presenterscreen-no-license.diff
diff --git a/applied_patches/0716-presentation-minimizer-no-license.diff b/applied_patches/0596-presentation-minimizer-no-license.diff
similarity index 100%
rename from applied_patches/0716-presentation-minimizer-no-license.diff
rename to applied_patches/0596-presentation-minimizer-no-license.diff
diff --git a/applied_patches/0717-apache-commons-build-fix-invalid-chars.diff b/applied_patches/0597-apache-commons-build-fix-invalid-chars.diff
similarity index 100%
rename from applied_patches/0717-apache-commons-build-fix-invalid-chars.diff
rename to applied_patches/0597-apache-commons-build-fix-invalid-chars.diff
diff --git a/applied_patches/0718-wiki-publisher-no-license.diff b/applied_patches/0598-wiki-publisher-no-license.diff
similarity index 100%
rename from applied_patches/0718-wiki-publisher-no-license.diff
rename to applied_patches/0598-wiki-publisher-no-license.diff
diff --git a/applied_patches/0719-pdfimport-no-license.diff b/applied_patches/0599-pdfimport-no-license.diff
similarity index 100%
rename from applied_patches/0719-pdfimport-no-license.diff
rename to applied_patches/0599-pdfimport-no-license.diff
diff --git a/applied_patches/0720-build-java-target-extensions.diff b/applied_patches/0600-build-java-target-extensions.diff
similarity index 100%
rename from applied_patches/0720-build-java-target-extensions.diff
rename to applied_patches/0600-build-java-target-extensions.diff
diff --git a/applied_patches/0721-pdfimport-lax-restrictions.diff b/applied_patches/0601-pdfimport-lax-restrictions.diff
similarity index 100%
rename from applied_patches/0721-pdfimport-lax-restrictions.diff
rename to applied_patches/0601-pdfimport-lax-restrictions.diff
diff --git a/applied_patches/0722-slideshow-effect-rewind-sdext.diff b/applied_patches/0602-slideshow-effect-rewind-sdext.diff
similarity index 100%
rename from applied_patches/0722-slideshow-effect-rewind-sdext.diff
rename to applied_patches/0602-slideshow-effect-rewind-sdext.diff
diff --git a/applied_patches/0628-fit-list-to-size-popup.diff b/applied_patches/0628-fit-list-to-size-popup.diff
deleted file mode 100644
index 6c4d98696..000000000
--- a/applied_patches/0628-fit-list-to-size-popup.diff
+++ /dev/null
@@ -1,288 +0,0 @@
- sd/inc/app.hrc                                     |    1 
- sd/sdi/_drvwsh.sdi                                 |    5 ++
- sd/sdi/sdraw.sdi                                   |   27 +++++++++++++
- sd/source/ui/app/menuids_tmpl.src                  |    8 ++++
- sd/source/ui/app/popup2_tmpl.src                   |   43 ++++++++++++++++++++
- sd/source/ui/inc/res_bmp.hrc                       |    2 +
- sd/source/ui/view/drviews2.cxx                     |   25 ++++++++++++
- sd/source/ui/view/drviews4.cxx                     |    6 ++-
- sd/source/ui/view/drviewsj.cxx                     |   19 ++++++---
- .../Linux_X86_64rc                                 |    2 -
- .../unorc                                          |    2 -
- 11 files changed, 130 insertions(+), 10 deletions(-)
-
-
-diff --git sd/inc/app.hrc sd/inc/app.hrc
-index 83cfa86..9bd8aee 100644
---- sd/inc/app.hrc
-+++ sd/inc/app.hrc
-@@ -459,11 +459,12 @@
- #define SID_DISPLAY_MASTER_OBJECTS          (SID_SD_START+437)
- #define SID_INSERTPAGE_LAYOUT_MENU          (SID_SD_START+438)
- #define SID_TP_EDIT_MASTER					(SID_SD_START+439)
-+#define SID_OUTLINE_TEXT_AUTOFIT            (SID_SD_START+440)
- 
- // Add companion for the SID_HIDE_SLIDE (that is defined in svx)
--#define SID_SHOW_SLIDE                      (SID_SD_START+440)
-+#define SID_SHOW_SLIDE                      (SID_SD_START+441)
- 
--#define SID_ADD_MOTION_PATH					(SID_SD_START+441)
--#define SID_TABLE_TOOLBOX					(SID_SD_START+442)
-+#define SID_ADD_MOTION_PATH					(SID_SD_START+442)
-+#define SID_TABLE_TOOLBOX					(SID_SD_START+443)
- 
- #endif
-diff --git sd/sdi/_drvwsh.sdi sd/sdi/_drvwsh.sdi
-index c895d2e..44a6ae0 100644
---- sd/sdi/_drvwsh.sdi
-+++ sd/sdi/_drvwsh.sdi
-@@ -665,6 +665,11 @@ interface DrawView
-         ExecMethod = FuPermanent ;
-         StateMethod = GetMenuState ;
-     ]
-+    SID_OUTLINE_TEXT_AUTOFIT // ole : no, status : ?
-+    [
-+        ExecMethod = FuTemporary ;
-+        StateMethod = GetMenuState ;
-+    ]
-     SID_TEXT_FITTOSIZE_VERTICAL // ole : no, status : ?
-     [
-         ExecMethod = FuPermanent ;
-diff --git sd/sdi/sdraw.sdi sd/sdi/sdraw.sdi
-index c4d7bad..fae94ab 100644
---- sd/sdi/sdraw.sdi
-+++ sd/sdi/sdraw.sdi
-@@ -6377,6 +6377,33 @@ SfxBoolItem TextFitToSizeTool SID_TEXT_FITTOSIZE
- ]
- 
- //--------------------------------------------------------------------------
-+SfxBoolItem TextAutoFitToSize SID_OUTLINE_TEXT_AUTOFIT
-+
-+[
-+	/* flags: */  
-+	AutoUpdate = TRUE, 
-+	Cachable = Cachable, 
-+	FastCall = FALSE, 
-+	HasCoreId = FALSE, 
-+	HasDialog = FALSE, 
-+	ReadOnlyDoc = FALSE, 
-+	Toggle = FALSE, 
-+	Container = FALSE, 
-+	RecordAbsolute = FALSE, 
-+	RecordPerSet;
-+	Synchron;
-+
-+	Readonly = FALSE, 
-+
-+	/* config: */ 
-+	AccelConfig = TRUE, 
-+	MenuConfig = TRUE, 
-+	StatusBarConfig = FALSE, 
-+	ToolBoxConfig = TRUE, 
-+	GroupId = GID_FORMAT;
-+]
-+
-+//--------------------------------------------------------------------------
- TbxImageItem TextToolbox SID_DRAWTBX_TEXT
- 
- [
-diff --git sd/source/ui/app/menuids_tmpl.src sd/source/ui/app/menuids_tmpl.src
-index feb34df..d35dc60 100644
---- sd/source/ui/app/menuids_tmpl.src
-+++ sd/source/ui/app/menuids_tmpl.src
-@@ -307,6 +307,14 @@
-         Text [ en-US ] = "~Text..." ; \
- 	};
- 
-+#define MN_OUTLINE_TEXT_AUTOFIT \
-+    MenuItem\
-+    {\
-+        Identifier = SID_OUTLINE_TEXT_AUTOFIT ; \
-+        HelpID = SID_OUTLINE_TEXT_AUTOFIT ; \
-+        Text [ en-US ] = "~Autofit Text" ; \
-+	};
-+
- #define MN_CONNECTION \
-     MenuItem\
-     {\
-diff --git sd/source/ui/app/popup2_tmpl.src sd/source/ui/app/popup2_tmpl.src
-index 63ad153..c5340a9 100644
---- sd/source/ui/app/popup2_tmpl.src
-+++ sd/source/ui/app/popup2_tmpl.src
-@@ -82,6 +82,49 @@
- };
- 
- //
-+// OUTLINETEXTOBJ_POPUP
-+//
-+#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
-+	Menu RID_DRAW_OUTLINETEXTOBJ_POPUP
-+#elif  SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
-+	Menu RID_GRAPHIC_OUTLINETEXTOBJ_POPUP
-+#endif
-+{
-+	ItemList =
-+	{
-+		MN_SET_DEFAULT
-+		SEPARATOR
-+		MN_LINE
-+		MN_AREA
-+		MN_TEXTATTR
-+		MN_OUTLINE_TEXT_AUTOFIT
-+		MN_TRANSFORM
-+		MN_FONTWORK
-+		SEPARATOR
-+		MN_CHAR_PARAGRAPH
-+		SEPARATOR
-+		MN_POSITION
-+		MN_OBJECT_ALIGN
-+		MN_DISTRIBUTE
-+		MNSUB_CONVERT
-+
-+		//-#i68101#----------------------
-+		SEPARATOR
-+		MN_OBJECT_TITLE_DESCRIPTION
-+		MN_NAME_GROUP
-+		//-#i68101#----------------------
-+
-+#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
-+		SEPARATOR
-+		MN_EFFECT
-+		MN_ACTION
-+#endif
-+		SEPARATOR
-+		MN_STYLEDT
-+	};
-+};
-+
-+//
- // GEOMOBJ_POPUP
- //
- #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
-diff --git sd/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc
-index d4914a3..8565e1b 100644
---- sd/source/ui/inc/res_bmp.hrc
-+++ sd/source/ui/inc/res_bmp.hrc
-@@ -301,6 +301,9 @@
- 
- #define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP	RID_APP_START+93
- 
-+#define RID_DRAW_OUTLINETEXTOBJ_POPUP		RID_APP_START+94
-+#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP	RID_APP_START+95
-+
- /*
-  * Pointer (Mauszeiger)
-  */
-diff --git sd/source/ui/view/drviews2.cxx sd/source/ui/view/drviews2.cxx
-index f55b303..605716f 100644
---- sd/source/ui/view/drviews2.cxx
-+++ sd/source/ui/view/drviews2.cxx
-@@ -175,6 +175,31 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
- 
- 	switch ( nSId )
- 	{
-+        case SID_OUTLINE_TEXT_AUTOFIT:
-+        {
-+            SfxUndoManager* pUndoManager = GetDocSh()->GetUndoManager();
-+            SdrObject* pObj = NULL;
-+            const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
-+            if( rMarkList.GetMarkCount() == 1 )
-+            {
-+                pUndoManager->EnterListAction( String(), String() );
-+                mpDrawView->BegUndo();
-+
-+                pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-+                bool bSet = ((const SdrTextFitToSizeTypeItem*)pObj->GetMergedItemSet().GetItem(SDRATTR_TEXT_FITTOSIZE))->GetValue() != SDRTEXTFIT_NONE;
-+
-+                mpDrawView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj));
-+
-+                pObj->SetMergedItem(SdrTextFitToSizeTypeItem(bSet ? SDRTEXTFIT_NONE : SDRTEXTFIT_AUTOFIT));
-+				
-+                mpDrawView->EndUndo();
-+                pUndoManager->LeaveListAction();
-+            }
-+            Cancel();
-+            rReq.Done();
-+        }
-+        break;
-+
- 		// Flaechen und Linien-Attribute:
- 		// Sollten (wie StateMethode) eine eigene
- 		// Execute-Methode besitzen
-diff --git sd/source/ui/view/drviews4.cxx sd/source/ui/view/drviews4.cxx
-index 66482d4..8a9b122 100644
---- sd/source/ui/view/drviews4.cxx
-+++ sd/source/ui/view/drviews4.cxx
-@@ -669,9 +669,13 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
- 							{
- 								switch ( nId )
- 								{
-+									case OBJ_OUTLINETEXT:
-+										nSdResId = bGraphicShell ? RID_GRAPHIC_OUTLINETEXTOBJ_POPUP :
-+																	RID_DRAW_OUTLINETEXTOBJ_POPUP;
-+										break;
-+
- 									case OBJ_CAPTION:
- 									case OBJ_TITLETEXT:
--									case OBJ_OUTLINETEXT:
- 									case OBJ_TEXT:
- 										nSdResId = bGraphicShell ? RID_GRAPHIC_TEXTOBJ_POPUP :
- 																	RID_DRAW_TEXTOBJ_POPUP;
-diff --git sd/source/ui/view/drviewsj.cxx sd/source/ui/view/drviewsj.cxx
-index 5892f63..eceea7a 100644
---- sd/source/ui/view/drviewsj.cxx
-+++ sd/source/ui/view/drviewsj.cxx
-@@ -213,9 +213,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
- 				rSet.DisableItem( SID_CHANGEPOLYGON );
- 			}
- 
--			if(nInv == SdrInventor && (nId == OBJ_TITLETEXT || nId == OBJ_OUTLINETEXT))
--				rSet.DisableItem( SID_TEXTATTR_DLG );
--
- 			if(nInv == SdrInventor && nId == OBJ_TABLE )
- 			{
- 				rSet.DisableItem( SID_TEXTATTR_DLG );
-@@ -308,6 +305,17 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
- 			else
- 				rSet.DisableItem( SID_MODIFY_FIELD );
- 		}
-+		if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTLINE_TEXT_AUTOFIT ) )
-+		{
-+            bool bSet = false;
-+            const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
-+            if( rMarkList.GetMarkCount() == 1 )
-+            {
-+                SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-+                bSet = ((const SdrTextFitToSizeTypeItem*)pObj->GetMergedItemSet().GetItem(SDRATTR_TEXT_FITTOSIZE))->GetValue() != SDRTEXTFIT_NONE;
-+            }
-+            rSet.Put(SfxBoolItem(SID_OUTLINE_TEXT_AUTOFIT, bSet));
-+		}
- 
- 		rSet.DisableItem( SID_GROUP );
- 		rSet.DisableItem( SID_COMBINE );
-@@ -357,7 +365,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
- 			BOOL bGraf = FALSE;
- 			BOOL bDrawObj = FALSE;
- 			BOOL b3dObj = FALSE;
--			BOOL bTitOutText = FALSE;
- 			bool bTable = false;
- 			BOOL bMeasureObj = FALSE;
- 			BOOL bEdgeObj = FALSE; // Connector
-@@ -397,8 +404,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
- 
- 						case OBJ_GRAF: bGraf = TRUE; break;
- 
--						case OBJ_TITLETEXT:
--						case OBJ_OUTLINETEXT: bTitOutText = TRUE; break;
- 						case OBJ_TABLE: bTable = true; break;
- 					}
- 				}
-@@ -446,7 +451,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
- 			{
- 				rSet.DisableItem( SID_UNGROUP );
- 			}
--			if( bTitOutText || bTable )
-+			if( bTable )
- 				rSet.DisableItem( SID_TEXTATTR_DLG );
- 
- 			if( !bMeasureObj )
diff --git a/applied_patches/0636-ui-desktop-integration.diff b/applied_patches/0636-ui-desktop-integration.diff
deleted file mode 100644
index 352cadba1..000000000
--- a/applied_patches/0636-ui-desktop-integration.diff
+++ /dev/null
@@ -1,223 +0,0 @@
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old	2009-04-06 16:42:16.000000000 +0000
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2009-04-06 16:42:19.000000000 +0000
-@@ -5653,6 +5653,13 @@ Dymamic border coloring means that when
- 				</info>
- 				<value>false</value>
- 			</prop>
-+			<prop oor:name="DisableUICustomization" oor:type="xs:boolean">
-+				<info>
-+					<author>RSiddhartha</author>
-+					<desc>Disables the customization of the UI elements.</desc>
-+				</info>
-+				<value>false</value>
-+			</prop>
- 			<prop oor:name="SymbolSet" oor:type="xs:short">
- 				<!-- UIHints: Tools  Options General View -->
- 				<info>
---- svtools/inc/svtools/miscopt.hxx.old	2009-04-06 16:42:16.000000000 +0000
-+++ svtools/inc/svtools/miscopt.hxx	2009-04-06 16:42:19.000000000 +0000
-@@ -117,6 +117,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: publ
-         void        SetTryODMADialog( sal_Bool bSet );
-         sal_Bool    IsTryUseODMADialogReadOnly() const;
- 
-+        sal_Bool    DisableUICustomization() const;
-+
-         sal_Bool    IsPluginsEnabled() const;
-         void        SetPluginsEnabled( sal_Bool bEnable );
-         sal_Bool    IsPluginsEnabledReadOnly() const;
---- svtools/source/config/miscopt.cxx.old	2009-04-06 16:42:16.000000000 +0000
-+++ svtools/source/config/miscopt.cxx	2009-04-06 16:42:19.000000000 +0000
-@@ -89,8 +89,10 @@ using namespace ::com::sun::star;
- #define PROPERTYHANDLE_TRYODMADIALOG	6
- #define PROPERTYNAME_SHOWLINKWARNINGDIALOG	ASCII_STR("ShowLinkWarningDialog")
- #define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
-+#define PROPERTYNAME_DISABLEUICUSTOMIZATION	ASCII_STR("DisableUICustomization")
-+#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION			8
- 
--#define PROPERTYCOUNT						8
-+#define PROPERTYCOUNT						9
- 
- #define VCL_TOOLBOX_STYLE_FLAT				((USHORT)0x0004) // from <vcl/toolbox.hxx>
- 
-@@ -123,6 +125,7 @@ class SvtMiscOptions_Impl : public Confi
-     sal_Bool    m_bIsUseSystemPrintDialogRO;
-     sal_Bool    m_bShowLinkWarningDialog;
-     sal_Bool    m_bIsShowLinkWarningDialogRO;
-+    sal_Bool    m_bDisableUICustomization;
- 
-     //-------------------------------------------------------------------------------------------------------------
- 	//	public methods
-@@ -200,6 +203,9 @@ class SvtMiscOptions_Impl : public Confi
-         inline sal_Bool IsTryUseODMADialogReadOnly() const
-         { return m_bIsTryODMADialogRO; }
- 
-+        inline sal_Bool DisableUICustomization() const
-+        { return m_bDisableUICustomization; }
-+
-         inline sal_Bool IsPluginsEnabled() const
-         { return m_bPluginsEnabled; }
- 
-@@ -448,6 +454,13 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl
-                 m_bIsSymbolsStyleRO = seqRO[nProperty];
-                 break;
-             }
-+	    
-+            case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : 
-+            {
-+                if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
-+                    DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
-+                    break;
-+            }
-         }
- 	}
- 
-@@ -563,6 +576,11 @@ void SvtMiscOptions_Impl::Load( const Se
-                                                             }
-                                                         }
-                                                     break;
-+            case PROPERTYHANDLE_DISABLEUICUSTOMIZATION      :   {
-+                                                            if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
-+                                                                DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
-+                                                        }
-+                                                    break;
-         }
-     }
- }
-@@ -726,6 +744,12 @@ void SvtMiscOptions_Impl::Commit()
-                     seqValues[nProperty] <<= m_bShowLinkWarningDialog;
-                 break;
-             }
-+
-+            case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
-+            {
-+                seqValues[nProperty] <<= m_bDisableUICustomization;
-+                break;
-+            }
-         }
- 	}
- 	// Set properties in configuration.
-@@ -747,7 +771,8 @@ Sequence< OUString > SvtMiscOptions_Impl
-         PROPERTYNAME_SYMBOLSTYLE,
-         PROPERTYNAME_USESYSTEMPRINTDIALOG,
-         PROPERTYNAME_TRYODMADIALOG,
--        PROPERTYNAME_SHOWLINKWARNINGDIALOG
-+        PROPERTYNAME_SHOWLINKWARNINGDIALOG,
-+        PROPERTYNAME_DISABLEUICUSTOMIZATION
- 	};
- 
- 	// Initialize return sequence with these list ...
-@@ -908,6 +933,11 @@ sal_Bool SvtMiscOptions::IsGetSymbolsSty
-     return m_pDataContainer->IsGetSymbolsStyleReadOnly();
- }
- 
-+sal_Bool SvtMiscOptions::DisableUICustomization() const
-+{
-+    return m_pDataContainer->DisableUICustomization();
-+}
-+
- sal_Int16 SvtMiscOptions::GetToolboxStyle() const
- {
-     return m_pDataContainer->GetToolboxStyle();
---- sfx2/sdi/appslots.sdi.old	2009-04-02 10:43:51.000000000 +0000
-+++ sfx2/sdi/appslots.sdi	2009-04-06 16:42:19.000000000 +0000
-@@ -188,6 +188,7 @@ interface Application
- 	SID_AVAILABLE_TOOLBARS
- 	[
- 		ExecMethod = MiscExec_Impl ;
-+		StateMethod = MiscState_Impl ;
- 	]
- 	SID_HELP_TUTORIALS
- 	[
---- sfx2/source/appl/appserv.cxx.old	2009-04-06 16:41:54.000000000 +0000
-+++ sfx2/source/appl/appserv.cxx	2009-04-06 16:42:19.000000000 +0000
-@@ -90,6 +90,7 @@
- #include <svtools/moduleoptions.hxx>
- #include <svtools/regoptions.hxx>
- #include <svtools/helpopt.hxx>
-+#include <svtools/miscopt.hxx>
- #include <toolkit/helper/vclunohelper.hxx>
- #include <tools/shl.hxx>
- #include <unotools/bootstrap.hxx>
-@@ -680,6 +681,18 @@ void SfxApplication::MiscState_Impl(SfxI
- 					break;
- 				}
- 
-+				case SID_CONFIG:
-+				case SID_TOOLBOXOPTIONS:
-+				case SID_CONFIGSTATUSBAR:
-+				case SID_CONFIGMENU:
-+				case SID_CONFIGACCEL:
-+				case SID_CONFIGEVENT:
-+				{
-+					if( SvtMiscOptions().DisableUICustomization() )
-+						rSet.DisableItem(nWhich);
-+					break;
-+				}
-+
- 				case SID_BASICSTOP:
- 					if ( !StarBASIC::IsRunning() )
- 						rSet.DisableItem(nWhich);
---- framework/source/uielement/toolbarmanager.cxx.old	2009-04-02 10:56:25.000000000 +0000
-+++ framework/source/uielement/toolbarmanager.cxx	2009-04-06 16:42:19.000000000 +0000
-@@ -252,7 +252,7 @@ ToolBarManager::ToolBarManager( const Re
-     m_bUpdateControllers( sal_False ),
-     m_bImageOrientationRegistered( sal_False ),
-     m_bImageMirrored( sal_False ),
--    m_bCanBeCustomized( sal_True ),
-+    m_bCanBeCustomized( !SvtMiscOptions().DisableUICustomization() ),
-     m_lImageRotation( 0 ),
-     m_pToolBar( pToolBar ),
-     m_aResourceName( rResourceName ),
-@@ -473,6 +473,24 @@ void ToolBarManager::UpdateControllers()
- {
-     RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" );
- 
-+    if( !m_bCanBeCustomized )
-+    {
-+        Any a;
-+        Reference< XLayoutManager > xLayoutManager;
-+        Reference< XPropertySet > xFramePropSet( m_xFrame, UNO_QUERY );
-+        if ( xFramePropSet.is() )
-+            a = xFramePropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
-+        a >>= xLayoutManager;
-+        Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
-+        if ( xLayoutManager.is() && xDockable.is() )
-+        {
-+            ::com::sun::star::awt::Point aPoint;
-+            aPoint.X = aPoint.Y = LONG_MAX;
-+            xLayoutManager->dockWindow( m_aResourceName, DockingArea_DOCKINGAREA_DEFAULT, aPoint );
-+            xLayoutManager->lockWindow( m_aResourceName );
-+        }
-+    }
-+
-     if ( !m_bUpdateControllers )
-     {
-         m_bUpdateControllers = sal_True;
-@@ -1701,6 +1719,7 @@ PopupMenu * ToolBarManager::GetToolBarCu
-             // Non-configurable toolbars should disable configuration menu items
-             aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, sal_False );
-             aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, sal_False );
-+            aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, sal_False );
-         }
- 
-         // Disable menu item CLOSE if the toolbar has no closer
---- framework/source/uielement/toolbarsmenucontroller.cxx.old	2009-04-02 10:56:25.000000000 +0000
-+++ framework/source/uielement/toolbarsmenucontroller.cxx	2009-04-06 16:42:19.000000000 +0000
-@@ -85,6 +85,7 @@
- #include <svtools/menuoptions.hxx>
- #include <svtools/cmdoptions.hxx>
- #include <dispatch/uieventloghelper.hxx>
-+#include <svtools/miscopt.hxx>
- 
- //_________________________________________________________________________________________________________________
- //	Defines
-@@ -384,6 +385,9 @@ sal_Bool ToolbarsMenuController::isConte
- 
- void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
- {
-+    if( SvtMiscOptions().DisableUICustomization() )
-+        return;
-+
-     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-     resetPopupMenu( rPopupMenu );
- 
diff --git a/applied_patches/0681-calc-external-ref-modify-link-modified.diff b/applied_patches/0681-calc-external-ref-modify-link-modified.diff
deleted file mode 100644
index 85504139b..000000000
--- a/applied_patches/0681-calc-external-ref-modify-link-modified.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git sc/source/ui/docshell/externalrefmgr.cxx sc/source/ui/docshell/externalrefmgr.cxx
-index b831e93..749695b 100644
---- sc/source/ui/docshell/externalrefmgr.cxx
-+++ sc/source/ui/docshell/externalrefmgr.cxx
-@@ -991,6 +991,7 @@ void ScExternalRefLink::DataChanged(const String& /*rMimeType*/, const Any& /*rV
-         // The source document has changed.
-         pMgr->switchSrcFile(mnFileId, aFile, aFilter);
-         maFilterName = aFilter;
-+        mpDoc->GetDocumentShell()->SetModified();
-     }
- }
- 
diff --git a/applied_patches/0682-calc-xls-hyperlink-single-quote-fix.diff b/applied_patches/0682-calc-xls-hyperlink-single-quote-fix.diff
deleted file mode 100644
index ba9eb19ea..000000000
--- a/applied_patches/0682-calc-xls-hyperlink-single-quote-fix.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git sc/source/filter/excel/xicontent.cxx sc/source/filter/excel/xicontent.cxx
-index 24c1999..3aa1cc0 100644
---- sc/source/filter/excel/xicontent.cxx
-+++ sc/source/filter/excel/xicontent.cxx
-@@ -377,14 +377,33 @@ void XclImpHyperlink::ConvertToValidTabName(String& rUrl)
-     String aNewUrl(sal_Unicode('#')), aTabName;
- 
-     bool bInQuote = false;
-+    bool bQuoteTabName = false;
-     for (xub_StrLen i = 1; i < n; ++i)
-     {
-         c = rUrl.GetChar(i);
-         if (c == sal_Unicode('\''))
-         {
-+            if (bInQuote && i+1 < n && rUrl.GetChar(i+1) == sal_Unicode('\''))
-+            {
-+                // Two consecutive single quotes ('') signify a single literal
-+                // quite.  When this occurs, the whole table name needs to be
-+                // quoted.
-+                bQuoteTabName = true;
-+                aTabName.Append(c);
-+                aTabName.Append(c);
-+                ++i;
-+                continue;
-+            }
-+
-             bInQuote = !bInQuote;
-             if (!bInQuote && aTabName.Len() > 0)
-+            {
-+                if (bQuoteTabName)
-+                    aNewUrl.Append(sal_Unicode('\''));
-                 aNewUrl.Append(aTabName);
-+                if (bQuoteTabName)
-+                    aNewUrl.Append(sal_Unicode('\''));
-+            }
-         }
-         else if (bInQuote)
-             aTabName.Append(c);
diff --git a/applied_patches/0683-calc-external-ref-decode-unicode-uri.diff b/applied_patches/0683-calc-external-ref-decode-unicode-uri.diff
deleted file mode 100644
index 4c65ca2d6..000000000
--- a/applied_patches/0683-calc-external-ref-decode-unicode-uri.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
-index bbb62c0..6bac207 100644
---- sc/source/core/tool/compiler.cxx
-+++ sc/source/core/tool/compiler.cxx
-@@ -1062,7 +1062,7 @@ struct ConventionOOO_A1 : public Convention_A1
-             String aFile;
-             const String* p = pRefMgr->getExternalFileName(nFileId);
-             if (p)
--                aFile = *p;
-+                aFile = INetURLObject::decode(*p, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
-             aFile.SearchAndReplaceAllAscii("'", String::CreateFromAscii("''"));
- 
-             rBuffer.append(sal_Unicode('\''));
-@@ -1319,8 +1319,9 @@ struct ConventionXL
- 
-         rBuffer.append(sal_Unicode('['));
-         rBuffer.append(sal_Unicode('\''));
--        const sal_Unicode* pBuf = rFullName.GetBuffer();
--        xub_StrLen nLen = rFullName.Len();
-+        String aFullName = INetURLObject::decode(rFullName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
-+        const sal_Unicode* pBuf = aFullName.GetBuffer();
-+        xub_StrLen nLen = aFullName.Len();
-         for (xub_StrLen i = 0; i < nLen; ++i)
-         {
-             const sal_Unicode c = pBuf[i];
diff --git a/applied_patches/0687-calc-perf-ods-import-properties.diff b/applied_patches/0687-calc-perf-ods-import-properties.diff
deleted file mode 100644
index b4683337f..000000000
--- a/applied_patches/0687-calc-perf-ods-import-properties.diff
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git sc/inc/attarray.hxx sc/inc/attarray.hxx
-index 2a8c515..82ea003 100644
---- sc/inc/attarray.hxx
-+++ sc/inc/attarray.hxx
-@@ -39,6 +39,7 @@ class ScEditDataArray;
- class ScMarkArray;
- class ScPatternAttr;
- class ScStyleSheet;
-+class ScFlatBoolRowSegments;
- 
- class Rectangle;
- class SfxItemPoolCache;
-@@ -162,7 +163,7 @@ public:
- 								BOOL bRefresh, BOOL bAttrs );
- 	BOOL	RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow );
- 
--	void	FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset );
-+	void	FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
- 	BOOL	IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
- 
- 	void	DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow);
-diff --git sc/inc/column.hxx sc/inc/column.hxx
-index babda9e..0f9586e 100644
---- sc/inc/column.hxx
-+++ sc/inc/column.hxx
-@@ -71,7 +71,7 @@ class ScPostIt;
- struct ScFunctionData;
- struct ScLineFlags;
- struct ScMergePatternState;
--
-+class ScFlatBoolRowSegments;
- 
- #define COLUMN_DELTA	4
- 
-@@ -341,7 +341,7 @@ public:
- 	const ScStyleSheet*	GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const;
- 	const ScStyleSheet*	GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const;
- 
--	void		FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset );
-+	void		FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
- 	BOOL		IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
- 
-                 /// May return -1 if not found
-diff --git sc/source/core/data/attarray.cxx sc/source/core/data/attarray.cxx
-index c02d595..a5f3607 100644
---- sc/source/core/data/attarray.cxx
-+++ sc/source/core/data/attarray.cxx
-@@ -57,6 +57,7 @@
- #include "rechead.hxx"
- #include "globstr.hrc"
- #include "cell.hxx"
-+#include "segmenttree.hxx"
- 
- #undef DBG_INVALIDATE
- #define DBGOUTPUT(s) \
-@@ -1749,8 +1750,7 @@ SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, BOOL bUp ) const
- 	return nRet;
- }
- 
--
--void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset )
-+void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset )
- {
- 	SCROW nStart = 0;
- 	SCSIZE nPos = 0;
-@@ -1762,7 +1762,7 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pU
- //			for (SCROW nRow = nStart; nRow <= nEnd; nRow++)
- //				pUsed[nRow] = TRUE;
- 
--			memset( &pUsed[nStart], TRUE, nEnd-nStart+1 );
-+			rUsedRows.setTrue(nStart, nEnd);
- 
- 			if (bReset)
- 			{
-diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx
-index 39061a7..374606a 100644
---- sc/source/core/data/column.cxx
-+++ sc/source/core/data/column.cxx
-@@ -620,13 +620,11 @@ const ScStyleSheet*	ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRo
- 	return bEqual ? pStyle : NULL;
- }
- 
--
--void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset )
-+void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset )
- {
--	pAttrArray->FindStyleSheet( pStyleSheet, pUsed, bReset );
-+	pAttrArray->FindStyleSheet( pStyleSheet, rUsedRows, bReset );
- }
- 
--
- BOOL ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const
- {
- 	return pAttrArray->IsStyleSheetUsed( rStyle, bGatherAllStyles );
-diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index 8cb6f7a..5a78469 100644
---- sc/source/core/data/table2.cxx
-+++ sc/source/core/data/table2.cxx
-@@ -60,6 +60,7 @@
- #include "bcaslot.hxx"
- #include "postit.hxx"
- #include "globstr.hrc"
-+#include "segmenttree.hxx"
- 
- #include <math.h>
- 
-@@ -1830,36 +1831,24 @@ void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRem
- 								double nPPTX, double nPPTY,
- 								const Fraction& rZoomX, const Fraction& rZoomY )
- {
--	BOOL* pUsed = new BOOL[MAXROWCOUNT];
--    memset( pUsed, 0, sizeof(BOOL) * (MAXROWCOUNT) );
-+    ScFlatBoolRowSegments aUsedRows;
-+    for (SCCOL i = 0; i <= MAXCOL; ++i)
-+        aCol[i].FindStyleSheet(pStyleSheet, aUsedRows, bRemoved);
- 
--	SCCOL nCol;
--	for (nCol=0; nCol<=MAXCOL; nCol++)
--		aCol[nCol].FindStyleSheet( pStyleSheet, pUsed, bRemoved );
-+    SCROW nRow = 0;
-+    while (nRow <= MAXROW)
-+    {
-+        ScFlatBoolRowSegments::RangeData aData;
-+        if (!aUsedRows.getRangeData(nRow, aData))
-+            // search failed!
-+            return;
- 
--	BOOL bFound = FALSE;
--	SCROW nStart = 0, nEnd = 0;
--	for (SCROW i=0; i<=MAXROW; i++)
--	{
--		if (pUsed[i])
--		{
--			if (!bFound)
--			{
--				nStart = i;
--				bFound = TRUE;
--			}
--			nEnd = i;
--		}
--		else if (bFound)
--		{
--			SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE );
--			bFound = FALSE;
--		}
--	}
--	if (bFound)
--		SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE );
-+        SCROW nEndRow = aData.mnRow2;
-+        if (aData.mbValue)
-+			SetOptimalHeight(nRow, nEndRow, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE);
- 
--	delete[] pUsed;
-+        nRow = nEndRow + 1;
-+    }
- }
- 
- 
diff --git a/applied_patches/0698-basegfx-color-tools.diff b/applied_patches/0698-basegfx-color-tools.diff
deleted file mode 100644
index ba1b96e66..000000000
--- a/applied_patches/0698-basegfx-color-tools.diff
+++ /dev/null
@@ -1,614 +0,0 @@
-Adds color conversion stuff to basegfx
-
-From: Thorsten Behrens <thb@openoffice.org>
-
-
----
-
- basegfx/inc/basegfx/color/bcolortools.hxx |   76 ++++++++
- basegfx/prj/d.lst                         |    1 
- basegfx/source/color/bcolortools.cxx      |  272 +++++++++++++++++++++++++++++
- basegfx/source/color/makefile.mk          |    1 
- basegfx/test/basegfx2d.cxx                |  175 +++++++++++++++++++
- basegfx/test/makefile.mk                  |    1 
- 6 files changed, 526 insertions(+), 0 deletions(-)
- create mode 100644 basegfx/inc/basegfx/color/bcolortools.hxx
- create mode 100644 basegfx/source/color/bcolortools.cxx
-
-
-diff --git basegfx/inc/basegfx/color/bcolortools.hxx basegfx/inc/basegfx/color/bcolortools.hxx
-new file mode 100644
-index 0000000..59f6c28
---- /dev/null
-+++ basegfx/inc/basegfx/color/bcolortools.hxx
-@@ -0,0 +1,76 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: bcolor.hxx,v $
-+ *
-+ * $Revision: 1.2 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef _BGFX_COLOR_BCOLORTOOLS_HXX
-+#define _BGFX_COLOR_BCOLORTOOLS_HXX
-+
-+#include <sal/types.h>
-+
-+//////////////////////////////////////////////////////////////////////////////
-+
-+namespace basegfx
-+{
-+    class BColor;
-+
-+    namespace tools
-+    {
-+        /// Transform from RGB to HSL
-+        BColor rgb2hsl(const BColor& rRGBColor);
-+        /// Transform from HSL to RGB
-+        BColor hsl2rgb(const BColor& rHSLColor);
-+
-+        /// Transform from RGB to HSV
-+        BColor rgb2hsv(const BColor& rRGBColor);
-+        /// Transform from HSV to RGB
-+        BColor hsv2rgb(const BColor& rHSVColor);
-+
-+        /// Transform from R'G'B' to YIQ (NTSC color model - Y is used in monochrome mode)
-+        BColor rgb2yiq(const BColor& rRGBColor);
-+        /// Transform from YIQ to R'G'B' (NTSC color model - Y is used in monochrome mode)
-+        BColor yiq2rgb(const BColor& rYIQColor);
-+
-+        /// Transform from R'G'B' to Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit))
-+        BColor rgb2ypbpr(const BColor& rRGBColor);
-+        /// Transform from Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) into R'G'B'
-+        BColor ypbpr2rgb(const BColor& rYPbPrColor);
-+
-+        /// Transform from CIE XYZ into Rec. 709 RGB (D65 white point)
-+        BColor ciexyz2rgb( const BColor& rXYZColor );
-+        /// Transform from Rec. 709 RGB (D65 white point) into CIE XYZ
-+        BColor rgb2ciexyz( const BColor& rRGBColor );
-+
-+	}
-+} // end of namespace basegfx
-+
-+#endif /* _BGFX_COLOR_BCOLORTOOLS_HXX */
-+
-+//////////////////////////////////////////////////////////////////////////////
-+// eof
-diff --git basegfx/prj/d.lst basegfx/prj/d.lst
-index 9dd6085..a58cd33 100644
---- basegfx/prj/d.lst
-+++ basegfx/prj/d.lst
-@@ -96,6 +96,7 @@ mkdir: %_DEST%\inc%_EXT%\basegfx\tools
- 
- mkdir: %_DEST%\inc%_EXT%\basegfx\color
- ..\inc\basegfx\color\bcolor.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolor.hxx
-+..\inc\basegfx\color\bcolortools.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolortools.hxx
- ..\inc\basegfx\color\bcolormodifier.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolormodifier.hxx
- 
- mkdir: %_DEST%\inc%_EXT%\basegfx\pixel
-diff --git basegfx/source/color/bcolortools.cxx basegfx/source/color/bcolortools.cxx
-new file mode 100644
-index 0000000..1dd2805
---- /dev/null
-+++ basegfx/source/color/bcolortools.cxx
-@@ -0,0 +1,272 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: bcolor.cxx,v $
-+ *
-+ * $Revision: 1.2 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_basegfx.hxx"
-+
-+#include <basegfx/numeric/ftools.hxx>
-+#include <basegfx/color/bcolor.hxx>
-+#include <basegfx/color/bcolortools.hxx>
-+
-+//////////////////////////////////////////////////////////////////////////////
-+
-+namespace basegfx { namespace tools
-+{
-+    BColor rgb2hsl(const BColor& rRGBColor)
-+    {
-+        const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue();
-+        const double minVal = ::std::min( ::std::min( r, g ), b );
-+        const double maxVal = ::std::max( ::std::max( r, g ), b );
-+        const double d = maxVal - minVal;
-+
-+        double h=0, s=0, l=0;
-+
-+        l = (maxVal + minVal) / 2.0;
-+    
-+        if( ::basegfx::fTools::equalZero(d) )
-+        {
-+            s = h = 0; // hue undefined (achromatic case)
-+        }
-+        else
-+        {
-+            s = l > 0.5 ? d/(2.0-maxVal-minVal) :
-+                d/(maxVal + minVal);
-+
-+            if( r == maxVal )
-+                h = (g - b)/d;
-+            else if( g == maxVal )
-+                h = 2.0 + (b - r)/d;
-+            else
-+                h = 4.0 + (r - h)/d;
-+
-+            h *= 60.0;
-+
-+            if( h < 0.0 )
-+                h += 360.0;
-+        }
-+
-+        return BColor(h,s,l);
-+    }
-+
-+    static inline double hsl2rgbHelper( double nValue1, double nValue2, double nHue )
-+    {
-+        // clamp hue to [0,360]
-+        nHue = fmod( nHue, 360.0 );
-+
-+        // cope with wrap-arounds
-+        if( nHue < 0.0 )
-+            nHue += 360.0;
-+
-+        if( nHue < 60.0 )
-+            return nValue1 + (nValue2 - nValue1)*nHue/60.0;
-+        else if( nHue < 180.0 )
-+            return nValue2;
-+        else if( nHue < 240.0 )
-+            return nValue1 + (nValue2 - nValue1)*(240.0 - nHue)/60.0;
-+        else 
-+            return nValue1;
-+    }
-+
-+    BColor hsl2rgb(const BColor& rHSLColor)
-+    {
-+        const double h=rHSLColor.getRed(), s=rHSLColor.getGreen(), l=rHSLColor.getBlue();
-+
-+        if( fTools::equalZero(s) )
-+            return BColor(l, l, l ); // achromatic case
-+
-+        const double nVal1( l <= 0.5 ? l*(1.0 + s) : l + s - l*s );
-+        const double nVal2( 2.0*l - nVal1 );
-+
-+        return BColor(
-+            hsl2rgbHelper(nVal2,
-+                          nVal1, 
-+                          h + 120.0),
-+            hsl2rgbHelper(nVal2, 
-+                          nVal1,
-+                          h),
-+            hsl2rgbHelper(nVal2,
-+                          nVal1,
-+                          h - 120.0) );
-+    }
-+    
-+    BColor rgb2hsv(const BColor& rRGBColor)
-+    {
-+        const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue();
-+        const double maxVal = std::max(std::max(r,g),b);
-+        const double minVal = std::min(std::min(r,g),b);
-+        const double delta = maxVal-minVal;
-+
-+        double h=0, s=0, v=0;
-+
-+        v = maxVal;
-+        if( fTools::equalZero(v) )
-+            s = 0;
-+        else
-+            s = delta / v;
-+
-+        if( !fTools::equalZero(s) )
-+        {
-+            if( maxVal == r )
-+            {
-+                h = (g - b) / delta;
-+            }
-+            else if( maxVal == g )
-+            {
-+                h = 2.0 + (b - r) / delta;
-+            }
-+            else
-+            {
-+                h = 4.0 + (r - g) / delta;
-+            }
-+
-+            h *= 60.0;
-+
-+            if( h < 0 )
-+                h += 360;
-+        }
-+
-+        return BColor(h,s,v);
-+    }
-+
-+    BColor hsv2rgb(const BColor& rHSVColor)
-+    {
-+        double h=rHSVColor.getRed();
-+        const double s=rHSVColor.getGreen(), v=rHSVColor.getBlue();
-+
-+        if( fTools::equalZero(s) )
-+        {
-+            // achromatic case: no hue.
-+            return BColor(v,v,v);
-+        }
-+        else
-+        {
-+            if( fTools::equal(h,360) )
-+                h = 0; // 360 degrees is equivalent to 0 degrees
-+
-+            h /= 60.0;
-+            const sal_Int32 intval = h;
-+            const double f = h - intval;
-+            const double p = v*(1.0-s);
-+            const double q = v*(1.0-(s*f));
-+            const double t = v*(1.0-(s*(1.0-f)));
-+
-+            /* which hue area? */
-+            switch( intval )
-+            {
-+                case 0:
-+                    return BColor(v,t,p);
-+
-+                case 1:
-+                    return BColor(q,v,p);
-+
-+                case 2:
-+                    return BColor(p,v,t);
-+
-+                case 3:
-+                    return BColor(p,q,v);
-+
-+                case 4:
-+                    return BColor(t,p,v);
-+
-+                case 5:
-+                    return BColor(v,p,q);
-+
-+                default:
-+                    // hue overflow
-+                    return BColor();
-+            }
-+        }
-+    }
-+
-+    BColor rgb2yiq(const BColor& rRGBColor)
-+    {
-+        // from Foley, van Dam, Computer Graphics
-+        const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue();
-+        return BColor(
-+            0.299*r + 0.587*g + 0.114*b,
-+            0.596*r - 0.274*g - 0.322*b,
-+            0.211*r - 0.522*g + 0.311*b);
-+    }
-+
-+    BColor yiq2rgb(const BColor& rYIQColor)
-+    {
-+        // from Foley, van Dam, Computer Graphics
-+        const double y=rYIQColor.getRed(), i=rYIQColor.getGreen(), q=rYIQColor.getBlue();
-+        return BColor(
-+            y + 0.956*i + 0.623*q,
-+            y - 0.272*i - 0.648*q,
-+            y - 1.105*i + 1.705*q );
-+    }
-+
-+    BColor ciexyz2rgb( const BColor& rXYZColor )
-+    {
-+        // from Poynton color faq, and SMPTE RP 177-1993, Derivation
-+        // of Basic Television Color Equations
-+        const double x=rXYZColor.getRed(), y=rXYZColor.getGreen(), z=rXYZColor.getBlue();
-+        return BColor(
-+            3.240479*x - 1.53715*y  - 0.498535*z,
-+            -0.969256*x + 1.875991*y + 0.041556*z,
-+            0.055648*x - 0.204043*y + 1.057311*z );
-+    }
-+
-+    BColor rgb2ciexyz( const BColor& rRGBColor )
-+    {
-+        // from Poynton color faq, and SMPTE RP 177-1993, Derivation
-+        // of Basic Television Color Equations
-+        const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue();
-+        return BColor(
-+            0.412453*r + 0.35758*g  + 0.180423*b,
-+            0.212671*r + 0.71516*g  + 0.072169*b,
-+            0.019334*r + 0.119193*g + 0.950227*b);
-+    }
-+
-+    BColor rgb2ypbpr(const BColor& rRGBColor)
-+    {
-+        const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue();
-+        return BColor(
-+             0.299*r    + 0.587*g    + 0.114*b,
-+            -0.168736*r - 0.331264*g + 0.5*b,
-+             0.5*r      - 0.418688*g - 0.081312*b);
-+    }
-+
-+    BColor ypbpr2rgb(const BColor& rYPbPrColor)
-+    {
-+        const double y=rYPbPrColor.getRed(), pb=rYPbPrColor.getGreen(), pr=rYPbPrColor.getBlue();
-+        return BColor(
-+            1.*y +       0.*pb +    1.402*pr,
-+            1.*y - 0.344136*pb - 0.714136*pr,
-+            1.*y +    1.772*pb +       0.*pr);
-+    }
-+
-+} } // end of namespace basegfx
-+
-+//////////////////////////////////////////////////////////////////////////////
-+// eof
-diff --git basegfx/source/color/makefile.mk basegfx/source/color/makefile.mk
-index 6a4ed94..36325e1 100644
---- basegfx/source/color/makefile.mk
-+++ basegfx/source/color/makefile.mk
-@@ -45,6 +45,7 @@ TARGET=color
- 
- SLOFILES= \
- 				$(SLO)$/bcolor.obj			\
-+				$(SLO)$/bcolortools.obj		\
- 				$(SLO)$/bcolormodifier.obj
- 
- # --- Targets ----------------------------------
-diff --git basegfx/test/basegfx2d.cxx basegfx/test/basegfx2d.cxx
-index 6519a36..5cc1e02 100644
---- basegfx/test/basegfx2d.cxx
-+++ basegfx/test/basegfx2d.cxx
-@@ -43,6 +43,8 @@
- #include <basegfx/polygon/b2dpolypolygontools.hxx>
- #include <basegfx/range/b2dmultirange.hxx>
- #include <basegfx/numeric/ftools.hxx>
-+#include <basegfx/color/bcolor.hxx>
-+#include <basegfx/color/bcolortools.hxx>
- 
- #include <basegfx/tools/debugplotter.hxx>
- 
-@@ -1443,6 +1445,178 @@ public:
-     CPPUNIT_TEST_SUITE_END();
- }; // class b2dvector
- 
-+class bcolor : public CppUnit::TestFixture
-+{
-+    BColor maWhite;
-+    BColor maBlack;
-+    BColor maRed;
-+    BColor maGreen;
-+    BColor maBlue;
-+    BColor maYellow;
-+    BColor maMagenta;
-+    BColor maCyan;
-+
-+public:
-+    bcolor() :
-+        maWhite(1,1,1),
-+        maBlack(0,0,0),
-+        maRed(1,0,0),
-+        maGreen(0,1,0),
-+        maBlue(0,0,1),
-+        maYellow(1,1,0),
-+        maMagenta(1,0,1),
-+        maCyan(0,1,1)
-+    {}
-+
-+
-+    // initialise your test code values here.
-+    void setUp()
-+    {
-+    }
-+
-+    void tearDown()
-+    {
-+    }
-+
-+    // insert your test code here.
-+    void hslTest()
-+    {
-+        CPPUNIT_ASSERT_MESSAGE("white", 
-+                               tools::rgb2hsl(maWhite) == BColor(0,0,1));
-+        CPPUNIT_ASSERT_MESSAGE("black", 
-+                               tools::rgb2hsl(maBlack) == BColor(0,0,0));
-+        CPPUNIT_ASSERT_MESSAGE("red", 
-+                               tools::rgb2hsl(maRed) == BColor(0,1,0.5));
-+        CPPUNIT_ASSERT_MESSAGE("green", 
-+                               tools::rgb2hsl(maGreen) == BColor(120,1,0.5));
-+        CPPUNIT_ASSERT_MESSAGE("blue", 
-+                               tools::rgb2hsl(maBlue) == BColor(240,1,0.5));
-+        CPPUNIT_ASSERT_MESSAGE("yellow", 
-+                               tools::rgb2hsl(maYellow) == BColor(60,1,0.5));
-+        CPPUNIT_ASSERT_MESSAGE("magenta", 
-+                               tools::rgb2hsl(maMagenta) == BColor(300,1,0.5));
-+        CPPUNIT_ASSERT_MESSAGE("cyan", 
-+                               tools::rgb2hsl(maCyan) == BColor(180,1,0.5));
-+
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip white", 
-+                               tools::hsl2rgb(tools::rgb2hsl(maWhite)) == maWhite);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip black", 
-+                               tools::hsl2rgb(tools::rgb2hsl(maBlack)) == maBlack);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip red", 
-+                               tools::hsl2rgb(tools::rgb2hsl(maRed)) == maRed);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip green", 
-+                               tools::hsl2rgb(tools::rgb2hsl(maGreen)) == maGreen);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip blue", 
-+                               tools::hsl2rgb(tools::rgb2hsl(maBlue)) == maBlue);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip yellow", 
-+                               tools::hsl2rgb(tools::rgb2hsl(maYellow)) == maYellow);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip magenta", 
-+                               tools::hsl2rgb(tools::rgb2hsl(maMagenta)) == maMagenta);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip cyan", 
-+                               tools::hsl2rgb(tools::rgb2hsl(maCyan)) == maCyan);
-+
-+        CPPUNIT_ASSERT_MESSAGE("grey10", 
-+                               tools::rgb2hsl(maWhite*.1) == BColor(0,0,.1));
-+        CPPUNIT_ASSERT_MESSAGE("grey90", 
-+                               tools::rgb2hsl(maWhite*.9) == BColor(0,0,.9));
-+        CPPUNIT_ASSERT_MESSAGE("red/2", 
-+                               tools::rgb2hsl(maRed*.5) == BColor(0,1,0.25));
-+        CPPUNIT_ASSERT_MESSAGE("green/2", 
-+                               tools::rgb2hsl(maGreen*.5) == BColor(120,1,0.25));
-+        CPPUNIT_ASSERT_MESSAGE("blue/2", 
-+                               tools::rgb2hsl(maBlue*.5) == BColor(240,1,0.25));
-+        CPPUNIT_ASSERT_MESSAGE("yellow/2", 
-+                               tools::rgb2hsl(maYellow*.5) == BColor(60,1,0.25));
-+        CPPUNIT_ASSERT_MESSAGE("magenta/2", 
-+                               tools::rgb2hsl(maMagenta*.5) == BColor(300,1,0.25));
-+        CPPUNIT_ASSERT_MESSAGE("cyan/2", 
-+                               tools::rgb2hsl(maCyan*.5) == BColor(180,1,0.25));
-+
-+        CPPUNIT_ASSERT_MESSAGE("pastel", 
-+                               tools::rgb2hsl(BColor(.75,.25,.25)) == BColor(0,.5,.5));
-+    }
-+
-+    // insert your test code here.
-+    void hsvTest()
-+    {
-+        CPPUNIT_ASSERT_MESSAGE("white", 
-+                               tools::rgb2hsv(maWhite) == BColor(0,0,1));
-+        CPPUNIT_ASSERT_MESSAGE("black", 
-+                               tools::rgb2hsv(maBlack) == BColor(0,0,0));
-+        CPPUNIT_ASSERT_MESSAGE("red", 
-+                               tools::rgb2hsv(maRed) == BColor(0,1,1));
-+        CPPUNIT_ASSERT_MESSAGE("green", 
-+                               tools::rgb2hsv(maGreen) == BColor(120,1,1));
-+        CPPUNIT_ASSERT_MESSAGE("blue", 
-+                               tools::rgb2hsv(maBlue) == BColor(240,1,1));
-+        CPPUNIT_ASSERT_MESSAGE("yellow", 
-+                               tools::rgb2hsv(maYellow) == BColor(60,1,1));
-+        CPPUNIT_ASSERT_MESSAGE("magenta", 
-+                               tools::rgb2hsv(maMagenta) == BColor(300,1,1));
-+        CPPUNIT_ASSERT_MESSAGE("cyan", 
-+                               tools::rgb2hsv(maCyan) == BColor(180,1,1));
-+
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip white", 
-+                               tools::hsv2rgb(tools::rgb2hsv(maWhite)) == maWhite);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip black", 
-+                               tools::hsv2rgb(tools::rgb2hsv(maBlack)) == maBlack);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip red", 
-+                               tools::hsv2rgb(tools::rgb2hsv(maRed)) == maRed);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip green", 
-+                               tools::hsv2rgb(tools::rgb2hsv(maGreen)) == maGreen);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip blue", 
-+                               tools::hsv2rgb(tools::rgb2hsv(maBlue)) == maBlue);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip yellow", 
-+                               tools::hsv2rgb(tools::rgb2hsv(maYellow)) == maYellow);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip magenta", 
-+                               tools::hsv2rgb(tools::rgb2hsv(maMagenta)) == maMagenta);
-+        CPPUNIT_ASSERT_MESSAGE("roundtrip cyan", 
-+                               tools::hsv2rgb(tools::rgb2hsv(maCyan)) == maCyan);
-+
-+        CPPUNIT_ASSERT_MESSAGE("grey10", 
-+                               tools::rgb2hsv(maWhite*.1) == BColor(0,0,.1));
-+        CPPUNIT_ASSERT_MESSAGE("grey90", 
-+                               tools::rgb2hsv(maWhite*.9) == BColor(0,0,.9));
-+        CPPUNIT_ASSERT_MESSAGE("red/2", 
-+                               tools::rgb2hsv(maRed*.5) == BColor(0,1,0.5));
-+        CPPUNIT_ASSERT_MESSAGE("green/2", 
-+                               tools::rgb2hsv(maGreen*.5) == BColor(120,1,0.5));
-+        CPPUNIT_ASSERT_MESSAGE("blue/2", 
-+                               tools::rgb2hsv(maBlue*.5) == BColor(240,1,0.5));
-+        CPPUNIT_ASSERT_MESSAGE("yellow/2", 
-+                               tools::rgb2hsv(maYellow*.5) == BColor(60,1,0.5));
-+        CPPUNIT_ASSERT_MESSAGE("magenta/2", 
-+                               tools::rgb2hsv(maMagenta*.5) == BColor(300,1,0.5));
-+        CPPUNIT_ASSERT_MESSAGE("cyan/2", 
-+                               tools::rgb2hsv(maCyan*.5) == BColor(180,1,0.5));
-+
-+        CPPUNIT_ASSERT_MESSAGE("pastel", 
-+                               tools::rgb2hsv(BColor(.5,.25,.25)) == BColor(0,.5,.5));
-+    }
-+
-+    void ciexyzTest()
-+    {
-+        tools::rgb2ciexyz(maWhite);
-+        tools::rgb2ciexyz(maBlack);
-+        tools::rgb2ciexyz(maRed);
-+        tools::rgb2ciexyz(maGreen);
-+        tools::rgb2ciexyz(maBlue);
-+        tools::rgb2ciexyz(maYellow);
-+        tools::rgb2ciexyz(maMagenta);
-+        tools::rgb2ciexyz(maCyan);
-+    }
-+
-+    // Change the following lines only, if you add, remove or rename 
-+    // member functions of the current class, 
-+    // because these macros are need by auto register mechanism.
-+
-+    CPPUNIT_TEST_SUITE(bcolor);
-+    CPPUNIT_TEST(hslTest);
-+    CPPUNIT_TEST(hsvTest);
-+    CPPUNIT_TEST(ciexyzTest);
-+    CPPUNIT_TEST_SUITE_END();
-+}; // class b2dvector
-+
- // -----------------------------------------------------------------------------
- //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dmultirange, "basegfx2d");
- CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dsvgdimpex, "basegfx2d");
-@@ -1458,6 +1632,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dquadraticbezier, "basegfx2d"
- CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2drange, "basegfx2d");
- CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dtuple, "basegfx2d");
- CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dvector, "basegfx2d");
-+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::bcolor, "basegfx2d");
- } // namespace basegfx2d
- 
- 
-diff --git basegfx/test/makefile.mk basegfx/test/makefile.mk
-index 0781cf2..710d194 100644
---- basegfx/test/makefile.mk
-+++ basegfx/test/makefile.mk
-@@ -58,6 +58,7 @@ SHL1LIBS=\
- 	$(SLB)$/range.lib	\
- 	$(SLB)$/tuple.lib	\
- 	$(SLB)$/tools.lib	\
-+	$(SLB)$/color.lib	\
- 	$(SLB)$/vector.lib
- 
- SHL1TARGET= basegfx_tests
diff --git a/applied_patches/0705-link-with-comphelper.diff b/applied_patches/0705-link-with-comphelper.diff
deleted file mode 100644
index 131d475c7..000000000
--- a/applied_patches/0705-link-with-comphelper.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- xmlscript/util/makefile.mk
-+++ xmlscript/util/makefile.mk
-@@ -58,6 +58,7 @@
-         $(LIB1TARGET)
- 
- SHL1STDLIBS= \
-+        $(COMPHELPERLIB)		\
-         $(CPPUHELPERLIB)		\
-         $(CPPULIB) 			\
-         $(SALLIB)
diff --git a/applied_patches/0706-import-export-dialogmodel.diff b/applied_patches/0706-import-export-dialogmodel.diff
deleted file mode 100644
index b8cd09e57..000000000
--- a/applied_patches/0706-import-export-dialogmodel.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- dbaccess/source/ext/macromigration/migrationengine.cxx
-+++ dbaccess/source/ext/macromigration/migrationengine.cxx
-@@ -1838,7 +1838,7 @@
-             Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
- 
-             Reference< XNameContainer > xDialogModel( m_aContext.createComponent( "com.sun.star.awt.UnoControlDialogModel" ), UNO_QUERY_THROW );
--            ::xmlscript::importDialogModel( xInput, xDialogModel, m_aContext.getUNOContext() );
-+            ::xmlscript::importDialogModel( xInput, xDialogModel, m_aContext.getUNOContext(), m_xDocumentModel );
- 
-             // adjust the events of the dialog
-             impl_adjustDialogElementEvents_throw( xDialogModel );
-@@ -1853,7 +1853,7 @@
-             }
- 
-             // export dialog model
--            xISP = ::xmlscript::exportDialogModel( xDialogModel, m_aContext.getUNOContext() );
-+            xISP = ::xmlscript::exportDialogModel( xDialogModel, m_aContext.getUNOContext(), m_xDocumentModel );
-             _inout_rDialogLibraryElement <<= xISP;
-         }
-         catch( const Exception& )
diff --git a/applied_patches/0707-dtrans-aqua-dragrect-fix.diff b/applied_patches/0707-dtrans-aqua-dragrect-fix.diff
deleted file mode 100644
index f712bd739..000000000
--- a/applied_patches/0707-dtrans-aqua-dragrect-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- dtrans/source/aqua/DropTarget.cxx~	2009-07-27 11:20:36.000000000 +0200
-+++ dtrans/source/aqua/DropTarget.cxx	2009-08-20 23:47:30.000000000 +0200
-@@ -297,6 +297,9 @@
- 
-       fire_dragOver(dtde);
- 
-+      // drag over callbacks likely have rendered something 
-+      [mView setNeedsDisplay: TRUE];
-+
-       dragOp = OfficeToSystemDragActions(mSelectedDropAction);
- 
-       //NSLog(@"Drag update: Source actions: %x proposed action %x selected action %x", mDragSourceSupportedActions, currentAction, mSelectedDropAction);
diff --git a/applied_patches/0709-build-fix.diff b/applied_patches/0709-build-fix.diff
deleted file mode 100644
index 7086a0580..000000000
--- a/applied_patches/0709-build-fix.diff
+++ /dev/null
@@ -1,140 +0,0 @@
-diff --git sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx
-index 6053662..2b303a1 100644
---- sc/source/filter/excel/xipivot.cxx
-+++ sc/source/filter/excel/xipivot.cxx
-@@ -1434,7 +1434,10 @@ void XclImpPivotTable::MaybeRefresh()
-     {
-         // 'refresh table on load' flag is set.  Refresh the table now.  Some
-         // Excel files contain partial table output when this flag is set.
--        mpDPObj->Output();
-+        //mpDPObj->Output();
-+        // #FIXME  change from above is just to satisfy compiler,
-+        // it probably makes no sense
-+        mpDPObj->Output( mpDPObj->GetOutRange().aStart );
-     }
- }
- 
-diff --git sc/source/ui/dbgui/filtdlg.cxx sc/source/ui/dbgui/filtdlg.cxx
-index 8e97d24..9d3baa1 100644
---- sc/source/ui/dbgui/filtdlg.cxx
-+++ sc/source/ui/dbgui/filtdlg.cxx
-@@ -454,7 +454,6 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
-                 SCTAB nTab		 = nSrcTab;
-                 SCROW nFirstRow = theQueryData.nRow1;
- 				SCROW nLastRow	 = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2;
--				SCROW nLastRow	 = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2;
- 
-                 //	erstmal ohne die erste Zeile
- 
-diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
-index 424f6a0..9aea7ce 100644
---- sc/source/ui/docshell/docfunc.cxx
-+++ sc/source/ui/docshell/docfunc.cxx
-@@ -1693,7 +1693,11 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
-                     default:
-                         break;
-                 }
--                MergeCells(aRange, FALSE, TRUE, TRUE);
-+                ScCellMergeOption aMergeOption(
-+                    aRange.aStart.Col(), aRange.aStart.Row(), 
-+                    aRange.aEnd.Col(), aRange.aEnd.Row() );
-+                aMergeOption.maTabs.insert(aRange.aStart.Tab());
-+                MergeCells(aMergeOption, FALSE, TRUE, TRUE);
-             }
-             qIncreaseRange.pop_back();
-         }
-@@ -1742,7 +1746,10 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
-             while( !qIncreaseRange.empty() )
-             {
-                 ScRange aRange = qIncreaseRange.back();
--                MergeCells(aRange, FALSE, TRUE, TRUE);
-+                 ScCellMergeOption aMergeOption(
-+                    aRange.aStart.Col(), aRange.aStart.Row(), 
-+                    aRange.aEnd.Col(), aRange.aEnd.Row() );               
-+                MergeCells(aMergeOption, FALSE, TRUE, TRUE);
-                 qIncreaseRange.pop_back();
-             }
- 
-@@ -2180,7 +2187,10 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
- 
-         if( !pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED | HASATTR_MERGED ) )
-         {
--            MergeCells( aRange, FALSE, TRUE, TRUE );
-+            ScCellMergeOption aMergeOption(
-+                aRange.aStart.Col(), aRange.aStart.Row(), 
-+                aRange.aEnd.Col(), aRange.aEnd.Row() ); 
-+            MergeCells( aMergeOption, FALSE, TRUE, TRUE );
-         }
-         qDecreaseRange.pop_back();
-     }
-diff --git sc/source/ui/miscdlgs/makefile.mk sc/source/ui/miscdlgs/makefile.mk
-index d600107..c6b8f27 100644
---- sc/source/ui/miscdlgs/makefile.mk
-+++ sc/source/ui/miscdlgs/makefile.mk
-@@ -81,9 +81,7 @@ SLOFILES =  \
-     $(SLO)$/conflictsdlg.obj    \
-     $(SLO)$/sharedocdlg.obj \
-     $(SLO)$/protectiondlg.obj \
--	$(SLO)$/retypepassdlg.obj \
--	$(SLO)$/scuiautofmt.obj			\
--	$(SLO)$/strindlg.obj            
-+	$(SLO)$/retypepassdlg.obj
- 
- EXCEPTIONSFILES = \
-     $(SLO)$/acredlin.obj        \
-@@ -126,6 +124,8 @@ LIB1OBJFILES =  \
-     $(SLO)$/warnbox.obj         \
-     $(SLO)$/conflictsdlg.obj    \
-     $(SLO)$/sharedocdlg.obj \
-+    $(SLO)$/scuiautofmt.obj     \
-+    $(SLO)$/strindlg.obj		\
-     $(SLO)$/protectiondlg.obj \
-     $(SLO)$/retypepassdlg.obj
- 
-diff --git sc/source/ui/unoobj/dapiuno.cxx sc/source/ui/unoobj/dapiuno.cxx
-index a4a78b7..a82585c 100644
---- sc/source/ui/unoobj/dapiuno.cxx
-+++ sc/source/ui/unoobj/dapiuno.cxx
-@@ -1627,7 +1627,7 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException)
-             aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) );
-         else
-             {
--                aName = pDim->GetLayoutName();
-+                aName = *pDim->GetLayoutName();
-                 if (!aName)
-                     aName = pDim->GetName();
-             }
-diff --git sd/prj/build.lst sd/prj/build.lst
-index 52734f4..ef69a6a 100644
---- sd/prj/build.lst
-+++ sd/prj/build.lst
-@@ -30,7 +30,6 @@ sd	sd\source\filter\ppt					nmake	-	all	sd_ppt sd_inc NULL
- sd	sd\source\filter						nmake	-	all	sd_filt sd_sdi sd_ppt sd_inc NULL
- sd	sd\source\filter\cgm					nmake	-	all	sd_cgm sd_inc NULL
- sd	sd\source\filter\eppt					nmake	-	all	sd_eppt sd_inc NULL
--sd	sd\source\filter\pptx					nmake	-	all	sd_pptx sd_inc NULL
- sd	sd\source\filter\grf					nmake	-	all	sd_grf sd_inc NULL
- sd	sd\source\filter\xml					nmake	-	all	sd_filter_xml sd_inc NULL
- sd	sd\source\filter\html					nmake	-	all	sd_html sd_inc NULL
-@@ -41,5 +40,4 @@ sd	sd\source\ui\framework\configuration	nmake	-	all sd_framework_configuration s
- sd	sd\source\ui\framework\module       	nmake	-	all sd_framework_module sd_inc NULL
- sd	sd\source\ui\framework\factories       	nmake	-	all sd_framework_factories sd_inc NULL
- sd	sd\source\ui\framework\tools           	nmake	-	all sd_framework_tools sd_inc NULL
--sd	sd\util									nmake	-	all	sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_pptx sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories NULL
--sd	sd\xml									nmake	-	all	sd_xml NULL
-+sd	sd\util									nmake	-	all	sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories NULL
-diff --git sd/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc
-index ec8bb6b..89841d7 100644
---- sd/source/ui/inc/res_bmp.hrc
-+++ sd/source/ui/inc/res_bmp.hrc
-@@ -308,8 +308,8 @@
- 
- #define RID_DRAW_TABLEOBJ_INSIDE_POPUP		RID_APP_START+94
- 
--#define RID_DRAW_OUTLINETEXTOBJ_POPUP		RID_APP_START+94
--#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP	RID_APP_START+95
-+#define RID_DRAW_OUTLINETEXTOBJ_POPUP		RID_APP_START+95
-+#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP	RID_APP_START+96
- 
- /*
-  * Pointer (Mauszeiger)
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 0096b4d16..098094652 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1367,7 +1367,7 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescriptor()
                     if( sObjName.Len() )
                     {
                         aModName.AppendAscii(" (").Append(sObjName).AppendAscii(")");
-                    }
+}
                 }
                 break;
             }    
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 709617036..21719c152 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -281,11 +281,11 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
 			pWin = FindBasWin( rDocument, aLibName, aModName, FALSE, TRUE );
             if( !pWin )
 			{    // new module window
-			    pWin = new ModulWindow( pModulLayout, rDocument, aLibName, aModName, aModule );
-			    nKey = InsertWindowInTable( pWin );
-            }
+            pWin = new ModulWindow( pModulLayout, rDocument, aLibName, aModName, aModule );
+            nKey = InsertWindowInTable( pWin );
         }
     }
+	}
     else
     {
         pWin->SetStatus( pWin->GetStatus() & ~BASWIN_SUSPENDED );
@@ -311,7 +311,7 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
 				aModName.AppendAscii(" (").Append(sObjName).AppendAscii(")");
 			}
 		}
-		pTabBar->InsertPage( (USHORT)nKey, aModName );
+    pTabBar->InsertPage( (USHORT)nKey, aModName );
 	}	
     pTabBar->Sort();
     pWin->GrabScrollBars( &aHScrollBar, &aVScrollBar );
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index ab34938bc..20ec88e4d 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -306,7 +306,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
         if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLoaded( aOULibName ) )
         {
             try
-		 	{
+            {
                 BasicManager* pBasMgr = rDocument.getBasicManager();
                 StarBASIC* pBasic = pBasMgr ? pBasMgr->GetLib( rLibName ) : 0;
                 sal_Bool bVBAEnabled = pBasic ? pBasic->isVBAEnabled(): sal_False;
@@ -314,50 +314,50 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
                     ImpCreateLibSubEntriesInVBAMode( pLibRootEntry, rDocument, rLibName );
                 else
                 {
-                    // get a sorted list of module names
-                    Sequence< ::rtl::OUString > aModNames = rDocument.getObjectNames( E_SCRIPTS, rLibName );
-                    sal_Int32 nModCount = aModNames.getLength();
-		            const ::rtl::OUString* pModNames = aModNames.getConstArray();
-
-                    for ( sal_Int32 i = 0 ; i < nModCount ; i++ )
-		 			{
-                        String aModName = pModNames[ i ];
-                        SvLBoxEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE );
-                        if ( !pModuleEntry )
-                            pModuleEntry = AddEntry(
-                                aModName,
-                                Image( IDEResId( RID_IMG_MODULE ) ),
-                                Image( IDEResId( RID_IMG_MODULE_HC ) ),
-                                pLibRootEntry, false,
-                                std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
-
-		 				// methods
-		 				if ( nMode & BROWSEMODE_SUBS )
-		 				{
-                            Sequence< ::rtl::OUString > aNames = BasicIDE::GetMethodNames( rDocument, rLibName, aModName );
-		 					sal_Int32 nCount = aNames.getLength();
-		 					const ::rtl::OUString* pNames = aNames.getConstArray();
-
-		 					for ( sal_Int32 j = 0 ; j < nCount ; j++ )
-		 					{
-		 						String aName = pNames[ j ];
-		 						SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
-                                if ( !pEntry )
-                                    pEntry = AddEntry(
-                                        aName,
-                                        Image( IDEResId( RID_IMG_MACRO ) ),
-                                        Image( IDEResId( RID_IMG_MACRO_HC ) ),
-                                        pModuleEntry, false,
-                                        std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_METHOD ) ) );
-		 					}
+                // get a sorted list of module names
+                Sequence< ::rtl::OUString > aModNames = rDocument.getObjectNames( E_SCRIPTS, rLibName );
+                sal_Int32 nModCount = aModNames.getLength();
+                const ::rtl::OUString* pModNames = aModNames.getConstArray();
+
+                for ( sal_Int32 i = 0 ; i < nModCount ; i++ )
+                {
+                    String aModName = pModNames[ i ];
+                    SvLBoxEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE );
+                    if ( !pModuleEntry )
+                        pModuleEntry = AddEntry(
+                            aModName,
+                            Image( IDEResId( RID_IMG_MODULE ) ),
+                            Image( IDEResId( RID_IMG_MODULE_HC ) ),
+                            pLibRootEntry, false,
+                            std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
+
+                    // methods
+                    if ( nMode & BROWSEMODE_SUBS )
+                    {
+                        Sequence< ::rtl::OUString > aNames = BasicIDE::GetMethodNames( rDocument, rLibName, aModName );
+                        sal_Int32 nCount = aNames.getLength();
+                        const ::rtl::OUString* pNames = aNames.getConstArray();
+
+                        for ( sal_Int32 j = 0 ; j < nCount ; j++ )
+                        {
+                            String aName = pNames[ j ];
+                            SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
+                            if ( !pEntry )
+                                pEntry = AddEntry(
+                                    aName,
+                                    Image( IDEResId( RID_IMG_MACRO ) ),
+                                    Image( IDEResId( RID_IMG_MACRO_HC ) ),
+                                    pModuleEntry, false,
+                                    std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_METHOD ) ) );
                         }
-		 			}
+                    }
                 }
             }
-		 	catch ( const container::NoSuchElementException& )
-		 	{
+            }
+            catch ( const container::NoSuchElementException& )
+            {
                 DBG_UNHANDLED_EXCEPTION();
-		 	}
+            }
         }   
     }
 
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index a5aeb8c6b..a8926f2fa 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -612,7 +612,7 @@ void __EXPORT BasicIDETabBar::Command( const CommandEvent& rCEvt )
 						{
 							aPopup.EnableItem( SID_BASICIDE_DELETECURRENT, FALSE );
 							aPopup.EnableItem( SID_BASICIDE_RENAMECURRENT, FALSE );
-						}
+        }
 					}
 				}
 			}
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index cf38077ef..7ec2c1337 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -641,7 +641,7 @@ void ObjectPage::CheckButtons()
         if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( nDepth == 2 ) )
             aEditButton.Disable();
         else
-		    aEditButton.Enable();
+        aEditButton.Enable();
     }    
     else
         aEditButton.Disable();
@@ -676,7 +676,7 @@ void ObjectPage::CheckButtons()
         if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( ( nDepth == 2 ) || aLibSubName.Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) ) )
             aDelButton.Disable();
         else
-            aDelButton.Enable();
+        aDelButton.Enable();
     }
     else
         aDelButton.Disable();
@@ -1005,8 +1005,8 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
             rDocument.createModule( aLibName, aModName, bMain, sModuleCode );
             BasicManager* pBasMgr = rDocument.getBasicManager();
             StarBASIC* pBasic = pBasMgr? pBasMgr->GetLib( aLibName ) : 0;
-            if ( pBasic )
-                pModule = pBasic->FindModule( aModName );
+                if ( pBasic )
+                    pModule = pBasic->FindModule( aModName );
             SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE );					
             BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
             SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index afa424045..a5c6cb3bf 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -1418,7 +1418,7 @@ namespace basctl
         }
         else
         {
-            OSL_VERIFY( aCode >>= _out_rModuleSource );
+        OSL_VERIFY( aCode >>= _out_rModuleSource );
         }
         return true;
     }
diff --git a/basegfx/inc/basegfx/color/bcolortools.hxx b/basegfx/inc/basegfx/color/bcolortools.hxx
index 59f6c28db..f32f85f2f 100644
--- a/basegfx/inc/basegfx/color/bcolortools.hxx
+++ b/basegfx/inc/basegfx/color/bcolortools.hxx
@@ -67,7 +67,7 @@ namespace basegfx
         /// Transform from Rec. 709 RGB (D65 white point) into CIE XYZ
         BColor rgb2ciexyz( const BColor& rRGBColor );
 
-	}
+    }
 } // end of namespace basegfx
 
 #endif /* _BGFX_COLOR_BCOLORTOOLS_HXX */
diff --git a/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx
index 1dd28056c..5e55e55ae 100644
--- a/basegfx/source/color/bcolortools.cxx
+++ b/basegfx/source/color/bcolortools.cxx
@@ -172,7 +172,7 @@ namespace basegfx { namespace tools
                 h = 0; // 360 degrees is equivalent to 0 degrees
 
             h /= 60.0;
-            const sal_Int32 intval = h;
+            const sal_Int32 intval = static_cast< sal_Int32 >( h );
             const double f = h - intval;
             const double p = v*(1.0-s);
             const double q = v*(1.0-(s*f));
diff --git a/basegfx/source/color/makefile.mk b/basegfx/source/color/makefile.mk
index 004658e9a..77b91a82f 100644
--- a/basegfx/source/color/makefile.mk
+++ b/basegfx/source/color/makefile.mk
@@ -45,7 +45,7 @@ TARGET=color
 
 SLOFILES= \
                 $(SLO)$/bcolor.obj			\
-				$(SLO)$/bcolortools.obj		\
+                $(SLO)$/bcolortools.obj		\
                 $(SLO)$/bcolormodifier.obj
 
 # --- Targets ----------------------------------
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 5d4ad3216..1bd4d59b9 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -58,7 +58,7 @@ SHL1LIBS=\
     $(SLB)$/range.lib	\
     $(SLB)$/tuple.lib	\
     $(SLB)$/tools.lib	\
-	$(SLB)$/color.lib	\
+    $(SLB)$/color.lib	\
     $(SLB)$/vector.lib
 
 SHL1TARGET= basegfx_tests
diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx
index 96cbe9bbb..5a9be633f 100644
--- a/basic/inc/basic/sbobjmod.hxx
+++ b/basic/inc/basic/sbobjmod.hxx
@@ -79,6 +79,7 @@ public:
     void Unload();
     void load();
     void triggerMethod( const String& );
+    void triggerMethod( const String&, css::uno::Sequence< css::uno::Any >&  );
     void triggerActivateEvent();
     void triggerDeActivateEvent();
     void triggerInitializeEvent();
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 4b373a7d0..2eedb2dba 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -121,7 +121,7 @@ public:
 
     // Compiler-Interface
     SbModule*   	MakeModule( const String& rName, const String& rSrc );
-    SbModule*       MakeModule32( const String& rName, const ::rtl::OUString& rSrc );
+    SbModule*   	MakeModule32( const String& rName, const ::rtl::OUString& rSrc );
     SbModule*       MakeModule32( const com::sun::star::script::ModuleInfo& mInfo );
     BOOL			Compile( SbModule* );
     BOOL 			Disassemble( SbModule*, String& rText );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 51ff20f72..bde0711f2 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -255,12 +255,12 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr,
             }
             else
             {
-			    ::rtl::OUString aMod;
-			    aElement >>= aMod;
-			    pLib->MakeModule32( aModuleName, aMod );
-            }
+            ::rtl::OUString aMod;
+            aElement >>= aMod;
+            pLib->MakeModule32( aModuleName, aMod );
         }
     }
+	}
 
     pLib->SetModified( FALSE );
 }
@@ -312,7 +312,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const ContainerEvent
                 {
         		    ::rtl::OUString aMod;
         		    Event.Element >>= aMod;
-			        pLib->MakeModule32( aName, aMod );
+                pLib->MakeModule32( aName, aMod );
                 }
                 pLib->SetModified( FALSE );
             }
@@ -340,13 +340,13 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const ContainerEvent
     
     if( pLib )
     {
-	    SbModule* pMod = pLib->FindModule( aName );
+        SbModule* pMod = pLib->FindModule( aName );
         ::rtl::OUString aMod;
         ModuleInfo mInfo;
         if( Event.Element >>= mInfo )
 			aMod = mInfo.ModuleSource;
         else 
-            Event.Element >>= aMod;
+        Event.Element >>= aMod;
         if( pMod )
 		{
             pMod->SetSource32( aMod );
@@ -363,7 +363,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const ContainerEvent
 			// the ModuleInfo structure ( vba ) for *all* modules
 			// or not ( normal )
 			if ( mInfo.ModuleType == ModuleType::Unknown )
-				pLib->MakeModule32( aName, aMod );
+            pLib->MakeModule32( aName, aMod );
 			else
 				pLib->MakeModule32( mInfo );
 
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index e93237601..c2db3f91f 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -577,7 +577,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
         {}
     }
 
-    Any aDlgLibAny;
+	Any aDlgLibAny;
 	bool bDocDialog = false;
 	StarBASIC* pFoundBasic = NULL;
     OSL_TRACE("About to try get a hold of ThisComponent");
@@ -585,18 +585,18 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 		aDlgLibAny = implFindDialogLibForDialogBasic( aAnyISP, pINST->GetBasic(), pFoundBasic );
 		// If we found the dialog then it belongs to the Search basic
 		if ( !pFoundBasic )
-		{
+    {
 			Reference< frame::XDesktop > xDesktop( xMSF->createInstance
 		( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ) ),
 			UNO_QUERY );
 			Reference< container::XEnumeration > xModels;
 			if ( xDesktop.is() )
-			{
+    {
 				Reference< container::XEnumerationAccess > xComponents( xDesktop->getComponents(), UNO_QUERY );
 				if ( xComponents.is() )
 					xModels.set( xComponents->createEnumeration(), UNO_QUERY );
 				if ( xModels.is() )
-				{
+    {
 					while ( xModels->hasMoreElements() )
 					{
 						Reference< frame::XModel > xNextModel( xModels->nextElement(), UNO_QUERY );
@@ -610,7 +610,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 								bDocDialog = true;
 								xModel = xNextModel;
 								break;
-							} 
+    }
 						}
 					}
 				}
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index e71560a22..c47715c97 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -511,7 +511,7 @@ SbClassModuleObject::~SbClassModuleObject()
 void SbClassModuleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                            const SfxHint& rHint, const TypeId& rHintType )
 {
-	SbModule::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
+        SbModule::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
 }
 
 SbxVariable* SbClassModuleObject::Find( const XubString& rName, SbxClassType t )
diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src
index 8124cadec..13b3d99ac 100644
--- a/basic/source/classes/sb.src
+++ b/basic/source/classes/sb.src
@@ -596,7 +596,7 @@ Resource RID_BASIC_START
 		Text [ de ] = "$(ARG1)." ;
 		Text [ en-US ] = "$(ARG1)." ;
 		Text [ x-comment ] = " ";
-	};
+};
 };
  // Hinweis: IDS_SBERR_TERMINATED = IDS_SBERR_START+2000.
 String IDS_SBERR_TERMINATED
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index b0360613a..06ae6a5f8 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -63,6 +63,7 @@
 #include <com/sun/star/script/XInvocationAdapterFactory.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/script/XDefaultProperty.hpp>
+#include <com/sun/star/script/XDefaultMethod.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/reflection/XIdlArray.hpp>
@@ -73,7 +74,7 @@
 #include <com/sun/star/bridge/oleautomation/Date.hpp>
 #include <com/sun/star/bridge/oleautomation/Decimal.hpp>
 #include <com/sun/star/bridge/oleautomation/Currency.hpp>
-
+#include <com/sun/star/script/XAutomationInvocation.hpp>
 
 using com::sun::star::uno::Reference;
 using namespace com::sun::star::uno;
@@ -141,16 +142,19 @@ bool SbUnoObject::getDefaultPropName( SbUnoObject* pUnoObj, String& sDfltProp )
 SbxVariable* getDefaultProp( SbxVariable* pRef )
 {
     SbxVariable* pDefaultProp = NULL;
-    SbxObject* pObj = PTR_CAST(SbxObject,(SbxVariable*) pRef);
-    if ( !pObj )
-    {
-        SbxBase* pObjVarObj = pRef->GetObject();
-        pObj = PTR_CAST(SbxObject,pObjVarObj);
-    }
-    if ( pObj && pObj->ISA(SbUnoObject) )
+	if ( pRef->GetType() == SbxOBJECT )
     {
-        SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj);
-        pDefaultProp = pUnoObj->GetDfltProperty();
+  		SbxObject* pObj = PTR_CAST(SbxObject,(SbxVariable*) pRef);
+		if ( !pObj )
+		{
+			SbxBase* pObjVarObj = pRef->GetObject();
+			pObj = PTR_CAST(SbxObject,pObjVarObj);
+		}
+		if ( pObj && pObj->ISA(SbUnoObject) )
+		{
+			SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj);
+			pDefaultProp = pUnoObj->GetDfltProperty();
+		}
     }
     return pDefaultProp;
 }
@@ -1504,6 +1508,103 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
     return aRetVal;
 }
 
+void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOLEAutomation, UINT32 nParamCount )
+{
+	AutomationNamedArgsSbxArray* pArgNamesArray = NULL;
+	if( bOLEAutomation )
+		pArgNamesArray = PTR_CAST(AutomationNamedArgsSbxArray,pParams);
+
+	args.realloc( nParamCount );
+	Any* pAnyArgs = args.getArray();
+	bool bBlockConversionToSmallestType = pINST->IsCompatibility();
+	UINT32 i = 0;	
+	if( pArgNamesArray )
+	{
+		Sequence< ::rtl::OUString >& rNameSeq = pArgNamesArray->getNames();
+		::rtl::OUString* pNames = rNameSeq.getArray();
+		Any aValAny;
+		for( i = 0 ; i < nParamCount ; i++ )
+		{
+			USHORT iSbx = (USHORT)(i+1);
+	
+			// ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
+			aValAny = sbxToUnoValueImpl( pParams->Get( iSbx ),
+			bBlockConversionToSmallestType );
+	
+			::rtl::OUString aParamName = pNames[iSbx];
+			if( aParamName.getLength() )
+			{
+				oleautomation::NamedArgument aNamedArgument;
+				aNamedArgument.Name = aParamName;
+				aNamedArgument.Value = aValAny;
+				pAnyArgs[i] <<= aNamedArgument;
+			}
+			else
+			{
+				pAnyArgs[i] = aValAny;
+			}
+		}
+	}
+	else
+	{
+		for( i = 0 ; i < nParamCount ; i++ )
+		{
+			// ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
+			pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (USHORT)(i+1) ),
+			bBlockConversionToSmallestType );
+		}
+	}
+
+}
+enum INVOKETYPE
+{
+   GetProp = 0, 
+   SetProp, 
+   Func
+};
+Any invokeAutomationMethod( const String& Name, Sequence< Any >& args, SbxArray* pParams, UINT32 nParamCount, Reference< XInvocation >& rxInvocation, INVOKETYPE invokeType = Func )
+{
+	Sequence< INT16 > OutParamIndex;
+	Sequence< Any > OutParam;
+    
+	Any aRetAny;
+	switch( invokeType )
+	{
+		case Func:
+			aRetAny = rxInvocation->invoke( Name, args, OutParamIndex, OutParam );
+			break;
+		case GetProp:
+			{
+				Reference< XAutomationInvocation > xAutoInv( rxInvocation, UNO_QUERY_THROW );
+				aRetAny = xAutoInv->invokeGetProperty( Name, args, OutParamIndex, OutParam );
+				break;
+			}
+		case SetProp:
+			{
+				Reference< XAutomationInvocation > xAutoInv( rxInvocation, UNO_QUERY_THROW );
+				aRetAny = xAutoInv->invokePutProperty( Name, args, OutParamIndex, OutParam );
+				break;
+			}
+		default:
+			break; // should introduce an error here
+	
+	}
+	const INT16* pIndices = OutParamIndex.getConstArray();
+	UINT32 nLen = OutParamIndex.getLength();
+	if( nLen )
+	{
+		const Any* pNewValues = OutParam.getConstArray();
+		for( UINT32 j = 0 ; j < nLen ; j++ )
+		{
+			INT16 iTarget = pIndices[ j ];
+			if( iTarget >= (INT16)nParamCount )
+				break;
+			unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pNewValues[ j ] );
+		}
+	}
+    return aRetAny;
+}
+
 // Dbg-Hilfsmethode zum Auslesen der in einem Object implementierten Interfaces
 String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, USHORT nRekLevel )
 {
@@ -2004,11 +2105,26 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 {
                     try
                     {
+						UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
+						sal_Bool bCanBeConsideredAMethod = mxInvocation->hasMethod( pProp->GetName() );
+						Any aRetAny;
+					   	if ( bCanBeConsideredAMethod && nParamCount )
+						{
+							// Automation properties have methods, so.. we need to invoke this through
+							// XInvocation
+							Sequence<Any> args;
+							processAutomationParams( pParams, args, true, nParamCount );
+							aRetAny = invokeAutomationMethod( pProp->GetName(), args, pParams, nParamCount, mxInvocation, GetProp );
+						}	
+						else
                         // Wert holen
-                        Any aRetAny = mxInvocation->getValue( pProp->GetName() );
+							aRetAny = mxInvocation->getValue( pProp->GetName() );
 
                         // Wert von Uno nach Sbx uebernehmen
                         unoToSbxValue( pVar, aRetAny );
+						if( pParams && bCanBeConsideredAMethod )
+							pVar->SetParameters( NULL );
+
                     }
                     catch( const Exception& )
                     {
@@ -2133,53 +2249,8 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 else if( bInvocation && pParams && mxInvocation.is() )
                 {
                     bool bOLEAutomation = true;
-                    // TODO: bOLEAutomation = xOLEAutomation.is()
-
-                    AutomationNamedArgsSbxArray* pArgNamesArray = NULL;
-                    if( bOLEAutomation )
-                        pArgNamesArray = PTR_CAST(AutomationNamedArgsSbxArray,pParams);
-
-                    args.realloc( nParamCount );
-                    Any* pAnyArgs = args.getArray();
-                    bool bBlockConversionToSmallestType = pINST->IsCompatibility();
-                    if( pArgNamesArray )
-                    {
-                        Sequence< ::rtl::OUString >& rNameSeq = pArgNamesArray->getNames();
-                        ::rtl::OUString* pNames = rNameSeq.getArray();
-
-                        Any aValAny;
-                        for( i = 0 ; i < nParamCount ; i++ )
-                        {
-                            USHORT iSbx = (USHORT)(i+1);
-
-                            // ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
-                            aValAny = sbxToUnoValueImpl( pParams->Get( iSbx ),
-                                                        bBlockConversionToSmallestType );
-
-                            ::rtl::OUString aParamName = pNames[iSbx];
-                            if( aParamName.getLength() )
-                            {
-                                oleautomation::NamedArgument aNamedArgument;
-                                aNamedArgument.Name = aParamName;
-                                aNamedArgument.Value = aValAny;
-                                pAnyArgs[i] <<= aNamedArgument;
+					processAutomationParams( pParams, args, bOLEAutomation, nParamCount );
                             }
-                            else
-                            {
-                                pAnyArgs[i] = aValAny;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        for( i = 0 ; i < nParamCount ; i++ )
-                        {
-                            // ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
-                            pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (USHORT)(i+1) ),
-                                                            bBlockConversionToSmallestType );
-                        }
-                    }
-                }
 
                 // Methode callen
                 GetSbData()->bBlockCompilerError = TRUE;  // #106433 Block compiler errors for API calls
@@ -2213,27 +2284,9 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                     }
                     else if( bInvocation && mxInvocation.is() )
                     {
-                        Sequence< INT16 > OutParamIndex;
-                        Sequence< Any > OutParam;
-                        Any aRetAny = mxInvocation->invoke( pMeth->GetName(), args, OutParamIndex, OutParam );
-
-                        // Wert von Uno nach Sbx uebernehmen
+						Any aRetAny = invokeAutomationMethod( pMeth->GetName(), args, pParams, nParamCount, mxInvocation );
                         unoToSbxValue( pVar, aRetAny );
-
-                        const INT16* pIndices = OutParamIndex.getConstArray();
-                        UINT32 nLen = OutParamIndex.getLength();
-                        if( nLen )
-                        {
-                            const Any* pNewValues = OutParam.getConstArray();
-                            for( UINT32 j = 0 ; j < nLen ; j++ )
-                            {
-                                INT16 iTarget = pIndices[ j ];
-                                if( iTarget >= (INT16)nParamCount )
-                                    break;
-                                unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pNewValues[ j ] );
                             }
-                        }
-                    }
 
                     // #55460, Parameter hier weghauen, da das in unoToSbxValue()
                     // bei Arrays wegen #54548 nicht mehr gemacht wird
@@ -3238,12 +3291,12 @@ VBAConstantHelper::getVBAConstant( const String& rName )
     SbxVariable* pConst = NULL;
     init();
 
-    ::rtl::OUString sKey( rName );
+	::rtl::OUString sKey( rName );
 
     VBAConstantsHash::const_iterator it = aConstHash.find( sKey.toAsciiLowerCase() );
 
     if ( it != aConstHash.end() )
-    {
+	{
         pConst = new SbxVariable( SbxVARIANT );
         pConst->SetName( rName );
         unoToSbxValue( pConst, it->second );
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 672068bdf..d05cf818c 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -80,6 +80,9 @@
 #include <com/sun/star/awt/XControl.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/anytostring.hxx>
+#include <com/sun/star/document/XVbaMethodParameter.hpp> //liuchen 2009-7-21
+extern void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue ); //liuchen 2009-7-21
+extern ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );  //liuchen 2009-7-21
 
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <vcl/svapp.hxx>
@@ -124,7 +127,7 @@ public:
     DECL_LINK( OnAsyncQuit, void* );
 };
 
-IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, pNull )
+IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, /*pNull*/ )
 {
     QuitApplication();
     return 0L;
@@ -529,7 +532,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
                 {
                     eEndTok = ENDPROPERTY; break;
                 }
-            }
+                }
             eLastTok = eCurTok;
         }
         // Definition der Methode
@@ -1666,7 +1669,7 @@ SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException
     if ( pUnoObj && pUnoObj->getUnoAny() == aObj ) // object is equal, nothing to do
         return;
     pDocObject = new SbUnoObject( GetName(), uno::makeAny( aObj ) );
-            
+
     com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > xServiceInfo( aObj, com::sun::star::uno::UNO_QUERY_THROW );
     if( xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Worksheet" ) ) )
     {
@@ -1751,7 +1754,40 @@ public:
             }
         }
     }
-    virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) {}
+	
+    //liuchen 2009-7-21, support Excel VBA Form_QueryClose event
+    virtual void SAL_CALL windowClosing( const lang::EventObject& e ) throw (uno::RuntimeException)
+    {    
+		uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY );
+		if ( xDialog.is() )
+		{
+			uno::Reference< awt::XControl > xControl( xDialog, uno::UNO_QUERY );
+			if ( xControl->getPeer().is() )
+			{
+				uno::Reference< document::XVbaMethodParameter > xVbaMethodParameter( xControl->getPeer(), uno::UNO_QUERY );
+				if ( xVbaMethodParameter.is() )
+				{	
+					sal_Int8 nCancel = 0;
+					sal_Int8 nCloseMode = 0;
+
+					Sequence< Any > aParams;
+					aParams.realloc(2);
+					aParams[0] <<= nCancel;
+					aParams[1] <<= nCloseMode;
+
+					mpUserForm->triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ),
+												aParams);
+					xVbaMethodParameter->setVbaMethodParameter( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Cancel")), aParams[0]);
+					return;
+	
+				}			
+			}		
+		}
+    	
+    	mpUserForm->triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ) );
+    }
+	//liuchen 2009-7-21
+	
     virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) { mbOpened = sal_False; mbShowing = sal_False; }
     virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) {}
     virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException){}
@@ -1805,13 +1841,49 @@ void SbUserFormModule::ResetApiObj()
 
 void SbUserFormModule::triggerMethod( const String& aMethodToRun )
 {
+	Sequence< Any > aArguments;
+	triggerMethod( aMethodToRun, aArguments );
+}
+void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any >& aArguments)
+{
 	OSL_TRACE("*** trigger %s ***", rtl::OUStringToOString( aMethodToRun, RTL_TEXTENCODING_UTF8 ).getStr() );
 	// Search method
 	SbxVariable* pMeth = SbObjModule::Find( aMethodToRun, SbxCLASS_METHOD );
 	if( pMeth )
-	{
-		SbxValues aVals;
-		pMeth->Get( aVals );
+	{		
+                 //liuchen 2009-7-21, support Excel VBA UserForm_QueryClose event with parameters
+		if ( aArguments.getLength() > 0 )   // Setup parameters
+		{
+			SbxArrayRef xArray = new SbxArray;
+			xArray->Put( pMeth, 0 );	// Method as parameter 0
+
+			for ( sal_Int32 i = 0; i < aArguments.getLength(); ++i )
+			{
+				SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
+                unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), aArguments[i] );
+                xArray->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+
+				// Enable passing by ref
+				if ( xSbxVar->GetType() != SbxVARIANT )
+					xSbxVar->SetFlag( SBX_FIXED );
+			}
+			pMeth->SetParameters( xArray );
+
+			SbxValues aVals;
+			pMeth->Get( aVals );
+			
+			for ( sal_Int32 i = 0; i < aArguments.getLength(); ++i )
+			{
+				aArguments[i] = sbxToUnoValue( xArray->Get( static_cast< USHORT >(i) + 1) );
+			}		
+			pMeth->SetParameters( NULL );
+		}
+		else
+//liuchen 2009-7-21
+		{
+			SbxValues aVals;
+			pMeth->Get( aVals );
+		}
 	}
 }
 
@@ -1854,12 +1926,31 @@ void SbUserFormModule::load()
     if ( !pDocObject )
         InitObject();
 }
+
+//liuchen 2009-7-21 change to accmordate VBA's beheavior
 void SbUserFormModule::Unload()
 {
     OSL_TRACE("** Unload() ");
+
+	sal_Int8 nCancel = 0;
+	sal_Int8 nCloseMode = 1;
+
+	Sequence< Any > aParams;
+	aParams.realloc(2);
+	aParams[0] <<= nCancel;
+	aParams[1] <<= nCloseMode;
+
+	triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ), aParams);
+
+	aParams[0] >>= nCancel;
+	if (nCancel == 1)
+	{
+		return;
+	}
+	
     if ( m_xDialog.is() )
     {
-	triggerTerminateEvent();
+		triggerTerminateEvent();
     }
 	// Search method
 	SbxVariable* pMeth = SbObjModule::Find( String( RTL_CONSTASCII_USTRINGPARAM( "UnloadObject" ) ), SbxCLASS_METHOD );
@@ -1884,6 +1975,7 @@ void SbUserFormModule::Unload()
 		OSL_TRACE("UnloadObject completed ( we hope )");
 	}
 }
+//liuchen
 
 void SbUserFormModule::InitObject()
 {
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index b4fb1d1be..3ea7e2941 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -406,6 +406,9 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
                 aExpr.Gen();
                 SbiOpcode eOp_ = pDef->IsNew() ? _CREATE : _TCREATE;
                 aGen.Gen( eOp_, pDef->GetId(), pDef->GetTypeId() );
+				if ( bVBASupportOn )
+					aGen.Gen( _VBASET );
+				else	
                 aGen.Gen( _SET );
             }
         }
@@ -581,7 +584,7 @@ void SbiParser::DefType( BOOL bPrivate )
                 pElem = VarDecl(&pDim,FALSE,FALSE);
                 if( !pElem )
                     bDone = TRUE;	// Error occured
-        }
+                }
         if( pElem )
         {
             SbxArray *pTypeMembers = pType -> GetProperties();
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 1c9ad8fb8..499f0dd47 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -381,10 +381,10 @@ SbiExprNode* SbiExpression::Term( void )
 			// defer error until runtime if in vba mode
 			if ( !pParser->IsVBASupportOn() )
                         {
-				pParser->Error( SbERR_BAD_DECLARATION, aSym );
-				bError = TRUE;
-			}
+            pParser->Error( SbERR_BAD_DECLARATION, aSym );
+            bError = TRUE;
         }
+		}
         if( !bError )
             pNd->aVar.pNext = ObjTerm( *pDef );
     }
@@ -574,7 +574,11 @@ SbiExprNode* SbiExpression::Unary()
             eTok = NEG;
         case NOT:
             pParser->Next();
-            pNd = new SbiExprNode( pParser, Unary(), eTok, NULL );
+            // process something like "Do While Not "foo"="" "
+            if( pParser->IsVBASupportOn() )
+                pNd = new SbiExprNode( pParser, Like(), eTok, NULL );
+            else    
+                pNd = new SbiExprNode( pParser, Unary(), eTok, NULL );
             break;
         case PLUS:
             pParser->Next();
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index cc667861a..a0a206ff7 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2439,8 +2439,8 @@ RTLFUNC(IsEmpty)
 			rPar.Get( 0 )->PutBool( pVar->IsEmpty() );
 		}
 		else
-			rPar.Get( 0 )->PutBool( rPar.Get(1)->IsEmpty() );
-	}
+        rPar.Get( 0 )->PutBool( rPar.Get(1)->IsEmpty() );
+}
 }
 
 RTLFUNC(IsError)
@@ -2465,8 +2465,8 @@ RTLFUNC(IsError)
 		if ( xError.is() )
 			rPar.Get( 0 )->PutBool( xError->hasError() );
 		else
-			rPar.Get( 0 )->PutBool( rPar.Get(1)->IsErr() );
-	}
+        rPar.Get( 0 )->PutBool( rPar.Get(1)->IsErr() );
+}
 }
 
 RTLFUNC(IsNull)
@@ -4239,12 +4239,12 @@ RTLFUNC(Load)
     // Diesen Call einfach an das Object weiterreichen
     SbxBase* pObj = (SbxObject*)rPar.Get(1)->GetObject();
 	if( pObj && pObj->IsA( TYPE( SbUserFormModule ) ) )
-	{
+    {
 		SbUserFormModule* pFormModule = ( SbUserFormModule* )pObj;
 		pFormModule->load();
 	}
 	else if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
-    {
+	{
         SbxVariable* pVar = ((SbxObject*)pObj)->
             Find( String( RTL_CONSTASCII_USTRINGPARAM("Load") ), SbxCLASS_METHOD );
         if( pVar )
@@ -4267,12 +4267,12 @@ RTLFUNC(Unload)
     // Diesen Call einfach an das Object weitereichen
     SbxBase* pObj = (SbxObject*)rPar.Get(1)->GetObject();
 	if( pObj && pObj->IsA( TYPE( SbUserFormModule ) ) )
-	{
+    {
 		SbUserFormModule* pFormModule = ( SbUserFormModule* )pObj;
 		pFormModule->Unload();
 	}
 	else if( pObj && pObj->IsA( TYPE( SbxObject ) ) )
-    {
+	{
         SbxVariable* pVar = ((SbxObject*)pObj)->
             Find( String( RTL_CONSTASCII_USTRINGPARAM("Unload") ), SbxCLASS_METHOD );
         if( pVar )
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 1f87c04ef..9bacf3102 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -3149,5 +3149,5 @@ RTLFUNC(Me)
     }
     else
         refVar->PutObject( pClassModuleObject );
-}
+    }
 
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 52f25b05b..db0fe1c99 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -294,7 +294,6 @@ SbiInstance::SbiInstance( StarBASIC* p )
     nErl	 = 0;
     bReschedule = TRUE;
     bCompatibility = FALSE;
-	SbxErrObject::getUnoErrObject()->Clear();
 }
 
 SbiInstance::~SbiInstance()
@@ -849,7 +848,7 @@ void SbiRuntime::Error( SbError n )
 				if ( !aMsg.Len() ) // no message for err no.
 					// need localized resource here
 					aMsg = String( RTL_CONSTASCII_USTRINGPARAM("Internal Object Error:") );
-			}
+}
 			// no num? most likely then it *is* really a vba err
 			SbxErrObject::getUnoErrObject()->setNumber( ( StarBASIC::GetVBErrorCode( n ) == 0 ) ? n : StarBASIC::GetVBErrorCode( n ) );
 			SbxErrObject::getUnoErrObject()->setDescription( aMsg );
@@ -988,7 +987,7 @@ void SbiRuntime::TOSMakeTemp()
 
 	SbxVariable* pDflt = NULL;
 	if ( bVBAEnabled &&  ( p->GetType() == SbxOBJECT || p->GetType() == SbxVARIANT  ) && ( pDflt = getDefaultProp( p ) ) )
-	{
+    {
 		pDflt->Broadcast( SBX_HINT_DATAWANTED );
 		// replacing new p on stack causes object pointed by 
 		// pDft->pParent to be deleted, when p2->Compute() is
@@ -1002,7 +1001,7 @@ void SbiRuntime::TOSMakeTemp()
 	}
 
 	else if( p->GetRefCount() != 1 )
-    {
+	{
         SbxVariable* pNew = new SbxVariable( *p );
         pNew->SetFlag( SBX_READWRITE );
         refExprStk->Put( pNew, nExprLvl - 1 );
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index df7117dbc..3b6297ecb 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -86,18 +86,18 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
     // values ( and type ) set as appropriate
     SbxDataType p1Type = p1->GetType(); 
     SbxDataType p2Type = p2->GetType(); 
-	if ( p1Type == SbxEMPTY )
-	{
-		p1->Broadcast( SBX_HINT_DATAWANTED );
+        if ( p1Type == SbxEMPTY )
+        {
+            p1->Broadcast( SBX_HINT_DATAWANTED );
 		p1Type = p1->GetType(); 
 	}
 	if ( p2Type == SbxEMPTY )
 	{
-		p2->Broadcast( SBX_HINT_DATAWANTED );
+            p2->Broadcast( SBX_HINT_DATAWANTED );
 		p2Type = p2->GetType(); 
-	}
-    if ( p1Type == p2Type )
-    {
+        }
+	if ( p1Type == p2Type )
+	{
         // if both sides are an object and have default props
         // then we need to use the default props
         // we don't need to worry if only one side ( lhs, rhs ) is an 
@@ -128,7 +128,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
 	// why do this at all ?
 	// I dumbly follow the pattern :-/
 	if ( bVBAEnabled && ( p1->IsNull() || p2->IsNull() ) )	
-	{
+    {
 		if( !pNULL )
 		{
 			pNULL = new SbxVariable;
@@ -138,7 +138,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
 		PushVar( pNULL );
 	}
 	else if( p2->Compare( eOp, *p1 ) )
-    {
+	{
         if( !pTRUE )
         {
             pTRUE = new SbxVariable;
@@ -158,13 +158,13 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
         PushVar( pFALSE );
     }
 #else
-    SbxVariable* pRes = new SbxVariable;
+	SbxVariable* pRes = new SbxVariable;
 	if ( bVBAEnabled && ( p1->IsNull() || p2->IsNull() ) )	
 		pRes->PutNull();
 	else
 	{
-		BOOL bRes = p2->Compare( eOp, *p1 );
-		pRes->PutBool( bRes );
+    BOOL bRes = p2->Compare( eOp, *p1 );
+    pRes->PutBool( bRes );
 	}
     PushVar( pRes );
 #endif
@@ -1132,6 +1132,7 @@ void SbiRuntime::StepNOERROR()
     pInst->nErr = 0L;
     pInst->nErl = 0;
     nError = 0L;
+	SbxErrObject::getUnoErrObject()->Clear();
     bError = FALSE;
 }
 
@@ -1140,6 +1141,9 @@ void SbiRuntime::StepNOERROR()
 void SbiRuntime::StepLEAVE()
 {
     bRun = FALSE;
+        // If VBA and we are leaving an ErrorHandler then clear the error ( it's been processed )
+	if ( bInError && pError )
+	    SbxErrObject::getUnoErrObject()->Clear();
 }
 
 void SbiRuntime::StepCHANNEL()	  	// TOS = Kanalnummer
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index 62e17372a..669ada99d 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -38,6 +38,7 @@
 #include "iosys.hxx"
 #include "image.hxx"
 #include "sbunoobj.hxx"
+#include "errobject.hxx"
 
 bool checkUnoObjectType( SbUnoObject* refVal, 
     const String& aClass );
@@ -374,6 +375,7 @@ void SbiRuntime::StepERRHDL( UINT32 nOp1 )
     pInst->nErr = 0;
     pInst->nErl = 0;
     nError = 0;
+	SbxErrObject::getUnoErrObject()->Clear();
 }
 
 // Resume nach Fehlern (+0=statement, 1=next or Label)
@@ -394,6 +396,8 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
     }
     else
         pCode = pErrStmnt;
+	if ( pError ) // current in error handler ( and got a Resume Next statment )
+		SbxErrObject::getUnoErrObject()->Clear();
 
     if( nOp1 > 1 )
         StepJUMP( nOp1 );
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 03dd0ac91..ac988754b 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -264,8 +264,10 @@ SbxVariable* SbiRuntime::FindElement
             pElem = pNew;
         }
         // Index-Access bei UnoObjekten beruecksichtigen
-        /*
-        else if( pElem->ISA(SbUnoProperty) )
+		// definitely we want this for VBA where properties are often 
+		// collections ( which need index access ), but lets only do 
+		// this if we actually have params following
+		else if( bVBAEnabled && pElem->ISA(SbUnoProperty) && pElem->GetParameters() )
         {
             // pElem auf eine Ref zuweisen, um ggf. eine Temp-Var zu loeschen
             SbxVariableRef refTemp = pElem;
@@ -275,7 +277,6 @@ SbxVariable* SbiRuntime::FindElement
             pElem->SetParameters( NULL ); // sonst bleibt Ref auf sich selbst
             pElem = pNew;
         }
-        */
     }
     return CheckArray( pElem );
 }
@@ -378,7 +379,8 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
                 bool bError_ = true;
 
                 SbUnoMethod* pUnoMethod = PTR_CAST(SbUnoMethod,p);
-                if( pUnoMethod )
+				SbUnoProperty* pUnoProperty = PTR_CAST(SbUnoProperty,p);
+				if( pUnoMethod || pUnoProperty )
                 {
                     SbUnoObject* pParentUnoObj = PTR_CAST( SbUnoObject,p->GetParent() );
                     if( pParentUnoObj )
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 23b3aaa17..885feb47b 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1285,12 +1285,12 @@ BOOL SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp )
                         if( aL.eType != SbxLONG && aL.eType != SbxULONG )
 						{
 							if ( aL.eType != SbxBOOL )
-								aL.nLong64 = ~aL.nLong64;
-							else
-								aL.nLong = ~aL.nLong;
-						}
+                            aL.nLong64 = ~aL.nLong64;
                         else
                             aL.nLong = ~aL.nLong;
+						}
+						else
+							aL.nLong = ~aL.nLong;
                         break;
                     default: break;
                 }
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 8bebf5a91..ad29c40f7 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -219,7 +219,7 @@ void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement
 	if ( aElement >>= mInfo )
 		aMod.aCode = mInfo.ModuleSource;
 	else
-		aElement >>= aMod.aCode;
+    aElement >>= aMod.aCode;
     xmlscript::exportScriptModule( xHandler, aMod );
 }
 
@@ -1180,7 +1180,7 @@ bool SfxScriptLibrary::containsValidModule( const Any& aElement )
 	if ( aElement >>= mInfo )
 		sModuleText = mInfo.ModuleSource;
 	else
-		aElement >>= sModuleText;
+    aElement >>= sModuleText;
     return ( sModuleText.getLength() > 0 );
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 6d27fd4fa..36a4ae155 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -45,7 +45,17 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined(__ARM_EABI__) && !defined(__SOFTFP__)
+/* 
+ * Based on http://gcc.gnu.org/PR41443
+ * References to __SOFTFP__ are incorrect for EABI; the __SOFTFP__ code
+ * should be used for *soft-float ABI* whether or not VFP is enabled,
+ * and __SOFTFP__ does specifically mean soft-float not soft-float ABI.
+ *
+ * Changing the conditionals to __SOFTFP__ || __ARM_EABI__ then 
+ * -mfloat-abi=softfp should work.  -mfloat-abi=hard won't; that would
+ * need both a new macro to identify the hard-VFP ABI.
+ */
+#if !defined(__ARM_EABI__) && (!defined(__SOFTFP__)
 #error Not Implemented
 
 /*
@@ -103,7 +113,7 @@ namespace arm
 
 void MapReturn(long r0, long r1, typelib_TypeClass eReturnType, void *pRegisterReturn)
 {
-#ifndef __SOFTFP__
+#if !defined(__ARM_EABI__) && !defined(__SOFTFP__)
     register float fret asm("f0");
     register double dret asm("f0");
 #endif
@@ -128,14 +138,14 @@ void MapReturn(long r0, long r1, typelib_TypeClass eReturnType, void *pRegisterR
             *(unsigned char*)pRegisterReturn = (unsigned char)r0;
             break;
         case typelib_TypeClass_FLOAT:
-#ifdef __SOFTFP__
+#if defined(__ARM_EABI__) || defined(__SOFTFP__)
             ((long*)pRegisterReturn)[0] = r0;
 #else
             *(float*)pRegisterReturn = fret;
 #endif
         break;
         case typelib_TypeClass_DOUBLE:
-#ifdef __SOFTFP__
+#if defined(__ARM_EABI__) || defined(__SOFTFP__)
             ((long*)pRegisterReturn)[1] = r1;
             ((long*)pRegisterReturn)[0] = r0;
 #else
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 4673f6de7..dc9e47422 100755
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -87,9 +87,14 @@
 
 #else
 
+    #include <dxsdkver.h>
     #include <d3d9.h>
     #include <d3dx9.h>
-    #include <dxerr9.h>
+    #if _DXSDK_BUILD_MAJOR < 1734 /* Earlier than the August 2009 DXSDK */
+        #include <dxerr9.h>
+    #else
+        #include <dxerr.h>
+    #endif
 
     typedef IDirect3DSurface9 surface_type;
 
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx
index 3a562f05b..db529a7cb 100644
--- a/chart2/source/model/template/AreaChartType.cxx
+++ b/chart2/source/model/template/AreaChartType.cxx
@@ -33,72 +33,8 @@
 #include "AreaChartType.hxx"
 #include "macros.hxx"
 #include "servicenames_charttypes.hxx"
-#include "PropertyHelper.hxx"
-#include "ContainerHelper.hxx"
-
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 
 using namespace ::com::sun::star;
-using ::com::sun::star::beans::Property;
-using ::com::sun::star::uno::Sequence;
-
-namespace
-{
-
-enum
-{
-    PROP_AREACHARTTYPE_STACKED,
-    PROP_AREACHARTTYPE_PERCENT
-};
-
-void lcl_AddPropertiesToVector(
-    ::std::vector< Property > & rOutProperties )
-{
-    rOutProperties.push_back(
-        Property( C2U( "Stacked" ),
-                  PROP_AREACHARTTYPE_STACKED,
-                  ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ));
-    rOutProperties.push_back(
-        Property( C2U( "Percent" ),
-                  PROP_AREACHARTTYPE_PERCENT,
-                  ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ));
-}
-
-void lcl_AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
-{
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AREACHARTTYPE_STACKED, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AREACHARTTYPE_PERCENT, false );
-}
-
-const Sequence< Property > & lcl_GetPropertySequence()
-{
-    static Sequence< Property > aPropSeq;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aPropSeq.getLength() )
-    {
-        // get properties
-        ::std::vector< ::com::sun::star::beans::Property > aProperties;
-        lcl_AddPropertiesToVector( aProperties );
-
-        // and sort them for access via bsearch
-        ::std::sort( aProperties.begin(), aProperties.end(),
-                     ::chart::PropertyNameLess() );
-
-        // transfer result to static Sequence
-        aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
-    }
-
-    return aPropSeq;
-}
-
-} // anonymous namespace
 
 namespace chart
 {
@@ -129,56 +65,6 @@ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone()
     return CHART2_SERVICE_NAME_CHARTTYPE_AREA;
 }
 
-// ____ OPropertySet ____
-uno::Any AreaChartType::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
-{
-    static tPropertyValueMap aStaticDefaults;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( 0 == aStaticDefaults.size() )
-    {
-        // initialize defaults
-        lcl_AddDefaultsToMap( aStaticDefaults );
-    }
-
-    tPropertyValueMap::const_iterator aFound(
-        aStaticDefaults.find( nHandle ));
-
-    if( aFound == aStaticDefaults.end())
-        return uno::Any();
-
-    return (*aFound).second;
-    // \--
-}
-
-::cppu::IPropertyArrayHelper & SAL_CALL AreaChartType::getInfoHelper()
-{
-    static ::cppu::OPropertyArrayHelper aArrayHelper( lcl_GetPropertySequence(),
-                                                      /* bSorted = */ sal_True );
-
-    return aArrayHelper;
-}
-
-// ____ XPropertySet ____
-uno::Reference< beans::XPropertySetInfo > SAL_CALL AreaChartType::getPropertySetInfo()
-    throw (uno::RuntimeException)
-{
-    static uno::Reference< beans::XPropertySetInfo > xInfo;
-
-    // /--
-    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-    if( !xInfo.is())
-    {
-        xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-            getInfoHelper());
-    }
-
-    return xInfo;
-    // \--
-}
-
 uno::Sequence< ::rtl::OUString > AreaChartType::getSupportedServiceNames_Static()
 {
     uno::Sequence< ::rtl::OUString > aServices( 2 );
diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx
index d3f905dc2..97830742e 100644
--- a/chart2/source/model/template/AreaChartType.hxx
+++ b/chart2/source/model/template/AreaChartType.hxx
@@ -56,16 +56,6 @@ protected:
     virtual ::rtl::OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException);
 
-    // ____ OPropertySet ____
-    virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(::com::sun::star::beans::UnknownPropertyException);
-    virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
-    // ____ XPropertySet ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (::com::sun::star::uno::RuntimeException);
-
     // ____ XCloneable ____
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
         throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index f7d24a5ae..98874ef8d 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -48,8 +48,6 @@ using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
 using ::osl::MutexGuard;
 
 namespace
@@ -277,7 +275,6 @@ Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForN
 {
     Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
     ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult );    
-    setStackModePropertiesToChartType(xResult);
     return xResult;
 }
 
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 0e5904dca..e6382d542 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -221,7 +221,6 @@ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNe
 {
     Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
     ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult );    
-    setStackModePropertiesToChartType(xResult);
     return xResult;
 }
 
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index fb0cff02a..9d6524e45 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -62,7 +62,6 @@ using ::rtl::OUString;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::UNO_QUERY;
 
 // ======================================================================
 
@@ -944,48 +943,6 @@ void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem(
         comphelper::copyProperties( xSource, xDestination );
 }
 
-void ChartTypeTemplate::setStackModePropertiesToChartType(const Reference<XChartType>& xChartType)
-{
-    Reference<beans::XPropertySet> xPropSet(xChartType, UNO_QUERY);
-    if (!xPropSet.is())
-        return;
-
-    bool bStacked = false;
-    bool bPercent = false;
-    switch (getStackMode(0))
-    {
-        case StackMode_Y_STACKED:
-            bStacked = true;
-        break;
-        case StackMode_Y_STACKED_PERCENT:
-            bStacked = true;
-            bPercent = true;
-        break;
-        case StackMode_Z_STACKED:
-        break;
-        default:
-            ;
-    }
-
-    try
-    {
-        xPropSet->setPropertyValue(
-            C2U("Stacked"), uno::makeAny(static_cast<sal_Bool>(bStacked)));
-    }
-    catch (const beans::UnknownPropertyException&)
-    {
-    }
-
-    try
-    {
-        xPropSet->setPropertyValue(
-            C2U("Percent"), uno::makeAny(static_cast<sal_Bool>(bPercent)));
-    }
-    catch (const beans::UnknownPropertyException&) 
-    {
-    }
-}
-
 // ________
 
 Sequence< OUString > ChartTypeTemplate::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx
index 0469478fd..d8b2b7b5b 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -272,11 +272,6 @@ protected:
                     const ::com::sun::star::uno::Reference<
                           ::com::sun::star::chart2::XChartType > & xNewChartType );
 
-    void setStackModePropertiesToChartType(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartType>& xChartType );
-
-
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
         m_xContext;
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index a326aa4cc..ed5aea88a 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -49,9 +49,7 @@ namespace
 enum
 {
     PROP_BARCHARTTYPE_OVERLAP_SEQUENCE,
-    PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE,
-    PROP_BARCHARTTYPE_STACKED,
-    PROP_BARCHARTTYPE_PERCENT
+    PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE
 };
 
 void lcl_AddPropertiesToVector(
@@ -70,19 +68,6 @@ void lcl_AddPropertiesToVector(
                   ::getCppuType( reinterpret_cast< const Sequence< sal_Int32 > * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-
-    rOutProperties.push_back(
-        Property( C2U( "Stacked" ),
-                  PROP_BARCHARTTYPE_STACKED,
-                  ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ));
-    rOutProperties.push_back(
-        Property( C2U( "Percent" ),
-                  PROP_BARCHARTTYPE_PERCENT,
-                  ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
 void lcl_AddDefaultsToMap(
@@ -95,9 +80,6 @@ void lcl_AddDefaultsToMap(
 
     aSeq[0] = aSeq[1] = 100;
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE, aSeq );
-
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_STACKED, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_PERCENT, false );
 }
 
 const Sequence< Property > & lcl_GetPropertySequence()
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 4d921760c..54e7ea8f0 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -410,7 +410,6 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew
         ASSERT_EXCEPTION( ex );
     }
 
-    setStackModePropertiesToChartType(xResult);
     return xResult;
 }
 
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index 274abb0cc..05f6b439d 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -54,9 +54,7 @@ enum
 {
     PROP_LINECHARTTYPE_CURVE_STYLE,
     PROP_LINECHARTTYPE_CURVE_RESOLUTION,
-    PROP_LINECHARTTYPE_SPLINE_ORDER,
-    PROP_LINECHARTTYPE_STACKED,
-    PROP_LINECHARTTYPE_PERCENT
+    PROP_LINECHARTTYPE_SPLINE_ORDER
 };
 
 void lcl_AddPropertiesToVector(
@@ -81,19 +79,6 @@ void lcl_AddPropertiesToVector(
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-
-    rOutProperties.push_back(
-        Property( C2U( "Stacked" ),
-                  PROP_LINECHARTTYPE_STACKED,
-                  ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ));
-    rOutProperties.push_back(
-        Property( C2U( "Percent" ),
-                  PROP_LINECHARTTYPE_PERCENT,
-                  ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
 
 void lcl_AddDefaultsToMap(
@@ -105,9 +90,6 @@ void lcl_AddDefaultsToMap(
     // todo: check whether order 3 means polygons of order 3 or 2. (see
     // http://www.people.nnov.ru/fractal/Splines/Basis.htm )
     ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_SPLINE_ORDER, 3 );
-
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_STACKED, false );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_PERCENT, false );
 }
 
 const Sequence< Property > & lcl_GetPropertySequence()
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 93cd9c872..749a3b1bc 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -336,7 +336,6 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal
         ASSERT_EXCEPTION( ex );
     }
 
-    setStackModePropertiesToChartType(xResult);
     return xResult;
 }
 
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index a9bc6bce2..f21857c3e 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -213,7 +213,6 @@ Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNe
 {
     Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
     ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult );    
-    setStackModePropertiesToChartType(xResult);
     return xResult;
 }
 
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 233ae8501..8280389b7 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -474,7 +474,6 @@ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNe
         ASSERT_EXCEPTION( ex );
     }
 
-    setStackModePropertiesToChartType(xResult);
     return xResult;
 }
 
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index b9e18c9ea..bc384a99f 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -374,7 +374,6 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex(
         ASSERT_EXCEPTION( ex );
     }
 
-    setStackModePropertiesToChartType(xResult);
     return xResult;
 }
 
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index fc9538a87..32c8eea0a 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -527,7 +527,6 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie
         ASSERT_EXCEPTION( ex );
     }
 
-    setStackModePropertiesToChartType(xResult);
     return xResult;
 }
 
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 57922f113..085d30073 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -131,15 +131,7 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
     if( bAutoMinimum )
     {
         if( m_aSourceScale.AxisType==AxisType::PERCENT )
-        {
             rExplicitScale.Minimum = 0.0;
-            if (!::rtl::math::isNan(m_fValueMinimum))
-            {
-                double fMin = m_fValueMinimum / 100.0;
-                if (rExplicitScale.Minimum > fMin)
-                    rExplicitScale.Minimum = fMin;
-            }
-        }
         else if( ::rtl::math::isNan( m_fValueMinimum ) )
             rExplicitScale.Minimum = 0.0;   //@todo get Minimum from scaling or from plotter????
         else
@@ -150,15 +142,7 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
     if( bAutoMaximum )
     {
         if( m_aSourceScale.AxisType==AxisType::PERCENT )
-        {
             rExplicitScale.Maximum = 1.0;
-            if (!::rtl::math::isNan(m_fValueMaximum))
-            {
-                double fMax = m_fValueMaximum / 100.0;
-                if (rExplicitScale.Maximum < fMax)
-                    rExplicitScale.Maximum = fMax;
-            }
-        }
         else if( ::rtl::math::isNan( m_fValueMaximum ) )
             rExplicitScale.Maximum = 10.0;  //@todo get Maximum from scaling or from plotter????
         else
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 159f6655c..f8bc0f0b9 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -603,19 +603,6 @@ struct FormerPoint
 
 void AreaChart::createShapes()
 {
-    sal_Bool bPercent = sal_False;
-    uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-    if (xPropSet.is())
-    {
-        try
-        {
-            xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-        }
-        catch (const beans::UnknownPropertyException&)
-        {
-        }
-    }
-
     if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
         return;
 
@@ -765,30 +752,9 @@ void AreaChart::createShapes()
                     if( m_nDimension==3 && m_bArea && pSeriesList->size()!=1 )
                         fLogicY = fabs( fLogicY );
 
-                    if (bPercent)
-                    {     
-                        // This data series is percent-stacked.
-
-                        if (::rtl::math::approxEqual(aLogicYSumMap[nAttachedAxisIndex], 0.0))
-                            fLogicY = 0.0;
-                        else
-                            fLogicY = fabs( fLogicY )/aLogicYSumMap[nAttachedAxisIndex];
-
-                        if (!pPosHelper->isPercentY())
-                        {    
-                            // When the axis itself is not percent-stacked,
-                            // their internal range value is 0 - 100.  So we
-                            // need to adjust the data point values
-                            // accordingly.
-                            fLogicY *= 100.0;
-                        }
-                    }
-                    else if (pPosHelper->isPercentY())
+                    if( pPosHelper->isPercentY() && !::rtl::math::approxEqual( aLogicYSumMap[nAttachedAxisIndex], 0.0 ) )
                     {
-                        // The data series is not percent-stacked, but the
-                        // axis itself is.  In this case, the axis' internal
-                        // range is 0 to 1.  Adjust the data point values.
-                        fLogicY /= 100.0;
+                        fLogicY = fabs( fLogicY )/aLogicYSumMap[nAttachedAxisIndex];
                     }
 
                     if(    ::rtl::math::isNan(fLogicX) || ::rtl::math::isInf(fLogicX)
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 124d4afcb..f57ffa717 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -466,19 +466,6 @@ void BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
 
 void BarChart::createShapes()
 {
-    uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-    sal_Bool bPercent = sal_False;
-    if (xPropSet.is())
-    {
-        try
-        {
-            xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-        }
-        catch (const beans::UnknownPropertyException&)
-        {
-        }
-    }
-
     if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
         return;
 
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 80f856e94..3596d1758 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -129,6 +129,8 @@ PieChart::PieChart( const uno::Reference<XChartType>& xChartTypeModel
         , m_pPosHelper( new PiePositionHelper( NormalAxis_Z, (m_nDimension==3)?0.0:90.0 ) )
         , m_bUseRings(false)
 {
+    ::rtl::math::setNan(&m_fMaxOffset);
+
     PlotterBase::m_pPosHelper = m_pPosHelper;
     VSeriesPlotter::m_pMainPosHelper = m_pPosHelper;
     m_pPosHelper->m_fRadiusOffset = 0.0;
@@ -248,27 +250,31 @@ double PieChart::getMinimumX()
 {
     return 0.5;
 }
-double PieChart::getMaxOffset() const
+double PieChart::getMaxOffset()
 {
-    double fRet = 0.0;
+    if (!::rtl::math::isNan(m_fMaxOffset))
+        // Value already cached.  Use it.
+        return m_fMaxOffset;
+
+    m_fMaxOffset = 0.0;
     if( m_aZSlots.size()<=0 )
-        return fRet;
+        return m_fMaxOffset;
     if( m_aZSlots[0].size()<=0 )
-        return fRet;
+        return m_fMaxOffset;
 
     const ::std::vector< VDataSeries* >& rSeriesList( m_aZSlots[0][0].m_aSeriesVector );
     if( rSeriesList.size()<=0 )
-        return fRet;
+        return m_fMaxOffset;
 
     VDataSeries* pSeries = rSeriesList[0];
     uno::Reference< beans::XPropertySet > xSeriesProp( pSeries->getPropertiesOfSeries() );
     if( !xSeriesProp.is() )
-        return fRet;
+        return m_fMaxOffset;
 
     double fExplodePercentage=0.0;
     xSeriesProp->getPropertyValue( C2U( "Offset" )) >>= fExplodePercentage;
-    if(fExplodePercentage>fRet)
-        fRet=fExplodePercentage;
+    if(fExplodePercentage>m_fMaxOffset)
+        m_fMaxOffset=fExplodePercentage;
 
     uno::Sequence< sal_Int32 > aAttributedDataPointIndexList;
     if( xSeriesProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList )
@@ -280,12 +286,12 @@ double PieChart::getMaxOffset() const
             {
                 fExplodePercentage=0.0;
                 xPointProp->getPropertyValue( C2U( "Offset" )) >>= fExplodePercentage;
-                if(fExplodePercentage>fRet)
-                    fRet=fExplodePercentage;
+                if(fExplodePercentage>m_fMaxOffset)
+                    m_fMaxOffset=fExplodePercentage;
             }
         }
     }
-    return fRet;
+    return m_fMaxOffset;
 }
 double PieChart::getMaximumX()
 {
@@ -357,6 +363,7 @@ void PieChart::createShapes()
         nExplodeableSlot = m_aZSlots[0].size()-1;
 
     m_aLabelInfoList.clear();
+    ::rtl::math::setNan(&m_fMaxOffset);
 
 //=============================================================================
     for( double fSlotX=0; aXSlotIter != aXSlotEnd && (m_bUseRings||fSlotX<0.5 ); aXSlotIter++, fSlotX+=1.0 )
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index e32a9e8b7..644751511 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -105,7 +105,7 @@ private: //methods
                         , double fLogicZ, double fDepth, double fExplodePercentage
                         , tPropertyNameValueMap* pOverWritePropertiesMap );
 
-    double              getMaxOffset() const;
+    double              getMaxOffset();
     bool                detectLabelOverlapsAndMove(const ::com::sun::star::awt::Size& rPageSize);//returns true when there might be more to do
     void                resetLabelPositionsToPreviousState();
 struct PieLabelInfo;
@@ -137,6 +137,8 @@ private: //member
     };
 
     ::std::vector< PieLabelInfo > m_aLabelInfoList;
+
+    double m_fMaxOffset;    /// cached max offset value (init'ed to NaN)
 };
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 8a246bac7..67cac8bd5 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1149,23 +1149,6 @@ double VSeriesPlotter::getMaximumX()
 
 double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex )
 {
-    sal_Bool bPercent = sal_False;
-    uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-    if (xPropSet.is())
-    {
-        try
-        {
-            xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-        }
-        catch (const beans::UnknownPropertyException&)
-        {
-        }
-    }
-
-    if (bPercent)
-        // This plotter is percent-stacked.
-        return 0.0;
-
     if( !m_bCategoryXAxis )
     {
         double fMinY, fMaxY;
@@ -1200,23 +1183,6 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s
 
 double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex )
 {
-    sal_Bool bPercent = sal_False;
-    uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-    if (xPropSet.is())
-    {
-        try
-        {
-            xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-        }
-        catch (const beans::UnknownPropertyException&)
-        {
-        }
-    }
-
-    if (bPercent)
-        // This plotter is percent-stacked.
-        return 100.0;
-
     if( !m_bCategoryXAxis )
     {
         double fMinY, fMaxY;
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index b5af9db83..09d510fb2 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1751,15 +1751,7 @@ sal_Int32 lcl_getExplicitNumberFormatKeyForAxis(
                     if( nDimensionIndex == 0 )
                         aRoleToMatch = C2U("values-x");
                     Sequence< Reference< XChartType > > aChartTypes( xCTCnt->getChartTypes());
-                    sal_Int32 nCTCount = aChartTypes.getLength();
-                    if (nCTCount > 0)
-                        // When multiple chart types share the same axis, always 
-                        // use the first chart type for automatic detection of
-                        // desired number format.  This is in line with the
-                        // fact that the axis type is also determined from the
-                        // first chart type alone.
-                        nCTCount = 1;
-                    for( sal_Int32 nCTIdx=0; nCTIdx<nCTCount; ++nCTIdx )
+                    for( sal_Int32 nCTIdx=0; nCTIdx<aChartTypes.getLength(); ++nCTIdx )
                     {
                         if( nDimensionIndex != 0 )
                             aRoleToMatch = ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( aChartTypes[nCTIdx] );
diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt
index d6115b807..4676c40d4 100644
--- a/cli_ure/version/version.txt
+++ b/cli_ure/version/version.txt
@@ -29,23 +29,23 @@
 #
 #*************************************************************************
 
-CLI_URETYPES_NEW_VERSION=1.0.3.0
-CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.2.0
-CLI_URETYPES_POLICY_VERSION=3.0.0.0	
+CLI_URETYPES_NEW_VERSION=1.0.4.0
+CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.3.0
+CLI_URETYPES_POLICY_VERSION=4.0.0.0	
 CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes
 
-CLI_BASETYPES_NEW_VERSION=1.0.14.0
-CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.13.0
-CLI_BASETYPES_POLICY_VERSION=14.0.0.0
+CLI_BASETYPES_NEW_VERSION=1.0.15.0
+CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.14.0
+CLI_BASETYPES_POLICY_VERSION=15.0.0.0
 CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes
 
-CLI_URE_NEW_VERSION=1.0.17.0
-CLI_URE_OLD_VERSION=1.0.0.0-1.0.16.0    
-CLI_URE_POLICY_VERSION=17.0.0.0
+CLI_URE_NEW_VERSION=1.0.18.0
+CLI_URE_OLD_VERSION=1.0.0.0-1.0.17.0    
+CLI_URE_POLICY_VERSION=18.0.0.0
 CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure
 
-CLI_CPPUHELPER_NEW_VERSION=1.0.17.0
-CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.16.0
-CLI_CPPUHELPER_POLICY_VERSION=17.0.0.0
+CLI_CPPUHELPER_NEW_VERSION=1.0.18.0
+CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.17.0
+CLI_CPPUHELPER_POLICY_VERSION=18.0.0.0
 CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper
 
diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/comphelper/inc/comphelper/docpasswordhelper.hxx
new file mode 100644
index 000000000..90927a3e9
--- /dev/null
+++ b/comphelper/inc/comphelper/docpasswordhelper.hxx
@@ -0,0 +1,212 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: docpasswordhelper.hxx,v $
+ * $Revision: 1.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef COMPHELPER_DOCPASSWORDHELPR_HXX
+#define COMPHELPER_DOCPASSWORDHELPR_HXX
+
+#include "comphelper/comphelperdllapi.h"
+#include <vector>
+#include "comphelper/docpasswordrequest.hxx"
+
+namespace com { namespace sun { namespace star { namespace task { class XInteractionHandler; } } } }
+
+namespace comphelper {
+
+class MediaDescriptor;
+
+// ============================================================================
+
+enum DocPasswordVerifierResult
+{
+    DocPasswordVerifierResult_OK,
+    DocPasswordVerifierResult_WRONG_PASSWORD,
+    DocPasswordVerifierResult_ABORT
+};
+
+// ============================================================================
+
+/** Base class for a password verifier used by the DocPasswordHelper class
+    below.
+
+    Users have to implement the virtual function and pass an instance of the
+    verifier to one of the password request functions.
+ */
+class COMPHELPER_DLLPUBLIC IDocPasswordVerifier
+{
+public:
+    virtual             ~IDocPasswordVerifier();
+
+    /** Will be called everytime a password needs to be verified.
+
+        @return  The result of the verification.
+            - DocPasswordVerifierResult_OK, if and only if the passed password
+              is valid and can be used to process the related document.
+            - DocPasswordVerifierResult_WRONG_PASSWORD, if the password is
+              wrong. The user may be asked again for a new password.
+            - DocPasswordVerifierResult_ABORT, if an unrecoverable error
+              occured while password verification. The password request loop
+              will be aborted.
+     */
+    virtual DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword ) = 0;
+
+};
+
+// ============================================================================
+
+/** Helper that asks for a document password and checks its validity.
+ */
+class COMPHELPER_DLLPUBLIC DocPasswordHelper
+{
+public:
+    // ------------------------------------------------------------------------
+
+    /** This helper function tries to request and verify a password to load a
+        protected document.
+
+        First, the list of default passwords will be tried if provided. This is
+        needed by import filters for external file formats that have to check a
+        predefined password in some cases without asking the user for a
+        password. Every password is checked using the passed password verifier.
+
+        If not successful, the passed password of a medium is tried, that has
+        been set e.g. by an API call to load a document. If existing, the
+        password is checked using the passed password verifier.
+
+        If still not successful, the passed interaction handler is used to
+        request a password from the user. This will be repeated until the
+        passed password verifier validates the entered password, or if the user
+        chooses to cancel password input.
+
+        @param rVerifier
+            The password verifier used to check every processed password.
+
+        @param rMediaPassword
+            If not empty, will be passed to the password validator before
+            requesting a password from the user. This password usually should
+            be querried from a media descriptor.
+
+        @param rxInteractHandler
+            The interaction handler that will be used to request a password
+            from the user, e.g. by showing a password input dialog.
+
+        @param rDocumentName
+            The name of the related document that will be shown in the password
+            input dialog.
+
+        @param eRequestType
+            The password request type that will be passed to the
+            DocPasswordRequest object created internally. See
+            docpasswordrequest.hxx for more details.
+
+        @param pDefaultPasswords
+            If not null, contains default passwords that will be tried before a
+            password will be requested from the media descriptor or the user.
+
+        @param pbIsDefaultPassword
+            (output parameter) If not null, the type of the found password will
+            be returned. True means the password has been found in the passed
+            list of default passwords. False means the password has been taken
+            from the rMediaPassword parameter or has been entered by the user.
+
+        @return
+            If not empty, contains the password that has been validated by the
+            passed password verifier. If empty, no valid password has been
+            found, or the user has chossen to cancel password input.
+     */
+    static ::rtl::OUString requestAndVerifyDocPassword(
+                            IDocPasswordVerifier& rVerifier,
+                            const ::rtl::OUString& rMediaPassword,
+                            const ::com::sun::star::uno::Reference<
+                                ::com::sun::star::task::XInteractionHandler >& rxInteractHandler,
+                            const ::rtl::OUString& rDocumentName,
+                            DocPasswordRequestType eRequestType,
+                            const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0,
+                            bool* pbIsDefaultPassword = 0 );
+
+    // ------------------------------------------------------------------------
+
+    /** This helper function tries to find a password for the document
+        described by the passed media descriptor.
+
+        First, the list of default passwords will be tried if provided. This is
+        needed by import filters for external file formats that have to check a
+        predefined password in some cases without asking the user for a
+        password. Every password is checked using the passed password verifier.
+
+        If not successful, the passed media descriptor is asked for a password,
+        that has been set e.g. by an API call to load a document. If existing,
+        the password is checked using the passed password verifier.
+
+        If still not successful, the interaction handler contained in the
+        passed nmedia descriptor is used to request a password from the user.
+        This will be repeated until the passed password verifier validates the
+        entered password, or if the user chooses to cancel password input.
+
+        @param rVerifier
+            The password verifier used to check every processed password.
+
+        @param rMediaDesc
+            The media descriptor of the document that needs to be opened with
+            a password. If a valid password (that is not contained in the
+            passed list of default passwords) was found, it will be inserted
+            into the "Password" property of this descriptor.
+
+        @param eRequestType
+            The password request type that will be passed to the
+            DocPasswordRequest object created internally. See
+            docpasswordrequest.hxx for more details.
+
+        @param pDefaultPasswords
+            If not null, contains default passwords that will be tried before a
+            password will be requested from the media descriptor or the user.
+
+        @return
+            If not empty, contains the password that has been validated by the
+            passed password verifier. If empty, no valid password has been
+            found, or the user has chossen to cancel password input.
+     */
+    static ::rtl::OUString requestAndVerifyDocPassword(
+                            IDocPasswordVerifier& rVerifier,
+                            MediaDescriptor& rMediaDesc,
+                            DocPasswordRequestType eRequestType,
+                            const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0 );
+
+    // ------------------------------------------------------------------------
+
+private:
+                        ~DocPasswordHelper();
+};
+
+// ============================================================================
+
+} // namespace comphelper
+
+#endif
+
diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx
new file mode 100644
index 000000000..b1e042e87
--- /dev/null
+++ b/comphelper/inc/comphelper/docpasswordrequest.hxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: docpasswordrequest.hxx,v $
+ * $Revision: 1.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef COMPHELPER_DOCPASSWORDREQUEST_HXX
+#define COMPHELPER_DOCPASSWORDREQUEST_HXX
+
+#include "comphelper/comphelperdllapi.h"
+#include <com/sun/star/task/PasswordRequestMode.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <cppuhelper/implbase1.hxx>
+
+namespace comphelper {
+
+// ============================================================================
+
+/** Selects which UNO document password request type to use. */
+enum DocPasswordRequestType
+{
+    DocPasswordRequestType_STANDARD,    /// Uses the standard com.sun.star.task.DocumentPasswordRequest request.
+    DocPasswordRequestType_MS           /// Uses the com.sun.star.task.DocumentMSPasswordRequest request.
+};
+
+// ============================================================================
+
+class AbortContinuation;
+class PasswordContinuation;
+
+/** Implements the task.XInteractionRequest interface for requesting a password
+    string for a document.
+ */
+class COMPHELPER_DLLPUBLIC DocPasswordRequest : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+public:
+    explicit            DocPasswordRequest(
+                            DocPasswordRequestType eType,
+                            ::com::sun::star::task::PasswordRequestMode eMode,
+                            const ::rtl::OUString& rDocumentName );
+    virtual             ~DocPasswordRequest();
+
+    bool                isAbort() const;
+    bool                isPassword() const;
+    ::rtl::OUString     getPassword() const;
+
+private:
+    virtual ::com::sun::star::uno::Any SAL_CALL
+                        getRequest() throw( ::com::sun::star::uno::RuntimeException );
+
+    virtual ::com::sun::star::uno::Sequence<
+                ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL
+                        getContinuations() throw( ::com::sun::star::uno::RuntimeException );
+
+private:
+    ::com::sun::star::uno::Any maRequest;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > maContinuations;
+    AbortContinuation*  mpAbort;
+    PasswordContinuation* mpPassword;
+};
+
+// ============================================================================
+
+} // namespace comphelper
+
+#endif
+
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index e1bfcf737..e388c0b4c 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,31 +51,33 @@ namespace comphelper{
 // definitions
 
 /** @short  can be used to work with a <type scope="::com::sun::star::document">MediaDescriptor</type>
-            struct.  
+            struct.
 
     @descr  It wraps a ::std::hash_map around the Sequence< css::beans::PropertyValue >, which
             represent the MediaDescriptor item.
             Further this helper defines often used functions (as e.g. open of the required streams,
             consistent checks etcpp.) and it defines all useable property names.
-            
-    @attention  This class isnt threadsafe and must be guarded from outside!            
+
+    @attention  This class isnt threadsafe and must be guarded from outside!
  */
 class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
 {
     //-------------------------------------------
     // const
     public:
-    
+
         //---------------------------------------
         /** @short  these methods can be used to get the different property names
                     as static const OUString values.
-                    
+
             @descr  Because definition and declaration of static const class members
                     does not work as expected under windows (under unix it works as well)
-                    these way must be used :-(                    
+                    these way must be used :-(
           */
+        static const ::rtl::OUString& PROP_ABORTED();
         static const ::rtl::OUString& PROP_ASTEMPLATE();
         static const ::rtl::OUString& PROP_CHARACTERSET();
+        static const ::rtl::OUString& PROP_COMPONENTDATA();
         static const ::rtl::OUString& PROP_DEEPDETECTION();
         static const ::rtl::OUString& PROP_DETECTSERVICE();
         static const ::rtl::OUString& PROP_DOCUMENTSERVICE();
@@ -131,15 +133,15 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         //---------------------------------------
         /** @short  these ctors do nothing - excepting that they forward
                     the given parameters to the base class ctors.
-                    
+
             @descr  The ctros must be overwritten to resolve conflicts with
                     the default ctors of the compiler :-(.
-         */                    
+         */
         MediaDescriptor();
         MediaDescriptor(const ::com::sun::star::uno::Any& aSource);
         MediaDescriptor(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lSource);
         MediaDescriptor(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lSource);
-        
+
         //---------------------------------------
         /** @short  it checks if the descriptor already has a valid
                     InputStream item and creates a new one, if not.
@@ -147,12 +149,12 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
             @descr  This method uses the current items of this MediaDescriptor,
                     to open the stream (as e.g. URL, ReadOnly, PostData etcpp.).
                     It creates a seekable stream and put it into the descriptor.
-                    
+
                     A might existing InteractionHandler will be used automaticly,
                     to solve problems!
 
                     In case of local file the system file locking is used.
- 
+
             @return TRUE, if the stream was already part of the descriptor or could
                     be created as new item. FALSE otherwhise.
          */
@@ -165,10 +167,10 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
             @descr  This method uses the current items of this MediaDescriptor,
                     to open the stream (as e.g. URL, ReadOnly, PostData etcpp.).
                     It creates a seekable stream and put it into the descriptor.
-                    
+
                     A might existing InteractionHandler will be used automaticly,
                     to solve problems!
- 
+
                     In case of local file the system file locking is used based on
                     configuration settings.
 
@@ -176,14 +178,14 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
                     be created as new item. FALSE otherwhise.
          */
         sal_Bool addInputStreamOwnLock();
-        
+
         //---------------------------------------
         /** @short  it checks if the descriptor describes a readonly stream.
 
             @descr  The descriptor itself isnt changed doing so.
                     It's only checked if the stream seems to be based
                     of a real readonly file.
-                    
+
             @Attention
                     We dont check the property "ReadOnly" here. Because
                     this property can be set from outside and overwrites
@@ -191,30 +193,30 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
                     If e.g. the stream could be opened read/write ...
                     but "ReadOnly" property is set to TRUE, this means:
                     show a readonly UI on top of this read/write stream.
-                    
+
             @return TRUE, if the stream must be interpreted as readonly ...
                     FALSE otherwhise.
          */
         sal_Bool isStreamReadOnly() const;
-        
+
     //-------------------------------------------
     // helper
     private:
-    
+
         //---------------------------------------
         /** @short  tries to open a stream by using the given PostData stream.
-        
-            @descr  The stream is used directly ...  
-            
+
+            @descr  The stream is used directly ...
+
                     The MediaDescriptor itself is changed inside this method.
                     Means: the stream is added internal and not returned by a value.
-                    
+
             @param  _rxPostData
                     the PostData stream.
-                    
+
             @return TRUE if the stream could be added successfully.
                     Note: If FALSE is returned, the error was already handled inside!
-            
+
             @throw  [css::uno::RuntimeException]
                     if the MediaDescriptor seems to be invalid!
 
@@ -224,26 +226,26 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         COMPHELPER_DLLPRIVATE sal_Bool impl_openStreamWithPostData(
             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& _rxPostData
             )   throw(::com::sun::star::uno::RuntimeException);
-        
+
         //---------------------------------------
         /** @short  tries to open a stream by using the given URL.
-        
+
             @descr  First it tries to open the content in r/w mode (if its
                     allowed to do so). Only in case its not allowed or it failed
                     the stream will be tried to open in readonly mode.
-            
+
                     The MediaDescriptor itself is changed inside this method.
                     Means: the stream is added internal and not returned by a value.
-                    
+
             @param  sURL
                     the URL for open.
- 
+
             @param  bLockFile
                     specifies whether the file should be locked
 
             @return TRUE if the stream could be added successfully.
                     Note: If FALSE is returned, the error was already handled inside!
-            
+
             @throw  [css::uno::RuntimeException]
                     if the MediaDescriptor seems to be invalid!
          */
@@ -251,18 +253,18 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
             const ::rtl::OUString& sURL,
             sal_Bool bLockFile
             ) throw(::com::sun::star::uno::RuntimeException);
-            
+
         //---------------------------------------
         /** @short  some URL parts can make trouble for opening streams (e.g. jumpmarks.)
                     An URL should be "normalized" before its used.
-                    
+
             @param  sURL
                     the original URL (e.g. including a jumpmark)
-                    
+
             @return [string]
                     the "normalized" URL (e.g. without jumpmark)
          */
-        COMPHELPER_DLLPRIVATE ::rtl::OUString impl_normalizeURL(const ::rtl::OUString& sURL);            
+        COMPHELPER_DLLPRIVATE ::rtl::OUString impl_normalizeURL(const ::rtl::OUString& sURL);
 
         //---------------------------------------
         /** @short  it checks if the descriptor already has a valid
@@ -271,10 +273,10 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
             @descr  This method uses the current items of this MediaDescriptor,
                     to open the stream (as e.g. URL, ReadOnly, PostData etcpp.).
                     It creates a seekable stream and put it into the descriptor.
-                    
+
                     A might existing InteractionHandler will be used automaticly,
                     to solve problems!
- 
+
             @param  bLockFile
                     specifies whether the file should be locked
 
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index 1fa97ccfe..ca9375ab4 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -181,7 +181,7 @@ public:
         ServiceDecl const& rServiceDecl,
         css::uno::Sequence<css::uno::Any> const& args,
         css::uno::Reference<css::uno::XComponentContext> const& xContext )
-        :BaseT(args, xContext), m_rServiceDecl(rServiceDecl) {}
+        : BaseT(args, xContext), m_rServiceDecl(rServiceDecl) {}
     OwnServiceImpl(
         ServiceDecl const& rServiceDecl,
         css::uno::Reference<css::uno::XComponentContext> const& xContext )
@@ -313,7 +313,7 @@ struct class_ : public serviceimpl_base< detail::ServiceImpl<ImplT_>, WithArgsT
     class_() : baseT() {}
     template <typename PostProcessFuncT>
     /** Ctor to pass a post processing function/functor.
-        
+
         @tpl PostProcessDefaultT let your compiler deduce this
         @param postProcessFunc function/functor that gets the yet unacquired
                                ImplT_ pointer returning a
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
new file mode 100644
index 000000000..1f362c02f
--- /dev/null
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -0,0 +1,152 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: docpasswordhelper.cxx,v $
+ * $Revision: 1.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_comphelper.hxx"
+
+#include "comphelper/docpasswordhelper.hxx"
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include "comphelper/mediadescriptor.hxx"
+
+using ::rtl::OUString;
+using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::UNO_SET_THROW;
+using ::com::sun::star::task::PasswordRequestMode;
+using ::com::sun::star::task::PasswordRequestMode_PASSWORD_ENTER;
+using ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER;
+using ::com::sun::star::task::XInteractionHandler;
+using ::com::sun::star::task::XInteractionRequest;
+
+namespace comphelper {
+
+// ============================================================================
+
+IDocPasswordVerifier::~IDocPasswordVerifier()
+{
+}
+
+// ============================================================================
+
+/*static*/ OUString DocPasswordHelper::requestAndVerifyDocPassword(
+        IDocPasswordVerifier& rVerifier,
+        const OUString& rMediaPassword,
+        const Reference< XInteractionHandler >& rxInteractHandler,
+        const OUString& rDocumentName,
+        DocPasswordRequestType eRequestType,
+        const ::std::vector< OUString >* pDefaultPasswords,
+        bool* pbIsDefaultPassword )
+{
+    OUString aPassword;
+    DocPasswordVerifierResult eResult = DocPasswordVerifierResult_WRONG_PASSWORD;
+
+    // first, try provided default passwords
+    if( pbIsDefaultPassword )
+        *pbIsDefaultPassword = false;
+    if( pDefaultPasswords )
+    {
+        for( ::std::vector< OUString >::const_iterator aIt = pDefaultPasswords->begin(), aEnd = pDefaultPasswords->end(); (eResult == DocPasswordVerifierResult_WRONG_PASSWORD) && (aIt != aEnd); ++aIt )
+        {
+            aPassword = *aIt;
+            OSL_ENSURE( aPassword.getLength() > 0, "DocPasswordHelper::requestAndVerifyDocPassword - unexpected empty default password" );
+            if( aPassword.getLength() > 0 )
+            {
+                eResult = rVerifier.verifyPassword( aPassword );
+                if( pbIsDefaultPassword )
+                    *pbIsDefaultPassword = eResult == DocPasswordVerifierResult_OK;
+            }
+        }
+    }
+
+    // try media password (skip, if result is OK or ABORT)
+    if( eResult == DocPasswordVerifierResult_WRONG_PASSWORD )
+    {
+        aPassword = rMediaPassword;
+        if( aPassword.getLength() > 0 )
+            eResult = rVerifier.verifyPassword( aPassword );
+    }
+
+    // request a password (skip, if result is OK or ABORT)
+    if( (eResult == DocPasswordVerifierResult_WRONG_PASSWORD) && rxInteractHandler.is() ) try
+    {
+        PasswordRequestMode eRequestMode = PasswordRequestMode_PASSWORD_ENTER;
+        while( eResult == DocPasswordVerifierResult_WRONG_PASSWORD )
+        {
+            DocPasswordRequest* pRequest = new DocPasswordRequest( eRequestType, eRequestMode, rDocumentName );
+            Reference< XInteractionRequest > xRequest( pRequest );
+            rxInteractHandler->handle( xRequest );
+            if( pRequest->isPassword() )
+            {
+                aPassword = pRequest->getPassword();
+                if( aPassword.getLength() > 0 )
+                    eResult = rVerifier.verifyPassword( aPassword );
+            }
+            else
+            {
+                eResult = DocPasswordVerifierResult_ABORT;
+            }
+            eRequestMode = PasswordRequestMode_PASSWORD_REENTER;
+        }
+    }
+    catch( Exception& )
+    {
+    }
+
+    return (eResult == DocPasswordVerifierResult_OK) ? aPassword : OUString();
+}
+
+/*static*/ OUString DocPasswordHelper::requestAndVerifyDocPassword(
+        IDocPasswordVerifier& rVerifier,
+        MediaDescriptor& rMediaDesc,
+        DocPasswordRequestType eRequestType,
+        const ::std::vector< OUString >* pDefaultPasswords )
+{
+    OUString aMediaPassword = rMediaDesc.getUnpackedValueOrDefault(
+        MediaDescriptor::PROP_PASSWORD(), OUString() );
+    Reference< XInteractionHandler > xInteractHandler = rMediaDesc.getUnpackedValueOrDefault(
+        MediaDescriptor::PROP_INTERACTIONHANDLER(), Reference< XInteractionHandler >() );
+    OUString aDocumentName = rMediaDesc.getUnpackedValueOrDefault(
+        MediaDescriptor::PROP_URL(), OUString() );
+
+    bool bIsDefaultPassword = false;
+    OUString aPassword = requestAndVerifyDocPassword(
+        rVerifier, aMediaPassword, xInteractHandler, aDocumentName, eRequestType, pDefaultPasswords, &bIsDefaultPassword );
+
+    // insert valid password into media descriptor (but not a default password)
+    if( (aPassword.getLength() > 0) && !bIsDefaultPassword )
+        rMediaDesc[ MediaDescriptor::PROP_PASSWORD() ] <<= aPassword;
+
+    return aPassword;
+}
+
+// ============================================================================
+
+} // namespace comphelper
+
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
new file mode 100644
index 000000000..187642e10
--- /dev/null
+++ b/comphelper/source/misc/docpasswordrequest.cxx
@@ -0,0 +1,153 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: docpasswordrequest.cxx,v $
+ * $Revision: 1.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_comphelper.hxx"
+
+#include "comphelper/docpasswordrequest.hxx"
+#include <com/sun/star/task/DocumentMSPasswordRequest.hpp>
+#include <com/sun/star/task/DocumentPasswordRequest.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionPassword.hpp>
+
+using ::rtl::OUString;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::RuntimeException;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::XInterface;
+using ::com::sun::star::task::InteractionClassification_QUERY;
+using ::com::sun::star::task::DocumentMSPasswordRequest;
+using ::com::sun::star::task::DocumentPasswordRequest;
+using ::com::sun::star::task::PasswordRequestMode;
+using ::com::sun::star::task::XInteractionAbort;
+using ::com::sun::star::task::XInteractionContinuation;
+using ::com::sun::star::task::XInteractionPassword;
+
+namespace comphelper {
+
+// ============================================================================
+
+class AbortContinuation : public ::cppu::WeakImplHelper1< XInteractionAbort >
+{
+public:
+    inline explicit     AbortContinuation() : mbSelected( false ) {}
+
+    inline bool         isSelected() const { return mbSelected; }
+    inline void         reset() { mbSelected = false; }
+
+    virtual void SAL_CALL select() throw( RuntimeException ) { mbSelected = true; }
+
+private:
+    bool                mbSelected;
+};
+
+// ============================================================================
+
+class PasswordContinuation : public ::cppu::WeakImplHelper1< XInteractionPassword >
+{
+public:
+    inline explicit     PasswordContinuation() : mbSelected( false ) {}
+
+    inline bool         isSelected() const { return mbSelected; }
+    inline void         reset() { mbSelected = false; }
+
+    virtual void SAL_CALL select() throw( RuntimeException ) { mbSelected = true; }
+    virtual void SAL_CALL setPassword( const OUString& rPass ) throw( RuntimeException ) { maPassword = rPass; }
+    virtual OUString SAL_CALL getPassword() throw( RuntimeException ) { return maPassword; }
+
+private:
+    OUString            maPassword;
+    bool                mbSelected;
+};
+
+// ============================================================================
+
+DocPasswordRequest::DocPasswordRequest( DocPasswordRequestType eType,
+        PasswordRequestMode eMode, const OUString& rDocumentName )
+{
+    switch( eType )
+    {
+        case DocPasswordRequestType_STANDARD:
+        {
+            DocumentPasswordRequest aRequest( OUString(), Reference< XInterface >(),
+                InteractionClassification_QUERY, eMode, rDocumentName );
+            maRequest <<= aRequest;
+        }
+        break;
+        case DocPasswordRequestType_MS:
+        {
+            DocumentMSPasswordRequest aRequest( OUString(), Reference< XInterface >(),
+                InteractionClassification_QUERY, eMode, rDocumentName );
+            maRequest <<= aRequest;
+        }
+        break;
+        /*  no 'default', so compilers will complain about missing
+            implementation of a new enum value. */
+    }
+
+    maContinuations.realloc( 2 );
+    maContinuations[ 0 ].set( mpAbort = new AbortContinuation );
+    maContinuations[ 1 ].set( mpPassword = new PasswordContinuation );
+}
+
+DocPasswordRequest::~DocPasswordRequest()
+{
+}
+
+bool DocPasswordRequest::isAbort() const
+{
+    return mpAbort->isSelected();
+}
+
+bool DocPasswordRequest::isPassword() const
+{
+    return mpPassword->isSelected();
+}
+
+OUString DocPasswordRequest::getPassword() const
+{
+    return mpPassword->getPassword();
+}
+
+Any SAL_CALL DocPasswordRequest::getRequest() throw( RuntimeException )
+{
+    return maRequest;
+}
+
+Sequence< Reference< XInteractionContinuation > > SAL_CALL DocPasswordRequest::getContinuations() throw( RuntimeException )
+{
+    return maContinuations;
+}
+
+// ============================================================================
+
+} // namespace comphelper
+
diff --git a/comphelper/source/misc/makefile.mk b/comphelper/source/misc/makefile.mk
index 018932eda..05e533559 100644
--- a/comphelper/source/misc/makefile.mk
+++ b/comphelper/source/misc/makefile.mk
@@ -57,6 +57,8 @@ SLOFILES=   \
             $(SLO)$/componentcontext.obj \
             $(SLO)$/componentmodule.obj \
             $(SLO)$/configurationhelper.obj \
+            $(SLO)$/docpasswordhelper.obj \
+            $(SLO)$/docpasswordrequest.obj \
             $(SLO)$/documentinfo.obj \
 	    $(SLO)$/evtmethodhelper.obj \
             $(SLO)$/documentiologring.obj \
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index edf3c196d..5f6d2a480 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -114,6 +114,12 @@ namespace css = ::com::sun::star;
 /*-----------------------------------------------
     10.03.2004 07:35
 -----------------------------------------------*/
+const ::rtl::OUString& MediaDescriptor::PROP_ABORTED()
+{
+    static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Aborted"));
+    return sProp;
+}
+
 const ::rtl::OUString& MediaDescriptor::PROP_ASTEMPLATE()
 {
     static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
@@ -126,6 +132,12 @@ const ::rtl::OUString& MediaDescriptor::PROP_CHARACTERSET()
     return sProp;
 }
 
+const ::rtl::OUString& MediaDescriptor::PROP_COMPONENTDATA()
+{
+    static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("ComponentData"));
+    return sProp;
+}
+
 const ::rtl::OUString& MediaDescriptor::PROP_DEEPDETECTION()
 {
     static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("DeepDetection"));
diff --git a/comphelper/source/misc/uieventslogger.cxx b/comphelper/source/misc/uieventslogger.cxx
index 6734f81c8..2a109dbce 100644
--- a/comphelper/source/misc/uieventslogger.cxx
+++ b/comphelper/source/misc/uieventslogger.cxx
@@ -218,11 +218,15 @@ namespace comphelper
     // public UiEventsLogger interface
     sal_Bool UiEventsLogger::isEnabled()
     {
-        try {
-            UiEventsLogger_Impl::prepareMutex();
-            Guard<Mutex> singleton_guard(UiEventsLogger_Impl::singleton_mutex);
-            return UiEventsLogger_Impl::getInstance()->m_Active;
-        } catch(...) { return false; } // never throws
+        if ( UiEventsLogger_Impl::getEnabledFromCfg() )
+        {
+            try {
+                UiEventsLogger_Impl::prepareMutex();
+                Guard<Mutex> singleton_guard(UiEventsLogger_Impl::singleton_mutex);
+                return UiEventsLogger_Impl::getInstance()->m_Active;
+            } catch(...) { return false; } // never throws
+        } // if ( )
+        return sal_False;
     }
 
     sal_Int32 UiEventsLogger::getSessionLogEventCount()
diff --git a/config.guess b/config.guess
index 822947132..d0d5d6393 100755
--- a/config.guess
+++ b/config.guess
@@ -789,7 +789,7 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:[34]*)
+    x86:Interix*:[3-6]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
diff --git a/configure.in b/configure.in
index 7868438a0..ffe161c34 100644
--- a/configure.in
+++ b/configure.in
@@ -970,7 +970,7 @@ case "$build_os" in
 		test_cups=no
 		_os=GNU
 		;;
-	cygwin*) # Windows
+	cygwin*|interix*) # Windows
 		test_cups=no
 		test_cairo=yes
 		test_freetype=no
@@ -4011,7 +4011,7 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
         ], []
     )
     AC_MSG_CHECKING([whether db is at least 4.1])
-    for v in `seq 1 7`; do
+    for v in `seq 1 8`; do
        AC_TRY_RUN([
 #include <db.h>
 
@@ -4595,7 +4595,7 @@ if test "$BUILD_MOZAB" = "TRUE"; then
          AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
 Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
 The archives can be found here:
-http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/])
+ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/])
    fi
    if test "$_os" = "WINNT"; then
       AC_MSG_CHECKING([for moztools binaries])
@@ -4610,9 +4610,9 @@ http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/
          AC_MSG_NOTICE([checking whether mozilla can be built...])
          PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build mozilla]), AC_MSG_ERROR([Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages]))
       else
-         PKG_CHECK_MODULES(MOZLIBREQ, libIDL >= 0.6.3 libIDL <= 0.6.8, MOZIDL="TRUE", MOZIDL="")
+         PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3,  MOZIDL="TRUE", MOZIDL="")
          if test -z "$MOZIDL"; then
-            AC_MSG_ERROR([libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla.])
+            AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit.])
          fi
       fi
    else
@@ -5260,6 +5260,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" >/dev/null 2>/dev/null; then
+        AC_MSG_RESULT([Found Windows SDK 7 ($PSDK_HOME)])
+        WINDOWS_VISTA_PSDK=TRUE
     else
         AC_MSG_RESULT([Found Legacy Windows Platform SDK ($PSDK_HOME)])
     fi
@@ -6312,8 +6315,8 @@ KDE4_CFLAGS=""
 KDE4_LIBS=""
 MOC4="moc"
 if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
-   qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
-   qt_libdirs="$QTLIB /usr/lib $x_libraries"
+   qt_incdirs="$QT4INC $QT4DIR $QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+   qt_libdirs="$QT4LIB $QTLIB /usr/lib $x_libraries"
    
    kde_incdirs="/usr/include $x_includes"
    kde_libdirs="/usr/lib $x_libraries"
@@ -6323,6 +6326,15 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
    fi
 
+   if test -n "$KDE4DIR" ; then
+      kde_incdirs="$KDE4DIR/include $kde_incdirs"
+      if test "$build_cpu" != "x86_64" ; then
+         kde_libdirs="$KDE4DIR/lib $kde_libdirs"
+      else
+         kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"
+      fi
+   fi
+
    qt_test_include="Qt/qobject.h"
    qt_test_library="libQtCore.so"
    kde_test_include="ksharedptr.h"
@@ -6339,7 +6351,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    
    AC_MSG_RESULT([$qt_header_dir])
    if test "x$qt_header_dir" = "xno" ; then
-      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
+      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
    fi
    
    AC_MSG_CHECKING([for Qt4 libraries])
@@ -6354,14 +6366,14 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    AC_MSG_RESULT([$qt_lib_dir])
    
    if test "x$qt_lib_dir" = "xno" ; then
-      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
+      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
    fi
 
    dnl Check for Meta Object Compiler
-   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] )
+   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
    if test "$MOC4" = "no" ; then
       AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
-the root of your Qt installation by exporting QTDIR before running "configure".])
+the root of your Qt installation by exporting QT4DIR before running "configure".])
    fi
 
    dnl Check for KDE4 headers
@@ -6375,7 +6387,7 @@ the root of your Qt installation by exporting QTDIR before running "configure".]
    done
    AC_MSG_RESULT([$kde_incdir])
    if test "x$kde_incdir" = "xno" ; then
-      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
+      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
    fi
 
    dnl Check for KDE4 libraries
@@ -6390,7 +6402,7 @@ the root of your Qt installation by exporting QTDIR before running "configure".]
    
    AC_MSG_RESULT([$kde_libdir])
    if test "x$kde_libdir" = "xno" ; then
-      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
+      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
    fi
 
    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx
index fa9a64202..ea9d4a57d 100644
--- a/connectivity/inc/connectivity/TTableHelper.hxx
+++ b/connectivity/inc/connectivity/TTableHelper.hxx
@@ -39,17 +39,50 @@
 
 namespace connectivity
 {
+    typedef sal_Int32   OrdinalPosition;
+    struct ColumnDesc
+    {
+        ::rtl::OUString sName;
+        ::rtl::OUString aField6;
+        ::rtl::OUString sField13;
+        sal_Int32		nField5        
+                    ,   nField7
+                    ,	nField9
+                    ,	nField11;
+        
+        OrdinalPosition nOrdinalPosition;
+
+        ColumnDesc() {}
+        ColumnDesc( const ::rtl::OUString& _rName
+            , sal_Int32		_nField5
+            , const ::rtl::OUString& _aField6
+            , sal_Int32		_nField7
+            , sal_Int32		_nField9
+            , sal_Int32		_nField11
+            , const ::rtl::OUString& _sField13
+            ,OrdinalPosition _nPosition )
+            :sName( _rName )
+            ,aField6(_aField6)
+            ,sField13(_sField13)
+            ,nField5(_nField5)            
+            ,nField7(_nField7)
+            ,nField9(_nField9)
+            ,nField11(_nField11)            
+            ,nOrdinalPosition( _nPosition )
+        {
+        }
+    };
     typedef connectivity::sdbcx::OTable OTable_TYPEDEF;
 
     OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp);
 
     DECLARE_STL_USTRINGACCESS_MAP( sdbcx::TKeyProperties , TKeyMap);
 
+    struct OTableHelperImpl;
+
     class OOO_DLLPUBLIC_DBTOOLS OTableHelper : public OTable_TYPEDEF
     {
-        TKeyMap  m_aKeys;
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >	m_xMetaData;
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >			m_xConnection;
+        ::std::auto_ptr<OTableHelperImpl> m_pImpl;
 
         void refreshPrimaryKeys(TStringVector& _rKeys);
         void refreshForgeinKeys(TStringVector& _rKeys);
@@ -83,11 +116,15 @@ namespace connectivity
         */
         virtual ::rtl::OUString getRenameStart() const;
 
+        virtual ~OTableHelper();
+
     public:
         virtual void refreshColumns();
         virtual void refreshKeys();
         virtual void refreshIndexes();
 
+        const ColumnDesc* getColumnDescription(const ::rtl::OUString& _sName) const;
+
     public:
         OTableHelper(	sdbcx::OCollection* _pTables,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
@@ -103,7 +140,7 @@ namespace connectivity
             );
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const;
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() const { return m_xConnection; }
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() const;
 
         virtual void SAL_CALL acquire() throw();
         virtual void SAL_CALL release() throw();
diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx
index fa040a236..1eee05742 100644
--- a/connectivity/inc/connectivity/sdbcx/VKey.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx
@@ -51,6 +51,7 @@ namespace connectivity
 
         struct OOO_DLLPUBLIC_DBTOOLS KeyProperties
         {
+            ::std::vector< ::rtl::OUString> m_aKeyColumnNames;
             ::rtl::OUString m_ReferencedTable;
             sal_Int32		m_Type;
             sal_Int32		m_UpdateRule;
diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx
index 53a2abcdc..0537c2731 100644
--- a/connectivity/inc/connectivity/sdbcx/VView.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VView.hxx
@@ -42,30 +42,21 @@
 #include "connectivity/sdbcx/VDescriptor.hxx"
 #include "connectivity/dbtoolsdllapi.hxx"
 #include <comphelper/IdPropArrayHelper.hxx>
+#include <cppuhelper/implbase2.hxx>
 
 namespace connectivity
 {
     namespace sdbcx
     {
 
-        typedef ::cppu::OWeakObject OView_BASE;
+        typedef ::cppu::WeakImplHelper2<    ::com::sun::star::lang::XServiceInfo,
+                                        ::com::sun::star::container::XNamed> OView_BASE;
 
 
-        class OOO_DLLPUBLIC_DBTOOLS OViewHelper
-        {
-        protected:
-            ::osl::Mutex			 m_aMutex;
-            ::cppu::OBroadcastHelper rBHelper;
-
-        public:
-            OViewHelper(): rBHelper(m_aMutex){}
-        };
 
         class OOO_DLLPUBLIC_DBTOOLS OView :
-                        public OViewHelper,
+                        public ::comphelper::OMutexAndBroadcastHelper,
                         public OView_BASE,
-                        public ::com::sun::star::container::XNamed,
-                        public ::com::sun::star::lang::XServiceInfo,
                         public ::comphelper::OIdPropertyArrayUsageHelper<OView>,
                         public ODescriptor
         {
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index 6a919172c..ad04cd29f 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -404,7 +404,8 @@ namespace connectivity
         static sal_Bool getTableComponents(const OSQLParseNode* _pTableNode,
                                             ::com::sun::star::uno::Any &_rCatalog,
                                             ::rtl::OUString &_rSchema,
-                                            ::rtl::OUString &_rTable);
+                                            ::rtl::OUString &_rTable
+                                            ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData);
 
         // susbtitute all occurences of :var or [name] into the dynamic parameter ?
         // _pNode will be modified if parameters exists
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index dcbc50111..d417c3316 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -109,7 +109,7 @@ void OConnectionWrapper::setDelegation(const Reference< XConnection >& _xConnect
 // -----------------------------------------------------------------------------
 void OConnectionWrapper::disposing()
 {
-    m_xConnection = NULL;
+m_xConnection.clear();
 }
 //-----------------------------------------------------------------------------
 OConnectionWrapper::~OConnectionWrapper()
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index bd6ad7bd7..bee1b9a69 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -45,6 +45,7 @@
 #include "TConnection.hxx"
 #include "diagnose_ex.h"
 #include <comphelper/numbers.hxx>
+#include <rtl/ustrbuf.hxx>
 
 
 using namespace ::connectivity;
@@ -63,7 +64,7 @@ using namespace ::com::sun::star::beans;
 ::rtl::OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, sal_Bool bQuote,
                                               const Reference< XTypeConverter >&  _rxTypeConverter)
 {
-    ::rtl::OUString aRet;
+    ::rtl::OUStringBuffer aRet;
     if (_rVal.hasValue())
     {
         try
@@ -78,18 +79,22 @@ using namespace ::com::sun::star::beans;
                     if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN)
                     {
                         if (::cppu::any2bool(_rVal))
-                            aRet = ::rtl::OUString::createFromAscii("1");
+                            aRet.appendAscii("1");
                         else
-                            aRet = ::rtl::OUString::createFromAscii("0");
+                            aRet.appendAscii("0");
                     }
                     else
-                        _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aRet;
+                    {
+                        ::rtl::OUString sTemp;
+                        _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= sTemp;
+                        aRet.append(sTemp);
+                    }
                     break;
                 case DataType::CHAR:
                 case DataType::VARCHAR:
                 case DataType::LONGVARCHAR:
                     if (bQuote)
-                        aRet += ::rtl::OUString::createFromAscii("'");
+                        aRet.appendAscii("'");
                     {
                         ::rtl::OUString aTemp;
                         _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aTemp;
@@ -104,17 +109,22 @@ using namespace ::com::sun::star::beans;
                                 aTemp = aTemp.replaceAt(nIndex,sQuot.getLength(),sQuotToReplace);
                         } while (nIndex != -1);
 
-                        aRet += aTemp;
+                        aRet.append(aTemp);
                     }
                     if (bQuote)
-                        aRet += ::rtl::OUString::createFromAscii("'");
+                        aRet.appendAscii("'");
                     break;
                 case DataType::REAL:
                 case DataType::DOUBLE:
                 case DataType::DECIMAL:
                 case DataType::NUMERIC:
                 case DataType::BIGINT:
-                    _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aRet;
+                default:
+                    {
+                        ::rtl::OUString sTemp;
+                        _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= sTemp;
+                        aRet.append(sTemp);
+                    }
                     break;
                 case DataType::TIMESTAMP:
                 {
@@ -123,9 +133,11 @@ using namespace ::com::sun::star::beans;
                     // check if this is really a timestamp or only a date
                     if ( _rVal >>= aDateTime )
                     {
-                        if (bQuote) aRet += ::rtl::OUString::createFromAscii("{TS '");
-                        aRet += DBTypeConversion::toDateTimeString(aDateTime);
-                        if (bQuote) aRet += ::rtl::OUString::createFromAscii("'}");
+                        if (bQuote) 
+                            aRet.appendAscii("{TS '");
+                        aRet.append(DBTypeConversion::toDateTimeString(aDateTime));
+                        if (bQuote) 
+                            aRet.appendAscii("'}");
                         break;
                     }
                     break;
@@ -134,20 +146,22 @@ using namespace ::com::sun::star::beans;
                 {
                     Date aDate;
                     OSL_VERIFY_RES( _rVal >>= aDate, "DBTypeConversion::toSQLString: _rVal is not date!");
-                    if (bQuote) aRet += ::rtl::OUString::createFromAscii("{D '");
-                    aRet += DBTypeConversion::toDateString(aDate);;
-                    if (bQuote) aRet += ::rtl::OUString::createFromAscii("'}");
+                    if (bQuote) 
+                        aRet.appendAscii("{D '");
+                    aRet.append(DBTypeConversion::toDateString(aDate));
+                    if (bQuote) 
+                        aRet.appendAscii("'}");
                 }	break;
                 case DataType::TIME:
                 {
                     Time aTime;
                     OSL_VERIFY_RES( _rVal >>= aTime,"DBTypeConversion::toSQLString: _rVal is not time!");
-                    if (bQuote) aRet += ::rtl::OUString::createFromAscii("{T '");
-                    aRet += DBTypeConversion::toTimeString(aTime);
-                    if (bQuote) aRet += ::rtl::OUString::createFromAscii("'}");
+                    if (bQuote) 
+                        aRet.appendAscii("{T '");
+                    aRet.append(DBTypeConversion::toTimeString(aTime));
+                    if (bQuote) 
+                        aRet.appendAscii("'}");
                 } break;
-                default:
-                    _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aRet;
             }
         }
         catch ( const Exception&  )
@@ -156,8 +170,8 @@ using namespace ::com::sun::star::beans;
         }
     }
     else
-        aRet = ::rtl::OUString::createFromAscii(" NULL ");
-    return aRet;
+        aRet.appendAscii(" NULL ");
+    return aRet.makeStringAndClear();
 }
 // -----------------------------------------------------------------------------
 Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xSupplier)
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index bd22077b5..17fe520b1 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -133,7 +133,7 @@ void ODatabaseMetaDataResultSet::disposing(void)
 
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aStatement	= NULL;
-    m_xMetaData		= NULL;
+m_xMetaData.clear();
     m_aRowsIter = m_aRows.end();
     m_aRows.clear();
     m_aRowsIter = m_aRows.end();
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 97dfbb42c..032d85957 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -37,6 +37,9 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
+#include <com/sun/star/sdbcx/KeyType.hpp>
+#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <comphelper/types.hxx>
 #include "connectivity/dbtools.hxx"
 #include "TConnection.hxx"
@@ -51,7 +54,7 @@ using namespace connectivity;
 using namespace dbtools;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
-//	using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
@@ -114,17 +117,67 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName)
         bAutoIncrement	= aFind->second.first.first;
         bIsCurrency		= aFind->second.first.second;
         nDataType		= aFind->second.second;
+    } // if ( aFind != m_pImpl->m_aColumnInfo.end() )
+
+    sdbcx::ObjectType xRet;
+    const ColumnDesc* pColDesc = m_pTable->getColumnDescription(_rName);
+    if ( pColDesc )
+    {
+        Reference<XPropertySet> xPr = m_pTable;
+        Reference<XKeysSupplier> xKeysSup(xPr,UNO_QUERY);
+        Reference<XNameAccess> xPrimaryKeyColumns;
+        if ( xKeysSup.is() )
+        {
+            const Reference<XIndexAccess> xKeys = xKeysSup->getKeys();
+            if ( xKeys.is() )
+            {
+                ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
+                const sal_Int32 nKeyCount = xKeys->getCount();
+                for(sal_Int32 nKeyIter = 0; nKeyIter < nKeyCount;++nKeyIter)
+                {
+                    const Reference<XPropertySet> xKey(xKeys->getByIndex(nKeyIter),UNO_QUERY_THROW);
+                    sal_Int32 nType = 0;
+                    xKey->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))	>>= nType;
+                    if ( nType == KeyType::PRIMARY )
+                    {
+                        const Reference<XColumnsSupplier> xColS(xKey,UNO_QUERY_THROW);
+                        xPrimaryKeyColumns = xColS->getColumns();
+                        break;
+                    }
+                } // for(sal_Int32 nKeyIter = 0; nKeyIter < nKeyCount;++)
+            }
+        }
+        sal_Int32 nField11 = pColDesc->nField11;
+        if ( nField11 != ColumnValue::NO_NULLS && xPrimaryKeyColumns.is() && xPrimaryKeyColumns->hasByName(_rName) )
+        {
+            nField11 = ColumnValue::NO_NULLS;
+        } // if ( xKeys.is() )
+        connectivity::sdbcx::OColumn* pRet = new connectivity::sdbcx::OColumn(_rName,
+                                                pColDesc->aField6,
+                                                pColDesc->sField13,
+                                                nField11,
+                                                pColDesc->nField7,
+                                                pColDesc->nField9,
+                                                pColDesc->nField5,
+                                                bAutoIncrement,
+                                                sal_False,
+                                                bIsCurrency,
+                                                isCaseSensitive());
+
+        xRet = pRet;
     }
-    
+    else
+    {
 
-    sdbcx::ObjectType xRet(::dbtools::createSDBCXColumn(	m_pTable,
-                                                            xConnection,
-                                                            _rName,
-                                                            isCaseSensitive(),
-                                                            bQueryInfo,
-                                                            bAutoIncrement,
-                                                            bIsCurrency,
-                                                            nDataType),UNO_QUERY);
+        xRet.set(::dbtools::createSDBCXColumn(	m_pTable,
+                                                xConnection,
+                                                _rName,
+                                                isCaseSensitive(),
+                                                bQueryInfo,
+                                                bAutoIncrement,
+                                                bIsCurrency,
+                                                nDataType),UNO_QUERY);
+    }
     return xRet;
 }
 
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index c5943e9da..1a763b0c1 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -90,8 +90,8 @@ Sequence< PropertyValue > SAL_CALL ODatabaseMetaDataBase::getConnectionInfo(  )
 void SAL_CALL ODatabaseMetaDataBase::disposing( const EventObject& /*Source*/ ) throw(RuntimeException)
 {
     // cut off all references to the connection
-    m_xConnection		= NULL;
-    m_xListenerHelper	= NULL;
+m_xConnection.clear();
+m_xListenerHelper.clear();
 }
 // -----------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 81ef5a205..1f10f853e 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -85,7 +85,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName)
         m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)),
         aSchema,aTable,_rName);
 
-    sdbcx::ObjectType xRet = NULL;
+    sdbcx::ObjectType xRet;
     if ( xResult.is() )
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index e53d62bd1..b4ae00b60 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -97,8 +97,8 @@ sdbcx::ObjectType OIndexesHelper::createObject(const ::rtl::OUString& _rName)
             {
                 sal_Int32 nClustered = xRow->getShort(7);
                 sal_Bool bPrimarKeyIndex = sal_False;
-                xRow = NULL;
-                xResult = NULL;
+                xRow.clear();
+                xResult.clear();
                 try
                 {
                     xResult = m_pTable->getMetaData()->getPrimaryKeys(aCatalog,aSchema,aTable);
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index ce0fd97b7..5f7605c25 100644
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
@@ -71,38 +71,43 @@ void OTableKeyHelper::refreshColumns()
     ::std::vector< ::rtl::OUString> aVector;
     if ( !isNew() )
     {
-        ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
-        ::rtl::OUString aSchema,aTable;
-        m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME))	>>= aSchema;
-        m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))		>>= aTable;
-
-        if ( m_Name.getLength() ) // foreign key
+        aVector = m_aProps->m_aKeyColumnNames;
+        if ( aVector.empty() )
         {
+            ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
+            ::rtl::OUString aSchema,aTable;
+            m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME))	>>= aSchema;
+            m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))		>>= aTable;
 
-            Reference< XResultSet > xResult = m_pTable->getMetaData()->getImportedKeys(m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)),
-                aSchema,aTable);
-
-            if ( xResult.is() )
+            if ( m_Name.getLength() ) // foreign key
             {
-                Reference< XRow > xRow(xResult,UNO_QUERY);
-                while( xResult->next() )
+
+                Reference< XResultSet > xResult = m_pTable->getMetaData()->getImportedKeys(m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)),
+                    aSchema,aTable);
+
+                if ( xResult.is() )
                 {
-                    ::rtl::OUString aForeignKeyColumn = xRow->getString(8);
-                    if(xRow->getString(12) == m_Name)
-                        aVector.push_back(aForeignKeyColumn);
+                    Reference< XRow > xRow(xResult,UNO_QUERY);
+                    while( xResult->next() )
+                    {
+                        ::rtl::OUString aForeignKeyColumn = xRow->getString(8);
+                        if(xRow->getString(12) == m_Name)
+                            aVector.push_back(aForeignKeyColumn);
+                    }
                 }
             }
-        }
-        if ( aVector.empty() )
-        {
-            Reference< XResultSet > xResult = m_pTable->getMetaData()->getPrimaryKeys(m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)),
-                aSchema,aTable);
-
-            if ( xResult.is() )
+        
+            if ( aVector.empty() )
             {
-                Reference< XRow > xRow(xResult,UNO_QUERY);
-                while( xResult->next() )
-                    aVector.push_back(xRow->getString(4));
+                const Reference< XResultSet > xResult = m_pTable->getMetaData()->getPrimaryKeys(m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)),
+                    aSchema,aTable);
+
+                if ( xResult.is() )
+                {
+                    const Reference< XRow > xRow(xResult,UNO_QUERY);
+                    while( xResult->next() )
+                        aVector.push_back(xRow->getString(4));
+                } // if ( xResult.is() )
             }
         }
     }
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 10543df92..2752aa4d4 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -127,8 +127,8 @@ const ORowSetValue& OResultSetPrivileges::getValue(sal_Int32 columnIndex)
 void SAL_CALL OResultSetPrivileges::disposing(void)
 {
     ODatabaseMetaDataResultSet::disposing();
-    m_xTables = NULL;
-    m_xRow = NULL;
+m_xTables.clear();
+m_xRow.clear();
 }
 // -----------------------------------------------------------------------------
 sal_Bool SAL_CALL OResultSetPrivileges::next(  ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index e3c6bd4d1..9a150d469 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -38,6 +38,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
+#include <comphelper/implementationreference.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
@@ -54,16 +55,70 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
+namespace
+{
+    /// helper class for column property change events which holds the OComponentDefinition weak
+typedef ::cppu::WeakImplHelper1	< XContainerListener > OTableContainerListener_BASE;
+class OTableContainerListener : public OTableContainerListener_BASE
+{
+    OTableHelper* m_pComponent;
+    ::std::map< ::rtl::OUString,bool> m_aRefNames;
+
+    OTableContainerListener(const OTableContainerListener&);
+    void operator =(const OTableContainerListener&);
+protected:
+    virtual ~OTableContainerListener(){}
+public:
+    OTableContainerListener(OTableHelper* _pComponent) : m_pComponent(_pComponent){}
+    virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& /*Event*/ ) throw (RuntimeException)
+    {
+    }
+    virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException)
+    {
+        ::rtl::OUString sName;
+        Event.Accessor	>>= sName;
+        if ( m_aRefNames.find(sName) != m_aRefNames.end() )
+            m_pComponent->refreshKeys();
+    }
+    virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException)
+    {
+        ::rtl::OUString sOldComposedName,sNewComposedName;
+        Event.ReplacedElement	>>= sOldComposedName;
+        Event.Accessor			>>= sNewComposedName;
+        if ( sOldComposedName != sNewComposedName && m_aRefNames.find(sOldComposedName) != m_aRefNames.end() )
+            m_pComponent->refreshKeys();
+    }
+    // XEventListener
+    virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) throw (RuntimeException)
+    {
+    }
+    void clear() { m_pComponent = NULL; }
+    inline void add(const ::rtl::OUString& _sRefName) { m_aRefNames.insert(::std::map< ::rtl::OUString,bool>::value_type(_sRefName,true)); }
+};
+}
+namespace connectivity
+{
+    struct OTableHelperImpl
+    {
+        TKeyMap  m_aKeys;
+        Reference< ::com::sun::star::sdbc::XDatabaseMetaData >	m_xMetaData;
+        Reference< ::com::sun::star::sdbc::XConnection >			m_xConnection;
+        ::comphelper::ImplementationReference< OTableContainerListener,XContainerListener>   
+                                    m_xTablePropertyListener;
+        ::std::vector< ColumnDesc > m_aColumnDesc;
+    };
+}
 
 OTableHelper::OTableHelper(	sdbcx::OCollection* _pTables,
                            const Reference< XConnection >& _xConnection,
                            sal_Bool _bCase) 
     :OTable_TYPEDEF(_pTables,_bCase)
-    ,m_xConnection(_xConnection)
+    ,m_pImpl(new OTableHelperImpl)
 {
     try
     {
-        m_xMetaData = m_xConnection->getMetaData();
+        m_pImpl->m_xConnection = _xConnection;
+        m_pImpl->m_xMetaData = m_pImpl->m_xConnection->getMetaData();
     }
     catch(const Exception&)
     {
@@ -85,42 +140,41 @@ OTableHelper::OTableHelper(	sdbcx::OCollection* _pTables,
                                           _Description,
                                           _SchemaName,
                                           _CatalogName)
-                        ,m_xConnection(_xConnection)
+                        ,m_pImpl(new OTableHelperImpl)
 {
     try
     {
-        m_xMetaData = m_xConnection->getMetaData();
+        m_pImpl->m_xConnection = _xConnection;
+        m_pImpl->m_xMetaData = m_pImpl->m_xConnection->getMetaData();
     }
     catch(const Exception&)
     {
     }
 }
 // -----------------------------------------------------------------------------
+OTableHelper::~OTableHelper()
+{
+}
+// -----------------------------------------------------------------------------
 void SAL_CALL OTableHelper::disposing()
 {
-    OTable_TYPEDEF::disposing();
     ::osl::MutexGuard aGuard(m_aMutex);
-    m_xConnection	= NULL;
-    m_xMetaData		= NULL;
+    if ( m_pImpl->m_xTablePropertyListener.is() )
+    {
+        m_pTables->removeContainerListener(m_pImpl->m_xTablePropertyListener.getRef());
+        m_pImpl->m_xTablePropertyListener->clear();
+        m_pImpl->m_xTablePropertyListener.dispose();
+    }
+    OTable_TYPEDEF::disposing();
+    
+    m_pImpl->m_xConnection	= NULL;
+    m_pImpl->m_xMetaData	= NULL;
+    
 }
 
 // -------------------------------------------------------------------------
 namespace
 {
-    typedef sal_Int32   OrdinalPosition;
-    struct ColumnDesc
-    {
-        ::rtl::OUString sName;
-        OrdinalPosition nOrdinalPosition;
-
-        ColumnDesc() {}
-        ColumnDesc( const ::rtl::OUString& _rName, OrdinalPosition _nPosition )
-            :sName( _rName )
-            ,nOrdinalPosition( _nPosition )
-        {
-        }
-    };
-
     /** collects ColumnDesc's from a resultset produced by XDatabaseMetaData::getColumns
     */
     void lcl_collectColumnDescs_throw( const Reference< XResultSet >& _rxResult, ::std::vector< ColumnDesc >& _out_rColumns )
@@ -131,8 +185,14 @@ namespace
         while ( _rxResult->next() )
         {
             sName = xRow->getString( 4 );           // COLUMN_NAME
+            sal_Int32		nField5	= xRow->getInt(5);
+            ::rtl::OUString aField6 = xRow->getString(6);
+            sal_Int32		nField7 = xRow->getInt(7)
+                        ,	nField9 = xRow->getInt(9)
+                        ,	nField11= xRow->getInt(11);
+            ::rtl::OUString sField13 = xRow->getString(13);
             nOrdinalPosition = xRow->getInt( 17 );  // ORDINAL_POSITION
-            _out_rColumns.push_back( ColumnDesc( sName, nOrdinalPosition ) );
+            _out_rColumns.push_back( ColumnDesc( sName,nField5,aField6,nField7,nField9,nField11,sField13, nOrdinalPosition ) );
         }
     }
 
@@ -201,16 +261,16 @@ void OTableHelper::refreshColumns()
         ) );
 
         // collect the column names, together with their ordinal position
-        ::std::vector< ColumnDesc > aColumns;
-        lcl_collectColumnDescs_throw( xResult, aColumns );
+        m_pImpl->m_aColumnDesc.clear();
+        lcl_collectColumnDescs_throw( xResult, m_pImpl->m_aColumnDesc );
 
         // ensure that the ordinal positions as obtained from the meta data do make sense
-        lcl_sanitizeColumnDescs( aColumns );
+        lcl_sanitizeColumnDescs( m_pImpl->m_aColumnDesc );
 
         // sort by ordinal position
         ::std::map< OrdinalPosition, ::rtl::OUString > aSortedColumns;
-        for (   ::std::vector< ColumnDesc >::const_iterator copy = aColumns.begin();
-                copy != aColumns.end();
+        for (   ::std::vector< ColumnDesc >::const_iterator copy = m_pImpl->m_aColumnDesc.begin();
+                copy != m_pImpl->m_aColumnDesc.end();
                 ++copy
             )
             aSortedColumns[ copy->nOrdinalPosition ] = copy->sName;
@@ -229,6 +289,21 @@ void OTableHelper::refreshColumns()
     else
         m_pColumns	= createColumns(aVector);
 }
+// -----------------------------------------------------------------------------
+const ColumnDesc* OTableHelper::getColumnDescription(const ::rtl::OUString& _sName) const
+{
+    const ColumnDesc* pRet = NULL;
+    ::std::vector< ColumnDesc >::const_iterator aEnd = m_pImpl->m_aColumnDesc.end();
+    for (::std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter)
+    {
+        if ( aIter->sName == _sName )
+        {
+            pRet = &*aIter;
+            break;
+        }
+    } // for (::std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter)
+    return pRet;
+}
 // -------------------------------------------------------------------------
 void OTableHelper::refreshPrimaryKeys(TStringVector& _rNames)
 {
@@ -237,14 +312,26 @@ void OTableHelper::refreshPrimaryKeys(TStringVector& _rNames)
         aCatalog <<= m_CatalogName;
     Reference< XResultSet > xResult = getMetaData()->getPrimaryKeys(aCatalog,m_SchemaName,m_Name);
 
-    if ( xResult.is() && xResult->next() )
+    if ( xResult.is() )
     {
-        Reference< XRow > xRow(xResult,UNO_QUERY);
-        const ::rtl::OUString aPkName = xRow->getString(6);
-        m_aKeys.insert(TKeyMap::value_type(aPkName,sdbcx::TKeyProperties(new sdbcx::KeyProperties(::rtl::OUString(),KeyType::PRIMARY,0,0))));
+        sdbcx::TKeyProperties pKeyProps(new sdbcx::KeyProperties(::rtl::OUString(),KeyType::PRIMARY,0,0));
+        ::rtl::OUString aPkName;
+        bool bAlreadyFetched = false;
+        const Reference< XRow > xRow(xResult,UNO_QUERY);
+        while ( xResult->next() )
+        {
+            pKeyProps->m_aKeyColumnNames.push_back(xRow->getString(4));
+            if ( !bAlreadyFetched )
+            {
+                aPkName = xRow->getString(6);
+                bAlreadyFetched = true;
+            }
+        }
+        
+        m_pImpl->m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps));
         _rNames.push_back(aPkName);
-        ::comphelper::disposeComponent(xResult);
-    }
+    } // if ( xResult.is() && xResult->next() )
+    ::comphelper::disposeComponent(xResult);
 }
 // -------------------------------------------------------------------------
 void OTableHelper::refreshForgeinKeys(TStringVector& _rNames)
@@ -257,7 +344,8 @@ void OTableHelper::refreshForgeinKeys(TStringVector& _rNames)
 
     if ( xRow.is() )
     {
-        ::rtl::OUString aName,sCatalog,aSchema;
+        sdbcx::TKeyProperties pKeyProps;
+        ::rtl::OUString aName,sCatalog,aSchema,sOldFKName;
         while( xResult->next() )
         {
             // this must be outsid the "if" because we have to call in a right order
@@ -267,29 +355,51 @@ void OTableHelper::refreshForgeinKeys(TStringVector& _rNames)
             aSchema		= xRow->getString(2);
             aName		= xRow->getString(3);
 
-            const sal_Int32 nKeySeq = xRow->getInt(9);
+            const ::rtl::OUString sForeignKeyColumn = xRow->getString(8);
             const sal_Int32 nUpdateRule = xRow->getInt(10);
             const sal_Int32 nDeleteRule = xRow->getInt(11);
+            const ::rtl::OUString sFkName = xRow->getString(12);
             
-            if ( nKeySeq == 1 )
-            { // only append when the sequnce number is 1 to forbid serveral inserting the same key name
-                const ::rtl::OUString sFkName = xRow->getString(12);
-                if ( sFkName.getLength() && !xRow->wasNull() )
+                if ( pKeyProps.get() )
+                {
+                }
+                
+                
+            if ( sFkName.getLength() && !xRow->wasNull() )
+            {
+                if ( sOldFKName != sFkName )
                 {
-                    ::rtl::OUString sReferencedName;
-                    sReferencedName = ::dbtools::composeTableName(getMetaData(),sCatalog,aSchema,aName,sal_False,::dbtools::eInDataManipulation);
-                    m_aKeys.insert(TKeyMap::value_type(sFkName,sdbcx::TKeyProperties(new sdbcx::KeyProperties(sReferencedName,KeyType::FOREIGN,nUpdateRule,nDeleteRule))));
+                    if ( pKeyProps.get() )
+                        m_pImpl->m_aKeys.insert(TKeyMap::value_type(sOldFKName,pKeyProps));
+
+                    const ::rtl::OUString sReferencedName = ::dbtools::composeTableName(getMetaData(),sCatalog,aSchema,aName,sal_False,::dbtools::eInDataManipulation);
+                    pKeyProps.reset(new sdbcx::KeyProperties(sReferencedName,KeyType::FOREIGN,nUpdateRule,nDeleteRule));
+                    pKeyProps->m_aKeyColumnNames.push_back(sForeignKeyColumn);                    
                     _rNames.push_back(sFkName);
+                    if ( m_pTables->hasByName(sReferencedName) )
+                    {
+                        if ( !m_pImpl->m_xTablePropertyListener.is() )
+                            m_pImpl->m_xTablePropertyListener = ::comphelper::ImplementationReference< OTableContainerListener,XContainerListener>( new OTableContainerListener(this) );
+                        m_pTables->addContainerListener(m_pImpl->m_xTablePropertyListener.getRef());
+                        m_pImpl->m_xTablePropertyListener->add(sReferencedName);
+                    } // if ( m_pTables->hasByName(sReferencedName) )
+                    sOldFKName = sFkName;
+                } // if ( sOldFKName != sFkName )
+                else if ( pKeyProps.get() )
+                {
+                    pKeyProps->m_aKeyColumnNames.push_back(sForeignKeyColumn);
                 }
             }
-        }
+        } // while( xResult->next() )
+        if ( pKeyProps.get() )
+            m_pImpl->m_aKeys.insert(TKeyMap::value_type(sOldFKName,pKeyProps));
         ::comphelper::disposeComponent(xResult);
     }
 }
 // -------------------------------------------------------------------------
 void OTableHelper::refreshKeys()
 {
-    m_aKeys.clear();
+    m_pImpl->m_aKeys.clear();
 
     TStringVector aNames;
 
@@ -386,7 +496,7 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx
         sComposedName = ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,sal_True,::dbtools::eInDataManipulation);
         sSql += sComposedName;
 
-        Reference< XStatement > xStmt = m_xConnection->createStatement(  );
+        Reference< XStatement > xStmt = m_pImpl->m_xConnection->createStatement(  );
         if ( xStmt.is() )
         {
             xStmt->execute(sSql);
@@ -401,7 +511,7 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx
 // -----------------------------------------------------------------------------
 Reference< XDatabaseMetaData> OTableHelper::getMetaData() const 
 { 
-    return m_xMetaData; 
+    return m_pImpl->m_xMetaData; 
 }
 // -------------------------------------------------------------------------
 void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
@@ -441,8 +551,8 @@ void SAL_CALL OTableHelper::release() throw()
 sdbcx::TKeyProperties OTableHelper::getKeyProperties(const ::rtl::OUString& _sName) const
 {
     sdbcx::TKeyProperties pKeyProps;
-    TKeyMap::const_iterator aFind = m_aKeys.find(_sName);
-    if ( aFind != m_aKeys.end() )
+    TKeyMap::const_iterator aFind = m_pImpl->m_aKeys.find(_sName);
+    if ( aFind != m_pImpl->m_aKeys.end() )
     {
         pKeyProps = aFind->second;
     }
@@ -457,7 +567,7 @@ sdbcx::TKeyProperties OTableHelper::getKeyProperties(const ::rtl::OUString& _sNa
 // -----------------------------------------------------------------------------
 void OTableHelper::addKey(const ::rtl::OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties)
 {
-    m_aKeys.insert(TKeyMap::value_type(_sName,_aKeyProperties));
+    m_pImpl->m_aKeys.insert(TKeyMap::value_type(_sName,_aKeyProperties));
 }
 // -----------------------------------------------------------------------------
 ::rtl::OUString OTableHelper::getTypeCreatePattern() const
@@ -465,4 +575,7 @@ void OTableHelper::addKey(const ::rtl::OUString& _sName,const sdbcx::TKeyPropert
     return ::rtl::OUString();
 }
 // -----------------------------------------------------------------------------
-
+Reference< XConnection> OTableHelper::getConnection() const 
+{ 
+    return m_pImpl->m_xConnection; 
+}
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 2d4e51b30..d2682adf7 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -99,9 +99,9 @@ namespace dbtools
         ::rtl::OUStringBuffer aTemp(toDateString(aDate));
         aTemp.appendAscii(" ");
         Time aTime(0,_rDateTime.Seconds,_rDateTime.Minutes,_rDateTime.Hours);
-        aTemp.append(toTimeString(aTime));
+        aTemp.append( toTimeString(aTime) );
         aTemp.appendAscii(".");
-        aTemp.append(static_cast<sal_Int32>(_rDateTime.HundredthSeconds));
+        aTemp.append( static_cast<sal_Int32>(_rDateTime.HundredthSeconds));
         return  aTemp.makeStringAndClear();
     }
     //------------------------------------------------------------------------------
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 064cb0815..2f9495e11 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -157,10 +157,9 @@ namespace dbtools
             const DatabaseMetaData_Impl& _metaData, ::boost::optional< ::rtl::OUString >& _cachedSetting,
             ::rtl::OUString (SAL_CALL XDatabaseMetaData::*_getter)() )
         {
-            lcl_checkConnected( _metaData );
-
             if ( !_cachedSetting )
             {
+                lcl_checkConnected( _metaData );
                 try
                 {
                     _cachedSetting.reset( (_metaData.xConnectionMetaData.get()->*_getter)() );
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index bfbfdc738..eaf1d6fe8 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -842,9 +842,8 @@ static ::rtl::OUString impl_doComposeTableName( const Reference< XDatabaseMetaDa
         return ::rtl::OUString();
     OSL_ENSURE(_rName.getLength(), "impl_doComposeTableName : at least the name should be non-empty !");
 
-    ::rtl::OUString sQuoteString = _rxMetaData->getIdentifierQuoteString();
-
-    NameComponentSupport aNameComps( lcl_getNameComponentSupport( _rxMetaData, _eComposeRule ) );
+    const ::rtl::OUString sQuoteString = _rxMetaData->getIdentifierQuoteString();
+    const NameComponentSupport aNameComps( lcl_getNameComponentSupport( _rxMetaData, _eComposeRule ) );
 
     ::rtl::OUStringBuffer aComposedName;
 
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index c9b4990f8..86a7f1e60 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -384,7 +384,7 @@ namespace
 }
 namespace 
 {
-    Reference<XPropertySet> lcl_createSDBCXColumn(
+    Reference<XPropertySet> lcl_createSDBCXColumn(const Reference<XNameAccess>& _xPrimaryKeyColumns,
                                           const Reference<XConnection>& _xConnection,
                                           const Any& _aCatalog,
                                           const ::rtl::OUString& _aSchema,
@@ -424,8 +424,7 @@ namespace
                         const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString();
                         ::rtl::OUString sQuotedName  = ::dbtools::quoteName(sQuote,_rName);
                         ::rtl::OUString sComposedName;
-                        sComposedName = composeTableNameForSelect(
-                            _xConnection, getString( _aCatalog ), _aSchema, _aTable );
+                        sComposedName = composeTableNameForSelect(_xConnection, getString( _aCatalog ), _aSchema, _aTable );
 
                         ColumnInformationMap aInfo(_bCase);
                         collectColumnInformation(_xConnection,sComposedName,sQuotedName,aInfo);
@@ -445,11 +444,19 @@ namespace
                     {
                         try
                         {
-                            Reference< XResultSet > xPKeys = xMetaData->getPrimaryKeys( _aCatalog, _aSchema, _aTable );
-                            Reference< XRow > xPKeyRow( xPKeys, UNO_QUERY_THROW );
-                            while( xPKeys->next() ) // there can be only one primary key
+                            if ( _xPrimaryKeyColumns.is() )
+                            {
+                                if ( _xPrimaryKeyColumns->hasByName(_rName) )
+                                    nField11 = ColumnValue::NO_NULLS;
+                                
+                            }
+                            else
+                            {
+                                Reference< XResultSet > xPKeys = xMetaData->getPrimaryKeys( _aCatalog, _aSchema, _aTable );
+                                Reference< XRow > xPKeyRow( xPKeys, UNO_QUERY_THROW );
+                                while( xPKeys->next() ) // there can be only one primary key
                                 {
-                                ::rtl::OUString sKeyColumn = xPKeyRow->getString(4);
+                                    ::rtl::OUString sKeyColumn = xPKeyRow->getString(4);
                                     if ( aMixCompare(_rName,sKeyColumn) )
                                     {
                                         nField11 = ColumnValue::NO_NULLS;
@@ -457,6 +464,7 @@ namespace
                                     }
                                 }
                             }
+                        }
                         catch(SQLException&)
                         {
                             OSL_ENSURE( false, "lcl_createSDBCXColumn: caught an exception!" );
@@ -521,10 +529,33 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable
     _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME))	>>= aSchema;
     _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))		>>= aTable;
 
-    xProp = lcl_createSDBCXColumn(_xConnection,aCatalog, aSchema, aTable, _rName,_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
+    Reference<XKeysSupplier> xKeysSup(_xTable,UNO_QUERY);
+    Reference<XNameAccess> xPrimaryKeyColumns;
+    if ( xKeysSup.is() )
+    {
+        const Reference<XIndexAccess> xKeys = xKeysSup->getKeys();
+        if ( xKeys.is() )
+        {
+            const sal_Int32 nKeyCount = xKeys->getCount();
+            for(sal_Int32 nKeyIter = 0; nKeyIter < nKeyCount;++nKeyIter)
+            {
+                const Reference<XPropertySet> xKey(xKeys->getByIndex(nKeyIter),UNO_QUERY_THROW);
+                sal_Int32 nType = 0;
+                xKey->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))	>>= nType;
+                if ( nType == KeyType::PRIMARY )
+                {
+                    const Reference<XColumnsSupplier> xColS(xKey,UNO_QUERY_THROW);
+                    xPrimaryKeyColumns = xColS->getColumns();
+                    break;
+                }
+            } // for(sal_Int32 nKeyIter = 0; nKeyIter < nKeyCount;++)
+        }
+    }
+
+    xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, _rName,_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
     if ( !xProp.is() )
     {
-        xProp = lcl_createSDBCXColumn(_xConnection,aCatalog, aSchema, aTable, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
+        xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
         if ( !xProp.is() )
             xProp = new connectivity::sdbcx::OColumn(_rName,
                                                 ::rtl::OUString(),::rtl::OUString(),
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 837fb1ddf..9114f20e1 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -118,7 +118,7 @@ namespace dbtools
     //--------------------------------------------------------------------
     void ParameterManager::clearAllParameterInformation()
     {
-        m_xInnerParamColumns = NULL;
+       m_xInnerParamColumns.clear();
         if ( m_pOuterParameters.is() )
             m_pOuterParameters->dispose();
         m_pOuterParameters   = NULL;
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 718ea9e8d..0b8710c49 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -277,7 +277,7 @@ namespace connectivity
         }
 
         if ( !sState.getLength() )
-            sState = ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "S1000" ), RTL_TEXTENCODING_ASCII_US );
+            sState = ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "S1000" ) );
 
         return sState;
     }
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 3d708e10a..d40aeccda 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -181,8 +181,8 @@ void OConnectionPool::clear(sal_Bool _bDispose)
     if (xProp.is())
         xProp->removePropertyChangeListener(getTimeoutNodeName(),this);
 
-    m_xDriverNode	= NULL;
-    m_xDriver		= NULL;
+m_xDriverNode.clear();
+m_xDriver.clear();
 }
 //--------------------------------------------------------------------------
 Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException)
@@ -223,7 +223,7 @@ void SAL_CALL OConnectionPool::disposing( const ::com::sun::star::lang::EventObj
     }
     else
     {
-        m_xDriverNode = NULL;
+    m_xDriverNode.clear();
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index a4a3aa178..679ea8d61 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -507,7 +507,7 @@ void SAL_CALL OPoolCollection::disposing( const EventObject& Source ) throw (Run
             {
                 if ( xProp.is() )
                     xProp->removePropertyChangeListener(getEnablePoolingNodeName(),this);
-                m_xConfigNode = NULL;
+            m_xConfigNode.clear();
             }
             else if ( xProp.is() )
                 xProp->removePropertyChangeListener(getEnableNodeName(),this);
@@ -577,7 +577,7 @@ void OPoolCollection::clearDesktop()
     clearConnectionPools(sal_True);
     if ( m_xDesktop.is() )
         m_xDesktop->removeTerminateListener(this);
-    m_xDesktop = NULL;
+m_xDesktop.clear();
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index 8ee7adf6d..64293811d 100644
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
@@ -64,14 +64,14 @@ void SAL_CALL OPooledConnection::disposing(void)
     MutexGuard aGuard(m_aMutex);
     if (m_xComponent.is())
         m_xComponent->removeEventListener(this);
-    m_xComponent = NULL;
+m_xComponent.clear();
     ::comphelper::disposeComponent(m_xRealConnection);
 }
 // -----------------------------------------------------------------------------
 // XEventListener
 void SAL_CALL OPooledConnection::disposing( const EventObject& /*Source*/ ) throw (RuntimeException)
 {
-    m_xComponent = NULL;
+m_xComponent.clear();
 }
 // -----------------------------------------------------------------------------
 //XPooledConnection 
diff --git a/connectivity/source/drivers/adabas/BConnection.cxx b/connectivity/source/drivers/adabas/BConnection.cxx
index 0eb8a5a72..151b886fd 100644
--- a/connectivity/source/drivers/adabas/BConnection.cxx
+++ b/connectivity/source/drivers/adabas/BConnection.cxx
@@ -223,10 +223,7 @@ Reference< XPreparedStatement > SAL_CALL OAdabasConnection::prepareStatement( co
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE2::rBHelper.bDisposed);
 
-    if(m_aTypeInfo.empty())
-        buildTypeInfo();
-
-    Reference< XPreparedStatement > xReturn = new OAdabasPreparedStatement(this,m_aTypeInfo,sql);
+    Reference< XPreparedStatement > xReturn = new OAdabasPreparedStatement(this,sql);
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 8f8870ad9..bcdd09cb7 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -317,7 +317,7 @@ void SAL_CALL ODriver::disposing( const EventObject& Source ) throw(RuntimeExcep
                 }
             }
         }
-        m_xORB = NULL;
+    m_xORB.clear();
     }
 }
 // --------------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/adabas/BPreparedStatement.cxx b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
index 4a4de6808..3b398c804 100644
--- a/connectivity/source/drivers/adabas/BPreparedStatement.cxx
+++ b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
@@ -48,8 +48,8 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 using namespace com::sun::star::util;
 
-OAdabasPreparedStatement::OAdabasPreparedStatement( OAdabasConnection* _pConnection,const ::std::vector<OTypeInfo>& _TypeInfo,const ::rtl::OUString& sql) 
-: ::connectivity::odbc::OPreparedStatement( _pConnection,_TypeInfo,sql)
+OAdabasPreparedStatement::OAdabasPreparedStatement( OAdabasConnection* _pConnection,const ::rtl::OUString& sql) 
+: ::connectivity::odbc::OPreparedStatement( _pConnection,sql)
 {
     m_aSelectColumns = _pConnection->createSelectColumns(sql);
 }
diff --git a/connectivity/source/drivers/adabas/BTables.cxx b/connectivity/source/drivers/adabas/BTables.cxx
index fb4b8c678..0d16aeba6 100644
--- a/connectivity/source/drivers/adabas/BTables.cxx
+++ b/connectivity/source/drivers/adabas/BTables.cxx
@@ -96,7 +96,7 @@ void OTables::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void OTables::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/adabas/BViews.cxx b/connectivity/source/drivers/adabas/BViews.cxx
index bac78d2b7..b62f0d12c 100644
--- a/connectivity/source/drivers/adabas/BViews.cxx
+++ b/connectivity/source/drivers/adabas/BViews.cxx
@@ -110,7 +110,7 @@ void OViews::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void OViews::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 39e933cf2..783707b8e 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -100,7 +100,7 @@ void ODatabaseMetaDataResultSet::disposing(void)
     if(m_pRecordSet)
         m_pRecordSet->Close();
     m_aStatement	= NULL;
-    m_xMetaData		= NULL;
+m_xMetaData.clear();
 }
 // -------------------------------------------------------------------------
 Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index 33c1f80b4..6ff8dedcf 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -39,6 +39,8 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include "connectivity/dbexception.hxx"
 #include "resource/ado_res.hrc"
+#include <Objbase.h>
+
 
 #include "resource/sharedresources.hxx"
 
@@ -57,12 +59,19 @@ ODriver::ODriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang:
     : ODriver_BASE(m_aMutex)
     ,m_xORB(_xORB)
 {
-    CoInitialize(NULL);
+     if ( FAILED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED)) )
+     {
+         CoUninitialize();
+         int h = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+         (void)h;
+         ++h;
+     }
 }
 // -------------------------------------------------------------------------
 ODriver::~ODriver()
 {
     CoUninitialize();
+    CoInitialize(NULL);
 }
 //------------------------------------------------------------------------------
 void ODriver::disposing()
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 517d17dd0..38284a3d4 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -135,7 +135,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) thr
 // -------------------------------------------------------------------------
 void OPreparedStatement::disposing()
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     if (m_pParameters)
     {
         m_pParameters->Release();
@@ -295,7 +295,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLE
 
 
     // first clear the old things
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     disposeResultSet();
     if(m_RecordSet.IsValid())
         m_RecordSet.Close();
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index f84a85eac..10295db9a 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -139,8 +139,8 @@ void OResultSet::disposing(void)
     ::osl::MutexGuard aGuard(m_aMutex);
     if(m_pRecordSet)
         m_pRecordSet->Close();
-    m_xStatement	= NULL;
-    m_xMetaData		= NULL;
+m_xStatement.clear();
+m_xMetaData.clear();
 }
 // -------------------------------------------------------------------------
 Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index 513d6b145..00ae2a249 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -121,7 +121,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
                 uno_Environment	** /*ppEnv*/
             )
 {
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine";
 }
 
 //---------------------------------------------------------------------------------------
@@ -143,7 +143,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
     }
     catch (::com::sun::star::registry::InvalidRegistryException& )
     {
-        OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
+        OSL_ENSURE(sal_False, "ADO::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
     }
 
     return sal_False;
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index d776a91c7..216dc2d9f 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1765,7 +1765,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
                         m_pColumns->getByIndex(i) >>= xCol;
                         OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!");
                         xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
-                        xCol = NULL;
+                        xCol.clear();
                     } // if ( !aColName.getLength() )
                     const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                             STR_DUPLICATE_VALUE_IN_COLUMN
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 7cf082488..2324ec7a7 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -82,7 +82,7 @@ void OEvoabDriver::disposing()
             xComp->dispose();
             }
             catch (com::sun::star::lang::DisposedException e) {
-             xComp=NULL;
+             xComp.clear();
             }
         }
     }
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 1b79c43af..c7e6a1617 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -579,7 +579,7 @@ void OEvoabResultSet::disposing(void)
     g_list_free(m_pContacts);
     m_pContacts = NULL;
     m_pStatement = NULL;
-    m_xMetaData	= NULL;
+m_xMetaData.clear();
 }
 // -------------------------------------------------------------------------
 Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 65cb703ff..120ceb524 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -463,7 +463,7 @@ rtl::OUString OCommonStatement::getTableName()
 
         if( m_aSQLIterator.isTableNode( pAllTableNames->getChild( 0 ) ) )
             OSQLParseNode::getTableComponents( pAllTableNames->getChild( 0 ),
-                                               aCatalog,aSchema, aTableName );
+                                               aCatalog,aSchema, aTableName,NULL );
 
         else if( SQL_ISRULE( pAllTableNames->getChild( 0 ), table_ref ) )
         {
@@ -472,7 +472,7 @@ rtl::OUString OCommonStatement::getTableName()
             {
                 aTableName = OSQLParseNode::getTableRange(pAllTableNames->getChild( 0 ));
                 if( !aTableName.getLength() )
-                    OSQLParseNode::getTableComponents( pNodeForTableName, aCatalog, aSchema, aTableName);
+                    OSQLParseNode::getTableComponents( pNodeForTableName, aCatalog, aSchema, aTableName,NULL);
             }
             else
                 OSL_ENSURE( false,  "odd table layout" );
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index 8b3d1a653..0109d9f12 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -101,7 +101,7 @@ void OEvoabTables::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void OEvoabTables::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index b98896786..8dba811f7 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -58,7 +58,7 @@ void SAL_CALL OFileCatalog::disposing()
     ::osl::MutexGuard aGuard(m_aMutex);
 
     typedef connectivity::sdbcx::OCatalog OFileCatalog_BASE;
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OFileCatalog_BASE::disposing();
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 4b68c873f..1894e34d9 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -383,8 +383,8 @@ void OConnection::disposing()
     OConnection_BASE::disposing();
 
     m_bClosed	= sal_True;
-    m_xDir		= NULL;
-    m_xContent	= NULL;
+m_xDir.clear();
+m_xContent.clear();
     m_xCatalog	= WeakReference< XTablesSupplier>();
 
     dispose_ChildImpl();
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 82eea55ba..914dddc59 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -98,9 +98,7 @@ void OPreparedStatement::disposing()
     }
 
     m_xParamColumns = NULL;
-
-
-    m_xMetaData = NULL;
+    m_xMetaData.clear();
     if(m_aParameterRow.isValid())
     {
         m_aParameterRow->get().clear();
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index ae614f0c2..2a373922d 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -174,13 +174,13 @@ void OResultSet::disposing(void)
     OPropertySetHelper::disposing();
 
     ::osl::MutexGuard aGuard(m_aMutex);
-    m_xStatement	= NULL;
-    m_xMetaData		= NULL;
+    m_xStatement.clear();
+    m_xMetaData.clear();
     m_pParseTree	= NULL;
-    m_xColNames		= NULL;
-    m_xColumns		= NULL;
+    m_xColNames.clear();
+    m_xColumns = NULL;
     m_xParamColumns = NULL;
-    m_xColsIdx		= NULL;
+    m_xColsIdx.clear();
 
     Reference<XComponent> xComp = m_pTable;
     if ( xComp.is() )
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index 0e02147df..b9233eb8b 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -68,7 +68,7 @@ void OTables::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void OTables::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }
 //------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index c402bdefc..81c4fc052 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -79,7 +79,7 @@ void OPredicateCompiler::dispose()
 {
     Clean();
     m_orgColumns		= NULL;
-    m_xIndexes			= NULL;
+m_xIndexes.clear();
 }
 //------------------------------------------------------------------
 //	inline OCursor& OPredicateCompiler::Cursor() const {return m_rCursor;}
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 79bfb4be4..712c38eea 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -64,12 +64,12 @@ namespace connectivity
         {
             try
             {
-                m_xStream = NULL;
-                m_xSeek = NULL;
+               m_xStream.clear();
+            m_xSeek.clear();
                 if ( m_xInputStream.is() )
                 {
                     m_xInputStream->closeInput();
-                    m_xInputStream = NULL;
+                m_xInputStream.clear();
                 }
                 if ( m_xOutputStream.is() )
                 {
@@ -86,7 +86,7 @@ namespace connectivity
                         OSL_UNUSED( e );
                         OSL_ENSURE(0,"Could not dispose OutputStream");
                     }
-                    m_xOutputStream = NULL;
+                m_xOutputStream.clear();
                 }
             }
             catch(Exception& )
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 0e4f6fb6c..9b3c08aa2 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -113,7 +113,7 @@ void OTables::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void OTables::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 480620364..9c20fc040 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -93,7 +93,7 @@ void HViews::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void HViews::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index aeec9ee2d..e1066776a 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -118,7 +118,7 @@ Reference< XConnection > SAL_CALL java_sql_Driver::connect( const ::rtl::OUStrin
         java_sql_Connection* pConnection = new java_sql_Connection( *this );
         xOut = pConnection;
         if ( !pConnection->construct(url,info) )
-            xOut = NULL; // an error occured and the java driver didn't throw an exception
+            xOut.clear(); // an error occured and the java driver didn't throw an exception
         else
             m_aLogger.log( LogLevel::INFO, STR_LOG_DRIVER_SUCCESS );
     }
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 7bcd93f23..8a5a9a22a 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -116,7 +116,7 @@ void java_sql_ResultSet::disposing(void)
     OPropertySetHelper::disposing();
 
     ::osl::MutexGuard aGuard(m_aMutex);
-    m_xMetaData		= NULL;
+m_xMetaData.clear();
     if( object )
     {
         SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index 1455fd2b9..91ef3f6ca 100644
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
@@ -124,8 +124,8 @@ void KabResultSet::disposing()
 
     ::osl::MutexGuard aGuard(m_aMutex);
 
-    m_xStatement	= NULL;
-    m_xMetaData		= NULL;
+m_xStatement.clear();
+m_xMetaData.clear();
 }
 // -------------------------------------------------------------------------
 Any SAL_CALL KabResultSet::queryInterface(const Type & rType) throw(RuntimeException)
diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx
index 931e537a4..82131b853 100644
--- a/connectivity/source/drivers/kab/KTables.cxx
+++ b/connectivity/source/drivers/kab/KTables.cxx
@@ -88,6 +88,6 @@ void KabTables::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void KabTables::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index 25113f9cf..5a5d660c6 100755
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -151,8 +151,8 @@ void MacabResultSet::disposing()
 
     ::osl::MutexGuard aGuard(m_aMutex);
 
-    m_xStatement	= NULL;
-    m_xMetaData		= NULL;
+m_xStatement.clear();
+m_xMetaData.clear();
 }
 // -------------------------------------------------------------------------
 Any SAL_CALL MacabResultSet::queryInterface(const Type & rType) throw(RuntimeException)
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx
index 82ccac7f9..7fa211ad7 100755
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
@@ -88,6 +88,6 @@ void MacabTables::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void MacabTables::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index b3fd20bd2..07e7551a8 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -91,7 +91,7 @@ void SAL_CALL OPreparedStatement::disposing()
 
     OCommonStatement::disposing();
 
-    m_xMetaData = NULL;
+    m_xMetaData.clear();
     if(m_aParameterRow.isValid())
     {
         m_aParameterRow->get().clear();
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index f3755e95a..081ff8369 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -139,10 +139,10 @@ void OResultSet::disposing(void)
 
     ::osl::MutexGuard aGuard(m_aMutex);
 
-    m_xStatement	= NULL;
-    m_xMetaData     = NULL;
+    m_xStatement.clear();
+    m_xMetaData.clear();
     m_pParseTree    = NULL;
-    m_xColumns      = NULL;
+    m_xColumns = NULL;
     m_xParamColumns = NULL;
     m_pKeySet       = NULL;
     if(m_pTable)
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
index ccfe2e3e9..a4d468d79 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
@@ -50,7 +50,7 @@ using namespace ::comphelper;
 // -------------------------------------------------------------------------
 OResultSetMetaData::~OResultSetMetaData()
 {
-    m_xColumns = NULL;
+   m_xColumns = NULL;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx
index f04a9308e..c6bac0f56 100644
--- a/connectivity/source/drivers/mozab/MTables.cxx
+++ b/connectivity/source/drivers/mozab/MTables.cxx
@@ -100,7 +100,7 @@ void OTables::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void OTables::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index 077adb5fa..8b2626d61 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -130,7 +130,7 @@ void OTables::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void OTables::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index adeeb229d..3a2e13342 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -87,7 +87,7 @@ void OViews::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void OViews::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 419294d26..e5f1dd6c3 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -69,6 +69,7 @@ OConnection::OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver*	_pDriver)
                          ,m_bParameterSubstitution(sal_False)
                          ,m_bIgnoreDriverPrivileges(sal_False)
                          ,m_bPreventGetVersionColumns(sal_False)
+                         ,m_bReadOnly(sal_True)
 {
     m_pDriver->acquire();
 }
@@ -104,7 +105,6 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int
     if (m_aConnectionHandle == SQL_NULL_HANDLE)
         return -1;
 
-    sal_Bool bReadOnly; //weil Methode statisch hier noch einmal ein lokales bReadOnly
     SQLRETURN nSQLRETURN = 0;
     SDB_ODBC_CHAR szConnStrOut[4096];
     SDB_ODBC_CHAR szConnStrIn[2048];
@@ -153,11 +153,11 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int
     {
         ::rtl::OUString aVal;
         OTools::GetInfo(this,m_aConnectionHandle,SQL_DATA_SOURCE_READ_ONLY,aVal,*this,getTextEncoding());
-        bReadOnly = !aVal.compareToAscii("Y");
+        m_bReadOnly = !aVal.compareToAscii("Y");
     }
     catch(Exception&)
     {
-        bReadOnly = sal_True;
+        m_bReadOnly = sal_True;
     }
     try
     {
@@ -172,7 +172,7 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int
 
     // autocoomit ist immer default
 
-    if (!bReadOnly)
+    if (!m_bReadOnly)
         N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_AUTOCOMMIT,(SQLPOINTER)SQL_AUTOCOMMIT_ON,SQL_IS_INTEGER);
 
     return nSQLRETURN;
@@ -299,10 +299,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
-    if(m_aTypeInfo.empty())
-        buildTypeInfo();
-
-    Reference< XPreparedStatement > xReturn = new OPreparedStatement(this,m_aTypeInfo,sql);
+    Reference< XPreparedStatement > xReturn = new OPreparedStatement(this,sql);
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
@@ -399,15 +396,10 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException,
         m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OConnection::isReadOnly() throw(SQLException, RuntimeException)
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
-    checkDisposed(OConnection_BASE::rBHelper.bDisposed);
-
-
-    ::rtl::OUString aValue;
-    OTools::GetInfo(this,m_aConnectionHandle,SQL_DATA_SOURCE_READ_ONLY,aValue,*this,getTextEncoding());
-    return !aValue.compareToAscii("Y");
+    // const member which will initialized only once
+    return m_bReadOnly;
 }
 // --------------------------------------------------------------------------------
 void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& catalog ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index 60e185b4a..97edeeffe 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
@@ -43,6 +43,7 @@
 #include "stdio.h"
 #include "TPrivilegesResultSet.hxx"
 #include <connectivity/dbexception.hxx>
+#include <rtl/ustrbuf.hxx>
 
 using namespace connectivity::odbc;
 using namespace com::sun::star::uno;
@@ -830,9 +831,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLExcepti
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
-    OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DATA_SOURCE_READ_ONLY,aValue,*this,m_pConnection->getTextEncoding());
-    return aValue.toChar() == 'Y';
+    return m_pConnection->isReadOnly();
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
@@ -1324,186 +1323,197 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeExc
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
-    ::rtl::OUString aValue;
+    ::rtl::OUStringBuffer aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_STRING_FUNCTIONS,nValue,*this);
     if(nValue & SQL_FN_STR_ASCII)
-        aValue = ::rtl::OUString::createFromAscii("ASCII,");
+        aValue.appendAscii("ASCII,");
     if(nValue & SQL_FN_STR_BIT_LENGTH)
-        aValue += ::rtl::OUString::createFromAscii("BIT_LENGTH,");
+        aValue.appendAscii("BIT_LENGTH,");
     if(nValue & SQL_FN_STR_CHAR)
-        aValue += ::rtl::OUString::createFromAscii("CHAR,");
+        aValue.appendAscii("CHAR,");
     if(nValue & SQL_FN_STR_CHAR_LENGTH)
-        aValue += ::rtl::OUString::createFromAscii("CHAR_LENGTH,");
+        aValue.appendAscii("CHAR_LENGTH,");
     if(nValue & SQL_FN_STR_CHARACTER_LENGTH)
-        aValue += ::rtl::OUString::createFromAscii("CHARACTER_LENGTH,");
+        aValue.appendAscii("CHARACTER_LENGTH,");
     if(nValue & SQL_FN_STR_CONCAT)
-        aValue += ::rtl::OUString::createFromAscii("CONCAT,");
+        aValue.appendAscii("CONCAT,");
     if(nValue & SQL_FN_STR_DIFFERENCE)
-        aValue += ::rtl::OUString::createFromAscii("DIFFERENCE,");
+        aValue.appendAscii("DIFFERENCE,");
     if(nValue & SQL_FN_STR_INSERT)
-        aValue += ::rtl::OUString::createFromAscii("INSERT,");
+        aValue.appendAscii("INSERT,");
     if(nValue & SQL_FN_STR_LCASE)
-        aValue += ::rtl::OUString::createFromAscii("LCASE,");
+        aValue.appendAscii("LCASE,");
     if(nValue & SQL_FN_STR_LEFT)
-        aValue += ::rtl::OUString::createFromAscii("LEFT,");
+        aValue.appendAscii("LEFT,");
     if(nValue & SQL_FN_STR_LENGTH)
-        aValue += ::rtl::OUString::createFromAscii("LENGTH,");
+        aValue.appendAscii("LENGTH,");
     if(nValue & SQL_FN_STR_LOCATE)
-        aValue += ::rtl::OUString::createFromAscii("LOCATE,");
+        aValue.appendAscii("LOCATE,");
     if(nValue & SQL_FN_STR_LOCATE_2)
-        aValue += ::rtl::OUString::createFromAscii("LOCATE_2,");
+        aValue.appendAscii("LOCATE_2,");
     if(nValue & SQL_FN_STR_LTRIM)
-        aValue += ::rtl::OUString::createFromAscii("LTRIM,");
+        aValue.appendAscii("LTRIM,");
     if(nValue & SQL_FN_STR_OCTET_LENGTH)
-        aValue += ::rtl::OUString::createFromAscii("OCTET_LENGTH,");
+        aValue.appendAscii("OCTET_LENGTH,");
     if(nValue & SQL_FN_STR_POSITION)
-        aValue += ::rtl::OUString::createFromAscii("POSITION,");
+        aValue.appendAscii("POSITION,");
     if(nValue & SQL_FN_STR_REPEAT)
-        aValue += ::rtl::OUString::createFromAscii("REPEAT,");
+        aValue.appendAscii("REPEAT,");
     if(nValue & SQL_FN_STR_REPLACE)
-        aValue += ::rtl::OUString::createFromAscii("REPLACE,");
+        aValue.appendAscii("REPLACE,");
     if(nValue & SQL_FN_STR_RIGHT)
-        aValue += ::rtl::OUString::createFromAscii("RIGHT,");
+        aValue.appendAscii("RIGHT,");
     if(nValue & SQL_FN_STR_RTRIM)
-        aValue += ::rtl::OUString::createFromAscii("RTRIM,");
+        aValue.appendAscii("RTRIM,");
     if(nValue & SQL_FN_STR_SOUNDEX)
-        aValue += ::rtl::OUString::createFromAscii("SOUNDEX,");
+        aValue.appendAscii("SOUNDEX,");
     if(nValue & SQL_FN_STR_SPACE)
-        aValue += ::rtl::OUString::createFromAscii("SPACE,");
+        aValue.appendAscii("SPACE,");
     if(nValue & SQL_FN_STR_SUBSTRING)
-        aValue += ::rtl::OUString::createFromAscii("SUBSTRING,");
+        aValue.appendAscii("SUBSTRING,");
     if(nValue & SQL_FN_STR_UCASE)
-        aValue += ::rtl::OUString::createFromAscii("UCASE,");
+        aValue.appendAscii("UCASE,");
 
 
-    return aValue.copy(0,aValue.lastIndexOf(','));
+    if ( aValue.getLength() )
+        aValue.setLength(aValue.getLength()-1);
+
+    return aValue.makeStringAndClear();
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
-    ::rtl::OUString aValue;
+    ::rtl::OUStringBuffer aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TIMEDATE_FUNCTIONS,nValue,*this);
 
     if(nValue & SQL_FN_TD_CURRENT_DATE)
-        aValue = ::rtl::OUString::createFromAscii("CURRENT_DATE,");
+        aValue.appendAscii("CURRENT_DATE,");
     if(nValue & SQL_FN_TD_CURRENT_TIME)
-        aValue += ::rtl::OUString::createFromAscii("CURRENT_TIME,");
+        aValue.appendAscii("CURRENT_TIME,");
     if(nValue & SQL_FN_TD_CURRENT_TIMESTAMP)
-        aValue += ::rtl::OUString::createFromAscii("CURRENT_TIMESTAMP,");
+        aValue.appendAscii("CURRENT_TIMESTAMP,");
     if(nValue & SQL_FN_TD_CURDATE)
-        aValue += ::rtl::OUString::createFromAscii("CURDATE,");
+        aValue.appendAscii("CURDATE,");
     if(nValue & SQL_FN_TD_CURTIME)
-        aValue += ::rtl::OUString::createFromAscii("CURTIME,");
+        aValue.appendAscii("CURTIME,");
     if(nValue & SQL_FN_TD_DAYNAME)
-        aValue += ::rtl::OUString::createFromAscii("DAYNAME,");
+        aValue.appendAscii("DAYNAME,");
     if(nValue & SQL_FN_TD_DAYOFMONTH)
-        aValue += ::rtl::OUString::createFromAscii("DAYOFMONTH,");
+        aValue.appendAscii("DAYOFMONTH,");
     if(nValue & SQL_FN_TD_DAYOFWEEK)
-        aValue += ::rtl::OUString::createFromAscii("DAYOFWEEK,");
+        aValue.appendAscii("DAYOFWEEK,");
     if(nValue & SQL_FN_TD_DAYOFYEAR)
-        aValue += ::rtl::OUString::createFromAscii("DAYOFYEAR,");
+        aValue.appendAscii("DAYOFYEAR,");
     if(nValue & SQL_FN_TD_EXTRACT)
-        aValue += ::rtl::OUString::createFromAscii("EXTRACT,");
+        aValue.appendAscii("EXTRACT,");
     if(nValue & SQL_FN_TD_HOUR)
-        aValue += ::rtl::OUString::createFromAscii("HOUR,");
+        aValue.appendAscii("HOUR,");
     if(nValue & SQL_FN_TD_MINUTE)
-        aValue += ::rtl::OUString::createFromAscii("MINUTE,");
+        aValue.appendAscii("MINUTE,");
     if(nValue & SQL_FN_TD_MONTH)
-        aValue += ::rtl::OUString::createFromAscii("MONTH,");
+        aValue.appendAscii("MONTH,");
     if(nValue & SQL_FN_TD_MONTHNAME)
-        aValue += ::rtl::OUString::createFromAscii("MONTHNAME,");
+        aValue.appendAscii("MONTHNAME,");
     if(nValue & SQL_FN_TD_NOW)
-        aValue += ::rtl::OUString::createFromAscii("NOW,");
+        aValue.appendAscii("NOW,");
     if(nValue & SQL_FN_TD_QUARTER)
-        aValue += ::rtl::OUString::createFromAscii("QUARTER,");
+        aValue.appendAscii("QUARTER,");
     if(nValue & SQL_FN_TD_SECOND)
-        aValue += ::rtl::OUString::createFromAscii("SECOND,");
+        aValue.appendAscii("SECOND,");
     if(nValue & SQL_FN_TD_TIMESTAMPADD)
-        aValue += ::rtl::OUString::createFromAscii("TIMESTAMPADD,");
+        aValue.appendAscii("TIMESTAMPADD,");
     if(nValue & SQL_FN_TD_TIMESTAMPDIFF)
-        aValue += ::rtl::OUString::createFromAscii("TIMESTAMPDIFF,");
+        aValue.appendAscii("TIMESTAMPDIFF,");
     if(nValue & SQL_FN_TD_WEEK)
-        aValue += ::rtl::OUString::createFromAscii("WEEK,");
+        aValue.appendAscii("WEEK,");
     if(nValue & SQL_FN_TD_YEAR)
-        aValue += ::rtl::OUString::createFromAscii("YEAR,");
+        aValue.appendAscii("YEAR,");
 
-    return aValue.copy(0,aValue.lastIndexOf(','));
+    if ( aValue.getLength() )
+        aValue.setLength(aValue.getLength()-1);
+
+    return aValue.makeStringAndClear();
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
-    ::rtl::OUString aValue;
+    ::rtl::OUStringBuffer aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SYSTEM_FUNCTIONS,nValue,*this);
 
     if(nValue & SQL_FN_SYS_DBNAME)
-        aValue += ::rtl::OUString::createFromAscii("DBNAME,");
+        aValue.appendAscii("DBNAME,");
     if(nValue & SQL_FN_SYS_IFNULL)
-        aValue += ::rtl::OUString::createFromAscii("IFNULL,");
+        aValue.appendAscii("IFNULL,");
     if(nValue & SQL_FN_SYS_USERNAME)
-        aValue += ::rtl::OUString::createFromAscii("USERNAME,");
+        aValue.appendAscii("USERNAME,");
 
-    return aValue.copy(0,aValue.lastIndexOf(','));
+    if ( aValue.getLength() )
+        aValue.setLength(aValue.getLength()-1);
+
+    return aValue.makeStringAndClear();
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
-    ::rtl::OUString aValue;
+    ::rtl::OUStringBuffer aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NUMERIC_FUNCTIONS,nValue,*this);
 
     if(nValue & SQL_FN_NUM_ABS)
-        aValue += ::rtl::OUString::createFromAscii("ABS,");
+        aValue.appendAscii("ABS,");
     if(nValue & SQL_FN_NUM_ACOS)
-        aValue += ::rtl::OUString::createFromAscii("ACOS,");
+        aValue.appendAscii("ACOS,");
     if(nValue & SQL_FN_NUM_ASIN)
-        aValue += ::rtl::OUString::createFromAscii("ASIN,");
+        aValue.appendAscii("ASIN,");
     if(nValue & SQL_FN_NUM_ATAN)
-        aValue += ::rtl::OUString::createFromAscii("ATAN,");
+        aValue.appendAscii("ATAN,");
     if(nValue & SQL_FN_NUM_ATAN2)
-        aValue += ::rtl::OUString::createFromAscii("ATAN2,");
+        aValue.appendAscii("ATAN2,");
     if(nValue & SQL_FN_NUM_CEILING)
-        aValue += ::rtl::OUString::createFromAscii("CEILING,");
+        aValue.appendAscii("CEILING,");
     if(nValue & SQL_FN_NUM_COS)
-        aValue += ::rtl::OUString::createFromAscii("COS,");
+        aValue.appendAscii("COS,");
     if(nValue & SQL_FN_NUM_COT)
-        aValue += ::rtl::OUString::createFromAscii("COT,");
+        aValue.appendAscii("COT,");
     if(nValue & SQL_FN_NUM_DEGREES)
-        aValue += ::rtl::OUString::createFromAscii("DEGREES,");
+        aValue.appendAscii("DEGREES,");
     if(nValue & SQL_FN_NUM_EXP)
-        aValue += ::rtl::OUString::createFromAscii("EXP,");
+        aValue.appendAscii("EXP,");
     if(nValue & SQL_FN_NUM_FLOOR)
-        aValue += ::rtl::OUString::createFromAscii("FLOOR,");
+        aValue.appendAscii("FLOOR,");
     if(nValue & SQL_FN_NUM_LOG)
-        aValue += ::rtl::OUString::createFromAscii("LOGF,");
+        aValue.appendAscii("LOGF,");
     if(nValue & SQL_FN_NUM_LOG10)
-        aValue += ::rtl::OUString::createFromAscii("LOG10,");
+        aValue.appendAscii("LOG10,");
     if(nValue & SQL_FN_NUM_MOD)
-        aValue += ::rtl::OUString::createFromAscii("MOD,");
+        aValue.appendAscii("MOD,");
     if(nValue & SQL_FN_NUM_PI)
-        aValue += ::rtl::OUString::createFromAscii("PI,");
+        aValue.appendAscii("PI,");
     if(nValue & SQL_FN_NUM_POWER)
-        aValue += ::rtl::OUString::createFromAscii("POWER,");
+        aValue.appendAscii("POWER,");
     if(nValue & SQL_FN_NUM_RADIANS)
-        aValue += ::rtl::OUString::createFromAscii("RADIANS,");
+        aValue.appendAscii("RADIANS,");
     if(nValue & SQL_FN_NUM_RAND)
-        aValue += ::rtl::OUString::createFromAscii("RAND,");
+        aValue.appendAscii("RAND,");
     if(nValue & SQL_FN_NUM_ROUND)
-        aValue += ::rtl::OUString::createFromAscii("ROUND,");
+        aValue.appendAscii("ROUND,");
     if(nValue & SQL_FN_NUM_SIGN)
-        aValue += ::rtl::OUString::createFromAscii("SIGN,");
+        aValue.appendAscii("SIGN,");
     if(nValue & SQL_FN_NUM_SIN)
-        aValue += ::rtl::OUString::createFromAscii("SIN,");
+        aValue.appendAscii("SIN,");
     if(nValue & SQL_FN_NUM_SQRT)
-        aValue += ::rtl::OUString::createFromAscii("SQRT,");
+        aValue.appendAscii("SQRT,");
     if(nValue & SQL_FN_NUM_TAN)
-        aValue += ::rtl::OUString::createFromAscii("TAN,");
+        aValue.appendAscii("TAN,");
     if(nValue & SQL_FN_NUM_TRUNCATE)
-        aValue += ::rtl::OUString::createFromAscii("TRUNCATE,");
+        aValue.appendAscii("TRUNCATE,");
 
+    if ( aValue.getLength() )
+        aValue.setLength(aValue.getLength()-1);
 
-    return aValue.copy(0,aValue.lastIndexOf(','));
+    return aValue.makeStringAndClear();
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 2c8f37de5..773b9c029 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -112,7 +112,7 @@ void ODatabaseMetaDataResultSet::disposing(void)
         m_pConnection->freeStatementHandle(m_aStatementHandle);
 
     m_aStatement	= NULL;
-    m_xMetaData		= NULL;
+m_xMetaData.clear();
     m_pConnection->release();
 }
 // -------------------------------------------------------------------------
@@ -434,7 +434,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
     columnIndex = mapColumn(columnIndex);
     ::rtl::OUString aVal;
     if(columnIndex <= m_nDriverColumnCount)
-        aVal = OTools::getStringValue(m_pConnection,m_aStatementHandle,columnIndex,(SWORD)getMetaData()->getColumnType(columnIndex),m_bWasNull,**this,m_nTextEncoding);
+        aVal = OTools::getStringValue(m_pConnection,m_aStatementHandle,columnIndex,(SWORD)SQL_C_WCHAR,m_bWasNull,**this,m_nTextEncoding);
     else
         m_bWasNull = sal_True;
 
@@ -880,7 +880,8 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const ::rtl::OUS
     else
         pSchemaPat = NULL;
 
-    aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding);
+    if ( catalog.hasValue() )
+        aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding);
     aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding);
 
     const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
@@ -1179,8 +1180,10 @@ void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const ::rt
     m_bFreeHandle = sal_True;
 
     ::rtl::OString aPKQ,aPKO,aPKN, aFKQ, aFKO, aFKN;
-    aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding);
-    aFKQ = ::rtl::OUStringToOString(comphelper::getString(catalog2),m_nTextEncoding);
+    if ( catalog.hasValue() )
+        aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding);
+    if ( catalog2.hasValue() )
+        aFKQ = ::rtl::OUStringToOString(comphelper::getString(catalog2),m_nTextEncoding);
 
     const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
                 *pPKO = schema && schema->getLength() ? ::rtl::OUStringToOString(*schema,m_nTextEncoding).getStr() : NULL,
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index e42f9d731..9af4b7bc3 100644
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -65,9 +65,8 @@ using namespace com::sun::star::util;
 IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.OPreparedStatement","com.sun.star.sdbc.PreparedStatement");
 
 
-OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const TTypeInfoVector& _TypeInfo,const ::rtl::OUString& sql)
+OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql)
     :OStatement_BASE2(_pConnection)
-    ,m_aTypeInfo(_TypeInfo)
     ,numParams(0)
     ,boundParams(NULL)
     ,m_bPrepared(sal_False)    
@@ -80,12 +79,11 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const TTypeInf
             OSQLParser aParser(_pConnection->getDriver()->getORB());
             ::rtl::OUString sErrorMessage;
             ::rtl::OUString sNewSql;
-            OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,sql);
-            if(pNode)
+            ::std::auto_ptr<OSQLParseNode> pNode( aParser.parseTree(sErrorMessage,sql) );
+            if ( pNode.get() )
             {	// special handling for parameters
-                OSQLParseNode::substituteParameterNames(pNode);
+                OSQLParseNode::substituteParameterNames(pNode.get());
                 pNode->parseNodeToStr( sNewSql, _pConnection );
-                delete pNode;
                 m_sSqlStatement = sNewSql;
             }
         }
@@ -819,12 +817,18 @@ sal_Int32 OPreparedStatement::getPrecision ( sal_Int32 sqlType)
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
     sal_Int32 prec = -1;
-    if (m_aTypeInfo.size())
+    const TTypeInfoVector& rTypeInfo = m_pConnection->getTypeInfo();
+    if ( !rTypeInfo.empty() )
+    {
+        m_pConnection->buildTypeInfo();
+    }
+
+    if ( !rTypeInfo.empty() )
     {
         OTypeInfo aInfo;
         aInfo.nType = (sal_Int16)sqlType;
-        TTypeInfoVector::const_iterator aIter = ::std::find(m_aTypeInfo.begin(),m_aTypeInfo.end(),aInfo);
-        if(aIter != m_aTypeInfo.end())
+        TTypeInfoVector::const_iterator aIter = ::std::find(rTypeInfo.begin(),rTypeInfo.end(),aInfo);
+        if(aIter != rTypeInfo.end())
             prec = (*aIter).nPrecision;
     }
     return prec;
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 6e0c339c8..473a95423 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -188,8 +188,8 @@ void OResultSet::disposing(void)
     if(m_bFreeHandle)
         m_pStatement->getOwnConnection()->freeStatementHandle(m_aStatementHandle);
 
-    m_xStatement	= NULL;
-    m_xMetaData		= NULL;
+m_xStatement.clear();
+m_xMetaData.clear();
 }
 // -------------------------------------------------------------------------
 SQLRETURN OResultSet::unbind(sal_Bool _bUnbindHandle)
@@ -1491,7 +1491,7 @@ void OResultSet::fillRow(sal_Int32 _nToColumn)
 
     for (; pColumn < pColumnEnd; ++nColumn, ++pColumn)
     {
-        sal_Int32 nType = pColumn->getTypeKind();
+        const sal_Int32 nType = pColumn->getTypeKind();
         switch (nType)
         {
             case DataType::CHAR:
diff --git a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
index 2296ab1cb..7eadf9058 100644
--- a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
@@ -134,32 +134,38 @@ SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
     {
         nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE );
     }
+
     return nType;
 }
 // -----------------------------------------------------------------------------
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nType = 0;
-    if(!m_bUseODBC2Types)
+    ::std::map<sal_Int32,sal_Int32>::iterator aFind = m_aColumnTypes.find(column);
+    if ( aFind == m_aColumnTypes.end() )
     {
-        try
+        sal_Int32 nType = 0;
+        if(!m_bUseODBC2Types)
         {
-            nType = getNumColAttrib(column,SQL_DESC_CONCISE_TYPE);
-            if(nType == SQL_UNKNOWN_TYPE)
-                nType = getNumColAttrib(column, SQL_DESC_TYPE);
-            nType = OTools::MapOdbcType2Jdbc(nType);
+            try
+            {
+                nType = getNumColAttrib(column,SQL_DESC_CONCISE_TYPE);
+                if(nType == SQL_UNKNOWN_TYPE)
+                    nType = getNumColAttrib(column, SQL_DESC_TYPE);
+                nType = OTools::MapOdbcType2Jdbc(nType);
+            }
+            catch(SQLException& ) // in this case we have an odbc 2.0 driver
+            {
+                m_bUseODBC2Types = sal_True;
+                nType = OTools::MapOdbcType2Jdbc(getNumColAttrib(column,SQL_DESC_CONCISE_TYPE ));
+            }
         }
-        catch(SQLException& ) // in this case we have an odbc 2.0 driver
-        {
-            m_bUseODBC2Types = sal_True;
+        else
             nType = OTools::MapOdbcType2Jdbc(getNumColAttrib(column,SQL_DESC_CONCISE_TYPE ));
-        }
+        aFind = m_aColumnTypes.insert(::std::map<sal_Int32,sal_Int32>::value_type(column,nType)).first;
     }
-    else
-        nType = OTools::MapOdbcType2Jdbc(getNumColAttrib(column,SQL_DESC_CONCISE_TYPE ));
 
 
-    return nType;
+    return aFind->second;
 }
 // -------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 61e28ad9a..501198880 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -94,7 +94,17 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
     osl_incrementInterlockedCount( &m_refCount );
     m_pConnection->acquire();
     m_aStatementHandle = m_pConnection->createStatementHandle();
-    setMaxFieldSize(0);
+
+    //setMaxFieldSize(0);
+    // Don't do this. By ODBC spec, "0" is the default for the SQL_ATTR_MAX_LENGTH attribute. We once introduced
+    // this line since an PostgreSQL ODBC driver had a default other than 0. However, current drivers (at least 8.3
+    // and later) have a proper default of 0, so there should be no need anymore.
+    // On the other hand, the NotesSQL driver (IBM's ODBC driver for the Lotus Notes series) wrongly interprets
+    // "0" as "0", whereas the ODBC spec says it should in fact mean "unlimited".
+    // So, removing this line seems to be the best option for now.
+    // If we ever again encounter a ODBC driver which needs this option, then we should introduce a data source
+    // setting for it, instead of unconditionally doing it.
+
     osl_decrementInterlockedCount( &m_refCount );
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index 1f447772e..ef2f572cb 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -571,9 +571,12 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
                 return ::rtl::OUString();
             // Bei Fehler bricht der GETDATA-Makro mit return ab,
             // bei NULL mit break!
-			SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
+            SQLLEN nRealSize = 0;
+            if ( pcbValue > -1 )
+                nRealSize = pcbValue / sizeof(sal_Unicode);
+            SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(nRealSize, nMaxLen) : (nMaxLen-1);
             waCharArray[nLen] = 0;
-            aData = ::rtl::OUString(waCharArray);
+            aData.append(waCharArray,nLen);
 
             // Es handelt sich um Binaerdaten, um einen String, der fuer
             // StarView zu lang ist oder der Treiber kann die Laenge der
@@ -598,7 +601,10 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
 												(SQLLEN)nLen+1,
                                                 &pcbValue),
                                     _aStatementHandle,SQL_HANDLE_STMT,_xInterface);
-                nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
+                nRealSize = 0;
+                if ( pcbValue > -1 )
+                    nRealSize = pcbValue / sizeof(sal_Unicode);
+                nLen = pcbValue != SQL_NO_TOTAL ? std::min(nRealSize, nMaxLen) : (nMaxLen-1);
                 waCharArray[nLen] = 0;
 
                 aData.append(::rtl::OUString(waCharArray));
@@ -628,7 +634,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
             aCharArray[nLen] = 0;
             if ( ((pcbValue == SQL_NO_TOTAL) || pcbValue > nMaxLen) && aCharArray[nLen-1] == 0 && nLen > 0 )
                 --nLen;
-            aData = ::rtl::OUString((const sal_Char*)aCharArray,nLen, _nTextEncoding);
+            aData.append(::rtl::OUString((const sal_Char*)aCharArray,nLen, _nTextEncoding));
 
             // Es handelt sich um Binaerdaten, um einen String, der fuer
             // StarView zu lang ist oder der Treiber kann die Laenge der
diff --git a/connectivity/source/inc/OSubComponent.hxx b/connectivity/source/inc/OSubComponent.hxx
index 642138dbc..dd6150f4e 100644
--- a/connectivity/source/inc/OSubComponent.hxx
+++ b/connectivity/source/inc/OSubComponent.hxx
@@ -78,7 +78,7 @@ namespace connectivity
         {
             // avoid ambiguity
             ::osl::MutexGuard aGuard( m_pDerivedImplementation->WEAK::rBHelper.rMutex );
-            m_xParent = NULL;
+        m_xParent.clear();
         }
         void relase_ChildImpl()
         {
diff --git a/connectivity/source/inc/adabas/BPreparedStatement.hxx b/connectivity/source/inc/adabas/BPreparedStatement.hxx
index 9ec400f67..a9a863eed 100644
--- a/connectivity/source/inc/adabas/BPreparedStatement.hxx
+++ b/connectivity/source/inc/adabas/BPreparedStatement.hxx
@@ -46,7 +46,7 @@ namespace connectivity
             virtual void setResultSetType(sal_Int32 _par0)			;
             virtual void setUsingBookmarks(sal_Bool _bUseBookmark)	;
         public:
-            OAdabasPreparedStatement( OAdabasConnection* _pConnection,const ::std::vector<OTypeInfo>& _TypeInfo,const ::rtl::OUString& sql);
+            OAdabasPreparedStatement( OAdabasConnection* _pConnection,const ::rtl::OUString& sql);
         };
     }
 }
diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx
index effca09eb..a6e2d71ed 100644
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
@@ -87,7 +87,7 @@ namespace connectivity
                 }
                 ~ODocHolder()
                 {
-                    m_xDoc = NULL;
+                   m_xDoc.clear();
                     m_pConnection->releaseDoc();
                 }
                 ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument> getDoc() const { return m_xDoc; }
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 49db42786..1b0339a74 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -89,12 +89,11 @@ namespace connectivity
             sal_Bool		m_bParameterSubstitution;
             sal_Bool		m_bIgnoreDriverPrivileges;
             sal_Bool        m_bPreventGetVersionColumns;    // #i60273#
+            sal_Bool        m_bReadOnly;
 
 
             SQLRETURN		OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent);
 
-            void            buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException);
-
             virtual OConnection*	cloneConnection(); // creates a new connection
             
         public:
@@ -154,6 +153,9 @@ namespace connectivity
             SQLHANDLE		createStatementHandle();
             // close and free the handle and set it to SQL_NULLHANDLE
             void			freeStatementHandle(SQLHANDLE& _pHandle);
+
+            void                    buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException);
+            const TTypeInfoVector&	getTypeInfo() const { return m_aTypeInfo; }
         };
     }
 }
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 2f0874a7c..5078eb3ac 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -76,6 +76,7 @@ namespace connectivity
             ::std::map<sal_Int32, ::connectivity::TString2IntMap >				m_aStrValueRange;
 
             ::std::map<sal_Int32, ::connectivity::TInt2StringMap >				m_aIntValueRange;
+            ::std::map<sal_Int32,SWORD>					                        m_aODBCColumnTypes;
 
             SQLHANDLE																	m_aStatementHandle;
             SQLHANDLE																	m_aConnectionHandle;
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 28b601f8d..dfd2a6283 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -73,10 +73,6 @@ namespace connectivity
             //====================================================================
             // Data attributes
             //====================================================================
-            TTypeInfoVector					m_aTypeInfo;	// Hashtable containing an entry
-                                                                        //  for each row returned by
-                                                                        //  DatabaseMetaData.getTypeInfo.
-
             SQLSMALLINT 	numParams;		// Number of parameter markers
                                             //  for the prepared statement
 
@@ -119,7 +115,7 @@ namespace connectivity
         public:
             DECLARE_SERVICE_INFO();
             // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
-            OPreparedStatement( OConnection* _pConnection,const TTypeInfoVector& _TypeInfo,const ::rtl::OUString& sql);
+            OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql);
 
             //XInterface
             virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 37f6b200a..7b936a3de 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -54,6 +54,7 @@ namespace connectivity
         {
         protected:
             ::std::vector<sal_Int32> m_vMapping; // when not every column is needed
+            ::std::map<sal_Int32,sal_Int32> m_aColumnTypes;
 
             SQLHANDLE		m_aStatementHandle;
             OConnection*	m_pConnection;
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index be1ee39d9..97875dfd4 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -3473,30 +3473,6 @@ OSQLParseNode* OSQLParser::parseTree(::rtl::OUString& rErrorMessage,
 }
 
 //-----------------------------------------------------------------------------
-/*sal_uInt32 OSQLParser::StrToTokenID(const ::rtl::OString & rName)
-{
-	::rtl::OString aName;
-	if (rName.IsAlphaNumericAscii())
-		aName = rName;
-	else
-	{
-		aName = "'";
-		aName += rName;
-		aName += "'";
-	}
-
-	// Gewuenschten Token-Namen suchen:
-	for (sal_uInt32 i = 0; i < SQLyyntoken; i++)
-	{
-		if (aName == TokenTypes[i].name)
-			return TokenTypes[i].token;
-	}
-
-	// Nicht gefunden
-	return 0;
-}*/
-
-//-----------------------------------------------------------------------------
 ::rtl::OUString OSQLParser::RuleIDToStr(sal_uInt32 nRuleID)
 {
 	OSL_ENSURE(nRuleID < (sizeof yytname/sizeof yytname[0]), "OSQLParser::RuleIDToStr: Invalid nRuleId!");
@@ -3599,17 +3575,15 @@ void OSQLParser::reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank)
 	OSL_ENSURE(pLiteral->isRule(), "This is no ::com::sun::star::chaos::Rule");
 	OSL_ENSURE(pLiteral->count() == 2, "OSQLParser::ReduceLiteral() Invalid count");
 	OSQLParseNode* pTemp = pLiteral;
-	::rtl::OUString aValue;
+	::rtl::OUStringBuffer aValue(pLiteral->getChild(0)->getTokenValue());
 	if (bAppendBlank)
 	{
-		((aValue = pLiteral->getChild(0)->getTokenValue()) += ::rtl::OUString::createFromAscii(" ")) +=
-					pLiteral->getChild(1)->getTokenValue();
+		aValue.appendAscii(" ");
 	}
-	else
-		(aValue = pLiteral->getChild(0)->getTokenValue()) +=
-					pLiteral->getChild(1)->getTokenValue();
+	
+	aValue.append(pLiteral->getChild(1)->getTokenValue());
 
-	pLiteral = new OSQLInternalNode(aValue,SQL_NODE_STRING);
+	pLiteral = new OSQLInternalNode(aValue.makeStringAndClear(),SQL_NODE_STRING);
 	delete pTemp;
 }
 
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 10a71b501..c92fc9b70 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -460,7 +460,7 @@ void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQ
     ::rtl::OUString aTableRange(rTableRange);
 
     // Tabellenname abholen
-    OSQLParseNode::getTableComponents(pTableName,aCatalog,aSchema,aTableName);
+    OSQLParseNode::getTableComponents(pTableName,aCatalog,aSchema,aTableName,m_pImpl->m_xDatabaseMetaData);
     
     // create the composed name like DOMAIN.USER.TABLE1
     aComposedName = ::dbtools::composeTableName(m_pImpl->m_xDatabaseMetaData,
@@ -1687,13 +1687,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu
         OSL_ENSURE(_rColumns == m_aSelectColumns,"Invalid columns used here!");
         ConstOSQLTablesIterator aFind = m_pImpl->m_pTables->find(rTableRange);
 
-        if(aFind == m_pImpl->m_pTables->end())
-        {
-            ::rtl::OUString strExpression = rTableRange;
-            strExpression += ::rtl::OUString::createFromAscii(".");
-            strExpression += rColumnName;
-        }
-        else
+        if(aFind != m_pImpl->m_pTables->end())
             appendColumns(_rColumns,rTableRange,aFind->second);
     }
     else if ( !rTableRange.getLength() )
@@ -1813,11 +1807,6 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu
         // Tabelle existiert nicht oder Feld nicht vorhanden
         if (bError)
         {
-            ::rtl::OUString strExpression = rTableRange;
-            if (strExpression.getLength())
-                strExpression += ::rtl::OUString::createFromAscii(".");
-            strExpression += rColumnName;
-
             ::rtl::OUString aNewColName(getUniqueColumnName(rColumnAlias));
 
             OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(),
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 7ca6c9202..b4da3ba02 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -742,12 +742,15 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rSt
 sal_Bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode,
                                             ::com::sun::star::uno::Any &_rCatalog,
                                             ::rtl::OUString &_rSchema,
-                                            ::rtl::OUString &_rTable)
+                                            ::rtl::OUString &_rTable,
+                                            const Reference< XDatabaseMetaData >& _xMetaData)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::getTableComponents" );
     OSL_ENSURE(_pTableNode,"Wrong use of getTableComponents! _pTableNode is not allowed to be null!");
     if(_pTableNode)
     {
+        const sal_Bool bSupportsCatalog = _xMetaData.is() && _xMetaData->supportsCatalogsInDataManipulation();
+        const sal_Bool bSupportsSchema = _xMetaData.is() && _xMetaData->supportsSchemasInDataManipulation();
         const OSQLParseNode* pTableNode = _pTableNode;
         // clear the parameter given
         _rCatalog = Any();
@@ -762,7 +765,10 @@ sal_Bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode,
         // check if we have schema_name rule
         if(SQL_ISRULE(pTableNode,schema_name))
         {
-            _rSchema = pTableNode->getChild(0)->getTokenValue();
+            if ( bSupportsCatalog && !bSupportsSchema )
+                _rCatalog <<= pTableNode->getChild(0)->getTokenValue();
+            else
+                _rSchema = pTableNode->getChild(0)->getTokenValue();
             pTableNode = pTableNode->getChild(2);
         }
         // check if we have table_name rule
@@ -1246,8 +1252,8 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const :
     if (SQLyyparse() != 0)
     {
         m_sFieldName= ::rtl::OUString();
-        m_xField = NULL;
-        m_xFormatter = NULL;
+    m_xField.clear();
+    m_xFormatter.clear();
         m_nFormatKey = 0;
         m_nDateFormatKey = 0;
 
@@ -1267,8 +1273,8 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const :
         (*s_pGarbageCollector)->clear();
 
         m_sFieldName= ::rtl::OUString();
-        m_xField = NULL;
-        m_xFormatter = NULL;
+    m_xField.clear();
+    m_xFormatter.clear();
         m_nFormatKey = 0;
         m_nDateFormatKey = 0;
 
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index 3ee6bcb98..5e33c7e4c 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -226,7 +226,7 @@ void OCatalog::fillNames(Reference< XResultSet >& _xResult,TStringVector& _rName
         {
             _rNames.push_back( buildName(xRow) );
         }
-        xRow = NULL;
+        xRow.clear();
         ::comphelper::disposeComponent(_xResult);
     }
 }
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index 12bce92c8..f610be3e6 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -215,10 +215,9 @@ Reference< XIndexAccess > SAL_CALL OTable::getKeys(  ) throw(RuntimeException)
 
     try
     {
-        refreshKeys();
+        if ( !m_pKeys )
+            refreshKeys();
         xKeys = m_pKeys;
-        if(!isNew())
-            m_pKeys = NULL;
     }
     catch( const RuntimeException& )
     {
@@ -283,8 +282,8 @@ void SAL_CALL OTable::rename( const ::rtl::OUString& newName ) throw(SQLExceptio
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
 
-    ::rtl::OUString sOldComposedName = getName();
-    Reference< XDatabaseMetaData> xMetaData = getMetaData();
+    const ::rtl::OUString sOldComposedName = getName();
+    const Reference< XDatabaseMetaData> xMetaData = getMetaData();
     if ( xMetaData.is() )
         ::dbtools::qualifiedNameComponents(xMetaData,newName,m_CatalogName,m_SchemaName,m_Name,::dbtools::eInDataManipulation);
     else
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index ebf0b5db4..8f221b1c7 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -53,7 +53,7 @@ OView::OView(sal_Bool _bCase,
             sal_Int32 _CheckOption,
             const ::rtl::OUString& _Command,
             const ::rtl::OUString& _SchemaName,
-            const ::rtl::OUString& _CatalogName) : ODescriptor(OViewHelper::rBHelper,_bCase)
+            const ::rtl::OUString& _CatalogName) : ODescriptor(::comphelper::OMutexAndBroadcastHelper::m_aBHelper,_bCase)
             ,m_CatalogName(_CatalogName)
             ,m_SchemaName(_SchemaName)
             ,m_Command(_Command)
@@ -66,7 +66,7 @@ OView::OView(sal_Bool _bCase,
 }
 // -------------------------------------------------------------------------
 OView::OView(sal_Bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData)
-    : ODescriptor(OViewHelper::rBHelper,_bCase,sal_True)
+    : ODescriptor(::comphelper::OMutexAndBroadcastHelper::m_aBHelper,_bCase,sal_True)
     ,m_xMetaData(_xMetaData)
 {
     construct();
@@ -97,17 +97,12 @@ void OView::disposing(void)
 // -------------------------------------------------------------------------
 Sequence< Type > SAL_CALL OView::getTypes(  ) throw(RuntimeException)
 {
-    Sequence< Type > aTypes(2);
-    aTypes.getArray()[0] = ::getCppuType(static_cast< Reference< ::com::sun::star::container::XNamed> *> (NULL));
-    aTypes.getArray()[1] = ::getCppuType(static_cast< Reference< XServiceInfo> *> (NULL));
-
-    return ::comphelper::concatSequences(ODescriptor::getTypes(),aTypes);
+    return ::comphelper::concatSequences(ODescriptor::getTypes(),OView_BASE::getTypes());
 }
 // -------------------------------------------------------------------------
 Any SAL_CALL OView::queryInterface( const Type & rType ) throw(RuntimeException)
 {
-    Any aRet = ::cppu::queryInterface(rType,static_cast< ::com::sun::star::container::XNamed*> (this),
-                    static_cast< XServiceInfo*> (this));
+    Any aRet = OView_BASE::queryInterface( rType);
     return aRet.hasValue() ? aRet : ODescriptor::queryInterface( rType);
 }
 // -------------------------------------------------------------------------
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index a35dbefd3..3194009fc 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -12,6 +12,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <vcl/canvastools.hxx>
+#include <rtl/ustring.hxx>
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/TexturingMode.hpp>
@@ -21,6 +22,7 @@
 #include <implrenderer.hxx>
 #include <outdevstate.hxx>
 #include <polypolyaction.hxx>
+#include <textaction.hxx>
 
 #define EmfPlusRecordTypeHeader 16385
 #define EmfPlusRecordTypeEndOfFile 16386
@@ -700,6 +702,39 @@ namespace cppcanvas
             }
         };
 
+        struct EMFPFont : public EMFPObject
+        {
+            sal_uInt32 version;
+	    float emSize;
+	    sal_uInt32 sizeUnit;
+	    sal_Int32 fontFlags;
+	    rtl::OUString family;
+
+            void Read (SvMemoryStream &s)
+            {
+                sal_uInt32 header;
+		sal_uInt32 reserved;
+		sal_uInt32 length;
+
+                s >> header >> emSize >> sizeUnit >> fontFlags >> reserved >> length;
+
+		OSL_ASSERT( ( header >> 12 ) == 0xdbc01 );
+
+                EMFP_DEBUG (printf ("EMF+\tfont\nEMF+\theader: 0x%08x version: 0x%08x size: %f unit: 0x%08x\n", header >> 12, header & 0x1fff, emSize, sizeUnit));
+                EMFP_DEBUG (printf ("EMF+\tflags: 0x%08x reserved: 0x%08x length: 0x%08x\n", fontFlags, reserved, length));
+
+		if( length > 0 && length < 0x4000 ) {
+		    sal_Unicode chars[ length ];
+
+		    for( int i = 0; i < length; i++ )
+			s >> chars[ i ];
+
+		    family = ::rtl::OUString( chars, length );
+		    EMFP_DEBUG (printf ("EMF+\tfamily: %s\n", rtl::OUStringToOString( family, RTL_TEXTENCODING_UTF8).getStr()));
+		}
+            }
+        };
+
         void ImplRenderer::ReadRectangle (SvStream& s, float& x, float& y, float &width, float& height, sal_uInt32 flags)
         {
             if (flags & 0x4000) {
@@ -796,10 +831,22 @@ namespace cppcanvas
             return ::basegfx::B2DRange (x, y, x + w, y + h);
         }
 
+#define COLOR(x) \
+	::vcl::unotools::colorToDoubleSequence( ::Color (0xff - (x >> 24), \
+							 (x >> 16) & 0xff, \
+							 (x >> 8) & 0xff, \
+							 x & 0xff),	\
+						rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
+#define SET_FILL_COLOR(x) \
+	rState.fillColor = COLOR(x);
+#define SET_LINE_COLOR(x) \
+	rState.lineColor = COLOR(x);
+#define SET_TEXT_COLOR(x) \
+	rState.textColor = COLOR(x);
+
         void ImplRenderer::EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms,
                                                 OutDevState& rState, const CanvasSharedPtr& rCanvas, bool isColor, sal_uInt32 brushIndexOrColor)
         {
-            sal_uInt8 transparency;
             ::basegfx::B2DPolyPolygon localPolygon (polygon);
 
             EMFP_DEBUG (printf ("EMF+\tfill polygon\n"));
@@ -811,15 +858,9 @@ namespace cppcanvas
             if (isColor) {
                 EMFP_DEBUG (printf ("EMF+\t\tcolor fill\n"));
 
-                transparency = 0xff - (brushIndexOrColor >> 24);
-
                 rState.isFillColorSet = true;
                 rState.isLineColorSet = false;
-                rState.fillColor = ::vcl::unotools::colorToDoubleSequence( ::Color (transparency,
-                                                                                    (brushIndexOrColor >> 16) & 0xff,
-                                                                                    (brushIndexOrColor >> 8) & 0xff,
-                                                                                    brushIndexOrColor & 0xff),
- 																			rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
+		SET_FILL_COLOR(brushIndexOrColor);
 
                 pPolyAction = ActionSharedPtr ( internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon, rParms.mrCanvas, rState ) );
 
@@ -1053,6 +1094,14 @@ namespace cppcanvas
 
                     break;
                 }
+            case EmfPlusObjectTypeFont:
+                {
+                    EMFPFont *font;
+                    aObjects [index] = font = new EMFPFont ();
+                    font->Read (rObjectStream);
+
+                    break;
+                }
             default:
                 EMFP_DEBUG (printf ("EMF+\tObject unhandled flags: 0x%04x\n", flags & 0xff00));
                 break;
@@ -1411,10 +1460,89 @@ namespace cppcanvas
                         EMFP_DEBUG (printf ("EMF+\tTODO\n"));
                     break;
                 }
-                case EmfPlusRecordTypeDrawDriverString:
+	        case EmfPlusRecordTypeDrawDriverString: {
                     EMFP_DEBUG (printf ("EMF+ DrawDriverString, flags: 0x%04x\n", flags));
-                    EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+		    sal_uInt32 brushIndexOrColor;
+		    sal_uInt32 optionFlags;
+		    sal_uInt32 hasMatrix;
+		    sal_uInt32 glyphsCount;
+
+		    rMF >> brushIndexOrColor >> optionFlags >> hasMatrix >> glyphsCount;
+
+		    EMFP_DEBUG (printf ("EMF+\t%s: 0x%08x\n", (flags & 0x8000) ? "color" : "brush index", brushIndexOrColor));
+		    EMFP_DEBUG (printf ("EMF+\toption flags: 0x%08x\n", optionFlags));
+		    EMFP_DEBUG (printf ("EMF+\thas matrix: %d\n", hasMatrix));
+		    EMFP_DEBUG (printf ("EMF+\tglyphs: %d\n", glyphsCount));
+
+		    if( ( optionFlags & 1 ) && glyphsCount > 0 ) {
+			sal_uInt16 chars[ glyphsCount ];
+			float charsPosX[ glyphsCount ];
+			float charsPosY[ glyphsCount ];
+
+			for( int i=0; i<glyphsCount; i++) {
+			    rMF >> chars[i];
+			    EMFP_DEBUG (printf ("EMF+\tglyph[%d]: 0x%04x\n",
+			    i, chars[i]));
+			}
+			for( int i=0; i<glyphsCount; i++) {
+			    rMF >> charsPosX[i] >> charsPosY[i];
+			    EMFP_DEBUG (printf ("EMF+\tglyphPosition[%d]: %f, %f\n", i, charsPosX[i], charsPosY[i]));
+			}
+
+			XForm transform;
+			if( hasMatrix ) {
+			    rMF >> transform;
+			    EMFP_DEBUG (printf ("EMF+\tmatrix:: %f, %f, %f, %f, %f, %f\n", transform.eM11, transform.eM12, transform.eM21, transform.eM22, transform.eDx, transform.eDy));
+			}
+
+			// create and add the text action
+			XubString text( chars, glyphsCount );
+
+                        EMFPFont *font = (EMFPFont*) aObjects[ flags & 0xff ];
+
+			rendering::FontRequest aFontRequest;
+			aFontRequest.FontDescription.FamilyName = font->family;
+			aFontRequest.CellSize = (rState.mapModeTransform*MapSize( font->emSize, 0 )).getX();
+			rState.xFont = rFactoryParms.mrCanvas->getUNOCanvas()->createFont( aFontRequest,
+											   uno::Sequence< beans::PropertyValue >(),
+											   geometry::Matrix2D() );
+			if( flags & 0x8000 )
+ 			    SET_TEXT_COLOR(brushIndexOrColor);
+
+			ActionSharedPtr pTextAction( 
+			    TextActionFactory::createTextAction(
+				::vcl::unotools::pointFromB2DPoint ( Map( charsPosX[0], charsPosY[0] ) ),
+				::Size(),
+				::Color(),
+				::Size(),
+				::Color(),
+				text,
+				0,
+				glyphsCount,
+				NULL,
+				rFactoryParms.mrVDev,
+				rFactoryParms.mrCanvas,
+				rState,
+				rFactoryParms.mrParms,
+				false ) );
+
+			if( pTextAction )
+			{
+			    EMFP_DEBUG (printf ("EMF+\t\tadd text action\n"));
+
+			    maActions.push_back(
+				MtfAction(
+				    pTextAction,
+				    rFactoryParms.mrCurrActionIndex ) );
+                
+			    rFactoryParms.mrCurrActionIndex += pTextAction->getActionCount()-1;
+			}
+		    } else {
+			EMFP_DEBUG (printf ("EMF+\tTODO: fonts (non-unicode glyphs chars)\n"));
+		    }
+
                     break;
+		}
                 default:
                     EMFP_DEBUG (printf ("EMF+ unhandled record type: %d\n", type));
                     EMFP_DEBUG (printf ("EMF+\tTODO\n"));
diff --git a/dbaccess/qa/complex/dbaccess/makefile.mk b/dbaccess/qa/complex/dbaccess/makefile.mk
index 0d86e5333..063116936 100755
--- a/dbaccess/qa/complex/dbaccess/makefile.mk
+++ b/dbaccess/qa/complex/dbaccess/makefile.mk
@@ -61,6 +61,8 @@ JARCOMPRESS 	= TRUE
 
 RUNNER_ARGS = -cp "$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar" org.openoffice.Runner -TestBase java_complex 
 
+RUNNER_CALL = $(AUGMENT_LIBRARY_PATH) java
+
 # --- Targets ------------------------------------------------------
 
 .IF "$(depend)" == ""
@@ -73,10 +75,10 @@ ALL: 	ALLDEP
 
 
 run: $(CLASSDIR)$/$(JARTARGET)
-    +java $(RUNNER_ARGS) -sce dbaccess.sce
+    +$(RUNNER_CALL) $(RUNNER_ARGS) -sce dbaccess.sce
 
 run_%: $(CLASSDIR)$/$(JARTARGET)
-    +java $(RUNNER_ARGS) -o complex.dbaccess.$(@:s/run_//)
+    +$(RUNNER_CALL) $(RUNNER_ARGS) -o complex.dbaccess.$(@:s/run_//)
 
 .ELSE
 .INCLUDE :  target.mk
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 574bd1778..d62ee8d8b 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -344,7 +344,7 @@ void OSingleSelectQueryComposer::setQuery_Impl( const ::rtl::OUString& command )
     // update columns and tables
     // why? Shouldn't this be done on request only?
     // otherwise nothing is working anymore :-)
-    getColumns();
+//	getColumns();
     getTables();
 }
 // -----------------------------------------------------------------------------
@@ -380,6 +380,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference<
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
+    getColumns();
     if ( !column.is()
         || !m_aCurrentColumns[SelectColumns]
         || !column->getPropertySetInfo()->hasPropertyByName(PROPERTY_NAME)
@@ -734,7 +735,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  ) thr
 
         if ( aSelectColumns->get().empty() )
         {
-            // This is a valid casse. If we can syntactically parse the query, but not semantically
+            // This is a valid case. If we can syntactically parse the query, but not semantically
             // (e.g. because it is based on a table we do not know), then there will be no SelectColumns
             aSelectColumns = ::connectivity::parse::OParseColumn::createColumnsForResultSet( xResultSetMeta, m_xMetaData );
             break;
@@ -1476,7 +1477,8 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
     column->getPropertyValue(PROPERTY_VALUE) >>= aValue;
 
     ::rtl::OUStringBuffer aSQL;
-    ::rtl::OUString aQuote	= m_xMetaData->getIdentifierQuoteString();
+    const ::rtl::OUString aQuote	= m_xMetaData->getIdentifierQuoteString();
+    getColumns();
 
     if ( m_aCurrentColumns[SelectColumns] && m_aCurrentColumns[SelectColumns]->hasByName(aName) )
     {
diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx
index 671951b69..b49d92867 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -237,64 +237,84 @@ void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
                 break;
             case PROPERTY_ID_ISSIGNED:
             {
-                sal_Bool bVal = m_xMetaData->isSigned(m_nPos);
-                rValue.setValue(&bVal, getBooleanCppuType());
+                if ( !m_isSigned )
+                    m_isSigned.reset( m_xMetaData->isSigned(m_nPos));
+                rValue <<= *m_isSigned;
             }	break;
             case PROPERTY_ID_ISCURRENCY:
             {
-                sal_Bool bVal = m_xMetaData->isCurrency(m_nPos);
-                rValue.setValue(&bVal, getBooleanCppuType());
+                if ( !m_isCurrency )
+                    m_isCurrency.reset( m_xMetaData->isCurrency(m_nPos));
+                rValue <<= *m_isCurrency;
             }	break;
             case PROPERTY_ID_ISSEARCHABLE:
             {
-                sal_Bool bVal = m_xMetaData->isSearchable(m_nPos);
-                rValue.setValue(&bVal, getBooleanCppuType());
+                if ( !m_bSearchable )
+                    m_bSearchable.reset( m_xMetaData->isSearchable(m_nPos));
+                rValue <<= *m_bSearchable;
             }	break;
             case PROPERTY_ID_ISCASESENSITIVE:
             {
-                sal_Bool bVal = m_xMetaData->isCaseSensitive(m_nPos);
-                rValue.setValue(&bVal, getBooleanCppuType());
+                if ( !m_isCaseSensitive )
+                    m_isCaseSensitive.reset( m_xMetaData->isCaseSensitive(m_nPos));
+                rValue <<= *m_isCaseSensitive;
             }	break;
             case PROPERTY_ID_ISREADONLY:
             {
-                sal_Bool bVal = m_xMetaData->isReadOnly(m_nPos);
-                rValue.setValue(&bVal, getBooleanCppuType());
+                if ( !m_isReadOnly )
+                    m_isReadOnly.reset( m_xMetaData->isReadOnly(m_nPos));
+                rValue <<= *m_isReadOnly;
             }	break;
             case PROPERTY_ID_ISWRITABLE:
             {
-                sal_Bool bVal = m_xMetaData->isWritable(m_nPos);
-                rValue.setValue(&bVal, getBooleanCppuType());
+                if ( !m_isWritable )
+                    m_isWritable.reset( m_xMetaData->isWritable(m_nPos));
+                rValue <<= *m_isWritable;
             }	break;
             case PROPERTY_ID_ISDEFINITELYWRITABLE:
             {
-                sal_Bool bVal = m_xMetaData->isDefinitelyWritable(m_nPos);
-                rValue.setValue(&bVal, getBooleanCppuType());
+                if ( !m_isDefinitelyWritable )
+                    m_isDefinitelyWritable.reset( m_xMetaData->isDefinitelyWritable(m_nPos));
+                rValue <<= *m_isDefinitelyWritable;
             }	break;
             case PROPERTY_ID_ISAUTOINCREMENT:
             {
-                sal_Bool bVal = m_xMetaData->isAutoIncrement(m_nPos);
-                rValue.setValue(&bVal, getBooleanCppuType());
+                if ( !m_isAutoIncrement )
+                    m_isAutoIncrement.reset( m_xMetaData->isAutoIncrement(m_nPos));
+                rValue <<= *m_isAutoIncrement;
             }	break;
             case PROPERTY_ID_SERVICENAME:
                 rValue <<= m_xMetaData->getColumnServiceName(m_nPos);
                 break;
             case PROPERTY_ID_LABEL:
-                rValue <<= m_xMetaData->getColumnLabel(m_nPos);
+                if ( !m_sColumnLabel )
+                    m_sColumnLabel.reset( m_xMetaData->getColumnLabel(m_nPos));
+                rValue <<= *m_sColumnLabel;
                 break;
             case PROPERTY_ID_DISPLAYSIZE:
-                rValue <<= m_xMetaData->getColumnDisplaySize(m_nPos);
+                if ( !m_nColumnDisplaySize )
+                    m_nColumnDisplaySize.reset( m_xMetaData->getColumnDisplaySize(m_nPos));
+                rValue <<= *m_nColumnDisplaySize;
                 break;
             case PROPERTY_ID_TYPE:
-                rValue <<= m_xMetaData->getColumnType(m_nPos);
+                if ( !m_nColumnType )
+                    m_nColumnType.reset( m_xMetaData->getColumnType(m_nPos));
+                rValue <<= *m_nColumnType;
                 break;
             case PROPERTY_ID_PRECISION:
-                rValue <<= m_xMetaData->getPrecision(m_nPos);
+                if ( !m_nPrecision )
+                    m_nPrecision.reset( m_xMetaData->getPrecision(m_nPos));
+                rValue <<= *m_nPrecision;
                 break;
             case PROPERTY_ID_SCALE:
-                rValue <<= m_xMetaData->getScale(m_nPos);
+                if ( !m_nScale )
+                    m_nScale.reset( m_xMetaData->getScale(m_nPos));
+                rValue <<= *m_nScale;
                 break;
             case PROPERTY_ID_ISNULLABLE:
-                rValue <<= m_xMetaData->isNullable(m_nPos);
+                if ( !m_isNullable )
+                    m_isNullable.reset( m_xMetaData->isNullable(m_nPos));
+                rValue <<= *m_isNullable;
                 break;
             case PROPERTY_ID_TYPENAME:
                 rValue <<= m_xMetaData->getColumnTypeName(m_nPos);
diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx
index c74addc7c..abbe8c78d 100644
--- a/dbaccess/source/core/api/resultcolumn.hxx
+++ b/dbaccess/source/core/api/resultcolumn.hxx
@@ -37,6 +37,7 @@
 #ifndef _DBA_COREAPI_COLUMN_HXX_
 #include <column.hxx>
 #endif
+#include <boost/optional.hpp>
 namespace dbaccess
 {
     //************************************************************
@@ -50,6 +51,20 @@ namespace dbaccess
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >   m_xDBMetaData;
         sal_Int32				    m_nPos;
         ::com::sun::star::uno::Any  m_aIsRowVersion;
+        mutable ::boost::optional< sal_Bool > m_isSigned;
+        mutable ::boost::optional< sal_Bool > m_isCurrency;
+        mutable ::boost::optional< sal_Bool > m_bSearchable;
+        mutable ::boost::optional< sal_Bool > m_isCaseSensitive;
+        mutable ::boost::optional< sal_Bool > m_isReadOnly;
+        mutable ::boost::optional< sal_Bool > m_isWritable;
+        mutable ::boost::optional< sal_Bool > m_isDefinitelyWritable;
+        mutable ::boost::optional< sal_Bool > m_isAutoIncrement;
+        mutable ::boost::optional< sal_Int32 > m_isNullable;
+        mutable ::boost::optional< ::rtl::OUString > m_sColumnLabel;
+        mutable ::boost::optional< sal_Int32 > m_nColumnDisplaySize;
+        mutable ::boost::optional< sal_Int32 > m_nColumnType;
+        mutable ::boost::optional< sal_Int32 > m_nPrecision;
+        mutable ::boost::optional< sal_Int32 > m_nScale;
 
         virtual ~OResultColumn();
     public:
diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx
index eb0656b1f..0ca98fec6 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.hxx
@@ -82,6 +82,7 @@ namespace dbaccess
 
         inline void setName(const ::rtl::OUString& _sName) { m_sName = _sName; }
         void setDefinition(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDest);
+        inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getDefinition() const { return m_xDest;}
     };
 //........................................................................
 }	// namespace dbaccess
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index 95515dd89..d0841ab67 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -289,7 +289,7 @@ Reference< XPropertySet > OContainerMediator::impl_getSettingsForInitialization_
 void OContainerMediator::notifyElementCreated(const ::rtl::OUString& _sName,const Reference<XPropertySet>& _xDest)
 {
     PropertyForwardList::iterator aFind = m_aForwardList.find(_sName);
-    if ( aFind == m_aForwardList.end() && m_xSettings.is() )
+    if ( (aFind == m_aForwardList.end() || !aFind->second->getDefinition().is() )&& m_xSettings.is() )
     {
         ::std::vector< ::rtl::OUString> aPropertyList;
 
@@ -321,8 +321,8 @@ void OContainerMediator::notifyElementCreated(const ::rtl::OUString& _sName,cons
         }
 
         ::rtl::Reference< OPropertyForward > pForward( new OPropertyForward( _xDest, m_xSettings, _sName, aPropertyList ) );
-        m_aForwardList.insert( PropertyForwardList::value_type( _sName, pForward ) );
-    }
+        m_aForwardList[_sName] = pForward;
+    } // if ( aFind == m_aForwardList.end() && m_xSettings.is() )
 }
 // -----------------------------------------------------------------------------
 //........................................................................
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index ebbebc020..b39181e01 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -38,6 +38,7 @@
 #endif
 
 class VCLXWindow;
+class WaitObject;
 namespace dbaui
 {
     class OTableConnectionData;
@@ -48,6 +49,8 @@ namespace dbaui
     class ORelationController : public OJoinController
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >	m_xTables;
+        ::std::auto_ptr<WaitObject> m_pWaitObject;
+        ULONG		m_nThreadEvent;
         sal_Bool	m_bRelationsPossible;
     protected:
         // all the features which should be handled by this class
@@ -59,7 +62,7 @@ namespace dbaui
 
         ORelationDesignView*	getRelationView() { return static_cast<ORelationDesignView*>(m_pView); }
         void loadData();
-        TTableWindowData::value_type existsTable(const ::rtl::OUString& _rComposedTableName) const;
+        TTableWindowData::value_type existsTable(const ::rtl::OUString& _rComposedTableName,sal_Bool _bCase) const;
         
         // load the window positions out of the datasource
         void loadLayoutInformation();
@@ -71,6 +74,8 @@ namespace dbaui
         // temp
         void SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabWinList, long nOffsetX, long nOffsetY );
         
+        void mergeData(const TTableConnectionData& _aConnectionData);
+        
         virtual sal_Bool Construct(Window* pParent);
 
         // XServiceInfo
@@ -92,6 +97,7 @@ namespace dbaui
         virtual void reset();
         virtual void impl_initialize();
         virtual ::rtl::OUString getPrivateTitle( ) const;
+        DECL_LINK( OnThreadFinished, void* );
     };
 }
 #endif // DBAUI_RELATIONCONTROLLER_HXX
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index e901f6135..8f559e2a4 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -66,6 +66,7 @@
 #include "WExtendPages.hxx"
 #include "WCPage.hxx"
 #include <svtools/syslocale.hxx>
+#include <svtools/zforlist.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/FValue.hxx>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
@@ -344,9 +345,14 @@ void ODatabaseExport::insertValueIntoColumn()
                             bool bNumberFormatError = false;
                             if ( m_pFormatter && m_sNumToken.Len() )
                             {
-                                LanguageType eNumLang;
-                                sal_uInt32 nNumberFormat2;
+                                LanguageType eNumLang = LANGUAGE_NONE;
+                                sal_uInt32 nNumberFormat2( nNumberFormat );
                                 fOutNumber = SfxHTMLParser::GetTableDataOptionsValNum(nNumberFormat2,eNumLang,m_sTextToken,m_sNumToken,*m_pFormatter);
+                                if ( eNumLang != LANGUAGE_NONE )
+                                {
+                                    nNumberFormat2 = m_pFormatter->GetFormatForLanguageIfBuiltIn( nNumberFormat2, eNumLang );
+                                    m_pFormatter->IsNumberFormat( m_sTextToken, nNumberFormat2, fOutNumber );
+                                }
                                 nNumberFormat = static_cast<sal_Int32>(nNumberFormat2);
                             }
                             else
@@ -357,6 +363,7 @@ void ODatabaseExport::insertValueIntoColumn()
                                     NumberFormat::DATETIME
                                     ,NumberFormat::DATE
                                     ,NumberFormat::TIME
+                                    ,NumberFormat::CURRENCY
                                     ,NumberFormat::NUMBER
                                     ,NumberFormat::LOGICAL
                                 };
@@ -438,9 +445,13 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl
         if ( m_pFormatter && m_sNumToken.Len() )
         {
             LanguageType eNumLang;
-            sal_uInt32 nFormatKey;
+            sal_uInt32 nFormatKey(0);
             fOutNumber = SfxHTMLParser::GetTableDataOptionsValNum(nFormatKey,eNumLang,m_sTextToken,m_sNumToken,*m_pFormatter);
-            //double fOutNumber2 = SfxHTMLParser::GetTableDataOptionsValNum(nNumberFormat2,eNumLang,m_sValToken,m_sNumToken,*m_pFormatter);
+            if ( eNumLang != LANGUAGE_NONE )
+            {
+                nFormatKey = m_pFormatter->GetFormatForLanguageIfBuiltIn( nFormatKey, eNumLang );
+                m_pFormatter->IsNumberFormat( m_sTextToken, nFormatKey, fOutNumber );
+            }
             Reference<XPropertySet> xProp = xFormats->getByKey(nFormatKey);
             xProp->getPropertyValue(PROPERTY_TYPE) >>= nNumberFormat;
         }
@@ -575,7 +586,7 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo
         {
             sal_Int32 nDataType;
             sal_Int32 nLength(0),nScale(0);
-            sal_Int16 nType = m_vNumberFormat[i];
+            sal_Int16 nType = m_vNumberFormat[i] & ~NumberFormat::DEFINED;
             
             switch ( nType )
             {
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index bb9bc9afe..b47782baa 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -157,6 +157,11 @@
 #ifndef _SV_WAITOBJ_HXX
 #include <vcl/waitobj.hxx>
 #endif
+#include <osl/thread.hxx>
+#include <vos/mutex.hxx>
+
+
+#define MAX_THREADS 10
 
 extern "C" void SAL_CALL createRegistryInfo_ORelationControl()
 {
@@ -181,6 +186,7 @@ using namespace ::com::sun::star::util;
 using namespace ::dbtools;
 using namespace ::dbaui;
 using namespace ::comphelper;
+using namespace ::osl;
 
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ORelationController::getImplementationName() throw( RuntimeException )
@@ -214,6 +220,7 @@ DBG_NAME(ORelationController);
 // -----------------------------------------------------------------------------
 ORelationController::ORelationController(const Reference< XMultiServiceFactory >& _rM) 
     : OJoinController(_rM)
+    ,m_nThreadEvent(0)
     ,m_bRelationsPossible(sal_True)
 {
     DBG_CTOR(ORelationController,NULL);
@@ -321,13 +328,8 @@ void ORelationController::impl_initialize()
     try
     {
         loadData();
-        getView()->initialize();	// show the windows and fill with our informations
-        getView()->Invalidate(INVALIDATE_NOERASE);
-        getUndoMgr()->Clear();		// clear all undo redo things
-        setModified(sal_False);		// and we are not modified yet
-        
-        if(m_vTableData.empty())
-            Execute(ID_BROWSER_ADDTABLE,Sequence<PropertyValue>());
+        if ( !m_nThreadEvent )
+            Application::PostUserEvent(LINK(this, ORelationController, OnThreadFinished));
     }
     catch( const Exception& )
     {
@@ -369,24 +371,53 @@ void ORelationController::describeSupportedFeatures()
     OJoinController::describeSupportedFeatures();
     implDescribeSupportedFeature( ".uno:DBAddRelation", SID_RELATION_ADD_RELATION, CommandGroup::EDIT );
 }
-// -----------------------------------------------------------------------------
-void ORelationController::loadData()
+namespace
 {
-    WaitObject aWaitCursor(getView());
-    try
+    class RelationLoader : public ::osl::Thread
     {
-        if ( !m_xTables.is() )
-            return;
-        // this may take some time
+        DECLARE_STL_MAP(::rtl::OUString,::boost::shared_ptr<OTableWindowData>,::comphelper::UStringMixLess,TTableDataHelper);
+        TTableDataHelper                    m_aTableData;
+        TTableConnectionData                m_vTableConnectionData;
+        const Sequence< ::rtl::OUString>    m_aTableList;
+        ORelationController*                m_pParent;
+        const Reference< XDatabaseMetaData> m_xMetaData;
+        const Reference< XNameAccess >	    m_xTables;
+        const sal_Int32                     m_nStartIndex;
+        const sal_Int32                     m_nEndIndex;
         
-        Reference< XDatabaseMetaData> xMetaData = getConnection()->getMetaData();
-        Sequence< ::rtl::OUString> aNames = m_xTables->getElementNames();
-        const ::rtl::OUString* pIter = aNames.getConstArray();
-        const ::rtl::OUString* pEnd = pIter + aNames.getLength();
-        for(;pIter != pEnd;++pIter)
+    public:
+        RelationLoader(ORelationController* _pParent
+                        ,const Reference< XDatabaseMetaData>& _xMetaData
+                        ,const Reference< XNameAccess >& _xTables
+                        ,const Sequence< ::rtl::OUString>& _aTableList
+                        ,const sal_Int32 _nStartIndex
+                        ,const sal_Int32 _nEndIndex) 
+            :m_aTableData(_xMetaData.is() && _xMetaData->supportsMixedCaseQuotedIdentifiers())
+            ,m_aTableList(_aTableList)
+            ,m_pParent(_pParent)
+            ,m_xMetaData(_xMetaData)
+            ,m_xTables(_xTables)
+            ,m_nStartIndex(_nStartIndex)
+            ,m_nEndIndex(_nEndIndex)
+        {
+        }
+
+    protected:
+        virtual ~RelationLoader(){}
+
+        /// Working method which should be overridden.
+        virtual void SAL_CALL run();
+        virtual void SAL_CALL onTerminated();
+        void loadTableData(const Any& _aTable);
+    };
+
+    void SAL_CALL RelationLoader::run()
+    {
+        const ::rtl::OUString* pIter = m_aTableList.getConstArray() + m_nStartIndex;
+        for(sal_Int32 i = m_nStartIndex; i < m_nEndIndex;++i,++pIter)
         {
             ::rtl::OUString sCatalog,sSchema,sTable;
-            ::dbtools::qualifiedNameComponents(xMetaData,
+            ::dbtools::qualifiedNameComponents(m_xMetaData,
                                                 *pIter,
                                                 sCatalog, 
                                                 sSchema, 
@@ -396,124 +427,210 @@ void ORelationController::loadData()
             if ( sCatalog.getLength() )
                 aCatalog <<= sCatalog;
 
-            Reference< XResultSet > xResult = xMetaData->getImportedKeys(aCatalog, sSchema,sTable);
-            if ( xResult.is() && xResult->next() )
-                loadTableData(m_xTables->getByName(*pIter));
+            try
+            {
+                Reference< XResultSet > xResult = m_xMetaData->getImportedKeys(aCatalog, sSchema,sTable);
+                if ( xResult.is() && xResult->next() )
+                {
+                    ::comphelper::disposeComponent(xResult);
+                    loadTableData(m_xTables->getByName(*pIter));
+                } // if ( xResult.is() && xResult->next() )
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
         }
     }
-    catch(SQLException& e)
+    void SAL_CALL RelationLoader::onTerminated()
     {
-        showError(SQLExceptionInfo(e));
-    }
-    catch(const Exception&)
-    {
-        DBG_UNHANDLED_EXCEPTION();
-    }	
-}
-// -----------------------------------------------------------------------------
-void ORelationController::loadTableData(const Any& _aTable)
-{
-    Reference<XPropertySet> xTableProp(_aTable,UNO_QUERY);
-    const ::rtl::OUString sSourceName = ::dbtools::composeTableName( getConnection()->getMetaData(), xTableProp, ::dbtools::eInTableDefinitions, false, false, false );
-    TTableWindowData::value_type pReferencingTable = existsTable(sSourceName);
-    bool bNotFound = true, bAdded = false;
-    if ( !pReferencingTable )
-    {
-        pReferencingTable.reset(new OTableWindowData(xTableProp,sSourceName, sSourceName));
-        pReferencingTable->ShowAll(FALSE);
-        bAdded = true;
-        m_vTableData.push_back(pReferencingTable);
+        m_pParent->mergeData(m_vTableConnectionData);
+        delete this;
     }
 
-    Reference<XIndexAccess> xKeys = pReferencingTable->getKeys();
-    Reference<XKeysSupplier> xKeySup(xTableProp,UNO_QUERY);
-    
-    if ( !xKeys.is() && xKeySup.is() )
+    void RelationLoader::loadTableData(const Any& _aTable)
     {
-        xKeys = xKeySup->getKeys();
-    }
-    
-    if ( xKeys.is() )
-    {  
-        Reference<XPropertySet> xKey;
-        const sal_Int32 nCount = xKeys->getCount();
-        for(sal_Int32 i = 0 ; i < nCount ; ++i)
+        Reference<XPropertySet> xTableProp(_aTable,UNO_QUERY);
+        const ::rtl::OUString sSourceName = ::dbtools::composeTableName( m_xMetaData, xTableProp, ::dbtools::eInTableDefinitions, false, false, false );
+        TTableDataHelper::iterator aFind = m_aTableData.find(sSourceName);
+        bool bNotFound = true, bAdded = false;
+        if ( aFind == m_aTableData.end() )
+        {
+            aFind = m_aTableData.insert(TTableDataHelper::value_type(sSourceName,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xTableProp,sSourceName, sSourceName)))).first;
+            aFind->second->ShowAll(FALSE);
+            bAdded = true;
+        }
+        TTableWindowData::value_type pReferencingTable = aFind->second;
+        Reference<XIndexAccess> xKeys = pReferencingTable->getKeys();
+        const Reference<XKeysSupplier> xKeySup(xTableProp,UNO_QUERY);
+        
+        if ( !xKeys.is() && xKeySup.is() )
         {
-            xKeys->getByIndex(i) >>= xKey;
-            sal_Int32 nKeyType = 0;
-            xKey->getPropertyValue(PROPERTY_TYPE) >>= nKeyType;
-            if ( KeyType::FOREIGN == nKeyType )
+            xKeys = xKeySup->getKeys();
+        }
+        
+        if ( xKeys.is() )
+        {  
+            Reference<XPropertySet> xKey;
+            const sal_Int32 nCount = xKeys->getCount();
+            for(sal_Int32 i = 0 ; i < nCount ; ++i)
             {
-                bNotFound = false;
-                ::rtl::OUString sReferencedTable;
-                xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable;
-                //////////////////////////////////////////////////////////////////////
-                // insert windows
-                TTableWindowData::value_type pReferencedTable = existsTable(sReferencedTable);
-                if ( !pReferencedTable )
+                xKeys->getByIndex(i) >>= xKey;
+                sal_Int32 nKeyType = 0;
+                xKey->getPropertyValue(PROPERTY_TYPE) >>= nKeyType;
+                if ( KeyType::FOREIGN == nKeyType )
                 {
-                    if ( m_xTables->hasByName(sReferencedTable) )
+                    bNotFound = false;
+                    ::rtl::OUString sReferencedTable;
+                    xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable;
+                    //////////////////////////////////////////////////////////////////////
+                    // insert windows
+                    TTableDataHelper::iterator aRefFind = m_aTableData.find(sReferencedTable);
+                    if ( aRefFind == m_aTableData.end() )
                     {
-                        Reference<XPropertySet>  xReferencedTable(m_xTables->getByName(sReferencedTable),UNO_QUERY);
-                        pReferencedTable.reset(new OTableWindowData(xReferencedTable,sReferencedTable, sReferencedTable));
-                        pReferencedTable->ShowAll(FALSE);
-                        m_vTableData.push_back(pReferencedTable);
-                    }
-                    else
-                        continue; // table name could not be found so we do not show this table releation
-                }
+                        if ( m_xTables->hasByName(sReferencedTable) )
+                        {
+                            Reference<XPropertySet>  xReferencedTable(m_xTables->getByName(sReferencedTable),UNO_QUERY);
+                            aRefFind = m_aTableData.insert(TTableDataHelper::value_type(sReferencedTable,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xReferencedTable,sReferencedTable, sReferencedTable)))).first;
+                            aRefFind->second->ShowAll(FALSE);
+                        }
+                        else
+                            continue; // table name could not be found so we do not show this table releation
+                    } // if ( aFind == m_aTableData.end() )
+                    TTableWindowData::value_type pReferencedTable = aRefFind->second;
 
-                ::rtl::OUString sKeyName;
-                xKey->getPropertyValue(PROPERTY_NAME) >>= sKeyName;
-                //////////////////////////////////////////////////////////////////////
-                // insert connection
-                ORelationTableConnectionData* pTabConnData = new ORelationTableConnectionData( pReferencingTable, pReferencedTable, sKeyName );
-                m_vTableConnectionData.push_back(TTableConnectionData::value_type(pTabConnData));
-                //////////////////////////////////////////////////////////////////////
-                // insert columns
-                Reference<XColumnsSupplier> xColsSup(xKey,UNO_QUERY);
-                OSL_ENSURE(xColsSup.is(),"Key is no XColumnsSupplier!");
-                Reference<XNameAccess> xColumns		= xColsSup->getColumns();
-                Sequence< ::rtl::OUString> aNames	= xColumns->getElementNames();
-                const ::rtl::OUString* pIter	= aNames.getConstArray();
-                const ::rtl::OUString* pEnd		= pIter + aNames.getLength();
-                ::rtl::OUString sColumnName,sRelatedName;
-                for(sal_uInt16 j=0;pIter != pEnd;++pIter,++j)
-                {
-                    Reference<XPropertySet> xPropSet;
-                    xColumns->getByName(*pIter) >>= xPropSet;
-                    OSL_ENSURE(xPropSet.is(),"Invalid column found in KeyColumns!");
-                    if ( xPropSet.is() )
+                    ::rtl::OUString sKeyName;
+                    xKey->getPropertyValue(PROPERTY_NAME) >>= sKeyName;
+                    //////////////////////////////////////////////////////////////////////
+                    // insert connection
+                    ORelationTableConnectionData* pTabConnData = new ORelationTableConnectionData( pReferencingTable, pReferencedTable, sKeyName );
+                    m_vTableConnectionData.push_back(TTableConnectionData::value_type(pTabConnData));
+                    //////////////////////////////////////////////////////////////////////
+                    // insert columns
+                    const Reference<XColumnsSupplier> xColsSup(xKey,UNO_QUERY);
+                    OSL_ENSURE(xColsSup.is(),"Key is no XColumnsSupplier!");
+                    const Reference<XNameAccess> xColumns		= xColsSup->getColumns();
+                    const Sequence< ::rtl::OUString> aNames	= xColumns->getElementNames();
+                    const ::rtl::OUString* pIter	= aNames.getConstArray();
+                    const ::rtl::OUString* pEnd		= pIter + aNames.getLength();
+                    ::rtl::OUString sColumnName,sRelatedName;
+                    for(sal_uInt16 j=0;pIter != pEnd;++pIter,++j)
                     {
-                        xPropSet->getPropertyValue(PROPERTY_NAME)			>>= sColumnName;
-                        xPropSet->getPropertyValue(PROPERTY_RELATEDCOLUMN)	>>= sRelatedName;
+                        const Reference<XPropertySet> xPropSet(xColumns->getByName(*pIter),UNO_QUERY);
+                        OSL_ENSURE(xPropSet.is(),"Invalid column found in KeyColumns!");
+                        if ( xPropSet.is() )
+                        {
+                            xPropSet->getPropertyValue(PROPERTY_NAME)			>>= sColumnName;
+                            xPropSet->getPropertyValue(PROPERTY_RELATEDCOLUMN)	>>= sRelatedName;
+                        }
+                        pTabConnData->SetConnLine( j, sColumnName, sRelatedName );
                     }
-                    pTabConnData->SetConnLine( j, sColumnName, sRelatedName );
-                }
-                //////////////////////////////////////////////////////////////////////
-                // Update/Del-Flags setzen
-                sal_Int32	nUpdateRule = 0;
-                sal_Int32	nDeleteRule = 0;
-                xKey->getPropertyValue(PROPERTY_UPDATERULE) >>= nUpdateRule;
-                xKey->getPropertyValue(PROPERTY_DELETERULE) >>= nDeleteRule;
-                
-                pTabConnData->SetUpdateRules( nUpdateRule );
-                pTabConnData->SetDeleteRules( nDeleteRule );
+                    //////////////////////////////////////////////////////////////////////
+                    // Update/Del-Flags setzen
+                    sal_Int32	nUpdateRule = 0;
+                    sal_Int32	nDeleteRule = 0;
+                    xKey->getPropertyValue(PROPERTY_UPDATERULE) >>= nUpdateRule;
+                    xKey->getPropertyValue(PROPERTY_DELETERULE) >>= nDeleteRule;
+                    
+                    pTabConnData->SetUpdateRules( nUpdateRule );
+                    pTabConnData->SetDeleteRules( nDeleteRule );
 
-                //////////////////////////////////////////////////////////////////////
-                // Kardinalitaet setzen
-                pTabConnData->SetCardinality();
+                    //////////////////////////////////////////////////////////////////////
+                    // Kardinalitaet setzen
+                    pTabConnData->SetCardinality();
+                }
             }
+        } // if ( xKeys.is() )
+    }
+}
+
+void ORelationController::mergeData(const TTableConnectionData& _aConnectionData)
+{
+    ::osl::MutexGuard aGuard( getMutex() );
+
+    ::std::copy( _aConnectionData.begin(), _aConnectionData.end(), ::std::back_inserter( m_vTableConnectionData ));
+    //const Reference< XDatabaseMetaData> xMetaData = getConnection()->getMetaData();
+    const sal_Bool bCase = sal_True;//xMetaData.is() && xMetaData->supportsMixedCaseQuotedIdentifiers();
+    // here we are finished, so we can collect the table from connection data
+    TTableConnectionData::iterator aConnDataIter = m_vTableConnectionData.begin();
+    TTableConnectionData::iterator aConnDataEnd = m_vTableConnectionData.end();
+    for(;aConnDataIter != aConnDataEnd;++aConnDataIter)
+    {
+        if ( !existsTable((*aConnDataIter)->getReferencingTable()->GetComposedName(),bCase) )
+        {
+            m_vTableData.push_back((*aConnDataIter)->getReferencingTable());
+        }
+        if ( !existsTable((*aConnDataIter)->getReferencedTable()->GetComposedName(),bCase) )
+        {
+            m_vTableData.push_back((*aConnDataIter)->getReferencedTable());
         }
-    } // if ( xKeys.is() )
-    if ( bNotFound && bAdded ) 
-        m_vTableData.pop_back();
+    } // for(;aConnDataIter != aConnDataEnd;++aConnDataIter)
+    --m_nThreadEvent;
+    if ( !m_nThreadEvent )
+        Application::PostUserEvent(LINK(this, ORelationController, OnThreadFinished));
+}
+// -----------------------------------------------------------------------------
+IMPL_LINK( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ )
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( getMutex() );
+    try
+    {
+        getView()->initialize();	// show the windows and fill with our informations
+        getView()->Invalidate(INVALIDATE_NOERASE);
+        getUndoMgr()->Clear();		// clear all undo redo things
+        setModified(sal_False);		// and we are not modified yet
+        
+        if(m_vTableData.empty())
+            Execute(ID_BROWSER_ADDTABLE,Sequence<PropertyValue>());
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+    m_pWaitObject.reset();
+    return 0L;
+}
+// -----------------------------------------------------------------------------
+void ORelationController::loadData()
+{
+    m_pWaitObject.reset( new WaitObject(getView()) );
+    try
+    {
+        if ( !m_xTables.is() )
+            return;
+        // this may take some time
+        const Reference< XDatabaseMetaData> xMetaData = getConnection()->getMetaData();
+        const Sequence< ::rtl::OUString> aNames = m_xTables->getElementNames();
+        const sal_Int32 nCount = aNames.getLength();
+        const sal_Int32 nMaxElements = (nCount / MAX_THREADS) +1;
+
+        sal_Int32 nStart = 0,nEnd = ::std::min(nMaxElements,nCount);
+        while(nStart != nEnd)
+        {
+            ++m_nThreadEvent;
+            RelationLoader* pThread = new RelationLoader(this,xMetaData,m_xTables,aNames,nStart,nEnd);
+            pThread->createSuspended();
+            pThread->setPriority(osl_Thread_PriorityBelowNormal);
+            pThread->resume();
+            nStart = nEnd;
+            nEnd += nMaxElements;
+            nEnd = ::std::min(nEnd,nCount);
+        } // for(;pIter != pEnd;++pIter)
+    }
+    catch(SQLException& e)
+    {
+        showError(SQLExceptionInfo(e));
+    }
+    catch(const Exception&)
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }	
 }
 // -----------------------------------------------------------------------------
-TTableWindowData::value_type ORelationController::existsTable(const ::rtl::OUString& _rComposedTableName)  const
+TTableWindowData::value_type ORelationController::existsTable(const ::rtl::OUString& _rComposedTableName,sal_Bool _bCase)  const
 {
-    Reference<XDatabaseMetaData> xMeta = getConnection()->getMetaData();
-    ::comphelper::UStringMixEqual bCase(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers());
+    ::comphelper::UStringMixEqual bCase(_bCase);
     TTableWindowData::const_iterator aIter = m_vTableData.begin();
     TTableWindowData::const_iterator aEnd = m_vTableData.end();
     for(;aIter != aEnd;++aIter)
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index d3ae601cf..fd47db6d2 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -165,7 +165,7 @@ void ORelationTableView::ReSync()
     // Verbindungen einfuegen
     TTableConnectionData* pTabConnDataList = m_pView->getController().getTableConnectionData();
     TTableConnectionData::reverse_iterator aConIter = pTabConnDataList->rbegin();
-    
+
     for(;aConIter != pTabConnDataList->rend();++aConIter)
     {
         ORelationTableConnectionData* pTabConnData = static_cast<ORelationTableConnectionData*>(aConIter->get());
@@ -182,8 +182,8 @@ void ORelationTableView::ReSync()
                 pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() );
                 continue;
             }
-        }
-
+        } // if ( !arrInvalidTables.empty() )
+        
         addConnection( new ORelationTableConnection(this, *aConIter), sal_False ); // don't add the data again
     }
 
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index ac53e1900..f236eb112 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -1179,7 +1179,8 @@ void OTableController::alterColumns()
     ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin();
     ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end();
     // first look for columns where something other than the name changed
-    for(sal_Int32 nPos = 0;aIter != aEnd;++aIter,++nPos)
+    sal_Int32 nPos = 0;
+    for(;aIter != aEnd;++aIter,++nPos)
     {
         OSL_ENSURE(*aIter,"OTableRow is null!");
         OFieldDescription* pField = (*aIter)->GetActFieldDescr();
@@ -1198,10 +1199,9 @@ void OTableController::alterColumns()
             xColumns->getByName(pField->GetName()) >>= xColumn;
             OSL_ENSURE(xColumn.is(),"Column is null!");
             
-            sal_Int32 nType=0,nPrecision=0,nScale=0,nNullable=0,nFormatKey=0,nAlignment=0;
+            sal_Int32 nType=0,nPrecision=0,nScale=0,nNullable=0;
             sal_Bool bAutoIncrement = false;
-            ::rtl::OUString sDescription, sTypeName;
-            Any aControlDefault;
+            ::rtl::OUString sTypeName;
 
             xColumn->getPropertyValue(PROPERTY_TYPE)			>>= nType;
             xColumn->getPropertyValue(PROPERTY_PRECISION)		>>= nPrecision;
@@ -1220,19 +1220,10 @@ void OTableController::alterColumns()
             }
 
             //	xColumn->getPropertyValue(PROPERTY_ISCURRENCY,::cppu::bool2any(pField->IsCurrency()));
-            if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_HELPTEXT))
-                xColumn->getPropertyValue(PROPERTY_HELPTEXT) >>= sDescription;
-            if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_CONTROLDEFAULT))
-                aControlDefault = xColumn->getPropertyValue(PROPERTY_CONTROLDEFAULT);
-            if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_FORMATKEY))
-                xColumn->getPropertyValue(PROPERTY_FORMATKEY)	>>= nFormatKey;
-            if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_ALIGN))
-                xColumn->getPropertyValue(PROPERTY_ALIGN)		>>= nAlignment;
-
             // check if something changed
             if((nType != pField->GetType()					|| 
                 sTypeName != pField->GetTypeName()         ||
-                nPrecision != pField->GetPrecision()		|| 
+                (nPrecision != pField->GetPrecision() && nPrecision )		|| 
                 nScale != pField->GetScale()				|| 
                 nNullable != pField->GetIsNullable()		|| 
                 bAutoIncrement != pField->IsAutoIncrement())&& 
@@ -1285,26 +1276,7 @@ void OTableController::alterColumns()
                 bReload = sal_True;
             }
             
-            if(nFormatKey != pField->GetFormatKey())
-            {
-                if(xColumn.is() && xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_FORMATKEY))
-                    xColumn->setPropertyValue(PROPERTY_FORMATKEY,makeAny(pField->GetFormatKey()));
-            }
-            if(nAlignment != dbaui::mapTextAllign(pField->GetHorJustify()))
-            {
-                if(xColumn.is() && xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_ALIGN))
-                    xColumn->setPropertyValue(PROPERTY_ALIGN,makeAny(dbaui::mapTextAllign(pField->GetHorJustify())));
-            }
-            if(sDescription != pField->GetDescription())
-            {
-                if(xColumn.is() && xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_HELPTEXT))
-                    xColumn->setPropertyValue(PROPERTY_HELPTEXT,makeAny(pField->GetDescription()));
-            }
-            if ( aControlDefault != pField->GetControlDefault())
-            {
-                if(xColumn.is() && xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_CONTROLDEFAULT))
-                    xColumn->setPropertyValue(PROPERTY_CONTROLDEFAULT,pField->GetControlDefault());
-            }
+            
         }
         else if(xColumnFactory.is() && xAlter.is() && nPos < nColumnCount)
         { // we can't find the column so we could try it with the index before we drop and append a new column
@@ -1350,6 +1322,37 @@ void OTableController::alterColumns()
         }
         else
             bReload = sal_True;
+    } // for(sal_Int32 nPos = 0;aIter != aEnd;++aIter,++nPos)
+    // alter column settings
+    aIter = m_vRowList.begin();
+    
+    // first look for columns where something other than the name changed
+    for(nPos = 0;aIter != aEnd;++aIter,++nPos)
+    {
+        OSL_ENSURE(*aIter,"OTableRow is null!");
+        OFieldDescription* pField = (*aIter)->GetActFieldDescr();
+        if ( !pField )
+            continue;
+        if ( (*aIter)->IsReadOnly() )
+        {
+            aColumns[pField->GetName()] = sal_True;
+            continue;
+        }
+        
+        Reference<XPropertySet> xColumn;
+        if ( xColumns->hasByName(pField->GetName()) )
+        {
+            xColumns->getByName(pField->GetName()) >>= xColumn;
+            Reference<XPropertySetInfo> xInfo = xColumn->getPropertySetInfo();
+            if ( xInfo->hasPropertyByName(PROPERTY_HELPTEXT) )
+                xColumn->setPropertyValue(PROPERTY_HELPTEXT,makeAny(pField->GetDescription()));
+            if(xInfo->hasPropertyByName(PROPERTY_CONTROLDEFAULT))
+                xColumn->setPropertyValue(PROPERTY_CONTROLDEFAULT,pField->GetControlDefault());
+            if(xInfo->hasPropertyByName(PROPERTY_FORMATKEY))
+                xColumn->setPropertyValue(PROPERTY_FORMATKEY,makeAny(pField->GetFormatKey()));
+            if(xInfo->hasPropertyByName(PROPERTY_ALIGN))
+                xColumn->setPropertyValue(PROPERTY_ALIGN,makeAny(dbaui::mapTextAllign(pField->GetHorJustify())));
+        } // if ( xColumns->hasByName(pField->GetName()) )
     }
     // second drop all columns which could be found by name
     Reference<XNameAccess> xKeyColumns	= getKeyColumns();
diff --git a/default_images/res/commandimagelist/lc_navigateback.png b/default_images/res/commandimagelist/lc_navigateback.png
new file mode 100644
index 0000000000000000000000000000000000000000..17ac6433da2432da93e7af0b7ec665f6cb77a547
GIT binary patch
literal 1042
zcwPY#1nv8YP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z^Q>-8KIssI20AY({UO#lFHAOHYz>;M4wNdN$Z`TziL
zg8%^NApig|x&Qzdi4RZnl>h((h)G02RCwBA{Qv(y13dsh05Q_bB7gv*n?(Qt1h<Hh
zkrA&#pR#G8Kq?za=nW9h*wU4?hma*8I{*TRg&5a(mre=&|NrmoNH<G<TLU$)*x?Je
z7?y57!U|;WA;t`V03v9SXVJvae}DhXj&!%;H_%dHc>eJhSX@I{j^Xd0-{Qmu9Y6r#
zwaC4oFZAEPKeNN#toSw6lo_7A`wo};^XE6izrTMOiM0qIfN)ymlG7Cmbn)ykH*0=X
zWo3p(Z@!|)U%q||=%YVGCkB83!fKIIW;-aj7KFOnaw#dPFg!rB<m&aC3@6W={ru_G
zlcmI31Q0+Nsm?yN8JN2MF9`Lp<5E&lWqA7jJBo(uH*PYVIdkUoho|?NFKu5q2PpKO
zm{bQ4Kqwa3Ce?wG@PZHzdoBfKHHOFUzM*KidGiLtg>z>?%zq&LK+Fu4`isT<A3*#N
zh#L;gZCniyKyZt!;;TTGEDrT@VwY1^XL$7XD~3)vVQvOB30|Ut>d&9Q3<pl0XIQmm
z&(Y(HJ8S>~2p&h@KfUK><KktPRZ?eo_~t8C%^-1Ha_E2w7(!yw3JiaK{RHJT27mx!
zf=K{V7#L&o2|3^&Fr=P;{0=q~1ONgEZV@m~F#P@f`}_6F7pY>=U!ZxnZ(N6G0e}F4
z2i?`}3pOfRdW)Sp@~7ed|9_lXdWIO9uU$INaQfIGSYm*O5*i<t)PDZ^_xJgak8i+P
z03d+SleeIpse3Aqh;)O6y)&n-p$Up!Ss_k_J6A3+ELyeU^OrYITOOU>2`c9pp(zl<
zDj)`xSI>ZUyaxy%Y^ArLtg%Zfx3FY`t&1n8fvE-5EC`Sm;9$6M;UvR?73)3%xv4jH
zE?P}YJ^~0JCM@FbAD`Vb`}3<O4F`5?{(R}oNd`7nRt7dUHZXqu?H_}#i8Vt)L=gX<
z-@o#SjWd7%V!|Q*{^^DNv%kD~*1TuS`p@T2A7@}^XJ_Ex-~i)yznB=b3@t#3hm}~1
z00M{!kKFs`mk!SP^7dKtwzbPYpFMtvfs>Pyfs2a^jKBV81*TNu3srysVj>{_{^gY;
zbH2TM(Y$`y!p|oT?FPoyUobv*@(3vDz9-fqfB+)4Di;*dv`As&7KlJZ@V^hgzkOQp
z=K6`n#3TlQ03y200J02-MUjg$XuIJPF%|&?5Zziq00BfdivR))0DQ}e-L+Xjg8%>k
M07*qoM6N<$f>uY)e*gdg

literal 0
HcwPel00001

diff --git a/default_images/res/commandimagelist/lc_navigateforward.png b/default_images/res/commandimagelist/lc_navigateforward.png
new file mode 100644
index 0000000000000000000000000000000000000000..429ce3431ac61c308eb04f52b5a1b9102ec60159
GIT binary patch
literal 1039
zcwPYy1n~QbP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z^Q>-8KIssI20AY({UO#lFHAOHYz>;M4wNdN$Z`TziL
zg8%^NApig|x&Qzdi4RZnl>h((g-Jv~RCwBA{Qv(y13dsh05LJp2>=8T-7EqKAQlk8
z$jC@gp-<T~7a)}Z#3D$-Q@3<wt;VMh7Bv6?#6WBuc@|CBxMcU4{|{e(0%H){yL9pg
z@6suuge(GKfB+&o=>GosEv}&~$MF2)FEBRHQeg;pG3WpH_s?w4qKTn|^aBJC(H8yt
z`<L<6#~%!zzW)Z}XYal<XsRhQgn}&l_h+_yK_6br00M{vAN^rCb@>*<=O4e}_|coM
z464e?48cz3{6HVicFF0&X&FEO5pB_@S5KB6Ja+Q)>5JDGzWw?O#}9y(DJiKi1iM&)
zf^mUUW;<5P00M{+6j8*aIv^0#^NddskXEWSF)`uQ)KEu}losS<xOe9^!|EM}z5&y5
z!ok_KtC15MKmdU)vP-T9xuOAx<$;(3izUpk5CrJ~g@l2TF@w6g28tqCAufgocW*JQ
z*>MnP8AHP1c}=Tf76AkhI3NA~^)o-r$3@G*+>n8Vg&Ci(;F7mqd}es`_A83y-Pd0j
z<P=pI0^R;`t=_h8v1ME(NEqxhfB*tp^yk-4RxxP>hJ!cXF#Myi?0X1|GdU%7VB*=u
z{_ERkZkRYg05L)H2rzGar`Qr00QnSTCJ4g-KmakplJ4yr*BSo){Yw>#u3x^$@b~xc
z@Bfg@0|+2+Vo<dU%;Vq}$!B6>mINk2b{yH@A2Q$6%8o%x&k#f5wM*w2P9Ht^{qyT5
z4fl_4oeebqJxClNfMCg65XhDSVm4^1!pH`olqzTH?!qG?T@x1;z^kHT!0;GYIv|6~
z=g%;lIJo!wmp4xv9-ZDf8z}T1mg)cki0FKz;T{Ld0<#k$g7`HI%o(13_<>w>GF&))
zg5mI<?ccw?ectf+>>jWs$oU8$fLMqP_dmaX<)_3(@avjbGd%nBi-C=e4OToeoH>4&
z;lPf~pTE6((em`dez+yb03d*fwg?!xtXhT^4DWt1F>r8jz^i~0hxaq=*|PrgxA!lb
zpI<sS2b(1z01!Yd#FyTG7{2~zW#HoCf?INU?+%7-YnOli{^3>g%PU84S^@$90Ypma
z{r=p^BfwPg7mQCF+Rd<j*+Nio5wrvZ00M~U#2}(+5zETOm%zx#Bmfip_4UJwH`h<#
zwFH(J00M}V(wh(3UO*1+*Mximvj`x780pon0|+3xHMal)3;^%irooPASgQa4002ov
JPDHLkV1i$o)CvFq

literal 0
HcwPel00001

diff --git a/default_images/res/commandimagelist/lch_navigateback.png b/default_images/res/commandimagelist/lch_navigateback.png
new file mode 100644
index 0000000000000000000000000000000000000000..20913a1d815abdd50264203acd826780e8d1e903
GIT binary patch
literal 336
zcwXxa@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%oCO|{#S9GG!XV7ZFl&wkP>?0v
z(btiI;l}H)G9s&he1&9>AYTTCJOu`ZqBjf--#r-^T7EGw<To=gyijCdFx<t!Al}LE
z|9L7<?J-Xm$B>F!Nq_$Tw`aCxa9}Vryuiu8B5+rSi9=ymB#VH9OZ1T&H-5~Y*vQy(
zawCUAgM>q8qd;0l#sL8pH+dsA4uwrRipP~27?e&6O|V!g#>gTNtHYSsz_6%WRe?vq
zp=2XV3nNp9h4+c09(~Ll3b!Jgrda_6@>H1}7%u9*U;r{Z85J5{Oxptzl@tRq!&rc(
z+~o=d8WL^FDBy5J+htSF91Ea}+^V)VF~BsR1=_l3wkrc88$-ME>G|;$CLTZ^F?hQA
KxvX<aXaWGXMqjP~

literal 0
HcwPel00001

diff --git a/default_images/res/commandimagelist/lch_navigateforward.png b/default_images/res/commandimagelist/lch_navigateforward.png
new file mode 100644
index 0000000000000000000000000000000000000000..37c11e450923499c4bd15d6be5e2249928273f24
GIT binary patch
literal 323
zcwXxa@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%oCO|{#S9GG!XV7ZFl&wkP>?0v
z(btiI;l}H)G9s&he1&9>AYTTCJOu`ZqBjf--#r-^T7EGw<To=gyijCdFx<t!Al}LE
z|9L7<?M_b@$B>F!Nq_$Tw`aCxa9}XJbXuu_VbN??21Xb2ZU&|f#uUMo66Z29e)zAE
zYhX~iFC?VP%%N~fSLu=wkb75Y!NMmIYyu8XjtWXnV`LGC6q}eV>A)~CS8yeWo9O!_
z$>cQ97^^ttLqH8lNehG-I23lV$~rJy)HP&a5x6_a9K<}#1Y~w80IiN*$R*%VvRVzO
yDNj@$D7RLN9jGIc1t_|iL!seCnxI1iBg3;hYHqH1`vifWVDNPHb6Mw<&;$VL5L;6K

literal 0
HcwPel00001

diff --git a/default_images/res/commandimagelist/sc_navigateback.png b/default_images/res/commandimagelist/sc_navigateback.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f9b9736465b5907fc4f6bc21a1cddf557d2906c
GIT binary patch
literal 526
zcwPYx0`dKcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z^Q>-8KIssI20AY({UO#lFHAOHYz>;M4wNdN$Z`TziL
zg8%^NApig|x&Qzdi4RZnl>h(%gh@m}RCwBA{Qv(y10?_;fS4F41ONfVh)vKwv(pwx
z9fET04o)vWj7=TL^#B2cA!w7@Y74~wUw{4q#vnE>+d&2Z1P}|dfMsHX?cYDY53TMk
zW4QR}16T~m$Lj@v0D>dam?~Q!{(tA?=l{!(KLBG8A1Gyv&jkPh1P%j(up+RZm-W{(
z9J=|6;mw;j3~Sb`CS+&W`IWt^0Ro6oCm<WFdFiAUhCNqbfMs|&SQ*Tfh4Jc+&Z}X#
zynYHJKmf6P{qUNTm6I2)83aE6_>IEH27dkg0j2>02;>DG5e<t7UMc0-Ii)pV!Pl=|
zFsxiS2d@F&-#)8&eqmoHKmft`JVL4_DYCYq|0nIa^MBrv2mdcW`S>5ihXx`xEC>oj
zfB-@^l!sqYKSjdK_y4>TFTnW5%WwZde0;G05J2c+JUnvRDI$jM|JUFA3C18cJ_7&(
z2%9($myAY=psv$@5C*aF82}JKj5y?YfLI;Mz6r!%a2Ws)K#Y`TXMg|$0PjApQgCl?
QIRF3v07*qoM6N<$f@*Bb`~Uy|

literal 0
HcwPel00001

diff --git a/default_images/res/commandimagelist/sc_navigateforward.png b/default_images/res/commandimagelist/sc_navigateforward.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cc4c09723b2e2fce4019eeab30f5e6401265e57
GIT binary patch
literal 537
zcwPY+0_OdRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z^Q>-8KIssI20AY({UO#lFHAOHYz>;M4wNdN$Z`TziL
zg8%^NApig|x&Qzdi4RZnl>h(%k4Z#9RCwBA{Qv(y10?_;fS4F41ONfV0wNe08L>**
zXLi~GsY6h%-NEVQhtbsl1P}v0FW98E{(t@X2N;9cKx~Vy1|Wd&dg1S%-wYQYeE{PX
zorNI&A<M)D6hi<4h=D*L8k@#c{a=3k0T|zT`T0MH55#ao00M{+WPo9KaVU_z3ZF?K
zA)yQ+A|ecS>S7F0g^l1axv;A5FhBr-4bTnD`M-2h3*OK^dG{^D=O4epY!___hUmN+
zups~e1dfGYKYuXnx%z_Wr~|15>G}QrGbca*fn6YJ;8e~jEY*QeQ+Rv|gQ%DUm_4Pt
zh2itFyQyz(oLB)6K(Ig*1O*s2ENdJ3|MHWM|K}Zf@PE>tJO4p^AytzUpd1fKBR~M*
zjRgra-~TsWe)~V~#0xM6@%a_?5t@MjAb?o#Is4D=UkukjFf#}W3NoZd_%Zx=`y}<t
zqpK@`QeR+d00IcF3%F!7QUrCK{(~@xjchXv00a;?5OL)Ns0MW?`zDIbPyi4>jFe_)
bfB*vk6UVQ`-6A|p00000NkvXXu0mjfVhGHK

literal 0
HcwPel00001

diff --git a/default_images/res/commandimagelist/sch_navigateback.png b/default_images/res/commandimagelist/sch_navigateback.png
new file mode 100644
index 0000000000000000000000000000000000000000..be9eb86e8505150492f5caca26a130a3b869e2e2
GIT binary patch
literal 310
zcwXxa@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>?0v
z(btiI;l}H)G9s&he1&9>AYTTCJOu`ZqBjf--#r-^T7EGw<To=gyijCdFx<t!Al}LE
z|9L7<?HW%P$B>F!Nq_$Tw`W#mP-vJTp~1qy*m9ZS*s){(6?{%GG%zGFR5HpgE|8M?
zmmJJ|7%2IW$!$Sd&>jW>haI_Uhsp%lI21O`>Fr@;;@ExmNWuzL21b`c6DAe`W)sE2
zNv~NO7@Q0wBrHyFx&T>E4GcC+&f;)jFkD#qT%B22*;>;PXi(1$BVlD_W$6pg<|p_$
wGg}9o)sJCgU=dJWx>Hc0L8H&Dfq|Lf(8BN^2N!$}1G<~R)78&qol`;+09^E0<p2Nx

literal 0
HcwPel00001

diff --git a/default_images/res/commandimagelist/sch_navigateforward.png b/default_images/res/commandimagelist/sch_navigateforward.png
new file mode 100644
index 0000000000000000000000000000000000000000..14266bf79cf48b071966fcbd2bf59c13e40166bd
GIT binary patch
literal 320
zcwXxa@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>?0v
z(btiI;l}H)G9s&he1&9>AYTTCJOu`ZqBjf--#r-^T7EGw<To=gyijCdFx<t!Al}LE
z|9L7<?KV#r$B>F!Nq_$Tw`W#mP-u|QGzF3zQU`9_;0XJ$f8RX8*)|Rgh7CLiS|z2V
z0$4VzWaLm#n>2^JgkzV41H;2oMzin*yIDY598Op>Ft%J4OETzS0;*x-Vsv1b_?ES-
zF3?XvSfSwrmrI$QAfJS|LW9S(Gsm=#^y#n&IOr^?nBM9>;qUY5-}g^A%D}{tAC&e`
zEa7)_*bm_&Y42X8|Ns2;uzrat1EWh}8qnA-UIq>W2C?L%q-!hNE&+YO;OXk;vd$@?
F2>`DmVs8Kd

literal 0
HcwPel00001

diff --git a/default_images/sc/res/popup_select_current.png b/default_images/sc/res/popup_select_current.png
new file mode 100644
index 0000000000000000000000000000000000000000..18f981535e61134f54eabb28c7e6907eaf9e5dfc
GIT binary patch
literal 373
zcwXxa@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgga4i-U4ix+~AL1s#pxJHyX=jZ08
z=9Mrw7o{eaq^2m8XO?6rxO@5rgg5eu0~KBHba4!^IQ?|8qHvRgK<oXp5`Q?;X8&RS
z-{dkYeC}d_^|AZfc$s@<w)rj&oMo01)M=8L&S)bN&@2{zbLQ;7WqJ2*t1>)TYug%h
z?vUaS2WD9jCk+N32L=Wwj#LS@Nh*%fOQ%e#a^N&qS*r5%fS%#s-BrmA@h?wqc=2e}
zi#JLp#zy!1LgZy;-Mq^z>&IXD_gMPsuo?QA3>zF-BZd38`cf0ado#=4^k0-JuGVU+
zYhjC-JtNLv|GPp*Dr3i;`WD87?Kk)5D!uOLueCpBzrR&FOuOVm0K?gBK)*3~y85}S
Ib4q9e0FP{hC;$Ke

literal 0
HcwPel00001

diff --git a/default_images/sc/res/popup_unselect_current.png b/default_images/sc/res/popup_unselect_current.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe49d83d8f849bc8e9258bb88562f5fcf8e5dab2
GIT binary patch
literal 324
zcwXxa@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgga4i-Uim88j&E&_!lOI#yLobz*Y
zQ}ap~oQqNuOHxx5$}>wc6x=<11Hv2m#DR+Dd%8G=Se#Bya9}=q^W=X?4+b3r-@U=l
zjhtSV%t$FM{aUZ9tJ{`+eVt*#Vjz%|T$pvaYxCrEC)4vzn^k%vt}ij<VM(}iTc}kq
z<DBVf2}ubFi47+gu1<Emb^r)AY`yWp{)+Wxps2*0RdY9F-3v3C+Su5r*xNcmxL)SI
zn}yWJrsv-|r5Q@imc4zy-uR8Rn}WbcmxpT_JMRh35NG%@C0y?4O<q5sQyDy6{an^L
HB{Ts5FWq!I

literal 0
HcwPel00001

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 82e0634f5..fb0bd3411 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1744,9 +1744,12 @@ sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& r
 
         // Try to instanciate quickstart service. This service is not mandatory, so
         // do nothing if service is not available.
-        Reference < XComponent > xQuickstart( rSMgr->createInstanceWithArguments(
+        if ( bQuickstart )
+        {
+            Reference < XComponent > xQuickstart( rSMgr->createInstanceWithArguments(
                                                 DEFINE_CONST_UNICODE( "com.sun.star.office.Quickstart" ), aSeq ),
                                                 UNO_QUERY );
+        }
         return sal_True;
     }
     catch( ::com::sun::star::uno::Exception& )
diff --git a/desktop/source/app/checkinstall.cxx b/desktop/source/app/checkinstall.cxx
index 9826754b6..acdd15a0c 100644
--- a/desktop/source/app/checkinstall.cxx
+++ b/desktop/source/app/checkinstall.cxx
@@ -51,63 +51,69 @@ namespace desktop
 
 sal_Bool CheckInstallation( OUString& rTitle )
 {
-    Reference< XMultiServiceFactory > xSMgr = ::comphelper::getProcessServiceFactory();
-    Reference< XExactName > xExactName( xSMgr->createInstance( 
-                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                    "com.sun.star.comp.desktop.Evaluation" ))), 
-                                UNO_QUERY );
-    if ( xExactName.is() )
+    try
     {
-        try
+        Reference< XMultiServiceFactory > xSMgr = ::comphelper::getProcessServiceFactory();
+        Reference< XExactName > xExactName( xSMgr->createInstance( 
+                                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
+                                        "com.sun.star.comp.desktop.Evaluation" ))), 
+                                    UNO_QUERY );
+        if ( xExactName.is() )
         {
-            rTitle = xExactName->getExactName( rTitle );
-            Reference< XMaterialHolder > xMaterialHolder( xExactName, UNO_QUERY );
-            if ( xMaterialHolder.is() )
+            try
             {
-                com::sun::star::util::Date aExpirationDate;
-                Any a = xMaterialHolder->getMaterial();
-                if ( a >>= aExpirationDate )
+                rTitle = xExactName->getExactName( rTitle );
+                Reference< XMaterialHolder > xMaterialHolder( xExactName, UNO_QUERY );
+                if ( xMaterialHolder.is() )
                 {
-                    Date aToday;
-                    Date aTimeBombDate( aExpirationDate.Day, aExpirationDate.Month, aExpirationDate.Year );
-                    if ( aToday > aTimeBombDate )
+                    com::sun::star::util::Date aExpirationDate;
+                    Any a = xMaterialHolder->getMaterial();
+                    if ( a >>= aExpirationDate )
                     {
-                        InfoBox aInfoBox( NULL, String::CreateFromAscii( "This version has expired" ) );
-                        aInfoBox.Execute();
-                        return sal_False;
+                        Date aToday;
+                        Date aTimeBombDate( aExpirationDate.Day, aExpirationDate.Month, aExpirationDate.Year );
+                        if ( aToday > aTimeBombDate )
+                        {
+                            InfoBox aInfoBox( NULL, String::CreateFromAscii( "This version has expired" ) );
+                            aInfoBox.Execute();
+                            return sal_False;
+                        }
                     }
+                    
+                    return sal_True;
+                }
+                else
+                {
+                    InfoBox aInfoBox( NULL, rTitle );
+                    aInfoBox.Execute();
+                    return sal_False;
                 }
-                
-                return sal_True;
             }
-            else
+            catch ( RuntimeException& )
             {
-                InfoBox aInfoBox( NULL, rTitle );
-                aInfoBox.Execute();
+                // Evaluation version expired!
                 return sal_False;
             }
         }
-        catch ( RuntimeException& )
-        {
-            // Evaluation version expired!
-            return sal_False;
-        }
-    }
-    else
-    {
-        Reference< com::sun::star::container::XContentEnumerationAccess > rContent( xSMgr , UNO_QUERY );
-        if( rContent.is() )
+        else
         {
-            OUString sEvalService = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.office.Evaluation" ) );
-            Reference < com::sun::star::container::XEnumeration > rEnum = rContent->createContentEnumeration( sEvalService );
-            if ( rEnum.is() )
+            Reference< com::sun::star::container::XContentEnumerationAccess > rContent( xSMgr , UNO_QUERY );
+            if( rContent.is() )
             {
-                InfoBox aInfoBox( NULL, rTitle );
-                aInfoBox.Execute();
-                return sal_False;
+                OUString sEvalService = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.office.Evaluation" ) );
+                Reference < com::sun::star::container::XEnumeration > rEnum = rContent->createContentEnumeration( sEvalService );
+                if ( rEnum.is() )
+                {
+                    InfoBox aInfoBox( NULL, rTitle );
+                    aInfoBox.Execute();
+                    return sal_False;
+                }
             }
         }
     }
+    catch(Exception)
+    {
+    }
     
     return sal_True;
 }
diff --git a/dmake/make.c b/dmake/make.c
index b7bbdfd4a..0dfad3b34 100644
--- a/dmake/make.c
+++ b/dmake/make.c
@@ -251,9 +251,8 @@ Make_targets()/*
 
    for( lp = Targets->ce_prq; lp != NIL(LINK); lp = lp->cl_next ) {
       CELLPTR tgt = lp->cl_prq;
-      if( !(tgt->ce_attr & A_UPDATED) 
-          && (Verbose & V_MAKE) )
-          printf( "`%s' is up to date\n", tgt->CE_NAME );
+      if( !(tgt->ce_attr & A_UPDATED) )
+     printf( "`%s' is up to date\n", tgt->CE_NAME );
    }
 
    DB_RETURN( 0 );
diff --git a/dmake/tests/misc-13 b/dmake/tests/misc-13
index 7493e744b..a2381a8c0 100755
--- a/dmake/tests/misc-13
+++ b/dmake/tests/misc-13
@@ -38,7 +38,7 @@ TeSt.target :
 
 EOT
 
-output=`eval ${DMAKEPROG} -vm -r -f $file1`
+output=`eval ${DMAKEPROG} -r -f $file1`
 result=$?
 
 if echo "$output" | grep -v ".target' is up to date"  > /dev/null 2>&1 ; then
diff --git a/dmake/tests/misc-15 b/dmake/tests/misc-15
index a213c2d88..1c52324a8 100755
--- a/dmake/tests/misc-15
+++ b/dmake/tests/misc-15
@@ -37,7 +37,7 @@ MYTARGET:=\$(PWD)/target.abc
 
 EOT
 
-output=`eval ${DMAKEPROG} -vm -r -f $file1`
+output=`eval ${DMAKEPROG} -r -f $file1`
 result=$?
 
 if echo "$output" | grep "target.abc' is up to date"  > /dev/null 2>&1 ; then
diff --git a/dmake/tests/targets-28 b/dmake/tests/targets-28
index 0943eb667..da202b0d2 100755
--- a/dmake/tests/targets-28
+++ b/dmake/tests/targets-28
@@ -112,10 +112,10 @@ sleep 1
 
 # This tests that aa.x is not build as the dependency chain is intact with
 # the virtual target aa.y having the same time stamp as aa.z.
-output3=`eval ${DMAKEPROG} -vm -rf $file1 2>&1`
+output3=`eval ${DMAKEPROG} -rf $file1 2>&1`
 result3=$?
 
-if test $result3 = 0 && echo "$output3" | grep "aa.x' is up to date"  > /dev/null 2>&1 ; then
+if test $result3 = 0 -a "$output3" = "\`aa.x' is up to date" ; then
   echo "Subtest 3: OK"
   result3=0
 else
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index c75e5003c..82db20f2b 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -614,13 +614,13 @@ namespace drawinglayer
                         {
                             const GraphicAttr& rAttr = rGraphicPrimitive.getGraphicAttr();
 
-                            if(!rAttr.IsSpecialDrawMode() && !rAttr.IsMirrored() && !rAttr.IsRotated() && !rAttr.IsAdjusted())
+                            if(!rAttr.IsSpecialDrawMode() && !rAttr.IsAdjusted())
                             {
                                 const basegfx::B2DHomMatrix& rTransform = rGraphicPrimitive.getTransform();
                                 double fRotate, fShearX;
                                 rTransform.decompose(aScale, aTranslate, fRotate, fShearX);
 
-                                if(aScale.getX() > 0.0 && aScale.getY() > 0.0)
+                                if( basegfx::fTools::equalZero( fRotate ) && ( aScale.getX() > 0.0 ) && ( aScale.getY() > 0.0 ) )
                                 {
                                     bUsingPDFExtOutDevData = true;
                                     mpPDFExtOutDevData->BeginGroup();
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 7ec07e11c..ced105907 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -4,10 +4,6 @@
  *
  *  $RCSfile: vclprocessor2d.cxx,v $
  *
- *  $Revision: 1.31 $
- *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
- *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
  *
@@ -227,11 +223,13 @@ namespace drawinglayer
                         const basegfx::BColor aTextlineColor = maBColorModifierStack.getModifiedColor(pTCPP->getTextlineColor());
                         mpOutputDevice->SetTextLineColor( Color(aTextlineColor) );
 
-                                                // set Overline attribute
+                        // set Overline attribute
                         FontUnderline eFontOverline = mapTextLineStyle( pTCPP->getFontOverline() );
                         if( eFontOverline != UNDERLINE_NONE )
                         {
                             aFont.SetOverline( eFontOverline );
+                            const basegfx::BColor aOverlineColor = maBColorModifierStack.getModifiedColor(pTCPP->getOverlineColor());
+                            mpOutputDevice->SetOverlineColor( Color(aOverlineColor) );
                             if( pTCPP->getWordLineMode() )
                                 aFont.SetWordLineMode( true );
                         }
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 6a28c3d0f..41c5e4f82 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -40,14 +40,30 @@
 
 namespace extensions { namespace config { namespace ldap {
 
-
+oslModule		LdapConnection::s_Ldap_Module = NULL;
+t_ldap_unbind_s          LdapConnection::s_p_unbind_s = NULL;
+t_ldap_simple_bind_s	 LdapConnection::s_p_simple_bind_s = NULL;
+t_ldap_set_option        LdapConnection::s_p_set_option = NULL;
+t_ldap_err2string        LdapConnection::s_p_err2string = NULL;
+t_ldap_init              LdapConnection::s_p_init = NULL;
+t_ldap_msgfree           LdapConnection::s_p_msgfree = NULL;
+t_ldap_get_dn            LdapConnection::s_p_get_dn = NULL;
+t_ldap_first_entry       LdapConnection::s_p_first_entry = NULL;
+t_ldap_search_s          LdapConnection::s_p_search_s = NULL;
+t_ldap_value_free        LdapConnection::s_p_value_free = NULL;
+t_ldap_get_values        LdapConnection::s_p_get_values = NULL;
+t_ldap_memfree           LdapConnection::s_p_memfree = NULL;
 //------------------------------------------------------------------------------
 typedef int LdapErrCode;
 //------------------------------------------------------------------------------
 struct LdapMessageHolder
 {
     LdapMessageHolder() : msg(0) {}
-    ~LdapMessageHolder() { if (msg) ldap_msgfree(msg); }
+    ~LdapMessageHolder() 
+    { 
+        if (msg) 
+            (*LdapConnection::s_p_msgfree)(msg); 
+    }
 
     LDAPMessage * msg;
 
@@ -66,7 +82,7 @@ void LdapConnection::disconnect()
 {
     if (mConnection != NULL) 
     { 
-        ldap_unbind_s(mConnection) ;
+        (*s_p_unbind_s)(mConnection) ;
         mConnection = NULL;
     }
 }
@@ -85,11 +101,11 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
     {
         message.appendAscii(aOperation).appendAscii(": ") ; 
     }
-    message.appendAscii(ldap_err2string(aRetCode)).appendAscii(" (") ;
+    message.appendAscii((*LdapConnection::s_p_err2string)(aRetCode)).appendAscii(" (") ;
     sal_Char *stub = NULL ;
 
 #ifndef LDAP_OPT_SIZELIMIT // for use with OpenLDAP
-    ldap_get_lderrno(aConnection, NULL, &stub) ;
+    (*s_p_get_lderrno)(aConnection, NULL, &stub) ;
 #endif
     if (stub != NULL) 
     {
@@ -99,7 +115,7 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
         // string itself. At any rate freeing it seems to 
         // cause some undue problems at least on Windows.
         // This call is thus disabled for the moment.
-        //ldap_memfree(stub) ;
+        //(*s_p_memfree)(stub) ;
     }
     else { message.appendAscii(kNoSpecificMessage) ; }
     message.appendAscii(")") ;
@@ -126,20 +142,20 @@ void  LdapConnection::connectSimple()
         initConnection() ;
         // Set Protocol V3
         int version = LDAP_VERSION3;
-        ldap_set_option(mConnection,
+        (*s_p_set_option)(mConnection,
                         LDAP_OPT_PROTOCOL_VERSION,
                         &version);
 
 #ifdef LDAP_X_OPT_CONNECT_TIMEOUT // OpenLDAP doesn't support this and the func
         /* timeout is specified in milliseconds -> 4 seconds*/
         int timeout = 4000;
-        ldap_set_option( mConnection, 
+        (*s_p_set_option)( mConnection, 
                         LDAP_X_OPT_CONNECT_TIMEOUT, 
                         &timeout );
 #endif
         
         // Do the bind
-        LdapErrCode retCode = ldap_simple_bind_s(mConnection,
+        LdapErrCode retCode = (*s_p_simple_bind_s)(mConnection,
                                                mLdapDefinition.mAnonUser ,
                                                mLdapDefinition.mAnonCredentials) ;
 
@@ -160,7 +176,7 @@ void LdapConnection::initConnection()
 
     if (mLdapDefinition.mPort == 0) mLdapDefinition.mPort = LDAP_PORT;
 
-    mConnection = ldap_init(mLdapDefinition.mServer, 
+    mConnection = (*s_p_init)(mLdapDefinition.mServer, 
                             mLdapDefinition.mPort) ;
     if (mConnection == NULL) 
     {
@@ -186,7 +202,7 @@ void LdapConnection::initConnection()
     rtl::OString aUserDn =findUserDn( rtl::OUStringToOString(aUser, RTL_TEXTENCODING_ASCII_US));
 
     LdapMessageHolder result;
-    LdapErrCode retCode = ldap_search_s(mConnection,
+    LdapErrCode retCode = (*s_p_search_s)(mConnection,
                                       aUserDn,
                                       LDAP_SCOPE_BASE,
                                       "(objectclass=*)",
@@ -228,21 +244,21 @@ void LdapConnection::initConnection()
     sal_Char * attributes [2];
     attributes[0]= const_cast<sal_Char *>(LDAP_NO_ATTRS);
     attributes[1]= NULL;
-    LdapErrCode retCode = ldap_search_s(mConnection, 
+    LdapErrCode retCode = (*s_p_search_s)(mConnection, 
                                       mLdapDefinition.mBaseDN,
                                       LDAP_SCOPE_SUBTREE,
                                       filter.makeStringAndClear(), attributes, 0, &result.msg) ;
 
     checkLdapReturnCode("FindUserDn", retCode,mConnection) ;
     rtl::OString userDn ;
-    LDAPMessage *entry = ldap_first_entry(mConnection, result.msg) ;
+    LDAPMessage *entry = (*s_p_first_entry)(mConnection, result.msg) ;
 
     if (entry != NULL) 
     {
-        sal_Char *charsDn = ldap_get_dn(mConnection, entry) ;
+        sal_Char *charsDn = (*s_p_get_dn)(mConnection, entry) ;
         
         userDn = charsDn ;
-        ldap_memfree(charsDn) ;
+        (*s_p_memfree)(charsDn) ;
     }
     else
     {
@@ -264,7 +280,7 @@ rtl::OString LdapConnection::getSingleAttribute(
     attributes [0] = aAttribute ;
     attributes [1] = 0 ;
     LdapMessageHolder result ;
-    LdapErrCode retCode = ldap_search_s(mConnection,
+    LdapErrCode retCode = (*s_p_search_s)(mConnection,
                                       aDn,
                                       LDAP_SCOPE_BASE,
                                       "(objectclass=*)",
@@ -277,22 +293,60 @@ rtl::OString LdapConnection::getSingleAttribute(
         return value ;
     }
     checkLdapReturnCode("GetSingleAttribute", retCode, mConnection) ;
-    LDAPMessage *entry = ldap_first_entry(mConnection, result.msg) ;
+    LDAPMessage *entry = (*s_p_first_entry)(mConnection, result.msg) ;
 
     if (entry != NULL)
     {
-        sal_Char **values = ldap_get_values(mConnection, entry, 
+        sal_Char **values = (*s_p_get_values)(mConnection, entry, 
                                             aAttribute) ;
 
         if (values != NULL)
         {
             if (*values != NULL) { value = *values ; }
-            ldap_value_free(values) ;
+            (*s_p_value_free)(values) ;
         }
     }
     return value ;
 }
 
+extern "C" { static void SAL_CALL thisModule() {} }
+void LdapConnection::loadModule()
+{
+    if ( !s_Ldap_Module )
+    {
+#if defined(WIN) || defined(WNT)
+#       define LIBLDAP "nsldap32v50.dll"
+#else
+#   ifdef WITH_OPENLDAP
+#       define xstr(s) str(s)
+#       define str(s) #s
+#       define LIBLDAP "libldap-" xstr(LDAP_VENDOR_VERSION_MAJOR) "." xstr(LDAP_VENDOR_VERSION_MINOR) ".so." xstr(LDAP_VENDOR_VERSION_MAJOR)
+#   else
+#       define LIBLDAP "libldap50.so"
+#   endif
+#endif
+        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP));
+
+        // load the dbtools library
+        s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);
+        if ( s_Ldap_Module != NULL )
+        {
+            s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_unbind_s").pData));
+            s_p_simple_bind_s = (t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_simple_bind_s").pData));
+            s_p_set_option = (t_ldap_set_option)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_set_option").pData));
+            s_p_err2string = (t_ldap_err2string)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_err2string").pData));
+            s_p_init = (t_ldap_init)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_init").pData));
+            s_p_msgfree = (t_ldap_msgfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_msgfree").pData));
+            s_p_get_dn = (t_ldap_get_dn)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_dn").pData));
+            s_p_first_entry = (t_ldap_first_entry)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_first_entry").pData));
+            s_p_search_s = (t_ldap_search_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_search_s").pData));
+            s_p_value_free = (t_ldap_value_free)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_value_free").pData));
+            s_p_get_values = (t_ldap_get_values)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_values").pData));
+            s_p_memfree = (t_ldap_memfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_memfree").pData));
+        }
+    }
+}
+
 //------------------------------------------------------------------------------
 } } } // extensions.config.ldap
 
diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index ea176fbe9..9a662f8c7 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -34,10 +34,9 @@
 #include "wrapldapinclude.hxx"
 #include <com/sun/star/ldap/LdapGenericException.hpp>
 
-#ifndef _COM_SUN_STAR_LDAP_LDAP_CONNECTIONEXCEPTION_HPP_
 #include <com/sun/star/ldap/LdapConnectionException.hpp>
-#endif // _COM_SUN_STAR_LDAP_LDAP_CONNECTIONEXCEPTION_HPP_
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <osl/module.h>
 
 namespace extensions { namespace config { namespace ldap {
 
@@ -50,6 +49,18 @@ namespace ldap = css::ldap ;
 struct LdapUserProfile;
 class LdapUserProfileMap;
 
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_unbind_s)( LDAP *ld );
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_simple_bind_s)( LDAP *ld, const char *who,	const char *passwd );
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_set_option)( LDAP *ld, int option,	const void *optdata );
+typedef LDAP_API(char *) (LDAP_CALL *t_ldap_err2string)( int err );
+typedef LDAP_API(LDAP *) (LDAP_CALL *t_ldap_init)( const char *defhost, int defport );
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_msgfree)( LDAPMessage *lm );
+typedef LDAP_API(char *) (LDAP_CALL *t_ldap_get_dn)( LDAP *ld, LDAPMessage *entry );
+typedef LDAP_API(LDAPMessage *) (LDAP_CALL *t_ldap_first_entry)( LDAP *ld, 	LDAPMessage *chain );
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_search_s)( LDAP *ld, const char *base, int scope,	const char *filter, char **attrs, int attrsonly, LDAPMessage **res );
+typedef LDAP_API(void) (LDAP_CALL *t_ldap_value_free)( char **vals );
+typedef LDAP_API(char **) (LDAP_CALL *t_ldap_get_values)( LDAP *ld, LDAPMessage *entry,	const char *target );
+typedef LDAP_API(void) (LDAP_CALL *t_ldap_memfree)( void *p );
 //------------------------------------------------------------------------------
 /** Struct containing the information on LDAP connection */
 struct LdapDefinition
@@ -75,6 +86,7 @@ struct LdapDefinition
 /** Class encapulating all LDAP functionality */
 class LdapConnection 
 {
+    friend struct LdapMessageHolder;
 public:
     
     /** Default constructor */
@@ -124,6 +136,12 @@ public:
         throw (lang::IllegalArgumentException,
                 ldap::LdapConnectionException, 
                 ldap::LdapGenericException);
+
+    void loadModule();
+
+    static t_ldap_err2string        s_p_err2string;
+    static t_ldap_value_free        s_p_value_free;
+    static t_ldap_get_values        s_p_get_values;
 private:
     
     void initConnection()
@@ -142,6 +160,19 @@ private:
     /** LDAP connection object */
     LDAP* mConnection ;
     LdapDefinition mLdapDefinition;
+
+    static oslModule		        s_Ldap_Module;
+    static t_ldap_unbind_s          s_p_unbind_s;
+    static t_ldap_simple_bind_s	    s_p_simple_bind_s;
+    static t_ldap_set_option        s_p_set_option;
+    static t_ldap_init              s_p_init;
+    static t_ldap_msgfree           s_p_msgfree;
+    static t_ldap_get_dn            s_p_get_dn;
+    static t_ldap_first_entry       s_p_first_entry;
+    static t_ldap_search_s          s_p_search_s;
+    
+    static t_ldap_memfree           s_p_memfree;
+
 } ;
 //------------------------------------------------------------------------------
 }} }
diff --git a/extensions/source/config/ldap/ldapuserprof.cxx b/extensions/source/config/ldap/ldapuserprof.cxx
index 22d7c6b0e..881b92117 100644
--- a/extensions/source/config/ldap/ldapuserprof.cxx
+++ b/extensions/source/config/ldap/ldapuserprof.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 #include "ldapuserprof.hxx"
-
+#include "ldapaccess.hxx"
 namespace extensions { namespace config { namespace ldap {
 //==============================================================================
 
@@ -127,14 +127,14 @@ void LdapUserProfileMap::ldapToUserProfile(LDAP *aConnection,
         for (sal_uInt32 j = 0 ; 
                 j < mMapping [i].mLdapAttributes.size() ; ++ j) 
         {
-            values = ldap_get_values(aConnection, aEntry,
+            values = (*LdapConnection::s_p_get_values)(aConnection, aEntry,
                                      mMapping [i].mLdapAttributes [j]) ;
             
             if (values != NULL)  
             {
                 aProfile.mProfile[i].mValue = rtl::OStringToOUString(
                     *values, RTL_TEXTENCODING_UTF8);
-                ldap_value_free(values);
+                (*LdapConnection::s_p_value_free)(values);
                 break;
             }
         }
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index 4b7430d23..6e1eebb37 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -112,27 +112,30 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex
         OSL_ENSURE(!bReentrantCall, "configuration: Ldap Backend constructor called reentrantly - probably a registration error.");
 
         if (!bReentrantCall)
-        try
         {
-            bReentrantCall = true ;
-            if (! readLdapConfiguration(aDefinition) )
+            try
             {
-                throw backend::BackendSetupException(
-                    rtl::OUString::createFromAscii("LdapUserProfileBe- LDAP not configured"),           
-                    NULL, uno::Any()); 	
+                bReentrantCall = true ;
+                if (! readLdapConfiguration(aDefinition) )
+                {
+                    throw backend::BackendSetupException(
+                        rtl::OUString::createFromAscii("LdapUserProfileBe- LDAP not configured"),           
+                        NULL, uno::Any()); 	
+                }
+                    
+                bReentrantCall = false ;
+            }
+            catch (uno::Exception&)
+            {
+                bReentrantCall = false;
+                throw;
             }
-                
-            bReentrantCall = false ;
-        }
-        catch (uno::Exception&)
-        {
-            bReentrantCall = false;
-            throw;
         }
     }
 
     try
     {
+        mLdapSource->mConnection.loadModule();
         mLdapSource->mConnection.connectSimple(aDefinition);
         //Set the UserDN
         mUserDN = mLdapSource->mConnection.findUserDn(
diff --git a/extensions/source/config/ldap/makefile.mk b/extensions/source/config/ldap/makefile.mk
index acd47ab9e..5ff3da4d2 100644
--- a/extensions/source/config/ldap/makefile.mk
+++ b/extensions/source/config/ldap/makefile.mk
@@ -82,7 +82,6 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=$(LIB1TARGET)
 SHL1IMPLIB=i$(SHL1TARGET)
 SHL1STDLIBS=    \
-        $(LDAPSDKLIB) \
         $(CPPUHELPERLIB) \
         $(CPPULIB) \
         $(SALHELPERLIB) \
diff --git a/extensions/source/config/ldap/wrapldapinclude.hxx b/extensions/source/config/ldap/wrapldapinclude.hxx
index ba2a17bf5..0d9918d96 100644
--- a/extensions/source/config/ldap/wrapldapinclude.hxx
+++ b/extensions/source/config/ldap/wrapldapinclude.hxx
@@ -35,6 +35,12 @@
 
 #ifdef WITH_OPENLDAP
 #include <ldap.h>
+#ifndef LDAP_API
+#    define LDAP_API(rt) rt
+#endif
+#ifndef LDAP_CALL
+#    define LDAP_CALL
+#endif
 #else
 #ifndef LDAP_INCLUDED
 #define LDAP_INCLUDED
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 41dc5b723..e132481e3 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -72,6 +72,7 @@ using namespace boost;
 using namespace osl;
 using namespace rtl;
 using namespace cppu;
+using namespace com::sun::star::script;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::bridge::oleautomation;
@@ -111,7 +112,7 @@ IUnknownWrapper_Impl::IUnknownWrapper_Impl( Reference<XMultiServiceFactory>& xFa
                                            sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass):
     UnoConversionUtilities<IUnknownWrapper_Impl>( xFactory, unoWrapperClass, comWrapperClass),
     m_pxIdlClass( NULL), m_eJScript( JScriptUndefined),
-    m_bComTlbIndexInit(false)
+    m_bComTlbIndexInit(false),  m_bHasDfltMethod(false), m_bHasDfltProperty(false)
 {
 }
 
@@ -150,17 +151,15 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl()
 Any IUnknownWrapper_Impl::queryInterface(const Type& t)
     throw (RuntimeException)
 {
-    if (t == getCppuType(static_cast<Reference<XInvocation>*>( 0)))
-    {
-        if (m_spDispatch)
-            return WeakImplHelper4<XInvocation, XBridgeSupplier2,
-                XInitialization, XAutomationObject>::queryInterface(t);
-        else
+    if (t == getCppuType(static_cast<Reference<XDefaultMethod>*>( 0)) && !m_bHasDfltMethod )
             return Any();
-    }
+    if (t == getCppuType(static_cast<Reference<XDefaultProperty>*>( 0)) && !m_bHasDfltProperty )
+        return Any();
+    if (t == getCppuType(static_cast<Reference<XInvocation>*>( 0)) && !m_spDispatch)
+        return Any();
 
-    return WeakImplHelper4<XInvocation, XBridgeSupplier2,
-        XInitialization, XAutomationObject>::queryInterface(t);
+    return WeakImplHelper6<XInvocation, XBridgeSupplier2,
+        XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod>::queryInterface(t);
 }
 
 Reference<XIntrospectionAccess> SAL_CALL IUnknownWrapper_Impl::getIntrospection(void)
@@ -1197,6 +1196,47 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument
 
     aArguments[1] >>= m_bOriginalDispatch;    
     aArguments[2] >>= m_seqTypes;
+    try
+    {
+        ITypeInfo* pType= getTypeInfo();
+        // Get Default member
+        CComBSTR defaultMemberName;
+        if ( SUCCEEDED( pType->GetDocumentation(0, &defaultMemberName, 0, 0, 0 ) ) )
+        {
+            OUString usName(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(defaultMemberName)));
+            FuncDesc aDescGet(pType);
+            FuncDesc aDescPut(pType);
+            VarDesc aVarDesc(pType);
+            // see if this is a property first ( more likely to be a property then a method )
+            getPropDesc( usName, & aDescGet, & aDescPut, & aVarDesc);
+
+            if ( !aDescGet && !aDescPut )
+            {
+                getFuncDesc( usName, &aDescGet );
+                if ( !aDescGet )
+                    // we're knackered
+                    throw RuntimeException();
+                
+}
+            // now for some funny heuristics to make basic understand what to do
+            // a single aDescGet ( that doesn't take any params ) would be 
+            // a read only ( defaultmember ) property e.g. this object
+            // should implement XDefaultProperty
+            // a single aDescGet ( that *does* ) take params is basically a
+            // default method e.g. implement XDefaultMethod
+
+            // a DescPut ( I guess we only really support a default param with '1' param ) as a setValue ( but I guess we can leave it through, the object will fail if we don't get it right anyway )
+            if ( aDescPut || ( aDescGet && aDescGet->cParams == 0 ) )
+                m_bHasDfltProperty = true;
+            if ( aDescGet->cParams > 0 )
+                m_bHasDfltMethod = true;
+            if ( m_bHasDfltProperty || m_bHasDfltMethod )
+                m_sDefaultMember = usName;
+        }
+    }
+    catch( Exception& )
+    {
+    } 
 }
 
 // UnoConversionUtilities --------------------------------------------------------------------------------
@@ -1448,6 +1488,9 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName,
         arDispidNamedArgs.reset(new DISPID[nSizeAr]);   
         HRESULT hr = getTypeInfo()->GetIDsOfNames(arNames, nSizeAr,
                                                   arDispidNamedArgs.get()); 
+        if ( hr == E_NOTIMPL )
+            hr = m_spDispatch->GetIDsOfNames(IID_NULL, arNames, nSizeAr, LOCALE_USER_DEFAULT, arDispidNamedArgs.get() );
+
         if (hr == S_OK)
         {
             // In a "property put" operation, the property value is a named param with the
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index badc65464..fa2627975 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -53,11 +53,14 @@
 #endif
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase6.hxx>
 
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
 #include <rtl/ustring.hxx>
 
+#include <com/sun/star/script/XDefaultProperty.hpp>
+#include <com/sun/star/script/XDefaultMethod.hpp>
 
 #include <typelib/typedescription.hxx>
 #include "unoconversionutilities.hxx"
@@ -81,7 +84,8 @@ typedef hash_multimap<OUString, unsigned int, hashOUString_Impl, equalOUString_I
 // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object.
 // If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component.
 // The interface is not a real interface in terms of an abstract class but is realized through IDispatch.
-class IUnknownWrapper_Impl : public WeakImplHelper4<XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject>,
+class IUnknownWrapper_Impl : public WeakImplHelper6<XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod>,
+
                              public UnoConversionUtilities<IUnknownWrapper_Impl>
 
 {
@@ -129,7 +133,9 @@ public:
     // XInitialization
     virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
         throw(Exception, RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
 protected:
+    virtual ::rtl::OUString SAL_CALL getDefaultMethodName(  ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
     
     // ----------------------------------------------------------------------------
     virtual Any invokeWithDispIdUnoTlb(const OUString& sFunctionName,
@@ -256,6 +262,9 @@ protected:
     bool m_bComTlbIndexInit;
     // Keeps the ITypeInfo obtained from IDispatch::GetTypeInfo
     CComPtr< ITypeInfo > m_spTypeInfo;
+    rtl::OUString m_sDefaultMember;
+    bool m_bHasDfltMethod;
+    bool m_bHasDfltProperty;
 };
 
 } // end namespace
diff --git a/extensions/source/plugin/aqua/macmgr.cxx b/extensions/source/plugin/aqua/macmgr.cxx
index fd0f257e5..8c09befa0 100644
--- a/extensions/source/plugin/aqua/macmgr.cxx
+++ b/extensions/source/plugin/aqua/macmgr.cxx
@@ -400,12 +400,48 @@ static int parseMimeResource( CFBundleRef i_xBundle,
     return nAdded;
 }
 
+// check some known bad plugins to avoid crashes
+static bool checkBlackList( CFBundleRef i_xBundle )
+{
+    rtl::OUString aBundleName;
+    CFTypeRef bundlename = CFBundleGetValueForInfoDictionaryKey( i_xBundle, CFSTR("CFBundleName"));
+    if( bundlename && CFGetTypeID(bundlename) == CFStringGetTypeID() )
+        aBundleName = getString( static_cast<CFStringRef>(bundlename) );
+
+    rtl::OUString aBundleVersion;
+    CFTypeRef bundleversion = CFBundleGetValueForInfoDictionaryKey( i_xBundle, CFSTR("CFBundleVersion"));
+    if( bundleversion && CFGetTypeID(bundleversion) == CFStringGetTypeID() )
+        aBundleVersion = getString( static_cast<CFStringRef>(bundleversion) );
+    
+    // #i102735# VLC plugin prior to 1.0 tends to crash 
+    if( aBundleName.equalsAscii( "VLC Plug-in" ) )
+    {
+        sal_Int32 nIndex = 0;
+        rtl::OUString aMajor( aBundleVersion.getToken( 0, '.', nIndex ) );
+        if( aMajor.toInt32() < 1 )
+        {
+            #if OSL_DEBUG_LEVEL > 1
+            fprintf( stderr, "rejecting VCL plugin (%s %s)\n",
+                     rtl::OUStringToOString( aBundleName, RTL_TEXTENCODING_UTF8 ).getStr(),
+                     rtl::OUStringToOString( aBundleVersion, RTL_TEXTENCODING_UTF8 ).getStr()
+                     );
+            #endif
+            return true;
+        }
+    }
+    
+    return false;
+}
+
 static int getPluginDescriptions( CFBundleRef i_xBundle , list< PluginDescription* >& io_rDescriptions )
 {
     int nDescriptions = 0;
     if( ! i_xBundle )
         return nDescriptions;
     
+    if( checkBlackList( i_xBundle ) )
+        return 0;
+
     rtl::OUString aPlugURL;
     CFURLRef xURL = CFBundleCopyBundleURL( i_xBundle );
     aPlugURL = getString( xURL );
@@ -424,7 +460,8 @@ static int getPluginDescriptions( CFBundleRef i_xBundle , list< PluginDescriptio
     fprintf( stderr, "URL: %s\nname: %s\ndescription: %s\n",
         rtl::OUStringToOString( aPlugURL, RTL_TEXTENCODING_UTF8 ).getStr(),
         rtl::OUStringToOString( aPlugName, RTL_TEXTENCODING_UTF8 ).getStr(),
-        rtl::OUStringToOString( aPlugDescription, RTL_TEXTENCODING_UTF8 ).getStr() );
+        rtl::OUStringToOString( aPlugDescription, RTL_TEXTENCODING_UTF8 ).getStr()
+        );
     #endif
     
     
diff --git a/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu b/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu
index 9efffbea6..53a7f5b74 100644
--- a/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu
+++ b/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu
@@ -1,5 +1,5 @@
     <node oor:name="writer_MS_Word_2007" oor:op="replace" >
-        <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.WriterFilterDetector</value></prop>
+    <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
         <prop oor:name="URLPattern"/>
         <prop oor:name="Extensions"><value>docx docm</value></prop>
         <prop oor:name="MediaType"><value>application/msword</value></prop>
diff --git a/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu b/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu
index 84e652587..c0ec68200 100644
--- a/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu
@@ -1,5 +1,5 @@
     <node oor:name="writer_MS_Word_2007_Template" oor:op="replace" >
-        <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.WriterFilterDetector</value></prop>
+    <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
         <prop oor:name="URLPattern"/>
         <prop oor:name="Extensions"><value>dotx dotm</value></prop>
         <prop oor:name="MediaType"><value>application/msword</value></prop>
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 2afd0c728..bc84af078 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -503,7 +503,7 @@ TabPage  RID_PDF_TAB_SECURITY
         TabStop = TRUE ;
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 12, 5 ) ;
-        Size = MAP_APPFONT ( 100 , 13 ) ;
+        Size = MAP_APPFONT ( 120 , 13 ) ;
         Text[ en-US ] = "Set ~open password...";
     };
 
@@ -538,7 +538,7 @@ TabPage  RID_PDF_TAB_SECURITY
         TabStop = TRUE ;
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 12, 45 ) ;
-        Size = MAP_APPFONT ( 100 , 13 ) ;
+        Size = MAP_APPFONT ( 120 , 13 ) ;
         Text[ en-US ] = "Set ~permission password...";
     };
 
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index ab8b85dce..484395f6a 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -97,8 +97,8 @@ Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMul
 // - PDFDialog -
 // -------------
 
-PDFDialog::PDFDialog( const Reference< XMultiServiceFactory > &rxMSF ) :
-    OGenericUnoDialog( rxMSF )
+PDFDialog::PDFDialog( const Reference< XMultiServiceFactory > &rxMSF )
+: PDFDialog_Base( rxMSF )
 {
     ByteString aResMgrName( "pdffilter" );
 
@@ -114,37 +114,6 @@ PDFDialog::~PDFDialog()
 
 // -----------------------------------------------------------------------------
 
-Any SAL_CALL PDFDialog::queryInterface( const Type& rType ) 
-    throw (RuntimeException)
-{
-    Any aReturn = OGenericUnoDialog::queryInterface( rType );
-
-    if( !aReturn.hasValue() )
-        aReturn = ::cppu::queryInterface( rType, 
-                                          static_cast< XPropertyAccess* >( this ),
-                                          static_cast< XExporter* >( this ) );
-
-    return aReturn;
-}
-
-// -----------------------------------------------------------------------------
-
-void SAL_CALL PDFDialog::acquire() 
-    throw ()
-{
-    OWeakObject::acquire();
-}
-
-// -----------------------------------------------------------------------------
-
-void SAL_CALL PDFDialog::release() 
-    throw ()
-{
-    OWeakObject::release();
-}
-
-// -----------------------------------------------------------------------------
-
 Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId() 
     throw(RuntimeException)
 {
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index 399a4b112..fc6acdda1 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -34,6 +34,8 @@
 #include "pdffilter.hxx"
 #include <svtools/genericunodialog.hxx>
 
+#include <cppuhelper/implbase2.hxx>
+
 // -------------
 // - PDFDialog -
 // -------------
@@ -41,10 +43,15 @@
 class Window;
 class ResMgr;
 
-class PDFDialog : public ::svt::OGenericUnoDialog,
-                  public ::comphelper::OPropertyArrayUsageHelper< PDFDialog >,
-                  public XPropertyAccess,
-                  public XExporter
+typedef ::svt::OGenericUnoDialog             PDFDialog_DialogBase;
+typedef ::cppu::ImplInheritanceHelper2  <
+                                             PDFDialog_DialogBase,
+                                             XPropertyAccess,
+                                             XExporter
+                                        >    PDFDialog_Base;
+
+class PDFDialog : public PDFDialog_Base,
+                  public ::comphelper::OPropertyArrayUsageHelper< PDFDialog >
 {
 private:
 
@@ -54,12 +61,6 @@ private:
     Reference< XComponent >     mxSrcDoc;
 
 protected:
-
-    // XInterface
-    virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException);
-    virtual void SAL_CALL acquire() throw ();
-    virtual void SAL_CALL release() throw ();
-
     // OGenericUnoDialog
     virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException);
     virtual OUString SAL_CALL getImplementationName() throw (RuntimeException);
diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
index bdf66af9f..79d73d4da 100644
--- a/filter/source/svg/gfxtypes.hxx
+++ b/filter/source/svg/gfxtypes.hxx
@@ -174,6 +174,7 @@ struct State
         mbVisibility(true),
         meFillType(SOLID),
         mnFillOpacity(1.0),
+        mnOpacity(1.0),
         meStrokeType(NONE),
         mnStrokeOpacity(1.0),
         meViewportFillType(NONE),
@@ -220,6 +221,7 @@ struct State
 
     PaintType                   meFillType;
     double                      mnFillOpacity;
+    double                      mnOpacity;
     PaintType                   meStrokeType;
     double                      mnStrokeOpacity;
     PaintType                   meViewportFillType;
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 1e4570cb0..8a3374575 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -519,12 +519,12 @@ struct AnnotatingVisitor
                                       rtl::OUString::valueOf(
                                           maGradientStopVector[
                                               rState.maFillGradient.maStops[0]].maStopColor.a*
-                                          maCurrState.mnFillOpacity*100.0)+USTR("%" ) );
+                                          maCurrState.mnFillOpacity*maCurrState.mnOpacity*100.0)+USTR("%" ) );
                 xAttrs->AddAttribute( USTR( "draw:start" ), 
                                       rtl::OUString::valueOf(
                                           maGradientStopVector[
                                               rState.maFillGradient.maStops[1]].maStopColor.a*
-                                          maCurrState.mnFillOpacity*100.0)+USTR("%" ) );
+                                          maCurrState.mnFillOpacity*maCurrState.mnOpacity*100.0)+USTR("%" ) );
                 xAttrs->AddAttribute( USTR( "draw:border" ), USTR("0%") );
                 mxDocumentHandler->startElement( USTR("draw:opacity"), 
                                                  xUnoAttrs );
@@ -616,17 +616,17 @@ struct AnnotatingVisitor
                         xAttrs->AddAttribute( USTR( "draw:opacity-name" ), 
                                               getStyleName("svgopacity", rState.maFillGradient.mnId) );
                     }
-                    else if( maCurrState.mnFillOpacity != 1.0 )
+                    else if( maCurrState.mnFillOpacity*maCurrState.mnOpacity != 1.0 )
                         xAttrs->AddAttribute( USTR( "draw:opacity" ), 
-                                              rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity)+USTR("%") );
+                                              rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+USTR("%") );
                 }
                 else
                 {
                     xAttrs->AddAttribute( USTR( "draw:fill" ), USTR("solid"));
                     xAttrs->AddAttribute( USTR( "draw:fill-color" ), getOdfColor(rState.maFillColor));
-                    if( maCurrState.mnFillOpacity != 1.0 )
+                    if( maCurrState.mnFillOpacity*maCurrState.mnOpacity != 1.0 )
                         xAttrs->AddAttribute( USTR( "draw:opacity" ), 
-                                              rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity)+USTR("%") );
+                                              rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+USTR("%") );
                 }
             }
             else
@@ -652,9 +652,9 @@ struct AnnotatingVisitor
                 xAttrs->AddAttribute( USTR( "draw:stroke-linejoin"), USTR("round"));
             else if( maCurrState.meLineJoin == basegfx::B2DLINEJOIN_BEVEL )
                 xAttrs->AddAttribute( USTR( "draw:stroke-linejoin"), USTR("bevel"));
-            if( maCurrState.mnStrokeOpacity != 1.0 )
+            if( maCurrState.mnStrokeOpacity*maCurrState.mnOpacity != 1.0 )
                 xAttrs->AddAttribute( USTR("svg:stroke-opacity"), 
-                                      rtl::OUString::valueOf(100.0*maCurrState.mnStrokeOpacity)+USTR("%"));
+                                      rtl::OUString::valueOf(100.0*maCurrState.mnStrokeOpacity*maCurrState.mnOpacity)+USTR("%"));
         }
 
         mxDocumentHandler->startElement( USTR("style:graphic-properties"), 
@@ -876,6 +876,12 @@ struct AnnotatingVisitor
                     maCurrState.meFillRule = maParentStates.back().meFillRule;
                 break;
             }
+            case XML_OPACITY:
+                if( aValueUtf8 == "inherit" )
+                    maCurrState.mnOpacity = maParentStates.back().mnOpacity;
+                else
+                    maCurrState.mnOpacity = aValueUtf8.toDouble();
+                break;
             case XML_FILL_OPACITY:
                 if( aValueUtf8 == "inherit" )
                     maCurrState.mnFillOpacity = maParentStates.back().mnFillOpacity;
@@ -2540,13 +2546,13 @@ struct ShapeRenderingVisitor
                 const BYTE	cTransStart( 255-
                     basegfx::fround(mrGradientStopVector[
                                         aState.maFillGradient.maStops[1]].maStopColor.a*
-                                    aState.mnFillOpacity*255.0));
+                                    aState.mnFillOpacity*maCurrState.mnOpacity*255.0));
                 const Color aTransStart( cTransStart, cTransStart, cTransStart );
 
                 const BYTE	cTransEnd( 255-
                     basegfx::fround(mrGradientStopVector[
                                         aState.maFillGradient.maStops[0]].maStopColor.a*
-                                    aState.mnFillOpacity*255.0));
+                                    aState.mnFillOpacity*maCurrState.mnOpacity*255.0));
                 const Color aTransEnd( cTransEnd, cTransEnd, cTransEnd );
 
                 // modulate gradient opacity with overall fill opacity
@@ -2594,10 +2600,10 @@ struct ShapeRenderingVisitor
             else
                 mrOutDev.SetFillColor(getVclColor(aState.maFillColor));
 
-            if( aState.mnFillOpacity != 1.0 )
+            if( aState.mnFillOpacity*maCurrState.mnOpacity != 1.0 )
                 mrOutDev.DrawTransparent(::PolyPolygon(aPoly),
                                          basegfx::fround(
-                                             (1.0-aState.mnFillOpacity)*100.0));
+                                             (1.0-(aState.mnFillOpacity*maCurrState.mnOpacity))*100.0));
             else
                 mrOutDev.DrawPolyPolygon(::PolyPolygon(aPoly));
         }
@@ -2652,10 +2658,10 @@ struct ShapeRenderingVisitor
 
             for( sal_uInt32 i=0; i<aPolys.size(); ++i )
             {
-                if( aState.mnStrokeOpacity != 1.0 )
+                if( aState.mnStrokeOpacity*maCurrState.mnOpacity != 1.0 )
                     mrOutDev.DrawTransparent(::PolyPolygon(aPolys[i]),
                                              basegfx::fround(
-                                                 (1.0-aState.mnStrokeOpacity)*100.0));
+                                                 (1.0-(aState.mnStrokeOpacity*maCurrState.mnOpacity))*100.0));
                 else
                     mrOutDev.DrawPolyPolygon(::PolyPolygon(aPolys[i]));
 
@@ -2675,10 +2681,10 @@ struct ShapeRenderingVisitor
             else
                 mrOutDev.SetLineColor(getVclColor(aState.maStrokeColor));
 
-            if( aState.mnStrokeOpacity != 1.0 )
+            if( aState.mnStrokeOpacity*maCurrState.mnOpacity != 1.0 )
                 mrOutDev.DrawTransparent(::PolyPolygon(aPoly),
                                          basegfx::fround(
-                                             (1.0-aState.mnStrokeOpacity)*100.0));
+                                             (1.0-(aState.mnStrokeOpacity*maCurrState.mnOpacity))*100.0));
             else
                 mrOutDev.DrawPolyPolygon(::PolyPolygon(aPoly));
         }
diff --git a/filter/source/xslt/export/spreadsheetml/formular.xsl b/filter/source/xslt/export/spreadsheetml/formular.xsl
index 859ef29c2..a6fe96a32 100644
--- a/filter/source/xslt/export/spreadsheetml/formular.xsl
+++ b/filter/source/xslt/export/spreadsheetml/formular.xsl
@@ -381,7 +381,7 @@
 					</xsl:when>
 					<xsl:otherwise>
 						<xsl:value-of select="$earlierCandidate" />
-						<xsl:variable name="parameterCandidate">
+						<xsl:variable name="parameterCandidate2">
 							<xsl:variable name="formularAfterCandidate" select="substring-after($expressionSuffix, $earlierCandidate)" />
 							<xsl:variable name="parameterTillBracket" select="concat(substring-before($formularAfterCandidate,')'),')')" />
 							<xsl:variable name="parameterTillComma" select="substring-before(substring-after($expressionSuffix, $parameterTillBracket),',')" />
@@ -405,8 +405,8 @@
 						<xsl:call-template name="getParameter">
 							<xsl:with-param name="closingBracketCount" select="$closingBracketCount" />
 							<xsl:with-param name="openingBracketCount" select="$openingBracketCount" />
-							<xsl:with-param name="parameterCandidate" select="$parameterCandidate" />
-							<xsl:with-param name="earlierCandidate" select="$parameterCandidate" />
+							<xsl:with-param name="parameterCandidate" select="$parameterCandidate2" />
+							<xsl:with-param name="earlierCandidate" select="$parameterCandidate2" />
 							<xsl:with-param name="expressionSuffix" select="$expressionSuffix" />
 						</xsl:call-template>
 					</xsl:otherwise>
diff --git a/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl b/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl
index e91fff273..c63600c2b 100644
--- a/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl
+++ b/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl
@@ -145,6 +145,17 @@
 						<RGB><xsl:value-of select="." /></RGB>
 					</Color>
 					</xsl:for-each>
+                    <xsl:for-each select="key('config', 'TabColor')[not(.=preceding::config:config-item)]">
+                    <xsl:sort select="." />
+                    <Color>
+                        <Index><xsl:value-of select="56 - position()" /></Index>
+                        <RGB>
+                            <xsl:call-template name="colordecimal2rgb">
+                                <xsl:with-param name="colordecimal" select="."/>
+                            </xsl:call-template>
+                        </RGB>
+                    </Color>
+                    </xsl:for-each>
 				</Colors>
 			</OfficeDocumentSettings>
 			<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
@@ -175,6 +186,160 @@
 		</Workbook>
 	</xsl:template>
 
+    <xsl:template name="colordecimal2rgb">
+        <xsl:param name="colordecimal"/>
+        <xsl:choose>
+            <xsl:when test="$colordecimal &lt;= 16777215 and $colordecimal &gt;= 65536">
+                <xsl:variable name="redValue" select="floor(($colordecimal) div 65536)"/>
+                <xsl:variable name="greenValue" select="floor(($colordecimal - ($redValue*65536)) div 256)"/>
+                <xsl:variable name="blueValue" select="$colordecimal - ($redValue*65536) - ($greenValue*256)"/>
+                <xsl:call-template name="dec_rgb2Hex">
+                    <xsl:with-param name="decRedValue" select="$redValue"/>
+                    <xsl:with-param name="decGreenValue" select="$greenValue"/>
+                    <xsl:with-param name="decBlueValue" select="$blueValue"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="$colordecimal &lt;= 65535 and $colordecimal &gt;= 256">
+                <xsl:variable name="redValue" select="0"/>
+                <xsl:variable name="greenValue" select="$colordecimal div 256"/>
+                <xsl:variable name="blueValue" select="$colordecimal - ($greenValue*256)"/>
+                <xsl:call-template name="dec_rgb2Hex">
+                    <xsl:with-param name="decRedValue" select="$redValue"/>
+                    <xsl:with-param name="decGreenValue" select="$greenValue"/>
+                    <xsl:with-param name="decBlueValue" select="$blueValue"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="$colordecimal &lt;= 255 and $colordecimal &gt;= 0">
+                <xsl:variable name="redValue" select="0"/>
+                <xsl:variable name="greenValue" select="0"/>
+                <xsl:variable name="blueValue" select="$colordecimal"/>
+                <xsl:call-template name="dec_rgb2Hex">
+                    <xsl:with-param name="decRedValue" select="$redValue"/>
+                    <xsl:with-param name="decGreenValue" select="$greenValue"/>
+                    <xsl:with-param name="decBlueValue" select="$blueValue"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise/>
+        </xsl:choose>
+    </xsl:template>
+    <xsl:template name="dec_rgb2Hex">
+        <xsl:param name="decRedValue"/>
+        <xsl:param name="decGreenValue"/>
+        <xsl:param name="decBlueValue"/>
+        <xsl:variable name="hexRedValue">
+            <xsl:variable name="tmpHexRedValue">
+                <xsl:call-template name="decimal2hex">
+                    <xsl:with-param name="dec-number" select="$decRedValue"/>
+                    <xsl:with-param name="last-value" select="'H'"/>
+                </xsl:call-template>
+            </xsl:variable>
+            <xsl:choose>
+                <xsl:when test="string-length($tmpHexRedValue) = 1">
+                    <xsl:value-of select="concat('0',$tmpHexRedValue)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$tmpHexRedValue"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="hexGreenValue">
+            <xsl:variable name="tmpHexGreenValue">
+                <xsl:call-template name="decimal2hex">
+                    <xsl:with-param name="dec-number" select="$decGreenValue"/>
+                    <xsl:with-param name="last-value" select="'H'"/>
+                </xsl:call-template>
+            </xsl:variable>
+            <xsl:choose>
+                <xsl:when test="string-length($tmpHexGreenValue) = 1">
+                    <xsl:value-of select="concat('0',$tmpHexGreenValue)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$tmpHexGreenValue"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="hexBlueValue">
+            <xsl:variable name="tmpHexBlueValue">
+                <xsl:call-template name="decimal2hex">
+                    <xsl:with-param name="dec-number" select="$decBlueValue"/>
+                    <xsl:with-param name="last-value" select="'H'"/>
+                </xsl:call-template>
+            </xsl:variable>
+            <xsl:choose>
+                <xsl:when test="string-length($tmpHexBlueValue) = 1">
+                    <xsl:value-of select="concat('0',$tmpHexBlueValue)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$tmpHexBlueValue"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:value-of select="concat('#',$hexRedValue,$hexGreenValue,$hexBlueValue)"/>
+    </xsl:template>
+    <xsl:template name="decimal2hex">
+        <!-- transforms a decimal number to a hex number,only for two-bit hex(less than 256 in decimal) currently -->
+        <xsl:param name="dec-number"/>
+        <xsl:param name="last-value"/>
+        <xsl:variable name="current-value">
+            <xsl:call-template name="decNumber2hex">
+                <xsl:with-param name="dec-value">
+                    <xsl:if test="$dec-number &gt; 15">
+                        <xsl:value-of select="floor($dec-number div 16)"/>
+                    </xsl:if>
+                    <xsl:if test="$dec-number &lt; 16">
+                        <xsl:value-of select="$dec-number"/>
+                    </xsl:if>
+                </xsl:with-param>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:if test="$dec-number &gt; 15">
+            <xsl:call-template name="decimal2hex">
+                <xsl:with-param name="dec-number" select="$dec-number mod 16"/>
+                <xsl:with-param name="last-value" select="concat($last-value,$current-value)"/>
+            </xsl:call-template>
+        </xsl:if>
+        <xsl:if test="$dec-number &lt; 16">
+            <xsl:value-of select="substring-after(concat($last-value,$current-value),'H')"/>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template name="decNumber2hex">
+        <!-- return a hex number for a decimal character -->
+        <xsl:param name="dec-value"/>
+        <xsl:choose>
+            <xsl:when test="$dec-value = 10">
+                <xsl:value-of select="'A'"/>
+            </xsl:when>
+            <xsl:when test="$dec-value = 11">
+                <xsl:value-of select="'B'"/>
+            </xsl:when>
+            <xsl:when test="$dec-value = 12">
+                <xsl:value-of select="'C'"/>
+            </xsl:when>
+            <xsl:when test="$dec-value = 13">
+                <xsl:value-of select="'D'"/>
+            </xsl:when>
+            <xsl:when test="$dec-value = 14">
+                <xsl:value-of select="'E'"/>
+            </xsl:when>
+            <xsl:when test="$dec-value = 15">
+                <xsl:value-of select="'F'"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$dec-value"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    <xsl:template name="GetTabColorIndex">
+        <xsl:param name="SheetColor"/>
+        <xsl:for-each select="key('config', 'TabColor')[not(.=preceding::config:config-item)]">
+        <xsl:sort select="." />
+            <xsl:variable name="tmpColor" select="."/>
+            <xsl:if test=". = $SheetColor" >
+                <xsl:value-of select="56 - position()"/>
+            </xsl:if>
+        </xsl:for-each>
+    </xsl:template>
 	<xsl:template match="office:body">
 		<!-- office:body table:table children are spreadsheets -->
 		<xsl:apply-templates />
@@ -187,8 +352,11 @@
 	<!-- office:body table:table children are spreadsheets -->
 	<xsl:template match="office:spreadsheet/table:table">
 		<xsl:element name="ss:Worksheet">
-			<xsl:attribute name="ss:Name">
+			<xsl:variable name="TableName">
 				<xsl:value-of select="@table:name" />
+			</xsl:variable>
+			<xsl:attribute name="ss:Name">
+				<xsl:value-of select="$TableName" />
 			</xsl:attribute>
 			<xsl:call-template name="table:table" />
 			<xsl:element name="x:WorksheetOptions">
@@ -204,6 +372,16 @@
 				<xsl:if test="key('config', 'ShowZeroValues') = 'false'">
 						<xsl:element name="x:DoNotDisplayZeros" />
 				</xsl:if>
+                <xsl:if test="/*/office:settings/config:config-item-set/config:config-item-map-indexed/config:config-item-map-entry/config:config-item-map-named/config:config-item-map-entry[@config:name=$TableName]/config:config-item[@config:name='TabColor']">
+                    <xsl:element name="x:TabColorIndex">
+                        <xsl:variable name="TabColorIndex">
+                            <xsl:call-template name="GetTabColorIndex">
+                                <xsl:with-param name="SheetColor" select="/*/office:settings/config:config-item-set/config:config-item-map-indexed/config:config-item-map-entry/config:config-item-map-named/config:config-item-map-entry[@config:name=$TableName]/config:config-item[@config:name='TabColor']"/>
+                            </xsl:call-template>
+                        </xsl:variable>
+                        <xsl:value-of select="$TabColorIndex"/>
+                    </xsl:element>
+                </xsl:if>
 			</xsl:element>
 		</xsl:element>
 	</xsl:template>
diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index a1576db37..6fcae4abe 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -385,6 +385,16 @@
 										</xsl:otherwise>
 									</xsl:choose>
 									<xsl:copy-of select="$sharedConfiguration"/>
+                                    <xsl:if test="x:WorksheetOptions/x:TabColorIndex">
+                                        <config:config-item config:name="TabColor" config:type="int">
+                                            <xsl:variable name="temp-value">
+                                                <xsl:call-template name="colorindex2decimal">
+                                                    <xsl:with-param name="colorindex" select="x:WorksheetOptions/x:TabColorIndex"/>
+                                                </xsl:call-template>
+                                            </xsl:variable>
+                                            <xsl:value-of select="$temp-value"/>
+                                        </config:config-item>
+                                    </xsl:if>
 								</config:config-item-map-entry>
 							</xsl:for-each>
 						</config:config-item-map-named>
@@ -4641,6 +4651,211 @@
 		</xsl:variable>
 		<xsl:value-of select="concat('#',$R-value,$G-value,$B-value)"/>
 	</xsl:template>
+    <xsl:template name="colorindex2decimal">
+        <xsl:param name="colorindex"/>
+        <xsl:variable name="colorIndexLookup">
+            <xsl:value-of select="$colorindex - 8"/>
+        </xsl:variable>
+        <xsl:variable name="tempColorValue">
+            <xsl:choose>
+                <!-- Grab the color from the custom color index if it exists... -->
+                <xsl:when test="/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:Index=$colorIndexLookup">
+                    <xsl:value-of select="substring-after(normalize-space(/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:RGB[/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:Index=$colorIndexLookup]), '#')"/>
+                </xsl:when >
+                <xsl:otherwise>
+                    <xsl:choose>
+                        <xsl:when test="$colorindex=8">
+                            <xsl:value-of select="'000000'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=9">
+                            <xsl:value-of select="'FFFFFF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=10">
+                            <xsl:value-of select="'FF0000'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=11">
+                            <xsl:value-of select="'00FF00'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=12">
+                            <xsl:value-of select="'0000FF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=13">
+                            <xsl:value-of select="'FFFF00'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=14">
+                            <xsl:value-of select="'FF00FF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=15">
+                            <xsl:value-of select="'00FFFF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=16">
+                            <xsl:value-of select="'800000'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=17">
+                            <xsl:value-of select="'008000'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=18">
+                            <xsl:value-of select="'000080'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=19">
+                            <xsl:value-of select="'808000'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=20">
+                            <xsl:value-of select="'800080'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=21">
+                            <xsl:value-of select="'008080'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=22">
+                            <xsl:value-of select="'C0C0C0'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=23">
+                            <xsl:value-of select="'808080'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=24">
+                            <xsl:value-of select="'9999FF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=25">
+                            <xsl:value-of select="'993366'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=26">
+                            <xsl:value-of select="'FFFFCC'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=27">
+                            <xsl:value-of select="'CCFFFF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=28">
+                            <xsl:value-of select="'660066'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=29">
+                            <xsl:value-of select="'FF8080'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=30">
+                            <xsl:value-of select="'0066CC'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=31">
+                            <xsl:value-of select="'CCCCFF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=32">
+                            <xsl:value-of select="'000080'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=33">
+                            <xsl:value-of select="'FF00FF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=34">
+                            <xsl:value-of select="'FFFF00'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=35">
+                            <xsl:value-of select="'00FFFF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=36">
+                            <xsl:value-of select="'800080'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=37">
+                            <xsl:value-of select="'800000'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=38">
+                            <xsl:value-of select="'008080'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=39">
+                            <xsl:value-of select="'0000FF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=40">
+                            <xsl:value-of select="'00CCFF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=41">
+                            <xsl:value-of select="'CCFFFF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=42">
+                            <xsl:value-of select="'CCFFCC'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=43">
+                            <xsl:value-of select="'FFFF99'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=44">
+                            <xsl:value-of select="'99CCFF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=45">
+                            <xsl:value-of select="'FF99CC'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=46">
+                            <xsl:value-of select="'CC99FF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=47">
+                            <xsl:value-of select="'FFCC99'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=48">
+                            <xsl:value-of select="'3366FF'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=49">
+                            <xsl:value-of select="'33CCCC'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=50">
+                            <xsl:value-of select="'99CC00'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=51">
+                            <xsl:value-of select="'FFCC00'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=52">
+                            <xsl:value-of select="'FF9900'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=53">
+                            <xsl:value-of select="'FF6600'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=54">
+                            <xsl:value-of select="'666699'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=55">
+                            <xsl:value-of select="'969696'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=56">
+                            <xsl:value-of select="'003366'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=57">
+                            <xsl:value-of select="'339966'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=58">
+                            <xsl:value-of select="'003300'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=59">
+                            <xsl:value-of select="'333300'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=60">
+                            <xsl:value-of select="'993300'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=61">
+                            <xsl:value-of select="'993366'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=62">
+                            <xsl:value-of select="'333399'"/>
+                        </xsl:when>
+                        <xsl:when test="$colorindex=63">
+                            <xsl:value-of select="'333333'"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="'NOTFOUND'"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="tempColorDecimal">
+            <xsl:choose>
+                    <xsl:when test="not($tempColorValue = 'NOTFOUND')">
+                        <xsl:call-template name="hex2decimal">
+                            <xsl:with-param name="hex-number" select="$tempColorValue"/>
+                            <xsl:with-param name="index" select="1"/>
+                            <xsl:with-param name="str-length" select="6"/>
+                            <xsl:with-param name="last-value" select="0"/>
+                        </xsl:call-template>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="4294967295"/>
+                    </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:value-of select="$tempColorDecimal"/>
+    </xsl:template>
 	<xsl:template name="hex2decimal">
 		<!-- transforms a hex number to a decimal number.parses the string from left to right -->
 		<xsl:param name="hex-number"/>
diff --git a/forms/qa/makefile.mk b/forms/qa/makefile.mk
index 822f67e1b..b34529e2f 100644
--- a/forms/qa/makefile.mk
+++ b/forms/qa/makefile.mk
@@ -73,15 +73,18 @@ ALL: 	ALLDEP
 
 .INCLUDE :  target.mk
 
+test:
+    echo $(SOLARBINDIR)
+
 .IF "$(BUILD_QADEVOOO)" == "YES"
 show_targets:
-    +@java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
+    +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
 
 run:
-    +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce
+    +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce
 
 run_%:
-    +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//)
+    +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//)
 
 .ELSE
 run: show_targets
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 418bdb7cc..35a312977 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -359,10 +359,10 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro
 		if (sGroupName.getLength() > 0)
 			return; // group hasn't changed; ignore this name change.
 		// no GroupName; use Name as GroupNme
-		evt.OldValue >>= sGroupName;
+        evt.OldValue >>= sGroupName;
 	}
 	else if (evt.PropertyName == PROPERTY_GROUP_NAME) {
-        evt.OldValue >>= sGroupName;
+		evt.OldValue >>= sGroupName;
 		if (sGroupName.getLength() == 0) {
 			// No prior GroupName; fallback to Nme
 			xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 3d16b39ee..7b5780d9f 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -231,51 +231,51 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
     if (nHandle == PROPERTY_ID_NAME)
     {
         setControlSource();
-    }
-
-    if (nHandle == PROPERTY_ID_DEFAULT_STATE)
-    {
-        sal_Int16 nValue;
-        rValue >>= nValue;
-        if (1 == nValue)
-        {	// bei allen Radios der selben Gruppe das 'default checked' ruecksetzen, denn wie schon der highlander wusste :
-            // es kann nur einen geben.
-            Any aZero;
-            nValue = 0;
-            aZero <<= nValue;
-            SetSiblingPropsTo(PROPERTY_DEFAULT_STATE, aZero);
-        }
-    }
+	}
+
+	if (nHandle == PROPERTY_ID_DEFAULT_STATE)
+	{
+		sal_Int16 nValue;
+		rValue >>= nValue;
+		if (1 == nValue)
+		{	// bei allen Radios der selben Gruppe das 'default checked' ruecksetzen, denn wie schon der highlander wusste :
+			// es kann nur einen geben.
+			Any aZero;
+			nValue = 0;
+			aZero <<= nValue;
+			SetSiblingPropsTo(PROPERTY_DEFAULT_STATE, aZero);
+		}
+	}
 }
 
 void ORadioButtonModel::setControlSource()
 {
-    Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
-    if (xIndexAccess.is())
-    {
+        Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
+        if (xIndexAccess.is())
+        {
         ::rtl::OUString sName, sGroupName;
 
         if (hasProperty(PROPERTY_GROUP_NAME, this))
             this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sGroupName;
         this->getPropertyValue(PROPERTY_NAME) >>= sName;
 
-        Reference<XPropertySet> xMyProps;
-        query_interface(static_cast<XWeak*>(this), xMyProps);
-        for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i)
-        {
-            Reference<XPropertySet>	xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
-            if (!xSiblingProperties.is())
-                continue;
+            Reference<XPropertySet> xMyProps;
+            query_interface(static_cast<XWeak*>(this), xMyProps);
+            for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i)
+            {
+                Reference<XPropertySet>	xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
+                if (!xSiblingProperties.is())
+                    continue;
 
-            if (xMyProps == xSiblingProperties)
-                // nur wenn ich nicht mich selber gefunden habe
-                continue;
+                if (xMyProps == xSiblingProperties)
+                    // nur wenn ich nicht mich selber gefunden habe
+                    continue;
 
-            sal_Int16 nType = 0;
-            xSiblingProperties->getPropertyValue(PROPERTY_CLASSID) >>= nType;
-            if (nType != FormComponentType::RADIOBUTTON)
-                // nur Radio-Buttons
-                continue;
+                sal_Int16 nType = 0;
+                xSiblingProperties->getPropertyValue(PROPERTY_CLASSID) >>= nType;
+                if (nType != FormComponentType::RADIOBUTTON)
+                    // nur Radio-Buttons
+                    continue;
 
             ::rtl::OUString sSiblingName, sSiblingGroupName;
             if (hasProperty(PROPERTY_GROUP_NAME, xSiblingProperties))
@@ -286,13 +286,13 @@ void ORadioButtonModel::setControlSource()
                  sName == sSiblingName) ||                                              //  names match) or
                 (sGroupName.getLength() != 0 && sSiblingGroupName.getLength() != 0 &&   // (have group name
                  sGroupName == sSiblingGroupName))                                      //  they match)
-            {
-                setPropertyValue(PROPERTY_CONTROLSOURCE, xSiblingProperties->getPropertyValue(PROPERTY_CONTROLSOURCE));
-                break;
+                {
+                    setPropertyValue(PROPERTY_CONTROLSOURCE, xSiblingProperties->getPropertyValue(PROPERTY_CONTROLSOURCE));
+                    break;
+                }
             }
         }
     }
-}
 
 //------------------------------------------------------------------------------
 void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index a16b43151..250aed4da 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -889,14 +889,14 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
 			{	
 				// add fake events to the control at index i
 				pIfcMgr->fakeVbaEventsHack( i );
-			}	
+    }
 		}
 		else
 		{
 			// add fake events to the control at index i
 			fakeVbaEventsHack(  _nIndex );	
 		}
-    }
+	}
 
     // notify derived classes
     implInserted( pElementMetaData );
@@ -1195,7 +1195,7 @@ void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const
     {
         m_xEventAttacher->registerScriptEvent( nIndex, aScriptEvent );
             fakeVbaEventsHack( nIndex ); // add fake vba events
-    }
+}
 }
 
 //------------------------------------------------------------------------
@@ -1206,7 +1206,7 @@ void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const
     {
         m_xEventAttacher->registerScriptEvents( nIndex, aScriptEvents );
         fakeVbaEventsHack( nIndex ); // add fake vba events
-    }
+}
 }
 
 //------------------------------------------------------------------------
diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx
index 1c4bf3f6d..a4dfbe3b0 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -293,7 +293,7 @@ void xforms_nowFunction(xmlXPathParserContextPtr ctxt, int /*nargs*/)
     */
     DateTime aDateTime;
     ::rtl::OString aDateTimeString = makeDateTimeString(aDateTime);
-    xmlChar *pString = (xmlChar*)rtl_allocateMemory(aDateTimeString.getLength()+1);
+    xmlChar *pString = static_cast<xmlChar*>(xmlMalloc(aDateTimeString.getLength()+1));
     strncpy((char*)pString, (char*)aDateTimeString.getStr(), aDateTimeString.getLength());
     pString[aDateTimeString.getLength()] = 0;
     xmlXPathReturnString(ctxt, pString);
diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc
index 9aea24297..8c402c281 100644
--- a/formula/inc/formula/compiler.hrc
+++ b/formula/inc/formula/compiler.hrc
@@ -193,8 +193,7 @@
 #define SC_OPCODE_UNICODE           155
 #define SC_OPCODE_UNICHAR           156
 #define SC_OPCODE_GAMMA             157
-#define SC_OPCODE_PHONETIC          158
-#define SC_OPCODE_STOP_1_PAR        159
+#define SC_OPCODE_STOP_1_PAR        158
 
 /*** Functions with more than one parameters ***/
 #define SC_OPCODE_START_2_PAR       201
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index bbf44ff5f..906d408b8 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -186,7 +186,6 @@ enum OpCodeEnum
         ocAsc               = SC_OPCODE_ASC,
         ocUnicode           = SC_OPCODE_UNICODE,
         ocUnichar           = SC_OPCODE_UNICHAR,
-        ocPhonetic          = SC_OPCODE_PHONETIC,
     // Functions with more than one parameters
         ocArcTan2			= SC_OPCODE_ARC_TAN_2,
         ocCeil				= SC_OPCODE_CEIL,
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index d13128830..0675ca86b 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -989,27 +989,27 @@ void FormulaCompiler::Factor()
             pArr->SetRecalcModeAlways();
         else
         {
-            switch( eOp )
-            {
-                    // Functions recalculated on every document load.
-                    // Don't use SetRecalcModeOnLoad() which would override
-                    // ModeAlways.
-                case ocConvert :
-                    pArr->AddRecalcMode( RECALCMODE_ONLOAD );
-                break;
-                    // If the referred cell is moved the value changes.
-                case ocColumn :
-                case ocRow :
-                    // ocCell needs recalc on move for some possible type values.
-                case ocCell :
-                    pArr->SetRecalcModeOnRefMove();
-                break;
-                case ocHyperLink :
-                    pArr->SetHyperLink(TRUE);
-                break;
-                default:
-                    ;   // nothing
-            }
+        switch( eOp )
+        {
+                // Functions recalculated on every document load.
+                // Don't use SetRecalcModeOnLoad() which would override
+                // ModeAlways.
+            case ocConvert :
+                pArr->AddRecalcMode( RECALCMODE_ONLOAD );
+            break;
+                // If the referred cell is moved the value changes.
+            case ocColumn :
+            case ocRow :
+                // ocCell needs recalc on move for some possible type values.
+            case ocCell :
+                pArr->SetRecalcModeOnRefMove();
+            break;
+            case ocHyperLink :
+                pArr->SetHyperLink(TRUE);
+            break;
+            default:
+                ;   // nothing
+        }
         }
         if (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR)
         {
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 0168a585d..c653087da 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -337,7 +337,6 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
     String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
     String SC_OPCODE_INFO { Text = "INFO" ; };
     String SC_OPCODE_BAHTTEXT { Text = "COM.MICROSOFT.BAHTTEXT" ; };
-    String SC_OPCODE_PHONETIC { Text = "PHONETIC" ; };
     String SC_OPCODE_GET_PIVOT_DATA { Text = "GETPIVOTDATA" ; };
     String SC_OPCODE_EUROCONVERT { Text = "EUROCONVERT" ; };
     String SC_OPCODE_NUMBERVALUE { Text = "NUMBERVALUE" ; };
@@ -662,7 +661,6 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
     String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
     String SC_OPCODE_INFO { Text = "INFO" ; };
     String SC_OPCODE_BAHTTEXT { Text = "BAHTTEXT" ; };
-    String SC_OPCODE_PHONETIC { Text = "PHONETIC" ; };
     String SC_OPCODE_GET_PIVOT_DATA { Text = "GETPIVOTDATA" ; };
     String SC_OPCODE_EUROCONVERT { Text = "EUROCONVERT" ; };
     String SC_OPCODE_NUMBERVALUE { Text = "NUMBERVALUE" ; };
@@ -1817,10 +1815,6 @@ Resource RID_STRLIST_FUNCTION_NAMES
     {
         Text [ en-US ] = "BAHTTEXT";
     };
-    String SC_OPCODE_PHONETIC
-    {
-        Text [ en-US ] = "PHONETIC";
-    };
     String SC_OPCODE_GET_PIVOT_DATA
     {
         Text [ en-US ] = "GETPIVOTDATA";
diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
index f6c7b0e69..1fe357d23 100644
--- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx
+++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
@@ -84,12 +84,12 @@ static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiS
 // the three uno functions that will be exported
 extern "C" 
 {
-    void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
+	void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
     {
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey )
+	sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
     {
         sal_Bool bRetVal = sal_True;
 
@@ -110,7 +110,7 @@ extern "C"
         return bRetVal;
     }
 
-    void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* pRegistryKey )
+	void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
     {
         void* pRet = 0;
 
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 71c708d51..2900e41a5 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -118,6 +118,8 @@ using namespace ::com::sun::star::uno;
 // helper functions
 //////////////////////////////////////////////////////////////////////////
 
+#include <QDebug>
+
 namespace
 {
     // controling event notifications    
@@ -166,7 +168,7 @@ KDE4FilePicker::KDE4FilePicker( const uno::Reference<lang::XMultiServiceFactory>
     
     _layout = new QGridLayout(_extraControls);
     
-    _dialog = new KFileDialog(KUrl(""), QString(""), 0, _extraControls);
+	_dialog = new KFileDialog(KUrl("~"), QString(""), 0, _extraControls);
     _dialog->setMode(KFile::File | KFile::LocalOnly);
     
     //default mode
@@ -213,21 +215,19 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
         }
     }
     
+	_dialog->clearFilter();
     _dialog->setFilter(_filter);
+	
     _dialog->exec();
     
     //nasty hack to get a local qt event loop going to process the dialog
     //otherwise the dialog returns immediately
     while (_dialog->isVisible())
-    {
         kapp->processEvents(QEventLoop::WaitForMoreEvents);
-    }
     
     //block and wait for user input
     if (_dialog->result() == KFileDialog::Accepted)
-    {
         return ExecutableDialogResults::OK;
-    }
     
     return ExecutableDialogResults::CANCEL;
 }
@@ -236,13 +236,9 @@ void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect )
     throw( uno::RuntimeException )
 {
     if (multiSelect)
-    {
         _dialog->setMode(KFile::Files | KFile::LocalOnly);
-    }
     else
-    {
         _dialog->setMode(KFile::File | KFile::LocalOnly);
-    }
 }
 
 void SAL_CALL KDE4FilePicker::setDefaultName( const ::rtl::OUString &name )
@@ -256,7 +252,7 @@ void SAL_CALL KDE4FilePicker::setDisplayDirectory( const rtl::OUString &dir )
     throw( uno::RuntimeException )
 {
     const QString url = toQString(dir);
-    _dialog->setStartDir(KUrl(url));
+	_dialog->setUrl(KUrl(url));
 }
 
 rtl::OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
@@ -269,16 +265,54 @@ rtl::OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
 uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
     throw( uno::RuntimeException )
 {
-    QStringList files = _dialog->selectedFiles();
+	QStringList rawFiles = _dialog->selectedFiles();
+	QStringList files;
     
-    uno::Sequence< ::rtl::OUString > seq(files.size());
+	// check if we need to add an extension
+	QString extension = "";
+	if ( _dialog->operationMode() == KFileDialog::Saving )
+	{
+		QCheckBox *cb = dynamic_cast<QCheckBox*> (
+			_customWidgets[ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION ]);
+			
+		if (cb->isChecked())
+		{
+			extension = _dialog->currentFilter(); // assuming filter value is like this *.ext
+			extension.replace("*","");
+		}
+	}
+	
+	// Workaround for the double click selection KDE4 bug 
+	// kde file picker returns the file and directories for selectedFiles()
+	// when a file is double clicked
+	// make a true list of files
+	const QString dir = "file://" + KUrl(rawFiles[0]).directory();
     
-    for (int i=0 ; i<files.size() ; ++i)
+	// by appending the dir, we make OO treat all opens like multifile opens
+	// this makes the code for adding the the OO sequence simpler
+	files.append(dir);
+	
+	for (USHORT i = 0; i < rawFiles.size(); ++i)
     {
-        const QString fileName = "file:" + files[i];
-        seq[i] = toOUString(fileName);
+		// if the raw file is not the base directory (see above kde bug)
+		// we add the file to list of avail files
+		if ((dir + "/") != ("file://" + rawFiles[i]))
+		{
+			const QString filename = KUrl(rawFiles[i]).fileName();
+			
+			//prevent extension append if we already have one
+			if (filename.endsWith(extension))
+				files.append(filename);
+			else
+				files.append(filename + extension);
+		}
     }
     
+	// add all files and leading directory to outgoing OO sequence
+	uno::Sequence< ::rtl::OUString > seq(files.size());
+	for (int i = 0; i < files.size(); ++i)
+		seq[i] = toOUString(files[i]);
+	
     return seq;
 }
 
@@ -289,9 +323,7 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const
     QString f = toQString(filter);
     
     if (!_filter.isNull())
-    {
         _filter.append("\n");
-    }
     
     //add to hash map for reverse lookup in getCurrentFilter
     _filters.insert(f, t);
@@ -318,17 +350,31 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
     
     //default if not found
     if (filter.isNull())
-    {
         filter = "ODF Text Document (.odt)";
-    }
     
     return toOUString(filter);
 }
 
-void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString&, const uno::Sequence<beans::StringPair>& )
+void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString&, const uno::Sequence<beans::StringPair>&)
     throw( lang::IllegalArgumentException, uno::RuntimeException )
-{
-    //TODO
+{	
+	//TODO ... don't really like this behavior... Shtylman
+#if 0
+	if (!_filter.isNull())
+		_filter.append(QString("\n"));
+	
+	for (USHORT i = 0; i < filters.getLength(); ++i)
+	{
+		beans::StringPair aPair = filters[i];
+		
+		_filter.append(QString("%1|%2").arg(
+			toQString(aPair.Second).replace(";", " ")).arg(
+			toQString(aPair.First).replace("/","\\/") + "\n" ));
+	}
+	
+	if (filters.getLength() > 0)
+		_filter.append(QString("*.*|*.*"));
+#endif
 }
 
 void SAL_CALL KDE4FilePicker::setValue( sal_Int16 controlId, sal_Int16, const uno::Any &value )
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 56500cdc1..6814f7976 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -191,7 +191,7 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog)
     // at least an empty version list will be better then the wrong one .-)
     iCustomize->RemoveAllControlItems(CONTROL_VERSIONLIST);
     
-    HRESULT                   hResult;
+    HRESULT                   hResult = E_FAIL;
     ComPtr< IShellItemArray > iItems;
     ComPtr< IShellItem >      iItem;
 
@@ -218,7 +218,7 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog)
 
     if ( FAILED(hResult) )
         return;
-
+    
     const ::rtl::OUString sURL = lcl_getURLFromShellItem2(iItem);
     if (sURL.getLength() < 1)
         return;
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 2729f1246..ad1870d5e 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -35,6 +35,10 @@
 // includes
 //-----------------------------------------------------------------------------
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#pragma warning( disable : 4917 )
+#endif
+
 #include "comptr.hxx"
 #include "vistatypes.h"
 #include "IVistaFilePickerInternalNotify.hxx"
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 088f0e032..2b9bda83b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -781,7 +781,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)
     // Note further: we must react different if dialog is in execute or not .-(
     ComPtr< IShellItem >      iItem;
     ComPtr< IShellItemArray > iItems;
-    HRESULT                   hResult;
+    HRESULT                   hResult = E_FAIL;
 
     if (iOpen.is())
     {
@@ -804,7 +804,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)
     }
 
     if (FAILED(hResult))
-        return;
+        return;    
     
     // convert and pack results
     TStringList lFiles;
@@ -917,7 +917,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
     }
     
 
-    HRESULT hResult;
+    HRESULT hResult = E_FAIL;
     try
     {
         // show dialog and wait for user decision
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 6f660ee7a..a5fb9e933 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -35,6 +35,10 @@
 // includes
 //-----------------------------------------------------------------------------
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#pragma warning( disable : 4917 )
+#endif
+
 #include "platform_vista.h"
 #include "asyncrequests.hxx"
 #include "comptr.hxx"
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index 7e4939d92..ee72930a5 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -45,7 +45,7 @@
 #include <cppuhelper/servicefactory.hxx>
 
 #ifndef _RTL_USTRING_
-#include <rtl/ustring>
+#include <rtl/ustring.hxx>
 #endif
 #include <sal/types.h>
 #include <osl/diagnose.h>
@@ -120,7 +120,7 @@ void CreateDeepDirectory( )
 //--------------------------------------------------------------
 
 
-int SAL_CALL main(int nArgc, char* Argv[], char* Env[]	)
+int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/	)
 {
     CoInitializeEx( NULL, COINIT_MULTITHREADED );
 
@@ -175,7 +175,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]	)
         rootDir = xFolderPicker->getDisplayDirectory( );
         selectedDir = xFolderPicker->getDirectory( );
     }
-    catch(...)
+    catch( ::com::sun::star::uno::Exception& )
     {
         MessageBox( NULL, "Exception caught!", "Error", MB_OK );
     }
diff --git a/fpicker/source/win32/folderpicker/workbench/makefile.mk b/fpicker/source/win32/folderpicker/workbench/makefile.mk
index ed5afe6e7..dda6c98e2 100644
--- a/fpicker/source/win32/folderpicker/workbench/makefile.mk
+++ b/fpicker/source/win32/folderpicker/workbench/makefile.mk
@@ -42,7 +42,7 @@ TARGETTYPE=		CUI
 
 .INCLUDE :  settings.mk
 
-CFLAGS+=-GR -GX
+CFLAGS+=-GR -EHa
 
 # --- Files --------------------------------------------------------
 
diff --git a/fpicker/source/win32/misc/makefile.mk b/fpicker/source/win32/misc/makefile.mk
index 6b41215c9..29ba59147 100644
--- a/fpicker/source/win32/misc/makefile.mk
+++ b/fpicker/source/win32/misc/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..$/..$/..
 PRJNAME=fpicker
 TARGET=utils
 LIBTARGET=NO
+ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings ----------------------------------
 
@@ -41,7 +42,7 @@ LIBTARGET=NO
 .IF "$(COM)"=="GCC"
 CFLAGSAPPEND+=-fexceptions -fno-enforce-eh-specs -DUNICODE -D_UNICODE
 .ELSE
-CFLAGS+=-GX -DUNICODE -D_UNICODE
+CFLAGS+=-EHa -DUNICODE -D_UNICODE
 .ENDIF
 
 # --- Files -------------------------------------
diff --git a/framework/collector/cmduicollector.cxx b/framework/collector/cmduicollector.cxx
index 9e3060248..94cbf563c 100644
--- a/framework/collector/cmduicollector.cxx
+++ b/framework/collector/cmduicollector.cxx
@@ -865,8 +865,9 @@ bool impl_isDuplicateKey(const KeyCommandInfoList& rList,
                          const KeyCommandInfo&     aInfo)
 {                        
     KeyCommandInfoList::const_iterator pInfo;
+    KeyCommandInfoList::const_iterator aEnd = rList.end();
     for (  pInfo  = rList.begin();
-           pInfo != rList.end()  ;
+           pInfo != aEnd  ;
          ++pInfo                 )
     {
         if (
@@ -886,6 +887,7 @@ bool ReadAccelerators( int nLangIndex, ResMgr* pResMgr, MODULES eModule, const :
     KeyCommandInfoList&        rAccs   = rLocale[nLangIndex];              
     
     USHORT c = pAcc->GetItemCount();
+    rAccs.reserve(rAccs.size()+c);
     USHORT i = 0;
     for (i=0; i<c; ++i)
     {
@@ -1067,11 +1069,12 @@ SfxSlotInfo::SfxSlotInfo( const ResId &rResId ) :
 
 bool ReadSlotInfos( int nLangIndex, ResMgr* pResMgr, MODULES eModule, const OUString& aProjectName )
 {
-    CommandIDToLabelsMap::iterator pIter = moduleMapFiles[MODULE_GLOBAL].begin();;
+    CommandIDToLabelsMap::iterator pIter = moduleMapFiles[MODULE_GLOBAL].begin();
+    CommandIDToLabelsMap::iterator pEnd = moduleMapFiles[MODULE_GLOBAL].end();
 
     if ( eModule != MODULE_GLOBAL )
     {
-        while ( pIter != moduleMapFiles[MODULE_GLOBAL].end() )
+        while ( pIter != pEnd )
         {
             int nId = pIter->first;
             CommandLabels& rCmdLabels = pIter->second;
@@ -1091,7 +1094,8 @@ bool ReadSlotInfos( int nLangIndex, ResMgr* pResMgr, MODULES eModule, const OUSt
     }
 
     pIter = moduleMapFiles[eModule].begin();
-    while ( pIter != moduleMapFiles[eModule].end() )
+    pEnd = moduleMapFiles[eModule].end();
+    while ( pIter != pEnd )
     {
         int nId = pIter->first;
         CommandLabels& rCmdLabels = pIter->second;
@@ -1261,13 +1265,15 @@ void FindAndMarkModulePopupMenuCmds()
     for ( int i = 0; i < int( MODULE_COUNT ); i++ )
     {
         CommandToLabelsMap::iterator pCmdIter = modulePopupMenusCmd[i].begin();
-        while ( pCmdIter != modulePopupMenusCmd[i].end() )
+        CommandToLabelsMap::iterator pCmdEnd = modulePopupMenusCmd[i].end();
+        while ( pCmdIter != pCmdEnd )
         {
             CommandLabels& rCmdLabel = pCmdIter->second;
             if ( rCmdLabel.bPopupMenu )
             {
                 CommandIDToLabelsMap::iterator pIDIter = moduleMapFiles[i].begin();
-                while ( pIDIter != moduleMapFiles[i].end() )
+                CommandIDToLabelsMap::iterator pIDEnd = moduleMapFiles[i].end();
+                while ( pIDIter != pIDEnd )
                 {
                     CommandLabels& rIDLabel = pIDIter->second;
                     if ( rIDLabel.aCommand.equals( rCmdLabel.aCommand ))
@@ -1311,7 +1317,8 @@ bool FindAndMoveGlobalPopupMenus()
     for ( int i = 1; i < int( MODULE_COUNT ); i++ )
     {
         CommandToLabelsMap::iterator pCmdIter = modulePopupMenusCmd[i].begin();
-        while ( pCmdIter != modulePopupMenusCmd[i].end() )
+        CommandToLabelsMap::iterator pCmdEnd = modulePopupMenusCmd[i].end();
+        while ( pCmdIter != pCmdEnd )
         {
             CommandLabels& rCmdLabel = pCmdIter->second;
             if ( rCmdLabel.bPopupMenu )
@@ -1409,8 +1416,8 @@ bool WriteXMLFiles( const OUString& aOutputDirURL)
             aXMLFile.write( ComponentDataStartEnd, strlen( ComponentDataStartEnd ), nWritten );
             aXMLFile.write( GroupText, strlen( GroupText ), nWritten );
 
-            if (( moduleMapFiles[i].size() > 0      ) ||
-                ( modulePopupMenusCmd[i].size() > 0 )    )
+            if (( !moduleMapFiles[i].empty()      ) ||
+                ( !modulePopupMenusCmd[i].empty() )    )
             {
                 for ( int nSets = 0; nSets < 2; nSets++ )
                 {
@@ -1420,7 +1427,8 @@ bool WriteXMLFiles( const OUString& aOutputDirURL)
                         aXMLFile.write( SetTextPopups, strlen( SetTextPopups ), nWritten );
 
                     CommandIDToLabelsMap::iterator pIter = moduleMapFiles[i].begin();
-                    while ( pIter != moduleMapFiles[i].end() )
+                    CommandIDToLabelsMap::iterator pEnd = moduleMapFiles[i].end();
+                    while ( pIter != pEnd )
                     {
                         CommandLabels& rCmdLabels = pIter->second;
 
@@ -1813,8 +1821,9 @@ bool impl_isAccListDuplicate(const KeyCommandInfoList& rAccsReference,
                              const KeyCommandInfoList& rAccs         )
 {
     KeyCommandInfoList::const_iterator pIt1;
+    KeyCommandInfoList::const_iterator aEnd = rAccsReference.end();
     for (  pIt1  = rAccsReference.begin();
-           pIt1 != rAccsReference.end()  ;
+           pIt1 != aEnd  ;
          ++pIt1                          )
     {
         KeyCommandInfoList::const_iterator pIt2 = ::std::find(rAccs.begin(), rAccs.end(), *pIt1);
@@ -1839,7 +1848,7 @@ bool ReadResourceWriteAcceleratorXMLLang( const ::rtl::OUString& aOutDirURL,
     KeyCommandInfoList&        rAccsReference = rLocale[1];         // en-US!
 
     // dont write empty files :-)
-    if (rAccs.size()<1)
+    if ( rAccs.empty() )
         return true;
 
     ::rtl::OUString sLanguage = ::rtl::OUString::createFromAscii(Language_codes[nLanguage].pLanguage);
@@ -1901,8 +1910,9 @@ bool ReadResourceWriteAcceleratorXMLLang( const ::rtl::OUString& aOutDirURL,
       
     ::rtl::OUStringBuffer sAccBuf(10000);
     KeyCommandInfoList::const_iterator pIt;
+    KeyCommandInfoList::const_iterator aEnd = rAccs.end();
     for (  pIt  = rAccs.begin();
-           pIt != rAccs.end()  ;
+           pIt != aEnd  ;
          ++pIt                 )
     {
         const KeyCommandInfo& aInfo = *pIt;
@@ -2620,7 +2630,7 @@ bool GetCommandOptions( const ::std::vector< OUString >& rArgs, const OUString&
         }
     }
 
-    return( rParams.size() > 0 );
+    return( !rParams.empty() );
 }
 
 void ShowUsage()
@@ -2694,7 +2704,7 @@ void Main()
         if ( aVersion.getLength() > 0 &&
              aPlatformName.getLength() > 0 &&
              aUseRes.getLength() > 0 &&
-             aInDirVector.size() > 0 )
+             !aInDirVector.empty() )
         {
             Convert( bUseProduct, aUseRes, aVersion, aOutputDirName, aPlatformName, aInDirVector, aErrOutputFileName );
         }
diff --git a/framework/collector/uicmdstohtml.cxx b/framework/collector/uicmdstohtml.cxx
index 019411455..8b685b3e3 100644
--- a/framework/collector/uicmdstohtml.cxx
+++ b/framework/collector/uicmdstohtml.cxx
@@ -697,7 +697,7 @@ bool WriteJumpTable( osl::File& rFile )
     sal_uInt32 i = 0;
     while ( ModuleName[i] != 0 )
     {
-        if ( moduleMapFiles[i].size() > 0 )
+        if ( !moduleMapFiles[i].empty() )
         {
             OString aTableNameStr( ModuleName[i] );
             OStringBuffer aJumpMark( aTableNameStr );
@@ -850,7 +850,7 @@ bool WriteHTMLFile( const OUString& aOutputDirURL)
         while ( ModuleToXML_Mapping[i] != 0 )
         {
             SortCommandTable( MODULES( i ));
-            if ( moduleCmdVector[i].size() > 0 )
+            if ( !moduleCmdVector[i].empty() )
             {
                 WriteHTMLTable( aHTMLFile, OUString::createFromAscii( ModuleName[i] ));
 
diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx
index 679d8d283..37e5e0593 100644
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/classes/addonmenu.hxx
@@ -56,12 +56,12 @@ class AddonMenu : public PopupMenu
                         AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
                         ~AddonMenu();
 
-    private:
+    protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
 };
 
 class AddonMenuManager;
-class AddonPopupMenu : public PopupMenu
+class AddonPopupMenu : public AddonMenu
 {
     public:
                                 ~AddonPopupMenu();
@@ -78,8 +78,7 @@ class AddonPopupMenu : public PopupMenu
     private:
                                 AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
 
-        rtl::OUString                                                     m_aCommandURL;
-        ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame;
+    rtl::OUString               m_aCommandURL;
         
     friend class AddonMenuManager;
 };
diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx
index 5b17b1f01..415514011 100644
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/classes/bmkmenu.hxx
@@ -30,6 +30,7 @@
 #ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX
 #define __FRAMEWORK_CLASSES_BMKMENU_HXX
 
+#include "classes/addonmenu.hxx"
 //_________________________________________________________________________________________________________________
 //	interface includes
 //_________________________________________________________________________________________________________________
@@ -52,7 +53,7 @@ namespace framework
 {
 
 class BmkMenu_Impl;
-class BmkMenu : public PopupMenu
+class BmkMenu : public AddonMenu
 {
     public:
                         enum BmkMenuType
@@ -76,7 +77,6 @@ class BmkMenu : public PopupMenu
                                  BmkMenuType, BmkMenu* pRoot );
 
         BmkMenu_Impl*	_pImp;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& m_xFrame;
 };
 
 } // namespace framework
diff --git a/framework/inc/classes/eventsconfiguration.hxx b/framework/inc/classes/eventsconfiguration.hxx
deleted file mode 100644
index 402330a14..000000000
--- a/framework/inc/classes/eventsconfiguration.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef __FRAMEWORK_CLASSES_EVENTSCONFIGURATION_HXX_
-#define __FRAMEWORK_CLASSES_EVENTSCONFIGURATION_HXX_
-
-#include <svtools/svarray.hxx>
-#include <tools/string.hxx>
-#include <tools/stream.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-
-// #110897#
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-namespace framework
-{
-
-struct EventsConfig
-{
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >				aEventNames;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >	aEventsProperties;
-};
-
-class EventsConfiguration
-{
-    public:
-
-        // #110897#
-        static sal_Bool	LoadEventsConfig( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            SvStream& rInStream, EventsConfig& aItems );
-
-        // #110897#
-        static sal_Bool	StoreEventsConfig( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            SvStream& rOutStream, const EventsConfig& aItems );
-};
-
-} // namespace framework
-
-#endif // __FRAMEWORK_CLASSES_EVENTSCONFIGURATION_HXX_
diff --git a/framework/inc/classes/eventsdocumenthandler.hxx b/framework/inc/classes/eventsdocumenthandler.hxx
deleted file mode 100644
index 758c34043..000000000
--- a/framework/inc/classes/eventsdocumenthandler.hxx
+++ /dev/null
@@ -1,198 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: eventsdocumenthandler.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_CLASSES_EVENTSDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_CLASSES_EVENTSDOCUMENTHANDLER_HXX_
-
-#ifndef __FRAMEWORK_CLASSES_TOOLBOXCONFIGURATION_HXX_
-#include <classes/eventsconfiguration.hxx>
-#endif
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-#include <threadhelp/threadhelpbase.hxx>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
-
-#ifndef __SGI_STL_HASH_MAP
-#include <hash_map>
-#endif
-#include <stdtypes.h>
-
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-//*****************************************************************************************************************
-// Hash code function for using in all hash maps of follow implementation.
-
-class OReadEventsDocumentHandler :	public ::com::sun::star::xml::sax::XDocumentHandler,
-                                    private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
-                                    public ::cppu::OWeakObject
-{
-    public:
-        enum Events_XML_Entry
-        {
-            EV_ELEMENT_EVENTS,
-            EV_ELEMENT_EVENT,
-            EV_ATTRIBUTE_TYPE,
-            EV_ATTRIBUTE_NAME,
-            XL_ATTRIBUTE_HREF,
-            XL_ATTRIBUTE_TYPE,
-            EV_ATTRIBUTE_MACRONAME,
-            EV_ATTRIBUTE_LIBRARY,
-            EV_XML_ENTRY_COUNT
-        };
-
-        enum Event_XML_Namespace
-        {
-            EV_NS_EVENT,
-            EV_NS_XLINK,
-            EV_XML_NAMESPACES_COUNT
-        };
-        
-        OReadEventsDocumentHandler( EventsConfig& aItems );
-        virtual ~OReadEventsDocumentHandler();
-
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget,
-                                                    const rtl::OUString& aData)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL setDocumentLocator(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-    private:
-        ::rtl::OUString getErrorLineString();
-
-        class EventsHashMap : public ::std::hash_map<	::rtl::OUString					,
-                                                        Events_XML_Entry				,
-                                                        OUStringHashCode				,
-                                                        ::std::equal_to< ::rtl::OUString >	>
-        {
-            public:
-                inline void free()
-                {
-                    EventsHashMap().swap( *this );
-                }
-        };
-
-        sal_Bool																	m_bEventsStartFound;
-        sal_Bool																	m_bEventsEndFound;
-        sal_Bool																	m_bEventStartFound;
-        EventsHashMap																m_aEventsMap;
-        EventsConfig&																m_aEventItems;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >	m_xLocator;
-};
-
-class OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
-{
-    public:
-        OWriteEventsDocumentHandler(
-            const EventsConfig& aItems,
-            ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > );
-        virtual ~OWriteEventsDocumentHandler();
-
-        void WriteEventsDocument() throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-    
-    protected:
-        virtual void WriteEvent( 
-                const ::rtl::OUString& aEventName, 
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aPropertyValue ) throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-        const EventsConfig&																	m_aItems;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >	m_xWriteDocumentHandler;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >		m_xEmptyList;
-        ::rtl::OUString																		m_aXMLEventNS;
-        ::rtl::OUString																		m_aXMLXlinkNS;
-        ::rtl::OUString																		m_aAttributeType;
-        ::rtl::OUString																		m_aAttributeURL;
-        ::rtl::OUString																		m_aAttributeLanguage;
-        ::rtl::OUString																		m_aAttributeLinkType;
-        ::rtl::OUString																		m_aAttributeMacroName;
-        ::rtl::OUString																		m_aAttributeLibrary;
-        ::rtl::OUString																		m_aAttributeName;
-};
-
-} // namespace framework
-
-#endif
diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx
new file mode 100755
index 000000000..f81e093ed
--- /dev/null
+++ b/framework/inc/classes/fwlresid.hxx
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: FwlResId.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_CLASSES_FwlResId_HXX_
+#define __FRAMEWORK_CLASSES_FwlResId_HXX_
+
+#include <tools/resid.hxx>
+
+namespace framework
+{
+
+class FwlResId : public ResId
+{
+    public:
+        FwlResId( USHORT nId );
+        
+    static ResMgr*	GetResManager();
+};
+
+}
+
+#endif // __FRAMEWORK_CLASSES_FwlResId
diff --git a/framework/inc/classes/imagesconfiguration.hxx b/framework/inc/classes/imagesconfiguration.hxx
deleted file mode 100644
index e902b148a..000000000
--- a/framework/inc/classes/imagesconfiguration.hxx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: imagesconfiguration.hxx,v $
- * $Revision: 1.10 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_CLASSES_IMAGESCONFIGURATION_HXX_
-#define __FRAMEWORK_CLASSES_IMAGESCONFIGURATION_HXX_
-
-#include <svtools/svarray.hxx>
-#include <tools/string.hxx>
-#include <tools/stream.hxx>
-#include <tools/color.hxx>
-
-// #110897#
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-namespace framework
-{
-
-enum ImageMaskMode
-{
-    ImageMaskMode_Color,
-    ImageMaskMode_Bitmap
-};
-
-struct ImageItemDescriptor
-{
-    ImageItemDescriptor() : nIndex( -1 ) {}
-
-    String	aCommandURL;				// URL command to dispatch
-    long	nIndex;						// index of the bitmap inside the bitmaplist
-};
-
-struct ExternalImageItemDescriptor
-{
-    String	aCommandURL;				// URL command to dispatch
-    String	aURL;						// a URL to an external bitmap
-};
-
-typedef ImageItemDescriptor* ImageItemDescriptorPtr;
-SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10, 2)
-
-typedef ExternalImageItemDescriptor* ExternalImageItemDescriptorPtr;
-SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10, 2) 
-
-struct ImageListItemDescriptor
-{
-    ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color )
-                                , pImageItemList( 0 ) {}
-    ~ImageListItemDescriptor() { delete pImageItemList; }
-
-    String						aURL;					// an URL to a bitmap with several images inside
-    Color						aMaskColor;				// a color used as transparent
-    String						aMaskURL;				// an URL to an optional bitmap used as a mask
-    ImageMaskMode				nMaskMode;				// an enum to describe the current mask mode
-    ImageItemListDescriptor*	pImageItemList;			// an array	of ImageItemDescriptors that describes every image
-    String						aHighContrastURL;		// an URL to an optional high contrast bitmap with serveral images inside
-    String						aHighContrastMaskURL;	// an URL to an optional high contrast bitmap as a mask
-};
-
-typedef ImageListItemDescriptor* ImageListItemDescriptorPtr;
-SV_DECL_PTRARR_DEL( ImageListDescriptor, ImageListItemDescriptorPtr, 10, 2)
-
-struct ImageListsDescriptor
-{
-    ImageListsDescriptor() : pImageList( 0 ),
-                             pExternalImageList( 0 ) {}
-    ~ImageListsDescriptor() { delete pImageList; delete pExternalImageList; }
-
-    ImageListDescriptor*				pImageList;
-    ExternalImageItemListDescriptor*	pExternalImageList;
-};
-
-class ImagesConfiguration
-{
-    public:
-        // #110897#
-        static sal_Bool	LoadImages( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            SvStream& rInStream, ImageListsDescriptor& aItems );
-
-        // #110897#
-        static sal_Bool	StoreImages( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            SvStream& rOutStream, const ImageListsDescriptor& aItems );
-};
-
-} // namespace framework
-
-#endif // __FRAMEWORK_CLASSES_IMAGES
diff --git a/framework/inc/classes/imagesdocumenthandler.hxx b/framework/inc/classes/imagesdocumenthandler.hxx
deleted file mode 100644
index c98cf3c16..000000000
--- a/framework/inc/classes/imagesdocumenthandler.hxx
+++ /dev/null
@@ -1,215 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: imagesdocumenthandler.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_CLASSES_IMAGEDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_CLASSES_IMAGEDOCUMENTHANDLER_HXX_
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-#include <classes/imagesconfiguration.hxx>
-#include <threadhelp/threadhelpbase.hxx>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
-
-#ifndef __SGI_STL_HASH_MAP
-#include <hash_map>
-#endif
-#include <stdtypes.h>
-
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-//*****************************************************************************************************************
-// Hash code function for using in all hash maps of follow implementation.
-
-class OReadImagesDocumentHandler : public ::com::sun::star::xml::sax::XDocumentHandler,
-                                   private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
-                                   public ::cppu::OWeakObject
-{
-    public:
-        enum Image_XML_Entry
-        {
-            IMG_ELEMENT_IMAGECONTAINER,
-            IMG_ELEMENT_IMAGES,
-            IMG_ELEMENT_ENTRY,
-            IMG_ELEMENT_EXTERNALIMAGES,
-            IMG_ELEMENT_EXTERNALENTRY,
-            IMG_ATTRIBUTE_HREF,
-            IMG_ATTRIBUTE_MASKCOLOR,
-            IMG_ATTRIBUTE_COMMAND,
-            IMG_ATTRIBUTE_BITMAPINDEX,
-            IMG_ATTRIBUTE_MASKURL,
-            IMG_ATTRIBUTE_MASKMODE,
-            IMG_ATTRIBUTE_HIGHCONTRASTURL,
-            IMG_ATTRIBUTE_HIGHCONTRASTMASKURL,
-            IMG_XML_ENTRY_COUNT
-        };
-
-        enum Image_XML_Namespace
-        {
-            IMG_NS_IMAGE,
-            IMG_NS_XLINK,
-            TBL_XML_NAMESPACES_COUNT
-        };
-        
-        OReadImagesDocumentHandler( ImageListsDescriptor& aItems );
-        virtual ~OReadImagesDocumentHandler();
-
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget,
-                                                    const rtl::OUString& aData)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL setDocumentLocator(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-    private:
-        ::rtl::OUString getErrorLineString();
-
-        class ImageHashMap : public ::std::hash_map< ::rtl::OUString		,
-                                                     Image_XML_Entry		,
-                                                     OUStringHashCode		,
-                                                     ::std::equal_to< ::rtl::OUString >	>
-        {
-            public:
-                inline void free()
-                {
-                    ImageHashMap().swap( *this );
-                }
-        };
-
-        sal_Bool																	m_bImageContainerStartFound;
-        sal_Bool																	m_bImageContainerEndFound;
-        sal_Bool																	m_bImagesStartFound;
-        sal_Bool																	m_bImagesEndFound;
-        sal_Bool																	m_bImageStartFound;
-        sal_Bool																	m_bExternalImagesStartFound;
-        sal_Bool																	m_bExternalImagesEndFound;
-        sal_Bool																	m_bExternalImageStartFound;
-        sal_Int32																	m_nHashMaskModeBitmap;
-        sal_Int32																	m_nHashMaskModeColor;
-        ImageHashMap																m_aImageMap;
-        ImageListsDescriptor&														m_aImageList;
-        ImageListItemDescriptor*													m_pImages;
-        ExternalImageItemListDescriptor*											m_pExternalImages;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >	m_xLocator;
-};
-
-class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
-{
-    public:
-        OWriteImagesDocumentHandler(
-            const ImageListsDescriptor& aItems,
-            ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > );
-        virtual ~OWriteImagesDocumentHandler();
-
-        void WriteImagesDocument() throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-    
-    protected:
-        virtual void WriteImageList( const ImageListItemDescriptor* ) throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-        virtual void WriteExternalImageList( const ExternalImageItemListDescriptor* ) throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-        virtual void WriteImage( const ImageItemDescriptor* ) throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-        virtual void WriteExternalImage( const ExternalImageItemDescriptor* ) throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-        const ImageListsDescriptor&															m_aImageListsItems;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >	m_xWriteDocumentHandler;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >		m_xEmptyList;
-        ::rtl::OUString																		m_aXMLXlinkNS;
-        ::rtl::OUString																		m_aXMLImageNS;
-        ::rtl::OUString																		m_aAttributeType;
-        ::rtl::OUString																		m_aAttributeXlinkType;
-        ::rtl::OUString																		m_aAttributeValueSimple;
-};
-
-} // namespace framework
-
-#endif
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 428474fd1..2ac4f42b8 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -35,17 +35,15 @@
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <vcl/image.hxx>
 
 namespace framework
 {
 
 class ImageWrapper : public ThreadHelpBase							,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                     public ::com::sun::star::awt::XBitmap			,
-                     public ::com::sun::star::lang::XUnoTunnel		,
-                     public ::com::sun::star::lang::XTypeProvider	,
-                     public ::cppu::OWeakObject
+                     public ::cppu::WeakImplHelper2< ::com::sun::star::awt::XBitmap,
+                                                    ::com::sun::star::lang::XUnoTunnel >
 {
     public:
         ImageWrapper( const Image& aImage );
@@ -58,12 +56,6 @@ class ImageWrapper : public ThreadHelpBase							,	// Struct for right initaliza
 
         static ::com::sun::star::uno::Sequence< sal_Int8 > GetUnoTunnelId();
         
-        // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 
-            throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL acquire() throw ();
-        virtual void SAL_CALL release() throw ();
-
         // XBitmap
         virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw (::com::sun::star::uno::RuntimeException);
@@ -72,10 +64,6 @@ class ImageWrapper : public ThreadHelpBase							,	// Struct for right initaliza
         // XUnoTunnel
         virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException);
 
-        // XTypeProvider
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
-
     private:
         Image	m_aImage;
 };
diff --git a/framework/inc/classes/menuconfiguration.hxx b/framework/inc/classes/menuconfiguration.hxx
deleted file mode 100644
index a8f7f3976..000000000
--- a/framework/inc/classes/menuconfiguration.hxx
+++ /dev/null
@@ -1,126 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: menuconfiguration.hxx,v $
- * $Revision: 1.13 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_CLASSES_MENUCONFIGURATION_HXX_
-#define __FRAMEWORK_CLASSES_MENUCONFIGURATION_HXX_
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-
-//_________________________________________________________________________________________________________________
-//	includes of other projects
-//_________________________________________________________________________________________________________________
-
-#include <vcl/menu.hxx>
-#include <vcl/toolbox.hxx>
-#include <cppuhelper/weak.hxx>
-
-#define BOOKMARK_NEWMENU		::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_new" ))
-#define BOOKMARK_WIZARDMENU		::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_wizard" ))
-#define ADDONS_POPUPMENU		::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_addons_popup" ))
-
-// Prepare for inclusion by framework and sfx
-// Please consider that there is a corresponding define also in sfxsids.hrc!! (SID_SFX_START)/(SID_ADDONS)
-#define FWK_SID_SFX_START 5000						
-#define FWK_SID_ADDONS (FWK_SID_SFX_START+1678)
-#define FWK_SID_ADDONHELP (FWK_SID_SFX_START+1684)
-
-const USHORT START_ITEMID_PICKLIST		= 4500;
-const USHORT END_ITEMID_PICKLIST        = 4599;
-const USHORT MAX_ITEMCOUNT_PICKLIST     =   99; // difference between START_... & END_... for picklist / must be changed too, if these values are changed!
-const USHORT START_ITEMID_WINDOWLIST	= 4600;
-const USHORT END_ITEMID_WINDOWLIST		= 4699;
-const USHORT ITEMID_ADDONLIST			= FWK_SID_ADDONS;
-const USHORT ITEMID_ADDONHELP			= FWK_SID_ADDONHELP;
-
-namespace framework
-{
-
-class MenuConfiguration
-{
-    public:
-        struct Attributes
-        {
-            Attributes() {}
-            Attributes( const ::rtl::OUString& aFrame, const ::rtl::OUString& aImageIdStr ) :
-                aTargetFrame( aFrame ), aImageId( aImageIdStr ) {}
-            
-            ::rtl::OUString aTargetFrame;
-            ::rtl::OUString	aImageId;
-            ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider;
-        };
-                        
-        MenuConfiguration(
-            // #110897#-1 use const when giving a uno reference by reference
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
-
-        virtual ~MenuConfiguration();
-
-        MenuBar* CreateMenuBarFromConfiguration(
-            ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream )
-            throw ( ::com::sun::star::lang::WrappedTargetException );
-
-        PopupMenu* CreateBookmarkMenu(
-                ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                const ::rtl::OUString& aURL )
-            throw ( ::com::sun::star::lang::WrappedTargetException );
-
-        ToolBox* CreateToolBoxFromConfiguration(
-            ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream )
-            throw ( ::com::sun::star::lang::WrappedTargetException );
-
-        void StoreMenuBar( MenuBar* pMenuBar,
-                      ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream )
-            throw ( ::com::sun::star::lang::WrappedTargetException );
-
-        void StoreToolBox( ToolBox* pToolBox,
-                      ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream )
-            throw ( ::com::sun::star::lang::WrappedTargetException );
-            
-        static BOOL IsPickListItemId( USHORT nId );
-        static BOOL IsWindowListItemId( USHORT nId );
-
-    private:
-        // #110897#-1 do not hold the uno reference by reference
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& m_rxServiceManager;
-};
-
-}
-
-#endif // __FRAMEWORK_CLASSES_MENUCONFIGURATION_HXX_
-
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index a379d70ea..50a7457f0 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
 
 //_________________________________________________________________________________________________________________
 //	other includes
@@ -50,7 +51,7 @@
 #include <rtl/ustring.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/accel.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/debug.hxx>
 
@@ -73,9 +74,8 @@ namespace framework
 class BmkMenu;
 class AddonMenu;
 class AddonPopupMenu;
-class MenuManager : public XSTATUSLISTENER		,
-                    public ThreadHelpBase			,
-                    public ::cppu::OWeakObject
+class MenuManager : public ThreadHelpBase			,
+                    public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XStatusListener >
 {
     public:
         // #110897#
@@ -89,34 +89,12 @@ class MenuManager : public XSTATUSLISTENER		,
         MenuManager( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             REFERENCE< XFRAME >& rFrame,
-            BmkMenu*			pBmkMenu,
-            sal_Bool			bDelete,
-            sal_Bool			bDeleteChildren );
-
-        MenuManager( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            REFERENCE< XFRAME >& rFrame,
             AddonMenu*			pAddonMenu,
             sal_Bool			bDelete,
             sal_Bool			bDeleteChildren );
 
-        MenuManager( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            REFERENCE< XFRAME >& rFrame,
-            AddonPopupMenu*	pAddonMenu,
-            sal_Bool			bDelete,
-            sal_Bool			bDeleteChildren );
-
         virtual ~MenuManager();
 
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( RUNTIMEEXCEPTION );
-
         // XStatusListener
         virtual void SAL_CALL statusChanged( const FEATURSTATEEVENT& Event ) throw ( RUNTIMEEXCEPTION );
 
@@ -132,6 +110,9 @@ class MenuManager : public XSTATUSLISTENER		,
         // #110897#
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
 
+        static void UpdateSpecialWindowMenu( Menu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,IMutex& _rMutex);
+        static void FillMenuImages(::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages);
+
     protected:
         DECL_LINK( Highlight, Menu * );
         DECL_LINK( Activate, Menu * );
@@ -140,6 +121,10 @@ class MenuManager : public XSTATUSLISTENER		,
     private:
         void UpdateSpecialFileMenu( Menu* pMenu );
         void UpdateSpecialWindowMenu( Menu* pMenu );
+        void ClearMenuDispatch(const EVENTOBJECT& Source = EVENTOBJECT(),bool _bRemoveOnly = true);
+        void SetHdl();
+        void AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,USHORT _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren);
+        USHORT FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const;
 
 
         struct MenuItemHandler
@@ -177,6 +162,7 @@ class MenuManager : public XSTATUSLISTENER		,
 
         // #110897#
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
+        ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >             m_xURLTransformer;
 };
 
 } // namespace
diff --git a/framework/inc/classes/statusbarconfiguration.hxx b/framework/inc/classes/statusbarconfiguration.hxx
deleted file mode 100644
index 72555dfcd..000000000
--- a/framework/inc/classes/statusbarconfiguration.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
-#define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
-
-#include <svtools/svarray.hxx>
-#include <tools/string.hxx>
-#include <tools/stream.hxx>
-#include <vcl/status.hxx>
-
-// #110897#
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-namespace framework
-{
-
-struct StatusBarItemDescriptor
-{
-    String	aURL;						// URL command to dispatch
-    long	nItemBits;					// properties for this statusbar item (WinBits)
-    long 	nWidth;						// width of a statusbar item
-    long	nOffset;					// offset
-
-    public:
-
-        StatusBarItemDescriptor() : nItemBits( SIB_CENTER | SIB_IN )
-                                    ,nWidth( 0 )
-                                    ,nOffset( STATUSBAR_OFFSET ) {}
-};
-
-typedef StatusBarItemDescriptor* StatusBarItemDescriptorPtr;
-SV_DECL_PTRARR_DEL( StatusBarDescriptor, StatusBarItemDescriptorPtr, 10, 2)
-
-class StatusBarConfiguration
-{
-    public:
-        // #110897#
-        static sal_Bool	LoadStatusBar( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            SvStream& rInStream, StatusBarDescriptor& aItems );
-
-        // #110897#
-        static sal_Bool	StoreStatusBar( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            SvStream& rOutStream, const StatusBarDescriptor& aItems );
-};
-
-} // namespace framework
-
-#endif // __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
diff --git a/framework/inc/classes/statusbardocumenthandler.hxx b/framework/inc/classes/statusbardocumenthandler.hxx
deleted file mode 100644
index 5dce26dec..000000000
--- a/framework/inc/classes/statusbardocumenthandler.hxx
+++ /dev/null
@@ -1,190 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: statusbardocumenthandler.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_CLASSES_STATUSBARDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_CLASSES_STATUSBARDOCUMENTHANDLER_HXX_
-
-#include <classes/statusbarconfiguration.hxx>
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-#include <threadhelp/threadhelpbase.hxx>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
-
-#ifndef __SGI_STL_HASH_MAP
-#include <hash_map>
-#endif
-#include <stdtypes.h>
-
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-//*****************************************************************************************************************
-// Hash code function for using in all hash maps of follow implementation.
-
-class OReadStatusBarDocumentHandler :	public ::com::sun::star::xml::sax::XDocumentHandler,
-                                        private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
-                                        public ::cppu::OWeakObject
-{
-    public:
-        enum StatusBar_XML_Entry
-        {
-            SB_ELEMENT_STATUSBAR,
-            SB_ELEMENT_STATUSBARITEM,
-            SB_ATTRIBUTE_URL,
-            SB_ATTRIBUTE_ALIGN,
-            SB_ATTRIBUTE_STYLE,
-            SB_ATTRIBUTE_AUTOSIZE,
-            SB_ATTRIBUTE_OWNERDRAW,
-            SB_ATTRIBUTE_WIDTH,
-            SB_ATTRIBUTE_OFFSET,
-            SB_XML_ENTRY_COUNT
-        };
-
-        enum StatusBar_XML_Namespace
-        {
-            SB_NS_STATUSBAR,
-            SB_NS_XLINK,
-            SB_XML_NAMESPACES_COUNT
-        };
-        
-        OReadStatusBarDocumentHandler( StatusBarDescriptor& aStatusBarItems );
-        virtual ~OReadStatusBarDocumentHandler();
-
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget,
-                                                    const rtl::OUString& aData)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL setDocumentLocator(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-    private:
-        ::rtl::OUString getErrorLineString();
-
-        class StatusBarHashMap : public ::std::hash_map< ::rtl::OUString				,
-                                                         StatusBar_XML_Entry			,
-                                                         OUStringHashCode				,
-                                                         ::std::equal_to< ::rtl::OUString >	>
-        {
-            public:
-                inline void free()
-                {
-                    StatusBarHashMap().swap( *this );
-                }
-        };
-
-        sal_Bool																	m_bStatusBarStartFound;
-        sal_Bool																	m_bStatusBarEndFound;
-        sal_Bool																	m_bStatusBarItemStartFound;
-        StatusBarHashMap															m_aStatusBarMap;
-        StatusBarDescriptor&														m_aStatusBarItems;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >	m_xLocator;
-};
-
-class OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
-{
-    public:
-        OWriteStatusBarDocumentHandler(
-            const StatusBarDescriptor& aStatusBarItems,
-            ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > );
-        virtual ~OWriteStatusBarDocumentHandler();
-
-        void WriteStatusBarDocument() throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-    
-    protected:
-        virtual void WriteStatusBarItem( const StatusBarItemDescriptor* ) throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-        const StatusBarDescriptor&															m_aStatusBarItems;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >	m_xWriteDocumentHandler;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >		m_xEmptyList;
-        ::rtl::OUString																		m_aXMLStatusBarNS;
-        ::rtl::OUString																		m_aXMLXlinkNS;
-        ::rtl::OUString																		m_aAttributeType;
-        ::rtl::OUString																		m_aAttributeURL;
-};
-
-} // namespace framework
-
-#endif
diff --git a/framework/inc/classes/toolboxconfiguration.hxx b/framework/inc/classes/toolboxconfiguration.hxx
deleted file mode 100755
index 0c0e1949b..000000000
--- a/framework/inc/classes/toolboxconfiguration.hxx
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef __FRAMEWORK_CLASSES_TOOLBOXCONFIGURATION_HXX_
-#define __FRAMEWORK_CLASSES_TOOLBOXCONFIGURATION_HXX_
-
-#include <svtools/svarray.hxx>
-#ifndef _SV_BITMAP_HXX
-#include <vcl/bitmapex.hxx>
-#endif
-#include <tools/string.hxx>
-#include <tools/stream.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/toolbox.hxx>
-
-// #110897#
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-namespace framework
-{
-
-struct ToolBoxItemDescriptor
-{
-    BitmapEx*	pBmpEx;						// Bitmap ptr not used by xml configuration
-    String  	aBitmapName;				// bitmap name => use to find correct bmp file
-    String		aItemText;					// label for this toolbox item
-    String		aURL;						// URL command to dispatch
-    USHORT		nId;						// internal id not used by xml configuration
-    USHORT		nItemBits;					// properties for this toolbox item (WinBits)
-    USHORT		nItemType;					// toolbox item type (BUTTON, SPACE, BREAK, SEPARATOR)
-    USHORT		nVisible;					// toolbox item visible?
-    USHORT 		nWidth;						// width of a toolbox window (edit field, etc.)
-    USHORT		nUserDef;					// user defined toolbox item (1=yes/0=no)
-    String		aHelpId;					// A help id associated with this toolbox item
-
-    public:
-
-        ToolBoxItemDescriptor() : pBmpEx( 0 )
-                                 ,nId( 0 )
-                                 ,nItemBits( 0 )
-                                 ,nItemType( (USHORT)TOOLBOXITEM_SPACE )
-                                 ,nVisible( sal_True )
-                                 ,nWidth( 0 )
-                                 ,nUserDef( sal_False ) {}
-};
-
-typedef ToolBoxItemDescriptor* ToolBoxItemDescriptorPtr;
-SV_DECL_PTRARR_DEL( ToolBoxDescriptor, ToolBoxItemDescriptorPtr, 10, 2)
-
-struct ToolBoxLayoutItemDescriptor
-{
-    String						aName;          // Unique name of the toolbox ( Objectbar, Toolbar etc. )
-    String						aUserName;		// Userspecified name for this toolbar
-    Point						aFloatingPos;   // Position in floating mode
-    USHORT						nFloatingLines; // Number of lines in floating mode
-    USHORT						nLines;         // Number of lines in docking mode
-    WindowAlign					eAlign;         // Aligned position in docking mode
-    BOOL						bVisible;       // Visible or not
-    BOOL						bFloating;      // Floating mode on/off
-    ButtonType					eType;          // text, symbol or text+symbol
-
-    ToolBoxLayoutItemDescriptor() : nFloatingLines( 0 )
-                                    ,nLines( 1 )
-                                    ,eAlign( WINDOWALIGN_LEFT )
-                                    ,bVisible( sal_False )
-                                    ,bFloating( sal_False )
-                                    ,eType( BUTTON_SYMBOL ) {}
-};
-
-typedef ToolBoxLayoutItemDescriptor* ToolBoxLayoutItemDescriptorPtr;
-SV_DECL_PTRARR_DEL( ToolBoxLayoutDescriptor, ToolBoxLayoutItemDescriptorPtr, 10, 2)
-
-class ToolBoxConfiguration
-{
-    public:
-        // #110897#
-        static sal_Bool	LoadToolBox( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            SvStream& rInStream, ToolBoxDescriptor& aItems );
-
-        // #110897#
-        static sal_Bool	StoreToolBox( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            SvStream& rOutStream, const ToolBoxDescriptor& aItems );
-
-        // #110897#
-        static sal_Bool	LoadToolBoxLayout( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            SvStream& rInStream, ToolBoxLayoutDescriptor& aItems );
-
-        // #110897#
-        static sal_Bool StoreToolBoxLayout( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            SvStream& rOutStream, ToolBoxLayoutDescriptor& aItems );
-};
-
-} // namespace framework
-
-#endif // __FRAMEWORK_CLASSES_TOOLBOXCONFIGURATION_HXX_
diff --git a/framework/inc/classes/toolboxconfigurationdefines.hxx b/framework/inc/classes/toolboxconfigurationdefines.hxx
deleted file mode 100644
index 842c59be1..000000000
--- a/framework/inc/classes/toolboxconfigurationdefines.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef __FRAMEWORK_TOOLBOXCONFIGURATIONDEFINES_HXX_
-#define __FRAMEWORK_TOOLBOXCONFIGURATIONDEFINES_HXX_
-
-#define XMLNS_TOOLBAR				"http://openoffice.org/2001/toolbar"
-#define XMLNS_XLINK					"http://www.w3.org/1999/xlink"
-#define XMLNS_TOOLBAR_PREFIX		"toolbar:"
-#define XMLNS_XLINK_PREFIX			"xlink:"
-
-#define XMLNS_FILTER_SEPARATOR		"^"
-
-#define ELEMENT_TOOLBAR				"toolbar"
-#define ELEMENT_TOOLBARITEM			"toolbaritem"
-#define ELEMENT_TOOLBARSPACE		"toolbarspace"
-#define ELEMENT_TOOLBARBREAK		"toolbarbreak"
-#define ELEMENT_TOOLBARSEPARATOR	"toolbarseparator"
-
-#define ELEMENT_TOOLBARLAYOUTS		"toolbarlayouts"
-#define ELEMENT_TOOLBARLAYOUT		"toolbarlayout"
-#define ELEMENT_TOOLBARCONFIGITEMS	"toolbarconfigitems"
-#define ELEMENT_TOOLBARCONFIGITEM	"toolbarconfigitem"
-
-#define ATTRIBUTE_BITMAP			"bitmap"
-#define ATTRIBUTE_TEXT				"text"
-#define ATTRIBUTE_URL				"href"
-#define ATTRIBUTE_ITEMBITS			"property"
-#define ATTRIBUTE_VISIBLE			"visible"
-#define ATTRIBUTE_WIDTH				"width"
-#define ATTRIBUTE_USER				"userdefined"
-#define ATTRIBUTE_HELPID			"helpid"
-#define ATTRIBUTE_ITEMSTYLE			"style"
-
-#define ATTRIBUTE_ID				"id"
-#define ATTRIBUTE_FLOATINGPOSLEFT	"floatingposleft"
-#define ATTRIBUTE_FLOATINGPOSTOP	"floatingpostop"
-#define ATTRIBUTE_TOOLBARNAME		"toolbarname"
-#define ATTRIBUTE_CONTEXT			"context"
-#define ATTRIBUTE_FLOATINGLINES		"floatinglines"
-#define ATTRIBUTE_DOCKINGLINES		"dockinglines"
-#define ATTRIBUTE_ALIGN				"align"
-#define ATTRIBUTE_FLOATING			"floating"
-#define ATTRIBUTE_BUTTONTYPE		"style"
-#define ATTRIBUTE_USERDEFNAME		"userdefname"
-
-#define ELEMENT_NS_TOOLBAR			"toolbar:toolbar"
-#define ELEMENT_NS_TOOLBARITEM		"toolbar:toolbaritem"
-#define ELEMENT_NS_TOOLBARSPACE		"toolbar:toolbarspace"
-#define ELEMENT_NS_TOOLBARBREAK		"toolbar:toolbarbreak"
-#define ELEMENT_NS_TOOLBARSEPARATOR	"toolbar:toolbarseparator"
-
-#define ELEMENT_NS_TOOLBARLAYOUTS		"toolbar:toolbarlayouts"
-#define ELEMENT_NS_TOOLBARLAYOUT		"toolbar:toolbarlayout"
-#define ELEMENT_NS_TOOLBARCONFIGITEMS	"toolbar:toolbarconfigitems"
-#define ELEMENT_NS_TOOLBARCONFIGITEM	"toolbar:toolbarconfigitem"
-
-#define ATTRIBUTE_XMLNS_TOOLBAR		"xmlns:toolbar"
-#define ATTRIBUTE_XMLNS_XLINK		"xmlns:xlink"
-
-#define ATTRIBUTE_TYPE_CDATA		"CDATA"
-
-#define ATTRIBUTE_BOOLEAN_TRUE		"true"
-#define ATTRIBUTE_BOOLEAN_FALSE		"false"
-
-#define ATTRIBUTE_ALIGN_LEFT		"left"
-#define ATTRIBUTE_ALIGN_RIGHT		"right"
-#define ATTRIBUTE_ALIGN_TOP			"top"
-#define ATTRIBUTE_ALIGN_BOTTOM		"bottom"
-
-#define ATTRIBUTE_STYLE_TEXT		"text"
-#define ATTRIBUTE_STYLE_SYMBOL		"symbol"
-#define ATTRIBUTE_STYLE_SYMBOLTEXT	"symboltext"
-#define ATTRIBUTE_STYLE_SYMBOLPLUSTEXT	"symbol+text"
-
-#define ATTRIBUTE_ITEMSTYLE_RADIO		"radio"
-#define ATTRIBUTE_ITEMSTYLE_AUTO		"auto"
-#define ATTRIBUTE_ITEMSTYLE_LEFT		"left"
-#define ATTRIBUTE_ITEMSTYLE_AUTOSIZE	"autosize"
-#define ATTRIBUTE_ITEMSTYLE_DROPDOWN	"dropdown"
-#define ATTRIBUTE_ITEMSTYLE_REPEAT		"repeat"
-
-#endif
diff --git a/framework/inc/classes/toolboxdocumenthandler.hxx b/framework/inc/classes/toolboxdocumenthandler.hxx
deleted file mode 100755
index 3db49370e..000000000
--- a/framework/inc/classes/toolboxdocumenthandler.hxx
+++ /dev/null
@@ -1,217 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: toolboxdocumenthandler.hxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_CLASSES_TOOLBOXDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_CLASSES_TOOLBOXDOCUMENTHANDLER_HXX_
-
-#include <classes/toolboxconfiguration.hxx>
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-#include <threadhelp/threadhelpbase.hxx>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
-
-#ifndef __SGI_STL_HASH_MAP
-#include <hash_map>
-#endif
-#include <stdtypes.h>
-
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-//*****************************************************************************************************************
-// Hash code function for using in all hash maps of follow implementation.
-
-class OReadToolBoxDocumentHandler : public ::com::sun::star::xml::sax::XDocumentHandler,
-                                    private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
-                                    public ::cppu::OWeakObject
-{
-    public:
-        enum ToolBox_XML_Entry
-        {
-            TB_ELEMENT_TOOLBAR,
-            TB_ELEMENT_TOOLBARITEM,
-            TB_ELEMENT_TOOLBARSPACE,
-            TB_ELEMENT_TOOLBARBREAK,
-            TB_ELEMENT_TOOLBARSEPARATOR,
-            TB_ATTRIBUTE_TEXT,
-            TB_ATTRIBUTE_BITMAP,
-            TB_ATTRIBUTE_URL,
-            TB_ATTRIBUTE_ITEMBITS,
-            TB_ATTRIBUTE_VISIBLE,
-            TB_ATTRIBUTE_WIDTH,
-            TB_ATTRIBUTE_USER,
-            TB_ATTRIBUTE_HELPID,
-            TB_ATTRIBUTE_STYLE,
-            TB_XML_ENTRY_COUNT
-        };
-
-        enum ToolBox_XML_Namespace
-        {
-            TB_NS_TOOLBAR,
-            TB_NS_XLINK,
-            TB_XML_NAMESPACES_COUNT
-        };
-        
-        OReadToolBoxDocumentHandler( ToolBoxDescriptor& aToolBoxItems );
-        virtual ~OReadToolBoxDocumentHandler();
-
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget,
-                                                    const rtl::OUString& aData)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL setDocumentLocator(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-    private:
-        ::rtl::OUString getErrorLineString();
-
-        class ToolBoxHashMap : public ::std::hash_map<	::rtl::OUString					,
-                                                        ToolBox_XML_Entry				,
-                                                        OUStringHashCode				,
-                                                        ::std::equal_to< ::rtl::OUString >	>
-        {
-            public:
-                inline void free()
-                {
-                    ToolBoxHashMap().swap( *this );
-                }
-        };
-
-        sal_Bool																	m_bToolBarStartFound;
-        sal_Bool																	m_bToolBarEndFound;
-        sal_Bool																	m_bToolBarItemStartFound;
-        sal_Bool																	m_bToolBarSpaceStartFound;
-        sal_Bool																	m_bToolBarBreakStartFound;
-        sal_Bool																	m_bToolBarSeparatorStartFound;
-        ToolBoxHashMap																m_aToolBoxMap;
-        ToolBoxDescriptor&															m_aToolBoxItems;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >	m_xLocator;
-        
-        sal_Int32																	m_nHashCode_Style_Radio;
-        sal_Int32																	m_nHashCode_Style_Auto;
-        sal_Int32																	m_nHashCode_Style_Left;
-        sal_Int32																	m_nHashCode_Style_AutoSize;
-        sal_Int32																	m_nHashCode_Style_DropDown;
-        sal_Int32																	m_nHashCode_Style_Repeat;
-};
-
-class OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
-{
-    public:
-        OWriteToolBoxDocumentHandler(
-            const ToolBoxDescriptor& aToolBoxItems,
-            ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > );
-        virtual ~OWriteToolBoxDocumentHandler();
-
-        void WriteToolBoxDocument() throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-    
-    protected:
-        virtual void WriteToolBoxItem( const ToolBoxItemDescriptor* ) throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-        virtual void WriteToolBoxSpace() throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-        
-        virtual void WriteToolBoxBreak() throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-        
-        virtual void WriteToolBoxSeparator() throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-        const ToolBoxDescriptor&															m_aToolBoxItems;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >	m_xWriteDocumentHandler;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >		m_xEmptyList;
-        ::rtl::OUString																		m_aXMLToolbarNS;
-        ::rtl::OUString																		m_aXMLXlinkNS;
-        ::rtl::OUString																		m_aAttributeType;
-        ::rtl::OUString																		m_aAttributeURL;
-};
-
-} // namespace framework
-
-#endif
diff --git a/framework/inc/classes/toolboxlayoutdocumenthandler.hxx b/framework/inc/classes/toolboxlayoutdocumenthandler.hxx
deleted file mode 100644
index 2c02e806d..000000000
--- a/framework/inc/classes/toolboxlayoutdocumenthandler.hxx
+++ /dev/null
@@ -1,198 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: toolboxlayoutdocumenthandler.hxx,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_CLASSES_TOOLBOXLAYOUTDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_CLASSES_TOOLBOXLAYOUTDOCUMENTHANDLER_HXX_
-
-#include <classes/toolboxconfiguration.hxx>
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-#include <threadhelp/threadhelpbase.hxx>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
-
-#ifndef __SGI_STL_HASH_MAP
-#include <hash_map>
-#endif
-#include <stdtypes.h>
-
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-//*****************************************************************************************************************
-// Hash code function for using in all hash maps of follow implementation.
-
-class OReadToolBoxLayoutDocumentHandler : public ::com::sun::star::xml::sax::XDocumentHandler,
-                                          private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
-                                          public ::cppu::OWeakObject
-{
-    public:
-        enum ToolBoxLayout_XML_Entry
-        {
-            TBL_ELEMENT_TOOLBARLAYOUTS,
-            TBL_ELEMENT_TOOLBARLAYOUT,
-            TBL_ELEMENT_TOOLBARCONFIGITEMS,
-            TBL_ELEMENT_TOOLBARCONFIGITEM,
-            TBL_ATTRIBUTE_ID,
-            TBL_ATTRIBUTE_TOOLBARNAME,
-            TBL_ATTRIBUTE_CONTEXT,
-            TBL_ATTRIBUTE_FLOATINGLINES,
-            TBL_ATTRIBUTE_DOCKINGLINES,
-            TBL_ATTRIBUTE_ALIGN,
-            TBL_ATTRIBUTE_FLOATING,
-            TBL_ATTRIBUTE_FLOATINGPOSLEFT,
-            TBL_ATTRIBUTE_FLOATINGPOSTOP,
-            TBL_ATTRIBUTE_VISIBLE,
-            TBL_ATTRIBUTE_STYLE,
-            TBL_ATTRIBUTE_USERDEFNAME,
-            TBL_XML_ENTRY_COUNT
-        };
-
-        enum ToolBox_XML_Namespace
-        {
-            TBL_NS_TOOLBAR,
-            TBL_XML_NAMESPACES_COUNT
-        };
-        
-        OReadToolBoxLayoutDocumentHandler( ToolBoxLayoutDescriptor& aToolBoxLayoutItems );
-        virtual ~OReadToolBoxLayoutDocumentHandler();
-
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget,
-                                                    const rtl::OUString& aData)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL setDocumentLocator(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-    private:
-        ::rtl::OUString getErrorLineString();
-
-        class ToolBoxLayoutHashMap : public ::std::hash_map< ::rtl::OUString				,
-                                                             ToolBoxLayout_XML_Entry		,
-                                                             OUStringHashCode				,
-                                                             ::std::equal_to< ::rtl::OUString >	>
-        {
-            public:
-                inline void free()
-                {
-                    ToolBoxLayoutHashMap().swap( *this );
-                }
-        };
-
-        sal_Bool																	m_bToolBarLayoutsStartFound;
-        sal_Bool																	m_bToolBarLayoutsEndFound;
-        sal_Bool																	m_bToolBarLayoutStartFound;
-        sal_Bool																	m_bToolBarConfigListStartFound;
-        sal_Bool																	m_bToolBarConfigItemStartFound;
-        ToolBoxLayoutHashMap														m_aToolBoxMap;
-        ToolBoxLayoutDescriptor&													m_aToolBoxItems;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >	m_xLocator;
-};
-
-class OWriteToolBoxLayoutDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
-{
-    public:
-        OWriteToolBoxLayoutDocumentHandler(
-            const ToolBoxLayoutDescriptor& aToolBoxLayoutItems,
-            ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > );
-        virtual ~OWriteToolBoxLayoutDocumentHandler();
-
-        void WriteToolBoxLayoutDocument() throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-    
-    protected:
-        virtual void WriteToolBoxLayoutItem( const ToolBoxLayoutItemDescriptor* ) throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-        const ToolBoxLayoutDescriptor&														m_aToolBoxLayoutItems;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >	m_xWriteDocumentHandler;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >		m_xEmptyList;
-        ::rtl::OUString																		m_aXMLToolbarNS;
-        ::rtl::OUString																		m_aAttributeType;
-        ::rtl::OUString																		m_aTrueValue;
-        ::rtl::OUString																		m_aFalseValue;
-};
-
-} // namespace framework
-
-#endif
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 9ca23ce51..13133a408 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -51,7 +51,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/weakref.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -63,10 +63,8 @@ namespace framework{
 //_________________________________________________________________________________________________________________
 
 
-class DockingAreaDefaultAcceptor    :	public css::lang::XTypeProvider				                ,
-                                        public ::com::sun::star::ui::XDockingAreaAcceptor	,
-                                        private ThreadHelpBase                                      ,
-                                        public ::cppu::OWeakObject
+class DockingAreaDefaultAcceptor    :	private ThreadHelpBase                                      ,
+                                        public ::cppu::WeakImplHelper1< ::com::sun::star::ui::XDockingAreaAcceptor >
 {
     public:
 
@@ -93,13 +91,6 @@ class DockingAreaDefaultAcceptor    :	public css::lang::XTypeProvider
         virtual ~DockingAreaDefaultAcceptor();
 
         //---------------------------------------------------------------------------------------------------------
-        //	XInterface
-        //---------------------------------------------------------------------------------------------------------
-
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-
-        //---------------------------------------------------------------------------------------------------------
         //	XDockingAreaAcceptor
         //---------------------------------------------------------------------------------------------------------
 
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 1d9df9caa..435b87a4f 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -32,6 +32,8 @@
 #define __MISC_HELPER_HXX_
 
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
 
 #include <i18npool/lang.h>
 #include <svtools/languageoptions.hxx>
@@ -48,12 +50,21 @@ inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType
 class LanguageGuessingHelper
 {
     mutable ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >    m_xLanguageGuesser;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
     
 public:
-    LanguageGuessingHelper() {}
+    LanguageGuessingHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceManager) : m_xServiceManager(_xServiceManager){}
 
     ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >  GetGuesser() const;
-};    
+};
+
+::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
+            ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&    _xServiceFactory
+            ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >&        _xUICommandLabels
+            ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame
+            ,::rtl::OUString& _rModuleIdentifier
+            ,sal_Bool& _rIni
+            ,const sal_Char* _pName);
 
 } // namespace framework
 
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 12c10f38b..5d7ee6e1b 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -55,7 +55,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/weakref.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -90,10 +90,8 @@ namespace framework{
     @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
-class OComponentAccess	:	public css::lang::XTypeProvider				,
-                            public css::container::XEnumerationAccess	,	// => XElementAccess
-                            private ThreadHelpBase                      ,   // Must be the first of baseclasses - Is neccessary for right initialization of objects!
-                            public ::cppu::OWeakObject
+class OComponentAccess	:	private ThreadHelpBase                      ,   // Must be the first of baseclasses - Is neccessary for right initialization of objects!
+                            public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumerationAccess >
 {
     //-------------------------------------------------------------------------------------------------------------
     //	public methods
@@ -123,13 +121,6 @@ class OComponentAccess	:	public css::lang::XTypeProvider				,
         OComponentAccess( const css::uno::Reference< css::frame::XDesktop >& xOwner );
 
         //---------------------------------------------------------------------------------------------------------
-        //	XInterface
-        //---------------------------------------------------------------------------------------------------------
-
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-
-        //---------------------------------------------------------------------------------------------------------
         //	XEnumerationAccess
         //---------------------------------------------------------------------------------------------------------
 
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index 78cb1be40..bdb031413 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -54,7 +54,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -88,11 +88,8 @@ namespace framework{
     @threadsafe		yes
 *//*-*************************************************************************************************************/
 
-class OComponentEnumeration	:	public css::lang::XTypeProvider		,
-                                public css::lang::XEventListener	,
-                                public css::container::XEnumeration	,
-                                public ThreadHelpBase               ,
-                                public ::cppu::OWeakObject
+class OComponentEnumeration	:	public ThreadHelpBase               ,
+                                public ::cppu::WeakImplHelper2< ::com::sun::star::container::XEnumeration,::com::sun::star::lang::XEventListener >
 {
     //-------------------------------------------------------------------------------------------------------------
     //	public methods
@@ -120,13 +117,6 @@ class OComponentEnumeration	:	public css::lang::XTypeProvider		,
          OComponentEnumeration( const css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents );
 
         //---------------------------------------------------------------------------------------------------------
-        //	XInterface
-        //---------------------------------------------------------------------------------------------------------
-
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-
-        //---------------------------------------------------------------------------------------------------------
         //	XEventListener
         //---------------------------------------------------------------------------------------------------------
 
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index eaf35a3df..2e16c8f71 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -53,7 +53,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/weakref.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -90,10 +90,8 @@ namespace framework{
     @devstatus		deprecated
 *//*-*************************************************************************************************************/
 
-class OFrames   :   public css::lang::XTypeProvider ,
-                    public css::frame::XFrames  ,   //=> XIndexAccess => XElementAccess
-                    private ThreadHelpBase      ,   // Must be the first of baseclasses - Is neccessary for right initialization of objects!
-                    public ::cppu::OWeakObject
+class OFrames   :   private ThreadHelpBase      ,   // Must be the first of baseclasses - Is neccessary for right initialization of objects!
+                    public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFrames >
 {
     //-------------------------------------------------------------------------------------------------------------
     //	public methods
@@ -125,13 +123,6 @@ class OFrames   :   public css::lang::XTypeProvider ,
                             FrameContainer*											pFrameContainer	);
 
         //---------------------------------------------------------------------------------------------------------
-        //	XInterface
-        //---------------------------------------------------------------------------------------------------------
-
-        FWK_DECLARE_XINTERFACE
-            FWK_DECLARE_XTYPEPROVIDER
-
-        //---------------------------------------------------------------------------------------------------------
         //	XFrames
         //---------------------------------------------------------------------------------------------------------
 
diff --git a/framework/inc/helper/opluginframedispatcher.hxx b/framework/inc/helper/opluginframedispatcher.hxx
index 226a8cc4a..c3000e67a 100644
--- a/framework/inc/helper/opluginframedispatcher.hxx
+++ b/framework/inc/helper/opluginframedispatcher.hxx
@@ -58,7 +58,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
@@ -106,11 +106,8 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<	::rtl::OUString				  		,
     @devstatus		ready to use
 *//*-*************************************************************************************************************/
 
-class OPlugInFrameDispatcher	:	public css::frame::XDispatchProvider			,
-                                      public css::frame::XDispatch					,
-                                    public css::mozilla::XPluginInstanceNotifySink	,
-                                    private ThreadHelpBase                          ,
-                                    public ::cppu::OWeakObject
+class OPlugInFrameDispatcher	:	private ThreadHelpBase                          ,
+                                    public ::cppu::WeakImplHelper3< ::com::sun::star::frame::XDispatchProvider, ::com::sun::star::frame::XDispatch, ::com::sun::star::mozilla::XPluginInstanceNotifySink >
 {
     //-------------------------------------------------------------------------------------------------------------
     //	public methods
@@ -144,12 +141,6 @@ class OPlugInFrameDispatcher	:	public css::frame::XDispatchProvider			,
                                 const	css::uno::Reference< css::mozilla::XPluginInstancePeer >&	xPlugInDLL	);
 
         //---------------------------------------------------------------------------------------------------------
-        //	XInterface
-        //---------------------------------------------------------------------------------------------------------
-
-        DECLARE_XINTERFACE
-
-        //---------------------------------------------------------------------------------------------------------
         //	XDispatchProvider
         //---------------------------------------------------------------------------------------------------------
 
diff --git a/framework/inc/helper/popupmenucontrollerbase.hxx b/framework/inc/helper/popupmenucontrollerbase.hxx
index 0c7c04e3d..18bc9c29d 100644
--- a/framework/inc/helper/popupmenucontrollerbase.hxx
+++ b/framework/inc/helper/popupmenucontrollerbase.hxx
@@ -56,7 +56,7 @@
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XUriReference.hpp>
-
+#include <com/sun/star/util/XURLTransformer.hpp>
 //_________________________________________________________________________________________________________________
 //	includes of other projects
 //_________________________________________________________________________________________________________________
@@ -93,7 +93,7 @@ namespace framework
             virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
             
             // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException) = 0;
+            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
 
             // XInitialization
@@ -127,8 +127,11 @@ namespace framework
         
         protected:
             virtual void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
+            virtual void impl_setPopupMenu();
+            virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
             ::rtl::OUString determineBaseURL( const ::rtl::OUString& aURL );
 
+
             bool                                                                             m_bInitialized;
             bool                                                                             m_bDisposed;
             rtl::OUString                                                                    m_aCommandURL;
@@ -136,6 +139,7 @@ namespace framework
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >           m_xDispatch;
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >              m_xFrame;
             ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+            ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >      m_xURLTransformer;
             ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >            m_xPopupMenu;
             ::cppu::OMultiTypeInterfaceContainerHelper                                       m_aListenerContainer; // container for ALL Listener
     };
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 7159af497..cffe6f677 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -52,6 +52,7 @@
 #include <com/sun/star/util/XUpdatable.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 //_________________________________________________________________________________________________________________
 //	other includes
@@ -80,7 +81,7 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
     //	public methods
     //-------------------------------------------------------------------------------------------------------------
     public:
-        UIConfigElementWrapperBase( sal_Int16 nType );
+        UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory );
         virtual ~UIConfigElementWrapperBase();
     
         //---------------------------------------------------------------------------------------------------------
@@ -99,8 +100,8 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
         
         // XUIElementSettings
         virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException) = 0;
-        virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
 
         // XUIElement
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
@@ -135,6 +136,8 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
         virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
         virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
 
+        virtual void impl_fillNewData();
+
         static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
 
         sal_Int16                                                                               m_nType;
@@ -145,6 +148,7 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
                                                                                                 m_bDisposed : 1,
                                                                                                 m_bNoClose : 1;
         rtl::OUString                                                                           m_aResourceURL;
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >        m_xServiceFactory;
         com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >         m_xConfigSource;
         com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >               m_xConfigData;
         com::sun::star::uno::WeakReference< com::sun::star::frame::XFrame >                     m_xWeakFrame;
diff --git a/framework/inc/interaction/preventduplicateinteraction.hxx b/framework/inc/interaction/preventduplicateinteraction.hxx
index 2443ec3ee..5ba991bf3 100644
--- a/framework/inc/interaction/preventduplicateinteraction.hxx
+++ b/framework/inc/interaction/preventduplicateinteraction.hxx
@@ -85,8 +85,8 @@ struct ThreadHelpBase2
         mutable ::osl::Mutex m_aLock;
 };
 
-class PreventDuplicateInteraction : public ::cppu::WeakImplHelper1< css::task::XInteractionHandler >
-                                  , private ThreadHelpBase2
+class PreventDuplicateInteraction : private ThreadHelpBase2
+                                    ,public ::cppu::WeakImplHelper1< css::task::XInteractionHandler >
 {
     //_____________________________________
     // structs, types etcp.
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index e954964a6..c8df521a6 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -41,7 +41,7 @@
 
 //_______________________________________________
 // other includes
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase3.hxx>
 
 //_______________________________________________
 // uno includes
@@ -66,12 +66,8 @@ namespace framework{
 
     @author as96863
  */
-class HelpOnStartup : public css::lang::XTypeProvider
-                    , public css::lang::XServiceInfo
-                    , public css::task::XJob
-                    , public css::lang::XEventListener
-                    , private ThreadHelpBase
-                    , public ::cppu::OWeakObject
+class HelpOnStartup : private ThreadHelpBase
+                      ,public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,::com::sun::star::lang::XEventListener,::com::sun::star::task::XJob >
 {
     //-------------------------------------------
     // member
@@ -132,11 +128,7 @@ class HelpOnStartup : public css::lang::XTypeProvider
     public:
 
         //---------------------------------------
-        // css.uno.XInterface
-        // css.lang.XTypeProvider
         // css.lang.XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
     
         // css.task.XJob
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 956290cd7..68d5136da 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -41,7 +41,7 @@
 
 //_______________________________________________
 // other includes
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 
 //_______________________________________________
 // uno includes
@@ -71,11 +71,8 @@ namespace framework{
 
     @author as96863
  */
-class ShellJob : public css::lang::XTypeProvider
-               , public css::lang::XServiceInfo
-               , public css::task::XJob
-               , private ThreadHelpBase
-               , public ::cppu::OWeakObject
+class ShellJob : private ThreadHelpBase
+               ,public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo,::com::sun::star::task::XJob >
 {
     //-------------------------------------------
     // member
@@ -112,11 +109,7 @@ class ShellJob : public css::lang::XTypeProvider
     public:
 
         //---------------------------------------
-        // css.uno.XInterface
-        // css.lang.XTypeProvider
         // css.lang.XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
     
         // css.task.XJob
diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx
index 0de020428..19d510fae 100644
--- a/framework/inc/macros/debug/memorymeasure.hxx
+++ b/framework/inc/macros/debug/memorymeasure.hxx
@@ -111,7 +111,7 @@
             {
                 ::rtl::OStringBuffer sBuffer( 10000 );
 
-                if( m_lSnapshots.size() > 0 )
+                if( !m_lSnapshots.empty() )
                 {
                     // Write informations to return buffer
                     ::std::vector< _MemoryInfo >::const_iterator pItem1;
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 5f71fb01d..ee2880a55 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -55,7 +55,9 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <cppuhelper/factory.hxx>
+#include <comphelper/sequence.hxx>
 #include <rtl/ustring.hxx>
+#include <rtl/logfile.hxx>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -93,29 +95,7 @@ ________________________________________________________________________________
     /*===========================================================================================================*/									\
     sal_Bool SAL_CALL CLASS::supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException )                             \
     {																																				\
-        /* Set default return value. */																												\
-        sal_Bool bReturn = sal_False ;																												\
-        /* Get names of all supported servicenames. */																								\
-        css::uno::Sequence< ::rtl::OUString >  seqServiceNames =   getSupportedServiceNames();                                                      \
-        const ::rtl::OUString*                 pArray          =   seqServiceNames.getConstArray();                                                 \
-        sal_Int32                              nCounter        =   0;                                                                               \
-        sal_Int32                              nLength         =   seqServiceNames.getLength();                                                     \
-        /* Search for right name in list. */																										\
-        while	(																																	\
-                    ( nCounter	<	nLength		)	&&																								\
-                    ( bReturn	==	sal_False	)																									\
-                )                                                                                                   								\
-        {																																			\
-            /* Is name was found, say "YES, SERVICE IS SUPPORTED." and break loop. */                               								\
-            if ( pArray[nCounter] == sServiceName )				  																					\
-            {																																		\
-                bReturn = sal_True ;																												\
-            }																																		\
-            /* Else step to next element in list. */                                                                								\
-            ++nCounter;                                                                                             								\
-        }																																			\
-        /* Return state of search. */																												\
-        return bReturn;																																\
+        return ::comphelper::findValue(getSupportedServiceNames(), sServiceName, sal_True).getLength() != 0;                                        \
     }																																				\
                                                                                                                                                     \
     /*===========================================================================================================*/									\
@@ -155,6 +135,7 @@ ________________________________________________________________________________
     /*===========================================================================================================*/									\
     css::uno::Reference< css::uno::XInterface > SAL_CALL CLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception )  \
     {                                                                                                                                                                                              \
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework","Ocke.Janssen@sun.com",U2B(IMPLEMENTATIONNAME).getStr());                                                                                                               \
         /* create new instance of service */                                                                                                                                                       \
         CLASS* pClass = new CLASS( xServiceManager );                                                                                                                                              \
         /* hold it alive by increasing his ref count!!! */                                                                                                                                         \
diff --git a/framework/inc/mediadescriptor.h b/framework/inc/mediadescriptor.h
dissimilarity index 76%
index 356e320e6..8daf743e7 100644
--- a/framework/inc/mediadescriptor.h
+++ b/framework/inc/mediadescriptor.h
@@ -1,80 +1,80 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: mediadescriptor.h,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_MEDIADESCRIPTOR_H_
-#define __FRAMEWORK_MEDIADESCRIPTOR_H_
-
-//_______________________________________________
-// namespace
-
-namespace framework{
-
-static const ::rtl::OUString MEDIADESCRIPTOR_ASTEMPLATE         = ::rtl::OUString::createFromAscii("AsTemplate"        );
-static const ::rtl::OUString MEDIADESCRIPTOR_CHARACTERSET       = ::rtl::OUString::createFromAscii("CharacterSet"      );
-static const ::rtl::OUString MEDIADESCRIPTOR_DEEPDETECTION      = ::rtl::OUString::createFromAscii("DeepDetection"     );
-static const ::rtl::OUString MEDIADESCRIPTOR_DETECTSERVICE      = ::rtl::OUString::createFromAscii("DetectService"     );
-static const ::rtl::OUString MEDIADESCRIPTOR_EXTENSION          = ::rtl::OUString::createFromAscii("Extension"         );
-static const ::rtl::OUString MEDIADESCRIPTOR_FILENAME           = ::rtl::OUString::createFromAscii("FileName"          ); // deprecated!
-static const ::rtl::OUString MEDIADESCRIPTOR_FILTERNAME         = ::rtl::OUString::createFromAscii("FilterName"        );
-static const ::rtl::OUString MEDIADESCRIPTOR_FILTEROPTIONS      = ::rtl::OUString::createFromAscii("FilterOptions"     );
-static const ::rtl::OUString MEDIADESCRIPTOR_FORMAT             = ::rtl::OUString::createFromAscii("Format"            );
-static const ::rtl::OUString MEDIADESCRIPTOR_FRAMENAME          = ::rtl::OUString::createFromAscii("FrameName"         );
-static const ::rtl::OUString MEDIADESCRIPTOR_HIDDEN             = ::rtl::OUString::createFromAscii("Hidden"            );
-static const ::rtl::OUString MEDIADESCRIPTOR_INPUTSTREAM        = ::rtl::OUString::createFromAscii("InputStream"       );
-static const ::rtl::OUString MEDIADESCRIPTOR_INTERACTIONHANDLER = ::rtl::OUString::createFromAscii("InteractionHandler");
-static const ::rtl::OUString MEDIADESCRIPTOR_JUMPMARK           = ::rtl::OUString::createFromAscii("JumpMark"          );
-static const ::rtl::OUString MEDIADESCRIPTOR_MACROEXECUTIONMODE = ::rtl::OUString::createFromAscii("MacroExecutionMode");
-static const ::rtl::OUString MEDIADESCRIPTOR_MEDIATYPE          = ::rtl::OUString::createFromAscii("MediaType"         );
-static const ::rtl::OUString MEDIADESCRIPTOR_MINIMIZED          = ::rtl::OUString::createFromAscii("Minimized"         );
-static const ::rtl::OUString MEDIADESCRIPTOR_OPENNEWVIEW        = ::rtl::OUString::createFromAscii("OpenNewView"       );
-static const ::rtl::OUString MEDIADESCRIPTOR_OUTPUTSTREAM       = ::rtl::OUString::createFromAscii("OutputStream"      );
-static const ::rtl::OUString MEDIADESCRIPTOR_PATTERN            = ::rtl::OUString::createFromAscii("Pattern"           );
-static const ::rtl::OUString MEDIADESCRIPTOR_POSSIZE            = ::rtl::OUString::createFromAscii("PosSize"           );
-static const ::rtl::OUString MEDIADESCRIPTOR_POSTDATA           = ::rtl::OUString::createFromAscii("PostData"          );
-static const ::rtl::OUString MEDIADESCRIPTOR_POSTSTRING         = ::rtl::OUString::createFromAscii("PostString"        );
-static const ::rtl::OUString MEDIADESCRIPTOR_PREVIEW            = ::rtl::OUString::createFromAscii("Preview"           );
-static const ::rtl::OUString MEDIADESCRIPTOR_READONLY           = ::rtl::OUString::createFromAscii("ReadOnly"          );
-static const ::rtl::OUString MEDIADESCRIPTOR_REFERRER           = ::rtl::OUString::createFromAscii("Referer"           );
-static const ::rtl::OUString MEDIADESCRIPTOR_SILENT             = ::rtl::OUString::createFromAscii("Silent"            );
-static const ::rtl::OUString MEDIADESCRIPTOR_STATUSINDICATOR    = ::rtl::OUString::createFromAscii("StatusIndicator"   );
-static const ::rtl::OUString MEDIADESCRIPTOR_TEMPLATENAME       = ::rtl::OUString::createFromAscii("TemplateName"      );
-static const ::rtl::OUString MEDIADESCRIPTOR_TEMPLATEREGIONNAME = ::rtl::OUString::createFromAscii("TemplateRegionName");
-static const ::rtl::OUString MEDIADESCRIPTOR_TYPENAME           = ::rtl::OUString::createFromAscii("TypeName"          );
-static const ::rtl::OUString MEDIADESCRIPTOR_UPDATEDOCMODE      = ::rtl::OUString::createFromAscii("UpdateDocMode"     );
-static const ::rtl::OUString MEDIADESCRIPTOR_URL                = ::rtl::OUString::createFromAscii("URL"               );
-static const ::rtl::OUString MEDIADESCRIPTOR_VERSION            = ::rtl::OUString::createFromAscii("Version"           );
-static const ::rtl::OUString MEDIADESCRIPTOR_VIEWID             = ::rtl::OUString::createFromAscii("ViewId"            );
-static const ::rtl::OUString MEDIADESCRIPTOR_REPAIRPACKAGE      = ::rtl::OUString::createFromAscii("RepairPackage"     );
-static const ::rtl::OUString MEDIADESCRIPTOR_DOCUMENTTITLE      = ::rtl::OUString::createFromAscii("DocumentTitle"     );
-static const ::rtl::OUString MEDIADESCRIPTOR_MODEL              = ::rtl::OUString::createFromAscii("Model"             );
-
-} // namespace framework
-
-#endif // #ifndef __FRAMEWORK_MEDIADESCRIPTOR_H_
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: mediadescriptor.h,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_MEDIADESCRIPTOR_H_
+#define __FRAMEWORK_MEDIADESCRIPTOR_H_
+
+//_______________________________________________
+// namespace
+
+namespace framework{
+
+//static const ::rtl::OUString MEDIADESCRIPTOR_ASTEMPLATE         = ::rtl::OUString::createFromAscii("AsTemplate"        );
+//static const ::rtl::OUString MEDIADESCRIPTOR_CHARACTERSET       = ::rtl::OUString::createFromAscii("CharacterSet"      );
+//static const ::rtl::OUString MEDIADESCRIPTOR_DEEPDETECTION      = ::rtl::OUString::createFromAscii("DeepDetection"     );
+//static const ::rtl::OUString MEDIADESCRIPTOR_DETECTSERVICE      = ::rtl::OUString::createFromAscii("DetectService"     );
+//static const ::rtl::OUString MEDIADESCRIPTOR_EXTENSION          = ::rtl::OUString::createFromAscii("Extension"         );
+//static const ::rtl::OUString MEDIADESCRIPTOR_FILENAME           = ::rtl::OUString::createFromAscii("FileName"          ); // deprecated!
+//static const ::rtl::OUString MEDIADESCRIPTOR_FILTERNAME         = ::rtl::OUString::createFromAscii("FilterName"        );
+//static const ::rtl::OUString MEDIADESCRIPTOR_FILTEROPTIONS      = ::rtl::OUString::createFromAscii("FilterOptions"     );
+//static const ::rtl::OUString MEDIADESCRIPTOR_FORMAT             = ::rtl::OUString::createFromAscii("Format"            );
+//static const ::rtl::OUString MEDIADESCRIPTOR_FRAMENAME          = ::rtl::OUString::createFromAscii("FrameName"         );
+//static const ::rtl::OUString MEDIADESCRIPTOR_HIDDEN             = ::rtl::OUString::createFromAscii("Hidden"            );
+//static const ::rtl::OUString MEDIADESCRIPTOR_INPUTSTREAM        = ::rtl::OUString::createFromAscii("InputStream"       );
+//static const ::rtl::OUString MEDIADESCRIPTOR_INTERACTIONHANDLER = ::rtl::OUString::createFromAscii("InteractionHandler");
+//static const ::rtl::OUString MEDIADESCRIPTOR_JUMPMARK           = ::rtl::OUString::createFromAscii("JumpMark"          );
+//static const ::rtl::OUString MEDIADESCRIPTOR_MACROEXECUTIONMODE = ::rtl::OUString::createFromAscii("MacroExecutionMode");
+//static const ::rtl::OUString MEDIADESCRIPTOR_MEDIATYPE          = ::rtl::OUString::createFromAscii("MediaType"         );
+//static const ::rtl::OUString MEDIADESCRIPTOR_MINIMIZED          = ::rtl::OUString::createFromAscii("Minimized"         );
+//static const ::rtl::OUString MEDIADESCRIPTOR_OPENNEWVIEW        = ::rtl::OUString::createFromAscii("OpenNewView"       );
+//static const ::rtl::OUString MEDIADESCRIPTOR_OUTPUTSTREAM       = ::rtl::OUString::createFromAscii("OutputStream"      );
+//static const ::rtl::OUString MEDIADESCRIPTOR_PATTERN            = ::rtl::OUString::createFromAscii("Pattern"           );
+//static const ::rtl::OUString MEDIADESCRIPTOR_POSSIZE            = ::rtl::OUString::createFromAscii("PosSize"           );
+//static const ::rtl::OUString MEDIADESCRIPTOR_POSTDATA           = ::rtl::OUString::createFromAscii("PostData"          );
+//static const ::rtl::OUString MEDIADESCRIPTOR_POSTSTRING         = ::rtl::OUString::createFromAscii("PostString"        );
+//static const ::rtl::OUString MEDIADESCRIPTOR_PREVIEW            = ::rtl::OUString::createFromAscii("Preview"           );
+//static const ::rtl::OUString MEDIADESCRIPTOR_READONLY           = ::rtl::OUString::createFromAscii("ReadOnly"          );
+//static const ::rtl::OUString MEDIADESCRIPTOR_REFERRER           = ::rtl::OUString::createFromAscii("Referer"           );
+//static const ::rtl::OUString MEDIADESCRIPTOR_SILENT             = ::rtl::OUString::createFromAscii("Silent"            );
+//static const ::rtl::OUString MEDIADESCRIPTOR_STATUSINDICATOR    = ::rtl::OUString::createFromAscii("StatusIndicator"   );
+//static const ::rtl::OUString MEDIADESCRIPTOR_TEMPLATENAME       = ::rtl::OUString::createFromAscii("TemplateName"      );
+//static const ::rtl::OUString MEDIADESCRIPTOR_TEMPLATEREGIONNAME = ::rtl::OUString::createFromAscii("TemplateRegionName");
+//static const ::rtl::OUString MEDIADESCRIPTOR_TYPENAME           = ::rtl::OUString::createFromAscii("TypeName"          );
+//static const ::rtl::OUString MEDIADESCRIPTOR_UPDATEDOCMODE      = ::rtl::OUString::createFromAscii("UpdateDocMode"     );
+//static const ::rtl::OUString MEDIADESCRIPTOR_URL                = ::rtl::OUString::createFromAscii("URL"               );
+//static const ::rtl::OUString MEDIADESCRIPTOR_VERSION            = ::rtl::OUString::createFromAscii("Version"           );
+//static const ::rtl::OUString MEDIADESCRIPTOR_VIEWID             = ::rtl::OUString::createFromAscii("ViewId"            );
+//static const ::rtl::OUString MEDIADESCRIPTOR_REPAIRPACKAGE      = ::rtl::OUString::createFromAscii("RepairPackage"     );
+//static const ::rtl::OUString MEDIADESCRIPTOR_DOCUMENTTITLE      = ::rtl::OUString::createFromAscii("DocumentTitle"     );
+//static const ::rtl::OUString MEDIADESCRIPTOR_MODEL              = ::rtl::OUString::createFromAscii("Model"             );
+
+} // namespace framework
+
+#endif // #ifndef __FRAMEWORK_MEDIADESCRIPTOR_H_
diff --git a/framework/inc/services.h b/framework/inc/services.h
index ac9dde220..5d3d248b3 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -135,17 +135,17 @@ namespace framework{
 #define	IMPLEMENTATIONNAME_FRAME							    DECLARE_ASCII("com.sun.star.comp.framework.Frame"					)
 #define	IMPLEMENTATIONNAME_DESKTOP							    DECLARE_ASCII("com.sun.star.comp.framework.Desktop"					)
 #define	IMPLEMENTATIONNAME_TASK								    DECLARE_ASCII("com.sun.star.comp.framework.Task"					)
-#define	IMPLEMENTATIONNAME_FRAMELOADERFACTORY				    DECLARE_ASCII("com.sun.star.comp.framework.FrameLoaderFactory"		)
-#define	IMPLEMENTATIONNAME_FILTERFACTORY					    DECLARE_ASCII("com.sun.star.comp.framework.FilterFactory"			)
+//#define	IMPLEMENTATIONNAME_FRAMELOADERFACTORY				    DECLARE_ASCII("com.sun.star.comp.framework.FrameLoaderFactory"		)
+//#define	IMPLEMENTATIONNAME_FILTERFACTORY					    DECLARE_ASCII("com.sun.star.comp.framework.FilterFactory"			)
 #define	IMPLEMENTATIONNAME_URLTRANSFORMER					    DECLARE_ASCII("com.sun.star.comp.framework.URLTransformer"			)
-#define	IMPLEMENTATIONNAME_PLUGINFRAME						    DECLARE_ASCII("com.sun.star.comp.framework.PluginFrame"				)
+// #define	IMPLEMENTATIONNAME_PLUGINFRAME						    DECLARE_ASCII("com.sun.star.comp.framework.PluginFrame"				)
 #define	IMPLEMENTATIONNAME_GENERICFRAMELOADER				    DECLARE_ASCII("com.sun.star.comp.office.FrameLoader"				)
 #define	IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER			    DECLARE_ASCII("com.sun.star.comp.framework.MediaTypeDetectionHelper")
-#define	IMPLEMENTATIONNAME_LOGINDIALOG						    DECLARE_ASCII("com.sun.star.comp.framework.LoginDialog"				)
-#define	IMPLEMENTATIONNAME_TYPEDETECTION					    DECLARE_ASCII("com.sun.star.comp.framework.TypeDetection"			)
-#define	IMPLEMENTATIONNAME_DOCUMENTPROPERTIES				    DECLARE_ASCII("com.sun.star.comp.framework.DocumentProperties"		)
+//#define	IMPLEMENTATIONNAME_LOGINDIALOG						    DECLARE_ASCII("com.sun.star.comp.framework.LoginDialog"				)
+//#define	IMPLEMENTATIONNAME_TYPEDETECTION					    DECLARE_ASCII("com.sun.star.comp.framework.TypeDetection"			)
+//#define	IMPLEMENTATIONNAME_DOCUMENTPROPERTIES				    DECLARE_ASCII("com.sun.star.comp.framework.DocumentProperties"		)
 #define IMPLEMENTATIONNAME_OXT_HANDLER                          DECLARE_ASCII("com.sun.star.comp.framework.OXTFileHandler"          )
-#define IMPLEMENTATIONNAME_CONTENTHANDLERFACTORY                DECLARE_ASCII("com.sun.star.comp.framework.ContentHandlerFactory"   )
+//#define IMPLEMENTATIONNAME_CONTENTHANDLERFACTORY                DECLARE_ASCII("com.sun.star.comp.framework.ContentHandlerFactory"   )
 #define IMPLEMENTATIONNAME_SFXTERMINATOR                        DECLARE_ASCII("com.sun.star.comp.sfx2.SfxTerminateListener"         )
 #define IMPLEMENTATIONNAME_PIPETERMINATOR                       DECLARE_ASCII("com.sun.star.comp.OfficeIPCThreadController"         )
 #define IMPLEMENTATIONNAME_QUICKLAUNCHER                        DECLARE_ASCII("com.sun.star.comp.desktop.QuickstartWrapper"         )
@@ -160,13 +160,13 @@ namespace framework{
 #define IMPLEMENTATIONNAME_PATHSETTINGS						    DECLARE_ASCII("com.sun.star.comp.framework.PathSettings"			)
 #define IMPLEMENTATIONNAME_JOBDISPATCH                          DECLARE_ASCII("com.sun.star.comp.framework.jobs.JobDispatch"        )
 #define IMPLEMENTATIONNAME_DISPATCHHELPER                       DECLARE_ASCII("com.sun.star.comp.framework.services.DispatchHelper" )
-#define IMPLEMENTATIONNAME_DETECTORFACTORY                      DECLARE_ASCII("com.sun.star.comp.framework.DetectorFactory"         )
+//#define IMPLEMENTATIONNAME_DETECTORFACTORY                      DECLARE_ASCII("com.sun.star.comp.framework.DetectorFactory"         )
 #define IMPLEMENTATIONNAME_LAYOUTMANAGER                        DECLARE_ASCII("com.sun.star.comp.framework.LayoutManager"           )
 #define IMPLEMENTATIONNAME_POPUPMENUCONTROLLERFACTORY           DECLARE_ASCII("com.sun.star.comp.framework.PopupMenuControllerFactory" )
 #define IMPLEMENTATIONNAME_MACROSMENUCONTROLLER                 DECLARE_ASCII("com.sun.star.comp.framework.MacrosMenuController"      )
 #define IMPLEMENTATIONNAME_FONTMENUCONTROLLER                   DECLARE_ASCII("com.sun.star.comp.framework.FontMenuController"      )
 #define IMPLEMENTATIONNAME_FONTSIZEMENUCONTROLLER               DECLARE_ASCII("com.sun.star.comp.framework.FontSizeMenuController"  )
-#define IMPLEMENTATIONNAME_FORMATMENUCONTROLLER                 DECLARE_ASCII("com.sun.star.comp.framework.FormatMenuController"    )
+// #define IMPLEMENTATIONNAME_FORMATMENUCONTROLLER                 DECLARE_ASCII("com.sun.star.comp.framework.FormatMenuController"    )
 #define IMPLEMENTATIONNAME_OBJECTMENUCONTROLLER                 DECLARE_ASCII("com.sun.star.comp.framework.ObjectMenuController"    )
 #define IMPLEMENTATIONNAME_HEADERMENUCONTROLLER                 DECLARE_ASCII("com.sun.star.comp.framework.HeaderMenuController"    )
 #define IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER                 DECLARE_ASCII("com.sun.star.comp.framework.FooterMenuController"    )
diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx
index d6bae3833..7708a8944 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -51,7 +51,7 @@
 
 //_______________________________________________
 // other includes
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <osl/conditn.hxx>
 
 //_______________________________________________
@@ -74,12 +74,8 @@ namespace framework{
                 All these steps are done inside one method call here.
 */
 
-class DispatchHelper : public css::lang::XTypeProvider
-                     , public css::lang::XServiceInfo
-                     , public css::frame::XDispatchHelper
-                     , public css::frame::XDispatchResultListener // => XEventListener
-                     , public ThreadHelpBase                      // must be the first base class!
-                     , public ::cppu::OWeakObject                 // => XInterface, XWeak
+class DispatchHelper : public ThreadHelpBase                      // must be the first base class!
+                      ,public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,::com::sun::star::frame::XDispatchHelper,::com::sun::star::frame::XDispatchResultListener >
 {
 
     //-------------------------------------------
@@ -112,8 +108,6 @@ class DispatchHelper : public css::lang::XTypeProvider
         //---------------------------------------
         // XInterface, XTypeProvider, XServiceInfo
 
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         //---------------------------------------
diff --git a/framework/inc/services/frameloaderfactory.hxx b/framework/inc/services/frameloaderfactory.hxx
index 10e026b24..41945500f 100644
--- a/framework/inc/services/frameloaderfactory.hxx
+++ b/framework/inc/services/frameloaderfactory.hxx
@@ -57,7 +57,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase3.hxx>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -107,12 +107,8 @@ struct tIMPLExtractedArguments
     @devstatus	deprecated
 *//*-*************************************************************************************************************/
 
-class FrameLoaderFactory	:	public css::lang::XTypeProvider				,
-                                public css::lang::XServiceInfo				,
-                                public css::lang::XMultiServiceFactory		,
-                                public css::container::XNameAccess			,		// => XElementAccess
-                                public ThreadHelpBase							,		// Struct for right initalization of mutex member! Mst first of baseclasses
-                                public ::cppu::OWeakObject
+class FrameLoaderFactory	:	public ThreadHelpBase							,		// Struct for right initalization of mutex member! Mst first of baseclasses
+                                public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,::com::sun::star::lang::XMultiServiceFactory,::com::sun::star::container::XNameAccess >
 {
     //-------------------------------------------------------------------------------------------------------------
     //	public methods
@@ -158,8 +154,6 @@ class FrameLoaderFactory	:	public css::lang::XTypeProvider				,
         //	XInterface, XTypeProvider, XServiceInfo
         //---------------------------------------------------------------------------------------------------------
 
-        DECLARE_XINTERFACE
-        DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         //---------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index 6b710e218..f8f5996f3 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -50,8 +50,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
-
+#include <cppuhelper/implbase2.hxx>
 //_________________________________________________________________________________________________________________
 //	namespaces
 //_________________________________________________________________________________________________________________
@@ -75,10 +74,7 @@ namespace framework{
     @devstatus		deprecated
 *//*-*************************************************************************************************************/
 
-class MediaTypeDetectionHelper	:	public css::lang::XTypeProvider
-                                ,	public css::lang::XServiceInfo
-                                ,	public css::util::XStringMapping
-                                ,	public ::cppu::OWeakObject
+class MediaTypeDetectionHelper	:	public ::cppu::WeakImplHelper2< ::com::sun::star::util::XStringMapping, css::lang::XServiceInfo>
 {
     //-------------------------------------------------------------------------------------------------------------
     //	public methods
@@ -122,8 +118,6 @@ class MediaTypeDetectionHelper	:	public css::lang::XTypeProvider
         //	XInterface, XTypeProvider, XServiceInfo
         //---------------------------------------------------------------------------------------------------------
 
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         //---------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/services/menudocumenthandler.hxx b/framework/inc/services/menudocumenthandler.hxx
deleted file mode 100644
index b59117ff8..000000000
--- a/framework/inc/services/menudocumenthandler.hxx
+++ /dev/null
@@ -1,317 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: menudocumenthandler.hxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_SERVICES_MENUDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_SERVICES_MENUDOCUMENTHANDLER_HXX_
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-#include <threadhelp/threadhelpbase.hxx>
-#include <rtl/ustring.hxx>
-#include <vcl/menu.hxx>
-#include <cppuhelper/weak.hxx>
-
-// #110897#
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-class ReadMenuDocumentHandlerBase : public ::com::sun::star::xml::sax::XDocumentHandler,
-                                    public ThreadHelpBase,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                                    public ::cppu::OWeakObject
-{
-    public:
-        ReadMenuDocumentHandlerBase();
-        virtual ~ReadMenuDocumentHandlerBase();
-
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException ) = 0;
-
-        virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException ) = 0;
-
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException ) = 0;
-
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException ) = 0;
-
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException ) = 0;
-
-        virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget,
-                                                    const rtl::OUString& aData)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL setDocumentLocator(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-    protected:
-        ::rtl::OUString getErrorLineString();
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> m_xReader;
-};
-
-
-class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
-{
-    public:
-        // #110897#
-        OReadMenuDocumentHandler( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            MenuBar* pMenuBar );
-        virtual ~OReadMenuDocumentHandler();
-
-        // #110897#
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-    private:
-        USHORT		m_nItemId;
-        int			m_nElementDepth;
-        sal_Bool	m_bMenuBarMode;
-        MenuBar*	m_pMenuBar;
-
-        // #110897#
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
-};	// OReadMenuDocumentHandler
-
-
-class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
-{
-    public:
-        // #110897#
-        OReadMenuBarHandler( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            MenuBar* pMenuBar, USHORT* pItemId );
-        virtual ~OReadMenuBarHandler();
-
-        // #110897#
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-    private:
-        USHORT*		m_pItemId;
-        int			m_nElementDepth;
-        sal_Bool	m_bMenuMode;
-        MenuBar*	m_pMenuBar;
-
-        // #110897#
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
-};	// OReadMenuBarHandler
-
-
-class OReadMenuHandler : public ReadMenuDocumentHandlerBase
-{
-    public:
-        OReadMenuHandler( Menu* pMenu, USHORT* pItemId );
-        virtual ~OReadMenuHandler();
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-    private:
-        USHORT*				m_pItemId;
-        int					m_nElementDepth;
-        sal_Bool			m_bMenuPopupMode;
-        Menu*				m_pMenu;
-}; // OReadMenuHandler
-
-
-class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
-{
-    public:
-        OReadMenuPopupHandler( Menu* pMenu, USHORT* pItemId );
-        virtual ~OReadMenuPopupHandler();
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-            throw (	::com::sun::star::xml::sax::SAXException,
-                    ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endDocument(void)
-            throw (	::com::sun::star::xml::sax::SAXException,
-                    ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-            throw (	::com::sun::star::xml::sax::SAXException,
-                    ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-            throw (	::com::sun::star::xml::sax::SAXException,
-                    ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-            throw (	::com::sun::star::xml::sax::SAXException,
-                    ::com::sun::star::uno::RuntimeException );
-
-    private:
-        enum NextElementClose { ELEM_CLOSE_NONE, ELEM_CLOSE_MENUITEM, ELEM_CLOSE_MENUSEPARATOR };
-
-        int					m_nElementDepth;
-        USHORT*				m_pItemId;
-        sal_Bool			m_bMenuMode;
-        Menu*				m_pMenu;
-        NextElementClose	m_nNextElementExpected;
-}; // OReadMenuPopupHandler
-
-
-class OWriteMenuDocumentHandler
-{
-    public:
-        OWriteMenuDocumentHandler(
-            MenuBar* pMenu,
-            ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > );
-        virtual ~OWriteMenuDocumentHandler();
-
-        void WriteMenuDocument() throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-    protected:
-        virtual void WriteMenu( Menu* pMenu ) throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-        virtual void WriteMenuItem( Menu* pMenu, USHORT nItemId );
-        virtual void WriteMenuSeparator();
-
-        MenuBar* m_pMenuBar;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList;
-        ::rtl::OUString m_aAttributeType;
-};
-
-} // namespace framework
-
-#endif	// #ifndef __FRAMEWORK_SERVICES_MENUDOCUMENTHANDLER_HXX_
diff --git a/framework/inc/services/popupmenucontrollerfactory.hxx b/framework/inc/services/popupmenucontrollerfactory.hxx
deleted file mode 100644
index bf1a4ee7c..000000000
--- a/framework/inc/services/popupmenucontrollerfactory.hxx
+++ /dev/null
@@ -1,97 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: popupmenucontrollerfactory.hxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_SERVICES_POPUPMENUCONTROLLERFACTORY_HXX_
-#define __FRAMEWORK_SERVICES_POPUPMENUCONTROLLERFACTORY_HXX_
-
-//_________________________________________________________________________________________________________________
-//	my own includes
-//_________________________________________________________________________________________________________________
-
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/generic.hxx>
-#include <macros/xinterface.hxx>
-#include <macros/xtypeprovider.hxx>
-#include <macros/xserviceinfo.hxx>
-#include <stdtypes.h>
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/frame/XUIControllerRegistration.hpp>
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
-#include <rtl/ustring.hxx>
-
-namespace framework
-{
-
-class ConfigurationAccess_PopupMenuControllerFactory;
-class PopupMenuControllerFactory :  public com::sun::star::lang::XTypeProvider		                    ,
-                                    public com::sun::star::lang::XServiceInfo		                    ,
-                                    public com::sun::star::lang::XMultiComponentFactory                 ,
-                                    public ::com::sun::star::frame::XUIControllerRegistration     ,
-                                    private ThreadHelpBase							                    ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                                    public ::cppu::OWeakObject
-{
-    public:
-        PopupMenuControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-        virtual ~PopupMenuControllerFactory();
-
-        //  XInterface, XTypeProvider, XServiceInfo
-        DECLARE_XINTERFACE
-        DECLARE_XTYPEPROVIDER
-        DECLARE_XSERVICEINFO
-
-        // XMultiComponentFactory
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::rtl::OUString& aServiceSpecifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException);
-
-        // XUIControllerRegistration
-        virtual sal_Bool SAL_CALL hasController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModelName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL registerController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModelName, const ::rtl::OUString& aControllerImplementationName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL deregisterController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModelName ) throw (::com::sun::star::uno::RuntimeException);
-
-    private:
-        sal_Bool                                                                         m_bConfigRead;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-        ConfigurationAccess_PopupMenuControllerFactory*                                  m_pConfigAccess;
-};
-
-} // namespace framework
-
-#endif // __FRAMEWORK_SERVICES_POPUPMENUCONTROLLERFACTORY_HXX_
diff --git a/framework/inc/services/saxnamespacefilter.hxx b/framework/inc/services/saxnamespacefilter.hxx
deleted file mode 100644
index 8aff13ff6..000000000
--- a/framework/inc/services/saxnamespacefilter.hxx
+++ /dev/null
@@ -1,119 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: saxnamespacefilter.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_SERVICES_SAXNAMESPACEFILTER_HXX_
-#define __FRAMEWORK_SERVICES_SAXNAMESPACEFILTER_HXX_
-
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <threadhelp/threadhelpbase.hxx>
-#include <classes/xmlnamespaces.hxx>
-
-#ifndef _RTL_USTRING_
-#include <rtl/ustring>
-#endif
-#include <vcl/menu.hxx>
-#include <cppuhelper/weak.hxx>
-
-#include <stack>
-
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework
-{
-
-class SaxNamespaceFilter : public ::com::sun::star::xml::sax::XDocumentHandler,
-                           public ThreadHelpBase,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                           public ::cppu::OWeakObject
-{
-    public:
-        SaxNamespaceFilter( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rSax1DocumentHandler );
-        virtual ~SaxNamespaceFilter();
-
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( 
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException, 
-                ::com::sun::star::uno::RuntimeException );
-        
-        virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException, 
-                ::com::sun::star::uno::RuntimeException );
-        
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException, 
-                ::com::sun::star::uno::RuntimeException );
-        
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException, 
-                ::com::sun::star::uno::RuntimeException );
-        
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException, 
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces)
-        throw(	::com::sun::star::xml::sax::SAXException, 
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget,
-                                                    const rtl::OUString& aData)
-        throw(	::com::sun::star::xml::sax::SAXException, 
-                ::com::sun::star::uno::RuntimeException );
-        
-        virtual void SAL_CALL setDocumentLocator( 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-    protected:
-        typedef ::std::stack< XMLNamespaces > NamespaceStack;
-
-        ::rtl::OUString getErrorLineString();
-        
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler;
-        NamespaceStack	m_aNamespaceStack;
-        sal_Int32		m_nDepth;
-};
-
-}
-
-#endif // __FRAMEWORK_SERVICES_SAXNAMESPACEFILTER_HXX_
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index 8bd7c9db4..675d16ceb 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -59,7 +59,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <rtl/ustring.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/link.hxx>
@@ -236,11 +236,8 @@ struct ReSubstUserVarOrder
 typedef std::list< ReSubstFixedVarOrder > ReSubstFixedVarOrderVector;
 typedef std::list< ReSubstUserVarOrder > ReSubstUserVarOrderVector;
 
-class SubstitutePathVariables :		public com::sun::star::lang::XTypeProvider		,
-                                    public com::sun::star::lang::XServiceInfo		,
-                                    public com::sun::star::util::XStringSubstitution,
-                                    private ThreadHelpBase							,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                                    public ::cppu::OWeakObject
+class SubstitutePathVariables :		private ThreadHelpBase							,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                                    public ::cppu::WeakImplHelper2< ::com::sun::star::util::XStringSubstitution, css::lang::XServiceInfo>
 {
     friend class SubstitutePathVariables_Impl;
 
@@ -249,8 +246,6 @@ class SubstitutePathVariables :		public com::sun::star::lang::XTypeProvider		,
         virtual ~SubstitutePathVariables();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XStringSubstitution
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index 0b7abc93d..8be2c30dc 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -40,22 +40,16 @@
 #include <com/sun/star/util/XStringAbbreviation.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 
 namespace framework
 {
 
-class UriAbbreviation:
-    public ::com::sun::star::lang::XTypeProvider,
-    public ::com::sun::star::lang::XServiceInfo,
-    public ::com::sun::star::util::XStringAbbreviation,
-    public ::cppu::OWeakObject	// helper implements XInterface, XWeak
+class UriAbbreviation:    public ::cppu::WeakImplHelper2< ::com::sun::star::util::XStringAbbreviation, css::lang::XServiceInfo>
 {
 public:
     explicit UriAbbreviation(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
 
-    FWK_DECLARE_XINTERFACE
-    FWK_DECLARE_XTYPEPROVIDER
     DECLARE_XSERVICEINFO
 
     // ::com::sun::star::util::XStringAbbreviation:
diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx
index ce0ce2763..df7b69dc9 100644
--- a/framework/inc/services/urltransformer.hxx
+++ b/framework/inc/services/urltransformer.hxx
@@ -54,7 +54,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -84,11 +84,7 @@ namespace framework{
                 OWeakObject
 *//*-*************************************************************************************************************/
 
-class URLTransformer	:	public css::lang::XTypeProvider		,
-                            public css::lang::XServiceInfo		,
-                            public css::util::XURLTransformer	,
-                            public ThreadHelpBase					,
-                            public ::cppu::OWeakObject
+class URLTransformer	:	public ::cppu::WeakImplHelper2< ::com::sun::star::util::XURLTransformer, css::lang::XServiceInfo>
 {
     //-------------------------------------------------------------------------------------------------------------
     //	public methods
@@ -132,8 +128,6 @@ class URLTransformer	:	public css::lang::XTypeProvider		,
         //	XInterface, XTypeProvider, XServiceInfo
         //---------------------------------------------------------------------------------------------------------
 
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         //---------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index 46c62d177..28b209894 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -56,26 +56,21 @@
 //_________________________________________________________________________________________________________________
 //	includes of other projects
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
 
-class TabWinFactory :  public com::sun::star::lang::XTypeProvider		        ,
-                       public com::sun::star::lang::XServiceInfo		        ,
-                       public com::sun::star::lang::XSingleComponentFactory		,
-                       protected ThreadHelpBase							        ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                       public ::cppu::OWeakObject
+class TabWinFactory :  protected ThreadHelpBase							        ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                       public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleComponentFactory, com::sun::star::lang::XServiceInfo>
 {
     public:
         TabWinFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~TabWinFactory();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
         DECLARE_XSERVICEINFO
-        FWK_DECLARE_XTYPEPROVIDER
 
         // XSingleComponentFactory
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 997826b10..b7326f7e1 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -38,6 +38,7 @@
 #include <vector>
 #include <list>
 #include <hash_map>
+#include <memory>
 
 //_________________________________________________________________________________________________________________
 //	my own includes
@@ -68,7 +69,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <rtl/ustring.hxx>
 
@@ -80,16 +81,12 @@
 
 namespace framework
 {
-    class ImageManager :    public com::sun::star::lang::XTypeProvider	                  ,
-                            public  css::lang::XServiceInfo                         ,
-                            public ::com::sun::star::ui::XImageManager              ,
-                            private ThreadHelpBase						                  ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                            public ::cppu::OWeakObject
+    class ImageManagerImpl;
+    class ImageManager :    private ThreadHelpBase						                  ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                            public ::cppu::WeakImplHelper2< ::com::sun::star::ui::XImageManager, css::lang::XServiceInfo>
     {
         public:
             //  XInterface, XTypeProvider, XServiceInfo
-            FWK_DECLARE_XINTERFACE
-            FWK_DECLARE_XTYPEPROVIDER
             DECLARE_XSERVICEINFO
 
             ImageManager( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceManager );
@@ -127,54 +124,7 @@ namespace framework
             void setStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException);
     
         private:
-            typedef std::hash_map< rtl::OUString, 
-                                   sal_Bool, 
-                                   OUStringHashCode,
-                                   ::std::equal_to< ::rtl::OUString > > ImageNameMap;
-            
-            // private data types
-            enum Layer
-            {
-                LAYER_DEFAULT,
-                LAYER_USERDEFINED,
-                LAYER_COUNT
-            };
-            
-            enum NotifyOp
-            {
-                NotifyOp_Remove,
-                NotifyOp_Insert,
-                NotifyOp_Replace
-            };
-
-            typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-
-            // private methods
-            void                                      implts_initialize();
-            void                                      implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
-            ImageList*                                implts_getUserImageList( ImageType nImageType );
-            sal_Bool                                  implts_loadUserImages( ImageType nImageType,
-                                                                             const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, 
-                                                                             const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage );
-            sal_Bool                                  implts_storeUserImages( ImageType nImageType,
-                                                                              const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, 
-                                                                              const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage );
-
-            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserConfigStorage;
-            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserImageStorage;
-            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserBitmapsStorage;
-            bool                                                                            m_bReadOnly;
-            bool                                                                            m_bInitialized;
-            bool                                                                            m_bModified;
-            bool                                                                            m_bConfigRead;
-            bool                                                                            m_bDisposed;
-            rtl::OUString                                                                   m_aXMLPostfix;
-            rtl::OUString                                                                   m_aModuleIdentifier;
-            rtl::OUString                                                                   m_aResourceString;
-            com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
-            ::cppu::OMultiTypeInterfaceContainerHelper                                      m_aListenerContainer;   /// container for ALL Listener
-            ImageList*                                                                      m_pUserImageList[ImageType_COUNT];
-            bool                                                                            m_bUserImageListModified[ImageType_COUNT];
+            ::std::auto_ptr<ImageManagerImpl> m_pImpl;
    };
 }
 
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index b19ff34bb..5e24d2a37 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -38,6 +38,7 @@
 #include <vector>
 #include <list>
 #include <hash_map>
+#include <memory>
 
 //_________________________________________________________________________________________________________________
 //	my own includes
@@ -68,7 +69,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <rtl/ustring.hxx>
 
@@ -80,64 +81,12 @@
 
 namespace framework
 {
-    class CmdImageList
-    {
-        public:
-            CmdImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
-                          const ::rtl::OUString& aModuleIdentifier );
-            virtual ~CmdImageList();
-            
-            virtual Image                           getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
-            virtual bool                            hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
-            virtual ::std::vector< rtl::OUString >& getImageNames();
-            virtual ::std::vector< rtl::OUString >& getImageCommandNames();
-
-        protected:
-            void                            impl_fillCommandToImageNameMap();
-            ImageList*                      impl_getImageList( sal_Int16 nImageType );
-            std::vector< ::rtl::OUString >& impl_getImageNameVector();
-            std::vector< ::rtl::OUString >& impl_getImageCommandNameVector();
+    class ImageManagerImpl;
 
-        private:
-            sal_Bool                                                                         m_bVectorInit;
-            rtl::OUString                                                                    m_aModuleIdentifier;
-            ImageList*                                                                       m_pImageList[ImageType_COUNT];
-            CommandToImageNameMap                                                            m_aCommandToImageNameMap;
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-            ::std::vector< rtl::OUString >                                                   m_aImageNameVector;
-            ::std::vector< rtl::OUString >                                                   m_aImageCommandNameVector;
-            sal_Int16                                                                        m_nSymbolsStyle;
-    };
-
-    class GlobalImageList : public CmdImageList, public rtl::IReference
+    class ModuleImageManager :    private ThreadHelpBase						                  ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                                  public ::cppu::WeakImplHelper1< ::com::sun::star::ui::XImageManager>
     {
         public:
-            GlobalImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
-            virtual ~GlobalImageList();
-
-            virtual Image                           getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
-            virtual bool                            hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
-            virtual ::std::vector< rtl::OUString >& getImageNames();
-            virtual ::std::vector< rtl::OUString >& getImageCommandNames();
-            
-            // ÍReference
-            virtual oslInterlockedCount SAL_CALL acquire();
-            virtual oslInterlockedCount SAL_CALL release();
-
-        private:
-            oslInterlockedCount                                                              m_nRefCount;
-    };
-
-    class ModuleImageManager :    public com::sun::star::lang::XTypeProvider	                  ,
-                                  public ::com::sun::star::ui::XImageManager                ,
-                                  private ThreadHelpBase						                  ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                                  public ::cppu::OWeakObject
-    {
-        public:
-            //  XInterface, XTypeProvider, XServiceInfo
-            FWK_DECLARE_XINTERFACE
-            FWK_DECLARE_XTYPEPROVIDER
-
             ModuleImageManager( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceManager );
             virtual ~ModuleImageManager();
 
@@ -170,59 +119,7 @@ namespace framework
             virtual sal_Bool SAL_CALL isReadOnly() throw (::com::sun::star::uno::RuntimeException);
 
         private:
-            typedef std::hash_map< rtl::OUString, 
-                                   sal_Bool, 
-                                   OUStringHashCode,
-                                   ::std::equal_to< ::rtl::OUString > > ImageNameMap;
-            
-            // private data types
-            enum Layer
-            {
-                LAYER_DEFAULT,
-                LAYER_USERDEFINED,
-                LAYER_COUNT
-            };
-            
-            enum NotifyOp
-            {
-                NotifyOp_Remove,
-                NotifyOp_Insert,
-                NotifyOp_Replace
-            };
-
-            typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-
-            // private methods
-            void                                      implts_initialize();
-            void                                      implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
-            const rtl::Reference< GlobalImageList >&  implts_getGlobalImageList();
-            CmdImageList*                             implts_getDefaultImageList();
-            ImageList*                                implts_getUserImageList( ImageType nImageType );
-            sal_Bool                                  implts_loadUserImages( ImageType nImageType,
-                                                                             const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, 
-                                                                             const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage );
-            sal_Bool                                  implts_storeUserImages( ImageType nImageType,
-                                                                              const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, 
-                                                                              const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage );
-
-            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserConfigStorage;
-            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserImageStorage;
-            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserBitmapsStorage;
-            bool                                                                            m_bReadOnly;
-            bool                                                                            m_bInitialized;
-            bool                                                                            m_bModified;
-            bool                                                                            m_bConfigRead;
-            bool                                                                            m_bDisposed;
-            rtl::OUString                                                                   m_aXMLPostfix;
-            rtl::OUString                                                                   m_aModuleIdentifier;
-            rtl::OUString                                                                   m_aResourceString;
-            com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject >      m_xUserRootCommit;
-            com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
-            ::cppu::OMultiTypeInterfaceContainerHelper                                      m_aListenerContainer;   /// container for ALL Listener
-            rtl::Reference< GlobalImageList >                                               m_pGlobalImageList;
-            CmdImageList*                                                                   m_pDefaultImageList;
-            ImageList*                                                                      m_pUserImageList[ImageType_COUNT];
-            bool                                                                            m_bUserImageListModified[ImageType_COUNT];
+            ::std::auto_ptr<ImageManagerImpl>                                               m_pImpl;
    };
 }
 
diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
index 05fd57f3d..37584d5a3 100644
--- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
@@ -38,6 +38,7 @@
 #include <vector>
 #include <list>
 #include <hash_map>
+#include <memory>
 
 //_________________________________________________________________________________________________________________
 //	my own includes
@@ -77,6 +78,7 @@
 
 namespace framework
 {
+    class UIConfigurationManagerImpl;
     class ModuleUIConfigurationManager :   public com::sun::star::lang::XTypeProvider	                    ,
                                            public com::sun::star::lang::XServiceInfo	                    ,
                                            public com::sun::star::lang::XComponent                          ,
@@ -85,7 +87,6 @@ namespace framework
                                            public ::com::sun::star::ui::XUIConfigurationManager       ,
                                            public ::com::sun::star::ui::XModuleUIConfigurationManager ,
                                            public ::com::sun::star::ui::XUIConfigurationPersistence   ,
-                                           private ThreadHelpBase						,	// Struct for right initalization of mutex member! Must be first of baseclasses.
                                            public ::cppu::OWeakObject
     {
         public:
@@ -134,94 +135,7 @@ namespace framework
             virtual sal_Bool SAL_CALL isReadOnly() throw (::com::sun::star::uno::RuntimeException);
 
         private:
-            // private data types
-            enum Layer
-            {
-                LAYER_DEFAULT,
-                LAYER_USERDEFINED,
-                LAYER_COUNT
-            };
-            
-            enum NotifyOp
-            {
-                NotifyOp_Remove,
-                NotifyOp_Insert,
-                NotifyOp_Replace
-            };
-
-            struct UIElementInfo
-            {
-                UIElementInfo( const rtl::OUString& rResourceURL, const rtl::OUString& rUIName ) :
-                    aResourceURL( rResourceURL), aUIName( rUIName ) {}
-                rtl::OUString   aResourceURL;
-                rtl::OUString   aUIName;
-            };
-            
-            struct UIElementData
-            {
-                UIElementData() : bModified( false ), bDefault( true ), bDefaultNode( true ) {};
-
-                rtl::OUString aResourceURL;
-                rtl::OUString aName;
-                bool          bModified;        // has been changed since last storing
-                bool          bDefault;         // default settings
-                bool          bDefaultNode;     // this is a default layer element data
-                com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > xSettings;
-            };
-
-            struct UIElementType;
-            friend struct UIElementType;
-            typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
-            
-            struct UIElementType
-            {
-                UIElementType() : bModified( false ),
-                                  bLoaded( false ), 
-                                  bDefaultLayer( false ),
-                                  nElementType( ::com::sun::star::ui::UIElementType::UNKNOWN ) {}
-                
-
-                bool                                                              bModified;
-                bool                                                              bLoaded;
-                bool                                                              bDefaultLayer;
-                sal_Int16                                                         nElementType;
-                UIElementDataHashMap                                              aElementsHashMap;
-                com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-            };
-
-            typedef ::std::vector< UIElementType > UIElementTypesVector;
-            typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-            typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
-
-            // private methods
-            void            impl_Initialize();
-            void            implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
-            void            impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType );
-            void            impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType );
-            UIElementData*  impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
-            void            impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData );
-            void            impl_storeElementTypeData( com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage, UIElementType& rElementType, bool bResetModifyState = true );
-            void            impl_resetElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
-            void            impl_reloadElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
-
-            UIElementTypesVector                                                            m_aUIElements[LAYER_COUNT];
-            PresetHandler*                                                                  m_pStorageHandler[::com::sun::star::ui::UIElementType::COUNT];
-            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xDefaultConfigStorage;
-            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserConfigStorage;
-            bool                                                                            m_bReadOnly;
-            bool                                                                            m_bInitialized;
-            bool                                                                            m_bModified;
-            bool                                                                            m_bConfigRead;
-            bool                                                                            m_bDisposed;
-            rtl::OUString                                                                   m_aXMLPostfix;
-            rtl::OUString                                                                   m_aPropUIName;
-            rtl::OUString                                                                   m_aPropResourceURL;
-            rtl::OUString                                                                   m_aModuleIdentifier;
-            rtl::OUString                                                                   m_aModuleShortName;
-            com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject >      m_xUserRootCommit;
-            com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
-            ::cppu::OMultiTypeInterfaceContainerHelper                                      m_aListenerContainer;   /// container for ALL Listener
-            com::sun::star::uno::Reference< com::sun::star::lang::XComponent >              m_xModuleImageManager;
+            ::std::auto_ptr<UIConfigurationManagerImpl> m_pImpl;
    };
 }
 
diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx
index 825dff114..099071539 100644
--- a/framework/inc/uiconfiguration/uicategorydescription.hxx
+++ b/framework/inc/uiconfiguration/uicategorydescription.hxx
@@ -43,9 +43,8 @@
 //_________________________________________________________________________________________________________________
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
-#include <macros/xinterface.hxx>
-#include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
+#include <uielement/uicommanddescription.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -59,61 +58,18 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
-#include <rtl/ustring.hxx>
 
 namespace framework
 {
-
-class ConfigurationAccess_UICategory;
-class UICategoryDescription :  public com::sun::star::lang::XTypeProvider	 ,
-                               public com::sun::star::lang::XServiceInfo	 ,
-                               public com::sun::star::container::XNameAccess ,
-                               private ThreadHelpBase						 ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                               public ::cppu::OWeakObject
+class UICategoryDescription :  public UICommandDescription
 {
     public:
         UICategoryDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~UICategoryDescription();
 
-        //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
-
-        // XNameAccess
-        virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) 
-            throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() 
-            throw (::com::sun::star::uno::RuntimeException);
-        
-        virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) 
-            throw (::com::sun::star::uno::RuntimeException);
-
-        // XElementAccess
-        virtual ::com::sun::star::uno::Type SAL_CALL getElementType() 
-            throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL hasElements() 
-            throw (::com::sun::star::uno::RuntimeException);
-
-        typedef ::std::hash_map< ::rtl::OUString,
-                                 ::rtl::OUString,
-                                 OUStringHashCode,
-                                 ::std::equal_to< ::rtl::OUString > > ModuleToCategoryFileMap;
-        
-        typedef ::std::hash_map< ::rtl::OUString,
-                                 ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >,
-                                 OUStringHashCode,
-                                 ::std::equal_to< ::rtl::OUString > > CategoryHashMap;
-
     private:
-        sal_Bool                                                                            m_bConfigRead;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
-        ModuleToCategoryFileMap                                                             m_aModuleToCategoryFileMap;
-        CategoryHashMap                                                                     m_aCategoryHashMap;
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >        m_xGenericCategories;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > m_xModuleManager;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const ::rtl::OUString& _sName);
 };
 
 } // namespace framework
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index 66ebbd0f1..d907d64c8 100644
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
@@ -38,6 +38,7 @@
 #include <vector>
 #include <list>
 #include <hash_map>
+#include <memory>
 
 //_________________________________________________________________________________________________________________
 //	my own includes
@@ -77,6 +78,7 @@
 
 namespace framework
 {
+    class UIConfigurationManagerImpl;
     class UIConfigurationManager :   public com::sun::star::lang::XTypeProvider	,
                                      public com::sun::star::lang::XServiceInfo	,
                                      public com::sun::star::lang::XComponent    ,
@@ -84,7 +86,6 @@ namespace framework
                                      public ::com::sun::star::ui::XUIConfigurationManager      ,
                                      public ::com::sun::star::ui::XUIConfigurationPersistence  ,
                                      public ::com::sun::star::ui::XUIConfigurationStorage      ,
-                                     private ThreadHelpBase						,	// Struct for right initalization of mutex member! Must be first of baseclasses.
                                      public ::cppu::OWeakObject
     {
         public:
@@ -130,83 +131,7 @@ namespace framework
             virtual sal_Bool SAL_CALL hasStorage() throw (::com::sun::star::uno::RuntimeException);
 
         private:
-            // private data types
-            enum NotifyOp
-            {
-                NotifyOp_Remove,
-                NotifyOp_Insert,
-                NotifyOp_Replace
-            };
-
-            struct UIElementInfo
-            {
-                UIElementInfo( const rtl::OUString& rResourceURL, const rtl::OUString& rUIName ) :
-                    aResourceURL( rResourceURL), aUIName( rUIName ) {}
-                rtl::OUString   aResourceURL;
-                rtl::OUString   aUIName;
-            };
-            
-            struct UIElementData
-            {
-                UIElementData() : bModified( false ), bDefault( true ) {};
-
-                rtl::OUString aResourceURL;
-                rtl::OUString aName;
-                bool          bModified;        // has been changed since last storing
-                bool          bDefault;         // default settings
-                com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > xSettings;
-            };
-
-            struct UIElementType;
-            friend struct UIElementType;
-            typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
-            
-            struct UIElementType
-            {
-                UIElementType() : bModified( false ), 
-                                  bLoaded( false ), 
-                                  bDefaultLayer( false ),
-                                  nElementType( ::com::sun::star::ui::UIElementType::UNKNOWN ) {}
-                
-
-                bool                                                              bModified;
-                bool                                                              bLoaded;
-                bool                                                              bDefaultLayer;
-                sal_Int16                                                         nElementType;
-                UIElementDataHashMap                                              aElementsHashMap;
-                com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-            };
-
-            typedef ::std::vector< UIElementType > UIElementTypesVector;
-            typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-            typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
-
-            // private methods
-            void            impl_Initialize();
-            void            implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
-            void            impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType );
-            void            impl_preloadUIElementTypeList( sal_Int16 nElementType );
-            UIElementData*  impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
-            void            impl_requestUIElementData( sal_Int16 nElementType, UIElementData& aUIElementData );
-            void            impl_storeElementTypeData( com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage, UIElementType& rElementType, bool bResetModifyState = true );
-            void            impl_resetElementTypeData( UIElementType& rDocElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer );
-            void            impl_reloadElementTypeData( UIElementType& rDocElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
-
-            UIElementTypesVector                                                            m_aUIElements;
-            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xDocConfigStorage;
-            bool                                                                            m_bReadOnly;
-            bool                                                                            m_bInitialized;
-            bool                                                                            m_bModified;
-            bool                                                                            m_bConfigRead;
-            bool                                                                            m_bDisposed;
-            rtl::OUString                                                                   m_aXMLPostfix;
-            rtl::OUString                                                                   m_aPropUIName;
-            rtl::OUString                                                                   m_aPropResourceURL;
-            rtl::OUString                                                                   m_aModuleIdentifier;
-            com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
-            ::cppu::OMultiTypeInterfaceContainerHelper                                      m_aListenerContainer;   /// container for ALL Listener
-            com::sun::star::uno::Reference< com::sun::star::lang::XComponent >              m_xImageManager;
-            com::sun::star::uno::Reference< com::sun::star::uno::XInterface >               m_xAccConfig;
+            ::std::auto_ptr<UIConfigurationManagerImpl> m_pImpl;
    };
 }
 
diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
index a4aba0a40..7d78e981d 100644
--- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx
+++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
@@ -59,7 +59,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
@@ -83,11 +83,8 @@ namespace framework
 #define WINDOWSTATE_PROPERTY_CONTEXTACTIVE  "ContextActive"
 
 class ConfigurationAccess_Windows;
-class WindowStateConfiguration :  public com::sun::star::lang::XTypeProvider	,
-                                  public com::sun::star::lang::XServiceInfo		,
-                                  public com::sun::star::container::XNameAccess ,
-                                  private ThreadHelpBase						,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                                  public ::cppu::OWeakObject
+class WindowStateConfiguration :  private ThreadHelpBase						,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                                  public ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameAccess, css::lang::XServiceInfo>
 {
     public:
         WindowStateConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index 48943f23b..ffa2d6481 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -77,9 +77,6 @@ class ComboboxToolbarController : public IComboBoxListener,
         // XComponent
         virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
 
-        // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); 
-
         // IComboBoxListener
         virtual void Select();
         virtual void DoubleClick();
@@ -91,6 +88,7 @@ class ComboboxToolbarController : public IComboBoxListener,
 
     protected:
         virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand );
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const;
 
     private:
         ComboBoxControl*    m_pComboBox;
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index 97e13c60a..1c120fe71 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -95,6 +95,7 @@ class ComplexToolbarController : public svt::ToolboxController
                             const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rInfo );
 
         virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) = 0;
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const;
         const ::com::sun::star::util::URL& getInitializedURL();
         void notifyFocusGet();
         void notifyFocusLost();
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index 6f1802fd1..1ab4391dd 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -72,7 +72,6 @@ namespace framework
             DECLARE_XSERVICEINFO
 
             // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
             
             // XInitialization
@@ -82,15 +81,15 @@ namespace framework
             virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
             // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
 
             // XEventListener
             virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
 
         private:
+            virtual void impl_setPopupMenu();
+            virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
+        
             class UrlToDispatchMap : public ::std::hash_map< ::rtl::OUString,
                                                              com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
                                                              OUStringHashCode,
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index 8efa6c284..a5002ec62 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -75,9 +75,6 @@ class DropdownToolbarController : public IListBoxListener,
         // XComponent
         virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
 
-        // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); 
-
         // IComboBoxListener
         virtual void Select();
         virtual void DoubleClick();
@@ -87,6 +84,7 @@ class DropdownToolbarController : public IListBoxListener,
 
     protected:
         virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand );
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const;
 
     private:
         ListBoxControl*    m_pListBoxControl;
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index a81c0d82b..385f5cc6f 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -75,9 +75,6 @@ class EditToolbarController : public IEditListener,
         // XComponent
         virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
 
-        // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); 
-
         // IEditListener
         virtual void Modify();
         virtual void KeyInput( const KeyEvent& rKEvt );
@@ -87,6 +84,7 @@ class EditToolbarController : public IEditListener,
 
     protected:
         virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand );
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const;
 
     private:
         EditControl*    m_pEditControl;
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index ec315fe6e..4746d09d9 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -69,25 +69,20 @@ namespace framework
             DECLARE_XSERVICEINFO
 
             // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
-            
-            // XInitialization
-            virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
             // XStatusListener
             virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
             // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-
+            
             // XEventListener
             virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
 
         private:
+            virtual void impl_setPopupMenu();
+            virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
             void fillPopupMenu( const com::sun::star::uno::Sequence< ::rtl::OUString >& rFontNameSeq, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
             
             rtl::OUString                                                       m_aFontFamilyName;
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 2367d7c6a..b111a02c3 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -70,25 +70,17 @@ namespace framework
             DECLARE_XSERVICEINFO
 
             // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
             
-            // XInitialization
-            virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
             // XStatusListener
             virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
-            // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-
             // XEventListener
             virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
 
         private:
+            virtual void impl_setPopupMenu();
+            virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
             void setCurHeight( long nHeight, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
             void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
             rtl::OUString retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
dissimilarity index 61%
index 48bef39df..e4669aa23 100644
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
@@ -1,99 +1,60 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: footermenucontroller.hxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_
-
-//_________________________________________________________________________________________________________________
-//	my own includes
-//_________________________________________________________________________________________________________________
-
-#include <helper/popupmenucontrollerbase.hxx>
-#include <stdtypes.h>
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
-#include <com/sun/star/frame/status/Verb.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-
-//_________________________________________________________________________________________________________________
-//	includes of other projects
-//_________________________________________________________________________________________________________________
-#include <toolkit/awt/vclxmenu.hxx>
-#include <cppuhelper/weak.hxx>
-#include <rtl/ustring.hxx>
-
-namespace framework
-{
-    class FooterMenuController :  public PopupMenuControllerBase
-    {
-        public:
-            FooterMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-            virtual ~FooterMenuController();
-            
-            // XServiceInfo
-            DECLARE_XSERVICEINFO
-
-            // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
-            
-            // XInitialization
-            virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
-            // XStatusListener
-            virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
-
-            // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-
-            // XEventListener
-            virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
-
-        private:
-            void fillPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
-
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel;
-    };
-}
-
-#endif // __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: footermenucontroller.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_
+#define __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+#include <uielement/headermenucontroller.hxx>
+
+namespace framework
+{
+    class FooterMenuController :  public HeaderMenuController
+    {
+        public:
+            FooterMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            virtual ~FooterMenuController();
+            
+            // XServiceInfo
+            virtual ::rtl::OUString                                        SAL_CALL getImplementationName              (                                                                               ) throw( css::uno::RuntimeException );  
+            virtual sal_Bool                                               SAL_CALL supportsService                    ( const ::rtl::OUString&                                        sServiceName    ) throw( css::uno::RuntimeException );  
+            virtual css::uno::Sequence< ::rtl::OUString >                  SAL_CALL getSupportedServiceNames           (                                                                               ) throw( css::uno::RuntimeException );  
+            /* Helper for XServiceInfo */                                                                                                                                                                                                      
+            static css::uno::Sequence< ::rtl::OUString >                   SAL_CALL impl_getStaticSupportedServiceNames(                                                                               );                                      
+            static ::rtl::OUString                                         SAL_CALL impl_getStaticImplementationName   (                                                                               );                                      
+            /* Helper for registry */                                                                                                                                                                                                          
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );         
+            static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );                                      
+    };
+}
+
+#endif // __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 316c60da4..377b685d6 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -37,6 +37,9 @@
 
 #include <svtools/toolboxcontroller.hxx>
 #include <vcl/toolbox.hxx>
+#include <memory>
+
+class PopupMenu;
 
 namespace framework
 {
@@ -64,7 +67,7 @@ class GenericToolbarController : public svt::ToolboxController
 
          DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo* ); 
     
-    private:
+    protected:
         ToolBox*        m_pToolbar;
         sal_uInt16      m_nID;
         sal_Bool        m_bEnumCommand : 1,
@@ -72,6 +75,28 @@ class GenericToolbarController : public svt::ToolboxController
         rtl::OUString   m_aEnumCommand;
 };
 
+class MenuToolbarController : public GenericToolbarController
+{
+    com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xMenuDesc;
+    PopupMenu* pMenu;
+    com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuManager;
+    rtl::OUString m_aModuleIdentifier;
+    public:
+        MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
+                                  const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
+                                  ToolBox* pToolBar,
+                                  USHORT   nID,
+                                  const rtl::OUString& aCommand, 
+                                  const rtl::OUString& aModuleIdentifier, 
+                                  const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc );
+
+    ~MenuToolbarController();
+    // XToolbarController
+    virtual void SAL_CALL click() throw ( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
+
+};
+
 }
 
 #endif // __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index f4e1d2c1d..8440d5f70 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -64,35 +64,27 @@ namespace framework
     class HeaderMenuController :  public PopupMenuControllerBase
     {
         public:
-            HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool _bFooter = sal_False );
             virtual ~HeaderMenuController();
             
             // XServiceInfo
             DECLARE_XSERVICEINFO
 
             // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
             
-            // XInitialization
-            virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
             // XStatusListener
             virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
-            // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-
             // XEventListener
             virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
 
         private:
+            virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
             void fillPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
 
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel;
+            bool m_bFooter;
     };
 }
 
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index b621822e7..ce92d25d3 100644
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -61,9 +61,6 @@ class ImageButtonToolbarController : public ComplexToolbarController
         // XComponent
         virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
 
-        // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); 
-
     protected:
         virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand );
 
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index a4c48ba95..e1933851c 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -52,7 +52,7 @@
 //	other includes
 //_________________________________________________________________________________________________________________
 #include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 
 #include <vector>
 
@@ -60,10 +60,7 @@ namespace framework
 {
 
 class ConstItemContainer;
-class ItemContainer :   public ::com::sun::star::lang::XTypeProvider           ,
-                        public ::com::sun::star::container::XIndexContainer    ,
-                        public ::com::sun::star::lang::XUnoTunnel              ,
-                        public ::cppu::OWeakObject
+class ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexContainer>
 {
     friend class ConstItemContainer;
 
@@ -76,9 +73,6 @@ class ItemContainer :   public ::com::sun::star::lang::XTypeProvider           ,
         //---------------------------------------------------------------------------------------------------------
         //	XInterface, XTypeProvider
         //---------------------------------------------------------------------------------------------------------
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER		
-
         // XUnoTunnel
         static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
         static ItemContainer*								        GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 505706d48..fcd250a37 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -72,7 +72,6 @@ namespace framework
             DECLARE_XSERVICEINFO
 
             // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
             
             // XInitialization
@@ -81,16 +80,12 @@ namespace framework
             // XStatusListener
             virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
-            // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-
             // XEventListener
             virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
 
         private:
+            virtual void impl_setPopupMenu();
+            virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
             enum Mode
             {
                 MODE_SetLanguageSelectionMenu,
diff --git a/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
index 9cba64719..a4862b5b5 100644
--- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx
+++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
@@ -87,7 +87,8 @@ class LangSelectionStatusbarController : public svt::StatusbarController
         virtual ~LangSelectionStatusbarController() {}
         LangSelectionStatusbarController(LangSelectionStatusbarController &); // not defined
         void operator =(LangSelectionStatusbarController &); // not defined
-        
+
+    
         sal_Bool            m_bShowMenu;
         sal_Int16           m_nScriptType;
         ::rtl::OUString     m_aCurrentLanguage;
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index 8d4c04810..8d5b3e14f 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -71,25 +71,14 @@ namespace framework
             // XServiceInfo
             DECLARE_XSERVICEINFO
 
-            // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
-            
-            // XInitialization
-            virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
             // XStatusListener
             virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
-            // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-
             // XEventListener
             virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
 
         private:
+            virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
             void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
             String RetrieveLabelFromCommand( const String& aCmdURL ); 
             void addScriptItems( PopupMenu* pPopupMenu, USHORT startItemId );
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 7fba779a5..083268600 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -103,6 +103,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         MenuBarManager( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer,
             AddonMenu*			pAddonMenu,
             sal_Bool			bDelete,
             sal_Bool			bDeleteChildren );
@@ -111,6 +112,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         MenuBarManager( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer,
             AddonPopupMenu*	    pAddonMenu,
             sal_Bool			bDelete,
             sal_Bool			bDeleteChildren );
@@ -120,6 +122,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         MenuBarManager( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider,
             const rtl::OUString& aModuleIdentifier,
             Menu* pMenu,
@@ -192,11 +195,12 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         void RequestImages();
         void RetrieveImageManagers();
         static sal_Bool MustBeHidden( PopupMenu* pPopupMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer );
-
+        String RetrieveLabelFromCommand( const String& aCmdURL );
+        
     private:
-        String RetrieveLabelFromCommand( const String& aCmdURL ); 
-        void UpdateSpecialFileMenu( Menu* pMenu );
-        void UpdateSpecialWindowMenu( Menu* pMenu );
+        
+        
+        
         void Destroy();
 
         struct MenuItemHandler
@@ -235,6 +239,10 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         
         MenuItemHandler* GetMenuItemHandler( USHORT nItemId );
         sal_Bool         CreatePopupMenuController( MenuItemHandler* pMenuItemHandler );
+        void             AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,USHORT _nItemId);
+        USHORT           FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const;
+        void             Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp = false);
+        void             SetHdl();
 
         sal_Bool                                                                               m_bDisposed : 1,
                                                                                                m_bInitialized : 1,
@@ -244,9 +252,9 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
                                                                                                m_bIsBookmarkMenu : 1,
                                                                                                m_bWasHiContrast : 1,
                                                                                                m_bShowMenuImages : 1;
-        sal_Bool                                                                               m_bModuleIdentified : 1,
-                                                                                               m_bRetrieveImages : 1,
+        sal_Bool                                                                               m_bRetrieveImages : 1,
                                                                                                m_bAcceleratorCfg : 1;
+        sal_Bool                                                                               m_bModuleIdentified;
         ::rtl::OUString						                                                   m_aMenuItemCommand;
         ::rtl::OUString                                                                        m_aModuleIdentifier;
         Menu*								                                                   m_pVCLMenu;
@@ -262,6 +270,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >    m_xModuleAcceleratorManager;
         ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >    m_xGlobalAcceleratorManager;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >       mxServiceFactory;
+        ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >            m_xURLTransformer;
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >          m_xDeferedItemContainer;
         sal_Int16                                                                              m_nSymbolsStyle;
         Timer                                                                                  m_aAsyncSettingsTimer;
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 48596269a..f10c66afe 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -74,9 +74,6 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
         FWK_DECLARE_XINTERFACE
         FWK_DECLARE_XTYPEPROVIDER
         
-        // #110897#
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
-
         MenuBarManager* GetMenuBarManager() const { return static_cast< MenuBarManager* >( m_xMenuBarManager.get() ); }
         void            InvalidatePopupControllerCache() { m_bRefreshPopupControllerCache = sal_True; }
 
@@ -91,8 +88,6 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
 
         // XUIElementSettings
         virtual void SAL_CALL updateSettings(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
 
         // XElementAccess
         virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException);
@@ -104,11 +99,11 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
         virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
 
     private:
+        virtual void impl_fillNewData();
         void fillPopupControllerCache();
 
         sal_Bool                                                                                m_bRefreshPopupControllerCache : 1;
         com::sun::star::uno::Reference< com::sun::star::lang::XComponent >                      m_xMenuBarManager;
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
         PopupControllerCache                                                                    m_aPopupControllerCache;
 };
 
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 8f8c265b5..bdeb5bc87 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -51,7 +51,6 @@
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
 
 //_________________________________________________________________________________________________________________
@@ -83,11 +82,7 @@ namespace framework
             
             // XServiceInfo
             DECLARE_XSERVICEINFO
-
-            // XPopupMenuController
-            virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
-            
+    
             // XInitialization
             virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
@@ -95,10 +90,8 @@ namespace framework
             virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
             // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
 
             // XEventListener
             virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
@@ -106,6 +99,7 @@ namespace framework
             DECL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument* ); 
     
         private:
+            virtual void impl_setPopupMenu();
             struct AddInfo
             {
                 rtl::OUString aTargetFrame;
@@ -133,7 +127,6 @@ namespace framework
             rtl::OUString       m_aTargetFrame;
             rtl::OUString       m_aModuleIdentifier;
             rtl::OUString       m_aEmptyDocURL;
-            ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >                 m_xURLTransformer;
             ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager;
             ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager;
             ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager;
diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx
index 18f7f3473..671a9f9a8 100644
--- a/framework/inc/uielement/objectmenucontroller.hxx
+++ b/framework/inc/uielement/objectmenucontroller.hxx
@@ -69,26 +69,15 @@ namespace framework
             // XServiceInfo
             DECLARE_XSERVICEINFO
 
-            // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
-
-            // XInitialization
-            virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
             // XStatusListener
             virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
-            // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-
             // XEventListener
             virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
 
         private:
             void fillPopupMenu( const com::sun::star::uno::Sequence< com::sun::star::embed::VerbDescriptor >& rVerbCommandSeq, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
+            virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
 
             com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >  m_xObjectUpdateDispatch;
     };
diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx
index f9a32b394..8c646c9e6 100644
--- a/framework/inc/uielement/recentfilesmenucontroller.hxx
+++ b/framework/inc/uielement/recentfilesmenucontroller.hxx
@@ -79,23 +79,16 @@ namespace framework
 
             // XPopupMenuController
             virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
             
-            // XInitialization
-            virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
             // XStatusListener
             virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
             // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
 
             // XDispatchProvider
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException );
-            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException );
 
             // XDispatch
             virtual void SAL_CALL dispatch(	const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException );
@@ -108,6 +101,7 @@ namespace framework
             DECL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile* ); 
     
         private:
+            virtual void impl_setPopupMenu();
             struct RecentFile
             {
                 rtl::OUString aURL;
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index 96193f88e..d7b73e1f5 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -81,9 +81,6 @@ class SpinfieldToolbarController : public ISpinfieldListener,
         // XComponent
         virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
 
-        // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); 
-
         // ISpinfieldListener
         virtual void Up();
         virtual void Down();
@@ -99,6 +96,7 @@ class SpinfieldToolbarController : public ISpinfieldListener,
 
     protected:
         virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand );
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const;
 
     private:
         bool impl_getValue( const ::com::sun::star::uno::Any& rAny, sal_Int32& nValue, double& fValue, bool& bFloat );
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index 70772b547..bcda17c17 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -46,6 +46,7 @@
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/frame/XStatusbarController.hpp>
 #include <com/sun/star/frame/XUIControllerRegistration.hpp>
 #include <com/sun/star/ui/XUIConfiguration.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
@@ -120,14 +121,15 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener
         void CreateControllers();
         void UpdateControllers();
         void AddFrameActionListener();
+        void MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL ::com::sun::star::frame::XStatusbarController::*_pMethod )(const ::com::sun::star::awt::MouseEvent&));
 
     protected:
         typedef std::vector< ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > StatusBarControllerVector;
 
         sal_Bool                                                                                        m_bDisposed : 1,
-                                                                                                        m_bModuleIdentified : 1,
                                                                                                         m_bFrameActionRegistered : 1,
                                                                                                         m_bUpdateControllers : 1;
+        sal_Bool                                                                                        m_bModuleIdentified;
         StatusBar*                                                                                      m_pStatusBar;
         rtl::OUString                                                                                   m_aModuleIdentifier;
         rtl::OUString                                                                                   m_aResourceName;
diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx
index 3f07d8927..26663ace2 100644
--- a/framework/inc/uielement/statusbarwrapper.hxx
+++ b/framework/inc/uielement/statusbarwrapper.hxx
@@ -70,12 +70,9 @@ class StatusBarWrapper : public UIConfigElementWrapperBase
 
         // XUIElementSettings
         virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
 
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >           m_xStatusBarManager;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory;
 };
 
 } // namespace framework
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index 5101f7471..940fe8f1b 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -51,28 +51,20 @@
 //	other includes
 //_________________________________________________________________________________________________________________
 #include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 
 #include <vector>
 
 namespace framework
 {
 
-class StatusIndicatorInterfaceWrapper :   public ::com::sun::star::lang::XTypeProvider       ,
-                                          public ::com::sun::star::task::XStatusIndicator    ,
-                                          public ::cppu::OWeakObject
+class StatusIndicatorInterfaceWrapper :   public ::cppu::WeakImplHelper1< ::com::sun::star::task::XStatusIndicator>
 {
     public:
         StatusIndicatorInterfaceWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rStatusIndicatorImpl );
         virtual ~StatusIndicatorInterfaceWrapper();
 
         //---------------------------------------------------------------------------------------------------------
-        //	XInterface, XTypeProvider
-        //---------------------------------------------------------------------------------------------------------
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER		
-
-        //---------------------------------------------------------------------------------------------------------
         //	XStatusIndicator
         //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL start   ( const ::rtl::OUString& sText  ,
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 253eb42bd..218d7d1f1 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -70,11 +70,11 @@ class ToggleButtonToolbarController : public ComplexToolbarController
         virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
 
         // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
 
     protected:
         virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand );
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const;
 
     private:
         DECL_LINK( MenuSelectHdl, Menu *);
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index a6e991d4e..3bdb284cc 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -50,13 +50,16 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XUIControllerRegistration.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XSubToolbarController.hpp>
+#include <com/sun/star/frame/XToolbarController.hpp>
 #include <com/sun/star/ui/ItemStyle.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
 
 //_________________________________________________________________________________________________________________
 //	other includes
@@ -189,12 +192,16 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const; 
         sal_Bool IsPluginMode() const;
         Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast );
+        long HandleClick(void ( SAL_CALL ::com::sun::star::frame::XToolbarController::*_pClick )(  ));
+        void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter);
+        void impl_elementChanged(bool _bRemove,const ::com::sun::star::ui::ConfigurationEvent& Event );
 
     protected:
         typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap;
         typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector;
         typedef BaseHash< SubToolBarControllerVector >                                                              SubToolBarToSubToolBarControllerMap;
 
+        typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
         sal_Bool                                                                               m_bDisposed : 1,
                                                                                                m_bIsHiContrast : 1,
                                                                                                m_bSmallSymbols : 1,
@@ -210,6 +217,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         ToolBar*                                                                               m_pToolBar;
         rtl::OUString                                                                          m_aModuleIdentifier;
         rtl::OUString                                                                          m_aResourceName;
+        com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >              m_xURLTransformer;
         com::sun::star::uno::Reference< com::sun::star::frame::XFrame >                        m_xFrame;
         com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >               m_xUICommandLabels;
         ToolBarControllerMap                                                                   m_aControllerMap;
@@ -223,6 +231,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         SubToolBarToSubToolBarControllerMap                                                    m_aSubToolBarControllerMap;
         Timer				                                                                   m_aAsyncUpdateControllersTimer;
         sal_Int16                                                                              m_nSymbolsStyle;
+        MenuDescriptionMap m_aMenuMap;
 };
     
 }
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 653152a38..22196995c 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -52,7 +52,6 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 
 //_________________________________________________________________________________________________________________
@@ -86,10 +85,8 @@ namespace framework
             virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
 
             // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
 
             // XEventListener
             virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
@@ -112,7 +109,6 @@ namespace framework
             sal_Bool isContextSensitiveToolbarNonVisible();
 
             ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >                m_xPersistentWindowState;
-            ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >                 m_xURLTransformer;
             ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >                m_xUICommandDescription;
             ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >   m_xModuleCfgMgr;
             ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >   m_xDocCfgMgr;
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index 67f43915a..342a19ad9 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -79,13 +79,6 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener,
         
         // XUIElementSettings
         virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
-
-        // XUIConfigurationListener
-        virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
 
         // XUIFunctionListener
         virtual void SAL_CALL functionExecute( const ::rtl::OUString& aUIElementName, const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
@@ -99,9 +92,9 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener,
     //-------------------------------------------------------------------------------------------------------------
     protected:
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any&  aValue ) throw( com::sun::star::uno::Exception );
+        virtual void impl_fillNewData();
     
     private:
-        com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
         com::sun::star::uno::Reference< com::sun::star::lang::XComponent >              m_xToolBarManager;
         com::sun::star::uno::Reference< com::sun::star::awt::XWindow >                  m_xToolBarWindow;
 };
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index d9fdd8614..0e72cec56 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -59,28 +59,22 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-
-class ConfigurationAccess_UICommand;
-class UICommandDescription :  public com::sun::star::lang::XTypeProvider	,
-                              public com::sun::star::lang::XServiceInfo		,
-                              public com::sun::star::container::XNameAccess ,
-                              private ThreadHelpBase						,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                              public ::cppu::OWeakObject
+class UICommandDescription :  private ThreadHelpBase						,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                              public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo		,
+                                                              com::sun::star::container::XNameAccess >
 {
     public:
         UICommandDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~UICommandDescription();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
-
+private:
         // XNameAccess
         virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) 
             throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -97,6 +91,7 @@ class UICommandDescription :  public com::sun::star::lang::XTypeProvider	,
         virtual sal_Bool SAL_CALL hasElements() 
             throw (::com::sun::star::uno::RuntimeException);
 
+public:
         typedef ::std::hash_map< ::rtl::OUString,
                                  ::rtl::OUString,
                                  OUStringHashCode,
@@ -107,7 +102,10 @@ class UICommandDescription :  public com::sun::star::lang::XTypeProvider	,
                                  OUStringHashCode,
                                  ::std::equal_to< ::rtl::OUString > > UICommandsHashMap;
 
-    private:
+    protected:
+        UICommandDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool  );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const ::rtl::OUString& _sName);
+        void impl_fillElements(const sal_Char* _pName);
         sal_Bool                                                                            m_bConfigRead;
         rtl::OUString                                                                       m_aPrivateResourceURL;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx
index 7bcc93d0e..4953f2076 100644
--- a/framework/inc/uifactory/addonstoolboxfactory.hxx
+++ b/framework/inc/uifactory/addonstoolboxfactory.hxx
@@ -58,26 +58,22 @@
 //_________________________________________________________________________________________________________________
 //	includes of other projects
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
 
-class AddonsToolBoxFactory :  public com::sun::star::lang::XTypeProvider		        ,
-                              public com::sun::star::lang::XServiceInfo		            ,
-                              public ::com::sun::star::ui::XUIElementFactory      ,
-                              protected ThreadHelpBase							        ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                              public ::cppu::OWeakObject
+class AddonsToolBoxFactory :  protected ThreadHelpBase							        ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                              public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo		,
+                                                              com::sun::star::ui::XUIElementFactory >
 {
     public:
         AddonsToolBoxFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~AddonsToolBoxFactory();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
         DECLARE_XSERVICEINFO
-        FWK_DECLARE_XTYPEPROVIDER
 
         // XUIElementFactory
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
new file mode 100755
index 000000000..7c5dd1d34
--- /dev/null
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -0,0 +1,127 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: toolbarcontrollerfactory.hxx,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_UIFACTORY_FACTORYCONFIGURATION_HXX_
+#define __FRAMEWORK_UIFACTORY_FACTORYCONFIGURATION_HXX_
+#include <threadhelp/threadhelpbase.hxx>
+#include <macros/generic.hxx>
+#include <macros/xinterface.hxx>
+#include <macros/xtypeprovider.hxx>
+#include <macros/xserviceinfo.hxx>
+#include <stdtypes.h>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/container/XContainerListener.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/frame/XUIControllerRegistration.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+#include <cppuhelper/implbase1.hxx>
+#include <rtl/ustring.hxx>
+
+//_________________________________________________________________________________________________________________
+//	Namespace
+//_________________________________________________________________________________________________________________
+// 
+
+namespace framework
+{
+
+//*****************************************************************************************************************
+//	Configuration access class for PopupMenuControllerFactory implementation
+//*****************************************************************************************************************
+class ConfigurationAccess_ControllerFactory : // interfaces
+                                                    private ThreadHelpBase,
+                                                    public  ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener>
+{
+public:
+                    ConfigurationAccess_ControllerFactory( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager,const ::rtl::OUString& _sRoot,bool _bAskValue = false );
+    virtual       ~ConfigurationAccess_ControllerFactory();
+
+    void          readConfigurationData();
+    void          updateConfigurationData();
+
+    rtl::OUString getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const;
+    rtl::OUString getValueFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const;
+    void          addServiceToCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier );
+    void          removeServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule );
+    inline bool   hasValue() const { return m_bAskValue; }
+
+    // container.XContainerListener
+    virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+
+    // lang.XEventListener
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+
+private:
+    struct ControllerInfo
+    {
+        rtl::OUString m_aImplementationName;
+        rtl::OUString m_aValue;
+        ControllerInfo(const ::rtl::OUString& _aImplementationName,const ::rtl::OUString& _aValue) : m_aImplementationName(_aImplementationName),m_aValue(_aValue){}
+        ControllerInfo(){}
+    };
+    class MenuControllerMap : public std::hash_map< rtl::OUString,
+                                                         ControllerInfo,
+                                                         OUStringHashCode,
+                                                         ::std::equal_to< ::rtl::OUString > >
+    {
+        inline void free()
+        {
+            MenuControllerMap().swap( *this );
+        }
+    };
+
+    sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier,rtl::OUString& aValue ) const;
+
+    rtl::OUString                     m_aPropCommand;
+    rtl::OUString                     m_aPropModule;
+    rtl::OUString                     m_aPropController;
+    rtl::OUString                     m_aPropValue;
+    rtl::OUString                     m_sRoot;
+    MenuControllerMap                 m_aMenuControllerMap;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xConfigProvider;
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >        m_xConfigAccess;
+    sal_Bool                          m_bConfigAccessInitialized;
+    bool                              m_bAskValue;
+};
+
+} // namespace framework
+#endif // __FRAMEWORK_UIFACTORY_FACTORYCONFIGURATION_HXX_
diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index db0177e4a..2895bbcab 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -56,30 +56,36 @@
 //	includes of other projects
 //_________________________________________________________________________________________________________________
 #include <toolkit/awt/vclxmenu.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-    class MenuBarFactory :  public com::sun::star::lang::XTypeProvider		            ,
-                            public com::sun::star::lang::XServiceInfo		            ,
-                            public ::com::sun::star::ui::XUIElementFactory        ,
-                            protected ThreadHelpBase							        ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                            public ::cppu::OWeakObject
+    class MenuBarFactory :  protected ThreadHelpBase							        ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                            public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo,
+                                                            ::com::sun::star::ui::XUIElementFactory>
     {
         public:
             MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~MenuBarFactory();
             
             //  XInterface, XTypeProvider, XServiceInfo
-            FWK_DECLARE_XINTERFACE
             DECLARE_XSERVICEINFO
-            FWK_DECLARE_XTYPEPROVIDER
 
             // XUIElementFactory
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
 
-        private:
+            static void CreateUIElement(const ::rtl::OUString& ResourceURL
+                        , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args
+                        ,const char* _pExtraMode
+                        ,const char* _pAsciiName
+                        ,const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& _xMenuBar
+                        ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager >& _xModuleManager
+                        ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceManager);
+
+        protected:
+            MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool );
+
             ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > m_xModuleManager;
     };
diff --git a/framework/inc/uifactory/popupmenucontrollerfactory.hxx b/framework/inc/uifactory/popupmenucontrollerfactory.hxx
index 98e707e05..3d9a47641 100644
--- a/framework/inc/uifactory/popupmenucontrollerfactory.hxx
+++ b/framework/inc/uifactory/popupmenucontrollerfactory.hxx
@@ -40,61 +40,29 @@
 //_________________________________________________________________________________________________________________
 //	my own includes
 //_________________________________________________________________________________________________________________
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/generic.hxx>
-#include <macros/xinterface.hxx>
-#include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
+#include <uifactory/toolbarcontrollerfactory.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
 //_________________________________________________________________________________________________________________
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/frame/XUIControllerRegistration.hpp>
 
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
-#include <rtl/ustring.hxx>
 
 namespace framework
 {
 
-class ConfigurationAccess_PopupMenuControllerFactory;
-class PopupMenuControllerFactory :  public com::sun::star::lang::XTypeProvider		                    ,
-                                    public com::sun::star::lang::XServiceInfo		                    ,
-                                    public com::sun::star::lang::XMultiComponentFactory                 ,
-                                    public ::com::sun::star::frame::XUIControllerRegistration     ,
-                                    private ThreadHelpBase							                    ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                                    public ::cppu::OWeakObject
+class ConfigurationAccess_ControllerFactory;
+class PopupMenuControllerFactory :  public ToolbarControllerFactory
 {
     public:
         PopupMenuControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-        virtual ~PopupMenuControllerFactory();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
-
-        // XMultiComponentFactory
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::rtl::OUString& aServiceSpecifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException);
-
-        // XUIControllerRegistration
-        virtual sal_Bool SAL_CALL hasController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL registerController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName, const ::rtl::OUString& aControllerImplementationName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL deregisterController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException);
-
-    private:
-        sal_Bool                                                                         m_bConfigRead;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-        ConfigurationAccess_PopupMenuControllerFactory*                                  m_pConfigAccess;
 };
 
 } // namespace framework
diff --git a/framework/inc/uifactory/statusbarcontrollerfactory.hxx b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
index f3149d242..c797771a6 100644
--- a/framework/inc/uifactory/statusbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
@@ -34,62 +34,30 @@
 //_________________________________________________________________________________________________________________
 //	my own includes
 //_________________________________________________________________________________________________________________
-
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/generic.hxx>
-#include <macros/xinterface.hxx>
-#include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
+#include <uifactory/toolbarcontrollerfactory.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
 //_________________________________________________________________________________________________________________
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/frame/XUIControllerRegistration.hpp>
 
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
-#include <rtl/ustring.hxx>
+
 
 namespace framework
 {
 
-class ConfigurationAccess_StatusbarControllerFactory;
-class StatusbarControllerFactory :  public com::sun::star::lang::XTypeProvider		                ,
-                                    public com::sun::star::lang::XServiceInfo		                ,
-                                    public com::sun::star::lang::XMultiComponentFactory             ,
-                                    public ::com::sun::star::frame::XUIControllerRegistration ,
-                                    private ThreadHelpBase							                ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                                    public ::cppu::OWeakObject
+class ConfigurationAccess_ControllerFactory;
+class StatusbarControllerFactory :  public ToolbarControllerFactory
 {
     public:
         StatusbarControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-        virtual ~StatusbarControllerFactory();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
-
-        // XMultiComponentFactory
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::rtl::OUString& aServiceSpecifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException);
-
-        // XUIControllerRegistration
-        virtual sal_Bool SAL_CALL hasController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL registerController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName, const ::rtl::OUString& aControllerImplementationName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL deregisterController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException);
-
-    private:
-        sal_Bool                                                                         m_bConfigRead;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-        ConfigurationAccess_StatusbarControllerFactory*                                  m_pConfigAccess;
 };
 
 } // namespace framework
diff --git a/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx
index d168801cf..b586e10a2 100644
--- a/framework/inc/uifactory/statusbarfactory.hxx
+++ b/framework/inc/uifactory/statusbarfactory.hxx
@@ -36,53 +36,33 @@
 //_________________________________________________________________________________________________________________
 
 #include <stdtypes.h>
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/generic.hxx>
-#include <macros/xinterface.hxx>
-#include <macros/xtypeprovider.hxx>
+
 #include <macros/xserviceinfo.hxx>
 #include <services.h>
+#include <uifactory/menubarfactory.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
 //_________________________________________________________________________________________________________________
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/ui/XUIElementFactory.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
-
 //_________________________________________________________________________________________________________________
 //	includes of other projects
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
 
-class StatusBarFactory :  public com::sun::star::lang::XTypeProvider		        ,
-                          public com::sun::star::lang::XServiceInfo		            ,
-                          public ::com::sun::star::ui::XUIElementFactory      ,
-                          protected ThreadHelpBase							        ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                          public ::cppu::OWeakObject
+class StatusBarFactory :  public MenuBarFactory
 {
     public:
         StatusBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-        virtual ~StatusBarFactory();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
         DECLARE_XSERVICEINFO
-        FWK_DECLARE_XTYPEPROVIDER
 
         // XUIElementFactory
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
 
-    private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > m_xModuleManager;
 };
 
 }
diff --git a/framework/inc/uifactory/toolbarcontrollerfactory.hxx b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
index 32830c67c..f36a6a59f 100644
--- a/framework/inc/uifactory/toolbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
@@ -53,27 +53,23 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
 
-class ConfigurationAccess_ToolbarControllerFactory;
-class ToolbarControllerFactory :  public com::sun::star::lang::XTypeProvider		                ,
-                                  public com::sun::star::lang::XServiceInfo		                    ,
-                                  public com::sun::star::lang::XMultiComponentFactory               ,
-                                  public ::com::sun::star::frame::XUIControllerRegistration   ,
-                                  private ThreadHelpBase							                ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                                  public ::cppu::OWeakObject
+class ConfigurationAccess_ControllerFactory;
+class ToolbarControllerFactory :  protected ThreadHelpBase							                ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                                  public ::cppu::WeakImplHelper3<   com::sun::star::lang::XServiceInfo,
+                                                                    com::sun::star::lang::XMultiComponentFactory,
+                                                                    com::sun::star::frame::XUIControllerRegistration>
 {
     public:
         ToolbarControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~ToolbarControllerFactory();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XMultiComponentFactory
@@ -86,10 +82,11 @@ class ToolbarControllerFactory :  public com::sun::star::lang::XTypeProvider
         virtual void SAL_CALL registerController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName, const ::rtl::OUString& aControllerImplementationName ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL deregisterController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException);
 
-    private:
+    protected:
+        ToolbarControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool  );
         sal_Bool                                                                         m_bConfigRead;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-        ConfigurationAccess_ToolbarControllerFactory*                                    m_pConfigAccess;
+        ConfigurationAccess_ControllerFactory*                                           m_pConfigAccess;
 };
 
 } // namespace framework
diff --git a/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx
index a917b6535..59f9f984f 100644
--- a/framework/inc/uifactory/toolboxfactory.hxx
+++ b/framework/inc/uifactory/toolboxfactory.hxx
@@ -36,23 +36,13 @@
 //_________________________________________________________________________________________________________________
 
 #include <stdtypes.h>
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/generic.hxx>
-#include <macros/xinterface.hxx>
-#include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <services.h>
+#include <uifactory/menubarfactory.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
 //_________________________________________________________________________________________________________________
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/ui/XUIElementFactory.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
-
 //_________________________________________________________________________________________________________________
 //	includes of other projects
 //_________________________________________________________________________________________________________________
@@ -62,27 +52,16 @@
 namespace framework
 {
 
-class ToolBoxFactory :  public com::sun::star::lang::XTypeProvider		            ,
-                        public com::sun::star::lang::XServiceInfo		            ,
-                        public ::com::sun::star::ui::XUIElementFactory        ,
-                        protected ThreadHelpBase							        ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                        public ::cppu::OWeakObject
+class ToolBoxFactory :  public MenuBarFactory
 {
     public:
         ToolBoxFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-        virtual ~ToolBoxFactory();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
         DECLARE_XSERVICEINFO
-        FWK_DECLARE_XTYPEPROVIDER
 
         // XUIElementFactory
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-
-    private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > m_xModuleManager;
 };
 
 }
diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx
index d4d151967..046062c38 100644
--- a/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/framework/inc/uifactory/uielementfactorymanager.hxx
@@ -51,35 +51,85 @@
 //	interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/ui/XUIElementFactory.hpp>
 #include <com/sun/star/ui/XUIElementFactoryRegistration.hpp>
+#include <com/sun/star/container/XContainerListener.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
 #include "com/sun/star/frame/XModuleManager.hpp"
 
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
 
-class ConfigurationAccess_UIElementFactoryManager;
-class UIElementFactoryManager :  public com::sun::star::lang::XTypeProvider		                    ,
-                                 public com::sun::star::lang::XServiceInfo		                    ,
-                                 public ::com::sun::star::ui::XUIElementFactory               ,
-                                 public ::com::sun::star::ui::XUIElementFactoryRegistration   ,
-                                 private ThreadHelpBase							                    ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                                 public ::cppu::OWeakObject
+    class ConfigurationAccess_FactoryManager : // interfaces
+                                                    // baseclasses
+                                                    // Order is neccessary for right initialization!
+                                                    private ThreadHelpBase                           ,
+                                                    public  ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener>
+{
+    public:
+                      ConfigurationAccess_FactoryManager( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager,const ::rtl::OUString& _sRoot );
+        virtual       ~ConfigurationAccess_FactoryManager();
+
+        void          readConfigurationData();
+
+        rtl::OUString                           getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) const;
+        void                                    addFactorySpecifierToTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule, const rtl::OUString& aServiceSpecifier );
+        void                                    removeFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule );
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >   getFactoriesDescription() const;
+
+        // container.XContainerListener
+    virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+
+    // lang.XEventListener
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+ 
+    private:
+        class FactoryManagerMap : public std::hash_map< rtl::OUString,
+                                                     rtl::OUString,
+                                                     OUStringHashCode,
+                                                     ::std::equal_to< ::rtl::OUString > >
+        {
+            inline void free()
+            {
+                FactoryManagerMap().swap( *this );
+            }
+        };
+    
+        sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& rElement, rtl::OUString& rType, rtl::OUString& rName, rtl::OUString& rModule, rtl::OUString& rServiceSpecifier ) const;
+
+        rtl::OUString                     m_aPropType;
+        rtl::OUString                     m_aPropName;
+        rtl::OUString                     m_aPropModule;
+        rtl::OUString                     m_aPropFactory;
+        ::rtl::OUString                   m_sRoot;
+        FactoryManagerMap                 m_aFactoryManagerMap;
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider;
+        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >     m_xConfigAccess;
+        sal_Bool                          m_bConfigAccessInitialized;
+        bool							  m_bConfigDirty;
+};
+
+
+class UIElementFactoryManager :  private ThreadHelpBase							                    ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                                 public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,
+                                                                 ::com::sun::star::ui::XUIElementFactory,
+                                                                 ::com::sun::star::ui::XUIElementFactoryRegistration>
 {
     public:
         UIElementFactoryManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~UIElementFactoryManager();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XUIElementFactory
@@ -92,12 +142,11 @@ class UIElementFactoryManager :  public com::sun::star::lang::XTypeProvider
         virtual void SAL_CALL deregisterFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleIdentifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
         
     private:
-        void RetrieveTypeNameFromResourceURL( const ::rtl::OUString& aResourceURL, rtl::OUString& aType, rtl::OUString& aName );
 
         sal_Bool                                                                            m_bConfigRead;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > m_xModuleManager;
-        ConfigurationAccess_UIElementFactoryManager*                                        m_pConfigAccess;
+        ConfigurationAccess_FactoryManager*                                        m_pConfigAccess;
 };
 
 } // namespace framework
diff --git a/framework/inc/uifactory/windowcontentfactorymanager.hxx b/framework/inc/uifactory/windowcontentfactorymanager.hxx
index 69dd2d3e8..225e03e5f 100644
--- a/framework/inc/uifactory/windowcontentfactorymanager.hxx
+++ b/framework/inc/uifactory/windowcontentfactorymanager.hxx
@@ -51,46 +51,41 @@
 //	interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include "com/sun/star/frame/XModuleManager.hpp"
 
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
 
-class ConfigurationAccess_WindowContentFactoryManager;
-class WindowContentFactoryManager : public com::sun::star::lang::XTypeProvider		              ,
-                                    public com::sun::star::lang::XServiceInfo		              ,
-                                    public com::sun::star::lang::XSingleComponentFactory		  ,
-                                    private ThreadHelpBase							              ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                                    public ::cppu::OWeakObject
+class ConfigurationAccess_FactoryManager;
+class WindowContentFactoryManager : private ThreadHelpBase							              ,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                                    public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo		              ,
+                                                             com::sun::star::lang::XSingleComponentFactory>
 {
     public:
         WindowContentFactoryManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~WindowContentFactoryManager();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XSingleComponentFactory
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
     
-    private:
-        void RetrieveTypeNameFromResourceURL( const ::rtl::OUString& aResourceURL, rtl::OUString& aType, rtl::OUString& aName );
+        static void RetrieveTypeNameFromResourceURL( const ::rtl::OUString& aResourceURL, rtl::OUString& aType, rtl::OUString& aName );
+    private:        
 
         sal_Bool                                                                         m_bConfigRead;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager >      m_xModuleManager;
-        ConfigurationAccess_WindowContentFactoryManager*                                 m_pConfigAccess;
+        ConfigurationAccess_FactoryManager*                                 m_pConfigAccess;
 };
 
 } // namespace framework
diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx
index c34411c8c..44f87697b 100644
--- a/framework/inc/xml/eventsdocumenthandler.hxx
+++ b/framework/inc/xml/eventsdocumenthandler.hxx
@@ -48,7 +48,7 @@
 //_________________________________________________________________________________________________________________
 #include <threadhelp/threadhelpbase.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 
 #include <hash_map>
 #include <stdtypes.h>
@@ -62,9 +62,8 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadEventsDocumentHandler :	public ::com::sun::star::xml::sax::XDocumentHandler,
-                                    private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
-                                    public ::cppu::OWeakObject
+class OReadEventsDocumentHandler :	private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
+                                    public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
         enum Events_XML_Entry
@@ -88,15 +87,7 @@ class OReadEventsDocumentHandler :	public ::com::sun::star::xml::sax::XDocumentH
         };
         
         OReadEventsDocumentHandler( EventsConfig& aItems );
-        virtual ~OReadEventsDocumentHandler();
-
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
+        
 
         // XDocumentHandler
         virtual void SAL_CALL startDocument(void)
@@ -135,6 +126,9 @@ class OReadEventsDocumentHandler :	public ::com::sun::star::xml::sax::XDocumentH
         throw(	::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
 
+    protected:
+        virtual ~OReadEventsDocumentHandler();
+
     private:
         ::rtl::OUString getErrorLineString();
 
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 7bde7db62..52aa6d8e3 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -45,7 +45,7 @@
 #include <xml/imagesconfiguration.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 
 #include <hash_map>
 #include <stdtypes.h>
@@ -59,9 +59,8 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadImagesDocumentHandler : public ::com::sun::star::xml::sax::XDocumentHandler,
-                                   private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
-                                   public ::cppu::OWeakObject
+class OReadImagesDocumentHandler : private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
+                                   public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
         enum Image_XML_Entry
@@ -92,14 +91,6 @@ class OReadImagesDocumentHandler : public ::com::sun::star::xml::sax::XDocumentH
         OReadImagesDocumentHandler( ImageListsDescriptor& aItems );
         virtual ~OReadImagesDocumentHandler();
 
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
         // XDocumentHandler
         virtual void SAL_CALL startDocument(void)
         throw (	::com::sun::star::xml::sax::SAXException,
diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/xml/menuconfiguration.hxx
index cff0e8d0e..f24994bd4 100644
--- a/framework/inc/xml/menuconfiguration.hxx
+++ b/framework/inc/xml/menuconfiguration.hxx
@@ -85,6 +85,7 @@ class MenuConfiguration
             ::rtl::OUString aTargetFrame;
             ::rtl::OUString	aImageId;
             ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider;
+                        sal_Int16 nStyle;
         };
                         
         MenuConfiguration(
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 63e109d2d..b6148ca82 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -42,13 +42,14 @@
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
 #include <threadhelp/threadhelpbase.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 //_________________________________________________________________________________________________________________
@@ -57,22 +58,13 @@
 
 namespace framework{
 
-class ReadMenuDocumentHandlerBase : public ::com::sun::star::xml::sax::XDocumentHandler,
-                                    public ThreadHelpBase,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                                    public ::cppu::OWeakObject
+class ReadMenuDocumentHandlerBase : public ThreadHelpBase,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                                    public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
         ReadMenuDocumentHandlerBase();
         virtual ~ReadMenuDocumentHandlerBase();
 
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
         // XDocumentHandler
         virtual void SAL_CALL startDocument(void)
         throw (	::com::sun::star::xml::sax::SAXException,
@@ -295,6 +287,7 @@ class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
         sal_Bool			m_bMenuMode;
         com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuContainer;
         com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory;
+        com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >     m_xComponentContext;
         NextElementClose	m_nNextElementExpected;
 }; // OReadMenuPopupHandler
 
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index 4168d5228..1dc04e46f 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -36,7 +36,7 @@
 #include <xml/xmlnamespaces.hxx>
 #include <rtl/ustring.hxx>
 #include <vcl/menu.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 
 #include <stack>
 
@@ -47,22 +47,13 @@
 namespace framework
 {
 
-class SaxNamespaceFilter : public ::com::sun::star::xml::sax::XDocumentHandler,
-                           public ThreadHelpBase,	// Struct for right initalization of mutex member! Must be first of baseclasses.
-                           public ::cppu::OWeakObject
+class SaxNamespaceFilter : public ThreadHelpBase,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+                           public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
         SaxNamespaceFilter( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rSax1DocumentHandler );
         virtual ~SaxNamespaceFilter();
 
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( 
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
         // XDocumentHandler
         virtual void SAL_CALL startDocument(void)
         throw (	::com::sun::star::xml::sax::SAXException, 
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 9e1e2637a..c27c4e6c4 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -48,7 +48,7 @@
 //_________________________________________________________________________________________________________________
 #include <threadhelp/threadhelpbase.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 
 #include <hash_map>
 #include <stdtypes.h>
@@ -62,9 +62,8 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadStatusBarDocumentHandler :	public ::com::sun::star::xml::sax::XDocumentHandler,
-                                        private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
-                                        public ::cppu::OWeakObject
+class OReadStatusBarDocumentHandler :	private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
+                                        public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
         enum StatusBar_XML_Entry
@@ -92,14 +91,6 @@ class OReadStatusBarDocumentHandler :	public ::com::sun::star::xml::sax::XDocume
         OReadStatusBarDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& aStatusBarItems );
         virtual ~OReadStatusBarDocumentHandler();
 
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
         // XDocumentHandler
         virtual void SAL_CALL startDocument(void)
         throw (	::com::sun::star::xml::sax::SAXException,
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index abd14938b..e90313542 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -44,7 +44,7 @@
 //_________________________________________________________________________________________________________________
 #include <threadhelp/threadhelpbase.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -56,9 +56,8 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadToolBoxDocumentHandler : public ::com::sun::star::xml::sax::XDocumentHandler,
-                                    private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
-                                    public ::cppu::OWeakObject
+class OReadToolBoxDocumentHandler : private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
+                                    public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
         enum ToolBox_XML_Entry
@@ -91,14 +90,6 @@ class OReadToolBoxDocumentHandler : public ::com::sun::star::xml::sax::XDocument
         OReadToolBoxDocumentHandler( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rItemContainer );
         virtual ~OReadToolBoxDocumentHandler();
 
-        // XInterface
-        virtual void SAL_CALL acquire() throw()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-            const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
         // XDocumentHandler
         virtual void SAL_CALL startDocument(void)
         throw (	::com::sun::star::xml::sax::SAXException,
diff --git a/framework/prj/d.lst b/framework/prj/d.lst
index bf7a67d09..a8640138b 100644
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -30,15 +30,14 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
 ..\inc\helper\imageproducer.hxx %_DEST%\inc%_EXT%\framework\imageproducer.hxx
 ..\inc\helper\acceleratorinfo.hxx %_DEST%\inc%_EXT%\framework\acceleratorinfo.hxx
 ..\inc\helper\actiontriggerhelper.hxx %_DEST%\inc%_EXT%\framework\actiontriggerhelper.hxx
-..\inc\classes\menuconfiguration.hxx %_DEST%\inc%_EXT%\framework\menuconfiguration.hxx
+..\inc\xml\menuconfiguration.hxx %_DEST%\inc%_EXT%\framework\menuconfiguration.hxx
 ..\inc\classes\bmkmenu.hxx %_DEST%\inc%_EXT%\framework\bmkmenu.hxx
-..\inc\classes\toolboxconfiguration.hxx %_DEST%\inc%_EXT%\framework\toolboxconfiguration.hxx
-..\inc\classes\statusbarconfiguration.hxx %_DEST%\inc%_EXT%\framework\statusbarconfiguration.hxx
-..\inc\classes\eventsconfiguration.hxx %_DEST%\inc%_EXT%\framework\eventsconfiguration.hxx
-..\inc\classes\imagesconfiguration.hxx %_DEST%\inc%_EXT%\framework\imagesconfiguration.hxx
+..\inc\xml\toolboxconfiguration.hxx %_DEST%\inc%_EXT%\framework\toolboxconfiguration.hxx
+..\inc\xml\statusbarconfiguration.hxx %_DEST%\inc%_EXT%\framework\statusbarconfiguration.hxx
+..\inc\xml\eventsconfiguration.hxx %_DEST%\inc%_EXT%\framework\eventsconfiguration.hxx
+..\inc\xml\imagesconfiguration.hxx %_DEST%\inc%_EXT%\framework\imagesconfiguration.hxx
 ..\inc\classes\addonsoptions.hxx %_DEST%\inc%_EXT%\framework\addonsoptions.hxx
 ..\inc\dispatch\interaction.hxx %_DEST%\inc%_EXT%\framework\interaction.hxx
-..\inc\classes\addonsoptions.hxx %_DEST%\inc%_EXT%\framework\addonsoptions.hxx
 ..\inc\classes\addonmenu.hxx %_DEST%\inc%_EXT%\framework\addonmenu.hxx
 ..\inc\classes\sfxhelperfunctions.hxx %_DEST%\inc%_EXT%\framework\sfxhelperfunctions.hxx
 ..\inc\helper\configimporter.hxx %_DEST%\inc%_EXT%\framework\configimporter.hxx
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx
index c43859215..db62188f8 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -127,10 +127,12 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const
     
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
+    lKeys.reserve(m_lKey2Commands.size());
     
     TKey2Commands::const_iterator pIt;
+    TKey2Commands::const_iterator pEnd = m_lKey2Commands.end();
     for (  pIt  = m_lKey2Commands.begin();
-           pIt != m_lKey2Commands.end()  ;
+           pIt != pEnd  ;
          ++pIt                           )
     {
         lKeys.push_back(pIt->first);
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 20488d814..37de07622 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -61,10 +61,6 @@
 // other includes
 #include <vcl/svapp.hxx>
 
-#ifndef __FRAMEWORK_ACCELERATORS_KEYMAPPING_HXX_
-#include <accelerators/keymapping.hxx>
-#endif
-
 #ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_
 #include <com/sun/star/container/XNamed.hpp>
 #endif
@@ -115,6 +111,23 @@ namespace framework
     namespace fpc = ::framework::pattern::configuration;
 #endif
 
+    ::rtl::OUString lcl_getKeyString(salhelper::SingletonRef<framework::KeyMapping>& _rKeyMapping, const css::awt::KeyEvent& aKeyEvent)
+    {
+        const sal_Int32 nBeginIndex = 4; // "KEY_" is the prefix of a identifier...
+        ::rtl::OUStringBuffer sKeyBuffer((_rKeyMapping->mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex));
+        
+        if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT )
+            sKeyBuffer.appendAscii("_SHIFT");
+        if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  )
+            sKeyBuffer.appendAscii("_MOD1");
+        if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  )
+            sKeyBuffer.appendAscii("_MOD2");
+        if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  )
+            sKeyBuffer.appendAscii("_MOD3");
+
+        return sKeyBuffer.makeStringAndClear();
+    }
+
 //-----------------------------------------------    
 //	XInterface, XTypeProvider
 DEFINE_XINTERFACE_6(XMLBasedAcceleratorConfiguration                       ,
@@ -285,7 +298,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
             continue;
         
         AcceleratorCache::TKeyList lKeys = rCache.getKeysByCommand(rCommand);
-        if (lKeys.size()<1)
+        if ( lKeys.empty() )
             continue;
         
         css::uno::Any& rAny = lPreferredOnes[i];
@@ -694,6 +707,7 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un
                                 , m_pPrimaryWriteCache(0                        )
                                 , m_pSecondaryWriteCache(0                      )
 {
+    static const ::rtl::OUString CFG_ENTRY_ACCELERATORS(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Accelerators"));
     m_xCfg = css::uno::Reference< css::container::XNameAccess > ( 
              ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_ACCELERATORS, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), 
              css::uno::UNO_QUERY );
@@ -714,8 +728,10 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
     AcceleratorCache::TKeyList lKeys  = impl_getCFG(sal_True).getAllKeys(); //get keys from PrimaryKeys set
 
     AcceleratorCache::TKeyList lSecondaryKeys = impl_getCFG(sal_False).getAllKeys(); //get keys from SecondaryKeys set
+    lKeys.reserve(lKeys.size()+lSecondaryKeys.size());
     AcceleratorCache::TKeyList::const_iterator pIt;
-    for ( pIt  = lSecondaryKeys.begin(); pIt != lSecondaryKeys.end(); ++pIt )
+    AcceleratorCache::TKeyList::const_iterator pEnd = lSecondaryKeys.end();
+    for ( pIt  = lSecondaryKeys.begin(); pIt != pEnd; ++pIt )
         lKeys.push_back(*pIt);
 
     return lKeys.getAsConstList();
@@ -753,7 +769,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
                                                     throw(css::lang::IllegalArgumentException,
                                                     css::uno::RuntimeException         )
 {
-    RTL_LOGFILE_PRODUCT_CONTEXT( aLog1, " start XCUBasedAcceleratorConfiguration::setKeyEvent" );
+    RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "XCUBasedAcceleratorConfiguration::setKeyEvent" );
 
     if (
         (aKeyEvent.KeyCode   == 0) &&
@@ -832,8 +848,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
 
     aWriteLock.unlock();
     // <- SAFE ----------------------------------
-
-    RTL_LOGFILE_PRODUCT_CONTEXT( aLog2, " end XCUBasedAcceleratorConfiguration::setKeyEvent" );
 }
 
 //-----------------------------------------------    
@@ -959,7 +973,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
             continue;
 
         AcceleratorCache::TKeyList lKeys = rCache.getKeysByCommand(rCommand);
-        if (lKeys.size()<1)
+        if ( lKeys.empty() )
             continue;
 
         AcceleratorCache::TKeyList::const_iterator pPreferredKey = lcl_getPreferredKey(lKeys);
@@ -1013,7 +1027,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
     throw(css::uno::Exception       ,
         css::uno::RuntimeException)
 {
-    RTL_LOGFILE_PRODUCT_CONTEXT( aLog1, " start XCUBasedAcceleratorConfiguration::reload()" );
+    RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "XCUBasedAcceleratorConfiguration::reload()" );
 
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
@@ -1047,8 +1061,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
 
     aWriteLock.unlock();  
     // <- SAFE ----------------------------------
-
-    RTL_LOGFILE_PRODUCT_CONTEXT( aLog2, " end XCUBasedAcceleratorConfiguration::reload()" );
 }
 
 //-----------------------------------------------    
@@ -1056,7 +1068,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store()
     throw(css::uno::Exception       ,
           css::uno::RuntimeException)
 {
-    RTL_LOGFILE_PRODUCT_CONTEXT( aLog1, " start XCUBasedAcceleratorConfiguration::store()" );
+    RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "XCUBasedAcceleratorConfiguration::store()" );
 
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
@@ -1078,17 +1090,73 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store()
 
     aReadLock.unlock();
     // <- SAFE ----------------------------------
-
-    RTL_LOGFILE_PRODUCT_CONTEXT( aLog2, " end XCUBasedAcceleratorConfiguration::store()" );
 }
 
 //-----------------------------------------------    
-void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/)
+void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
     throw(css::uno::Exception       ,
       css::uno::RuntimeException)
 {
-    // todo implement me
     // use m_aCache + old AcceleratorXMLWriter to store data directly on storage given as parameter ...  
+    if (!xStorage.is())
+        return;
+
+    long nOpenModes = css::embed::ElementModes::READWRITE;
+    css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString::createFromAscii("accelerator"), nOpenModes);
+    if (!xAcceleratorTypeStorage.is())
+        return;
+
+    css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString::createFromAscii("current"), nOpenModes);
+    css::uno::Reference< css::io::XOutputStream > xOut;
+    if (xStream.is())
+        xOut = xStream->getOutputStream();
+    if (!xOut.is())
+        throw css::io::IOException(
+        ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."),
+        static_cast< ::cppu::OWeakObject* >(this));
+
+    // the original m_aCache has been split into primay cache and secondary cache...
+    // we should merge them before storing to storage
+    // SAFE -> ----------------------------------
+    WriteGuard aWriteLock(m_aLock);
+
+    AcceleratorCache aCache;
+    if (m_pPrimaryWriteCache != 0)
+        aCache.takeOver(*m_pPrimaryWriteCache);
+    else
+        aCache.takeOver(m_aPrimaryReadCache);
+
+    AcceleratorCache::TKeyList lKeys;
+    AcceleratorCache::TKeyList::const_iterator pIt;
+    if (m_pSecondaryWriteCache!=0)
+    {
+        lKeys = m_pSecondaryWriteCache->getAllKeys();
+        for ( pIt=lKeys.begin(); pIt!=lKeys.end(); ++pIt )
+            aCache.setKeyCommandPair(*pIt, m_pSecondaryWriteCache->getCommandByKey(*pIt));
+    }
+    else
+    {
+        lKeys = m_aSecondaryReadCache.getAllKeys();
+        for ( pIt=lKeys.begin(); pIt!=lKeys.end(); ++pIt )
+            aCache.setKeyCommandPair(*pIt, m_aSecondaryReadCache.getCommandByKey(*pIt));
+    }
+
+    aWriteLock.unlock();
+    // <- SAFE ----------------------------------
+
+    css::uno::Reference< css::io::XTruncate > xClearable(xOut, css::uno::UNO_QUERY_THROW);
+    xClearable->truncate();
+    css::uno::Reference< css::io::XSeekable > xSeek(xOut, css::uno::UNO_QUERY);
+    if (xSeek.is())
+        xSeek->seek(0);
+
+    css::uno::Reference< css::xml::sax::XDocumentHandler > xWriter    (m_xSMGR->createInstance(SERVICENAME_SAXWRITER), css::uno::UNO_QUERY_THROW);
+    css::uno::Reference< css::io::XActiveDataSource>       xDataSource(xWriter                                     , css::uno::UNO_QUERY_THROW);
+    xDataSource->setOutputStream(xOut);
+
+    // write into the stream
+    AcceleratorConfigurationWriter aWriter(aCache, xWriter);
+    aWriter.flush();
 }
 
 //-----------------------------------------------    
@@ -1174,7 +1242,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::u
 void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent)
     throw(css::uno::RuntimeException)
 {
-    RTL_LOGFILE_PRODUCT_CONTEXT( aLog1, " start XCUBasedAcceleratorConfiguration::changesOccurred()" );
+    RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "XCUBasedAcceleratorConfiguration::changesOccurred()" );
 
     css::uno::Reference< css::container::XHierarchicalNameAccess > xHAccess;
     aEvent.Base >>= xHAccess;
@@ -1222,8 +1290,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
                 reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey);
         }
     }
-
-    RTL_LOGFILE_PRODUCT_CONTEXT( aLog2, " end XCUBasedAcceleratorConfiguration::changesOccurred()" );
 }
 
 //----------------------------------------------- 
@@ -1246,7 +1312,6 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
         xModules->getByName(m_sModuleCFG) >>= xAccess;
     }
 
-    static KeyMapping aKeyMapping;
     const ::rtl::OUString sIsoLang       = impl_ts_getLocale().toISO();
     const ::rtl::OUString sDefaultLocale = ::rtl::OUString::createFromAscii("en-US");
 
@@ -1298,7 +1363,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
             sal_Int32 nIndex = 0;
             ::rtl::OUString sKeyCommand = sKey.getToken(0, '_', nIndex);
             ::rtl::OUString sPrefix = ::rtl::OUString::createFromAscii("KEY_");
-            aKeyEvent.KeyCode = aKeyMapping.mapIdentifierToCode(sPrefix + sKeyCommand);
+            aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sPrefix + sKeyCommand);
 
             css::uno::Sequence< ::rtl::OUString > sToken(4);
             const sal_Int32 nToken = 4;
@@ -1464,18 +1529,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
         xModules->getByName(m_sModuleCFG) >>= xContainer;
     }
 
-    KeyMapping aKeyMapping;
-    const sal_Int32 nBeginIndex = 4; // "KEY_" is the prefix of a identifier...
-    ::rtl::OUString sKey = (aKeyMapping.mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex);
-    
-    if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT )
-        sKey += ::rtl::OUString::createFromAscii("_SHIFT");
-    if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  )
-        sKey += ::rtl::OUString::createFromAscii("_MOD1");
-    if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  )
-        sKey += ::rtl::OUString::createFromAscii("_MOD2");
-        if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  )
-                sKey += ::rtl::OUString::createFromAscii("_MOD3");
+    const ::rtl::OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent);
     css::uno::Reference< css::container::XNameAccess > xKey;
     css::uno::Reference< css::container::XNameContainer > xCommand;
     if ( !xContainer->hasByName(sKey) )
@@ -1516,19 +1570,7 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw
         xModules->getByName(m_sModuleCFG) >>= xContainer;
     }
 
-    KeyMapping aKeyMapping;
-    const sal_Int32 nBeginIndex = 4; // "KEY_" is the prefix of a identifier...
-    ::rtl::OUString sKey = (aKeyMapping.mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex);
-
-    if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT )
-        sKey += ::rtl::OUString::createFromAscii("_SHIFT");
-    if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  )
-        sKey += ::rtl::OUString::createFromAscii("_MOD1");
-    if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  )
-        sKey += ::rtl::OUString::createFromAscii("_MOD2");
-        if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  )
-                sKey += ::rtl::OUString::createFromAscii("_MOD3");
-
+    const ::rtl::OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent);
     xContainer->removeByName(sKey);
 }
 
@@ -1550,13 +1592,12 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
         xModules->getByName(sModule) >>= xContainer;
     }
 
-    KeyMapping aKeyMapping;
     css::awt::KeyEvent aKeyEvent;
     ::rtl::OUString sKeyIdentifier;
 
     sal_Int32 nIndex = 0;
     sKeyIdentifier = sKey.getToken(0, '_', nIndex);
-    aKeyEvent.KeyCode = aKeyMapping.mapIdentifierToCode(::rtl::OUString::createFromAscii("KEY_")+sKeyIdentifier);
+    aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString::createFromAscii("KEY_")+sKeyIdentifier);
 
     css::uno::Sequence< ::rtl::OUString > sToken(3);
     const sal_Int32 nToken = 3;
@@ -1677,4 +1718,3 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer
 }
 
 } // namespace framework
-
diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx
index 91591ed53..a6b0bd7bc 100644
--- a/framework/source/accelerators/acceleratorexecute.cxx
+++ b/framework/source/accelerators/acceleratorexecute.cxx
@@ -123,7 +123,7 @@ void AcceleratorExecute::init(const css::uno::Reference< css::lang::XMultiServic
         // <- SAFE ------------------------------
         
         css::uno::Reference< css::frame::XDispatchProvider > xDispatcher(
-                            xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")),
+                            xSMGR->createInstance(SERVICENAME_DESKTOP),
                             css::uno::UNO_QUERY_THROW);
         
         // SAFE -> ------------------------------
@@ -276,7 +276,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
 css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::impl_st_openGlobalConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
 {
     css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg(
-        xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.ui.GlobalAcceleratorConfiguration")),
+        xSMGR->createInstance(SERVICENAME_GLOBALACCELERATORCONFIGURATION),
         css::uno::UNO_QUERY_THROW);
     return xAccCfg;        
 }
@@ -286,7 +286,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::im
                                                                                                         const css::uno::Reference< css::frame::XFrame >&              xFrame)
 {
     css::uno::Reference< css::frame::XModuleManager > xModuleDetection(
-        xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager")),
+        xSMGR->createInstance(SERVICENAME_MODULEMANAGER),
         css::uno::UNO_QUERY_THROW);
 
     ::rtl::OUString sModule;        
@@ -300,7 +300,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::im
         { return css::uno::Reference< css::ui::XAcceleratorConfiguration >(); }
         
     css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUISupplier(
-        xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")),
+        xSMGR->createInstance(SERVICENAME_MODULEUICONFIGURATIONMANAGERSUPPLIER),
         css::uno::UNO_QUERY_THROW);
         
     css::uno::Reference< css::ui::XUIConfigurationManager >   xUIManager = xUISupplier->getUIConfigurationManager(sModule);
@@ -331,7 +331,7 @@ css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_ge
     // <- SAFE ----------------------------------
     
     css::uno::Reference< css::util::XURLTransformer > xParser(
-                xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")),
+                xSMGR->createInstance(SERVICENAME_URLTRANSFORMER),
                 css::uno::UNO_QUERY_THROW);
                 
     // SAFE -> ----------------------------------
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 340ffa56d..36599063c 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -109,6 +109,7 @@ DEFINE_INIT_SERVICE(ModuleAcceleratorConfiguration,
 ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR)
     : XCUBasedAcceleratorConfiguration(xSMGR)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration" );
 }
 
 //-----------------------------------------------    
@@ -122,6 +123,7 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc
     throw(css::uno::Exception       ,
           css::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleAcceleratorConfiguration::initialize" );
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
     
@@ -143,6 +145,7 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc
 //-----------------------------------------------    
 void ModuleAcceleratorConfiguration::impl_ts_fillCache()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleAcceleratorConfiguration::impl_ts_fillCache" );
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
     ::rtl::OUString sModule = m_sModule;
diff --git a/framework/source/classes/addonmenu.cxx b/framework/source/classes/addonmenu.cxx
index aac8ba948..35b61510c 100644
--- a/framework/source/classes/addonmenu.cxx
+++ b/framework/source/classes/addonmenu.cxx
@@ -39,7 +39,7 @@
 #include <general.h>
 #include <macros/debug/assertion.hxx>
 #include <helper/imageproducer.hxx>
-#include <classes/menuconfiguration.hxx>
+#include <xml/menuconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -106,23 +106,12 @@ sal_Bool AddonPopupMenu::IsCommandURLPrefix( const ::rtl::OUString& aCmdURL )
 }
 
 AddonPopupMenu::AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ) :
-    m_xFrame( rFrame )
+    AddonMenu( rFrame )
 {
 }
 
 AddonPopupMenu::~AddonPopupMenu()
 {
-    for ( USHORT i = 0; i < GetItemCount(); i++ )
-    {
-        if ( GetItemType( i ) != MENUITEM_SEPARATOR )
-        {
-            // delete user attributes created with new!
-            USHORT nId = GetItemId( i );
-            MenuConfiguration::Attributes* pUserAttributes = (MenuConfiguration::Attributes*)GetUserValue( nId );
-            delete pUserAttributes;
-            delete GetPopupMenu( nId );
-        }
-    }
 }
 
 // ------------------------------------------------------------------------
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx
index 26de1c7b2..b94d47c98 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/classes/addonsoptions.cxx
@@ -789,7 +789,7 @@ sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeTo
         ReadToolBarItemSet( aToolBarItemNode, rAddonOfficeToolBars[n] );
     }
 
-    return ( rAddonOfficeToolBars.size() > 0 );
+    return ( !rAddonOfficeToolBars.empty() );
 }
 
 
diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx
index 0e6c26946..3c2d17771 100644
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/classes/bmkmenu.cxx
@@ -41,7 +41,7 @@
 #include <general.h>
 #include <macros/debug/assertion.hxx>
 #include <helper/imageproducer.hxx>
-#include <classes/menuconfiguration.hxx>
+#include <xml/menuconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -130,15 +130,17 @@ USHORT BmkMenu_Impl::GetMID()
 
 // ------------------------------------------------------------------------
 
-BmkMenu::BmkMenu( com::sun::star::uno::Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType, BmkMenu* pRoot ) :
-    m_nType( nType ), m_xFrame( xFrame )
+BmkMenu::BmkMenu( com::sun::star::uno::Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType, BmkMenu* pRoot ) 
+    :AddonMenu(xFrame)
+    ,m_nType( nType )
 {
     _pImp = new BmkMenu_Impl( pRoot );
     Initialize();
 }
 
-BmkMenu::BmkMenu( Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType ) :
-    m_nType( nType ), m_xFrame( xFrame )
+BmkMenu::BmkMenu( Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType )
+    :AddonMenu(xFrame)    
+    ,m_nType( nType )
 {
     _pImp = new BmkMenu_Impl();
     Initialize();
@@ -147,17 +149,6 @@ BmkMenu::BmkMenu( Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType ) :
 BmkMenu::~BmkMenu()
 {
     delete _pImp;
-
-    for ( USHORT i = 0; i < GetItemCount(); i++ )
-    {
-        if ( GetItemType( i ) != MENUITEM_SEPARATOR )
-        {
-            // delete user attributes created with new!
-            USHORT nId = GetItemId( i );
-            MenuConfiguration::Attributes* pUserAttributes = (MenuConfiguration::Attributes*)GetUserValue( nId );
-            delete pUserAttributes;
-        }
-    }
 }
 
 void BmkMenu::Initialize()
diff --git a/framework/source/classes/framelistanalyzer.cxx b/framework/source/classes/framelistanalyzer.cxx
index bf16a997d..84b9e9796 100644
--- a/framework/source/classes/framelistanalyzer.cxx
+++ b/framework/source/classes/framelistanalyzer.cxx
@@ -151,8 +151,7 @@ void FrameListAnalyzer::impl_analyze()
         (xSet.is()                             )
        )
     {
-        css::uno::Any aValue = xSet->getPropertyValue(FRAME_PROPNAME_ISHIDDEN);
-        aValue >>= m_bReferenceIsHidden;
+        xSet->getPropertyValue(FRAME_PROPNAME_ISHIDDEN) >>= m_bReferenceIsHidden;
     }
 
     // check, if the reference frame includes the backing component.
@@ -272,8 +271,7 @@ void FrameListAnalyzer::impl_analyze()
                 xSet = css::uno::Reference< css::beans::XPropertySet >(xFrame, css::uno::UNO_QUERY);
                 if (xSet.is())
                 {
-                    css::uno::Any aValue = xSet->getPropertyValue(FRAME_PROPNAME_ISHIDDEN);
-                    aValue >>= bHidden;
+                    xSet->getPropertyValue(FRAME_PROPNAME_ISHIDDEN) >>= bHidden;
                 }
             }
 
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 8628744fb..973d3cbdc 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -33,7 +33,7 @@
 
 #include <classes/fwktabwindow.hxx>
 #include "framework.hrc"
-#include <classes/fwkresid.hxx>
+#include <classes/fwlresid.hxx>
 
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/XContainerWindowEventHandler.hpp>
@@ -224,9 +224,9 @@ void FwkTabPage::Save()
 
 FwkTabWindow::FwkTabWindow( Window* pParent ) :
 
-    Window( pParent, FwkResId( WIN_TABWINDOW ) ),
+    Window( pParent, FwlResId( WIN_TABWINDOW ) ),
 
-    m_aTabCtrl  ( this, FwkResId( TC_TABCONTROL ) )
+    m_aTabCtrl  ( this, FwlResId( TC_TABCONTROL ) )
 {
     uno::Reference < lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
     m_xWinProvider = uno::Reference < awt::XContainerWindowProvider >(
@@ -365,20 +365,19 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
     {
         beans::NamedValue aValue = rProperties[i];
         ::rtl::OUString sName = aValue.Name;
-        uno::Any aAny = aValue.Value;
 
         if ( sName.equalsAscii("Title") )
-            aAny >>= sTitle;
+            aValue.Value >>= sTitle;
         else if ( sName.equalsAscii("ToolTip") )
-            aAny >>= sToolTip;
+            aValue.Value >>= sToolTip;
         else if ( sName.equalsAscii("PageURL") )
-            aAny >>= sPageURL;
+            aValue.Value >>= sPageURL;
         else if ( sName.equalsAscii("EventHdl") )
-            aAny >>= xEventHdl;
+            aValue.Value >>= xEventHdl;
         else if ( sName.equalsAscii("Image") )
-            aAny >>= xImage;
+            aValue.Value >>= xImage;
         else if ( sName.equalsAscii("Disabled") )
-            aAny >>= bDisabled;
+            aValue.Value >>= bDisabled;
     }
 
     TabEntry* pEntry = new TabEntry( nIndex, sPageURL, xEventHdl );
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
new file mode 100755
index 000000000..d8eeb18de
--- /dev/null
+++ b/framework/source/classes/fwlresid.cxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: FwlResId.cxx,v $
+ * $Revision: 1.8 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+#include "classes/fwlresid.hxx"
+#include <tools/string.hxx>
+#include <vos/mutex.hxx>
+#include <vcl/svapp.hxx>
+
+#include <rtl/strbuf.hxx>
+
+namespace framework
+{
+
+ResMgr*	FwlResId::GetResManager()
+{
+    static ResMgr*	pResMgr = NULL;
+    
+    if ( !pResMgr )
+    {
+        rtl::OStringBuffer aBuf( 32 );
+        aBuf.append( "fwe" );
+        
+        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        pResMgr = ResMgr::CreateResMgr( aBuf.getStr() );
+    }
+    
+    return pResMgr;
+}
+
+// -----------------------------------------------------------------------
+
+FwlResId::FwlResId( USHORT nId ) :
+    ResId( nId, *FwlResId::GetResManager() )
+{
+}
+
+}
+
diff --git a/framework/source/classes/imagewrapper.cxx b/framework/source/classes/imagewrapper.cxx
index cd57d4189..7e001a9e4 100644
--- a/framework/source/classes/imagewrapper.cxx
+++ b/framework/source/classes/imagewrapper.cxx
@@ -54,7 +54,6 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier()
 
 
 ImageWrapper::ImageWrapper( const Image& aImage ) : ThreadHelpBase( &Application::GetSolarMutex() )
-                                                    ,	cppu::OWeakObject()
                                                     ,	m_aImage( aImage )
 {
 }
@@ -70,33 +69,6 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId()
     return impl_getStaticIdentifier();
 }
 
-
-// XInterface
-void SAL_CALL ImageWrapper::acquire() throw ()
-{
-    OWeakObject::acquire();
-}
-
-void SAL_CALL ImageWrapper::release() throw ()
-{
-    OWeakObject::release();
-}
-
-Any SAL_CALL ImageWrapper::queryInterface( const Type& aType )
-throw ( RuntimeException )
-{
-    Any a = ::cppu::queryInterface(
-                aType ,
-                SAL_STATIC_CAST( com::sun::star::awt::XBitmap*, this ),
-                SAL_STATIC_CAST( XUnoTunnel*, this ),
-                SAL_STATIC_CAST( XTypeProvider*, this ));
-
-    if( a.hasValue() )
-        return a;
-
-    return OWeakObject::queryInterface( aType );
-}
-
 // XBitmap
 com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException )
 {
@@ -147,63 +119,5 @@ sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIden
         return 0;
 }
 
-// XTypeProvider
-Sequence< Type > SAL_CALL ImageWrapper::getTypes() throw ( RuntimeException )
-{
-    // Optimize this method !
-    // We initialize a static variable only one time. And we don't must use a mutex at every call!
-    // For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
-    static ::cppu::OTypeCollection* pTypeCollection = NULL ;
-
-    if ( pTypeCollection == NULL )
-    {
-        // Ready for multithreading; get global mutex for first call of this method only! see before
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
-
-        // Control these pointer again ... it can be, that another instance will be faster then these!
-        if ( pTypeCollection == NULL )
-        {
-            // Create a static typecollection ...
-            static ::cppu::OTypeCollection aTypeCollection(
-                        ::getCppuType(( const Reference< XTypeProvider					>*)NULL ) ,
-                        ::getCppuType(( const Reference< XUnoTunnel						>*)NULL ) ,
-                        ::getCppuType(( const Reference< com::sun::star::awt::XBitmap	>*)NULL )	) ;
-
-            // ... and set his address to static pointer!
-            pTypeCollection = &aTypeCollection ;
-        }
-    }
-
-    return pTypeCollection->getTypes() ;
-}
-
-Sequence< sal_Int8 > SAL_CALL ImageWrapper::getImplementationId() throw ( RuntimeException )
-{
-    // Create one Id for all instances of this class.
-    // Use ethernet address to do this! (sal_True)
-
-    // Optimize this method
-    // We initialize a static variable only one time. And we don't must use a mutex at every call!
-    // For the first call; pID is NULL - for the second call pID is different from NULL!
-    static ::cppu::OImplementationId* pID = NULL ;
-
-    if ( pID == NULL )
-    {
-        // Ready for multithreading; get global mutex for first call of this method only! see before
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
-
-        // Control these pointer again ... it can be, that another instance will be faster then these!
-        if ( pID == NULL )
-        {
-            // Create a new static ID ...
-            static ::cppu::OImplementationId aID( sal_False ) ;
-            // ... and set his address to static pointer!
-            pID = &aID ;
-        }
-    }
-
-    return pID->getImplementationId() ;
-}
-
 }
 
diff --git a/framework/source/classes/makefile.mk b/framework/source/classes/makefile.mk
index a80bf0b87..c55af1cdf 100644
--- a/framework/source/classes/makefile.mk
+++ b/framework/source/classes/makefile.mk
@@ -57,6 +57,7 @@ SLOFILES=           \
                     $(SLO)$/addonmenu.obj							\
                     $(SLO)$/addonsoptions.obj						\
                     $(SLO)$/fwkresid.obj                            \
+                    $(SLO)$/fwlresid.obj                            \
                     $(SLO)$/framelistanalyzer.obj                   \
                     $(SLO)$/sfxhelperfunctions.obj                  \
                     $(SLO)$/menuextensionsupplier.obj               \
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 88b573bbf..0527084ad 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -36,14 +36,14 @@
 //	my own includes
 //_________________________________________________________________________________________________________________
 #include <classes/menumanager.hxx>
-#include <classes/menuconfiguration.hxx>
+#include <xml/menuconfiguration.hxx>
 #include <classes/bmkmenu.hxx>
 #include <classes/addonmenu.hxx>
 #include <helper/imageproducer.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include "classes/addonsoptions.hxx"
 #include <classes/fwkresid.hxx>
-
+#include <services.h>
 #include "classes/resource.hrc"
 
 //_________________________________________________________________________________________________________________
@@ -92,6 +92,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
 
@@ -122,9 +123,7 @@ namespace framework
 #define SID_HELPMENU			(SID_SFX_START + 410)
 
 #define SFX_REFERER_USER		"private:user"
-#define DESKTOP_SERVICE			::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))
 
-const ::rtl::OUString aSlotString( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
 const ::rtl::OUString aSlotNewDocDirect( RTL_CONSTASCII_USTRINGPARAM( "slot:5537" ));
 const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" ));
 
@@ -146,7 +145,6 @@ MenuManager::MenuManager(
     REFERENCE< XFRAME >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) 
 :	// #110897#
     ThreadHelpBase( &Application::GetSolarMutex() ), 
-    OWeakObject(),
     mxServiceFactory(xServiceFactory)
 {
     m_bActive			= sal_False;
@@ -163,61 +161,30 @@ MenuManager::MenuManager(
     m_bShowMenuImages	= rSettings.GetUseImagesInMenus();
 
     sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
+#if 0
     ::std::vector< USHORT > aQueryLabelItemIdVector;
+#endif
 
     USHORT nItemCount = pMenu->GetItemCount();
+    m_aMenuItemHandlerVector.reserve(nItemCount);
+    ::rtl::OUString aItemCommand;
     for ( USHORT i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = pMenu->GetItemId( i );
-
-        ::rtl::OUString aItemCommand = pMenu->GetItemCommand( nItemId );
-        if ( !aItemCommand.getLength() )
-        {
-            aItemCommand = aSlotString;
-            aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId );
-            pMenu->SetItemCommand( nItemId, aItemCommand );
-        }
+        USHORT nItemId = FillItemCommand(aItemCommand,pMenu, i );
 
         PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nItemId );
         if ( pPopupMenu )
         {
-            if (( aItemCommand.getLength() > nAddonsURLPrefixLength ) &&
-                ( aItemCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 ))
-            {
-                // A special addon popup menu, must be created with a different ctor
-                
-                // #110897#
-                // MenuManager* pSubMenuManager = new MenuManager( rFrame, (AddonPopupMenu *)pPopupMenu, bDeleteChildren, bDeleteChildren );
-                MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), rFrame, (AddonPopupMenu *)pPopupMenu, bDeleteChildren, bDeleteChildren );
-                
-                // store menu item command as we later have to know which menu is active (see Activate handler)
-                pSubMenuManager->m_aMenuItemCommand = aItemCommand;
-
-                REFERENCE< XDISPATCH > aXDispatchRef;
-                MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
-                                                            nItemId,
-                                                            pSubMenuManager,
-                                                            aXDispatchRef );
-                m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
-            }
-            else
+            AddMenu(pPopupMenu,aItemCommand,nItemId,bDeleteChildren,bDeleteChildren);
+            if (! (( aItemCommand.getLength() > nAddonsURLPrefixLength ) &&
+                ( aItemCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 )) )
             {
                 // #110897#
                 // MenuManager* pSubMenuManager = new MenuManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-                MenuManager* pSubMenuMgr = new MenuManager( getServiceFactory(), rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-
-                // store menu item command as we later have to know which menu is active (see Activate handler)
-                pSubMenuMgr->m_aMenuItemCommand = aItemCommand;
-
-                REFERENCE< XDISPATCH > aXDispRef;
-                MenuItemHandler* pMenuItemHdl = new MenuItemHandler(
-                                                            nItemId,
-                                                            pSubMenuMgr,
-                                                            aXDispRef );
-                m_aMenuItemHandlerVector.push_back( pMenuItemHdl );
-
+#if 0
                 if ( pMenu->GetItemText( nItemId ).Len() == 0 )
                     aQueryLabelItemIdVector.push_back( nItemId );
+#endif
 
                 // Create addon popup menu if there exist elements and this is the tools popup menu
                 if (( nItemId == SID_ADDONLIST ||
@@ -237,23 +204,18 @@ MenuManager::MenuManager(
                         pPopupMenu->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu );
 
                         // Set item command for popup menu to enable it for GetImageFromURL
+                        const static ::rtl::OUString aSlotString( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                         aItemCommand = aSlotString;
                         aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST );
                         pPopupMenu->SetItemCommand( ITEMID_ADDONLIST, aItemCommand );
                         
                         // #110897#
                         // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
-                        MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), rFrame, pSubMenu, sal_True, sal_False );
-
-                        REFERENCE< XDISPATCH > aXDispatchRef;
-                        MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
-                                                                    nItemId,
-                                                                    pSubMenuManager,
-                                                                    aXDispatchRef );
+                        AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
+#if 0
                         if ( pMenu->GetItemText( nItemId ).Len() == 0 )
                             aQueryLabelItemIdVector.push_back( nItemId );
-                        m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
-
+#endif
                         // Set image for the addon popup menu item
                         if ( m_bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST ))
                         {
@@ -281,16 +243,11 @@ MenuManager::MenuManager(
 
                 // #110897#
                 // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
-                MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), rFrame, pSubMenu, sal_True, sal_False );
-
-                REFERENCE< XDISPATCH > aXDispatchRef;
-                MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
-                                                            nItemId,
-                                                            pSubMenuManager,
-                                                            aXDispatchRef );
+                AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
+#if 0
                 if ( pMenu->GetItemText( nItemId ).Len() == 0 )
                     aQueryLabelItemIdVector.push_back( nItemId );
-                m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
+#endif
                 
                 if ( m_bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
@@ -311,16 +268,11 @@ MenuManager::MenuManager(
 
                 // #110897#
                 // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
-                MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), rFrame, pSubMenu, sal_True, sal_False );
-
-                REFERENCE< XDISPATCH > aXDispatchRef;
-                MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
-                                                            nItemId,
-                                                            pSubMenuManager,
-                                                            aXDispatchRef );
+                AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
+#if 0
                 if ( pMenu->GetItemText( nItemId ).Len() == 0 )
                     aQueryLabelItemIdVector.push_back( nItemId );
-                m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
+#endif
                 
                 if ( m_bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
@@ -368,8 +320,10 @@ MenuManager::MenuManager(
                 
                 REFERENCE< XDISPATCH > aXDispatchRef;
                 m_aMenuItemHandlerVector.push_back( new MenuItemHandler( nItemId, NULL, aXDispatchRef ));
+#if 0
                 if ( pMenu->GetItemText( nItemId ).Len() == 0 )
                     aQueryLabelItemIdVector.push_back( nItemId );
+#endif
             }
         }
     }
@@ -397,98 +351,15 @@ MenuManager::MenuManager(
         }
     }
 #endif
-    m_pVCLMenu->SetHighlightHdl( LINK( this, MenuManager, Highlight ));
-    m_pVCLMenu->SetActivateHdl( LINK( this, MenuManager, Activate ));
-    m_pVCLMenu->SetDeactivateHdl( LINK( this, MenuManager, Deactivate ));
-    m_pVCLMenu->SetSelectHdl( LINK( this, MenuManager, Select ));
-}
-
-
-// #110897#
-MenuManager::MenuManager( 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-    REFERENCE< XFRAME >& rFrame, BmkMenu* pBmkMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) 
-:	// #110897#
-    ThreadHelpBase( &Application::GetSolarMutex() ), 
-    OWeakObject(),
-    mxServiceFactory(xServiceFactory)
-{
-    m_bActive			= sal_False;
-    m_bDeleteMenu		= bDelete;
-    m_bDeleteChildren	= bDeleteChildren;
-    m_pVCLMenu			= pBmkMenu;
-    m_xFrame			= rFrame;
-    m_bInitialized		= sal_False;
-    m_bIsBookmarkMenu	= sal_True;
-
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast	= rSettings.GetMenuColor().IsDark();
-
-    SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
-
-    USHORT nItemCount = pBmkMenu->GetItemCount();
-    for ( USHORT i = 0; i < nItemCount; i++ )
-    {
-        USHORT nItemId = pBmkMenu->GetItemId( i );
-
-        ::rtl::OUString aItemCommand = pBmkMenu->GetItemCommand( nItemId );
-        if ( !aItemCommand.getLength() )
-        {
-            aItemCommand = aSlotString;
-            aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId );
-            pBmkMenu->SetItemCommand( nItemId, aItemCommand );
-        }
-
-        PopupMenu* pPopupMenu = pBmkMenu->GetPopupMenu( nItemId );
-        if ( pPopupMenu )
-        {
-            // #110897#
-            // MenuManager* pSubMenuManager = new MenuManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-            MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-
-            // store menu item command as we later have to know which menu is active (see Acivate handler)
-            pSubMenuManager->m_aMenuItemCommand = aItemCommand;
-
-            REFERENCE< XDISPATCH > aXDispatchRef;
-            MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
-                                                        nItemId,
-                                                        pSubMenuManager,
-                                                        aXDispatchRef );
-            m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
-        }
-        else
-        {
-            if ( pBmkMenu->GetItemType( i ) != MENUITEM_SEPARATOR )
-            {
-                MenuConfiguration::Attributes* pBmkAttributes = (MenuConfiguration::Attributes *)(pBmkMenu->GetUserValue( nItemId ));
-                REFERENCE< XDISPATCH > aXDispatchRef;
-                MenuItemHandler* pMenuItemHandler = new MenuItemHandler( nItemId, NULL, aXDispatchRef );
-
-                if ( pBmkAttributes )
-                {
-                    // read additional attributes from attributes struct and BmkMenu implementation will delete all attributes itself!!
-                    pMenuItemHandler->aTargetFrame = pBmkAttributes->aTargetFrame;
-                }
-
-                m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
-            }
-        }
-    }
-
-    m_pVCLMenu->SetHighlightHdl( LINK( this, MenuManager, Highlight ));
-    m_pVCLMenu->SetActivateHdl( LINK( this, MenuManager, Activate ));
-    m_pVCLMenu->SetDeactivateHdl( LINK( this, MenuManager, Deactivate ));
-    m_pVCLMenu->SetSelectHdl( LINK( this, MenuManager, Select ));
+    SetHdl();
 }
 
-
 // #110897#
 MenuManager::MenuManager( 
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     REFERENCE< XFRAME >& rFrame, AddonMenu* pAddonMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) 
 :	// #110897#
     ThreadHelpBase( &Application::GetSolarMutex() ), 
-    OWeakObject(),
     mxServiceFactory(xServiceFactory)
 {
     m_bActive			= sal_False;
@@ -505,34 +376,18 @@ MenuManager::MenuManager(
     SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
 
     USHORT nItemCount = pAddonMenu->GetItemCount();
+    m_aMenuItemHandlerVector.reserve(nItemCount);
+    ::rtl::OUString aItemCommand;
     for ( USHORT i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = pAddonMenu->GetItemId( i );
-
-        ::rtl::OUString aItemCommand = pAddonMenu->GetItemCommand( nItemId );
-        if ( !aItemCommand.getLength() )
-        {
-            aItemCommand = aSlotString;
-            aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId );
-            pAddonMenu->SetItemCommand( nItemId, aItemCommand );
-        }
+        USHORT nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
 
         PopupMenu* pPopupMenu = pAddonMenu->GetPopupMenu( nItemId );
         if ( pPopupMenu )
         {
             // #110897#
             // MenuManager* pSubMenuManager = new MenuManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-            MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-
-            // store menu item command as we later have to know which menu is active (see Acivate handler)
-            pSubMenuManager->m_aMenuItemCommand = aItemCommand;
-
-            REFERENCE< XDISPATCH > aXDispatchRef;
-            MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
-                                                        nItemId,
-                                                        pSubMenuManager,
-                                                        aXDispatchRef );
-            m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
+            AddMenu(pPopupMenu,aItemCommand,nItemId,bDeleteChildren,bDeleteChildren);
         }
         else
         {
@@ -553,110 +408,27 @@ MenuManager::MenuManager(
         }
     }
 
-    m_pVCLMenu->SetHighlightHdl( LINK( this, MenuManager, Highlight ));
-    m_pVCLMenu->SetActivateHdl( LINK( this, MenuManager, Activate ));
-    m_pVCLMenu->SetDeactivateHdl( LINK( this, MenuManager, Deactivate ));
-    m_pVCLMenu->SetSelectHdl( LINK( this, MenuManager, Select ));
+    SetHdl();
 }
 
-
-// #110897#
-MenuManager::MenuManager( 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-    REFERENCE< XFRAME >& rFrame, AddonPopupMenu* pAddonPopupMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) 
-:	// #110897#
-    ThreadHelpBase( &Application::GetSolarMutex() ), 
-    OWeakObject(),
-    mxServiceFactory(xServiceFactory)
+void MenuManager::SetHdl()
 {
-    m_bActive			= sal_False;
-    m_bDeleteMenu		= bDelete;
-    m_bDeleteChildren	= bDeleteChildren;
-    m_pVCLMenu			= pAddonPopupMenu;
-    m_xFrame			= rFrame;
-    m_bInitialized		= sal_False;
-    m_bIsBookmarkMenu	= sal_True;
-
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast	= rSettings.GetMenuColor().IsDark();
-
-    SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
-
-    USHORT nItemCount = pAddonPopupMenu->GetItemCount();
-    for ( USHORT i = 0; i < nItemCount; i++ )
-    {
-        USHORT nItemId = pAddonPopupMenu->GetItemId( i );
-
-        ::rtl::OUString aItemCommand = pAddonPopupMenu->GetItemCommand( nItemId );
-        if ( !aItemCommand.getLength() )
-        {
-            aItemCommand = aSlotString;
-            aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId );
-            pAddonPopupMenu->SetItemCommand( nItemId, aItemCommand );
-        }
-
-        PopupMenu* pPopupMenu = pAddonPopupMenu->GetPopupMenu( nItemId );
-        if ( pPopupMenu )
-        {
-            // #110897#
-            // MenuManager* pSubMenuManager = new MenuManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-            MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-
-            // store menu item command as we later have to know which menu is active (see Acivate handler)
-            pSubMenuManager->m_aMenuItemCommand = aItemCommand;
-
-            REFERENCE< XDISPATCH > aXDispatchRef;
-            MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
-                                                        nItemId,
-                                                        pSubMenuManager,
-                                                        aXDispatchRef );
-            m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
-        }
-        else
-        {
-            if ( pAddonPopupMenu->GetItemType( i ) != MENUITEM_SEPARATOR )
-            {
-                MenuConfiguration::Attributes* pAttributes = (MenuConfiguration::Attributes *)(pAddonPopupMenu->GetUserValue( nItemId ));
-                REFERENCE< XDISPATCH > aXDispatchRef;
-                MenuItemHandler* pMenuItemHandler = new MenuItemHandler( nItemId, NULL, aXDispatchRef );
-
-                if ( pAttributes )
-                {
-                    // read additional attributes from attributes struct and BmkMenu implementation will delete all attributes itself!!
-                    pMenuItemHandler->aTargetFrame = pAttributes->aTargetFrame;
-                }
-
-                m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
-            }
-        }
-    }
-
     m_pVCLMenu->SetHighlightHdl( LINK( this, MenuManager, Highlight ));
     m_pVCLMenu->SetActivateHdl( LINK( this, MenuManager, Activate ));
     m_pVCLMenu->SetDeactivateHdl( LINK( this, MenuManager, Deactivate ));
     m_pVCLMenu->SetSelectHdl( LINK( this, MenuManager, Select ));
-}
 
-Any SAL_CALL MenuManager::queryInterface( const ::com::sun::star::uno::Type & rType ) throw ( RuntimeException )
-{
-    Any a = ::cppu::queryInterface(
-                rType ,
-                SAL_STATIC_CAST( XSTATUSLISTENER*, this ),
-                SAL_STATIC_CAST( XEVENTLISTENER*, this ));
-    if ( a.hasValue() )
-        return a;
-
-    return OWeakObject::queryInterface( rType );
+    if ( mxServiceFactory.is() )
+        m_xURLTransformer.set( mxServiceFactory->createInstance(SERVICENAME_URLTRANSFORMER),UNO_QUERY );
 }
 
-
 MenuManager::~MenuManager()
 {
     std::vector< MenuItemHandler* >::iterator p;
     for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
     {
         MenuItemHandler* pItemHandler = *p;
-        pItemHandler->xMenuItemDispatch = REFERENCE< XDISPATCH >();
+        pItemHandler->xMenuItemDispatch.clear();
         if ( pItemHandler->pSubMenuManager )
             SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)pItemHandler->pSubMenuManager )->release();
         delete pItemHandler;
@@ -730,11 +502,7 @@ throw ( RuntimeException )
             aTargetURL.Complete = pStatusChangedMenu->aMenuItemURL;
 
             // #110897#
-            // REFERENCE< XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-            //		rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-            REFERENCE< XURLTransformer > xTrans( getServiceFactory()->createInstance(
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-            xTrans->parseStrict( aTargetURL );
+            m_xURLTransformer->parseStrict( aTargetURL );
 
             REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
             REFERENCE< XDISPATCH > xMenuItemDispatch = xDispatchProvider->queryDispatch(
@@ -754,16 +522,15 @@ throw ( RuntimeException )
 void MenuManager::RemoveListener()
 {
     ResetableGuard aGuard( m_aLock );
+    ClearMenuDispatch();
+}
 
+void MenuManager::ClearMenuDispatch(const EVENTOBJECT& Source,bool _bRemoveOnly)
+{
     // disposing called from parent dispatcher
     // remove all listener to prepare shutdown
 
     // #110897#
-    //REFERENCE< XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-    //	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-    REFERENCE< XURLTransformer > xTrans( getServiceFactory()->createInstance(
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-
     std::vector< MenuItemHandler* >::iterator p;
     for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
     {
@@ -772,15 +539,20 @@ void MenuManager::RemoveListener()
         {
             URL aTargetURL;
             aTargetURL.Complete	= pItemHandler->aMenuItemURL;
-            xTrans->parseStrict( aTargetURL );
+            m_xURLTransformer->parseStrict( aTargetURL );
 
             pItemHandler->xMenuItemDispatch->removeStatusListener(
                 SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL );
         }
 
-        pItemHandler->xMenuItemDispatch = REFERENCE< XDISPATCH >();
+        pItemHandler->xMenuItemDispatch.clear();
         if ( pItemHandler->pSubMenuManager )
-            pItemHandler->pSubMenuManager->RemoveListener();
+        {
+            if ( _bRemoveOnly )
+                pItemHandler->pSubMenuManager->RemoveListener();
+            else
+                pItemHandler->pSubMenuManager->disposing( Source );
+        }
     }
 }
 
@@ -790,34 +562,7 @@ void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIM
     if ( Source.Source == m_xFrame )
     {
         ResetableGuard aGuard( m_aLock );
-
-        // disposing called from parent dispatcher
-        // remove all listener to prepare shutdown
-
-        // #110897#
-        // REFERENCE< XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-        //	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-        REFERENCE< XURLTransformer > xTrans( getServiceFactory()->createInstance(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-
-        std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
-        {
-            MenuItemHandler* pItemHandler = *p;
-            if ( pItemHandler->xMenuItemDispatch.is() )
-            {
-                URL aTargetURL;
-                aTargetURL.Complete	= pItemHandler->aMenuItemURL;
-                xTrans->parseStrict( aTargetURL );
-
-                pItemHandler->xMenuItemDispatch->removeStatusListener(
-                    SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL );
-            }
-
-            pItemHandler->xMenuItemDispatch = REFERENCE< XDISPATCH >();
-            if ( pItemHandler->pSubMenuManager )
-                pItemHandler->pSubMenuManager->disposing( Source );
-        }
+        ClearMenuDispatch(Source,false);
     }
     else
     {
@@ -844,15 +589,10 @@ void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIM
                 aTargetURL.Complete	= pMenuItemDisposing->aMenuItemURL;
 
                 // #110897#
-                // REFERENCE< XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                //	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-                REFERENCE< XURLTransformer > xTrans( getServiceFactory()->createInstance(
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-                xTrans->parseStrict( aTargetURL );
-
-                pMenuItemDisposing->xMenuItemDispatch->removeStatusListener(
-                    SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL );
-                pMenuItemDisposing->xMenuItemDispatch = REFERENCE< XDISPATCH >();
+                m_xURLTransformer->parseStrict( aTargetURL );
+
+                pMenuItemDisposing->xMenuItemDispatch->removeStatusListener(SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL );
+                pMenuItemDisposing->xMenuItemDispatch.clear();
             }
         }
     }
@@ -869,6 +609,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
     USHORT	nPickItemId = START_ITEMID_PICKLIST;
     int		nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength();
 
+    aNewPickVector.reserve(nPickListMenuItems);
     for ( int i = 0; i < nPickListMenuItems; i++ )
     {
         Sequence< PropertyValue > aPickListEntry = aHistoryList[i];
@@ -896,19 +637,15 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
         aNewPickVector.push_back( pNewMenuItemHandler );
     }
 
-    if ( aNewPickVector.size() > 0 )
+    if ( !aNewPickVector.empty() )
     {
         URL aTargetURL;
         REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
 
         // #110897#
-        // REFERENCE< XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-        //			rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-        REFERENCE< XURLTransformer > xTrans( getServiceFactory()->createInstance(
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-
         REFERENCE< XDISPATCH > xMenuItemDispatch;
 
+        static const ::rtl::OUString s_sDefault(RTL_CONSTASCII_USTRINGPARAM("_default"));
         // query for dispatcher
         std::vector< MenuItemHandler* >::iterator p;
         for ( p = aNewPickVector.begin(); p != aNewPickVector.end(); p++ )
@@ -916,12 +653,12 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
             MenuItemHandler* pMenuItemHandler = *p;
 
             aTargetURL.Complete = pMenuItemHandler->aMenuItemURL;
-            xTrans->parseStrict( aTargetURL );
+            m_xURLTransformer->parseStrict( aTargetURL );
 
             if ( !xMenuItemDispatch.is() )
             {
                 // attention: this code assume that "_blank" can only be consumed by desktop service
-                xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_default"), 0 );
+                xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, s_sDefault, 0 );
             }
 
             if ( xMenuItemDispatch.is() )
@@ -963,8 +700,10 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
             }
 
             // append new picklist menu entries
+            aNewPickVector.reserve(aNewPickVector.size());
             pMenu->InsertSeparator();
-            for ( sal_uInt32 i = 0; i < aNewPickVector.size(); i++ )
+            const sal_uInt32 nCount = aNewPickVector.size();
+            for ( sal_uInt32 i = 0; i < nCount; i++ )
             {
                 char menuShortCut[5] = "~n: ";
 
@@ -1027,17 +766,13 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
     }
 }
 
-
-void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu )
+void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiServiceFactory >& xServiceFactory,framework::IMutex& _rMutex )
 {
     // update window list
     ::std::vector< ::rtl::OUString > aNewWindowListVector;
 
     // #110897#
-    // Reference< XDesktop > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
-    //	DESKTOP_SERVICE ), UNO_QUERY );
-    Reference< XDesktop > xDesktop( getServiceFactory()->createInstance(
-        DESKTOP_SERVICE ), UNO_QUERY );
+    Reference< XDesktop > xDesktop( xServiceFactory->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
 
     USHORT	nActiveItemId = 0;
     USHORT	nItemId = START_ITEMID_WINDOWLIST;
@@ -1048,11 +783,12 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu )
         Reference< XFrame > xCurrentFrame = xDesktop->getCurrentFrame();
         Reference< XIndexAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY );
         sal_Int32 nCount = xList->getCount();
+        aNewWindowListVector.reserve(nCount);
         for (sal_Int32 i=0; i<nCount; ++i )
         {
-            Any aItem = xList->getByIndex(i);
             Reference< XFrame > xFrame;
-            aItem >>= xFrame;
+            xList->getByIndex(i) >>= xFrame;
+            
             if (xFrame.is())
             {
                 if ( xFrame == xCurrentFrame )
@@ -1069,9 +805,9 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu )
     }
 
     {
-        ResetableGuard aGuard( m_aLock );
+        ResetableGuard aGuard( _rMutex );
 
-        int	nItemCount		 = pMenu->GetItemCount();
+        int	nItemCount = pMenu->GetItemCount();
 
         if ( nItemCount > 0 )
         {
@@ -1084,12 +820,13 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu )
                 pMenu->RemoveItem( pMenu->GetItemCount()-1 );
         }
 
-        if ( aNewWindowListVector.size() > 0 )
+        if ( !aNewWindowListVector.empty() )
         {
             // append new window list entries to menu
             pMenu->InsertSeparator();
             nItemId = START_ITEMID_WINDOWLIST;
-            for ( sal_uInt32 i = 0; i < aNewWindowListVector.size(); i++ )
+            const sal_uInt32 nCount = aNewWindowListVector.size();
+            for ( sal_uInt32 i = 0; i < nCount; i++ )
             {
                 pMenu->InsertItem( nItemId, aNewWindowListVector.at( i ), MIB_RADIOCHECK );
                 if ( nItemId == nActiveItemId )
@@ -1179,7 +916,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
         else if ( m_aMenuItemCommand == aSpecialWindowMenu ||
                   m_aMenuItemCommand == aSlotSpecialWindowMenu ||
                   aCommand == aSpecialWindowCommand )
-            UpdateSpecialWindowMenu( pMenu );
+                  UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock );
 
         // Check if some modes have changed so we have to update our menu images
         sal_Bool bIsHiContrast = rSettings.GetMenuColor().IsDark();
@@ -1189,48 +926,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
             // The mode changed so we have to replace all images
             m_bWasHiContrast	= bIsHiContrast;
             m_bShowMenuImages	= bShowMenuImages;
-            AddonsOptions		aAddonOptions;
-
-            for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
-            {
-                USHORT nId = pMenu->GetItemId( nPos );
-                if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
-                {
-                    if ( bShowMenuImages )
-                    {
-                        sal_Bool		bImageSet = sal_False;
-                        ::rtl::OUString aImageId;
-
-                        ::framework::MenuConfiguration::Attributes* pMenuAttributes =
-                            (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nId );
-
-                        if ( pMenuAttributes )
-                            aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
-
-                        if ( aImageId.getLength() > 0 )
-                        {
-                            Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, bIsHiContrast );
-                            if ( !!aImage )
-                            {
-                                bImageSet = sal_True;
-                                pMenu->SetItemImage( nId, aImage );
-                            }
-                        }
-
-                        if ( !bImageSet )
-                        {
-                            rtl::OUString aMenuItemCommand = pMenu->GetItemCommand( nId );
-                            Image aImage = GetImageFromURL( m_xFrame, aMenuItemCommand, FALSE, bIsHiContrast );
-                            if ( !aImage )
-                                aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE, bIsHiContrast );
-                            
-                            pMenu->SetItemImage( nId, aImage );
-                        }
-                    }
-                    else
-                        pMenu->SetItemImage( nId, Image() );
-                }
-            }
+            FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages);
         }
 
         if ( m_bInitialized )
@@ -1240,11 +936,6 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
             URL aTargetURL;
 
             // #110897#
-            // REFERENCE< XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-            //		rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-            REFERENCE< XURLTransformer > xTrans( getServiceFactory()->createInstance(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-
             ResetableGuard aGuard( m_aLock );
 
             REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
@@ -1266,14 +957,15 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
                             ::rtl::OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId );
                             if ( !aItemCommand.getLength() )
                             {
-                                aItemCommand = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+                                const static ::rtl::OUString aSlotString( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+                                aItemCommand = aSlotString;
                                 aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)pMenuItemHandler->nItemId );
                                 pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand );
                             }
 
                             aTargetURL.Complete = aItemCommand;
 
-                            xTrans->parseStrict( aTargetURL );
+                            m_xURLTransformer->parseStrict( aTargetURL );
 
                             REFERENCE< XDISPATCH > xMenuItemDispatch;
                             if ( m_bIsBookmarkMenu )
@@ -1330,8 +1022,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
                 // #110897#
                 // Reference< XFramesSupplier > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
                 //	DESKTOP_SERVICE ), UNO_QUERY );
-                Reference< XFramesSupplier > xDesktop( getServiceFactory()->createInstance(
-                    DESKTOP_SERVICE ), UNO_QUERY );
+                Reference< XFramesSupplier > xDesktop( getServiceFactory()->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
 
                 if ( xDesktop.is() )
                 {
@@ -1340,9 +1031,9 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
                     sal_Int32 nCount = xList->getCount();
                     for ( sal_Int32 i=0; i<nCount; ++i )
                     {
-                        Any aItem = xList->getByIndex(i);
                         Reference< XFrame > xFrame;
-                        aItem >>= xFrame;
+                        xList->getByIndex(i) >>= xFrame;
+                        
                         if ( xFrame.is() && nTaskId == nCurItemId )
                         {
                             Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
@@ -1360,14 +1051,8 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
                 MenuItemHandler* pMenuItemHandler = GetMenuItemHandler( nCurItemId );
                 if ( pMenuItemHandler && pMenuItemHandler->xMenuItemDispatch.is() )
                 {
-                    // #110897#
-                    // REFERENCE< XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                    //	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-                    REFERENCE< XURLTransformer > xTrans( getServiceFactory()->createInstance(
-                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-
                     aTargetURL.Complete = pMenuItemHandler->aMenuItemURL;
-                    xTrans->parseStrict( aTargetURL );
+                    m_xURLTransformer->parseStrict( aTargetURL );
 
                     if ( nCurItemId >= START_ITEMID_PICKLIST &&
                          nCurItemId <  START_ITEMID_WINDOWLIST )
@@ -1378,11 +1063,9 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
                     else if ( m_bIsBookmarkMenu )
                     {
                         // bookmark menu item selected
-                        Any a;
                         aArgs.realloc( 1 );
                         aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
-                        a <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER ));
-                        aArgs[0].Value = a;
+                        aArgs[0].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER ));
                     }
 
                     xDispatch = pMenuItemHandler->xMenuItemDispatch;
@@ -1410,4 +1093,78 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFac
     return mxServiceFactory;
 }
 
+void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,USHORT _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren)
+{
+    MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), m_xFrame, _pPopupMenu, _bDelete, _bDeleteChildren );
+                
+    // store menu item command as we later have to know which menu is active (see Activate handler)
+    pSubMenuManager->m_aMenuItemCommand = _sItemCommand;
+
+    REFERENCE< XDISPATCH > aXDispatchRef;
+    MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
+                                                _nItemId,
+                                                pSubMenuManager,
+                                                aXDispatchRef );
+    m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
+}
+
+USHORT MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const
+{
+    USHORT nItemId = _pMenu->GetItemId( _nIndex );
+
+    _rItemCommand = _pMenu->GetItemCommand( nItemId );
+    if ( !_rItemCommand.getLength() )
+    {
+        const static ::rtl::OUString aSlotString( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+        _rItemCommand = aSlotString;
+        _rItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId );
+        _pMenu->SetItemCommand( nItemId, _rItemCommand );
+    }
+    return nItemId;
+}
+void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages)
+{
+    AddonsOptions		aAddonOptions;
+
+    for ( USHORT nPos = 0; nPos < _pMenu->GetItemCount(); nPos++ )
+    {
+        USHORT nId = _pMenu->GetItemId( nPos );
+        if ( _pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
+        {
+            if ( bShowMenuImages )
+            {
+                sal_Bool		bImageSet = sal_False;
+                ::rtl::OUString aImageId;
+
+                ::framework::MenuConfiguration::Attributes* pMenuAttributes =
+                    (::framework::MenuConfiguration::Attributes*)_pMenu->GetUserValue( nId );
+
+                if ( pMenuAttributes )
+                    aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
+
+                if ( aImageId.getLength() > 0 )
+                {
+                    Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE, bIsHiContrast );
+                    if ( !!aImage )
+                    {
+                        bImageSet = sal_True;
+                        _pMenu->SetItemImage( nId, aImage );
+                    }
+                }
+
+                if ( !bImageSet )
+                {
+                    rtl::OUString aMenuItemCommand = _pMenu->GetItemCommand( nId );
+                    Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE, bIsHiContrast );
+                    if ( !aImage )
+                        aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE, bIsHiContrast );
+                    
+                    _pMenu->SetItemImage( nId, aImage );
+                }
+            }
+            else
+                _pMenu->SetItemImage( nId, Image() );
+        }
+    }
+}
 }
diff --git a/framework/source/classes/propertysethelper.cxx b/framework/source/classes/propertysethelper.cxx
index 40bb50cec..5e1c2d560 100644
--- a/framework/source/classes/propertysethelper.cxx
+++ b/framework/source/classes/propertysethelper.cxx
@@ -301,8 +301,7 @@ css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const ::rtl::OUString
         // <- SAFE
     }
 
-    css::uno::Any aValue = impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle);
-    return aValue;
+    return impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/framework/source/classes/protocolhandlercache.cxx b/framework/source/classes/protocolhandlercache.cxx
index 1b0510856..3a1c4131c 100644
--- a/framework/source/classes/protocolhandlercache.cxx
+++ b/framework/source/classes/protocolhandlercache.cxx
@@ -56,6 +56,7 @@
 //_________________________________________________________________________________________________________________
 #include <tools/wldcrd.hxx>
 #include <unotools/configpathes.hxx>
+#include <rtl/ustrbuf.hxx>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -299,15 +300,13 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
     sal_Int32 nTarget=0;
     for( nSource=0; nSource<nSourceCount; ++nSource )
     {
-        ::rtl::OUString sPath;
+        ::rtl::OUStringBuffer sPath( SETNAME_HANDLER );
+        sPath.append(CFG_PATH_SEPERATOR);
+        sPath.append(lNames[nSource]);
+        sPath.append(CFG_PATH_SEPERATOR);
+        sPath.append(PROPERTY_PROTOCOLS);
 
-        sPath  = SETNAME_HANDLER    ;
-        sPath += CFG_PATH_SEPERATOR ;
-        sPath += lNames[nSource]    ;
-        sPath += CFG_PATH_SEPERATOR ;
-
-        lFullNames[nTarget]  = sPath;
-        lFullNames[nTarget] += PROPERTY_PROTOCOLS;
+        lFullNames[nTarget]  = sPath.makeStringAndClear();
         ++nTarget;
     }
 
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 3471a22b8..2ab4e33b5 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -127,8 +127,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::
             ( TargetHelper::matchSpecialTarget(sName, TargetHelper::E_DEFAULT) )
            )
         {
-            css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(xSMGR, PACKAGE, RELPATH, KEY, ::comphelper::ConfigurationHelper::E_READONLY);
-            aVal >>= sCreator;
+            ::comphelper::ConfigurationHelper::readDirectKey(xSMGR, PACKAGE, RELPATH, KEY, ::comphelper::ConfigurationHelper::E_READONLY) >>= sCreator;
         }
 
         xCreator = css::uno::Reference< css::lang::XSingleServiceFactory >(
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index a35e3d251..f93613bcf 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -46,11 +46,8 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/CommandGroup.hpp>
-
-#ifndef __COM_SUN_STAR_AWT_XTOPWINDOW_HPP_
+#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
-#endif
-
 #include "com/sun/star/beans/XFastPropertySet.hpp"
 #include <toolkit/helper/vclunohelper.hxx>
 
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index b48a6568d..1bb33a335 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -185,7 +185,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
     // a) no interceptor at all - set this instance as master for given interceptor
     //    and set our slave as it's slave - and put this interceptor to the list.
     //    It's place there doesn matter. Because this list is currently empty.
-    if (m_lInterceptionRegs.size()<1)
+    if (m_lInterceptionRegs.empty())
     {
         xInterceptor->setMasterDispatchProvider(xThis   );
         xInterceptor->setSlaveDispatchProvider (m_xSlave);
@@ -333,7 +333,7 @@ void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent
     #if OSL_DEBUG_LEVEL > 0
     // SAFE ->
     aReadLock.lock();
-    if (m_lInterceptionRegs.size() > 0)
+    if (!m_lInterceptionRegs.empty() )
         OSL_ENSURE(sal_False, "There are some pending interceptor objects, which seams to be registered during (!) the destruction of a frame.");
     aReadLock.unlock();
     // <- SAFE
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 43c0da312..5fd964341 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -36,8 +36,9 @@
 //_________________________________________________________________________________________________________________
 #include <dispatch/menudispatcher.hxx>
 #include <general.h>
-#include <classes/menuconfiguration.hxx>
+#include <xml/menuconfiguration.hxx>
 #include <classes/addonmenu.hxx>
+#include <services.h>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -62,6 +63,7 @@
 #include <tools/rcid.h>
 #include <vos/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <rtl/logfile.hxx>
 
 //_________________________________________________________________________________________________________________
 //	includes of other projects
@@ -388,7 +390,7 @@ IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG )
     css::util::URL aURL;
     aURL.Complete = ::rtl::OUString::createFromAscii(".uno:CloseWin");
     css::uno::Reference< css::util::XURLTransformer >  xTrans ( m_xFactory->createInstance(
-                        ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer") ), css::uno::UNO_QUERY );
+                        SERVICENAME_URLTRANSFORMER ), css::uno::UNO_QUERY );
     if( xTrans.is() )
     {
         // Datei laden
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 73b94f43b..507f6a998 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -37,7 +37,7 @@
 
 #include <dispatch/popupmenudispatcher.hxx>
 #include <general.h>
-#include <classes/menuconfiguration.hxx>
+#include <xml/menuconfiguration.hxx>
 #include <classes/addonmenu.hxx>
 #include <services.h>
 #include <properties.h>
@@ -241,8 +241,7 @@ throw( css::uno::RuntimeException )
                 css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider;
                 
                 // Find popup menu controller using the base URL
-                Any a = xPopupCtrlQuery->getByName( aBaseURL );
-                a >>= xDispatchProvider;
+                xPopupCtrlQuery->getByName( aBaseURL ) >>= xDispatchProvider;
                 aGuard.unlock();
                 
                 // Ask popup menu dispatch provider for dispatch object
@@ -384,8 +383,7 @@ void PopupMenuDispatcher::impl_RetrievePopupControllerQuery()
             {
                 try
                 {
-                    Any a = xPropSet->getPropertyValue( FRAME_PROPNAME_LAYOUTMANAGER );
-                    a >>= xLayoutManager;
+                    xPropSet->getPropertyValue( FRAME_PROPNAME_LAYOUTMANAGER ) >>= xLayoutManager;
 
                     if ( xLayoutManager.is() )
                     {
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 6eb340ccb..531d6807e 100755
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -55,6 +55,7 @@
 #include <vcl/cmdevt.hxx>
 #include <vos/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <rtl/logfile.hxx>
 
 //_______________________________________________
 // namespace
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx
index ce533b2c1..607549584 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/helper/actiontriggerhelper.cxx
@@ -128,9 +128,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
             try
             {
                 Reference< XPropertySet > xPropSet;
-                Any a = xIndexAccess->getByIndex( i );
-
-                if (( a >>= xPropSet ) && ( xPropSet.is() ))
+                if (( xIndexAccess->getByIndex( i ) >>= xPropSet ) && ( xPropSet.is() ))
                 {
                     if ( IsSeparator( xPropSet ))
                     {
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index f6c33c700..cf8820145 100644
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -82,7 +82,6 @@ using namespace ::rtl							;
 DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor(	const	Reference< XFrame >&		xOwner	)
         //	Init baseclasses first
         :	ThreadHelpBase  ( &Application::GetSolarMutex() )
-        ,   OWeakObject		(			)
         // Init member
         ,	m_xOwner		( xOwner	)
 {
@@ -96,18 +95,6 @@ DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor()
 }
 
 //*****************************************************************************************************************
-//	XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_2(	DockingAreaDefaultAcceptor                                              ,
-                        OWeakObject								                                ,
-                        DIRECT_INTERFACE(XTypeProvider		                                )	,
-                        DIRECT_INTERFACE(::com::sun::star::ui::XDockingAreaAcceptor	)   )
-
-DEFINE_XTYPEPROVIDER_2(	DockingAreaDefaultAcceptor                          ,
-                        XTypeProvider							            ,
-                        ::com::sun::star::ui::XDockingAreaAcceptor	)
-
-//*****************************************************************************************************************
 //	XDockingAreaAcceptor
 //*****************************************************************************************************************
 css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException)
diff --git a/framework/source/helper/mischelper.cxx b/framework/source/helper/mischelper.cxx
index 395d59259..8e0f79b26 100644
--- a/framework/source/helper/mischelper.cxx
+++ b/framework/source/helper/mischelper.cxx
@@ -32,13 +32,21 @@
 #include "precompiled_framework.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
 #include <helper/mischelper.hxx>
+#include <services.h>
 
 
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
 
 namespace framework
 {
@@ -49,14 +57,10 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
     {
         try
         {
-            uno::Reference< lang::XMultiServiceFactory > xMgr ( comphelper::getProcessServiceFactory() );
-            if (xMgr.is())
-            {
-                m_xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(
-                        xMgr->createInstance(
-                            rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ),
-                            uno::UNO_QUERY );
-            }
+            m_xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(
+                    m_xServiceManager->createInstance(
+                        rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ),
+                        uno::UNO_QUERY );
         }
         catch (uno::Exception &r)
         {
@@ -66,6 +70,76 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
     }
     return m_xLanguageGuesser;
 }
+
+::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
+            ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&    _xServiceFactory
+            ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >&        _xUICommandLabels
+            ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame
+            ,::rtl::OUString& _rModuleIdentifier
+            ,sal_Bool& _rIni
+            ,const sal_Char* _pName)
+{
+    ::rtl::OUString aLabel;
+
+    // Retrieve popup menu labels
+    if ( !_xUICommandLabels.is() )
+    {
+        try
+        {
+            if ( !_rIni )
+            {
+                _rIni = sal_True;
+                Reference< XModuleManager > xModuleManager( _xServiceFactory->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
+
+                try
+                {
+                    _rModuleIdentifier = xModuleManager->identify( _xFrame );
+                }
+                catch( Exception& )
+                {
+                }
+            }
+
+            Reference< XNameAccess > xNameAccess( _xServiceFactory->createInstance( SERVICENAME_UICOMMANDDESCRIPTION ), UNO_QUERY );
+            if ( xNameAccess.is() )
+            {
+                xNameAccess->getByName( _rModuleIdentifier ) >>= _xUICommandLabels;
+            }
+        }
+        catch ( Exception& )
+        {
+        }
+    }
+
+    if ( _xUICommandLabels.is() )
+    {
+        try
+        {
+            if ( aCmdURL.getLength() > 0 )
+            {
+                rtl::OUString aStr;
+                Sequence< PropertyValue > aPropSeq;
+                if ( _xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq )
+                {
+                    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
+                    {
+                        if ( aPropSeq[i].Name.equalsAscii( _pName/*"Label"*/ ))
+                        {
+                            aPropSeq[i].Value >>= aStr;
+                            break;
+                        }
+                    }
+                }
+                aLabel = aStr;
+            }
+        }
+        catch ( com::sun::star::uno::Exception& )
+        {
+        }
+    }
+
+    return aLabel;
+}
     
 } // namespace framework
 
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 7ae53db8a..274f3cdd6 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -83,7 +83,6 @@ using namespace ::rtl							;
 OComponentAccess::OComponentAccess( const Reference< XDesktop >& xOwner )
         //	Init baseclasses first
         :   ThreadHelpBase  ( &Application::GetSolarMutex() )
-        ,   OWeakObject     (                               )
         // Init member
         ,   m_xOwner        ( xOwner                        )
 {
@@ -99,20 +98,6 @@ OComponentAccess::~OComponentAccess()
 }
 
 //*****************************************************************************************************************
-//	XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_3(	OComponentAccess						,
-                        OWeakObject								,
-                        DIRECT_INTERFACE(XTypeProvider		)	,
-                        DIRECT_INTERFACE(XEnumerationAccess	)	,
-                        DIRECT_INTERFACE(XElementAccess		)	)
-
-DEFINE_XTYPEPROVIDER_3(	OComponentAccess						,
-                        XTypeProvider							,
-                        XEnumerationAccess						,
-                        XElementAccess							)
-
-//*****************************************************************************************************************
 //	XEnumerationAccess
 //*****************************************************************************************************************
 Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException )
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index 347d09e6e..ed3866638 100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -85,7 +85,6 @@ OComponentEnumeration::OComponentEnumeration( const Sequence< Reference< XCompon
         //		we must garant right initialization and a valid value of this! First initialize
         //		baseclasses and then members. And we need the mutex for other baseclasses !!!
         :   ThreadHelpBase  ( &Application::GetSolarMutex() )
-        ,   OWeakObject     (                               )
         // Init member
         ,   m_nPosition     ( 0                             )   // 0 is the first position for a valid list and the right value for an invalid list to!
         ,   m_seqComponents ( seqComponents                 )
@@ -105,22 +104,6 @@ OComponentEnumeration::~OComponentEnumeration()
 }
 
 //*****************************************************************************************************************
-//	XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_3		(	OComponentEnumeration			,
-                            OWeakObject					  	,
-                            DIRECT_INTERFACE(XTypeProvider	),
-                            DIRECT_INTERFACE(XEventListener	),
-                            DIRECT_INTERFACE(XEnumeration	)
-                        )
-
-DEFINE_XTYPEPROVIDER_3	(	OComponentEnumeration			,
-                            XTypeProvider					,
-                            XEventListener					,
-                            XEnumeration
-                        )
-
-//*****************************************************************************************************************
 //	XEventListener
 //*****************************************************************************************************************
 void SAL_CALL OComponentEnumeration::disposing( const EventObject&
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 68730bc59..43f968225 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -87,7 +87,6 @@ OFrames::OFrames(	const	Reference< XMultiServiceFactory >&	xFactory		,
                             FrameContainer*						pFrameContainer	)
         //	Init baseclasses first
         :   ThreadHelpBase              ( &Application::GetSolarMutex() )
-        ,   OWeakObject                 (                               )
         // Init member
         ,   m_xFactory                  ( xFactory                      )
         ,   m_xOwner                    ( xOwner                        )
@@ -109,24 +108,6 @@ OFrames::~OFrames()
 }
 
 //*****************************************************************************************************************
-//	XInterface
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_4     (   OFrames                         ,
-                            OWeakObject					  	,
-                            DIRECT_INTERFACE(XTypeProvider  ),
-                            DIRECT_INTERFACE(XFrames		),
-                            DIRECT_INTERFACE(XIndexAccess	),
-                            DIRECT_INTERFACE(XElementAccess	)
-                        )
-
-DEFINE_XTYPEPROVIDER_4  (   OFrames        ,
-                            XTypeProvider  ,
-                            XFrames        ,
-                            XIndexAccess   ,
-                            XElementAccess
-                        )
-
-//*****************************************************************************************************************
 //	XFrames
 //*****************************************************************************************************************
 void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( RuntimeException )
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 02eb74d98..de7fa59ee 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -240,12 +240,11 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
     
     try
     {
-        css::uno::Any aWindowState = ::comphelper::ConfigurationHelper::readDirectKey(xSMGR,
+        ::comphelper::ConfigurationHelper::readDirectKey(xSMGR,
                                                                                       sPackage,
                                                                                       sRelPath,
                                                                                       sKey,
-                                                                                      ::comphelper::ConfigurationHelper::E_READONLY);
-        aWindowState >>= sWindowState;
+                                                                                      ::comphelper::ConfigurationHelper::E_READONLY) >>= sWindowState;
     }
     catch(const css::uno::RuntimeException& exRun)
         { throw exRun; }
diff --git a/framework/source/helper/popupmenucontrollerbase.cxx b/framework/source/helper/popupmenucontrollerbase.cxx
index 29a9a0688..e8215eccc 100644
--- a/framework/source/helper/popupmenucontrollerbase.cxx
+++ b/framework/source/helper/popupmenucontrollerbase.cxx
@@ -44,9 +44,8 @@
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //	includes of other projects
@@ -57,7 +56,7 @@
 #endif
 #include <vcl/svapp.hxx>
 #include <rtl/ustrbuf.hxx>
-
+#include <rtl/logfile.hxx>
 //_________________________________________________________________________________________________________________
 //	Defines
 //_________________________________________________________________________________________________________________
@@ -111,6 +110,10 @@ PopupMenuControllerBase::PopupMenuControllerBase( const ::com::sun::star::uno::R
     m_xServiceManager( xServiceManager ),
     m_aListenerContainer( m_aLock.getShareableOslMutex() )
 {
+    if ( m_xServiceManager.is() )
+        m_xURLTransformer.set( m_xServiceManager->createInstance(
+                                                                SERVICENAME_URLTRANSFORMER),
+                                                             UNO_QUERY );
 }
 
 PopupMenuControllerBase::~PopupMenuControllerBase()
@@ -178,10 +181,12 @@ void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) throw ( R
 // XMenuListener
 void SAL_CALL PopupMenuControllerBase::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
-    
-    if ( m_bDisposed )
-        throw DisposedException();
+}
+
+void PopupMenuControllerBase::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL)
+{
+    Sequence<PropertyValue>	     aArgs;
+    _xDispatch->dispatch( aURL, aArgs );
 }
 
 void SAL_CALL PopupMenuControllerBase::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
@@ -205,37 +210,24 @@ void SAL_CALL PopupMenuControllerBase::select( const css::awt::MenuEvent& rEvent
         if ( pPopupMenu )
         {
             css::util::URL               aTargetURL;
-            Sequence<PropertyValue>	     aArgs;
-            Reference< XURLTransformer > xURLTransformer( xServiceManager->createInstance( 
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                        UNO_QUERY );
-
             {
                 vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
                 PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
                 aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId );
             }
 
-            xURLTransformer->parseStrict( aTargetURL );
-            xDispatch->dispatch( aTargetURL, aArgs );
+            m_xURLTransformer->parseStrict( aTargetURL );
+            impl_select(xDispatch,aTargetURL);
         }
     }
 }
 
 void SAL_CALL PopupMenuControllerBase::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
-    
-    if ( m_bDisposed )
-        throw DisposedException();
 }
 
 void SAL_CALL PopupMenuControllerBase::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
-    
-    if ( m_bDisposed )
-        throw DisposedException();
 }
 
 void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
@@ -247,12 +239,9 @@ void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::sta
     
     Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
     Reference< XDispatch > xDispatch( m_xDispatch );
-    Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
-                                                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                UNO_QUERY );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = m_aCommandURL;
-    xURLTransformer->parseStrict( aTargetURL );
+    m_xURLTransformer->parseStrict( aTargetURL );
     aLock.unlock();
 
     // Add/remove status listener to get a status update once
@@ -279,10 +268,7 @@ throw( RuntimeException )
     return Reference< XDispatch >();
 }
 
-Sequence< Reference< XDispatch > > SAL_CALL 
-PopupMenuControllerBase::queryDispatches( 
-    const Sequence< DispatchDescriptor >& lDescriptor ) 
-throw( RuntimeException )
+Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispatches( const Sequence< DispatchDescriptor >& lDescriptor ) throw( RuntimeException )
 {
     // Create return list - which must have same size then the given descriptor
     // It's not allowed to pack it!
@@ -381,9 +367,6 @@ throw( ::com::sun::star::uno::RuntimeException )
 // XInitialization
 void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    const rtl::OUString aFrameName( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-    const rtl::OUString aCommandURLName( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
-
     ResetableGuard aLock( m_aLock );
     
     sal_Bool bInitalized( m_bInitialized );
@@ -413,5 +396,35 @@ void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArgum
         }
     }
 }
+// XPopupMenuController
+void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
+{
+    ResetableGuard aLock( m_aLock );
+
+    if ( m_bDisposed )
+        throw DisposedException();
+    
+    if ( m_xFrame.is() && !m_xPopupMenu.is() )
+    {
+        // Create popup menu on demand
+        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
         
+        m_xPopupMenu = xPopupMenu;
+        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
+            
+        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
+        
+        com::sun::star::util::URL aTargetURL;
+        aTargetURL.Complete = m_aCommandURL;
+        m_xURLTransformer->parseStrict( aTargetURL );
+        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+
+        impl_setPopupMenu();
+
+        updatePopupMenu();
+    }    
+}
+void PopupMenuControllerBase::impl_setPopupMenu()
+{
+}
 }
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index ec2ca0071..1db613237 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -336,8 +336,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
     {
         try
         {
-            css::uno::Any aID = xSet->getPropertyValue( CONTROLLER_PROPNAME_ICONID );
-            aID >>= nIcon;
+            xSet->getPropertyValue( CONTROLLER_PROPNAME_ICONID ) >>= nIcon;
         }
         catch(const css::uno::Exception&)
         {}
diff --git a/framework/source/helper/titlehelper.cxx b/framework/source/helper/titlehelper.cxx
index 4c83be7f6..2eb1707ae 100644
--- a/framework/source/helper/titlehelper.cxx
+++ b/framework/source/helper/titlehelper.cxx
@@ -521,7 +521,7 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram
     impl_appendProductName      (sTitle);
     impl_appendModuleName       (sTitle);
     impl_appendProductExtension (sTitle);
-    impl_appendEvalVersion      (sTitle);
+    //impl_appendEvalVersion      (sTitle);
     impl_appendDebugVersion     (sTitle);
     
     // SYNCHRONIZED ->
@@ -633,29 +633,29 @@ void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer&)
 #endif
 
 //*****************************************************************************************************************
-void TitleHelper::impl_appendEvalVersion (::rtl::OUStringBuffer& sTitle)
+void TitleHelper::impl_appendEvalVersion (::rtl::OUStringBuffer& /*sTitle*/)
 {
     // SYNCHRONIZED ->
-    ::osl::ResettableMutexGuard aLock(m_aMutex);
-    css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR ;
-    aLock.clear ();
-    // <- SYNCHRONIZED
-
-    css::uno::Reference< css::beans::XMaterialHolder > xHolder(
-        xSMGR->createInstance(SERVICENAME_TABREG),
-        css::uno::UNO_QUERY);
-
-    if ( ! xHolder.is())
-        return;
-
-          ::comphelper::SequenceAsHashMap aMaterial(xHolder->getMaterial());
-    const ::rtl::OUString				  sEvalTitle = aMaterial.getUnpackedValueOrDefault(TABREG_PROPNAME_TITLE, ::rtl::OUString());
-
-    if (sEvalTitle.getLength())
-    {
-        sTitle.appendAscii (" "		  );
-        sTitle.append	   (sEvalTitle);
-    }
+ //   ::osl::ResettableMutexGuard aLock(m_aMutex);
+ //   css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR ;
+    //aLock.clear ();
+    //// <- SYNCHRONIZED
+
+    //css::uno::Reference< css::beans::XMaterialHolder > xHolder(
+ //       xSMGR->createInstance(SERVICENAME_TABREG),
+    //	css::uno::UNO_QUERY);
+
+ //   if ( ! xHolder.is())
+    //	return;
+
+    //	  ::comphelper::SequenceAsHashMap aMaterial(xHolder->getMaterial());
+    //const ::rtl::OUString				  sEvalTitle = aMaterial.getUnpackedValueOrDefault(TABREG_PROPNAME_TITLE, ::rtl::OUString());
+
+    //if (sEvalTitle.getLength())
+    //{
+    //	sTitle.appendAscii (" "		  );
+    //	sTitle.append	   (sEvalTitle);
+    //}
 }
 
 //-----------------------------------------------
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 87a19fa5f..23ac2c8a7 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -38,6 +38,8 @@
 #include <general.h>
 #include <properties.h>
 #include <threadhelp/resetableguard.hxx>
+#include <uielement/constitemcontainer.hxx>
+#include <uielement/rootitemcontainer.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -46,11 +48,13 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/ui/XUIConfiguration.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //	includes of other projects
 //_________________________________________________________________________________________________________________
 #include <vcl/svapp.hxx>
+#include <rtl/logfile.hxx>
 
 const int UIELEMENT_PROPHANDLE_CONFIGSOURCE     = 1;
 const int UIELEMENT_PROPHANDLE_FRAME            = 2;
@@ -75,6 +79,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::lang;
+using namespace com::sun::star::container;
 using namespace ::com::sun::star::ui;
 
 namespace framework
@@ -110,7 +115,7 @@ DEFINE_XTYPEPROVIDER_10 (   UIConfigElementWrapperBase
                             ::com::sun::star::ui::XUIConfigurationListener
                         )
 
-UIConfigElementWrapperBase::UIConfigElementWrapperBase( sal_Int16 nType )
+UIConfigElementWrapperBase::UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory )
     :   ThreadHelpBase              ( &Application::GetSolarMutex()                      )
     ,   ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() )
     ,   ::cppu::OPropertySetHelper  ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
@@ -122,6 +127,7 @@ UIConfigElementWrapperBase::UIConfigElementWrapperBase( sal_Int16 nType )
     ,   m_bConfigListening          ( sal_False                                         )
     ,   m_bDisposed                 ( sal_False                                         )
     ,   m_bNoClose                  ( sal_False                                         )
+    ,   m_xServiceFactory           ( _xServiceFactory                                  )
     ,   m_aListenerContainer        ( m_aLock.getShareableOslMutex()                    )
 {
 }
@@ -493,5 +499,58 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigE
     // Return static "PropertyDescriptor"
     return lPropertyDescriptor;
 }
+void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException )
+{
+    ResetableGuard aLock( m_aLock );
+
+    //if ( m_bDisposed )
+    //    throw DisposedException();
+
+    if ( xSettings.is() )
+    {
+        // Create a copy of the data if the container is not const
+        Reference< XIndexReplace > xReplace( xSettings, UNO_QUERY );
+        if ( xReplace.is() )
+            m_xConfigData = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xSettings ) ), UNO_QUERY );
+        else
+            m_xConfigData = xSettings;
+
+        if ( m_xConfigSource.is() && m_bPersistent )
+        {
+            ::rtl::OUString aResourceURL( m_aResourceURL );
+            Reference< XUIConfigurationManager > xUICfgMgr( m_xConfigSource );
+
+            aLock.unlock();
+
+            try
+            {
+                xUICfgMgr->replaceSettings( aResourceURL, m_xConfigData );
+            }
+            catch( NoSuchElementException& )
+            {
+            }
+        }
+        else if ( !m_bPersistent )
+        {
+            // Transient menubar => Fill menubar with new data
+            impl_fillNewData();
+        }
+    }
+}
+void UIConfigElementWrapperBase::impl_fillNewData()
+{
+}
+Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable ) throw ( RuntimeException )
+{
+    ResetableGuard aLock( m_aLock );
+
+    //if ( m_bDisposed )
+    //    throw DisposedException();
+
+    if ( bWriteable )
+        return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY );
+    
+    return m_xConfigData;
+}
 
 }
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index e417ac95b..64a08326e 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -50,6 +50,7 @@
 //	includes of other projects
 //_________________________________________________________________________________________________________________
 #include <vcl/svapp.hxx>
+#include <rtl/logfile.hxx>
 
 const int UIELEMENT_PROPHANDLE_RESOURCEURL  = 1;
 const int UIELEMENT_PROPHANDLE_TYPE         = 2;
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 5e4594dc9..57d000121 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -37,6 +37,7 @@
 #include <accelerators/istoragelistener.hxx>
 #include <accelerators/presethandler.hxx>
 #include <accelerators/acceleratorcache.hxx>
+#include <accelerators/keymapping.hxx>
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -67,6 +68,7 @@
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/locale.hxx>
+#include <salhelper/singletonref.hxx>
 
 //__________________________________________
 // definition
@@ -75,7 +77,7 @@ namespace framework
 {
 //-----------------------------------------------
 // Accelerators.xcu
-static const ::rtl::OUString CFG_ENTRY_ACCELERATORS	= ::rtl::OUString::createFromAscii("org.openoffice.Office.Accelerators");
+
 static const ::rtl::OUString CFG_ENTRY_PRIMARY	    = ::rtl::OUString::createFromAscii("PrimaryKeys");
 static const ::rtl::OUString CFG_ENTRY_SECONDARY	= ::rtl::OUString::createFromAscii("SecondaryKeys");
 
@@ -338,6 +340,8 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
         ::rtl::OUString m_sGlobalOrModules;
         ::rtl::OUString m_sModuleCFG;
 
+        ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
+
         //______________________________________
         // native interface!
 
diff --git a/framework/source/inc/dispatch/uieventloghelper.hxx b/framework/source/inc/dispatch/uieventloghelper.hxx
index 872545448..9b425077c 100644
--- a/framework/source/inc/dispatch/uieventloghelper.hxx
+++ b/framework/source/inc/dispatch/uieventloghelper.hxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/util/URL.hpp>
 #include <comphelper/uieventslogger.hxx>
 #include <rtl/ustring.hxx>
+#include <services.h>
 
 namespace framework
 {
@@ -61,7 +62,7 @@ namespace framework
                 {
                     try
                     {
-                        static ::rtl::OUString our_aModuleManagerName = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager"); 
+                        static ::rtl::OUString our_aModuleManagerName = SERVICENAME_MODULEMANAGER; 
                         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager(
                             rServiceManager->createInstance(our_aModuleManagerName)
                             , ::com::sun::star::uno::UNO_QUERY_THROW);
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 6e8a96730..16167e39c 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 
 //_______________________________________________
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index ec383a831..0c4765933 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -85,19 +85,6 @@ static ::rtl::OUString ENVTYPE_DOCUMENTEVENT    = ::rtl::OUString::createFromAsc
 
 //-----------------------------------------------
 
-DEFINE_XINTERFACE_4(HelpOnStartup                              ,
-                    OWeakObject                                ,
-                    DIRECT_INTERFACE(css::lang::XTypeProvider ),
-                    DIRECT_INTERFACE(css::lang::XServiceInfo  ),
-                    DIRECT_INTERFACE(css::task::XJob          ),
-                    DIRECT_INTERFACE(css::lang::XEventListener))
-
-DEFINE_XTYPEPROVIDER_4(HelpOnStartup            ,
-                       css::lang::XTypeProvider ,
-                       css::lang::XServiceInfo  ,
-                       css::task::XJob          ,
-                       css::lang::XEventListener)
-
 DEFINE_XSERVICEINFO_MULTISERVICE(HelpOnStartup                   ,
                                       ::cppu::OWeakObject             ,
                                       SERVICENAME_JOB                 ,
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 257c8772a..2609a5773 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -45,11 +45,13 @@
 #include <com/sun/star/task/XAsyncJob.hpp>
 #include <com/sun/star/util/XCloseBroadcaster.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //________________________________
 //	includes of other projects
 #include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
+#include <comphelper/uieventslogger.hxx>
 
 //________________________________
 //	namespace
@@ -236,6 +238,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD
     // Otherwhise we might die by ref count ...
     css::uno::Reference< css::task::XJobListener > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
 
+    if ( ::comphelper::UiEventsLogger::isEnabled() )
     try
     {
         // create the job
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 8e395a15a..bb04f4f09 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -660,23 +660,20 @@ css::uno::Sequence< ::rtl::OUString > JobData::getEnabledJobsForEvent( const css
 
     for (sal_Int32 s=0; s<c; ++s)
     {
-        css::uno::Any aNode = xJobList->getByName(pAllJobs[s]);
         css::uno::Reference< css::beans::XPropertySet > xJob;
         if (
-            !(aNode >>= xJob) ||
+            !(xJobList->getByName(pAllJobs[s]) >>= xJob) ||
             !(xJob.is()     )
            )
         {
            continue;
         }
 
-        aNode = xJob->getPropertyValue(ADMINTIME);
         ::rtl::OUString sAdminTime;
-        aNode >>= sAdminTime;
+        xJob->getPropertyValue(ADMINTIME) >>= sAdminTime;
 
-        aNode = xJob->getPropertyValue(USERTIME);
         ::rtl::OUString sUserTime;
-        aNode >>= sUserTime;
+        xJob->getPropertyValue(USERTIME) >>= sUserTime;
 
         if (!isEnabled(sAdminTime, sUserTime))
             continue;
diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx
index faffb74ab..98a082118 100644
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
@@ -138,7 +138,7 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult )
 
     // analyze the result and actualize our other members
     ::comphelper::SequenceAsHashMap aProtocol(aResult);
-    if (aProtocol.size() < 1)
+    if ( aProtocol.empty() )
         return;
 
     ::comphelper::SequenceAsHashMap::const_iterator pIt = aProtocol.end();
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index 974561915..0bafb763a 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -80,17 +80,6 @@ static const ::rtl::OUString PROP_CHECKEXITCODE = ::rtl::OUString::createFromAsc
 
 //-----------------------------------------------
 
-DEFINE_XINTERFACE_3(ShellJob                                   ,
-                    OWeakObject                                ,
-                    DIRECT_INTERFACE(css::lang::XTypeProvider ),
-                    DIRECT_INTERFACE(css::lang::XServiceInfo  ),
-                    DIRECT_INTERFACE(css::task::XJob          ))
-
-DEFINE_XTYPEPROVIDER_3(ShellJob                 ,
-                       css::lang::XTypeProvider ,
-                       css::lang::XServiceInfo  ,
-                       css::task::XJob          )
-
 DEFINE_XSERVICEINFO_MULTISERVICE(ShellJob                   ,
                                  ::cppu::OWeakObject        ,
                                  SERVICENAME_JOB            ,
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 9e81fae21..3ea3d2759 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -86,6 +86,7 @@
 #include <com/sun/star/frame/LayoutManagerEvents.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XDispatchHelper.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //	other includes
@@ -107,7 +108,7 @@
 #include <svtools/cmdoptions.hxx>
 
 #include <algorithm>
-
+#include <boost/bind.hpp>
 // ______________________________________________
 //	using namespace
 
@@ -131,6 +132,26 @@ using namespace ::com::sun::star::frame;
 // You have to change BOTH values, see sfx2/inc/sfx2/sfxsids.hrc (SID_DOCKWIN_START)
 static const sal_Int32 DOCKWIN_ID_BASE = 9800;
 
+bool lcl_checkUIElement(const Reference< XUIElement >& xUIElement,css::awt::Rectangle& _rPosSize,Reference< css::awt::XWindow >& _xWindow)
+{
+    bool bRet = xUIElement.is();
+    if ( bRet )
+    {
+        vos::OGuard	aGuard( Application::GetSolarMutex() );
+        _xWindow.set( xUIElement->getRealInterface(), UNO_QUERY );
+        _rPosSize = _xWindow->getPosSize();
+
+        Window* pWindow = VCLUnoHelper::GetWindow( _xWindow );
+        if ( pWindow->GetType() == WINDOW_TOOLBOX )
+        {
+            ::Size aSize = ((ToolBox*)pWindow)->CalcWindowSizePixel( 1 );
+            _rPosSize.Width = aSize.Width();
+            _rPosSize.Height = aSize.Height();
+        }
+    } // if ( xUIElement.is() )
+    return bRet;
+}
+
 // convert alignment constant to vcl's WindowAlign type
 static WindowAlign ImplConvertAlignment( sal_Int16 aAlignment )
 {
@@ -200,15 +221,10 @@ bool LayoutManager::UIElement::operator< ( const LayoutManager::UIElement& aUIEl
                         bool bEqual = ( m_aDockedData.m_aPos.X() == aUIElement.m_aDockedData.m_aPos.X() );
                         if ( bEqual )
                         {
-                            if ( m_bUserActive && !aUIElement.m_bUserActive )
-                                return sal_True;
-                            else if ( !m_bUserActive && aUIElement.m_bUserActive )
-                                return sal_False;
-                            else
-                                return sal_False;
+                            return m_bUserActive && !aUIElement.m_bUserActive;
                         }
                         else
-                            return ( m_aDockedData.m_aPos.X() <= aUIElement.m_aDockedData.m_aPos.X() );
+                            return ( m_aDockedData.m_aPos.X() < aUIElement.m_aDockedData.m_aPos.X() );
                     }
                 }
                 else
@@ -220,15 +236,10 @@ bool LayoutManager::UIElement::operator< ( const LayoutManager::UIElement& aUIEl
                         bool bEqual = ( m_aDockedData.m_aPos.Y() == aUIElement.m_aDockedData.m_aPos.Y() );
                         if ( bEqual )
                         {
-                            if ( m_bUserActive && !aUIElement.m_bUserActive )
-                                return sal_True;
-                            else if ( !m_bUserActive && aUIElement.m_bUserActive )
-                                return sal_False;
-                            else
-                                return sal_False;
+                            return m_bUserActive && !aUIElement.m_bUserActive;
                         }
                         else
-                            return ( m_aDockedData.m_aPos.Y() <= aUIElement.m_aDockedData.m_aPos.Y() );
+                            return ( m_aDockedData.m_aPos.Y() < aUIElement.m_aDockedData.m_aPos.Y() );
                     }
                 }
             }
@@ -394,7 +405,7 @@ LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceM
         ,   ::cppu::OWeakObject         (                                                   )
         ,   m_xSMGR( xServiceManager )
         ,   m_xURLTransformer( Reference< XURLTransformer >( xServiceManager->createInstance(
-                                                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
+                                                                SERVICENAME_URLTRANSFORMER),
                                                              UNO_QUERY ))
         ,   m_nLockCount( 0 )
         ,   m_bActive( sal_False )
@@ -493,8 +504,7 @@ void LayoutManager::impl_clearUpMenuBar()
                 {
                     try
                     {
-                        Any a = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" )));
-                        a >>= xMenuBar;
+                        xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" ))) >>= xMenuBar;
                     }
                     catch ( com::sun::star::beans::UnknownPropertyException )
                     {
@@ -821,7 +831,8 @@ void LayoutManager::implts_destroyDockingAreaWindows()
     aWriteLock.unlock();
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
-    for ( sal_Int32 i=0; i < (sal_Int32)oldDockingAreaWindows.size(); i++ )
+    const sal_uInt32 nCount = oldDockingAreaWindows.size();
+    for ( sal_uInt32 i=0; i < nCount; i++ )
     {
         if ( oldDockingAreaWindows[i].is() )
         {
@@ -957,13 +968,13 @@ void LayoutManager::implts_createAddonsToolBars()
 
     Sequence< PropertyValue > aPropSeq( 2 );
     aPropSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-    aPropSeq[0].Value = makeAny( xFrame );
+    aPropSeq[0].Value <<= xFrame;
     aPropSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationData" ));
     for ( sal_uInt32 i = 0; i < nCount; i++ )
     {
         ::rtl::OUString aAddonToolBarName( aAddonsToolBarStaticName + m_pAddonOptions->GetAddonsToolbarResourceName(i) );
         aAddonToolBarData = m_pAddonOptions->GetAddonsToolBarPart( i );
-        aPropSeq[1].Value = makeAny( aAddonToolBarData );
+        aPropSeq[1].Value <<= aAddonToolBarData;
 
         aWriteLock.lock();
         UIElement aElement = impl_findElement( aAddonToolBarName );
@@ -1072,15 +1083,16 @@ void LayoutManager::implts_createNonContextSensitiveToolBars()
 
     try
     {
-        rtl::OUString aElementType;
-        rtl::OUString aElementName;
-        rtl::OUString aName;
-
-        Reference< ::com::sun::star::ui::XUIElement > xUIElement;
         Sequence< rtl::OUString > aToolbarNames = xPersistentWindowState->getElementNames();
 
         if ( aToolbarNames.getLength() > 0 )
         {
+            rtl::OUString aElementType;
+            rtl::OUString aElementName;
+            rtl::OUString aName;
+
+            Reference< ::com::sun::star::ui::XUIElement > xUIElement;
+            aMakeVisibleToolbars.reserve(aToolbarNames.getLength());
             WriteGuard aWriteLock( m_aLock );
 
             const rtl::OUString* pTbNames = aToolbarNames.getConstArray();
@@ -1120,12 +1132,10 @@ void LayoutManager::implts_createNonContextSensitiveToolBars()
     {
     }
 
-    if ( aMakeVisibleToolbars.size() > 0 )
+    if ( !aMakeVisibleToolbars.empty() )
     {
         implts_lock();
-        for ( sal_uInt32 i = 0; i < aMakeVisibleToolbars.size(); i++ )
-            requestElement( aMakeVisibleToolbars[i] );
-
+        ::std::for_each( aMakeVisibleToolbars.begin(), aMakeVisibleToolbars.end(),::boost::bind( &LayoutManager::requestElement, this,_1 ));
         implts_unlock();
     }
 }
@@ -1368,7 +1378,8 @@ void LayoutManager::implts_refreshContextToolbarsVisibility()
     aReadLock.unlock();
 
     UIElement aUIElement;
-    for ( sal_uInt32 i = 0; i < aToolbarVisibleVector.size(); i++ )
+    const sal_uInt32 nCount = aToolbarVisibleVector.size();
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
     {
         UIElementVisibility& rToolbar = aToolbarVisibleVector[i];
 
@@ -1411,10 +1422,8 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
 
         try
         {
-            Any a;
             Sequence< PropertyValue > aWindowState;
-            a = xPersistentWindowState->getByName( aName );
-            if ( a >>= aWindowState )
+            if ( xPersistentWindowState->getByName( aName ) >>= aWindowState )
             {
                 sal_Bool bValue( sal_False );
                 for ( sal_Int32 n = 0; n < aWindowState.getLength(); n++ )
@@ -1579,18 +1588,18 @@ void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, con
             aPos.X = rElementData.m_aDockedData.m_aPos.X();
             aPos.Y = rElementData.m_aDockedData.m_aPos.Y();
             aWindowState[3].Name    = m_aPropDockPos;
-            aWindowState[3].Value   = makeAny( aPos );
+            aWindowState[3].Value   <<= aPos;
 
             aPos.X = rElementData.m_aFloatingData.m_aPos.X();
             aPos.Y = rElementData.m_aFloatingData.m_aPos.Y();
             aWindowState[4].Name    = m_aPropPos;
-            aWindowState[4].Value   = makeAny( aPos );
+            aWindowState[4].Value   <<= aPos;
 
             css::awt::Size aSize;
             aSize.Width = rElementData.m_aFloatingData.m_aSize.Width();
             aSize.Height = rElementData.m_aFloatingData.m_aSize.Height();
             aWindowState[5].Name    = m_aPropSize;
-            aWindowState[5].Value   = makeAny( aSize );
+            aWindowState[5].Value   <<= aSize;
             aWindowState[6].Name    = m_aPropUIName;
             aWindowState[6].Value   = makeAny( rElementData.m_aUIName );
             aWindowState[7].Name    = m_aPropLocked;
@@ -1799,7 +1808,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference<
         {
             Reference< css::awt::XDockableWindow > xDockWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
             Reference< css::awt::XWindow > xWindow( xDockWindow, UNO_QUERY );
-            if ( xDockWindow.is() && xWindow.is() && xDockWindow->isFloating() )
+            if ( xDockWindow.is() && xDockWindow->isFloating() )
             {
                 vos::OGuard	aGuard( Application::GetSolarMutex() );
                 Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
@@ -1864,7 +1873,8 @@ void LayoutManager::implts_findNextDockingPos( DockingArea DockingArea, const ::
 
     implts_getDockingAreaElementInfos( DockingArea, aRowColumnsWindowData );
     sal_Int32 nPixelPos( 0 );
-    for ( sal_Int32 i = 0; i < sal_Int32( aRowColumnsWindowData.size()); i++ )
+    const sal_uInt32 nCount = aRowColumnsWindowData.size();
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
     {
         SingleRowColumnWindowData& rRowColumnWindowData = aRowColumnsWindowData[i];
 
@@ -1877,7 +1887,8 @@ void LayoutManager::implts_findNextDockingPos( DockingArea DockingArea, const ::
         {
             // Check current row where we can find the needed space
             sal_Int32 nCurrPos( 0 );
-            for ( sal_Int32 j = 0; j < sal_Int32( rRowColumnWindowData.aRowColumnWindowSizes.size()); j++ )
+            const sal_uInt32 nWindowSizesCount = rRowColumnWindowData.aRowColumnWindowSizes.size();
+            for ( sal_uInt32 j = 0; j < nWindowSizesCount; j++ )
             {
                 css::awt::Rectangle rRect   = rRowColumnWindowData.aRowColumnWindowSizes[j];
                 sal_Int32&          rSpace  = rRowColumnWindowData.aRowColumnSpace[j];
@@ -1999,7 +2010,8 @@ void LayoutManager::implts_sortUIElements()
     UIElementVector::iterator pIter;
     for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
     {
-        if ( pIter->m_bUserActive )
+        // why check, just set it to false
+        //if ( pIter->m_bUserActive )
             pIter->m_bUserActive = sal_False;
     }
 
@@ -2021,24 +2033,22 @@ void LayoutManager::implts_getDockingAreaElementInfos( DockingArea eDockingArea,
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
+    aWindowVector.reserve(m_aUIElements.size());
     xDockAreaWindow = m_xDockAreaWindows[eDockingArea];
     UIElementVector::iterator   pIter;
     for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
     {
-        if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea )
+        if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea && pIter->m_bVisible && !pIter->m_bFloating )
         {
             Reference< XUIElement > xUIElement( pIter->m_xUIElement );
             if ( xUIElement.is() )
             {
                 Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                if ( xWindow.is() )
+                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
+                if ( xDockWindow.is() )
                 {
-                    Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-                    if ( xDockWindow.is() && pIter->m_bVisible && !pIter->m_bFloating )
-                    {
-                        // docked windows
-                        aWindowVector.push_back( *pIter );
-                    }
+                    // docked windows
+                    aWindowVector.push_back( *pIter );
                 }
             }
         }
@@ -2068,29 +2078,15 @@ void LayoutManager::implts_getDockingAreaElementInfos( DockingArea eDockingArea,
     else
         nLastRowColPixelPos = aDockAreaRect.Width;
 
-    for ( j = 0; j < sal_Int32( aWindowVector.size()); j++ )
+    const sal_uInt32 nCount = aWindowVector.size();
+    for ( j = 0; j < sal_Int32( nCount); j++ )
     {
         const UIElement& rElement = aWindowVector[j];
         Reference< css::awt::XWindow > xWindow;
         Reference< XUIElement > xUIElement( rElement.m_xUIElement );
         css::awt::Rectangle aPosSize;
-        if ( xUIElement.is() )
-        {
-            vos::OGuard	aGuard( Application::GetSolarMutex() );
-            xWindow = Reference< css::awt::XWindow >( xUIElement->getRealInterface(), UNO_QUERY );
-            aPosSize = xWindow->getPosSize();
-
-            Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-            if ( pWindow->GetType() == WINDOW_TOOLBOX )
-            {
-                ::Size aSize = ((ToolBox*)pWindow)->CalcWindowSizePixel( 1 );
-                aPosSize.Width = aSize.Width();
-                aPosSize.Height = aSize.Height();
-            }
-        }
-        else
+        if ( !lcl_checkUIElement(xUIElement,aPosSize,xWindow) )
             continue;
-
         if (( eDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
             ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
         {
@@ -2225,7 +2221,8 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
     UIElementVector::iterator   pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    UIElementVector::iterator   pEnd = m_aUIElements.end();
+    for ( pIter = m_aUIElements.begin(); pIter != pEnd; pIter++ )
     {
         if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea )
         {
@@ -2268,33 +2265,21 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea
     sal_Int32 j;
     sal_Int32 nLastPos( 0 );
 
-    for ( j = 0; j < sal_Int32( aWindowVector.size()); j++ )
+    const sal_uInt32 nCount = aWindowVector.size();
+    for ( j = 0; j < sal_Int32( nCount); j++ )
     {
         const UIElement& rElement = aWindowVector[j];
         Reference< css::awt::XWindow > xWindow;
         Reference< XUIElement > xUIElement( rElement.m_xUIElement );
         css::awt::Rectangle aPosSize;
-        if ( xUIElement.is() )
-        {
-            vos::OGuard	aGuard( Application::GetSolarMutex() );
-            xWindow = Reference< css::awt::XWindow >( xUIElement->getRealInterface(), UNO_QUERY );
-            aPosSize = xWindow->getPosSize();
-
-            Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-            if ( pWindow->GetType() == WINDOW_TOOLBOX )
-            {
-                ::Size aSize = ((ToolBox*)pWindow)->CalcWindowSizePixel( 1 );
-                aPosSize.Width = aSize.Width();
-                aPosSize.Height = aSize.Height();
-            }
-        }
-        else
+        if ( !lcl_checkUIElement(xUIElement,aPosSize,xWindow) )
             continue;
 
+        sal_Int32 nSpace;
         if (( eDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
             ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
         {
-            sal_Int32 nSpace( rElement.m_aDockedData.m_aPos.X() - nLastPos );
+            nSpace = ( rElement.m_aDockedData.m_aPos.X() - nLastPos );
 
             // Calc space before an element and store it
             if ( rElement.m_aDockedData.m_aPos.X() > nLastPos )
@@ -2302,11 +2287,9 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea
             else
                 nSpace = 0;
 
-            rRowColumnWindowData.aRowColumnSpace.push_back( nSpace );
             nLastPos = rElement.m_aDockedData.m_aPos.X() + aPosSize.Width;
 
-            rRowColumnWindowData.aRowColumnWindows.push_back( xWindow );
-            rRowColumnWindowData.aUIElementNames.push_back( rElement.m_aName );
+            
             rRowColumnWindowData.aRowColumnWindowSizes.push_back(
                 css::awt::Rectangle( rElement.m_aDockedData.m_aPos.X(),
                                      rElement.m_aDockedData.m_aPos.Y(),
@@ -2314,21 +2297,19 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea
                                      aPosSize.Height ));
             if ( rRowColumnWindowData.nStaticSize < aPosSize.Height )
                 rRowColumnWindowData.nStaticSize = aPosSize.Height;
-            rRowColumnWindowData.nVarSize += aPosSize.Width + nSpace;
+            rRowColumnWindowData.nVarSize += aPosSize.Width;
         }
         else
         {
             // Calc space before an element and store it
-            sal_Int32 nSpace( rElement.m_aDockedData.m_aPos.Y() - nLastPos );
+            nSpace = ( rElement.m_aDockedData.m_aPos.Y() - nLastPos );
             if ( rElement.m_aDockedData.m_aPos.Y() > nLastPos )
                 rRowColumnWindowData.nSpace += nSpace;
             else
                 nSpace = 0;
-            rRowColumnWindowData.aRowColumnSpace.push_back( nSpace );
+            
             nLastPos = rElement.m_aDockedData.m_aPos.Y() + aPosSize.Height;
 
-            rRowColumnWindowData.aRowColumnWindows.push_back( xWindow );
-            rRowColumnWindowData.aUIElementNames.push_back( rElement.m_aName );
             rRowColumnWindowData.aRowColumnWindowSizes.push_back(
                 css::awt::Rectangle( rElement.m_aDockedData.m_aPos.X(),
                                      rElement.m_aDockedData.m_aPos.Y(),
@@ -2336,8 +2317,13 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea
                                      aPosSize.Height ));
             if ( rRowColumnWindowData.nStaticSize < aPosSize.Width )
                 rRowColumnWindowData.nStaticSize = aPosSize.Width;
-            rRowColumnWindowData.nVarSize += aPosSize.Height + nSpace;
+            rRowColumnWindowData.nVarSize += aPosSize.Height;
         }
+
+        rRowColumnWindowData.aUIElementNames.push_back( rElement.m_aName );
+        rRowColumnWindowData.aRowColumnWindows.push_back( xWindow );
+        rRowColumnWindowData.aRowColumnSpace.push_back( nSpace );
+        rRowColumnWindowData.nVarSize += nSpace;
     }
 }
 
@@ -2354,13 +2340,14 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea
                               ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM ));
 
     implts_getDockingAreaElementInfoOnSingleRowCol( eDockingArea, nRowCol, aRowColumnWindowData );
-    if ( aRowColumnWindowData.aRowColumnWindows.size() == 0 )
+    if ( aRowColumnWindowData.aRowColumnWindows.empty() )
         return rMovedElementRect;
     else
     {
         sal_Int32 nSpace( 0 );
         ::Rectangle aFrontDockingRect( rMovedElementRect );
-        for ( sal_uInt32 i = 0; i < aRowColumnWindowData.aRowColumnWindows.size(); i++ )
+        const sal_uInt32 nCount = aRowColumnWindowData.aRowColumnWindows.size();
+        for ( sal_uInt32 i = 0; i < nCount; i++ )
         {
             if ( bHorzDockArea )
             {
@@ -2415,7 +2402,7 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea
         ( DockingArea > DockingArea_DOCKINGAREA_RIGHT ))
         DockingArea = DockingArea_DOCKINGAREA_TOP;
 
-    if ( rRowColumnWindowData.aRowColumnWindows.size() == 0 )
+    if ( rRowColumnWindowData.aRowColumnWindows.empty() )
         return aWinRect;
     else
     {
@@ -2432,7 +2419,8 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea
         Window* pDockingAreaWindow( VCLUnoHelper::GetWindow( xDockingAreaWindow ));
         if ( pDockingAreaWindow && pContainerWindow )
         {
-            for ( sal_uInt32 i = 0; i < rRowColumnWindowData.aRowColumnWindows.size(); i++ )
+            const sal_uInt32 nCount = rRowColumnWindowData.aRowColumnWindows.size();
+            for ( sal_uInt32 i = 0; i < nCount; i++ )
             {
                 css::awt::Rectangle aWindowRect = rRowColumnWindowData.aRowColumnWindows[i]->getPosSize();
                 ::Rectangle aRect( aWindowRect.X, aWindowRect.Y, aWindowRect.X+aWindowRect.Width, aWindowRect.Y+aWindowRect.Height );
@@ -2660,7 +2648,8 @@ void LayoutManager::implts_calcDockingPosSize(
     // determine current first row/column and last row/column
     sal_Int32 nMaxRowCol( -1 );
     sal_Int32 nMinRowCol( SAL_MAX_INT32 );
-    for ( sal_uInt32 i = 0; i < aRowColumnsWindowData.size(); i++ )
+    const sal_uInt32 nCount = aRowColumnsWindowData.size();
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
     {
         if ( aRowColumnsWindowData[i].nRowColumn > nMaxRowCol )
             nMaxRowCol = aRowColumnsWindowData[i].nRowColumn;
@@ -2676,7 +2665,8 @@ void LayoutManager::implts_calcDockingPosSize(
         ::Rectangle aWindowRect;
         ::Rectangle aRowColumnRect;
 
-        for ( sal_uInt32 i = 0; i < aRowColumnsWindowData.size(); i++ )
+        const sal_uInt32 nWindowDataCount = aRowColumnsWindowData.size();
+        for ( sal_uInt32 i = 0; i < nWindowDataCount; i++ )
         {
             ::Rectangle aRect( aRowColumnsWindowData[i].aRowColumnRect.X,
                                aRowColumnsWindowData[i].aRowColumnRect.Y,
@@ -3163,6 +3153,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible )
     }
 
     ReadGuard aReadLock( m_aLock );
+    aWinVector.reserve(m_aUIElements.size());
     UIElementVector::iterator pIter;
     for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
     {
@@ -3187,7 +3178,8 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible )
     try
     {
         vos::OGuard	aGuard( Application::GetSolarMutex() );
-        for ( sal_uInt32 i = 0; i < aWinVector.size(); i++ )
+        const sal_uInt32 nCount = aWinVector.size();
+        for ( sal_uInt32 i = 0; i < nCount; i++ )
         {
             Reference< css::awt::XWindow > xWindow( aWinVector[i] );
             if ( xWindow.is() )
@@ -3653,7 +3645,7 @@ throw (::com::sun::star::uno::RuntimeException)
             Reference< XDispatchProvider > xDispatchProvider;
 
             MenuBar* pMenuBar = new MenuBar;
-            m_pInplaceMenuBar = new MenuBarManager( m_xSMGR, m_xFrame, xDispatchProvider, aModuleIdentifier, pMenuBar, sal_True, sal_True );
+            m_pInplaceMenuBar = new MenuBarManager( m_xSMGR, m_xFrame, m_xURLTransformer,xDispatchProvider, aModuleIdentifier, pMenuBar, sal_True, sal_True );
             m_pInplaceMenuBar->SetItemContainer( xMergedMenuBar );
 
             Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
@@ -3895,9 +3887,10 @@ throw ( RuntimeException )
     else
         implts_destroyElements(); // remove all elements
 
-    if ( oldDockingAreaWindows.size() > 0 )
+    if ( !oldDockingAreaWindows.empty() )
     {
-        for ( sal_Int32 i=0; i < (sal_Int32)oldDockingAreaWindows.size(); i++ )
+        const sal_uInt32 nCount = oldDockingAreaWindows.size();
+        for ( sal_uInt32 i = 0; i < nCount; ++i )
         {
             if ( oldDockingAreaWindows[i].is() )
             {
@@ -4079,7 +4072,8 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent )
                 aReadLock.unlock();
                 /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
-                for ( sal_uInt32 i = 0; i < aListenerArray.size(); i++ )
+                const sal_uInt32 nCount = aListenerArray.size();
+                for ( sal_uInt32 i = 0; i < nCount; ++i )
                 {
                     try
                     {
@@ -4125,7 +4119,6 @@ throw (RuntimeException)
     ReadGuard aReadLock( m_aLock );
     Reference< XFrame > xFrame = m_xFrame;
     Reference< XURLTransformer > xURLTransformer = m_xURLTransformer;
-    Reference< XModel >          xModel;
     sal_Bool    bInPlaceMenu = m_bInplaceMenuSet;
     aReadLock.unlock();
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -4133,7 +4126,7 @@ throw (RuntimeException)
     if ( !xFrame.is() )
         return;
 
-    xModel = impl_getModelFromFrame( xFrame );
+    Reference< XModel >  xModel( impl_getModelFromFrame( xFrame ) );
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
@@ -4147,7 +4140,7 @@ throw (RuntimeException)
     implts_findElement( aName, aElementType, aElementName, xUIElement );
     bFound = xUIElement.is();
 
-    if ( xFrame.is() && m_xContainerWindow.is() && !implts_isPreviewModel( xModel ) ) // no bars on preview mode
+    if ( /*xFrame.is() && */m_xContainerWindow.is() && !implts_isPreviewModel( xModel ) ) // no bars on preview mode
     {
         if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ))
         {
@@ -4243,8 +4236,7 @@ throw (RuntimeException)
                         {
                             try
                             {
-                                Any a = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" )));
-                                a >>= xMenuBar;
+                                xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" ))) >>= xMenuBar;
                             }
                             catch ( com::sun::star::beans::UnknownPropertyException )
                             {
@@ -4263,13 +4255,11 @@ throw (RuntimeException)
                                 if ( pMenuBar )
                                 {
                                     pSysWindow->SetMenuBar( pMenuBar );
+                                    pMenuBar->SetDisplayable( m_bMenuVisible );
                                     if ( m_bMenuVisible )
                                     {
-                                        pMenuBar->SetDisplayable( sal_True );
                                         bNotify = sal_True;
                                     }
-                                    else
-                                        pMenuBar->SetDisplayable( sal_False );
                                     implts_updateMenuBarClose();
                                 }
                             }
@@ -4304,8 +4294,7 @@ throw (RuntimeException)
     if ( bNotify )
     {
         // UI element is invisible - provide information to listeners
-        uno::Any a = uno::makeAny( aName );
-        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_VISIBLE, a );
+        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( aName ) );
     }
 }
 
@@ -4362,7 +4351,7 @@ throw (RuntimeException)
             {
                 if ( pIter->m_aName == aName )
                 {
-                    xComponent = Reference< XComponent >( pIter->m_xUIElement, UNO_QUERY );
+                    xComponent.set( pIter->m_xUIElement, UNO_QUERY );
                     Reference< XUIElement > xUIElement( pIter->m_xUIElement );
                     if ( xUIElement.is() )
                     {
@@ -4444,8 +4433,7 @@ throw (RuntimeException)
     if ( bNotify )
     {
         // UI element is invisible - provide information to listeners
-        uno::Any a = uno::makeAny( aName );
-        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, a );
+        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::makeAny( aName ) );
     }
 }
 
@@ -4530,7 +4518,7 @@ throw (::com::sun::star::uno::RuntimeException)
                             if ( xDockWindow.is() && xDockWindow->isFloating() )
                                 bShowElement = ( bShowElement && xContainerWindow->isActive() );
 
-                            if ( xWindow.is() && xDockWindow.is() && bShowElement )
+                            if ( xDockWindow.is() && bShowElement )
                             {
                                 pIter->m_bVisible = sal_True;
                                 aWriteLock.unlock();
@@ -4550,9 +4538,9 @@ throw (::com::sun::star::uno::RuntimeException)
                                 }
 
                                 bResult = sal_False;
-                                break;
                             }
-                        }
+                        } // if ( pIter->m_xUIElement.is() )
+                        break;
                     }
                 }
 
@@ -4597,8 +4585,7 @@ throw (::com::sun::star::uno::RuntimeException)
     if ( bNotify )
     {
         // UI element is visible - provide information to listeners
-        uno::Any a = uno::makeAny( ResourceURL );
-        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_VISIBLE, a );
+        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( ResourceURL ) );
     }
 
     return bResult;
@@ -4723,7 +4710,7 @@ throw (RuntimeException)
                     implts_writeWindowStateData( aUIElement.m_aName, aUIElement );
                     implts_sortUIElements();
 
-                    if ( xWindow.is() && xDockWindow.is() && bShowElement )
+                    if ( xDockWindow.is() && bShowElement )
                     {
                         // we need VCL here to pass special flags to Show()
                         vos::OGuard	aGuard( Application::GetSolarMutex() );
@@ -4739,7 +4726,8 @@ throw (RuntimeException)
                             doLayout();
 
                         bResult = sal_True;
-                    }
+                    } // if ( xDockWindow.is() && bShowElement )
+                    break;
                 }
             }
         }
@@ -4757,8 +4745,7 @@ throw (RuntimeException)
     if ( bNotify )
     {
         // UI element is visible - provide information to listeners
-        uno::Any a = uno::makeAny( aName );
-        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_VISIBLE, a );
+        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( aName ) );
     }
 
     return bResult;
@@ -4839,7 +4826,7 @@ throw (RuntimeException)
                     Reference< css::awt::XWindow > xWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
                     Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
 
-                    if ( xWindow.is() && xDockWindow.is() )
+                    if ( xDockWindow.is() )
                     {
                         pIter->m_bVisible = sal_False;
                         aWriteLock.unlock();
@@ -4852,7 +4839,8 @@ throw (RuntimeException)
 
                         bResult = sal_True;
                         bNotify = sal_True;
-                    }
+                    } // if ( xDockWindow.is() )
+                    break;
                 }
             }
         }
@@ -4870,8 +4858,7 @@ throw (RuntimeException)
     if ( bNotify )
     {
         // UI element is visible - provide information to listeners
-        uno::Any a = uno::makeAny( aName );
-        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, a );
+        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::makeAny( aName ) );
     }
 
     return sal_False;
@@ -4882,96 +4869,93 @@ throw (RuntimeException)
 {
     UIElement aUIElement;
 
-    if ( implts_findElement( aName, aUIElement ))
+    if ( implts_findElement( aName, aUIElement ) && aUIElement.m_xUIElement.is() )
     {
-        if ( aUIElement.m_xUIElement.is() )
+        try
         {
-            try
+            Reference< css::awt::XWindow > xWindow( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
+            Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
+            if ( xDockWindow.is() )
             {
-                Reference< css::awt::XWindow > xWindow( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-                if ( xWindow.is() &&  xDockWindow.is() )
-                {
-                    if ( DockingArea != DockingArea_DOCKINGAREA_DEFAULT )
-                        aUIElement.m_aDockedData.m_nDockedArea = sal_Int16( DockingArea );
+                if ( DockingArea != DockingArea_DOCKINGAREA_DEFAULT )
+                    aUIElement.m_aDockedData.m_nDockedArea = sal_Int16( DockingArea );
 
-                    if (( Pos.X != SAL_MAX_INT32 ) && ( Pos.Y != SAL_MAX_INT32 ))
-                        aUIElement.m_aDockedData.m_aPos = ::Point( Pos.X, Pos.Y );
+                if (( Pos.X != SAL_MAX_INT32 ) && ( Pos.Y != SAL_MAX_INT32 ))
+                    aUIElement.m_aDockedData.m_aPos = ::Point( Pos.X, Pos.Y );
 
-                    if ( !xDockWindow->isFloating() )
-                    {
-                        Window*     pWindow( 0 );
-                        ToolBox*    pToolBox( 0 );
+                if ( !xDockWindow->isFloating() )
+                {
+                    Window*     pWindow( 0 );
+                    ToolBox*    pToolBox( 0 );
 
+                    {
+                        vos::OGuard	aGuard( Application::GetSolarMutex() );
+                        pWindow = VCLUnoHelper::GetWindow( xWindow );
+                        if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
                         {
-                            vos::OGuard	aGuard( Application::GetSolarMutex() );
-                            pWindow = VCLUnoHelper::GetWindow( xWindow );
-                            if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-                            {
-                                pToolBox = (ToolBox *)pWindow;
+                            pToolBox = (ToolBox *)pWindow;
 
-                                // We have to set the alignment of the toolbox. It's possible that the toolbox is moved from a
-                                // horizontal to a vertical docking area!
-                                pToolBox->SetAlign( ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ));
-                            }
+                            // We have to set the alignment of the toolbox. It's possible that the toolbox is moved from a
+                            // horizontal to a vertical docking area!
+                            pToolBox->SetAlign( ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ));
                         }
+                    }
 
-                        if (( aUIElement.m_aDockedData.m_aPos.X() == SAL_MAX_INT32 ) ||
-                            ( aUIElement.m_aDockedData.m_aPos.Y() == SAL_MAX_INT32 ))
-                        {
-                            // Docking on its default position without a preset position -
-                            // we have to find a good place for it.
-                            ::Size      aSize;
-
-                            vos::OGuard	aGuard( Application::GetSolarMutex() );
-                            {
-                                if ( pToolBox )
-                                    aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ) );
-                                else
-                                    aSize = pWindow->GetSizePixel();
-                            }
+                    if (( aUIElement.m_aDockedData.m_aPos.X() == SAL_MAX_INT32 ) ||
+                        ( aUIElement.m_aDockedData.m_aPos.Y() == SAL_MAX_INT32 ))
+                    {
+                        // Docking on its default position without a preset position -
+                        // we have to find a good place for it.
+                        ::Size      aSize;
 
-                            ::Point aPixelPos;
-                            ::Point aDockPos;
-                            implts_findNextDockingPos( (::com::sun::star::ui::DockingArea)aUIElement.m_aDockedData.m_nDockedArea,
-                                                    aSize,
-                                                    aDockPos,
-                                                    aPixelPos );
-                            aUIElement.m_aDockedData.m_aPos = aDockPos;
+                        vos::OGuard	aGuard( Application::GetSolarMutex() );
+                        {
+                            if ( pToolBox )
+                                aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ) );
+                            else
+                                aSize = pWindow->GetSizePixel();
                         }
-                    }
 
-                    WriteGuard aWriteLock( m_aLock );
-                    UIElement& rUIElement = LayoutManager::impl_findElement( aUIElement.m_aName );
-                    if ( rUIElement.m_aName == aName )
-                    {
-                        rUIElement.m_aDockedData.m_nDockedArea = aUIElement.m_aDockedData.m_nDockedArea;
-                        rUIElement.m_aDockedData.m_aPos        = aUIElement.m_aDockedData.m_aPos;
+                        ::Point aPixelPos;
+                        ::Point aDockPos;
+                        implts_findNextDockingPos( (::com::sun::star::ui::DockingArea)aUIElement.m_aDockedData.m_nDockedArea,
+                                                aSize,
+                                                aDockPos,
+                                                aPixelPos );
+                        aUIElement.m_aDockedData.m_aPos = aDockPos;
                     }
-                    aWriteLock.unlock();
+                }
 
-                    if ( xDockWindow->isFloating() )
-                    {
-                        // Will call toggle floating mode which will do the rest!
-                        xWindow->setVisible( sal_False );
-                        xDockWindow->setFloatingMode( sal_False );
-                        xWindow->setVisible( sal_True );
-                    }
-                    else
-                    {
-                        implts_writeWindowStateData( aName, aUIElement );
-                        implts_sortUIElements();
+                WriteGuard aWriteLock( m_aLock );
+                UIElement& rUIElement = LayoutManager::impl_findElement( aUIElement.m_aName );
+                if ( rUIElement.m_aName == aName )
+                {
+                    rUIElement.m_aDockedData.m_nDockedArea = aUIElement.m_aDockedData.m_nDockedArea;
+                    rUIElement.m_aDockedData.m_aPos        = aUIElement.m_aDockedData.m_aPos;
+                }
+                aWriteLock.unlock();
 
-                        if ( aUIElement.m_bVisible )
-                            doLayout();
-                    }
+                if ( xDockWindow->isFloating() )
+                {
+                    // Will call toggle floating mode which will do the rest!
+                    xWindow->setVisible( sal_False );
+                    xDockWindow->setFloatingMode( sal_False );
+                    xWindow->setVisible( sal_True );
+                }
+                else
+                {
+                    implts_writeWindowStateData( aName, aUIElement );
+                    implts_sortUIElements();
 
-                    return sal_True;
+                    if ( aUIElement.m_bVisible )
+                        doLayout();
                 }
+
+                return sal_True;
             }
-            catch ( DisposedException& )
-            {
-            }
+        }
+        catch ( DisposedException& )
+        {
         }
     }
 
@@ -5000,7 +4984,8 @@ throw (RuntimeException)
             }
         }
 
-        for ( sal_uInt32 i = 0; i < aToolBarNameVector.size(); i++ )
+        const sal_uInt32 nCount = aToolBarNameVector.size();
+        for ( sal_uInt32 i = 0; i < nCount; ++i )
         {
             ::com::sun::star::awt::Point aPoint;
             aPoint.X = aPoint.Y = SAL_MAX_INT32;
@@ -5164,42 +5149,39 @@ throw (RuntimeException)
 {
     UIElement aUIElement;
 
-    if ( implts_findElement( aName, aUIElement ))
+    if ( implts_findElement( aName, aUIElement ) && aUIElement.m_xUIElement.is() )
     {
-        if ( aUIElement.m_xUIElement.is() )
+        try
         {
-            try
-            {
-                Reference< css::awt::XWindow > xWindow( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
+            Reference< css::awt::XWindow > xWindow( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
+            Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
 
-                if ( xWindow.is() && xDockWindow.is() )
+            if ( xWindow.is() && xDockWindow.is() )
+            {
+                if ( aUIElement.m_bFloating )
                 {
-                    if ( aUIElement.m_bFloating )
-                    {
-                        xWindow->setPosSize( aPos.X, aPos.Y, 0, 0, css::awt::PosSize::POS );
-                        implts_writeNewStateData( aName, xWindow );
-                    }
-                    else
-                    {
-                        WriteGuard aWriteLock( m_aLock );
-                        UIElement& rUIElement = LayoutManager::impl_findElement( aUIElement.m_aName );
-                        if ( rUIElement.m_aName == aName )
-                            rUIElement.m_aDockedData.m_aPos = ::Point( aPos.X, aPos.Y );
-                        aWriteLock.unlock();
+                    xWindow->setPosSize( aPos.X, aPos.Y, 0, 0, css::awt::PosSize::POS );
+                    implts_writeNewStateData( aName, xWindow );
+                }
+                else
+                {
+                    WriteGuard aWriteLock( m_aLock );
+                    UIElement& rUIElement = LayoutManager::impl_findElement( aUIElement.m_aName );
+                    if ( rUIElement.m_aName == aName )
+                        rUIElement.m_aDockedData.m_aPos = ::Point( aPos.X, aPos.Y );
+                    aWriteLock.unlock();
 
-                        aUIElement.m_aDockedData.m_aPos = ::Point( aPos.X, aPos.Y );
-                        implts_writeWindowStateData( aName, aUIElement );
-                        implts_sortUIElements();
+                    aUIElement.m_aDockedData.m_aPos = ::Point( aPos.X, aPos.Y );
+                    implts_writeWindowStateData( aName, aUIElement );
+                    implts_sortUIElements();
 
-                        if ( aUIElement.m_bVisible )
-                            doLayout();
-                    }
+                    if ( aUIElement.m_bVisible )
+                        doLayout();
                 }
             }
-            catch ( DisposedException& )
-            {
-            }
+        }
+        catch ( DisposedException& )
+        {
         }
     }
 }
@@ -5322,10 +5304,7 @@ throw (RuntimeException)
                     if ( xWindow.is() )
                     {
                         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                        if ( pWindow && pWindow->IsVisible() )
-                            return sal_True;
-                        else
-                            return sal_False;
+                        return pWindow && pWindow->IsVisible();
                     }
                 }
             }
@@ -5353,13 +5332,8 @@ throw (RuntimeException)
     {
         if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
         {
-            Reference< css::awt::XWindow > xWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            if ( xWindow.is() )
-            {
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-                if ( xDockWindow.is() )
-                    return xDockWindow->isFloating();
-            }
+            Reference< css::awt::XDockableWindow > xDockWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
+            return xDockWindow.is() && xDockWindow->isFloating();
         }
     }
 
@@ -5376,13 +5350,8 @@ throw (RuntimeException)
     {
         if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
         {
-            Reference< css::awt::XWindow > xWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            if ( xWindow.is() )
-            {
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-                if ( xDockWindow.is() )
-                    return !xDockWindow->isFloating();
-            }
+            Reference< css::awt::XDockableWindow > xDockWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
+            return xDockWindow.is() && !xDockWindow->isFloating();
         }
     }
 
@@ -5397,16 +5366,10 @@ throw (::com::sun::star::uno::RuntimeException)
     ReadGuard aReadLock( m_aLock );
     for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
     {
-        if (( pIter->m_aName == ResourceURL ) &&
-            ( pIter->m_xUIElement.is() ))
+        if (( pIter->m_aName == ResourceURL ) && ( pIter->m_xUIElement.is() ))
         {
-            Reference< css::awt::XWindow > xWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            if ( xWindow.is() )
-            {
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-                if ( xDockWindow.is() )
-                    return xDockWindow->isLocked();
-            }
+            Reference< css::awt::XDockableWindow > xDockWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
+            return xDockWindow.is() && !xDockWindow->isLocked();
         }
     }
 
@@ -5416,64 +5379,53 @@ throw (::com::sun::star::uno::RuntimeException)
 css::awt::Size SAL_CALL LayoutManager::getElementSize( const ::rtl::OUString& aName )
 throw (RuntimeException)
 {
-    UIElementVector::const_iterator pIter;
-
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    UIElement aElementData;
+    if ( implts_findElement( aName,aElementData  ) && aElementData.m_xUIElement.is() )
     {
-        if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
+        Reference< css::awt::XWindow > xWindow( aElementData.m_xUIElement->getRealInterface(), UNO_QUERY );
+        if ( xWindow.is() )
         {
-            Reference< css::awt::XWindow > xWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            if ( xWindow.is() )
+            Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+            if ( pWindow )
             {
-                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                if ( pWindow )
-                {
-                    ::Size aSize = pWindow->GetSizePixel();
-                    css::awt::Size aElementSize;
-                    aElementSize.Width  = aSize.Width();
-                    aElementSize.Height = aSize.Height();
-                    return aElementSize;
-                }
-                else
-                    break;
-            }
+                ::Size aSize = pWindow->GetSizePixel();
+                css::awt::Size aElementSize;
+                aElementSize.Width  = aSize.Width();
+                aElementSize.Height = aSize.Height();
+                return aElementSize;
+            } // if ( pWindow )
         }
     }
-
     return css::awt::Size();
 }
 
 css::awt::Point SAL_CALL LayoutManager::getElementPos( const ::rtl::OUString& aName )
 throw (RuntimeException)
 {
-    UIElementVector::const_iterator pIter;
-
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    UIElement aElementData;
+    if ( implts_findElement( aName,aElementData  ) && aElementData.m_xUIElement.is() )
     {
-        if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
+        Reference< css::awt::XWindow > xWindow( aElementData.m_xUIElement->getRealInterface(), UNO_QUERY );
+        Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
+        if ( xDockWindow.is() )
         {
-            Reference< css::awt::XWindow > xWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-            if ( xWindow.is() && xDockWindow.is() )
+            css::awt::Point aPos;
+            if ( aElementData.m_bFloating )
             {
-                css::awt::Point aPos;
-                if ( pIter->m_bFloating )
-                {
-                    css::awt::Rectangle aRect = xWindow->getPosSize();
-                    aPos.X = aRect.X;
-                    aPos.Y = aRect.Y;
-                }
-                else
-                {
-                    ::Point aVirtualPos = pIter->m_aDockedData.m_aPos;
-                    aPos.X = aVirtualPos.X();
-                    aPos.Y = aVirtualPos.Y();
-                }
-
-                return aPos;
+                css::awt::Rectangle aRect = xWindow->getPosSize();
+                aPos.X = aRect.X;
+                aPos.Y = aRect.Y;
+            }
+            else
+            {
+                ::Point aVirtualPos = aElementData.m_aDockedData.m_aPos;
+                aPos.X = aVirtualPos.X();
+                aPos.Y = aVirtualPos.Y();
             }
+
+            return aPos;
         }
     }
 
@@ -5621,7 +5573,8 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace )
                 implts_getDockingAreaElementInfos( (DockingArea)i, aRowColumnsWindowData );
 
                 sal_Int32 nOffset( 0 );
-                for ( sal_Int32 j = 0; j < sal_Int32( aRowColumnsWindowData.size() ); j++ )
+                const sal_uInt32 nCount = aRowColumnsWindowData.size();
+                for ( sal_uInt32 j = 0; j < nCount; ++j )
                 {
                     implts_calcWindowPosSizeOnSingleRowColumn( i, nOffset, aRowColumnsWindowData[j], aContainerSize );
                     nOffset += aRowColumnsWindowData[j].nStaticSize;
@@ -5687,7 +5640,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin
     sal_Int32   nBottomDockingAreaSize;
     sal_Int32   nContainerClientSize;
 
-    if ( rRowColumnWindowData.aRowColumnWindows.size() == 0 )
+    if ( rRowColumnWindowData.aRowColumnWindows.empty() )
         return;
 
     if (( nDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
@@ -5704,26 +5657,28 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin
         nDiff = nContainerClientSize - rRowColumnWindowData.nVarSize;
     }
 
+    const sal_uInt32 nCount = rRowColumnWindowData.aRowColumnWindowSizes.size();
     if (( nDiff < 0 ) && ( nRCSpace > 0 ))
     {
         // First we try to reduce the size of blank space before/behind docked windows
-        sal_Int32 i = rRowColumnWindowData.aRowColumnWindowSizes.size()-1;
+        sal_Int32 i = nCount - 1;
         while ( i >= 0 )
         {
             sal_Int32 nSpace = rRowColumnWindowData.aRowColumnSpace[i];
             if ( nSpace >= -nDiff )
             {
+                
                 if (( nDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
                     ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
                 {
                     // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_Int32 j = i; j < sal_Int32( rRowColumnWindowData.aRowColumnWindowSizes.size() ); j++ )
+                    for ( sal_uInt32 j = i; j < nCount ; j++ )
                         rRowColumnWindowData.aRowColumnWindowSizes[j].X += nDiff;
                 }
                 else
                 {
                     // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_Int32 j = i; j < sal_Int32( rRowColumnWindowData.aRowColumnWindowSizes.size() ); j++ )
+                    for ( sal_uInt32 j = i; j < nCount ; j++ )
                         rRowColumnWindowData.aRowColumnWindowSizes[j].Y += nDiff;
                 }
                 nDiff = 0;
@@ -5736,13 +5691,13 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin
                     ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
                 {
                     // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_Int32 j = i; j < sal_Int32( rRowColumnWindowData.aRowColumnWindowSizes.size() ); j++ )
+                    for ( sal_uInt32 j = i; j < nCount; j++ )
                         rRowColumnWindowData.aRowColumnWindowSizes[j].X -= nSpace;
                 }
                 else
                 {
                     // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_Int32 j = i; j < sal_Int32( rRowColumnWindowData.aRowColumnWindowSizes.size() ); j++ )
+                    for ( sal_uInt32 j = i; j < nCount; j++ )
                         rRowColumnWindowData.aRowColumnWindowSizes[j].Y -= nSpace;
                 }
                 nDiff += nSpace;
@@ -5755,7 +5710,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin
     if ( nDiff < 0 )
     {
         // Now we have to reduce the size of certain docked windows
-        sal_Int32 i = sal_Int32( rRowColumnWindowData.aRowColumnWindowSizes.size() - 1 );
+        sal_Int32 i = sal_Int32( nCount - 1 );
         while ( i >= 0 )
         {
             css::awt::Rectangle& rWinRect = rRowColumnWindowData.aRowColumnWindowSizes[i];
@@ -5787,7 +5742,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin
                     }
 
                     // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_Int32 j = i; j < sal_Int32( rRowColumnWindowData.aRowColumnWindowSizes.size() ); j++ )
+                    for ( sal_uInt32 j = i; j < nCount; j++ )
                         rRowColumnWindowData.aRowColumnWindowSizes[j].X += nDiff;
                 }
                 else
@@ -5805,7 +5760,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin
                     }
 
                     // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_Int32 j = i; j < sal_Int32( rRowColumnWindowData.aRowColumnWindowSizes.size() ); j++ )
+                    for ( sal_uInt32 j = i; j < nCount; j++ )
                         rRowColumnWindowData.aRowColumnWindowSizes[j].Y += nDiff;
                 }
             }
@@ -5831,7 +5786,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin
         nStartOffset = pDockAreaWindow->GetSizePixel().Height() - rRowColumnWindowData.nStaticSize;
 
     vos::OGuard	aGuard( Application::GetSolarMutex() );
-    for ( sal_Int32 i = 0; i < sal_Int32( rRowColumnWindowData.aRowColumnWindows.size() ); i++ )
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
     {
         Reference< css::awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i];
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
@@ -5986,12 +5941,13 @@ css::awt::Rectangle LayoutManager::implts_calcDockingAreaSizes()
         }
 
         // Sum up max heights from every row/column
-        if ( aWindowVector.size() > 0 )
+        if ( !aWindowVector.empty() )
         {
             for ( sal_Int32 i = 0; i <= DockingArea_DOCKINGAREA_RIGHT; i++ )
             {
                 sal_Int32 nSize( 0 );
-                for ( sal_Int32 j = 0; j < sal_Int32( aRowColumnSizes[i].size() ); j++ )
+                const sal_uInt32 nCount = aRowColumnSizes[i].size();
+                for ( sal_uInt32 j = 0; j < nCount; j++ )
                     nSize += aRowColumnSizes[i][j];
 
                 if ( i == DockingArea_DOCKINGAREA_TOP )
@@ -7084,6 +7040,7 @@ IMPL_LINK( LayoutManager, AsyncLayoutHdl, Timer *, EMPTYARG )
 
 void LayoutManager::implts_checkElementContainer()
 {
+#ifdef DBG_UTIL
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
 
@@ -7102,7 +7059,8 @@ void LayoutManager::implts_checkElementContainer()
             ::rtl::OString aName = ::rtl::OUStringToOString( pCheckIter->first, RTL_TEXTENCODING_ASCII_US );
             DBG_ASSERT( "More than one element (%s) with the same name found!", aName.getStr() );
         }
-    }
+    } // for ( ; pCheckIter != aUIElementHash.end(); pCheckIter++ )
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index e67b7570f..902a5a970 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -75,6 +75,7 @@
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
@@ -1829,9 +1830,8 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
         // read window state from the configuration
         // and apply it on the window.
         // Do nothing, if no configuration entry exists!
-        css::uno::Any   aWindowState = ::comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, sModule, OFFICEFACTORY_PROPNAME_WINDOWATTRIBUTES);
         ::rtl::OUString sWindowState ;
-        aWindowState >>= sWindowState;
+        ::comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, sModule, OFFICEFACTORY_PROPNAME_WINDOWATTRIBUTES) >>= sWindowState;
         if (sWindowState.getLength())
         {
             // SOLAR SAFE ->
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index de76f5889..9ad3f696d 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -187,7 +187,7 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException
     /* SAFE{ */
     WriteGuard aWriteLock(m_aLock);
 
-    if ( !m_aStatements.size() )
+    if ( m_aStatements.empty() )
         return ::rtl::OUString();
 
     ::rtl::OUStringBuffer aScriptBuffer;
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index 48d383ce7..c7ef3da66 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -61,29 +61,29 @@
 =================================================================================================================*/
 #include <services/urltransformer.hxx>
 #include <services/desktop.hxx>
-#include <services/tabwindowservice.hxx>
+//#include <services/tabwindowservice.hxx>
 #include <services/frame.hxx>
 #include <services/modulemanager.hxx>
-#include <dispatch/oxt_handler.hxx>
+//#include <dispatch/oxt_handler.hxx>
 #include <jobs/jobexecutor.hxx>
-#include <recording/dispatchrecordersupplier.hxx>
-#include <recording/dispatchrecorder.hxx>
-#include <dispatch/mailtodispatcher.hxx>
-#include <dispatch/servicehandler.hxx>
+//#include <recording/dispatchrecordersupplier.hxx>
+//#include <recording/dispatchrecorder.hxx>
+//#include <dispatch/mailtodispatcher.hxx>
+//#include <dispatch/servicehandler.hxx>
 #include <jobs/jobdispatch.hxx>
 #include <services/backingcomp.hxx>
-#include <services/dispatchhelper.hxx>
+//#include <services/dispatchhelper.hxx>
 #include <services/layoutmanager.hxx>
-#include <services/license.hxx>
+//#include <services/license.hxx>
 #include <uifactory/uielementfactorymanager.hxx>
 #include <uifactory/popupmenucontrollerfactory.hxx>
-#include <uielement/fontmenucontroller.hxx>
-#include <uielement/fontsizemenucontroller.hxx>
+//#include <uielement/fontmenucontroller.hxx>
+//#include <uielement/fontsizemenucontroller.hxx>
 #include <uielement/objectmenucontroller.hxx>
-#include <uielement/headermenucontroller.hxx>
-#include <uielement/footermenucontroller.hxx>
+//#include <uielement/headermenucontroller.hxx>
+//#include <uielement/footermenucontroller.hxx>
 #include <uielement/controlmenucontroller.hxx>
-#include <uielement/macrosmenucontroller.hxx>
+//#include <uielement/macrosmenucontroller.hxx>
 #include <uielement/uicommanddescription.hxx>
 #include <uiconfiguration/uiconfigurationmanager.hxx>
 #include <uiconfiguration/moduleuicfgsupplier.hxx>
@@ -95,53 +95,54 @@
 #include <uifactory/toolboxfactory.hxx>
 #include <uifactory/addonstoolboxfactory.hxx>
 #include "uiconfiguration/windowstateconfiguration.hxx"
-#include <uielement/toolbarsmenucontroller.hxx>
+//#include <uielement/toolbarsmenucontroller.hxx>
 #include "uifactory/toolbarcontrollerfactory.hxx"
 #include "uifactory/statusbarcontrollerfactory.hxx"
-#include <uielement/toolbarsmenucontroller.hxx>
 #include <services/autorecovery.hxx>
 #include <helper/statusindicatorfactory.hxx>
 #include <uielement/recentfilesmenucontroller.hxx>
 #include <uifactory/statusbarfactory.hxx>
 #include <uiconfiguration/uicategorydescription.hxx>
 #include <services/sessionlistener.hxx>
-#include <uielement/logoimagestatusbarcontroller.hxx>
-#include <uielement/logotextstatusbarcontroller.hxx>
-#include <uielement/newmenucontroller.hxx>
+//#include <uielement/logoimagestatusbarcontroller.hxx>
+//#include <uielement/logotextstatusbarcontroller.hxx>
+//#include <uielement/newmenucontroller.hxx>
 #include <services/taskcreatorsrv.hxx>
-#include <uielement/simpletextstatusbarcontroller.hxx>
-#include <services/uriabbreviation.hxx>
-#include <dispatch/popupmenudispatcher.hxx>
+//#include <uielement/simpletextstatusbarcontroller.hxx>
+//#include <services/uriabbreviation.hxx>
+
 #include <uielement/langselectionstatusbarcontroller.hxx>
-#include <uielement/langselectionmenucontroller.hxx>
+//#include <uielement/langselectionmenucontroller.hxx>
 #include <uiconfiguration/imagemanager.hxx>
 #include <uifactory/windowcontentfactorymanager.hxx>
+#include <services/substitutepathvars.hxx>
+#include <services/pathsettings.hxx>
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
 COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::URLTransformer                          )
                         COMPONENTINFO( ::framework::Desktop						            )
                         COMPONENTINFO( ::framework::Frame                                   )
-                        COMPONENTINFO( ::framework::Oxt_Handler                             )
+                        //COMPONENTINFO( ::framework::Oxt_Handler                             )
                         COMPONENTINFO( ::framework::JobExecutor                             )
-                        COMPONENTINFO( ::framework::DispatchRecorderSupplier                )
-                        COMPONENTINFO( ::framework::DispatchRecorder                        )
-                        COMPONENTINFO( ::framework::MailToDispatcher                        )
-                        COMPONENTINFO( ::framework::ServiceHandler                          )
+                        //COMPONENTINFO( ::framework::DispatchRecorderSupplier                )
+                        //COMPONENTINFO( ::framework::DispatchRecorder                        )
+                        //COMPONENTINFO( ::framework::MailToDispatcher                        )
+                        //COMPONENTINFO( ::framework::ServiceHandler                          )
                         COMPONENTINFO( ::framework::JobDispatch                             )
                         COMPONENTINFO( ::framework::BackingComp                             )
-                        COMPONENTINFO( ::framework::DispatchHelper                          )
+                        //COMPONENTINFO( ::framework::DispatchHelper                          )
                         COMPONENTINFO( ::framework::LayoutManager                           )
-                        COMPONENTINFO( ::framework::License                                 )
+                        //COMPONENTINFO( ::framework::License                                 )
                         COMPONENTINFO( ::framework::UIElementFactoryManager                 )
                         COMPONENTINFO( ::framework::PopupMenuControllerFactory              )
-                        COMPONENTINFO( ::framework::FontMenuController                      )
-                        COMPONENTINFO( ::framework::FontSizeMenuController                  )
+                        //COMPONENTINFO( ::framework::FontMenuController                      )
+                        //COMPONENTINFO( ::framework::FontSizeMenuController                  )
                         COMPONENTINFO( ::framework::ObjectMenuController                    )
-                        COMPONENTINFO( ::framework::HeaderMenuController                    )
-                        COMPONENTINFO( ::framework::FooterMenuController                    )
+                        //COMPONENTINFO( ::framework::HeaderMenuController                    )
+                        //COMPONENTINFO( ::framework::FooterMenuController                    )
                         COMPONENTINFO( ::framework::ControlMenuController                   )
-                        COMPONENTINFO( ::framework::MacrosMenuController                    )
+                        //COMPONENTINFO( ::framework::MacrosMenuController                    )
                         COMPONENTINFO( ::framework::UICommandDescription                    )
                         COMPONENTINFO( ::framework::ModuleManager                           )
                         COMPONENTINFO( ::framework::UIConfigurationManager                  )
@@ -155,7 +156,7 @@ COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::URLTransformer
                         COMPONENTINFO( ::framework::AddonsToolBoxFactory                    )
                         COMPONENTINFO( ::framework::WindowStateConfiguration                )
                         COMPONENTINFO( ::framework::ToolbarControllerFactory                )
-                        COMPONENTINFO( ::framework::ToolbarsMenuController                  )
+                        //COMPONENTINFO( ::framework::ToolbarsMenuController                  )
                         COMPONENTINFO( ::framework::AutoRecovery                            )
                         COMPONENTINFO( ::framework::StatusIndicatorFactory                  )
                         COMPONENTINFO( ::framework::RecentFilesMenuController               )
@@ -163,43 +164,45 @@ COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::URLTransformer
                         COMPONENTINFO( ::framework::UICategoryDescription                   )
                         COMPONENTINFO( ::framework::StatusbarControllerFactory              )
                         COMPONENTINFO( ::framework::SessionListener                         )
-                        COMPONENTINFO( ::framework::LogoImageStatusbarController            )
-                        COMPONENTINFO( ::framework::LogoTextStatusbarController             )
-                        COMPONENTINFO( ::framework::NewMenuController                       )
+                        //COMPONENTINFO( ::framework::LogoImageStatusbarController            )
+                        //COMPONENTINFO( ::framework::LogoTextStatusbarController             )
+                        //COMPONENTINFO( ::framework::NewMenuController                       )
                         COMPONENTINFO( ::framework::TaskCreatorService                      )
-                        COMPONENTINFO( ::framework::SimpleTextStatusbarController           )
-                        COMPONENTINFO( ::framework::UriAbbreviation                         )
-                        COMPONENTINFO( ::framework::PopupMenuDispatcher                     )
+                        //COMPONENTINFO( ::framework::SimpleTextStatusbarController           )
+                        //COMPONENTINFO( ::framework::UriAbbreviation                         )
+                        //COMPONENTINFO( ::framework::PopupMenuDispatcher                     )
                         COMPONENTINFO( ::framework::ImageManager                            )
                         COMPONENTINFO( ::framework::LangSelectionStatusbarController        )
-                        COMPONENTINFO( ::framework::LanguageSelectionMenuController         )
-                        COMPONENTINFO( ::framework::TabWindowService                        )
+                        //COMPONENTINFO( ::framework::LanguageSelectionMenuController         )
+                        //COMPONENTINFO( ::framework::TabWindowService                        )
                         COMPONENTINFO( ::framework::WindowContentFactoryManager             )
+                        COMPONENTINFO( ::framework::SubstitutePathVariables		)
+                        COMPONENTINFO( ::framework::PathSettings				)
                     )
 
 COMPONENTGETFACTORY	(	IFFACTORY( ::framework::URLTransformer					        )	else
                         IFFACTORY( ::framework::Desktop							        )	else
                         IFFACTORY( ::framework::Frame                                   )   else
-                        IFFACTORY( ::framework::Oxt_Handler                             )   else
+                        //IFFACTORY( ::framework::Oxt_Handler                             )   else
                         IFFACTORY( ::framework::JobExecutor                             )   else
-                        IFFACTORY( ::framework::DispatchRecorderSupplier                )   else
-                        IFFACTORY( ::framework::DispatchRecorder                        )   else
-                        IFFACTORY( ::framework::MailToDispatcher                        )   else
-                        IFFACTORY( ::framework::ServiceHandler                          )   else
+                        //IFFACTORY( ::framework::DispatchRecorderSupplier                )   else
+                        //IFFACTORY( ::framework::DispatchRecorder                        )   else
+                        //IFFACTORY( ::framework::MailToDispatcher                        )   else
+                        //IFFACTORY( ::framework::ServiceHandler                          )   else
                         IFFACTORY( ::framework::JobDispatch                             )   else
                         IFFACTORY( ::framework::BackingComp                             )	else
-                        IFFACTORY( ::framework::DispatchHelper                          )   else
+                        //IFFACTORY( ::framework::DispatchHelper                          )   else
                         IFFACTORY( ::framework::LayoutManager                           )   else
-                        IFFACTORY( ::framework::License                                 )   else
+                        //IFFACTORY( ::framework::License                                 )   else
                         IFFACTORY( ::framework::UIElementFactoryManager                 )   else
                         IFFACTORY( ::framework::PopupMenuControllerFactory              )   else
-                        IFFACTORY( ::framework::FontMenuController                      )   else
-                        IFFACTORY( ::framework::FontSizeMenuController                  )   else
+                        //IFFACTORY( ::framework::FontMenuController                      )   else
+                        //IFFACTORY( ::framework::FontSizeMenuController                  )   else
                         IFFACTORY( ::framework::ObjectMenuController                    )   else
-                        IFFACTORY( ::framework::HeaderMenuController                    )   else
-                        IFFACTORY( ::framework::FooterMenuController                    )   else
+                        //IFFACTORY( ::framework::HeaderMenuController                    )   else
+                        //IFFACTORY( ::framework::FooterMenuController                    )   else
                         IFFACTORY( ::framework::ControlMenuController                   )   else
-                        IFFACTORY( ::framework::MacrosMenuController                    )   else
+                        //IFFACTORY( ::framework::MacrosMenuController                    )   else
                         IFFACTORY( ::framework::UICommandDescription                    )   else
                         IFFACTORY( ::framework::ModuleManager                           )   else
                         IFFACTORY( ::framework::UIConfigurationManager                  )   else
@@ -213,7 +216,7 @@ COMPONENTGETFACTORY	(	IFFACTORY( ::framework::URLTransformer					        )	else
                         IFFACTORY( ::framework::AddonsToolBoxFactory                    )   else
                         IFFACTORY( ::framework::WindowStateConfiguration                )   else
                         IFFACTORY( ::framework::ToolbarControllerFactory                )   else
-                        IFFACTORY( ::framework::ToolbarsMenuController                  )	else
+                        //IFFACTORY( ::framework::ToolbarsMenuController                  )	else
                         IFFACTORY( ::framework::AutoRecovery                            )   else
                         IFFACTORY( ::framework::StatusIndicatorFactory                  )	else
                         IFFACTORY( ::framework::RecentFilesMenuController               )   else
@@ -222,18 +225,19 @@ COMPONENTGETFACTORY	(	IFFACTORY( ::framework::URLTransformer					        )	else
                         IFFACTORY( ::framework::SessionListener                         )	else
                         IFFACTORY( ::framework::StatusbarControllerFactory              )   else
                         IFFACTORY( ::framework::SessionListener                         )   else
-                        IFFACTORY( ::framework::LogoImageStatusbarController            )   else
-                        IFFACTORY( ::framework::LogoTextStatusbarController             )	else
+                        //IFFACTORY( ::framework::LogoImageStatusbarController            )   else
+                        //IFFACTORY( ::framework::LogoTextStatusbarController             )	else
                         IFFACTORY( ::framework::TaskCreatorService	                    )   else
-                        IFFACTORY( ::framework::NewMenuController                       )   else
-                        IFFACTORY( ::framework::SimpleTextStatusbarController           )   else
-                        IFFACTORY( ::framework::UriAbbreviation                         )   else
-                        IFFACTORY( ::framework::PopupMenuDispatcher                     )   else
+                        //IFFACTORY( ::framework::NewMenuController                       )   else
+                        //IFFACTORY( ::framework::SimpleTextStatusbarController           )   else
+                        //IFFACTORY( ::framework::UriAbbreviation                         )   else
+                        //IFFACTORY( ::framework::PopupMenuDispatcher                     )   else
                         IFFACTORY( ::framework::ImageManager                            )   else
-                        IFFACTORY( ::framework::PopupMenuDispatcher                     )   else
                         IFFACTORY( ::framework::LangSelectionStatusbarController        )   else
-                        IFFACTORY( ::framework::LanguageSelectionMenuController         )   else
+                        //IFFACTORY( ::framework::LanguageSelectionMenuController         )   else
                         IFFACTORY( ::framework::WindowContentFactoryManager             )   else
-                        IFFACTORY( ::framework::TabWindowService                        )
+                        //IFFACTORY( ::framework::TabWindowService                        )   else
+                        IFFACTORY( ::framework::SubstitutePathVariables			        )	else
+                        IFFACTORY( ::framework::PathSettings					        )
             )
 
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index d008176f8..2297346ae 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -60,17 +60,74 @@
                              )
 =================================================================================================================*/
 #include <services/mediatypedetectionhelper.hxx>
-#include <services/substitutepathvars.hxx>
-#include <services/pathsettings.hxx>
+#include <dispatch/mailtodispatcher.hxx>
+#include <dispatch/oxt_handler.hxx>
+#include <dispatch/popupmenudispatcher.hxx>
+#include <dispatch/servicehandler.hxx>
+#include <services/dispatchhelper.hxx>
+#include <recording/dispatchrecorder.hxx>
+#include <recording/dispatchrecordersupplier.hxx>
+#include <services/license.hxx>
+#include <services/uriabbreviation.hxx>
+#include <uielement/simpletextstatusbarcontroller.hxx>
+#include <uielement/logoimagestatusbarcontroller.hxx>
+#include <uielement/logotextstatusbarcontroller.hxx>
+#include <services/tabwindowservice.hxx>
+#include <uielement/fontmenucontroller.hxx>
+#include <uielement/fontsizemenucontroller.hxx>
+#include <uielement/footermenucontroller.hxx>
+#include <uielement/headermenucontroller.hxx>
+#include <uielement/langselectionmenucontroller.hxx>
+#include <uielement/macrosmenucontroller.hxx>
+#include <uielement/newmenucontroller.hxx>
+#include <uielement/toolbarsmenucontroller.hxx>
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
 COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::MediaTypeDetectionHelper	)
-                        COMPONENTINFO( ::framework::SubstitutePathVariables		)
-                        COMPONENTINFO( ::framework::PathSettings				)
+                        COMPONENTINFO( ::framework::MailToDispatcher                        )
+                        COMPONENTINFO( ::framework::NewMenuController                       )
+                        COMPONENTINFO( ::framework::ToolbarsMenuController                  )
+                        COMPONENTINFO( ::framework::MacrosMenuController                    )
+                        COMPONENTINFO( ::framework::FontSizeMenuController                  )
+                        COMPONENTINFO( ::framework::HeaderMenuController                    )
+                        COMPONENTINFO( ::framework::FooterMenuController                    )
+                        COMPONENTINFO( ::framework::FontMenuController                      )
+                        COMPONENTINFO( ::framework::ServiceHandler                          )
+                        COMPONENTINFO( ::framework::LogoImageStatusbarController            )
+                        COMPONENTINFO( ::framework::LogoTextStatusbarController             )
+                        COMPONENTINFO( ::framework::SimpleTextStatusbarController           )
+                        COMPONENTINFO( ::framework::UriAbbreviation                         )
+                        COMPONENTINFO( ::framework::LanguageSelectionMenuController         )
+                        COMPONENTINFO( ::framework::PopupMenuDispatcher                     )
+                        COMPONENTINFO( ::framework::DispatchHelper                          )
+                        COMPONENTINFO( ::framework::TabWindowService                        )
+                        COMPONENTINFO( ::framework::DispatchRecorder                        )
+                        COMPONENTINFO( ::framework::DispatchRecorderSupplier                )
+                        COMPONENTINFO( ::framework::Oxt_Handler                             )
+                        COMPONENTINFO( ::framework::License                                 )
                     )
 
-COMPONENTGETFACTORY	(	IFFACTORY( ::framework::MediaTypeDetectionHelper		)	else
-                        IFFACTORY( ::framework::SubstitutePathVariables			)	else
-                        IFFACTORY( ::framework::PathSettings					)
+COMPONENTGETFACTORY	(	IFFACTORY( ::framework::MediaTypeDetectionHelper		)	
+                        IFFACTORY( ::framework::MailToDispatcher                        ) else
+                        IFFACTORY( ::framework::ServiceHandler                          )   else
+                        IFFACTORY( ::framework::LogoTextStatusbarController             )	else
+                        IFFACTORY( ::framework::LogoImageStatusbarController            )   else
+                        IFFACTORY( ::framework::License                                 )   else
+                        IFFACTORY( ::framework::PopupMenuDispatcher                     )   else
+                        IFFACTORY( ::framework::DispatchHelper                          )   else
+                        IFFACTORY( ::framework::TabWindowService                        )   else
+                        IFFACTORY( ::framework::DispatchRecorder                        )   else
+                        IFFACTORY( ::framework::DispatchRecorderSupplier                )   else
+                        IFFACTORY( ::framework::SimpleTextStatusbarController           )   else
+                        IFFACTORY( ::framework::ToolbarsMenuController                  )	else
+                        IFFACTORY( ::framework::FontMenuController                      )   else
+                        IFFACTORY( ::framework::MacrosMenuController                    )   else
+                        IFFACTORY( ::framework::NewMenuController                       )   else
+                        IFFACTORY( ::framework::FontSizeMenuController                  )   else
+                        IFFACTORY( ::framework::UriAbbreviation                         )   else
+                        IFFACTORY( ::framework::FooterMenuController                    )   else
+                        IFFACTORY( ::framework::HeaderMenuController                    )   else
+                        IFFACTORY( ::framework::LanguageSelectionMenuController         )   else
+                        IFFACTORY( ::framework::Oxt_Handler                             )
                     )
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index f6841a7e0..ca7b94f2c 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -3180,15 +3180,13 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
     {
         case AUTORECOVERY_PROPHANDLE_EXISTS_RECOVERYDATA :
                 {
-                    css::uno::Any aSessionVal = ::comphelper::ConfigurationHelper::readDirectKey(
+                    sal_Bool bSessionData  = sal_False;
+                    ::comphelper::ConfigurationHelper::readDirectKey(
                                                     m_xSMGR,
                                                     CFG_PACKAGE_RECOVERY,
                                                     CFG_PATH_RECOVERYINFO,
                                                     CFG_ENTRY_SESSIONDATA,
-                                                    ::comphelper::ConfigurationHelper::E_READONLY);
-
-                    sal_Bool bSessionData  = sal_False;
-                    aSessionVal >>= bSessionData;
+                                                    ::comphelper::ConfigurationHelper::E_READONLY) >>= bSessionData;
 
                     sal_Bool bRecoveryData = ((sal_Bool)(m_lDocCache.size()>0));
 
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 767f41885..66da993f4 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -34,6 +34,7 @@
 #include "backingwindow.hxx"
 #include "framework.hrc"
 #include "classes/fwkresid.hxx"
+#include <services.h>
 
 #include "vcl/metric.hxx"
 #include "vcl/mnemonic.hxx"
@@ -198,9 +199,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     maToolbox.ShowItem( nItemId_Info );
 
     // get dispatch provider
-    mxDesktop = Reference<XDesktop>( comphelper::getProcessServiceFactory()->createInstance(
-                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ),
-                                        UNO_QUERY );
+    mxDesktop = Reference<XDesktop>( comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_DESKTOP ),UNO_QUERY );
     if( mxDesktop.is() )
         mxDesktopDispatchProvider = Reference< XDispatchProvider >( mxDesktop, UNO_QUERY );
     
@@ -712,9 +711,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
     {
         try
         {
-            Reference<lang::XMultiServiceFactory> xConfig( comphelper::getProcessServiceFactory()->createInstance(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
-                UNO_QUERY);
+            Reference<lang::XMultiServiceFactory> xConfig( comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_CFGPROVIDER),UNO_QUERY);
             if( xConfig.is() )
             {
                 Sequence<Any> args(1);
@@ -724,9 +721,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
                     Any(rtl::OUString::createFromAscii(pNodePath)),
                     PropertyState_DIRECT_VALUE);
                 args.getArray()[0] <<= val;
-                Reference<container::XNameAccess> xNameAccess(
-                    xConfig->createInstanceWithArguments(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
-                        args), UNO_QUERY);
+                Reference<container::XNameAccess> xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,args), UNO_QUERY);
                 if( xNameAccess.is() )
                 {
                     rtl::OUString sURL;
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index ebb9eb082..679554eab 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -82,6 +82,7 @@
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/document/UpdateDocMode.hpp>
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 29b3ff5c8..0413cbfdb 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -63,19 +63,6 @@ namespace framework{
 //_______________________________________________
 // XInterface, XTypeProvider, XServiceInfo
 
-DEFINE_XINTERFACE_4(DispatchHelper                                       ,
-                    OWeakObject                                          ,
-                    DIRECT_INTERFACE(css::lang::XTypeProvider           ),
-                    DIRECT_INTERFACE(css::lang::XServiceInfo            ),
-                    DIRECT_INTERFACE(css::frame::XDispatchHelper        ),
-                    DIRECT_INTERFACE(css::frame::XDispatchResultListener))
-
-DEFINE_XTYPEPROVIDER_4(DispatchHelper                     ,
-                       css::lang::XTypeProvider           ,
-                       css::lang::XServiceInfo            ,
-                       css::frame::XDispatchHelper        ,
-                       css::frame::XDispatchResultListener)
-
 DEFINE_XSERVICEINFO_MULTISERVICE(DispatchHelper                   ,
                                  ::cppu::OWeakObject              ,
                                  SERVICENAME_DISPATCHHELPER       ,
@@ -91,7 +78,6 @@ DEFINE_INIT_SERVICE( DispatchHelper, {} )
 */
 DispatchHelper::DispatchHelper( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR )
         :   ThreadHelpBase(     )
-        ,   OWeakObject   (     )
         // Init member
         ,   m_xSMGR       (xSMGR)
 {
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 6b3231b2b..f6e55c671 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -62,6 +62,7 @@
 //	interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/task/XJobExecutor.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
@@ -991,10 +992,9 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl
                         sal_Int32 nCount = xContainer->getCount();
                         for( sal_Int32 i=0; i<nCount; ++i )
                         {
-                            css::uno::Any aItem = xContainer->getByIndex(i);
                             css::uno::Reference< css::frame::XFrame > xSibling;
                             if (
-                                ( !(aItem>>=xSibling)                                 ) ||  // control unpacking
+                                ( !(xContainer->getByIndex(i)>>=xSibling)                                 ) ||  // control unpacking
                                 ( ! xSibling.is()                                     ) ||  // check for valid items
                                 ( xSibling==static_cast< ::cppu::OWeakObject* >(this) )     // ignore ourself! (We are a part of this container too - but search on our children was already done.)
                             )
@@ -2899,11 +2899,7 @@ void Frame::implts_setIconOnWindow()
         {
             try
             {
-                css::uno::Any aID = xSet->getPropertyValue( DECLARE_ASCII("IconId") );
-                if( aID.hasValue() == sal_True )
-                {
-                    aID >>= nIcon;
-                }
+                xSet->getPropertyValue( DECLARE_ASCII("IconId") )>>= nIcon;
             }
             catch( css::beans::UnknownPropertyException& )
             {
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index c71d1a109..0627707de 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -318,9 +318,9 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
 #endif
         // check if we need to show the license at all
         // open org.openoffice.Setup/Office/ooLicenseAcceptDate
-        ::rtl::OUString sConfigSrvc = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
+        ::rtl::OUString sConfigSrvc = SERVICENAME_CFGPROVIDER;
         ::rtl::OUString sAccessSrvc = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
-        ::rtl::OUString sReadSrvc   = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
+        ::rtl::OUString sReadSrvc   = SERVICENAME_CFGREADACCESS;
 
         // get configuration provider
         Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >(
@@ -332,11 +332,10 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
         theArgs[0] <<= v;
         Reference< XPropertySet > pset = Reference< XPropertySet >(
             theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
-        Any result = pset->getPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate"));
 
         // if we find a date there, compare it to baseinstall license date
         ::rtl::OUString aAcceptDate;
-        if (result >>= aAcceptDate)
+        if (pset->getPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate")) >>= aAcceptDate)
         {
             // get LicenseFileDate from base install
             ::rtl::OUString aLicenseURL = aLicensePath;
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 17016865d..b5b7cfe06 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -38,6 +38,7 @@
 #include <services.h>
 #include <svtools/inettype.hxx>
 #include <tools/string.hxx>
+#include <rtl/logfile.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -72,23 +73,6 @@ MediaTypeDetectionHelper::~MediaTypeDetectionHelper()
 {
 }
 
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-
-DEFINE_XINTERFACE_3					(	MediaTypeDetectionHelper
-                                        , OWeakObject
-                                        , DIRECT_INTERFACE( lang::XTypeProvider )
-                                        , DIRECT_INTERFACE( lang::XServiceInfo  )
-                                        , DIRECT_INTERFACE( util::XStringMapping )
-                                    )
-
-DEFINE_XTYPEPROVIDER_3				(	MediaTypeDetectionHelper
-                                        , lang::XTypeProvider
-                                        , lang::XServiceInfo
-                                        , util::XStringMapping
-                                    )
-
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE	(	MediaTypeDetectionHelper
                                         , ::cppu::OWeakObject
                                         , SERVICENAME_MEDIATYPEDETECTIONHELPER
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 1ad7cfb47..2bb57c30a 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -53,6 +53,7 @@
 
 //_______________________________________________
 // other includes
+#include <rtl/logfile.hxx>
 
 namespace framework
 {
@@ -194,7 +195,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
            css::uno::RuntimeException            )
 {
     ::comphelper::SequenceAsHashMap lProps(aValue);
-    if (lProps.size() < 1)
+    if (lProps.empty() )
     {
         throw css::lang::IllegalArgumentException(
                 ::rtl::OUString::createFromAscii("No properties given to replace part of module."),
@@ -254,10 +255,8 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
 {
     // get access to the element
     css::uno::Reference< css::container::XNameAccess > xCFG = implts_getConfig();
-    css::uno::Any aElement = xCFG->getByName(sName);
-
     css::uno::Reference< css::container::XNameAccess > xModule;
-    aElement >>= xModule;
+    xCFG->getByName(sName) >>= xModule;
     if (!xModule.is())
     {
         throw css::uno::RuntimeException(
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 0f19580d1..8871fea73 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -157,6 +157,7 @@ PathSettings::PathSettings( const css::uno::Reference< css::lang::XMultiServiceF
     ,   m_pPropHelp(0    )
     ,  m_bIgnoreEvents(sal_False)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::PathSettings" );
 }
 
 //-----------------------------------------------------------------------------
@@ -170,6 +171,7 @@ PathSettings::~PathSettings()
 void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEvent)
     throw (css::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::changesOccurred" );
     /*
     if (m_bIgnoreEvents)
         return;
@@ -206,6 +208,7 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven
 void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource)
     throw(css::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::disposing" );
     // SAFE ->
     WriteGuard aWriteLock(m_aLock);
 
@@ -219,6 +222,7 @@ void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource)
 //-----------------------------------------------------------------------------
 void PathSettings::impl_readAll()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_readAll" );
     RTL_LOGFILE_CONTEXT(aLog, "framework (as96863) ::PathSettings::load config (all)");
 
     // TODO think about me
@@ -241,6 +245,7 @@ void PathSettings::impl_readAll()
 // NO substitution here ! It's done outside ...
 OUStringList PathSettings::impl_readOldFormat(const ::rtl::OUString& sPath)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_readOldFormat" );
     css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgOld();
     css::uno::Any                                      aVal = xCfg->getByName(sPath);
 
@@ -308,6 +313,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& s
 //-----------------------------------------------------------------------------
 void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_storePath" );
     m_bIgnoreEvents = sal_True;
 
     css::uno::Reference< css::container::XNameAccess > xCfgNew = fa_getCfgNew();
@@ -356,6 +362,7 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath)
 void PathSettings::impl_mergeOldUserPaths(      PathSettings::PathInfo& rPath,
                                           const OUStringList&           lOld )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_mergeOldUserPaths" );
     OUStringList::const_iterator pIt;
     for (  pIt  = lOld.begin();
            pIt != lOld.end()  ;
@@ -654,6 +661,7 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath   ,
 {
     OUStringList::const_iterator pIt;
     OUStringList				 lTemp;
+    lTemp.reserve(rPath.lInternalPaths.size() + rPath.lUserPaths.size() + 1);
 
     for (  pIt  = rPath.lInternalPaths.begin();
            pIt != rPath.lInternalPaths.end()  ;
@@ -857,7 +865,7 @@ void PathSettings::impl_setPathValue(      sal_Int32      nID ,
                 if (aChangePath.bIsSinglePath)
                 {
                     LOG_ASSERT2(lList.size()>1, "PathSettings::impl_setPathValue()", "You try to set more then path value for a defined SINGLE_PATH!")
-                    if (lList.size()>0)
+                    if ( !lList.empty() )
                         aChangePath.sWritePath = *(lList.begin());
                     else
                         aChangePath.sWritePath = ::rtl::OUString();
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 66bb9710d..ee766efee 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -295,7 +295,7 @@ void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSu
 
             SubstituteRuleVector aRuleSet;
             ReadSharePointRuleSetFromConfiguration( aSharePointNames[ nSharePoints ], aSharePointNodeName, aRuleSet );
-            if ( aRuleSet.size() > 0 )
+            if ( !aRuleSet.empty() )
             {
                 // We have at minimum one rule. Filter the correct rule out of the rule set
                 // and put into our SubstituteVariable map
@@ -409,10 +409,11 @@ sal_Bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector
 {
     sal_Bool bResult = sal_False;
 
-    if ( aRuleSet.size() >= 1 )
+    if ( !aRuleSet.empty() )
     {
         sal_Int16	nPrioCurrentRule = aEnvPrioTable[ ET_UNKNOWN ];
-        for ( sal_Int32 nIndex = 0; nIndex < (sal_Int32)aRuleSet.size(); nIndex++ )
+        const sal_uInt32 nCount = aRuleSet.size();
+        for ( sal_uInt32 nIndex = 0; nIndex < nCount; nIndex++ )
         {
             const SubstituteRule& aRule = aRuleSet[nIndex];
             EnvironmentType eEnvType	= aRule.aEnvType;
@@ -587,19 +588,6 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration(
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_3                    (   SubstitutePathVariables                                  ,
-                                            OWeakObject                                             ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider              ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo               ),
-                                            DIRECT_INTERFACE( css::util::XStringSubstitution		)
-                                        )
-
-DEFINE_XTYPEPROVIDER_3                  (   SubstitutePathVariables				,
-                                            css::lang::XTypeProvider			,
-                                            css::lang::XServiceInfo				,
-                                            css::util::XStringSubstitution
-                                        )
-
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   SubstitutePathVariables						,
                                             ::cppu::OWeakObject							,
                                             SERVICENAME_SUBSTITUTEPATHVARIABLES			,
@@ -616,6 +604,7 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiService
     m_aImpl( LINK( this, SubstitutePathVariables, implts_ConfigurationNotify )),
     m_xServiceManager( xServiceManager )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::SubstitutePathVariables" );
     int i;
 
     SetPredefinedPathVariables( m_aPreDefVars );
@@ -674,6 +663,7 @@ SubstitutePathVariables::~SubstitutePathVariables()
 rtl::OUString SAL_CALL SubstitutePathVariables::substituteVariables( const ::rtl::OUString& aText, sal_Bool bSubstRequired )
 throw ( NoSuchElementException, RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::substituteVariables" );
     ResetableGuard aLock( m_aLock );
     return impl_substituteVariable( aText, bSubstRequired );
 }
@@ -681,6 +671,7 @@ throw ( NoSuchElementException, RuntimeException )
 rtl::OUString SAL_CALL SubstitutePathVariables::reSubstituteVariables( const ::rtl::OUString& aText )
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::reSubstituteVariables" );
     ResetableGuard aLock( m_aLock );
     return impl_reSubstituteVariables( aText );
 }
@@ -688,6 +679,7 @@ throw ( RuntimeException )
 rtl::OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const ::rtl::OUString& aVariable )
 throw ( NoSuchElementException, RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::getSubstituteVariableValue" );
     ResetableGuard aLock( m_aLock );
     return impl_getSubstituteVariableValue( aVariable );
 }
@@ -707,6 +699,7 @@ IMPL_LINK( SubstitutePathVariables, implts_ConfigurationNotify, SubstitutePathNo
 
 rtl::OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::ConvertOSLtoUCBURL" );
     String			aResult;
     rtl::OUString	aTemp;
 
@@ -722,28 +715,28 @@ rtl::OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const rtl::OUString&
 
 rtl::OUString SubstitutePathVariables::GetWorkPath() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetWorkPath" );
     rtl::OUString aWorkPath;
-    css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
+    ::comphelper::ConfigurationHelper::readDirectKey(
                             m_xServiceManager,
                             ::rtl::OUString::createFromAscii("org.openoffice.Office.Paths"),
                             ::rtl::OUString::createFromAscii("Paths/Work"),
                             ::rtl::OUString::createFromAscii("WritePath"),
-                            ::comphelper::ConfigurationHelper::E_READONLY);
-    aVal >>= aWorkPath;
+                            ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath;
     return aWorkPath;
 }
 
 rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const
 {
-    css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetWorkVariableValue" );
+    ::rtl::OUString aWorkPath;
+    ::comphelper::ConfigurationHelper::readDirectKey(
                             m_xServiceManager,
                             ::rtl::OUString::createFromAscii("org.openoffice.Office.Paths"),
                             ::rtl::OUString::createFromAscii("Variables"),
                             ::rtl::OUString::createFromAscii("Work"),
-                            ::comphelper::ConfigurationHelper::E_READONLY);
-    ::rtl::OUString aWorkPath;
-    aVal >>= aWorkPath;
-
+                            ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath;
+    
     // fallback to $HOME in  case platform dependend config layer does not return
     // an usuable work dir value.
     if (aWorkPath.getLength() < 1)
@@ -756,6 +749,7 @@ rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const
 
 rtl::OUString SubstitutePathVariables::GetHomeVariableValue() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetHomeVariableValue" );
     osl::Security	aSecurity;
     rtl::OUString	aHomePath;
 
@@ -765,6 +759,7 @@ rtl::OUString SubstitutePathVariables::GetHomeVariableValue() const
 
 rtl::OUString SubstitutePathVariables::GetPathVariableValue() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetPathVariableValue" );
     const int PATH_EXTEND_FACTOR = 120;
 
     rtl::OUString aRetStr;
@@ -801,6 +796,7 @@ rtl::OUString SubstitutePathVariables::GetPathVariableValue() const
 rtl::OUString SubstitutePathVariables::impl_substituteVariable( const ::rtl::OUString& rText, sal_Bool bSubstRequired )
 throw ( NoSuchElementException, RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::impl_substituteVariable" );
     // This is maximal recursive depth supported!
     const sal_Int32 nMaxRecursiveDepth = 8;
 
@@ -928,7 +924,8 @@ throw ( NoSuchElementException, RuntimeException )
         else
         {
             // Check for recursion
-            for ( sal_Int32 i=0; i < (sal_Int32)aEndlessRecursiveDetector.size(); i++ )
+            const sal_uInt32 nCount = aEndlessRecursiveDetector.size();
+            for ( sal_uInt32 i=0; i < nCount; i++ )
             {
                 if ( aEndlessRecursiveDetector[i] == aWorkText )
                 {
@@ -992,6 +989,7 @@ throw ( NoSuchElementException, RuntimeException )
 rtl::OUString SubstitutePathVariables::impl_reSubstituteVariables( const ::rtl::OUString& rURL )
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::impl_reSubstituteVariables" );
     rtl::OUString aURL;
 
     INetURLObject aUrl( rURL );
@@ -1096,6 +1094,7 @@ throw ( RuntimeException )
 ::rtl::OUString SubstitutePathVariables::impl_getSubstituteVariableValue( const ::rtl::OUString& rVariable )
 throw ( NoSuchElementException, RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::impl_getSubstituteVariableValue" );
     rtl::OUString aVariable;
 
     sal_Int32 nPos = rVariable.indexOf( m_aVarStart );
@@ -1148,6 +1147,7 @@ throw ( NoSuchElementException, RuntimeException )
 
 void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariables& aPreDefPathVariables )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::SetPredefinedPathVariables" );
     Any aAny;
     ::rtl::OUString aOfficePath;
     ::rtl::OUString aUserPath;
@@ -1204,9 +1204,8 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
 
     // Detect the language type of the current office
     aPreDefPathVariables.m_eLanguageType = LANGUAGE_ENGLISH_US;
-    Any aLocale = utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE );
     rtl::OUString aLocaleStr;
-    if ( aLocale >>= aLocaleStr )
+    if ( utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE ) >>= aLocaleStr )
         aPreDefPathVariables.m_eLanguageType = MsLangId::convertIsoStringToLanguage( aLocaleStr );
     else
     {
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index ad8177f5e..c7655f5cc 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -55,19 +55,6 @@ namespace css = ::com::sun::star;
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_3                (    UriAbbreviation                                                         ,
-                                        cppu::OWeakObject													    ,
-                                        DIRECT_INTERFACE(css::lang::XTypeProvider								),
-                                        DIRECT_INTERFACE(css::lang::XServiceInfo								),
-                                        DIRECT_INTERFACE(css::util::XStringAbbreviation                         )
-                                    )
-
-DEFINE_XTYPEPROVIDER_3              (   UriAbbreviation                                                         ,
-                                        css::lang::XTypeProvider												,
-                                        css::lang::XServiceInfo													,
-                                        css::util::XStringAbbreviation
-                                    )
-
 DEFINE_XSERVICEINFO_MULTISERVICE_2 (	UriAbbreviation															,
                                         ::cppu::OWeakObject                                                     ,
                                         SERVICENAME_STRINGABBREVIATION										    ,
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 6d8000694..f04827592 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -77,21 +77,11 @@ using namespace ::com::sun::star::util			;
 //*****************************************************************************************************************
 //	constructor
 //*****************************************************************************************************************
-URLTransformer::URLTransformer( const Reference< XMultiServiceFactory >& xFactory )
-        //	Init baseclasses first
-        //	Attention:
-        //		Don't change order of initialization!
-        //      ThreadHelpBase is a struct with a mutex as member. We can't use a mutex as member, while
-        //		we must garant right initialization and a valid value of this! First initialize
-        //		baseclasses and then members. And we need the mutex for other baseclasses !!!
-        :   ThreadHelpBase  ( &Application::GetSolarMutex() )
-        ,   OWeakObject     (                               )
-        // Init member
-        ,   m_xFactory      ( xFactory                      )
+URLTransformer::URLTransformer( const Reference< XMultiServiceFactory >& /*xFactory*/ )
 {
     // Safe impossible cases.
     // Method not defined for all incoming parameter.
-    LOG_ASSERT( xFactory.is(), "URLTransformer::URLTransformer()\nInvalid parameter detected!\n" )
+    //LOG_ASSERT( xFactory.is(), "URLTransformer::URLTransformer()\nInvalid parameter detected!\n" )
 }
 
 //*****************************************************************************************************************
@@ -105,19 +95,6 @@ URLTransformer::~URLTransformer()
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
 
-DEFINE_XINTERFACE_3					(	URLTransformer						,
-                                        OWeakObject					  		,
-                                        DIRECT_INTERFACE(XTypeProvider		),
-                                        DIRECT_INTERFACE(XServiceInfo		),
-                                        DIRECT_INTERFACE(XURLTransformer	)
-                                    )
-
-DEFINE_XTYPEPROVIDER_3				(	URLTransformer	,
-                                        XTypeProvider	,
-                                        XServiceInfo	,
-                                        XURLTransformer
-                                    )
-
 DEFINE_XSERVICEINFO_MULTISERVICE	(	URLTransformer						,
                                         OWeakObject                         ,
                                         SERVICENAME_URLTRANSFORMER			,
@@ -129,21 +106,68 @@ DEFINE_INIT_SERVICE                 (   URLTransformer,
                                         }
                                     )
 
+namespace
+{
+    void lcl_ParserHelper(INetURLObject& _rParser,URL& _rURL,bool _bUseIntern)
+    {
+        // Get all information about this URL.
+        _rURL.Protocol	= INetURLObject::GetScheme( _rParser.GetProtocol() );
+        _rURL.User		= _rParser.GetUser	( INetURLObject::DECODE_WITH_CHARSET );
+        _rURL.Password	= _rParser.GetPass	( INetURLObject::DECODE_WITH_CHARSET );
+        _rURL.Server		= _rParser.GetHost	( INetURLObject::DECODE_WITH_CHARSET );
+        _rURL.Port		= (sal_Int16)_rParser.GetPort();
+
+        sal_Int32 nCount = _rParser.getSegmentCount( false );
+        if ( nCount > 0 )
+        {
+            // Don't add last segment as it is the name!
+            --nCount;
+
+            rtl::OUStringBuffer aPath;
+            for ( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
+            {
+                aPath.append( sal_Unicode( '/' ));
+                aPath.append( _rParser.getName( nIndex, false, INetURLObject::NO_DECODE ));
+            }
+
+            if ( nCount > 0 )
+                aPath.append( sal_Unicode( '/' )); // final slash!
+
+            _rURL.Path = aPath.makeStringAndClear();
+            _rURL.Name = _rParser.getName( INetURLObject::LAST_SEGMENT, false, INetURLObject::NO_DECODE );
+        }
+        else
+        {
+            _rURL.Path       = _rParser.GetURLPath( INetURLObject::NO_DECODE           );
+            _rURL.Name		= _rParser.GetName	(									 );
+        }
+
+        _rURL.Arguments  = _rParser.GetParam  ( INetURLObject::NO_DECODE           );
+        _rURL.Mark		= _rParser.GetMark	( INetURLObject::DECODE_WITH_CHARSET );
+
+        // INetURLObject supports only an intelligent method of parsing URL's. So write
+        // back Complete to have a valid encoded URL in all cases!
+        _rURL.Complete	= _rParser.GetMainURL( INetURLObject::NO_DECODE           );
+        if ( _bUseIntern )
+            _rURL.Complete   = _rURL.Complete.intern();
+
+        _rParser.SetMark	( ::rtl::OUString() );
+        _rParser.SetParam( ::rtl::OUString() );
+
+        _rURL.Main       = _rParser.GetMainURL( INetURLObject::NO_DECODE           );
+    }
+}
 //*****************************************************************************************************************
 //	XURLTransformer
 //*****************************************************************************************************************
 sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeException )
 {
-    // Ready for multithreading
-    ResetableGuard aGuard( m_aLock );
-
     // Safe impossible cases.
     if	(( &aURL						==	NULL	)	||
          ( aURL.Complete.getLength()	<	1		)		)
     {
         return sal_False;
     }
-
     // Try to extract the protocol
     sal_Int32 nURLIndex = aURL.Complete.indexOf( sal_Unicode( ':' ));
     ::rtl::OUString aProtocol;
@@ -165,50 +189,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti
             }
             else if ( !aParser.HasError() )
             {
-                aURL.Protocol	= INetURLObject::GetScheme( aParser.GetProtocol() );
-                aURL.User		= aParser.GetUser	( INetURLObject::DECODE_WITH_CHARSET );
-                aURL.Password	= aParser.GetPass	( INetURLObject::DECODE_WITH_CHARSET );
-                aURL.Server		= aParser.GetHost	( INetURLObject::DECODE_WITH_CHARSET );
-                aURL.Port		= (sal_Int16)aParser.GetPort();
-
-                sal_Int32 nCount = aParser.getSegmentCount( false );
-                if ( nCount > 0 )
-                {
-                    // Don't add last segment as it is the name!
-                    --nCount;
-
-                    rtl::OUStringBuffer aPath;
-                    for ( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
-                    {
-                        aPath.append( sal_Unicode( '/' ));
-                        aPath.append( aParser.getName( nIndex, false, INetURLObject::NO_DECODE ));
-                    }
-
-                    if ( nCount > 0 )
-                        aPath.append( sal_Unicode( '/' )); // final slash!
-
-                    aURL.Path = aPath.makeStringAndClear();
-                    aURL.Name = aParser.getName( INetURLObject::LAST_SEGMENT, false, INetURLObject::NO_DECODE );
-                }
-                else
-                {
-                    aURL.Path       = aParser.GetURLPath( INetURLObject::NO_DECODE           );
-                    aURL.Name		= aParser.GetName	(									 );
-                }
-
-                aURL.Arguments  = aParser.GetParam  ( INetURLObject::NO_DECODE           );
-                aURL.Mark		= aParser.GetMark	( INetURLObject::DECODE_WITH_CHARSET );
-
-                // INetURLObject supports only an intelligent method of parsing URL's. So write
-                // back Complete to have a valid encoded URL in all cases!
-                aURL.Complete	= aParser.GetMainURL( INetURLObject::NO_DECODE           );
-                aURL.Complete   = aURL.Complete.intern();
-
-                aParser.SetMark	( ::rtl::OUString() );
-                aParser.SetParam( ::rtl::OUString() );
-
-                aURL.Main       = aParser.GetMainURL( INetURLObject::NO_DECODE           );
-
+                lcl_ParserHelper(aParser,aURL,false);
                 // Return "URL is parsed".
                 return sal_True;
             }
@@ -235,8 +216,6 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti
 sal_Bool SAL_CALL URLTransformer::parseSmart(			URL&		aURL			,
                                                 const	::rtl::OUString&	sSmartProtocol	) throw( RuntimeException )
 {
-    // Ready for multithreading
-    ResetableGuard aGuard( m_aLock );
     // Safe impossible cases.
     if	(( &aURL							==	NULL	) ||
          ( aURL.Complete.getLength()		<	1		)	 )
@@ -251,48 +230,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart(			URL&		aURL			,
     bool bOk = aParser.SetSmartURL( aURL.Complete );
     if ( bOk )
     {
-        // Get all information about this URL.
-        aURL.Protocol	= INetURLObject::GetScheme( aParser.GetProtocol() );
-        aURL.User		= aParser.GetUser	( INetURLObject::DECODE_WITH_CHARSET );
-        aURL.Password	= aParser.GetPass	( INetURLObject::DECODE_WITH_CHARSET );
-        aURL.Server		= aParser.GetHost	( INetURLObject::DECODE_WITH_CHARSET );
-        aURL.Port		= (sal_Int16)aParser.GetPort();
-
-        sal_Int32 nCount = aParser.getSegmentCount( false );
-        if ( nCount > 0 )
-        {
-            // Don't add last segment as it is the name!
-            --nCount;
-
-            rtl::OUStringBuffer aPath;
-            for ( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
-            {
-                aPath.append( sal_Unicode( '/' ));
-                aPath.append( aParser.getName( nIndex, false, INetURLObject::NO_DECODE ));
-            }
-
-            if ( nCount > 0 )
-                aPath.append( sal_Unicode( '/' )); // final slash!
-
-            aURL.Path = aPath.makeStringAndClear();
-            aURL.Name = aParser.getName( INetURLObject::LAST_SEGMENT, false, INetURLObject::NO_DECODE );
-        }
-        else
-        {
-            aURL.Path       = aParser.GetURLPath( INetURLObject::NO_DECODE           );
-            aURL.Name		= aParser.GetName	(									 );
-        }
-
-        aURL.Arguments  = aParser.GetParam  ( INetURLObject::NO_DECODE           );
-        aURL.Mark		= aParser.GetMark	( INetURLObject::DECODE_WITH_CHARSET );
-
-        aURL.Complete	= aParser.GetMainURL( INetURLObject::NO_DECODE           );
-
-        aParser.SetMark	( ::rtl::OUString() );
-        aParser.SetParam( ::rtl::OUString() );
-
-        aURL.Main       = aParser.GetMainURL( INetURLObject::NO_DECODE           );
-
+        lcl_ParserHelper(aParser,aURL,true);
         // Return "URL is parsed".
         return sal_True;
     }
@@ -333,9 +271,6 @@ sal_Bool SAL_CALL URLTransformer::parseSmart(			URL&		aURL			,
 //*****************************************************************************************************************
 sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException )
 {
-    // Ready for multithreading
-    ResetableGuard aGuard( m_aLock );
-
     // Safe impossible cases.
     if	( &aURL == NULL )
         return sal_False ;
@@ -400,9 +335,6 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
 ::rtl::OUString SAL_CALL URLTransformer::getPresentation(	const	URL&		aURL			,
                                                             sal_Bool	bWithPassword	) throw( RuntimeException )
 {
-    // Ready for multithreading
-    ResetableGuard aGuard( m_aLock );
-
     // Safe impossible cases.
     if	(( &aURL						==	NULL		)	||
          ( aURL.Complete.getLength()	<	1			)	||
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 5a3431bd4..72d7b4a1c 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/WindowDescriptor.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-
+#include <com/sun/star/lang/DisposedException.hpp>
 //_________________________________________________________________________________________________________________
 //	includes of other projects
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index 6bf4eafd4..bde6ef752 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -70,19 +70,6 @@ namespace framework
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_3                    (    TabWinFactory                                                  ,
-                                            OWeakObject                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                       ),
-                                            DIRECT_INTERFACE( css::lang::XSingleComponentFactory			)
-                                        )
-
-DEFINE_XTYPEPROVIDER_3                  (   TabWinFactory		                            ,
-                                            css::lang::XTypeProvider			            ,
-                                            css::lang::XServiceInfo				            ,
-                                            css::lang::XSingleComponentFactory
-                                        )
-
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   TabWinFactory				                    ,
                                             ::cppu::OWeakObject							    ,
                                             SERVICENAME_TABWINFACTORY	                    ,
diff --git a/framework/source/threadhelp/transactionmanager.cxx b/framework/source/threadhelp/transactionmanager.cxx
index 3b1519fa2..17b06afa6 100644
--- a/framework/source/threadhelp/transactionmanager.cxx
+++ b/framework/source/threadhelp/transactionmanager.cxx
@@ -43,7 +43,7 @@
 //_________________________________________________________________________________________________________________
 //	interface includes
 //_________________________________________________________________________________________________________________
-
+#include <com/sun/star/lang/DisposedException.hpp>
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx
index aee1b9e0a..658d18df0 100644
--- a/framework/source/uiconfiguration/graphicnameaccess.cxx
+++ b/framework/source/uiconfiguration/graphicnameaccess.cxx
@@ -103,7 +103,7 @@ throw(::com::sun::star::uno::RuntimeException)
 sal_Bool SAL_CALL GraphicNameAccess::hasElements()
 throw( uno::RuntimeException )
 {
-    return ( m_aNameToElementMap.size() > 0 );
+    return ( !m_aNameToElementMap.empty() );
 }
 
 uno::Type SAL_CALL GraphicNameAccess::getElementType()
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
dissimilarity index 81%
index 06af65cf5..18eb67dea 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -1,1133 +1,257 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: imagemanager.cxx,v $
- * $Revision: 1.16.82.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-#include <uiconfiguration/imagemanager.hxx>
-#include <threadhelp/resetableguard.hxx>
-#include <xml/imagesconfiguration.hxx>
-#include <uiconfiguration/graphicnameaccess.hxx>
-#include <services.h>
-
-#include "properties.h"
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/ui/UIElementType.hpp>
-#include <com/sun/star/ui/ConfigurationEvent.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/ui/ImageType.hpp>
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-
-#include <vcl/svapp.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/mutex.hxx>
-#include <comphelper/sequence.hxx>
-#include <tools/urlobj.hxx>
-#include <unotools/ucbstreamhelper.hxx>
-#include <vcl/pngread.hxx>
-#include <vcl/pngwrite.hxx>
-
-//_________________________________________________________________________________________________________________
-//	namespaces
-//_________________________________________________________________________________________________________________
-
-using ::rtl::OUString;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::XInterface;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::makeAny;
-using ::com::sun::star::graphic::XGraphic;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::embed;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::ui;
-
-// Image sizes for our toolbars/menus
-const sal_Int32 IMAGE_SIZE_NORMAL         = 16;
-const sal_Int32 IMAGE_SIZE_LARGE          = 26;
-const sal_Int16 MAX_IMAGETYPE_VALUE       = ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST|
-                                            ::com::sun::star::ui::ImageType::SIZE_LARGE;
-
-static const char   IMAGE_FOLDER[]        = "images";
-static const char   BITMAPS_FOLDER[]      = "Bitmaps";
-static const char   IMAGE_EXTENSION[]     = ".png";
-
-static const char*  IMAGELIST_XML_FILE[]  =
-{
-    "sc_imagelist.xml",
-    "lc_imagelist.xml",
-    "sch_imagelist.xml",
-    "lch_imagelist.xml"
-};
-
-static const char*  BITMAP_FILE_NAMES[]   =
-{
-    "sc_userimages.png",
-    "lc_userimages.png",
-    "sch_userimages.png",
-    "lch_userimages.png"
-};
-
-namespace framework
-{
-
-static char ModuleImageList[] = "private:resource/images/moduleimages";
-
-typedef GraphicNameAccess CmdToXGraphicNameAccess;
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_6                    (    ImageManager                                                    ,
-                                            OWeakObject                                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
-                                            DIRECT_INTERFACE( css::lang::XComponent                                         ),
-                                            DIRECT_INTERFACE( css::lang::XInitialization                                    ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XImageManager                     ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfiguration                  ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationPersistence       )
-                                        )
-
-DEFINE_XTYPEPROVIDER_6                  (   ImageManager                                          ,
-                                            css::lang::XTypeProvider			                        ,
-                                            css::lang::XComponent                                       ,
-                                            css::lang::XInitialization                                  ,
-                                            ::com::sun::star::ui::XImageManager                   ,
-                                            ::com::sun::star::ui::XUIConfiguration                ,
-                                            ::com::sun::star::ui::XUIConfigurationPersistence
-                                        )
-
-DEFINE_XSERVICEINFO_MULTISERVICE        (   ImageManager						,
-                                            ::cppu::OWeakObject                 ,
-                                            SERVICENAME_IMAGEMANAGER			,
-                                            IMPLEMENTATIONNAME_IMAGEMANAGER
-                                        )
-
-DEFINE_INIT_SERVICE                     (   ImageManager, {} )
-
-static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGraphic, const uno::Reference< XGraphic >& rInGraphic, sal_Int16 nImageType )
-{
-    static Size   aNormSize( IMAGE_SIZE_NORMAL, IMAGE_SIZE_NORMAL );
-    static Size   aLargeSize( IMAGE_SIZE_LARGE, IMAGE_SIZE_LARGE );
-
-    if ( !rInGraphic.is() )
-    {
-        rOutGraphic = Image().GetXGraphic();
-        return sal_False;
-    }
-
-    // Check size and scale it
-    Image  aImage( rInGraphic );
-    Size   aSize = aImage.GetSizePixel();
-    bool   bMustScale( false );
-
-    if (( nImageType == ImageType_Color_Large ) ||
-        ( nImageType == ImageType_HC_Large ))
-        bMustScale = ( aSize != aLargeSize );
-    else
-        bMustScale = ( aSize != aNormSize );
-
-    if ( bMustScale )
-    {
-        BitmapEx aBitmap = aImage.GetBitmapEx();
-        aBitmap.Scale( aNormSize );
-        aImage = Image( aBitmap );
-        rOutGraphic = aImage.GetXGraphic();
-    }
-    else
-        rOutGraphic = rInGraphic;
-    return sal_True;
-}
-
-static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType )
-{
-    sal_Int16 nIndex( 0 );
-    if ( nImageType & ::com::sun::star::ui::ImageType::SIZE_LARGE )
-        nIndex += 1;
-    if ( nImageType & ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST )
-        nIndex += 2;
-    return nIndex;
-}
-
-ImageList* ImageManager::implts_getUserImageList( ImageType nImageType )
-{
-    ResetableGuard aGuard( m_aLock );
-    if ( !m_pUserImageList[nImageType] )
-        implts_loadUserImages( nImageType, m_xUserImageStorage, m_xUserBitmapsStorage );
-
-    return m_pUserImageList[nImageType];
-}
-
-void ImageManager::implts_initialize()
-{
-    // Initialize the top-level structures with the storage data
-    if ( m_xUserConfigStorage.is() )
-    {
-        long nModes = m_bReadOnly ? ElementModes::READ : ElementModes::READWRITE;
-
-        try
-        {
-            m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ),
-                                                                            nModes );
-            if ( m_xUserImageStorage.is() )
-            {
-                m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
-                                                                                 nModes );
-            }
-        }
-        catch ( com::sun::star::container::NoSuchElementException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
-        {
-        }
-        catch ( ::com::sun::star::lang::IllegalArgumentException& )
-        {
-        }
-        catch ( ::com::sun::star::io::IOException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
-        {
-        }
-    }
-}
-
-sal_Bool ImageManager::implts_loadUserImages(
-    ImageType nImageType,
-    const uno::Reference< XStorage >& xUserImageStorage,
-    const uno::Reference< XStorage >& xUserBitmapsStorage )
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( xUserImageStorage.is() && xUserBitmapsStorage.is() )
-    {
-        try
-        {
-            uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ),
-                                                                                      ElementModes::READ );
-            uno::Reference< XInputStream > xInputStream = xStream->getInputStream();
-
-            ImageListsDescriptor aUserImageListInfo;
-            ImagesConfiguration::LoadImages( m_xServiceManager,
-                                             xInputStream,
-                                             aUserImageListInfo );
-            if (( aUserImageListInfo.pImageList != 0 ) &&
-                ( aUserImageListInfo.pImageList->Count() > 0 ))
-            {
-                ImageListItemDescriptor* pList = aUserImageListInfo.pImageList->GetObject(0);
-                sal_Int32 nCount = pList->pImageItemList->Count();
-
-                std::vector< OUString > aUserImagesVector;
-                for ( USHORT i=0; i < nCount; i++ )
-                {
-                    const ImageItemDescriptor* pItem = pList->pImageItemList->GetObject(i);
-                    aUserImagesVector.push_back( pItem->aCommandURL );
-                }
-
-                uno::Reference< XStream > xBitmapStream = xUserBitmapsStorage->openStreamElement(
-                                                        rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ),
-                                                        ElementModes::READ );
-
-                if ( xBitmapStream.is() )
-                {
-                    SvStream* pSvStream( 0 );
-                    BitmapEx aUserBitmap;
-                    {
-                        pSvStream = utl::UcbStreamHelper::CreateStream( xBitmapStream );
-                        vcl::PNGReader aPngReader( *pSvStream );
-                        aUserBitmap = aPngReader.Read();
-                    }
-                    delete pSvStream;
-
-                    // Delete old image list and create a new one from the read bitmap
-                    delete m_pUserImageList[nImageType];
-                    m_pUserImageList[nImageType] = new ImageList();
-                    m_pUserImageList[nImageType]->InsertFromHorizontalStrip
-                        ( aUserBitmap, aUserImagesVector );
-                    return sal_True;
-                }
-            }
-        }
-        catch ( com::sun::star::container::NoSuchElementException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
-        {
-        }
-        catch ( ::com::sun::star::lang::IllegalArgumentException& )
-        {
-        }
-        catch ( ::com::sun::star::io::IOException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
-        {
-        }
-    }
-
-    // Destroy old image list - create a new empty one
-    delete m_pUserImageList[nImageType];
-    m_pUserImageList[nImageType] = new ImageList;
-
-    return sal_True;
-}
-
-sal_Bool ImageManager::implts_storeUserImages(
-    ImageType nImageType,
-    const uno::Reference< XStorage >& xUserImageStorage,
-    const uno::Reference< XStorage >& xUserBitmapsStorage )
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bModified )
-    {
-        ImageList* pImageList = implts_getUserImageList( nImageType );
-        if ( pImageList->GetImageCount() > 0 )
-        {
-            ImageListsDescriptor aUserImageListInfo;
-            aUserImageListInfo.pImageList = new ImageListDescriptor;
-
-            ImageListItemDescriptor* pList = new ImageListItemDescriptor;
-            aUserImageListInfo.pImageList->Insert( pList, 0 );
-
-            pList->pImageItemList = new ImageItemListDescriptor;
-            for ( USHORT i=0; i < pImageList->GetImageCount(); i++ )
-            {
-                ImageItemDescriptor* pItem = new ::framework::ImageItemDescriptor;
-
-                pItem->nIndex = i;
-                pItem->aCommandURL = pImageList->GetImageName( i );
-                pList->pImageItemList->Insert( pItem, pList->pImageItemList->Count() );
-            }
-
-            pList->aURL = String::CreateFromAscii("Bitmaps/");
-            pList->aURL += String::CreateFromAscii( BITMAP_FILE_NAMES[nImageType] );
-
-            uno::Reference< XTransactedObject > xTransaction;
-            uno::Reference< XOutputStream >     xOutputStream;
-            uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ),
-                                                                                      ElementModes::WRITE|ElementModes::TRUNCATE );
-            if ( xStream.is() )
-            {
-                uno::Reference< XStream > xBitmapStream =
-                    xUserBitmapsStorage->openStreamElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ),
-                                                            ElementModes::WRITE|ElementModes::TRUNCATE );
-                if ( xBitmapStream.is() )
-                {
-                    SvStream* pSvStream = utl::UcbStreamHelper::CreateStream( xBitmapStream );
-                    {
-                        vcl::PNGWriter aPngWriter( pImageList->GetAsHorizontalStrip() );
-                        aPngWriter.Write( *pSvStream );
-                    }
-                    delete pSvStream;
-
-                    // Commit user bitmaps storage
-                    xTransaction = uno::Reference< XTransactedObject >( xUserBitmapsStorage, UNO_QUERY );
-                    if ( xTransaction.is() )
-                        xTransaction->commit();
-                }
-
-                xOutputStream = xStream->getOutputStream();
-                if ( xOutputStream.is() )
-                    ImagesConfiguration::StoreImages( m_xServiceManager, xOutputStream, aUserImageListInfo );
-
-                // Commit user image storage
-                xTransaction = uno::Reference< XTransactedObject >( xUserImageStorage, UNO_QUERY );
-                if ( xTransaction.is() )
-                    xTransaction->commit();
-            }
-
-            return sal_True;
-        }
-        else
-        {
-            // Remove the streams from the storage, if we have no data. We have to catch
-            // the NoSuchElementException as it can be possible that there is no stream at all!
-            try
-            {
-                xUserImageStorage->removeElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ));
-            }
-            catch ( ::com::sun::star::container::NoSuchElementException& )
-            {
-            }
-
-            try
-            {
-                xUserBitmapsStorage->removeElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ));
-            }
-            catch ( ::com::sun::star::container::NoSuchElementException& )
-            {
-            }
-
-            uno::Reference< XTransactedObject > xTransaction;
-            
-            // Commit user image storage
-            xTransaction = uno::Reference< XTransactedObject >( xUserImageStorage, UNO_QUERY );
-            if ( xTransaction.is() )
-                xTransaction->commit();
-
-            // Commit user bitmaps storage
-            xTransaction = uno::Reference< XTransactedObject >( xUserBitmapsStorage, UNO_QUERY );
-            if ( xTransaction.is() )
-                xTransaction->commit();
-            
-            return sal_True;
-        }
-    }
-
-    return sal_False;
-}
-
-ImageManager::ImageManager( uno::Reference< XMultiServiceFactory > xServiceManager ) :
-    ThreadHelpBase( &Application::GetSolarMutex() )
-    , m_xUserConfigStorage( 0 )
-    , m_xUserImageStorage( 0 )
-    , m_xUserBitmapsStorage( 0 )
-    , m_bReadOnly( true )
-    , m_bInitialized( false )
-    , m_bModified( false )
-    , m_bConfigRead( false )
-    , m_bDisposed( false )
-    , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" ))
-    , m_aResourceString( RTL_CONSTASCII_USTRINGPARAM( ModuleImageList ))
-    , m_xServiceManager( xServiceManager )
-    , m_aListenerContainer( m_aLock.getShareableOslMutex() )
-{
-    for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
-    {
-        m_pUserImageList[n] = 0;
-        m_bUserImageListModified[n] = false;
-    }
-}
-
-ImageManager::~ImageManager()
-{
-    ResetableGuard aGuard( m_aLock );
-    for ( sal_Int32 n = 0; n < ImageType_COUNT; n++ )
-    {
-        delete m_pUserImageList[n];
-        m_pUserImageList[n] = 0;
-    }
-}
-
-// XComponent
-void SAL_CALL ImageManager::dispose() throw (::com::sun::star::uno::RuntimeException)
-{
-    uno::Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
-
-    css::lang::EventObject aEvent( xThis );
-    m_aListenerContainer.disposeAndClear( aEvent );
-
-    {
-        ResetableGuard aGuard( m_aLock );
-        m_xUserConfigStorage.clear();
-        m_xUserImageStorage.clear();
-        m_bConfigRead = false;
-        m_bModified = false;
-        m_bDisposed = true;
-    }
-}
-
-void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    {
-        ResetableGuard aGuard( m_aLock );
-
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-    }
-
-    m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< XEventListener >* ) NULL ), xListener );
-}
-
-void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< XEventListener >* ) NULL ), xListener );
-}
-
-// Non-UNO methods
-void ImageManager::setStorage( const uno::Reference< XStorage >& Storage )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    m_xUserConfigStorage = Storage;
-    implts_initialize();
-}
-
-// XInitialization
-void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( !m_bInitialized )
-    {
-        for ( sal_Int32 n = 0; n < aArguments.getLength(); n++ )
-        {
-            PropertyValue aPropValue;
-            if ( aArguments[n] >>= aPropValue )
-            {
-                if ( aPropValue.Name.equalsAscii( "UserConfigStorage" ))
-                {
-                    aPropValue.Value >>= m_xUserConfigStorage;
-                }
-                else if ( aPropValue.Name.equalsAscii( "ModuleIdentifier" ))
-                {
-                    aPropValue.Value >>= m_aModuleIdentifier;
-                }
-            }
-        }
-
-        if ( m_xUserConfigStorage.is() )
-        {
-            uno::Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
-            if ( xPropSet.is() )
-            {
-                long nOpenMode = 0;
-                Any a = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenMode" )));
-                if ( a >>= nOpenMode )
-                    m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
-            }
-        }
-
-        implts_initialize();
-
-        m_bInitialized = true;
-    }
-}
-
-// XImageManager
-void SAL_CALL ImageManager::reset()
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    std::vector< OUString > aUserImageNames;
-
-    for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
-    {
-        aUserImageNames.clear();
-        ImageList* pImageList = implts_getUserImageList( ImageType(i));
-        pImageList->GetImageNames( aUserImageNames );
-
-        Sequence< rtl::OUString > aRemoveList( aUserImageNames.size() );
-        for ( sal_uInt32 j = 0; j < aUserImageNames.size(); j++ )
-            aRemoveList[j] = aUserImageNames[j];
-
-        // Remove images
-        removeImages( sal_Int16( i ), aRemoveList );
-        m_bUserImageListModified[i] = true;
-    }
-
-    m_bModified = sal_True;
-}
-
-Sequence< ::rtl::OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    sal_uInt32 i( 0 );
-    sal_Int16  nIndex     = implts_convertImageTypeToIndex( nImageType );
-    ImageList* pImageList = implts_getUserImageList( ImageType( nIndex ));
-
-    std::vector< OUString > aUserImageNames;
-    pImageList->GetImageNames( aUserImageNames );
-
-    Sequence< OUString > aImageNameSeq( aUserImageNames.size() );
-    for ( i = 0; i < aUserImageNames.size(); i++ )
-        aImageNameSeq[i] = aUserImageNames[i];
-
-    return aImageNameSeq;
-}
-
-::sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL )
-throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE ))
-        throw IllegalArgumentException();
-
-    sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
-    ImageList* pImageList = implts_getUserImageList( ImageType( nIndex ));
-    if ( pImageList )
-        return ( pImageList->GetImagePos( aCommandURL ) != IMAGELIST_IMAGE_NOTFOUND );
-
-    return sal_False;
-}
-
-Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages(
-    ::sal_Int16 nImageType,
-    const Sequence< ::rtl::OUString >& aCommandURLSequence )
-throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE ))
-        throw IllegalArgumentException();
-
-    Sequence< uno::Reference< XGraphic > > aGraphSeq( aCommandURLSequence.getLength() );
-
-    const rtl::OUString* aStrArray      = aCommandURLSequence.getConstArray();
-    sal_Int16            nIndex         = implts_convertImageTypeToIndex( nImageType );
-    ImageList*           pUserImageList = implts_getUserImageList( ImageType( nIndex ));
-
-    for ( sal_Int32 n = 0; n < aCommandURLSequence.getLength(); n++ )
-    {
-        Image aImage = pUserImageList->GetImage( aStrArray[n] );
-        aGraphSeq[n] = aImage.GetXGraphic();
-    }
-
-    return aGraphSeq;
-}
-
-void SAL_CALL ImageManager::replaceImages( 
-    ::sal_Int16 nImageType, 
-    const Sequence< ::rtl::OUString >& aCommandURLSequence, 
-    const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) 
-throw ( ::com::sun::star::lang::IllegalArgumentException, 
-        ::com::sun::star::lang::IllegalAccessException, 
-        ::com::sun::star::uno::RuntimeException)
-{
-    CmdToXGraphicNameAccess* pInsertedImages( 0 );
-    CmdToXGraphicNameAccess* pReplacedImages( 0 );
-    
-    {
-        ResetableGuard aLock( m_aLock );
-            
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        if (( aCommandURLSequence.getLength() != aGraphicsSequence.getLength() ) ||
-            (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE )))
-            throw IllegalArgumentException();
-
-        if ( m_bReadOnly )
-            throw IllegalAccessException();
-
-        sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
-        ImageList* pImageList = implts_getUserImageList( ImageType( nIndex ));
-        
-        uno::Reference< XGraphic > xGraphic;
-        for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
-        {
-            // Check size and scale. If we don't have any graphics ignore it
-            if ( !implts_checkAndScaleGraphic( xGraphic, aGraphicsSequence[i], nIndex ))
-                continue;
-            
-            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
-            if ( nPos == IMAGELIST_IMAGE_NOTFOUND )
-            {
-                pImageList->AddImage( aCommandURLSequence[i], xGraphic );
-                if ( !pInsertedImages )
-                    pInsertedImages = new CmdToXGraphicNameAccess();
-                pInsertedImages->addElement( aCommandURLSequence[i], xGraphic );
-            }
-            else
-            {
-                pImageList->ReplaceImage( aCommandURLSequence[i], xGraphic );
-                if ( !pReplacedImages )
-                    pReplacedImages = new CmdToXGraphicNameAccess();
-                pReplacedImages->addElement( aCommandURLSequence[i], xGraphic );
-            }
-        }
-
-        if (( pInsertedImages != 0 ) || (  pReplacedImages != 0 ))
-        {
-            m_bModified = sal_True;
-            m_bUserImageListModified[nIndex] = true;
-        }
-    }
-
-    // Notify listeners
-    uno::Reference< XImageManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    uno::Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-    if ( pInsertedImages != 0 )
-    {
-        ConfigurationEvent aInsertEvent;
-        aInsertEvent.aInfo           = uno::makeAny( nImageType );
-        aInsertEvent.Accessor        = uno::makeAny( xThis );
-        aInsertEvent.Source          = xIfac;
-        aInsertEvent.ResourceURL     = m_aResourceString;
-        aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                        static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
-        implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
-    }
-    if ( pReplacedImages != 0 )
-    {
-        ConfigurationEvent aReplaceEvent;
-        aReplaceEvent.aInfo           = uno::makeAny( nImageType );
-        aReplaceEvent.Accessor        = uno::makeAny( xThis );
-        aReplaceEvent.Source          = xIfac;
-        aReplaceEvent.ResourceURL     = m_aResourceString;
-        aReplaceEvent.ReplacedElement = Any();
-        aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                            static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
-        implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
-    }
-}
-
-void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) 
-throw ( ::com::sun::star::lang::IllegalArgumentException, 
-        ::com::sun::star::lang::IllegalAccessException, 
-        ::com::sun::star::uno::RuntimeException)
-{
-    CmdToXGraphicNameAccess* pRemovedImages( 0 );
-
-    {
-        ResetableGuard aLock( m_aLock );
-            
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        if (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE ))
-            throw IllegalArgumentException();
-
-        if ( m_bReadOnly )
-            throw IllegalAccessException();
-
-        sal_Int16                   nIndex      = implts_convertImageTypeToIndex( nImageType );
-        ImageList*                  pImageList  = implts_getUserImageList( ImageType( nIndex ));
-        uno::Reference< XGraphic >  xEmptyGraphic( Image().GetXGraphic() );
-        
-        for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
-        {
-            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
-            if ( nPos != IMAGELIST_IMAGE_NOTFOUND )
-            {
-                Image aImage = pImageList->GetImage( nPos );
-                USHORT nId   = pImageList->GetImageId( nPos );
-                pImageList->RemoveImage( nId );
-
-                if ( !pRemovedImages )
-                    pRemovedImages = new CmdToXGraphicNameAccess();
-                pRemovedImages->addElement( aCommandURLSequence[i], xEmptyGraphic );
-            }
-        }
-        
-        if ( pRemovedImages != 0 )
-        {
-            m_bModified = sal_True;
-            m_bUserImageListModified[nIndex] = true;
-        }
-    }
-
-    // Notify listeners
-    uno::Reference< XImageManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    uno::Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-    if ( pRemovedImages != 0 )
-    {
-        ConfigurationEvent aRemoveEvent;
-        aRemoveEvent.aInfo           = uno::makeAny( nImageType );
-        aRemoveEvent.Accessor        = uno::makeAny( xThis );
-        aRemoveEvent.Source          = xIfac;
-        aRemoveEvent.ResourceURL     = m_aResourceString;
-        aRemoveEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                            static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
-        implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove );
-    }
-}
-
-void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) 
-throw ( ::com::sun::star::container::ElementExistException, 
-        ::com::sun::star::lang::IllegalArgumentException, 
-        ::com::sun::star::lang::IllegalAccessException, 
-        ::com::sun::star::uno::RuntimeException)
-{
-    CmdToXGraphicNameAccess* pInsertedImages( 0 );
-    CmdToXGraphicNameAccess* pReplacedImages( 0 );
-
-    {
-        ResetableGuard aLock( m_aLock );
-            
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        if (( aCommandURLSequence.getLength() != aGraphicSequence.getLength() ) ||
-            (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE )))
-            throw IllegalArgumentException();
-
-        if ( m_bReadOnly )
-            throw IllegalAccessException();
-
-        sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
-        ImageList* pImageList = implts_getUserImageList( ImageType( nIndex ));
-        
-        uno::Reference< XGraphic > xGraphic;
-        for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
-        {
-            if ( !implts_checkAndScaleGraphic( xGraphic, aGraphicSequence[i], nIndex ))
-                continue;
-
-            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
-            if ( nPos == IMAGELIST_IMAGE_NOTFOUND )
-            {
-                pImageList->AddImage( aCommandURLSequence[i], xGraphic );
-                if ( !pInsertedImages )
-                    pInsertedImages = new CmdToXGraphicNameAccess();
-                pInsertedImages->addElement( aCommandURLSequence[i], xGraphic );
-            }
-            else
-            {
-                pImageList->ReplaceImage( aCommandURLSequence[i], xGraphic );
-                if ( !pReplacedImages )
-                    pReplacedImages = new CmdToXGraphicNameAccess();
-                pReplacedImages->addElement( aCommandURLSequence[i], xGraphic );
-            }
-        }
-        
-        if (( pInsertedImages != 0 ) || ( pReplacedImages != 0 ))
-        {
-            m_bModified = sal_True;
-            m_bUserImageListModified[nIndex] = true;
-        }
-    }
-
-    // Notify listeners
-    uno::Reference< XImageManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    uno::Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-    if ( pInsertedImages != 0 )
-    {
-        ConfigurationEvent aInsertEvent;
-        aInsertEvent.aInfo           = uno::makeAny( nImageType );
-        aInsertEvent.Accessor        = uno::makeAny( xThis );
-        aInsertEvent.Source          = xIfac;
-        aInsertEvent.ResourceURL     = m_aResourceString;
-        aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                        static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
-        implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
-    }
-    if ( pReplacedImages != 0 )
-    {
-        ConfigurationEvent aReplaceEvent;
-        aReplaceEvent.aInfo           = uno::makeAny( nImageType );
-        aReplaceEvent.Accessor        = uno::makeAny( xThis );
-        aReplaceEvent.Source          = xIfac;
-        aReplaceEvent.ResourceURL     = m_aResourceString;
-        aReplaceEvent.ReplacedElement = Any();
-        aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                         static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
-        implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
-    }
-}
-
-// XUIConfiguration
-void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) 
-throw (::com::sun::star::uno::RuntimeException)
-{
-    {
-        ResetableGuard aGuard( m_aLock );
-    
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-    }
-        
-    m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< XUIConfigurationListener >* ) NULL ), xListener );
-}
-
-void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) 
-throw (::com::sun::star::uno::RuntimeException)
-{
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< XUIConfigurationListener >* ) NULL ), xListener );
-}
-
-// XUIConfigurationPersistence
-void SAL_CALL ImageManager::reload() 
-throw ( ::com::sun::star::uno::Exception, 
-        ::com::sun::star::uno::RuntimeException )
-{
-    ResetableGuard aGuard( m_aLock );
-
-    uno::Reference< uno::XInterface > xRefThis( static_cast< OWeakObject* >( this ));
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    CommandMap                   aOldUserCmdImageSet;   
-    std::vector< rtl::OUString > aNewUserCmdImageSet;
-    
-    if ( m_bModified )
-    {
-        uno::Reference< XImageManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-        uno::Reference< XInterface > xIfac( xThis, UNO_QUERY );
-                
-        for ( sal_Int16 i = 0; i < sal_Int16( ImageType_COUNT ); i++ )
-        {
-            if ( !m_bDisposed && m_bUserImageListModified[i] )
-            {
-                std::vector< rtl::OUString > aOldUserCmdImageVector;
-                ImageList* pImageList = implts_getUserImageList( (ImageType)i );
-                pImageList->GetImageNames( aOldUserCmdImageVector );
-
-                // Fill hash map to speed up search afterwards
-                sal_uInt32 j( 0 );
-                for ( j = 0; j < aOldUserCmdImageVector.size(); j++ )
-                    aOldUserCmdImageSet.insert( CommandMap::value_type( aOldUserCmdImageVector[j], false ));
-                
-                // Attention: This can make the old image list pointer invalid!
-                implts_loadUserImages( (ImageType)i, m_xUserImageStorage, m_xUserBitmapsStorage );
-                pImageList = implts_getUserImageList( (ImageType)i );
-                pImageList->GetImageNames( aNewUserCmdImageSet );
-            
-                CmdToXGraphicNameAccess* pInsertedImages( 0 );
-                CmdToXGraphicNameAccess* pReplacedImages( 0 );
-                CmdToXGraphicNameAccess* pRemovedImages( 0 );
-
-                for ( j = 0; j < aNewUserCmdImageSet.size(); j++ )
-                {
-                    CommandMap::iterator pIter = aOldUserCmdImageSet.find( aNewUserCmdImageSet[j] );
-                    if ( pIter != aOldUserCmdImageSet.end() )
-                    {
-                        pIter->second = true; // mark entry as replaced
-                        if ( !pReplacedImages )
-                            pReplacedImages = new CmdToXGraphicNameAccess();
-                        pReplacedImages->addElement( aNewUserCmdImageSet[j], 
-                                                     pImageList->GetImage( aNewUserCmdImageSet[j] ).GetXGraphic() );
-                    }
-                    else
-                    {
-                        if ( !pInsertedImages )
-                            pInsertedImages = new CmdToXGraphicNameAccess();
-                        pInsertedImages->addElement( aNewUserCmdImageSet[j], 
-                                                     pImageList->GetImage( aNewUserCmdImageSet[j] ).GetXGraphic() );
-                    }
-                }
-
-                // Search map for unmarked entries => they have been removed from the user list 
-                // through this reload operation. 
-                uno::Reference< XGraphic >        xEmptyGraphic( Image().GetXGraphic() );
-                CommandMap::const_iterator        pIter = aOldUserCmdImageSet.begin();
-                while ( pIter != aOldUserCmdImageSet.end() )
-                {
-                    if ( !pIter->second )
-                    {
-                        // No image in the user image list => remove user image
-                        if ( !pRemovedImages )
-                            pRemovedImages = new CmdToXGraphicNameAccess();
-                        pRemovedImages->addElement( pIter->first, xEmptyGraphic );
-                    }
-                    ++pIter;
-                }
-                
-                aGuard.unlock();
-                
-                // Now notify our listeners. Unlock mutex to prevent deadlocks
-                if ( pInsertedImages != 0 )
-                {
-                    ConfigurationEvent aInsertEvent;
-                    aInsertEvent.aInfo           = uno::makeAny( i );
-                    aInsertEvent.Accessor        = uno::makeAny( xThis );
-                    aInsertEvent.Source          = xIfac;
-                    aInsertEvent.ResourceURL     = m_aResourceString;
-                    aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                                    static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
-                    implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
-                }
-                if ( pReplacedImages != 0 )
-                {
-                    ConfigurationEvent aReplaceEvent;
-                    aReplaceEvent.aInfo           = uno::makeAny( i );
-                    aReplaceEvent.Accessor        = uno::makeAny( xThis );
-                    aReplaceEvent.Source          = xIfac;
-                    aReplaceEvent.ResourceURL     = m_aResourceString;
-                    aReplaceEvent.ReplacedElement = Any();
-                    aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                                    static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
-                    implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
-                }
-                if ( pRemovedImages != 0 )
-                {
-                    ConfigurationEvent aRemoveEvent;
-                    aRemoveEvent.aInfo           = uno::makeAny( i );
-                    aRemoveEvent.Accessor        = uno::makeAny( xThis );
-                    aRemoveEvent.Source          = xIfac;
-                    aRemoveEvent.ResourceURL     = m_aResourceString;
-                    aRemoveEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                                        static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
-                    implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove );
-                }
-
-                aGuard.lock();
-            }
-        }
-    }
-}
-
-void SAL_CALL ImageManager::store() 
-throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_bModified )
-    {
-        sal_Bool bWritten( sal_False );
-        for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
-        {
-            sal_Bool bSuccess = implts_storeUserImages( ImageType(i), m_xUserImageStorage, m_xUserBitmapsStorage );
-            if ( bSuccess )
-                bWritten = sal_True;
-            m_bUserImageListModified[i] = false;
-        }
-
-        if ( bWritten && 
-             m_xUserConfigStorage.is())
-        {
-            uno::Reference< XTransactedObject > xUserConfigStorageCommit( m_xUserConfigStorage, UNO_QUERY );
-            if ( xUserConfigStorageCommit.is() )
-                xUserConfigStorageCommit->commit();
-        }
-
-        m_bModified = sal_False;
-    }
-}
-
-void SAL_CALL ImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) 
-throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_bModified && Storage.is() )
-    {
-        long nModes = ElementModes::READWRITE;
-
-        uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ), 
-                                                                                    nModes );
-        if ( xUserImageStorage.is() )
-        {
-            uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
-                                                                                                    nModes );
-            for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
-            {
-                implts_getUserImageList( (ImageType)i );
-                implts_storeUserImages( (ImageType)i, xUserImageStorage, xUserBitmapsStorage );
-            }
-        
-            uno::Reference< XTransactedObject > xTransaction( Storage, UNO_QUERY );
-            if ( xTransaction.is() )
-                xTransaction->commit();
-        }
-    }
-}
-
-sal_Bool SAL_CALL ImageManager::isModified() 
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    return m_bModified;
-}
-
-sal_Bool SAL_CALL ImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    return m_bReadOnly;
-}
-
-void ImageManager::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp )
-{
-    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( 
-                                        ::getCppuType( ( const css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >*) NULL ) );
-    if ( pContainer != NULL )
-    {
-        ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
-        while ( pIterator.hasMoreElements() )
-        {
-            try
-            {
-                switch ( eOp )
-                {
-                    case NotifyOp_Replace:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementReplaced( aEvent );
-                        break;
-                    case NotifyOp_Insert:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementInserted( aEvent );
-                        break;
-                    case NotifyOp_Remove:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementRemoved( aEvent );
-                        break;
-                }
-            }
-            catch( css::uno::RuntimeException& )
-            {
-                pIterator.remove();
-            }
-        }
-    }
-}
-
-} // namespace framework
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: imagemanager.cxx,v $
+ * $Revision: 1.16.82.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+#include <uiconfiguration/imagemanager.hxx>
+#include <threadhelp/resetableguard.hxx>
+#include <xml/imagesconfiguration.hxx>
+#include <uiconfiguration/graphicnameaccess.hxx>
+#include <services.h>
+#include "imagemanagerimpl.hxx"
+
+#include "properties.h"
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/ui/ConfigurationEvent.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/ui/ImageType.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <vcl/svapp.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <osl/mutex.hxx>
+#include <comphelper/sequence.hxx>
+#include <tools/urlobj.hxx>
+#include <unotools/ucbstreamhelper.hxx>
+#include <vcl/pngread.hxx>
+#include <vcl/pngwrite.hxx>
+#include <rtl/logfile.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespaces
+//_________________________________________________________________________________________________________________
+
+using ::rtl::OUString;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::XInterface;
+using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::RuntimeException;
+using ::com::sun::star::uno::UNO_QUERY;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::makeAny;
+using ::com::sun::star::graphic::XGraphic;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::embed;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::ui;
+
+// Image sizes for our toolbars/menus
+const sal_Int32 IMAGE_SIZE_NORMAL         = 16;
+const sal_Int32 IMAGE_SIZE_LARGE          = 26;
+const sal_Int16 MAX_IMAGETYPE_VALUE       = ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST|
+                                            ::com::sun::star::ui::ImageType::SIZE_LARGE;
+
+namespace framework
+{
+
+typedef GraphicNameAccess CmdToXGraphicNameAccess;
+
+//*****************************************************************************************************************
+//	XInterface, XTypeProvider, XServiceInfo
+//*****************************************************************************************************************
+DEFINE_XSERVICEINFO_MULTISERVICE        (   ImageManager						,
+                                            ::cppu::OWeakObject                 ,
+                                            SERVICENAME_IMAGEMANAGER			,
+                                            IMPLEMENTATIONNAME_IMAGEMANAGER
+                                        )
+
+DEFINE_INIT_SERVICE                     (   ImageManager, {} )
+
+ImageManager::ImageManager( uno::Reference< XMultiServiceFactory > xServiceManager ) :
+    ThreadHelpBase( &Application::GetSolarMutex() )
+    , m_pImpl( new ImageManagerImpl(xServiceManager,static_cast< OWeakObject* >(this),false) )
+{
+}
+
+ImageManager::~ImageManager()
+{
+    m_pImpl->clear();
+}
+
+// XComponent
+void SAL_CALL ImageManager::dispose() throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->dispose();
+}
+
+void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->addEventListener(xListener);
+}
+
+void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    m_pImpl->removeEventListener(xListener);
+}
+
+// Non-UNO methods
+void ImageManager::setStorage( const uno::Reference< XStorage >& Storage )
+throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aLock( m_pImpl->m_aLock );
+
+    m_pImpl->m_xUserConfigStorage = Storage;
+    m_pImpl->implts_initialize();
+}
+
+// XInitialization
+void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
+{
+    m_pImpl->initialize(aArguments);
+}
+
+// XImageManager
+void SAL_CALL ImageManager::reset()
+throw (::com::sun::star::uno::RuntimeException)
+{
+
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    m_pImpl->reset();
+}
+
+Sequence< ::rtl::OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType )
+throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->getAllImageNames( nImageType );
+}
+
+::sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL )
+throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->hasImage(nImageType,aCommandURL);   
+}
+
+Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages(
+    ::sal_Int16 nImageType,
+    const Sequence< ::rtl::OUString >& aCommandURLSequence )
+throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
+{
+    return m_pImpl->getImages(nImageType,aCommandURLSequence);
+}
+
+void SAL_CALL ImageManager::replaceImages( 
+    ::sal_Int16 nImageType, 
+    const Sequence< ::rtl::OUString >& aCommandURLSequence, 
+    const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) 
+throw ( ::com::sun::star::lang::IllegalArgumentException, 
+        ::com::sun::star::lang::IllegalAccessException, 
+        ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence);
+}
+
+void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) 
+throw ( ::com::sun::star::lang::IllegalArgumentException, 
+        ::com::sun::star::lang::IllegalAccessException, 
+        ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->removeImages(nImageType,aCommandURLSequence);
+}
+
+void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) 
+throw ( ::com::sun::star::container::ElementExistException, 
+        ::com::sun::star::lang::IllegalArgumentException, 
+        ::com::sun::star::lang::IllegalAccessException, 
+        ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence);
+}
+
+// XUIConfiguration
+void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) 
+throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->addConfigurationListener(xListener);
+}
+
+void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) 
+throw (::com::sun::star::uno::RuntimeException)
+{
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    m_pImpl->removeConfigurationListener(xListener);
+}
+
+// XUIConfigurationPersistence
+void SAL_CALL ImageManager::reload() 
+throw ( ::com::sun::star::uno::Exception, 
+        ::com::sun::star::uno::RuntimeException )
+{
+    m_pImpl->reload();
+}
+
+void SAL_CALL ImageManager::store() 
+throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->store();
+}
+
+void SAL_CALL ImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) 
+throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->storeToStorage(Storage);
+}
+
+sal_Bool SAL_CALL ImageManager::isModified() 
+throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->isModified();
+}
+
+sal_Bool SAL_CALL ImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->isReadOnly();
+}
+
+} // namespace framework
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
new file mode 100755
index 000000000..2ba2e105d
--- /dev/null
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -0,0 +1,1466 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: ImageManagerImpl.cxx,v $
+ * $Revision: 1.16.82.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+#include <imagemanagerimpl.hxx>
+#include <threadhelp/resetableguard.hxx>
+#include <xml/imagesconfiguration.hxx>
+#include <uiconfiguration/graphicnameaccess.hxx>
+#include <services.h>
+
+#include "properties.h"
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/ui/ConfigurationEvent.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/ui/ImageType.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <vcl/svapp.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <osl/mutex.hxx>
+#include <comphelper/sequence.hxx>
+#include <tools/urlobj.hxx>
+#include <unotools/ucbstreamhelper.hxx>
+#include <vcl/pngread.hxx>
+#include <vcl/pngwrite.hxx>
+#include <rtl/logfile.hxx>
+#include "svtools/miscopt.hxx"
+
+//_________________________________________________________________________________________________________________
+//	namespaces
+//_________________________________________________________________________________________________________________
+
+using ::rtl::OUString;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::XInterface;
+using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::RuntimeException;
+using ::com::sun::star::uno::UNO_QUERY;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::makeAny;
+using ::com::sun::star::graphic::XGraphic;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::embed;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::ui;
+using namespace ::cppu;
+
+// Image sizes for our toolbars/menus
+const sal_Int32 IMAGE_SIZE_NORMAL         = 16;
+const sal_Int32 IMAGE_SIZE_LARGE          = 26;
+const sal_Int16 MAX_IMAGETYPE_VALUE       = ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST|
+                                            ::com::sun::star::ui::ImageType::SIZE_LARGE;
+
+static const char   IMAGE_FOLDER[]        = "images";
+static const char   BITMAPS_FOLDER[]      = "Bitmaps";
+static const char   IMAGE_EXTENSION[]     = ".png";
+
+static const char*  IMAGELIST_XML_FILE[]  =
+{
+    "sc_imagelist.xml",
+    "lc_imagelist.xml",
+    "sch_imagelist.xml",
+    "lch_imagelist.xml"
+};
+
+static const char*  BITMAP_FILE_NAMES[]   =
+{
+    "sc_userimages.png",
+    "lc_userimages.png",
+    "sch_userimages.png",
+    "lch_userimages.png"
+};
+
+namespace framework
+{
+    static char ModuleImageList[] = "private:resource/images/moduleimages";
+    static osl::Mutex*          pImageListWrapperMutex = 0;
+    static GlobalImageList*     pGlobalImageList = 0;
+    static const char* ImageType_Prefixes[ImageType_COUNT] =
+    {
+        "res/commandimagelist/sc_",
+        "res/commandimagelist/lc_",
+        "res/commandimagelist/sch_",
+        "res/commandimagelist/lch_"
+    };
+
+typedef GraphicNameAccess CmdToXGraphicNameAccess;
+
+static osl::Mutex& getGlobalImageListMutex()
+{
+    if ( pImageListWrapperMutex == 0 )
+    {
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        if ( pImageListWrapperMutex == 0 )
+            pImageListWrapperMutex = new osl::Mutex;
+    }
+
+    return *pImageListWrapperMutex;
+}
+
+static GlobalImageList* getGlobalImageList( const uno::Reference< XMultiServiceFactory >& rServiceManager )
+{
+    osl::MutexGuard guard( getGlobalImageListMutex() );
+
+    if ( pGlobalImageList == 0 )
+        pGlobalImageList = new GlobalImageList( rServiceManager );
+
+    return pGlobalImageList;
+}
+
+static rtl::OUString getCanonicalName( const rtl::OUString& rFileName )
+{
+    bool               bRemoveSlash( true );
+    sal_Int32          nLength = rFileName.getLength();
+    const sal_Unicode* pString = rFileName.getStr();
+
+    rtl::OUStringBuffer aBuf( nLength );
+    for ( sal_Int32 i = 0; i < nLength; i++ )
+    {
+        const sal_Unicode c = pString[i];
+        switch ( c )
+        {
+            // map forbidden characters to escape
+            case '/' : if ( !bRemoveSlash )
+                         aBuf.appendAscii( "%2f" ); 
+                       break;
+            case '\\': aBuf.appendAscii( "%5c" ); bRemoveSlash = false; break;
+            case ':' : aBuf.appendAscii( "%3a" ); bRemoveSlash = false; break;
+            case '*' : aBuf.appendAscii( "%2a" ); bRemoveSlash = false; break;
+            case '?' : aBuf.appendAscii( "%3f" ); bRemoveSlash = false; break;
+            case '<' : aBuf.appendAscii( "%3c" ); bRemoveSlash = false; break;
+            case '>' : aBuf.appendAscii( "%3e" ); bRemoveSlash = false; break;
+            case '|' : aBuf.appendAscii( "%7c" ); bRemoveSlash = false; break;
+            default: aBuf.append( c ); bRemoveSlash = false; 
+        }
+    }
+    return aBuf.makeStringAndClear();
+}
+
+//_________________________________________________________________________________________________________________
+
+CmdImageList::CmdImageList( const uno::Reference< XMultiServiceFactory >& rServiceManager, const rtl::OUString& aModuleIdentifier ) :
+    m_bVectorInit( sal_False ),
+    m_aModuleIdentifier( aModuleIdentifier ),
+    m_xServiceManager( rServiceManager ),
+    m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
+{
+    for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
+        m_pImageList[n] = 0;
+}
+
+CmdImageList::~CmdImageList()
+{
+    for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
+        delete m_pImageList[n];
+}
+
+void CmdImageList::impl_fillCommandToImageNameMap()
+{
+    RTL_LOGFILE_CONTEXT( aLog, "framework: CmdImageList::impl_fillCommandToImageNameMap" );
+
+    if ( !m_bVectorInit )
+    {
+        const rtl::OUString aCommandImageList( RTL_CONSTASCII_USTRINGPARAM( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST ));
+        Sequence< OUString > aCmdImageSeq;
+        uno::Reference< XNameAccess > xCmdDesc( m_xServiceManager->createInstance(
+                                                SERVICENAME_UICOMMANDDESCRIPTION ),
+                                            UNO_QUERY );
+
+        if ( m_aModuleIdentifier.getLength() > 0 )
+        {
+            // If we have a module identifier - use to retrieve the command image name list from it.
+            // Otherwise we will use the global command image list
+            try
+            {
+                xCmdDesc->getByName( m_aModuleIdentifier ) >>= xCmdDesc;
+                if ( xCmdDesc.is() )
+                    xCmdDesc->getByName( aCommandImageList ) >>= aCmdImageSeq;
+            }
+            catch ( NoSuchElementException& )
+            {
+                // Module unknown we will work with an empty command image list!
+                return;
+            }
+        }
+
+        if ( xCmdDesc.is() )
+        {
+            try
+            {
+                xCmdDesc->getByName( aCommandImageList ) >>= aCmdImageSeq;
+            }
+            catch ( NoSuchElementException& )
+            {
+            }
+            catch ( WrappedTargetException& )
+            {
+            }
+        }
+
+        // We have to map commands which uses special characters like '/',':','?','\','<'.'>','|'
+        String aExt = String::CreateFromAscii( IMAGE_EXTENSION );
+        m_aImageCommandNameVector.resize(aCmdImageSeq.getLength() );
+        m_aImageNameVector.resize( aCmdImageSeq.getLength() );
+
+        ::std::copy( aCmdImageSeq.getConstArray(),
+                     aCmdImageSeq.getConstArray()+aCmdImageSeq.getLength(),
+                     m_aImageCommandNameVector.begin() );
+
+        // Create a image name vector that must be provided to the vcl imagelist. We also need
+        // a command to image name map to speed up access time for image retrieval.
+        OUString aUNOString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
+        String   aEmptyString;
+        const sal_uInt32 nCount = m_aImageCommandNameVector.size();
+        for ( sal_uInt32 i = 0; i < nCount; i++ )
+        {
+            OUString aCommandName( m_aImageCommandNameVector[i] );
+            String   aImageName;
+            
+            if ( aCommandName.indexOf( aUNOString ) != 0 )
+            {
+                INetURLObject aUrlObject( aCommandName, INetURLObject::ENCODE_ALL );
+                aImageName = aUrlObject.GetURLPath();
+                aImageName = getCanonicalName( aImageName ); // convert to valid filename
+            }
+            else
+            {
+                // just remove the schema 
+                if ( aCommandName.getLength() > 5 )
+                    aImageName = aCommandName.copy( 5 );
+                else
+                    aImageName = aEmptyString;
+                
+                // Search for query part. 
+                sal_Int32 nIndex = aImageName.Search( '?' );
+                if ( nIndex != STRING_NOTFOUND )
+                    aImageName = getCanonicalName( aImageName ); // convert to valid filename
+            }
+            // Image names are not case-dependent. Always use lower case characters to
+            // reflect this.
+            aImageName += aExt;
+            aImageName.ToLowerAscii();
+            
+            m_aImageNameVector[i] = aImageName;
+            m_aCommandToImageNameMap.insert( CommandToImageNameMap::value_type( aCommandName, aImageName ));
+        }
+
+        m_bVectorInit = sal_True;
+    }
+}
+
+ImageList* CmdImageList::impl_getImageList( sal_Int16 nImageType )
+{
+    SvtMiscOptions aMiscOptions;
+
+    sal_Int16 nSymbolsStyle = aMiscOptions.GetCurrentSymbolsStyle();
+    if ( nSymbolsStyle != m_nSymbolsStyle )
+    {
+        m_nSymbolsStyle = nSymbolsStyle;
+        for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
+            delete m_pImageList[n], m_pImageList[n] = NULL;
+    }
+
+    if ( !m_pImageList[nImageType] )
+    {
+        m_pImageList[nImageType] = new ImageList( m_aImageNameVector,
+                                                  OUString::createFromAscii( ImageType_Prefixes[nImageType] ) );
+    }
+
+    return m_pImageList[nImageType];
+}
+
+std::vector< ::rtl::OUString >& CmdImageList::impl_getImageNameVector()
+{
+    return m_aImageNameVector;
+}
+
+std::vector< rtl::OUString >& CmdImageList::impl_getImageCommandNameVector()
+{
+    return m_aImageCommandNameVector;
+}
+
+Image CmdImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL )
+{
+    impl_fillCommandToImageNameMap();
+    CommandToImageNameMap::const_iterator pIter = m_aCommandToImageNameMap.find( rCommandURL );
+    if ( pIter != m_aCommandToImageNameMap.end() )
+    {
+        ImageList* pImageList = impl_getImageList( nImageType );
+        return pImageList->GetImage( pIter->second );
+    }
+
+    return Image();
+}
+
+bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const rtl::OUString& rCommandURL )
+{
+    impl_fillCommandToImageNameMap();
+    CommandToImageNameMap::const_iterator pIter = m_aCommandToImageNameMap.find( rCommandURL );
+    if ( pIter != m_aCommandToImageNameMap.end() )
+        return true;
+    else
+        return false;
+}
+
+::std::vector< rtl::OUString >& CmdImageList::getImageNames()
+{
+    return impl_getImageNameVector();
+}
+
+::std::vector< rtl::OUString >& CmdImageList::getImageCommandNames()
+{
+    return impl_getImageCommandNameVector();
+}
+
+//_________________________________________________________________________________________________________________
+
+GlobalImageList::GlobalImageList( const uno::Reference< XMultiServiceFactory >& rServiceManager ) :
+    CmdImageList( rServiceManager, rtl::OUString() ),
+    m_nRefCount( 0 )
+{
+}
+
+GlobalImageList::~GlobalImageList()
+{
+}
+
+Image GlobalImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL )
+{
+    osl::MutexGuard guard( getGlobalImageListMutex() );
+    return CmdImageList::getImageFromCommandURL( nImageType, rCommandURL );
+}
+
+bool GlobalImageList::hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL )
+{
+    osl::MutexGuard guard( getGlobalImageListMutex() );
+    return CmdImageList::hasImage( nImageType, rCommandURL );
+}
+
+::std::vector< rtl::OUString >& GlobalImageList::getImageNames()
+{
+    osl::MutexGuard guard( getGlobalImageListMutex() );
+    return impl_getImageNameVector();
+}
+
+::std::vector< rtl::OUString >& GlobalImageList::getImageCommandNames()
+{
+    osl::MutexGuard guard( getGlobalImageListMutex() );
+    return impl_getImageCommandNameVector();
+}
+
+oslInterlockedCount GlobalImageList::acquire()
+{
+    osl_incrementInterlockedCount( &m_nRefCount );
+    return m_nRefCount;
+}
+
+oslInterlockedCount GlobalImageList::release()
+{
+    osl::MutexGuard guard( getGlobalImageListMutex() );
+
+    if ( !osl_decrementInterlockedCount( &m_nRefCount ))
+    {
+        oslInterlockedCount nCount( m_nRefCount );
+        // remove global pointer as we destroy the object now
+        pGlobalImageList = 0;
+        delete this;
+        return nCount;
+    }
+
+    return m_nRefCount;
+}
+
+static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGraphic, const uno::Reference< XGraphic >& rInGraphic, sal_Int16 nImageType )
+{
+    static Size   aNormSize( IMAGE_SIZE_NORMAL, IMAGE_SIZE_NORMAL );
+    static Size   aLargeSize( IMAGE_SIZE_LARGE, IMAGE_SIZE_LARGE );
+
+    if ( !rInGraphic.is() )
+    {
+        rOutGraphic = Image().GetXGraphic();
+        return sal_False;
+    }
+
+    // Check size and scale it
+    Image  aImage( rInGraphic );
+    Size   aSize = aImage.GetSizePixel();
+    bool   bMustScale( false );
+
+    if (( nImageType == ImageType_Color_Large ) ||
+        ( nImageType == ImageType_HC_Large ))
+        bMustScale = ( aSize != aLargeSize );
+    else
+        bMustScale = ( aSize != aNormSize );
+
+    if ( bMustScale )
+    {
+        BitmapEx aBitmap = aImage.GetBitmapEx();
+        aBitmap.Scale( aNormSize );
+        aImage = Image( aBitmap );
+        rOutGraphic = aImage.GetXGraphic();
+    }
+    else
+        rOutGraphic = rInGraphic;
+    return sal_True;
+}
+
+static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType )
+{
+    sal_Int16 nIndex( 0 );
+    if ( nImageType & ::com::sun::star::ui::ImageType::SIZE_LARGE )
+        nIndex += 1;
+    if ( nImageType & ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST )
+        nIndex += 2;
+    return nIndex;
+}
+
+ImageList* ImageManagerImpl::implts_getUserImageList( ImageType nImageType )
+{
+    ResetableGuard aGuard( m_aLock );
+    if ( !m_pUserImageList[nImageType] )
+        implts_loadUserImages( nImageType, m_xUserImageStorage, m_xUserBitmapsStorage );
+
+    return m_pUserImageList[nImageType];
+}
+
+void ImageManagerImpl::implts_initialize()
+{
+    // Initialize the top-level structures with the storage data
+    if ( m_xUserConfigStorage.is() )
+    {
+        long nModes = m_bReadOnly ? ElementModes::READ : ElementModes::READWRITE;
+
+        try
+        {
+            m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ),
+                                                                            nModes );
+            if ( m_xUserImageStorage.is() )
+            {
+                m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
+                                                                                 nModes );
+            }
+        }
+        catch ( com::sun::star::container::NoSuchElementException& )
+        {
+        }
+        catch ( ::com::sun::star::embed::InvalidStorageException& )
+        {
+        }
+        catch ( ::com::sun::star::lang::IllegalArgumentException& )
+        {
+        }
+        catch ( ::com::sun::star::io::IOException& )
+        {
+        }
+        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+        {
+        }
+    }
+}
+
+sal_Bool ImageManagerImpl::implts_loadUserImages(
+    ImageType nImageType,
+    const uno::Reference< XStorage >& xUserImageStorage,
+    const uno::Reference< XStorage >& xUserBitmapsStorage )
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( xUserImageStorage.is() && xUserBitmapsStorage.is() )
+    {
+        try
+        {
+            uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ),
+                                                                                      ElementModes::READ );
+            uno::Reference< XInputStream > xInputStream = xStream->getInputStream();
+
+            ImageListsDescriptor aUserImageListInfo;
+            ImagesConfiguration::LoadImages( m_xServiceManager,
+                                             xInputStream,
+                                             aUserImageListInfo );
+            if (( aUserImageListInfo.pImageList != 0 ) &&
+                ( aUserImageListInfo.pImageList->Count() > 0 ))
+            {
+                ImageListItemDescriptor* pList = aUserImageListInfo.pImageList->GetObject(0);
+                sal_Int32 nCount = pList->pImageItemList->Count();
+                std::vector< OUString > aUserImagesVector;
+                aUserImagesVector.reserve(nCount);
+                for ( USHORT i=0; i < nCount; i++ )
+                {
+                    const ImageItemDescriptor* pItem = pList->pImageItemList->GetObject(i);
+                    aUserImagesVector.push_back( pItem->aCommandURL );
+                }
+
+                uno::Reference< XStream > xBitmapStream = xUserBitmapsStorage->openStreamElement(
+                                                        rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ),
+                                                        ElementModes::READ );
+
+                if ( xBitmapStream.is() )
+                {
+                    SvStream* pSvStream( 0 );
+                    BitmapEx aUserBitmap;
+                    {
+                        pSvStream = utl::UcbStreamHelper::CreateStream( xBitmapStream );
+                        vcl::PNGReader aPngReader( *pSvStream );
+                        aUserBitmap = aPngReader.Read();
+                    }
+                    delete pSvStream;
+
+                    // Delete old image list and create a new one from the read bitmap
+                    delete m_pUserImageList[nImageType];
+                    m_pUserImageList[nImageType] = new ImageList();
+                    m_pUserImageList[nImageType]->InsertFromHorizontalStrip
+                        ( aUserBitmap, aUserImagesVector );
+                    return sal_True;
+                }
+            }
+        }
+        catch ( com::sun::star::container::NoSuchElementException& )
+        {
+        }
+        catch ( ::com::sun::star::embed::InvalidStorageException& )
+        {
+        }
+        catch ( ::com::sun::star::lang::IllegalArgumentException& )
+        {
+        }
+        catch ( ::com::sun::star::io::IOException& )
+        {
+        }
+        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+        {
+        }
+    }
+
+    // Destroy old image list - create a new empty one
+    delete m_pUserImageList[nImageType];
+    m_pUserImageList[nImageType] = new ImageList;
+
+    return sal_True;
+}
+
+sal_Bool ImageManagerImpl::implts_storeUserImages(
+    ImageType nImageType,
+    const uno::Reference< XStorage >& xUserImageStorage,
+    const uno::Reference< XStorage >& xUserBitmapsStorage )
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( m_bModified )
+    {
+        ImageList* pImageList = implts_getUserImageList( nImageType );
+        if ( pImageList->GetImageCount() > 0 )
+        {
+            ImageListsDescriptor aUserImageListInfo;
+            aUserImageListInfo.pImageList = new ImageListDescriptor;
+
+            ImageListItemDescriptor* pList = new ImageListItemDescriptor;
+            aUserImageListInfo.pImageList->Insert( pList, 0 );
+
+            pList->pImageItemList = new ImageItemListDescriptor;
+            for ( USHORT i=0; i < pImageList->GetImageCount(); i++ )
+            {
+                ImageItemDescriptor* pItem = new ::framework::ImageItemDescriptor;
+
+                pItem->nIndex = i;
+                pItem->aCommandURL = pImageList->GetImageName( i );
+                pList->pImageItemList->Insert( pItem, pList->pImageItemList->Count() );
+            }
+
+            pList->aURL = String::CreateFromAscii("Bitmaps/");
+            pList->aURL += String::CreateFromAscii( BITMAP_FILE_NAMES[nImageType] );
+
+            uno::Reference< XTransactedObject > xTransaction;
+            uno::Reference< XOutputStream >     xOutputStream;
+            uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ),
+                                                                                      ElementModes::WRITE|ElementModes::TRUNCATE );
+            if ( xStream.is() )
+            {
+                uno::Reference< XStream > xBitmapStream =
+                    xUserBitmapsStorage->openStreamElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ),
+                                                            ElementModes::WRITE|ElementModes::TRUNCATE );
+                if ( xBitmapStream.is() )
+                {
+                    SvStream* pSvStream = utl::UcbStreamHelper::CreateStream( xBitmapStream );
+                    {
+                        vcl::PNGWriter aPngWriter( pImageList->GetAsHorizontalStrip() );
+                        aPngWriter.Write( *pSvStream );
+                    }
+                    delete pSvStream;
+
+                    // Commit user bitmaps storage
+                    xTransaction = uno::Reference< XTransactedObject >( xUserBitmapsStorage, UNO_QUERY );
+                    if ( xTransaction.is() )
+                        xTransaction->commit();
+                }
+
+                xOutputStream = xStream->getOutputStream();
+                if ( xOutputStream.is() )
+                    ImagesConfiguration::StoreImages( m_xServiceManager, xOutputStream, aUserImageListInfo );
+
+                // Commit user image storage
+                xTransaction = uno::Reference< XTransactedObject >( xUserImageStorage, UNO_QUERY );
+                if ( xTransaction.is() )
+                    xTransaction->commit();
+            }
+
+            return sal_True;
+        }
+        else
+        {
+            // Remove the streams from the storage, if we have no data. We have to catch
+            // the NoSuchElementException as it can be possible that there is no stream at all!
+            try
+            {
+                xUserImageStorage->removeElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ));
+            }
+            catch ( ::com::sun::star::container::NoSuchElementException& )
+            {
+            }
+
+            try
+            {
+                xUserBitmapsStorage->removeElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ));
+            }
+            catch ( ::com::sun::star::container::NoSuchElementException& )
+            {
+            }
+
+            uno::Reference< XTransactedObject > xTransaction;
+            
+            // Commit user image storage
+            xTransaction = uno::Reference< XTransactedObject >( xUserImageStorage, UNO_QUERY );
+            if ( xTransaction.is() )
+                xTransaction->commit();
+
+            // Commit user bitmaps storage
+            xTransaction = uno::Reference< XTransactedObject >( xUserBitmapsStorage, UNO_QUERY );
+            if ( xTransaction.is() )
+                xTransaction->commit();
+            
+            return sal_True;
+        }
+    }
+
+    return sal_False;
+}
+const rtl::Reference< GlobalImageList >& ImageManagerImpl::implts_getGlobalImageList()
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( !m_pGlobalImageList.is() )
+        m_pGlobalImageList = getGlobalImageList( m_xServiceManager );
+    return m_pGlobalImageList;
+}
+
+CmdImageList* ImageManagerImpl::implts_getDefaultImageList()
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( !m_pDefaultImageList )
+        m_pDefaultImageList = new CmdImageList( m_xServiceManager, m_aModuleIdentifier );
+
+    return m_pDefaultImageList;
+}
+
+ImageManagerImpl::ImageManagerImpl( const uno::Reference< XMultiServiceFactory >& xServiceManager,const uno::Reference< XInterface >& _xOwner,bool _bUseGlobal ) :
+    ThreadHelpBase( &Application::GetSolarMutex() )
+    , m_xServiceManager( xServiceManager )
+    , m_xOwner(_xOwner)
+    , m_pDefaultImageList( 0 )
+    , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" ))
+    , m_aResourceString( RTL_CONSTASCII_USTRINGPARAM( ModuleImageList ))    
+    , m_aListenerContainer( m_aLock.getShareableOslMutex() )
+    , m_bUseGlobal(_bUseGlobal)
+    , m_bReadOnly( true )
+    , m_bInitialized( false )
+    , m_bModified( false )
+    , m_bConfigRead( false )
+    , m_bDisposed( false )
+{
+    for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
+    {
+        m_pUserImageList[n] = 0;
+        m_bUserImageListModified[n] = false;
+    }
+}
+
+ImageManagerImpl::~ImageManagerImpl()
+{
+    clear();
+}
+
+void ImageManagerImpl::dispose()
+{
+    css::lang::EventObject aEvent( m_xOwner );
+    m_aListenerContainer.disposeAndClear( aEvent );
+
+    {
+        ResetableGuard aGuard( m_aLock );
+        m_xUserConfigStorage.clear();
+        m_xUserImageStorage.clear();
+        m_xUserRootCommit.clear();
+        m_bConfigRead = false;
+        m_bModified = false;
+        m_bDisposed = true;
+        
+        // delete user and default image list on dispose
+        for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
+        {
+            delete m_pUserImageList[n];
+            m_pUserImageList[n] = 0;
+        }
+        delete m_pDefaultImageList;
+        m_pDefaultImageList = 0;
+    }
+    
+}
+void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    {
+        ResetableGuard aGuard( m_aLock );
+
+        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+        if ( m_bDisposed )
+            throw DisposedException();
+    }
+
+    m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< XEventListener >* ) NULL ), xListener );
+}
+
+void ImageManagerImpl::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< XEventListener >* ) NULL ), xListener );
+}
+
+// XInitialization
+void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
+{
+    ResetableGuard aLock( m_aLock );
+
+    if ( !m_bInitialized )
+    {
+        for ( sal_Int32 n = 0; n < aArguments.getLength(); n++ )
+        {
+            PropertyValue aPropValue;
+            if ( aArguments[n] >>= aPropValue )
+            {
+                if ( aPropValue.Name.equalsAscii( "UserConfigStorage" ))
+                {
+                    aPropValue.Value >>= m_xUserConfigStorage;
+                }
+                else if ( aPropValue.Name.equalsAscii( "ModuleIdentifier" ))
+                {
+                    aPropValue.Value >>= m_aModuleIdentifier;
+                }
+                else if ( aPropValue.Name.equalsAscii( "UserRootCommit" ))
+                {
+                    aPropValue.Value >>= m_xUserRootCommit;
+                }
+            }
+        }
+
+        if ( m_xUserConfigStorage.is() )
+        {
+            uno::Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
+            if ( xPropSet.is() )
+            {
+                long nOpenMode = 0;
+                if ( xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenMode" ))) >>= nOpenMode )
+                    m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
+            }
+        }
+
+        implts_initialize();
+
+        m_bInitialized = true;
+    }
+}
+
+// XImageManagerImpl
+void ImageManagerImpl::reset()
+throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    std::vector< OUString > aUserImageNames;
+
+    for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
+    {
+        aUserImageNames.clear();
+        ImageList* pImageList = implts_getUserImageList( ImageType(i));
+        pImageList->GetImageNames( aUserImageNames );
+
+        Sequence< rtl::OUString > aRemoveList( aUserImageNames.size() );
+        const sal_uInt32 nCount = aUserImageNames.size();
+        for ( sal_uInt32 j = 0; j < nCount; j++ )
+            aRemoveList[j] = aUserImageNames[j];
+
+        // Remove images
+        removeImages( sal_Int16( i ), aRemoveList );
+        m_bUserImageListModified[i] = true;
+    }
+
+    m_bModified = sal_True;
+}
+
+Sequence< ::rtl::OUString > ImageManagerImpl::getAllImageNames( ::sal_Int16 nImageType )
+throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    ImageNameMap aImageCmdNameMap;
+
+    sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
+    
+    sal_uInt32 i( 0 );
+    if ( m_bUseGlobal )
+    {
+        rtl::Reference< GlobalImageList > rGlobalImageList = implts_getGlobalImageList();
+   
+        const std::vector< OUString >& rGlobalImageNameVector = rGlobalImageList->getImageCommandNames();
+        const sal_uInt32 nGlobalCount = rGlobalImageNameVector.size();
+        for ( i = 0; i < nGlobalCount; i++ )
+            aImageCmdNameMap.insert( ImageNameMap::value_type( rGlobalImageNameVector[i], sal_True ));
+
+        const std::vector< OUString >& rModuleImageNameVector = implts_getDefaultImageList()->getImageCommandNames();
+        const sal_uInt32 nModuleCount = rModuleImageNameVector.size();
+        for ( i = 0; i < nModuleCount; i++ )
+            aImageCmdNameMap.insert( ImageNameMap::value_type( rModuleImageNameVector[i], sal_True ));
+    }
+
+    ImageList* pImageList = implts_getUserImageList( ImageType( nIndex ));
+    std::vector< OUString > rUserImageNames;
+    pImageList->GetImageNames( rUserImageNames );
+    const sal_uInt32 nUserCount = rUserImageNames.size();
+    for ( i = 0; i < nUserCount; i++ )
+        aImageCmdNameMap.insert( ImageNameMap::value_type( rUserImageNames[i], sal_True ));
+
+    Sequence< OUString > aImageNameSeq( aImageCmdNameMap.size() );
+    ImageNameMap::const_iterator pIter;
+    i = 0;
+    for ( pIter = aImageCmdNameMap.begin(); pIter != aImageCmdNameMap.end(); pIter++ )
+        aImageNameSeq[i++] = pIter->first;
+
+    return aImageNameSeq;
+}
+
+::sal_Bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL )
+throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    if (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE ))
+        throw IllegalArgumentException();
+
+    sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
+    if ( m_bUseGlobal && implts_getGlobalImageList()->hasImage( nIndex, aCommandURL ))
+        return sal_True;
+    else
+    {
+        if ( m_bUseGlobal && implts_getDefaultImageList()->hasImage( nIndex, aCommandURL ))
+            return sal_True;
+        else
+        {
+            // User layer
+            ImageList* pImageList = implts_getUserImageList( ImageType( nIndex ));
+            if ( pImageList )
+                return ( pImageList->GetImagePos( aCommandURL ) != IMAGELIST_IMAGE_NOTFOUND );
+        }
+    }
+
+    return sal_False;
+}
+
+Sequence< uno::Reference< XGraphic > > ImageManagerImpl::getImages(
+    ::sal_Int16 nImageType,
+    const Sequence< ::rtl::OUString >& aCommandURLSequence )
+throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
+{
+    ResetableGuard aLock( m_aLock );
+
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    if (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE ))
+        throw IllegalArgumentException();
+
+    Sequence< uno::Reference< XGraphic > > aGraphSeq( aCommandURLSequence.getLength() );
+
+    const rtl::OUString* aStrArray = aCommandURLSequence.getConstArray();
+
+    sal_Int16                         nIndex            = implts_convertImageTypeToIndex( nImageType );
+    rtl::Reference< GlobalImageList > rGlobalImageList;
+    CmdImageList*                     pDefaultImageList = NULL;
+    if ( m_bUseGlobal )
+    {
+        rGlobalImageList  = implts_getGlobalImageList();
+        pDefaultImageList = implts_getDefaultImageList();
+    }
+    ImageList*                        pUserImageList    = implts_getUserImageList( ImageType( nIndex ));
+
+    // We have to search our image list in the following order:
+    // 1. user image list (read/write)
+    // 2. module image list (read)
+    // 3. global image list (read)
+    for ( sal_Int32 n = 0; n < aCommandURLSequence.getLength(); n++ )
+    {
+        Image aImage = pUserImageList->GetImage( aStrArray[n] );
+        if ( !aImage && m_bUseGlobal )
+        {
+            aImage = pDefaultImageList->getImageFromCommandURL( nIndex, aStrArray[n] );
+            if ( !aImage )
+                aImage = rGlobalImageList->getImageFromCommandURL( nIndex, aStrArray[n] );
+        }
+
+        aGraphSeq[n] = aImage.GetXGraphic();
+    }
+
+    return aGraphSeq;
+}
+
+void ImageManagerImpl::replaceImages( 
+    ::sal_Int16 nImageType, 
+    const Sequence< ::rtl::OUString >& aCommandURLSequence, 
+    const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) 
+throw ( ::com::sun::star::lang::IllegalArgumentException, 
+        ::com::sun::star::lang::IllegalAccessException, 
+        ::com::sun::star::uno::RuntimeException)
+{
+    CmdToXGraphicNameAccess* pInsertedImages( 0 );
+    CmdToXGraphicNameAccess* pReplacedImages( 0 );
+    
+    {
+        ResetableGuard aLock( m_aLock );
+            
+        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+        if ( m_bDisposed )
+            throw DisposedException();
+
+        if (( aCommandURLSequence.getLength() != aGraphicsSequence.getLength() ) ||
+            (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE )))
+            throw IllegalArgumentException();
+
+        if ( m_bReadOnly )
+            throw IllegalAccessException();
+
+        sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
+        ImageList* pImageList = implts_getUserImageList( ImageType( nIndex ));
+        
+        uno::Reference< XGraphic > xGraphic;
+        for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
+        {
+            // Check size and scale. If we don't have any graphics ignore it
+            if ( !implts_checkAndScaleGraphic( xGraphic, aGraphicsSequence[i], nIndex ))
+                continue;
+            
+            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
+            if ( nPos == IMAGELIST_IMAGE_NOTFOUND )
+            {
+                pImageList->AddImage( aCommandURLSequence[i], xGraphic );
+                if ( !pInsertedImages )
+                    pInsertedImages = new CmdToXGraphicNameAccess();
+                pInsertedImages->addElement( aCommandURLSequence[i], xGraphic );
+            }
+            else
+            {
+                pImageList->ReplaceImage( aCommandURLSequence[i], xGraphic );
+                if ( !pReplacedImages )
+                    pReplacedImages = new CmdToXGraphicNameAccess();
+                pReplacedImages->addElement( aCommandURLSequence[i], xGraphic );
+            }
+        }
+
+        if (( pInsertedImages != 0 ) || (  pReplacedImages != 0 ))
+        {
+            m_bModified = sal_True;
+            m_bUserImageListModified[nIndex] = true;
+        }
+    }
+
+    // Notify listeners
+    if ( pInsertedImages != 0 )
+    {
+        ConfigurationEvent aInsertEvent;
+        aInsertEvent.aInfo           <<= nImageType;
+        aInsertEvent.Accessor        <<= m_xOwner;
+        aInsertEvent.Source          = m_xOwner;
+        aInsertEvent.ResourceURL     = m_aResourceString;
+        aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
+                                        static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
+        implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
+    }
+    if ( pReplacedImages != 0 )
+    {
+        ConfigurationEvent aReplaceEvent;
+        aReplaceEvent.aInfo           <<= nImageType;
+        aReplaceEvent.Accessor        <<= m_xOwner;
+        aReplaceEvent.Source          = m_xOwner;
+        aReplaceEvent.ResourceURL     = m_aResourceString;
+        aReplaceEvent.ReplacedElement = Any();
+        aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
+                                            static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
+        implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
+    }
+}
+
+void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) 
+throw ( ::com::sun::star::lang::IllegalArgumentException, 
+        ::com::sun::star::lang::IllegalAccessException, 
+        ::com::sun::star::uno::RuntimeException)
+{
+    CmdToXGraphicNameAccess* pRemovedImages( 0 );
+    CmdToXGraphicNameAccess* pReplacedImages( 0 );
+
+    {
+        ResetableGuard aLock( m_aLock );
+
+        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+        if ( m_bDisposed )
+            throw DisposedException();
+
+        if (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE ))
+            throw IllegalArgumentException();
+
+        if ( m_bReadOnly )
+            throw IllegalAccessException();
+
+        sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
+        rtl::Reference< GlobalImageList > rGlobalImageList;
+        CmdImageList*                     pDefaultImageList = NULL;
+        if ( m_bUseGlobal )
+        {
+            rGlobalImageList  = implts_getGlobalImageList();
+            pDefaultImageList = implts_getDefaultImageList();
+        }
+        ImageList*                        pImageList        = implts_getUserImageList( ImageType( nIndex ));
+        uno::Reference< XGraphic >        xEmptyGraphic( Image().GetXGraphic() );
+
+        for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
+        {
+            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
+            if ( nPos != IMAGELIST_IMAGE_NOTFOUND )
+            {
+                Image aImage = pImageList->GetImage( nPos );
+                USHORT nId   = pImageList->GetImageId( nPos );
+                pImageList->RemoveImage( nId );
+
+                if ( m_bUseGlobal )
+                {
+                    // Check, if we have a image in our module/global image list. If we find one =>
+                    // this is a replace instead of a remove operation!
+                    Image aNewImage = pDefaultImageList->getImageFromCommandURL( nIndex, aCommandURLSequence[i] );
+                    if ( !aNewImage )
+                        aNewImage = rGlobalImageList->getImageFromCommandURL( nIndex, aCommandURLSequence[i] );
+                    if ( !aNewImage )
+                    {
+                        if ( !pRemovedImages )
+                            pRemovedImages = new CmdToXGraphicNameAccess();
+                        pRemovedImages->addElement( aCommandURLSequence[i], xEmptyGraphic );
+                    }
+                    else
+                    {
+                        if ( !pReplacedImages )
+                            pReplacedImages = new CmdToXGraphicNameAccess();
+                        pReplacedImages->addElement( aCommandURLSequence[i], aNewImage.GetXGraphic() );
+                    }
+                } // if ( m_bUseGlobal )
+                else
+                {
+                    if ( !pRemovedImages )
+                        pRemovedImages = new CmdToXGraphicNameAccess();
+                    pRemovedImages->addElement( aCommandURLSequence[i], xEmptyGraphic );
+                }
+            }
+        }
+
+        if (( pReplacedImages != 0 ) || ( pRemovedImages != 0 ))
+        {
+            m_bModified = sal_True;
+            m_bUserImageListModified[nIndex] = true;
+        }
+    }
+
+    // Notify listeners
+    if ( pRemovedImages != 0 )
+    {
+        ConfigurationEvent aRemoveEvent;
+        aRemoveEvent.aInfo           = uno::makeAny( nImageType );
+        aRemoveEvent.Accessor        = uno::makeAny( m_xOwner );
+        aRemoveEvent.Source          = m_xOwner;
+        aRemoveEvent.ResourceURL     = m_aResourceString;
+        aRemoveEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
+                                            static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
+        implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove );
+    }
+    if ( pReplacedImages != 0 )
+    {
+        ConfigurationEvent aReplaceEvent;
+        aReplaceEvent.aInfo           = uno::makeAny( nImageType );
+        aReplaceEvent.Accessor        = uno::makeAny( m_xOwner );
+        aReplaceEvent.Source          = m_xOwner;
+        aReplaceEvent.ResourceURL     = m_aResourceString;
+        aReplaceEvent.ReplacedElement = Any();
+        aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
+                                            static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
+        implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
+    }
+}
+
+void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) 
+throw ( ::com::sun::star::container::ElementExistException, 
+        ::com::sun::star::lang::IllegalArgumentException, 
+        ::com::sun::star::lang::IllegalAccessException, 
+        ::com::sun::star::uno::RuntimeException)
+{
+    replaceImages(nImageType,aCommandURLSequence,aGraphicSequence);
+}
+
+
+// XUIConfigurationPersistence
+void ImageManagerImpl::reload() 
+throw ( ::com::sun::star::uno::Exception, 
+        ::com::sun::star::uno::RuntimeException )
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    CommandMap                   aOldUserCmdImageSet;   
+    std::vector< rtl::OUString > aNewUserCmdImageSet;
+    
+    if ( m_bModified )
+    {
+        for ( sal_Int16 i = 0; i < sal_Int16( ImageType_COUNT ); i++ )
+        {
+            if ( !m_bDisposed && m_bUserImageListModified[i] )
+            {
+                std::vector< rtl::OUString > aOldUserCmdImageVector;
+                ImageList* pImageList = implts_getUserImageList( (ImageType)i );
+                pImageList->GetImageNames( aOldUserCmdImageVector );
+
+                // Fill hash map to speed up search afterwards
+                sal_uInt32 j( 0 );
+                const sal_uInt32 nOldCount = aOldUserCmdImageVector.size();
+                for ( j = 0; j < nOldCount; j++ )
+                    aOldUserCmdImageSet.insert( CommandMap::value_type( aOldUserCmdImageVector[j], false ));
+                
+                // Attention: This can make the old image list pointer invalid!
+                implts_loadUserImages( (ImageType)i, m_xUserImageStorage, m_xUserBitmapsStorage );
+                pImageList = implts_getUserImageList( (ImageType)i );
+                pImageList->GetImageNames( aNewUserCmdImageSet );
+            
+                CmdToXGraphicNameAccess* pInsertedImages( 0 );
+                CmdToXGraphicNameAccess* pReplacedImages( 0 );
+                CmdToXGraphicNameAccess* pRemovedImages( 0 );
+
+                const sal_uInt32 nNewCount = aNewUserCmdImageSet.size();
+                for ( j = 0; j < nNewCount; j++ )
+                {
+                    CommandMap::iterator pIter = aOldUserCmdImageSet.find( aNewUserCmdImageSet[j] );
+                    if ( pIter != aOldUserCmdImageSet.end() )
+                    {
+                        pIter->second = true; // mark entry as replaced
+                        if ( !pReplacedImages )
+                            pReplacedImages = new CmdToXGraphicNameAccess();
+                        pReplacedImages->addElement( aNewUserCmdImageSet[j], 
+                                                     pImageList->GetImage( aNewUserCmdImageSet[j] ).GetXGraphic() );
+                    }
+                    else
+                    {
+                        if ( !pInsertedImages )
+                            pInsertedImages = new CmdToXGraphicNameAccess();
+                        pInsertedImages->addElement( aNewUserCmdImageSet[j], 
+                                                     pImageList->GetImage( aNewUserCmdImageSet[j] ).GetXGraphic() );
+                    }
+                }
+
+                // Search map for unmarked entries => they have been removed from the user list 
+                // through this reload operation. 
+                // We have to search the module and global image list!
+                rtl::Reference< GlobalImageList > rGlobalImageList;
+                CmdImageList*                     pDefaultImageList = NULL;
+                if ( m_bUseGlobal )
+                {
+                    rGlobalImageList  = implts_getGlobalImageList();
+                    pDefaultImageList = implts_getDefaultImageList();
+                }
+                uno::Reference< XGraphic >        xEmptyGraphic( Image().GetXGraphic() );
+                CommandMap::const_iterator        pIter = aOldUserCmdImageSet.begin();
+                while ( pIter != aOldUserCmdImageSet.end() )
+                {
+                    if ( !pIter->second )
+                    {
+                        if ( m_bUseGlobal )
+                        {
+                            Image aImage = pDefaultImageList->getImageFromCommandURL( i, pIter->first );
+                            if ( !aImage )
+                                aImage = rGlobalImageList->getImageFromCommandURL( i, pIter->first );
+
+                            if ( !aImage )
+                            {
+                                // No image in the module/global image list => remove user image
+                                if ( !pRemovedImages )
+                                    pRemovedImages = new CmdToXGraphicNameAccess();
+                                pRemovedImages->addElement( pIter->first, xEmptyGraphic );
+                            }
+                            else
+                            {
+                                // Image has been found in the module/global image list => replace user image
+                                if ( !pReplacedImages )
+                                    pReplacedImages = new CmdToXGraphicNameAccess();
+                                pReplacedImages->addElement( pIter->first, aImage.GetXGraphic() );
+                            }
+                        } // if ( m_bUseGlobal )
+                        else
+                        {
+                            // No image in the user image list => remove user image
+                            if ( !pRemovedImages )
+                                pRemovedImages = new CmdToXGraphicNameAccess();
+                            pRemovedImages->addElement( pIter->first, xEmptyGraphic );
+                        }
+                    }
+                    ++pIter;
+                }
+                
+                aGuard.unlock();
+                
+                // Now notify our listeners. Unlock mutex to prevent deadlocks
+                if ( pInsertedImages != 0 )
+                {
+                    ConfigurationEvent aInsertEvent;
+                    aInsertEvent.aInfo           = uno::makeAny( i );
+                    aInsertEvent.Accessor        = uno::makeAny( m_xOwner );
+                    aInsertEvent.Source          = m_xOwner;
+                    aInsertEvent.ResourceURL     = m_aResourceString;
+                    aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
+                                                    static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
+                    implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
+                }
+                if ( pReplacedImages != 0 )
+                {
+                    ConfigurationEvent aReplaceEvent;
+                    aReplaceEvent.aInfo           = uno::makeAny( i );
+                    aReplaceEvent.Accessor        = uno::makeAny( m_xOwner );
+                    aReplaceEvent.Source          = m_xOwner;
+                    aReplaceEvent.ResourceURL     = m_aResourceString;
+                    aReplaceEvent.ReplacedElement = Any();
+                    aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
+                                                    static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
+                    implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
+                }
+                if ( pRemovedImages != 0 )
+                {
+                    ConfigurationEvent aRemoveEvent;
+                    aRemoveEvent.aInfo           = uno::makeAny( i );
+                    aRemoveEvent.Accessor        = uno::makeAny( m_xOwner );
+                    aRemoveEvent.Source          = m_xOwner;
+                    aRemoveEvent.ResourceURL     = m_aResourceString;
+                    aRemoveEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
+                                                        static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
+                    implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove );
+                }
+
+                aGuard.lock();
+            }
+        }
+    }
+}
+
+void ImageManagerImpl::store() 
+throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    if ( m_bModified )
+    {
+        sal_Bool bWritten( sal_False );
+        for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
+        {
+            sal_Bool bSuccess = implts_storeUserImages( ImageType(i), m_xUserImageStorage, m_xUserBitmapsStorage );
+            if ( bSuccess )
+                bWritten = sal_True;
+            m_bUserImageListModified[i] = false;
+        }
+
+        if ( bWritten && 
+             m_xUserConfigStorage.is() )
+        {
+            uno::Reference< XTransactedObject > xUserConfigStorageCommit( m_xUserConfigStorage, UNO_QUERY );
+            if ( xUserConfigStorageCommit.is() )
+                xUserConfigStorageCommit->commit();
+            if ( m_xUserRootCommit.is() )
+                m_xUserRootCommit->commit();
+        }
+
+        m_bModified = sal_False;
+    }
+}
+
+void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage ) 
+throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    if ( m_bModified && Storage.is() )
+    {
+        long nModes = ElementModes::READWRITE;
+
+        uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ), 
+                                                                                    nModes );
+        if ( xUserImageStorage.is() )
+        {
+            uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
+                                                                                                    nModes );
+            for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
+            {
+                implts_getUserImageList( (ImageType)i );
+                implts_storeUserImages( (ImageType)i, xUserImageStorage, xUserBitmapsStorage );
+            }
+        
+            uno::Reference< XTransactedObject > xTransaction( Storage, UNO_QUERY );
+            if ( xTransaction.is() )
+                xTransaction->commit();
+        }
+    }
+}
+
+sal_Bool ImageManagerImpl::isModified() 
+throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+    return m_bModified;
+}
+
+sal_Bool ImageManagerImpl::isReadOnly() throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+    return m_bReadOnly;
+}
+// XUIConfiguration
+void ImageManagerImpl::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) 
+throw (::com::sun::star::uno::RuntimeException)
+{
+    {
+        ResetableGuard aGuard( m_aLock );
+    
+        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+        if ( m_bDisposed )
+            throw DisposedException();
+    }
+        
+    m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< XUIConfigurationListener >* ) NULL ), xListener );
+}
+
+void ImageManagerImpl::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) 
+throw (::com::sun::star::uno::RuntimeException)
+{
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< XUIConfigurationListener >* ) NULL ), xListener );
+}
+
+
+void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp )
+{
+    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( 
+                                        ::getCppuType( ( const css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >*) NULL ) );
+    if ( pContainer != NULL )
+    {
+        ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
+        while ( pIterator.hasMoreElements() )
+        {
+            try
+            {
+                switch ( eOp )
+                {
+                    case NotifyOp_Replace:
+                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementReplaced( aEvent );
+                        break;
+                    case NotifyOp_Insert:
+                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementInserted( aEvent );
+                        break;
+                    case NotifyOp_Remove:
+                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementRemoved( aEvent );
+                        break;
+                }
+            }
+            catch( css::uno::RuntimeException& )
+            {
+                pIterator.remove();
+            }
+        }
+    }
+}
+void ImageManagerImpl::clear()
+{
+    ResetableGuard aGuard( m_aLock );
+    for ( sal_Int32 n = 0; n < ImageType_COUNT; n++ )
+    {
+        delete m_pUserImageList[n];
+        m_pUserImageList[n] = 0;
+    }
+}
+} // namespace framework
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
new file mode 100755
index 000000000..e5201e9a9
--- /dev/null
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -0,0 +1,225 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: imagemanager.hxx,v $
+ * $Revision: 1.7.82.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_UICONFIGURATION_IMAGEMANAGERIMPL_HXX_
+#define __FRAMEWORK_UICONFIGURATION_IMAGEMANAGERIMPL_HXX_
+
+
+/** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble
+               with solaris headers ...
+*/
+#include <vector>
+#include <list>
+#include <hash_map>
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+#include <threadhelp/threadhelpbase.hxx>
+#include <macros/generic.hxx>
+#include <macros/xinterface.hxx>
+#include <macros/xtypeprovider.hxx>
+#include <macros/xserviceinfo.hxx>
+#include <stdtypes.h>
+#include <uiconfiguration/imagetype.hxx>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
+#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
+#include <com/sun/star/ui/XUIConfiguration.hpp>
+#include <com/sun/star/ui/XImageManager.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/ui/ConfigurationEvent.hpp>
+#include <com/sun/star/embed/XTransactedObject.hpp>
+#include <com/sun/star/ui/XImageManager.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
+#include <rtl/ustring.hxx>
+
+#include <vcl/image.hxx>
+#include <tools/color.hxx>
+#include <rtl/ref.hxx>
+
+#include <vector>
+
+namespace framework
+{
+    class CmdImageList
+    {
+        public:
+            CmdImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
+                          const ::rtl::OUString& aModuleIdentifier );
+            virtual ~CmdImageList();
+            
+            virtual Image                           getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
+            virtual bool                            hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
+            virtual ::std::vector< rtl::OUString >& getImageNames();
+            virtual ::std::vector< rtl::OUString >& getImageCommandNames();
+
+        protected:
+            void                            impl_fillCommandToImageNameMap();
+            ImageList*                      impl_getImageList( sal_Int16 nImageType );
+            std::vector< ::rtl::OUString >& impl_getImageNameVector();
+            std::vector< ::rtl::OUString >& impl_getImageCommandNameVector();
+
+        private:
+            sal_Bool                                                                         m_bVectorInit;
+            rtl::OUString                                                                    m_aModuleIdentifier;
+            ImageList*                                                                       m_pImageList[ImageType_COUNT];
+            CommandToImageNameMap                                                            m_aCommandToImageNameMap;
+            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+            ::std::vector< rtl::OUString >                                                   m_aImageNameVector;
+            ::std::vector< rtl::OUString >                                                   m_aImageCommandNameVector;
+            sal_Int16                                                                        m_nSymbolsStyle;
+    };
+
+    class GlobalImageList : public CmdImageList, public rtl::IReference
+    {
+        public:
+            GlobalImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+            virtual ~GlobalImageList();
+
+            virtual Image                           getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
+            virtual bool                            hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
+            virtual ::std::vector< rtl::OUString >& getImageNames();
+            virtual ::std::vector< rtl::OUString >& getImageCommandNames();
+            
+            // ÍReference
+            virtual oslInterlockedCount SAL_CALL acquire();
+            virtual oslInterlockedCount SAL_CALL release();
+
+        private:
+            oslInterlockedCount                                                              m_nRefCount;
+    };
+
+    class ImageManagerImpl : public ThreadHelpBase	// Struct for right initalization of mutex member! Must be first of baseclasses.
+    {
+        public:
+
+            ImageManagerImpl(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager
+                ,const  com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& _xOwner
+                ,bool _bUseGlobal);
+            ~ImageManagerImpl();
+
+            void dispose();
+            void initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
+            void addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+            void removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+
+            // XImageManager
+            void reset() throw (::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::Sequence< ::rtl::OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException);
+            ::sal_Bool hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+            void replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+            void removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+            void insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+
+            // XUIConfiguration
+            void addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+            void removeConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+
+            // XUIConfigurationPersistence
+            void reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+            void store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+            void storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+            sal_Bool isModified() throw (::com::sun::star::uno::RuntimeException);
+            sal_Bool isReadOnly() throw (::com::sun::star::uno::RuntimeException);
+
+            void clear();
+
+            typedef std::hash_map< rtl::OUString, 
+                                   sal_Bool, 
+                                   OUStringHashCode,
+                                   ::std::equal_to< ::rtl::OUString > > ImageNameMap;
+            
+            enum Layer
+            {
+                LAYER_DEFAULT,
+                LAYER_USERDEFINED,
+                LAYER_COUNT
+            };
+            
+            enum NotifyOp
+            {
+                NotifyOp_Remove,
+                NotifyOp_Insert,
+                NotifyOp_Replace
+            };
+
+            typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
+
+            // private methods
+            void                                      implts_initialize();
+            void                                      implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
+            ImageList*                                implts_getUserImageList( ImageType nImageType );
+            sal_Bool                                  implts_loadUserImages( ImageType nImageType,
+                                                                             const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, 
+                                                                             const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage );
+            sal_Bool                                  implts_storeUserImages( ImageType nImageType,
+                                                                              const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, 
+                                                                              const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage );
+            const rtl::Reference< GlobalImageList >&  implts_getGlobalImageList();
+            CmdImageList*                             implts_getDefaultImageList();
+
+
+            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserConfigStorage;
+            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserImageStorage;
+            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserBitmapsStorage;
+            com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject >      m_xUserRootCommit;
+            com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
+            com::sun::star::uno::Reference< com::sun::star::uno::XInterface >               m_xOwner;
+            rtl::Reference< GlobalImageList >                                               m_pGlobalImageList;
+            CmdImageList*                                                                   m_pDefaultImageList;
+            rtl::OUString                                                                   m_aXMLPostfix;
+            rtl::OUString                                                                   m_aModuleIdentifier;
+            rtl::OUString                                                                   m_aResourceString;            
+            ::cppu::OMultiTypeInterfaceContainerHelper                                      m_aListenerContainer;   /// container for ALL Listener
+            ImageList*                                                                      m_pUserImageList[ImageType_COUNT];
+            bool                                                                            m_bUserImageListModified[ImageType_COUNT];
+            bool                                                                            m_bUseGlobal;
+            bool                                                                            m_bReadOnly;
+            bool                                                                            m_bInitialized;
+            bool                                                                            m_bModified;
+            bool                                                                            m_bConfigRead;
+            bool                                                                            m_bDisposed;            
+   };
+}
+
+#endif // __FRAMEWORK_UICONFIGURATION_IMAGEMANAGERIMPL_HXX_
diff --git a/framework/source/uiconfiguration/makefile.mk b/framework/source/uiconfiguration/makefile.mk
index a78ecaca4..c7d6eb435 100644
--- a/framework/source/uiconfiguration/makefile.mk
+++ b/framework/source/uiconfiguration/makefile.mk
@@ -43,11 +43,13 @@ ENABLE_EXCEPTIONS=	TRUE
 
 SLOFILES=			\
                     $(SLO)$/uiconfigurationmanager.obj          \
+                    $(SLO)$/uiconfigurationmanagerimpl.obj      \
                     $(SLO)$/moduleuiconfigurationmanager.obj    \
                     $(SLO)$/moduleuicfgsupplier.obj             \
                     $(SLO)$/windowstateconfiguration.obj        \
                     $(SLO)$/moduleimagemanager.obj              \
                     $(SLO)$/imagemanager.obj                    \
+                    $(SLO)$/imagemanagerimpl.obj                \
                     $(SLO)$/graphicnameaccess.obj               \
                     $(SLO)$/uicategorydescription.obj           \
                     $(SLO)$/globalsettings.obj
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
dissimilarity index 87%
index 632dbbba3..2273c1d64 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -1,1533 +1,229 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: moduleimagemanager.cxx,v $
- * $Revision: 1.21 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-#include <rtl/logfile.hxx>
-#include <uiconfiguration/moduleimagemanager.hxx>
-#include <threadhelp/resetableguard.hxx>
-#include <xml/imagesconfiguration.hxx>
-#include <uiconfiguration/graphicnameaccess.hxx>
-#include <services.h>
-
-#include "properties.h"
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/ui/UIElementType.hpp>
-#include <com/sun/star/ui/ConfigurationEvent.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/ui/ImageType.hpp>
-#include <com/sun/star/uri/XUriReferenceFactory.hpp>
-#include <com/sun/star/uri/XUriReference.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-
-#include <vcl/svapp.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/mutex.hxx>
-#include <osl/file.hxx>
-#include <comphelper/sequence.hxx>
-#include <tools/urlobj.hxx>
-#include <unotools/ucbstreamhelper.hxx>
-#include <vcl/pngread.hxx>
-#include <vcl/pngwrite.hxx>
-#include "svtools/miscopt.hxx"
-
-//_________________________________________________________________________________________________________________
-//	namespaces
-//_________________________________________________________________________________________________________________
-
-using ::rtl::OUString;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::XInterface;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::makeAny;
-using ::com::sun::star::graphic::XGraphic;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::embed;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::ui;
-
-// Image sizes for our toolbars/menus
-const sal_Int32 IMAGE_SIZE_NORMAL         = 16;
-const sal_Int32 IMAGE_SIZE_LARGE          = 26;
-const sal_Int16 MAX_IMAGETYPE_VALUE       = ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST|
-                                            ::com::sun::star::ui::ImageType::SIZE_LARGE;
-
-static const char   IMAGE_FOLDER[]        = "images";
-static const char   BITMAPS_FOLDER[]      = "Bitmaps";
-static const char   IMAGE_EXTENSION[]     = ".png";
-
-static const char*  IMAGELIST_XML_FILE[]  =
-{
-    "sc_imagelist.xml",
-    "lc_imagelist.xml",
-    "sch_imagelist.xml",
-    "lch_imagelist.xml"
-};
-
-static const char*  BITMAP_FILE_NAMES[]   =
-{
-    "sc_userimages.png",
-    "lc_userimages.png",
-    "sch_userimages.png",
-    "lch_userimages.png"
-};
-
-namespace framework
-{
-
-static osl::Mutex*          pImageListWrapperMutex = 0;
-static GlobalImageList*     pGlobalImageList = 0;
-static const char* ImageType_Prefixes[ImageType_COUNT] =
-{
-    "res/commandimagelist/sc_",
-    "res/commandimagelist/lc_",
-    "res/commandimagelist/sch_",
-    "res/commandimagelist/lch_"
-};
-static char ModuleImageList[] = "private:resource/images/moduleimages";
-
-typedef GraphicNameAccess CmdToXGraphicNameAccess;
-
-static osl::Mutex& getGlobalImageListMutex()
-{
-    if ( pImageListWrapperMutex == 0 )
-    {
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
-        if ( pImageListWrapperMutex == 0 )
-            pImageListWrapperMutex = new osl::Mutex;
-    }
-
-    return *pImageListWrapperMutex;
-}
-
-static GlobalImageList* getGlobalImageList( const uno::Reference< XMultiServiceFactory >& rServiceManager )
-{
-    osl::MutexGuard guard( getGlobalImageListMutex() );
-
-    if ( pGlobalImageList == 0 )
-        pGlobalImageList = new GlobalImageList( rServiceManager );
-
-    return pGlobalImageList;
-}
-
-static rtl::OUString getCanonicalName( const rtl::OUString& rFileName )
-{
-    bool               bRemoveSlash( true );
-    sal_Int32          nLength = rFileName.getLength();
-    const sal_Unicode* pString = rFileName.getStr();
-
-    rtl::OUStringBuffer aBuf( nLength );
-    for ( sal_Int32 i = 0; i < nLength; i++ )
-    {
-        const sal_Unicode c = pString[i];
-        switch ( c )
-        {
-            // map forbidden characters to escape
-            case '/' : if ( !bRemoveSlash )
-                         aBuf.appendAscii( "%2f" ); 
-                       break;
-            case '\\': aBuf.appendAscii( "%5c" ); bRemoveSlash = false; break;
-            case ':' : aBuf.appendAscii( "%3a" ); bRemoveSlash = false; break;
-            case '*' : aBuf.appendAscii( "%2a" ); bRemoveSlash = false; break;
-            case '?' : aBuf.appendAscii( "%3f" ); bRemoveSlash = false; break;
-            case '<' : aBuf.appendAscii( "%3c" ); bRemoveSlash = false; break;
-            case '>' : aBuf.appendAscii( "%3e" ); bRemoveSlash = false; break;
-            case '|' : aBuf.appendAscii( "%7c" ); bRemoveSlash = false; break;
-            default: aBuf.append( c ); bRemoveSlash = false; 
-        }
-    }
-    return aBuf.makeStringAndClear();
-}
-
-//_________________________________________________________________________________________________________________
-
-CmdImageList::CmdImageList( const uno::Reference< XMultiServiceFactory >& rServiceManager, const rtl::OUString& aModuleIdentifier ) :
-    m_bVectorInit( sal_False ),
-    m_aModuleIdentifier( aModuleIdentifier ),
-    m_xServiceManager( rServiceManager ),
-    m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
-{
-    for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
-        m_pImageList[n] = 0;
-}
-
-CmdImageList::~CmdImageList()
-{
-    for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
-        delete m_pImageList[n];
-}
-
-void CmdImageList::impl_fillCommandToImageNameMap()
-{
-    RTL_LOGFILE_CONTEXT( aLog, "framework: CmdImageList::impl_fillCommandToImageNameMap" );
-
-    if ( !m_bVectorInit )
-    {
-        const rtl::OUString aCommandImageList( RTL_CONSTASCII_USTRINGPARAM( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST ));
-        Sequence< OUString > aCmdImageSeq;
-        uno::Reference< XNameAccess > xCmdDesc( m_xServiceManager->createInstance(
-                                                SERVICENAME_UICOMMANDDESCRIPTION ),
-                                            UNO_QUERY );
-
-        if ( m_aModuleIdentifier.getLength() > 0 )
-        {
-            // If we have a module identifier - use to retrieve the command image name list from it.
-            // Otherwise we will use the global command image list
-            try
-            {
-                xCmdDesc->getByName( m_aModuleIdentifier ) >>= xCmdDesc;
-                if ( xCmdDesc.is() )
-                    xCmdDesc->getByName( aCommandImageList ) >>= aCmdImageSeq;
-            }
-            catch ( NoSuchElementException& )
-            {
-                // Module unknown we will work with an empty command image list!
-                return;
-            }
-        }
-
-        if ( xCmdDesc.is() )
-        {
-            try
-            {
-                xCmdDesc->getByName( aCommandImageList ) >>= aCmdImageSeq;
-            }
-            catch ( NoSuchElementException& )
-            {
-            }
-            catch ( WrappedTargetException& )
-            {
-            }
-        }
-
-        // We have to map commands which uses special characters like '/',':','?','\','<'.'>','|'
-        String aExt = String::CreateFromAscii( IMAGE_EXTENSION );
-        m_aImageCommandNameVector.resize(aCmdImageSeq.getLength() );
-        m_aImageNameVector.resize( aCmdImageSeq.getLength() );
-
-        ::std::copy( aCmdImageSeq.getConstArray(),
-                     aCmdImageSeq.getConstArray()+aCmdImageSeq.getLength(),
-                     m_aImageCommandNameVector.begin() );
-
-        // Create a image name vector that must be provided to the vcl imagelist. We also need
-        // a command to image name map to speed up access time for image retrieval.
-        OUString aUNOString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
-        String   aEmptyString;
-        for ( sal_uInt32 i = 0; i < m_aImageCommandNameVector.size(); i++ )
-        {
-            OUString aCommandName( m_aImageCommandNameVector[i] );
-            String   aImageName;
-            
-            if ( aCommandName.indexOf( aUNOString ) != 0 )
-            {
-                INetURLObject aUrlObject( aCommandName, INetURLObject::ENCODE_ALL );
-                aImageName = aUrlObject.GetURLPath();
-                aImageName = getCanonicalName( aImageName ); // convert to valid filename
-            }
-            else
-            {
-                // just remove the schema 
-                if ( aCommandName.getLength() > 5 )
-                    aImageName = aCommandName.copy( 5 );
-                else
-                    aImageName = aEmptyString;
-                
-                // Search for query part. 
-                sal_Int32 nIndex = aImageName.Search( '?' );
-                if ( nIndex != STRING_NOTFOUND )
-                    aImageName = getCanonicalName( aImageName ); // convert to valid filename
-            }
-            // Image names are not case-dependent. Always use lower case characters to
-            // reflect this.
-            aImageName += aExt;
-            aImageName.ToLowerAscii();
-            
-            m_aImageNameVector[i] = aImageName;
-            m_aCommandToImageNameMap.insert( CommandToImageNameMap::value_type( aCommandName, aImageName ));
-        }
-
-        m_bVectorInit = sal_True;
-    }
-}
-
-ImageList* CmdImageList::impl_getImageList( sal_Int16 nImageType )
-{
-    SvtMiscOptions aMiscOptions;
-
-    sal_Int16 nSymbolsStyle = aMiscOptions.GetCurrentSymbolsStyle();
-    if ( nSymbolsStyle != m_nSymbolsStyle )
-    {
-        m_nSymbolsStyle = nSymbolsStyle;
-        for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
-            delete m_pImageList[n], m_pImageList[n] = NULL;
-    }
-
-    if ( !m_pImageList[nImageType] )
-    {
-        m_pImageList[nImageType] = new ImageList( m_aImageNameVector,
-                                                  OUString::createFromAscii( ImageType_Prefixes[nImageType] ) );
-    }
-
-    return m_pImageList[nImageType];
-}
-
-std::vector< ::rtl::OUString >& CmdImageList::impl_getImageNameVector()
-{
-    return m_aImageNameVector;
-}
-
-std::vector< rtl::OUString >& CmdImageList::impl_getImageCommandNameVector()
-{
-    return m_aImageCommandNameVector;
-}
-
-Image CmdImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL )
-{
-    impl_fillCommandToImageNameMap();
-    CommandToImageNameMap::const_iterator pIter = m_aCommandToImageNameMap.find( rCommandURL );
-    if ( pIter != m_aCommandToImageNameMap.end() )
-    {
-        ImageList* pImageList = impl_getImageList( nImageType );
-        return pImageList->GetImage( pIter->second );
-    }
-
-    return Image();
-}
-
-bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const rtl::OUString& rCommandURL )
-{
-    impl_fillCommandToImageNameMap();
-    CommandToImageNameMap::const_iterator pIter = m_aCommandToImageNameMap.find( rCommandURL );
-    if ( pIter != m_aCommandToImageNameMap.end() )
-        return true;
-    else
-        return false;
-}
-
-::std::vector< rtl::OUString >& CmdImageList::getImageNames()
-{
-    return impl_getImageNameVector();
-}
-
-::std::vector< rtl::OUString >& CmdImageList::getImageCommandNames()
-{
-    return impl_getImageCommandNameVector();
-}
-
-//_________________________________________________________________________________________________________________
-
-GlobalImageList::GlobalImageList( const uno::Reference< XMultiServiceFactory >& rServiceManager ) :
-    CmdImageList( rServiceManager, rtl::OUString() ),
-    m_nRefCount( 0 )
-{
-}
-
-GlobalImageList::~GlobalImageList()
-{
-}
-
-Image GlobalImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL )
-{
-    osl::MutexGuard guard( getGlobalImageListMutex() );
-    return CmdImageList::getImageFromCommandURL( nImageType, rCommandURL );
-}
-
-bool GlobalImageList::hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL )
-{
-    osl::MutexGuard guard( getGlobalImageListMutex() );
-    return CmdImageList::hasImage( nImageType, rCommandURL );
-}
-
-::std::vector< rtl::OUString >& GlobalImageList::getImageNames()
-{
-    osl::MutexGuard guard( getGlobalImageListMutex() );
-    return impl_getImageNameVector();
-}
-
-::std::vector< rtl::OUString >& GlobalImageList::getImageCommandNames()
-{
-    osl::MutexGuard guard( getGlobalImageListMutex() );
-    return impl_getImageCommandNameVector();
-}
-
-oslInterlockedCount GlobalImageList::acquire()
-{
-    osl_incrementInterlockedCount( &m_nRefCount );
-    return m_nRefCount;
-}
-
-oslInterlockedCount GlobalImageList::release()
-{
-    osl::MutexGuard guard( getGlobalImageListMutex() );
-
-    if ( !osl_decrementInterlockedCount( &m_nRefCount ))
-    {
-        oslInterlockedCount nCount( m_nRefCount );
-        // remove global pointer as we destroy the object now
-        pGlobalImageList = 0;
-        delete this;
-        return nCount;
-    }
-
-    return m_nRefCount;
-}
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_6                    (    ModuleImageManager                                                    ,
-                                            OWeakObject                                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
-                                            DIRECT_INTERFACE( css::lang::XComponent                                         ),
-                                            DIRECT_INTERFACE( css::lang::XInitialization                                    ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XImageManager                     ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfiguration                  ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationPersistence       )
-                                        )
-
-DEFINE_XTYPEPROVIDER_6                  (   ModuleImageManager                                          ,
-                                            css::lang::XTypeProvider			                        ,
-                                            css::lang::XComponent                                       ,
-                                            css::lang::XInitialization                                  ,
-                                            ::com::sun::star::ui::XImageManager                   ,
-                                            ::com::sun::star::ui::XUIConfiguration                ,
-                                            ::com::sun::star::ui::XUIConfigurationPersistence
-                                        )
-
-static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGraphic, const uno::Reference< XGraphic >& rInGraphic, sal_Int16 nImageType )
-{
-    static Size   aNormSize( IMAGE_SIZE_NORMAL, IMAGE_SIZE_NORMAL );
-    static Size   aLargeSize( IMAGE_SIZE_LARGE, IMAGE_SIZE_LARGE );
-
-    if ( !rInGraphic.is() )
-    {
-        rOutGraphic = Image().GetXGraphic();
-        return sal_False;
-    }
-
-    // Check size and scale it
-    Image  aImage( rInGraphic );
-    Size   aSize = aImage.GetSizePixel();
-    bool   bMustScale( false );
-
-    if (( nImageType == ImageType_Color_Large ) ||
-        ( nImageType == ImageType_HC_Large ))
-        bMustScale = ( aSize != aLargeSize );
-    else
-        bMustScale = ( aSize != aNormSize );
-
-    if ( bMustScale )
-    {
-        BitmapEx aBitmap = aImage.GetBitmapEx();
-        aBitmap.Scale( aNormSize );
-        aImage = Image( aBitmap );
-        rOutGraphic = aImage.GetXGraphic();
-    }
-    else
-        rOutGraphic = rInGraphic;
-    return sal_True;
-}
-
-static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType )
-{
-    sal_Int16 nIndex( 0 );
-    if ( nImageType & ::com::sun::star::ui::ImageType::SIZE_LARGE )
-        nIndex += 1;
-    if ( nImageType & ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST )
-        nIndex += 2;
-    return nIndex;
-}
-
-const rtl::Reference< GlobalImageList >& ModuleImageManager::implts_getGlobalImageList()
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( !m_pGlobalImageList.is() )
-        m_pGlobalImageList = getGlobalImageList( m_xServiceManager );
-    return m_pGlobalImageList;
-}
-
-CmdImageList* ModuleImageManager::implts_getDefaultImageList()
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( !m_pDefaultImageList )
-        m_pDefaultImageList = new CmdImageList( m_xServiceManager, m_aModuleIdentifier );
-
-    return m_pDefaultImageList;
-}
-
-ImageList* ModuleImageManager::implts_getUserImageList( ImageType nImageType )
-{
-    ResetableGuard aGuard( m_aLock );
-    if ( !m_pUserImageList[nImageType] )
-        implts_loadUserImages( nImageType, m_xUserImageStorage, m_xUserBitmapsStorage );
-
-    return m_pUserImageList[nImageType];
-}
-
-void ModuleImageManager::implts_initialize()
-{
-    // Initialize the top-level structures with the storage data
-    if ( m_xUserConfigStorage.is() )
-    {
-        long nModes = m_bReadOnly ? ElementModes::READ : ElementModes::READWRITE;
-
-        try
-        {
-            m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ),
-                                                                            nModes );
-            if ( m_xUserImageStorage.is() )
-            {
-                m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
-                                                                                 nModes );
-            }
-        }
-        catch ( com::sun::star::container::NoSuchElementException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
-        {
-        }
-        catch ( ::com::sun::star::lang::IllegalArgumentException& )
-        {
-        }
-        catch ( ::com::sun::star::io::IOException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
-        {
-        }
-    }
-}
-
-sal_Bool ModuleImageManager::implts_loadUserImages(
-    ImageType nImageType,
-    const uno::Reference< XStorage >& xUserImageStorage,
-    const uno::Reference< XStorage >& xUserBitmapsStorage )
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( xUserImageStorage.is() && xUserBitmapsStorage.is() )
-    {
-        try
-        {
-            uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ),
-                                                                                      ElementModes::READ );
-            uno::Reference< XInputStream > xInputStream = xStream->getInputStream();
-
-            ImageListsDescriptor aUserImageListInfo;
-            ImagesConfiguration::LoadImages( m_xServiceManager,
-                                             xInputStream,
-                                             aUserImageListInfo );
-            if (( aUserImageListInfo.pImageList != 0 ) &&
-                ( aUserImageListInfo.pImageList->Count() > 0 ))
-            {
-                ImageListItemDescriptor* pList = aUserImageListInfo.pImageList->GetObject(0);
-                sal_Int32 nCount = pList->pImageItemList->Count();
-
-                std::vector< OUString > aUserImagesVector;
-                for ( USHORT i=0; i < nCount; i++ )
-                {
-                    const ImageItemDescriptor* pItem = pList->pImageItemList->GetObject(i);
-                    aUserImagesVector.push_back( pItem->aCommandURL );
-                }
-
-                uno::Reference< XStream > xBitmapStream = xUserBitmapsStorage->openStreamElement(
-                                                        rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ),
-                                                        ElementModes::READ );
-
-                if ( xBitmapStream.is() )
-                {
-                    SvStream* pSvStream( 0 );
-                    BitmapEx aUserBitmap;
-                    {
-                        pSvStream = utl::UcbStreamHelper::CreateStream( xBitmapStream );
-                        vcl::PNGReader aPngReader( *pSvStream );
-                        aUserBitmap = aPngReader.Read();
-                    }
-                    delete pSvStream;
-
-                    // Delete old image list and create a new one from the read bitmap
-                    delete m_pUserImageList[nImageType];
-                    m_pUserImageList[nImageType] = new ImageList();
-                    m_pUserImageList[nImageType]->InsertFromHorizontalStrip
-                        ( aUserBitmap, aUserImagesVector );
-                    return sal_True;
-                }
-            }
-        }
-        catch ( com::sun::star::container::NoSuchElementException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
-        {
-        }
-        catch ( ::com::sun::star::lang::IllegalArgumentException& )
-        {
-        }
-        catch ( ::com::sun::star::io::IOException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
-        {
-        }
-    }
-
-    // Destroy old image list - create a new empty one
-    delete m_pUserImageList[nImageType];
-    m_pUserImageList[nImageType] = new ImageList;
-
-    return sal_True;
-}
-
-sal_Bool ModuleImageManager::implts_storeUserImages(
-    ImageType nImageType,
-    const uno::Reference< XStorage >& xUserImageStorage,
-    const uno::Reference< XStorage >& xUserBitmapsStorage )
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bModified )
-    {
-        ImageList* pImageList = implts_getUserImageList( nImageType );
-        if ( pImageList->GetImageCount() > 0 )
-        {
-            ImageListsDescriptor aUserImageListInfo;
-            aUserImageListInfo.pImageList = new ImageListDescriptor;
-
-            ImageListItemDescriptor* pList = new ImageListItemDescriptor;
-            aUserImageListInfo.pImageList->Insert( pList, 0 );
-
-            pList->pImageItemList = new ImageItemListDescriptor;
-            for ( USHORT i=0; i < pImageList->GetImageCount(); i++ )
-            {
-                ImageItemDescriptor* pItem = new ::framework::ImageItemDescriptor;
-
-                pItem->nIndex = i;
-                pItem->aCommandURL = pImageList->GetImageName( i );
-                pList->pImageItemList->Insert( pItem, pList->pImageItemList->Count() );
-            }
-
-            pList->aURL = String::CreateFromAscii("Bitmaps/");
-            pList->aURL += String::CreateFromAscii( BITMAP_FILE_NAMES[nImageType] );
-
-            uno::Reference< XTransactedObject > xTransaction;
-            uno::Reference< XOutputStream >     xOutputStream;
-            uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ),
-                                                                                      ElementModes::WRITE|ElementModes::TRUNCATE );
-            if ( xStream.is() )
-            {
-                uno::Reference< XStream > xBitmapStream =
-                    xUserBitmapsStorage->openStreamElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ),
-                                                            ElementModes::WRITE|ElementModes::TRUNCATE );
-                if ( xBitmapStream.is() )
-                {
-                    SvStream* pSvStream = utl::UcbStreamHelper::CreateStream( xBitmapStream );
-                    {
-                        vcl::PNGWriter aPngWriter( pImageList->GetAsHorizontalStrip() );
-                        aPngWriter.Write( *pSvStream );
-                    }
-                    delete pSvStream;
-
-                    // Commit user bitmaps storage
-                    xTransaction = uno::Reference< XTransactedObject >( xUserBitmapsStorage, UNO_QUERY );
-                    if ( xTransaction.is() )
-                        xTransaction->commit();
-                }
-
-                xOutputStream = xStream->getOutputStream();
-                if ( xOutputStream.is() )
-                    ImagesConfiguration::StoreImages( m_xServiceManager, xOutputStream, aUserImageListInfo );
-
-                // Commit user image storage
-                xTransaction = uno::Reference< XTransactedObject >( xUserImageStorage, UNO_QUERY );
-                if ( xTransaction.is() )
-                    xTransaction->commit();
-            }
-
-            return sal_True;
-        }
-        else
-        {
-            // Remove the streams from the storage, if we have no data. We have to catch
-            // the NoSuchElementException as it can be possible that there is no stream at all!
-            try
-            {
-                xUserImageStorage->removeElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ));
-            }
-            catch ( ::com::sun::star::container::NoSuchElementException& )
-            {
-            }
-
-            try
-            {
-                xUserBitmapsStorage->removeElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ));
-            }
-            catch ( ::com::sun::star::container::NoSuchElementException& )
-            {
-            }
-
-            uno::Reference< XTransactedObject > xTransaction;
-            
-            // Commit user image storage
-            xTransaction = uno::Reference< XTransactedObject >( xUserImageStorage, UNO_QUERY );
-            if ( xTransaction.is() )
-                xTransaction->commit();
-
-            // Commit user bitmaps storage
-            xTransaction = uno::Reference< XTransactedObject >( xUserBitmapsStorage, UNO_QUERY );
-            if ( xTransaction.is() )
-                xTransaction->commit();
-            
-            return sal_True;
-        }
-    }
-
-    return sal_False;
-}
-
-ModuleImageManager::ModuleImageManager( uno::Reference< XMultiServiceFactory > xServiceManager ) :
-    ThreadHelpBase( &Application::GetSolarMutex() )
-    , m_xUserConfigStorage( 0 )
-    , m_xUserImageStorage( 0 )
-    , m_xUserBitmapsStorage( 0 )
-    , m_bReadOnly( true )
-    , m_bInitialized( false )
-    , m_bModified( false )
-    , m_bConfigRead( false )
-    , m_bDisposed( false )
-    , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" ))
-    , m_aResourceString( RTL_CONSTASCII_USTRINGPARAM( ModuleImageList ))
-    , m_xServiceManager( xServiceManager )
-    , m_aListenerContainer( m_aLock.getShareableOslMutex() )
-    , m_pDefaultImageList( 0 )
-{
-    for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
-    {
-        m_pUserImageList[n] = 0;
-        m_bUserImageListModified[n] = false;
-    }
-}
-
-ModuleImageManager::~ModuleImageManager()
-{
-}
-
-// XComponent
-void SAL_CALL ModuleImageManager::dispose() throw (::com::sun::star::uno::RuntimeException)
-{
-    uno::Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
-
-    css::lang::EventObject aEvent( xThis );
-    m_aListenerContainer.disposeAndClear( aEvent );
-
-    {
-        ResetableGuard aGuard( m_aLock );
-        m_xUserConfigStorage.clear();
-        m_xUserImageStorage.clear();
-        m_xUserRootCommit.clear();
-        m_bConfigRead = false;
-        m_bModified = false;
-        m_bDisposed = true;
-        
-        // delete user and default image list on dispose
-        for ( sal_Int32 n=0; n < ImageType_COUNT; n++ )
-        {
-            delete m_pUserImageList[n];
-            m_pUserImageList[n] = 0;
-        }
-        delete m_pDefaultImageList;
-        m_pDefaultImageList = 0;
-    }
-}
-
-void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    {
-        ResetableGuard aGuard( m_aLock );
-
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-    }
-
-    m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< XEventListener >* ) NULL ), xListener );
-}
-
-void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< XEventListener >* ) NULL ), xListener );
-}
-
-// XInitialization
-void SAL_CALL ModuleImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( !m_bInitialized )
-    {
-        for ( sal_Int32 n = 0; n < aArguments.getLength(); n++ )
-        {
-            PropertyValue aPropValue;
-            if ( aArguments[n] >>= aPropValue )
-            {
-                if ( aPropValue.Name.equalsAscii( "UserConfigStorage" ))
-                {
-                    aPropValue.Value >>= m_xUserConfigStorage;
-                }
-                else if ( aPropValue.Name.equalsAscii( "ModuleIdentifier" ))
-                {
-                    aPropValue.Value >>= m_aModuleIdentifier;
-                }
-                else if ( aPropValue.Name.equalsAscii( "UserRootCommit" ))
-                {
-                    aPropValue.Value >>= m_xUserRootCommit;
-                }
-            }
-        }
-
-        if ( m_xUserConfigStorage.is() )
-        {
-            uno::Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
-            if ( xPropSet.is() )
-            {
-                long nOpenMode = 0;
-                Any a = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenMode" )));
-                if ( a >>= nOpenMode )
-                    m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
-            }
-        }
-
-        implts_initialize();
-
-        m_bInitialized = true;
-    }
-}
-
-// XImageManager
-void SAL_CALL ModuleImageManager::reset()
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    std::vector< OUString > aUserImageNames;
-
-    for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
-    {
-        aUserImageNames.clear();
-        ImageList* pImageList = implts_getUserImageList( ImageType(i));
-        pImageList->GetImageNames( aUserImageNames );
-
-        Sequence< rtl::OUString > aRemoveList( aUserImageNames.size() );
-        for ( sal_uInt32 j = 0; j < aUserImageNames.size(); j++ )
-            aRemoveList[j] = aUserImageNames[j];
-
-        // Remove images
-        removeImages( sal_Int16( i ), aRemoveList );
-        m_bUserImageListModified[i] = true;
-    }
-
-    m_bModified = sal_True;
-}
-
-Sequence< ::rtl::OUString > SAL_CALL ModuleImageManager::getAllImageNames( ::sal_Int16 nImageType )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    ImageNameMap aImageCmdNameMap;
-
-    sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
-    rtl::Reference< GlobalImageList > rGlobalImageList = implts_getGlobalImageList();
-
-    sal_uInt32 i( 0 );
-    const std::vector< OUString >& rGlobalImageNameVector = rGlobalImageList->getImageCommandNames();
-    for ( i = 0; i < rGlobalImageNameVector.size(); i++ )
-        aImageCmdNameMap.insert( ImageNameMap::value_type( rGlobalImageNameVector[i], sal_True ));
-
-    const std::vector< OUString >& rModuleImageNameVector = implts_getDefaultImageList()->getImageCommandNames();
-    for ( i = 0; i < rModuleImageNameVector.size(); i++ )
-        aImageCmdNameMap.insert( ImageNameMap::value_type( rModuleImageNameVector[i], sal_True ));
-
-    ImageList* pImageList = implts_getUserImageList( ImageType( nIndex ));
-    std::vector< OUString > rUserImageNames;
-    pImageList->GetImageNames( rUserImageNames );
-    for ( i = 0; i < rUserImageNames.size(); i++ )
-        aImageCmdNameMap.insert( ImageNameMap::value_type( rUserImageNames[i], sal_True ));
-
-    Sequence< OUString > aImageNameSeq( aImageCmdNameMap.size() );
-    ImageNameMap::const_iterator pIter;
-    i = 0;
-    for ( pIter = aImageCmdNameMap.begin(); pIter != aImageCmdNameMap.end(); pIter++ )
-        aImageNameSeq[i++] = pIter->first;
-
-    return aImageNameSeq;
-}
-
-::sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL )
-throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE ))
-        throw IllegalArgumentException();
-
-    sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
-    if ( implts_getGlobalImageList()->hasImage( nIndex, aCommandURL ))
-        return sal_True;
-    else
-    {
-        if ( implts_getDefaultImageList()->hasImage( nIndex, aCommandURL ))
-            return sal_True;
-        else
-        {
-            // User layer
-            ImageList* pImageList = implts_getUserImageList( ImageType( nIndex ));
-            if ( pImageList )
-                return ( pImageList->GetImagePos( aCommandURL ) != IMAGELIST_IMAGE_NOTFOUND );
-        }
-    }
-
-    return sal_False;
-}
-
-Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages(
-    ::sal_Int16 nImageType,
-    const Sequence< ::rtl::OUString >& aCommandURLSequence )
-throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
-{
-    RTL_LOGFILE_CONTEXT( aLog, "framework: ModuleImageManager::getImages" );
-
-    ResetableGuard aLock( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE ))
-        throw IllegalArgumentException();
-
-    Sequence< uno::Reference< XGraphic > > aGraphSeq( aCommandURLSequence.getLength() );
-
-    const rtl::OUString* aStrArray = aCommandURLSequence.getConstArray();
-
-    sal_Int16                         nIndex            = implts_convertImageTypeToIndex( nImageType );
-    rtl::Reference< GlobalImageList > rGlobalImageList  = implts_getGlobalImageList();
-    CmdImageList*                     pDefaultImageList = implts_getDefaultImageList();
-    ImageList*                        pUserImageList    = implts_getUserImageList( ImageType( nIndex ));
-
-    // We have to search our image list in the following order:
-    // 1. user image list (read/write)
-    // 2. module image list (read)
-    // 3. global image list (read)
-    for ( sal_Int32 n = 0; n < aCommandURLSequence.getLength(); n++ )
-    {
-        Image aImage = pUserImageList->GetImage( aStrArray[n] );
-        if ( !aImage )
-        {
-            aImage = pDefaultImageList->getImageFromCommandURL( nIndex, aStrArray[n] );
-            if ( !aImage )
-                aImage = rGlobalImageList->getImageFromCommandURL( nIndex, aStrArray[n] );
-        }
-
-        aGraphSeq[n] = aImage.GetXGraphic();
-    }
-
-    return aGraphSeq;
-}
-
-void SAL_CALL ModuleImageManager::replaceImages(
-    ::sal_Int16 nImageType,
-    const Sequence< ::rtl::OUString >& aCommandURLSequence,
-    const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
-throw ( ::com::sun::star::lang::IllegalArgumentException,
-        ::com::sun::star::lang::IllegalAccessException,
-        ::com::sun::star::uno::RuntimeException)
-{
-    CmdToXGraphicNameAccess* pInsertedImages( 0 );
-    CmdToXGraphicNameAccess* pReplacedImages( 0 );
-
-    {
-        ResetableGuard aLock( m_aLock );
-
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        if (( aCommandURLSequence.getLength() != aGraphicsSequence.getLength() ) ||
-            (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE )))
-            throw IllegalArgumentException();
-
-        if ( m_bReadOnly )
-            throw IllegalAccessException();
-
-        sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
-        ImageList* pImageList = implts_getUserImageList( ImageType( nIndex ));
-
-        uno::Reference< XGraphic > xGraphic;
-        for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
-        {
-            // Check size and scale. If we don't have any graphics ignore it
-            if ( !implts_checkAndScaleGraphic( xGraphic, aGraphicsSequence[i], nIndex ))
-                continue;
-
-            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
-            if ( nPos == IMAGELIST_IMAGE_NOTFOUND )
-            {
-                pImageList->AddImage( aCommandURLSequence[i], xGraphic );
-                if ( !pInsertedImages )
-                    pInsertedImages = new CmdToXGraphicNameAccess();
-                pInsertedImages->addElement( aCommandURLSequence[i], xGraphic );
-            }
-            else
-            {
-                pImageList->ReplaceImage( aCommandURLSequence[i], xGraphic );
-                if ( !pReplacedImages )
-                    pReplacedImages = new CmdToXGraphicNameAccess();
-                pReplacedImages->addElement( aCommandURLSequence[i], xGraphic );
-            }
-        }
-
-        if (( pInsertedImages != 0 ) || (  pReplacedImages != 0 ))
-        {
-            m_bModified = sal_True;
-            m_bUserImageListModified[nIndex] = true;
-        }
-    }
-
-    // Notify listeners
-    uno::Reference< XImageManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    uno::Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-    if ( pInsertedImages != 0 )
-    {
-        ConfigurationEvent aInsertEvent;
-        aInsertEvent.aInfo           = uno::makeAny( nImageType );
-        aInsertEvent.Accessor        = uno::makeAny( xThis );
-        aInsertEvent.Source          = xIfac;
-        aInsertEvent.ResourceURL     = m_aResourceString;
-        aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
-                                        static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
-        implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
-    }
-    if ( pReplacedImages != 0 )
-    {
-        ConfigurationEvent aReplaceEvent;
-        aReplaceEvent.aInfo           = uno::makeAny( nImageType );
-        aReplaceEvent.Accessor        = uno::makeAny( xThis );
-        aReplaceEvent.Source          = xIfac;
-        aReplaceEvent.ResourceURL     = m_aResourceString;
-        aReplaceEvent.ReplacedElement = Any();
-        aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
-                                            static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
-        implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
-    }
-}
-
-void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence )
-throw ( ::com::sun::star::lang::IllegalArgumentException,
-        ::com::sun::star::lang::IllegalAccessException,
-        ::com::sun::star::uno::RuntimeException)
-{
-    CmdToXGraphicNameAccess* pRemovedImages( 0 );
-    CmdToXGraphicNameAccess* pReplacedImages( 0 );
-
-    {
-        ResetableGuard aLock( m_aLock );
-
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        if (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE ))
-            throw IllegalArgumentException();
-
-        if ( m_bReadOnly )
-            throw IllegalAccessException();
-
-        sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
-        rtl::Reference< GlobalImageList > rGlobalImageList  = implts_getGlobalImageList();
-        CmdImageList*                     pDefaultImageList = implts_getDefaultImageList();
-        ImageList*                        pImageList        = implts_getUserImageList( ImageType( nIndex ));
-        uno::Reference< XGraphic >        xEmptyGraphic( Image().GetXGraphic() );
-
-        for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
-        {
-            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
-            if ( nPos != IMAGELIST_IMAGE_NOTFOUND )
-            {
-                Image aImage = pImageList->GetImage( nPos );
-                USHORT nId   = pImageList->GetImageId( nPos );
-                pImageList->RemoveImage( nId );
-
-                // Check, if we have a image in our module/global image list. If we find one =>
-                // this is a replace instead of a remove operation!
-                Image aNewImage = pDefaultImageList->getImageFromCommandURL( nIndex, aCommandURLSequence[i] );
-                if ( !aNewImage )
-                    aNewImage = rGlobalImageList->getImageFromCommandURL( nIndex, aCommandURLSequence[i] );
-                if ( !aNewImage )
-                {
-                    if ( !pRemovedImages )
-                        pRemovedImages = new CmdToXGraphicNameAccess();
-                    pRemovedImages->addElement( aCommandURLSequence[i], xEmptyGraphic );
-                }
-                else
-                {
-                    if ( !pReplacedImages )
-                        pReplacedImages = new CmdToXGraphicNameAccess();
-                    pReplacedImages->addElement( aCommandURLSequence[i], aNewImage.GetXGraphic() );
-                }
-            }
-        }
-
-        if (( pReplacedImages != 0 ) || ( pRemovedImages != 0 ))
-        {
-            m_bModified = sal_True;
-            m_bUserImageListModified[nIndex] = true;
-        }
-    }
-
-    // Notify listeners
-    uno::Reference< XImageManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    uno::Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-    if ( pRemovedImages != 0 )
-    {
-        ConfigurationEvent aRemoveEvent;
-        aRemoveEvent.aInfo           = uno::makeAny( nImageType );
-        aRemoveEvent.Accessor        = uno::makeAny( xThis );
-        aRemoveEvent.Source          = xIfac;
-        aRemoveEvent.ResourceURL     = m_aResourceString;
-        aRemoveEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
-                                            static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
-        implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove );
-    }
-    if ( pReplacedImages != 0 )
-    {
-        ConfigurationEvent aReplaceEvent;
-        aReplaceEvent.aInfo           = uno::makeAny( nImageType );
-        aReplaceEvent.Accessor        = uno::makeAny( xThis );
-        aReplaceEvent.Source          = xIfac;
-        aReplaceEvent.ResourceURL     = m_aResourceString;
-        aReplaceEvent.ReplacedElement = Any();
-        aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
-                                            static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
-        implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
-    }
-}
-
-void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
-throw ( ::com::sun::star::container::ElementExistException,
-        ::com::sun::star::lang::IllegalArgumentException,
-        ::com::sun::star::lang::IllegalAccessException,
-        ::com::sun::star::uno::RuntimeException)
-{
-    CmdToXGraphicNameAccess* pInsertedImages( 0 );
-    CmdToXGraphicNameAccess* pReplacedImages( 0 );
-
-    {
-        ResetableGuard aLock( m_aLock );
-
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        if (( aCommandURLSequence.getLength() != aGraphicSequence.getLength() ) ||
-            (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE )))
-            throw IllegalArgumentException();
-
-        if ( m_bReadOnly )
-            throw IllegalAccessException();
-
-        sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
-        ImageList* pImageList = implts_getUserImageList( ImageType( nIndex ));
-
-        uno::Reference< XGraphic > xGraphic;
-        for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
-        {
-            if ( !implts_checkAndScaleGraphic( xGraphic, aGraphicSequence[i], nIndex ))
-                continue;
-
-            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
-            if ( nPos == IMAGELIST_IMAGE_NOTFOUND )
-            {
-                pImageList->AddImage( aCommandURLSequence[i], xGraphic );
-                if ( !pInsertedImages )
-                    pInsertedImages = new CmdToXGraphicNameAccess();
-                pInsertedImages->addElement( aCommandURLSequence[i], xGraphic );
-            }
-            else
-            {
-                pImageList->ReplaceImage( aCommandURLSequence[i], xGraphic );
-                if ( !pReplacedImages )
-                    pReplacedImages = new CmdToXGraphicNameAccess();
-                pReplacedImages->addElement( aCommandURLSequence[i], xGraphic );
-            }
-        }
-        
-        if (( pInsertedImages != 0 ) || ( pReplacedImages != 0 ))
-        {
-            m_bModified = sal_True;
-            m_bUserImageListModified[nIndex] = true;
-        }
-    }
-
-    // Notify listeners
-    uno::Reference< XImageManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    uno::Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-    if ( pInsertedImages != 0 )
-    {
-        ConfigurationEvent aInsertEvent;
-        aInsertEvent.aInfo           = uno::makeAny( nImageType );
-        aInsertEvent.Accessor        = uno::makeAny( xThis );
-        aInsertEvent.Source          = xIfac;
-        aInsertEvent.ResourceURL     = m_aResourceString;
-        aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                        static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
-        implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
-    }
-    if ( pReplacedImages != 0 )
-    {
-        ConfigurationEvent aReplaceEvent;
-        aReplaceEvent.aInfo           = uno::makeAny( nImageType );
-        aReplaceEvent.Accessor        = uno::makeAny( xThis );
-        aReplaceEvent.Source          = xIfac;
-        aReplaceEvent.ResourceURL     = m_aResourceString;
-        aReplaceEvent.ReplacedElement = Any();
-        aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                         static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
-        implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
-    }
-}
-
-// XUIConfiguration
-void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) 
-throw (::com::sun::star::uno::RuntimeException)
-{
-    {
-        ResetableGuard aGuard( m_aLock );
-    
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-    }
-        
-    m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< XUIConfigurationListener >* ) NULL ), xListener );
-}
-
-void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) 
-throw (::com::sun::star::uno::RuntimeException)
-{
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< XUIConfigurationListener >* ) NULL ), xListener );
-}
-
-// XUIConfigurationPersistence
-void SAL_CALL ModuleImageManager::reload() 
-throw ( ::com::sun::star::uno::Exception, 
-        ::com::sun::star::uno::RuntimeException )
-{
-    ResetableGuard aGuard( m_aLock );
-
-    uno::Reference< uno::XInterface > xRefThis( static_cast< OWeakObject* >( this ));
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    CommandMap                   aOldUserCmdImageSet;   
-    std::vector< rtl::OUString > aNewUserCmdImageSet;
-    
-    if ( m_bModified )
-    {
-        uno::Reference< XImageManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-        uno::Reference< XInterface > xIfac( xThis, UNO_QUERY );
-                
-        for ( sal_Int16 i = 0; i < sal_Int16( ImageType_COUNT ); i++ )
-        {
-            if ( !m_bDisposed && m_bUserImageListModified[i] )
-            {
-                std::vector< rtl::OUString > aOldUserCmdImageVector;
-                ImageList* pImageList = implts_getUserImageList( (ImageType)i );
-                pImageList->GetImageNames( aOldUserCmdImageVector );
-
-                // Fill hash map to speed up search afterwards
-                sal_uInt32 j( 0 );
-                for ( j = 0; j < aOldUserCmdImageVector.size(); j++ )
-                    aOldUserCmdImageSet.insert( CommandMap::value_type( aOldUserCmdImageVector[j], false ));
-                
-                // Attention: This can make the old image list pointer invalid!
-                implts_loadUserImages( (ImageType)i, m_xUserImageStorage, m_xUserBitmapsStorage );
-                pImageList = implts_getUserImageList( (ImageType)i );
-                pImageList->GetImageNames( aNewUserCmdImageSet );
-            
-                CmdToXGraphicNameAccess* pInsertedImages( 0 );
-                CmdToXGraphicNameAccess* pReplacedImages( 0 );
-                CmdToXGraphicNameAccess* pRemovedImages( 0 );
-
-                for ( j = 0; j < aNewUserCmdImageSet.size(); j++ )
-                {
-                    CommandMap::iterator pIter = aOldUserCmdImageSet.find( aNewUserCmdImageSet[j] );
-                    if ( pIter != aOldUserCmdImageSet.end() )
-                    {
-                        pIter->second = true; // mark entry as replaced
-                        if ( !pReplacedImages )
-                            pReplacedImages = new CmdToXGraphicNameAccess();
-                        pReplacedImages->addElement( aNewUserCmdImageSet[j], 
-                                                     pImageList->GetImage( aNewUserCmdImageSet[j] ).GetXGraphic() );
-                    }
-                    else
-                    {
-                        if ( !pInsertedImages )
-                            pInsertedImages = new CmdToXGraphicNameAccess();
-                        pInsertedImages->addElement( aNewUserCmdImageSet[j], 
-                                                     pImageList->GetImage( aNewUserCmdImageSet[j] ).GetXGraphic() );
-                    }
-                }
-
-                // Search map for unmarked entries => they have been removed from the user list 
-                // through this reload operation. 
-                // We have to search the module and global image list!
-                rtl::Reference< GlobalImageList > rGlobalImageList  = implts_getGlobalImageList();
-                CmdImageList*                     pDefaultImageList = implts_getDefaultImageList();
-                uno::Reference< XGraphic >        xEmptyGraphic( Image().GetXGraphic() );
-                CommandMap::const_iterator        pIter = aOldUserCmdImageSet.begin();
-                while ( pIter != aOldUserCmdImageSet.end() )
-                {
-                    if ( !pIter->second )
-                    {
-                        Image aImage = pDefaultImageList->getImageFromCommandURL( i, pIter->first );
-                        if ( !aImage )
-                            aImage = rGlobalImageList->getImageFromCommandURL( i, pIter->first );
-
-                        if ( !aImage )
-                        {
-                            // No image in the module/global image list => remove user image
-                            if ( !pRemovedImages )
-                                pRemovedImages = new CmdToXGraphicNameAccess();
-                            pRemovedImages->addElement( pIter->first, xEmptyGraphic );
-                        }
-                        else
-                        {
-                            // Image has been found in the module/global image list => replace user image
-                            if ( !pReplacedImages )
-                                pReplacedImages = new CmdToXGraphicNameAccess();
-                            pReplacedImages->addElement( pIter->first, aImage.GetXGraphic() );
-                        }
-                    }
-                    ++pIter;
-                }
-                
-                aGuard.unlock();
-                
-                // Now notify our listeners. Unlock mutex to prevent deadlocks
-                if ( pInsertedImages != 0 )
-                {
-                    ConfigurationEvent aInsertEvent;
-                    aInsertEvent.aInfo           = uno::makeAny( i );
-                    aInsertEvent.Accessor        = uno::makeAny( xThis );
-                    aInsertEvent.Source          = xIfac;
-                    aInsertEvent.ResourceURL     = m_aResourceString;
-                    aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                                    static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
-                    implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
-                }
-                if ( pReplacedImages != 0 )
-                {
-                    ConfigurationEvent aReplaceEvent;
-                    aReplaceEvent.aInfo           = uno::makeAny( i );
-                    aReplaceEvent.Accessor        = uno::makeAny( xThis );
-                    aReplaceEvent.Source          = xIfac;
-                    aReplaceEvent.ResourceURL     = m_aResourceString;
-                    aReplaceEvent.ReplacedElement = Any();
-                    aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                                    static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
-                    implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
-                }
-                if ( pRemovedImages != 0 )
-                {
-                    ConfigurationEvent aRemoveEvent;
-                    aRemoveEvent.aInfo           = uno::makeAny( i );
-                    aRemoveEvent.Accessor        = uno::makeAny( xThis );
-                    aRemoveEvent.Source          = xIfac;
-                    aRemoveEvent.ResourceURL     = m_aResourceString;
-                    aRemoveEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >( 
-                                                        static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
-                    implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove );
-                }
-
-                aGuard.lock();
-            }
-        }
-    }
-}
-
-void SAL_CALL ModuleImageManager::store() 
-throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_bModified )
-    {
-        sal_Bool bWritten( sal_False );
-        for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
-        {
-            sal_Bool bSuccess = implts_storeUserImages( ImageType(i), m_xUserImageStorage, m_xUserBitmapsStorage );
-            if ( bSuccess )
-                bWritten = sal_True;
-            m_bUserImageListModified[i] = false;
-        }
-
-        if ( bWritten && 
-             m_xUserConfigStorage.is() &&  
-             m_xUserRootCommit.is() )
-        {
-            uno::Reference< XTransactedObject > xUserConfigStorageCommit( m_xUserConfigStorage, UNO_QUERY );
-            if ( xUserConfigStorageCommit.is() )
-                xUserConfigStorageCommit->commit();
-            m_xUserRootCommit->commit();
-        }
-
-        m_bModified = sal_False;
-    }
-}
-
-void SAL_CALL ModuleImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) 
-throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_bModified && Storage.is() )
-    {
-        long nModes = ElementModes::READWRITE;
-
-        uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ), 
-                                                                                    nModes );
-        if ( xUserImageStorage.is() )
-        {
-            uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
-                                                                                                    nModes );
-            for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
-            {
-                implts_getUserImageList( (ImageType)i );
-                implts_storeUserImages( (ImageType)i, xUserImageStorage, xUserBitmapsStorage );
-            }
-        
-            uno::Reference< XTransactedObject > xTransaction( Storage, UNO_QUERY );
-            if ( xTransaction.is() )
-                xTransaction->commit();
-        }
-    }
-}
-
-sal_Bool SAL_CALL ModuleImageManager::isModified() 
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    return m_bModified;
-}
-
-sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    
-    return m_bReadOnly;
-}
-
-void ModuleImageManager::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp )
-{
-    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( 
-                                        ::getCppuType( ( const css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >*) NULL ) );
-    if ( pContainer != NULL )
-    {
-        ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
-        while ( pIterator.hasMoreElements() )
-        {
-            try
-            {
-                switch ( eOp )
-                {
-                    case NotifyOp_Replace:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementReplaced( aEvent );
-                        break;
-                    case NotifyOp_Insert:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementInserted( aEvent );
-                        break;
-                    case NotifyOp_Remove:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementRemoved( aEvent );
-                        break;
-                }
-            }
-            catch( css::uno::RuntimeException& )
-            {
-                pIterator.remove();
-            }
-        }
-    }
-}
-
-} // namespace framework
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: moduleimagemanager.cxx,v $
+ * $Revision: 1.21 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+#include <rtl/logfile.hxx>
+#include <uiconfiguration/moduleimagemanager.hxx>
+#include <threadhelp/resetableguard.hxx>
+#include <xml/imagesconfiguration.hxx>
+#include <uiconfiguration/graphicnameaccess.hxx>
+#include <services.h>
+#include "imagemanagerimpl.hxx"
+
+#include "properties.h"
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/ui/ConfigurationEvent.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/ui/ImageType.hpp>
+#include <com/sun/star/uri/XUriReferenceFactory.hpp>
+#include <com/sun/star/uri/XUriReference.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <vcl/svapp.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <osl/mutex.hxx>
+#include <osl/file.hxx>
+#include <comphelper/sequence.hxx>
+#include <tools/urlobj.hxx>
+#include <unotools/ucbstreamhelper.hxx>
+#include <vcl/pngread.hxx>
+#include <vcl/pngwrite.hxx>
+#include <rtl/logfile.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespaces
+//_________________________________________________________________________________________________________________
+
+using ::rtl::OUString;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::XInterface;
+using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::RuntimeException;
+using ::com::sun::star::uno::UNO_QUERY;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::makeAny;
+using ::com::sun::star::graphic::XGraphic;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::embed;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::ui;
+
+namespace framework
+{
+ModuleImageManager::ModuleImageManager( uno::Reference< XMultiServiceFactory > xServiceManager ) :
+    ThreadHelpBase( &Application::GetSolarMutex() )
+    , m_pImpl( new ImageManagerImpl(xServiceManager,static_cast< OWeakObject* >(this),true) )
+{
+}
+
+ModuleImageManager::~ModuleImageManager()
+{
+}
+
+// XComponent
+void SAL_CALL ModuleImageManager::dispose() throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->dispose();
+}
+
+void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->addEventListener(xListener);
+}
+
+void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    m_pImpl->removeEventListener(xListener);
+}
+
+// XInitialization
+void SAL_CALL ModuleImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
+{
+    m_pImpl->initialize(aArguments);
+}
+
+// XImageManager
+void SAL_CALL ModuleImageManager::reset()
+throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->reset();
+}
+
+Sequence< ::rtl::OUString > SAL_CALL ModuleImageManager::getAllImageNames( ::sal_Int16 nImageType )
+throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->getAllImageNames( nImageType );
+}
+
+::sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL )
+throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->hasImage(nImageType,aCommandURL);   
+}
+
+Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages(
+    ::sal_Int16 nImageType,
+    const Sequence< ::rtl::OUString >& aCommandURLSequence )
+throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
+{
+    RTL_LOGFILE_CONTEXT( aLog, "framework: ModuleImageManager::getImages" );
+    return m_pImpl->getImages(nImageType,aCommandURLSequence);
+}
+
+void SAL_CALL ModuleImageManager::replaceImages(
+    ::sal_Int16 nImageType,
+    const Sequence< ::rtl::OUString >& aCommandURLSequence,
+    const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
+throw ( ::com::sun::star::lang::IllegalArgumentException,
+        ::com::sun::star::lang::IllegalAccessException,
+        ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence);
+}
+
+void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence )
+throw ( ::com::sun::star::lang::IllegalArgumentException,
+        ::com::sun::star::lang::IllegalAccessException,
+        ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->removeImages(nImageType,aCommandURLSequence);    
+}
+
+void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
+throw ( ::com::sun::star::container::ElementExistException,
+        ::com::sun::star::lang::IllegalArgumentException,
+        ::com::sun::star::lang::IllegalAccessException,
+        ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence);
+}
+
+// XUIConfiguration
+void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) 
+throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->addConfigurationListener(xListener);
+}
+
+void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) 
+throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->removeConfigurationListener(xListener);
+}
+
+// XUIConfigurationPersistence
+void SAL_CALL ModuleImageManager::reload() 
+throw ( ::com::sun::star::uno::Exception, 
+        ::com::sun::star::uno::RuntimeException )
+{
+    m_pImpl->reload();
+}
+
+void SAL_CALL ModuleImageManager::store() 
+throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->store();
+}
+
+void SAL_CALL ModuleImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) 
+throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->storeToStorage(Storage);
+}
+
+sal_Bool SAL_CALL ModuleImageManager::isModified() 
+throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->isModified();
+}
+
+sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->isReadOnly();
+}
+
+} // namespace framework
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 43d4fcfc8..812381371 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -50,7 +50,7 @@
 //	other includes
 //_________________________________________________________________________________________________________________
 #include <rtl/logfile.hxx>
-
+#include <cppuhelper/implbase1.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace com::sun::star::uno;
@@ -65,15 +65,10 @@ using namespace ::com::sun::star::frame;
 namespace framework
 {
 
-class RootStorageWrapper :  public com::sun::star::lang::XTypeProvider	    ,
-                            public com::sun::star::embed::XTransactedObject ,
-                            public ::cppu::OWeakObject
+class RootStorageWrapper :  public ::cppu::WeakImplHelper1< com::sun::star::embed::XTransactedObject >
 {
     public:
         //  XInterface, XTypeProvider
-        FWK_DECLARE_XINTERFACE
-      FWK_DECLARE_XTYPEPROVIDER
-
         RootStorageWrapper( const Reference< XTransactedObject >& xRootCommit ) : m_xRootCommit( xRootCommit ) {}
         virtual ~RootStorageWrapper() {}
 
@@ -92,17 +87,6 @@ class RootStorageWrapper :  public com::sun::star::lang::XTypeProvider	    ,
         Reference< XTransactedObject > m_xRootCommit;
 };
 
-DEFINE_XINTERFACE_2                    (    RootStorageWrapper                                          ,
-                                            OWeakObject                                                 ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                 ),
-                                            DIRECT_INTERFACE( com::sun::star::embed::XTransactedObject )
-                                        )
-
-DEFINE_XTYPEPROVIDER_2                  (   RootStorageWrapper              ,
-                                            css::lang::XTypeProvider        ,
-                                            css::embed::XTransactedObject
-                                        )
-
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
@@ -133,6 +117,7 @@ DEFINE_INIT_SERVICE                     (   ModuleUIConfigurationManagerSupplier
 /*TODO_AS
 void ModuleUIConfigurationManagerSupplier::impl_initStorages()
 {
+RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::impl_initStorages" );
     if ( !m_bInit )
     {
         RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ModuleUIConfigurationManagerSupplier::impl_initStorages" );
@@ -232,6 +217,7 @@ ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons
     , m_xServiceManager( xServiceManager )
     , m_aListenerContainer( m_aLock.getShareableOslMutex() )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier" );
     // Retrieve known modules and insert them into our hash_map to speed-up access time.
     Reference< XNameAccess > xNameAccess( m_xModuleMgr, UNO_QUERY );
     const Sequence< ::rtl::OUString >     aNameSeq   = xNameAccess->getElementNames();
@@ -273,6 +259,7 @@ ModuleUIConfigurationManagerSupplier::~ModuleUIConfigurationManagerSupplier()
 void SAL_CALL ModuleUIConfigurationManagerSupplier::dispose()
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::dispose" );
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
     css::lang::EventObject aEvent( xThis );
@@ -287,6 +274,7 @@ throw ( RuntimeException )
 void SAL_CALL ModuleUIConfigurationManagerSupplier::addEventListener( const Reference< XEventListener >& xListener )
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::addEventListener" );
     {
         ResetableGuard aGuard( m_aLock );
 
@@ -301,6 +289,7 @@ throw ( RuntimeException )
 void SAL_CALL ModuleUIConfigurationManagerSupplier::removeEventListener( const Reference< XEventListener >& xListener )
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::removeEventListener" );
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
 }
@@ -309,6 +298,7 @@ throw ( RuntimeException )
 Reference< XUIConfigurationManager > SAL_CALL ModuleUIConfigurationManagerSupplier::getUIConfigurationManager( const ::rtl::OUString& ModuleIdentifier )
 throw ( NoSuchElementException, RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::getUIConfigurationManager" );
     ResetableGuard aGuard( m_aLock );
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -318,30 +308,6 @@ throw ( NoSuchElementException, RuntimeException)
     ModuleToModuleCfgMgr::iterator pIter = m_aModuleToModuleUICfgMgrMap.find( ModuleIdentifier );
     if ( pIter == m_aModuleToModuleUICfgMgrMap.end() )
         throw NoSuchElementException();
-
-    ::rtl::OUString sShort;
-    try
-    {
-        Sequence< PropertyValue > lProps;
-        Reference< XNameAccess > xCont(m_xModuleMgr, UNO_QUERY);
-        xCont->getByName(ModuleIdentifier) >>= lProps;
-        for (sal_Int32 i=0; i<lProps.getLength(); ++i)
-        {
-            if (lProps[i].Name.equalsAscii("ooSetupFactoryShortName"))
-            {
-                lProps[i].Value >>= sShort;
-                break;
-            }
-        }
-    }
-    catch( Exception& )
-    {
-        sShort = ::rtl::OUString();
-    }
-
-    if (!sShort.getLength())
-        throw NoSuchElementException();
-
 //TODO_AS    impl_initStorages();
 
     // Create instance on demand
@@ -394,6 +360,28 @@ throw ( NoSuchElementException, RuntimeException)
         aArg.Value <<= m_xUserRootCommit;
         aArgs[3] <<= aArg;
         */
+        ::rtl::OUString sShort;
+        try
+        {
+            Sequence< PropertyValue > lProps;
+            Reference< XNameAccess > xCont(m_xModuleMgr, UNO_QUERY);
+            xCont->getByName(ModuleIdentifier) >>= lProps;
+            for (sal_Int32 i=0; i<lProps.getLength(); ++i)
+            {
+                if (lProps[i].Name.equalsAscii("ooSetupFactoryShortName"))
+                {
+                    lProps[i].Value >>= sShort;
+                    break;
+                }
+            }
+        }
+        catch( Exception& )
+        {
+            sShort = ::rtl::OUString();
+        }
+
+        if (!sShort.getLength())
+            throw NoSuchElementException();
         PropertyValue   aArg;
         Sequence< Any > aArgs( 2 );
         aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleShortName" ));
@@ -403,9 +391,7 @@ throw ( NoSuchElementException, RuntimeException)
         aArg.Value <<= ModuleIdentifier;
         aArgs[1] <<= aArg;
 
-        pIter->second = Reference< XUIConfigurationManager >( m_xServiceManager->createInstanceWithArguments(
-                                                                SERVICENAME_MODULEUICONFIGURATIONMANAGER, aArgs ),
-                                                              UNO_QUERY );
+        pIter->second.set( m_xServiceManager->createInstanceWithArguments(SERVICENAME_MODULEUICONFIGURATIONMANAGER, aArgs ),UNO_QUERY );
     }
 
     return pIter->second;
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
dissimilarity index 84%
index 7d2bf4fd5..5f478f290 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1,1615 +1,287 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: moduleuiconfigurationmanager.cxx,v $
- * $Revision: 1.19.208.2 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-#include <uiconfiguration/moduleuiconfigurationmanager.hxx>
-#include <threadhelp/resetableguard.hxx>
-#include <services.h>
-#include <uielement/constitemcontainer.hxx>
-#include <uielement/rootitemcontainer.hxx>
-#include <uielement/uielementtypenames.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <xml/toolboxconfiguration.hxx>
-
-#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
-#include <xml/statusbarconfiguration.hxx>
-#endif
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/ui/UIElementType.hpp>
-#include <com/sun/star/ui/ConfigurationEvent.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/io/XStream.hpp>
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-
-#include <vcl/svapp.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <comphelper/sequenceashashmap.hxx>
-
-//_________________________________________________________________________________________________________________
-//	namespaces
-//_________________________________________________________________________________________________________________
-
-using rtl::OUString;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::io;
-using namespace com::sun::star::embed;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::container;
-using namespace com::sun::star::beans;
-using namespace ::com::sun::star::ui;
-
-namespace framework
-{
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_8                    (    ModuleUIConfigurationManager                                                    ,
-                                            OWeakObject                                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                       ),
-                                            DIRECT_INTERFACE( css::lang::XComponent                                         ),
-                                            DIRECT_INTERFACE( css::lang::XInitialization                                    ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfiguration                  ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationManager           ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XModuleUIConfigurationManager     ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationPersistence       )
-                                        )
-
-DEFINE_XTYPEPROVIDER_8                  (   ModuleUIConfigurationManager                                ,
-                                            css::lang::XTypeProvider			                        ,
-                                            css::lang::XServiceInfo				                        ,
-                                            css::lang::XComponent                                       ,
-                                            css::lang::XInitialization                                  ,
-                                            ::com::sun::star::ui::XUIConfiguration                ,
-                                            ::com::sun::star::ui::XUIConfigurationManager         ,
-                                            ::com::sun::star::ui::XModuleUIConfigurationManager   ,
-                                            ::com::sun::star::ui::XUIConfigurationPersistence     
-                                        )
-
-DEFINE_XSERVICEINFO_MULTISERVICE        (   ModuleUIConfigurationManager                    ,
-                                            ::cppu::OWeakObject                             ,
-                                            SERVICENAME_MODULEUICONFIGURATIONMANAGER	    ,
-                                            IMPLEMENTATIONNAME_MODULEUICONFIGURATIONMANAGER
-                                        )
-
-DEFINE_INIT_SERVICE                     (   ModuleUIConfigurationManager, {} )
-
-
-// important: The order and position of the elements must match the constant
-// definition of "::com::sun::star::ui::UIElementType"
-static const char* UIELEMENTTYPENAMES[] =
-{
-    "",  // Dummy value for unknown!
-    UIELEMENTTYPE_MENUBAR_NAME,
-    UIELEMENTTYPE_POPUPMENU_NAME,
-    UIELEMENTTYPE_TOOLBAR_NAME,
-    UIELEMENTTYPE_STATUSBAR_NAME,
-    UIELEMENTTYPE_FLOATINGWINDOW_NAME,
-    UIELEMENTTYPE_PROGRESSBAR_NAME
-};
-
-static const char       RESOURCEURL_PREFIX[] = "private:resource/";
-static const sal_Int32  RESOURCEURL_PREFIX_SIZE = 17;
-static const char       RESOURCEURL_CUSTOM_ELEMENT[] = "custom_";
-
-static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL )
-{
-
-    if (( aResourceURL.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_PREFIX ))) == 0 ) &&
-        ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
-    {
-        OUString    aTmpStr     = aResourceURL.copy( RESOURCEURL_PREFIX_SIZE );
-        sal_Int32   nIndex      = aTmpStr.indexOf( '/' );
-        if (( nIndex > 0 ) &&  ( aTmpStr.getLength() > nIndex ))
-        {
-            OUString aTypeStr( aTmpStr.copy( 0, nIndex ));
-            for ( int i = 0; i < UIElementType::COUNT; i++ )
-            {
-                if ( aTypeStr.equalsAscii( UIELEMENTTYPENAMES[i] ))
-                    return sal_Int16( i );
-            }
-        }
-    }
-
-    return UIElementType::UNKNOWN;
-}
-
-static OUString RetrieveNameFromResourceURL( const rtl::OUString& aResourceURL )
-{
-    if (( aResourceURL.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_PREFIX ))) == 0 ) &&
-        ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
-    {
-        sal_Int32 nIndex = aResourceURL.lastIndexOf( '/' );
-        if (( nIndex > 0 ) && (( nIndex+1 ) < aResourceURL.getLength()))
-            return aResourceURL.copy( nIndex+1 );
-    }
-
-    return OUString();
-}
-
-void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType )
-{
-    // preload list of element types on demand
-    impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType );
-    impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
-
-    UIElementDataHashMap& rUserElements = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap;
-    UIElementDataHashMap::const_iterator pUserIter = rUserElements.begin();
-
-    OUString aCustomUrlPrefix( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_CUSTOM_ELEMENT ));
-    while ( pUserIter != rUserElements.end() )
-    {
-        sal_Int32 nIndex = pUserIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE );
-        if ( nIndex > RESOURCEURL_PREFIX_SIZE )
-        {
-            // Performance: Retrieve user interface name only for custom user interface elements. 
-            // It's only used by them!
-            UIElementData* pDataSettings = impl_findUIElementData( pUserIter->second.aResourceURL, nElementType );
-            if ( pDataSettings )
-            {
-                // Retrieve user interface name from XPropertySet interface
-                rtl::OUString aUIName;
-                Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY );
-                if ( xPropSet.is() )
-                {
-                    Any a = xPropSet->getPropertyValue( m_aPropUIName );
-                    a >>= aUIName;
-                }
-                
-                UIElementInfo aInfo( pUserIter->second.aResourceURL, aUIName );
-                aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pUserIter->second.aResourceURL, aInfo ));
-            }
-        }
-        else
-        {
-            // The user interface name for standard user interface elements is stored in the WindowState.xcu file
-            UIElementInfo aInfo( pUserIter->second.aResourceURL, OUString() );
-            aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pUserIter->second.aResourceURL, aInfo ));
-        }
-        ++pUserIter;
-    }
-
-    UIElementDataHashMap& rDefaultElements = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
-    UIElementDataHashMap::const_iterator pDefIter = rDefaultElements.begin();
-
-    while ( pDefIter != rDefaultElements.end() )
-    {
-        UIElementInfoHashMap::const_iterator pIterInfo = aUIElementInfoCollection.find( pDefIter->second.aResourceURL );
-        if ( pIterInfo == aUIElementInfoCollection.end() )
-        {
-            sal_Int32 nIndex = pDefIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE );
-            if ( nIndex > RESOURCEURL_PREFIX_SIZE )
-            {
-                // Performance: Retrieve user interface name only for custom user interface elements. 
-                // It's only used by them!
-                UIElementData* pDataSettings = impl_findUIElementData( pDefIter->second.aResourceURL, nElementType );
-                if ( pDataSettings )
-                {
-                    // Retrieve user interface name from XPropertySet interface
-                    rtl::OUString aUIName;
-                    Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY );
-                    if ( xPropSet.is() )
-                    {
-                        Any a = xPropSet->getPropertyValue( m_aPropUIName );
-                        a >>= aUIName;
-                    }
-                    
-                    UIElementInfo aInfo( pDefIter->second.aResourceURL, aUIName );
-                    aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo ));
-                }
-            }
-            else
-            {
-                // The user interface name for standard user interface elements is stored in the WindowState.xcu file
-                UIElementInfo aInfo( pDefIter->second.aResourceURL, OUString() );
-                aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo ));
-            }
-        }
-        
-        ++pDefIter;
-    }
-}
-
-void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType )
-{    
-    UIElementType& rElementTypeData = m_aUIElements[eLayer][nElementType];
-
-    if ( !rElementTypeData.bLoaded )
-    {
-        Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage;
-        if ( xElementTypeStorage.is() )
-        {
-            rtl::OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE );
-            aBuf.appendAscii( RESOURCEURL_PREFIX );
-            aBuf.appendAscii( UIELEMENTTYPENAMES[ nElementType ] );
-            aBuf.appendAscii( "/" );
-            OUString aResURLPrefix( aBuf.makeStringAndClear() );
-
-            UIElementDataHashMap& rHashMap = rElementTypeData.aElementsHashMap;
-            Reference< XNameAccess > xNameAccess( xElementTypeStorage, UNO_QUERY );
-            Sequence< OUString > aUIElementNames = xNameAccess->getElementNames();
-            for ( sal_Int32 n = 0; n < aUIElementNames.getLength(); n++ )
-            {
-                UIElementData aUIElementData;
-                
-                // Resource name must be without ".xml"
-                sal_Int32 nIndex = aUIElementNames[n].lastIndexOf( '.' );
-                if (( nIndex > 0 ) && ( nIndex < aUIElementNames[n].getLength() ))
-                {
-                    OUString aExtension( aUIElementNames[n].copy( nIndex+1 ));
-                    OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex ));
-
-                    if (( aUIElementName.getLength() > 0 ) && 
-                        ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 )))
-                    {
-                        aUIElementData.aResourceURL = aResURLPrefix + aUIElementName;
-                        aUIElementData.aName        = aUIElementNames[n];
-
-                        if ( eLayer == LAYER_USERDEFINED )
-                        {
-                            aUIElementData.bModified    = false;
-                            aUIElementData.bDefault     = false;
-                            aUIElementData.bDefaultNode = false;
-                        }
-                        
-                        // Create hash_map entries for all user interface elements inside the storage. We don't load the
-                        // settings to speed up the process.
-                        rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
-                    }
-                }
-            }
-        }
-    }
-
-    rElementTypeData.bLoaded = true;
-}
-
-void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData )
-{
-    UIElementType& rElementTypeData = m_aUIElements[eLayer][nElementType];
-
-    Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage;
-    if ( xElementTypeStorage.is() && aUIElementData.aName.getLength() )
-    {
-        try
-        {
-            Reference< XStream > xStream = xElementTypeStorage->openStreamElement( aUIElementData.aName, ElementModes::READ );
-            Reference< XInputStream > xInputStream = xStream->getInputStream();
-
-            if ( xInputStream.is() )
-            {
-                switch ( nElementType )
-                {
-                    case ::com::sun::star::ui::UIElementType::UNKNOWN:
-                    break;
-
-                    case ::com::sun::star::ui::UIElementType::MENUBAR:
-                    {
-                        try
-                        {
-                            MenuConfiguration aMenuCfg( m_xServiceManager );
-                            Reference< XIndexAccess > xContainer( aMenuCfg.CreateMenuBarConfigurationFromXML( xInputStream ));
-                            RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xContainer );
-                            if ( pRootItemContainer )
-                                aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
-                            else
-                                aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, sal_True ) ), UNO_QUERY );
-                            return;
-                        }
-                        catch ( ::com::sun::star::lang::WrappedTargetException& )
-                        {
-                        }
-                    }
-                    break;
-                        
-                    case ::com::sun::star::ui::UIElementType::POPUPMENU:
-                    {
-                        break;
-                    }
-
-                    case ::com::sun::star::ui::UIElementType::TOOLBAR:
-                    {
-                        try
-                        {
-                            Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
-                            ToolBoxConfiguration::LoadToolBox( m_xServiceManager, xInputStream, xIndexContainer );
-                            RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer );
-                            aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
-                            return;
-                        }
-                        catch ( ::com::sun::star::lang::WrappedTargetException& )
-                        {
-                        }
-                        
-                        break;
-                    }
-
-                    case ::com::sun::star::ui::UIElementType::STATUSBAR:
-                    {
-                        try
-                        {
-                            Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
-                            StatusBarConfiguration::LoadStatusBar( m_xServiceManager, xInputStream, xIndexContainer );
-                            RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer );
-                            aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
-                            return;
-                        }
-                        catch ( ::com::sun::star::lang::WrappedTargetException& )
-                        {
-                        }
-                        
-                        break;
-                    }
-
-                    case ::com::sun::star::ui::UIElementType::FLOATINGWINDOW:
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
-        {
-        }
-        catch (	::com::sun::star::lang::IllegalArgumentException& )
-        {
-        }
-        catch ( ::com::sun::star::io::IOException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
-        {
-        }
-    }
-
-    // At least we provide an empty settings container!
-    aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer() ), UNO_QUERY );
-}
-
-ModuleUIConfigurationManager::UIElementData*  ModuleUIConfigurationManager::impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad )
-{
-    // preload list of element types on demand
-    impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType );
-    impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
-
-    // first try to look into our user-defined vector/hash_map combination
-    UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap;
-    UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
-    if ( pIter != rUserHashMap.end() )
-    {
-        // Default data settings data must be retrieved from the default layer!
-        if ( !pIter->second.bDefault )
-        {
-            if ( !pIter->second.xSettings.is() && bLoad )
-                impl_requestUIElementData( nElementType, LAYER_USERDEFINED, pIter->second );
-            return &(pIter->second);
-        }
-    }
-    
-    // Not successfull, we have to look into our default vector/hash_map combination
-    UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
-    pIter = rDefaultHashMap.find( aResourceURL );
-    if ( pIter != rDefaultHashMap.end() )
-    {
-        if ( !pIter->second.xSettings.is() && bLoad )
-            impl_requestUIElementData( nElementType, LAYER_DEFAULT, pIter->second );
-        return &(pIter->second);
-    }
-
-    // Nothing has been found!
-    return NULL;
-}
-
-void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorage > xStorage, UIElementType& rElementType, bool bResetModifyState )
-{
-    UIElementDataHashMap& rHashMap          = rElementType.aElementsHashMap;
-    UIElementDataHashMap::iterator pIter    = rHashMap.begin();
-    
-    while ( pIter != rHashMap.end() )
-    {
-        UIElementData& rElement = pIter->second;
-        if ( rElement.bModified )
-        {
-            if ( rElement.bDefault )
-            {
-                xStorage->removeElement( rElement.aName );
-                rElement.bModified = sal_False; // mark as not modified
-            }
-            else
-            {
-                Reference< XStream > xStream( xStorage->openStreamElement( rElement.aName, ElementModes::WRITE|ElementModes::TRUNCATE ), UNO_QUERY );
-                Reference< XOutputStream > xOutputStream( xStream->getOutputStream() );
-                                
-                if ( xOutputStream.is() )
-                {
-                    switch( rElementType.nElementType )
-                    {
-                        case ::com::sun::star::ui::UIElementType::MENUBAR:
-                        {
-                            try
-                            {
-                                MenuConfiguration aMenuCfg( m_xServiceManager );
-                                aMenuCfg.StoreMenuBarConfigurationToXML( rElement.xSettings, xOutputStream );
-                            }
-                            catch ( ::com::sun::star::lang::WrappedTargetException& )
-                            {
-                            }
-                        }
-                        break;
-
-                        case ::com::sun::star::ui::UIElementType::TOOLBAR:
-                        {
-                            try
-                            {
-                                ToolBoxConfiguration::StoreToolBox( m_xServiceManager, xOutputStream, rElement.xSettings );
-                            }
-                            catch ( ::com::sun::star::lang::WrappedTargetException& )
-                            {
-                            }
-                        }
-                        break;
-
-                        case ::com::sun::star::ui::UIElementType::STATUSBAR:
-                        {
-                            try
-                            {
-                                StatusBarConfiguration::StoreStatusBar( m_xServiceManager, xOutputStream, rElement.xSettings );
-                            }
-                            catch ( ::com::sun::star::lang::WrappedTargetException& )
-                            {
-                            }
-                        }
-                        break;
-                        
-                        default:
-                        break;
-                    }
-                }
-                
-                // mark as not modified if we store to our own storage
-                if ( bResetModifyState )
-                    rElement.bModified = sal_False;
-            }
-        }
-        
-        ++pIter;
-    }
-
-    // commit element type storage
-    Reference< XTransactedObject > xTransactedObject( xStorage, UNO_QUERY );
-    if ( xTransactedObject.is() )
-        xTransactedObject->commit();
-
-    // mark UIElementType as not modified if we store to our own storage
-    if ( bResetModifyState )
-        rElementType.bModified = sal_False;
-}
-
-// This is only allowed to be called on the LAYER_USER_DEFINED!
-void ModuleUIConfigurationManager::impl_resetElementTypeData( 
-    UIElementType& rUserElementType, 
-    UIElementType& rDefaultElementType, 
-    ConfigEventNotifyContainer& rRemoveNotifyContainer, 
-    ConfigEventNotifyContainer& rReplaceNotifyContainer )
-{
-    UIElementDataHashMap& rHashMap          = rUserElementType.aElementsHashMap;
-    UIElementDataHashMap::iterator pIter    = rHashMap.begin();
-    
-    Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    Reference< XInterface > xIfac( xThis, UNO_QUERY );
-    Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY );
-    sal_Int16 nType = rUserElementType.nElementType;
-    
-    // Make copies of the event structures to be thread-safe. We have to unlock our mutex before calling
-    // our listeners!
-    while ( pIter != rHashMap.end() )
-    {
-        UIElementData& rElement = pIter->second;
-        if ( !rElement.bDefault )
-        {
-            if ( xDefaultNameAccess->hasByName( rElement.aName ))
-            {
-                // Replace settings with data from default layer
-                Reference< XIndexAccess > xOldSettings( rElement.xSettings );
-                impl_requestUIElementData( nType, LAYER_DEFAULT, rElement );
-                
-                ConfigurationEvent aReplaceEvent;
-                aReplaceEvent.ResourceURL = rElement.aResourceURL;
-                aReplaceEvent.Accessor <<= xThis;
-                aReplaceEvent.Source = xIfac;
-                aReplaceEvent.ReplacedElement <<= xOldSettings;
-                aReplaceEvent.Element <<= rElement.xSettings;
-                
-                rReplaceNotifyContainer.push_back( aReplaceEvent );
-                
-                // Mark element as default and not modified. That means "not active"
-                // in the user layer anymore.
-                rElement.bModified = false;
-                rElement.bDefault  = true;
-            }
-            else
-            {
-                // Remove user-defined settings from user layer
-                ConfigurationEvent aEvent;
-                aEvent.ResourceURL = rElement.aResourceURL;
-                aEvent.Accessor <<= xThis;
-                aEvent.Source = xIfac;
-                aEvent.Element <<= rElement.xSettings;
-                
-                rRemoveNotifyContainer.push_back( aEvent );
-                
-                // Mark element as default and not modified. That means "not active"
-                // in the user layer anymore.
-                rElement.bModified = false;
-                rElement.bDefault  = true;
-            }
-        }
-        
-        ++pIter;
-    }
-
-    // Remove all settings from our user interface elements
-    rHashMap.clear();
-}
-
-void ModuleUIConfigurationManager::impl_reloadElementTypeData( 
-    UIElementType&              rUserElementType, 
-    UIElementType&              rDefaultElementType, 
-    ConfigEventNotifyContainer& rRemoveNotifyContainer, 
-    ConfigEventNotifyContainer& rReplaceNotifyContainer )
-{
-    UIElementDataHashMap& rHashMap          = rUserElementType.aElementsHashMap;
-    UIElementDataHashMap::iterator pIter    = rHashMap.begin();
-    Reference< XStorage > xUserStorage( rUserElementType.xStorage );
-    Reference< XStorage > xDefaultStorage( rDefaultElementType.xStorage );
-    Reference< XNameAccess > xUserNameAccess( rUserElementType.xStorage, UNO_QUERY );
-    Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY );
-    
-    Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    Reference< XInterface > xIfac( xThis, UNO_QUERY );
-    sal_Int16 nType = rUserElementType.nElementType;
-    
-    while ( pIter != rHashMap.end() )
-    {
-        UIElementData& rElement = pIter->second;
-        if ( rElement.bModified )
-        {
-            if ( xUserNameAccess->hasByName( rElement.aName ))
-            {
-                // Replace settings with data from user layer
-                Reference< XIndexAccess > xOldSettings( rElement.xSettings );
-
-                impl_requestUIElementData( nType, LAYER_USERDEFINED, rElement );
-                
-                ConfigurationEvent aReplaceEvent;
-                
-                aReplaceEvent.ResourceURL = rElement.aResourceURL;
-                aReplaceEvent.Accessor <<= xThis;
-                aReplaceEvent.Source = xIfac;
-                aReplaceEvent.ReplacedElement <<= xOldSettings;
-                aReplaceEvent.Element <<= rElement.xSettings;
-                rReplaceNotifyContainer.push_back( aReplaceEvent );
-                
-                rElement.bModified = false;
-            }
-            else if ( xDefaultNameAccess->hasByName( rElement.aName ))
-            {
-                // Replace settings with data from default layer
-                Reference< XIndexAccess > xOldSettings( rElement.xSettings );
-
-                impl_requestUIElementData( nType, LAYER_DEFAULT, rElement );
-                
-                ConfigurationEvent aReplaceEvent;
-                
-                aReplaceEvent.ResourceURL = rElement.aResourceURL;
-                aReplaceEvent.Accessor <<= xThis;
-                aReplaceEvent.Source = xIfac;
-                aReplaceEvent.ReplacedElement <<= xOldSettings;
-                aReplaceEvent.Element <<= rElement.xSettings;
-                rReplaceNotifyContainer.push_back( aReplaceEvent );
-                
-                // Mark element as default and not modified. That means "not active"
-                // in the user layer anymore.
-                rElement.bModified = false;
-                rElement.bDefault  = true;
-            }
-            else
-            {
-                // Element settings are not in any storage => remove
-                ConfigurationEvent aRemoveEvent;
-                
-                aRemoveEvent.ResourceURL = rElement.aResourceURL;
-                aRemoveEvent.Accessor <<= xThis;
-                aRemoveEvent.Source = xIfac;
-                aRemoveEvent.Element <<= rElement.xSettings;
-                
-                rRemoveNotifyContainer.push_back( aRemoveEvent );
-                
-                // Mark element as default and not modified. That means "not active"
-                // in the user layer anymore.
-                rElement.bModified = false;
-                rElement.bDefault  = true;
-            }
-        }
-        ++pIter;
-    }
-
-    rUserElementType.bModified = sal_False;
-}
-
-void ModuleUIConfigurationManager::impl_Initialize()
-{
-    // Initialize the top-level structures with the storage data
-    if ( m_xUserConfigStorage.is() )
-    {
-        // Try to access our module sub folder
-        for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT;
-              i++ )
-        {
-            Reference< XStorage > xElementTypeStorage;
-            try
-            {
-                if ( m_pStorageHandler[i] )
-                    xElementTypeStorage = m_pStorageHandler[i]->getWorkingStorageUser();
-            }
-            catch ( com::sun::star::container::NoSuchElementException& )
-            {
-            }
-            catch ( ::com::sun::star::embed::InvalidStorageException& )
-            {
-            }
-            catch ( ::com::sun::star::lang::IllegalArgumentException& )
-            {
-            }
-            catch ( ::com::sun::star::io::IOException& )
-            {
-            }
-            catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
-            {
-            }
-
-            m_aUIElements[LAYER_USERDEFINED][i].nElementType = i;
-            m_aUIElements[LAYER_USERDEFINED][i].bModified = false;
-            m_aUIElements[LAYER_USERDEFINED][i].xStorage = xElementTypeStorage;
-            m_aUIElements[LAYER_USERDEFINED][i].bDefaultLayer = false;
-        }
-    }
-
-    if ( m_xDefaultConfigStorage.is() )
-    {
-        Reference< XNameAccess > xNameAccess( m_xDefaultConfigStorage, UNO_QUERY_THROW );
-
-        // Try to access our module sub folder
-        for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT;
-              i++ )
-        {
-            Reference< XStorage > xElementTypeStorage;
-            try
-            {
-                Any a = xNameAccess->getByName( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ));
-                a >>= xElementTypeStorage;
-            }
-            catch ( com::sun::star::container::NoSuchElementException& )
-            {
-            }
-
-            m_aUIElements[LAYER_DEFAULT][i].nElementType = i;
-            m_aUIElements[LAYER_DEFAULT][i].bModified = false;
-            m_aUIElements[LAYER_DEFAULT][i].xStorage = xElementTypeStorage;
-            m_aUIElements[LAYER_DEFAULT][i].bDefaultLayer = true;
-        }
-    }
-}
-
-ModuleUIConfigurationManager::ModuleUIConfigurationManager( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceManager ) :
-    ThreadHelpBase( &Application::GetSolarMutex() )
-    , m_xDefaultConfigStorage( 0 )
-    , m_xUserConfigStorage( 0 )
-    , m_bReadOnly( true )
-    , m_bInitialized( false )
-    , m_bModified( false )
-    , m_bConfigRead( false )
-    , m_bDisposed( false )
-    , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" ))
-    , m_aPropUIName( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))
-    , m_aPropResourceURL( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" ))
-    , m_xServiceManager( xServiceManager )
-    , m_aListenerContainer( m_aLock.getShareableOslMutex() )
-{
-    for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-        m_pStorageHandler[i] = 0;
-    
-    // Make sure we have a default initialized entry for every layer and user interface element type!
-    // The following code depends on this!
-    m_aUIElements[LAYER_DEFAULT].resize( ::com::sun::star::ui::UIElementType::COUNT );
-    m_aUIElements[LAYER_USERDEFINED].resize( ::com::sun::star::ui::UIElementType::COUNT );
-}
-
-ModuleUIConfigurationManager::~ModuleUIConfigurationManager()
-{
-    for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-        delete m_pStorageHandler[i];
-}
-
-// XComponent
-void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException)
-{
-    Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
-
-    css::lang::EventObject aEvent( xThis );
-    m_aListenerContainer.disposeAndClear( aEvent );
-    
-    {
-        ResetableGuard aGuard( m_aLock );
-        try
-        {
-            if ( m_xModuleImageManager.is() )
-                m_xModuleImageManager->dispose();
-        }
-        catch ( Exception& )
-        {
-        }
-        
-        m_xModuleImageManager.clear();
-        m_aUIElements[LAYER_USERDEFINED].clear();
-        m_aUIElements[LAYER_DEFAULT].clear();
-        m_xDefaultConfigStorage.clear();
-        m_xUserConfigStorage.clear();
-        m_xUserRootCommit.clear();
-        m_bConfigRead = false;
-        m_bModified = false;
-        m_bDisposed = true;
-    }
-}
-
-void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    {
-        ResetableGuard aGuard( m_aLock );
-
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-    }
-        
-    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
-}
-
-void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
-}
-
-// XInitialization
-void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bInitialized )
-    {
-        ::comphelper::SequenceAsHashMap lArgs(aArguments);
-        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
-        m_aModuleShortName  = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString());
-
-        for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-        {
-            rtl::OUString aResourceType;
-            if ( i == ::com::sun::star::ui::UIElementType::MENUBAR )
-                aResourceType = PresetHandler::RESOURCETYPE_MENUBAR();
-            else if ( i == ::com::sun::star::ui::UIElementType::TOOLBAR )
-                aResourceType = PresetHandler::RESOURCETYPE_TOOLBAR();
-            else if ( i == ::com::sun::star::ui::UIElementType::STATUSBAR )
-                aResourceType = PresetHandler::RESOURCETYPE_STATUSBAR();
-
-            if ( aResourceType.getLength() > 0 )
-            {
-                m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
-                m_pStorageHandler[i]->connectToResource( PresetHandler::E_MODULES,
-                                                         aResourceType, // this path wont be used later ... seee next lines!
-                                                         m_aModuleShortName,
-                                                         css::uno::Reference< css::embed::XStorage >()); // no document root used here!
-            }
-        }
-        
-        // initialize root storages for all resource types
-        m_xUserRootCommit       = css::uno::Reference< css::embed::XTransactedObject >(
-                                    m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty
-        m_xDefaultConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageShare(
-                                    m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare());                                            
-        m_xUserConfigStorage    = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageUser(
-                                    m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageUser());
-                                            
-        if ( m_xUserConfigStorage.is() )
-        {
-            Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
-            if ( xPropSet.is() )
-            {
-                long nOpenMode = 0;
-                Any a = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenMode" )));
-                if ( a >>= nOpenMode )
-                    m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
-            }
-        }
-    
-        impl_Initialize();
-
-        m_bInitialized = true;    
-    }
-}
-
-// XUIConfiguration
-void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    {
-        ResetableGuard aGuard( m_aLock );
-    
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-    }
-        
-    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener );
-}
-
-void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener );
-}
-
-        
-// XUIConfigurationManager
-void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    bool bResetStorage( false );
-
-    if ( !isReadOnly() )
-    {
-        // Remove all elements from our user-defined storage!
-        try
-        {
-            for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-            {
-                UIElementType&        rElementType = m_aUIElements[LAYER_USERDEFINED][i];
-                Reference< XStorage > xSubStorage( rElementType.xStorage, UNO_QUERY );
-
-                if ( xSubStorage.is() )
-                {
-                    bool bCommitSubStorage( false );                
-                    Reference< XNameAccess > xSubStorageNameAccess( xSubStorage, UNO_QUERY );
-                    Sequence< OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames();
-                    for ( sal_Int32 j = 0; j < aUIElementStreamNames.getLength(); j++ )
-                    {
-                        xSubStorage->removeElement( aUIElementStreamNames[j] );
-                        bCommitSubStorage = true;
-                    }
-                    
-                    if ( bCommitSubStorage )
-                    {
-                        Reference< XTransactedObject > xTransactedObject( xSubStorage, UNO_QUERY );
-                        if ( xTransactedObject.is() )
-                            xTransactedObject->commit();
-                        m_pStorageHandler[i]->commitUserChanges();
-                    }
-                }
-            }
-
-            bResetStorage = true;
-        
-            // remove settings from user defined layer and notify listener about removed settings data!
-            ConfigEventNotifyContainer aRemoveEventNotifyContainer;
-            ConfigEventNotifyContainer aReplaceEventNotifyContainer;
-            for ( sal_Int16 j = 1; j < ::com::sun::star::ui::UIElementType::COUNT; j++ )
-            {
-                try
-                {
-                    UIElementType& rUserElementType     = m_aUIElements[LAYER_USERDEFINED][j];
-                    UIElementType& rDefaultElementType  = m_aUIElements[LAYER_DEFAULT][j];
-                    
-                    impl_resetElementTypeData( rUserElementType, rDefaultElementType, aRemoveEventNotifyContainer, aReplaceEventNotifyContainer );
-                    rUserElementType.bModified = sal_False;
-                }
-                catch ( Exception& )
-                {
-                    throw IOException();
-                }
-            }
-        
-            m_bModified = sal_False;
-
-            // Unlock mutex before notify our listeners
-            aGuard.unlock();
-                
-            // Notify our listeners
-            sal_uInt32 k = 0;
-            for ( k = 0; k < aRemoveEventNotifyContainer.size(); k++ )
-                implts_notifyContainerListener( aRemoveEventNotifyContainer[k], NotifyOp_Remove );
-            for ( k = 0; k < aReplaceEventNotifyContainer.size(); k++ )
-                implts_notifyContainerListener( aReplaceEventNotifyContainer[k], NotifyOp_Replace );
-        }
-        catch ( ::com::sun::star::lang::IllegalArgumentException& )
-        {
-        }
-        catch ( ::com::sun::star::container::NoSuchElementException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
-        {
-        }
-    }    
-}
-
-Sequence< Sequence< PropertyValue > > SAL_CALL ModuleUIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType )
-throw ( IllegalArgumentException, RuntimeException )
-{
-    if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT ))
-        throw IllegalArgumentException();
-
-    ResetableGuard aGuard( m_aLock );
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    Sequence< Sequence< PropertyValue > > aElementInfoSeq;
-    UIElementInfoHashMap aUIElementInfoCollection;
-
-    if ( ElementType == ::com::sun::star::ui::UIElementType::UNKNOWN )
-    {
-        for ( sal_Int16 i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-            impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, sal_Int16( i ) );
-    }
-    else
-        impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, ElementType );
-
-    Sequence< PropertyValue > aUIElementInfo( 2 );
-    aUIElementInfo[0].Name = m_aPropResourceURL;
-    aUIElementInfo[1].Name = m_aPropUIName;
-
-    aElementInfoSeq.realloc( aUIElementInfoCollection.size() );
-    UIElementInfoHashMap::const_iterator pIter = aUIElementInfoCollection.begin();
-
-    sal_Int32 n = 0;
-    while ( pIter != aUIElementInfoCollection.end() )
-    {
-        aUIElementInfo[0].Value <<= pIter->second.aResourceURL;
-        aUIElementInfo[1].Value <<= pIter->second.aUIName;
-        aElementInfoSeq[n++] = aUIElementInfo;
-        ++pIter;
-    }
-
-    return aElementInfoSeq;
-}
-
-Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    // Creates an empty item container which can be filled from outside
-    return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
-}
-
-sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) 
-throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else
-    {
-        ResetableGuard aGuard( m_aLock );
-        
-        if ( m_bDisposed )
-            throw DisposedException();
-       
-        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false );
-        if ( pDataSettings )
-            return sal_True;
-    }
-    
-    return sal_False;
-}
-
-Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable )
-throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else
-    {
-        ResetableGuard aGuard( m_aLock );
-        
-        if ( m_bDisposed )
-            throw DisposedException();
-        
-        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType );
-        if ( pDataSettings )
-        {
-            // Create a copy of our data if someone wants to change the data.
-            if ( bWriteable )
-                return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( pDataSettings->xSettings ) ), UNO_QUERY );
-            else
-                return pDataSettings->xSettings;
-        }
-    }
-    
-    throw NoSuchElementException();
-}
-
-void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) 
-throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else if ( m_bReadOnly )
-        throw IllegalAccessException();
-    else
-    {
-        ResetableGuard aGuard( m_aLock );
-        
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType );
-        if ( pDataSettings )
-        {
-            if ( !pDataSettings->bDefaultNode )
-            {
-                // we have a settings entry in our user-defined layer - replace
-                Reference< XIndexAccess > xOldSettings = pDataSettings->xSettings;
-
-                // Create a copy of the data if the container is not const
-                Reference< XIndexReplace > xReplace( aNewData, UNO_QUERY );
-                if ( xReplace.is() )
-                    pDataSettings->xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( aNewData ) ), UNO_QUERY );
-                else
-                    pDataSettings->xSettings = aNewData;
-                pDataSettings->bDefault  = false;
-                pDataSettings->bModified = true;
-                m_bModified = true;
-
-                // Modify type container
-                UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType];
-                rElementType.bModified = true;
-
-                Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-
-                // Create event to notify listener about replaced element settings
-                ConfigurationEvent aEvent;
-                Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-                aEvent.ResourceURL = ResourceURL;
-                aEvent.Accessor <<= xThis;
-                aEvent.Source = xIfac;
-                aEvent.ReplacedElement <<= xOldSettings;
-                aEvent.Element <<= pDataSettings->xSettings;
-                
-                aGuard.unlock();
-                
-                implts_notifyContainerListener( aEvent, NotifyOp_Replace );
-            }
-            else
-            {
-                // we have no settings in our user-defined layer - insert
-                UIElementData aUIElementData;
-
-                aUIElementData.bDefault     = false;
-                aUIElementData.bDefaultNode = false;
-                aUIElementData.bModified    = true;
-
-                // Create a copy of the data if the container is not const
-                Reference< XIndexReplace > xReplace( aNewData, UNO_QUERY );
-                if ( xReplace.is() )
-                    aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( aNewData ) ), UNO_QUERY );
-                else
-                    aUIElementData.xSettings = aNewData;
-                aUIElementData.aName        = RetrieveNameFromResourceURL( ResourceURL ) + m_aXMLPostfix;
-                aUIElementData.aResourceURL = ResourceURL;
-                m_bModified = true;
-
-                // Modify type container
-                UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType];
-                rElementType.bModified = true;
-                
-                UIElementDataHashMap& rElements = rElementType.aElementsHashMap;
-
-                // Check our user element settings hash map as it can already contain settings that have been set to default!
-                // If no node can be found, we have to insert it.
-                UIElementDataHashMap::iterator pIter = rElements.find( ResourceURL );
-                if ( pIter != rElements.end() )
-                    pIter->second = aUIElementData;
-                else
-                    rElements.insert( UIElementDataHashMap::value_type( ResourceURL, aUIElementData ));
-                
-                Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-                Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-                // Create event to notify listener about replaced element settings
-                ConfigurationEvent aEvent;
-                
-                aEvent.ResourceURL = ResourceURL;
-                aEvent.Accessor <<= xThis;
-                aEvent.Source = xIfac;
-                aEvent.ReplacedElement <<= pDataSettings->xSettings;
-                aEvent.Element <<= aUIElementData.xSettings;
-                
-                aGuard.unlock();
-                
-                implts_notifyContainerListener( aEvent, NotifyOp_Replace );
-            }
-        }
-        else
-            throw NoSuchElementException();
-    }
-}
-
-void SAL_CALL ModuleUIConfigurationManager::removeSettings( const ::rtl::OUString& ResourceURL )
-throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException)
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else if ( m_bReadOnly )
-        throw IllegalAccessException();
-    else
-    {
-        ResetableGuard aGuard( m_aLock );
-        
-        if ( m_bDisposed )
-            throw DisposedException();
-        
-        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType );
-        if ( pDataSettings )
-        {
-            // If element settings are default, we don't need to change anything!
-            if ( pDataSettings->bDefault )
-                return;
-            else
-            {
-                Reference< XIndexAccess > xRemovedSettings = pDataSettings->xSettings;
-                pDataSettings->bDefault = true;
-                 
-                // check if this is a default layer node
-                if ( !pDataSettings->bDefaultNode )
-                    pDataSettings->bModified = true; // we have to remove this node from the user layer!
-                pDataSettings->xSettings.clear();
-                m_bModified = true; // user layer must be written
-
-                // Modify type container
-                UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType];
-                rElementType.bModified = true;
-
-                Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-                Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-                // Check if we have settings in the default layer which replaces the user-defined one!
-                UIElementData* pDefaultDataSettings = impl_findUIElementData( ResourceURL, nElementType );
-                if ( pDefaultDataSettings )
-                {
-                    // Create event to notify listener about replaced element settings
-                    ConfigurationEvent aEvent;
-                    
-                    aEvent.ResourceURL = ResourceURL;
-                    aEvent.Accessor <<= xThis;
-                    aEvent.Source = xIfac;
-                    aEvent.Element <<= xRemovedSettings;
-                    aEvent.ReplacedElement <<= pDefaultDataSettings->xSettings;
-                    
-                    aGuard.unlock();
-                    
-                    implts_notifyContainerListener( aEvent, NotifyOp_Replace );
-                }
-                else
-                {
-                    // Create event to notify listener about removed element settings
-                    ConfigurationEvent aEvent;
-                    
-                    aEvent.ResourceURL = ResourceURL;
-                    aEvent.Accessor <<= xThis;
-                    aEvent.Source = xIfac;
-                    aEvent.Element <<= xRemovedSettings;
-                    
-                    aGuard.unlock();
-                    
-                    implts_notifyContainerListener( aEvent, NotifyOp_Remove );
-                }
-            }
-        }
-        else
-            throw NoSuchElementException();
-    }
-}         
-
-void SAL_CALL ModuleUIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
-throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException )
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else if ( m_bReadOnly )
-        throw IllegalAccessException();
-    else
-    {
-        ResetableGuard aGuard( m_aLock );
-        
-        if ( m_bDisposed )
-            throw DisposedException();
-        
-        UIElementData* pDataSettings = impl_findUIElementData( NewResourceURL, nElementType );
-        if ( !pDataSettings )
-        {
-            UIElementData aUIElementData;
-
-            aUIElementData.bDefault     = false;
-            aUIElementData.bDefaultNode = false;
-            aUIElementData.bModified    = true;
-
-            // Create a copy of the data if the container is not const
-            Reference< XIndexReplace > xReplace( aNewData, UNO_QUERY );
-            if ( xReplace.is() )
-                aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( aNewData ) ), UNO_QUERY );
-            else
-                aUIElementData.xSettings = aNewData;
-            aUIElementData.aName        = RetrieveNameFromResourceURL( NewResourceURL ) + m_aXMLPostfix;
-            aUIElementData.aResourceURL = NewResourceURL;
-            m_bModified = true;
-
-            UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType];
-            rElementType.bModified = true;
-
-            UIElementDataHashMap& rElements = rElementType.aElementsHashMap;
-            rElements.insert( UIElementDataHashMap::value_type( NewResourceURL, aUIElementData ));
-            
-            Reference< XIndexAccess > xInsertSettings( aUIElementData.xSettings );
-            Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-            Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-            // Create event to notify listener about removed element settings
-            ConfigurationEvent aEvent;
-            
-            aEvent.ResourceURL = NewResourceURL;
-            aEvent.Accessor <<= xThis;
-            aEvent.Source = xIfac;
-            aEvent.Element <<= xInsertSettings;
-            
-            aGuard.unlock();
-            
-            implts_notifyContainerListener( aEvent, NotifyOp_Insert );
-        }
-        else
-            throw ElementExistException();
-    }
-}
-
-Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( !m_xModuleImageManager.is() )
-    {
-        m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ModuleImageManager( m_xServiceManager )), 
-                                                         UNO_QUERY );
-        Reference< XInitialization > xInit( m_xModuleImageManager, UNO_QUERY );
-        
-        Sequence< Any > aPropSeq( 3 );
-        PropertyValue aPropValue;
-        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" ));
-        aPropValue.Value = makeAny( m_xUserConfigStorage );
-        aPropSeq[0] = makeAny( aPropValue );
-        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" ));
-        aPropValue.Value = makeAny( m_aModuleIdentifier );
-        aPropSeq[1] = makeAny( aPropValue );
-        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserRootCommit" ));
-        aPropValue.Value = makeAny( m_xUserRootCommit );
-        aPropSeq[2] = makeAny( aPropValue );
-        
-        xInit->initialize( aPropSeq );
-    }
-
-    return Reference< XInterface >( m_xModuleImageManager, UNO_QUERY );
-
-//    return Reference< XInterface >();
-}
-
-Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    Reference< XMultiServiceFactory > xSMGR   = m_xServiceManager;
-    ::rtl::OUString                   aModule = /*m_aModuleShortName*/m_aModuleIdentifier;
-    aGuard.unlock();
-
-    Reference< XInterface >      xManager = xSMGR->createInstance(SERVICENAME_MODULEACCELERATORCONFIGURATION); 
-    Reference< XInitialization > xInit    (xManager, UNO_QUERY_THROW);
-    
-    PropertyValue aProp;
-    aProp.Name    = ::rtl::OUString::createFromAscii("ModuleIdentifier");
-    aProp.Value <<= aModule;
-    
-    Sequence< Any > lArgs(1);
-    lArgs[0] <<= aProp;
-    
-    xInit->initialize(lArgs);
-    
-    return xManager;
-}
-
-Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException)
-{
-    return Reference< XInterface >();
-}
-
-// XModuleUIConfigurationManager
-sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const ::rtl::OUString& ResourceURL )
-throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else
-    {
-        ResetableGuard aGuard( m_aLock );
-        
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false );
-        if ( pDataSettings && pDataSettings->bDefaultNode )
-            return sal_True;
-    }
-    
-    return sal_False;
-}
-
-Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const ::rtl::OUString& ResourceURL ) 
-throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else
-    {
-        ResetableGuard aGuard( m_aLock );
-        
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        // preload list of element types on demand
-        impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
-
-        // Look into our default vector/hash_map combination
-        UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
-        UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL );
-        if ( pIter != rDefaultHashMap.end() )
-        {
-            if ( !pIter->second.xSettings.is() )
-                impl_requestUIElementData( nElementType, LAYER_DEFAULT, pIter->second );
-            return pIter->second.xSettings;
-        }
-    }
-    
-    // Nothing has been found!
-    throw NoSuchElementException();
-}
-
-// XUIConfigurationPersistence
-void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly )
-    {
-        // Try to access our module sub folder
-        ConfigEventNotifyContainer aRemoveNotifyContainer;
-        ConfigEventNotifyContainer aReplaceNotifyContainer;
-        for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-        {
-            try
-            {
-                UIElementType& rUserElementType    = m_aUIElements[LAYER_USERDEFINED][i];
-                UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][i];
-                
-                if ( rUserElementType.bModified )
-                    impl_reloadElementTypeData( rUserElementType, rDefaultElementType, aRemoveNotifyContainer, aReplaceNotifyContainer );
-            }
-            catch ( Exception& )
-            {
-                throw IOException();
-            }
-        }
-
-        m_bModified = sal_False;
-
-        // Unlock mutex before notify our listeners
-        aGuard.unlock();
-            
-        // Notify our listeners
-        for ( sal_uInt32 j = 0; j < aRemoveNotifyContainer.size(); j++ )
-            implts_notifyContainerListener( aRemoveNotifyContainer[j], NotifyOp_Remove );
-        for ( sal_uInt32 k = 0; k < aReplaceNotifyContainer.size(); k++ )
-            implts_notifyContainerListener( aReplaceNotifyContainer[k], NotifyOp_Replace );
-    }
-}
-
-void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly )
-    {
-        // Try to access our module sub folder
-        for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-        {
-            try
-            {
-                UIElementType&        rElementType = m_aUIElements[LAYER_USERDEFINED][i];
-                Reference< XStorage > xStorage( rElementType.xStorage, UNO_QUERY );
-                
-                if ( rElementType.bModified && xStorage.is() )
-                {
-                    impl_storeElementTypeData( xStorage, rElementType );
-                    m_pStorageHandler[i]->commitUserChanges();
-                }
-            }
-            catch ( Exception& )
-            {
-                throw IOException();
-            }
-        }
-        
-        m_bModified = false;
-    }
-}
-
-void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly )
-    {
-        // Try to access our module sub folder
-        for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-        {
-            try
-            {
-                Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( 
-                                                            OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE ));
-                UIElementType&        rElementType = m_aUIElements[LAYER_USERDEFINED][i];
-                
-                if ( rElementType.bModified && xElementTypeStorage.is() )
-                    impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag!
-            }
-            catch ( Exception& )
-            {
-                throw IOException();
-            }
-        }
-        
-        Reference< XTransactedObject > xTransactedObject( Storage, UNO_QUERY );
-        if ( xTransactedObject.is() )
-            xTransactedObject->commit();
-    }
-}
-
-sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    
-    return m_bModified;
-}
-
-sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    
-    return m_bReadOnly;
-}
-
-void ModuleUIConfigurationManager::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp )
-{
-    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >*) NULL ) );
-    if ( pContainer != NULL )
-    {
-        ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
-        while ( pIterator.hasMoreElements() )
-        {
-            try
-            {
-                switch ( eOp )
-                {
-                    case NotifyOp_Replace:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementReplaced( aEvent );
-                        break;
-                    case NotifyOp_Insert:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementInserted( aEvent );
-                        break;
-                    case NotifyOp_Remove:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementRemoved( aEvent );
-                        break;
-                }
-            }
-            catch( css::uno::RuntimeException& )
-            {
-                pIterator.remove();
-            }
-        }
-    }
-}
-
-} // namespace framework
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: moduleuiconfigurationmanager.cxx,v $
+ * $Revision: 1.19.208.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+#include <uiconfiguration/moduleuiconfigurationmanager.hxx>
+#include <threadhelp/resetableguard.hxx>
+#include <services.h>
+#include <uielement/constitemcontainer.hxx>
+#include <uielement/rootitemcontainer.hxx>
+#include <uielement/uielementtypenames.hxx>
+#include <xml/menuconfiguration.hxx>
+#include <xml/toolboxconfiguration.hxx>
+#include <uiconfigurationmanagerimpl.hxx>
+
+#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
+#include <xml/statusbarconfiguration.hxx>
+#endif
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/ui/ConfigurationEvent.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/io/XStream.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <vcl/svapp.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <comphelper/sequenceashashmap.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespaces
+//_________________________________________________________________________________________________________________
+
+using rtl::OUString;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::io;
+using namespace com::sun::star::embed;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::container;
+using namespace com::sun::star::beans;
+using namespace ::com::sun::star::ui;
+
+namespace framework
+{
+
+//*****************************************************************************************************************
+//	XInterface, XTypeProvider, XServiceInfo
+//*****************************************************************************************************************
+DEFINE_XINTERFACE_8                    (    ModuleUIConfigurationManager                                                    ,
+                                            OWeakObject                                                                     ,
+                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
+                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                       ),
+                                            DIRECT_INTERFACE( css::lang::XComponent                                         ),
+                                            DIRECT_INTERFACE( css::lang::XInitialization                                    ),
+                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfiguration                  ),
+                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationManager           ),
+                                            DIRECT_INTERFACE( ::com::sun::star::ui::XModuleUIConfigurationManager     ),
+                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationPersistence       )
+                                        )
+
+DEFINE_XTYPEPROVIDER_8                  (   ModuleUIConfigurationManager                                ,
+                                            css::lang::XTypeProvider			                        ,
+                                            css::lang::XServiceInfo				                        ,
+                                            css::lang::XComponent                                       ,
+                                            css::lang::XInitialization                                  ,
+                                            ::com::sun::star::ui::XUIConfiguration                ,
+                                            ::com::sun::star::ui::XUIConfigurationManager         ,
+                                            ::com::sun::star::ui::XModuleUIConfigurationManager   ,
+                                            ::com::sun::star::ui::XUIConfigurationPersistence     
+                                        )
+
+DEFINE_XSERVICEINFO_MULTISERVICE        (   ModuleUIConfigurationManager                    ,
+                                            ::cppu::OWeakObject                             ,
+                                            SERVICENAME_MODULEUICONFIGURATIONMANAGER	    ,
+                                            IMPLEMENTATIONNAME_MODULEUICONFIGURATIONMANAGER
+                                        )
+
+DEFINE_INIT_SERVICE                     (   ModuleUIConfigurationManager, {} )
+
+
+ModuleUIConfigurationManager::ModuleUIConfigurationManager( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceManager ) 
+: m_pImpl( new UIConfigurationManagerImpl(xServiceManager,static_cast< OWeakObject* >(this),true) )
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::ModuleUIConfigurationManager" );
+}
+
+ModuleUIConfigurationManager::~ModuleUIConfigurationManager()
+{
+}
+
+// XComponent
+void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::dispose" );
+    m_pImpl->dispose();
+}
+
+void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::addEventListener" );
+    m_pImpl->addEventListener(xListener);
+}
+
+void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::removeEventListener" );
+    m_pImpl->removeEventListener(xListener);
+}
+
+// XInitialization
+void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::initialize" );
+    m_pImpl->initialize(aArguments);
+}
+
+// XUIConfiguration
+void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::addConfigurationListener" );
+    m_pImpl->addConfigurationListener(xListener);
+}
+
+void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::removeConfigurationListener" );
+    m_pImpl->removeConfigurationListener(xListener);
+}
+
+        
+// XUIConfigurationManager
+void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::reset" );
+    m_pImpl->reset();
+}
+
+Sequence< Sequence< PropertyValue > > SAL_CALL ModuleUIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType )
+throw ( IllegalArgumentException, RuntimeException )
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::getUIElementsInfo" );
+    return m_pImpl->getUIElementsInfo(ElementType);
+}
+
+Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::createSettings" );
+    
+    // Creates an empty item container which can be filled from outside
+    return m_pImpl->createSettings();
+}
+
+sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) 
+throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::hasSettings" );
+    return m_pImpl->hasSettings(ResourceURL);
+}
+
+Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable )
+throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::getSettings" );
+    return m_pImpl->getSettings(ResourceURL,bWriteable);
+}
+
+void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) 
+throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::replaceSettings" );
+    return m_pImpl->replaceSettings(ResourceURL,aNewData);
+}
+
+void SAL_CALL ModuleUIConfigurationManager::removeSettings( const ::rtl::OUString& ResourceURL )
+throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::removeSettings" );
+    m_pImpl->removeSettings(ResourceURL);
+}         
+
+void SAL_CALL ModuleUIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
+throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException )
+{
+    m_pImpl->insertSettings(NewResourceURL,aNewData);
+}
+
+Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::getImageManager" );
+    return m_pImpl->getImageManager();
+}
+
+Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::getShortCutManager" );
+    return m_pImpl->getShortCutManager();
+}
+
+Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::getEventsManager" );
+    return Reference< XInterface >();
+}
+
+// XModuleUIConfigurationManager
+sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const ::rtl::OUString& ResourceURL )
+throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::isDefaultSettings" );
+    return m_pImpl->isDefaultSettings(ResourceURL);
+}
+
+Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const ::rtl::OUString& ResourceURL ) 
+throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::getDefaultSettings" );
+    return m_pImpl->getDefaultSettings(ResourceURL);
+}
+
+// XUIConfigurationPersistence
+void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::reload" );
+    m_pImpl->reload();
+}
+
+void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::store" );
+    m_pImpl->store();
+}
+
+void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::storeToStorage" );
+    m_pImpl->storeToStorage(Storage);
+}
+
+sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::isModified" );
+    return m_pImpl->isModified();
+}
+
+sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManager::isReadOnly" );
+    return m_pImpl->isReadOnly();
+}
+
+} // namespace framework
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index d87163dc1..739130ae4 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -56,7 +56,7 @@
 //	includes of other projects
 //_________________________________________________________________________________________________________________
 #include <rtl/ustrbuf.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <unotools/configmgr.hxx>
 #include <tools/string.hxx>
 
@@ -101,23 +101,14 @@ namespace framework
 //	Configuration access class for PopupMenuControllerFactory implementation
 //*****************************************************************************************************************
 
-class ConfigurationAccess_UICategory : // interfaces
-                                        public  XTypeProvider                            ,
-                                        public  XNameAccess                              ,
-                                        public  XContainerListener                       ,
-                                        // baseclasses
-                                        // Order is neccessary for right initialization!
+class ConfigurationAccess_UICategory : // Order is neccessary for right initialization!
                                         private ThreadHelpBase                           ,
-                                        public  ::cppu::OWeakObject
+                                        public  ::cppu::WeakImplHelper2<XNameAccess,XContainerListener>
 {
     public:
                                   ConfigurationAccess_UICategory( const ::rtl::OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XMultiServiceFactory >& rServiceManager );
         virtual                   ~ConfigurationAccess_UICategory();
 
-        //  XInterface, XTypeProvider
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-
         // XNameAccess
         virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
             throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -171,22 +162,6 @@ class ConfigurationAccess_UICategory : // interfaces
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_5     (   ConfigurationAccess_UICategory                                                   ,
-                            OWeakObject                                                                     ,
-                            DIRECT_INTERFACE ( css::container::XNameAccess                                  ),
-                            DIRECT_INTERFACE ( css::container::XContainerListener                           ),
-                            DIRECT_INTERFACE ( css::lang::XTypeProvider                                     ),
-                            DERIVED_INTERFACE( css::container::XElementAccess, css::container::XNameAccess  ),
-                            DERIVED_INTERFACE( css::lang::XEventListener, XContainerListener                )
-                        )
-
-DEFINE_XTYPEPROVIDER_5  (   ConfigurationAccess_UICategory      ,
-                            css::container::XNameAccess         ,
-                            css::container::XElementAccess      ,
-                            css::container::XContainerListener  ,
-                            css::lang::XTypeProvider            ,
-                            css::lang::XEventListener
-                        )
 
 ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XMultiServiceFactory >& rServiceManager ) :
     ThreadHelpBase(),
@@ -197,14 +172,12 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUStr
     m_bConfigAccessInitialized( sal_False ),
     m_bCacheFilled( sal_False )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::ConfigurationAccess_UICategory" );
     // Create configuration hierachical access name
     m_aConfigCategoryAccess += aModuleName;
     m_aConfigCategoryAccess += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_CATEGORY_ELEMENT_ACCESS ));
 
-    m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance(
-                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                                    "com.sun.star.configuration.ConfigurationProvider" ))),
-                                                           UNO_QUERY );
+    m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance(SERVICENAME_CFGPROVIDER),UNO_QUERY );
 }
 
 ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory()
@@ -220,6 +193,7 @@ ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory()
 Any SAL_CALL ConfigurationAccess_UICategory::getByName( const ::rtl::OUString& rId )
 throw ( NoSuchElementException, WrappedTargetException, RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getByName" );
     ResetableGuard aLock( m_aLock );
     if ( !m_bConfigAccessInitialized )
     {
@@ -240,42 +214,42 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException)
 Sequence< ::rtl::OUString > SAL_CALL ConfigurationAccess_UICategory::getElementNames()
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getElementNames" );
     return getAllIds();
 }
 
 sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasByName( const ::rtl::OUString& rId )
 throw (::com::sun::star::uno::RuntimeException)
 {
-    Any a = getByName( rId );
-    if ( a != Any() )
-        return sal_True;
-    else
-        return sal_False;
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::hasByName" );
+    return getByName( rId ).hasValue();
 }
 
 // XElementAccess
 Type SAL_CALL ConfigurationAccess_UICategory::getElementType()
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getElementType" );
     return( ::getCppuType( (const rtl::OUString*)NULL ) );
 }
 
 sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasElements()
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::hasElements" );
     // There must be global categories!
     return sal_True;
 }
 
 sal_Bool ConfigurationAccess_UICategory::fillCache()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::fillCache" );
     RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ConfigurationAccess_UICategory::fillCache" );
 
     if ( m_bCacheFilled )
         return sal_True;
 
     sal_Int32            i( 0 );
-    Any                  a;
     rtl::OUString        aUIName;
     Sequence< ::rtl::OUString > aNameSeq = m_xConfigAccess->getElementNames();
 
@@ -283,12 +257,10 @@ sal_Bool ConfigurationAccess_UICategory::fillCache()
     {
         try
         {
-            Reference< XNameAccess > xNameAccess;
-            a = m_xConfigAccess->getByName( aNameSeq[i] );
-            if ( a >>= xNameAccess )
+            Reference< XNameAccess > xNameAccess(m_xConfigAccess->getByName( aNameSeq[i] ),UNO_QUERY);
+            if ( xNameAccess.is() )
             {
-                a = xNameAccess->getByName( m_aPropUIName );
-                a >>= aUIName;
+                xNameAccess->getByName( m_aPropUIName ) >>= aUIName;
 
                 m_aIdCache.insert( IdToInfoCache::value_type( aNameSeq[i], aUIName ));
             }
@@ -308,6 +280,7 @@ sal_Bool ConfigurationAccess_UICategory::fillCache()
 
 Any ConfigurationAccess_UICategory::getUINameFromID( const rtl::OUString& rId )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getUINameFromID" );
     Any a;
 
     try
@@ -343,6 +316,7 @@ Any ConfigurationAccess_UICategory::getUINameFromID( const rtl::OUString& rId )
 
 Any ConfigurationAccess_UICategory::getUINameFromCache( const rtl::OUString& rId )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getUINameFromCache" );
     Any a;
 
     IdToInfoCache::const_iterator pIter = m_aIdCache.find( rId );
@@ -354,6 +328,7 @@ Any ConfigurationAccess_UICategory::getUINameFromCache( const rtl::OUString& rId
 
 Sequence< rtl::OUString > ConfigurationAccess_UICategory::getAllIds()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getAllIds" );
     // SAFE
     ResetableGuard aLock( m_aLock );
 
@@ -402,20 +377,17 @@ Sequence< rtl::OUString > ConfigurationAccess_UICategory::getAllIds()
 
 sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::initializeConfigAccess" );
     Sequence< Any > aArgs( 1 );
     PropertyValue   aPropValue;
 
     try
     {
         aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
-        aPropValue.Value = makeAny( m_aConfigCategoryAccess );
+        aPropValue.Value <<= m_aConfigCategoryAccess;
         aArgs[0] <<= aPropValue;
 
-        m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(
-                                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                                                "com.sun.star.configuration.ConfigurationAccess" )),
-                                                                            aArgs ),
-                                                                        UNO_QUERY );
+        m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,aArgs ),UNO_QUERY );
         if ( m_xConfigAccess.is() )
         {
             // Add as container listener
@@ -439,19 +411,23 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess()
 // container.XContainerListener
 void SAL_CALL ConfigurationAccess_UICategory::elementInserted( const ContainerEvent& ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::elementInserted" );
 }
 
 void SAL_CALL ConfigurationAccess_UICategory::elementRemoved ( const ContainerEvent& ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::elementRemoved " );
 }
 
 void SAL_CALL ConfigurationAccess_UICategory::elementReplaced( const ContainerEvent& ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::elementReplaced" );
 }
 
 // lang.XEventListener
 void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEvent ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::disposing" );
     // SAFE
     // remove our reference to the config access
     ResetableGuard aLock( m_aLock );
@@ -465,21 +441,6 @@ void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEve
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_4                    (    UICategoryDescription                                                           ,
-                                            OWeakObject                                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                       ),
-                                            DIRECT_INTERFACE( css::container::XNameAccess		                            ),
-                                            DERIVED_INTERFACE( css::container::XElementAccess, css::container::XNameAccess  )
-                                        )
-
-DEFINE_XTYPEPROVIDER_4                  (   UICategoryDescription		    ,
-                                            css::lang::XTypeProvider		,
-                                            css::lang::XServiceInfo			,
-                                            css::container::XNameAccess     ,
-                                            css::container::XElementAccess
-                                        )
-
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   UICategoryDescription				    ,
                                             ::cppu::OWeakObject						,
                                             SERVICENAME_UICATEGORYDESCRIPTION	    ,
@@ -489,139 +450,29 @@ DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   UICategoryDescription				    ,
 DEFINE_INIT_SERVICE                     (   UICategoryDescription, {} )
 
 UICategoryDescription::UICategoryDescription( const Reference< XMultiServiceFactory >& xServiceManager ) :
-    ThreadHelpBase(),
-    m_xServiceManager( xServiceManager )
+    UICommandDescription(xServiceManager,true)
 {
     Reference< XNameAccess > xEmpty;
-    rtl::OUString aGenericCategories( ::rtl::OUString::createFromAscii( "GenericCategories" ));
-    m_xGenericCategories = new ConfigurationAccess_UICategory( aGenericCategories, xEmpty, xServiceManager );
-
-    m_xModuleManager = Reference< XModuleManager >( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ),
-                                                    UNO_QUERY );
-    Reference< XNameAccess > xNameAccess( m_xModuleManager, UNO_QUERY_THROW );
-    Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames();
-    Sequence< PropertyValue > aSeq;
-    ::rtl::OUString                  aModuleIdentifier;
+    rtl::OUString aGenericCategories( RTL_CONSTASCII_USTRINGPARAM( "GenericCategories" ));
+    m_xGenericUICommands = new ConfigurationAccess_UICategory( aGenericCategories, xEmpty, xServiceManager );
 
     // insert generic categories mappings
-    m_aModuleToCategoryFileMap.insert( ModuleToCategoryFileMap::value_type(
+    m_aModuleToCommandFileMap.insert( ModuleToCommandFileMap::value_type(
         rtl::OUString::createFromAscii( GENERIC_MODULE_NAME ), aGenericCategories ));
 
-    CategoryHashMap::iterator pCatIter = m_aCategoryHashMap.find( aGenericCategories );
-    if ( pCatIter != m_aCategoryHashMap.end() )
-        pCatIter->second = m_xGenericCategories;
-
-    for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ )
-    {
-        aModuleIdentifier = aElementNames[i];
-        Any a = xNameAccess->getByName( aModuleIdentifier );
-        if ( a >>= aSeq )
-        {
-            ::rtl::OUString aCmdCategoryStr;
-            for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
-            {
-                if ( aSeq[y].Name.equalsAscii("ooSetupFactoryCmdCategoryConfigRef") )
-                {
-                    aSeq[y].Value >>= aCmdCategoryStr;
-                    break;
-                }
-            }
-
-            // Create first mapping module identifier ==> category file
-            m_aModuleToCategoryFileMap.insert(
-                ModuleToCategoryFileMap::value_type( aModuleIdentifier, aCmdCategoryStr ));
+    UICommandsHashMap::iterator pCatIter = m_aUICommandsHashMap.find( aGenericCategories );
+    if ( pCatIter != m_aUICommandsHashMap.end() )
+        pCatIter->second = m_xGenericUICommands;
 
-            // Create second mapping category file ==> category instance
-            CategoryHashMap::iterator pIter = m_aCategoryHashMap.find( aCmdCategoryStr );
-            if ( pIter == m_aCategoryHashMap.end() )
-                m_aCategoryHashMap.insert( CategoryHashMap::value_type( aCmdCategoryStr, xEmpty ));
-        }
-    }
+    impl_fillElements("ooSetupFactoryCmdCategoryConfigRef");
 }
 
 UICategoryDescription::~UICategoryDescription()
 {
-    ResetableGuard aLock( m_aLock );
-    m_aModuleToCategoryFileMap.clear();
-    m_aCategoryHashMap.clear();
-    m_xGenericCategories.clear();
 }
-
-Any SAL_CALL UICategoryDescription::getByName( const ::rtl::OUString& aName )
-throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+Reference< XNameAccess > UICategoryDescription::impl_createConfigAccess(const ::rtl::OUString& _sName)
 {
-    Any a;
-
-    ResetableGuard aLock( m_aLock );
-
-    ModuleToCategoryFileMap::const_iterator pM2CIter = m_aModuleToCategoryFileMap.find( aName );
-    if ( pM2CIter != m_aModuleToCategoryFileMap.end() )
-    {
-        ::rtl::OUString aCommandFile( pM2CIter->second );
-        CategoryHashMap::iterator pIter = m_aCategoryHashMap.find( aCommandFile );
-        if ( pIter != m_aCategoryHashMap.end() )
-        {
-            if ( pIter->second.is() )
-                a <<= pIter->second;
-            else
-            {
-                Reference< XNameAccess > xUICategory;
-                ConfigurationAccess_UICategory* pUICategory = new ConfigurationAccess_UICategory( aCommandFile,
-                                                                                                  m_xGenericCategories,
-                                                                                                  m_xServiceManager );
-                xUICategory = Reference< XNameAccess >( static_cast< cppu::OWeakObject* >( pUICategory ),UNO_QUERY );
-                pIter->second = xUICategory;
-                a <<= xUICategory;
-            }
-        }
-    }
-    else
-    {
-        throw NoSuchElementException();
-    }
-
-    return a;
-}
-
-Sequence< ::rtl::OUString > SAL_CALL UICategoryDescription::getElementNames()
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    Sequence< rtl::OUString > aSeq( m_aModuleToCategoryFileMap.size() );
-
-    sal_Int32 n = 0;
-    ModuleToCategoryFileMap::const_iterator pIter = m_aModuleToCategoryFileMap.begin();
-    while ( pIter != m_aModuleToCategoryFileMap.end() )
-    {
-        aSeq[n] = pIter->first;
-        ++pIter;
-    }
-
-    return aSeq;
-}
-
-sal_Bool SAL_CALL UICategoryDescription::hasByName( const ::rtl::OUString& aName )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    ModuleToCategoryFileMap::const_iterator pIter = m_aModuleToCategoryFileMap.find( aName );
-    return ( pIter != m_aModuleToCategoryFileMap.end() );
-}
-
-// XElementAccess
-Type SAL_CALL UICategoryDescription::getElementType()
-throw (::com::sun::star::uno::RuntimeException)
-{
-    return( ::getCppuType( (const Reference< XNameAccess >*)NULL ) );
-}
-
-sal_Bool SAL_CALL UICategoryDescription::hasElements()
-throw (::com::sun::star::uno::RuntimeException)
-{
-    // generic UI commands are always available!
-    return sal_True;
+    return new ConfigurationAccess_UICategory( _sName,m_xGenericUICommands,m_xServiceManager );
 }
 
 } // namespace framework
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
dissimilarity index 81%
index 35b35c339..a46120ab4 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1,1357 +1,250 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: uiconfigurationmanager.cxx,v $
- * $Revision: 1.19 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-#include <uiconfiguration/uiconfigurationmanager.hxx>
-#include <threadhelp/resetableguard.hxx>
-#include <services.h>
-#include <uielement/rootitemcontainer.hxx>
-#include <uielement/constitemcontainer.hxx>
-#include <uielement/uielementtypenames.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <xml/toolboxconfiguration.hxx>
-
-#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
-#include <xml/statusbarconfiguration.hxx>
-#endif
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/ui/UIElementType.hpp>
-#include <com/sun/star/ui/ConfigurationEvent.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/embed/XTransactedObject.hpp>
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-
-#include <vcl/svapp.hxx>
-#include <rtl/ustrbuf.hxx>
-
-//_________________________________________________________________________________________________________________
-//	namespaces
-//_________________________________________________________________________________________________________________
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::io;
-using namespace com::sun::star::embed;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::container;
-using namespace com::sun::star::beans;
-using namespace ::com::sun::star::ui;
-
-namespace framework
-{
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_7                    (    UIConfigurationManager                                                          ,
-                                            OWeakObject                                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                       ),
-                                            DIRECT_INTERFACE( css::lang::XComponent                                         ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfiguration                  ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationManager           ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationPersistence       ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationStorage           )
-                                        )
-
-DEFINE_XTYPEPROVIDER_7                  (   UIConfigurationManager                                  ,
-                                            css::lang::XTypeProvider			                    ,
-                                            css::lang::XServiceInfo				                    ,
-                                            css::lang::XComponent                                   ,
-                                            ::com::sun::star::ui::XUIConfiguration            ,
-                                            ::com::sun::star::ui::XUIConfigurationManager     ,
-                                            ::com::sun::star::ui::XUIConfigurationPersistence ,
-                                            ::com::sun::star::ui::XUIConfigurationStorage
-                                        )
-
-DEFINE_XSERVICEINFO_MULTISERVICE        (   UIConfigurationManager                      ,
-                                            ::cppu::OWeakObject                         ,
-                                            SERVICENAME_UICONFIGURATIONMANAGER	        ,
-                                            IMPLEMENTATIONNAME_UICONFIGURATIONMANAGER
-                                        )
-
-DEFINE_INIT_SERVICE                     (   UIConfigurationManager, {} )
-
-
-// important: The order and position of the elements must match the constant
-// definition of "::com::sun::star::ui::UIElementType"
-static const char* UIELEMENTTYPENAMES[] =
-{
-    "",  // Dummy value for unknown!
-    UIELEMENTTYPE_MENUBAR_NAME,
-    UIELEMENTTYPE_POPUPMENU_NAME,
-    UIELEMENTTYPE_TOOLBAR_NAME,
-    UIELEMENTTYPE_STATUSBAR_NAME,
-    UIELEMENTTYPE_FLOATINGWINDOW_NAME,
-    UIELEMENTTYPE_PROGRESSBAR_NAME
-};
-
-static const char       RESOURCEURL_PREFIX[] = "private:resource/";
-static const sal_Int32  RESOURCEURL_PREFIX_SIZE = 17;
-
-static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL )
-{
-
-    if (( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_PREFIX ))) == 0 ) &&
-        ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
-    {
-        rtl::OUString aTmpStr     = aResourceURL.copy( RESOURCEURL_PREFIX_SIZE );
-        sal_Int32     nIndex      = aTmpStr.indexOf( '/' );
-        if (( nIndex > 0 ) &&  ( aTmpStr.getLength() > nIndex ))
-        {
-            rtl::OUString aTypeStr( aTmpStr.copy( 0, nIndex ));
-            for ( int i = 0; i < UIElementType::COUNT; i++ )
-            {
-                if ( aTypeStr.equalsAscii( UIELEMENTTYPENAMES[i] ))
-                    return sal_Int16( i );
-            }
-        }
-    }
-
-    return UIElementType::UNKNOWN;
-}
-
-static rtl::OUString RetrieveNameFromResourceURL( const rtl::OUString& aResourceURL )
-{
-    if (( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_PREFIX ))) == 0 ) &&
-        ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
-    {
-        sal_Int32 nIndex = aResourceURL.lastIndexOf( '/' );
-        if (( nIndex > 0 ) && (( nIndex+1 ) < aResourceURL.getLength()))
-            return aResourceURL.copy( nIndex+1 );
-    }
-
-    return rtl::OUString();
-}
-
-void UIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType )
-{
-    // preload list of element types on demand
-    impl_preloadUIElementTypeList( nElementType );
-
-    UIElementDataHashMap& rUserElements = m_aUIElements[nElementType].aElementsHashMap;
-    UIElementDataHashMap::const_iterator pUserIter = rUserElements.begin();
-
-    while ( pUserIter != rUserElements.end() )
-    {
-        UIElementData* pDataSettings = impl_findUIElementData( pUserIter->second.aResourceURL, nElementType );
-        if ( pDataSettings && !pDataSettings->bDefault )
-        {
-            // Retrieve user interface name from XPropertySet interface
-            rtl::OUString aUIName;
-            Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY );
-            if ( xPropSet.is() )
-            {
-                Any a = xPropSet->getPropertyValue( m_aPropUIName );
-                a >>= aUIName;
-            }
-
-            UIElementInfo aInfo( pUserIter->second.aResourceURL, aUIName );
-            aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pUserIter->second.aResourceURL, aInfo ));
-        }
-        ++pUserIter;
-    }
-}
-
-void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementType )
-{
-    UIElementType& rElementTypeData = m_aUIElements[nElementType];
-
-    if ( !rElementTypeData.bLoaded )
-    {
-        Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage;
-        if ( xElementTypeStorage.is() )
-        {
-            rtl::OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE );
-            aBuf.appendAscii( RESOURCEURL_PREFIX );
-            aBuf.appendAscii( UIELEMENTTYPENAMES[ nElementType ] );
-            aBuf.appendAscii( "/" );
-            rtl::OUString aResURLPrefix( aBuf.makeStringAndClear() );
-
-            UIElementDataHashMap& rHashMap = rElementTypeData.aElementsHashMap;
-            Reference< XNameAccess > xNameAccess( xElementTypeStorage, UNO_QUERY );
-            Sequence< rtl::OUString > aUIElementNames = xNameAccess->getElementNames();
-            for ( sal_Int32 n = 0; n < aUIElementNames.getLength(); n++ )
-            {
-                UIElementData aUIElementData;
-
-                // Resource name must be without ".xml"
-                sal_Int32 nIndex = aUIElementNames[n].lastIndexOf( '.' );
-                if (( nIndex > 0 ) && ( nIndex < aUIElementNames[n].getLength() ))
-                {
-                    rtl::OUString aExtension( aUIElementNames[n].copy( nIndex+1 ));
-                    rtl::OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex ));
-
-                    if (( aUIElementName.getLength() > 0 ) &&
-                        ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 )))
-                    {
-                        aUIElementData.aResourceURL = aResURLPrefix + aUIElementName;
-                        aUIElementData.aName        = aUIElementNames[n];
-                        aUIElementData.bModified    = false;
-                        aUIElementData.bDefault     = false;
-
-                        // Create hash_map entries for all user interface elements inside the storage. We don't load the
-                        // settings to speed up the process.
-                        rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
-                    }
-                }
-            }
-        }
-    }
-
-    rElementTypeData.bLoaded = true;
-}
-
-void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, UIElementData& aUIElementData )
-{
-    UIElementType& rElementTypeData = m_aUIElements[nElementType];
-
-    Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage;
-    if ( xElementTypeStorage.is() && aUIElementData.aName.getLength() )
-    {
-        try
-        {
-            Reference< XStream > xStream = xElementTypeStorage->openStreamElement( aUIElementData.aName, ElementModes::READ );
-            Reference< XInputStream > xInputStream = xStream->getInputStream();
-
-            if ( xInputStream.is() )
-            {
-                switch ( nElementType )
-                {
-                    case ::com::sun::star::ui::UIElementType::UNKNOWN:
-                    break;
-
-                    case ::com::sun::star::ui::UIElementType::MENUBAR:
-                    {
-                        try
-                        {
-                            MenuConfiguration aMenuCfg( m_xServiceManager );
-                            Reference< XIndexAccess > xContainer( aMenuCfg.CreateMenuBarConfigurationFromXML( xInputStream ));
-                            RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xContainer );
-                            if ( pRootItemContainer )
-                                aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
-                            else
-                                aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, sal_True ) ), UNO_QUERY );
-                            return;
-                        }
-                        catch ( ::com::sun::star::lang::WrappedTargetException& )
-                        {
-                        }
-                    }
-                    break;
-
-                    case ::com::sun::star::ui::UIElementType::POPUPMENU:
-                    {
-                        break;
-                    }
-
-                    case ::com::sun::star::ui::UIElementType::TOOLBAR:
-                    {
-                        try
-                        {
-                            Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
-                            ToolBoxConfiguration::LoadToolBox( m_xServiceManager, xInputStream, xIndexContainer );
-                            RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer );
-                            aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
-                            return;
-                        }
-                        catch ( ::com::sun::star::lang::WrappedTargetException& )
-                        {
-                        }
-
-                        break;
-                    }
-
-                    case ::com::sun::star::ui::UIElementType::STATUSBAR:
-                    {
-                        try
-                        {
-                            Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
-                            StatusBarConfiguration::LoadStatusBar( m_xServiceManager, xInputStream, xIndexContainer );
-                            RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer );
-                            aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
-                            return;
-                        }
-                        catch ( ::com::sun::star::lang::WrappedTargetException& )
-                        {
-                        }
-                        
-                        break;
-                    }
-
-                    case ::com::sun::star::ui::UIElementType::FLOATINGWINDOW:
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
-        {
-        }
-        catch (	::com::sun::star::lang::IllegalArgumentException& )
-        {
-        }
-        catch ( ::com::sun::star::io::IOException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
-        {
-        }
-    }
-
-    // At least we provide an empty settings container!
-    aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer()), UNO_QUERY );
-}
-
-UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad )
-{
-    // preload list of element types on demand
-    impl_preloadUIElementTypeList( nElementType );
-
-    // try to look into our document vector/hash_map combination
-    UIElementDataHashMap& rUserHashMap = m_aUIElements[nElementType].aElementsHashMap;
-    UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
-    if ( pIter != rUserHashMap.end() )
-    {
-        // Default data settings data means removed!
-        if ( pIter->second.bDefault )
-            return &(pIter->second);
-        else
-        {
-            if ( !pIter->second.xSettings.is() && bLoad )
-                impl_requestUIElementData( nElementType, pIter->second );
-            return &(pIter->second);
-        }
-    }
-
-    // Nothing has been found!
-    return NULL;
-}
-
-void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& xStorage, UIElementType& rElementType, bool bResetModifyState )
-{
-    UIElementDataHashMap& rHashMap          = rElementType.aElementsHashMap;
-    UIElementDataHashMap::iterator pIter    = rHashMap.begin();
-
-    while ( pIter != rHashMap.end() )
-    {
-        UIElementData& rElement = pIter->second;
-        if ( rElement.bModified )
-        {
-            if ( rElement.bDefault )
-            {
-                xStorage->removeElement( rElement.aName );
-                rElement.bModified = sal_False; // mark as not modified
-            }
-            else
-            {
-                Reference< XStream > xStream( xStorage->openStreamElement( rElement.aName, ElementModes::WRITE|ElementModes::TRUNCATE ), UNO_QUERY );
-                Reference< XOutputStream > xOutputStream( xStream->getOutputStream() );
-
-                if ( xOutputStream.is() )
-                {
-                    switch( rElementType.nElementType )
-                    {
-                        case ::com::sun::star::ui::UIElementType::MENUBAR:
-                        {
-                            try
-                            {
-                                MenuConfiguration aMenuCfg( m_xServiceManager );
-                                aMenuCfg.StoreMenuBarConfigurationToXML( rElement.xSettings, xOutputStream );
-                            }
-                            catch ( ::com::sun::star::lang::WrappedTargetException& )
-                            {
-                            }
-                        }
-                        break;
-
-                        case ::com::sun::star::ui::UIElementType::TOOLBAR:
-                        {
-                            try
-                            {
-                                ToolBoxConfiguration::StoreToolBox( m_xServiceManager, xOutputStream, rElement.xSettings );
-                            }
-                            catch ( ::com::sun::star::lang::WrappedTargetException& )
-                            {
-                            }
-                        }
-                        break;
-
-                        case ::com::sun::star::ui::UIElementType::STATUSBAR:
-                        {
-                            try
-                            {
-                                StatusBarConfiguration::StoreStatusBar( m_xServiceManager, xOutputStream, rElement.xSettings );
-                            }
-                            catch ( ::com::sun::star::lang::WrappedTargetException& )
-                            {
-                            }
-                        }
-                        break;
-                        
-                        default:
-                        break;
-                    }
-                }
-
-                // mark as not modified if we store to our own storage
-                if ( bResetModifyState )
-                    rElement.bModified = sal_False;
-            }
-        }
-
-        ++pIter;
-    }
-
-    // commit element type storage
-    Reference< XTransactedObject > xTransactedObject( xStorage, UNO_QUERY );
-    if ( xTransactedObject.is() )
-        xTransactedObject->commit();
-
-    // mark UIElementType as not modified if we store to our own storage
-    if ( bResetModifyState )
-        rElementType.bModified = sal_False;
-}
-
-void UIConfigurationManager::impl_resetElementTypeData(
-    UIElementType& rDocElementType,
-    ConfigEventNotifyContainer& rRemoveNotifyContainer )
-{
-    UIElementDataHashMap& rHashMap          = rDocElementType.aElementsHashMap;
-    UIElementDataHashMap::iterator pIter    = rHashMap.begin();
-
-    Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-    // Make copies of the event structures to be thread-safe. We have to unlock our mutex before calling
-    // our listeners!
-    while ( pIter != rHashMap.end() )
-    {
-        UIElementData& rElement = pIter->second;
-        if ( !rElement.bDefault )
-        {
-            // Remove user-defined settings from document
-            ConfigurationEvent aEvent;
-            aEvent.ResourceURL = rElement.aResourceURL;
-            aEvent.Accessor <<= xThis;
-            aEvent.Source = xIfac;
-            aEvent.Element <<= rElement.xSettings;
-
-            rRemoveNotifyContainer.push_back( aEvent );
-
-            // Mark element as default.
-            rElement.bModified = false;
-            rElement.bDefault  = true;
-        }
-        else
-            rElement.bModified = false;
-
-        ++pIter;
-    }
-
-    // Remove all settings from our user interface elements
-    rHashMap.clear();
-}
-
-void UIConfigurationManager::impl_reloadElementTypeData(
-    UIElementType&              rDocElementType,
-    ConfigEventNotifyContainer& rRemoveNotifyContainer,
-    ConfigEventNotifyContainer& rReplaceNotifyContainer )
-{
-    UIElementDataHashMap& rHashMap          = rDocElementType.aElementsHashMap;
-    UIElementDataHashMap::iterator pIter    = rHashMap.begin();
-    Reference< XStorage > xElementStorage( rDocElementType.xStorage );
-    Reference< XNameAccess > xElementNameAccess( xElementStorage, UNO_QUERY );
-
-    Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    Reference< XInterface > xIfac( xThis, UNO_QUERY );
-    sal_Int16 nType = rDocElementType.nElementType;
-
-    while ( pIter != rHashMap.end() )
-    {
-        UIElementData& rElement = pIter->second;
-        if ( rElement.bModified )
-        {
-            if ( xElementNameAccess->hasByName( rElement.aName ))
-            {
-                // Replace settings with data from user layer
-                Reference< XIndexAccess > xOldSettings( rElement.xSettings );
-
-                impl_requestUIElementData( nType, rElement );
-
-                ConfigurationEvent aReplaceEvent;
-
-                aReplaceEvent.ResourceURL = rElement.aResourceURL;
-                aReplaceEvent.Accessor <<= xThis;
-                aReplaceEvent.Source = xIfac;
-                aReplaceEvent.ReplacedElement <<= xOldSettings;
-                aReplaceEvent.Element <<= rElement.xSettings;
-                rReplaceNotifyContainer.push_back( aReplaceEvent );
-
-                rElement.bModified = false;
-            }
-            else
-            {
-                // Element settings are not in any storage => remove
-                ConfigurationEvent aRemoveEvent;
-
-                aRemoveEvent.ResourceURL = rElement.aResourceURL;
-                aRemoveEvent.Accessor <<= xThis;
-                aRemoveEvent.Source = xIfac;
-                aRemoveEvent.Element <<= rElement.xSettings;
-
-                rRemoveNotifyContainer.push_back( aRemoveEvent );
-
-                // Mark element as default and not modified. That means "not active" in the document anymore
-                rElement.bModified = false;
-                rElement.bDefault  = true;
-            }
-        }
-        ++pIter;
-    }
-
-    rDocElementType.bModified = sal_False;
-}
-
-void UIConfigurationManager::impl_Initialize()
-{
-    // Initialize the top-level structures with the storage data
-    if ( m_xDocConfigStorage.is() )
-    {
-        long nModes = m_bReadOnly ? ElementModes::READ : ElementModes::READWRITE;
-
-        // Try to access our module sub folder
-        for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT;
-              i++ )
-        {
-            Reference< XStorage > xElementTypeStorage;
-            try
-            {
-                xElementTypeStorage = m_xDocConfigStorage->openStorageElement( rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), nModes );
-            }
-            catch ( com::sun::star::container::NoSuchElementException& )
-            {
-            }
-            catch ( ::com::sun::star::embed::InvalidStorageException& )
-            {
-            }
-            catch ( ::com::sun::star::lang::IllegalArgumentException& )
-            {
-            }
-            catch ( ::com::sun::star::io::IOException& )
-            {
-            }
-            catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
-            {
-            }
-
-            m_aUIElements[i].nElementType = i;
-            m_aUIElements[i].bModified = false;
-            m_aUIElements[i].xStorage = xElementTypeStorage;
-            m_aUIElements[i].bDefaultLayer = false;
-        }
-    }
-    else
-    {
-        // We have no storage, just initialize ui element types with empty storage!
-        for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-            m_aUIElements[i].xStorage = m_xDocConfigStorage;
-    }
-}
-
-UIConfigurationManager::UIConfigurationManager( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceManager ) :
-    ThreadHelpBase( &Application::GetSolarMutex() )
-    , m_xDocConfigStorage( 0 )
-    , m_bReadOnly( true )
-    , m_bInitialized( false )
-    , m_bModified( false )
-    , m_bConfigRead( false )
-    , m_bDisposed( false )
-    , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" ))
-    , m_aPropUIName( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))
-    , m_aPropResourceURL( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" ))
-    , m_xServiceManager( xServiceManager )
-    , m_aListenerContainer( m_aLock.getShareableOslMutex() )
-{
-    // Make sure we have a default initialized entry for every layer and user interface element type!
-    // The following code depends on this!
-    m_aUIElements.resize( ::com::sun::star::ui::UIElementType::COUNT );
-}
-
-UIConfigurationManager::~UIConfigurationManager()
-{
-}
-
-// XComponent
-void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException)
-{
-    Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
-
-    css::lang::EventObject aEvent( xThis );
-    m_aListenerContainer.disposeAndClear( aEvent );
-
-    {
-        ResetableGuard aGuard( m_aLock );
-        try
-        {
-            if ( m_xImageManager.is() )
-                m_xImageManager->dispose();
-        }
-        catch ( Exception& )
-        {
-        }
-
-        m_xImageManager.clear();
-        m_aUIElements.clear();
-        m_xDocConfigStorage.clear();
-        m_bConfigRead = false;
-        m_bModified = false;
-        m_bDisposed = true;
-    }
-}
-
-void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    {
-        ResetableGuard aGuard( m_aLock );
-
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-    }
-
-    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
-}
-
-void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
-}
-
-// XUIConfigurationManager
-void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    {
-        ResetableGuard aGuard( m_aLock );
-
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        if ( m_bDisposed )
-            throw DisposedException();
-    }
-
-    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener );
-}
-
-void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener );
-}
-
-
-void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( isReadOnly() )
-        return;
-
-    bool bResetStorage( false );
-    if ( m_xDocConfigStorage.is() )
-    {
-        try
-        {
-            // Remove all elements from our user-defined storage!
-            bool bCommit( false );
-            for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-            {
-                UIElementType&        rElementType = m_aUIElements[i];
-                Reference< XStorage > xSubStorage( rElementType.xStorage, UNO_QUERY );
-
-                if ( xSubStorage.is() )
-                {
-                    bool bCommitSubStorage( false );
-                    Reference< XNameAccess > xSubStorageNameAccess( xSubStorage, UNO_QUERY );
-                    Sequence< rtl::OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames();
-                    for ( sal_Int32 j = 0; j < aUIElementStreamNames.getLength(); j++ )
-                    {
-                        xSubStorage->removeElement( aUIElementStreamNames[j] );
-                        bCommitSubStorage = true;
-                        bCommit = true;
-                    }
-
-                    if ( bCommitSubStorage )
-                    {
-                        Reference< XTransactedObject > xTransactedObject( xSubStorage, UNO_QUERY );
-                        if ( xTransactedObject.is() )
-                            xTransactedObject->commit();
-                    }
-                }
-            }
-
-            // Commit changes
-            if ( bCommit )
-            {
-                Reference< XTransactedObject > xTransactedObject( m_xDocConfigStorage, UNO_QUERY );
-                if ( xTransactedObject.is() )
-                    xTransactedObject->commit();
-            }
-            bResetStorage = true;
-
-            // remove settings from user defined layer and notify listener about removed settings data!
-            // Try to access our module sub folder
-            ConfigEventNotifyContainer aRemoveEventNotifyContainer;
-            for ( sal_Int16 j = 1; j < ::com::sun::star::ui::UIElementType::COUNT; j++ )
-            {
-                UIElementType& rDocElementType = m_aUIElements[j];
-                
-                impl_resetElementTypeData( rDocElementType, aRemoveEventNotifyContainer );
-                rDocElementType.bModified = sal_False;
-            }
-        
-            m_bModified = sal_False;
-
-            // Unlock mutex before notify our listeners
-            aGuard.unlock();
-                
-            // Notify our listeners
-            for ( sal_uInt32 k = 0; k < aRemoveEventNotifyContainer.size(); k++ )
-                implts_notifyContainerListener( aRemoveEventNotifyContainer[k], NotifyOp_Remove );
-        }
-        catch ( ::com::sun::star::lang::IllegalArgumentException& )
-        {
-        }
-        catch ( ::com::sun::star::container::NoSuchElementException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
-        {
-        }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
-        {
-        }        
-    }    
-}
-
-Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType )
-throw ( IllegalArgumentException, RuntimeException )
-{
-    if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT ))
-        throw IllegalArgumentException();
-
-    ResetableGuard aGuard( m_aLock );
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    Sequence< Sequence< PropertyValue > > aElementInfoSeq;
-    UIElementInfoHashMap aUIElementInfoCollection;
-
-    if ( ElementType == ::com::sun::star::ui::UIElementType::UNKNOWN )
-    {
-        for ( sal_Int16 i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-            impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, sal_Int16( i ) );
-    }
-    else
-        impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, ElementType );
-
-    Sequence< PropertyValue > aUIElementInfo( 2 );
-    aUIElementInfo[0].Name = m_aPropResourceURL;
-    aUIElementInfo[1].Name = m_aPropUIName;
-
-    aElementInfoSeq.realloc( aUIElementInfoCollection.size() );
-    UIElementInfoHashMap::const_iterator pIter = aUIElementInfoCollection.begin();
-
-    sal_Int32 n = 0;
-    while ( pIter != aUIElementInfoCollection.end() )
-    {
-        aUIElementInfo[0].Value <<= pIter->second.aResourceURL;
-        aUIElementInfo[1].Value <<= pIter->second.aUIName;
-        aElementInfoSeq[n++] = aUIElementInfo;
-        ++pIter;
-    }
-
-    return aElementInfoSeq;
-}
-
-Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    // Creates an empty item container which can be filled from outside
-    return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer()), UNO_QUERY );
-}
-
-sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) 
-throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else
-    {
-        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false );
-        if ( pDataSettings && !pDataSettings->bDefault )
-            return sal_True;
-    }
-    
-    return sal_False;
-}
-
-Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable )
-throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else
-    {
-        ResetableGuard aGuard( m_aLock );
-        
-        if ( m_bDisposed )
-            throw DisposedException();
-        
-        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType );
-        if ( pDataSettings && !pDataSettings->bDefault )
-        {
-            // Create a copy of our data if someone wants to change the data.
-            if ( bWriteable )
-                return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( pDataSettings->xSettings ) ), UNO_QUERY );
-            else
-                return pDataSettings->xSettings;
-        }
-    }
-    
-    throw NoSuchElementException();
-}
-
-void SAL_CALL UIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) 
-throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else if ( m_bReadOnly )
-        throw IllegalAccessException();
-    else
-    {
-        ResetableGuard aGuard( m_aLock );
-        
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType );
-        if ( pDataSettings && !pDataSettings->bDefault )
-        {
-            // we have a settings entry in our user-defined layer - replace
-            Reference< XIndexAccess > xOldSettings = pDataSettings->xSettings;
-
-            // Create a copy of the data if the container is not const
-            Reference< XIndexReplace > xReplace( aNewData, UNO_QUERY );
-            if ( xReplace.is() )
-                pDataSettings->xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( aNewData ) ), UNO_QUERY );
-            else
-                pDataSettings->xSettings = aNewData;
-
-            pDataSettings->bDefault  = false;
-            pDataSettings->bModified = true;
-            m_bModified = true;
-
-            // Modify type container
-            UIElementType& rElementType = m_aUIElements[nElementType];
-            rElementType.bModified = true;
-
-            Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-
-            // Create event to notify listener about replaced element settings
-            ConfigurationEvent aEvent;
-            Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-            aEvent.ResourceURL = ResourceURL;
-            aEvent.Accessor <<= xThis;
-            aEvent.Source = xIfac;
-            aEvent.ReplacedElement <<= xOldSettings;
-            aEvent.Element <<= pDataSettings->xSettings;
-            
-            aGuard.unlock();
-            
-            implts_notifyContainerListener( aEvent, NotifyOp_Replace );
-        }
-        else
-            throw NoSuchElementException();
-    }
-}
-
-void SAL_CALL UIConfigurationManager::removeSettings( const ::rtl::OUString& ResourceURL )
-throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException)
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else if ( m_bReadOnly )
-        throw IllegalAccessException();
-    else
-    {
-        ResetableGuard aGuard( m_aLock );
-        
-        if ( m_bDisposed )
-            throw DisposedException();
-        
-        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType );
-        if ( pDataSettings )
-        {
-            // If element settings are default, we don't need to change anything!
-            if ( pDataSettings->bDefault )
-                return;
-            else
-            {
-                Reference< XIndexAccess > xRemovedSettings = pDataSettings->xSettings;
-                pDataSettings->bDefault = true;
-                 
-                // check if this is a default layer node
-                pDataSettings->bModified = true; // we have to remove this node from the user layer!
-                pDataSettings->xSettings.clear();
-                m_bModified = true; // user layer must be written
-
-                // Modify type container
-                UIElementType& rElementType = m_aUIElements[nElementType];
-                rElementType.bModified = true;
-
-                Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-                Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-                // Create event to notify listener about removed element settings
-                ConfigurationEvent aEvent;
-                
-                aEvent.ResourceURL = ResourceURL;
-                aEvent.Accessor <<= xThis;
-                aEvent.Source = xIfac;
-                aEvent.Element <<= xRemovedSettings;
-                
-                aGuard.unlock();
-                
-                implts_notifyContainerListener( aEvent, NotifyOp_Remove );
-            }
-        }
-        else
-            throw NoSuchElementException();
-    }
-}         
-
-void SAL_CALL UIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
-throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException )
-{
-    sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL );
-    
-    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
-        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
-        throw IllegalArgumentException();
-    else if ( m_bReadOnly )
-        throw IllegalAccessException();
-    else
-    {
-        ResetableGuard aGuard( m_aLock );
-        
-        if ( m_bDisposed )
-            throw DisposedException();
-        
-        bool           bInsertData( false );
-        UIElementData  aUIElementData;
-        UIElementData* pDataSettings = impl_findUIElementData( NewResourceURL, nElementType );
-        
-        if ( pDataSettings && !pDataSettings->bDefault )
-            throw ElementExistException();
-        
-        if ( !pDataSettings )
-        {
-            pDataSettings = &aUIElementData;
-            bInsertData   = true;
-        }
-        
-        {
-            pDataSettings->bDefault     = false;
-            pDataSettings->bModified    = true;
-
-            // Create a copy of the data if the container is not const
-            Reference< XIndexReplace > xReplace( aNewData, UNO_QUERY );
-            if ( xReplace.is() )
-                pDataSettings->xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( aNewData ) ), UNO_QUERY );
-            else
-                pDataSettings->xSettings = aNewData;
-
-            m_bModified = true;
-
-            UIElementType& rElementType = m_aUIElements[nElementType];
-            rElementType.bModified = true;
-
-            if ( bInsertData )
-            {
-                pDataSettings->aName        = RetrieveNameFromResourceURL( NewResourceURL ) + m_aXMLPostfix;
-                pDataSettings->aResourceURL = NewResourceURL;
-                
-                UIElementDataHashMap& rElements = rElementType.aElementsHashMap;
-                rElements.insert( UIElementDataHashMap::value_type( NewResourceURL, *pDataSettings ));
-            }
-            
-            Reference< XIndexAccess > xInsertSettings( aUIElementData.xSettings );
-            Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY );
-            Reference< XInterface > xIfac( xThis, UNO_QUERY );
-
-            // Create event to notify listener about removed element settings
-            ConfigurationEvent aEvent;
-            
-            aEvent.ResourceURL = NewResourceURL;
-            aEvent.Accessor <<= xThis;
-            aEvent.Source = xIfac;
-            aEvent.Element <<= xInsertSettings;
-            
-            aGuard.unlock();
-            
-            implts_notifyContainerListener( aEvent, NotifyOp_Insert );
-        }
-    }
-}
-
-Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException)
-{
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( !m_xImageManager.is() )
-    {
-        m_xImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ImageManager( m_xServiceManager )), 
-                                                         UNO_QUERY );
-        Reference< XInitialization > xInit( m_xImageManager, UNO_QUERY );
-        
-        Sequence< Any > aPropSeq( 2 );
-        PropertyValue aPropValue;
-        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" ));
-        aPropValue.Value = makeAny( m_xDocConfigStorage );
-        aPropSeq[0] = makeAny( aPropValue );
-        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" ));
-        aPropValue.Value = makeAny( m_aModuleIdentifier );
-        aPropSeq[1] = makeAny( aPropValue );
-        
-        xInit->initialize( aPropSeq );
-    }
-
-    return Reference< XInterface >( m_xImageManager, UNO_QUERY );
-}
-
-Reference< XInterface > SAL_CALL UIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException)
-{
-    // SAFE ->
-    ResetableGuard aGuard( m_aLock );
-    
-    if (m_xAccConfig.is())
-        return m_xAccConfig;
-    
-    Reference< XMultiServiceFactory > xSMGR         = m_xServiceManager;
-    Reference< XStorage >             xDocumentRoot = m_xDocConfigStorage;
-    
-    aGuard.unlock();
-    // <- SAFE
-    
-    Reference< XInterface >      xAccConfig = xSMGR->createInstance(SERVICENAME_DOCUMENTACCELERATORCONFIGURATION); 
-    Reference< XInitialization > xInit      (xAccConfig, UNO_QUERY_THROW);
-    
-    PropertyValue aProp;
-    aProp.Name    = ::rtl::OUString::createFromAscii("DocumentRoot");
-    aProp.Value <<= xDocumentRoot;
-    
-    Sequence< Any > lArgs(1);
-    lArgs[0] <<= aProp;
-    
-    xInit->initialize(lArgs);
-    
-    // SAFE ->
-    aGuard.lock();
-    m_xAccConfig = xAccConfig; 
-    aGuard.unlock();
-    // <- SAFE
-    
-    return xAccConfig;
-}
-
-Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException)
-{
-    return Reference< XInterface >();
-}
-
-// XUIConfigurationStorage
-void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    if ( m_xDocConfigStorage.is() )
-    {
-        try
-        {
-            // Dispose old storage to be sure that it will be closed
-            Reference< XComponent > xComponent( m_xDocConfigStorage, UNO_QUERY );
-            if ( xComponent.is() )
-                xComponent->dispose();
-        }
-        catch ( Exception& )
-        {
-        }
-    }
-
-    // We store the new storage. Be careful it could be an empty reference!
-    m_xDocConfigStorage = Storage;
-    m_bReadOnly         = sal_True;
-
-    Reference< XUIConfigurationStorage > xAccUpdate(m_xAccConfig, UNO_QUERY);
-    if ( xAccUpdate.is() )
-        xAccUpdate->setStorage( m_xDocConfigStorage );
-    
-    if ( m_xImageManager.is() )
-    {
-        ImageManager* pImageManager = (ImageManager*)m_xImageManager.get();
-        if ( pImageManager )
-            pImageManager->setStorage( m_xDocConfigStorage );
-    }
-
-    if ( m_xDocConfigStorage.is() )
-    {
-        Reference< XPropertySet > xPropSet( m_xDocConfigStorage, UNO_QUERY );
-        if ( xPropSet.is() )
-        {
-            try
-            {
-                long nOpenMode = 0;
-                Any a = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenMode" )));
-                if ( a >>= nOpenMode )
-                    m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
-            }
-            catch ( com::sun::star::beans::UnknownPropertyException& )
-            {
-            }
-            catch ( com::sun::star::lang::WrappedTargetException& )
-            {
-            }
-        }
-    }
-
-    impl_Initialize();
-}
-
-sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    return ( m_xDocConfigStorage.is() );
-}
-
-// XUIConfigurationPersistence
-void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_xDocConfigStorage.is() && m_bModified && !m_bReadOnly )
-    {
-        // Try to access our module sub folder
-        ConfigEventNotifyContainer aRemoveNotifyContainer;
-        ConfigEventNotifyContainer aReplaceNotifyContainer;
-        for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-        {
-            try
-            {
-                UIElementType& rDocElementType = m_aUIElements[i];
-                if ( rDocElementType.bModified )
-                    impl_reloadElementTypeData( rDocElementType, aRemoveNotifyContainer, aReplaceNotifyContainer );
-            }
-            catch ( Exception& )
-            {
-                throw IOException();
-            }
-        }
-
-        m_bModified = sal_False;
-
-        // Unlock mutex before notify our listeners
-        aGuard.unlock();
-            
-        // Notify our listeners
-        for ( sal_uInt32 j = 0; j < aRemoveNotifyContainer.size(); j++ )
-            implts_notifyContainerListener( aRemoveNotifyContainer[j], NotifyOp_Remove );
-        for ( sal_uInt32 k = 0; k < aReplaceNotifyContainer.size(); k++ )
-            implts_notifyContainerListener( aReplaceNotifyContainer[k], NotifyOp_Replace );
-    }
-}
-
-void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    if ( m_xDocConfigStorage.is() && m_bModified && !m_bReadOnly )
-    {
-        // Try to access our module sub folder
-        for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-        {
-            try
-            {
-                UIElementType& rElementType = m_aUIElements[i];
-                Reference< XStorage > xStorage( rElementType.xStorage, UNO_QUERY );
-                
-                if ( rElementType.bModified && xStorage.is() )
-                    impl_storeElementTypeData( xStorage, rElementType );
-            }
-            catch ( Exception& )
-            {
-                throw IOException();
-            }
-        }
-        
-        m_bModified = false;
-        Reference< XTransactedObject > xTransactedObject( m_xDocConfigStorage, UNO_QUERY );
-        if ( xTransactedObject.is() )
-            xTransactedObject->commit();
-    }
-}
-
-void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_xDocConfigStorage.is() && m_bModified && !m_bReadOnly )
-    {
-        // Try to access our module sub folder
-        for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
-        {
-            try
-            {
-                Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( 
-                                                           rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE ));
-                UIElementType& rElementType = m_aUIElements[i];
-                
-                if ( rElementType.bModified && xElementTypeStorage.is() )
-                    impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag!
-            }
-            catch ( Exception& )
-            {
-                throw IOException();
-            }
-        }
-        
-        Reference< XTransactedObject > xTransactedObject( Storage, UNO_QUERY );
-        if ( xTransactedObject.is() )
-            xTransactedObject->commit();
-    }
-}
-
-sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    
-    return m_bModified;
-}
-
-sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aGuard( m_aLock );
-    
-    return m_bReadOnly;
-}
-
-void UIConfigurationManager::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp )
-{
-    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >*) NULL ) );
-    if ( pContainer != NULL )
-    {
-        ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
-        while ( pIterator.hasMoreElements() )
-        {
-            try
-            {
-                switch ( eOp )
-                {
-                    case NotifyOp_Replace:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementReplaced( aEvent );
-                        break;
-                    case NotifyOp_Insert:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementInserted( aEvent );
-                        break;
-                    case NotifyOp_Remove:
-                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementRemoved( aEvent );
-                        break;
-                }
-            }
-            catch( css::uno::RuntimeException& )
-            {
-                pIterator.remove();
-            }
-        }
-    }
-}
-
-} // namespace framework
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: uiconfigurationmanager.cxx,v $
+ * $Revision: 1.19 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+#include <uiconfiguration/uiconfigurationmanager.hxx>
+#include <threadhelp/resetableguard.hxx>
+#include <services.h>
+#include <uielement/rootitemcontainer.hxx>
+#include <uielement/constitemcontainer.hxx>
+#include <uielement/uielementtypenames.hxx>
+#include <xml/menuconfiguration.hxx>
+#include <xml/toolboxconfiguration.hxx>
+#include <uiconfigurationmanagerimpl.hxx>
+
+#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
+#include <xml/statusbarconfiguration.hxx>
+#endif
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/ui/ConfigurationEvent.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/embed/XTransactedObject.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <vcl/svapp.hxx>
+#include <rtl/ustrbuf.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespaces
+//_________________________________________________________________________________________________________________
+
+using namespace com::sun::star::uno;
+using namespace com::sun::star::io;
+using namespace com::sun::star::embed;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::container;
+using namespace com::sun::star::beans;
+using namespace ::com::sun::star::ui;
+
+namespace framework
+{
+
+//*****************************************************************************************************************
+//	XInterface, XTypeProvider, XServiceInfo
+//*****************************************************************************************************************
+DEFINE_XINTERFACE_7                    (    UIConfigurationManager                                                          ,
+                                            OWeakObject                                                                     ,
+                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
+                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                       ),
+                                            DIRECT_INTERFACE( css::lang::XComponent                                         ),
+                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfiguration                  ),
+                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationManager           ),
+                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationPersistence       ),
+                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationStorage           )
+                                        )
+
+DEFINE_XTYPEPROVIDER_7                  (   UIConfigurationManager                                  ,
+                                            css::lang::XTypeProvider			                    ,
+                                            css::lang::XServiceInfo				                    ,
+                                            css::lang::XComponent                                   ,
+                                            ::com::sun::star::ui::XUIConfiguration            ,
+                                            ::com::sun::star::ui::XUIConfigurationManager     ,
+                                            ::com::sun::star::ui::XUIConfigurationPersistence ,
+                                            ::com::sun::star::ui::XUIConfigurationStorage
+                                        )
+
+DEFINE_XSERVICEINFO_MULTISERVICE        (   UIConfigurationManager                      ,
+                                            ::cppu::OWeakObject                         ,
+                                            SERVICENAME_UICONFIGURATIONMANAGER	        ,
+                                            IMPLEMENTATIONNAME_UICONFIGURATIONMANAGER
+                                        )
+
+DEFINE_INIT_SERVICE                     (   UIConfigurationManager, {} )
+
+UIConfigurationManager::UIConfigurationManager( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceManager )
+: m_pImpl( new UIConfigurationManagerImpl(xServiceManager,static_cast< OWeakObject* >(this),false) )
+{
+}
+
+UIConfigurationManager::~UIConfigurationManager()
+{
+}
+
+// XComponent
+void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->dispose();
+}
+
+void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+
+    m_pImpl->addEventListener(xListener);
+}
+
+void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->removeEventListener(xListener);
+}
+
+// XUIConfigurationManager
+void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->addConfigurationListener(xListener);
+}
+
+void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->removeConfigurationListener(xListener);
+}
+
+
+void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->reset();
+}
+
+Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType )
+throw ( IllegalArgumentException, RuntimeException )
+{
+    return m_pImpl->getUIElementsInfo(ElementType);
+}
+
+Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->createSettings();
+}
+
+sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) 
+throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->hasSettings(ResourceURL);
+}
+
+Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable )
+throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->getSettings(ResourceURL,bWriteable);
+}
+
+void SAL_CALL UIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) 
+throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->replaceSettings(ResourceURL,aNewData);
+}
+
+void SAL_CALL UIConfigurationManager::removeSettings( const ::rtl::OUString& ResourceURL )
+throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException)
+{
+    m_pImpl->removeSettings(ResourceURL);
+}         
+
+void SAL_CALL UIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
+throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException )
+{
+    m_pImpl->insertSettings(NewResourceURL,aNewData);
+}
+
+Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->getImageManager();
+}
+
+Reference< XInterface > SAL_CALL UIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->getShortCutManager();
+}
+
+Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException)
+{
+    return Reference< XInterface >();
+}
+
+// XUIConfigurationStorage
+void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->setStorage(Storage);
+}
+
+sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->hasStorage();
+}
+
+// XUIConfigurationPersistence
+void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->reload();
+}
+
+void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->store();
+}
+
+void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    m_pImpl->storeToStorage(Storage);
+}
+
+sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->isModified();
+}
+
+sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_pImpl->isReadOnly();
+}
+
+} // namespace framework
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
new file mode 100755
index 000000000..fd687e3a1
--- /dev/null
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -0,0 +1,1713 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: UIConfigurationManagerImpl.cxx,v $
+ * $Revision: 1.19.208.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+#include <uiconfigurationmanagerimpl.hxx>
+#include <threadhelp/resetableguard.hxx>
+#include <services.h>
+#include <uielement/constitemcontainer.hxx>
+#include <uielement/rootitemcontainer.hxx>
+#include <uielement/uielementtypenames.hxx>
+#include <xml/menuconfiguration.hxx>
+#include <xml/toolboxconfiguration.hxx>
+#include <uiconfiguration/imagemanager.hxx>
+
+#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
+#include <xml/statusbarconfiguration.hxx>
+#endif
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/ui/ConfigurationEvent.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/io/XStream.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <vcl/svapp.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <comphelper/sequenceashashmap.hxx>
+#include <boost/bind.hpp>
+
+//_________________________________________________________________________________________________________________
+//	namespaces
+//_________________________________________________________________________________________________________________
+
+using rtl::OUString;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::io;
+using namespace com::sun::star::embed;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::container;
+using namespace com::sun::star::beans;
+using namespace ::com::sun::star::ui;
+using namespace ::cppu;
+
+namespace framework
+{
+
+
+// important: The order and position of the elements must match the constant
+// definition of "::com::sun::star::ui::UIElementType"
+static const char* UIELEMENTTYPENAMES[] =
+{
+    "",  // Dummy value for unknown!
+    UIELEMENTTYPE_MENUBAR_NAME,
+    UIELEMENTTYPE_POPUPMENU_NAME,
+    UIELEMENTTYPE_TOOLBAR_NAME,
+    UIELEMENTTYPE_STATUSBAR_NAME,
+    UIELEMENTTYPE_FLOATINGWINDOW_NAME,
+    UIELEMENTTYPE_PROGRESSBAR_NAME
+};
+
+static const char       RESOURCEURL_PREFIX[] = "private:resource/";
+static const sal_Int32  RESOURCEURL_PREFIX_SIZE = 17;
+static const char       RESOURCEURL_CUSTOM_ELEMENT[] = "custom_";
+
+static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL )
+{
+
+    if (( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_PREFIX ))) == 0 ) &&
+        ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
+    {
+        rtl::OUString    aTmpStr     = aResourceURL.copy( RESOURCEURL_PREFIX_SIZE );
+        sal_Int32   nIndex      = aTmpStr.indexOf( '/' );
+        if (( nIndex > 0 ) &&  ( aTmpStr.getLength() > nIndex ))
+        {
+            rtl::OUString aTypeStr( aTmpStr.copy( 0, nIndex ));
+            for ( int i = 0; i < UIElementType::COUNT; i++ )
+            {
+                if ( aTypeStr.equalsAscii( UIELEMENTTYPENAMES[i] ))
+                    return sal_Int16( i );
+            }
+        }
+    }
+
+    return UIElementType::UNKNOWN;
+}
+
+static rtl::OUString RetrieveNameFromResourceURL( const rtl::OUString& aResourceURL )
+{
+    if (( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_PREFIX ))) == 0 ) &&
+        ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
+    {
+        sal_Int32 nIndex = aResourceURL.lastIndexOf( '/' );
+        if (( nIndex > 0 ) && (( nIndex+1 ) < aResourceURL.getLength()))
+            return aResourceURL.copy( nIndex+1 );
+    }
+
+    return rtl::OUString();
+}
+
+void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType )
+{
+    // preload list of element types on demand
+    impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType );
+    if ( m_bUseDefault )
+        impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
+
+    UIElementDataHashMap& rUserElements = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap;
+    UIElementDataHashMap::const_iterator pUserIter = rUserElements.begin();
+
+    rtl::OUString aCustomUrlPrefix( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_CUSTOM_ELEMENT ));
+    while ( pUserIter != rUserElements.end() )
+    {
+        sal_Int32 nIndex = pUserIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE );
+        if ( !m_bUseDefault && nIndex > RESOURCEURL_PREFIX_SIZE )
+        {
+            // Performance: Retrieve user interface name only for custom user interface elements. 
+            // It's only used by them!
+            UIElementData* pDataSettings = impl_findUIElementData( pUserIter->second.aResourceURL, nElementType );
+            if ( pDataSettings && ( !m_bUseDefault || !pDataSettings->bDefault) )
+            {
+                // Retrieve user interface name from XPropertySet interface
+                rtl::OUString aUIName;
+                Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY );
+                if ( xPropSet.is() )
+                {
+                    xPropSet->getPropertyValue( m_aPropUIName ) >>= aUIName;
+                }
+                
+                UIElementInfo aInfo( pUserIter->second.aResourceURL, aUIName );
+                aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pUserIter->second.aResourceURL, aInfo ));
+            }
+        }
+        else
+        {
+            // The user interface name for standard user interface elements is stored in the WindowState.xcu file
+            UIElementInfo aInfo( pUserIter->second.aResourceURL, rtl::OUString() );
+            aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pUserIter->second.aResourceURL, aInfo ));
+        }
+        ++pUserIter;
+    }
+
+    if ( m_bUseDefault )
+    {
+        UIElementDataHashMap& rDefaultElements = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
+        UIElementDataHashMap::const_iterator pDefIter = rDefaultElements.begin();
+
+        while ( pDefIter != rDefaultElements.end() )
+        {
+            UIElementInfoHashMap::const_iterator pIterInfo = aUIElementInfoCollection.find( pDefIter->second.aResourceURL );
+            if ( pIterInfo == aUIElementInfoCollection.end() )
+            {
+                sal_Int32 nIndex = pDefIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE );
+                if ( nIndex > RESOURCEURL_PREFIX_SIZE )
+                {
+                    // Performance: Retrieve user interface name only for custom user interface elements. 
+                    // It's only used by them!
+                    UIElementData* pDataSettings = impl_findUIElementData( pDefIter->second.aResourceURL, nElementType );
+                    if ( pDataSettings )
+                    {
+                        // Retrieve user interface name from XPropertySet interface
+                        rtl::OUString aUIName;
+                        Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY );
+                        if ( xPropSet.is() )
+                        {
+                            xPropSet->getPropertyValue( m_aPropUIName ) >>= aUIName;
+                        }
+                        
+                        UIElementInfo aInfo( pDefIter->second.aResourceURL, aUIName );
+                        aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo ));
+                    }
+                }
+                else
+                {
+                    // The user interface name for standard user interface elements is stored in the WindowState.xcu file
+                    UIElementInfo aInfo( pDefIter->second.aResourceURL, rtl::OUString() );
+                    aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo ));
+                }
+            }
+            
+            ++pDefIter;
+        } // while ( pDefIter != rDefaultElements.end() )
+    }
+}
+
+void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType )
+{    
+    UIElementType& rElementTypeData = m_aUIElements[eLayer][nElementType];
+
+    if ( !rElementTypeData.bLoaded )
+    {
+        Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage;
+        if ( xElementTypeStorage.is() )
+        {
+            rtl::OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE );
+            aBuf.appendAscii( RESOURCEURL_PREFIX );
+            aBuf.appendAscii( UIELEMENTTYPENAMES[ nElementType ] );
+            aBuf.appendAscii( "/" );
+            rtl::OUString aResURLPrefix( aBuf.makeStringAndClear() );
+
+            UIElementDataHashMap& rHashMap = rElementTypeData.aElementsHashMap;
+            Reference< XNameAccess > xNameAccess( xElementTypeStorage, UNO_QUERY );
+            Sequence< rtl::OUString > aUIElementNames = xNameAccess->getElementNames();
+            for ( sal_Int32 n = 0; n < aUIElementNames.getLength(); n++ )
+            {
+                UIElementData aUIElementData;
+                
+                // Resource name must be without ".xml"
+                sal_Int32 nIndex = aUIElementNames[n].lastIndexOf( '.' );
+                if (( nIndex > 0 ) && ( nIndex < aUIElementNames[n].getLength() ))
+                {
+                    rtl::OUString aExtension( aUIElementNames[n].copy( nIndex+1 ));
+                    rtl::OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex ));
+
+                    if (( aUIElementName.getLength() > 0 ) && 
+                        ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 )))
+                    {
+                        aUIElementData.aResourceURL = aResURLPrefix + aUIElementName;
+                        aUIElementData.aName        = aUIElementNames[n];
+
+                        if ( eLayer == LAYER_USERDEFINED )
+                        {
+                            aUIElementData.bModified    = false;
+                            aUIElementData.bDefault     = false;
+                            aUIElementData.bDefaultNode = false;
+                        }
+                        
+                        // Create hash_map entries for all user interface elements inside the storage. We don't load the
+                        // settings to speed up the process.
+                        rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
+                    }
+                }
+            }
+        }
+    }
+
+    rElementTypeData.bLoaded = true;
+}
+
+void UIConfigurationManagerImpl::impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData )
+{
+    UIElementType& rElementTypeData = m_aUIElements[eLayer][nElementType];
+
+    Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage;
+    if ( xElementTypeStorage.is() && aUIElementData.aName.getLength() )
+    {
+        try
+        {
+            Reference< XStream > xStream = xElementTypeStorage->openStreamElement( aUIElementData.aName, ElementModes::READ );
+            Reference< XInputStream > xInputStream = xStream->getInputStream();
+
+            if ( xInputStream.is() )
+            {
+                switch ( nElementType )
+                {
+                    case ::com::sun::star::ui::UIElementType::UNKNOWN:
+                    break;
+
+                    case ::com::sun::star::ui::UIElementType::MENUBAR:
+                    {
+                        try
+                        {
+                            MenuConfiguration aMenuCfg( m_xServiceManager );
+                            Reference< XIndexAccess > xContainer( aMenuCfg.CreateMenuBarConfigurationFromXML( xInputStream ));
+                            RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xContainer );
+                            if ( pRootItemContainer )
+                                aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
+                            else
+                                aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, sal_True ) ), UNO_QUERY );
+                            return;
+                        }
+                        catch ( ::com::sun::star::lang::WrappedTargetException& )
+                        {
+                        }
+                    }
+                    break;
+                        
+                    case ::com::sun::star::ui::UIElementType::POPUPMENU:
+                    {
+                        break;
+                    }
+
+                    case ::com::sun::star::ui::UIElementType::TOOLBAR:
+                    {
+                        try
+                        {
+                            Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
+                            ToolBoxConfiguration::LoadToolBox( m_xServiceManager, xInputStream, xIndexContainer );
+                            RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer );
+                            aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
+                            return;
+                        }
+                        catch ( ::com::sun::star::lang::WrappedTargetException& )
+                        {
+                        }
+                        
+                        break;
+                    }
+
+                    case ::com::sun::star::ui::UIElementType::STATUSBAR:
+                    {
+                        try
+                        {
+                            Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
+                            StatusBarConfiguration::LoadStatusBar( m_xServiceManager, xInputStream, xIndexContainer );
+                            RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer );
+                            aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
+                            return;
+                        }
+                        catch ( ::com::sun::star::lang::WrappedTargetException& )
+                        {
+                        }
+                        
+                        break;
+                    }
+
+                    case ::com::sun::star::ui::UIElementType::FLOATINGWINDOW:
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+        catch ( ::com::sun::star::embed::InvalidStorageException& )
+        {
+        }
+        catch (	::com::sun::star::lang::IllegalArgumentException& )
+        {
+        }
+        catch ( ::com::sun::star::io::IOException& )
+        {
+        }
+        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+        {
+        }
+    }
+
+    // At least we provide an empty settings container!
+    aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer() ), UNO_QUERY );
+}
+
+UIConfigurationManagerImpl::UIElementData*  UIConfigurationManagerImpl::impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad )
+{
+    // preload list of element types on demand
+    impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType );
+    if ( m_bUseDefault )
+        impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
+
+    // first try to look into our user-defined vector/hash_map combination
+    UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap;
+    UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
+    if ( pIter != rUserHashMap.end() )
+    {
+        // Default data settings data must be retrieved from the default layer!
+        if ( !pIter->second.bDefault )
+        {
+            if ( !pIter->second.xSettings.is() && bLoad )
+                impl_requestUIElementData( nElementType, LAYER_USERDEFINED, pIter->second );
+            return &(pIter->second);
+        }
+    }
+    
+    if ( m_bUseDefault )
+    {
+        // Not successfull, we have to look into our default vector/hash_map combination
+        UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
+        pIter = rDefaultHashMap.find( aResourceURL );
+        if ( pIter != rDefaultHashMap.end() )
+        {
+            if ( !pIter->second.xSettings.is() && bLoad )
+                impl_requestUIElementData( nElementType, LAYER_DEFAULT, pIter->second );
+            return &(pIter->second);
+        } // if ( pIter != rDefaultHashMap.end() )
+    }
+
+    // Nothing has been found!
+    return NULL;
+}
+
+void UIConfigurationManagerImpl::impl_storeElementTypeData( Reference< XStorage > xStorage, UIElementType& rElementType, bool bResetModifyState )
+{
+    UIElementDataHashMap& rHashMap          = rElementType.aElementsHashMap;
+    UIElementDataHashMap::iterator pIter    = rHashMap.begin();
+    
+    while ( pIter != rHashMap.end() )
+    {
+        UIElementData& rElement = pIter->second;
+        if ( rElement.bModified )
+        {
+            if ( rElement.bDefault )
+            {
+                xStorage->removeElement( rElement.aName );
+                rElement.bModified = sal_False; // mark as not modified
+            }
+            else
+            {
+                Reference< XStream > xStream( xStorage->openStreamElement( rElement.aName, ElementModes::WRITE|ElementModes::TRUNCATE ), UNO_QUERY );
+                Reference< XOutputStream > xOutputStream( xStream->getOutputStream() );
+                                
+                if ( xOutputStream.is() )
+                {
+                    switch( rElementType.nElementType )
+                    {
+                        case ::com::sun::star::ui::UIElementType::MENUBAR:
+                        {
+                            try
+                            {
+                                MenuConfiguration aMenuCfg( m_xServiceManager );
+                                aMenuCfg.StoreMenuBarConfigurationToXML( rElement.xSettings, xOutputStream );
+                            }
+                            catch ( ::com::sun::star::lang::WrappedTargetException& )
+                            {
+                            }
+                        }
+                        break;
+
+                        case ::com::sun::star::ui::UIElementType::TOOLBAR:
+                        {
+                            try
+                            {
+                                ToolBoxConfiguration::StoreToolBox( m_xServiceManager, xOutputStream, rElement.xSettings );
+                            }
+                            catch ( ::com::sun::star::lang::WrappedTargetException& )
+                            {
+                            }
+                        }
+                        break;
+
+                        case ::com::sun::star::ui::UIElementType::STATUSBAR:
+                        {
+                            try
+                            {
+                                StatusBarConfiguration::StoreStatusBar( m_xServiceManager, xOutputStream, rElement.xSettings );
+                            }
+                            catch ( ::com::sun::star::lang::WrappedTargetException& )
+                            {
+                            }
+                        }
+                        break;
+                        
+                        default:
+                        break;
+                    }
+                }
+                
+                // mark as not modified if we store to our own storage
+                if ( bResetModifyState )
+                    rElement.bModified = sal_False;
+            }
+        }
+        
+        ++pIter;
+    }
+
+    // commit element type storage
+    Reference< XTransactedObject > xTransactedObject( xStorage, UNO_QUERY );
+    if ( xTransactedObject.is() )
+        xTransactedObject->commit();
+
+    // mark UIElementType as not modified if we store to our own storage
+    if ( bResetModifyState )
+        rElementType.bModified = sal_False;
+}
+
+// This is only allowed to be called on the LAYER_USER_DEFINED!
+void UIConfigurationManagerImpl::impl_resetElementTypeData( 
+    UIElementType& rUserElementType, 
+    UIElementType& rDefaultElementType, 
+    ConfigEventNotifyContainer& rRemoveNotifyContainer, 
+    ConfigEventNotifyContainer& rReplaceNotifyContainer )
+{
+    UIElementDataHashMap& rHashMap          = rUserElementType.aElementsHashMap;
+    UIElementDataHashMap::iterator pIter    = rHashMap.begin();
+    
+    Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY );
+    Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY );
+    sal_Int16 nType = rUserElementType.nElementType;
+    
+    // Make copies of the event structures to be thread-safe. We have to unlock our mutex before calling
+    // our listeners!
+    while ( pIter != rHashMap.end() )
+    {
+        UIElementData& rElement = pIter->second;
+        if ( !rElement.bDefault )
+        {
+            if ( m_bUseDefault && xDefaultNameAccess->hasByName( rElement.aName ))
+            {
+                // Replace settings with data from default layer
+                Reference< XIndexAccess > xOldSettings( rElement.xSettings );
+                impl_requestUIElementData( nType, LAYER_DEFAULT, rElement );
+                
+                ConfigurationEvent aReplaceEvent;
+                aReplaceEvent.ResourceURL = rElement.aResourceURL;
+                aReplaceEvent.Accessor <<= xThis;
+                aReplaceEvent.Source = m_xOwner;
+                aReplaceEvent.ReplacedElement <<= xOldSettings;
+                aReplaceEvent.Element <<= rElement.xSettings;
+                
+                rReplaceNotifyContainer.push_back( aReplaceEvent );
+                
+                // Mark element as default and not modified. That means "not active"
+                // in the user layer anymore.
+                rElement.bModified = false;
+                rElement.bDefault  = true;
+            }
+            else
+            {
+                // Remove user-defined settings from user layer
+                ConfigurationEvent aEvent;
+                aEvent.ResourceURL = rElement.aResourceURL;
+                aEvent.Accessor <<= xThis;
+                aEvent.Source = m_xOwner;
+                aEvent.Element <<= rElement.xSettings;
+                
+                rRemoveNotifyContainer.push_back( aEvent );
+                
+                // Mark element as default and not modified. That means "not active"
+                // in the user layer anymore.
+                rElement.bModified = false;
+                rElement.bDefault  = true;
+            }
+        } // if ( !rElement.bDefault )
+        else
+            rElement.bModified = false;
+        
+        ++pIter;
+    }
+
+    // Remove all settings from our user interface elements
+    rHashMap.clear();
+}
+
+void UIConfigurationManagerImpl::impl_reloadElementTypeData( 
+    UIElementType&              rUserElementType, 
+    UIElementType&              rDefaultElementType, 
+    ConfigEventNotifyContainer& rRemoveNotifyContainer, 
+    ConfigEventNotifyContainer& rReplaceNotifyContainer )
+{
+    UIElementDataHashMap& rHashMap          = rUserElementType.aElementsHashMap;
+    UIElementDataHashMap::iterator pIter    = rHashMap.begin();
+    Reference< XStorage > xUserStorage( rUserElementType.xStorage );
+    Reference< XStorage > xDefaultStorage( rDefaultElementType.xStorage );
+    Reference< XNameAccess > xUserNameAccess( rUserElementType.xStorage, UNO_QUERY );
+    Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY );
+    
+    Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY );
+    sal_Int16 nType = rUserElementType.nElementType;
+    
+    while ( pIter != rHashMap.end() )
+    {
+        UIElementData& rElement = pIter->second;
+        if ( rElement.bModified )
+        {
+            if ( xUserNameAccess->hasByName( rElement.aName ))
+            {
+                // Replace settings with data from user layer
+                Reference< XIndexAccess > xOldSettings( rElement.xSettings );
+
+                impl_requestUIElementData( nType, LAYER_USERDEFINED, rElement );
+                
+                ConfigurationEvent aReplaceEvent;
+                
+                aReplaceEvent.ResourceURL = rElement.aResourceURL;
+                aReplaceEvent.Accessor <<= xThis;
+                aReplaceEvent.Source = m_xOwner;
+                aReplaceEvent.ReplacedElement <<= xOldSettings;
+                aReplaceEvent.Element <<= rElement.xSettings;
+                rReplaceNotifyContainer.push_back( aReplaceEvent );
+                
+                rElement.bModified = false;
+            }
+            else if ( m_bUseDefault && xDefaultNameAccess->hasByName( rElement.aName ))
+            {
+                // Replace settings with data from default layer
+                Reference< XIndexAccess > xOldSettings( rElement.xSettings );
+
+                impl_requestUIElementData( nType, LAYER_DEFAULT, rElement );
+                
+                ConfigurationEvent aReplaceEvent;
+                
+                aReplaceEvent.ResourceURL = rElement.aResourceURL;
+                aReplaceEvent.Accessor <<= xThis;
+                aReplaceEvent.Source = m_xOwner;
+                aReplaceEvent.ReplacedElement <<= xOldSettings;
+                aReplaceEvent.Element <<= rElement.xSettings;
+                rReplaceNotifyContainer.push_back( aReplaceEvent );
+                
+                // Mark element as default and not modified. That means "not active"
+                // in the user layer anymore.
+                rElement.bModified = false;
+                rElement.bDefault  = true;
+            }
+            else
+            {
+                // Element settings are not in any storage => remove
+                ConfigurationEvent aRemoveEvent;
+                
+                aRemoveEvent.ResourceURL = rElement.aResourceURL;
+                aRemoveEvent.Accessor <<= xThis;
+                aRemoveEvent.Source = m_xOwner;
+                aRemoveEvent.Element <<= rElement.xSettings;
+                
+                rRemoveNotifyContainer.push_back( aRemoveEvent );
+                
+                // Mark element as default and not modified. That means "not active"
+                // in the user layer anymore.
+                rElement.bModified = false;
+                rElement.bDefault  = true;
+            }
+        }
+        ++pIter;
+    }
+
+    rUserElementType.bModified = sal_False;
+}
+
+void UIConfigurationManagerImpl::impl_Initialize()
+{
+    // Initialize the top-level structures with the storage data
+    if ( m_xUserConfigStorage.is() )
+    {
+        // Try to access our module sub folder
+        for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT;
+              i++ )
+        {
+            Reference< XStorage > xElementTypeStorage;
+            try
+            {
+                if ( m_pStorageHandler[i] )
+                    xElementTypeStorage = m_pStorageHandler[i]->getWorkingStorageUser();
+            }
+            catch ( com::sun::star::container::NoSuchElementException& )
+            {
+            }
+            catch ( ::com::sun::star::embed::InvalidStorageException& )
+            {
+            }
+            catch ( ::com::sun::star::lang::IllegalArgumentException& )
+            {
+            }
+            catch ( ::com::sun::star::io::IOException& )
+            {
+            }
+            catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+            {
+            }
+
+            m_aUIElements[LAYER_USERDEFINED][i].nElementType = i;
+            m_aUIElements[LAYER_USERDEFINED][i].bModified = false;
+            m_aUIElements[LAYER_USERDEFINED][i].xStorage = xElementTypeStorage;
+            m_aUIElements[LAYER_USERDEFINED][i].bDefaultLayer = false;
+        }
+    } // if ( m_xUserConfigStorage.is() )
+    else if ( !m_bUseDefault )
+    {
+        // We have no storage, just initialize ui element types with empty storage!
+        for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
+            m_aUIElements[LAYER_USERDEFINED][i].xStorage.clear();
+    }
+
+    if ( m_bUseDefault && m_xUserConfigStorage.is() )
+    {
+        Reference< XNameAccess > xNameAccess( m_xDefaultConfigStorage, UNO_QUERY_THROW );
+
+        // Try to access our module sub folder
+        for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT;
+              i++ )
+        {
+            Reference< XStorage > xElementTypeStorage;
+            try
+            {
+                xNameAccess->getByName( rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] )) >>= xElementTypeStorage;
+            }
+            catch ( com::sun::star::container::NoSuchElementException& )
+            {
+            }
+
+            m_aUIElements[LAYER_DEFAULT][i].nElementType = i;
+            m_aUIElements[LAYER_DEFAULT][i].bModified = false;
+            m_aUIElements[LAYER_DEFAULT][i].xStorage = xElementTypeStorage;
+            m_aUIElements[LAYER_DEFAULT][i].bDefaultLayer = true;
+        }
+    }
+}
+
+UIConfigurationManagerImpl::UIConfigurationManagerImpl( const Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager
+                                                       ,const Reference< XInterface >& _xOwner
+                                                       , bool _bUseDefault) :
+    ThreadHelpBase( &Application::GetSolarMutex() )
+    , m_xOwner( _xOwner )
+    , m_bUseDefault(_bUseDefault)
+    , m_bReadOnly( true )
+    , m_bInitialized( false )
+    , m_bModified( false )
+    , m_bConfigRead( false )
+    , m_bDisposed( false )
+    , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" ))
+    , m_aPropUIName( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))
+    , m_aPropResourceURL( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" ))
+    , m_xServiceManager( xServiceManager )
+    , m_aListenerContainer( m_aLock.getShareableOslMutex() )
+{
+    for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
+        m_pStorageHandler[i] = 0;
+    
+    // Make sure we have a default initialized entry for every layer and user interface element type!
+    // The following code depends on this!
+    m_aUIElements[LAYER_DEFAULT].resize( ::com::sun::star::ui::UIElementType::COUNT );
+    m_aUIElements[LAYER_USERDEFINED].resize( ::com::sun::star::ui::UIElementType::COUNT );
+}
+
+UIConfigurationManagerImpl::~UIConfigurationManagerImpl()
+{
+    for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
+        delete m_pStorageHandler[i];
+}
+
+// XComponent
+void UIConfigurationManagerImpl::dispose() throw (::com::sun::star::uno::RuntimeException)
+{
+    css::lang::EventObject aEvent( m_xOwner );
+    m_aListenerContainer.disposeAndClear( aEvent );
+    
+    {
+        ResetableGuard aGuard( m_aLock );
+        try
+        {
+            if ( m_xModuleImageManager.is() )
+                m_xModuleImageManager->dispose();
+        }
+        catch ( Exception& )
+        {
+        }
+        
+        m_xModuleImageManager.clear();
+        m_aUIElements[LAYER_USERDEFINED].clear();
+        m_aUIElements[LAYER_DEFAULT].clear();
+        m_xDefaultConfigStorage.clear();
+        m_xUserConfigStorage.clear();
+        m_xUserRootCommit.clear();
+        m_bConfigRead = false;
+        m_bModified = false;
+        m_bDisposed = true;
+    }
+}
+
+void UIConfigurationManagerImpl::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    {
+        ResetableGuard aGuard( m_aLock );
+
+        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+        if ( m_bDisposed )
+            throw DisposedException();
+    }
+        
+    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+}
+
+void UIConfigurationManagerImpl::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+}
+
+// XInitialization
+void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
+{
+    ResetableGuard aLock( m_aLock );
+    
+    if ( !m_bInitialized )
+    {
+        ::comphelper::SequenceAsHashMap lArgs(aArguments);
+        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
+        m_aModuleShortName  = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString());
+
+        for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
+        {
+            rtl::OUString aResourceType;
+            if ( i == ::com::sun::star::ui::UIElementType::MENUBAR )
+                aResourceType = PresetHandler::RESOURCETYPE_MENUBAR();
+            else if ( i == ::com::sun::star::ui::UIElementType::TOOLBAR )
+                aResourceType = PresetHandler::RESOURCETYPE_TOOLBAR();
+            else if ( i == ::com::sun::star::ui::UIElementType::STATUSBAR )
+                aResourceType = PresetHandler::RESOURCETYPE_STATUSBAR();
+
+            if ( aResourceType.getLength() > 0 )
+            {
+                m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
+                m_pStorageHandler[i]->connectToResource( PresetHandler::E_MODULES,
+                                                         aResourceType, // this path wont be used later ... seee next lines!
+                                                         m_aModuleShortName,
+                                                         css::uno::Reference< css::embed::XStorage >()); // no document root used here!
+            }
+        }
+        
+        // initialize root storages for all resource types
+        m_xUserRootCommit       = css::uno::Reference< css::embed::XTransactedObject >(
+                                    m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty
+        m_xDefaultConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageShare(
+                                    m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare());                                            
+        m_xUserConfigStorage    = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageUser(
+                                    m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageUser());
+                                            
+        if ( m_xUserConfigStorage.is() )
+        {
+            Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
+            if ( xPropSet.is() )
+            {
+                long nOpenMode = 0;
+                if ( xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenMode" ))) >>= nOpenMode )
+                    m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
+            }
+        }
+    
+        impl_Initialize();
+
+        m_bInitialized = true;    
+    }
+}
+
+// XUIConfiguration
+void UIConfigurationManagerImpl::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    {
+        ResetableGuard aGuard( m_aLock );
+    
+        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+        if ( m_bDisposed )
+            throw DisposedException();
+    }
+        
+    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener );
+}
+
+void UIConfigurationManagerImpl::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+{
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener );
+}
+
+        
+// XUIConfigurationManager
+void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    if ( m_bDisposed )
+        throw DisposedException();
+    
+    bool bResetStorage( false );
+
+    if ( !isReadOnly() )
+    {
+        // Remove all elements from our user-defined storage!
+        try
+        {
+            for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
+            {
+                UIElementType&        rElementType = m_aUIElements[LAYER_USERDEFINED][i];
+                Reference< XStorage > xSubStorage( rElementType.xStorage, UNO_QUERY );
+
+                if ( xSubStorage.is() )
+                {
+                    bool bCommitSubStorage( false );                
+                    Reference< XNameAccess > xSubStorageNameAccess( xSubStorage, UNO_QUERY );
+                    Sequence< rtl::OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames();
+                    for ( sal_Int32 j = 0; j < aUIElementStreamNames.getLength(); j++ )
+                    {
+                        xSubStorage->removeElement( aUIElementStreamNames[j] );
+                        bCommitSubStorage = true;
+                    }
+                    
+                    if ( bCommitSubStorage )
+                    {
+                        Reference< XTransactedObject > xTransactedObject( xSubStorage, UNO_QUERY );
+                        if ( xTransactedObject.is() )
+                            xTransactedObject->commit();
+                        m_pStorageHandler[i]->commitUserChanges();
+                    }
+                }
+            }
+
+            bResetStorage = true;
+        
+            // remove settings from user defined layer and notify listener about removed settings data!
+            ConfigEventNotifyContainer aRemoveEventNotifyContainer;
+            ConfigEventNotifyContainer aReplaceEventNotifyContainer;
+            for ( sal_Int16 j = 1; j < ::com::sun::star::ui::UIElementType::COUNT; j++ )
+            {
+                try
+                {
+                    UIElementType& rUserElementType     = m_aUIElements[LAYER_USERDEFINED][j];
+                    UIElementType& rDefaultElementType  = m_aUIElements[LAYER_DEFAULT][j];
+                    
+                    impl_resetElementTypeData( rUserElementType, rDefaultElementType, aRemoveEventNotifyContainer, aReplaceEventNotifyContainer );
+                    rUserElementType.bModified = sal_False;
+                }
+                catch ( Exception& )
+                {
+                    throw IOException();
+                }
+            }
+        
+            m_bModified = sal_False;
+
+            // Unlock mutex before notify our listeners
+            aGuard.unlock();
+                
+            // Notify our listeners
+            ::std::for_each(aRemoveEventNotifyContainer.begin(),aRemoveEventNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Remove));
+            ::std::for_each(aReplaceEventNotifyContainer.begin(),aReplaceEventNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Replace));
+        }
+        catch ( ::com::sun::star::lang::IllegalArgumentException& )
+        {
+        }
+        catch ( ::com::sun::star::container::NoSuchElementException& )
+        {
+        }
+        catch ( ::com::sun::star::embed::InvalidStorageException& )
+        {
+        }
+        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+        {
+        }
+    }    
+}
+
+Sequence< Sequence< PropertyValue > > UIConfigurationManagerImpl::getUIElementsInfo( sal_Int16 ElementType )
+throw ( IllegalArgumentException, RuntimeException )
+{
+    if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT ))
+        throw IllegalArgumentException();
+
+    ResetableGuard aGuard( m_aLock );
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    Sequence< Sequence< PropertyValue > > aElementInfoSeq;
+    UIElementInfoHashMap aUIElementInfoCollection;
+
+    if ( ElementType == ::com::sun::star::ui::UIElementType::UNKNOWN )
+    {
+        for ( sal_Int16 i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
+            impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, sal_Int16( i ) );
+    }
+    else
+        impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, ElementType );
+
+    Sequence< PropertyValue > aUIElementInfo( 2 );
+    aUIElementInfo[0].Name = m_aPropResourceURL;
+    aUIElementInfo[1].Name = m_aPropUIName;
+
+    aElementInfoSeq.realloc( aUIElementInfoCollection.size() );
+    UIElementInfoHashMap::const_iterator pIter = aUIElementInfoCollection.begin();
+
+    sal_Int32 n = 0;
+    while ( pIter != aUIElementInfoCollection.end() )
+    {
+        aUIElementInfo[0].Value <<= pIter->second.aResourceURL;
+        aUIElementInfo[1].Value <<= pIter->second.aUIName;
+        aElementInfoSeq[n++] = aUIElementInfo;
+        ++pIter;
+    }
+
+    return aElementInfoSeq;
+}
+
+Reference< XIndexContainer > UIConfigurationManagerImpl::createSettings() throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+    
+    if ( m_bDisposed )
+        throw DisposedException();
+    
+    // Creates an empty item container which can be filled from outside
+    return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
+}
+
+sal_Bool UIConfigurationManagerImpl::hasSettings( const ::rtl::OUString& ResourceURL ) 
+throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
+    
+    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
+        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
+        throw IllegalArgumentException();
+    else
+    {
+        ResetableGuard aGuard( m_aLock );
+        
+        if ( m_bDisposed )
+            throw DisposedException();
+       
+        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false );
+        if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault) )
+            return sal_True;
+    }
+    
+    return sal_False;
+}
+
+Reference< XIndexAccess > UIConfigurationManagerImpl::getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable )
+throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
+    
+    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
+        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
+        throw IllegalArgumentException();
+    else
+    {
+        ResetableGuard aGuard( m_aLock );
+        
+        if ( m_bDisposed )
+            throw DisposedException();
+        
+        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType );
+        if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault) )
+        {
+            // Create a copy of our data if someone wants to change the data.
+            if ( bWriteable )
+                return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( pDataSettings->xSettings ) ), UNO_QUERY );
+            else
+                return pDataSettings->xSettings;
+        }
+    }
+    
+    throw NoSuchElementException();
+}
+
+void UIConfigurationManagerImpl::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) 
+throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
+{
+    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
+    
+    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
+        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
+        throw IllegalArgumentException();
+    else if ( m_bReadOnly )
+        throw IllegalAccessException();
+    else
+    {
+        ResetableGuard aGuard( m_aLock );
+        
+        if ( m_bDisposed )
+            throw DisposedException();
+
+        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType );
+        if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault) )
+        {
+            if ( !m_bUseDefault || !pDataSettings->bDefaultNode )
+            {
+                // we have a settings entry in our user-defined layer - replace
+                Reference< XIndexAccess > xOldSettings = pDataSettings->xSettings;
+
+                // Create a copy of the data if the container is not const
+                Reference< XIndexReplace > xReplace( aNewData, UNO_QUERY );
+                if ( xReplace.is() )
+                    pDataSettings->xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( aNewData ) ), UNO_QUERY );
+                else
+                    pDataSettings->xSettings = aNewData;
+                pDataSettings->bDefault  = false;
+                pDataSettings->bModified = true;
+                m_bModified = true;
+
+                // Modify type container
+                UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType];
+                rElementType.bModified = true;
+
+                Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY );
+
+                // Create event to notify listener about replaced element settings
+                ConfigurationEvent aEvent;
+
+                aEvent.ResourceURL = ResourceURL;
+                aEvent.Accessor <<= xThis;
+                aEvent.Source = m_xOwner;
+                aEvent.ReplacedElement <<= xOldSettings;
+                aEvent.Element <<= pDataSettings->xSettings;
+                
+                aGuard.unlock();
+                
+                implts_notifyContainerListener( aEvent, NotifyOp_Replace );
+            }
+            else
+            {
+                // we have no settings in our user-defined layer - insert
+                UIElementData aUIElementData;
+
+                aUIElementData.bDefault     = false;
+                aUIElementData.bDefaultNode = false;
+                aUIElementData.bModified    = true;
+
+                // Create a copy of the data if the container is not const
+                Reference< XIndexReplace > xReplace( aNewData, UNO_QUERY );
+                if ( xReplace.is() )
+                    aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( aNewData ) ), UNO_QUERY );
+                else
+                    aUIElementData.xSettings = aNewData;
+                aUIElementData.aName        = RetrieveNameFromResourceURL( ResourceURL ) + m_aXMLPostfix;
+                aUIElementData.aResourceURL = ResourceURL;
+                m_bModified = true;
+
+                // Modify type container
+                UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType];
+                rElementType.bModified = true;
+                
+                UIElementDataHashMap& rElements = rElementType.aElementsHashMap;
+
+                // Check our user element settings hash map as it can already contain settings that have been set to default!
+                // If no node can be found, we have to insert it.
+                UIElementDataHashMap::iterator pIter = rElements.find( ResourceURL );
+                if ( pIter != rElements.end() )
+                    pIter->second = aUIElementData;
+                else
+                    rElements.insert( UIElementDataHashMap::value_type( ResourceURL, aUIElementData ));
+                
+                Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY );
+
+                // Create event to notify listener about replaced element settings
+                ConfigurationEvent aEvent;
+                
+                aEvent.ResourceURL = ResourceURL;
+                aEvent.Accessor <<= xThis;
+                aEvent.Source = m_xOwner;
+                aEvent.ReplacedElement <<= pDataSettings->xSettings;
+                aEvent.Element <<= aUIElementData.xSettings;
+                
+                aGuard.unlock();
+                
+                implts_notifyContainerListener( aEvent, NotifyOp_Replace );
+            }
+        }
+        else
+            throw NoSuchElementException();
+    }
+}
+
+void UIConfigurationManagerImpl::removeSettings( const ::rtl::OUString& ResourceURL )
+throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException)
+{
+    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
+    
+    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
+        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
+        throw IllegalArgumentException();
+    else if ( m_bReadOnly )
+        throw IllegalAccessException();
+    else
+    {
+        ResetableGuard aGuard( m_aLock );
+        
+        if ( m_bDisposed )
+            throw DisposedException();
+        
+        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType );
+        if ( pDataSettings )
+        {
+            // If element settings are default, we don't need to change anything!
+            if ( pDataSettings->bDefault )
+                return;
+            else
+            {
+                Reference< XIndexAccess > xRemovedSettings = pDataSettings->xSettings;
+                pDataSettings->bDefault = true;
+                 
+                // check if this is a default layer node
+                if ( !m_bUseDefault || !pDataSettings->bDefaultNode )
+                    pDataSettings->bModified = true; // we have to remove this node from the user layer!
+                pDataSettings->xSettings.clear();
+                m_bModified = true; // user layer must be written
+
+                // Modify type container
+                UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType];
+                rElementType.bModified = true;
+
+                Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY );
+                // Check if we have settings in the default layer which replaces the user-defined one!
+                UIElementData* pDefaultDataSettings = m_bUseDefault ? impl_findUIElementData( ResourceURL, nElementType ) : NULL;
+                if ( pDefaultDataSettings )
+                {
+                    // Create event to notify listener about replaced element settings
+                    ConfigurationEvent aEvent;
+                    
+                    aEvent.ResourceURL = ResourceURL;
+                    aEvent.Accessor <<= xThis;
+                    aEvent.Source = m_xOwner;
+                    aEvent.Element <<= xRemovedSettings;
+                    aEvent.ReplacedElement <<= pDefaultDataSettings->xSettings;
+                    
+                    aGuard.unlock();
+                    
+                    implts_notifyContainerListener( aEvent, NotifyOp_Replace );
+                }
+                else
+                {
+                    // Create event to notify listener about removed element settings
+                    ConfigurationEvent aEvent;
+                    
+                    aEvent.ResourceURL = ResourceURL;
+                    aEvent.Accessor <<= xThis;
+                    aEvent.Source = m_xOwner;
+                    aEvent.Element <<= xRemovedSettings;
+                    
+                    aGuard.unlock();
+                    
+                    implts_notifyContainerListener( aEvent, NotifyOp_Remove );
+                }
+            }
+        }
+        else
+            throw NoSuchElementException();
+    }
+}         
+
+void UIConfigurationManagerImpl::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
+throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException )
+{
+    sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL );
+    
+    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
+        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
+        throw IllegalArgumentException();
+    else if ( m_bReadOnly )
+        throw IllegalAccessException();
+    else
+    {
+        ResetableGuard aGuard( m_aLock );
+        
+        if ( m_bDisposed )
+            throw DisposedException();
+        
+        bool           bInsertData( m_bUseDefault );
+        UIElementData aUIElementData;
+        UIElementData* pDataSettings = impl_findUIElementData( NewResourceURL, nElementType );
+        if ( !m_bUseDefault )
+        {
+            if ( pDataSettings && !pDataSettings->bDefault )
+                throw ElementExistException();
+            if ( !pDataSettings )
+            {
+                pDataSettings = &aUIElementData;
+                bInsertData   = true;
+            }
+        }
+        if ( !pDataSettings || bInsertData )
+        {
+            aUIElementData.bDefault     = false;
+            if ( !m_bUseDefault )
+                aUIElementData.bDefaultNode = false;
+            aUIElementData.bModified    = true;
+
+            // Create a copy of the data if the container is not const
+            Reference< XIndexReplace > xReplace( aNewData, UNO_QUERY );
+            if ( xReplace.is() )
+                aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( aNewData ) ), UNO_QUERY );
+            else
+                aUIElementData.xSettings = aNewData;
+            
+            m_bModified = true;
+
+            UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType];
+            rElementType.bModified = true;
+
+            if ( bInsertData )
+            {
+                aUIElementData.aName        = RetrieveNameFromResourceURL( NewResourceURL ) + m_aXMLPostfix;
+                aUIElementData.aResourceURL = NewResourceURL;
+                UIElementDataHashMap& rElements = rElementType.aElementsHashMap;
+                rElements.insert( UIElementDataHashMap::value_type( NewResourceURL, aUIElementData ));
+            }
+            
+            Reference< XIndexAccess > xInsertSettings( aUIElementData.xSettings );
+            Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY );
+
+            // Create event to notify listener about removed element settings
+            ConfigurationEvent aEvent;
+            
+            aEvent.ResourceURL = NewResourceURL;
+            aEvent.Accessor <<= xThis;
+            aEvent.Source = m_xOwner;
+            aEvent.Element <<= xInsertSettings;
+            
+            aGuard.unlock();
+            
+            implts_notifyContainerListener( aEvent, NotifyOp_Insert );
+        }
+        else
+            throw ElementExistException();
+    }
+}
+
+Reference< XInterface > UIConfigurationManagerImpl::getImageManager() throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    if ( !m_xModuleImageManager.is() )
+    {
+        if ( m_bUseDefault )
+            m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ModuleImageManager( m_xServiceManager )), 
+                                                         UNO_QUERY );
+        else
+            m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ImageManager( m_xServiceManager )), 
+                                                         UNO_QUERY );
+        Reference< XInitialization > xInit( m_xModuleImageManager, UNO_QUERY );
+        
+        Sequence< Any > aPropSeq( m_bUseDefault ? 3 : 2 );
+        PropertyValue aPropValue;
+        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" ));
+        aPropValue.Value <<= m_xUserConfigStorage;
+        aPropSeq[0] <<= aPropValue;
+        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" ));
+        aPropValue.Value <<= m_aModuleIdentifier;
+        aPropSeq[1] <<= aPropValue;
+        if ( m_bUseDefault )
+        {
+            aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserRootCommit" ));
+            aPropValue.Value <<= m_xUserRootCommit;
+            aPropSeq[2] <<= aPropValue;
+        }
+        
+        xInit->initialize( aPropSeq );
+    }
+
+    return Reference< XInterface >( m_xModuleImageManager, UNO_QUERY );
+
+//    return Reference< XInterface >();
+}
+
+Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+    if ( !m_bUseDefault && m_xAccConfig.is())
+        return m_xAccConfig;
+
+    Reference< XMultiServiceFactory > xSMGR   = m_xServiceManager;
+    ::rtl::OUString                   aModule = m_aModuleIdentifier;
+    Reference< XStorage >             xDocumentRoot = m_xUserConfigStorage;
+    aGuard.unlock();
+    Reference< XInterface >      xManager = xSMGR->createInstance(m_bUseDefault ? SERVICENAME_MODULEACCELERATORCONFIGURATION : SERVICENAME_DOCUMENTACCELERATORCONFIGURATION ); 
+    Reference< XInitialization > xInit    (xManager, UNO_QUERY_THROW);
+    
+    PropertyValue aProp;
+    Sequence< Any > lArgs(1);
+    if ( m_bUseDefault )
+    {
+        aProp.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier"));
+        aProp.Value <<= aModule;
+    } // if ( m_bUseDefault )
+    else
+    {
+        aProp.Name    = ::rtl::OUString::createFromAscii("DocumentRoot");
+        aProp.Value <<= xDocumentRoot;
+    }
+    lArgs[0] <<= aProp;
+    xInit->initialize(lArgs);
+
+    if ( !m_bUseDefault )
+    {
+        // SAFE ->
+        aGuard.lock();
+        m_xAccConfig = xManager; 
+        aGuard.unlock();
+        // <- SAFE
+    }
+    
+    return xManager;
+}
+
+Reference< XInterface > UIConfigurationManagerImpl::getEventsManager() throw (::com::sun::star::uno::RuntimeException)
+{
+    return Reference< XInterface >();
+}
+// XUIConfigurationStorage
+void UIConfigurationManagerImpl::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+    
+    if ( m_bDisposed )
+        throw DisposedException();
+    
+    if ( m_xUserConfigStorage.is() )
+    {
+        try
+        {
+            // Dispose old storage to be sure that it will be closed
+            Reference< XComponent > xComponent( m_xUserConfigStorage, UNO_QUERY );
+            if ( xComponent.is() )
+                xComponent->dispose();
+        }
+        catch ( Exception& )
+        {
+        }
+    }
+
+    // We store the new storage. Be careful it could be an empty reference!
+    m_xUserConfigStorage = Storage;
+    m_bReadOnly         = sal_True;
+
+    Reference< XUIConfigurationStorage > xAccUpdate(m_xAccConfig, UNO_QUERY);
+    if ( xAccUpdate.is() )
+        xAccUpdate->setStorage( m_xUserConfigStorage );
+    
+    if ( m_xModuleImageManager.is() )
+    {
+        ImageManager* pImageManager = (ImageManager*)m_xModuleImageManager.get();
+        if ( pImageManager )
+            pImageManager->setStorage( m_xUserConfigStorage );
+    }
+
+    if ( m_xUserConfigStorage.is() )
+    {
+        ::rtl::OUString sEmpty;
+        for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
+        {
+            rtl::OUString aResourceType;
+            if ( i == ::com::sun::star::ui::UIElementType::MENUBAR )
+                aResourceType = PresetHandler::RESOURCETYPE_MENUBAR();
+            else if ( i == ::com::sun::star::ui::UIElementType::TOOLBAR )
+                aResourceType = PresetHandler::RESOURCETYPE_TOOLBAR();
+            else if ( i == ::com::sun::star::ui::UIElementType::STATUSBAR )
+                aResourceType = PresetHandler::RESOURCETYPE_STATUSBAR();
+
+            //if ( aResourceType.getLength() > 0 )
+            {
+                m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
+                m_pStorageHandler[i]->connectToResource( PresetHandler::E_DOCUMENT,
+                                                         rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), // this path wont be used later ... seee next lines!
+                                                         sEmpty,
+                                                         m_xUserConfigStorage); 
+            }
+        }
+        Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
+        if ( xPropSet.is() )
+        {
+            try
+            {
+                long nOpenMode = 0;
+                if ( xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenMode" ))) >>= nOpenMode )
+                    m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
+            }
+            catch ( com::sun::star::beans::UnknownPropertyException& )
+            {
+            }
+            catch ( com::sun::star::lang::WrappedTargetException& )
+            {
+            }
+        }
+    }
+
+    impl_Initialize();
+}
+// -----------------------------------------------------------------------------
+sal_Bool UIConfigurationManagerImpl::hasStorage() throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    return ( m_xUserConfigStorage.is() );
+}
+
+// XUIConfigurationManagerImpl
+sal_Bool UIConfigurationManagerImpl::isDefaultSettings( const ::rtl::OUString& ResourceURL )
+throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
+    
+    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
+        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
+        throw IllegalArgumentException();
+    else
+    {
+        ResetableGuard aGuard( m_aLock );
+        
+        if ( m_bDisposed )
+            throw DisposedException();
+
+        UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false );
+        if ( pDataSettings && pDataSettings->bDefaultNode )
+            return sal_True;
+    }
+    
+    return sal_False;
+}
+
+Reference< XIndexAccess > UIConfigurationManagerImpl::getDefaultSettings( const ::rtl::OUString& ResourceURL ) 
+throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
+    
+    if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || 
+        ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT   ))
+        throw IllegalArgumentException();
+    else
+    {
+        ResetableGuard aGuard( m_aLock );
+        
+        if ( m_bDisposed )
+            throw DisposedException();
+
+        // preload list of element types on demand
+        impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
+
+        // Look into our default vector/hash_map combination
+        UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
+        UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL );
+        if ( pIter != rDefaultHashMap.end() )
+        {
+            if ( !pIter->second.xSettings.is() )
+                impl_requestUIElementData( nElementType, LAYER_DEFAULT, pIter->second );
+            return pIter->second.xSettings;
+        }
+    }
+    
+    // Nothing has been found!
+    throw NoSuchElementException();
+}
+
+// XUIConfigurationPersistence
+void UIConfigurationManagerImpl::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly )
+    {
+        // Try to access our module sub folder
+        ConfigEventNotifyContainer aRemoveNotifyContainer;
+        ConfigEventNotifyContainer aReplaceNotifyContainer;
+        for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
+        {
+            try
+            {
+                UIElementType& rUserElementType    = m_aUIElements[LAYER_USERDEFINED][i];
+                UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][i];
+                
+                if ( rUserElementType.bModified )
+                    impl_reloadElementTypeData( rUserElementType, rDefaultElementType, aRemoveNotifyContainer, aReplaceNotifyContainer );
+            }
+            catch ( Exception& )
+            {
+                throw IOException();
+            }
+        }
+
+        m_bModified = sal_False;
+
+        // Unlock mutex before notify our listeners
+        aGuard.unlock();
+            
+        // Notify our listeners
+        ::std::for_each(aRemoveNotifyContainer.begin(),aRemoveNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Remove));
+        ::std::for_each(aReplaceNotifyContainer.begin(),aReplaceNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Replace));
+    }
+}
+
+void UIConfigurationManagerImpl::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( m_bDisposed )
+        throw DisposedException();
+    
+    if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly )
+    {
+        // Try to access our module sub folder
+        for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
+        {
+            try
+            {
+                UIElementType&        rElementType = m_aUIElements[LAYER_USERDEFINED][i];
+                Reference< XStorage > xStorage( rElementType.xStorage, UNO_QUERY );
+                
+                if ( rElementType.bModified && xStorage.is() )
+                {
+                    impl_storeElementTypeData( xStorage, rElementType );
+                    m_pStorageHandler[i]->commitUserChanges();
+                }
+            }
+            catch ( Exception& )
+            {
+                throw IOException();
+            }
+        }
+        
+        m_bModified = false;
+    }
+}
+
+void UIConfigurationManagerImpl::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+
+    if ( m_bDisposed )
+        throw DisposedException();
+
+    if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly )
+    {
+        // Try to access our module sub folder
+        for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
+        {
+            try
+            {
+                Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( 
+                                                            rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE ));
+                UIElementType&        rElementType = m_aUIElements[LAYER_USERDEFINED][i];
+                
+                if ( rElementType.bModified && xElementTypeStorage.is() )
+                    impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag!
+            }
+            catch ( Exception& )
+            {
+                throw IOException();
+            }
+        }
+        
+        Reference< XTransactedObject > xTransactedObject( Storage, UNO_QUERY );
+        if ( xTransactedObject.is() )
+            xTransactedObject->commit();
+    }
+}
+
+sal_Bool UIConfigurationManagerImpl::isModified() throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+    
+    return m_bModified;
+}
+
+sal_Bool UIConfigurationManagerImpl::isReadOnly() throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aGuard( m_aLock );
+    
+    return m_bReadOnly;
+}
+
+void UIConfigurationManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp )
+{
+    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >*) NULL ) );
+    if ( pContainer != NULL )
+    {
+        ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
+        while ( pIterator.hasMoreElements() )
+        {
+            try
+            {
+                switch ( eOp )
+                {
+                    case NotifyOp_Replace:
+                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementReplaced( aEvent );
+                        break;
+                    case NotifyOp_Insert:
+                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementInserted( aEvent );
+                        break;
+                    case NotifyOp_Remove:
+                        ((::com::sun::star::ui::XUIConfigurationListener*)pIterator.next())->elementRemoved( aEvent );
+                        break;
+                }
+            }
+            catch( css::uno::RuntimeException& )
+            {
+                pIterator.remove();
+            }
+        }
+    }
+}
+
+} // namespace framework
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
new file mode 100755
index 000000000..937aca2a9
--- /dev/null
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
@@ -0,0 +1,221 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: UIConfigurationManagerImpl.hxx,v $
+ * $Revision: 1.10 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_UICONFIGURATION_UICONFIGMANAGERIMPL_HXX_
+#define __FRAMEWORK_UICONFIGURATION_UICONFIGMANAGERIMPL_HXX_
+
+
+/** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble
+               with solaris headers ...
+*/
+#include <vector>
+#include <list>
+#include <hash_map>
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+#include <accelerators/presethandler.hxx>
+#include <threadhelp/threadhelpbase.hxx>
+#include <macros/generic.hxx>
+#include <macros/xinterface.hxx>
+#include <macros/xtypeprovider.hxx>
+#include <macros/xserviceinfo.hxx>
+#include <stdtypes.h>
+#include <uiconfiguration/moduleimagemanager.hxx>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
+#include <com/sun/star/ui/XUIConfiguration.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
+#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/ui/ConfigurationEvent.hpp>
+#include <com/sun/star/embed/XTransactedObject.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
+#include <rtl/ustring.hxx>
+
+
+namespace framework
+{
+    class UIConfigurationManagerImpl :   public ThreadHelpBase		// Struct for right initalization of mutex member! Must be first of baseclasses.
+    {
+        public:
+            //  XInterface, XTypeProvider, XServiceInfo
+            UIConfigurationManagerImpl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager
+                                        , const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& _xOwner
+                                        , bool _bUseDefault);
+            ~UIConfigurationManagerImpl();
+
+            // XComponent
+            void dispose() throw (::com::sun::star::uno::RuntimeException);
+            void addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+            void removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+
+            // XInitialization
+            void initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+            // XUIConfiguration
+            void addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+            void removeConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+
+            // XUIConfigurationManager
+            void reset() throw (::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > getUIElementsInfo( sal_Int16 ElementType ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > createSettings(  ) throw (::com::sun::star::uno::RuntimeException);
+            sal_Bool hasSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+            void replaceSettings( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+            void removeSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+            void insertSettings( const ::rtl::OUString& NewResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getImageManager() throw (::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getShortCutManager() throw (::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getEventsManager() throw (::com::sun::star::uno::RuntimeException);
+
+            // XUIConfigurationManagerImpl
+            sal_Bool isDefaultSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > getDefaultSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+
+            // XUIConfigurationPersistence
+            void reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+            void store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+            void storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+            sal_Bool isModified() throw (::com::sun::star::uno::RuntimeException);
+            sal_Bool isReadOnly() throw (::com::sun::star::uno::RuntimeException);
+
+            // XUIConfigurationStorage
+            void setStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException);
+            sal_Bool hasStorage() throw (::com::sun::star::uno::RuntimeException);
+
+            enum Layer
+            {
+                LAYER_DEFAULT,
+                LAYER_USERDEFINED,
+                LAYER_COUNT
+            };
+            
+            enum NotifyOp
+            {
+                NotifyOp_Remove,
+                NotifyOp_Insert,
+                NotifyOp_Replace
+            };
+
+            struct UIElementInfo
+            {
+                UIElementInfo( const rtl::OUString& rResourceURL, const rtl::OUString& rUIName ) :
+                    aResourceURL( rResourceURL), aUIName( rUIName ) {}
+                rtl::OUString   aResourceURL;
+                rtl::OUString   aUIName;
+            };
+            
+            struct UIElementData
+            {
+                UIElementData() : bModified( false ), bDefault( true ), bDefaultNode( true ) {};
+
+                rtl::OUString aResourceURL;
+                rtl::OUString aName;
+                bool          bModified;        // has been changed since last storing
+                bool          bDefault;         // default settings
+                bool          bDefaultNode;     // this is a default layer element data
+                com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > xSettings;
+            };
+
+            struct UIElementType;
+            friend struct UIElementType;
+            typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+            
+            struct UIElementType
+            {
+                UIElementType() : bModified( false ),
+                                  bLoaded( false ), 
+                                  bDefaultLayer( false ),
+                                  nElementType( ::com::sun::star::ui::UIElementType::UNKNOWN ) {}
+                
+
+                bool                                                              bModified;
+                bool                                                              bLoaded;
+                bool                                                              bDefaultLayer;
+                sal_Int16                                                         nElementType;
+                UIElementDataHashMap                                              aElementsHashMap;
+                com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
+            };
+
+            typedef ::std::vector< UIElementType > UIElementTypesVector;
+            typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
+            typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+
+            // private methods
+            void            impl_Initialize();
+            void            implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
+            void            impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType );
+            void            impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType );
+            UIElementData*  impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
+            void            impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData );
+            void            impl_storeElementTypeData( com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage, UIElementType& rElementType, bool bResetModifyState = true );
+            void            impl_resetElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
+            void            impl_reloadElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
+
+            UIElementTypesVector                                                            m_aUIElements[LAYER_COUNT];
+            PresetHandler*                                                                  m_pStorageHandler[::com::sun::star::ui::UIElementType::COUNT];
+            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xDefaultConfigStorage;
+            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserConfigStorage;
+            com::sun::star::uno::Reference< com::sun::star::uno::XInterface >               m_xOwner;
+            bool                                                                            m_bUseDefault;
+            bool                                                                            m_bReadOnly;
+            bool                                                                            m_bInitialized;
+            bool                                                                            m_bModified;
+            bool                                                                            m_bConfigRead;
+            bool                                                                            m_bDisposed;
+            rtl::OUString                                                                   m_aXMLPostfix;
+            rtl::OUString                                                                   m_aPropUIName;
+            rtl::OUString                                                                   m_aPropResourceURL;
+            rtl::OUString                                                                   m_aModuleIdentifier;
+            rtl::OUString                                                                   m_aModuleShortName;
+            com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject >      m_xUserRootCommit;
+            com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
+            ::cppu::OMultiTypeInterfaceContainerHelper                                      m_aListenerContainer;   /// container for ALL Listener
+            com::sun::star::uno::Reference< com::sun::star::uno::XInterface >               m_xAccConfig;
+            com::sun::star::uno::Reference< com::sun::star::lang::XComponent >              m_xModuleImageManager;
+   };
+}
+
+#endif // __FRAMEWORK_UICONFIGURATION_UICONFIGMANAGERIMPL_HXX_
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index ea1d499f7..c97caecc0 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -369,7 +369,7 @@ throw (::com::sun::star::uno::RuntimeException)
 {
     try
     {
-        Any a = getByName( rResourceURL );
+        getByName( rResourceURL );
     }
     catch ( NoSuchElementException& )
     {
@@ -761,7 +761,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt
                                 nMask |= WINDOWSTATE_MASK_DOCKPOS;
                             }
 
-                            a = makeAny( aPos );
+                            a <<= aPos;
                             bAddToSeq = true;
                         }
                     }
@@ -792,7 +792,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt
                                 nMask |= WINDOWSTATE_MASK_DOCKSIZE;
                             }
 
-                            a = makeAny( aSize );
+                            a <<= aSize;
                             bAddToSeq = true;
                         }
                     }
@@ -1312,11 +1312,11 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess()
     try
     {
         aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
-        aPropValue.Value = makeAny( m_aConfigWindowAccess );
-        aArgs[0] = makeAny( aPropValue );
+        aPropValue.Value <<= m_aConfigWindowAccess;
+        aArgs[0] <<= aPropValue;
         aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ));
-        aPropValue.Value = makeAny( sal_True );
-        aArgs[1] = makeAny( aPropValue );
+        aPropValue.Value <<= sal_True;
+        aArgs[1] <<= aPropValue;
 
         m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(
                                                         SERVICENAME_CFGUPDATEACCESS, aArgs ),
@@ -1383,8 +1383,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi
     for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ )
     {
         aModuleIdentifier = aElementNames[i];
-        Any a = xNameAccess->getByName( aModuleIdentifier );
-        if ( a >>= aSeq )
+        if ( xNameAccess->getByName( aModuleIdentifier ) >>= aSeq )
         {
             ::rtl::OUString aWindowStateFileStr;
             for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
@@ -1439,7 +1438,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
                 ConfigurationAccess_WindowState* pModuleWindowState = new ConfigurationAccess_WindowState( aWindowStateConfigFile, m_xServiceManager );
                 xResourceURLWindowState = Reference< XNameAccess >( static_cast< cppu::OWeakObject* >( pModuleWindowState ),UNO_QUERY );
                 pModuleIter->second = xResourceURLWindowState;
-                a = makeAny( xResourceURLWindowState );
+                a <<= xResourceURLWindowState;
             }
 
             return a;
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 984631159..ad3c5fbfa 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -343,20 +343,20 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
                         PropertyValue   aPropValue;
 
                         aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
-                        aPropValue.Value    = makeAny( m_aModuleIdentifier );
-                        aArgs[0] = makeAny( aPropValue );
+                        aPropValue.Value    <<= m_aModuleIdentifier;
+                        aArgs[0] <<= aPropValue;
                         aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-                        aPropValue.Value    = makeAny( m_xFrame );
-                        aArgs[1] = makeAny( aPropValue );
+                        aPropValue.Value    <<= m_xFrame;
+                        aArgs[1] <<= aPropValue;
                         aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ServiceManager" ));
-                        aPropValue.Value    = makeAny( m_xServiceManager );
-                        aArgs[2] = makeAny( aPropValue );
+                        aPropValue.Value    <<= m_xServiceManager;
+                        aArgs[2] <<= aPropValue;
                         aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ));
-                        aPropValue.Value    = makeAny( xToolbarWindow );
-                        aArgs[3] = makeAny( aPropValue );
+                        aPropValue.Value    <<= xToolbarWindow;
+                        aArgs[3] <<= aPropValue;
                         aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ItemId" ));
                         aPropValue.Value    = makeAny( sal_Int32( nId ));
-                        aArgs[4] = makeAny( aPropValue );
+                        aArgs[4] <<= aPropValue;
 
                         try
                         {
@@ -387,14 +387,14 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
                     PropertyValue aPropValue;
                     Sequence< Any > aArgs( 3 );
                     aPropValue.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-                    aPropValue.Value = makeAny( m_xFrame );
-                    aArgs[0] = makeAny( aPropValue );
+                    aPropValue.Value <<= m_xFrame;
+                    aArgs[0] <<= aPropValue;
                     aPropValue.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
-                    aPropValue.Value = makeAny( aURL );
-                    aArgs[1] = makeAny( aPropValue );
+                    aPropValue.Value <<= aURL;
+                    aArgs[1] <<= aPropValue;
                     aPropValue.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ServiceManager" ));
-                    aPropValue.Value = makeAny( m_xServiceManager );
-                    aArgs[2] = makeAny( aPropValue );
+                    aPropValue.Value <<= m_xServiceManager;
+                    aArgs[2] <<= aPropValue;
                     try
                     {
                         xInit->initialize( aArgs );
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 088f440a8..da40a4ee0 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -51,6 +51,7 @@
 //	interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XSystemDependentMenuPeer.hpp>
 #include <com/sun/star/awt/XMenuBar.hpp>
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 8072c8f80..855f1dd3f 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -285,7 +285,7 @@ throw (::com::sun::star::uno::RuntimeException)
 
             // Provide key modifier information to dispatch function
             aArgs[0].Name   = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
-            aArgs[0].Value  = makeAny( KeyModifier );
+            aArgs[0].Value  <<= KeyModifier;
             
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
                 UiEventLogHelper(::rtl::OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 80c267b19..937c099aa 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -214,52 +214,17 @@ throw ( RuntimeException )
 }
 
 // ------------------------------------------------------------------
-
-void SAL_CALL ComboboxToolbarController::execute( sal_Int16 KeyModifier )
-throw ( RuntimeException )
+Sequence<PropertyValue> ComboboxToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
-    Reference< XDispatch >       xDispatch;
-    Reference< XURLTransformer > xURLTransformer;
-    ::rtl::OUString                     aCommandURL;
-    ::rtl::OUString                     aSelectedText;
-    ::com::sun::star::util::URL  aTargetURL;
-
-    {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        if ( m_bInitialized &&
-             m_xFrame.is() &&
-             m_xServiceManager.is() &&
-             m_aCommandURL.getLength() )
-        {
-            xURLTransformer = m_xURLTransformer;
-            xDispatch = getDispatchFromCommand( m_aCommandURL );
-            aCommandURL = m_aCommandURL;
-            aTargetURL = getInitializedURL();
-            aSelectedText = m_pComboBox->GetText();
-        }
-    }
-
-    if ( xDispatch.is() && aTargetURL.Complete.getLength() > 0 )
-    {
-        Sequence<PropertyValue>   aArgs( 2 );
-
-        // Add key modifier to argument list
-        aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
-        aArgs[0].Value <<= KeyModifier;
-        aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
-        aArgs[1].Value <<= aSelectedText;
-
-        // Execute dispatch asynchronously
-        ExecuteInfo* pExecuteInfo = new ExecuteInfo;
-        pExecuteInfo->xDispatch     = xDispatch;
-        pExecuteInfo->aTargetURL    = aTargetURL;
-        pExecuteInfo->aArgs         = aArgs;
-        Application::PostUserEvent( STATIC_LINK(0, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo );
-    }
+    Sequence<PropertyValue> aArgs( 2 );
+    ::rtl::OUString aSelectedText = m_pComboBox->GetText();
+
+    // Add key modifier to argument list
+    aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
+    aArgs[0].Value <<= KeyModifier;
+    aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
+    aArgs[1].Value <<= aSelectedText;
+    return aArgs;
 }
 
 // ------------------------------------------------------------------
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index a1bdb08e1..3b5d19726 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -92,7 +92,7 @@ ComplexToolbarController::ComplexToolbarController(
     ,   m_nID( nID )
     ,   m_bMadeInvisible( sal_False )
 {
-    m_xURLTransformer = Reference< XURLTransformer >( m_xServiceManager->createInstance(
+    m_xURLTransformer.set( m_xServiceManager->createInstance(
                                                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
                                                       UNO_QUERY_THROW );
 }
@@ -119,7 +119,16 @@ throw ( RuntimeException )
 }
 
 // ------------------------------------------------------------------
+Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
+{
+    Sequence<PropertyValue> aArgs( 1 );
 
+    // Add key modifier to argument list
+    aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
+    aArgs[0].Value <<= KeyModifier;
+    return aArgs;
+}
+// -----------------------------------------------------------------------------
 void SAL_CALL ComplexToolbarController::execute( sal_Int16 KeyModifier )
 throw ( RuntimeException )
 {
@@ -127,6 +136,7 @@ throw ( RuntimeException )
     Reference< XURLTransformer > xURLTransformer;
     ::rtl::OUString                     aCommandURL;
     ::com::sun::star::util::URL  aTargetURL;
+    Sequence<PropertyValue> aArgs;
 
     {
         vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
@@ -143,17 +153,12 @@ throw ( RuntimeException )
             xDispatch = getDispatchFromCommand( m_aCommandURL );
             aCommandURL = m_aCommandURL;
             aTargetURL = getInitializedURL();
+            aArgs = getExecuteArgs(KeyModifier);
         }
     }
 
     if ( xDispatch.is() && aTargetURL.Complete.getLength() > 0 )
     {
-        Sequence<PropertyValue> aArgs( 1 );
-
-        // Add key modifier to argument list
-        aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
-        aArgs[0].Value <<= KeyModifier;
-
         // Execute dispatch asynchronously
         ExecuteInfo* pExecuteInfo = new ExecuteInfo;
         pExecuteInfo->xDispatch     = xDispatch;
diff --git a/framework/source/uielement/constitemcontainer.cxx b/framework/source/uielement/constitemcontainer.cxx
index e4277aaf1..91fb93f55 100644
--- a/framework/source/uielement/constitemcontainer.cxx
+++ b/framework/source/uielement/constitemcontainer.cxx
@@ -201,13 +201,13 @@ ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSource
         try
         {
             sal_Int32 nCount = rSourceContainer->getCount();
+            m_aItemVector.reserve(nCount);
             if ( bFastCopy )
             {
                 for ( sal_Int32 i = 0; i < nCount; i++ )
                 {
                     Sequence< PropertyValue > aPropSeq;
-                    Any a = rSourceContainer->getByIndex( i );
-                    if ( a >>= aPropSeq )
+                    if ( rSourceContainer->getByIndex( i ) >>= aPropSeq )
                         m_aItemVector.push_back( aPropSeq );
                 }
             }
@@ -216,8 +216,7 @@ ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSource
                 for ( sal_Int32 i = 0; i < nCount; i++ )
                 {
                     Sequence< PropertyValue > aPropSeq;
-                    Any a = rSourceContainer->getByIndex( i );
-                    if ( a >>= aPropSeq )
+                    if ( rSourceContainer->getByIndex( i ) >>= aPropSeq )
                     {
                         sal_Int32 nContainerIndex = -1;
                         Reference< XIndexAccess > xIndexAccess;
@@ -252,7 +251,8 @@ ConstItemContainer::~ConstItemContainer()
 // private
 void ConstItemContainer::copyItemContainer( const std::vector< Sequence< PropertyValue > >& rSourceVector )
 {
-    for ( sal_uInt32 i = 0; i < rSourceVector.size(); i++ )
+    const sal_uInt32 nCount = rSourceVector.size();
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
     {
         sal_Int32 nContainerIndex = -1;
         Sequence< PropertyValue > aPropSeq( rSourceVector[i] );
@@ -328,7 +328,7 @@ ConstItemContainer* ConstItemContainer::GetImplementation( const ::com::sun::sta
 sal_Bool SAL_CALL ConstItemContainer::hasElements()
 throw ( RuntimeException )
 {
-    return ( m_aItemVector.size() != 0 );
+    return ( !m_aItemVector.empty() );
 }
 
 // XIndexAccess
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 84d4e217e..5b1abca91 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -346,51 +345,17 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
 }
 
 // XMenuListener
-void SAL_CALL ControlMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
+void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispatch*/,const ::com::sun::star::util::URL& aURL)
 {
-}
-
-void SAL_CALL ControlMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
-{
-    Reference< css::awt::XPopupMenu >   xPopupMenu;
-    Reference< XDispatch >              xRefDispatch;
-    Reference< XMultiServiceFactory >   xServiceManager;
-
-    ResetableGuard aLock( m_aLock );
-    xPopupMenu      = m_xPopupMenu;
-    xRefDispatch    = m_xDispatch;
-    xServiceManager = m_xServiceManager;
-    aLock.unlock();
-
-    if ( xPopupMenu.is() )
+    UrlToDispatchMap::iterator pIter = m_aURLToDispatchMap.find( aURL.Complete );
+    if ( pIter != m_aURLToDispatchMap.end() )
     {
-        VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
-        if ( pPopupMenu )
-        {
-            css::util::URL               aTargetURL;
-            Sequence<PropertyValue>	     aArgs( 1 );
-            Reference< XURLTransformer > xURLTransformer( xServiceManager->createInstance( 
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                        UNO_QUERY );
-
-            {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-                PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-
-                aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId );
-            }
-            
-            xURLTransformer->parseStrict( aTargetURL );
-            UrlToDispatchMap::iterator pIter = m_aURLToDispatchMap.find( aTargetURL.Complete );
-            if ( pIter != m_aURLToDispatchMap.end() )
-            {
-                Reference< XDispatch > xDispatch = pIter->second;
-                if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                    UiEventLogHelper(::rtl::OUString::createFromAscii("ControlMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
-                if ( xDispatch.is() )
-                    xDispatch->dispatch( aTargetURL, aArgs );
-            }
-        }
+        Sequence<PropertyValue>	     aArgs;
+        Reference< XDispatch > xDispatch = pIter->second;
+        if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+            UiEventLogHelper(::rtl::OUString::createFromAscii("ControlMenuController")).log(m_xServiceManager, m_xFrame, aURL, aArgs);
+        if ( xDispatch.is() )
+            xDispatch->dispatch( aURL, aArgs );
     }
 }
 
@@ -425,54 +390,26 @@ void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) thro
     }
 }
 
-void SAL_CALL ControlMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
 // XPopupMenuController
-void SAL_CALL ControlMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
+void ControlMenuController::impl_setPopupMenu()
 {
-    ResetableGuard aLock( m_aLock );
-    
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
+    if ( m_pResPopupMenu == 0 )
     {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-        
-        if ( m_pResPopupMenu == 0 )
-        {
-            rtl::OStringBuffer aBuf( 32 );
-            aBuf.append( "svx" );
+        rtl::OStringBuffer aBuf( 32 );
+        aBuf.append( "svx" );
 
-            ResMgr* pResMgr = ResMgr::CreateResMgr( aBuf.getStr() );
-            if ( pResMgr )
-            {
-                ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr );
-                aResId.SetRT( RSC_MENU );
-                if ( pResMgr->IsAvailable( aResId ))
-                    m_pResPopupMenu = new PopupMenu( aResId );
+        ResMgr* pResMgr = ResMgr::CreateResMgr( aBuf.getStr() );
+        if ( pResMgr )
+        {
+            ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr );
+            aResId.SetRT( RSC_MENU );
+            if ( pResMgr->IsAvailable( aResId ))
+                m_pResPopupMenu = new PopupMenu( aResId );
 
-                updateImagesPopupMenu( m_pResPopupMenu );
-                delete pResMgr;
-            }
+            updateImagesPopupMenu( m_pResPopupMenu );
+            delete pResMgr;
         }
-
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-            
-        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
-                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                    UNO_QUERY );
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-        
-        com::sun::star::util::URL aTargetURL;
-        aTargetURL.Complete = m_aCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-    }    
+    } // if ( m_pResPopupMenu == 0 )
 }
         
 void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException)
@@ -485,10 +422,6 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::
     if ( m_xFrame.is() && m_xPopupMenu.is() )
     {
         URL aTargetURL;
-        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
-                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                    UNO_QUERY );
-
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         fillPopupMenu( m_xPopupMenu );
         m_aURLToDispatchMap.free();
@@ -496,7 +429,7 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::
         for (sal_uInt32 i=0; i<sizeof(aCommands)/sizeof(aCommands[0]); ++i)
         {
             aTargetURL.Complete = rtl::OUString::createFromAscii( aCommands[i] );
-            xURLTransformer->parseStrict( aTargetURL );
+            m_xURLTransformer->parseStrict( aTargetURL );
             
             Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
             if ( xDispatch.is() )
@@ -512,36 +445,9 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::
 // XInitialization
 void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    const rtl::OUString aFrameName( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-    const rtl::OUString aCommandURLName( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
-
     ResetableGuard aLock( m_aLock );
-    
-    sal_Bool bInitalized( m_bInitialized );
-    if ( !bInitalized )
-    {
-        PropertyValue       aPropValue;
-        rtl::OUString       aCommandURL;
-        Reference< XFrame > xFrame;
-        
-        for ( int i = 0; i < aArguments.getLength(); i++ )
-        {
-            if ( aArguments[i] >>= aPropValue )
-            {
-                if ( aPropValue.Name.equalsAscii( "Frame" ))
-                    aPropValue.Value >>= xFrame;
-                else if ( aPropValue.Name.equalsAscii( "CommandURL" ))
-                    aPropValue.Value >>= aCommandURL;
-            }
-        }
-
-        if ( xFrame.is() && aCommandURL.getLength() )
-        {
-            m_xFrame        = xFrame;
-            m_aCommandURL   = aCommandURL;
-            m_bInitialized = sal_True;
-        }
-    }
+    PopupMenuControllerBase::initialize(aArguments);
+    m_aBaseURL = ::rtl::OUString();    
 }
 
 }
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index a268d0f63..e9910d6b4 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -197,52 +197,17 @@ throw ( RuntimeException )
 }
 
 // ------------------------------------------------------------------
-
-void SAL_CALL DropdownToolbarController::execute( sal_Int16 KeyModifier )
-throw ( RuntimeException )
+Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
-    Reference< XDispatch >       xDispatch;
-    Reference< XURLTransformer > xURLTransformer;
-    ::rtl::OUString                     aCommandURL;
-    ::rtl::OUString                     aSelectedText;
-    ::com::sun::star::util::URL  aTargetURL;
-
-    {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        if ( m_bInitialized &&
-             m_xFrame.is() &&
-             m_xServiceManager.is() &&
-             m_aCommandURL.getLength() )
-        {
-            xURLTransformer = m_xURLTransformer;
-            xDispatch = getDispatchFromCommand( m_aCommandURL );
-            aCommandURL = m_aCommandURL;
-            aTargetURL = getInitializedURL();
-            aSelectedText = m_pListBoxControl->GetText();
-        }
-    }
-
-    if ( xDispatch.is() && aTargetURL.Complete.getLength() > 0 )
-    {
-        Sequence<PropertyValue>   aArgs( 2 );
-
-        // Add key modifier to argument list
-        aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
-        aArgs[0].Value <<= KeyModifier;
-        aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
-        aArgs[1].Value <<= aSelectedText;
-
-        // Execute dispatch asynchronously
-        ExecuteInfo* pExecuteInfo = new ExecuteInfo;
-        pExecuteInfo->xDispatch     = xDispatch;
-        pExecuteInfo->aTargetURL    = aTargetURL;
-        pExecuteInfo->aArgs         = aArgs;
-        Application::PostUserEvent( STATIC_LINK(0, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo );
-    }
+    Sequence<PropertyValue> aArgs( 2 );
+    ::rtl::OUString aSelectedText = m_pListBoxControl->GetText();
+
+    // Add key modifier to argument list
+    aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
+    aArgs[0].Value <<= KeyModifier;
+    aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
+    aArgs[1].Value <<= aSelectedText;
+    return aArgs;
 }
 
 // ------------------------------------------------------------------
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index b65d52581..5faefa928 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -194,52 +194,17 @@ throw ( RuntimeException )
 }
 
 // ------------------------------------------------------------------
-
-void SAL_CALL EditToolbarController::execute( sal_Int16 KeyModifier )
-throw ( RuntimeException )
+Sequence<PropertyValue> EditToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
-    Reference< XDispatch >       xDispatch;
-    Reference< XURLTransformer > xURLTransformer;
-    ::rtl::OUString                     aCommandURL;
-    ::rtl::OUString                     aSelectedText;
-    ::com::sun::star::util::URL  aTargetURL;
-
-    {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        if ( m_bInitialized &&
-             m_xFrame.is() &&
-             m_xServiceManager.is() &&
-             m_aCommandURL.getLength() )
-        {
-            xURLTransformer = m_xURLTransformer;
-            xDispatch = getDispatchFromCommand( m_aCommandURL );
-            aCommandURL = m_aCommandURL;
-            aTargetURL = getInitializedURL();
-            aSelectedText = m_pEditControl->GetText();
-        }
-    }
-
-    if ( xDispatch.is() && aTargetURL.Complete.getLength() > 0 )
-    {
-        Sequence<PropertyValue>   aArgs( 2 );
-
-        // Add key modifier to argument list
-        aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
-        aArgs[0].Value <<= KeyModifier;
-        aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
-        aArgs[1].Value <<= aSelectedText;
-
-        // Execute dispatch asynchronously
-        ExecuteInfo* pExecuteInfo = new ExecuteInfo;
-        pExecuteInfo->xDispatch     = xDispatch;
-        pExecuteInfo->aTargetURL    = aTargetURL;
-        pExecuteInfo->aArgs         = aArgs;
-        Application::PostUserEvent( STATIC_LINK(0, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo );
-    }
+    Sequence<PropertyValue> aArgs( 2 );
+    ::rtl::OUString aSelectedText = m_pEditControl->GetText();
+
+    // Add key modifier to argument list
+    aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
+    aArgs[0].Value <<= KeyModifier;
+    aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
+    aArgs[1].Value <<= aSelectedText;
+    return aArgs;
 }
 
 // ------------------------------------------------------------------
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index eb23ac5c3..320e7ffbe 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 
 
@@ -119,6 +118,7 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont
     if ( pVCLPopupMenu )
     {
         vector<rtl::OUString> aVector;
+        aVector.reserve(rFontNameSeq.getLength());
         for ( USHORT i = 0; i < rFontNameSeq.getLength(); i++ )
         {
             aVector.push_back(MnemonicGenerator::EraseAllMnemonicChars(pFontNameArray[i]));
@@ -126,7 +126,8 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont
         sort(aVector.begin(), aVector.end(), lcl_I18nCompareString );
 
         const rtl::OUString aFontNameCommandPrefix( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName?CharFontName.FamilyName:string=" ));
-        for(USHORT i = 0; i < aVector.size(); i++)
+        const sal_Int16 nCount = (sal_Int16)aVector.size();
+        for ( sal_Int16 i = 0; i < nCount; i++ )
         {
             const rtl::OUString& rName = aVector[i];
             m_xPopupMenu->insertItem( i+1, rName, css::awt::MenuItemStyle::RADIOCHECK | css::awt::MenuItemStyle::AUTOCHECK, i );
@@ -178,51 +179,16 @@ void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event
 }
 
 // XMenuListener
-void SAL_CALL FontMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
+void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL)
 {
-}
-
-void SAL_CALL FontMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
-{
-    Reference< css::awt::XPopupMenu >   xPopupMenu;
-    Reference< XDispatch >              xDispatch;
-    Reference< XMultiServiceFactory >   xServiceManager;
-
-    ResetableGuard aLock( m_aLock );
-    xPopupMenu      = m_xPopupMenu;
-    xDispatch       = m_xDispatch;
-    xServiceManager = m_xServiceManager;
-    aLock.unlock();
-
-    if ( xPopupMenu.is() && xDispatch.is() )
-    {
-        VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
-        if ( pPopupMenu )
-        {
-            css::util::URL               aTargetURL;
-            Sequence<PropertyValue>	     aArgs;
-            Reference< XURLTransformer > xURLTransformer( xServiceManager->createInstance( 
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                        UNO_QUERY );
-
-            {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-                
-                // Command URL used to dispatch the selected font family name
-                PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-                aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId );
-            }
-            
-            xURLTransformer->parseStrict( aTargetURL );
-            if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                UiEventLogHelper(::rtl::OUString::createFromAscii("FontMenuController")).log(
-                    m_xServiceManager,
-                    m_xFrame,
-                    aTargetURL,
-                    Sequence<PropertyValue>());
-            xDispatch->dispatch( aTargetURL, aArgs );
-        }
-    }
+    Sequence<PropertyValue>	     aArgs;
+    if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+        UiEventLogHelper(::rtl::OUString::createFromAscii("FontMenuController")).log(
+            m_xServiceManager,
+            m_xFrame,
+            aTargetURL,
+            Sequence<PropertyValue>());
+    _xDispatch->dispatch( aTargetURL, aArgs );
 }
 
 void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
@@ -262,44 +228,16 @@ void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (
     }
 }
 
-void SAL_CALL FontMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
 // XPopupMenuController
-void SAL_CALL FontMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw (RuntimeException)
+void FontMenuController::impl_setPopupMenu()
 {
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
+    Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
     
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
-    {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-        
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-
-
-        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
-                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                    UNO_QUERY );
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-        
-        com::sun::star::util::URL aTargetURL;
-        aTargetURL.Complete = m_aCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-        
-        // Register for font list updates to get the current font list from the controller
-        aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontNameList" ));
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-        
-        updatePopupMenu();
-    }    
+    com::sun::star::util::URL aTargetURL;
+    // Register for font list updates to get the current font list from the controller
+    aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontNameList" ));
+    m_xURLTransformer->parseStrict( aTargetURL );
+    m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
 }
         
 void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
@@ -308,12 +246,9 @@ void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::un
 
     ResetableGuard aLock( m_aLock );
     Reference< XDispatch > xDispatch( m_xFontListDispatch );
-    Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
-                                                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                UNO_QUERY );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontNameList" ));
-    xURLTransformer->parseStrict( aTargetURL );
+    m_xURLTransformer->parseStrict( aTargetURL );
     aLock.unlock();
 
     if ( xDispatch.is() )
@@ -323,11 +258,5 @@ void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::un
     }
 }
 
-// XInitialization
-void SAL_CALL FontMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    PopupMenuControllerBase::initialize( aArguments );
-}
-
 }
 
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 6a2b967dc..e3ff3f203 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/view/XPrintable.hpp>
 
@@ -322,93 +321,23 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev
 }
 
 // XMenuListener
-void SAL_CALL FontSizeMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL FontSizeMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
-{
-    Reference< css::awt::XPopupMenu >   xPopupMenu;
-    Reference< XDispatch >              xDispatch;
-    Reference< XMultiServiceFactory >   xServiceManager;
-
-    ResetableGuard aLock( m_aLock );
-    xPopupMenu      = m_xPopupMenu;
-    xDispatch       = m_xDispatch;
-    xServiceManager = m_xServiceManager;
-    aLock.unlock();
-
-    // Command URL used to dispatch the selected font family name
-    const rtl::OUString aFontHeightCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight?FontHeight.Height:float=" ));
-
-    if ( xPopupMenu.is() && xDispatch.is() )
-    {
-        VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
-        if ( pPopupMenu )
-        {
-            css::util::URL               aTargetURL;
-            Sequence<PropertyValue>	     aArgs;
-            Reference< XURLTransformer > xURLTransformer( xServiceManager->createInstance( 
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                        UNO_QUERY );
-
-            {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-                PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-                aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId );
-            }
-            
-            xURLTransformer->parseStrict( aTargetURL );
-            if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                UiEventLogHelper(::rtl::OUString::createFromAscii("FontSizeMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
-            xDispatch->dispatch( aTargetURL, aArgs );
-        }
-    }
-}
-
-void SAL_CALL FontSizeMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL FontSizeMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void FontSizeMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL)
 {
+    Sequence<PropertyValue>	     aArgs;
+    if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+        UiEventLogHelper(::rtl::OUString::createFromAscii("FontSizeMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+    _xDispatch->dispatch( aTargetURL, aArgs );
 }
 
 // XPopupMenuController
-void SAL_CALL FontSizeMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
+void FontSizeMenuController::impl_setPopupMenu()
 {
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
-    {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-        
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-
-        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
-                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                    UNO_QUERY );
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-        
-        com::sun::star::util::URL aTargetURL;
-
-        // Register for font name updates which gives us info about the current font!
-        aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" ));
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        // Register for font height updates
-        aTargetURL.Complete = m_aCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        updatePopupMenu();
-    }
+    Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
+    com::sun::star::util::URL aTargetURL;
+    // Register for font name updates which gives us info about the current font!
+    aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" ));
+    m_xURLTransformer->parseStrict( aTargetURL );
+    m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
 }
         
 void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
@@ -419,12 +348,9 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star
         throw DisposedException();
     
     Reference< XDispatch > xDispatch( m_xCurrentFontDispatch );
-    Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
-                                                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                UNO_QUERY );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" ));
-    xURLTransformer->parseStrict( aTargetURL );
+    m_xURLTransformer->parseStrict( aTargetURL );
     aLock.unlock();
 
     if ( xDispatch.is() )
@@ -435,11 +361,4 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star
 
     PopupMenuControllerBase::updatePopupMenu();
 }
-
-// XInitialization
-void SAL_CALL FontSizeMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    PopupMenuControllerBase::initialize( aArguments );
-}
-
 }
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
dissimilarity index 71%
index 454da1ca0..182a6c369 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -1,346 +1,100 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: footermenucontroller.cxx,v $
- * $Revision: 1.10.40.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-#include <uielement/footermenucontroller.hxx>
-
-//_________________________________________________________________________________________________________________
-//	my own includes
-//_________________________________________________________________________________________________________________
-#include <threadhelp/resetableguard.hxx>
-#include "services.h"
-#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
-#include <classes/resource.hrc>
-#endif
-#include <classes/fwkresid.hxx>
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/awt/XDevice.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-
-//_________________________________________________________________________________________________________________
-//	includes of other projects
-//_________________________________________________________________________________________________________________
-
-#ifndef _VCL_MENU_HXX_
-#include <vcl/menu.hxx>
-#endif
-#include <vcl/svapp.hxx>
-#include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <dispatch/uieventloghelper.hxx>
-
-//_________________________________________________________________________________________________________________
-//	Defines
-//_________________________________________________________________________________________________________________
-// 
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::frame;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::util;
-using namespace com::sun::star::style;
-using namespace com::sun::star::container;
-
-const USHORT ALL_MENUITEM_ID = 1;
-
-namespace framework
-{
-
-DEFINE_XSERVICEINFO_MULTISERVICE        (   FooterMenuController				    ,
-                                            OWeakObject                             ,
-                                            SERVICENAME_POPUPMENUCONTROLLER		    ,
-                                            IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER
-                                        )
-
-DEFINE_INIT_SERVICE                     (   FooterMenuController, {} )
-
-FooterMenuController::FooterMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager )
-{
-}
-
-FooterMenuController::~FooterMenuController()
-{
-}
-
-// private function
-void FooterMenuController::fillPopupMenu( const Reference< ::com::sun::star::frame::XModel >& rModel, Reference< css::awt::XPopupMenu >& rPopupMenu )
-{
-    VCLXPopupMenu*                                     pPopupMenu        = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
-    PopupMenu*                                         pVCLPopupMenu     = 0;
-    
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-    
-    resetPopupMenu( rPopupMenu );
-    if ( pPopupMenu )
-        pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-        
-    Reference< XStyleFamiliesSupplier > xStyleFamiliesSupplier( rModel, UNO_QUERY );
-    if ( pVCLPopupMenu && xStyleFamiliesSupplier.is())
-    {
-        Reference< XNameAccess > xStyleFamilies = xStyleFamiliesSupplier->getStyleFamilies();
-        
-        try
-        {
-            const rtl::OUString aCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPageFooter" ));
-            const rtl::OUString aIsPhysicalStr( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ));
-            const rtl::OUString aDisplayNameStr( RTL_CONSTASCII_USTRINGPARAM( "DisplayName" ));
-            const rtl::OUString aFooterIsOnStr( RTL_CONSTASCII_USTRINGPARAM( "FooterIsOn" ));
-            
-            Reference< XNameContainer > xNameContainer;
-            Any a = xStyleFamilies->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageStyles" )));
-            if ( a >>= xNameContainer )
-            {
-                Sequence< rtl::OUString > aSeqNames = xNameContainer->getElementNames();
-
-                USHORT  nId = 2;
-                USHORT  nCount = 0;
-                sal_Bool bAllOneState( sal_True );
-                sal_Bool bLastCheck( sal_True );
-                sal_Bool bFirstChecked( sal_False );
-                sal_Bool bFirstItemInserted( sal_False );
-                for ( sal_Int32 n = 0; n < aSeqNames.getLength(); n++ )
-                {
-                    rtl::OUString aName = aSeqNames[n];
-                    Reference< XPropertySet > xPropSet( xNameContainer->getByName( aName ), UNO_QUERY );
-                    if ( xPropSet.is() )
-                    {
-                        sal_Bool bIsPhysical( sal_False );
-                        a = xPropSet->getPropertyValue( aIsPhysicalStr );
-                        if (( a >>= bIsPhysical ) && bIsPhysical )
-                        {
-                            rtl::OUString aDisplayName;
-                            sal_Bool      bHeaderIsOn( sal_False );
-                            a = xPropSet->getPropertyValue( aDisplayNameStr );
-                            a >>= aDisplayName;
-                            a = xPropSet->getPropertyValue( aFooterIsOnStr );
-                            a >>= bHeaderIsOn;
-                            
-                            rtl::OUStringBuffer aStrBuf( aCmd );
-                            aStrBuf.appendAscii( "?PageStyle:string=");
-                            aStrBuf.append( aDisplayName );
-                            aStrBuf.appendAscii( "&On:bool=" );
-                            if ( !bHeaderIsOn )
-                                aStrBuf.appendAscii( "true" );
-                            else
-                                aStrBuf.appendAscii( "false" );
-                            rtl::OUString aCommand( aStrBuf.makeStringAndClear() );
-                            pVCLPopupMenu->InsertItem( nId, aDisplayName, MIB_CHECKABLE );
-                            if ( !bFirstItemInserted )
-                            {
-                                bFirstItemInserted = sal_True;
-                                bFirstChecked      = bHeaderIsOn;
-                            }
-                            
-                            pVCLPopupMenu->SetItemCommand( nId, aCommand );
-                            if ( bHeaderIsOn )
-                                pVCLPopupMenu->CheckItem( nId, sal_True );
-                            ++nId;
-                            
-                            // Check if all entries have the same state
-                            if( bAllOneState && n && bHeaderIsOn != bLastCheck )
-                                bAllOneState = FALSE;
-                            bLastCheck = bHeaderIsOn;
-                            ++nCount;
-                        }
-                    }
-                }
-
-                if ( bAllOneState && ( nCount > 1 ))
-                {
-                    // Insert special item for all command
-                    pVCLPopupMenu->InsertItem( ALL_MENUITEM_ID, String( FwkResId( STR_MENU_HEADFOOTALL )), 0, 0 );
-                    
-                    rtl::OUStringBuffer aStrBuf( aCmd );
-                    aStrBuf.appendAscii( "?On:bool=" );
-                    
-                    // Command depends on check state of first menu item entry
-                    if ( !bFirstChecked )
-                        aStrBuf.appendAscii( "true" );
-                    else
-                        aStrBuf.appendAscii( "false" );
-
-                    pVCLPopupMenu->SetItemCommand( 1, aStrBuf.makeStringAndClear() );
-                    pVCLPopupMenu->InsertSeparator( 1 );
-                }
-            }
-        }
-        catch ( com::sun::star::container::NoSuchElementException& )
-        {
-        }
-    }
-}
-
-// XEventListener
-void SAL_CALL FooterMenuController::disposing( const EventObject& ) throw ( RuntimeException )
-{
-    Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
-
-    ResetableGuard aLock( m_aLock );
-    m_xFrame.clear();
-    m_xDispatch.clear();
-    m_xServiceManager.clear();
-    
-    if ( m_xPopupMenu.is() )
-        m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
-    m_xPopupMenu.clear();
-}
-
-// XStatusListener
-void SAL_CALL FooterMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException )
-{
-    Reference< com::sun::star::frame::XModel > xModel;
-
-    if ( Event.State >>= xModel )
-    {
-        ResetableGuard aLock( m_aLock );
-        if ( m_xPopupMenu.is() )
-            fillPopupMenu( xModel, m_xPopupMenu );
-    }
-}
-
-// XMenuListener
-void SAL_CALL FooterMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL FooterMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
-{
-    Reference< css::awt::XPopupMenu >   xPopupMenu;
-    Reference< XDispatch >              xDispatch;
-    Reference< XMultiServiceFactory >   xServiceManager;
-
-    ResetableGuard aLock( m_aLock );
-    xPopupMenu      = m_xPopupMenu;
-    xDispatch       = m_xDispatch;
-    xServiceManager = m_xServiceManager;
-    aLock.unlock();
-
-    if ( xPopupMenu.is() && xDispatch.is() )
-    {
-        VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
-        if ( pPopupMenu )
-        {
-            css::util::URL               aTargetURL;
-            Sequence<PropertyValue>	     aArgs( 1 );
-            Reference< XURLTransformer > xURLTransformer( xServiceManager->createInstance( 
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                        UNO_QUERY );
-
-            {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-                PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-
-                aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId );
-            }
-            
-            xURLTransformer->parseStrict( aTargetURL );
-            if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                UiEventLogHelper(::rtl::OUString::createFromAscii("FooterMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
-            xDispatch->dispatch( aTargetURL, aArgs );
-        }
-    }
-}
-
-void SAL_CALL FooterMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL FooterMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-// XPopupMenuController
-void SAL_CALL FooterMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
-    {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-        
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-            
-        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
-                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                    UNO_QUERY );
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-        
-        com::sun::star::util::URL aTargetURL;
-        aTargetURL.Complete = m_aCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        updatePopupMenu();
-    }    
-}
-        
-void SAL_CALL FooterMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-    
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    Reference< com::sun::star::frame::XModel > xModel( m_xModel );
-    aLock.unlock();
-    
-    if ( !xModel.is() )
-        PopupMenuControllerBase::updatePopupMenu();
-    
-    aLock.lock();
-    if ( m_xPopupMenu.is() && m_xModel.is() )
-        fillPopupMenu( m_xModel, m_xPopupMenu );
-}
-
-// XInitialization
-void SAL_CALL FooterMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    PopupMenuControllerBase::initialize( aArguments );
-}
-
-}
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: footermenucontroller.cxx,v $
+ * $Revision: 1.10.40.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+#include <uielement/footermenucontroller.hxx>
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+#include <threadhelp/resetableguard.hxx>
+#include "services.h"
+#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
+#include <classes/resource.hrc>
+#endif
+#include <classes/fwlresid.hxx>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/awt/XDevice.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/awt/MenuItemStyle.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+
+//_________________________________________________________________________________________________________________
+//	includes of other projects
+//_________________________________________________________________________________________________________________
+
+#ifndef _VCL_MENU_HXX_
+#include <vcl/menu.hxx>
+#endif
+#include <vcl/svapp.hxx>
+#include <vcl/i18nhelp.hxx>
+#include <tools/urlobj.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <dispatch/uieventloghelper.hxx>
+
+//_________________________________________________________________________________________________________________
+//	Defines
+//_________________________________________________________________________________________________________________
+// 
+
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::frame;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::util;
+using namespace com::sun::star::style;
+using namespace com::sun::star::container;
+
+namespace framework
+{
+
+DEFINE_XSERVICEINFO_MULTISERVICE        (   FooterMenuController				    ,
+                                            OWeakObject                             ,
+                                            SERVICENAME_POPUPMENUCONTROLLER		    ,
+                                            IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER
+                                        )
+
+FooterMenuController::FooterMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
+    HeaderMenuController( xServiceManager,true )
+{
+}
+
+FooterMenuController::~FooterMenuController()
+{
+}
+}
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 311776c1b..0a6d92975 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -68,6 +68,9 @@
 #include <classes/fwkresid.hxx>
 #include <dispatch/uieventloghelper.hxx>
 
+#include <xml/menuconfiguration.hxx>
+#include <uielement/menubarmanager.hxx>
+
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -75,6 +78,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::frame::status;
 using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::container;
 
 namespace framework
 {
@@ -326,5 +330,67 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI
    return 0;
 }
 
+MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, USHORT   nID, const rtl::OUString& aCommand, const rtl::OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier )
+{
+}
+
+MenuToolbarController::~MenuToolbarController()
+{
+    try
+    {
+        if ( m_xMenuManager.is() )
+            m_xMenuManager->dispose();
+    }
+    catch( Exception& ) {}
+    if ( pMenu )
+    {
+        delete pMenu;
+        pMenu = NULL;
+    }
+ 
+}
+
+class Toolbarmenu : public PopupMenu
+{
+    public:
+    Toolbarmenu();
+    ~Toolbarmenu();
+};
+
+Toolbarmenu::Toolbarmenu()
+{
+    OSL_TRACE("**** contstructing Toolbarmenu 0x%x", this );
+}
+
+Toolbarmenu::~Toolbarmenu()
+{
+    OSL_TRACE("**** destructing Toolbarmenu 0x%x", this );
+}
+
+void SAL_CALL MenuToolbarController::click() throw (RuntimeException)
+{
+    createPopupWindow();
+}
+
+Reference< XWindow > SAL_CALL 
+MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException)
+{
+    if ( !pMenu ) 
+    {
+        Reference< XDispatchProvider > xDispatch;
+        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
+        pMenu = new Toolbarmenu();
+        m_xMenuManager.set( new MenuBarManager( m_xServiceManager, m_xFrame, xURLTransformer, xDispatch, m_aModuleIdentifier, pMenu, sal_True, sal_True ) );
+        if ( m_xMenuManager.is() )
+        {
+            MenuBarManager* pMgr = dynamic_cast< MenuBarManager* >( m_xMenuManager.get() );
+            pMgr->SetItemContainer( m_xMenuDesc );
+        }
+    }
+
+    ::Rectangle aRect( m_pToolbar->GetItemRect( m_nID ) );
+    pMenu->Execute( m_pToolbar, aRect, POPUPMENU_EXECUTE_DOWN );
+    return NULL; 
+}
 } // namespace
 
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index ac4f1f972..7882abbb9 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -41,7 +41,7 @@
 #ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
 #endif
-#include <classes/fwkresid.hxx>
+#include <classes/fwlresid.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -49,11 +49,11 @@
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //	includes of other projects
@@ -99,8 +99,9 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   HeaderMenuController				    ,
 
 DEFINE_INIT_SERVICE                     (   HeaderMenuController, {} )
 
-HeaderMenuController::HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
+HeaderMenuController::HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool _bFooter ) :
     PopupMenuControllerBase( xServiceManager )
+    ,m_bFooter(_bFooter)
 {
 }
 
@@ -125,16 +126,20 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
     {
         Reference< XNameAccess > xStyleFamilies = xStyleFamiliesSupplier->getStyleFamilies();
         
+        rtl::OUString aCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPageHeader" ));
+        rtl::OUString aHeaderFooterIsOnStr(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsOn" ));
+        if ( m_bFooter )
+        {
+            aCmd = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPageFooter" ));
+            aHeaderFooterIsOnStr = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterIsOn" ));
+        }
+        const rtl::OUString aIsPhysicalStr( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ));
+        const rtl::OUString aDisplayNameStr( RTL_CONSTASCII_USTRINGPARAM( "DisplayName" ));
+        
         try
         {
-            const rtl::OUString aCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPageHeader" ));
-            const rtl::OUString aIsPhysicalStr( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ));
-            const rtl::OUString aDisplayNameStr( RTL_CONSTASCII_USTRINGPARAM( "DisplayName" ));
-            const rtl::OUString aHeaderIsOnStr( RTL_CONSTASCII_USTRINGPARAM( "HeaderIsOn" ));
-
             Reference< XNameContainer > xNameContainer;
-            Any a = xStyleFamilies->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageStyles" )));
-            if ( a >>= xNameContainer )
+            if ( xStyleFamilies->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageStyles" ))) >>= xNameContainer )
             {
                 Sequence< rtl::OUString > aSeqNames = xNameContainer->getElementNames();
 
@@ -151,15 +156,12 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
                     if ( xPropSet.is() )
                     {
                         sal_Bool bIsPhysical( sal_False );
-                        a = xPropSet->getPropertyValue( aIsPhysicalStr );
-                        if (( a >>= bIsPhysical ) && bIsPhysical )
+                        if (( xPropSet->getPropertyValue( aIsPhysicalStr ) >>= bIsPhysical ) && bIsPhysical )
                         {
                             rtl::OUString aDisplayName;
                             sal_Bool      bHeaderIsOn( sal_False );
-                            a = xPropSet->getPropertyValue( aDisplayNameStr );
-                            a >>= aDisplayName;
-                            a = xPropSet->getPropertyValue( aHeaderIsOnStr );
-                            a >>= bHeaderIsOn;
+                            xPropSet->getPropertyValue( aDisplayNameStr ) >>= aDisplayName;
+                            xPropSet->getPropertyValue( aHeaderFooterIsOnStr ) >>= bHeaderIsOn;                            
                             
                             rtl::OUStringBuffer aStrBuf( aCmd );
                             aStrBuf.appendAscii( "?PageStyle:string=");
@@ -195,7 +197,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
                 if ( bAllOneState && ( nCount > 1 ))
                 {
                     // Insert special item for all command
-                    pVCLPopupMenu->InsertItem( ALL_MENUITEM_ID, String( FwkResId( STR_MENU_HEADFOOTALL )), 0, 0 );
+                    pVCLPopupMenu->InsertItem( ALL_MENUITEM_ID, String( FwlResId( STR_MENU_HEADFOOTALL )), 0, 0 );
 
                     rtl::OUStringBuffer aStrBuf( aCmd );
                     aStrBuf.appendAscii( "?On:bool=" );
@@ -247,86 +249,14 @@ void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Even
 }
 
 // XMenuListener
-void SAL_CALL HeaderMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL HeaderMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
-{
-    Reference< css::awt::XPopupMenu >   xPopupMenu;
-    Reference< XDispatch >              xDispatch;
-    Reference< XMultiServiceFactory >   xServiceManager;
-
-    ResetableGuard aLock( m_aLock );
-    xPopupMenu      = m_xPopupMenu;
-    xDispatch       = m_xDispatch;
-    xServiceManager = m_xServiceManager;
-    aLock.unlock();
-
-    if ( xPopupMenu.is() && xDispatch.is() )
-    {
-        VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
-        if ( pPopupMenu )
-        {
-            css::util::URL               aTargetURL;
-            Sequence<PropertyValue>	     aArgs( 1 );
-            Reference< XURLTransformer > xURLTransformer( xServiceManager->createInstance( 
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                        UNO_QUERY );
-
-            {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-                PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-
-                aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId );
-            }
-            
-            xURLTransformer->parseStrict( aTargetURL );
-            if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                UiEventLogHelper(::rtl::OUString::createFromAscii("HeaderMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
-            xDispatch->dispatch( aTargetURL, aArgs );
-        }
-    }
-}
-
-void SAL_CALL HeaderMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL HeaderMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void HeaderMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL)
 {
+    Sequence<PropertyValue>	     aArgs;
+    if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+        UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(m_bFooter ? "FooterMenuController" : "HeaderMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+    _xDispatch->dispatch( aTargetURL, aArgs );
 }
 
-// XPopupMenuController
-void SAL_CALL HeaderMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
-    {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-        
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-            
-        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
-                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                    UNO_QUERY );
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-        
-        com::sun::star::util::URL aTargetURL;
-        aTargetURL.Complete = m_aCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        updatePopupMenu();
-    }    
-}
-        
 void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException)
 {
     ResetableGuard aLock( m_aLock );
@@ -345,10 +275,4 @@ void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::u
         fillPopupMenu( m_xModel, m_xPopupMenu );
 }
 
-// XInitialization
-void SAL_CALL HeaderMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    PopupMenuControllerBase::initialize( aArguments );
-}
-
 }
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 5897f5ea9..542c15bdb 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -168,14 +168,6 @@ throw ( RuntimeException )
 
 // ------------------------------------------------------------------
 
-void SAL_CALL ImageButtonToolbarController::execute( sal_Int16 KeyModifier )
-throw ( RuntimeException )
-{
-    ComplexToolbarController::execute( KeyModifier );
-}
-
-// ------------------------------------------------------------------
-
 void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand )
 {
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
diff --git a/framework/source/uielement/itemcontainer.cxx b/framework/source/uielement/itemcontainer.cxx
index 5e139a114..b0fc5d385 100644
--- a/framework/source/uielement/itemcontainer.cxx
+++ b/framework/source/uielement/itemcontainer.cxx
@@ -55,39 +55,20 @@ namespace framework
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_6     (   ItemContainer                                                   ,
-                            OWeakObject                                                     ,
-                            DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider         ),
-                            DIRECT_INTERFACE( ::com::sun::star::container::XIndexContainer  ),
-                            DIRECT_INTERFACE( ::com::sun::star::lang::XUnoTunnel            ),
-                            DERIVED_INTERFACE( ::com::sun::star::container::XIndexReplace, com::sun::star::container::XIndexContainer ),
-                            DERIVED_INTERFACE( ::com::sun::star::container::XIndexAccess, com::sun::star::container::XIndexReplace    ),
-                            DERIVED_INTERFACE( ::com::sun::star::container::XElementAccess, ::com::sun::star::container::XIndexAccess )
-                        )
 
-DEFINE_XTYPEPROVIDER_6  (   ItemContainer                                   ,
-                            ::com::sun::star::lang::XTypeProvider           ,
-                            ::com::sun::star::container::XIndexContainer    ,
-                            ::com::sun::star::container::XIndexReplace      ,
-                            ::com::sun::star::container::XIndexAccess       ,
-                            ::com::sun::star::container::XElementAccess     ,
-                            ::com::sun::star::lang::XUnoTunnel
-                        )
-
-ItemContainer::ItemContainer( const ShareableMutex& rMutex ) : ::cppu::OWeakObject()
-    ,   m_aShareMutex( rMutex )
+ItemContainer::ItemContainer( const ShareableMutex& rMutex ) : 
+    m_aShareMutex( rMutex )
 {
 }
 
 
-ItemContainer::ItemContainer( const ConstItemContainer& rConstItemContainer, const ShareableMutex& rMutex ) : ::cppu::OWeakObject()
-    ,   m_aShareMutex( rMutex )
+ItemContainer::ItemContainer( const ConstItemContainer& rConstItemContainer, const ShareableMutex& rMutex ) : m_aShareMutex( rMutex )
 {
     copyItemContainer( rConstItemContainer.m_aItemVector, rMutex );
 }
 
-ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer, const ShareableMutex& rMutex ) : ::cppu::OWeakObject()
-    ,   m_aShareMutex( rMutex )
+ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer, const ShareableMutex& rMutex ) : 
+    m_aShareMutex( rMutex )
 {
     if ( rSourceContainer.is() )
     {
@@ -97,8 +78,7 @@ ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer,
             for ( sal_Int32 i = 0; i < nCount; i++ )
             {
                 Sequence< PropertyValue > aPropSeq;
-                Any a = rSourceContainer->getByIndex( i );
-                if ( a >>= aPropSeq )
+                if ( rSourceContainer->getByIndex( i ) >>= aPropSeq )
                 {
                     sal_Int32 nContainerIndex = -1;
                     Reference< XIndexAccess > xIndexAccess;
@@ -132,7 +112,8 @@ ItemContainer::~ItemContainer()
 // private
 void ItemContainer::copyItemContainer( const std::vector< Sequence< PropertyValue > >& rSourceVector, const ShareableMutex& rMutex )
 {
-    for ( sal_uInt32 i = 0; i < rSourceVector.size(); i++ )
+    const sal_uInt32 nCount = rSourceVector.size();
+    for ( sal_uInt32 i = 0; i < nCount; ++i )
     {
         sal_Int32 nContainerIndex = -1;
         Sequence< PropertyValue > aPropSeq( rSourceVector[i] );
@@ -208,7 +189,7 @@ sal_Bool SAL_CALL ItemContainer::hasElements()
 throw ( RuntimeException )
 {
     ShareGuard aLock( m_aShareMutex );
-    return ( m_aItemVector.size() != 0 );
+    return ( !m_aItemVector.empty() );
 }
 
 // XIndexAccess
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index a18839ea0..a2f8ec271 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 
 //_________________________________________________________________________________________________________________
@@ -72,7 +71,7 @@
 #include <svtools/languageoptions.hxx>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <svtools/langtab.hxx>
-#include <classes/fwkresid.hxx>
+#include <classes/fwlresid.hxx>
 
 #ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
@@ -107,6 +106,7 @@ DEFINE_INIT_SERVICE                     (   LanguageSelectionMenuController, {}
 LanguageSelectionMenuController::LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
     PopupMenuControllerBase( xServiceManager ),
     m_bShowMenu( sal_True )
+    ,m_aLangGuessHelper(xServiceManager)
 {
 }
 
@@ -167,129 +167,65 @@ void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureState
 }
 
 // XMenuListener
-void SAL_CALL LanguageSelectionMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
+void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL)
 {
-}
-
-void SAL_CALL LanguageSelectionMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
-{
-    Reference< css::awt::XPopupMenu >   xPopupMenu;
-    Reference< XDispatch >              xDispatch;
-    Reference< XMultiServiceFactory >   xServiceManager;
+    Reference< XDispatch > xDispatch = _xDispatch;
 
-    ResetableGuard aLock( m_aLock );
-    xPopupMenu      = m_xPopupMenu;
-    //xDispatch       = m_xDispatch;
-    xServiceManager = m_xServiceManager;
-    aLock.unlock();
+    if ( aTargetURL.Complete == m_aMenuCommandURL_Font )
+    {	//open format/character dialog for current selection
+        xDispatch = m_xMenuDispatch_Font;
+    }
+    else if ( aTargetURL.Complete == m_aMenuCommandURL_Lang )
+    {	//open language tab-page in tools/options dialog
+        xDispatch = m_xMenuDispatch_Lang;
+    }
+    else if ( aTargetURL.Complete == m_aMenuCommandURL_CharDlgForParagraph )
+    {	//open format/character dialog for current selection
+        xDispatch = m_xMenuDispatch_CharDlgForParagraph;
+    }
 
-    if ( xPopupMenu.is())//&& xDispatch.is()
+    if ( !xDispatch.is() )
     {
-        VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
-        if ( pPopupMenu )
-        {
-            css::util::URL               aTargetURL;
-            Sequence< PropertyValue >	 aArgs;
-            Reference< XURLTransformer > xURLTransformer( xServiceManager->createInstance(
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
-                                                        UNO_QUERY );
-
-            {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-                // Command URL used to dispatch the selected font family name
-                PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-                aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId );
-            }
-
-            if ( aTargetURL.Complete == m_aMenuCommandURL_Font )
-            {	//open format/character dialog for current selection
-                xDispatch = m_xMenuDispatch_Font;
-            }
-            else if ( aTargetURL.Complete == m_aMenuCommandURL_Lang )
-            {	//open language tab-page in tools/options dialog
-                xDispatch = m_xMenuDispatch_Lang;
-            }
-            else if ( aTargetURL.Complete == m_aMenuCommandURL_CharDlgForParagraph )
-            {	//open format/character dialog for current selection
-                xDispatch = m_xMenuDispatch_CharDlgForParagraph;
-            }
-
-            xURLTransformer->parseStrict( aTargetURL );
-            if ( !xDispatch.is() )
-            {
-                Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-                if ( xDispatchProvider.is() )
-                    xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-            }
-
-            if ( xDispatch.is() )
-            {	
-                if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                    UiEventLogHelper(::rtl::OUString::createFromAscii("LanguageSelectionMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
-                xDispatch->dispatch( aTargetURL, aArgs );
-            }
-        }
+        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
+        if ( xDispatchProvider.is() )
+            xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
     }
-}
 
-void SAL_CALL LanguageSelectionMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL LanguageSelectionMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
+    if ( xDispatch.is() )
+    {	
+        Sequence<PropertyValue>	     aArgs;
+        if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+            UiEventLogHelper(::rtl::OUString::createFromAscii("LanguageSelectionMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+        xDispatch->dispatch( aTargetURL, aArgs );
+    }
 }
 
 // XPopupMenuController
-void SAL_CALL LanguageSelectionMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw (RuntimeException)
+void LanguageSelectionMenuController::impl_setPopupMenu()
 {
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
-    {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-
-
-        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
-                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
-                                                    UNO_QUERY );
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
+    Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
 
-        com::sun::star::util::URL aTargetURL;
-        aTargetURL.Complete = m_aCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        // Register for language updates
-        aTargetURL.Complete = m_aLangStatusCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xLanguageDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        // Register for setting languages and opening language dialog
-        aTargetURL.Complete = m_aMenuCommandURL_Lang;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xMenuDispatch_Lang = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        // Register for opening character dialog
-        aTargetURL.Complete = m_aMenuCommandURL_Font;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xMenuDispatch_Font = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        // Register for opening character dialog with preselected paragraph
-        aTargetURL.Complete = m_aMenuCommandURL_CharDlgForParagraph;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xMenuDispatch_CharDlgForParagraph = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+    com::sun::star::util::URL aTargetURL;
 
-        updatePopupMenu();
-    }
+    // Register for language updates
+    aTargetURL.Complete = m_aLangStatusCommandURL;
+    m_xURLTransformer->parseStrict( aTargetURL );
+    m_xLanguageDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+
+    // Register for setting languages and opening language dialog
+    aTargetURL.Complete = m_aMenuCommandURL_Lang;
+    m_xURLTransformer->parseStrict( aTargetURL );
+    m_xMenuDispatch_Lang = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+
+    // Register for opening character dialog
+    aTargetURL.Complete = m_aMenuCommandURL_Font;
+    m_xURLTransformer->parseStrict( aTargetURL );
+    m_xMenuDispatch_Font = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+
+    // Register for opening character dialog with preselected paragraph
+    aTargetURL.Complete = m_aMenuCommandURL_CharDlgForParagraph;
+    m_xURLTransformer->parseStrict( aTargetURL );
+    m_xMenuDispatch_CharDlgForParagraph = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
 }
 
 void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu , const Mode eMode )
@@ -306,9 +242,9 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
     if ( pVCLPopupMenu )
         pPopupMenu = (PopupMenu *)pVCLPopupMenu->GetMenu();
 
-    String aCmd=String::CreateFromAscii("");
-    String aCmd_Dialog=String::CreateFromAscii("");
-    String aCmd_Language=String::CreateFromAscii("");
+    String aCmd;
+    String aCmd_Dialog;
+    String aCmd_Language;
     if( eMode == MODE_SetLanguageSelectionMenu )
     {
         aCmd_Dialog+=String::CreateFromAscii(".uno:FontDialog?Language:string=*");
@@ -332,7 +268,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
     USHORT nItemId = 1;
 
     //1--add current language
-    if(m_aCurLang!=::rtl::OUString::createFromAscii(""))
+    if(m_aCurLang.getLength())
     {
         LangItems[m_aCurLang]=m_aCurLang;
     }
@@ -404,17 +340,18 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
                     break;
                 const Locale& rLocale=rLocales[i];
                 if(IsScriptTypeMatchingToLanguage(m_nScriptType, aLanguageTable.GetType(rLocale.Language)))
-                    LangItems[::rtl::OUString(rLocale.Language)]=::rtl::OUString(rLocale.Language);
+                    LangItems[rLocale.Language] = rLocale.Language;
             }
         }
     }
     std::map< sal_Int16, ::rtl::OUString > LangTable;
 
+    const ::rtl::OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*"));
     for(std::map< ::rtl::OUString, ::rtl::OUString >::const_iterator it = LangItems.begin(); it != LangItems.end(); ++it)
     {
         if(it->first != ::rtl::OUString( aLangTable.GetString( LANGUAGE_NONE ) )&&
-           it->first != ::rtl::OUString::createFromAscii("*") &&
-           it->first != ::rtl::OUString::createFromAscii(""))
+           it->first != sAsterix &&
+           it->first.getLength())
         {
             ++nItemId;
             pPopupMenu->InsertItem( nItemId,it->first);
@@ -432,14 +369,14 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
 
     //7--none
     nItemId++;
-    pPopupMenu->InsertItem( nItemId, String(FwkResId( STR_LANGSTATUS_NONE )) );
+    pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_NONE )) );
     aCmd=aCmd_Language;
     aCmd+=String::CreateFromAscii("LANGUAGE_NONE");
     pPopupMenu->SetItemCommand(nItemId,aCmd);
 
     //More...
     nItemId++;
-    pPopupMenu->InsertItem( nItemId, String(FwkResId( STR_LANGSTATUS_MORE )));
+    pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_MORE )));
     pPopupMenu->SetItemCommand(nItemId,aCmd_Dialog);
 }
 
@@ -451,12 +388,9 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::
     // Force status update to get information about the current languages
     ResetableGuard aLock( m_aLock );
     Reference< XDispatch > xDispatch( m_xLanguageDispatch );
-    Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
-                                                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
-                                                UNO_QUERY );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = m_aLangStatusCommandURL;
-    xURLTransformer->parseStrict( aTargetURL );
+    m_xURLTransformer->parseStrict( aTargetURL );
     aLock.unlock();
 
     if ( xDispatch.is() )
@@ -484,39 +418,19 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::
 // XInitialization
 void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    const rtl::OUString aFrameName( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-    const rtl::OUString aCommandURLName( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
-
     ResetableGuard aLock( m_aLock );
 
     sal_Bool bInitalized( m_bInitialized );
     if ( !bInitalized )
     {
-        PropertyValue       aPropValue;
-        rtl::OUString       aCommandURL;
-        Reference< XFrame > xFrame;
-
-        for ( int i = 0; i < aArguments.getLength(); i++ )
-        {
-            if ( aArguments[i] >>= aPropValue )
-            {
-                if ( aPropValue.Name.equalsAscii( "Frame" ))
-                    aPropValue.Value >>= xFrame;
-                else if ( aPropValue.Name.equalsAscii( "CommandURL" ))
-                    aPropValue.Value >>= aCommandURL;
-            }
-        }
+        PopupMenuControllerBase::initialize(aArguments);
 
-        if ( xFrame.is() && aCommandURL.getLength() )
+        if ( m_bInitialized )
         {
-            m_xFrame							  = xFrame;
-            m_aCommandURL						  = aCommandURL;
-            m_aBaseURL							  = determineBaseURL( aCommandURL );
             m_aLangStatusCommandURL				  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LanguageStatus" ));
             m_aMenuCommandURL_Lang				  = m_aLangStatusCommandURL;
             m_aMenuCommandURL_Font			      = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialog" ));
             m_aMenuCommandURL_CharDlgForParagraph = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialogForParagraph" ));
-            m_bInitialized						  = true;
         }
     }
 }
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index b49f9bf16..a99c60a10 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -100,6 +100,7 @@ LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::R
     svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ),
     m_bShowMenu( sal_True ),
     m_nScriptType( 7 )
+    ,m_aLangGuessHelper(xServiceManager)
 {
 }
 
@@ -123,6 +124,7 @@ void SAL_CALL LangSelectionStatusbarController::release() throw ()
 void SAL_CALL LangSelectionStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
 throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::initialize" );
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
 
     svt::StatusbarController::initialize( aArguments );
@@ -142,6 +144,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
 void SAL_CALL LangSelectionStatusbarController::dispose()
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::dispose" );
     svt::StatusbarController::dispose();
 }
 
@@ -149,6 +152,7 @@ throw (::com::sun::star::uno::RuntimeException)
 void SAL_CALL LangSelectionStatusbarController::disposing( const com::sun::star::lang::EventObject& Source )
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::disposing" );
     svt::StatusbarController::disposing( Source );
 }
 
@@ -157,6 +161,7 @@ throw ( RuntimeException )
     const ::com::sun::star::awt::MouseEvent& )
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::mouseButtonDown" );
     return sal_False;
 }
 
@@ -164,6 +169,7 @@ throw (::com::sun::star::uno::RuntimeException)
     const ::com::sun::star::awt::MouseEvent& )
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::mouseMove" );
     return sal_False;
 }
 
@@ -171,18 +177,21 @@ throw (::com::sun::star::uno::RuntimeException)
     const ::com::sun::star::awt::MouseEvent& )
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::mouseButtonUp" );
     return sal_False;
 }
 
 void LangSelectionStatusbarController::LangMenu()throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::LangMenu" );
     if (!m_bShowMenu)
         return;
 
     //add context menu
-    Reference< awt::XPopupMenu > xPopupMenu( m_xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.awt.PopupMenu" ) ), UNO_QUERY );
+    const static ::rtl::OUString s_sPopupMenu(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.PopupMenu"));
+    Reference< awt::XPopupMenu > xPopupMenu( m_xServiceManager->createInstance( s_sPopupMenu ), UNO_QUERY );
     //sub menu that contains all items except the last two items: Separator + Set Language for Paragraph
-    Reference< awt::XPopupMenu > subPopupMenu(m_xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.awt.PopupMenu" ) ), UNO_QUERY );
+    Reference< awt::XPopupMenu > subPopupMenu(m_xServiceManager->createInstance( s_sPopupMenu ), UNO_QUERY );
 
     std::set< ::rtl::OUString > LangItems;
 
@@ -190,7 +199,7 @@ void LangSelectionStatusbarController::LangMenu()throw (::com::sun::star::uno::R
     USHORT nItemId=1;
 
     //1--add current language
-    if( m_aCurLang != ::rtl::OUString::createFromAscii( "" ) &&
+    if( m_aCurLang != ::rtl::OUString( ) &&
         LANGUAGE_DONTKNOW != aLanguageTable.GetType( m_aCurLang ))
         LangItems.insert( m_aCurLang );
 
@@ -394,6 +403,7 @@ void SAL_CALL LangSelectionStatusbarController::command(
     const ::com::sun::star::uno::Any& /*aData*/ )
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::command" );
     if ( nCommand & ::awt::Command::CONTEXTMENU )
     {
         LangMenu();
@@ -407,18 +417,21 @@ void SAL_CALL LangSelectionStatusbarController::paint(
     ::sal_Int32 nStyle )
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::paint" );
     svt::StatusbarController::paint( xGraphics, rOutputRectangle, nItemId, nStyle );
 }
 
 void SAL_CALL LangSelectionStatusbarController::click()
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::click" );
     LangMenu();
 }
 
 void SAL_CALL LangSelectionStatusbarController::doubleClick()
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::doubleClick" );
     svt::StatusbarController::doubleClick();
 }
 
@@ -426,6 +439,7 @@ throw (::com::sun::star::uno::RuntimeException)
 void SAL_CALL LangSelectionStatusbarController::statusChanged( const FeatureStateEvent& Event )
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::statusChanged" );
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
 
     if ( m_bDisposed )
diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx
index 3e5e83ccf..7158ccae2 100644
--- a/framework/source/uielement/logoimagestatusbarcontroller.cxx
+++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 #include <uielement/logoimagestatusbarcontroller.hxx>
-#include <classes/fwkresid.hxx>
+#include <classes/fwlresid.hxx>
 #include <services.h>
 #include <classes/resource.hrc>
 #include <vos/mutex.hxx>
@@ -64,7 +64,7 @@ DEFINE_INIT_SERVICE                     (   LogoImageStatusbarController, {} )
 LogoImageStatusbarController::LogoImageStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) :
     svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 )
 {
-    Image aImage( FwkResId( RID_IMAGE_STATUSBAR_LOGO ));
+    Image aImage( FwlResId( RID_IMAGE_STATUSBAR_LOGO ));
     m_aLogoImage = aImage;
 }
 
diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx
index 5e8818591..e11bfd122 100644
--- a/framework/source/uielement/logotextstatusbarcontroller.cxx
+++ b/framework/source/uielement/logotextstatusbarcontroller.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 #include <uielement/logotextstatusbarcontroller.hxx>
-#include <classes/fwkresid.hxx>
+#include <classes/fwlresid.hxx>
 #include <services.h>
 #include <classes/resource.hrc>
 #include <vos/mutex.hxx>
@@ -65,7 +65,7 @@ DEFINE_INIT_SERVICE                     (   LogoTextStatusbarController, {} )
 LogoTextStatusbarController::LogoTextStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) :
     svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 )
 {
-    m_aLogoText = String( FwkResId( STR_STATUSBAR_LOGOTEXT ));
+    m_aLogoText = String( FwlResId( STR_STATUSBAR_LOGOTEXT ));
 }
 
 LogoTextStatusbarController::~LogoTextStatusbarController()
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index eed8455db..65385b780 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -32,6 +32,7 @@
 #include "precompiled_framework.hxx"
 
 #include <uielement/macrosmenucontroller.hxx>
+#include <uielement/menubarmanager.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
 #include <classes/resource.hrc>
@@ -42,7 +43,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
@@ -50,6 +50,7 @@
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <dispatch/uieventloghelper.hxx>
+#include "helper/mischelper.hxx"
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -136,60 +137,25 @@ void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) th
 }
 
 // XMenuListener
-void SAL_CALL MacrosMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
+void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatch*/,const ::com::sun::star::util::URL& aTargetURL)
 {
-}
-
-void SAL_CALL MacrosMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
-{
-    Reference< css::awt::XPopupMenu >   xPopupMenu;
-    Reference< XDispatch >              xDispatch;
-    Reference< XMultiServiceFactory >   xServiceManager;
-
-    ResetableGuard aLock( m_aLock );
-    xPopupMenu      = m_xPopupMenu;
-    xDispatch       = m_xDispatch;
-    xServiceManager = m_xServiceManager;
-    aLock.unlock();
-
-    if ( xPopupMenu.is() && xDispatch.is() )
+    // need to requery, since we handle more than one type of Command
+    // if we don't do this only .uno:ScriptOrganizer commands are executed
+    Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
+    Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+    if( xDispatch.is() )
     {
-        VCLXPopupMenu* pVCLPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
-        if ( pVCLPopupMenu )
-        {
-            css::util::URL               aTargetURL;
-            Sequence<PropertyValue>	     aArgs;
-            Reference< XURLTransformer > xURLTransformer( xServiceManager->createInstance( 
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                        UNO_QUERY );
-
-            {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-                PopupMenu* pPopupMenu = (PopupMenu *)pVCLPopupMenu->GetMenu();
-
-                aTargetURL.Complete = pPopupMenu->GetItemCommand( rEvent.MenuId );
-            }
-            
-            xURLTransformer->parseStrict( aTargetURL );
-
-            // need to requery, since we handle more than one type of Command
-            // if we don't do this only .uno:ScriptOrganizer commands are executed
-            xDispatch = m_xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-            if( xDispatch.is() )
-            {
-                ExecuteInfo* pExecuteInfo = new ExecuteInfo;
-                pExecuteInfo->xDispatch     = xDispatch;
-                pExecuteInfo->aTargetURL    = aTargetURL;
-                pExecuteInfo->aArgs         = aArgs; 
-                if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                    UiEventLogHelper(::rtl::OUString::createFromAscii("MacrosMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+        ExecuteInfo* pExecuteInfo = new ExecuteInfo;
+        pExecuteInfo->xDispatch     = xDispatch;
+        pExecuteInfo->aTargetURL    = aTargetURL;
+        //pExecuteInfo->aArgs         = aArgs; 
+        if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+            UiEventLogHelper(::rtl::OUString::createFromAscii("MacrosMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs);
 //                xDispatch->dispatch( aTargetURL, aArgs );
-                Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo ); 
-            }
-            else
-            {
-            }
-        }
+        Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo ); 
+    }
+    else
+    {
     }
 }
 
@@ -210,105 +176,10 @@ IMPL_STATIC_LINK_NOINSTANCE( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo*
    return 0;
 } 
 
-void SAL_CALL MacrosMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL MacrosMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-// XPopupMenuController
-void SAL_CALL MacrosMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
-    {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-        
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-            
-        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( 
-                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), 
-                                                    UNO_QUERY );
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-        
-        m_xDispatchProvider = xDispatchProvider;
-        com::sun::star::util::URL aTargetURL;
-        aTargetURL.Complete = m_aCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        updatePopupMenu();
-    }    
-}
-        
-// XInitialization
-void SAL_CALL MacrosMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    PopupMenuControllerBase::initialize( aArguments );
-}
-
 String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL )
 {
-    String aLabel;
-
-    // Retrieve popup menu labels
-    if ( !m_aModuleIdentifier.getLength() )
-    {
-        Reference< XModuleManager > xModuleManager( ::comphelper::getProcessServiceFactory()->createInstance( 
-                                                        SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
-        Reference< XInterface > xIfac( m_xFrame, UNO_QUERY );
-        m_aModuleIdentifier = xModuleManager->identify( xIfac );
-
-        if ( m_aModuleIdentifier.getLength() > 0 )
-        {
-            Reference< XNameAccess > xNameAccess( ::comphelper::getProcessServiceFactory()->createInstance( 
-                                                        SERVICENAME_UICOMMANDDESCRIPTION ), UNO_QUERY );
-            if ( xNameAccess.is() )
-            {
-                Any a = xNameAccess->getByName( m_aModuleIdentifier );
-                Reference< XNameAccess > xUICommands;
-                a >>= m_xUICommandLabels;
-            }
-        }
-    }
-
-    if ( m_xUICommandLabels.is() )
-    {
-        try
-        {   
-            if ( aCmdURL.Len() > 0 )
-            {
-                rtl::OUString aStr;
-                Sequence< PropertyValue > aPropSeq;
-                Any a( m_xUICommandLabels->getByName( aCmdURL ));
-                if ( a >>= aPropSeq )
-                {
-                    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
-                    {
-                        if ( aPropSeq[i].Name.equalsAscii( "Label" ))
-                        {
-                            aPropSeq[i].Value >>= aStr;
-                            break;
-                        }
-                    }
-                }
-                aLabel = aStr;
-            }
-        }
-        catch ( com::sun::star::uno::Exception& )
-        {
-        }
-    }
-
-    return aLabel;
+    sal_Bool bModuleIdentified = m_aModuleIdentifier.getLength() != 0;
+    return framework::RetrieveLabelFromCommand(aCmdURL,m_xServiceManager,m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,bModuleIdentified,"Label");
 }
 
 void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startItemId )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 07b68c017..0b4620da7 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -36,14 +36,16 @@
 //	my own includes
 //_________________________________________________________________________________________________________________
 #include <uielement/menubarmanager.hxx>
-#include <classes/menuconfiguration.hxx>
+#include <xml/menuconfiguration.hxx>
 #include <classes/bmkmenu.hxx>
 #include <classes/addonmenu.hxx>
 #include <helper/imageproducer.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include "classes/addonsoptions.hxx"
 #include <classes/fwkresid.hxx>
+#include <classes/menumanager.hxx>
 #include <helper/acceleratorinfo.hxx>
+#include <helper/mischelper.hxx>
 #include <classes/menuextensionsupplier.hxx>
 #include <classes/resource.hrc>
 #include <services.h>
@@ -53,6 +55,7 @@
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
@@ -67,11 +70,11 @@
 #endif
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/ui/ImageType.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/ItemStyle.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 
 //_________________________________________________________________________________________________________________
@@ -134,6 +137,7 @@ static const char ITEM_DESCRIPTOR_LABEL[]             = "Label";
 static const char ITEM_DESCRIPTOR_TYPE[]              = "Type";
 static const char ITEM_DESCRIPTOR_MODULEIDENTIFIER[]  = "ModuleIdentifier";
 static const char ITEM_DESCRIPTOR_DISPATCHPROVIDER[]  = "DispatchProvider";
+static const char   ITEM_DESCRIPTOR_STYLE[]         = "Style";
 
 const sal_Int32   LEN_DESCRIPTOR_COMMANDURL           = 10;
 const sal_Int32   LEN_DESCRIPTOR_HELPURL              = 7;
@@ -142,6 +146,7 @@ const sal_Int32   LEN_DESCRIPTOR_LABEL                = 5;
 const sal_Int32   LEN_DESCRIPTOR_TYPE                 = 4;
 const sal_Int32   LEN_DESCRIPTOR_MODULEIDENTIFIER     = 16;
 const sal_Int32   LEN_DESCRIPTOR_DISPATCHPROVIDER     = 16;
+static const sal_Int32 ITEM_DESCRIPTOR_STYLE_LEN       = 5;
 
 const sal_uInt16 ADDONMENU_MERGE_ITEMID_START = 1500;
 
@@ -153,7 +158,7 @@ class StringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XSt
 
         // XStringWidth
         sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString )
-            throw (::com::sun::star::uno::RuntimeException)
+            throw (RuntimeException)
         {
             return aString.getLength();
         }
@@ -172,9 +177,7 @@ namespace framework
 #define SID_HELPMENU			(SID_SFX_START + 410)
 
 #define SFX_REFERER_USER		"private:user"
-#define DESKTOP_SERVICE			::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))
 
-const ::rtl::OUString aSlotString( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
 const ::rtl::OUString aCmdHelpIndex( RTL_CONSTASCII_USTRINGPARAM( ".uno:HelpIndex" ));
 const ::rtl::OUString aCmdToolsMenu( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolsMenu" ));
 const ::rtl::OUString aCmdHelpMenu( RTL_CONSTASCII_USTRINGPARAM( ".uno:HelpMenu" ));
@@ -204,20 +207,23 @@ static sal_Int16 getImageTypeFromBools( sal_Bool bBig, sal_Bool bHighContrast )
 
 // #110897#
 MenuBarManager::MenuBarManager(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+    const Reference< XMultiServiceFactory >& xServiceFactory,
     const Reference< XFrame >& rFrame,
+    const Reference< XURLTransformer >& _xURLTransformer,
     const Reference< XDispatchProvider >& rDispatchProvider,
     const rtl::OUString& rModuleIdentifier,
     Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren )
 : ThreadHelpBase( &Application::GetSolarMutex() ), OWeakObject()
     , m_bDisposed( sal_False )
-    , m_bModuleIdentified( sal_False )
     , m_bRetrieveImages( sal_False )
     , m_bAcceleratorCfg( sal_False )
+    , m_bModuleIdentified( sal_False )
     , m_aListenerContainer( m_aLock.getShareableOslMutex() )
     , mxServiceFactory(xServiceFactory)
+    , m_xURLTransformer(_xURLTransformer)
     , m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::MenuBarManager" );
     m_xPopupMenuControllerRegistration = Reference< ::com::sun::star::frame::XUIControllerRegistration >(
         getServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuControllerFactory" ))),
         UNO_QUERY );
@@ -226,209 +232,59 @@ MenuBarManager::MenuBarManager(
 
 // #110897#
 MenuBarManager::MenuBarManager(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+    const Reference< XMultiServiceFactory >& xServiceFactory,
     const Reference< XFrame >& rFrame,
+    const Reference< XURLTransformer >& _xURLTransformer,
     AddonMenu* pAddonMenu,
     sal_Bool bDelete,
     sal_Bool bDeleteChildren )
 :   ThreadHelpBase( &Application::GetSolarMutex() )
     , OWeakObject()
     , m_bDisposed( sal_False )
-    , m_bModuleIdentified( sal_False )
     , m_bRetrieveImages( sal_True )
     , m_bAcceleratorCfg( sal_False )
+    , m_bModuleIdentified( sal_False )
     , m_aListenerContainer( m_aLock.getShareableOslMutex() )
     , mxServiceFactory(xServiceFactory)
+    , m_xURLTransformer(_xURLTransformer)
     , m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
 {
-    m_bActive			= sal_False;
-    m_bDeleteMenu		= bDelete;
-    m_bDeleteChildren	= bDeleteChildren;
-    m_pVCLMenu			= pAddonMenu;
-    m_xFrame			= rFrame;
-    m_bInitialized		= sal_False;
-    m_bIsBookmarkMenu	= sal_True;
-
-    rtl::OUString aModuleIdentifier;
-    m_xPopupMenuControllerRegistration = Reference< ::com::sun::star::frame::XUIControllerRegistration >(
-        getServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuControllerFactory" ))),
-        UNO_QUERY );
-
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast	= rSettings.GetMenuColor().IsDark();
-
-    Reference< XStatusListener > xStatusListener;
-    Reference< XDispatch > xDispatch;
-    USHORT nItemCount = pAddonMenu->GetItemCount();
-    for ( USHORT i = 0; i < nItemCount; i++ )
-    {
-        USHORT nItemId = pAddonMenu->GetItemId( i );
-
-        ::rtl::OUString aItemCommand = pAddonMenu->GetItemCommand( nItemId );
-        if ( !aItemCommand.getLength() )
-        {
-            aItemCommand = aSlotString;
-            aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId );
-            pAddonMenu->SetItemCommand( nItemId, aItemCommand );
-        }
-
-        PopupMenu* pPopupMenu = pAddonMenu->GetPopupMenu( nItemId );
-        if ( pPopupMenu )
-        {
-            // #110897#
-            Reference< XDispatchProvider > xDispatchProvider;
-            MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), rFrame, xDispatchProvider, aModuleIdentifier, pPopupMenu, bDeleteChildren, bDeleteChildren );
-
-            Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
-
-            // store menu item command as we later have to know which menu is active (see Acivate handler)
-            pSubMenuManager->m_aMenuItemCommand = aItemCommand;
-
-            MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
-                                                        nItemId,
-                                                        xSubMenuManager,
-                                                        xDispatch );
-            m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
-        }
-        else
-        {
-            if ( pAddonMenu->GetItemType( i ) != MENUITEM_SEPARATOR )
-            {
-                MenuConfiguration::Attributes* pAddonAttributes = (MenuConfiguration::Attributes *)(pAddonMenu->GetUserValue( nItemId ));
-                MenuItemHandler* pMenuItemHandler = new MenuItemHandler( nItemId, xStatusListener, xDispatch );
-
-                if ( pAddonAttributes )
-                {
-                    // read additional attributes from attributes struct and AddonMenu implementation will delete all attributes itself!!
-                    pMenuItemHandler->aTargetFrame = pAddonAttributes->aTargetFrame;
-                }
-
-                pMenuItemHandler->aMenuItemURL = aItemCommand;
-                m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
-            }
-        }
-    }
-
-    m_pVCLMenu->SetHighlightHdl( LINK( this, MenuBarManager, Highlight ));
-    m_pVCLMenu->SetActivateHdl( LINK( this, MenuBarManager, Activate ));
-    m_pVCLMenu->SetDeactivateHdl( LINK( this, MenuBarManager, Deactivate ));
-    m_pVCLMenu->SetSelectHdl( LINK( this, MenuBarManager, Select ));
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::MenuBarManager" );
+    Init(rFrame,pAddonMenu,bDelete,bDeleteChildren);
 }
 
-
 // #110897#
 MenuBarManager::MenuBarManager(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+    const Reference< XMultiServiceFactory >& xServiceFactory,
     const Reference< XFrame >& rFrame,
+    const Reference< XURLTransformer >& _xURLTransformer,
     AddonPopupMenu* pAddonPopupMenu,
     sal_Bool bDelete,
     sal_Bool bDeleteChildren )
 :     ThreadHelpBase( &Application::GetSolarMutex() )
     , OWeakObject()
     , m_bDisposed( sal_False )
-    , m_bModuleIdentified( sal_False )
     , m_bRetrieveImages( sal_True )
     , m_bAcceleratorCfg( sal_False )
+    , m_bModuleIdentified( sal_False )
     , m_aListenerContainer( m_aLock.getShareableOslMutex() )
     , mxServiceFactory(xServiceFactory)
+    , m_xURLTransformer(_xURLTransformer)
     , m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
 {
-    m_bActive			= sal_False;
-    m_bDeleteMenu		= bDelete;
-    m_bDeleteChildren	= bDeleteChildren;
-    m_pVCLMenu			= pAddonPopupMenu;
-    m_xFrame			= rFrame;
-    m_bInitialized		= sal_False;
-    m_bIsBookmarkMenu	= sal_True;
-
-    rtl::OUString aModuleIdentifier;
-    m_xPopupMenuControllerRegistration = Reference< ::com::sun::star::frame::XUIControllerRegistration >(
-        getServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuControllerFactory" ))),
-        UNO_QUERY );
-
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast	= rSettings.GetMenuColor().IsDark();
-
-    Reference< XDispatch > xDispatch;
-    Reference< XStatusListener > xStatusListener;
-    USHORT nItemCount = pAddonPopupMenu->GetItemCount();
-    for ( USHORT i = 0; i < nItemCount; i++ )
-    {
-        USHORT nItemId = pAddonPopupMenu->GetItemId( i );
-
-        ::rtl::OUString aItemCommand = pAddonPopupMenu->GetItemCommand( nItemId );
-        if ( !aItemCommand.getLength() )
-        {
-            aItemCommand = aSlotString;
-            aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId );
-            pAddonPopupMenu->SetItemCommand( nItemId, aItemCommand );
-        }
-
-        PopupMenu* pPopupMenu = pAddonPopupMenu->GetPopupMenu( nItemId );
-        if ( pPopupMenu )
-        {
-            // #110897#
-            Reference< XDispatchProvider > xDispatchProvider;
-            MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), rFrame, xDispatchProvider, aModuleIdentifier, pPopupMenu, sal_False, sal_False );
-
-            Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
-
-            // store menu item command as we later have to know which menu is active (see Acivate handler)
-            pSubMenuManager->m_aMenuItemCommand = aItemCommand;
-
-            MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
-                                                        nItemId,
-                                                        xSubMenuManager,
-                                                        xDispatch );
-            m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
-        }
-        else
-        {
-            if ( pAddonPopupMenu->GetItemType( i ) != MENUITEM_SEPARATOR )
-            {
-                MenuConfiguration::Attributes* pAttributes = (MenuConfiguration::Attributes *)(pAddonPopupMenu->GetUserValue( nItemId ));
-                MenuItemHandler* pMenuItemHandler = new MenuItemHandler( nItemId, xStatusListener, xDispatch );
-
-                if ( pAttributes )
-                {
-                    // read additional attributes from attributes struct and BmkMenu implementation will delete all attributes itself!!
-                    pMenuItemHandler->aTargetFrame = pAttributes->aTargetFrame;
-                }
-
-                pMenuItemHandler->aMenuItemURL = aItemCommand;
-                
-                // Check if we have to create a popup menu for a uno based popup menu controller.
-                // We have to set an empty popup menu into our menu structure so the controller also
-                // works with inplace OLE.
-                if ( m_xPopupMenuControllerRegistration.is() &&
-                     m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() ))
-                {
-                    VCLXPopupMenu* pVCLXPopupMenu = new VCLXPopupMenu;
-                    PopupMenu* pCtlPopupMenu = (PopupMenu *)pVCLXPopupMenu->GetMenu();
-                    pAddonPopupMenu->SetPopupMenu( pMenuItemHandler->nItemId, pCtlPopupMenu );
-                    pMenuItemHandler->xPopupMenu = Reference< com::sun::star::awt::XPopupMenu >( (OWeakObject *)pVCLXPopupMenu, UNO_QUERY );
-                    
-                }
-                m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
-            }
-        }
-    }
-
-    m_pVCLMenu->SetHighlightHdl( LINK( this, MenuBarManager, Highlight ));
-    m_pVCLMenu->SetActivateHdl( LINK( this, MenuBarManager, Activate ));
-    m_pVCLMenu->SetDeactivateHdl( LINK( this, MenuBarManager, Deactivate ));
-    m_pVCLMenu->SetSelectHdl( LINK( this, MenuBarManager, Select ));
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::MenuBarManager" );
+    Init(rFrame,pAddonPopupMenu,bDelete,bDeleteChildren,true);
 }
 
-Any SAL_CALL MenuBarManager::queryInterface( const ::com::sun::star::uno::Type & rType ) throw ( RuntimeException )
+Any SAL_CALL MenuBarManager::queryInterface( const Type & rType ) throw ( RuntimeException )
 {
     Any a = ::cppu::queryInterface(
                 rType ,
                 SAL_STATIC_CAST( ::com::sun::star::frame::XStatusListener*, this ),
                 SAL_STATIC_CAST( ::com::sun::star::frame::XFrameActionListener*, this ),
                 SAL_STATIC_CAST( ::com::sun::star::ui::XUIConfigurationListener*, this ),
-                SAL_STATIC_CAST( ::com::sun::star::lang::XEventListener*, (XStatusListener *)this ),
-                SAL_STATIC_CAST( ::com::sun::star::lang::XComponent*, this ),
+                SAL_STATIC_CAST( XEventListener*, (XStatusListener *)this ),
+                SAL_STATIC_CAST( XComponent*, this ),
                 SAL_STATIC_CAST( ::com::sun::star::awt::XSystemDependentMenuPeer*, this ));
 
     if ( a.hasValue() )
@@ -450,8 +306,9 @@ void SAL_CALL MenuBarManager::release() throw()
 }
 
 
-Any SAL_CALL MenuBarManager::getMenuHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw (::com::sun::star::uno::RuntimeException)
+Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::getMenuHandle" );
     ResetableGuard aGuard( m_aLock );
 
     if ( m_bDisposed )
@@ -468,16 +325,16 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const ::com::sun::star::uno::Sequenc
 
         m_pVCLMenu->GetSystemMenuData( &aSystemMenuData );
 #ifdef QUARTZ
-        if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC )
+        if( SystemType == SystemDependent::SYSTEM_MAC )
         {
         }
 #elif (defined WNT)
-        if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32 )
+        if( SystemType == SystemDependent::SYSTEM_WIN32 )
         {
             a <<= (long) aSystemMenuData.hMenu;
         }
 #elif (defined UNX)
-        if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW )
+        if( SystemType == SystemDependent::SYSTEM_XWINDOW )
         {
         }
 #endif
@@ -497,6 +354,7 @@ MenuBarManager::~MenuBarManager()
 
 void MenuBarManager::Destroy()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Destroy" );
     OGuard	aGuard( Application::GetSolarMutex() );
 
     if ( !m_bDisposed )
@@ -529,6 +387,7 @@ void MenuBarManager::Destroy()
 // XComponent
 void SAL_CALL MenuBarManager::dispose() throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::dispose" );
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
     EventObject aEvent( xThis );
@@ -577,6 +436,7 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException )
 
 void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::addEventListener" );
     ResetableGuard aGuard( m_aLock );
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -588,14 +448,16 @@ void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener
 
 void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::removeEventListener" );
     ResetableGuard aGuard( m_aLock );
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
 }
 
 void SAL_CALL MenuBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event )
-throw (::com::sun::star::uno::RuntimeException)
+throw (RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::elementInserted" );
     ResetableGuard aGuard( m_aLock );
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -610,41 +472,24 @@ throw (::com::sun::star::uno::RuntimeException)
 }
 
 void SAL_CALL MenuBarManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event )
-throw (::com::sun::star::uno::RuntimeException)
+throw (RuntimeException)
 {
-    ResetableGuard aGuard( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        return;
-
-    sal_Int16 nImageType = sal_Int16();
-    sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False, m_bWasHiContrast );
-    if (( Event.aInfo >>= nImageType ) &&
-        ( nImageType == nCurrentImageType ))
-        RequestImages();
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::elementRemoved" );
+    elementInserted(Event);
 }
 
 void SAL_CALL MenuBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event )
-throw (::com::sun::star::uno::RuntimeException)
+throw (RuntimeException)
 {
-    ResetableGuard aGuard( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        return;
-
-    sal_Int16 nImageType = sal_Int16();
-    sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False, m_bWasHiContrast );
-    if (( Event.aInfo >>= nImageType ) &&
-        ( nImageType == nCurrentImageType ))
-        RequestImages();
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::elementReplaced" );
+    elementInserted(Event);
 }
 
 // XFrameActionListener
 void SAL_CALL MenuBarManager::frameAction( const FrameActionEvent& Action )
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::frameAction" );
     ResetableGuard aGuard( m_aLock );
 
     if ( m_bDisposed )
@@ -666,6 +511,7 @@ throw ( RuntimeException )
 void SAL_CALL MenuBarManager::statusChanged( const FeatureStateEvent& Event )
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::statusChanged" );
     ::rtl::OUString aFeatureURL = Event.FeatureURL.Complete;
 
     OGuard	aSolarGuard( Application::GetSolarMutex() );
@@ -761,6 +607,7 @@ throw ( RuntimeException )
 // Helper to retrieve own structure from item ID
 MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( USHORT nItemId )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::GetMenuItemHandler" );
     ResetableGuard aGuard( m_aLock );
 
     std::vector< MenuItemHandler* >::iterator p;
@@ -777,10 +624,13 @@ MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( USHORT nIte
 // Helper to set request images flag
 void MenuBarManager::RequestImages()
 {
-    ResetableGuard aGuard( m_aLock );
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::RequestImages" );
+    // must be locked from callee
+    // ResetableGuard aGuard( m_aLock );
 
     m_bRetrieveImages = sal_True;
-    for ( sal_uInt32 i = 0; i < m_aMenuItemHandlerVector.size(); i++ )
+    const sal_uInt32 nCount = m_aMenuItemHandlerVector.size();
+    for ( sal_uInt32 i = 0; i < nCount; ++i )
     {
         MenuItemHandler* pItemHandler = m_aMenuItemHandlerVector[i];
         if ( pItemHandler->xSubMenuManager.is() )
@@ -794,6 +644,7 @@ void MenuBarManager::RequestImages()
 // Helper to reset objects to prepare shutdown
 void MenuBarManager::RemoveListener()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::RemoveListener" );
     ResetableGuard aGuard( m_aLock );
 
     // Check service manager reference. Remove listener can be called due
@@ -802,9 +653,6 @@ void MenuBarManager::RemoveListener()
     Reference< XMultiServiceFactory > xServiceManager = getServiceFactory();
     if ( xServiceManager.is() )
     {
-        Reference< XURLTransformer > xTrans( xServiceManager->createInstance(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-
         std::vector< MenuItemHandler* >::iterator p;
         for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
         {
@@ -813,7 +661,7 @@ void MenuBarManager::RemoveListener()
             {
                 URL aTargetURL;
                 aTargetURL.Complete	= pItemHandler->aMenuItemURL;
-                xTrans->parseStrict( aTargetURL );
+                m_xURLTransformer->parseStrict( aTargetURL );
 
                 pItemHandler->xMenuItemDispatch->removeStatusListener(
                     static_cast< XStatusListener* >( this ), aTargetURL );
@@ -879,6 +727,7 @@ void MenuBarManager::RemoveListener()
 
 void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::disposing(evt)" );
     MenuItemHandler* pMenuItemDisposing = NULL;
 
     ResetableGuard aGuard( m_aLock );
@@ -907,9 +756,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run
         Reference< XMultiServiceFactory > xServiceManager( getServiceFactory() );
         if ( xServiceManager.is() )
         {
-            Reference< XURLTransformer > xTrans( xServiceManager->createInstance(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-            xTrans->parseStrict( aTargetURL );
+            m_xURLTransformer->parseStrict( aTargetURL );
 
             pMenuItemDisposing->xMenuItemDispatch->removeStatusListener(
                 static_cast< XStatusListener* >( this ), aTargetURL );
@@ -944,78 +791,10 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run
         m_xModuleImageManager.clear();
 }
 
-void MenuBarManager::UpdateSpecialWindowMenu( Menu* pMenu )
-{
-    // update window list
-    ::std::vector< ::rtl::OUString > aNewWindowListVector;
-
-    // #110897#
-    // Reference< XDesktop > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( DESKTOP_SERVICE ), UNO_QUERY );
-    Reference< XDesktop > xDesktop( getServiceFactory()->createInstance( DESKTOP_SERVICE ), UNO_QUERY );
-
-    USHORT	nActiveItemId = 0;
-    USHORT	nItemId = START_ITEMID_WINDOWLIST;
-
-    if ( xDesktop.is() )
-    {
-        Reference< XFramesSupplier > xTasksSupplier( xDesktop, UNO_QUERY );
-        Reference< XFrame > xCurrentFrame = xDesktop->getCurrentFrame();
-        Reference< XIndexAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY );
-        sal_Int32 nCount = xList->getCount();
-        for (sal_Int32 i=0; i<nCount; ++i )
-        {
-            Any aItem = xList->getByIndex(i);
-            Reference< XFrame > xFrame;
-            aItem >>= xFrame;
-            if (xFrame.is())
-            {
-                if ( xFrame == xCurrentFrame )
-                    nActiveItemId = nItemId;
-
-                Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
-                if ( pWin && pWin->IsVisible() )
-                {
-                    aNewWindowListVector.push_back( pWin->GetText() );
-                    ++nItemId;
-                }
-            }
-        }
-    }
-
-    {
-        ResetableGuard aGuard( m_aLock );
-
-        int	nItemCount = pMenu->GetItemCount();
-
-        if ( nItemCount > 0 )
-        {
-            // remove all old window list entries from menu
-            sal_uInt16 nPos = pMenu->GetItemPos( START_ITEMID_WINDOWLIST );
-            for ( sal_uInt16 n = nPos; n < pMenu->GetItemCount(); )
-                pMenu->RemoveItem( n );
-
-            if ( pMenu->GetItemType( pMenu->GetItemCount()-1 ) == MENUITEM_SEPARATOR )
-                pMenu->RemoveItem( pMenu->GetItemCount()-1 );
-        }
-
-        if ( aNewWindowListVector.size() > 0 )
-        {
-            // append new window list entries to menu
-            pMenu->InsertSeparator();
-            nItemId = START_ITEMID_WINDOWLIST;
-            for ( sal_uInt32 i = 0; i < aNewWindowListVector.size(); i++ )
-            {
-                pMenu->InsertItem( nItemId, aNewWindowListVector.at( i ), MIB_RADIOCHECK );
-                if ( nItemId == nActiveItemId )
-                    pMenu->CheckItem( nItemId );
-                ++nItemId;
-            }
-        }
-    }
-}
 
 void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::CheckAndAddMenuExtension" );
     static const char REFERENCECOMMAND_AFTER[]          = ".uno:OnlineRegistrationDlg";
     static const char REFERENCECOMMAND_BEFORE[]         = ".uno:About";
 
@@ -1064,6 +843,7 @@ static void lcl_CheckForChildren(Menu* pMenu, USHORT nItemId)
 
 IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Activate" );
     if ( pMenu == m_pVCLMenu )
     {
         // set/unset hiding disabled menu entries
@@ -1090,7 +870,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
         if ( m_aMenuItemCommand == aSpecialWindowMenu ||
              m_aMenuItemCommand == aSlotSpecialWindowMenu ||
              aMenuCommand == aSpecialWindowCommand )
-            UpdateSpecialWindowMenu( pMenu );
+             MenuManager::UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock );
 
         // Check if some modes have changed so we have to update our menu images
         sal_Bool bIsHiContrast = rSettings.GetMenuColor().IsDark();
@@ -1106,48 +886,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
             m_bShowMenuImages	= bShowMenuImages;
             m_bRetrieveImages	= sal_False;
             m_nSymbolsStyle		= nSymbolsStyle;
-            AddonsOptions		aAddonOptions;
-
-            for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
-            {
-                USHORT nId = pMenu->GetItemId( nPos );
-                if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
-                {
-                    if ( bShowMenuImages )
-                    {
-                        sal_Bool		bImageSet = sal_False;
-                        ::rtl::OUString aImageId;
-
-                        ::framework::MenuConfiguration::Attributes* pMenuAttributes =
-                            (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nId );
-
-                        if ( pMenuAttributes )
-                            aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
-
-                        if ( aImageId.getLength() > 0 )
-                        {
-                            Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, bIsHiContrast );
-                            if ( !!aImage )
-                            {
-                                bImageSet = sal_True;
-                                pMenu->SetItemImage( nId, aImage );
-                            }
-                        }
-
-                        if ( !bImageSet )
-                        {
-                            rtl::OUString aMenuItemCommand = pMenu->GetItemCommand( nId );
-                            Image aImage = GetImageFromURL( m_xFrame, aMenuItemCommand, FALSE, bIsHiContrast );
-                            if ( !aImage )
-                                aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE, bIsHiContrast );
-
-                            pMenu->SetItemImage( nId, aImage );
-                        }
-                    }
-                    else
-                        pMenu->SetItemImage( nId, Image() );
-                }
-            }
+            MenuManager::FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages);
         }
 
         // Try to map commands to labels
@@ -1185,10 +924,6 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
 
         URL aTargetURL;
 
-        // #110897#
-        // Reference< XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-        Reference< XURLTransformer > xTrans( getServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-
         // Use provided dispatch provider => fallback to frame as dispatch provider
         Reference< XDispatchProvider > xDispatchProvider;
         if ( m_xDispatchProvider.is() )
@@ -1227,7 +962,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
 
                             aTargetURL.Complete = aItemCommand;
 
-                            xTrans->parseStrict( aTargetURL );
+                            m_xURLTransformer->parseStrict( aTargetURL );
 
                             if ( bHasDisabledEntries )
                             {
@@ -1285,7 +1020,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
                         try
                         {
                             aTargetURL.Complete = pMenuItemHandler->aMenuItemURL;
-                            xTrans->parseStrict( aTargetURL );
+                            m_xURLTransformer->parseStrict( aTargetURL );
 
                             pMenuItemHandler->xMenuItemDispatch->addStatusListener(
                                                                     static_cast< XStatusListener* >( this ), aTargetURL );
@@ -1309,6 +1044,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
 
 IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Deactivate" );
     if ( pMenu == m_pVCLMenu )
     {
         m_bActive = sal_False;
@@ -1344,6 +1080,7 @@ IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,)
 
 IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Select" );
     URL						aTargetURL;
     Sequence<PropertyValue>	aArgs;
     Reference< XDispatch >	xDispatch;
@@ -1363,7 +1100,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
 
                 // #110897#
                 // Reference< XFramesSupplier > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( DESKTOP_SERVICE ), UNO_QUERY );
-                Reference< XFramesSupplier > xDesktop( getServiceFactory()->createInstance( DESKTOP_SERVICE ), UNO_QUERY );
+                Reference< XFramesSupplier > xDesktop( getServiceFactory()->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
 
                 if ( xDesktop.is() )
                 {
@@ -1372,9 +1109,8 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
                     sal_Int32 nCount = xList->getCount();
                     for ( sal_Int32 i=0; i<nCount; ++i )
                     {
-                        Any aItem = xList->getByIndex(i);
                         Reference< XFrame > xFrame;
-                        aItem >>= xFrame;
+                        xList->getByIndex(i) >>= xFrame;
                         if ( xFrame.is() && nTaskId == nCurItemId )
                         {
                             Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
@@ -1392,21 +1128,15 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
                 MenuItemHandler* pMenuItemHandler = GetMenuItemHandler( nCurItemId );
                 if ( pMenuItemHandler && pMenuItemHandler->xMenuItemDispatch.is() )
                 {
-                    // #110897#
-                    // Reference< XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-                    Reference< XURLTransformer > xTrans( getServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-
                     aTargetURL.Complete = pMenuItemHandler->aMenuItemURL;
-                    xTrans->parseStrict( aTargetURL );
+                    m_xURLTransformer->parseStrict( aTargetURL );
 
                     if ( m_bIsBookmarkMenu )
                     {
                         // bookmark menu item selected
-                        Any a;
                         aArgs.realloc( 1 );
                         aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
-                        a <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER ));
-                        aArgs[0].Value = a;
+                        aArgs[0].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER ));
                     }
 
                     xDispatch = pMenuItemHandler->xMenuItemDispatch;
@@ -1435,6 +1165,7 @@ IMPL_LINK( MenuBarManager, Highlight, Menu *, EMPTYARG )
 
 sal_Bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< XURLTransformer >& rTransformer )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::MustBeHidden" );
     if ( pPopupMenu )
     {
         URL               aTargetURL;
@@ -1475,77 +1206,16 @@ sal_Bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< X
 
     return sal_True;
 }
-
 String MenuBarManager::RetrieveLabelFromCommand( const String& aCmdURL )
 {
-    String aLabel;
-
-    // Retrieve popup menu labels
-    if ( !m_xUICommandLabels.is() )
-    {
-        try
-        {
-            if ( !m_bModuleIdentified )
-            {
-                m_bModuleIdentified = sal_True;
-                Reference< XModuleManager > xModuleManager;
-                xModuleManager = Reference< XModuleManager >( getServiceFactory()->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
-
-                try
-                {
-                    m_aModuleIdentifier = xModuleManager->identify( m_xFrame );
-                }
-                catch( Exception& )
-                {
-                }
-            }
-
-            Reference< XNameAccess > xNameAccess( getServiceFactory()->createInstance( SERVICENAME_UICOMMANDDESCRIPTION ), UNO_QUERY );
-            if ( xNameAccess.is() )
-            {
-                Any a = xNameAccess->getByName( m_aModuleIdentifier );
-                Reference< XNameAccess > xUICommands;
-                a >>= m_xUICommandLabels;
-            }
-        }
-        catch ( Exception& )
-        {
-        }
-    }
+    return framework::RetrieveLabelFromCommand(aCmdURL,mxServiceFactory,m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,m_bModuleIdentified,"Label");
+}
 
-    if ( m_xUICommandLabels.is() )
-    {
-        try
-        {
-            if ( aCmdURL.Len() > 0 )
-            {
-                rtl::OUString aStr;
-                Sequence< PropertyValue > aPropSeq;
-                Any a( m_xUICommandLabels->getByName( aCmdURL ));
-                if ( a >>= aPropSeq )
-                {
-                    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
-                    {
-                        if ( aPropSeq[i].Name.equalsAscii( "Label" ))
-                        {
-                            aPropSeq[i].Value >>= aStr;
-                            break;
-                        }
-                    }
-                }
-                aLabel = aStr;
-            }
-        }
-        catch ( com::sun::star::uno::Exception& )
-        {
-        }
-    }
 
-    return aLabel;
-}
 
 sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHandler )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::CreatePopupMenuController" );
     rtl::OUString aItemCommand( pMenuItemHandler->aMenuItemURL );
 
     // Try instanciate a popup menu controller. It is stored in the menu item handler.
@@ -1589,6 +1259,7 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa
 
 void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rFrame, const Reference< XDispatchProvider >& rDispatchProvider, const rtl::OUString& rModuleIdentifier, sal_Bool bDelete, sal_Bool bDeleteChildren )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillMenuManager" );
     m_xFrame			= rFrame;
     m_bActive			= sal_False;
     m_bDeleteMenu		= bDelete;
@@ -1636,17 +1307,11 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
     String      aEmpty;
     sal_Bool    bAccessibilityEnabled( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() );
     USHORT nItemCount = pMenu->GetItemCount();
+    ::rtl::OUString aItemCommand;
+    m_aMenuItemHandlerVector.reserve(nItemCount);
     for ( USHORT i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = pMenu->GetItemId( i );
-
-        ::rtl::OUString aItemCommand = pMenu->GetItemCommand( nItemId );
-        if ( !aItemCommand.getLength() )
-        {
-            aItemCommand = aSlotString;
-            aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId );
-            pMenu->SetItemCommand( nItemId, aItemCommand );
-        }
+        USHORT nItemId = FillItemCommand(aItemCommand,pMenu, i );
 
         // Set module identifier when provided from outside
         if ( rModuleIdentifier.getLength() > 0 )
@@ -1665,6 +1330,11 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
         Reference< XDispatch > xDispatch;
         Reference< XStatusListener > xStatusListener;
         PopupMenu* pPopup = pMenu->GetPopupMenu( nItemId );
+        bool bItemShowMenuImages = m_bShowMenuImages;
+        MenuItemBits nBits =  pMenu->GetItemBits( nItemId );
+        // overwrite the show icons on menu option?
+        if ( nBits )
+            bItemShowMenuImages = ( ( nBits & MIB_ICON ) == MIB_ICON );
         if ( pPopup )
         {
             // Retrieve module identifier from Help Command entry
@@ -1676,8 +1346,9 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
             }
 
             if ( m_xPopupMenuControllerRegistration.is() &&
-                 m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() ) &&
-                 pPopup->GetItemCount() == 0 )
+                 pPopup->GetItemCount() == 0 &&
+                 m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() )
+                  )
             {
                 // Check if we have to create a popup menu for a uno based popup menu controller.
                 // We have to set an empty popup menu into our menu structure so the controller also
@@ -1703,20 +1374,8 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
             {
                 // A special addon popup menu, must be created with a different ctor
                 // #110897#
-                MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), rFrame, (AddonPopupMenu *)pPopup, bDeleteChildren, bDeleteChildren );
-
-                Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
-                rFrame->addFrameActionListener( Reference< XFrameActionListener >( xSubMenuManager, UNO_QUERY ));
-
-                // store menu item command as we later have to know which menu is active (see Activate handler)
-                pSubMenuManager->m_aMenuItemCommand = aItemCommand;
-
-                MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
-                                                            nItemId,
-                                                            xSubMenuManager,
-                                                            xDispatch );
-                pMenuItemHandler->aMenuItemURL = aItemCommand;
-                m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
+                MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), m_xFrame, m_xURLTransformer,(AddonPopupMenu *)pPopup, bDeleteChildren, bDeleteChildren );
+                AddMenu(pSubMenuManager,aItemCommand,nItemId);
             }
             else
             {
@@ -1750,6 +1409,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                         pPopup->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu );
 
                         // Set item command for popup menu to enable it for GetImageFromURL
+                        const ::rtl::OUString aSlotString( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                         ::rtl::OUString aNewItemCommand( aSlotString );
                         aNewItemCommand += ::rtl::OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST );
                         pPopup->SetItemCommand( ITEMID_ADDONLIST, aNewItemCommand );
@@ -1765,20 +1425,12 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                     AddonMenu* pSubMenu = dynamic_cast< AddonMenu* >( pPopup );
                     if ( pSubMenu )
                     {
-                        MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), rFrame, pSubMenu, sal_True, sal_False );
-
-                        Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
-                        rFrame->addFrameActionListener( Reference< XFrameActionListener >( xSubMenuManager, UNO_QUERY ));
-
-                        MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
-                                                                    nItemId,
-                                                                    xSubMenuManager,
-                                                                    xDispatch );
-                        pMenuItemHandler->aMenuItemURL = aItemCommand;
-                        m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
+                        MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), m_xFrame, m_xURLTransformer,pSubMenu, sal_True, sal_False );
+                        AddMenu(pSubMenuManager,aItemCommand,nItemId);
+                        pSubMenuManager->m_aMenuItemCommand = ::rtl::OUString();
 
                         // Set image for the addon popup menu item
-                        if ( m_bShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
+			            if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
                         {
                             Reference< XFrame > xTemp( rFrame );
                             Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE, m_bWasHiContrast );
@@ -1790,25 +1442,14 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                 else
                 {
                     // #110897# MenuBarManager* pSubMenuManager = new MenuBarManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-                    MenuBarManager* pSubMenuMgr = new MenuBarManager( getServiceFactory(), rFrame, rDispatchProvider, aModuleIdentifier, pPopup, bDeleteChildren, bDeleteChildren );
-                    Reference< XStatusListener > xSubMenuMgr( static_cast< OWeakObject *>( pSubMenuMgr ), UNO_QUERY );
-                    rFrame->addFrameActionListener( Reference< XFrameActionListener >( xSubMenuMgr, UNO_QUERY ));
-
-                    // store menu item command as we later have to know which menu is active (see Activate handler)
-                    pSubMenuMgr->m_aMenuItemCommand = aItemCommand;
-
-                    MenuItemHandler* pMenuItemHdl = new MenuItemHandler(
-                                                                nItemId,
-                                                                xSubMenuMgr,
-                                                                xDispatch );
-                    pMenuItemHdl->aMenuItemURL = aItemCommand;
-                    m_aMenuItemHandlerVector.push_back( pMenuItemHdl );
+                    MenuBarManager* pSubMenuMgr = new MenuBarManager( getServiceFactory(), rFrame, m_xURLTransformer,rDispatchProvider, aModuleIdentifier, pPopup, bDeleteChildren, bDeleteChildren );
+                    AddMenu(pSubMenuMgr,aItemCommand,nItemId);
                 }
             }
         }
         else if ( pMenu->GetItemType( i ) != MENUITEM_SEPARATOR )
         {
-            if ( m_bShowMenuImages )
+            if ( bItemShowMenuImages )
             {
                 if ( AddonMenuManager::IsAddonMenuId( nItemId ))
                 {
@@ -1854,10 +1495,9 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                 pMenu->SetPopupMenu( pItemHandler->nItemId, pPopupMenu );
                 pItemHandler->xPopupMenu = Reference< com::sun::star::awt::XPopupMenu >( (OWeakObject *)pVCLXPopupMenu, UNO_QUERY );
 
-                if ( bAccessibilityEnabled )
+                if ( bAccessibilityEnabled && CreatePopupMenuController( pItemHandler ) )
                 {
-                    if ( CreatePopupMenuController( pItemHandler ))
-                        pItemHandler->xPopupMenuController->updatePopupMenu();
+                    pItemHandler->xPopupMenuController->updatePopupMenu();
                 }
 
                 lcl_CheckForChildren(pMenu, pItemHandler->nItemId);
@@ -1887,10 +1527,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
         }
     }
 
-    m_pVCLMenu->SetHighlightHdl( LINK( this, MenuBarManager, Highlight ));
-    m_pVCLMenu->SetActivateHdl( LINK( this, MenuBarManager, Activate ));
-    m_pVCLMenu->SetDeactivateHdl( LINK( this, MenuBarManager, Deactivate ));
-    m_pVCLMenu->SetSelectHdl( LINK( this, MenuBarManager, Select ));
+    SetHdl();
 }
 
 void MenuBarManager::impl_RetrieveShortcutsFromConfiguration(
@@ -1898,6 +1535,7 @@ void MenuBarManager::impl_RetrieveShortcutsFromConfiguration(
     const Sequence< rtl::OUString >& rCommands,
     std::vector< MenuItemHandler* >& aMenuShortCuts )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::impl_RetrieveShortcutsFromConfiguration" );
     if ( rAccelCfg.is() )
     {
         try
@@ -1918,6 +1556,7 @@ void MenuBarManager::impl_RetrieveShortcutsFromConfiguration(
 
 void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuShortCuts )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::RetrieveShortcuts" );
     if ( !m_bModuleIdentified )
     {
         m_bModuleIdentified = sal_True;
@@ -2000,7 +1639,8 @@ void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuSh
 
         KeyCode aEmptyKeyCode;
         Sequence< rtl::OUString > aSeq( aMenuShortCuts.size() );
-        for ( sal_uInt32 i = 0; i < aMenuShortCuts.size(); i++ )
+        const sal_uInt32 nCount = aMenuShortCuts.size();
+        for ( sal_uInt32 i = 0; i < nCount; ++i )
         {
             aSeq[i] = aMenuShortCuts[i]->aMenuItemURL;
             aMenuShortCuts[i]->aKeyCode = aEmptyKeyCode;
@@ -2017,6 +1657,7 @@ void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuSh
 
 void MenuBarManager::RetrieveImageManagers()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::RetrieveImageManagers" );
     if ( !m_xDocImageManager.is() )
     {
         Reference< XController > xController = m_xFrame->getController();
@@ -2041,7 +1682,7 @@ void MenuBarManager::RetrieveImageManagers()
 
     Reference< XModuleManager > xModuleManager;
     if ( m_aModuleIdentifier.getLength() == 0 )
-        xModuleManager = Reference< XModuleManager >( getServiceFactory()->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
+        xModuleManager.set( getServiceFactory()->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
 
     try
     {
@@ -2058,7 +1699,7 @@ void MenuBarManager::RetrieveImageManagers()
                                                                                     SERVICENAME_MODULEUICONFIGURATIONMANAGERSUPPLIER ),
                                                                                   UNO_QUERY );
         Reference< XUIConfigurationManager > xUICfgMgr = xModuleCfgMgrSupplier->getUIConfigurationManager( m_aModuleIdentifier );
-        m_xModuleImageManager = Reference< XImageManager >( xUICfgMgr->getImageManager(), UNO_QUERY );
+        m_xModuleImageManager.set( xUICfgMgr->getImageManager(), UNO_QUERY );
         m_xModuleImageManager->addConfigurationListener( Reference< XUIConfigurationListener >(
                                                             static_cast< OWeakObject* >( this ), UNO_QUERY ));
     }
@@ -2071,6 +1712,7 @@ void MenuBarManager::FillMenuWithConfiguration(
     const Reference< XIndexAccess >&    rItemContainer,
     const Reference< XURLTransformer >& rTransformer )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillMenuWithConfiguration" );
     Reference< XDispatchProvider > xEmptyDispatchProvider;
     MenuBarManager::FillMenu( nId, pMenu, rModuleIdentifier, rItemContainer, xEmptyDispatchProvider );
 
@@ -2106,6 +1748,7 @@ void MenuBarManager::FillMenu(
     const Reference< XIndexAccess >&      rItemContainer,
     const Reference< XDispatchProvider >& rDispatchProvider )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillMenu" );
     // Fill menu bar with container contents
     for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
     {
@@ -2117,7 +1760,7 @@ void MenuBarManager::FillMenu(
         sal_uInt16                      nType = 0;
         Reference< XIndexAccess >       xIndexContainer;
         Reference< XDispatchProvider >  xDispatchProvider( rDispatchProvider );
-
+        sal_Int16 nStyle = 0;
         try
         {
             if ( rItemContainer->getByIndex( n ) >>= aProp )
@@ -2146,6 +1789,8 @@ void MenuBarManager::FillMenu(
                     else if ( aPropName.equalsAsciiL( ITEM_DESCRIPTOR_DISPATCHPROVIDER,
                                                       LEN_DESCRIPTOR_DISPATCHPROVIDER ))
                         aProp[i].Value >>= xDispatchProvider;
+                   else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_STYLE, ITEM_DESCRIPTOR_STYLE_LEN ))
+                        aProp[i].Value >>= nStyle;
                 }
 
                 if ( nType == ::com::sun::star::ui::ItemType::DEFAULT )
@@ -2156,7 +1801,15 @@ void MenuBarManager::FillMenu(
                     sal_Int32 nHelpId = aHelpURL.toInt32();
                     if ( nHelpId > 0 )
                         pMenu->SetHelpId( nId, (USHORT)nHelpId );
-
+                    if ( nStyle )
+                    {
+                        MenuItemBits nBits = pMenu->GetItemBits( nId );
+                        if ( nStyle & ::com::sun::star::ui::ItemStyle::ICON )
+                           nBits |= MIB_ICON;
+                        if ( nStyle & ::com::sun::star::ui::ItemStyle::TEXT )
+                           nBits |= MIB_TEXT;
+                        pMenu->SetItemBits( nId, nBits );
+                    } 
                     if ( xIndexContainer.is() )
                     {
                         PopupMenu* pNewPopupMenu = new PopupMenu;
@@ -2187,7 +1840,7 @@ void MenuBarManager::FillMenu(
                 }
             }
         }
-        catch ( ::com::sun::star::lang::IndexOutOfBoundsException& )
+        catch ( IndexOutOfBoundsException& )
         {
             break;
         }
@@ -2199,6 +1852,7 @@ void MenuBarManager::MergeAddonMenus(
     const MergeMenuInstructionContainer& aMergeInstructionContainer,
     const ::rtl::OUString& rModuleIdentifier )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::MergeAddonMenus" );
     // set start value for the item ID for the new addon menu items
     sal_uInt16 nItemId = ADDONMENU_MERGE_ITEMID_START;
 
@@ -2299,10 +1953,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
         USHORT          nId = 1;
 
         // Fill menu bar with container contents
-        Reference< XURLTransformer > xTrans( getServiceFactory()->createInstance(
-                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
-        FillMenuWithConfiguration( nId, (Menu *)m_pVCLMenu, m_aModuleIdentifier, rItemContainer, xTrans );
+        FillMenuWithConfiguration( nId, (Menu *)m_pVCLMenu, m_aModuleIdentifier, rItemContainer, m_xURLTransformer );
 
         // Refill menu manager again
         Reference< XDispatchProvider > xDispatchProvider;
@@ -2315,6 +1966,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
 
 void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::GetPopupController" );
     String aPopupScheme = String::CreateFromAscii( "vnd.sun.star.popup:" );
 
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
@@ -2360,10 +2012,138 @@ void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController
 }
 
 // #110897#
-const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& MenuBarManager::getServiceFactory()
+const Reference< XMultiServiceFactory >& MenuBarManager::getServiceFactory()
 {
     // #110897#
     return mxServiceFactory;
 }
 
+void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,USHORT _nItemId)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::AddMenu" );
+    Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
+    m_xFrame->addFrameActionListener( Reference< XFrameActionListener >( xSubMenuManager, UNO_QUERY ));
+
+    // store menu item command as we later have to know which menu is active (see Activate handler)
+    pSubMenuManager->m_aMenuItemCommand = _sItemCommand;
+    Reference< XDispatch > xDispatch;
+    MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
+                                                _nItemId,
+                                                xSubMenuManager,
+                                                xDispatch );
+    pMenuItemHandler->aMenuItemURL = _sItemCommand;
+    m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
+}
+
+USHORT MenuBarManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillItemCommand" );
+    USHORT nItemId = _pMenu->GetItemId( _nIndex );
+
+    _rItemCommand = _pMenu->GetItemCommand( nItemId );
+    if ( !_rItemCommand.getLength() )
+    {
+        const static ::rtl::OUString aSlotString( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+        _rItemCommand = aSlotString;
+        _rItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId );
+        _pMenu->SetItemCommand( nItemId, _rItemCommand );
+    }
+    return nItemId;
+}
+void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Init" );
+    m_bActive			= sal_False;
+    m_bDeleteMenu		= bDelete;
+    m_bDeleteChildren	= bDeleteChildren;
+    m_pVCLMenu			= pAddonMenu;
+    m_xFrame			= rFrame;
+    m_bInitialized		= sal_False;
+    m_bIsBookmarkMenu	= sal_True;
+
+    rtl::OUString aModuleIdentifier;
+    m_xPopupMenuControllerRegistration = Reference< ::com::sun::star::frame::XUIControllerRegistration >(
+        getServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuControllerFactory" ))),
+        UNO_QUERY );
+
+    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
+    m_bWasHiContrast	= rSettings.GetMenuColor().IsDark();
+
+    Reference< XStatusListener > xStatusListener;
+    Reference< XDispatch > xDispatch;
+    USHORT nItemCount = pAddonMenu->GetItemCount();
+    ::rtl::OUString aItemCommand;
+    m_aMenuItemHandlerVector.reserve(nItemCount);
+    for ( USHORT i = 0; i < nItemCount; i++ )
+    {
+        USHORT nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
+
+        PopupMenu* pPopupMenu = pAddonMenu->GetPopupMenu( nItemId );
+        if ( pPopupMenu )
+        {
+            // #110897#
+            Reference< XDispatchProvider > xDispatchProvider;
+            MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), rFrame, m_xURLTransformer,xDispatchProvider, aModuleIdentifier, pPopupMenu, _bHandlePopUp ? sal_False : bDeleteChildren, _bHandlePopUp ? sal_False : bDeleteChildren );
+
+            Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
+
+            // store menu item command as we later have to know which menu is active (see Acivate handler)
+            pSubMenuManager->m_aMenuItemCommand = aItemCommand;
+
+            MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
+                                                        nItemId,
+                                                        xSubMenuManager,
+                                                        xDispatch );
+            m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
+        }
+        else
+        {
+            if ( pAddonMenu->GetItemType( i ) != MENUITEM_SEPARATOR )
+            {
+                MenuConfiguration::Attributes* pAddonAttributes = (MenuConfiguration::Attributes *)(pAddonMenu->GetUserValue( nItemId ));
+                MenuItemHandler* pMenuItemHandler = new MenuItemHandler( nItemId, xStatusListener, xDispatch );
+
+                if ( pAddonAttributes )
+                {
+                    // read additional attributes from attributes struct and AddonMenu implementation will delete all attributes itself!!
+                    pMenuItemHandler->aTargetFrame = pAddonAttributes->aTargetFrame;
+                }
+
+                pMenuItemHandler->aMenuItemURL = aItemCommand;
+                if ( _bHandlePopUp )
+                {
+                    // Check if we have to create a popup menu for a uno based popup menu controller.
+                    // We have to set an empty popup menu into our menu structure so the controller also
+                    // works with inplace OLE.
+                    if ( m_xPopupMenuControllerRegistration.is() &&
+                        m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() ))
+                    {
+                        VCLXPopupMenu* pVCLXPopupMenu = new VCLXPopupMenu;
+                        PopupMenu* pCtlPopupMenu = (PopupMenu *)pVCLXPopupMenu->GetMenu();
+                        pAddonMenu->SetPopupMenu( pMenuItemHandler->nItemId, pCtlPopupMenu );
+                        pMenuItemHandler->xPopupMenu = Reference< com::sun::star::awt::XPopupMenu >( (OWeakObject *)pVCLXPopupMenu, UNO_QUERY );
+                        
+                    }
+                }
+                m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
+            }
+        }
+    }
+
+    SetHdl();
+}
+
+void MenuBarManager::SetHdl()
+{
+    m_pVCLMenu->SetHighlightHdl( LINK( this, MenuBarManager, Highlight ));
+    m_pVCLMenu->SetActivateHdl( LINK( this, MenuBarManager, Activate ));
+    m_pVCLMenu->SetDeactivateHdl( LINK( this, MenuBarManager, Deactivate ));
+    m_pVCLMenu->SetSelectHdl( LINK( this, MenuBarManager, Select ));
+
+    if ( !m_xURLTransformer.is() && mxServiceFactory.is() )
+        m_xURLTransformer.set( mxServiceFactory->createInstance(
+                                                                SERVICENAME_URLTRANSFORMER),
+                                                             UNO_QUERY );
+}
+
 }
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index 04511c998..9e497b62c 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -190,7 +190,7 @@ bool MenuBarMerger::CreateSubMenu(
             {
                 pSubMenu->InsertItem( nItemId, rMenuItem.aTitle, 0, MENU_APPEND );
                 pSubMenu->SetItemCommand( nItemId, rMenuItem.aURL );
-                if ( rMenuItem.aSubMenu.size() > 0 )
+                if ( !rMenuItem.aSubMenu.empty() )
                 {
                     PopupMenu* pPopupMenu = new PopupMenu();
                     pSubMenu->SetPopupMenu( nItemId, pPopupMenu );
@@ -231,7 +231,7 @@ bool MenuBarMerger::MergeMenuItems(
             {
                 pMenu->InsertItem( nItemId, rMenuItem.aTitle, 0, nPos+nModIndex+nIndex );
                 pMenu->SetItemCommand( nItemId, rMenuItem.aURL );
-                if ( rMenuItem.aSubMenu.size() > 0 )
+                if ( !rMenuItem.aSubMenu.empty() )
                 {
                     PopupMenu* pSubMenu = new PopupMenu();
                     pMenu->SetPopupMenu( nItemId, pSubMenu );
@@ -342,7 +342,8 @@ bool MenuBarMerger::ProcessFallbackOperation(
         {
             if ( nLevel == nSize-1 )
             {
-                for ( sal_uInt32 i = 0; i < rAddonMenuItems.size(); i++ )
+                const sal_uInt32 nCount = rAddonMenuItems.size();
+                for ( sal_uInt32 i = 0; i < nCount; ++i )
                 {
                     const AddonMenuItem& rMenuItem = rAddonMenuItems[i];
                     if ( IsCorrectContext( rMenuItem.aContext, rModuleIdentifier ))
@@ -429,6 +430,7 @@ void MenuBarMerger::GetSubMenu(
     rSubMenu.clear();
     
     const sal_Int32 nCount = rSubMenuEntries.getLength();
+    rSubMenu.reserve(rSubMenu.size() + nCount);
     for ( sal_Int32 i = 0; i < nCount; i++ )
     {
         const uno::Sequence< beans::PropertyValue >& rMenuEntry = rSubMenuEntries[ i ];
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index aaab3672b..ea4af2ef5 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -37,8 +37,6 @@
 #include <uielement/menubarwrapper.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include <helper/actiontriggerhelper.hxx>
-#include <uielement/constitemcontainer.hxx>
-#include <uielement/rootitemcontainer.hxx>
 #include <services.h>
 
 //_________________________________________________________________________________________________________________
@@ -110,9 +108,8 @@ DEFINE_XTYPEPROVIDER_11 (   MenuBarWrapper                                  ,
 MenuBarWrapper::MenuBarWrapper(
     const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager
     )
-:    UIConfigElementWrapperBase( UIElementType::MENUBAR ),
-     m_bRefreshPopupControllerCache( sal_True ),
-     mxServiceFactory( xServiceManager )
+:    UIConfigElementWrapperBase( UIElementType::MENUBAR,xServiceManager ),
+     m_bRefreshPopupControllerCache( sal_True )
 {
 }
 
@@ -120,13 +117,6 @@ MenuBarWrapper::~MenuBarWrapper()
 {
 }
 
-// #110897#
-const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& MenuBarWrapper::getServiceFactory()
-{
-    // #110897#
-    return mxServiceFactory;
-}
-
 void SAL_CALL MenuBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException)
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -173,7 +163,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
 
             Reference< XModuleManager > xModuleManager;
             xModuleManager = Reference< XModuleManager >(
-                getServiceFactory()->createInstance(
+                m_xServiceFactory->createInstance(
                     SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
 
             try
@@ -184,15 +174,16 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
             {
             }
 
+            Reference< XURLTransformer > xTrans;
             try
             {
+                xTrans.set( m_xServiceFactory->createInstance(
+                                                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+                                                    "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
                 m_xConfigData = m_xConfigSource->getSettings( m_aResourceURL, sal_False );
                 if ( m_xConfigData.is() )
                 {
                     // Fill menubar with container contents
-                    Reference< XURLTransformer > xTrans( getServiceFactory()->createInstance(
-                                                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                    "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
                     USHORT nId = 1;
                     MenuBarManager::FillMenuWithConfiguration( nId, pVCLMenuBar, aModuleIdentifier, m_xConfigData, xTrans );
                 }
@@ -221,8 +212,9 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                 Reference< XDispatchProvider > xDispatchProvider;
 
                 // #110897#
-                MenuBarManager* pMenuBarManager = new MenuBarManager( getServiceFactory(),
+                MenuBarManager* pMenuBarManager = new MenuBarManager( m_xServiceFactory,
                                                                       xFrame,
+                                                                      xTrans,
                                                                       xDispatchProvider,
                                                                       aModuleIdentifier,
                                                                       pVCLMenuBar,
@@ -270,61 +262,15 @@ void SAL_CALL MenuBarWrapper::updateSettings() throw ( RuntimeException )
         }
     }
 }
-
-void SAL_CALL MenuBarWrapper::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException )
+void MenuBarWrapper::impl_fillNewData()
 {
-    ResetableGuard aLock( m_aLock );
+    // Transient menubar => Fill menubar with new data
+    MenuBarManager* pMenuBarManager = static_cast< MenuBarManager *>( m_xMenuBarManager.get() );
 
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( xSettings.is() )
-    {
-        // Create a copy of the data if the container is not const
-        Reference< XIndexReplace > xReplace( xSettings, UNO_QUERY );
-        if ( xReplace.is() )
-            m_xConfigData = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xSettings ) ), UNO_QUERY );
-        else
-            m_xConfigData = xSettings;
-
-        if ( m_xConfigSource.is() && m_bPersistent )
-        {
-            ::rtl::OUString aResourceURL( m_aResourceURL );
-            Reference< XUIConfigurationManager > xUICfgMgr( m_xConfigSource );
-
-            aLock.unlock();
-
-            try
-            {
-                xUICfgMgr->replaceSettings( aResourceURL, m_xConfigData );
-            }
-            catch( NoSuchElementException& )
-            {
-            }
-        }
-        else if ( !m_bPersistent )
-        {
-            // Transient menubar => Fill menubar with new data
-            MenuBarManager* pMenuBarManager = static_cast< MenuBarManager *>( m_xMenuBarManager.get() );
-
-            if ( pMenuBarManager )
-                pMenuBarManager->SetItemContainer( m_xConfigData );
-        }
-    }
+    if ( pMenuBarManager )
+        pMenuBarManager->SetItemContainer( m_xConfigData );
 }
 
-Reference< XIndexAccess > SAL_CALL MenuBarWrapper::getSettings( sal_Bool bWriteable ) throw ( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( bWriteable )
-        return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY );
-    else
-        return m_xConfigData;
-}
 
 void MenuBarWrapper::fillPopupControllerCache()
 {
@@ -333,7 +279,7 @@ void MenuBarWrapper::fillPopupControllerCache()
         MenuBarManager* pMenuBarManager = static_cast< MenuBarManager *>( m_xMenuBarManager.get() );
         if ( pMenuBarManager )
             pMenuBarManager->GetPopupController( m_aPopupControllerCache );
-        if ( m_aPopupControllerCache.size() > 0 )
+        if ( !m_aPopupControllerCache.empty() )
             m_bRefreshPopupControllerCache = sal_False;
     }
 }
@@ -354,7 +300,7 @@ throw (::com::sun::star::uno::RuntimeException)
         throw DisposedException();
 
     fillPopupControllerCache();
-    return ( m_aPopupControllerCache.size() > 0 );
+    return ( !m_aPopupControllerCache.empty() );
 }
 
 // XNameAccess
@@ -374,12 +320,9 @@ throw ( container::NoSuchElementException,
     PopupControllerCache::const_iterator pIter = m_aPopupControllerCache.find( aName );
     if ( pIter != m_aPopupControllerCache.end() )
     {
-        Any a;
         uno::Reference< frame::XDispatchProvider > xDispatchProvider;
         xDispatchProvider = pIter->second.m_xDispatchProvider;
-
-        a = uno::makeAny( xDispatchProvider );
-        return a;
+        return uno::makeAny( xDispatchProvider );
     }
     else
         throw container::NoSuchElementException();
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index aa371399c..c515c7b3a 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -43,7 +43,7 @@
 #include <classes/fwkresid.hxx>
 #include <classes/bmkmenu.hxx>
 #include <helper/imageproducer.hxx>
-#include <classes/menuconfiguration.hxx>
+#include <xml/menuconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -280,7 +280,8 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
             aMenuShortCuts.push_back( aEmptyKeyCode );
         }
         
-        for ( sal_uInt32 i = 0; i < aCmds.size(); i++ )
+        const sal_uInt32 nCount = aCmds.size();
+        for ( sal_uInt32 i = 0; i < nCount; i++ )
             aSeq[i] = aCmds[i];
         
         if ( m_xGlobalAcceleratorManager.is() )
@@ -290,7 +291,8 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
         if ( m_xDocAcceleratorManager.is() )
             retrieveShortcutsFromConfiguration( xGlobalAccelCfg, aSeq, aMenuShortCuts );
 
-        for ( sal_uInt32 i = 0; i < aIds.size(); i++ )
+        const sal_uInt32 nCount2 = aIds.size();
+        for ( sal_uInt32 i = 0; i < nCount2; i++ )
             pPopupMenu->SetAccelKey( USHORT( aIds[i] ), aMenuShortCuts[i] );
 
         // Special handling for "New" menu short-cut should be set at the
@@ -335,10 +337,6 @@ NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::
     m_bAcceleratorCfg( sal_False ),
     m_aTargetFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ))
 {
-    m_xURLTransformer = Reference< XURLTransformer >( 
-                            xServiceManager->createInstance(
-                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
-                            UNO_QUERY );
 }
 
 NewMenuController::~NewMenuController()
@@ -420,10 +418,6 @@ void SAL_CALL NewMenuController::statusChanged( const FeatureStateEvent& ) throw
 }
 
 // XMenuListener
-void SAL_CALL NewMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
 void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
 {
     Reference< css::awt::XPopupMenu > xPopupMenu;
@@ -510,118 +504,66 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R
     }
 }
 
-void SAL_CALL NewMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
 // XPopupMenuController
-void SAL_CALL NewMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
+void NewMenuController::impl_setPopupMenu()
 {
-    ResetableGuard aLock( m_aLock );
+  
+    if ( m_xPopupMenu.is() )
+        fillPopupMenu( m_xPopupMenu );
 
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
+    // Identify module that we are attach to. It's our context that we need to know.
+    Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ),UNO_QUERY );
+    if ( xModuleManager.is() )
     {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-
-        com::sun::star::util::URL aTargetURL;
-        aTargetURL.Complete = m_aCommandURL;
-        m_xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        if ( m_xPopupMenu.is() )
-            fillPopupMenu( m_xPopupMenu );
-
-        // Identify module that we are attach to. It's our context that we need to know.
-        Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ),UNO_QUERY );
-        if ( xModuleManager.is() )
+        try
         {
-            try
+            m_aModuleIdentifier = xModuleManager->identify( m_xFrame );
+            m_bModuleIdentified = sal_True;
+
+            Reference< XNameAccess > xNameAccess( xModuleManager, UNO_QUERY );
+            if (( m_aModuleIdentifier.getLength() > 0 ) && xNameAccess.is() )
             {
-                m_aModuleIdentifier = xModuleManager->identify( m_xFrame );
-                m_bModuleIdentified = sal_True;
+                Sequence< PropertyValue > aSeq;
 
-                Reference< XNameAccess > xNameAccess( xModuleManager, UNO_QUERY );
-                if (( m_aModuleIdentifier.getLength() > 0 ) && xNameAccess.is() )
+                if ( xNameAccess->getByName( m_aModuleIdentifier ) >>= aSeq )
                 {
-                    Sequence< PropertyValue > aSeq;
-
-                    Any a = xNameAccess->getByName( m_aModuleIdentifier );
-                    if ( a >>= aSeq )
+                    for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
                     {
-                        for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
+                        if ( aSeq[y].Name.equalsAscii("ooSetupFactoryEmptyDocumentURL") )
                         {
-                            if ( aSeq[y].Name.equalsAscii("ooSetupFactoryEmptyDocumentURL") )
-                            {
-                                aSeq[y].Value >>= m_aEmptyDocURL;
-                                break;
-                            }
+                            aSeq[y].Value >>= m_aEmptyDocURL;
+                            break;
                         }
                     }
                 }
             }
-            catch ( RuntimeException& e )
-            {
-                throw e;
-            }
-            catch ( Exception& )
-            {
-            }
+        }
+        catch ( RuntimeException& e )
+        {
+            throw e;
+        }
+        catch ( Exception& )
+        {
         }
     }
 }
 
-void SAL_CALL NewMenuController::updatePopupMenu() throw (RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-    if ( m_bDisposed )
-        throw DisposedException();
-}
-
 // XInitialization
 void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    const rtl::OUString aFrameName( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-    const rtl::OUString aCommandURLName( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
-
     ResetableGuard aLock( m_aLock );
 
     sal_Bool bInitalized( m_bInitialized );
     if ( !bInitalized )
     {
-        PropertyValue       aPropValue;
-        rtl::OUString       aCommandURL;
-        Reference< XFrame > xFrame;
+        PopupMenuControllerBase::initialize( aArguments );
 
-        for ( int i = 0; i < aArguments.getLength(); i++ )
+        if ( m_bInitialized )
         {
-            if ( aArguments[i] >>= aPropValue )
-            {
-                if ( aPropValue.Name.equalsAscii( "Frame" ))
-                    aPropValue.Value >>= xFrame;
-                else if ( aPropValue.Name.equalsAscii( "CommandURL" ))
-                    aPropValue.Value >>= aCommandURL;
-            }
-        }
-
-        if ( xFrame.is() && aCommandURL.getLength() )
-        {
-            m_xFrame        = xFrame;
-            m_aCommandURL   = aCommandURL;
-            m_bInitialized  = sal_True;
-
             const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
 
             m_bShowImages   = rSettings.GetUseImagesInMenus();
-        m_bHiContrast   = rSettings.GetMenuColor().IsDark();
+            m_bHiContrast   = rSettings.GetMenuColor().IsDark();
 
             m_bNewMenu      = m_aCommandURL.equalsAscii( ".uno:AddDirect" );
         }
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 3ed7cbb08..accc576f3 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 
 #ifndef _COM_SUN_STAR_EMBED_VERBDATTRIBUTES_HPP_
@@ -156,90 +155,12 @@ void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Even
 }
 
 // XMenuListener
-void SAL_CALL ObjectMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
+void ObjectMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL)
 {
-}
-
-void SAL_CALL ObjectMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
-{
-    Reference< css::awt::XPopupMenu >   xPopupMenu;
-    Reference< XDispatch >              xDispatch;
-    Reference< XMultiServiceFactory >   xServiceManager;
-
-    ResetableGuard aLock( m_aLock );
-    xPopupMenu      = m_xPopupMenu;
-    xDispatch       = m_xDispatch;
-    xServiceManager = m_xServiceManager;
-    aLock.unlock();
-
-    if ( xPopupMenu.is() && xDispatch.is() )
-    {
-        VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
-        if ( pPopupMenu )
-        {
-            css::util::URL               aTargetURL;
-            Sequence<PropertyValue>	     aArgs;
-            Reference< XURLTransformer > xURLTransformer( xServiceManager->createInstance(
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
-                                                        UNO_QUERY );
-
-            {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-                PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-
-                aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId );
-            }
-
-            xURLTransformer->parseStrict( aTargetURL );
-            if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                UiEventLogHelper(::rtl::OUString::createFromAscii("ObjectMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
-            xDispatch->dispatch( aTargetURL, aArgs );
-        }
-    }
-}
-
-void SAL_CALL ObjectMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL ObjectMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-// XPopupMenuController
-void SAL_CALL ObjectMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
-    {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-
-        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
-                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
-                                                    UNO_QUERY );
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-
-        com::sun::star::util::URL aTargetURL;
-        aTargetURL.Complete = m_aCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        updatePopupMenu();
-    }
-}
-
-// XInitialization
-void SAL_CALL ObjectMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    PopupMenuControllerBase::initialize( aArguments );
+    Sequence<PropertyValue>	     aArgs;
+    if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+        UiEventLogHelper(::rtl::OUString::createFromAscii("ObjectMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+    _xDispatch->dispatch( aTargetURL, aArgs );
 }
 
 }
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 42b92f69c..914acc33d 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -49,9 +49,8 @@
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/util/XStringWidth.hpp>
-
+#include <com/sun/star/lang/DisposedException.hpp>
 //_________________________________________________________________________________________________________________
 //	includes of other projects
 //_________________________________________________________________________________________________________________
@@ -171,11 +170,12 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
             }
         }
 
-        if ( m_aRecentFilesItems.size() > 0 )
+        if ( !m_aRecentFilesItems.empty() )
         {
             URL aTargetURL;
 
-            for ( sal_uInt32 i = 0; i < m_aRecentFilesItems.size(); i++ )
+            const sal_uInt32 nCount = m_aRecentFilesItems.size();
+            for ( sal_uInt32 i = 0; i < nCount; i++ )
             {
                 char menuShortCut[5] = "~n: ";
 
@@ -300,14 +300,10 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
     if (( nIndex >= 0 ) && 
         ( nIndex < sal::static_int_cast<sal_Int32>( m_aRecentFilesItems.size() )))
     {
-        Reference< XURLTransformer > xURLTransformer( xServiceManager->createInstance(
-                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
-                                                    UNO_QUERY );
-
         const RecentFile& rRecentFile = m_aRecentFilesItems[ nIndex ];
 
         aTargetURL.Complete = rRecentFile.aURL;
-        xURLTransformer->parseStrict( aTargetURL );
+        m_xURLTransformer->parseStrict( aTargetURL );
 
         aArgsList.realloc( NUM_OF_PICKLIST_ARGS );
         aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
@@ -327,14 +323,14 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
                 aFilterOptions = aFilter.copy( nPos+1 );
 
             aArgsList[2].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterOptions" ));
-            aArgsList[2].Value = makeAny( aFilterOptions );
+            aArgsList[2].Value <<= aFilterOptions;
 
             aFilter = aFilter.copy( 0, nPos-1 );
             aArgsList.realloc( ++NUM_OF_PICKLIST_ARGS );
         }
 
         aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
-        aArgsList[NUM_OF_PICKLIST_ARGS-1].Value = makeAny( aFilter );
+        aArgsList[NUM_OF_PICKLIST_ARGS-1].Value <<= aFilter;
 
         xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_default"), 0 );
     }
@@ -376,11 +372,6 @@ void SAL_CALL RecentFilesMenuController::statusChanged( const FeatureStateEvent&
     m_bDisabled = !Event.IsEnabled;
 }
 
-// XMenuListener
-void SAL_CALL RecentFilesMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
 void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
 {
     Reference< css::awt::XPopupMenu > xPopupMenu;
@@ -408,43 +399,14 @@ void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEve
 void SAL_CALL RecentFilesMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     ResetableGuard aLock( m_aLock );
-    if ( m_xPopupMenu.is() )
-        fillPopupMenu( m_xPopupMenu );
-}
-
-void SAL_CALL RecentFilesMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
+    impl_setPopupMenu();
 }
 
 // XPopupMenuController
-void SAL_CALL RecentFilesMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
+void RecentFilesMenuController::impl_setPopupMenu()
 {
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
-    {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-
-        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
-                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
-                                                    UNO_QUERY );
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-
-        com::sun::star::util::URL aTargetURL;
-        aTargetURL.Complete = m_aCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        if ( m_xPopupMenu.is() )
-            fillPopupMenu( m_xPopupMenu );
-    }
+    if ( m_xPopupMenu.is() )
+        fillPopupMenu( m_xPopupMenu );
 }
 
 void SAL_CALL RecentFilesMenuController::updatePopupMenu() throw (RuntimeException)
@@ -456,12 +418,9 @@ void SAL_CALL RecentFilesMenuController::updatePopupMenu() throw (RuntimeExcepti
 
     Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
     Reference< XDispatch > xDispatch( m_xDispatch );
-    Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
-                                                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
-                                                UNO_QUERY );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = m_aCommandURL;
-    xURLTransformer->parseStrict( aTargetURL );
+    m_xURLTransformer->parseStrict( aTargetURL );
     aLock.unlock();
 
     // Add/remove status listener to get a status update once
@@ -490,18 +449,6 @@ throw( RuntimeException )
         return Reference< XDispatch >();
 }
 
-Sequence< Reference< XDispatch > > SAL_CALL RecentFilesMenuController::queryDispatches( 
-    const Sequence< DispatchDescriptor >& lDescriptor ) 
-throw( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-    
-    if ( m_bDisposed )
-        throw DisposedException();
-    
-    return PopupMenuControllerBase::queryDispatches( lDescriptor );
-}
-
 // XDispatch
 void SAL_CALL RecentFilesMenuController::dispatch( 
     const URL& aURL, 
@@ -560,12 +507,6 @@ throw( RuntimeException )
     PopupMenuControllerBase::removeStatusListener( xControl, aURL );
 }
 
-// XInitialization
-void SAL_CALL RecentFilesMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    PopupMenuControllerBase::initialize( aArguments );
-}
-
 IMPL_STATIC_LINK_NOINSTANCE( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile*, pLoadRecentFile )
 {
     try
diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/uielement/rootitemcontainer.cxx
index f57b7b494..6275f2a7a 100644
--- a/framework/source/uielement/rootitemcontainer.cxx
+++ b/framework/source/uielement/rootitemcontainer.cxx
@@ -146,8 +146,7 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo
             for ( sal_Int32 i = 0; i < nCount; i++ )
             {
                 Sequence< PropertyValue > aPropSeq;
-                Any a = rSourceContainer->getByIndex( i );
-                if ( a >>= aPropSeq )
+                if ( rSourceContainer->getByIndex( i ) >>= aPropSeq )
                 {
                     sal_Int32 nContainerIndex = -1;
                     Reference< XIndexAccess > xIndexAccess;
@@ -181,7 +180,9 @@ RootItemContainer::~RootItemContainer()
 // private
 void RootItemContainer::copyItemContainer( const std::vector< Sequence< PropertyValue > >& rSourceVector )
 {
-    for ( sal_uInt32 i = 0; i < rSourceVector.size(); i++ )
+    const sal_uInt32 nCount = rSourceVector.size();
+    m_aItemVector.reserve(nCount);
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
     {
         sal_Int32 nContainerIndex = -1;
         Sequence< PropertyValue > aPropSeq( rSourceVector[i] );
@@ -256,7 +257,7 @@ sal_Bool SAL_CALL RootItemContainer::hasElements()
 throw ( RuntimeException )
 {
     ShareGuard aLock( m_aShareMutex );
-    return ( m_aItemVector.size() != 0 );
+    return ( !m_aItemVector.empty() );
 }
 
 // XIndexAccess
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index d5700398d..12aa429d8 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -255,59 +255,20 @@ throw ( RuntimeException )
 }
 
 // ------------------------------------------------------------------
-
-void SAL_CALL SpinfieldToolbarController::execute( sal_Int16 KeyModifier )
-throw ( RuntimeException )
+Sequence<PropertyValue> SpinfieldToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
-    Reference< XDispatch >       xDispatch;
-    Reference< XURLTransformer > xURLTransformer;
-    ::rtl::OUString                     aCommandURL;
-    ::rtl::OUString                     aSpinfieldText;
-    ::com::sun::star::util::URL  aTargetURL;
-    bool                         bFloat( false );
-
-    {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    Sequence<PropertyValue> aArgs( 2 );
+    ::rtl::OUString aSpinfieldText = m_pSpinfieldControl->GetText();
 
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        if ( m_bInitialized &&
-             m_xFrame.is() &&
-             m_xServiceManager.is() &&
-             m_aCommandURL.getLength() )
-        {
-            xURLTransformer = m_xURLTransformer;
-            xDispatch = getDispatchFromCommand( m_aCommandURL );
-            aCommandURL = m_aCommandURL;
-            aTargetURL = getInitializedURL();
-            aSpinfieldText = m_pSpinfieldControl->GetText();
-            bFloat = m_bFloat;
-        }
-    }
-
-    if ( xDispatch.is() && aTargetURL.Complete.getLength() > 0 )
-    {
-        Sequence<PropertyValue>   aArgs( 2 );
-
-        // Add key modifier to argument list
-        aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
-        aArgs[0].Value <<= KeyModifier;
-        aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value" ));
-
-        // Use correct type
-        if ( bFloat )
-            aArgs[1].Value <<= aSpinfieldText.toDouble();
-        else
-            aArgs[1].Value <<= aSpinfieldText.toInt32();
-
-        // Execute dispatch asynchronously
-        ExecuteInfo* pExecuteInfo = new ExecuteInfo;
-        pExecuteInfo->xDispatch     = xDispatch;
-        pExecuteInfo->aTargetURL    = aTargetURL;
-        pExecuteInfo->aArgs         = aArgs;
-        Application::PostUserEvent( STATIC_LINK(0, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo );
-    }
+    // Add key modifier to argument list
+    aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
+    aArgs[0].Value <<= KeyModifier;
+    aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value" ));
+    if ( m_bFloat )
+        aArgs[1].Value <<= aSpinfieldText.toDouble();
+    else
+        aArgs[1].Value <<= aSpinfieldText.toInt32();
+    return aArgs;
 }
 
 // ------------------------------------------------------------------
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 718d4b9f8..6c1cdf44f 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -46,6 +46,7 @@
 #include "services.h"
 #include "general.h"
 #include "properties.h"
+#include <helper/mischelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -148,15 +149,16 @@ StatusBarManager::StatusBarManager(
     ThreadHelpBase( &Application::GetSolarMutex() ),
     OWeakObject(),
     m_bDisposed( sal_False ),
-    m_bModuleIdentified( sal_False ),
     m_bFrameActionRegistered( sal_False ),
     m_bUpdateControllers( sal_False ),
+    m_bModuleIdentified( sal_False ),
     m_pStatusBar( pStatusBar ),
     m_aResourceName( rResourceName ),
     m_xFrame( rFrame ),
     m_aListenerContainer( m_aLock.getShareableOslMutex() ),
     m_xServiceManager( rServiceManager )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::StatusBarManager" );
 
     if ( m_xServiceManager.is() )
         m_xStatusbarControllerRegistration = uno::Reference< css::frame::XUIControllerRegistration >( 
@@ -173,6 +175,7 @@ StatusBarManager::~StatusBarManager()
 
 StatusBar* StatusBarManager::GetStatusBar() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::GetStatusBar" );
     ResetableGuard aGuard( m_aLock );
     return m_pStatusBar;
 }
@@ -180,6 +183,7 @@ StatusBar* StatusBarManager::GetStatusBar() const
 void StatusBarManager::frameAction( const frame::FrameActionEvent& Action )
 throw ( uno::RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::frameAction" );
     ResetableGuard aGuard( m_aLock );
     if ( Action.Action == frame::FrameAction_CONTEXT_CHANGED )
         UpdateControllers();
@@ -187,6 +191,7 @@ throw ( uno::RuntimeException )
 
 void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::disposing" );
     {
         ResetableGuard aGuard( m_aLock );
         if ( m_bDisposed )
@@ -207,6 +212,7 @@ void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) thr
 // XComponent
 void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::dispose" );
     uno::Reference< lang::XComponent > xThis( 
         static_cast< OWeakObject* >(this), uno::UNO_QUERY );
 
@@ -245,6 +251,7 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException )
 
 void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::addEventListener" );
     ResetableGuard aGuard( m_aLock );
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -257,6 +264,7 @@ void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XE
 
 void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::removeEventListener" );
     m_aListenerContainer.removeInterface( ::getCppuType( 
         ( const uno::Reference< lang::XEventListener >* ) NULL ), xListener );
 }
@@ -264,6 +272,7 @@ void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang:
 // XUIConfigurationListener
 void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::elementInserted" );
     ResetableGuard aGuard( m_aLock );
     
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -273,6 +282,7 @@ void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEve
 
 void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::elementRemoved" );
     ResetableGuard aGuard( m_aLock );
     
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -282,6 +292,7 @@ void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEven
     
 void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::elementReplaced" );
     ResetableGuard aGuard( m_aLock );
     
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -291,10 +302,12 @@ void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEve
 
 void StatusBarManager::UpdateControllers()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::UpdateControllers" );
     if ( !m_bUpdateControllers )
     {
         m_bUpdateControllers = sal_True;
-        for ( sal_uInt32 n = 0; n < m_aControllerVector.size(); n++ )
+        const sal_uInt32 nCount = m_aControllerVector.size();
+        for ( sal_uInt32 n = 0; n < nCount; n++ )
         {
             try
             {
@@ -312,12 +325,14 @@ void StatusBarManager::UpdateControllers()
 
 void StatusBarManager::RemoveControllers()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::RemoveControllers" );
     ResetableGuard aGuard( m_aLock );
 
     if ( m_bDisposed )
         return;
 
-    for ( sal_uInt32 n = 0; n < m_aControllerVector.size(); n++ )
+    const sal_uInt32 nCount = m_aControllerVector.size();
+    for ( sal_uInt32 n = 0; n < nCount; n++ )
     {
         try
         {
@@ -336,71 +351,12 @@ void StatusBarManager::RemoveControllers()
 
 rtl::OUString StatusBarManager::RetrieveLabelFromCommand( const rtl::OUString& aCmdURL )
 {
-    rtl::OUString aLabel;
-
-    // Retrieve short bubble help
-    if ( !m_bModuleIdentified )
-    {
-        uno::Reference< css::frame::XModuleManager > xModuleManager( 
-            m_xServiceManager->createInstance( 
-                SERVICENAME_MODULEMANAGER ), uno::UNO_QUERY_THROW );
-        uno::Reference< uno::XInterface > xIfac( m_xFrame, uno::UNO_QUERY );
-        try
-        {
-            m_bModuleIdentified = sal_True;
-            m_aModuleIdentifier = xModuleManager->identify( xIfac );
-
-            if ( m_aModuleIdentifier.getLength() > 0 )
-            {
-                uno::Reference< container::XNameAccess > xNameAccess( 
-                    m_xServiceManager->createInstance( 
-                        SERVICENAME_UICOMMANDDESCRIPTION ), uno::UNO_QUERY );
-                if ( xNameAccess.is() )
-                {
-                    uno::Any a = xNameAccess->getByName( m_aModuleIdentifier );
-                    uno::Reference< container::XNameAccess > xUICommands;
-                    a >>= m_xUICommandLabels;
-                }
-            }
-        }
-        catch ( uno::Exception& )
-        {
-        }
-    }
-
-    if ( m_xUICommandLabels.is() )
-    {
-        try
-        {   
-            if ( aCmdURL.getLength() > 0 )
-            {
-                rtl::OUString aStr;
-                uno::Sequence< beans::PropertyValue > aPropSeq;
-                uno::Any a( m_xUICommandLabels->getByName( aCmdURL ));
-                if ( a >>= aPropSeq )
-                {
-                    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
-                    {
-                        if ( aPropSeq[i].Name.equalsAscii( "Name" ))
-                        {
-                            aPropSeq[i].Value >>= aStr;
-                            break;
-                        }
-                    }
-                }
-                aLabel = aStr;
-            }
-        }
-        catch ( uno::Exception& )
-        {
-        }
-    }
-
-    return aLabel;
+    return framework::RetrieveLabelFromCommand(aCmdURL,m_xServiceManager,m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,m_bModuleIdentified,"Name");
 }
 
 void StatusBarManager::CreateControllers()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::CreateControllers" );
     uno::Reference< lang::XMultiComponentFactory > xStatusbarControllerFactory( m_xStatusbarControllerRegistration, uno::UNO_QUERY );
     uno::Reference< uno::XComponentContext > xComponentContext;
     uno::Reference< beans::XPropertySet > xProps( m_xServiceManager, uno::UNO_QUERY );
@@ -499,6 +455,7 @@ void StatusBarManager::CreateControllers()
     
 void StatusBarManager::AddFrameActionListener()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::AddFrameActionListener" );
     if ( !m_bFrameActionRegistered && m_xFrame.is() )
     {
         m_bFrameActionRegistered = sal_True;
@@ -527,6 +484,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
 
     for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
     {
+        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::FillStatusBar" );
         uno::Sequence< beans::PropertyValue >   aProp;
         rtl::OUString                           aCommandURL;
         rtl::OUString                           aHelpURL;
@@ -604,10 +562,12 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
 
 void StatusBarManager::StateChanged( StateChangedType )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::StateChanged" );
 }
 
 void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::DataChanged" );
     ResetableGuard aGuard( m_aLock );
     
     if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS	        ) ||
@@ -616,12 +576,10 @@ void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt )
          ( rDCEvt.GetType() == DATACHANGED_DISPLAY	        ))	&&
          ( rDCEvt.GetFlags() & SETTINGS_STYLE		        ))
     {
-        css::uno::Any a;
         css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
         css::uno::Reference< css::beans::XPropertySet > xPropSet( m_xFrame, css::uno::UNO_QUERY );
         if ( xPropSet.is() )
-            a = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
-        a >>= xLayoutManager;
+            xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xLayoutManager;
         if ( xLayoutManager.is() )
         {
             aGuard.unlock();
@@ -632,6 +590,7 @@ void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt )
 
 void StatusBarManager::UserDraw( const UserDrawEvent& rUDEvt )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::UserDraw" );
     ResetableGuard aGuard( m_aLock );
     
     if ( m_bDisposed )
@@ -659,6 +618,7 @@ void StatusBarManager::UserDraw( const UserDrawEvent& rUDEvt )
 
 void StatusBarManager::Command( const CommandEvent& rEvt )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::Command" );
     ResetableGuard aGuard( m_aLock );
     
     if ( m_bDisposed )
@@ -684,74 +644,43 @@ void StatusBarManager::Command( const CommandEvent& rEvt )
 
 void StatusBarManager::MouseMove( const MouseEvent& rMEvt )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::MouseMove" );
+    MouseButton(rMEvt,&frame::XStatusbarController::mouseMove);
+}
+void StatusBarManager::MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL frame::XStatusbarController::*_pMethod )(const ::com::sun::star::awt::MouseEvent&))
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::MouseButton" );
     ResetableGuard aGuard( m_aLock );
     
-    if ( m_bDisposed )
-        return;
-    
-    USHORT nId = m_pStatusBar->GetItemId( rMEvt.GetPosPixel() );
-    if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
+    if ( !m_bDisposed )
     {
-        uno::Reference< frame::XStatusbarController > xController( 
-            m_aControllerVector[nId-1], uno::UNO_QUERY );
-        if ( xController.is() )
+        USHORT nId = m_pStatusBar->GetItemId( rMEvt.GetPosPixel() );
+        if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
         {
-            ::com::sun::star::awt::MouseEvent aMouseEvent;
-            aMouseEvent.Buttons = rMEvt.GetButtons();
-            aMouseEvent.X = rMEvt.GetPosPixel().X();
-            aMouseEvent.Y = rMEvt.GetPosPixel().Y();
-            aMouseEvent.ClickCount = rMEvt.GetClicks();
-            xController->mouseMove( aMouseEvent );
-        }
+            uno::Reference< frame::XStatusbarController > xController( 
+                m_aControllerVector[nId-1], uno::UNO_QUERY );
+            if ( xController.is() )
+            {
+                ::com::sun::star::awt::MouseEvent aMouseEvent;
+                aMouseEvent.Buttons = rMEvt.GetButtons();
+                aMouseEvent.X = rMEvt.GetPosPixel().X();
+                aMouseEvent.Y = rMEvt.GetPosPixel().Y();
+                aMouseEvent.ClickCount = rMEvt.GetClicks();
+                (xController.get()->*_pMethod)( aMouseEvent);
+            }
+        } // if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
     }
 }
-
 void StatusBarManager::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    ResetableGuard aGuard( m_aLock );
-    
-    if ( m_bDisposed )
-        return;
-
-    USHORT nId = m_pStatusBar->GetItemId( rMEvt.GetPosPixel() );
-    if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
-    {
-        uno::Reference< frame::XStatusbarController > xController( 
-            m_aControllerVector[nId-1], uno::UNO_QUERY );
-        if ( xController.is() )
-        {
-            ::com::sun::star::awt::MouseEvent aMouseEvent;
-            aMouseEvent.Buttons = rMEvt.GetButtons();
-            aMouseEvent.X = rMEvt.GetPosPixel().X();
-            aMouseEvent.Y = rMEvt.GetPosPixel().Y();
-            aMouseEvent.ClickCount = rMEvt.GetClicks();
-            xController->mouseButtonDown( aMouseEvent );
-        }
-    }
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::MouseButtonDown" );
+    MouseButton(rMEvt,&frame::XStatusbarController::mouseButtonDown);
 }
 
 void StatusBarManager::MouseButtonUp( const MouseEvent& rMEvt )
 {
-    ResetableGuard aGuard( m_aLock );
-    
-    if ( m_bDisposed )
-        return;
-
-    USHORT nId = m_pStatusBar->GetItemId( rMEvt.GetPosPixel() );
-    if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
-    {
-        uno::Reference< frame::XStatusbarController > xController( 
-            m_aControllerVector[nId-1], uno::UNO_QUERY );
-        if ( xController.is() )
-        {
-            ::com::sun::star::awt::MouseEvent aMouseEvent;
-            aMouseEvent.Buttons = rMEvt.GetButtons();
-            aMouseEvent.X = rMEvt.GetPosPixel().X();
-            aMouseEvent.Y = rMEvt.GetPosPixel().Y();
-            aMouseEvent.ClickCount = rMEvt.GetClicks();
-            xController->mouseButtonUp( aMouseEvent );
-        }
-    }
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::MouseButtonUp" );
+    MouseButton(rMEvt,&frame::XStatusbarController::mouseButtonUp);
 }
 
 IMPL_LINK( StatusBarManager, Click, StatusBar*, EMPTYARG )
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index ed9d7a191..d016dbac1 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -80,8 +80,7 @@ namespace framework
 StatusBarWrapper::StatusBarWrapper(
     const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager
     )
- :	UIConfigElementWrapperBase( UIElementType::STATUSBAR ),
-    m_xServiceFactory( xServiceManager )
+ :	UIConfigElementWrapperBase( UIElementType::STATUSBAR,xServiceManager )
 {
 }
 
@@ -187,53 +186,6 @@ void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException )
     }
 }
 
-void SAL_CALL StatusBarWrapper::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( xSettings.is() )
-    {
-        // Create a copy of the data if the container is not const
-        Reference< XIndexReplace > xReplace( xSettings, UNO_QUERY );
-        if ( xReplace.is() )
-            m_xConfigData = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xSettings ) ), UNO_QUERY );
-        else
-            m_xConfigData = xSettings;
-
-        if ( m_xConfigSource.is() && m_bPersistent )
-        {
-            ::rtl::OUString aResourceURL( m_aResourceURL );
-            Reference< XUIConfigurationManager > xUICfgMgr( m_xConfigSource );
-
-            aLock.unlock();
-
-            try
-            {
-                xUICfgMgr->replaceSettings( aResourceURL, m_xConfigData );
-            }
-            catch( NoSuchElementException& )
-            {
-            }
-        }
-    }
-}
-
-Reference< XIndexAccess > SAL_CALL StatusBarWrapper::getSettings( sal_Bool bWriteable ) throw ( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( bWriteable )
-        return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY );
-    else
-        return m_xConfigData;
-}
-
 Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( RuntimeException )
 {
     ResetableGuard aLock( m_aLock );
diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
index 0563d8470..5c11a87b2 100644
--- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx
+++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
@@ -53,24 +53,10 @@ using namespace com::sun::star::beans;
 namespace framework
 {
 
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_2     (   StatusIndicatorInterfaceWrapper                                 ,
-                            cppu::OWeakObject                                               ,
-                            DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider         ),
-                            DIRECT_INTERFACE( ::com::sun::star::task::XStatusIndicator      )
-                        )
-
-DEFINE_XTYPEPROVIDER_2  (   StatusIndicatorInterfaceWrapper             ,
-                            ::com::sun::star::lang::XTypeProvider       ,
-                            ::com::sun::star::task::XStatusIndicator
-                        )
 
 StatusIndicatorInterfaceWrapper::StatusIndicatorInterfaceWrapper(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rStatusIndicatorImpl ) :
-    ::cppu::OWeakObject()
-    ,   m_xStatusIndicatorImpl( rStatusIndicatorImpl )
+    m_xStatusIndicatorImpl( rStatusIndicatorImpl )
 {
 }
 
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index d8a168249..b803edb1c 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -117,52 +117,16 @@ throw ( RuntimeException )
 }
 
 // ------------------------------------------------------------------
-
-void SAL_CALL ToggleButtonToolbarController::execute( sal_Int16 KeyModifier )
-throw ( RuntimeException )
+Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
-    Reference< XDispatch >       xDispatch;
-    Reference< XURLTransformer > xURLTransformer;
-    ::rtl::OUString                     aCommandURL;
-    ::rtl::OUString                     aSelectedText;
-    ::com::sun::star::util::URL  aTargetURL;
-
-    {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-        if ( m_bDisposed )
-            throw DisposedException();
-
-        if ( m_bInitialized &&
-             m_xFrame.is() &&
-             m_xServiceManager.is() &&
-             m_aCommandURL.getLength() )
-        {
-            xURLTransformer = m_xURLTransformer;
-            xDispatch = getDispatchFromCommand( m_aCommandURL );
-            aCommandURL = m_aCommandURL;
-            aTargetURL = getInitializedURL();
-            aSelectedText = m_aCurrentSelection;
-        }
-    }
-
-    if ( xDispatch.is() && aTargetURL.Complete.getLength() > 0 )
-    {
-        Sequence<PropertyValue>   aArgs( 2 );
-
-        // Add key modifier to argument list
-        aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
-        aArgs[0].Value <<= KeyModifier;
-        aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
-        aArgs[1].Value <<= aSelectedText;
-
-        // Execute dispatch asynchronously
-        ExecuteInfo* pExecuteInfo = new ExecuteInfo;
-        pExecuteInfo->xDispatch     = xDispatch;
-        pExecuteInfo->aTargetURL    = aTargetURL;
-        pExecuteInfo->aArgs         = aArgs;
-        Application::PostUserEvent( STATIC_LINK(0, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo );
-    }
+    Sequence<PropertyValue> aArgs( 2 );
+
+    // Add key modifier to argument list
+    aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
+    aArgs[0].Value <<= KeyModifier;
+    aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
+    aArgs[1].Value <<= m_aCurrentSelection;
+    return aArgs;
 }
 
 // ------------------------------------------------------------------
@@ -178,8 +142,8 @@ throw (::com::sun::star::uno::RuntimeException)
     {
         // create popup menu
         PopupMenu aPopup;
-
-        for ( sal_uInt32 i = 0; i < m_aDropdownMenuList.size(); i++ )
+        const sal_uInt32 nCount = m_aDropdownMenuList.size();
+        for ( sal_uInt32 i = 0; i < nCount; i++ )
         {
             rtl::OUString aLabel( m_aDropdownMenuList[i] );
             aPopup.InsertItem( sal_uInt16( i+1 ), aLabel );
diff --git a/framework/source/uielement/toolbar.cxx b/framework/source/uielement/toolbar.cxx
index e56a992f8..eed4602e9 100644
--- a/framework/source/uielement/toolbar.cxx
+++ b/framework/source/uielement/toolbar.cxx
@@ -36,6 +36,7 @@
 //_________________________________________________________________________________________________________________
 #include <uielement/toolbar.hxx>
 #include <uielement/toolbarmanager.hxx>
+#include <rtl/logfile.hxx>
 
 namespace framework
 {
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index c55179231..7488a86a1 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -60,7 +60,6 @@
 //	interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/ui/ItemType.hpp>
-#include <com/sun/star/frame/XToolbarController.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XDockableWindow.hpp>
@@ -72,7 +71,6 @@
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/ui/XUIElementSettings.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
@@ -101,6 +99,7 @@
 #include <rtl/logfile.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/cmdoptions.hxx>
+#include <boost/bind.hpp>
 
 //_________________________________________________________________________________________________________________
 //	namespaces
@@ -202,8 +201,7 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager
     {
         try
         {
-            Any a( xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) );
-            a >>= xLayoutManager;
+            xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xLayoutManager;
         }
         catch ( RuntimeException& )
         {
@@ -271,10 +269,16 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
         ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( m_pToolBar );
 
     if ( m_xServiceManager.is() )
+    {
         m_xToolbarControllerRegistration = Reference< XUIControllerRegistration >(
                                                     m_xServiceManager->createInstance( SERVICENAME_TOOLBARCONTROLLERFACTORY ),
                                                 UNO_QUERY );
 
+        m_xURLTransformer.set( m_xServiceManager->createInstance(
+                                                                SERVICENAME_URLTRANSFORMER),
+                                                             UNO_QUERY );
+    }
+
     m_pToolBar->SetSelectHdl( LINK( this, ToolBarManager, Select) );
     m_pToolBar->SetActivateHdl( LINK( this, ToolBarManager, Activate) );
     m_pToolBar->SetDeactivateHdl( LINK( this, ToolBarManager, Deactivate) );
@@ -701,56 +705,15 @@ void SAL_CALL ToolBarManager::removeEventListener( const Reference< XEventListen
 // XUIConfigurationListener
 void SAL_CALL ToolBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ResetableGuard aGuard( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        return;
-
-    Reference< XNameAccess > xNameAccess;
-    sal_Int16                nImageType = sal_Int16();
-    sal_Int16                nCurrentImageType = getImageTypeFromBools(
-                                                    SvtMiscOptions().AreCurrentSymbolsLarge(),
-                                                    m_bIsHiContrast );
-
-    if (( Event.aInfo >>= nImageType ) &&
-        ( nImageType == nCurrentImageType ) &&
-        ( Event.Element >>= xNameAccess ))
-    {
-        sal_Int16 nImageInfo( 1 );
-        Reference< XInterface > xIfacDocImgMgr( m_xDocImageManager, UNO_QUERY );
-        if ( xIfacDocImgMgr == Event.Source )
-            nImageInfo = 0;
-
-        Sequence< rtl::OUString > aSeq = xNameAccess->getElementNames();
-        for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
-        {
-            // Check if we have commands which have an image. We stored for every command
-            // from which image manager it got its image. Use only images from this
-            // notification if stored nImageInfo >= current nImageInfo!
-            rtl::OUString aCommandURL = aSeq[i];
-            CommandToInfoMap::iterator pIter = m_aCommandMap.find( aCommandURL );
-            if ( pIter != m_aCommandMap.end() && ( pIter->second.nImageInfo >= nImageInfo ))
-            {
-                Reference< XGraphic > xGraphic;
-                if ( xNameAccess->getByName( aSeq[i] ) >>= xGraphic )
-                {
-                    Image aImage( xGraphic );
-                    m_pToolBar->SetItemImage( pIter->second.nId, aImage );
-                    if ( pIter->second.aIds.size() > 0 )
-                    {
-                        for ( sal_uInt32 j=0; j < pIter->second.aIds.size(); j++ )
-                            m_pToolBar->SetItemImage( pIter->second.aIds[j], aImage );
-                    }
-                }
-                pIter->second.nImageInfo = nImageInfo;
-            }
-        }
-    }
+    impl_elementChanged(false,Event);
 }
 
 void SAL_CALL ToolBarManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
+    impl_elementChanged(true,Event);
+}
+void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::ui::ConfigurationEvent& Event )
+{
     ResetableGuard aGuard( m_aLock );
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -775,80 +738,50 @@ void SAL_CALL ToolBarManager::elementRemoved( const ::com::sun::star::ui::Config
         Sequence< rtl::OUString > aSeq = xNameAccess->getElementNames();
         for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
         {
-            CommandToInfoMap::const_iterator pIter = m_aCommandMap.find( aSeq[i] );
+            CommandToInfoMap::iterator pIter = m_aCommandMap.find( aSeq[i] );
             if ( pIter != m_aCommandMap.end() && ( pIter->second.nImageInfo >= nImageInfo ))
             {
-                Image aImage;
-                if (( pIter->second.nImageInfo == 0 ) && ( pIter->second.nImageInfo == nImageInfo ))
+                if ( _bRemove )
                 {
-                    // Special case: An image from the document image manager has been removed.
-                    // It is possible that we have a image at our module image manager. Before
-                    // we can remove our image we have to ask our module image manager.
-                    Sequence< rtl::OUString > aCmdURLSeq( 1 );
-                    Sequence< Reference< XGraphic > > aGraphicSeq;
-                    aCmdURLSeq[0] = pIter->first;
-                    aGraphicSeq = m_xModuleImageManager->getImages( nImageType, aCmdURLSeq );
-                    aImage = Image( aGraphicSeq[0] );
-                }
+                    Image aImage;
+                    if (( pIter->second.nImageInfo == 0 ) && ( pIter->second.nImageInfo == nImageInfo ))
+                    {
+                        // Special case: An image from the document image manager has been removed.
+                        // It is possible that we have a image at our module image manager. Before
+                        // we can remove our image we have to ask our module image manager.
+                        Sequence< rtl::OUString > aCmdURLSeq( 1 );
+                        Sequence< Reference< XGraphic > > aGraphicSeq;
+                        aCmdURLSeq[0] = pIter->first;
+                        aGraphicSeq = m_xModuleImageManager->getImages( nImageType, aCmdURLSeq );
+                        aImage = Image( aGraphicSeq[0] );
+                    }
 
-                m_pToolBar->SetItemImage( pIter->second.nId, aImage );
-                if ( pIter->second.aIds.size() > 0 )
+                    setToolBarImage(aImage,pIter);
+                } // if ( _bRemove )
+                else
                 {
-                    for ( sal_uInt32 j=0; j < pIter->second.aIds.size(); j++ )
-                        m_pToolBar->SetItemImage( pIter->second.aIds[j], aImage );
+                    Reference< XGraphic > xGraphic;
+                    if ( xNameAccess->getByName( aSeq[i] ) >>= xGraphic )
+                    {
+                        Image aImage( xGraphic );
+                        setToolBarImage(aImage,pIter);
+                    }
+                    pIter->second.nImageInfo = nImageInfo;
                 }
             }
         }
     }
 }
+void ToolBarManager::setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter)
+{
+    const ::std::vector< USHORT >& _rIDs = _pIter->second.aIds;
+    m_pToolBar->SetItemImage( _pIter->second.nId, _aImage );
+    ::std::for_each(_rIDs.begin(),_rIDs.end(),::boost::bind(&ToolBar::SetItemImage,m_pToolBar,_1,_aImage));
+}
 
 void SAL_CALL ToolBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ResetableGuard aGuard( m_aLock );
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( m_bDisposed )
-        return;
-
-    Reference< XNameAccess > xNameAccess;
-    sal_Int16                nImageType = sal_Int16();
-    sal_Int16                nCurrentImageType = getImageTypeFromBools(
-                                                    SvtMiscOptions().AreCurrentSymbolsLarge(),
-                                                    m_bIsHiContrast );
-
-    if (( Event.aInfo >>= nImageType ) &&
-        ( nImageType == nCurrentImageType ) &&
-        ( Event.Element >>= xNameAccess ))
-    {
-        sal_Int16 nImageInfo( 1 );
-        Reference< XInterface > xIfacDocImgMgr( m_xDocImageManager, UNO_QUERY );
-        if ( xIfacDocImgMgr == Event.Source )
-            nImageInfo = 0;
-
-        Sequence< rtl::OUString > aSeq = xNameAccess->getElementNames();
-        for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
-        {
-            // Check if we have commands which have an image. We stored for every command
-            // from which image manager it got its image. Use only images from this
-            // notification if stored nImageInfo >= current nImageInfo!
-            CommandToInfoMap::iterator pIter = m_aCommandMap.find( aSeq[i] );
-            if ( pIter != m_aCommandMap.end() && ( pIter->second.nImageInfo >= nImageInfo ))
-            {
-                Reference< XGraphic > xGraphic;
-                if ( xNameAccess->getByName( aSeq[i] ) >>= xGraphic )
-                {
-                    Image aImage( xGraphic );
-                    m_pToolBar->SetItemImage( pIter->second.nId, aImage );
-                    if ( pIter->second.aIds.size() > 0 )
-                    {
-                        for ( sal_uInt32 j=0; j < pIter->second.aIds.size(); j++ )
-                            m_pToolBar->SetItemImage( pIter->second.aIds[j], aImage );
-                    }
-                }
-                pIter->second.nImageInfo = nImageInfo;
-            }
-        }
-    }
+    impl_elementChanged(false,Event);
 }
 
 void ToolBarManager::RemoveControllers()
@@ -907,9 +840,7 @@ void ToolBarManager::RemoveControllers()
                 Reference< XNameAccess > xNameAccess( m_xServiceManager->createInstance( SERVICENAME_UICOMMANDDESCRIPTION ), UNO_QUERY );
                 if ( xNameAccess.is() )
                 {
-                    Any a = xNameAccess->getByName( m_aModuleIdentifier );
-                    Reference< XNameAccess > xUICommands;
-                    a >>= m_xUICommandLabels;
+                    xNameAccess->getByName( m_aModuleIdentifier ) >>= m_xUICommandLabels;
                 }
             }
         }
@@ -926,8 +857,7 @@ void ToolBarManager::RemoveControllers()
             {
                 rtl::OUString aStr;
                 Sequence< PropertyValue > aPropSeq;
-                Any a( m_xUICommandLabels->getByName( aCmdURL ));
-                if ( a >>= aPropSeq )
+                if ( m_xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq )
                 {
                     for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
                     {
@@ -957,8 +887,6 @@ void ToolBarManager::CreateControllers()
     Reference< XComponentContext > xComponentContext;
     Reference< XPropertySet > xProps( m_xServiceManager, UNO_QUERY );
     Reference< XWindow > xToolbarWindow = VCLUnoHelper::GetInterface( m_pToolBar );
-    Reference< css::util::XURLTransformer > xTrans( m_xServiceManager->createInstance(
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), css::uno::UNO_QUERY );
 
     css::util::URL	    aURL;
     sal_Bool            bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED );
@@ -986,7 +914,7 @@ void ToolBarManager::CreateControllers()
         if ( bHasDisabledEntries )
         {
             aURL.Complete = aCommandURL;
-            xTrans->parseStrict( aURL );
+            m_xURLTransformer->parseStrict( aURL );
             if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aURL.Path ))
             {
                 m_aControllerMap[ nId ] = xController;
@@ -1004,22 +932,22 @@ void ToolBarManager::CreateControllers()
                 std::vector< Any > aPropertyVector;
 
                 aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
-                aPropValue.Value    = makeAny( m_aModuleIdentifier );
+                aPropValue.Value    <<= m_aModuleIdentifier;
                 aPropertyVector.push_back( makeAny( aPropValue ));
                 aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-                aPropValue.Value    = makeAny( m_xFrame );
+                aPropValue.Value    <<= m_xFrame;
                 aPropertyVector.push_back( makeAny( aPropValue ));
                 aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ServiceManager" ));
-                aPropValue.Value    = makeAny( m_xServiceManager );
+                aPropValue.Value    <<= m_xServiceManager;
                 aPropertyVector.push_back( makeAny( aPropValue ));
                 aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ));
-                aPropValue.Value    = makeAny( xToolbarWindow );
+                aPropValue.Value    <<= xToolbarWindow;
                 aPropertyVector.push_back( makeAny( aPropValue ));
 
                 if ( nWidth > 0 )
                 {
                     aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ));
-                    aPropValue.Value    = makeAny( nWidth );
+                    aPropValue.Value    <<= nWidth;
                     aPropertyVector.push_back( makeAny( aPropValue ));
                 }
 
@@ -1057,8 +985,13 @@ void ToolBarManager::CreateControllers()
                 }
                 else
                 {
+                    MenuDescriptionMap::iterator it = m_aMenuMap.find( nId );
+                    if ( it == m_aMenuMap.end() )
                     xController = Reference< XStatusListener >(
                         new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL ));
+                    else
+                        xController = Reference< XStatusListener >(
+                            new MenuToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL, m_aModuleIdentifier, m_aMenuMap[ nId ] ));
                 }
             }
             else if ( pController )
@@ -1102,21 +1035,21 @@ void ToolBarManager::CreateControllers()
                 std::vector< Any > aPropertyVector;
 
                 aPropValue.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-                aPropValue.Value = makeAny( m_xFrame );
+                aPropValue.Value <<= m_xFrame;
                 aPropertyVector.push_back( makeAny( aPropValue ));
                 aPropValue.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
-                aPropValue.Value = makeAny( aCommandURL );
+                aPropValue.Value <<= aCommandURL;
                 aPropertyVector.push_back( makeAny( aPropValue ));
                 aPropValue.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ServiceManager" ));
-                aPropValue.Value = makeAny( m_xServiceManager );
+                aPropValue.Value <<= m_xServiceManager;
                 aPropertyVector.push_back( makeAny( aPropValue ));
                 aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ));
-                aPropValue.Value = makeAny( xToolbarWindow );
+                aPropValue.Value <<= xToolbarWindow;
                 aPropertyVector.push_back( makeAny( aPropValue ));
                 if ( nWidth > 0 )
                 {
                     aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ));
-                    aPropValue.Value    = makeAny( nWidth );
+                    aPropValue.Value    <<= nWidth;
                     aPropertyVector.push_back( makeAny( aPropValue ));
                 }
 
@@ -1190,6 +1123,10 @@ sal_uInt16 ToolBarManager::ConvertStyleToToolboxItemBits( sal_Int32 nStyle )
         nItemBits |= TIB_REPEAT;
     if ( nStyle & ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY )
         nItemBits |= TIB_DROPDOWNONLY;
+    if ( nStyle & ::com::sun::star::ui::ItemStyle::TEXT )
+        nItemBits |= TIB_TEXT_ONLY;
+    if ( nStyle & ::com::sun::star::ui::ItemStyle::ICON )
+        nItemBits |= TIB_ICON_ONLY;
 
     return nItemBits;
 }
@@ -1255,6 +1192,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
     m_aControllerMap.clear();
     m_aCommandMap.clear();
 
+    m_aMenuMap.clear();
+
     CommandInfo aCmdInfo;
     for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
     {
@@ -1268,6 +1207,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
         sal_Bool                    bIsVisible( sal_True );
         sal_uInt32                  nStyle( 0 );
 
+        Reference< XIndexAccess >   aMenuDesc;
         try
         {
             if ( rItemContainer->getByIndex( n ) >>= aProp )
@@ -1290,6 +1230,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                         aProp[i].Value >>= nWidth;
                     else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_STYLE, ITEM_DESCRIPTOR_STYLE_LEN ))
                         aProp[i].Value >>= nStyle;
+                    else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_CONTAINER, ITEM_DESCRIPTOR_CONTAINER_LEN ))
+                        aProp[i].Value >>= aMenuDesc;
                 }
 
                 if (( nType == ::com::sun::star::ui::ItemType::DEFAULT ) && ( aCommandURL.getLength() > 0 ))
@@ -1297,13 +1239,14 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                     ::rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL ));
 
                     sal_uInt16 nItemBits = ConvertStyleToToolboxItemBits( nStyle );
-                    OSL_TRACE("** style for command url %s is 0x%x", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8  ).getStr(), nItemBits );
+                    if ( aMenuDesc.is() )
+                        m_aMenuMap[ nId ] = aMenuDesc;
                     m_pToolBar->InsertItem( nId, aString, nItemBits );
                     m_pToolBar->SetItemCommand( nId, aCommandURL );
                     if ( aTooltip.getLength() )
                         m_pToolBar->SetQuickHelpText( nId, aTooltip );
                     else
-                        m_pToolBar->SetQuickHelpText( nId, aString );
+                    m_pToolBar->SetQuickHelpText( nId, aString );
                     if ( aLabel.getLength() > 0 )
                         m_pToolBar->SetItemText( nId, aLabel );
                     else
@@ -1367,10 +1310,11 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
 
     AddonsOptions().GetMergeToolbarInstructions( aToolbarName, aMergeInstructionContainer );
 
-    if ( aMergeInstructionContainer.size() > 0 )
+    if ( !aMergeInstructionContainer.empty() )
     {
         sal_uInt16 nItemId( TOOLBAR_ITEM_STARTID );
-        for ( sal_uInt32 i = 0; i < aMergeInstructionContainer.size(); i++ )
+        const sal_uInt32 nCount = aMergeInstructionContainer.size();
+        for ( sal_uInt32 i=0; i < nCount; i++ )
         {
             MergeToolbarInstruction& rInstruction = aMergeInstructionContainer[i];
             if ( ToolBarMerger::IsCorrectContext( rInstruction.aMergeContext, m_aModuleIdentifier ))
@@ -1430,7 +1374,6 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
     Reference< XPropertySet > xPropSet( rItemContainer, UNO_QUERY );
     if ( xPropSet.is() )
     {
-        Any a;
         try
         {
             rtl::OUString aUIName;
@@ -1455,7 +1398,8 @@ void ToolBarManager::RequestImages()
 
     sal_uInt32 i = 0;
     CommandToInfoMap::iterator pIter = m_aCommandMap.begin();
-    while ( pIter != m_aCommandMap.end() )
+    CommandToInfoMap::iterator pEnd = m_aCommandMap.end();
+    while ( pIter != pEnd )
     {
         aCmdURLSeq[i++] = pIter->first;
         ++pIter;
@@ -1471,7 +1415,7 @@ void ToolBarManager::RequestImages()
 
     i = 0;
     pIter = m_aCommandMap.begin();
-    while ( pIter != m_aCommandMap.end() )
+    while ( pIter != pEnd )
     {
         rtl::OUString aCommandURL = aCmdURLSeq[i];
 
@@ -1485,24 +1429,14 @@ void ToolBarManager::RequestImages()
             // empty image.
             if ( !aImage )
                 aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages, m_bIsHiContrast );
-            m_pToolBar->SetItemImage( pIter->second.nId, aImage );
-            if ( pIter->second.aIds.size() > 0 )
-            {
-                for ( sal_uInt32 j=0; j < pIter->second.aIds.size(); j++ )
-                    m_pToolBar->SetItemImage( pIter->second.aIds[j], aImage );
-            }
+            
             pIter->second.nImageInfo = 1; // mark image as module based
         }
         else
         {
-            m_pToolBar->SetItemImage( pIter->second.nId, aImage );
-            if ( pIter->second.aIds.size() > 0 )
-            {
-                for ( sal_uInt32 j=0; j < pIter->second.aIds.size(); j++ )
-                    m_pToolBar->SetItemImage( pIter->second.aIds[j], aImage );
-            }
             pIter->second.nImageInfo = 0; // mark image as document based
         }
+        setToolBarImage(aImage,pIter);
         ++pIter;
         ++i;
     }
@@ -1511,7 +1445,7 @@ void ToolBarManager::RequestImages()
 void ToolBarManager::notifyRegisteredControllers( const rtl::OUString& aUIElementName, const rtl::OUString& aCommand )
 {
     ResetableGuard aGuard( m_aLock );
-    if ( m_aSubToolBarControllerMap.size() > 0 )
+    if ( !m_aSubToolBarControllerMap.empty() )
     {
         SubToolBarToSubToolBarControllerMap::const_iterator pIter =
             m_aSubToolBarControllerMap.find( aUIElementName );
@@ -1519,12 +1453,13 @@ void ToolBarManager::notifyRegisteredControllers( const rtl::OUString& aUIElemen
         if ( pIter != m_aSubToolBarControllerMap.end() )
         {
             const SubToolBarControllerVector& rSubToolBarVector = pIter->second;
-            if ( rSubToolBarVector.size() > 0 )
+            if ( !rSubToolBarVector.empty() )
             {
                 SubToolBarControllerVector aNotifyVector = rSubToolBarVector;
                 aGuard.unlock();
 
-                for ( sal_uInt32 i = 0; i < aNotifyVector.size(); i++ )
+                const sal_uInt32 nCount = aNotifyVector.size();
+                for ( sal_uInt32 i=0; i < nCount; i++ )
                 {
                     try
                     {
@@ -1544,8 +1479,7 @@ void ToolBarManager::notifyRegisteredControllers( const rtl::OUString& aUIElemen
         }
     }
 }
-
-IMPL_LINK( ToolBarManager, Click, ToolBox*, EMPTYARG )
+long ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )())
 {
     ResetableGuard aGuard( m_aLock );
 
@@ -1559,12 +1493,16 @@ IMPL_LINK( ToolBarManager, Click, ToolBox*, EMPTYARG )
         Reference< XToolbarController > xController( pIter->second, UNO_QUERY );
 
         if ( xController.is() )
-            xController->click();
-    }
-
+            (xController.get()->*_pClick)( );
+    } // if ( pIter != m_aControllerMap.end() )
     return 1;
 }
 
+IMPL_LINK( ToolBarManager, Click, ToolBox*, EMPTYARG )
+{
+    return HandleClick(&XToolbarController::click);
+}
+
 IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG )
 {
     ResetableGuard aGuard( m_aLock );
@@ -1581,28 +1519,12 @@ IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG )
         if ( xController.is() )
             xController->createPopupWindow();
     }
-
     return 1;
 }
 
 IMPL_LINK( ToolBarManager, DoubleClick, ToolBox*, EMPTYARG )
 {
-    ResetableGuard aGuard( m_aLock );
-
-    if ( m_bDisposed )
-        return 1;
-
-    USHORT nId( m_pToolBar->GetCurItemId() );
-    ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
-    if ( pIter != m_aControllerMap.end() )
-    {
-        Reference< XToolbarController > xController( pIter->second, UNO_QUERY );
-
-        if ( xController.is() )
-            xController->doubleClick();
-    }
-
-    return 1;
+    return HandleClick(&XToolbarController::doubleClick);
 }
 
 void ToolBarManager::ImplClearPopupMenu( ToolBox *pToolBar )
@@ -1695,11 +1617,8 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
     if ( m_xFrame.is() )
     {
         Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY );
-        Reference< XURLTransformer > xTrans( m_xServiceManager->createInstance(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
         aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConfigureDialog" ));
-        xTrans->parseStrict( aURL );
+        m_xURLTransformer->parseStrict( aURL );
         if ( xProv.is() )
             xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 );
 
@@ -1869,11 +1788,8 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
                 if ( m_xFrame.is() )
                 {
                     Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY );
-                    Reference< XURLTransformer > xTrans( m_xServiceManager->createInstance(
-                                                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                            "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
                     aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConfigureDialog" ));
-                    xTrans->parseStrict( aURL );
+                    m_xURLTransformer->parseStrict( aURL );
                     if ( xProv.is() )
                         xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 );
                 }
@@ -1993,9 +1909,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
                                             if ( xPropSet.is() )
                                             {
                                                 Reference< XUIConfigurationPersistence > xUICfgMgr;
-                                                Any a = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                                                        "ConfigurationSource" )));
-                                                if (( a >>= xUICfgMgr ) && ( xUICfgMgr.is() ))
+                                                if (( xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ConfigurationSource" ))) >>= xUICfgMgr ) && ( xUICfgMgr.is() ))
                                                     xUICfgMgr->store();
                                             }
                                         }
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index e2bca0d68..7fe966a0b 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -58,13 +58,10 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/ui/XUIElementSettings.hpp>
-#ifndef _COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGER_HPP_
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
-#endif
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#ifndef _COM_SUN_STAR_UI_UIElementType_HPP_
 #include <com/sun/star/ui/UIElementType.hpp>
-#endif
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //	includes of other projects
@@ -85,6 +82,7 @@
 #include <svtools/menuoptions.hxx>
 #include <svtools/cmdoptions.hxx>
 #include <dispatch/uieventloghelper.hxx>
+#include <rtl/logfile.hxx>
 #include <svtools/miscopt.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -149,8 +147,7 @@ Reference< XLayoutManager > getLayoutManagerFromFrame( const Reference< XFrame >
     
     try
     {
-        Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
-        aValue >>= xLayoutManager;
+        xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xLayoutManager;
     }
     catch ( UnknownPropertyException& )
     {
@@ -265,8 +262,7 @@ rtl::OUString ToolbarsMenuController::getUINameFromCommand( const rtl::OUString&
             Reference< XNameAccess > xNameAccess( m_xServiceManager->createInstance(
                                                                     SERVICENAME_UICOMMANDDESCRIPTION ),
                                                                 UNO_QUERY );
-            Any a = xNameAccess->getByName( m_aModuleIdentifier );
-            a >>= m_xUICommandDescription;
+            xNameAccess->getByName( m_aModuleIdentifier ) >>= m_xUICommandDescription;
         }
         catch ( Exception& )
         {
@@ -279,8 +275,7 @@ rtl::OUString ToolbarsMenuController::getUINameFromCommand( const rtl::OUString&
         {
             Sequence< PropertyValue > aPropSeq;
             rtl::OUString             aStr;
-            Any a( m_xUICommandDescription->getByName( rCommandURL ));
-            if ( a >>= aPropSeq )
+            if ( m_xUICommandDescription->getByName( rCommandURL ) >>= aPropSeq )
             {
                 for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
                 {
@@ -368,7 +363,8 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl
     aTbSeq[1].Name = m_aPropResourceURL;
 
     Sequence< Sequence< com::sun::star::beans::PropertyValue > > aSeq( aToolBarArray.size() );
-    for ( sal_uInt32 i = 0; i < aToolBarArray.size(); i++ )
+    const sal_uInt32 nCount = aToolBarArray.size();
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
     {
         aTbSeq[0].Value <<= aToolBarArray[i].aToolBarUIName;
         aTbSeq[1].Value <<= aToolBarArray[i].aToolBarResName;
@@ -480,7 +476,8 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
         std::sort( aSortedTbs.begin(), aSortedTbs.end(), CompareToolBarEntry );
 
         sal_Int16 nIndex( 1 );
-        for ( sal_uInt32 i = 0; i < aSortedTbs.size(); i++ )
+        const sal_uInt32 nCount = aSortedTbs.size();
+        for ( sal_uInt32 i = 0; i < nCount; i++ )
         {
             USHORT nItemCount = m_xPopupMenu->getItemCount();
             m_xPopupMenu->insertItem( nIndex, aSortedTbs[i].aUIName, css::awt::MenuItemStyle::CHECKABLE, nItemCount );
@@ -635,10 +632,6 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev
 }
 
 // XMenuListener
-void SAL_CALL ToolbarsMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
 void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
 {
     Reference< css::awt::XPopupMenu >   xPopupMenu;
@@ -682,10 +675,8 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent
                             {
                                 rtl::OUString aElementName = aElementNames[i];
                                 Sequence< PropertyValue > aWindowState;
-                                    
-                                Any a( xPersistentWindowState->getByName( aElementName ));
-                                    
-                                if ( a >>= aWindowState )
+
+                                if ( xPersistentWindowState->getByName( aElementName ) >>= aWindowState )
                                 {
                                     sal_Bool  bVisible( sal_False );
                                     sal_Bool  bContextSensitive( sal_False );
@@ -704,7 +695,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent
                                     if ( !bVisible && bContextSensitive && nVisibleIndex >= 0 )
                                     {
                                         // Default is: Every context sensitive toolbar is visible
-                                        aWindowState[nVisibleIndex].Value = makeAny( sal_True );
+                                        aWindowState[nVisibleIndex].Value <<= sal_True;
                                         xNameReplace->replaceByName( aElementName, makeAny( aWindowState ));
                                         bRefreshToolbars = true;
                                     }
@@ -814,7 +805,8 @@ void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) thr
     }
 
     // Update status for all commands inside our toolbars popup menu
-    for ( sal_uInt32 i=0; i < aCmdVector.size(); i++ )
+    const sal_uInt32 nCount = aCmdVector.size();
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
     {
         bool bInternal = ( aCmdVector[i].indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STATIC_INTERNAL_CMD_PART ))) == 0);
 
@@ -841,10 +833,6 @@ void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) thr
     }
 }
 
-void SAL_CALL ToolbarsMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
 // XPopupMenuController
 void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
 {
@@ -867,37 +855,14 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X
 // XInitialization
 void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    const rtl::OUString aFrameName( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-    const rtl::OUString aCommandURLName( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
-
     ResetableGuard aLock( m_aLock );
-    
     sal_Bool bInitalized( m_bInitialized );
     if ( !bInitalized )
     {
-        PropertyValue       aPropValue;
-        rtl::OUString       aCommandURL;
-        Reference< XFrame > xFrame;
-        
-        for ( int i = 0; i < aArguments.getLength(); i++ )
-        {
-            if ( aArguments[i] >>= aPropValue )
-            {
-                if ( aPropValue.Name.equalsAscii( "Frame" ))
-                    aPropValue.Value >>= xFrame;
-                else if ( aPropValue.Name.equalsAscii( "CommandURL" ))
-                    aPropValue.Value >>= aCommandURL;
-            }
-        }
-
-        if ( xFrame.is() && aCommandURL.getLength() )
+        PopupMenuControllerBase::initialize(aArguments);
+    
+        if ( m_bInitialized )
         {
-            m_xFrame        = xFrame;
-            m_aCommandURL   = aCommandURL;
-            m_bInitialized  = true;
-            
-            m_aBaseURL      = determineBaseURL( aCommandURL );
-            
             Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( 
                                                             SERVICENAME_MODULEMANAGER ), 
                                                         UNO_QUERY );
@@ -936,11 +901,6 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume
                 {
                 }
             }
-
-            m_xURLTransformer = Reference< XURLTransformer >( m_xServiceManager->createInstance( 
-                                                                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                                                        "com.sun.star.util.URLTransformer" ))), 
-                                                                   UNO_QUERY );
         }
     }
 }
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index faf14a567..59b696763 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -85,8 +85,7 @@ namespace framework
 {
 
 ToolBarWrapper::ToolBarWrapper( const Reference< XMultiServiceFactory >& xServiceManager ) :
-    UIConfigElementWrapperBase( UIElementType::TOOLBAR ),
-    m_xServiceManager( xServiceManager )
+    UIConfigElementWrapperBase( UIElementType::TOOLBAR,xServiceManager )
 {
 }
 
@@ -185,7 +184,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
 
                     pToolBar = new ToolBar( pWindow, nStyles );
                     m_xToolBarWindow = VCLUnoHelper::GetInterface( pToolBar );
-                    pToolBarManager = new ToolBarManager( m_xServiceManager, xFrame, m_aResourceURL, pToolBar );
+                    pToolBarManager = new ToolBarManager( m_xServiceFactory, xFrame, m_aResourceURL, pToolBar );
                     pToolBar->SetToolBarManager( pToolBarManager );
                     m_xToolBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pToolBarManager ), UNO_QUERY );
                     pToolBar->WillUsePopupMode( bPopupMode );
@@ -276,71 +275,12 @@ void SAL_CALL ToolBarWrapper::updateSettings() throw (::com::sun::star::uno::Run
     }
 }
 
-Reference< XIndexAccess > SAL_CALL ToolBarWrapper::getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( bWriteable )
-        return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY );
-    else
-        return m_xConfigData;
-}
-
-void SAL_CALL ToolBarWrapper::setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xSettings ) throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( xSettings.is() )
-    {
-        // Create a copy of the data if the container is not const
-        Reference< XIndexReplace > xReplace( xSettings, UNO_QUERY );
-        if ( xReplace.is() )
-            m_xConfigData = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xSettings ) ), UNO_QUERY );
-        else
-            m_xConfigData = xSettings;
-
-        if ( m_xConfigSource.is() && m_bPersistent )
-        {
-            ::rtl::OUString aResourceURL( m_aResourceURL );
-            Reference< XUIConfigurationManager > xUICfgMgr( m_xConfigSource );
-
-            aLock.unlock();
-
-            try
-            {
-                xUICfgMgr->replaceSettings( aResourceURL, m_xConfigData );
-            }
-            catch( NoSuchElementException& )
-            {
-            }
-        }
-        else if ( !m_bPersistent )
-        {
-            // Transient toolbar => Fill toolbar with new data
-            ToolBarManager* pToolBarManager = static_cast< ToolBarManager *>( m_xToolBarManager.get() );
-            if ( pToolBarManager )
-                pToolBarManager->FillToolbar( m_xConfigData );
-        }
-    }
-}
-
-//  XUIConfigurationListener
-void SAL_CALL ToolBarWrapper::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException)
-{
-}
-
-void SAL_CALL ToolBarWrapper::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException)
-{
-}
-
-void SAL_CALL ToolBarWrapper::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException)
+void ToolBarWrapper::impl_fillNewData()
 {
+    // Transient toolbar => Fill toolbar with new data
+    ToolBarManager* pToolBarManager = static_cast< ToolBarManager *>( m_xToolBarManager.get() );
+    if ( pToolBarManager )
+        pToolBarManager->FillToolbar( m_xConfigData );
 }
 
 // XUIElement interface
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 8e1b3d409..e13ed0e97 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -53,7 +53,7 @@
 //	includes of other projects
 //_________________________________________________________________________________________________________________
 #include <rtl/ustrbuf.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <unotools/configmgr.hxx>
 #include <tools/string.hxx>
 
@@ -113,23 +113,14 @@ namespace framework
 //	Configuration access class for PopupMenuControllerFactory implementation
 //*****************************************************************************************************************
 
-class ConfigurationAccess_UICommand : // interfaces
-                                        public  XTypeProvider                            ,
-                                        public  XNameAccess                              ,
-                                        public  XContainerListener                       ,
-                                        // baseclasses
-                                        // Order is neccessary for right initialization!
+class ConfigurationAccess_UICommand : // Order is neccessary for right initialization!
                                         private ThreadHelpBase                           ,
-                                        public  ::cppu::OWeakObject
+                                        public  ::cppu::WeakImplHelper2<XNameAccess,XContainerListener>
 {
     public:
                                   ConfigurationAccess_UICommand( const ::rtl::OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XMultiServiceFactory >& rServiceManager );
         virtual                   ~ConfigurationAccess_UICommand();
 
-        //  XInterface, XTypeProvider
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-
         // XNameAccess
         virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
             throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -177,6 +168,10 @@ class ConfigurationAccess_UICommand : // interfaces
         Sequence< rtl::OUString > getAllCommands();
         sal_Bool                  fillCache();
         sal_Bool                  addGenericInfoToCache();
+        void                      impl_fill(const Reference< XNameAccess >& _xConfigAccess,sal_Bool _bPopup,
+                                                std::vector< ::rtl::OUString >& aImageCommandVector,
+                                                std::vector< ::rtl::OUString >& aImageRotateVector,
+                                                std::vector< ::rtl::OUString >& aImageMirrorVector);
 
     private:
         typedef ::std::hash_map< ::rtl::OUString,
@@ -202,7 +197,7 @@ class ConfigurationAccess_UICommand : // interfaces
         Reference< XNameAccess >          m_xGenericUICommands;
         Reference< XMultiServiceFactory > m_xServiceManager;
         Reference< XMultiServiceFactory > m_xConfigProvider;
-        Reference< XMultiServiceFactory > m_xConfigProviderPopups;
+        //Reference< XMultiServiceFactory > m_xConfigProviderPopups;
         Reference< XNameAccess >          m_xConfigAccess;
         Reference< XNameAccess >          m_xConfigAccessPopups;
         Sequence< rtl::OUString >         m_aCommandImageList;
@@ -217,23 +212,6 @@ class ConfigurationAccess_UICommand : // interfaces
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_5     (   ConfigurationAccess_UICommand                                                   ,
-                            OWeakObject                                                                     ,
-                            DIRECT_INTERFACE ( css::container::XNameAccess                                  ),
-                            DIRECT_INTERFACE ( css::container::XContainerListener                           ),
-                            DIRECT_INTERFACE ( css::lang::XTypeProvider                                     ),
-                            DERIVED_INTERFACE( css::container::XElementAccess, css::container::XNameAccess  ),
-                            DERIVED_INTERFACE( css::lang::XEventListener, XContainerListener                )
-                        )
-
-DEFINE_XTYPEPROVIDER_5  (   ConfigurationAccess_UICommand       ,
-                            css::container::XNameAccess         ,
-                            css::container::XElementAccess      ,
-                            css::container::XContainerListener  ,
-                            css::lang::XTypeProvider            ,
-                            css::lang::XEventListener
-                        )
-
 ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XMultiServiceFactory >& rServiceManager ) :
     ThreadHelpBase(),
     m_aConfigCmdAccess( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_ROOT_ACCESS )),
@@ -255,21 +233,14 @@ ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const rtl::OUStrin
     m_aConfigCmdAccess += aModuleName;
     m_aConfigCmdAccess += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_CMD_ELEMENT_ACCESS ));
 
-    m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance(
-                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                                    "com.sun.star.configuration.ConfigurationProvider" ))),
-                                                           UNO_QUERY );
+    m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance(SERVICENAME_CFGPROVIDER),UNO_QUERY );
 
     m_aConfigPopupAccess += aModuleName;
     m_aConfigPopupAccess += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_POP_ELEMENT_ACCESS ));
-    m_xConfigProviderPopups = Reference< XMultiServiceFactory >( rServiceManager->createInstance(
-                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                                    "com.sun.star.configuration.ConfigurationProvider" ))),
-                                                           UNO_QUERY );
+    //m_xConfigProviderPopups = Reference< XMultiServiceFactory >( rServiceManager->createInstance(SERVICENAME_CFGPROVIDER),UNO_QUERY );
 
-    Any aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME );
     rtl::OUString aTmp;
-    aRet >>= aTmp;
+    ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME ) >>= aTmp;
     m_aBrandName = aTmp;
 }
 
@@ -336,11 +307,7 @@ throw ( RuntimeException )
 sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const ::rtl::OUString& rCommandURL )
 throw (::com::sun::star::uno::RuntimeException)
 {
-    Any a = getByName( rCommandURL );
-    if ( a != Any() )
-        return sal_True;
-    else
-        return sal_False;
+    return getByName( rCommandURL ).hasValue();
 }
 
 // XElementAccess
@@ -381,48 +348,36 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const ::rtl::OUString&
         aPropSeq[0].Value = pIter->second.aContextLabel.getLength() ?
                 makeAny( pIter->second.aContextLabel ): makeAny( pIter->second.aLabel );
         aPropSeq[1].Name  = m_aPropName;
-        aPropSeq[1].Value = makeAny( pIter->second.aCommandName );
+        aPropSeq[1].Value <<= pIter->second.aCommandName;
         aPropSeq[2].Name  = m_aPropPopup;
-        aPropSeq[2].Value = makeAny( pIter->second.bPopup );
+        aPropSeq[2].Value <<= pIter->second.bPopup;
         return makeAny( aPropSeq );
     }
 
     return Any();
 }
-
-sal_Bool ConfigurationAccess_UICommand::fillCache()
+void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _xConfigAccess,sal_Bool _bPopup,
+                                                std::vector< ::rtl::OUString >& aImageCommandVector,
+                                                std::vector< ::rtl::OUString >& aImageRotateVector,
+                                                std::vector< ::rtl::OUString >& aImageMirrorVector)
 {
-    RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ConfigurationAccess_UICommand::fillCache" );
-
-    if ( m_bCacheFilled )
-        return sal_True;
-
-    sal_Int32               i( 0 );
-    Any                     a;
-    std::vector< ::rtl::OUString > aImageCommandVector;
-    std::vector< ::rtl::OUString > aImageRotateVector;
-    std::vector< ::rtl::OUString > aImageMirrorVector;
-    Sequence< ::rtl::OUString >    aNameSeq;
-
-    if ( m_xConfigAccess.is() )
+    if ( _xConfigAccess.is() )
     {
-        aNameSeq = m_xConfigAccess->getElementNames();
-        for ( i = 0; i < aNameSeq.getLength(); i++ )
+        Sequence< ::rtl::OUString> aNameSeq = _xConfigAccess->getElementNames();
+        const sal_Int32 nCount = aNameSeq.getLength();
+        for ( sal_Int32 i = 0; i < nCount; i++ )
         {
             try
             {
-                Reference< XNameAccess > xNameAccess;
-                a = m_xConfigAccess->getByName( aNameSeq[i] );
-                if ( a >>= xNameAccess )
+                Reference< XNameAccess > xNameAccess(_xConfigAccess->getByName( aNameSeq[i] ),UNO_QUERY);
+                if ( xNameAccess.is() )
                 {
                     CmdToInfoMap aCmdToInfo;
 
-                    a = xNameAccess->getByName( m_aPropUILabel );
-                    a >>= aCmdToInfo.aLabel;
-                    a = xNameAccess->getByName( m_aPropUIContextLabel );
-                    a >>= aCmdToInfo.aContextLabel;
-                    a = xNameAccess->getByName( m_aPropProperties );
-                    a >>= aCmdToInfo.nProperties;
+                    aCmdToInfo.bPopup = _bPopup;
+                    xNameAccess->getByName( m_aPropUILabel )        >>= aCmdToInfo.aLabel;
+                    xNameAccess->getByName( m_aPropUIContextLabel ) >>= aCmdToInfo.aContextLabel;
+                    xNameAccess->getByName( m_aPropProperties )     >>= aCmdToInfo.nProperties;
 
                     m_aCmdInfoCache.insert( CommandToInfoCache::value_type( aNameSeq[i], aCmdToInfo ));
 
@@ -441,48 +396,21 @@ sal_Bool ConfigurationAccess_UICommand::fillCache()
             {
             }
         }
-    }
-
-    if ( m_xConfigAccessPopups.is() )
-    {
-        aNameSeq = m_xConfigAccessPopups->getElementNames();
-        for ( i = 0; i < aNameSeq.getLength(); i++ )
-        {
-            try
-            {
-                Reference< XNameAccess > xNameAccess;
-                a = m_xConfigAccessPopups->getByName( aNameSeq[i] );
-                if ( a >>= xNameAccess )
-                {
-                    CmdToInfoMap aCmdToInfo;
-
-                    aCmdToInfo.bPopup = sal_True;
-                    a = xNameAccess->getByName( m_aPropUILabel );
-                    a >>= aCmdToInfo.aLabel;
-                    a = xNameAccess->getByName( m_aPropUIContextLabel );
-                    a >>= aCmdToInfo.aContextLabel;
-                    a = xNameAccess->getByName( m_aPropProperties );
-                    a >>= aCmdToInfo.nProperties;
+    } // if ( m_xConfigAccessPopups.is() )
+}
+sal_Bool ConfigurationAccess_UICommand::fillCache()
+{
+    RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ConfigurationAccess_UICommand::fillCache" );
 
-                    m_aCmdInfoCache.insert( CommandToInfoCache::value_type( aNameSeq[i], aCmdToInfo ));
+    if ( m_bCacheFilled )
+        return sal_True;
 
-                    if ( aCmdToInfo.nProperties & COMMAND_PROPERTY_IMAGE )
-                        aImageCommandVector.push_back( aNameSeq[i] );
-                    if ( aCmdToInfo.nProperties & COMMAND_PROPERTY_ROTATE )
-                        aImageRotateVector.push_back( aNameSeq[i] );
-                    if ( aCmdToInfo.nProperties & COMMAND_PROPERTY_MIRROR )
-                        aImageMirrorVector.push_back( aNameSeq[i] );
-                }
-            }
-            catch ( com::sun::star::lang::WrappedTargetException& )
-            {
-            }
-            catch ( com::sun::star::container::NoSuchElementException& )
-            {
-            }
-        }
-    }
+    std::vector< ::rtl::OUString > aImageCommandVector;
+    std::vector< ::rtl::OUString > aImageRotateVector;
+    std::vector< ::rtl::OUString > aImageMirrorVector;
 
+    impl_fill(m_xConfigAccess,sal_False,aImageCommandVector,aImageRotateVector,aImageMirrorVector);
+    impl_fill(m_xConfigAccessPopups,sal_True,aImageCommandVector,aImageRotateVector,aImageMirrorVector);
     // Create cached sequences for fast retrieving
     m_aCommandImageList       = comphelper::containerToSequence( aImageCommandVector );
     m_aCommandRotateImageList = comphelper::containerToSequence( aImageRotateVector );
@@ -582,7 +510,6 @@ Sequence< rtl::OUString > ConfigurationAccess_UICommand::getAllCommands()
 
     if ( m_xConfigAccess.is() )
     {
-        Any                      a;
         Reference< XNameAccess > xNameAccess;
 
         try
@@ -624,14 +551,10 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess()
     try
     {
         aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
-        aPropValue.Value = makeAny( m_aConfigCmdAccess );
+        aPropValue.Value <<= m_aConfigCmdAccess;
         aArgs[0] <<= aPropValue;
 
-        m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(
-                                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                                                "com.sun.star.configuration.ConfigurationAccess" )),
-                                                                            aArgs ),
-                                                                        UNO_QUERY );
+        m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,aArgs ),UNO_QUERY );
         if ( m_xConfigAccess.is() )
         {
             // Add as container listener
@@ -640,13 +563,9 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess()
                 xContainer->addContainerListener( this );
         }
 
-        aPropValue.Value = makeAny( m_aConfigPopupAccess );
+        aPropValue.Value <<= m_aConfigPopupAccess;
         aArgs[0] <<= aPropValue;
-        m_xConfigAccessPopups = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(
-                                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                                                "com.sun.star.configuration.ConfigurationAccess" )),
-                                                                            aArgs ),
-                                                                        UNO_QUERY );
+        m_xConfigAccessPopups = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,aArgs ),UNO_QUERY );
         if ( m_xConfigAccessPopups.is() )
         {
             // Add as container listener
@@ -711,21 +630,6 @@ void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEven
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_4                    (    UICommandDescription                                                            ,
-                                            OWeakObject                                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                       ),
-                                            DIRECT_INTERFACE( css::container::XNameAccess		                            ),
-                                            DERIVED_INTERFACE( css::container::XElementAccess, css::container::XNameAccess  )
-                                        )
-
-DEFINE_XTYPEPROVIDER_4                  (   UICommandDescription		    ,
-                                            css::lang::XTypeProvider		,
-                                            css::lang::XServiceInfo			,
-                                            css::container::XNameAccess     ,
-                                            css::container::XElementAccess
-                                        )
-
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   UICommandDescription				    ,
                                             ::cppu::OWeakObject						,
                                             SERVICENAME_UICOMMANDDESCRIPTION	    ,
@@ -739,12 +643,33 @@ UICommandDescription::UICommandDescription( const Reference< XMultiServiceFactor
     m_aPrivateResourceURL( RTL_CONSTASCII_USTRINGPARAM( PRIVATE_RESOURCE_URL )),
     m_xServiceManager( xServiceManager )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::UICommandDescription" );
     Reference< XNameAccess > xEmpty;
     rtl::OUString aGenericUICommand( ::rtl::OUString::createFromAscii( "GenericCommands" ));
     m_xGenericUICommands = new ConfigurationAccess_UICommand( aGenericUICommand, xEmpty, xServiceManager );
 
-    m_xModuleManager = Reference< XModuleManager >( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ),
-                                                    UNO_QUERY );
+    impl_fillElements("ooSetupFactoryCommandConfigRef");
+
+    // insert generic commands
+    UICommandsHashMap::iterator pIter = m_aUICommandsHashMap.find( aGenericUICommand );
+    if ( pIter != m_aUICommandsHashMap.end() )
+        pIter->second = m_xGenericUICommands;
+}
+UICommandDescription::UICommandDescription( const Reference< XMultiServiceFactory >& xServiceManager,bool ) :
+    ThreadHelpBase(),
+    m_xServiceManager( xServiceManager )
+{
+}
+UICommandDescription::~UICommandDescription()
+{
+    ResetableGuard aLock( m_aLock );
+    m_aModuleToCommandFileMap.clear();
+    m_aUICommandsHashMap.clear();
+    m_xGenericUICommands.clear();
+}
+void UICommandDescription::impl_fillElements(const sal_Char* _pName)
+{
+    m_xModuleManager.set( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ),UNO_QUERY );
     Reference< XNameAccess > xNameAccess( m_xModuleManager, UNO_QUERY_THROW );
     Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames();
     Sequence< PropertyValue > aSeq;
@@ -753,13 +678,12 @@ UICommandDescription::UICommandDescription( const Reference< XMultiServiceFactor
     for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ )
     {
         aModuleIdentifier = aElementNames[i];
-        Any a = xNameAccess->getByName( aModuleIdentifier );
-        if ( a >>= aSeq )
+        if ( xNameAccess->getByName( aModuleIdentifier ) >>= aSeq )
         {
             ::rtl::OUString aCommandStr;
             for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
             {
-                if ( aSeq[y].Name.equalsAscii("ooSetupFactoryCommandConfigRef") )
+                if ( aSeq[y].Name.equalsAscii(_pName) )
                 {
                     aSeq[y].Value >>= aCommandStr;
                     break;
@@ -774,25 +698,17 @@ UICommandDescription::UICommandDescription( const Reference< XMultiServiceFactor
             if ( pIter == m_aUICommandsHashMap.end() )
                 m_aUICommandsHashMap.insert( UICommandsHashMap::value_type( aCommandStr, Reference< XNameAccess >() ));
         }
-    }
-
-    // insert generic commands
-    UICommandsHashMap::iterator pIter = m_aUICommandsHashMap.find( aGenericUICommand );
-    if ( pIter != m_aUICommandsHashMap.end() )
-        pIter->second = m_xGenericUICommands;
+    } // for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ )
 }
-
-UICommandDescription::~UICommandDescription()
+Reference< XNameAccess > UICommandDescription::impl_createConfigAccess(const ::rtl::OUString& _sName)
 {
-    ResetableGuard aLock( m_aLock );
-    m_aModuleToCommandFileMap.clear();
-    m_aUICommandsHashMap.clear();
-    m_xGenericUICommands.clear();
+    return new ConfigurationAccess_UICommand( _sName,m_xGenericUICommands,m_xServiceManager );
 }
 
 Any SAL_CALL UICommandDescription::getByName( const ::rtl::OUString& aName )
 throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::getByName" );
     Any a;
 
     ResetableGuard aLock( m_aLock );
@@ -818,7 +734,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
             }
         }
     }
-    else if ( aName.indexOf( m_aPrivateResourceURL ) == 0 )
+    else if ( m_aPrivateResourceURL.getLength() && aName.indexOf( m_aPrivateResourceURL ) == 0 )
     {
         // special keys to retrieve information about a set of commands
         return m_xGenericUICommands->getByName( aName );
@@ -834,6 +750,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
 Sequence< ::rtl::OUString > SAL_CALL UICommandDescription::getElementNames()
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::getElementNames" );
     ResetableGuard aLock( m_aLock );
 
     Sequence< rtl::OUString > aSeq( m_aModuleToCommandFileMap.size() );
@@ -852,6 +769,7 @@ throw (::com::sun::star::uno::RuntimeException)
 sal_Bool SAL_CALL UICommandDescription::hasByName( const ::rtl::OUString& aName )
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::hasByName" );
     ResetableGuard aLock( m_aLock );
 
     ModuleToCommandFileMap::const_iterator pIter = m_aModuleToCommandFileMap.find( aName );
@@ -862,12 +780,14 @@ throw (::com::sun::star::uno::RuntimeException)
 Type SAL_CALL UICommandDescription::getElementType()
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::getElementType" );
     return( ::getCppuType( (const Reference< XNameAccess >*)NULL ) );
 }
 
 sal_Bool SAL_CALL UICommandDescription::hasElements()
 throw (::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::hasElements" );
     // generic UI commands are always available!
     return sal_True;
 }
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx
index 9187f5489..c41213d6d 100644
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolboxfactory.cxx
@@ -76,19 +76,6 @@ namespace framework
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_3                    (    AddonsToolBoxFactory                                            ,
-                                            OWeakObject                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                       ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementFactory )
-                                        )
-
-DEFINE_XTYPEPROVIDER_3                  (   AddonsToolBoxFactory		                    ,
-                                            css::lang::XTypeProvider			            ,
-                                            css::lang::XServiceInfo				            ,
-                                            ::com::sun::star::ui::XUIElementFactory
-                                        )
-
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   AddonsToolBoxFactory				            ,
                                             ::cppu::OWeakObject							    ,
                                             SERVICENAME_TOOLBARFACTORY	                    ,
@@ -101,9 +88,7 @@ AddonsToolBoxFactory::AddonsToolBoxFactory(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
     ThreadHelpBase( &Application::GetSolarMutex() )
     , m_xServiceManager( xServiceManager )
-    , m_xModuleManager( xServiceManager->createInstance(
-                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))),
-                        UNO_QUERY )
+    , m_xModuleManager( xServiceManager->createInstance(SERVICENAME_MODULEMANAGER),UNO_QUERY )
 {
 }
 
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
new file mode 100755
index 000000000..58ff92e5a
--- /dev/null
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -0,0 +1,344 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: ConfigurationAccess_ControllerFactory.cxx,v $
+ * $Revision: 1.9 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+#include "uifactory/factoryconfiguration.hxx"
+#include <threadhelp/resetableguard.hxx>
+#include "services.h"
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XContainer.hpp>
+
+//_________________________________________________________________________________________________________________
+//	includes of other projects
+//_________________________________________________________________________________________________________________
+#include <rtl/ustrbuf.hxx>
+#include <cppuhelper/weak.hxx>
+#include <rtl/logfile.hxx>
+
+//_________________________________________________________________________________________________________________
+//	Defines
+//_________________________________________________________________________________________________________________
+// 
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::container;
+using namespace ::com::sun::star::frame;
+
+//_________________________________________________________________________________________________________________
+//	Namespace
+//_________________________________________________________________________________________________________________
+// 
+
+namespace framework
+{
+rtl::OUString getHashKeyFromStrings( const rtl::OUString& aCommandURL, const rtl::OUString& aModuleName )
+{
+    rtl::OUStringBuffer aKey( aCommandURL );
+    aKey.appendAscii( "-" );
+    aKey.append( aModuleName );
+    return aKey.makeStringAndClear();
+}
+
+//*****************************************************************************************************************
+//	XInterface, XTypeProvider
+//*****************************************************************************************************************
+ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( Reference< XMultiServiceFactory >& rServiceManager,const ::rtl::OUString& _sRoot,bool _bAskValue ) :
+    ThreadHelpBase(),
+    m_aPropCommand( RTL_CONSTASCII_USTRINGPARAM( "Command" )),
+    m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )),
+    m_aPropController( RTL_CONSTASCII_USTRINGPARAM( "Controller" )),
+    m_aPropValue( RTL_CONSTASCII_USTRINGPARAM( "Value" )),
+    m_sRoot(_sRoot),
+    m_xServiceManager( rServiceManager ),    
+    m_bConfigAccessInitialized( sal_False ),
+    m_bAskValue(_bAskValue)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory" );
+    m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance( SERVICENAME_CFGPROVIDER),UNO_QUERY );
+}
+
+ConfigurationAccess_ControllerFactory::~ConfigurationAccess_ControllerFactory()
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+    
+    Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
+    if ( xContainer.is() )
+        xContainer->removeContainerListener( this );
+}
+
+rtl::OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::getServiceFromCommandModule" );
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+    MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
+     
+    if ( pIter != m_aMenuControllerMap.end() )
+        return pIter->second.m_aImplementationName;
+    else if ( rModule.getLength() )
+    {
+        // Try to detect if we have a generic popup menu controller
+        pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() ));
+         
+        if ( pIter != m_aMenuControllerMap.end() )
+            return pIter->second.m_aImplementationName;
+    }
+    
+    return rtl::OUString();
+}
+rtl::OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::getValueFromCommandModule" );
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+    
+    MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
+     
+    if ( pIter != m_aMenuControllerMap.end() )
+        return pIter->second.m_aValue;
+    else if ( rModule.getLength() )
+    {
+        // Try to detect if we have a generic popup menu controller
+        pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() ));
+         
+        if ( pIter != m_aMenuControllerMap.end() )
+            return pIter->second.m_aValue;
+    }
+    
+    return rtl::OUString();
+}
+
+
+void ConfigurationAccess_ControllerFactory::addServiceToCommandModule( 
+    const rtl::OUString& rCommandURL, 
+    const rtl::OUString& rModule, 
+    const rtl::OUString& rServiceSpecifier )
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::addServiceToCommandModule" );
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
+    m_aMenuControllerMap.insert( MenuControllerMap::value_type( aHashKey,ControllerInfo(rServiceSpecifier,::rtl::OUString()) ));
+}
+
+void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule( 
+    const rtl::OUString& rCommandURL, 
+    const rtl::OUString& rModule )
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule" );
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+    
+    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
+    m_aMenuControllerMap.erase( aHashKey );
+}
+
+// container.XContainerListener
+void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::elementInserted" );
+    rtl::OUString   aCommand;
+    rtl::OUString   aModule;
+    rtl::OUString   aService;
+    rtl::OUString   aValue;
+    
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService, aValue ))
+    {
+        // Create hash key from command and module as they are together a primary key to
+        // the UNO service that implements the popup menu controller.
+        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
+        ControllerInfo& rControllerInfo = m_aMenuControllerMap[ aHashKey ];
+        rControllerInfo.m_aImplementationName = aService;
+        rControllerInfo.m_aValue = aValue;
+    }
+}
+
+void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::elementRemoved" );
+    rtl::OUString   aCommand;
+    rtl::OUString   aModule;
+    rtl::OUString   aService;
+    rtl::OUString   aValue;
+    
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+    
+    if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService, aValue ))
+    {
+        // Create hash key from command and module as they are together a primary key to
+        // the UNO service that implements the popup menu controller.
+        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
+        m_aMenuControllerMap.erase( aHashKey );
+    }
+}
+
+void SAL_CALL ConfigurationAccess_ControllerFactory::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::elementReplaced" );
+    elementInserted(aEvent);
+}
+
+// lang.XEventListener
+void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObject& ) throw(RuntimeException)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::disposing" );
+    // SAFE
+    // remove our reference to the config access
+    ResetableGuard aLock( m_aLock );
+    m_xConfigAccess.clear();   
+}
+
+void ConfigurationAccess_ControllerFactory::readConfigurationData()
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::readConfigurationData" );
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+    
+    if ( !m_bConfigAccessInitialized )
+    {
+        Sequence< Any > aArgs( 1 );
+        PropertyValue   aPropValue;
+        
+        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
+        aPropValue.Value <<= m_sRoot;
+        aArgs[0] <<= aPropValue;
+        
+        try
+        {
+            m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,aArgs ), UNO_QUERY );
+        }
+        catch ( WrappedTargetException& )
+        {
+        }
+        
+        m_bConfigAccessInitialized = sal_True;
+    }
+    
+    if ( m_xConfigAccess.is() )
+    {
+        // Read and update configuration data
+        updateConfigurationData();
+
+        uno::Reference< container::XContainer > xContainer( m_xConfigAccess, uno::UNO_QUERY );
+        // UNSAFE
+        aLock.unlock();
+
+        if ( xContainer.is() )
+            xContainer->addContainerListener( this );
+    }
+}
+
+void ConfigurationAccess_ControllerFactory::updateConfigurationData()
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::updateConfigurationData" );
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+    if ( m_xConfigAccess.is() )
+    {
+        Sequence< rtl::OUString >   aPopupMenuControllers = m_xConfigAccess->getElementNames();
+        
+        rtl::OUString aCommand;
+        rtl::OUString aModule;
+        rtl::OUString aService;
+        rtl::OUString aHashKey;
+        rtl::OUString aValue;
+        
+        m_aMenuControllerMap.clear();
+        for ( sal_Int32 i = 0; i < aPopupMenuControllers.getLength(); i++ )
+        {
+            try
+            {
+                if ( impl_getElementProps( m_xConfigAccess->getByName( aPopupMenuControllers[i] ), aCommand, aModule, aService,aValue ))
+                {
+                    // Create hash key from command and module as they are together a primary key to
+                    // the UNO service that implements the popup menu controller.
+                    aHashKey = getHashKeyFromStrings( aCommand, aModule );
+                    m_aMenuControllerMap.insert( MenuControllerMap::value_type( aHashKey, ControllerInfo(aService,aValue) ));
+                }
+            }
+            catch ( NoSuchElementException& )
+            {
+            }
+            catch ( WrappedTargetException& )
+            {
+            }
+        }
+    }
+}
+
+sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier,rtl::OUString& aValue  ) const
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::impl_getElementProps" );
+    Reference< XPropertySet > xPropertySet;
+    aElement >>= xPropertySet;
+
+    if ( xPropertySet.is() )
+    {
+        try
+        {
+            xPropertySet->getPropertyValue( m_aPropCommand ) >>= aCommand;
+            xPropertySet->getPropertyValue( m_aPropModule ) >>= aModule;
+            xPropertySet->getPropertyValue( m_aPropController ) >>= aServiceSpecifier;
+            if ( m_bAskValue )
+                xPropertySet->getPropertyValue( m_aPropValue ) >>= aValue;
+        }
+        catch ( com::sun::star::beans::UnknownPropertyException& )
+        {
+            return sal_False;
+        }
+        catch ( com::sun::star::lang::WrappedTargetException& )
+        {
+            return sal_False;
+        }
+    }
+
+    return sal_True;
+}
+} // namespace framework
diff --git a/framework/source/uifactory/makefile.mk b/framework/source/uifactory/makefile.mk
index a70beb52f..d5805faba 100644
--- a/framework/source/uifactory/makefile.mk
+++ b/framework/source/uifactory/makefile.mk
@@ -49,6 +49,7 @@ SLOFILES=			\
                     $(SLO)$/toolbarcontrollerfactory.obj    \
                     $(SLO)$/statusbarfactory.obj            \
                     $(SLO)$/statusbarcontrollerfactory.obj	\
+                    $(SLO)$/factoryconfiguration.obj        \
                     $(SLO)$/windowcontentfactorymanager.obj
 
 # --- Targets ------------------------------------------------------
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index 86132d86b..f07700c20 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -62,6 +62,7 @@
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <rtl/logfile.hxx>
 
 //_________________________________________________________________________________________________________________
 //	Defines
@@ -81,19 +82,6 @@ namespace framework
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_3                    (    MenuBarFactory                                                  ,
-                                            OWeakObject                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                       ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementFactory )
-                                        )
-
-DEFINE_XTYPEPROVIDER_3                  (   MenuBarFactory		                            ,
-                                            css::lang::XTypeProvider			            ,
-                                            css::lang::XServiceInfo				            ,
-                                            ::com::sun::star::ui::XUIElementFactory
-                                        )
-
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   MenuBarFactory				                    ,
                                             ::cppu::OWeakObject							    ,
                                             SERVICENAME_MENUBARFACTORY	                    ,
@@ -108,6 +96,12 @@ MenuBarFactory::MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::s
     , m_xModuleManager( xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY )
 {
 }
+MenuBarFactory::MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool ) :
+    ThreadHelpBase(&Application::GetSolarMutex())
+    , m_xServiceManager( xServiceManager )
+    , m_xModuleManager( xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY )
+{
+}
 
 MenuBarFactory::~MenuBarFactory()
 {
@@ -121,12 +115,27 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
 {
     // SAFE
     ResetableGuard aLock( m_aLock );
-
+    MenuBarWrapper* pMenuBarWrapper = new MenuBarWrapper( m_xServiceManager );
+    Reference< ::com::sun::star::ui::XUIElement > xMenuBar( (OWeakObject *)pMenuBarWrapper, UNO_QUERY );
+    Reference< ::com::sun::star::frame::XModuleManager > xModuleManager = m_xModuleManager;
+    aLock.unlock();
+    CreateUIElement(ResourceURL,Args,"MenuOnly","private:resource/menubar/",xMenuBar,xModuleManager,m_xServiceManager);
+    return xMenuBar;
+}
+void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL
+                                     , const Sequence< PropertyValue >& Args
+                                     ,const char* _pExtraMode
+                                     ,const char* _pAsciiName
+                                     ,const Reference< ::com::sun::star::ui::XUIElement >& _xMenuBar
+                                     ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager >& _xModuleManager
+                                     ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceManager)
+{
+    Reference< XUIConfigurationManager > xCfgMgr;    
     Reference< XUIConfigurationManager > xConfigSource;
     Reference< XFrame >                  xFrame;
     rtl::OUString                        aResourceURL( ResourceURL );
     sal_Bool                             bPersistent( sal_True );
-    sal_Bool                             bMenuOnly( sal_False );
+    sal_Bool                             bExtraMode( sal_False );
 
     for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
     {
@@ -138,51 +147,47 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
             Args[n].Value >>= aResourceURL;
         else if ( Args[n].Name.equalsAscii( "Persistent" ))
             Args[n].Value >>= bPersistent;
-        else if ( Args[n].Name.equalsAscii( "MenuOnly" ))
-            Args[n].Value >>= bMenuOnly;
-    }
-
-    Reference< XUIConfigurationManager > xCfgMgr;    
-    if ( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/" ))) != 0 )
+        else if ( _pExtraMode && Args[n].Name.equalsAscii( _pExtraMode ))
+            Args[n].Value >>= bExtraMode;
+    } // for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
+    if ( aResourceURL.indexOf( rtl::OUString::createFromAscii(_pAsciiName)) != 0 )
         throw IllegalArgumentException();
-    else
+
+    // Identify frame and determine document based ui configuration manager/module ui configuration manager
+    if ( xFrame.is() && !xConfigSource.is() )
     {
-        // Identify frame and determine document based ui configuration manager/module ui configuration manager
-        if ( xFrame.is() && !xConfigSource.is() )
-        {
-            bool bHasSettings( false );
-            Reference< XModel > xModel;
+        bool bHasSettings( false );
+        Reference< XModel > xModel;
 
-            Reference< XController > xController = xFrame->getController();
-            if ( xController.is() )
-                xModel = xController->getModel();
+        Reference< XController > xController = xFrame->getController();
+        if ( xController.is() )
+            xModel = xController->getModel();
 
-            if ( xModel.is() )
+        if ( xModel.is() )
+        {
+            Reference< XUIConfigurationManagerSupplier > xUIConfigurationManagerSupplier( xModel, UNO_QUERY );
+            if ( xUIConfigurationManagerSupplier.is() )
             {
-                Reference< XUIConfigurationManagerSupplier > xUIConfigurationManagerSupplier( xModel, UNO_QUERY );
-                if ( xUIConfigurationManagerSupplier.is() )
-                {
-                    xCfgMgr = xUIConfigurationManagerSupplier->getUIConfigurationManager();
-                    bHasSettings = xCfgMgr->hasSettings( aResourceURL );
-                }
+                xCfgMgr = xUIConfigurationManagerSupplier->getUIConfigurationManager();
+                bHasSettings = xCfgMgr->hasSettings( aResourceURL );
             }
+        }
 
-            if ( !bHasSettings )
+        if ( !bHasSettings )
+        {
+            rtl::OUString aModuleIdentifier = _xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ));
+            if ( aModuleIdentifier.getLength() )
             {
-                rtl::OUString aModuleIdentifier = m_xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ));
-                if ( aModuleIdentifier.getLength() )
-                {
-                    Reference< ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(
-                        m_xServiceManager->createInstance( SERVICENAME_MODULEUICONFIGURATIONMANAGERSUPPLIER ), UNO_QUERY );
-                    xCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier );
-                    bHasSettings = xCfgMgr->hasSettings( aResourceURL );
-                }
+                Reference< ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(
+                    _xServiceManager->createInstance( SERVICENAME_MODULEUICONFIGURATIONMANAGERSUPPLIER ), UNO_QUERY );
+                xCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier );
+                bHasSettings = xCfgMgr->hasSettings( aResourceURL );
             }
         }
     }
-
+    
     PropertyValue aPropValue;
-    Sequence< Any > aPropSeq( 5 );
+    Sequence< Any > aPropSeq( _pExtraMode ? 5 : 4);
     aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
     aPropValue.Value <<= xFrame;
     aPropSeq[0] <<= aPropValue;
@@ -195,16 +200,16 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
     aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
     aPropValue.Value <<= bPersistent;
     aPropSeq[3] <<= aPropValue;
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MenuOnly" ));
-    aPropValue.Value <<= bMenuOnly;
-    aPropSeq[4] <<= aPropValue;
+    if ( _pExtraMode )
+    {
+        aPropValue.Name = rtl::OUString::createFromAscii(_pExtraMode);
+        aPropValue.Value <<= bExtraMode;
+        aPropSeq[4] <<= aPropValue;
+    }
     
     vos::OGuard	aGuard( Application::GetSolarMutex() );
-    MenuBarWrapper* pMenuBarWrapper = new MenuBarWrapper( m_xServiceManager );
-    Reference< ::com::sun::star::ui::XUIElement > xMenuBar( (OWeakObject *)pMenuBarWrapper, UNO_QUERY );
-    Reference< XInitialization > xInit( xMenuBar, UNO_QUERY );
+    Reference< XInitialization > xInit( _xMenuBar, UNO_QUERY );
     xInit->initialize( aPropSeq );
-    return xMenuBar;
 }
 
 } // namespace framework
diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx
dissimilarity index 81%
index 0cdf512b1..5c9ccdaca 100644
--- a/framework/source/uifactory/popupmenucontrollerfactory.cxx
+++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx
@@ -1,533 +1,96 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: popupmenucontrollerfactory.cxx,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-//_________________________________________________________________________________________________________________
-//	my own includes
-//_________________________________________________________________________________________________________________
-#include "uifactory/popupmenucontrollerfactory.hxx"
-#include <threadhelp/resetableguard.hxx>
-#include "services.h"
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XContainer.hpp>
-
-//_________________________________________________________________________________________________________________
-//	includes of other projects
-//_________________________________________________________________________________________________________________
-#include <rtl/ustrbuf.hxx>
-#include <cppuhelper/weak.hxx>
-
-//_________________________________________________________________________________________________________________
-//	Defines
-//_________________________________________________________________________________________________________________
-// 
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::container;
-using namespace ::com::sun::star::frame;
-
-//_________________________________________________________________________________________________________________
-//	Namespace
-//_________________________________________________________________________________________________________________
-// 
-
-namespace framework
-{
-
-// global function needed by both implementations
-rtl::OUString getHashKeyFromStrings( const rtl::OUString& aCommandURL, const rtl::OUString& aModuleName )
-{
-    rtl::OUStringBuffer aKey( aCommandURL );
-    aKey.appendAscii( "-" );
-    aKey.append( aModuleName );
-    return aKey.makeStringAndClear();
-}
-
-
-//*****************************************************************************************************************
-//	Configuration access class for PopupMenuControllerFactory implementation
-//*****************************************************************************************************************
-
-class ConfigurationAccess_PopupMenuControllerFactory : // interfaces
-                                                       public  XTypeProvider                            ,
-                                                       public  XContainerListener                       ,
-                                                       // baseclasses
-                                                       // Order is neccessary for right initialization!
-                                                       private ThreadHelpBase                           ,
-                                                       public  ::cppu::OWeakObject
-{
-    public:
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-                      
-                      ConfigurationAccess_PopupMenuControllerFactory( Reference< XMultiServiceFactory >& rServiceManager );
-        virtual       ~ConfigurationAccess_PopupMenuControllerFactory();
-
-        void          readConfigurationData();
-        void          updateConfigurationData();
-
-        rtl::OUString getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const;
-        void          addServiceToCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier );
-        void          removeServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule );
-
-        // container.XContainerListener
-        virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException);
-        virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException);
-        virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException);
-
-        // lang.XEventListener
-        virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException);
- 
-    private:
-        class PopupMenuControllerMap : public std::hash_map< rtl::OUString,
-                                                             rtl::OUString,
-                                                             OUStringHashCode,
-                                                             ::std::equal_to< ::rtl::OUString > >
-        {
-            inline void free()
-            {
-                PopupMenuControllerMap().swap( *this );
-            }
-        };
-    
-        sal_Bool impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier ) const;
-
-        rtl::OUString                     m_aPropCommand;
-        rtl::OUString                     m_aPropModule;
-        rtl::OUString                     m_aPropController;
-        PopupMenuControllerMap            m_aPopupMenuControllerMap;
-        Reference< XMultiServiceFactory > m_xServiceManager;
-        Reference< XMultiServiceFactory > m_xConfigProvider;
-        Reference< XNameAccess >          m_xConfigAccess;
-        sal_Bool                          m_bConfigAccessInitialized;
-};
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_3     (   ConfigurationAccess_PopupMenuControllerFactory                      ,
-                            OWeakObject                                                         ,
-                            DIRECT_INTERFACE ( XTypeProvider                                    ),
-                            DIRECT_INTERFACE ( XContainerListener                               ),
-                            DERIVED_INTERFACE( css::lang::XEventListener, XContainerListener    )
-                        )
-
-DEFINE_XTYPEPROVIDER_3  (   ConfigurationAccess_PopupMenuControllerFactory  ,
-                            XTypeProvider                                   ,
-                            XContainerListener                              ,
-                            css::lang::XEventListener
-                        )
-
-ConfigurationAccess_PopupMenuControllerFactory::ConfigurationAccess_PopupMenuControllerFactory( Reference< XMultiServiceFactory >& rServiceManager ) :
-    ThreadHelpBase(),
-    m_aPropCommand( RTL_CONSTASCII_USTRINGPARAM( "Command" )),
-    m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )),
-    m_aPropController( RTL_CONSTASCII_USTRINGPARAM( "Controller" )),
-    m_xServiceManager( rServiceManager ),
-    m_bConfigAccessInitialized( sal_False )
-{
-    m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance( 
-                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                                                    "com.sun.star.configuration.ConfigurationProvider" ))),
-                                                           UNO_QUERY );
-}
-
-ConfigurationAccess_PopupMenuControllerFactory::~ConfigurationAccess_PopupMenuControllerFactory()
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
-    if ( xContainer.is() )
-        xContainer->removeContainerListener( this );
-}
-
-rtl::OUString ConfigurationAccess_PopupMenuControllerFactory::getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    PopupMenuControllerMap::const_iterator pIter = 
-        m_aPopupMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
-     
-    if ( pIter != m_aPopupMenuControllerMap.end() )
-        return pIter->second;
-    else
-    {
-        // Try to detect if we have a generic popup menu controller
-        pIter = m_aPopupMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() ));
-         
-        if ( pIter != m_aPopupMenuControllerMap.end() )
-            return pIter->second;
-    }
-    
-    return rtl::OUString();
-}
-
-void ConfigurationAccess_PopupMenuControllerFactory::addServiceToCommandModule( 
-    const rtl::OUString& rCommandURL, 
-    const rtl::OUString& rModule, 
-    const rtl::OUString& rServiceSpecifier )
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-
-    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
-    m_aPopupMenuControllerMap.insert( PopupMenuControllerMap::value_type( aHashKey, rServiceSpecifier ));
-}
-
-void ConfigurationAccess_PopupMenuControllerFactory::removeServiceFromCommandModule( 
-    const rtl::OUString& rCommandURL, 
-    const rtl::OUString& rModule )
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
-    m_aPopupMenuControllerMap.erase( aHashKey );
-}
-
-// container.XContainerListener
-void SAL_CALL ConfigurationAccess_PopupMenuControllerFactory::elementInserted( const ContainerEvent& /*aEvent*/ ) throw(RuntimeException)
-{
-    updateConfigurationData();
-}
-
-void SAL_CALL ConfigurationAccess_PopupMenuControllerFactory::elementRemoved ( const ContainerEvent& /*aEvent*/ ) throw(RuntimeException)
-{
-    updateConfigurationData();
-}
-
-void SAL_CALL ConfigurationAccess_PopupMenuControllerFactory::elementReplaced( const ContainerEvent& /*aEvent*/ ) throw(RuntimeException)
-{
-    updateConfigurationData();
-}
-
-// lang.XEventListener
-void SAL_CALL ConfigurationAccess_PopupMenuControllerFactory::disposing( const EventObject& ) throw(RuntimeException)
-{
-    // SAFE
-    // remove our reference to the config access
-    ResetableGuard aLock( m_aLock );
-    m_xConfigAccess.clear();   
-}
-
-void ConfigurationAccess_PopupMenuControllerFactory::readConfigurationData()
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigAccessInitialized )
-    {
-        Sequence< Any > aArgs( 1 );
-        PropertyValue   aPropValue;
-        
-        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
-        aPropValue.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/PopupMenu" ));
-        aArgs[0] <<= aPropValue;
-        
-        try
-        {
-            m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments( 
-                                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                                                                    "com.sun.star.configuration.ConfigurationAccess" )),
-                                                                                aArgs ), 
-                                                                            UNO_QUERY );
-        }
-        catch ( WrappedTargetException& )
-        {
-        }
-        
-        m_bConfigAccessInitialized = sal_True;
-    }
-    
-    if ( m_xConfigAccess.is() )
-    {
-        // Read and update configuration data
-        updateConfigurationData();
-
-        Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
-        if ( xContainer.is() )
-            xContainer->addContainerListener( this );
-    }
-}
-
-void ConfigurationAccess_PopupMenuControllerFactory::updateConfigurationData()
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    if ( m_xConfigAccess.is() )
-    {
-        Sequence< rtl::OUString >   aPopupMenuControllers = m_xConfigAccess->getElementNames();
-        
-        rtl::OUString aCommand;
-        rtl::OUString aModule;
-        rtl::OUString aService;
-        rtl::OUString aHashKey;
-        
-        m_aPopupMenuControllerMap.clear();
-        for ( sal_Int32 i = 0; i < aPopupMenuControllers.getLength(); i++ )
-        {
-            try
-            {
-                if ( impl_getElementProps( m_xConfigAccess->getByName( aPopupMenuControllers[i] ), aCommand, aModule, aService ))
-                {
-                    // Create hash key from command and module as they are together a primary key to
-                    // the UNO service that implements the popup menu controller.
-                    aHashKey = getHashKeyFromStrings( aCommand, aModule );
-                    m_aPopupMenuControllerMap.insert( PopupMenuControllerMap::value_type( aHashKey, aService ));
-                }
-            }
-            catch ( NoSuchElementException& )
-            {
-            }
-            catch ( WrappedTargetException& )
-            {
-            }
-        }
-    }
-}
-
-sal_Bool ConfigurationAccess_PopupMenuControllerFactory::impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier ) const
-{
-    Reference< XPropertySet > xPropertySet;
-    aElement >>= xPropertySet;
-
-    if ( xPropertySet.is() )
-    {
-        try
-        {
-            xPropertySet->getPropertyValue( m_aPropCommand ) >>= aCommand;
-            xPropertySet->getPropertyValue( m_aPropModule ) >>= aModule;
-            xPropertySet->getPropertyValue( m_aPropController ) >>= aServiceSpecifier;
-        }
-        catch ( com::sun::star::beans::UnknownPropertyException& )
-        {
-            return sal_False;
-        }
-        catch ( com::sun::star::lang::WrappedTargetException& )
-        {
-            return sal_False;
-        }
-    }
-
-    return sal_True;
-}
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_4                    (    PopupMenuControllerFactory                                                      ,
-                                            OWeakObject                                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                       ),
-                                            DIRECT_INTERFACE( css::lang::XMultiComponentFactory		                        ),
-                                            DIRECT_INTERFACE( ::com::sun::star::frame::XUIControllerRegistration    )
-                                        )
-
-DEFINE_XTYPEPROVIDER_4                  (   PopupMenuControllerFactory		    ,
-                                            css::lang::XTypeProvider			,
-                                            css::lang::XServiceInfo				,
-                                            css::lang::XMultiComponentFactory   ,
-                                            ::com::sun::star::frame::XUIControllerRegistration
-                                        )
-
-DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   PopupMenuControllerFactory				        ,
-                                            ::cppu::OWeakObject							    ,
-                                            SERVICENAME_POPUPMENUCONTROLLERFACTORY	        ,
-                                            IMPLEMENTATIONNAME_POPUPMENUCONTROLLERFACTORY
-                                        )
-
-DEFINE_INIT_SERVICE                     (   PopupMenuControllerFactory, {} )
-
-PopupMenuControllerFactory::PopupMenuControllerFactory( const Reference< XMultiServiceFactory >& xServiceManager ) :
-    ThreadHelpBase(),
-    m_bConfigRead( sal_False ),
-    m_xServiceManager( xServiceManager )
-{
-    m_pConfigAccess = new ConfigurationAccess_PopupMenuControllerFactory( m_xServiceManager );
-    m_pConfigAccess->acquire();
-}
-
-PopupMenuControllerFactory::~PopupMenuControllerFactory()
-{
-    ResetableGuard aLock( m_aLock );
-    
-    // reduce reference count
-    m_pConfigAccess->release();
-}
-
-// XMultiComponentFactory
-Reference< XInterface > SAL_CALL PopupMenuControllerFactory::createInstanceWithContext( 
-    const ::rtl::OUString& aServiceSpecifier, 
-    const Reference< XComponentContext >& )
-throw (Exception, RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-    
-    rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( aServiceSpecifier, rtl::OUString() );
-    if ( aServiceName.getLength() > 0 )
-        return m_xServiceManager->createInstance( aServiceName );
-    else
-        return Reference< XInterface >();
-    // SAFE
-}
-
-Reference< XInterface > SAL_CALL PopupMenuControllerFactory::createInstanceWithArgumentsAndContext( 
-    const ::rtl::OUString&                  ServiceSpecifier, 
-    const Sequence< Any >&                  Arguments, 
-    const Reference< XComponentContext >&    )
-throw (Exception, RuntimeException)
-{
-    const rtl::OUString aPropModuleName( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
-    
-    rtl::OUString   aPropName;
-    PropertyValue   aPropValue;
-    
-    // Retrieve the optional module name form the Arguments sequence. It is used as a part of
-    // the hash map key to support different controller implementation for the same URL but different
-    // module!!
-    for ( int i = 0; i < Arguments.getLength(); i++ )
-    {
-        if (( Arguments[i] >>= aPropValue ) && ( aPropValue.Name.equals( aPropModuleName )))
-        {
-            aPropValue.Value >>= aPropName;
-            break;
-        }
-    }
-    
-    // Append the command URL to the Arguments sequence so that one controller can be
-    // used for more than one command URL.
-    Sequence< Any > aNewArgs( Arguments );
-    
-    sal_Int32 nAppendIndex = aNewArgs.getLength();
-    aNewArgs.realloc( aNewArgs.getLength()+1 );
-    aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
-    aPropValue.Value  <<= ServiceSpecifier;
-    aNewArgs[nAppendIndex] <<= aPropValue;
-
-    // SAFE
-    {
-        ResetableGuard aLock( m_aLock );
-        
-        if ( !m_bConfigRead )
-        {
-            m_bConfigRead = sal_True;
-            m_pConfigAccess->readConfigurationData();
-        }
-
-        rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( ServiceSpecifier, aPropName );
-        if ( aServiceName.getLength() > 0 )
-            return m_xServiceManager->createInstanceWithArguments( aServiceName, aNewArgs );
-        else
-            return Reference< XInterface >();
-    }
-    // SAFE
-}
-
-Sequence< ::rtl::OUString > SAL_CALL PopupMenuControllerFactory::getAvailableServiceNames()
-throw (RuntimeException)
-{
-    return Sequence< ::rtl::OUString >();
-}
-
-// XUIControllerRegistration
-sal_Bool SAL_CALL PopupMenuControllerFactory::hasController( 
-    const ::rtl::OUString& aCommandURL, 
-    const rtl::OUString& aModuleName ) 
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-    
-    return ( m_pConfigAccess->getServiceFromCommandModule( aCommandURL, aModuleName ).getLength() > 0 );
-}
-
-void SAL_CALL PopupMenuControllerFactory::registerController( 
-    const ::rtl::OUString& aCommandURL, 
-    const ::rtl::OUString& aModuleName, 
-    const ::rtl::OUString& aControllerImplementationName ) 
-throw (RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-
-    m_pConfigAccess->addServiceToCommandModule( aCommandURL, aModuleName, aControllerImplementationName );
-    // SAFE
-}
-
-void SAL_CALL PopupMenuControllerFactory::deregisterController( 
-    const ::rtl::OUString& aCommandURL, 
-    const rtl::OUString& aModuleName ) 
-throw (RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-
-    m_pConfigAccess->removeServiceFromCommandModule( aCommandURL, aModuleName );
-    // SAFE
-}
-
-} // namespace framework
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: popupmenucontrollerfactory.cxx,v $
+ * $Revision: 1.9 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+#include "uifactory/popupmenucontrollerfactory.hxx"
+#include <threadhelp/resetableguard.hxx>
+#include "services.h"
+#include "uifactory/factoryconfiguration.hxx"
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XContainer.hpp>
+
+//_________________________________________________________________________________________________________________
+//	includes of other projects
+//_________________________________________________________________________________________________________________
+#include <rtl/ustrbuf.hxx>
+#include <cppuhelper/weak.hxx>
+#include <rtl/logfile.hxx>
+
+//_________________________________________________________________________________________________________________
+//	Defines
+//_________________________________________________________________________________________________________________
+// 
+
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::container;
+using namespace ::com::sun::star::frame;
+
+//_________________________________________________________________________________________________________________
+//	Namespace
+//_________________________________________________________________________________________________________________
+// 
+
+namespace framework
+{
+
+//*****************************************************************************************************************
+//	XInterface, XTypeProvider, XServiceInfo
+//*****************************************************************************************************************
+DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   PopupMenuControllerFactory				        ,
+                                            ::cppu::OWeakObject							    ,
+                                            SERVICENAME_POPUPMENUCONTROLLERFACTORY	        ,
+                                            IMPLEMENTATIONNAME_POPUPMENUCONTROLLERFACTORY
+                                        )
+
+DEFINE_INIT_SERVICE                     (   PopupMenuControllerFactory, {} )
+
+PopupMenuControllerFactory::PopupMenuControllerFactory( const Reference< XMultiServiceFactory >& xServiceManager ) :
+    ToolbarControllerFactory(xServiceManager,true)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PopupMenuControllerFactory::PopupMenuControllerFactory" );
+    m_pConfigAccess = new ConfigurationAccess_ControllerFactory( m_xServiceManager,rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/PopupMenu" )) );
+    m_pConfigAccess->acquire();
+}
+
+} // namespace framework
diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx
dissimilarity index 83%
index e28c745bc..b5364b3fb 100644
--- a/framework/source/uifactory/statusbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx
@@ -1,622 +1,94 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: statusbarcontrollerfactory.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-//_________________________________________________________________________________________________________________
-//	my own includes
-//_________________________________________________________________________________________________________________
-#include "uifactory/statusbarcontrollerfactory.hxx"
-#include <threadhelp/resetableguard.hxx>
-#include "services.h"
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XContainer.hpp>
-
-//_________________________________________________________________________________________________________________
-//	includes of other projects
-//_________________________________________________________________________________________________________________
-#include <rtl/ustrbuf.hxx>
-#include <cppuhelper/weak.hxx>
-
-//_________________________________________________________________________________________________________________
-//	Defines
-//_________________________________________________________________________________________________________________
-// 
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::container;
-using namespace ::com::sun::star::frame;
-
-//_________________________________________________________________________________________________________________
-//	Namespace
-//_________________________________________________________________________________________________________________
-// 
-
-namespace framework
-{
-
-// global function needed by both implementations
-static rtl::OUString getHashKeyFromStrings( const rtl::OUString& aCommandURL, const rtl::OUString& aModuleName )
-{
-    rtl::OUStringBuffer aKey( aCommandURL );
-    aKey.appendAscii( "-" );
-    aKey.append( aModuleName );
-    return aKey.makeStringAndClear();
-}
-
-
-//*****************************************************************************************************************
-//	Configuration access class for StatusbarControllerFactory implementation
-//*****************************************************************************************************************
-
-class ConfigurationAccess_StatusbarControllerFactory : // interfaces
-                                                       public  XTypeProvider                            ,
-                                                       public  XContainerListener                       ,
-                                                       // baseclasses
-                                                       // Order is neccessary for right initialization!
-                                                       private ThreadHelpBase                           ,
-                                                       public  ::cppu::OWeakObject
-{
-    public:
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-                      
-                      ConfigurationAccess_StatusbarControllerFactory( Reference< XMultiServiceFactory >& rServiceManager );
-        virtual       ~ConfigurationAccess_StatusbarControllerFactory();
-
-        void          readConfigurationData();
-
-        rtl::OUString getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const;
-        rtl::OUString getValueFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const;
-        void          addServiceToCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier );
-        void          removeServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule );
-
-        // container.XContainerListener
-        virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException);
-        virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException);
-        virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException);
-
-        // lang.XEventListener
-        virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException);
- 
-    private:
-        struct StatusbarControllerInfo
-        {
-            rtl::OUString m_aImplementationName;
-            rtl::OUString m_aValue;
-        };
-        
-        class StatusbarControllerMap : public std::hash_map< rtl::OUString,
-                                                             StatusbarControllerInfo,
-                                                             OUStringHashCode,
-                                                             ::std::equal_to< ::rtl::OUString > >
-        {
-            inline void free()
-            {
-                StatusbarControllerMap().swap( *this );
-            }
-        };
-    
-        sal_Bool impl_getElementProps( const Any& aElement, 
-                                       rtl::OUString& aCommand, 
-                                       rtl::OUString& aModule, 
-                                       rtl::OUString& aServiceSpecifier, 
-                                       rtl::OUString& aValue ) const;
-
-        rtl::OUString                     m_aPropCommand;
-        rtl::OUString                     m_aPropModule;
-        rtl::OUString                     m_aPropController;
-        rtl::OUString                     m_aPropValue;
-        StatusbarControllerMap            m_aStatusbarControllerMap;
-        Reference< XMultiServiceFactory > m_xServiceManager;
-        Reference< XMultiServiceFactory > m_xConfigProvider;
-        Reference< XNameAccess >          m_xConfigAccess;
-        sal_Bool                          m_bConfigAccessInitialized;
-};
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_3     (   ConfigurationAccess_StatusbarControllerFactory                      ,
-                            OWeakObject                                                         ,
-                            DIRECT_INTERFACE ( XTypeProvider                                    ),
-                            DIRECT_INTERFACE ( XContainerListener                               ),
-                            DERIVED_INTERFACE( css::lang::XEventListener, XContainerListener    )
-                        )
-
-DEFINE_XTYPEPROVIDER_3  (   ConfigurationAccess_StatusbarControllerFactory  ,
-                            XTypeProvider                                   ,
-                            XContainerListener                              ,
-                            css::lang::XEventListener
-                        )
-
-ConfigurationAccess_StatusbarControllerFactory::ConfigurationAccess_StatusbarControllerFactory( Reference< XMultiServiceFactory >& rServiceManager ) :
-    ThreadHelpBase(),
-    m_aPropCommand( RTL_CONSTASCII_USTRINGPARAM( "Command" )),
-    m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )),
-    m_aPropController( RTL_CONSTASCII_USTRINGPARAM( "Controller" )),
-    m_aPropValue( RTL_CONSTASCII_USTRINGPARAM( "Value" )),
-    m_xServiceManager( rServiceManager ),
-    m_bConfigAccessInitialized( sal_False )
-{
-    m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance( 
-                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                                                    "com.sun.star.configuration.ConfigurationProvider" ))),
-                                                           UNO_QUERY );
-}
-
-ConfigurationAccess_StatusbarControllerFactory::~ConfigurationAccess_StatusbarControllerFactory()
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
-    if ( xContainer.is() )
-        xContainer->removeContainerListener( this );
-}
-
-rtl::OUString ConfigurationAccess_StatusbarControllerFactory::getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    StatusbarControllerMap::const_iterator pIter = 
-        m_aStatusbarControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
-     
-    if ( pIter != m_aStatusbarControllerMap.end() )
-        return pIter->second.m_aImplementationName;
-    else
-    {
-        // Try to detect if we have a generic controller
-        pIter = m_aStatusbarControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() ));
-         
-        if ( pIter != m_aStatusbarControllerMap.end() )
-            return pIter->second.m_aImplementationName;
-    }
-    
-    return rtl::OUString();
-}
-
-rtl::OUString ConfigurationAccess_StatusbarControllerFactory::getValueFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    StatusbarControllerMap::const_iterator pIter = 
-        m_aStatusbarControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
-     
-    if ( pIter != m_aStatusbarControllerMap.end() )
-        return pIter->second.m_aValue;
-    else
-    {
-        // Try to detect if we have a generic popup menu controller
-        pIter = m_aStatusbarControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() ));
-         
-        if ( pIter != m_aStatusbarControllerMap.end() )
-            return pIter->second.m_aValue;
-    }
-    
-    return rtl::OUString();
-}
-
-void ConfigurationAccess_StatusbarControllerFactory::addServiceToCommandModule( 
-    const rtl::OUString& rCommandURL, 
-    const rtl::OUString& rModule, 
-    const rtl::OUString& rServiceSpecifier )
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-
-    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
-
-    StatusbarControllerInfo& rControllerInfo = m_aStatusbarControllerMap[ aHashKey ];
-    rControllerInfo.m_aImplementationName = rServiceSpecifier;
-    rControllerInfo.m_aValue = rtl::OUString();
-}
-
-void ConfigurationAccess_StatusbarControllerFactory::removeServiceFromCommandModule( 
-    const rtl::OUString& rCommandURL, 
-    const rtl::OUString& rModule )
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
-    m_aStatusbarControllerMap.erase( aHashKey );
-}
-
-// container.XContainerListener
-void SAL_CALL ConfigurationAccess_StatusbarControllerFactory::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException)
-{
-    rtl::OUString   aCommand;
-    rtl::OUString   aModule;
-    rtl::OUString   aService;
-    rtl::OUString   aValue;
-    
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-
-    if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService, aValue ))
-    {
-        // Create hash key from command and module as they are together a primary key to
-        // the UNO service that implements the popup menu controller.
-        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
-        StatusbarControllerInfo& rControllerInfo = m_aStatusbarControllerMap[ aHashKey ];
-        rControllerInfo.m_aImplementationName = aService;
-        rControllerInfo.m_aValue = aValue;
-    }
-}
-
-void SAL_CALL ConfigurationAccess_StatusbarControllerFactory::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException)
-{
-    rtl::OUString   aCommand;
-    rtl::OUString   aModule;
-    rtl::OUString   aService;
-    rtl::OUString   aValue;
-    
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService, aValue ))
-    {
-        // Create hash key from command and module as they are together a primary key to
-        // the UNO service that implements the popup menu controller.
-        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
-        m_aStatusbarControllerMap.erase( aHashKey );
-    }
-}
-
-void SAL_CALL ConfigurationAccess_StatusbarControllerFactory::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException)
-{
-    rtl::OUString   aCommand;
-    rtl::OUString   aModule;
-    rtl::OUString   aService;
-    rtl::OUString   aValue;
-    
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-
-    if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService, aValue ))
-    {
-        // Create hash key from command and module as they are together a primary key to
-        // the UNO service that implements the popup menu controller.
-        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
-        StatusbarControllerInfo& rControllerInfo = m_aStatusbarControllerMap[ aHashKey ];
-        rControllerInfo.m_aImplementationName = aService;
-        rControllerInfo.m_aValue = aValue;
-    }
-}
-
-// lang.XEventListener
-void SAL_CALL ConfigurationAccess_StatusbarControllerFactory::disposing( const EventObject& ) throw(RuntimeException)
-{
-    // SAFE
-    // remove our reference to the config access
-    ResetableGuard aLock( m_aLock );
-    m_xConfigAccess.clear();   
-}
-
-void ConfigurationAccess_StatusbarControllerFactory::readConfigurationData()
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigAccessInitialized )
-    {
-        Sequence< Any > aArgs( 1 );
-        PropertyValue   aPropValue;
-        
-        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
-        aPropValue.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/StatusBar" ));
-        aArgs[0] <<= aPropValue;
-        
-        try
-        {
-            m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments( 
-                                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                                                                    "com.sun.star.configuration.ConfigurationAccess" )),
-                                                                                aArgs ), 
-                                                                            UNO_QUERY );
-        }
-        catch ( WrappedTargetException& )
-        {
-        }
-        
-        m_bConfigAccessInitialized = sal_True;
-    }
-    
-    if ( m_xConfigAccess.is() )
-    {
-        Sequence< rtl::OUString >   aStatusbarControllers = m_xConfigAccess->getElementNames();
-        
-        Any a;
-        rtl::OUString             aCommand;
-        rtl::OUString             aModule;
-        rtl::OUString             aService;
-        rtl::OUString             aValue;
-        rtl::OUString             aHashKey;
-        Reference< XPropertySet > xPropertySet;
-        for ( sal_Int32 i = 0; i < aStatusbarControllers.getLength(); i++ )
-        {
-            if ( impl_getElementProps( m_xConfigAccess->getByName( aStatusbarControllers[i] ), aCommand, aModule, aService, aValue ))
-            {
-                // Create hash key from command and module as they are together a primary key to
-                // the UNO service that implements the popup menu controller.
-                aHashKey = getHashKeyFromStrings( aCommand, aModule );
-                StatusbarControllerInfo& rControllerInfo = m_aStatusbarControllerMap[ aHashKey ];
-                rControllerInfo.m_aImplementationName = aService;
-                rControllerInfo.m_aValue = aValue;
-            }
-        }
-    
-        // UNSAFE
-        aLock.unlock();
-
-        Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
-        if ( xContainer.is() )
-            xContainer->addContainerListener( this );
-    }
-}
-
-sal_Bool ConfigurationAccess_StatusbarControllerFactory::impl_getElementProps( 
-    const Any& aElement, 
-    rtl::OUString& aCommand, 
-    rtl::OUString& aModule, 
-    rtl::OUString& aServiceSpecifier,
-    rtl::OUString& aValue ) const
-{
-    Reference< XPropertySet > xPropertySet;
-    aElement >>= xPropertySet;
-
-    if ( xPropertySet.is() )
-    {
-        try
-        {
-            xPropertySet->getPropertyValue( m_aPropCommand ) >>= aCommand;
-            xPropertySet->getPropertyValue( m_aPropModule ) >>= aModule;
-            xPropertySet->getPropertyValue( m_aPropController ) >>= aServiceSpecifier;
-            xPropertySet->getPropertyValue( m_aPropValue ) >>= aValue;
-        }
-        catch ( com::sun::star::beans::UnknownPropertyException& )
-        {
-            return sal_False;
-        }
-        catch ( com::sun::star::lang::WrappedTargetException& )
-        {
-            return sal_False;
-        }
-    }
-
-    return sal_True;
-}
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_4                    (    StatusbarControllerFactory                                                      ,
-                                            OWeakObject                                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                       ),
-                                            DIRECT_INTERFACE( css::lang::XMultiComponentFactory		                        ),
-                                            DIRECT_INTERFACE( ::com::sun::star::frame::XUIControllerRegistration    )
-                                        )
-
-DEFINE_XTYPEPROVIDER_4                  (   StatusbarControllerFactory		    ,
-                                            css::lang::XTypeProvider			,
-                                            css::lang::XServiceInfo				,
-                                            css::lang::XMultiComponentFactory   ,
-                                            ::com::sun::star::frame::XUIControllerRegistration
-                                        )
-
-DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   StatusbarControllerFactory				        ,
-                                            ::cppu::OWeakObject							    ,
-                                            SERVICENAME_STATUSBARCONTROLLERFACTORY	        ,
-                                            IMPLEMENTATIONNAME_STATUSBARCONTROLLERFACTORY
-                                        )
-
-DEFINE_INIT_SERVICE                     (   StatusbarControllerFactory, {} )
-
-StatusbarControllerFactory::StatusbarControllerFactory( const Reference< XMultiServiceFactory >& xServiceManager ) :
-    ThreadHelpBase(),
-    m_bConfigRead( sal_False ),
-    m_xServiceManager( xServiceManager )
-{
-    m_pConfigAccess = new ConfigurationAccess_StatusbarControllerFactory( m_xServiceManager );
-    m_pConfigAccess->acquire();
-}
-
-StatusbarControllerFactory::~StatusbarControllerFactory()
-{
-    ResetableGuard aLock( m_aLock );
-    
-    // reduce reference count
-    m_pConfigAccess->release();
-}
-
-// XMultiComponentFactory
-Reference< XInterface > SAL_CALL StatusbarControllerFactory::createInstanceWithContext( 
-    const ::rtl::OUString& aServiceSpecifier, 
-    const Reference< XComponentContext >& )
-throw (Exception, RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-    
-    rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( aServiceSpecifier, rtl::OUString() );
-    if ( aServiceName.getLength() > 0 )
-        return m_xServiceManager->createInstance( aServiceName );
-    else
-        return Reference< XInterface >();
-    // SAFE
-}
-
-Reference< XInterface > SAL_CALL StatusbarControllerFactory::createInstanceWithArgumentsAndContext( 
-    const ::rtl::OUString&                  ServiceSpecifier, 
-    const Sequence< Any >&                  Arguments, 
-    const Reference< XComponentContext >& )
-throw (Exception, RuntimeException)
-{
-    const rtl::OUString aPropModuleName( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
-    const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" ));
-    
-    rtl::OUString   aPropName;
-    PropertyValue   aPropValue;
-    
-    // Retrieve the optional module name form the Arguments sequence. It is used as a part of
-    // the hash map key to support different controller implementation for the same URL but different
-    // module!!
-    for ( int i = 0; i < Arguments.getLength(); i++ )
-    {
-        if (( Arguments[i] >>= aPropValue ) && ( aPropValue.Name.equals( aPropModuleName )))
-        {
-            aPropValue.Value >>= aPropName;
-            break;
-        }
-    }
-    
-    Sequence< Any > aNewArgs( Arguments );
-    
-    sal_Int32 nAppendIndex = aNewArgs.getLength();
-    aNewArgs.realloc( aNewArgs.getLength()+2 );
-
-    // Append the command URL to the Arguments sequence so that one controller can be
-    // used for more than one command URL.
-    aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
-    aPropValue.Value  <<= ServiceSpecifier;
-    aNewArgs[nAppendIndex] <<= aPropValue;
-    
-    // Append the optional value argument. It's an empty string if no additional info
-    // is provided to the controller.
-    rtl::OUString aValue = m_pConfigAccess->getValueFromCommandModule( ServiceSpecifier, aPropName );
-    aPropValue.Name = aPropValueName;
-    aPropValue.Value <<= aValue;
-    aNewArgs[nAppendIndex+1] <<= aPropValue;
-
-    {
-        // SAFE
-        ResetableGuard aLock( m_aLock );
-        
-        if ( !m_bConfigRead )
-        {
-            m_bConfigRead = sal_True;
-            m_pConfigAccess->readConfigurationData();
-        }
-        
-        rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( ServiceSpecifier, aPropName );
-        Reference< XMultiServiceFactory > xServiceManager( m_xServiceManager );
-        
-        aLock.unlock();
-        // SAFE
-
-        
-        if ( aServiceName.getLength() > 0 )
-            return xServiceManager->createInstanceWithArguments( aServiceName, aNewArgs );
-        else
-            return Reference< XInterface >();
-    }
-}
-
-Sequence< ::rtl::OUString > SAL_CALL StatusbarControllerFactory::getAvailableServiceNames()
-throw (RuntimeException)
-{
-    return Sequence< ::rtl::OUString >();
-}
-
-// XUIControllerRegistration
-sal_Bool SAL_CALL StatusbarControllerFactory::hasController( 
-    const ::rtl::OUString& aCommandURL, 
-    const rtl::OUString& aModuleName ) 
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-    
-    return ( m_pConfigAccess->getServiceFromCommandModule( aCommandURL, aModuleName ).getLength() > 0 );
-}
-
-void SAL_CALL StatusbarControllerFactory::registerController( 
-    const ::rtl::OUString& aCommandURL, 
-    const ::rtl::OUString& aModuleName, 
-    const ::rtl::OUString& aControllerImplementationName ) 
-throw (RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-
-    m_pConfigAccess->addServiceToCommandModule( aCommandURL, aModuleName, aControllerImplementationName );
-    // SAFE
-}
-
-void SAL_CALL StatusbarControllerFactory::deregisterController( 
-    const ::rtl::OUString& aCommandURL, 
-    const rtl::OUString& aModuleName ) 
-throw (RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-
-    m_pConfigAccess->removeServiceFromCommandModule( aCommandURL, aModuleName );
-    // SAFE
-}
-
-} // namespace framework
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: statusbarcontrollerfactory.cxx,v $
+ * $Revision: 1.8 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+#include "uifactory/statusbarcontrollerfactory.hxx"
+#include "uifactory/factoryconfiguration.hxx"
+#include <threadhelp/resetableguard.hxx>
+#include "services.h"
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XContainer.hpp>
+
+//_________________________________________________________________________________________________________________
+//	includes of other projects
+//_________________________________________________________________________________________________________________
+#include <rtl/ustrbuf.hxx>
+#include <cppuhelper/weak.hxx>
+
+//_________________________________________________________________________________________________________________
+//	Defines
+//_________________________________________________________________________________________________________________
+// 
+
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::container;
+using namespace ::com::sun::star::frame;
+
+//_________________________________________________________________________________________________________________
+//	Namespace
+//_________________________________________________________________________________________________________________
+// 
+
+namespace framework
+{
+//*****************************************************************************************************************
+//	XInterface, XTypeProvider, XServiceInfo
+//*****************************************************************************************************************
+DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   StatusbarControllerFactory				        ,
+                                            ::cppu::OWeakObject							    ,
+                                            SERVICENAME_STATUSBARCONTROLLERFACTORY	        ,
+                                            IMPLEMENTATIONNAME_STATUSBARCONTROLLERFACTORY
+                                        )
+
+DEFINE_INIT_SERVICE                     (   StatusbarControllerFactory, {} )
+
+StatusbarControllerFactory::StatusbarControllerFactory( const Reference< XMultiServiceFactory >& xServiceManager ) :
+    ToolbarControllerFactory(xServiceManager,true)
+{
+    m_pConfigAccess = new ConfigurationAccess_ControllerFactory( m_xServiceManager,rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/StatusBar" )),true );
+    m_pConfigAccess->acquire();
+}   
+
+
+} // namespace framework
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index 7276556c1..07303c55e 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -31,6 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 #include <uifactory/statusbarfactory.hxx>
+#include <uifactory/menubarfactory.hxx>
 
 //_________________________________________________________________________________________________________________
 //	my own includes
@@ -76,19 +77,6 @@ namespace framework
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_3                    (    StatusBarFactory                                                ,
-                                            OWeakObject                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                       ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementFactory )
-                                        )
-
-DEFINE_XTYPEPROVIDER_3                  (   StatusBarFactory                                ,
-                                            css::lang::XTypeProvider			            ,
-                                            css::lang::XServiceInfo				            ,
-                                            ::com::sun::star::ui::XUIElementFactory
-                                        )
-
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   StatusBarFactory				                ,
                                             ::cppu::OWeakObject							    ,
                                             SERVICENAME_STATUSBARFACTORY	                ,
@@ -98,16 +86,9 @@ DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   StatusBarFactory
 DEFINE_INIT_SERVICE                     (   StatusBarFactory, {} )
 
 StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    ThreadHelpBase( &Application::GetSolarMutex() )
-    , m_xServiceManager( xServiceManager )
-    , m_xModuleManager( xServiceManager->createInstance(
-                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))),
-                        UNO_QUERY )
-{
-}
-
-StatusBarFactory::~StatusBarFactory()
+    MenuBarFactory( xServiceManager,true )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarFactory::StatusBarFactory" );
 }
 
 // XUIElementFactory
@@ -116,88 +97,15 @@ Reference< XUIElement > SAL_CALL StatusBarFactory::createUIElement(
     const Sequence< PropertyValue >& Args )
 throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarFactory::createUIElement" );
     // SAFE
     ResetableGuard aLock( m_aLock );
-
-    Reference< XUIConfigurationManager > xConfigSource;
-    Reference< XFrame >                  xFrame;
-    rtl::OUString                        aResourceURL( ResourceURL );
-    sal_Bool                             bPersistent( sal_True );
-
-    for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
-    {
-        if ( Args[n].Name.equalsAscii( "ConfigurationSource" ))
-            Args[n].Value >>= xConfigSource;
-        else if ( Args[n].Name.equalsAscii( "Frame" ))
-            Args[n].Value >>= xFrame;
-        else if ( Args[n].Name.equalsAscii( "ResourceURL" ))
-            Args[n].Value >>= aResourceURL;
-        else if ( Args[n].Name.equalsAscii( "Persistent" ))
-            Args[n].Value >>= bPersistent;
-    }
-
-    Reference< XUIConfigurationManager > xCfgMgr;
-    if ( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/" ))) != 0 )
-        throw IllegalArgumentException();
-    else
-    {
-        // Identify frame and determine document based ui configuration manager/module ui configuration manager
-        if ( xFrame.is() && !xConfigSource.is() )
-        {
-            bool bHasSettings( false );
-            Reference< XModel > xModel;
-
-            Reference< XController > xController = xFrame->getController();
-            if ( xController.is() )
-                xModel = xController->getModel();
-
-            if ( xModel.is() )
-            {
-                Reference< XUIConfigurationManagerSupplier > xUIConfigurationManagerSupplier( xModel, UNO_QUERY );
-                if ( xUIConfigurationManagerSupplier.is() )
-                {
-                    xCfgMgr = xUIConfigurationManagerSupplier->getUIConfigurationManager();
-                    bHasSettings = xCfgMgr->hasSettings( aResourceURL );
-                }
-            }
-
-            if ( !bHasSettings )
-            {
-                rtl::OUString aModuleIdentifier = m_xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ));
-                if ( aModuleIdentifier.getLength() )
-                {
-                    Reference< ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(
-                        m_xServiceManager->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ))),
-                        UNO_QUERY );
-                    xCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier );
-                    bHasSettings = xCfgMgr->hasSettings( aResourceURL );
-                }
-            }
-        }
-    }
-
-    PropertyValue aPropValue;
-    Sequence< Any > aPropSeq( 4 );
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-    aPropValue.Value <<= xFrame;
-    aPropSeq[0] <<= aPropValue;
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
-    aPropValue.Value <<= xCfgMgr;
-    aPropSeq[1] <<= aPropValue;
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" ));
-    aPropValue.Value <<= aResourceURL;
-    aPropSeq[2] <<= aPropValue;
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
-    aPropValue.Value <<= bPersistent;
-    aPropSeq[3] <<= aPropValue;
-
-    vos::OGuard	aGuard( Application::GetSolarMutex() );
-    StatusBarWrapper* pStatusBarWrapper = new StatusBarWrapper( m_xServiceManager );
-    Reference< ::com::sun::star::ui::XUIElement > xStatusBar( (OWeakObject *)pStatusBarWrapper, UNO_QUERY );
-    Reference< XInitialization > xInit( xStatusBar, UNO_QUERY );
-    xInit->initialize( aPropSeq );
-    return xStatusBar;
+    StatusBarWrapper* pWrapper = new StatusBarWrapper( m_xServiceManager );
+    Reference< ::com::sun::star::ui::XUIElement > xMenuBar( (OWeakObject *)pWrapper, UNO_QUERY );
+    Reference< ::com::sun::star::frame::XModuleManager > xModuleManager = m_xModuleManager;
+    aLock.unlock();
+    MenuBarFactory::CreateUIElement(ResourceURL,Args,NULL,"private:resource/statusbar/",xMenuBar,xModuleManager,m_xServiceManager);
+    return xMenuBar;
 }
 
 }
diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx
dissimilarity index 62%
index 96b81b907..8bff439d5 100644
--- a/framework/source/uifactory/toolbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx
@@ -1,555 +1,265 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: toolbarcontrollerfactory.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-//_________________________________________________________________________________________________________________
-//	my own includes
-//_________________________________________________________________________________________________________________
-#include "uifactory/toolbarcontrollerfactory.hxx"
-#include <threadhelp/resetableguard.hxx>
-#include "services.h"
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XContainer.hpp>
-
-//_________________________________________________________________________________________________________________
-//	includes of other projects
-//_________________________________________________________________________________________________________________
-#include <rtl/ustrbuf.hxx>
-#include <cppuhelper/weak.hxx>
-
-//_________________________________________________________________________________________________________________
-//	Defines
-//_________________________________________________________________________________________________________________
-// 
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::container;
-using namespace ::com::sun::star::frame;
-
-//_________________________________________________________________________________________________________________
-//	Namespace
-//_________________________________________________________________________________________________________________
-// 
-
-namespace framework
-{
-
-// global function needed by both implementations
-static rtl::OUString getHashKeyFromStrings( const rtl::OUString& aCommandURL, const rtl::OUString& aModuleName )
-{
-    rtl::OUStringBuffer aKey( aCommandURL );
-    aKey.appendAscii( "-" );
-    aKey.append( aModuleName );
-    return aKey.makeStringAndClear();
-}
-
-
-//*****************************************************************************************************************
-//	Configuration access class for ToolbarControllerFactory implementation
-//*****************************************************************************************************************
-
-class ConfigurationAccess_ToolbarControllerFactory : // interfaces
-                                                       public  XTypeProvider                            ,
-                                                       public  XContainerListener                       ,
-                                                       // baseclasses
-                                                       // Order is neccessary for right initialization!
-                                                       private ThreadHelpBase                           ,
-                                                       public  ::cppu::OWeakObject
-{
-    public:
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-                      
-                      ConfigurationAccess_ToolbarControllerFactory( Reference< XMultiServiceFactory >& rServiceManager );
-        virtual       ~ConfigurationAccess_ToolbarControllerFactory();
-
-        void          readConfigurationData();
-
-        rtl::OUString getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const;
-        void          addServiceToCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier );
-        void          removeServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule );
-
-        // container.XContainerListener
-        virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException);
-        virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException);
-        virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException);
-
-        // lang.XEventListener
-        virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException);
- 
-    private:
-        class ToolbarControllerMap : public std::hash_map< rtl::OUString,
-                                                             rtl::OUString,
-                                                             OUStringHashCode,
-                                                             ::std::equal_to< ::rtl::OUString > >
-        {
-            inline void free()
-            {
-                ToolbarControllerMap().swap( *this );
-            }
-        };
-    
-        sal_Bool impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier ) const;
-
-        rtl::OUString                     m_aPropCommand;
-        rtl::OUString                     m_aPropModule;
-        rtl::OUString                     m_aPropController;
-        ToolbarControllerMap              m_aToolbarControllerMap;
-        Reference< XMultiServiceFactory > m_xServiceManager;
-        Reference< XMultiServiceFactory > m_xConfigProvider;
-        Reference< XNameAccess >          m_xConfigAccess;
-        sal_Bool                          m_bConfigAccessInitialized;
-};
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_3     (   ConfigurationAccess_ToolbarControllerFactory                      ,
-                            OWeakObject                                                         ,
-                            DIRECT_INTERFACE ( XTypeProvider                                    ),
-                            DIRECT_INTERFACE ( XContainerListener                               ),
-                            DERIVED_INTERFACE( css::lang::XEventListener, XContainerListener    )
-                        )
-
-DEFINE_XTYPEPROVIDER_3  (   ConfigurationAccess_ToolbarControllerFactory  ,
-                            XTypeProvider                                   ,
-                            XContainerListener                              ,
-                            css::lang::XEventListener
-                        )
-
-ConfigurationAccess_ToolbarControllerFactory::ConfigurationAccess_ToolbarControllerFactory( Reference< XMultiServiceFactory >& rServiceManager ) :
-    ThreadHelpBase(),
-    m_aPropCommand( RTL_CONSTASCII_USTRINGPARAM( "Command" )),
-    m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )),
-    m_aPropController( RTL_CONSTASCII_USTRINGPARAM( "Controller" )),
-    m_xServiceManager( rServiceManager ),
-    m_bConfigAccessInitialized( sal_False )
-{
-    m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance( 
-                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                                                    "com.sun.star.configuration.ConfigurationProvider" ))),
-                                                           UNO_QUERY );
-}
-
-ConfigurationAccess_ToolbarControllerFactory::~ConfigurationAccess_ToolbarControllerFactory()
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
-    if ( xContainer.is() )
-        xContainer->removeContainerListener( this );
-}
-
-rtl::OUString ConfigurationAccess_ToolbarControllerFactory::getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    ToolbarControllerMap::const_iterator pIter = 
-        m_aToolbarControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
-     
-    if ( pIter != m_aToolbarControllerMap.end() )
-        return pIter->second;
-    else
-    {
-        // Try to detect if we have a generic popup menu controller
-        pIter = m_aToolbarControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() ));
-         
-        if ( pIter != m_aToolbarControllerMap.end() )
-            return pIter->second;
-    }
-    
-    return rtl::OUString();
-}
-
-void ConfigurationAccess_ToolbarControllerFactory::addServiceToCommandModule( 
-    const rtl::OUString& rCommandURL, 
-    const rtl::OUString& rModule, 
-    const rtl::OUString& rServiceSpecifier )
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-
-    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
-    m_aToolbarControllerMap.insert( ToolbarControllerMap::value_type( aHashKey, rServiceSpecifier ));
-}
-
-void ConfigurationAccess_ToolbarControllerFactory::removeServiceFromCommandModule( 
-    const rtl::OUString& rCommandURL, 
-    const rtl::OUString& rModule )
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
-    m_aToolbarControllerMap.erase( aHashKey );
-}
-
-// container.XContainerListener
-void SAL_CALL ConfigurationAccess_ToolbarControllerFactory::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException)
-{
-    rtl::OUString   aCommand;
-    rtl::OUString   aModule;
-    rtl::OUString   aService;
-    
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-
-    if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService ))
-    {
-        // Create hash key from command and module as they are together a primary key to
-        // the UNO service that implements the popup menu controller.
-        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
-        m_aToolbarControllerMap.insert( ToolbarControllerMap::value_type( aHashKey, aService ));
-    }
-}
-
-void SAL_CALL ConfigurationAccess_ToolbarControllerFactory::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException)
-{
-    rtl::OUString   aCommand;
-    rtl::OUString   aModule;
-    rtl::OUString   aService;
-    
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService ))
-    {
-        // Create hash key from command and module as they are together a primary key to
-        // the UNO service that implements the popup menu controller.
-        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
-        m_aToolbarControllerMap.erase( aHashKey );
-    }
-}
-
-void SAL_CALL ConfigurationAccess_ToolbarControllerFactory::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException)
-{
-    rtl::OUString   aCommand;
-    rtl::OUString   aModule;
-    rtl::OUString   aService;
-    
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-
-    if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService ))
-    {
-        // Create hash key from command and module as they are together a primary key to
-        // the UNO service that implements the popup menu controller.
-        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
-        m_aToolbarControllerMap.erase( aHashKey );
-        m_aToolbarControllerMap.insert( ToolbarControllerMap::value_type( aHashKey, aService ));
-    }
-}
-
-// lang.XEventListener
-void SAL_CALL ConfigurationAccess_ToolbarControllerFactory::disposing( const EventObject& ) throw(RuntimeException)
-{
-    // SAFE
-    // remove our reference to the config access
-    ResetableGuard aLock( m_aLock );
-    m_xConfigAccess.clear();   
-}
-
-void ConfigurationAccess_ToolbarControllerFactory::readConfigurationData()
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigAccessInitialized )
-    {
-        Sequence< Any > aArgs( 1 );
-        PropertyValue   aPropValue;
-        
-        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
-        aPropValue.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/ToolBar" ));
-        aArgs[0] <<= aPropValue;
-        
-        try
-        {
-            m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments( 
-                                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                                                                    "com.sun.star.configuration.ConfigurationAccess" )),
-                                                                                aArgs ), 
-                                                                            UNO_QUERY );
-        }
-        catch ( WrappedTargetException& )
-        {
-        }
-        
-        m_bConfigAccessInitialized = sal_True;
-    }
-    
-    if ( m_xConfigAccess.is() )
-    {
-        Sequence< rtl::OUString >   aToolbarControllers = m_xConfigAccess->getElementNames();
-        
-        Any a;
-        rtl::OUString             aCommand;
-        rtl::OUString             aModule;
-        rtl::OUString             aService;
-        rtl::OUString             aHashKey;
-        Reference< XPropertySet > xPropertySet;
-        for ( sal_Int32 i = 0; i < aToolbarControllers.getLength(); i++ )
-        {
-            if ( impl_getElementProps( m_xConfigAccess->getByName( aToolbarControllers[i] ), aCommand, aModule, aService ))
-            {
-                // Create hash key from command and module as they are together a primary key to
-                // the UNO service that implements the popup menu controller.
-                aHashKey = getHashKeyFromStrings( aCommand, aModule );
-                m_aToolbarControllerMap.insert( ToolbarControllerMap::value_type( aHashKey, aService ));
-            }
-        }
-    
-        // UNSAFE
-        aLock.unlock();
-
-        Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
-        if ( xContainer.is() )
-            xContainer->addContainerListener( this );
-    }
-}
-
-sal_Bool ConfigurationAccess_ToolbarControllerFactory::impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier ) const
-{
-    Reference< XPropertySet > xPropertySet;
-    aElement >>= xPropertySet;
-
-    if ( xPropertySet.is() )
-    {
-        try
-        {
-            xPropertySet->getPropertyValue( m_aPropCommand ) >>= aCommand;
-            xPropertySet->getPropertyValue( m_aPropModule ) >>= aModule;
-            xPropertySet->getPropertyValue( m_aPropController ) >>= aServiceSpecifier;
-        }
-        catch ( com::sun::star::beans::UnknownPropertyException& )
-        {
-            return sal_False;
-        }
-        catch ( com::sun::star::lang::WrappedTargetException& )
-        {
-            return sal_False;
-        }
-    }
-
-    return sal_True;
-}
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_4                    (    ToolbarControllerFactory                                                      ,
-                                            OWeakObject                                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                       ),
-                                            DIRECT_INTERFACE( css::lang::XMultiComponentFactory		                        ),
-                                            DIRECT_INTERFACE( ::com::sun::star::frame::XUIControllerRegistration    )
-                                        )
-
-DEFINE_XTYPEPROVIDER_4                  (   ToolbarControllerFactory		    ,
-                                            css::lang::XTypeProvider			,
-                                            css::lang::XServiceInfo				,
-                                            css::lang::XMultiComponentFactory   ,
-                                            ::com::sun::star::frame::XUIControllerRegistration
-                                        )
-
-DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   ToolbarControllerFactory				        ,
-                                            ::cppu::OWeakObject							    ,
-                                            SERVICENAME_TOOLBARCONTROLLERFACTORY	        ,
-                                            IMPLEMENTATIONNAME_TOOLBARCONTROLLERFACTORY
-                                        )
-
-DEFINE_INIT_SERVICE                     (   ToolbarControllerFactory, {} )
-
-ToolbarControllerFactory::ToolbarControllerFactory( const Reference< XMultiServiceFactory >& xServiceManager ) :
-    ThreadHelpBase(),
-    m_bConfigRead( sal_False ),
-    m_xServiceManager( xServiceManager )
-{
-    m_pConfigAccess = new ConfigurationAccess_ToolbarControllerFactory( m_xServiceManager );
-    m_pConfigAccess->acquire();
-}
-
-ToolbarControllerFactory::~ToolbarControllerFactory()
-{
-    ResetableGuard aLock( m_aLock );
-    
-    // reduce reference count
-    m_pConfigAccess->release();
-}
-
-// XMultiComponentFactory
-Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithContext( 
-    const ::rtl::OUString& aServiceSpecifier, 
-    const Reference< XComponentContext >& )
-throw (Exception, RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-    
-    rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( aServiceSpecifier, rtl::OUString() );
-    if ( aServiceName.getLength() > 0 )
-        return m_xServiceManager->createInstance( aServiceName );
-    else
-        return Reference< XInterface >();
-    // SAFE
-}
-
-Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithArgumentsAndContext( 
-    const ::rtl::OUString&                  ServiceSpecifier, 
-    const Sequence< Any >&                  Arguments, 
-    const Reference< XComponentContext >& )
-throw (Exception, RuntimeException)
-{
-    const rtl::OUString aPropModuleName( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
-    
-    rtl::OUString   aPropName;
-    PropertyValue   aPropValue;
-    
-    // Retrieve the optional module name form the Arguments sequence. It is used as a part of
-    // the hash map key to support different controller implementation for the same URL but different
-    // module!!
-    for ( int i = 0; i < Arguments.getLength(); i++ )
-    {
-        if (( Arguments[i] >>= aPropValue ) && ( aPropValue.Name.equals( aPropModuleName )))
-        {
-            aPropValue.Value >>= aPropName;
-            break;
-        }
-    }
-    
-    // Append the command URL to the Arguments sequence so that one controller can be
-    // used for more than one command URL.
-    Sequence< Any > aNewArgs( Arguments );
-    
-    sal_Int32 nAppendIndex = aNewArgs.getLength();
-    aNewArgs.realloc( aNewArgs.getLength()+1 );
-    aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
-    aPropValue.Value  <<= ServiceSpecifier;
-    aNewArgs[nAppendIndex] <<= aPropValue;
-
-    // SAFE
-    {
-        ResetableGuard aLock( m_aLock );
-        
-        if ( !m_bConfigRead )
-        {
-            m_bConfigRead = sal_True;
-            m_pConfigAccess->readConfigurationData();
-        }
-
-        rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( ServiceSpecifier, aPropName );
-        if ( aServiceName.getLength() > 0 )
-            return m_xServiceManager->createInstanceWithArguments( aServiceName, aNewArgs );
-        else
-            return Reference< XInterface >();
-    }
-    // SAFE
-}
-
-Sequence< ::rtl::OUString > SAL_CALL ToolbarControllerFactory::getAvailableServiceNames()
-throw (RuntimeException)
-{
-    return Sequence< ::rtl::OUString >();
-}
-
-// XUIControllerRegistration
-sal_Bool SAL_CALL ToolbarControllerFactory::hasController( 
-    const ::rtl::OUString& aCommandURL, 
-    const rtl::OUString& aModuleName ) 
-throw (::com::sun::star::uno::RuntimeException)
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-    
-    return ( m_pConfigAccess->getServiceFromCommandModule( aCommandURL, aModuleName ).getLength() > 0 );
-}
-
-void SAL_CALL ToolbarControllerFactory::registerController( 
-    const ::rtl::OUString& aCommandURL, 
-    const ::rtl::OUString& aModuleName, 
-    const ::rtl::OUString& aControllerImplementationName ) 
-throw (RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-
-    m_pConfigAccess->addServiceToCommandModule( aCommandURL, aModuleName, aControllerImplementationName );
-    // SAFE
-}
-
-void SAL_CALL ToolbarControllerFactory::deregisterController( 
-    const ::rtl::OUString& aCommandURL, 
-    const rtl::OUString& aModuleName ) 
-throw (RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    if ( !m_bConfigRead )
-    {
-        m_bConfigRead = sal_True;
-        m_pConfigAccess->readConfigurationData();
-    }
-
-    m_pConfigAccess->removeServiceFromCommandModule( aCommandURL, aModuleName );
-    // SAFE
-}
-
-} // namespace framework
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: toolbarcontrollerfactory.cxx,v $
+ * $Revision: 1.8 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+#include "uifactory/toolbarcontrollerfactory.hxx"
+#include "uifactory/factoryconfiguration.hxx"
+#include <threadhelp/resetableguard.hxx>
+#include "services.h"
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XContainer.hpp>
+
+//_________________________________________________________________________________________________________________
+//	includes of other projects
+//_________________________________________________________________________________________________________________
+#include <rtl/ustrbuf.hxx>
+#include <cppuhelper/weak.hxx>
+
+//_________________________________________________________________________________________________________________
+//	Defines
+//_________________________________________________________________________________________________________________
+// 
+
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::container;
+using namespace ::com::sun::star::frame;
+
+//_________________________________________________________________________________________________________________
+//	Namespace
+//_________________________________________________________________________________________________________________
+// 
+
+namespace framework
+{
+
+//*****************************************************************************************************************
+//	XInterface, XTypeProvider, XServiceInfo
+//*****************************************************************************************************************
+DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   ToolbarControllerFactory				        ,
+                                            ::cppu::OWeakObject							    ,
+                                            SERVICENAME_TOOLBARCONTROLLERFACTORY	        ,
+                                            IMPLEMENTATIONNAME_TOOLBARCONTROLLERFACTORY
+                                        )
+
+DEFINE_INIT_SERVICE                     (   ToolbarControllerFactory, {} )
+
+ToolbarControllerFactory::ToolbarControllerFactory( const Reference< XMultiServiceFactory >& xServiceManager ) :
+    ThreadHelpBase(),
+    m_bConfigRead( sal_False ),
+    m_xServiceManager( xServiceManager )
+{
+    m_pConfigAccess = new ConfigurationAccess_ControllerFactory( m_xServiceManager,rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/ToolBar" )) );
+    m_pConfigAccess->acquire();
+}
+
+ToolbarControllerFactory::ToolbarControllerFactory( const Reference< XMultiServiceFactory >& xServiceManager,bool ) :
+    ThreadHelpBase(),
+    m_bConfigRead( sal_False ),
+    m_xServiceManager( xServiceManager )
+{
+    m_pConfigAccess = NULL;
+}
+
+ToolbarControllerFactory::~ToolbarControllerFactory()
+{
+    ResetableGuard aLock( m_aLock );
+    
+    // reduce reference count
+    m_pConfigAccess->release();
+}
+
+// XMultiComponentFactory
+Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithContext( 
+    const ::rtl::OUString& aServiceSpecifier, 
+    const Reference< XComponentContext >& )
+throw (Exception, RuntimeException)
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+    
+    if ( !m_bConfigRead )
+    {
+        m_bConfigRead = sal_True;
+        m_pConfigAccess->readConfigurationData();
+    }
+    
+    rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( aServiceSpecifier, rtl::OUString() );
+    if ( aServiceName.getLength() > 0 )
+        return m_xServiceManager->createInstance( aServiceName );
+    else
+        return Reference< XInterface >();
+    // SAFE
+}
+
+Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithArgumentsAndContext( 
+    const ::rtl::OUString&                  ServiceSpecifier, 
+    const Sequence< Any >&                  Arguments, 
+    const Reference< XComponentContext >& )
+throw (Exception, RuntimeException)
+{
+    const rtl::OUString aPropModuleName( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
+    const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" ));
+    
+    rtl::OUString   aPropName;
+    PropertyValue   aPropValue;
+    
+    // Retrieve the optional module name form the Arguments sequence. It is used as a part of
+    // the hash map key to support different controller implementation for the same URL but different
+    // module!!
+    for ( int i = 0; i < Arguments.getLength(); i++ )
+    {
+        if (( Arguments[i] >>= aPropValue ) && ( aPropValue.Name.equals( aPropModuleName )))
+        {
+            aPropValue.Value >>= aPropName;
+            break;
+        }
+    }
+    
+    Sequence< Any > aNewArgs( Arguments );
+    
+    sal_Int32 nAppendIndex = aNewArgs.getLength();
+    bool bHasValue = m_pConfigAccess->hasValue();
+    aNewArgs.realloc( aNewArgs.getLength() + (bHasValue ? 2 : 1) );
+
+    // Append the command URL to the Arguments sequence so that one controller can be
+    // used for more than one command URL.
+    aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
+    aPropValue.Value  <<= ServiceSpecifier;
+    aNewArgs[nAppendIndex] <<= aPropValue;
+    
+    if ( bHasValue )
+    {
+        // Append the optional value argument. It's an empty string if no additional info
+        // is provided to the controller.
+        rtl::OUString aValue = m_pConfigAccess->getValueFromCommandModule( ServiceSpecifier, aPropName );
+        aPropValue.Name = aPropValueName;
+        aPropValue.Value <<= aValue;
+        aNewArgs[nAppendIndex+1] <<= aPropValue;
+    }
+
+    {
+        // SAFE
+        ResetableGuard aLock( m_aLock );
+        
+        if ( !m_bConfigRead )
+        {
+            m_bConfigRead = sal_True;
+            m_pConfigAccess->readConfigurationData();
+        }
+        
+        rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( ServiceSpecifier, aPropName );
+        Reference< XMultiServiceFactory > xServiceManager( m_xServiceManager );
+        
+        aLock.unlock();
+        // SAFE
+
+        
+        if ( aServiceName.getLength() > 0 )
+            return xServiceManager->createInstanceWithArguments( aServiceName, aNewArgs );
+        else
+            return Reference< XInterface >();
+    }
+}
+
+Sequence< ::rtl::OUString > SAL_CALL ToolbarControllerFactory::getAvailableServiceNames()
+throw (RuntimeException)
+{
+    return Sequence< ::rtl::OUString >();
+}
+
+// XUIControllerRegistration
+sal_Bool SAL_CALL ToolbarControllerFactory::hasController( 
+    const ::rtl::OUString& aCommandURL, 
+    const rtl::OUString& aModuleName ) 
+throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+
+    if ( !m_bConfigRead )
+    {
+        m_bConfigRead = sal_True;
+        m_pConfigAccess->readConfigurationData();
+    }
+    
+    return ( m_pConfigAccess->getServiceFromCommandModule( aCommandURL, aModuleName ).getLength() > 0 );
+}
+
+void SAL_CALL ToolbarControllerFactory::registerController( 
+    const ::rtl::OUString& aCommandURL, 
+    const ::rtl::OUString& aModuleName, 
+    const ::rtl::OUString& aControllerImplementationName ) 
+throw (RuntimeException)
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+    
+    if ( !m_bConfigRead )
+    {
+        m_bConfigRead = sal_True;
+        m_pConfigAccess->readConfigurationData();
+    }
+
+    m_pConfigAccess->addServiceToCommandModule( aCommandURL, aModuleName, aControllerImplementationName );
+    // SAFE
+}
+
+void SAL_CALL ToolbarControllerFactory::deregisterController( 
+    const ::rtl::OUString& aCommandURL, 
+    const rtl::OUString& aModuleName ) 
+throw (RuntimeException)
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+    
+    if ( !m_bConfigRead )
+    {
+        m_bConfigRead = sal_True;
+        m_pConfigAccess->readConfigurationData();
+    }
+
+    m_pConfigAccess->removeServiceFromCommandModule( aCommandURL, aModuleName );
+    // SAFE
+}
+
+} // namespace framework
diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx
index 5c969eb3d..3540c81c3 100644
--- a/framework/source/uifactory/toolboxfactory.cxx
+++ b/framework/source/uifactory/toolboxfactory.cxx
@@ -76,19 +76,6 @@ namespace framework
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_3                    (    ToolBoxFactory                                                  ,
-                                            OWeakObject                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                       ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementFactory )
-                                        )
-
-DEFINE_XTYPEPROVIDER_3                  (   ToolBoxFactory		                            ,
-                                            css::lang::XTypeProvider			            ,
-                                            css::lang::XServiceInfo				            ,
-                                            ::com::sun::star::ui::XUIElementFactory
-                                        )
-
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   ToolBoxFactory				                    ,
                                             ::cppu::OWeakObject							    ,
                                             SERVICENAME_TOOLBARFACTORY	                    ,
@@ -98,15 +85,7 @@ DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   ToolBoxFactory
 DEFINE_INIT_SERVICE                     (   ToolBoxFactory, {} )
 
 ToolBoxFactory::ToolBoxFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    ThreadHelpBase( &Application::GetSolarMutex() )
-    , m_xServiceManager( xServiceManager )
-    , m_xModuleManager( xServiceManager->createInstance(
-                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))),
-                        UNO_QUERY )
-{
-}
-
-ToolBoxFactory::~ToolBoxFactory()
+    MenuBarFactory( xServiceManager,true )
 {
 }
 
@@ -116,94 +95,13 @@ Reference< XUIElement > SAL_CALL ToolBoxFactory::createUIElement(
     const Sequence< PropertyValue >& Args )
 throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
 {
-    // SAFE
     ResetableGuard aLock( m_aLock );
-
-    Reference< XUIConfigurationManager > xConfigSource;
-    Reference< XFrame >                  xFrame;
-    rtl::OUString                        aResourceURL( ResourceURL );
-    sal_Bool                             bPersistent( sal_True );
-    sal_Bool                             bPopupMode( sal_False );
-
-    for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
-    {
-        if ( Args[n].Name.equalsAscii( "ConfigurationSource" ))
-            Args[n].Value >>= xConfigSource;
-        else if ( Args[n].Name.equalsAsciiL( "Frame", 5 ))
-            Args[n].Value >>= xFrame;
-        else if ( Args[n].Name.equalsAsciiL( "ResourceURL", 11 ))
-            Args[n].Value >>= aResourceURL;
-        else if ( Args[n].Name.equalsAsciiL( "Persistent", 10 ))
-            Args[n].Value >>= bPersistent;
-        else if ( Args[n].Name.equalsAsciiL( "PopupMode", 9 ))
-            Args[n].Value >>= bPopupMode;
-    }
-
-    Reference< XUIConfigurationManager > xCfgMgr;
-    if ( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" ))) != 0 )
-        throw IllegalArgumentException();
-    else
-    {
-        // Identify frame and determine document based ui configuration manager/module ui configuration manager
-        if ( xFrame.is() && !xConfigSource.is() )
-        {
-            bool bHasSettings( false );
-            Reference< XModel > xModel;
-
-            Reference< XController > xController = xFrame->getController();
-            if ( xController.is() )
-                xModel = xController->getModel();
-
-            if ( xModel.is() )
-            {
-                Reference< XUIConfigurationManagerSupplier > xUIConfigurationManagerSupplier( xModel, UNO_QUERY );
-                if ( xUIConfigurationManagerSupplier.is() )
-                {
-                    xCfgMgr = xUIConfigurationManagerSupplier->getUIConfigurationManager();
-                    bHasSettings = xCfgMgr->hasSettings( aResourceURL );
-                }
-            }
-
-            if ( !bHasSettings )
-            {
-                rtl::OUString aModuleIdentifier = m_xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ));
-                if ( aModuleIdentifier.getLength() )
-                {
-                    Reference< ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(
-                        m_xServiceManager->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ))),
-                        UNO_QUERY );
-                    xCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier );
-                    bHasSettings = xCfgMgr->hasSettings( aResourceURL );
-                }
-            }
-        }
-    }
-
-    PropertyValue aPropValue;
-    Sequence< Any > aPropSeq( 5 );
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-    aPropValue.Value <<= xFrame;
-    aPropSeq[0] <<= aPropValue;
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
-    aPropValue.Value <<= xCfgMgr;
-    aPropSeq[1] <<= aPropValue;
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" ));
-    aPropValue.Value <<= aResourceURL;
-    aPropSeq[2] <<= aPropValue;
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
-    aPropValue.Value <<= bPersistent;
-    aPropSeq[3] <<= aPropValue;
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PopupMode" ));
-    aPropValue.Value <<= bPopupMode;
-    aPropSeq[4] <<= aPropValue;
-
-    vos::OGuard	aGuard( Application::GetSolarMutex() );
-    ToolBarWrapper* pToolBarWrapper = new ToolBarWrapper( m_xServiceManager );
-    Reference< ::com::sun::star::ui::XUIElement > xToolBar( (OWeakObject *)pToolBarWrapper, UNO_QUERY );
-    Reference< XInitialization > xInit( xToolBar, UNO_QUERY );
-    xInit->initialize( aPropSeq );
-    return xToolBar;
+    ToolBarWrapper* pWrapper = new ToolBarWrapper( m_xServiceManager );
+    Reference< ::com::sun::star::ui::XUIElement > xMenuBar( (OWeakObject *)pWrapper, UNO_QUERY );
+    Reference< ::com::sun::star::frame::XModuleManager > xModuleManager = m_xModuleManager;
+    aLock.unlock();
+    CreateUIElement(ResourceURL,Args,"PopupMode","private:resource/toolbar/",xMenuBar,xModuleManager,m_xServiceManager);
+    return xMenuBar;
 }
 
 }
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 59ee74232..67e6a936b 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -35,6 +35,7 @@
 //	my own includes
 //_________________________________________________________________________________________________________________
 #include <uifactory/uielementfactorymanager.hxx>
+#include <uifactory/windowcontentfactorymanager.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
 
@@ -55,7 +56,7 @@
 #include <cppuhelper/weak.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
-
+#include <rtl/logfile.hxx>
 //_________________________________________________________________________________________________________________
 //	Defines
 //_________________________________________________________________________________________________________________
@@ -93,93 +94,23 @@ rtl::OUString getHashKeyFromStrings( const rtl::OUString& aType, const rtl::OUSt
 //	Configuration access class for UIElementFactoryManager implementation
 //*****************************************************************************************************************
 
-class ConfigurationAccess_UIElementFactoryManager : // interfaces
-                                                    public  XTypeProvider                            ,
-                                                    public  XContainerListener                       ,
-                                                    // baseclasses
-                                                    // Order is neccessary for right initialization!
-                                                    private ThreadHelpBase                           ,
-                                                    public  ::cppu::OWeakObject
-{
-    public:
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-                      
-                      ConfigurationAccess_UIElementFactoryManager( Reference< XMultiServiceFactory >& rServiceManager );
-        virtual       ~ConfigurationAccess_UIElementFactoryManager();
-
-        void          readConfigurationData();
-
-        rtl::OUString                           getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) const;
-        void                                    addFactorySpecifierToTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule, const rtl::OUString& aServiceSpecifier );
-        void                                    removeFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule );
-        Sequence< Sequence< PropertyValue > >   getFactoriesDescription() const;
-
-        // container.XContainerListener
-        virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException);
-        virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException);
-        virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException);
-
-        // lang.XEventListener
-        virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException);
- 
-    private:
-        class UIElementFactoryManagerMap : public std::hash_map< rtl::OUString,
-                                                                 rtl::OUString,
-                                                                 OUStringHashCode,
-                                                                 ::std::equal_to< ::rtl::OUString > >
-        {
-            inline void free()
-            {
-                UIElementFactoryManagerMap().swap( *this );
-            }
-        };
-    
-        sal_Bool impl_getElementProps( const Any& rElement, rtl::OUString& rType, rtl::OUString& rName, rtl::OUString& rModule, rtl::OUString& rServiceSpecifier ) const;
-
-        rtl::OUString                     m_aPropType;
-        rtl::OUString                     m_aPropName;
-        rtl::OUString                     m_aPropModule;
-        rtl::OUString                     m_aPropFactory;
-        UIElementFactoryManagerMap        m_aUIElementFactoryManagerMap;
-        Reference< XMultiServiceFactory > m_xServiceManager;
-        Reference< XMultiServiceFactory > m_xConfigProvider;
-        Reference< XNameAccess >          m_xConfigAccess;
-        sal_Bool                          m_bConfigAccessInitialized;
-};
 
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_3     (   ConfigurationAccess_UIElementFactoryManager                         ,
-                            OWeakObject                                                         ,
-                            DIRECT_INTERFACE ( XTypeProvider                                    ),
-                            DIRECT_INTERFACE ( XContainerListener                               ),
-                            DERIVED_INTERFACE( css::lang::XEventListener, XContainerListener    )
-                        )
-
-DEFINE_XTYPEPROVIDER_3  (   ConfigurationAccess_UIElementFactoryManager ,
-                            XTypeProvider                               ,
-                            XContainerListener                          ,
-                            css::lang::XEventListener
-                        )
-
-ConfigurationAccess_UIElementFactoryManager::ConfigurationAccess_UIElementFactoryManager( Reference< XMultiServiceFactory >& rServiceManager ) :
+ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( Reference< XMultiServiceFactory >& rServiceManager,const ::rtl::OUString& _sRoot ) :
     ThreadHelpBase(),
     m_aPropType( RTL_CONSTASCII_USTRINGPARAM( "Type" )),
     m_aPropName( RTL_CONSTASCII_USTRINGPARAM( "Name" )),
     m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )),
     m_aPropFactory( RTL_CONSTASCII_USTRINGPARAM( "FactoryImplementation" )),
+    m_sRoot(_sRoot),
     m_xServiceManager( rServiceManager ),
-    m_bConfigAccessInitialized( sal_False )
+    m_bConfigAccessInitialized( sal_False ),
+    m_bConfigDirty(true)
 {
-    m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance( 
-                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                                                    "com.sun.star.configuration.ConfigurationProvider" ))),
-                                                           UNO_QUERY );
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::ConfigurationAccess_FactoryManager" );
+    m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance( SERVICENAME_CFGPROVIDER),UNO_QUERY );
 }
 
-ConfigurationAccess_UIElementFactoryManager::~ConfigurationAccess_UIElementFactoryManager()
+ConfigurationAccess_FactoryManager::~ConfigurationAccess_FactoryManager()
 {
     // SAFE
     ResetableGuard aLock( m_aLock );
@@ -189,19 +120,20 @@ ConfigurationAccess_UIElementFactoryManager::~ConfigurationAccess_UIElementFacto
         xContainer->removeContainerListener( this );
 }
 
-rtl::OUString ConfigurationAccess_UIElementFactoryManager::getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) const
+rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactorySpecifierFromTypeNameModule" );
     // SAFE
     ResetableGuard aLock( m_aLock );
-    
-    UIElementFactoryManagerMap::const_iterator pIter = 
-        m_aUIElementFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, rModule ));
-    if ( pIter != m_aUIElementFactoryManagerMap.end() )
+
+    FactoryManagerMap::const_iterator pIter = 
+        m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, rModule ));
+    if ( pIter != m_aFactoryManagerMap.end() )
         return pIter->second;
     else
     {
-        pIter = m_aUIElementFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, rtl::OUString() ));
-        if ( pIter != m_aUIElementFactoryManagerMap.end() )
+        pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, rtl::OUString() ));
+        if ( pIter != m_aFactoryManagerMap.end() )
             return pIter->second;
         else
         {
@@ -210,13 +142,13 @@ rtl::OUString ConfigurationAccess_UIElementFactoryManager::getFactorySpecifierFr
             if ( nIndex > 0 )
             {
                 rtl::OUString aName = rName.copy( 0, nIndex+1 );
-                pIter = m_aUIElementFactoryManagerMap.find( getHashKeyFromStrings( rType, aName, rtl::OUString() ));
-                if ( pIter != m_aUIElementFactoryManagerMap.end() )
+                pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, aName, rtl::OUString() ));
+                if ( pIter != m_aFactoryManagerMap.end() )
                     return pIter->second;
             }
 
-            pIter = m_aUIElementFactoryManagerMap.find( getHashKeyFromStrings( rType, rtl::OUString(), rtl::OUString() ));
-            if ( pIter != m_aUIElementFactoryManagerMap.end() )
+            pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, rtl::OUString(), rtl::OUString() ));
+            if ( pIter != m_aFactoryManagerMap.end() )
                 return pIter->second;
         }
     }
@@ -224,49 +156,50 @@ rtl::OUString ConfigurationAccess_UIElementFactoryManager::getFactorySpecifierFr
     return rtl::OUString();
 }
 
-void ConfigurationAccess_UIElementFactoryManager::addFactorySpecifierToTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier )
+void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::addFactorySpecifierToTypeNameModule" );
     // SAFE
     ResetableGuard aLock( m_aLock );
 
     rtl::OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule );
 
-    UIElementFactoryManagerMap::const_iterator pIter = 
-        m_aUIElementFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, rModule ));
+    FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( aHashKey );
     
-    if ( pIter != m_aUIElementFactoryManagerMap.end() )
+    if ( pIter != m_aFactoryManagerMap.end() )
         throw ElementExistException();
     else
-        m_aUIElementFactoryManagerMap.insert( UIElementFactoryManagerMap::value_type( aHashKey, rServiceSpecifier ));
+        m_aFactoryManagerMap.insert( FactoryManagerMap::value_type( aHashKey, rServiceSpecifier ));
 }
 
 
-void ConfigurationAccess_UIElementFactoryManager::removeFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule )
+void ConfigurationAccess_FactoryManager::removeFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::removeFactorySpecifierFromTypeNameModule" );
     // SAFE
     ResetableGuard aLock( m_aLock );
     
     rtl::OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule );
 
-    UIElementFactoryManagerMap::const_iterator pIter = 
-        m_aUIElementFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, rModule ));
+    FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( aHashKey );
     
-    if ( pIter == m_aUIElementFactoryManagerMap.end() )
+    if ( pIter == m_aFactoryManagerMap.end() )
         throw NoSuchElementException();
     else
-        m_aUIElementFactoryManagerMap.erase( aHashKey );
+        m_aFactoryManagerMap.erase( aHashKey );
 }
 
-Sequence< Sequence< PropertyValue > > ConfigurationAccess_UIElementFactoryManager::getFactoriesDescription() const
+Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFactoriesDescription() const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactoriesDescription" );
     // SAFE
     ResetableGuard aLock( m_aLock );
     
     Sequence< Sequence< PropertyValue > > aSeqSeq;
 
     sal_Int32 nIndex( 0 );
-    UIElementFactoryManagerMap::const_iterator pIter = m_aUIElementFactoryManagerMap.begin();
-    while ( pIter != m_aUIElementFactoryManagerMap.end() )
+    FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.begin();
+    while ( pIter != m_aFactoryManagerMap.end() )
     {
         rtl::OUString aFactory = pIter->first;
         if ( aFactory.getLength() > 0 )
@@ -300,8 +233,9 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_UIElementFactoryManage
 }
 
 // container.XContainerListener
-void SAL_CALL ConfigurationAccess_UIElementFactoryManager::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException)
+void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementInserted" );
     rtl::OUString   aType;
     rtl::OUString   aName;
     rtl::OUString   aModule;
@@ -315,12 +249,13 @@ void SAL_CALL ConfigurationAccess_UIElementFactoryManager::elementInserted( cons
         // Create hash key from type, name and module as they are together a primary key to
         // the UNO service that implements a user interface factory.
         rtl::OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule ));
-        m_aUIElementFactoryManagerMap.insert( UIElementFactoryManagerMap::value_type( aHashKey, aService ));
+        m_aFactoryManagerMap.insert( FactoryManagerMap::value_type( aHashKey, aService ));
     }
 }
 
-void SAL_CALL ConfigurationAccess_UIElementFactoryManager::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException)
+void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementRemoved " );
     rtl::OUString   aType;
     rtl::OUString   aName;
     rtl::OUString   aModule;
@@ -334,12 +269,13 @@ void SAL_CALL ConfigurationAccess_UIElementFactoryManager::elementRemoved ( cons
         // Create hash key from command and model as they are together a primary key to
         // the UNO service that implements the popup menu controller.
         rtl::OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule ));
-        m_aUIElementFactoryManagerMap.erase( aHashKey );
+        m_aFactoryManagerMap.erase( aHashKey );
     }
 }
 
-void SAL_CALL ConfigurationAccess_UIElementFactoryManager::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException)
+void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementReplaced" );
     rtl::OUString   aType;
     rtl::OUString   aName;
     rtl::OUString   aModule;
@@ -353,22 +289,24 @@ void SAL_CALL ConfigurationAccess_UIElementFactoryManager::elementReplaced( cons
         // Create hash key from command and model as they are together a primary key to
         // the UNO service that implements the popup menu controller.
         rtl::OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule ));
-        m_aUIElementFactoryManagerMap.erase( aHashKey );
-        m_aUIElementFactoryManagerMap.insert( UIElementFactoryManagerMap::value_type( aHashKey, aService ));
+        m_aFactoryManagerMap.erase( aHashKey );
+        m_aFactoryManagerMap.insert( FactoryManagerMap::value_type( aHashKey, aService ));
     }
 }
 
 // lang.XEventListener
-void SAL_CALL ConfigurationAccess_UIElementFactoryManager::disposing( const EventObject& ) throw(RuntimeException)
+void SAL_CALL ConfigurationAccess_FactoryManager::disposing( const EventObject& ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::disposing" );
     // SAFE
     // remove our reference to the config access
     ResetableGuard aLock( m_aLock );
     m_xConfigAccess.clear();   
 }
 
-void ConfigurationAccess_UIElementFactoryManager::readConfigurationData()
+void ConfigurationAccess_FactoryManager::readConfigurationData()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::readConfigurationData" );
     // SAFE
     ResetableGuard aLock( m_aLock );
     
@@ -378,16 +316,12 @@ void ConfigurationAccess_UIElementFactoryManager::readConfigurationData()
         PropertyValue   aPropValue;
         
         aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
-        aPropValue.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Factories/Registered/UIElementFactories" ));
+        aPropValue.Value <<= m_sRoot;
         aArgs[0] <<= aPropValue;
         
         try
         {
-            m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments( 
-                                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                                                                    "com.sun.star.configuration.ConfigurationAccess" )),
-                                                                                aArgs ), 
-                                                                            UNO_QUERY );
+            m_xConfigAccess.set( m_xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,aArgs ), UNO_QUERY );
         }
         catch ( WrappedTargetException& )
         {
@@ -400,7 +334,6 @@ void ConfigurationAccess_UIElementFactoryManager::readConfigurationData()
     {
         Sequence< rtl::OUString >   aUIElementFactories = m_xConfigAccess->getElementNames();
         
-        Any a;
         rtl::OUString             aType;
         rtl::OUString             aName;
         rtl::OUString             aModule;
@@ -414,7 +347,7 @@ void ConfigurationAccess_UIElementFactoryManager::readConfigurationData()
                 // Create hash key from type, name and module as they are together a primary key to
                 // the UNO service that implements the user interface element factory.
                 aHashKey = getHashKeyFromStrings( aType, aName, aModule );
-                m_aUIElementFactoryManagerMap.insert( UIElementFactoryManagerMap::value_type( aHashKey, aService ));
+                m_aFactoryManagerMap.insert( FactoryManagerMap::value_type( aHashKey, aService ));
             }
         }
     
@@ -426,12 +359,11 @@ void ConfigurationAccess_UIElementFactoryManager::readConfigurationData()
     }
 }
 
-sal_Bool ConfigurationAccess_UIElementFactoryManager::impl_getElementProps( const Any& aElement, rtl::OUString& rType, rtl::OUString& rName, rtl::OUString& rModule, rtl::OUString& rServiceSpecifier ) const
+sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aElement, rtl::OUString& rType, rtl::OUString& rName, rtl::OUString& rModule, rtl::OUString& rServiceSpecifier ) const
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::impl_getElementProps" );
     Reference< XPropertySet > xPropertySet;
-    Reference< XNameAccess > xNameAccess;
     aElement >>= xPropertySet;
-    aElement >>= xNameAccess;
 
     if ( xPropertySet.is() )
     {
@@ -458,21 +390,6 @@ sal_Bool ConfigurationAccess_UIElementFactoryManager::impl_getElementProps( cons
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_4                    (    UIElementFactoryManager                                                         ,
-                                            OWeakObject                                                                     ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                       ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementFactory                 ),
-                                            DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementFactoryRegistration     )
-                                        )
-
-DEFINE_XTYPEPROVIDER_4                  (   UIElementFactoryManager		                                ,
-                                            css::lang::XTypeProvider			                        ,
-                                            css::lang::XServiceInfo				                        ,
-                                            ::com::sun::star::ui::XUIElementFactory               ,
-                                            ::com::sun::star::ui::XUIElementFactoryRegistration
-                                        )
-
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   UIElementFactoryManager				            ,
                                             ::cppu::OWeakObject							    ,
                                             SERVICENAME_UIELEMENTFACTORYMANAGER             ,
@@ -486,7 +403,8 @@ UIElementFactoryManager::UIElementFactoryManager( const Reference< XMultiService
     m_bConfigRead( sal_False ),
     m_xServiceManager( xServiceManager )
 {
-    m_pConfigAccess = new ConfigurationAccess_UIElementFactoryManager( m_xServiceManager );
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::UIElementFactoryManager" );
+    m_pConfigAccess = new ConfigurationAccess_FactoryManager( m_xServiceManager,rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Factories/Registered/UIElementFactories" )) );
     m_pConfigAccess->acquire();
     m_xModuleManager = Reference< XModuleManager >( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY );
 }
@@ -499,41 +417,13 @@ UIElementFactoryManager::~UIElementFactoryManager()
     m_pConfigAccess->release();
 }
 
-void UIElementFactoryManager::RetrieveTypeNameFromResourceURL( const rtl::OUString& aResourceURL, rtl::OUString& aType, rtl::OUString& aName )
-{
-    const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17;
-    const char      RESOURCEURL_PREFIX[] = "private:resource/";
-
-    if (( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_PREFIX ))) == 0 ) &&
-        ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
-    {
-        rtl::OUString aTmpStr( aResourceURL.copy( RESOURCEURL_PREFIX_SIZE ));
-        sal_Int32 nToken = 0;
-        sal_Int32 nPart  = 0;
-        do
-        {
-            ::rtl::OUString sToken = aTmpStr.getToken( 0, '/', nToken);
-            if ( sToken.getLength() )
-            {
-                if ( nPart == 0 )
-                    aType = sToken;
-                else if ( nPart == 1 )
-                    aName = sToken;
-                else
-                    break;
-                nPart++;
-            }
-        }
-        while( nToken >=0 );
-    }
-}
-
 // XUIElementFactory
 Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement( 
     const ::rtl::OUString& ResourceURL, 
     const Sequence< PropertyValue >& Args )
 throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::createUIElement" );
     // SAFE
     ResetableGuard aLock( m_aLock );
     
@@ -582,6 +472,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
 Sequence< Sequence< PropertyValue > > SAL_CALL UIElementFactoryManager::getRegisteredFactories() 
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getRegisteredFactories" );
     // SAFE
     ResetableGuard aLock( m_aLock );
     
@@ -597,6 +488,7 @@ throw ( RuntimeException )
 Reference< XUIElementFactory > SAL_CALL UIElementFactoryManager::getFactory( const ::rtl::OUString& aResourceURL, const ::rtl::OUString& aModuleId )
 throw ( RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactory" );
     ResetableGuard aLock( m_aLock );
 
     if ( !m_bConfigRead )
@@ -608,7 +500,7 @@ throw ( RuntimeException )
     rtl::OUString aType;
     rtl::OUString aName;
     
-    RetrieveTypeNameFromResourceURL( aResourceURL, aType, aName );
+    WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( aResourceURL, aType, aName );
     
     Reference< XMultiServiceFactory > xSManager( m_xServiceManager );
     
@@ -624,6 +516,7 @@ throw ( RuntimeException )
 void SAL_CALL UIElementFactoryManager::registerFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleId, const ::rtl::OUString& aFactoryImplementationName ) 
 throw ( ElementExistException, RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::registerFactory" );
     // SAFE
     ResetableGuard aLock( m_aLock );
     
@@ -640,6 +533,7 @@ throw ( ElementExistException, RuntimeException )
 void SAL_CALL UIElementFactoryManager::deregisterFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleId )
 throw ( NoSuchElementException, RuntimeException )
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::deregisterFactory" );
     // SAFE
     ResetableGuard aLock( m_aLock );
     
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 38cc2b191..b860deb8f 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -35,6 +35,7 @@
 //	my own includes
 //_________________________________________________________________________________________________________________
 #include <uifactory/windowcontentfactorymanager.hxx>
+#include <uifactory/uielementfactorymanager.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
 
@@ -74,298 +75,9 @@ using namespace ::com::sun::star;
 namespace framework
 {
 
-// global function needed by both implementations
-static rtl::OUString getHashKeyFromStrings( const rtl::OUString& aType, const rtl::OUString& aName, const rtl::OUString& aModuleName )
-{
-    rtl::OUStringBuffer aKey( aType );
-    aKey.appendAscii( "^" );
-    aKey.append( aName );
-    aKey.appendAscii( "^" );
-    aKey.append( aModuleName );
-    return aKey.makeStringAndClear();
-}
-
-
-//*****************************************************************************************************************
-//	Configuration access class for UIElementFactoryManager implementation
-//*****************************************************************************************************************
-
-class ConfigurationAccess_WindowContentFactoryManager : // interfaces
-                                                    public  lang::XTypeProvider                      ,
-                                                    public  container::XContainerListener            ,
-                                                    // baseclasses
-                                                    // Order is neccessary for right initialization!
-                                                    private ThreadHelpBase                           ,
-                                                    public  ::cppu::OWeakObject
-{
-    public:
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-                      
-                      ConfigurationAccess_WindowContentFactoryManager( uno::Reference< lang::XMultiServiceFactory >& rServiceManager );
-        virtual       ~ConfigurationAccess_WindowContentFactoryManager();
-
-        void          readConfigurationData();
-
-        rtl::OUString getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule );
-
-        // container.XContainerListener
-        virtual void SAL_CALL elementInserted( const container::ContainerEvent& aEvent ) throw(uno::RuntimeException);
-        virtual void SAL_CALL elementRemoved ( const container::ContainerEvent& aEvent ) throw(uno::RuntimeException);
-        virtual void SAL_CALL elementReplaced( const container::ContainerEvent& aEvent ) throw(uno::RuntimeException);
-
-        // lang.XEventListener
-        virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw(uno::RuntimeException);
- 
-    private:
-        class FactoryMap : public std::hash_map< rtl::OUString,
-                                                 rtl::OUString,
-                                                 OUStringHashCode,
-                                                 ::std::equal_to< ::rtl::OUString > >
-        {
-            inline void free()
-            {
-                FactoryMap().swap( *this );
-            }
-        };
-    
-        sal_Bool impl_getElementProps( const uno::Any& rElement, rtl::OUString& rType, rtl::OUString& rName, rtl::OUString& rModule, rtl::OUString& rServiceSpecifier ) const;
-
-        rtl::OUString								 m_aPropType;
-        rtl::OUString								 m_aPropName;
-        rtl::OUString								 m_aPropModule;
-        rtl::OUString								 m_aPropFactory;
-        FactoryMap						             m_aFactoryMap;
-        uno::Reference< lang::XMultiServiceFactory > m_xServiceManager;
-        uno::Reference< lang::XMultiServiceFactory > m_xConfigProvider;
-        uno::Reference< container::XNameAccess >     m_xConfigAccess;
-        bool										 m_bConfigAccessInitialized;
-        bool										 m_bConfigDirty;
-};
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_3     (   ConfigurationAccess_WindowContentFactoryManager                     ,
-                            OWeakObject                                                         ,
-                            DIRECT_INTERFACE ( lang::XTypeProvider                              ),
-                            DIRECT_INTERFACE ( container::XContainerListener                    ),
-                            DERIVED_INTERFACE( lang::XEventListener, XContainerListener			)
-                        )
-
-DEFINE_XTYPEPROVIDER_3  (   ConfigurationAccess_WindowContentFactoryManager ,
-                            lang::XTypeProvider                             ,
-                            container::XContainerListener                   ,
-                            lang::XEventListener
-                        )
-
-ConfigurationAccess_WindowContentFactoryManager::ConfigurationAccess_WindowContentFactoryManager( uno::Reference< lang::XMultiServiceFactory >& rServiceManager ) :
-    ThreadHelpBase(),
-    m_aPropType( RTL_CONSTASCII_USTRINGPARAM( "Type" )),
-    m_aPropName( RTL_CONSTASCII_USTRINGPARAM( "Name" )),
-    m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )),
-    m_aPropFactory( RTL_CONSTASCII_USTRINGPARAM( "FactoryImplementation" )),
-    m_xServiceManager( rServiceManager ),
-    m_bConfigAccessInitialized( false ),
-    m_bConfigDirty( true )
-{
-    m_xConfigProvider = uno::Reference< lang::XMultiServiceFactory >( rServiceManager->createInstance( 
-                                                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                                                            "com.sun.star.configuration.ConfigurationProvider" ))),
-                                                                      uno::UNO_QUERY );
-}
-
-ConfigurationAccess_WindowContentFactoryManager::~ConfigurationAccess_WindowContentFactoryManager()
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    uno::Reference< container::XContainer > xContainer( m_xConfigAccess, uno::UNO_QUERY );
-    if ( xContainer.is() )
-        xContainer->removeContainerListener( this );
-}
-
-rtl::OUString ConfigurationAccess_WindowContentFactoryManager::getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule )
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    // Make sure that we read the configuration data at least once.
-    // May be more dependent on the dirty flag!
-    readConfigurationData();
-
-    FactoryMap::const_iterator pIter = 
-        m_aFactoryMap.find( getHashKeyFromStrings( rType, rName, rModule ));
-    if ( pIter != m_aFactoryMap.end() )
-        return pIter->second;
-    else
-    {
-        pIter = m_aFactoryMap.find( getHashKeyFromStrings( rType, rName, rtl::OUString() ));
-        if ( pIter != m_aFactoryMap.end() )
-            return pIter->second;
-        else
-        {
-            // Support factories which uses a defined prefix for their element names.
-            sal_Int32 nIndex = rName.indexOf( '_' );
-            if ( nIndex > 0 )
-            {
-                rtl::OUString aName = rName.copy( 0, nIndex );
-                pIter = m_aFactoryMap.find( getHashKeyFromStrings( rType, aName, rtl::OUString() ));
-                if ( pIter != m_aFactoryMap.end() )
-                    return pIter->second;
-            }
-
-            pIter = m_aFactoryMap.find( getHashKeyFromStrings( rType, rtl::OUString(), rtl::OUString() ));
-            if ( pIter != m_aFactoryMap.end() )
-                return pIter->second;
-        }
-    }
-    
-    return rtl::OUString();
-}
-
-// container.XContainerListener
-void SAL_CALL ConfigurationAccess_WindowContentFactoryManager::elementInserted( const container::ContainerEvent& ) throw(uno::RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    m_bConfigDirty = true;
-}
-
-void SAL_CALL ConfigurationAccess_WindowContentFactoryManager::elementRemoved ( const container::ContainerEvent& ) throw(uno::RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    m_bConfigDirty = true;
-}
-
-void SAL_CALL ConfigurationAccess_WindowContentFactoryManager::elementReplaced( const container::ContainerEvent& ) throw(uno::RuntimeException)
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    m_bConfigDirty = true;
-}
-
-// lang.XEventListener
-void SAL_CALL ConfigurationAccess_WindowContentFactoryManager::disposing( const lang::EventObject& ) throw(uno::RuntimeException)
-{
-    // SAFE
-    // remove our reference to the config access
-    ResetableGuard aLock( m_aLock );
-    m_xConfigAccess.clear();   
-}
-
-void ConfigurationAccess_WindowContentFactoryManager::readConfigurationData()
-{
-    // SAFE
-    ResetableGuard aLock( m_aLock );
-    
-    bool bConfigAccessInitialized(m_bConfigAccessInitialized);
-    if ( !m_bConfigAccessInitialized )
-    {
-        uno::Sequence< uno::Any > aArgs( 1 );
-        beans::PropertyValue     aPropValue;
-        
-        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
-        aPropValue.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.WindowContentFactories/Registered/ContentFactories" ));
-        aArgs[0] <<= aPropValue;
-        
-        try
-        {
-            m_xConfigAccess = uno::Reference< container::XNameAccess >( m_xConfigProvider->createInstanceWithArguments( 
-                                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                                                                                    "com.sun.star.configuration.ConfigurationAccess" )),
-                                                                                aArgs ), 
-                                                                                uno::UNO_QUERY );
-        }
-        catch ( lang::WrappedTargetException& )
-        {
-        }
-        
-        m_bConfigAccessInitialized = sal_True;
-    }
-    
-    if ( m_xConfigAccess.is() && m_bConfigDirty )
-    {
-        uno::Sequence< rtl::OUString > aUIElementFactories = m_xConfigAccess->getElementNames();
-        
-        uno::Any      a;
-        rtl::OUString aType;
-        rtl::OUString aName;
-        rtl::OUString aModule;
-        rtl::OUString aService;
-        rtl::OUString aHashKey;
-        
-        uno::Reference< beans::XPropertySet > xPropertySet;
-        
-        m_aFactoryMap.clear();
-        for ( sal_Int32 i = 0; i < aUIElementFactories.getLength(); i++ )
-        {
-            if ( impl_getElementProps( m_xConfigAccess->getByName( aUIElementFactories[i] ), aType, aName, aModule, aService ))
-            {
-                // Create hash key from type, name and module as they are together a primary key to
-                // the UNO service that implements the user interface element factory.
-                aHashKey = getHashKeyFromStrings( aType, aName, aModule );
-                m_aFactoryMap.insert( FactoryMap::value_type( aHashKey, aService ));
-            }
-        }
-    
-        uno::Reference< container::XContainer > xContainer( m_xConfigAccess, uno::UNO_QUERY );
-        m_bConfigDirty = false;
-
-        aLock.unlock();
-        // UNSAFE
-        
-        if ( xContainer.is() && !bConfigAccessInitialized)
-            xContainer->addContainerListener( this );
-    }
-}
-
-sal_Bool ConfigurationAccess_WindowContentFactoryManager::impl_getElementProps( const uno::Any& aElement, rtl::OUString& rType, rtl::OUString& rName, rtl::OUString& rModule, rtl::OUString& rServiceSpecifier ) const
-{
-    uno::Reference< beans::XPropertySet > xPropertySet;
-    uno::Reference< container::XNameAccess > xNameAccess;
-    aElement >>= xPropertySet;
-    aElement >>= xNameAccess;
-
-    if ( xPropertySet.is() )
-    {
-        try
-        {
-            xPropertySet->getPropertyValue( m_aPropType ) >>= rType;
-            xPropertySet->getPropertyValue( m_aPropName ) >>= rName;
-            xPropertySet->getPropertyValue( m_aPropModule ) >>= rModule;
-            xPropertySet->getPropertyValue( m_aPropFactory ) >>= rServiceSpecifier;
-        }
-        catch ( beans::UnknownPropertyException& )
-        {
-            return sal_False;
-        }
-        catch ( lang::WrappedTargetException& )
-        {
-            return sal_False;
-        }
-    }
-
-    return sal_True;
-}
-
 //*****************************************************************************************************************
 //	XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_3                    (    WindowContentFactoryManager                              ,
-                                            OWeakObject                                              ,
-                                            DIRECT_INTERFACE( lang::XTypeProvider                    ),
-                                            DIRECT_INTERFACE( lang::XServiceInfo                     ),
-                                            DIRECT_INTERFACE( lang::XSingleComponentFactory          )
-                                        )
-
-DEFINE_XTYPEPROVIDER_3                  (   WindowContentFactoryManager		,
-                                            lang::XTypeProvider			    ,
-                                            lang::XServiceInfo				,
-                                            lang::XSingleComponentFactory
-                                        )
-
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   WindowContentFactoryManager				        ,
                                             ::cppu::OWeakObject							    ,
                                             SERVICENAME_WINDOWCONTENTFACTORYMANAGER         ,
@@ -379,7 +91,7 @@ WindowContentFactoryManager::WindowContentFactoryManager( const uno::Reference<
     m_bConfigRead( sal_False ),
     m_xServiceManager( xServiceManager )
 {
-    m_pConfigAccess = new ConfigurationAccess_WindowContentFactoryManager( m_xServiceManager );
+    m_pConfigAccess = new ConfigurationAccess_FactoryManager( m_xServiceManager,rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.WindowContentFactories/Registered/ContentFactories" )) );
     m_pConfigAccess->acquire();
     m_xModuleManager = uno::Reference< frame::XModuleManager >( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), uno::UNO_QUERY );
 }
diff --git a/framework/source/xml/eventsconfiguration.cxx b/framework/source/xml/eventsconfiguration.cxx
index 0ff9665bc..320f94b8a 100644
--- a/framework/source/xml/eventsconfiguration.cxx
+++ b/framework/source/xml/eventsconfiguration.cxx
@@ -32,6 +32,7 @@
 #include "precompiled_framework.hxx"
 #include <xml/eventsconfiguration.hxx>
 #include <xml/eventsdocumenthandler.hxx>
+#include <services.h>
 
 #ifndef __FRAMEWORK_XML_SAXNAMESPACEFILTER_HXX_
 #include <xml/saxnamespacefilter.hxx>
@@ -74,8 +75,8 @@ static Reference< XParser > GetSaxParser(
     )
 {
     //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
-    //return Reference< XParser >( xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )), UNO_QUERY);
-    return Reference< XParser >( xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )), UNO_QUERY);
+    //return Reference< XParser >( xServiceManager->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
+    return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
 }
 
 static Reference< XDocumentHandler > GetSaxWriter(
@@ -84,8 +85,8 @@ static Reference< XDocumentHandler > GetSaxWriter(
     )
 {
     //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
-    //return Reference< XDocumentHandler >( xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" )), UNO_QUERY) ;
-    return Reference< XDocumentHandler >( xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" )), UNO_QUERY) ;
+    //return Reference< XDocumentHandler >( xServiceManager->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
+    return Reference< XDocumentHandler >( xServiceFactory->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
 }
 
 // #110897#
diff --git a/framework/source/xml/eventsdocumenthandler.cxx b/framework/source/xml/eventsdocumenthandler.cxx
index 24764bc7a..f160ffe89 100644
--- a/framework/source/xml/eventsdocumenthandler.cxx
+++ b/framework/source/xml/eventsdocumenthandler.cxx
@@ -128,7 +128,6 @@ static EventEntryProperty EventEntries[OReadEventsDocumentHandler::EV_XML_ENTRY_
 
 OReadEventsDocumentHandler::OReadEventsDocumentHandler( EventsConfig& aItems ) :
     ThreadHelpBase( &Application::GetSolarMutex() ),
-    ::cppu::OWeakObject(),
     m_aEventItems( aItems )
 {
     ::rtl::OUString aNamespaceEvent( RTL_CONSTASCII_USTRINGPARAM( XMLNS_EVENT ));
@@ -163,18 +162,6 @@ OReadEventsDocumentHandler::~OReadEventsDocumentHandler()
 {
 }
 
-Any SAL_CALL OReadEventsDocumentHandler::queryInterface( const Type & rType )
-throw( RuntimeException )
-{
-    Any a = ::cppu::queryInterface(
-                rType ,
-                SAL_STATIC_CAST( XDocumentHandler*, this ));
-    if ( a.hasValue() )
-        return a;
-
-    return OWeakObject::queryInterface( rType );
-}
-
 // XDocumentHandler
 void SAL_CALL OReadEventsDocumentHandler::startDocument(void)
 throw (	SAXException, RuntimeException )
diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx
index 7fd405024..995da4124 100644
--- a/framework/source/xml/imagesconfiguration.cxx
+++ b/framework/source/xml/imagesconfiguration.cxx
@@ -31,6 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 #include <xml/imagesconfiguration.hxx>
+#include <services.h>
 
 #ifndef __FRAMEWORK_CLASSES_IMAGESDOCUMENTHANDLER_HXX_
 #include <xml/imagesdocumenthandler.hxx>
@@ -78,8 +79,8 @@ static Reference< XParser > GetSaxParser(
     )
 {
     //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
-    //return Reference< XParser >( xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )), UNO_QUERY);
-    return Reference< XParser >( xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )), UNO_QUERY);
+    //return Reference< XParser >( xServiceManager->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
+    return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
 }
 
 static Reference< XDocumentHandler > GetSaxWriter(
@@ -88,8 +89,8 @@ static Reference< XDocumentHandler > GetSaxWriter(
     )
 {
     //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
-    //return Reference< XDocumentHandler >( xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" )), UNO_QUERY) ;
-    return Reference< XDocumentHandler >( xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" )), UNO_QUERY) ;
+    //return Reference< XDocumentHandler >( xServiceManager->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
+    return Reference< XDocumentHandler >( xServiceFactory->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
 }
 
 // #110897#
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index b4906785b..ceb187c32 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -134,7 +134,6 @@ ImageXMLEntryProperty ImagesEntries[OReadImagesDocumentHandler::IMG_XML_ENTRY_CO
 
 OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aItems ) :
     ThreadHelpBase( &Application::GetSolarMutex() ),
-    ::cppu::OWeakObject(),
     m_aImageList( aItems ),
     m_pImages( 0 ),
     m_pExternalImages( 0 )
@@ -175,18 +174,6 @@ OReadImagesDocumentHandler::~OReadImagesDocumentHandler()
 {
 }
 
-Any SAL_CALL OReadImagesDocumentHandler::queryInterface( const Type & rType )
-throw( RuntimeException )
-{
-    Any a = ::cppu::queryInterface(
-                rType ,
-                SAL_STATIC_CAST( XDocumentHandler*, this ));
-    if ( a.hasValue() )
-        return a;
-
-    return OWeakObject::queryInterface( rType );
-}
-
 // XDocumentHandler
 void SAL_CALL OReadImagesDocumentHandler::startDocument(void)
 throw (	SAXException, RuntimeException )
diff --git a/framework/source/xml/menuconfiguration.cxx b/framework/source/xml/menuconfiguration.cxx
index 602c2ffcb..7dbe62e38 100644
--- a/framework/source/xml/menuconfiguration.cxx
+++ b/framework/source/xml/menuconfiguration.cxx
@@ -42,6 +42,7 @@
 #include <classes/addonmenu.hxx>
 #include <xml/menudocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
+#include <services.h>
 
 #ifndef _FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_
 #include <services/layoutmanager.hxx>
@@ -99,9 +100,7 @@ Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML(
     Reference< XInputStream >& rInputStream )
 throw ( WrappedTargetException )
 {
-    Reference< XParser > xParser( m_rxServiceManager->createInstance(
-                                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" ))),
-                                  UNO_QUERY);
+    Reference< XParser > xParser( m_rxServiceManager->createInstance(SERVICENAME_SAXPARSER),UNO_QUERY);
 
     // connect stream to input stream to the parser
     InputSource aInputSource;
@@ -167,7 +166,7 @@ throw ( WrappedTargetException )
     Reference< XDocumentHandler > xWriter;
 
     xWriter = Reference< XDocumentHandler >( m_rxServiceManager->createInstance(
-            ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" )), UNO_QUERY) ;
+            SERVICENAME_SAXWRITER), UNO_QUERY) ;
 
     Reference< XActiveDataSource> xDataSource( xWriter , UNO_QUERY );
     xDataSource->setOutputStream( rOutputStream );
diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx
index 7b447572d..66addd127 100644
--- a/framework/source/xml/menudocumenthandler.cxx
+++ b/framework/source/xml/menudocumenthandler.cxx
@@ -47,7 +47,6 @@
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
@@ -55,7 +54,7 @@
 //	other includes
 //_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
-
+#include <rtl/logfile.hxx>
 #include <comphelper/attributelist.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -174,19 +173,6 @@ ReadMenuDocumentHandlerBase::~ReadMenuDocumentHandlerBase()
 {
 }
 
-Any SAL_CALL ReadMenuDocumentHandlerBase::queryInterface(
-    const Type & rType )
-throw( RuntimeException )
-{
-    Any a = ::cppu::queryInterface(
-                rType ,
-                SAL_STATIC_CAST( XDocumentHandler*, this ));
-    if ( a.hasValue() )
-        return a;
-
-    return OWeakObject::queryInterface( rType );
-}
-
 void SAL_CALL ReadMenuDocumentHandlerBase::ignorableWhitespace(
     const ::rtl::OUString& )
 throw( SAXException, RuntimeException )
@@ -607,14 +593,15 @@ throw( SAXException, RuntimeException )
         m_bMenuMode = sal_True;
 
         // Container must be factory to create sub container
-        Reference< XComponentContext > xComponentContext;
-        Reference< XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
-        xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>=
-            xComponentContext;
+        if ( !m_xComponentContext.is() )
+        {
+            const Reference< XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
+            m_xComponentContext.set(xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW );
+        }
 
         Reference< XIndexContainer > xSubItemContainer;
         if ( m_xContainerFactory.is() )
-            xSubItemContainer = Reference< XIndexContainer >( m_xContainerFactory->createInstanceWithContext( xComponentContext ), UNO_QUERY );
+            xSubItemContainer = Reference< XIndexContainer >( m_xContainerFactory->createInstanceWithContext( m_xComponentContext ), UNO_QUERY );
 
         // read attributes for menu
         for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ )
diff --git a/framework/source/xml/saxnamespacefilter.cxx b/framework/source/xml/saxnamespacefilter.cxx
index 47040e63a..06ba54932 100644
--- a/framework/source/xml/saxnamespacefilter.cxx
+++ b/framework/source/xml/saxnamespacefilter.cxx
@@ -43,6 +43,7 @@
 #include <comphelper/attributelist.hxx>
 
 #include <vcl/svapp.hxx>
+#include <rtl/logfile.hxx>
 
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::uno;
@@ -54,7 +55,7 @@ namespace framework{
 
 
 SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler >& rSax1DocumentHandler ) :
-    ThreadHelpBase( &Application::GetSolarMutex() ), OWeakObject(),
+    ThreadHelpBase( &Application::GetSolarMutex() ),
      m_xLocator( 0 ),
      xDocumentHandler( rSax1DocumentHandler ),
      m_nDepth( 0 )
@@ -65,17 +66,6 @@ SaxNamespaceFilter::~SaxNamespaceFilter()
 {
 }
 
-Any SAL_CALL SaxNamespaceFilter::queryInterface( const Type & rType ) throw( RuntimeException )
-{
-    Any a = ::cppu::queryInterface(
-                rType ,
-                SAL_STATIC_CAST( XDocumentHandler*, this ));
-    if ( a.hasValue() )
-        return a;
-
-    return OWeakObject::queryInterface( rType );
-}
-
 // XDocumentHandler
 void SAL_CALL SaxNamespaceFilter::startDocument(void)
     throw (	SAXException, RuntimeException )
@@ -92,7 +82,7 @@ void SAL_CALL SaxNamespaceFilter::startElement(
     throw(	SAXException, RuntimeException )
 {
     XMLNamespaces aXMLNamespaces;
-    if ( m_aNamespaceStack.size() > 0 )
+    if ( !m_aNamespaceStack.empty() )
         aXMLNamespaces = m_aNamespaceStack.top();
 
     ::comphelper::AttributeList* pNewList = new ::comphelper::AttributeList();
diff --git a/framework/source/xml/statusbarconfiguration.cxx b/framework/source/xml/statusbarconfiguration.cxx
index 23c42c884..618afd679 100644
--- a/framework/source/xml/statusbarconfiguration.cxx
+++ b/framework/source/xml/statusbarconfiguration.cxx
@@ -34,6 +34,7 @@
 #include <xml/statusbarconfiguration.hxx>
 #include <xml/statusbardocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
+#include <services.h>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -73,14 +74,14 @@ static Reference< XParser > GetSaxParser(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
     )
 {
-    return Reference< XParser >( xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )), UNO_QUERY);
+    return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
 }
 
 static Reference< XDocumentHandler > GetSaxWriter(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
     )
 {
-    return Reference< XDocumentHandler >( xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" )), UNO_QUERY) ;
+    return Reference< XDocumentHandler >( xServiceFactory->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
 }
 
 sal_Bool StatusBarConfiguration::LoadStatusBar(
diff --git a/framework/source/xml/statusbardocumenthandler.cxx b/framework/source/xml/statusbardocumenthandler.cxx
index cebb852d7..321239d03 100644
--- a/framework/source/xml/statusbardocumenthandler.cxx
+++ b/framework/source/xml/statusbardocumenthandler.cxx
@@ -179,7 +179,6 @@ StatusBarEntryProperty StatusBarEntries[OReadStatusBarDocumentHandler::SB_XML_EN
 OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler(
     const Reference< XIndexContainer >& rStatusBarItems ) :
     ThreadHelpBase( &Application::GetSolarMutex() ),
-    ::cppu::OWeakObject(),
     m_aStatusBarItems( rStatusBarItems )
 {
     ::rtl::OUString aNamespaceStatusBar( RTL_CONSTASCII_USTRINGPARAM( XMLNS_STATUSBAR ));
@@ -214,18 +213,6 @@ OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler()
 {
 }
 
-Any SAL_CALL OReadStatusBarDocumentHandler::queryInterface( const Type & rType )
-throw( RuntimeException )
-{
-    Any a = ::cppu::queryInterface(
-                rType ,
-                SAL_STATIC_CAST( XDocumentHandler*, this ));
-    if ( a.hasValue() )
-        return a;
-
-    return OWeakObject::queryInterface( rType );
-}
-
 // XDocumentHandler
 void SAL_CALL OReadStatusBarDocumentHandler::startDocument(void)
 throw (	SAXException, RuntimeException )
@@ -428,11 +415,11 @@ throw(	SAXException, RuntimeException )
                             aStatusbarItemProp[4].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_WIDTH ));
                             aStatusbarItemProp[5].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ));
 
-                            aStatusbarItemProp[0].Value = makeAny( aCommandURL );
-                            aStatusbarItemProp[1].Value = makeAny( aHelpURL );
-                            aStatusbarItemProp[2].Value = makeAny( nOffset );
-                            aStatusbarItemProp[3].Value = makeAny( nItemBits );
-                            aStatusbarItemProp[4].Value = makeAny( nWidth );
+                            aStatusbarItemProp[0].Value <<= aCommandURL;
+                            aStatusbarItemProp[1].Value <<= aHelpURL;
+                            aStatusbarItemProp[2].Value <<= nOffset;
+                            aStatusbarItemProp[3].Value <<= nItemBits;
+                            aStatusbarItemProp[4].Value <<= nWidth;
                             aStatusbarItemProp[5].Value = makeAny( ::com::sun::star::ui::ItemType::DEFAULT );
 
                             m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) );
diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/xml/toolboxconfiguration.cxx
index b165ec89f..24c1e8840 100644
--- a/framework/source/xml/toolboxconfiguration.cxx
+++ b/framework/source/xml/toolboxconfiguration.cxx
@@ -35,6 +35,7 @@
 #include <xml/toolboxdocumenthandler.hxx>
 #include <xml/toolboxlayoutdocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
+#include <services.h>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -73,7 +74,7 @@ static Reference< XParser > GetSaxParser(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
     )
 {
-    return Reference< XParser >( xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )), UNO_QUERY);
+    return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
 }
 
 static Reference< XDocumentHandler > GetSaxWriter(
@@ -81,7 +82,7 @@ static Reference< XDocumentHandler > GetSaxWriter(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
     )
 {
-    return Reference< XDocumentHandler >( xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" )), UNO_QUERY) ;
+    return Reference< XDocumentHandler >( xServiceFactory->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
 }
 
 // #110897#
diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx
index e48dd41a3..53098b168 100644
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/xml/toolboxdocumenthandler.cxx
@@ -140,7 +140,6 @@ ToolBarEntryProperty ToolBoxEntries[OReadToolBoxDocumentHandler::TB_XML_ENTRY_CO
 
 OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XIndexContainer >& rItemContainer ) :
     ThreadHelpBase( &Application::GetSolarMutex() ),
-    ::cppu::OWeakObject(),
     m_rItemContainer( rItemContainer ),
     m_aType( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE )),
     m_aLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL )),
@@ -193,18 +192,6 @@ OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler()
 {
 }
 
-Any SAL_CALL OReadToolBoxDocumentHandler::queryInterface( const Type & rType )
-throw( RuntimeException )
-{
-    Any a = ::cppu::queryInterface(
-                rType ,
-                SAL_STATIC_CAST( XDocumentHandler*, this ));
-    if ( a.hasValue() )
-        return a;
-
-    return OWeakObject::queryInterface( rType );
-}
-
 // XDocumentHandler
 void SAL_CALL OReadToolBoxDocumentHandler::startDocument(void)
 throw (	SAXException, RuntimeException )
@@ -435,12 +422,12 @@ throw(	SAXException, RuntimeException )
                     aToolbarItemProp[4].Name = m_aStyle;
                     aToolbarItemProp[5].Name = m_aIsVisible;
 
-                    aToolbarItemProp[0].Value = makeAny( aCommandURL );
-                    aToolbarItemProp[1].Value = makeAny( aHelpURL );
-                    aToolbarItemProp[2].Value = makeAny( aLabel );
+                    aToolbarItemProp[0].Value <<= aCommandURL;
+                    aToolbarItemProp[1].Value <<= aHelpURL;
+                    aToolbarItemProp[2].Value <<= aLabel;
                     aToolbarItemProp[3].Value = makeAny( ::com::sun::star::ui::ItemType::DEFAULT );
-                    aToolbarItemProp[4].Value = makeAny( nItemBits );
-                    aToolbarItemProp[5].Value = makeAny( bVisible );
+                    aToolbarItemProp[4].Value <<= nItemBits;
+                    aToolbarItemProp[5].Value <<= bVisible;
 
                     m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) );
                 }
@@ -693,8 +680,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
     {
         try
         {
-            Any a = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" )));
-            a >>= aUIName;
+            xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= aUIName;
         }
         catch ( UnknownPropertyException& )
         {
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 7b3e7c54d..716773d5c 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -60,6 +60,8 @@ LIB1OBJFILES=   \
                 $(SLO)$/rootitemcontainer.obj                   \
                 $(SLO)$/constitemcontainer.obj                  \
                 $(SLO)$/jobconst.obj                            \
+                $(SLO)$/popupmenucontrollerbase.obj             \
+                $(SLO)$/mischelper.obj                          \
                 $(SLO)$/propertysethelper.obj
 
 
@@ -118,6 +120,8 @@ SHL1STDLIBS=    \
                 $(CPPUHELPERLIB)    \
                 $(TOOLSLIB)         \
                 $(VOSLIB)           \
+                $(VCLLIB)           \
+                $(TKLIB)            \
                 $(CPPULIB)          \
                 $(SALLIB)
 
@@ -174,12 +178,36 @@ SHL3IMPLIB=     ifwl
 
 SHL3OBJS=       $(SLO)$/mediatypedetectionhelper.obj\
                 $(SLO)$/registertemp.obj            \
-                $(SLO)$/substitutepathvars.obj      \
-                $(SLO)$/pathsettings.obj
+                $(SLO)$/mailtodispatcher.obj        \
+                $(SLO)$/oxt_handler.obj    			\
+                $(SLO)$/toolbarsmenucontroller.obj  \
+                $(SLO)$/newmenucontroller.obj          \
+                $(SLO)$/macrosmenucontroller.obj   \
+                $(SLO)$/langselectionmenucontroller.obj   \
+                $(SLO)$/headermenucontroller.obj    \
+                $(SLO)$/footermenucontroller.obj    \
+                $(SLO)$/fontsizemenucontroller.obj  \
+                $(SLO)$/fontmenucontroller.obj      \
+                $(SLO)$/tabwindowservice.obj        \
+                $(SLO)$/fwktabwindow.obj            \
+                $(SLO)$/logotextstatusbarcontroller.obj   \
+                $(SLO)$/fwlresid.obj    			\
+                $(SLO)$/logoimagestatusbarcontroller.obj  \
+                $(SLO)$/simpletextstatusbarcontroller.obj \
+                $(SLO)$/uriabbreviation.obj         \
+                $(SLO)$/servicehandler.obj          \
+                $(SLO)$/license.obj                 \
+                $(SLO)$/dispatchrecorder.obj        \
+                $(SLO)$/dispatchrecordersupplier.obj\
+                $(SLO)$/dispatchhelper.obj          \
+                $(SLO)$/popupmenudispatcher.obj           \
 
 SHL3STDLIBS=    \
                 $(FWILIB)                           \
+                $(FWELIB)                           \
                 $(SVLLIB)                           \
+                $(TKLIB)                            \
+                $(SVTOOLLIB)                        \
                 $(UNOTOOLSLIB)                      \
                 $(TOOLSLIB)                         \
                 $(I18NISOLANGLIB)                   \
@@ -187,10 +215,11 @@ SHL3STDLIBS=    \
                 $(CPPUHELPERLIB)                    \
                 $(COMPHELPERLIB)                    \
                 $(CPPULIB)                          \
+                $(VCLLIB)                           \
                 $(SALLIB)
 
 SHL3DEF=        $(MISC)$/$(SHL3TARGET).def
-SHL3DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN)
+SHL3DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2TARGETN)
 
 DEF3NAME=       $(SHL3TARGET)
 
@@ -222,20 +251,15 @@ SHL4OBJS=       \
                 $(SLO)$/contenthandler.obj          \
                 $(SLO)$/controlmenucontroller.obj   \
                 $(SLO)$/desktop.obj                 \
-                $(SLO)$/dispatchhelper.obj          \
                 $(SLO)$/dispatchinformationprovider.obj     \
                 $(SLO)$/dispatchprovider.obj        \
-                $(SLO)$/dispatchrecorder.obj        \
-                $(SLO)$/dispatchrecordersupplier.obj\
                 $(SLO)$/dockingareadefaultacceptor.obj  \
                 $(SLO)$/documentacceleratorconfiguration.obj \
                 $(SLO)$/dropdownboxtoolbarcontroller.obj  \
                 $(SLO)$/droptargetlistener.obj      \
-                $(SLO)$/edittoolbarcontroller.obj         \
+                $(SLO)$/edittoolbarcontroller.obj   \
+                $(SLO)$/factoryconfiguration.obj    \
                 $(SLO)$/filter.obj                  \
-                $(SLO)$/fontmenucontroller.obj      \
-                $(SLO)$/fontsizemenucontroller.obj  \
-                $(SLO)$/footermenucontroller.obj    \
                 $(SLO)$/framecontainer.obj          \
                 $(SLO)$/frameloader.obj             \
                 $(SLO)$/frame.obj                   \
@@ -243,10 +267,10 @@ SHL4OBJS=       \
                 $(SLO)$/globalacceleratorconfiguration.obj  \
                 $(SLO)$/globalsettings.obj                \
                 $(SLO)$/graphicnameaccess.obj       \
-                $(SLO)$/headermenucontroller.obj    \
                 $(SLO)$/helpagentdispatcher.obj     \
                 $(SLO)$/imagebuttontoolbarcontroller.obj  \
                 $(SLO)$/imagemanager.obj            \
+                $(SLO)$/imagemanagerimpl.obj        \
                 $(SLO)$/interceptionhelper.obj      \
                 $(SLO)$/jobdata.obj                 \
                 $(SLO)$/jobdispatch.obj             \
@@ -255,46 +279,34 @@ SHL4OBJS=       \
                 $(SLO)$/jobresult.obj               \
                 $(SLO)$/joburl.obj                  \
                 $(SLO)$/keymapping.obj              \
-                $(SLO)$/langselectionmenucontroller.obj   \
                 $(SLO)$/langselectionstatusbarcontroller.obj \
                 $(SLO)$/layoutmanager.obj           \
-                $(SLO)$/license.obj                 \
                 $(SLO)$/loaddispatcher.obj          \
                 $(SLO)$/loaddispatchlistener.obj    \
                 $(SLO)$/loadenv.obj                 \
-                $(SLO)$/logoimagestatusbarcontroller.obj  \
-                $(SLO)$/logotextstatusbarcontroller.obj   \
-                $(SLO)$/macrosmenucontroller.obj   \
-                $(SLO)$/mailtodispatcher.obj        \
                 $(SLO)$/menubarfactory.obj          \
                 $(SLO)$/menubarmanager.obj          \
                 $(SLO)$/menubarmerger.obj                 \
                 $(SLO)$/menubarwrapper.obj          \
                 $(SLO)$/menudispatcher.obj          \
                 $(SLO)$/menumanager.obj             \
-                $(SLO)$/mischelper.obj             \
                 $(SLO)$/moduleacceleratorconfiguration.obj  \
                 $(SLO)$/moduleimagemanager.obj      \
                 $(SLO)$/modulemanager.obj           \
                 $(SLO)$/moduleuicfgsupplier.obj     \
                 $(SLO)$/moduleuiconfigurationmanager.obj \
-                $(SLO)$/newmenucontroller.obj          \
                 $(SLO)$/objectmenucontroller.obj    \
                 $(SLO)$/ocomponentaccess.obj        \
                 $(SLO)$/ocomponentenumeration.obj   \
                 $(SLO)$/oframes.obj                 \
-                $(SLO)$/oxt_handler.obj    			\
+                $(SLO)$/pathsettings.obj			\
                 $(SLO)$/persistentwindowstate.obj   \
-                $(SLO)$/popupmenucontrollerbase.obj \
                 $(SLO)$/popupmenucontrollerfactory.obj\
-                $(SLO)$/popupmenudispatcher.obj           \
                 $(SLO)$/presethandler.obj                   \
                 $(SLO)$/progressbarwrapper.obj          \
                 $(SLO)$/recentfilesmenucontroller.obj   \
                 $(SLO)$/registerservices.obj        \
-                $(SLO)$/servicehandler.obj          \
                 $(SLO)$/sessionlistener.obj         \
-                $(SLO)$/simpletextstatusbarcontroller.obj \
                 $(SLO)$/spinfieldtoolbarcontroller.obj    \
                 $(SLO)$/statusbarcontrollerfactory.obj\
                 $(SLO)$/statusbarfactory.obj        \
@@ -306,8 +318,7 @@ SHL4OBJS=       \
                 $(SLO)$/statusindicator.obj         \
                 $(SLO)$/stillinteraction.obj        \
                 $(SLO)$/storageholder.obj           \
-                $(SLO)$/tabwindowservice.obj        \
-                $(SLO)$/fwktabwindow.obj            \
+                $(SLO)$/substitutepathvars.obj      \
                 $(SLO)$/tagwindowasmodified.obj     \
                 $(SLO)$/targethelper.obj            \
                 $(SLO)$/taskcreator.obj             \
@@ -318,14 +329,13 @@ SHL4OBJS=       \
                 $(SLO)$/toolbarmanager.obj          \
                 $(SLO)$/toolbarmerger.obj           \
                 $(SLO)$/toolbar.obj                 \
-                $(SLO)$/toolbarsmenucontroller.obj  \
                 $(SLO)$/toolbarwrapper.obj          \
                 $(SLO)$/toolboxfactory.obj          \
                 $(SLO)$/uicategorydescription.obj   \
                 $(SLO)$/uicommanddescription.obj    \
                 $(SLO)$/uiconfigurationmanager.obj  \
+                $(SLO)$/uiconfigurationmanagerimpl.obj  \
                 $(SLO)$/uielementfactorymanager.obj \
-                $(SLO)$/uriabbreviation.obj         \
                 $(SLO)$/urltransformer.obj          \
                 $(SLO)$/vclstatusindicator.obj      \
                 $(SLO)$/wakeupthread.obj            \
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index a22beaa15..0985e53b1 100755
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -53,7 +53,8 @@ TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
 TARFILE_ROOTDIR=hsqldb
 
 CONVERTFILES=build$/build.xml \
-            src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java
+            src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \
+            src$/org$/hsqldb$/Library.java
 
 PATCH_FILES=patches$/accumulated_patches.patch
 
diff --git a/hsqldb/patches/accumulated_patches.patch b/hsqldb/patches/accumulated_patches.patch
index 42f1ef04b..f7d341a99 100644
--- a/hsqldb/patches/accumulated_patches.patch
+++ b/hsqldb/patches/accumulated_patches.patch
@@ -102,3 +102,14 @@
          }
  
          // OOo end
+--- misc/hsqldb/src/org/hsqldb/Library.java
++++ misc/build/hsqldb/src/org/hsqldb/Library.java
+@@ -1957,7 +1957,7 @@
+         functionMap.put("bitand", bitand);
+         functionMap.put("bitlength", bitLength);
+         functionMap.put("bitor", bitor);
+-        functionMap.put("bitxor", bitor);
++        functionMap.put("bitxor", bitxor);
+         functionMap.put("character", character);
+         functionMap.put("concat", concat);
+         functionMap.put("cot", cot);
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 7255ffb11..355e083b8 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -53,6 +53,7 @@ class DefaultNumberingProvider : public cppu::WeakImplHelper4
     void GetCharStrN( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const;
     void GetCharStr( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const;
     void GetRomanString( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const;
+    void impl_loadTranslit();
 public:
     DefaultNumberingProvider(
         const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& xMSF );
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index cc9c30f55..82ae543b4 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -195,9 +195,9 @@ static sal_Unicode lowerLetter[] = {
     0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A 
 };
 
-DefaultNumberingProvider::DefaultNumberingProvider( const Reference < XMultiServiceFactory >& xMSF ) : xSMgr(xMSF)
+DefaultNumberingProvider::DefaultNumberingProvider( const Reference < XMultiServiceFactory >& xMSF ) : xSMgr(xMSF),translit(NULL)
 {
-        translit = new TransliterationImpl(xMSF);
+        
 }
 
 DefaultNumberingProvider::~DefaultNumberingProvider()
@@ -205,6 +205,12 @@ DefaultNumberingProvider::~DefaultNumberingProvider()
         delete translit;
 }
 
+void DefaultNumberingProvider::impl_loadTranslit()
+{
+    if ( !translit )
+        translit = new TransliterationImpl(xSMgr);
+}
+
 Sequence< Reference<container::XIndexAccess> >
 DefaultNumberingProvider::getDefaultOutlineNumberings(const Locale& rLocale ) throw(RuntimeException)
 {
@@ -468,6 +474,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
                     const OUString &tmp = OUString::valueOf( number );
                     OUString transliteration;
                     getPropertyByName(aProperties, "Transliteration", sal_True) >>= transliteration;
+                    impl_loadTranslit();
                     translit->loadModuleByImplName(transliteration, aLocale);
                     result += translit->transliterateString2String(tmp, 0, tmp.getLength());
                } catch (Exception& ) {
diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx
index aa53b08b4..18eb90bbd 100644
--- a/idlc/source/idlcmain.cxx
+++ b/idlc/source/idlcmain.cxx
@@ -132,6 +132,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             options.getProgramName().getStr(),
             sal::static_int_cast< long >(nErrors), 
             options.prepareVersion().getStr());
+    } else
+    {
+        fprintf(stdout, "%s: returned successful%s",
+            options.getProgramName().getStr(),
+            options.prepareVersion().getStr());
     }
     return nErrors;
 }
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index f0ceaeef3..ae0b76b4a 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -159,7 +159,7 @@ bool SunVersion::init(const char *szVersion)
                 {
                     //1.4.1_01-, 1.4.1_01a, the numerical part may only be 2 chars.
                     int len = pCur - pLast;
-                    if (len != 2)
+                    if (len > 2)
                         return false;
                     //we've got the update: 01, 02 etc
                     strncpy(buf, pLast, len);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 45f9e8019..abc283c5c 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -241,9 +241,9 @@ FileHandleReader::readLine(rtl::OString * pLine)
     {
         if (m_nIndex == m_nSize)
         {
-            sal_uInt64 nRead;
+            sal_uInt64 nRead = 0;
             switch (osl_readFile(
-                        m_aGuard.getHandle(), m_aBuffer, BUFFER_SIZE, &nRead))
+                        m_aGuard.getHandle(), m_aBuffer, sizeof(m_aBuffer), &nRead))
             {
             case osl_File_E_PIPE: //HACK! for windows
                 nRead = 0;
@@ -256,8 +256,8 @@ FileHandleReader::readLine(rtl::OString * pLine)
                 m_nIndex = 0;
                 m_nSize = static_cast< int >(nRead);
                 break;
-        case osl_File_E_INTR:
-            continue;
+            case osl_File_E_INTR:
+                continue;
 
             default:
                 return RESULT_ERROR;
@@ -483,19 +483,21 @@ bool getJavaProps(const OUString & exePath,
  */
 rtl::OUString decodeOutput(const rtl::OString& s)
 {
-    OUString sEncoded = OStringToOUString(s, RTL_TEXTENCODING_ASCII_US);
     OUStringBuffer buff(512);
     sal_Int32 nIndex = 0;
     do
     {
-        OUString aToken = sEncoded.getToken( 0, ' ', nIndex );
+        OString aToken = s.getToken( 0, ' ', nIndex );
         if (aToken.getLength())
         {
-            sal_Unicode value = (sal_Unicode) aToken.toInt32();
+            sal_Unicode value = (sal_Unicode)(aToken.toInt32());
             buff.append(value);
         }
     } while (nIndex >= 0);
-   return buff.makeStringAndClear();
+
+    OUString sDecoded(buff.makeStringAndClear());
+    JFW_TRACE2(sDecoded);
+    return sDecoded;
 }
 
 
diff --git a/moz/download/mozilla-source.txt b/moz/download/mozilla-source.txt
index 8adda26a9..b5d175da5 100644
--- a/moz/download/mozilla-source.txt
+++ b/moz/download/mozilla-source.txt
@@ -1,7 +1,10 @@
 Please copy the source archive for the Mozilla sources into this directory.
-At the moment "seamonkey-1.1.12-source.tar.gz" is required, it can be found
+At the moment "seamonkey-1.1.14.source.tar.gz" is required, it can be found
 here:
- http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.13
+ ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.14
+
+If this version is not available anymore, try a later 1.1.x release - chances
+are good it will work, too.
 
 Windows builders need also
   "vc8-moztools.zip"
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index 654cbc8d0..dfb14afa8 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -30,7 +30,7 @@
 #*************************************************************************
 
 MOZTARGET=$(OS)$(COM)$(CPU)
-MOZ_DIST_DIR=$(MISC)$/build$/mozilla$/dist
+MOZ_DIST_DIR=$(MISC)$/build$/mozilla$/$(BUILD_DIR)$/dist
 MOZ_BIN_DIR=$(MOZ_DIST_DIR)$/bin
 RUNTIME_DIR=$(MISC)$/$(MOZTARGET)runtime
 LIB_DIR=$(LB)
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 75be11886..3722229bf 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -160,9 +160,13 @@ DEFAULT_MOZILLA_TOOLKIT*=gtk2
 MOZILLA_CONFIGURE_FLAGS+= --enable-default-toolkit=$(DEFAULT_MOZILLA_TOOLKIT)
 .ENDIF
 
-CONFIGURE_ACTION=sh -c "./configure $(MOZILLA_CONFIGURE_FLAGS)"
+# create a objdir build = build files in a seperate directory, not in the sourcetree directly
+CONFIGURE_DIR=$(CPU)_objdir
+BUILD_DIR=$(CONFIGURE_DIR)
+MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="gcc -arch $(MOZ_ARCH)" CXX="g++ -arch $(MOZ_ARCH)" AR=ar
+
+CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS)
 
-BUILD_DIR=
 .IF "$(USE_SHELL)"!="4nt"
 BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS)
 .ELSE
@@ -332,4 +336,94 @@ $(MISC)$/build$/moztools.complete : $(MISC)$/build$/moztools.unpack
 zip:	\
     $(MISC)$/CREATETARBALL
 
+.IF "$(GUIBASE)"=="aqua"
+MOZ_ARCH=$(eq,$(CPU),I i386 ppc)
+MOZILLA_CONFIGURE_FLAGS+=$(eq,$(CPU),I --target=i386-apple-darwin8 --target=powerpc-apple-darwin8)
+
+force_clean :
+    @$(IFEXIST) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(THEN) echo 'ERROR: get rid of your outputdir first (or refactor the makefiles to allow incremental creation of prebuilt zips). Remember to copy already created zips to a safe place '; exit 1 $(FI)
+
+zip_intel .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL
+
+zip_ppc .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL
+
+# target-conditionals, when building target -> Macro is set
+zip_intel ?= MOZ_ARCH=i386
+zip_intel ?= MOZILLA_CONFIGURE_FLAGS+=--target=i386-apple-darwin8
+zip_intel ?= CPU=I
+
+zip_ppc ?= MOZ_ARCH=ppc
+zip_ppc ?= MOZILLA_CONFIGURE_FLAGS+=--target=powerpc-apple-darwin8
+zip_ppc ?= CPU=P
+
+zip_universal: $(OUT)$/zipped$/$(OS)$(COM)UBinc.zip $(OUT)$/zipped$/$(OS)$(COM)UBlib.zip $(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip
+    @echo "All zips created successfully - copy from $(OUT)$/zipped to \$$SRC_ROOT/moz/zipped and use --disable-build-mozilla to use them"
+
+$(OUT)$/zipped$/$(OS)$(COM)UBinc.zip : zipped$/$(OS)$(COM)Pinc.zip zipped$/$(OS)$(COM)Iinc.zip
+    @echo "setting up for $@"
+    @rm -rf $(MISC)$/UB_inc
+    @$(MKDIRHIER) $(MISC)$/UB_inc$/intel
+    @$(MKDIR) $(MISC)$/UB_inc$/ppc
+    @$(MKDIR) $(MISC)$/UB_inc$/uni
+    @unzip -q zipped$/$(OS)$(COM)Pinc.zip -d $(MISC)$/UB_inc$/ppc
+    @unzip -q zipped$/$(OS)$(COM)Iinc.zip -d $(MISC)$/UB_inc$/intel
+# use one of the two as basis for the universal one - (saves manually creating directories/copying identical files)
+    @unzip -q zipped$/$(OS)$(COM)Pinc.zip -d $(MISC)$/UB_inc$/uni
+# add safety-warning to host-autogenerated headers (aren't used anywhere in OOo currently, but doesn't hurt to be safe
+# bail out on everything that differs and is not a *.h file
+    @echo "flagging endian-specific headers with #error.."
+    @diff --brief -r $(MISC)$/UB_inc$/ppc $(MISC)$/UB_inc$/intel | awk \
+      '/^Only in/ {{print; print "ERROR - file sets differ!"; exit 1}} \
+       /^Files .*\.h differ$$/ {{target="$(MISC)$/UB_inc$/uni$/" substr($$2,length("$(MISC)$/UB_inc$/ppc")+2); \
+         system("echo \"#error use native moz-zips, this header is endian-specific!\" | cat - " $$2 " > " target); next}} \
+                  {{print; print "ERROR - unexpected files encountered!"; exit 2}}'
+    @cd $(MISC)$/UB_inc$/uni ; zip -q -r ..$/$(@:f) *
+    @$(MKDIRHIER) $(@:d)
+    @$(MV) $(MISC)$/UB_inc$/$(@:f) $@
+    @echo "successfully created $@"
+
+$(OUT)$/zipped$/$(OS)$(COM)UBlib.zip : zipped$/$(OS)$(COM)Plib.zip zipped$/$(OS)$(COM)Ilib.zip
+    @echo "setting up for $@"
+    @rm -rf $(MISC)$/UB_lib
+    @$(MKDIRHIER) $(MISC)$/UB_lib$/intel
+    @$(MKDIR) $(MISC)$/UB_lib$/ppc
+    @$(MKDIR) $(MISC)$/UB_lib$/uni
+    @unzip -q zipped$/$(OS)$(COM)Plib.zip -d $(MISC)$/UB_lib$/ppc
+    @unzip -q zipped$/$(OS)$(COM)Ilib.zip -d $(MISC)$/UB_lib$/intel
+# use lipo on .a and .dylib files - bail out on anything else
+    @echo "creating universal binaries from libs..."
+    @diff --brief -s -r $(MISC)$/UB_lib$/ppc $(MISC)$/UB_lib$/intel | awk \
+      '/^Only in/ {{print "ERROR - file sets differ!"; print; exit 1}} \
+       /^Files .*\.(a|dylib) differ$$/ {{target="$(MISC)$/UB_lib$/uni$/" substr($$2,length("$(MISC)$/UB_lib$/ppc")+2); \
+         if(0!=system("lipo -create -arch ppc "$$2" -arch i386 "$$4" -output " target)) exit 11; next}} \
+                  {{print; print "ERROR - unexpected files encountered!"; exit 2}}'
+    @cd $(MISC)$/UB_lib$/uni ; zip -q -r ..$/$(@:f) *
+    @$(MKDIRHIER) $(@:d)
+    @$(MV) $(MISC)$/UB_lib$/$(@:f) $@
+    @echo "successfully created $@"
+
+$(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip : zipped$/$(OS)$(COM)Pruntime.zip zipped$/$(OS)$(COM)Iruntime.zip
+    @echo "setting up for $@"
+    @rm -rf $(MISC)$/UB_runtime
+    @$(MKDIRHIER) $(MISC)$/UB_runtime$/intel
+    @$(MKDIR) $(MISC)$/UB_runtime$/ppc
+    @$(MKDIR) $(MISC)$/UB_runtime$/uni
+    @unzip -q zipped$/$(OS)$(COM)Pruntime.zip -d $(MISC)$/UB_runtime$/ppc
+    @unzip -q zipped$/$(OS)$(COM)Iruntime.zip -d $(MISC)$/UB_runtime$/intel
+# use one of the two as basis for the universal one - (saves manually creating directories/copying identical files)
+    @unzip -q zipped$/$(OS)$(COM)Pruntime.zip -d $(MISC)$/UB_runtime$/uni
+# @line -comments in autogenerated files: contains path of source-file, ignore different objdirs
+    @echo "creating universal binaries from libs..."
+    @diff --brief -I "^//@line [0-9][0-9]*" -r $(MISC)$/UB_runtime$/ppc $(MISC)$/UB_runtime$/intel | awk \
+      '/^Only in/ {{print; print "ERROR - file sets differ!"; exit 1}} \
+           /^Files .*\.dylib differ$$/ {{target="$(MISC)$/UB_runtime$/uni$/" substr($$2,length("$(MISC)$/UB_runtime$/ppc")+2); \
+             if(0!=system("lipo -create -arch ppc "$$2" -arch i386 "$$4" -output " target)) exit 11; next}} \
+                      {{print; print "ERROR - unexpected files encountered!"; exit 2}}'
+    @cd $(MISC)$/UB_lib$/uni ; zip -q -r ..$/$(@:f) *
+    @$(MKDIRHIER) $(@:d)
+    @$(MV) $(MISC)$/UB_lib$/$(@:f) $@
+    @echo "successfully created $@"
+
+.ENDIF # $(GUIBASE)=="aqua"
+
 .INCLUDE : extractfiles.mk
diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk
index 400b57677..66d0c38bc 100644
--- a/moz/zipped/makefile.mk
+++ b/moz/zipped/makefile.mk
@@ -60,11 +60,11 @@ ALLTAR: \
 .ENDIF
 .IF "$(GUI)" == "UNX"
 
-$(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip $(OS)$(COM)$(CPU)runtime.zip
+$(MISC)$/unpacked_%_lib : $(OS)$(COM)$(CPU)lib.zip '$(OS)$(COM)$(CPU)runtime.zip'
     unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && unzip -o -d $(LB) $(OS)$(COM)$(CPU)runtime.zip && $(TOUCH) $@
     chmod -R 775 $(LB)
 
-$(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip
+$(MISC)$/unpacked_%_inc : $(OS)$(COM)$(CPU)inc.zip
     unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH)	$@
     chmod -R 775 $(INCCOM)
 
@@ -79,14 +79,28 @@ $(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip
 
 .ENDIF
 
-$(BIN)$/mozruntime.zip : $(OS)$(COM)$(CPU)runtime.zip
+$(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPU)runtime.zip
     $(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
 
+# add alternative rules for universal binary moz-zips
+.IF "$(GUIBASE)" == "aqua"
+$(MISC)$/unpacked_%_lib : $(OS)$(COM)UBlib.zip '$(OS)$(COM)UBruntime.zip'
+    unzip -o -d $(LB) $(OS)$(COM)UBlib.zip && unzip -o -d $(LB) $(OS)$(COM)UBruntime.zip && $(TOUCH) $@
+    chmod -R 775 $(LB)
+
+$(MISC)$/unpacked_%_inc : $(OS)$(COM)UBinc.zip
+    unzip -o -d $(INCCOM) $(OS)$(COM)UBinc.zip && $(TOUCH)	$@
+    chmod -R 775 $(INCCOM)
+
+$(BIN)$/mozruntime%zip : $(OS)$(COM)UBruntime.zip
+    $(COPY) $(OS)$(COM)UBruntime.zip $(BIN)$/mozruntime.zip
+
+.ENDIF # "$(GUIBASE)"=="aqua"
+
 LIBLIST =
 BIN_RUNTIMELIST = 
 NSS_INCLUDE_LIST =
 NSS_MODULE_RUNTIME_LIST =
-
 .IF "$(ENABLE_NSS_MODULE)"=="YES"
 # The prebuilt moz files include all the old NSS stuff from moz and not the new
 # NSS libs, headers, etc, from the separate nss module. If we use the nss module
diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl
index 1be9e8dc0..49c9cf285 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -84,6 +84,12 @@ module com { module sun { module star { module document {
 published service MediaDescriptor
 {
     //-------------------------------------------------------------------------
+    /** May be set by filters or detection services if user has choosen to
+        abort loading/saving, e.g. while entering a password.
+     */
+    [optional,property] boolean Aborted;
+
+    //-------------------------------------------------------------------------
     /** document is a template
 
         <p>
@@ -136,7 +142,7 @@ published service MediaDescriptor
         </p>
      */
     [optional,property] any ComponentData;
-    
+
     //-------------------------------------------------------------------------
     /** The base URL of the document to be used to resolve relative links.
      */
@@ -439,7 +445,7 @@ published service MediaDescriptor
     /** let the document be opened in repair mode
 
         <p>
-        For loading of corrupted zip packages: Setting this to <TRUE/> let the document 
+        For loading of corrupted zip packages: Setting this to <TRUE/> let the document
         be opened in repair mode, so as much as possible information will be retrieved.
         </p>
 
diff --git a/offapi/com/sun/star/document/PDFDialog.idl b/offapi/com/sun/star/document/PDFDialog.idl
new file mode 100644
index 000000000..79d718d2e
--- /dev/null
+++ b/offapi/com/sun/star/document/PDFDialog.idl
@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile:$
+ * $Revision:$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_document_PDFDialog_idl__ 
+#define __com_sun_star_document_PDFDialog_idl__ 
+ 
+#ifndef __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
+#include <com/sun/star/ui/dialogs/FilterOptionsDialog.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module document {  
+ 
+//============================================================================= 
+ 
+/** This service is for a PDFDialog
+ */
+service PDFDialog
+{ 
+    service com::sun::star::ui::dialogs::FilterOptionsDialog; 
+
+    //-------------------------------------------------------------------------
+    /** PDFDialog options can be set as sequence of
+        com.sun.star.beans.PropertyValue at the FilterData property of the
+        MediaDescriptor. The PropertyValues which are supported within the
+        sequence are described in the registry at Office.Common/Filter/PDF/Export
+
+        The source of this registry can be found in following file:
+        "officecfg/registry/schema/org/openoffice/Office/Common.xcs"
+    */
+
+    //-------------------------------------------------------------------------
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
+
diff --git a/offapi/com/sun/star/document/XVbaMethodParameter.idl b/offapi/com/sun/star/document/XVbaMethodParameter.idl
new file mode 100644
index 000000000..7ef52964b
--- /dev/null
+++ b/offapi/com/sun/star/document/XVbaMethodParameter.idl
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright IBM Corporation 2009
+ * Copyright 2009 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XVbaMethodParameter,v $
+ * $Revision: 1.13 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __org_openoffice_vba_XVbaMethodParameter_idl__
+#define __org_openoffice_vba_XVbaMethodParameter_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+//============================================================================= 
+
+module com {  module sun {  module star {  module document {
+
+//============================================================================= 
+//gives access to vba method input/output parameters
+//
+//some OO objects need to implement this interface to support the passing of input/output parameters
+//for certain VBA events
+
+interface XVbaMethodParameter : com::sun::star::uno::XInterface
+{
+	//------------------------------------------------------------------------- 
+	 
+	/** sets the value of the parameter with the specified name.
+	 */
+	void setVbaMethodParameter( [in] string PropertyName, 
+			 [in] any Value ); 
+ 
+	//------------------------------------------------------------------------- 
+
+	/** returns the value of the parameter with the specified name.
+     */
+	any getVbaMethodParameter( [in] string PropertyName ); 
+};
+
+//============================================================================= 
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/document/makefile.mk b/offapi/com/sun/star/document/makefile.mk
index 2f3f67581..e0a55668f 100644
--- a/offapi/com/sun/star/document/makefile.mk
+++ b/offapi/com/sun/star/document/makefile.mk
@@ -71,6 +71,7 @@ IDLFILES=\
     OfficeDocument.idl\
     OleEmbeddedServerRegistration.idl\
     OwnLockOnDocumentRequest.idl\
+    PDFDialog.idl\
     PrinterIndependentLayout.idl\
     RedlineDisplayType.idl \
     Settings.idl\
@@ -105,7 +106,7 @@ IDLFILES=\
     XLinkTargetSupplier.idl\
     XMimeTypeInfo.idl\
     XOOXMLDocumentPropertiesImporter.idl\
-        XRedlinesSupplier.idl \
+    XRedlinesSupplier.idl \
     XScriptInvocationContext.idl\
     XStandaloneDocumentInfo.idl\
     XStorageBasedDocument.idl\
@@ -119,6 +120,7 @@ IDLFILES=\
     XCodeNameQuery.idl \
     XDocumentEventCompatibleHelper.idl \
     XCompatWriterDocProperties.idl \
+    XVbaMethodParameter.idl \
     VbaEventId.idl \
     XVbaEventsHelper.idl \
     VbaEventsHelper.idl \
diff --git a/offapi/com/sun/star/text/XFormField.idl b/offapi/com/sun/star/text/XFormField.idl
index b8d602376..772d7ebda 100644
--- a/offapi/com/sun/star/text/XFormField.idl
+++ b/offapi/com/sun/star/text/XFormField.idl
@@ -11,14 +11,13 @@
  */
  interface XFormField: com::sun::star::uno::XInterface
  {
-     short getType();
-     short getRes();
-     string getDescription( ); 	
- 
-     void setType([in] short fieldType );
-     void setRes([in] short res );
-     void setDescription([in] string description );
- 
+     string getFieldType();
+     void setFieldType([in] string fieldType);     
+
+     short getParamCount();
+     string getParamName([in] short i);
+     string getParamValue([in] short i);
+     void addParam([in] string name, [in] string value, [in] boolean replaceExisting);
  };
  
  }; }; }; }; 
diff --git a/offapi/com/sun/star/ui/ItemStyle.idl b/offapi/com/sun/star/ui/ItemStyle.idl
index 1243c6795..5728b4a01 100644
--- a/offapi/com/sun/star/ui/ItemStyle.idl
+++ b/offapi/com/sun/star/ui/ItemStyle.idl
@@ -149,6 +149,7 @@ constants ItemStyle
         <p>This style is only valid if the item describes a toolbar item.</p>
     */
     const short DROPDOWN_ONLY = 1024;
+    const short TEXT = 2048;
 };
 
 }; }; }; };
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 949820bf6..b151d6abd 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1249,9 +1249,9 @@
             </node>
             <node oor:name=".uno:Name" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Rename Sheet</value>
-                </prop>
-            </node>
+					<value xml:lang="en-US">Rename Sheet</value>
+				</prop>
+			</node>
             <node oor:name=".uno:SetTabBgColor" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">~Tab Color...</value>
@@ -1265,9 +1265,9 @@
                     <value xml:lang="en-US">Tab Color</value>
                 </prop>
             </node>
-            <node oor:name=".uno:Move" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Move/Copy Sheet...</value>
+			<node oor:name=".uno:Move" oor:op="replace">
+				<prop oor:name="Label" oor:type="xs:string">
+					<value xml:lang="en-US">~Move/Copy Sheet...</value>
                 </prop>
                 <prop oor:name="ContextLabel" oor:type="xs:string">
                     <value xml:lang="en-US">~Move/Copy...</value>
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index 0fd9bc69d..6c1e01492 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -887,27 +887,27 @@
     </node>
     <node oor:name="pa-IN" oor:op="replace">
       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-        <value>Raavi;Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
-      </prop>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma</value>
+     </prop>
       <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-        <value>Raavi;Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-        <value>Raavi;Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-        <value>Raavi;Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-        <value>Raavi;Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-        <value>Raavi;Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
     </node>
     <node oor:name="ta-IN" oor:op="replace">
       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-        <value>Latha;Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+        <value>Latha;Lohit Tamil;Tahoma;Sans Serif</value>
       </prop>
       <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
         <value>Latha;Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
@@ -1643,6 +1643,21 @@
           <value>Decorative,Special</value>
         </prop>
       </node>
+
+      <node oor:name="calibri" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>hiraginomarugothicpronw3;hiraginomarugothicprow3</value>
+        </prop>
+        <prop oor:name="FontType"><value>Normal,SansSerif</value></prop>
+      </node>
+
+      <node oor:name="cambria" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>applelisung</value>
+        </prop>
+        <prop oor:name="FontType"><value>Normal,Serif</value></prop>
+      </node>
+
       <node oor:name="calisto" oor:op="replace">
         <prop oor:name="SubstFonts">
           <value>thorndaleamt;thorndale;timesnewroman;nimbusromanno9l;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
@@ -7708,8 +7723,7 @@
         <prop oor:name="FontType">
           <value>Normal,SansSerif</value>
         </prop>
-       </node>
-
+      </node>
 
       <node oor:name="sansdemi" oor:op="replace">
         <prop oor:name="SubstFonts">
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu.bak b/officecfg/registry/data/org/openoffice/VCL.xcu.bak
index 62738dbf1..ccbfcd4d0 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu.bak
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu.bak
@@ -887,27 +887,27 @@
     </node>
     <node oor:name="pa-IN" oor:op="replace">
       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
-      </prop>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma</value>
+     </prop>
       <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
     </node>
     <node oor:name="ta-IN" oor:op="replace">
       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+        <value>Lohit Tamil;Tahoma;Sans Serif</value>
       </prop>
       <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
         <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
@@ -1643,6 +1643,21 @@
           <value>Decorative,Special</value>
         </prop>
       </node>
+
+      <node oor:name="calibri" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>hiraginomarugothicpronw3;hiraginomarugothicprow3</value>
+        </prop>
+        <prop oor:name="FontType"><value>Normal,SansSerif</value></prop>
+      </node>
+
+      <node oor:name="cambria" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>applelisung</value>
+        </prop>
+        <prop oor:name="FontType"><value>Normal,Serif</value></prop>
+      </node>
+
       <node oor:name="calisto" oor:op="replace">
         <prop oor:name="SubstFonts">
           <value>thorndaleamt;thorndale;timesnewroman;nimbusromanno9l;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
@@ -7708,8 +7723,7 @@
         <prop oor:name="FontType">
           <value>Normal,SansSerif</value>
         </prop>
-       </node>
-
+      </node>
 
       <node oor:name="sansdemi" oor:op="replace">
         <prop oor:name="SubstFonts">
diff --git a/oovbaapi/ooo/vba/Globals.idl b/oovbaapi/ooo/vba/Globals.idl
new file mode 100644
index 000000000..e69de29bb
diff --git a/oovbaapi/ooo/vba/XGlobals.idl b/oovbaapi/ooo/vba/XGlobals.idl
new file mode 100644
index 000000000..e69de29bb
diff --git a/oovbaapi/ooo/vba/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index 35e10c825..c44a063c6 100644
--- a/oovbaapi/ooo/vba/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
@@ -42,6 +42,7 @@ interface XLabel: com::sun::star::uno::XInterface
 {
     [attribute] string Caption;
     [attribute] any Value;
+	[attribute] long ForeColor; //liuchen 2009-7-3
 };
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 2ff4d6d67..5a2153b0d 100644
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -43,7 +43,7 @@ interface XListBox: com::sun::star::uno::XInterface
 {
     [attribute] any Value;
     [attribute] string Text;
-    [attribute] boolean MultiSelect;
+	[attribute] long MultiSelect; //liuchen 2009-7-31 MultiSelect property in Excel VBA is type long
     [attribute] any ListIndex;
         [attribute, readonly ] long ListCount;
     void AddItem( [in] any pvargItem, [in] any pvargIndex );
diff --git a/oox/inc/oox/core/binarycodec.hxx b/oox/inc/oox/core/binarycodec.hxx
index bb33c214f..767b9c2be 100644
--- a/oox/inc/oox/core/binarycodec.hxx
+++ b/oox/inc/oox/core/binarycodec.hxx
@@ -34,11 +34,26 @@
 #include <rtl/cipher.h>
 #include <rtl/digest.h>
 
+namespace oox { class AttributeList; }
+
 namespace oox {
 namespace core {
 
 // ============================================================================
 
+class CodecHelper
+{
+public:
+    /** Returns the password hash if it is in the required 16-bit limit. */
+    static sal_uInt16   getPasswordHash( const AttributeList& rAttribs, sal_Int32 nElement );
+
+private:
+                        CodecHelper();
+                        ~CodecHelper();
+};
+
+// ============================================================================
+
 /** Encodes and decodes data from/to protected MS Office documents.
 
     Implements a simple XOR encoding/decoding algorithm used in MS Office
@@ -182,12 +197,12 @@ public:
         @param pnPassData
             Unicode character array containing the password. Must be zero
             terminated, which results in a maximum length of 15 characters.
-        @param pnUnique
-            Unique document identifier read from or written to the file.
+        @param pnSalt
+            Random salt data block read from or written to the file.
      */
     void                initKey(
                             const sal_uInt16 pnPassData[ 16 ],
-                            const sal_uInt8 pnUnique[ 16 ] );
+                            const sal_uInt8 pnSalt[ 16 ] );
 
     /** Verifies the validity of the password using the passed salt data.
 
@@ -195,17 +210,17 @@ public:
             The codec must be initialized with the initKey() function before
             this function can be used.
 
-        @param pnSaltData
-            Salt data block read from the file.
-        @param pnSaltDigest
-            Salt digest read from the file.
+        @param pnVerifier
+            Verifier block read from the file.
+        @param pnVerifierHash
+            Verifier hash read from the file.
 
         @return
             True = test was successful.
      */
     bool                verifyKey(
-                            const sal_uInt8 pnSaltData[ 16 ],
-                            const sal_uInt8 pnSaltDigest[ 16 ] );
+                            const sal_uInt8 pnVerifier[ 16 ],
+                            const sal_uInt8 pnVerifierHash[ 16 ] );
 
     /** Rekeys the codec using the specified counter.
 
diff --git a/oox/inc/oox/core/binaryfilterbase.hxx b/oox/inc/oox/core/binaryfilterbase.hxx
index ce2c4f2c3..c051934f5 100644
--- a/oox/inc/oox/core/binaryfilterbase.hxx
+++ b/oox/inc/oox/core/binaryfilterbase.hxx
@@ -49,8 +49,9 @@ public:
 
 private:
     virtual StorageRef  implCreateStorage(
-                            ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
-                            ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const;
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const;
+    virtual StorageRef  implCreateStorage(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const;
 };
 
 typedef ::rtl::Reference< BinaryFilterBase > BinaryFilterRef;
diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx
index 001b53744..9115c88be 100644
--- a/oox/inc/oox/core/filterbase.hxx
+++ b/oox/inc/oox/core/filterbase.hxx
@@ -44,7 +44,7 @@
 #include <cppuhelper/implbase5.hxx>
 #include "oox/helper/binarystreambase.hxx"
 #include "oox/helper/storagebase.hxx"
-#include <oox/dllapi.h>
+#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace lang { class XMultiServiceFactory; }
@@ -58,6 +58,11 @@ namespace com { namespace sun { namespace star {
     namespace graphic { class XGraphic; }
 } } }
 
+namespace comphelper {
+    class IDocPasswordVerifier;
+    class MediaDescriptor;
+}
+
 namespace oox {
     class GraphicHelper;
     class ModelObjectHelper;
@@ -110,6 +115,9 @@ public:
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&
                         getGlobalFactory() const;
 
+    /** Returns the media descriptor. */
+    ::comphelper::MediaDescriptor& getMediaDescriptor() const;
+
     /** Returns the document model (always existing). */
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >&
                         getModel() const;
@@ -193,6 +201,10 @@ public:
     /** Returns a system color specified by the passed XML token identifier. */
     sal_Int32           getSystemColor( sal_Int32 nToken, sal_Int32 nDefaultRgb = -1 ) const;
 
+    /** Requests a password from the media descriptor or from the user. On
+        success, the password will be inserted into the media descriptor. */
+    ::rtl::OUString     requestPassword( ::comphelper::IDocPasswordVerifier& rVerifier ) const;
+
     /** Imports the raw binary data from the specified stream.
         @return  True, if the data could be imported from the stream. */
     bool                importBinaryData( StreamDataSequence& orDataSeq, const ::rtl::OUString& rStreamName );
@@ -251,19 +263,29 @@ public:
     // com.sun.star.document.XFilter interface --------------------------------
 
     virtual sal_Bool SAL_CALL filter(
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor )
+                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq )
                             throw( ::com::sun::star::uno::RuntimeException );
 
     virtual void SAL_CALL cancel()
                             throw( ::com::sun::star::uno::RuntimeException );
 
     // ------------------------------------------------------------------------
+protected:
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+                        implGetInputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const;
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
+                        implGetOutputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const;
+
 private:
+    void                setMediaDescriptor(
+                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq );
+
     virtual ::rtl::OUString implGetImplementationName() const = 0;
 
     virtual StorageRef  implCreateStorage(
-                            ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
-                            ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const = 0;
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const = 0;
+    virtual StorageRef  implCreateStorage(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const = 0;
 
 private:
     ::std::auto_ptr< FilterBaseImpl > mxImpl;
diff --git a/oox/inc/oox/core/filterdetect.hxx b/oox/inc/oox/core/filterdetect.hxx
new file mode 100644
index 000000000..bd9e3a84f
--- /dev/null
+++ b/oox/inc/oox/core/filterdetect.hxx
@@ -0,0 +1,168 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: filterdetect.hxx,v $
+ * $Revision: 1.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef OOX_CORE_FILTERDETECT_HXX
+#define OOX_CORE_FILTERDETECT_HXX
+
+#include <vector>
+#include <com/sun/star/document/XExtendedFilterDetection.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include "oox/dllapi.h"
+
+namespace com { namespace sun { namespace star {
+    namespace io { class XInputStream; }
+} } }
+
+namespace comphelper { class MediaDescriptor; }
+namespace oox { class AttributeList; }
+
+namespace oox {
+namespace core {
+
+// ============================================================================
+
+/** Document handler specifically designed for detecting OOXML file formats.
+
+    It takes a reference to the filter string object via its constructor, and
+    puts the name of the detected filter to it, if it successfully finds one.
+ */
+class FilterDetectDocHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastDocumentHandler >
+{
+public:
+    explicit            FilterDetectDocHandler( ::rtl::OUString& rFilter );
+    virtual             ~FilterDetectDocHandler();
+
+    // XFastDocumentHandler
+    virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+
+    // XFastContextHandler
+    virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+
+private:
+    void                parseRelationship( const AttributeList& rAttribs );
+
+    ::rtl::OUString     getFilterNameFromContentType( const ::rtl::OUString& rContentType ) const;
+    void                parseContentTypesDefault( const AttributeList& rAttribs );
+    void                parseContentTypesOverride( const AttributeList& rAttribs );
+
+private:
+    typedef ::std::vector< sal_Int32 > ContextVector;
+
+    ::rtl::OUString&    mrFilterName;
+    ContextVector       maContextStack;
+    ::rtl::OUString     maTargetPath;
+};
+
+// ============================================================================
+
+class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
+{
+public:
+    explicit            FilterDetect( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory );
+    virtual             ~FilterDetect();
+
+    /** Tries to extract an unencrypted ZIP package from the passed media
+        descriptor.
+
+        First, this function checks if the input stream provided by the media
+        descriptor property 'InputStream' contains a ZIP package. If yes, this
+        stream is returned.
+
+        Second, this function checks if the 'ComponentData' property exists and
+        contains a sequence of com.sun.star.beans.NamedValue. If yes, a named
+        value is searched with the name 'DecryptedPackage' and a value of type
+        com.sun.star.io.XStream. If the input stream provided by this XStream
+        contains a ZIP package, this input stream is returned.
+
+        Third, this function checks if the input stream of the media descriptor
+        contains an OLE package. If yes, it checks the existence of the streams
+        'EncryptionInfo' and 'EncyptedPackage' and tries to decrypt the package
+        into a temporary file. This may include requesting a password from the
+        media descriptor property 'Password' or from the user, using the
+        interaction handler provided by the descriptor. On success, and if the
+        decrypted package is a ZIP package, the XStream of the temporary file
+        is stored in the property 'ComponentData' of the media descriptor and
+        its input stream is returned.
+     */
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+                        extractUnencryptedPackage( ::comphelper::MediaDescriptor& rMediaDesc ) const;
+
+    // com.sun.star.lang.XServiceInfo interface -------------------------------
+
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+
+    // com.sun.star.document.XExtendedFilterDetection interface ---------------
+
+    /** Detects MS Office 2007 file types and supports package decryption.
+
+        The following file types are detected:
+        - MS Word 2007 XML Document (*.docx, *.docm)
+        - MS Word 2007 XML Template (*.dotx, *.dotm)
+        - MS Excel 2007 XML Document (*.xlsx, *.xlsm)
+        - MS Excel 2007 BIFF12 Document (*.xlsb)
+        - MS Excel 2007 XML Template (*.xltx, *.xltm)
+        - MS Powerpoint 2007 XML Document (*.pptx, *.pptm)
+        - MS Powerpoint 2007 XML Template (*.potx, *.potm)
+
+        If the package is encrypted, the detection tries to decrypt it into a
+        temporary file. The user may be asked for a password. The XStream
+        interface of the temporary file will be stored in the 'ComponentData'
+        property of the passed media descriptor.
+     */
+    virtual ::rtl::OUString SAL_CALL detect(
+                            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq )
+                            throw( ::com::sun::star::uno::RuntimeException );
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxFactory;
+};
+
+// ============================================================================
+
+} // namespace core
+} // namespace oox
+
+#endif
+
diff --git a/oox/inc/oox/core/xmlfilterbase.hxx b/oox/inc/oox/core/xmlfilterbase.hxx
index f88554457..d1b79dc11 100644
--- a/oox/inc/oox/core/xmlfilterbase.hxx
+++ b/oox/inc/oox/core/xmlfilterbase.hxx
@@ -204,10 +204,15 @@ public:
      */
     XmlFilterBase& exportDocumentProperties( ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xProperties );
 
+protected:
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+                        implGetInputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const;
+
 private:
     virtual StorageRef  implCreateStorage(
-                            ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
-                            ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const;
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const;
+    virtual StorageRef  implCreateStorage(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const;
 
 private:
     ::std::auto_ptr< XmlFilterBaseImpl > mxImpl;
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 0c5314c4a..9a791942c 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -41,6 +41,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/util/DateTime.hpp>
+#include <comphelper/mediadescriptor.hxx>
 #include "oox/helper/helper.hxx"
 #include "oox/helper/storagebase.hxx"
 #include "oox/helper/binaryinputstream.hxx"
@@ -57,6 +58,10 @@ namespace com { namespace sun { namespace star {
     namespace lang { class XMultiServiceFactory; }
 } } }
 
+namespace comphelper {
+    class IDocPasswordVerifier;
+}
+
 namespace oox {
     class BinaryOutputStream;
 }
@@ -866,7 +871,8 @@ public:
                             const ::rtl::OUString& rFileName,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
                             const StorageRef& rxRootStrg,
-                            const ::rtl::OUString& rSysFileName );
+                            const ::rtl::OUString& rSysFileName,
+                            ::comphelper::MediaDescriptor& rMediaDesc );
 
     virtual             ~SharedConfigData();
 
@@ -883,6 +889,9 @@ public:
     void                eraseNameList( const ::rtl::OUString& rListName );
     NameListRef         getNameList( const ::rtl::OUString& rListName ) const;
 
+    ::rtl::OUString     requestPassword( ::comphelper::IDocPasswordVerifier& rVerifier );
+    inline bool         isPasswordCancelled() const { return mbPwCancelled; }
+
 protected:
     virtual bool        implIsValid() const;
     virtual void        implProcessConfigItemStr(
@@ -905,11 +914,13 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxFactory;
     StorageRef          mxRootStrg;
     ::rtl::OUString     maSysFileName;
+    ::comphelper::MediaDescriptor& mrMediaDesc;
     ConfigFileSet       maConfigFiles;
     ConfigDataMap       maConfigData;
     NameListMap         maNameLists;
     ::rtl::OUString     maConfigPath;
     bool                mbLoaded;
+    bool                mbPwCancelled;
 };
 
 // ----------------------------------------------------------------------------
@@ -947,7 +958,8 @@ public:
                             const sal_Char* pcEnvVar,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
                             const StorageRef& rxRootStrg,
-                            const ::rtl::OUString& rSysFileName );
+                            const ::rtl::OUString& rSysFileName,
+                            ::comphelper::MediaDescriptor& rMediaDesc );
 
     virtual             ~Config();
 
@@ -978,6 +990,9 @@ public:
     template< typename Type >
     bool                hasName( const NameListWrapper& rListWrp, Type nKey ) const;
 
+    ::rtl::OUString     requestPassword( ::comphelper::IDocPasswordVerifier& rVerifier );
+    bool                isPasswordCancelled() const;
+
 protected:
     inline explicit     Config() {}
     void                construct( const Config& rParent );
@@ -988,7 +1003,8 @@ protected:
                             const sal_Char* pcEnvVar,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
                             const StorageRef& rxRootStrg,
-                            const ::rtl::OUString& rSysFileName );
+                            const ::rtl::OUString& rSysFileName,
+                            ::comphelper::MediaDescriptor& rMediaDesc );
 
     virtual bool        implIsValid() const;
     virtual const ::rtl::OUString* implGetOption( const ::rtl::OUString& rKey ) const;
@@ -1822,11 +1838,6 @@ class RecordObjectBase : public InputObjectBase
 protected:
     inline explicit     RecordObjectBase() {}
 
-    inline sal_Int64    getRecPos() const { return mnRecPos; }
-    inline sal_Int64    getRecId() const { return mnRecId; }
-    inline sal_Int64    getRecSize() const { return mnRecSize; }
-    inline NameListRef  getRecNames() const { return maRecNames.getNameList( cfg() ); }
-
     using               InputObjectBase::construct;
     void                construct(
                             const ObjectBase& rParent,
@@ -1842,6 +1853,14 @@ protected:
                             const String& rRecNames,
                             const String& rSimpleRecs = EMPTY_STRING );
 
+    inline sal_Int64    getRecPos() const { return mnRecPos; }
+    inline sal_Int64    getRecId() const { return mnRecId; }
+    inline sal_Int64    getRecSize() const { return mnRecSize; }
+    inline NameListRef  getRecNames() const { return maRecNames.getNameList( cfg() ); }
+
+    inline void         setBinaryOnlyMode( bool bBinaryOnly ) { mbBinaryOnly = bBinaryOnly; }
+    inline bool         isBinaryOnlyMode() const { return mbBinaryOnly; }
+
     virtual bool        implIsValid() const;
     virtual void        implDump();
 
@@ -1865,6 +1884,7 @@ private:
     sal_Int64           mnRecId;
     sal_Int64           mnRecSize;
     bool                mbShowRecPos;
+    bool                mbBinaryOnly;
 };
 
 // ============================================================================
@@ -1922,6 +1942,7 @@ public:
     virtual             ~DumperBase();
 
     bool                isImportEnabled() const;
+    bool                isImportCancelled() const;
 
 protected:
     inline explicit     DumperBase() {}
@@ -1936,12 +1957,13 @@ protected:
 } // namespace dump
 } // namespace oox
 
-#define OOX_DUMP_FILE( DumperClassName )    \
-do {                                        \
-    DumperClassName aDumper( *this );       \
-    aDumper.dump();                         \
-    if( !aDumper.isImportEnabled() )        \
-        return aDumper.isValid();           \
+#define OOX_DUMP_FILE( DumperClassName )            \
+do {                                                \
+    DumperClassName aDumper( *this );               \
+    aDumper.dump();                                 \
+    bool bCancelled = aDumper.isImportCancelled();  \
+    if( !aDumper.isImportEnabled() || bCancelled )  \
+        return aDumper.isValid() && !bCancelled;    \
 } while( false )
 
 #else   // OOX_INCLUDE_DUMPER
diff --git a/oox/inc/oox/xls/biffcodec.hxx b/oox/inc/oox/xls/biffcodec.hxx
index 165a608d4..3fc5d77b4 100644
--- a/oox/inc/oox/xls/biffcodec.hxx
+++ b/oox/inc/oox/xls/biffcodec.hxx
@@ -32,6 +32,7 @@
 #define OOX_XLS_BIFFCODEC_HXX
 
 #include <vector>
+#include <comphelper/docpasswordhelper.hxx>
 #include "oox/core/binarycodec.hxx"
 #include "oox/xls/workbookhelper.hxx"
 
@@ -40,29 +41,27 @@ namespace xls {
 
 // ============================================================================
 
-const sal_Int32 CODEC_OK                    = 0;
-const sal_Int32 CODEC_ERROR_WRONG_PASS      = 1;
-const sal_Int32 CODEC_ERROR_UNSUPP_CRYPT    = 2;
-
 const sal_Int64 BIFF_RCF_BLOCKSIZE          = 1024;
 
 // ============================================================================
 
 /** Base class for BIFF stream decoders. */
-class BiffDecoderBase : public WorkbookHelper
+class BiffDecoderBase : public ::comphelper::IDocPasswordVerifier
 {
 public:
-    explicit            BiffDecoderBase( const WorkbookHelper& rHelper );
+    explicit            BiffDecoderBase();
     virtual             ~BiffDecoderBase();
 
     /** Derived classes return a clone of the decoder for usage in new streams. */
     inline BiffDecoderBase* clone() { return implClone(); }
 
-    /** Returns the current error code of the decoder. */
-    inline sal_Int32    getErrorCode() const { return mnError; }
-    /** Returns true, if the decoder has been constructed successfully.
-        This means especially that construction happened with a valid password. */
-    inline bool         isValid() const { return mnError == CODEC_OK; }
+    /** Implementation of the ::comphelper::IDocPasswordVerifier interface,
+        calls the new virtual function implVerify(). */
+    virtual ::comphelper::DocPasswordVerifierResult
+                        verifyPassword( const ::rtl::OUString& rPassword );
+
+    /** Returns true, if the decoder has been initialized correctly. */
+    inline bool         isValid() const { return mbValid; }
 
     /** Decodes nBytes bytes and writes encrypted data into the buffer pnDestData. */
     void                decode(
@@ -71,17 +70,14 @@ public:
                             sal_Int64 nStreamPos,
                             sal_uInt16 nBytes );
 
-protected:
-    /** Copy constructor for cloning. */
-                        BiffDecoderBase( const BiffDecoderBase& rDecoder );
-
-    /** Sets the decoder to a state showing whether the password was correct. */
-    void                setHasValidPassword( bool bValid );
-
 private:
     /** Derived classes return a clone of the decoder for usage in new streams. */
     virtual BiffDecoderBase* implClone() = 0;
 
+    /** Derived classes implement password verification and initialization of
+        the decoder. */
+    virtual bool        implVerify( const ::rtl::OUString& rPassword ) = 0;
+
     /** Implementation of decryption of a memory block. */
     virtual void        implDecode(
                             sal_uInt8* pnDestData,
@@ -90,7 +86,7 @@ private:
                             sal_uInt16 nBytes ) = 0;
 
 private:
-    sal_Int32           mnError;        /// Decoder error code.
+    bool                mbValid;        /// True = decoder is correctly initialized.
 };
 
 typedef ::boost::shared_ptr< BiffDecoderBase > BiffDecoderRef;
@@ -101,31 +97,18 @@ typedef ::boost::shared_ptr< BiffDecoderBase > BiffDecoderRef;
 class BiffDecoder_XOR : public BiffDecoderBase
 {
 public:
-    /** Constructs the decoder.
-
-        Checks if the passed key and hash specify workbook protection. Asks for
-        a password otherwise.
-
-        @param nKey
-            Password key from FILEPASS record to verify password.
-        @param nHash
-            Password hash value from FILEPASS record to verify password.
-     */
-    explicit            BiffDecoder_XOR(
-                            const WorkbookHelper& rHelper,
-                            sal_uInt16 nKey, sal_uInt16 nHash );
+    explicit            BiffDecoder_XOR( sal_uInt16 nKey, sal_uInt16 nHash );
 
 private:
     /** Copy constructor for cloning. */
                         BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder );
 
-    /** Initializes the wrapped codec object. After that, internal status can
-        be querried with isValid(). */
-    void                init( const ::rtl::OString& rPass );
-
     /** Returns a clone of the decoder for usage in new streams. */
     virtual BiffDecoder_XOR* implClone();
 
+    /** Implements password verification and initialization of the decoder. */
+    virtual bool        implVerify( const ::rtl::OUString& rPassword );
+
     /** Implementation of decryption of a memory block. */
     virtual void        implDecode(
                             sal_uInt8* pnDestData,
@@ -135,7 +118,7 @@ private:
 
 private:
     ::oox::core::BinaryCodec_XOR maCodec;   /// Cipher algorithm implementation.
-    ::rtl::OString      maPass;
+    ::std::vector< sal_uInt8 > maPassword;
     sal_uInt16          mnKey;
     sal_uInt16          mnHash;
 };
@@ -146,35 +129,21 @@ private:
 class BiffDecoder_RCF : public BiffDecoderBase
 {
 public:
-    /** Constructs the decoder.
-
-        Checks if the passed salt data specifies workbook protection. Asks for
-        a password otherwise.
-
-        @param pnDocId
-            Unique document identifier from FILEPASS record.
-        @param pnSaltData
-            Salt data from FILEPASS record.
-        @param pnSaltHash
-            Salt hash value from FILEPASS record.
-     */
     explicit            BiffDecoder_RCF(
-                            const WorkbookHelper& rHelper,
-                            sal_uInt8 pnDocId[ 16 ],
-                            sal_uInt8 pnSaltData[ 16 ],
-                            sal_uInt8 pnSaltHash[ 16 ] );
+                            sal_uInt8 pnSalt[ 16 ],
+                            sal_uInt8 pnVerifier[ 16 ],
+                            sal_uInt8 pnVerifierHash[ 16 ] );
 
 private:
     /** Copy constructor for cloning. */
                         BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder );
 
-    /** Initializes the wrapped codec object. After that, internal status can
-        be querried with isValid(). */
-    void                init( const ::rtl::OUString& rPass );
-
     /** Returns a clone of the decoder for usage in new streams. */
     virtual BiffDecoder_RCF* implClone();
 
+    /** Implements password verification and initialization of the decoder. */
+    virtual bool        implVerify( const ::rtl::OUString& rPassword );
+
     /** Implementation of decryption of a memory block. */
     virtual void        implDecode(
                             sal_uInt8* pnDestData,
@@ -184,10 +153,10 @@ private:
 
 private:
     ::oox::core::BinaryCodec_RCF maCodec;   /// Cipher algorithm implementation.
-    ::rtl::OUString     maPass;
-    ::std::vector< sal_uInt8 > maDocId;
-    ::std::vector< sal_uInt8 > maSaltData;
-    ::std::vector< sal_uInt8 > maSaltHash;
+    ::std::vector< sal_uInt16 > maPassword;
+    ::std::vector< sal_uInt8 > maSalt;
+    ::std::vector< sal_uInt8 > maVerifier;
+    ::std::vector< sal_uInt8 > maVerifierHash;
 };
 
 // ============================================================================
@@ -198,30 +167,16 @@ class BiffCodecHelper : public WorkbookHelper
 public:
     explicit            BiffCodecHelper( const WorkbookHelper& rHelper );
 
-    /** Returns the fixed password for workbook protection. */
-    static const ::rtl::OString& getBiff5WbProtPassword();
-    /** Returns the fixed password for workbook protection. */
-    static const ::rtl::OUString& getBiff8WbProtPassword();
+    /** Implementation helper, reads the FILEPASS and returns a decoder object. */
+    static BiffDecoderRef implReadFilePass( BiffInputStream& rStrm, BiffType eBiff );
 
-    /** Looks for a password provided via API, or queries it via GUI. */
-    ::rtl::OUString     queryPassword();
-
-    /** Imports the FILEPASS record and sets a decoder at the stream. */
+    /** Imports the FILEPASS record, asks for a password and sets a decoder at the stream. */
     bool                importFilePass( BiffInputStream& rStrm );
     /** Clones the contained decoder object if existing and sets it at the passed stream. */
     void                cloneDecoder( BiffInputStream& rStrm );
 
 private:
-    void                importFilePass_XOR( BiffInputStream& rStrm );
-    void                importFilePass_RCF( BiffInputStream& rStrm );
-    void                importFilePass_Strong( BiffInputStream& rStrm );
-    void                importFilePass2( BiffInputStream& rStrm );
-    void                importFilePass8( BiffInputStream& rStrm );
-
-private:
     BiffDecoderRef      mxDecoder;          /// The decoder for import filter.
-    ::rtl::OUString     maPassword;         /// Password for stream encoder/decoder.
-    bool                mbHasPassword;      /// True = password already querried.
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/xls/biffhelper.hxx b/oox/inc/oox/xls/biffhelper.hxx
index 8d9aac767..1da2c3621 100644
--- a/oox/inc/oox/xls/biffhelper.hxx
+++ b/oox/inc/oox/xls/biffhelper.hxx
@@ -120,6 +120,7 @@ const sal_Int32 OOBIN_ID_EXTROW             = 0x016E;
 const sal_Int32 OOBIN_ID_EXTSHEETDATA       = 0x016B;
 const sal_Int32 OOBIN_ID_EXTERNALNAMEFLAGS  = 0x024A;
 const sal_Int32 OOBIN_ID_EXTSHEETNAMES      = 0x0167;
+const sal_Int32 OOBIN_ID_FILESHARING        = 0x0224;
 const sal_Int32 OOBIN_ID_FILEVERSION        = 0x0080;
 const sal_Int32 OOBIN_ID_FILL               = 0x002D;
 const sal_Int32 OOBIN_ID_FILLS              = 0x025B;
@@ -369,6 +370,7 @@ const sal_uInt16 BIFF5_ID_EXTERNALNAME      = 0x0023;
 const sal_uInt16 BIFF_ID_EXTERNSHEET        = 0x0017;
 const sal_uInt16 BIFF_ID_EXTSST             = 0x00FF;
 const sal_uInt16 BIFF_ID_FILEPASS           = 0x002F;
+const sal_uInt16 BIFF_ID_FILESHARING        = 0x005B;
 const sal_uInt16 BIFF2_ID_FONT              = 0x0031;
 const sal_uInt16 BIFF3_ID_FONT              = 0x0231;
 const sal_uInt16 BIFF5_ID_FONT              = 0x0031;
@@ -388,6 +390,7 @@ const sal_uInt16 BIFF_ID_HYPERLINK          = 0x01B8;
 const sal_uInt16 BIFF3_ID_IMGDATA           = 0x007F;
 const sal_uInt16 BIFF8_ID_IMGDATA           = 0x00E9;
 const sal_uInt16 BIFF2_ID_INTEGER           = 0x0002;
+const sal_uInt16 BIFF_ID_INTERFACEHDR       = 0x00E1;
 const sal_uInt16 BIFF_ID_ITERATION          = 0x0011;
 const sal_uInt16 BIFF_ID_IXFE               = 0x0044;
 const sal_uInt16 BIFF2_ID_LABEL             = 0x0004;
diff --git a/oox/inc/oox/xls/viewsettings.hxx b/oox/inc/oox/xls/viewsettings.hxx
index fceb1bc1a..f1160a15b 100644
--- a/oox/inc/oox/xls/viewsettings.hxx
+++ b/oox/inc/oox/xls/viewsettings.hxx
@@ -83,6 +83,7 @@ struct SheetViewModel
     bool                mbShowZeros;                    /// True = show zero value zells.
     bool                mbShowOutline;                  /// True = show outlines.
     bool                mbZoomToFit;                    /// True = zoom chart sheet to fit window.
+    Color               maTabColor;                     /// Sheet tab color. (TODO: Move to sheet settings later.)
 
     explicit            SheetViewModel();
 
@@ -112,6 +113,8 @@ public:
 
     /** Imports the sheetView element containing sheet view settings. */
     void                importSheetView( const AttributeList& rAttribs );
+    /** Imports the tabcolor element containing tab color settings. */
+    void                importTabColor( const AttributeList& rAttribs );
     /** Imports the pane element containing sheet pane settings. */
     void                importPane( const AttributeList& rAttribs );
     /** Imports the selection element containing selection settings for a pane. */
diff --git a/oox/inc/oox/xls/workbooksettings.hxx b/oox/inc/oox/xls/workbooksettings.hxx
index 683747c03..81712bd5c 100644
--- a/oox/inc/oox/xls/workbooksettings.hxx
+++ b/oox/inc/oox/xls/workbooksettings.hxx
@@ -40,6 +40,18 @@ namespace xls {
 
 // ============================================================================
 
+/** Settings for workbook write protection. */
+struct FileSharingModel
+{
+    ::rtl::OUString     maUserName;             /// User who added the write protection password.
+    sal_uInt16          mnPasswordHash;         /// Hash value of the write protection password.
+    bool                mbRecommendReadOnly;    /// True = recommend read-only mode on opening.
+
+    explicit            FileSharingModel();
+};
+
+// ============================================================================
+
 /** Global workbook settings. */
 struct WorkbookSettingsModel
 {
@@ -84,11 +96,15 @@ class WorkbookSettings : public WorkbookHelper
 public:
     explicit            WorkbookSettings( const WorkbookHelper& rHelper );
 
+    /** Imports the fileSharing element containing write protection settings. */
+    void                importFileSharing( const AttributeList& rAttribs );
     /** Imports the workbookPr element containing global workbook settings. */
     void                importWorkbookPr( const AttributeList& rAttribs );
     /** Imports the calcPr element containing workbook calculation settings. */
     void                importCalcPr( const AttributeList& rAttribs );
 
+    /** Imports the FILESHARING record containing write protection settings. */
+    void                importFileSharing( RecordInputStream& rStrm );
     /** Imports the WORKBOOKPR record containing global workbook settings. */
     void                importWorkbookPr( RecordInputStream& rStrm );
     /** Imports the CALCPR record containing workbook calculation settings. */
@@ -96,6 +112,8 @@ public:
 
     /** Sets the save external linked values flag, e.g. from the WSBOOL record. */
     void                setSaveExtLinkValues( bool bSaveExtLinks );
+    /** Imports the FILESHARING record. */
+    void                importFileSharing( BiffInputStream& rStrm );
     /** Imports the BOOKBOOL record. */
     void                importBookBool( BiffInputStream& rStrm );
     /** Imports the CALCCOUNT record. */
@@ -136,6 +154,7 @@ private:
     void                setDateMode( bool bDateMode1904 );
 
 private:
+    FileSharingModel    maFileSharing;
     WorkbookSettingsModel maBookSettings;
     CalcSettingsModel   maCalcSettings;
 };
diff --git a/oox/prj/build.lst b/oox/prj/build.lst
index 34477aaff..d0e446f22 100644
--- a/oox/prj/build.lst
+++ b/oox/prj/build.lst
@@ -1,4 +1,4 @@
-oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl unotools BOOST:boost NULL
+oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl unotools BOOST:boost OPENSSL:openssl NULL
 oox	oox				usr1	-   all	oox_mkout NULL
 oox	oox\prj				get	-   all	oox_prj NULL
 oox	oox\source\token		nmake	-   all	oox_token NULL
diff --git a/oox/prj/d.lst b/oox/prj/d.lst
index df4430bcd..50ec05955 100644
--- a/oox/prj/d.lst
+++ b/oox/prj/d.lst
@@ -1,10 +1,10 @@
 mkdir: %_DEST%\inc%_EXT%\oox
-mkdir: %_DEST%\inc%_EXT%\oox\core
 mkdir: %_DEST%\inc%_EXT%\oox\helper
-mkdir: %_DEST%\inc%_EXT%\oox\vml
+mkdir: %_DEST%\inc%_EXT%\oox\core
 mkdir: %_DEST%\inc%_EXT%\oox\drawingml
 mkdir: %_DEST%\inc%_EXT%\oox\drawingml\chart
 mkdir: %_DEST%\inc%_EXT%\oox\drawingml\table
+mkdir: %_DEST%\inc%_EXT%\oox\vml
 
 ..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
 ..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib
@@ -13,23 +13,24 @@ mkdir: %_DEST%\inc%_EXT%\oox\drawingml\table
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
 ..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%\i*.lib
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
 
-..\inc\oox\dllapi.h %_DEST%\inc%_EXT%\oox\dllapi.h
-..\source\token\tokens.txt %_DEST%\inc%_EXT%\oox\token.txt
-..\inc\oox\core\filterbase.hxx %_DEST%\inc%_EXT%\oox\core\filterbase.hxx
-..\inc\oox\core\relations.hxx %_DEST%\inc%_EXT%\oox\core\relations.hxx
 ..\%__SRC%\inc\tokens.hxx %_DEST%\inc%_EXT%\oox\core\tokens.hxx
-..\inc\oox\core\xmlfilterbase.hxx %_DEST%\inc%_EXT%\oox\core\xmlfilterbase.hxx
+
+..\source\token\tokens.txt %_DEST%\inc%_EXT%\oox\token.txt
+..\inc\oox\dllapi.h %_DEST%\inc%_EXT%\oox\dllapi.h
 ..\inc\oox\helper\binarystreambase.hxx %_DEST%\inc%_EXT%\oox\helper\binarystreambase.hxx
 ..\inc\oox\helper\helper.hxx %_DEST%\inc%_EXT%\oox\helper\helper.hxx
 ..\inc\oox\helper\storagebase.hxx %_DEST%\inc%_EXT%\oox\helper\storagebase.hxx
 ..\inc\oox\helper\zipstorage.hxx %_DEST%\inc%_EXT%\oox\helper\zipstorage.hxx
-..\inc\oox\vml\drawing.hxx %_DEST%\inc%_EXT%\oox\vml\drawing.hxx
+..\inc\oox\core\filterbase.hxx %_DEST%\inc%_EXT%\oox\core\filterbase.hxx
+..\inc\oox\core\filterdetect.hxx %_DEST%\inc%_EXT%\oox\core\filterdetect.hxx
+..\inc\oox\core\relations.hxx %_DEST%\inc%_EXT%\oox\core\relations.hxx
+..\inc\oox\core\xmlfilterbase.hxx %_DEST%\inc%_EXT%\oox\core\xmlfilterbase.hxx
 ..\inc\oox\drawingml\chart\chartconverter.hxx %_DEST%\inc%_EXT%\oox\drawingml\chart\chartconverter.hxx
 ..\inc\oox\drawingml\table\tablestylelist.hxx %_DEST%\inc%_EXT%\oox\drawingml\table\tablestylelist.hxx
-..\inc\oox\vml\shape.hxx %_DEST%\inc%_EXT%\oox\vml\shape.hxx
-
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\inc\oox\vml\vmldrawing.hxx %_DEST%\inc%_EXT%\oox\vml\vmldrawing.hxx
+..\inc\oox\vml\vmlshape.hxx %_DEST%\inc%_EXT%\oox\vml\vmlshape.hxx
 
 dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
 
diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx
index 6e465fb39..b6a7e9298 100644
--- a/oox/source/core/binarycodec.cxx
+++ b/oox/source/core/binarycodec.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #include "oox/core/binarycodec.hxx"
 #include <algorithm>
 #include <string.h>
-#include <osl/diagnose.h>
+#include "oox/helper/attributelist.hxx"
 
 namespace oox {
 namespace core {
@@ -113,6 +113,15 @@ sal_uInt16 lclGetHash( const sal_uInt8* pnPassData, sal_Int32 nBufferSize )
 
 // ============================================================================
 
+/*static*/ sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, sal_Int32 nElement )
+{
+    sal_Int32 nPasswordHash = rAttribs.getIntegerHex( nElement, 0 );
+    OSL_ENSURE( (0 <= nPasswordHash) && (nPasswordHash <= SAL_MAX_UINT16), "CodecHelper::getPasswordHash - invalid password hash" );
+    return static_cast< sal_uInt16 >( ((0 <= nPasswordHash) && (nPasswordHash <= SAL_MAX_UINT16)) ? nPasswordHash : 0 );
+}
+
+// ============================================================================
+
 BinaryCodec_XOR::BinaryCodec_XOR( CodecType eCodecType ) :
     meCodecType( eCodecType ),
     mnOffset( 0 ),
@@ -249,7 +258,7 @@ BinaryCodec_RCF::~BinaryCodec_RCF()
     rtl_cipher_destroy( mhCipher );
 }
 
-void BinaryCodec_RCF::initKey( const sal_uInt16 pnPassData[ 16 ], const sal_uInt8 pnUnique[ 16 ] )
+void BinaryCodec_RCF::initKey( const sal_uInt16 pnPassData[ 16 ], const sal_uInt8 pnSalt[ 16 ] )
 {
     // create little-endian key data array from password data
     sal_uInt8 pnKeyData[ 64 ];
@@ -271,11 +280,11 @@ void BinaryCodec_RCF::initKey( const sal_uInt16 pnPassData[ 16 ], const sal_uInt
     (void)rtl_digest_updateMD5( mhDigest, pnKeyData, sizeof( pnKeyData ) );
     (void)rtl_digest_rawMD5( mhDigest, pnKeyData, RTL_DIGEST_LENGTH_MD5 );
 
-    // update digest with key data and passed unique data
+    // update digest with key data and passed salt data
     for( size_t nIndex = 0; nIndex < 16; ++nIndex )
     {
         rtl_digest_updateMD5( mhDigest, pnKeyData, 5 );
-        rtl_digest_updateMD5( mhDigest, pnUnique, 16 );
+        rtl_digest_updateMD5( mhDigest, pnSalt, 16 );
     }
 
     // update digest with padding
@@ -292,7 +301,7 @@ void BinaryCodec_RCF::initKey( const sal_uInt16 pnPassData[ 16 ], const sal_uInt
     (void)memset( pnKeyData, 0, sizeof( pnKeyData ) );
 }
 
-bool BinaryCodec_RCF::verifyKey( const sal_uInt8 pnSaltData[ 16 ], const sal_uInt8 pnSaltDigest[ 16 ] )
+bool BinaryCodec_RCF::verifyKey( const sal_uInt8 pnVerifier[ 16 ], const sal_uInt8 pnVerifierHash[ 16 ] )
 {
     if( !startBlock( 0 ) )
         return false;
@@ -301,7 +310,7 @@ bool BinaryCodec_RCF::verifyKey( const sal_uInt8 pnSaltData[ 16 ], const sal_uIn
     sal_uInt8 pnBuffer[ 64 ];
 
     // decode salt data into buffer
-    rtl_cipher_decode( mhCipher, pnSaltData, 16, pnBuffer, sizeof( pnBuffer ) );
+    rtl_cipher_decode( mhCipher, pnVerifier, 16, pnBuffer, sizeof( pnBuffer ) );
 
     pnBuffer[ 16 ] = 0x80;
     (void)memset( pnBuffer + 17, 0, sizeof( pnBuffer ) - 17 );
@@ -312,7 +321,7 @@ bool BinaryCodec_RCF::verifyKey( const sal_uInt8 pnSaltData[ 16 ], const sal_uIn
     rtl_digest_rawMD5( mhDigest, pnDigest, sizeof( pnDigest ) );
 
     // decode original salt digest into buffer
-    rtl_cipher_decode( mhCipher, pnSaltDigest, 16, pnBuffer, sizeof( pnBuffer ) );
+    rtl_cipher_decode( mhCipher, pnVerifierHash, 16, pnBuffer, sizeof( pnBuffer ) );
 
     // compare buffer with computed digest
     bool bResult = memcmp( pnBuffer, pnDigest, sizeof( pnDigest ) ) == 0;
diff --git a/oox/source/core/binaryfilterbase.cxx b/oox/source/core/binaryfilterbase.cxx
index 86e89318d..c883284de 100644
--- a/oox/source/core/binaryfilterbase.cxx
+++ b/oox/source/core/binaryfilterbase.cxx
@@ -51,15 +51,16 @@ BinaryFilterBase::~BinaryFilterBase()
 {
 }
 
-StorageRef BinaryFilterBase::implCreateStorage(
-        Reference< XInputStream >& rxInStream, Reference< XStream >& rxOutStream ) const
+// private --------------------------------------------------------------------
+
+StorageRef BinaryFilterBase::implCreateStorage( const Reference< XInputStream >& rxInStream ) const
+{
+    return StorageRef( new OleStorage( getGlobalFactory(), rxInStream, true ) );
+}
+
+StorageRef BinaryFilterBase::implCreateStorage( const Reference< XStream >& rxOutStream ) const
 {
-    StorageRef xStorage;
-    if( rxInStream.is() )
-        xStorage.reset( new OleStorage( getGlobalFactory(), rxInStream, true ) );
-    else if( rxOutStream.is() )
-        xStorage.reset( new OleStorage( getGlobalFactory(), rxOutStream, true ) );
-    return xStorage;
+    return StorageRef( new OleStorage( getGlobalFactory(), rxOutStream, true ) );
 }
 
 // ============================================================================
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 23363db46..55793859f 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -38,6 +38,7 @@
 #include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/uri.hxx>
+#include <comphelper/docpasswordhelper.hxx>
 #include <comphelper/mediadescriptor.hxx>
 #include "tokens.hxx"
 #include "oox/helper/binaryinputstream.hxx"
@@ -58,7 +59,6 @@ using ::com::sun::star::uno::UNO_SET_THROW;
 using ::com::sun::star::lang::IllegalArgumentException;
 using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::lang::XComponent;
-using ::com::sun::star::beans::NamedValue;
 using ::com::sun::star::beans::PropertyValue;
 using ::com::sun::star::awt::DeviceInfo;
 using ::com::sun::star::awt::XDevice;
@@ -72,6 +72,7 @@ using ::com::sun::star::task::XStatusIndicator;
 using ::com::sun::star::task::XInteractionHandler;
 using ::com::sun::star::graphic::XGraphic;
 using ::comphelper::MediaDescriptor;
+using ::comphelper::SequenceAsHashMap;
 using ::oox::ole::OleObjectHelper;
 
 namespace oox {
@@ -125,6 +126,16 @@ DocumentOpenedGuard::~DocumentOpenedGuard()
 
 // ============================================================================
 
+/** Specifies whether this filter is an import or export filter. */
+enum FilterDirection
+{
+    FILTERDIRECTION_UNKNOWN,
+    FILTERDIRECTION_IMPORT,
+    FILTERDIRECTION_EXPORT
+};
+
+// ----------------------------------------------------------------------------
+
 struct FilterBaseImpl
 {
     typedef ::boost::shared_ptr< GraphicHelper >            GraphicHelperRef;
@@ -132,9 +143,10 @@ struct FilterBaseImpl
     typedef ::boost::shared_ptr< OleObjectHelper >          OleObjHelperRef;
     typedef ::std::map< OUString, Reference< XGraphic > >   EmbeddedGraphicMap;
     typedef ::std::map< sal_Int32, sal_Int32 >              SystemPalette;
-    typedef ::std::map< OUString, Any >                     ArgumentMap;
 
-    MediaDescriptor     maDescriptor;
+    FilterDirection     meDirection;
+    SequenceAsHashMap   maArguments;
+    MediaDescriptor     maMediaDesc;
     DeviceInfo          maDeviceInfo;
     OUString            maFileUrl;
     StorageRef          mxStorage;
@@ -145,7 +157,6 @@ struct FilterBaseImpl
     EmbeddedGraphicMap  maEmbeddedGraphics;     /// Maps all imported embedded graphics by their path.
     SystemPalette       maSystemPalette;        /// Maps system colors (XML tokens) to RGB color values.
 
-    ArgumentMap                         maArguments;
     Reference< XMultiServiceFactory >   mxGlobalFactory;
     Reference< XModel >                 mxModel;
     Reference< XMultiServiceFactory >   mxModelFactory;
@@ -157,14 +168,16 @@ struct FilterBaseImpl
     explicit            FilterBaseImpl( const Reference< XMultiServiceFactory >& rxGlobalFactory );
 
     void                setDocumentModel( const Reference< XComponent >& rxComponent );
-    void                setMediaDescriptor( const Sequence< PropertyValue >& rDescriptor );
-
     bool                hasDocumentModel() const;
+
+    void                initializeFilter();
+    void                finalizeFilter();
 };
 
 // ----------------------------------------------------------------------------
 
 FilterBaseImpl::FilterBaseImpl( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
+    meDirection( FILTERDIRECTION_UNKNOWN ),
     mxGlobalFactory( rxGlobalFactory )
 {
     OSL_ENSURE( mxGlobalFactory.is(), "FilterBaseImpl::FilterBaseImpl - missing service factory" );
@@ -223,23 +236,39 @@ void FilterBaseImpl::setDocumentModel( const Reference< XComponent >& rxComponen
     mxModelFactory.set( rxComponent, UNO_QUERY );
 }
 
-void FilterBaseImpl::setMediaDescriptor( const Sequence< PropertyValue >& rDescriptor )
+bool FilterBaseImpl::hasDocumentModel() const
 {
-    maDescriptor = rDescriptor;
-
-    maFileUrl = maDescriptor.getUnpackedValueOrDefault( MediaDescriptor::PROP_URL(), maFileUrl );
-    mxInStream = maDescriptor.getUnpackedValueOrDefault( MediaDescriptor::PROP_INPUTSTREAM(), mxInStream );
-    mxOutStream = maDescriptor.getUnpackedValueOrDefault( MediaDescriptor::PROP_STREAMFOROUTPUT(), mxOutStream );
-    mxStatusIndicator = maDescriptor.getUnpackedValueOrDefault( MediaDescriptor::PROP_STATUSINDICATOR(), mxStatusIndicator );
-    mxInteractionHandler = maDescriptor.getUnpackedValueOrDefault( MediaDescriptor::PROP_INTERACTIONHANDLER(), mxInteractionHandler );
+    return mxGlobalFactory.is() && mxModel.is() && mxModelFactory.is();
+}
 
-    if( mxInStream.is() )
-        maDescriptor.addInputStream();
+void FilterBaseImpl::initializeFilter()
+{
+    try
+    {
+        // lock the model controllers
+        mxModel->lockControllers();
+    }
+    catch( Exception& )
+    {
+    }
 }
 
-bool FilterBaseImpl::hasDocumentModel() const
+void FilterBaseImpl::finalizeFilter()
 {
-    return mxGlobalFactory.is() && mxModel.is() && mxModelFactory.is();
+    try
+    {
+        // clear the 'ComponentData' property in the descriptor
+        MediaDescriptor::iterator aIt = maMediaDesc.find( MediaDescriptor::PROP_COMPONENTDATA() );
+        if( aIt != maMediaDesc.end() )
+            aIt->second.clear();
+        // write the descriptor back to the document model (adds the password)
+        mxModel->attachResource( maFileUrl, maMediaDesc.getAsConstPropertyValueList() );
+        // unlock the model controllers
+        mxModel->unlockControllers();
+    }
+    catch( Exception& )
+    {
+    }
 }
 
 // ============================================================================
@@ -255,19 +284,19 @@ FilterBase::~FilterBase()
 
 bool FilterBase::isImportFilter() const
 {
-    return mxImpl->mxInStream.is();
+    return mxImpl->meDirection == FILTERDIRECTION_IMPORT;
 }
 
 bool FilterBase::isExportFilter() const
 {
-    return mxImpl->mxOutStream.is();
+    return mxImpl->meDirection == FILTERDIRECTION_EXPORT;
 }
 
 // ----------------------------------------------------------------------------
 
 Any FilterBase::getArgument( const OUString& rArgName ) const
 {
-    FilterBaseImpl::ArgumentMap::const_iterator aIt = mxImpl->maArguments.find( rArgName );
+    SequenceAsHashMap::const_iterator aIt = mxImpl->maArguments.find( rArgName );
     return (aIt == mxImpl->maArguments.end()) ? Any() : aIt->second;
 }
 
@@ -276,6 +305,11 @@ const Reference< XMultiServiceFactory >& FilterBase::getGlobalFactory() const
     return mxImpl->mxGlobalFactory;
 }
 
+MediaDescriptor& FilterBase::getMediaDescriptor() const
+{
+    return mxImpl->maMediaDesc;
+}
+
 const Reference< XModel >& FilterBase::getModel() const
 {
     return mxImpl->mxModel;
@@ -440,6 +474,14 @@ sal_Int32 FilterBase::getSystemColor( sal_Int32 nToken, sal_Int32 nDefaultRgb )
     return (aIt == mxImpl->maSystemPalette.end()) ? ((nDefaultRgb < 0) ? API_RGB_WHITE : nDefaultRgb) : aIt->second;
 }
 
+OUString FilterBase::requestPassword( ::comphelper::IDocPasswordVerifier& rVerifier ) const
+{
+    ::std::vector< OUString > aDefaultPasswords;
+    aDefaultPasswords.push_back( CREATE_OUSTRING( "VelvetSweatshop" ) );
+    return ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
+        rVerifier, mxImpl->maMediaDesc, ::comphelper::DocPasswordRequestType_MS, &aDefaultPasswords );
+}
+
 bool FilterBase::importBinaryData( StreamDataSequence& orDataSeq, const OUString& rStreamName )
 {
     OSL_ENSURE( rStreamName.getLength() > 0, "FilterBase::importBinaryData - empty stream name" );
@@ -508,17 +550,12 @@ Sequence< OUString > SAL_CALL FilterBase::getSupportedServiceNames() throw( Runt
 
 void SAL_CALL FilterBase::initialize( const Sequence< Any >& rArgs ) throw( Exception, RuntimeException )
 {
-    if( rArgs.getLength() >= 2 )
+    if( rArgs.getLength() >= 2 ) try
+    {
+        mxImpl->maArguments << rArgs[ 1 ];
+    }
+    catch( Exception& )
     {
-        Sequence< NamedValue > aArgSeq;
-        if( (rArgs[ 1 ] >>= aArgSeq) && aArgSeq.hasElements() )
-        {
-            const NamedValue* pArg = aArgSeq.getConstArray();
-            const NamedValue* pEnd = pArg + aArgSeq.getLength();
-            for( ; pArg < pEnd; ++pArg )
-                if( pArg->Name.getLength() > 0 )
-                    mxImpl->maArguments[ pArg->Name ] = pArg->Value;
-        }
     }
 }
 
@@ -529,6 +566,7 @@ void SAL_CALL FilterBase::setTargetDocument( const Reference< XComponent >& rxDo
     mxImpl->setDocumentModel( rxDocument );
     if( !mxImpl->hasDocumentModel() )
         throw IllegalArgumentException();
+    mxImpl->meDirection = FILTERDIRECTION_IMPORT;
 }
 
 // com.sun.star.document.XExporter interface ----------------------------------
@@ -538,29 +576,41 @@ void SAL_CALL FilterBase::setSourceDocument( const Reference< XComponent >& rxDo
     mxImpl->setDocumentModel( rxDocument );
     if( !mxImpl->hasDocumentModel() )
         throw IllegalArgumentException();
+    mxImpl->meDirection = FILTERDIRECTION_EXPORT;
 }
 
 // com.sun.star.document.XFilter interface ------------------------------------
 
-sal_Bool SAL_CALL FilterBase::filter( const Sequence< PropertyValue >& rDescriptor ) throw( RuntimeException )
+sal_Bool SAL_CALL FilterBase::filter( const Sequence< PropertyValue >& rMediaDescSeq ) throw( RuntimeException )
 {
     sal_Bool bRet = sal_False;
-    if( mxImpl->hasDocumentModel() )
+    if( mxImpl->hasDocumentModel() && (mxImpl->meDirection != FILTERDIRECTION_UNKNOWN) )
     {
-        mxImpl->setMediaDescriptor( rDescriptor );
+        setMediaDescriptor( rMediaDescSeq );
         DocumentOpenedGuard aOpenedGuard( mxImpl->maFileUrl );
         if( aOpenedGuard.isValid() )
         {
-            mxImpl->mxStorage = implCreateStorage( mxImpl->mxInStream, mxImpl->mxOutStream );
-            if( mxImpl->mxStorage.get() )
+            mxImpl->initializeFilter();
+            switch( mxImpl->meDirection )
             {
-                mxImpl->mxModel->lockControllers();
-                if( mxImpl->mxInStream.is() )
-                    bRet = importDocument();
-                else if( mxImpl->mxOutStream.is() )
-                    bRet = exportDocument();
-                mxImpl->mxModel->unlockControllers();
+                case FILTERDIRECTION_UNKNOWN:
+                break;
+                case FILTERDIRECTION_IMPORT:
+                    if( mxImpl->mxInStream.is() )
+                    {
+                        mxImpl->mxStorage = implCreateStorage( mxImpl->mxInStream );
+                        bRet = mxImpl->mxStorage.get() && importDocument();
+                    }
+                break;
+                case FILTERDIRECTION_EXPORT:
+                    if( mxImpl->mxOutStream.is() )
+                    {
+                        mxImpl->mxStorage = implCreateStorage( mxImpl->mxOutStream );
+                        bRet = mxImpl->mxStorage.get() && exportDocument();
+                    }
+                break;
             }
+            mxImpl->finalizeFilter();
         }
     }
     return bRet;
@@ -570,6 +620,46 @@ void SAL_CALL FilterBase::cancel() throw( RuntimeException )
 {
 }
 
+// protected ------------------------------------------------------------------
+
+Reference< XInputStream > FilterBase::implGetInputStream( MediaDescriptor& rMediaDesc ) const
+{
+    return rMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_INPUTSTREAM(), Reference< XInputStream >() );
+}
+
+Reference< XStream > FilterBase::implGetOutputStream( MediaDescriptor& rMediaDesc ) const
+{
+    return rMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_STREAMFOROUTPUT(), Reference< XStream >() );
+}
+
+// private --------------------------------------------------------------------
+
+void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDescSeq )
+{
+    mxImpl->maMediaDesc = rMediaDescSeq;
+
+    switch( mxImpl->meDirection )
+    {
+        case FILTERDIRECTION_UNKNOWN:
+            OSL_ENSURE( false, "FilterBase::setMediaDescriptor - invalid filter direction" );
+        break;
+        case FILTERDIRECTION_IMPORT:
+            mxImpl->maMediaDesc.addInputStream();
+            mxImpl->mxInStream = implGetInputStream( mxImpl->maMediaDesc );
+            OSL_ENSURE( mxImpl->mxInStream.is(), "FilterBase::setMediaDescriptor - missing input stream" );
+        break;
+        case FILTERDIRECTION_EXPORT:
+            mxImpl->mxOutStream = implGetOutputStream( mxImpl->maMediaDesc );
+            OSL_ENSURE( mxImpl->mxOutStream.is(), "FilterBase::setMediaDescriptor - missing output stream" );
+        break;
+    }
+
+    mxImpl->maFileUrl = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_URL(), OUString() );
+    mxImpl->mxStatusIndicator = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >() );
+    mxImpl->mxInteractionHandler = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_INTERACTIONHANDLER(), Reference< XInteractionHandler >() );
+}
+
+
 // ============================================================================
 
 } // namespace core
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index af3081801..477faa8b4 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -28,89 +28,52 @@
  *
  ************************************************************************/
 
-#include <com/sun/star/document/XExtendedFilterDetection.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
-
-#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
+#include "oox/core/filterdetect.hxx"
+#include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
-
+#include <rtl/digest.h>
+#include <openssl/evp.h>
+#include <comphelper/docpasswordhelper.hxx>
 #include <comphelper/mediadescriptor.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-
 #include "oox/helper/attributelist.hxx"
+#include "oox/helper/binaryinputstream.hxx"
+#include "oox/helper/binaryoutputstream.hxx"
+#include "oox/helper/olestorage.hxx"
 #include "oox/helper/zipstorage.hxx"
 #include "oox/core/fasttokenhandler.hxx"
 #include "oox/core/namespaces.hxx"
-#include "tokens.hxx"
-
-#include <vector>
 
 using ::rtl::OUString;
-using ::rtl::OString;
+using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::RuntimeException;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::UNO_QUERY;
+using ::com::sun::star::uno::UNO_QUERY_THROW;
+using ::com::sun::star::uno::UNO_SET_THROW;
+using ::com::sun::star::uno::XInterface;
+using ::com::sun::star::lang::XMultiServiceFactory;
+using ::com::sun::star::beans::NamedValue;
+using ::com::sun::star::beans::PropertyValue;
+using ::com::sun::star::io::XInputStream;
+using ::com::sun::star::io::XOutputStream;
+using ::com::sun::star::io::XStream;
+using ::com::sun::star::xml::sax::InputSource;
+using ::com::sun::star::xml::sax::SAXException;
+using ::com::sun::star::xml::sax::XFastAttributeList;
+using ::com::sun::star::xml::sax::XFastContextHandler;
+using ::com::sun::star::xml::sax::XFastParser;
+using ::com::sun::star::xml::sax::XLocator;
 using ::comphelper::MediaDescriptor;
-using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::embed;
-using namespace ::com::sun::star::xml::sax;
+using ::comphelper::SequenceAsHashMap;
 
 namespace oox {
 namespace core {
 
 // ============================================================================
 
-/** Document handler specifically designed for detecting OOXML file formats.
-
-    It takes a reference to the filter string object via its constructor, and
-    puts the name of the detected filter to it if it successfully finds one.
- */
-class FilterDetectDocHandler : public ::cppu::WeakImplHelper1< XFastDocumentHandler >
-{
-public:
-    explicit            FilterDetectDocHandler( OUString& rFilter );
-    virtual             ~FilterDetectDocHandler();
-
-    // XFastDocumentHandler
-    virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException);
-    virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException);
-    virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) throw (SAXException, RuntimeException);
-
-    // XFastContextHandler
-    virtual void SAL_CALL startFastElement( sal_Int32 nElement, const Reference< XFastAttributeList >& Attribs ) throw (SAXException, RuntimeException);
-    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const Reference< XFastAttributeList >& Attribs ) throw (SAXException, RuntimeException);
-    virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (SAXException, RuntimeException);
-    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (SAXException, RuntimeException);
-    virtual Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const Reference< XFastAttributeList >& Attribs ) throw (SAXException, RuntimeException);
-    virtual Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const Reference< XFastAttributeList >& Attribs ) throw (SAXException, RuntimeException);
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (SAXException, RuntimeException);
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException);
-    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (SAXException, RuntimeException);
-
-private:
-    void                parseRelationship( const AttributeList& rAttribs );
-
-    OUString            getFilterNameFromContentType( const OUString& rContentType ) const;
-    void                parseContentTypesDefault( const AttributeList& rAttribs );
-    void                parseContentTypesOverride( const AttributeList& rAttribs );
-
-private:
-    typedef ::std::vector< sal_Int32 > ContextVector;
-
-    OUString&           mrFilter;
-    ContextVector       maContextStack;
-    OUString            maTargetPath;
-};
-
-// ============================================================================
-
-FilterDetectDocHandler::FilterDetectDocHandler( OUString& rFilter ) :
-    mrFilter( rFilter )
+FilterDetectDocHandler::FilterDetectDocHandler( OUString& rFilterName ) :
+    mrFilterName( rFilterName )
 {
     maContextStack.reserve( 2 );
 }
@@ -134,8 +97,6 @@ void SAL_CALL FilterDetectDocHandler::setDocumentLocator( const Reference<XLocat
 {
 }
 
-// ===========================================================================
-
 void SAL_CALL FilterDetectDocHandler::startFastElement(
         sal_Int32 nElement, const Reference< XFastAttributeList >& rAttribs )
     throw (SAXException,RuntimeException)
@@ -213,8 +174,6 @@ void SAL_CALL FilterDetectDocHandler::processingInstruction(
 {
 }
 
-// ============================================================================
-
 void FilterDetectDocHandler::parseRelationship( const AttributeList& rAttribs )
 {
     OUString aType = rAttribs.getString( XML_Type, OUString() );
@@ -224,6 +183,14 @@ void FilterDetectDocHandler::parseRelationship( const AttributeList& rAttribs )
 
 OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& rContentType ) const
 {
+    if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" ) ||
+        rContentType.equalsAscii( "application/vnd.ms-word.document.macroEnabled.main+xml" ) )
+        return CREATE_OUSTRING( "writer_MS_Word_2007" );
+
+    if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml" ) ||
+        rContentType.equalsAscii( "application/vnd.ms-word.template.macroEnabledTemplate.main+xml" ) )
+        return CREATE_OUSTRING( "writer_MS_Word_2007_Template" );
+
     if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml" ) ||
         rContentType.equalsAscii( "application/vnd.ms-excel.sheet.macroEnabled.main+xml" ) )
         return CREATE_OUSTRING( "MS Excel 2007 XML" );
@@ -253,44 +220,24 @@ OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& r
 void FilterDetectDocHandler::parseContentTypesDefault( const AttributeList& rAttribs )
 {
     // only if no overridden part name found
-    if( mrFilter.getLength() == 0 )
+    if( mrFilterName.getLength() == 0 )
     {
         // check if target path ends with extension
         OUString aExtension = rAttribs.getString( XML_Extension, OUString() );
         sal_Int32 nExtPos = maTargetPath.getLength() - aExtension.getLength();
         if( (nExtPos > 0) && (maTargetPath[ nExtPos - 1 ] == '.') && maTargetPath.match( aExtension, nExtPos ) )
-            mrFilter = getFilterNameFromContentType( rAttribs.getString( XML_ContentType, OUString() ) );
+            mrFilterName = getFilterNameFromContentType( rAttribs.getString( XML_ContentType, OUString() ) );
     }
 }
 
 void FilterDetectDocHandler::parseContentTypesOverride( const AttributeList& rAttribs )
 {
     if( rAttribs.getString( XML_PartName, OUString() ).equals( maTargetPath ) )
-        mrFilter = getFilterNameFromContentType( rAttribs.getString( XML_ContentType, OUString() ) );
+        mrFilterName = getFilterNameFromContentType( rAttribs.getString( XML_ContentType, OUString() ) );
 }
 
 // ============================================================================
 
-class FilterDetect : public ::cppu::WeakImplHelper2< XExtendedFilterDetection, XServiceInfo >
-{
-public:
-    explicit            FilterDetect( const Reference< XMultiServiceFactory >& xFactory );
-    virtual             ~FilterDetect();
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( RuntimeException );
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException );
-
-    // XExtendedFilterDetect
-    virtual OUString SAL_CALL detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException );
-
-private:
-    Reference< XMultiServiceFactory > mxFactory;
-};
-
-// ----------------------------------------------------------------------------
-
 /* Helper for XServiceInfo */
 Sequence< OUString > FilterDetect_getSupportedServiceNames()
 {
@@ -311,8 +258,10 @@ Reference< XInterface > SAL_CALL FilterDetect_createInstance( const Reference< X
     return Reference< XInterface >( *new FilterDetect( xServiceManager ) );
 }
 
-FilterDetect::FilterDetect( const Reference< XMultiServiceFactory >& xFactory ) :
-    mxFactory( xFactory )
+// ----------------------------------------------------------------------------
+
+FilterDetect::FilterDetect( const Reference< XMultiServiceFactory >& rxFactory ) :
+    mxFactory( rxFactory )
 {
     OSL_ENSURE( mxFactory.is(), "FilterDetect::FilterDetect - no service factory" );
 }
@@ -321,45 +270,319 @@ FilterDetect::~FilterDetect()
 {
 }
 
-// com.sun.star.document.XExtendedFilterDetect interface ----------------------
+/* =========================================================================== */
+/*  Kudos to Caolan McNamara who provided the core decryption implementations. */
+/* =========================================================================== */
+
+namespace {
+
+const sal_uInt32 ENCRYPTINFO_CRYPTOAPI      = 0x00000004;
+const sal_uInt32 ENCRYPTINFO_DOCPROPS       = 0x00000008;
+const sal_uInt32 ENCRYPTINFO_EXTERNAL       = 0x00000010;
+const sal_uInt32 ENCRYPTINFO_AES            = 0x00000020;
+
+const sal_uInt32 ENCRYPT_ALGO_AES128        = 0x0000660E;
+const sal_uInt32 ENCRYPT_ALGO_AES192        = 0x0000660F;
+const sal_uInt32 ENCRYPT_ALGO_AES256        = 0x00006610;
+const sal_uInt32 ENCRYPT_ALGO_RC4           = 0x00006801;
+
+const sal_uInt32 ENCRYPT_HASH_SHA1          = 0x00008004;
+
+// ----------------------------------------------------------------------------
+
+bool lclIsZipPackage( const Reference< XMultiServiceFactory >& rxFactory, const Reference< XInputStream >& rxInStrm )
+{
+    ZipStorage aZipStorage( rxFactory, rxInStrm );
+    return aZipStorage.isStorage();
+}
+
+// ----------------------------------------------------------------------------
+
+struct PackageEncryptionInfo
+{
+    sal_uInt8           mpnSalt[ 16 ];
+    sal_uInt8           mpnEncrVerifier[ 16 ];
+    sal_uInt8           mpnEncrVerifierHash[ 32 ];
+    sal_uInt32          mnFlags;
+    sal_uInt32          mnAlgorithmId;
+    sal_uInt32          mnAlgorithmIdHash;
+    sal_uInt32          mnKeySize;
+    sal_uInt32          mnSaltSize;
+    sal_uInt32          mnVerifierHashSize;
+};
+
+bool lclReadEncryptionInfo( PackageEncryptionInfo& rEncrInfo, BinaryInputStream& rStrm )
+{
+    rStrm.skip( 4 );
+    rStrm >> rEncrInfo.mnFlags;
+    if( getFlag( rEncrInfo.mnFlags, ENCRYPTINFO_EXTERNAL ) )
+        return false;
+
+    sal_uInt32 nHeaderSize, nRepeatedFlags;
+    rStrm >> nHeaderSize >> nRepeatedFlags;
+    if( (nHeaderSize < 20) || (nRepeatedFlags != rEncrInfo.mnFlags) )
+        return false;
+
+    rStrm.skip( 4 );
+    rStrm >> rEncrInfo.mnAlgorithmId >> rEncrInfo.mnAlgorithmIdHash >> rEncrInfo.mnKeySize;
+    rStrm.skip( nHeaderSize - 20 );
+    rStrm >> rEncrInfo.mnSaltSize;
+    if( rEncrInfo.mnSaltSize != 16 )
+        return false;
+
+    rStrm.readMemory( rEncrInfo.mpnSalt, 16 );
+    rStrm.readMemory( rEncrInfo.mpnEncrVerifier, 16 );
+    rStrm >> rEncrInfo.mnVerifierHashSize;
+    rStrm.readMemory( rEncrInfo.mpnEncrVerifierHash, 32 );
+    return !rStrm.isEof();
+}
+
+// ----------------------------------------------------------------------------
+
+void lclDeriveKey( const sal_uInt8* pnHash, sal_uInt32 nHashLen, sal_uInt8* pnKeyDerived, sal_uInt32 nRequiredKeyLen )
+{
+    sal_uInt8 pnBuffer[ 64 ];
+    memset( pnBuffer, 0x36, sizeof( pnBuffer ) );
+    for( sal_uInt32 i = 0; i < nHashLen; ++i )
+        pnBuffer[ i ] ^= pnHash[ i ];
+
+    rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
+    rtlDigestError aError = rtl_digest_update( aDigest, pnBuffer, sizeof( pnBuffer ) );
+    sal_uInt8 pnX1[ RTL_DIGEST_LENGTH_SHA1 ];
+    aError = rtl_digest_get( aDigest, pnX1, RTL_DIGEST_LENGTH_SHA1 );
+    rtl_digest_destroy( aDigest );
+
+    memset( pnBuffer, 0x5C, sizeof( pnBuffer ) );
+    for( sal_uInt32 i = 0; i < nHashLen; ++i )
+        pnBuffer[ i ] ^= pnHash[ i ];
+
+    aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
+    aError = rtl_digest_update( aDigest, pnBuffer, sizeof( pnBuffer ) );
+    sal_uInt8 pnX2[ RTL_DIGEST_LENGTH_SHA1 ];
+    aError = rtl_digest_get( aDigest, pnX2, RTL_DIGEST_LENGTH_SHA1 );
+    rtl_digest_destroy( aDigest );
+
+    if( nRequiredKeyLen > RTL_DIGEST_LENGTH_SHA1 )
+    {
+        memcpy( pnKeyDerived + RTL_DIGEST_LENGTH_SHA1, pnX2, nRequiredKeyLen - RTL_DIGEST_LENGTH_SHA1 );
+        nRequiredKeyLen = RTL_DIGEST_LENGTH_SHA1;
+    }
+    memcpy( pnKeyDerived, pnX1, nRequiredKeyLen );
+}
+
+// ----------------------------------------------------------------------------
 
-OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException )
+bool lclGenerateEncryptionKey( const PackageEncryptionInfo& rEncrInfo, const OUString& rPassword, sal_uInt8* pnKey, sal_uInt32 nRequiredKeyLen )
 {
-    OUString aFilter;
+    size_t nBufferSize = rEncrInfo.mnSaltSize + 2 * rPassword.getLength();
+    sal_uInt8* pnBuffer = new sal_uInt8[ nBufferSize ];
+    memcpy( pnBuffer, rEncrInfo.mpnSalt, rEncrInfo.mnSaltSize );
+
+    sal_uInt8* pnPasswordLoc = pnBuffer + rEncrInfo.mnSaltSize;
+    const sal_Unicode* pStr = rPassword.getStr();
+    for( sal_Int32 i = 0, nLen = rPassword.getLength(); i < nLen; ++i, ++pStr, pnPasswordLoc += 2 )
+        ByteOrderConverter::writeLittleEndian( pnPasswordLoc, static_cast< sal_uInt16 >( *pStr ) );
+
+    rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
+    rtlDigestError aError = rtl_digest_update( aDigest, pnBuffer, nBufferSize );
+    delete[] pnBuffer;
 
-    if( mxFactory.is() ) try
+    size_t nHashSize = RTL_DIGEST_LENGTH_SHA1 + 4;
+    sal_uInt8* pnHash = new sal_uInt8[ nHashSize ];
+    aError = rtl_digest_get( aDigest, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 );
+    rtl_digest_destroy( aDigest );
+
+    for( sal_uInt32 i = 0; i < 50000; ++i )
     {
-        Reference< XFastParser > xParser( mxFactory->createInstance(
-            CREATE_OUSTRING( "com.sun.star.xml.sax.FastParser" ) ), UNO_QUERY_THROW );
-
-        xParser->setFastDocumentHandler( new FilterDetectDocHandler( aFilter ) );
-        xParser->setTokenHandler( new FastTokenHandler );
-
-        xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships" ), NMSP_PACKAGE_RELATIONSHIPS );
-        xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/officeDocument/2006/relationships" ), NMSP_RELATIONSHIPS );
-        xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/content-types" ), NMSP_CONTENT_TYPES );
-
-        MediaDescriptor aDescriptor( lDescriptor );
-        aDescriptor.addInputStream();
-        Reference< XInputStream > xInputStream( aDescriptor[ MediaDescriptor::PROP_INPUTSTREAM() ], UNO_QUERY_THROW );
-        StorageRef xStorage( new ZipStorage( mxFactory, xInputStream ) );
-
-        // Parse _rels/.rels to get the target path.
-        InputSource aParserInput;
-        aParserInput.sSystemId = CREATE_OUSTRING( "_rels/.rels" );
-        aParserInput.aInputStream = xStorage->openInputStream( aParserInput.sSystemId );
-        xParser->parseStream( aParserInput );
-
-        // Parse [Content_Types].xml to determine the content type of the part at the target path.
-        aParserInput.sSystemId = CREATE_OUSTRING( "[Content_Types].xml" );
-        aParserInput.aInputStream = xStorage->openInputStream( aParserInput.sSystemId );
-        xParser->parseStream( aParserInput );
+        ByteOrderConverter::writeLittleEndian( pnHash, i );
+        aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
+        aError = rtl_digest_update( aDigest, pnHash, nHashSize );
+        aError = rtl_digest_get( aDigest, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 );
+        rtl_digest_destroy( aDigest );
     }
-    catch ( const Exception& )
+
+    memmove( pnHash, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 );
+    memset( pnHash + RTL_DIGEST_LENGTH_SHA1, 0, 4 );
+    aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
+    aError = rtl_digest_update( aDigest, pnHash, nHashSize );
+    aError = rtl_digest_get( aDigest, pnHash, RTL_DIGEST_LENGTH_SHA1 );
+    rtl_digest_destroy( aDigest );
+
+    lclDeriveKey( pnHash, RTL_DIGEST_LENGTH_SHA1, pnKey, nRequiredKeyLen );
+    delete[] pnHash;
+
+    // check password
+    EVP_CIPHER_CTX aes_ctx;
+    EVP_CIPHER_CTX_init( &aes_ctx );
+    EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
+    EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+    int nOutLen = 0;
+    sal_uInt8 pnVerifier[ 16 ] = { 0 };
+    /*int*/ EVP_DecryptUpdate( &aes_ctx, pnVerifier, &nOutLen, rEncrInfo.mpnEncrVerifier, sizeof( rEncrInfo.mpnEncrVerifier ) );
+    EVP_CIPHER_CTX_cleanup( &aes_ctx );
+
+    EVP_CIPHER_CTX_init( &aes_ctx );
+    EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
+    EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+    sal_uInt8 pnVerifierHash[ 32 ] = { 0 };
+    /*int*/ EVP_DecryptUpdate( &aes_ctx, pnVerifierHash, &nOutLen, rEncrInfo.mpnEncrVerifierHash, sizeof( rEncrInfo.mpnEncrVerifierHash ) );
+    EVP_CIPHER_CTX_cleanup( &aes_ctx );
+
+    aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
+    aError = rtl_digest_update( aDigest, pnVerifier, sizeof( pnVerifier ) );
+    sal_uInt8 pnSha1Hash[ RTL_DIGEST_LENGTH_SHA1 ];
+    aError = rtl_digest_get( aDigest, pnSha1Hash, RTL_DIGEST_LENGTH_SHA1 );
+    rtl_digest_destroy( aDigest );
+
+    return memcmp( pnSha1Hash, pnVerifierHash, RTL_DIGEST_LENGTH_SHA1 ) == 0;
+}
+
+// the password verifier ------------------------------------------------------
+
+class PasswordVerifier : public ::comphelper::IDocPasswordVerifier
+{
+public:
+    explicit            PasswordVerifier( const PackageEncryptionInfo& rEncryptInfo );
+
+    virtual ::comphelper::DocPasswordVerifierResult
+                        verifyPassword( const OUString& rPassword );
+
+    inline const sal_uInt8* getKey() const { return &maKey.front(); }
+
+private:
+    const PackageEncryptionInfo& mrEncryptInfo;
+    ::std::vector< sal_uInt8 > maKey;
+};
+
+PasswordVerifier::PasswordVerifier( const PackageEncryptionInfo& rEncryptInfo ) :
+    mrEncryptInfo( rEncryptInfo ),
+    maKey( static_cast< size_t >( rEncryptInfo.mnKeySize / 8 ), 0 )
+{
+}
+
+::comphelper::DocPasswordVerifierResult PasswordVerifier::verifyPassword( const OUString& rPassword )
+{
+    // verifies the password and writes the related decryption key into maKey
+    return lclGenerateEncryptionKey( mrEncryptInfo, rPassword, &maKey.front(), maKey.size() ) ?
+        ::comphelper::DocPasswordVerifierResult_OK : ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+}
+
+} // namespace
+
+// ----------------------------------------------------------------------------
+
+Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescriptor& rMediaDesc ) const
+{
+    if( mxFactory.is() )
     {
+        // try the plain input stream
+        Reference< XInputStream > xInStrm( rMediaDesc[ MediaDescriptor::PROP_INPUTSTREAM() ], UNO_QUERY );
+        if( !xInStrm.is() || lclIsZipPackage( mxFactory, xInStrm ) )
+            return xInStrm;
+
+        // check if a temporary file is passed in the 'ComponentData' property
+        Sequence< NamedValue > aCompData = rMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_COMPONENTDATA(), Sequence< NamedValue >() );
+        SequenceAsHashMap aCompDataMap( aCompData );
+        Reference< XStream > xDecrypted = aCompDataMap.getUnpackedValueOrDefault( CREATE_OUSTRING( "DecryptedPackage" ), Reference< XStream >() );
+        if( xDecrypted.is() )
+        {
+            Reference< XInputStream > xDecrInStrm = xDecrypted->getInputStream();
+            if( lclIsZipPackage( mxFactory, xDecrInStrm ) )
+                return xDecrInStrm;
+        }
+
+        // try to decrypt an encrypted OLE package
+        OleStorage aOleStorage( mxFactory, xInStrm, false );
+        if( aOleStorage.isStorage() ) try
+        {
+            // open the required input streams in the encrypted package
+            Reference< XInputStream > xEncryptionInfo( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptionInfo" ) ), UNO_SET_THROW );
+            Reference< XInputStream > xEncryptedPackage( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptedPackage" ) ), UNO_SET_THROW );
+
+            // read the encryption info stream
+            PackageEncryptionInfo aEncryptInfo;
+            BinaryXInputStream aInfoStrm( xEncryptionInfo, true );
+            bool bValidInfo = lclReadEncryptionInfo( aEncryptInfo, aInfoStrm );
+
+            // check flags and agorithm IDs, requiered are AES128 and SHA-1
+            bool bImplemented = bValidInfo &&
+                getFlag( aEncryptInfo.mnFlags, ENCRYPTINFO_CRYPTOAPI ) &&
+                getFlag( aEncryptInfo.mnFlags, ENCRYPTINFO_AES ) &&
+                // algorithm ID 0 defaults to AES128 too, if ENCRYPTINFO_AES flag is set
+                ((aEncryptInfo.mnAlgorithmId == 0) || (aEncryptInfo.mnAlgorithmId == ENCRYPT_ALGO_AES128)) &&
+                // hash algorithm ID 0 defaults to SHA-1 too
+                ((aEncryptInfo.mnAlgorithmIdHash == 0) || (aEncryptInfo.mnAlgorithmIdHash == ENCRYPT_HASH_SHA1)) &&
+                (aEncryptInfo.mnVerifierHashSize == 20);
+
+            if( bImplemented )
+            {
+                /*  "VelvetSweatshop" is the built-in default encryption
+                    password used by MS Excel for the "workbook protection"
+                    feature with password. Try this first before prompting the
+                    user for a password. */
+                ::std::vector< OUString > aDefaultPasswords;
+                aDefaultPasswords.push_back( CREATE_OUSTRING( "VelvetSweatshop" ) );
+
+                /*  Use the comphelper password helper to request a password.
+                    This helper returns either with the correct password
+                    (according to the verifier), or with an empty string if
+                    user has cancelled the password input dialog. */
+                PasswordVerifier aVerifier( aEncryptInfo );
+                OUString aPassword = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
+                    aVerifier, rMediaDesc, ::comphelper::DocPasswordRequestType_MS, &aDefaultPasswords );
+
+                if( aPassword.getLength() == 0 )
+                {
+                    rMediaDesc[ MediaDescriptor::PROP_ABORTED() ] <<= true;
+                }
+                else
+                {
+                    // create temporary file for unencrypted package
+                    Reference< XStream > xTempFile( mxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TempFile" ) ), UNO_QUERY_THROW );
+                    Reference< XOutputStream > xDecryptedPackage( xTempFile->getOutputStream(), UNO_SET_THROW );
+                    BinaryXOutputStream aDecryptedPackage( xDecryptedPackage, true );
+                    BinaryXInputStream aEncryptedPackage( xEncryptedPackage, true );
+
+                    EVP_CIPHER_CTX aes_ctx;
+                    EVP_CIPHER_CTX_init( &aes_ctx );
+                    EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, aVerifier.getKey(), 0 );
+                    EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
+
+                    sal_uInt8 pnInBuffer[ 1024 ];
+                    sal_uInt8 pnOutBuffer[ 1024 ];
+                    sal_Int32 nInLen;
+                    int nOutLen;
+                    aEncryptedPackage.skip( 8 ); // decrypted size
+                    while( (nInLen = aEncryptedPackage.readMemory( pnInBuffer, sizeof( pnInBuffer ) )) > 0 )
+                    {
+                        EVP_DecryptUpdate( &aes_ctx, pnOutBuffer, &nOutLen, pnInBuffer, nInLen );
+                        aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen );
+                    }
+                    EVP_DecryptFinal_ex( &aes_ctx, pnOutBuffer, &nOutLen );
+                    aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen );
+
+                    EVP_CIPHER_CTX_cleanup( &aes_ctx );
+                    xDecryptedPackage->flush();
+                    aDecryptedPackage.seekToStart();
+
+                    // store temp file in media descriptor to keep it alive
+                    Sequence< NamedValue > aPropSeq( 1 );
+                    aPropSeq[ 0 ].Name = CREATE_OUSTRING( "DecryptedPackage" );
+                    aPropSeq[ 0 ].Value <<= xTempFile;
+                    rMediaDesc[ MediaDescriptor::PROP_COMPONENTDATA() ] <<= aPropSeq;
+
+                    Reference< XInputStream > xDecrInStrm = xTempFile->getInputStream();
+                    if( lclIsZipPackage( mxFactory, xDecrInStrm ) )
+                        return xDecrInStrm;
+                }
+            }
+        }
+        catch( Exception& )
+        {
+        }
     }
 
-    return aFilter;
+    return Reference< XInputStream >();
 }
 
 // com.sun.star.lang.XServiceInfo interface -----------------------------------
@@ -382,6 +605,62 @@ Sequence< OUString > SAL_CALL FilterDetect::getSupportedServiceNames() throw( Ru
     return FilterDetect_getSupportedServiceNames();
 }
 
+// com.sun.star.document.XExtendedFilterDetection interface -------------------
+
+OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq ) throw( RuntimeException )
+{
+    OUString aFilterName;
+    MediaDescriptor aMediaDesc( rMediaDescSeq );
+
+    /*  Check that the user has not choosen to abort detection, e.g. by hitting
+        'Cancel' in the password input dialog. This may happen because this
+        filter detection is used by different filters. */
+    bool bAborted = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_ABORTED(), false );
+    if( !bAborted && mxFactory.is() ) try
+    {
+        aMediaDesc.addInputStream();
+
+        /*  Get the unencrypted input stream. This may include creation of a
+            temporary file that contains the decrypted package. This temporary
+            file will be stored in the 'ComponentData' property of the media
+            descriptor. */
+        Reference< XInputStream > xInStrm( extractUnencryptedPackage( aMediaDesc ), UNO_SET_THROW );
+
+        // try to detect the file type, must be a ZIP package
+        ZipStorage aZipStorage( mxFactory, xInStrm );
+        if( aZipStorage.isStorage() )
+        {
+            Reference< XFastParser > xParser( mxFactory->createInstance(
+                CREATE_OUSTRING( "com.sun.star.xml.sax.FastParser" ) ), UNO_QUERY_THROW );
+
+            xParser->setFastDocumentHandler( new FilterDetectDocHandler( aFilterName ) );
+            xParser->setTokenHandler( new FastTokenHandler );
+
+            xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships" ), NMSP_PACKAGE_RELATIONSHIPS );
+            xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/officeDocument/2006/relationships" ), NMSP_RELATIONSHIPS );
+            xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/content-types" ), NMSP_CONTENT_TYPES );
+
+            // Parse _rels/.rels to get the target path.
+            InputSource aParserInput;
+            aParserInput.sSystemId = CREATE_OUSTRING( "_rels/.rels" );
+            aParserInput.aInputStream = aZipStorage.openInputStream( aParserInput.sSystemId );
+            xParser->parseStream( aParserInput );
+
+            // Parse [Content_Types].xml to determine the content type of the part at the target path.
+            aParserInput.sSystemId = CREATE_OUSTRING( "[Content_Types].xml" );
+            aParserInput.aInputStream = aZipStorage.openInputStream( aParserInput.sSystemId );
+            xParser->parseStream( aParserInput );
+        }
+    }
+    catch( Exception& )
+    {
+    }
+
+    // write back changed media descriptor members
+    aMediaDesc >> rMediaDescSeq;
+    return aFilterName;
+}
+
 // ============================================================================
 
 } // namespace core
diff --git a/oox/source/core/makefile.mk b/oox/source/core/makefile.mk
index 3443bd35c..51804e1d0 100644
--- a/oox/source/core/makefile.mk
+++ b/oox/source/core/makefile.mk
@@ -42,6 +42,10 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 
+.IF "$(SYSTEM_OPENSSL)" == "YES"
+CFLAGS+= $(OPENSSL_CFLAGS)
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 88a1e6b28..0abc43797 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -28,16 +28,7 @@
  *
  ************************************************************************/
 
-#include "properties.hxx"
 #include "oox/core/xmlfilterbase.hxx"
-#include "oox/core/fasttokenhandler.hxx"
-#include "oox/core/fragmenthandler.hxx"
-#include "oox/core/namespaces.hxx"
-#include "oox/core/recordparser.hxx"
-#include "oox/core/relationshandler.hxx"
-#include "oox/helper/containerhelper.hxx"
-#include "oox/helper/propertyset.hxx"
-#include "oox/helper/zipstorage.hxx"
 
 #include <cstdio>
 
@@ -47,9 +38,19 @@
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
+#include <comphelper/mediadescriptor.hxx>
 #include <sax/fshelper.hxx>
-
+#include "properties.hxx"
 #include "tokens.hxx"
+#include "oox/helper/containerhelper.hxx"
+#include "oox/helper/propertyset.hxx"
+#include "oox/helper/zipstorage.hxx"
+#include "oox/core/fasttokenhandler.hxx"
+#include "oox/core/filterdetect.hxx"
+#include "oox/core/fragmenthandler.hxx"
+#include "oox/core/namespaces.hxx"
+#include "oox/core/recordparser.hxx"
+#include "oox/core/relationshandler.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -76,6 +77,7 @@ using ::com::sun::star::xml::sax::InputSource;
 using ::com::sun::star::xml::sax::SAXException;
 using ::com::sun::star::document::XDocumentProperties;
 using ::com::sun::star::util::DateTime;
+using ::comphelper::MediaDescriptor;
 using ::sax_fastparser::FastSerializerHelper;
 using ::sax_fastparser::FSHelperPtr;
 
@@ -323,7 +325,7 @@ writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, const DateTime& rTime )
     if ( ( nXmlElement >> 16 ) != XML_dcterms )
         pDoc->startElement( nXmlElement, FSEND );
     else
-        pDoc->startElement( nXmlElement, 
+        pDoc->startElement( nXmlElement,
                 FSNS( XML_xsi, XML_type ), "dcterms:W3CDTF",
                 FSEND );
 
@@ -468,7 +470,7 @@ XmlFilterBase& XmlFilterBase::exportDocumentProperties( Reference< XDocumentProp
             ::com::sun::star::uno::Any aValue = aStats[ i ].Value;
             ::rtl::OUString sValue;
             bool bHaveString = aValue >>= sValue;
-            printf ("#\t%s=%s [%s]\n", 
+            printf ("#\t%s=%s [%s]\n",
                     OUStringToOString( aStats[ i ].Name, RTL_TEXTENCODING_UTF8 ).getStr(),
                     bHaveString
                         ? OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr()
@@ -479,16 +481,27 @@ XmlFilterBase& XmlFilterBase::exportDocumentProperties( Reference< XDocumentProp
     return *this;
 }
 
-StorageRef XmlFilterBase::implCreateStorage(
-        Reference< XInputStream >& rxInStream, Reference< XStream >& rxOutStream ) const
+// protected ------------------------------------------------------------------
+
+Reference< XInputStream > XmlFilterBase::implGetInputStream( MediaDescriptor& rMediaDesc ) const
 {
-    StorageRef xStorage;
-    if( rxInStream.is() )
-        xStorage.reset( new ZipStorage( getGlobalFactory(), rxInStream ) );
-    else if( rxOutStream.is() )
-        xStorage.reset( new ZipStorage( getGlobalFactory(), rxOutStream ) );
+    /*  Get the input stream directly from the media descriptor, or decrypt the
+        package again. The latter is needed e.g. when the document is reloaded.
+        All this is implemented in the detector service. */
+    FilterDetect aDetector( getGlobalFactory() );
+    return aDetector.extractUnencryptedPackage( rMediaDesc );
+}
+
+// private --------------------------------------------------------------------
+
+StorageRef XmlFilterBase::implCreateStorage( const Reference< XInputStream >& rxInStream ) const
+{
+    return StorageRef( new ZipStorage( getGlobalFactory(), rxInStream ) );
+}
 
-    return xStorage;
+StorageRef XmlFilterBase::implCreateStorage( const Reference< XStream >& rxOutStream ) const
+{
+    return StorageRef( new ZipStorage( getGlobalFactory(), rxOutStream ) );
 }
 
 // ============================================================================
diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
index 1e27dcd60..cdeed26f1 100644
--- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
+++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
@@ -271,15 +271,14 @@ Reference< XFastContextHandler > FillPropertiesContext::createFastChildContext(
         ContextHandler& rParent, sal_Int32 nElement,
         const Reference< XFastAttributeList >& rxAttribs, FillProperties& rFillProps )
 {
-    rFillProps.moFillType = getToken( nElement );
     switch( nElement )
     {
-        case A_TOKEN( noFill ):     return 0;
-        case A_TOKEN( solidFill ):  return new SolidFillContext( rParent, rxAttribs, rFillProps );
-        case A_TOKEN( gradFill ):   return new GradientFillContext( rParent, rxAttribs, rFillProps.maGradientProps );
-        case A_TOKEN( pattFill ):   return new PatternFillContext( rParent, rxAttribs, rFillProps.maPatternProps );
-        case A_TOKEN( blipFill ):   return new BlipFillContext( rParent, rxAttribs, rFillProps.maBlipProps );
-        case A_TOKEN( grpFill ):    return 0;   // TODO
+        case A_TOKEN( noFill ):			{ rFillProps.moFillType = getToken( nElement ); return 0; };
+        case A_TOKEN( solidFill ):		{ rFillProps.moFillType = getToken( nElement ); return new SolidFillContext( rParent, rxAttribs, rFillProps ); };
+        case A_TOKEN( gradFill ):		{ rFillProps.moFillType = getToken( nElement ); return new GradientFillContext( rParent, rxAttribs, rFillProps.maGradientProps ); };
+        case A_TOKEN( pattFill ):		{ rFillProps.moFillType = getToken( nElement ); return new PatternFillContext( rParent, rxAttribs, rFillProps.maPatternProps ); };
+        case A_TOKEN( blipFill ):		{ rFillProps.moFillType = getToken( nElement ); return new BlipFillContext( rParent, rxAttribs, rFillProps.maBlipProps ); };
+        case A_TOKEN( grpFill ):		{ rFillProps.moFillType = getToken( nElement ); return 0; };	// TODO 
     }
     return 0;
 }
diff --git a/oox/source/dump/biffdumper.cxx b/oox/source/dump/biffdumper.cxx
index 95b7da811..f4a53a4a0 100644
--- a/oox/source/dump/biffdumper.cxx
+++ b/oox/source/dump/biffdumper.cxx
@@ -50,6 +50,7 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::util::DateTime;
 using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::io::XInputStream;
+using ::comphelper::MediaDescriptor;
 using ::oox::core::FilterBase;
 
 using namespace ::oox::xls;
@@ -326,14 +327,6 @@ bool BiffObjectBase::implStartRecord( BinaryInputStream&, sal_Int64& ornRecPos,
     ornRecPos = mxBiffStrm->tellBase() - 4;
     ornRecId = mxBiffStrm->getRecId();
 
-    // record specific settings
-    switch( mxBiffStrm->getRecId() )
-    {
-        case BIFF_ID_CHEND:
-            out().decIndent();
-        break;
-    }
-
     // special CONTINUE handling
     mxBiffStrm->resetRecord( mbMergeContRec );
     if( mbMergeContRec ) switch( mxBiffStrm->getRecId() )
@@ -350,6 +343,21 @@ bool BiffObjectBase::implStartRecord( BinaryInputStream&, sal_Int64& ornRecPos,
         break;
     }
 
+    // record specific settings
+    switch( mxBiffStrm->getRecId() )
+    {
+        case BIFF2_ID_BOF:
+        case BIFF3_ID_BOF:
+        case BIFF4_ID_BOF:
+        case BIFF5_ID_BOF:
+        case BIFF_ID_INTERFACEHDR:
+            mxBiffStrm->enableDecoder( false );
+        break;
+        case BIFF_ID_CHEND:
+            out().decIndent();
+        break;
+    }
+
     ornRecSize = mxBiffStrm->getLength();
     return bValid;
 }
@@ -2183,6 +2191,52 @@ void WorkbookStreamObject::implDumpRecordBody()
             }
         break;
 
+        case BIFF_ID_FILEPASS:
+        {
+            rStrm.enableDecoder( false );
+            if( eBiff == BIFF8 )
+            {
+                switch( dumpDec< sal_uInt16 >( "type", "FILEPASS-TYPE" ) )
+                {
+                    case 0:
+                        dumpHex< sal_uInt16 >( "key" );
+                        dumpHex< sal_uInt16 >( "verifier" );
+                    break;
+                    case 1:
+                    {
+                        sal_uInt16 nMajor = dumpDec< sal_uInt16 >( "major-version", "FILEPASS-MAJOR" );
+                        dumpDec< sal_uInt16 >( "minor-version" );
+                        switch( nMajor )
+                        {
+                            case 1:
+                                dumpArray( "salt", 16 );
+                                dumpArray( "verifier", 16 );
+                                dumpArray( "verifier-hash", 16 );
+                            break;
+                        }
+                    }
+                    break;
+                }
+            }
+            else
+            {
+                dumpHex< sal_uInt16 >( "key" );
+                dumpHex< sal_uInt16 >( "verifier" );
+            }
+            rStrm.seekToStart();
+            BiffDecoderRef xDecoder = BiffCodecHelper::implReadFilePass( rStrm, eBiff );
+            if( xDecoder.get() )
+                cfg().requestPassword( *xDecoder );
+            setBinaryOnlyMode( !xDecoder || !xDecoder->isValid() );
+        }
+        break;
+
+        case BIFF_ID_FILESHARING:
+            dumpBool< sal_uInt16 >( "recommend-read-only" );
+            dumpHex< sal_uInt16 >( "password-hash" );
+            dumpString( "password-creator", BIFF_STR_8BITLENGTH, BIFF_STR_SMARTFLAGS );
+        break;
+
         case BIFF2_ID_FONT:
         case BIFF3_ID_FONT:
             dumpFontRec();
@@ -2602,9 +2656,14 @@ void WorkbookStreamObject::implDumpRecordBody()
         break;
 
         case BIFF_ID_SHEET:
-            if( eBiff >= BIFF5 ) dumpHex< sal_uInt32 >( "sheet-stream-pos", "CONV-DEC" );
-            if( eBiff >= BIFF5 ) dumpDec< sal_uInt8 >( "sheet-state", "SHEET-STATE" );
-            if( eBiff >= BIFF5 ) dumpDec< sal_uInt8 >( "sheet-type", "SHEET-TYPE" );
+            if( eBiff >= BIFF5 )
+            {
+                rStrm.enableDecoder( false );
+                dumpHex< sal_uInt32 >( "sheet-stream-pos", "CONV-DEC" );
+                rStrm.enableDecoder( true );
+                dumpDec< sal_uInt8 >( "sheet-state", "SHEET-STATE" );
+                dumpDec< sal_uInt8 >( "sheet-type", "SHEET-TYPE" );
+            }
             dumpString( "sheet-name", BIFF_STR_8BITLENGTH, BIFF_STR_8BITLENGTH );
         break;
 
@@ -3682,7 +3741,8 @@ Dumper::Dumper( const Reference< XMultiServiceFactory >& rxFactory, const Refere
     if( rxFactory.is() && rxInStrm.is() )
     {
         StorageRef xStrg( new OleStorage( rxFactory, rxInStrm, true ) );
-        ConfigRef xCfg( new Config( DUMP_BIFF_CONFIG_ENVVAR, rxFactory, xStrg, rSysFileName ) );
+        MediaDescriptor aMediaDesc;
+        ConfigRef xCfg( new Config( DUMP_BIFF_CONFIG_ENVVAR, rxFactory, xStrg, rSysFileName, aMediaDesc ) );
         DumperBase::construct( xCfg );
     }
 }
diff --git a/oox/source/dump/biffdumper.ini b/oox/source/dump/biffdumper.ini
index 069e18d35..df9518e92 100644
--- a/oox/source/dump/biffdumper.ini
+++ b/oox/source/dump/biffdumper.ini
@@ -1093,6 +1093,11 @@ constlist=EXTERNSHEET-IDX-BIFF8
   -2=special
 end
 
+# FILEPASS -------------------------------------------------------------------
+
+shortlist=FILEPASS-TYPE,0,xor,rc4
+shortlist=FILEPASS-MAJOR,1,rc4,crypto-api-2003,crypto-api-2007
+
 # FONT -----------------------------------------------------------------------
 
 flagslist=FONT-FLAGS
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index e3a553ffa..81f63062b 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/io/XTextOutputStream.hpp>
 #include <rtl/math.hxx>
 #include <osl/file.hxx>
+#include <comphelper/docpasswordhelper.hxx>
 #include "oox/helper/binaryoutputstream.hxx"
 #include "oox/core/filterbase.hxx"
 #include "oox/xls/biffhelper.hxx"
@@ -51,8 +52,8 @@ using ::rtl::OStringToOUString;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 using ::rtl::OUStringToOString;
-using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
 using ::com::sun::star::util::DateTime;
 using ::com::sun::star::lang::XMultiServiceFactory;
@@ -60,9 +61,10 @@ using ::com::sun::star::ucb::XSimpleFileAccess;
 using ::com::sun::star::io::XActiveDataSink;
 using ::com::sun::star::io::XActiveDataSource;
 using ::com::sun::star::io::XInputStream;
-using ::com::sun::star::io::XTextInputStream;
 using ::com::sun::star::io::XOutputStream;
+using ::com::sun::star::io::XTextInputStream;
 using ::com::sun::star::io::XTextOutputStream;
+using ::comphelper::MediaDescriptor;
 using ::oox::core::FilterBase;
 
 namespace oox {
@@ -1465,11 +1467,14 @@ NameListRef NameListWrapper::getNameList( const Config& rCfg ) const
 // ============================================================================
 
 SharedConfigData::SharedConfigData( const OUString& rFileName,
-        const Reference< XMultiServiceFactory >& rxFactory, const StorageRef& rxRootStrg, const OUString& rSysFileName ) :
+        const Reference< XMultiServiceFactory >& rxFactory, const StorageRef& rxRootStrg,
+        const OUString& rSysFileName, MediaDescriptor& rMediaDesc ) :
     mxFactory( rxFactory ),
     mxRootStrg( rxRootStrg ),
     maSysFileName( rSysFileName ),
-    mbLoaded( false )
+    mrMediaDesc( rMediaDesc ),
+    mbLoaded( false ),
+    mbPwCancelled( false )
 {
     OUString aFileUrl = InputOutputHelper::convertFileNameToUrl( rFileName );
     if( aFileUrl.getLength() > 0 )
@@ -1515,6 +1520,20 @@ NameListRef SharedConfigData::getNameList( const OUString& rListName ) const
     return xList;
 }
 
+OUString SharedConfigData::requestPassword( ::comphelper::IDocPasswordVerifier& rVerifier )
+{
+    OUString aPassword;
+    if( !mbPwCancelled )
+    {
+        ::std::vector< OUString > aDefaultPasswords;
+        aDefaultPasswords.push_back( CREATE_OUSTRING( "VelvetSweatshop" ) );
+        aPassword = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
+            rVerifier, mrMediaDesc, ::comphelper::DocPasswordRequestType_MS, &aDefaultPasswords );
+        mbPwCancelled = aPassword.getLength() == 0;
+    }
+    return aPassword;
+}
+
 bool SharedConfigData::implIsValid() const
 {
     return mbLoaded && mxFactory.is() && mxRootStrg.get() && (maSysFileName.getLength() > 0);
@@ -1614,9 +1633,9 @@ Config::Config( const sal_Char* pcEnvVar, const FilterBase& rFilter )
     construct( pcEnvVar, rFilter );
 }
 
-Config::Config( const sal_Char* pcEnvVar, const Reference< XMultiServiceFactory >& rxFactory, const StorageRef& rxRootStrg, const OUString& rSysFileName )
+Config::Config( const sal_Char* pcEnvVar, const Reference< XMultiServiceFactory >& rxFactory, const StorageRef& rxRootStrg, const OUString& rSysFileName, MediaDescriptor& rMediaDesc )
 {
-    construct( pcEnvVar, rxFactory, rxRootStrg, rSysFileName );
+    construct( pcEnvVar, rxFactory, rxRootStrg, rSysFileName, rMediaDesc );
 }
 
 Config::~Config()
@@ -1631,14 +1650,14 @@ void Config::construct( const Config& rParent )
 void Config::construct( const sal_Char* pcEnvVar, const FilterBase& rFilter )
 {
     if( rFilter.getFileUrl().getLength() > 0 )
-        construct( pcEnvVar, rFilter.getGlobalFactory(), rFilter.getStorage(), rFilter.getFileUrl() );
+        construct( pcEnvVar, rFilter.getGlobalFactory(), rFilter.getStorage(), rFilter.getFileUrl(), rFilter.getMediaDescriptor() );
 }
 
-void Config::construct( const sal_Char* pcEnvVar, const Reference< XMultiServiceFactory >& rxFactory, const StorageRef& rxRootStrg, const OUString& rSysFileName )
+void Config::construct( const sal_Char* pcEnvVar, const Reference< XMultiServiceFactory >& rxFactory, const StorageRef& rxRootStrg, const OUString& rSysFileName, MediaDescriptor& rMediaDesc )
 {
     if( pcEnvVar && rxRootStrg.get() && (rSysFileName.getLength() > 0) )
         if( const sal_Char* pcFileName = ::getenv( pcEnvVar ) )
-            mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxFactory, rxRootStrg, rSysFileName ) );
+            mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxFactory, rxRootStrg, rSysFileName, rMediaDesc ) );
 }
 
 void Config::setStringOption( const String& rKey, const String& rData )
@@ -1683,6 +1702,16 @@ NameListRef Config::getNameList( const String& rListName ) const
     return implGetNameList( rListName );
 }
 
+OUString Config::requestPassword( ::comphelper::IDocPasswordVerifier& rVerifier )
+{
+    return mxCfgData->requestPassword( rVerifier );
+}
+
+bool Config::isPasswordCancelled() const
+{
+    return mxCfgData->isPasswordCancelled();
+}
+
 bool Config::implIsValid() const
 {
     return isValid( mxCfgData );
@@ -3050,7 +3079,7 @@ void RecordObjectBase::implDump()
         sal_Int64 nRecPos = in().tell();
 
         // record body
-        if( cfg().hasName( xRecNames, mnRecId ) )
+        if( !mbBinaryOnly && cfg().hasName( xRecNames, mnRecId ) )
         {
             ItemFormatMap::const_iterator aIt = aSimpleRecs.find( mnRecId );
             if( aIt != aSimpleRecs.end() )
@@ -3081,6 +3110,7 @@ void RecordObjectBase::constructRecObjBase( const BinaryInputStreamRef& rxBaseSt
     maRecNames = rRecNames;
     maSimpleRecs = rSimpleRecs;
     mnRecPos = mnRecId = mnRecSize = 0;
+    mbBinaryOnly = false;
     if( InputObjectBase::implIsValid() )
         mbShowRecPos = cfg().getBoolOption( "show-record-position", true );
 }
@@ -3166,6 +3196,11 @@ bool DumperBase::isImportEnabled() const
     return !isValid() || cfg().isImportEnabled();
 }
 
+bool DumperBase::isImportCancelled() const
+{
+    return isValid() && cfg().isPasswordCancelled();
+}
+
 void DumperBase::construct( const ConfigRef& rxConfig )
 {
     if( isValid( rxConfig ) && rxConfig->isDumperEnabled() )
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index d1694000f..0e04cb821 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -41,6 +41,7 @@ using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::io::XInputStream;
+using ::comphelper::MediaDescriptor;
 using ::oox::core::FilterBase;
 
 namespace oox {
@@ -127,7 +128,8 @@ Dumper::Dumper( const Reference< XMultiServiceFactory >& rxFactory, const Refere
     if( rxFactory.is() && rxInStrm.is() )
     {
         StorageRef xStrg( new ZipStorage( rxFactory, rxInStrm ) );
-        ConfigRef xCfg( new Config( DUMP_PPTX_CONFIG_ENVVAR, rxFactory, xStrg, rSysFileName ) );
+        MediaDescriptor aMediaDesc;
+        ConfigRef xCfg( new Config( DUMP_PPTX_CONFIG_ENVVAR, rxFactory, xStrg, rSysFileName, aMediaDesc ) );
         DumperBase::construct( xCfg );
     }
 }
diff --git a/oox/source/dump/xlsbdumper.cxx b/oox/source/dump/xlsbdumper.cxx
index 819aff6be..3db91fd73 100644
--- a/oox/source/dump/xlsbdumper.cxx
+++ b/oox/source/dump/xlsbdumper.cxx
@@ -48,6 +48,7 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::util::DateTime;
 using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::io::XInputStream;
+using ::comphelper::MediaDescriptor;
 using ::oox::core::FilterBase;
 
 using namespace ::oox::xls;
@@ -1492,6 +1493,12 @@ void RecordStreamObject::implDumpRecordBody()
                 dumpString( "#sheet-name" );
         break;
 
+        case OOBIN_ID_FILESHARING:
+            dumpBool< sal_uInt16 >( "recommend-read-only" );
+            dumpHex< sal_uInt16 >( "password-hash" );
+            dumpString( "password-creator" );
+        break;
+
         case OOBIN_ID_FILL:
             dumpDec< sal_Int32 >( "fill-pattern", "FILLPATTERNS" );
             dumpColor( "fg-color" );
@@ -2267,7 +2274,8 @@ Dumper::Dumper( const Reference< XMultiServiceFactory >& rxFactory, const Refere
     if( rxFactory.is() && rxInStrm.is() )
     {
         StorageRef xStrg( new ZipStorage( rxFactory, rxInStrm ) );
-        ConfigRef xCfg( new Config( DUMP_XLSB_CONFIG_ENVVAR, rxFactory, xStrg, rSysFileName ) );
+        MediaDescriptor aMediaDesc;
+        ConfigRef xCfg( new Config( DUMP_XLSB_CONFIG_ENVVAR, rxFactory, xStrg, rSysFileName, aMediaDesc ) );
         DumperBase::construct( xCfg );
     }
 }
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 958a9ac24..89a65cd39 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -355,6 +355,7 @@ Suffix
 SwapXAndYAxis
 Symbol
 SymbolColor
+TabColor
 TableBorder
 TableLayout
 TableSelected
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index e583248ad..d586196ac 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -319,7 +319,7 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS
     if( !maShapeModel.mxClientData.get() || !mrDrawing.convertShapeClientAnchor( aShapeRect, maShapeModel.mxClientData->maAnchor ) )
         aShapeRect = getRectangle( pParentAnchor );
     // convert the shape, if the calculated rectangle is not empty
-    if( (aShapeRect.Width > 0) || (aShapeRect.Height > 0) && rxShapes.is() )
+    if( ((aShapeRect.Width > 0) || (aShapeRect.Height > 0)) && rxShapes.is() )
         xShape = implConvertAndInsert( rxShapes, aShapeRect );
     return xShape;
 }
diff --git a/oox/source/xls/biffcodec.cxx b/oox/source/xls/biffcodec.cxx
index b76f51ad0..a589b1b32 100644
--- a/oox/source/xls/biffcodec.cxx
+++ b/oox/source/xls/biffcodec.cxx
@@ -31,95 +31,89 @@
 #include "oox/xls/biffcodec.hxx"
 #include <osl/thread.h>
 #include <string.h>
+#include "oox/core/filterbase.hxx"
 #include "oox/xls/biffinputstream.hxx"
 
 using ::rtl::OString;
 using ::rtl::OUString;
 using ::rtl::OStringToOUString;
+using ::oox::core::FilterBase;
 
 namespace oox {
 namespace xls {
 
 // ============================================================================
 
-BiffDecoderBase::BiffDecoderBase( const WorkbookHelper& rHelper ) :
-    WorkbookHelper( rHelper ),
-    mnError( CODEC_ERROR_UNSUPP_CRYPT )
+BiffDecoderBase::BiffDecoderBase() :
+    mbValid( false )
 {
 }
 
-BiffDecoderBase::BiffDecoderBase( const BiffDecoderBase& rDecoder ) :
-    WorkbookHelper( rDecoder ),
-    mnError( rDecoder.mnError )
+BiffDecoderBase::~BiffDecoderBase()
 {
 }
 
-BiffDecoderBase::~BiffDecoderBase()
+::comphelper::DocPasswordVerifierResult BiffDecoderBase::verifyPassword( const OUString& rPassword )
 {
+    mbValid = implVerify( rPassword );
+    return mbValid ? ::comphelper::DocPasswordVerifierResult_OK : ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
 }
 
 void BiffDecoderBase::decode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int64 nStreamPos, sal_uInt16 nBytes )
 {
     if( pnDestData && pnSrcData && (nBytes > 0) )
     {
-        if( isValid() )
+        if( mbValid )
             implDecode( pnDestData, pnSrcData, nStreamPos, nBytes );
         else
             memcpy( pnDestData, pnSrcData, nBytes );
     }
 }
 
-void BiffDecoderBase::setHasValidPassword( bool bValid )
-{
-    mnError = bValid ? CODEC_OK : CODEC_ERROR_WRONG_PASS;
-}
-
 // ============================================================================
 
-BiffDecoder_XOR::BiffDecoder_XOR( const WorkbookHelper& rHelper, sal_uInt16 nKey, sal_uInt16 nHash ) :
-    BiffDecoderBase( rHelper ),
+BiffDecoder_XOR::BiffDecoder_XOR( sal_uInt16 nKey, sal_uInt16 nHash ) :
     maCodec( ::oox::core::BinaryCodec_XOR::CODEC_EXCEL ),
+    maPassword( 16 ),
     mnKey( nKey ),
     mnHash( nHash )
 {
-    init( BiffCodecHelper::getBiff5WbProtPassword() );
-    if( !isValid() )
-        init( OUStringToOString( getCodecHelper().queryPassword(), osl_getThreadTextEncoding() ) );
 }
 
 BiffDecoder_XOR::BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ) :
-    BiffDecoderBase( rDecoder ),
+    BiffDecoderBase(),  // must be called to prevent compiler warning
     maCodec( ::oox::core::BinaryCodec_XOR::CODEC_EXCEL ),
+    maPassword( rDecoder.maPassword ),
     mnKey( rDecoder.mnKey ),
     mnHash( rDecoder.mnHash )
 {
-    init( rDecoder.maPass );
+    if( isValid() )
+        maCodec.initKey( &maPassword.front() );
 }
 
-void BiffDecoder_XOR::init( const OString& rPass )
+BiffDecoder_XOR* BiffDecoder_XOR::implClone()
 {
-    maPass = rPass;
-    sal_Int32 nLen = maPass.getLength();
-    bool bValid = (0 < nLen) && (nLen < 16);
+    return new BiffDecoder_XOR( *this );
+}
 
-    if( bValid )
+bool BiffDecoder_XOR::implVerify( const OUString& rPassword )
+{
+    /*  Convert password to a byte string. TODO: this needs some finetuning
+        according to the spec... */
+    OString aBytePassword = OUStringToOString( rPassword, osl_getThreadTextEncoding() );
+    sal_Int32 nLen = aBytePassword.getLength();
+    if( (0 < nLen) && (nLen < 16) )
     {
         // copy byte string to sal_uInt8 array
-        sal_uInt8 pnPassw[ 16 ];
-        memset( pnPassw, 0, sizeof( pnPassw ) );
-        memcpy( pnPassw, maPass.getStr(), static_cast< size_t >( nLen ) );
+        maPassword.clear();
+        maPassword.resize( 16, 0 );
+        memcpy( &maPassword.front(), aBytePassword.getStr(), static_cast< size_t >( nLen ) );
 
         // init codec
-        maCodec.initKey( pnPassw );
-        bValid = maCodec.verifyKey( mnKey, mnHash );
+        maCodec.initKey( &maPassword.front() );
+        return maCodec.verifyKey( mnKey, mnHash );
     }
-
-    setHasValidPassword( bValid );
-}
-
-BiffDecoder_XOR* BiffDecoder_XOR::implClone()
-{
-    return new BiffDecoder_XOR( *this );
+    return false;
 }
 
 void BiffDecoder_XOR::implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int64 nStreamPos, sal_uInt16 nBytes )
@@ -149,55 +143,49 @@ sal_Int32 lclGetRcfOffset( sal_Int64 nStreamPos )
 
 // ----------------------------------------------------------------------------
 
-BiffDecoder_RCF::BiffDecoder_RCF( const WorkbookHelper& rHelper,
-        sal_uInt8 pnDocId[ 16 ], sal_uInt8 pnSaltData[ 16 ], sal_uInt8 pnSaltHash[ 16 ] ) :
-    BiffDecoderBase( rHelper ),
-    maDocId( pnDocId, pnDocId + 16 ),
-    maSaltData( pnSaltData, pnSaltData + 16 ),
-    maSaltHash( pnSaltHash, pnSaltHash + 16 )
+BiffDecoder_RCF::BiffDecoder_RCF( sal_uInt8 pnSalt[ 16 ], sal_uInt8 pnVerifier[ 16 ], sal_uInt8 pnVerifierHash[ 16 ] ) :
+    maPassword( 16, 0 ),
+    maSalt( pnSalt, pnSalt + 16 ),
+    maVerifier( pnVerifier, pnVerifier + 16 ),
+    maVerifierHash( pnVerifierHash, pnVerifierHash + 16 )
 {
-    init( BiffCodecHelper::getBiff8WbProtPassword() );
-    if( !isValid() )
-        init( getCodecHelper().queryPassword() );
 }
 
 BiffDecoder_RCF::BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ) :
-    BiffDecoderBase( rDecoder ),
-    maDocId( rDecoder.maDocId ),
-    maSaltData( rDecoder.maSaltData ),
-    maSaltHash( rDecoder.maSaltHash )
+    BiffDecoderBase(),  // must be called to prevent compiler warning
+    maPassword( rDecoder.maPassword ),
+    maSalt( rDecoder.maSalt ),
+    maVerifier( rDecoder.maVerifier ),
+    maVerifierHash( rDecoder.maVerifierHash )
 {
-    init( rDecoder.maPass );
+    if( isValid() )
+        maCodec.initKey( &maPassword.front(), &maSalt.front() );
 }
 
-void BiffDecoder_RCF::init( const OUString& rPass )
+BiffDecoder_RCF* BiffDecoder_RCF::implClone()
 {
-    maPass = rPass;
-    sal_Int32 nLen = maPass.getLength();
-    bool bValid = (0 < nLen) && (nLen < 16);
+    return new BiffDecoder_RCF( *this );
+}
 
-    if( bValid )
+bool BiffDecoder_RCF::implVerify( const OUString& rPassword )
+{
+    sal_Int32 nLen = rPassword.getLength();
+    if( (0 < nLen) && (nLen < 16) )
     {
         // copy string to sal_uInt16 array
-        sal_uInt16 pnPassw[ 16 ];
-        memset( pnPassw, 0, sizeof( pnPassw ) );
-        const sal_Unicode* pcChar = maPass.getStr();
+        maPassword.clear();
+        maPassword.resize( 16, 0 );
+        const sal_Unicode* pcChar = rPassword.getStr();
         const sal_Unicode* pcCharEnd = pcChar + nLen;
-        sal_uInt16* pnCurrPass = pnPassw;
-        for( ; pcChar < pcCharEnd; ++pcChar, ++pnCurrPass )
-            *pnCurrPass = static_cast< sal_uInt16 >( *pcChar );
+        ::std::vector< sal_uInt16 >::iterator aIt = maPassword.begin();
+        for( ; pcChar < pcCharEnd; ++pcChar, ++aIt )
+            *aIt = static_cast< sal_uInt16 >( *pcChar );
 
         // init codec
-        maCodec.initKey( pnPassw, &maDocId.front() );
-        bValid = maCodec.verifyKey( &maSaltData.front(), &maSaltHash.front() );
+        maCodec.initKey( &maPassword.front(), &maSalt.front() );
+        return maCodec.verifyKey( &maVerifier.front(), &maVerifierHash.front() );
     }
-
-    setHasValidPassword( bValid );
-}
-
-BiffDecoder_RCF* BiffDecoder_RCF::implClone()
-{
-    return new BiffDecoder_RCF( *this );
+    return false;
 }
 
 void BiffDecoder_RCF::implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int64 nStreamPos, sal_uInt16 nBytes )
@@ -229,130 +217,117 @@ void BiffDecoder_RCF::implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcD
 
 namespace {
 
-const sal_uInt16 BIFF_FILEPASS_BIFF2        = 0x0000;
-const sal_uInt16 BIFF_FILEPASS_BIFF8        = 0x0001;
-const sal_uInt16 BIFF_FILEPASS_BIFF8_RCF    = 0x0001;
-const sal_uInt16 BIFF_FILEPASS_BIFF8_STRONG = 0x0002;
+const sal_uInt16 BIFF_FILEPASS_XOR                  = 0;
+const sal_uInt16 BIFF_FILEPASS_RCF                  = 1;
 
-} // namespace
+const sal_uInt16 BIFF_FILEPASS_BIFF8_RCF            = 1;
+const sal_uInt16 BIFF_FILEPASS_BIFF8_CRYPTOAPI_2003 = 2;
+const sal_uInt16 BIFF_FILEPASS_BIFF8_CRYPTOAPI_2007 = 3;
 
 // ----------------------------------------------------------------------------
 
-BiffCodecHelper::BiffCodecHelper( const WorkbookHelper& rHelper ) :
-    WorkbookHelper( rHelper ),
-    mbHasPassword( false )
-{
-}
-
-const OString& BiffCodecHelper::getBiff5WbProtPassword()
-{
-    static const OString saPass( "VelvetSweatshop" );
-    return saPass;
-}
-
-const OUString& BiffCodecHelper::getBiff8WbProtPassword()
+BiffDecoderRef lclReadFilePass_XOR( BiffInputStream& rStrm )
 {
-    static const OUString saPass = OStringToOUString( getBiff5WbProtPassword(), RTL_TEXTENCODING_ASCII_US );
-    return saPass;
-}
-
-OUString BiffCodecHelper::queryPassword()
-{
-    if( !mbHasPassword )
-    {
-        //! TODO
-        maPassword = OUString();
-        // set to true, even if dialog has been cancelled (never ask twice)
-        mbHasPassword = true;
-    }
-    return maPassword;
-}
-
-bool BiffCodecHelper::importFilePass( BiffInputStream& rStrm )
-{
-    OSL_ENSURE( !mxDecoder, "BiffCodecHelper::importFilePass - multiple FILEPASS records" );
-    rStrm.enableDecoder( false );
-    mxDecoder.reset();
-    if( getBiff() == BIFF8 ) importFilePass8( rStrm ); else importFilePass2( rStrm );
-
-    // set decoder at import stream
-    rStrm.setDecoder( mxDecoder );
-    //! TODO remember encryption state for export
-//    mrStrm.GetRoot().GetExtDocOptions().GetDocSettings().mbEncrypted = true;
-
-    return mxDecoder.get() && mxDecoder->isValid();
-}
-
-void BiffCodecHelper::cloneDecoder( BiffInputStream& rStrm )
-{
-    if( mxDecoder.get() )
-        rStrm.setDecoder( BiffDecoderRef( mxDecoder->clone() ) );
-}
-
-// private --------------------------------------------------------------------
-
-void BiffCodecHelper::importFilePass_XOR( BiffInputStream& rStrm )
-{
-    OSL_ENSURE( rStrm.getRemaining() == 4, "BiffCodecHelper::importFilePass_XOR - wrong record size" );
+    BiffDecoderRef xDecoder;
+    OSL_ENSURE( rStrm.getRemaining() == 4, "lclReadFilePass_XOR - wrong record size" );
     if( rStrm.getRemaining() == 4 )
     {
         sal_uInt16 nBaseKey, nHash;
         rStrm >> nBaseKey >> nHash;
-        mxDecoder.reset( new BiffDecoder_XOR( *this, nBaseKey, nHash ) );
+        xDecoder.reset( new BiffDecoder_XOR( nBaseKey, nHash ) );
     }
+    return xDecoder;
 }
 
-void BiffCodecHelper::importFilePass_RCF( BiffInputStream& rStrm )
+BiffDecoderRef lclReadFilePass_RCF( BiffInputStream& rStrm )
 {
-    OSL_ENSURE( rStrm.getRemaining() == 48, "BiffCodecHelper::importFilePass_RCF - wrong record size" );
+    BiffDecoderRef xDecoder;
+    OSL_ENSURE( rStrm.getRemaining() == 48, "lclReadFilePass_RCF - wrong record size" );
     if( rStrm.getRemaining() == 48 )
     {
-        sal_uInt8 pnDocId[ 16 ];
-        sal_uInt8 pnSaltData[ 16 ];
-        sal_uInt8 pnSaltHash[ 16 ];
-        rStrm.readMemory( pnDocId, 16 );
-        rStrm.readMemory( pnSaltData, 16 );
-        rStrm.readMemory( pnSaltHash, 16 );
-        mxDecoder.reset( new BiffDecoder_RCF( *this, pnDocId, pnSaltData, pnSaltHash ) );
+        sal_uInt8 pnSalt[ 16 ];
+        sal_uInt8 pnVerifier[ 16 ];
+        sal_uInt8 pnVerifierHash[ 16 ];
+        rStrm.readMemory( pnSalt, 16 );
+        rStrm.readMemory( pnVerifier, 16 );
+        rStrm.readMemory( pnVerifierHash, 16 );
+        xDecoder.reset( new BiffDecoder_RCF( pnSalt, pnVerifier, pnVerifierHash ) );
     }
+    return xDecoder;
 }
 
-void BiffCodecHelper::importFilePass_Strong( BiffInputStream& /*rStrm*/ )
+BiffDecoderRef lclReadFilePass_CryptoApi( BiffInputStream& /*rStrm*/ )
 {
     // not supported
+    return BiffDecoderRef();
 }
 
-void BiffCodecHelper::importFilePass2( BiffInputStream& rStrm )
-{
-    importFilePass_XOR( rStrm );
-}
-
-void BiffCodecHelper::importFilePass8( BiffInputStream& rStrm )
+BiffDecoderRef lclReadFilePassBiff8( BiffInputStream& rStrm )
 {
+    BiffDecoderRef xDecoder;
     switch( rStrm.readuInt16() )
     {
-        case BIFF_FILEPASS_BIFF2:
-            importFilePass_XOR( rStrm );
+        case BIFF_FILEPASS_XOR:
+            xDecoder = lclReadFilePass_XOR( rStrm );
         break;
 
-        case BIFF_FILEPASS_BIFF8:
+        case BIFF_FILEPASS_RCF:
+        {
+            sal_uInt16 nMajor = rStrm.readuInt16();
             rStrm.skip( 2 );
-            switch( rStrm.readuInt16() )
+            switch( nMajor )
             {
                 case BIFF_FILEPASS_BIFF8_RCF:
-                    importFilePass_RCF( rStrm );
+                    xDecoder = lclReadFilePass_RCF( rStrm );
                 break;
-                case BIFF_FILEPASS_BIFF8_STRONG:
-                    importFilePass_Strong( rStrm );
+                case BIFF_FILEPASS_BIFF8_CRYPTOAPI_2003:
+                case BIFF_FILEPASS_BIFF8_CRYPTOAPI_2007:
+                    xDecoder = lclReadFilePass_CryptoApi( rStrm );
                 break;
                 default:
-                    OSL_ENSURE( false, "BiffCodecHelper::importFilePass8 - unknown BIFF8 encryption sub mode" );
+                    OSL_ENSURE( false, "lclReadFilePassBiff8 - unknown BIFF8 encryption sub mode" );
             }
+        }
         break;
 
         default:
-            OSL_ENSURE( false, "BiffCodecHelper::importFilePass8 - unknown encryption mode" );
+            OSL_ENSURE( false, "lclReadFilePassBiff8 - unknown encryption mode" );
     }
+    return xDecoder;
+}
+
+} // namespace
+
+// ----------------------------------------------------------------------------
+
+BiffCodecHelper::BiffCodecHelper( const WorkbookHelper& rHelper ) :
+    WorkbookHelper( rHelper )
+{
+}
+
+/*static*/ BiffDecoderRef BiffCodecHelper::implReadFilePass( BiffInputStream& rStrm, BiffType eBiff )
+{
+    rStrm.enableDecoder( false );
+    BiffDecoderRef xDecoder = (eBiff == BIFF8) ? lclReadFilePassBiff8( rStrm ) : lclReadFilePass_XOR( rStrm );
+    rStrm.setDecoder( xDecoder );
+    return xDecoder;
+}
+
+bool BiffCodecHelper::importFilePass( BiffInputStream& rStrm )
+{
+    OSL_ENSURE( !mxDecoder, "BiffCodecHelper::importFilePass - multiple FILEPASS records" );
+    mxDecoder = implReadFilePass( rStrm, getBiff() );
+    // request and verify a password (decoder implements IDocPasswordVerifier)
+    if( mxDecoder.get() )
+        getBaseFilter().requestPassword( *mxDecoder );
+    // correct password is indicated by isValid() function of decoder
+    return mxDecoder.get() && mxDecoder->isValid();
+}
+
+void BiffCodecHelper::cloneDecoder( BiffInputStream& rStrm )
+{
+    if( mxDecoder.get() )
+        rStrm.setDecoder( BiffDecoderRef( mxDecoder->clone() ) );
 }
 
 // ============================================================================
diff --git a/oox/source/xls/viewsettings.cxx b/oox/source/xls/viewsettings.cxx
index caeacaf6d..ce8c009a8 100644
--- a/oox/source/xls/viewsettings.cxx
+++ b/oox/source/xls/viewsettings.cxx
@@ -245,6 +245,12 @@ void SheetViewSettings::importSheetView( const AttributeList& rAttribs )
     rModel.mbShowOutline     = rAttribs.getBool( XML_showOutlineSymbols, true );
 }
 
+void SheetViewSettings::importTabColor( const AttributeList& rAttribs )
+{
+    SheetViewModel& rModel = maSheetViews.empty() ? *createSheetView() : *maSheetViews.back();
+    rModel.maTabColor.importColor( rAttribs );
+}
+
 void SheetViewSettings::importPane( const AttributeList& rAttribs )
 {
     OSL_ENSURE( !maSheetViews.empty(), "SheetViewSettings::importPane - missing sheet view model" );
@@ -589,6 +595,9 @@ void SheetViewSettings::finalizeImport()
     aPropMap[ PROP_ShowZeroValues ]               <<= xModel->mbShowZeros;
     aPropMap[ PROP_IsOutlineSymbolsSet ]          <<= xModel->mbShowOutline;
 
+    if (!xModel->maTabColor.isAuto())
+        aPropMap[ PROP_TabColor ] <<= static_cast< sal_Int32 >(xModel->maTabColor.getColor(*this));
+
     // store sheet view settings in global view settings object
     getViewSettings().setSheetViewSettings( getSheetIndex(), xModel, Any( aPropMap.makePropertyValueSequence() ) );
 }
diff --git a/oox/source/xls/workbookfragment.cxx b/oox/source/xls/workbookfragment.cxx
index d5904877b..1779cb4a7 100644
--- a/oox/source/xls/workbookfragment.cxx
+++ b/oox/source/xls/workbookfragment.cxx
@@ -101,8 +101,9 @@ ContextHandlerRef OoxWorkbookFragment::onCreateContext( sal_Int32 nElement, cons
                 case XLS_TOKEN( definedNames ):
                 case XLS_TOKEN( pivotCaches ):          return this;
 
-                case XLS_TOKEN( workbookPr ):           getWorkbookSettings().importWorkbookPr( rAttribs ); break;
-                case XLS_TOKEN( calcPr ):               getWorkbookSettings().importCalcPr( rAttribs );     break;
+                case XLS_TOKEN( fileSharing ):          getWorkbookSettings().importFileSharing( rAttribs );    break;
+                case XLS_TOKEN( workbookPr ):           getWorkbookSettings().importWorkbookPr( rAttribs );     break;
+                case XLS_TOKEN( calcPr ):               getWorkbookSettings().importCalcPr( rAttribs );         break;
             }
         break;
 
@@ -151,6 +152,7 @@ ContextHandlerRef OoxWorkbookFragment::onCreateRecordContext( sal_Int32 nRecId,
                 case OOBIN_ID_EXTERNALREFS:
                 case OOBIN_ID_PIVOTCACHES:      return this;
 
+                case OOBIN_ID_FILESHARING:      getWorkbookSettings().importFileSharing( rStrm );   break;
                 case OOBIN_ID_WORKBOOKPR:       getWorkbookSettings().importWorkbookPr( rStrm );    break;
                 case OOBIN_ID_CALCPR:           getWorkbookSettings().importCalcPr( rStrm );        break;
                 case OOBIN_ID_DEFINEDNAME:      getDefinedNames().importDefinedName( rStrm );       break;
@@ -402,7 +404,8 @@ bool BiffWorkbookFragment::importFragment()
     }
 
     // final conversions, e.g. calculation settings and view settings
-    finalizeWorkbookImport();
+    if( bRet )
+        finalizeWorkbookImport();
 
     return bRet;
 }
@@ -509,33 +512,35 @@ bool BiffWorkbookFragment::importGlobalsFragment( ISegmentProgressBar& rProgress
 
                 case BIFF3: switch( nRecId )
                 {
-                    case BIFF_ID_CRN:           bExtLinkRec = true;                     break;
-                    case BIFF3_ID_DEFINEDNAME:  bExtLinkRec = true;                     break;
-                    case BIFF3_ID_EXTERNALNAME: bExtLinkRec = true;                     break;
-                    case BIFF_ID_EXTERNSHEET:   bExtLinkRec = true;                     break;
-                    case BIFF3_ID_FONT:         rStyles.importFont( mrStrm );           break;
-                    case BIFF2_ID_FORMAT:       rStyles.importFormat( mrStrm );         break;
-                    case BIFF_ID_HIDEOBJ:       rWorkbookSett.importHideObj( mrStrm );  break;
-                    case BIFF_ID_PALETTE:       rStyles.importPalette( mrStrm );        break;
-                    case BIFF_ID_STYLE:         rStyles.importStyle( mrStrm );          break;
-                    case BIFF_ID_XCT:           bExtLinkRec = true;                     break;
-                    case BIFF3_ID_XF:           rStyles.importXf( mrStrm );             break;
+                    case BIFF_ID_CRN:           bExtLinkRec = true;                         break;
+                    case BIFF3_ID_DEFINEDNAME:  bExtLinkRec = true;                         break;
+                    case BIFF3_ID_EXTERNALNAME: bExtLinkRec = true;                         break;
+                    case BIFF_ID_EXTERNSHEET:   bExtLinkRec = true;                         break;
+                    case BIFF_ID_FILESHARING:   rWorkbookSett.importFileSharing( mrStrm );  break;
+                    case BIFF3_ID_FONT:         rStyles.importFont( mrStrm );               break;
+                    case BIFF2_ID_FORMAT:       rStyles.importFormat( mrStrm );             break;
+                    case BIFF_ID_HIDEOBJ:       rWorkbookSett.importHideObj( mrStrm );      break;
+                    case BIFF_ID_PALETTE:       rStyles.importPalette( mrStrm );            break;
+                    case BIFF_ID_STYLE:         rStyles.importStyle( mrStrm );              break;
+                    case BIFF_ID_XCT:           bExtLinkRec = true;                         break;
+                    case BIFF3_ID_XF:           rStyles.importXf( mrStrm );                 break;
                 }
                 break;
 
                 case BIFF4: switch( nRecId )
                 {
-                    case BIFF_ID_CRN:           bExtLinkRec = true;                     break;
-                    case BIFF3_ID_DEFINEDNAME:  bExtLinkRec = true;                     break;
-                    case BIFF3_ID_EXTERNALNAME: bExtLinkRec = true;                     break;
-                    case BIFF_ID_EXTERNSHEET:   bExtLinkRec = true;                     break;
-                    case BIFF3_ID_FONT:         rStyles.importFont( mrStrm );           break;
-                    case BIFF4_ID_FORMAT:       rStyles.importFormat( mrStrm );         break;
-                    case BIFF_ID_HIDEOBJ:       rWorkbookSett.importHideObj( mrStrm );  break;
-                    case BIFF_ID_PALETTE:       rStyles.importPalette( mrStrm );        break;
-                    case BIFF_ID_STYLE:         rStyles.importStyle( mrStrm );          break;
-                    case BIFF_ID_XCT:           bExtLinkRec = true;                     break;
-                    case BIFF4_ID_XF:           rStyles.importXf( mrStrm );             break;
+                    case BIFF_ID_CRN:           bExtLinkRec = true;                         break;
+                    case BIFF3_ID_DEFINEDNAME:  bExtLinkRec = true;                         break;
+                    case BIFF3_ID_EXTERNALNAME: bExtLinkRec = true;                         break;
+                    case BIFF_ID_EXTERNSHEET:   bExtLinkRec = true;                         break;
+                    case BIFF_ID_FILESHARING:   rWorkbookSett.importFileSharing( mrStrm );  break;
+                    case BIFF3_ID_FONT:         rStyles.importFont( mrStrm );               break;
+                    case BIFF4_ID_FORMAT:       rStyles.importFormat( mrStrm );             break;
+                    case BIFF_ID_HIDEOBJ:       rWorkbookSett.importHideObj( mrStrm );      break;
+                    case BIFF_ID_PALETTE:       rStyles.importPalette( mrStrm );            break;
+                    case BIFF_ID_STYLE:         rStyles.importStyle( mrStrm );              break;
+                    case BIFF_ID_XCT:           bExtLinkRec = true;                         break;
+                    case BIFF4_ID_XF:           rStyles.importXf( mrStrm );                 break;
                 }
                 break;
 
@@ -546,6 +551,7 @@ bool BiffWorkbookFragment::importGlobalsFragment( ISegmentProgressBar& rProgress
                     case BIFF5_ID_DEFINEDNAME:  bExtLinkRec = true;                         break;
                     case BIFF5_ID_EXTERNALNAME: bExtLinkRec = true;                         break;
                     case BIFF_ID_EXTERNSHEET:   bExtLinkRec = true;                         break;
+                    case BIFF_ID_FILESHARING:   rWorkbookSett.importFileSharing( mrStrm );  break;
                     case BIFF5_ID_FONT:         rStyles.importFont( mrStrm );               break;
                     case BIFF4_ID_FORMAT:       rStyles.importFormat( mrStrm );             break;
                     case BIFF_ID_HIDEOBJ:       rWorkbookSett.importHideObj( mrStrm );      break;
@@ -567,6 +573,7 @@ bool BiffWorkbookFragment::importGlobalsFragment( ISegmentProgressBar& rProgress
                     case BIFF_ID_EXTERNALBOOK:  bExtLinkRec = true;                         break;
                     case BIFF5_ID_EXTERNALNAME: bExtLinkRec = true;                         break;
                     case BIFF_ID_EXTERNSHEET:   bExtLinkRec = true;                         break;
+                    case BIFF_ID_FILESHARING:   rWorkbookSett.importFileSharing( mrStrm );  break;
                     case BIFF5_ID_FONT:         rStyles.importFont( mrStrm );               break;
                     case BIFF4_ID_FORMAT:       rStyles.importFormat( mrStrm );             break;
                     case BIFF_ID_HIDEOBJ:       rWorkbookSett.importHideObj( mrStrm );      break;
@@ -591,8 +598,11 @@ bool BiffWorkbookFragment::importGlobalsFragment( ISegmentProgressBar& rProgress
 
     // finalize global buffers
     rProgressBar.setPosition( 0.5 );
-    rSharedStrings.finalizeImport();
-    rStyles.finalizeImport();
+    if( bRet )
+    {
+        rSharedStrings.finalizeImport();
+        rStyles.finalizeImport();
+    }
 
     /*  Import external link data (EXTERNSHEET, EXTERNALNAME, DEFINEDNAME)
         which need existing internal sheets (SHEET records). The SHEET records
diff --git a/oox/source/xls/workbooksettings.cxx b/oox/source/xls/workbooksettings.cxx
index b91315f66..e4de0ff2d 100644
--- a/oox/source/xls/workbooksettings.cxx
+++ b/oox/source/xls/workbooksettings.cxx
@@ -32,10 +32,12 @@
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/sheet/XCalculatable.hpp>
+#include <comphelper/mediadescriptor.hxx>
 #include "properties.hxx"
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/helper/recordinputstream.hxx"
+#include "oox/core/filterbase.hxx"
 #include "oox/xls/biffinputstream.hxx"
 #include "oox/xls/unitconverter.hxx"
 
@@ -45,6 +47,7 @@ using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::util::Date;
 using ::com::sun::star::util::XNumberFormatsSupplier;
 using ::com::sun::star::sheet::XCalculatable;
+using ::oox::core::CodecHelper;
 
 namespace oox {
 namespace xls {
@@ -73,6 +76,14 @@ const sal_Int16 API_SHOWMODE_PLACEHOLDER        = 2;        /// Show placeholder
 
 // ============================================================================
 
+FileSharingModel::FileSharingModel() :
+    mnPasswordHash( 0 ),
+    mbRecommendReadOnly( false )
+{
+}
+
+// ============================================================================
+
 WorkbookSettingsModel::WorkbookSettingsModel() :
     mnShowObjectMode( XML_all ),
     mnUpdateLinksMode( XML_userSet ),
@@ -113,6 +124,13 @@ WorkbookSettings::WorkbookSettings( const WorkbookHelper& rHelper ) :
 {
 }
 
+void WorkbookSettings::importFileSharing( const AttributeList& rAttribs )
+{
+    maFileSharing.maUserName          = rAttribs.getXString( XML_userName, OUString() );
+    maFileSharing.mnPasswordHash      = CodecHelper::getPasswordHash( rAttribs, XML_reservationPassword );
+    maFileSharing.mbRecommendReadOnly = rAttribs.getBool( XML_readOnlyRecommended, false );
+}
+
 void WorkbookSettings::importWorkbookPr( const AttributeList& rAttribs )
 {
     maBookSettings.maCodeName          = rAttribs.getString( XML_codePage, OUString() );
@@ -138,6 +156,12 @@ void WorkbookSettings::importCalcPr( const AttributeList& rAttribs )
     maCalcSettings.mbConcurrent    = rAttribs.getBool( XML_concurrentCalc, true );
 }
 
+void WorkbookSettings::importFileSharing( RecordInputStream& rStrm )
+{
+    maFileSharing.mbRecommendReadOnly = rStrm.readuInt16() != 0;
+    rStrm >> maFileSharing.mnPasswordHash >> maFileSharing.maUserName;
+}
+
 void WorkbookSettings::importWorkbookPr( RecordInputStream& rStrm )
 {
     sal_uInt32 nFlags;
@@ -170,6 +194,23 @@ void WorkbookSettings::setSaveExtLinkValues( bool bSaveExtLinks )
     maBookSettings.mbSaveExtLinkValues = bSaveExtLinks;
 }
 
+void WorkbookSettings::importFileSharing( BiffInputStream& rStrm )
+{
+    maFileSharing.mbRecommendReadOnly = rStrm.readuInt16() != 0;
+    rStrm >> maFileSharing.mnPasswordHash;
+    if( getBiff() == BIFF8 )
+    {
+        sal_uInt16 nStrLen = rStrm.readuInt16();
+        // there is no string flags field if string is empty
+        if( nStrLen > 0 )
+            maFileSharing.maUserName = rStrm.readUniStringBody( nStrLen );
+    }
+    else
+    {
+        maFileSharing.maUserName = rStrm.readByteStringUC( false, getTextEncoding() );
+    }
+}
+
 void WorkbookSettings::importBookBool( BiffInputStream& rStrm )
 {
     // value of 0 means save external values, value of 1 means strip external values
@@ -254,6 +295,10 @@ void WorkbookSettings::finalizeImport()
         break;
     }
 
+    // write protection
+    if( maFileSharing.mbRecommendReadOnly || (maFileSharing.mnPasswordHash != 0) )
+        getBaseFilter().getMediaDescriptor()[ CREATE_OUSTRING( "ReadOnly" ) ] <<= true;
+
     // calculation settings
     Date aNullDate = getNullDate();
 
diff --git a/oox/source/xls/worksheetfragment.cxx b/oox/source/xls/worksheetfragment.cxx
index 4b754114b..d2bed72a4 100644
--- a/oox/source/xls/worksheetfragment.cxx
+++ b/oox/source/xls/worksheetfragment.cxx
@@ -297,7 +297,9 @@ ContextHandlerRef OoxWorksheetFragment::onCreateContext( sal_Int32 nElement, con
         case XLS_TOKEN( sheetPr ):
             switch( nElement )
             {
-                case XLS_TOKEN( tabColor ):         getWorksheetSettings().importTabColor( rAttribs );              break;
+// TODO: Treat tab color as a sheet setting later.
+//              case XLS_TOKEN( tabColor ):         getWorksheetSettings().importTabColor( rAttribs );              break;
+                case XLS_TOKEN( tabColor ):         getSheetViewSettings().importTabColor( rAttribs );              break;
                 case XLS_TOKEN( outlinePr ):        getWorksheetSettings().importOutlinePr( rAttribs );             break;
                 case XLS_TOKEN( pageSetUpPr ):      importPageSetUpPr( rAttribs );                                  break;
             }
diff --git a/oox/source/xls/worksheetsettings.cxx b/oox/source/xls/worksheetsettings.cxx
index 48cc9c304..d791e4801 100644
--- a/oox/source/xls/worksheetsettings.cxx
+++ b/oox/source/xls/worksheetsettings.cxx
@@ -41,6 +41,7 @@ using ::com::sun::star::uno::Exception;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
 using ::com::sun::star::util::XProtectable;
+using ::oox::core::CodecHelper;
 
 namespace oox {
 namespace xls {
@@ -112,16 +113,6 @@ SheetProtectionModel::SheetProtectionModel() :
 
 // ============================================================================
 
-namespace {
-
-sal_uInt16 lclGetCheckedHash( sal_Int32 nHash )
-{
-    OSL_ENSURE( (0 <= nHash) && (nHash <= SAL_MAX_UINT16), "lclGetCheckedHash - invalid password hash" );
-    return getLimitedValue< sal_uInt16, sal_Int32 >( nHash, 0, SAL_MAX_UINT16 );
-}
-
-} // namespace
-
 WorksheetSettings::WorksheetSettings( const WorksheetHelper& rHelper ) :
     WorksheetHelper( rHelper ),
     maPhoneticSett( rHelper )
@@ -153,7 +144,7 @@ void WorksheetSettings::importOutlinePr( const AttributeList& rAttribs )
 
 void WorksheetSettings::importSheetProtection( const AttributeList& rAttribs )
 {
-    maSheetProt.mnPasswordHash     = lclGetCheckedHash( rAttribs.getIntegerHex( XML_password, 0 ) );
+    maSheetProt.mnPasswordHash     = CodecHelper::getPasswordHash( rAttribs, XML_password );
     maSheetProt.mbSheet            = rAttribs.getBool( XML_sheet, false );
     maSheetProt.mbObjects          = rAttribs.getBool( XML_objects, false );
     maSheetProt.mbScenarios        = rAttribs.getBool( XML_scenarios, false );
@@ -174,7 +165,7 @@ void WorksheetSettings::importSheetProtection( const AttributeList& rAttribs )
 
 void WorksheetSettings::importChartProtection( const AttributeList& rAttribs )
 {
-    maSheetProt.mnPasswordHash = lclGetCheckedHash( rAttribs.getIntegerHex( XML_password, 0 ) );
+    maSheetProt.mnPasswordHash = CodecHelper::getPasswordHash( rAttribs, XML_password );
     maSheetProt.mbSheet        = rAttribs.getBool( XML_content, false );
     maSheetProt.mbObjects      = rAttribs.getBool( XML_objects, false );
 }
diff --git a/oox/util/makefile.mk b/oox/util/makefile.mk
index f98003b0f..93669d2d4 100644
--- a/oox/util/makefile.mk
+++ b/oox/util/makefile.mk
@@ -74,6 +74,20 @@ SHL1STDLIBS= \
         $(BASEGFXLIB)	\
         $(SAXLIB)
 
+# link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk
+.IF "$(GUI)"=="WNT"
+SHL1STDLIBS+= $(OPENSSLLIB)
+.ELSE # WNT
+.IF "$(OS)"=="SOLARIS"
+SHL1STDLIBS+= -lnsl -lsocket -ldl
+.ENDIF # SOLARIS
+.IF "$(SYSTEM_OPENSSL)"=="YES"
+SHL1STDLIBS+= $(OPENSSLLIB)
+.ELSE
+SHL1STDLIBS+= $(OPENSSLLIBST)
+.ENDIF
+.ENDIF # WNT
+
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=   $(LIB1TARGET)
 DEF1NAME    =$(SHL1TARGET)
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 7f01e7ce5..93d26a0e0 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -40,6 +40,7 @@
 #include <Inflater.hxx>
 #endif
 
+#include <mutexholder.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace lang { class XMultiServiceFactory; }
@@ -90,6 +91,7 @@ protected:
 
     // aMediaType parameter is used only for raw stream header creation
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream >  createUnbufferedStream(
+            SotMutexHolderRef aMutexHolder,
             ZipEntry & rEntry,
             const vos::ORef < EncryptionData > &rData, 
             sal_Int8 nStreamMode,
@@ -128,7 +130,8 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawData( 
             ZipEntry& rEntry,
             const vos::ORef < EncryptionData > &rData,
-            sal_Bool bDecrypt)
+            sal_Bool bDecrypt,
+            SotMutexHolderRef aMutexHolder )
         throw(::com::sun::star::io::IOException, ::com::sun::star::packages::zip::ZipException, ::com::sun::star::uno::RuntimeException);
     
     static sal_Bool StaticGetCipher ( const vos::ORef < EncryptionData > & xEncryptionData, rtlCipher &rCipher, sal_Bool bDecode );
@@ -157,13 +160,15 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( 
             ZipEntry& rEntry,
             const vos::ORef < EncryptionData > &rData,
-            sal_Bool bDecrypt )
+            sal_Bool bDecrypt,
+            SotMutexHolderRef aMutexHolder )
         throw(::com::sun::star::io::IOException, ::com::sun::star::packages::zip::ZipException, ::com::sun::star::uno::RuntimeException);
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getDataStream( 
             ZipEntry& rEntry,
             const vos::ORef < EncryptionData > &rData,
-            sal_Bool bDecrypt )
+            sal_Bool bDecrypt,
+            SotMutexHolderRef aMutexHolder )
         throw ( ::com::sun::star::packages::WrongPasswordException,
                 ::com::sun::star::io::IOException,
                 ::com::sun::star::packages::zip::ZipException,
@@ -172,7 +177,8 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getWrappedRawStream( 
             ZipEntry& rEntry,
             const vos::ORef < EncryptionData > &rData,
-            const ::rtl::OUString& aMediaType )
+            const ::rtl::OUString& aMediaType,
+            SotMutexHolderRef aMutexHolder )
         throw ( ::com::sun::star::packages::NoEncryptionException,
                 ::com::sun::star::io::IOException,
                 ::com::sun::star::packages::zip::ZipException,
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index a1e757983..2fd8afcf6 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -37,12 +37,15 @@
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #endif
 #include <HashMaps.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <osl/file.h>
+#include <mutexholder.hxx>
+
 class ZipOutputStream;
 class ZipPackageFolder;
 class ZipFile;
@@ -81,6 +84,8 @@ class ZipPackage : public cppu::WeakImplHelper7
                     >
 {
 protected:
+    SotMutexHolderRef m_aMutexHolder;
+
     ::com::sun::star::uno::Sequence < sal_Int8 > aEncryptionKey;
     FolderHash 		 aRecent;
     ::rtl::OUString	 sURL;
@@ -106,9 +111,13 @@ protected:
     void parseManifest();
     void parseContentType();
     void getZipFileContents();
-    sal_Bool writeFileIsTemp();
-    ::com::sun::star::uno::Reference < ::com::sun::star::io::XActiveDataStreamer > openOriginalForOutput();
+
     void WriteMimetypeMagicFile( ZipOutputStream& aZipOut );
+    void WriteManifest( ZipOutputStream& aZipOut, const ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& aManList );
+    void WriteContentTypes( ZipOutputStream& aZipOut, const ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& aManList );
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > writeTempFile();
+    ::com::sun::star::uno::Reference < ::com::sun::star::io::XActiveDataStreamer > openOriginalForOutput();
     void DisconnectFromTargetAndThrowException_Impl(
             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xTempStream );
 
@@ -119,6 +128,10 @@ public:
     const com::sun::star::uno::Sequence < sal_Int8 > & getEncryptionKey ( ) {return aEncryptionKey;}
     sal_Int16 getFormat() const { return m_nFormat; }
 
+    SotMutexHolderRef GetSharedMutexRef() { return m_aMutexHolder; }
+
+    void ConnectTo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream );
+
     // XInitialization
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) 
         throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx
index c69059f02..b4462dce6 100644
--- a/package/inc/ZipPackageBuffer.hxx
+++ b/package/inc/ZipPackageBuffer.hxx
@@ -56,7 +56,7 @@ public:
 
     inline void realloc ( sal_Int32 nSize ) { m_aBuffer.realloc ( nSize ); }
     inline const sal_Int8 * getConstArray () const { return m_aBuffer.getConstArray(); }
-    inline const com::sun::star::uno::Sequence < sal_Int8> & getSequence () const { return m_aBuffer; }
+    inline const com::sun::star::uno::Sequence < sal_Int8> getSequence () const { return m_aBuffer; }
 
     // XInputStream
     virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index 2f6ad049d..aaf45e000 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -40,7 +40,8 @@
 
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/implbase5.hxx>
-#include <osl/mutex.hxx>
+
+#include <mutexholder.hxx>
 
 #include <ZipFile.hxx>
 #include <HashMaps.hxx>
@@ -52,7 +53,8 @@ class OZipFileAccess : public ::cppu::WeakImplHelper5<
                         ::com::sun::star::lang::XComponent,
                         ::com::sun::star::lang::XServiceInfo >
 {
-    ::osl::Mutex m_aMutex;
+    SotMutexHolderRef m_aMutexHolder;
+
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xContentStream;
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 66976d5d7..0328837d0 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -41,6 +41,8 @@
 #include <algorithm>
 #include <string.h>
 
+#include <osl/mutex.hxx>
+
 #if 0
 // for debugging purposes here
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
@@ -55,14 +57,16 @@ using com::sun::star::lang::IllegalArgumentException;
 using com::sun::star::packages::zip::ZipIOException;
 using ::rtl::OUString;
 
-XUnbufferedStream::XUnbufferedStream( ZipEntry & rEntry,
+XUnbufferedStream::XUnbufferedStream( SotMutexHolderRef aMutexHolder,
+                          ZipEntry & rEntry,
                            Reference < XInputStream > xNewZipStream,
                            const vos::ORef < EncryptionData > &rData, 
                            sal_Int8 nStreamMode,
                            sal_Bool bIsEncrypted,
                           const ::rtl::OUString& aMediaType,
                           sal_Bool bRecoveryMode )
-: mxZipStream ( xNewZipStream )
+: maMutexHolder( aMutexHolder.Is() ? aMutexHolder : SotMutexHolderRef( new SotMutexHolder ) )
+, mxZipStream ( xNewZipStream )
 , mxZipSeek ( xNewZipStream, UNO_QUERY )
 , maEntry ( rEntry )
 , mxData ( rData )
@@ -115,7 +119,8 @@ XUnbufferedStream::XUnbufferedStream( ZipEntry & rEntry,
 // allows to read package raw stream
 XUnbufferedStream::XUnbufferedStream( const Reference < XInputStream >& xRawStream,
                     const vos::ORef < EncryptionData > &rData )
-: mxZipStream ( xRawStream )
+: maMutexHolder( new SotMutexHolder )
+, mxZipStream ( xRawStream )
 , mxZipSeek ( xRawStream, UNO_QUERY )
 , mxData ( rData )
 , maCipher ( NULL )
@@ -159,6 +164,8 @@ XUnbufferedStream::~XUnbufferedStream()
 sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
+    ::osl::MutexGuard aGuard( maMutexHolder->GetMutex() );
+
     sal_Int32 nRequestedBytes = nBytesToRead;
     OSL_ENSURE( !mnHeaderToRead || mbWrappedRaw, "Only encrypted raw stream can be provided with header!" );
     if ( mnMyCurrent + nRequestedBytes > mnZipSize + maHeader.getLength() )
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index f63d1b202..63b4951e7 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -36,16 +36,11 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <cppuhelper/implbase1.hxx>
-#ifndef _VOS_REF_H_
 #include <vos/ref.hxx>
-#endif
-#ifndef _INFLATER_HXX
 #include <Inflater.hxx>
-#endif
 #include <ZipEntry.hxx>
-#ifndef _CRC32_HXX_
 #include <CRC32.hxx>
-#endif
+#include <mutexholder.hxx>
 
 #define UNBUFF_STREAM_DATA			0
 #define UNBUFF_STREAM_RAW			1
@@ -59,6 +54,8 @@ class XUnbufferedStream : public cppu::WeakImplHelper1
 >
 {
 protected:
+    SotMutexHolderRef maMutexHolder;
+
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream > mxZipStream;
     com::sun::star::uno::Reference < com::sun::star::io::XSeekable > mxZipSeek;
     com::sun::star::uno::Sequence < sal_Int8 > maCompBuffer, maHeader;
@@ -73,7 +70,9 @@ protected:
     sal_Bool mbCheckCRC;
 
 public:
-    XUnbufferedStream( ZipEntry & rEntry,
+    XUnbufferedStream(
+                 SotMutexHolderRef aMutexHolder,
+                 ZipEntry & rEntry,
                  com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewZipStream,
                  const vos::ORef < EncryptionData > &rData, 
                  sal_Int8 nStreamMode,
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 4bd3a3597..89dbbb2ab 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -492,13 +492,14 @@ Reference < XInputStream > ZipFile::createMemoryStream(
 }
 #endif
 Reference < XInputStream > ZipFile::createUnbufferedStream(
+            SotMutexHolderRef aMutexHolder,
             ZipEntry & rEntry,
             const ORef < EncryptionData > &rData,
             sal_Int8 nStreamMode,
             sal_Bool bIsEncrypted,
             ::rtl::OUString aMediaType )
 {
-    return new XUnbufferedStream ( rEntry, xStream, rData, nStreamMode, bIsEncrypted, aMediaType, bRecoveryMode );
+    return new XUnbufferedStream ( aMutexHolder, rEntry, xStream, rData, nStreamMode, bIsEncrypted, aMediaType, bRecoveryMode );
 }
 
 
@@ -509,7 +510,8 @@ ZipEnumeration * SAL_CALL ZipFile::entries(  )
 
 Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntry,
         const vos::ORef < EncryptionData > &rData,
-        sal_Bool bIsEncrypted )
+        sal_Bool bIsEncrypted,
+        SotMutexHolderRef aMutexHolder )
     throw(IOException, ZipException, RuntimeException)
 {
     if ( rEntry.nOffset <= 0 )
@@ -525,7 +527,8 @@ Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntry,
     if ( bIsEncrypted && !rData.isEmpty() && rData->aDigest.getLength() )
         bNeedRawStream = !hasValidPassword ( rEntry, rData );
 
-    return createUnbufferedStream ( rEntry,
+    return createUnbufferedStream ( aMutexHolder,
+                                    rEntry,
                                     rData,
                                     bNeedRawStream ? UNBUFF_STREAM_RAW : UNBUFF_STREAM_DATA,
                                     bIsEncrypted );
@@ -533,7 +536,8 @@ Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntry,
 
 Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry,
         const vos::ORef < EncryptionData > &rData,
-        sal_Bool bIsEncrypted )
+        sal_Bool bIsEncrypted,
+        SotMutexHolderRef aMutexHolder )
     throw ( packages::WrongPasswordException,
             IOException,
             ZipException,
@@ -562,7 +566,8 @@ Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry,
     else
         bNeedRawStream = ( rEntry.nMethod == STORED );
 
-    return createUnbufferedStream ( rEntry,
+    return createUnbufferedStream ( aMutexHolder,
+                                    rEntry,
                                     rData,
                                     bNeedRawStream ? UNBUFF_STREAM_RAW : UNBUFF_STREAM_DATA,
                                     bIsEncrypted );
@@ -570,19 +575,21 @@ Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry,
 
 Reference< XInputStream > SAL_CALL ZipFile::getRawData( ZipEntry& rEntry,
         const vos::ORef < EncryptionData > &rData,
-        sal_Bool bIsEncrypted )
+        sal_Bool bIsEncrypted,
+        SotMutexHolderRef aMutexHolder )
     throw(IOException, ZipException, RuntimeException)
 {
     if ( rEntry.nOffset <= 0 )
         readLOC( rEntry );
 
-    return createUnbufferedStream ( rEntry, rData, UNBUFF_STREAM_RAW, bIsEncrypted );
+    return createUnbufferedStream ( aMutexHolder, rEntry, rData, UNBUFF_STREAM_RAW, bIsEncrypted );
 }
 
 Reference< XInputStream > SAL_CALL ZipFile::getWrappedRawStream(
         ZipEntry& rEntry,
         const vos::ORef < EncryptionData > &rData,
-        const ::rtl::OUString& aMediaType )
+        const ::rtl::OUString& aMediaType,
+        SotMutexHolderRef aMutexHolder )
     throw ( packages::NoEncryptionException,
             IOException,
             ZipException,
@@ -594,7 +601,7 @@ Reference< XInputStream > SAL_CALL ZipFile::getWrappedRawStream(
     if ( rEntry.nOffset <= 0 )
         readLOC( rEntry );
 
-    return createUnbufferedStream ( rEntry, rData, UNBUFF_STREAM_WRAPPEDRAW, sal_True, aMediaType );
+    return createUnbufferedStream ( aMutexHolder, rEntry, rData, UNBUFF_STREAM_WRAPPEDRAW, sal_True, aMediaType );
 }
 
 sal_Bool ZipFile::readLOC( ZipEntry &rEntry )
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 34fbea0ff..427a2ca9a 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -83,6 +83,7 @@
 #include <comphelper/seekableinput.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/ofopxmlhelper.hxx>
+#include <comphelper/documentconstants.hxx>
 
 using namespace rtl;
 using namespace std;
@@ -106,6 +107,8 @@ using namespace com::sun::star::packages::zip::ZipConstants;
 #define LOGFILE_AUTHOR "mg115289"
 
 
+namespace {
+
 sal_Bool isLocalFile_Impl( ::rtl::OUString aURL )
 {
     ::rtl::OUString aSystemPath;
@@ -132,6 +135,27 @@ sal_Bool isLocalFile_Impl( ::rtl::OUString aURL )
     return ( aSystemPath.getLength() != 0 );
 }
 
+class PostinitializationGuard
+{
+    uno::Reference< io::XInputStream > m_xTempStream;
+
+    ZipPackage&                        m_rZipPackage;
+
+public:
+    PostinitializationGuard( const uno::Reference< io::XInputStream >& xTempStream,
+                             ZipPackage& rZipPackage )
+    : m_xTempStream( xTempStream )
+    , m_rZipPackage( rZipPackage )
+    {}
+
+    virtual ~PostinitializationGuard()
+    {
+        m_rZipPackage.ConnectTo( m_xTempStream );
+    }
+};
+
+}
+
 //===========================================================================
 
 class ActiveDataStreamer : public ::cppu::WeakImplHelper1< XActiveDataStreamer >
@@ -174,7 +198,8 @@ class DummyInputStream : public ::cppu::WeakImplHelper1< XInputStream >
 //===========================================================================
 
 ZipPackage::ZipPackage (const uno::Reference < XMultiServiceFactory > &xNewFactory)
-: bHasEncryptedEntries ( sal_False )
+: m_aMutexHolder( new SotMutexHolder )
+, bHasEncryptedEntries ( sal_False )
 , bUseManifest ( sal_True )
 , bForceRecovery ( sal_False )
 , m_bMediaTypeFallbackUsed ( sal_False )
@@ -928,21 +953,138 @@ void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut )
     }
 }
 
-sal_Bool ZipPackage::writeFileIsTemp()
+void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< Sequence < PropertyValue > >& aManList )
+{
+    // Write the manifest
+    uno::Reference < XOutputStream > xManOutStream;
+    OUString sManifestWriter( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.packages.manifest.ManifestWriter" ) );
+    uno::Reference < XManifestWriter > xWriter ( xFactory->createInstance( sManifestWriter ), UNO_QUERY );
+    if ( xWriter.is() )
+    {
+        ZipEntry * pEntry = new ZipEntry;
+        ZipPackageBuffer *pBuffer = new ZipPackageBuffer( n_ConstBufferSize );
+        xManOutStream = uno::Reference < XOutputStream > (*pBuffer, UNO_QUERY);
+
+        pEntry->sName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "META-INF/manifest.xml") );
+        pEntry->nMethod = DEFLATED;
+        pEntry->nCrc = pEntry->nSize = pEntry->nCompressedSize = -1;
+        pEntry->nTime = ZipOutputStream::getCurrentDosTime();
+
+        // Convert vector into a Sequence
+        Sequence < Sequence < PropertyValue > > aManifestSequence ( aManList.size() );
+        Sequence < PropertyValue > * pSequence = aManifestSequence.getArray();
+        for (vector < Sequence < PropertyValue > >::const_iterator aIter = aManList.begin(), aEnd = aManList.end();
+             aIter != aEnd;
+             aIter++, pSequence++)
+            *pSequence= (*aIter);
+        xWriter->writeManifestSequence ( xManOutStream,  aManifestSequence );
+
+        sal_Int32 nBufferLength = static_cast < sal_Int32 > ( pBuffer->getPosition() );
+        pBuffer->realloc( nBufferLength );
+
+        // the manifest.xml is never encrypted - so pass an empty reference
+        vos::ORef < EncryptionData > xEmpty;
+        aZipOut.putNextEntry( *pEntry, xEmpty );
+        aZipOut.write( pBuffer->getSequence(), 0, nBufferLength );
+        aZipOut.closeEntry();
+    }
+    else
+    {
+        VOS_ENSURE ( 0, "Couldn't get a ManifestWriter!" );
+        IOException aException;
+        throw WrappedTargetException( 
+                OUString( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX "Couldn't get a ManifestWriter!" ) ),
+                static_cast < OWeakObject * > ( this ), 
+                makeAny( aException ) );
+    }
+}
+
+void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< Sequence < PropertyValue > >& aManList )
+{
+    const OUString sFullPath ( RTL_CONSTASCII_USTRINGPARAM ( "FullPath" ) );
+    const OUString sMediaType ( RTL_CONSTASCII_USTRINGPARAM ( "MediaType" ) );
+
+    ZipEntry* pEntry = new ZipEntry;
+    ZipPackageBuffer *pBuffer = new ZipPackageBuffer( n_ConstBufferSize );
+    uno::Reference< io::XOutputStream > xConTypeOutStream( *pBuffer, UNO_QUERY );
+
+    pEntry->sName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "[Content_Types].xml") );
+    pEntry->nMethod = DEFLATED;
+    pEntry->nCrc = pEntry->nSize = pEntry->nCompressedSize = -1;
+    pEntry->nTime = ZipOutputStream::getCurrentDosTime();
+
+    // Convert vector into a Sequence
+    // TODO/LATER: use Defaulst entries in future
+    uno::Sequence< beans::StringPair > aDefaultsSequence;
+    uno::Sequence< beans::StringPair > aOverridesSequence( aManList.size() );
+    sal_Int32 nSeqLength = 0;
+    for ( vector< uno::Sequence< beans::PropertyValue > >::const_iterator aIter = aManList.begin(),
+            aEnd = aManList.end();
+         aIter != aEnd;
+         aIter++)
+    {
+        ::rtl::OUString aPath;
+        ::rtl::OUString aType;
+        OSL_ENSURE( (*aIter)[PKG_MNFST_MEDIATYPE].Name.equals( sMediaType ) && (*aIter)[PKG_MNFST_FULLPATH].Name.equals( sFullPath ),
+                    "The mediatype sequence format is wrong!\n" );
+        (*aIter)[PKG_MNFST_MEDIATYPE].Value >>= aType;
+        if ( aType.getLength() )
+        {
+            // only nonempty type makes sence here
+            nSeqLength++;
+            (*aIter)[PKG_MNFST_FULLPATH].Value >>= aPath;
+            aOverridesSequence[nSeqLength-1].First = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) + aPath;
+            aOverridesSequence[nSeqLength-1].Second = aType;
+        }
+    }
+    aOverridesSequence.realloc( nSeqLength );
+
+    ::comphelper::OFOPXMLHelper::WriteContentSequence(
+            xConTypeOutStream, aDefaultsSequence, aOverridesSequence, xFactory );
+
+    sal_Int32 nBufferLength = static_cast < sal_Int32 > ( pBuffer->getPosition() );
+    pBuffer->realloc( nBufferLength );
+
+    // there is no encryption in this format currently
+    vos::ORef < EncryptionData > xEmpty;
+    aZipOut.putNextEntry( *pEntry, xEmpty );
+    aZipOut.write( pBuffer->getSequence(), 0, nBufferLength );
+    aZipOut.closeEntry();
+}
+
+void ZipPackage::ConnectTo( const uno::Reference< io::XInputStream >& xInStream )
+{
+    xContentSeek.set( xInStream, uno::UNO_QUERY_THROW );
+    xContentStream = xInStream;
+
+    // seek back to the beginning of the temp file so we can read segments from it 
+    xContentSeek->seek( 0 );
+    if ( pZipFile )
+        pZipFile->setInputStream( xContentStream );
+    else
+        pZipFile = new ZipFile ( xContentStream, xFactory, sal_False );    
+}
+
+uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
 {
     // In case the target local file does not exist or empty
-    // write directly to it otherwize create a temporary file to write to
+    // write directly to it otherwize create a temporary file to write to.
+    // If a temporary file is created it is returned back by the method.
+    // If the data written directly, xComponentStream will be switched here
     
     sal_Bool bUseTemp = sal_True;
-    uno::Reference < XOutputStream > xTempOut;
-    uno::Reference< XActiveDataStreamer > xSink;
+    uno::Reference < io::XInputStream > xResult;
+    uno::Reference < io::XInputStream > xTempIn;
+
+    uno::Reference < io::XOutputStream > xTempOut;
+    uno::Reference< io::XActiveDataStreamer > xSink;
 
     if ( eMode == e_IMode_URL && !pZipFile && isLocalFile_Impl( sURL ) )
     {
         xSink = openOriginalForOutput();
         if( xSink.is() )
         {
-            uno::Reference< XStream > xStr = xSink->getStream();
+            uno::Reference< io::XStream > xStr = xSink->getStream();
             if( xStr.is() )
             {
                 xTempOut = xStr->getOutputStream();
@@ -963,7 +1105,9 @@ sal_Bool ZipPackage::writeFileIsTemp()
     {
         // create temporary file
         const OUString sServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.io.TempFile" ) );
-        xTempOut = uno::Reference < XOutputStream > ( xFactory->createInstance ( sServiceName ), UNO_QUERY );
+        uno::Reference < io::XStream > xTempFile( xFactory->createInstance ( sServiceName ), UNO_QUERY_THROW );
+        xTempOut.set( xTempFile->getOutputStream(), UNO_SET_THROW );
+        xTempIn.set( xTempFile->getInputStream(), UNO_SET_THROW );
     }
     
     // Hand it to the ZipOutputStream:
@@ -995,7 +1139,7 @@ sal_Bool ZipPackage::writeFileIsTemp()
             // Write a magic file with mimetype
             WriteMimetypeMagicFile( aZipOut );
         }
-        if ( m_nFormat == OFOPXML_FORMAT )
+        else if ( m_nFormat == OFOPXML_FORMAT )
         {
             // Remove the old [Content_Types].xml file as the
             // file will be re-generated
@@ -1009,9 +1153,6 @@ sal_Bool ZipPackage::writeFileIsTemp()
         // Create a vector to store data for the manifest.xml file
         vector < Sequence < PropertyValue > > aManList;
 
-        // Make a reference to the manifest output stream so it persists
-        // until the call to ZipOutputStream->finish()
-        uno::Reference < XOutputStream > xManOutStream;
         const OUString sMediaType ( RTL_CONSTASCII_USTRINGPARAM ( "MediaType" ) );
         const OUString sVersion ( RTL_CONSTASCII_USTRINGPARAM ( "Version" ) );
         const OUString sFullPath ( RTL_CONSTASCII_USTRINGPARAM ( "FullPath" ) );
@@ -1047,107 +1188,20 @@ sal_Bool ZipPackage::writeFileIsTemp()
 
         if( bUseManifest && m_nFormat == PACKAGE_FORMAT )
         {
-            // Write the manifest
-            OUString sManifestWriter( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.packages.manifest.ManifestWriter" ) );
-            uno::Reference < XManifestWriter > xWriter ( xFactory->createInstance( sManifestWriter ), UNO_QUERY );
-            if ( xWriter.is() )
-            {
-                ZipEntry * pEntry = new ZipEntry;
-                ZipPackageBuffer *pBuffer = new ZipPackageBuffer( n_ConstBufferSize );
-                xManOutStream = uno::Reference < XOutputStream > (*pBuffer, UNO_QUERY);
-
-                pEntry->sName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "META-INF/manifest.xml") );
-                pEntry->nMethod = DEFLATED;
-                pEntry->nCrc = pEntry->nSize = pEntry->nCompressedSize = -1;
-                pEntry->nTime = ZipOutputStream::getCurrentDosTime();
-        
-                // Convert vector into a Sequence
-                Sequence < Sequence < PropertyValue > > aManifestSequence ( aManList.size() );
-                Sequence < PropertyValue > * pSequence = aManifestSequence.getArray();
-                for (vector < Sequence < PropertyValue > >::const_iterator aIter = aManList.begin(), aEnd = aManList.end();
-                     aIter != aEnd;
-                     aIter++, pSequence++)
-                    *pSequence= (*aIter);
-                xWriter->writeManifestSequence ( xManOutStream,  aManifestSequence );
-
-                sal_Int32 nBufferLength = static_cast < sal_Int32 > ( pBuffer->getPosition() );
-                pBuffer->realloc( nBufferLength );
-
-                // the manifest.xml is never encrypted - so pass an empty reference
-                vos::ORef < EncryptionData > xEmpty;
-                aZipOut.putNextEntry( *pEntry, xEmpty );
-                aZipOut.write( pBuffer->getSequence(), 0, nBufferLength );
-                aZipOut.closeEntry();
-            }
-            else
-            {
-                VOS_ENSURE ( 0, "Couldn't get a ManifestWriter!" );
-                IOException aException;
-                throw WrappedTargetException( 
-                        OUString( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX "Couldn't get a ManifestWriter!" ) ),
-                        static_cast < OWeakObject * > ( this ), 
-                        makeAny( aException ) );
-            }
+            WriteManifest( aZipOut, aManList );
         }
         else if( m_nFormat == OFOPXML_FORMAT )
         {
-            ZipEntry* pEntry = new ZipEntry;
-            ZipPackageBuffer *pBuffer = new ZipPackageBuffer( n_ConstBufferSize );
-            uno::Reference< io::XOutputStream > xConTypeOutStream( *pBuffer, UNO_QUERY );
-
-            pEntry->sName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "[Content_Types].xml") );
-            pEntry->nMethod = DEFLATED;
-            pEntry->nCrc = pEntry->nSize = pEntry->nCompressedSize = -1;
-            pEntry->nTime = ZipOutputStream::getCurrentDosTime();
-        
-            // Convert vector into a Sequence
-            // TODO/LATER: use Defaulst entries in future
-            uno::Sequence< beans::StringPair > aDefaultsSequence;
-            uno::Sequence< beans::StringPair > aOverridesSequence( aManList.size() );
-            sal_Int32 nSeqLength = 0;
-            for ( vector< uno::Sequence< beans::PropertyValue > >::const_iterator aIter = aManList.begin(),
-                    aEnd = aManList.end();
-                 aIter != aEnd;
-                 aIter++)
-            {
-                ::rtl::OUString aPath;
-                ::rtl::OUString aType;
-                OSL_ENSURE( (*aIter)[PKG_MNFST_MEDIATYPE].Name.equals( sMediaType ) && (*aIter)[PKG_MNFST_FULLPATH].Name.equals( sFullPath ),
-                            "The mediatype sequence format is wrong!\n" );
-                (*aIter)[PKG_MNFST_MEDIATYPE].Value >>= aType;
-                if ( aType.getLength() )
-                {
-                    // only nonempty type makes sence here
-                    nSeqLength++;
-                    (*aIter)[PKG_MNFST_FULLPATH].Value >>= aPath;
-                    aOverridesSequence[nSeqLength-1].First = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) + aPath;
-                    aOverridesSequence[nSeqLength-1].Second = aType;
-                }
-            }
-            aOverridesSequence.realloc( nSeqLength );
-
-            ::comphelper::OFOPXMLHelper::WriteContentSequence(
-                    xConTypeOutStream, aDefaultsSequence, aOverridesSequence, xFactory );
-
-            sal_Int32 nBufferLength = static_cast < sal_Int32 > ( pBuffer->getPosition() );
-            pBuffer->realloc( nBufferLength );
-
-            // there is no encryption in this format currently
-            vos::ORef < EncryptionData > xEmpty;
-            aZipOut.putNextEntry( *pEntry, xEmpty );
-            aZipOut.write( pBuffer->getSequence(), 0, nBufferLength );
-            aZipOut.closeEntry();
+            WriteContentTypes( aZipOut, aManList );
         }
 
         aZipOut.finish();
     
-        // Update our References to point to the new temp file
         if( bUseTemp )
-        {
-            xContentStream = uno::Reference < XInputStream > ( xTempOut, UNO_QUERY_THROW );
-            xContentSeek = uno::Reference < XSeekable > ( xTempOut, UNO_QUERY_THROW );
-        }
-        else
+            xResult = xTempIn;
+
+        // Update our References to point to the new temp file
+        if( !bUseTemp )
         {
             // the case when the original contents were written directly
             xTempOut->flush();
@@ -1158,14 +1212,15 @@ sal_Bool ZipPackage::writeFileIsTemp()
             if ( asyncOutputMonitor.is() )
                 asyncOutputMonitor->waitForCompletion();
 
+            // no need to postpone switching to the new stream since the target was written directly
+            uno::Reference< io::XInputStream > xNewStream;
             if ( eMode == e_IMode_URL )
-                xContentStream = xSink->getStream()->getInputStream();
-            else if ( eMode == e_IMode_XStream )
-                xContentStream = xStream->getInputStream();
+                xNewStream = xSink->getStream()->getInputStream();
+            else if ( eMode == e_IMode_XStream && xStream.is() )
+                xNewStream = xStream->getInputStream();
 
-            xContentSeek = uno::Reference < XSeekable > ( xContentStream, UNO_QUERY_THROW );
-
-            OSL_ENSURE( xContentStream.is() && xContentSeek.is(), "XSeekable interface is required!" );
+            if ( xNewStream.is() )
+                ConnectTo( xNewStream );
         }
     }
     catch ( uno::Exception& )
@@ -1197,14 +1252,7 @@ sal_Bool ZipPackage::writeFileIsTemp()
         }
     }
 
-    // seek back to the beginning of the temp file so we can read segments from it 
-    xContentSeek->seek ( 0 );
-    if ( pZipFile )
-        pZipFile->setInputStream ( xContentStream );
-    else
-        pZipFile = new ZipFile ( xContentStream, xFactory, sal_False );	
-
-    return bUseTemp;
+    return xResult;
 }
 
 uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
@@ -1259,9 +1307,12 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
 }
 
 // XChangesBatch
-void SAL_CALL ZipPackage::commitChanges(  ) 
+void SAL_CALL ZipPackage::commitChanges() 
         throw(WrappedTargetException, RuntimeException)
 {
+    // lock the component for the time of commiting
+    ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
+
     if ( eMode == e_IMode_XInputStream )
     {
         IOException aException;
@@ -1269,13 +1320,19 @@ void SAL_CALL ZipPackage::commitChanges(  )
                 static_cast < OWeakObject * > ( this ), makeAny ( aException ) );
     }
 
-    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "{ ZipPackage::commitChanges" );	
-    // First we write the entire package to a temporary file. After writeTempFile,
-    // xContentSeek and xContentStream will reference the new temporary file.
-    // Exception - empty or nonexistent local file that is written directly
+    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "{ ZipPackage::commitChanges" );    
+
+    // first the writeTempFile is called, if it returns a stream the stream should be written to the target
+    // if no stream was returned, the file was written directly, nothing should be done
 
-    if ( writeFileIsTemp() )
+    uno::Reference< io::XInputStream > xTempInStream = writeTempFile();
+    if ( xTempInStream.is() )
     {
+        uno::Reference< io::XSeekable > xTempSeek( xTempInStream, uno::UNO_QUERY_THROW );
+
+        // switch to the new temporary stream only after the transfer
+        PostinitializationGuard( xTempInStream, *this );
+
         if ( eMode == e_IMode_XStream )
         {
             // First truncate our output stream
@@ -1284,7 +1341,7 @@ void SAL_CALL ZipPackage::commitChanges(  )
             // preparation for copy step
             try
             {
-                xContentSeek->seek( 0 );
+                xTempSeek->seek( 0 );
 
                 xOutputStream = xStream->getOutputStream();
                 uno::Reference < XTruncate > xTruncate ( xOutputStream, UNO_QUERY );
@@ -1303,7 +1360,7 @@ void SAL_CALL ZipPackage::commitChanges(  )
             try
             {
                 // then copy the contents of the tempfile to our output stream
-                ::comphelper::OStorageHelper::CopyInputToOutput( xContentStream, xOutputStream );
+                ::comphelper::OStorageHelper::CopyInputToOutput( xTempInStream, xOutputStream );
                 xOutputStream->flush();
                 uno::Reference< io::XAsyncOutputMonitor > asyncOutputMonitor(
                     xOutputStream, uno::UNO_QUERY);
@@ -1316,7 +1373,7 @@ void SAL_CALL ZipPackage::commitChanges(  )
                 // if anything goes wrong in this block the target file becomes corrupted
                 // so an exception should be thrown as a notification about it
                 // and the package must disconnect from the stream
-                DisconnectFromTargetAndThrowException_Impl( xContentStream );
+                DisconnectFromTargetAndThrowException_Impl( xTempInStream );
             }
         }
         else if ( eMode == e_IMode_URL )
@@ -1349,7 +1406,7 @@ void SAL_CALL ZipPackage::commitChanges(  )
                 {
                     try
                     {
-                        ::comphelper::OStorageHelper::CopyInputToOutput( xContentStream, aOrigFileStream );
+                        ::comphelper::OStorageHelper::CopyInputToOutput( xTempInStream, aOrigFileStream );
                         aOrigFileStream->closeOutput();
                     }
                     catch( uno::Exception& )
@@ -1369,7 +1426,7 @@ void SAL_CALL ZipPackage::commitChanges(  )
             {
                 try
                 {
-                    uno::Reference < XPropertySet > xPropSet ( xContentStream, UNO_QUERY );
+                    uno::Reference < XPropertySet > xPropSet ( xTempInStream, UNO_QUERY );
                     OSL_ENSURE( xPropSet.is(), "This is a temporary file that must implement XPropertySet!\n" );
                     if ( !xPropSet.is() )
                         throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -1396,7 +1453,7 @@ void SAL_CALL ZipPackage::commitChanges(  )
                 catch (::com::sun::star::uno::Exception& r)
                 {
                     if ( bCanBeCorrupted )
-                        DisconnectFromTargetAndThrowException_Impl( xContentStream );
+                        DisconnectFromTargetAndThrowException_Impl( xTempInStream );
 
                     throw WrappedTargetException(
                                                 OUString( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX "This package may be read only!" ) ),
@@ -1410,7 +1467,7 @@ void SAL_CALL ZipPackage::commitChanges(  )
     // after successful storing it can be set to false
     m_bMediaTypeFallbackUsed = sal_False;
 
-    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "} ZipPackage::commitChanges" );	
+    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "} ZipPackage::commitChanges" );    
 }
 
 void ZipPackage::DisconnectFromTargetAndThrowException_Impl( const uno::Reference< io::XInputStream >& xTempStream )
@@ -1423,7 +1480,7 @@ void ZipPackage::DisconnectFromTargetAndThrowException_Impl( const uno::Referenc
 
     ::rtl::OUString aTempURL;
     try {
-        uno::Reference< beans::XPropertySet > xTempFile( xContentStream, uno::UNO_QUERY_THROW );
+        uno::Reference< beans::XPropertySet > xTempFile( xTempStream, uno::UNO_QUERY_THROW );
         uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) );
         aUrl >>= aTempURL;
         xTempFile->setPropertyValue( ::rtl::OUString::createFromAscii( "RemoveFile" ),
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index b95a20a94..c82759b3e 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -229,10 +229,8 @@ Reference< io::XInputStream > ZipPackageStream::TryToGetRawFromDataStream( sal_B
         if ( !xNewPackStream.is() )
             throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
     
-        if ( !m_aSharedMutexRef.Is() )
-            m_aSharedMutexRef = new SotMutexHolder();
         xNewPackStream->setDataStream( static_cast< io::XInputStream* >(
-                                                    new WrapStreamForShare( GetOwnSeekStream(), m_aSharedMutexRef ) ) );
+                                                    new WrapStreamForShare( GetOwnSeekStream(), rZipPackage.GetSharedMutexRef() ) ) );
     
         Reference< XPropertySet > xNewPSProps( xNewPackStream, UNO_QUERY );
         if ( !xNewPSProps.is() )
@@ -385,7 +383,6 @@ void SAL_CALL ZipPackageStream::setInputStream( const Reference< io::XInputStrea
         throw(RuntimeException)
 {
     // if seekable access is required the wrapping will be done on demand
-    m_aSharedMutexRef = new SotMutexHolder();
     xStream = aStream;
     m_bHasSeekable = sal_False;
     SetPackageMember ( sal_False );
@@ -403,13 +400,11 @@ Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
         {
             if ( !xEncryptionData.isEmpty() && !bHaveOwnKey )
                 xEncryptionData->aKey = rZipPackage.getEncryptionKey();
-            return rZipPackage.getZipFile().getRawData( aEntry, xEncryptionData, bIsEncrypted );
+            return rZipPackage.getZipFile().getRawData( aEntry, xEncryptionData, bIsEncrypted, rZipPackage.GetSharedMutexRef() );
         }
         else if ( GetOwnSeekStream().is() )
         {
-            if ( !m_aSharedMutexRef.Is() )
-                m_aSharedMutexRef = new SotMutexHolder();
-            return new WrapStreamForShare( GetOwnSeekStream(), m_aSharedMutexRef );
+            return new WrapStreamForShare( GetOwnSeekStream(), rZipPackage.GetSharedMutexRef() );
         }
         else
             return Reference < io::XInputStream > ();
@@ -436,13 +431,11 @@ Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream(  )
         {
             if ( !xEncryptionData.isEmpty() && !bHaveOwnKey )
                 xEncryptionData->aKey = rZipPackage.getEncryptionKey();
-            return rZipPackage.getZipFile().getInputStream( aEntry, xEncryptionData, bIsEncrypted );
+            return rZipPackage.getZipFile().getInputStream( aEntry, xEncryptionData, bIsEncrypted, rZipPackage.GetSharedMutexRef() );
         }
         else if ( GetOwnSeekStream().is() )
         {
-            if ( !m_aSharedMutexRef.Is() )
-                m_aSharedMutexRef = new SotMutexHolder();
-            return new WrapStreamForShare( GetOwnSeekStream(), m_aSharedMutexRef );
+            return new WrapStreamForShare( GetOwnSeekStream(), rZipPackage.GetSharedMutexRef() );
         }
         else
             return Reference < io::XInputStream > ();
@@ -482,15 +475,13 @@ Reference< io::XInputStream > SAL_CALL ZipPackageStream::getDataStream()
         if ( !xEncryptionData.isEmpty() && !bHaveOwnKey )
             xEncryptionData->aKey = rZipPackage.getEncryptionKey();
 
-        return rZipPackage.getZipFile().getDataStream( aEntry, xEncryptionData, bIsEncrypted );
+        return rZipPackage.getZipFile().getDataStream( aEntry, xEncryptionData, bIsEncrypted, rZipPackage.GetSharedMutexRef() );
     }
     else if ( m_nStreamMode == PACKAGE_STREAM_RAW )
         return ZipFile::StaticGetDataFromRawStream( GetOwnSeekStream(), xEncryptionData );
     else if ( GetOwnSeekStream().is() )
     {
-        if ( !m_aSharedMutexRef.Is() )
-            m_aSharedMutexRef = new SotMutexHolder();
-        return new WrapStreamForShare( GetOwnSeekStream(), m_aSharedMutexRef );
+        return new WrapStreamForShare( GetOwnSeekStream(), rZipPackage.GetSharedMutexRef() );
     }
     else
         return uno::Reference< io::XInputStream >();
@@ -515,15 +506,13 @@ Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream()
         if ( !bIsEncrypted || xEncryptionData.isEmpty() )
             throw packages::NoEncryptionException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
-        return rZipPackage.getZipFile().getWrappedRawStream( aEntry, xEncryptionData, sMediaType );
+        return rZipPackage.getZipFile().getWrappedRawStream( aEntry, xEncryptionData, sMediaType, rZipPackage.GetSharedMutexRef() );
     }
     else if ( GetOwnSeekStream().is() )
     {
         if ( m_nStreamMode == PACKAGE_STREAM_RAW )
         {
-            if ( !m_aSharedMutexRef.Is() )
-                m_aSharedMutexRef = new SotMutexHolder();
-            return new WrapStreamForShare( GetOwnSeekStream(), m_aSharedMutexRef );
+            return new WrapStreamForShare( GetOwnSeekStream(), rZipPackage.GetSharedMutexRef() );
         }
         else if ( m_nStreamMode == PACKAGE_STREAM_DATA && bToBeEncrypted )
             return TryToGetRawFromDataStream( sal_True );
@@ -568,7 +557,6 @@ void SAL_CALL ZipPackageStream::setRawStream( const Reference< io::XInputStream
     // the raw stream MUST have seekable access
     m_bHasSeekable = sal_True;
     
-    m_aSharedMutexRef = new SotMutexHolder();
     SetPackageMember ( sal_False );
     aEntry.nTime = -1;
     m_nStreamMode = PACKAGE_STREAM_RAW;
@@ -589,7 +577,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getPlainRawStream(
 
     if (IsPackageMember())
     {
-        return rZipPackage.getZipFile().getRawData( aEntry, xEncryptionData, bIsEncrypted );
+        return rZipPackage.getZipFile().getRawData( aEntry, xEncryptionData, bIsEncrypted, rZipPackage.GetSharedMutexRef() );
     }
     else if ( GetOwnSeekStream().is() )
     {
diff --git a/package/source/zippackage/ZipPackageStream.hxx b/package/source/zippackage/ZipPackageStream.hxx
index 9080a9e8b..94861e4ea 100644
--- a/package/source/zippackage/ZipPackageStream.hxx
+++ b/package/source/zippackage/ZipPackageStream.hxx
@@ -70,8 +70,6 @@ protected:
     sal_uInt32	m_nMagicalHackPos;
     sal_uInt32	m_nMagicalHackSize;
 
-    SotMutexHolderRef m_aSharedMutexRef;
-
     sal_Bool m_bHasSeekable;
 
     sal_Bool m_bCompressedIsSetFromOutside;
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index c4f04cb54..26a01c7fd 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -53,7 +53,8 @@ using namespace ::com::sun::star;
 
 // ----------------------------------------------------------------
 OZipFileAccess::OZipFileAccess( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
-: m_xFactory( xFactory )
+: m_aMutexHolder( new SotMutexHolder )
+, m_xFactory( xFactory )
 , m_pZipFile( NULL )
 , m_pListenersContainer( NULL )
 , m_bDisposed( sal_False )
@@ -66,7 +67,7 @@ OZipFileAccess::OZipFileAccess( const uno::Reference< lang::XMultiServiceFactory
 OZipFileAccess::~OZipFileAccess()
 {
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
+        ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
         if ( !m_bDisposed )
         {
             try {
@@ -179,7 +180,7 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu
     throw ( uno::Exception,
             uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
     if ( m_bDisposed )
         throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -242,7 +243,7 @@ uno::Any SAL_CALL OZipFileAccess::getByName( const ::rtl::OUString& aName )
             lang::WrappedTargetException,
             uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
     if ( m_bDisposed )
         throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -256,7 +257,8 @@ uno::Any SAL_CALL OZipFileAccess::getByName( const ::rtl::OUString& aName )
 
     uno::Reference< io::XInputStream > xEntryStream( m_pZipFile->getDataStream( (*aIter).second,
                                                                                 new EncryptionData(),
-                                                                                sal_False ) );
+                                                                                sal_False,
+                                                                                m_aMutexHolder ) );
 
     if ( !xEntryStream.is() )
         throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -268,7 +270,7 @@ uno::Any SAL_CALL OZipFileAccess::getByName( const ::rtl::OUString& aName )
 uno::Sequence< ::rtl::OUString > SAL_CALL OZipFileAccess::getElementNames()
     throw ( uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
     if ( m_bDisposed )
         throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -303,7 +305,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OZipFileAccess::getElementNames()
 sal_Bool SAL_CALL OZipFileAccess::hasByName( const ::rtl::OUString& aName )
     throw (uno::RuntimeException)
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
     if ( m_bDisposed )
         throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -320,7 +322,7 @@ sal_Bool SAL_CALL OZipFileAccess::hasByName( const ::rtl::OUString& aName )
 uno::Type SAL_CALL OZipFileAccess::getElementType()
     throw ( uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
     if ( m_bDisposed )
         throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -335,7 +337,7 @@ uno::Type SAL_CALL OZipFileAccess::getElementType()
 sal_Bool SAL_CALL OZipFileAccess::hasElements()
     throw ( uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
     if ( m_bDisposed )
         throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -353,7 +355,7 @@ uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern(
             io::IOException,
             uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
     if ( m_bDisposed )
         throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -370,7 +372,8 @@ uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern(
         {
             uno::Reference< io::XInputStream > xEntryStream( m_pZipFile->getDataStream( (*aIter).second, 
                                                                                         new EncryptionData(), 
-                                                                                        sal_False ) );
+                                                                                        sal_False,
+                                                                                        m_aMutexHolder ) );
 
             if ( !xEntryStream.is() )
                 throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -386,7 +389,7 @@ uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern(
 void SAL_CALL OZipFileAccess::dispose()
     throw ( uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
     if ( m_bDisposed )
         throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -418,13 +421,13 @@ void SAL_CALL OZipFileAccess::dispose()
 void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw ( uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
     if ( m_bDisposed )
         throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
     if ( !m_pListenersContainer )
-        m_pListenersContainer = new ::cppu::OInterfaceContainerHelper( m_aMutex );
+        m_pListenersContainer = new ::cppu::OInterfaceContainerHelper( m_aMutexHolder->GetMutex() );
     m_pListenersContainer->addInterface( xListener );
 }
 
@@ -432,7 +435,7 @@ void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEve
 void SAL_CALL OZipFileAccess::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw ( uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
     if ( m_bDisposed )
         throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
index cbf12a3e5..53a1e1c65 100644
--- a/packimages/pack/makefile.mk
+++ b/packimages/pack/makefile.mk
@@ -100,7 +100,7 @@ $(MISC)$/oxygen.flag : $(OXYGEN_TARBALL)
 
 # unpack the classic icon set
 $(MISC)$/classic.flag : $(CLASSIC_TARBALL)
-    cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
+    cd $(MISC) && gunzip -d -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
 .IF "$(GUI)"=="UNX"
     chmod -R g+w $(MISC)$/classic
 .ENDIF
diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java
index 0e540cf97..22f16eac1 100644
--- a/qadevOOo/runner/base/java_fat.java
+++ b/qadevOOo/runner/base/java_fat.java
@@ -279,7 +279,7 @@ public class java_fat implements TestBase
                         tEnv = getEnv(entry, param);
                     }
 
-                    MultiMethodTest ifc = null;
+                    // MultiMethodTest ifc = null;
                     lib.TestResult res = null;
 
                     // run the interface test twice if it failed.
@@ -319,17 +319,7 @@ public class java_fat implements TestBase
                             }
                         }
                     }
-                    if (res != null)
-                    {
-                        for (int k = 0; k < aSubEntry.SubEntryCount; k++)
-                        {
-                            DescEntry aSubSubEntry = aSubEntry.SubEntries[k];
-                            if (res.hasMethod( aSubSubEntry.entryName))
-                            {
-                                aSubSubEntry.State = res.getStatusFor(aSubSubEntry.entryName).toString();
-                            }
-                        }
-                    }
+                    setState(aSubEntry, res);
 
                     sumIt.summarizeUp(aSubEntry);
 
@@ -386,6 +376,21 @@ public class java_fat implements TestBase
             return retValue;
         }
 
+    private void setState(DescEntry aSubEntry, lib.TestResult res)
+    {
+        if (res != null)
+        {
+            for (int k = 0; k < aSubEntry.SubEntryCount; k++)
+            {
+                DescEntry aSubSubEntry = aSubEntry.SubEntries[k];
+                if (res.hasMethod( aSubSubEntry.entryName))
+                {
+                    aSubSubEntry.State = res.getStatusFor(aSubSubEntry.entryName).toString();
+                }
+            }
+        }
+    }
+
     private TestEnvironment getEnv(DescEntry entry, TestParameters param)
         {
 //        if (dcl == null)
diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java
index d375ac5ca..6b1371575 100644
--- a/qadevOOo/runner/graphical/IniFile.java
+++ b/qadevOOo/runner/graphical/IniFile.java
@@ -99,7 +99,7 @@ public class IniFile implements Enumeration
                 while (aLine != null)
                 {
                     aLine = aReader.readLine();
-                    if (aLine != null)
+                    if (aLine != null && aLine.length() > 0)
                     {
                         aLines.add(aLine);
                     }
diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java
index 701dc534f..06fa30bc1 100644
--- a/qadevOOo/runner/graphical/JPEGComparator.java
+++ b/qadevOOo/runner/graphical/JPEGComparator.java
@@ -160,10 +160,9 @@ public class JPEGComparator extends EnhancedComplexTestCase
                 assure("File '" + sJPEGFilename + "' doesn't exists.", aFile.exists(), true);
                 if (aFile.exists())
                 {
+                    GlobalLogWriter.println("Page: " + i);
                     checkOnePicture(sJPEGFilename, _sResult, _aParams);
                 }
-
-
             }
         }
         else
@@ -513,14 +512,20 @@ public class JPEGComparator extends EnhancedComplexTestCase
      *       between old and new graphics. The font of the new graphics is little bit bigger, 
      *       so the pixel count between old graphics and new graphics is twice the more.
      * 
+     * @param _sOldGfx path & name to the jpeg file (1)
+     * @param _sNewGfx path & name to the other jpeg file (2)
+     * @param _sDiffGfx path & name to the new difference file which shows the difference between (1) and (2)
+     * @return the count of different pixels
+     * @throws java.io.IOException if file access is not possible
      */
-    public int estimateGfx(String _sOldGfx, String _sNewGfx, String _sDiffGfx)
+
+    public static int estimateGfx(String _sOldGfx, String _sNewGfx, String _sDiffGfx)
         throws java.io.IOException
         {
             // new count pixels
-            int nNotWhiteCount_OldGraphic = PixelCounter.countNotWhitePixelsFromImage(_sOldGfx);
-            int nNotWhiteCount_NewGraphic = PixelCounter.countNotWhitePixelsFromImage(_sNewGfx);
-            int nNotBlackCount_DiffGraphic = PixelCounter.countNotBlackPixelsFromImage(_sDiffGfx);
+            final int nNotWhiteCount_OldGraphic = PixelCounter.countNotWhitePixelsFromImage(_sOldGfx);
+            final int nNotWhiteCount_NewGraphic = PixelCounter.countNotWhitePixelsFromImage(_sNewGfx);
+            final int nNotBlackCount_DiffGraphic = PixelCounter.countNotBlackPixelsFromImage(_sDiffGfx);
                 
             int nMinNotWhiteCount = Math.min(nNotWhiteCount_NewGraphic, nNotWhiteCount_OldGraphic);
                 
@@ -539,7 +544,7 @@ public class JPEGComparator extends EnhancedComplexTestCase
             return nPercent;
         }
 
-        public int compareJPEG(String _sOldGfx, String _sNewGfx, String _sDiffGfx)
+        private static int compareJPEG(String _sOldGfx, String _sNewGfx, String _sDiffGfx)
         {
             String sComposite = "composite";
             if (OSHelper.isWindows())
@@ -571,6 +576,15 @@ public class JPEGComparator extends EnhancedComplexTestCase
                 String sBack = aHandler.getOutputText();
                 GlobalLogWriter.get().println("'" + sBack + "'");
             }
+            else
+            {
+                // creates an extra smaller difference picture
+                File aDiffFile = new File(_sDiffGfx);
+                if (aDiffFile.exists())
+                {
+                    JPEGCreator.convertToNearSameFileWithWidth340(_sDiffGfx);
+                }
+            }
             return nExitCode;
         }
         
@@ -624,7 +638,7 @@ public class JPEGComparator extends EnhancedComplexTestCase
             }
             catch(java.lang.NumberFormatException e)
             {
-                GlobalLogWriter.get().println("Number format exception");
+                GlobalLogWriter.get().println("identify(): Number format exception");
                 nResult = 0;
             }
             return nResult;
diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java
index 5e5c681f0..5b78976d6 100644
--- a/qadevOOo/runner/graphical/JPEGCreator.java
+++ b/qadevOOo/runner/graphical/JPEGCreator.java
@@ -76,6 +76,8 @@ public class JPEGCreator extends EnhancedComplexTestCase
          int nPages = countPages(sJPEGNameSchema);
          if (nPages > 0)
          {
+             createSmallPictures(sJPEGNameSchema);
+
              String sIndexFile = FileHelper.appendPath(_sResult, "index.ini");         
              File aIndexFile = new File(sIndexFile);
              if (aIndexFile.exists())
@@ -89,7 +91,110 @@ public class JPEGCreator extends EnhancedComplexTestCase
              }
          }
     }
-    
+
+/**
+ * Create a lot of smaller and nicer Pictures of the big fat pages.
+ * Looks better
+ * @param _sJPEGSchema
+ */
+    public void createSmallPictures(String _sJPEGSchema)
+    {
+        int nPages = 0;
+        if (_sJPEGSchema.length() > 0)
+        {
+            // TODO: if there doesn't exists a '%04d' in the schema we will return 9999 which is a little bit wrong here.
+            for (int i=1;i<10000;i++)
+            {
+                String sJPEGFilename = getFilenameForJPEGSchema(_sJPEGSchema, i);
+                if (FileHelper.exists(sJPEGFilename))
+                {
+                    convertToNearSameFileWithWidth340(sJPEGFilename);
+                    // m_aFileList.add(sNewJPEGFilename); // as long as the files exist, fill the array
+                    nPages ++;
+                }
+                else
+                {
+                    break;                             // stop file check
+                }
+            }
+        }
+        // return nPages;
+    }
+
+/**
+ * convert a picture to a new picture with 340 pixel width.
+ * @param _sJPEGFilename
+ */
+public static void convertToNearSameFileWithWidth340(String _sJPEGFilename)
+{
+    String sNewJPEGFilename;
+    sNewJPEGFilename = util.utils.replaceAll13(_sJPEGFilename, ".jpg", "_w340.jpg");
+    convertToWidth340(_sJPEGFilename, sNewJPEGFilename);
+}
+
+    /**
+ * convert chart2_Regression.ods.ps_180DPI_0001.jpg -filter Catrom -resize
+340x chart2_Regression.ods.ps_180DPI_0001_w340.jpg
+
+Point wie bisher
+Cubic schlecht, weil unscharf
+...
+Triangle ganz brauchbar (default?)
+Catrom am besten
+
+ * @param _sFrom
+ * @param _To
+ */
+private static void convertToWidth340(String _sFrom, String _To)
+{
+            // int nResult = 0;
+
+            String sConvertEXE = "convert";
+            if (OSHelper.isLinuxIntel())
+            {
+                sConvertEXE = "convert";
+            }
+            if (OSHelper.isWindows())
+            {
+                sConvertEXE = "convert.exe";
+            }
+
+            String[] sCommandArray =
+                {
+                    sConvertEXE,
+                    _sFrom,
+                     "-filter", "Catrom",
+                    "-resize", "340x",
+                    _To
+                };
+            ProcessHandler aHandler = new ProcessHandler(sCommandArray);
+            boolean bBackValue = aHandler.executeSynchronously();
+            int nExitCode = aHandler.getExitCode();
+
+            String sBack = aHandler.getOutputText();
+            if (sBack.length() > 0)
+            {
+                GlobalLogWriter.get().println("'" + sBack + "'");
+            }
+            // try to interpret the result, which we get as a String
+//            try
+//            {
+//                int nIdx = sBack.indexOf("\n");
+//                if (nIdx > 0)
+//                {
+//                    sBack = sBack.substring(0, nIdx);
+//                }
+//
+//                nResult = Integer.valueOf(sBack).intValue();
+//            }
+//            catch(java.lang.NumberFormatException e)
+//            {
+//                GlobalLogWriter.get().println("Number format exception");
+//                nResult = 0;
+//            }
+            // return nResult;
+}
+
 /**
  * create out of a given Postscript/PDF _sFile a list of JPEGs, one for every page
  * @param _sFile
diff --git a/qadevOOo/runner/graphical/PixelCounter.java b/qadevOOo/runner/graphical/PixelCounter.java
index 38dbac8f0..0e3f54409 100644
--- a/qadevOOo/runner/graphical/PixelCounter.java
+++ b/qadevOOo/runner/graphical/PixelCounter.java
@@ -34,7 +34,7 @@ package graphical;
 // -----------------------------------------------------------------------------
 abstract class CountPixel
 {
-    int m_nCount = 0;
+    protected int m_nCount = 0;
     public int getCount() {return m_nCount;}
     public abstract void count(int _nRGB);
 }
@@ -47,9 +47,9 @@ class CountNotWhite extends CountPixel
             // System.out.println("CountWhite()");
         }
     
-    public void count(final int pixel)
+    public void countold(final int pixel)
         {
-            final int alpha = (pixel >> 24) & 0xff;
+            // final int alpha = (pixel >> 24) & 0xff;
             final int red   = (pixel >> 16) & 0xff;
             final int green = (pixel >>  8) & 0xff;
             final int blue  = (pixel      ) & 0xff;
@@ -61,6 +61,28 @@ class CountNotWhite extends CountPixel
             }
             ++m_nCount;
         }
+    public void count(final int pixel)
+        {
+            // final int alpha = (pixel >> 24) & 0xff;
+            final int blue  = (pixel      ) & 0xff;
+            if (blue != 0xff)
+            {
+                ++m_nCount;
+                return;
+            }
+            final int green = (pixel >>  8) & 0xff;
+            if (green != 0xff)
+            {
+                ++m_nCount;
+                return;
+            }
+            final int red   = (pixel >> 16) & 0xff;
+            if (red != 0xff)
+            {
+                ++m_nCount;
+                return;
+            }
+        }
 }
 
 // -----------------------------------------------------------------------------
@@ -71,9 +93,9 @@ class CountNotBlack extends CountPixel
             // System.out.println("CountBlack()");
         }
     
-    public void count(final int pixel)
+    public void countold(final int pixel)
         {
-            final int alpha = (pixel >> 24) & 0xff;
+            // final int alpha = (pixel >> 24) & 0xff;
             final int red   = (pixel >> 16) & 0xff;
             final int green = (pixel >>  8) & 0xff;
             final int blue  = (pixel      ) & 0xff;
@@ -84,6 +106,28 @@ class CountNotBlack extends CountPixel
             }
             ++m_nCount;
         }
+    public void count(final int pixel)
+        {
+            // final int alpha = (pixel >> 24) & 0xff;
+            final int blue  = (pixel      ) & 0xff;
+            if (blue != 0x00)
+            {
+                ++m_nCount;
+                return;
+            }
+            final int green = (pixel >>  8) & 0xff;
+            if (green != 0x00)
+            {
+                ++m_nCount;
+                return;
+            }
+            final int red   = (pixel >> 16) & 0xff;
+            if (red != 0x00)
+            {
+                ++m_nCount;
+                return;
+            }
+        }
 }
 
 // -----------------------------------------------------------------------------
@@ -157,7 +201,7 @@ public class PixelCounter {
         throws java.io.IOException
         {
             ImageHelper aImage = ImageHelper.createImageHelper(_sFile);
-            int nw = graphics_stuff.countNotWhitePixel(aImage);
+            final int nw = graphics_stuff.countNotWhitePixel(aImage);
             return nw;
         }
 
@@ -165,7 +209,7 @@ public class PixelCounter {
         throws java.io.IOException
         {
             ImageHelper aImage = ImageHelper.createImageHelper(_sFile);
-            int nw = graphics_stuff.countNotBlackPixel(aImage);
+            final int nw = graphics_stuff.countNotBlackPixel(aImage);
             return nw;
         }
     
diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java
index cce776434..c007d6d20 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -326,7 +326,6 @@ public class APIDescGetter extends DescGetter
                 // String meth_name = line.substring(line.lastIndexOf(";") + 2, line.length() - 1);
 
                 DescEntry methDesc = createDescEntry(meth_name, ifc_name, parent);
-                meth_names.add(methDesc);
 
                 if (!ifc_name.equals(old_ifc_name))
                 {
@@ -365,37 +364,13 @@ public class APIDescGetter extends DescGetter
                         ifc_name = ifc_name.substring(0, ifc_name.indexOf("#"));
                     }
 
-                    StringTokenizer st = new StringTokenizer(ifc_name, ":");
-                    String className = "";
-
-                    int count = 3;
-
-                    if (ifc_name.startsWith("drafts"))
-                    {
-                        count = 4;
-                    }
-
-                    for (int i = 0; st.hasMoreTokens(); i++)
-                    {
-                        String token = st.nextToken();
-
-                        // skipping (drafts.)com.sun.star
-                        if (i >= count)
-                        {
-                            if (!st.hasMoreTokens())
-                            {
-                                // inserting '_' before the last token
-                                token = "_" + token;
-                            }
-
-                            className += ("." + token);
-                        }
-                    }
+                    String className = createClassName(ifc_name);
 
                     ifcDesc.EntryType = entryType;
                     ifcDesc.entryName = "ifc" + className;
                     ifcDesc.longName = parent.entryName + "::" + ifc_name;
                 }
+                meth_names.add(methDesc);
 
             }
             catch (java.io.IOException ioe)
@@ -430,6 +405,37 @@ public class APIDescGetter extends DescGetter
 
         return getDescArray(makeArray(ifc_names));
     }
+    private static String createClassName(String _ifc_name)
+    {
+        StringTokenizer st = new StringTokenizer(_ifc_name, ":");
+        String className = "";
+
+        int count = 3;
+
+        if (_ifc_name.startsWith("drafts"))
+        {
+            count = 4;
+        }
+
+        for (int i = 0; st.hasMoreTokens(); i++)
+        {
+            String token = st.nextToken();
+
+            // skipping (drafts.)com.sun.star
+            if (i >= count)
+            {
+                if (!st.hasMoreTokens())
+                {
+                    // inserting '_' before the last token
+                    token = "_" + token;
+                }
+
+                className += ("." + token);
+            }
+        }
+        return className;
+    }
+
     private static String entryType;
 
     private static DescEntry createDescEntry(String meth_name, String ifc_name, DescEntry parent)
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 101681103..4c4e07d8e 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -91,6 +91,7 @@ public class OfficeProvider implements AppProvider
             OfficeWatcherPing owp = new OfficeWatcherPing((OfficeWatcher) param.get(PropertyName.OFFICE_WATCHER));
             owp.start();
 
+            deleteFilesAndDirector (new File(copyLayer));
             FileTools.copyDirectory(new File(userLayer), new File(copyLayer), new String[]
                     {
                         "temp"
@@ -581,6 +582,7 @@ public class OfficeProvider implements AppProvider
                 final String copyLayer = (String) param.get("copyLayer");
                 if (userLayer != null && copyLayer != null)
                 {
+                    deleteFilesAndDirector(new File(userLayer));
                     final File copyFile = new File(copyLayer);
                     dbg("copy '" + copyFile + "' -> '" + userLayer + "'");
                     FileTools.copyDirectory(copyFile, new File(userLayer), new String[]
@@ -823,4 +825,22 @@ public class OfficeProvider implements AppProvider
             }
         }
     }
+
+private void deleteFilesAndDirector(File file)
+        {   
+            File f = file;   
+            if(f.isDirectory())
+            {   
+                File files[] = f.listFiles();   
+                for(int i = 0; i < files.length; i++)
+                {   
+                    deleteFilesAndDirector(files[i]);   
+                }   
+                f.delete();   
+            }
+            else if (f.isFile())
+            {   
+                f.delete();   
+            }   
+        }   
 }
diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java
index eca10a8fa..234a7ca04 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -27,7 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
 package lib;
 
 import com.sun.star.beans.Property;
@@ -71,7 +70,9 @@ import com.sun.star.uno.Type;
  * @see #compare
  * @see #toString(Object)
  */
-public class MultiPropertyTest extends MultiMethodTest {
+public class MultiPropertyTest extends MultiMethodTest
+{
+
     /**
      * Contains a XPropertySet interface of the tested object. Is initialized
      * in MultiMethodTest code.
@@ -82,18 +83,23 @@ public class MultiPropertyTest extends MultiMethodTest {
     /**
      * Overrides super.before() to check the service is supported by the object.
      */
-    protected void before() {
-        XServiceInfo xInfo = (XServiceInfo)UnoRuntime.queryInterface(
+    protected void before()
+    {
+        XServiceInfo xInfo = (XServiceInfo) UnoRuntime.queryInterface(
                 XServiceInfo.class, oObj);
-        
+
         optionalService = entry.isOptional;
 
         String theService = getTestedClassName();
-        if (xInfo != null && !xInfo.supportsService(theService)) {
-            log.println("Service "+theService+" not available");
-            if (optionalService) {
+        if (xInfo != null && !xInfo.supportsService(theService))
+        {
+            log.println("Service " + theService + " not available");
+            if (optionalService)
+            {
                 log.println("This is OK since it is optional");
-            } else {
+            }
+            else
+            {
                 Status.failed(theService + " is not supported");
             }
         }
@@ -107,10 +113,14 @@ public class MultiPropertyTest extends MultiMethodTest {
      *
      * @see #MultiMethodTest.invokeTestMethod()
      */
-    protected void invokeTestMethod(Method meth, String methName) {
-        if (meth != null) {
+    protected void invokeTestMethod(Method meth, String methName)
+    {
+        if (meth != null)
+        {
             super.invokeTestMethod(meth, methName);
-        } else {
+        }
+        else
+        {
             testProperty(methName);
         }
     }
@@ -122,7 +132,9 @@ public class MultiPropertyTest extends MultiMethodTest {
      * each property separately, by providing subclass of PropertyTester
      * and passing it to testProperty(String, PropertyTester method).
      */
-    public class PropertyTester {
+    public class PropertyTester
+    {
+
         /**
          * The method defines the whole process of testing propName
          * property.
@@ -140,37 +152,46 @@ public class MultiPropertyTest extends MultiMethodTest {
          * @result - adds the result of testing propName property to
          *           MultiMethodTest.tRes.
          */
-        protected void testProperty(String propName) {
+        protected void testProperty(String propName)
+        {
             XPropertySetInfo info = oObj.getPropertySetInfo();
 
-            if (!info.hasPropertyByName(propName)) {
-                if (isOptional(propName) || optionalService) {
-                    // skipping optional property test
-                    log.println("Property '" + propName
-                            + "' is optional and not supported");
-                    tRes.tested(propName,true);
-                    return;
-                } else {
-                    // cannot test the property
-                    log.println("Tested XPropertySet does not contain'"
-                            + propName + "' property");
-                    tRes.tested(propName, false);
-                    return;
+            if (info != null)
+            {
+                if (!info.hasPropertyByName(propName))
+                {
+                    if (isOptional(propName) || optionalService)
+                    {
+                        // skipping optional property test
+                        log.println("Property '" + propName + "' is optional and not supported");
+                        tRes.tested(propName, true);
+                        return;
+                    }
+                    else
+                    {
+                        // cannot test the property
+                        log.println("Tested XPropertySet does not contain'" + propName + "' property");
+                        tRes.tested(propName, false);
+                        return;
+                    }
                 }
             }
 
-            try {
+            try
+            {
                 Object oldValue = oObj.getPropertyValue(propName);
 
                 Object newValue;
 
                 // trying to create new value
-                try {
+                try
+                {
                     newValue = getNewValue(propName, oldValue);
-                } catch (java.lang.IllegalArgumentException e) {
+                }
+                catch (java.lang.IllegalArgumentException e)
+                {
                     // skipping test since new value is not available
-                    Status.failed("Cannot create new value for '"
-                            + propName + " : " + e.getMessage());
+                    Status.failed("Cannot create new value for '" + propName + " : " + e.getMessage());
                     return;
                 }
 
@@ -178,20 +199,31 @@ public class MultiPropertyTest extends MultiMethodTest {
                 // to pass it to checkResult method
                 Exception exception = null;
 
-                try {
+                try
+                {
                     log.println("try to set:");
                     log.println("old = " + toString(oldValue));
                     log.println("new = " + toString(newValue));
                     oObj.setPropertyValue(propName, newValue);
-                } catch(IllegalArgumentException e) {
+                }
+                catch (IllegalArgumentException e)
+                {
                     exception = e;
-                } catch(PropertyVetoException e) {
+                }
+                catch (PropertyVetoException e)
+                {
                     exception = e;
-                } catch(WrappedTargetException e) {
+                }
+                catch (WrappedTargetException e)
+                {
                     exception = e;
-                } catch(UnknownPropertyException e) {
+                }
+                catch (UnknownPropertyException e)
+                {
                     exception = e;
-                } catch(RuntimeException e) {
+                }
+                catch (RuntimeException e)
+                {
                     exception = e;
                 }
 
@@ -200,7 +232,9 @@ public class MultiPropertyTest extends MultiMethodTest {
 
                 // checking results
                 checkResult(propName, oldValue, newValue, resValue, exception);
-            } catch (Exception e) {
+            }
+            catch (Exception e)
+            {
                 log.println("Exception occured while testing property '" + propName + "'");
                 e.printStackTrace(log);
                 tRes.tested(propName, false);
@@ -234,130 +268,175 @@ public class MultiPropertyTest extends MultiMethodTest {
          */
         protected void checkResult(String propName, Object oldValue,
                 Object newValue, Object resValue, Exception exception)
-                    throws Exception {
+                throws Exception
+        {
             XPropertySetInfo info = oObj.getPropertySetInfo();
+            if (info == null)
+            {
+                log.println("Can't get XPropertySetInfo for property " + propName);
+                tRes.tested(propName, false);
+                return;
+            }
             Property prop = info.getPropertyByName(propName);
 
             short attr = prop.Attributes;
-            boolean readOnly = (prop.Attributes
-                    & PropertyAttribute.READONLY) != 0;
-            boolean maybeVoid = (prop.Attributes
-                    & PropertyAttribute.MAYBEVOID) != 0;
+            boolean readOnly = (prop.Attributes & PropertyAttribute.READONLY) != 0;
+            boolean maybeVoid = (prop.Attributes & PropertyAttribute.MAYBEVOID) != 0;
             //check get-set methods
-            if (maybeVoid) log.println("Property "+propName+" is void");
-            if (readOnly) log.println("Property "+propName+" is readOnly");
-            if (util.utils.isVoid(oldValue) && !maybeVoid) {
-                log.println(propName
-                        + " is void, but it's not MAYBEVOID");
+            if (maybeVoid)
+            {
+                log.println("Property " + propName + " is void");
+            }
+            if (readOnly)
+            {
+                log.println("Property " + propName + " is readOnly");
+            }
+            if (util.utils.isVoid(oldValue) && !maybeVoid)
+            {
+                log.println(propName + " is void, but it's not MAYBEVOID");
                 tRes.tested(propName, false);
-            } else if (oldValue == null ) {
-                log.println(propName
-                        + " has null value, and therefore can't be changed");
+            }
+            else if (oldValue == null)
+            {
+                log.println(propName + " has null value, and therefore can't be changed");
                 tRes.tested(propName, true);
-            } else if (readOnly) {
+            }
+            else if (readOnly)
+            {
                 // check if exception was thrown
-                if (exception != null) {
-                    if (exception instanceof PropertyVetoException) {
+                if (exception != null)
+                {
+                    if (exception instanceof PropertyVetoException)
+                    {
                         // the change of read only prohibited - OK
                         log.println("Property is ReadOnly and wasn't changed");
                         log.println("Property '" + propName + "' OK");
                         tRes.tested(propName, true);
-                    } else if (exception instanceof IllegalArgumentException) {
+                    }
+                    else if (exception instanceof IllegalArgumentException)
+                    {
                         // the change of read only prohibited - OK
                         log.println("Property is ReadOnly and wasn't changed");
                         log.println("Property '" + propName + "' OK");
                         tRes.tested(propName, true);
-                    } else if (exception instanceof UnknownPropertyException) {
+                    }
+                    else if (exception instanceof UnknownPropertyException)
+                    {
                         // the change of read only prohibited - OK
                         log.println("Property is ReadOnly and wasn't changed");
                         log.println("Property '" + propName + "' OK");
                         tRes.tested(propName, true);
-                    }else if (exception instanceof RuntimeException) {
+                    }
+                    else if (exception instanceof RuntimeException)
+                    {
                         // the change of read only prohibited - OK
                         log.println("Property is ReadOnly and wasn't changed");
                         log.println("Property '" + propName + "' OK");
                         tRes.tested(propName, true);
-                    } else {
+                    }
+                    else
+                    {
                         throw exception;
                     }
-                } else {
+                }
+                else
+                {
                     // if no exception - check that value
                     // has not changed
-                    if (!compare(resValue, oldValue)) {
-                        log.println("Read only property '"
-                                + propName + "' has changed");
-                        try {
-                            if (!util.utils.isVoid(oldValue) 
-                                                && oldValue instanceof Any) {
-                                oldValue = AnyConverter.toObject
-                                        (new Type(((Any)oldValue).getClass()),oldValue);
+                    if (!compare(resValue, oldValue))
+                    {
+                        log.println("Read only property '" + propName + "' has changed");
+                        try
+                        {
+                            if (!util.utils.isVoid(oldValue) && oldValue instanceof Any)
+                            {
+                                oldValue = AnyConverter.toObject(new Type(((Any) oldValue).getClass()), oldValue);
                             }
 //                            log.println("old = " + toString(oldValue));
 //                            log.println("new = " + toString(newValue));
                             log.println("result = " + toString(resValue));
-                        } catch(com.sun.star.lang.IllegalArgumentException iae) {
+                        }
+                        catch (com.sun.star.lang.IllegalArgumentException iae)
+                        {
                             log.println("NOTIFY: this property needs further investigations.");
                             log.println("\t The type seems to be an Any with value of NULL.");
                             log.println("\t Maybe the property should get it's own test method.");
                         }
-                        
+
                         tRes.tested(propName, false);
-                    } else {
-                        log.println("Read only property '"
-                                + propName + "' hasn't changed");
+                    }
+                    else
+                    {
+                        log.println("Read only property '" + propName + "' hasn't changed");
                         log.println("Property '" + propName + "' OK");
                         tRes.tested(propName, true);
                     }
                 }
-            } else {
-                if (exception == null) {
+            }
+            else
+            {
+                if (exception == null)
+                {
                     // if no exception thrown
                     // check that the new value is set
-                    if ((!compare(resValue, newValue)) || (compare(resValue, oldValue))) {
-                        log.println("Value for '" + propName
-                                + "' hasn't changed as expected");
-                        try {
-                            if (!util.utils.isVoid(oldValue) 
-                                            && oldValue instanceof Any) {
-                                oldValue = AnyConverter.toObject
-                                        (new Type(((Any)oldValue).getClass()),oldValue);
+                    if ((!compare(resValue, newValue)) || (compare(resValue, oldValue)))
+                    {
+                        log.println("Value for '" + propName + "' hasn't changed as expected");
+                        try
+                        {
+                            if (!util.utils.isVoid(oldValue) && oldValue instanceof Any)
+                            {
+                                oldValue = AnyConverter.toObject(new Type(((Any) oldValue).getClass()), oldValue);
                             }
 //                            log.println("old = " + toString(oldValue));
 //                            log.println("new = " + toString(newValue));
                             log.println("result = " + toString(resValue));
-                        } catch(com.sun.star.lang.IllegalArgumentException iae) {
+                        }
+                        catch (com.sun.star.lang.IllegalArgumentException iae)
+                        {
                             log.println("NOTIFY: this property needs further investigations.");
                             log.println("\t The type seems to be an Any with value of NULL.");
                             log.println("\t Maybe the property should get it's own test method.");
-                        }                        
-                        if (resValue != null ) {
-                            if ( (!compare(resValue, oldValue)) || (!resValue.equals(oldValue))) {
+                        }
+                        if (resValue != null)
+                        {
+                            if ((!compare(resValue, oldValue)) || (!resValue.equals(oldValue)))
+                            {
                                 log.println("But it has changed.");
                                 tRes.tested(propName, true);
-                            } else {
+                            }
+                            else
+                            {
                                 tRes.tested(propName, false);
                             }
                         }
-                        else {
+                        else
+                        {
                             tRes.tested(propName, false);
                         }
                         //tRes.tested(propName, false);
-                    } else {
+                    }
+                    else
+                    {
                         log.println("Property '" + propName + "' OK");
-                        try {
-                            if (!util.utils.isVoid(oldValue) 
-                                                   && oldValue instanceof Any) {
-                                oldValue = AnyConverter.toObject
-                                        (new Type(((Any)oldValue).getClass()),oldValue);
+                        try
+                        {
+                            if (!util.utils.isVoid(oldValue) && oldValue instanceof Any)
+                            {
+                                oldValue = AnyConverter.toObject(new Type(((Any) oldValue).getClass()), oldValue);
                             }
 //                            log.println("old = " + toString(oldValue));
 //                            log.println("new = " + toString(newValue));
                             log.println("result = " + toString(resValue));
-                        } catch(com.sun.star.lang.IllegalArgumentException iae) {
+                        }
+                        catch (com.sun.star.lang.IllegalArgumentException iae)
+                        {
                         }
                         tRes.tested(propName, true);
                     }
-                } else {
+                }
+                else
+                {
                     throw exception;
                 }
             }
@@ -371,7 +450,8 @@ public class MultiPropertyTest extends MultiMethodTest {
          * when oldValue is null.
          */
         protected Object getNewValue(String propName, Object oldValue)
-                throws java.lang.IllegalArgumentException {
+                throws java.lang.IllegalArgumentException
+        {
             return ValueChanger.changePValue(oldValue);
         }
 
@@ -382,7 +462,8 @@ public class MultiPropertyTest extends MultiMethodTest {
          * which is not apropriate in some cases(e.g., structs with equals
          * not overridden).
          */
-        protected boolean compare(Object obj1, Object obj2) {
+        protected boolean compare(Object obj1, Object obj2)
+        {
             return callCompare(obj1, obj2);
         }
 
@@ -391,7 +472,8 @@ public class MultiPropertyTest extends MultiMethodTest {
          * MultipropertyTest.toString(Object), but subclasses can override
          * to change the behaviour.
          */
-        protected String toString(Object obj) {
+        protected String toString(Object obj)
+        {
             return callToString(obj);
         }
     }
@@ -402,9 +484,11 @@ public class MultiPropertyTest extends MultiMethodTest {
      * class returns one of these two values depending on the
      * old value, so new value is not equal to old value.
      */
-    public class PropertyValueSwitcher extends PropertyTester {
-        Object val1 = null ;
-        Object val2 = null ;
+    public class PropertyValueSwitcher extends PropertyTester
+    {
+
+        Object val1 = null;
+        Object val2 = null;
 
         /**
          * Constructs a property tester with two different values
@@ -415,9 +499,10 @@ public class MultiPropertyTest extends MultiMethodTest {
          * @param val1 Not <code>null</code> value for the property
          * tested which differs from the first value.
          */
-        public PropertyValueSwitcher(Object val1, Object val2) {
-            this.val1 = val1 ;
-            this.val2 = val2 ;
+        public PropertyValueSwitcher(Object val1, Object val2)
+        {
+            this.val1 = val1;
+            this.val2 = val2;
         }
 
         /**
@@ -427,18 +512,24 @@ public class MultiPropertyTest extends MultiMethodTest {
          * @return The second value if old value is equal to the first
          * one, the first value otherwise.
          */
-        protected Object getNewValue(String propName, Object old) {
+        protected Object getNewValue(String propName, Object old)
+        {
             if (ValueComparer.equalValue(val1, old))
-                return val2 ;
+            {
+                return val2;
+            }
             else
-                return val1 ;
+            {
+                return val1;
+            }
         }
     }
 
     /**
      * The method performs testing of propName property using propTester.
      */
-    protected void testProperty(String propName, PropertyTester propTester) {
+    protected void testProperty(String propName, PropertyTester propTester)
+    {
         propTester.testProperty(propName);
     }
 
@@ -446,7 +537,8 @@ public class MultiPropertyTest extends MultiMethodTest {
      * The method performs testing of propName property. It uses PropertyTester
      * instance for testing.
      */
-    protected void testProperty(String propName) {
+    protected void testProperty(String propName)
+    {
         testProperty(propName, new PropertyTester());
     }
 
@@ -456,7 +548,8 @@ public class MultiPropertyTest extends MultiMethodTest {
      *
      * @see #PropertyValueSwitcher
      */
-    protected void testProperty(String propName, Object val1, Object val2) {
+    protected void testProperty(String propName, Object val1, Object val2)
+    {
         testProperty(propName, new PropertyValueSwitcher(val1, val2));
     }
 
@@ -464,14 +557,16 @@ public class MultiPropertyTest extends MultiMethodTest {
      * The method just calls compare. This is a workaround to CodeWarrior's
      * compiler bug.
      */
-    private boolean callCompare(Object obj1, Object obj2) {
+    private boolean callCompare(Object obj1, Object obj2)
+    {
         return compare(obj1, obj2);
     }
 
     /**
      * Compares two object. In the implementation calls obj1.equals(obj2).
      */
-    protected boolean compare(Object obj1, Object obj2) {
+    protected boolean compare(Object obj1, Object obj2)
+    {
         return ValueComparer.equalValue(obj1, obj2);
     }
 
@@ -479,7 +574,8 @@ public class MultiPropertyTest extends MultiMethodTest {
      * The method just calls toString. This is a workaround to
      * CodeWarrior's compiler bug.
      */
-    private String callToString(Object obj) {
+    private String callToString(Object obj)
+    {
         return toString(obj);
     }
 
@@ -487,7 +583,8 @@ public class MultiPropertyTest extends MultiMethodTest {
      * Gets string representation of the obj. In the implementation
      * returns obj.toString().
      */
-    protected String toString(Object obj) {
+    protected String toString(Object obj)
+    {
         return obj == null ? "null" : obj.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java
index 2176f46c3..8ab9a7a23 100644
--- a/qadevOOo/runner/lib/TestParameters.java
+++ b/qadevOOo/runner/lib/TestParameters.java
@@ -161,13 +161,13 @@ public class TestParameters extends Hashtable {
      * This parameter contains the timeout used<br>
      * by the watcher
      */
-    public Integer TimeOut = new Integer(30000);
+    public Integer TimeOut = new Integer(3000000);
 
     /*
      * This parameter contains the timeout used<br>
      * by the complex tests
      */
-    public Integer ThreadTimeOut = new Integer(30000);
+    public Integer ThreadTimeOut = new Integer(3000000);
 
     /*
      * This parameter contains the time which the office could use to close for
diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java
index 75a6d20a4..f716abfce 100644
--- a/qadevOOo/runner/org/openoffice/Runner.java
+++ b/qadevOOo/runner/org/openoffice/Runner.java
@@ -187,7 +187,7 @@ public class Runner
 
     public static void main(String[] args)
     {
-        System.out.println("OOoRunner Main()");
+        System.out.println("OOoRunner Main() version from 20090825 (yyyymmdd)");
 
         setStartTime(getTime());
 
diff --git a/qadevOOo/runner/util/DesktopTools.java b/qadevOOo/runner/util/DesktopTools.java
index 561536c06..3507a8a08 100644
--- a/qadevOOo/runner/util/DesktopTools.java
+++ b/qadevOOo/runner/util/DesktopTools.java
@@ -317,22 +317,22 @@ public class DesktopTools
         }
         catch (com.sun.star.util.CloseVetoException e)
         {
-            e.printStackTrace();
+            // e.printStackTrace();
             System.out.println("Couldn't close document");
         }
         catch (com.sun.star.lang.DisposedException e)
         {
-            e.printStackTrace();
+            // e.printStackTrace();
             System.out.println("Couldn't close document");
         }
         catch (java.lang.NullPointerException e)
         {
-            e.printStackTrace();
+            // e.printStackTrace();
             System.out.println("Couldn't close document");
         }
         catch (com.sun.star.beans.PropertyVetoException e)
         {
-            e.printStackTrace();
+            // e.printStackTrace();
             System.out.println("Couldn't close document");
         }
     }
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 8e64894c4..eba35f6bf 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -1248,7 +1248,7 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel)
             uno::makeAny( sal_True ), beans::PropertyState_DIRECT_VALUE );
         aArgs[2] = beans::PropertyValue(
             ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1,
-            uno::makeAny( sal_False ), beans::PropertyState_DIRECT_VALUE );
+            uno::makeAny( sal_True ), beans::PropertyState_DIRECT_VALUE );
         aArgs[3] = beans::PropertyValue(
             ::rtl::OUString::createFromAscii("DataRowSource"), -1,
             uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE );
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 529578226..d5b11a647 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -363,7 +363,7 @@ namespace
         _rItemSet.Put(aHorJustifyItem);
         //_rItemSet.Put(SfxInt32Item(ITEMID_DEGREES,_rxReportControlFormat->getCharRotation()));
         SvxVerJustifyItem aVerJustifyItem(ITEMID_VERJUSTIFY);
-        aVerJustifyItem.PutValue(xSet->getPropertyValue(PROPERTY_VERTICALALIGN),0);
+        aVerJustifyItem.PutValue(xSet->getPropertyValue(PROPERTY_VERTICALALIGN),MID_HORJUST_ADJUST);
         _rItemSet.Put(aVerJustifyItem);
         //_rItemSet.Put(SfxInt32Item(ITEMID_IDENT,_rxReportControlFormat->getCharRotation()));
 
@@ -489,7 +489,7 @@ namespace
         {
             const SvxVerJustifyItem* pJustifyItem = static_cast<const SvxVerJustifyItem*>(pItem);
             uno::Any aValue;
-            pJustifyItem->QueryValue(aValue,0);
+            pJustifyItem->QueryValue(aValue,MID_HORJUST_ADJUST);
             lcl_pushBack( _out_rProperties, PROPERTY_VERTICALALIGN, aValue );
         }
         if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_CHARRELIEF,sal_True,&pItem) && pItem->ISA(SvxCharReliefItem))
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index ecfb41943..8cba08853 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -223,6 +223,8 @@ void SAL_CALL OStatusbarController::update() throw ( RuntimeException )
 // XComponent
 void SAL_CALL OStatusbarController::dispose() throw (::com::sun::star::uno::RuntimeException)
 {
+    Reference< XComponent > xComp( m_pController.getRef(), UNO_QUERY );
+    ::comphelper::disposeComponent(xComp);
     m_pController.dispose();
     svt::StatusbarController::dispose();
 }
diff --git a/sal/osl/all/makefile.mk b/sal/osl/all/makefile.mk
index 6bed1c53c..bbb46b89d 100644
--- a/sal/osl/all/makefile.mk
+++ b/sal/osl/all/makefile.mk
@@ -57,18 +57,20 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 SLOFILES=	\
             $(SLO)$/utility.obj\
-            $(SLO)$/readline.obj\
             $(SLO)$/filepath.obj\
             $(SLO)$/debugbase.obj\
             $(SLO)$/loadmodulerelative.obj
 
+#			$(SLO)$/readline.obj\
+
 #.IF "$(UPDATER)"=="YES"
 OBJFILES=	\
             $(OBJ)$/utility.obj\
-            $(OBJ)$/readline.obj\
             $(OBJ)$/filepath.obj\
             $(OBJ)$/debugbase.obj\
             $(OBJ)$/loadmodulerelative.obj
+
+#			$(OBJ)$/readline.obj\
 #.ENDIF
 
 # --- Targets ------------------------------------------------------
diff --git a/sal/osl/all/readline.c b/sal/osl/all/readline.c
deleted file mode 100644
index e5baa4f96..000000000
--- a/sal/osl/all/readline.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: readline.c,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <osl/diagnose.h>
-#include <osl/file.h>
-#include <rtl/byteseq.h>
-#include <rtl/alloc.h>
-
-
-/* Test cases:
-
-    1.	A file without line ends
-    2.	A file with lines longer than the initial buffer size
-    3.	An empty file
-    4.	
-*/
-
-/** Some defines     
-*/
-#define CR 0x0D
-#define LF 0x0A
-
-#define INITIAL_BUFF_SIZE  80
-#define BUFFER_GROW_FACTOR 2 
-#define READ_BLOCK_SIZE (INITIAL_BUFF_SIZE - 1)
-
-/** Helper data and function
-*/    
-
-struct _Buffer
-{
-    sal_Char*	m_pMem;
-    sal_uInt64  m_Capacity;           /* elements possible in buffer */
-    sal_uInt64  m_Size;               /* elements actually in buffer */
-    sal_uInt64  m_ActiveSectionStart; /* buffer was lastly filled from here to
-                                         (m_Size - 1) */
-};
-
-typedef struct _Buffer Buffer;
-
-
-/** Allocate the memory of the buffer
-    @Returns	sal_True on succes
-*/
-static sal_Bool AllocateBuffer(Buffer* pBuffer, sal_uInt64 Capacity)
-{
-    sal_Bool rc = sal_False;
-    
-    OSL_ASSERT(pBuffer);
-        
-    pBuffer->m_pMem = (sal_Char*)rtl_allocateZeroMemory((sal_uInt32)Capacity);
-    if (pBuffer->m_pMem)
-    {
-        pBuffer->m_Capacity = Capacity;
-        pBuffer->m_Size = 0;
-        pBuffer->m_ActiveSectionStart = 0;
-        rc = sal_True;
-    }    
-    
-    return rc;
-}
-
-/** Release the memory occupied by the buffer 
-*/
-static void FreeBuffer(Buffer* pBuffer)
-{
-    OSL_ASSERT(pBuffer);
-    
-    rtl_freeMemory(pBuffer->m_pMem);
-    pBuffer->m_pMem  = 0;
-    pBuffer->m_Capacity = 0;
-    pBuffer->m_Size   = 0;
-    pBuffer->m_ActiveSectionStart = 0;
-}
-
-/** Grow the buffer by the specified factor (usually doubling
-    the buffer size)
-    In case of failure, growing the buffer, the original buffer
-    stays untouched
-
-    @Returns	sal_True on success	
-*/
-static sal_Bool GrowBuffer(Buffer* pBuffer, size_t factor)
-{
-    sal_Bool rc = sal_False;
-    void*	 p;
-    
-    OSL_ASSERT(pBuffer);
-    
-    p = rtl_reallocateMemory(
-        pBuffer->m_pMem, (sal_uInt32)(pBuffer->m_Capacity * factor));
-    if (p)
-    {
-        pBuffer->m_pMem		 = (sal_Char*)p;
-        pBuffer->m_Capacity *= factor;
-        rc					 = sal_True;
-    }
-    
-    return rc;
-}
-
-/** Read n bytes from file into buffer, 
-    grow the buffer if necessary
-
-    @Returns osl_File_E_None on success else
-    an error code
-*/
-static oslFileError ReadFromFile(oslFileHandle hFile, Buffer* pBuffer, sal_uInt64 Requested, sal_uInt64* pRead)
-{
-    oslFileError rc;
-    
-    OSL_ASSERT(pBuffer);
-    OSL_ASSERT(hFile);
-    OSL_ASSERT(pRead);
-    
-    if (((pBuffer->m_Size + Requested) > pBuffer->m_Capacity) &&
-        !GrowBuffer(pBuffer, BUFFER_GROW_FACTOR))
-        return osl_File_E_NOMEM;
-    
-    pBuffer->m_ActiveSectionStart = pBuffer->m_Size;
-
-    rc = osl_readFile(
-        hFile, 
-        pBuffer->m_pMem + pBuffer->m_ActiveSectionStart, 
-        Requested, 
-        pRead);
-    
-    if (osl_File_E_None == rc)
-        pBuffer->m_Size += *pRead;
-    
-    return rc; 
-}
-
-/** Makes a sequence from the given buffer and release the memory
-    occupied by the buffer
-*/
-static void MakeSequenceFreeBuffer(sal_Sequence** ppSequence, Buffer* pBuffer, sal_uInt64 Length)
-{
-    OSL_ASSERT(ppSequence);
-    OSL_ASSERT(pBuffer);
-    OSL_ASSERT(Length <= pBuffer->m_Capacity);
-    
-    rtl_byte_sequence_constructFromArray(ppSequence, (sal_Int8*)pBuffer->m_pMem, (sal_Int32)Length);           
-    FreeBuffer(pBuffer);
-}
-
-/** Handle occurence of LF character:
-    construct a sequence from buffer
-    correct file pointer (maybe we have read more than necessary)
-
-    @Returns osl_File_E_None on success else
-    an error code
-*/
-static oslFileError HandleLFFreeBuffer(oslFileHandle hFile, sal_Sequence** ppSequence, Buffer* pBuffer, sal_uInt64 Pos)
-{    
-    sal_Int64    offset = 0;
-    oslFileError rc     = osl_File_E_None;
-    
-    OSL_ASSERT(hFile);
-    OSL_ASSERT(pBuffer);
-    OSL_ASSERT(LF == pBuffer->m_pMem[Pos]);
-  
-    /* correct file pointer pos in case we have read to far */
-    offset = pBuffer->m_Size - (Pos + 1);
-    rc = osl_setFilePos(hFile, osl_Pos_Current, -offset);
-    
-    if (osl_File_E_None == rc)
-        MakeSequenceFreeBuffer(ppSequence, pBuffer, Pos);
-    else
-        FreeBuffer(pBuffer);
-
-    return rc;
-}
-
-/** Handle occurence of CR character
-    construct a sequence from buffer
-    correct file pointer (maybe we have read more than necessary)
-
-    @Returns osl_File_E_None on success else
-    an error code
-*/
-static oslFileError HandleCRFreeBuffer(oslFileHandle hFile, sal_Sequence** ppSequence, Buffer* pBuffer, sal_uInt64 Pos)
-{
-    sal_Int64    offset = 0;    
-    sal_uInt64   nread  = 0;
-    oslFileError rc     = osl_File_E_None;
-
-    OSL_ASSERT(hFile);
-    OSL_ASSERT(pBuffer);
-    OSL_ASSERT(CR == pBuffer->m_pMem[Pos]);
-    
-    if (Pos == (pBuffer->m_Size - 1))
-    {
-        /*	only need to check if the next byte is a LF 
-            that's why reading only one byte from file */
-        rc = ReadFromFile(hFile, pBuffer, 1, &nread);
-        
-        if (osl_File_E_None != rc)
-        {
-            FreeBuffer(pBuffer);
-            return rc;
-        }
-        else if (0 == nread)
-        {       
-            MakeSequenceFreeBuffer(ppSequence, pBuffer, Pos);            
-            return osl_File_E_None;
-        }
-    }
-
-    if (LF == pBuffer->m_pMem[Pos + 1])                
-        Pos++;
-    
-    /* correct the file pointer */
-    offset = pBuffer->m_Size - (Pos + 1);    
-    rc = osl_setFilePos(hFile, osl_Pos_Current, -offset);
-
-    if (osl_File_E_None == rc)
-        MakeSequenceFreeBuffer(ppSequence, pBuffer, Pos - 1);
-    else
-        FreeBuffer(pBuffer);
-    
-    return rc;
-}
-
-/***************************************************************************
-    osl_readLine (platform independent)                                     
-    Reads a line from given file. The new line delimiter(s) are NOT returned!
-    Valid line ends: \n, \r\n or \r
-
-    @param	Handle [in] Handle to an open file.
-    @param	ppSequence [in/out] a pointer to a valid sequence. 
-    
-    @return osl_File_E_None on success otherwise one of the following errorcodes:<p> 
-
-    osl_File_E_INVAL		the format of the parameters was not valid<br>
-    osl_File_E_NOMEM        the necessary memory could not be allocated
-****************************************************************************/
-
-oslFileError SAL_CALL osl_readLine(oslFileHandle Handle, sal_Sequence** ppSeq)
-{
-    oslFileError rc;    
-    sal_uInt64   nread = 0;
-    Buffer       line_buffer;
-    sal_uInt64       pos;
-    
-    OSL_PRECOND(Handle, "invalid handle");
-    OSL_PRECOND(ppSeq,  "invalid parameter detected");
-
-    if (!AllocateBuffer(&line_buffer, INITIAL_BUFF_SIZE))
-        return osl_File_E_NOMEM;
-
-    for(;;)
-    {                       
-        rc = ReadFromFile(Handle, &line_buffer, READ_BLOCK_SIZE, &nread);
-
-        if (osl_File_E_None != rc)
-        {
-            FreeBuffer(&line_buffer);
-            return rc;
-        }
-        else if (0 == nread)
-        {
-            /* EOF */
-            nread = line_buffer.m_Size;
-            MakeSequenceFreeBuffer(ppSeq, &line_buffer, nread);
-            if (0 < nread)
-                return osl_File_E_None;
-            else
-                return osl_File_E_AGAIN;
-        }
-         
-        /* scan buffer for line end */
-        for (pos = line_buffer.m_ActiveSectionStart; pos < line_buffer.m_Size; pos++)
-        {
-            switch(line_buffer.m_pMem[pos])
-            {
-            case LF:
-                return HandleLFFreeBuffer(Handle, ppSeq, &line_buffer, pos);
-            case CR:
-                return HandleCRFreeBuffer(Handle, ppSeq, &line_buffer, pos);
-            }            
-        }
-    } /* end for */
-}   
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
dissimilarity index 87%
index f15f6bd37..28cc35831 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1,3748 +1,1343 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: file.cxx,v $
- * $Revision: 1.21 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
-
-/************************************************************************
- *   ToDo
- *
- *   Fix osl_getCanonicalName
- *
- *   - Fix: check for corresponding struct sizes in exported functions
- *   - check size/use of oslDirectory
- *   - check size/use of oslDirectoryItem
- *   - check size/use of oslFileStatus
- *   - check size/use of oslVolumeDeviceHandle
- *   - check size/use of oslVolumeInfo
- *   - check size/use of oslFileHandle
- ***********************************************************************/
-
-#include <algorithm>
-#include <limits>
-#include "system.h"
-#include <rtl/alloc.h>
-
-#include "osl/file.hxx"
-
-
-#include <sal/types.h>
-#include <osl/thread.h>
-#include <osl/diagnose.h>
-#include "file_error_transl.h"
-#include <osl/time.h>
-
-#ifndef _FILE_URL_H_
-#include "file_url.h"
-#endif
-
-#include "file_path_helper.hxx"
-#include "uunxapi.hxx"
-
-
-#include <sys/mman.h>
-
-#ifdef HAVE_STATFS_H
-#undef HAVE_STATFS_H
-#endif
-
-#ifndef	_STRING_H
-#include <string.h>
-#endif
-
-#if defined(SOLARIS)
-#include <sys/mnttab.h>
-#include <sys/statvfs.h>
-#define  HAVE_STATFS_H
-#include <sys/fs/ufs_quota.h>
-static const sal_Char* MOUNTTAB="/etc/mnttab";
-
-#elif defined(LINUX)
-#include <mntent.h>
-#include <sys/vfs.h>
-#define  HAVE_STATFS_H
-#include <sys/quota.h>
-#include <ctype.h>
-static const sal_Char* MOUNTTAB="/etc/mtab";
-
-#elif defined(NETBSD) || defined(FREEBSD)
-#include <sys/param.h>
-#include <sys/ucred.h>
-#include <sys/mount.h>
-#include <ufs/ufs/quota.h>
-#include <ctype.h>
-#define  HAVE_STATFS_H
-/* No mounting table on *BSD
- * This information is stored only in the kernel. */
-/* static const sal_Char* MOUNTTAB="/etc/mtab"; */
-
-#elif defined(IRIX)
-#include <mntent.h>
-#include <sys/mount.h>
-#include <sys/statvfs.h>
-#define  HAVE_STATFS_H
-#include <sys/quota.h>
-#include <ctype.h>
-static const sal_Char* MOUNTTAB="/etc/mtab";
-
-#elif defined(MACOSX)
-#include <ufs/ufs/quota.h>
-#include <ctype.h>
-// static const sal_Char* MOUNTTAB="/etc/mtab";
-
-#include <sys/param.h>
-#include <sys/mount.h>
-#define HAVE_STATFS_H
-#define HAVE_O_EXLOCK
-
-// add MACOSX Time Value
-
-#define TimeValue CFTimeValue
-#include <CoreFoundation/CoreFoundation.h>
-#undef TimeValue
-
-#endif
-
-#ifdef _DIRENT_HAVE_D_TYPE
-#include "file_impl.hxx"
-    oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType )
-    {
-        oslDirectoryItemImpl *pItemObject = (oslDirectoryItemImpl*) malloc( sizeof( oslDirectoryItemImpl ) );
-        pItemObject->RefCount = 1;
-        pItemObject->bHasType = _bHasDType;
-        pItemObject->DType = _DType;
-        pItemObject->ustrFilePath = _ustrFilePath;
-
-        return pItemObject;
-    }
-
-    void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem )
-    {
-        if( pItem->ustrFilePath ) {
-            rtl_uString_release( pItem->ustrFilePath );
-            pItem->ustrFilePath = NULL;
-        }
-        free( pItem );
-    }
-
-    void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem )
-    {
-        pItem->RefCount ++;
-    }
-
-    void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem )
-    {
-        pItem->RefCount --;
-
-        if( pItem->RefCount <= 0 )
-            oslDirectoryItemImpl_Destroy( pItem );
-    }
-#endif
-
-#if OSL_DEBUG_LEVEL > 1
-
-    extern void debug_ustring(rtl_uString*);
-
-#endif
-
-
-#ifdef DEBUG_OSL_FILE
-#	define PERROR( a, b ) perror( a ); fprintf( stderr, b )
-#else
-#	define PERROR( a, b )
-#endif
-
-extern "C" oslFileHandle osl_createFileHandleFromFD( int fd );
-
-/******************************************************************************
- *
- *                  Data Type Definition
- *
- ******************************************************************************/
-
-#if 0
-/* FIXME: reintroducing this may save some extra bytes per Item */
-typedef struct
-{
-    rtl_uString* ustrFileName;       /* holds native file name */
-    rtl_uString* ustrDirPath;        /* holds native dir path */
-    sal_uInt32   RefCount;
-} oslDirectoryItemImpl;
-#endif
-
-typedef struct
-{
-    rtl_uString* ustrPath;           /* holds native directory path */
-    DIR*         pDirStruct;
-} oslDirectoryImpl;
-
-
-typedef struct
-{
-    rtl_uString* ustrFilePath;      /* holds native file path */
-    int fd;
-    sal_Bool bLocked;
-} oslFileHandleImpl;
-
-
-typedef struct _oslVolumeDeviceHandleImpl
-{
-    sal_Char pszMountPoint[PATH_MAX];
-    sal_Char pszFilePath[PATH_MAX];
-    sal_Char pszDevice[PATH_MAX];
-    sal_Char ident[4];
-    sal_uInt32   RefCount;
-} oslVolumeDeviceHandleImpl;
-
-
-/******************************************************************************
- *
- *                  static members
- *
- *****************************************************************************/
-
-static const char * pFileLockEnvVar = (char *) -1;
-
-
-/******************************************************************************
- *
- *                  C-String Function Declarations
- *
- *****************************************************************************/
-
-static oslFileError osl_psz_getVolumeInformation(const sal_Char* , oslVolumeInfo* pInfo, sal_uInt32 uFieldMask);
-static oslFileError osl_psz_removeFile(const sal_Char* pszPath);
-static oslFileError osl_psz_createDirectory(const sal_Char* pszPath);
-static oslFileError osl_psz_removeDirectory(const sal_Char* pszPath);
-static oslFileError osl_psz_copyFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
-static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
-static oslFileError osl_psz_setFileAttributes(const sal_Char* pszFilePath, sal_uInt64 uAttributes);
-static oslFileError osl_psz_setFileTime(const sal_Char* strFilePath, const TimeValue* pCreationTime, const TimeValue* pLastAccessTime, const TimeValue* pLastWriteTime);
-
-
-/******************************************************************************
- *
- *                  Static Module Utility Function Declarations
- *
- *****************************************************************************/
-
-static oslFileError  oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, mode_t nMode, size_t nSourceSize, int DestFileExists);
-static oslFileError  oslChangeFileModes(const sal_Char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID);
-static int           oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName);
-static int           oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode);
-static oslFileError  oslDoMoveFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
-static rtl_uString*  oslMakeUStrFromPsz(const sal_Char* pszStr,rtl_uString** uStr);
-
-/******************************************************************************
- *
- *                  Non-Static Utility Function Declarations
- *
- *****************************************************************************/
-
-extern "C" int UnicodeToText( char *, size_t, const sal_Unicode *, sal_Int32 );
-extern "C" int TextToUnicode(
-    const char* text, size_t text_buffer_size,	sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
-
-/******************************************************************************
- *
- *                  'removeable device' aka floppy functions
- *
- *****************************************************************************/
-
-static oslVolumeDeviceHandle  osl_isFloppyDrive(const sal_Char* pszPath);
-static oslFileError   osl_mountFloppy(oslVolumeDeviceHandle hFloppy);
-static oslFileError   osl_unmountFloppy(oslVolumeDeviceHandle hFloppy);
-
-
-#if defined(SOLARIS)
-static sal_Bool       osl_isFloppyMounted(sal_Char* pszPath, sal_Char* pszMountPath);
-static sal_Bool       osl_getFloppyMountEntry(const sal_Char* pszPath, sal_Char* pBuffer);
-static sal_Bool       osl_checkFloppyPath(sal_Char* pszPath, sal_Char* pszFilePath, sal_Char* pszDevicePath);
-#endif
-
-#if defined(LINUX)
-static sal_Bool       osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice);
-static sal_Bool       osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem);
-#endif
-
-
-#if defined(IRIX)
-static sal_Bool       osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice);
-static sal_Bool       osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem);
-#endif
-
-#ifdef DEBUG_OSL_FILE
-static void           osl_printFloppyHandle(oslVolumeDeviceHandleImpl* hFloppy);
-#endif
-
-#ifdef MACOSX
-
-/*******************************************************************
- *	adjustLockFlags
- ******************************************************************/
-
-/* The AFP implementation of MacOS X 10.4 treats O_EXLOCK in a way 
- * that makes it impossible for OOo to create a backup copy of the
- * file it keeps opened. OTOH O_SHLOCK for AFP behaves as desired by
- * the OOo file handling, so we need to check the path of the file
- * for the filesystem name.
- */
- 
-static int adjustLockFlags(const char * path, int flags)
-{
-    struct statfs s;
-  
-    if( 0 <= statfs( path, &s ) )
-    {
-        if( 0 == strncmp("afpfs", s.f_fstypename, 5) )
-        {
-            flags &= ~O_EXLOCK;
-            flags |= O_SHLOCK;
-        }    
-        else
-        {
-            /* Needed flags to allow opening a webdav file */
-            flags &= ~( O_EXLOCK | O_SHLOCK );
-        }
-    }
-
-    return flags;
-}
-
-#endif
-
-
-/*******************************************************************
- *	osl_openDirectory
- ******************************************************************/
-
-oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirectory* pDirectory)
-{
-    rtl_uString* ustrSystemPath = NULL;
-    oslFileError eRet;
-
-    char path[PATH_MAX];
-
-    OSL_ASSERT(ustrDirectoryURL && (ustrDirectoryURL->length > 0));
-    OSL_ASSERT(pDirectory);
-
-    if (0 == ustrDirectoryURL->length )
-        return osl_File_E_INVAL;
-
-    /* convert file URL to system path */
-    eRet = osl_getSystemPathFromFileURL_Ex(ustrDirectoryURL, &ustrSystemPath, sal_False);
-
-    if( osl_File_E_None != eRet )
-        return eRet;
-
-    osl_systemPathRemoveSeparator(ustrSystemPath);
-
-    /* convert unicode path to text */
-    if ( UnicodeToText( path, PATH_MAX, ustrSystemPath->buffer, ustrSystemPath->length ) 
-#ifdef MACOSX 
-     && macxp_resolveAlias( path, PATH_MAX ) == 0 
-#endif /* MACOSX */
-     )
-    {
-        /* open directory */
-        DIR *pdir = opendir( path );
-
-        if( pdir )
-        {
-            /* create and initialize impl structure */
-            oslDirectoryImpl* pDirImpl = (oslDirectoryImpl*) rtl_allocateMemory( sizeof(oslDirectoryImpl) );
-
-            if( pDirImpl )
-            {
-                pDirImpl->pDirStruct = pdir;
-                pDirImpl->ustrPath = ustrSystemPath;
-
-                *pDirectory = (oslDirectory) pDirImpl;
-                return osl_File_E_None;
-            }
-            else
-            {
-                errno = ENOMEM;
-                closedir( pdir );
-            }
-        }
-        else
-        {
-            /* should be removed by optimizer in product version */
-            PERROR( "osl_openDirectory", path );
-        }
-    }
-
-    rtl_uString_release( ustrSystemPath );
-
-    return oslTranslateFileError(OSL_FET_ERROR, errno);
-}
-
-/****************************************************************************/
-/*	osl_closeDirectory */
-/****************************************************************************/
-
-oslFileError SAL_CALL osl_closeDirectory( oslDirectory Directory )
-{
-    oslDirectoryImpl* pDirImpl = (oslDirectoryImpl*) Directory;
-    oslFileError err = osl_File_E_None;
-
-    OSL_ASSERT( Directory );
-
-    if( NULL == pDirImpl )
-        return osl_File_E_INVAL;
-
-    /* close directory */
-    if( closedir( pDirImpl->pDirStruct ) )
-    {
-        err = oslTranslateFileError(OSL_FET_ERROR, errno);
-    }
-
-    /* cleanup members */
-    rtl_uString_release( pDirImpl->ustrPath );
-
-    rtl_freeMemory( pDirImpl );
-
-    return err;
-}
-
-/**********************************************
- * osl_readdir_impl_
- *
- * readdir wrapper, filters out "." and ".."
- * on request
- *********************************************/
-
-static struct dirent* osl_readdir_impl_(DIR* pdir, sal_Bool bFilterLocalAndParentDir)
-{
-    struct dirent* pdirent;
-
-    while ((pdirent = readdir(pdir)) != NULL)
-    {
-        if (bFilterLocalAndParentDir &&
-            ((0 == strcmp(pdirent->d_name, ".")) || (0 == strcmp(pdirent->d_name, ".."))))
-            continue;
-        else
-            break;
-    }
-
-    return pdirent;
-}
-
-/****************************************************************************
- *	osl_getNextDirectoryItem
- ***************************************************************************/
-
-oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem* pItem, sal_uInt32 /*uHint*/)
-{
-    oslDirectoryImpl* pDirImpl     = (oslDirectoryImpl*)Directory;
-    rtl_uString*      ustrFileName = NULL;
-    rtl_uString*      ustrFilePath = NULL;
-    struct dirent*    pEntry;
-
-    OSL_ASSERT(Directory);
-    OSL_ASSERT(pItem);
-
-    if ((NULL == Directory) || (NULL == pItem))
-        return osl_File_E_INVAL;
-
-    pEntry = osl_readdir_impl_(pDirImpl->pDirStruct, sal_True);
-
-    if (NULL == pEntry)
-        return osl_File_E_NOENT;
-
-
-#if defined(MACOSX)
-
-    // convert decomposed filename to precomposed unicode 
-    char composed_name[BUFSIZ];  
-    CFMutableStringRef strRef = CFStringCreateMutable (NULL, 0 );
-    CFStringAppendCString( strRef, pEntry->d_name, kCFStringEncodingUTF8 );  //UTF8 is default on Mac OSX
-    CFStringNormalize( strRef, kCFStringNormalizationFormC );
-    CFStringGetCString( strRef, composed_name, BUFSIZ, kCFStringEncodingUTF8 );
-    CFRelease( strRef );
-    rtl_string2UString( &ustrFileName, composed_name, strlen( composed_name),
-    osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-
-#else  // not MACOSX
-    /* convert file name to unicode */
-    rtl_string2UString( &ustrFileName, pEntry->d_name, strlen( pEntry->d_name ),
-        osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-    OSL_ASSERT(ustrFileName != 0);
-
-#endif
-
-    osl_systemPathMakeAbsolutePath(pDirImpl->ustrPath, ustrFileName, &ustrFilePath);
-    rtl_uString_release( ustrFileName );
-
-#ifdef _DIRENT_HAVE_D_TYPE
-    if(*pItem)
-        oslDirectoryItemImpl_release( ( oslDirectoryItemImpl* )( *pItem ) );
-
-     *pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrFilePath, true, pEntry->d_type );
-#else
-     /* use path as directory item */
-     *pItem = (oslDirectoryItem) ustrFilePath;
-#endif
-
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*	osl_getDirectoryItem */
-/****************************************************************************/
-
-oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirectoryItem* pItem )
-{
-    rtl_uString* ustrSystemPath = NULL;
-    oslFileError osl_error      = osl_File_E_INVAL;
-
-    OSL_ASSERT(ustrFileURL);
-    OSL_ASSERT(pItem);
-
-    if (0 == ustrFileURL->length || NULL == pItem)
-        return osl_File_E_INVAL;
-
-    osl_error = osl_getSystemPathFromFileURL_Ex(ustrFileURL, &ustrSystemPath, sal_False);
-
-    if (osl_File_E_None != osl_error)
-        return osl_error;
-
-    osl_systemPathRemoveSeparator(ustrSystemPath);
-
-    if (0 == access_u(ustrSystemPath, F_OK))
-    {
-#ifdef _DIRENT_HAVE_D_TYPE
-        *pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrSystemPath, false );
-#else
-        *pItem = (oslDirectoryItem)ustrSystemPath;
-#endif
-        osl_error = osl_File_E_None;
-    }
-    else
-    {
-        osl_error = oslTranslateFileError(OSL_FET_ERROR, errno);
-        rtl_uString_release(ustrSystemPath);
-    }
-    return osl_error;
-}
-
-
-/****************************************************************************/
-/*	osl_acquireDirectoryItem */
-/****************************************************************************/
-
-oslFileError osl_acquireDirectoryItem( oslDirectoryItem Item )
-{
-#ifdef _DIRENT_HAVE_D_TYPE
-    oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
-#else
-    rtl_uString* ustrFilePath = (rtl_uString *) Item;
-#endif
-
-    OSL_ASSERT( Item );
-
-#ifdef _DIRENT_HAVE_D_TYPE
-    if( pImpl )
-        oslDirectoryItemImpl_acquire( pImpl );
-#else
-    if( ustrFilePath )
-        rtl_uString_acquire( ustrFilePath );
-#endif
-
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*	osl_releaseDirectoryItem */
-/****************************************************************************/
-
-oslFileError osl_releaseDirectoryItem( oslDirectoryItem Item )
-{
-#ifdef _DIRENT_HAVE_D_TYPE
-    oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
-#else
-    rtl_uString* ustrFilePath = (rtl_uString *) Item;
-#endif
-
-    OSL_ASSERT( Item );
-
-#ifdef _DIRENT_HAVE_D_TYPE
-    if( pImpl )
-        oslDirectoryItemImpl_release( pImpl );
-#else
-    if( ustrFilePath )
-        rtl_uString_release( ustrFilePath );
-#endif
-
-    return osl_File_E_None;
-}
-
-/****************************************************************************
- *	osl_createFileHandleFromFD
- ***************************************************************************/
-
-oslFileHandle osl_createFileHandleFromFD( int fd )
-{
-    oslFileHandleImpl* pHandleImpl = NULL;
-
-    if ( fd >= 0 )
-    {
-        pHandleImpl = (oslFileHandleImpl*) rtl_allocateMemory( sizeof(oslFileHandleImpl) );
-
-        if( pHandleImpl )
-        {
-            pHandleImpl->ustrFilePath = NULL;
-            rtl_uString_new( &pHandleImpl->ustrFilePath );
-            pHandleImpl->fd = fd;
-
-            /* FIXME: it should be detected whether the file has been locked */
-            pHandleImpl->bLocked = sal_True;
-        }
-    }
-
-    return (oslFileHandle)pHandleImpl;
-}
-
-
-/****************************************************************************
- *	osl_openFile
- ***************************************************************************/
-
-#ifdef HAVE_O_EXLOCK
-#define OPEN_WRITE_FLAGS ( O_RDWR | O_EXLOCK | O_NONBLOCK )
-#define OPEN_CREATE_FLAGS ( O_CREAT | O_EXCL | O_RDWR | O_EXLOCK | O_NONBLOCK )
-#else
-#define OPEN_WRITE_FLAGS ( O_RDWR )
-#define OPEN_CREATE_FLAGS ( O_CREAT | O_EXCL | O_RDWR )
-#endif
-
-oslFileError osl_openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, sal_uInt32 uFlags )
-{
-    oslFileHandleImpl* pHandleImpl = NULL;
-    oslFileError eRet;
-    rtl_uString* ustrFilePath = NULL;
-
-    char buffer[PATH_MAX];
-    int  fd;
-    int  mode  = S_IRUSR | S_IRGRP | S_IROTH;
-    int  flags = O_RDONLY;
-
-    struct flock aflock;
-
-    /* locking the complete file */
-    aflock.l_type = 0;
-    aflock.l_whence = SEEK_SET;
-    aflock.l_start = 0;
-    aflock.l_len = 0;
-
-    OSL_ASSERT( ustrFileURL );
-    OSL_ASSERT( pHandle );
-
-    if( ( 0 == ustrFileURL->length ) )
-        return osl_File_E_INVAL;
-
-    /* convert file URL to system path */
-    eRet = osl_getSystemPathFromFileURL( ustrFileURL, &ustrFilePath );
-
-    if( osl_File_E_None != eRet )
-        return eRet;
-
-    osl_systemPathRemoveSeparator(ustrFilePath);
-
-    /* convert unicode path to text */
-    if( UnicodeToText( buffer, PATH_MAX, ustrFilePath->buffer, ustrFilePath->length ) 
-#ifdef MACOSX 
-     && macxp_resolveAlias( buffer, PATH_MAX ) == 0 
-#endif /* MACOSX */
-     )
-    {
-        /* we do not open devices or such here */
-        if( !( uFlags & osl_File_OpenFlag_Create ) )
-        {
-            struct stat aFileStat;
-
-            if( 0 > stat( buffer, &aFileStat ) )
-            {
-                PERROR( "osl_openFile", buffer );
-                eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-            }
-
-            else if( !S_ISREG( aFileStat.st_mode ) )
-            {
-                eRet = osl_File_E_INVAL;
-            }
-        }
-
-        if( osl_File_E_None == eRet )
-        {
-            /*
-             * set flags and mode
-             */
-
-            if ( uFlags & osl_File_OpenFlag_Write )
-            {
-                mode |= S_IWUSR | S_IWGRP | S_IWOTH;
-                flags = OPEN_WRITE_FLAGS;
-#ifdef MACOSX
-                flags = adjustLockFlags(buffer, flags);
-#endif
-                aflock.l_type = F_WRLCK;
-            }
-
-            if ( uFlags & osl_File_OpenFlag_Create )
-            {
-                mode |= S_IWUSR | S_IWGRP | S_IWOTH;
-                flags = OPEN_CREATE_FLAGS;
-#ifdef MACOSX
-                flags = adjustLockFlags(buffer, flags);
-#endif
-            }
-
-            sal_Bool bNeedsLock = ( ( uFlags & osl_File_OpenFlag_NoLock ) == 0 );
-            if ( !bNeedsLock )
-            {
-#ifdef MACOSX
-                flags &= ~O_EXLOCK;
-                flags &= ~O_SHLOCK;
-#endif
-            }    
-
-            /* open the file */
-            fd = open( buffer, flags, mode );
-            if ( fd >= 0 )
-            {
-                sal_Bool bLocked = sal_False;
-                if( bNeedsLock )
-                {
-#ifndef HAVE_O_EXLOCK
-                    /* check if file lock is enabled and clear l_type member of flock otherwise */
-                    if( (char *) -1 == pFileLockEnvVar )
-                    {
-                        /* FIXME: this is not MT safe */
-                        pFileLockEnvVar = getenv("SAL_ENABLE_FILE_LOCKING");
-
-                        if( NULL == pFileLockEnvVar)
-                            pFileLockEnvVar = getenv("STAR_ENABLE_FILE_LOCKING");
-                    }
-#else
-                    /* disable range based locking */
-                    pFileLockEnvVar = NULL;
-                    
-                    /* remove the NONBLOCK flag again */
-                    flags = fcntl(fd, F_GETFL, NULL);
-                    flags &= ~O_NONBLOCK;
-                    if( 0 > fcntl(fd, F_SETFL, flags) )
-                   {
-                        close(fd);
-                        return oslTranslateFileError(OSL_FET_ERROR, errno);
-                   }
-#endif
-                    if( NULL == pFileLockEnvVar )
-                        aflock.l_type = 0;
-
-                    /* lock the file if flock.l_type is set */
-#ifdef MACOSX
-                    bLocked = ( F_WRLCK != aflock.l_type );
-                    if (!bLocked) 
-                    {
-                       /* Mac OSX returns ENOTSUP for webdav drives. We should try read lock */
-                       if ( 0 == flock( fd, LOCK_EX | LOCK_NB ) || errno == ENOTSUP )
-                          bLocked = ( errno != ENOTSUP ) || ( 0 == flock( fd, LOCK_SH | LOCK_NB ) || errno == ENOTSUP );
-                    }
-#else	/* MACOSX */
-                     bLocked = ( F_WRLCK != aflock.l_type || -1 != fcntl( fd, F_SETLK, &aflock ) );
-#endif	/* MACOSX */
-
-                }
-
-                if ( !bNeedsLock || bLocked )
-                {
-                    /* allocate memory for impl structure */
-                    pHandleImpl = (oslFileHandleImpl*) rtl_allocateMemory( sizeof(oslFileHandleImpl) );
-                    if( pHandleImpl )
-                    {
-                        pHandleImpl->ustrFilePath = ustrFilePath;
-                        pHandleImpl->fd = fd;
-                        pHandleImpl->bLocked = bLocked;
-
-                        *pHandle = (oslFileHandle) pHandleImpl;
-
-                        return osl_File_E_None;
-                    }
-                    else
-                    {
-                        errno = ENOMEM;
-                    }
-                }
-
-                close( fd );
-            }
-
-            PERROR( "osl_openFile", buffer );
-            eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-        }
-    }
-    else
-        eRet = osl_File_E_INVAL;
-
-    rtl_uString_release( ustrFilePath );
-    return eRet;
-}
-
-/****************************************************************************/
-/*	osl_closeFile */
-/****************************************************************************/
-
-oslFileError osl_closeFile( oslFileHandle Handle )
-{
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl *) Handle;
-    oslFileError eRet = osl_File_E_INVAL;
-
-    OSL_ASSERT( Handle );
-
-    if( pHandleImpl )
-    {
-        rtl_uString_release( pHandleImpl->ustrFilePath );
-
-        /* release file lock if locking is enabled */
-        if( pFileLockEnvVar )
-        {
-            struct flock aflock;
-
-            aflock.l_type = F_UNLCK;
-            aflock.l_whence = SEEK_SET;
-            aflock.l_start = 0;
-            aflock.l_len = 0;
-
-            if ( pHandleImpl->bLocked )
-            {
-                /* FIXME: check if file is really locked ?  */
-
-                /* release the file share lock on this file */
-#ifdef MACOSX
-                /* Mac OSX will return ENOTSUP for webdav drives. We should ignore the error */
-                if ( 0 != flock( pHandleImpl->fd, LOCK_UN | LOCK_NB ) && errno != ENOTSUP )
-#else	/* MACOSX */
-                if( -1 == fcntl( pHandleImpl->fd, F_SETLK, &aflock ) )
-#endif	/* MACOSX */
-                {
-                    PERROR( "osl_closeFile", "unlock failed" );
-                }
-            }
-        }
-
-        if( 0 > close( pHandleImpl->fd ) )
-        {
-            eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-        }
-        else
-            eRet = osl_File_E_None;
-
-        rtl_freeMemory( pHandleImpl );
-    }
-
-    return eRet;
-}
-
-/****************************************************************************/
-/*	osl_isEndOfFile */
-/****************************************************************************/
-
-oslFileError SAL_CALL osl_isEndOfFile( oslFileHandle Handle, sal_Bool *pIsEOF )
-{
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl *) Handle;
-    oslFileError eRet = osl_File_E_INVAL;
-
-    if ( pHandleImpl)
-    {
-        long curPos = lseek( pHandleImpl->fd, 0, SEEK_CUR );
-
-        if ( curPos >= 0 )
-        {
-            long endPos = lseek( pHandleImpl->fd, 0, SEEK_END  );
-
-            if ( endPos >= 0 )
-            {
-                *pIsEOF = ( curPos == endPos );
-                curPos = lseek( pHandleImpl->fd, curPos, SEEK_SET );
-
-                if ( curPos >= 0 )
-                    eRet = osl_File_E_None;
-                else
-                    eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-            }
-            else
-                eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-        }
-        else
-            eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-    }
-
-    return eRet;
-}
-
-
-/****************************************************************************/
-/*	osl_moveFile */
-/****************************************************************************/
-
-oslFileError osl_moveFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
-{
-    char srcPath[PATH_MAX];
-    char destPath[PATH_MAX];
-    oslFileError eRet;
-
-    OSL_ASSERT( ustrFileURL );
-    OSL_ASSERT( ustrDestURL );
-
-    /* convert source url to system path */
-    eRet = FileURLToPath( srcPath, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    /* convert destination url to system path */
-    eRet = FileURLToPath( destPath, PATH_MAX, ustrDestURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-#ifdef MACOSX
-    if ( macxp_resolveAlias( srcPath, PATH_MAX ) != 0 || macxp_resolveAlias( destPath, PATH_MAX ) != 0 )
-      return oslTranslateFileError( OSL_FET_ERROR, errno );
-#endif/* MACOSX */
-
-    return oslDoMoveFile( srcPath, destPath );
-}
-
-/****************************************************************************/
-/*	osl_copyFile */
-/****************************************************************************/
-
-oslFileError osl_copyFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
-{
-    char srcPath[PATH_MAX];
-    char destPath[PATH_MAX];
-    oslFileError eRet;
-
-    OSL_ASSERT( ustrFileURL );
-    OSL_ASSERT( ustrDestURL );
-
-    /* convert source url to system path */
-    eRet = FileURLToPath( srcPath, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    /* convert destination url to system path */
-    eRet = FileURLToPath( destPath, PATH_MAX, ustrDestURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-#ifdef MACOSX
-    if ( macxp_resolveAlias( srcPath, PATH_MAX ) != 0 || macxp_resolveAlias( destPath, PATH_MAX ) != 0 )
-      return oslTranslateFileError( OSL_FET_ERROR, errno );
-#endif/* MACOSX */
-
-    return osl_psz_copyFile( srcPath, destPath );
-}
-
-/****************************************************************************/
-/*	osl_removeFile */
-/****************************************************************************/
-
-oslFileError osl_removeFile( rtl_uString* ustrFileURL )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-
-    OSL_ASSERT( ustrFileURL );
-
-    /* convert file url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-#ifdef MACOSX
-    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
-      return oslTranslateFileError( OSL_FET_ERROR, errno );
-#endif/* MACOSX */
-
-    return osl_psz_removeFile( path );
-}
-
-/****************************************************************************/
-/*	osl_getVolumeInformation */
-/****************************************************************************/
-
-oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-
-    OSL_ASSERT( ustrDirectoryURL );
-    OSL_ASSERT( pInfo );
-
-    /* convert directory url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrDirectoryURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-#ifdef MACOSX
-    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
-      return oslTranslateFileError( OSL_FET_ERROR, errno );
-#endif/* MACOSX */
-
-    return osl_psz_getVolumeInformation( path, pInfo, uFieldMask);
-}
-
-/****************************************************************************/
-/*	osl_createDirectory */
-/****************************************************************************/
-
-oslFileError osl_createDirectory( rtl_uString* ustrDirectoryURL )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-
-    OSL_ASSERT( ustrDirectoryURL );
-
-    /* convert directory url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrDirectoryURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-#ifdef MACOSX
-    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
-      return oslTranslateFileError( OSL_FET_ERROR, errno );
-#endif/* MACOSX */
-
-    return osl_psz_createDirectory( path );
-}
-
-/****************************************************************************/
-/*	osl_removeDirectory */
-/****************************************************************************/
-
-oslFileError osl_removeDirectory( rtl_uString* ustrDirectoryURL )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-
-    OSL_ASSERT( ustrDirectoryURL );
-
-    /* convert directory url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrDirectoryURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-#ifdef MACOSX
-    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
-      return oslTranslateFileError( OSL_FET_ERROR, errno );
-#endif/* MACOSX */
-
-    return osl_psz_removeDirectory( path );
-}
-
-//#############################################
-int path_make_parent(sal_Unicode* path)
-{
-    int i = rtl_ustr_lastIndexOfChar(path, '/');
-    
-    if (i > 0)
-    {
-        *(path + i) = 0;
-        return i;
-    }
-    else
-        return 0;
-}
-
-//#############################################
-int create_dir_with_callback(
-    sal_Unicode* directory_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
-    void* pData)
-{
-    int mode = S_IRWXU | S_IRWXG | S_IRWXO;
-    
-    if (osl::mkdir(directory_path, mode) == 0)
-    {
-        if (aDirectoryCreationCallbackFunc)
-        {
-            rtl::OUString url;                
-            osl::FileBase::getFileURLFromSystemPath(directory_path, url);                                
-            aDirectoryCreationCallbackFunc(pData, url.pData);
-        }                
-        return 0;
-    }
-    return errno;
-}
-
-//#############################################
-oslFileError create_dir_recursively_(
-    sal_Unicode* dir_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
-    void* pData)
-{   
-    OSL_PRECOND((rtl_ustr_getLength(dir_path) > 0) && ((dir_path + (rtl_ustr_getLength(dir_path) - 1)) != (dir_path + rtl_ustr_lastIndexOfChar(dir_path, '/'))), \
-    "Path must not end with a slash");
-         
-    int native_err = create_dir_with_callback(
-        dir_path, aDirectoryCreationCallbackFunc, pData);
-        
-    if (native_err == 0)    
-        return osl_File_E_None;
-                        
-    if (native_err != ENOENT)
-        return oslTranslateFileError(OSL_FET_ERROR, native_err);
-    
-    // we step back until '/a_dir' at maximum because
-    // we should get an error unequal ENOENT when
-    // we try to create 'a_dir' at '/' and would so 
-    // return before	    
-    int pos = path_make_parent(dir_path);
-                    
-    oslFileError osl_error = create_dir_recursively_(
-        dir_path, aDirectoryCreationCallbackFunc, pData);
-                    
-    if (osl_File_E_None != osl_error)
-        return osl_error;
-                    
-       dir_path[pos] = '/';
-                               
-    return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData);     
-}
-
-//#######################################
-oslFileError SAL_CALL osl_createDirectoryPath(
-    rtl_uString* aDirectoryUrl, 
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
-    void* pData)
-{
-    if (aDirectoryUrl == NULL)
-        return osl_File_E_INVAL;
-    
-    rtl::OUString sys_path;         
-    oslFileError osl_error = osl_getSystemPathFromFileURL_Ex(
-        aDirectoryUrl, &sys_path.pData, sal_False);        
-    
-    if (osl_error != osl_File_E_None)
-        return osl_error;
-                                                                
-    osl::systemPathRemoveSeparator(sys_path);
-    
-    // const_cast because sys_path is a local copy which we want to modify inplace instead of 
-    // coyp it into another buffer on the heap again
-    return create_dir_recursively_(sys_path.pData->buffer, aDirectoryCreationCallbackFunc, pData);			
-}
-
-/****************************************************************************/
-/*	osl_getCanonicalName */
-/****************************************************************************/
-
-oslFileError osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uString** pustrValidURL )
-{
-    OSL_ENSURE(sal_False, "osl_getCanonicalName not implemented");
-
-    rtl_uString_newFromString(pustrValidURL, ustrFileURL);
-    return osl_File_E_None;
-}
-
-
-/****************************************************************************/
-/*	osl_setFileAttributes */
-/****************************************************************************/
-
-oslFileError osl_setFileAttributes( rtl_uString* ustrFileURL, sal_uInt64 uAttributes )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-
-    OSL_ASSERT( ustrFileURL );
-
-    /* convert file url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-#ifdef MACOSX
-    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
-      return oslTranslateFileError( OSL_FET_ERROR, errno );
-#endif/* MACOSX */
-
-    return osl_psz_setFileAttributes( path, uAttributes );
-}
-
-/****************************************************************************/
-/*	osl_setFileTime */
-/****************************************************************************/
-
-oslFileError osl_setFileTime( rtl_uString* ustrFileURL, const TimeValue* pCreationTime,
-                              const TimeValue* pLastAccessTime, const TimeValue* pLastWriteTime )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-
-    OSL_ASSERT( ustrFileURL );
-
-    /* convert file url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-#ifdef MACOSX
-    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
-      return oslTranslateFileError( OSL_FET_ERROR, errno );
-#endif/* MACOSX */
-
-    return osl_psz_setFileTime( path, pCreationTime, pLastAccessTime, pLastWriteTime );
-}
-
-/******************************************************************************
- *
- *                  Exported Module Functions
- *             (independent of C or Unicode Strings)
- *
- *****************************************************************************/
-
-/*******************************************
-    osl_mapFile
-********************************************/
-oslFileError
-SAL_CALL osl_mapFile (
-    oslFileHandle Handle,
-    void**        ppAddr,
-    sal_uInt64    uLength,
-    sal_uInt64    uOffset,
-    sal_uInt32    uFlags
-)
-{
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl*)Handle;
-
-    if ((0 == pHandleImpl) || (-1 == pHandleImpl->fd) || (0 == ppAddr))
-        return osl_File_E_INVAL;
-    *ppAddr = 0;
-
-    static sal_uInt64 const g_limit_size_t = std::numeric_limits< size_t >::max();
-    if (g_limit_size_t < uLength)
-        return osl_File_E_OVERFLOW;
-    size_t const nLength = sal::static_int_cast< size_t >(uLength);
-
-    static sal_uInt64 const g_limit_off_t = std::numeric_limits< off_t >::max();
-    if (g_limit_off_t < uOffset)
-        return osl_File_E_OVERFLOW;
-    off_t const nOffset = sal::static_int_cast< off_t >(uOffset);
-
-    void* p = mmap(NULL, nLength, PROT_READ, MAP_SHARED, pHandleImpl->fd, nOffset);
-    if (MAP_FAILED == p)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-    *ppAddr = p;
-
-    if (uFlags & osl_File_MapFlag_RandomAccess)
-    {
-        // Determine memory pagesize.
-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
-        size_t const nPageSize = getpagesize();
-#else  /* POSIX */
-        size_t const nPageSize = sysconf(_SC_PAGESIZE);
-#endif /* xBSD || POSIX */
-        if (size_t(-1) != nPageSize)
-        {
-            /*
-             * Pagein, touching first byte of every memory page.
-             * Note: volatile disables optimizing the loop away.
-             */
-            sal_uInt8 * pData (reinterpret_cast<sal_uInt8*>(*ppAddr));
-            size_t      nSize (nLength);
-
-            volatile sal_uInt8 c = 0;
-            while (nSize > nPageSize)
-            {
-                c ^= pData[0];
-                pData += nPageSize;
-                nSize -= nPageSize;
-            }
-            if (nSize > 0)
-            {
-                c^= pData[0];
-                pData += nSize;
-                nSize -= nSize;
-            }
-        }
-    }
-    return osl_File_E_None;
-}
-
-/*******************************************
-    osl_unmapFile
-********************************************/
-oslFileError
-SAL_CALL osl_unmapFile (void* pAddr, sal_uInt64 uLength)
-{
-    if (0 == pAddr)
-        return osl_File_E_INVAL;
-
-    static sal_uInt64 const g_limit_size_t = std::numeric_limits< size_t >::max();
-    if (g_limit_size_t < uLength)
-        return osl_File_E_OVERFLOW;
-    size_t const nLength = sal::static_int_cast< size_t >(uLength);
-
-    if (-1 == munmap(static_cast<char*>(pAddr), nLength))
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    return osl_File_E_None;
-}
-
-/*******************************************
-    osl_readFile
-********************************************/
-
-oslFileError osl_readFile(oslFileHandle Handle, void* pBuffer, sal_uInt64 uBytesRequested, sal_uInt64* pBytesRead)
-{
-    ssize_t            nBytes      = 0;
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl*)Handle;
-
-    if ((0 == pHandleImpl) || (pHandleImpl->fd < 0) || (0 == pBuffer) || (0 == pBytesRead))
-        return osl_File_E_INVAL;
-    
-    nBytes = read(
-        pHandleImpl->fd, pBuffer,
-        ((uBytesRequested
-          <= static_cast< size_t >(std::numeric_limits< ssize_t >::max()))
-         ? static_cast< size_t >(uBytesRequested)
-         : static_cast< size_t >(std::numeric_limits< ssize_t >::max())));
-
-    if (-1 == nBytes)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    *pBytesRead = nBytes;
-    return osl_File_E_None;
-}
-
-/*******************************************
-    osl_writeFile
-********************************************/
-
-oslFileError osl_writeFile(oslFileHandle Handle, const void* pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64* pBytesWritten)
-{
-    ssize_t            nBytes      = 0;
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl*)Handle;
-
-    OSL_ASSERT(pHandleImpl);
-    OSL_ASSERT(pBuffer);
-    OSL_ASSERT(pBytesWritten);
-
-    if ((0 == pHandleImpl) || (0 == pBuffer) || (0 == pBytesWritten))
-        return osl_File_E_INVAL;
-
-    OSL_ASSERT(pHandleImpl->fd >= 0);
-
-    if (pHandleImpl->fd < 0)
-        return osl_File_E_INVAL;
-
-    nBytes = write(
-        pHandleImpl->fd, pBuffer,
-        ((uBytesToWrite
-          <= static_cast< size_t >(std::numeric_limits< ssize_t >::max()))
-         ? static_cast< size_t >(uBytesToWrite)
-         : static_cast< size_t >(std::numeric_limits< ssize_t >::max())));
-
-    if (-1 == nBytes)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    *pBytesWritten = nBytes;
-    return osl_File_E_None;
-}
-
-/*******************************************
-    osl_readFileAt
-********************************************/
-oslFileError
-SAL_CALL osl_readFileAt (
-    oslFileHandle Handle,
-    sal_uInt64    uOffset,
-    void*         pBuffer,
-    sal_uInt64    uBytesRequested,
-    sal_uInt64*   pBytesRead)
-{
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl*)Handle;
-
-    if ((0 == pHandleImpl) || (pHandleImpl->fd < 0) || (0 == pBuffer) || (0 == pBytesRead))
-        return osl_File_E_INVAL;
-
-    static sal_uInt64 const g_limit_off_t = std::numeric_limits< off_t >::max();
-    if (g_limit_off_t < uOffset)
-        return osl_File_E_OVERFLOW;
-    off_t const nOffset = sal::static_int_cast< off_t >(uOffset);
-
-    static sal_uInt64 const g_limit_ssize_t = std::numeric_limits< ssize_t >::max();
-    if (g_limit_ssize_t < uBytesRequested)
-        return osl_File_E_OVERFLOW;
-    size_t const nBytesRequested = sal::static_int_cast< size_t >(uBytesRequested);
-
-#if defined(LINUX) || defined(SOLARIS)
-
-    ssize_t nBytes = ::pread(pHandleImpl->fd, pBuffer, nBytesRequested, nOffset);
-    if ((-1 == nBytes) && (EOVERFLOW == errno))
-    {
-        /*
-         * Workaround for 'pread()' failure at end-of-file:
-         *
-         * Some 'pread()'s fail with EOVERFLOW when reading at (or past)
-         * end-of-file, different from 'lseek() + read()' behaviour.
-         * Returning '0 bytes read' and 'osl_File_E_None' instead.
-         */
-        nBytes = 0;
-    }
-
-#else /* LINUX || SOLARIS */
-
-    if (-1 == ::lseek (pHandleImpl->fd, nOffset, SEEK_SET))
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    ssize_t nBytes = ::read(pHandleImpl->fd, pBuffer, nBytesRequested);
-
-#endif /* LINUX || SOLARIS */
-
-    if (-1 == nBytes)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    *pBytesRead = nBytes;
-    return osl_File_E_None;
-}
-
-/*******************************************
-    osl_writeFileAt
-********************************************/
-oslFileError
-SAL_CALL osl_writeFileAt (
-    oslFileHandle Handle,
-    sal_uInt64    uOffset,
-    const void*   pBuffer,
-    sal_uInt64    uBytesToWrite,
-    sal_uInt64*   pBytesWritten)
-{
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl*)Handle;
-
-    if ((0 == pHandleImpl) || (pHandleImpl->fd < 0) || (0 == pBuffer) || (0 == pBytesWritten))
-        return osl_File_E_INVAL;
-
-    static sal_uInt64 const g_limit_off_t = std::numeric_limits< off_t >::max();
-    if (g_limit_off_t < uOffset)
-        return osl_File_E_OVERFLOW;
-    off_t const nOffset = sal::static_int_cast< off_t >(uOffset);
-
-    static sal_uInt64 const g_limit_ssize_t = std::numeric_limits< ssize_t >::max();
-    if (g_limit_ssize_t < uBytesToWrite)
-        return osl_File_E_OVERFLOW;
-    size_t const nBytesToWrite = sal::static_int_cast< size_t >(uBytesToWrite);
-
-#if defined(LINUX) || defined(SOLARIS)
-
-    ssize_t nBytes = ::pwrite(pHandleImpl->fd, pBuffer, nBytesToWrite, nOffset);
-
-#else /* LINUX || SOLARIS */
-
-    if (-1 == ::lseek(pHandleImpl->fd, nOffset, SEEK_SET))
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    ssize_t nBytes = ::write(pHandleImpl->fd, pBuffer, nBytesToWrite);
-
-#endif /* LINUX || SOLARIS */
-
-    if (-1 == nBytes)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    *pBytesWritten = nBytes;
-    return osl_File_E_None;
-}
-
-/*******************************************
-    osl_setFilePos
-********************************************/
-
-oslFileError osl_setFilePos( oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uPos )
-{
-    oslFileHandleImpl* pHandleImpl=0;
-    int nRet=0;
-    off_t nOffset=0;
-
-    pHandleImpl = (oslFileHandleImpl*) Handle;
-    if ( pHandleImpl == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pHandleImpl->fd < 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    /* FIXME mfe: setFilePos: Do we have any runtime function to determine LONG_MAX? */
-    if ( uPos > LONG_MAX )
-    {
-        return osl_File_E_OVERFLOW;
-    }
-
-    nOffset=(off_t)uPos;
-
-    switch(uHow)
-    {
-        case osl_Pos_Absolut:
-            nOffset = lseek(pHandleImpl->fd,nOffset,SEEK_SET);
-            break;
-
-        case osl_Pos_Current:
-            nOffset = lseek(pHandleImpl->fd,nOffset,SEEK_CUR);
-            break;
-
-        case osl_Pos_End:
-            nOffset = lseek(pHandleImpl->fd,nOffset,SEEK_END);
-            break;
-
-        default:
-            return osl_File_E_INVAL;
-    }
-
-    if ( nOffset < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-
-/************************************************
- * osl_getFilePos
- ***********************************************/
-
-oslFileError osl_getFilePos( oslFileHandle Handle, sal_uInt64* pPos )
-{
-    oslFileHandleImpl* pHandleImpl=0;
-    off_t nOffset=0;
-    int nRet=0;
-
-    pHandleImpl = (oslFileHandleImpl*) Handle;
-    if ( pHandleImpl == 0 || pPos == 0)
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pHandleImpl->fd < 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    nOffset = lseek(pHandleImpl->fd,0,SEEK_CUR);
-
-    if (nOffset < 0)
-    {
-        nRet  =errno;
-
-        /* *pPos =0; */
-
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    *pPos=nOffset;
-
-    return osl_File_E_None;
-}
-
-/****************************************************************************
- *	osl_getFileSize
- ****************************************************************************/
-
-oslFileError osl_getFileSize( oslFileHandle Handle, sal_uInt64* pSize )
-{	
-    oslFileHandleImpl* pHandleImpl=(oslFileHandleImpl*) Handle;
-    if (pHandleImpl == 0)
-        return osl_File_E_INVAL;
-
-    struct stat file_stat;
-    if (fstat(pHandleImpl->fd, &file_stat) == -1)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    *pSize = file_stat.st_size;
-    return osl_File_E_None;
-}
-
-/************************************************
- * osl_setFileSize
- ***********************************************/
-
-oslFileError osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize )
-{
-    oslFileHandleImpl* pHandleImpl=0;
-    off_t nOffset=0;
-
-    pHandleImpl = (oslFileHandleImpl*) Handle;
-    if ( pHandleImpl == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pHandleImpl->fd < 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    /* FIXME: mfe: setFileSize: Do we have any runtime function to determine LONG_MAX? */
-    if ( uSize > LONG_MAX )
-    {
-        return osl_File_E_OVERFLOW;
-    }
-
-    nOffset = (off_t)uSize;
-    if (ftruncate (pHandleImpl->fd, nOffset) < 0)
-    {
-        /* Failure. Try fallback algorithm */
-        oslFileError result;
-        struct stat  aStat;
-        off_t        nCurPos;
-
-        /* Save original result */
-        result = oslTranslateFileError (OSL_FET_ERROR, errno);
-        PERROR("ftruncate", "Try osl_setFileSize [fallback]\n");
-
-        /* Check against current size. Fail upon 'shrink' */
-        if (fstat (pHandleImpl->fd, &aStat) < 0)
-        {
-            PERROR("ftruncate: fstat", "Out osl_setFileSize [error]\n");
-            return (result);
-        }
-        if ((0 <= nOffset) && (nOffset <= aStat.st_size))
-        {
-            /* Failure upon 'shrink'. Return original result */
-            return (result);
-        }
-
-        /* Save current position */
-        nCurPos = (off_t)lseek (pHandleImpl->fd, (off_t)0, SEEK_CUR);
-        if (nCurPos == (off_t)(-1))
-        {
-            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]\n");
-            return (result);
-        }
-
-        /* Try 'expand' via 'lseek()' and 'write()' */
-        if (lseek (pHandleImpl->fd, (off_t)(nOffset - 1), SEEK_SET) < 0)
-        {
-            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]\n");
-            return (result);
-        }
-        if (write (pHandleImpl->fd, (char*)"", (size_t)1) < 0)
-        {
-            /* Failure. Restore saved position */
-            PERROR("ftruncate: write", "Out osl_setFileSize [error]\n");
-            if (lseek (pHandleImpl->fd, (off_t)nCurPos, SEEK_SET) < 0)
-            {
-#ifdef DEBUG_OSL_FILE
-                perror("ftruncate: lseek");
-#endif /* DEBUG_OSL_FILE */
-            }
-            return (result);
-        }
-
-        /* Success. Restore saved position */
-        if (lseek (pHandleImpl->fd, (off_t)nCurPos, SEEK_SET) < 0)
-        {
-            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]");
-            return (result);
-        }
-    }
-
-    return (osl_File_E_None);
-}
-
-/*###############################################*/
-oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
-{
-    oslFileHandleImpl* handle_impl = (oslFileHandleImpl*)Handle;
-    
-    if (handle_impl == 0)
-        return osl_File_E_INVAL;
-    
-    if (fsync(handle_impl->fd) == -1)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-    
-    return osl_File_E_None;
-}
-
-/******************************************************************************
- *
- *                  C-String Versions of Exported Module Functions
- *
- *****************************************************************************/
-
-#ifdef HAVE_STATFS_H
-
-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
-#   define __OSL_STATFS_STRUCT      			struct statfs
-#   define __OSL_STATFS(dir, sfs)   			statfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)   			((sal_uInt64)((a).f_bsize))
-#   define __OSL_STATFS_TYPENAME(a) 			((a).f_fstypename)
-#   define __OSL_STATFS_ISREMOTE(a) 			(((a).f_type & MNT_LOCAL) == 0)
-
-/* always return true if queried for the properties of
-   the file system. If you think this is wrong under any
-   of the target platforms fix it!!!! */
-#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
-#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* FREEBSD || NETBSD || MACOSX */
-
-#if defined(LINUX)
-#	define __OSL_NFS_SUPER_MAGIC				 0x6969
-#	define __OSL_SMB_SUPER_MAGIC				 0x517B
-#	define __OSL_MSDOS_SUPER_MAGIC  			 0x4d44
-#	define __OSL_NTFS_SUPER_MAGIC				 0x5346544e
-#   define __OSL_STATFS_STRUCT       		     struct statfs
-#   define __OSL_STATFS(dir, sfs)    			 statfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)    			 ((sal_uInt64)((a).f_bsize))
-#   define __OSL_STATFS_IS_NFS(a)     			 (__OSL_NFS_SUPER_MAGIC == (a).f_type) 
-#   define __OSL_STATFS_IS_SMB(a)     			 (__OSL_SMB_SUPER_MAGIC == (a).f_type) 
-#   define __OSL_STATFS_ISREMOTE(a)  			 (__OSL_STATFS_IS_NFS((a)) || __OSL_STATFS_IS_SMB((a)))
-#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type) && (__OSL_NTFS_SUPER_MAGIC != (a).f_type))
-#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
-#endif /* LINUX */
-
-#if defined(SOLARIS) || defined(IRIX)
-#   define __OSL_STATFS_STRUCT          		 struct statvfs
-#   define __OSL_STATFS(dir, sfs)	    		 statvfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)       		 ((sal_uInt64)((a).f_frsize))
-#   define __OSL_STATFS_TYPENAME(a)     		 ((a).f_basetype)
-#   define __OSL_STATFS_ISREMOTE(a)     		 (rtl_str_compare((a).f_basetype, "nfs") == 0)
-
-/* always return true if queried for the properties of
-   the file system. If you think this is wrong under any
-   of the target platforms fix it!!!! */
-#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
-#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* SOLARIS || IRIX*/
-
-#   define __OSL_STATFS_INIT(a) 	    (memset(&(a), 0, sizeof(__OSL_STATFS_STRUCT)))
-
-#else /* no statfs available */
-
-#   define __OSL_STATFS_STRUCT        			 struct dummy {int i;}
-#   define __OSL_STATFS_INIT(a)       			 ((void)0)
-#   define __OSL_STATFS(dir, sfs)     		     (1)
-#   define __OSL_STATFS_ISREMOTE(sfs) 			 (0)
-#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
-#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* HAVE_STATFS_H */
-
-
-static oslFileError osl_psz_getVolumeInformation (
-    const sal_Char* pszDirectory, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask)
-{
-    __OSL_STATFS_STRUCT sfs;
-
-    if (!pInfo)   
-        return osl_File_E_INVAL;
-    
-    __OSL_STATFS_INIT(sfs);
-    
-    pInfo->uValidFields = 0;
-    pInfo->uAttributes  = 0;
-    
-    if ((__OSL_STATFS(pszDirectory, &sfs)) < 0)
-    {	
-        oslFileError result = oslTranslateFileError(OSL_FET_ERROR, errno);		
-        return (result);
-    }
-
-    /* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */
-    if (uFieldMask & osl_VolumeInfo_Mask_Attributes)
-    {	
-        if (__OSL_STATFS_ISREMOTE(sfs))
-            pInfo->uAttributes  |= osl_Volume_Attribute_Remote;
-                        
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;	
-    }
-
-    if (uFieldMask & osl_VolumeInfo_Mask_FileSystemCaseHandling)
-    {
-        if (__OSL_STATFS_IS_CASE_SENSITIVE_FS(sfs))
-            pInfo->uAttributes |= osl_Volume_Attribute_Case_Sensitive;
-        
-        if (__OSL_STATFS_IS_CASE_PRESERVING_FS(sfs))
-            pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
-            
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;	
-    }
-    
-    pInfo->uTotalSpace = 0;
-    pInfo->uFreeSpace  = 0;
-    pInfo->uUsedSpace  = 0;
-    
-#if defined(__OSL_STATFS_BLKSIZ)
-    
-    if ((uFieldMask & osl_VolumeInfo_Mask_TotalSpace) ||
-        (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
-    {
-        pInfo->uTotalSpace   = __OSL_STATFS_BLKSIZ(sfs);
-        pInfo->uTotalSpace  *= (sal_uInt64)(sfs.f_blocks);
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace;
-    }
-    
-    if ((uFieldMask & osl_VolumeInfo_Mask_FreeSpace) ||
-        (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
-    {
-        pInfo->uFreeSpace = __OSL_STATFS_BLKSIZ(sfs);
-        
-        if (getuid() == 0)		
-            pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bfree);
-        else			
-            pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bavail);
-    
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_FreeSpace;
-    }
-
-#endif  /* __OSL_STATFS_BLKSIZ */
-    
-    if ((pInfo->uValidFields & osl_VolumeInfo_Mask_TotalSpace) &&
-        (pInfo->uValidFields & osl_VolumeInfo_Mask_FreeSpace ))
-    {
-        pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_UsedSpace;
-    }
-    
-    pInfo->uMaxNameLength = 0;
-    if (uFieldMask & osl_VolumeInfo_Mask_MaxNameLength)
-    {
-        long nLen = pathconf(pszDirectory, _PC_NAME_MAX);
-        if (nLen > 0)
-        {
-            pInfo->uMaxNameLength = (sal_uInt32)nLen;
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_MaxNameLength;
-        }
-    }
-
-    pInfo->uMaxPathLength = 0;
-    if (uFieldMask & osl_VolumeInfo_Mask_MaxPathLength)
-    {
-        long nLen = pathconf (pszDirectory, _PC_PATH_MAX);
-        if (nLen > 0)
-        {
-            pInfo->uMaxPathLength  = (sal_uInt32)nLen;
-            pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxPathLength;
-        }
-    }
-
-#if defined(__OSL_STATFS_TYPENAME)
-
-    if (uFieldMask & osl_VolumeInfo_Mask_FileSystemName)
-    {
-        rtl_string2UString(
-            &(pInfo->ustrFileSystemName),
-            __OSL_STATFS_TYPENAME(sfs),
-            rtl_str_getLength(__OSL_STATFS_TYPENAME(sfs)),
-            osl_getThreadTextEncoding(),
-            OUSTRING_TO_OSTRING_CVTFLAGS);
-        OSL_ASSERT(pInfo->ustrFileSystemName != 0);
-            
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_FileSystemName;
-    }
-    
-#endif /* __OSL_STATFS_TYPENAME */
-    
-    if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
-    {
-        /* FIXME: check also entries in mntent for the device
-           and fill it with correct values */
-        
-        *pInfo->pDeviceHandle = osl_isFloppyDrive(pszDirectory);
-
-        if (*pInfo->pDeviceHandle)
-        {
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_DeviceHandle;
-            pInfo->uAttributes  |= osl_Volume_Attribute_Removeable;
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
-        }
-    }
-    return osl_File_E_None;
-}
-
-/*************************************
- * osl_psz_setFileAttributes
- ************************************/
-
-static oslFileError osl_psz_setFileAttributes( const sal_Char* pszFilePath, sal_uInt64 uAttributes )
-{
-    oslFileError osl_error = osl_File_E_None;
-    mode_t 		 nNewMode  = 0;
-
-     OSL_ENSURE(!(osl_File_Attribute_Hidden & uAttributes), "osl_File_Attribute_Hidden doesn't work under Unix");
-
-    if (uAttributes & osl_File_Attribute_OwnRead)
-        nNewMode |= S_IRUSR;
-
-    if (uAttributes & osl_File_Attribute_OwnWrite)
-        nNewMode|=S_IWUSR;
-
-    if  (uAttributes & osl_File_Attribute_OwnExe)
-        nNewMode|=S_IXUSR;
-
-    if (uAttributes & osl_File_Attribute_GrpRead)
-        nNewMode|=S_IRGRP;
-
-    if (uAttributes & osl_File_Attribute_GrpWrite)
-        nNewMode|=S_IWGRP;
-
-    if (uAttributes & osl_File_Attribute_GrpExe)
-        nNewMode|=S_IXGRP;
-
-    if (uAttributes & osl_File_Attribute_OthRead)
-        nNewMode|=S_IROTH;
-
-    if (uAttributes & osl_File_Attribute_OthWrite)
-        nNewMode|=S_IWOTH;
-
-    if (uAttributes & osl_File_Attribute_OthExe)
-        nNewMode|=S_IXOTH;
-
-    if (chmod(pszFilePath, nNewMode) < 0)
-        osl_error = oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    return osl_error;
-}
-
-/******************************************
- * osl_psz_setFileTime
- *****************************************/
-
-static oslFileError osl_psz_setFileTime( const sal_Char* pszFilePath,
-                                  const TimeValue* /*pCreationTime*/,
-                                  const TimeValue* pLastAccessTime,
-                                  const TimeValue* pLastWriteTime )
-{
-    int nRet=0;
-    struct utimbuf aTimeBuffer;
-    struct stat aFileStat;
-#ifdef DEBUG_OSL_FILE
-    struct tm* pTM=0;
-#endif
-
-    nRet = lstat(pszFilePath,&aFileStat);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"File Times are (in localtime):\n");
-    pTM=localtime(&aFileStat.st_ctime);
-    fprintf(stderr,"CreationTime is '%s'\n",asctime(pTM));
-    pTM=localtime(&aFileStat.st_atime);
-    fprintf(stderr,"AccessTime   is '%s'\n",asctime(pTM));
-    pTM=localtime(&aFileStat.st_mtime);
-    fprintf(stderr,"Modification is '%s'\n",asctime(pTM));
-
-    fprintf(stderr,"File Times are (in UTC):\n");
-    fprintf(stderr,"CreationTime is '%s'\n",ctime(&aFileStat.st_ctime));
-    fprintf(stderr,"AccessTime   is '%s'\n",ctime(&aTimeBuffer.actime));
-    fprintf(stderr,"Modification is '%s'\n",ctime(&aTimeBuffer.modtime));
-#endif
-
-    if ( pLastAccessTime != 0 )
-    {
-        aTimeBuffer.actime=pLastAccessTime->Seconds;
-    }
-    else
-    {
-        aTimeBuffer.actime=aFileStat.st_atime;
-    }
-
-    if ( pLastWriteTime != 0 )
-    {
-        aTimeBuffer.modtime=pLastWriteTime->Seconds;
-    }
-    else
-    {
-        aTimeBuffer.modtime=aFileStat.st_mtime;
-    }
-
-    /* mfe: Creation time not used here! */
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"File Times are (in localtime):\n");
-    pTM=localtime(&aFileStat.st_ctime);
-    fprintf(stderr,"CreationTime now '%s'\n",asctime(pTM));
-    pTM=localtime(&aTimeBuffer.actime);
-    fprintf(stderr,"AccessTime   now '%s'\n",asctime(pTM));
-    pTM=localtime(&aTimeBuffer.modtime);
-    fprintf(stderr,"Modification now '%s'\n",asctime(pTM));
-
-    fprintf(stderr,"File Times are (in UTC):\n");
-    fprintf(stderr,"CreationTime now '%s'\n",ctime(&aFileStat.st_ctime));
-    fprintf(stderr,"AccessTime   now '%s'\n",ctime(&aTimeBuffer.actime));
-    fprintf(stderr,"Modification now '%s'\n",ctime(&aTimeBuffer.modtime));
-#endif
-
-    nRet=utime(pszFilePath,&aTimeBuffer);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-
-
-/*****************************************
- * osl_psz_removeFile
- ****************************************/
-
-static oslFileError osl_psz_removeFile( const sal_Char* pszPath )
-{
-    int nRet=0;
-    struct stat aStat;
-
-    nRet = lstat(pszPath,&aStat);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    if ( S_ISDIR(aStat.st_mode) )
-    {
-        return osl_File_E_ISDIR;
-    }
-
-    nRet = unlink(pszPath);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * osl_psz_createDirectory
- ****************************************/
-
-static oslFileError osl_psz_createDirectory( const sal_Char* pszPath )
-{
-    int nRet=0;
-    int mode = S_IRWXU | S_IRWXG | S_IRWXO;
-
-    nRet = mkdir(pszPath,mode);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * osl_psz_removeDirectory
- ****************************************/
-
-static oslFileError osl_psz_removeDirectory( const sal_Char* pszPath )
-{
-    int nRet=0;
-
-    nRet = rmdir(pszPath);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * oslDoMoveFile
- ****************************************/
-
-static oslFileError oslDoMoveFile( const sal_Char* pszPath, const sal_Char* pszDestPath)
-{
-    oslFileError tErr=osl_File_E_invalidError;
-
-    tErr = osl_psz_moveFile(pszPath,pszDestPath);
-    if ( tErr == osl_File_E_None )
-    {
-        return tErr;
-    }
-
-    if ( tErr != osl_File_E_XDEV )
-    {
-        return tErr;
-    }
-
-    tErr=osl_psz_copyFile(pszPath,pszDestPath);
-
-    if ( tErr != osl_File_E_None )
-    {
-        oslFileError tErrRemove;
-        tErrRemove=osl_psz_removeFile(pszDestPath);
-        return tErr;
-    }
-
-    tErr=osl_psz_removeFile(pszPath);
-
-    return tErr;
-}
-
-/*****************************************
- * osl_psz_moveFile
- ****************************************/
-
-static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* pszDestPath)
-{
-
-    int nRet = 0;
-
-    nRet = rename(pszPath,pszDestPath);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * osl_psz_copyFile
- ****************************************/
-
-static oslFileError osl_psz_copyFile( const sal_Char* pszPath, const sal_Char* pszDestPath )
-{
-    time_t nAcTime=0;
-    time_t nModTime=0;
-    uid_t nUID=0;
-    gid_t nGID=0;
-    int nRet=0;
-    mode_t nMode=0;
-    struct stat aFileStat;
-    oslFileError tErr=osl_File_E_invalidError;
-    size_t nSourceSize=0;
-    int DestFileExists=1;
-
-    /* mfe: does the source file really exists? */
-    nRet = lstat(pszPath,&aFileStat);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    /* mfe: we do only copy files here! */
-    if ( S_ISDIR(aFileStat.st_mode) )
-    {
-        return osl_File_E_ISDIR;
-    }
-
-    nSourceSize=(size_t)aFileStat.st_size;
-    nMode=aFileStat.st_mode;
-    nAcTime=aFileStat.st_atime;
-    nModTime=aFileStat.st_mtime;
-    nUID=aFileStat.st_uid;
-    nGID=aFileStat.st_gid;
-
-    nRet = stat(pszDestPath,&aFileStat);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-
-        if ( nRet == ENOENT )
-        {
-            DestFileExists=0;
-        }
-/*        return oslTranslateFileError(nRet);*/
-    }
-
-    /* mfe: the destination file must not be a directory! */
-    if ( nRet == 0 && S_ISDIR(aFileStat.st_mode) )
-    {
-        return osl_File_E_ISDIR;
-    }
-    else
-    {
-        /* mfe: file does not exists or is no dir */
-    }
-
-    tErr = oslDoCopy(pszPath,pszDestPath,nMode,nSourceSize,DestFileExists);
-
-    if ( tErr != osl_File_E_None )
-    {
-        return tErr;
-    }
-
-    /*
-     *   mfe: ignore return code
-     *        since only  the success of the copy is
-     *        important
-     */
-    oslChangeFileModes(pszDestPath,nMode,nAcTime,nModTime,nUID,nGID);
-
-    return tErr;
-}
-
-
-/******************************************************************************
- *
- *                  Utility Functions
- *
- *****************************************************************************/
-
-/*****************************************
- * oslDoCopy
- ****************************************/
-
-#define TMP_DEST_FILE_EXTENSION ".osl-tmp"
-
-static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, mode_t nMode, size_t nSourceSize, int DestFileExists)
-{
-    int      nRet=0;
-    sal_Char pszTmpDestFile[PATH_MAX];
-    size_t   size_tmp_dest_buff = sizeof(pszTmpDestFile);
-
-    /* Quick fix for #106048, the whole copy file function seems
-       to be erroneous anyway and needs to be rewritten.
-       Besides osl_copyFile	is currently not used from OO/SO code.
-    */
-    memset(pszTmpDestFile, 0, size_tmp_dest_buff);
-
-    if ( DestFileExists )
-    {
-        strncpy(pszTmpDestFile, pszDestFileName, size_tmp_dest_buff - 1);
-
-        if ((strlen(pszTmpDestFile) + strlen(TMP_DEST_FILE_EXTENSION)) >= size_tmp_dest_buff)
-            return osl_File_E_NAMETOOLONG;
-
-        strncat(pszTmpDestFile, TMP_DEST_FILE_EXTENSION, strlen(TMP_DEST_FILE_EXTENSION));
-
-        /* FIXME: what if pszTmpDestFile already exists? */
-        /*        with getcanonical??? */
-        nRet=rename(pszDestFileName,pszTmpDestFile);
-    }
-
-    /* mfe: should be S_ISREG */
-    if ( !S_ISLNK(nMode) )
-    {
-        /* copy SourceFile to DestFile */
-        nRet = oslDoCopyFile(pszSourceFileName,pszDestFileName,nSourceSize, nMode);
-    }
-    /* mfe: OK redundant at the moment */
-    else if ( S_ISLNK(nMode) )
-    {
-        nRet = oslDoCopyLink(pszSourceFileName,pszDestFileName);
-    }
-    else
-    {
-        /* mfe: what to do here? */
-        nRet=ENOSYS;
-    }
-
-    if ( nRet > 0 && DestFileExists == 1 )
-    {
-        unlink(pszDestFileName);
-        rename(pszTmpDestFile,pszDestFileName);
-    }
-
-    if ( nRet > 0 )
-    {
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    if ( DestFileExists == 1 )
-    {
-        unlink(pszTmpDestFile);
-    }
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * oslChangeFileModes
- ****************************************/
-
-static oslFileError oslChangeFileModes( const sal_Char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID)
-{
-    int nRet=0;
-    struct utimbuf aTimeBuffer;
-
-    nRet = chmod(pszFileName,nMode);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    aTimeBuffer.actime=nAcTime;
-    aTimeBuffer.modtime=nModTime;
-    nRet=utime(pszFileName,&aTimeBuffer);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    if ( nUID != getuid() )
-    {
-        nUID=getuid();
-    }
-
-    nRet=chown(pszFileName,nUID,nGID);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-
-        /* mfe: do not return an error here! */
-        /* return oslTranslateFileError(nRet);*/
-    }
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * oslDoCopyLink
- ****************************************/
-
-static int oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName)
-{
-    int nRet=0;
-
-    /* mfe: if dest file is symbolic link remove the link and place the file instead (hro says so) */
-    /* mfe: if source is a link copy the link and not the file it points to (hro says so) */
-    sal_Char pszLinkContent[PATH_MAX];
-
-    pszLinkContent[0] = '\0';
-
-    nRet = readlink(pszSourceFileName,pszLinkContent,PATH_MAX);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return nRet;
-    }
-    else
-        pszLinkContent[ nRet ] = 0;
-
-    nRet = symlink(pszLinkContent,pszDestFileName);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return nRet;
-    }
-
-    return 0;
-}
-
-/*****************************************
- * oslDoCopyFile
- ****************************************/
-
-static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode)
-{    
-    int SourceFileFD=0;
-    int DestFileFD=0;
-    int nRet=0;
-    void* pSourceFile=0;
-
-    SourceFileFD=open(pszSourceFileName,O_RDONLY);
-    if ( SourceFileFD < 0 )
-    {		
-        nRet=errno;
-        return nRet;
-    }
-    
-    DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT, mode);
-        
-    if ( DestFileFD < 0 )
-    {
-        nRet=errno;
-        close(SourceFileFD);
-        return nRet;
-    }
-
-    /* HACK: because memory mapping fails on various 
-       platforms if the size of the source file is  0 byte */
-    if (0 == nSourceSize)
-    {						
-        close(SourceFileFD);
-        close(DestFileFD);
-        return 0;
-    }
-    
-    /* FIXME doCopy: fall back code for systems not having mmap */
-    /* mmap file -- open dest file -- write once -- fsync it */
-    pSourceFile=mmap(0,nSourceSize,PROT_READ,MAP_PRIVATE,SourceFileFD,0);
-    
-    if ( pSourceFile == MAP_FAILED )
-    {	
-        /* it's important to set nRet before the hack
-           otherwise errno may be changed by lstat */
-        nRet = errno;
-        close(SourceFileFD);
-        close(DestFileFD);
-        
-        return nRet;
-    }
-
-    nRet = write(DestFileFD,pSourceFile,nSourceSize);
-        
-    /* #112584# if 'write' could not write the requested number of bytes
-             we have to fail of course; because it's not exactly specified if 'write'
-            sets errno if less than requested byte could be written we set nRet
-           explicitly to ENOSPC */
-    if ((nRet < 0) || (nRet != sal::static_int_cast< int >(nSourceSize)))
-    {				
-        if (nRet < 0)
-            nRet = errno;
-        else 
-            nRet = ENOSPC;
-        
-        close(SourceFileFD);
-        close(DestFileFD);
-        munmap((char*)pSourceFile,nSourceSize);
-        return nRet;
-    }
-    
-    nRet = munmap((char*)pSourceFile,nSourceSize);
-    if ( nRet < 0 )
-    {				
-        nRet=errno;
-        close(SourceFileFD);
-        close(DestFileFD);
-        return nRet;
-    }
-    
-    close(SourceFileFD);
-    
-    // Removed call to 'fsync' again (#112584#) and instead 
-    // evaluate the return value of 'close' in order to detect 
-    // and report ENOSPC and other erronous conditions on close    
-    if (close(DestFileFD) == -1)
-        return errno;
-    else
-        return 0;
-}
-
-/*****************************************
- * oslMakeUStrFromPsz
- ****************************************/
-
-static rtl_uString* oslMakeUStrFromPsz(const sal_Char* pszStr, rtl_uString** ustrValid)
-{
-    rtl_string2UString(
-        ustrValid,
-        pszStr,
-        rtl_str_getLength( pszStr ),
-        osl_getThreadTextEncoding(),
-        OUSTRING_TO_OSTRING_CVTFLAGS );
-    OSL_ASSERT(*ustrValid != 0);
-
-    return *ustrValid;
-}
-
-/*****************************************************************************
- * UnicodeToText
- * converting unicode to text manually saves us the penalty of a temporary
- * rtl_String object.
- ****************************************************************************/
-
-int UnicodeToText( char * buffer, size_t bufLen, const sal_Unicode * uniText, sal_Int32 uniTextLen )
-{
-    rtl_UnicodeToTextConverter hConverter;
-    sal_uInt32   nInfo;
-    sal_Size   nSrcChars, nDestBytes;
-
-    /* stolen from rtl/string.c */
-    hConverter = rtl_createUnicodeToTextConverter( osl_getThreadTextEncoding() );
-
-    nDestBytes = rtl_convertUnicodeToText( hConverter, 0, uniText, uniTextLen,
-                                           buffer, bufLen,
-                                           OUSTRING_TO_OSTRING_CVTFLAGS | RTL_UNICODETOTEXT_FLAGS_FLUSH,
-                                           &nInfo, &nSrcChars );
-
-    rtl_destroyUnicodeToTextConverter( hConverter );
-
-    if( nInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL )
-    {
-        errno = EOVERFLOW;
-        return 0;
-    }
-
-    /* ensure trailing '\0' */
-    buffer[nDestBytes] = '\0';
-
-    return nDestBytes;
-}
-
-/*****************************************************************************
-   TextToUnicode
-
-   @param text
-          The text to convert.
-
-   @param text_buffer_size
-          The number of characters.
-
-   @param unic_text
-          The unicode buffer.
-
-   @param unic_text_buffer_size
-             The size in characters of the unicode buffer.
-
- ****************************************************************************/
-
-int TextToUnicode(
-    const char*  text,
-    size_t       text_buffer_size,
-    sal_Unicode* unic_text,
-    sal_Int32    unic_text_buffer_size)
-{
-    rtl_TextToUnicodeConverter hConverter;
-    sal_uInt32 nInfo;
-    sal_Size nSrcChars;
-    sal_Size nDestBytes;
-
-    /* stolen from rtl/string.c */
-    hConverter = rtl_createTextToUnicodeConverter(osl_getThreadTextEncoding());
-
-    nDestBytes = rtl_convertTextToUnicode(hConverter,
-                                          0,
-                                          text,  text_buffer_size,
-                                          unic_text, unic_text_buffer_size,
-                                          OSTRING_TO_OUSTRING_CVTFLAGS | RTL_TEXTTOUNICODE_FLAGS_FLUSH,
-                                          &nInfo, &nSrcChars);
-
-    rtl_destroyTextToUnicodeConverter(hConverter);
-
-    if (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL)
-    {
-        errno = EOVERFLOW;
-        return 0;
-    }
-
-    /* ensure trailing '\0' */
-    unic_text[nDestBytes] = '\0';
-
-    return nDestBytes;
-}
-
-/******************************************************************************
- *
- *                  GENERIC FLOPPY FUNCTIONS
- *
- *****************************************************************************/
-
-
-/*****************************************
- * osl_unmountVolumeDevice
- ****************************************/
-
-oslFileError osl_unmountVolumeDevice( oslVolumeDeviceHandle Handle )
-{
-    oslFileError tErr = osl_File_E_NOSYS;
-
-    tErr = osl_unmountFloppy(Handle);
-
-     /* Perhaps current working directory is set to mount point */
-
-     if ( tErr )
-    {
-        sal_Char *pszHomeDir = getenv("HOME");
-
-        if ( pszHomeDir && strlen( pszHomeDir ) && 0 == chdir( pszHomeDir ) )
-        {
-            /* try again */
-
-            tErr = osl_unmountFloppy(Handle);
-
-            OSL_ENSURE( tErr, "osl_unmountvolumeDevice: CWD was set to volume mount point" );
-        }
-    }
-
-    return tErr;
-}
-
-/*****************************************
- * osl_automountVolumeDevice
- ****************************************/
-
-oslFileError osl_automountVolumeDevice( oslVolumeDeviceHandle Handle )
-{
-    oslFileError tErr = osl_File_E_NOSYS;
-
-    tErr = osl_mountFloppy(Handle);
-
-    return tErr;
-}
-
-/*****************************************
- * osl_getVolumeDeviceMountPath
- ****************************************/
-
-oslFileError osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uString **pstrPath )
-{
-    oslVolumeDeviceHandleImpl* pItem = (oslVolumeDeviceHandleImpl*) Handle;
-    sal_Char Buffer[PATH_MAX];
-
-    Buffer[0] = '\0';
-
-    if ( pItem == 0 || pstrPath == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-        return osl_File_E_INVAL;
-    }
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"Handle is:\n");
-    osl_printFloppyHandle(pItem);
-#endif
-
-    snprintf(Buffer, sizeof(Buffer), "file://%s", pItem->pszMountPoint);
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"Mount Point is: '%s'\n",Buffer);
-#endif
-
-    oslMakeUStrFromPsz(Buffer, pstrPath);
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * osl_acquireVolumeDeviceHandle
- ****************************************/
-
-oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
-{
-    oslVolumeDeviceHandleImpl* pItem =(oslVolumeDeviceHandleImpl*) Handle;
-
-    if ( pItem == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    ++pItem->RefCount;
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * osl_releaseVolumeDeviceHandle
- ****************************************/
-
-oslFileError osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
-{
-    oslVolumeDeviceHandleImpl* pItem =(oslVolumeDeviceHandleImpl*) Handle;
-
-    if ( pItem == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    --pItem->RefCount;
-    
-    if ( pItem->RefCount == 0 )
-    {
-        rtl_freeMemory(pItem);
-    }
-    
-    return osl_File_E_None;
-}
-
-#ifndef MACOSX
-
-/*****************************************
- * osl_newVolumeDeviceHandleImpl
- ****************************************/
- 
-static oslVolumeDeviceHandleImpl* osl_newVolumeDeviceHandleImpl()
-{
-    oslVolumeDeviceHandleImpl* pHandle;
-    const size_t               nSizeOfHandle = sizeof(oslVolumeDeviceHandleImpl);
- 
-    pHandle = (oslVolumeDeviceHandleImpl*) rtl_allocateMemory (nSizeOfHandle);
-    if (pHandle != NULL)
-    {
-        pHandle->ident[0]         = 'O';
-        pHandle->ident[1]         = 'V';
-        pHandle->ident[2]         = 'D';
-        pHandle->ident[3]         = 'H';
-        pHandle->pszMountPoint[0] = '\0';
-        pHandle->pszFilePath[0]   = '\0';
-        pHandle->pszDevice[0]     = '\0';
-        pHandle->RefCount         = 1;
-    }
-    return pHandle;   
-}
-
-/*****************************************
- * osl_freeVolumeDeviceHandleImpl
- ****************************************/
- 
-static void osl_freeVolumeDeviceHandleImpl (oslVolumeDeviceHandleImpl* pHandle)
-{
-    if (pHandle != NULL)
-        rtl_freeMemory (pHandle);
-}
-#endif
-
-/******************************************************************************
- *
- *                  SOLARIS FLOPPY FUNCTIONS
- *
- *****************************************************************************/
-
-#if defined(SOLARIS)
-/* compare a given devicename with the typical device names on a Solaris box */
-static sal_Bool
-osl_isAFloppyDevice (const char* pDeviceName)
-{
-    const char* pFloppyDevice [] = { 
-        "/dev/fd",           "/dev/rfd", 
-        "/dev/diskette",     "/dev/rdiskette", 
-        "/vol/dev/diskette", "/vol/dev/rdiskette" 
-    };
-
-    int i;
-    for (i = 0; i < (sizeof(pFloppyDevice)/sizeof(pFloppyDevice[0])); i++)
-    {
-        if (strncmp(pDeviceName, pFloppyDevice[i], strlen(pFloppyDevice[i])) == 0)
-            return sal_True;
-    }
-    return sal_False;
-}
-
-/* compare two directories whether the first may be a parent of the second. this
- * does not realpath() resolving */
-static sal_Bool
-osl_isAParentDirectory (const char* pParentDir, const char* pSubDir)
-{
-    return strncmp(pParentDir, pSubDir, strlen(pParentDir)) == 0; 
-}
-
-/* the name of the routine is obviously silly. But anyway create a 
- * oslVolumeDeviceHandle with correct mount point, device name and a resolved filepath
- * only if pszPath points to file or directory on a floppy */
-static oslVolumeDeviceHandle 
-osl_isFloppyDrive(const sal_Char* pszPath)
-{
-    FILE*                       pMountTab;
-    struct mnttab               aMountEnt;
-    oslVolumeDeviceHandleImpl*  pHandle;
-
-    if ((pHandle = osl_newVolumeDeviceHandleImpl()) == NULL)
-    {
-        return NULL;
-    }
-    if (realpath(pszPath, pHandle->pszFilePath) == NULL)
-    {
-        osl_freeVolumeDeviceHandleImpl (pHandle);
-        return NULL;
-    }
-    if ((pMountTab = fopen (MOUNTTAB, "r")) == NULL)
-    {
-        osl_freeVolumeDeviceHandleImpl (pHandle);
-        return NULL;
-    }
-
-    while (getmntent(pMountTab, &aMountEnt) == 0)
-    {
-        const char *pMountPoint = aMountEnt.mnt_mountp;
-        const char *pDevice     = aMountEnt.mnt_special; 
-        if (   osl_isAParentDirectory (aMountEnt.mnt_mountp, pHandle->pszFilePath)
-            && osl_isAFloppyDevice    (aMountEnt.mnt_special))
-        {
-            /* skip the last item for it is the name of the disk */
-            char * pc = strrchr( aMountEnt.mnt_special, '/' );
-            
-            if ( NULL != pc )
-            {
-                int len = pc - aMountEnt.mnt_special;
-                                
-                strncpy( pHandle->pszDevice, aMountEnt.mnt_special, len );
-                pHandle->pszDevice[len] = '\0';
-            }
-            else
-            {
-                /* #106048 use save str functions to avoid buffer overflows */
-                memset(pHandle->pszDevice, 0, sizeof(pHandle->pszDevice));				
-                strncpy(pHandle->pszDevice, aMountEnt.mnt_special, sizeof(pHandle->pszDevice) - 1);				                
-            }
-            
-            /* remember the mount point */
-            memset(pHandle->pszMountPoint, 0, sizeof(pHandle->pszMountPoint));
-            strncpy(pHandle->pszMountPoint, aMountEnt.mnt_mountp, sizeof(pHandle->pszMountPoint) - 1);
-                        
-            fclose (pMountTab);
-            return pHandle;
-        }
-    }
-
-    fclose (pMountTab);
-    osl_freeVolumeDeviceHandleImpl (pHandle);
-    return NULL;
-}
-
-static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
-{
-    FILE*                       pMountTab;
-    struct mnttab               aMountEnt;
-    oslVolumeDeviceHandleImpl*  pHandle = (oslVolumeDeviceHandleImpl*) hFloppy;
-
-    int nRet=0;
-    sal_Char pszCmd[512] = "";
-   
-    if ( pHandle == 0 )
-        return osl_File_E_INVAL;
-
-    /* FIXME: don't know what this is good for */    
-    if ( pHandle->ident[0] != 'O' || pHandle->ident[1] != 'V' || pHandle->ident[2] != 'D' || pHandle->ident[3] != 'H' )
-        return osl_File_E_INVAL;
-
-    snprintf(pszCmd, sizeof(pszCmd), "eject -q %s > /dev/null 2>&1", pHandle->pszDevice);
-    
-    nRet = system( pszCmd );
-
-    switch ( WEXITSTATUS(nRet) )
-    {
-    case 0:        
-        {
-            /* lookup the device in mount tab again */
-            if ((pMountTab = fopen (MOUNTTAB, "r")) == NULL)
-                return osl_File_E_BUSY;
-
-            while (getmntent(pMountTab, &aMountEnt) == 0)
-            {
-                const char *pMountPoint = aMountEnt.mnt_mountp;
-                const char *pDevice     = aMountEnt.mnt_special; 
-                if ( 0 == strncmp( pHandle->pszDevice, aMountEnt.mnt_special, strlen(pHandle->pszDevice) ) )
-                {
-                    memset(pHandle->pszMountPoint, 0, sizeof(pHandle->pszMountPoint));
-                    strncpy (pHandle->pszMountPoint, aMountEnt.mnt_mountp, sizeof(pHandle->pszMountPoint) - 1);
-                                        
-                    fclose (pMountTab);
-                    return osl_File_E_None;
-                }
-            }
-
-            fclose (pMountTab);
-            return osl_File_E_BUSY;
-        }
-        //break; // break not necessary here, see return statements before
-         
-    case 1:
-        return osl_File_E_BUSY;
-
-    default:
-        break;
-    }
-
-    return osl_File_E_BUSY;
-}
-
-static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
-{
-//    FILE*                       pMountTab;
-//    struct mnttab               aMountEnt;
-    oslVolumeDeviceHandleImpl*  pHandle = (oslVolumeDeviceHandleImpl*) hFloppy;    
-    
-    int nRet=0;
-    sal_Char pszCmd[512] = "";
-    
-    if ( pHandle == 0 )
-        return osl_File_E_INVAL;
-
-    /* FIXME: don't know what this is good for */    
-    if ( pHandle->ident[0] != 'O' || pHandle->ident[1] != 'V' || pHandle->ident[2] != 'D' || pHandle->ident[3] != 'H' )
-        return osl_File_E_INVAL;
-    
-    snprintf(pszCmd, sizeof(pszCmd), "eject %s > /dev/null 2>&1", pHandle->pszDevice);
-    
-    nRet = system( pszCmd );
-
-    switch ( WEXITSTATUS(nRet) )
-    {
-    case 0:        
-        {
-            FILE*         pMountTab;
-            struct mnttab aMountEnt;
-            
-            /* lookup if device is still in mount tab */
-            if ((pMountTab = fopen (MOUNTTAB, "r")) == NULL)
-                return osl_File_E_BUSY;
-
-            while (getmntent(pMountTab, &aMountEnt) == 0)
-            {
-                const char *pMountPoint = aMountEnt.mnt_mountp;
-                const char *pDevice     = aMountEnt.mnt_special; 
-                if ( 0 == strncmp( pHandle->pszDevice, aMountEnt.mnt_special, strlen(pHandle->pszDevice) ) )
-                {
-                    fclose (pMountTab);
-                    return osl_File_E_BUSY;
-                }
-            }
-
-            fclose (pMountTab);
-            pHandle->pszMountPoint[0] = 0;
-            return osl_File_E_None;
-        }
-        
-        //break; //break not necessary, see return statements before
-        
-    case 1:
-        return osl_File_E_NODEV;
-
-    case 4:
-        pHandle->pszMountPoint[0] = 0;
-        return osl_File_E_None;
-
-    default:
-        break;
-    }
-
-    return osl_File_E_BUSY;
-}
-
-#endif /* SOLARIS */
-
-/******************************************************************************
- *
- *                  LINUX FLOPPY FUNCTIONS
- *
- *****************************************************************************/
-
-#if defined(LINUX)
-static oslVolumeDeviceHandle 
-osl_isFloppyDrive (const sal_Char* pszPath)
-{
-    oslVolumeDeviceHandleImpl* pItem = osl_newVolumeDeviceHandleImpl(); 
-    if (osl_getFloppyMountEntry(pszPath, pItem))
-        return (oslVolumeDeviceHandle) pItem;
-    
-    osl_freeVolumeDeviceHandleImpl (pItem);
-    return 0;
-}
-#endif /* LINUX */
-
-#if defined(LINUX)
-static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
-{       
-    sal_Bool bRet = sal_False;
-    oslVolumeDeviceHandleImpl* pItem=0;
-    int nRet;
-    sal_Char  pszCmd[PATH_MAX];
-    const sal_Char* pszMountProg = "mount";
-    sal_Char* pszSuDo = 0;
-    sal_Char* pszTmp = 0;
-
-    pszCmd[0] = '\0';
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"In  osl_mountFloppy\n");
-#endif
-
-    pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
-    
-    if ( pItem == 0 )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_mountFloppy [pItem == 0]\n");
-#endif
-        
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_mountFloppy [invalid handle]\n");
-#endif
-        return osl_File_E_INVAL;
-    }
-    
-    bRet = osl_isFloppyMounted(pItem);
-    if ( bRet == sal_True )
-    {
-#ifdef DEBUG_OSL_FILE
-        fprintf(stderr,"detected mounted floppy at '%s'\n",pItem->pszMountPoint);
-#endif
-        return osl_File_E_BUSY;
-    }
-
-    /* mfe: we can't use the mount(2) system call!!!   */
-    /*      even if we are root                        */
-    /*      since mtab is not updated!!!               */
-    /*      but we need it to be updated               */
-    /*      some "magic" must be done                  */
-
-/*      nRet = mount(pItem->pszDevice,pItem->pszMountPoint,0,0,0); */
-/*      if ( nRet != 0 ) */
-/*      { */
-/*          nRet=errno; */
-/*  #ifdef DEBUG_OSL_FILE */
-/*          perror("mount"); */
-/*  #endif */
-/*      } */
-
-    pszTmp = getenv("SAL_MOUNT_MOUNTPROG");
-    if ( pszTmp != 0 )
-    {
-        pszMountProg=pszTmp;
-    }
-
-    pszTmp=getenv("SAL_MOUNT_SU_DO");
-    if ( pszTmp != 0 )
-    {
-        pszSuDo=pszTmp;
-    }
-    
-    if ( pszSuDo != 0 )
-    {
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s %s",pszSuDo,pszMountProg,pItem->pszDevice,pItem->pszMountPoint);
-    }
-    else
-    {
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszMountProg,pItem->pszMountPoint);        
-    }
-    
-    
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"executing '%s'\n",pszCmd);
-#endif
-    
-    nRet = system(pszCmd);    
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"call returned '%i'\n",nRet);
-    fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
-#endif
-    
-    
-    switch ( WEXITSTATUS(nRet) )
-    {
-    case 0:
-        nRet=0;
-        break;
-        
-    case 2:
-        nRet=EPERM;
-        break;
-
-    case 4:
-        nRet=ENOENT;
-        break;
-
-    case 8:
-        nRet=EINTR;
-        break;
-
-    case 16:
-        nRet=EPERM;
-        break;
-
-    case 32:
-        nRet=EBUSY;
-        break;
-
-    case 64:
-        nRet=EAGAIN;
-        break;
-
-    default:
-        nRet=EBUSY;
-        break;
-    }
-    
-    return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
-}
-#endif /* LINUX */
-
-
-#if defined(LINUX)
-static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
-{
-    oslVolumeDeviceHandleImpl* pItem=0;
-    int nRet=0;
-    sal_Char pszCmd[PATH_MAX];
-    sal_Char* pszTmp = 0;
-    sal_Char* pszSuDo = 0;
-    const sal_Char* pszUmountProg = "umount";
-
-    pszCmd[0] = '\0';
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"In  osl_unmountFloppy\n");
-#endif    
-
-    pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
-    
-    if ( pItem == 0 )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_unmountFloppy [pItem==0]\n");
-#endif
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_unmountFloppy [invalid handle]\n");
-#endif
-        return osl_File_E_INVAL;
-    }
-
-    /* mfe: we can't use the umount(2) system call!!!  */
-    /*      even if we are root                        */
-    /*      since mtab is not updated!!!               */
-    /*      but we need it to be updated               */
-    /*      some "magic" must be done                  */
-
-/*      nRet=umount(pItem->pszDevice); */
-/*      if ( nRet != 0 ) */
-/*      { */
-/*          nRet = errno; */
-        
-/*  #ifdef DEBUG_OSL_FILE */
-/*          perror("mount"); */
-/*  #endif */
-/*      } */
-    
-    
-    pszTmp = getenv("SAL_MOUNT_UMOUNTPROG");
-    if ( pszTmp != 0 )
-    {
-        pszUmountProg=pszTmp;
-    }
-
-    pszTmp = getenv("SAL_MOUNT_SU_DO");
-    if ( pszTmp != 0 )
-    {
-        pszSuDo=pszTmp;
-    }
-
-    if ( pszSuDo != 0 )
-    {    
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s",pszSuDo,pszUmountProg,pItem->pszMountPoint);        
-    }
-    else
-    {
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszUmountProg,pItem->pszMountPoint);
-    }
-    
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"executing '%s'\n",pszCmd);
-#endif
-    
-    nRet = system(pszCmd);    
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"call returned '%i'\n",nRet);
-    fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
-#endif
-    
-    switch ( WEXITSTATUS(nRet) )
-    {
-    case 0:
-        nRet=0;
-        break;
-
-    default:
-        nRet=EBUSY;
-        break;
-    }
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"Out osl_unmountFloppy [ok]\n");
-#endif    
-
-    return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
-    
-/*    return osl_File_E_None;*/
-}
-
-#endif /* LINUX */
-
-#if defined(LINUX)
-static sal_Bool 
-osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
-{
-    struct mntent* pMountEnt;
-    FILE*          pMountTab;
-
-    pMountTab = setmntent (MOUNTTAB, "r");
-    if (pMountTab == 0)
-        return sal_False;
-
-    while ((pMountEnt = getmntent(pMountTab)) != 0)
-    {
-        if (   strncmp(pMountEnt->mnt_dir,    pszPath,   strlen(pMountEnt->mnt_dir)) == 0 
-            && strncmp(pMountEnt->mnt_fsname, "/dev/fd", strlen("/dev/fd")) == 0)
-        {
-            memset(pItem->pszMountPoint, 0, sizeof(pItem->pszMountPoint));			
-            strncpy(pItem->pszMountPoint, pMountEnt->mnt_dir, sizeof(pItem->pszMountPoint) - 1);
-            
-            memset(pItem->pszFilePath, 0, sizeof(pItem->pszFilePath));
-            strncpy(pItem->pszFilePath, pMountEnt->mnt_dir, sizeof(pItem->pszFilePath) - 1);
-            
-            memset(pItem->pszDevice, 0, sizeof(pItem->pszDevice));
-            strncpy(pItem->pszDevice, pMountEnt->mnt_fsname, sizeof(pItem->pszDevice) - 1);
-                       
-            endmntent (pMountTab);
-            return sal_True; 
-        }
-    }    
-
-    endmntent (pMountTab);
-    return sal_False;
-}
-#endif /* LINUX */
-
-#if defined(LINUX)
-static sal_Bool 
-osl_isFloppyMounted (oslVolumeDeviceHandleImpl* pDevice)
-{
-    oslVolumeDeviceHandleImpl aItem;    
-
-    if (   osl_getFloppyMountEntry (pDevice->pszMountPoint, &aItem)
-        && strcmp (aItem.pszMountPoint, pDevice->pszMountPoint) == 0 
-        && strcmp (aItem.pszDevice,     pDevice->pszDevice) == 0)
-    {
-        return sal_True;
-    }
-    return sal_False;    
-}
-#endif /* LINUX */
-
-/******************************************************************************
- *
- *                  IRIX FLOPPY FUNCTIONS
- *
- *****************************************************************************/
-
-#if defined(IRIX)
-static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
-{
-    oslVolumeDeviceHandleImpl* pItem = osl_newVolumeDeviceHandleImpl ();    
-    sal_Bool bRet = sal_False;
-    
-#ifdef TRACE_OSL_FILE   
-    fprintf(stderr,"In  osl_isFloppyDrive\n");
-#endif
-
-    bRet=osl_getFloppyMountEntry(pszPath,pItem);
-
-    if ( bRet == sal_False )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_isFloppyDrive [not a floppy]\n");
-#endif
-        rtl_freeMemory(pItem);
-        return 0;
-    }
-
-    
-#ifdef DEBUG_OSL_FILE
-    osl_printFloppyHandle(pItem);
-#endif
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"Out osl_isFloppyDrive [ok]\n");
-#endif
-    
-    return (oslVolumeDeviceHandle) pItem;
-}
-
-
-static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
-{       
-    sal_Bool bRet = sal_False;
-    oslVolumeDeviceHandleImpl* pItem=0;
-    int nRet;
-    sal_Char  pszCmd[PATH_MAX];
-    sal_Char* pszMountProg = "mount";
-    sal_Char* pszSuDo = 0;
-    sal_Char* pszTmp = 0;
-
-    pszCmd[0] = '\0';
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"In  osl_mountFloppy\n");
-#endif
-
-    pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
-    
-    if ( pItem == 0 )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_mountFloppy [pItem == 0]\n");
-#endif
-        
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_mountFloppy [invalid handle]\n");
-#endif
-        return osl_File_E_INVAL;
-    }
-    
-    bRet = osl_isFloppyMounted(pItem);
-    if ( bRet == sal_True )
-    {
-#ifdef DEBUG_OSL_FILE
-        fprintf(stderr,"detected mounted floppy at '%s'\n",pItem->pszMountPoint);
-#endif
-        return osl_File_E_BUSY;
-    }
-
-    /* mfe: we can't use the mount(2) system call!!!   */
-    /*      even if we are root                        */
-    /*      since mtab is not updated!!!               */
-    /*      but we need it to be updated               */
-    /*      some "magic" must be done                  */
-
-/*      nRet = mount(pItem->pszDevice,pItem->pszMountPoint,0,0,0); */
-/*      if ( nRet != 0 ) */
-/*      { */
-/*          nRet=errno; */
-/*  #ifdef DEBUG_OSL_FILE */
-/*          perror("mount"); */
-/*  #endif */
-/*      } */
-
-    pszTmp = getenv("SAL_MOUNT_MOUNTPROG");
-    if ( pszTmp != 0 )
-    {
-        pszMountProg=pszTmp;
-    }
-
-    pszTmp=getenv("SAL_MOUNT_SU_DO");
-    if ( pszTmp != 0 )
-    {
-        pszSuDo=pszTmp;
-    }
-    
-    if ( pszSuDo != 0 )
-    {
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s %s",pszSuDo,pszMountProg,pItem->pszDevice,pItem->pszMountPoint);
-    }
-    else
-    {
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszMountProg,pItem->pszMountPoint);        
-    }
-    
-    
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"executing '%s'\n",pszCmd);
-#endif
-    
-    nRet = system(pszCmd);    
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"call returned '%i'\n",nRet);
-    fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
-#endif
-    
-    
-    switch ( WEXITSTATUS(nRet) )
-    {
-    case 0:
-        nRet=0;
-        break;
-        
-    case 2:
-        nRet=EPERM;
-        break;
-
-    case 4:
-        nRet=ENOENT;
-        break;
-
-    case 8:
-        nRet=EINTR;
-        break;
-
-    case 16:
-        nRet=EPERM;
-        break;
-
-    case 32:
-        nRet=EBUSY;
-        break;
-
-    case 64:
-        nRet=EAGAIN;
-        break;
-
-    default:
-        nRet=EBUSY;
-        break;
-    }
-    
-    return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
-}
-
-static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
-{
-    oslVolumeDeviceHandleImpl* pItem=0;
-    int nRet=0;
-    sal_Char pszCmd[PATH_MAX];
-    sal_Char* pszTmp = 0;
-    sal_Char* pszSuDo = 0;
-    sal_Char* pszUmountProg = "umount";
-
-    pszCmd[0] = '\0';
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"In  osl_unmountFloppy\n");
-#endif    
-
-    pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
-    
-    if ( pItem == 0 )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_unmountFloppy [pItem==0]\n");
-#endif
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_unmountFloppy [invalid handle]\n");
-#endif
-        return osl_File_E_INVAL;
-    }
-
-    /* mfe: we can't use the umount(2) system call!!!  */
-    /*      even if we are root                        */
-    /*      since mtab is not updated!!!               */
-    /*      but we need it to be updated               */
-    /*      some "magic" must be done                  */
-
-/*      nRet=umount(pItem->pszDevice); */
-/*      if ( nRet != 0 ) */
-/*      { */
-/*          nRet = errno; */
-        
-/*  #ifdef DEBUG_OSL_FILE */
-/*          perror("mount"); */
-/*  #endif */
-/*      } */
-    
-    
-    pszTmp = getenv("SAL_MOUNT_UMOUNTPROG");
-    if ( pszTmp != 0 )
-    {
-        pszUmountProg=pszTmp;
-    }
-
-    pszTmp = getenv("SAL_MOUNT_SU_DO");
-    if ( pszTmp != 0 )
-    {
-        pszSuDo=pszTmp;
-    }
-
-    if ( pszSuDo != 0 )
-    {    
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s",pszSuDo,pszUmountProg,pItem->pszMountPoint);        
-    }
-    else
-    {
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszUmountProg,pItem->pszMountPoint);
-    }
-    
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"executing '%s'\n",pszCmd);
-#endif
-    
-    nRet = system(pszCmd);    
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"call returned '%i'\n",nRet);
-    fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
-#endif
-    
-    switch ( WEXITSTATUS(nRet) )
-    {
-    case 0:
-        nRet=0;
-        break;
-
-    default:
-        nRet=EBUSY;
-        break;
-    }
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"Out osl_unmountFloppy [ok]\n");
-#endif    
-
-    return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
-    
-/*    return osl_File_E_None;*/
-}
-
-static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
-{
-    struct mntent* pMountEnt=0;
-    sal_Char buffer[PATH_MAX];
-    FILE* mntfile=0;
-    int nRet=0;
-
-    buffer[0] = '\0';
-    
-    mntfile = setmntent(MOUNTTAB,"r");
-
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"In  osl_getFloppyMountEntry\n");
-#endif
-
-    memset(buffer, 0, sizeof(buffer));
-    strncpy(buffer, pszPath, sizeof(buffer) - 1);
-    
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"Checking mount of %s\n",buffer);
-#endif
-
-    
-    if ( mntfile == 0 )
-    {
-        nRet=errno;
-#ifdef DEBUG_OSL_FILE
-        perror("mounttab");
-#endif
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_getFloppyMountEntry [mntfile]\n");
-#endif
-        return sal_False;
-    }
-
-    pMountEnt=getmntent(mntfile);
-    while ( pMountEnt != 0 )
-    {
-#ifdef DEBUG_OSL_FILE
-/*           fprintf(stderr,"mnt_fsname : %s\n",pMountEnt->mnt_fsname); */
-/*           fprintf(stderr,"mnt_dir    : %s\n",pMountEnt->mnt_dir); */
-/*        fprintf(stderr,"mnt_type   : %s\n",pMountEnt->mnt_type);*/
-#endif
-        if ( strcmp(pMountEnt->mnt_dir,buffer) == 0 &&
-             strncmp(pMountEnt->mnt_fsname,"/dev/fd",strlen("/dev/fd")) == 0 )
-        {
-            
-            memset(pItem->pszMountPoint, 0, sizeof(pItem->pszMountPoint));			
-            strncpy(pItem->pszMountPoint, pMountEnt->mnt_dir, sizeof(pItem->pszMountPoint) - 1);
-            
-            memset(pItem->pszFilePath, 0, sizeof(pItem->pszFilePath));
-            strncpy(pItem->pszFilePath, pMountEnt->mnt_dir, sizeof(pItem->pszFilePath) - 1);
-            
-            memset(pItem->pszDevice, 0, sizeof(pItem->pszDevice));
-            strncpy(pItem->pszDevice, pMountEnt->mnt_fsname, sizeof(pItem->pszDevice) - 1);
-                                    
-            fclose(mntfile);
-#ifdef DEBUG_OSL_FILE
-            fprintf(stderr,"Mount Point found '%s'\n",pItem->pszMountPoint);
-#endif
-#ifdef TRACE_OSL_FILE
-            fprintf(stderr,"Out osl_getFloppyMountEntry [found]\n");
-#endif
-            return sal_True;
-        }
-#ifdef DEBUG_OSL_FILE
-/*        fprintf(stderr,"=================\n");*/
-#endif
-        pMountEnt=getmntent(mntfile);
-    }    
-
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"Out osl_getFloppyMountEntry [not found]\n");
-#endif
-
-    fclose(mntfile);
-    return sal_False;
-}
-
-static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
-{
-    sal_Char buffer[PATH_MAX];
-    oslVolumeDeviceHandleImpl* pItem=0;    
-    sal_Bool bRet=0;
-
-    buffer[0] = '\0';
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"In  osl_isFloppyMounted\n");
-#endif
-
-    pItem = osl_newVolumeDeviceHandleImpl ();
-    if ( pItem == 0 )
-        return osl_File_E_NOMEM;
-    
-    memset(buffer, 0, sizeof(buffer));	
-    strncpy(buffer, pDevice->pszMountPoint, sizeof(buffer) - 1);
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"Checking mount of %s\n",buffer);
-#endif
-
-    bRet = osl_getFloppyMountEntry(buffer,pItem);
-
-    if ( bRet == sal_False )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_isFloppyMounted [not mounted]\n");
-#endif
-        return sal_False;
-    }
-
-    if (strcmp(pItem->pszMountPoint, pDevice->pszMountPoint) == 0 &&
-        strcmp(pItem->pszDevice,pDevice->pszDevice) == 0)
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_isFloppyMounted [is mounted]\n");
-#endif
-        rtl_freeMemory(pItem);
-        return sal_True;
-    }
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"Out osl_isFloppyMounted [may be EBUSY]\n");
-#endif
-
-    rtl_freeMemory(pItem);
-    return sal_False;    
-}
-#endif /* IRIX */
-
-
-/* NetBSD floppy functions have to be added here. Until we have done that, 
- * we use the MACOSX definitions for nonexistent floppy.
- * */
-
-/******************************************************************************
- *
- *                  MAC OS X FLOPPY FUNCTIONS
- *
- *****************************************************************************/
-
-#if (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
-static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
-{
-    return NULL;
-}
-#endif /* MACOSX */
-
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
-static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
-{
-    return osl_File_E_BUSY;
-}
-#endif /* MACOSX */
-
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
-static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
-{
-    return osl_File_E_BUSY;
-}
-#endif /* MACOSX */
-
-#if ( defined(NETBSD) || defined(FREEBSD) )
-static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
-{
-    return sal_False;
-}
-#endif /* NETBSD || FREEBSD */
-
-#if ( defined(NETBSD) || defined(FREEBSD) )
-static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
-{
-    return sal_False;
-}
-#endif /* NETBSD || FREEBSD */
-
-
-#ifdef DEBUG_OSL_FILE
-static void osl_printFloppyHandle(oslVolumeDeviceHandleImpl* pItem)
-{
-    if (pItem == 0 )
-    {
-        fprintf(stderr,"NULL Handle\n");
-        return;
-    }
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Invalid Handle]\n");
-#endif
-        return;
-    }
-    
-
-    fprintf(stderr,"MountPoint : '%s'\n",pItem->pszMountPoint);
-    fprintf(stderr,"FilePath   : '%s'\n",pItem->pszFilePath);
-    fprintf(stderr,"Device     : '%s'\n",pItem->pszDevice);
-
-    return;    
-}
-#endif
-
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: file.cxx,v $
+ * $Revision: 1.21 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sal.hxx"
+
+#include "osl/file.hxx"
+
+#include "osl/diagnose.h"
+#include "rtl/alloc.h"
+
+#include "system.h"
+#include "file_error_transl.h"
+#include "file_url.h"
+
+#include <algorithm>
+#include <limits>
+
+#include <string.h>
+#include <sys/mman.h>
+
+#if defined(MACOSX)
+
+#include <sys/param.h>
+#include <sys/mount.h>
+#define HAVE_O_EXLOCK
+
+// add MACOSX Time Value
+#define TimeValue CFTimeValue
+#include <CoreFoundation/CoreFoundation.h>
+#undef TimeValue
+
+#endif /* MACOSX */
+
+#ifdef DEBUG_OSL_FILE
+#   define OSL_FILE_TRACE 0 ? (void)(0) : osl_trace
+#	define PERROR( a, b ) perror( a ); fprintf( stderr, b )
+#else
+#   define OSL_FILE_TRACE 1 ? (void)(0) : osl_trace
+#	define PERROR( a, b )
+#endif
+
+/*******************************************************************
+ *
+ * FileHandle_Impl interface
+ *
+ ******************************************************************/
+struct FileHandle_Impl
+{
+    rtl_String * m_strFilePath; /* holds native file path */
+    int          m_fd;
+
+    /** State
+     */
+    enum StateBits
+    {
+        STATE_SEEKABLE  = 1, /* default */
+        STATE_READABLE  = 2, /* default */
+        STATE_WRITEABLE = 4, /* open() sets, write() requires, else osl_File_E_BADF */
+        STATE_MODIFIED  = 8  /* write() sets, flush() resets  */
+    };
+    int          m_state;
+
+    sal_uInt64   m_size;    /* file size */
+    off_t        m_offset;  /* physical offset from begin of file */
+    off_t        m_fileptr; /* logical offset from begin of file */
+
+    off_t        m_bufptr;  /* buffer offset from begin of file */
+    size_t       m_buflen;  /* buffer filled [0, m_bufsiz - 1] */
+
+    size_t       m_bufsiz;
+    sal_uInt8 *  m_buffer;
+
+    explicit FileHandle_Impl (int fd, char const * path = "<anon>");
+    ~FileHandle_Impl();
+
+    static void* operator new (size_t n);
+    static void  operator delete (void * p, size_t);
+
+    static size_t getpagesize();
+
+    sal_uInt64   getPos() const;
+    oslFileError setPos (sal_uInt64 uPos);
+
+    sal_uInt64   getSize() const;
+
+    oslFileError readAt (
+        off_t        nOffset,
+        void *       pBuffer,
+        size_t       nBytesRequested,
+        sal_uInt64 * pBytesRead);
+
+    oslFileError writeAt (
+        off_t        nOffset,
+        void const * pBuffer,
+        size_t       nBytesToWrite,
+        sal_uInt64 * pBytesWritten);
+
+    oslFileError readFileAt (
+        off_t        nOffset,
+        void *       pBuffer,
+        size_t       nBytesRequested,
+        sal_uInt64 * pBytesRead);
+
+    oslFileError writeFileAt (
+        off_t        nOffset,
+        void const * pBuffer,
+        size_t       nBytesToWrite,
+        sal_uInt64 * pBytesWritten);
+
+    oslFileError readLineAt (
+        off_t           nOffset,
+        sal_Sequence ** ppSequence,
+        sal_uInt64 *    pBytesRead);
+
+    oslFileError writeSequence_Impl (
+        sal_Sequence ** ppSequence,
+        size_t *        pnOffset,
+        const void *    pBuffer,
+        size_t          nBytes);
+
+    oslFileError syncFile();
+
+    /** Buffer cache / allocator.
+     */
+    class Allocator
+    {
+        rtl_cache_type * m_cache;
+        size_t           m_bufsiz;
+
+        Allocator (Allocator const &);
+        Allocator & operator= (Allocator const &);
+
+    public:
+        static Allocator & get();
+
+        void allocate (sal_uInt8 ** ppBuffer, size_t * pnSize);
+        void deallocate (sal_uInt8 * pBuffer);
+
+    protected:
+        Allocator();
+        ~Allocator();
+    };
+};
+
+/*******************************************************************
+ *
+ * FileHandle_Impl implementation
+ *
+ ******************************************************************/
+
+FileHandle_Impl::Allocator &
+FileHandle_Impl::Allocator::get()
+{
+    static Allocator g_aBufferAllocator;
+    return g_aBufferAllocator;
+}
+
+FileHandle_Impl::Allocator::Allocator()
+    : m_cache  (0),
+      m_bufsiz (0)
+{
+    size_t const pagesize = FileHandle_Impl::getpagesize();
+    if (size_t(-1) != pagesize)
+    {
+        m_cache  = rtl_cache_create (
+            "osl_file_buffer_cache", pagesize, 0, 0, 0, 0, 0, 0, 0);
+        if (0 != m_cache)
+            m_bufsiz = pagesize;
+    }
+}
+FileHandle_Impl::Allocator::~Allocator()
+{
+    rtl_cache_destroy (m_cache), m_cache = 0;
+}
+
+void FileHandle_Impl::Allocator::allocate (sal_uInt8 ** ppBuffer, size_t * pnSize)
+{
+    OSL_PRECOND((0 != ppBuffer) && (0 != pnSize), "FileHandle_Impl::Allocator::allocate(): contract violation");
+    *ppBuffer = static_cast< sal_uInt8* >(rtl_cache_alloc(m_cache)), *pnSize = m_bufsiz;
+}
+void FileHandle_Impl::Allocator::deallocate (sal_uInt8 * pBuffer)
+{
+    if (0 != pBuffer)
+        rtl_cache_free (m_cache, pBuffer);
+}
+
+FileHandle_Impl::FileHandle_Impl (int fd, char const * path)
+    : m_strFilePath (0),
+      m_fd      (fd),
+      m_state   (STATE_SEEKABLE | STATE_READABLE),
+      m_size    (0),
+      m_offset  (0),
+      m_fileptr (0),
+      m_bufptr  (-1),
+      m_buflen  (0),
+      m_bufsiz  (0),
+      m_buffer  (0)
+{
+    rtl_string_newFromStr (&m_strFilePath, path);
+    Allocator::get().allocate (&m_buffer, &m_bufsiz);
+    if (0 != m_buffer)
+        memset (m_buffer, 0, m_bufsiz);
+}
+FileHandle_Impl::~FileHandle_Impl()
+{
+    Allocator::get().deallocate (m_buffer), m_buffer = 0;
+    rtl_string_release (m_strFilePath), m_strFilePath = 0;
+}
+
+void* FileHandle_Impl::operator new (size_t n)
+{
+    return rtl_allocateMemory(n);
+}
+void FileHandle_Impl::operator delete (void * p, size_t)
+{
+    rtl_freeMemory(p);
+}
+
+size_t FileHandle_Impl::getpagesize()
+{
+#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
+    return sal::static_int_cast< size_t >(::getpagesize());
+#else /* POSIX */
+    return sal::static_int_cast< size_t >(::sysconf(_SC_PAGESIZE));
+#endif /* xBSD || POSIX */
+}
+
+sal_uInt64 FileHandle_Impl::getPos() const
+{
+    return sal::static_int_cast< sal_uInt64 >(m_fileptr);
+}
+
+oslFileError FileHandle_Impl::setPos (sal_uInt64 uPos)
+{
+    OSL_FILE_TRACE("FileHandle_Impl::setPos(%d, %lld) => %lld", m_fd, getPos(), uPos);
+    m_fileptr = sal::static_int_cast< off_t >(uPos);
+    return osl_File_E_None;
+}
+
+sal_uInt64 FileHandle_Impl::getSize() const
+{
+    off_t const bufend = std::max((off_t)(0), m_bufptr) + m_buflen;
+    return std::max(m_size, sal::static_int_cast< sal_uInt64 >(bufend));
+}
+
+oslFileError FileHandle_Impl::readAt (
+    off_t        nOffset,
+    void *       pBuffer,
+    size_t       nBytesRequested,
+    sal_uInt64 * pBytesRead)
+{
+    OSL_PRECOND((m_state & STATE_SEEKABLE), "FileHandle_Impl::readAt(): not seekable");
+    if (!(m_state & STATE_SEEKABLE))
+        return osl_File_E_SPIPE;
+
+    OSL_PRECOND((m_state & STATE_READABLE), "FileHandle_Impl::readAt(): not readable");
+    if (!(m_state & STATE_READABLE))
+        return osl_File_E_BADF;
+
+#if defined(LINUX) || defined(SOLARIS)
+
+    ssize_t nBytes = ::pread (m_fd, pBuffer, nBytesRequested, nOffset);
+    if ((-1 == nBytes) && (EOVERFLOW == errno))
+    {
+        /* Some 'pread()'s fail with EOVERFLOW when reading at (or past)
+         * end-of-file, different from 'lseek() + read()' behaviour.
+         * Returning '0 bytes read' and 'osl_File_E_None' instead.
+         */
+        nBytes = 0;
+    }
+    if (-1 == nBytes)
+        return oslTranslateFileError (OSL_FET_ERROR, errno);
+
+#else /* !(LINUX || SOLARIS) */
+
+    if (nOffset != m_offset)
+    {
+        if (-1 == ::lseek (m_fd, nOffset, SEEK_SET))
+            return oslTranslateFileError (OSL_FET_ERROR, errno);
+        m_offset = nOffset;
+    }
+
+    ssize_t nBytes = ::read (m_fd, pBuffer, nBytesRequested);
+    if (-1 == nBytes)
+        return oslTranslateFileError (OSL_FET_ERROR, errno);
+    m_offset += nBytes;
+
+#endif /* !(LINUX || SOLARIS) */
+
+    OSL_FILE_TRACE("FileHandle_Impl::readAt(%d, %lld, %ld)", m_fd, nOffset, nBytes);
+    *pBytesRead = nBytes;
+    return osl_File_E_None;
+}
+
+oslFileError FileHandle_Impl::writeAt (
+    off_t        nOffset,
+    void const * pBuffer,
+    size_t       nBytesToWrite,
+    sal_uInt64 * pBytesWritten)
+{
+    OSL_PRECOND((m_state & STATE_SEEKABLE), "FileHandle_Impl::writeAt(): not seekable");
+    if (!(m_state & STATE_SEEKABLE))
+        return osl_File_E_SPIPE;
+
+    OSL_PRECOND((m_state & STATE_WRITEABLE), "FileHandle_Impl::writeAt(): not writeable");
+    if (!(m_state & STATE_WRITEABLE))
+        return osl_File_E_BADF;
+
+#if defined(LINUX) || defined(SOLARIS)
+
+    ssize_t nBytes = ::pwrite (m_fd, pBuffer, nBytesToWrite, nOffset);
+    if (-1 == nBytes)
+        return oslTranslateFileError (OSL_FET_ERROR, errno);
+
+#else /* !(LINUX || SOLARIS) */
+
+    if (nOffset != m_offset)
+    {
+        if (-1 == ::lseek (m_fd, nOffset, SEEK_SET))
+            return oslTranslateFileError (OSL_FET_ERROR, errno);
+        m_offset = nOffset;
+    }
+
+    ssize_t nBytes = ::write (m_fd, pBuffer, nBytesToWrite);
+    if (-1 == nBytes)
+        return oslTranslateFileError (OSL_FET_ERROR, errno);
+    m_offset += nBytes;
+
+#endif /* !(LINUX || SOLARIS) */
+
+    OSL_FILE_TRACE("FileHandle_Impl::writeAt(%d, %lld, %ld)", m_fd, nOffset, nBytes);
+    m_size = std::max (m_size, sal::static_int_cast< sal_uInt64 >(nOffset + nBytes));
+
+    *pBytesWritten = nBytes;
+    return osl_File_E_None;
+}
+
+oslFileError FileHandle_Impl::readFileAt (
+    off_t        nOffset,
+    void *       pBuffer,
+    size_t       nBytesRequested,
+    sal_uInt64 * pBytesRead)
+{
+    if (0 == (m_state & STATE_SEEKABLE))
+    {
+        // not seekable (pipe)
+        ssize_t nBytes = ::read (m_fd, pBuffer, nBytesRequested);
+        if (-1 == nBytes)
+            return oslTranslateFileError (OSL_FET_ERROR, errno);
+        *pBytesRead = nBytes;
+        return osl_File_E_None;
+    }
+    else if (0 == m_buffer)
+    {
+        // not buffered
+        return readAt (nOffset, pBuffer, nBytesRequested, pBytesRead);
+    }
+    else
+    {
+        sal_uInt8 * buffer = static_cast<sal_uInt8*>(pBuffer);
+        for (*pBytesRead = 0; nBytesRequested > 0; )
+        {
+            off_t  const bufptr = (nOffset / m_bufsiz) * m_bufsiz;
+            size_t const bufpos = (nOffset % m_bufsiz);
+
+            if (bufptr != m_bufptr)
+            {
+                // flush current buffer
+                oslFileError result = syncFile();
+                if (result != osl_File_E_None)
+                    return (result);
+
+                if (nBytesRequested >= m_bufsiz)
+                {
+                    // buffer too small, read through from file
+                    sal_uInt64 uDone = 0;
+                    result = readAt (nOffset, &(buffer[*pBytesRead]), nBytesRequested, &uDone);
+                    if (result != osl_File_E_None)
+                        return (result);
+
+                    nBytesRequested -= uDone, *pBytesRead += uDone;
+                    return osl_File_E_None;
+                }
+
+                // update buffer (pointer)
+                sal_uInt64 uDone = 0;
+                result = readAt (bufptr, m_buffer, m_bufsiz, &uDone);
+                if (result != osl_File_E_None)
+                    return (result);
+                m_bufptr = bufptr, m_buflen = uDone;
+            }
+            if (bufpos >= m_buflen)
+            {
+                // end of file
+                return osl_File_E_None;
+            }
+
+            size_t const bytes = std::min (m_buflen - bufpos, nBytesRequested);
+            OSL_FILE_TRACE("FileHandle_Impl::readFileAt(%d, %lld, %ld)", m_fd, nOffset, bytes);
+
+            memcpy (&(buffer[*pBytesRead]), &(m_buffer[bufpos]), bytes);
+            nBytesRequested -= bytes, *pBytesRead += bytes, nOffset += bytes;
+        }
+        return osl_File_E_None;
+    }
+}
+
+oslFileError FileHandle_Impl::writeFileAt (
+    off_t        nOffset,
+    void const * pBuffer,
+    size_t       nBytesToWrite,
+    sal_uInt64 * pBytesWritten)
+{
+    if (0 == (m_state & STATE_SEEKABLE))
+    {
+        // not seekable (pipe)
+        ssize_t nBytes = ::write (m_fd, pBuffer, nBytesToWrite);
+        if (-1 == nBytes)
+            return oslTranslateFileError (OSL_FET_ERROR, errno);
+        *pBytesWritten = nBytes;
+        return osl_File_E_None;
+    }
+    else if (0 == m_buffer)
+    {
+        // not buffered
+        return writeAt (nOffset, pBuffer, nBytesToWrite, pBytesWritten);
+    }
+    else
+    {
+        sal_uInt8 const * buffer = static_cast<sal_uInt8 const *>(pBuffer);
+        for (*pBytesWritten = 0; nBytesToWrite > 0; )
+        {
+            off_t  const bufptr = (nOffset / m_bufsiz) * m_bufsiz;
+            size_t const bufpos = (nOffset % m_bufsiz);
+            if (bufptr != m_bufptr)
+            {
+                // flush current buffer
+                oslFileError result = syncFile();
+                if (result != osl_File_E_None)
+                    return (result);
+
+                if (nBytesToWrite >= m_bufsiz)
+                {
+                    // buffer to small, write through to file
+                    sal_uInt64 uDone = 0;
+                    result = writeAt (nOffset, &(buffer[*pBytesWritten]), nBytesToWrite, &uDone);
+                    if (result != osl_File_E_None)
+                        return (result);
+                    if (uDone != nBytesToWrite)
+                        return osl_File_E_IO;
+
+                    nBytesToWrite -= uDone, *pBytesWritten += uDone;
+                    return osl_File_E_None;
+                }
+
+                // update buffer (pointer)
+                sal_uInt64 uDone = 0;
+                result = readAt (bufptr, m_buffer, m_bufsiz, &uDone);
+                if (result != osl_File_E_None)
+                    return (result);
+                m_bufptr = bufptr, m_buflen = uDone;
+            }
+
+            size_t const bytes = std::min (m_bufsiz - bufpos, nBytesToWrite);
+            OSL_FILE_TRACE("FileHandle_Impl::writeFileAt(%d, %lld, %ld)", m_fd, nOffset, bytes);
+
+            memcpy (&(m_buffer[bufpos]), &(buffer[*pBytesWritten]), bytes);
+            nBytesToWrite -= bytes, *pBytesWritten += bytes, nOffset += bytes;
+
+            m_buflen = std::max(m_buflen, bufpos + bytes);
+            m_state |= STATE_MODIFIED;
+        }
+        return osl_File_E_None;
+    }
+}
+
+oslFileError FileHandle_Impl::readLineAt (
+    off_t           nOffset,
+    sal_Sequence ** ppSequence,
+    sal_uInt64 *    pBytesRead)
+{
+    oslFileError result = osl_File_E_None;
+
+    off_t bufptr = nOffset / m_bufsiz * m_bufsiz;
+    if (bufptr != m_bufptr)
+    {
+        /* flush current buffer */
+        result = syncFile();
+        if (result != osl_File_E_None)
+            return (result);
+
+        /* update buffer (pointer) */
+        sal_uInt64 uDone = 0;
+        result = readAt (bufptr, m_buffer, m_bufsiz, &uDone);
+        if (result != osl_File_E_None)
+            return (result);
+
+        m_bufptr = bufptr, m_buflen = uDone;
+    }
+
+    static int const LINE_STATE_BEGIN = 0;
+    static int const LINE_STATE_CR    = 1;
+    static int const LINE_STATE_LF    = 2;
+
+    size_t bufpos = nOffset - m_bufptr, curpos = bufpos, dstpos = 0;
+    int    state  = (bufpos >= m_buflen) ? LINE_STATE_LF : LINE_STATE_BEGIN;
+
+    for ( ; state != LINE_STATE_LF; )
+    {
+        if (curpos >= m_buflen)
+        {
+            /* buffer examined */
+            if (0 < (curpos - bufpos))
+            {
+                /* flush buffer to sequence */
+                result = writeSequence_Impl (
+                    ppSequence, &dstpos, &(m_buffer[bufpos]), curpos - bufpos);
+                if (result != osl_File_E_None)
+                    return (result);
+                *pBytesRead += curpos - bufpos, nOffset += curpos - bufpos;
+            }
+
+            bufptr = nOffset / m_bufsiz * m_bufsiz;
+            if (bufptr != m_bufptr)
+            {
+                /* update buffer (pointer) */
+                sal_uInt64 uDone = 0;
+                result = readAt (bufptr, m_buffer, m_bufsiz, &uDone);
+                if (result != osl_File_E_None)
+                    return (result);
+                m_bufptr = bufptr, m_buflen = uDone;
+            }
+
+            bufpos = nOffset - m_bufptr, curpos = bufpos;
+            if (bufpos >= m_buflen)
+                break;
+        }
+        switch (state)
+        {
+        case LINE_STATE_CR:
+            state = LINE_STATE_LF;
+            switch (m_buffer[curpos])
+            {
+            case 0x0A: /* CRLF */
+                /* eat current char */
+                curpos++;
+                break;
+            default: /* single CR */
+                /* keep current char */
+                break;
+            }
+            break;
+        default:
+            /* determine next state */
+            switch (m_buffer[curpos])
+            {
+            case 0x0A: /* single LF */
+                state = LINE_STATE_LF;
+                break;
+            case 0x0D: /* CR */
+                state = LINE_STATE_CR;
+                break;
+            default: /* advance to next char */
+                curpos++;
+                break;
+            }
+            if (state != LINE_STATE_BEGIN)
+            {
+                /* store (and eat) the newline char */
+                m_buffer[curpos] = 0x0A, curpos++;
+
+                /* flush buffer to sequence */
+                result = writeSequence_Impl (
+                    ppSequence, &dstpos, &(m_buffer[bufpos]), curpos - bufpos - 1);
+                if (result != osl_File_E_None)
+                    return (result);
+                *pBytesRead += curpos - bufpos, nOffset += curpos - bufpos;
+            }
+            break;
+        }
+    }
+
+    result = writeSequence_Impl (ppSequence, &dstpos, 0, 0);
+    if (result != osl_File_E_None)
+        return (result);
+    if (0 < dstpos)
+        return osl_File_E_None;
+    if (bufpos >= m_buflen)
+        return osl_File_E_AGAIN;
+    return osl_File_E_None;
+}
+
+oslFileError FileHandle_Impl::writeSequence_Impl (
+    sal_Sequence ** ppSequence,
+    size_t *        pnOffset,
+    const void *    pBuffer,
+    size_t          nBytes)
+{
+    sal_Int32 nElements = *pnOffset + nBytes;
+    if (!*ppSequence)
+    {
+        /* construct sequence */
+        rtl_byte_sequence_constructNoDefault(ppSequence, nElements);
+    }
+    else if (nElements != (*ppSequence)->nElements)
+    {
+        /* resize sequence */
+        rtl_byte_sequence_realloc(ppSequence, nElements);
+    }
+    if (*ppSequence != 0)
+    {
+        /* fill sequence */
+        memcpy(&((*ppSequence)->elements[*pnOffset]), pBuffer, nBytes), *pnOffset += nBytes;
+    }
+    return (*ppSequence != 0) ? osl_File_E_None : osl_File_E_NOMEM;
+}
+
+oslFileError FileHandle_Impl::syncFile()
+{
+    oslFileError result = osl_File_E_None;
+    if (m_state & STATE_MODIFIED)
+    {
+        sal_uInt64 uDone = 0;
+        result = writeAt (m_bufptr, m_buffer, m_buflen, &uDone);
+        if (result != osl_File_E_None)
+            return (result);
+        if (uDone != m_buflen)
+            return osl_File_E_IO;
+        m_state &= ~STATE_MODIFIED;
+    }
+    return (result);
+}
+
+/****************************************************************************
+ *	osl_createFileHandleFromFD
+ ***************************************************************************/
+extern "C" oslFileHandle osl_createFileHandleFromFD( int fd )
+{
+    if (-1 == fd)
+        return 0; // EINVAL
+
+    struct stat aFileStat;
+    if (-1 == fstat (fd, &aFileStat))
+        return 0; // EBADF
+
+    FileHandle_Impl * pImpl = new FileHandle_Impl (fd);
+    if (0 == pImpl)
+        return 0; // ENOMEM
+
+    // assume writeable
+    pImpl->m_state |= FileHandle_Impl::STATE_WRITEABLE;
+    if (!S_ISREG(aFileStat.st_mode))
+    {
+        /* not a regular file, mark not seekable */
+        pImpl->m_state &= ~FileHandle_Impl::STATE_SEEKABLE;
+    }
+    else
+    {
+        /* regular file, init current size */
+        pImpl->m_size = sal::static_int_cast< sal_uInt64 >(aFileStat.st_size);
+    }
+
+    OSL_FILE_TRACE("osl_createFileHandleFromFD(%d, writeable) => %s",
+                   pImpl->m_fd, rtl_string_getStr(pImpl->m_strFilePath));
+    return (oslFileHandle)(pImpl);
+}
+
+/*******************************************************************
+ * osl_file_adjustLockFlags
+ ******************************************************************/
+static int osl_file_adjustLockFlags (const char * path, int flags)
+{
+#ifdef MACOSX
+    /*
+     * The AFP implementation of MacOS X 10.4 treats O_EXLOCK in a way 
+     * that makes it impossible for OOo to create a backup copy of the
+     * file it keeps opened. OTOH O_SHLOCK for AFP behaves as desired by
+     * the OOo file handling, so we need to check the path of the file
+     * for the filesystem name.
+     */
+    struct statfs s;
+    if( 0 <= statfs( path, &s ) )
+    {
+        if( 0 == strncmp("afpfs", s.f_fstypename, 5) )
+        {
+            flags &= ~O_EXLOCK;
+            flags |=  O_SHLOCK;
+        }    
+        else
+        {
+            /* Needed flags to allow opening a webdav file */
+            flags &= ~(O_EXLOCK | O_SHLOCK | O_NONBLOCK);
+        }
+    }
+#endif /* MACOSX */
+
+    (void) path;
+    return flags;
+}
+
+/****************************************************************************
+ *	osl_file_queryLocking
+ ***************************************************************************/
+struct Locking_Impl
+{
+    int m_enabled;
+    Locking_Impl() : m_enabled(0)
+    {
+#ifndef HAVE_O_EXLOCK
+        m_enabled = ((getenv("SAL_ENABLE_FILE_LOCKING") != 0) || (getenv("STAR_ENABLE_FILE_LOCKING") != 0));
+#endif /* HAVE_O_EXLOCK */
+    }
+};
+static int osl_file_queryLocking (sal_uInt32 uFlags)
+{
+    if (!(uFlags & osl_File_OpenFlag_NoLock))
+    {
+        if ((uFlags & osl_File_OpenFlag_Write) || (uFlags & osl_File_OpenFlag_Create))
+        {
+            static Locking_Impl g_locking;
+            return (g_locking.m_enabled != 0);
+        }
+    }
+    return 0;
+}
+
+/****************************************************************************
+ *	osl_openFile
+ ***************************************************************************/
+#ifdef HAVE_O_EXLOCK
+#define OPEN_WRITE_FLAGS ( O_RDWR | O_EXLOCK | O_NONBLOCK )
+#define OPEN_CREATE_FLAGS ( O_CREAT | O_EXCL | O_RDWR | O_EXLOCK | O_NONBLOCK )
+#else
+#define OPEN_WRITE_FLAGS ( O_RDWR )
+#define OPEN_CREATE_FLAGS ( O_CREAT | O_EXCL | O_RDWR )
+#endif
+
+oslFileError
+SAL_CALL osl_openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, sal_uInt32 uFlags )
+{
+    oslFileError eRet;
+
+    if ((ustrFileURL == 0) || (ustrFileURL->length == 0) || (pHandle == 0))
+        return osl_File_E_INVAL;
+
+    /* convert file URL to system path */
+    char buffer[PATH_MAX];
+    eRet = FileURLToPath (buffer, sizeof(buffer), ustrFileURL);
+    if (eRet != osl_File_E_None)
+        return eRet;
+#ifdef MACOSX 
+    if (macxp_resolveAlias (buffer, sizeof(buffer)) != 0)
+        return oslTranslateFileError (OSL_FET_ERROR, errno);
+#endif /* MACOSX */
+
+    /* set mode and flags */
+    int mode  = S_IRUSR | S_IRGRP | S_IROTH;
+    int flags = O_RDONLY;
+    if (uFlags & osl_File_OpenFlag_Write)
+    {
+        mode |= S_IWUSR | S_IWGRP | S_IWOTH;
+        flags = OPEN_WRITE_FLAGS;
+    }
+    if (uFlags & osl_File_OpenFlag_Create)
+    {
+        mode |= S_IWUSR | S_IWGRP | S_IWOTH;
+        flags = OPEN_CREATE_FLAGS;
+    }
+    if (uFlags & osl_File_OpenFlag_NoLock)
+    {
+#ifdef HAVE_O_EXLOCK
+        flags &= ~(O_EXLOCK | O_SHLOCK | O_NONBLOCK);
+#endif /* HAVE_O_EXLOCK */
+    }
+    else
+    {
+        flags = osl_file_adjustLockFlags (buffer, flags);
+    }
+
+    /* open the file */
+    int fd = open( buffer, flags, mode );
+    if (-1 == fd)
+        return oslTranslateFileError (OSL_FET_ERROR, errno);
+
+    /* reset O_NONBLOCK flag */
+    if (flags & O_NONBLOCK)
+    {
+        int f = fcntl (fd, F_GETFL, 0);
+        if (-1 == f)
+        {
+            eRet = oslTranslateFileError (OSL_FET_ERROR, errno);
+            (void) close(fd);
+            return eRet;
+        }
+        if (-1 == fcntl (fd, F_SETFL, (f & ~O_NONBLOCK)))
+        {
+            eRet = oslTranslateFileError (OSL_FET_ERROR, errno);
+            (void) close(fd);
+            return eRet;
+        }
+    }
+
+    /* get file status (mode, size) */
+    struct stat aFileStat;
+    if (-1 == fstat (fd, &aFileStat))
+    {
+        eRet = oslTranslateFileError (OSL_FET_ERROR, errno);
+        (void) close(fd);
+        return eRet;
+    }
+    if (!S_ISREG(aFileStat.st_mode))
+    {
+        /* we only open regular files here */
+        (void) close(fd);
+        return osl_File_E_INVAL;
+    }
+
+    if (osl_file_queryLocking (uFlags))
+    {
+#ifdef MACOSX
+        if (-1 == flock (fd, LOCK_EX | LOCK_NB))
+        {
+            /* Mac OSX returns ENOTSUP for webdav drives. We should try read lock */
+            if ((errno != ENOTSUP) || ((-1 == flock (fd, LOCK_SH | LOCK_NB)) && (errno != ENOTSUP)))
+            {
+                eRet = oslTranslateFileError (OSL_FET_ERROR, errno);
+                (void) close(fd);
+                return eRet;
+            }
+        }
+#else   /* F_SETLK */
+        {
+            struct flock aflock;
+
+            aflock.l_type = F_WRLCK;
+            aflock.l_whence = SEEK_SET;
+            aflock.l_start = 0;
+            aflock.l_len = 0;
+
+            if (-1 == fcntl (fd, F_SETLK, &aflock))
+            {
+                eRet = oslTranslateFileError (OSL_FET_ERROR, errno);
+                (void) close(fd);
+                return eRet;
+            }
+        }
+#endif  /* F_SETLK */
+    }
+
+    /* allocate memory for impl structure */
+    FileHandle_Impl * pImpl = new FileHandle_Impl (fd, buffer);
+    if (!pImpl)
+    {
+        eRet = oslTranslateFileError (OSL_FET_ERROR, ENOMEM);
+        (void) close(fd);
+        return eRet;
+    }
+    if (flags & O_RDWR)
+        pImpl->m_state |= FileHandle_Impl::STATE_WRITEABLE;
+    pImpl->m_size = sal::static_int_cast< sal_uInt64 >(aFileStat.st_size);
+
+    OSL_TRACE("osl_openFile(%d, %s) => %s", pImpl->m_fd,
+              flags & O_RDWR ? "writeable":"readonly",
+              rtl_string_getStr(pImpl->m_strFilePath));
+
+    *pHandle = (oslFileHandle)(pImpl);
+    return osl_File_E_None;
+}
+
+/****************************************************************************/
+/*	osl_closeFile */
+/****************************************************************************/
+oslFileError
+SAL_CALL osl_closeFile( oslFileHandle Handle )
+{
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((pImpl == 0) || (pImpl->m_fd < 0))
+        return osl_File_E_INVAL;
+
+    /* close(2) implicitly (and unconditionally) unlocks */
+    OSL_TRACE("osl_closeFile(%d) => %s", pImpl->m_fd, rtl_string_getStr(pImpl->m_strFilePath));
+    oslFileError result = pImpl->syncFile();
+    if (result != osl_File_E_None)
+    {
+        /* close, ignoring double failure */
+        (void) close (pImpl->m_fd);
+    }
+    else if (-1 == close (pImpl->m_fd))
+    {
+        /* translate error code */
+        result = oslTranslateFileError (OSL_FET_ERROR, errno);
+    }
+
+    delete pImpl;
+    return (result);
+}
+
+/************************************************
+ * osl_syncFile
+ ***********************************************/
+oslFileError
+SAL_CALL osl_syncFile(oslFileHandle Handle)
+{
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+    
+    if ((0 == pImpl) || (-1 == pImpl->m_fd))
+        return osl_File_E_INVAL;
+
+    OSL_FILE_TRACE("osl_syncFile(%d)", pImpl->m_fd);
+    oslFileError result = pImpl->syncFile();
+    if (result != osl_File_E_None)
+        return (result);
+    if (-1 == fsync (pImpl->m_fd))
+        return oslTranslateFileError (OSL_FET_ERROR, errno);
+    
+    return osl_File_E_None;
+}
+
+/*******************************************
+    osl_mapFile
+********************************************/
+oslFileError
+SAL_CALL osl_mapFile (
+    oslFileHandle Handle,
+    void**        ppAddr,
+    sal_uInt64    uLength,
+    sal_uInt64    uOffset,
+    sal_uInt32    uFlags
+)
+{
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == ppAddr))
+        return osl_File_E_INVAL;
+    *ppAddr = 0;
+
+    static sal_uInt64 const g_limit_size_t = std::numeric_limits< size_t >::max();
+    if (g_limit_size_t < uLength)
+        return osl_File_E_OVERFLOW;
+    size_t const nLength = sal::static_int_cast< size_t >(uLength);
+
+    static sal_uInt64 const g_limit_off_t = std::numeric_limits< off_t >::max();
+    if (g_limit_off_t < uOffset)
+        return osl_File_E_OVERFLOW;
+    off_t const nOffset = sal::static_int_cast< off_t >(uOffset);
+
+    void* p = mmap(NULL, nLength, PROT_READ, MAP_SHARED, pImpl->m_fd, nOffset);
+    if (MAP_FAILED == p)
+        return oslTranslateFileError(OSL_FET_ERROR, errno);
+    *ppAddr = p;
+
+    if (uFlags & osl_File_MapFlag_RandomAccess)
+    {
+        // Determine memory pagesize.
+        size_t const nPageSize = FileHandle_Impl::getpagesize();
+        if (size_t(-1) != nPageSize)
+        {
+            /*
+             * Pagein, touching first byte of every memory page.
+             * Note: volatile disables optimizing the loop away.
+             */
+            sal_uInt8 * pData (reinterpret_cast<sal_uInt8*>(*ppAddr));
+            size_t      nSize (nLength);
+
+            volatile sal_uInt8 c = 0;
+            while (nSize > nPageSize)
+            {
+                c ^= pData[0];
+                pData += nPageSize;
+                nSize -= nPageSize;
+            }
+            if (nSize > 0)
+            {
+                c^= pData[0];
+                pData += nSize;
+                nSize -= nSize;
+            }
+        }
+    }
+    return osl_File_E_None;
+}
+
+/*******************************************
+    osl_unmapFile
+********************************************/
+oslFileError
+SAL_CALL osl_unmapFile (void* pAddr, sal_uInt64 uLength)
+{
+    if (0 == pAddr)
+        return osl_File_E_INVAL;
+
+    static sal_uInt64 const g_limit_size_t = std::numeric_limits< size_t >::max();
+    if (g_limit_size_t < uLength)
+        return osl_File_E_OVERFLOW;
+    size_t const nLength = sal::static_int_cast< size_t >(uLength);
+
+    if (-1 == munmap(static_cast<char*>(pAddr), nLength))
+        return oslTranslateFileError(OSL_FET_ERROR, errno);
+
+    return osl_File_E_None;
+}
+
+/*******************************************
+    osl_readLine
+********************************************/
+oslFileError
+SAL_CALL osl_readLine (
+    oslFileHandle   Handle,
+    sal_Sequence ** ppSequence)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == ppSequence))
+        return osl_File_E_INVAL;
+    sal_uInt64 uBytesRead = 0;
+
+    // read at current fileptr; fileptr += uBytesRead;
+    oslFileError result = pImpl->readLineAt (
+        pImpl->m_fileptr, ppSequence, &uBytesRead);
+    if (result == osl_File_E_None)
+        pImpl->m_fileptr += uBytesRead;
+    return (result);
+}
+
+/*******************************************
+    osl_readFile
+********************************************/
+oslFileError
+SAL_CALL osl_readFile (
+    oslFileHandle Handle,
+    void *        pBuffer,
+    sal_uInt64    uBytesRequested,
+    sal_uInt64 *  pBytesRead)
+{
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == pBuffer) || (0 == pBytesRead))
+        return osl_File_E_INVAL;
+    
+    static sal_uInt64 const g_limit_ssize_t = std::numeric_limits< ssize_t >::max();
+    if (g_limit_ssize_t < uBytesRequested)
+        return osl_File_E_OVERFLOW;
+    size_t const nBytesRequested = sal::static_int_cast< size_t >(uBytesRequested);
+
+    // read at current fileptr; fileptr += *pBytesRead;
+    oslFileError result = pImpl->readFileAt (
+        pImpl->m_fileptr, pBuffer, nBytesRequested, pBytesRead);
+    if (result == osl_File_E_None)
+        pImpl->m_fileptr += *pBytesRead;
+    return (result);
+}
+
+/*******************************************
+    osl_writeFile
+********************************************/
+oslFileError
+SAL_CALL osl_writeFile (
+    oslFileHandle Handle,
+    const void *  pBuffer,
+    sal_uInt64    uBytesToWrite,
+    sal_uInt64 *  pBytesWritten)
+{
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == pBuffer) || (0 == pBytesWritten))
+        return osl_File_E_INVAL;
+    if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE))
+        return osl_File_E_BADF;
+
+    static sal_uInt64 const g_limit_ssize_t = std::numeric_limits< ssize_t >::max();
+    if (g_limit_ssize_t < uBytesToWrite)
+        return osl_File_E_OVERFLOW;
+    size_t const nBytesToWrite = sal::static_int_cast< size_t >(uBytesToWrite);
+
+    // write at current fileptr; fileptr += *pBytesWritten;
+    oslFileError result = pImpl->writeFileAt (
+        pImpl->m_fileptr, pBuffer, nBytesToWrite, pBytesWritten);
+    if (result == osl_File_E_None)
+        pImpl->m_fileptr += *pBytesWritten;
+    return (result);
+}
+
+/*******************************************
+    osl_readFileAt
+********************************************/
+oslFileError
+SAL_CALL osl_readFileAt (
+    oslFileHandle Handle,
+    sal_uInt64    uOffset,
+    void*         pBuffer,
+    sal_uInt64    uBytesRequested,
+    sal_uInt64*   pBytesRead)
+{
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == pBuffer) || (0 == pBytesRead))
+        return osl_File_E_INVAL;
+    if (0 == (pImpl->m_state & FileHandle_Impl::STATE_SEEKABLE))
+        return osl_File_E_SPIPE;
+
+    static sal_uInt64 const g_limit_off_t = std::numeric_limits< off_t >::max();
+    if (g_limit_off_t < uOffset)
+        return osl_File_E_OVERFLOW;
+    off_t const nOffset = sal::static_int_cast< off_t >(uOffset);
+
+    static sal_uInt64 const g_limit_ssize_t = std::numeric_limits< ssize_t >::max();
+    if (g_limit_ssize_t < uBytesRequested)
+        return osl_File_E_OVERFLOW;
+    size_t const nBytesRequested = sal::static_int_cast< size_t >(uBytesRequested);
+
+    // read at specified fileptr
+    return pImpl->readFileAt (nOffset, pBuffer, nBytesRequested, pBytesRead);
+}
+
+/*******************************************
+    osl_writeFileAt
+********************************************/
+oslFileError
+SAL_CALL osl_writeFileAt (
+    oslFileHandle Handle,
+    sal_uInt64    uOffset,
+    const void*   pBuffer,
+    sal_uInt64    uBytesToWrite,
+    sal_uInt64*   pBytesWritten)
+{
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == pBuffer) || (0 == pBytesWritten))
+        return osl_File_E_INVAL;
+    if (0 == (pImpl->m_state & FileHandle_Impl::STATE_SEEKABLE))
+        return osl_File_E_SPIPE;
+    if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE))
+        return osl_File_E_BADF;
+
+    static sal_uInt64 const g_limit_off_t = std::numeric_limits< off_t >::max();
+    if (g_limit_off_t < uOffset)
+        return osl_File_E_OVERFLOW;
+    off_t const nOffset = sal::static_int_cast< off_t >(uOffset);
+
+    static sal_uInt64 const g_limit_ssize_t = std::numeric_limits< ssize_t >::max();
+    if (g_limit_ssize_t < uBytesToWrite)
+        return osl_File_E_OVERFLOW;
+    size_t const nBytesToWrite = sal::static_int_cast< size_t >(uBytesToWrite);
+
+    // write at specified fileptr
+    return pImpl->writeFileAt (nOffset, pBuffer, nBytesToWrite, pBytesWritten);
+}
+
+/****************************************************************************/
+/*	osl_isEndOfFile */
+/****************************************************************************/
+oslFileError
+SAL_CALL osl_isEndOfFile( oslFileHandle Handle, sal_Bool *pIsEOF )
+{
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == pIsEOF))
+        return osl_File_E_INVAL;
+
+    *pIsEOF = (pImpl->getPos() == pImpl->getSize());
+    return osl_File_E_None;
+}
+
+/************************************************
+ * osl_getFilePos
+ ***********************************************/
+oslFileError
+SAL_CALL osl_getFilePos( oslFileHandle Handle, sal_uInt64* pPos )
+{
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == pPos))
+        return osl_File_E_INVAL;
+
+    *pPos = pImpl->getPos();
+    return osl_File_E_None;
+}
+
+/*******************************************
+    osl_setFilePos
+********************************************/
+oslFileError
+SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffset)
+{
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || (-1 == pImpl->m_fd))
+        return osl_File_E_INVAL;
+
+    static sal_Int64 const g_limit_off_t = std::numeric_limits< off_t >::max();
+    if (g_limit_off_t < uOffset)
+        return osl_File_E_OVERFLOW;
+    off_t nPos = 0, nOffset = sal::static_int_cast< off_t >(uOffset);
+
+    switch(uHow)
+    {
+        case osl_Pos_Absolut:
+            if (0 > nOffset)
+                return osl_File_E_INVAL;
+            break;
+
+        case osl_Pos_Current:
+            nPos = sal::static_int_cast< off_t >(pImpl->getPos());
+            if ((0 > nOffset) && (-1*nOffset > nPos))
+                return osl_File_E_INVAL;
+            if (g_limit_off_t < nPos + nOffset)
+                return osl_File_E_OVERFLOW;
+            break;
+
+        case osl_Pos_End:
+            nPos = sal::static_int_cast< off_t >(pImpl->getSize());
+            if ((0 > nOffset) && (-1*nOffset > nPos))
+                return osl_File_E_INVAL;
+            if (g_limit_off_t < nPos + nOffset)
+                return osl_File_E_OVERFLOW;
+            break;
+
+        default:
+            return osl_File_E_INVAL;
+    }
+
+    return pImpl->setPos (nPos + nOffset);
+}
+
+/****************************************************************************
+ *	osl_getFileSize
+ ****************************************************************************/
+oslFileError
+SAL_CALL osl_getFileSize( oslFileHandle Handle, sal_uInt64* pSize )
+{	
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == pSize))
+        return osl_File_E_INVAL;
+
+    *pSize = pImpl->getSize();
+    return osl_File_E_None;
+}
+
+/************************************************
+ * osl_setFileSize
+ ***********************************************/
+oslFileError
+SAL_CALL osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize )
+{
+    FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || (-1 == pImpl->m_fd))
+        return osl_File_E_INVAL;
+    if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE))
+        return osl_File_E_BADF;
+
+    static sal_uInt64 const g_limit_off_t = std::numeric_limits< off_t >::max();
+    if (g_limit_off_t < uSize)
+        return osl_File_E_OVERFLOW;
+    off_t const nSize = sal::static_int_cast< off_t >(uSize);
+
+    oslFileError result = pImpl->syncFile();
+    if (result != osl_File_E_None)
+        return (result);
+
+    if (-1 == ftruncate (pImpl->m_fd, nSize))
+    {
+        /* Failure. Try fallback algorithm */
+        off_t nCurPos;
+
+        /* Save original result */
+        result = oslTranslateFileError (OSL_FET_ERROR, errno);
+        PERROR("ftruncate", "Try osl_setFileSize [fallback]\n");
+
+        /* Check against current size. Fail upon 'shrink' */
+        if (uSize <= pImpl->getSize())
+        {
+            /* Failure upon 'shrink'. Return original result */
+            return (result);
+        }
+
+        /* Save current position *//* @@@ pImpl->m_offset @@@ */
+        nCurPos = (off_t)lseek (pImpl->m_fd, (off_t)0, SEEK_CUR);
+        if (nCurPos == (off_t)(-1))
+        {
+            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]\n");
+            return (result);
+        }
+
+        /* Try 'expand' via 'lseek()' and 'write()' */
+        if (lseek (pImpl->m_fd, (off_t)(nSize - 1), SEEK_SET) < 0)
+        {
+            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]\n");
+            return (result);
+        }
+        if (write (pImpl->m_fd, (char*)"", (size_t)1) < 0)
+        {
+            /* Failure. Restore saved position */
+            PERROR("ftruncate: write", "Out osl_setFileSize [error]\n");
+            if (lseek (pImpl->m_fd, (off_t)nCurPos, SEEK_SET) < 0)
+            {
+                PERROR("ftruncate: lseek", "ignoring");
+            }
+            return (result);
+        }
+
+        /* Success. Restore saved position */
+        if (lseek (pImpl->m_fd, (off_t)nCurPos, SEEK_SET) < 0)
+        {
+            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]");
+            return (result);
+        }
+    }
+
+    OSL_FILE_TRACE("osl_setFileSize(%d, %lld) => %ld", pImpl->m_fd, pImpl->getSize(), nSize);
+    pImpl->m_size = sal::static_int_cast< sal_uInt64 >(nSize);
+    return osl_File_E_None;
+}
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index 7a379125c..a1b0da6f9 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -28,21 +28,30 @@
  *
  ************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef struct
+#ifndef INCLUDED_FILE_IMPL_HXX
+#define INCLUDED_FILE_IMPL_HXX
+
+#include "osl/file.h"
+#include <stddef.h>
+
+struct DirectoryItem_Impl
 {
-    rtl_uString* ustrFilePath;       /* holds native file name */
-    unsigned char DType;
-    bool bHasType;
-    sal_uInt32 RefCount;
-} oslDirectoryItemImpl;
-
-    oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType=0 );
-    void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem );
-    void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem );
-    void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem );
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
+    sal_Int32     m_RefCount;
+
+    rtl_uString * m_ustrFilePath;       /* holds native file name */
+    unsigned char m_DType;
+
+    explicit DirectoryItem_Impl(
+        rtl_uString * ustrFilePath, unsigned char DType = 0);
+    ~DirectoryItem_Impl();
+
+    static void * operator new(size_t n);
+    static void operator delete (void * p, size_t);
+
+    void acquire(); /* @see osl_acquireDirectoryItem() */
+    void release(); /* @see osl_releaseDirectoryItem() */
+
+    oslFileType getFileType() const;
+};
+
+#endif /* INCLUDED_FILE_IMPL_HXX */
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
new file mode 100644
index 000000000..a04d4b4c9
--- /dev/null
+++ b/sal/osl/unx/file_misc.cxx
@@ -0,0 +1,1084 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "osl/file.hxx"
+
+#include "osl/diagnose.h"
+#include "osl/thread.h"
+#include "rtl/alloc.h"
+
+#include "system.h"
+#include "file_impl.hxx"
+#include "file_error_transl.h"
+#include "file_path_helper.hxx"
+#include "file_url.h"
+#include "uunxapi.hxx"
+
+#include <sys/types.h>
+#include <errno.h>
+#include <dirent.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+/************************************************************************
+ *   ToDo
+ *
+ *   - Fix: check for corresponding struct sizes in exported functions
+ *   - check size/use of oslDirectory
+ *   - check size/use of oslDirectoryItem
+ ***********************************************************************/
+/******************************************************************************
+ *
+ *                  Data Type Definition
+ *
+ ******************************************************************************/
+
+typedef struct
+{
+    rtl_uString* ustrPath;           /* holds native directory path */
+    DIR*         pDirStruct;
+} oslDirectoryImpl;
+
+#if 0
+/* FIXME: reintroducing this may save some extra bytes per Item */
+typedef struct
+{
+    rtl_uString* ustrFileName;       /* holds native file name */
+    rtl_uString* ustrDirPath;        /* holds native dir path */
+    sal_uInt32   RefCount;
+} oslDirectoryItemImpl;
+#endif
+
+DirectoryItem_Impl::DirectoryItem_Impl(
+    rtl_uString * ustrFilePath, unsigned char DType)
+    : m_RefCount     (1),
+      m_ustrFilePath (ustrFilePath),
+      m_DType        (DType)
+{
+    if (m_ustrFilePath != 0)
+        rtl_uString_acquire(m_ustrFilePath);
+}
+DirectoryItem_Impl::~DirectoryItem_Impl()
+{
+    if (m_ustrFilePath != 0)
+        rtl_uString_release(m_ustrFilePath);
+}
+
+void * DirectoryItem_Impl::operator new(size_t n)
+{
+    return rtl_allocateMemory(n);
+}
+void DirectoryItem_Impl::operator delete(void * p, size_t)
+{
+    rtl_freeMemory(p);
+}
+
+void DirectoryItem_Impl::acquire()
+{
+    ++m_RefCount;
+}
+void DirectoryItem_Impl::release()
+{
+    if (0 == --m_RefCount)
+        delete this;
+}
+
+oslFileType DirectoryItem_Impl::getFileType() const
+{
+    switch (m_DType)
+    {
+#ifdef _DIRENT_HAVE_D_TYPE
+        case DT_LNK:
+            return osl_File_Type_Link;
+        case DT_DIR:
+            return osl_File_Type_Directory;
+        case DT_REG:
+            return osl_File_Type_Regular;
+        case DT_FIFO:
+            return osl_File_Type_Fifo;
+        case DT_SOCK:
+            return osl_File_Type_Socket;
+        case DT_CHR:
+        case DT_BLK:
+            return osl_File_Type_Special;
+#endif /* _DIRENT_HAVE_D_TYPE */
+        default:
+            break;
+    }
+    return osl_File_Type_Unknown;
+}
+
+/******************************************************************************
+ *
+ *                  C-String Function Declarations
+ *
+ *****************************************************************************/
+
+static oslFileError osl_psz_createDirectory(const sal_Char* pszPath);
+static oslFileError osl_psz_removeDirectory(const sal_Char* pszPath);
+
+/*******************************************************************
+ *	osl_openDirectory
+ ******************************************************************/
+
+oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirectory* pDirectory)
+{
+    rtl_uString* ustrSystemPath = NULL;
+    oslFileError eRet;
+
+    char path[PATH_MAX];
+
+    if ((0 == ustrDirectoryURL) || (0 == ustrDirectoryURL->length) || (0 == pDirectory))
+        return osl_File_E_INVAL;
+
+    /* convert file URL to system path */
+    eRet = osl_getSystemPathFromFileURL_Ex(ustrDirectoryURL, &ustrSystemPath, sal_False);
+
+    if( osl_File_E_None != eRet )
+        return eRet;
+
+    osl_systemPathRemoveSeparator(ustrSystemPath);
+
+    /* convert unicode path to text */
+    if ( UnicodeToText( path, PATH_MAX, ustrSystemPath->buffer, ustrSystemPath->length ) 
+#ifdef MACOSX 
+     && macxp_resolveAlias( path, PATH_MAX ) == 0 
+#endif /* MACOSX */
+     )
+    {
+        /* open directory */
+        DIR *pdir = opendir( path );
+
+        if( pdir )
+        {
+            /* create and initialize impl structure */
+            oslDirectoryImpl* pDirImpl = (oslDirectoryImpl*) rtl_allocateMemory( sizeof(oslDirectoryImpl) );
+
+            if( pDirImpl )
+            {
+                pDirImpl->pDirStruct = pdir;
+                pDirImpl->ustrPath = ustrSystemPath;
+
+                *pDirectory = (oslDirectory) pDirImpl;
+                return osl_File_E_None;
+            }
+            else
+            {
+                errno = ENOMEM;
+                closedir( pdir );
+            }
+        }
+        else
+        {
+#ifdef DEBUG_OSL_FILE
+            perror ("osl_openDirectory"); fprintf (stderr, path);
+#endif
+        }
+    }
+
+    rtl_uString_release( ustrSystemPath );
+
+    return oslTranslateFileError(OSL_FET_ERROR, errno);
+}
+
+/****************************************************************************/
+/*	osl_closeDirectory */
+/****************************************************************************/
+
+oslFileError SAL_CALL osl_closeDirectory( oslDirectory Directory )
+{
+    oslDirectoryImpl* pDirImpl = (oslDirectoryImpl*) Directory;
+    oslFileError err = osl_File_E_None;
+
+    OSL_ASSERT( Directory );
+
+    if( NULL == pDirImpl )
+        return osl_File_E_INVAL;
+
+    /* close directory */
+    if( closedir( pDirImpl->pDirStruct ) )
+    {
+        err = oslTranslateFileError(OSL_FET_ERROR, errno);
+    }
+
+    /* cleanup members */
+    rtl_uString_release( pDirImpl->ustrPath );
+
+    rtl_freeMemory( pDirImpl );
+
+    return err;
+}
+
+/**********************************************
+ * osl_readdir_impl_
+ *
+ * readdir wrapper, filters out "." and ".."
+ * on request
+ *********************************************/
+
+static struct dirent* osl_readdir_impl_(DIR* pdir, sal_Bool bFilterLocalAndParentDir)
+{
+    struct dirent* pdirent;
+
+    while ((pdirent = readdir(pdir)) != NULL)
+    {
+        if (bFilterLocalAndParentDir &&
+            ((0 == strcmp(pdirent->d_name, ".")) || (0 == strcmp(pdirent->d_name, ".."))))
+            continue;
+        else
+            break;
+    }
+
+    return pdirent;
+}
+
+/****************************************************************************
+ *	osl_getNextDirectoryItem
+ ***************************************************************************/
+
+oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem* pItem, sal_uInt32 /*uHint*/)
+{
+    oslDirectoryImpl* pDirImpl     = (oslDirectoryImpl*)Directory;
+    rtl_uString*      ustrFileName = NULL;
+    rtl_uString*      ustrFilePath = NULL;
+    struct dirent*    pEntry;
+
+    OSL_ASSERT(Directory);
+    OSL_ASSERT(pItem);
+
+    if ((NULL == Directory) || (NULL == pItem))
+        return osl_File_E_INVAL;
+
+    pEntry = osl_readdir_impl_(pDirImpl->pDirStruct, sal_True);
+
+    if (NULL == pEntry)
+        return osl_File_E_NOENT;
+
+
+#if defined(MACOSX)
+
+    // convert decomposed filename to precomposed unicode 
+    char composed_name[BUFSIZ];  
+    CFMutableStringRef strRef = CFStringCreateMutable (NULL, 0 );
+    CFStringAppendCString( strRef, pEntry->d_name, kCFStringEncodingUTF8 );  //UTF8 is default on Mac OSX
+    CFStringNormalize( strRef, kCFStringNormalizationFormC );
+    CFStringGetCString( strRef, composed_name, BUFSIZ, kCFStringEncodingUTF8 );
+    CFRelease( strRef );
+    rtl_string2UString( &ustrFileName, composed_name, strlen( composed_name),
+    osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
+
+#else  // not MACOSX
+    /* convert file name to unicode */
+    rtl_string2UString( &ustrFileName, pEntry->d_name, strlen( pEntry->d_name ),
+        osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
+    OSL_ASSERT(ustrFileName != 0);
+
+#endif
+
+    osl_systemPathMakeAbsolutePath(pDirImpl->ustrPath, ustrFileName, &ustrFilePath);
+    rtl_uString_release( ustrFileName );
+
+    DirectoryItem_Impl * pImpl = static_cast< DirectoryItem_Impl* >(*pItem);
+    if (0 != pImpl)
+    {
+        pImpl->release(), pImpl = 0;
+    }
+#ifdef _DIRENT_HAVE_D_TYPE
+    pImpl = new DirectoryItem_Impl(ustrFilePath, pEntry->d_type);
+#else
+    pImpl = new DirectoryItem_Impl(ustrFilePath);
+#endif /* _DIRENT_HAVE_D_TYPE */
+    *pItem = pImpl;
+    rtl_uString_release( ustrFilePath );
+
+    return osl_File_E_None;
+}
+
+/****************************************************************************/
+/*	osl_getDirectoryItem */
+/****************************************************************************/
+
+oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirectoryItem* pItem )
+{
+    rtl_uString* ustrSystemPath = NULL;
+    oslFileError osl_error      = osl_File_E_INVAL;
+
+    OSL_ASSERT(ustrFileURL);
+    OSL_ASSERT(pItem);
+
+    if (0 == ustrFileURL->length || NULL == pItem)
+        return osl_File_E_INVAL;
+
+    osl_error = osl_getSystemPathFromFileURL_Ex(ustrFileURL, &ustrSystemPath, sal_False);
+    if (osl_File_E_None != osl_error)
+        return osl_error;
+
+    osl_systemPathRemoveSeparator(ustrSystemPath);
+
+    if (-1 == access_u(ustrSystemPath, F_OK))
+    {
+        osl_error = oslTranslateFileError(OSL_FET_ERROR, errno);
+    }
+    else
+    {
+        *pItem = new DirectoryItem_Impl(ustrSystemPath);
+    }
+    rtl_uString_release(ustrSystemPath);
+
+    return osl_error;
+}
+
+
+/****************************************************************************/
+/*	osl_acquireDirectoryItem */
+/****************************************************************************/
+
+oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item )
+{
+    DirectoryItem_Impl * pImpl = static_cast< DirectoryItem_Impl* >(Item);
+    if (0 == pImpl)
+        return osl_File_E_INVAL;
+
+    pImpl->acquire();
+    return osl_File_E_None;
+}
+
+/****************************************************************************/
+/*	osl_releaseDirectoryItem */
+/****************************************************************************/
+
+oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item )
+{
+    DirectoryItem_Impl * pImpl = static_cast< DirectoryItem_Impl* >(Item);
+    if (0 == pImpl)
+        return osl_File_E_INVAL;
+
+    pImpl->release();
+    return osl_File_E_None;
+}
+
+/****************************************************************************/
+/*	osl_createDirectory */
+/****************************************************************************/
+
+oslFileError SAL_CALL osl_createDirectory( rtl_uString* ustrDirectoryURL )
+{
+    char path[PATH_MAX];
+    oslFileError eRet;
+
+    OSL_ASSERT( ustrDirectoryURL );
+
+    /* convert directory url to system path */
+    eRet = FileURLToPath( path, PATH_MAX, ustrDirectoryURL );
+    if( eRet != osl_File_E_None )
+        return eRet;
+
+#ifdef MACOSX
+    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
+      return oslTranslateFileError( OSL_FET_ERROR, errno );
+#endif/* MACOSX */
+
+    return osl_psz_createDirectory( path );
+}
+
+/****************************************************************************/
+/*	osl_removeDirectory */
+/****************************************************************************/
+
+oslFileError SAL_CALL osl_removeDirectory( rtl_uString* ustrDirectoryURL )
+{
+    char path[PATH_MAX];
+    oslFileError eRet;
+
+    OSL_ASSERT( ustrDirectoryURL );
+
+    /* convert directory url to system path */
+    eRet = FileURLToPath( path, PATH_MAX, ustrDirectoryURL );
+    if( eRet != osl_File_E_None )
+        return eRet;
+
+#ifdef MACOSX
+    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
+      return oslTranslateFileError( OSL_FET_ERROR, errno );
+#endif/* MACOSX */
+
+    return osl_psz_removeDirectory( path );
+}
+
+/*****************************************
+ * osl_psz_createDirectory
+ ****************************************/
+
+static oslFileError osl_psz_createDirectory( const sal_Char* pszPath )
+{
+    int nRet=0;
+    int mode = S_IRWXU | S_IRWXG | S_IRWXO;
+
+    nRet = mkdir(pszPath,mode);
+
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return oslTranslateFileError(OSL_FET_ERROR, nRet);
+    }
+
+    return osl_File_E_None;
+}
+
+/*****************************************
+ * osl_psz_removeDirectory
+ ****************************************/
+
+static oslFileError osl_psz_removeDirectory( const sal_Char* pszPath )
+{
+    int nRet=0;
+
+    nRet = rmdir(pszPath);
+
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return oslTranslateFileError(OSL_FET_ERROR, nRet);
+    }
+
+    return osl_File_E_None;
+}
+
+/****************************************************************************/
+/*	osl_createDirectoryPath */
+/****************************************************************************/
+
+static int path_make_parent(sal_Unicode* path)
+{
+    int i = rtl_ustr_lastIndexOfChar(path, '/');
+    
+    if (i > 0)
+    {
+        *(path + i) = 0;
+        return i;
+    }
+    else
+        return 0;
+}
+
+static int create_dir_with_callback(
+    sal_Unicode* directory_path,
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
+    void* pData)
+{
+    int mode = S_IRWXU | S_IRWXG | S_IRWXO;
+    
+    if (osl::mkdir(directory_path, mode) == 0)
+    {
+        if (aDirectoryCreationCallbackFunc)
+        {
+            rtl::OUString url;                
+            osl::FileBase::getFileURLFromSystemPath(directory_path, url);                                
+            aDirectoryCreationCallbackFunc(pData, url.pData);
+        }                
+        return 0;
+    }
+    return errno;
+}
+
+static oslFileError create_dir_recursively_(
+    sal_Unicode* dir_path,
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
+    void* pData)
+{   
+    OSL_PRECOND((rtl_ustr_getLength(dir_path) > 0) && ((dir_path + (rtl_ustr_getLength(dir_path) - 1)) != (dir_path + rtl_ustr_lastIndexOfChar(dir_path, '/'))), \
+    "Path must not end with a slash");
+         
+    int native_err = create_dir_with_callback(
+        dir_path, aDirectoryCreationCallbackFunc, pData);
+        
+    if (native_err == 0)    
+        return osl_File_E_None;
+                        
+    if (native_err != ENOENT)
+        return oslTranslateFileError(OSL_FET_ERROR, native_err);
+    
+    // we step back until '/a_dir' at maximum because
+    // we should get an error unequal ENOENT when
+    // we try to create 'a_dir' at '/' and would so 
+    // return before	    
+    int pos = path_make_parent(dir_path);
+                    
+    oslFileError osl_error = create_dir_recursively_(
+        dir_path, aDirectoryCreationCallbackFunc, pData);
+                    
+    if (osl_File_E_None != osl_error)
+        return osl_error;
+                    
+       dir_path[pos] = '/';
+                               
+    return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData);     
+}
+
+oslFileError SAL_CALL osl_createDirectoryPath(
+    rtl_uString* aDirectoryUrl, 
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
+    void* pData)
+{
+    if (aDirectoryUrl == NULL)
+        return osl_File_E_INVAL;
+    
+    rtl::OUString sys_path;         
+    oslFileError osl_error = osl_getSystemPathFromFileURL_Ex(
+        aDirectoryUrl, &sys_path.pData, sal_False);        
+    
+    if (osl_error != osl_File_E_None)
+        return osl_error;
+                                                                
+    osl::systemPathRemoveSeparator(sys_path);
+    
+    // const_cast because sys_path is a local copy which we want to modify inplace instead of 
+    // coyp it into another buffer on the heap again
+    return create_dir_recursively_(sys_path.pData->buffer, aDirectoryCreationCallbackFunc, pData);			
+}
+
+/******************************************************************************
+ *
+ *                  C-String Function Declarations
+ *
+ *****************************************************************************/
+
+static oslFileError osl_psz_removeFile(const sal_Char* pszPath);
+static oslFileError osl_psz_copyFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
+static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
+
+
+/******************************************************************************
+ *
+ *                  Static Module Utility Function Declarations
+ *
+ *****************************************************************************/
+
+static oslFileError  oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, mode_t nMode, size_t nSourceSize, int DestFileExists);
+static oslFileError  oslChangeFileModes(const sal_Char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID);
+static int           oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName);
+static int           oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode);
+static oslFileError  oslDoMoveFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
+
+/****************************************************************************/
+/*	osl_moveFile */
+/****************************************************************************/
+
+oslFileError SAL_CALL osl_moveFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
+{
+    char srcPath[PATH_MAX];
+    char destPath[PATH_MAX];
+    oslFileError eRet;
+
+    OSL_ASSERT( ustrFileURL );
+    OSL_ASSERT( ustrDestURL );
+
+    /* convert source url to system path */
+    eRet = FileURLToPath( srcPath, PATH_MAX, ustrFileURL );
+    if( eRet != osl_File_E_None )
+        return eRet;
+
+    /* convert destination url to system path */
+    eRet = FileURLToPath( destPath, PATH_MAX, ustrDestURL );
+    if( eRet != osl_File_E_None )
+        return eRet;
+
+#ifdef MACOSX
+    if ( macxp_resolveAlias( srcPath, PATH_MAX ) != 0 || macxp_resolveAlias( destPath, PATH_MAX ) != 0 )
+      return oslTranslateFileError( OSL_FET_ERROR, errno );
+#endif/* MACOSX */
+
+    return oslDoMoveFile( srcPath, destPath );
+}
+
+/****************************************************************************/
+/*	osl_copyFile */
+/****************************************************************************/
+
+oslFileError SAL_CALL osl_copyFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
+{
+    char srcPath[PATH_MAX];
+    char destPath[PATH_MAX];
+    oslFileError eRet;
+
+    OSL_ASSERT( ustrFileURL );
+    OSL_ASSERT( ustrDestURL );
+
+    /* convert source url to system path */
+    eRet = FileURLToPath( srcPath, PATH_MAX, ustrFileURL );
+    if( eRet != osl_File_E_None )
+        return eRet;
+
+    /* convert destination url to system path */
+    eRet = FileURLToPath( destPath, PATH_MAX, ustrDestURL );
+    if( eRet != osl_File_E_None )
+        return eRet;
+
+#ifdef MACOSX
+    if ( macxp_resolveAlias( srcPath, PATH_MAX ) != 0 || macxp_resolveAlias( destPath, PATH_MAX ) != 0 )
+      return oslTranslateFileError( OSL_FET_ERROR, errno );
+#endif/* MACOSX */
+
+    return osl_psz_copyFile( srcPath, destPath );
+}
+
+/****************************************************************************/
+/*	osl_removeFile */
+/****************************************************************************/
+
+oslFileError SAL_CALL osl_removeFile( rtl_uString* ustrFileURL )
+{
+    char path[PATH_MAX];
+    oslFileError eRet;
+
+    OSL_ASSERT( ustrFileURL );
+
+    /* convert file url to system path */
+    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
+    if( eRet != osl_File_E_None )
+        return eRet;
+
+#ifdef MACOSX
+    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
+      return oslTranslateFileError( OSL_FET_ERROR, errno );
+#endif/* MACOSX */
+
+    return osl_psz_removeFile( path );
+}
+
+/******************************************************************************
+ *
+ *                  Utility Functions
+ *
+ *****************************************************************************/
+
+/*****************************************
+ * oslDoMoveFile
+ ****************************************/
+
+static oslFileError oslDoMoveFile( const sal_Char* pszPath, const sal_Char* pszDestPath)
+{
+    oslFileError tErr=osl_File_E_invalidError;
+
+    tErr = osl_psz_moveFile(pszPath,pszDestPath);
+    if ( tErr == osl_File_E_None )
+    {
+        return tErr;
+    }
+
+    if ( tErr != osl_File_E_XDEV )
+    {
+        return tErr;
+    }
+
+    tErr=osl_psz_copyFile(pszPath,pszDestPath);
+
+    if ( tErr != osl_File_E_None )
+    {
+        oslFileError tErrRemove;
+        tErrRemove=osl_psz_removeFile(pszDestPath);
+        return tErr;
+    }
+
+    tErr=osl_psz_removeFile(pszPath);
+
+    return tErr;
+}
+
+/*****************************************
+ * osl_psz_removeFile
+ ****************************************/
+static oslFileError osl_psz_removeFile( const sal_Char* pszPath )
+{
+    int nRet=0;
+    struct stat aStat;
+
+    nRet = lstat(pszPath,&aStat);
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return oslTranslateFileError(OSL_FET_ERROR, nRet);
+    }
+
+    if ( S_ISDIR(aStat.st_mode) )
+    {
+        return osl_File_E_ISDIR;
+    }
+
+    nRet = unlink(pszPath);
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return oslTranslateFileError(OSL_FET_ERROR, nRet);
+    }
+
+    return osl_File_E_None;
+}
+
+/*****************************************
+ * osl_psz_moveFile
+ ****************************************/
+
+static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* pszDestPath)
+{
+
+    int nRet = 0;
+
+    nRet = rename(pszPath,pszDestPath);
+
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return oslTranslateFileError(OSL_FET_ERROR, nRet);
+    }
+
+    return osl_File_E_None;
+}
+
+/*****************************************
+ * osl_psz_copyFile
+ ****************************************/
+
+static oslFileError osl_psz_copyFile( const sal_Char* pszPath, const sal_Char* pszDestPath )
+{
+    time_t nAcTime=0;
+    time_t nModTime=0;
+    uid_t nUID=0;
+    gid_t nGID=0;
+    int nRet=0;
+    mode_t nMode=0;
+    struct stat aFileStat;
+    oslFileError tErr=osl_File_E_invalidError;
+    size_t nSourceSize=0;
+    int DestFileExists=1;
+
+    /* mfe: does the source file really exists? */
+    nRet = lstat(pszPath,&aFileStat);
+
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return oslTranslateFileError(OSL_FET_ERROR, nRet);
+    }
+
+    /* mfe: we do only copy files here! */
+    if ( S_ISDIR(aFileStat.st_mode) )
+    {
+        return osl_File_E_ISDIR;
+    }
+
+    nSourceSize=(size_t)aFileStat.st_size;
+    nMode=aFileStat.st_mode;
+    nAcTime=aFileStat.st_atime;
+    nModTime=aFileStat.st_mtime;
+    nUID=aFileStat.st_uid;
+    nGID=aFileStat.st_gid;
+
+    nRet = stat(pszDestPath,&aFileStat);
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+
+        if ( nRet == ENOENT )
+        {
+            DestFileExists=0;
+        }
+/*        return oslTranslateFileError(nRet);*/
+    }
+
+    /* mfe: the destination file must not be a directory! */
+    if ( nRet == 0 && S_ISDIR(aFileStat.st_mode) )
+    {
+        return osl_File_E_ISDIR;
+    }
+    else
+    {
+        /* mfe: file does not exists or is no dir */
+    }
+
+    tErr = oslDoCopy(pszPath,pszDestPath,nMode,nSourceSize,DestFileExists);
+
+    if ( tErr != osl_File_E_None )
+    {
+        return tErr;
+    }
+
+    /*
+     *   mfe: ignore return code
+     *        since only  the success of the copy is
+     *        important
+     */
+    oslChangeFileModes(pszDestPath,nMode,nAcTime,nModTime,nUID,nGID);
+
+    return tErr;
+}
+
+
+/******************************************************************************
+ *
+ *                  Utility Functions
+ *
+ *****************************************************************************/
+
+/*****************************************
+ * oslDoCopy
+ ****************************************/
+
+#define TMP_DEST_FILE_EXTENSION ".osl-tmp"
+
+static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, mode_t nMode, size_t nSourceSize, int DestFileExists)
+{
+    int      nRet=0;
+    sal_Char pszTmpDestFile[PATH_MAX];
+    size_t   size_tmp_dest_buff = sizeof(pszTmpDestFile);
+
+    /* Quick fix for #106048, the whole copy file function seems
+       to be erroneous anyway and needs to be rewritten.
+       Besides osl_copyFile	is currently not used from OO/SO code.
+    */
+    memset(pszTmpDestFile, 0, size_tmp_dest_buff);
+
+    if ( DestFileExists )
+    {
+        strncpy(pszTmpDestFile, pszDestFileName, size_tmp_dest_buff - 1);
+
+        if ((strlen(pszTmpDestFile) + strlen(TMP_DEST_FILE_EXTENSION)) >= size_tmp_dest_buff)
+            return osl_File_E_NAMETOOLONG;
+
+        strncat(pszTmpDestFile, TMP_DEST_FILE_EXTENSION, strlen(TMP_DEST_FILE_EXTENSION));
+
+        /* FIXME: what if pszTmpDestFile already exists? */
+        /*        with getcanonical??? */
+        nRet=rename(pszDestFileName,pszTmpDestFile);
+    }
+
+    /* mfe: should be S_ISREG */
+    if ( !S_ISLNK(nMode) )
+    {
+        /* copy SourceFile to DestFile */
+        nRet = oslDoCopyFile(pszSourceFileName,pszDestFileName,nSourceSize, nMode);
+    }
+    /* mfe: OK redundant at the moment */
+    else if ( S_ISLNK(nMode) )
+    {
+        nRet = oslDoCopyLink(pszSourceFileName,pszDestFileName);
+    }
+    else
+    {
+        /* mfe: what to do here? */
+        nRet=ENOSYS;
+    }
+
+    if ( nRet > 0 && DestFileExists == 1 )
+    {
+        unlink(pszDestFileName);
+        rename(pszTmpDestFile,pszDestFileName);
+    }
+
+    if ( nRet > 0 )
+    {
+        return oslTranslateFileError(OSL_FET_ERROR, nRet);
+    }
+
+    if ( DestFileExists == 1 )
+    {
+        unlink(pszTmpDestFile);
+    }
+
+    return osl_File_E_None;
+}
+
+/*****************************************
+ * oslChangeFileModes
+ ****************************************/
+
+static oslFileError oslChangeFileModes( const sal_Char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID)
+{
+    int nRet=0;
+    struct utimbuf aTimeBuffer;
+
+    nRet = chmod(pszFileName,nMode);
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return oslTranslateFileError(OSL_FET_ERROR, nRet);
+    }
+
+    aTimeBuffer.actime=nAcTime;
+    aTimeBuffer.modtime=nModTime;
+    nRet=utime(pszFileName,&aTimeBuffer);
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return oslTranslateFileError(OSL_FET_ERROR, nRet);
+    }
+
+    if ( nUID != getuid() )
+    {
+        nUID=getuid();
+    }
+
+    nRet=chown(pszFileName,nUID,nGID);
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+
+        /* mfe: do not return an error here! */
+        /* return oslTranslateFileError(nRet);*/
+    }
+
+    return osl_File_E_None;
+}
+
+/*****************************************
+ * oslDoCopyLink
+ ****************************************/
+
+static int oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName)
+{
+    int nRet=0;
+
+    /* mfe: if dest file is symbolic link remove the link and place the file instead (hro says so) */
+    /* mfe: if source is a link copy the link and not the file it points to (hro says so) */
+    sal_Char pszLinkContent[PATH_MAX];
+
+    pszLinkContent[0] = '\0';
+
+    nRet = readlink(pszSourceFileName,pszLinkContent,PATH_MAX);
+
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return nRet;
+    }
+    else
+        pszLinkContent[ nRet ] = 0;
+
+    nRet = symlink(pszLinkContent,pszDestFileName);
+
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return nRet;
+    }
+
+    return 0;
+}
+
+/*****************************************
+ * oslDoCopyFile
+ ****************************************/
+
+static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode)
+{    
+    int SourceFileFD=0;
+    int DestFileFD=0;
+    int nRet=0;
+    void* pSourceFile=0;
+
+    SourceFileFD=open(pszSourceFileName,O_RDONLY);
+    if ( SourceFileFD < 0 )
+    {		
+        nRet=errno;
+        return nRet;
+    }
+    
+    DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT, mode);
+        
+    if ( DestFileFD < 0 )
+    {
+        nRet=errno;
+        close(SourceFileFD);
+        return nRet;
+    }
+
+    /* HACK: because memory mapping fails on various 
+       platforms if the size of the source file is  0 byte */
+    if (0 == nSourceSize)
+    {						
+        close(SourceFileFD);
+        close(DestFileFD);
+        return 0;
+    }
+    
+    /* FIXME doCopy: fall back code for systems not having mmap */
+    /* mmap file -- open dest file -- write once -- fsync it */
+    pSourceFile=mmap(0,nSourceSize,PROT_READ,MAP_PRIVATE,SourceFileFD,0);
+    
+    if ( pSourceFile == MAP_FAILED )
+    {	
+        /* it's important to set nRet before the hack
+           otherwise errno may be changed by lstat */
+        nRet = errno;
+        close(SourceFileFD);
+        close(DestFileFD);
+        
+        return nRet;
+    }
+
+    nRet = write(DestFileFD,pSourceFile,nSourceSize);
+        
+    /* #112584# if 'write' could not write the requested number of bytes
+             we have to fail of course; because it's not exactly specified if 'write'
+            sets errno if less than requested byte could be written we set nRet
+           explicitly to ENOSPC */
+    if ((nRet < 0) || (nRet != sal::static_int_cast< int >(nSourceSize)))
+    {				
+        if (nRet < 0)
+            nRet = errno;
+        else 
+            nRet = ENOSPC;
+        
+        close(SourceFileFD);
+        close(DestFileFD);
+        munmap((char*)pSourceFile,nSourceSize);
+        return nRet;
+    }
+    
+    nRet = munmap((char*)pSourceFile,nSourceSize);
+    if ( nRet < 0 )
+    {				
+        nRet=errno;
+        close(SourceFileFD);
+        close(DestFileFD);
+        return nRet;
+    }
+    
+    close(SourceFileFD);
+    
+    // Removed call to 'fsync' again (#112584#) and instead 
+    // evaluate the return value of 'close' in order to detect 
+    // and report ENOSPC and other erronous conditions on close    
+    if (close(DestFileFD) == -1)
+        return errno;
+    else
+        return 0;
+}
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index b26e89882..63f876ce8 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -31,39 +31,20 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#ifndef _TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifndef _LIMITS_H
-#include <limits.h>
-#endif
-
-#ifndef _UNISTD_H
-#include <unistd.h>
-#endif
+#include "osl/file.h"
 
-#ifndef _DIRENT_H
+#include "system.h"
+#include <sys/types.h>
 #include <dirent.h>
-#endif
-
-#include <osl/file.h>
-
-#ifndef _ERRNO_H
 #include <errno.h>
-#endif
- 
-#include <rtl/string.hxx>
-
-#ifndef _OSL_UUNXAPI_H_
-#include "uunxapi.hxx"
-#endif
-#include "file_path_helper.hxx"
-#include "file_error_transl.h"
+#include <limits.h>
+#include <unistd.h>
 
-#ifdef _DIRENT_HAVE_D_TYPE
 #include "file_impl.hxx"
-#endif
+#include "file_error_transl.h"
+#include "file_path_helper.hxx"
+#include "file_url.h"
+#include "uunxapi.hxx"
 
 namespace /* private */
 {
@@ -231,19 +212,10 @@ namespace /* private */
     
     /* we only need to call stat or lstat if one of the 
        following flags is set */
-#ifdef _DIRENT_HAVE_D_TYPE
-    inline bool is_stat_call_necessary(sal_uInt32 field_mask, oslDirectoryItemImpl *pImpl)
-#else
-    inline bool is_stat_call_necessary(sal_uInt32 field_mask)
-#endif
+    inline bool is_stat_call_necessary(sal_uInt32 field_mask, oslFileType file_type = osl_File_Type_Unknown)
     {
         return (
-/* on linux the dirent might have d_type */
-#ifdef _DIRENT_HAVE_D_TYPE
-                ((field_mask & osl_FileStatus_Mask_Type) && (!pImpl->bHasType || pImpl->DType == DT_UNKNOWN)) ||
-#else
-                (field_mask & osl_FileStatus_Mask_Type) ||
-#endif
+                ((field_mask & osl_FileStatus_Mask_Type) && (file_type == osl_File_Type_Unknown)) ||
                 (field_mask & osl_FileStatus_Mask_Attributes) ||
                 (field_mask & osl_FileStatus_Mask_CreationTime) ||
                 (field_mask & osl_FileStatus_Mask_AccessTime) ||
@@ -267,24 +239,18 @@ namespace /* private */
         return osl_File_E_None;			
     }
     
-    inline oslFileError setup_osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pStat, rtl::OUString& file_path)
+    inline oslFileError setup_osl_getFileStatus(
+        DirectoryItem_Impl * pImpl, oslFileStatus* pStat, rtl::OUString& file_path)
     {		
-        if ((NULL == Item) || (NULL == pStat))
+        if ((NULL == pImpl) || (NULL == pStat))
             return osl_File_E_INVAL;
                             
-#ifdef _DIRENT_HAVE_D_TYPE
-        file_path = rtl::OUString(reinterpret_cast<rtl_uString*>(((oslDirectoryItemImpl* ) Item)->ustrFilePath));
-#else
-        file_path = rtl::OUString(reinterpret_cast<rtl_uString*>(Item));    
-#endif
-
+        file_path = rtl::OUString(pImpl->m_ustrFilePath);
         OSL_ASSERT(file_path.getLength() > 0);
-        
         if (file_path.getLength() <= 0)
             return osl_File_E_INVAL;
                             
         pStat->uValidFields = 0;
-                                    
         return osl_File_E_None;		
     }
     
@@ -297,8 +263,10 @@ namespace /* private */
 
 oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pStat, sal_uInt32 uFieldMask)
 {	
+    DirectoryItem_Impl * pImpl = static_cast< DirectoryItem_Impl* >(Item);
+
     rtl::OUString file_path;	
-    oslFileError  osl_error = setup_osl_getFileStatus(Item, pStat, file_path);	
+    oslFileError  osl_error = setup_osl_getFileStatus(pImpl, pStat, file_path);
     if (osl_File_E_None != osl_error)
         return osl_error;
     
@@ -308,13 +276,7 @@ oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pS
     struct stat file_stat;
 #endif
 
-#ifdef _DIRENT_HAVE_D_TYPE
-    oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
-    bool bStatNeeded = is_stat_call_necessary(uFieldMask, pImpl);
-#else
-    bool bStatNeeded = is_stat_call_necessary(uFieldMask);
-#endif
-
+    bool bStatNeeded = is_stat_call_necessary(uFieldMask, pImpl->getFileType());
     if (bStatNeeded && (0 != osl::lstat(file_path, file_stat)))
         return oslTranslateFileError(OSL_FET_ERROR, errno);
     
@@ -338,37 +300,10 @@ oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pS
 #ifdef _DIRENT_HAVE_D_TYPE
     else if (uFieldMask & osl_FileStatus_Mask_Type)
     {
-        OSL_ASSERT(pImpl->bHasType);
-
-        switch(pImpl->DType)
-        {
-        case DT_LNK:
-            pStat->eType = osl_File_Type_Link;              
-            break;
-        case DT_DIR:
-            pStat->eType = osl_File_Type_Directory;       
-            break;
-        case DT_REG:
-            pStat->eType = osl_File_Type_Regular;
-            break;
-        case DT_FIFO:
-            pStat->eType = osl_File_Type_Fifo;
-            break;
-        case DT_SOCK:
-            pStat->eType = osl_File_Type_Socket;
-            break;
-        case DT_CHR:
-        case DT_BLK:
-            pStat->eType = osl_File_Type_Special;
-            break;
-        default:
-            OSL_ASSERT(0);
-            pStat->eType = osl_File_Type_Unknown;
-        }
-
-       pStat->uValidFields |= osl_FileStatus_Mask_Type;
+        pStat->eType = pImpl->getFileType();
+        pStat->uValidFields |= osl_FileStatus_Mask_Type;
     }
-#endif
+#endif /* _DIRENT_HAVE_D_TYPE */
             
     if (uFieldMask & osl_FileStatus_Mask_FileURL)
     {
@@ -386,3 +321,175 @@ oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pS
     return osl_File_E_None;
 }
 
+/****************************************************************************/
+/*	osl_setFileAttributes */
+/****************************************************************************/
+
+static oslFileError osl_psz_setFileAttributes( const sal_Char* pszFilePath, sal_uInt64 uAttributes )
+{
+    oslFileError osl_error = osl_File_E_None;
+    mode_t 		 nNewMode  = 0;
+
+     OSL_ENSURE(!(osl_File_Attribute_Hidden & uAttributes), "osl_File_Attribute_Hidden doesn't work under Unix");
+
+    if (uAttributes & osl_File_Attribute_OwnRead)
+        nNewMode |= S_IRUSR;
+
+    if (uAttributes & osl_File_Attribute_OwnWrite)
+        nNewMode|=S_IWUSR;
+
+    if  (uAttributes & osl_File_Attribute_OwnExe)
+        nNewMode|=S_IXUSR;
+
+    if (uAttributes & osl_File_Attribute_GrpRead)
+        nNewMode|=S_IRGRP;
+
+    if (uAttributes & osl_File_Attribute_GrpWrite)
+        nNewMode|=S_IWGRP;
+
+    if (uAttributes & osl_File_Attribute_GrpExe)
+        nNewMode|=S_IXGRP;
+
+    if (uAttributes & osl_File_Attribute_OthRead)
+        nNewMode|=S_IROTH;
+
+    if (uAttributes & osl_File_Attribute_OthWrite)
+        nNewMode|=S_IWOTH;
+
+    if (uAttributes & osl_File_Attribute_OthExe)
+        nNewMode|=S_IXOTH;
+
+    if (chmod(pszFilePath, nNewMode) < 0)
+        osl_error = oslTranslateFileError(OSL_FET_ERROR, errno);
+
+    return osl_error;
+}
+
+oslFileError SAL_CALL osl_setFileAttributes( rtl_uString* ustrFileURL, sal_uInt64 uAttributes )
+{
+    char path[PATH_MAX];
+    oslFileError eRet;
+
+    OSL_ASSERT( ustrFileURL );
+
+    /* convert file url to system path */
+    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
+    if( eRet != osl_File_E_None )
+        return eRet;
+
+#ifdef MACOSX
+    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
+      return oslTranslateFileError( OSL_FET_ERROR, errno );
+#endif/* MACOSX */
+
+    return osl_psz_setFileAttributes( path, uAttributes );
+}
+
+/****************************************************************************/
+/*	osl_setFileTime */
+/****************************************************************************/
+
+static oslFileError osl_psz_setFileTime (
+    const sal_Char* pszFilePath,
+    const TimeValue* /*pCreationTime*/,
+    const TimeValue* pLastAccessTime,
+    const TimeValue* pLastWriteTime )
+{
+    int nRet=0;
+    struct utimbuf aTimeBuffer;
+    struct stat aFileStat;
+#ifdef DEBUG_OSL_FILE
+    struct tm* pTM=0;
+#endif
+
+    nRet = lstat(pszFilePath,&aFileStat);
+
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return oslTranslateFileError(OSL_FET_ERROR, nRet);
+    }
+
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"File Times are (in localtime):\n");
+    pTM=localtime(&aFileStat.st_ctime);
+    fprintf(stderr,"CreationTime is '%s'\n",asctime(pTM));
+    pTM=localtime(&aFileStat.st_atime);
+    fprintf(stderr,"AccessTime   is '%s'\n",asctime(pTM));
+    pTM=localtime(&aFileStat.st_mtime);
+    fprintf(stderr,"Modification is '%s'\n",asctime(pTM));
+
+    fprintf(stderr,"File Times are (in UTC):\n");
+    fprintf(stderr,"CreationTime is '%s'\n",ctime(&aFileStat.st_ctime));
+    fprintf(stderr,"AccessTime   is '%s'\n",ctime(&aTimeBuffer.actime));
+    fprintf(stderr,"Modification is '%s'\n",ctime(&aTimeBuffer.modtime));
+#endif
+
+    if ( pLastAccessTime != 0 )
+    {
+        aTimeBuffer.actime=pLastAccessTime->Seconds;
+    }
+    else
+    {
+        aTimeBuffer.actime=aFileStat.st_atime;
+    }
+
+    if ( pLastWriteTime != 0 )
+    {
+        aTimeBuffer.modtime=pLastWriteTime->Seconds;
+    }
+    else
+    {
+        aTimeBuffer.modtime=aFileStat.st_mtime;
+    }
+
+    /* mfe: Creation time not used here! */
+
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"File Times are (in localtime):\n");
+    pTM=localtime(&aFileStat.st_ctime);
+    fprintf(stderr,"CreationTime now '%s'\n",asctime(pTM));
+    pTM=localtime(&aTimeBuffer.actime);
+    fprintf(stderr,"AccessTime   now '%s'\n",asctime(pTM));
+    pTM=localtime(&aTimeBuffer.modtime);
+    fprintf(stderr,"Modification now '%s'\n",asctime(pTM));
+
+    fprintf(stderr,"File Times are (in UTC):\n");
+    fprintf(stderr,"CreationTime now '%s'\n",ctime(&aFileStat.st_ctime));
+    fprintf(stderr,"AccessTime   now '%s'\n",ctime(&aTimeBuffer.actime));
+    fprintf(stderr,"Modification now '%s'\n",ctime(&aTimeBuffer.modtime));
+#endif
+
+    nRet=utime(pszFilePath,&aTimeBuffer);
+    if ( nRet < 0 )
+    {
+        nRet=errno;
+        return oslTranslateFileError(OSL_FET_ERROR, nRet);
+    }
+
+    return osl_File_E_None;
+}
+
+oslFileError SAL_CALL osl_setFileTime (
+    rtl_uString* ustrFileURL,
+    const TimeValue* pCreationTime,
+    const TimeValue* pLastAccessTime,
+    const TimeValue* pLastWriteTime )
+{
+    char path[PATH_MAX];
+    oslFileError eRet;
+
+    OSL_ASSERT( ustrFileURL );
+
+    /* convert file url to system path */
+    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
+    if( eRet != osl_File_E_None )
+        return eRet;
+
+#ifdef MACOSX
+    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
+      return oslTranslateFileError( OSL_FET_ERROR, errno );
+#endif/* MACOSX */
+
+    return osl_psz_setFileTime( path, pCreationTime, pLastAccessTime, pLastWriteTime );
+}
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 2e7c81512..4e67fce51 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -30,45 +30,31 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
+
+#include "file_url.h"
+
 #include "system.h"
 
-#ifndef _LIMITS_H
 #include <limits.h>
-#endif
-
-#ifndef _ERRNO_H
 #include <errno.h>
-#endif
-
-#ifndef _STRINGS_H
 #include <strings.h>
-#endif
-
-#ifndef _UNISTD_H
 #include <unistd.h>
-#endif
-#include <osl/file.h>
+
+#include "osl/file.hxx"
 #include <osl/security.h>
-#include <rtl/uri.h>
 #include <osl/diagnose.h>
+#include <osl/thread.h>
+#include <osl/process.h>
+
+#include <rtl/uri.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.h>
+#include "rtl/textcvt.h"
 
-#ifndef _OSL_TREAD_H_
-#include <osl/thread.h>
-#endif
-#include <osl/file.hxx>
-#include <osl/process.h>
 #include "file_error_transl.h"
-
-#ifndef _FILE_URL_H_
-#include "file_url.h"
-#endif
 #include "file_path_helper.hxx"
  
-#ifndef _OSL_UUNXAPI_HXX_
 #include "uunxapi.hxx"
-#endif
  
 /***************************************************
  
@@ -84,16 +70,14 @@
  so this code should be consolidated.
  
  **************************************************/
+/************************************************************************
+ *   ToDo
+ *
+ *   Fix osl_getCanonicalName
+ *
+ ***********************************************************************/
  
  
- 
-/***************************************************
- * forward
- **************************************************/
- 
-extern "C" int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
-extern "C" int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
-
 /***************************************************
  * namespace directives
  **************************************************/
@@ -151,6 +135,18 @@ static sal_Bool findWrongUsage( const sal_Unicode *path, sal_Int32 len )
 */
 
 /****************************************************************************/
+/*	osl_getCanonicalName */
+/****************************************************************************/
+
+oslFileError SAL_CALL osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uString** pustrValidURL )
+{
+    OSL_ENSURE(0, "osl_getCanonicalName not implemented");
+
+    rtl_uString_newFromString(pustrValidURL, ustrFileURL);
+    return osl_File_E_None;
+}
+
+/****************************************************************************/
 /*	osl_getSystemPathFromFileURL */
 /****************************************************************************/
 
@@ -664,3 +660,120 @@ oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileUR
     
     return osl_error;
 }
+
+/*****************************************************************************
+ * UnicodeToText
+ ****************************************************************************/
+
+namespace /* private */
+{
+    class UnicodeToTextConverter_Impl
+    {
+        rtl_UnicodeToTextConverter m_converter;
+
+        UnicodeToTextConverter_Impl()
+            : m_converter (rtl_createUnicodeToTextConverter (osl_getThreadTextEncoding()))
+        {}
+
+        ~UnicodeToTextConverter_Impl()
+        {
+            rtl_destroyUnicodeToTextConverter (m_converter);
+        }
+    public:
+        static UnicodeToTextConverter_Impl & getInstance()
+        {
+            static UnicodeToTextConverter_Impl g_theConverter;
+            return g_theConverter;
+        }
+
+        sal_Size convert(
+            sal_Unicode const * pSrcBuf, sal_Size nSrcChars, sal_Char * pDstBuf, sal_Size nDstBytes,
+            sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtChars)
+        {
+            OSL_ASSERT(m_converter != 0);
+            return rtl_convertUnicodeToText (
+                m_converter, 0, pSrcBuf, nSrcChars, pDstBuf, nDstBytes, nFlags, pInfo, pSrcCvtChars);
+        }
+    };
+} // end namespace private
+
+int UnicodeToText( char * buffer, size_t bufLen, const sal_Unicode * uniText, sal_Int32 uniTextLen )
+{
+    sal_uInt32   nInfo = 0;
+    sal_Size     nSrcChars = 0;
+
+    sal_Size nDestBytes = UnicodeToTextConverter_Impl::getInstance().convert (
+        uniText, uniTextLen, buffer, bufLen,
+        OUSTRING_TO_OSTRING_CVTFLAGS | RTL_UNICODETOTEXT_FLAGS_FLUSH, &nInfo, &nSrcChars);
+
+    if( nInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL )
+    {
+        errno = EOVERFLOW;
+        return 0;
+    }
+
+    /* ensure trailing '\0' */
+    buffer[nDestBytes] = '\0';
+    return nDestBytes;
+}
+
+/*****************************************************************************
+ * TextToUnicode
+ ****************************************************************************/
+
+namespace /* private */
+{
+    class TextToUnicodeConverter_Impl
+    {
+        rtl_TextToUnicodeConverter m_converter;
+
+        TextToUnicodeConverter_Impl()
+            : m_converter (rtl_createTextToUnicodeConverter (osl_getThreadTextEncoding()))
+        {}
+
+        ~TextToUnicodeConverter_Impl()
+        {
+            rtl_destroyTextToUnicodeConverter (m_converter);
+        }
+
+    public:
+        static TextToUnicodeConverter_Impl & getInstance()
+        {
+            static TextToUnicodeConverter_Impl g_theConverter;
+            return g_theConverter;
+        }
+
+        sal_Size convert(
+            sal_Char const * pSrcBuf, sal_Size nSrcBytes, sal_Unicode * pDstBuf, sal_Size nDstChars,
+            sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtBytes)
+        {
+            OSL_ASSERT(m_converter != 0);
+            return rtl_convertTextToUnicode (
+                m_converter, 0, pSrcBuf, nSrcBytes, pDstBuf, nDstChars, nFlags, pInfo, pSrcCvtBytes);
+        }
+    };
+} // end namespace private
+
+int TextToUnicode(
+    const char*  text,
+    size_t       text_buffer_size,
+    sal_Unicode* unic_text,
+    sal_Int32    unic_text_buffer_size)
+{
+    sal_uInt32 nInfo = 0;
+    sal_Size   nSrcChars = 0;
+
+    sal_Size nDestBytes = TextToUnicodeConverter_Impl::getInstance().convert(
+        text,  text_buffer_size, unic_text, unic_text_buffer_size,
+        OSTRING_TO_OUSTRING_CVTFLAGS | RTL_TEXTTOUNICODE_FLAGS_FLUSH, &nInfo, &nSrcChars);
+
+    if (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL)
+    {
+        errno = EOVERFLOW;
+        return 0;
+    }
+
+    /* ensure trailing '\0' */
+    unic_text[nDestBytes] = '\0';
+    return nDestBytes;
+}
diff --git a/sal/osl/unx/file_url.h b/sal/osl/unx/file_url.h
index 218ea3c68..50b070f5e 100644
--- a/sal/osl/unx/file_url.h
+++ b/sal/osl/unx/file_url.h
@@ -28,43 +28,45 @@
  *
  ************************************************************************/
  
- /***************************************************
-  * Internal header file, declares all functions 
-  * that are not part of the offical API and are 
-  * not defined in the osl header files
-  **************************************************/
+#ifndef INCLUDED_FILE_URL_H
+#define INCLUDED_FILE_URL_H
  
- #ifndef _FILE_URL_H_
- #define _FILE_URL_H_
+#include "osl/file.h"
  
- #ifndef _FILE_H_
- #include <osl/file.h>
- #endif
+#ifdef __cplusplus
+extern "C" 
+{
+#endif
  
- #ifdef __cplusplus
- extern "C" 
- {
- #endif
+/**************************************************
+ * osl_getSystemPathFromFileURL_Ex
+ *************************************************/
  
- /**************************************************
-  * _osl_getSystemPathFromFileURL
-  *************************************************/
- 
- #define FURL_ALLOW_RELATIVE sal_True
- #define FURL_DENY_RELATIVE  sal_False
+#define FURL_ALLOW_RELATIVE sal_True
+#define FURL_DENY_RELATIVE  sal_False
   
- oslFileError osl_getSystemPathFromFileURL_Ex(rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath, sal_Bool bAllowRelative);
+oslFileError osl_getSystemPathFromFileURL_Ex(rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath, sal_Bool bAllowRelative);
 
- /**************************************************
-  * FileURLToPath
-  *************************************************/
+/**************************************************
+ * FileURLToPath
+ *************************************************/
   
- oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL);
+oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL);
  
+/***************************************************
+ * UnicodeToText
+ **************************************************/
  
- #ifdef __cplusplus
- }
- #endif
+int UnicodeToText(char * buffer, size_t bufLen, const sal_Unicode * uniText, sal_Int32 uniTextLen);
+
+/***************************************************
+ * TextToUniCode
+ **************************************************/
  
+int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
+
+#ifdef __cplusplus
+}
+#endif
  
- #endif /* #define _FILE_URL_H_ */
+#endif /* #define INCLUDED_FILE_URL_H */
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
new file mode 100644
index 000000000..66a0cef5e
--- /dev/null
+++ b/sal/osl/unx/file_volume.cxx
@@ -0,0 +1,1570 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "osl/file.h"
+
+#include "osl/diagnose.h"
+#include "osl/thread.h"
+#include "rtl/alloc.h"
+
+#include "file_error_transl.h"
+#include "file_url.h"
+#include "system.h"
+
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#ifdef HAVE_STATFS_H
+#undef HAVE_STATFS_H
+#endif
+
+#if defined(SOLARIS)
+
+#include <sys/mnttab.h>
+#include <sys/statvfs.h>
+#define  HAVE_STATFS_H
+#include <sys/fs/ufs_quota.h>
+static const sal_Char* MOUNTTAB="/etc/mnttab";
+
+#elif defined(LINUX)
+
+#include <mntent.h>
+#include <sys/vfs.h>
+#define  HAVE_STATFS_H
+#include <sys/quota.h>
+//#include <ctype.h>
+static const sal_Char* MOUNTTAB="/etc/mtab";
+
+#elif defined(NETBSD) || defined(FREEBSD)
+
+#include <sys/param.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
+#include <ufs/ufs/quota.h>
+//#include <ctype.h>
+#define  HAVE_STATFS_H
+
+/* No mounting table on *BSD
+ * This information is stored only in the kernel. */
+/* static const sal_Char* MOUNTTAB="/etc/mtab"; */
+
+#elif defined(IRIX)
+
+#include <mntent.h>
+#include <sys/mount.h>
+#include <sys/statvfs.h>
+#define  HAVE_STATFS_H
+#include <sys/quota.h>
+//#include <ctype.h>
+static const sal_Char* MOUNTTAB="/etc/mtab";
+
+#elif defined(MACOSX)
+
+#include <ufs/ufs/quota.h>
+//#include <ctype.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+#define HAVE_STATFS_H
+// static const sal_Char* MOUNTTAB="/etc/mtab";
+
+#endif /* HAVE_STATFS_H */
+
+/************************************************************************
+ *   ToDo
+ *
+ *   - Fix: check for corresponding struct sizes in exported functions
+ *   - check size/use of oslVolumeDeviceHandle
+ *   - check size/use of oslVolumeInfo
+ ***********************************************************************/
+/******************************************************************************
+ *
+ *                  Data Type Definition
+ *
+ ******************************************************************************/
+
+typedef struct _oslVolumeDeviceHandleImpl
+{
+    sal_Char pszMountPoint[PATH_MAX];
+    sal_Char pszFilePath[PATH_MAX];
+    sal_Char pszDevice[PATH_MAX];
+    sal_Char ident[4];
+    sal_uInt32   RefCount;
+} oslVolumeDeviceHandleImpl;
+
+/******************************************************************************
+ *
+ *                  'removeable device' aka floppy functions
+ *
+ *****************************************************************************/
+
+static oslVolumeDeviceHandle  osl_isFloppyDrive(const sal_Char* pszPath);
+static oslFileError   osl_mountFloppy(oslVolumeDeviceHandle hFloppy);
+static oslFileError   osl_unmountFloppy(oslVolumeDeviceHandle hFloppy);
+
+#if defined(SOLARIS)
+static sal_Bool       osl_isFloppyMounted(sal_Char* pszPath, sal_Char* pszMountPath);
+static sal_Bool       osl_getFloppyMountEntry(const sal_Char* pszPath, sal_Char* pBuffer);
+static sal_Bool       osl_checkFloppyPath(sal_Char* pszPath, sal_Char* pszFilePath, sal_Char* pszDevicePath);
+#endif /* SOLARIS */
+
+#if defined(LINUX)
+static sal_Bool       osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice);
+static sal_Bool       osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem);
+#endif /* LINUX */
+
+
+#if defined(IRIX)
+static sal_Bool       osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice);
+static sal_Bool       osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem);
+#endif /* IRIX */
+
+#ifdef DEBUG_OSL_FILE
+static void           osl_printFloppyHandle(oslVolumeDeviceHandleImpl* hFloppy);
+#endif /* DEBUG_OSL_FILE */
+
+/******************************************************************************
+ *
+ *                  C-String Function Declarations
+ *
+ *****************************************************************************/
+
+static oslFileError osl_psz_getVolumeInformation(const sal_Char* , oslVolumeInfo* pInfo, sal_uInt32 uFieldMask);
+
+/****************************************************************************/
+/*	osl_getVolumeInformation */
+/****************************************************************************/
+
+oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask )
+{
+    char path[PATH_MAX];
+    oslFileError eRet;
+
+    OSL_ASSERT( ustrDirectoryURL );
+    OSL_ASSERT( pInfo );
+
+    /* convert directory url to system path */
+    eRet = FileURLToPath( path, PATH_MAX, ustrDirectoryURL );
+    if( eRet != osl_File_E_None )
+        return eRet;
+
+#ifdef MACOSX
+    if ( macxp_resolveAlias( path, PATH_MAX ) != 0 )
+      return oslTranslateFileError( OSL_FET_ERROR, errno );
+#endif/* MACOSX */
+
+    return osl_psz_getVolumeInformation( path, pInfo, uFieldMask);
+}
+
+/******************************************************************************
+ *
+ *                  C-String Versions of Exported Module Functions
+ *
+ *****************************************************************************/
+
+#ifdef HAVE_STATFS_H
+
+#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
+#   define __OSL_STATFS_STRUCT      			struct statfs
+#   define __OSL_STATFS(dir, sfs)   			statfs((dir), (sfs))
+#   define __OSL_STATFS_BLKSIZ(a)   			((sal_uInt64)((a).f_bsize))
+#   define __OSL_STATFS_TYPENAME(a) 			((a).f_fstypename)
+#   define __OSL_STATFS_ISREMOTE(a) 			(((a).f_type & MNT_LOCAL) == 0)
+
+/* always return true if queried for the properties of
+   the file system. If you think this is wrong under any
+   of the target platforms fix it!!!! */
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#endif /* FREEBSD || NETBSD || MACOSX */
+
+#if defined(LINUX)
+#	define __OSL_NFS_SUPER_MAGIC				 0x6969
+#	define __OSL_SMB_SUPER_MAGIC				 0x517B
+#	define __OSL_MSDOS_SUPER_MAGIC  			 0x4d44
+#	define __OSL_NTFS_SUPER_MAGIC				 0x5346544e
+#   define __OSL_STATFS_STRUCT       		     struct statfs
+#   define __OSL_STATFS(dir, sfs)    			 statfs((dir), (sfs))
+#   define __OSL_STATFS_BLKSIZ(a)    			 ((sal_uInt64)((a).f_bsize))
+#   define __OSL_STATFS_IS_NFS(a)     			 (__OSL_NFS_SUPER_MAGIC == (a).f_type) 
+#   define __OSL_STATFS_IS_SMB(a)     			 (__OSL_SMB_SUPER_MAGIC == (a).f_type) 
+#   define __OSL_STATFS_ISREMOTE(a)  			 (__OSL_STATFS_IS_NFS((a)) || __OSL_STATFS_IS_SMB((a)))
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type) && (__OSL_NTFS_SUPER_MAGIC != (a).f_type))
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
+#endif /* LINUX */
+
+#if defined(SOLARIS) || defined(IRIX)
+#   define __OSL_STATFS_STRUCT          		 struct statvfs
+#   define __OSL_STATFS(dir, sfs)	    		 statvfs((dir), (sfs))
+#   define __OSL_STATFS_BLKSIZ(a)       		 ((sal_uInt64)((a).f_frsize))
+#   define __OSL_STATFS_TYPENAME(a)     		 ((a).f_basetype)
+#   define __OSL_STATFS_ISREMOTE(a)     		 (rtl_str_compare((a).f_basetype, "nfs") == 0)
+
+/* always return true if queried for the properties of
+   the file system. If you think this is wrong under any
+   of the target platforms fix it!!!! */
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#endif /* SOLARIS || IRIX*/
+
+#   define __OSL_STATFS_INIT(a) 	    (memset(&(a), 0, sizeof(__OSL_STATFS_STRUCT)))
+
+#else /* no statfs available */
+
+#   define __OSL_STATFS_STRUCT        			 struct dummy {int i;}
+#   define __OSL_STATFS_INIT(a)       			 ((void)0)
+#   define __OSL_STATFS(dir, sfs)     		     (1)
+#   define __OSL_STATFS_ISREMOTE(sfs) 			 (0)
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#endif /* HAVE_STATFS_H */
+
+
+static oslFileError osl_psz_getVolumeInformation (
+    const sal_Char* pszDirectory, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask)
+{
+    __OSL_STATFS_STRUCT sfs;
+
+    if (!pInfo)   
+        return osl_File_E_INVAL;
+    
+    __OSL_STATFS_INIT(sfs);
+    
+    pInfo->uValidFields = 0;
+    pInfo->uAttributes  = 0;
+    
+    if ((__OSL_STATFS(pszDirectory, &sfs)) < 0)
+    {	
+        oslFileError result = oslTranslateFileError(OSL_FET_ERROR, errno);		
+        return (result);
+    }
+
+    /* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */
+    if (uFieldMask & osl_VolumeInfo_Mask_Attributes)
+    {	
+        if (__OSL_STATFS_ISREMOTE(sfs))
+            pInfo->uAttributes  |= osl_Volume_Attribute_Remote;
+                        
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;	
+    }
+
+    if (uFieldMask & osl_VolumeInfo_Mask_FileSystemCaseHandling)
+    {
+        if (__OSL_STATFS_IS_CASE_SENSITIVE_FS(sfs))
+            pInfo->uAttributes |= osl_Volume_Attribute_Case_Sensitive;
+        
+        if (__OSL_STATFS_IS_CASE_PRESERVING_FS(sfs))
+            pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
+            
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;	
+    }
+    
+    pInfo->uTotalSpace = 0;
+    pInfo->uFreeSpace  = 0;
+    pInfo->uUsedSpace  = 0;
+    
+#if defined(__OSL_STATFS_BLKSIZ)
+    
+    if ((uFieldMask & osl_VolumeInfo_Mask_TotalSpace) ||
+        (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
+    {
+        pInfo->uTotalSpace   = __OSL_STATFS_BLKSIZ(sfs);
+        pInfo->uTotalSpace  *= (sal_uInt64)(sfs.f_blocks);
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace;
+    }
+    
+    if ((uFieldMask & osl_VolumeInfo_Mask_FreeSpace) ||
+        (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
+    {
+        pInfo->uFreeSpace = __OSL_STATFS_BLKSIZ(sfs);
+        
+        if (getuid() == 0)		
+            pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bfree);
+        else			
+            pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bavail);
+    
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_FreeSpace;
+    }
+
+#endif  /* __OSL_STATFS_BLKSIZ */
+    
+    if ((pInfo->uValidFields & osl_VolumeInfo_Mask_TotalSpace) &&
+        (pInfo->uValidFields & osl_VolumeInfo_Mask_FreeSpace ))
+    {
+        pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_UsedSpace;
+    }
+    
+    pInfo->uMaxNameLength = 0;
+    if (uFieldMask & osl_VolumeInfo_Mask_MaxNameLength)
+    {
+        long nLen = pathconf(pszDirectory, _PC_NAME_MAX);
+        if (nLen > 0)
+        {
+            pInfo->uMaxNameLength = (sal_uInt32)nLen;
+            pInfo->uValidFields |= osl_VolumeInfo_Mask_MaxNameLength;
+        }
+    }
+
+    pInfo->uMaxPathLength = 0;
+    if (uFieldMask & osl_VolumeInfo_Mask_MaxPathLength)
+    {
+        long nLen = pathconf (pszDirectory, _PC_PATH_MAX);
+        if (nLen > 0)
+        {
+            pInfo->uMaxPathLength  = (sal_uInt32)nLen;
+            pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxPathLength;
+        }
+    }
+
+#if defined(__OSL_STATFS_TYPENAME)
+
+    if (uFieldMask & osl_VolumeInfo_Mask_FileSystemName)
+    {
+        rtl_string2UString(
+            &(pInfo->ustrFileSystemName),
+            __OSL_STATFS_TYPENAME(sfs),
+            rtl_str_getLength(__OSL_STATFS_TYPENAME(sfs)),
+            osl_getThreadTextEncoding(),
+            OUSTRING_TO_OSTRING_CVTFLAGS);
+        OSL_ASSERT(pInfo->ustrFileSystemName != 0);
+            
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_FileSystemName;
+    }
+    
+#endif /* __OSL_STATFS_TYPENAME */
+    
+    if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
+    {
+        /* FIXME: check also entries in mntent for the device
+           and fill it with correct values */
+        
+        *pInfo->pDeviceHandle = osl_isFloppyDrive(pszDirectory);
+
+        if (*pInfo->pDeviceHandle)
+        {
+            pInfo->uValidFields |= osl_VolumeInfo_Mask_DeviceHandle;
+            pInfo->uAttributes  |= osl_Volume_Attribute_Removeable;
+            pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
+        }
+    }
+    return osl_File_E_None;
+}
+
+/******************************************************************************
+ *
+ *                  GENERIC FLOPPY FUNCTIONS
+ *
+ *****************************************************************************/
+
+
+/*****************************************
+ * osl_unmountVolumeDevice
+ ****************************************/
+
+oslFileError osl_unmountVolumeDevice( oslVolumeDeviceHandle Handle )
+{
+    oslFileError tErr = osl_File_E_NOSYS;
+
+    tErr = osl_unmountFloppy(Handle);
+
+     /* Perhaps current working directory is set to mount point */
+
+     if ( tErr )
+    {
+        sal_Char *pszHomeDir = getenv("HOME");
+
+        if ( pszHomeDir && strlen( pszHomeDir ) && 0 == chdir( pszHomeDir ) )
+        {
+            /* try again */
+
+            tErr = osl_unmountFloppy(Handle);
+
+            OSL_ENSURE( tErr, "osl_unmountvolumeDevice: CWD was set to volume mount point" );
+        }
+    }
+
+    return tErr;
+}
+
+/*****************************************
+ * osl_automountVolumeDevice
+ ****************************************/
+
+oslFileError osl_automountVolumeDevice( oslVolumeDeviceHandle Handle )
+{
+    oslFileError tErr = osl_File_E_NOSYS;
+
+    tErr = osl_mountFloppy(Handle);
+
+    return tErr;
+}
+
+/*****************************************
+ * osl_getVolumeDeviceMountPath
+ ****************************************/
+static rtl_uString* oslMakeUStrFromPsz(const sal_Char* pszStr, rtl_uString** ustrValid)
+{
+    rtl_string2UString(
+        ustrValid,
+        pszStr,
+        rtl_str_getLength( pszStr ),
+        osl_getThreadTextEncoding(),
+        OUSTRING_TO_OSTRING_CVTFLAGS );
+    OSL_ASSERT(*ustrValid != 0);
+
+    return *ustrValid;
+}
+
+oslFileError osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uString **pstrPath )
+{
+    oslVolumeDeviceHandleImpl* pItem = (oslVolumeDeviceHandleImpl*) Handle;
+    sal_Char Buffer[PATH_MAX];
+
+    Buffer[0] = '\0';
+
+    if ( pItem == 0 || pstrPath == 0 )
+    {
+        return osl_File_E_INVAL;
+    }
+
+    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
+    {
+        return osl_File_E_INVAL;
+    }
+
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"Handle is:\n");
+    osl_printFloppyHandle(pItem);
+#endif
+
+    snprintf(Buffer, sizeof(Buffer), "file://%s", pItem->pszMountPoint);
+
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"Mount Point is: '%s'\n",Buffer);
+#endif
+
+    oslMakeUStrFromPsz(Buffer, pstrPath);
+
+    return osl_File_E_None;
+}
+
+/*****************************************
+ * osl_acquireVolumeDeviceHandle
+ ****************************************/
+
+oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
+{
+    oslVolumeDeviceHandleImpl* pItem =(oslVolumeDeviceHandleImpl*) Handle;
+
+    if ( pItem == 0 )
+    {
+        return osl_File_E_INVAL;
+    }
+
+    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
+    {
+        return osl_File_E_INVAL;
+    }
+
+    ++pItem->RefCount;
+
+    return osl_File_E_None;
+}
+
+/*****************************************
+ * osl_releaseVolumeDeviceHandle
+ ****************************************/
+
+oslFileError osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
+{
+    oslVolumeDeviceHandleImpl* pItem =(oslVolumeDeviceHandleImpl*) Handle;
+
+    if ( pItem == 0 )
+    {
+        return osl_File_E_INVAL;
+    }
+
+    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
+    {
+        return osl_File_E_INVAL;
+    }
+
+    --pItem->RefCount;
+    
+    if ( pItem->RefCount == 0 )
+    {
+        rtl_freeMemory(pItem);
+    }
+    
+    return osl_File_E_None;
+}
+
+#ifndef MACOSX
+
+/*****************************************
+ * osl_newVolumeDeviceHandleImpl
+ ****************************************/
+ 
+static oslVolumeDeviceHandleImpl* osl_newVolumeDeviceHandleImpl()
+{
+    oslVolumeDeviceHandleImpl* pHandle;
+    const size_t               nSizeOfHandle = sizeof(oslVolumeDeviceHandleImpl);
+ 
+    pHandle = (oslVolumeDeviceHandleImpl*) rtl_allocateMemory (nSizeOfHandle);
+    if (pHandle != NULL)
+    {
+        pHandle->ident[0]         = 'O';
+        pHandle->ident[1]         = 'V';
+        pHandle->ident[2]         = 'D';
+        pHandle->ident[3]         = 'H';
+        pHandle->pszMountPoint[0] = '\0';
+        pHandle->pszFilePath[0]   = '\0';
+        pHandle->pszDevice[0]     = '\0';
+        pHandle->RefCount         = 1;
+    }
+    return pHandle;   
+}
+
+/*****************************************
+ * osl_freeVolumeDeviceHandleImpl
+ ****************************************/
+ 
+static void osl_freeVolumeDeviceHandleImpl (oslVolumeDeviceHandleImpl* pHandle)
+{
+    if (pHandle != NULL)
+        rtl_freeMemory (pHandle);
+}
+#endif
+
+/******************************************************************************
+ *
+ *                  SOLARIS FLOPPY FUNCTIONS
+ *
+ *****************************************************************************/
+
+#if defined(SOLARIS)
+/* compare a given devicename with the typical device names on a Solaris box */
+static sal_Bool
+osl_isAFloppyDevice (const char* pDeviceName)
+{
+    const char* pFloppyDevice [] = { 
+        "/dev/fd",           "/dev/rfd", 
+        "/dev/diskette",     "/dev/rdiskette", 
+        "/vol/dev/diskette", "/vol/dev/rdiskette" 
+    };
+
+    int i;
+    for (i = 0; i < (sizeof(pFloppyDevice)/sizeof(pFloppyDevice[0])); i++)
+    {
+        if (strncmp(pDeviceName, pFloppyDevice[i], strlen(pFloppyDevice[i])) == 0)
+            return sal_True;
+    }
+    return sal_False;
+}
+
+/* compare two directories whether the first may be a parent of the second. this
+ * does not realpath() resolving */
+static sal_Bool
+osl_isAParentDirectory (const char* pParentDir, const char* pSubDir)
+{
+    return strncmp(pParentDir, pSubDir, strlen(pParentDir)) == 0; 
+}
+
+/* the name of the routine is obviously silly. But anyway create a 
+ * oslVolumeDeviceHandle with correct mount point, device name and a resolved filepath
+ * only if pszPath points to file or directory on a floppy */
+static oslVolumeDeviceHandle 
+osl_isFloppyDrive(const sal_Char* pszPath)
+{
+    FILE*                       pMountTab;
+    struct mnttab               aMountEnt;
+    oslVolumeDeviceHandleImpl*  pHandle;
+
+    if ((pHandle = osl_newVolumeDeviceHandleImpl()) == NULL)
+    {
+        return NULL;
+    }
+    if (realpath(pszPath, pHandle->pszFilePath) == NULL)
+    {
+        osl_freeVolumeDeviceHandleImpl (pHandle);
+        return NULL;
+    }
+    if ((pMountTab = fopen (MOUNTTAB, "r")) == NULL)
+    {
+        osl_freeVolumeDeviceHandleImpl (pHandle);
+        return NULL;
+    }
+
+    while (getmntent(pMountTab, &aMountEnt) == 0)
+    {
+        const char *pMountPoint = aMountEnt.mnt_mountp;
+        const char *pDevice     = aMountEnt.mnt_special; 
+        if (   osl_isAParentDirectory (aMountEnt.mnt_mountp, pHandle->pszFilePath)
+            && osl_isAFloppyDevice    (aMountEnt.mnt_special))
+        {
+            /* skip the last item for it is the name of the disk */
+            char * pc = strrchr( aMountEnt.mnt_special, '/' );
+            
+            if ( NULL != pc )
+            {
+                int len = pc - aMountEnt.mnt_special;
+                                
+                strncpy( pHandle->pszDevice, aMountEnt.mnt_special, len );
+                pHandle->pszDevice[len] = '\0';
+            }
+            else
+            {
+                /* #106048 use save str functions to avoid buffer overflows */
+                memset(pHandle->pszDevice, 0, sizeof(pHandle->pszDevice));				
+                strncpy(pHandle->pszDevice, aMountEnt.mnt_special, sizeof(pHandle->pszDevice) - 1);				                
+            }
+            
+            /* remember the mount point */
+            memset(pHandle->pszMountPoint, 0, sizeof(pHandle->pszMountPoint));
+            strncpy(pHandle->pszMountPoint, aMountEnt.mnt_mountp, sizeof(pHandle->pszMountPoint) - 1);
+                        
+            fclose (pMountTab);
+            return pHandle;
+        }
+    }
+
+    fclose (pMountTab);
+    osl_freeVolumeDeviceHandleImpl (pHandle);
+    return NULL;
+}
+
+static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
+{
+    FILE*                       pMountTab;
+    struct mnttab               aMountEnt;
+    oslVolumeDeviceHandleImpl*  pHandle = (oslVolumeDeviceHandleImpl*) hFloppy;
+
+    int nRet=0;
+    sal_Char pszCmd[512] = "";
+   
+    if ( pHandle == 0 )
+        return osl_File_E_INVAL;
+
+    /* FIXME: don't know what this is good for */    
+    if ( pHandle->ident[0] != 'O' || pHandle->ident[1] != 'V' || pHandle->ident[2] != 'D' || pHandle->ident[3] != 'H' )
+        return osl_File_E_INVAL;
+
+    snprintf(pszCmd, sizeof(pszCmd), "eject -q %s > /dev/null 2>&1", pHandle->pszDevice);
+    
+    nRet = system( pszCmd );
+
+    switch ( WEXITSTATUS(nRet) )
+    {
+    case 0:        
+        {
+            /* lookup the device in mount tab again */
+            if ((pMountTab = fopen (MOUNTTAB, "r")) == NULL)
+                return osl_File_E_BUSY;
+
+            while (getmntent(pMountTab, &aMountEnt) == 0)
+            {
+                const char *pMountPoint = aMountEnt.mnt_mountp;
+                const char *pDevice     = aMountEnt.mnt_special; 
+                if ( 0 == strncmp( pHandle->pszDevice, aMountEnt.mnt_special, strlen(pHandle->pszDevice) ) )
+                {
+                    memset(pHandle->pszMountPoint, 0, sizeof(pHandle->pszMountPoint));
+                    strncpy (pHandle->pszMountPoint, aMountEnt.mnt_mountp, sizeof(pHandle->pszMountPoint) - 1);
+                                        
+                    fclose (pMountTab);
+                    return osl_File_E_None;
+                }
+            }
+
+            fclose (pMountTab);
+            return osl_File_E_BUSY;
+        }
+        //break; // break not necessary here, see return statements before
+         
+    case 1:
+        return osl_File_E_BUSY;
+
+    default:
+        break;
+    }
+
+    return osl_File_E_BUSY;
+}
+
+static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
+{
+//    FILE*                       pMountTab;
+//    struct mnttab               aMountEnt;
+    oslVolumeDeviceHandleImpl*  pHandle = (oslVolumeDeviceHandleImpl*) hFloppy;    
+    
+    int nRet=0;
+    sal_Char pszCmd[512] = "";
+    
+    if ( pHandle == 0 )
+        return osl_File_E_INVAL;
+
+    /* FIXME: don't know what this is good for */    
+    if ( pHandle->ident[0] != 'O' || pHandle->ident[1] != 'V' || pHandle->ident[2] != 'D' || pHandle->ident[3] != 'H' )
+        return osl_File_E_INVAL;
+    
+    snprintf(pszCmd, sizeof(pszCmd), "eject %s > /dev/null 2>&1", pHandle->pszDevice);
+    
+    nRet = system( pszCmd );
+
+    switch ( WEXITSTATUS(nRet) )
+    {
+    case 0:        
+        {
+            FILE*         pMountTab;
+            struct mnttab aMountEnt;
+            
+            /* lookup if device is still in mount tab */
+            if ((pMountTab = fopen (MOUNTTAB, "r")) == NULL)
+                return osl_File_E_BUSY;
+
+            while (getmntent(pMountTab, &aMountEnt) == 0)
+            {
+                const char *pMountPoint = aMountEnt.mnt_mountp;
+                const char *pDevice     = aMountEnt.mnt_special; 
+                if ( 0 == strncmp( pHandle->pszDevice, aMountEnt.mnt_special, strlen(pHandle->pszDevice) ) )
+                {
+                    fclose (pMountTab);
+                    return osl_File_E_BUSY;
+                }
+            }
+
+            fclose (pMountTab);
+            pHandle->pszMountPoint[0] = 0;
+            return osl_File_E_None;
+        }
+        
+        //break; //break not necessary, see return statements before
+        
+    case 1:
+        return osl_File_E_NODEV;
+
+    case 4:
+        pHandle->pszMountPoint[0] = 0;
+        return osl_File_E_None;
+
+    default:
+        break;
+    }
+
+    return osl_File_E_BUSY;
+}
+
+#endif /* SOLARIS */
+
+/******************************************************************************
+ *
+ *                  LINUX FLOPPY FUNCTIONS
+ *
+ *****************************************************************************/
+
+#if defined(LINUX)
+static oslVolumeDeviceHandle 
+osl_isFloppyDrive (const sal_Char* pszPath)
+{
+    oslVolumeDeviceHandleImpl* pItem = osl_newVolumeDeviceHandleImpl(); 
+    if (osl_getFloppyMountEntry(pszPath, pItem))
+        return (oslVolumeDeviceHandle) pItem;
+    
+    osl_freeVolumeDeviceHandleImpl (pItem);
+    return 0;
+}
+#endif /* LINUX */
+
+#if defined(LINUX)
+static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
+{       
+    sal_Bool bRet = sal_False;
+    oslVolumeDeviceHandleImpl* pItem=0;
+    int nRet;
+    sal_Char  pszCmd[PATH_MAX];
+    const sal_Char* pszMountProg = "mount";
+    sal_Char* pszSuDo = 0;
+    sal_Char* pszTmp = 0;
+
+    pszCmd[0] = '\0';
+    
+#ifdef TRACE_OSL_FILE
+    fprintf(stderr,"In  osl_mountFloppy\n");
+#endif
+
+    pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
+    
+    if ( pItem == 0 )
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_mountFloppy [pItem == 0]\n");
+#endif
+        
+        return osl_File_E_INVAL;
+    }
+
+    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_mountFloppy [invalid handle]\n");
+#endif
+        return osl_File_E_INVAL;
+    }
+    
+    bRet = osl_isFloppyMounted(pItem);
+    if ( bRet == sal_True )
+    {
+#ifdef DEBUG_OSL_FILE
+        fprintf(stderr,"detected mounted floppy at '%s'\n",pItem->pszMountPoint);
+#endif
+        return osl_File_E_BUSY;
+    }
+
+    /* mfe: we can't use the mount(2) system call!!!   */
+    /*      even if we are root                        */
+    /*      since mtab is not updated!!!               */
+    /*      but we need it to be updated               */
+    /*      some "magic" must be done                  */
+
+/*      nRet = mount(pItem->pszDevice,pItem->pszMountPoint,0,0,0); */
+/*      if ( nRet != 0 ) */
+/*      { */
+/*          nRet=errno; */
+/*  #ifdef DEBUG_OSL_FILE */
+/*          perror("mount"); */
+/*  #endif */
+/*      } */
+
+    pszTmp = getenv("SAL_MOUNT_MOUNTPROG");
+    if ( pszTmp != 0 )
+    {
+        pszMountProg=pszTmp;
+    }
+
+    pszTmp=getenv("SAL_MOUNT_SU_DO");
+    if ( pszTmp != 0 )
+    {
+        pszSuDo=pszTmp;
+    }
+    
+    if ( pszSuDo != 0 )
+    {
+        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s %s",pszSuDo,pszMountProg,pItem->pszDevice,pItem->pszMountPoint);
+    }
+    else
+    {
+        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszMountProg,pItem->pszMountPoint);        
+    }
+    
+    
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"executing '%s'\n",pszCmd);
+#endif
+    
+    nRet = system(pszCmd);    
+
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"call returned '%i'\n",nRet);
+    fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
+#endif
+    
+    
+    switch ( WEXITSTATUS(nRet) )
+    {
+    case 0:
+        nRet=0;
+        break;
+        
+    case 2:
+        nRet=EPERM;
+        break;
+
+    case 4:
+        nRet=ENOENT;
+        break;
+
+    case 8:
+        nRet=EINTR;
+        break;
+
+    case 16:
+        nRet=EPERM;
+        break;
+
+    case 32:
+        nRet=EBUSY;
+        break;
+
+    case 64:
+        nRet=EAGAIN;
+        break;
+
+    default:
+        nRet=EBUSY;
+        break;
+    }
+    
+    return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
+}
+#endif /* LINUX */
+
+
+#if defined(LINUX)
+static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
+{
+    oslVolumeDeviceHandleImpl* pItem=0;
+    int nRet=0;
+    sal_Char pszCmd[PATH_MAX];
+    sal_Char* pszTmp = 0;
+    sal_Char* pszSuDo = 0;
+    const sal_Char* pszUmountProg = "umount";
+
+    pszCmd[0] = '\0';
+    
+#ifdef TRACE_OSL_FILE
+    fprintf(stderr,"In  osl_unmountFloppy\n");
+#endif    
+
+    pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
+    
+    if ( pItem == 0 )
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_unmountFloppy [pItem==0]\n");
+#endif
+        return osl_File_E_INVAL;
+    }
+
+    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_unmountFloppy [invalid handle]\n");
+#endif
+        return osl_File_E_INVAL;
+    }
+
+    /* mfe: we can't use the umount(2) system call!!!  */
+    /*      even if we are root                        */
+    /*      since mtab is not updated!!!               */
+    /*      but we need it to be updated               */
+    /*      some "magic" must be done                  */
+
+/*      nRet=umount(pItem->pszDevice); */
+/*      if ( nRet != 0 ) */
+/*      { */
+/*          nRet = errno; */
+        
+/*  #ifdef DEBUG_OSL_FILE */
+/*          perror("mount"); */
+/*  #endif */
+/*      } */
+    
+    
+    pszTmp = getenv("SAL_MOUNT_UMOUNTPROG");
+    if ( pszTmp != 0 )
+    {
+        pszUmountProg=pszTmp;
+    }
+
+    pszTmp = getenv("SAL_MOUNT_SU_DO");
+    if ( pszTmp != 0 )
+    {
+        pszSuDo=pszTmp;
+    }
+
+    if ( pszSuDo != 0 )
+    {    
+        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s",pszSuDo,pszUmountProg,pItem->pszMountPoint);        
+    }
+    else
+    {
+        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszUmountProg,pItem->pszMountPoint);
+    }
+    
+
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"executing '%s'\n",pszCmd);
+#endif
+    
+    nRet = system(pszCmd);    
+
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"call returned '%i'\n",nRet);
+    fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
+#endif
+    
+    switch ( WEXITSTATUS(nRet) )
+    {
+    case 0:
+        nRet=0;
+        break;
+
+    default:
+        nRet=EBUSY;
+        break;
+    }
+    
+#ifdef TRACE_OSL_FILE
+    fprintf(stderr,"Out osl_unmountFloppy [ok]\n");
+#endif    
+
+    return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
+    
+/*    return osl_File_E_None;*/
+}
+
+#endif /* LINUX */
+
+#if defined(LINUX)
+static sal_Bool 
+osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
+{
+    struct mntent* pMountEnt;
+    FILE*          pMountTab;
+
+    pMountTab = setmntent (MOUNTTAB, "r");
+    if (pMountTab == 0)
+        return sal_False;
+
+    while ((pMountEnt = getmntent(pMountTab)) != 0)
+    {
+        if (   strncmp(pMountEnt->mnt_dir,    pszPath,   strlen(pMountEnt->mnt_dir)) == 0 
+            && strncmp(pMountEnt->mnt_fsname, "/dev/fd", strlen("/dev/fd")) == 0)
+        {
+            memset(pItem->pszMountPoint, 0, sizeof(pItem->pszMountPoint));			
+            strncpy(pItem->pszMountPoint, pMountEnt->mnt_dir, sizeof(pItem->pszMountPoint) - 1);
+            
+            memset(pItem->pszFilePath, 0, sizeof(pItem->pszFilePath));
+            strncpy(pItem->pszFilePath, pMountEnt->mnt_dir, sizeof(pItem->pszFilePath) - 1);
+            
+            memset(pItem->pszDevice, 0, sizeof(pItem->pszDevice));
+            strncpy(pItem->pszDevice, pMountEnt->mnt_fsname, sizeof(pItem->pszDevice) - 1);
+                       
+            endmntent (pMountTab);
+            return sal_True; 
+        }
+    }    
+
+    endmntent (pMountTab);
+    return sal_False;
+}
+#endif /* LINUX */
+
+#if defined(LINUX)
+static sal_Bool 
+osl_isFloppyMounted (oslVolumeDeviceHandleImpl* pDevice)
+{
+    oslVolumeDeviceHandleImpl aItem;    
+
+    if (   osl_getFloppyMountEntry (pDevice->pszMountPoint, &aItem)
+        && strcmp (aItem.pszMountPoint, pDevice->pszMountPoint) == 0 
+        && strcmp (aItem.pszDevice,     pDevice->pszDevice) == 0)
+    {
+        return sal_True;
+    }
+    return sal_False;    
+}
+#endif /* LINUX */
+
+/******************************************************************************
+ *
+ *                  IRIX FLOPPY FUNCTIONS
+ *
+ *****************************************************************************/
+
+#if defined(IRIX)
+static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
+{
+    oslVolumeDeviceHandleImpl* pItem = osl_newVolumeDeviceHandleImpl ();    
+    sal_Bool bRet = sal_False;
+    
+#ifdef TRACE_OSL_FILE   
+    fprintf(stderr,"In  osl_isFloppyDrive\n");
+#endif
+
+    bRet=osl_getFloppyMountEntry(pszPath,pItem);
+
+    if ( bRet == sal_False )
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_isFloppyDrive [not a floppy]\n");
+#endif
+        rtl_freeMemory(pItem);
+        return 0;
+    }
+
+    
+#ifdef DEBUG_OSL_FILE
+    osl_printFloppyHandle(pItem);
+#endif
+#ifdef TRACE_OSL_FILE
+    fprintf(stderr,"Out osl_isFloppyDrive [ok]\n");
+#endif
+    
+    return (oslVolumeDeviceHandle) pItem;
+}
+
+
+static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
+{       
+    sal_Bool bRet = sal_False;
+    oslVolumeDeviceHandleImpl* pItem=0;
+    int nRet;
+    sal_Char  pszCmd[PATH_MAX];
+    sal_Char* pszMountProg = "mount";
+    sal_Char* pszSuDo = 0;
+    sal_Char* pszTmp = 0;
+
+    pszCmd[0] = '\0';
+    
+#ifdef TRACE_OSL_FILE
+    fprintf(stderr,"In  osl_mountFloppy\n");
+#endif
+
+    pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
+    
+    if ( pItem == 0 )
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_mountFloppy [pItem == 0]\n");
+#endif
+        
+        return osl_File_E_INVAL;
+    }
+
+    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_mountFloppy [invalid handle]\n");
+#endif
+        return osl_File_E_INVAL;
+    }
+    
+    bRet = osl_isFloppyMounted(pItem);
+    if ( bRet == sal_True )
+    {
+#ifdef DEBUG_OSL_FILE
+        fprintf(stderr,"detected mounted floppy at '%s'\n",pItem->pszMountPoint);
+#endif
+        return osl_File_E_BUSY;
+    }
+
+    /* mfe: we can't use the mount(2) system call!!!   */
+    /*      even if we are root                        */
+    /*      since mtab is not updated!!!               */
+    /*      but we need it to be updated               */
+    /*      some "magic" must be done                  */
+
+/*      nRet = mount(pItem->pszDevice,pItem->pszMountPoint,0,0,0); */
+/*      if ( nRet != 0 ) */
+/*      { */
+/*          nRet=errno; */
+/*  #ifdef DEBUG_OSL_FILE */
+/*          perror("mount"); */
+/*  #endif */
+/*      } */
+
+    pszTmp = getenv("SAL_MOUNT_MOUNTPROG");
+    if ( pszTmp != 0 )
+    {
+        pszMountProg=pszTmp;
+    }
+
+    pszTmp=getenv("SAL_MOUNT_SU_DO");
+    if ( pszTmp != 0 )
+    {
+        pszSuDo=pszTmp;
+    }
+    
+    if ( pszSuDo != 0 )
+    {
+        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s %s",pszSuDo,pszMountProg,pItem->pszDevice,pItem->pszMountPoint);
+    }
+    else
+    {
+        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszMountProg,pItem->pszMountPoint);        
+    }
+    
+    
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"executing '%s'\n",pszCmd);
+#endif
+    
+    nRet = system(pszCmd);    
+
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"call returned '%i'\n",nRet);
+    fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
+#endif
+    
+    
+    switch ( WEXITSTATUS(nRet) )
+    {
+    case 0:
+        nRet=0;
+        break;
+        
+    case 2:
+        nRet=EPERM;
+        break;
+
+    case 4:
+        nRet=ENOENT;
+        break;
+
+    case 8:
+        nRet=EINTR;
+        break;
+
+    case 16:
+        nRet=EPERM;
+        break;
+
+    case 32:
+        nRet=EBUSY;
+        break;
+
+    case 64:
+        nRet=EAGAIN;
+        break;
+
+    default:
+        nRet=EBUSY;
+        break;
+    }
+    
+    return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
+}
+
+static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
+{
+    oslVolumeDeviceHandleImpl* pItem=0;
+    int nRet=0;
+    sal_Char pszCmd[PATH_MAX];
+    sal_Char* pszTmp = 0;
+    sal_Char* pszSuDo = 0;
+    sal_Char* pszUmountProg = "umount";
+
+    pszCmd[0] = '\0';
+    
+#ifdef TRACE_OSL_FILE
+    fprintf(stderr,"In  osl_unmountFloppy\n");
+#endif    
+
+    pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
+    
+    if ( pItem == 0 )
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_unmountFloppy [pItem==0]\n");
+#endif
+        return osl_File_E_INVAL;
+    }
+
+    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_unmountFloppy [invalid handle]\n");
+#endif
+        return osl_File_E_INVAL;
+    }
+
+    /* mfe: we can't use the umount(2) system call!!!  */
+    /*      even if we are root                        */
+    /*      since mtab is not updated!!!               */
+    /*      but we need it to be updated               */
+    /*      some "magic" must be done                  */
+
+/*      nRet=umount(pItem->pszDevice); */
+/*      if ( nRet != 0 ) */
+/*      { */
+/*          nRet = errno; */
+        
+/*  #ifdef DEBUG_OSL_FILE */
+/*          perror("mount"); */
+/*  #endif */
+/*      } */
+    
+    
+    pszTmp = getenv("SAL_MOUNT_UMOUNTPROG");
+    if ( pszTmp != 0 )
+    {
+        pszUmountProg=pszTmp;
+    }
+
+    pszTmp = getenv("SAL_MOUNT_SU_DO");
+    if ( pszTmp != 0 )
+    {
+        pszSuDo=pszTmp;
+    }
+
+    if ( pszSuDo != 0 )
+    {    
+        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s",pszSuDo,pszUmountProg,pItem->pszMountPoint);        
+    }
+    else
+    {
+        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszUmountProg,pItem->pszMountPoint);
+    }
+    
+
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"executing '%s'\n",pszCmd);
+#endif
+    
+    nRet = system(pszCmd);    
+
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"call returned '%i'\n",nRet);
+    fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
+#endif
+    
+    switch ( WEXITSTATUS(nRet) )
+    {
+    case 0:
+        nRet=0;
+        break;
+
+    default:
+        nRet=EBUSY;
+        break;
+    }
+    
+#ifdef TRACE_OSL_FILE
+    fprintf(stderr,"Out osl_unmountFloppy [ok]\n");
+#endif    
+
+    return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
+    
+/*    return osl_File_E_None;*/
+}
+
+static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
+{
+    struct mntent* pMountEnt=0;
+    sal_Char buffer[PATH_MAX];
+    FILE* mntfile=0;
+    int nRet=0;
+
+    buffer[0] = '\0';
+    
+    mntfile = setmntent(MOUNTTAB,"r");
+
+#ifdef TRACE_OSL_FILE
+    fprintf(stderr,"In  osl_getFloppyMountEntry\n");
+#endif
+
+    memset(buffer, 0, sizeof(buffer));
+    strncpy(buffer, pszPath, sizeof(buffer) - 1);
+    
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"Checking mount of %s\n",buffer);
+#endif
+
+    
+    if ( mntfile == 0 )
+    {
+        nRet=errno;
+#ifdef DEBUG_OSL_FILE
+        perror("mounttab");
+#endif
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_getFloppyMountEntry [mntfile]\n");
+#endif
+        return sal_False;
+    }
+
+    pMountEnt=getmntent(mntfile);
+    while ( pMountEnt != 0 )
+    {
+#ifdef DEBUG_OSL_FILE
+/*           fprintf(stderr,"mnt_fsname : %s\n",pMountEnt->mnt_fsname); */
+/*           fprintf(stderr,"mnt_dir    : %s\n",pMountEnt->mnt_dir); */
+/*        fprintf(stderr,"mnt_type   : %s\n",pMountEnt->mnt_type);*/
+#endif
+        if ( strcmp(pMountEnt->mnt_dir,buffer) == 0 &&
+             strncmp(pMountEnt->mnt_fsname,"/dev/fd",strlen("/dev/fd")) == 0 )
+        {
+            
+            memset(pItem->pszMountPoint, 0, sizeof(pItem->pszMountPoint));			
+            strncpy(pItem->pszMountPoint, pMountEnt->mnt_dir, sizeof(pItem->pszMountPoint) - 1);
+            
+            memset(pItem->pszFilePath, 0, sizeof(pItem->pszFilePath));
+            strncpy(pItem->pszFilePath, pMountEnt->mnt_dir, sizeof(pItem->pszFilePath) - 1);
+            
+            memset(pItem->pszDevice, 0, sizeof(pItem->pszDevice));
+            strncpy(pItem->pszDevice, pMountEnt->mnt_fsname, sizeof(pItem->pszDevice) - 1);
+                                    
+            fclose(mntfile);
+#ifdef DEBUG_OSL_FILE
+            fprintf(stderr,"Mount Point found '%s'\n",pItem->pszMountPoint);
+#endif
+#ifdef TRACE_OSL_FILE
+            fprintf(stderr,"Out osl_getFloppyMountEntry [found]\n");
+#endif
+            return sal_True;
+        }
+#ifdef DEBUG_OSL_FILE
+/*        fprintf(stderr,"=================\n");*/
+#endif
+        pMountEnt=getmntent(mntfile);
+    }    
+
+#ifdef TRACE_OSL_FILE
+    fprintf(stderr,"Out osl_getFloppyMountEntry [not found]\n");
+#endif
+
+    fclose(mntfile);
+    return sal_False;
+}
+
+static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
+{
+    sal_Char buffer[PATH_MAX];
+    oslVolumeDeviceHandleImpl* pItem=0;    
+    sal_Bool bRet=0;
+
+    buffer[0] = '\0';
+    
+#ifdef TRACE_OSL_FILE
+    fprintf(stderr,"In  osl_isFloppyMounted\n");
+#endif
+
+    pItem = osl_newVolumeDeviceHandleImpl ();
+    if ( pItem == 0 )
+        return osl_File_E_NOMEM;
+    
+    memset(buffer, 0, sizeof(buffer));	
+    strncpy(buffer, pDevice->pszMountPoint, sizeof(buffer) - 1);
+
+#ifdef DEBUG_OSL_FILE
+    fprintf(stderr,"Checking mount of %s\n",buffer);
+#endif
+
+    bRet = osl_getFloppyMountEntry(buffer,pItem);
+
+    if ( bRet == sal_False )
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_isFloppyMounted [not mounted]\n");
+#endif
+        return sal_False;
+    }
+
+    if (strcmp(pItem->pszMountPoint, pDevice->pszMountPoint) == 0 &&
+        strcmp(pItem->pszDevice,pDevice->pszDevice) == 0)
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Out osl_isFloppyMounted [is mounted]\n");
+#endif
+        rtl_freeMemory(pItem);
+        return sal_True;
+    }
+    
+#ifdef TRACE_OSL_FILE
+    fprintf(stderr,"Out osl_isFloppyMounted [may be EBUSY]\n");
+#endif
+
+    rtl_freeMemory(pItem);
+    return sal_False;    
+}
+#endif /* IRIX */
+
+
+/* NetBSD floppy functions have to be added here. Until we have done that, 
+ * we use the MACOSX definitions for nonexistent floppy.
+ * */
+
+/******************************************************************************
+ *
+ *                  MAC OS X FLOPPY FUNCTIONS
+ *
+ *****************************************************************************/
+
+#if (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
+{
+    return NULL;
+}
+#endif /* MACOSX */
+
+#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
+{
+    return osl_File_E_BUSY;
+}
+#endif /* MACOSX */
+
+#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
+{
+    return osl_File_E_BUSY;
+}
+#endif /* MACOSX */
+
+#if ( defined(NETBSD) || defined(FREEBSD) )
+static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
+{
+    return sal_False;
+}
+#endif /* NETBSD || FREEBSD */
+
+#if ( defined(NETBSD) || defined(FREEBSD) )
+static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
+{
+    return sal_False;
+}
+#endif /* NETBSD || FREEBSD */
+
+
+#ifdef DEBUG_OSL_FILE
+static void osl_printFloppyHandle(oslVolumeDeviceHandleImpl* pItem)
+{
+    if (pItem == 0 )
+    {
+        fprintf(stderr,"NULL Handle\n");
+        return;
+    }
+    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
+    {
+#ifdef TRACE_OSL_FILE
+        fprintf(stderr,"Invalid Handle]\n");
+#endif
+        return;
+    }
+    
+
+    fprintf(stderr,"MountPoint : '%s'\n",pItem->pszMountPoint);
+    fprintf(stderr,"FilePath   : '%s'\n",pItem->pszFilePath);
+    fprintf(stderr,"Device     : '%s'\n",pItem->pszDevice);
+
+    return;    
+}
+#endif
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk
index 1717d836e..0e728c29d 100644
--- a/sal/osl/unx/makefile.mk
+++ b/sal/osl/unx/makefile.mk
@@ -68,18 +68,20 @@ SLOFILES=   $(SLO)$/conditn.obj  \
             $(SLO)$/security.obj \
             $(SLO)$/profile.obj  \
             $(SLO)$/time.obj     \
-            $(SLO)$/file.obj     \
             $(SLO)$/signal.obj   \
             $(SLO)$/pipe.obj   	 \
             $(SLO)$/system.obj	 \
             $(SLO)$/util.obj	 \
             $(SLO)$/tempfile.obj\
+            $(SLO)$/file.obj     \
+            $(SLO)$/file_misc.obj \
             $(SLO)$/file_url.obj\
             $(SLO)$/file_error_transl.obj\
             $(SLO)$/file_path_helper.obj\
+            $(SLO)$/file_stat.obj \
+            $(SLO)$/file_volume.obj \
             $(SLO)$/uunxapi.obj\
             $(SLO)$/process_impl.obj\
-            $(SLO)$/file_stat.obj \
             $(SLO)$/salinit.obj
 
 #.IF "$(UPDATER)"=="YES"
@@ -96,18 +98,20 @@ OBJFILES=   $(OBJ)$/conditn.obj  \
             $(OBJ)$/security.obj \
             $(OBJ)$/profile.obj  \
             $(OBJ)$/time.obj     \
-            $(OBJ)$/file.obj     \
             $(OBJ)$/signal.obj   \
             $(OBJ)$/pipe.obj   	 \
             $(OBJ)$/system.obj	 \
             $(OBJ)$/util.obj	 \
             $(OBJ)$/tempfile.obj\
+            $(OBJ)$/file.obj     \
+            $(OBJ)$/file_misc.obj \
             $(OBJ)$/file_url.obj\
             $(OBJ)$/file_error_transl.obj\
             $(OBJ)$/file_path_helper.obj\
+            $(OBJ)$/file_stat.obj \
+            $(OBJ)$/file_volume.obj \
             $(OBJ)$/uunxapi.obj\
             $(OBJ)$/process_impl.obj\
-            $(OBJ)$/file_stat.obj \
             $(OBJ)$/salinit.obj
             
 #.ENDIF
diff --git a/sal/osl/w32/MAKEFILE.MK b/sal/osl/w32/MAKEFILE.MK
index e6a338543..cd52ef549 100644
--- a/sal/osl/w32/MAKEFILE.MK
+++ b/sal/osl/w32/MAKEFILE.MK
@@ -78,6 +78,10 @@ SLOFILES=   $(SLO)$/conditn.obj  \
             $(SLO)$/pipe.obj     \
             $(SLO)$/util.obj     \
             $(SLO)$/file.obj\
+            $(SLO)$/file_dirvol.obj\
+            $(SLO)$/file_error.obj\
+            $(SLO)$/file_url.obj\
+            $(SLO)$/tempfile.obj\
             $(SLO)$/path_helper.obj\
             $(SLO)$/procimpl.obj \
             $(SLO)$/salinit.obj
@@ -101,6 +105,10 @@ OBJFILES=   $(OBJ)$/conditn.obj  \
             $(OBJ)$/pipe.obj     \
             $(OBJ)$/util.obj     \
             $(OBJ)$/file.obj\
+            $(OBJ)$/file_dirvol.obj\
+            $(OBJ)$/file_error.obj\
+            $(OBJ)$/file_url.obj\
+            $(OBJ)$/tempfile.obj\
             $(OBJ)$/path_helper.obj\
             $(OBJ)$/procimpl.obj \
             $(OBJ)$/salinit.obj
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
dissimilarity index 91%
index 4e7994c52..b8d231a1c 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -1,3753 +1,1147 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: file.cxx,v $
- * $Revision: 1.19 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
-#define UNICODE
-#define _UNICODE
-#define _WIN32_WINNT 0x0500
-#include "systools\win32\uwinapi.h"
-
-#include "path_helper.hxx"
-
-#include "sal/types.h"
-
-#include "osl/file.hxx"
-#include "osl/diagnose.h"
-#include "rtl/ustring.hxx"
-#include "rtl/alloc.h"
-#include "rtl/tencinfo.h"
-#include "osl/thread.h"
-#include "osl/mutex.h"
-#include "rtl/byteseq.h"
-#include "osl/time.h"
-//#include <rtl/logfile.h>
-#include <stdio.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <tchar.h>
-
-#ifdef __MINGW32__
-#include <wchar.h>
-#include <ctype.h>
-#endif
-
-#include <malloc.h>
-#include <algorithm>
-#include <limits>
-
-#ifdef max /* conflict w/ std::numeric_limits<T>::max() */
-#undef max
-#endif
-
-//#####################################################
-// BEGIN global
-//#####################################################
-
-extern "C" oslMutex g_CurrentDirectoryMutex; /* Initialized in dllentry.c */
-oslMutex g_CurrentDirectoryMutex;
-
-//#####################################################
-extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime)
-{
-    SYSTEMTIME	BaseSysTime;
-    FILETIME	BaseFileTime;
-    FILETIME	FTime;
-    __int64		localTime;
-    BOOL		fSuccess = FALSE;
-
-    BaseSysTime.wYear         = 1970;
-    BaseSysTime.wMonth        = 1;
-    BaseSysTime.wDayOfWeek    = 0;
-    BaseSysTime.wDay          = 1;
-    BaseSysTime.wHour         = 0;
-    BaseSysTime.wMinute       = 0;
-    BaseSysTime.wSecond       = 0;
-    BaseSysTime.wMilliseconds = 0;
-
-    if (cpTimeVal==NULL)
-        return fSuccess;
-
-    if ( SystemTimeToFileTime(&BaseSysTime, &BaseFileTime) )
-    {
-        __int64 timeValue;
-        localTime=cpTimeVal->Seconds*(__int64)10000000+cpTimeVal->Nanosec/100;
-        *(__int64 *)&FTime=localTime;
-        fSuccess = 0 <= (timeValue= *((__int64 *)&BaseFileTime) + *((__int64 *) &FTime));
-        if (fSuccess)
-            *(__int64 *)pFTime=timeValue;
-    }
-    return fSuccess;
-}
-
-//#####################################################
-extern "C" BOOL FileTimeToTimeValue(const FILETIME *cpFTime, TimeValue *pTimeVal)
-{
-    SYSTEMTIME	BaseSysTime;
-    FILETIME	BaseFileTime;
-    BOOL		fSuccess = FALSE;	/* Assume failure */
-
-    BaseSysTime.wYear         = 1970;
-    BaseSysTime.wMonth        = 1;
-    BaseSysTime.wDayOfWeek    = 0;
-    BaseSysTime.wDay          = 1;
-    BaseSysTime.wHour         = 0;
-    BaseSysTime.wMinute       = 0;
-    BaseSysTime.wSecond       = 0;
-    BaseSysTime.wMilliseconds = 0;
-
-    if ( SystemTimeToFileTime(&BaseSysTime, &BaseFileTime) )
-    {
-        __int64		Value;
-
-        fSuccess = 0 <= (Value = *((__int64 *)cpFTime) - *((__int64 *)&BaseFileTime));
-
-        if ( fSuccess )
-        {
-            pTimeVal->Seconds  = (unsigned long) (Value / 10000000L);
-            pTimeVal->Nanosec  = (unsigned long)((Value % 10000000L) * 100);
-        }
-    }
-    return fSuccess;
-}
-
-//#####################################################
-extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle(HANDLE hFile)
-{
-    if ( IsValidHandle(hFile) )
-        return (oslFileHandle)hFile;
-    else
-        return NULL;
-}
-
-//#####################################################
-// End global
-//#####################################################
-
-                    
-using namespace osl;
-
-#define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0])))
-
-// Allocate n number of t's on the stack return a pointer to it in p 
-#ifdef __MINGW32__
-#define STACK_ALLOC(p, t, n) (p) = reinterpret_cast<t*>(_alloca((n)*sizeof(t)));
-#else
-#define STACK_ALLOC(p, t, n) __try {(p) = reinterpret_cast<t*>(_alloca((n)*sizeof(t)));} \
-                             __except(EXCEPTION_EXECUTE_HANDLER) {(p) = NULL;}
-#endif
-
-#if OSL_DEBUG_LEVEL > 0
-#define OSL_ENSURE_FILE( cond, msg, file ) ( (cond) ?  (void)0 : _osl_warnFile( msg, file ) )
-#else
-#define OSL_ENSURE_FILE( cond, msg, file ) ((void)0)
-#endif
-                             
-#define PATHTYPE_ERROR						0
-#define PATHTYPE_RELATIVE					1
-#define PATHTYPE_ABSOLUTE_UNC				2
-#define PATHTYPE_ABSOLUTE_LOCAL				3
-#define PATHTYPE_MASK_TYPE					0xFF
-#define PATHTYPE_IS_VOLUME					0x0100
-#define PATHTYPE_IS_SERVER					0x0200
-
-#define VALIDATEPATH_NORMAL					0x0000
-#define VALIDATEPATH_ALLOW_WILDCARDS		0x0001
-#define VALIDATEPATH_ALLOW_ELLIPSE			0x0002
-#define VALIDATEPATH_ALLOW_RELATIVE			0x0004
-#define VALIDATEPATH_ALLOW_UNC				0x0008
-#define VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD 0x0010
-
-#define WSTR_SYSTEM_ROOT_PATH				L"\\\\.\\"
-
-typedef struct {
-    UINT	uType;
-
-    union {
-        WIN32_FIND_DATA	FindData;
-        TCHAR			cDriveString[MAX_PATH];
-    };
-    TCHAR			szFullPath[MAX_PATH];
-    BOOL			bFullPathNormalized;
-    int				nRefCount;
-}DirectoryItem_Impl;
-
-#define	DIRECTORYTYPE_LOCALROOT	    0
-#define	DIRECTORYTYPE_NETROOT		1
-#define	DIRECTORYTYPE_NETRESORCE	2
-#define	DIRECTORYTYPE_FILESYSTEM	3
-
-#define DIRECTORYITEM_DRIVE		0
-#define DIRECTORYITEM_FILE		1
-#define DIRECTORYITEM_SERVER	2
-
-typedef struct {
-    UINT	uType;
-    union {
-        HANDLE	hDirectory;
-        HANDLE	hEnumDrives;
-    };
-    TCHAR	szDirectoryPath[MAX_PATH];
-} Directory_Impl;
-
-/* Different types of paths */
-typedef enum _PATHTYPE
-{
-    PATHTYPE_SYNTAXERROR = 0,
-    PATHTYPE_NETROOT,
-    PATHTYPE_NETSERVER,
-    PATHTYPE_VOLUME,
-    PATHTYPE_FILE
-} PATHTYPE;
-
-                             
-namespace /* private */
-{       
-    // forward    
-    void _osl_warnFile(const char*, rtl_uString*);
-    oslFileError SAL_CALL _osl_getFileURLFromSystemPath(rtl_uString* , rtl_uString**);
-    DWORD WINAPI IsValidFilePath(rtl_uString*, LPCTSTR*, DWORD, rtl_uString**);
-    HANDLE WINAPI OpenLogicalDrivesEnum(void);    
-    BOOL WINAPI EnumLogicalDrives(HANDLE, LPTSTR);
-    BOOL WINAPI CloseLogicalDrivesEnum(HANDLE);
-    HANDLE WINAPI OpenDirectory(LPCTSTR);
-    BOOL WINAPI CloseDirectory(HANDLE);
-    BOOL WINAPI EnumDirectory(HANDLE, LPWIN32_FIND_DATA);    
-    DWORD WINAPI GetCaseCorrectPathName(LPCTSTR, LPTSTR, DWORD);	
-    oslFileError SAL_CALL _osl_getSystemPathFromFileURL(rtl_uString*, rtl_uString**, sal_Bool);
-    
-    /* OS error to errno values mapping table */
-    struct errentry {
-        unsigned long oscode;	/* OS return value */
-        int errnocode;			/* System V error code */
-    };
-
-    struct errentry errtable[] = {
-        {  ERROR_SUCCESS,				 osl_File_E_None     },  /* 0 */
-        {  ERROR_INVALID_FUNCTION,       osl_File_E_INVAL    },  /* 1 */
-        {  ERROR_FILE_NOT_FOUND,         osl_File_E_NOENT    },  /* 2 */
-        {  ERROR_PATH_NOT_FOUND,         osl_File_E_NOENT    },  /* 3 */
-        {  ERROR_TOO_MANY_OPEN_FILES,    osl_File_E_MFILE    },  /* 4 */
-        {  ERROR_ACCESS_DENIED,          osl_File_E_ACCES    },  /* 5 */
-        {  ERROR_INVALID_HANDLE,         osl_File_E_BADF     },  /* 6 */
-        {  ERROR_ARENA_TRASHED,          osl_File_E_NOMEM    },  /* 7 */
-        {  ERROR_NOT_ENOUGH_MEMORY,      osl_File_E_NOMEM    },  /* 8 */
-        {  ERROR_INVALID_BLOCK,          osl_File_E_NOMEM    },  /* 9 */
-        {  ERROR_BAD_ENVIRONMENT,        osl_File_E_2BIG     },  /* 10 */
-        {  ERROR_BAD_FORMAT,             osl_File_E_NOEXEC   },  /* 11 */
-        {  ERROR_INVALID_ACCESS,         osl_File_E_INVAL    },  /* 12 */
-        {  ERROR_INVALID_DATA,           osl_File_E_INVAL    },  /* 13 */
-        {  ERROR_INVALID_DRIVE,          osl_File_E_NOENT    },  /* 15 */
-        {  ERROR_CURRENT_DIRECTORY,      osl_File_E_ACCES    },  /* 16 */
-        {  ERROR_NOT_SAME_DEVICE,        osl_File_E_XDEV     },  /* 17 */
-        {  ERROR_NO_MORE_FILES,          osl_File_E_NOENT    },  /* 18 */
-        {  ERROR_NOT_READY,              osl_File_E_NOTREADY },  /* 21 */
-        {  ERROR_LOCK_VIOLATION,         osl_File_E_ACCES    },  /* 33 */
-        {  ERROR_BAD_NETPATH,            osl_File_E_NOENT    },  /* 53 */
-        {  ERROR_NETWORK_ACCESS_DENIED,  osl_File_E_ACCES    },  /* 65 */
-        {  ERROR_BAD_NET_NAME,           osl_File_E_NOENT    },  /* 67 */
-        {  ERROR_FILE_EXISTS,            osl_File_E_EXIST    },  /* 80 */
-        {  ERROR_CANNOT_MAKE,            osl_File_E_ACCES    },  /* 82 */
-        {  ERROR_FAIL_I24,               osl_File_E_ACCES    },  /* 83 */
-        {  ERROR_INVALID_PARAMETER,      osl_File_E_INVAL    },  /* 87 */
-        {  ERROR_NO_PROC_SLOTS,          osl_File_E_AGAIN    },  /* 89 */
-        {  ERROR_DRIVE_LOCKED,           osl_File_E_ACCES    },  /* 108 */
-        {  ERROR_BROKEN_PIPE,            osl_File_E_PIPE     },  /* 109 */
-        {  ERROR_DISK_FULL,              osl_File_E_NOSPC    },  /* 112 */
-        {  ERROR_INVALID_TARGET_HANDLE,  osl_File_E_BADF     },  /* 114 */
-        {  ERROR_INVALID_HANDLE,         osl_File_E_INVAL    },  /* 124 */
-        {  ERROR_WAIT_NO_CHILDREN,       osl_File_E_CHILD    },  /* 128 */
-        {  ERROR_CHILD_NOT_COMPLETE,     osl_File_E_CHILD    },  /* 129 */
-        {  ERROR_DIRECT_ACCESS_HANDLE,   osl_File_E_BADF     },  /* 130 */
-        {  ERROR_NEGATIVE_SEEK,          osl_File_E_INVAL    },  /* 131 */
-        {  ERROR_SEEK_ON_DEVICE,         osl_File_E_ACCES    },  /* 132 */
-        {  ERROR_DIR_NOT_EMPTY,          osl_File_E_NOTEMPTY },  /* 145 */
-        {  ERROR_NOT_LOCKED,             osl_File_E_ACCES    },  /* 158 */
-        {  ERROR_BAD_PATHNAME,           osl_File_E_NOENT    },  /* 161 */
-        {  ERROR_MAX_THRDS_REACHED,      osl_File_E_AGAIN    },  /* 164 */
-        {  ERROR_LOCK_FAILED,            osl_File_E_ACCES    },  /* 167 */
-        {  ERROR_ALREADY_EXISTS,         osl_File_E_EXIST    },  /* 183 */
-        {  ERROR_FILENAME_EXCED_RANGE,   osl_File_E_NOENT    },  /* 206 */
-        {  ERROR_NESTING_NOT_ALLOWED,    osl_File_E_AGAIN    },  /* 215 */
-        {  ERROR_DIRECTORY,              osl_File_E_NOENT    },  /* 267 */
-        {  ERROR_NOT_ENOUGH_QUOTA,       osl_File_E_NOMEM    },  /* 1816 */
-        {  ERROR_UNEXP_NET_ERR,          osl_File_E_NETWORK  }   /* 59 */
-    };
-    
-    /* The following two constants must be the minimum and maximum
-    values in the (contiguous) range of osl_File_E_xec Failure errors. */
-    #define MIN_EXEC_ERROR ERROR_INVALID_STARTING_CODESEG
-    #define MAX_EXEC_ERROR ERROR_INFLOOP_IN_RELOC_CHAIN
-
-    /* These are the low and high value in the range of errors that are
-    access violations */
-    #define MIN_EACCES_RANGE ERROR_WRITE_PROTECT
-    #define MAX_EACCES_RANGE ERROR_SHARING_BUFFER_EXCEEDED
-
-    //#####################################################
-    oslFileError MapError(DWORD dwError)
-    {        
-        for (int i = 0; i < ELEMENTS_OF_ARRAY(errtable); ++i )
-        {
-            if (dwError == errtable[i].oscode)
-                return static_cast<oslFileError>(errtable[i].errnocode);
-        }
-
-        /* The error code wasn't in the table.  We check for a range of 
-        osl_File_E_ACCES errors or exec failure errors (ENOEXEC).  
-        Otherwise osl_File_E_INVAL is returned. */
-        if ( dwError >= MIN_EACCES_RANGE && dwError <= MAX_EACCES_RANGE)
-            return osl_File_E_ACCES;
-        else if ( dwError >= MIN_EXEC_ERROR && dwError <= MAX_EXEC_ERROR)
-            return osl_File_E_NOEXEC;
-        else
-            return osl_File_E_INVAL;
-    }
-            
-    //#####################################################
-    oslFileError SAL_CALL osl_openLocalRoot(
-        rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
-    {
-        rtl_uString		*strSysPath = NULL;
-        oslFileError	error;
-        
-        if ( !pDirectory )
-            return osl_File_E_INVAL;
-
-        *pDirectory = NULL;
-
-        error = _osl_getSystemPathFromFileURL( strDirectoryPath, &strSysPath, sal_False );
-
-        if ( osl_File_E_None == error )
-        {
-            Directory_Impl	*pDirImpl;
-
-            pDirImpl = reinterpret_cast<Directory_Impl*>(rtl_allocateMemory( sizeof(Directory_Impl)));
-            _tcscpy( pDirImpl->szDirectoryPath, reinterpret_cast<LPCTSTR>(rtl_uString_getStr(strSysPath)) );
-
-            /* Append backslash if neccessary */
-
-            /* @@@ToDo
-               use function ensure backslash
-            */
-            if ( pDirImpl->szDirectoryPath[_tcslen(pDirImpl->szDirectoryPath) - 1] != L'\\' )
-                _tcscat( pDirImpl->szDirectoryPath, L"\\" );
-
-            pDirImpl->uType = DIRECTORYTYPE_LOCALROOT;
-            pDirImpl->hEnumDrives = OpenLogicalDrivesEnum();
-
-            /* @@@ToDo
-               Use IsValidHandle(...)
-            */
-            if ( pDirImpl->hEnumDrives != INVALID_HANDLE_VALUE )
-            {
-                *pDirectory = (oslDirectory)pDirImpl;
-                error = osl_File_E_None;
-            }
-            else
-            {
-                if ( pDirImpl )
-                    rtl_freeMemory(pDirImpl);
-
-                error = MapError( GetLastError() );
-            }
-
-            rtl_uString_release( strSysPath );
-        }
-        return error;
-    }
-
-    //#####################################################
-    oslFileError SAL_CALL osl_openFileDirectory(
-        rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
-    {
-        // MT: Done in osl_openDirectory!
-//	    rtl_uString		*strSysPath = NULL;
-        oslFileError	error;
-        
-        //MT: Not done in osl_openNetworkServer, why here?
-        if ( !pDirectory )
-            return osl_File_E_INVAL;
-
-        *pDirectory = NULL;
-
-        // MT: Done in osl_openDirectory!
-//	    error = _osl_getSystemPathFromFileURL( strDirectoryPath, &strSysPath, sal_False );
-//	    if ( osl_File_E_None == error )
-        {
-            Directory_Impl	*pDirImpl;
-
-            pDirImpl = reinterpret_cast<Directory_Impl*>(rtl_allocateMemory(sizeof(Directory_Impl)));
-            _tcscpy( pDirImpl->szDirectoryPath, reinterpret_cast<LPCTSTR>(rtl_uString_getStr(strDirectoryPath)) );
-
-            /* Append backslash if neccessary */
-
-            /* @@@ToDo
-               use function ensure backslash
-            */
-            if ( pDirImpl->szDirectoryPath[_tcslen(pDirImpl->szDirectoryPath) - 1] != L'\\' )
-                _tcscat( pDirImpl->szDirectoryPath, L"\\" );
-            // MT: ???
-            // GetCaseCorrectPathName( pDirImpl->szDirectoryPath, pDirImpl->szDirectoryPath, sizeof(pDirImpl->szDirectoryPath) );
-
-            pDirImpl->uType = DIRECTORYTYPE_FILESYSTEM;
-            pDirImpl->hDirectory = OpenDirectory( pDirImpl->szDirectoryPath );
-
-            if ( pDirImpl->hDirectory )
-            {
-                *pDirectory = (oslDirectory)pDirImpl;
-                error = osl_File_E_None;
-            }
-            else
-            {
-                if ( pDirImpl )
-                    rtl_freeMemory(pDirImpl);
-
-                error = MapError( GetLastError() );
-            }
-
-//		    rtl_uString_release( strSysPath );
-        }
-        return error;
-    }
-
-    typedef struct tagDIRECTORY
-    {
-        HANDLE			hFind;
-        WIN32_FIND_DATA	aFirstData;
-    } DIRECTORY, *PDIRECTORY, FAR *LPDIRECTORY;
-     
-    //#####################################################
-    HANDLE WINAPI OpenDirectory(LPCTSTR lpszPath)
-    {
-        LPDIRECTORY	pDirectory = (LPDIRECTORY)HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECTORY));
-
-        if (pDirectory)
-        {
-            TCHAR	szFileMask[MAX_PATH];
-            int		nLen;
-
-            _tcscpy( szFileMask, lpszPath );
-            nLen = _tcslen( szFileMask );
-
-            if (nLen && szFileMask[nLen-1] != '\\')
-                _tcscat(szFileMask, TEXT("\\*.*"));
-            else
-                _tcscat(szFileMask, TEXT("*.*"));
-
-            pDirectory->hFind = FindFirstFile(szFileMask, &pDirectory->aFirstData);
-
-            if (!IsValidHandle(pDirectory->hFind))		
-            {
-                if ( GetLastError() != ERROR_NO_MORE_FILES )
-                {
-                    HeapFree(GetProcessHeap(), 0, pDirectory);
-                    pDirectory = NULL;
-                }
-            }
-        }
-        return (HANDLE)pDirectory;
-    }
-
-    //#####################################################
-    BOOL WINAPI CloseDirectory(HANDLE hDirectory)
-    {
-        BOOL		fSuccess = FALSE;
-        LPDIRECTORY	pDirectory = (LPDIRECTORY)hDirectory;
-
-        if (pDirectory)
-        {
-            if (IsValidHandle(pDirectory->hFind))
-                fSuccess = FindClose(pDirectory->hFind);
-
-            fSuccess = HeapFree(GetProcessHeap(), 0, pDirectory) && fSuccess;
-        }
-        else
-            SetLastError(ERROR_INVALID_HANDLE);
-
-        return fSuccess;
-    }
-
-    //#####################################################
-    BOOL WINAPI EnumDirectory(HANDLE hDirectory, LPWIN32_FIND_DATA pFindData)
-    {
-        BOOL		fSuccess = FALSE;
-        LPDIRECTORY	pDirectory = (LPDIRECTORY)hDirectory;
-
-        if ( pDirectory )
-        {
-            BOOL	fValid;
-
-            do
-            {
-                if ( pDirectory->aFirstData.cFileName[0] )
-                {
-                    *pFindData = pDirectory->aFirstData;
-                    fSuccess = TRUE;
-                    pDirectory->aFirstData.cFileName[0] = 0;
-                }
-                else if ( IsValidHandle( pDirectory->hFind ) )
-                    fSuccess = FindNextFile( pDirectory->hFind, pFindData );
-                else
-                {
-                    fSuccess = FALSE;
-                    SetLastError( ERROR_NO_MORE_FILES );
-                }
-
-                fValid = fSuccess && _tcscmp( TEXT("."), pFindData->cFileName ) != 0 && _tcscmp( TEXT(".."), pFindData->cFileName ) != 0;
-
-            } while( fSuccess && !fValid );
-        }
-        else
-            SetLastError( ERROR_INVALID_HANDLE );
-
-        return fSuccess;
-    }
-
-    //#####################################################
-    oslFileError SAL_CALL osl_openNetworkServer(rtl_uString *strSysDirPath, oslDirectory *pDirectory)
-    {
-        NETRESOURCEW	aNetResource;
-        HANDLE			hEnum;
-        DWORD			dwError;
-
-        ZeroMemory( &aNetResource, sizeof(aNetResource) );
-
-        aNetResource.lpRemoteName = reinterpret_cast<LPWSTR>(strSysDirPath->buffer);
-
-        dwError = WNetOpenEnumW( 
-            RESOURCE_GLOBALNET, 
-            RESOURCETYPE_DISK, 
-            RESOURCEUSAGE_CONNECTABLE | RESOURCEUSAGE_CONTAINER, 
-            &aNetResource, 
-            &hEnum );
-
-        if ( ERROR_SUCCESS == dwError )
-        {
-            Directory_Impl	*pDirImpl;
-
-            pDirImpl = reinterpret_cast<Directory_Impl*>(rtl_allocateMemory(sizeof(Directory_Impl)));
-            pDirImpl->uType = DIRECTORYTYPE_NETROOT;
-            pDirImpl->hDirectory = hEnum;	
-            *pDirectory = (oslDirectory)pDirImpl;
-        }
-        return MapError( dwError );
-    }
-
-    //#####################################################
-    oslFileError SAL_CALL osl_getNextNetResource( 
-        oslDirectory Directory, 
-        oslDirectoryItem *pItem, 
-        sal_uInt32 uHint )
-    {
-        Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
-        DirectoryItem_Impl	*pItemImpl = NULL;
-        BYTE				buffer[16384];
-        LPNETRESOURCEW		lpNetResource = (LPNETRESOURCEW)buffer;
-        DWORD				dwError, dwCount, dwBufSize;
-
-        uHint = uHint; /* to get no warning */        	    
-
-        if ( !pItem )
-            return osl_File_E_INVAL;
-
-        *pItem = NULL;
-
-        if ( !pDirImpl )
-            return osl_File_E_INVAL;
-
-        dwCount = 1;
-        dwBufSize = sizeof(buffer);
-        dwError = WNetEnumResource( pDirImpl->hDirectory, &dwCount, lpNetResource, &dwBufSize );
-
-        switch ( dwError )
-        {
-        case NO_ERROR:
-        case ERROR_MORE_DATA:
-            {
-                pItemImpl = reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-                if ( !pItemImpl )
-                    return osl_File_E_NOMEM;
-
-                ZeroMemory( pItemImpl, sizeof(DirectoryItem_Impl) );
-                pItemImpl->uType = DIRECTORYITEM_DRIVE;
-                osl_acquireDirectoryItem( (oslDirectoryItem)pItemImpl );
-
-                wcscpy( pItemImpl->cDriveString, lpNetResource->lpRemoteName );
-
-                *pItem = pItemImpl;
-            }
-            return osl_File_E_None;
-        case ERROR_NO_MORE_ITEMS:
-            return osl_File_E_NOENT;
-        default:
-            return MapError( dwError );
-        }
-    }
-
-    //##################################################### 
-    oslFileError SAL_CALL osl_getNextDrive( 
-        oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint )
-    {
-        Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
-        DirectoryItem_Impl	*pItemImpl = NULL;
-        BOOL				fSuccess;
-
-        uHint = uHint; /* avoid warnings */
-                
-        if ( !pItem )
-            return osl_File_E_INVAL;
-
-        *pItem = NULL;
-
-        if ( !pDirImpl )
-            return osl_File_E_INVAL;
-
-        pItemImpl = reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-        if ( !pItemImpl )
-            return osl_File_E_NOMEM;
-
-
-        ZeroMemory( pItemImpl, sizeof(DirectoryItem_Impl) );
-        pItemImpl->uType = DIRECTORYITEM_DRIVE;
-        osl_acquireDirectoryItem( (oslDirectoryItem)pItemImpl );
-        fSuccess = EnumLogicalDrives( pDirImpl->hEnumDrives, pItemImpl->cDriveString );
-
-        if ( fSuccess )
-        {
-            *pItem = pItemImpl;
-            return osl_File_E_None;
-        }
-        else
-        {
-            rtl_freeMemory( pItemImpl );
-            return MapError( GetLastError() );
-        }
-    }
-
-    //##################################################### 
-    oslFileError SAL_CALL osl_getNextFileItem( 
-        oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint)
-    {
-        Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
-        DirectoryItem_Impl	*pItemImpl = NULL;
-        BOOL				fFound;
-
-        uHint = uHint; /* avoid warnings */
-                
-        if ( !pItem )
-            return osl_File_E_INVAL;
-
-        *pItem = NULL;
-
-        if ( !pDirImpl )
-            return osl_File_E_INVAL;
-
-        pItemImpl = reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-        if ( !pItemImpl )
-            return osl_File_E_NOMEM;
-
-        memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
-        fFound = EnumDirectory( pDirImpl->hDirectory, &pItemImpl->FindData );
-
-        if ( fFound )
-        {
-            pItemImpl->uType = DIRECTORYITEM_FILE;
-            pItemImpl->nRefCount = 1;
-            _tcscpy( pItemImpl->szFullPath, pDirImpl->szDirectoryPath );
-            _tcscat( pItemImpl->szFullPath, pItemImpl->FindData.cFileName );
-            pItemImpl->bFullPathNormalized = FALSE;
-            *pItem = (oslDirectoryItem)pItemImpl;
-            return osl_File_E_None;
-        }
-        else
-        {
-            rtl_freeMemory( pItemImpl );
-            return MapError( GetLastError() );
-        }
-    }
-
-    //##################################################### 
-    oslFileError SAL_CALL osl_getDriveInfo(
-        oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask)
-    {
-        DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
-        TCHAR				cDrive[3] = TEXT("A:");
-        TCHAR				cRoot[4] = TEXT("A:\\");
-
-        if ( !pItemImpl )
-            return osl_File_E_INVAL;
-
-        pStatus->uValidFields = 0;
-
-        cDrive[0] = pItemImpl->cDriveString[0];
-        cRoot[0] = pItemImpl->cDriveString[0];
-
-        if ( uFieldMask & osl_FileStatus_Mask_FileName )
-        {
-            if ( pItemImpl->cDriveString[0] == '\\' &&
-                pItemImpl->cDriveString[1] == '\\' )
-            {
-                LPCWSTR	lpFirstBkSlash = wcschr( &pItemImpl->cDriveString[2], '\\' );
-
-                if ( lpFirstBkSlash && lpFirstBkSlash[1] )
-                {
-                    LPCWSTR	lpLastBkSlash = wcschr( &lpFirstBkSlash[1], '\\' );
-
-                    if ( lpLastBkSlash )
-                        rtl_uString_newFromStr_WithLength( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(&lpFirstBkSlash[1]), lpLastBkSlash - lpFirstBkSlash - 1 );
-                    else
-                        rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(&lpFirstBkSlash[1]) );
-                    pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-                }
-            }
-            else switch ( GetDriveType( cRoot ) )
-            {
-            case DRIVE_REMOTE:
-                {
-                    TCHAR	szBuffer[1024];
-                    DWORD	dwBufsize = ELEMENTS_OF_ARRAY(szBuffer);
-                    DWORD	dwResult = WNetGetConnection( cDrive, szBuffer, &dwBufsize );
-
-                    if ( NO_ERROR == dwResult )
-                    {
-                        TCHAR	szFileName[ELEMENTS_OF_ARRAY(szBuffer) + 16];
-
-                        swprintf( szFileName, L"%s [%s]", cDrive, szBuffer );
-                        rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(szFileName) );
-                    }
-                    else
-                        rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(cDrive) );
-                }
-                pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-                break;
-            case DRIVE_FIXED:
-                {
-                    TCHAR	szVolumeNameBuffer[1024];
-
-                    if ( GetVolumeInformation( cRoot, szVolumeNameBuffer, ELEMENTS_OF_ARRAY(szVolumeNameBuffer), NULL, NULL, NULL, NULL, 0 ) )
-                    {
-                        TCHAR	szFileName[ELEMENTS_OF_ARRAY(szVolumeNameBuffer) + 16];
-
-                        swprintf( szFileName, L"%s [%s]", cDrive, szVolumeNameBuffer );
-                        rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(szFileName) );
-                    }
-                    else
-                        rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(cDrive) );
-                }
-                pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-                break;
-            case DRIVE_CDROM:
-            case DRIVE_REMOVABLE:
-                pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-                rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(cRoot) );
-                break;
-            case DRIVE_UNKNOWN:
-            default:
-                break;
-            }
-        }
-
-        pStatus->eType = osl_File_Type_Volume;
-        pStatus->uValidFields |= osl_FileStatus_Mask_Type;
-
-        if ( uFieldMask & osl_FileStatus_Mask_FileURL )
-        {
-            rtl_uString	*ustrSystemPath = NULL;
-
-            rtl_uString_newFromStr( &ustrSystemPath, reinterpret_cast<const sal_Unicode*>(pItemImpl->cDriveString) );
-            osl_getFileURLFromSystemPath( ustrSystemPath, &pStatus->ustrFileURL );
-            rtl_uString_release( ustrSystemPath );
-            pStatus->uValidFields |= osl_FileStatus_Mask_FileURL;
-        }
-        return osl_File_E_None;
-    }
-
-    //##################################################### 
-    oslFileError SAL_CALL osl_getServerInfo( 
-        oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask )
-    {
-        DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
-
-        if ( !pItemImpl )
-            return osl_File_E_INVAL;
-
-        pStatus->uValidFields = 0;
-
-        //	pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-
-        //	if ( _tcscmp( pItemImpl->FindData.cFileName, TEXT(".") ) == 0 )
-        //		rtl_uString_newFromAscii( &pStatus->ustrFileName, "/" );
-        //	else
-        //		rtl_uString_newFromStr( &pStatus->ustrFileName, pItemImpl->FindData.cFileName );
-
-        pStatus->eType = osl_File_Type_Directory;
-        pStatus->uValidFields |= osl_FileStatus_Mask_Type;
-
-        if ( uFieldMask & osl_FileStatus_Mask_FileURL )
-        {
-            rtl_uString	*ustrSystemPath = NULL;
-
-            rtl_uString_newFromStr( &ustrSystemPath, reinterpret_cast<const sal_Unicode*>(pItemImpl->szFullPath) );
-            osl_getFileURLFromSystemPath( ustrSystemPath, &pStatus->ustrFileURL );
-            rtl_uString_release( ustrSystemPath );
-            pStatus->uValidFields |= osl_FileStatus_Mask_FileURL;
-        }
-        return osl_File_E_None;
-    }
-
-    typedef struct tagDRIVEENUM {
-        LPCTSTR	lpIdent;
-        TCHAR	cBuffer[/*('Z' - 'A' + 1) * sizeof("A:\\") + 1*/256];
-        LPCTSTR	lpCurrent;
-    } DRIVEENUM, * PDRIVEENUM, FAR * LPDRIVEENUM;
-
-    //##################################################### 
-    HANDLE WINAPI OpenLogicalDrivesEnum(void)
-    {
-        LPDRIVEENUM	pEnum = NULL;
-
-        pEnum = (LPDRIVEENUM)HeapAlloc( GetProcessHeap(), 0, sizeof(DRIVEENUM) );
-
-        if ( pEnum )
-        {
-            DWORD	dwNumCopied = GetLogicalDriveStrings( (sizeof(pEnum->cBuffer) - 1) / sizeof(TCHAR), pEnum->cBuffer );
-
-            if ( dwNumCopied && dwNumCopied < sizeof(pEnum->cBuffer) / sizeof(TCHAR) )
-            {
-                pEnum->lpCurrent = pEnum->cBuffer;
-                pEnum->lpIdent = L"tagDRIVEENUM";
-            }
-            else
-            {
-                HeapFree( GetProcessHeap(), 0, pEnum );
-                pEnum = NULL;
-            }
-        }
-        return pEnum ? (HANDLE)pEnum : INVALID_HANDLE_VALUE;
-    }
-
-    //##################################################### 
-    BOOL WINAPI EnumLogicalDrives(HANDLE hEnum, LPTSTR lpBuffer)
-    {
-        BOOL		fSuccess = FALSE;
-        LPDRIVEENUM	pEnum = (LPDRIVEENUM)hEnum;
-
-        if ( pEnum )
-        {
-            int	nLen = _tcslen( pEnum->lpCurrent );
-
-            if ( nLen )
-            {
-                CopyMemory( lpBuffer, pEnum->lpCurrent, (nLen + 1) * sizeof(TCHAR) );
-                pEnum->lpCurrent += nLen + 1;
-                fSuccess = TRUE;
-            }
-            else
-                SetLastError( ERROR_NO_MORE_FILES );
-        }
-        else
-            SetLastError( ERROR_INVALID_HANDLE );
-
-        return fSuccess;
-    }
-
-    //##################################################### 
-    BOOL WINAPI CloseLogicalDrivesEnum(HANDLE hEnum)
-    {
-        BOOL		fSuccess = FALSE;
-        LPDRIVEENUM	pEnum = (LPDRIVEENUM)hEnum;
-
-        if ( pEnum )
-        {
-            HeapFree( GetProcessHeap(), 0, pEnum );
-            fSuccess = TRUE;
-        }
-        else
-            SetLastError( ERROR_INVALID_HANDLE );
-
-        return fSuccess;
-    }
-
-    //#####################################################
-    //Undocumented in SHELL32.DLL ordinal 35 
-    BOOL WINAPI PathRemoveFileSpec(LPTSTR lpPath)
-    {
-        BOOL	fSuccess = FALSE;	// Assume failure
-        LPTSTR	lpLastBkSlash = _tcsrchr( lpPath, '\\' );
-        LPTSTR	lpLastSlash = _tcsrchr( lpPath, '/' );
-        LPTSTR	lpLastDelimiter = lpLastSlash > lpLastBkSlash ? lpLastSlash : lpLastBkSlash;
-
-        if ( lpLastDelimiter )
-        {
-            if ( 0 == *(lpLastDelimiter + 1) )
-            {
-                if ( lpLastDelimiter > lpPath && *(lpLastDelimiter - 1) != ':' )
-                {
-                    *lpLastDelimiter = 0;
-                    fSuccess = TRUE;
-                }
-            }
-            else
-            {
-                *(++lpLastDelimiter) = 0;
-                fSuccess = TRUE;
-            }
-        }
-        return fSuccess;
-    }
-        
-    //#####################################################
-    // Undocumented in SHELL32.DLL ordinal 32 
-    LPTSTR WINAPI PathAddBackslash(LPTSTR lpPath)
-    {
-        LPTSTR	lpEndPath = NULL;
-
-        if ( lpPath )
-        {
-            int		nLen = _tcslen(lpPath);
-
-            if ( !nLen || lpPath[nLen-1] != '\\' && lpPath[nLen-1] != '/' && nLen < MAX_PATH - 1 )
-            {
-                lpEndPath = lpPath + nLen;
-                *lpEndPath++ = '\\';
-                *lpEndPath = 0;
-            }
-        }
-        return lpEndPath;
-    }
-    
-#if 1
-    //#####################################################
-    // Same as GetLongPathName but also 95/NT4 
-    DWORD WINAPI GetCaseCorrectPathNameEx(
-        LPCTSTR	lpszShortPath,	// file name
-        LPTSTR	lpszLongPath,	// path buffer
-        DWORD	cchBuffer,		// size of path buffer 
-        DWORD	nSkipLevels
-    )
-    {
-//      log file doesn't work, because initialization of rtl log init() calls this method...
-//      RTL_LOGFILE_TRACE1( "SAL: GetCaseCorrectPathNameEx: %s (Skip:%n)", lpszShortPath,nSkipLevels );
-
-        TCHAR	szPath[MAX_PATH];
-        BOOL	fSuccess;
-
-        cchBuffer = cchBuffer; /* avoid warnings */
-        
-        _tcscpy( szPath, lpszShortPath );
-
-        fSuccess = PathRemoveFileSpec( szPath );
-
-        if ( fSuccess )
-        {		
-            int nLen = _tcslen( szPath );
-            LPCTSTR	lpszFileSpec = lpszShortPath + nLen;
-            BOOL	bSkipThis;
-
-            if ( 0 == _tcscmp( lpszFileSpec, TEXT("..") ) )
-            {
-                bSkipThis = TRUE;
-                nSkipLevels += 1;
-            }
-            else if ( 
-                0 == _tcscmp( lpszFileSpec, TEXT(".") ) || 
-                0 == _tcscmp( lpszFileSpec, TEXT("\\") ) ||
-                0 == _tcscmp( lpszFileSpec, TEXT("/") ) 
-                )
-            {
-                bSkipThis = TRUE;
-            }
-            else if ( nSkipLevels )
-            {
-                bSkipThis = TRUE;
-                nSkipLevels--;
-            }
-            else
-                bSkipThis = FALSE;
-
-            GetCaseCorrectPathNameEx( szPath, szPath, MAX_PATH, nSkipLevels );
-
-            PathAddBackslash( szPath );
-
-            /* Analyze parent if not only a trailing backslash was cutted but a real file spec */
-            if ( !bSkipThis )
-            {
-                WIN32_FIND_DATA	aFindFileData;
-                HANDLE	hFind = FindFirstFile( lpszShortPath, &aFindFileData );
-
-                if ( IsValidHandle(hFind) )
-                {
-                    _tcscat( szPath, aFindFileData.cFileName[0] ? aFindFileData.cFileName : aFindFileData.cAlternateFileName );
-
-                    FindClose( hFind );
-                }
-                else
-                    return 0;
-            }
-        }
-        else
-        {
-            /* File specification can't be removed therefore the short path is either a drive
-               or a network share. If still levels to skip are left, the path specification 
-               tries to travel below the file system root */
-            if ( nSkipLevels )
-                return 0;
-
-            _tcsupr( szPath );
-        }
-
-        _tcscpy( lpszLongPath, szPath );
-
-        return _tcslen( lpszLongPath );
-    }
-#endif
-
-#if 0
-    inline size_t wcstoupper( LPWSTR lpStr )
-    {
-        size_t nLen = wcslen( lpStr );
-
-        for ( LPWSTR p = lpStr; p < lpStr + nLen; p++ )
-        {
-            *p = towupper(*p);
-        }
-
-        return nLen;
-    }
-
-#endif
-
-    //##################################################### 
-    DWORD WINAPI GetCaseCorrectPathName(
-        LPCTSTR	lpszShortPath,	// file name
-        LPTSTR	lpszLongPath,	// path buffer
-        DWORD	cchBuffer		// size of path buffer 
-    )
-#if 0
-    {
-        /* Special handling for "\\.\" as system root */
-        if ( lpszShortPath && 0 == wcscmp( lpszShortPath, WSTR_SYSTEM_ROOT_PATH ) )
-        {
-            if ( cchBuffer >= ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) )
-            {
-                wcscpy( lpszLongPath, WSTR_SYSTEM_ROOT_PATH );
-                return ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1;
-            }
-            else
-                return ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH);
-        }
-        else
-        {
-            DWORD	nSrcLen = wcslen( lpszShortPath );
-
-            if ( cchBuffer > nSrcLen )
-            {
-                wcscpy( lpszLongPath, lpszShortPath );
-                wcstoupper( lpszLongPath );
-            }
-            else
-                nSrcLen++;
-
-            return nSrcLen;
-        }
-    }
-#else
-    {
-        /* Special handling for "\\.\" as system root */
-        if ( lpszShortPath && 0 == wcscmp( lpszShortPath, WSTR_SYSTEM_ROOT_PATH ) )
-        {
-            if ( cchBuffer >= ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) )
-            {
-                wcscpy( lpszLongPath, WSTR_SYSTEM_ROOT_PATH );
-                return ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1;
-            }
-            else
-                return ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1;
-        }
-        else
-            return GetCaseCorrectPathNameEx( lpszShortPath, lpszLongPath, cchBuffer, 0 );
-    }
-
-#endif
-
-    //#####################################################
-    #define	CHARSET_SEPARATOR	TEXT("\\/")
-
-    BOOL WINAPI IsValidFilePathComponent(
-        LPCTSTR lpComponent, LPCTSTR *lppComponentEnd, DWORD dwFlags)
-    {
-        LPCTSTR	lpComponentEnd = NULL;
-        LPCTSTR	lpCurrent = lpComponent;
-        BOOL	fValid = TRUE;	/* Assume success */
-        TCHAR	cLast = 0;
-
-        /* Path component length must not exceed MAX_PATH */
-
-        while ( !lpComponentEnd && lpCurrent && lpCurrent - lpComponent < MAX_PATH )
-        {
-            switch ( *lpCurrent )
-            {
-                /* Both backslash and slash determine the end of a path component */
-            case '\0':
-            case '/':
-            case '\\':
-                switch ( cLast )
-                {
-                    /* Component must not end with '.' or blank and can't be empty */
-
-                case '.':
-                    if ( dwFlags & VALIDATEPATH_ALLOW_ELLIPSE )
-                    {
-					    if ( (dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD) ||
-							 1 == lpCurrent - lpComponent )
-                        {
-						    /* Either do allow periods anywhere, or current directory */
-                            lpComponentEnd = lpCurrent;
-                            break;
-                        }
-                        else if ( 2 == lpCurrent - lpComponent && '.' == *lpComponent )
-                        {
-                            /* Parent directory is O.K. */
-                            lpComponentEnd = lpCurrent;
-                            break;
-                        }
-                    }
-                case 0:
-                case ' ':
-					if ( dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD )
-						lpComponentEnd = lpCurrent;
-					else
-					{
-						lpComponentEnd = lpCurrent - 1;
-						fValid = FALSE;
-					}
-                    break;
-                default:
-                    lpComponentEnd = lpCurrent;
-                    break;
-                }
-                break;
-                /* '?' and '*' are valid wildcards but not valid file name characters */
-            case '?':
-            case '*':
-                if ( dwFlags & VALIDATEPATH_ALLOW_WILDCARDS )
-                    break;
-                /* The following characters are reserved */
-            case '<':
-            case '>':
-            case '\"':
-            case '|':
-            case ':':
-                lpComponentEnd = lpCurrent;
-                fValid = FALSE;
-                break;
-            default:
-                /* Characters below ASCII 32 are not allowed */
-                if ( *lpCurrent < ' ' )
-                {
-                    lpComponentEnd = lpCurrent;
-                    fValid = FALSE;
-                }
-                break;
-            }
-            cLast = *lpCurrent++;
-        }
-
-        /*	If we don't reached the end of the component the length of the component was to long 
-            ( See condition of while loop ) */
-        if ( !lpComponentEnd )
-        {
-            fValid = FALSE;
-            lpComponentEnd = lpCurrent;
-        }
-
-        /* Test wether the component specifies a device name what is not allowed */
-        
-        // MT: PERFORMANCE: 
-        // This is very expensive. A lot of calls to _tcsicmp.
-        // in SRC6870m71 67.000 calls of this method while empty office start result into more than 1.500.00 calls of _tcsicmp!
-        // Possible optimizations
-        // - Array should be const static
-        // - Sorted array, use binary search
-        // - More intelligent check for com1-9, lpt1-9
-        // Maybe make szComponent upper case, don't search case intensitive
-        // Talked to HRO: Could be removed. Shouldn't be used in OOo, and if used for something like a filename, it will lead to an error anyway.
-        /*
-        if ( fValid )
-        {
-            LPCTSTR	alpDeviceNames[] =
-            {
-                TEXT("CON"),
-                TEXT("PRN"),
-                TEXT("AUX"),
-                TEXT("CLOCK$"),
-                TEXT("NUL"),
-                TEXT("LPT1"),
-                TEXT("LPT2"),
-                TEXT("LPT3"),
-                TEXT("LPT4"),
-                TEXT("LPT5"),
-                TEXT("LPT6"),
-                TEXT("LPT7"),
-                TEXT("LPT8"),
-                TEXT("LPT9"),
-                TEXT("COM1"),
-                TEXT("COM2"),
-                TEXT("COM3"),
-                TEXT("COM4"),
-                TEXT("COM5"),
-                TEXT("COM6"),
-                TEXT("COM7"),
-                TEXT("COM8"),
-                TEXT("COM9")
-            };
-            
-            TCHAR	szComponent[MAX_PATH];
-            int		nComponentLength;
-            LPCTSTR	lpDot;
-            int		i;
-
-            // A device name with an extension is also invalid
-            lpDot = _tcschr( lpComponent, '.' );
-
-            if ( !lpDot || lpDot > lpComponentEnd )
-                nComponentLength = lpComponentEnd - lpComponent;
-            else
-                nComponentLength = lpDot - lpComponent;
-
-            _tcsncpy( szComponent, lpComponent, nComponentLength );
-            szComponent[nComponentLength] = 0;
-
-            for ( i = 0; i < sizeof( alpDeviceNames ) / sizeof(LPCTSTR); i++ )
-            {
-                if ( 0 == _tcsicmp( szComponent, alpDeviceNames[i] ) )
-                {
-                    lpComponentEnd = lpComponent;
-                    fValid = FALSE;
-                    break;
-                }
-            }
-        }
-        */
-
-        if ( fValid )
-        {
-            // Empty components are not allowed
-            if ( lpComponentEnd - lpComponent < 1 )
-                fValid = FALSE;
-
-            // If we reached the end of the string NULL is returned
-            else if ( !*lpComponentEnd )
-                lpComponentEnd = NULL;
-
-        }
-
-        if ( lppComponentEnd )
-            *lppComponentEnd = lpComponentEnd;
-
-        return fValid;
-    }
-
-    //##################################################### 
-    DWORD WINAPI IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_uString **corrected)
-    {
-        LPCTSTR lpszPath = reinterpret_cast< LPCTSTR >(path->buffer);
-        LPCTSTR	lpComponent;
-        BOOL	fValid = TRUE;
-        DWORD	dwPathType = PATHTYPE_ERROR;
-
-        if ( dwFlags & VALIDATEPATH_ALLOW_RELATIVE )
-            dwFlags |= VALIDATEPATH_ALLOW_ELLIPSE;
-
-        if ( !lpszPath )
-        {
-            fValid = FALSE;
-            lpComponent = lpszPath;
-        }
-
-        /* Test for UNC path notation */
-        if ( 2 == _tcsspn( lpszPath, CHARSET_SEPARATOR ) )
-        {
-            /* Place the pointer behind the leading to backslashes */
-
-            lpComponent = lpszPath + 2;
-
-            fValid = IsValidFilePathComponent( lpComponent, &lpComponent, VALIDATEPATH_ALLOW_ELLIPSE );
-
-            /* So far we have a valid servername. Now let's see if we also have a network resource */
-
-            dwPathType = PATHTYPE_ABSOLUTE_UNC;
-
-            if ( fValid )
-            {
-                if ( lpComponent &&	 !*++lpComponent )
-                    lpComponent = NULL;
-                
-                if ( !lpComponent )
-                {
-    #if 0
-                    /* We only have a Server specification what is invalid */
-
-                    lpComponent = lpszPath;
-                    fValid = FALSE;
-    #else
-                    dwPathType |= PATHTYPE_IS_SERVER;
-    #endif
-                }
-                else
-                {
-                    /* Now test the network resource */
-
-                    fValid = IsValidFilePathComponent( lpComponent, &lpComponent, 0 );
-
-                    /* If we now reached the end of the path, everything is O.K. */
-
-
-                    if ( fValid && (!lpComponent || lpComponent && !*++lpComponent ) )
-                    {
-                        lpComponent = NULL;
-                        dwPathType |= PATHTYPE_IS_VOLUME;
-                    }
-                }
-            }
-        }
-
-        /* Local path verification. Must start with <drive>: */
-        else if ( _istalpha( lpszPath[0] ) && ':' == lpszPath[1] )
-        {
-            /* Place pointer behind correct drive specification */
-
-            lpComponent = lpszPath + 2;
-
-            if ( 1 == _tcsspn( lpComponent, CHARSET_SEPARATOR ) )
-                lpComponent++;
-            else if ( *lpComponent )
-                fValid = FALSE;
-
-            dwPathType = PATHTYPE_ABSOLUTE_LOCAL;
-
-            /* Now we are behind the backslash or it was a simple drive without backslash */
-
-            if ( fValid && !*lpComponent )
-            {
-                lpComponent = NULL;
-                dwPathType |= PATHTYPE_IS_VOLUME;
-            }
-        }
-
-        /* Can be a relative path */
-        else if ( dwFlags & VALIDATEPATH_ALLOW_RELATIVE )
-        {
-            lpComponent = lpszPath;
-
-            /* Relative path can start with a backslash */
-
-            if ( 1 == _tcsspn( lpComponent, CHARSET_SEPARATOR ) )
-            {
-                lpComponent++;
-                if ( !*lpComponent )
-                    lpComponent = NULL;
-            }
-
-            dwPathType = PATHTYPE_RELATIVE;
-        }
-
-        /* Anything else is an error */
-        else
-        {
-            fValid = FALSE;
-            lpComponent = lpszPath;
-        }
-
-        /* Now validate each component of the path */
-        while ( fValid && lpComponent )
-        {
-            // Correct path by merging consecutive slashes:
-            if (*lpComponent == '\\' && corrected != NULL) {
-                sal_Int32 i = lpComponent - lpszPath;
-                rtl_uString_newReplaceStrAt(corrected, path, i, 1, NULL);
-                    //TODO: handle out-of-memory
-                lpszPath = reinterpret_cast< LPCTSTR >((*corrected)->buffer);
-                lpComponent = lpszPath + i;
-            }
-
-		    fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags | VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD);
-
-            if ( fValid && lpComponent )
-            {
-                lpComponent++;
-
-                /* If the string behind the backslash is empty, we've done */
-
-                if ( !*lpComponent )
-                    lpComponent = NULL;
-            }
-        }
-        
-        if ( fValid && _tcslen( lpszPath ) >= MAX_PATH )
-        {
-            fValid = FALSE;
-            lpComponent = lpszPath + MAX_PATH;
-        }
-
-        if ( lppError )
-            *lppError = lpComponent;
-
-        return fValid ? dwPathType : PATHTYPE_ERROR;
-    }
-
-    //#####################################################
-    bool is_floppy_drive(const rtl::OUString& path);
-    
-    //#####################################################
-    struct Component
-    {       
-        Component() : 
-            begin_(0), end_(0)
-        {}
-
-        bool isPresent() const
-        { return (static_cast<sal_Int32>(end_ - begin_) > 0); }        
-        
-        const sal_Unicode* begin_;
-        const sal_Unicode* end_;
-    };
-                    
-    //#####################################################
-    struct UNCComponents
-    {                        
-        Component server_;
-        Component share_;
-        Component resource_;
-    };
-    
-    //#####################################################
-    const wchar_t UNC_PREFIX[] = L"\\\\";
-    const wchar_t BACKSLASH = '\\';
-    const wchar_t SLASH = '/';
-                                   
-    bool is_UNC_path(const sal_Unicode* path)
-    { return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast<LPCWSTR>(path), ELEMENTS_OF_ARRAY(UNC_PREFIX) - 1)); }   
-    
-    //#####################################################
-    bool is_UNC_path(const rtl::OUString& path)
-    { return is_UNC_path(path.getStr()); }
-    
-    //#####################################################
-    void parse_UNC_path(const sal_Unicode* path, UNCComponents* puncc)
-    {                
-        OSL_PRECOND(is_UNC_path(path), "Precondition violated: No UNC path");
-        OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) != -1, "Path must not contain slashes");
-                        
-        const sal_Unicode* pend = path + rtl_ustr_getLength(path);
-        const sal_Unicode* ppos = path + 2;
-                
-        puncc->server_.begin_ = ppos;                                    
-        while ((ppos < pend) && (*ppos != BACKSLASH))
-            ppos++;
-        
-        puncc->server_.end_ = ppos;
-        
-        if (BACKSLASH == *ppos)    
-        {                                                
-            puncc->share_.begin_ = ++ppos;                                
-            while ((ppos < pend) && (*ppos != BACKSLASH))
-                ppos++;
-                
-            puncc->share_.end_ = ppos;
-                                        
-            if (BACKSLASH == *ppos)
-            {                                                                                                                                                                               
-                puncc->resource_.begin_ = ++ppos;                                                        
-                while (ppos < pend)
-                    ppos++;
-                
-                puncc->resource_.end_ = ppos;
-            }                                 
-        }     
-        
-        OSL_POSTCOND(puncc->server_.isPresent() && puncc->share_.isPresent(), \
-        "Postcondition violated: Invalid UNC path detected");   
-    }
-    
-    //#####################################################
-    void parse_UNC_path(const rtl::OUString& path, UNCComponents* puncc)
-    { parse_UNC_path(path.getStr(), puncc); }
-    
-    //#####################################################
-    bool is_volume_mount_point(const rtl::OUString& path)
-    {
-        rtl::OUString p(path);        
-        osl::systemPathRemoveSeparator(p);
-            
-        bool  is_volume_root = false;
-        
-        if (!is_floppy_drive(p))
-        {
-            DWORD fattr = GetFileAttributes(reinterpret_cast<LPCTSTR>(p.getStr()));
-            
-            if ((INVALID_FILE_ATTRIBUTES != fattr) && 
-                (FILE_ATTRIBUTE_REPARSE_POINT & fattr))
-            {
-                WIN32_FIND_DATA find_data;
-                HANDLE h_find = FindFirstFile(reinterpret_cast<LPCTSTR>(p.getStr()), &find_data);    
-                           
-                if (IsValidHandle(h_find) &&
-                    (FILE_ATTRIBUTE_REPARSE_POINT & find_data.dwFileAttributes) && 
-                    (IO_REPARSE_TAG_MOUNT_POINT == find_data.dwReserved0))
-                {            
-                    is_volume_root = true;
-                }        
-                if (IsValidHandle(h_find))
-                    FindClose(h_find);
-            }
-        }
-        return is_volume_root;
-    }
-        
-    //#####################################################
-    // Has the given path a parent or are we already there, 
-    // e.g. 'c:\' or '\\server\share\'?
-    bool has_path_parent(const sal_Unicode* path)
-    {                
-        bool has_parent = false;
-        
-        if (is_UNC_path(path))
-        {
-            UNCComponents unc_comp;
-            parse_UNC_path(path, &unc_comp);                        
-            has_parent = unc_comp.resource_.isPresent();
-        }
-        else 
-        {
-            has_parent = !osl::systemPathIsLogicalDrivePattern(path);
-        }
-        return has_parent;
-    }
-    
-    //#####################################################
-    // @see bool has_path_parent(const sal_Unicode* path)
-    bool has_path_parent(const rtl::OUString& path)
-    { return has_path_parent(path.getStr()); }
-    
-    //#####################################################
-    bool path_get_parent(rtl::OUString& path)
-    {   
-        OSL_PRECOND(path.lastIndexOf(SLASH) == -1, "Path must not have slashes");
-        
-        if (!has_path_parent(path))
-        {
-            sal_Int32 i = path.lastIndexOf(BACKSLASH);                        
-            if (-1 < i)
-            {
-                path = rtl::OUString(path.getStr(), i);
-                return true;                    
-            }
-        }
-        return false;
-    }
-    
-    //#############################################
-    /*  Cut off the last part of the given path to 
-    get the parent only, e.g. 'c:\dir\subdir' -> 
-    'c:\dir' or '\\share\sub\dir' -> '\\share\sub'
-    @return The position where the path has been cut 
-    off (this is the posistion of the last backslash).
-    If there are no more parents 0 will be returned, 
-    e.g. 'c:\' or '\\Share' have no more parents */        
-    int path_make_parent(sal_Unicode* path)
-    {    
-        OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) != -1, "Path must not contain slashes");
-        OSL_PRECOND(has_path_parent(path), "Path must have a parent");                
-                    
-        sal_Unicode* pos_last_backslash = path + rtl_ustr_lastIndexOfChar(path, BACKSLASH);
-        *pos_last_backslash = 0; 
-        return (pos_last_backslash - path);        
-    }
-    
-    //##################################################### 
-    void path_travel_to_volume_root(const rtl::OUString& system_path, rtl::OUString& volume_root)
-    {
-        rtl::OUString sys_path(system_path);
-        
-        while(!is_volume_mount_point(sys_path) && path_get_parent(sys_path))
-            /**/;
-        
-        volume_root = sys_path;
-        osl_systemPathEnsureSeparator(&volume_root.pData);                            
-    } 
-    
-    //#####################################################
-    inline bool is_floppy_A_present()
-    { return (GetLogicalDrives() & 1); }
-    
-    //#####################################################
-    inline bool is_floppy_B_present()
-    { return (GetLogicalDrives() & 2); }
-    
-    //#####################################################
-    // determines if a volume mount point shows to a floppy
-    // disk by comparing the unique volume names           
-    const LPWSTR FLOPPY_A = L"A:\\";
-    const LPWSTR FLOPPY_B = L"B:\\";
-    
-    bool is_floppy_volume_mount_point(const rtl::OUString& path)
-    {                   
-        rtl::OUString p(path);
-        osl_systemPathEnsureSeparator(&p.pData);
-        
-        TCHAR vn[51];
-        if (GetVolumeNameForVolumeMountPoint(reinterpret_cast<LPCTSTR>(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
-        {       
-            TCHAR vnfloppy[51];
-            if (is_floppy_A_present() && 
-                GetVolumeNameForVolumeMountPoint(FLOPPY_A, vnfloppy, ELEMENTS_OF_ARRAY(vnfloppy)) &&
-                (0 == wcscmp(vn, vnfloppy)))
-                return true;
-                    
-            if (is_floppy_B_present() &&
-                GetVolumeNameForVolumeMountPoint(FLOPPY_B, vnfloppy, ELEMENTS_OF_ARRAY(vnfloppy)) &&
-                (0 == wcscmp(vn, vnfloppy)))
-                return true;
-        }   
-        return false;
-    }
-    
-    //################################################
-    // we must take into account that even a floppy 
-    // drive may be mounted to a directory so checking
-    // for the drive letter alone is not sufficient
-    // we must compare the unique volume name with 
-    // that of the available floppy disks
-    LPCWSTR FLOPPY_DRV_LETTERS = TEXT("AaBb"); 
-       
-    bool is_floppy_drive(const rtl::OUString& path)
-    {
-        const sal_Unicode* pf = path.getStr();
-        const sal_Unicode* ps = path.getStr() + 1;        
-        return ((wcschr(FLOPPY_DRV_LETTERS, *pf) && (L':' == *ps)) ||
-                is_floppy_volume_mount_point(path));                
-    }
-    
-    //#############################################
-    UINT get_volume_mount_point_drive_type(const rtl::OUString& path)
-    {        
-        if (0 == path.getLength())
-            return GetDriveType(NULL);
-        
-        rtl::OUString p(path);
-        osl_systemPathEnsureSeparator(&p.pData);
-        
-        TCHAR vn[51];  
-        if (GetVolumeNameForVolumeMountPoint(reinterpret_cast<LPCTSTR>(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
-            return GetDriveType(vn);
-        
-        return DRIVE_NO_ROOT_DIR;  
-    }
-    
-    //#############################################
-    oslFileError osl_get_drive_type(const rtl::OUString& path, oslVolumeInfo* pInfo)
-    {
-        // GetDriveType fails on empty volume mount points
-        // see Knowledge Base Q244089
-        UINT drive_type;
-        if (is_volume_mount_point(path))
-            drive_type = get_volume_mount_point_drive_type(path);
-        else
-            drive_type = GetDriveType(reinterpret_cast<LPCTSTR>(path.getStr()));
-        
-        if (DRIVE_NO_ROOT_DIR == drive_type)
-            return MapError(ERROR_INVALID_DRIVE);
-                
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;		
-
-        switch (drive_type)
-        {
-        case DRIVE_CDROM:
-            pInfo->uAttributes |= osl_Volume_Attribute_CompactDisc | osl_Volume_Attribute_Removeable;
-            break;
-        case DRIVE_REMOVABLE:
-            pInfo->uAttributes |= osl_Volume_Attribute_Removeable;
-            if (is_floppy_drive(path))
-                pInfo->uAttributes |= osl_Volume_Attribute_FloppyDisk;
-            break;
-        case DRIVE_FIXED:
-            pInfo->uAttributes |= osl_Volume_Attribute_FixedDisk;
-            break;
-        case DRIVE_RAMDISK:
-            pInfo->uAttributes |= osl_Volume_Attribute_RAMDisk;
-            break;
-        case DRIVE_REMOTE:
-            pInfo->uAttributes |= osl_Volume_Attribute_Remote;
-            break;
-        case DRIVE_UNKNOWN:
-            pInfo->uAttributes = 0;
-            break;		
-        default:
-            pInfo->uValidFields &= ~osl_VolumeInfo_Mask_Attributes;
-            pInfo->uAttributes = 0;
-            break;
-        }	
-        return osl_File_E_None;    
-    }
-    
-    //#############################################
-    inline bool is_volume_space_info_request(sal_uInt32 field_mask)
-    {
-        return (field_mask & 
-                (osl_VolumeInfo_Mask_TotalSpace | 
-                 osl_VolumeInfo_Mask_UsedSpace  | 
-                 osl_VolumeInfo_Mask_FreeSpace));
-    }
-    
-    //#############################################
-    void get_volume_space_information(const rtl::OUString& path, oslVolumeInfo *pInfo)
-    {
-        BOOL ret = GetDiskFreeSpaceEx(
-            reinterpret_cast<LPCTSTR>(path.getStr()), 
-            (PULARGE_INTEGER)&pInfo->uFreeSpace, 
-            (PULARGE_INTEGER)&pInfo->uTotalSpace, 
-            NULL);
-            
-        if (ret)
-        {			    			    
-            pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace | 
-                                   osl_VolumeInfo_Mask_UsedSpace | 
-                                   osl_VolumeInfo_Mask_FreeSpace;
-        }
-    }
-    
-    //#############################################
-    inline bool is_filesystem_attributes_request(sal_uInt32 field_mask)
-    {
-        return (field_mask & 
-                (osl_VolumeInfo_Mask_MaxNameLength | 
-                 osl_VolumeInfo_Mask_MaxPathLength | 
-                 osl_VolumeInfo_Mask_FileSystemName | 
-                 osl_VolumeInfo_Mask_FileSystemCaseHandling));
-    }
-    
-    //#############################################
-    inline bool is_drivetype_request(sal_uInt32 field_mask)
-    {
-        return (field_mask & osl_VolumeInfo_Mask_Attributes);
-    }
-    
-    //#############################################
-    oslFileError get_filesystem_attributes(const rtl::OUString& path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
-    {
-        pInfo->uAttributes = 0;
-        
-        oslFileError osl_error = osl_File_E_None;
-        
-        // osl_get_drive_type must be called first because
-        // this function resets osl_VolumeInfo_Mask_Attributes
-        // on failure
-        if (is_drivetype_request(field_mask))
-            osl_error = osl_get_drive_type(path, pInfo);
-                
-        if ((osl_File_E_None == osl_error) && is_filesystem_attributes_request(field_mask))
-        {
-            WCHAR vn[MAX_PATH];
-            WCHAR fsn[MAX_PATH];
-            DWORD serial;
-            DWORD mcl;
-            DWORD flags;
-            
-            if (GetVolumeInformation(reinterpret_cast<LPCTSTR>(path.getStr()), vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH))
-            {		
-                pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxNameLength;
-                pInfo->uMaxNameLength  = mcl;
-            
-                pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxPathLength;
-                pInfo->uMaxPathLength  = MAX_PATH;
-
-                pInfo->uValidFields   |= osl_VolumeInfo_Mask_FileSystemName;
-                rtl_uString_newFromStr(&pInfo->ustrFileSystemName, reinterpret_cast<const sal_Unicode*>(fsn));
-                
-                // volumes (even NTFS) will always be considered case
-                // insensitive because the Win32 API is not able to
-                // deal with case sensitive volumes see M$ Knowledge Base
-                // article 100625 that's why we never set the attribute
-                // osl_Volume_Attribute_Case_Sensitive
-                
-                if (flags & FS_CASE_IS_PRESERVED)
-                    pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
-                    
-                pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
-            }
-        }
-        return osl_error;
-    }
-    
-    //#############################################
-    // Create the specified directory and call the 
-    // user specified callback function. On success
-    // the function returns ERROR_SUCCESS else a
-    // Win32 error code.
-    DWORD create_dir_with_callback(
-        sal_Unicode* dir_path,
-        oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
-        void* pData)
-    {
-        if (CreateDirectory(reinterpret_cast<LPCTSTR>(dir_path), NULL))
-        {
-            if (aDirectoryCreationCallbackFunc)
-            {
-                rtl::OUString url;                
-                FileBase::getFileURLFromSystemPath(dir_path, url);                                                
-                aDirectoryCreationCallbackFunc(pData, url.pData);
-            }                
-            return ERROR_SUCCESS;
-        }
-        return GetLastError();
-    }
-
-    //#############################################
-    DWORD create_dir_recursively_(
-        sal_Unicode* dir_path,
-        oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
-        void* pData)
-    {        
-        OSL_PRECOND(rtl_ustr_getLength(dir_path) > 0 && (rtl_ustr_lastIndexOfChar(dir_path, BACKSLASH) != rtl_ustr_getLength(dir_path) - 1), \
-        "Path must not end with a backslash");
-        
-        DWORD w32_error = create_dir_with_callback(
-            dir_path, aDirectoryCreationCallbackFunc, pData);
-        
-        if (w32_error == ERROR_SUCCESS)
-            return ERROR_SUCCESS;   
-                                
-        if ((w32_error != ERROR_PATH_NOT_FOUND) || !has_path_parent(dir_path))
-            return w32_error;
-                                    
-        int pos = path_make_parent(dir_path);
-                            
-        w32_error = create_dir_recursively_(
-            dir_path, aDirectoryCreationCallbackFunc, pData);
-                    
-        if (ERROR_SUCCESS != w32_error)
-            return w32_error;
-                    
-        dir_path[pos] = BACKSLASH;
-                               
-        return create_dir_recursively_(
-            dir_path, aDirectoryCreationCallbackFunc, pData);     
-    }
-    
-    //#####################################################
-    // Temp file 
-    //#####################################################
-        
-        
-    //#####################################################
-    oslFileError osl_setup_base_directory_impl_(
-        rtl_uString*  pustrDirectoryURL,
-        rtl_uString** ppustr_base_dir)
-    {    
-        rtl_uString* dir_url = 0;
-        rtl_uString* dir     = 0;        
-        oslFileError error   = osl_File_E_None;
-        
-        if (pustrDirectoryURL)
-            rtl_uString_assign(&dir_url, pustrDirectoryURL);         
-        else 
-            error = osl_getTempDirURL(&dir_url);                     	    	           				
-
-        if (osl_File_E_None == error)        
-        {
-        error = _osl_getSystemPathFromFileURL(dir_url, &dir, sal_False);                           
-        rtl_uString_release(dir_url);
-        }
-              
-        if (osl_File_E_None == error )
-        {
-            rtl_uString_assign(ppustr_base_dir, dir);        
-            rtl_uString_release(dir);
-        }
-        
-        return error;	
-    }
-
-    //#####################################################
-    oslFileError osl_setup_createTempFile_impl_(
-        rtl_uString*   pustrDirectoryURL,
-        oslFileHandle* pHandle,
-        rtl_uString**  ppustrTempFileURL,
-        rtl_uString**  ppustr_base_dir,
-        sal_Bool*      b_delete_on_close)
-    {
-        oslFileError osl_error;
-        
-        OSL_PRECOND(((0 != pHandle) || (0 != ppustrTempFileURL)), "Invalid parameter!");
-            
-        if ((0 == pHandle) && (0 == ppustrTempFileURL))    
-        {
-            osl_error = osl_File_E_INVAL;
-        }
-        else
-        {        
-            osl_error = osl_setup_base_directory_impl_(
-                pustrDirectoryURL, ppustr_base_dir);
-                
-            *b_delete_on_close = (sal_Bool)(0 == ppustrTempFileURL);
-        }
-           
-        return osl_error;
-    }
-
-    //#####################################################
-    oslFileError osl_win32_GetTempFileName_impl_(
-        rtl_uString* base_directory, LPWSTR temp_file_name)
-    {
-        oslFileError osl_error = osl_File_E_None;
-           
-        if (0 == GetTempFileNameW(
-                reinterpret_cast<LPCWSTR>(rtl_uString_getStr(base_directory)),
-                L"",
-                0,
-                temp_file_name))
-        {    
-            osl_error = MapError(GetLastError());
-        }
-           
-        return osl_error;
-    }
-
-    //#####################################################
-    sal_Bool osl_win32_CreateFile_impl_(
-        LPCWSTR file_name, sal_Bool b_delete_on_close, oslFileHandle* p_handle)
-    {
-        DWORD  flags = FILE_ATTRIBUTE_NORMAL;
-        HANDLE hFile;
-        
-        OSL_ASSERT(p_handle);
-        
-        if (b_delete_on_close)
-            flags |= FILE_FLAG_DELETE_ON_CLOSE;
-            
-        hFile = CreateFileW(
-            file_name,
-            GENERIC_READ | GENERIC_WRITE,
-            0,  
-            NULL, 
-            TRUNCATE_EXISTING, 
-            flags,
-            NULL);
-                
-        if (IsValidHandle(hFile))        
-            *p_handle = (oslFileHandle)hFile;
-        
-        return (sal_Bool)IsValidHandle(hFile);
-    }
-
-    //############################################# 
-    oslFileError osl_createTempFile_impl_(
-        rtl_uString*   base_directory, 
-        LPWSTR         tmp_name,
-        sal_Bool       b_delete_on_close,
-        oslFileHandle* pHandle,
-        rtl_uString**  ppustrTempFileURL)
-    {
-        oslFileError osl_error;
-        
-        do
-        {       
-            osl_error = osl_win32_GetTempFileName_impl_(base_directory, tmp_name);
-            
-            /*  if file could not be opened try again */                                                     
-                
-            if ((osl_File_E_None != osl_error) || (0 == pHandle) || 
-                osl_win32_CreateFile_impl_(tmp_name, b_delete_on_close, pHandle)) 
-                break;
-                                                                        
-        } while(1); // try until success
-            
-        if ((osl_File_E_None == osl_error) && !b_delete_on_close)        
-        {
-            rtl_uString* pustr = 0;                
-            rtl_uString_newFromStr(&pustr, reinterpret_cast<const sal_Unicode*>(tmp_name));        
-            osl_getFileURLFromSystemPath(pustr, ppustrTempFileURL);
-            rtl_uString_release(pustr);
-        }
-        
-        return osl_error;
-    }
-    
-    //#####################################################
-    // End Temp file 
-    //#####################################################
-
-        
-    //############################################# 
-    sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedURL )
-    {
-        sal_Char		*pBuffer;
-        const sal_Char	*pSrcEnd;
-        const sal_Char	*pSrc;
-        sal_Char		*pDest;
-        sal_Int32		nSrcLen;
-        sal_Bool		bValidEncoded = sal_True;	/* Assume success */
-
-        /* The resulting decoded string length is shorter or equal to the source length */
-
-        nSrcLen = rtl_string_getLength(strUTF8);
-        pBuffer = reinterpret_cast<sal_Char*>(rtl_allocateMemory(nSrcLen + 1));
-
-        pDest = pBuffer;
-        pSrc = rtl_string_getStr(strUTF8);
-        pSrcEnd = pSrc + nSrcLen;
-
-        /* Now decode the URL what should result in an UTF8 string */
-        while ( bValidEncoded && pSrc < pSrcEnd )
-        {
-            switch ( *pSrc )
-            {
-            case '%':
-                {
-                    sal_Char	aToken[3];
-                    sal_Char	aChar;
-
-                    pSrc++;
-                    aToken[0] = *pSrc++;
-                    aToken[1] = *pSrc++;
-                    aToken[2] = 0;
-
-                    aChar = (sal_Char)strtoul( aToken, NULL, 16 );
-
-                    /* The chars are path delimiters and must not be encoded */
-
-                    if ( 0 == aChar || '\\' == aChar || '/' == aChar || ':' == aChar )
-                        bValidEncoded = sal_False;
-                    else
-                        *pDest++ = aChar;
-                }
-                break;
-            default:
-                *pDest++ = *pSrc++;
-                break;
-            }
-        }
-
-        *pDest++ = 0;
-        
-        if ( bValidEncoded ) {
-            rtl_string2UString( pstrDecodedURL, pBuffer, rtl_str_getLength(pBuffer), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
-            OSL_ASSERT(*pstrDecodedURL != 0);
-        }
-        
-        rtl_freeMemory( pBuffer );
-
-        return bValidEncoded;
-    }
-
-    //############################################# 
-    void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
-    {
-        /* Encode non ascii characters within the URL */
-
-        rtl_String		*strUTF8 = NULL;
-        sal_Char		*pszEncodedURL;
-        const sal_Char	*pURLScan;
-        sal_Char		*pURLDest;
-        sal_Int32		nURLScanLen;
-        sal_Int32		nURLScanCount;
-        
-        rtl_uString2String( &strUTF8, rtl_uString_getStr( strURL ), rtl_uString_getLength( strURL ), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
-
-        pszEncodedURL = (sal_Char*) rtl_allocateMemory( (rtl_string_getLength( strUTF8 ) * 3 + 1)  * sizeof(sal_Char) );
-
-        pURLDest = pszEncodedURL;
-        pURLScan = rtl_string_getStr( strUTF8 );
-        nURLScanLen = rtl_string_getLength( strUTF8 );
-        nURLScanCount = 0;
-
-        while ( nURLScanCount < nURLScanLen )
-        {
-            sal_Char	cCurrent = *pURLScan;
-
-            switch ( cCurrent )
-            {
-            default:
-                if (!( ( cCurrent >= 'a' && cCurrent <= 'z' ) || ( cCurrent >= 'A' && cCurrent <= 'Z' ) || ( cCurrent >= '0' && cCurrent <= '9' ) ) )
-                {
-                    sprintf( pURLDest, "%%%02X", (unsigned char)cCurrent );
-                    pURLDest += 3;
-                    break;
-                }
-            case '!':
-            case '\'':
-            case '(':
-            case ')':
-            case '*':
-            case '-':
-            case '.':
-            case '_':
-            case '~':
-            case '$':
-            case '&':
-            case '+':
-            case ',':
-            case '=':
-            case '@':
-            case ':':
-            case '/':
-            case '\\':
-            case '|':
-                *pURLDest++ = cCurrent;
-                break;
-            case 0:
-                break;
-            }
-
-            pURLScan++;
-            nURLScanCount++;
-        }
-
-
-        *pURLDest = 0;	    
-
-        rtl_string_release( strUTF8 );        	  
-        rtl_string_newFromStr( pstrEncodedURL, pszEncodedURL );	    
-        rtl_freeMemory( pszEncodedURL );
-    }
-
-    //#############################################      
-    oslFileError SAL_CALL _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **pustrPath, sal_Bool bAllowRelative )
-    {
-        rtl_String			*strUTF8 = NULL;
-        rtl_uString			*strDecodedURL = NULL;
-        rtl_uString			*strTempPath = NULL;
-        const sal_Unicode	*pDecodedURL;
-        sal_uInt32			nDecodedLen;
-        sal_Bool			bValidEncoded;
-        oslFileError		nError = osl_File_E_INVAL;	/* Assume failure */
-
-        /*  If someone hasn't encoded the complete URL we convert it to UTF8 now to prevent from
-            having a mixed encoded URL later */
-
-        rtl_uString2String( &strUTF8, rtl_uString_getStr( strURL ), rtl_uString_getLength( strURL ), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
-
-        /* If the length of strUTF8 and strURL differs it indicates that the URL was not correct encoded */
-
-        OSL_ENSURE_FILE( 
-            strUTF8->length == strURL->length || 
-            0 != rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( strURL->buffer, strURL->length, "file:\\\\", 7 )
-            ,"osl_getSystemPathFromFileURL: \"%s\" is not encoded !!!", strURL );
-
-        bValidEncoded = _osl_decodeURL( strUTF8, &strDecodedURL );
-
-        /* Release the encoded UTF8 string */
-
-        rtl_string_release( strUTF8 );
-
-
-        if ( bValidEncoded )
-        {
-            /* Replace backslashes and pipes */
-
-            rtl_uString_newReplace( &strDecodedURL, strDecodedURL, '/', '\\' );
-            rtl_uString_newReplace( &strDecodedURL, strDecodedURL, '|', ':' );
-
-            pDecodedURL = rtl_uString_getStr( strDecodedURL );
-            nDecodedLen = rtl_uString_getLength( strDecodedURL );
-
-            /* Must start with "file://" */
-
-            if ( 0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\", 7 ) )
-            {
-                sal_uInt32	nSkip;
-
-                if ( 0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\\\", 8 ) )
-                    nSkip = 8;
-                else if ( 
-                    0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\localhost\\", 17 ) ||
-                    0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\127.0.0.1\\", 17 ) 
-                )
-                    nSkip = 17;
-                else 
-                    nSkip = 5;
-
-                /* Indicates local root */
-                if ( nDecodedLen == nSkip )
-                    rtl_uString_newFromStr_WithLength( &strTempPath, reinterpret_cast<const sal_Unicode*>(WSTR_SYSTEM_ROOT_PATH), ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1 );
-                else
-                    rtl_uString_newFromStr_WithLength( &strTempPath, pDecodedURL + nSkip, nDecodedLen - nSkip );
-
-                if ( IsValidFilePath( strTempPath, NULL, VALIDATEPATH_ALLOW_ELLIPSE, &strTempPath ) )
-                    nError = osl_File_E_None;
-            }
-            else if ( bAllowRelative )	/* This maybe a relative file URL */
-            {
-                rtl_uString_assign( &strTempPath, strDecodedURL );
-
-                if ( IsValidFilePath( strTempPath, NULL, VALIDATEPATH_ALLOW_RELATIVE | VALIDATEPATH_ALLOW_ELLIPSE, &strTempPath ) )
-                    nError = osl_File_E_None;
-            }
-        /*
-            else
-                OSL_ENSURE_FILE( !nError, "osl_getSystemPathFromFileURL: \"%s\" is not an absolute FileURL !!!", strURL );
-         */
-
-        }
-        
-        if ( strDecodedURL )
-            rtl_uString_release( strDecodedURL );
-            
-        if ( osl_File_E_None == nError )
-            rtl_uString_assign( pustrPath, strTempPath );
-      
-        if ( strTempPath )
-            rtl_uString_release( strTempPath );
-
-        /*
-        OSL_ENSURE_FILE( !nError, "osl_getSystemPathFromFileURL: \"%s\" is not a FileURL !!!", strURL );
-        */
-
-        return nError;
-    }
-
-    //#############################################      
-    oslFileError SAL_CALL _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** pstrURL )
-    {
-        oslFileError nError = osl_File_E_INVAL; /* Assume failure */
-        rtl_uString	*strTempURL = NULL;
-        DWORD dwPathType = PATHTYPE_ERROR;
-
-        if (strPath)
-            dwPathType = IsValidFilePath(strPath, NULL, VALIDATEPATH_ALLOW_RELATIVE, NULL);
-                
-        if (dwPathType)
-        {
-            rtl_uString	*strTempPath = NULL;
-
-            /* Replace backslashes */
-
-            rtl_uString_newReplace( &strTempPath, strPath, '\\', '/' );
-
-            switch ( dwPathType & PATHTYPE_MASK_TYPE )
-            {
-            case PATHTYPE_RELATIVE:
-                rtl_uString_assign( &strTempURL, strTempPath );
-                nError = osl_File_E_None;
-                break;
-            case PATHTYPE_ABSOLUTE_UNC:
-                rtl_uString_newFromAscii( &strTempURL, "file:" );
-                rtl_uString_newConcat( &strTempURL, strTempURL, strTempPath );
-                nError = osl_File_E_None;
-                break;
-            case PATHTYPE_ABSOLUTE_LOCAL:
-                rtl_uString_newFromAscii( &strTempURL, "file:///" );
-                rtl_uString_newConcat( &strTempURL, strTempURL, strTempPath );
-                nError = osl_File_E_None;
-                break;
-            default:
-                break;
-            }
-
-            /* Release temp path */
-
-            rtl_uString_release( strTempPath );
-        }
-
-        if ( osl_File_E_None == nError )
-        {
-            rtl_String	*strEncodedURL = NULL;
-
-            /* Encode the URL */
-
-            _osl_encodeURL( strTempURL, &strEncodedURL );
-
-            /* Provide URL via unicode string */
-
-            rtl_string2UString( pstrURL, rtl_string_getStr(strEncodedURL), rtl_string_getLength(strEncodedURL), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-            OSL_ASSERT(*pstrURL != 0);
-            rtl_string_release( strEncodedURL );
-        }
-
-        /* Release temp URL */
-
-        if ( strTempURL )
-            rtl_uString_release( strTempURL );
-
-        /*
-        OSL_ENSURE_FILE( !nError, "osl_getFileURLFromSystemPath: \"%s\" is not a systemPath !!!", strPath );
-        */
-
-        return nError;
-    }
-               
-#if OSL_DEBUG_LEVEL > 0
-
-    //##################################################### 
-    void _osl_warnFile( const char *message, rtl_uString *ustrFile )
-    {
-        char szBuffer[2048];
-
-        if (ustrFile)
-        {
-            rtl_String	*strFile = NULL;
-
-            rtl_uString2String( &strFile, rtl_uString_getStr( ustrFile ), rtl_uString_getLength( ustrFile ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
-            snprintf( szBuffer, sizeof(szBuffer), message, strFile->buffer );
-            rtl_string_release( strFile );
-
-            message = szBuffer;
-        }
-        OSL_ENSURE( 0, message );
-    }
-
-#endif // OSL_DEBUG_LEVEL > 0
-            
-} // end namespace private 
-
-
-//#####################################################
-// Exported OSL API
-//#####################################################
-          
-           
-//#############################################
-oslFileError SAL_CALL osl_getVolumeInformation( 
-    rtl_uString *ustrURL, oslVolumeInfo *pInfo, sal_uInt32 uFieldMask )
-{			
-    if (!pInfo)
-        return osl_File_E_INVAL;
-
-    rtl::OUString system_path;		
-    oslFileError error = _osl_getSystemPathFromFileURL(ustrURL, &system_path.pData, sal_False);
-    
-    if (osl_File_E_None != error)
-        return error;
-    
-    rtl::OUString volume_root;
-    path_travel_to_volume_root(system_path, volume_root);        
-                
-    pInfo->uValidFields = 0;
-    
-    if ((error = get_filesystem_attributes(volume_root, uFieldMask, pInfo)) != osl_File_E_None)
-        return error;
-                
-    if (is_volume_space_info_request(uFieldMask)) 
-        get_volume_space_information(volume_root, pInfo);
-                
-    if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
-    {
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_DeviceHandle;
-        osl_getFileURLFromSystemPath(volume_root.pData, (rtl_uString**)&pInfo->pDeviceHandle);
-    }
-    
-    return osl_File_E_None;
-}
-
-   
-//#############################################
-oslFileError SAL_CALL osl_createDirectoryPath(
-    rtl_uString* aDirectoryUrl, 
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
-    void* pData)
-{   
-    if (aDirectoryUrl == NULL)
-        return osl_File_E_INVAL;
-        
-    rtl::OUString sys_path;         
-    oslFileError osl_error = 
-        _osl_getSystemPathFromFileURL(aDirectoryUrl, &sys_path.pData, sal_False);        
-    
-    if (osl_error != osl_File_E_None)
-        return osl_error;
-                                                                
-    systemPathRemoveSeparator(sys_path);
-    
-    // const_cast because sys_path is a local copy
-    // which we want to modify inplace instead of 
-    // coyp it into another buffer on the heap again
-    return MapError(create_dir_recursively_(
-        sys_path.pData->buffer, aDirectoryCreationCallbackFunc, pData));                     
-}
-
-//#############################################
-oslFileError SAL_CALL osl_createTempFile(    
-    rtl_uString*   pustrDirectoryURL,
-    oslFileHandle* pHandle, 
-    rtl_uString**  ppustrTempFileURL)
-{
-    rtl_uString*    base_directory = 0;            
-    LPWSTR          tmp_name;        
-    sal_Bool        b_delete_on_close;
-    oslFileError    osl_error;        
-    
-    osl_error = osl_setup_createTempFile_impl_(
-        pustrDirectoryURL,
-        pHandle,
-        ppustrTempFileURL,
-        &base_directory,
-        &b_delete_on_close);
-        
-    if (osl_File_E_None != osl_error)
-        return osl_error;
-   
-    /* allocate enough space on the stack */
-    STACK_ALLOC(tmp_name, WCHAR, (rtl_uString_getLength(base_directory) + MAX_PATH));
-    
-    if (tmp_name)
-    {
-        osl_createTempFile_impl_(
-            base_directory, 
-            tmp_name,
-            b_delete_on_close,
-            pHandle,
-            ppustrTempFileURL);
-    }
-    else // stack alloc failed
-    {
-        osl_error = osl_File_E_NOMEM;
-    }
-            
-    if (base_directory)
-        rtl_uString_release(base_directory);
-                
-    return osl_error;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_getTempDirURL(rtl_uString** pustrTempDir)
-{
-    WCHAR	szBuffer[MAX_PATH];
-    LPWSTR	lpBuffer = szBuffer;
-    DWORD	nBufferLength = ELEMENTS_OF_ARRAY(szBuffer) - 1;
-
-    DWORD			nLength;
-    oslFileError	error;
-
-    do
-    {
-        nLength = GetTempPathW( ELEMENTS_OF_ARRAY(szBuffer), lpBuffer );
-        if ( nLength > nBufferLength )
-        {
-            nLength++;
-            lpBuffer = reinterpret_cast<WCHAR*>(alloca( sizeof(WCHAR) * nLength ));
-            nBufferLength = nLength - 1;
-        }
-    } while ( nLength > nBufferLength );
-
-    if ( nLength )
-    {
-        rtl_uString	*ustrTempPath = NULL;
-
-        if ( '\\' == lpBuffer[nLength-1] )
-            lpBuffer[nLength-1] = 0;
-
-        rtl_uString_newFromStr( &ustrTempPath, reinterpret_cast<const sal_Unicode*>(lpBuffer) );
-
-        error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir );
-
-        rtl_uString_release( ustrTempPath );
-    }
-    else
-        error = MapError( GetLastError() );
-
-    return error;
-}
-
-//##################################################################
-// File handling functions
-//##################################################################
- 
- 
-//#############################################
-oslFileError SAL_CALL osl_openFile(
-    rtl_uString *strPath, oslFileHandle *pHandle, sal_uInt32 uFlags )
-{
-    rtl_uString		*strSysPath = NULL;
-    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
-
-    if ( osl_File_E_None == error )
-    {
-        DWORD	dwAccess = 0, dwShare = FILE_SHARE_READ, dwCreation = 0, dwAttributes = 0;
-        HANDLE	hFile;
-
-        if ( uFlags & osl_File_OpenFlag_Read )
-            dwAccess |= GENERIC_READ;
-
-        if ( uFlags & osl_File_OpenFlag_Write )
-            dwAccess |= GENERIC_WRITE;
-        else
-            dwShare  |= FILE_SHARE_WRITE;
-
-        if ( uFlags & osl_File_OpenFlag_NoLock )
-            dwShare  |= FILE_SHARE_WRITE;
-
-        if ( uFlags & osl_File_OpenFlag_Create )
-            dwCreation |= CREATE_NEW;
-        else
-            dwCreation |= OPEN_EXISTING;
-
-        hFile = CreateFileW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr( strSysPath )), dwAccess, dwShare, NULL, dwCreation, dwAttributes, NULL );
-
-        *pHandle = osl_createFileHandleFromOSHandle( hFile );
-
-        if ( !IsValidHandle( hFile ) )
-            error = MapError( GetLastError() );
-
-        rtl_uString_release( strSysPath );
-    }
-
-    return error;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
-{
-    if (!IsValidHandle((HANDLE)Handle))
-        return osl_File_E_INVAL;
-    
-    if (!FlushFileBuffers((HANDLE)Handle))
-        return MapError(GetLastError());
-        
-    return osl_File_E_None;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_closeFile(oslFileHandle Handle)
-{
-    oslFileError	error;
-    HANDLE			hFile = (HANDLE)Handle;
-
-    if ( IsValidHandle(hFile) )
-        error = CloseHandle( hFile ) ? osl_File_E_None : MapError( GetLastError() );
-    else
-        error = osl_File_E_INVAL;
-
-    return error;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_isEndOfFile(oslFileHandle Handle, sal_Bool *pIsEOF)
-{
-    oslFileError	error = osl_File_E_INVAL;
-    HANDLE			hFile = (HANDLE)Handle;
-
-    if ( IsValidHandle(hFile) )
-    {
-        LONG		lDistanceToMove, lDistanceToMoveHigh;
-        sal_uInt64	nCurPos;
-
-        /*	Return value INVALID_SET_FILE_POINTER is no error indication and LastError could
-            be set from previous IO call */
-
-        SetLastError( NOERROR );
-
-        lDistanceToMoveHigh = 0;
-        lDistanceToMove = SetFilePointer( hFile, 0, &lDistanceToMoveHigh, FILE_CURRENT );
-
-        error = MapError( GetLastError() );
-
-        if ( osl_File_E_None == error )
-        {
-            nCurPos = (sal_uInt64)lDistanceToMove + ((sal_uInt64)lDistanceToMoveHigh << 32);
-
-            lDistanceToMoveHigh = 0;
-            lDistanceToMove = SetFilePointer( hFile, 0, &lDistanceToMoveHigh, FILE_END );
-
-            error = MapError( GetLastError() );
-
-            if ( osl_File_E_None == error )
-            {
-                sal_uInt64	nEndPos = (sal_uInt64)lDistanceToMove + ((sal_uInt64)lDistanceToMoveHigh << 32);
-
-                *pIsEOF = (sal_Bool)(nEndPos == nCurPos);
-
-                lDistanceToMoveHigh = (LONG)(nCurPos >> 32);
-                SetFilePointer( hFile, (LONG)(nCurPos & 0xFFFFFFFF), &lDistanceToMoveHigh, FILE_BEGIN );
-
-                error = MapError( GetLastError() );
-            }
-        }
-    }
-    return error;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uPos)
-{
-    HANDLE hFile = (HANDLE)Handle;
-    if (!IsValidHandle(hFile))
-        return osl_File_E_INVAL;
-
-    DWORD dwMoveMethod = 0;
-    switch ( uHow )
-    {
-        case osl_Pos_Current:
-            dwMoveMethod = FILE_CURRENT;
-            break;
-        case osl_Pos_End:
-            dwMoveMethod = FILE_END;
-            break;
-        case osl_Pos_Absolut:
-        default:
-            dwMoveMethod = FILE_BEGIN;
-            break;
-    }
-
-    LONG nOffsetLo = sal::static_int_cast<LONG>(uPos & 0xFFFFFFFF);
-    LONG nOffsetHi = sal::static_int_cast<LONG>(uPos >> 32);
-
-    SetLastError(0);
-    DWORD dwPosLo = SetFilePointer( hFile, nOffsetLo, &nOffsetHi, dwMoveMethod );
-    if (INVALID_SET_FILE_POINTER == dwPosLo)
-    {
-        DWORD dwError = GetLastError();
-        if (NO_ERROR != dwError)
-            return MapError( dwError );
-    }
-    return osl_File_E_None;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_getFilePos(oslFileHandle Handle, sal_uInt64 *pPos)
-{
-    oslFileError	error;
-    HANDLE			hFile = (HANDLE)Handle;
-
-    if ( IsValidHandle(hFile) )
-    {
-        LONG	lDistanceToMove, lDistanceToMoveHigh;
-
-        /*	Return value INVALID_SET_FILE_POINTER is no error indication and LastError could
-            be set from previous IO call */
-
-        SetLastError( NOERROR );
-
-        lDistanceToMoveHigh = 0;
-        lDistanceToMove = SetFilePointer( hFile, 0, &lDistanceToMoveHigh, FILE_CURRENT );
-
-        error = MapError( GetLastError() );
-
-        if ( osl_File_E_None == error )
-            *pPos = (sal_uInt64)lDistanceToMove + ((sal_uInt64)lDistanceToMoveHigh << 32);
-    }
-    else
-        error = osl_File_E_INVAL;
-
-    return error;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_getFileSize(oslFileHandle Handle, sal_uInt64 *pSize)
-{
-    HANDLE hFile = (HANDLE)Handle;
-    if ( !IsValidHandle(hFile) )
-        return osl_File_E_INVAL;
-
-    DWORD nSize = GetFileSize(hFile, NULL);
-    if (nSize == INVALID_FILE_SIZE)
-    {
-        DWORD nError = GetLastError();
-        if (nError != NO_ERROR)
-            return MapError(nError);
-    }
-
-    *pSize = (sal_uInt64)(nSize);
-    return osl_File_E_None;
-}
-
-oslFileError SAL_CALL osl_setFileSize(oslFileHandle Handle, sal_uInt64 uSize)
-{
-    oslFileError	error = osl_setFilePos( Handle, osl_Pos_Absolut, uSize );
-    if ( osl_File_E_None == error )
-    {
-        if ( !SetEndOfFile( (HANDLE)Handle ) )
-            error = MapError( osl_File_E_None );
-    }
-
-    return error;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_mapFile(
-    oslFileHandle Handle,
-    void**        ppAddr,
-    sal_uInt64    uLength,
-    sal_uInt64    uOffset,
-    sal_uInt32    uFlags)
-{
-    struct FileMapping
-    {
-        HANDLE m_handle;
-
-        explicit FileMapping (HANDLE hMap)
-            : m_handle (hMap)
-        {}
-
-        ~FileMapping()
-        {
-            (void)::CloseHandle(m_handle);
-        }
-    };
-        
-    HANDLE hFile = (HANDLE)(Handle);
-    if (!IsValidHandle(hFile) || (0 == ppAddr))
-        return osl_File_E_INVAL;
-    *ppAddr = 0;
-
-    static SIZE_T const nLimit = std::numeric_limits< SIZE_T >::max();
-    if (uLength > nLimit)
-        return osl_File_E_OVERFLOW;
-    SIZE_T const nLength = sal::static_int_cast< SIZE_T >(uLength);
-
-    OSVERSIONINFO osinfo;
-    osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    (void)::GetVersionEx(&osinfo);
-
-    if (VER_PLATFORM_WIN32_NT != osinfo.dwPlatformId)
-        return osl_File_E_NOSYS; // Unsupported
-
-    FileMapping aMap( ::CreateFileMapping (hFile, NULL, SEC_COMMIT | PAGE_READONLY, 0, 0, NULL) );
-    if (!IsValidHandle(aMap.m_handle))
-        return MapError( GetLastError() );
-
-    DWORD const dwOffsetHi = sal::static_int_cast<DWORD>(uOffset >> 32);
-    DWORD const dwOffsetLo = sal::static_int_cast<DWORD>(uOffset & 0xFFFFFFFF);
-
-    *ppAddr = ::MapViewOfFile( aMap.m_handle, FILE_MAP_READ, dwOffsetHi, dwOffsetLo, nLength );
-    if (0 == *ppAddr)
-        return MapError( GetLastError() );
-
-    if (uFlags & osl_File_MapFlag_RandomAccess)
-    {
-        // Determine memory pagesize.
-        SYSTEM_INFO info;
-        ::GetSystemInfo( &info );
-        DWORD const dwPageSize = info.dwPageSize;
-
-        /*
-         * Pagein, touching first byte of each memory page.
-         * Note: volatile disables optimizing the loop away.
-         */
-        BYTE * pData (reinterpret_cast<BYTE*>(*ppAddr));
-        SIZE_T nSize (nLength);
-
-        volatile BYTE c = 0;
-        while (nSize > dwPageSize)
-        {
-            c ^= pData[0];
-            pData += dwPageSize;
-            nSize -= dwPageSize;
-        }
-        if (nSize > 0)
-        {
-            c ^= pData[0];
-            pData += nSize;
-            nSize -= nSize;
-        }
-    }
-    return osl_File_E_None;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_unmapFile(void* pAddr, sal_uInt64 /* uLength */)
-{
-    if (0 == pAddr)
-        return osl_File_E_INVAL;
-
-    if (!::UnmapViewOfFile (pAddr))
-        return MapError( GetLastError() );
-
-    return osl_File_E_None;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_readFile( 
-    oslFileHandle Handle, 
-    void *pBuffer, 
-    sal_uInt64 uBytesRequested, 
-    sal_uInt64 *pBytesRead )
-{
-    oslFileError	error;
-    HANDLE			hFile = (HANDLE)Handle;
-
-    if ( IsValidHandle(hFile) )
-    {
-        DWORD	dwBytesToRead = (DWORD)uBytesRequested;
-        DWORD	dwBytesRead;
-
-        if ( ReadFile( hFile, pBuffer, dwBytesToRead, &dwBytesRead, NULL ) )
-        {
-            *pBytesRead = (sal_uInt64)dwBytesRead;
-            error = osl_File_E_None;
-        }
-        else
-            error = MapError( GetLastError() );
-    }
-    else
-        error = osl_File_E_INVAL;
-
-    return error;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_writeFile(
-    oslFileHandle Handle, 
-    const void *pBuffer, 
-    sal_uInt64 uBytesToWrite, 
-    sal_uInt64 *pBytesWritten )
-{
-    oslFileError	error;
-    HANDLE			hFile = (HANDLE)Handle;
-
-    if ( IsValidHandle(hFile) )
-    {
-        DWORD	dwBytesToWrite = (DWORD)uBytesToWrite;
-        DWORD	dwBytesWritten;
-
-        if ( WriteFile( hFile, pBuffer, dwBytesToWrite, &dwBytesWritten, NULL ) )
-        {
-            *pBytesWritten = (sal_uInt64)dwBytesWritten;
-            error = osl_File_E_None;
-        }
-        else
-            error = MapError( GetLastError() );
-    }
-    else
-        error = osl_File_E_INVAL;
-
-    return error;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_readFileAt(
-    oslFileHandle Handle,
-    sal_uInt64    uOffset,
-    void*         pBuffer,
-    sal_uInt64    uBytesRequested,
-    sal_uInt64*   pBytesRead)
-{
-    HANDLE hFile = (HANDLE)(Handle);
-    if (!IsValidHandle(hFile) || (0 == pBuffer))
-        return osl_File_E_INVAL;
-
-    static sal_uInt64 const g_limit_dword = std::numeric_limits< DWORD >::max();
-    if (g_limit_dword < uBytesRequested)
-        return osl_File_E_OVERFLOW;
-    DWORD const dwBytes = sal::static_int_cast< DWORD >(uBytesRequested);
-
-    if (0 == pBytesRead)
-        return osl_File_E_INVAL;
-    *pBytesRead = 0;
-
-    oslFileError error = osl_setFilePos(Handle, osl_Pos_Absolut, uOffset);
-    if (osl_File_E_None != error)
-        return error;
-
-    DWORD dwDone = 0;
-    if (!::ReadFile(hFile, pBuffer, dwBytes, &dwDone, NULL))
-        return MapError( GetLastError() );
-
-    *pBytesRead = dwDone;
-    return osl_File_E_None;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_writeFileAt(
-    oslFileHandle Handle,
-    sal_uInt64    uOffset,
-    const void*   pBuffer,
-    sal_uInt64    uBytesToWrite,
-    sal_uInt64*   pBytesWritten)
-{
-    HANDLE hFile = (HANDLE)(Handle);
-    if (!IsValidHandle(hFile) || (0 == pBuffer))
-        return osl_File_E_INVAL;
-
-    static sal_uInt64 const g_limit_dword = std::numeric_limits< DWORD >::max();
-    if (g_limit_dword < uBytesToWrite)
-        return osl_File_E_OVERFLOW;
-    DWORD const dwBytes = sal::static_int_cast< DWORD >(uBytesToWrite);
-
-    if (0 == pBytesWritten)
-        return osl_File_E_INVAL;
-    *pBytesWritten = 0;
-
-    oslFileError error = osl_setFilePos(Handle, osl_Pos_Absolut, uOffset);
-    if (osl_File_E_None != error)
-        return error;
-
-    DWORD dwDone = 0;
-    if (!::WriteFile(hFile, pBuffer, dwBytes, &dwDone, NULL))
-        return MapError( GetLastError() );
-
-    *pBytesWritten = dwDone;
-    return osl_File_E_None;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_removeFile( rtl_uString* strPath )
-{
-    rtl_uString	*strSysPath = NULL;
-    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
-
-    if ( osl_File_E_None == error )
-    {
-        if ( DeleteFile( reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysPath )) ) )
-            error = osl_File_E_None;
-        else
-            error = MapError( GetLastError() );
-
-        rtl_uString_release( strSysPath );
-    }
-    return error;
-}
-
-//#############################################
-#define osl_File_CopyRecursive	0x0001
-#define osl_File_CopyOverwrite	0x0002
-
-oslFileError SAL_CALL osl_copyFile( rtl_uString* strPath, rtl_uString *strDestPath )
-{
-    rtl_uString	*strSysPath = NULL, *strSysDestPath = NULL;
-    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
-
-    if ( osl_File_E_None == error )
-        error = _osl_getSystemPathFromFileURL( strDestPath, &strSysDestPath, sal_False );
-
-    if ( osl_File_E_None == error )
-    {
-        if ( CopyFile( reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysPath )), reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysDestPath )), FALSE ) )
-            error = osl_File_E_None;
-        else
-            error = MapError( GetLastError() );
-    }
-
-    if ( strSysPath )
-        rtl_uString_release( strSysPath );
-    if ( strSysDestPath )
-        rtl_uString_release( strSysDestPath );
-
-    return error;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_moveFile( rtl_uString* strPath, rtl_uString *strDestPath )
-{
-    rtl_uString	*strSysPath = NULL, *strSysDestPath = NULL;
-    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
-
-    if ( osl_File_E_None == error )
-        error = _osl_getSystemPathFromFileURL( strDestPath, &strSysDestPath, sal_False );
-
-    if ( osl_File_E_None == error )
-    {
-        if ( MoveFileEx( reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysPath )), reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysDestPath )), MOVEFILE_COPY_ALLOWED | MOVEFILE_WRITE_THROUGH | MOVEFILE_REPLACE_EXISTING ) )
-            error = osl_File_E_None;
-        else
-            error = MapError( GetLastError() );
-    }
-
-    if ( strSysPath )
-        rtl_uString_release( strSysPath );
-    if ( strSysDestPath )
-        rtl_uString_release( strSysDestPath );
-
-    return error;
-}
-
-//#############################################
-oslFileError SAL_CALL osl_setFileAttributes( 
-    rtl_uString *ustrFileURL, 
-    sal_uInt64 uAttributes )
-{
-    oslFileError	error;
-    rtl_uString		*ustrSysPath = NULL;
-    DWORD			dwFileAttributes;
-    BOOL			fSuccess;
-
-    // Converts the normalized path into a systempath
-    error = _osl_getSystemPathFromFileURL( ustrFileURL, &ustrSysPath, sal_False );
-
-    if ( osl_File_E_None != error )
-        return error;
-
-    dwFileAttributes = GetFileAttributes( reinterpret_cast<LPCTSTR>(rtl_uString_getStr(ustrSysPath)) );
-
-    if ( (DWORD)-1 != dwFileAttributes )
-    {
-        dwFileAttributes &= ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN);
-
-        if ( uAttributes & osl_File_Attribute_ReadOnly )
-            dwFileAttributes |= FILE_ATTRIBUTE_READONLY;
-
-        if ( uAttributes & osl_File_Attribute_Hidden )
-            dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN;
-
-        fSuccess = SetFileAttributes( reinterpret_cast<LPCTSTR>(rtl_uString_getStr(ustrSysPath)), dwFileAttributes );
-    }
-    else
-        fSuccess = FALSE;
-
-    if ( !fSuccess )
-        error = MapError( GetLastError() );
-
-    rtl_uString_release( ustrSysPath );
-
-    return error;
-}
-
-//##################################################### 
-oslFileError SAL_CALL osl_setFileTime(
-    rtl_uString *filePath, 
-    const TimeValue *aCreationTime, 
-    const TimeValue *aLastAccessTime, 
-    const TimeValue *aLastWriteTime)
-{
-    oslFileError error;
-    rtl_uString *sysPath=NULL;
-    FILETIME *lpCreationTime=NULL;
-    FILETIME *lpLastAccessTime=NULL;
-    FILETIME *lpLastWriteTime=NULL;
-    FILETIME ftCreationTime;
-    FILETIME ftLastAccessTime;
-    FILETIME ftLastWriteTime;
-    HANDLE hFile;
-    BOOL fSuccess;
-
-
-    error=_osl_getSystemPathFromFileURL(filePath, &sysPath, sal_False);
-
-    if (error==osl_File_E_INVAL)
-        return error;
-
-    hFile=CreateFileW(reinterpret_cast<LPCWSTR>(rtl_uString_getStr(sysPath)), GENERIC_WRITE, 0, NULL , OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-    rtl_uString_release(sysPath);
-
-    if (hFile==INVALID_HANDLE_VALUE)
-        return osl_File_E_NOENT;
-
-    if (TimeValueToFileTime(aCreationTime, &ftCreationTime))
-        lpCreationTime=&ftCreationTime;
-
-    if (TimeValueToFileTime(aLastAccessTime, &ftLastAccessTime))
-        lpLastAccessTime=&ftLastAccessTime;
-
-    if (TimeValueToFileTime(aLastWriteTime, &ftLastWriteTime))
-        lpLastWriteTime=&ftLastWriteTime;
-
-    fSuccess=SetFileTime(hFile, lpCreationTime, lpLastAccessTime, lpLastWriteTime);
-
-    CloseHandle(hFile);
-
-    if (!fSuccess)
-        return osl_File_E_INVAL;
-    else
-        return osl_File_E_None;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_getFileStatus( 
-    oslDirectoryItem Item, 
-    oslFileStatus *pStatus, 
-    sal_uInt32 uFieldMask )
-{
-    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
-
-    if ( !pItemImpl )
-        return osl_File_E_INVAL;
-
-    switch ( pItemImpl->uType  )
-    {
-    case DIRECTORYITEM_DRIVE:
-        return osl_getDriveInfo( Item, pStatus, uFieldMask );
-    case DIRECTORYITEM_SERVER:
-        return osl_getServerInfo( Item, pStatus, uFieldMask );
-    default:
-        break;
-    }
-
-    if ( uFieldMask & osl_FileStatus_Mask_Validate )
-    {
-        HANDLE	hFind = FindFirstFile( pItemImpl->szFullPath, &pItemImpl->FindData );
-
-        if ( hFind != INVALID_HANDLE_VALUE )
-            FindClose( hFind );
-        else
-            return MapError( GetLastError() );
-
-        uFieldMask &= ~	osl_FileStatus_Mask_Validate;
-    }
-
-    /* If no fields to retrieve left ignore pStatus */
-    if ( !uFieldMask )
-        return osl_File_E_None;
-
-    /* Otherwise, this must be a valid pointer */
-    if ( !pStatus )
-        return osl_File_E_INVAL;
-
-    if ( pStatus->uStructSize != sizeof(oslFileStatus) )
-        return osl_File_E_INVAL;
-
-    pStatus->uValidFields = 0;
-
-    /* File time stamps */
-
-    if ( (uFieldMask & osl_FileStatus_Mask_ModifyTime) &&
-        FileTimeToTimeValue( &pItemImpl->FindData.ftLastWriteTime, &pStatus->aModifyTime ) )
-        pStatus->uValidFields |= osl_FileStatus_Mask_ModifyTime;
-
-    if ( (uFieldMask & osl_FileStatus_Mask_AccessTime) &&
-        FileTimeToTimeValue( &pItemImpl->FindData.ftLastAccessTime, &pStatus->aAccessTime ) )
-        pStatus->uValidFields |= osl_FileStatus_Mask_AccessTime;
-
-    if ( (uFieldMask & osl_FileStatus_Mask_CreationTime) &&
-        FileTimeToTimeValue( &pItemImpl->FindData.ftCreationTime, &pStatus->aCreationTime ) )
-        pStatus->uValidFields |= osl_FileStatus_Mask_CreationTime;
-
-    /* Most of the fields are already set, regardless of requiered fields */
-
-    rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(pItemImpl->FindData.cFileName) );
-    pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-
-    if ((FILE_ATTRIBUTE_REPARSE_POINT & pItemImpl->FindData.dwFileAttributes) &&
-        (IO_REPARSE_TAG_MOUNT_POINT == pItemImpl->FindData.dwReserved0))
-        pStatus->eType = osl_File_Type_Volume;
-    else if (pItemImpl->FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-        pStatus->eType = osl_File_Type_Directory;
-    else    
-        pStatus->eType = osl_File_Type_Regular;
-        
-    pStatus->uValidFields |= osl_FileStatus_Mask_Type;
-
-    pStatus->uAttributes = pItemImpl->FindData.dwFileAttributes;
-    pStatus->uValidFields |= osl_FileStatus_Mask_Attributes;
-
-    pStatus->uFileSize = (sal_uInt64)pItemImpl->FindData.nFileSizeLow + ((sal_uInt64)pItemImpl->FindData.nFileSizeHigh << 32);
-    pStatus->uValidFields |= osl_FileStatus_Mask_FileSize;
-
-    if ( uFieldMask & osl_FileStatus_Mask_LinkTargetURL )
-    {
-        rtl_uString	*ustrFullPath = NULL;
-
-        rtl_uString_newFromStr( &ustrFullPath, reinterpret_cast<const sal_Unicode*>(pItemImpl->szFullPath) );
-        osl_getFileURLFromSystemPath( ustrFullPath, &pStatus->ustrLinkTargetURL );
-        rtl_uString_release( ustrFullPath );
-
-        pStatus->uValidFields |= osl_FileStatus_Mask_LinkTargetURL;
-    }
-
-    if ( uFieldMask & osl_FileStatus_Mask_FileURL )
-    {
-        rtl_uString	*ustrFullPath = NULL;
-
-
-        if ( !pItemImpl->bFullPathNormalized )
-        {
-            GetCaseCorrectPathName( pItemImpl->szFullPath, pItemImpl->szFullPath, sizeof(pItemImpl->szFullPath) );
-            pItemImpl->bFullPathNormalized = TRUE;
-        }
-        rtl_uString_newFromStr( &ustrFullPath, reinterpret_cast<const sal_Unicode*>(pItemImpl->szFullPath) );
-        osl_getFileURLFromSystemPath( ustrFullPath, &pStatus->ustrFileURL );
-        rtl_uString_release( ustrFullPath );
-        pStatus->uValidFields |= osl_FileStatus_Mask_FileURL;
-    }
-
-    return osl_File_E_None;
-}
-
-//##################################################################
-// directory handling functions
-//##################################################################
-
-
-//#####################################################
-oslFileError SAL_CALL osl_createDirectory(rtl_uString* strPath)
-{
-    rtl_uString	*strSysPath = NULL;
-    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
-
-    if ( osl_File_E_None == error )
-    {
-        if ( CreateDirectoryW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr( strSysPath )), NULL ) )
-            error = osl_File_E_None;
-/*@@@ToDo
-  The else case is a hack because the ucb or the webtop had some 
-  problems with the error code that CreateDirectory returns in
-  case the path is only a logical drive, should be removed!
-*/			
-        else
-        {
-            const sal_Unicode	*pBuffer = rtl_uString_getStr( strSysPath );
-            sal_Int32			nLen = rtl_uString_getLength( strSysPath );
-
-            if (
-                ( pBuffer[0] >= 'A' && pBuffer[0] <= 'Z' ||
-                  pBuffer[0] >= 'a' && pBuffer[0] <= 'z' ) &&
-                pBuffer[1] == ':' && ( nLen ==2 || nLen == 3 && pBuffer[2] == '\\' )
-                )
-                SetLastError( ERROR_ALREADY_EXISTS );
-
-            error = MapError( GetLastError() );
-        }
-
-        rtl_uString_release( strSysPath );
-    }
-    return error;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_removeDirectory(rtl_uString* strPath)
-{
-    rtl_uString	*strSysPath = NULL;
-    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
-
-    if ( osl_File_E_None == error )
-    {
-        if ( RemoveDirectory( reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysPath )) ) )
-            error = osl_File_E_None;
-        else
-            error = MapError( GetLastError() );
-
-        rtl_uString_release( strSysPath );
-    }
-    return error;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_openDirectory(rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
-{
-    oslFileError	error;			
-
-    if ( 0 == rtl_ustr_ascii_compareIgnoreAsciiCase( strDirectoryPath->buffer, "file:///" ) )
-        error = osl_openLocalRoot( strDirectoryPath, pDirectory );
-    else
-    {
-        rtl_uString	*strSysDirectoryPath = NULL;
-//		WCHAR		szCorrectedPathName[MAX_PATH];
-        DWORD		dwPathType;
-
-        error = _osl_getSystemPathFromFileURL( strDirectoryPath, &strSysDirectoryPath, sal_False );
-
-        if ( osl_File_E_None != error )
-                return error;
-
-        // MT Perform05
-        /*
-        if ( GetCaseCorrectPathName( strSysDirectoryPath->buffer, szCorrectedPathName, MAX_PATH ) )
-        {
-            rtl_uString_newFromStr( &strSysDirectoryPath, szCorrectedPathName );
-        }
-        */
-
-        dwPathType = IsValidFilePath( strSysDirectoryPath, NULL, VALIDATEPATH_NORMAL, NULL );
-
-        if ( dwPathType & PATHTYPE_IS_SERVER )
-        {
-            error = osl_openNetworkServer( strSysDirectoryPath, pDirectory );
-        }
-        else
-            error = osl_openFileDirectory( strSysDirectoryPath, pDirectory );
-
-        rtl_uString_release( strSysDirectoryPath );
-    }
-    return error;
-}
-
-//##################################################### 
-oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint)
-{
-    Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
-    
-    /* Assume failure */
-
-    if ( !pItem )
-        return osl_File_E_INVAL;
-
-    *pItem = NULL;
-
-    if ( !pDirImpl )
-        return osl_File_E_INVAL;
-
-    switch ( pDirImpl->uType )
-    {
-    case DIRECTORYTYPE_LOCALROOT:
-        return osl_getNextDrive( Directory, pItem, uHint );
-    case DIRECTORYTYPE_NETROOT:
-        return osl_getNextNetResource( Directory, pItem, uHint );
-    case DIRECTORYTYPE_FILESYSTEM:
-        return osl_getNextFileItem( Directory, pItem, uHint );
-    default:
-        return osl_File_E_INVAL;
-    }
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory)
-{
-    Directory_Impl	*pDirImpl = (Directory_Impl *)Directory;
-    oslFileError	eError = osl_File_E_INVAL;
-
-    if ( pDirImpl )
-    {
-        switch ( pDirImpl->uType )
-        {
-        case DIRECTORYTYPE_FILESYSTEM:
-            eError = CloseDirectory( pDirImpl->hDirectory ) ? osl_File_E_None : MapError( GetLastError() );
-            break;
-        case DIRECTORYTYPE_LOCALROOT:
-            eError = CloseLogicalDrivesEnum( pDirImpl->hEnumDrives ) ? osl_File_E_None : MapError( GetLastError() );
-            break;
-        case DIRECTORYTYPE_NETROOT:
-            {
-                DWORD err = WNetCloseEnum(pDirImpl->hDirectory);
-                eError = (err == NO_ERROR) ? osl_File_E_None : MapError(err);
-            }
-            break;
-        default:
-            OSL_ENSURE( 0, "Invalid directory type" );
-            break;
-        }
-
-        rtl_freeMemory(pDirImpl);
-    }	
-    return eError;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirectoryItem *pItem)
-{
-    oslFileError	error = osl_File_E_None;
-    rtl_uString*	strSysFilePath = NULL;
-    PATHTYPE		type = PATHTYPE_FILE;
-    DWORD			dwPathType;
-//	TCHAR			szCorrectedPathName[MAX_PATH];
-
-    /* Assume failure */
-
-    if ( !pItem )
-        return osl_File_E_INVAL;
-
-    *pItem = NULL;
-
-
-    error = _osl_getSystemPathFromFileURL( strFilePath, &strSysFilePath, sal_False );
-
-    if ( osl_File_E_None != error )
-            return error;
-
-    // MT: I can't imagine a case where this is good for!
-    /*
-    if ( GetCaseCorrectPathName( strSysFilePath->buffer, szCorrectedPathName, MAX_PATH ) )
-    {
-        rtl_uString_newFromStr( &strSysFilePath, szCorrectedPathName );
-    }
-    */
-
-    dwPathType = IsValidFilePath( strSysFilePath, NULL, VALIDATEPATH_NORMAL, NULL );
-
-    if ( dwPathType & PATHTYPE_IS_VOLUME )
-        type = PATHTYPE_VOLUME;
-    else if ( dwPathType & PATHTYPE_IS_SERVER )
-        type = PATHTYPE_NETSERVER;
-    else
-        type = PATHTYPE_FILE;
-
-    switch ( type )
-    {
-    case PATHTYPE_NETSERVER:
-        {
-            DirectoryItem_Impl*	pItemImpl = 
-                reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-
-            if ( !pItemImpl )
-                error = osl_File_E_NOMEM;
-
-            if ( osl_File_E_None == error )
-            {
-                ZeroMemory( pItemImpl, sizeof(DirectoryItem_Impl) );
-                pItemImpl->uType = DIRECTORYITEM_SERVER;
-
-                osl_acquireDirectoryItem( (oslDirectoryItem)pItemImpl );
-
-                _tcscpy( pItemImpl->szFullPath, reinterpret_cast<LPCTSTR>(strSysFilePath->buffer) );
-
-                // Assign a title anyway
-                {
-                    int iSrc = 2;
-                    int	iDst = 0;
-
-                    while( iSrc < strSysFilePath->length && strSysFilePath->buffer[iSrc] && strSysFilePath->buffer[iSrc] != '\\' )
-                    {
-                        pItemImpl->FindData.cFileName[iDst++] = strSysFilePath->buffer[iSrc++];
-                    }
-                }
-
-                *pItem = pItemImpl;
-            }
-        }
-        break;
-    case PATHTYPE_VOLUME:
-        {
-            DirectoryItem_Impl*	pItemImpl = 
-                reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-
-            if ( !pItemImpl )
-                error = osl_File_E_NOMEM;
-
-            if ( osl_File_E_None == error )
-            {
-                ZeroMemory( pItemImpl, sizeof(DirectoryItem_Impl) );
-                pItemImpl->uType = DIRECTORYITEM_DRIVE;
-
-                osl_acquireDirectoryItem( (oslDirectoryItem)pItemImpl );
-
-                _tcscpy( pItemImpl->cDriveString, reinterpret_cast<LPCTSTR>(strSysFilePath->buffer) );
-                pItemImpl->cDriveString[0] = _toupper( pItemImpl->cDriveString[0] );
-
-                if ( pItemImpl->cDriveString[_tcslen(pItemImpl->cDriveString) - 1] != '\\' )
-                    _tcscat( pItemImpl->cDriveString, TEXT( "\\" ) );
-
-                *pItem = pItemImpl;
-            }
-        }
-        break;
-    case PATHTYPE_SYNTAXERROR:
-    case PATHTYPE_NETROOT:
-    case PATHTYPE_FILE:
-        {
-            HANDLE				hFind;
-            WIN32_FIND_DATA		aFindData;
-
-            if ( strSysFilePath->length > 0 && strSysFilePath->buffer[strSysFilePath->length - 1] == '\\' )
-                rtl_uString_newFromStr_WithLength( &strSysFilePath, strSysFilePath->buffer, strSysFilePath->length - 1 );
-
-            hFind = FindFirstFile( reinterpret_cast<LPCTSTR>(rtl_uString_getStr(strSysFilePath)), &aFindData );
-
-            if ( hFind != INVALID_HANDLE_VALUE )
-            {
-                DirectoryItem_Impl	*pItemImpl = 
-                    reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-
-                ZeroMemory( pItemImpl, sizeof(DirectoryItem_Impl) );
-                osl_acquireDirectoryItem( (oslDirectoryItem)pItemImpl );
-
-                CopyMemory( &pItemImpl->FindData, &aFindData, sizeof(WIN32_FIND_DATA) );
-                _tcscpy( pItemImpl->szFullPath, reinterpret_cast<LPCTSTR>(rtl_uString_getStr(strSysFilePath)) );
-
-                // MT: This costs 600ms startup time on fast v60x!
-                // GetCaseCorrectPathName( pItemImpl->szFullPath, pItemImpl->szFullPath, sizeof(pItemImpl->szFullPath) );
-
-                pItemImpl->uType = DIRECTORYITEM_FILE;
-                *pItem = pItemImpl;
-                FindClose( hFind );
-            }
-            else
-                error = MapError( GetLastError() );
-        }
-        break;
-    }
-
-    if ( strSysFilePath )
-        rtl_uString_release( strSysFilePath );
-
-    return error;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item )
-{
-    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
-
-    if ( !pItemImpl )
-        return osl_File_E_INVAL;
-
-    pItemImpl->nRefCount++;
-    return osl_File_E_None;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item )
-{
-    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
-
-    if ( !pItemImpl )
-        return osl_File_E_INVAL;
-
-    if ( ! --pItemImpl->nRefCount )
-        rtl_freeMemory( pItemImpl );
-    return osl_File_E_None;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_unmountVolumeDevice( oslVolumeDeviceHandle Handle )
-{
-    if ( Handle )
-        return osl_File_E_None;
-    else
-        return osl_File_E_INVAL;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_automountVolumeDevice( oslVolumeDeviceHandle Handle )
-{
-    if ( Handle )
-        return osl_File_E_None;
-    else
-        return osl_File_E_INVAL;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
-{
-    if ( Handle )
-    {
-        rtl_uString_acquire( (rtl_uString *)Handle );
-        return osl_File_E_None;
-    }
-    else
-        return osl_File_E_INVAL;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
-{
-    if ( Handle )
-    {
-        rtl_uString_release( (rtl_uString *)Handle );
-        return osl_File_E_None;
-    }
-    else
-        return osl_File_E_INVAL;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uString **pstrPath )
-{
-    if ( Handle && pstrPath )
-    {
-        rtl_uString_assign( pstrPath, (rtl_uString *)Handle );
-        return osl_File_E_None;
-    }
-    else
-        return osl_File_E_INVAL;
-}
-
-
-//##################################################################
-// FileURL functions
-//##################################################################
-  
-  
-//#####################################################
-oslFileError SAL_CALL osl_getFileURLFromSystemPath( 
-    rtl_uString* ustrPath, rtl_uString** pustrURL )
-{
-    return _osl_getFileURLFromSystemPath( ustrPath, pustrURL );
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_getSystemPathFromFileURL( 
-    rtl_uString *ustrURL, rtl_uString **pustrPath)
-{
-    return _osl_getSystemPathFromFileURL( ustrURL, pustrPath, sal_True );
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_searchFileURL( 
-    rtl_uString *ustrFileName, 
-    rtl_uString *ustrSystemSearchPath, 
-    rtl_uString **pustrPath)
-{
-    rtl_uString		*ustrUNCPath = NULL;
-    rtl_uString		*ustrSysPath = NULL;
-    oslFileError	error;
-
-    /* First try to interpret the file name as an URL even a relative one */
-    error = _osl_getSystemPathFromFileURL( ustrFileName, &ustrUNCPath, sal_True );
-
-    /* So far we either have an UNC path or something invalid 
-       Now create a system path */
-    if ( osl_File_E_None == error )
-        error = _osl_getSystemPathFromFileURL( ustrUNCPath, &ustrSysPath, sal_True );
-
-    if ( osl_File_E_None == error )
-    {
-        DWORD	nBufferLength;
-        DWORD	dwResult;		
-        LPTSTR	lpBuffer = NULL;
-        LPTSTR	lpszFilePart;
-
-        /* Repeat calling SearchPath ... 
-           Start with MAX_PATH for the buffer. In most cases this 
-           will be enough and does not force the loop to runtwice */
-        dwResult = MAX_PATH;
-
-        do
-        {
-            /* If search path is empty use a NULL pointer instead according to MSDN documentation of SearchPath */
-            LPCTSTR	lpszSearchPath = ustrSystemSearchPath && ustrSystemSearchPath->length ? reinterpret_cast<LPCTSTR>(ustrSystemSearchPath->buffer) : NULL;
-            LPCTSTR	lpszSearchFile = reinterpret_cast<LPCTSTR>(ustrSysPath->buffer);
-
-            /* Allocate space for buffer according to previous returned count of required chars */
-            /* +1 is not neccessary if we follow MSDN documentation but for robustness we do so */
-            nBufferLength = dwResult + 1;
-            lpBuffer = lpBuffer ? 
-                reinterpret_cast<LPTSTR>(rtl_reallocateMemory(lpBuffer, nBufferLength * sizeof(TCHAR))) : 
-                reinterpret_cast<LPTSTR>(rtl_allocateMemory(nBufferLength * sizeof(TCHAR)));
-
-            dwResult = SearchPath( lpszSearchPath, lpszSearchFile, NULL, nBufferLength, lpBuffer, &lpszFilePart ); 
-        } while ( dwResult && dwResult >= nBufferLength );
-
-        /*	... until an error occures or buffer is large enough. 
-            dwResult == nBufferLength can not happen according to documentation but lets be robust ;-) */
-
-        if ( dwResult )
-        {
-            rtl_uString_newFromStr( &ustrSysPath, reinterpret_cast<const sal_Unicode*>(lpBuffer) );
-            error = osl_getFileURLFromSystemPath( ustrSysPath, pustrPath );
-        }
-        else
-        {
-            WIN32_FIND_DATA	aFindFileData;
-            HANDLE	hFind;
-
-            /* Somthing went wrong, perhaps the path was absolute */
-            error = MapError( GetLastError() );
-
-            hFind = FindFirstFile( reinterpret_cast<LPCTSTR>(ustrSysPath->buffer), &aFindFileData );
-
-            if ( IsValidHandle(hFind) )
-            {
-                error = osl_getFileURLFromSystemPath( ustrSysPath, pustrPath );
-                FindClose( hFind );
-            }
-        }
-
-        rtl_freeMemory( lpBuffer );
-    }
-    
-    if ( ustrSysPath )
-        rtl_uString_release( ustrSysPath );
-
-    if ( ustrUNCPath )
-        rtl_uString_release( ustrUNCPath );
-
-    return error;
-}
-
-//#####################################################
-
-oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL )
-{
-    oslFileError	eError;
-    rtl_uString		*ustrRelSysPath = NULL;
-    rtl_uString		*ustrBaseSysPath = NULL;
-
-    if ( ustrBaseURL && ustrBaseURL->length )
-    {
-        eError = _osl_getSystemPathFromFileURL( ustrBaseURL, &ustrBaseSysPath, sal_False );
-        OSL_ENSURE( osl_File_E_None == eError, "osl_getAbsoluteFileURL called with relative or invalid base URL" );
-
-        eError = _osl_getSystemPathFromFileURL( ustrRelativeURL, &ustrRelSysPath, sal_True );
-    }
-    else
-    {
-        eError = _osl_getSystemPathFromFileURL( ustrRelativeURL, &ustrRelSysPath, sal_False );
-        OSL_ENSURE( osl_File_E_None == eError, "osl_getAbsoluteFileURL called with empty base URL and/or invalid relative URL" );
-    }
-
-    if ( !eError )
-    {
-        TCHAR	szBuffer[MAX_PATH];
-        TCHAR	szCurrentDir[MAX_PATH];
-        LPTSTR	lpFilePart = NULL;
-        DWORD	dwResult;
-
-/*@@@ToDo
-  Bad, bad hack, this only works if the base path
-  really exists which is not necessary according
-  to RFC2396
-  The whole FileURL implementation should be merged 
-  with the rtl/uri class.
-*/
-        if ( ustrBaseSysPath )
-        {
-            osl_acquireMutex( g_CurrentDirectoryMutex );
-
-            GetCurrentDirectory( MAX_PATH, szCurrentDir );
-            SetCurrentDirectory( reinterpret_cast<LPCTSTR>(ustrBaseSysPath->buffer) );
-        }
-
-        dwResult = GetFullPathName( reinterpret_cast<LPCTSTR>(ustrRelSysPath->buffer), MAX_PATH, szBuffer, &lpFilePart );
-
-        if ( ustrBaseSysPath )
-        {
-            SetCurrentDirectory( szCurrentDir );
-
-            osl_releaseMutex( g_CurrentDirectoryMutex );
-        }
-
-        if ( dwResult )
-        {
-            if ( dwResult >= MAX_PATH )
-                eError = osl_File_E_INVAL;
-            else
-            {
-                rtl_uString	*ustrAbsSysPath = NULL;
-
-                rtl_uString_newFromStr( &ustrAbsSysPath, reinterpret_cast<const sal_Unicode*>(szBuffer) );
-
-                eError = osl_getFileURLFromSystemPath( ustrAbsSysPath, pustrAbsoluteURL );
-
-                if ( ustrAbsSysPath )
-                    rtl_uString_release( ustrAbsSysPath );
-            }
-        }
-        else
-            eError = MapError( GetLastError() );
-    }
-
-    if ( ustrBaseSysPath )
-        rtl_uString_release( ustrBaseSysPath );
-
-    if ( ustrRelSysPath )
-        rtl_uString_release( ustrRelSysPath );
-
-    return	eError;
-}
-
-//#####################################################
-oslFileError SAL_CALL osl_getCanonicalName( rtl_uString *strRequested, rtl_uString **strValid )
-{
-    rtl_uString_newFromString(strValid, strRequested);
-    return osl_File_E_None;
-}
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: file.cxx,v $
+ * $Revision: 1.0 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sal.hxx"
+
+#define UNICODE
+#define _UNICODE
+#define _WIN32_WINNT 0x0500
+#include "systools/win32/uwinapi.h"
+
+#include "osl/file.hxx"
+
+#include "file_url.h"
+#include "file_error.h"
+
+#include "osl/diagnose.h"
+#include "rtl/alloc.h"
+#include "rtl/byteseq.h"
+#include "rtl/ustring.hxx"
+
+#include <stdio.h>
+#include <tchar.h>
+
+#ifdef __MINGW32__
+#include <wchar.h>
+#include <ctype.h>
+#endif
+
+#include <algorithm>
+#include <limits>
+
+#ifdef max /* conflict w/ std::numeric_limits<T>::max() */
+#undef max
+#endif
+#ifdef min
+#undef min
+#endif
+
+//##################################################################
+// File handle implementation
+//##################################################################
+struct FileHandle_Impl
+{
+    HANDLE m_hFile;
+
+    /** State
+     */
+    enum StateBits
+    {
+        STATE_SEEKABLE  = 1, /* open() sets, iff regular file */
+        STATE_READABLE  = 2, /* open() sets, read() requires */
+        STATE_WRITEABLE = 4, /* open() sets, write() requires */
+        STATE_MODIFIED  = 8  /* write() sets, flush() resets */
+    };
+    int          m_state;
+
+    sal_uInt64   m_size;    /* file size */
+    LONGLONG     m_offset;  /* physical offset from begin of file */
+    LONGLONG     m_filepos; /* logical offset from begin of file */
+
+    LONGLONG     m_bufptr;  /* buffer offset from begin of file */
+    SIZE_T       m_buflen;  /* buffer filled [0, m_bufsiz - 1] */
+
+    SIZE_T       m_bufsiz;
+    sal_uInt8 *  m_buffer;
+
+    explicit FileHandle_Impl (HANDLE hFile);
+    ~FileHandle_Impl();
+
+    static void*  operator new(size_t n);
+    static void   operator delete(void * p, size_t);
+    static SIZE_T getpagesize();
+
+    sal_uInt64    getPos() const;
+    oslFileError  setPos (sal_uInt64 uPos);
+
+    sal_uInt64    getSize() const;
+
+    oslFileError readAt (
+        LONGLONG     nOffset,
+        void *       pBuffer,
+        DWORD        nBytesRequested,
+        sal_uInt64 * pBytesRead);
+
+    oslFileError writeAt (
+        LONGLONG     nOffset,
+        void const * pBuffer,
+        DWORD        nBytesToWrite,
+        sal_uInt64 * pBytesWritten);
+
+    oslFileError readFileAt (
+        LONGLONG     nOffset,
+        void *       pBuffer,
+        sal_uInt64   uBytesRequested,
+        sal_uInt64 * pBytesRead);
+
+    oslFileError writeFileAt (
+        LONGLONG     nOffset,
+        void const * pBuffer,
+        sal_uInt64   uBytesToWrite,
+        sal_uInt64 * pBytesWritten);
+
+    oslFileError readLineAt (
+        LONGLONG        nOffset,
+        sal_Sequence ** ppSequence,
+        sal_uInt64 *    pBytesRead);
+
+    oslFileError writeSequence_Impl (
+        sal_Sequence ** ppSequence,
+        SIZE_T *        pnOffset,
+        const void *    pBuffer,
+        SIZE_T          nBytes);
+
+    oslFileError syncFile();
+
+    /** Buffer cache / allocator.
+     */
+    class Allocator
+    {
+        rtl_cache_type * m_cache;
+        SIZE_T           m_bufsiz;
+
+        Allocator (Allocator const &);
+        Allocator & operator= (Allocator const &);
+
+    public:
+        static Allocator & get();
+
+        void allocate (sal_uInt8 ** ppBuffer, SIZE_T * pnSize);
+        void deallocate (sal_uInt8 * pBuffer);
+
+    protected:
+        Allocator();
+        ~Allocator();
+    };
+};
+
+FileHandle_Impl::Allocator &
+FileHandle_Impl::Allocator::get()
+{
+    static Allocator g_aBufferAllocator;
+    return g_aBufferAllocator;
+}
+
+FileHandle_Impl::Allocator::Allocator()
+    : m_cache  (0),
+      m_bufsiz (0)
+{
+    SIZE_T const pagesize = FileHandle_Impl::getpagesize();
+    m_cache = rtl_cache_create (
+        "osl_file_buffer_cache", pagesize, 0, 0, 0, 0, 0, 0, 0);
+    if (0 != m_cache)
+        m_bufsiz = pagesize;
+}
+
+FileHandle_Impl::Allocator::~Allocator()
+{
+    rtl_cache_destroy(m_cache), m_cache = 0;
+}
+
+void FileHandle_Impl::Allocator::allocate (sal_uInt8 ** ppBuffer, SIZE_T * pnSize)
+{
+    OSL_PRECOND((0 != ppBuffer) && (0 != pnSize), "FileHandle_Impl::Allocator::allocate(): contract violation");
+    *ppBuffer = static_cast< sal_uInt8* >(rtl_cache_alloc(m_cache)), *pnSize = m_bufsiz;
+}
+
+void FileHandle_Impl::Allocator::deallocate (sal_uInt8 * pBuffer)
+{
+    if (0 != pBuffer)
+        rtl_cache_free (m_cache, pBuffer);
+}
+
+FileHandle_Impl::FileHandle_Impl(HANDLE hFile)
+    : m_hFile   (hFile),
+      m_state   (STATE_READABLE | STATE_WRITEABLE),
+      m_size    (0),
+      m_offset  (0),
+      m_filepos (0),
+      m_bufptr  (-1),
+      m_buflen  (0),
+      m_bufsiz  (0),
+      m_buffer  (0)
+{
+    Allocator::get().allocate (&m_buffer, &m_bufsiz);
+    if (m_buffer != 0)
+        memset (m_buffer, 0, m_bufsiz);
+}
+
+FileHandle_Impl::~FileHandle_Impl()
+{
+    Allocator::get().deallocate (m_buffer), m_buffer = 0;
+}
+
+void * FileHandle_Impl::operator new(size_t n)
+{
+    return rtl_allocateMemory(n);
+}
+
+void FileHandle_Impl::operator delete(void * p, size_t)
+{
+    rtl_freeMemory(p);
+}
+
+SIZE_T FileHandle_Impl::getpagesize()
+{
+    SYSTEM_INFO info;
+    ::GetSystemInfo (&info);
+    return sal::static_int_cast< SIZE_T >(info.dwPageSize);
+}
+
+sal_uInt64 FileHandle_Impl::getPos() const
+{
+    return sal::static_int_cast< sal_uInt64 >(m_filepos);
+}
+
+oslFileError FileHandle_Impl::setPos (sal_uInt64 uPos)
+{
+    m_filepos = sal::static_int_cast< LONGLONG >(uPos);
+    return osl_File_E_None;
+}
+
+sal_uInt64 FileHandle_Impl::getSize() const
+{
+    LONGLONG bufend = std::max((LONGLONG)(0), m_bufptr) + m_buflen;
+    return std::max(m_size, sal::static_int_cast< sal_uInt64 >(bufend));
+}
+
+oslFileError FileHandle_Impl::readAt (
+    LONGLONG     nOffset,
+    void *       pBuffer,
+    DWORD        nBytesRequested,
+    sal_uInt64 * pBytesRead)
+{
+    OSL_PRECOND(m_state & STATE_SEEKABLE, "FileHandle_Impl::readAt(): not seekable");
+    if (!(m_state & STATE_SEEKABLE))
+        return osl_File_E_SPIPE;
+
+    OSL_PRECOND(m_state & STATE_READABLE, "FileHandle_Impl::readAt(): not readable");
+    if (!(m_state & STATE_READABLE))
+        return osl_File_E_BADF;
+
+    if (nOffset != m_offset)
+    {
+        LARGE_INTEGER liOffset; liOffset.QuadPart = nOffset;
+        if (!::SetFilePointerEx(m_hFile, liOffset, 0, FILE_BEGIN))
+            return oslTranslateFileError( GetLastError() );
+        m_offset = nOffset;
+    }
+
+    DWORD dwDone = 0;
+    if (!::ReadFile(m_hFile, pBuffer, nBytesRequested, &dwDone, 0))
+        return oslTranslateFileError( GetLastError() );
+    m_offset += dwDone;
+
+    *pBytesRead = dwDone;
+    return osl_File_E_None;
+}
+
+oslFileError FileHandle_Impl::writeAt (
+    LONGLONG     nOffset,
+    void const * pBuffer,
+    DWORD        nBytesToWrite,
+    sal_uInt64 * pBytesWritten)
+{
+    OSL_PRECOND(m_state & STATE_SEEKABLE, "FileHandle_Impl::writeAt(): not seekable");
+    if (!(m_state & STATE_SEEKABLE))
+        return osl_File_E_SPIPE;
+
+    OSL_PRECOND(m_state & STATE_WRITEABLE, "FileHandle_Impl::writeAt(): not writeable");
+    if (!(m_state & STATE_WRITEABLE))
+        return osl_File_E_BADF;
+
+    if (nOffset != m_offset)
+    {
+        LARGE_INTEGER liOffset; liOffset.QuadPart = nOffset;
+        if (!::SetFilePointerEx (m_hFile, liOffset, 0, FILE_BEGIN))
+            return oslTranslateFileError( GetLastError() );
+        m_offset = nOffset;
+    }
+    
+    DWORD dwDone = 0;
+    if (!::WriteFile(m_hFile, pBuffer, nBytesToWrite, &dwDone, 0))
+        return oslTranslateFileError( GetLastError() );
+    m_offset += dwDone;
+
+    m_size = std::max(m_size, sal::static_int_cast< sal_uInt64 >(m_offset));
+
+    *pBytesWritten = dwDone;
+    return osl_File_E_None;
+}
+
+oslFileError FileHandle_Impl::readFileAt (
+    LONGLONG     nOffset,
+    void *       pBuffer,
+    sal_uInt64   uBytesRequested,
+    sal_uInt64 * pBytesRead)
+{
+    static sal_uInt64 const g_limit_dword = std::numeric_limits< DWORD >::max();
+    if (g_limit_dword < uBytesRequested)
+        return osl_File_E_OVERFLOW;
+    DWORD nBytesRequested = sal::static_int_cast< DWORD >(uBytesRequested);
+
+    if (0 == (m_state & STATE_SEEKABLE))
+    {
+        // not seekable (pipe)
+        DWORD dwDone = 0;
+        if (!::ReadFile(m_hFile, pBuffer, nBytesRequested, &dwDone, 0))
+            return oslTranslateFileError( GetLastError() );
+        *pBytesRead = dwDone;
+        return osl_File_E_None;
+    }
+    else if (0 == m_buffer)
+    {
+        // not buffered
+        return readAt (nOffset, pBuffer, nBytesRequested, pBytesRead);
+    }
+    else
+    {
+        sal_uInt8 * buffer = static_cast< sal_uInt8* >(pBuffer);
+        for (*pBytesRead = 0; nBytesRequested > 0; )
+        {
+            LONGLONG const bufptr = (nOffset / m_bufsiz) * m_bufsiz;
+            SIZE_T   const bufpos = (nOffset % m_bufsiz);
+
+            if (bufptr != m_bufptr)
+            {
+                // flush current buffer
+                oslFileError result = syncFile();
+                if (result != osl_File_E_None)
+                    return (result);
+
+                if (nBytesRequested >= m_bufsiz)
+                {
+                    // buffer too small, read through from file
+                    sal_uInt64 uDone = 0;
+                    result = readAt (nOffset, &(buffer[*pBytesRead]), nBytesRequested, &uDone);
+                    if (result != osl_File_E_None)
+                        return (result);
+
+                    nBytesRequested -= sal::static_int_cast< DWORD >(uDone), *pBytesRead += uDone;
+                    return osl_File_E_None;
+                }
+
+                // update buffer (pointer)
+                sal_uInt64 uDone = 0;
+                result = readAt (bufptr, m_buffer, m_bufsiz, &uDone);
+                if (result != osl_File_E_None)
+                    return (result);
+                m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone);
+            }
+            if (bufpos >= m_buflen)
+            {
+                // end of file
+                return osl_File_E_None;
+            }
+
+            SIZE_T const bytes = std::min(m_buflen - bufpos, nBytesRequested);
+            memcpy (&(buffer[*pBytesRead]), &(m_buffer[bufpos]), bytes);
+            nBytesRequested -= bytes, *pBytesRead += bytes, nOffset += bytes;
+        }
+        return osl_File_E_None;
+    }
+}
+
+oslFileError FileHandle_Impl::writeFileAt (
+    LONGLONG     nOffset,
+    void const * pBuffer,
+    sal_uInt64   uBytesToWrite,
+    sal_uInt64 * pBytesWritten)
+{
+    static sal_uInt64 const g_limit_dword = std::numeric_limits< DWORD >::max();
+    if (g_limit_dword < uBytesToWrite)
+        return osl_File_E_OVERFLOW;
+    DWORD nBytesToWrite = sal::static_int_cast< DWORD >(uBytesToWrite);
+
+    if (0 == (m_state & STATE_SEEKABLE))
+    {
+        // not seekable (pipe)
+        DWORD dwDone = 0;
+        if (!::WriteFile(m_hFile, pBuffer, nBytesToWrite, &dwDone, 0))
+            return oslTranslateFileError( GetLastError() );
+        *pBytesWritten = dwDone;
+        return osl_File_E_None;
+    }
+    else if (0 == m_buffer)
+    {
+        // not buffered
+        return writeAt(nOffset, pBuffer, nBytesToWrite, pBytesWritten);
+    }
+    else
+    {
+        sal_uInt8 const * buffer = static_cast< sal_uInt8 const* >(pBuffer);
+        for (*pBytesWritten = 0; nBytesToWrite > 0; )
+        {
+            LONGLONG const bufptr = (nOffset / m_bufsiz) * m_bufsiz;
+            SIZE_T   const bufpos = (nOffset % m_bufsiz);
+            if (bufptr != m_bufptr)
+            {
+                // flush current buffer
+                oslFileError result = syncFile();
+                if (result != osl_File_E_None)
+                    return (result);
+
+                if (nBytesToWrite >= m_bufsiz)
+                {
+                    // buffer too small, write through to file
+                    sal_uInt64 uDone = 0;
+                    result = writeAt (nOffset, &(buffer[*pBytesWritten]), nBytesToWrite, &uDone);
+                    if (result != osl_File_E_None)
+                        return (result);
+                    if (uDone != nBytesToWrite)
+                        return osl_File_E_IO;
+
+                    nBytesToWrite -= sal::static_int_cast< DWORD >(uDone), *pBytesWritten += uDone;
+                    return osl_File_E_None;
+                }
+
+                // update buffer (pointer)
+                sal_uInt64 uDone = 0;
+                result = readAt (bufptr, m_buffer, m_bufsiz, &uDone);
+                if (result != osl_File_E_None)
+                    return (result);
+                m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone);
+            }
+
+            SIZE_T const bytes = std::min(m_bufsiz - bufpos, nBytesToWrite);
+            memcpy (&(m_buffer[bufpos]), &(buffer[*pBytesWritten]), bytes);
+            nBytesToWrite -= bytes, *pBytesWritten += bytes, nOffset += bytes;
+
+            m_buflen = std::max(m_buflen, bufpos + bytes);
+            m_state |= STATE_MODIFIED;
+        }
+        return osl_File_E_None;
+    }
+}
+
+oslFileError FileHandle_Impl::readLineAt (
+    LONGLONG        nOffset,
+    sal_Sequence ** ppSequence,
+    sal_uInt64 *    pBytesRead)
+{
+    oslFileError result = osl_File_E_None;
+
+    LONGLONG bufptr = (nOffset / m_bufsiz) * m_bufsiz;
+    if (bufptr != m_bufptr)
+    {
+        /* flush current buffer */
+        result = syncFile();
+        if (result != osl_File_E_None)
+            return (result);
+
+        /* update buffer (pointer) */
+        sal_uInt64 uDone = 0;
+        result = readAt (bufptr, m_buffer, m_bufsiz, &uDone);
+        if (result != osl_File_E_None)
+            return (result);
+
+        m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone);
+    }
+
+    static int const LINE_STATE_BEGIN = 0;
+    static int const LINE_STATE_CR    = 1;
+    static int const LINE_STATE_LF    = 2;
+
+    SIZE_T bufpos = sal::static_int_cast< SIZE_T >(nOffset - m_bufptr), curpos = bufpos, dstpos = 0;
+    int    state  = (bufpos >= m_buflen) ? LINE_STATE_LF : LINE_STATE_BEGIN;
+
+    for ( ; state != LINE_STATE_LF; )
+    {
+        if (curpos >= m_buflen)
+        {
+            /* buffer examined */
+            if (0 < (curpos - bufpos))
+            {
+                /* flush buffer to sequence */
+                result = writeSequence_Impl (
+                    ppSequence, &dstpos, &(m_buffer[bufpos]), curpos - bufpos);
+                if (result != osl_File_E_None)
+                    return (result);
+                *pBytesRead += curpos - bufpos, nOffset += curpos - bufpos;
+            }
+
+            bufptr = nOffset / m_bufsiz * m_bufsiz;
+            if (bufptr != m_bufptr)
+            {
+                /* update buffer (pointer) */
+                sal_uInt64 uDone = 0;
+                result = readAt (bufptr, m_buffer, m_bufsiz, &uDone);
+                if (result != osl_File_E_None)
+                    return (result);
+                m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone);
+            }
+
+            bufpos = sal::static_int_cast< SIZE_T >(nOffset - m_bufptr), curpos = bufpos;
+            if (bufpos >= m_buflen)
+                break;
+        }
+        switch (state)
+        {
+        case LINE_STATE_CR:
+            state = LINE_STATE_LF;
+            switch (m_buffer[curpos])
+            {
+            case 0x0A: /* CRLF */
+                /* eat current char */
+                curpos++;
+                break;
+            default: /* single CR */
+                /* keep current char */
+                break;
+            }
+            break;
+        default:
+            /* determine next state */
+            switch (m_buffer[curpos])
+            {
+            case 0x0A: /* single LF */
+                state = LINE_STATE_LF;
+                break;
+            case 0x0D: /* CR */
+                state = LINE_STATE_CR;
+                break;
+            default: /* advance to next char */
+                curpos++;
+                break;
+            }
+            if (state != LINE_STATE_BEGIN)
+            {
+                /* store (and eat) the newline char */
+                m_buffer[curpos] = 0x0A, curpos++;
+
+                /* flush buffer to sequence */
+                result = writeSequence_Impl (
+                    ppSequence, &dstpos, &(m_buffer[bufpos]), curpos - bufpos - 1);
+                if (result != osl_File_E_None)
+                    return (result);
+                *pBytesRead += curpos - bufpos, nOffset += curpos - bufpos;
+            }
+            break;
+        }
+    }
+
+    result = writeSequence_Impl (ppSequence, &dstpos, 0, 0);
+    if (result != osl_File_E_None)
+        return (result);
+    if (0 < dstpos)
+        return osl_File_E_None;
+    if (bufpos >= m_buflen)
+        return osl_File_E_AGAIN;
+    return osl_File_E_None;
+}
+
+oslFileError FileHandle_Impl::writeSequence_Impl (
+    sal_Sequence ** ppSequence,
+    SIZE_T *        pnOffset,
+    const void *    pBuffer,
+    SIZE_T          nBytes)
+{
+    sal_Int32 nElements = *pnOffset + nBytes;
+    if (!*ppSequence)
+    {
+        /* construct sequence */
+        rtl_byte_sequence_constructNoDefault(ppSequence, nElements);
+    }
+    else if (nElements != (*ppSequence)->nElements)
+    {
+        /* resize sequence */
+        rtl_byte_sequence_realloc(ppSequence, nElements);
+    }
+    if (*ppSequence != 0)
+    {
+        /* fill sequence */
+        memcpy(&((*ppSequence)->elements[*pnOffset]), pBuffer, nBytes), *pnOffset += nBytes;
+    }
+    return (*ppSequence != 0) ? osl_File_E_None : osl_File_E_NOMEM;
+}
+
+oslFileError FileHandle_Impl::syncFile()
+{
+    oslFileError result = osl_File_E_None;
+    if (m_state & STATE_MODIFIED)
+    {
+        sal_uInt64 uDone = 0;
+        result = writeAt (m_bufptr, m_buffer, m_buflen, &uDone);
+        if (result != osl_File_E_None)
+            return (result);
+        if (uDone != m_buflen)
+            return osl_File_E_IO;
+        m_state &= ~STATE_MODIFIED;
+    }
+    return (result);
+}
+ 
+//##################################################################
+// File I/O functions
+//##################################################################
+
+extern "C" oslFileHandle
+SAL_CALL osl_createFileHandleFromOSHandle (
+    HANDLE     hFile,
+    sal_uInt32 uFlags)
+{
+    if ( !IsValidHandle(hFile) )
+        return 0; // EINVAL
+
+    FileHandle_Impl * pImpl = new FileHandle_Impl(hFile);
+    if (pImpl == 0)
+    {
+        // cleanup and fail
+        (void) ::CloseHandle(hFile);
+        return 0; // ENOMEM
+    }
+
+    /* check for regular file */
+    if (FILE_TYPE_DISK == GetFileType(hFile))
+    {
+        /* mark seekable */
+        pImpl->m_state |= FileHandle_Impl::STATE_SEEKABLE;
+
+        /* init current size */
+        LARGE_INTEGER uSize = { 0, 0 };
+        (void) ::GetFileSizeEx(hFile, &uSize);
+        pImpl->m_size = (sal::static_int_cast<sal_uInt64>(uSize.HighPart) << 32) + uSize.LowPart;
+    }
+
+    if (!(uFlags & osl_File_OpenFlag_Read))
+        pImpl->m_state &= ~FileHandle_Impl::STATE_READABLE;
+    if (!(uFlags & osl_File_OpenFlag_Write))
+        pImpl->m_state &= ~FileHandle_Impl::STATE_WRITEABLE;
+
+    OSL_POSTCOND(
+        (uFlags & osl_File_OpenFlag_Read) || (uFlags & osl_File_OpenFlag_Write),
+        "osl_createFileHandleFromOSHandle(): missing read/write access flags");
+    return (oslFileHandle)(pImpl);
+}
+
+//#############################################
+oslFileError 
+SAL_CALL osl_openFile(
+    rtl_uString *   strPath,
+    oslFileHandle * pHandle,
+    sal_uInt32      uFlags )
+{
+    rtl_uString * strSysPath = 0;
+    oslFileError result = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
+    if (result != osl_File_E_None)
+        return (result);
+
+    DWORD dwAccess = GENERIC_READ, dwShare = FILE_SHARE_READ, dwCreation = 0, dwAttributes = 0;
+
+    if ( uFlags & osl_File_OpenFlag_Write )
+        dwAccess |= GENERIC_WRITE;
+    else
+        dwShare  |= FILE_SHARE_WRITE;
+
+    if ( uFlags & osl_File_OpenFlag_NoLock )
+        dwShare  |= FILE_SHARE_WRITE;
+
+    if ( uFlags & osl_File_OpenFlag_Create )
+        dwCreation |= CREATE_NEW;
+    else
+        dwCreation |= OPEN_EXISTING;
+
+    HANDLE hFile = CreateFileW(
+        reinterpret_cast<LPCWSTR>(rtl_uString_getStr( strSysPath )),
+        dwAccess, dwShare, NULL, dwCreation, dwAttributes, NULL );
+
+    // @@@ ERROR HANDLING @@@
+    if ( !IsValidHandle( hFile ) )
+        result = oslTranslateFileError( GetLastError() );
+
+    *pHandle = osl_createFileHandleFromOSHandle (hFile, uFlags | osl_File_OpenFlag_Read);
+
+    rtl_uString_release( strSysPath );
+    return (result);
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_syncFile(oslFileHandle Handle)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile))
+        return osl_File_E_INVAL;
+
+    oslFileError result = pImpl->syncFile();
+    if (result != osl_File_E_None)
+        return result;
+
+    if (!FlushFileBuffers(pImpl->m_hFile))
+        return oslTranslateFileError(GetLastError());
+        
+    return osl_File_E_None;
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_closeFile(oslFileHandle Handle)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile))
+        return osl_File_E_INVAL;
+
+    oslFileError result = pImpl->syncFile();
+    if (result != osl_File_E_None)
+    {
+        /* ignore double failure */
+        (void)::CloseHandle(pImpl->m_hFile);
+    }
+    else if (!::CloseHandle(pImpl->m_hFile))
+    {
+        /* translate error code */
+        result = oslTranslateFileError( GetLastError() );
+    }
+
+    delete pImpl;
+    return (result);
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_mapFile(
+    oslFileHandle Handle,
+    void**        ppAddr,
+    sal_uInt64    uLength,
+    sal_uInt64    uOffset,
+    sal_uInt32    uFlags)
+{
+    struct FileMapping
+    {
+        HANDLE m_handle;
+
+        explicit FileMapping (HANDLE hMap)
+            : m_handle (hMap)
+        {}
+
+        ~FileMapping()
+        {
+            (void)::CloseHandle(m_handle);
+        }
+    };
+        
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile) || (0 == ppAddr))
+        return osl_File_E_INVAL;
+    *ppAddr = 0;
+
+    static SIZE_T const nLimit = std::numeric_limits< SIZE_T >::max();
+    if (uLength > nLimit)
+        return osl_File_E_OVERFLOW;
+    SIZE_T const nLength = sal::static_int_cast< SIZE_T >(uLength);
+
+    OSVERSIONINFO osinfo;
+    osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    (void)::GetVersionEx(&osinfo);
+
+    if (VER_PLATFORM_WIN32_NT != osinfo.dwPlatformId)
+        return osl_File_E_NOSYS; // Unsupported
+
+    FileMapping aMap( ::CreateFileMapping (pImpl->m_hFile, NULL, SEC_COMMIT | PAGE_READONLY, 0, 0, NULL) );
+    if (!IsValidHandle(aMap.m_handle))
+        return oslTranslateFileError( GetLastError() );
+
+    DWORD const dwOffsetHi = sal::static_int_cast<DWORD>(uOffset >> 32);
+    DWORD const dwOffsetLo = sal::static_int_cast<DWORD>(uOffset & 0xFFFFFFFF);
+
+    *ppAddr = ::MapViewOfFile( aMap.m_handle, FILE_MAP_READ, dwOffsetHi, dwOffsetLo, nLength );
+    if (0 == *ppAddr)
+        return oslTranslateFileError( GetLastError() );
+
+    if (uFlags & osl_File_MapFlag_RandomAccess)
+    {
+        // Determine memory pagesize.
+        SYSTEM_INFO info;
+        ::GetSystemInfo( &info );
+        DWORD const dwPageSize = info.dwPageSize;
+
+        /*
+         * Pagein, touching first byte of each memory page.
+         * Note: volatile disables optimizing the loop away.
+         */
+        BYTE * pData (reinterpret_cast<BYTE*>(*ppAddr));
+        SIZE_T nSize (nLength);
+
+        volatile BYTE c = 0;
+        while (nSize > dwPageSize)
+        {
+            c ^= pData[0];
+            pData += dwPageSize;
+            nSize -= dwPageSize;
+        }
+        if (nSize > 0)
+        {
+            c ^= pData[0];
+            pData += nSize;
+            nSize -= nSize;
+        }
+    }
+    return osl_File_E_None;
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_unmapFile(void* pAddr, sal_uInt64 /* uLength */)
+{
+    if (0 == pAddr)
+        return osl_File_E_INVAL;
+
+    if (!::UnmapViewOfFile (pAddr))
+        return oslTranslateFileError( GetLastError() );
+
+    return osl_File_E_None;
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_readLine(
+    oslFileHandle   Handle,
+    sal_Sequence ** ppSequence)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile) || (0 == ppSequence))
+        return osl_File_E_INVAL;
+    sal_uInt64 uBytesRead = 0;
+
+    // read at current filepos; filepos += uBytesRead;
+    oslFileError result = pImpl->readLineAt (
+        pImpl->m_filepos, ppSequence, &uBytesRead);
+    if (result == osl_File_E_None)
+        pImpl->m_filepos += uBytesRead;
+    return (result);
+}
+
+//#############################################
+oslFileError 
+SAL_CALL osl_readFile( 
+    oslFileHandle Handle, 
+    void *        pBuffer, 
+    sal_uInt64    uBytesRequested, 
+    sal_uInt64 *  pBytesRead)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile) || (0 == pBuffer) || (0 == pBytesRead))
+        return osl_File_E_INVAL;
+
+    // read at current filepos; filepos += *pBytesRead;
+    oslFileError result = pImpl->readFileAt (
+        pImpl->m_filepos, pBuffer, uBytesRequested, pBytesRead);
+    if (result == osl_File_E_None)
+        pImpl->m_filepos += *pBytesRead;
+    return (result);
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_writeFile(
+    oslFileHandle Handle, 
+    const void *  pBuffer, 
+    sal_uInt64    uBytesToWrite, 
+    sal_uInt64 *  pBytesWritten )
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile) || (0 == pBuffer) || (0 == pBytesWritten))
+        return osl_File_E_INVAL;
+
+    // write at current filepos; filepos += *pBytesWritten;
+    oslFileError result = pImpl->writeFileAt (
+        pImpl->m_filepos, pBuffer, uBytesToWrite, pBytesWritten);
+    if (result == osl_File_E_None)
+        pImpl->m_filepos += *pBytesWritten;
+    return (result);
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_readFileAt(
+    oslFileHandle Handle,
+    sal_uInt64    uOffset,
+    void*         pBuffer,
+    sal_uInt64    uBytesRequested,
+    sal_uInt64*   pBytesRead)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile) || (0 == pBuffer) || (0 == pBytesRead))
+        return osl_File_E_INVAL;
+    if (0 == (pImpl->m_state & FileHandle_Impl::STATE_SEEKABLE))
+        return osl_File_E_SPIPE;
+
+    static sal_uInt64 const g_limit_longlong = std::numeric_limits< LONGLONG >::max();
+    if (g_limit_longlong < uOffset)
+        return osl_File_E_OVERFLOW;
+    LONGLONG const nOffset = sal::static_int_cast< LONGLONG >(uOffset);
+
+    // read at specified fileptr
+    return pImpl->readFileAt (nOffset, pBuffer, uBytesRequested, pBytesRead);
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_writeFileAt(
+    oslFileHandle Handle,
+    sal_uInt64    uOffset,
+    const void*   pBuffer,
+    sal_uInt64    uBytesToWrite,
+    sal_uInt64*   pBytesWritten)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile) || (0 == pBuffer) || (0 == pBytesWritten))
+        return osl_File_E_INVAL;
+    if (0 == (pImpl->m_state & FileHandle_Impl::STATE_SEEKABLE))
+        return osl_File_E_SPIPE;
+
+    static sal_uInt64 const g_limit_longlong = std::numeric_limits< LONGLONG >::max();
+    if (g_limit_longlong < uOffset)
+        return osl_File_E_OVERFLOW;
+    LONGLONG const nOffset = sal::static_int_cast< LONGLONG >(uOffset);
+
+    // write at specified fileptr
+    return pImpl->writeFileAt (nOffset, pBuffer, uBytesToWrite, pBytesWritten);
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_isEndOfFile (oslFileHandle Handle, sal_Bool *pIsEOF)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile) || (0 == pIsEOF))
+        return osl_File_E_INVAL;
+
+    *pIsEOF = (pImpl->getPos() == pImpl->getSize());
+    return osl_File_E_None;
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_getFilePos(oslFileHandle Handle, sal_uInt64 *pPos)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile) || (0 == pPos))
+        return osl_File_E_INVAL;
+
+    *pPos = pImpl->getPos();
+    return osl_File_E_None;
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffset)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile))
+        return osl_File_E_INVAL;
+
+    static sal_Int64 const g_limit_longlong = std::numeric_limits< LONGLONG >::max();
+    if (g_limit_longlong < uOffset)
+        return osl_File_E_OVERFLOW;
+    LONGLONG nPos = 0, nOffset = sal::static_int_cast< LONGLONG >(uOffset);
+
+    switch (uHow)
+    {
+        case osl_Pos_Absolut:
+            if (0 > nOffset)
+                return osl_File_E_INVAL;
+            break;
+
+        case osl_Pos_Current:
+            nPos = sal::static_int_cast< LONGLONG >(pImpl->getPos());
+            if ((0 > nOffset) && (-1*nOffset > nPos))
+                return osl_File_E_INVAL;
+            if (g_limit_longlong < nPos + nOffset)
+                return osl_File_E_OVERFLOW;
+            break;
+
+        case osl_Pos_End:
+            nPos = sal::static_int_cast< LONGLONG >(pImpl->getSize());
+            if ((0 > nOffset) && (-1*nOffset > nPos))
+                return osl_File_E_INVAL;
+            if (g_limit_longlong < nPos + nOffset)
+                return osl_File_E_OVERFLOW;
+            break;
+
+        default:
+            return osl_File_E_INVAL;
+    }
+
+    return pImpl->setPos (nPos + nOffset);
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_getFileSize (oslFileHandle Handle, sal_uInt64 *pSize)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile) || (0 == pSize))
+        return osl_File_E_INVAL;
+
+    *pSize = pImpl->getSize();
+    return osl_File_E_None;
+}
+
+//#############################################
+oslFileError
+SAL_CALL osl_setFileSize (oslFileHandle Handle, sal_uInt64 uSize)
+{
+    FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
+
+    if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile))
+        return osl_File_E_INVAL;
+    if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE))
+        return osl_File_E_BADF;
+
+    static sal_uInt64 const g_limit_longlong = std::numeric_limits< LONGLONG >::max();
+    if (g_limit_longlong < uSize)
+        return osl_File_E_OVERFLOW;
+
+    oslFileError result = pImpl->syncFile();
+    if (result != osl_File_E_None)
+        return (result);
+
+    LARGE_INTEGER nDstPos; nDstPos.QuadPart = sal::static_int_cast< LONGLONG >(uSize);
+    if (!::SetFilePointerEx(pImpl->m_hFile, nDstPos, 0, FILE_BEGIN))
+        return oslTranslateFileError( GetLastError() );
+
+    if (!::SetEndOfFile(pImpl->m_hFile))
+        return oslTranslateFileError( GetLastError() );
+    pImpl->m_size = uSize;
+
+    nDstPos.QuadPart = pImpl->m_offset;
+    if (!::SetFilePointerEx(pImpl->m_hFile, nDstPos, 0, FILE_BEGIN))
+        return oslTranslateFileError( GetLastError() );
+
+    return osl_File_E_None;
+}
+
+//##################################################################
+// File handling functions
+//##################################################################
+ 
+//#############################################
+oslFileError SAL_CALL osl_removeFile( rtl_uString* strPath )
+{
+    rtl_uString	*strSysPath = NULL;
+    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
+
+    if ( osl_File_E_None == error )
+    {
+        if ( DeleteFile( reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysPath )) ) )
+            error = osl_File_E_None;
+        else
+            error = oslTranslateFileError( GetLastError() );
+
+        rtl_uString_release( strSysPath );
+    }
+    return error;
+}
+
+//#############################################
+#define osl_File_CopyRecursive	0x0001
+#define osl_File_CopyOverwrite	0x0002
+
+oslFileError SAL_CALL osl_copyFile( rtl_uString* strPath, rtl_uString *strDestPath )
+{
+    rtl_uString	*strSysPath = NULL, *strSysDestPath = NULL;
+    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
+
+    if ( osl_File_E_None == error )
+        error = _osl_getSystemPathFromFileURL( strDestPath, &strSysDestPath, sal_False );
+
+    if ( osl_File_E_None == error )
+    {
+        LPCTSTR src = reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysPath ));
+        LPCTSTR dst = reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysDestPath ));
+
+        if ( CopyFile( src, dst, FALSE ) )
+            error = osl_File_E_None;
+        else
+            error = oslTranslateFileError( GetLastError() );
+    }
+
+    if ( strSysPath )
+        rtl_uString_release( strSysPath );
+    if ( strSysDestPath )
+        rtl_uString_release( strSysDestPath );
+
+    return error;
+}
+
+//#############################################
+oslFileError SAL_CALL osl_moveFile( rtl_uString* strPath, rtl_uString *strDestPath )
+{
+    rtl_uString	*strSysPath = NULL, *strSysDestPath = NULL;
+    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
+
+    if ( osl_File_E_None == error )
+        error = _osl_getSystemPathFromFileURL( strDestPath, &strSysDestPath, sal_False );
+
+    if ( osl_File_E_None == error )
+    {
+        LPCTSTR src = reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysPath ));
+        LPCTSTR dst = reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysDestPath ));
+
+        if ( MoveFileEx( src, dst, MOVEFILE_COPY_ALLOWED | MOVEFILE_WRITE_THROUGH | MOVEFILE_REPLACE_EXISTING ) )
+            error = osl_File_E_None;
+        else
+            error = oslTranslateFileError( GetLastError() );
+    }
+
+    if ( strSysPath )
+        rtl_uString_release( strSysPath );
+    if ( strSysDestPath )
+        rtl_uString_release( strSysDestPath );
+
+    return error;
+}
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
new file mode 100644
index 000000000..15cade63e
--- /dev/null
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -0,0 +1,1774 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: file.cxx,v $
+ * $Revision: 1.19 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#define UNICODE
+#define _UNICODE
+#define _WIN32_WINNT_0x0500
+#include "systools/win32/uwinapi.h"
+
+#include "osl/file.h"
+
+#include "file_url.h"
+#include "file_error.h"
+#include "path_helper.hxx"
+
+#include "osl/diagnose.h"
+#include "osl/time.h"
+#include "rtl/alloc.h"
+#include "rtl/ustring.hxx"
+
+#include <tchar.h>
+
+//#####################################################
+#define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0])))
+
+static const wchar_t UNC_PREFIX[] = L"\\\\";
+static const wchar_t BACKSLASH = '\\';
+static const wchar_t SLASH = '/';
+
+//#####################################################
+extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime)
+{
+    SYSTEMTIME	BaseSysTime;
+    FILETIME	BaseFileTime;
+    FILETIME	FTime;
+    __int64		localTime;
+    BOOL		fSuccess = FALSE;
+
+    BaseSysTime.wYear         = 1970;
+    BaseSysTime.wMonth        = 1;
+    BaseSysTime.wDayOfWeek    = 0;
+    BaseSysTime.wDay          = 1;
+    BaseSysTime.wHour         = 0;
+    BaseSysTime.wMinute       = 0;
+    BaseSysTime.wSecond       = 0;
+    BaseSysTime.wMilliseconds = 0;
+
+    if (cpTimeVal==NULL)
+        return fSuccess;
+
+    if ( SystemTimeToFileTime(&BaseSysTime, &BaseFileTime) )
+    {
+        __int64 timeValue;
+        localTime=cpTimeVal->Seconds*(__int64)10000000+cpTimeVal->Nanosec/100;
+        *(__int64 *)&FTime=localTime;
+        fSuccess = 0 <= (timeValue= *((__int64 *)&BaseFileTime) + *((__int64 *) &FTime));
+        if (fSuccess)
+            *(__int64 *)pFTime=timeValue;
+    }
+    return fSuccess;
+}
+
+//#####################################################
+extern "C" BOOL FileTimeToTimeValue(const FILETIME *cpFTime, TimeValue *pTimeVal)
+{
+    SYSTEMTIME	BaseSysTime;
+    FILETIME	BaseFileTime;
+    BOOL		fSuccess = FALSE;	/* Assume failure */
+
+    BaseSysTime.wYear         = 1970;
+    BaseSysTime.wMonth        = 1;
+    BaseSysTime.wDayOfWeek    = 0;
+    BaseSysTime.wDay          = 1;
+    BaseSysTime.wHour         = 0;
+    BaseSysTime.wMinute       = 0;
+    BaseSysTime.wSecond       = 0;
+    BaseSysTime.wMilliseconds = 0;
+
+    if ( SystemTimeToFileTime(&BaseSysTime, &BaseFileTime) )
+    {
+        __int64		Value;
+
+        fSuccess = 0 <= (Value = *((__int64 *)cpFTime) - *((__int64 *)&BaseFileTime));
+
+        if ( fSuccess )
+        {
+            pTimeVal->Seconds  = (unsigned long) (Value / 10000000L);
+            pTimeVal->Nanosec  = (unsigned long)((Value % 10000000L) * 100);
+        }
+    }
+    return fSuccess;
+}
+
+//#####################################################
+namespace /* private */
+{       
+    //#####################################################
+    struct Component
+    {       
+        Component() : 
+            begin_(0), end_(0)
+        {}
+
+        bool isPresent() const
+        { return (static_cast<sal_IntPtr>(end_ - begin_) > 0); }        
+        
+        const sal_Unicode* begin_;
+        const sal_Unicode* end_;
+    };
+                    
+    //#####################################################
+    struct UNCComponents
+    {                        
+        Component server_;
+        Component share_;
+        Component resource_;
+    };
+    
+    //#####################################################
+    inline bool is_UNC_path(const sal_Unicode* path)
+    { return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast<LPCWSTR>(path), ELEMENTS_OF_ARRAY(UNC_PREFIX) - 1)); }   
+    
+    //#####################################################
+    inline bool is_UNC_path(const rtl::OUString& path)
+    { return is_UNC_path(path.getStr()); }
+    
+    //#####################################################
+    void parse_UNC_path(const sal_Unicode* path, UNCComponents* puncc)
+    {                
+        OSL_PRECOND(is_UNC_path(path), "Precondition violated: No UNC path");
+        OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) != -1, "Path must not contain slashes");
+                        
+        const sal_Unicode* pend = path + rtl_ustr_getLength(path);
+        const sal_Unicode* ppos = path + 2;
+                
+        puncc->server_.begin_ = ppos;                                    
+        while ((ppos < pend) && (*ppos != BACKSLASH))
+            ppos++;
+        
+        puncc->server_.end_ = ppos;
+        
+        if (BACKSLASH == *ppos)    
+        {                                                
+            puncc->share_.begin_ = ++ppos;                                
+            while ((ppos < pend) && (*ppos != BACKSLASH))
+                ppos++;
+                
+            puncc->share_.end_ = ppos;
+                                        
+            if (BACKSLASH == *ppos)
+            {                                                                                                                                                                               
+                puncc->resource_.begin_ = ++ppos;                                                        
+                while (ppos < pend)
+                    ppos++;
+                
+                puncc->resource_.end_ = ppos;
+            }                                 
+        }     
+        
+        OSL_POSTCOND(puncc->server_.isPresent() && puncc->share_.isPresent(), \
+        "Postcondition violated: Invalid UNC path detected");   
+    }
+    
+    //#####################################################
+    void parse_UNC_path(const rtl::OUString& path, UNCComponents* puncc)
+    { parse_UNC_path(path.getStr(), puncc); }
+    
+                                   
+    //#####################################################
+    bool has_path_parent(const sal_Unicode* path)
+    {                
+        // Has the given path a parent or are we already there, 
+        // e.g. 'c:\' or '\\server\share\'?
+
+        bool has_parent = false;
+        if (is_UNC_path(path))
+        {
+            UNCComponents unc_comp;
+            parse_UNC_path(path, &unc_comp);                        
+            has_parent = unc_comp.resource_.isPresent();
+        }
+        else 
+        {
+            has_parent = !osl::systemPathIsLogicalDrivePattern(path);
+        }
+        return has_parent;
+    }
+    
+    //#####################################################
+    inline bool has_path_parent(const rtl::OUString& path)
+    { return has_path_parent(path.getStr()); }
+    
+} // end namespace private 
+
+//#####################################################
+// volume handling functions
+//#####################################################
+
+//#####################################################
+oslFileError SAL_CALL osl_unmountVolumeDevice( oslVolumeDeviceHandle Handle )
+{
+    if ( Handle )
+        return osl_File_E_None;
+    else
+        return osl_File_E_INVAL;
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_automountVolumeDevice( oslVolumeDeviceHandle Handle )
+{
+    if ( Handle )
+        return osl_File_E_None;
+    else
+        return osl_File_E_INVAL;
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
+{
+    if ( Handle )
+    {
+        rtl_uString_acquire( (rtl_uString *)Handle );
+        return osl_File_E_None;
+    }
+    else
+        return osl_File_E_INVAL;
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
+{
+    if ( Handle )
+    {
+        rtl_uString_release( (rtl_uString *)Handle );
+        return osl_File_E_None;
+    }
+    else
+        return osl_File_E_INVAL;
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uString **pstrPath )
+{
+    if ( Handle && pstrPath )
+    {
+        rtl_uString_assign( pstrPath, (rtl_uString *)Handle );
+        return osl_File_E_None;
+    }
+    else
+        return osl_File_E_INVAL;
+}
+
+//##################################################################
+// directory handling functions
+//##################################################################
+
+#define DIRECTORYITEM_DRIVE		0
+#define DIRECTORYITEM_FILE		1
+#define DIRECTORYITEM_SERVER	2
+
+struct DirectoryItem_Impl
+{
+    UINT uType;
+    union {
+        WIN32_FIND_DATA	FindData;
+        TCHAR			cDriveString[MAX_PATH];
+    };
+    TCHAR			szFullPath[MAX_PATH];
+    BOOL			bFullPathNormalized;
+    int				nRefCount;
+};
+
+//#####################################################
+
+#define	DIRECTORYTYPE_LOCALROOT	    0
+#define	DIRECTORYTYPE_NETROOT		1
+#define	DIRECTORYTYPE_NETRESORCE	2
+#define	DIRECTORYTYPE_FILESYSTEM	3
+
+struct Directory_Impl
+{
+    UINT uType;
+    union {
+        HANDLE	hDirectory;
+        HANDLE	hEnumDrives;
+    };
+    TCHAR	szDirectoryPath[MAX_PATH];
+};
+
+//##################################################### 
+
+typedef struct tagDRIVEENUM
+{
+    LPCTSTR	lpIdent;
+    TCHAR	cBuffer[/*('Z' - 'A' + 1) * sizeof("A:\\") + 1*/256];
+    LPCTSTR	lpCurrent;
+} DRIVEENUM, * PDRIVEENUM, FAR * LPDRIVEENUM;
+
+//##################################################### 
+
+static HANDLE WINAPI OpenLogicalDrivesEnum(void)
+{
+    LPDRIVEENUM	pEnum = (LPDRIVEENUM)HeapAlloc( GetProcessHeap(), 0, sizeof(DRIVEENUM) );
+    if ( pEnum )
+    {
+        DWORD dwNumCopied = GetLogicalDriveStrings( (sizeof(pEnum->cBuffer) - 1) / sizeof(TCHAR), pEnum->cBuffer );
+
+        if ( dwNumCopied && dwNumCopied < sizeof(pEnum->cBuffer) / sizeof(TCHAR) )
+        {
+            pEnum->lpCurrent = pEnum->cBuffer;
+            pEnum->lpIdent = L"tagDRIVEENUM";
+        }
+        else
+        {
+            HeapFree( GetProcessHeap(), 0, pEnum );
+            pEnum = NULL;
+        }
+    }
+    return pEnum ? (HANDLE)pEnum : INVALID_HANDLE_VALUE;
+}
+
+//##################################################### 
+static BOOL WINAPI EnumLogicalDrives(HANDLE hEnum, LPTSTR lpBuffer)
+{
+    BOOL		fSuccess = FALSE;
+    LPDRIVEENUM	pEnum = (LPDRIVEENUM)hEnum;
+
+    if ( pEnum )
+    {
+        int	nLen = _tcslen( pEnum->lpCurrent );
+
+        if ( nLen )
+        {
+            CopyMemory( lpBuffer, pEnum->lpCurrent, (nLen + 1) * sizeof(TCHAR) );
+            pEnum->lpCurrent += nLen + 1;
+            fSuccess = TRUE;
+        }
+        else
+            SetLastError( ERROR_NO_MORE_FILES );
+    }
+    else
+        SetLastError( ERROR_INVALID_HANDLE );
+
+    return fSuccess;
+}
+
+//##################################################### 
+static BOOL WINAPI CloseLogicalDrivesEnum(HANDLE hEnum)
+{
+    BOOL		fSuccess = FALSE;
+    LPDRIVEENUM	pEnum = (LPDRIVEENUM)hEnum;
+
+    if ( pEnum )
+    {
+        HeapFree( GetProcessHeap(), 0, pEnum );
+        fSuccess = TRUE;
+    }
+    else
+        SetLastError( ERROR_INVALID_HANDLE );
+
+    return fSuccess;
+}
+
+//#####################################################
+typedef struct tagDIRECTORY
+{
+    HANDLE          hFind;
+    WIN32_FIND_DATA aFirstData;
+} DIRECTORY, *PDIRECTORY, FAR *LPDIRECTORY;
+
+//#####################################################
+static HANDLE WINAPI OpenDirectory(LPCTSTR lpszPath)
+{
+    LPDIRECTORY	pDirectory = (LPDIRECTORY)HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECTORY));
+
+    if (pDirectory)
+    {
+        TCHAR	szFileMask[MAX_PATH];
+        int		nLen;
+
+        _tcscpy( szFileMask, lpszPath );
+        nLen = _tcslen( szFileMask );
+
+        if (nLen && szFileMask[nLen-1] != '\\')
+            _tcscat(szFileMask, TEXT("\\*.*"));
+        else
+            _tcscat(szFileMask, TEXT("*.*"));
+
+        pDirectory->hFind = FindFirstFile(szFileMask, &pDirectory->aFirstData);
+
+        if (!IsValidHandle(pDirectory->hFind))		
+        {
+            if ( GetLastError() != ERROR_NO_MORE_FILES )
+            {
+                HeapFree(GetProcessHeap(), 0, pDirectory);
+                pDirectory = NULL;
+            }
+        }
+    }
+    return (HANDLE)pDirectory;
+}
+
+//#####################################################
+BOOL WINAPI EnumDirectory(HANDLE hDirectory, LPWIN32_FIND_DATA pFindData)
+{
+    BOOL		fSuccess = FALSE;
+    LPDIRECTORY	pDirectory = (LPDIRECTORY)hDirectory;
+
+    if ( pDirectory )
+    {
+        BOOL	fValid;
+
+        do
+        {
+            if ( pDirectory->aFirstData.cFileName[0] )
+            {
+                *pFindData = pDirectory->aFirstData;
+                fSuccess = TRUE;
+                pDirectory->aFirstData.cFileName[0] = 0;
+            }
+            else if ( IsValidHandle( pDirectory->hFind ) )
+                fSuccess = FindNextFile( pDirectory->hFind, pFindData );
+            else
+            {
+                fSuccess = FALSE;
+                SetLastError( ERROR_NO_MORE_FILES );
+            }
+
+            fValid = fSuccess && _tcscmp( TEXT("."), pFindData->cFileName ) != 0 && _tcscmp( TEXT(".."), pFindData->cFileName ) != 0;
+
+        } while( fSuccess && !fValid );
+    }
+    else
+        SetLastError( ERROR_INVALID_HANDLE );
+
+    return fSuccess;
+}
+
+//#####################################################
+static BOOL WINAPI CloseDirectory(HANDLE hDirectory)
+{
+    BOOL		fSuccess = FALSE;
+    LPDIRECTORY	pDirectory = (LPDIRECTORY)hDirectory;
+
+    if (pDirectory)
+    {
+        if (IsValidHandle(pDirectory->hFind))
+            fSuccess = FindClose(pDirectory->hFind);
+
+        fSuccess = HeapFree(GetProcessHeap(), 0, pDirectory) && fSuccess;
+    }
+    else
+        SetLastError(ERROR_INVALID_HANDLE);
+
+    return fSuccess;
+}
+
+//#####################################################
+static oslFileError osl_openLocalRoot(
+    rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
+{
+    rtl_uString		*strSysPath = NULL;
+    oslFileError	error;
+        
+    if ( !pDirectory )
+        return osl_File_E_INVAL;
+
+    *pDirectory = NULL;
+
+    error = _osl_getSystemPathFromFileURL( strDirectoryPath, &strSysPath, sal_False );
+    if ( osl_File_E_None == error )
+    {
+        Directory_Impl	*pDirImpl;
+
+        pDirImpl = reinterpret_cast<Directory_Impl*>(rtl_allocateMemory( sizeof(Directory_Impl)));
+        _tcscpy( pDirImpl->szDirectoryPath, reinterpret_cast<LPCTSTR>(rtl_uString_getStr(strSysPath)) );
+
+        /* Append backslash if neccessary */
+
+        /* @@@ToDo
+           use function ensure backslash
+        */
+        if ( pDirImpl->szDirectoryPath[_tcslen(pDirImpl->szDirectoryPath) - 1] != L'\\' )
+            _tcscat( pDirImpl->szDirectoryPath, L"\\" );
+
+        pDirImpl->uType = DIRECTORYTYPE_LOCALROOT;
+        pDirImpl->hEnumDrives = OpenLogicalDrivesEnum();
+
+        /* @@@ToDo
+           Use IsValidHandle(...)
+        */
+        if ( pDirImpl->hEnumDrives != INVALID_HANDLE_VALUE )
+        {
+            *pDirectory = (oslDirectory)pDirImpl;
+            error = osl_File_E_None;
+        }
+        else
+        {
+            if ( pDirImpl )
+                rtl_freeMemory(pDirImpl);
+
+            error = oslTranslateFileError( GetLastError() );
+        }
+
+        rtl_uString_release( strSysPath );
+    }
+    return error;
+}
+
+//#####################################################
+static oslFileError SAL_CALL osl_openFileDirectory(
+    rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
+{
+    oslFileError error = osl_File_E_None;
+        
+    if ( !pDirectory )
+        return osl_File_E_INVAL;
+    *pDirectory = NULL;
+
+    Directory_Impl *pDirImpl = reinterpret_cast<Directory_Impl*>(rtl_allocateMemory(sizeof(Directory_Impl)));
+    _tcscpy( pDirImpl->szDirectoryPath, reinterpret_cast<LPCTSTR>(rtl_uString_getStr(strDirectoryPath)) );
+
+    /* Append backslash if neccessary */
+
+    /* @@@ToDo
+       use function ensure backslash
+    */
+    if ( pDirImpl->szDirectoryPath[_tcslen(pDirImpl->szDirectoryPath) - 1] != L'\\' )
+        _tcscat( pDirImpl->szDirectoryPath, L"\\" );
+
+    pDirImpl->uType = DIRECTORYTYPE_FILESYSTEM;
+    pDirImpl->hDirectory = OpenDirectory( pDirImpl->szDirectoryPath );
+
+    if ( !pDirImpl->hDirectory )
+    {
+        error = oslTranslateFileError( GetLastError() );
+
+        rtl_freeMemory(pDirImpl), pDirImpl = 0;
+    }
+
+    *pDirectory = (oslDirectory)(pDirImpl);
+    return error;
+}
+
+//#####################################################
+static oslFileError SAL_CALL osl_openNetworkServer(
+    rtl_uString *strSysDirPath, oslDirectory *pDirectory)
+{
+    NETRESOURCEW	aNetResource;
+    HANDLE			hEnum;
+    DWORD			dwError;
+
+    ZeroMemory( &aNetResource, sizeof(aNetResource) );
+
+    aNetResource.lpRemoteName = reinterpret_cast<LPWSTR>(strSysDirPath->buffer);
+
+    dwError = WNetOpenEnumW( 
+        RESOURCE_GLOBALNET, 
+        RESOURCETYPE_DISK, 
+        RESOURCEUSAGE_CONNECTABLE | RESOURCEUSAGE_CONTAINER, 
+        &aNetResource, 
+        &hEnum );
+
+    if ( ERROR_SUCCESS == dwError )
+    {
+        Directory_Impl	*pDirImpl;
+
+        pDirImpl = reinterpret_cast<Directory_Impl*>(rtl_allocateMemory(sizeof(Directory_Impl)));
+        pDirImpl->uType = DIRECTORYTYPE_NETROOT;
+        pDirImpl->hDirectory = hEnum;	
+        *pDirectory = (oslDirectory)pDirImpl;
+    }
+    return oslTranslateFileError( dwError );
+}
+
+//#############################################
+static DWORD create_dir_with_callback(
+    rtl_uString * dir_path,
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
+    void* pData)
+{
+    // Create the specified directory and call the 
+    // user specified callback function. On success
+    // the function returns ERROR_SUCCESS else a Win32 error code.
+
+    if (CreateDirectory(reinterpret_cast<LPCTSTR>(dir_path->buffer), NULL))
+    {
+        if (aDirectoryCreationCallbackFunc)
+        {
+            rtl::OUString url;
+            _osl_getFileURLFromSystemPath(dir_path, &(url.pData));
+            aDirectoryCreationCallbackFunc(pData, url.pData);
+        }
+        return ERROR_SUCCESS;
+    }
+    return GetLastError();
+}
+
+//#############################################
+static int path_make_parent(sal_Unicode* path)
+{    
+    /*  Cut off the last part of the given path to 
+    get the parent only, e.g. 'c:\dir\subdir' -> 
+    'c:\dir' or '\\share\sub\dir' -> '\\share\sub'
+    @return The position where the path has been cut 
+    off (this is the posistion of the last backslash).
+    If there are no more parents 0 will be returned, 
+    e.g. 'c:\' or '\\Share' have no more parents */        
+
+    OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) != -1, "Path must not contain slashes");
+    OSL_PRECOND(has_path_parent(path), "Path must have a parent");                
+                    
+    sal_Unicode* pos_last_backslash = path + rtl_ustr_lastIndexOfChar(path, BACKSLASH);
+    *pos_last_backslash = 0; 
+    return (pos_last_backslash - path);        
+}
+    
+//#############################################
+static DWORD create_dir_recursively_(
+    rtl_uString * dir_path,
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
+    void* pData)
+{
+    OSL_PRECOND(
+        rtl_ustr_lastIndexOfChar_WithLength(dir_path->buffer, dir_path->length, BACKSLASH) != dir_path->length,
+        "Path must not end with a backslash");
+        
+    DWORD w32_error = create_dir_with_callback(
+        dir_path, aDirectoryCreationCallbackFunc, pData);
+    if (w32_error == ERROR_SUCCESS)
+        return ERROR_SUCCESS;   
+                                
+    if ((w32_error != ERROR_PATH_NOT_FOUND) || !has_path_parent(dir_path->buffer))
+        return w32_error;
+
+    int pos = path_make_parent(dir_path->buffer); // dir_path->buffer[pos] = 0, restore below
+                            
+    w32_error = create_dir_recursively_(
+        dir_path, aDirectoryCreationCallbackFunc, pData);
+
+    dir_path->buffer[pos] = BACKSLASH; // restore
+
+    if (ERROR_SUCCESS != w32_error)
+        return w32_error;
+
+    return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData);
+}
+
+//#############################################
+oslFileError SAL_CALL osl_createDirectoryPath(
+    rtl_uString* aDirectoryUrl, 
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
+    void* pData)
+{   
+    if (aDirectoryUrl == NULL)
+        return osl_File_E_INVAL;
+        
+    rtl::OUString sys_path;         
+    oslFileError osl_error = 
+        _osl_getSystemPathFromFileURL(aDirectoryUrl, &sys_path.pData, sal_False);        
+    
+    if (osl_error != osl_File_E_None)
+        return osl_error;
+                                                                
+    osl::systemPathRemoveSeparator(sys_path);
+    
+    // const_cast because sys_path is a local copy
+    // which we want to modify inplace instead of 
+    // coyp it into another buffer on the heap again
+    return oslTranslateFileError(create_dir_recursively_(
+        sys_path.pData, aDirectoryCreationCallbackFunc, pData));                     
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_createDirectory(rtl_uString* strPath)
+{
+    rtl_uString	*strSysPath = NULL;
+    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
+
+    if ( osl_File_E_None == error )
+    {
+        if ( CreateDirectoryW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr( strSysPath )), NULL ) )
+            error = osl_File_E_None;
+/*@@@ToDo
+  The else case is a hack because the ucb or the webtop had some 
+  problems with the error code that CreateDirectory returns in
+  case the path is only a logical drive, should be removed!
+*/			
+        else
+        {
+            const sal_Unicode	*pBuffer = rtl_uString_getStr( strSysPath );
+            sal_Int32			nLen = rtl_uString_getLength( strSysPath );
+
+            if (
+                ( pBuffer[0] >= 'A' && pBuffer[0] <= 'Z' ||
+                  pBuffer[0] >= 'a' && pBuffer[0] <= 'z' ) &&
+                pBuffer[1] == ':' && ( nLen ==2 || nLen == 3 && pBuffer[2] == '\\' )
+                )
+                SetLastError( ERROR_ALREADY_EXISTS );
+
+            error = oslTranslateFileError( GetLastError() );
+        }
+
+        rtl_uString_release( strSysPath );
+    }
+    return error;
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_removeDirectory(rtl_uString* strPath)
+{
+    rtl_uString	*strSysPath = NULL;
+    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
+
+    if ( osl_File_E_None == error )
+    {
+        if ( RemoveDirectory( reinterpret_cast<LPCTSTR>(rtl_uString_getStr( strSysPath )) ) )
+            error = osl_File_E_None;
+        else
+            error = oslTranslateFileError( GetLastError() );
+
+        rtl_uString_release( strSysPath );
+    }
+    return error;
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_openDirectory(rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
+{
+    oslFileError	error;			
+
+    if ( 0 == rtl_ustr_ascii_compareIgnoreAsciiCase( strDirectoryPath->buffer, "file:///" ) )
+        error = osl_openLocalRoot( strDirectoryPath, pDirectory );
+    else
+    {
+        rtl_uString	*strSysDirectoryPath = NULL;
+        DWORD		dwPathType;
+
+        error = _osl_getSystemPathFromFileURL( strDirectoryPath, &strSysDirectoryPath, sal_False );
+
+        if ( osl_File_E_None != error )
+                return error;
+
+        dwPathType = IsValidFilePath( strSysDirectoryPath, NULL, VALIDATEPATH_NORMAL, NULL );
+
+        if ( dwPathType & PATHTYPE_IS_SERVER )
+        {
+            error = osl_openNetworkServer( strSysDirectoryPath, pDirectory );
+        }
+        else
+            error = osl_openFileDirectory( strSysDirectoryPath, pDirectory );
+
+        rtl_uString_release( strSysDirectoryPath );
+    }
+    return error;
+}
+
+//#####################################################
+static oslFileError SAL_CALL osl_getNextNetResource( 
+    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint )
+{
+    Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
+    DirectoryItem_Impl	*pItemImpl = NULL;
+    BYTE				buffer[16384];
+    LPNETRESOURCEW		lpNetResource = (LPNETRESOURCEW)buffer;
+    DWORD				dwError, dwCount, dwBufSize;
+
+    uHint = uHint; /* to get no warning */        	    
+
+    if ( !pItem )
+        return osl_File_E_INVAL;
+    *pItem = NULL;
+
+    if ( !pDirImpl )
+        return osl_File_E_INVAL;
+
+    dwCount = 1;
+    dwBufSize = sizeof(buffer);
+    dwError = WNetEnumResource( pDirImpl->hDirectory, &dwCount, lpNetResource, &dwBufSize );
+
+    switch ( dwError )
+    {
+        case NO_ERROR:
+        case ERROR_MORE_DATA:
+        {
+            pItemImpl = reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
+            if ( !pItemImpl )
+                return osl_File_E_NOMEM;
+
+            ZeroMemory( pItemImpl, sizeof(DirectoryItem_Impl) );
+            pItemImpl->uType = DIRECTORYITEM_DRIVE;
+            osl_acquireDirectoryItem( (oslDirectoryItem)pItemImpl );
+
+            wcscpy( pItemImpl->cDriveString, lpNetResource->lpRemoteName );
+
+            *pItem = pItemImpl;
+        }
+        return osl_File_E_None;
+        case ERROR_NO_MORE_ITEMS:
+            return osl_File_E_NOENT;
+        default:
+            return oslTranslateFileError( dwError );
+    }
+}
+
+//##################################################### 
+static oslFileError SAL_CALL osl_getNextDrive( 
+    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint )
+{
+    Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
+    DirectoryItem_Impl	*pItemImpl = NULL;
+    BOOL				fSuccess;
+
+    uHint = uHint; /* avoid warnings */
+                
+    if ( !pItem )
+        return osl_File_E_INVAL;
+    *pItem = NULL;
+
+    if ( !pDirImpl )
+        return osl_File_E_INVAL;
+
+    pItemImpl = reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
+    if ( !pItemImpl )
+        return osl_File_E_NOMEM;
+
+    ZeroMemory( pItemImpl, sizeof(DirectoryItem_Impl) );
+    pItemImpl->uType = DIRECTORYITEM_DRIVE;
+    osl_acquireDirectoryItem( (oslDirectoryItem)pItemImpl );
+    fSuccess = EnumLogicalDrives( pDirImpl->hEnumDrives, pItemImpl->cDriveString );
+
+    if ( fSuccess )
+    {
+        *pItem = pItemImpl;
+        return osl_File_E_None;
+    }
+    else
+    {
+        rtl_freeMemory( pItemImpl );
+        return oslTranslateFileError( GetLastError() );
+    }
+}
+
+//##################################################### 
+static oslFileError SAL_CALL osl_getNextFileItem( 
+    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint)
+{
+    Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
+    DirectoryItem_Impl	*pItemImpl = NULL;
+    BOOL				fFound;
+
+    uHint = uHint; /* avoid warnings */
+                
+    if ( !pItem )
+        return osl_File_E_INVAL;
+    *pItem = NULL;
+
+    if ( !pDirImpl )
+        return osl_File_E_INVAL;
+
+    pItemImpl = reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
+    if ( !pItemImpl )
+        return osl_File_E_NOMEM;
+
+    memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
+    fFound = EnumDirectory( pDirImpl->hDirectory, &pItemImpl->FindData );
+
+    if ( fFound )
+    {
+        pItemImpl->uType = DIRECTORYITEM_FILE;
+        pItemImpl->nRefCount = 1;
+        _tcscpy( pItemImpl->szFullPath, pDirImpl->szDirectoryPath );
+        _tcscat( pItemImpl->szFullPath, pItemImpl->FindData.cFileName );
+        pItemImpl->bFullPathNormalized = FALSE;
+        *pItem = (oslDirectoryItem)pItemImpl;
+        return osl_File_E_None;
+    }
+    else
+    {
+        rtl_freeMemory( pItemImpl );
+        return oslTranslateFileError( GetLastError() );
+    }
+}
+
+//##################################################### 
+oslFileError SAL_CALL osl_getNextDirectoryItem(
+    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint)
+{
+    Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
+    
+    /* Assume failure */
+
+    if ( !pItem )
+        return osl_File_E_INVAL;
+    *pItem = NULL;
+
+    if ( !pDirImpl )
+        return osl_File_E_INVAL;
+
+    switch ( pDirImpl->uType )
+    {
+    case DIRECTORYTYPE_LOCALROOT:
+        return osl_getNextDrive( Directory, pItem, uHint );
+    case DIRECTORYTYPE_NETROOT:
+        return osl_getNextNetResource( Directory, pItem, uHint );
+    case DIRECTORYTYPE_FILESYSTEM:
+        return osl_getNextFileItem( Directory, pItem, uHint );
+    default:
+        return osl_File_E_INVAL;
+    }
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory)
+{
+    Directory_Impl	*pDirImpl = (Directory_Impl *)Directory;
+    oslFileError	eError = osl_File_E_INVAL;
+
+    if ( pDirImpl )
+    {
+        switch ( pDirImpl->uType )
+        {
+        case DIRECTORYTYPE_FILESYSTEM:
+            eError = CloseDirectory( pDirImpl->hDirectory ) ? osl_File_E_None : oslTranslateFileError( GetLastError() );
+            break;
+        case DIRECTORYTYPE_LOCALROOT:
+            eError = CloseLogicalDrivesEnum( pDirImpl->hEnumDrives ) ? osl_File_E_None : oslTranslateFileError( GetLastError() );
+            break;
+        case DIRECTORYTYPE_NETROOT:
+            {
+                DWORD err = WNetCloseEnum(pDirImpl->hDirectory);
+                eError = (err == NO_ERROR) ? osl_File_E_None : oslTranslateFileError(err);
+            }
+            break;
+        default:
+            OSL_ENSURE( 0, "Invalid directory type" );
+            break;
+        }
+
+        rtl_freeMemory(pDirImpl);
+    }	
+    return eError;
+}
+
+//#####################################################
+/* Different types of paths */
+typedef enum _PATHTYPE
+{
+    PATHTYPE_SYNTAXERROR = 0,
+    PATHTYPE_NETROOT,
+    PATHTYPE_NETSERVER,
+    PATHTYPE_VOLUME,
+    PATHTYPE_FILE
+} PATHTYPE;
+
+oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirectoryItem *pItem)
+{
+    oslFileError	error = osl_File_E_None;
+    rtl_uString*	strSysFilePath = NULL;
+    PATHTYPE		type = PATHTYPE_FILE;
+    DWORD			dwPathType;
+
+    /* Assume failure */
+
+    if ( !pItem )
+        return osl_File_E_INVAL;
+
+    *pItem = NULL;
+
+
+    error = _osl_getSystemPathFromFileURL( strFilePath, &strSysFilePath, sal_False );
+
+    if ( osl_File_E_None != error )
+            return error;
+
+    dwPathType = IsValidFilePath( strSysFilePath, NULL, VALIDATEPATH_NORMAL, NULL );
+
+    if ( dwPathType & PATHTYPE_IS_VOLUME )
+        type = PATHTYPE_VOLUME;
+    else if ( dwPathType & PATHTYPE_IS_SERVER )
+        type = PATHTYPE_NETSERVER;
+    else
+        type = PATHTYPE_FILE;
+
+    switch ( type )
+    {
+    case PATHTYPE_NETSERVER:
+        {
+            DirectoryItem_Impl*	pItemImpl = 
+                reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
+
+            if ( !pItemImpl )
+                error = osl_File_E_NOMEM;
+
+            if ( osl_File_E_None == error )
+            {
+                ZeroMemory( pItemImpl, sizeof(DirectoryItem_Impl) );
+                pItemImpl->uType = DIRECTORYITEM_SERVER;
+
+                osl_acquireDirectoryItem( (oslDirectoryItem)pItemImpl );
+
+                _tcscpy( pItemImpl->szFullPath, reinterpret_cast<LPCTSTR>(strSysFilePath->buffer) );
+
+                // Assign a title anyway
+                {
+                    int iSrc = 2;
+                    int	iDst = 0;
+
+                    while( iSrc < strSysFilePath->length && strSysFilePath->buffer[iSrc] && strSysFilePath->buffer[iSrc] != '\\' )
+                    {
+                        pItemImpl->FindData.cFileName[iDst++] = strSysFilePath->buffer[iSrc++];
+                    }
+                }
+
+                *pItem = pItemImpl;
+            }
+        }
+        break;
+    case PATHTYPE_VOLUME:
+        {
+            DirectoryItem_Impl*	pItemImpl = 
+                reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
+
+            if ( !pItemImpl )
+                error = osl_File_E_NOMEM;
+
+            if ( osl_File_E_None == error )
+            {
+                ZeroMemory( pItemImpl, sizeof(DirectoryItem_Impl) );
+                pItemImpl->uType = DIRECTORYITEM_DRIVE;
+
+                osl_acquireDirectoryItem( (oslDirectoryItem)pItemImpl );
+
+                _tcscpy( pItemImpl->cDriveString, reinterpret_cast<LPCTSTR>(strSysFilePath->buffer) );
+                pItemImpl->cDriveString[0] = _toupper( pItemImpl->cDriveString[0] );
+
+                if ( pItemImpl->cDriveString[_tcslen(pItemImpl->cDriveString) - 1] != '\\' )
+                    _tcscat( pItemImpl->cDriveString, TEXT( "\\" ) );
+
+                *pItem = pItemImpl;
+            }
+        }
+        break;
+    case PATHTYPE_SYNTAXERROR:
+    case PATHTYPE_NETROOT:
+    case PATHTYPE_FILE:
+        {
+            HANDLE				hFind;
+            WIN32_FIND_DATA		aFindData;
+
+            if ( strSysFilePath->length > 0 && strSysFilePath->buffer[strSysFilePath->length - 1] == '\\' )
+                rtl_uString_newFromStr_WithLength( &strSysFilePath, strSysFilePath->buffer, strSysFilePath->length - 1 );
+
+            hFind = FindFirstFile( reinterpret_cast<LPCTSTR>(rtl_uString_getStr(strSysFilePath)), &aFindData );
+
+            if ( hFind != INVALID_HANDLE_VALUE )
+            {
+                DirectoryItem_Impl	*pItemImpl = 
+                    reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
+
+                ZeroMemory( pItemImpl, sizeof(DirectoryItem_Impl) );
+                osl_acquireDirectoryItem( (oslDirectoryItem)pItemImpl );
+
+                CopyMemory( &pItemImpl->FindData, &aFindData, sizeof(WIN32_FIND_DATA) );
+                _tcscpy( pItemImpl->szFullPath, reinterpret_cast<LPCTSTR>(rtl_uString_getStr(strSysFilePath)) );
+
+                // MT: This costs 600ms startup time on fast v60x!
+                // GetCaseCorrectPathName( pItemImpl->szFullPath, pItemImpl->szFullPath, sizeof(pItemImpl->szFullPath) );
+
+                pItemImpl->uType = DIRECTORYITEM_FILE;
+                *pItem = pItemImpl;
+                FindClose( hFind );
+            }
+            else
+                error = oslTranslateFileError( GetLastError() );
+        }
+        break;
+    }
+
+    if ( strSysFilePath )
+        rtl_uString_release( strSysFilePath );
+
+    return error;
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item )
+{
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
+
+    if ( !pItemImpl )
+        return osl_File_E_INVAL;
+
+    pItemImpl->nRefCount++;
+    return osl_File_E_None;
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item )
+{
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
+
+    if ( !pItemImpl )
+        return osl_File_E_INVAL;
+
+    if ( ! --pItemImpl->nRefCount )
+        rtl_freeMemory( pItemImpl );
+    return osl_File_E_None;
+}
+
+//#####################################################
+// volume / file info handling functions
+//#####################################################
+
+//#####################################################
+static inline bool is_floppy_A_present()
+{ return (GetLogicalDrives() & 1); }
+    
+//#####################################################
+static inline bool is_floppy_B_present()
+{ return (GetLogicalDrives() & 2); }
+    
+//#####################################################
+bool is_floppy_volume_mount_point(const rtl::OUString& path)
+{                   
+    // determines if a volume mount point shows to a floppy
+    // disk by comparing the unique volume names           
+    static const LPWSTR FLOPPY_A = L"A:\\";
+    static const LPWSTR FLOPPY_B = L"B:\\";
+
+    rtl::OUString p(path);
+    osl::systemPathEnsureSeparator(p);
+        
+    TCHAR vn[51];
+    if (GetVolumeNameForVolumeMountPoint(reinterpret_cast<LPCTSTR>(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
+    {       
+        TCHAR vnfloppy[51];
+        if (is_floppy_A_present() && 
+            GetVolumeNameForVolumeMountPoint(FLOPPY_A, vnfloppy, ELEMENTS_OF_ARRAY(vnfloppy)) &&
+            (0 == wcscmp(vn, vnfloppy)))
+            return true;
+                    
+        if (is_floppy_B_present() &&
+            GetVolumeNameForVolumeMountPoint(FLOPPY_B, vnfloppy, ELEMENTS_OF_ARRAY(vnfloppy)) &&
+            (0 == wcscmp(vn, vnfloppy)))
+            return true;
+    }
+    return false;
+}
+    
+//################################################
+static bool is_floppy_drive(const rtl::OUString& path)
+{
+    static const LPWSTR FLOPPY_DRV_LETTERS = TEXT("AaBb"); 
+
+    // we must take into account that even a floppy 
+    // drive may be mounted to a directory so checking
+    // for the drive letter alone is not sufficient
+    // we must compare the unique volume name with 
+    // that of the available floppy disks
+ 
+    const sal_Unicode* pszPath = path.getStr();
+    return ((wcschr(FLOPPY_DRV_LETTERS, pszPath[0]) && (L':' == pszPath[1])) || is_floppy_volume_mount_point(path));
+}
+    
+//#####################################################
+static bool is_volume_mount_point(const rtl::OUString& path)
+{
+    rtl::OUString p(path);        
+    osl::systemPathRemoveSeparator(p);
+            
+    bool  is_volume_root = false;
+        
+    if (!is_floppy_drive(p))
+    {
+        DWORD fattr = GetFileAttributes(reinterpret_cast<LPCTSTR>(p.getStr()));
+            
+        if ((INVALID_FILE_ATTRIBUTES != fattr) && 
+            (FILE_ATTRIBUTE_REPARSE_POINT & fattr))
+        {
+            WIN32_FIND_DATA find_data;
+            HANDLE h_find = FindFirstFile(reinterpret_cast<LPCTSTR>(p.getStr()), &find_data);    
+                           
+            if (IsValidHandle(h_find) &&
+                (FILE_ATTRIBUTE_REPARSE_POINT & find_data.dwFileAttributes) && 
+                (IO_REPARSE_TAG_MOUNT_POINT == find_data.dwReserved0))
+            {            
+                is_volume_root = true;
+            }        
+            if (IsValidHandle(h_find))
+                FindClose(h_find);
+        }
+    }
+    return is_volume_root;
+}
+
+//#############################################
+static UINT get_volume_mount_point_drive_type(const rtl::OUString& path)
+{
+    if (0 == path.getLength())
+        return GetDriveType(NULL);
+        
+    rtl::OUString p(path);
+    osl::systemPathEnsureSeparator(p);
+        
+    TCHAR vn[51];  
+    if (GetVolumeNameForVolumeMountPoint(reinterpret_cast<LPCTSTR>(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
+        return GetDriveType(vn);
+        
+    return DRIVE_NO_ROOT_DIR;  
+}
+
+//#############################################
+static inline bool is_drivetype_request(sal_uInt32 field_mask)
+{
+    return (field_mask & osl_VolumeInfo_Mask_Attributes);
+}
+
+//#############################################
+static oslFileError osl_get_drive_type(
+    const rtl::OUString& path, oslVolumeInfo* pInfo)
+{
+    // GetDriveType fails on empty volume mount points
+    // see Knowledge Base Q244089
+    UINT drive_type;
+    if (is_volume_mount_point(path))
+        drive_type = get_volume_mount_point_drive_type(path);
+    else
+        drive_type = GetDriveType(reinterpret_cast<LPCTSTR>(path.getStr()));
+        
+    if (DRIVE_NO_ROOT_DIR == drive_type)
+        return oslTranslateFileError(ERROR_INVALID_DRIVE);
+                
+    pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;		
+
+    switch (drive_type)
+    {
+        case DRIVE_CDROM:
+            pInfo->uAttributes |= osl_Volume_Attribute_CompactDisc | osl_Volume_Attribute_Removeable;
+            break;
+        case DRIVE_REMOVABLE:
+            pInfo->uAttributes |= osl_Volume_Attribute_Removeable;
+            if (is_floppy_drive(path))
+                pInfo->uAttributes |= osl_Volume_Attribute_FloppyDisk;
+            break;
+        case DRIVE_FIXED:
+            pInfo->uAttributes |= osl_Volume_Attribute_FixedDisk;
+            break;
+        case DRIVE_RAMDISK:
+            pInfo->uAttributes |= osl_Volume_Attribute_RAMDisk;
+            break;
+        case DRIVE_REMOTE:
+            pInfo->uAttributes |= osl_Volume_Attribute_Remote;
+            break;
+        case DRIVE_UNKNOWN:
+            pInfo->uAttributes = 0;
+            break;		
+        default:
+            pInfo->uValidFields &= ~osl_VolumeInfo_Mask_Attributes;
+            pInfo->uAttributes = 0;
+            break;
+    }
+    return osl_File_E_None;    
+}
+
+//#############################################
+static inline bool is_volume_space_info_request(sal_uInt32 field_mask)
+{
+    return (field_mask & 
+            (osl_VolumeInfo_Mask_TotalSpace | 
+             osl_VolumeInfo_Mask_UsedSpace  | 
+             osl_VolumeInfo_Mask_FreeSpace));
+}
+    
+//#############################################
+static void get_volume_space_information(
+    const rtl::OUString& path, oslVolumeInfo *pInfo)
+{
+    BOOL ret = GetDiskFreeSpaceEx(
+        reinterpret_cast<LPCTSTR>(path.getStr()), 
+        (PULARGE_INTEGER)&(pInfo->uFreeSpace),
+        (PULARGE_INTEGER)&(pInfo->uTotalSpace),
+        NULL);
+            
+    if (ret)
+    {			    			    
+        pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace | 
+            osl_VolumeInfo_Mask_UsedSpace | 
+            osl_VolumeInfo_Mask_FreeSpace;
+    }
+}
+    
+//#############################################
+static inline bool is_filesystem_attributes_request(sal_uInt32 field_mask)
+{
+    return (field_mask & 
+            (osl_VolumeInfo_Mask_MaxNameLength | 
+             osl_VolumeInfo_Mask_MaxPathLength | 
+             osl_VolumeInfo_Mask_FileSystemName | 
+             osl_VolumeInfo_Mask_FileSystemCaseHandling));
+}
+    
+//#############################################
+static oslFileError get_filesystem_attributes(
+    const rtl::OUString& path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
+{
+    pInfo->uAttributes = 0;
+        
+    // osl_get_drive_type must be called first because
+    // this function resets osl_VolumeInfo_Mask_Attributes
+    // on failure
+    if (is_drivetype_request(field_mask))
+    {
+        oslFileError osl_error = osl_get_drive_type(path, pInfo);
+        if (osl_File_E_None != osl_error)
+            return osl_error;
+    }
+    if (is_filesystem_attributes_request(field_mask))
+    {
+        WCHAR vn[MAX_PATH];
+        WCHAR fsn[MAX_PATH];
+        DWORD serial;
+        DWORD mcl;
+        DWORD flags;
+            
+        LPCTSTR pszPath = reinterpret_cast<LPCTSTR>(path.getStr());
+        if (GetVolumeInformation(pszPath, vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH))
+        {		
+            pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxNameLength;
+            pInfo->uMaxNameLength  = mcl;
+            
+            pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxPathLength;
+            pInfo->uMaxPathLength  = MAX_PATH;
+
+            pInfo->uValidFields   |= osl_VolumeInfo_Mask_FileSystemName;
+            rtl_uString_newFromStr(&pInfo->ustrFileSystemName, reinterpret_cast<const sal_Unicode*>(fsn));
+                
+            // volumes (even NTFS) will always be considered case
+            // insensitive because the Win32 API is not able to
+            // deal with case sensitive volumes see M$ Knowledge Base
+            // article 100625 that's why we never set the attribute
+            // osl_Volume_Attribute_Case_Sensitive
+                
+            if (flags & FS_CASE_IS_PRESERVED)
+                pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
+                    
+            pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
+        }
+    }
+    return osl_File_E_None;
+}
+    
+//#####################################################
+static bool path_get_parent(rtl::OUString& path)
+{   
+    OSL_PRECOND(path.lastIndexOf(SLASH) == -1, "Path must not have slashes");
+        
+    if (!has_path_parent(path))
+    {
+        sal_Int32 i = path.lastIndexOf(BACKSLASH);                        
+        if (-1 < i)
+        {
+            path = rtl::OUString(path.getStr(), i);
+            return true;                    
+        }
+    }
+    return false;
+}
+    
+//##################################################### 
+static void path_travel_to_volume_root(const rtl::OUString& system_path, rtl::OUString& volume_root)
+{
+    rtl::OUString sys_path(system_path);
+        
+    while(!is_volume_mount_point(sys_path) && path_get_parent(sys_path))
+        /**/;
+        
+    volume_root = sys_path;
+    osl::systemPathEnsureSeparator(volume_root);                            
+}
+
+//#############################################
+oslFileError SAL_CALL osl_getVolumeInformation( 
+    rtl_uString *ustrURL, oslVolumeInfo *pInfo, sal_uInt32 uFieldMask )
+{			
+    if (!pInfo)
+        return osl_File_E_INVAL;
+
+    rtl::OUString system_path;		
+    oslFileError error = _osl_getSystemPathFromFileURL(ustrURL, &system_path.pData, sal_False);
+    
+    if (osl_File_E_None != error)
+        return error;
+    
+    rtl::OUString volume_root;
+    path_travel_to_volume_root(system_path, volume_root);        
+                
+    pInfo->uValidFields = 0;
+    
+    if ((error = get_filesystem_attributes(volume_root, uFieldMask, pInfo)) != osl_File_E_None)
+        return error;
+                
+    if (is_volume_space_info_request(uFieldMask)) 
+        get_volume_space_information(volume_root, pInfo);
+                
+    if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
+    {
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_DeviceHandle;
+        osl_getFileURLFromSystemPath(volume_root.pData, (rtl_uString**)&pInfo->pDeviceHandle);
+    }
+    
+    return osl_File_E_None;
+}
+
+//##################################################### 
+static oslFileError SAL_CALL osl_getDriveInfo(
+    oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask)
+{
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
+    TCHAR				cDrive[3] = TEXT("A:");
+    TCHAR				cRoot[4] = TEXT("A:\\");
+
+    if ( !pItemImpl )
+        return osl_File_E_INVAL;
+
+    pStatus->uValidFields = 0;
+
+    cDrive[0] = pItemImpl->cDriveString[0];
+    cRoot[0] = pItemImpl->cDriveString[0];
+
+    if ( uFieldMask & osl_FileStatus_Mask_FileName )
+    {
+        if ( pItemImpl->cDriveString[0] == '\\' && pItemImpl->cDriveString[1] == '\\' )
+        {
+            LPCWSTR	lpFirstBkSlash = wcschr( &pItemImpl->cDriveString[2], '\\' );
+
+            if ( lpFirstBkSlash && lpFirstBkSlash[1] )
+            {
+                LPCWSTR	lpLastBkSlash = wcschr( &lpFirstBkSlash[1], '\\' );
+
+                if ( lpLastBkSlash )
+                    rtl_uString_newFromStr_WithLength( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(&lpFirstBkSlash[1]), lpLastBkSlash - lpFirstBkSlash - 1 );
+                else
+                    rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(&lpFirstBkSlash[1]) );
+                pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
+            }
+        }
+        else switch ( GetDriveType( cRoot ) )
+        {
+            case DRIVE_REMOTE:
+            {
+                TCHAR szBuffer[1024];
+                DWORD const dwBufsizeConst = ELEMENTS_OF_ARRAY(szBuffer);
+                DWORD dwBufsize = dwBufsizeConst;
+
+                DWORD dwResult = WNetGetConnection( cDrive, szBuffer, &dwBufsize );
+                if ( NO_ERROR == dwResult )
+                {
+                    TCHAR szFileName[dwBufsizeConst + 16];
+
+                    swprintf( szFileName, L"%s [%s]", cDrive, szBuffer );
+                    rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(szFileName) );
+                }
+                else
+                    rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(cDrive) );
+            }
+            pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
+            break;
+            case DRIVE_FIXED:
+            {
+                TCHAR szVolumeNameBuffer[1024];
+                DWORD const dwBufsizeConst = ELEMENTS_OF_ARRAY(szVolumeNameBuffer);
+
+                if ( GetVolumeInformation( cRoot, szVolumeNameBuffer, dwBufsizeConst, NULL, NULL, NULL, NULL, 0 ) )
+                {
+                    TCHAR	szFileName[dwBufsizeConst + 16];
+
+                    swprintf( szFileName, L"%s [%s]", cDrive, szVolumeNameBuffer );
+                    rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(szFileName) );
+                }
+                else
+                    rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(cDrive) );
+            }
+            pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
+            break;
+            case DRIVE_CDROM:
+            case DRIVE_REMOVABLE:
+                pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
+                rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(cRoot) );
+                break;
+            case DRIVE_UNKNOWN:
+            default:
+                break;
+        }
+    }
+
+    pStatus->eType = osl_File_Type_Volume;
+    pStatus->uValidFields |= osl_FileStatus_Mask_Type;
+
+    if ( uFieldMask & osl_FileStatus_Mask_FileURL )
+    {
+        rtl_uString	*ustrSystemPath = NULL;
+
+        rtl_uString_newFromStr( &ustrSystemPath, reinterpret_cast<const sal_Unicode*>(pItemImpl->cDriveString) );
+        osl_getFileURLFromSystemPath( ustrSystemPath, &pStatus->ustrFileURL );
+        rtl_uString_release( ustrSystemPath );
+        pStatus->uValidFields |= osl_FileStatus_Mask_FileURL;
+    }
+    return osl_File_E_None;
+}
+
+//##################################################### 
+static oslFileError SAL_CALL osl_getServerInfo( 
+    oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask )
+{
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
+    if ( !pItemImpl )
+        return osl_File_E_INVAL;
+
+    pStatus->uValidFields = 0;
+
+    //	pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
+
+    //	if ( _tcscmp( pItemImpl->FindData.cFileName, TEXT(".") ) == 0 )
+    //		rtl_uString_newFromAscii( &pStatus->ustrFileName, "/" );
+    //	else
+    //		rtl_uString_newFromStr( &pStatus->ustrFileName, pItemImpl->FindData.cFileName );
+
+    pStatus->eType = osl_File_Type_Directory;
+    pStatus->uValidFields |= osl_FileStatus_Mask_Type;
+
+    if ( uFieldMask & osl_FileStatus_Mask_FileURL )
+    {
+        rtl_uString	*ustrSystemPath = NULL;
+
+        rtl_uString_newFromStr( &ustrSystemPath, reinterpret_cast<const sal_Unicode*>(pItemImpl->szFullPath) );
+        osl_getFileURLFromSystemPath( ustrSystemPath, &pStatus->ustrFileURL );
+        rtl_uString_release( ustrSystemPath );
+        pStatus->uValidFields |= osl_FileStatus_Mask_FileURL;
+    }
+    return osl_File_E_None;
+}
+
+//#############################################
+oslFileError SAL_CALL osl_getFileStatus( 
+    oslDirectoryItem Item, 
+    oslFileStatus *pStatus, 
+    sal_uInt32 uFieldMask )
+{
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
+
+    if ( !pItemImpl )
+        return osl_File_E_INVAL;
+
+    switch ( pItemImpl->uType  )
+    {
+    case DIRECTORYITEM_DRIVE:
+        return osl_getDriveInfo( Item, pStatus, uFieldMask );
+    case DIRECTORYITEM_SERVER:
+        return osl_getServerInfo( Item, pStatus, uFieldMask );
+    default:
+        break;
+    }
+
+    if ( uFieldMask & osl_FileStatus_Mask_Validate )
+    {
+        HANDLE	hFind = FindFirstFile( pItemImpl->szFullPath, &pItemImpl->FindData );
+
+        if ( hFind != INVALID_HANDLE_VALUE )
+            FindClose( hFind );
+        else
+            return oslTranslateFileError( GetLastError() );
+
+        uFieldMask &= ~	osl_FileStatus_Mask_Validate;
+    }
+
+    /* If no fields to retrieve left ignore pStatus */
+    if ( !uFieldMask )
+        return osl_File_E_None;
+
+    /* Otherwise, this must be a valid pointer */
+    if ( !pStatus )
+        return osl_File_E_INVAL;
+
+    if ( pStatus->uStructSize != sizeof(oslFileStatus) )
+        return osl_File_E_INVAL;
+
+    pStatus->uValidFields = 0;
+
+    /* File time stamps */
+
+    if ( (uFieldMask & osl_FileStatus_Mask_ModifyTime) &&
+        FileTimeToTimeValue( &pItemImpl->FindData.ftLastWriteTime, &pStatus->aModifyTime ) )
+        pStatus->uValidFields |= osl_FileStatus_Mask_ModifyTime;
+
+    if ( (uFieldMask & osl_FileStatus_Mask_AccessTime) &&
+        FileTimeToTimeValue( &pItemImpl->FindData.ftLastAccessTime, &pStatus->aAccessTime ) )
+        pStatus->uValidFields |= osl_FileStatus_Mask_AccessTime;
+
+    if ( (uFieldMask & osl_FileStatus_Mask_CreationTime) &&
+        FileTimeToTimeValue( &pItemImpl->FindData.ftCreationTime, &pStatus->aCreationTime ) )
+        pStatus->uValidFields |= osl_FileStatus_Mask_CreationTime;
+
+    /* Most of the fields are already set, regardless of requiered fields */
+
+    rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(pItemImpl->FindData.cFileName) );
+    pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
+
+    if ((FILE_ATTRIBUTE_REPARSE_POINT & pItemImpl->FindData.dwFileAttributes) &&
+        (IO_REPARSE_TAG_MOUNT_POINT == pItemImpl->FindData.dwReserved0))
+        pStatus->eType = osl_File_Type_Volume;
+    else if (pItemImpl->FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+        pStatus->eType = osl_File_Type_Directory;
+    else    
+        pStatus->eType = osl_File_Type_Regular;
+        
+    pStatus->uValidFields |= osl_FileStatus_Mask_Type;
+
+    pStatus->uAttributes = pItemImpl->FindData.dwFileAttributes;
+    pStatus->uValidFields |= osl_FileStatus_Mask_Attributes;
+
+    pStatus->uFileSize = (sal_uInt64)pItemImpl->FindData.nFileSizeLow + ((sal_uInt64)pItemImpl->FindData.nFileSizeHigh << 32);
+    pStatus->uValidFields |= osl_FileStatus_Mask_FileSize;
+
+    if ( uFieldMask & osl_FileStatus_Mask_LinkTargetURL )
+    {
+        rtl_uString	*ustrFullPath = NULL;
+
+        rtl_uString_newFromStr( &ustrFullPath, reinterpret_cast<const sal_Unicode*>(pItemImpl->szFullPath) );
+        osl_getFileURLFromSystemPath( ustrFullPath, &pStatus->ustrLinkTargetURL );
+        rtl_uString_release( ustrFullPath );
+
+        pStatus->uValidFields |= osl_FileStatus_Mask_LinkTargetURL;
+    }
+
+    if ( uFieldMask & osl_FileStatus_Mask_FileURL )
+    {
+        rtl_uString	*ustrFullPath = NULL;
+
+
+        if ( !pItemImpl->bFullPathNormalized )
+        {
+            GetCaseCorrectPathName( pItemImpl->szFullPath, pItemImpl->szFullPath, sizeof(pItemImpl->szFullPath) );
+            pItemImpl->bFullPathNormalized = TRUE;
+        }
+        rtl_uString_newFromStr( &ustrFullPath, reinterpret_cast<const sal_Unicode*>(pItemImpl->szFullPath) );
+        osl_getFileURLFromSystemPath( ustrFullPath, &pStatus->ustrFileURL );
+        rtl_uString_release( ustrFullPath );
+        pStatus->uValidFields |= osl_FileStatus_Mask_FileURL;
+    }
+
+    return osl_File_E_None;
+}
+
+//#####################################################
+// file attributes handling functions
+//#####################################################
+
+//#############################################
+oslFileError SAL_CALL osl_setFileAttributes( 
+    rtl_uString *ustrFileURL, 
+    sal_uInt64 uAttributes )
+{
+    oslFileError	error;
+    rtl_uString		*ustrSysPath = NULL;
+    DWORD			dwFileAttributes;
+    BOOL			fSuccess;
+
+    // Converts the normalized path into a systempath
+    error = _osl_getSystemPathFromFileURL( ustrFileURL, &ustrSysPath, sal_False );
+
+    if ( osl_File_E_None != error )
+        return error;
+
+    dwFileAttributes = GetFileAttributes( reinterpret_cast<LPCTSTR>(rtl_uString_getStr(ustrSysPath)) );
+
+    if ( (DWORD)-1 != dwFileAttributes )
+    {
+        dwFileAttributes &= ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN);
+
+        if ( uAttributes & osl_File_Attribute_ReadOnly )
+            dwFileAttributes |= FILE_ATTRIBUTE_READONLY;
+
+        if ( uAttributes & osl_File_Attribute_Hidden )
+            dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN;
+
+        fSuccess = SetFileAttributes( reinterpret_cast<LPCTSTR>(rtl_uString_getStr(ustrSysPath)), dwFileAttributes );
+    }
+    else
+        fSuccess = FALSE;
+
+    if ( !fSuccess )
+        error = oslTranslateFileError( GetLastError() );
+
+    rtl_uString_release( ustrSysPath );
+
+    return error;
+}
+
+//##################################################### 
+oslFileError SAL_CALL osl_setFileTime(
+    rtl_uString *filePath, 
+    const TimeValue *aCreationTime, 
+    const TimeValue *aLastAccessTime, 
+    const TimeValue *aLastWriteTime)
+{
+    oslFileError error;
+    rtl_uString *sysPath=NULL;
+    FILETIME *lpCreationTime=NULL;
+    FILETIME *lpLastAccessTime=NULL;
+    FILETIME *lpLastWriteTime=NULL;
+    FILETIME ftCreationTime;
+    FILETIME ftLastAccessTime;
+    FILETIME ftLastWriteTime;
+    HANDLE hFile;
+    BOOL fSuccess;
+
+
+    error=_osl_getSystemPathFromFileURL(filePath, &sysPath, sal_False);
+
+    if (error==osl_File_E_INVAL)
+        return error;
+
+    hFile=CreateFileW(reinterpret_cast<LPCWSTR>(rtl_uString_getStr(sysPath)), GENERIC_WRITE, 0, NULL , OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    rtl_uString_release(sysPath);
+
+    if (hFile==INVALID_HANDLE_VALUE)
+        return osl_File_E_NOENT;
+
+    if (TimeValueToFileTime(aCreationTime, &ftCreationTime))
+        lpCreationTime=&ftCreationTime;
+
+    if (TimeValueToFileTime(aLastAccessTime, &ftLastAccessTime))
+        lpLastAccessTime=&ftLastAccessTime;
+
+    if (TimeValueToFileTime(aLastWriteTime, &ftLastWriteTime))
+        lpLastWriteTime=&ftLastWriteTime;
+
+    fSuccess=SetFileTime(hFile, lpCreationTime, lpLastAccessTime, lpLastWriteTime);
+
+    CloseHandle(hFile);
+
+    if (!fSuccess)
+        return osl_File_E_INVAL;
+    else
+        return osl_File_E_None;
+}
diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
new file mode 100644
index 000000000..d79bd524b
--- /dev/null
+++ b/sal/osl/w32/file_error.c
@@ -0,0 +1,154 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: file_error.c,v $
+ * $Revision: 1.0 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#define UNICODE
+#define _UNICODE
+#define _WIN32_WINNT_0x0500
+#include "systools/win32/uwinapi.h"
+
+#include "file_error.h"
+
+#include "osl/diagnose.h"
+#include "osl/thread.h"
+
+/* OS error to oslFileError values mapping table */
+struct osl_file_error_entry
+{
+    unsigned long oscode; /* OS return value */
+    int errnocode;        /* oslFileError code */
+};
+
+static const struct osl_file_error_entry errtable[] = {
+  {  ERROR_SUCCESS,				   osl_File_E_None     },  /* 0 */
+  {  ERROR_INVALID_FUNCTION,       osl_File_E_INVAL    },  /* 1 */
+  {  ERROR_FILE_NOT_FOUND,         osl_File_E_NOENT    },  /* 2 */
+  {  ERROR_PATH_NOT_FOUND,         osl_File_E_NOENT    },  /* 3 */
+  {  ERROR_TOO_MANY_OPEN_FILES,    osl_File_E_MFILE    },  /* 4 */
+  {  ERROR_ACCESS_DENIED,          osl_File_E_ACCES    },  /* 5 */
+  {  ERROR_INVALID_HANDLE,         osl_File_E_BADF     },  /* 6 */
+  {  ERROR_ARENA_TRASHED,          osl_File_E_NOMEM    },  /* 7 */
+  {  ERROR_NOT_ENOUGH_MEMORY,      osl_File_E_NOMEM    },  /* 8 */
+  {  ERROR_INVALID_BLOCK,          osl_File_E_NOMEM    },  /* 9 */
+  {  ERROR_BAD_ENVIRONMENT,        osl_File_E_2BIG     },  /* 10 */
+  {  ERROR_BAD_FORMAT,             osl_File_E_NOEXEC   },  /* 11 */
+  {  ERROR_INVALID_ACCESS,         osl_File_E_INVAL    },  /* 12 */
+  {  ERROR_INVALID_DATA,           osl_File_E_INVAL    },  /* 13 */
+  {  ERROR_INVALID_DRIVE,          osl_File_E_NOENT    },  /* 15 */
+  {  ERROR_CURRENT_DIRECTORY,      osl_File_E_ACCES    },  /* 16 */
+  {  ERROR_NOT_SAME_DEVICE,        osl_File_E_XDEV     },  /* 17 */
+  {  ERROR_NO_MORE_FILES,          osl_File_E_NOENT    },  /* 18 */
+  {  ERROR_NOT_READY,              osl_File_E_NOTREADY },  /* 21 */
+  {  ERROR_LOCK_VIOLATION,         osl_File_E_ACCES    },  /* 33 */
+  {  ERROR_BAD_NETPATH,            osl_File_E_NOENT    },  /* 53 */
+  {  ERROR_NETWORK_ACCESS_DENIED,  osl_File_E_ACCES    },  /* 65 */
+  {  ERROR_BAD_NET_NAME,           osl_File_E_NOENT    },  /* 67 */
+  {  ERROR_FILE_EXISTS,            osl_File_E_EXIST    },  /* 80 */
+  {  ERROR_CANNOT_MAKE,            osl_File_E_ACCES    },  /* 82 */
+  {  ERROR_FAIL_I24,               osl_File_E_ACCES    },  /* 83 */
+  {  ERROR_INVALID_PARAMETER,      osl_File_E_INVAL    },  /* 87 */
+  {  ERROR_NO_PROC_SLOTS,          osl_File_E_AGAIN    },  /* 89 */
+  {  ERROR_DRIVE_LOCKED,           osl_File_E_ACCES    },  /* 108 */
+  {  ERROR_BROKEN_PIPE,            osl_File_E_PIPE     },  /* 109 */
+  {  ERROR_DISK_FULL,              osl_File_E_NOSPC    },  /* 112 */
+  {  ERROR_INVALID_TARGET_HANDLE,  osl_File_E_BADF     },  /* 114 */
+  {  ERROR_INVALID_HANDLE,         osl_File_E_INVAL    },  /* 124 */
+  {  ERROR_WAIT_NO_CHILDREN,       osl_File_E_CHILD    },  /* 128 */
+  {  ERROR_CHILD_NOT_COMPLETE,     osl_File_E_CHILD    },  /* 129 */
+  {  ERROR_DIRECT_ACCESS_HANDLE,   osl_File_E_BADF     },  /* 130 */
+  {  ERROR_NEGATIVE_SEEK,          osl_File_E_INVAL    },  /* 131 */
+  {  ERROR_SEEK_ON_DEVICE,         osl_File_E_ACCES    },  /* 132 */
+  {  ERROR_DIR_NOT_EMPTY,          osl_File_E_NOTEMPTY },  /* 145 */
+  {  ERROR_NOT_LOCKED,             osl_File_E_ACCES    },  /* 158 */
+  {  ERROR_BAD_PATHNAME,           osl_File_E_NOENT    },  /* 161 */
+  {  ERROR_MAX_THRDS_REACHED,      osl_File_E_AGAIN    },  /* 164 */
+  {  ERROR_LOCK_FAILED,            osl_File_E_ACCES    },  /* 167 */
+  {  ERROR_ALREADY_EXISTS,         osl_File_E_EXIST    },  /* 183 */
+  {  ERROR_FILENAME_EXCED_RANGE,   osl_File_E_NOENT    },  /* 206 */
+  {  ERROR_NESTING_NOT_ALLOWED,    osl_File_E_AGAIN    },  /* 215 */
+  {  ERROR_DIRECTORY,              osl_File_E_NOENT    },  /* 267 */
+  {  ERROR_NOT_ENOUGH_QUOTA,       osl_File_E_NOMEM    },  /* 1816 */
+  {  ERROR_UNEXP_NET_ERR,          osl_File_E_NETWORK  }   /* 59 */
+};
+    
+/* The following two constants must be the minimum and maximum
+   values in the (contiguous) range of osl_File_E_xec Failure errors.
+*/
+#define MIN_EXEC_ERROR ERROR_INVALID_STARTING_CODESEG
+#define MAX_EXEC_ERROR ERROR_INFLOOP_IN_RELOC_CHAIN
+
+/* These are the low and high value in the range of errors that are
+   access violations
+*/
+#define MIN_EACCES_RANGE ERROR_WRITE_PROTECT
+#define MAX_EACCES_RANGE ERROR_SHARING_BUFFER_EXCEEDED
+
+oslFileError oslTranslateFileError (/*DWORD*/ unsigned long dwError)
+{
+    static const int n = sizeof(errtable)/sizeof(errtable[0]);
+
+    int i;
+    for (i = 0; i < n; ++i )
+    {
+        if (dwError == errtable[i].oscode)
+            return (oslFileError)(errtable[i].errnocode);
+    }
+
+    /* The error code wasn't in the table.  We check for a range of 
+       osl_File_E_ACCES errors or exec failure errors (ENOEXEC).  
+       Otherwise osl_File_E_INVAL is returned.
+    */
+    if ( (dwError >= MIN_EACCES_RANGE) && (dwError <= MAX_EACCES_RANGE) )
+        return osl_File_E_ACCES;
+    else if ( (dwError >= MIN_EXEC_ERROR) && (dwError <= MAX_EXEC_ERROR) )
+        return osl_File_E_NOEXEC;
+    else
+        return osl_File_E_INVAL;
+}
+
+//##################################################### 
+#if OSL_DEBUG_LEVEL > 0
+void _osl_warnFile( const char *message, rtl_uString *ustrFile )
+{
+    char szBuffer[2048];
+
+    if (ustrFile)
+    {
+        rtl_String	*strFile = NULL;
+
+        rtl_uString2String( &strFile, rtl_uString_getStr( ustrFile ), rtl_uString_getLength( ustrFile ),
+                            osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
+        snprintf( szBuffer, sizeof(szBuffer), message, strFile->buffer );
+        rtl_string_release( strFile );
+
+        message = szBuffer;
+    }
+    OSL_ENSURE( 0, message );
+}
+#endif /* OSL_DEBUG_LEVEL */
diff --git a/sal/osl/w32/file_error.h b/sal/osl/w32/file_error.h
new file mode 100644
index 000000000..c59e513f0
--- /dev/null
+++ b/sal/osl/w32/file_error.h
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: file_error.h,v $
+ * $Revision: 1.0 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_OSL_FILE_ERROR_H
+#define INCLUDED_OSL_FILE_ERROR_H
+
+#include "osl/file.h"
+#include "rtl/ustring.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+oslFileError oslTranslateFileError (/*DWORD*/ unsigned long dwError);
+
+#if OSL_DEBUG_LEVEL > 0
+void _osl_warnFile (const char * message, rtl_uString * ustrFile);
+#define OSL_ENSURE_FILE( cond, msg, file ) ( (cond) ?  (void)0 : _osl_warnFile( msg, file ) )
+#else
+#define OSL_ENSURE_FILE( cond, msg, file ) ((void)0)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* INCLUDED_OSL_FILE_ERROR_H */
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
new file mode 100644
index 000000000..fe916de83
--- /dev/null
+++ b/sal/osl/w32/file_url.cxx
@@ -0,0 +1,1019 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: file_url.cxx,v $
+ * $Revision: 1.0 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#define UNICODE
+#define _UNICODE
+#define _WIN32_WINNT_0x0500
+#include "systools/win32/uwinapi.h"
+
+#include "file_url.h"
+#include "file_error.h"
+
+#include "rtl/alloc.h"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "osl/mutex.h"
+
+#include <stdio.h>
+#include <tchar.h>
+
+#if OSL_DEBUG_LEVEL > 0
+#define OSL_ENSURE_FILE( cond, msg, file ) ( (cond) ?  (void)0 : _osl_warnFile( msg, file ) )
+#else
+#define OSL_ENSURE_FILE( cond, msg, file ) ((void)0)
+#endif
+
+#define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0])))
+
+//##################################################################
+// FileURL functions
+//##################################################################
+
+extern "C" oslMutex g_CurrentDirectoryMutex; /* Initialized in dllentry.c */
+oslMutex g_CurrentDirectoryMutex = 0;
+
+//#####################################################
+static BOOL IsValidFilePathComponent(
+    LPCTSTR lpComponent, LPCTSTR *lppComponentEnd, DWORD dwFlags)
+{
+        LPCTSTR	lpComponentEnd = NULL;
+        LPCTSTR	lpCurrent = lpComponent;
+        BOOL	fValid = TRUE;	/* Assume success */
+        TCHAR	cLast = 0;
+
+        /* Path component length must not exceed MAX_PATH */
+
+        while ( !lpComponentEnd && lpCurrent && lpCurrent - lpComponent < MAX_PATH )
+        {
+            switch ( *lpCurrent )
+            {
+                /* Both backslash and slash determine the end of a path component */
+            case '\0':
+            case '/':
+            case '\\':
+                switch ( cLast )
+                {
+                    /* Component must not end with '.' or blank and can't be empty */
+
+                case '.':
+                    if ( dwFlags & VALIDATEPATH_ALLOW_ELLIPSE )
+                    {
+					    if ( (dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD) ||
+							 1 == lpCurrent - lpComponent )
+                        {
+						    /* Either do allow periods anywhere, or current directory */
+                            lpComponentEnd = lpCurrent;
+                            break;
+                        }
+                        else if ( 2 == lpCurrent - lpComponent && '.' == *lpComponent )
+                        {
+                            /* Parent directory is O.K. */
+                            lpComponentEnd = lpCurrent;
+                            break;
+                        }
+                    }
+                case 0:
+                case ' ':
+					if ( dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD )
+						lpComponentEnd = lpCurrent;
+					else
+					{
+						lpComponentEnd = lpCurrent - 1;
+						fValid = FALSE;
+					}
+                    break;
+                default:
+                    lpComponentEnd = lpCurrent;
+                    break;
+                }
+                break;
+                /* '?' and '*' are valid wildcards but not valid file name characters */
+            case '?':
+            case '*':
+                if ( dwFlags & VALIDATEPATH_ALLOW_WILDCARDS )
+                    break;
+                /* The following characters are reserved */
+            case '<':
+            case '>':
+            case '\"':
+            case '|':
+            case ':':
+                lpComponentEnd = lpCurrent;
+                fValid = FALSE;
+                break;
+            default:
+                /* Characters below ASCII 32 are not allowed */
+                if ( *lpCurrent < ' ' )
+                {
+                    lpComponentEnd = lpCurrent;
+                    fValid = FALSE;
+                }
+                break;
+            }
+            cLast = *lpCurrent++;
+        }
+
+        /*	If we don't reached the end of the component the length of the component was to long 
+            ( See condition of while loop ) */
+        if ( !lpComponentEnd )
+        {
+            fValid = FALSE;
+            lpComponentEnd = lpCurrent;
+        }
+
+        /* Test wether the component specifies a device name what is not allowed */
+        
+        // MT: PERFORMANCE: 
+        // This is very expensive. A lot of calls to _tcsicmp.
+        // in SRC6870m71 67.000 calls of this method while empty office start result into more than 1.500.00 calls of _tcsicmp!
+        // Possible optimizations
+        // - Array should be const static
+        // - Sorted array, use binary search
+        // - More intelligent check for com1-9, lpt1-9
+        // Maybe make szComponent upper case, don't search case intensitive
+        // Talked to HRO: Could be removed. Shouldn't be used in OOo, and if used for something like a filename, it will lead to an error anyway.
+        /*
+        if ( fValid )
+        {
+            LPCTSTR	alpDeviceNames[] =
+            {
+                TEXT("CON"),
+                TEXT("PRN"),
+                TEXT("AUX"),
+                TEXT("CLOCK$"),
+                TEXT("NUL"),
+                TEXT("LPT1"),
+                TEXT("LPT2"),
+                TEXT("LPT3"),
+                TEXT("LPT4"),
+                TEXT("LPT5"),
+                TEXT("LPT6"),
+                TEXT("LPT7"),
+                TEXT("LPT8"),
+                TEXT("LPT9"),
+                TEXT("COM1"),
+                TEXT("COM2"),
+                TEXT("COM3"),
+                TEXT("COM4"),
+                TEXT("COM5"),
+                TEXT("COM6"),
+                TEXT("COM7"),
+                TEXT("COM8"),
+                TEXT("COM9")
+            };
+            
+            TCHAR	szComponent[MAX_PATH];
+            int		nComponentLength;
+            LPCTSTR	lpDot;
+            int		i;
+
+            // A device name with an extension is also invalid
+            lpDot = _tcschr( lpComponent, '.' );
+
+            if ( !lpDot || lpDot > lpComponentEnd )
+                nComponentLength = lpComponentEnd - lpComponent;
+            else
+                nComponentLength = lpDot - lpComponent;
+
+            _tcsncpy( szComponent, lpComponent, nComponentLength );
+            szComponent[nComponentLength] = 0;
+
+            for ( i = 0; i < sizeof( alpDeviceNames ) / sizeof(LPCTSTR); i++ )
+            {
+                if ( 0 == _tcsicmp( szComponent, alpDeviceNames[i] ) )
+                {
+                    lpComponentEnd = lpComponent;
+                    fValid = FALSE;
+                    break;
+                }
+            }
+        }
+        */
+
+        if ( fValid )
+        {
+            // Empty components are not allowed
+            if ( lpComponentEnd - lpComponent < 1 )
+                fValid = FALSE;
+
+            // If we reached the end of the string NULL is returned
+            else if ( !*lpComponentEnd )
+                lpComponentEnd = NULL;
+
+        }
+
+        if ( lppComponentEnd )
+            *lppComponentEnd = lpComponentEnd;
+
+        return fValid;
+}
+
+//##################################################### 
+#define	CHARSET_SEPARATOR TEXT("\\/")
+
+DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_uString **corrected)
+{
+        LPCTSTR lpszPath = reinterpret_cast< LPCTSTR >(path->buffer);
+        LPCTSTR	lpComponent;
+        BOOL	fValid = TRUE;
+        DWORD	dwPathType = PATHTYPE_ERROR;
+
+        if ( dwFlags & VALIDATEPATH_ALLOW_RELATIVE )
+            dwFlags |= VALIDATEPATH_ALLOW_ELLIPSE;
+
+        if ( !lpszPath )
+        {
+            fValid = FALSE;
+            lpComponent = lpszPath;
+        }
+
+        /* Test for UNC path notation */
+        if ( 2 == _tcsspn( lpszPath, CHARSET_SEPARATOR ) )
+        {
+            /* Place the pointer behind the leading to backslashes */
+
+            lpComponent = lpszPath + 2;
+
+            fValid = IsValidFilePathComponent( lpComponent, &lpComponent, VALIDATEPATH_ALLOW_ELLIPSE );
+
+            /* So far we have a valid servername. Now let's see if we also have a network resource */
+
+            dwPathType = PATHTYPE_ABSOLUTE_UNC;
+
+            if ( fValid )
+            {
+                if ( lpComponent &&	 !*++lpComponent )
+                    lpComponent = NULL;
+                
+                if ( !lpComponent )
+                {
+    #if 0
+                    /* We only have a Server specification what is invalid */
+
+                    lpComponent = lpszPath;
+                    fValid = FALSE;
+    #else
+                    dwPathType |= PATHTYPE_IS_SERVER;
+    #endif
+                }
+                else
+                {
+                    /* Now test the network resource */
+
+                    fValid = IsValidFilePathComponent( lpComponent, &lpComponent, 0 );
+
+                    /* If we now reached the end of the path, everything is O.K. */
+
+
+                    if ( fValid && (!lpComponent || lpComponent && !*++lpComponent ) )
+                    {
+                        lpComponent = NULL;
+                        dwPathType |= PATHTYPE_IS_VOLUME;
+                    }
+                }
+            }
+        }
+
+        /* Local path verification. Must start with <drive>: */
+        else if ( _istalpha( lpszPath[0] ) && ':' == lpszPath[1] )
+        {
+            /* Place pointer behind correct drive specification */
+
+            lpComponent = lpszPath + 2;
+
+            if ( 1 == _tcsspn( lpComponent, CHARSET_SEPARATOR ) )
+                lpComponent++;
+            else if ( *lpComponent )
+                fValid = FALSE;
+
+            dwPathType = PATHTYPE_ABSOLUTE_LOCAL;
+
+            /* Now we are behind the backslash or it was a simple drive without backslash */
+
+            if ( fValid && !*lpComponent )
+            {
+                lpComponent = NULL;
+                dwPathType |= PATHTYPE_IS_VOLUME;
+            }
+        }
+
+        /* Can be a relative path */
+        else if ( dwFlags & VALIDATEPATH_ALLOW_RELATIVE )
+        {
+            lpComponent = lpszPath;
+
+            /* Relative path can start with a backslash */
+
+            if ( 1 == _tcsspn( lpComponent, CHARSET_SEPARATOR ) )
+            {
+                lpComponent++;
+                if ( !*lpComponent )
+                    lpComponent = NULL;
+            }
+
+            dwPathType = PATHTYPE_RELATIVE;
+        }
+
+        /* Anything else is an error */
+        else
+        {
+            fValid = FALSE;
+            lpComponent = lpszPath;
+        }
+
+        /* Now validate each component of the path */
+        while ( fValid && lpComponent )
+        {
+            // Correct path by merging consecutive slashes:
+            if (*lpComponent == '\\' && corrected != NULL) {
+                sal_Int32 i = lpComponent - lpszPath;
+                rtl_uString_newReplaceStrAt(corrected, path, i, 1, NULL);
+                    //TODO: handle out-of-memory
+                lpszPath = reinterpret_cast< LPCTSTR >((*corrected)->buffer);
+                lpComponent = lpszPath + i;
+            }
+
+		    fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags | VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD);
+
+            if ( fValid && lpComponent )
+            {
+                lpComponent++;
+
+                /* If the string behind the backslash is empty, we've done */
+
+                if ( !*lpComponent )
+                    lpComponent = NULL;
+            }
+        }
+        
+        if ( fValid && _tcslen( lpszPath ) >= MAX_PATH )
+        {
+            fValid = FALSE;
+            lpComponent = lpszPath + MAX_PATH;
+        }
+
+        if ( lppError )
+            *lppError = lpComponent;
+
+        return fValid ? dwPathType : PATHTYPE_ERROR;
+}
+
+//############################################# 
+//#####################################################
+//Undocumented in SHELL32.DLL ordinal 35 
+static BOOL PathRemoveFileSpec(LPTSTR lpPath)
+{
+    BOOL	fSuccess = FALSE;	// Assume failure
+    LPTSTR	lpLastBkSlash = _tcsrchr( lpPath, '\\' );
+    LPTSTR	lpLastSlash = _tcsrchr( lpPath, '/' );
+    LPTSTR	lpLastDelimiter = lpLastSlash > lpLastBkSlash ? lpLastSlash : lpLastBkSlash;
+
+    if ( lpLastDelimiter )
+    {
+            if ( 0 == *(lpLastDelimiter + 1) )
+            {
+                if ( lpLastDelimiter > lpPath && *(lpLastDelimiter - 1) != ':' )
+                {
+                    *lpLastDelimiter = 0;
+                    fSuccess = TRUE;
+                }
+            }
+            else
+            {
+                *(++lpLastDelimiter) = 0;
+                fSuccess = TRUE;
+            }
+    }
+    return fSuccess;
+}
+        
+//#####################################################
+// Undocumented in SHELL32.DLL ordinal 32 
+static LPTSTR PathAddBackslash(LPTSTR lpPath)
+{
+    LPTSTR	lpEndPath = NULL;
+
+    if ( lpPath )
+    {
+            int		nLen = _tcslen(lpPath);
+
+            if ( !nLen || lpPath[nLen-1] != '\\' && lpPath[nLen-1] != '/' && nLen < MAX_PATH - 1 )
+            {
+                lpEndPath = lpPath + nLen;
+                *lpEndPath++ = '\\';
+                *lpEndPath = 0;
+            }
+    }
+    return lpEndPath;
+}
+
+//#####################################################
+// Same as GetLongPathName but also 95/NT4 
+static DWORD GetCaseCorrectPathNameEx(
+    LPCTSTR	lpszShortPath,	// file name
+    LPTSTR	lpszLongPath,	// path buffer
+    DWORD	cchBuffer,		// size of path buffer 
+    DWORD	nSkipLevels
+)
+{
+        TCHAR	szPath[MAX_PATH];
+        BOOL	fSuccess;
+
+        cchBuffer = cchBuffer; /* avoid warnings */
+        
+        _tcscpy( szPath, lpszShortPath );
+
+        fSuccess = PathRemoveFileSpec( szPath );
+
+        if ( fSuccess )
+        {		
+            int nLen = _tcslen( szPath );
+            LPCTSTR	lpszFileSpec = lpszShortPath + nLen;
+            BOOL	bSkipThis;
+
+            if ( 0 == _tcscmp( lpszFileSpec, TEXT("..") ) )
+            {
+                bSkipThis = TRUE;
+                nSkipLevels += 1;
+            }
+            else if ( 
+                0 == _tcscmp( lpszFileSpec, TEXT(".") ) || 
+                0 == _tcscmp( lpszFileSpec, TEXT("\\") ) ||
+                0 == _tcscmp( lpszFileSpec, TEXT("/") ) 
+                )
+            {
+                bSkipThis = TRUE;
+            }
+            else if ( nSkipLevels )
+            {
+                bSkipThis = TRUE;
+                nSkipLevels--;
+            }
+            else
+                bSkipThis = FALSE;
+
+            GetCaseCorrectPathNameEx( szPath, szPath, MAX_PATH, nSkipLevels );
+
+            PathAddBackslash( szPath );
+
+            /* Analyze parent if not only a trailing backslash was cutted but a real file spec */
+            if ( !bSkipThis )
+            {
+                WIN32_FIND_DATA	aFindFileData;
+                HANDLE	hFind = FindFirstFile( lpszShortPath, &aFindFileData );
+
+                if ( IsValidHandle(hFind) )
+                {
+                    _tcscat( szPath, aFindFileData.cFileName[0] ? aFindFileData.cFileName : aFindFileData.cAlternateFileName );
+
+                    FindClose( hFind );
+                }
+                else
+                    return 0;
+            }
+        }
+        else
+        {
+            /* File specification can't be removed therefore the short path is either a drive
+               or a network share. If still levels to skip are left, the path specification 
+               tries to travel below the file system root */
+            if ( nSkipLevels )
+                return 0;
+
+            _tcsupr( szPath );
+        }
+
+        _tcscpy( lpszLongPath, szPath );
+
+        return _tcslen( lpszLongPath );
+}
+
+//##################################################### 
+#define WSTR_SYSTEM_ROOT_PATH				L"\\\\.\\"
+
+DWORD GetCaseCorrectPathName(
+    LPCTSTR	lpszShortPath,	// file name
+    LPTSTR	lpszLongPath,	// path buffer
+    DWORD	cchBuffer		// size of path buffer 
+)
+{
+    /* Special handling for "\\.\" as system root */
+    if ( lpszShortPath && 0 == wcscmp( lpszShortPath, WSTR_SYSTEM_ROOT_PATH ) )
+    {
+        if ( cchBuffer >= ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) )
+        {
+            wcscpy( lpszLongPath, WSTR_SYSTEM_ROOT_PATH );
+            return ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1;
+        }
+        else
+        {
+            return ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1;
+        }
+    }
+    else
+    {
+        return GetCaseCorrectPathNameEx( lpszShortPath, lpszLongPath, cchBuffer, 0 );
+    }
+}
+
+//############################################# 
+static sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedURL )
+{
+    sal_Char		*pBuffer;
+    const sal_Char	*pSrcEnd;
+    const sal_Char	*pSrc;
+    sal_Char		*pDest;
+    sal_Int32		nSrcLen;
+    sal_Bool		bValidEncoded = sal_True;	/* Assume success */
+
+    /* The resulting decoded string length is shorter or equal to the source length */
+
+    nSrcLen = rtl_string_getLength(strUTF8);
+    pBuffer = reinterpret_cast<sal_Char*>(rtl_allocateMemory(nSrcLen + 1));
+
+    pDest = pBuffer;
+    pSrc = rtl_string_getStr(strUTF8);
+    pSrcEnd = pSrc + nSrcLen;
+
+    /* Now decode the URL what should result in an UTF8 string */
+    while ( bValidEncoded && pSrc < pSrcEnd )
+    {
+        switch ( *pSrc )
+        {
+        case '%':
+            {
+                sal_Char	aToken[3];
+                sal_Char	aChar;
+
+                pSrc++;
+                aToken[0] = *pSrc++;
+                aToken[1] = *pSrc++;
+                aToken[2] = 0;
+
+                aChar = (sal_Char)strtoul( aToken, NULL, 16 );
+
+                /* The chars are path delimiters and must not be encoded */
+
+                if ( 0 == aChar || '\\' == aChar || '/' == aChar || ':' == aChar )
+                    bValidEncoded = sal_False;
+                else
+                    *pDest++ = aChar;
+            }
+            break;
+        default:
+            *pDest++ = *pSrc++;
+            break;
+        }
+    }
+
+    *pDest++ = 0;
+        
+    if ( bValidEncoded )
+    {
+        rtl_string2UString( pstrDecodedURL, pBuffer, rtl_str_getLength(pBuffer), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
+        OSL_ASSERT(*pstrDecodedURL != 0);
+    }
+        
+    rtl_freeMemory( pBuffer );
+
+    return bValidEncoded;
+}
+
+//############################################# 
+static void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
+{
+    /* Encode non ascii characters within the URL */
+
+    rtl_String		*strUTF8 = NULL;
+    sal_Char		*pszEncodedURL;
+    const sal_Char	*pURLScan;
+    sal_Char		*pURLDest;
+    sal_Int32		nURLScanLen;
+    sal_Int32		nURLScanCount;
+        
+    rtl_uString2String( &strUTF8, rtl_uString_getStr( strURL ), rtl_uString_getLength( strURL ), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
+
+    pszEncodedURL = (sal_Char*) rtl_allocateMemory( (rtl_string_getLength( strUTF8 ) * 3 + 1)  * sizeof(sal_Char) );
+
+    pURLDest = pszEncodedURL;
+    pURLScan = rtl_string_getStr( strUTF8 );
+    nURLScanLen = rtl_string_getLength( strUTF8 );
+    nURLScanCount = 0;
+
+    while ( nURLScanCount < nURLScanLen )
+    {
+        sal_Char cCurrent = *pURLScan;
+        switch ( cCurrent )
+        {
+        default:
+            if (!( ( cCurrent >= 'a' && cCurrent <= 'z' ) || ( cCurrent >= 'A' && cCurrent <= 'Z' ) || ( cCurrent >= '0' && cCurrent <= '9' ) ) )
+            {
+                sprintf( pURLDest, "%%%02X", (unsigned char)cCurrent );
+                pURLDest += 3;
+                break;
+            }
+        case '!':
+        case '\'':
+        case '(':
+        case ')':
+        case '*':
+        case '-':
+        case '.':
+        case '_':
+        case '~':
+        case '$':
+        case '&':
+        case '+':
+        case ',':
+        case '=':
+        case '@':
+        case ':':
+        case '/':
+        case '\\':
+        case '|':
+            *pURLDest++ = cCurrent;
+            break;
+        case 0:
+            break;
+        }
+
+        pURLScan++;
+        nURLScanCount++;
+    }
+
+    *pURLDest = 0;
+
+    rtl_string_release( strUTF8 );
+    rtl_string_newFromStr( pstrEncodedURL, pszEncodedURL );
+    rtl_freeMemory( pszEncodedURL );
+}
+
+//#############################################      
+#define WSTR_SYSTEM_ROOT_PATH				L"\\\\.\\"
+
+oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **pustrPath, sal_Bool bAllowRelative )
+{
+    rtl_String			*strUTF8 = NULL;
+    rtl_uString			*strDecodedURL = NULL;
+    rtl_uString			*strTempPath = NULL;
+    const sal_Unicode	*pDecodedURL;
+    sal_uInt32			nDecodedLen;
+    sal_Bool			bValidEncoded;
+    oslFileError		nError = osl_File_E_INVAL;	/* Assume failure */
+
+    /*  If someone hasn't encoded the complete URL we convert it to UTF8 now to prevent from
+        having a mixed encoded URL later */
+
+    rtl_uString2String( &strUTF8, rtl_uString_getStr( strURL ), rtl_uString_getLength( strURL ), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
+
+    /* If the length of strUTF8 and strURL differs it indicates that the URL was not correct encoded */
+
+    OSL_ENSURE_FILE( 
+        strUTF8->length == strURL->length || 
+        0 != rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( strURL->buffer, strURL->length, "file:\\\\", 7 )
+        ,"osl_getSystemPathFromFileURL: \"%s\" is not encoded !!!", strURL );
+
+    bValidEncoded = _osl_decodeURL( strUTF8, &strDecodedURL );
+
+    /* Release the encoded UTF8 string */
+    rtl_string_release( strUTF8 );
+
+    if ( bValidEncoded )
+    {
+        /* Replace backslashes and pipes */
+
+        rtl_uString_newReplace( &strDecodedURL, strDecodedURL, '/', '\\' );
+        rtl_uString_newReplace( &strDecodedURL, strDecodedURL, '|', ':' );
+
+        pDecodedURL = rtl_uString_getStr( strDecodedURL );
+        nDecodedLen = rtl_uString_getLength( strDecodedURL );
+
+        /* Must start with "file://" */
+        if ( 0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\", 7 ) )
+        {
+            sal_uInt32	nSkip;
+
+            if ( 0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\\\", 8 ) )
+                nSkip = 8;
+            else if ( 
+                0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\localhost\\", 17 ) ||
+                0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\127.0.0.1\\", 17 ) 
+                      )
+                nSkip = 17;
+            else 
+                nSkip = 5;
+
+            /* Indicates local root */
+            if ( nDecodedLen == nSkip )
+                rtl_uString_newFromStr_WithLength( &strTempPath, reinterpret_cast<const sal_Unicode*>(WSTR_SYSTEM_ROOT_PATH), ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1 );
+            else
+                rtl_uString_newFromStr_WithLength( &strTempPath, pDecodedURL + nSkip, nDecodedLen - nSkip );
+
+            if ( IsValidFilePath( strTempPath, NULL, VALIDATEPATH_ALLOW_ELLIPSE, &strTempPath ) )
+                nError = osl_File_E_None;
+        }
+        else if ( bAllowRelative )	/* This maybe a relative file URL */
+        {
+            rtl_uString_assign( &strTempPath, strDecodedURL );
+
+            if ( IsValidFilePath( strTempPath, NULL, VALIDATEPATH_ALLOW_RELATIVE | VALIDATEPATH_ALLOW_ELLIPSE, &strTempPath ) )
+                nError = osl_File_E_None;
+        }
+        /*
+          else
+          OSL_ENSURE_FILE( !nError, "osl_getSystemPathFromFileURL: \"%s\" is not an absolute FileURL !!!", strURL );
+        */
+
+    }
+        
+    if ( strDecodedURL )
+        rtl_uString_release( strDecodedURL );
+            
+    if ( osl_File_E_None == nError )
+        rtl_uString_assign( pustrPath, strTempPath );
+      
+    if ( strTempPath )
+        rtl_uString_release( strTempPath );
+
+    /*
+      OSL_ENSURE_FILE( !nError, "osl_getSystemPathFromFileURL: \"%s\" is not a FileURL !!!", strURL );
+    */
+
+    return nError;
+}
+
+//#############################################      
+oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** pstrURL )
+{
+    oslFileError nError = osl_File_E_INVAL; /* Assume failure */
+    rtl_uString	*strTempURL = NULL;
+    DWORD dwPathType = PATHTYPE_ERROR;
+
+    if (strPath)
+        dwPathType = IsValidFilePath(strPath, NULL, VALIDATEPATH_ALLOW_RELATIVE, NULL);
+                
+    if (dwPathType)
+    {
+        rtl_uString	*strTempPath = NULL;
+
+        /* Replace backslashes */
+        rtl_uString_newReplace( &strTempPath, strPath, '\\', '/' );
+
+        switch ( dwPathType & PATHTYPE_MASK_TYPE )
+        {
+        case PATHTYPE_RELATIVE:
+            rtl_uString_assign( &strTempURL, strTempPath );
+            nError = osl_File_E_None;
+            break;
+        case PATHTYPE_ABSOLUTE_UNC:
+            rtl_uString_newFromAscii( &strTempURL, "file:" );
+            rtl_uString_newConcat( &strTempURL, strTempURL, strTempPath );
+            nError = osl_File_E_None;
+            break;
+        case PATHTYPE_ABSOLUTE_LOCAL:
+            rtl_uString_newFromAscii( &strTempURL, "file:///" );
+            rtl_uString_newConcat( &strTempURL, strTempURL, strTempPath );
+            nError = osl_File_E_None;
+            break;
+        default:
+            break;
+        }
+
+        /* Release temp path */
+        rtl_uString_release( strTempPath );
+    }
+
+    if ( osl_File_E_None == nError )
+    {
+        rtl_String	*strEncodedURL = NULL;
+
+        /* Encode the URL */
+        _osl_encodeURL( strTempURL, &strEncodedURL );
+
+        /* Provide URL via unicode string */
+        rtl_string2UString( pstrURL, rtl_string_getStr(strEncodedURL), rtl_string_getLength(strEncodedURL), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
+        OSL_ASSERT(*pstrURL != 0);
+        rtl_string_release( strEncodedURL );
+    }
+
+    /* Release temp URL */
+    if ( strTempURL )
+        rtl_uString_release( strTempURL );
+
+    /*
+      OSL_ENSURE_FILE( !nError, "osl_getFileURLFromSystemPath: \"%s\" is not a systemPath !!!", strPath );
+    */
+    return nError;
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_getFileURLFromSystemPath( 
+    rtl_uString* ustrPath, rtl_uString** pustrURL )
+{
+    return _osl_getFileURLFromSystemPath( ustrPath, pustrURL );
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_getSystemPathFromFileURL( 
+    rtl_uString *ustrURL, rtl_uString **pustrPath)
+{
+    return _osl_getSystemPathFromFileURL( ustrURL, pustrPath, sal_True );
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_searchFileURL( 
+    rtl_uString *ustrFileName, 
+    rtl_uString *ustrSystemSearchPath, 
+    rtl_uString **pustrPath)
+{
+    rtl_uString		*ustrUNCPath = NULL;
+    rtl_uString		*ustrSysPath = NULL;
+    oslFileError	error;
+
+    /* First try to interpret the file name as an URL even a relative one */
+    error = _osl_getSystemPathFromFileURL( ustrFileName, &ustrUNCPath, sal_True );
+
+    /* So far we either have an UNC path or something invalid 
+       Now create a system path */
+    if ( osl_File_E_None == error )
+        error = _osl_getSystemPathFromFileURL( ustrUNCPath, &ustrSysPath, sal_True );
+
+    if ( osl_File_E_None == error )
+    {
+        DWORD	nBufferLength;
+        DWORD	dwResult;		
+        LPTSTR	lpBuffer = NULL;
+        LPTSTR	lpszFilePart;
+
+        /* Repeat calling SearchPath ... 
+           Start with MAX_PATH for the buffer. In most cases this 
+           will be enough and does not force the loop to runtwice */
+        dwResult = MAX_PATH;
+
+        do
+        {
+            /* If search path is empty use a NULL pointer instead according to MSDN documentation of SearchPath */
+            LPCTSTR	lpszSearchPath = ustrSystemSearchPath && ustrSystemSearchPath->length ? reinterpret_cast<LPCTSTR>(ustrSystemSearchPath->buffer) : NULL;
+            LPCTSTR	lpszSearchFile = reinterpret_cast<LPCTSTR>(ustrSysPath->buffer);
+
+            /* Allocate space for buffer according to previous returned count of required chars */
+            /* +1 is not neccessary if we follow MSDN documentation but for robustness we do so */
+            nBufferLength = dwResult + 1;
+            lpBuffer = lpBuffer ? 
+                reinterpret_cast<LPTSTR>(rtl_reallocateMemory(lpBuffer, nBufferLength * sizeof(TCHAR))) : 
+                reinterpret_cast<LPTSTR>(rtl_allocateMemory(nBufferLength * sizeof(TCHAR)));
+
+            dwResult = SearchPath( lpszSearchPath, lpszSearchFile, NULL, nBufferLength, lpBuffer, &lpszFilePart ); 
+        } while ( dwResult && dwResult >= nBufferLength );
+
+        /*	... until an error occures or buffer is large enough. 
+            dwResult == nBufferLength can not happen according to documentation but lets be robust ;-) */
+
+        if ( dwResult )
+        {
+            rtl_uString_newFromStr( &ustrSysPath, reinterpret_cast<const sal_Unicode*>(lpBuffer) );
+            error = osl_getFileURLFromSystemPath( ustrSysPath, pustrPath );
+        }
+        else
+        {
+            WIN32_FIND_DATA	aFindFileData;
+            HANDLE	hFind;
+
+            /* Somthing went wrong, perhaps the path was absolute */
+            error = oslTranslateFileError( GetLastError() );
+
+            hFind = FindFirstFile( reinterpret_cast<LPCTSTR>(ustrSysPath->buffer), &aFindFileData );
+
+            if ( IsValidHandle(hFind) )
+            {
+                error = osl_getFileURLFromSystemPath( ustrSysPath, pustrPath );
+                FindClose( hFind );
+            }
+        }
+
+        rtl_freeMemory( lpBuffer );
+    }
+    
+    if ( ustrSysPath )
+        rtl_uString_release( ustrSysPath );
+
+    if ( ustrUNCPath )
+        rtl_uString_release( ustrUNCPath );
+
+    return error;
+}
+
+//#####################################################
+
+oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL )
+{
+    oslFileError	eError;
+    rtl_uString		*ustrRelSysPath = NULL;
+    rtl_uString		*ustrBaseSysPath = NULL;
+
+    if ( ustrBaseURL && ustrBaseURL->length )
+    {
+        eError = _osl_getSystemPathFromFileURL( ustrBaseURL, &ustrBaseSysPath, sal_False );
+        OSL_ENSURE( osl_File_E_None == eError, "osl_getAbsoluteFileURL called with relative or invalid base URL" );
+
+        eError = _osl_getSystemPathFromFileURL( ustrRelativeURL, &ustrRelSysPath, sal_True );
+    }
+    else
+    {
+        eError = _osl_getSystemPathFromFileURL( ustrRelativeURL, &ustrRelSysPath, sal_False );
+        OSL_ENSURE( osl_File_E_None == eError, "osl_getAbsoluteFileURL called with empty base URL and/or invalid relative URL" );
+    }
+
+    if ( !eError )
+    {
+        TCHAR	szBuffer[MAX_PATH];
+        TCHAR	szCurrentDir[MAX_PATH];
+        LPTSTR	lpFilePart = NULL;
+        DWORD	dwResult;
+
+/*@@@ToDo
+  Bad, bad hack, this only works if the base path
+  really exists which is not necessary according
+  to RFC2396
+  The whole FileURL implementation should be merged 
+  with the rtl/uri class.
+*/
+        if ( ustrBaseSysPath )
+        {
+            osl_acquireMutex( g_CurrentDirectoryMutex );
+
+            GetCurrentDirectory( MAX_PATH, szCurrentDir );
+            SetCurrentDirectory( reinterpret_cast<LPCTSTR>(ustrBaseSysPath->buffer) );
+        }
+
+        dwResult = GetFullPathName( reinterpret_cast<LPCTSTR>(ustrRelSysPath->buffer), MAX_PATH, szBuffer, &lpFilePart );
+
+        if ( ustrBaseSysPath )
+        {
+            SetCurrentDirectory( szCurrentDir );
+
+            osl_releaseMutex( g_CurrentDirectoryMutex );
+        }
+
+        if ( dwResult )
+        {
+            if ( dwResult >= MAX_PATH )
+                eError = osl_File_E_INVAL;
+            else
+            {
+                rtl_uString	*ustrAbsSysPath = NULL;
+
+                rtl_uString_newFromStr( &ustrAbsSysPath, reinterpret_cast<const sal_Unicode*>(szBuffer) );
+
+                eError = osl_getFileURLFromSystemPath( ustrAbsSysPath, pustrAbsoluteURL );
+
+                if ( ustrAbsSysPath )
+                    rtl_uString_release( ustrAbsSysPath );
+            }
+        }
+        else
+            eError = oslTranslateFileError( GetLastError() );
+    }
+
+    if ( ustrBaseSysPath )
+        rtl_uString_release( ustrBaseSysPath );
+
+    if ( ustrRelSysPath )
+        rtl_uString_release( ustrRelSysPath );
+
+    return	eError;
+}
+
+//#####################################################
+oslFileError SAL_CALL osl_getCanonicalName( rtl_uString *strRequested, rtl_uString **strValid )
+{
+    rtl_uString_newFromString(strValid, strRequested);
+    return osl_File_E_None;
+}
diff --git a/sal/osl/w32/file_url.h b/sal/osl/w32/file_url.h
new file mode 100644
index 000000000..306395ef1
--- /dev/null
+++ b/sal/osl/w32/file_url.h
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: file_url.h,v $
+ * $Revision: 1.0 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_OSL_FILE_URL_H
+#define INCLUDED_OSL_FILE_URL_H
+
+#include "sal/types.h"
+#include "rtl/ustring.h"
+#include "osl/file.h"
+
+#ifdef _MSC_VER
+#pragma warning(push,1)
+#endif
+
+#define WINDOWS_LEAN_AND_MEAN
+#include <windows.h>
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define PATHTYPE_ERROR						0
+#define PATHTYPE_RELATIVE					1
+#define PATHTYPE_ABSOLUTE_UNC				2
+#define PATHTYPE_ABSOLUTE_LOCAL				3
+#define PATHTYPE_MASK_TYPE					0xFF
+#define PATHTYPE_IS_VOLUME					0x0100
+#define PATHTYPE_IS_SERVER					0x0200
+
+#define VALIDATEPATH_NORMAL					0x0000
+#define VALIDATEPATH_ALLOW_WILDCARDS		0x0001
+#define VALIDATEPATH_ALLOW_ELLIPSE			0x0002
+#define VALIDATEPATH_ALLOW_RELATIVE			0x0004
+#define VALIDATEPATH_ALLOW_UNC				0x0008
+#define VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD 0x0010
+
+DWORD IsValidFilePath (
+    rtl_uString *  path,
+    LPCTSTR *      lppError,
+    DWORD          dwFlags,
+    rtl_uString ** corrected
+);
+
+DWORD GetCaseCorrectPathName (
+    LPCTSTR	lpszShortPath,	// file name
+    LPTSTR	lpszLongPath,	// path buffer
+    DWORD	cchBuffer		// size of path buffer 
+);
+
+oslFileError _osl_getSystemPathFromFileURL (
+    rtl_uString *  strURL,
+    rtl_uString ** pustrPath,
+    sal_Bool       bAllowRelative
+);
+
+oslFileError _osl_getFileURLFromSystemPath (
+    rtl_uString *  strPath,
+    rtl_uString ** pstrURL
+);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* INCLUDED_OSL_FILE_URL_H */
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 3aaea44fd..875d1a097 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -59,7 +59,7 @@
 #include <string>
 
 //#################################################
-extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle( HANDLE hFile );
+extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle( HANDLE hFile, sal_uInt32 uFlags );
 
 //#################################################
 const sal_Unicode NAME_VALUE_SEPARATOR = TEXT('=');
@@ -576,13 +576,13 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
                 WaitForSingleObject(pProcImpl->m_hProcess, INFINITE);
         
             if (pProcessInputWrite)
-                *pProcessInputWrite = osl_createFileHandleFromOSHandle(hInputWrite);
+                *pProcessInputWrite = osl_createFileHandleFromOSHandle(hInputWrite, osl_File_OpenFlag_Write);
 
             if (pProcessOutputRead)
-                *pProcessOutputRead = osl_createFileHandleFromOSHandle(hOutputRead);
+                *pProcessOutputRead = osl_createFileHandleFromOSHandle(hOutputRead, osl_File_OpenFlag_Read);
 
             if (pProcessErrorRead)
-                *pProcessErrorRead = osl_createFileHandleFromOSHandle(hErrorRead);
+                *pProcessErrorRead = osl_createFileHandleFromOSHandle(hErrorRead, osl_File_OpenFlag_Read);
 
             return osl_Process_E_None;
         }
diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
new file mode 100644
index 000000000..708dbe15c
--- /dev/null
+++ b/sal/osl/w32/tempfile.cxx
@@ -0,0 +1,279 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: file.cxx,v $
+ * $Revision: 1.0 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#define UNICODE
+#define _UNICODE
+#define _WIN32_WINNT_0x0500
+#include "systools/win32/uwinapi.h"
+
+#include "osl/file.h"
+
+#include "file_error.h"
+#include "file_url.h"
+
+#include "osl/diagnose.h"
+
+#include <malloc.h>
+#include <tchar.h>
+
+//#####################################################
+#define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0])))
+
+// Allocate n number of t's on the stack return a pointer to it in p 
+#ifdef __MINGW32__
+#define STACK_ALLOC(p, t, n) (p) = reinterpret_cast<t*>(_alloca((n)*sizeof(t)));
+#else
+#define STACK_ALLOC(p, t, n) __try {(p) = reinterpret_cast<t*>(_alloca((n)*sizeof(t)));} \
+                             __except(EXCEPTION_EXECUTE_HANDLER) {(p) = 0;}
+#endif
+
+extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle(HANDLE hFile, sal_uInt32 uFlags);
+
+//#####################################################
+// Temp file functions
+//#####################################################
+        
+static oslFileError osl_setup_base_directory_impl_(
+    rtl_uString*  pustrDirectoryURL,
+    rtl_uString** ppustr_base_dir)
+{    
+    rtl_uString* dir_url = 0;
+    rtl_uString* dir     = 0;        
+    oslFileError error   = osl_File_E_None;
+        
+    if (pustrDirectoryURL)
+        rtl_uString_assign(&dir_url, pustrDirectoryURL);         
+    else 
+        error = osl_getTempDirURL(&dir_url);                     	    	           				
+
+    if (osl_File_E_None == error)        
+    {
+        error = _osl_getSystemPathFromFileURL(dir_url, &dir, sal_False);                           
+        rtl_uString_release(dir_url);
+    }
+              
+    if (osl_File_E_None == error )
+    {
+        rtl_uString_assign(ppustr_base_dir, dir);        
+        rtl_uString_release(dir);
+    }
+        
+    return error;	
+}
+
+//#####################################################
+static oslFileError osl_setup_createTempFile_impl_(
+    rtl_uString*   pustrDirectoryURL,
+    oslFileHandle* pHandle,
+    rtl_uString**  ppustrTempFileURL,
+    rtl_uString**  ppustr_base_dir,
+    sal_Bool*      b_delete_on_close)
+{
+    oslFileError osl_error;
+        
+    OSL_PRECOND(((0 != pHandle) || (0 != ppustrTempFileURL)), "Invalid parameter!");
+            
+    if ((0 == pHandle) && (0 == ppustrTempFileURL))    
+    {
+        osl_error = osl_File_E_INVAL;
+    }
+    else
+    {        
+        osl_error = osl_setup_base_directory_impl_(
+            pustrDirectoryURL, ppustr_base_dir);
+                
+        *b_delete_on_close = (sal_Bool)(0 == ppustrTempFileURL);
+    }
+           
+    return osl_error;
+}
+
+//#####################################################
+static oslFileError osl_win32_GetTempFileName_impl_(
+    rtl_uString* base_directory, LPWSTR temp_file_name)
+{
+    oslFileError osl_error = osl_File_E_None;
+           
+    if (0 == GetTempFileNameW(
+            reinterpret_cast<LPCWSTR>(rtl_uString_getStr(base_directory)),
+            L"",
+            0,
+            temp_file_name))
+    {    
+        osl_error = oslTranslateFileError(GetLastError());
+    }
+           
+    return osl_error;
+}
+
+//#####################################################
+static sal_Bool osl_win32_CreateFile_impl_(
+    LPCWSTR file_name, sal_Bool b_delete_on_close, oslFileHandle* p_handle)
+{
+    DWORD  flags = FILE_ATTRIBUTE_NORMAL;
+    HANDLE hFile;
+        
+    OSL_ASSERT(p_handle);
+        
+    if (b_delete_on_close)
+        flags |= FILE_FLAG_DELETE_ON_CLOSE;
+            
+    hFile = CreateFileW(
+        file_name,
+        GENERIC_READ | GENERIC_WRITE,
+        0,  
+        NULL, 
+        TRUNCATE_EXISTING, 
+        flags,
+        NULL);
+                
+    // @@@ ERROR HANDLING @@@
+    if (IsValidHandle(hFile))        
+        *p_handle = osl_createFileHandleFromOSHandle(hFile, osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+        
+    return (sal_Bool)IsValidHandle(hFile);
+}
+
+//############################################# 
+static oslFileError osl_createTempFile_impl_(
+    rtl_uString*   base_directory, 
+    LPWSTR         tmp_name,
+    sal_Bool       b_delete_on_close,
+    oslFileHandle* pHandle,
+    rtl_uString**  ppustrTempFileURL)
+{
+    oslFileError osl_error;
+        
+    do
+    {       
+        osl_error = osl_win32_GetTempFileName_impl_(base_directory, tmp_name);
+            
+        /*  if file could not be opened try again */                                                     
+                
+        if ((osl_File_E_None != osl_error) || (0 == pHandle) || 
+            osl_win32_CreateFile_impl_(tmp_name, b_delete_on_close, pHandle)) 
+            break;
+                                                                        
+    } while(1); // try until success
+            
+    if ((osl_File_E_None == osl_error) && !b_delete_on_close)        
+    {
+        rtl_uString* pustr = 0;                
+        rtl_uString_newFromStr(&pustr, reinterpret_cast<const sal_Unicode*>(tmp_name));        
+        osl_getFileURLFromSystemPath(pustr, ppustrTempFileURL);
+        rtl_uString_release(pustr);
+    }
+        
+    return osl_error;
+}
+    
+//#############################################
+oslFileError SAL_CALL osl_createTempFile(    
+    rtl_uString*   pustrDirectoryURL,
+    oslFileHandle* pHandle, 
+    rtl_uString**  ppustrTempFileURL)
+{
+    rtl_uString*    base_directory = 0;            
+    LPWSTR          tmp_name;        
+    sal_Bool        b_delete_on_close;
+    oslFileError    osl_error;        
+    
+    osl_error = osl_setup_createTempFile_impl_(
+        pustrDirectoryURL,
+        pHandle,
+        ppustrTempFileURL,
+        &base_directory,
+        &b_delete_on_close);
+        
+    if (osl_File_E_None != osl_error)
+        return osl_error;
+   
+    /* allocate enough space on the stack */
+    STACK_ALLOC(tmp_name, WCHAR, (rtl_uString_getLength(base_directory) + MAX_PATH));
+    
+    if (tmp_name)
+    {
+        osl_createTempFile_impl_(
+            base_directory, 
+            tmp_name,
+            b_delete_on_close,
+            pHandle,
+            ppustrTempFileURL);
+    }
+    else // stack alloc failed
+    {
+        osl_error = osl_File_E_NOMEM;
+    }
+            
+    if (base_directory)
+        rtl_uString_release(base_directory);
+                
+    return osl_error;
+}
+
+//#############################################
+oslFileError SAL_CALL osl_getTempDirURL(rtl_uString** pustrTempDir)
+{
+    WCHAR	szBuffer[MAX_PATH];
+    LPWSTR	lpBuffer = szBuffer;
+    DWORD	nBufferLength = ELEMENTS_OF_ARRAY(szBuffer) - 1;
+
+    DWORD			nLength;
+    oslFileError	error;
+
+    do
+    {
+        nLength = GetTempPathW( ELEMENTS_OF_ARRAY(szBuffer), lpBuffer );
+        if ( nLength > nBufferLength )
+        {
+            nLength++;
+            lpBuffer = reinterpret_cast<WCHAR*>(alloca( sizeof(WCHAR) * nLength ));
+            nBufferLength = nLength - 1;
+        }
+    } while ( nLength > nBufferLength );
+
+    if ( nLength )
+    {
+        rtl_uString	*ustrTempPath = NULL;
+
+        if ( '\\' == lpBuffer[nLength-1] )
+            lpBuffer[nLength-1] = 0;
+
+        rtl_uString_newFromStr( &ustrTempPath, reinterpret_cast<const sal_Unicode*>(lpBuffer) );
+
+        error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir );
+
+        rtl_uString_release( ustrTempPath );
+    }
+    else
+        error = oslTranslateFileError( GetLastError() );
+
+    return error;
+}
diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk
index 05afbbb22..5f20dd07b 100644
--- a/sal/workben/makefile.mk
+++ b/sal/workben/makefile.mk
@@ -35,9 +35,10 @@ PRJNAME=sal
 TARGET=workben
 LIBTARGET=NO
 TARGETTYPE=CUI
-ENABLE_EXCEPTIONS=TRUE
+#ENABLE_EXCEPTIONS=TRUE
+NO_DEFAULT_STL=YES
 
-TESTAPP=test_osl_getVolInfo
+#TESTAPP=test_osl_getVolInfo
 #TESTAPP=test_osl_joinProcess
 #TESTAPP=getlocaleinfotest
 #TESTAPP=test_osl_joinProcess
@@ -45,6 +46,7 @@ TESTAPP=test_osl_getVolInfo
 #TESTAPP=salstattest
 #TESTAPP=saldyntest
 
+TESTAPP=t_readline
 #TESTAPP=t_cipher
 #TESTAPP=t_digest
 #TESTAPP=t_random
@@ -174,6 +176,23 @@ DEF1EXPORTFILE=export.exp
 .ENDIF # salstattest
 
 #
+# t_readline
+#
+.IF "$(TESTAPP)" == "t_readline"
+
+CFILES=		t_readline.c
+OBJFILES=	$(OBJ)$/t_readline.obj
+
+APP1TARGET=	t_readline
+APP1OBJS=	$(OBJFILES)
+APP1STDLIBS=$(SALLIB)
+APP1DEPN=	$(SLB)$/sal.lib
+
+APP1RPATH=UREBIN
+
+.ENDIF # t_readline
+
+#
 # t_cipher
 #
 .IF "$(TESTAPP)" == "t_cipher"
diff --git a/sal/workben/t_layer.c b/sal/workben/t_layer.c
deleted file mode 100644
index e286bcfb7..000000000
--- a/sal/workben/t_layer.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: t_layer.c,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <sal/types.h>
-#include <rtl/alloc.h>
-#include <osl/diagnose.h>
-#include <osl/interlck.h>
-#ifndef _OSL_ISOCKET_H_
-#include <osl/isocket.h>
-#endif
-
-/*========================================================================
- *
- * osl/debug.c
- *
- *======================================================================*/
-/*
- * __osl_debug_create.
- */
-static oslSocketResult SAL_CALL __osl_debug_create (
-    oslSocketDescriptor *socket,
-    oslAddrFamily        family,
-    oslSocketType        type,
-    oslProtocol          protocol)
-{
-    oslSocketResult result;
-
-    if (!(socket->m_lower))
-    {
-        oslSocketDescriptor *lower;
-        lower = osl_socket_createSocketLayer (osl_socket_getSocketMethods());
-        osl_socket_pushSocketLayer (socket, lower);
-    }
-
-    result = (socket->m_lower->m_methods->m_create)(
-        socket->m_lower, family, type, protocol);
-    if (!(result == osl_Socket_Ok))
-        return (result);
-
-    if (!(socket->m_private))
-    {
-        /* ... */
-    }
-    return (osl_Socket_Ok);
-}
-
-/*
- * __osl_debug_delete.
- */
-static void SAL_CALL __osl_debug_delete (oslSocketDescriptor *socket)
-{
-    if (socket->m_private)
-    {
-        /* ... */
-    }
-    if (socket->m_lower)
-    {
-        (socket->m_lower->m_methods->m_delete)(socket->m_lower);
-        osl_socket_deleteSocketLayer (socket->m_lower);
-    }
-}
-
-/*
- * __osl_debug_getOption.
- */
-static oslSocketResult SAL_CALL __osl_debug_getOption (
-    oslSocketDescriptor  *socket,
-    oslSocketOptionLevel  level,
-    oslSocketOption       option,
-    void                 *buffer,
-    sal_uInt32            length)
-{
-    if (level == osl_Socket_LevelSocketLayer)
-    {
-        /* ... */
-        return (osl_Socket_Ok);
-    }
-
-    return (socket->m_lower->m_methods->m_getoption)(
-        socket->m_lower, level, option, buffer, length);
-}
-
-/*
- * __osl_debug_setOption.
- */
-static oslSocketResult SAL_CALL __osl_debug_setOption (
-    oslSocketDescriptor  *socket,
-    oslSocketOptionLevel  level,
-    oslSocketOption       option,
-    const void           *buffer,
-    sal_uInt32            length)
-{
-    if (level == osl_Socket_LevelSocketLayer)
-    {
-        /* ... */
-        return (osl_Socket_Ok);
-    }
-
-    return (socket->m_lower->m_methods->m_setoption)(
-        socket->m_lower, level, option, buffer, length);
-}
-
-/*
- * __osl_debug_accept.
- */
-static oslSocketDescriptor* SAL_CALL __osl_debug_accept (
-    oslSocketDescriptor *socket, oslSocketAddr *fromaddr)
-{
-    oslSocketDescriptor *lower;
-    lower = (socket->m_lower->m_methods->m_accept)(socket->m_lower, fromaddr);
-    if (lower)
-    {
-        oslSocketDescriptor *upper;
-        upper = osl_socket_createSocketLayer (socket->m_methods);
-        osl_socket_pushSocketLayer (upper, lower);
-        return (upper);
-    }
-    return ((oslSocketDescriptor*)NULL);
-}
-
-/*
- * __osl_debug_connect.
- */
-static oslSocketResult SAL_CALL __osl_debug_connect (
-    oslSocketDescriptor *socket, oslSocketAddr addr)
-{
-    return (socket->m_lower->m_methods->m_connect)(socket->m_lower, addr);
-}
-
-/*
- * __osl_debug_close.
- */
-static void SAL_CALL __osl_debug_close (oslSocketDescriptor *socket)
-{
-    (socket->m_lower->m_methods->m_close)(socket->m_lower);
-}
-
-/*
- * __osl_shutdown.
- */
-static void SAL_CALL __osl_debug_shutdown (
-    oslSocketDescriptor *socket, oslSocketDirection direction)
-{
-    (socket->m_lower->m_methods->m_shutdown)(socket->m_lower, direction);
-}
-
-/*
- * __osl_debug_methods.
- */
-static oslSocketMethods __osl_debug_methods =
-{
-    NULL /* initialized on demand */
-};
-
-/*
- * osl_debug_getSocketMethods.
- */
-const oslSocketMethods* SAL_CALL osl_debug_getSocketMethods (void)
-{
-    static oslInterlockedCount nonce = 0;
-    if (osl_incrementInterlockedCount (&nonce) == 1)
-    {
-        const oslSocketMethods *methods = osl_socket_getDefaultSocketMethods();
-        __osl_debug_methods = *methods;
-
-        __osl_debug_methods.m_create    = __osl_debug_create;
-        __osl_debug_methods.m_delete    = __osl_debug_delete;
-
-        __osl_debug_methods.m_getoption = __osl_debug_getOption;
-        __osl_debug_methods.m_setoption = __osl_debug_setOption;
-
-        __osl_debug_methods.m_accept    = __osl_debug_accept;
-        __osl_debug_methods.m_connect   = __osl_debug_connect;
-        __osl_debug_methods.m_close     = __osl_debug_close;
-
-        __osl_debug_methods.m_shutdown  = __osl_debug_shutdown;
-
-        osl_incrementInterlockedCount (&nonce);
-    }
-
-    osl_decrementInterlockedCount (&nonce);
-    return (&__osl_debug_methods);
-}
-
-/*========================================================================
- *
- * osl/socket.c (physical, bottom layer).
- *
- *======================================================================*/
-#if 0  /* NYI */
-
-static oslSocketResult SAL_CALL __osl_socket_create (
-    oslSocketDescriptor *socket,
-    oslAddrFamily        family,
-    oslSocketType        type,
-    oslProtocol          protocol)
-{
-#if OSL_DEBUG_LEVEL > 1
-    const oslSocketMethods *debug = osl_debug_getSocketMethods();
-    if (!(socket->m_upper || socket->m_upper->m_methods == debug))
-    {
-        oslSocketDescriptor *upper;
-
-        upper = osl_socket_createSocketLayer (debug);
-        osl_socket_pushSocketLayer (upper, socket);
-
-        return (upper->m_methods->m_create)(upper, family, type, protocol);
-    }
-#endif /* OSL_DEBUG_LEVEL */
-    if (!(socket->m_private))
-    {
-        /* ... */
-        socket->m_private = osl_createSocket (family, type, protocol);
-    }
-    return (osl_Socket_Ok);
-}
-
-#endif /* NYI */
-
-/*========================================================================
- *
- * main.
- *
- *======================================================================*/
-int SAL_CALL main (int argc, char **argv)
-{
-    oslSocketDescriptor *socket;
-
-    socket = osl_socket_createSocketLayer (osl_debug_getSocketMethods());
-    if (socket)
-    {
-        oslSocketDescriptor *connection;
-        oslSocketResult      result;
-        oslSocketAddr        addr, from;
-        sal_Int32            option = 1;
-
-        result = osl_socket_create (
-            socket,
-            osl_Socket_FamilyInet,
-            osl_Socket_TypeStream,
-            osl_Socket_ProtocolIp);
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        result = osl_socket_setOption (
-            socket,
-            osl_Socket_LevelSocket,
-            osl_Socket_OptionReuseAddr,
-            &option, sizeof(option));
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        addr = osl_createEmptySocketAddr (osl_Socket_FamilyInet);
-        osl_setInetPortOfSocketAddr (addr, 7777);
-
-        result = osl_socket_bind (socket, addr);
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        result = osl_socket_listen (socket, 1);
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        connection = osl_socket_accept (socket, &from);
-        if (connection)
-        {
-            sal_Char         buffer[1024];
-            sal_Int32        k, n = sizeof(buffer);
-            oslSocketMsgFlag flag = osl_Socket_MsgNormal;
-
-            while ((k = osl_socket_recv (connection, buffer, n, flag)) > 0)
-            {
-                if (osl_socket_send (connection, buffer, k, flag) < 0)
-                    break;
-            }
-
-            osl_socket_close (connection);
-            osl_socket_delete (connection);
-
-            osl_socket_deleteSocketLayer (connection);
-        }
-
-        osl_socket_close (socket);
-        osl_socket_delete (socket);
-
-        osl_socket_deleteSocketLayer (socket);
-    }
-
-    return 0;
-}
-
diff --git a/sal/workben/t_readline.c b/sal/workben/t_readline.c
new file mode 100644
index 000000000..9cbc7d39c
--- /dev/null
+++ b/sal/workben/t_readline.c
@@ -0,0 +1,58 @@
+/*
+ * t_readline.c
+ */
+
+#include "osl/file.h"
+
+#include "osl/diagnose.h"
+#include "rtl/ustring.h"
+#include "rtl/byteseq.h"
+
+#include <stdio.h>
+
+/* main */
+int main (int argc, char ** argv)
+{
+  if (argc > 1)
+  {
+    oslFileError  result;
+    oslFileHandle hFile = 0;
+
+    rtl_uString * pSystemPath = 0;
+    rtl_uString * pFileUrl = 0;
+
+    rtl_uString_newFromAscii (&pSystemPath, argv[1]);
+
+    result = osl_getFileURLFromSystemPath (pSystemPath, &pFileUrl);
+    rtl_uString_release (pSystemPath), pSystemPath = 0;
+    if (result != osl_File_E_None)
+      return (result);
+
+    result = osl_openFile (pFileUrl, &hFile, osl_File_OpenFlag_Read);
+    rtl_uString_release (pFileUrl), pFileUrl = 0;
+    if (result == osl_File_E_None)
+    {
+      sal_Sequence * pBuffer = 0;
+      for ( ;; )
+      {
+        sal_Int32 i, n;
+
+        result = osl_readLine (hFile, &pBuffer);
+        if (result != osl_File_E_None)
+          break;
+#if 0
+        if (pBuffer->elements[0] == 0)
+          /* @@@ cannot distinguish empty line from EOF @@@ */
+          break;
+#endif
+        for (i = 0, n = pBuffer->nElements; i < n; i++)
+          printf ("%c", (char)(pBuffer->elements[i]));
+        printf("\n");
+      }
+
+      rtl_byte_sequence_release (pBuffer), pBuffer = 0;
+      (void) osl_closeFile (hFile);
+    }
+  }
+  return 0;
+}
diff --git a/sal/workben/t_tls.c b/sal/workben/t_tls.c
deleted file mode 100644
index 91d0891de..000000000
--- a/sal/workben/t_tls.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: t_tls.c,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <sal/types.h>
-#include <rtl/alloc.h>
-#include <rtl/ustring.h>
-#include <osl/diagnose.h>
-#include <osl/file.h>
-#include <osl/interlck.h>
-#ifndef _OSL_ISOCKET_H_
-#include <osl/isocket.h>
-#endif
-
-#ifndef _OSL_TLS_H_
-#include <osl/tls.h>
-#endif
-
-#include <string.h>
-#include <stdio.h>
-
-/*========================================================================
- *
- * Internals.
- *
- *======================================================================*/
-void SAL_CALL __rtl_sequence_release (sal_Sequence *value)
-{
-    if (value)
-    {
-        if (osl_decrementInterlockedCount (&(value->nRefCount)) == 0)
-            rtl_freeMemory (value);
-    }
-}
-
-void SAL_CALL __rtl_sequence_new (sal_Sequence **value, sal_Int32 length)
-{
-    if (value)
-    {
-        __rtl_sequence_release (*value);
-
-        *value = (sal_Sequence*)rtl_allocateMemory (
-            SAL_SEQUENCE_HEADER_SIZE + length);
-
-        (*value)->nRefCount = 1;
-        (*value)->nElements = 0;
-    }
-}
-
-void load_sequence (sal_Sequence **ppSequence, const sal_Char *name)
-{
-    oslFileError  result;
-    rtl_uString  *pName, *pPath;
-
-    if (ppSequence)
-    {
-        __rtl_sequence_release (*ppSequence);
-        *ppSequence = NULL;
-    }
-
-    pName = NULL;
-    rtl_uString_newFromAscii (&pName, name);
-
-    pPath = NULL;
-    result = osl_searchNormalizedPath (pName, NULL, &pPath);
-    if (result == osl_File_E_None)
-    {
-        oslFileHandle hFile;
-
-        result = osl_openFile (pPath, &hFile, osl_File_OpenFlag_Read);
-        if (result == osl_File_E_None)
-        {
-            sal_uInt64 nSize = 0, nRead = 0;
-
-            osl_setFilePos (hFile, osl_Pos_End, 0);
-            osl_getFilePos (hFile, &nSize);
-            osl_setFilePos (hFile, osl_Pos_Absolut, 0);
-
-            __rtl_sequence_new (ppSequence, (sal_Int32)nSize);
-
-            osl_readFile (hFile, (*ppSequence)->elements, nSize, &nRead);
-            (*ppSequence)->nElements = (sal_Int32)nRead;
-        }
-        osl_closeFile (hFile);
-
-        rtl_uString_release (pPath);
-    }
-
-    rtl_uString_release (pName);
-}
-
-/*========================================================================
- *
- * main.
- *
- *======================================================================*/
-int SAL_CALL main (int argc, char **argv)
-{
-    static const sal_Char p[] = "GET / HTTP/1.0\015\012\015\012";
-    oslSocketDescriptor  *socket;
-
-
-    socket = osl_socket_createSocketLayer (osl_tls_getSocketMethods());
-    if (socket)
-    {
-        oslSocketAddr     target;
-        oslSocketResult   result;
-        oslSocketMsgFlag  flag   = osl_Socket_MsgNormal;
-        rtl_uString      *dotted = NULL;
-
-
-        rtl_uString_newFromAscii (&dotted, argv[1]);
-        target = osl_createInetSocketAddr (dotted, 443);
-        rtl_uString_release (dotted);
-
-        result = osl_socket_create (
-            socket,
-            osl_Socket_FamilyInet,
-            osl_Socket_TypeStream,
-            osl_Socket_ProtocolIp);
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        result = osl_socket_connect (socket, target);
-        osl_destroySocketAddr (target);
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        result = osl_socket_connect_handshake (socket, target);
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        if (osl_socket_send (socket, p, strlen(p), flag) > 0)
-        {
-            sal_Char  buffer[1024];
-            sal_Int32 k, n = sizeof(buffer);
-
-            while ((k = osl_socket_recv (socket, buffer, n, flag)) > 0)
-                fwrite (buffer, 1, k, stdout);
-        }
-
-        osl_socket_shutdown (socket, osl_Socket_DirReadWrite);
-        osl_socket_close (socket);
-    
-        osl_socket_delete (socket);
-        osl_socket_deleteSocketLayer (socket);
-    }
-
-
-    socket = osl_socket_createSocketLayer (osl_tls_getSocketMethods());
-    if (socket)
-    {
-        oslSocketDescriptor *connection;
-        oslSocketResult      result;
-        oslSocketAddr        addr, from;
-        sal_Int32            option = 1;
-        sal_Sequence        *data = NULL;
-
-
-        result = osl_socket_create (
-            socket,
-            osl_Socket_FamilyInet,
-            osl_Socket_TypeStream,
-            osl_Socket_ProtocolIp);
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        result = osl_socket_setOption (
-            socket,
-            osl_Socket_LevelSocket,
-            osl_Socket_OptionReuseAddr,
-            &option, sizeof(option));
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        addr = osl_createEmptySocketAddr (osl_Socket_FamilyInet);
-        osl_setInetPortOfSocketAddr (addr, 7777);
-
-        result = osl_socket_bind (socket, addr);
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        load_sequence (&data, "s_cert.der");
-        if (data && data->nElements)
-        {
-            result = osl_socket_setOption (
-                socket,
-                osl_Socket_LevelTLS,
-                osl_Socket_OptionCertificate,
-                data->elements, data->nElements);
-            OSL_ASSERT(result == osl_Socket_Ok);
-        }
-
-        load_sequence (&data, "s_pkey.der");
-        if (data && data->nElements)
-        {
-            result = osl_socket_setOption (
-                socket,
-                osl_Socket_LevelTLS,
-                osl_Socket_OptionPrivateKey,
-                data->elements, data->nElements);
-            OSL_ASSERT(result == osl_Socket_Ok);
-        }
-        __rtl_sequence_release (data);
-
-        result = osl_socket_listen (socket, 1);
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        connection = osl_socket_accept (socket, &from);
-        if (connection)
-        {
-            sal_Char  buffer[1024];
-            sal_Int32 k, n = sizeof(buffer);
-            oslSocketMsgFlag flag = osl_Socket_MsgNormal;
-
-            result = osl_socket_accept_handshake (connection, from);
-            OSL_ASSERT(result == osl_Socket_Ok);
-
-            while ((k = osl_socket_recv (connection, buffer, n, flag)) > 0)
-            {
-                if (osl_socket_send (connection, buffer, k, flag) < 0)
-                    break;
-            }
-
-            osl_socket_close (connection);
-
-            osl_socket_delete (connection);
-            osl_socket_deleteSocketLayer (connection);
-        }
-
-        osl_socket_delete (socket);
-        osl_socket_deleteSocketLayer (socket);
-    }
-
-    return 0;
-}
-
diff --git a/sal/workben/t_zip.c b/sal/workben/t_zip.c
deleted file mode 100644
index 5105b5b25..000000000
--- a/sal/workben/t_zip.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: t_zip.c,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <sal/types.h>
-#include <rtl/ustring.h>
-#include <osl/diagnose.h>
-#include <osl/thread.h>
-#ifndef _OSL_ZSOCKET_H_
-#include <osl/zsocket.h>
-#endif
-
-#include <stdio.h>
-
-/*========================================================================
- *
- * internals.
- *
- *======================================================================*/
-void SAL_CALL clientSocketReader (void *pData)
-{
-    oslSocketDescriptor *socket;
-
-    socket = (oslSocketDescriptor*)pData;
-    if (socket)
-    {
-        sal_Char         buffer[128];
-        sal_Int32        k, n = sizeof(buffer);
-        oslSocketMsgFlag flag = osl_Socket_MsgNormal;
-
-        while ((k = osl_socket_recv (socket, buffer, n, flag)) > 0)
-        {
-            fwrite (buffer, 1, k, stdout);
-            fflush (stdout);
-        }
-    }
-}
-
-/*========================================================================
- *
- * main.
- *
- *======================================================================*/
-int SAL_CALL main (int argc, char **argv)
-{
-    oslSocketDescriptor *socket;
-
-    socket = osl_socket_createSocketLayer (osl_zlib_getSocketMethods());
-    if (socket)
-    {
-        oslSocketAddr   addr = 0;
-        oslSocketResult result;
-
-        result = osl_socket_create (
-            socket,
-            osl_Socket_FamilyInet,
-            osl_Socket_TypeStream,
-            osl_Socket_ProtocolIp);
-        OSL_ASSERT(result == osl_Socket_Ok);
-
-        if (argc > 1)
-        {
-            rtl_uString *host = 0;
-
-            rtl_uString_newFromAscii (&host, argv[1]);
-            addr = osl_resolveHostname (host);
-            rtl_uString_release (host);
-        }
-
-        if (addr)
-        {
-            sal_Char         buffer[128];
-            sal_Int32        k, n = sizeof(buffer);
-            oslSocketMsgFlag flag = osl_Socket_MsgNormal;
-            oslThread        reader;
-
-            osl_setInetPortOfSocketAddr (addr, 7777);
-
-            result = osl_socket_connect (socket, addr);
-            OSL_ASSERT(result == osl_Socket_Ok);
-
-            result = osl_socket_connect_handshake (socket, addr);
-            osl_destroySocketAddr (addr);
-            OSL_ASSERT(result == osl_Socket_Ok);
-
-            reader = osl_createSuspendedThread (clientSocketReader, socket);
-            OSL_ASSERT(reader);
-            osl_resumeThread (reader);
-
-            while ((k = fread (buffer, 1, n, stdin)) > 0)
-            {
-                if (osl_socket_send (socket, buffer, k, flag) < 0)
-                    break;
-            }
-
-            osl_socket_shutdown (socket, osl_Socket_DirReadWrite);
-            osl_socket_close (socket);
-
-            osl_joinWithThread (reader);
-            osl_destroyThread (reader);
-        }
-        else
-        {
-            oslSocketDescriptor *connection;
-            oslSocketAddr        from   = 0;
-            sal_Int32            option = 1;
-
-            addr = osl_createEmptySocketAddr (osl_Socket_FamilyInet);
-            osl_setInetPortOfSocketAddr (addr, 7777);
-
-            result = osl_socket_setOption (
-                socket,
-                osl_Socket_LevelSocket,
-                osl_Socket_OptionReuseAddr,
-                &option, sizeof(option));
-            OSL_ASSERT(result == osl_Socket_Ok);
-
-            result = osl_socket_bind (socket, addr);
-            osl_destroySocketAddr (addr);
-            OSL_ASSERT(result == osl_Socket_Ok);
-
-            result = osl_socket_listen (socket, 1);
-            OSL_ASSERT(result == osl_Socket_Ok);
-
-            connection = osl_socket_accept (socket, &from);
-            if (connection)
-            {
-                sal_Char         buffer[64];
-                sal_Int32        k, n = sizeof(buffer);
-                oslSocketMsgFlag flag = osl_Socket_MsgNormal;
-
-                result = osl_socket_accept_handshake (connection, from);
-                osl_destroySocketAddr (from);
-                OSL_ASSERT(result == osl_Socket_Ok);
-
-                while ((k = osl_socket_recv (connection, buffer, n, flag)) > 0)
-                {
-                    if (osl_socket_send (connection, buffer, k, flag) < 0)
-                        break;
-                }
-
-                osl_socket_close (connection);
-
-                osl_socket_delete (connection);
-                osl_socket_deleteSocketLayer (connection);
-            }
-
-            osl_socket_close (socket);
-        }
-
-        osl_socket_delete (socket);
-        osl_socket_deleteSocketLayer (socket);
-    }
-
-    return 0;
-}
-
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index ed975ccbf..b43fa3483 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/XParser.hpp>
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/weak.hxx>
@@ -374,7 +375,8 @@ extern "C"
 // LocatorImpl
 //---------------------------------------------
 class LocatorImpl :
-    public WeakImplHelper1< XLocator > 
+    public WeakImplHelper2< XLocator, com::sun::star::io::XSeekable >
+    // should use a different interface for stream positions!
 {
 public:
     LocatorImpl( SaxExpatParser_Impl *p )
@@ -400,6 +402,20 @@ public: //XLocator
         return m_pParser->getEntity().structSource.sSystemId;
     }
 
+    // XSeekable (only for getPosition)
+
+    virtual void SAL_CALL seek( sal_Int64 ) throw()
+    {
+    }
+    virtual sal_Int64 SAL_CALL getPosition() throw()
+    {
+        return XML_GetCurrentByteIndex( m_pParser->getEntity().pParser );
+    }
+    virtual ::sal_Int64 SAL_CALL getLength() throw()
+    {
+        return 0;
+    }
+
 private:
 
     SaxExpatParser_Impl *m_pParser;
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index 246d5ef18..63f8def74 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -208,6 +208,8 @@ public:
 // If there are invalid characters in the string it returns sal_False.
 // Than the calling method has to throw the needed Exception.
     inline sal_Bool comment(const rtl::OUString& rComment) throw( SAXException );
+
+    inline void clearBuffer() throw( SAXException );
 };
 
 const sal_Bool g_bValidCharsBelow32[32] =
@@ -693,6 +695,17 @@ inline void SaxWriterHelper::endDocument() throw( SAXException )
     }
 }
 
+inline void SaxWriterHelper::clearBuffer() throw( SAXException )
+{
+    FinishStartElement();
+    if (nCurrentPos > 0)
+    {
+        m_Sequence.realloc(nCurrentPos);
+        nCurrentPos = writeSequence();
+        m_Sequence.realloc(SEQUENCESIZE);
+    }
+}
+
 inline sal_Bool SaxWriterHelper::processingInstruction(const rtl::OUString& rTarget, const rtl::OUString& rData) throw( SAXException )
 {
     FinishStartElement();
@@ -927,12 +940,20 @@ public: // XActiveDataSource
     virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream)
         throw (RuntimeException)
             {
+                // temporary: set same stream again to clear buffer
+                if ( m_out == aStream && mp_SaxWriterHelper && m_bDocStarted )
+                    mp_SaxWriterHelper->clearBuffer();
+                else
+                {
+
                 m_out = aStream;
                 delete mp_SaxWriterHelper;
                 mp_SaxWriterHelper = new SaxWriterHelper(m_out);
                 m_bDocStarted = sal_False;
                 m_nLevel = 0;
                 m_bIsCDATA = sal_False;
+
+                }
             }
     virtual Reference< XOutputStream >  SAL_CALL getOutputStream(void)
         throw(RuntimeException)
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
new file mode 100644
index 000000000..2495b4c27
--- /dev/null
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -0,0 +1,191 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AccessibleDataPilotControl.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_ACCESSIBLEFILTERMENU_HXX
+#define SC_ACCESSIBLEFILTERMENU_HXX
+
+#include "AccessibleContextBase.hxx"
+#include "cppuhelper/implbase1.hxx"
+
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <com/sun/star/accessibility/XAccessibleText.hpp>
+#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
+#include <com/sun/star/accessibility/TextSegment.hpp>
+
+#include <vector>
+
+namespace com { namespace sun { namespace star {
+    namespace accessibility {
+        struct AccessibleEventObject;
+    }
+}}}
+
+class ScDocument;
+class ScMenuFloatingWindow;
+
+typedef ::cppu::ImplHelper1< 
+        ::com::sun::star::accessibility::XAccessibleSelection > ScAccessibleFilterMenu_BASE;
+
+class ScAccessibleFilterMenu : 
+    public ScAccessibleContextBase, 
+    public ScAccessibleFilterMenu_BASE
+{
+public:
+    explicit ScAccessibleFilterMenu(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible>& rxParent,
+            ScMenuFloatingWindow* pWin, const ::rtl::OUString& rName, size_t nMenuPos, ScDocument* pDoc);
+    virtual ~ScAccessibleFilterMenu();
+
+	// XAccessibleComponent
+
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+		SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint )
+		    throw (::com::sun::star::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL isVisible()
+		throw (::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL grabFocus()
+		throw (::com::sun::star::uno::RuntimeException);
+
+    virtual sal_Int32 SAL_CALL getForeground() 
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual sal_Int32 SAL_CALL getBackground() 
+        throw (::com::sun::star::uno::RuntimeException);
+
+	// XAccessibleContext
+
+	virtual ::rtl::OUString SAL_CALL getAccessibleName()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+    	getAccessibleChild(sal_Int32 nIndex)
+            throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
+
+	virtual ::com::sun::star::uno::Reference< 
+        ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
+    	getAccessibleStateSet()
+            throw (::com::sun::star::uno::RuntimeException);
+
+	virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleEventBroadcaster
+
+	virtual void SAL_CALL
+    	addEventListener(
+        	const ::com::sun::star::uno::Reference<
+                ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
+        throw (com::sun::star::uno::RuntimeException);
+
+    //	Remove an existing event listener.
+	virtual void SAL_CALL
+    	removeEventListener(
+			const ::com::sun::star::uno::Reference<
+                ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
+        throw (com::sun::star::uno::RuntimeException);
+
+    // XAccessibleSelection
+
+    virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex) 
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected(sal_Int32 nChildIndex) 
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL clearAccessibleSelection() 
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL selectAllAccessibleChildren() 
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::sal_Int32 SAL_CALL getSelectedAccessibleChildCount() 
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL 
+        getSelectedAccessibleChild(sal_Int32 nChildIndex) 
+            throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex) 
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XInterface
+
+	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( 
+		::com::sun::star::uno::Type const & rType ) 
+		    throw (::com::sun::star::uno::RuntimeException);
+
+	virtual void SAL_CALL acquire() throw ();
+	virtual void SAL_CALL release() throw ();
+
+    // XTypeProvider
+
+    virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // non-UNO methods
+
+    void appendMenuItem(const ::rtl::OUString& rName, bool bEnabled, size_t nMenuPos);
+    void setMenuPos(size_t nMenuPos);
+    void setEnabled(bool bEnabled);
+
+protected:
+
+    sal_Int32 getMenuItemCount() const;
+
+	virtual Rectangle GetBoundingBoxOnScreen() const
+		throw (::com::sun::star::uno::RuntimeException);
+
+	virtual Rectangle GetBoundingBox() const
+		throw (::com::sun::star::uno::RuntimeException);
+
+private:
+    bool isSelected() const;
+    bool isFocused() const;
+
+    void updateStates();
+
+private:
+    ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > maMenuItems;
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet;
+
+    size_t mnMenuPos;
+    ScMenuFloatingWindow* mpWindow;
+    ScDocument* mpDoc;
+
+    bool mbEnabled:1;
+};
+
+#endif
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
new file mode 100644
index 000000000..b9a348529
--- /dev/null
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -0,0 +1,124 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AccessibleDataPilotControl.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_ACCESSIBLEFILTERMENUITEM_HXX
+#define SC_ACCESSIBLEFILTERMENUITEM_HXX
+
+#include "AccessibleContextBase.hxx"
+#include "cppuhelper/implbase1.hxx"
+
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+
+class ScMenuFloatingWindow;
+
+typedef ::cppu::ImplHelper1<
+    ::com::sun::star::accessibility::XAccessibleAction > ScAccessibleFilterMenuItem_BASE;
+
+class ScAccessibleFilterMenuItem : 
+    public ScAccessibleContextBase,
+    public ScAccessibleFilterMenuItem_BASE
+{
+public:
+    explicit ScAccessibleFilterMenuItem(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const ::rtl::OUString& rName, size_t nMenuPos);
+
+    virtual ~ScAccessibleFilterMenuItem();
+
+	// XAccessibleContext
+
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Reference< 
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    	getAccessibleChild(sal_Int32 nIndex)
+            throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
+
+	virtual ::com::sun::star::uno::Reference< 
+        ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
+    	getAccessibleStateSet()
+            throw (::com::sun::star::uno::RuntimeException);
+
+	virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleAction
+
+    virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() 
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex) 
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex) 
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Reference< 
+        ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL 
+        getAccessibleActionKeyBinding(sal_Int32 nIndex) 
+            throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XInterface
+
+	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( 
+		::com::sun::star::uno::Type const & rType ) 
+		    throw (::com::sun::star::uno::RuntimeException);
+
+	virtual void SAL_CALL acquire() throw ();
+	virtual void SAL_CALL release() throw ();
+
+    // Non-UNO Methods
+
+    void setEnabled(bool bEnabled);
+
+protected:
+
+	virtual Rectangle GetBoundingBoxOnScreen() const
+		throw (::com::sun::star::uno::RuntimeException);
+
+	virtual Rectangle GetBoundingBox() const
+		throw (::com::sun::star::uno::RuntimeException);
+
+private:
+    bool isSelected() const;
+    bool isFocused() const;
+    void updateStateSet();
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet;
+
+    ScMenuFloatingWindow* mpWindow;
+    ::rtl::OUString maName;
+    size_t mnMenuPos;
+    bool mbEnabled;
+};
+
+#endif
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
new file mode 100644
index 000000000..c13c494e2
--- /dev/null
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AccessibleDataPilotControl.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_ACCESSIBLEFILTERTOPWINDOW_HXX
+#define SC_ACCESSIBLEFILTERTOPWINDOW_HXX
+
+//#include "AccessibleContextBase.hxx"
+#include "AccessibleFilterMenu.hxx"
+#include "cppuhelper/implbase1.hxx"
+
+class ScDPFieldPopupWindow;
+class ScDocument;
+
+class ScAccessibleFilterTopWindow : public ScAccessibleFilterMenu
+{
+public:
+    ScAccessibleFilterTopWindow(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible>& rxParent,
+            ScDPFieldPopupWindow* pWin, const ::rtl::OUString& rName, ScDocument* pDoc);
+    virtual ~ScAccessibleFilterTopWindow();
+
+	// XAccessibleContext
+
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+    	getAccessibleChild(sal_Int32 nIndex)
+            throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
+
+	virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // Non-UNO Methods
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        getAccessibleChildMenu();
+
+    enum ChildControlType {
+        LISTBOX, TOGGLE_ALL, SINGLE_ON_BTN, SINGLE_OFF_BTN, OK_BTN, CANCEL_BTN
+    };
+    void setAccessibleChild(
+        const ::com::sun::star::uno::Reference< 
+            ::com::sun::star::accessibility::XAccessible >& rAccessible,
+        ChildControlType eType);
+
+private:
+    /** The top menu part */
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        mxAccMenu;
+
+    /** check list box for field member visibility */
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        mxAccListBox;
+
+    /** check box for toggling all field member's visibility. */
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        mxAccToggleAll;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        mxAccSingleOnBtn;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        mxAccSingleOffBtn;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        mxAccOkBtn;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        mxAccCancelBtn;
+
+    ScDPFieldPopupWindow* mpWindow;
+    ScDocument* mpDoc;
+};
+
+#endif
diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx
new file mode 100644
index 000000000..5e75bf4ba
--- /dev/null
+++ b/sc/inc/AccessibleGlobal.hxx
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AccessibleDataPilotControl.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_ACCESSIBLEGLOBAL_HXX
+#define SC_ACCESSIBLEGLOBAL_HXX
+
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include "cppuhelper/implbase1.hxx"
+
+#include <set>
+
+/** 
+ * Generic XAccessibleStateSet implementation.
+ */
+class ScAccessibleStateSet : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleStateSet >
+{
+public:
+    ScAccessibleStateSet();
+    virtual ~ScAccessibleStateSet();
+
+    // XAccessibleStateSet
+
+    virtual ::sal_Bool SAL_CALL isEmpty() 
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL contains(sal_Int16 nState) 
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL containsAll(
+        const ::com::sun::star::uno::Sequence<sal_Int16>& aStateSet) 
+            throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Sequence<sal_Int16> SAL_CALL getStates() 
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // Non-UNO Methods
+
+    void insert(sal_Int16 nState);
+    void clear();
+
+private:
+    ::std::set<sal_Int16> maStates;
+};
+
+#endif
diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx
index 4561e51c6..1143d9fb4 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -64,7 +64,7 @@
 // this are the defines for the position of the settings in the
 // TableViewSettingsSequence
 
-#define SC_TABLE_VIEWSETTINGS_COUNT         15
+#define SC_TABLE_VIEWSETTINGS_COUNT         16
 
 #define SC_CURSOR_X							0
 #define SC_CURSOR_Y							1
@@ -80,7 +80,8 @@
 #define SC_TABLE_ZOOM_TYPE                  11
 #define SC_TABLE_ZOOM_VALUE                 12
 #define SC_TABLE_PAGE_VIEW_ZOOM_VALUE       13
-#define SC_TABLE_SHOWGRID                   14
+#define SC_TABLE_TAB_BG_COLOR               14
+#define SC_TABLE_SHOWGRID                   15
 
 #define SC_CURSORPOSITIONX					"CursorPositionX"
 #define SC_CURSORPOSITIONY					"CursorPositionY"
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 4ab8d3249..25caeb12a 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -106,6 +106,7 @@ public:
 
     BOOL	HasAutoFilter() const		{ return ( GetValue() & SC_MF_AUTO ) != 0; }
     BOOL	HasButton() const			{ return ( GetValue() & SC_MF_BUTTON ) != 0; }
+    bool    HasDPTable() const          { return ( GetValue() & SC_MF_DP_TABLE ) != 0; }
 
     BOOL	IsScenario() const			{ return ( GetValue() & SC_MF_SCENARIO ) != 0; }
 };
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 2e385e3a2..41a441317 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -44,7 +44,6 @@
 #include "formula/grammar.hxx"
 #include "tokenarray.hxx"
 #include "formularesult.hxx"
-#include "phonetic.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <vcl/fontcvt.hxx>
 #include "scdllapi.h"
@@ -64,7 +63,6 @@ class ScCodeArray;
 class ScProgress;
 class ScPostIt;
 class ScPatternAttr;
-class ScPhonetic;
 
 // ============================================================================
 
@@ -246,64 +244,12 @@ public:
     inline void		GetString( String& rString ) const { rString = maString; }
     inline const String& GetString() const { return maString; }
 
-    virtual bool    HasPhonetic() const;
-
 private:
     String		    maString;
 };
 
 // ============================================================================
 
-/**
- * A class for representing of Asian phonetic guide.
- */
-class SC_DLLPUBLIC ScAsianStringCell : public ScStringCell
-{
-private:
-    ScPhonetic      aPhonetic;
-
-public:
-
-#ifdef USE_MEMPOOL
-    DECL_FIXEDMEMPOOL_NEWDEL( ScAsianStringCell )
-#endif
-#ifdef DBG_UTIL
-    ~ScAsianStringCell();
-#endif
-
-    ScAsianStringCell();
-
-    /**
-     * A constructor of ScAsianStringCell
-     * @param rString the text of the cell.
-     * @param rPhonetic a reference of ScPhonetic.
-     */
-    ScAsianStringCell( const String& rString, const ScPhonetic& rPhonetic );
-
-    /**
-     * A constructor of ScAsianStringCell
-     * @param rStream a reference of SvStream.
-     * @param nVer the number of vesion.
-     */
-    ScAsianStringCell( SvStream& rStream, USHORT nVer );
-
-    /**
-     * Sets ScPhonetic:
-     * @param rPhonetic a reference of ScPhonetic.
-     */
-    void            SetPhonetic( const ScPhonetic& rPhonetic );
-
-    /**
-     * Gets ScPhonetic:
-     * @param rPhonetic a reference of ScPhonetic.
-     */
-    void            GetPhonetic( ScPhonetic& rPhonetic ) const;
-
-    virtual bool    HasPhonetic() const;
-};
-
-// ============================================================================
-
 class SC_DLLPUBLIC ScEditCell : public ScBaseCell
 {
 private:
@@ -336,8 +282,6 @@ public:
     void			GetData( const EditTextObject*& rpObject ) const;
     void			GetString( String& rString ) const;
 
-    virtual bool    HasPhonetic() const;
-
     const EditTextObject* GetData() const	{ return pData; }
 
     /** Removes character attribute based on new pattern attributes. */
@@ -390,60 +334,6 @@ private:
 
 // ============================================================================
 
-
-/**
- * A class for representing of Asian phonetic guide.
- * It is derived from ScStringCell.
- */
-class SC_DLLPUBLIC ScAsianEditCell : public ScEditCell
-{
-private:
-    ScPhonetic      aPhonetic;
-
-public:
-
-#ifdef USE_MEMPOOL
-    DECL_FIXEDMEMPOOL_NEWDEL( ScAsianStringCell )
-#endif
-#ifdef DBG_UTIL
-    ~ScAsianEditCell();
-#endif
-
-    /**
-     * A constructor of ScAsianEditCell
-     * @param rEditCell a reference of ScEditCell.
-     * @param pDoc a pointer of ScDocument.
-     * @param rPhonetic a reference of ScPhonetic.
-     */
-    ScAsianEditCell( const ScEditCell& rEditCell, ScDocument& rDoc, const ScPhonetic& rPhonetic );
-
-    /**
-     * A constructor of ScAsianEditCell
-     * @param pObject a pointer of EditTextObject.
-     * @param pDoc a pointer of ScDocument.
-     * @param pFromPool a pointer of SfxItemPool.
-     * @param rPhonetic a reference of ScPhonetic.
-     */
-    ScAsianEditCell( const EditTextObject* pObject, ScDocument* pDoc,
-                     const SfxItemPool* pFromPool, const ScPhonetic& rPhonetic );
-
-    /**
-     * Sets ScPhonetic:
-     * @param rPhonetic a reference of ScPhonetic.
-     */
-    void            SetPhonetic( const ScPhonetic& rPhonetic );
-
-    /**
-     * Gets ScPhonetic:
-     * @param rPhonetic a reference of ScPhonetic.
-     */
-    void            GetPhonetic( ScPhonetic& rPhonetic ) const;
-
-    virtual bool    HasPhonetic() const;
-};
-
-// ----------------------------------------------------------------------------
-
 enum ScMatrixMode {
     MM_NONE      = 0,                   // No matrix formula
     MM_FORMULA   = 1,                   // Upper left matrix formula cell
@@ -451,8 +341,6 @@ enum ScMatrixMode {
     MM_FAKE      = 3                    // Interpret "as-if" matrix formula (legacy)
 };
 
-class ScIndexMap;
-
 class SC_DLLPUBLIC ScFormulaCell : public ScBaseCell, public SvtListener
 {
 private:
@@ -575,8 +463,7 @@ public:
     void			UpdateCompile( BOOL bForceIfNameInUse = FALSE );
     BOOL			IsRangeNameInUse(USHORT nIndex) const;
     void            FindRangeNamesInUse(std::set<USHORT>& rIndexes) const;
-    void 			ReplaceRangeNamesInUse( const ScIndexMap& rMap );
-	void 			ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap );
+    void 			ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap );
     BOOL			IsSubTotal() const 						{ return bSubTotal; }
     BOOL			IsChanged() const  						{ return bChanged; }
     void			ResetChanged()							{ bChanged = FALSE; }
@@ -670,67 +557,5 @@ public:
 
 // ============================================================================
 
-inline bool ScStringCell::HasPhonetic() const
-{
-    return false;
-}
-
-// ScAsianStringCell
-
-inline ScAsianStringCell::ScAsianStringCell()
-{
-}
-
-inline ScAsianStringCell::ScAsianStringCell( const String& rString, const ScPhonetic& rPhonetic ) :
-    ScStringCell ( rString ),
-    aPhonetic ( rPhonetic )
-{
-}
-
-inline void ScAsianStringCell::GetPhonetic( ScPhonetic& rPhonetic ) const
-{
-    rPhonetic = aPhonetic;
-}
-
-inline bool ScAsianStringCell::HasPhonetic() const
-{
-    return true;
-}
-
-inline void ScAsianStringCell::SetPhonetic( const ScPhonetic& rPhonetic )
-{
-    aPhonetic = rPhonetic;
-}
-
-//      ScAsianEditCell
-
-inline ScAsianEditCell::ScAsianEditCell( const ScEditCell& rEditCell, ScDocument& rDoc, const ScPhonetic& rPhonetic ) :
-    ScEditCell( rEditCell, rDoc ),
-    aPhonetic( rPhonetic )
-{
-}
-
-inline ScAsianEditCell::ScAsianEditCell( const EditTextObject* pObject, ScDocument* pDocP,
-                                         const SfxItemPool* pFromPool, const ScPhonetic& rPhonetic ) :
-    ScEditCell( pObject, pDocP, pFromPool ),
-    aPhonetic( rPhonetic )
-{
-}
-
-inline void ScAsianEditCell::GetPhonetic( ScPhonetic& rPhonetic ) const
-{
-    rPhonetic = aPhonetic;
-}
-
-inline void ScAsianEditCell::SetPhonetic( const ScPhonetic& rPhonetic )
-{
-    aPhonetic = rPhonetic;
-}
-
-inline bool ScAsianEditCell::HasPhonetic() const
-{
-    return true;
-}
-
 #endif
 
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 12c810437..a1671b836 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -155,7 +155,7 @@ namespace ooo
         namespace excel {
     class ScVbaCellRangeAccess;  // Vba Helper class
     }
-    }
+}
 }
 
 class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet,
@@ -985,14 +985,6 @@ public:
     virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException);
 
     static String		GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aPos);
-
-    /**
-     * Gets phonetic text from a cell. 
-     *  
-     * @param pDoc A pointer of ScDocument.
-     * @param aPos A reference of ScAdress.
-     */
-    static String GetOutputPhoneticString_Impl(ScDocument* pDoc, const ScAddress& aPos);
 };
 
 
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 93afe6491..46b7ff076 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -533,6 +533,14 @@ private:
     };
 
     ::std::list<Item>           m_aDataArray;
+
+    /** 
+     * Cached data for getData.  We may also need to cache data for the 
+     * numerical and textural data series if they turn out to be bottlenecks 
+     * under certain scenarios.
+     */ 
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aMixedDataCache;
+
     ::com::sun::star::uno::Sequence<sal_Int32>  m_aHiddenValues;
 
     // properties
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index a8a97d3b4..51ac644ee 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -49,7 +49,7 @@ class ScChartUnoData;
 #include <com/sun/star/chart/XChartData.hpp>
 #include <com/sun/star/chart/XChartDataChangeEventListener.hpp>
 
-class ScChartListener : public StrData, public SvtListener
+class SC_DLLPUBLIC ScChartListener : public StrData, public SvtListener
 {
 public:
     class ExternalRefListener : public ScExternalRefManager::LinkListener
diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx
index 1a46f4cd7..544cef3f2 100644
--- a/sc/inc/clipparam.hxx
+++ b/sc/inc/clipparam.hxx
@@ -49,6 +49,7 @@ struct ScClipParam
     bool        mbCutMode;
 
     ScClipParam();
+    ScClipParam(const ScRange& rRange, bool bCutMode);
     explicit ScClipParam(const ScClipParam& r);
 
     bool isMultiRange() const;
diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx
index 6c6987b55..348981983 100644
--- a/sc/inc/collect.hxx
+++ b/sc/inc/collect.hxx
@@ -80,7 +80,7 @@ public:
 
     ScDataObject*   At(USHORT nIndex) const;
     virtual USHORT      IndexOf(ScDataObject* pScDataObject) const;
-    USHORT GetCount() const { return nCount; }
+    USHORT GetCount() const;
 
             ScDataObject* operator[]( const USHORT nIndex) const {return At(nIndex);}
             ScCollection&   operator=( const ScCollection& rCol );
@@ -192,6 +192,7 @@ public:
 
             TypedScStrCollection( const TypedScStrCollection& rCpy )
                 : ScSortedCollection( rCpy ) { bCaseSensitive = rCpy.bCaseSensitive; }
+            ~TypedScStrCollection();
 
     virtual ScDataObject*       Clone() const;
     virtual short           Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e215ad71e..1d3cad939 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -69,6 +69,7 @@ class ScPostIt;
 struct ScFunctionData;
 struct ScLineFlags;
 struct ScMergePatternState;
+struct ScSetStringParam;
 class ScFlatBoolRowSegments;
 
 #define COLUMN_DELTA	4
@@ -99,8 +100,6 @@ struct ColEntry
 };
 
 
-class ScIndexMap;
-
 class ScColumn
 {
 private:
@@ -117,7 +116,7 @@ private:
 friend class ScDocument;					// fuer FillInfo
 friend class ScDocumentIterator;
 friend class ScValueIterator;
-friend class ScQueryValueIterator;
+friend class ScDBQueryDataIterator;
 friend class ScColumnIterator;
 friend class ScQueryCellIterator;
 friend class ScMarkedDataIter;
@@ -215,10 +214,10 @@ public:
                 //	UpdateSelectionFunction: Mehrfachselektion
     void		UpdateSelectionFunction( const ScMarkData& rMark,
                                     ScFunctionData& rData,
-                                    const ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags,
+                                    ScFlatBoolRowSegments& rHiddenRows,
                                     BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
     void		UpdateAreaFunction( ScFunctionData& rData,
-                                    const ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags,
+                                    ScFlatBoolRowSegments& rHiddenRows,
                                     SCROW nStartRow, SCROW nEndRow );
 
     void		CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
@@ -242,8 +241,7 @@ public:
                 //	TRUE = Zahlformat gesetzt
     BOOL		SetString( SCROW nRow, SCTAB nTab, const String& rString,
 						   formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO,
-                           SvNumberFormatter* pFormatter = NULL,
-                           bool bDetectNumberFormat = true );
+                           ScSetStringParam* pParam = NULL );
     void		SetValue( SCROW nRow, const double& rVal);
     void		SetError( SCROW nRow, const USHORT nError);
 
@@ -301,8 +299,7 @@ public:
     void		SetTabNo(SCTAB nNewTab);
     BOOL		IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const;
     void        FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<USHORT>& rIndexes) const;
-    void 		ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScIndexMap& rMap );
-	void 		ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap );
+    void 		ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap );
 
     const SfxPoolItem*		GetAttr( SCROW nRow, USHORT nWhich ) const;
     const ScPatternAttr*	GetPattern( SCROW nRow ) const;
@@ -382,7 +379,7 @@ public:
                 /// Including current, may return -1
     SCsROW		GetNextUnprotected( SCROW nRow, BOOL bUp ) const;
 
-    void		GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings);
+    void		GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates);
     BOOL		GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit);
 
 //UNUSED2008-05  SCROW		NoteCount( SCROW nMaxRow = MAXROW ) const;
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 31038751d..44e033629 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -32,6 +32,8 @@
 #define SC_DATAUNO_HXX
 
 #include "global.hxx"
+#include "queryparam.hxx"
+
 #include <svtools/itemprop.hxx>
 #include <svtools/lstner.hxx>
 #include <com/sun/star/sheet/TableFilterField.hpp>
diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx
index e41ccfa3b..00ea53b57 100644
--- a/sc/inc/dbcolect.hxx
+++ b/sc/inc/dbcolect.hxx
@@ -63,7 +63,7 @@ private:
     BOOL			bStripData;
     // SortParam
     BOOL			bSortCaseSens;
-	BOOL			bSortNaturalSort;
+    BOOL			bSortNaturalSort;
     BOOL			bIncludePattern;
     BOOL			bSortInplace;
     BOOL			bSortUserDef;
@@ -88,6 +88,7 @@ private:
     SCCOLROW		nQueryField[MAXQUERY];
     ScQueryOp		eQueryOp[MAXQUERY];
     BOOL			bQueryByString[MAXQUERY];
+    bool            bQueryByDate[MAXQUERY];
     String*			pQueryStr[MAXQUERY];
     double			nQueryVal[MAXQUERY];
     ScQueryConnect  eQueryConnect[MAXQUERY];
diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index c38150d2c..54cb4130d 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -136,6 +136,7 @@ class SC_DLLPUBLIC ScDetectiveFunc
 
     BOOL		FindFrameForObject( SdrObject* pObject, ScRange& rRange );
 
+    void        Modified();
 
 public:
                 ScDetectiveFunc(ScDocument* pDocument, SCTAB nTable) : pDoc(pDocument),nTab(nTable) {}
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index d5d42354d..350c6110b 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -35,6 +35,9 @@
 #include <tools/solar.h>
 #include "global.hxx"
 #include "scdllapi.h"
+#include "queryparam.hxx"
+
+#include <memory>
 
 class ScDocument;
 class ScBaseCell;
@@ -127,34 +130,91 @@ public:
                     }
 };
 
-class ScQueryValueIterator            // alle Zahlenwerte in einem Bereich durchgehen
+// ============================================================================
+
+class ScDBQueryDataIterator
 {
+public:
+    struct Value
+    {
+        ::rtl::OUString maString;
+        double          mfValue;
+        sal_uInt16      mnError;
+        bool            mbIsNumber;
+
+        Value();
+    };
+
 private:
-    ScQueryParam	aParam;
-    ScDocument*		pDoc;
-    const ScAttrArray*	pAttrArray;
-    ULONG			nNumFormat;		// fuer CalcAsShown
-    ULONG			nNumFmtIndex;
-    SCCOL 			nCol;
-    SCROW			nRow;
-    SCSIZE			nColRow;
-    SCROW			nAttrEndRow;
-    SCTAB			nTab;
-    short			nNumFmtType;
-    BOOL			bCalcAsShown;
+    class DataAccess
+    {
+    public:
+        DataAccess(const ScDBQueryDataIterator* pParent);
+        virtual ~DataAccess() = 0;
+        virtual bool getCurrent(Value& rValue) = 0;
+        virtual bool getFirst(Value& rValue) = 0;
+        virtual bool getNext(Value& rValue) = 0;
+    protected:
+        const ScDBQueryDataIterator* mpParent;
+    };
+
+    class DataAccessInternal : public DataAccess
+    {
+    public:
+        DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc);
+        virtual ~DataAccessInternal();
+        virtual bool getCurrent(Value& rValue);
+        virtual bool getFirst(Value& rValue);
+        virtual bool getNext(Value& rValue);
+
+    private:
+        ScDBQueryParamInternal* mpParam;
+        ScDocument*         mpDoc;
+        const ScAttrArray*  pAttrArray;
+        ULONG               nNumFormat;     // for CalcAsShown
+        ULONG               nNumFmtIndex;
+        SCCOL               nCol;
+        SCROW               nRow;
+        SCSIZE              nColRow;
+        SCROW               nAttrEndRow;
+        SCTAB               nTab;
+        short               nNumFmtType;
+        bool                bCalcAsShown;
+    };
+
+    class DataAccessMatrix : public DataAccess
+    {
+    public:
+        DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam);
+        virtual ~DataAccessMatrix();
+        virtual bool getCurrent(Value& rValue);
+        virtual bool getFirst(Value& rValue);
+        virtual bool getNext(Value& rValue);
+
+    private:
+        bool isValidQuery(SCROW mnRow, const ScMatrix& rMat) const;
+
+        ScDBQueryParamMatrix* mpParam;
+        SCROW mnCurRow;
+        SCROW mnRows;
+        SCCOL mnCols;
+    };
+
+    ::std::auto_ptr<ScDBQueryParamBase> mpParam;
+    ::std::auto_ptr<DataAccess>         mpData;
+
+    bool            GetThis(Value& rValue);
 
-    BOOL			GetThis(double& rValue, USHORT& rErr);
 public:
-                    ScQueryValueIterator(ScDocument* pDocument, SCTAB nTable,
-                                         const ScQueryParam& aParam);
+                    ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam);
     /// Does NOT reset rValue if no value found!
-    BOOL			GetFirst(double& rValue, USHORT& rErr);
+    bool            GetFirst(Value& rValue);
     /// Does NOT reset rValue if no value found!
-    BOOL			GetNext(double& rValue, USHORT& rErr);
-    void			GetCurNumFmtInfo( short& nType, ULONG& nIndex )
-                        { nType = nNumFmtType; nIndex = nNumFmtIndex; }
+    bool            GetNext(Value& rValue);
 };
 
+// ============================================================================
+
 class ScCellIterator            // alle Zellen in einem Bereich durchgehen
 {								// bei SubTotal aber keine ausgeblendeten und
 private:						// SubTotalZeilen
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index cd19d02dd..dc8710efd 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -47,6 +47,7 @@
 
 #include <memory>
 #include <map>
+#include <set>
 
 class KeyEvent;
 class OutputDevice;
@@ -135,10 +136,11 @@ class ScAutoNameCache;
 class ScTemporaryChartLock;
 class ScLookupCache;
 struct ScLookupCacheMapImpl;
-struct ScClipParam;
-struct ScClipRangeNameData;
 class SfxUndoManager;
 class ScFormulaParserPool;
+struct ScClipParam;        
+struct ScClipRangeNameData;
+struct ScSetStringParam;
 
 namespace com { namespace sun { namespace star {
     namespace lang {
@@ -154,6 +156,9 @@ namespace com { namespace sun { namespace star {
     namespace embed {
         class XEmbeddedObject;
     }
+    namespace sheet {
+        struct TablePageBreakData;
+    }
 } } }
 
 namespace com { namespace sun { namespace star { namespace document {
@@ -231,7 +236,7 @@ class ScDocument
 {
 friend class ScDocumentIterator;
 friend class ScValueIterator;
-friend class ScQueryValueIterator;
+friend class ScDBQueryDataIterator;
 friend class ScCellIterator;
 friend class ScQueryCellIterator;
 friend class ScHorizontalCellIterator;
@@ -264,7 +269,7 @@ private:
     ScChartCollection*	pChartCollection;
     std::auto_ptr< ScTemporaryChartLock > apTemporaryChartLock;
     ScPatternAttr*		pSelectionAttr;					// Attribute eines Blocks
-    SvxLinkManager*		pLinkManager;
+    mutable SvxLinkManager*		pLinkManager;
     ScFormulaCell*		pFormulaTree;					// Berechnungsbaum Start
     ScFormulaCell*		pEOFormulaTree;					// Berechnungsbaum Ende, letzte Zelle
     ScFormulaCell*		pFormulaTrack;					// BroadcastTrack Start
@@ -422,22 +427,18 @@ private:
     bool                mbAdjustHeightEnabled;
     bool                mbExecuteLinkEnabled;
     bool                mbChangeReadOnlyEnabled;    // allow changes in read-only document (for API import filters)
+    bool                mbStreamValidLocked;
 
     sal_Int16           mnNamedRangesLockCount;
 
 	// for worksheet calculate event
 	::std::vector< SCTAB > maTabs;
 
-    inline BOOL 		RowHidden( SCROW nRow, SCTAB nTab );		// FillInfo
-
 public:
     SC_DLLPUBLIC ULONG			GetCellCount() const;		// alle Zellen
     ULONG			GetWeightedCount() const;	// Formeln und Edit staerker gewichtet
     ULONG			GetCodeCount() const;		// RPN-Code in Formeln
     DECL_LINK( GetUserDefinedColor, USHORT * );
-    BOOL        RowFiltered( SCROW nRow, SCTAB nTab ) const;    // FillInfo
-    BOOL        ColFiltered( SCCOL nCol, SCTAB nTab ) const;    // FillInfo
-                                                                // Numberformatter
 
 public:
     SC_DLLPUBLIC 				ScDocument( ScDocumentMode eMode = SCDOCMODE_DOCUMENT,
@@ -457,7 +458,7 @@ public:
     SC_DLLPUBLIC void			InitDrawLayer( SfxObjectShell* pDocShell = NULL );
     XColorTable*	GetColorTable();
 
-    SvxLinkManager*		GetLinkManager() { return pLinkManager; }
+    SC_DLLPUBLIC SvxLinkManager*		GetLinkManager() const;
 
     SC_DLLPUBLIC const ScDocOptions&		GetDocOptions() const;
     SC_DLLPUBLIC void					SetDocOptions( const ScDocOptions& rOpt );
@@ -529,7 +530,7 @@ public:
             ::com::sun::star::embed::XEmbeddedObject >
                     FindOleObjectByName( const String& rName );
 
-    SC_DLLPUBLIC void			MakeTable( SCTAB nTab );
+    SC_DLLPUBLIC void			MakeTable( SCTAB nTab,bool _bNeedsNameCheck = true );
 
     SCTAB			GetVisibleTab() const		{ return nVisibleTab; }
     SC_DLLPUBLIC void			SetVisibleTab(SCTAB nTab)	{ nVisibleTab = nTab; }
@@ -591,6 +592,10 @@ public:
     SC_DLLPUBLIC void			TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos);
     SC_DLLPUBLIC void			SetVisible( SCTAB nTab, BOOL bVisible );
     SC_DLLPUBLIC BOOL			IsVisible( SCTAB nTab ) const;
+    BOOL            IsStreamValid( SCTAB nTab ) const;
+    void            SetStreamValid( SCTAB nTab, BOOL bSet, BOOL bIgnoreLock = FALSE );
+    void            LockStreamValid( bool bLock );
+    bool            IsStreamValidLocked() const                         { return mbStreamValidLocked; }
     BOOL            IsPendingRowHeights( SCTAB nTab ) const;
     void            SetPendingRowHeights( SCTAB nTab, BOOL bSet );
     SC_DLLPUBLIC void			SetLayoutRTL( SCTAB nTab, BOOL bRTL );
@@ -737,8 +742,7 @@ public:
                             ULONG nFormatIndex, BOOL bForceTab = FALSE);
                     //	return TRUE = Zahlformat gesetzt
     SC_DLLPUBLIC BOOL           SetString(
-        SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
-        SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
+        SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, ScSetStringParam* pParam = NULL );
     SC_DLLPUBLIC void           SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal );
     void 			SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError);
 
@@ -880,7 +884,7 @@ public:
     BOOL			IsForcedFormulaPending() const { return bForcedFormulaPending; }
                     // if CalcFormulaTree() is currently running
     BOOL			IsCalculatingFormulaTree() { return bCalculatingFormulaTree; }
-	
+
 					// for worksheet calculate event
 	BOOL			FireCalculateEvent( SCTAB nTab );
 	void			AddCalculateTable( SCTAB nTab );
@@ -890,7 +894,7 @@ public:
     bool            ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow) const;
 
     void			GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
-									SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld ) const;
+                                 SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld ) const;
     SC_DLLPUBLIC BOOL			GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
     SC_DLLPUBLIC BOOL			GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
     SC_DLLPUBLIC BOOL			GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
@@ -987,15 +991,11 @@ public:
     void			DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                 SCTAB nTab, USHORT nDelFlag);
     void			DeleteAreaTab(const ScRange& rRange, USHORT nDelFlag);
-    void			CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                BOOL bCut, ScDocument* pClipDoc, BOOL bAllTabs,
-                                const ScMarkData* pMarks = NULL,
-                                BOOL bKeepScenarioFlags = FALSE,
-                                BOOL bIncludeObjects = FALSE,
-                                BOOL bCloneNoteCaptions = TRUE);
+
     void            CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc, 
-                               const ScMarkData* pMarks = NULL, bool bKeepScenarioFlags = false,
+                               const ScMarkData* pMarks = NULL, bool bAllTabs = false, bool bKeepScenarioFlags = false,
                                bool bIncludeObjects = false, bool bCloneNoteCaptions = true);
+
     void			CopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                 SCTAB nTab, ScDocument* pClipDoc = NULL);
     void 			CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
@@ -1267,7 +1267,6 @@ public:
                         SCTAB nTab, double fScale ) const;
     SC_DLLPUBLIC inline USHORT	FastGetRowHeight( SCROW nRow, SCTAB nTab ) const;
     inline SCROW	FastGetRowForHeight( SCTAB nTab, ULONG nHeight ) const;
-    inline SCROW    FastGetFirstNonHiddenRow( SCROW nStartRow, SCTAB nTab ) const;
                     /** No check for flags whether row is hidden, height value
                         is returned unconditionally. */
     inline USHORT   FastGetOriginalRowHeight( SCROW nRow, SCTAB nTab ) const;
@@ -1308,6 +1307,44 @@ public:
     SC_DLLPUBLIC const ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArray( SCTAB nTab ) const;
     SC_DLLPUBLIC       ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArrayModifiable( SCTAB nTab );
 
+    SC_DLLPUBLIC void           GetAllRowBreaks(::std::set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const;
+    SC_DLLPUBLIC void           GetAllColBreaks(::std::set<SCCOL>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const;
+    SC_DLLPUBLIC ScBreakType    HasRowBreak(SCROW nRow, SCTAB nTab) const;
+    SC_DLLPUBLIC ScBreakType    HasColBreak(SCCOL nCol, SCTAB nTab) const;
+    SC_DLLPUBLIC void           SetRowBreak(SCROW nRow, SCTAB nTab, bool bPage, bool bManual);
+    SC_DLLPUBLIC void           SetColBreak(SCCOL nCol, SCTAB nTab, bool bPage, bool bManual);
+    void                        RemoveRowBreak(SCROW nRow, SCTAB nTab, bool bPage, bool bManual);
+    void                        RemoveColBreak(SCCOL nCol, SCTAB nTab, bool bPage, bool bManual);
+    ::com::sun::star::uno::Sequence<
+        ::com::sun::star::sheet::TablePageBreakData> GetRowBreakData(SCTAB nTab) const;
+
+    SC_DLLPUBLIC bool           RowHidden(SCROW nRow, SCTAB nTab, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL);
+    SC_DLLPUBLIC bool           RowHidden(SCROW nRow, SCTAB nTab, SCROW& rLastRow);
+    SC_DLLPUBLIC bool           HasHiddenRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
+    SC_DLLPUBLIC bool           ColHidden(SCCOL nCol, SCTAB nTab, SCCOL& rLastCol);
+    SC_DLLPUBLIC bool           ColHidden(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL);
+    SC_DLLPUBLIC void           SetRowHidden(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bHidden);
+    SC_DLLPUBLIC void           SetColHidden(SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bHidden);
+    SC_DLLPUBLIC SCROW          FirstVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
+    SC_DLLPUBLIC SCROW          LastVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
+    SCROW                       CountVisibleRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
+
+    bool                        RowFiltered(SCROW nRow, SCTAB nTab, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL);
+    bool                        HasFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
+    bool                        ColFiltered(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL);
+    SC_DLLPUBLIC void           SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bFiltered);
+    SC_DLLPUBLIC void           SetColFiltered(SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bFiltered);
+    SCROW                       FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
+    SCROW                       LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
+    SCROW                       CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
+
+    /** 
+     * Write all column row flags to table's flag data, because not all column 
+     * row attributes are stored in the flag data members.  This is necessary 
+     * for ods export. 
+     */
+    void                        SyncColRowFlags();
+
                     /// @return  the index of the last row with any set flags (auto-pagebreak is ignored).
     SC_DLLPUBLIC SCROW			GetLastFlaggedRow( SCTAB nTab ) const;
 
@@ -1329,8 +1366,6 @@ public:
     BOOL			GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault);
     BOOL			GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault);
 
-    BOOL			IsFiltered( SCROW nRow, SCTAB nTab ) const;
-
     BOOL			UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow );
     BOOL			UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bShow );
 
@@ -1347,6 +1382,7 @@ public:
     Size			GetPageSize( SCTAB nTab ) const;
     void			SetPageSize( SCTAB nTab, const Size& rSize );
     void			SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow );
+    void            InvalidatePageBreaks(SCTAB nTab);
     void			UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL );
     void			RemoveManualBreaks( SCTAB nTab );
     BOOL			HasManualBreaks( SCTAB nTab ) const;
@@ -1417,9 +1453,9 @@ public:
     void            UpdateDynamicEndRow(ScDBData& rDBData) const;
 
     BOOL			GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
-                                TypedScStrCollection& rStrings, bool bFilter = false );
+                                bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates);
     SC_DLLPUBLIC BOOL			GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow,
-                                SCTAB nTab, TypedScStrCollection& rStrings );
+                                SCTAB nTab, TypedScStrCollection& rStrings, bool& rHasDates );
     BOOL			GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
                                 TypedScStrCollection& rStrings, BOOL bLimit = FALSE );
     BOOL			GetFormulaEntries( TypedScStrCollection& rStrings );
@@ -1811,58 +1847,24 @@ inline void ScDocument::SetSortParam( ScSortParam& rParam, SCTAB nTab )
 inline ULONG ScDocument::FastGetScaledRowHeight( SCROW nStartRow, SCROW nEndRow,
         SCTAB nTab, double fScale ) const
 {
-    return pTab[nTab]->pRowFlags->SumScaledCoupledArrayForCondition( nStartRow,
-            nEndRow, CR_HIDDEN, 0, *(pTab[nTab]->pRowHeight), fScale);
+    ULONG nHeight = FastGetRowHeight(nStartRow, nEndRow, nTab);
+    return nHeight * fScale;
 }
 
 inline USHORT ScDocument::FastGetRowHeight( SCROW nRow, SCTAB nTab ) const
 {
-    return ( pTab[nTab]->pRowFlags->GetValue(nRow) & CR_HIDDEN ) ? 0 :
-        pTab[nTab]->pRowHeight->GetValue(nRow);
+    return pTab[nTab]->GetRowHeight(nRow);
 }
 
 inline SCROW ScDocument::FastGetRowForHeight( SCTAB nTab, ULONG nHeight ) const
 {
-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
-            *(pTab[nTab]->pRowFlags), 0, MAXROW, CR_HIDDEN, 0,
-            *(pTab[nTab]->pRowHeight));
-    ULONG nSum = 0;
-    for ( ; aIter; aIter.NextRange() )
-    {
-        ULONG nNew = *aIter * (aIter.GetRangeEnd() - aIter.GetRangeStart() + 1);
-        if (nSum + nNew > nHeight)
-        {
-            for ( ; aIter && nSum <= nHeight; ++aIter )
-            {
-                nSum += *aIter;
-            }
-            return aIter.GetPos();
-        }
-        nSum += nNew;
-    }
-    return aIter.GetPos();
-}
-
-inline SCROW ScDocument::FastGetFirstNonHiddenRow( SCROW nStartRow, SCTAB nTab) const
-{
-    return pTab[nTab]->pRowFlags->GetFirstForCondition( nStartRow, MAXROW,
-            CR_HIDDEN, 0);
+    return pTab[nTab]->GetRowForHeight(nHeight);
 }
 
 inline USHORT ScDocument::FastGetOriginalRowHeight( SCROW nRow, SCTAB nTab ) const
 {
     return pTab[nTab]->pRowHeight->GetValue(nRow);
 }
-
-inline BOOL ScDocument::ColFiltered( SCCOL nCol, SCTAB nTab ) const
-{
-    return ( pTab[nTab]->pColFlags[nCol] & CR_FILTERED) != 0;
-}
-
-inline BOOL ScDocument::RowFiltered( SCROW nRow, SCTAB nTab ) const
-{
-    return pTab[nTab]->IsFiltered(nRow);
-}
  
 #endif
 
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 5cd6146a2..af844f502 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -76,6 +76,7 @@ class ScTableSheetObj;
 class SvxFmDrawPage;
 class SvxDrawPage;
 class ScRangeList;
+class ScSheetSaveData;
 
 class SC_DLLPUBLIC ScModelObj : public SfxBaseModel,
                     public com::sun::star::sheet::XSpreadsheetDocument,
@@ -112,6 +113,7 @@ private:
 
     BOOL					FillRenderMarkData( const com::sun::star::uno::Any& aSelection,
                                                 ScMarkData& rMark, ScPrintSelectionStatus& rStatus ) const;
+    com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> GetFormatter();
 
     rtl::OUString			maBuildId;
 protected: 
@@ -131,6 +133,7 @@ public:
 
     void                    BeforeXMLLoading();
     void                    AfterXMLLoading(sal_Bool bRet);
+    ScSheetSaveData*        GetSheetSaveData();
 
     bool                    HasChangesListeners() const;
 
diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx
index 7a605354e..0a22fb06e 100644
--- a/sc/inc/dpcachetable.hxx
+++ b/sc/inc/dpcachetable.hxx
@@ -60,6 +60,7 @@ class ScDPDimension;
 class ScDPCollection;
 struct ScDPCacheCell;
 struct ScDPItemData;
+struct ScQueryParam;
 class Date;
 
 // ----------------------------------------------------------------------------
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 512d99882..d7fbbfe13 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -36,6 +36,7 @@
 #include "address.hxx"
 #include "collect.hxx"
 #include "dpoutput.hxx"
+#include "pivot.hxx"
 #include <com/sun/star/sheet/XDimensionsSupplier.hpp>
 
 #include <boost/shared_ptr.hpp>
@@ -108,10 +109,10 @@ private:
     ScDPOutput*				pOutput;
     BOOL					bSettingsChanged;
     BOOL					bAlive;			// FALSE if only used to hold settings
-	USHORT                                  nAutoFormatIndex;
+    sal_uInt16              mnAutoFormatIndex;
     BOOL					bAllowMove;
     long					nHeaderRows;	// page fields plus filter button
-    bool                    bHeaderLayout;  // TRUE : grid, FALSE : standard
+    bool                    mbHeaderLayout;  // TRUE : grid, FALSE : standard
 
 
     SC_DLLPRIVATE ScDPTableData*    GetTableData();
@@ -142,11 +143,11 @@ public:
     void				SetOutRange(const ScRange& rRange);
     const ScRange&		GetOutRange() const		{ return aOutRange; }
 
-	void 			SetAutoFormatIndex (const USHORT nIndex);
-	USHORT			GetAutoFormatIndex ()	{ if (this == NULL) return 65535; else return nAutoFormatIndex; }
+    void                SetAutoFormatIndex (const sal_uInt16 nIndex);
+    sal_uInt16          GetAutoFormatIndex() const; 
 
-    void                SetHeaderLayout (bool bUseGrid);
-    bool                GetHeaderLayout ()  const { return bHeaderLayout; }
+    void                SetHeaderLayout(bool bUseGrid);
+    bool                GetHeaderLayout() const;
 
     void				SetSheetDesc(const ScSheetSourceDesc& rDesc);
     void				SetImportDesc(const ScImportSourceDesc& rDesc);
@@ -210,16 +211,10 @@ public:
     sal_Int32           GetUsedHierarchy( sal_Int32 nDim );
 
     BOOL                GetMembersNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
-    BOOL                GetMembers( sal_Int32 nDim,
-                            com::sun::star::uno::Sequence< rtl::OUString >& rMembers,
-                            com::sun::star::uno::Sequence< sal_Bool >* pVisible = 0,
-                            com::sun::star::uno::Sequence< sal_Bool >* pShowDet = 0 );
-
     BOOL                GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
-    BOOL                GetMembers( sal_Int32 nDim, sal_Int32 nHier,
-                            com::sun::star::uno::Sequence< rtl::OUString >& rMembers,
-                            com::sun::star::uno::Sequence< sal_Bool >* pVisible = 0,
-                            com::sun::star::uno::Sequence< sal_Bool >* pShowDet = 0 );
+
+    bool                GetMemberNames( sal_Int32 nDim, ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames );
+    bool                GetMembers( sal_Int32 nDim, sal_Int32 nHier, ::std::vector<ScDPLabelData::Member>& rMembers );
 
     void				UpdateReference( UpdateRefMode eUpdateRefMode,
                                          const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
@@ -313,6 +308,11 @@ public:
 
     ScSimpleSharedString& GetSharedString();
 
+    void FreeTable(ScDPObject* pDPObj);
+    SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj);
+
+    bool        HasDPTable(SCCOL nCol, SCROW nRow, SCTAB nTab) const;
+
     ScDPCacheCell* getCacheCellFromPool(const ScDPCacheCell& rCell);
     void clearCacheCellPool();
 };
diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index 234e39a1a..c28f901a2 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -110,7 +110,7 @@ private:
     long					nColCount;
     long					nRowCount;
     long					nHeaderSize;
-    bool                    bHeaderLayout;  // TRUE : grid, FALSE : standard
+    bool                    mbHeaderLayout;  // TRUE : grid, FALSE : standard
     SCCOL					nTabStartCol;
     SCROW					nTabStartRow;
     SCCOL					nMemberStartCol;
@@ -164,8 +164,8 @@ public:
 
     void            GetMemberResultNames( ScStrCollection& rNames, long nDimension );
 
-    void            SetHeaderLayout (bool bUseGrid);
-    bool            GetHeaderLayout () const    { return bHeaderLayout; }
+    void            SetHeaderLayout(bool bUseGrid);
+    bool            GetHeaderLayout() const;
 
     static void     GetDataDimensionNames( String& rSourceName, String& rGivenName,
                                            const com::sun::star::uno::Reference<
diff --git a/sc/inc/dpoutputgeometry.hxx b/sc/inc/dpoutputgeometry.hxx
index aae327113..d423d186a 100644
--- a/sc/inc/dpoutputgeometry.hxx
+++ b/sc/inc/dpoutputgeometry.hxx
@@ -40,8 +40,9 @@ class SC_DLLPUBLIC ScDPOutputGeometry
 {
 public:
     enum FieldType { Column, Row, Page, Data, None };
+    enum ImportType { ODF, XLS };
 
-    ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter);
+    ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter, ImportType eImportType);
     ~ScDPOutputGeometry();
 
     /** 
@@ -57,6 +58,8 @@ public:
     void getRowFieldPositions(::std::vector<ScAddress>& rAddrs) const;
     void getPageFieldPositions(::std::vector<ScAddress>& rAddrs) const;
 
+    SCROW getRowFieldHeaderRow() const;
+
     FieldType getFieldButtonType(const ScAddress& rPos) const;
 
 private:
@@ -64,11 +67,13 @@ private:
 
 private:
     ScRange     maOutRange;
-    sal_uInt32  mnRowFields;
+    sal_uInt32  mnRowFields;    /// number of row fields (data layout field NOT included!)
     sal_uInt32  mnColumnFields;
     sal_uInt32  mnPageFields;
     sal_uInt32  mnDataFields;
 
+    ImportType  meImportType;
+
     bool        mbShowFilter;
 };
 
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index ede4933cf..8483ca2a5 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -35,6 +35,7 @@
 #include "global.hxx"
 #include "address.hxx"
 #include "scdllapi.h"
+#include "queryparam.hxx"
 
 #include <vector>
 
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 6bced1f4b..40730f5c7 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -206,13 +206,16 @@ const SCSIZE PIVOT_MAXPAGEFIELD = 10;
                                     // FILTERED und MANUALSIZE nur fuer Zeilen moeglich
 const BYTE   CR_HIDDEN      = 1;
 //const BYTE CR_MARKED      = 2;
-const BYTE   CR_PAGEBREAK   = 4;
+//const BYTE CR_PAGEBREAK   = 4;
 const BYTE   CR_MANUALBREAK = 8;
 const BYTE   CR_FILTERED    = 16;
 const BYTE   CR_MANUALSIZE  = 32;
+const BYTE   CR_ALL         = (CR_HIDDEN | CR_MANUALBREAK | CR_FILTERED | CR_MANUALSIZE);
 
-//	was davon kommt in die Datei:
-#define CR_SAVEMASK		( ~CR_PAGEBREAK )
+typedef BYTE ScBreakType;
+const ScBreakType BREAK_NONE   = 0;
+const ScBreakType BREAK_PAGE   = 1;
+const ScBreakType BREAK_MANUAL = 2;
 
 // Insert-/Delete-Flags
 const USHORT IDF_NONE       = 0x0000;
@@ -540,9 +543,15 @@ class ScGlobal
     static  SvNumberFormatter*  pEnglishFormatter;          // for UNO / XML export
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XOrdinalSuffix> xOrdinalSuffix;
-
-public:
+    static CalendarWrapper*		pCalendar;
+    static CollatorWrapper*		pCaseCollator;
+    static CollatorWrapper*		pCollator;
+    static ::utl::TransliterationWrapper* pTransliteration;
+    static ::utl::TransliterationWrapper* pCaseTransliteration;
+    static IntlWrapper*         pScIntlWrapper;
     static ::com::sun::star::lang::Locale*		pLocale;
+
+public:	
     static SvtSysLocale*        pSysLocale;
     // for faster access a pointer to the single instance provided by SvtSysLocale
     SC_DLLPUBLIC static const CharClass*     pCharClass;
@@ -550,15 +559,15 @@ public:
     SC_DLLPUBLIC static const LocaleDataWrapper* pLocaleData;
     SC_DLLPUBLIC static const LocaleDataWrapper* GetpLocaleData();
 
-    static CalendarWrapper*		pCalendar;
-    SC_DLLPUBLIC static CollatorWrapper*		pCollator;
-    static CollatorWrapper*		pCaseCollator;
-
-    static ::utl::TransliterationWrapper* pTransliteration;
+    static CalendarWrapper*     GetCalendar();
+    SC_DLLPUBLIC static CollatorWrapper*		GetCollator();
+    static CollatorWrapper*		GetCaseCollator();
+    static IntlWrapper*         GetScIntlWrapper();
+    static ::com::sun::star::lang::Locale*		GetLocale();
+    
     SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration(); //CHINA001
-
-    static ::utl::TransliterationWrapper* pCaseTransliteration;
-    static IntlWrapper*         pScIntlWrapper;
+    static ::utl::TransliterationWrapper* GetCaseTransliteration();
+    
     SC_DLLPUBLIC static LanguageType	   		eLnge;
     static sal_Unicode			cListDelimiter;
 
@@ -792,6 +801,7 @@ struct ScQueryEntry
 {
     BOOL			bDoQuery;
     BOOL			bQueryByString;
+    bool            bQueryByDate;
     SCCOLROW		nField;
     ScQueryOp		eOp;
     ScQueryConnect  eConnect;
@@ -812,50 +822,6 @@ struct ScQueryEntry
     BOOL			operator==( const ScQueryEntry& r ) const;
 };
 
-struct SC_DLLPUBLIC ScQueryParam
-{
-    SCCOL			nCol1;
-    SCROW			nRow1;
-    SCCOL			nCol2;
-    SCROW			nRow2;
-    SCTAB			nTab;
-    BOOL			bHasHeader;
-    BOOL			bByRow;
-    BOOL			bInplace;
-    BOOL			bCaseSens;
-	BOOL			bNaturalSort;
-    BOOL			bRegExp;
-    BOOL            bMixedComparison;   // whether numbers are smaller than strings
-    BOOL			bDuplicate;
-    BOOL			bDestPers;			// nicht gespeichert
-    SCTAB			nDestTab;
-    SCCOL			nDestCol;
-    SCROW			nDestRow;
-    SCROW           nDynamicEndRow;
-    bool            bUseDynamicRange;
-
-private:
-    SCSIZE			nEntryCount;
-    ScQueryEntry*	pEntries;
-
-public:
-    ScQueryParam();
-    ScQueryParam( const ScQueryParam& r );
-    ~ScQueryParam();
-
-    SCSIZE          GetEntryCount() const           { return nEntryCount; }
-    ScQueryEntry&   GetEntry(SCSIZE n) const        { return pEntries[n]; }
-    void            Resize(SCSIZE nNew);
-
-    ScQueryParam&   operator=   ( const ScQueryParam& r );
-    BOOL            operator==  ( const ScQueryParam& rOther ) const;
-    void            Clear       ();
-    void            DeleteQuery( SCSIZE nPos );
-
-    void            MoveToDest();
-    void            FillInExcelSyntax(String& aCellStr, SCSIZE nIndex);
-};
-
 // -----------------------------------------------------------------------
 
 struct SC_DLLPUBLIC ScSubTotalParam
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 7a1ee7aec..1a1963e07 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -573,23 +573,26 @@
 #define STR_STYLE_FAMILY_CELL       433
 #define STR_STYLE_FAMILY_PAGE       434
 
-#define STR_SHAPE_AUTOSHAPE         435
-#define STR_SHAPE_RECTANGLE         436
-#define STR_SHAPE_LINE              437
-#define STR_SHAPE_OVAL              438
-#define STR_SHAPE_TEXTBOX           439
+#define STR_UNDO_SET_TAB_BG_COLOR       435
+#define STR_UNDO_SET_MULTI_TAB_BG_COLOR 436
+
+#define STR_SHAPE_AUTOSHAPE         437
+#define STR_SHAPE_RECTANGLE         438
+#define STR_SHAPE_LINE              439
+#define STR_SHAPE_OVAL              440
+#define STR_SHAPE_TEXTBOX           441
+
+#define STR_FORM_BUTTON             442
+#define STR_FORM_CHECKBOX           443
+#define STR_FORM_OPTIONBUTTON       444
+#define STR_FORM_LABEL              445
+#define STR_FORM_LISTBOX            446
+#define STR_FORM_GROUPBOX           447
+#define STR_FORM_DROPDOWN           448
+#define STR_FORM_SPINNER            449
+#define STR_FORM_SCROLLBAR          450
                                        
-#define STR_FORM_BUTTON             440
-#define STR_FORM_CHECKBOX           441
-#define STR_FORM_OPTIONBUTTON       442
-#define STR_FORM_LABEL              443
-#define STR_FORM_LISTBOX            444
-#define STR_FORM_GROUPBOX           445
-#define STR_FORM_DROPDOWN           446
-#define STR_FORM_SPINNER            447
-#define STR_FORM_SCROLLBAR          448
-                                       
-#define STR_COUNT                   449
+#define STR_COUNT                   451
 
 #endif
 
diff --git a/sc/inc/indexmap.hxx b/sc/inc/indexmap.hxx
deleted file mode 100644
index a599e6b10..000000000
--- a/sc/inc/indexmap.hxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: indexmap.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SC_INDEXMAP_HXX
-#define _SC_INDEXMAP_HXX
-
-
-#include <tools/solar.h>
-
-
-class ScIndexMap
-{
-                                // not implemented
-                                ScIndexMap( const ScIndexMap& );
-            ScIndexMap&			operator=( const ScIndexMap& );
-
-private:
-            USHORT*				pMap;
-            USHORT				nCount;
-
-public:
-                                ScIndexMap( USHORT nEntries );
-                                ~ScIndexMap();
-
-            void				SetPair( USHORT nEntry, USHORT nIndex1, USHORT nIndex2 );
-                                /// returns nIndex2 if found, else nIndex1
-            USHORT				Find( USHORT nIndex1 ) const;
-};
-
-
-#endif // _SC_INDEXMAP_HXX
-
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index 3402f5ae1..7ce4c902b 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -285,12 +285,29 @@ public:
     static sal_Int32		GetEnumProperty( const com::sun::star::uno::Reference<
                                                 com::sun::star::beans::XPropertySet>& xProp,
                                             const ::rtl::OUString& rName, long nDefault );
+    static ::rtl::OUString  GetStringProperty(
+        const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xProp,
+        const ::rtl::OUString& rName, const ::rtl::OUString& rDefault );
 
     static sal_Bool			GetBoolFromAny( const com::sun::star::uno::Any& aAny );
     static sal_Int16		GetInt16FromAny( const com::sun::star::uno::Any& aAny );
     static sal_Int32		GetInt32FromAny( const com::sun::star::uno::Any& aAny );
     static sal_Int32		GetEnumFromAny( const com::sun::star::uno::Any& aAny );
     static void				SetBoolInAny( com::sun::star::uno::Any& rAny, sal_Bool bValue );
+
+    static void             SetOptionalPropertyValue(
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rPropSet,
+        const sal_Char* pPropName, const ::com::sun::star::uno::Any& rVal );
+
+    template<typename ValueType>
+    static void             SetOptionalPropertyValue(
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rPropSet,
+        const sal_Char* pPropName, const ValueType& rVal )
+    {
+        ::com::sun::star::uno::Any any;
+        any <<= rVal;
+        SetOptionalPropertyValue(rPropSet, pPropName, any);
+    }
 };
 
 
diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx
index 456d22366..a71519b7c 100644
--- a/sc/inc/olinetab.hxx
+++ b/sc/inc/olinetab.hxx
@@ -39,6 +39,7 @@
 #define SC_OL_MAXDEPTH		7
 
 class SvStream;
+class ScTable;
 
 
 class ScOutlineEntry : public ScDataObject
@@ -126,9 +127,7 @@ public:
     void					InsertSpace( SCCOLROW nStartPos, SCSIZE nSize );
     BOOL					DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize );
 
-    BOOL					ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos,
-                                BOOL bShow,
-                                const ScBitMaskCompressedArray< SCCOLROW, BYTE>& rHiddenFlags );
+    bool                    ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos, bool bShow, ScTable& rTable, bool bCol );
 
     void					RemoveAll();
 };
diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx
index 9613752bf..73b29d6a1 100644
--- a/sc/inc/optutil.hxx
+++ b/sc/inc/optutil.hxx
@@ -33,9 +33,9 @@
 
 #include <unotools/configitem.hxx>
 #include <tools/link.hxx>
-
 #include "scdllapi.h"
 
+
 class ScOptionsUtil
 {
 public:
@@ -50,8 +50,8 @@ class SC_DLLPUBLIC ScLinkConfigItem : public utl::ConfigItem
     Link	aCommitLink;
 
 public:
-            ScLinkConfigItem( const rtl::OUString rSubTree );
-            ScLinkConfigItem( const rtl::OUString rSubTree, sal_Int16 nMode );
+            ScLinkConfigItem( const rtl::OUString& rSubTree );
+            ScLinkConfigItem( const rtl::OUString& rSubTree, sal_Int16 nMode );
     void	SetCommitLink( const Link& rLink );
 
     virtual void	Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames );
diff --git a/sc/inc/phonetic.hxx b/sc/inc/phonetic.hxx
deleted file mode 100644
index 3d7d542ef..000000000
--- a/sc/inc/phonetic.hxx
+++ /dev/null
@@ -1,107 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: global.hxx,v $
- * $Revision: 1.53 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SC_PHONETIC_HXX
-#define SC_PHONETIC_HXX
-
-
-#include "tools/string.hxx"
-#include "scdllapi.h"
-
-#include <vector>
-
-struct PhoneticPortion
-{
-    sal_uInt16          mncpa;  /// position of the first character in the phonetic text
-    sal_uInt16          mncpm;  /// position of the first character in the base text
-    sal_uInt16          mnccm;  /// length of the characters in the base text
-    explicit inline     PhoneticPortion() : mncpa( 0 ), mncpm( 0 ), mnccm( 0 ) {}
-    explicit inline     PhoneticPortion( sal_uInt16 ncpa, sal_uInt16 ncpm, sal_uInt16 nccm ) :
-                            mncpa( ncpa ), mncpm( ncpm ), mnccm ( nccm ) {}
-};
-
-inline bool operator==( const PhoneticPortion& rLeft, const PhoneticPortion& rRight )
-{
-    return
-        ( rLeft.mncpa == rRight.mncpa ) &&
-        ( rLeft.mncpm == rRight.mncpm ) &&
-        ( rLeft.mnccm == rRight.mnccm );
-}
-
-typedef ::std::vector< PhoneticPortion > PhoneticPortionVec;
-
-/*
- * A class for store Asian phonetic guide information.
- */
-class SC_DLLPUBLIC ScPhonetic
-{
-public:
-	ScPhonetic() : mnFontIdx( 0 ), mnAdditionalSettings( 0 ), mnRepeatedTotalLength ( 0 ) {}
-	/** A constructor of ScPhonetic.
-	 * @param nFontIdx font index.
-	 * @param nAdditionalSettings an additional settings.
-	 * @param nRepeatedTotalLength the number of repeated total length.
-	 * @param rPhoneticString phonetic text.
-	 * @param rPhoneticPortions the portion of phonetic text.
-	 */
-	ScPhonetic( sal_uInt16 nFontIdx, sal_uInt16 nAdditionalSettings,
-					sal_uInt16 nRepeatedTotalLength, const String& rPhoneticString,
-					const PhoneticPortionVec& rPhoneticPortions) :
-		mnFontIdx( nFontIdx ), mnAdditionalSettings( nAdditionalSettings ),
-		mnRepeatedTotalLength ( nRepeatedTotalLength ),
-		maPhoneticString ( rPhoneticString ), maPhoneticPortions ( rPhoneticPortions ) {}
-	virtual ~ScPhonetic();
-
-	virtual int             operator==( const ScPhonetic& ) const;
-
-	/** Returns True if no phonetic information. */
-	inline BOOL IsEmpty() const { return maPhoneticString.Len() == 0; }
-	/** Returns the text for phonetic information. */
-	inline const String& GetString() const { return maPhoneticString; }
-    /** Returns the portion for phonetic information. */
-	inline const PhoneticPortionVec& GetPortions() const { return maPhoneticPortions; }
-    /** Returns font index of phonetic information. */
-	inline sal_uInt16 GetFontIndex() const { return mnFontIdx; }
-    /** Returns additional settings of phonetic information. */
-	inline sal_uInt16 GetAdditionalSettings() const { return mnAdditionalSettings; }
-    /** Returns repeated length of phonetic information. */
-	inline sal_uInt16 GetRepeatedTotalLength() const { return mnRepeatedTotalLength; }
-    /** Returns the size of phonetic information. */
-	inline sal_uInt32 GetSize() const { return 14 + ( maPhoneticString.Len() ? maPhoneticString.Len() * 2 : 2 ) + maPhoneticPortions.size() * 6; }
-
-private:
-	sal_uInt16         mnFontIdx;            /// Index to FONT record
-	sal_uInt16         mnAdditionalSettings; /// Additional settings for the Asian phonetic text
-	sal_uInt16         mnRepeatedTotalLength;
-	String             maPhoneticString;
-	PhoneticPortionVec maPhoneticPortions;
-};
-
-#endif
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 195509bec..680da7dd9 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -138,22 +138,43 @@ typedef PivotField          PivotPageFieldArr[PIVOT_MAXPAGEFIELD];
 
 struct ScDPLabelData
 {
-    String              maName;         /// Visible name of the dimension.
+    ::rtl::OUString     maName;         /// Original name of the dimension.
+    ::rtl::OUString     maLayoutName;   /// Layout name (display name)
     SCsCOL              mnCol;
     USHORT              mnFuncMask;     /// Page/Column/Row subtotal function.
     sal_Int32           mnUsedHier;     /// Used hierarchy.
     bool                mbShowAll;      /// true = Show all (also empty) results.
     bool                mbIsValue;      /// true = Sum or count in data field.
 
+    struct Member
+    {
+        ::rtl::OUString maName;
+        ::rtl::OUString maLayoutName;
+        bool mbVisible;
+        bool mbShowDetails;
+
+        Member();
+
+        /** 
+         * return the name that should be displayed in the dp dialogs i.e. 
+         * when the layout name is present, use it, or else use the original 
+         * name. 
+         */ 
+        ::rtl::OUString SC_DLLPUBLIC getDisplayName() const;
+    };
+    ::std::vector<Member>                               maMembers;
     ::com::sun::star::uno::Sequence< ::rtl::OUString >  maHiers;        /// Hierarchies.
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >  maMembers;      /// Members.
-    ::com::sun::star::uno::Sequence< sal_Bool >         maVisible;      /// Visibility of members.
-    ::com::sun::star::uno::Sequence< sal_Bool >         maShowDet;      /// Show details of members.
     ::com::sun::star::sheet::DataPilotFieldSortInfo     maSortInfo;     /// Sorting info.
     ::com::sun::star::sheet::DataPilotFieldLayoutInfo   maLayoutInfo;   /// Layout info.
     ::com::sun::star::sheet::DataPilotFieldAutoShowInfo maShowInfo;     /// AutoShow info.
 
     explicit            ScDPLabelData( const String& rName, short nCol, bool bIsValue );
+
+    /** 
+     * return the name that should be displayed in the dp dialogs i.e. when 
+     * the layout name is present, use it, or else use the original name.
+     */ 
+    ::rtl::OUString SC_DLLPUBLIC getDisplayName() const;
 };
 
 // ============================================================================
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
new file mode 100644
index 000000000..01ddffb5c
--- /dev/null
+++ b/sc/inc/queryparam.hxx
@@ -0,0 +1,144 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: interpre.hxx,v $
+ * $Revision: 1.35.44.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_QUERYPARAM_HXX
+#define SC_QUERYPARAM_HXX
+
+#include "global.hxx"
+#include "scmatrix.hxx"
+
+#include <vector>
+
+struct ScDBQueryParamInternal;
+
+struct ScQueryParamBase
+{
+    bool            bHasHeader;
+    bool            bByRow;
+    bool            bInplace;
+    bool            bCaseSens;
+    bool            bRegExp;
+    bool            bDuplicate;
+    bool            bMixedComparison;   // whether numbers are smaller than strings
+
+    virtual ~ScQueryParamBase();
+
+    SC_DLLPUBLIC SCSIZE GetEntryCount() const;
+    SC_DLLPUBLIC ScQueryEntry& GetEntry(SCSIZE n) const;
+    void Resize(SCSIZE nNew);
+    SC_DLLPUBLIC void DeleteQuery( SCSIZE nPos );
+    void FillInExcelSyntax(String& aCellStr, SCSIZE nIndex);
+
+protected:
+    ScQueryParamBase();
+    ScQueryParamBase(const ScQueryParamBase& r);
+
+    mutable ::std::vector<ScQueryEntry>  maEntries;
+};
+
+// ============================================================================
+
+struct ScQueryParamTable
+{
+    SCCOL           nCol1;
+    SCROW           nRow1;
+    SCCOL           nCol2;
+    SCROW           nRow2;
+    SCTAB           nTab;
+
+    ScQueryParamTable();
+    ScQueryParamTable(const ScQueryParamTable& r);
+    virtual ~ScQueryParamTable();
+};
+
+// ============================================================================
+
+struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamTable
+{
+    BOOL            bDestPers;          // nicht gespeichert
+    SCTAB           nDestTab;
+    SCCOL           nDestCol;
+    SCROW           nDestRow;
+    SCROW           nDynamicEndRow;
+    bool            bUseDynamicRange;
+
+    ScQueryParam();
+    ScQueryParam( const ScQueryParam& r );
+    ScQueryParam( const ScDBQueryParamInternal& r );
+    virtual ~ScQueryParam();
+
+    ScQueryParam&   operator=   ( const ScQueryParam& r );
+    BOOL            operator==  ( const ScQueryParam& rOther ) const;
+    void            Clear();
+    void            ClearDestParams();
+    void            MoveToDest();
+};
+
+// ============================================================================
+
+struct ScDBQueryParamBase : public ScQueryParamBase
+{
+    enum DataType { INTERNAL, MATRIX };
+
+    SCCOL   mnField;    /// the field in which the values are processed during iteration.
+    bool    mbSkipString;
+
+    DataType        GetType() const;
+
+    virtual ~ScDBQueryParamBase();
+
+protected:
+    ScDBQueryParamBase(DataType eType);
+
+private:
+    ScDBQueryParamBase();
+
+    DataType        meType;
+};
+
+// ============================================================================
+
+struct ScDBQueryParamInternal : public ScDBQueryParamBase, public ScQueryParamTable
+{
+    ScDBQueryParamInternal();
+    virtual ~ScDBQueryParamInternal();
+};
+
+// ============================================================================
+
+struct ScDBQueryParamMatrix : public ScDBQueryParamBase
+{
+    ScMatrixRef mpMatrix;
+
+    ScDBQueryParamMatrix();
+    virtual ~ScDBQueryParamMatrix();
+};
+
+#endif
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 662bc2036..980f593c8 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -67,7 +67,6 @@ typedef USHORT RangeType;
 //------------------------------------------------------------------------
 
 class ScTokenArray;
-class ScIndexMap;
 
 class ScRangeData : public ScDataObject
 {
@@ -156,7 +155,6 @@ public:
 
     void			ValidateTabRefs();
 
-    void			ReplaceRangeNamesInUse( const ScIndexMap& rMap );
     void            ReplaceRangeNamesInUse( const IndexMap& rMap );
 
     static void		MakeValidName( String& rName );
diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx
index 44619ab00..1ea763e70 100644
--- a/sc/inc/reftokenhelper.hxx
+++ b/sc/inc/reftokenhelper.hxx
@@ -70,12 +70,12 @@ public:
 
     static void getTokensFromRangeList(::std::vector<ScSharedTokenRef>& pTokens, const ScRangeList& rRanges);
 
-    static bool isRef(const ScSharedTokenRef& pToken);
-    static bool isExternalRef(const ScSharedTokenRef& pToken);
+    static bool SC_DLLPUBLIC isRef(const ScSharedTokenRef& pToken);
+    static bool SC_DLLPUBLIC isExternalRef(const ScSharedTokenRef& pToken);
 
-    static bool intersects(const ::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
+    static bool SC_DLLPUBLIC intersects(const ::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
 
-    static void join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
+    static void SC_DLLPUBLIC join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
 
     static bool getDoubleRefDataFromToken(ScComplexRefData& rData, const ScSharedTokenRef& pToken);
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index b1a3ff793..5b828a0f6 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -834,9 +834,10 @@
 #define FID_TAB_INDEX			(TAB_POPUP_START+6)
 #define FID_TAB_RTL				(TAB_POPUP_START+7)
 #define FID_TAB_DESELECTALL     (TAB_POPUP_START+8)
-#define FID_TAB_TOGGLE_GRID     (TAB_POPUP_START+9)
+#define FID_TAB_MENU_SET_TAB_BG_COLOR (TAB_POPUP_START + 9)
+#define FID_TAB_SET_TAB_BG_COLOR      (TAB_POPUP_START + 10)
 
-#define TAB_POPUP_END			(DATA_MENU_END + 20)
+#define TAB_POPUP_END			(TAB_POPUP_START + 20)
 
 #define OBJBAR_FORMAT_START		(TAB_POPUP_END)
 #define SID_ALIGNLEFT			(OBJBAR_FORMAT_START+6)
@@ -1436,7 +1437,10 @@
 
 #define RID_SCSTR_ONCLICK       (STR_START + 402)
 
-#define STR_END                 RID_SCSTR_ONCLICK
+#define SCSTR_SET_TAB_BG_COLOR  (STR_START + 403)
+#define SCSTR_NO_TAB_BG_COLOR   (STR_START + 404)
+
+#define STR_END                 (SCSTR_NO_TAB_BG_COLOR)
 
 #define BMP_START				(STR_END)
 
@@ -1450,6 +1454,8 @@
 #define RID_IMG_H_DROP_URL		(BMP_START + 5)
 #define RID_IMG_H_DROP_LINK		(BMP_START + 6)
 #define RID_IMG_H_DROP_COPY		(BMP_START + 7)
+#define RID_IMG_SELECT_CURRENT   (BMP_START + 8)
+#define RID_IMG_UNSELECT_CURRENT (BMP_START + 9)
 
 #define RID_SCPTR_PIVOTCOL      (BMP_START + 81)
 #define RID_SCPTR_PIVOTROW      (BMP_START + 82)
@@ -1641,8 +1647,11 @@
 #define RID_SCDLG_DOCPROTECTION         (SC_DIALOGS_START + 149)
 #define RID_SCDLG_RETYPEPASS            (SC_DIALOGS_START + 150)
 #define RID_SCDLG_RETYPEPASS_INPUT      (SC_DIALOGS_START + 151)
+#define RID_POPUP_FILTER                (SC_DIALOGS_START + 152)
+#define RID_SCDLG_TEXT_IMPORT_OPTIONS   (SC_DIALOGS_START + 153)
+#define RID_SCDLG_TAB_BG_COLOR          (SC_DIALOGS_START + 154)
 
-#define SC_DIALOGS_END          (SC_DIALOGS_START + 152)
+#define SC_DIALOGS_END                  (SC_DIALOGS_START + 155)
 
 #ifndef STD_MASKCOLOR
 #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
@@ -1656,29 +1665,28 @@
 #define MID_3   3
 #define MID_4   4
 
+// Formula options page
+#define RID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 5)
+#define HID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 6)
+
 // ----------------------------------------------------------------------------
 // ooo-build specific resources
 
 #define SC_OOO_BUILD_START          (SC_DIALOGS_END)
 
-// Data Form
-#define SID_DATAFORM_NEW            (SC_OOO_BUILD_START + 1) // message
-#define SID_DATA_FORM               (SC_OOO_BUILD_START + 2) // menu (in Data menu)
-#define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 3) // dialog
-
 // Autoformat for DataPilot
 #define SID_PIVOT_AFMT              (SC_OOO_BUILD_START + 4)
 
-// Formula options page
-#define RID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 5)
-#define HID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 6)
+// Toggle sheet grid
+#define FID_TAB_TOGGLE_GRID         (SC_OOO_BUILD_START + 5)
 
-// Language chooser for text import filters.
-#define RID_SCDLG_LANG_CHOOSER           (SC_OOO_BUILD_START + 12)
+#define SC_OOO_BUILD_START          (SC_DIALOGS_END)
 
-// Datapilot controls
-#define RID_SC_DPCONTROL                 (SC_OOO_BUILD_START + 13)
+// Data Form
+#define SID_DATAFORM_NEW            (SC_OOO_BUILD_START + 1) // message
+#define SID_DATA_FORM               (SC_OOO_BUILD_START + 2) // menu (in Data menu)
+#define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 3) // dialog
 
-#endif
+#endif 
 
 
diff --git a/sc/inc/sc.hrc.patched b/sc/inc/sc.hrc.patched
new file mode 100644
index 000000000..b8fe53133
--- /dev/null
+++ b/sc/inc/sc.hrc.patched
@@ -0,0 +1,1660 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: sc.hrc,v $
+ * $Revision: 1.63 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef SC_SC_HRC
+#define SC_SC_HRC
+
+#ifndef _SFX_HRC
+#include <sfx2/sfx.hrc>      // ->#include <solar.hrc>
+#endif
+
+#ifndef _SVX_DIALOGS_HRC
+#include <svx/dialogs.hrc>  // ->Svx-IDs
+#endif
+
+#define VAR_ARGS				30 // variable Parameter in scfuncs.src
+
+#define RID_HANDLEBITMAP		10005
+
+// Bereiche ------------------------------------------------------------------
+
+#define SC_VIEW_START			(SID_SC_START)
+#define SC_VIEW_END				(SID_SC_START + 99)
+#define SC_MESSAGE_START		(SID_SC_START + 100)
+#define SC_MESSAGE_END			(SID_SC_START + 199)
+#define SC_FUNCTION_START 		(SID_SC_START + 200)
+#define SC_FUNCTION_END			(SID_SC_START + 299)
+#define SC_PARAM_START			(SID_SC_START + 300)
+#define SC_PARAM_END			(SID_SC_START + 399)
+
+//	kompatibel zu frueher bleiben:
+#define SC_RESOURCE_START		(RID_APP_START+5000)
+#define SC_RESOURCE_END			(RID_APP_END)
+
+// ---------------------------------------------------------------------------
+// Hilfe IDs -----------------------------------------------------------------
+//	Calc hat einen Bereich von 2000 IDs
+//	Die Funktionen brauchen 11*90 = 990 IDs
+
+#define HID_SC_FUNC_START		(HID_SC_START + 0)
+#define HID_INSWIN_START		(HID_SC_START + 1000)
+#define HID_SC_SHEET_START		(HID_SC_START + 1010)
+#define HID_SC_SHELL_START		(HID_SC_START + 1030)
+#define HID_SC_WIN_START		(HID_SC_START + 1050)
+#define HID_SC_CONTROL_START	(HID_SC_START + 1070)
+#define HID_SC_DLG_START		(HID_SC_START + 1100)
+#define HID_SC_TOOLBOX_START	(HID_SC_START + 1170)
+#define HID_SC_MENU_START		(HID_SC_START + 1180)
+#define HID_SC_OTHER_START		(HID_SC_START + 1230)
+#define HID_SC_AAI_FUNCS_START	(HID_SC_START + 1300)		// Analysis Addin Functions
+#define HID_SC_DAI_FUNCS_START  (HID_SC_START + 1420)       // DateFunc Addin Functions
+
+// ---------------------------------------------------------------------------
+
+#define HID_INSWIN_POS			(HID_INSWIN_START + 0 )
+#define HID_INSWIN_CALC			(HID_INSWIN_START + 1 )
+#define HID_INSWIN_CANCEL		(HID_INSWIN_START + 2 )
+#define HID_INSWIN_OK			(HID_INSWIN_START + 3 )
+#define HID_INSWIN_SUMME		(HID_INSWIN_START + 4 )
+#define HID_INSWIN_FUNC			(HID_INSWIN_START + 5 )
+#define HID_INSWIN_INPUT		(HID_INSWIN_START + 6 )
+
+// Hilfe IDs fuer Vorlagen ---------------------------------------------------
+#define HID_SC_SHEET_CELL_STD	(HID_SC_SHEET_START +0 )
+#define HID_SC_SHEET_CELL_ERG	(HID_SC_SHEET_START +1 )
+#define HID_SC_SHEET_CELL_ERG1	(HID_SC_SHEET_START +2 )
+#define HID_SC_SHEET_CELL_UEB	(HID_SC_SHEET_START +3 )
+#define HID_SC_SHEET_CELL_UEB1	(HID_SC_SHEET_START +4 )
+#define HID_SC_SHEET_PAGE_STD	(HID_SC_SHEET_START +10 )
+#define HID_SC_SHEET_PAGE_REP	(HID_SC_SHEET_START +11 )
+
+// Hilfe IDs fuer Shells (Helferlein) (max.20) -------------------------------
+#define HID_SCSHELL_APP			(HID_SC_SHELL_START +0 )
+#define HID_SCSHELL_DOCSH		(HID_SC_SHELL_START +1 )
+#define HID_SCSHELL_DRAWSH		(HID_SC_SHELL_START +2 )
+#define HID_SCSHELL_DRTXTOB		(HID_SC_SHELL_START +3 )
+#define HID_SCSHELL_PIVOTSH		(HID_SC_SHELL_START +4 )
+#define HID_SCSHELL_PREVWSH		(HID_SC_SHELL_START +5 )
+#define HID_SCSHELL_TABVWSH		(HID_SC_SHELL_START +6 )
+#define HID_SCSHELL_AUDIT		(HID_SC_SHELL_START +7 )
+#define HID_SCSHELL_DRAWFORMSH	(HID_SC_SHELL_START +8 )
+#define HID_SCSHELL_CELLSH		(HID_SC_SHELL_START +9 )
+#define HID_SCSHELL_FORMATSH	(HID_SC_SHELL_START +10)
+#define HID_SCSHELL_OLEOBEJCTSH	(HID_SC_SHELL_START +11)
+#define HID_SCSHELL_CHARTSH		(HID_SC_SHELL_START +12)
+#define HID_SCSHELL_GRAPHIC		(HID_SC_SHELL_START +13)
+#define HID_SCSHELL_PAGEBREAK	(HID_SC_SHELL_START +14)
+#define HID_SCSHELL_MEDIA		(HID_SC_SHELL_START +15)
+
+// Hilfe IDs fuer Dokumentfenster --------------------------------------------
+#define HID_SC_WIN_GRIDWIN		( HID_SC_WIN_START )
+#define HID_SC_WIN_PREVIEW		( HID_SC_WIN_START + 1 )
+
+// Hilfe IDs fuer einzelne Controls (max.30) ---------------------------------
+//	Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts
+#define HID_SC_HF_HLL			( HID_SC_CONTROL_START + 0 )
+#define HID_SC_HF_HLC			( HID_SC_CONTROL_START + 1 )
+#define HID_SC_HF_HLR			( HID_SC_CONTROL_START + 2 )
+#define HID_SC_HF_HRL			( HID_SC_CONTROL_START + 3 )
+#define HID_SC_HF_HRC			( HID_SC_CONTROL_START + 4 )
+#define HID_SC_HF_HRR			( HID_SC_CONTROL_START + 5 )
+#define HID_SC_HF_FLL			( HID_SC_CONTROL_START + 6 )
+#define HID_SC_HF_FLC			( HID_SC_CONTROL_START + 7 )
+#define HID_SC_HF_FLR			( HID_SC_CONTROL_START + 8 )
+#define HID_SC_HF_FRL			( HID_SC_CONTROL_START + 9 )
+#define HID_SC_HF_FRC			( HID_SC_CONTROL_START + 10 )
+#define HID_SC_HF_FRR			( HID_SC_CONTROL_START + 11 )
+//	"Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr!
+//#define HID_SC_SUBT_COLS_1		( HID_SC_CONTROL_START + 12 )
+//#define HID_SC_SUBT_COLS_2		( HID_SC_CONTROL_START + 13 )
+//#define HID_SC_SUBT_COLS_3		( HID_SC_CONTROL_START + 14 )
+//	Eintraege im Navigator
+#define HID_SC_NAVIPI_ENTRIES	( HID_SC_CONTROL_START + 15 )
+#define HID_SC_NAVIPI_ROW		( HID_SC_CONTROL_START + 16 )
+#define HID_SC_NAVIPI_COL		( HID_SC_CONTROL_START + 17 )
+#define HID_SC_NAVIPI_DOC		( HID_SC_CONTROL_START + 18 )
+#define HID_SC_NAVIPI_DATA		( HID_SC_CONTROL_START + 19 )
+#define HID_SC_NAVIPI_UP		( HID_SC_CONTROL_START + 20 )
+#define HID_SC_NAVIPI_DOWN		( HID_SC_CONTROL_START + 21 )
+#define HID_SC_NAVIPI_ZOOM		( HID_SC_CONTROL_START + 22 )
+#define HID_SC_NAVIPI_ROOT		( HID_SC_CONTROL_START + 23 )
+#define HID_SC_NAVIPI_SCEN		( HID_SC_CONTROL_START + 24 )
+#define HID_SC_NAVIPI_DROP		( HID_SC_CONTROL_START + 25 )
+//	Teilergebnisse
+#define HID_SC_SUBT_GROUP		( HID_SC_CONTROL_START + 26 )
+#define HID_SC_SUBT_COLS		( HID_SC_CONTROL_START + 27 )
+#define HID_SC_SUBT_FUNC		( HID_SC_CONTROL_START + 28 )
+//
+#define HID_SC_NAVIPI_TOOLBOX	( HID_SC_CONTROL_START + 29 )
+//	Bereich ist voll!
+
+// Hilfe IDs fuer Dialoge / Pages (max.70) -----------------------------------
+#define HID_SC_AUTOFORMAT		(HID_SC_DLG_START )
+#define HID_SC_PIVOTFILTER		(HID_SC_DLG_START +1 )
+#define HID_SC_INPORTOPT		(HID_SC_DLG_START +2 )
+#define HID_SC_PIVOTSUBT		(HID_SC_DLG_START +3 )
+#define HID_SC_FORM_ARGS		(HID_SC_DLG_START +4 )
+#define HID_SCPAGE_SORT_FIELDS	(HID_SC_DLG_START +5 )
+#define HID_SCPAGE_SORT_OPTIONS	(HID_SC_DLG_START +6 )
+#define HID_SCPAGE_SUBT_OPTIONS	(HID_SC_DLG_START +7 )
+#define HID_SCPAGE_SUBT_GROUP	(HID_SC_DLG_START +8 )
+#define HID_SCPAGE_PROTECTION	(HID_SC_DLG_START +9 )
+#define HID_SCPAGE_VIEW			(HID_SC_DLG_START +10 )
+#define HID_SCPAGE_CALC			(HID_SC_DLG_START +11 )
+#define HID_SCPAGE_USERLISTS	(HID_SC_DLG_START +12 )
+#define HID_SCPAGE_HFEDIT		(HID_SC_DLG_START +13 )
+#define HID_SCPAGE_AREAS		(HID_SC_DLG_START +14 )
+#define HID_SCPAGE_TABLE		(HID_SC_DLG_START +15 )
+#define HID_SCPAGE_PRINT		(HID_SC_DLG_START +16 )
+
+#define HID_SCPAGE_SUBT_GROUP1	(HID_SC_DLG_START +17 )
+#define HID_SCPAGE_SUBT_GROUP2	(HID_SC_DLG_START +18 )
+#define HID_SCPAGE_SUBT_GROUP3	(HID_SC_DLG_START +19 )
+
+#define HID_SCPAGE_HFED_HL		(HID_SC_DLG_START +20 )
+#define HID_SCPAGE_HFED_HR		(HID_SC_DLG_START +21 )
+#define HID_SCPAGE_HFED_FL		(HID_SC_DLG_START +22 )
+#define HID_SCPAGE_HFED_FR		(HID_SC_DLG_START +23 )
+
+#define HID_SCPAGE_CONTENT		(HID_SC_DLG_START +24 )
+#define HID_SCPAGE_LAYOUT		(HID_SC_DLG_START +25 )
+#define HID_SCPAGE_INPUT		(HID_SC_DLG_START +26 )
+
+#define HID_SC_NAVIGATOR		(HID_SC_DLG_START +27 )
+
+#define HID_SC_MTRIN_VAL		(HID_SC_DLG_START +28 )
+#define HID_SC_MTRIN_DEF		(HID_SC_DLG_START +29 )
+#define HID_SC_SELENTRY_LIST	(HID_SC_DLG_START +30 )
+#define HID_SC_GROUP_COLS		(HID_SC_DLG_START +31 )
+#define HID_SC_GROUP_ROWS		(HID_SC_DLG_START +32 )
+
+#define HID_SC_HF_TEXT			(HID_SC_DLG_START +33 )
+#define HID_SC_HF_FILE			(HID_SC_DLG_START +34 )
+#define HID_SC_HF_TABLE			(HID_SC_DLG_START +35 )
+#define HID_SC_HF_PAGE			(HID_SC_DLG_START +36 )
+#define HID_SC_HF_PAGES			(HID_SC_DLG_START +37 )
+#define HID_SC_HF_DATE			(HID_SC_DLG_START +38 )
+#define HID_SC_HF_TIME			(HID_SC_DLG_START +39 )
+
+#define HID_SC_HEADER_EDIT		(HID_SC_DLG_START +40 )
+#define HID_SC_FOOTER_EDIT		(HID_SC_DLG_START +41 )
+
+#define HID_SC_SCENWIN_TOP		(HID_SC_DLG_START +42 )
+#define HID_SC_SCENWIN_BOTTOM	(HID_SC_DLG_START +43 )
+
+#define HID_SC_INPUTWIN			(HID_SC_DLG_START +44 )
+
+#define HID_SC_RENAME_NAME		(HID_SC_DLG_START +45 )
+#define HID_SC_APPEND_NAME		(HID_SC_DLG_START +46 )
+
+//	Funktionsautopilot: nur als Unique-IDs
+#define HID_SC_FAP_PAGE			(HID_SC_DLG_START +47 )
+#define HID_SC_FAP_EDIT1		(HID_SC_DLG_START +48 )
+#define HID_SC_FAP_EDIT2		(HID_SC_DLG_START +49 )
+#define HID_SC_FAP_EDIT3		(HID_SC_DLG_START +50 )
+#define HID_SC_FAP_EDIT4		(HID_SC_DLG_START +51 )
+
+#define HID_SC_ADD_AUTOFMT		(HID_SC_DLG_START +52 )
+#define HID_SC_AUTOFMT_NAME		(HID_SC_DLG_START +53 )
+
+#define HID_SC_DROPMODE_URL		(HID_SC_DLG_START +54 )
+#define HID_SC_DROPMODE_LINK	(HID_SC_DLG_START +55 )
+#define HID_SC_DROPMODE_COPY	(HID_SC_DLG_START +56 )
+
+#define HID_SC_FAP_STRUCT		(HID_SC_DLG_START +57 )
+#define HID_SC_ASCII_TABCTR		(HID_SC_DLG_START +58 )
+
+#define HID_SC_SCENARIO_DELETE	(HID_SC_DLG_START +59 )
+#define HID_SC_SCENARIO_EDIT	(HID_SC_DLG_START +60 )
+
+#define HID_SCDLG_FORMULA		(HID_SC_DLG_START +61 )
+#define HID_SCDLG_CONDFORMAT	(HID_SC_DLG_START +62 )
+#define HID_COLROWNAMERANGES	(HID_SC_DLG_START +63 )
+
+#define HID_FUNCTION_BOX		(HID_SC_DLG_START +64 )
+#define HID_SCPAGE_OPREDLINE	(HID_SC_DLG_START +65 )
+#define HID_SC_REDLIN_CTR		(HID_SC_DLG_START +66 )
+
+//Kopf/FusszeilenDlg: Contextmenue fuer Dateiname
+#define HID_FCOMMAND_TITEL		(HID_SC_DLG_START +67 )
+#define HID_FCOMMAND_FILENAME	(HID_SC_DLG_START +68 )
+#define HID_FCOMMAND_PATH		(HID_SC_DLG_START +69 )
+
+
+// Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) -----------------------
+
+#define HID_SC_TOOLBOX_TOOLS	( HID_SC_TOOLBOX_START )
+#define HID_SC_TOOLBOX_TABLE	( HID_SC_TOOLBOX_START + 1 )
+#define HID_SC_TOOLBOX_DRAW		( HID_SC_TOOLBOX_START + 2 )
+#define HID_SC_TOOLBOX_DRTEXT	( HID_SC_TOOLBOX_START + 3 )
+#define HID_SC_TOOLBOX_PREVIEW	( HID_SC_TOOLBOX_START + 4 )
+
+//	wrong group - HID_SC_DLG_START is full
+#define HID_SC_RENAME_AUTOFMT	( HID_SC_TOOLBOX_START + 5 )
+#define HID_SC_REN_AFMT_NAME	( HID_SC_TOOLBOX_START + 6 )
+
+#define HID_SC_TOOLBOX_GRAPHIC	( HID_SC_TOOLBOX_START + 7 )
+
+#define HID_CHG_PROTECT         ( HID_SC_TOOLBOX_START + 8 )
+
+#define HID_SC_RENAME_OBJECT	( HID_SC_TOOLBOX_START + 9 )
+
+// Hilfe IDs fuer Submenus (max.50) ------------------------------------------
+#define HID_SCMENU_EDIT			( HID_SC_MENU_START )
+#define HID_SCMENU_FILL			( HID_SC_MENU_START + 1 )
+#define HID_SCMENU_DELBREAK		( HID_SC_MENU_START + 2 )
+#define HID_SCMENU_VIEW			( HID_SC_MENU_START + 3 )
+#define HID_SCMENU_TOOLBARS		( HID_SC_MENU_START + 4 )
+#define HID_SCMENU_INSERT		( HID_SC_MENU_START + 5 )
+#define HID_SCMENU_INSBREAK		( HID_SC_MENU_START + 6 )
+#define HID_SCMENU_NAME			( HID_SC_MENU_START + 7 )
+#define HID_SCMENU_GRAPHIC		( HID_SC_MENU_START + 8 )
+#define HID_SCMENU_DATA			( HID_SC_MENU_START + 9 )
+#define HID_SCMENU_FILTER		( HID_SC_MENU_START + 10 )
+#define HID_SCMENU_OUTLINE		( HID_SC_MENU_START + 11 )
+#define HID_SCMENU_PIVOT		( HID_SC_MENU_START + 12 )
+#define HID_SCMENU_EXTRA		( HID_SC_MENU_START + 13 )
+#define HID_SCMENU_SPELLING		( HID_SC_MENU_START + 14 )
+#define HID_SCMENU_AUDIT		( HID_SC_MENU_START + 15 )
+#define HID_SCMENU_PROTECT		( HID_SC_MENU_START + 16 )
+#define HID_SCMENU_CELLCONT		( HID_SC_MENU_START + 17 )
+#define HID_SCMENU_ROW			( HID_SC_MENU_START + 18 )
+#define HID_SCMENU_COL			( HID_SC_MENU_START + 19 )
+#define HID_SCMENU_TAB			( HID_SC_MENU_START + 20 )
+#define HID_SCMENU_MERGE		( HID_SC_MENU_START + 21 )
+#define HID_SCMENU_AREA			( HID_SC_MENU_START + 22 )
+#define HID_SCMENU_OBJMIRROR	( HID_SC_MENU_START + 23 )
+#define HID_SCMENU_OBJARRANGE	( HID_SC_MENU_START + 24 )
+#define HID_SCMENU_ANCHOR		( HID_SC_MENU_START + 25 )
+#define HID_SCMENU_SENDTO		( HID_SC_MENU_START + 26 )
+#define HID_SCMENU_CHANGES		( HID_SC_MENU_START + 27 )
+
+#define HID_SC_FAP_BTN_FX1		( HID_SC_MENU_START + 28 )
+#define HID_SC_FAP_BTN_FX2		( HID_SC_MENU_START + 29 )
+#define HID_SC_FAP_BTN_FX3		( HID_SC_MENU_START + 30 )
+#define HID_SC_FAP_BTN_FX4		( HID_SC_MENU_START + 31 )
+#define HID_SC_FAP_BTN_REF1		( HID_SC_MENU_START + 32 )
+#define HID_SC_FAP_BTN_REF2		( HID_SC_MENU_START + 33 )
+#define HID_SC_FAP_BTN_REF3		( HID_SC_MENU_START + 34 )
+#define HID_SC_FAP_BTN_REF4		( HID_SC_MENU_START + 35 )
+#define HID_SC_FAP_FORMULA		( HID_SC_MENU_START + 36 )
+
+#define HID_SC_SORT_ACTION		( HID_SC_MENU_START + 37 )
+#define HID_SC_SORT_AUTHOR		( HID_SC_MENU_START + 38 )
+#define HID_SC_SORT_DATE		( HID_SC_MENU_START + 39 )
+#define HID_SC_SORT_COMMENT		( HID_SC_MENU_START + 40 )
+#define HID_SORT_POSITION		( HID_SC_MENU_START + 41 )
+#define HID_SC_CHANGES_COMMENT  ( HID_SC_MENU_START + 42 )
+#define HID_SC_FUNCTIONLIST		( HID_SC_MENU_START + 43 )
+#define HID_SCPAGE_OPTLOAD		( HID_SC_MENU_START + 44 )
+#define HID_PASSWD_TABLE		( HID_SC_MENU_START + 45 )
+#define HID_PASSWD_DOC			( HID_SC_MENU_START + 46 )
+
+#define HID_DATAPILOT_TYPE		( HID_SC_MENU_START + 47 )
+#define HID_DATAPILOT_DATABASE	( HID_SC_MENU_START + 48 )
+#define HID_DATAPILOT_SERVICE	( HID_SC_MENU_START + 49 )
+
+// Other help IDs (max.70) ---------------------------------------------------
+#define HID_SCDLG_LINKAREAURL   ( HID_SC_OTHER_START )
+#define HID_SCMENU_EDIT_TABLE   ( HID_SC_OTHER_START + 1 )
+
+#define HID_SELECTTABLES        ( HID_SC_OTHER_START + 2 )
+#define HID_SC_REPLCELLSWARN    ( HID_SC_OTHER_START + 3 )
+
+// data pilot layout dialog
+#define HID_SC_DPLAY_PAGE       ( HID_SC_OTHER_START + 4 )
+#define HID_SC_DPLAY_COLUMN     ( HID_SC_OTHER_START + 5 )
+#define HID_SC_DPLAY_ROW        ( HID_SC_OTHER_START + 6 )
+#define HID_SC_DPLAY_DATA       ( HID_SC_OTHER_START + 7 )
+#define HID_SC_DPLAY_SELECT     ( HID_SC_OTHER_START + 8 )
+
+#define HID_SC_DRAW_RENAME      ( HID_SC_OTHER_START + 9 )
+
+#define HID_SC_DPDATAFIELD      ( HID_SC_OTHER_START + 10 )
+#define HID_SC_DPSUBT_OPT       ( HID_SC_OTHER_START + 11 )
+#define HID_SC_DPSUBT_HIDE      ( HID_SC_OTHER_START + 12 )
+#define HID_SC_DPNUMGROUP       ( HID_SC_OTHER_START + 13 )
+#define HID_SC_DPDATEGROUP      ( HID_SC_OTHER_START + 14 )
+#define HID_SC_DPDATEGROUP_LB   ( HID_SC_OTHER_START + 15 )
+#define HID_SC_DPSHOWDETAIL     ( HID_SC_OTHER_START + 16 )
+
+// #i68101#
+#define HID_SC_TITLE_DESCRIPTION_OBJECT	( HID_SC_OTHER_START + 17 )
+
+#define HID_SC_SOLVEROPTIONS    ( HID_SC_OTHER_START + 18 )
+#define HID_SC_SOLVEROPTIONS_LB ( HID_SC_OTHER_START + 19 )
+#define HID_SC_SOLVER_INTEGER   ( HID_SC_OTHER_START + 20 )
+#define HID_SC_SOLVER_DOUBLE    ( HID_SC_OTHER_START + 21 )
+#define HID_SC_SOLVER_PROGRESS  ( HID_SC_OTHER_START + 22 )
+#define HID_SC_SOLVER_NOSOLUTION ( HID_SC_OTHER_START + 23 )
+#define HID_SC_SOLVER_SUCCESS   ( HID_SC_OTHER_START + 24 )
+
+#define HID_SCDLG_CONFLICTS     ( HID_SC_OTHER_START + 25 )
+
+#define HID_SC_HF_HL_DEFINED    ( HID_SC_OTHER_START + 26 )
+#define HID_SC_HF_HR_DEFINED    ( HID_SC_OTHER_START + 27 )
+#define HID_SC_HF_FL_DEFINED    ( HID_SC_OTHER_START + 28 )
+#define HID_SC_HF_FR_DEFINED    ( HID_SC_OTHER_START + 29 )
+
+// Analysis Addin Functions (max.120) ----------------------------------------
+#define HID_AAI_FUNC_WORKDAY		( HID_SC_AAI_FUNCS_START )
+#define HID_AAI_FUNC_YEARFRAC		( HID_SC_AAI_FUNCS_START + 1 )
+#define HID_AAI_FUNC_EDATE			( HID_SC_AAI_FUNCS_START + 2 )
+#define HID_AAI_FUNC_WEEKNUM		( HID_SC_AAI_FUNCS_START + 3 )
+#define HID_AAI_FUNC_EOMONTH		( HID_SC_AAI_FUNCS_START + 4 )
+#define HID_AAI_FUNC_NETWORKDAYS	( HID_SC_AAI_FUNCS_START + 5 )
+#define HID_AAI_FUNC_AMORDEGRC		( HID_SC_AAI_FUNCS_START + 6 )
+#define HID_AAI_FUNC_AMORLINC		( HID_SC_AAI_FUNCS_START + 7 )
+#define HID_AAI_FUNC_ACCRINT		( HID_SC_AAI_FUNCS_START + 8 )
+#define HID_AAI_FUNC_ACCRINTM		( HID_SC_AAI_FUNCS_START + 9 )
+#define HID_AAI_FUNC_RECEIVED		( HID_SC_AAI_FUNCS_START + 10 )
+#define HID_AAI_FUNC_DISC			( HID_SC_AAI_FUNCS_START + 11 )
+#define HID_AAI_FUNC_DURATION		( HID_SC_AAI_FUNCS_START + 12 )
+#define HID_AAI_FUNC_EFFECT			( HID_SC_AAI_FUNCS_START + 13 )
+#define HID_AAI_FUNC_CUMPRINC		( HID_SC_AAI_FUNCS_START + 14 )
+#define HID_AAI_FUNC_CUMIPMT		( HID_SC_AAI_FUNCS_START + 15 )
+#define HID_AAI_FUNC_PRICE			( HID_SC_AAI_FUNCS_START + 16 )
+#define HID_AAI_FUNC_PRICEDISC		( HID_SC_AAI_FUNCS_START + 17 )
+#define HID_AAI_FUNC_PRICEMAT		( HID_SC_AAI_FUNCS_START + 18 )
+#define HID_AAI_FUNC_MDURATION		( HID_SC_AAI_FUNCS_START + 19 )
+#define HID_AAI_FUNC_NOMINAL		( HID_SC_AAI_FUNCS_START + 20 )
+#define HID_AAI_FUNC_DOLLARFR		( HID_SC_AAI_FUNCS_START + 21 )
+#define HID_AAI_FUNC_DOLLARDE		( HID_SC_AAI_FUNCS_START + 22 )
+#define HID_AAI_FUNC_YIELD			( HID_SC_AAI_FUNCS_START + 23 )
+#define HID_AAI_FUNC_YIELDDISC		( HID_SC_AAI_FUNCS_START + 24 )
+#define HID_AAI_FUNC_YIELDMAT		( HID_SC_AAI_FUNCS_START + 25 )
+#define HID_AAI_FUNC_TBILLEQ		( HID_SC_AAI_FUNCS_START + 26 )
+#define HID_AAI_FUNC_TBILLPRICE		( HID_SC_AAI_FUNCS_START + 27 )
+#define HID_AAI_FUNC_TBILLYIELD		( HID_SC_AAI_FUNCS_START + 28 )
+#define HID_AAI_FUNC_ODDFPRICE		( HID_SC_AAI_FUNCS_START + 29 )
+#define HID_AAI_FUNC_ODDFYIELD		( HID_SC_AAI_FUNCS_START + 30 )
+#define HID_AAI_FUNC_ODDLPRICE		( HID_SC_AAI_FUNCS_START + 31 )
+#define HID_AAI_FUNC_ODDLYIELD		( HID_SC_AAI_FUNCS_START + 32 )
+#define HID_AAI_FUNC_XIRR			( HID_SC_AAI_FUNCS_START + 33 )
+#define HID_AAI_FUNC_XNPV			( HID_SC_AAI_FUNCS_START + 34 )
+#define HID_AAI_FUNC_INTRATE		( HID_SC_AAI_FUNCS_START + 35 )
+#define HID_AAI_FUNC_COUPNCD		( HID_SC_AAI_FUNCS_START + 36 )
+#define HID_AAI_FUNC_COUPDAYS		( HID_SC_AAI_FUNCS_START + 37 )
+#define HID_AAI_FUNC_COUPDAYSNC		( HID_SC_AAI_FUNCS_START + 38 )
+#define HID_AAI_FUNC_COUPDAYBS		( HID_SC_AAI_FUNCS_START + 39 )
+#define HID_AAI_FUNC_COUPPCD		( HID_SC_AAI_FUNCS_START + 40 )
+#define HID_AAI_FUNC_COUPNUM		( HID_SC_AAI_FUNCS_START + 41 )
+#define HID_AAI_FUNC_FVSCHEDULE		( HID_SC_AAI_FUNCS_START + 42 )
+#define HID_AAI_FUNC_ISEVEN			( HID_SC_AAI_FUNCS_START + 43 )
+#define HID_AAI_FUNC_ISODD			( HID_SC_AAI_FUNCS_START + 44 )
+#define HID_AAI_FUNC_GCD			( HID_SC_AAI_FUNCS_START + 45 )
+#define HID_AAI_FUNC_LCM			( HID_SC_AAI_FUNCS_START + 46 )
+#define HID_AAI_FUNC_MULTINOMIAL	( HID_SC_AAI_FUNCS_START + 47 )
+#define HID_AAI_FUNC_SERIESSUM		( HID_SC_AAI_FUNCS_START + 48 )
+#define HID_AAI_FUNC_QUOTIENT		( HID_SC_AAI_FUNCS_START + 49 )
+#define HID_AAI_FUNC_MROUND			( HID_SC_AAI_FUNCS_START + 50 )
+#define HID_AAI_FUNC_SQRTPI			( HID_SC_AAI_FUNCS_START + 51 )
+#define HID_AAI_FUNC_RANDBETWEEN	( HID_SC_AAI_FUNCS_START + 52 )
+#define HID_AAI_FUNC_BESSELI		( HID_SC_AAI_FUNCS_START + 53 )
+#define HID_AAI_FUNC_BESSELJ		( HID_SC_AAI_FUNCS_START + 54 )
+#define HID_AAI_FUNC_BESSELK		( HID_SC_AAI_FUNCS_START + 55 )
+#define HID_AAI_FUNC_BESSELY		( HID_SC_AAI_FUNCS_START + 56 )
+#define HID_AAI_FUNC_BIN2DEC		( HID_SC_AAI_FUNCS_START + 57 )
+#define HID_AAI_FUNC_BIN2HEX		( HID_SC_AAI_FUNCS_START + 58 )
+#define HID_AAI_FUNC_BIN2OCT		( HID_SC_AAI_FUNCS_START + 59 )
+#define HID_AAI_FUNC_DELTA			( HID_SC_AAI_FUNCS_START + 60 )
+#define HID_AAI_FUNC_DEC2BIN		( HID_SC_AAI_FUNCS_START + 61 )
+#define HID_AAI_FUNC_DEC2HEX		( HID_SC_AAI_FUNCS_START + 62 )
+#define HID_AAI_FUNC_DEC2OCT		( HID_SC_AAI_FUNCS_START + 63 )
+#define HID_AAI_FUNC_ERF			( HID_SC_AAI_FUNCS_START + 64 )
+#define HID_AAI_FUNC_ERFC			( HID_SC_AAI_FUNCS_START + 65 )
+#define HID_AAI_FUNC_GESTEP			( HID_SC_AAI_FUNCS_START + 66 )
+#define HID_AAI_FUNC_HEX2BIN		( HID_SC_AAI_FUNCS_START + 67 )
+#define HID_AAI_FUNC_HEX2DEC		( HID_SC_AAI_FUNCS_START + 68 )
+#define HID_AAI_FUNC_HEX2OCT		( HID_SC_AAI_FUNCS_START + 69 )
+#define HID_AAI_FUNC_IMABS			( HID_SC_AAI_FUNCS_START + 70 )
+#define HID_AAI_FUNC_IMAGINARY		( HID_SC_AAI_FUNCS_START + 71 )
+#define HID_AAI_FUNC_IMPOWER		( HID_SC_AAI_FUNCS_START + 72 )
+#define HID_AAI_FUNC_IMARGUMENT		( HID_SC_AAI_FUNCS_START + 73 )
+#define HID_AAI_FUNC_IMCOS			( HID_SC_AAI_FUNCS_START + 74 )
+#define HID_AAI_FUNC_IMDIV			( HID_SC_AAI_FUNCS_START + 75 )
+#define HID_AAI_FUNC_IMEXP			( HID_SC_AAI_FUNCS_START + 76 )
+#define HID_AAI_FUNC_IMCONJUGATE	( HID_SC_AAI_FUNCS_START + 77 )
+#define HID_AAI_FUNC_IMLN			( HID_SC_AAI_FUNCS_START + 78 )
+#define HID_AAI_FUNC_IMLOG10		( HID_SC_AAI_FUNCS_START + 79 )
+#define HID_AAI_FUNC_IMLOG2			( HID_SC_AAI_FUNCS_START + 80 )
+#define HID_AAI_FUNC_IMPRODUCT		( HID_SC_AAI_FUNCS_START + 81 )
+#define HID_AAI_FUNC_IMREAL			( HID_SC_AAI_FUNCS_START + 82 )
+#define HID_AAI_FUNC_IMSIN			( HID_SC_AAI_FUNCS_START + 83 )
+#define HID_AAI_FUNC_IMSUB			( HID_SC_AAI_FUNCS_START + 84 )
+#define HID_AAI_FUNC_IMSUM			( HID_SC_AAI_FUNCS_START + 85 )
+#define HID_AAI_FUNC_IMSQRT			( HID_SC_AAI_FUNCS_START + 86 )
+#define HID_AAI_FUNC_COMPLEX		( HID_SC_AAI_FUNCS_START + 87 )
+#define HID_AAI_FUNC_OCT2BIN		( HID_SC_AAI_FUNCS_START + 88 )
+#define HID_AAI_FUNC_OCT2DEZ		( HID_SC_AAI_FUNCS_START + 89 )
+#define HID_AAI_FUNC_OCT2HEX		( HID_SC_AAI_FUNCS_START + 90 )
+#define HID_AAI_FUNC_CONVERT		( HID_SC_AAI_FUNCS_START + 91 )
+#define HID_AAI_FUNC_FACTDOUBLE		( HID_SC_AAI_FUNCS_START + 92 )
+
+// DateFunc Addin Functions (max.20) -----------------------------------------
+#define HID_DAI_FUNC_DAYSINMONTH    ( HID_SC_DAI_FUNCS_START )
+#define HID_DAI_FUNC_DAYSINYEAR     ( HID_SC_DAI_FUNCS_START + 1 )
+#define HID_DAI_FUNC_WEEKSINYEAR    ( HID_SC_DAI_FUNCS_START + 2 )
+#define HID_DAI_FUNC_DIFFMONTHS     ( HID_SC_DAI_FUNCS_START + 3 )
+#define HID_DAI_FUNC_DIFFWEEKS      ( HID_SC_DAI_FUNCS_START + 4 )
+#define HID_DAI_FUNC_DIFFYEARS      ( HID_SC_DAI_FUNCS_START + 5 )
+#define HID_DAI_FUNC_ROT13          ( HID_SC_DAI_FUNCS_START + 6 )
+
+// Ende Hilfe IDs ------------------------------------------------------------
+// ---------------------------------------------------------------------------
+
+// View-Funktionen (max. 100) ------------------------------------------------
+
+#define FID_TESTFUNC0			(SC_VIEW_START)
+#define FID_TESTFUNC1			(SC_VIEW_START + 1)
+#define FID_TESTFUNC2			(SC_VIEW_START + 2)
+#define FID_TESTFUNC3			(SC_VIEW_START + 3)
+#define FID_TESTFUNC4			(SC_VIEW_START + 4)
+#define FID_TESTFUNC5			(SC_VIEW_START + 5)
+#define FID_TESTFUNC6			(SC_VIEW_START + 6)
+#define FID_TESTFUNC7			(SC_VIEW_START + 7)
+#define FID_TESTFUNC8			(SC_VIEW_START + 8)
+#define FID_TESTFUNC9			(SC_VIEW_START + 9)
+#define FID_SCALESTATUS			(SC_VIEW_START + 10)
+#define FID_COLOR				(SC_VIEW_START + 11)
+//aus sfx: #define SID_REPAINT				(SC_VIEW_START + 12)
+#define SID_UPDATECHART			(SC_VIEW_START + 13)
+#define FID_MARKLEFT			(SC_VIEW_START + 14)
+#define FID_MARKRIGHT			(SC_VIEW_START + 15)
+#define FID_MARKUP				(SC_VIEW_START + 16)
+#define FID_MARKDOWN			(SC_VIEW_START + 17)
+#define FID_MARKPAGEUP			(SC_VIEW_START + 18)
+#define FID_MARKPAGEDOWN		(SC_VIEW_START + 19)
+
+// Slot-IDs fuer Attribute:
+
+#define SID_SCATTR_HOR_JUSTIFY	(SC_VIEW_START + 30)	// Alignment-Page
+#define SID_SCATTR_VER_JUSTIFY	(SC_VIEW_START + 31)
+#define SID_SCATTR_MARGIN		(SC_VIEW_START + 32)
+#define SID_SCATTR_STACKED      (SC_VIEW_START + 33)
+#define SID_SCATTR_LINEBREAK	(SC_VIEW_START + 35)
+#define	SID_SCATTR_PROTECTION	(SC_VIEW_START + 36)	// Protection-Page
+
+// sonstige Slot-IDs:
+
+#define SID_SCUSERLISTS         (SC_VIEW_START + 37)    // Benutzerdef.Listen
+#define RES_TBX_DUMMY			(SC_VIEW_START + 38)    // Dummy-Item
+#define SID_SCVIEWOPTIONS       (SC_VIEW_START + 39)
+#define SID_SCDOCOPTIONS        (SC_VIEW_START + 40)
+
+// Cursorbewegungen als Properties:
+
+#define	SID_CURRENTCELL			(SC_VIEW_START + 41)
+#define	SID_CURRENTTAB			(SC_VIEW_START + 42)
+#define SID_CURRENTDOC			(SC_VIEW_START + 43)
+#define SID_CURRENTOBJECT		(SC_VIEW_START + 44)
+
+// Slot-IDs fuer spez. ToolBox-Funktionen:
+
+#define SID_NUMBER_CURRENCY		(SC_VIEW_START + 45)
+#define SID_NUMBER_PERCENT		(SC_VIEW_START + 46)
+
+// "Slot" Ids fuer Eingabezeilen Images:
+#define SID_INPUT_FUNCTION		(SC_VIEW_START + 47)
+#define SID_INPUT_SUM			(SC_VIEW_START + 48)
+#define SID_INPUT_EQUAL			(SC_VIEW_START + 49)
+#define SID_INPUT_CANCEL		(SC_VIEW_START + 50)
+#define SID_INPUT_OK			(SC_VIEW_START + 51)
+
+#define SID_NUMBER_STANDARD		(SC_VIEW_START + 52)
+#define SID_NUMBER_DATE			(SC_VIEW_START + 53)
+#define SID_NUMBER_TWODEC		(SC_VIEW_START + 54)
+#define SID_NUMBER_SCIENTIFIC	(SC_VIEW_START + 55)
+#define SID_NUMBER_TIME			(SC_VIEW_START + 56)
+#define SID_NUMBER_INCDEC		(SC_VIEW_START + 57)
+#define SID_NUMBER_DECDEC		(SC_VIEW_START + 58)
+
+// Sonstiges:
+#define SID_LINKS				(SC_VIEW_START + 60)
+#define SID_INSERT_SIMAGE		(SC_VIEW_START + 61)
+#define SID_INSERT_SCHART		(SC_VIEW_START + 62)
+#define SID_INSERT_SMATH        (SC_VIEW_START + 63)
+#define SID_STANDARD_FONTS		(SC_VIEW_START + 64)
+#define SID_MIRROR_VERTICAL		(SC_VIEW_START + 65)
+#define SID_MIRROR_HORIZONTAL	(SC_VIEW_START + 66)
+#define SID_CELL_FORMAT_RESET	(SC_VIEW_START + 67)
+#define SID_SCPRINTOPTIONS      (SC_VIEW_START + 68)
+#define SID_WINDOW_SPLIT		(SC_VIEW_START + 69)
+#define SID_WINDOW_FIX			(SC_VIEW_START + 70)
+#ifdef SID_DRAW_CHART
+#undef SID_DRAW_CHART
+#endif
+#define SID_DRAW_CHART			(SC_VIEW_START + 71)
+#define SID_UPDATETABLINKS		(SC_VIEW_START + 72)
+
+//TabPage Eingabe
+#define SID_SC_INPUT_SELECTION          (SC_VIEW_START + 73)
+#define SID_SC_INPUT_SELECTIONPOS       (SC_VIEW_START + 74)
+#define SID_SC_INPUT_EDITMODE           (SC_VIEW_START + 75)
+#define SID_SC_INPUT_FMT_EXPAND         (SC_VIEW_START + 76)
+#define SID_SC_INPUT_RANGEFINDER        (SC_VIEW_START + 77)
+#define SID_SC_INPUT_REF_EXPAND			(SC_VIEW_START + 78)
+#define SID_SC_INPUT_MARK_HEADER		(SC_VIEW_START + 79)
+
+#define SID_REIMPORT_AFTER_LOAD	(SC_VIEW_START + 80)
+#define SID_DRAW_NOTEEDIT		(SC_VIEW_START + 81)
+
+#define SID_CHOOSE_DESIGN		(SC_VIEW_START + 82)
+#define SID_EURO_CONVERTER		(SC_VIEW_START + 83)
+//#define SID_CHG_PROTECT         (SC_VIEW_START + 84)		-> moved to SVX
+#define SID_EXTERNAL_SOURCE     (SC_VIEW_START + 85)
+
+#define SID_SC_INPUT_TEXTWYSIWYG		(SC_VIEW_START + 86)
+
+#define SID_ENABLE_HYPHENATION          (SC_VIEW_START + 87)
+
+#define SID_RENAME_OBJECT				(SC_VIEW_START + 88)
+#define SID_FOCUS_INPUTLINE				(SC_VIEW_START + 89)
+#define SID_SELECT_TABLES               (SC_VIEW_START + 90)
+
+// #97776# new entry "Filter..." in DP popup menu
+#define SID_DP_FILTER                   (SC_VIEW_START + 91)
+
+// #101160# Replace cell contents warning
+#define SID_SC_INPUT_REPLCELLSWARN      (SC_VIEW_START + 92)
+
+// additional IDs for list/range validity
+#define FID_VALID_LISTTYPE              (SC_VIEW_START + 93)
+
+// #i68101# ID for changing Title & Descriptopn of an Object
+#define SID_TITLE_DESCRIPTION_OBJECT	(SC_VIEW_START + 94)
+
+// #i59082# assign macro to shape
+#define SID_ASSIGNMACRO                 (SC_VIEW_START + 95)
+
+// #i66550# hyperlinks in shapes
+#define SID_DRAW_HLINK_EDIT             (SC_VIEW_START + 96)
+#define SID_DRAW_HLINK_DELETE           (SC_VIEW_START + 97)
+
+// "Zoom / Synchronize sheets" in options dialog
+#define SID_SC_OPT_SYNCZOOM             (SC_VIEW_START + 98)
+
+// NOTE: last valid ID is (SC_VIEW_START + 99)
+
+// Nachrichten -------------------------------------------------------------
+
+#define FID_INPUTLINE_STATUS	(SC_MESSAGE_START)
+#define FID_INPUTLINE_ENTER		(SC_MESSAGE_START + 1)
+#define FID_REPAINT				(SC_MESSAGE_START + 2)
+#define FID_DATACHANGED			(SC_MESSAGE_START + 3)
+#define FID_REFMODECHANGED		(SC_MESSAGE_START + 4)
+#define FID_KILLEDITVIEW		(SC_MESSAGE_START + 5)
+#define SID_SOLVE               (SC_MESSAGE_START + 6)
+#define FID_FONT_SELECTED       (SC_MESSAGE_START + 7)
+#define FID_FILTER_OK           (SC_MESSAGE_START + 8)
+#define SC_HINT_DRWLAYER_NEW	(SC_MESSAGE_START + 9)
+#define SID_TABDELETED			(SC_MESSAGE_START + 10)
+#define FID_INPUTLINE_MATRIX	(SC_MESSAGE_START + 11)
+#define SID_DLG_RETOK           (SC_MESSAGE_START + 12)
+#define FID_ANYDATACHANGED		(SC_MESSAGE_START + 13)
+#define SID_STATUS_DOCPOS       (SC_MESSAGE_START + 14)
+#define SID_STATUS_PAGESTYLE    (SC_MESSAGE_START + 15)
+#define SID_STATUS_SELMODE	    (SC_MESSAGE_START + 16)
+#define FID_KILLEDITVIEW_NOPAINT (SC_MESSAGE_START + 17)
+#define SID_DLG_MATRIX          (SC_MESSAGE_START + 18)
+#define SC_HINT_DBAREAS_CHANGED (SC_MESSAGE_START + 19)
+#define SC_HINT_AREAS_CHANGED   (SC_MESSAGE_START + 20)
+#define SC_HINT_TABLES_CHANGED  (SC_MESSAGE_START + 21)
+
+#define SID_STATUS_SELMODE_ERG  (SC_MESSAGE_START + 22)
+#define SID_STATUS_SELMODE_ERW  (SC_MESSAGE_START + 23)
+#define SID_STATUS_SELMODE_NORM (SC_MESSAGE_START + 24)
+
+#define SID_CHART_SOURCE		(SC_MESSAGE_START + 25)
+#define SID_CHART_NAME			(SC_MESSAGE_START + 26)
+#define SID_CHART_ADDSOURCE		(SC_MESSAGE_START + 27)
+
+#define SID_AUTO_STYLE			(SC_MESSAGE_START + 28)
+
+#define FID_INPUTLINE_BLOCK		(SC_MESSAGE_START + 29)
+
+#define SID_STATUS_SUM			(SC_MESSAGE_START + 30)
+
+#define SC_HINT_DRAW_CHANGED	(SC_MESSAGE_START + 31)
+#define SC_HINT_DOCNAME_CHANGED	(SC_MESSAGE_START + 32)
+#define SC_HINT_AREALINKS_CHANGED (SC_MESSAGE_START + 33)
+#define SC_HINT_SHOWRANGEFINDER	(SC_MESSAGE_START + 34)
+#define SC_HINT_DOC_SAVED		(SC_MESSAGE_START + 35)
+#define SC_HINT_FORCESETTAB		(SC_MESSAGE_START + 36)
+
+// Nachricht zum Oeffnen von Dialogen:
+#define SID_OPENDLG_CONSOLIDATE		(SC_MESSAGE_START + 50)
+#define SID_OPENDLG_PIVOTTABLE 		(SC_MESSAGE_START + 51)
+#define SID_OPENDLG_FUNCTION		(SC_MESSAGE_START + 52)
+#define SID_OPENDLG_SOLVE      		(SC_MESSAGE_START + 53)
+#define SID_OPENDLG_TABOP			(SC_MESSAGE_START + 54)
+//#define SID_OPENDLG_CHART			(SC_MESSAGE_START + 55)
+#define SID_OPENDLG_EDITFUNCTION	(SC_MESSAGE_START + 56)
+#define SID_OPENDLG_ARGUMENT		(SC_MESSAGE_START + 57)
+//#define SID_OPENDLG_MODCHART		(SC_MESSAGE_START + 58)
+#define SID_OPENDLG_CONDFRMT		(SC_MESSAGE_START + 59)
+#define SID_OPENDLG_OPTSOLVER       (SC_MESSAGE_START + 60)
+
+#define SC_HINT_NAVIGATOR_UPDATEALL  (SC_MESSAGE_START + 65)
+
+// Funktionen ------------------------------------------------------------
+
+
+//#define FID_PRINT_PREVIEW		(SC_FUNCTION_START)
+#define FID_DOC_MANAGER 		(SC_FUNCTION_START + 1)
+#define FID_CURSOR_ENTER		(SC_FUNCTION_START + 2)
+#define SID_MAIL                (SC_FUNCTION_START + 3)
+#define FILE_MENU_END			(SC_FUNCTION_START + 20)
+
+#define EDIT_MENU_START 		(FILE_MENU_END)
+#define FID_PASTE_CONTENTS		(EDIT_MENU_START)
+#define FID_DELETE_CELLCONTENTS	(EDIT_MENU_START + 1)
+#define FID_DELETE_CELL			(EDIT_MENU_START + 2)
+#define FID_DELETE_TABLE		(EDIT_MENU_START + 3)
+#define FID_FILL_TO_BOTTOM		(EDIT_MENU_START + 4)
+#define FID_FILL_TO_RIGHT		(EDIT_MENU_START + 5)
+#define FID_FILL_TO_TOP			(EDIT_MENU_START + 6)
+#define FID_FILL_TO_LEFT		(EDIT_MENU_START + 7)
+#define FID_FILL_TAB			(EDIT_MENU_START + 8)
+#define FID_FILL_SERIES			(EDIT_MENU_START + 9)
+#define FID_SEARCH_REPLACE_DLG	(EDIT_MENU_START + 10)
+#define FID_EDIT_OBJECT			(EDIT_MENU_START + 11)
+#define SID_SC_NAVIGATOR		(EDIT_MENU_START + 12)
+#define SID_SC_WIZARD		    (EDIT_MENU_START + 13)
+#define SID_SC_EDIT_OBJECT	    (EDIT_MENU_START + 14)
+#define SID_HFEDIT              (EDIT_MENU_START + 15)
+
+#define SID_DEL_ROWS            (EDIT_MENU_START + 16)//JN
+#define SID_DEL_COLS            (EDIT_MENU_START + 17)//JN
+
+//#define	FID_CHG_RECORD			(EDIT_MENU_START + 18)	-> moved to SVX
+#define	FID_CHG_SHOW			(EDIT_MENU_START + 19)
+
+#define EDIT_MENU_END			(EDIT_MENU_START + 20)
+#define VIEW_MENU_START 		(EDIT_MENU_END)
+
+#define FID_TOGGLEOBJECT		(VIEW_MENU_START)
+#define FID_TOGGLEINPUTLINE 	(VIEW_MENU_START + 1)
+#define FID_TOGGLEHEADERS		(VIEW_MENU_START + 2)
+#define FID_SCALE				(VIEW_MENU_START + 4)
+#define FID_TOGGLESYNTAX		(VIEW_MENU_START + 5)
+#define FID_SCREEN_OPTIONS		(VIEW_MENU_START + 6)
+#define FID_PAGEBREAKMODE		(VIEW_MENU_START + 7)
+#define FID_FUNCTION_BOX		(VIEW_MENU_START + 8)
+#define FID_NORMALVIEWMODE      (VIEW_MENU_START + 9)
+#define FID_TOGGLEFORMULA		(VIEW_MENU_START + 10)
+// Compare/Merge jetzt aus Sfx
+//#define FID_CHG_COMPARE		(VIEW_MENU_START + 16)// DANGER DIRTY ID
+//#define FID_CHG_MERGE			(VIEW_MENU_START + 17)// DANGER DIRTY ID
+#define	FID_CHG_ACCEPT			(VIEW_MENU_START + 18)// DANGER DIRTY ID
+#define	FID_CHG_COMMENT			(VIEW_MENU_START + 19)// DANGER DIRTY ID
+#define VIEW_MENU_END			(VIEW_MENU_START + 20)
+
+#define INSERT_MENU_START		(VIEW_MENU_END)
+#define FID_PAGEBREAK			(INSERT_MENU_START)
+#define FID_INS_ROWBRK			(INSERT_MENU_START + 1)
+#define FID_INS_COLBRK			(INSERT_MENU_START + 2)
+#define FID_DEL_ROWBRK			(INSERT_MENU_START + 3)
+#define FID_DEL_COLBRK			(INSERT_MENU_START + 4)
+#define FID_INS_CELL_CONTENTS	(INSERT_MENU_START + 5)
+#define FID_INS_CELL			(INSERT_MENU_START + 6)
+#define FID_INS_ROW 			(INSERT_MENU_START + 7)
+#define FID_INS_COLUMN			(INSERT_MENU_START + 8)
+#define FID_INS_TABLE			(INSERT_MENU_START + 9)
+#define SID_INS_FUNCTION		(INSERT_MENU_START + 10)
+#define FID_DEFINE_NAME 		(INSERT_MENU_START + 11)
+#define FID_INSERT_NAME 		(INSERT_MENU_START + 12)
+#define FID_USE_NAME			(INSERT_MENU_START + 13)
+#define FID_APPLY_NAME			(INSERT_MENU_START + 14)
+#define FID_INS_TABLE_EXT       (INSERT_MENU_START + 15)
+//#define SID_CHARMAP				(INSERT_MENU_START + 15)//!!! kommt von sfx
+//aus sfx: #define SID_INSERT_POSTIT       (INSERT_MENU_START + 16)
+#define SID_INSERT_CLIPART      (INSERT_MENU_START + 17) //!!! sollte vom Svx kommen
+#define FID_INS_CELLSDOWN		(INSERT_MENU_START + 18)
+#define FID_INS_CELLSRIGHT		(INSERT_MENU_START + 19)
+#define INSERT_MENU_END 		(INSERT_MENU_START + 20)
+
+#define FORMAT_MENU_START		(INSERT_MENU_END)
+#define FID_CELL_FORMAT 		(FORMAT_MENU_START)
+#define FID_ROW_HEIGHT			(FORMAT_MENU_START + 1)
+#define FID_ROW_OPT_HEIGHT		(FORMAT_MENU_START + 2)
+#define FID_ROW_HIDE			(FORMAT_MENU_START + 3)
+#define FID_ROW_SHOW			(FORMAT_MENU_START + 4)
+#define FID_COL_WIDTH			(FORMAT_MENU_START + 5)
+#define FID_COL_OPT_WIDTH		(FORMAT_MENU_START + 6)
+#define FID_COL_HIDE			(FORMAT_MENU_START + 7)
+#define FID_COL_SHOW			(FORMAT_MENU_START + 8)
+#define FID_TABLE_HIDE			(FORMAT_MENU_START + 9)
+#define FID_TABLE_SHOW			(FORMAT_MENU_START + 10)
+#define FID_CONDITIONAL_FORMAT	(FORMAT_MENU_START + 11)
+#define SID_SCSTYLES	 		(FORMAT_MENU_START + 12)
+#define FID_MERGE_ON			(FORMAT_MENU_START + 13)
+#define FID_MERGE_OFF			(FORMAT_MENU_START + 14)
+#define SID_FORMATPAGE          (FORMAT_MENU_START + 15)
+#define SID_TEXT_STANDARD       (FORMAT_MENU_START + 16)
+#define SID_DRAWTEXT_ATTR_DLG	(FORMAT_MENU_START + 17)
+#define FID_TABLE_VISIBLE		(FORMAT_MENU_START + 18)
+#define FID_COL_OPT_DIRECT		(FORMAT_MENU_START + 19)
+#define FORMAT_MENU_END 		(FORMAT_MENU_START + 20)
+
+#define EXTRA_MENU_START		(FORMAT_MENU_END)
+#define FID_VOICE_CONTROL 		(EXTRA_MENU_START + 1)
+#define SID_RECALC_TITLE        (EXTRA_MENU_START + 2)
+#define FID_AUTO_CALC	 		(EXTRA_MENU_START + 3)
+#define FID_RECALC		 		(EXTRA_MENU_START + 4)
+#define FID_UPDATE_DIAGRAMS	 	(EXTRA_MENU_START + 5)
+#define FID_PROTECT_TABLE		(EXTRA_MENU_START + 6)
+#define FID_PROTECT_DOC			(EXTRA_MENU_START + 7)
+#define SID_EDIT_MACRO			(EXTRA_MENU_START + 8)
+#define SID_SCOPTIONS			(EXTRA_MENU_START + 9)
+#define SID_MACRO_CHOOSER		(EXTRA_MENU_START + 10)
+#define SID_SHARE_DOC           (EXTRA_MENU_START + 11)
+#define SID_SCENARIOS			(EXTRA_MENU_START + 12)
+#define SID_ADD_IN_MANAGER		(EXTRA_MENU_START + 13)
+#define SID_PIVOT_RECALC        (EXTRA_MENU_START + 14)
+#define SID_PIVOT_KILL          (EXTRA_MENU_START + 15)
+
+// hier falsch, aber erstmal
+#define SID_SC_HELP_PI			(EXTRA_MENU_START + 16)
+#define SID_SC_SHOW_KEYBOARD_HELP (EXTRA_MENU_START + 17)
+
+#define FID_HARD_RECALC		 	(EXTRA_MENU_START + 18)
+#define FID_AUTOCOMPLETE		(EXTRA_MENU_START + 19)
+
+#define EXTRA_MENU_END	 		(EXTRA_MENU_START + 20)
+
+#define DATA_MENU_START			(EXTRA_MENU_END)
+#define SID_DEFINE_DBNAME		(DATA_MENU_START)
+#define SID_SELECT_DB			(DATA_MENU_START + 1)
+#define SID_SORT                (DATA_MENU_START + 2)
+#define SID_FILTER              (DATA_MENU_START + 3)
+#define SID_SPECIAL_FILTER      (DATA_MENU_START + 4)
+#define SID_AUTO_FILTER         (DATA_MENU_START + 5)
+#define SID_UNFILTER	        (DATA_MENU_START + 6)
+#define SID_QUERY               (DATA_MENU_START + 7)
+#define SID_SUBTOTALS           (DATA_MENU_START + 8)
+//aus sfx: #define SID_OUTLINE_HIDE        (DATA_MENU_START + 9)
+//aus sfx: #define SID_OUTLINE_SHOW        (DATA_MENU_START + 10)
+//aus sfx: #define SID_OUTLINE_MAKE        (DATA_MENU_START + 11)
+//aus sfx: #define SID_OUTLINE_REMOVE      (DATA_MENU_START + 12)
+#define SID_AUTO_OUTLINE		(DATA_MENU_START + 13)
+//aus sfx: #define SID_OUTLINE_DELETEALL   (DATA_MENU_START + 14)
+#define SID_IMPORT_DATA         (DATA_MENU_START + 15)
+#define SID_REIMPORT_DATA       (DATA_MENU_START + 16)
+#define SID_PIVOT_TABLE			(DATA_MENU_START + 17)
+#define SID_TABOP				(DATA_MENU_START + 18)
+#define SID_TEXT_TO_COLUMNS		(DATA_MENU_START + 19)
+#define SID_CONSOLIDATE			(DATA_MENU_START + 20)
+#define SID_AUTOFILTER_HIDE		(DATA_MENU_START + 21)
+
+#define SID_SBA_IMPORT			(DATA_MENU_START + 22)
+
+#define SID_SORT_DESCENDING		(DATA_MENU_START + 23)
+#define SID_SORT_ASCENDING		(DATA_MENU_START + 24)
+//
+//
+#define DATA_MENU_END           (DATA_MENU_START + 25)
+
+#define TAB_POPUP_START			(DATA_MENU_END)
+#define RID_POPUP_TAB			(TAB_POPUP_START)
+#define FID_TAB_MENU_RENAME		(TAB_POPUP_START+1)
+#define FID_TAB_RENAME			(TAB_POPUP_START+2)
+#define FID_TAB_MOVE			(TAB_POPUP_START+3)
+#define FID_TAB_SELECTALL		(TAB_POPUP_START+4)
+#define FID_TAB_APPEND			(TAB_POPUP_START+5)
+#define FID_TAB_INDEX			(TAB_POPUP_START+6)
+#define FID_TAB_RTL				(TAB_POPUP_START+7)
+#define FID_TAB_DESELECTALL     (TAB_POPUP_START+8)
+
+#define TAB_POPUP_END			(DATA_MENU_END + 20)
+
+#define OBJBAR_FORMAT_START		(TAB_POPUP_END)
+#define SID_ALIGNLEFT			(OBJBAR_FORMAT_START+6)
+#define SID_ALIGNRIGHT			(OBJBAR_FORMAT_START+7)
+#define SID_ALIGNCENTERHOR 		(OBJBAR_FORMAT_START+8)
+#define SID_ALIGNBLOCK			(OBJBAR_FORMAT_START+9)
+#define SID_ALIGNTOP			(OBJBAR_FORMAT_START+10)
+#define SID_ALIGNBOTTOM			(OBJBAR_FORMAT_START+11)
+#define SID_ALIGNCENTERVER 		(OBJBAR_FORMAT_START+12)
+#define SID_SELECT_SCENARIO		(OBJBAR_FORMAT_START+13)
+
+#define SID_V_ALIGNCELL			(OBJBAR_FORMAT_START+14)
+#define SID_H_ALIGNCELL			(OBJBAR_FORMAT_START+15)
+
+#define OBJBAR_FORMAT_END		(OBJBAR_FORMAT_START+20)
+
+#define RID_INPUTBAR_START		(OBJBAR_FORMAT_END)
+#define SID_INPUT_WINDOW		(RID_INPUTBAR_START)
+#define RID_INPUTBAR_END		(RID_INPUTBAR_START+1)
+
+#define DRAW_BAR_START			(RID_INPUTBAR_END)
+//! SID_OBJECT_MIRROR wird sicher mal allgemein
+#define SID_OBJECT_MIRROR		(DRAW_BAR_START)
+#define SID_DRAWTOABOVE			(DRAW_BAR_START+15)
+#define SID_DRAWTOBELOW			(DRAW_BAR_START+16)
+//#define SID_GROUP				(DRAW_BAR_START+17)
+//#define SID_UNGROUP				(DRAW_BAR_START+18)
+#define SID_FRAMETOTOP			(DRAW_BAR_START+19)
+#define SID_FRAMETOBOTTOM		(DRAW_BAR_START+20)
+//aus sfx: #define SID_FRAME_UP			(DRAW_BAR_START+21)
+//aus sfx: #define SID_FRAME_DOWN			(DRAW_BAR_START+22)
+#define SID_TOOL_TEXT           (DRAW_BAR_START+23)
+#define SID_ANCHOR_PAGE         (DRAW_BAR_START+24)
+#define SID_ANCHOR_CELL         (DRAW_BAR_START+25)
+#define SID_ANCHOR_TOGGLE       (DRAW_BAR_START+26)
+#define SID_ORIGINALSIZE		(DRAW_BAR_START+27)
+
+#define DRAW_BAR_END			(DRAW_BAR_START+50)
+
+#define DRAWTEXTBAR_START		(DRAW_BAR_END)
+#define SID_TEXT_LINESPACING_1	(DRAWTEXTBAR_START)
+#define SID_TEXT_LINESPACING_2	(DRAWTEXTBAR_START+1)
+#define SID_TEXT_LINESPACING_3	(DRAWTEXTBAR_START+2)
+#define DRAWTEXTBAR_END			(DRAWTEXTBAR_START+20)
+
+#define DETECTIVE_START			(DRAWTEXTBAR_END)
+#define SID_DETECTIVE_ADD_PRED  (DETECTIVE_START)
+#define SID_DETECTIVE_DEL_PRED  (DETECTIVE_START+1)
+#define SID_DETECTIVE_ADD_SUCC  (DETECTIVE_START+2)
+#define SID_DETECTIVE_DEL_SUCC  (DETECTIVE_START+3)
+#define SID_DETECTIVE_ADD_ERR   (DETECTIVE_START+4)
+#define SID_DETECTIVE_DEL_ALL   (DETECTIVE_START+5)
+
+#define SID_DETECTIVE_FILLMODE	(DETECTIVE_START+6)
+#define SID_FILL_ADD_PRED		(DETECTIVE_START+7)
+#define SID_FILL_DEL_PRED		(DETECTIVE_START+8)
+#define SID_FILL_ADD_SUCC		(DETECTIVE_START+9)
+#define SID_FILL_DEL_SUCC		(DETECTIVE_START+10)
+#define SID_FILL_NONE			(DETECTIVE_START+11)
+#define SID_FILL_SELECT			(DETECTIVE_START+12)
+
+#define SID_DETECTIVE_INVALID   (DETECTIVE_START+13)
+
+#define SID_DETECTIVE_REFRESH   (DETECTIVE_START+14)
+#define SID_DETECTIVE_AUTO      (DETECTIVE_START+15)
+
+#define DETECTIVE_END			(DETECTIVE_START+20)
+
+#define SID_API_SLOTS			(DETECTIVE_END)
+//aus sfx: #define SID_ENTER_STRING		(SID_API_SLOTS)
+#define SID_INSERT_MATRIX		(SID_API_SLOTS+1)
+
+#define SID_DELETE_NOTE         (SID_API_SLOTS+2)
+
+
+#define SID_PREVIEW_START		(SID_API_SLOTS+20)
+#define SID_PREVIEW_NEXT		(SID_PREVIEW_START)
+#define SID_PREVIEW_PREVIOUS	(SID_PREVIEW_START+1)
+#define SID_PREVIEW_FIRST		(SID_PREVIEW_START+2)
+#define SID_PREVIEW_LAST		(SID_PREVIEW_START+3)
+#define SID_PREVIEW_GOTO		(SID_PREVIEW_START+4)
+#define SID_PREVIEW_ZOOMIN		(SID_PREVIEW_START+5)
+#define SID_PREVIEW_ZOOMOUT		(SID_PREVIEW_START+6)
+#define SID_PREVIEW_CLOSE		(SID_PREVIEW_START+7)
+#define SID_PREVIEW_MARGIN      (SID_PREVIEW_START+8)
+#define SID_PREVIEW_SCALINGFACTOR   (SID_PREVIEW_START+9)
+#define SID_PREVIEW_END			(SID_PREVIEW_START+20)
+
+//aus sfx: #define SID_KEYFUNC_START		(SID_PREVIEW_END+5)
+#define SID_CURSORDOWN_SEL		(SID_KEYFUNC_START + 0)
+#define SID_CURSORUP_SEL		(SID_KEYFUNC_START + 1)
+#define SID_CURSORLEFT_SEL		(SID_KEYFUNC_START + 2)
+#define SID_CURSORRIGHT_SEL		(SID_KEYFUNC_START + 3)
+#define SID_CURSORPAGEDOWN_SEL	(SID_KEYFUNC_START + 4)
+#define SID_CURSORPAGEUP_SEL	(SID_KEYFUNC_START + 5)
+
+#define SID_CURSORPAGELEFT_		(SID_KEYFUNC_START + 6)
+#define SID_CURSORPAGELEFT_SEL	(SID_KEYFUNC_START + 7)
+#define SID_CURSORPAGERIGHT_	(SID_KEYFUNC_START + 8)
+#define SID_CURSORPAGERIGHT_SEL	(SID_KEYFUNC_START + 9)
+
+#define SID_CURSORTOPOFFILE_SEL	(SID_KEYFUNC_START + 10)
+#define SID_CURSORENDOFFILE_SEL	(SID_KEYFUNC_START + 11)
+#define SID_CURSORHOME_SEL		(SID_KEYFUNC_START + 12)
+#define SID_CURSOREND_SEL		(SID_KEYFUNC_START + 13)
+#define SID_CURSORBLKUP			(SID_KEYFUNC_START + 14)
+#define SID_CURSORBLKDOWN		(SID_KEYFUNC_START + 15)
+#define SID_CURSORBLKLEFT		(SID_KEYFUNC_START + 16)
+#define SID_CURSORBLKRIGHT		(SID_KEYFUNC_START + 17)
+#define SID_CURSORBLKUP_SEL		(SID_KEYFUNC_START + 18)
+#define SID_CURSORBLKDOWN_SEL	(SID_KEYFUNC_START + 19)
+#define SID_CURSORBLKLEFT_SEL	(SID_KEYFUNC_START + 20)
+#define SID_CURSORBLKRIGHT_SEL	(SID_KEYFUNC_START + 21)
+
+#define SID_NEXT_TABLE			(SID_KEYFUNC_START + 22)
+#define SID_PREV_TABLE			(SID_KEYFUNC_START + 23)
+
+#define SID_NEXT_UNPROTECT		(SID_KEYFUNC_START + 24)
+#define SID_PREV_UNPROTECT		(SID_KEYFUNC_START + 25)
+
+#define SID_SELECT_COL			(SID_KEYFUNC_START + 26)
+#define SID_SELECT_ROW			(SID_KEYFUNC_START + 27)
+#define SID_SELECT_NONE			(SID_KEYFUNC_START + 28)
+#define SID_ALIGNCURSOR			(SID_KEYFUNC_START + 29)
+#define SID_MARKDATAAREA		(SID_KEYFUNC_START + 30)
+#define SID_SETINPUTMODE		(SID_KEYFUNC_START + 31)
+#define SID_DELETE_CONTENTS		(SID_KEYFUNC_START + 32)
+
+#define SID_MARKAREA			(SID_KEYFUNC_START + 33)
+
+#define SID_AUTOFILL			(SID_KEYFUNC_START + 34)
+#define FID_FILL_AUTO			(SID_KEYFUNC_START + 35)
+#define SID_CANCEL				(SID_KEYFUNC_START + 36)
+
+#define SID_CURSORENTERUP		(SID_KEYFUNC_START + 37)
+#define SID_CURSORENTERDOWN		(SID_KEYFUNC_START + 38)
+
+#define SID_MARKARRAYFORMULA    (SID_KEYFUNC_START + 39)
+
+#define SID_NEXT_TABLE_SEL      (SID_KEYFUNC_START + 40)
+#define SID_PREV_TABLE_SEL      (SID_KEYFUNC_START + 41)
+
+#define SID_KEYFUNC_END			(SID_KEYFUNC_START + 50)
+
+#define SID_NEW_SLOTS			(SID_KEYFUNC_END)
+#define SID_NEW_SLOTS_END		(SID_NEW_SLOTS+100)
+
+#define SID_NEW_TABLENAME		(SID_NEW_SLOTS+1)
+#define SID_COL_START			(SID_NEW_SLOTS+2)
+#define SID_ROW_START			(SID_NEW_SLOTS+3)
+#define SID_COL_END				(SID_NEW_SLOTS+4)
+#define SID_ROW_END				(SID_NEW_SLOTS+5)
+#define SID_KEEP_MARK			(SID_NEW_SLOTS+6)
+#define SID_FILL_DIR			(SID_NEW_SLOTS+7)
+#define SID_FILL_COUNT			(SID_NEW_SLOTS+8)
+#define SID_WITH_UNDO			(SID_NEW_SLOTS+9)
+#define FID_MERGE_TOGGLE        (SID_NEW_SLOTS+10)
+//aus sfx: #define SID_ATTR_SECIALCHAR		(SID_NEW_SLOTS+10)
+#define SID_ATTR_ROWHEADERS		(SID_NEW_SLOTS+11)
+#define SID_ATTR_COLHEADERS		(SID_NEW_SLOTS+12)
+
+#define SID_SC_CELLS			(SID_NEW_SLOTS+13)
+#define SID_SC_RANGE			(SID_NEW_SLOTS+14)
+#define SID_SC_SELECTION		(SID_NEW_SLOTS+15)
+#define SID_SC_CELLTEXT			(SID_NEW_SLOTS+16)
+
+#define SID_SC_NAME_TITLE		(SID_NEW_SLOTS+17)
+
+#define SID_SC_ACTIVECELL		(SID_NEW_SLOTS+18)
+#define SID_SC_ACTIVETAB		(SID_NEW_SLOTS+19)
+#define SID_RANGE_ROW			(SID_NEW_SLOTS+20)
+#define SID_RANGE_COL			(SID_NEW_SLOTS+21)
+#define SID_RANGE_TABLE			(SID_NEW_SLOTS+22)
+#define SID_RANGE_VALUE			(SID_NEW_SLOTS+23)
+#define SID_RANGE_FORMULA		(SID_NEW_SLOTS+24)
+#define SID_RANGE_TEXT			(SID_NEW_SLOTS+25)
+#define SID_RANGE_TEXTVALUE		(SID_NEW_SLOTS+26)
+#define SID_TABLE_ACTIVATE		(SID_NEW_SLOTS+27)
+#define SID_TABLES_GET			(SID_NEW_SLOTS+28)
+#define SID_PROP_INTERIOR		(SID_NEW_SLOTS+29)
+#define SID_PROP_FONT			(SID_NEW_SLOTS+30)
+
+#define SID_DEFINE_PRINTAREA		(SID_NEW_SLOTS+31)
+#define SID_DELETE_PRINTAREA		(SID_NEW_SLOTS+32)
+#define SID_CHANGE_PRINTAREA        (SID_NEW_SLOTS+33)
+#define SID_OPENDLG_EDIT_PRINTAREA	(SID_NEW_SLOTS+34)
+
+#define SID_OLE_OBJECT			(SID_NEW_SLOTS+35)
+#define SID_OLE_ACTIVATE		(SID_NEW_SLOTS+36)
+#define SID_OLE_DEACTIVATE		(SID_NEW_SLOTS+37)
+
+#define SID_TOGGLE_REL			(SID_NEW_SLOTS+38)
+#define SID_DATA_SELECT			(SID_NEW_SLOTS+39)
+
+//	Suchen & Ersetzen
+#define FID_SEARCH				(SID_NEW_SLOTS+40)
+#define FID_REPEAT_SEARCH		(SID_NEW_SLOTS+41)
+#define FID_REPLACE				(SID_NEW_SLOTS+42)
+#define FID_SEARCH_ALL			(SID_NEW_SLOTS+43)
+#define FID_REPLACE_ALL			(SID_NEW_SLOTS+44)
+#define FID_SEARCH_COUNT		(SID_NEW_SLOTS+45)
+
+#define SID_SC_SETTEXT			(SID_NEW_SLOTS+46)
+#define SID_RANGE_ADDRESS		(SID_NEW_SLOTS+47)
+#define SID_RANGE_OFFSET		(SID_NEW_SLOTS+48)
+#define SID_NUMBER_FORMAT		(SID_NEW_SLOTS+49)
+
+#define SID_OLE_SELECT			(SID_NEW_SLOTS+50)
+#define SID_SC_ACTIVEOBJECT		(SID_NEW_SLOTS+51)
+
+#define SID_RANGE_NOTETEXT		(SID_NEW_SLOTS+52)
+#define FID_INSERT_FILE			(SID_NEW_SLOTS+53)
+
+#define FID_VALIDATION			(SID_NEW_SLOTS+54)
+
+//	Slots fuer Toolbox Controller in der Werkzeugleiste
+#define SID_TBXCTL_INSERT		(SID_NEW_SLOTS+55)
+#define SID_TBXCTL_INSCELLS		(SID_NEW_SLOTS+56)
+#define SID_TBXCTL_INSOBJ		(SID_NEW_SLOTS+57)
+
+#define SID_DEFINE_COLROWNAMERANGES (SID_NEW_SLOTS+58)
+
+#define FID_NOTE_VISIBLE		(SID_NEW_SLOTS+59)
+
+//	Items fuer Gueltigkeit
+#define FID_VALID_MODE			(SID_NEW_SLOTS+60)
+#define FID_VALID_CONDMODE		(SID_NEW_SLOTS+61)
+#define FID_VALID_VALUE1		(SID_NEW_SLOTS+62)
+#define FID_VALID_VALUE2		(SID_NEW_SLOTS+63)
+#define FID_VALID_BLANK			(SID_NEW_SLOTS+64)
+#define FID_VALID_SHOWHELP		(SID_NEW_SLOTS+65)
+#define FID_VALID_HELPTITLE		(SID_NEW_SLOTS+66)
+#define FID_VALID_HELPTEXT		(SID_NEW_SLOTS+67)
+#define FID_VALID_SHOWERR		(SID_NEW_SLOTS+68)
+#define FID_VALID_ERRSTYLE		(SID_NEW_SLOTS+69)
+#define FID_VALID_ERRTITLE		(SID_NEW_SLOTS+70)
+#define FID_VALID_ERRTEXT		(SID_NEW_SLOTS+71)
+
+#define SID_REFRESH_DBAREA		(SID_NEW_SLOTS+72)
+#define SID_RANGE_REGION		(SID_NEW_SLOTS+73)
+
+#define FID_FOCUS_POSWND		(SID_NEW_SLOTS+74)
+
+//	einzelne Slots fuer verschiedene Unterstreich-Arten (Popup-Menu)
+#define SID_ULINE_VAL_NONE		(SID_NEW_SLOTS+75)
+#define SID_ULINE_VAL_SINGLE	(SID_NEW_SLOTS+76)
+#define SID_ULINE_VAL_DOUBLE	(SID_NEW_SLOTS+77)
+#define SID_ULINE_VAL_DOTTED	(SID_NEW_SLOTS+78)
+
+#define FID_DEL_MANUALBREAKS	(SID_NEW_SLOTS+79)
+#define SID_ADD_PRINTAREA		(SID_NEW_SLOTS+80)
+#define FID_ADJUST_PRINTZOOM	(SID_NEW_SLOTS+81)
+#define FID_RESET_PRINTZOOM		(SID_NEW_SLOTS+82)
+
+#define SID_TABLES_COUNT		(SID_NEW_SLOTS+83)
+#define SID_ACTIVE_OBJ_NAME		(SID_NEW_SLOTS+84)
+#define SID_OBJECT_LEFT			(SID_NEW_SLOTS+85)
+#define SID_OBJECT_TOP			(SID_NEW_SLOTS+86)
+#define SID_OBJECT_WIDTH		(SID_NEW_SLOTS+87)
+#define SID_OBJECT_HEIGHT		(SID_NEW_SLOTS+88)
+
+#define SID_PIVOT_CREATE		(SID_NEW_SLOTS+89)
+#define SID_PIVOT_FIELDS		(SID_NEW_SLOTS+90)
+#define SID_PFIELD_NAME			(SID_NEW_SLOTS+91)
+#define SID_PFIELD_ORIENTATION	(SID_NEW_SLOTS+92)
+#define SID_PFIELD_FUNCTION		(SID_NEW_SLOTS+93)
+#define SID_PIVOT_GET			(SID_NEW_SLOTS+94)
+
+#define SID_DELETE_SCENARIO		(SID_NEW_SLOTS+95)
+#define SID_EDIT_SCENARIO		(SID_NEW_SLOTS+96)
+
+#define SID_GET_CLPBRD_FORMAT_COUNT		(SID_NEW_SLOTS+97)
+#define SID_GET_CLPBRD_FORMAT_BY_IDX	(SID_NEW_SLOTS+98)
+#define SID_GET_CLPBRD_FORMAT_NAME		(SID_NEW_SLOTS+99)
+
+// idl Parameter ---------------------------------------------------------
+
+//aus sfx: #define FN_PARAM_1				(SC_PARAM_START)
+//aus sfx: #define FN_PARAM_2				(SC_PARAM_START+1)
+//aus sfx: #define FN_PARAM_3				(SC_PARAM_START+2)
+//aus sfx: #define FN_PARAM_4				(SC_PARAM_START+3)
+//aus sfx: #define FN_PARAM_5				(SC_PARAM_START+4)
+//aus sfx: #define FN_PARAM_6				(SC_PARAM_START+5)
+//aus sfx: #define FN_PARAM_7				(SC_PARAM_START+6)
+//aus sfx: #define FN_PARAM_8				(SC_PARAM_START+7)
+#define FN_PARAM_9				(FN_PARAM_8+1)
+
+#define SID_SORT_BYROW			(SC_PARAM_START)
+#define SID_SORT_HASHEADER		(SC_PARAM_START+1)
+#define SID_SORT_CASESENS		(SC_PARAM_START+2)
+#define SID_SORT_ATTRIBS		(SC_PARAM_START+3)
+#define SID_SORT_USERDEF		(SC_PARAM_START+4)
+
+// Resourcen -------------------------------------------------------------
+
+#define RID_OBJECTBAR_APP		(SC_RESOURCE_START)
+#define RID_OBJECTBAR_FORMAT	(SC_RESOURCE_START+1)
+#define RID_OBJECTBAR_INPUT		(SC_RESOURCE_START+2)
+#define RID_POPUP_CELLS			(SC_RESOURCE_START+3)
+#define RID_POPUP_DRAW			(SC_RESOURCE_START+4)
+#define RID_TEXT_TOOLBOX		(SC_RESOURCE_START+5)
+#define RID_OBJECTBAR_PREVIEW	(SC_RESOURCE_START+6)
+#define RID_POPUP_PREVIEW		(SC_RESOURCE_START+7)
+#define RID_POPUP_OLE			(SC_RESOURCE_START+8)
+#define RID_POPUP_CHART			(SC_RESOURCE_START+9)
+//#define RID_ANCHORBITMAP		(SC_RESOURCE_START+10)
+//#define RID_GRAYANCHORBITMAP	(SC_RESOURCE_START+11)
+#define RID_OUTLINEBITMAPS		(SC_RESOURCE_START+12)
+#define RID_DRAW_WIN			(SC_RESOURCE_START+13)
+#define RID_CNTRLR_WIN			(SC_RESOURCE_START+14)
+#define RID_GLOBSTR             (SC_RESOURCE_START+15)
+#define RID_ALIGNMENT_WIN		(SC_RESOURCE_START+19)
+#define RID_SCFUNCTIONS			(SC_RESOURCE_START+20)
+#define RID_POPUP_PIVOT			(SC_RESOURCE_START+21)
+#define RID_IMGLIST_INPUTWIN    (SC_RESOURCE_START+22)
+#define RID_ERRHDLSC			(SC_RESOURCE_START+23)
+#define RID_POPUP_GRAPHIC		(SC_RESOURCE_START+24)
+#define RID_SCTEAMDLGBMP1		(SC_RESOURCE_START+25)
+#define RID_SCTEAMDLGBMP2		(SC_RESOURCE_START+26)
+#define RID_SCTEAMDLGBMP3		(SC_RESOURCE_START+27)
+#define RID_POPUP_DRAWTEXT		(SC_RESOURCE_START+29)
+#define RID_MN_FORMAT_ALGN	 	(SC_RESOURCE_START+30)
+#define RID_MN_FORMAT_STYLE		(SC_RESOURCE_START+31)
+#define RID_MN_FORMAT_LINESPACE	(SC_RESOURCE_START+32)
+#define RID_POPUP_EDIT			(SC_RESOURCE_START+33)
+#define RID_POPUP_AUDIT			(SC_RESOURCE_START+34)
+#define RID_OBJECTBAR_TOOLS		(SC_RESOURCE_START+35)
+// free
+// free
+#define RID_TBXCTL_INSERT		(SC_RESOURCE_START+38)
+#define RID_TBXCTL_INSCELLS		(SC_RESOURCE_START+39)
+#define RID_TBXCTL_INSOBJ		(SC_RESOURCE_START+40)
+// free
+// free
+#define RID_SC_FUNCTION_DESCRIPTIONS1	(SC_RESOURCE_START+43)
+#define RID_SC_FUNCTION_DESCRIPTIONS2	(SC_RESOURCE_START+44)
+#define RID_POPUP_CONTROL		(SC_RESOURCE_START+45)
+#define RID_POPUP_PAGEBREAK		(SC_RESOURCE_START+46)
+// free
+#define RID_POPUP_DRAWFORM		(SC_RESOURCE_START+48)
+#define RID_SC_ADDIN_ROT13		(SC_RESOURCE_START+50)
+#define RID_SC_ADDIN_DFA		(SC_RESOURCE_START+51)
+#define RID_IMAGELIST_NAVCONT	(SC_RESOURCE_START+52)
+#define RID_DRAW_OBJECTBAR		(SC_RESOURCE_START+53)
+#define RID_GRAPHIC_OBJECTBAR	(SC_RESOURCE_START+54)
+// free
+// free
+#define RID_IMAGELIST_H_NAVCONT	(SC_RESOURCE_START+57)
+#define RID_OUTLINEBITMAPS_H    (SC_RESOURCE_START+58)
+#define RID_MEDIA_OBJECTBAR		(SC_RESOURCE_START+60)
+#define RID_POPUP_MEDIA			(SC_RESOURCE_START+61)
+#define RID_FUNCTION_CATEGORIES	(SC_RESOURCE_START+62)
+
+#define STR_START               (SC_RESOURCE_START+100)
+#define STR_ROWHEIGHT			(STR_START)
+#define STR_ROWHEIGHT_TITLE		(STR_START + 1)
+#define STR_OPT_ROWHEIGHT		(STR_START + 2)
+#define STR_OPT_ROWHEIGHT_TITLE	(STR_START + 3)
+#define STR_COLWIDTH			(STR_START + 4)
+#define STR_COLWIDTH_TITLE		(STR_START + 5)
+#define STR_OPT_COLWIDTH		(STR_START + 6)
+#define STR_OPT_COLWIDTH_TITLE	(STR_START + 7)
+#define	SCSTR_UNDEFINED			(STR_START + 8)
+#define	SCSTR_NONAME			(STR_START + 9)
+#define	SCSTR_NONE				(STR_START + 10)
+#define	SCSTR_EMPTY				(STR_START + 11)
+#define	SCSTR_NOTEMPTY			(STR_START + 12)
+#define SCSTR_COLUMN            (STR_START + 13)
+#define SCSTR_ROW               (STR_START + 14)
+#define SCSTR_NEW               (STR_START + 15)
+#define SCSTR_ADD               (STR_START + 16)
+#define SCSTR_REMOVE            (STR_START + 17)
+#define SCSTR_CANCEL            (STR_START + 18)
+#define SCSTR_MODIFY            (STR_START + 19)
+#define SCSTR_SHOWTABLE			(STR_START + 20)
+#define SCSTR_HIDDENTABLES		(STR_START + 21)
+#define SCSTR_SELECTDB			(STR_START + 22)
+#define SCSTR_AREAS				(STR_START + 23)
+#define SCSTR_TABLE				(STR_START + 24)
+#define SCSTR_NAME				(STR_START + 25)
+#define SCSTR_INSTABLE			(STR_START + 26)
+#define SCSTR_APDTABLE			(STR_START + 27)
+#define SCSTR_RENAMETAB			(STR_START + 28)
+#define STR_INSERTGRAPHIC		(STR_START + 29)
+//#define STR_BASIC_IDE           (STR_START + 30)
+#define SCSTR_APPLICATION		(STR_START + 31)
+#define SCSTR_DOCSHELL			(STR_START + 32)
+#define SCSTR_TABVIEWSHELL		(STR_START + 33)
+#define SCSTR_EDITSHELL			(STR_START + 34)
+#define SCSTR_DRAWSHELL			(STR_START + 35)
+#define SCSTR_DRAWTEXTSHELL		(STR_START + 36)
+#define SCSTR_NEWTABLE          (STR_START + 37)
+#define SCSTR_PREVIEWSHELL		(STR_START + 38)
+
+#define SCSTR_PROTECTDOC		(STR_START + 39)
+#define SCSTR_UNPROTECTDOC		(STR_START + 40)
+#define SCSTR_PROTECTTAB		(STR_START + 41)
+#define SCSTR_UNPROTECTTAB		(STR_START + 42)
+#define SCSTR_PASSWORD			(STR_START + 43)
+#define SCSTR_PASSWORDOPT		(STR_START + 44)
+#define SCSTR_WRONGPASSWORD		(STR_START + 45)
+
+#define SCSTR_PIVOTSHELL		(STR_START + 46)
+#define SCSTR_END				(STR_START + 47)
+#define SCSTR_STAT_PRINT		(STR_START + 48)
+
+#define SCSTR_UNKNOWN           (STR_START + 49)
+#define SCSTR_CHAR_ATTRS        (STR_START + 50)
+#define	SCSTR_ALL				(STR_START + 51)
+#define	SCSTR_STDFILTER			(STR_START + 52)
+
+// Cfg-Item-Namen
+#define SCSTR_CFG_APP           (STR_START + 53)
+#define SCSTR_CFG_DOC           (STR_START + 54)
+#define SCSTR_CFG_VIEW          (STR_START + 55)
+#define SCSTR_CFG_SPELLCHECK    (STR_START + 56)
+#define SCSTR_CFG_PRINT		    (STR_START + 57)
+
+#define SCSTR_AUDITSHELL		(STR_START + 58)
+
+#define SCSTR_CHARSET_USER		(STR_START + 59)
+#define SCSTR_COLUMN_USER		(STR_START + 60)
+#define SCSTR_FIELDSEP			(STR_START + 61)
+#define SCSTR_TEXTSEP			(STR_START + 62)
+
+#define SCSTR_30_APPLICATION	(STR_START + 63)
+#define SCSTR_30_LONG_DOCNAME	(STR_START + 64)
+
+#define SCSTR_CFG_INPUT		    (STR_START + 65)
+
+#define	SCSTR_TOP10FILTER		(STR_START + 66)
+
+#define SCSTR_CFG_NAVIPI        (STR_START + 67)
+
+#define SCSTR_40_APPLICATION	(STR_START + 68)
+#define SCSTR_40_LONG_DOCNAME	(STR_START + 69)
+
+#define SCSTR_DRAWFORMSHELL		(STR_START + 70)
+#define SCSTR_CELLSHELL			(STR_START + 71)
+#define SCSTR_FORMATSHELL		(STR_START + 72)
+#define SCSTR_OLEOBJECTSHELL	(STR_START + 73)
+#define SCSTR_CHARTSHELL		(STR_START + 74)
+#define SCSTR_GRAPHICSHELL		(STR_START + 75)
+#define SCSTR_PAGEBREAKSHELL	(STR_START + 76)
+
+#define SCSTR_GRFILTER_OPENERROR     (STR_START + 77)
+#define SCSTR_GRFILTER_IOERROR       (STR_START + 78)
+#define SCSTR_GRFILTER_FORMATERROR   (STR_START + 79)
+#define SCSTR_GRFILTER_VERSIONERROR  (STR_START + 80)
+#define SCSTR_GRFILTER_FILTERERROR   (STR_START + 81)
+#define SCSTR_GRFILTER_TOOBIG        (STR_START + 82)
+#define SCSTR_UNDO_GRAFFILTER        (STR_START + 83)
+
+#define SCSTR_50_APPLICATION	(STR_START + 84)
+#define SCSTR_50_LONG_DOCNAME	(STR_START + 85)
+#define SCSTR_CHG_PROTECT       (STR_START + 86)
+#define SCSTR_CHG_UNPROTECT     (STR_START + 87)
+
+// #98185#
+#define STR_CAPTION_DEFAULT_TEXT	(STR_START + 88)
+
+// dialog: Select Sheets
+#define STR_DLG_SELECTTABLES_TITLE  (STR_START + 89)
+#define STR_DLG_SELECTTABLES_LBNAME (STR_START + 90)
+
+// #101160# Replace cell contents warning
+#define STR_REPLCELLSWARN           (STR_START + 91)
+
+#define SCSTR_DPFUNCLISTBOX         (STR_START + 92)
+#define STR_PRINT_NOTHING           (STR_START + 93)
+#define SCSTR_ALLFILTER             (STR_START + 94)
+#define SCSTR_MOREBTN_MOREOPTIONS   (STR_START + 95)
+#define SCSTR_MOREBTN_FEWEROPTIONS   (STR_START + 96)
+
+// Items
+
+#define SCSTR_HOR_JUSTIFY_LEFT		(STR_START + 100)
+#define SCSTR_HOR_JUSTIFY_CENTER	(STR_START + 101)
+#define SCSTR_HOR_JUSTIFY_RIGHT		(STR_START + 102)
+#define SCSTR_HOR_JUSTIFY_BLOCK		(STR_START + 103)
+#define SCSTR_HOR_JUSTIFY_REPEAT	(STR_START + 104)
+#define SCSTR_HOR_JUSTIFY_STANDARD	(STR_START + 105)
+#define SCSTR_VER_JUSTIFY_TOP		(STR_START + 106)
+#define SCSTR_VER_JUSTIFY_CENTER	(STR_START + 107)
+#define SCSTR_VER_JUSTIFY_BOTTOM	(STR_START + 108)
+#define SCSTR_VER_JUSTIFY_STANDARD	(STR_START + 109)
+#define SCSTR_ORIENTATION_TOPBOTTOM	(STR_START + 110)
+#define SCSTR_ORIENTATION_BOTTOMTOP	(STR_START + 111)
+#define SCSTR_ORIENTATION_STANDARD	(STR_START + 112)
+
+// Accessibility ------------------------------------
+
+// CSV import
+#define STR_ACC_CSVRULER_NAME       (STR_START + 150)
+#define STR_ACC_CSVRULER_DESCR      (STR_START + 151)
+#define STR_ACC_CSVGRID_NAME        (STR_START + 152)
+#define STR_ACC_CSVGRID_DESCR       (STR_START + 153)
+
+// Document
+#define STR_ACC_DOC_NAME            (STR_START + 154)
+#define STR_ACC_DOC_DESCR           (STR_START + 155)
+#define STR_ACC_TABLE_NAME          (STR_START + 156)
+#define STR_ACC_TABLE_DESCR         (STR_START + 157)
+#define STR_ACC_CELL_NAME           (STR_START + 158)
+#define STR_ACC_CELL_DESCR          (STR_START + 159)
+// Preview
+#define STR_ACC_PREVIEWDOC_NAME     (STR_START + 160)
+#define STR_ACC_PREVIEWDOC_DESCR    (STR_START + 161)
+#define STR_ACC_HEADERCELL_NAME     (STR_START + 162)
+#define STR_ACC_HEADERCELL_DESCR    (STR_START + 163)
+#define STR_ACC_LEFTAREA_NAME       (STR_START + 164)
+#define STR_ACC_LEFTAREA_DESCR      (STR_START + 165)
+#define STR_ACC_CENTERAREA_NAME     (STR_START + 166)
+#define STR_ACC_CENTERAREA_DESCR    (STR_START + 167)
+#define STR_ACC_RIGHTAREA_NAME      (STR_START + 168)
+#define STR_ACC_RIGHTAREA_DESCR     (STR_START + 169)
+#define STR_ACC_HEADER_NAME         (STR_START + 170)
+#define STR_ACC_HEADER_DESCR        (STR_START + 171)
+#define STR_ACC_FOOTER_NAME         (STR_START + 172)
+#define STR_ACC_FOOTER_DESCR        (STR_START + 173)
+
+// Editline
+#define STR_ACC_EDITLINE_NAME       (STR_START + 174)
+#define STR_ACC_EDITLINE_DESCR      (STR_START + 175)
+
+// EditCell
+#define STR_ACC_EDITCELL_NAME       (STR_START + 176)
+#define STR_ACC_EDITCELL_DESCR      (STR_START + 177)
+
+// DataPilot
+#define STR_ACC_DATAPILOT_ROW_DESCR (STR_START + 178)
+#define STR_ACC_DATAPILOT_COL_DESCR (STR_START + 179)
+#define STR_ACC_DATAPILOT_DATA_DESCR (STR_START + 180)
+#define STR_ACC_DATAPILOT_SEL_DESCR (STR_START + 181)
+
+// --------------------------------------------------
+
+#define SCSTR_HUMAN_SCDOC_NAME      (STR_START + 210)
+#define SCSTR_SHORT_SCDOC_NAME      (STR_START + 211)
+#define SCSTR_LONG_SCDOC_NAME       (STR_START + 212)
+
+#define SCSTR_CLPBRD_CLEAR			(STR_START + 213)
+
+#define SCSTR_FORMULA_AUTOCORRECTION	(STR_START + 214)
+
+#define SCSTR_RENAMEOBJECT			(STR_START + 215)
+
+// Navigator - in der Reihenfolge wie SC_CONTENT_...
+#define SCSTR_CONTENT_ROOT		(STR_START + 250)
+#define SCSTR_CONTENT_TABLE		(STR_START + 251)
+#define SCSTR_CONTENT_RANGENAME	(STR_START + 252)
+#define SCSTR_CONTENT_DBAREA	(STR_START + 253)
+#define SCSTR_CONTENT_GRAPHIC	(STR_START + 254)
+#define SCSTR_CONTENT_OLEOBJECT	(STR_START + 255)
+#define SCSTR_CONTENT_NOTE		(STR_START + 256)
+#define SCSTR_CONTENT_AREALINK	(STR_START + 257)
+#define SCSTR_CONTENT_DRAWING	(STR_START + 258)
+//	hier ein wenig Platz fuer Erweiterungen
+
+// Eingabezeile, Quickhelp-Strings (HelpText jetzt per HelpId aus Hilfe)
+#define SCSTR_QHELP_INPUTWND	(STR_START + 307)
+#define SCSTR_QHELP_POSWND		(STR_START + 308)
+#define SCSTR_QHELP_BTNCALC		(STR_START + 309)
+#define SCSTR_QHELP_BTNOK		(STR_START + 310)
+#define SCSTR_QHELP_BTNCANCEL	(STR_START + 311)
+#define SCSTR_QHELP_BTNSUM		(STR_START + 312)
+#define SCSTR_QHELP_BTNEQUAL	(STR_START + 313)
+
+// Validator
+#define SCSTR_VALID_MINIMUM     (STR_START + 314)
+#define SCSTR_VALID_MAXIMUM     (STR_START + 315)
+#define SCSTR_VALID_VALUE       (STR_START + 316)
+#define SCSTR_VALID_RANGE       (STR_START + 317)
+#define SCSTR_VALID_LIST        (STR_START + 318)
+
+// Formulator
+#define SCSTR_FUDB				(STR_START + 389)
+#define SCSTR_FUDATE			(STR_START + 390)
+#define SCSTR_FUFIN				(STR_START + 391)
+#define SCSTR_FUINFO			(STR_START + 392)
+#define SCSTR_FULOG				(STR_START + 393)
+#define SCSTR_FUMATHS			(STR_START + 394)
+#define SCSTR_FUSTAT			(STR_START + 395)
+#define SCSTR_FUTAB				(STR_START + 396)
+#define SCSTR_FUTEXT			(STR_START + 397)
+//
+#define SCSTR_COMPILER_STRINGS  (STR_START + 398)
+#define SCSTR_FILTER_STRINGS    (STR_START + 399)
+#define SCSTR_COMPILER_INTL_STR (STR_START + 400)
+
+// Media shell
+#define SCSTR_MEDIASHELL		(STR_START + 401)
+
+#define RID_SCSTR_ONCLICK       (STR_START + 402)
+
+#define STR_END                 RID_SCSTR_ONCLICK
+
+#define BMP_START				(STR_END)
+
+// Navigator
+// not used anymore: RID_BMP_EXPAND, RID_BMP_COLLAPSE
+//#define    RID_BMP_EXPAND          (BMP_START)
+//#define    RID_BMP_COLLAPSE        (BMP_START + 1)
+#define RID_IMG_DROP_URL		(BMP_START + 2)
+#define RID_IMG_DROP_LINK		(BMP_START + 3)
+#define RID_IMG_DROP_COPY		(BMP_START + 4)
+#define RID_IMG_H_DROP_URL		(BMP_START + 5)
+#define RID_IMG_H_DROP_LINK		(BMP_START + 6)
+#define RID_IMG_H_DROP_COPY		(BMP_START + 7)
+
+#define RID_SCPTR_PIVOTCOL      (BMP_START + 81)
+#define RID_SCPTR_PIVOTROW      (BMP_START + 82)
+#define RID_SCPTR_DETECTIVE     (BMP_START + 83)
+#define RID_SCPTR_CHART			(BMP_START + 84)
+
+#define RID_SCICN_DOCUMENT      (BMP_START + 95)
+#define RID_SCICN_TEMPLATE      (BMP_START + 96)
+#define RID_SCICN_SC10DOC       (BMP_START + 97)
+
+#define BMP_END                 (BMP_START + 100)
+
+#define SC_DIALOGS_START		(BMP_END)
+#define RID_SCDLG_ATTR			(SC_DIALOGS_START)
+#define RID_SCPAGE_NUMBER		(SC_DIALOGS_START + 1)
+#define RID_SCPAGE_ALIGNMENT	(SC_DIALOGS_START + 2)
+#define RID_SCPAGE_PROTECTION  	(SC_DIALOGS_START + 3)
+#define RID_SCDLG_SORT			(SC_DIALOGS_START + 5)
+#define RID_SCPAGE_SORT_FIELDS	(SC_DIALOGS_START + 6)
+#define RID_SCPAGE_SORT_OPTIONS	(SC_DIALOGS_START + 7)
+#define RID_SCDLG_FILTER		(SC_DIALOGS_START + 8)
+#define RID_SCDLG_SPEC_FILTER	(SC_DIALOGS_START + 9)
+#define RID_SCMISCDLGS			(SC_DIALOGS_START + 10)
+#define RID_SCDLG_DELCELL		(SC_DIALOGS_START + 11)
+#define RID_SCDLG_INSCELL		(SC_DIALOGS_START + 12)
+#define RID_SCDLG_DELCONT		(SC_DIALOGS_START + 13)
+#define RID_SCDLG_INSCONT		(SC_DIALOGS_START + 14)
+#define RID_SCDLG_MOVETAB		(SC_DIALOGS_START + 15)
+#define RID_SCDLG_STRINPUT		(SC_DIALOGS_START + 16)
+#define RID_SCDLG_MTRINPUT		(SC_DIALOGS_START + 17)
+#define RID_SCDLG_SELENTRY		(SC_DIALOGS_START + 18)
+#define RID_SCDLG_FILLSERIES	(SC_DIALOGS_START + 19)
+#define RID_SCDLG_AUTOFORMAT    (SC_DIALOGS_START + 20)
+#define RID_SCDLG_GROUP         (SC_DIALOGS_START + 21)
+#define RID_SCDLG_NAMES         (SC_DIALOGS_START + 22)
+#define RID_SCDLG_DBNAMES       (SC_DIALOGS_START + 23)
+#define RID_SCDLG_PRINTOPTIONS  (SC_DIALOGS_START + 24)
+#define RID_SCPAGE_PRINTOPTIONS (SC_DIALOGS_START + 25)
+#define RID_SCDLG_SOLVER        (SC_DIALOGS_START + 26)
+#define RID_SCDLG_SUBTOTALS		(SC_DIALOGS_START + 27)
+#define RID_SUBTBASE			(SC_DIALOGS_START + 28)
+#define RID_SCPAGE_SUBT_OPTIONS	(SC_DIALOGS_START + 29)
+#define RID_SCDLG_OPTIONS       (SC_DIALOGS_START + 30)
+#define RID_SCPAGE_USERLISTS    (SC_DIALOGS_START + 31)
+#define RID_SCDLG_PIVOTFILTER   (SC_DIALOGS_START + 33)
+#define RID_SCDLG_PIVOT_LAYOUT  (SC_DIALOGS_START + 34)
+#define RID_SCDLG_CONSOLIDATE   (SC_DIALOGS_START + 35)
+#define RID_SCTBXWND_SCENARIO   (SC_DIALOGS_START + 36)
+#define RID_SCDLG_FORMULATOR	(SC_DIALOGS_START + 37)
+#define RID_SCDLG_PIVOTSUBT     (SC_DIALOGS_START + 38)
+#define RID_SCDLG_NEWSCENARIO   (SC_DIALOGS_START + 39)
+#define RID_SCDLG_FORMULA		(SC_DIALOGS_START + 40)
+#define RID_SCDLG_ARGUMENTS     (SC_DIALOGS_START + 41)
+#define RID_SCDLG_INSERT_TABLE  (SC_DIALOGS_START + 42)
+#define RID_SCPAGE_TABLE        (SC_DIALOGS_START + 43)
+#define RID_SCPAGE_AREAS        (SC_DIALOGS_START + 44)
+#define RID_SCDLG_STYLES_START	(SC_DIALOGS_START + 45)
+#define RID_SCDLG_STYLES_CHAR	(SC_DIALOGS_START + 45)
+#define RID_SCDLG_STYLES_PAR	(SC_DIALOGS_START + 46)
+#define RID_SCDLG_STYLES_FRAME	(SC_DIALOGS_START + 47)
+#define RID_SCDLG_STYLES_PAGE	(SC_DIALOGS_START + 48)
+#define RID_SCDLG_STYLES_END	(SC_DIALOGS_START + 48)
+#define RID_HFBASE			    (SC_DIALOGS_START + 49)
+#define RID_SCDLG_HFEDIT	    (SC_DIALOGS_START + 50)
+#define RID_SCDLG_HFEDIT_ALL    (SC_DIALOGS_START + 51)
+#define RID_SCDLG_HFED_HEADER   (SC_DIALOGS_START + 52)
+#define RID_SCDLG_HFED_FOOTER	(SC_DIALOGS_START + 53)
+#define RID_SCBTN_HFEDIT        (SC_DIALOGS_START + 54)
+#define RID_SCPAGE_VIEW		    (SC_DIALOGS_START + 55)
+#define RID_SCPAGE_CALC		    (SC_DIALOGS_START + 56)
+#define RID_SCDLG_NAVIGATOR	    (SC_DIALOGS_START + 57)
+#define RID_SCDLG_TABOP		    (SC_DIALOGS_START + 58)
+#define RID_SCDLG_IMPORTOPT		(SC_DIALOGS_START + 59)
+#define RID_POPUP_ROWHEADER     (SC_DIALOGS_START + 60)
+#define RID_POPUP_COLHEADER     (SC_DIALOGS_START + 61)
+#define RID_SCDLG_HFEDIT_SHDR   (SC_DIALOGS_START + 62)
+#define RID_SCDLG_HFEDIT_SFTR   (SC_DIALOGS_START + 63)
+#define RID_SCDLG_HFEDIT_LEFTHEADER	    (SC_DIALOGS_START + 64)
+#define RID_SCDLG_HFEDIT_RIGHTHEADER    (SC_DIALOGS_START + 65)
+#define RID_SCDLG_HFEDIT_LEFTFOOTER	    (SC_DIALOGS_START + 66)
+#define RID_SCDLG_HFEDIT_RIGHTFOOTER	(SC_DIALOGS_START + 67)
+#define RID_SCDLG_HFEDIT_HEADER		    (SC_DIALOGS_START + 68)
+#define RID_SCDLG_HFEDIT_FOOTER			(SC_DIALOGS_START + 69)
+#define RID_SCPAGE_PRINT				(SC_DIALOGS_START + 70)
+#define RID_SCDLG_COLORROW              (SC_DIALOGS_START + 71)
+#define RID_SCDLG_NAMES_PASTE           (SC_DIALOGS_START + 72)
+#define RID_SCDLG_NAMES_CREATE          (SC_DIALOGS_START + 73)
+#define RID_SCDLG_NAMES_APPLY           (SC_DIALOGS_START + 74) //NYI
+#define RID_SCDLG_TEAM		            (SC_DIALOGS_START + 75)
+
+#define RID_SCDLG_CHAR			        (SC_DIALOGS_START + 76)
+#define RID_SCDLG_PARAGRAPH		        (SC_DIALOGS_START + 77)
+//#define RID_SCDLG_CHARTRANGE	        (SC_DIALOGS_START + 78)
+
+#define RID_SCPAGE_STAT		    		(SC_DIALOGS_START + 79)
+#define RID_SCDLG_CHARTCOLROW	        (SC_DIALOGS_START + 80)
+#define RID_SCDLG_AREAS					(SC_DIALOGS_START + 81)
+
+#define RID_SCDLG_EDITCHAR		        (SC_DIALOGS_START + 82)
+
+	//	Popup fuer Statusbar-Controller
+#define RID_POPUP_SUMCTL				(SC_DIALOGS_START + 83)
+#define RID_SUMCTL_SUM					(SC_DIALOGS_START + 84)
+#define RID_SUMCTL_MIN					(SC_DIALOGS_START + 85)
+#define RID_SUMCTL_MAX					(SC_DIALOGS_START + 86)
+#define RID_SUMCTL_COUNT				(SC_DIALOGS_START + 87)
+#define RID_SUMCTL_COUNT2				(SC_DIALOGS_START + 88)
+#define RID_SUMCTL_AVG					(SC_DIALOGS_START + 89)
+#define RID_SUMCTL_NONE					(SC_DIALOGS_START + 90)
+
+#define RID_SCDLG_ASCII			        (SC_DIALOGS_START + 91)
+
+	//	Popup fuer Drop-Modus im Navigator
+#define RID_POPUP_DROPMODE				(SC_DIALOGS_START + 92)
+#define RID_DROPMODE_URL				(SC_DIALOGS_START + 93)
+#define RID_DROPMODE_LINK				(SC_DIALOGS_START + 94)
+#define RID_DROPMODE_COPY				(SC_DIALOGS_START + 95)
+#define RID_SCDLG_CONDFORMAT			(SC_DIALOGS_START + 96)
+
+#define RID_SCPAGE_SUBT_GROUP1			(SC_DIALOGS_START + 97)
+#define RID_SCPAGE_SUBT_GROUP2			(SC_DIALOGS_START + 98)
+#define RID_SCPAGE_SUBT_GROUP3			(SC_DIALOGS_START + 99)
+
+#define RID_SCPAGE_HFED_HL				(SC_DIALOGS_START + 100)
+#define RID_SCPAGE_HFED_HR				(SC_DIALOGS_START + 101)
+#define RID_SCPAGE_HFED_FL				(SC_DIALOGS_START + 102)
+#define RID_SCPAGE_HFED_FR				(SC_DIALOGS_START + 103)
+
+// Ableitungen von RID_SCDLG_MTRINPUT
+#define RID_SCDLG_COL_MAN				(SC_DIALOGS_START + 104)
+#define RID_SCDLG_COL_OPT				(SC_DIALOGS_START + 105)
+#define RID_SCDLG_ROW_MAN				(SC_DIALOGS_START + 106)
+#define RID_SCDLG_ROW_OPT				(SC_DIALOGS_START + 107)
+
+// Ableitungen von RID_SCDLG_SELENTRY
+#define RID_SCDLG_SELECTDB				(SC_DIALOGS_START + 108)
+#define RID_SCDLG_SHOW_TAB				(SC_DIALOGS_START + 109)
+
+// Ableitungen von RID_SCDLG_GROUP
+#define RID_SCDLG_GRP_MAKE				(SC_DIALOGS_START + 110)
+#define RID_SCDLG_GRP_KILL				(SC_DIALOGS_START + 111)
+
+#define RID_SCDLG_COLROWNAMERANGES		(SC_DIALOGS_START + 112)
+
+#define RID_SCPAGE_CONTENT				(SC_DIALOGS_START + 113)
+#define RID_SCPAGE_LAYOUT               (SC_DIALOGS_START + 114)
+#define RID_SCPAGE_INPUT				(SC_DIALOGS_START + 115)
+
+#define RID_SCTAB_PARAMETER				(SC_DIALOGS_START + 116)
+#define RID_SCTAB_FUNCTION				(SC_DIALOGS_START + 117)
+#define RID_SCTAB_STRUCT				(SC_DIALOGS_START + 118)
+
+#define RID_SCDLG_CHANGES				(SC_DIALOGS_START + 119)
+
+#define RID_POPUP_NAVIPI_SCENARIO		(SC_DIALOGS_START + 120)
+#define RID_NAVIPI_SCENARIO_DELETE		(SC_DIALOGS_START + 121)
+#define RID_NAVIPI_SCENARIO_EDIT		(SC_DIALOGS_START + 122)
+
+#define RID_SCDLG_HIGHLIGHT_CHANGES		(SC_DIALOGS_START + 123)
+#define RID_SCPAGE_OPREDLINE			(SC_DIALOGS_START + 124)
+
+#define RID_SCDLG_SIMPLEREF				(SC_DIALOGS_START + 125)
+#define WID_SIMPLE_REF					(SC_DIALOGS_START + 126)
+#define RID_POPUP_CHANGES				(SC_DIALOGS_START + 127)
+#define RID_SCPAGE_OPTLOAD				(SC_DIALOGS_START + 128)
+
+#define RID_SCDLG_DAPITYPE				(SC_DIALOGS_START + 129)
+#define RID_SCDLG_DAPISERVICE			(SC_DIALOGS_START + 130)
+#define RID_SCDLG_DAPIDATA				(SC_DIALOGS_START + 131)
+
+#define RID_SCDLG_LINKAREA				(SC_DIALOGS_START + 132)
+#define RID_SCDLG_DPDATAFIELD           (SC_DIALOGS_START + 133)
+#define RID_SCDLG_DPSUBTOTAL_OPT        (SC_DIALOGS_START + 134)
+#define RID_SCDLG_DPNUMGROUP            (SC_DIALOGS_START + 135)
+#define RID_SCDLG_DPDATEGROUP           (SC_DIALOGS_START + 136)
+#define RID_SCDLG_DPSHOWDETAIL          (SC_DIALOGS_START + 137)
+#define RID_SCDLG_OPTSOLVER             (SC_DIALOGS_START + 138)
+#define RID_SCDLG_SOLVEROPTIONS         (SC_DIALOGS_START + 139)
+#define RID_SCDLG_SOLVER_INTEGER        (SC_DIALOGS_START + 140)
+#define RID_SCDLG_SOLVER_DOUBLE         (SC_DIALOGS_START + 141)
+#define RID_SCDLG_SOLVER_PROGRESS       (SC_DIALOGS_START + 142)
+#define RID_SCDLG_SOLVER_NOSOLUTION     (SC_DIALOGS_START + 143)
+#define RID_SCDLG_SOLVER_SUCCESS        (SC_DIALOGS_START + 144)
+
+#define RID_SCDLG_CONFLICTS             (SC_DIALOGS_START + 145)
+#define RID_SCDLG_SHAREDOCUMENT         (SC_DIALOGS_START + 146)
+#define RID_SCDLG_SORT_WARNING          (SC_DIALOGS_START + 147)
+#define RID_SCDLG_TABPROTECTION         (SC_DIALOGS_START + 148)
+#define RID_SCDLG_DOCPROTECTION         (SC_DIALOGS_START + 149)
+#define RID_SCDLG_RETYPEPASS            (SC_DIALOGS_START + 150)
+#define RID_SCDLG_RETYPEPASS_INPUT      (SC_DIALOGS_START + 151)
+
+#define SC_DIALOGS_END          (SC_DIALOGS_START + 152)
+
+#ifndef STD_MASKCOLOR
+#define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
+#endif
+
+// mask color for high contrast
+#define SC_HC_MASKCOLOR STD_MASKCOLOR
+
+#define MID_1   1
+#define MID_2   2
+#define MID_3   3
+#define MID_4   4
+
+#define SC_OOO_BUILD_START          (SC_DIALOGS_END)
+
+// Data Form
+#define SID_DATAFORM_NEW            (SC_OOO_BUILD_START + 1) // message
+#define SID_DATA_FORM               (SC_OOO_BUILD_START + 2) // menu (in Data menu)
+#define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 3) // dialog
+
+#endif
+
+
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 2407c6251..97f651321 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -293,13 +293,19 @@ public:
     virtual void GetInputString( String& rString ) const = 0;
 };
 
+class AbstractScTabBgColorDlg : public VclAbstractDialog  //add for ScTabBgColorDlg
+{
+public:
+    virtual void GetSelectedColor( Color& rColor ) const = 0;
+};
+
 class AbstractScImportOptionsDlg : public VclAbstractDialog  //add for ScImportOptionsDlg
 {
 public:
     virtual void GetImportOptions( ScImportOptions& rOptions ) const = 0;
 };
 
-class AbstractScLangChooserDlg : public VclAbstractDialog //add for ScLangChooserDlg
+class AbstractScTextImportOptionsDlg : public VclAbstractDialog //add for ScLangChooserDlg
 {
 public:
     virtual LanguageType GetLanguageType() const = 0;
@@ -316,7 +322,7 @@ public:
                                                                     SvStream* pInStream, int nId,
                                                                     sal_Unicode cSep = '\t') = 0;
 
-    virtual     AbstractScLangChooserDlg * CreateScLangChooserDlg( Window* pParent, int nId ) = 0;
+    virtual     AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId ) = 0;
 
     virtual		AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window*					pParent, //add for ScAutoFormatDlg
                                                                 ScAutoFormat*				pAutoFormat,
@@ -445,6 +451,14 @@ public:
                                                                 const String& rDefault,
                                                                 ULONG nHelpId ,
                                                                 int nId ) = 0;
+
+    virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg (  Window* pParent, //add for ScTabBgColorDlg
+                                                                const String& rTitle, //Dialog Title
+                                                                const String& rTabBgColorNoColorText, //Label for no tab color
+                                                                const Color& rDefaultColor, //Currently selected Color
+                                                                ULONG nHelpId ,
+                                                                int nId ) = 0;
+
     virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* 				pParent, //add for ScImportOptionsDlg
                                                                     int nId,
                                                                     BOOL                    bAscii = TRUE,
diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx
index 3464fbb49..ba1eea20d 100644
--- a/sc/inc/scextopt.hxx
+++ b/sc/inc/scextopt.hxx
@@ -81,6 +81,8 @@ struct ScExtTabSettings
     bool                mbFrozenPanes;      /// true = Frozen panes; false = Normal splits.
     bool                mbPageMode;         /// true = Pagebreak mode; false = Normal view mode.
     bool                mbShowGrid;         /// Whether or not to display gridlines.
+    Color               maTabBgColor;       /// Tab Bg Color
+    bool                IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO) ? TRUE : FALSE; };
 
     explicit            ScExtTabSettings();
 };
diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc
index 24fa7f87b..d0ca82f30 100644
--- a/sc/inc/scfuncs.hrc
+++ b/sc/inc/scfuncs.hrc
@@ -333,4 +333,3 @@
 #define HID_FUNC_UNICODE            (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+31)
 #define HID_FUNC_UNICHAR            (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+32)
 #define HID_FUNC_NUMBERVALUE        (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+33)
-#define HID_FUNC_PHONETIC           (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+34)
diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx
new file mode 100644
index 000000000..1cfe2e0e7
--- /dev/null
+++ b/sc/inc/sheetdata.hxx
@@ -0,0 +1,183 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: sheetdata.hxx,v $
+ * $Revision: 1.16.32.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_SHEETDATA_HXX
+#define SC_SHEETDATA_HXX
+
+#include <xmloff/maptype.hxx>
+#include <svx/editdata.hxx>
+#include <vector>
+#include <hash_set>
+
+#include "address.hxx"
+
+class ScAddress;
+class SvXMLNamespaceMap;
+
+
+struct ScStreamEntry
+{
+    sal_Int32   mnStartOffset;
+    sal_Int32   mnEndOffset;
+
+                ScStreamEntry() :
+                    mnStartOffset(-1),
+                    mnEndOffset(-1)
+                {
+                }
+
+                ScStreamEntry( sal_Int32 nStart, sal_Int32 nEnd ) :
+                    mnStartOffset(nStart),
+                    mnEndOffset(nEnd)
+                {
+                }
+};
+
+struct ScCellStyleEntry
+{
+    rtl::OUString   maName;
+    ScAddress       maCellPos;
+
+                ScCellStyleEntry( const rtl::OUString& rName, const ScAddress& rPos ) :
+                    maName(rName),
+                    maCellPos(rPos)
+                {
+                }
+};
+
+struct ScNoteStyleEntry
+{
+    rtl::OUString   maStyleName;
+    rtl::OUString   maTextStyle;
+    ScAddress       maCellPos;
+
+                ScNoteStyleEntry( const rtl::OUString& rStyle, const rtl::OUString& rText, const ScAddress& rPos ) :
+                    maStyleName(rStyle),
+                    maTextStyle(rText),
+                    maCellPos(rPos)
+                {
+                }
+};
+
+struct ScTextStyleEntry
+{
+    rtl::OUString   maName;
+    ScAddress       maCellPos;
+    ESelection      maSelection;
+
+                ScTextStyleEntry( const rtl::OUString& rName, const ScAddress& rPos, const ESelection& rSel ) :
+                    maName(rName),
+                    maCellPos(rPos),
+                    maSelection(rSel)
+                {
+                }
+};
+
+struct ScLoadedNamespaceEntry
+{
+    rtl::OUString   maPrefix;
+    rtl::OUString   maName;
+    sal_uInt16      mnKey;
+
+                ScLoadedNamespaceEntry( const rtl::OUString& rPrefix, const rtl::OUString& rName, sal_uInt16 nKey ) :
+                    maPrefix(rPrefix),
+                    maName(rName),
+                    mnKey(nKey)
+                {
+                }
+};
+
+class ScSheetSaveData
+{
+    std::hash_set<rtl::OUString, rtl::OUStringHash>  maInitialPrefixes;
+    std::vector<ScLoadedNamespaceEntry>              maLoadedNamespaces;
+
+    std::vector<ScCellStyleEntry> maCellStyles;
+    std::vector<ScCellStyleEntry> maColumnStyles;
+    std::vector<ScCellStyleEntry> maRowStyles;
+    std::vector<ScCellStyleEntry> maTableStyles;
+    std::vector<ScNoteStyleEntry> maNoteStyles;
+    std::vector<ScTextStyleEntry> maNoteParaStyles;
+    std::vector<ScTextStyleEntry> maNoteTextStyles;
+    std::vector<ScTextStyleEntry> maTextStyles;
+    std::vector<bool>          maBlocked;
+    std::vector<ScStreamEntry> maStreamEntries;
+    std::vector<ScStreamEntry> maSaveEntries;
+    sal_Int32   mnStartTab;
+    sal_Int32   mnStartOffset;
+
+    ScNoteStyleEntry    maPreviousNote;
+
+public:
+                ScSheetSaveData();
+                ~ScSheetSaveData();
+
+    void        AddCellStyle( const rtl::OUString& rName, const ScAddress& rCellPos );
+    void        AddColumnStyle( const rtl::OUString& rName, const ScAddress& rCellPos );
+    void        AddRowStyle( const rtl::OUString& rName, const ScAddress& rCellPos );
+    void        AddTableStyle( const rtl::OUString& rName, const ScAddress& rCellPos );
+
+    void        HandleNoteStyles( const rtl::OUString& rStyleName, const rtl::OUString& rTextName, const ScAddress& rCellPos );
+    void        AddNoteContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection );
+
+    void        AddTextStyle( const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection );
+
+    void        BlockSheet( sal_Int32 nTab );
+    bool        IsSheetBlocked( sal_Int32 nTab ) const;
+
+    void        AddStreamPos( sal_Int32 nTab, sal_Int32 nStartOffset, sal_Int32 nEndOffset );
+    void        GetStreamPos( sal_Int32 nTab, sal_Int32& rStartOffset, sal_Int32& rEndOffset ) const;
+    bool        HasStreamPos( sal_Int32 nTab ) const;
+
+    void        StartStreamPos( sal_Int32 nTab, sal_Int32 nStartOffset );
+    void        EndStreamPos( sal_Int32 nEndOffset );
+
+    bool        HasStartPos() const { return mnStartTab >= 0; }
+
+    void        ResetSaveEntries();
+    void        AddSavePos( sal_Int32 nTab, sal_Int32 nStartOffset, sal_Int32 nEndOffset );
+    void        UseSaveEntries();
+
+    void        StoreInitialNamespaces( const SvXMLNamespaceMap& rNamespaces );
+    void        StoreLoadedNamespaces( const SvXMLNamespaceMap& rNamespaces );
+    bool        AddLoadedNamespaces( SvXMLNamespaceMap& rNamespaces ) const;
+
+    const std::vector<ScCellStyleEntry>& GetCellStyles() const   { return maCellStyles; }
+    const std::vector<ScCellStyleEntry>& GetColumnStyles() const { return maColumnStyles; }
+    const std::vector<ScCellStyleEntry>& GetRowStyles() const    { return maRowStyles; }
+    const std::vector<ScCellStyleEntry>& GetTableStyles() const  { return maTableStyles; }
+    const std::vector<ScNoteStyleEntry>& GetNoteStyles() const   { return maNoteStyles; }
+    const std::vector<ScTextStyleEntry>& GetNoteParaStyles() const { return maNoteParaStyles; }
+    const std::vector<ScTextStyleEntry>& GetNoteTextStyles() const { return maNoteTextStyles; }
+    const std::vector<ScTextStyleEntry>& GetTextStyles() const   { return maTextStyles; }
+};
+
+#endif
+
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index c27cef57b..bc0f86324 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -52,7 +52,7 @@ struct SC_DLLPUBLIC ScSortParam
     BOOL		bHasHeader;
     BOOL		bByRow;
     BOOL		bCaseSens;
-	BOOL		bNaturalSort;
+    BOOL		bNaturalSort;
     BOOL		bUserDef;
     USHORT		nUserIndex;
     BOOL		bIncludePattern;
diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index 4ca8629d9..fd2d7c3ee 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -32,6 +32,41 @@
 #define SC_STRINGUTIL_HXX
 
 #include "rtl/ustring.hxx"
+#include "scdllapi.h"
+
+class SvNumberFormatter;
+
+/** 
+ * Store parameters used in the ScDocument::SetString() method.  Various 
+ * options for string-setting operation are specified herein. 
+ */
+struct SC_DLLPUBLIC ScSetStringParam
+{
+    /** 
+     * Stores the pointer to the number formatter instance to be used during 
+     * number format detection.  The caller must manage the life cycle of the 
+     * instance. 
+     */
+    SvNumberFormatter* mpNumFormatter;
+
+    /** 
+     * When true, we try to detect special number format (dates etc) from the 
+     * input string, when false, we only try to detect a basic decimal number 
+     * format. 
+     */
+    bool mbDetectNumberFormat;
+
+    /** 
+     * When true, set the format of the cell to Text when a string cell is 
+     * requested for a number input.  We may want to do this during text file 
+     * import (csv, html etc). 
+     */
+    bool mbSetTextCellFormat; 
+
+    ScSetStringParam();
+};
+
+// ============================================================================
 
 class ScStringUtil
 {
diff --git a/sc/inc/tabbgcolor.hxx b/sc/inc/tabbgcolor.hxx
new file mode 100644
index 000000000..83b694af6
--- /dev/null
+++ b/sc/inc/tabbgcolor.hxx
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: tabbgcolor.hxx,v $
+ * $Revision: 1.00 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef SC_TABBGCOLOR_HXX
+#define SC_TABBGCOLOR_HXX
+
+#include <tools/color.hxx>
+#include <tools/list.hxx>
+
+struct ScUndoSetTabBgColorInfo
+{
+public:
+    SCTAB nTabId;
+    Color aOldTabBgColor;
+    Color aNewTabBgColor;
+    BOOL IsDefaultOldTabBgColor() const {return aOldTabBgColor == Color( COL_AUTO ) ? TRUE : FALSE ;};
+    BOOL IsDefaultNewTabBgColor() const {return aOldTabBgColor == Color( COL_AUTO ) ? TRUE : FALSE ;};
+};
+DECLARE_LIST( ScUndoSetTabBgColorInfoList, ScUndoSetTabBgColorInfo* )
+#endif
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index c24822ce8..b8fd37b06 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -42,12 +42,20 @@
 #include "compressedarray.hxx"
 
 #include <memory>
+#include <set>
+#include <boost/shared_ptr.hpp>
 
 namespace utl {
     class SearchParam;
     class TextSearch;
 }
 
+namespace com { namespace sun { namespace star {
+    namespace sheet {
+        struct TablePageBreakData;
+    }
+} } }
+
 class SfxItemSet;
 class SfxStyleSheetBase;
 class SvxBoxInfoItem;
@@ -72,12 +80,13 @@ class ScStyleSheet;
 class ScTableLink;
 class ScTableProtection;
 class ScUserListData;
-class ScIndexMap;
 struct RowInfo;
 struct ScFunctionData;
 struct ScLineFlags;
 class CollatorWrapper;
-
+struct ScSetStringParam;
+class ScFlatBoolRowSegments;
+class ScFlatBoolColSegments;
 
 class ScTable
 {
@@ -120,6 +129,15 @@ private:
 
     BYTE*			pColFlags;
     ScBitMaskCompressedArray< SCROW, BYTE>*     pRowFlags;
+    ::boost::shared_ptr<ScFlatBoolColSegments>  mpHiddenCols;
+    ::boost::shared_ptr<ScFlatBoolRowSegments>  mpHiddenRows;
+    ::boost::shared_ptr<ScFlatBoolColSegments>  mpFilteredCols;
+    ::boost::shared_ptr<ScFlatBoolRowSegments>  mpFilteredRows;
+
+    ::std::set<SCROW>                      maRowPageBreaks;
+    ::std::set<SCROW>                      maRowManualBreaks;
+    ::std::set<SCCOL>                      maColPageBreaks;
+    ::std::set<SCCOL>                      maColManualBreaks;
 
     ScOutlineTable*	pOutlineTable;
 
@@ -129,6 +147,7 @@ private:
 
                                             //	interne Verwaltung	------------------
     BOOL			bVisible;
+    BOOL            bStreamValid;
     BOOL            bPendingRowHeights;
 
     SCTAB			nTab;
@@ -159,11 +178,12 @@ private:
     Color			aScenarioColor;
     USHORT			nScenarioFlags;
     BOOL			bActiveScenario;
+    bool            mbPageBreaksValid;
 
 friend class ScDocument;					// fuer FillInfo
 friend class ScDocumentIterator;
 friend class ScValueIterator;
-friend class ScQueryValueIterator;
+friend class ScDBQueryDataIterator;
 friend class ScCellIterator;
 friend class ScQueryCellIterator;
 friend class ScHorizontalCellIterator;
@@ -195,6 +215,9 @@ public:
     BOOL		IsVisible() const							 { return bVisible; }
     void		SetVisible( BOOL bVis );
 
+    BOOL        IsStreamValid() const                        { return bStreamValid; }
+    void        SetStreamValid( BOOL bSet, BOOL bIgnoreLock = FALSE );
+
     BOOL        IsPendingRowHeights() const                  { return bPendingRowHeights; }
     void        SetPendingRowHeights( BOOL bSet );
 
@@ -266,7 +289,7 @@ public:
     void		PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell);
                 //	TRUE = Zahlformat gesetzt
 	BOOL		SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
-                           SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
+                           ScSetStringParam* pParam = NULL );
     void		SetValue( SCCOL nCol, SCROW nRow, const double& rVal );
     void 		SetError( SCCOL nCol, SCROW nRow, USHORT nError);
 
@@ -364,7 +387,8 @@ public:
 
     void		CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const;
 
-    void		InvalidateTableArea()						{ bTableAreaValid = FALSE; }
+    void        InvalidateTableArea();
+    void        InvalidatePageBreaks();
 
     BOOL		GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const;			// FALSE = leer
     BOOL		GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const;
@@ -380,10 +404,11 @@ public:
                         SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow );
 
     void		GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
-								BOOL bIncludeOld ) const;
+                             BOOL bIncludeOld ) const;
 
     SCSIZE	    GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
                                         SCCOL nEndCol, SCROW nEndRow, ScDirection eDir );
+
     void		FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY );
     void		GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
                                 BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark );
@@ -443,9 +468,7 @@ public:
     void        FindRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                  std::set<USHORT>& rIndexes) const;
     void 		ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                      const ScIndexMap& rMap );
-	void 		ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-									  const ScRangeData::IndexMap& rMap );
+                                      const ScRangeData::IndexMap& rMap );
     void		Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                         ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
                         double nStepValue, double nMaxValue);
@@ -463,7 +486,7 @@ public:
                                 SCCOL& rCol, SCROW& rRow, ScMarkData& rMark,
                                 String& rUndoStr, ScDocument* pUndoDoc);
 
-    void		FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ) const;
+	void		FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 );
 
     void		GetBorderLines( SCCOL nCol, SCROW nRow,
                                 const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop,
@@ -585,19 +608,29 @@ public:
                         // nPPT fuer Test auf Veraenderung
     void		SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual );
 
-    USHORT		GetColWidth( SCCOL nCol ) const;
-    USHORT		GetRowHeight( SCROW nRow ) const;
-    ULONG		GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const;
-    ULONG		GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const;
-    ULONG		GetColOffset( SCCOL nCol ) const;
-    ULONG		GetRowOffset( SCROW nRow ) const;
+	USHORT		GetColWidth( SCCOL nCol );
+    SC_DLLPUBLIC USHORT GetRowHeight( SCROW nRow );
+	ULONG		GetRowHeight( SCROW nStartRow, SCROW nEndRow );
+	ULONG		GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale );
+	ULONG		GetColOffset( SCCOL nCol );
+	ULONG		GetRowOffset( SCROW nRow );
+
+    /** 
+     * Get the last row such that the height of row 0 to the end row is as 
+     * high as possible without exceeding the specified height value.
+     *
+     * @param nHeight maximum desired height
+     * 
+     * @return SCROW last row of the range within specified height.
+     */
+    SCROW       GetRowForHeight(ULONG nHeight);
 
     USHORT		GetOriginalWidth( SCCOL nCol ) const;
     USHORT		GetOriginalHeight( SCROW nRow ) const;
 
-    USHORT		GetCommonWidth( SCCOL nEndCol ) const;
+	USHORT		GetCommonWidth( SCCOL nEndCol );
 
-    SCROW		GetHiddenRowCount( SCROW nRow ) const;
+	SCROW		GetHiddenRowCount( SCROW nRow );
 
     void		ShowCol(SCCOL nCol, BOOL bShow);
     void		ShowRow(SCROW nRow, BOOL bShow);
@@ -618,8 +651,6 @@ public:
                 /// @return  the index of the last changed row (flags and row height, auto pagebreak is ignored).
     SCROW      GetLastChangedRow() const;
 
-    BOOL		IsFiltered(SCROW nRow) const;
-
     BYTE		GetColFlags( SCCOL nCol ) const;
     BYTE		GetRowFlags( SCROW nRow ) const;
 
@@ -635,6 +666,49 @@ public:
     void		RemoveManualBreaks();
     BOOL		HasManualBreaks() const;
 
+    void        GetAllRowBreaks(::std::set<SCROW>& rBreaks, bool bPage, bool bManual) const;
+    void        GetAllColBreaks(::std::set<SCCOL>& rBreaks, bool bPage, bool bManual) const;
+    bool        HasRowPageBreak(SCROW nRow) const;
+    bool        HasColPageBreak(SCCOL nCol) const;
+    bool        HasRowManualBreak(SCROW nRow) const;
+    bool        HasColManualBreak(SCCOL nCol) const;
+    void        RemoveRowPageBreaks(SCROW nStartRow, SCROW nEndRow);
+    void        RemoveRowBreak(SCROW nRow, bool bPage, bool bManual);
+    void        RemoveColBreak(SCCOL nCol, bool bPage, bool bManual);
+    void        SetRowBreak(SCROW nRow, bool bPage, bool bManual);
+    void        SetColBreak(SCCOL nCol, bool bPage, bool bManual);
+    ::com::sun::star::uno::Sequence<
+        ::com::sun::star::sheet::TablePageBreakData> GetRowBreakData() const;
+
+    bool        RowHidden(SCROW nRow, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL);
+    bool        RowHidden(SCROW nRow, SCROW& rLastRow);
+    bool        HasHiddenRows(SCROW nStartRow, SCROW nEndRow);
+    bool        ColHidden(SCCOL nCol, SCCOL& rLastCol);
+    bool        ColHidden(SCCOL nCol, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL);
+    void        SetRowHidden(SCROW nStartRow, SCROW nEndRow, bool bHidden);
+    void        SetColHidden(SCCOL nStartCol, SCCOL nEndCol, bool bHidden);
+    void        CopyColHidden(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol);
+    void        CopyRowHidden(ScTable& rTable, SCROW nStartRow, SCROW nEndRow);
+    SCROW       FirstVisibleRow(SCROW nStartRow, SCROW nEndRow);
+    SCROW       LastVisibleRow(SCROW nStartRow, SCROW nEndRow);
+    SCROW       CountVisibleRows(SCROW nStartRow, SCROW nEndRow);
+    sal_uInt32  GetTotalRowHeight(SCROW nStartRow, SCROW nEndRow);
+
+    SCCOLROW    LastHiddenColRow(SCCOLROW nPos, bool bCol);
+
+    bool        RowFiltered(SCROW nRow, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL);
+    bool        ColFiltered(SCCOL nCol, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL);
+    bool        HasFilteredRows(SCROW nStartRow, SCROW nEndRow);
+    void        CopyColFiltered(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol);
+    void        CopyRowFiltered(ScTable& rTable, SCROW nStartRow, SCROW nEndRow);
+    void        SetRowFiltered(SCROW nStartRow, SCROW nEndRow, bool bFiltered);
+    void        SetColFiltered(SCCOL nStartCol, SCCOL nEndCol, bool bFiltered);
+    SCROW       FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow);
+    SCROW       LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow);
+    SCROW       CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow);
+
+    void        SyncColRowFlags();
+
     void		StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
     void		ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
 
@@ -646,8 +720,8 @@ public:
     SCSIZE		Query(ScQueryParam& rQueryParam, BOOL bKeepSub);
     BOOL		CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
 
-    void		GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings);
-    void        GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings );
+    void        GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings, bool& rHasDates);
+    void        GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings, bool& rHasDates );
     BOOL		GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit);
 
     BOOL		HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
@@ -748,7 +822,7 @@ private:
     BOOL 		GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel,
                                     const ScMarkData& rMark) const;
     BOOL		GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark );
-    void		SetDrawPageSize();
+    void        SetDrawPageSize(bool bResetStreamValid = true);
     BOOL		TestTabRefAbs(SCTAB nTable);
     void 		CompileDBFormula();
     void 		CompileDBFormula( BOOL bCreateFormulaString );
@@ -763,12 +837,14 @@ private:
 
     SCSIZE		FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2,
                             SCCOL nCol, SCROW nAttrRow1, SCROW nAttrRow2, SCSIZE nArrY,
-                            const ScPatternAttr* pPattern, const SfxItemSet* pCondSet ) const;
+							const ScPatternAttr* pPattern, const SfxItemSet* pCondSet );
 
     // idle calculation of OutputDevice text width for cell
     // also invalidates script type, broadcasts for "calc as shown"
     void        InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo,
                                      BOOL bNumFormatChanged, BOOL bBroadcast );
+
+    void        SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bForward);
 };
 
 
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index dcb5af199..e9b31b24f 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -259,6 +259,8 @@ public:
                             ScCellTextCursor(ScCellObj& rText);
         virtual                                 ~ScCellTextCursor() throw();
 
+    ScCellObj&              GetCellObj() const  { return rTextObj; }
+
                             // SvxUnoTextCursor methods reimplemented here:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL
                             getText() throw(::com::sun::star::uno::RuntimeException);
@@ -324,6 +326,15 @@ public:
                             getStart() throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL
                             getEnd() throw(::com::sun::star::uno::RuntimeException);
+
+                            // XUnoTunnel
+    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence<
+                                    sal_Int8 >& aIdentifier )
+                                throw(::com::sun::star::uno::RuntimeException);
+
+    static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
+    static ScDrawTextCursor* getImplementation( const com::sun::star::uno::Reference<
+                                    com::sun::star::uno::XInterface> xObj );
 };
 
 
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index f3d6fe9cf..ce328f81a 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -533,6 +533,8 @@
 #define SC_UNO_ZOOMVALUE            "ZoomValue"
 #define SC_UNO_UPDTEMPL             "UpdateFromTemplate"
 #define SC_UNO_FILTERED_RANGE_SELECTION       "FilteredRangeSelection"
+#define SC_UNO_TABCOLOR             "TabColor"
+ 
 /*Stampit enable/disable print cancel */
 #define SC_UNO_ALLOWPRINTJOBCANCEL  "AllowPrintJobCancel"
 
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index 3360184f8..e780e11cf 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -63,6 +63,7 @@ interface TableSelection
     FID_DELETE_TABLE	[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
     FID_TAB_RENAME		[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
     FID_TAB_RTL			[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+    FID_TAB_SET_TAB_BG_COLOR    [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
     FID_TAB_TOGGLE_GRID [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
 
     SID_TABLE_ACTIVATE	[ ExecMethod = Execute; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 0cd2c15e0..8f37898b6 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -1924,7 +1924,6 @@ SfxVoidItem AutoFormatPivotTable SID_PIVOT_AFMT
         GroupId = GID_DATA;
 ]
 
-
 //--------------------------------------------------------------------------
 SfxVoidItem DeletePrintArea SID_DELETE_PRINTAREA
 ()
@@ -8000,3 +7999,56 @@ SfxVoidItem MarkDependents SID_DETECTIVE_MARK_SUCC
     GroupId = GID_OPTIONS;
 ]
 
+
+//--------------------------------------------------------------------------
+SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR
+
+[
+    // flags: 
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    Readonly = FALSE,
+
+    // config: 
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+SfxVoidItem SetTabBgColor FID_TAB_MENU_SET_TAB_BG_COLOR
+(SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR)
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_FORMAT;
+]
+
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index b1c1332f0..851a20c68 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -61,6 +61,7 @@ interface Tables
     FID_TABLE_HIDE	[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
     FID_TABLE_SHOW	[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
         SID_SELECT_TABLES       [ ExecMethod = Execute; StateMethod = GetState; ]
+    FID_TAB_MENU_SET_TAB_BG_COLOR   [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
 }
 
  // ===========================================================================
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index e94f8e258..3807adeb6 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -172,6 +172,9 @@ void ScAttrArray::Reset( const ScPatternAttr* pPattern, BOOL bAlloc )
         }
         delete[] pData;
 
+        if (pDocument->IsStreamValid(nTab))
+            pDocument->SetStreamValid(nTab, FALSE);
+
         if (bAlloc)
         {
             nCount = nLimit = 1;
@@ -504,6 +507,9 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern
 
                 nCount++;
             }
+
+            if (pDocument->IsStreamValid(nTab))
+                pDocument->SetStreamValid(nTab, FALSE);
         }
     }
 //	InfoBox(0, String(nCount) + String(" Eintraege") ).Execute();
@@ -582,6 +588,9 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet*
             delete pNewPattern;
         }
         while ((nStart <= nEndRow) && (nPos < nCount));
+
+        if (pDocument->IsStreamValid(nTab))
+            pDocument->SetStreamValid(nTab, FALSE);
     }
 
 #ifdef DBG_UTIL
@@ -821,6 +830,9 @@ void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCac
             }
         }
         while (nStart <= nEndRow);
+
+        if (pDocument->IsStreamValid(nTab))
+            pDocument->SetStreamValid(nTab, FALSE);
     }
 
 #ifdef DBG_UTIL
diff --git a/sc/source/core/data/autonamecache.cxx b/sc/source/core/data/autonamecache.cxx
index c51efb6c5..329e7f469 100644
--- a/sc/source/core/data/autonamecache.cxx
+++ b/sc/source/core/data/autonamecache.cxx
@@ -40,6 +40,7 @@
 #include "autonamecache.hxx"
 #include "dociter.hxx"
 #include "cell.hxx"
+#include "queryparam.hxx"
 
 // -----------------------------------------------------------------------
 
@@ -99,7 +100,7 @@ const ScAutoNameAddresses& ScAutoNameCache::GetNameOccurences( const String& rNa
                     ;   // nothing, prevent compiler warning
                 break;
             }
-            if ( ScGlobal::pTransliteration->isEqual( aStr, rName ) )
+            if ( ScGlobal::GetpTransliteration()->isEqual( aStr, rName ) )
             {
                 rAddresses.push_back( ScAddress( aIter.GetCol(), aIter.GetRow(), aIter.GetTab() ) );
             }
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index fdeabd766..29f54e8dc 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -294,13 +294,13 @@ void ScBroadcastAreaSlot::DelBroadcastAreasInRange( const ScRange& rRange )
         if (rRange.In( rAreaRange))
         {
             ScBroadcastArea* pArea = *aIter;
+            aBroadcastAreaTbl.erase( aIter++);  // erase before modifying
             if (!pArea->DecRef())
             {
                 if (pBASM->IsInBulkBroadcast())
                     pBASM->RemoveBulkArea( pArea);
                 delete pArea;
             }
-            aBroadcastAreaTbl.erase( aIter++);
         }
         else
             ++aIter;
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 06c82deb1..69f4065ed 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -78,14 +78,10 @@ const USHORT nMemPoolValueCell = (0x8000 - 64) / sizeof(ScValueCell);
 const USHORT nMemPoolFormulaCell = (0x8000 - 64) / sizeof(ScFormulaCell);
 const USHORT nMemPoolStringCell = (0x4000 - 64) / sizeof(ScStringCell);
 const USHORT nMemPoolNoteCell = (0x1000 - 64) / sizeof(ScNoteCell);
-const USHORT nMemPoolAsianStringCell = (0x4000 - 64) / sizeof(ScAsianStringCell);
-const USHORT nMemPoolAsianEditCell = (0x4000 - 64) / sizeof(ScAsianEditCell);
 IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell,   nMemPoolValueCell, nMemPoolValueCell )
 IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell, nMemPoolFormulaCell, nMemPoolFormulaCell )
 IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell,  nMemPoolStringCell, nMemPoolStringCell )
 IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell,	 nMemPoolNoteCell, nMemPoolNoteCell )
-IMPL_FIXEDMEMPOOL_NEWDEL( ScAsianStringCell, nMemPoolAsianStringCell, nMemPoolAsianStringCell )
-IMPL_FIXEDMEMPOOL_NEWDEL( ScAsianEditCell, nMemPoolAsianEditCell, nMemPoolAsianEditCell )
 #endif
 
 // ============================================================================
@@ -518,31 +514,19 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 )
             return ( ((const ScValueCell*)pCell1)->GetValue() ==
                      ((const ScValueCell*)pCell2)->GetValue() );
         case CELLTYPE_STRING:		// String oder Edit
-        {
-            String aText1, aText2;
-            const ScStringCell* pStrCell1 = static_cast<const ScStringCell*>(pCell1);
-            const ScStringCell* pStrCell2 = static_cast<const ScStringCell*>(pCell2);
-            pStrCell1->GetString( aText1 );
-            pStrCell2->GetString( aText2 );
-            if (aText1 != aText2)
-                return false;
-
-            ScPhonetic aPhonetic1, aPhonetic2;
-            if (pStrCell1->HasPhonetic())
-            {
-                const ScAsianStringCell* pPhoCell1 = 
-                    static_cast<const ScAsianStringCell*>(pStrCell1);
-                pPhoCell1->GetPhonetic(aPhonetic1);
-            }
-            if (pStrCell2->HasPhonetic())
             {
-                const ScAsianStringCell* pPhoCell2 = 
-                    static_cast<const ScAsianStringCell*>(pStrCell2);
-                pPhoCell2->GetPhonetic(aPhonetic2);
+                String aText1;
+                if ( pCell1->GetCellType() == CELLTYPE_STRING )
+                    ((const ScStringCell*)pCell1)->GetString(aText1);
+                else
+                    ((const ScEditCell*)pCell1)->GetString(aText1);
+                String aText2;
+                if ( pCell2->GetCellType() == CELLTYPE_STRING )
+                    ((const ScStringCell*)pCell2)->GetString(aText2);
+                else
+                    ((const ScEditCell*)pCell2)->GetString(aText2);
+                return ( aText1 == aText2 );
             }
-
-            return aPhonetic1 == aPhonetic2;
-        }
         case CELLTYPE_FORMULA:
             {
                 //!	eingefuegte Zeilen / Spalten beruecksichtigen !!!!!
@@ -1582,6 +1566,10 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
         }
         bRunning = bOldRunning;
 
+        // #i102616# For single-sheet saving consider only content changes, not format type,
+        // because format type isn't set on loading (might be changed later)
+        BOOL bContentChanged = FALSE;
+
         // Do not create a HyperLink() cell if the formula results in an error.
         if( p->GetError() && pCode->IsHyperLink())
             pCode->SetHyperLink(FALSE);
@@ -1620,7 +1608,12 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
 
         // New error code?
         if( p->GetError() != nOldErrCode )
+        {
             bChanged = TRUE;
+            // bContentChanged only has to be set if the file content would be changed
+            if ( aResult.GetCellResultType() != svUnknown )
+                bContentChanged = TRUE;
+        }
         // Different number format?
         if( nFormatType != p->GetRetFormatType() )
         {
@@ -1636,7 +1629,33 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
         // In case of changes just obtain the result, no temporary and
         // comparison needed anymore.
         if (bChanged)
+        {
+            // #i102616# Compare anyway if the sheet is still marked unchanged for single-sheet saving
+            // Also handle special cases of initial results after loading.
+
+            if ( !bContentChanged && pDocument->IsStreamValid(aPos.Tab()) )
+            {
+                ScFormulaResult aNewResult( p->GetResultToken());
+                StackVar eOld = aResult.GetCellResultType();
+                StackVar eNew = aNewResult.GetCellResultType();
+                if ( eOld == svUnknown && ( eNew == svError || ( eNew == svDouble && aNewResult.GetDouble() == 0.0 ) ) )
+                {
+                    // ScXMLTableRowCellContext::EndElement doesn't call SetFormulaResultDouble for 0
+                    // -> no change
+                }
+                else
+                {
+                    if ( eOld == svHybridCell )     // string result from SetFormulaResultString?
+                        eOld = svString;            // ScHybridCellToken has a valid GetString method
+
+                    bContentChanged = (eOld != eNew ||
+                            (eNew == svDouble && aResult.GetDouble() != aNewResult.GetDouble()) ||
+                            (eNew == svString && aResult.GetString() != aNewResult.GetString()));
+                }
+            }
+
             aResult.SetToken( p->GetResultToken() );
+        }
         else
         {
             ScFormulaResult aNewResult( p->GetResultToken());
@@ -1645,6 +1664,19 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
             bChanged = (eOld != eNew ||
                     (eNew == svDouble && aResult.GetDouble() != aNewResult.GetDouble()) ||
                     (eNew == svString && aResult.GetString() != aNewResult.GetString()));
+
+            // #i102616# handle special cases of initial results after loading (only if the sheet is still marked unchanged)
+            if ( bChanged && !bContentChanged && pDocument->IsStreamValid(aPos.Tab()) )
+            {
+                if ( ( eOld == svUnknown && ( eNew == svError || ( eNew == svDouble && aNewResult.GetDouble() == 0.0 ) ) ) ||
+                     ( eOld == svHybridCell && eNew == svString && aResult.GetString() == aNewResult.GetString() ) )
+                {
+                    // no change, see above
+                }
+                else
+                    bContentChanged = TRUE;
+            }
+
             aResult.Assign( aNewResult);
         }
 
@@ -1681,13 +1713,19 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
             // Coded double error may occur via filter import.
             USHORT nErr = GetDoubleErrorValue( aResult.GetDouble());
             aResult.SetResultError( nErr);
-            bChanged = true;
+            bChanged = bContentChanged = true;
         }
         if( bChanged )
         {
             SetTextWidth( TEXTWIDTH_DIRTY );
             SetScriptType( SC_SCRIPTTYPE_UNKNOWN );
         }
+        if (bContentChanged && pDocument->IsStreamValid(aPos.Tab()))
+        {
+            // pass bIgnoreLock=TRUE, because even if called from pending row height update,
+            // a changed result must still reset the stream flag
+            pDocument->SetStreamValid(aPos.Tab(), FALSE, TRUE);
+        }
         if ( !pCode->IsRecalcModeAlways() )
             pDocument->RemoveFromFormulaTree( this );
 
@@ -1726,9 +1764,9 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
                     // The formula was previously volatile, but no more.
                     EndListeningTo(pDocument);
                     pCode->SetRecalcModeNormal();
-                }
-                else
-                {    
+    }
+    else
+    {
                     // non-volatile formula.  End listening to the area in case 
                     // it's listening due to macro module change.
                     pDocument->EndListeningArea(BCA_LISTEN_ALWAYS, this);
@@ -1842,6 +1880,9 @@ void ScFormulaCell::SetDirty()
                 pDocument->TrackFormulas();
             }
         }
+
+        if (pDocument->IsStreamValid(aPos.Tab()))
+            pDocument->SetStreamValid(aPos.Tab(), FALSE);
     }
 }
 
@@ -1854,8 +1895,7 @@ void ScFormulaCell::SetDirtyVar()
 
 void ScFormulaCell::SetDirtyAfterLoad()
 {
-    bDirty = TRUE;
-    if ( !pDocument->GetHardRecalcState() )
+    if ( bDirty && !pDocument->GetHardRecalcState() )
         pDocument->PutInFormulaTree( this );
 }
 
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index bb9ef6e73..944bca3a9 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -53,7 +53,6 @@
 #include "scmatrix.hxx"
 #include "editutil.hxx"
 #include "chgtrack.hxx"
-#include "indexmap.hxx"
 #include "externalrefmgr.hxx"
 #include "scitems.hxx" 
 #include "patattr.hxx" 
@@ -145,11 +144,6 @@ void ScEditCell::GetString( String& rString ) const
         rString.Erase();
 }
 
-bool ScEditCell::HasPhonetic() const
-{
-    return false;
-}
-
 void ScEditCell::RemoveCharAttribs( const ScPatternAttr& rAttr )
 {
     const struct {
@@ -1579,25 +1573,6 @@ void ScFormulaCell::FindRangeNamesInUse(std::set<USHORT>& rIndexes) const
     lcl_FindRangeNamesInUse( rIndexes, pCode, pDocument->GetRangeName() );
 }
 
-void ScFormulaCell::ReplaceRangeNamesInUse( const ScIndexMap& rMap )
-{
-    for( FormulaToken* p = pCode->First(); p; p = pCode->Next() )
-    {
-        if( p->GetOpCode() == ocName )
-        {
-            USHORT nIndex = p->GetIndex();
-            USHORT nNewIndex = rMap.Find( nIndex );
-            if ( nIndex != nNewIndex )
-            {
-                p->SetIndex( nNewIndex );
-                bCompile = TRUE;
-            }
-        }
-    }
-    if( bCompile )
-        CompileTokenArray();
-}
-
 void ScFormulaCell::ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap )
 {
     for( FormulaToken* p = pCode->First(); p; p = pCode->Next() )
@@ -1606,7 +1581,7 @@ void ScFormulaCell::ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap )
         {
             sal_uInt16 nIndex = p->GetIndex();
             ScRangeData::IndexMap::const_iterator itr = rMap.find(nIndex);
-            sal_uInt16 nNewIndex = itr == rMap.end() ? nIndex : nNewIndex;
+            sal_uInt16 nNewIndex = itr == rMap.end() ? nIndex : itr->second;
             if ( nIndex != nNewIndex )
             {
                 p->SetIndex( nNewIndex );
diff --git a/sc/source/core/data/clipparam.cxx b/sc/source/core/data/clipparam.cxx
index 564b04d85..b2ec555a0 100644
--- a/sc/source/core/data/clipparam.cxx
+++ b/sc/source/core/data/clipparam.cxx
@@ -43,6 +43,13 @@ ScClipParam::ScClipParam() :
 {
 }
 
+ScClipParam::ScClipParam(const ScRange& rRange, bool bCutMode) :
+    meDirection(Unspecified),
+    mbCutMode(bCutMode)
+{
+    maRanges.Append(rRange);
+}
+
 ScClipParam::ScClipParam(const ScClipParam& r) :
     maRanges(r.maRanges),
     meDirection(r.meDirection),
@@ -69,14 +76,12 @@ SCCOL ScClipParam::getPasteColSize()
                 nColSize += p->aEnd.Col() - p->aStart.Col() + 1;
             return nColSize;
         }
-        break;
         case ScClipParam::Row:
         {
             // We assume that all ranges have identical column size.
             const ScRange& rRange = *maRanges.First();
             return rRange.aEnd.Col() - rRange.aStart.Col() + 1;
         }
-        break;
         case ScClipParam::Unspecified:
         default:
             ;
@@ -97,7 +102,6 @@ SCROW ScClipParam::getPasteRowSize()
             const ScRange& rRange = *maRanges.First();
             return rRange.aEnd.Row() - rRange.aStart.Row() + 1;
         }
-        break;
         case ScClipParam::Row:
         {
             SCROW nRowSize = 0;
@@ -105,7 +109,6 @@ SCROW ScClipParam::getPasteRowSize()
                 nRowSize += p->aEnd.Row() - p->aStart.Row() + 1;
             return nRowSize;
         }
-        break;
         case ScClipParam::Unspecified:
         default:
             ;
@@ -121,7 +124,7 @@ ScRange ScClipParam::getWholeRange() const
     for (ScRange* p = aRanges.First(); p; p = aRanges.Next())
     {
         if (bFirst)
-        {    
+        {
             aWhole = *p;
             bFirst = false;
             continue;
@@ -146,7 +149,7 @@ void ScClipParam::transpose()
 {
     switch (meDirection)
     {
-        case Column: 
+        case Column:
             meDirection = ScClipParam::Row;
         break;
         case Row:
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 0fdc706cb..98e470a63 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1917,24 +1917,6 @@ void ScColumn::FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<USHORT>& r
 }
 
 void ScColumn::ReplaceRangeNamesInUse(SCROW nRow1, SCROW nRow2,
-                                     const ScIndexMap& rMap )
-{
-    if (pItems)
-        for (SCSIZE i = 0; i < nCount; i++)
-        {
-            if ((pItems[i].nRow >= nRow1) &&
-                (pItems[i].nRow <= nRow2) &&
-                (pItems[i].pCell->GetCellType() == CELLTYPE_FORMULA))
-            {
-                SCROW nRow = pItems[i].nRow;
-                ((ScFormulaCell*)pItems[i].pCell)->ReplaceRangeNamesInUse( rMap );
-                if ( nRow != pItems[i].nRow )
-                    Search( nRow, i );		// Listener geloescht/eingefuegt?
-            }
-        }
-}
-
-void ScColumn::ReplaceRangeNamesInUse(SCROW nRow1, SCROW nRow2,
                                      const ScRangeData::IndexMap& rMap )
 {
     if (pItems)
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 2291859d6..c97fbda8d 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -69,6 +69,7 @@
 #include "compiler.hxx"			// ScTokenArray GetCodeLen
 #include "dbcolect.hxx"
 #include "fillinfo.hxx"
+#include "segmenttree.hxx"
 
 #include <math.h>
 
@@ -1785,7 +1786,7 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
 //	Mehrfachselektion:
 void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark,
                                         ScFunctionData& rData,
-                                        const ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags,
+										ScFlatBoolRowSegments& rHiddenRows,
                                         BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow )
 {
     SCSIZE nIndex;
@@ -1793,7 +1794,8 @@ void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark,
     while (aDataIter.Next( nIndex ))
     {
         SCROW nRow = pItems[nIndex].nRow;
-        if ( !pRowFlags || !( pRowFlags->GetValue(nRow) & CR_HIDDEN ) )
+		bool bRowHidden = rHiddenRows.getValue(nRow);
+		if ( !bRowHidden )
             if ( !bDoExclude || nRow < nExStartRow || nRow > nExEndRow )
                 lcl_UpdateSubTotal( rData, pItems[nIndex].pCell );
     }
@@ -1801,7 +1803,7 @@ void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark,
 
 //	bei bNoMarked die Mehrfachselektion weglassen
 void ScColumn::UpdateAreaFunction( ScFunctionData& rData,
-                                    const ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags,
+								   ScFlatBoolRowSegments& rHiddenRows,
                                     SCROW nStartRow, SCROW nEndRow )
 {
     SCSIZE nIndex;
@@ -1809,7 +1811,8 @@ void ScColumn::UpdateAreaFunction( ScFunctionData& rData,
     while ( nIndex<nCount && pItems[nIndex].nRow<=nEndRow )
     {
         SCROW nRow = pItems[nIndex].nRow;
-        if ( !pRowFlags || !( pRowFlags->GetValue(nRow) & CR_HIDDEN ) )
+		bool bRowHidden = rHiddenRows.getValue(nRow);
+		if ( !bRowHidden )
             lcl_UpdateSubTotal( rData, pItems[nIndex].pCell );
         ++nIndex;
     }
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 4d8fd01dc..b4e62a096 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -55,6 +55,7 @@
 #include "detfunc.hxx"			// fuer Notizen bei DeleteRange
 #include "postit.hxx"
 #include "stringutil.hxx"
+#include "docpool.hxx"
 
 #include <com/sun/star/i18n/LocaleDataItem.hpp>
 
@@ -1265,7 +1266,7 @@ void ScColumn::StartListeningInArea( SCROW nRow1, SCROW nRow2 )
 //	TRUE = Zahlformat gesetzt
 BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                           formula::FormulaGrammar::AddressConvention eConv,
-                          SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
+                          ScSetStringParam* pParam )
 {
     BOOL bNumFmtSet = FALSE;
     if (VALIDROW(nRow))
@@ -1274,11 +1275,15 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
         BOOL bIsLoading = FALSE;
         if (rString.Len() > 0)
         {
+            ScSetStringParam aParam;
+            if (pParam)
+                aParam = *pParam;
+
             double nVal;
             sal_uInt32 nIndex, nOldIndex = 0;
             sal_Unicode cFirstChar;
-            if (!pFormatter)
-                pFormatter = pDocument->GetFormatTable();
+            if (!aParam.mpNumFormatter)
+                aParam.mpNumFormatter = pDocument->GetFormatTable();
             SfxObjectShell* pDocSh = pDocument->GetDocumentShell();
             if ( pDocSh )
                 bIsLoading = pDocSh->IsLoading();
@@ -1287,7 +1292,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
             {
                 nIndex = nOldIndex = GetNumberFormat( nRow );
                 if ( rString.Len() > 1
-                        && pFormatter->GetType(nIndex) != NUMBERFORMAT_TEXT )
+                        && aParam.mpNumFormatter->GetType(nIndex) != NUMBERFORMAT_TEXT )
                     cFirstChar = rString.GetChar(0);
                 else
                     cFirstChar = 0;								// Text
@@ -1343,7 +1348,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                     }
                     // nIndex fuer IsNumberFormat vorbelegen
                     if ( !bIsText )
-                        nIndex = nOldIndex = pFormatter->GetStandardIndex();
+                        nIndex = nOldIndex = aParam.mpNumFormatter->GetStandardIndex();
                 }
 
                 do
@@ -1351,9 +1356,9 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                     if (bIsText)
                         break;
 
-                    if (bDetectNumberFormat)
+                    if (aParam.mbDetectNumberFormat)
                     {
-                        if (!pFormatter->IsNumberFormat(rString, nIndex, nVal))
+                        if (!aParam.mpNumFormatter->IsNumberFormat(rString, nIndex, nVal))
                             break;
 
                         pNewCell = new ScValueCell( nVal );
@@ -1364,21 +1369,21 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                             // Exception: If the new format is boolean, always apply it.
 
                             BOOL bOverwrite = FALSE;
-                            const SvNumberformat* pOldFormat = pFormatter->GetEntry( nOldIndex );
+                            const SvNumberformat* pOldFormat = aParam.mpNumFormatter->GetEntry( nOldIndex );
                             if ( pOldFormat )
                             {
                                 short nOldType = pOldFormat->GetType() & ~NUMBERFORMAT_DEFINED;
                                 if ( nOldType == NUMBERFORMAT_NUMBER || nOldType == NUMBERFORMAT_DATE ||
                                      nOldType == NUMBERFORMAT_TIME || nOldType == NUMBERFORMAT_LOGICAL )
                                 {
-                                    if ( nOldIndex == pFormatter->GetStandardFormat(
+                                    if ( nOldIndex == aParam.mpNumFormatter->GetStandardFormat(
                                                         nOldType, pOldFormat->GetLanguage() ) )
                                     {
                                         bOverwrite = TRUE;      // default of these types can be overwritten
                                     }
                                 }
                             }
-                            if ( !bOverwrite && pFormatter->GetType( nIndex ) == NUMBERFORMAT_LOGICAL )
+                            if ( !bOverwrite && aParam.mpNumFormatter->GetType( nIndex ) == NUMBERFORMAT_LOGICAL )
                             {
                                 bOverwrite = TRUE;              // overwrite anything if boolean was detected
                             }
@@ -1394,7 +1399,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                     else
                     {
                         // Only check if the string is a regular number.
-                        const LocaleDataWrapper* pLocale = pFormatter->GetLocaleData();
+                        const LocaleDataWrapper* pLocale = aParam.mpNumFormatter->GetLocaleData();
                         if (!pLocale)
                             break;
                         
@@ -1416,7 +1421,19 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                 while (false);
 
                 if (!pNewCell)
+                {
+                    if (aParam.mbSetTextCellFormat && aParam.mpNumFormatter->IsNumberFormat(rString, nIndex, nVal))
+                    {
+                        // Set the cell format type to Text.
+                        sal_uInt32 nFormat = aParam.mpNumFormatter->GetStandardFormat(NUMBERFORMAT_TEXT);
+                        ScPatternAttr aNewAttrs(pDocument->GetPool());
+                        SfxItemSet& rSet = aNewAttrs.GetItemSet();
+                        rSet.Put( SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat) );
+                        ApplyPattern(nRow, aNewAttrs);
+                    }
+                        
                     pNewCell = new ScStringCell(rString);
+                }
             }
         }
 
@@ -1483,8 +1500,9 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
 }
 
 
-void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings)
+void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates)
 {
+    bool bHasDates = false;
     SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
     String aString;
     SCROW nRow = 0;
@@ -1520,6 +1538,18 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec
                     nValue = 0.0;
             }
 
+            if (pFormatter)
+            {
+                short nType = pFormatter->GetType(nFormat);
+                if ((nType & NUMBERFORMAT_DATE) && !(nType & NUMBERFORMAT_TIME))
+                {    
+                    // special case for date values.  Disregard the time
+                    // element if the number format is of date type.
+                    nValue = ::rtl::math::approxFloor(nValue);
+                    bHasDates = true;
+                }
+            }
+
             pData = new TypedStrData( aString, nValue, SC_STRTYPE_VALUE );
         }
 #if 0 // DR
@@ -1538,6 +1568,8 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec
 
         ++nIndex;
     }
+
+    rHasDates = bHasDates;
 }
 
 //
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index cbfea174e..6bd129319 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -786,7 +786,7 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const
     String aUpVal2( aStrVal2 );
 
     if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN )
-        if ( ScGlobal::pCollator->compareString( aUpVal1, aUpVal2 )
+        if ( ScGlobal::GetCollator()->compareString( aUpVal1, aUpVal2 )
                 == COMPARE_GREATER )
         {
             //	richtige Reihenfolge fuer Wertebereich
@@ -797,16 +797,16 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const
     switch ( eOp )
     {
         case SC_COND_EQUAL:
-            bValid = (ScGlobal::pCollator->compareString(
+            bValid = (ScGlobal::GetCollator()->compareString(
                 rArg, aUpVal1 ) == COMPARE_EQUAL);
         break;
         case SC_COND_NOTEQUAL:
-            bValid = (ScGlobal::pCollator->compareString(
+            bValid = (ScGlobal::GetCollator()->compareString(
                 rArg, aUpVal1 ) != COMPARE_EQUAL);
         break;
         default:
         {
-            sal_Int32 nCompare = ScGlobal::pCollator->compareString(
+            sal_Int32 nCompare = ScGlobal::GetCollator()->compareString(
                 rArg, aUpVal1 );
             switch ( eOp )
             {
@@ -826,7 +826,7 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const
                 case SC_COND_NOTBETWEEN:
                     //	Test auf NOTBETWEEN:
                     bValid = ( nCompare == COMPARE_LESS ||
-                        ScGlobal::pCollator->compareString( rArg,
+                        ScGlobal::GetCollator()->compareString( rArg,
                         aUpVal2 ) == COMPARE_GREATER );
                     if ( eOp == SC_COND_BETWEEN )
                         bValid = !bValid;
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 911d473c2..9f9dedbf9 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -47,9 +47,23 @@
 #include "docoptio.hxx"
 #include "cellform.hxx"
 
+#include <vector>
+
+using ::rtl::math::approxEqual;
+using ::std::vector;
+using ::rtl::OUString;
 
 // STATIC DATA -----------------------------------------------------------
 
+namespace {
+
+void lcl_toUpper(OUString& rStr)
+{
+    rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, rStr.getLength());
+}
+
+}
+
 ScDocumentIterator::ScDocumentIterator( ScDocument* pDocument,
                             SCTAB nStartTable, SCTAB nEndTable ) :
     pDoc( pDocument ),
@@ -334,7 +348,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr)
         if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= nEndRow )
         {
             nRow = pCol->pItems[nColRow].nRow + 1;
-            if ( !bSubTotal || !pDoc->pTab[nTab]->IsFiltered( nRow-1 ) )
+			if ( !bSubTotal || !pDoc->pTab[nTab]->RowFiltered( nRow-1 ) )
             {
                 ScBaseCell* pCell = pCol->pItems[nColRow].pCell;
                 ++nColRow;
@@ -482,83 +496,85 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
 }
 */
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
+// ============================================================================
 
-ScQueryValueIterator::ScQueryValueIterator(ScDocument* pDocument, SCTAB nTable, const ScQueryParam& rParam) :
-    aParam (rParam),
-    pDoc( pDocument ),
-    nNumFmtIndex(0),
-    nTab( nTable),
-    nNumFmtType( NUMBERFORMAT_UNDEFINED ),
-    bCalcAsShown( pDocument->GetDocOptions().IsCalcAsShown() )
+ScDBQueryDataIterator::DataAccess::DataAccess(const ScDBQueryDataIterator* pParent) :
+    mpParent(pParent)
 {
-    nCol = aParam.nCol1;
-    nRow = aParam.nRow1;
+}
+
+ScDBQueryDataIterator::DataAccess::~DataAccess()
+{
+}
+
+// ----------------------------------------------------------------------------
+
+ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc) :
+    DataAccess(pParent), 
+    mpParam(pParam),
+    mpDoc(pDoc)
+{
+    nCol = mpParam->mnField;
+    nRow = mpParam->nRow1;
+    nTab = mpParam->nTab;
+
     nColRow = 0;					// wird bei GetFirst initialisiert
     SCSIZE i;
-    SCSIZE nCount = aParam.GetEntryCount();
-    for (i=0; (i<nCount) && (aParam.GetEntry(i).bDoQuery); i++)
+	SCSIZE nCount = mpParam->GetEntryCount();
+	for (i=0; (i<nCount) && (mpParam->GetEntry(i).bDoQuery); i++)
     {
-        ScQueryEntry& rEntry = aParam.GetEntry(i);
+		ScQueryEntry& rEntry = mpParam->GetEntry(i);
         sal_uInt32 nIndex = 0;
         rEntry.bQueryByString =
-                !(pDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal));
+				!(mpDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal));
     }
     nNumFormat = 0;					// werden bei GetNumberFormat initialisiert
     pAttrArray = 0;
     nAttrEndRow = 0;
 }
 
-BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr)
+ScDBQueryDataIterator::DataAccessInternal::~DataAccessInternal()
 {
-    ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol];
-    SCCOLROW nFirstQueryField = aParam.GetEntry(0).nField;
+}
+
+bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue)
+{
+	ScColumn* pCol = &(mpDoc->pTab[nTab])->aCol[nCol];
+    SCCOLROW nFirstQueryField = mpParam->GetEntry(0).nField;
     for ( ;; )
     {
-        if ( nRow > aParam.nRow2 )
+        if (nRow > mpParam->nRow2)
         {
-            nRow = aParam.nRow1;
-            if (aParam.bHasHeader)
-                nRow++;
-            do
-            {
-                nCol++;
-                if ( nCol > aParam.nCol2 )
-                {
-                    // rValue = 0.0;    // do not change caller's value!
-                    rErr = 0;
-                    return FALSE;				// Ende und Aus
-                }
-                pCol = &(pDoc->pTab[nTab])->aCol[nCol];
-            } while ( pCol->nCount == 0 );
-            pCol->Search( nRow, nColRow );
+            // Bottom of the range reached.  Bail out.
+            rValue.mnError = 0;
+            return false;
         }
 
         while ( (nColRow < pCol->nCount) && (pCol->pItems[nColRow].nRow < nRow) )
             nColRow++;
 
-        if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= aParam.nRow2 )
+		if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= mpParam->nRow2 )
         {
             nRow = pCol->pItems[nColRow].nRow;
             ScBaseCell* pCell = pCol->pItems[nColRow].pCell;
-            if ( (pDoc->pTab[nTab])->ValidQuery( nRow, aParam, NULL,
+            if ( (mpDoc->pTab[nTab])->ValidQuery( nRow, *mpParam, NULL,
                     (nCol == static_cast<SCCOL>(nFirstQueryField) ? pCell : NULL) ) )
             {
                 switch (pCell->GetCellType())
                 {
                     case CELLTYPE_VALUE:
                         {
-                            rValue = ((ScValueCell*)pCell)->GetValue();
+                            rValue.mfValue = ((ScValueCell*)pCell)->GetValue();
+                            rValue.mbIsNumber = true;
                             if ( bCalcAsShown )
                             {
                                 lcl_IterGetNumberFormat( nNumFormat, pAttrArray,
-                                    nAttrEndRow, pCol->pAttrArray, nRow, pDoc );
-                                rValue = pDoc->RoundValueAsShown( rValue, nNumFormat );
+									nAttrEndRow, pCol->pAttrArray, nRow, mpDoc );
+                                rValue.mfValue = mpDoc->RoundValueAsShown( rValue.mfValue, nNumFormat );
                             }
                             nNumFmtType = NUMBERFORMAT_NUMBER;
                             nNumFmtIndex = 0;
-                            rErr = 0;
+                            rValue.mnError = 0;
                             return TRUE;		// gefunden
                         }
 //                        break;
@@ -566,17 +582,31 @@ BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr)
                         {
                             if (((ScFormulaCell*)pCell)->IsValue())
                             {
-                                rValue = ((ScFormulaCell*)pCell)->GetValue();
-                                pDoc->GetNumberFormatInfo( nNumFmtType,
+                                rValue.mfValue = ((ScFormulaCell*)pCell)->GetValue();
+                                rValue.mbIsNumber = true;
+                                mpDoc->GetNumberFormatInfo( nNumFmtType,
                                     nNumFmtIndex, ScAddress( nCol, nRow, nTab ),
                                     pCell );
-                                rErr = ((ScFormulaCell*)pCell)->GetErrCode();
+                                rValue.mnError = ((ScFormulaCell*)pCell)->GetErrCode();
                                 return TRUE;	// gefunden
                             }
                             else
                                 nRow++;
                         }
                         break;
+                    case CELLTYPE_STRING:
+                    case CELLTYPE_EDIT:
+                        if (mpParam->mbSkipString)
+                            ++nRow;
+                        else
+                        {
+                            rValue.maString = pCell->GetStringData();
+                            rValue.mfValue = 0.0;
+                            rValue.mnError = 0;
+                            rValue.mbIsNumber = false;
+                            return true;
+                        }
+                        break;
                     default:
                         nRow++;
                         break;
@@ -586,30 +616,309 @@ BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr)
                 nRow++;
         }
         else
-            nRow = aParam.nRow2 + 1; // Naechste Spalte
+			nRow = mpParam->nRow2 + 1; // Naechste Spalte
     }
-//    return FALSE;
+    return false;
 }
 
-BOOL ScQueryValueIterator::GetFirst(double& rValue, USHORT& rErr)
+bool ScDBQueryDataIterator::DataAccessInternal::getFirst(Value& rValue)
 {
-    nCol = aParam.nCol1;
-    nRow = aParam.nRow1;
-    if (aParam.bHasHeader)
+    if (mpParam->bHasHeader)
         nRow++;
-//	nColRow = 0;
-    ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol];
+//  nColRow = 0;
+    ScColumn* pCol = &(mpDoc->pTab[nTab])->aCol[nCol];
     pCol->Search( nRow, nColRow );
-    return GetThis(rValue, rErr);
+    return getCurrent(rValue);
 }
 
-BOOL ScQueryValueIterator::GetNext(double& rValue, USHORT& rErr)
+bool ScDBQueryDataIterator::DataAccessInternal::getNext(Value& rValue)
 {
     ++nRow;
-    return GetThis(rValue, rErr);
+    return getCurrent(rValue);
 }
 
-//-------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam) :
+    DataAccess(pParent),
+    mpParam(pParam)
+{
+    SCSIZE nC, nR;
+    mpParam->mpMatrix->GetDimensions(nC, nR);
+    mnRows = static_cast<SCROW>(nR);
+    mnCols = static_cast<SCCOL>(nC);
+}
+
+ScDBQueryDataIterator::DataAccessMatrix::~DataAccessMatrix()
+{
+}
+
+bool ScDBQueryDataIterator::DataAccessMatrix::getCurrent(Value& rValue)
+{
+    // Starting from row == mnCurRow, get the first row that satisfies all the
+    // query parameters.
+    for ( ;mnCurRow < mnRows; ++mnCurRow)
+    {
+        const ScMatrix& rMat = *mpParam->mpMatrix;
+        if (rMat.IsEmpty(mpParam->mnField, mnCurRow))
+            // Don't take empty values into account.
+            continue;
+
+        bool bIsStrVal = rMat.IsString(mpParam->mnField, mnCurRow);
+        if (bIsStrVal && mpParam->mbSkipString)
+            continue;
+
+        if (isValidQuery(mnCurRow, rMat))
+        {
+            rValue.maString = rMat.GetString(mpParam->mnField, mnCurRow);
+            rValue.mfValue = rMat.GetDouble(mpParam->mnField, mnCurRow);
+            rValue.mbIsNumber = !bIsStrVal;
+            rValue.mnError = 0;
+            return true;
+        }
+    }
+    return false;
+}
+
+bool ScDBQueryDataIterator::DataAccessMatrix::getFirst(Value& rValue)
+{
+    mnCurRow = mpParam->bHasHeader ? 1 : 0;
+    return getCurrent(rValue);
+}
+
+bool ScDBQueryDataIterator::DataAccessMatrix::getNext(Value& rValue)
+{
+    ++mnCurRow;
+    return getCurrent(rValue);
+}
+
+namespace {
+
+bool lcl_isQueryByValue(const ScQueryEntry& rEntry, const ScMatrix& rMat, SCSIZE nCol, SCSIZE nRow)
+{
+    if (rEntry.bQueryByString)
+        return false;
+
+    if (!rMat.IsValueOrEmpty(nCol, nRow))
+        return false;
+
+    return true;
+}
+
+bool lcl_isQueryByString(const ScQueryEntry& rEntry, const ScMatrix& rMat, SCSIZE nCol, SCSIZE nRow)
+{
+    switch (rEntry.eOp)
+    {
+        case SC_EQUAL:
+        case SC_NOT_EQUAL:
+        case SC_CONTAINS:
+        case SC_DOES_NOT_CONTAIN:
+        case SC_BEGINS_WITH:
+        case SC_ENDS_WITH:
+        case SC_DOES_NOT_BEGIN_WITH:
+        case SC_DOES_NOT_END_WITH:
+            return true;
+        default:
+            ;
+    }
+
+    if (rEntry.bQueryByString && rMat.IsString(nCol, nRow))
+        return true;
+
+    return false;
+}
+
+}
+
+bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScMatrix& rMat) const
+{
+    SCSIZE nEntryCount = mpParam->GetEntryCount();
+    vector<bool> aResults;
+    aResults.reserve(nEntryCount);
+
+    const CollatorWrapper& rCollator = 
+        mpParam->bCaseSens ? *ScGlobal::GetCaseCollator() : *ScGlobal::GetCollator();
+
+    for (SCSIZE i = 0; i < nEntryCount; ++i)
+    {
+        const ScQueryEntry& rEntry = mpParam->GetEntry(i);
+        if (!rEntry.bDoQuery)
+            continue;
+
+        switch (rEntry.eOp)
+        {
+            case SC_EQUAL:
+            case SC_LESS:
+            case SC_GREATER:
+            case SC_LESS_EQUAL:
+            case SC_GREATER_EQUAL:
+            case SC_NOT_EQUAL:
+                break;
+            default:
+                // Only the above operators are supported.
+                continue;
+        }
+
+        bool bValid = false;
+
+        SCSIZE nField = static_cast<SCSIZE>(rEntry.nField);
+        if (lcl_isQueryByValue(rEntry, rMat, nField, nRow))
+        {
+            // By value
+            double fMatVal = rMat.GetDouble(nField, nRow);
+            bool bEqual = approxEqual(fMatVal, rEntry.nVal);
+            switch (rEntry.eOp)
+            {
+                case SC_EQUAL:
+                    bValid = bEqual;
+                break;
+                case SC_LESS:
+                    bValid = (fMatVal < rEntry.nVal) && !bEqual;
+                break;
+                case SC_GREATER:
+                    bValid = (fMatVal > rEntry.nVal) && !bEqual;
+                break;
+                case SC_LESS_EQUAL:
+                    bValid = (fMatVal < rEntry.nVal) || bEqual;
+                break;
+                case SC_GREATER_EQUAL:
+                    bValid = (fMatVal > rEntry.nVal) || bEqual;
+                break;
+                case SC_NOT_EQUAL:
+                    bValid = !bEqual;
+                break;
+                default:
+                    ;
+            }
+        }
+        else if (lcl_isQueryByString(rEntry, rMat, nField, nRow))
+        {
+            // By string
+            do
+            {
+                if (!rEntry.pStr)
+                    break;
+
+                // Equality check first.
+
+                OUString aMatStr = rMat.GetString(nField, nRow);
+                lcl_toUpper(aMatStr);
+                OUString aQueryStr = *rEntry.pStr;
+                lcl_toUpper(aQueryStr);
+                bool bDone = false;
+                switch (rEntry.eOp)
+                {
+                    case SC_EQUAL:
+                        bValid = aMatStr.equals(aQueryStr);
+                        bDone = true;
+                    break;
+                    case SC_NOT_EQUAL:
+                        bValid = !aMatStr.equals(aQueryStr);
+                        bDone = true;
+                    break;
+                    default:
+                        ;
+                }
+
+                if (bDone)
+                    break;
+
+                // Unequality check using collator.
+
+                sal_Int32 nCompare = rCollator.compareString(aMatStr, aQueryStr);
+                switch (rEntry.eOp)
+                {
+                    case SC_LESS :
+                        bValid = (nCompare < 0);
+                    break;
+                    case SC_GREATER :
+                        bValid = (nCompare > 0);
+                    break;
+                    case SC_LESS_EQUAL :
+                        bValid = (nCompare <= 0);
+                    break;
+                    case SC_GREATER_EQUAL :
+                        bValid = (nCompare >= 0);
+                    break;
+                    default:
+                        ;
+                }
+            }
+            while (false);
+        }
+        else if (mpParam->bMixedComparison)
+        {
+            // Not used at the moment.
+        }
+
+        if (aResults.empty())
+            // First query entry.
+            aResults.push_back(bValid);
+        else if (rEntry.eConnect == SC_AND)
+        {
+            // For AND op, tuck the result into the last result value.
+            size_t n = aResults.size();    
+            aResults[n-1] = aResults[n-1] && bValid;
+        }
+        else
+            // For OR op, store its own result.
+            aResults.push_back(bValid);
+    }
+
+    // Row is valid as long as there is at least one result being true.
+    vector<bool>::const_iterator itr = aResults.begin(), itrEnd = aResults.end();
+    for (; itr != itrEnd; ++itr)
+        if (*itr)
+            return true;
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+
+ScDBQueryDataIterator::Value::Value() :
+    mnError(0), mbIsNumber(true)
+{
+    ::rtl::math::setNan(&mfValue);
+}
+
+// ----------------------------------------------------------------------------
+
+ScDBQueryDataIterator::ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam) :
+    mpParam (pParam)
+{
+    switch (mpParam->GetType())
+    {
+        case ScDBQueryParamBase::INTERNAL:
+        {
+            ScDBQueryParamInternal* p = static_cast<ScDBQueryParamInternal*>(pParam);
+            mpData.reset(new DataAccessInternal(this, p, pDocument));
+        }
+        break;
+        case ScDBQueryParamBase::MATRIX:
+        {
+            ScDBQueryParamMatrix* p = static_cast<ScDBQueryParamMatrix*>(pParam);
+            mpData.reset(new DataAccessMatrix(this, p));
+        }
+    }
+}
+
+bool ScDBQueryDataIterator::GetThis(Value& rValue)
+{
+    return mpData->getCurrent(rValue);
+}
+
+bool ScDBQueryDataIterator::GetFirst(Value& rValue)
+{
+    return mpData->getFirst(rValue);
+}
+
+bool ScDBQueryDataIterator::GetNext(Value& rValue)
+{
+    return mpData->getNext(rValue);
+}
+
+// ============================================================================
 
 ScCellIterator::ScCellIterator( ScDocument* pDocument,
                                 SCCOL nSCol, SCROW nSRow, SCTAB nSTab,
@@ -725,7 +1034,7 @@ ScBaseCell* ScCellIterator::GetThis()
         if ( nColRow < pCol->nCount	&& pCol->pItems[nColRow].nRow <= nEndRow )
         {
             nRow = pCol->pItems[nColRow].nRow;
-            if ( !bSubTotal || !pDoc->pTab[nTab]->IsFiltered( nRow ) )
+			if ( !bSubTotal || !pDoc->pTab[nTab]->RowFiltered( nRow ) )
             {
                 ScBaseCell* pCell = pCol->pItems[nColRow].pCell;
 
@@ -1074,8 +1383,8 @@ ScBaseCell* ScQueryCellIterator::BinarySearch()
 
     ScBaseCell* pCell;
     SCSIZE nHi, nLo;
-    CollatorWrapper* pCollator = (aParam.bCaseSens ? ScGlobal::pCaseCollator :
-        ScGlobal::pCollator);
+    CollatorWrapper* pCollator = (aParam.bCaseSens ? ScGlobal::GetCaseCollator() :
+        ScGlobal::GetCollator());
     SvNumberFormatter& rFormatter = *(pDoc->GetFormatTable());
     const ScQueryEntry& rEntry = aParam.GetEntry(0);
     bool bLessEqual = rEntry.eOp == SC_LESS_EQUAL;
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 8a8da6e0e..1204c1bd1 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -744,7 +744,7 @@ SfxItemPresentation lcl_HFPresentation
 
             default:
                 if ( !pIntl )
-                    pIntl = ScGlobal::pScIntlWrapper;
+                    pIntl = ScGlobal::GetScIntlWrapper();
                 pItem->GetPresentation( ePresentation, eCoreMetric, ePresentationMetric, aText, pIntl );
 
         }
@@ -1021,7 +1021,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation(
 
         default:
             if ( !pIntl )
-                pIntl = ScGlobal::pScIntlWrapper;
+                pIntl = ScGlobal::GetScIntlWrapper();
             ePresentation = rItem.GetPresentation( ePresentation, GetMetric( nW ), ePresentationMetric, rText, pIntl );
         break;
     }
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index a4499b2fe..481178c5d 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -86,7 +86,6 @@
 #include "editutil.hxx"
 #include "hints.hxx"
 #include "dpobject.hxx"
-#include "indexmap.hxx"
 #include "scrdata.hxx"
 #include "poolhelp.hxx"
 #include "unoreflist.hxx"
@@ -95,10 +94,10 @@
 #include "lookupcache.hxx"
 #include "externalrefmgr.hxx"
 #include "tabprotection.hxx"
+#include "formulaparserpool.hxx"
 #include "clipparam.hxx"
 #include "macromgr.hxx"
 #include <com/sun/star/document/XVbaEventsHelper.hpp>
-#include "formulaparserpool.hxx"
 
 // pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
 // dtor plus helpers are convenient.
@@ -158,8 +157,9 @@ ScDocument::ScDocument( ScDocumentMode	eMode,
         pScriptTypeData( NULL ),
         pCacheFieldEditEngine( NULL ),
         pDocProtection( NULL ),
-        mpClipParam( NULL ),
+        mpClipParam( NULL),
         mpMacroMgr( NULL ), 
+        pExternalRefMgr( NULL ),
         pViewOptions( NULL ),
         pDocOptions( NULL ),
         pExtDocOptions( NULL ),
@@ -222,6 +222,7 @@ ScDocument::ScDocument( ScDocumentMode	eMode,
         mbAdjustHeightEnabled( true ),
         mbExecuteLinkEnabled( true ),
         mbChangeReadOnlyEnabled( false ),
+        mbStreamValidLocked( false ),
         mnNamedRangesLockCount( 0 )
 {
     SetStorageGrammar( formula::FormulaGrammar::GRAM_STORAGE_DEFAULT);
@@ -266,6 +267,15 @@ ScDocument::ScDocument( ScDocumentMode	eMode,
     aTrackTimer.SetTimeout( 100 );
 }
 
+SvxLinkManager*	ScDocument::GetLinkManager()  const
+{ 
+    if ( bAutoCalc && !pLinkManager && pShell)
+    {
+        pLinkManager = new SvxLinkManager( pShell );
+    }
+    return pLinkManager; 
+}
+
 
 void ScDocument::SetStorageGrammar( formula::FormulaGrammar::Grammar eGram )
 {
@@ -376,7 +386,7 @@ ScDocument::~ScDocument()
 
     // Links aufrauemen
 
-    if ( pLinkManager )
+    if ( GetLinkManager() )
     {
         // BaseLinks freigeben
         for ( USHORT n = pLinkManager->GetServers().Count(); n; )
@@ -988,7 +998,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
             // array containing range names which might need update of indices
             ScRangeData** pSrcRangeNames = nSrcRangeNames ? new ScRangeData* [nSrcRangeNames] : NULL;
             // the index mapping thereof
-            ScIndexMap aSrcRangeMap( nSrcRangeNames );
+            ScRangeData::IndexMap aSrcRangeMap;
             BOOL bRangeNameReplace = FALSE;
 
             // find named ranges that are used in the source sheet
@@ -1013,7 +1023,8 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
                         USHORT nExistingIndex = pExistingData->GetIndex();
 
                         pSrcRangeNames[i] = NULL;       // don't modify the named range
-                        aSrcRangeMap.SetPair( i, nOldIndex, nExistingIndex );
+                        aSrcRangeMap.insert(
+                            ScRangeData::IndexMap::value_type(nOldIndex, nExistingIndex));
                         bRangeNameReplace = TRUE;
                         bNamesLost = TRUE;
                     }
@@ -1033,7 +1044,8 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
                             pData->TransferTabRef( nSrcPos, nDestPos );
                             pSrcRangeNames[i] = pData;
                             USHORT nNewIndex = pData->GetIndex();
-                            aSrcRangeMap.SetPair( i, nOldIndex, nNewIndex );
+                            aSrcRangeMap.insert(
+                                ScRangeData::IndexMap::value_type(nOldIndex, nNewIndex));
                             if ( !bRangeNameReplace )
                                 bRangeNameReplace = ( nOldIndex != nNewIndex );
                         }
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 263619b1b..4c8cb8026 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -80,8 +80,8 @@
 #include "unoreflist.hxx"
 #include "listenercalls.hxx"
 #include "tabprotection.hxx"
-#include "clipparam.hxx"
 #include "formulaparserpool.hxx"
+#include "clipparam.hxx"
 
 #include <memory>
 
@@ -430,7 +430,7 @@ BOOL ScDocument::LinkExternalTab( SCTAB& rTab, const String& aDocTab,
     {
         ScTableLink* pLink = new ScTableLink( pShell, aFileName, aFilterName, aOptions, nRefreshDelay );
         pLink->SetInCreate( TRUE );
-        pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aFileName,
+        GetLinkManager()->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aFileName,
                                         &aFilterName );
         pLink->Update();
         pLink->SetInCreate( FALSE );
@@ -856,7 +856,7 @@ void ScDocument::UpdateReference( UpdateRefMode eUpdateRefMode,
         {
             ScDocument* pClipDoc = SC_MOD()->GetClipDoc();
             if (pClipDoc)
-				pClipDoc->GetClipParam().mbCutMode = false;
+                pClipDoc->GetClipParam().mbCutMode = false;
         }
     }
 }
@@ -1123,15 +1123,6 @@ BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem,
     return bFound;
 }
 
-BOOL ScDocument::IsFiltered( SCROW nRow, SCTAB nTab ) const
-{
-    if (VALIDTAB(nTab))
-        if (pTab[nTab])
-            return pTab[nTab]->IsFiltered( nRow );
-    DBG_ERROR("Falsche Tabellennummer");
-    return 0;
-}
-
 //	Outline anpassen
 
 BOOL ScDocument::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow )
@@ -1252,6 +1243,7 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
     //if (VALIDTAB(nTab))
     //	if (pTab[nTab])
     //		return pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow );
+
     //return FALSE;
 }
 
@@ -1270,7 +1262,9 @@ void ScDocument::UpdateDynamicEndRow(ScDBData& rDBData) const
 //
 //	GetFilterEntries - Eintraege fuer AutoFilter-Listbox
 //
-BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScStrCollection& rStrings, bool bFilter )
+
+BOOL ScDocument::GetFilterEntries(
+    SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates)
 {
     if ( ValidTab(nTab) && pTab[nTab] && pDBCollection )
     {
@@ -1309,11 +1303,11 @@ BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScSt
 
             if ( bFilter )
             {
-                pTab[nTab]->GetFilteredFilterEntries( nCol, nStartRow, nEndRow, aParam, rStrings );
+                pTab[nTab]->GetFilteredFilterEntries( nCol, nStartRow, nEndRow, aParam, rStrings, rHasDates );
             }
             else
             {
-                pTab[nTab]->GetFilterEntries( nCol, nStartRow, nEndRow, rStrings );
+                pTab[nTab]->GetFilterEntries( nCol, nStartRow, nEndRow, rStrings, rHasDates );
             }
 
             return TRUE;
@@ -1328,11 +1322,11 @@ BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScSt
 //
 
 BOOL ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow,
-                                        SCTAB nTab, TypedScStrCollection& rStrings )
+                                        SCTAB nTab, TypedScStrCollection& rStrings, bool& rHasDates )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
     {
-        pTab[nTab]->GetFilterEntries( nCol, nStartRow, nEndRow, rStrings );
+        pTab[nTab]->GetFilterEntries( nCol, nStartRow, nEndRow, rStrings, rHasDates );
         return TRUE;
     }
 
@@ -1555,46 +1549,43 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect )
     nTwips = (long) (aPosRect.Top() / HMM_PER_TWIPS);
 
     SCROW nY1 = 0;
-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
-            *(pTable->GetRowFlagsArray()), nY1, MAXROW, CR_HIDDEN, 0,
-            *(pTable->GetRowHeightArray()));
     bEnd = FALSE;
-    while (!bEnd && aIter)
+    for (SCROW i = nY1; i <= MAXROW && !bEnd; ++i)
     {
-        nY1 = aIter.GetPos();
-        nAdd = (long) *aIter;
+        if (pTable->RowHidden(i))
+            continue;
+
+        nY1 = i;
+        nAdd = static_cast<long>(pTable->GetRowHeight(i));
         if (nSize+nAdd <= nTwips+1 && nY1<MAXROW)
         {
             nSize += nAdd;
             ++nY1;
-            ++aIter;
         }
         else
             bEnd = TRUE;
     }
-    if (!aIter)
-        nY1 = aIter.GetIterEnd();   // all hidden down to the bottom
+    if (!bEnd)
+        nY1 = MAXROW;   // all hidden down to the bottom
 
     nTwips = (long) (aPosRect.Bottom() / HMM_PER_TWIPS);
 
     SCROW nY2 = nY1;
-    aIter.NewLimits( nY2, MAXROW);
     bEnd = FALSE;
-    while (!bEnd && aIter)
+    for (SCROW i = nY2; i <= MAXROW && !bEnd; ++i)
     {
-        nY2 = aIter.GetPos();
-        nAdd = (long) *aIter;
+        nY2 = i;
+        nAdd = static_cast<long>(pTable->GetRowHeight(i));
         if (nSize+nAdd < nTwips && nY2<MAXROW)
         {
             nSize += nAdd;
             ++nY2;
-            ++aIter;
         }
         else
             bEnd = TRUE;
     }
-    if (!aIter)
-        nY2 = aIter.GetIterEnd();   // all hidden down to the bottom
+    if (!bEnd)
+        nY2 = MAXROW;   // all hidden down to the bottom
 
     return ScRange( nX1,nY1,nTab, nX2,nY2,nTab );
 }
@@ -1632,24 +1623,33 @@ void lcl_SnapVer( ScTable* pTable, long& rVal, SCROW& rStartRow )
     SCROW nRow = 0;
     long nTwips = (long) (rVal / HMM_PER_TWIPS);
     long nSnap = 0;
-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
-            *(pTable->GetRowFlagsArray()), nRow, MAXROW, CR_HIDDEN, 0,
-            *(pTable->GetRowHeightArray()));
-    while ( aIter )
+
+    bool bFound = false;
+    for (SCROW i = nRow; i <= MAXROW; ++i)
     {
-        nRow = aIter.GetPos();
-        long nAdd = *aIter;
+        SCROW nLastRow;
+        if (pTable->RowHidden(i, NULL, &nLastRow))
+        {
+            i = nLastRow;    
+            continue;
+        }
+
+        nRow = i;
+		long nAdd = pTable->GetRowHeight(i);
         if ( nSnap + nAdd/2 < nTwips || nRow < rStartRow )
         {
             nSnap += nAdd;
             ++nRow;
-            ++aIter;
         }
         else
+        {
+            bFound = true;    
             break;
+        }
     }
-    if (!aIter)
+    if (!bFound)
         nRow = MAXROW;  // all hidden down to the bottom
+
     rVal = (long) ( nSnap * HMM_PER_TWIPS );
     rStartRow = nRow;
 }
@@ -1752,10 +1752,8 @@ void ScDocument::SetDocOptions( const ScDocOptions& rOpt )
     *pDocOptions = rOpt;
     rOpt.GetDate( d,m,y );
 
-    SvNumberFormatter* pFormatter = xPoolHelper->GetFormTable();
-    pFormatter->ChangeNullDate( d,m,y );
-    pFormatter->ChangeStandardPrec( (USHORT)rOpt.GetStdPrecision() );
-    pFormatter->SetYear2000( rOpt.GetYear2000() );
+    xPoolHelper->SetFormTableOpt(rOpt);
+
     SetGrammar( rOpt.GetFormulaSyntax() );
 
     // Update the separators.
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 172b49db5..31fc96194 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -133,6 +133,13 @@ void ScDocument::Broadcast( const ScHint& rHint )
     //	Repaint fuer bedingte Formate mit relativen Referenzen:
     if ( pCondFormList && rHint.GetAddress() != BCA_BRDCST_ALWAYS )
         pCondFormList->SourceChanged( rHint.GetAddress() );
+
+    if ( rHint.GetAddress() != BCA_BRDCST_ALWAYS )
+    {
+        SCTAB nTab = rHint.GetAddress().Tab();
+        if (pTab[nTab] && pTab[nTab]->IsStreamValid())
+            pTab[nTab]->SetStreamValid(FALSE);
+    }
 }
 
 
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 78be061c3..32868f2f2 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -96,6 +96,7 @@
 #include "globstr.hrc"
 #include "sc.hrc"
 #include "charthelper.hxx"
+#include "dpobject.hxx"
 #include "macromgr.hxx"
 
 #define GET_SCALEVALUE(set,id) 	((const SfxUInt16Item&)(set.Get( id ))).GetValue()
@@ -272,6 +273,11 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet,
                 if ( ScGlobal::CheckWidthInvalidate( bNumFormatChanged,
                         rSet, rChanges ) )
                     InvalidateTextWidth( NULL, NULL, bNumFormatChanged );
+
+                for (SCTAB nTab=0; nTab<=MAXTAB; ++nTab)
+                    if (pTab[nTab] && pTab[nTab]->IsStreamValid())
+                        pTab[nTab]->SetStreamValid( FALSE );
+
                 ULONG nOldFormat =
                     ((const SfxUInt32Item*)&rSet.Get(
                     ATTR_VALUE_FORMAT ))->GetValue();
@@ -709,8 +715,13 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
     //	skip everything left of rSpellPos:
     while ( pCell && nRow == rSpellPos.Row() && nCol < rSpellPos.Col() )
         pCell = aIter.GetNext( nCol, nRow );
-    while ( pCell )
+
+	for (; pCell; pCell = aIter.GetNext(nCol, nRow))
     {
+        if (pDPCollection && pDPCollection->HasDPTable(nCol, nRow, nTab))
+            // Don't spell check within datapilot table.
+            continue;
+
         CellType eType = pCell->GetCellType();
         if ( eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT )
         {
@@ -795,8 +806,6 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
 
         if ( ++nCellCount >= SPELL_MAXCELLS )			// seen enough cells?
             break;
-
-        pCell = aIter.GetNext( nCol, nRow );
     }
 
     if ( pCell )
@@ -916,7 +925,7 @@ BOOL ScDocument::IdleCheckLinks()			// TRUE = demnaechst wieder versuchen
 {
     BOOL bAnyLeft = FALSE;
 
-    if (pLinkManager)
+    if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
         USHORT nCount = rLinks.Count();
@@ -944,7 +953,7 @@ void ScDocument::SaveDdeLinks(SvStream& rStream) const
     //	bei 4.0-Export alle mit Modus != DEFAULT weglassen
     BOOL bExport40 = ( rStream.GetVersion() <= SOFFICE_FILEFORMAT_40 );
 
-    const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
+    const ::sfx2::SvBaseLinks& rLinks = GetLinkManager()->GetLinks();
     USHORT nCount = rLinks.Count();
 
     //	erstmal zaehlen...
@@ -982,6 +991,7 @@ void ScDocument::LoadDdeLinks(SvStream& rStream)
 {
     ScMultipleReadHeader aHdr( rStream );
 
+    GetLinkManager();
     USHORT nCount;
     rStream >> nCount;
     for (USHORT i=0; i<nCount; i++)
@@ -994,7 +1004,7 @@ void ScDocument::LoadDdeLinks(SvStream& rStream)
 
 BOOL ScDocument::HasDdeLinks() const
 {
-    if (pLinkManager)			// Clipboard z.B. hat keinen LinkManager
+    if (GetLinkManager())			// Clipboard z.B. hat keinen LinkManager
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
         USHORT nCount = rLinks.Count();
@@ -1021,7 +1031,7 @@ BOOL ScDocument::IsInLinkUpdate() const
 
 void ScDocument::UpdateExternalRefLinks()
 {
-    if (!pLinkManager)
+    if (!GetLinkManager())
         return;
 
     const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
@@ -1060,7 +1070,7 @@ void ScDocument::UpdateExternalRefLinks()
 
 void ScDocument::UpdateDdeLinks()
 {
-    if (pLinkManager)
+    if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
         USHORT nCount = rLinks.Count();
@@ -1106,7 +1116,7 @@ BOOL ScDocument::UpdateDdeLink( const String& rAppl, const String& rTopic, const
     //!	wenn's mal alles asynchron wird, aber auch hier
 
     BOOL bFound = FALSE;
-    if (pLinkManager)
+    if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
         USHORT nCount = rLinks.Count();
@@ -1131,7 +1141,7 @@ BOOL ScDocument::UpdateDdeLink( const String& rAppl, const String& rTopic, const
 
 void ScDocument::DisconnectDdeLinks()
 {
-    if (pLinkManager)
+    if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
         USHORT nCount = rLinks.Count();
@@ -1154,7 +1164,7 @@ void ScDocument::CopyDdeLinks( ScDocument* pDestDoc ) const
             pDestDoc->LoadDdeLinks(*pClipData);
         }
     }
-    else if (pLinkManager)              // Links direkt kopieren
+    else if (GetLinkManager())              // Links direkt kopieren
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
         USHORT nCount = rLinks.Count();
@@ -1175,7 +1185,7 @@ void ScDocument::CopyDdeLinks( ScDocument* pDestDoc ) const
 USHORT ScDocument::GetDdeLinkCount() const
 {
     USHORT nDdeCount = 0;
-    if (pLinkManager)
+    if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
         USHORT nCount = rLinks.Count();
@@ -1251,12 +1261,12 @@ ScDdeLink* lclGetDdeLink( const SvxLinkManager* pLinkManager, USHORT nDdePos )
 
 bool ScDocument::FindDdeLink( const String& rAppl, const String& rTopic, const String& rItem, BYTE nMode, USHORT& rnDdePos )
 {
-    return lclGetDdeLink( pLinkManager, rAppl, rTopic, rItem, nMode, &rnDdePos ) != NULL;
+    return lclGetDdeLink( GetLinkManager(), rAppl, rTopic, rItem, nMode, &rnDdePos ) != NULL;
 }
 
 bool ScDocument::GetDdeLinkData( USHORT nDdePos, String& rAppl, String& rTopic, String& rItem ) const
 {
-    if( const ScDdeLink* pDdeLink = lclGetDdeLink( pLinkManager, nDdePos ) )
+    if( const ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos ) )
     {
         rAppl  = pDdeLink->GetAppl();
         rTopic = pDdeLink->GetTopic();
@@ -1268,7 +1278,7 @@ bool ScDocument::GetDdeLinkData( USHORT nDdePos, String& rAppl, String& rTopic,
 
 bool ScDocument::GetDdeLinkMode( USHORT nDdePos, BYTE& rnMode ) const
 {
-    if( const ScDdeLink* pDdeLink = lclGetDdeLink( pLinkManager, nDdePos ) )
+    if( const ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos ) )
     {
         rnMode = pDdeLink->GetMode();
         return true;
@@ -1278,7 +1288,7 @@ bool ScDocument::GetDdeLinkMode( USHORT nDdePos, BYTE& rnMode ) const
 
 const ScMatrix* ScDocument::GetDdeLinkResultMatrix( USHORT nDdePos ) const
 {
-    const ScDdeLink* pDdeLink = lclGetDdeLink( pLinkManager, nDdePos );
+    const ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos );
     return pDdeLink ? pDdeLink->GetResult() : NULL;
 }
 
@@ -1289,7 +1299,7 @@ bool ScDocument::CreateDdeLink( const String& rAppl, const String& rTopic, const
         on existing and new links. */
     //! store DDE links additionally at document (for efficiency)?
     DBG_ASSERT( nMode != SC_DDE_IGNOREMODE, "ScDocument::CreateDdeLink - SC_DDE_IGNOREMODE not allowed here" );
-    if( pLinkManager && (nMode != SC_DDE_IGNOREMODE) )
+    if( GetLinkManager() && (nMode != SC_DDE_IGNOREMODE) )
     {
         ScDdeLink* pDdeLink = lclGetDdeLink( pLinkManager, rAppl, rTopic, rItem, nMode );
         if( !pDdeLink )
@@ -1310,7 +1320,7 @@ bool ScDocument::CreateDdeLink( const String& rAppl, const String& rTopic, const
 
 bool ScDocument::SetDdeLinkResultMatrix( USHORT nDdePos, ScMatrix* pResults )
 {
-    if( ScDdeLink* pDdeLink = lclGetDdeLink( pLinkManager, nDdePos ) )
+    if( ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos ) )
     {
         pDdeLink->SetResult( pResults );
         return true;
@@ -1322,7 +1332,7 @@ bool ScDocument::SetDdeLinkResultMatrix( USHORT nDdePos, ScMatrix* pResults )
 
 BOOL ScDocument::HasAreaLinks() const
 {
-    if (pLinkManager)			// Clipboard z.B. hat keinen LinkManager
+    if (GetLinkManager())			// Clipboard z.B. hat keinen LinkManager
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
         USHORT nCount = rLinks.Count();
@@ -1336,7 +1346,7 @@ BOOL ScDocument::HasAreaLinks() const
 
 void ScDocument::UpdateAreaLinks()
 {
-    if (pLinkManager)
+    if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
         USHORT nCount = rLinks.Count();
@@ -1351,7 +1361,7 @@ void ScDocument::UpdateAreaLinks()
 
 void ScDocument::DeleteAreaLinksOnTab( SCTAB nTab )
 {
-    if (pLinkManager)
+    if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
         USHORT nPos = 0;
@@ -1370,7 +1380,7 @@ void ScDocument::DeleteAreaLinksOnTab( SCTAB nTab )
 void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
                              const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    if (pLinkManager)
+    if (GetLinkManager())
     {
         bool bAnyUpdate = false;
 
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index d220e3a79..5591d98b1 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -223,7 +223,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
         if ( pShell && !pShell->IsLoading() )		// #88438# don't call GetTitle while loading
             aName = pShell->GetTitle();
         pDrawLayer = new ScDrawLayer( this, aName );
-        if (pLinkManager)
+        if (GetLinkManager())
             pDrawLayer->SetLinkManager( pLinkManager );
 
         //	Drawing pages are accessed by table number, so they must also be present
@@ -245,7 +245,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
                 pTab[nTab]->GetName(aTabName);
                 pDrawLayer->ScRenamePage( nTab, aTabName );
 
-                pTab[nTab]->SetDrawPageSize();	// #54782# sofort die richtige Groesse
+                pTab[nTab]->SetDrawPageSize(false);     // #54782# set the right size immediately
 #if 0
                 ULONG nx = (ULONG) ((double) (MAXCOL+1) * STD_COL_WIDTH			  * HMM_PER_TWIPS );
                 ULONG ny = (ULONG) ((double) (MAXROW+1) * ScGlobal::nStdRowHeight * HMM_PER_TWIPS );
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index a457512ce..09308c1ae 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -54,6 +54,7 @@
 #include <tools/tenccvt.hxx>
 
 #include <com/sun/star/text/WritingMode2.hpp>
+#include <com/sun/star/sheet/TablePageBreakData.hpp>
 
 #include "document.hxx"
 #include "table.hxx"
@@ -84,7 +85,6 @@
 #include "detdata.hxx"
 #include "cell.hxx"
 #include "dpobject.hxx"
-#include "indexmap.hxx"
 #include "detfunc.hxx"		// for UpdateAllComments
 #include "scmod.hxx"
 #include "dociter.hxx"
@@ -99,10 +99,14 @@
 #include <com/sun/star/container/XContainer.hpp>
 
 #include <map>
+#include <limits>
 
 using namespace ::com::sun::star;
 
 namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::sheet::TablePageBreakData;
+using ::std::set;
 
 struct ScDefaultAttr
 {
@@ -122,13 +126,14 @@ struct ScLessDefaultAttr
 
 typedef std::set<ScDefaultAttr, ScLessDefaultAttr>	ScDefaultAttrSet;
 
-void ScDocument::MakeTable( SCTAB nTab )
+void ScDocument::MakeTable( SCTAB nTab,bool _bNeedsNameCheck )
 {
     if ( ValidTab(nTab) && !pTab[nTab] )
     {
         String aString = ScGlobal::GetRscString(STR_TABLE_DEF); //"Tabelle"
         aString += String::CreateFromInt32(nTab+1);
-        CreateValidTabName( aString );	// keine doppelten
+        if ( _bNeedsNameCheck )
+            CreateValidTabName( aString );	// keine doppelten
 
         pTab[nTab] = new ScTable(this, nTab, aString);
         ++nMaxTableNumber;
@@ -252,7 +257,7 @@ BOOL ScDocument::ValidNewTabName( const String& rName ) const
         {
             String aOldName;
             pTab[i]->GetName(aOldName);
-            bValid = !ScGlobal::pTransliteration->isEqual( rName, aOldName );
+            bValid = !ScGlobal::GetpTransliteration()->isEqual( rName, aOldName );
         }
     return bValid;
 }
@@ -507,7 +512,7 @@ BOOL ScDocument::RenameTab( SCTAB nTab, const String& rName, BOOL /* bUpdateRef
                 {
                     String aOldName;
                     pTab[i]->GetName(aOldName);
-                    bValid = !ScGlobal::pTransliteration->isEqual( rName, aOldName );
+                    bValid = !ScGlobal::GetpTransliteration()->isEqual( rName, aOldName );
                 }
             if (bValid)
             {
@@ -540,6 +545,28 @@ BOOL ScDocument::IsVisible( SCTAB nTab ) const
 }
 
 
+BOOL ScDocument::IsStreamValid( SCTAB nTab ) const
+{
+    if ( ValidTab(nTab) && pTab[nTab] )
+        return pTab[nTab]->IsStreamValid();
+
+    return FALSE;
+}
+
+
+void ScDocument::SetStreamValid( SCTAB nTab, BOOL bSet, BOOL bIgnoreLock )
+{
+    if ( ValidTab(nTab) && pTab[nTab] )
+        pTab[nTab]->SetStreamValid( bSet, bIgnoreLock );
+}
+
+
+void ScDocument::LockStreamValid( bool bLock )
+{
+    mbStreamValidLocked = bLock;
+}
+
+
 BOOL ScDocument::IsPendingRowHeights( SCTAB nTab ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
@@ -681,7 +708,7 @@ bool ScDocument::ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow
 //	zusammenhaengender Bereich
 
 void ScDocument::GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
-								SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld ) const
+                              SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld ) const
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
@@ -1424,7 +1451,7 @@ void ScDocument::SetCutMode( BOOL bVal )
 BOOL ScDocument::IsCutMode()
 {
     if (bIsClip)
-		return GetClipParam().mbCutMode;
+        return GetClipParam().mbCutMode;
     else
     {
         DBG_ERROR("IsCutMode ohne bIsClip");
@@ -1536,57 +1563,12 @@ void ScDocument::UndoToDocument(const ScRange& rRange,
     pDestDoc->SetAutoCalc( bOldAutoCalc );
 }
 
-
-void ScDocument::CopyToClip(SCCOL nCol1, SCROW nRow1,
-                            SCCOL nCol2, SCROW nRow2,
-                            BOOL bCut, ScDocument* pClipDoc,
-                            BOOL bAllTabs, const ScMarkData* pMarks,
-                            BOOL bKeepScenarioFlags, BOOL bIncludeObjects, BOOL bCloneNoteCaptions)
-{
-    DBG_ASSERT( bAllTabs || pMarks, "CopyToClip: ScMarkData fehlt" );
-
-    if (!bIsClip)
-    {
-        PutInOrder( nCol1, nCol2 );
-        PutInOrder( nRow1, nRow2 );
-        if (!pClipDoc)
-        {
-            DBG_ERROR("CopyToClip: no ClipDoc");
-            pClipDoc = SC_MOD()->GetClipDoc();
-        }
-
-        ScRange aClipRange(nCol1, nRow1, 0, nCol2, nRow2, 0);
-        ScClipParam& rClipParam = pClipDoc->GetClipParam();
-        rClipParam.maRanges.RemoveAll();
-        rClipParam.maRanges.Append(aClipRange);
-        pClipDoc->aDocName = aDocName;
-        pClipDoc->ResetClip( this, pMarks );
-
-        CopyRangeNamesToClip(pClipDoc, aClipRange, pMarks, bAllTabs);
-
-		for (SCTAB j = 0; j <= MAXTAB; j++)
-            if (pTab[j] && pClipDoc->pTab[j])
-                if ( bAllTabs || !pMarks || pMarks->GetTableSelect(j) )
-                {
-                    pTab[j]->CopyToClip(nCol1, nRow1, nCol2, nRow2, pClipDoc->pTab[j], bKeepScenarioFlags, bCloneNoteCaptions);
-
-                    if ( pDrawLayer && bIncludeObjects )
-                    {
-                        //	also copy drawing objects
-
-                        Rectangle aObjRect = GetMMRect( nCol1, nRow1, nCol2, nRow2, j );
-                        pDrawLayer->CopyToClip( pClipDoc, j, aObjRect );
-                    }
-                }
-
-		pClipDoc->GetClipParam().mbCutMode = bCut;
-    }
-}
-
 void ScDocument::CopyToClip(const ScClipParam& rClipParam, 
                             ScDocument* pClipDoc, const ScMarkData* pMarks,
-                            bool bKeepScenarioFlags, bool bIncludeObjects, bool bCloneNoteCaptions)
+                            bool bAllTabs, bool bKeepScenarioFlags, bool bIncludeObjects, bool bCloneNoteCaptions)
 {
+    DBG_ASSERT( bAllTabs || pMarks, "CopyToClip: ScMarkData fehlt" );
+
     if (bIsClip)
         return;
 
@@ -1601,7 +1583,7 @@ void ScDocument::CopyToClip(const ScClipParam& rClipParam,
     pClipDoc->ResetClip(this, pMarks);
 
     ScRange aClipRange = rClipParam.getWholeRange();
-    CopyRangeNamesToClip(pClipDoc, aClipRange, pMarks, false);
+    CopyRangeNamesToClip(pClipDoc, aClipRange, pMarks, bAllTabs);
 
     for (SCTAB i = 0; i <= MAXTAB; ++i)
     {
@@ -1616,9 +1598,8 @@ void ScDocument::CopyToClip(const ScClipParam& rClipParam,
         if (pDrawLayer && bIncludeObjects)
         {
             //	also copy drawing objects
-            const ScRange aRange = rClipParam.getWholeRange();
             Rectangle aObjRect = GetMMRect(
-                aRange.aStart.Col(), aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row(), i);
+                aClipRange.aStart.Col(), aClipRange.aStart.Row(), aClipRange.aEnd.Col(), aClipRange.aEnd.Row(), i);
             pDrawLayer->CopyToClip(pClipDoc, i, aObjRect);
         }
     }
@@ -1839,8 +1820,8 @@ void ScDocument::UpdateRangeNamesInFormulas(
 
     // first update all inserted named formulas if they contain other
     // range names and used indices changed
-    sal_uInt16 nRangeNameCount = rRangeNames.mpRangeNames.size();
-    for (sal_uInt16 i = 0; i < nRangeNameCount; ++i)        //! DB-Bereiche Pivot-Bereiche auch
+    size_t nRangeNameCount = rRangeNames.mpRangeNames.size();
+    for (size_t i = 0; i < nRangeNameCount; ++i)        //! DB-Bereiche Pivot-Bereiche auch
     {
         if ( rRangeNames.mpRangeNames[i] )
             rRangeNames.mpRangeNames[i]->ReplaceRangeNamesInUse(rRangeNames.maRangeMap);
@@ -2034,11 +2015,8 @@ void ScDocument::CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1,
     while ( nFlagTab < MAXTAB && !ppClipTab[nFlagTab] )
         ++nFlagTab;
 
-    const ScBitMaskCompressedArray< SCROW, BYTE> & rSourceFlags =
-        pCBFCP->pClipDoc->GetRowFlagsArray( nFlagTab);
-
     SCROW nSourceRow = rClipStartRow;
-	SCROW nSourceEnd = 0;
+    SCROW nSourceEnd = 0;
     if (pCBFCP->pClipDoc->GetClipParam().maRanges.Count())
         nSourceEnd = pCBFCP->pClipDoc->GetClipParam().maRanges.First()->aEnd.Row();
     SCROW nDestRow = nRow1;
@@ -2046,12 +2024,15 @@ void ScDocument::CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1,
     while ( nSourceRow <= nSourceEnd && nDestRow <= nRow2 )
     {
         // skip filtered rows
-        nSourceRow = rSourceFlags.GetFirstForCondition( nSourceRow, nSourceEnd, CR_FILTERED, 0);
+        nSourceRow = pCBFCP->pClipDoc->FirstNonFilteredRow(nSourceRow, nSourceEnd, nFlagTab);
 
         if ( nSourceRow <= nSourceEnd )
         {
             // look for more non-filtered rows following
-            SCROW nFollow = rSourceFlags.GetBitStateEnd( nSourceRow, CR_FILTERED, 0) - nSourceRow;
+            SCROW nLastRow = nSourceRow;
+            pCBFCP->pClipDoc->RowFiltered(nSourceRow, nFlagTab, NULL, &nLastRow);
+            SCROW nFollow = nLastRow - nSourceRow;
+
             if (nFollow > nSourceEnd - nSourceRow)
                 nFollow = nSourceEnd - nSourceRow;
             if (nFollow > nRow2 - nDestRow)
@@ -2261,6 +2242,21 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
     }
 }
 
+static SCROW lcl_getLastNonFilteredRow(
+    const ScBitMaskCompressedArray<SCROW, BYTE>& rFlags, SCROW nBegRow, SCROW nEndRow, 
+    SCROW nRowCount)
+{
+    SCROW nFilteredRow = rFlags.GetFirstForCondition(
+        nBegRow, nEndRow, CR_FILTERED, CR_FILTERED);
+
+    SCROW nRow = nFilteredRow - 1;
+    if (nRow - nBegRow + 1 > nRowCount)
+        // make sure the row range stays within the data size.
+        nRow = nBegRow + nRowCount - 1;
+
+    return nRow;
+}
+
 void ScDocument::CopyMultiRangeFromClip(
     const ScAddress& rDestPos, const ScMarkData& rMark, sal_uInt16 nInsFlag, ScDocument* pClipDoc,
     bool bResetCut, bool bAsLink, bool /*bIncludeFiltered*/, bool bSkipAttrForEmpty)
@@ -2293,8 +2289,6 @@ void ScDocument::CopyMultiRangeFromClip(
     aCBFCP.nTabStart = MAXTAB;
     aCBFCP.nTabEnd = 0;
 
-    SCCOL nCols = rClipParam.getPasteColSize();
-    SCROW nRows = rClipParam.getPasteRowSize();
     for (SCTAB j = 0; j <= MAXTAB; ++j)
     {    
         if (pTab[j] && rMark.GetTableSelect(j))
@@ -2306,27 +2300,62 @@ void ScDocument::CopyMultiRangeFromClip(
         }
     }
 
+    ScRange aDestRange;
+    rMark.GetMarkArea(aDestRange);
+    SCROW nLastMarkedRow = aDestRange.aEnd.Row();
+
     bInsertingFromOtherDoc = TRUE;  // kein Broadcast/Listener aufbauen bei Insert
 
-    if (!bSkipAttrForEmpty)
-    {
-        sal_uInt16 nDelFlag = IDF_CONTENTS;
-        DeleteArea(nCol1, nRow1, nCol1+nCols-1, nRow1+nRows-1, rMark, nDelFlag);
-    }
+    SCROW nBegRow = nRow1;
+    sal_uInt16 nDelFlag = IDF_CONTENTS;
+    const ScBitMaskCompressedArray<SCROW, BYTE>& rFlags = GetRowFlagsArray(aCBFCP.nTabStart);
 
     for (ScRange* p = rClipParam.maRanges.First(); p; p = rClipParam.maRanges.Next())
     {
+        // The begin row must not be filtered.
+
+        SCROW nRowCount = p->aEnd.Row() - p->aStart.Row() + 1;
+
         SCsCOL nDx = static_cast<SCsCOL>(nCol1 - p->aStart.Col());
-        SCsROW nDy = static_cast<SCsROW>(nRow1 - p->aStart.Row());
+        SCsROW nDy = static_cast<SCsROW>(nBegRow - p->aStart.Row());
         SCCOL nCol2 = nCol1 + p->aEnd.Col() - p->aStart.Col();
-        SCROW nRow2 = nRow1 + p->aEnd.Row() - p->aStart.Row();
-    
-        CopyBlockFromClip(nCol1, nRow1, nCol2, nRow2, rMark, nDx, nDy, &aCBFCP);
+
+        SCROW nEndRow = lcl_getLastNonFilteredRow(rFlags, nBegRow, nLastMarkedRow, nRowCount);
+
+        if (!bSkipAttrForEmpty)
+            DeleteArea(nCol1, nBegRow, nCol2, nEndRow, rMark, nDelFlag);
+
+        CopyBlockFromClip(nCol1, nBegRow, nCol2, nEndRow, rMark, nDx, nDy, &aCBFCP);
+        nRowCount -= nEndRow - nBegRow + 1;
+
+        while (nRowCount > 0)
+        {
+            // Get the first non-filtered row.
+            SCROW nNonFilteredRow = rFlags.GetFirstForCondition(nEndRow+1, nLastMarkedRow, CR_FILTERED, 0);
+            if (nNonFilteredRow > nLastMarkedRow)
+                return;
+
+            SCROW nRowsSkipped = nNonFilteredRow - nEndRow - 1;
+            nDy += nRowsSkipped;
+
+            nBegRow = nNonFilteredRow;
+            nEndRow = lcl_getLastNonFilteredRow(rFlags, nBegRow, nLastMarkedRow, nRowCount);
+
+            if (!bSkipAttrForEmpty)
+                DeleteArea(nCol1, nBegRow, nCol2, nEndRow, rMark, nDelFlag);
+
+            CopyBlockFromClip(nCol1, nBegRow, nCol2, nEndRow, rMark, nDx, nDy, &aCBFCP);
+            nRowCount -= nEndRow - nBegRow + 1;
+        }
+
+        if (rClipParam.meDirection == ScClipParam::Row)
+            // Begin row for the next range being pasted.
+            nBegRow = rFlags.GetFirstForCondition(nEndRow+1, nLastMarkedRow, CR_FILTERED, 0);
+        else
+            nBegRow = nRow1;
 
         if (rClipParam.meDirection == ScClipParam::Column)
             nCol1 += p->aEnd.Col() - p->aStart.Col() + 1;
-        if (rClipParam.meDirection == ScClipParam::Row)
-            nRow1 += p->aEnd.Row() - p->aStart.Row() + 1;
     }
 
     for (SCTAB i = 0; i <= MAXTAB; i++)
@@ -2335,10 +2364,10 @@ void ScDocument::CopyMultiRangeFromClip(
 
     bInsertingFromOtherDoc = FALSE;
 
-    ScRange aDestRange(rDestPos.Col(), rDestPos.Row(), rDestPos.Tab(), 
-                       rDestPos.Col()+nCols-1, rDestPos.Row()+nRows-1, rDestPos.Tab());
     ScRangeList aRanges;
     aRanges.Append(aDestRange);
+    SCCOL nCols = aDestRange.aEnd.Col() - aDestRange.aStart.Col() + 1;
+    SCROW nRows = aDestRange.aEnd.Row() - aDestRange.aStart.Row() + 1;
     UpdateRangeNamesInFormulas(aClipRangeNames, aRanges, rMark, nCols-1, nRows-1);
 
     // Listener aufbauen nachdem alles inserted wurde
@@ -2411,8 +2440,7 @@ void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered
         while ( nCountTab < MAXTAB && !pTab[nCountTab] )
             ++nCountTab;
 
-        SCROW nResult = GetRowFlagsArray( nCountTab).CountForCondition(
-                nStartRow, nEndRow, CR_FILTERED, 0);
+        SCROW nResult = CountNonFilteredRows(nStartRow, nEndRow, nCountTab);
 
         if ( nResult > 0 )
             nClipY = nResult - 1;
@@ -2451,8 +2479,13 @@ BOOL ScDocument::HasClipFilteredRows()
     if (!rClipRanges.Count())
         return false;
 
-    return GetRowFlagsArray( nCountTab).HasCondition( rClipRanges.First()->aStart.Row(),
-            rClipRanges.First()->aEnd.Row(), CR_FILTERED, CR_FILTERED);
+    for (ScRange* p = rClipRanges.First(); p; p = rClipRanges.Next())
+    {
+        bool bAnswer = pTab[nCountTab]->HasFilteredRows(p->aStart.Row(), p->aEnd.Row());
+        if (bAnswer)
+            return true;
+    }
+    return false;
 }
 
 
@@ -2625,10 +2658,10 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT
 
 
 BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
-                            SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
+                            ScSetStringParam* pParam )
 {
-    if ( ValidTab(nTab) && pTab[nTab] )
-		return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pFormatter, bDetectNumberFormat );
+	if ( ValidTab(nTab) && pTab[nTab] )
+		return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pParam );
     else
         return FALSE;
 }
@@ -3153,8 +3186,7 @@ ULONG ScDocument::GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) con
 ULONG ScDocument::FastGetRowHeight( SCROW nStartRow, SCROW nEndRow,
         SCTAB nTab ) const
 {
-    return pTab[nTab]->pRowFlags->SumCoupledArrayForCondition( nStartRow,
-            nEndRow, CR_HIDDEN, 0, *(pTab[nTab]->pRowHeight));
+	return GetRowHeight(nStartRow, nEndRow, nTab);
 }
 
 ULONG ScDocument::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow,
@@ -3380,6 +3412,259 @@ const ScBitMaskCompressedArray< SCROW, BYTE> & ScDocument::GetRowFlagsArray(
     return *pFlags;
 }
 
+void ScDocument::GetAllRowBreaks(set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+        return;
+
+    pTab[nTab]->GetAllRowBreaks(rBreaks, bPage, bManual);
+}
+
+void ScDocument::GetAllColBreaks(set<SCCOL>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+        return;
+
+    pTab[nTab]->GetAllColBreaks(rBreaks, bPage, bManual);
+}
+
+ScBreakType ScDocument::HasRowBreak(SCROW nRow, SCTAB nTab) const
+{
+    ScBreakType nType = BREAK_NONE;
+    if (!ValidTab(nTab) || !pTab[nTab] || !ValidRow(nRow))
+        return nType;
+
+    if (pTab[nTab]->HasRowPageBreak(nRow))
+        nType |= BREAK_PAGE;
+
+    if (pTab[nTab]->HasRowManualBreak(nRow))
+        nType |= BREAK_MANUAL;
+
+    return nType;
+}
+
+ScBreakType ScDocument::HasColBreak(SCCOL nCol, SCTAB nTab) const
+{
+    ScBreakType nType = BREAK_NONE;
+    if (!ValidTab(nTab) || !pTab[nTab] || !ValidCol(nCol))
+        return nType;
+
+    if (pTab[nTab]->HasColPageBreak(nCol))
+        nType |= BREAK_PAGE;
+
+    if (pTab[nTab]->HasColManualBreak(nCol))
+        nType |= BREAK_MANUAL;
+
+    return nType;
+}
+
+void ScDocument::SetRowBreak(SCROW nRow, SCTAB nTab, bool bPage, bool bManual)
+{
+    if (!ValidTab(nTab) || !pTab[nTab] || !ValidRow(nRow))
+        return;
+
+    pTab[nTab]->SetRowBreak(nRow, bPage, bManual);
+}
+
+void ScDocument::SetColBreak(SCCOL nCol, SCTAB nTab, bool bPage, bool bManual)
+{
+    if (!ValidTab(nTab) || !pTab[nTab] || !ValidCol(nCol))
+        return;
+
+    pTab[nTab]->SetColBreak(nCol, bPage, bManual);
+}
+
+void ScDocument::RemoveRowBreak(SCROW nRow, SCTAB nTab, bool bPage, bool bManual)
+{
+    if (!ValidTab(nTab) || !pTab[nTab] || !ValidRow(nRow))
+        return;
+
+    pTab[nTab]->RemoveRowBreak(nRow, bPage, bManual);
+}
+
+void ScDocument::RemoveColBreak(SCCOL nCol, SCTAB nTab, bool bPage, bool bManual)
+{
+    if (!ValidTab(nTab) || !pTab[nTab] || !ValidCol(nCol))
+        return;
+
+    pTab[nTab]->RemoveColBreak(nCol, bPage, bManual);
+}
+
+Sequence<TablePageBreakData> ScDocument::GetRowBreakData(SCTAB nTab) const
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+        return Sequence<TablePageBreakData>();
+
+    return pTab[nTab]->GetRowBreakData();
+}
+
+bool ScDocument::RowHidden(SCROW nRow, SCTAB nTab, SCROW* pFirstRow, SCROW* pLastRow)
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+		return false;
+
+	return pTab[nTab]->RowHidden(nRow, pFirstRow, pLastRow);
+}
+
+bool ScDocument::RowHidden(SCROW nRow, SCTAB nTab, SCROW& rLastRow)
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+	{
+		rLastRow = nRow;	
+		return false;
+	}
+
+	return pTab[nTab]->RowHidden(nRow, rLastRow);
+}
+
+
+bool ScDocument::HasHiddenRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+		return false;
+
+	return pTab[nTab]->HasHiddenRows(nStartRow, nEndRow);
+}
+
+bool ScDocument::ColHidden(SCCOL nCol, SCTAB nTab, SCCOL& rLastCol)
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+	{
+		rLastCol = nCol;	
+		return false;
+	}
+
+	return pTab[nTab]->ColHidden(nCol, rLastCol);
+}
+
+bool ScDocument::ColHidden(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol, SCCOL* pLastCol)
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+	{
+        if (pFirstCol)
+            *pFirstCol = nCol;
+        if (pLastCol)
+            *pLastCol = nCol;
+		return false;
+	}
+
+	return pTab[nTab]->ColHidden(nCol, pFirstCol, pLastCol);
+}
+
+void ScDocument::SetRowHidden(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bHidden)
+{
+	if (!ValidTab(nTab) || !pTab[nTab])
+		return;
+
+	pTab[nTab]->SetRowHidden(nStartRow, nEndRow, bHidden);
+}
+
+void ScDocument::SetColHidden(SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bHidden)
+{
+	if (!ValidTab(nTab) || !pTab[nTab])
+		return;
+
+	pTab[nTab]->SetColHidden(nStartCol, nEndCol, bHidden);
+}
+
+SCROW ScDocument::FirstVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
+{
+	if (!ValidTab(nTab) || !pTab[nTab])
+		return ::std::numeric_limits<SCROW>::max();;
+
+    return pTab[nTab]->FirstVisibleRow(nStartRow, nEndRow);
+}
+
+SCROW ScDocument::LastVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
+{
+	if (!ValidTab(nTab) || !pTab[nTab])
+		return ::std::numeric_limits<SCROW>::max();;
+
+    return pTab[nTab]->LastVisibleRow(nStartRow, nEndRow);
+}
+
+SCROW ScDocument::CountVisibleRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
+{
+	if (!ValidTab(nTab) || !pTab[nTab])
+        return 0;
+
+    return pTab[nTab]->CountVisibleRows(nStartRow, nEndRow);
+}
+
+bool ScDocument::RowFiltered(SCROW nRow, SCTAB nTab, SCROW* pFirstRow, SCROW* pLastRow)
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+		return false;
+
+	return pTab[nTab]->RowFiltered(nRow, pFirstRow, pLastRow);
+}
+
+bool ScDocument::HasFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+		return false;
+
+	return pTab[nTab]->HasFilteredRows(nStartRow, nEndRow);
+}
+
+bool ScDocument::ColFiltered(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol, SCCOL* pLastCol)
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+		return false;
+
+	return pTab[nTab]->ColFiltered(nCol, pFirstCol, pLastCol);
+}
+
+void ScDocument::SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bFiltered)
+{
+	if (!ValidTab(nTab) || !pTab[nTab])
+		return;
+
+	pTab[nTab]->SetRowFiltered(nStartRow, nEndRow, bFiltered);
+}
+
+void ScDocument::SetColFiltered(SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bFiltered)
+{
+	if (!ValidTab(nTab) || !pTab[nTab])
+		return;
+
+	pTab[nTab]->SetColFiltered(nStartCol, nEndCol, bFiltered);
+}
+
+SCROW ScDocument::FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
+{
+	if (!ValidTab(nTab) || !pTab[nTab])
+		return ::std::numeric_limits<SCROW>::max();;
+
+    return pTab[nTab]->FirstNonFilteredRow(nStartRow, nEndRow);
+}
+
+SCROW ScDocument::LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
+{
+	if (!ValidTab(nTab) || !pTab[nTab])
+		return ::std::numeric_limits<SCROW>::max();;
+
+    return pTab[nTab]->LastNonFilteredRow(nStartRow, nEndRow);
+}
+
+SCROW ScDocument::CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab)
+{
+	if (!ValidTab(nTab) || !pTab[nTab])
+        return 0;
+
+    return pTab[nTab]->CountNonFilteredRows(nStartRow, nEndRow);
+}
+
+void ScDocument::SyncColRowFlags()
+{
+    for (SCTAB i = 0; i <= nMaxTableNumber; ++i)
+    {
+        if (!ValidTab(i) || !pTab[i])
+            continue;
+
+        pTab[i]->SyncColRowFlags();
+    }
+}
 
 SCROW ScDocument::GetLastFlaggedRow( SCTAB nTab ) const
 {
@@ -4765,6 +5050,11 @@ void ScDocument::SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCRO
         pTab[nTab]->SetRepeatArea( nStartCol, nEndCol, nStartRow, nEndRow );
 }
 
+void ScDocument::InvalidatePageBreaks(SCTAB nTab)
+{
+    if (ValidTab(nTab) && pTab[nTab])
+        pTab[nTab]->InvalidatePageBreaks();
+}
 
 void ScDocument::UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea )
 {
diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx
index 015c6512d..23bdc9511 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/sc/source/core/data/dpcachetable.cxx
@@ -38,6 +38,7 @@
 #include "dptabdat.hxx"
 #include "dptabsrc.hxx"
 #include "dpobject.hxx"
+#include "queryparam.hxx"
 
 #include <com/sun/star/i18n/LocaleDataItem.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
@@ -209,9 +210,39 @@ sal_Int32 ScDPCacheTable::getColSize() const
     return maTable.empty() ? 0 : maTable[0].size();
 }
 
+namespace {
+
+/** 
+ * While the macro interpret level is incremented, the formula cells are 
+ * (semi-)guaranteed to be interpreted. 
+ */ 
+class MacroInterpretIncrementer
+{
+public:
+    MacroInterpretIncrementer(ScDocument* pDoc) :
+        mpDoc(pDoc)
+    {
+        mpDoc->IncMacroInterpretLevel();
+    }
+    ~MacroInterpretIncrementer()
+    {
+        mpDoc->DecMacroInterpretLevel();
+    }
+private:
+    ScDocument* mpDoc;
+};
+
+}
+
 void ScDPCacheTable::fillTable(ScDocument* pDoc, const ScRange& rRange, const ScQueryParam& rQuery, BOOL* pSpecial,
                                bool bIgnoreEmptyRows)
 {
+    // Make sure the formula cells within the data range are interpreted 
+    // during this call, for this method may be called from the interpretation
+    // of GETPIVOTDATA, which disables nested formula interpretation without
+    // an increased macro level.
+    MacroInterpretIncrementer aMacroInc(pDoc);
+
     SCTAB nTab = rRange.aStart.Tab();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 96ed4649a..2d62cc8ae 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -251,7 +251,7 @@ String lcl_GetDateGroupName( sal_Int32 nDatePart, sal_Int32 nValue, SvNumberForm
             break;
         case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS:
             //! cache getMonths() result?
-            aRet = ScGlobal::pCalendar->getDisplayName(
+            aRet = ScGlobal::GetCalendar()->getDisplayName(
                         ::com::sun::star::i18n::CalendarDisplayIndex::MONTH,
                         sal_Int16(nValue-1), 0 );    // 0-based, get short name
             break;
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 320ac72a4..5dcd70893 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -75,6 +75,7 @@
 #include <svtools/zforlist.hxx>		// IsNumberFormat
 
 #include <vector>
+#include <stdio.h>
 
 using namespace com::sun::star;
 using ::std::vector;
@@ -167,10 +168,10 @@ ScDPObject::ScDPObject( ScDocument* pD ) :
     pOutput( NULL ),
     bSettingsChanged( FALSE ),
     bAlive( FALSE ),
-    nAutoFormatIndex( 65535 ),
+    mnAutoFormatIndex( 65535 ),
     bAllowMove( FALSE ),
 	nHeaderRows( 0 ),
-    bHeaderLayout( false )
+    mbHeaderLayout(false)
 {
 }
 
@@ -188,10 +189,10 @@ ScDPObject::ScDPObject(const ScDPObject& r) :
     pOutput( NULL ),
     bSettingsChanged( FALSE ),
     bAlive( FALSE ),
-	nAutoFormatIndex( r.nAutoFormatIndex ),
+    mnAutoFormatIndex( r.mnAutoFormatIndex ),
     bAllowMove( FALSE ),
 	nHeaderRows( r.nHeaderRows ),
-    bHeaderLayout( r.bHeaderLayout )
+    mbHeaderLayout( r.mbHeaderLayout )
 {
     if (r.pSaveData)
         pSaveData = new ScDPSaveData(*r.pSaveData);
@@ -239,14 +240,24 @@ void ScDPObject::SetSaveData(const ScDPSaveData& rData)
     InvalidateData();		// re-init source from SaveData
 }
 
-void ScDPObject::SetAutoFormatIndex(const USHORT nIndex)
+void ScDPObject::SetAutoFormatIndex(const sal_uInt16 nIndex)
 {
-	nAutoFormatIndex	= nIndex;
+    mnAutoFormatIndex = nIndex;
+}
+
+sal_uInt16 ScDPObject::GetAutoFormatIndex() const
+{
+    return mnAutoFormatIndex; 
 }
 
 void ScDPObject::SetHeaderLayout (bool bUseGrid)
 {
-    bHeaderLayout = bUseGrid;
+    mbHeaderLayout = bUseGrid;
+}
+
+bool ScDPObject::GetHeaderLayout() const
+{
+    return mbHeaderLayout;
 }
 
 void ScDPObject::SetOutRange(const ScRange& rRange)
@@ -371,7 +382,7 @@ void ScDPObject::CreateOutput()
     {
         BOOL bFilterButton = IsSheetData() && pSaveData && pSaveData->GetFilterButton();
         pOutput = new ScDPOutput( pDoc, xSource, aOutRange.aStart, bFilterButton );
-        pOutput->SetHeaderLayout ( bHeaderLayout );
+        pOutput->SetHeaderLayout ( mbHeaderLayout );
 
         long nOldRows = nHeaderRows;
         nHeaderRows = pOutput->GetHeaderRows();
@@ -492,7 +503,7 @@ void ScDPObject::InvalidateData()
 void ScDPObject::InvalidateSource()
 {
     xSource = NULL;
-	mpTableData.reset();
+    mpTableData.reset();
 }
 
 ScRange ScDPObject::GetNewOutputRange( BOOL& rOverflow )
@@ -527,6 +538,9 @@ void ScDPObject::Output( const ScAddress& rPos )
 
     //	aOutRange is always the range that was last output to the document
     aOutRange = pOutput->GetOutputRange();
+    const ScAddress& s = aOutRange.aStart;
+    const ScAddress& e = aOutRange.aEnd;
+    pDoc->ApplyFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
 }
 
 const ScRange ScDPObject::GetOutputRangeByType( sal_Int32 nType )
@@ -584,6 +598,55 @@ void ScDPObject::BuildAllDimensionMembers()
     pSaveData->BuildAllDimensionMembers(GetTableData());
 }
 
+bool ScDPObject::GetMemberNames( sal_Int32 nDim, Sequence<OUString>& rNames )
+{
+    vector<ScDPLabelData::Member> aMembers;
+    if (!GetMembers(nDim, GetUsedHierarchy(nDim), aMembers))
+        return false;
+
+    size_t n = aMembers.size();
+    rNames.realloc(n);
+    for (size_t i = 0; i < n; ++i)
+        rNames[i] = aMembers[i].maName;
+
+    return true;
+}
+
+bool ScDPObject::GetMembers( sal_Int32 nDim, sal_Int32 nHier, vector<ScDPLabelData::Member>& rMembers )
+{
+    Reference< container::XNameAccess > xMembersNA;
+    if (!GetMembersNA( nDim, nHier, xMembersNA ))
+        return false;
+
+    Reference<container::XIndexAccess> xMembersIA( new ScNameToIndexAccess(xMembersNA) );
+    sal_Int32 nCount = xMembersIA->getCount();
+    vector<ScDPLabelData::Member> aMembers;
+    aMembers.reserve(nCount);
+
+    for (sal_Int32 i = 0; i < nCount; ++i)
+    {
+        Reference<container::XNamed> xMember(xMembersIA->getByIndex(i), UNO_QUERY);
+        ScDPLabelData::Member aMem;
+
+        if (xMember.is())
+            aMem.maName = xMember->getName();
+
+        Reference<beans::XPropertySet> xMemProp(xMember, UNO_QUERY);
+        if (xMemProp.is())
+        {
+            aMem.mbVisible     = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString::createFromAscii(SC_UNO_ISVISIBL));
+            aMem.mbShowDetails = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString::createFromAscii(SC_UNO_SHOWDETA));
+
+            aMem.maLayoutName = ScUnoHelpFunctions::GetStringProperty(
+                xMemProp, OUString::createFromAscii(SC_UNO_LAYOUTNAME), OUString());
+        }
+
+        aMembers.push_back(aMem);
+    }
+    rMembers.swap(aMembers);
+    return true;
+}
+
 void ScDPObject::UpdateReference( UpdateRefMode eUpdateRefMode,
                                      const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
@@ -1159,7 +1222,7 @@ bool lcl_IsAtStart( const String& rList, const String& rSearch, sal_Int32& rMatc
             }
         }
 
-        if ( bParsed && ScGlobal::pTransliteration->isEqual( aDequoted, rSearch ) )
+        if ( bParsed && ScGlobal::GetpTransliteration()->isEqual( aDequoted, rSearch ) )
         {
             nMatchList = nQuoteEnd;             // match count in the list string, including quotes
             nMatchSearch = rSearch.Len();
@@ -1168,7 +1231,7 @@ bool lcl_IsAtStart( const String& rList, const String& rSearch, sal_Int32& rMatc
     else
     {
         // otherwise look for search string at the start of rList
-        ScGlobal::pTransliteration->equals( rList, 0, rList.Len(), nMatchList,
+        ScGlobal::GetpTransliteration()->equals( rList, 0, rList.Len(), nMatchList,
                                             rSearch, 0, rSearch.Len(), nMatchSearch );
     }
 
@@ -1880,14 +1943,18 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
             {
             }
 
+            OUString aLayoutName = ScUnoHelpFunctions::GetStringProperty(
+                xDimProp, OUString::createFromAscii(SC_UNO_LAYOUTNAME), OUString());
+
             if ( aFieldName.Len() && !bData && !bDuplicated )
             {
                 SCsCOL nCol = static_cast< SCsCOL >( nDim );           //! ???
                 bool bIsValue = true;                               //! check
 
                 ScDPLabelDataRef pNewLabel(new ScDPLabelData(aFieldName, nCol, bIsValue));
+                pNewLabel->maLayoutName = aLayoutName;
                 GetHierarchies(nDim, pNewLabel->maHiers);
-                GetMembers(nDim, pNewLabel->maMembers, &pNewLabel->maVisible, &pNewLabel->maShowDet);
+                GetMembers(nDim, GetUsedHierarchy(nDim), pNewLabel->maMembers);
                 lcl_FillLabelData(*pNewLabel, xDimProp);
                 rParam.maLabelArray.push_back(pNewLabel);
             }
@@ -1942,14 +2009,6 @@ BOOL ScDPObject::GetMembersNA( sal_Int32 nDim, uno::Reference< container::XNameA
     return GetMembersNA( nDim, GetUsedHierarchy( nDim ), xMembers );
 }
 
-BOOL ScDPObject::GetMembers( sal_Int32 nDim,
-        uno::Sequence< rtl::OUString >& rMembers,
-        uno::Sequence< sal_Bool >* pVisible,
-        uno::Sequence< sal_Bool >* pShowDet )
-{
-    return GetMembers( nDim, GetUsedHierarchy( nDim ), rMembers, pVisible, pShowDet );
-}
-
 BOOL ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< container::XNameAccess >& xMembers )
 {
     BOOL bRet = FALSE;
@@ -1985,55 +2044,6 @@ BOOL ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference<
     return bRet;
 }
 
-BOOL ScDPObject::GetMembers( sal_Int32 nDim, sal_Int32 nHier,
-        uno::Sequence< rtl::OUString >& rMembers,
-        uno::Sequence< sal_Bool >* pVisible,
-        uno::Sequence< sal_Bool >* pShowDet )
-{
-    BOOL bRet = FALSE;
-    uno::Reference< container::XNameAccess > xMembersNA;
-    if( GetMembersNA( nDim, nHier, xMembersNA ) )
-    {
-        uno::Reference< container::XIndexAccess > xMembersIA( new ScNameToIndexAccess( xMembersNA ) );
-        sal_Int32 nCount = xMembersIA->getCount();
-        rMembers.realloc( nCount );
-        if( pVisible )
-            pVisible->realloc( nCount );
-        if( pShowDet )
-            pShowDet->realloc( nCount );
-
-        rtl::OUString* pAry = rMembers.getArray();
-        for( sal_Int32 nItem = 0; nItem < nCount; ++nItem )
-        {
-            uno::Reference< container::XNamed > xMember( xMembersIA->getByIndex( nItem ), uno::UNO_QUERY );
-            if( xMember.is() )
-                pAry[ nItem ] = xMember->getName();
-            if( pVisible || pShowDet )
-            {
-                uno::Reference< beans::XPropertySet > xMemProp( xMember, uno::UNO_QUERY );
-                if( pVisible )
-                {
-                    sal_Bool bVis = sal_True;
-                    if( xMemProp.is() )
-                        bVis = ScUnoHelpFunctions::GetBoolProperty( xMemProp,
-                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ISVISIBL ) ) );
-                    (*pVisible)[ nItem ] = bVis;
-                }
-                if( pShowDet )
-                {
-                    sal_Bool bShow = sal_True;
-                    if( xMemProp.is() )
-                        bShow = ScUnoHelpFunctions::GetBoolProperty( xMemProp,
-                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWDETA ) ) );
-                    (*pShowDet)[ nItem ] = bShow;
-                }
-            }
-        }
-        bRet = TRUE;
-    }
-    return bRet;
-}
-
 //------------------------------------------------------------------------
 //	convert old pivot tables into new datapilot tables
 
@@ -2428,7 +2438,7 @@ void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const
 
                 ScDPObject* pDestObj = new ScDPObject( *pSourceObj );
                 pDestObj->SetAlive(TRUE);
-                if ( !r.Insert(pDestObj) )
+                if ( !r.InsertNewTable(pDestObj) )
                 {
                     DBG_ERROR("cannot insert DPObject");
                     DELETEZ( pDestObj );
@@ -2463,6 +2473,39 @@ ScSimpleSharedString& ScDPCollection::GetSharedString()
     return maSharedString;
 }
 
+void ScDPCollection::FreeTable(ScDPObject* pDPObj)
+{
+    const ScRange& rOutRange = pDPObj->GetOutRange();
+    const ScAddress& s = rOutRange.aStart;
+    const ScAddress& e = rOutRange.aEnd;
+    pDoc->RemoveFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
+    Free(pDPObj);
+}
+
+bool ScDPCollection::InsertNewTable(ScDPObject* pDPObj)
+{
+    bool bSuccess = Insert(pDPObj);
+    if (bSuccess)
+    {
+        const ScRange& rOutRange = pDPObj->GetOutRange();
+        const ScAddress& s = rOutRange.aStart;
+        const ScAddress& e = rOutRange.aEnd;
+        pDoc->ApplyFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
+    }
+    return bSuccess;
+}
+
+bool ScDPCollection::HasDPTable(SCCOL nCol, SCROW nRow, SCTAB nTab) const
+{
+    const ScMergeFlagAttr* pMergeAttr = static_cast<const ScMergeFlagAttr*>(
+            pDoc->GetAttr(nCol, nRow, nTab, ATTR_MERGE_FLAG));
+
+    if (!pMergeAttr)
+        return false;
+
+    return pMergeAttr->HasDPTable();
+}
+
 ScDPCacheCell* ScDPCollection::getCacheCellFromPool(const ScDPCacheCell& rCell)
 {
     ScDPCacheCell aCell(rCell);
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index a47513162..6894e5604 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -384,7 +384,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
     nSingleNumFmt( 0 ),
     bSizesValid( FALSE ),
 	bSizeOverflow( FALSE ),
-    bHeaderLayout( false )
+    mbHeaderLayout( false )
 {
     nTabStartCol = nMemberStartCol = nDataStartCol = nTabEndCol = 0;
     nTabStartRow = nMemberStartRow = nDataStartRow = nTabEndRow = 0;
@@ -690,7 +690,7 @@ void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rC
         nMergeFlag |= SC_MF_BUTTON_POPUP;
     if (bHasHiddenMember)
         nMergeFlag |= SC_MF_HIDDEN_MEMBER;
-    pDoc->ApplyAttr( nCol, nRow, nTab, ScMergeFlagAttr(nMergeFlag) );
+    pDoc->ApplyFlagsTab(nCol, nRow, nCol, nRow, nTab, nMergeFlag);
 
     lcl_SetStyleById( pDoc,nTab, nCol,nRow, nCol,nRow, STR_PIVOT_STYLE_FIELDNAME );
 }
@@ -698,7 +698,7 @@ void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rC
 void lcl_DoFilterButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
 {
     pDoc->SetString( nCol, nRow, nTab, ScGlobal::GetRscString(STR_CELL_FILTER) );
-    pDoc->ApplyAttr( nCol, nRow, nTab, ScMergeFlagAttr(SC_MF_BUTTON) );
+    pDoc->ApplyFlagsTab(nCol, nRow, nCol, nRow, nTab, SC_MF_BUTTON);
 }
 
 void ScDPOutput::CalcSizes()
@@ -1045,6 +1045,16 @@ void ScDPOutput::GetMemberResultNames( ScStrCollection& rNames, long nDimension
     }
 }
 
+void ScDPOutput::SetHeaderLayout(bool bUseGrid)
+{
+    mbHeaderLayout = bUseGrid;
+    bSizesValid = false;
+}
+
+bool ScDPOutput::GetHeaderLayout() const
+{
+    return mbHeaderLayout;
+}
 
 void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionData& rPosData)
 {
@@ -1242,12 +1252,6 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>&
     return true;
 }
 
-void ScDPOutput::SetHeaderLayout (bool bLayout)
-{
-    bHeaderLayout = bLayout;
-    bSizesValid = FALSE;
-}
-
 //
 //  helper functions for ScDPOutput::GetPivotData
 //
@@ -1255,19 +1259,20 @@ void ScDPOutput::SetHeaderLayout (bool bLayout)
 bool lcl_IsNamedDataField( const ScDPGetPivotDataField& rTarget, const String& rSourceName, const String& rGivenName )
 {
     // match one of the names, ignoring case
-    return ScGlobal::pTransliteration->isEqual( rTarget.maFieldName, rSourceName ) ||
-           ScGlobal::pTransliteration->isEqual( rTarget.maFieldName, rGivenName );
+    return ScGlobal::GetpTransliteration()->isEqual( rTarget.maFieldName, rSourceName ) ||
+           ScGlobal::GetpTransliteration()->isEqual( rTarget.maFieldName, rGivenName );
 }
 
 bool lcl_IsNamedCategoryField( const ScDPGetPivotDataField& rFilter, const ScDPOutLevelData& rField )
 {
-    return ScGlobal::pTransliteration->isEqual( rFilter.maFieldName, rField.maName );
+    //! name from source instead of caption?
+    return ScGlobal::GetpTransliteration()->isEqual( rFilter.maFieldName, rField.maName );
 }
 
 bool lcl_IsCondition( const sheet::MemberResult& rResultEntry, const ScDPGetPivotDataField& rFilter )
 {
     //! handle numeric conditions?
-    return ScGlobal::pTransliteration->isEqual( rResultEntry.Name, rFilter.maValStr );
+    return ScGlobal::GetpTransliteration()->isEqual( rResultEntry.Name, rFilter.maValStr );
 }
 
 bool lcl_CheckPageField( const ScDPOutLevelData& rField,
diff --git a/sc/source/core/data/dpoutputgeometry.cxx b/sc/source/core/data/dpoutputgeometry.cxx
index bc5513bf2..999ab2866 100644
--- a/sc/source/core/data/dpoutputgeometry.cxx
+++ b/sc/source/core/data/dpoutputgeometry.cxx
@@ -42,12 +42,13 @@
 
 using ::std::vector;
 
-ScDPOutputGeometry::ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter) :
+ScDPOutputGeometry::ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter, ImportType eImportType) :
     maOutRange(rOutRange),
     mnRowFields(0),
     mnColumnFields(0),
     mnPageFields(0),
     mnDataFields(0),
+    meImportType(eImportType),
     mbShowFilter(bShowFilter)
 {
 }
@@ -117,20 +118,7 @@ void ScDPOutputGeometry::getRowFieldPositions(vector<ScAddress>& rAddrs) const
         return;
     }
 
-    SCROW nCurRow = maOutRange.aStart.Row();
-
-    if (mnPageFields)
-    {
-        SCROW nRowStart = maOutRange.aStart.Row() + mbShowFilter;
-        SCROW nRowEnd   = nRowStart + static_cast<SCCOL>(mnPageFields-1);
-        nCurRow = nRowEnd + 2;
-    }
-    else if (mbShowFilter)
-        nCurRow += 2;
-
-    nCurRow += static_cast<SCROW>(mnColumnFields);
-
-    SCROW nRow = nCurRow;
+    SCROW nRow = getRowFieldHeaderRow();
     SCTAB nTab = maOutRange.aStart.Tab();
     SCCOL nColStart = maOutRange.aStart.Col();
     SCCOL nColEnd = nColStart + static_cast<SCCOL>(mnRowFields-1);
@@ -160,10 +148,32 @@ void ScDPOutputGeometry::getPageFieldPositions(vector<ScAddress>& rAddrs) const
     rAddrs.swap(aAddrs);
 }
 
+SCROW ScDPOutputGeometry::getRowFieldHeaderRow() const
+{
+    SCROW nCurRow = maOutRange.aStart.Row();
+
+    if (mnPageFields)
+    {
+        SCROW nRowStart = maOutRange.aStart.Row() + mbShowFilter;
+        SCROW nRowEnd   = nRowStart + static_cast<SCCOL>(mnPageFields-1);
+        nCurRow = nRowEnd + 2;
+    }
+    else if (mbShowFilter)
+        nCurRow += 2;
+
+    if (mnColumnFields)
+        nCurRow += static_cast<SCROW>(mnColumnFields);
+    else if (mnRowFields)
+        ++nCurRow;
+
+    return nCurRow;
+}
+
 ScDPOutputGeometry::FieldType ScDPOutputGeometry::getFieldButtonType(const ScAddress& rPos) const
 {
     // We will ignore the table position for now.
 
+    bool bExtraTitleRow = (mnColumnFields == 0 && meImportType == ScDPOutputGeometry::XLS);
     bool bDataLayout = mnDataFields > 1;
 
     SCROW nCurRow = maOutRange.aStart.Row();
@@ -192,6 +202,9 @@ ScDPOutputGeometry::FieldType ScDPOutputGeometry::getFieldButtonType(const ScAdd
         nCurRow += static_cast<SCROW>(mnColumnFields);
     }
 
+    if (bExtraTitleRow)
+        ++nCurRow;
+
     if (mnRowFields)
     {
         SCCOL nColStart = maOutRange.aStart.Col();
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 881d2cd8f..3161155fb 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -61,6 +61,8 @@
 #include <hash_map>
 
 using namespace com::sun::star;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Any;
 using ::rtl::OUString;
 using ::rtl::OUStringHash;
 using ::std::hash_map;
@@ -180,10 +182,6 @@ void ScDPSaveMember::RemoveLayoutName()
 
 void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMember, sal_Int32 nPosition )
 {
-    //	nothing to do?
-    if ( nVisibleMode == SC_DPSAVEMODE_DONTKNOW && nShowDetailsMode == SC_DPSAVEMODE_DONTKNOW && nPosition < 0 )
-        return;
-
     uno::Reference<beans::XPropertySet> xMembProp( xMember, uno::UNO_QUERY );
     DBG_ASSERT( xMembProp.is(), "no properties at member" );
     if ( xMembProp.is() )
@@ -199,28 +197,10 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
                     rtl::OUString::createFromAscii(DP_PROP_SHOWDETAILS), (BOOL)nShowDetailsMode );
 
         if (mpLayoutName.get())
-        {
-            try
-            {
-                uno::Any any;
-                any <<= rtl::OUString(*mpLayoutName);
-                xMembProp->setPropertyValue(rtl::OUString::createFromAscii(SC_UNO_LAYOUTNAME), any);
-            }
-            catch (uno::Exception&)
-            {
-            }
-        }
+            ScUnoHelpFunctions::SetOptionalPropertyValue(xMembProp, SC_UNO_LAYOUTNAME, *mpLayoutName);
+
         if ( nPosition >= 0 )
-        {
-            try
-            {
-                xMembProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_POSITION), uno::Any(nPosition) );
-            }
-            catch ( uno::Exception& )
-            {
-                // position is optional - exception must be ignored
-            }
-        }
+            ScUnoHelpFunctions::SetOptionalPropertyValue(xMembProp, DP_PROP_POSITION, nPosition);
     }
 }
 
@@ -579,28 +559,15 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
             aFilter = uno::Sequence<sheet::TableFilterField>( &aField, 1 );
         }
         // else keep empty sequence
-        try
-        {
-            aAny <<= aFilter;
-            xDimProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_FILTER), aAny );
-            if (mpLayoutName.get())
-            {
-                aAny <<= *mpLayoutName;
-                xDimProp->setPropertyValue(rtl::OUString::createFromAscii(SC_UNO_LAYOUTNAME), aAny);
-            }
 
-            const OUString* pSubTotalName = GetSubtotalName();
-            if (pSubTotalName)
-            {
-                // Custom subtotal name, with '?' being replaced by the visible field name later.
-                aAny <<= *pSubTotalName;
-                xDimProp->setPropertyValue(OUString::createFromAscii(SC_UNO_FIELD_SUBTOTALNAME), aAny);
-            }
-        }
-        catch ( beans::UnknownPropertyException& )
-        {
-            // recent addition - allow source to not handle it (no error)
-        }
+        ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, DP_PROP_FILTER, aFilter);
+        if (mpLayoutName.get())
+            ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_LAYOUTNAME, *mpLayoutName);
+
+        const OUString* pSubTotalName = GetSubtotalName();
+        if (pSubTotalName)
+            // Custom subtotal name, with '?' being replaced by the visible field name later.
+            ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_FIELD_SUBTOTALNAME, *pSubTotalName);
     }
 
     //	Level loop outside of maMemberList loop
@@ -659,41 +626,13 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
                         rtl::OUString::createFromAscii(DP_PROP_SHOWEMPTY), (BOOL)nShowEmptyMode );
 
                 if ( pSortInfo )
-                {
-                    aAny <<= *pSortInfo;
-                    try
-                    {
-                        xLevProp->setPropertyValue( rtl::OUString::createFromAscii(SC_UNO_SORTING), aAny );
-                    }
-                    catch ( beans::UnknownPropertyException& )
-                    {
-                        // recent addition - allow source to not handle it (no error)
-                    }
-                }
+                    ScUnoHelpFunctions::SetOptionalPropertyValue(xLevProp, SC_UNO_SORTING, *pSortInfo);
+
                 if ( pAutoShowInfo )
-                {
-                    aAny <<= *pAutoShowInfo;
-                    try
-                    {
-                        xLevProp->setPropertyValue( rtl::OUString::createFromAscii(SC_UNO_AUTOSHOW), aAny );
-                    }
-                    catch ( beans::UnknownPropertyException& )
-                    {
-                        // recent addition - allow source to not handle it (no error)
-                    }
-                }
+                    ScUnoHelpFunctions::SetOptionalPropertyValue(xLevProp, SC_UNO_AUTOSHOW, *pAutoShowInfo);
+
                 if ( pLayoutInfo )
-                {
-                    aAny <<= *pLayoutInfo;
-                    try
-                    {
-                        xLevProp->setPropertyValue( rtl::OUString::createFromAscii(SC_UNO_LAYOUT), aAny );
-                    }
-                    catch ( beans::UnknownPropertyException& )
-                    {
-                        // recent addition - allow source to not handle it (no error)
-                    }
-                }
+                    ScUnoHelpFunctions::SetOptionalPropertyValue(xLevProp, SC_UNO_LAYOUT, *pLayoutInfo);
 
                 // exceptions are caught at ScDPSaveData::WriteToSource
             }
@@ -734,12 +673,7 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
     }
 
     if (xDimProp.is())
-    {
-        uno::Any any;
-        any <<= bHasHiddenMember;    
-        xDimProp->setPropertyValue(
-            OUString::createFromAscii(SC_UNO_HAS_HIDDEN_MEMBER), any);
-    }
+        ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_HAS_HIDDEN_MEMBER, bHasHiddenMember);
 }
 
 void ScDPSaveDimension::UpdateMemberVisibility(const hash_map<OUString, bool, OUStringHash>& rData)
@@ -961,8 +895,8 @@ ScDPSaveDimension* ScDPSaveData::GetDataLayoutDimension()
 
 ScDPSaveDimension* ScDPSaveData::GetExistingDataLayoutDimension() const
 {
-    ULONG nCount = aDimList.Count();
-    for (ULONG i=0; i<nCount; i++)
+    long nCount = aDimList.Count();
+    for (long i=0; i<nCount; i++)
     {
         ScDPSaveDimension* pDim = (ScDPSaveDimension*)aDimList.GetObject(i);
         if ( pDim->IsDataLayout() )
@@ -1141,19 +1075,15 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
             if ( nRepeatEmptyMode != SC_DPSAVEMODE_DONTKNOW )
                 lcl_SetBoolProperty( xSourceProp,
                     rtl::OUString::createFromAscii(DP_PROP_REPEATIFEMPTY), (BOOL)nRepeatEmptyMode );
-
-            const OUString* pGrandTotalName = GetGrandTotalName();
-            if (pGrandTotalName)
-            {
-                uno::Any any;
-                any <<= *pGrandTotalName;
-                xSourceProp->setPropertyValue(OUString::createFromAscii(SC_UNO_GRANDTOTAL_NAME), any);
-            }
         }
         catch(uno::Exception&)
         {
             // no error
         }
+
+        const OUString* pGrandTotalName = GetGrandTotalName();
+        if (pGrandTotalName)
+            ScUnoHelpFunctions::SetOptionalPropertyValue(xSourceProp, SC_UNO_GRANDTOTAL_NAME, *pGrandTotalName);
     }
 
     // exceptions in the other calls are errors
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index a5708c45b..42a8b13ed 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -66,7 +66,7 @@ BOOL ScDPItemData::IsCaseInsEqual( const ScDPItemData& r ) const
     //!	inline?
     return bHasValue ? ( r.bHasValue && rtl::math::approxEqual( fValue, r.fValue ) ) :
                        ( !r.bHasValue &&
-                        ScGlobal::pTransliteration->isEqual( aString, r.aString ) );
+                        ScGlobal::GetpTransliteration()->isEqual( aString, r.aString ) );
 }
 
 size_t ScDPItemData::Hash() const
@@ -115,7 +115,7 @@ sal_Int32 ScDPItemData::Compare( const ScDPItemData& rA,
     else if ( rB.bHasValue )
         return 1;                // values first
     else
-        return ScGlobal::pCollator->compareString( rA.aString, rB.aString );
+        return ScGlobal::GetCollator()->compareString( rA.aString, rB.aString );
 }
 
 // ---------------------------------------------------------------------------
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 12162023a..e99c2bc23 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2593,14 +2593,14 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
                 else if ( nHier == SC_DAPI_HIERARCHY_WEEK && nLev == SC_DAPI_LEVEL_WEEKDAY )
                 {
                     nVal = nIndex;				// DayOfWeek is 0-based
-                    aName = ScGlobal::pCalendar->getDisplayName(
+                    aName = ScGlobal::GetCalendar()->getDisplayName(
                         ::com::sun::star::i18n::CalendarDisplayIndex::DAY,
                         sal::static_int_cast<sal_Int16>(nVal), 0 );
                 }
                 else if ( nHier == SC_DAPI_HIERARCHY_QUARTER && nLev == SC_DAPI_LEVEL_MONTH )
                 {
                     nVal = nIndex;				// Month is 0-based
-                    aName = ScGlobal::pCalendar->getDisplayName(
+                    aName = ScGlobal::GetCalendar()->getDisplayName(
                         ::com::sun::star::i18n::CalendarDisplayIndex::MONTH,
                         sal::static_int_cast<sal_Int16>(nVal), 0 );
                 }
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 94708e1c7..03c48f538 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -610,12 +610,14 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b
     {
         //!	nicht mehrere Undos fuer ein Objekt erzeugen (hinteres kann dann weggelassen werden)
 
+        SCCOL nLastCol;
+        SCROW nLastRow;
         if( bValid1 )
         {
             Point aPos( pDoc->GetColOffset( nCol1, nTab1 ), pDoc->GetRowOffset( nRow1, nTab1 ) );
-            if( (pDoc->GetColFlags( nCol1, nTab1 ) & CR_HIDDEN) == 0 )
+            if (!pDoc->ColHidden(nCol1, nTab1, nLastCol))
                 aPos.X() += pDoc->GetColWidth( nCol1, nTab1 ) / 4;
-            if( (pDoc->GetRowFlags( nRow1, nTab1 ) & CR_HIDDEN) == 0 )
+            if (!pDoc->RowHidden(nRow1, nTab1, nLastRow))
                 aPos.Y() += pDoc->GetRowHeight( nRow1, nTab1 ) / 2;
             TwipsToMM( aPos.X() );
             TwipsToMM( aPos.Y() );
@@ -647,9 +649,9 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b
         if( bValid2 )
         {
             Point aPos( pDoc->GetColOffset( nCol2, nTab2 ), pDoc->GetRowOffset( nRow2, nTab2 ) );
-            if( (pDoc->GetColFlags( nCol2, nTab2 ) & CR_HIDDEN) == 0 )
+            if (!pDoc->ColHidden(nCol2, nTab2, nLastCol))
                 aPos.X() += pDoc->GetColWidth( nCol2, nTab2 ) / 4;
-            if( (pDoc->GetRowFlags( nRow2, nTab2 ) & CR_HIDDEN) == 0 )
+            if (!pDoc->RowHidden(nRow2, nTab2, nLastRow))
                 aPos.Y() += pDoc->GetRowHeight( nRow2, nTab2 ) / 2;
             TwipsToMM( aPos.X() );
             TwipsToMM( aPos.Y() );
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 54ffe10b0..e87516794 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -55,7 +55,6 @@
 #include "conditio.hxx"
 #include "stlpool.hxx"
 
-
 // -----------------------------------------------------------------------
 
 const USHORT ROWINFO_MAX = 1024;
@@ -100,11 +99,13 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
     rStartY = nY;
     BOOL bHOver = pInfo->bHOverlapped;
     BOOL bVOver = pInfo->bVOverlapped;
+    SCCOL nLastCol;
+    SCROW nLastRow;
 
     while (bHOver)				// nY konstant
     {
         --rStartX;
-        if (rStartX >= (SCsCOL) nX1 && (pDoc->GetColFlags(rStartX,nTab) & CR_HIDDEN) == 0)
+        if (rStartX >= (SCsCOL) nX1 && !pDoc->ColHidden(rStartX, nTab, nLastCol))
         {
             bHOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bHOverlapped;
             bVOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bVOverlapped;
@@ -126,8 +127,8 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
             --nArrY;						// lokale Kopie !
 
         if (rStartX >= (SCsCOL) nX1 && rStartY >= (SCsROW) nY1 &&
-            (pDoc->GetColFlags(rStartX,nTab) & CR_HIDDEN) == 0 &&
-            (pDoc->GetRowFlags(rStartY,nTab) & CR_HIDDEN) == 0 &&
+            !pDoc->ColHidden(rStartX, nTab, nLastCol) &&
+            !pDoc->RowHidden(rStartY, nTab, nLastRow) &&
             (SCsROW) pRowInfo[nArrY].nRowNo == rStartY)
         {
             bHOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bHOverlapped;
@@ -144,8 +145,8 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
 
     const ScMergeAttr* pMerge;
     if (rStartX >= (SCsCOL) nX1 && rStartY >= (SCsROW) nY1 &&
-        (pDoc->GetColFlags(rStartX,nTab) & CR_HIDDEN) == 0 &&
-        (pDoc->GetRowFlags(rStartY,nTab) & CR_HIDDEN) == 0 &&
+        !pDoc->ColHidden(rStartX, nTab, nLastCol) &&
+        !pDoc->RowHidden(rStartY, nTab, nLastRow) &&
         (SCsROW) pRowInfo[nArrY].nRowNo == rStartY)
     {
         pMerge = (const ScMergeAttr*) &pRowInfo[nArrY].pCellInfo[rStartX+1].pPatternAttr->
@@ -158,12 +159,6 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
     rEndY = rStartY + pMerge->GetRowMerge() - 1;
 }
 
-inline BOOL ScDocument::RowHidden( SCROW nRow, SCTAB nTab )
-{
-    return ( pTab[nTab]->pRowFlags->GetValue(nRow) & CR_HIDDEN ) != 0;
-}
-
-
 #define CELLINFO(x,y) pRowInfo[nArrY+y].pCellInfo[nArrX+x]
 
 void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
@@ -359,7 +354,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
         nX = nArrX-1;
         if ( ValidCol(nX) )
         {
-            if ( (GetColFlags(nX,nTab) & CR_HIDDEN) == 0 )			// Spalte nicht versteckt
+            if (!ColHidden(nX, nTab))
             {
                 USHORT nThisWidth = (USHORT) (GetColWidth( nX, nTab ) * nScaleX);
                 if (!nThisWidth)
@@ -379,7 +374,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
             // #i58049#, #i57939# Hidden columns must be skipped here, or their attributes
             // will disturb the output
 
-            if ( (GetColFlags(nX,nTab) & CR_HIDDEN) == 0 )          // column not hidden
+            // TODO: Optimize this loop.
+            if (!ColHidden(nX, nTab))
             {
                 USHORT nThisWidth = (USHORT) (GetColWidth( nX, nTab ) * nScaleX);
                 if (!nThisWidth)
@@ -484,7 +480,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
 
                         do
                         {
-                            if ( nArrY==0 || !RowHidden( nCurRow,nTab ) )
+#define NEW_METHOD 1
+#if NEW_METHOD
+                            SCROW nLastHiddenRow = -1;
+                            bool bRowHidden = RowHidden(nCurRow, nTab, nLastHiddenRow);
+#else
+                            bool bRowHidden = RowHidden(nCurRow, nTab);
+#endif
+							if ( nArrY==0 || !bRowHidden )
                             {
                                 RowInfo* pThisRowInfo = &pRowInfo[nArrY];
                                 if (pBackground != pDefBackground)			// Spalten-HG == Standard ?
@@ -554,6 +557,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
 
                                 ++nArrY;
                             }
+#if NEW_METHOD
+                            else if (bRowHidden && nLastHiddenRow >= 0)
+                            {
+                                nCurRow = nLastHiddenRow;
+                                if (nCurRow > nThisRow)
+                                    nCurRow = nThisRow;
+                            }
+#endif
                             ++nCurRow;
                         }
                         while (nCurRow <= nThisRow && nCurRow <= nYExtra);
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 6754d9ffd..4a7e08615 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -559,25 +559,10 @@ void ScGlobal::Init()
 
     //!	Wenn Sortierung etc. von der Sprache der installierten Offfice-Version
     //! abhaengen sollen, hier "Application::GetSettings().GetUILanguage()"
-    LanguageType eOfficeLanguage = Application::GetSettings().GetLanguage();
-    pLocale = new ::com::sun::star::lang::Locale( Application::GetSettings().GetLocale());
     pSysLocale = new SvtSysLocale;
     pCharClass = pSysLocale->GetCharClassPtr();
     pLocaleData = pSysLocale->GetLocaleDataPtr();
-    pCalendar = new CalendarWrapper( ::comphelper::getProcessServiceFactory() );
-    pCalendar->loadDefaultCalendar( *pLocale );
-    pCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );
-    pCollator->loadDefaultCollator( *pLocale, SC_COLLATOR_IGNORES );
-    pCaseCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );
-    pCaseCollator->loadDefaultCollator( *pLocale, 0 );
-    pTransliteration = new ::utl::TransliterationWrapper(
-        ::comphelper::getProcessServiceFactory(), SC_TRANSLITERATION_IGNORECASE );
-    pTransliteration->loadModuleIfNeeded( eOfficeLanguage );
-    pCaseTransliteration = new ::utl::TransliterationWrapper(
-        ::comphelper::getProcessServiceFactory(), SC_TRANSLITERATION_CASESENSE );
-    pCaseTransliteration->loadModuleIfNeeded( eOfficeLanguage );
-    pScIntlWrapper = new IntlWrapper( ::comphelper::getProcessServiceFactory(), *pLocale );
-
+    
     ppRscString = new String *[ STR_COUNT ];
     for( USHORT nC = 0 ; nC < STR_COUNT ; nC++ ) ppRscString[ nC ] = NULL;
 
@@ -1766,6 +1751,7 @@ ScFunctionMgr::ScFunctionMgr()
         aCatLists[i] = new List;
 
     pRootList = aCatLists[0];								// Gesamtliste ("Alle") erstellen
+    CollatorWrapper* pCaseCollator = ScGlobal::GetCaseCollator();
     for ( n=0; n<nCount; n++ )
     {
         ULONG nTmpCnt=0;
@@ -1775,8 +1761,7 @@ ScFunctionMgr::ScFunctionMgr()
             // ist zwar case-sensitiv, aber Umlaute muessen richtig einsortiert werden
 
             const ScFuncDesc*	pTmpDesc = (const ScFuncDesc*)pRootList->GetObject(nTmpCnt);
-            if ( ScGlobal::pCaseCollator->compareString(
-                        *pDesc->pFuncName, *pTmpDesc->pFuncName ) == COMPARE_LESS )
+            if ( pCaseCollator->compareString(*pDesc->pFuncName, *pTmpDesc->pFuncName ) == COMPARE_LESS )
                 break;
         }
         pRootList->Insert((void*)pDesc, nTmpCnt);					// Einsortieren
@@ -1949,6 +1934,13 @@ sal_uInt32 ScFunctionCategory::getNumber() const
 
 utl::TransliterationWrapper* ScGlobal::GetpTransliteration() //add by CHINA001
 {
+    if ( !pTransliteration )
+    {
+        const LanguageType eOfficeLanguage = Application::GetSettings().GetLanguage();
+        pTransliteration = new ::utl::TransliterationWrapper(
+            ::comphelper::getProcessServiceFactory(), SC_TRANSLITERATION_IGNORECASE );
+        pTransliteration->loadModuleIfNeeded( eOfficeLanguage );
+    }
     DBG_ASSERT(
         pTransliteration,
         "ScGlobal::GetpTransliteration() called before ScGlobal::Init()");
@@ -1962,3 +1954,57 @@ const LocaleDataWrapper* ScGlobal::GetpLocaleData()
         "ScGlobal::GetpLocaleData() called before ScGlobal::Init()");
     return pLocaleData;
 }
+CalendarWrapper*     ScGlobal::GetCalendar()
+{
+    if ( !pCalendar )
+    {
+        pCalendar = new CalendarWrapper( ::comphelper::getProcessServiceFactory() );
+        pCalendar->loadDefaultCalendar( *GetLocale() );
+    }
+    return pCalendar;
+}
+CollatorWrapper*		ScGlobal::GetCollator()
+{
+    if ( !pCollator )
+    {
+        pCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );
+        pCollator->loadDefaultCollator( *GetLocale(), SC_COLLATOR_IGNORES );
+    } // if ( !pCollator )
+    return pCollator;
+}
+CollatorWrapper*		ScGlobal::GetCaseCollator()
+{
+    if ( !pCaseCollator )
+    {
+        pCaseCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );
+        pCaseCollator->loadDefaultCollator( *GetLocale(), 0 );
+    } // if ( !pCaseCollator )
+    return pCaseCollator;
+}
+::utl::TransliterationWrapper* ScGlobal::GetCaseTransliteration()
+{
+    if ( !pCaseTransliteration )
+    {
+        const LanguageType eOfficeLanguage = Application::GetSettings().GetLanguage();
+        pCaseTransliteration = new ::utl::TransliterationWrapper(::comphelper::getProcessServiceFactory(), SC_TRANSLITERATION_CASESENSE );
+        pCaseTransliteration->loadModuleIfNeeded( eOfficeLanguage );
+    } // if ( !pCaseTransliteration )
+    return pCaseTransliteration;
+}
+IntlWrapper*         ScGlobal::GetScIntlWrapper()
+{
+    if ( !pScIntlWrapper )
+    {
+        pScIntlWrapper = new IntlWrapper( ::comphelper::getProcessServiceFactory(), *GetLocale() );
+    }
+    return pScIntlWrapper;
+}
+::com::sun::star::lang::Locale*		ScGlobal::GetLocale()
+{
+    if ( !pLocale )
+    {
+        pLocale = new ::com::sun::star::lang::Locale( Application::GetSettings().GetLocale());
+    }
+    return pLocale;
+}
+
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index be16aeddd..6f3c424f6 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -145,30 +145,32 @@ BOOL ScImportParam::operator==( const ScImportParam& rOther ) const
 //------------------------------------------------------------------------
 // struct ScQueryParam:
 
-ScQueryEntry::ScQueryEntry()
+ScQueryEntry::ScQueryEntry() :
+    bDoQuery(FALSE),
+    bQueryByString(FALSE),
+    bQueryByDate(false),
+    nField(0),
+    eOp(SC_EQUAL),
+    eConnect(SC_AND),
+    pStr(new String),
+    nVal(0.0),
+    pSearchParam(NULL),
+    pSearchText(NULL)
+{
+}
+
+ScQueryEntry::ScQueryEntry(const ScQueryEntry& r) :
+    bDoQuery(r.bDoQuery),
+    bQueryByString(r.bQueryByString),
+    bQueryByDate(r.bQueryByDate),
+    nField(r.nField),
+    eOp(r.eOp),
+    eConnect(r.eConnect),
+    pStr(new String(*r.pStr)),
+    nVal(r.nVal),
+    pSearchParam(NULL),
+    pSearchText(NULL)
 {
-    bDoQuery		= FALSE;
-    bQueryByString	= FALSE;
-    eOp				= SC_EQUAL;
-    eConnect		= SC_AND;
-    nField			= 0;
-    nVal			= 0.0;
-    pStr			= new String;
-    pSearchParam	= NULL;
-    pSearchText		= NULL;
-}
-
-ScQueryEntry::ScQueryEntry(const ScQueryEntry& r)
-{
-    bDoQuery		= r.bDoQuery;
-    bQueryByString	= r.bQueryByString;
-    eOp				= r.eOp;
-    eConnect		= r.eConnect;
-    nField			= r.nField;
-    nVal			= r.nVal;
-    pStr			= new String(*r.pStr);
-    pSearchParam	= NULL;
-    pSearchText		= NULL;
 }
 
 ScQueryEntry::~ScQueryEntry()
@@ -185,6 +187,7 @@ ScQueryEntry& ScQueryEntry::operator=( const ScQueryEntry& r )
 {
     bDoQuery		= r.bDoQuery;
     bQueryByString	= r.bQueryByString;
+    bQueryByDate    = r.bQueryByDate;
     eOp				= r.eOp;
     eConnect		= r.eConnect;
     nField			= r.nField;
@@ -205,6 +208,7 @@ void ScQueryEntry::Clear()
 {
     bDoQuery		= FALSE;
     bQueryByString	= FALSE;
+    bQueryByDate    = false;
     eOp				= SC_EQUAL;
     eConnect		= SC_AND;
     nField			= 0;
@@ -223,6 +227,7 @@ BOOL ScQueryEntry::operator==( const ScQueryEntry& r ) const
 {
     return bDoQuery			== r.bDoQuery
         && bQueryByString	== r.bQueryByString
+        && bQueryByDate     == r.bQueryByDate
         && eOp				== r.eOp
         && eConnect			== r.eConnect
         && nField			== r.nField
@@ -243,246 +248,6 @@ utl::TextSearch* ScQueryEntry::GetSearchTextPtr( BOOL bCaseSens )
 }
 
 //------------------------------------------------------------------------
-
-ScQueryParam::ScQueryParam()
-{
-    nEntryCount = 0;
-    Clear();
-}
-
-//------------------------------------------------------------------------
-
-ScQueryParam::ScQueryParam( const ScQueryParam& r ) :
-        nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nTab(r.nTab),
-        bHasHeader(r.bHasHeader), bByRow(r.bByRow), bInplace(r.bInplace), bCaseSens(r.bCaseSens),
-        bRegExp(r.bRegExp), bMixedComparison(r.bMixedComparison),
-        bDuplicate(r.bDuplicate), bDestPers(r.bDestPers),
-		nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow),
-        nDynamicEndRow(r.nDynamicEndRow), bUseDynamicRange(r.bUseDynamicRange)
-{
-    nEntryCount = 0;
-
-    Resize( r.nEntryCount );
-    for (USHORT i=0; i<nEntryCount; i++)
-        pEntries[i] = r.pEntries[i];
-}
-
-//------------------------------------------------------------------------
-
-ScQueryParam::~ScQueryParam()
-{
-    delete[] pEntries;
-}
-
-//------------------------------------------------------------------------
-
-void ScQueryParam::Clear()
-{
-    nCol1=nCol2=nDestCol = 0;
-    nRow1=nRow2=nDestRow = 0;
-    nDestTab = 0;
-    nTab = SCTAB_MAX;
-    bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE;
-    bInplace = bByRow = bDuplicate = bDestPers = TRUE;
-    nDynamicEndRow = 0;
-    bUseDynamicRange = false;
-
-    Resize( MAXQUERY );
-    for (USHORT i=0; i<MAXQUERY; i++)
-        pEntries[i].Clear();
-}
-
-//------------------------------------------------------------------------
-
-ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
-{
-    nCol1		= r.nCol1;
-    nRow1		= r.nRow1;
-    nCol2		= r.nCol2;
-    nRow2		= r.nRow2;
-    nTab		= r.nTab;
-    nDestTab	= r.nDestTab;
-    nDestCol	= r.nDestCol;
-    nDestRow	= r.nDestRow;
-    bHasHeader	= r.bHasHeader;
-    bInplace	= r.bInplace;
-    bCaseSens	= r.bCaseSens;
-    bRegExp		= r.bRegExp;
-    bMixedComparison = r.bMixedComparison;
-    bDuplicate	= r.bDuplicate;
-    bByRow		= r.bByRow;
-    bDestPers	= r.bDestPers;
-    nDynamicEndRow = r.nDynamicEndRow;
-    bUseDynamicRange = r.bUseDynamicRange;
-
-    Resize( r.nEntryCount );
-    for (USHORT i=0; i<nEntryCount; i++)
-        pEntries[i] = r.pEntries[i];
-
-    return *this;
-}
-
-//------------------------------------------------------------------------
-
-BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
-{
-    BOOL bEqual = FALSE;
-
-    // Anzahl der Queries gleich?
-    USHORT nUsed 	  = 0;
-    USHORT nOtherUsed = 0;
-    while ( nUsed<nEntryCount && pEntries[nUsed].bDoQuery ) ++nUsed;
-    while ( nOtherUsed<rOther.nEntryCount && rOther.pEntries[nOtherUsed].bDoQuery )
-        ++nOtherUsed;
-
-    if (   (nUsed 		== nOtherUsed)
-        && (nCol1		== rOther.nCol1)
-        && (nRow1		== rOther.nRow1)
-        && (nCol2		== rOther.nCol2)
-        && (nRow2		== rOther.nRow2)
-        && (nTab 		== rOther.nTab)
-        && (bHasHeader	== rOther.bHasHeader)
-        && (bByRow		== rOther.bByRow)
-        && (bInplace	== rOther.bInplace)
-        && (bCaseSens	== rOther.bCaseSens)
-        && (bRegExp		== rOther.bRegExp)
-        && (bMixedComparison == rOther.bMixedComparison)
-        && (bDuplicate	== rOther.bDuplicate)
-        && (bDestPers   == rOther.bDestPers)
-        && (nDestTab	== rOther.nDestTab)
-        && (nDestCol	== rOther.nDestCol)
-		&& (nDestRow	== rOther.nDestRow)
-        && (nDynamicEndRow == rOther.nDynamicEndRow)
-        && (bUseDynamicRange == rOther.bUseDynamicRange) )
-    {
-        bEqual = TRUE;
-        for ( USHORT i=0; i<nUsed && bEqual; i++ )
-            bEqual = pEntries[i] == rOther.pEntries[i];
-    }
-    return bEqual;
-}
-
-//------------------------------------------------------------------------
-
-void ScQueryParam::DeleteQuery( SCSIZE nPos )
-{
-    if (nPos<nEntryCount)
-    {
-        for (SCSIZE i=nPos; i+1<nEntryCount; i++)
-            pEntries[i] = pEntries[i+1];
-
-        pEntries[nEntryCount-1].Clear();
-    }
-    else
-    {
-        DBG_ERROR("Falscher Parameter bei ScQueryParam::DeleteQuery");
-    }
-}
-
-//------------------------------------------------------------------------
-
-void ScQueryParam::Resize(SCSIZE nNew)
-{
-    if ( nNew < MAXQUERY )
-        nNew = MAXQUERY;				// nie weniger als MAXQUERY
-
-    ScQueryEntry* pNewEntries = NULL;
-    if ( nNew )
-        pNewEntries = new ScQueryEntry[nNew];
-
-    SCSIZE nCopy = Min( nEntryCount, nNew );
-    for (SCSIZE i=0; i<nCopy; i++)
-        pNewEntries[i] = pEntries[i];
-
-    if ( nEntryCount )
-        delete[] pEntries;
-    nEntryCount = nNew;
-    pEntries = pNewEntries;
-}
-
-//------------------------------------------------------------------------
-
-void ScQueryParam::MoveToDest()
-{
-    if (!bInplace)
-    {
-        SCsCOL nDifX = ((SCsCOL) nDestCol) - ((SCsCOL) nCol1);
-        SCsROW nDifY = ((SCsROW) nDestRow) - ((SCsROW) nRow1);
-        SCsTAB nDifZ = ((SCsTAB) nDestTab) - ((SCsTAB) nTab);
-
-        nCol1 = sal::static_int_cast<SCCOL>( nCol1 + nDifX );
-        nRow1 = sal::static_int_cast<SCROW>( nRow1 + nDifY );
-        nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );
-        nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );
-        nTab  = sal::static_int_cast<SCTAB>( nTab  + nDifZ );
-        nDynamicEndRow = sal::static_int_cast<SCROW>( nDynamicEndRow + nDifY );
-        for (USHORT i=0; i<nEntryCount; i++)
-            pEntries[i].nField += nDifX;
-
-        bInplace = TRUE;
-    }
-    else
-    {
-        DBG_ERROR("MoveToDest, bInplace == TRUE");
-    }
-}
-
-//------------------------------------------------------------------------
-
-void ScQueryParam::FillInExcelSyntax(String& aCellStr, SCSIZE nIndex)
-{
-    if (aCellStr.Len() > 0)
-    {
-        if ( nIndex >= nEntryCount )
-            Resize( nIndex+1 );
-
-        ScQueryEntry& rEntry = pEntries[nIndex];
-
-        rEntry.bDoQuery = TRUE;
-        // Operatoren herausfiltern
-        if (aCellStr.GetChar(0) == '<')
-        {
-            if (aCellStr.GetChar(1) == '>')
-            {
-                *rEntry.pStr = aCellStr.Copy(2);
-                rEntry.eOp   = SC_NOT_EQUAL;
-            }
-            else if (aCellStr.GetChar(1) == '=')
-            {
-                *rEntry.pStr = aCellStr.Copy(2);
-                rEntry.eOp   = SC_LESS_EQUAL;
-            }
-            else
-            {
-                *rEntry.pStr = aCellStr.Copy(1);
-                rEntry.eOp   = SC_LESS;
-            }
-        }
-        else if (aCellStr.GetChar(0) == '>')
-        {
-            if (aCellStr.GetChar(1) == '=')
-            {
-                *rEntry.pStr = aCellStr.Copy(2);
-                rEntry.eOp   = SC_GREATER_EQUAL;
-            }
-            else
-            {
-                *rEntry.pStr = aCellStr.Copy(1);
-                rEntry.eOp   = SC_GREATER;
-            }
-        }
-        else
-        {
-            if (aCellStr.GetChar(0) == '=')
-                *rEntry.pStr = aCellStr.Copy(1);
-            else
-                *rEntry.pStr = aCellStr;
-            rEntry.eOp = SC_EQUAL;
-        }
-    }
-}
-
-//------------------------------------------------------------------------
 // struct ScSubTotalParam:
 
 ScSubTotalParam::ScSubTotalParam()
@@ -863,8 +628,8 @@ __EXPORT ScPivotParam::~ScPivotParam()
 //UNUSED2009-05     nTab = 0;
 //UNUSED2009-05     bIgnoreEmptyRows = bDetectCategories = FALSE;
 //UNUSED2009-05     bMakeTotalCol = bMakeTotalRow = TRUE;
+//UNUSED2009-05     ClearLabelData();
 //UNUSED2009-05     ClearPivotArrays();
-//UNUSED2009-05     maLabelArray.clear();
 //UNUSED2009-05 }
 
 void __EXPORT ScPivotParam::ClearPivotArrays()
diff --git a/sc/source/core/data/makefile.mk b/sc/source/core/data/makefile.mk
index a9db42629..58931368f 100644
--- a/sc/source/core/data/makefile.mk
+++ b/sc/source/core/data/makefile.mk
@@ -99,7 +99,6 @@ SLOFILES =  \
     $(SLO)$/patattr.obj \
     $(SLO)$/pivot.obj \
     $(SLO)$/pivot2.obj \
-	$(SLO)$/phonetic.obj \
     $(SLO)$/poolhelp.obj \
     $(SLO)$/scimpexpmsg.obj \
 	$(SLO)$/segmenttree.obj \
@@ -121,6 +120,7 @@ EXCEPTIONSFILES= \
     $(SLO)$/autonamecache.obj \
     $(SLO)$/bcaslot.obj \
     $(SLO)$/cell2.obj \
+    $(SLO)$/clipparam.obj \
     $(SLO)$/column.obj \
     $(SLO)$/column3.obj \
     $(SLO)$/documen2.obj \
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index a30065e00..cc4f7f670 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -44,6 +44,7 @@
 #include "global.hxx"
 #include "rechead.hxx"
 #include "address.hxx"
+#include "table.hxx"
 
 //------------------------------------------------------------------------
 
@@ -640,8 +641,7 @@ BOOL ScOutlineArray::DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize )
     return bNeedSave;
 }
 
-BOOL ScOutlineArray::ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos,
-        BOOL bShow, const ScBitMaskCompressedArray< SCCOLROW, BYTE>& rHiddenFlags )
+bool ScOutlineArray::ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos, bool bShow, ScTable& rTable, bool bCol )
 {
     BOOL bModified = FALSE;
     ScSubOutlineIterator aIter( this );
@@ -657,9 +657,7 @@ BOOL ScOutlineArray::ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos,
             {
                 //	#i12341# hide if all columns/rows are hidden, show if at least one
                 //	is visible
-
-                SCCOLROW nEnd = rHiddenFlags.GetBitStateEnd( nEntryStart,
-                        CR_HIDDEN, CR_HIDDEN);
+                SCCOLROW nEnd = rTable.LastHiddenColRow(nEntryStart, bCol);
                 BOOL bAllHidden = (nEntryEnd <= nEnd && nEnd <
                         ::std::numeric_limits<SCCOLROW>::max());
 
diff --git a/sc/source/core/data/phonetic.cxx b/sc/source/core/data/phonetic.cxx
deleted file mode 100644
index 1bd10fa83..000000000
--- a/sc/source/core/data/phonetic.cxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: global.hxx,v $
- * $Revision: 1.53 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sc.hxx"
-
-// INCLUDE ---------------------------------------------------------------
-
-#if 1
-#ifndef _COM_SUN_STAR_UTIL_CELLPROTECTION_HPP_
-#include <com/sun/star/util/CellProtection.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_XPROTECTABLE_HPP_
-#include <com/sun/star/util/XProtectable.hpp>
-#endif
-#ifndef _COM_SUN_STAR_TEXT_XTEXT_HPP_
-#include <com/sun/star/text/XText.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
-#include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#endif
-
-#include "phonetic.hxx"
-
-using namespace com::sun::star;
-
-
-//------------------------------------------------------------------------
-
-ScPhonetic::~ScPhonetic()
-{
-}
-
-//------------------------------------------------------------------------
-
-int ScPhonetic::operator==( const ScPhonetic& rItem ) const
-{
-	return ((mnFontIdx == rItem.mnFontIdx)
-			 && (mnAdditionalSettings == rItem.mnAdditionalSettings)
-			 && (mnRepeatedTotalLength == rItem.mnRepeatedTotalLength)
-			 && (maPhoneticString == rItem.maPhoneticString)
-			 && (maPhoneticPortions == rItem.maPhoneticPortions));
-}
-
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index 4b29c8f39..85f294164 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -61,11 +61,25 @@
 #include "stlsheet.hxx"
 
 using ::com::sun::star::sheet::DataPilotFieldReference;
+using ::rtl::OUString;
 
 // STATIC DATA -----------------------------------------------------------
-
 // ============================================================================
 
+ScDPLabelData::Member::Member() :
+    mbVisible(true),
+    mbShowDetails(true)
+{
+}
+
+OUString ScDPLabelData::Member::getDisplayName() const
+{
+    if (maLayoutName.getLength())
+        return maLayoutName;
+
+    return maName;
+}
+
 ScDPLabelData::ScDPLabelData( const String& rName, short nCol, bool bIsValue ) :
     maName( rName ),
     mnCol( nCol ),
@@ -76,6 +90,14 @@ ScDPLabelData::ScDPLabelData( const String& rName, short nCol, bool bIsValue ) :
 {
 }
 
+OUString ScDPLabelData::getDisplayName() const
+{
+    if (maLayoutName.getLength())
+        return maLayoutName;
+
+    return maName;
+}
+
 // ============================================================================
 
 ScDPFuncData::ScDPFuncData( short nCol, USHORT nFuncMask ) :
diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx
index d77f3194c..4c2a19e01 100644
--- a/sc/source/core/data/poolhelp.cxx
+++ b/sc/source/core/data/poolhelp.cxx
@@ -45,27 +45,17 @@
 
 // -----------------------------------------------------------------------
 
-ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc )
+ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc ) 
+:pFormTable(NULL)
+,pEditPool(NULL)
+,pEnginePool(NULL)
+,m_pSourceDoc(pSourceDoc)
 {
     DBG_ASSERT( pSourceDoc, "ScPoolHelper: no document" );
-
     pDocPool = new ScDocumentPool;
     pDocPool->FreezeIdRanges();
 
     mxStylePool = new ScStyleSheetPool( *pDocPool, pSourceDoc );
-
-    pFormTable = new SvNumberFormatter( pSourceDoc->GetServiceManager(), ScGlobal::eLnge );
-    pFormTable->SetColorLink( LINK( pSourceDoc, ScDocument, GetUserDefinedColor ) );
-    pFormTable->SetEvalDateFormat( NF_EVALDATEFORMAT_INTL_FORMAT );
-
-    pEditPool = EditEngine::CreatePool();
-    pEditPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM );
-    pEditPool->FreezeIdRanges();
-    pEditPool->SetFileFormatVersion( SOFFICE_FILEFORMAT_50 );	// used in ScGlobal::EETextObjEqual
-
-    pEnginePool = EditEngine::CreatePool();
-    pEnginePool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM );
-    pEnginePool->FreezeIdRanges();
 }
 
 ScPoolHelper::~ScPoolHelper()
@@ -76,12 +66,49 @@ ScPoolHelper::~ScPoolHelper()
     mxStylePool.clear();
     SfxItemPool::Free(pDocPool);
 }
-
+SfxItemPool*		ScPoolHelper::GetEditPool() const
+{
+    if ( !pEditPool )
+    {
+        pEditPool = EditEngine::CreatePool();
+        pEditPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM );
+        pEditPool->FreezeIdRanges();
+        pEditPool->SetFileFormatVersion( SOFFICE_FILEFORMAT_50 );	// used in ScGlobal::EETextObjEqual
+    }
+    return pEditPool;
+}
+SfxItemPool*		ScPoolHelper::GetEnginePool() const
+{
+    if ( !pEnginePool )
+    {
+        pEnginePool = EditEngine::CreatePool();
+        pEnginePool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM );
+        pEnginePool->FreezeIdRanges();
+    } // ifg ( pEnginePool )
+    return pEnginePool;
+}
+SvNumberFormatter*	ScPoolHelper::GetFormTable() const
+{
+    if ( !pFormTable )
+    {
+        pFormTable = new SvNumberFormatter( m_pSourceDoc->GetServiceManager(), ScGlobal::eLnge );
+        pFormTable->SetColorLink( LINK( m_pSourceDoc, ScDocument, GetUserDefinedColor ) );
+        pFormTable->SetEvalDateFormat( NF_EVALDATEFORMAT_INTL_FORMAT );
+
+        USHORT d,m,y;
+        aOpt.GetDate( d,m,y );
+        pFormTable->ChangeNullDate( d,m,y );
+        pFormTable->ChangeStandardPrec( (USHORT)aOpt.GetStdPrecision() );
+        pFormTable->SetYear2000( aOpt.GetYear2000() );
+    }
+    return pFormTable;
+}
 void ScPoolHelper::SourceDocumentGone()
 {
     //	reset all pointers to the source document
     mxStylePool->SetDocument( NULL );
-    pFormTable->SetColorLink( Link() );
+    if ( pFormTable )
+        pFormTable->SetColorLink( Link() );
 }
 
 // -----------------------------------------------------------------------
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index bb5f75627..332772e1e 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -36,6 +36,7 @@
 #include "sortparam.hxx"
 #include "global.hxx"
 #include "address.hxx"
+#include "queryparam.hxx"
 #include <tools/debug.hxx>
 
 
@@ -50,7 +51,7 @@ ScSortParam::ScSortParam()
 
 ScSortParam::ScSortParam( const ScSortParam& r ) :
         nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),
-		bHasHeader(r.bHasHeader),bByRow(r.bByRow),bCaseSens(r.bCaseSens),bNaturalSort(r.bNaturalSort),
+        bHasHeader(r.bHasHeader),bByRow(r.bByRow),bCaseSens(r.bCaseSens),bNaturalSort(r.bNaturalSort),
         bUserDef(r.bUserDef),nUserIndex(r.nUserIndex),bIncludePattern(r.bIncludePattern),
         bInplace(r.bInplace),
         nDestTab(r.nDestTab),nDestCol(r.nDestCol),nDestRow(r.nDestRow),
@@ -73,7 +74,7 @@ void ScSortParam::Clear()
     nCompatHeader = 2;
     nDestTab = 0;
     nUserIndex = 0;
-	bHasHeader=bCaseSens=bUserDef=bNaturalSort = FALSE;
+    bHasHeader=bCaseSens=bUserDef=bNaturalSort = FALSE;
     bByRow=bIncludePattern=bInplace	= TRUE;
     aCollatorLocale = ::com::sun::star::lang::Locale();
     aCollatorAlgorithm.Erase();
@@ -96,7 +97,7 @@ ScSortParam& ScSortParam::operator=( const ScSortParam& r )
     nRow2			= r.nRow2;
     bHasHeader		= r.bHasHeader;
     bCaseSens		= r.bCaseSens;
-	bNaturalSort	= r.bNaturalSort;
+    bNaturalSort	= r.bNaturalSort;
     bByRow			= r.bByRow;
     bUserDef		= r.bUserDef;
     nUserIndex		= r.nUserIndex;
@@ -138,7 +139,7 @@ BOOL ScSortParam::operator==( const ScSortParam& rOther ) const
         && (bHasHeader		== rOther.bHasHeader)
         && (bByRow			== rOther.bByRow)
         && (bCaseSens		== rOther.bCaseSens)
-		&& (bNaturalSort	== rOther.bNaturalSort)
+        && (bNaturalSort	== rOther.bNaturalSort)
         && (bUserDef		== rOther.bUserDef)
         && (nUserIndex		== rOther.nUserIndex)
         && (bIncludePattern == rOther.bIncludePattern)
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 0fd6fb056..d45f43867 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -263,7 +263,7 @@ void ScStyleSheetPool::CreateStandardStyles()
     String			aStr;
     xub_StrLen		nStrLen;
     String			aHelpFile;//XXX JN welcher Text???
-    ULONG			nNumFmt			= 0L;
+    //ULONG			nNumFmt			= 0L;
     SfxItemSet*		pSet			= NULL;
     SfxItemSet*		pHFSet			= NULL;
     SvxSetItem*		pHFSetItem		= NULL;
@@ -345,10 +345,11 @@ void ScStyleSheetPool::CreateStandardStyles()
 
     pSheet->SetParent( SCSTR( STR_STYLENAME_RESULT ) );
     pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_ERG1 );
-    pSet = &pSheet->GetItemSet();
-    nNumFmt = pDoc->GetFormatTable()->GetStandardFormat( NUMBERFORMAT_CURRENCY,
-                                                        ScGlobal::eLnge );
-    pSet->Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumFmt ) );
+    // will now be done in GetItemSet();
+    // pSet = &pSheet->GetItemSet();
+    // nNumFmt = pDoc->GetFormatTable()->GetStandardFormat( NUMBERFORMAT_CURRENCY,
+            //										    ScGlobal::eLnge );
+    // pSet->Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumFmt ) );
 
     //----------------
     // 4. Ueberschrift
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 0469e8d38..22db96040 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -53,10 +53,11 @@
 #include <svtools/smplhint.hxx>
 #include "attrib.hxx"
 
+
 #include <vcl/svapp.hxx>	// GetSettings()
 
 #include "globstr.hrc"
-
+#include "sc.hrc"
 //------------------------------------------------------------------------
 
 TYPEINIT1(ScStyleSheet, SfxStyleSheet);
@@ -247,6 +248,18 @@ SfxItemSet& __EXPORT ScStyleSheet::GetItemSet()
                 break;
         }
         bMySet = TRUE;
+    } // if ( !pSet )
+    if ( nHelpId == HID_SC_SHEET_CELL_ERG1 )
+    {
+        if ( !pSet->Count() )
+        {
+            ScDocument* pDoc = ((ScStyleSheetPool&)GetPool()).GetDocument();
+            if ( pDoc )
+            {
+                ULONG nNumFmt = pDoc->GetFormatTable()->GetStandardFormat( NUMBERFORMAT_CURRENCY,ScGlobal::eLnge );
+                pSet->Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumFmt ) );
+            } // if ( pDoc && pDoc->IsLoadingDone() )
+        }
     }
 
     return *pSet;
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index ce4919d10..733d8849d 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -115,6 +115,7 @@
 #include "hints.hxx"		// fuer Paint-Broadcast
 #include "prnsave.hxx"
 #include "tabprotection.hxx"
+#include "segmenttree.hxx"
 
 // STATIC DATA -----------------------------------------------------------
 
@@ -139,9 +140,14 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
     pRowHeight( NULL ),
     pColFlags( NULL ),
     pRowFlags( NULL ),
+    mpHiddenCols(new ScFlatBoolColSegments),
+    mpHiddenRows(new ScFlatBoolRowSegments),
+    mpFilteredCols(new ScFlatBoolColSegments),
+    mpFilteredRows(new ScFlatBoolRowSegments),
     pOutlineTable( NULL ),
     bTableAreaValid( FALSE ),
     bVisible( TRUE ),
+    bStreamValid( FALSE ),
     bPendingRowHeights( FALSE ),
     nTab( nNewTab ),
     nRecalcLvl( 0 ),
@@ -156,7 +162,8 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
     pScenarioRanges( NULL ),
     aScenarioColor( COL_LIGHTGRAY ),
     nScenarioFlags( 0 ),
-    bActiveScenario( FALSE )
+	bActiveScenario( FALSE ),
+    mbPageBreaksValid(false)
 {
 
     if (bColInfo)
@@ -249,9 +256,18 @@ const String& ScTable::GetUpperName() const
 
 void ScTable::SetVisible( BOOL bVis )
 {
+    if (bVisible != bVis && IsStreamValid())
+        SetStreamValid(FALSE);
+
     bVisible = bVis;
 }
 
+void ScTable::SetStreamValid( BOOL bSet, BOOL bIgnoreLock )
+{
+    if ( bIgnoreLock || !pDocument->IsStreamValidLocked() )
+        bStreamValid = bSet;
+}
+
 void ScTable::SetPendingRowHeights( BOOL bSet )
 {
     bPendingRowHeights = bSet;
@@ -680,7 +696,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
 }
 
 void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
-							BOOL bIncludeOld ) const
+                           BOOL bIncludeOld ) const
 {
     BOOL bLeft       = FALSE;
     BOOL bRight  = FALSE;
@@ -897,9 +913,10 @@ BOOL ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
         //	auf der naechsten Zelle landet, auch wenn die geschuetzt/nicht markiert ist.
         //!	per Extra-Parameter steuern, nur fuer Cursor-Bewegung ???
 
-        if ( pRowFlags && ( pRowFlags->GetValue(nRow) & CR_HIDDEN ) )
+        if (RowHidden(nRow))
             return FALSE;
-        if ( pColFlags && ( pColFlags[nCol] & CR_HIDDEN ) )
+
+        if (ColHidden(nCol))
             return FALSE;
     }
 
@@ -926,8 +943,8 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
     {
         BOOL bUp = ( nMovY < 0 );
         nRow = rMark.GetNextMarked( nCol, nRow, bUp );
-        while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
-                pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
+        while ( VALIDROW(nRow) && 
+                (RowHidden(nRow) || pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
         {
             //	#53697# ausgeblendete ueberspringen (s.o.)
             nRow += nMovY;
@@ -937,7 +954,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
         while ( nRow < 0 || nRow > MAXROW )
         {
             nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) );
-            while ( VALIDCOL(nCol) && pColFlags && (pColFlags[nCol] & CR_HIDDEN) )
+			while ( VALIDCOL(nCol) && ColHidden(nCol) )
                 nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) );   //	#53697# skip hidden rows (see above)
             if (nCol < 0)
             {
@@ -956,8 +973,8 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
             else if (nRow > MAXROW)
                 nRow = 0;
             nRow = rMark.GetNextMarked( nCol, nRow, bUp );
-            while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
-                    pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
+            while ( VALIDROW(nRow) && 
+                    (RowHidden(nRow) || pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
             {
                 //	#53697# ausgeblendete ueberspringen (s.o.)
                 nRow += nMovY;
@@ -1257,6 +1274,9 @@ void ScTable::UpdateInsertTab(SCTAB nTable)
 {
     if (nTab >= nTable) nTab++;
     for (SCCOL i=0; i <= MAXCOL; i++) aCol[i].UpdateInsertTab(nTable);
+
+    if (IsStreamValid())
+        SetStreamValid(FALSE);
 }
 
 //UNUSED2008-05  void ScTable::UpdateInsertTabOnlyCells(SCTAB nTable)
@@ -1273,6 +1293,9 @@ void ScTable::UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo )
         for (i=0; i <= MAXCOL; i++) aCol[i].UpdateDeleteTab(nTable, bIsMove, &pRefUndo->aCol[i]);
     else
         for (i=0; i <= MAXCOL; i++) aCol[i].UpdateDeleteTab(nTable, bIsMove, NULL);
+
+    if (IsStreamValid())
+        SetStreamValid(FALSE);
 }
 
 void ScTable::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo,
@@ -1284,6 +1307,9 @@ void ScTable::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo,
         aCol[i].UpdateMoveTab( nOldPos, nNewPos, nTabNo );
         rProgress.SetState( rProgress.GetState() + aCol[i].GetCodeCount() );
     }
+
+    if (IsStreamValid())
+        SetStreamValid(FALSE);
 }
 
 void ScTable::UpdateCompile( BOOL bForceIfNameInUse )
@@ -1318,16 +1344,6 @@ void ScTable::FindRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
 
 void ScTable::ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1,
                                     SCCOL nCol2, SCROW nRow2,
-                                    const ScIndexMap& rMap )
-{
-    for (SCCOL i = nCol1; i <= nCol2 && (ValidCol(i)); i++)
-    {
-        aCol[i].ReplaceRangeNamesInUse( nRow1, nRow2, rMap );
-    }
-}
-
-void ScTable::ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1,
-                                    SCCOL nCol2, SCROW nRow2,
                                     const ScRangeData::IndexMap& rMap )
 {
     for (SCCOL i = nCol1; i <= nCol2 && (ValidCol(i)); i++)
@@ -1355,19 +1371,14 @@ void ScTable::ExtendPrintArea( OutputDevice* pDev,
 
     SCSIZE nIndex;
     SCCOL nPrintCol = rEndCol;
-    SCSIZE nRowFlagsIndex;
-    SCROW nRowFlagsEndRow;
-    BYTE nRowFlag = pRowFlags->GetValue( nStartRow, nRowFlagsIndex, nRowFlagsEndRow);
     for (SCROW nRow = nStartRow; nRow<=nEndRow; nRow++)
     {
-        if (nRow > nRowFlagsEndRow)
-            nRowFlag = pRowFlags->GetNextValue( nRowFlagsIndex, nRowFlagsEndRow);
-        if ( ( nRowFlag & CR_HIDDEN ) == 0 )
+		if (!RowHidden(nRow))
         {
             SCCOL nDataCol = rEndCol;
             while (nDataCol > 0 && ( bEmpty[nDataCol] || !aCol[nDataCol].Search(nRow,nIndex) ) )
                 --nDataCol;
-            if ( ( pColFlags[nDataCol] & CR_HIDDEN ) == 0 )
+            if (!ColHidden(nDataCol))
             {
                 ScBaseCell* pCell = aCol[nDataCol].GetCell(nRow);
                 if (pCell)
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 4a2f5998c..773cf8b66 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -132,12 +132,17 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
         }
         if (pOutlineTable)
             pOutlineTable->InsertRow( nStartRow, nSize );
+
+        mpFilteredRows->insertSegment(nStartRow, nSize, true);
+        mpHiddenRows->insertSegment(nStartRow, nSize, true);
     }
 
     for (SCCOL j=nStartCol; j<=nEndCol; j++)
         aCol[j].InsertRow( nStartRow, nSize );
     if( !--nRecalcLvl )
         SetDrawPageSize();
+
+    InvalidatePageBreaks();
 }
 
 
@@ -157,6 +162,9 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
             if (pOutlineTable->DeleteRow( nStartRow, nSize ))
                 if (pUndoOutline)
                     *pUndoOutline = TRUE;
+
+        mpFilteredRows->removeSegment(nStartRow, nStartRow+nSize);
+        mpHiddenRows->removeSegment(nStartRow, nStartRow+nSize);
     }
 
     {   // scope for bulk broadcast
@@ -166,6 +174,8 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
     }
     if( !--nRecalcLvl )
         SetDrawPageSize();
+
+    InvalidatePageBreaks();
 }
 
 
@@ -201,6 +211,9 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
         }
         if (pOutlineTable)
             pOutlineTable->InsertCol( nStartCol, nSize );
+
+        mpHiddenCols->insertSegment(nStartCol, nSize, true);
+        mpFilteredCols->insertSegment(nStartCol, nSize, true);
     }
 
 
@@ -233,6 +246,8 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
     }
     if( !--nRecalcLvl )
         SetDrawPageSize();
+
+    InvalidatePageBreaks();
 }
 
 
@@ -254,6 +269,9 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
             if (pOutlineTable->DeleteCol( nStartCol, nSize ))
                 if (pUndoOutline)
                     *pUndoOutline = TRUE;
+
+        mpHiddenCols->removeSegment(nStartCol, nStartCol+nSize);
+        mpFilteredCols->removeSegment(nStartCol, nStartCol+nSize);
     }
 
 
@@ -276,6 +294,8 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
     }
     if( !--nRecalcLvl )
         SetDrawPageSize();
+
+    InvalidatePageBreaks();
 }
 
 
@@ -349,20 +369,21 @@ void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
         //	copy widths/heights, and only "hidden", "filtered" and "manual" flags
         //	also for all preceding columns/rows, to have valid positions for drawing objects
 
-        if (pColFlags && pTable->pColFlags && pColWidth && pTable->pColWidth)
+		if (pColWidth && pTable->pColWidth)
             for (i=0; i<=nCol2; i++)
-            {
-                pTable->pColFlags[i] = pColFlags[i] & CR_HIDDEN;
                 pTable->pColWidth[i] = pColWidth[i];
-            }
+
+        pTable->CopyColHidden(*this, 0, nCol2);
+        pTable->CopyColFiltered(*this, 0, nCol2);
 
         if (pRowFlags && pTable->pRowFlags && pRowHeight && pTable->pRowHeight)
         {
-            pTable->pRowFlags->CopyFromAnded( *pRowFlags, 0, nRow2,
-                    (CR_HIDDEN | CR_FILTERED | CR_MANUALSIZE));
+            pTable->pRowFlags->CopyFromAnded( *pRowFlags, 0, nRow2, CR_MANUALSIZE);
             pTable->pRowHeight->CopyFrom( *pRowHeight, 0, nRow2);
         }
 
+        pTable->CopyRowHidden(*this, 0, nRow2);
+        pTable->CopyRowFiltered(*this, 0, nRow2);
 
         //	ggf. Formeln durch Werte ersetzen
 
@@ -642,6 +663,8 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
             //	Charts muessen beim Ein-/Ausblenden angepasst werden
             ScChartListenerCollection* pCharts = pDestTab->pDocument->GetChartListenerCollection();
 
+            bool bFlagChange = false;
+
             BOOL bWidth  = (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth);
             BOOL bHeight = (nCol1==0 && nCol2==MAXCOL && pRowHeight && pDestTab->pRowHeight);
 
@@ -652,33 +675,64 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                 if (bWidth)
                     for (SCCOL i=nCol1; i<=nCol2; i++)
                     {
-                        BOOL bChange = pCharts &&
-                            ( pDestTab->pColFlags[i] & CR_HIDDEN ) != ( pColFlags[i] & CR_HIDDEN );
+                        bool bThisHidden = ColHidden(i);
+                        bool bHiddenChange = (pDestTab->ColHidden(i) != bThisHidden);
+						bool bChange = bHiddenChange || (pDestTab->pColWidth[i] != pColWidth[i]);
                         pDestTab->pColWidth[i] = pColWidth[i];
                         pDestTab->pColFlags[i] = pColFlags[i];
+                        pDestTab->SetColHidden(i, i, bThisHidden);
                         //!	Aenderungen zusammenfassen?
-                        if (bChange)
+						if (bHiddenChange && pCharts) 
                             pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab ));
+
+						if (bChange)
+                            bFlagChange = true;
                     }
 
                 if (bHeight)
                 {
+					bool bChange = pDestTab->pRowHeight->SumValues(nRow1, nRow2) != pRowHeight->SumValues(nRow1, nRow2);
+
+					if (bChange)
+                        bFlagChange = true;
+
                     pDestTab->pRowHeight->CopyFrom( *pRowHeight, nRow1, nRow2);
-                    for (SCROW i=nRow1; i<=nRow2; i++)
+                    pDestTab->pRowFlags->CopyFrom(*pRowFlags, nRow1, nRow2);
+
+                    for (SCROW i = nRow1; i <= nRow2; ++i)
                     {
-                        // TODO: might need some performance improvement, block
-                        // operations instead of single GetValue()/SetValue() calls.
-                        BYTE nThisRowFlags = pRowFlags->GetValue(i);
-                        BOOL bChange = pCharts &&
-                            ( pDestTab->pRowFlags->GetValue(i) & CR_HIDDEN ) != ( nThisRowFlags & CR_HIDDEN );
-                        pDestTab->pRowFlags->SetValue( i, nThisRowFlags );
-                        //!	Aenderungen zusammenfassen?
-                        if (bChange)
-                            pCharts->SetRangeDirty(ScRange( 0, i, nTab, MAXCOL, i, nTab ));
+                        SCROW nThisLastRow, nDestLastRow;
+                        bool bThisHidden = RowHidden(i, nThisLastRow);
+                        bool bDestHidden = pDestTab->RowHidden(i, nDestLastRow);
+    
+                        // If the segment sizes differ, we take the shorter segment of the two.
+                        SCROW nLastRow = ::std::min(nThisLastRow, nDestLastRow);
+                        if (nLastRow >= nRow2)
+                            // the last row shouldn't exceed the upper bound the caller specified.
+                            nLastRow = nRow2;
+    
+                        pDestTab->SetRowHidden(i, nLastRow, bThisHidden);
+
+                        bool bThisHiddenChange = (bThisHidden != bDestHidden);
+                        if (bThisHiddenChange && pCharts)
+                        {
+                            // Hidden flags differ.
+                            pCharts->SetRangeDirty(ScRange(0, i, nTab, MAXCOL, nLastRow, nTab));
+                        }
+    
+                        if (bThisHiddenChange)
+                            bFlagChange = true;
+    
+                        // Jump to the last row of the identical flag segment.
+                        i = nLastRow;
                     }
                 }
                 pDestTab->DecRecalcLevel();
             }
+
+            if (bFlagChange)
+                pDestTab->InvalidatePageBreaks();
+
             pDestTab->SetOutlineTable( pOutlineTable );		// auch nur wenn bColRowFlags
         }
     }
@@ -726,6 +780,16 @@ void ScTable::CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const
         aCol[i].CopyUpdated( pPosTab->aCol[i], pDestTab->aCol[i] );
 }
 
+void ScTable::InvalidateTableArea()
+{
+    bTableAreaValid = FALSE;
+}
+
+void ScTable::InvalidatePageBreaks()
+{
+    mbPageBreaksValid = false;
+}
+
 void ScTable::CopyScenarioTo( ScTable* pDestTab ) const
 {
     DBG_ASSERT( bScenario, "bScenario == FALSE" );
@@ -858,11 +922,11 @@ void ScTable::PutCell( const ScAddress& rPos, ScBaseCell* pCell )
 
 
 BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString, 
-                         SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
+                         ScSetStringParam* pParam )
 {
     if (ValidColRow(nCol,nRow))
         return aCol[nCol].SetString( 
-            nRow, nTabP, rString, pDocument->GetAddressConvention(), pFormatter, bDetectNumberFormat );
+            nRow, nTabP, rString, pDocument->GetAddressConvention(), pParam );
     else
         return FALSE;
 }
@@ -1271,7 +1335,7 @@ BOOL ScTable::IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
 SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2,
                             SCCOL nCol, SCROW nAttrRow1, SCROW nAttrRow2, SCSIZE nArrY,
-                            const ScPatternAttr* pPattern, const SfxItemSet* pCondSet ) const
+							const ScPatternAttr* pPattern, const SfxItemSet* pCondSet )
 {
     //	Rueckgabe = neues nArrY
 
@@ -1304,7 +1368,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
 
             for ( SCROW nRow = nAttrRow1; nRow <= nAttrRow2; nRow++ )
             {
-                if ( !(pRowFlags->GetValue(nRow) & CR_HIDDEN) )
+                if (!RowHidden(nRow))
                 {
                     BOOL bHitOne = TRUE;
                     if ( nCol > nX2+1 )
@@ -1338,7 +1402,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
     return nArrY;
 }
 
-void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ) const
+void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 )
 {
     if ( !pColWidth || !pRowHeight || !pColFlags || !pRowFlags )
     {
@@ -1353,7 +1417,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC
 
     for (SCCOL nCol=0; nCol<=MAXCOL; nCol++)
     {
-        if ( !(pColFlags[nCol] & CR_HIDDEN) )
+        if (!ColHidden(nCol))
         {
             SCSIZE nArrY = 0;
             ScDocAttrIterator aIter( pDocument, nTab, nCol, nY1, nCol, nY2 );
@@ -1969,6 +2033,8 @@ void ScTable::SetColWidth( SCCOL nCol, USHORT nNewWidth )
             pColWidth[nCol] = nNewWidth;
             if( !--nRecalcLvl )
                 SetDrawPageSize();
+
+            InvalidatePageBreaks();
         }
     }
     else
@@ -1999,6 +2065,8 @@ void ScTable::SetRowHeight( SCROW nRow, USHORT nNewHeight )
             pRowHeight->SetValue( nRow, nNewHeight);
             if( !--nRecalcLvl )
                 SetDrawPageSize();
+
+            InvalidatePageBreaks();
         }
     }
     else
@@ -2099,6 +2167,9 @@ BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeig
         }
         if( !--nRecalcLvl )
             SetDrawPageSize();
+
+        if (bChanged)
+            InvalidatePageBreaks();
     }
     else
     {
@@ -2125,13 +2196,13 @@ void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual )
 }
 
 
-USHORT ScTable::GetColWidth( SCCOL nCol ) const
+USHORT ScTable::GetColWidth( SCCOL nCol )
 {
     DBG_ASSERT(VALIDCOL(nCol),"Falsche Spaltennummer");
 
     if (VALIDCOL(nCol) && pColFlags && pColWidth)
     {
-        if ( pColFlags[nCol] & CR_HIDDEN )
+        if (ColHidden(nCol))
             return 0;
         else
             return pColWidth[nCol];
@@ -2152,7 +2223,7 @@ USHORT ScTable::GetOriginalWidth( SCCOL nCol ) const		// immer die eingestellte
 }
 
 
-USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) const
+USHORT ScTable::GetCommonWidth( SCCOL nEndCol )
 {
     //	get the width that is used in the largest continuous column range (up to nEndCol)
 
@@ -2164,24 +2235,24 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) const
 
     USHORT nMaxWidth = 0;
     USHORT nMaxCount = 0;
-    USHORT nRangeStart = 0;
+	SCCOL nRangeStart = 0;
     while ( nRangeStart <= nEndCol )
     {
         //	skip hidden columns
-        while ( nRangeStart <= nEndCol && (pColFlags[nRangeStart] & CR_HIDDEN) )
+		while ( nRangeStart <= nEndCol && ColHidden(nRangeStart) )
             ++nRangeStart;
         if ( nRangeStart <= nEndCol )
         {
             USHORT nThisCount = 0;
             USHORT nThisWidth = pColWidth[nRangeStart];
-            USHORT nRangeEnd = nRangeStart;
+			SCCOL nRangeEnd = nRangeStart;
             while ( nRangeEnd <= nEndCol && pColWidth[nRangeEnd] == nThisWidth )
             {
                 ++nThisCount;
                 ++nRangeEnd;
 
                 //	skip hidden columns
-                while ( nRangeEnd <= nEndCol && (pColFlags[nRangeEnd] & CR_HIDDEN) )
+				while ( nRangeEnd <= nEndCol && ColHidden(nRangeEnd) )
                     ++nRangeEnd;
             }
 
@@ -2199,13 +2270,13 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) const
 }
 
 
-USHORT ScTable::GetRowHeight( SCROW nRow ) const
+USHORT ScTable::GetRowHeight( SCROW nRow )
 {
     DBG_ASSERT(VALIDROW(nRow),"Falsche Zeilennummer");
 
-    if (VALIDROW(nRow) && pRowFlags && pRowHeight)
+	if (VALIDROW(nRow) && pRowHeight)
     {
-        if ( pRowFlags->GetValue(nRow) & CR_HIDDEN )
+        if (RowHidden(nRow))
             return 0;
         else
             return pRowHeight->GetValue(nRow);
@@ -2215,28 +2286,53 @@ USHORT ScTable::GetRowHeight( SCROW nRow ) const
 }
 
 
-ULONG ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const
+ULONG ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow )
 {
     DBG_ASSERT(VALIDROW(nStartRow) && VALIDROW(nEndRow),"Falsche Zeilennummer");
 
-    if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowFlags && pRowHeight)
+	if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowHeight)
     {
-        return pRowFlags->SumCoupledArrayForCondition( nStartRow, nEndRow,
-                CR_HIDDEN, 0, *pRowHeight);
+        ULONG nHeight = 0;
+        SCROW nRow = nStartRow;
+        while (nRow <= nEndRow)
+        {
+            SCROW nLastRow = -1;
+            if (!RowHidden(nRow, nLastRow))
+            {
+                if (nLastRow > nEndRow)
+                    nLastRow = nEndRow;
+                nHeight += pRowFlags->SumCoupledArrayForCondition(nRow, nLastRow, 0, 0, *pRowHeight);
+            }
+            nRow = nLastRow + 1;
+        }
+        return nHeight;
     }
     else
         return (ULONG) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight);
 }
 
 
-ULONG ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const
+ULONG ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale )
 {
     DBG_ASSERT(VALIDROW(nStartRow) && VALIDROW(nEndRow),"Falsche Zeilennummer");
 
-    if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowFlags && pRowHeight)
+	if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowHeight)
     {
-        return pRowFlags->SumScaledCoupledArrayForCondition( nStartRow,
-                nEndRow, CR_HIDDEN, 0, *pRowHeight, fScale);
+        ULONG nHeight = 0;
+        SCROW nRow = nStartRow;
+        while (nRow <= nEndRow)
+        {
+            SCROW nLastRow = -1;
+            if (!RowHidden(nRow, nLastRow))
+            {
+                if (nLastRow > nEndRow)
+                    nLastRow = nEndRow;
+                nHeight += pRowFlags->SumScaledCoupledArrayForCondition(
+                    nRow, nLastRow, 0, 0, *pRowHeight, fScale);
+            }
+            nRow = nLastRow + 1;
+        }
+        return nHeight;
     }
     else
         return (ULONG) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight * fScale);
@@ -2257,18 +2353,16 @@ USHORT ScTable::GetOriginalHeight( SCROW nRow ) const		// non-0 even if hidden
 //	Spalten-/Zeilen-Flags
 
 
-SCROW ScTable::GetHiddenRowCount( SCROW nRow ) const
+SCROW ScTable::GetHiddenRowCount( SCROW nRow )
 {
-    SCROW nEndRow = nRow;
-    if ( pRowFlags )
-    {
-        nEndRow = pRowFlags->GetBitStateEnd( nRow, CR_HIDDEN, CR_HIDDEN);
-        if (ValidRow(nEndRow))
-            ++nEndRow;
-        else
-            nEndRow = nRow;
-    }
-    return nEndRow - nRow;
+    if (!ValidRow(nRow))
+        return 0;
+
+    SCROW nLastRow = -1;
+    if (!RowHidden(nRow, nLastRow) || !ValidRow(nLastRow))
+        return 0;
+
+    return nLastRow - nRow + 1;
 }
 
 
@@ -2276,9 +2370,9 @@ SCROW ScTable::GetHiddenRowCount( SCROW nRow ) const
 
 void ScTable::ShowCol(SCCOL nCol, BOOL bShow)
 {
-    if (VALIDCOL(nCol) && pColFlags)
+	if (VALIDCOL(nCol))
     {
-        BOOL bWasVis = ( pColFlags[nCol] & CR_HIDDEN ) == 0;
+        bool bWasVis = !ColHidden(nCol);
         if (bWasVis != bShow)
         {
             nRecalcLvl++;
@@ -2292,10 +2386,8 @@ void ScTable::ShowCol(SCCOL nCol, BOOL bShow)
                     pDrawLayer->WidthChanged( nTab, nCol, -(long) pColWidth[nCol] );
             }
 
-            if (bShow)
-                pColFlags[nCol] &= ~CR_HIDDEN;
-            else
-                pColFlags[nCol] |= CR_HIDDEN;
+            SetColHidden(nCol, nCol, !bShow);
+
             if( !--nRecalcLvl )
                 SetDrawPageSize();
 
@@ -2315,8 +2407,7 @@ void ScTable::ShowRow(SCROW nRow, BOOL bShow)
 {
     if (VALIDROW(nRow) && pRowFlags)
     {
-        BYTE nFlags = pRowFlags->GetValue(nRow);
-        BOOL bWasVis = ( nFlags & CR_HIDDEN ) == 0;
+        bool bWasVis = !RowHidden(nRow);
         if (bWasVis != bShow)
         {
             nRecalcLvl++;
@@ -2330,16 +2421,18 @@ void ScTable::ShowRow(SCROW nRow, BOOL bShow)
                     pDrawLayer->HeightChanged( nTab, nRow, -(long) pRowHeight->GetValue(nRow) );
             }
 
+            SetRowHidden(nRow, nRow, !bShow);
             if (bShow)
-                pRowFlags->SetValue( nRow, nFlags & ~(CR_HIDDEN | CR_FILTERED));
-            else
-                pRowFlags->SetValue( nRow, nFlags | CR_HIDDEN);
+                SetRowFiltered(nRow, nRow, false);
+
             if( !--nRecalcLvl )
                 SetDrawPageSize();
 
             ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
             if ( pCharts )
                 pCharts->SetRangeDirty(ScRange( 0, nRow, nTab, MAXCOL, nRow, nTab ));
+
+            InvalidatePageBreaks();
         }
     }
     else
@@ -2353,8 +2446,7 @@ void ScTable::DBShowRow(SCROW nRow, BOOL bShow)
 {
     if (VALIDROW(nRow) && pRowFlags)
     {
-        BYTE nFlags = pRowFlags->GetValue(nRow);
-        BOOL bWasVis = ( nFlags & CR_HIDDEN ) == 0;
+        bool bWasVis = !RowHidden(nRow);
         nRecalcLvl++;
         InitializeNoteCaptions();
         if (bWasVis != bShow)
@@ -2370,10 +2462,10 @@ void ScTable::DBShowRow(SCROW nRow, BOOL bShow)
         }
 
         //	Filter-Flag immer setzen, auch wenn Hidden unveraendert
-        if (bShow)
-            pRowFlags->SetValue( nRow, nFlags & ~(CR_HIDDEN | CR_FILTERED));
-        else
-            pRowFlags->SetValue( nRow, nFlags | (CR_HIDDEN | CR_FILTERED));
+
+        SetRowHidden(nRow, nRow, !bShow);
+        SetRowFiltered(nRow, nRow, !bShow);
+
         if( !--nRecalcLvl )
             SetDrawPageSize();
 
@@ -2385,6 +2477,8 @@ void ScTable::DBShowRow(SCROW nRow, BOOL bShow)
 
             if (pOutlineTable)
                 UpdateOutlineRow( nRow, nRow, bShow );
+
+            InvalidatePageBreaks();
         }
     }
     else
@@ -2401,12 +2495,11 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
     InitializeNoteCaptions();
     while (nStartRow <= nRow2)
     {
-        BYTE nOldFlag = pRowFlags->GetValue(nStartRow) & CR_HIDDEN;
-        SCROW nEndRow = pRowFlags->GetBitStateEnd( nStartRow, CR_HIDDEN, nOldFlag);
+        SCROW nEndRow = -1;
+        bool bWasVis = !RowHidden(nStartRow, nEndRow);
         if (nEndRow > nRow2)
             nEndRow = nRow2;
 
-        BOOL bWasVis = ( nOldFlag == 0 );
         BOOL bChanged = ( bWasVis != bShow );
         if ( bChanged )
         {
@@ -2421,10 +2514,8 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
             }
         }
 
-        if (bShow)
-            pRowFlags->AndValue( nStartRow, nEndRow, sal::static_int_cast<BYTE>(~(CR_HIDDEN | CR_FILTERED)) );
-        else
-            pRowFlags->OrValue( nStartRow, nEndRow, (CR_HIDDEN | CR_FILTERED));
+        SetRowHidden(nStartRow, nEndRow, !bShow);
+        SetRowFiltered(nStartRow, nEndRow, !bShow);
 
         if ( bChanged )
         {
@@ -2454,12 +2545,11 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
     InitializeNoteCaptions();
     while (nStartRow <= nRow2)
     {
-        BYTE nOldFlag = pRowFlags->GetValue(nStartRow) & CR_HIDDEN;
-        SCROW nEndRow = pRowFlags->GetBitStateEnd( nStartRow, CR_HIDDEN, nOldFlag);
+        SCROW nEndRow = -1;
+        bool bWasVis = !RowHidden(nStartRow, nEndRow);
         if (nEndRow > nRow2)
             nEndRow = nRow2;
 
-        BOOL bWasVis = ( nOldFlag == 0 );
         BOOL bChanged = ( bWasVis != bShow );
         if ( bChanged )
         {
@@ -2474,16 +2564,17 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
             }
         }
 
+        SetRowHidden(nStartRow, nEndRow, !bShow);
         if (bShow)
-            pRowFlags->AndValue( nStartRow, nEndRow, sal::static_int_cast<BYTE>(~(CR_HIDDEN | CR_FILTERED)) );
-        else
-            pRowFlags->OrValue( nStartRow, nEndRow, CR_HIDDEN);
+            SetRowFiltered(nStartRow, nEndRow, false);
 
         if ( bChanged )
         {
             ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
             if ( pCharts )
                 pCharts->SetRangeDirty(ScRange( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab ));
+
+            InvalidatePageBreaks();
         }
 
         nStartRow = nEndRow + 1;
@@ -2493,16 +2584,6 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow)
 }
 
 
-BOOL ScTable::IsFiltered(SCROW nRow) const
-{
-    if (VALIDROW(nRow) && pRowFlags)
-        return ( pRowFlags->GetValue(nRow) & CR_FILTERED ) != 0;
-
-    DBG_ERROR("Falsche Zeilennummer oder keine Flags");
-    return FALSE;
-}
-
-
 void ScTable::SetColFlags( SCCOL nCol, BYTE nNewFlags )
 {
     if (VALIDCOL(nCol) && pColFlags)
@@ -2559,7 +2640,7 @@ SCROW ScTable::GetLastFlaggedRow() const
     if ( !pRowFlags )
         return 0;
 
-    SCROW nLastFound = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
+    SCROW nLastFound = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(CR_ALL) );
     return ValidRow(nLastFound) ? nLastFound : 0;
 }
 
@@ -2571,7 +2652,7 @@ SCCOL ScTable::GetLastChangedCol() const
 
     SCCOL nLastFound = 0;
     for (SCCOL nCol = 1; nCol <= MAXCOL; nCol++)
-        if ((pColFlags[nCol] & ~CR_PAGEBREAK) || (pColWidth[nCol] != STD_COL_WIDTH))
+        if ((pColFlags[nCol] & CR_ALL) || (pColWidth[nCol] != STD_COL_WIDTH))
             nLastFound = nCol;
 
     return nLastFound;
@@ -2583,7 +2664,7 @@ SCROW ScTable::GetLastChangedRow() const
     if ( !pRowFlags )
         return 0;
 
-    SCROW nLastFlags = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
+    SCROW nLastFlags = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(CR_ALL) );
     if (!ValidRow(nLastFlags))
         nLastFlags = 0;
 
@@ -2600,7 +2681,7 @@ BOOL ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow )
     if (pOutlineTable && pColFlags)
     {
         ScBitMaskCompressedArray< SCCOLROW, BYTE> aArray( MAXCOL, pColFlags, MAXCOLCOUNT);
-        return pOutlineTable->GetColArray()->ManualAction( nStartCol, nEndCol, bShow, aArray );
+		return pOutlineTable->GetColArray()->ManualAction( nStartCol, nEndCol, bShow, *this, true );
     }
     else
         return FALSE;
@@ -2610,7 +2691,7 @@ BOOL ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow )
 BOOL ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow )
 {
     if (pOutlineTable && pRowFlags)
-        return pOutlineTable->GetRowArray()->ManualAction( nStartRow, nEndRow, bShow, *pRowFlags );
+		return pOutlineTable->GetRowArray()->ManualAction( nStartRow, nEndRow, bShow, *this, false );
     else
         return FALSE;
 }
@@ -2618,54 +2699,58 @@ BOOL ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow )
 
 void ScTable::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
 {
-    if (pColFlags)
-    {
-        while ( rX1>0 ? (pColFlags[rX1-1] & CR_HIDDEN) : FALSE )
-            --rX1;
-        while ( rX2<MAXCOL ? (pColFlags[rX2+1] & CR_HIDDEN) : FALSE )
-            ++rX2;
-    }
-    if (pRowFlags)
+    // Column-wise expansion
+
+    while (rX1 > 0 && ColHidden(rX1-1))
+        --rX1;
+
+    while (rX2 < MAXCOL && ColHidden(rX2+1))
+        ++rX2;
+
+    // Row-wise expansion
+
+    if (rY1 > 0)
     {
-        if (rY1 > 0)
+        ScFlatBoolRowSegments::RangeData aData;
+        if (mpHiddenRows->getRangeData(rY1-1, aData) && aData.mbValue)
         {
-            SCROW nStartRow = pRowFlags->GetBitStateStart( rY1-1, CR_HIDDEN, CR_HIDDEN);
+            SCROW nStartRow = aData.mnRow1;
             if (ValidRow(nStartRow))
                 rY1 = nStartRow;
         }
-        if (rY2 < MAXROW)
-        {
-            SCROW nEndRow = pRowFlags->GetBitStateEnd( rY2+1, CR_HIDDEN, CR_HIDDEN);
-            if (ValidRow(nEndRow))
-                rY2 = nEndRow;
-        }
+    }
+    if (rY2 < MAXROW)
+    {
+        SCROW nEndRow = -1;
+        if (RowHidden(rY2+1, nEndRow) && ValidRow(nEndRow))
+            rY2 = nEndRow;
     }
 }
 
 
 void ScTable::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
 {
-    if (pColFlags)
-    {
-        while ( rX2>rX1 && (pColFlags[rX2] & CR_HIDDEN) )
-            --rX2;
-        while ( rX2>rX1 && (pColFlags[rX1] & CR_HIDDEN) )
-            ++rX1;
-    }
-    if (pRowFlags)
+    while ( rX2>rX1 && ColHidden(rX2) )
+        --rX2;
+    while ( rX2>rX1 && ColHidden(rX1) )
+        ++rX1;
+
+    if (rY1 < rY2)
     {
-        if (rY1 < rY2)
+        ScFlatBoolRowSegments::RangeData aData;
+        if (mpHiddenRows->getRangeData(rY2, aData) && aData.mbValue)
         {
-            SCROW nStartRow = pRowFlags->GetBitStateStart( rY2, CR_HIDDEN, CR_HIDDEN);
+            SCROW nStartRow = aData.mnRow1;
             if (ValidRow(nStartRow) && nStartRow >= rY1)
                 rY2 = nStartRow;
         }
-        if (rY1 < rY2)
-        {
-            SCROW nEndRow = pRowFlags->GetBitStateEnd( rY1, CR_HIDDEN, CR_HIDDEN);
-            if (ValidRow(nEndRow) && nEndRow <= rY2)
-                rY1 = nEndRow;
-        }
+    }
+
+    if (rY1 < rY2)
+    {
+        SCROW nEndRow = -1;
+        if (RowHidden(rY1, nEndRow) && ValidRow(nEndRow) && nEndRow <= rY2)
+            rY1 = nEndRow;
     }
 }
 
@@ -2827,16 +2912,16 @@ BOOL ScTable::RefVisible(ScFormulaCell* pCell)
 
     if (pCell->HasOneReference(aRef))
     {
-        if (aRef.aStart.Col()==aRef.aEnd.Col() && aRef.aStart.Tab()==aRef.aEnd.Tab() && pRowFlags)
+		if (aRef.aStart.Col()==aRef.aEnd.Col() && aRef.aStart.Tab()==aRef.aEnd.Tab())
         {
-            // while ((value & CR_FILTERED) == CR_FILTERED)
-            // most times will be faster than
-            // while ((value & CR_FILTERED) == 0)
-            SCROW nEndRow = pRowFlags->GetBitStateEnd( aRef.aStart.Row(),
-                    CR_FILTERED, CR_FILTERED);
+            SCROW nEndRow;
+            if (!RowFiltered(aRef.aStart.Row(), NULL, &nEndRow))
+                // row not filtered.
+                nEndRow = ::std::numeric_limits<SCROW>::max();
+
             if (!ValidRow(nEndRow) || nEndRow < aRef.aEnd.Row())
                 return TRUE;    // at least partly visible
-            return FALSE;       // completely unvisible
+            return FALSE;       // completely invisible
         }
     }
 
@@ -2855,7 +2940,7 @@ void ScTable::GetUpperCellString(SCCOL nCol, SCROW nRow, String& rStr)
 
 // Berechnen der Groesse der Tabelle und setzen der Groesse an der DrawPage
 
-void ScTable::SetDrawPageSize()
+void ScTable::SetDrawPageSize(bool bResetStreamValid)
 {
     ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
     if( pDrawLayer )
@@ -2870,10 +2955,15 @@ void ScTable::SetDrawPageSize()
 
         pDrawLayer->SetPageSize( static_cast<sal_uInt16>(nTab), Size( x, y ) );
     }
+
+    // #i102616# actions that modify the draw page size count as sheet modification
+    // (exception: InitDrawLayer)
+    if (bResetStreamValid && IsStreamValid())
+        SetStreamValid(FALSE);
 }
 
 
-ULONG ScTable::GetRowOffset( SCROW nRow ) const
+ULONG ScTable::GetRowOffset( SCROW nRow )
 {
     ULONG n = 0;
     if ( pRowFlags && pRowHeight )
@@ -2883,8 +2973,7 @@ ULONG ScTable::GetRowOffset( SCROW nRow ) const
         else if (nRow == 1)
             return GetRowHeight(0);
 
-        n = pRowFlags->SumCoupledArrayForCondition( 0, nRow-1, CR_HIDDEN, 0,
-                *pRowHeight);
+        n = GetTotalRowHeight(0, nRow-1);
 #ifdef DBG_UTIL
         if (n == ::std::numeric_limits<unsigned long>::max())
             DBG_ERRORFILE("ScTable::GetRowOffset: row heights overflow");
@@ -2897,18 +2986,42 @@ ULONG ScTable::GetRowOffset( SCROW nRow ) const
     return n;
 }
 
+SCROW ScTable::GetRowForHeight(ULONG nHeight)
+{
+    sal_uInt32 nSum = 0;
+
+    ScFlatBoolRowSegments::RangeData aData;
+    for (SCROW nRow = 0; nRow <= MAXROW; ++nRow)
+    {
+        if (!mpHiddenRows->getRangeData(nRow, aData))
+            break;
+
+        if (aData.mbValue)
+        {
+            nRow = aData.mnRow2;
+            continue;
+        }
+
+        sal_uInt32 nNew = pRowHeight->GetValue(nRow);
+        nSum += nNew;
+        if (nSum > nHeight)
+        {
+            return nRow < MAXROW ? nRow + 1 : MAXROW;
+        }
+    }
+    return -1;
+}
+
 
-ULONG ScTable::GetColOffset( SCCOL nCol ) const
+ULONG ScTable::GetColOffset( SCCOL nCol )
 {
     ULONG n = 0;
-    if ( pColFlags && pColWidth )
+	if ( pColWidth )
     {
         SCCOL i;
-        BYTE* pFlags = pColFlags;
-        USHORT* pWidth = pColWidth;
-        for( i = 0; i < nCol; i++, pFlags++, pWidth++ )
-            if( !( *pFlags & CR_HIDDEN ) )
-                n += *pWidth;
+		for( i = 0; i < nCol; i++ )
+            if (!ColHidden(i))
+				n += pColWidth[i];
     }
     else
     {
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 5c3945956..52d7d327e 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -60,6 +60,8 @@
 #include "progress.hxx"
 #include "cellform.hxx"
 #include "postit.hxx"
+#include "queryparam.hxx"
+#include "svtools/zformat.hxx"
 
 #include <vector>
 
@@ -70,132 +72,132 @@ namespace naturalsort {
 using namespace ::com::sun::star::i18n;
 
 /** Splits a given string into three parts: the prefix, number string, and 
-	the suffix.
+    the suffix.
 
-	@param sWhole
-	Original string to be split into pieces
+    @param sWhole
+    Original string to be split into pieces
 
-	@param sPrefix
-	Prefix string that consists of the part before the first number token
+    @param sPrefix
+    Prefix string that consists of the part before the first number token
 
-	@param sSuffix
-	String after the last number token.  This may still contain number strings.
+    @param sSuffix
+    String after the last number token.  This may still contain number strings.
 
-	@param fNum
-	Number converted from the middle number string
+    @param fNum
+    Number converted from the middle number string
 
-	@return Returns TRUE if a numeral element is found in a given string, or 
-	FALSE if no numeral element is found.
+    @return Returns TRUE if a numeral element is found in a given string, or 
+    FALSE if no numeral element is found.
 */
-BOOL SplitString( const rtl::OUString &sWhole, 
-	rtl::OUString &sPrefix, rtl::OUString &sSuffix, double &fNum )
+bool SplitString( const rtl::OUString &sWhole, 
+    rtl::OUString &sPrefix, rtl::OUString &sSuffix, double &fNum )
 {
-	i18n::LocaleDataItem aLocaleItem = ScGlobal::pLocaleData->getLocaleItem();
-
-	// Get prefix element
-	rtl::OUString sEmpty, sUser = rtl::OUString::createFromAscii( "-" );
-	ParseResult aPRPre = ScGlobal::pCharClass->parsePredefinedToken( 
-		KParseType::IDENTNAME, sWhole, 0, 
-		KParseTokens::ANY_LETTER, sUser, KParseTokens::ANY_LETTER, sUser );
-	sPrefix = sWhole.copy( 0, aPRPre.EndPos );
-	
-	// Return FALSE if no numeral element is found
-	if ( aPRPre.EndPos == sWhole.getLength() )
-		return FALSE;
-	
-	// Get numeral element
-	sUser = aLocaleItem.decimalSeparator;
-	ParseResult aPRNum = ScGlobal::pCharClass->parsePredefinedToken(
-		KParseType::ANY_NUMBER, sWhole, aPRPre.EndPos, 
-		KParseTokens::ANY_NUMBER, sEmpty, KParseTokens::ANY_NUMBER, sUser );
-	
-	if ( aPRNum.EndPos == aPRPre.EndPos )
-		return FALSE;
-	
-	fNum = aPRNum.Value;
-	sSuffix = sWhole.copy( aPRNum.EndPos );
-	
-	return TRUE;
+    i18n::LocaleDataItem aLocaleItem = ScGlobal::pLocaleData->getLocaleItem();
+
+    // Get prefix element
+    rtl::OUString sEmpty, sUser = rtl::OUString::createFromAscii( "-" );
+    ParseResult aPRPre = ScGlobal::pCharClass->parsePredefinedToken( 
+        KParseType::IDENTNAME, sWhole, 0, 
+        KParseTokens::ANY_LETTER, sUser, KParseTokens::ANY_LETTER, sUser );
+    sPrefix = sWhole.copy( 0, aPRPre.EndPos );
+    
+    // Return FALSE if no numeral element is found
+    if ( aPRPre.EndPos == sWhole.getLength() )
+        return false;
+    
+    // Get numeral element
+    sUser = aLocaleItem.decimalSeparator;
+    ParseResult aPRNum = ScGlobal::pCharClass->parsePredefinedToken(
+        KParseType::ANY_NUMBER, sWhole, aPRPre.EndPos, 
+        KParseTokens::ANY_NUMBER, sEmpty, KParseTokens::ANY_NUMBER, sUser );
+    
+    if ( aPRNum.EndPos == aPRPre.EndPos )
+        return false;
+    
+    fNum = aPRNum.Value;
+    sSuffix = sWhole.copy( aPRNum.EndPos );
+    
+    return true;
 }
 
 /** Naturally compares two given strings.
 
-	This is the main function that should be called externally.  It returns 
-	either 1, 0, or -1 depending on the comparison result of given two strings.
+    This is the main function that should be called externally.  It returns 
+    either 1, 0, or -1 depending on the comparison result of given two strings.
 
-	@param sInput1
-	Input string 1
+    @param sInput1
+    Input string 1
 
-	@param sInput2
-	Input string 2
+    @param sInput2
+    Input string 2
 
-	@param bCaseSens
-	Boolean value for case sensitivity
+    @param bCaseSens
+    Boolean value for case sensitivity
 
-	@param pData
-	Pointer to user defined sort list
+    @param pData
+    Pointer to user defined sort list
 
-	@param pCW
-	Pointer to collator wrapper for normal string comparison
-	
-	@return Returnes 1 if sInput1 is greater, 0 if sInput1 == sInput2, and -1 if 
-	sInput2 is greater.
+    @param pCW
+    Pointer to collator wrapper for normal string comparison
+    
+    @return Returnes 1 if sInput1 is greater, 0 if sInput1 == sInput2, and -1 if 
+    sInput2 is greater.
 */
 short Compare( const String &sInput1, const String &sInput2, 
-			   const BOOL bCaseSens, const ScUserListData* pData, const CollatorWrapper *pCW )
+               const BOOL bCaseSens, const ScUserListData* pData, const CollatorWrapper *pCW )
 {   
-	rtl::OUString sStr1( sInput1 ), sStr2( sInput2 ), sPre1, sSuf1, sPre2, sSuf2;
-
-	do
-	{
-		double nNum1, nNum2;
-		BOOL bNumFound1 = SplitString( sStr1, sPre1, sSuf1, nNum1 );
-		BOOL bNumFound2 = SplitString( sStr2, sPre2, sSuf2, nNum2 );
-
-		short nPreRes; // Prefix comparison result
-		if ( pData )
-		{
-			if ( bCaseSens )
-			{
-				if ( !bNumFound1 || !bNumFound2 )
-					return static_cast<short>(pData->Compare( sStr1, sStr2 ));
-				else
-					nPreRes = pData->Compare( sPre1, sPre2 );
-			}
-			else
-			{
-				if ( !bNumFound1 || !bNumFound2 )
-					return static_cast<short>(pData->ICompare( sStr1, sStr2 ));
-				else
-					nPreRes = pData->ICompare( sPre1, sPre2 );
-			}
-		} 
-		else
-		{
-			if ( !bNumFound1 || !bNumFound2 )
-				return static_cast<short>(pCW->compareString( sStr1, sStr2 ));
-			else
-				nPreRes = static_cast<short>(pCW->compareString( sPre1, sPre2 ));
-		}
-		
-		// Prefix strings differ.  Return immediately.
-		if ( nPreRes != 0 ) return nPreRes;
-			
-		if ( nNum1 != nNum2 )
-		{
-			if ( nNum1 < nNum2 ) return -1;
-			return static_cast<short>( nNum1 > nNum2 );
-		}
-
-		// The prefix and the first numerical elements are equal, but the suffix
-		// strings may still differ.  Stay in the loop.
-
-		sStr1 = sSuf1;
-		sStr2 = sSuf2;
-
-	} while ( true );
-
-	return 0;
+    rtl::OUString sStr1( sInput1 ), sStr2( sInput2 ), sPre1, sSuf1, sPre2, sSuf2;
+
+    do
+    {
+        double nNum1, nNum2;
+        BOOL bNumFound1 = SplitString( sStr1, sPre1, sSuf1, nNum1 );
+        BOOL bNumFound2 = SplitString( sStr2, sPre2, sSuf2, nNum2 );
+
+        short nPreRes; // Prefix comparison result
+        if ( pData )
+        {
+            if ( bCaseSens )
+            {
+                if ( !bNumFound1 || !bNumFound2 )
+                    return static_cast<short>(pData->Compare( sStr1, sStr2 ));
+                else
+                    nPreRes = pData->Compare( sPre1, sPre2 );
+            }
+            else
+            {
+                if ( !bNumFound1 || !bNumFound2 )
+                    return static_cast<short>(pData->ICompare( sStr1, sStr2 ));
+                else
+                    nPreRes = pData->ICompare( sPre1, sPre2 );
+            }
+        } 
+        else
+        {
+            if ( !bNumFound1 || !bNumFound2 )
+                return static_cast<short>(pCW->compareString( sStr1, sStr2 ));
+            else
+                nPreRes = static_cast<short>(pCW->compareString( sPre1, sPre2 ));
+        }
+        
+        // Prefix strings differ.  Return immediately.
+        if ( nPreRes != 0 ) return nPreRes;
+            
+        if ( nNum1 != nNum2 )
+        {
+            if ( nNum1 < nNum2 ) return -1;
+            return static_cast<short>( nNum1 > nNum2 );
+        }
+
+        // The prefix and the first numerical elements are equal, but the suffix
+        // strings may still differ.  Stay in the loop.
+
+        sStr1 = sSuf1;
+        sStr2 = sSuf2;
+
+    } while (true);
+
+    return 0;
 }
 
 }
@@ -308,8 +310,8 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 )
 
 BOOL ScTable::IsSortCollatorGlobal() const
 {
-    return	pSortCollator == ScGlobal::pCollator ||
-            pSortCollator == ScGlobal::pCaseCollator;
+    return	pSortCollator == ScGlobal::GetCollator() ||
+            pSortCollator == ScGlobal::GetCaseCollator();
 }
 
 
@@ -325,8 +327,8 @@ void ScTable::InitSortCollator( const ScSortParam& rPar )
     else
     {	// SYSTEM
         DestroySortCollator();
-        pSortCollator = (rPar.bCaseSens ? ScGlobal::pCaseCollator :
-            ScGlobal::pCollator);
+        pSortCollator = (rPar.bCaseSens ? ScGlobal::GetCaseCollator() :
+            ScGlobal::GetCollator());
     }
 }
 
@@ -431,15 +433,15 @@ short ScTable::CompareCell( USHORT nSort,
 						
                     if (pData)
                     {
-						if ( bNaturalSort )
-							nRes = naturalsort::Compare( aStr1, aStr2, bCaseSens, pData, pSortCollator );
+                        if ( bNaturalSort )
+                            nRes = naturalsort::Compare( aStr1, aStr2, bCaseSens, pData, pSortCollator );
                         else
-						{
-							if ( bCaseSens )
-								nRes = sal::static_int_cast<short>( pData->Compare(aStr1, aStr2) );
-							else
-								nRes = sal::static_int_cast<short>( pData->ICompare(aStr1, aStr2) );
-						}
+                        {
+                            if ( bCaseSens )
+                                nRes = sal::static_int_cast<short>( pData->Compare(aStr1, aStr2) );
+                            else
+                                nRes = sal::static_int_cast<short>( pData->ICompare(aStr1, aStr2) );
+                        }
                     }
                     else
                         bUserDef = FALSE;
@@ -447,10 +449,10 @@ short ScTable::CompareCell( USHORT nSort,
                 }
                 if (!bUserDef)
 				{
-					if ( bNaturalSort )
-						nRes = naturalsort::Compare( aStr1, aStr2, bCaseSens, NULL, pSortCollator );
-					else
-						nRes = static_cast<short>( pSortCollator->compareString( aStr1, aStr2 ) );
+                    if ( bNaturalSort )
+                        nRes = naturalsort::Compare( aStr1, aStr2, bCaseSens, NULL, pSortCollator );
+                    else
+                        nRes = static_cast<short>( pSortCollator->compareString( aStr1, aStr2 ) );
 				}
             }
             else if ( bStr1 )				// String <-> Zahl
@@ -599,14 +601,17 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
             }
         }
     }
-    if (bGlobalKeepQuery && pRowFlags)
+	if (bGlobalKeepQuery)
     {
-        BYTE nRow1Flags = pRowFlags->GetValue(nRow1);
-        BYTE nRow2Flags = pRowFlags->GetValue(nRow2);
-        BYTE nFlags1 = nRow1Flags & ( CR_HIDDEN | CR_FILTERED );
-        BYTE nFlags2 = nRow2Flags & ( CR_HIDDEN | CR_FILTERED );
-        pRowFlags->SetValue( nRow1, (nRow1Flags & ~( CR_HIDDEN | CR_FILTERED )) | nFlags2);
-        pRowFlags->SetValue( nRow2, (nRow2Flags & ~( CR_HIDDEN | CR_FILTERED )) | nFlags1);
+        bool bRow1Hidden = RowHidden(nRow1);
+        bool bRow2Hidden = RowHidden(nRow2);
+        SetRowHidden(nRow1, nRow1, bRow2Hidden);
+        SetRowHidden(nRow2, nRow2, bRow1Hidden);
+
+        bool bRow1Filtered = RowFiltered(nRow1);
+        bool bRow2Filtered = RowFiltered(nRow2);
+        SetRowFiltered(nRow1, nRow1, bRow2Filtered);
+        SetRowFiltered(nRow2, nRow2, bRow1Filtered);
     }
 }
 
@@ -766,7 +771,7 @@ void ScTable::RemoveSubTotals( ScSubTotalParam& rParam )
             if ( pCell->GetCellType() == CELLTYPE_FORMULA )
                 if (((ScFormulaCell*)pCell)->IsSubTotal())
                 {
-                    SetRowFlags(nRow+1,GetRowFlags(nRow+1)&(~CR_MANUALBREAK));
+                    RemoveRowBreak(nRow+1, false, true);
                     pDocument->DeleteRow( 0,nTab, MAXCOL,nTab, nRow, 1 );
                     --nEndRow;
                     aIter = ScColumnIterator( &aCol[nCol],nRow,nEndRow );
@@ -934,9 +939,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
                     bBlockVis = FALSE;
                     if ( rParam.bPagebreak && nRow < MAXROW &&
                             aRowEntry.nSubStartRow != nStartRow && nLevel == 0)
-                        SetRowFlags( aRowEntry.nSubStartRow,
-                                GetRowFlags(aRowEntry.nSubStartRow) |
-                                CR_MANUALBREAK);
+                        SetRowBreak(aRowEntry.nSubStartRow, false, true);
 
                     if (bSpaceLeft)
                     {
@@ -989,13 +992,6 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
                         SetString( nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, nTab, aOutString );
                         ApplyStyle( nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, *pStyle );
 
-/*						if (rParam.bPagebreak && nRow < MAXROW)
-                        {
-                            BYTE nFlags = GetRowFlags( nRow+1 );
-                            nFlags |= CR_MANUALBREAK;
-                            SetRowFlags( nRow+1, nFlags );
-                        }
-*/
                         ++nRow;
                         ++nEndRow;
                         aRowEntry.nSubStartRow = nRow;
@@ -1009,11 +1005,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
                         }
                     }
                 }
-                if (!pRowFlags)
-                    bBlockVis = TRUE;
-                else
-                    if ( (pRowFlags->GetValue(nRow) & CR_FILTERED) == 0 )
-                        bBlockVis = TRUE;
+                bBlockVis = !RowFiltered(nRow);
             }
         }
         else
@@ -1097,10 +1089,10 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
     long	nPos = -1;
     SCSIZE	i	 = 0;
     BOOL	bMatchWholeCell = pDocument->GetDocOptions().IsMatchWholeCell();
-    CollatorWrapper* pCollator = (rParam.bCaseSens ? ScGlobal::pCaseCollator :
-        ScGlobal::pCollator);
+    CollatorWrapper* pCollator = (rParam.bCaseSens ? ScGlobal::GetCaseCollator() :
+        ScGlobal::GetCollator());
     ::utl::TransliterationWrapper* pTransliteration = (rParam.bCaseSens ?
-        ScGlobal::pCaseTransliteration : ScGlobal::pTransliteration);
+        ScGlobal::GetCaseTransliteration() : ScGlobal::GetpTransliteration());
 
     while ( (i < nEntryCount) && rParam.GetEntry(i).bDoQuery )
     {
@@ -1140,6 +1132,20 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
             }
             else
                 nCellVal = GetValue( static_cast<SCCOL>(rEntry.nField), nRow );
+
+            if (rEntry.bQueryByDate)
+            {
+                sal_uInt32 nNumFmt = GetNumberFormat(static_cast<SCCOL>(rEntry.nField), nRow);
+                const SvNumberformat* pEntry = pDocument->GetFormatTable()->GetEntry(nNumFmt);
+                if (pEntry)
+                {
+                    short nNumFmtType = pEntry->GetType();
+                    if ((nNumFmtType & NUMBERFORMAT_DATE) && !(nNumFmtType & NUMBERFORMAT_TIME))
+                        // The format is of date type.  Strip off the time element.
+                        nCellVal = ::rtl::math::approxFloor(nCellVal);
+                }
+            }
+
             switch (rEntry.eOp)
             {
                 case SC_EQUAL :
@@ -1607,7 +1613,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
                             aParam.nDestCol, aParam.nDestRow, aParam.nDestTab );
     }
 
-	for (SCROW j=aParam.nRow1 + nHeader; j<=nEndRow; j++)
+    for (SCROW j=aParam.nRow1 + nHeader; j<=nEndRow; j++)
     {
         BOOL bResult;									// Filterergebnis
         BOOL bValid = ValidQuery(j, aParam, pSpecial);
@@ -1928,12 +1934,13 @@ BOOL ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL /* nEndCol *
     return TRUE;
 }
 
-void ScTable::GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings)
+void ScTable::GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings, bool& rHasDates)
 {
-    aCol[nCol].GetFilterEntries( nRow1, nRow2, rStrings );
+    aCol[nCol].GetFilterEntries( nRow1, nRow2, rStrings, rHasDates );
 }
 
-void ScTable::GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings )
+void ScTable::GetFilteredFilterEntries(
+    SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings, bool& rHasDates )
 {
     // remove the entry for this column from the query parameter
     ScQueryParam aParam( rParam );
@@ -1951,15 +1958,18 @@ void ScTable::GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, co
 
     BOOL* pSpecial = new BOOL[nEntryCount];
     lcl_PrepareQuery( pDocument, this, aParam, pSpecial );
-
+    bool bHasDates = false;
     for ( SCROW j = nRow1; j <= nRow2; ++j )
     {
         if ( ValidQuery( j, aParam, pSpecial ) )
         {
-            aCol[nCol].GetFilterEntries( j, j, rStrings );
+            bool bThisHasDates = false;
+            aCol[nCol].GetFilterEntries( j, j, rStrings, bThisHasDates );
+            bHasDates |= bThisHasDates;
         }
     }
 
+    rHasDates = bHasDates;
     delete[] pSpecial;
 }
 
@@ -2031,8 +2041,8 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData,
     SCCOL nCol;
     if ( rMark.IsMultiMarked() )
         for (nCol=0; nCol<=MAXCOL && !rData.bError; nCol++)
-            if ( !pColFlags || !( pColFlags[nCol] & CR_HIDDEN ) )
-                aCol[nCol].UpdateSelectionFunction( rMark, rData, pRowFlags,
+			if ( !pColFlags || !ColHidden(nCol) )
+				aCol[nCol].UpdateSelectionFunction( rMark, rData, *mpHiddenRows,
                                                     bSingle && ( nCol >= nStartCol && nCol <= nEndCol ),
                                                     nStartRow, nEndRow );
 
@@ -2040,8 +2050,8 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData,
 
     if ( bSingle && !rMark.IsMarkNegative() )
         for (nCol=nStartCol; nCol<=nEndCol && !rData.bError; nCol++)
-            if ( !pColFlags || !( pColFlags[nCol] & CR_HIDDEN ) )
-                aCol[nCol].UpdateAreaFunction( rData, pRowFlags, nStartRow, nEndRow );
+			if ( !pColFlags || !ColHidden(nCol) )
+				aCol[nCol].UpdateAreaFunction( rData, *mpHiddenRows, nStartRow, nEndRow );
 }
 
 void ScTable::FindConditionalFormat( ULONG nKey, ScRangeList& rList )
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index c1bbb4405..f88713b9e 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -53,8 +53,15 @@
 #include "brdcst.hxx"
 #include "tabprotection.hxx"
 #include "globstr.hrc"
+#include "segmenttree.hxx"
+#include <com/sun/star/sheet/TablePageBreakData.hpp>
+
+#include <algorithm>
+#include <limits>
 
 using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::sheet::TablePageBreakData;
+using ::std::set;
 
 // STATIC DATA -----------------------------------------------------------
 
@@ -68,6 +75,9 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
     if ( !pUserArea && !bPageSizeValid )
         return;
 
+    if (mbPageBreaksValid)
+        return;
+
     SfxStyleSheetBase* pStyle = pDocument->GetStyleSheetPool()->
                                     Find( aPageStyle, SFX_STYLE_FAMILY_PAGE );
     if ( !pStyle )
@@ -79,7 +89,6 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
     const SfxPoolItem* pItem;
 
     SCCOL nX;
-    SCROW nY;
     SCCOL nStartCol = 0;
     SCROW nStartRow = 0;
     SCCOL nEndCol = MAXCOL;
@@ -99,8 +108,9 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
             //	bei mehreren Bereichen nichts anzeigen:
 
             for (nX=0; nX<MAXCOL; nX++)
-                pColFlags[nX] &= ~CR_PAGEBREAK;
-            pRowFlags->AndValue( 0, MAXROW-1, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
+                RemoveColBreak(nX, true, false);
+
+            RemoveRowPageBreaks(0, MAXROW-1);
 
             return;
         }
@@ -144,13 +154,13 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
         //	Anfang: Breaks loeschen
 
     for (nX=0; nX<nStartCol; nX++)
-        pColFlags[nX] &= ~CR_PAGEBREAK;
-    pRowFlags->AndValue( 0, nStartRow-1, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
+        RemoveColBreak(nX, true, false);
+    RemoveRowPageBreaks(0, nStartRow-1);
 
     if (nStartCol > 0)
-        pColFlags[nStartCol] |= CR_PAGEBREAK;			//! AREABREAK
+        SetColBreak(nStartCol, true, false);  // AREABREAK
     if (nStartRow > 0)
-        pRowFlags->OrValue( nStartRow, CR_PAGEBREAK);			//! AREABREAK
+        SetRowBreak(nStartRow, true, false);  // AREABREAK
 
         //	Mittelteil: Breaks verteilen
 
@@ -160,15 +170,16 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
     for (nX=nStartCol; nX<=nEndCol; nX++)
     {
         BOOL bStartOfPage = FALSE;
-        long nThisX = ( pColFlags[nX] & CR_HIDDEN ) ? 0 : pColWidth[nX];
-        if ( (nSizeX+nThisX > nPageSizeX) || ((pColFlags[nX] & CR_MANUALBREAK) && !bSkipBreaks) )
+		long nThisX = ColHidden(nX) ? 0 : pColWidth[nX];
+        bool bManualBreak = HasColManualBreak(nX);
+        if ( (nSizeX+nThisX > nPageSizeX) || (bManualBreak && !bSkipBreaks) )
         {
-            pColFlags[nX] |= CR_PAGEBREAK;
+            SetColBreak(nX, true, false);
             nSizeX = 0;
             bStartOfPage = TRUE;
         }
         else if (nX != nStartCol)
-            pColFlags[nX] &= ~CR_PAGEBREAK;
+            RemoveColBreak(nX, true, false);
         else
             bStartOfPage = TRUE;
 
@@ -176,9 +187,9 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
         {
             // subtract size of repeat columns from page size
             for (SCCOL i=nRepeatStartX; i<=nRepeatEndX; i++)
-                nPageSizeX -= ( pColFlags[i] & CR_HIDDEN ) ? 0 : pColWidth[i];
+				nPageSizeX -= ColHidden(i) ? 0 : pColWidth[i];
             while (nX<=nRepeatEndX)
-                pColFlags[++nX] &= ~CR_PAGEBREAK;
+                RemoveColBreak(++nX, true, false);
             bColFound = TRUE;
         }
 
@@ -186,23 +197,20 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
     }
 
     // Remove all page breaks in range.
-    pRowFlags->AndValue( nStartRow+1, nEndRow, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
+    RemoveRowPageBreaks(nStartRow+1, nEndRow);
+
     // And set new page breaks.
     BOOL bRepeatRow = ( nRepeatStartY != SCROW_REPEAT_NONE );
     BOOL bRowFound = FALSE;
     long nSizeY = 0;
-    ScCompressedArrayIterator< SCROW, BYTE> aFlagsIter( *pRowFlags, nStartRow, nEndRow);
-    ScCompressedArrayIterator< SCROW, USHORT> aHeightIter( *pRowHeight, nStartRow, nEndRow);
-    for ( ; aFlagsIter; ++aFlagsIter, ++aHeightIter)
+    for (SCROW nY = nStartRow; nY <= nEndRow; ++nY)
     {
-        nY = aFlagsIter.GetPos();
         BOOL bStartOfPage = FALSE;
-        BYTE nFlags = *aFlagsIter;
-        long nThisY = (nFlags & CR_HIDDEN) ? 0 : *aHeightIter;
-        if ( (nSizeY+nThisY > nPageSizeY) || ((nFlags & CR_MANUALBREAK) && !bSkipBreaks) )
+        long nThisY = RowHidden(nY) ? 0 : pRowHeight->GetValue(nY);
+        bool bManualBreak = HasRowManualBreak(nY);
+		if ( (nSizeY+nThisY > nPageSizeY) || (bManualBreak && !bSkipBreaks) )
         {
-            pRowFlags->SetValue( nY, nFlags | CR_PAGEBREAK);
-            aFlagsIter.Resync( nY);
+            SetRowBreak(nY, true, false);
             nSizeY = 0;
             bStartOfPage = TRUE;
         }
@@ -214,20 +222,14 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
         if ( bStartOfPage && bRepeatRow && nY>nRepeatStartY && !bRowFound )
         {
             // subtract size of repeat rows from page size
-            unsigned long nHeights = pRowFlags->SumCoupledArrayForCondition(
-                    nRepeatStartY, nRepeatEndY, CR_HIDDEN, 0, *pRowHeight);
+            unsigned long nHeights = GetTotalRowHeight(nRepeatStartY, nRepeatEndY);
 #ifdef DBG_UTIL
             if (nHeights == ::std::numeric_limits<unsigned long>::max())
                 DBG_ERRORFILE("ScTable::UpdatePageBreaks: row heights overflow");
 #endif
             nPageSizeY -= nHeights;
             if (nY <= nRepeatEndY)
-            {
-                pRowFlags->AndValue( nY, nRepeatEndY, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
-                nY = nRepeatEndY + 1;
-                aFlagsIter.Resync( nY);
-                aHeightIter.Resync( nY);
-            }
+                RemoveRowPageBreaks(nY, nRepeatEndY);
             bRowFound = TRUE;
         }
 
@@ -238,46 +240,722 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
 
     if (nEndCol < MAXCOL)
     {
-        pColFlags[nEndCol+1] |= CR_PAGEBREAK;			//! AREABREAK
+        SetColBreak(nEndCol+1, true, false);  // AREABREAK
         for (nX=nEndCol+2; nX<=MAXCOL; nX++)
-            pColFlags[nX] &= ~CR_PAGEBREAK;
+            RemoveColBreak(nX, true, false);
     }
     if (nEndRow < MAXROW)
     {
-        pRowFlags->OrValue( nEndRow+1, CR_PAGEBREAK);			//! AREABREAK
+        SetRowBreak(nEndRow+1, true, false);  // AREABREAK
         if (nEndRow+2 <= MAXROW)
-            pRowFlags->AndValue( nEndRow+2, MAXROW, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) );
+            RemoveRowPageBreaks(nEndRow+2, MAXROW);
     }
+    mbPageBreaksValid = true;
 }
 
 void ScTable::RemoveManualBreaks()
 {
-    if (pColFlags)
-        for (SCCOL nCol = 0; nCol <= MAXCOL; nCol++)
-            pColFlags[nCol] &= ~CR_MANUALBREAK;
-
-    if (pRowFlags)
-        pRowFlags->AndValue( 0, MAXROW, sal::static_int_cast<BYTE>(~CR_MANUALBREAK) );
+    maRowManualBreaks.clear();
+    maColManualBreaks.clear();
+    InvalidatePageBreaks();
 }
 
 BOOL ScTable::HasManualBreaks() const
 {
-    if (pColFlags)
-        for (SCCOL nCol = 0; nCol <= MAXCOL; nCol++)
-            if ( pColFlags[nCol] & CR_MANUALBREAK )
-                return TRUE;
+    return !maRowManualBreaks.empty() || !maColManualBreaks.empty();
+}
+
+void ScTable::GetAllRowBreaks(set<SCROW>& rBreaks, bool bPage, bool bManual) const
+{
+    if (bPage)
+        rBreaks = maRowPageBreaks;
+
+    if (bManual)
+    {
+        using namespace std;    
+        copy(maRowManualBreaks.begin(), maRowManualBreaks.end(), inserter(rBreaks, rBreaks.begin()));
+    }
+}
+
+void ScTable::GetAllColBreaks(set<SCCOL>& rBreaks, bool bPage, bool bManual) const
+{
+    if (bPage)
+        rBreaks = maColPageBreaks;
+
+    if (bManual)
+    {
+        using namespace std;
+        copy(maColManualBreaks.begin(), maColManualBreaks.end(), inserter(rBreaks, rBreaks.begin()));
+    }
+}
+
+bool ScTable::HasRowPageBreak(SCROW nRow) const
+{
+    if (!ValidRow(nRow))
+        return false;
+
+    return maRowPageBreaks.count(nRow) > 0;
+}
+
+bool ScTable::HasColPageBreak(SCCOL nCol) const
+{
+    if (!ValidCol(nCol))
+        return false;
+
+    return maColPageBreaks.count(nCol) > 0;
+}
+
+bool ScTable::HasRowManualBreak(SCROW nRow) const
+{
+    if (!ValidRow(nRow))
+        return false;
+
+    return maRowManualBreaks.count(nRow) > 0;
+}
+
+bool ScTable::HasColManualBreak(SCCOL nCol) const
+{
+    if (!ValidCol(nCol))
+        return false;
+
+    return (maColManualBreaks.count(nCol) > 0);
+}
+
+void ScTable::RemoveRowPageBreaks(SCROW nStartRow, SCROW nEndRow)
+{
+    using namespace std;
+
+    if (!ValidRow(nStartRow) || !ValidRow(nEndRow))
+        return;
+
+    set<SCROW>::iterator low  = maRowPageBreaks.lower_bound(nStartRow);
+    set<SCROW>::iterator high = maRowPageBreaks.upper_bound(nEndRow);
+    maRowPageBreaks.erase(low, high);
+}
+
+void ScTable::RemoveRowBreak(SCROW nRow, bool bPage, bool bManual)
+{
+    if (!ValidRow(nRow))
+        return;
+
+    if (bPage)
+        maRowPageBreaks.erase(nRow);
+
+    if (bManual)
+    {    
+        maRowManualBreaks.erase(nRow);
+        InvalidatePageBreaks();
+    }
+}
+
+void ScTable::RemoveColBreak(SCCOL nCol, bool bPage, bool bManual)
+{
+    if (!ValidCol(nCol))
+        return;
+
+    if (bPage)
+        maColPageBreaks.erase(nCol);
+
+    if (bManual)
+    {    
+        maColManualBreaks.erase(nCol);
+        InvalidatePageBreaks();
+    }
+}
+
+void ScTable::SetRowBreak(SCROW nRow, bool bPage, bool bManual)
+{
+    if (!ValidRow(nRow))
+        return;
+
+    if (bPage)
+        maRowPageBreaks.insert(nRow);
+
+    if (bManual)
+    {    
+        maRowManualBreaks.insert(nRow);
+        InvalidatePageBreaks();
+    }
+}
+
+void ScTable::SetColBreak(SCCOL nCol, bool bPage, bool bManual)
+{
+    if (!ValidCol(nCol))
+        return;
+
+    if (bPage)
+        maColPageBreaks.insert(nCol);
+
+    if (bManual)
+    {    
+        maColManualBreaks.insert(nCol);
+        InvalidatePageBreaks();
+    }
+}
+
+Sequence<TablePageBreakData> ScTable::GetRowBreakData() const
+{
+    using ::std::copy;
+    using ::std::inserter;
+
+    set<SCROW> aRowBreaks = maRowPageBreaks;
+    copy(maRowManualBreaks.begin(), maRowManualBreaks.end(), inserter(aRowBreaks, aRowBreaks.begin()));
+
+    set<SCROW>::const_iterator itr = aRowBreaks.begin(), itrEnd = aRowBreaks.end();
+    Sequence<TablePageBreakData> aSeq(aRowBreaks.size());
+
+    for (sal_Int32 i = 0; itr != itrEnd; ++itr, ++i)
+    {
+        SCROW nRow = *itr;
+        TablePageBreakData aData;
+        aData.Position = nRow;
+        aData.ManualBreak = HasRowManualBreak(nRow);
+        aSeq[i] = aData;
+    }
+
+    return aSeq;
+}
+
+bool ScTable::RowHidden(SCROW nRow, SCROW* pFirstRow, SCROW* pLastRow)
+{
+    if (!ValidRow(nRow))
+        return true;
+
+    ScFlatBoolRowSegments::RangeData aData;
+    if (!mpHiddenRows->getRangeData(nRow, aData))
+        // search failed.
+        return true;
+
+    if (pFirstRow)
+        *pFirstRow = aData.mnRow1;
+    if (pLastRow)
+        *pLastRow = aData.mnRow2;
+
+    return aData.mbValue;
+}
+
+
+bool ScTable::RowHidden(SCROW nRow, SCROW& rLastRow)
+{
+    rLastRow = nRow;    
+    if (!ValidRow(nRow))
+        return true;
+
+    ScFlatBoolRowSegments::RangeData aData;
+    if (!mpHiddenRows->getRangeData(nRow, aData))
+        // search failed.
+        return true;
+
+    rLastRow = aData.mnRow2;
+    return aData.mbValue;
+}
+
+bool ScTable::HasHiddenRows(SCROW nStartRow, SCROW nEndRow)
+{
+    SCROW nRow = nStartRow;
+    while (nRow <= nEndRow)
+    {
+        SCROW nLastRow = -1;
+        bool bHidden = RowHidden(nRow, nLastRow);
+        if (bHidden)
+            return true;
+
+        nRow = nLastRow + 1;
+    }
+    return false;
+}
+
+bool ScTable::ColHidden(SCCOL nCol, SCCOL& rLastCol)
+{
+    rLastCol = nCol;    
+    if (!ValidCol(nCol))
+        return true;
+
+    ScFlatBoolColSegments::RangeData aData;
+    if (!mpHiddenCols->getRangeData(nCol, aData))
+        return true;
+
+    rLastCol = aData.mnCol2;
+    return aData.mbValue;
+}
+
+bool ScTable::ColHidden(SCCOL nCol, SCCOL* pFirstCol, SCCOL* pLastCol)
+{
+    if (!ValidCol(nCol))
+        return true;
+
+    ScFlatBoolColSegments::RangeData aData;
+    if (!mpHiddenCols->getRangeData(nCol, aData))
+        return true;
+
+    if (pFirstCol)
+        *pFirstCol = aData.mnCol1;
+    if (pLastCol)
+        *pLastCol = aData.mnCol2;
+
+    return aData.mbValue;
+}
+
+void ScTable::SetRowHidden(SCROW nStartRow, SCROW nEndRow, bool bHidden)
+{
+    if (bHidden)
+        mpHiddenRows->setTrue(nStartRow, nEndRow);
+    else
+        mpHiddenRows->setFalse(nStartRow, nEndRow);
+
+#if 0
+    // Remove this once the refactoring is complete.
+    if (bHidden)
+        pRowFlags->OrValue(nStartRow, nEndRow, CR_HIDDEN);
+    else
+        pRowFlags->AndValue(nStartRow, nEndRow, ~CR_HIDDEN);
+#endif
+}
+
+void ScTable::SetColHidden(SCCOL nStartCol, SCCOL nEndCol, bool bHidden)
+{
+    if (bHidden)
+        mpHiddenCols->setTrue(nStartCol, nEndCol);
+    else
+        mpHiddenCols->setFalse(nStartCol, nEndCol);
+#if 0
+    for (SCCOL nCol = nStartCol; nCol <= nEndCol; ++nCol)
+    {
+        if (bHidden)
+            pColFlags[nCol] |= CR_HIDDEN;
+        else
+            pColFlags[nCol] &= ~CR_HIDDEN;
+    }
+#endif
+}
+
+void ScTable::CopyColHidden(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol)
+{
+    SCCOL nCol = nStartCol;
+    while (nCol <= nEndCol)
+    {
+        SCCOL nLastCol;
+        bool bHidden = rTable.ColHidden(nCol, NULL, &nLastCol);
+        if (nLastCol > nEndCol)
+            nLastCol = nEndCol;
+
+        SetColHidden(nCol, nLastCol, bHidden);
+        nCol = nLastCol + 1;
+    }
+}
+
+void ScTable::CopyRowHidden(ScTable& rTable, SCROW nStartRow, SCROW nEndRow)
+{
+    SCROW nRow = nStartRow;
+    while (nRow <= nEndRow)
+    {
+        SCROW nLastRow = -1;
+        bool bHidden = rTable.RowHidden(nRow, nLastRow);
+        if (nLastRow > nEndRow)
+            nLastRow = nEndRow;
+        SetRowHidden(nRow, nLastRow, bHidden);
+        nRow = nLastRow + 1;
+    }
+}
+
+SCROW ScTable::FirstVisibleRow(SCROW nStartRow, SCROW nEndRow)
+{
+    SCROW nRow = nStartRow;
+    ScFlatBoolRowSegments::RangeData aData;
+    while (nRow <= nEndRow)
+    {
+        if (!ValidRow(nRow))
+            break;
+
+        if (!mpHiddenRows->getRangeData(nRow, aData))
+            // failed to get range data.
+            break;
+
+        if (!aData.mbValue)
+            // visible row found
+            return nRow;
+
+        nRow = aData.mnRow2 + 1;
+    }
+
+    return ::std::numeric_limits<SCROW>::max();
+}
+
+SCROW ScTable::LastVisibleRow(SCROW nStartRow, SCROW nEndRow)
+{
+    SCROW nRow = nEndRow;
+    ScFlatBoolRowSegments::RangeData aData;
+    while (nRow >= nStartRow)
+    {
+        if (!ValidRow(nRow))
+            break;
+
+        if (!mpHiddenRows->getRangeData(nRow, aData))
+            // failed to get range data.
+            break;
 
-    if (pRowFlags)
-        if (ValidRow( pRowFlags->GetLastAnyBitAccess( 0, CR_MANUALBREAK)))
-            return TRUE;
+        if (!aData.mbValue)
+            // visible row found
+            return nRow;
+
+        nRow = aData.mnRow1 - 1;
+    }
 
-    return FALSE;
+    return ::std::numeric_limits<SCROW>::max();
+}
+
+SCROW ScTable::CountVisibleRows(SCROW nStartRow, SCROW nEndRow)
+{
+    SCROW nCount = 0;
+    SCROW nRow = nStartRow;
+    ScFlatBoolRowSegments::RangeData aData;
+    while (nRow <= nEndRow)
+    {
+        if (!mpHiddenRows->getRangeData(nRow, aData))
+            break;
+
+        if (aData.mnRow2 > nEndRow)
+            aData.mnRow2 = nEndRow;
+
+        if (!aData.mbValue)
+            nCount += aData.mnRow2 - nRow + 1;
+
+        nRow = aData.mnRow2 + 1;
+    }
+    return nCount;
+}
+
+sal_uInt32 ScTable::GetTotalRowHeight(SCROW nStartRow, SCROW nEndRow)
+{
+    sal_uInt32 nHeight = 0;
+    SCROW nRow = nStartRow;
+    ScFlatBoolRowSegments::RangeData aData;
+    while (nRow <= nEndRow)
+    {
+        if (!mpHiddenRows->getRangeData(nRow, aData))
+            break;
+
+        if (aData.mnRow2 > nEndRow)
+            aData.mnRow2 = nEndRow;
+
+        if (!aData.mbValue)
+            // visible row range.
+            nHeight += pRowHeight->SumValues(nRow, aData.mnRow2);
+
+        nRow = aData.mnRow2 + 1;
+    }
+
+    return nHeight;
+}
+
+SCCOLROW ScTable::LastHiddenColRow(SCCOLROW nPos, bool bCol)
+{
+    if (bCol)
+    {
+        SCCOL nCol = static_cast<SCCOL>(nPos);
+        if (ColHidden(nCol))
+        {
+            for (SCCOL i = nCol+1; i <= MAXCOL; ++i)
+            {
+                if (!ColHidden(nCol))
+                    return nCol - 1;
+            }
+        }
+    }
+    else
+    {
+        SCROW nRow = static_cast<SCROW>(nPos);
+        SCROW nLastRow;
+        if (RowHidden(nRow, NULL, &nLastRow))
+            return static_cast<SCCOLROW>(nLastRow);
+    }
+    return ::std::numeric_limits<SCCOLROW>::max();
+}
+
+bool ScTable::RowFiltered(SCROW nRow, SCROW* pFirstRow, SCROW* pLastRow)
+{
+#if 1
+    if (!ValidRow(nRow))
+        return false;
+
+    ScFlatBoolRowSegments::RangeData aData;
+    if (!mpFilteredRows->getRangeData(nRow, aData))
+        // search failed.
+        return false;
+
+    if (pFirstRow)
+        *pFirstRow = aData.mnRow1;
+    if (pLastRow)
+        *pLastRow = aData.mnRow2;
+
+    return aData.mbValue;
+#else
+    if (pFirstRow)
+        *pFirstRow = nRow;
+    if (pLastRow)
+        *pLastRow = nRow;
+    return (pRowFlags->GetValue(nRow) & CR_FILTERED) == CR_FILTERED;
+#endif
+}
+
+bool ScTable::ColFiltered(SCCOL nCol, SCCOL* pFirstCol, SCCOL* pLastCol)
+{
+#if 1
+    if (!ValidCol(nCol))
+        return false;
+
+    ScFlatBoolColSegments::RangeData aData;
+    if (!mpFilteredCols->getRangeData(nCol, aData))
+        // search failed.
+        return false;
+
+    if (pFirstCol)
+        *pFirstCol = aData.mnCol1;
+    if (pLastCol)
+        *pLastCol = aData.mnCol2;
+
+    return aData.mbValue;
+#else
+    if (pFirstCol)
+        *pFirstCol = nCol;
+    if (pLastCol)
+        *pLastCol = nCol;
+    return (pColFlags[nCol] & CR_FILTERED) == CR_FILTERED;
+#endif
+}
+
+bool ScTable::HasFilteredRows(SCROW nStartRow, SCROW nEndRow)
+{
+    SCROW nRow = nStartRow;
+    while (nRow <= nEndRow)
+    {
+        SCROW nLastRow = nRow;
+        bool bFiltered = RowFiltered(nRow, NULL, &nLastRow);
+        if (bFiltered)
+            return true;
+
+        nRow = nLastRow + 1;
+    }
+    return false;
+}
+
+void ScTable::CopyColFiltered(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol)
+{
+    SCCOL nCol = nStartCol;
+    while (nCol <= nEndCol)
+    {
+        SCCOL nLastCol;
+        bool bFiltered = rTable.ColFiltered(nCol, NULL, &nLastCol);
+        if (nLastCol > nEndCol)
+            nLastCol = nEndCol;
+
+        SetColFiltered(nCol, nLastCol, bFiltered);
+        nCol = nLastCol + 1;
+    }
+}
+
+void ScTable::CopyRowFiltered(ScTable& rTable, SCROW nStartRow, SCROW nEndRow)
+{
+    SCROW nRow = nStartRow;
+    while (nRow <= nEndRow)
+    {
+        SCROW nLastRow = -1;
+        bool bFiltered = rTable.RowFiltered(nRow, NULL, &nLastRow);
+        if (nLastRow > nEndRow)
+            nLastRow = nEndRow;
+        SetRowFiltered(nRow, nLastRow, bFiltered);
+        nRow = nLastRow + 1;
+    }
+}
+
+void ScTable::SetRowFiltered(SCROW nStartRow, SCROW nEndRow, bool bFiltered)
+{
+    if (bFiltered)
+        mpFilteredRows->setTrue(nStartRow, nEndRow);
+    else
+        mpFilteredRows->setFalse(nStartRow, nEndRow);
+
+#if 0
+    // Remove this once the refactoring is complete.
+    if (bFiltered)
+        pRowFlags->OrValue(nStartRow, nEndRow, CR_FILTERED);
+    else
+        pRowFlags->AndValue(nStartRow, nEndRow, ~CR_FILTERED);
+#endif
+}
+
+void ScTable::SetColFiltered(SCCOL nStartCol, SCCOL nEndCol, bool bFiltered)
+{
+    if (bFiltered)
+        mpFilteredCols->setTrue(nStartCol, nEndCol);
+    else
+        mpFilteredCols->setFalse(nStartCol, nEndCol);
+
+#if 0
+    // Remove this once the refactoring is complete.
+    for (SCCOL nCol = nStartCol; nCol <= nEndCol; ++nCol)
+    {
+        if (bFiltered)
+            pColFlags[nCol] |= CR_FILTERED;
+        else
+            pColFlags[nCol] &= ~CR_FILTERED;
+    }
+#endif
+}
+
+SCROW ScTable::FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow)
+{
+    SCROW nRow = nStartRow;
+    ScFlatBoolRowSegments::RangeData aData;
+    while (nRow <= nEndRow)
+    {
+        if (!ValidRow(nRow))
+            break;
+
+        if (!mpFilteredRows->getRangeData(nRow, aData))
+            // failed to get range data.
+            break;
+
+        if (!aData.mbValue)
+            // non-filtered row found
+            return nRow;
+
+        nRow = aData.mnRow2 + 1;
+    }
+
+    return ::std::numeric_limits<SCROW>::max();
+}
+
+SCROW ScTable::LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow)
+{
+    SCROW nRow = nEndRow;
+    ScFlatBoolRowSegments::RangeData aData;
+    while (nRow >= nStartRow)
+    {
+        if (!ValidRow(nRow))
+            break;
+
+        if (!mpFilteredRows->getRangeData(nRow, aData))
+            // failed to get range data.
+            break;
+
+        if (!aData.mbValue)
+            // non-filtered row found
+            return nRow;
+
+        nRow = aData.mnRow1 - 1;
+    }
+
+    return ::std::numeric_limits<SCROW>::max();
+}
+
+SCROW ScTable::CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow)
+{
+    SCROW nCount = 0;
+    SCROW nRow = nStartRow;
+    ScFlatBoolRowSegments::RangeData aData;
+    while (nRow <= nEndRow)
+    {
+        if (!mpFilteredRows->getRangeData(nRow, aData))
+            break;
+
+        if (aData.mnRow2 > nEndRow)
+            aData.mnRow2 = nEndRow;
+
+        if (!aData.mbValue)
+            nCount += aData.mnRow2 - nRow + 1;
+
+        nRow = aData.mnRow2 + 1;
+    }
+    return nCount;
+}
+
+namespace {
+
+void lcl_syncFlags(ScFlatBoolColSegments& rColSegments, ScFlatBoolRowSegments& rRowSegments,
+    BYTE* pColFlags, ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags, const BYTE nFlagMask)
+{
+    using ::sal::static_int_cast;
+
+    pRowFlags->AndValue(0, MAXROW, static_int_cast<BYTE>(~nFlagMask));
+    for (SCCOL i = 0; i <= MAXCOL; ++i)
+        pColFlags[i] &= static_int_cast<BYTE>(~nFlagMask);
+
+    {
+        // row hidden flags.
+
+        SCROW nRow = 0;
+        ScFlatBoolRowSegments::RangeData aData;
+        while (nRow <= MAXROW)
+        {
+            if (!rRowSegments.getRangeData(nRow, aData))
+                break;
+
+            if (aData.mbValue)
+                pRowFlags->OrValue(nRow, aData.mnRow2, static_int_cast<BYTE>(nFlagMask));
+
+            nRow = aData.mnRow2 + 1;
+        }
+    }
+
+    {
+        // column hidden flags.
+
+        SCCOL nCol = 0;
+        ScFlatBoolColSegments::RangeData aData;
+        while (nCol <= MAXCOL)
+        {
+            if (!rColSegments.getRangeData(nCol, aData))
+                break;
+
+            if (aData.mbValue)
+            {
+                for (SCCOL i = nCol; i <= aData.mnCol2; ++i)
+                    pColFlags[i] |= nFlagMask;
+            }
+
+            nCol = aData.mnCol2 + 1;
+        }
+    }
+}
+
+}
+
+void ScTable::SyncColRowFlags()
+{
+    using ::sal::static_int_cast;
+
+    // Manual breaks.
+    pRowFlags->AndValue(0, MAXROW, static_int_cast<BYTE>(~CR_MANUALBREAK));
+    for (SCCOL i = 0; i <= MAXCOL; ++i)
+        pColFlags[i] &= static_int_cast<BYTE>(~CR_MANUALBREAK);
+
+    if (!maRowManualBreaks.empty())
+    {
+        for (set<SCROW>::const_iterator itr = maRowManualBreaks.begin(), itrEnd = maRowManualBreaks.end();
+              itr != itrEnd; ++itr)
+            pRowFlags->OrValue(*itr, static_int_cast<BYTE>(CR_MANUALBREAK));
+    }
+
+    if (!maColManualBreaks.empty())
+    {
+        for (set<SCCOL>::const_iterator itr = maColManualBreaks.begin(), itrEnd = maColManualBreaks.end();
+              itr != itrEnd; ++itr)
+            pColFlags[*itr] |= CR_MANUALBREAK;
+    }
+
+    // Hidden flags.
+    lcl_syncFlags(*mpHiddenCols, *mpHiddenRows, pColFlags, pRowFlags, CR_HIDDEN);
+    lcl_syncFlags(*mpFilteredCols, *mpFilteredRows, pColFlags, pRowFlags, CR_FILTERED);
 }
 
 void ScTable::SetPageSize( const Size& rSize )
 {
     if ( rSize.Width() != 0 && rSize.Height() != 0 )
     {
+        if (aPageSizeTwips != rSize)
+            InvalidatePageBreaks();
+
         bPageSizeValid = TRUE;
         aPageSizeTwips = rSize;
     }
@@ -362,6 +1040,9 @@ void ScTable::SetPageStyle( const String& rName )
 
             if ( pNewStyle )			// auch ohne den alten (fuer UpdateStdNames)
                 aPageStyle = aStrNew;
+
+            if (IsStreamValid())
+                SetStreamValid(FALSE);
         }
     }
 }
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 8d5ec0f3f..a1bd2799d 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -251,6 +251,42 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
     return bFound;
 }
 
+void ScTable::SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bForward)
+{
+    if (bForward)
+    {
+        // forward search
+
+        if (rRow <= rLastNonFilteredRow)
+            return;
+    
+        SCROW nLastRow = rRow;
+        if (RowFiltered(rRow, NULL, &nLastRow))
+            // move to the first non-filtered row.
+            rRow = nLastRow + 1;
+        else
+            // record the last non-filtered row to avoid checking 
+            // the filtered state for each and every row.
+            rLastNonFilteredRow = nLastRow;
+    }
+    else
+    {
+        // backward search
+
+        if (rRow >= rLastNonFilteredRow)
+            return;
+    
+        SCROW nFirstRow = rRow;
+        if (RowFiltered(rRow, &nFirstRow, NULL))
+            // move to the first non-filtered row.
+            rRow = nFirstRow - 1;
+        else
+            // record the last non-filtered row to avoid checking 
+            // the filtered state for each and every row.
+            rLastNonFilteredRow = nFirstRow;
+    }
+}
+
 BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                         const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc)
 {
@@ -264,6 +300,7 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
     GetLastDataPos(nLastCol, nLastRow);
     if (!bAll && rSearchItem.GetBackward())
     {
+        SCROW nLastNonFilteredRow = MAXROW + 1;
         nCol = Min(nCol, (SCCOL)(nLastCol + 1));
         nRow = Min(nRow, (SCROW)(nLastRow + 1));
         if (rSearchItem.GetRowDirection())
@@ -271,6 +308,8 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
             nCol--;
             while (!bFound && ((SCsROW)nRow >= 0))
             {
+                SkipFilteredRows(nRow, nLastNonFilteredRow, false);
+
                 while (!bFound && ((SCsCOL)nCol >= 0))
                 {
                     bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
@@ -302,6 +341,8 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
             {
                 while (!bFound && ((SCsROW)nRow >= 0))
                 {
+                    SkipFilteredRows(nRow, nLastNonFilteredRow, false);
+
                     bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
                     if (!bFound)
                     {
@@ -311,8 +352,10 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                 }
                 if (!bFound)
                 {
+                    // Not found in this column.  Move to the next column.
                     BOOL bIsEmpty;
                     nRow = nLastRow;
+                    nLastNonFilteredRow = MAXROW + 1;
                     do
                     {
                         nCol--;
@@ -328,11 +371,14 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
     }
     else
     {
+        SCROW nLastNonFilteredRow = -1;
         if (!bAll && rSearchItem.GetRowDirection())
         {
             nCol++;
             while (!bFound && (nRow <= nLastRow))
             {
+                SkipFilteredRows(nRow, nLastNonFilteredRow, true);
+
                 while (!bFound && (nCol <= nLastCol))
                 {
                     bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
@@ -356,6 +402,8 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
             {
                 while (!bFound && (nRow <= nLastRow))
                 {
+                    SkipFilteredRows(nRow, nLastNonFilteredRow, true);
+
                     bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
                     if (!bFound)
                     {
@@ -365,7 +413,9 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                 }
                 if (!bFound)
                 {
+                    // Not found in this column.  Move to the next column.
                     nRow = 0;
+                    nLastNonFilteredRow = -1;
                     nCol++;
                     while ((nCol <= nLastCol) && aCol[nCol].IsEmptyData()) nCol++;
                 }
@@ -660,7 +710,7 @@ BOOL ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem,
         {
             //	SearchParam no longer needed - SearchOptions contains all settings
             com::sun::star::util::SearchOptions aSearchOptions = rSearchItem.GetSearchOptions();
-            aSearchOptions.Locale = *ScGlobal::pLocale;
+            aSearchOptions.Locale = *ScGlobal::GetLocale();
 
             if (!aSearchOptions.searchString.getLength())
             {
@@ -770,6 +820,30 @@ bool ScTable::SearchAndReplaceEmptyCells(
     return false;
 }
 
+namespace {
+
+bool lcl_maybeReplaceCellString(
+    ScColumn& rColObj, SCCOL& rCol, SCROW& rRow, String& rUndoStr, SCCOL nCol, SCROW nRow, const SvxSearchItem& rSearchItem)
+{
+    ScBaseCell* pCell = rColObj.GetCell(nRow);
+    if (!pCell || pCell->GetCellType() == CELLTYPE_NOTE)
+    {
+        // empty cell found.
+        rCol = nCol;
+        rRow = nRow;
+        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
+            rSearchItem.GetReplaceString().Len())
+        {
+            rColObj.Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
+            rUndoStr = String();
+        }
+        return true;
+    }
+    return false;
+}
+
+}
+
 bool ScTable::SearchRangeForEmptyCell(
     const ScRange& rRange, const SvxSearchItem& rSearchItem, 
     SCCOL& rCol, SCROW& rRow, String& rUndoStr, ScDocument* /*pUndoDoc*/)
@@ -781,30 +855,23 @@ bool ScTable::SearchRangeForEmptyCell(
         if (rSearchItem.GetRowDirection())
         {
             // row direction.
+            SCROW nLastNonFilteredRow = MAXROW + 1;
             SCROW nBeginRow = rRange.aEnd.Row() > rRow ? rRow : rRange.aEnd.Row();
             for (SCROW nRow = nBeginRow; nRow >= rRange.aStart.Row(); --nRow)
             {
+                SkipFilteredRows(nRow, nLastNonFilteredRow, false);
+                if (nRow < rRange.aStart.Row())
+                    break;
+
                 SCCOL nBeginCol = rRange.aEnd.Col();
                 if (nRow == rRow && nBeginCol >= rCol)
                     // always start from one cell before the cursor.
-                    nBeginCol = rCol - (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
+                    nBeginCol = rCol - (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
 
                 for (SCCOL nCol = nBeginCol; nCol >= rRange.aStart.Col(); --nCol)
                 {
-                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
-                    if (!pCell)
-                    {
-                        // empty cell found.
-                        rCol = nCol;
-                        rRow = nRow;
-                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
-                            rSearchItem.GetReplaceString().Len())
-                        {
-                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
-                            rUndoStr = String();
-                        }
+                    if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
                         return true;
-                    }
                 }
             }
         }
@@ -814,26 +881,19 @@ bool ScTable::SearchRangeForEmptyCell(
             SCCOL nBeginCol = rRange.aEnd.Col() > rCol ? rCol : rRange.aEnd.Col();
             for (SCCOL nCol = nBeginCol; nCol >= rRange.aStart.Col(); --nCol)
             {
+                SCROW nLastNonFilteredRow = MAXROW + 1;
                 SCROW nBeginRow = rRange.aEnd.Row();
                 if (nCol == rCol && nBeginRow >= rRow)
                     // always start from one cell before the cursor.
-                    nBeginRow = rRow - (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
+                    nBeginRow = rRow - (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
                 for (SCROW nRow = nBeginRow; nRow >= rRange.aStart.Row(); --nRow)
                 {   
-                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
-                    if (!pCell)
-                    {
-                        // empty cell found.
-                        rCol = nCol;
-                        rRow = nRow;
-                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
-                            rSearchItem.GetReplaceString().Len())
-                        {
-                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
-                            rUndoStr = String();
-                        }
+                    SkipFilteredRows(nRow, nLastNonFilteredRow, false);
+                    if (nRow < rRange.aStart.Row())
+                        break;
+
+                    if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
                         return true;
-                    }
                 }
             }
         }
@@ -844,29 +904,22 @@ bool ScTable::SearchRangeForEmptyCell(
         if (rSearchItem.GetRowDirection())
         {
             // row direction.
+            SCROW nLastNonFilteredRow = -1;
             SCROW nBeginRow = rRange.aStart.Row() < rRow ? rRow : rRange.aStart.Row();
             for (SCROW nRow = nBeginRow; nRow <= rRange.aEnd.Row(); ++nRow)
             {
+                SkipFilteredRows(nRow, nLastNonFilteredRow, true);
+                if (nRow > rRange.aEnd.Row())
+                    break;
+
                 SCCOL nBeginCol = rRange.aStart.Col();
                 if (nRow == rRow && nBeginCol <= rCol)
                     // always start from one cell past the cursor.
-                    nBeginCol = rCol + (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
+                    nBeginCol = rCol + (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
                 for (SCCOL nCol = nBeginCol; nCol <= rRange.aEnd.Col(); ++nCol)
                 {
-                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
-                    if (!pCell)
-                    {
-                        // empty cell found.
-                        rCol = nCol;
-                        rRow = nRow;
-                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
-                            rSearchItem.GetReplaceString().Len())
-                        {
-                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
-                            rUndoStr = String();
-                        }
+                    if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
                         return true;
-                    }
                 }
             }
         }
@@ -876,26 +929,19 @@ bool ScTable::SearchRangeForEmptyCell(
             SCCOL nBeginCol = rRange.aStart.Col() < rCol ? rCol : rRange.aStart.Col();
             for (SCCOL nCol = nBeginCol; nCol <= rRange.aEnd.Col(); ++nCol)
             {
+                SCROW nLastNonFilteredRow = -1;
                 SCROW nBeginRow = rRange.aStart.Row();
                 if (nCol == rCol && nBeginRow <= rRow)
                     // always start from one cell past the cursor.
-                    nBeginRow = rRow + (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
+                    nBeginRow = rRow + (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
                 for (SCROW nRow = nBeginRow; nRow <= rRange.aEnd.Row(); ++nRow)
                 {   
-                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
-                    if (!pCell)
-                    {
-                        // empty cell found.
-                        rCol = nCol;
-                        rRow = nRow;
-                        if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
-                            rSearchItem.GetReplaceString().Len())
-                        {
-                            aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
-                            rUndoStr = String();
-                        }
+                    SkipFilteredRows(nRow, nLastNonFilteredRow, true);
+                    if (nRow > rRange.aEnd.Row())
+                        break;
+
+                    if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
                         return true;
-                    }
                 }
             }
         }
@@ -913,32 +959,44 @@ bool ScTable::SearchRangeForAllEmptyCells(
 
     for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
     {
+        SCROW nLastNonFilteredRow = -1;
         if (aCol[nCol].IsEmptyData())
         {
-            // The entire column is empty.  Add the whole column and move on.
-            rMark.SetMultiMarkArea(
-                ScRange(nCol, rRange.aStart.Row(), nTab, nCol, rRange.aEnd.Row(), nTab));
-            bFound = true;
-
-            if (bReplace)
+            // The entire column is empty.
+            for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
             {
-                const String& rNewStr = rSearchItem.GetReplaceString();
-                for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
+                SCROW nLastRow;
+                if (!RowFiltered(nRow, NULL, &nLastRow))
                 {    
-                    aCol[nCol].Insert(nRow, new ScStringCell(rNewStr));
-                    if (pUndoDoc)
-                        // TODO: I'm using a string cell with empty content to 
-                        // trigger deletion of cell instance on undo.  Maybe I
-                        // should create a new cell type for this?
-                        pUndoDoc->PutCell(nCol, nRow, nTab, new ScStringCell(String()));
+                    rMark.SetMultiMarkArea(ScRange(nCol, nRow, nTab, nCol, nLastRow, nTab));
+                    if (bReplace)
+                    {
+                        const String& rNewStr = rSearchItem.GetReplaceString();
+                        for (SCROW i = nRow; i <= nLastRow; ++i)
+                        {    
+                            aCol[nCol].Insert(i, new ScStringCell(rNewStr));
+                            if (pUndoDoc)
+                                // TODO: I'm using a string cell with empty content to 
+                                // trigger deletion of cell instance on undo.  Maybe I
+                                // should create a new cell type for this?
+                                pUndoDoc->PutCell(nCol, i, nTab, new ScStringCell(String()));
+                        }
+                        rUndoStr = String();
+                    }
                 }
-                rUndoStr = String();
+
+                nRow = nLastRow; // move to the last filtered row.
             }
+            bFound = true;
             continue;
         }
 
         for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
         {
+            SkipFilteredRows(nRow, nLastNonFilteredRow, true);
+            if (nRow > rRange.aEnd.Row())
+                break;
+
             ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
             if (!pCell)
             {    
@@ -956,6 +1014,21 @@ bool ScTable::SearchRangeForAllEmptyCells(
                         pUndoDoc->PutCell(nCol, nRow, nTab, new ScStringCell(String()));
                 }
             }
+            else if (pCell->GetCellType() == CELLTYPE_NOTE)
+            {
+                rMark.SetMultiMarkArea(ScRange(nCol, nRow, nTab));
+                bFound = true;
+
+                if (bReplace)
+                {    
+                    if (pUndoDoc)
+                    {
+                        ScAddress aCellPos(nCol, nRow, nTab);
+                        pUndoDoc->PutCell(nCol, nRow, nTab, pCell->CloneWithNote(aCellPos, *pUndoDoc, aCellPos));
+                    }
+                    aCol[nCol].SetString(nRow, nTab, rSearchItem.GetReplaceString());
+                }
+            }
         }
     }
     return bFound;
diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx
new file mode 100644
index 000000000..0aa577b99
--- /dev/null
+++ b/sc/source/core/inc/doubleref.hxx
@@ -0,0 +1,194 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: interpre.hxx,v $
+ * $Revision: 1.35.44.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_DOUBLEREF_HXX
+#define SC_DOUBLEREF_HXX
+
+#include "address.hxx"
+#include "scmatrix.hxx"
+
+class ScDocument;
+class ScBaseCell;
+class ScDBQueryParamBase;
+class ScQueryParamBase;
+
+// ============================================================================
+
+/** 
+ * Base class for abstracting range data backends for database functions. 
+ */
+class ScDBRangeBase
+{
+public:
+    enum RefType { INTERNAL, EXTERNAL };
+
+    virtual ~ScDBRangeBase() = 0;
+
+    RefType getType() const;
+    bool fillQueryEntries(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef) const;
+
+    virtual SCCOL getColSize() const = 0;
+    virtual SCROW getRowSize() const = 0;
+    virtual SCSIZE getVisibleDataCellCount() const = 0;
+
+    /** 
+     * Get a string value of a specified cell position.  Note that the 
+     * position of the upper left cell of the range is always (0, 0) even if 
+     * the reference type is of internal range.
+     *
+     * @param nCol column position (0 to column size-1)
+     * @param nRow row position (0 to row size-1)
+     */
+    virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const = 0;
+
+    virtual SCCOL getFirstFieldColumn() const = 0;
+
+    /** 
+     * Get a <i>0-based</i> column index that corresponds with the passed field
+     * index.  Note that the field index passed as the 1st parameter is 
+     * <i>1-based.</i> 
+     *
+     * @param nIndex 1-based field index.
+     * 
+     * @return 0-based column index
+     */
+    virtual SCCOL findFieldColumn(SCCOL nIndex) const = 0;
+    virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const = 0;
+    virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const = 0;
+    virtual bool isRangeEqual(const ScRange& rRange) const = 0;
+
+protected:
+    ScDBRangeBase(ScDocument* pDoc, RefType eType);
+    ScDocument* getDoc() const;
+
+    /** 
+     * Populate query options that are always the same for all database 
+     * queries.
+     */
+    static void fillQueryOptions(ScQueryParamBase* pParam);
+
+private:
+    ScDBRangeBase(); // disabled
+
+    ScDocument* mpDoc;
+    RefType meType;
+};
+
+// ============================================================================
+
+class ScDBInternalRange : public ScDBRangeBase
+{
+public:
+    explicit ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange);
+    virtual ~ScDBInternalRange();
+
+    const ScRange& getRange() const;
+
+    virtual SCCOL getColSize() const;
+    virtual SCROW getRowSize() const;
+    virtual SCSIZE getVisibleDataCellCount() const;
+
+    /** 
+     * Get a string value of a specified cell position.  Note that the 
+     * position of the upper left cell of the range is always (0, 0) even if 
+     * the reference type is of internal range.
+     *
+     * @param nCol column position (0 to column size-1)
+     * @param nRow row position (0 to row size-1)
+     */
+    virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const;
+
+    virtual SCCOL getFirstFieldColumn() const;
+    /** 
+     * Get a <i>0-based</i> column index that corresponds with the passed field
+     * index.  Note that the field index passed as the 1st parameter is 
+     * <i>1-based.</i> 
+     *
+     * @param nIndex 1-based field index.
+     * 
+     * @return 0-based column index
+     */
+    virtual SCCOL findFieldColumn(SCCOL nIndex) const;
+    virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const;
+    virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const;
+    virtual bool isRangeEqual(const ScRange& rRange) const;
+
+private:
+    sal_uInt16 getCellString(::rtl::OUString& rStr, ScBaseCell* pCell) const;
+
+private:
+    ScRange maRange;
+};
+
+// ============================================================================
+
+class ScDBExternalRange : public ScDBRangeBase
+{
+public:
+    explicit ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat);
+    virtual ~ScDBExternalRange();
+
+    virtual SCCOL getColSize() const;
+    virtual SCROW getRowSize() const;
+    virtual SCSIZE getVisibleDataCellCount() const;
+
+    /** 
+     * Get a string value of a specified cell position.  Note that the 
+     * position of the upper left cell of the range is always (0, 0) even if 
+     * the reference type is of internal range.
+     *
+     * @param nCol column position (0 to column size-1)
+     * @param nRow row position (0 to row size-1)
+     */
+    virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const;
+
+    virtual SCCOL getFirstFieldColumn() const;
+
+    /** 
+     * Get a <i>0-based</i> column index that corresponds with the passed field
+     * index.  Note that the field index passed as the 1st parameter is 
+     * <i>1-based.</i> 
+     *
+     * @param nIndex 1-based field index.
+     * 
+     * @return 0-based column index
+     */
+    virtual SCCOL findFieldColumn(SCCOL nIndex) const;
+    virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const;
+    virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const;
+    virtual bool isRangeEqual(const ScRange& rRange) const;
+
+private:
+    const ScMatrixRef mpMatrix;
+    SCCOL mnCols;
+    SCROW mnRows;
+};
+
+#endif
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 9cf132e6a..bc9499c72 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -53,7 +53,10 @@ class SbxVariable;
 class ScBaseCell;
 class ScFormulaCell;
 class SvNumberFormatter;
+class ScDBRangeBase;
 struct MatrixDoubleOp;
+struct ScQueryParam;
+struct ScDBQueryParamBase;
 
 struct ScCompare
 {
@@ -220,7 +223,6 @@ double GetValueCellValue( const ScAddress&, const ScValueCell* );
 ScBaseCell* GetCell( const ScAddress& rPos )
     { return pDok->GetCell( rPos ); }
 void GetCellString( String& rStr, const ScBaseCell* pCell );
-void GetCellPhoneticString( String& rStr, const ScBaseCell* pCell );
 inline USHORT GetCellErrCode( const ScBaseCell* pCell )
     { return pCell ? pCell->GetErrorCode() : 0; }
 inline CellType GetCellType( const ScBaseCell* pCell )
@@ -323,6 +325,7 @@ void DoubleRefToVars( const ScToken* p,
         SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
         SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
         BOOL bDontCheckForTableOp = FALSE );
+ScDBRangeBase* PopDoubleRef();
 void PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
                           SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
                           BOOL bDontCheckForTableOp = FALSE );
@@ -510,7 +513,7 @@ void ScSubTotal();
 // compatibility). If this was the case then rMissingField is set to TRUE upon
 // return. If rMissingField==FALSE upon call all "missing cases" are considered
 // to be an error.
-BOOL GetDBParams( SCTAB& rTab, ScQueryParam& rParam, BOOL& rMissingField );
+ScDBQueryParamBase* GetDBParams( BOOL& rMissingField );
 
 void DBIterator( ScIterFunc );
 void ScDBSum();
@@ -557,7 +560,6 @@ void ScExternalRef();
 void ScGetPivotData();
 void ScHyperLink();
 void ScBahtText();
-void ScPhoneticString();
 void ScCalcTeam();
 void ScAnswer();
 void ScTTT();
diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx
index a8098dc8c..c634f7875 100644
--- a/sc/source/core/inc/poolhelp.hxx
+++ b/sc/source/core/inc/poolhelp.hxx
@@ -34,6 +34,7 @@
 #include <rtl/ref.hxx>
 #include <vos/refernce.hxx>
 #include <tools/link.hxx>
+#include "docoptio.hxx"
 
 class ScDocument;
 class ScDocumentPool;
@@ -45,11 +46,13 @@ class SfxItemPool;
 class ScPoolHelper : public vos::OReference
 {
 private:
+    ScDocOptions        aOpt;
     ScDocumentPool*		pDocPool;
     rtl::Reference< ScStyleSheetPool > mxStylePool;
-    SvNumberFormatter*	pFormTable;
-    SfxItemPool*		pEditPool;						// EditTextObjectPool
-    SfxItemPool*		pEnginePool;					// EditEnginePool
+    mutable SvNumberFormatter*	pFormTable;
+    mutable SfxItemPool*		pEditPool;						// EditTextObjectPool
+    mutable SfxItemPool*		pEnginePool;					// EditEnginePool
+    ScDocument*         m_pSourceDoc;
 
 public:
                 ScPoolHelper( ScDocument* pSourceDoc );
@@ -61,9 +64,11 @@ public:
                 // access to pointers (are never 0):
     ScDocumentPool*		GetDocPool() const		{ return pDocPool; }
     ScStyleSheetPool*	GetStylePool() const	{ return mxStylePool.get(); }
-    SvNumberFormatter*	GetFormTable() const	{ return pFormTable; }
-    SfxItemPool*		GetEditPool() const		{ return pEditPool; }
-    SfxItemPool*		GetEnginePool() const	{ return pEnginePool; }
+    SvNumberFormatter*	GetFormTable() const;
+    SfxItemPool*		GetEditPool() const;
+    SfxItemPool*		GetEnginePool() const;
+
+    void                SetFormTableOpt(const ScDocOptions& rOpt) { aOpt = rOpt; }
 };
 
 #endif
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 85632bba1..27b9b8c3b 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -1026,11 +1026,11 @@ short ScAutoFormat::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
     ((ScAutoFormatData*)pKey1)->GetName(aStr1);
     ((ScAutoFormatData*)pKey2)->GetName(aStr2);
     String aStrStandard = ScGlobal::GetRscString(STR_STYLENAME_STANDARD);
-    if ( ScGlobal::pTransliteration->isEqual( aStr1, aStrStandard ) )
+    if ( ScGlobal::GetpTransliteration()->isEqual( aStr1, aStrStandard ) )
         return -1;
-    if ( ScGlobal::pTransliteration->isEqual( aStr2, aStrStandard ) )
+    if ( ScGlobal::GetpTransliteration()->isEqual( aStr2, aStrStandard ) )
         return 1;
-    return (short) ScGlobal::pTransliteration->compareString( aStr1, aStr2 );
+    return (short) ScGlobal::GetpTransliteration()->compareString( aStr1, aStr2 );
 }
 
 BOOL ScAutoFormat::Load()
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index b15954d3a..6445bffcb 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -156,7 +156,7 @@ FuncData::FuncData(const FuncData& rData) :
 
 short FuncCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
 {
-    return (short) ScGlobal::pTransliteration->compareString(
+    return (short) ScGlobal::GetpTransliteration()->compareString(
         ((FuncData*)pKey1)->aInternalName, ((FuncData*)pKey2)->aInternalName );
 }
 
@@ -205,7 +205,7 @@ static ModuleCollection aModuleCollection;
 
 short ModuleCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
 {
-    return (short) ScGlobal::pTransliteration->compareString(
+    return (short) ScGlobal::GetpTransliteration()->compareString(
         ((ModuleData*)pKey1)->aName, ((ModuleData*)pKey2)->aName );
 }
 
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index 5445a9d0a..59519577a 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -47,6 +47,9 @@
 #include "cell.hxx"
 #include "docoptio.hxx"
 
+#include <vector>
+
+using ::std::vector;
 
 // -----------------------------------------------------------------------
 
@@ -166,11 +169,17 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
 
     SCCOL nStrCol = nCol1;		// fuer Beschriftung merken
     SCROW nStrRow = nRow1;
-    // Beschriftungen auch nach HiddenCols finden
-    while ( (pDocument->GetColFlags( nCol1, nTab1) & CR_HIDDEN) != 0 )
-        nCol1++;
-    nRow1 = pDocument->GetRowFlagsArray( nTab1).GetFirstForCondition( nRow1,
-            nRow2, CR_HIDDEN, 0);
+	// Skip hidden columns.
+	// TODO: make use of last column value once implemented.
+	SCCOL nLastCol = -1;
+	while (pDocument->ColHidden(nCol1, nTab1, nLastCol))
+		++nCol1;
+
+	// Skip hidden rows.
+	SCROW nLastRow = -1;
+	if (pDocument->RowHidden(nRow1, nTab1, nLastRow))
+		nRow1 = nLastRow + 1;
+
     // falls alles hidden ist, bleibt die Beschriftung am Anfang
     if ( nCol1 <= nCol2 )
     {
@@ -184,17 +193,33 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
     }
 
     SCSIZE nTotalCols = ( nCol1 <= nCol2 ? nCol2 - nCol1 + 1 : 0 );
-    SCCOL* pCols = new SCCOL[nTotalCols > 0 ? nTotalCols : 1];
-    SCSIZE nColCount = 0;
+	vector<SCCOL> aCols;
+	aCols.reserve(nTotalCols);
     for (SCSIZE i=0; i<nTotalCols; i++)
-        if ((pDocument->GetColFlags(sal::static_int_cast<SCCOL>(nCol1+i),nTab1)&CR_HIDDEN)==0)
-            pCols[nColCount++] = sal::static_int_cast<SCCOL>(nCol1+i);
+	{
+		SCCOL nThisCol = sal::static_int_cast<SCCOL>(nCol1+i);
+		if (!pDocument->ColHidden(nThisCol, nTab1, nLastCol))
+			aCols.push_back(nThisCol);
+	}
+	SCSIZE nColCount = aCols.size();
 
     SCSIZE nTotalRows = ( nRow1 <= nRow2 ? nRow2 - nRow1 + 1 : 0 );
-    SCROW* pRows = new SCROW[nTotalRows > 0 ? nTotalRows : 1];
-    SCSIZE nRowCount = (nTotalRows ?
-            pDocument->GetRowFlagsArray( nTab1).FillArrayForCondition( nRow1,
-                nRow2, CR_HIDDEN, 0, pRows, nTotalRows) : 0);
+	vector<SCROW> aRows;
+	aRows.reserve(nTotalRows);
+	if (nRow1 <= nRow2)
+	{
+		// Get all visible rows between nRow1 and nRow2.
+		SCROW nThisRow = nRow1;
+		while (nThisRow <= nRow2)
+		{
+			if (pDocument->RowHidden(nThisRow, nTab1, nLastRow))
+				nThisRow = nLastRow;
+			else
+				aRows.push_back(nThisRow);
+			++nThisRow;
+		}
+	}
+	SCSIZE nRowCount = aRows.size();
 
     // May happen at least with more than 32k rows.
     if (nColCount > SHRT_MAX || nRowCount > SHRT_MAX)
@@ -208,13 +233,13 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
     {
         bValidData = FALSE;
         nColCount = 1;
-        pCols[0] = nStrCol;
+		aCols.push_back(nStrCol);
     }
     if ( !nRowCount )
     {
         bValidData = FALSE;
         nRowCount = 1;
-        pRows[0] = nStrRow;
+		aRows.push_back(nStrRow);
     }
 
         //
@@ -237,7 +262,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
                 {
                     double nVal = DBL_MIN;		// Hack fuer Chart, um leere Zellen zu erkennen
 
-                    pDocument->GetCell( pCols[nCol], pRows[nRow], nTab1, pCell );
+					pDocument->GetCell( aCols[nCol], aRows[nRow], nTab1, pCell );
                     if (pCell)
                     {
                         CellType eType = pCell->GetCellType();
@@ -247,8 +272,8 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
                             if ( bCalcAsShown && nVal != 0.0 )
                             {
                                 sal_uInt32 nFormat;
-                                pDocument->GetNumberFormat( pCols[nCol],
-                                    pRows[nRow], nTab1, nFormat );
+								pDocument->GetNumberFormat( aCols[nCol],
+									aRows[nRow], nTab1, nFormat );
                                 nVal = pDocument->RoundValueAsShown( nVal, nFormat );
                             }
                         }
@@ -280,13 +305,13 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
         {
             String aString, aColStr;
             if (HasColHeaders())
-                pDocument->GetString( pCols[nCol], nStrRow, nTab1, aString );
+				pDocument->GetString( aCols[nCol], nStrRow, nTab1, aString );
             if ( !aString.Len() )
             {
                 aString = ScGlobal::GetRscString(STR_COLUMN);
                 aString += ' ';
 //                aString += String::CreateFromInt32( pCols[nCol]+1 );
-                ScAddress aPos( pCols[ nCol ], 0, 0 );
+                ScAddress aPos( aCols[ nCol ], 0, 0 );
                 aPos.Format( aColStr, SCA_VALID_COL, NULL );
                 aString += aColStr;
             }
@@ -306,14 +331,14 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
             String aString;
             if (HasRowHeaders())
             {
-                ScAddress aAddr( nStrCol, pRows[nRow], nTab1 );
-                pDocument->GetString( nStrCol, pRows[nRow], nTab1, aString );
+				ScAddress aAddr( nStrCol, aRows[nRow], nTab1 );
+				pDocument->GetString( nStrCol, aRows[nRow], nTab1, aString );
             }
             if ( !aString.Len() )
             {
                 aString = ScGlobal::GetRscString(STR_ROW);
                 aString += ' ';
-                aString += String::CreateFromInt32( pRows[nRow]+1 );
+				aString += String::CreateFromInt32( aRows[nRow]+1 );
             }
             pMemChart->SetRowText( static_cast<short>(nRow), aString);
 
@@ -349,11 +374,6 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
 //        SetExtraStrings( *pMemChart );
     }
 
-        //	Aufraeumen
-
-    delete[] pRows;
-    delete[] pCols;
-
     return pMemChart;
 }
 
diff --git a/sc/source/core/tool/collect.cxx b/sc/source/core/tool/collect.cxx
index d5982aa9e..78c6b25d9 100644
--- a/sc/source/core/tool/collect.cxx
+++ b/sc/source/core/tool/collect.cxx
@@ -96,7 +96,7 @@ ScCollection::~ScCollection()
 }
 
 //------------------------------------------------------------------------
-
+USHORT ScCollection::GetCount() const { return nCount; }
 void ScCollection::AtFree(USHORT nIndex)
 {
     if ((pItems) && (nIndex < nCount))
@@ -359,7 +359,8 @@ ScDataObject*	TypedStrData::Clone() const
 {
     return new TypedStrData(*this);
 }
-
+TypedScStrCollection::~TypedScStrCollection()
+{}
 ScDataObject* TypedScStrCollection::Clone() const
 {
     return new TypedScStrCollection(*this);
@@ -396,10 +397,10 @@ short TypedScStrCollection::Compare( ScDataObject* pKey1, ScDataObject* pKey2 )
             // Strings vergleichen:
             //---------------------
             if ( bCaseSensitive )
-                nResult = (short) ScGlobal::pCaseTransliteration->compareString(
+                nResult = (short) ScGlobal::GetCaseTransliteration()->compareString(
                     rData1.aStrValue, rData2.aStrValue );
             else
-                nResult = (short) ScGlobal::pTransliteration->compareString(
+                nResult = (short) ScGlobal::GetpTransliteration()->compareString(
                     rData1.aStrValue, rData2.aStrValue );
         }
     }
@@ -435,12 +436,12 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
             TypedStrData* pData = (TypedStrData*) pItems[i];
             if (pData->nStrType)
             {
-                if ( ScGlobal::pTransliteration->isMatch( rStart, pData->aStrValue ) )
+                if ( ScGlobal::GetpTransliteration()->isMatch( rStart, pData->aStrValue ) )
                 {
                     //	If the collection is case sensitive, it may contain several entries
                     //	that are equal when compared case-insensitive. They are skipped here.
                     if ( !bCaseSensitive || !aOldResult.Len() ||
-                            !ScGlobal::pTransliteration->isEqual(
+                            !ScGlobal::GetpTransliteration()->isEqual(
                             pData->aStrValue, aOldResult ) )
                     {
                         rResult = pData->aStrValue;
@@ -463,12 +464,12 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
             TypedStrData* pData = (TypedStrData*) pItems[i];
             if (pData->nStrType)
             {
-                if ( ScGlobal::pTransliteration->isMatch( rStart, pData->aStrValue ) )
+                if ( ScGlobal::GetpTransliteration()->isMatch( rStart, pData->aStrValue ) )
                 {
                     //	If the collection is case sensitive, it may contain several entries
                     //	that are equal when compared case-insensitive. They are skipped here.
                     if ( !bCaseSensitive || !aOldResult.Len() ||
-                            !ScGlobal::pTransliteration->isEqual(
+                            !ScGlobal::GetpTransliteration()->isEqual(
                             pData->aStrValue, aOldResult ) )
                     {
                         rResult = pData->aStrValue;
@@ -491,7 +492,7 @@ BOOL TypedScStrCollection::GetExactMatch( String& rString ) const
     for (USHORT i=0; i<nCount; i++)
     {
         TypedStrData* pData = (TypedStrData*) pItems[i];
-        if ( pData->nStrType && ScGlobal::pTransliteration->isEqual(
+        if ( pData->nStrType && ScGlobal::GetpTransliteration()->isEqual(
                 pData->aStrValue, rString ) )
         {
             rString = pData->aStrValue;							// String anpassen
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 63634f219..7f0966b50 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1002,7 +1002,7 @@ struct ConventionOOO_A1 : public Convention_A1
             String aFile;
             const String* p = pRefMgr->getExternalFileName(nFileId);
             if (p)
-                aFile = INetURLObject::decode(*p, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
+                aFile = *p;
             aFile.SearchAndReplaceAllAscii("'", String::CreateFromAscii("''"));
 
             rBuffer.append(sal_Unicode('\''));
@@ -1259,9 +1259,8 @@ struct ConventionXL
 
         rBuffer.append(sal_Unicode('['));
         rBuffer.append(sal_Unicode('\''));
-        String aFullName = INetURLObject::decode(rFullName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
-        const sal_Unicode* pBuf = aFullName.GetBuffer();
-        xub_StrLen nLen = aFullName.Len();
+        const sal_Unicode* pBuf = rFullName.GetBuffer();
+        xub_StrLen nLen = rFullName.Len();
         for (xub_StrLen i = 0; i < nLen; ++i)
         {
             const sal_Unicode c = pBuf[i];
@@ -2974,7 +2973,7 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                                 ;   // nothing, prevent compiler warning
                             break;
                         }
-                        if ( ScGlobal::pTransliteration->isEqual( aStr, aName ) )
+                        if ( ScGlobal::GetpTransliteration()->isEqual( aStr, aName ) )
                         {
                             aRef.InitFlags();
                             aRef.nCol = aIter.GetCol();
@@ -3103,7 +3102,7 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                             ;   // nothing, prevent compiler warning
                         break;
                     }
-                    if ( ScGlobal::pTransliteration->isEqual( aStr, aName ) )
+                    if ( ScGlobal::GetpTransliteration()->isEqual( aStr, aName ) )
                     {
                         SCCOL nCol = aIter.GetCol();
                         SCROW nRow = aIter.GetRow();
diff --git a/sc/source/core/tool/dbcolect.cxx b/sc/source/core/tool/dbcolect.cxx
index 8eb32cebc..5fae4bdfc 100644
--- a/sc/source/core/tool/dbcolect.cxx
+++ b/sc/source/core/tool/dbcolect.cxx
@@ -40,6 +40,7 @@
 #include "refupdat.hxx"
 #include "rechead.hxx"
 #include "document.hxx"
+#include "queryparam.hxx"
 #include "globstr.hrc"
 
 
@@ -158,6 +159,7 @@ ScDBData::ScDBData( const ScDBData& rData ) :
         nQueryField[i]		= rData.nQueryField[i];
         eQueryOp[i]			= rData.eQueryOp[i];
         bQueryByString[i]	= rData.bQueryByString[i];
+        bQueryByDate[i]     = rData.bQueryByDate[i];
         pQueryStr[i]		= new String( *(rData.pQueryStr[i]) );
         nQueryVal[i]		= rData.nQueryVal[i];
         eQueryConnect[i]	= rData.eQueryConnect[i];
@@ -248,6 +250,7 @@ ScDBData& ScDBData::operator= (const ScDBData& rData)
         nQueryField[i]		= rData.nQueryField[i];
         eQueryOp[i]			= rData.eQueryOp[i];
         bQueryByString[i]	= rData.bQueryByString[i];
+        bQueryByDate[i]     = rData.bQueryByDate[i];
         *pQueryStr[i]		= *rData.pQueryStr[i];
         nQueryVal[i]		= rData.nQueryVal[i];
         eQueryConnect[i]	= rData.eQueryConnect[i];
@@ -385,13 +388,13 @@ void ScDBData::GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SC
     rCol1 = nStartCol;
     rRow1 = nStartRow;
     rCol2 = nEndCol;
-	rRow2 = bUseDynamicRange ? nDynamicEndRow : nEndRow;
+    rRow2 = bUseDynamicRange ? nDynamicEndRow : nEndRow;
 }
 
 void ScDBData::GetArea(ScRange& rRange, bool bUseDynamicRange) const
 {
     SCROW nNewEndRow = bUseDynamicRange ? nDynamicEndRow : nEndRow;
-	rRange = ScRange( nStartCol, nStartRow, nTable, nEndCol, nNewEndRow, nTable );
+    rRange = ScRange( nStartCol, nStartRow, nTable, nEndCol, nNewEndRow, nTable );
 }
 
 void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2)
@@ -526,6 +529,7 @@ void ScDBData::GetQueryParam( ScQueryParam& rQueryParam ) const
         rEntry.nField = nQueryField[i];
         rEntry.eOp = eQueryOp[i];
         rEntry.bQueryByString = bQueryByString[i];
+        rEntry.bQueryByDate = bQueryByDate[i];
         *rEntry.pStr = *pQueryStr[i];
         rEntry.nVal = nQueryVal[i];
         rEntry.eConnect = eQueryConnect[i];
@@ -557,6 +561,7 @@ void ScDBData::SetQueryParam(const ScQueryParam& rQueryParam)
         nQueryField[i] = rEntry.nField;
         eQueryOp[i] = rEntry.eOp;
         bQueryByString[i] = rEntry.bQueryByString;
+        bQueryByDate[i] = rEntry.bQueryByDate;
         *pQueryStr[i] = *rEntry.pStr;
         nQueryVal[i] = rEntry.nVal;
         eQueryConnect[i] = rEntry.eConnect;
@@ -713,7 +718,7 @@ short ScDBCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
 {
     const String& rStr1 = ((ScDBData*)pKey1)->GetName();
     const String& rStr2 = ((ScDBData*)pKey2)->GetName();
-    return (short) ScGlobal::pTransliteration->compareString( rStr1, rStr2 );
+    return (short) ScGlobal::GetpTransliteration()->compareString( rStr1, rStr2 );
 }
 
 //	IsEqual - alles gleich
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 99e0e7105..a1deff3e2 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -296,6 +296,12 @@ void ScCommentData::UpdateCaptionSet( const SfxItemSet& rItemSet )
 
 //------------------------------------------------------------------------
 
+void ScDetectiveFunc::Modified()
+{
+    if (pDoc->IsStreamValid(nTab))
+        pDoc->SetStreamValid(nTab, FALSE);
+}
+
 inline BOOL Intersect( SCCOL nStartCol1, SCROW nStartRow1, SCCOL nEndCol1, SCROW nEndRow1,
                         SCCOL nStartCol2, SCROW nStartRow2, SCCOL nEndCol2, SCROW nEndRow2 )
 {
@@ -553,6 +559,7 @@ BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
 
     pData->maEnd.Set( nCol, nRow, nTab);
 
+    Modified();
     return TRUE;
 }
 
@@ -615,6 +622,7 @@ BOOL ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
     pData->maStart.Set( nStartCol, nStartRow, nTab);
     pData->maEnd.SetInvalid();
 
+    Modified();
     return TRUE;
 }
 
@@ -682,6 +690,8 @@ void ScDetectiveFunc::DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData
     ScDrawObjData* pData = ScDrawLayer::GetObjData( pCircle, TRUE );
     pData->maStart.Set( nCol, nRow, nTab);
     pData->maEnd.SetInvalid();
+
+    Modified();
 }
 
 void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt )
@@ -722,6 +732,8 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt )
             pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
 
         delete[] ppObj;
+
+        Modified();
     }
 }
 
@@ -797,6 +809,8 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR
             pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
 
         delete[] ppObj;
+
+        Modified();
     }
 }
 
@@ -1339,6 +1353,8 @@ BOOL ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat )
             pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
 
         delete[] ppObj;
+
+        Modified();
     }
 
     return ( nDelCount != 0 );
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index e3d6f54af..b0188eec8 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -142,7 +142,7 @@ void ScDocOptions::ResetDocOptions()
 
     do
     {
-        const Locale& rLocale = *ScGlobal::pLocale;
+        const Locale& rLocale = *ScGlobal::GetLocale();
         const OUString& rLang = rLocale.Language;
         if (rLang.equalsAscii("ru"))
             // Don't do automatic guess for these languages, and fall back to 
diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx
new file mode 100644
index 000000000..e1bba5c2d
--- /dev/null
+++ b/sc/source/core/tool/doubleref.cxx
@@ -0,0 +1,568 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: interpre.hxx,v $
+ * $Revision: 1.35.44.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sc.hxx"
+
+// INCLUDE ---------------------------------------------------------------
+
+#include "doubleref.hxx"
+#include "cell.hxx"
+#include "global.hxx"
+#include "document.hxx"
+#include "queryparam.hxx"
+#include "globstr.hrc"
+
+#include <memory>
+#include <vector>
+
+using ::rtl::OUString;
+using ::std::auto_ptr;
+using ::std::vector;
+
+namespace {
+
+void lcl_toUpper(OUString& rStr)
+{
+    rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, rStr.getLength());
+}
+
+bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)
+{
+    // A valid StarQuery must be at least 4 columns wide. To be precise it
+    // should be exactly 4 columns ...
+    // Additionally, if this wasn't checked, a formula pointing to a valid 1-3
+    // column Excel style query range immediately left to itself would result
+    // in a circular reference when the field name or operator or value (first
+    // to third query range column) is obtained (#i58354#). Furthermore, if the
+    // range wasn't sufficiently specified data changes wouldn't flag formula
+    // cells for recalculation.
+
+    if (pQueryRef->getColSize() < 4)
+        return false;
+
+    BOOL bValid;
+    BOOL bFound;
+    OUString aCellStr;
+    SCSIZE nIndex = 0;
+    SCROW nRow = 0;
+    SCROW nRows = pDBRef->getRowSize();
+    SCSIZE nNewEntries = static_cast<SCSIZE>(nRows);
+    pParam->Resize(nNewEntries);
+
+    do
+    {
+        ScQueryEntry& rEntry = pParam->GetEntry(nIndex);
+
+        bValid = FALSE;
+
+        if (nIndex > 0)
+        {
+            // For all entries after the first one, check the and/or connector in the first column.
+            aCellStr = pQueryRef->getString(0, nRow);
+            lcl_toUpper(aCellStr);
+            if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_UND)) )
+            {
+                rEntry.eConnect = SC_AND;
+                bValid = TRUE;
+            }
+            else if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_ODER)) )
+            {
+                rEntry.eConnect = SC_OR;
+                bValid = TRUE;
+            }
+        }
+
+        if ((nIndex < 1) || bValid)
+        {
+            // field name in the 2nd column.
+            bFound = FALSE;
+            aCellStr = pQueryRef->getString(1, nRow);
+            SCCOL nField = pDBRef->findFieldColumn(aCellStr); // TODO: must be case insensitive comparison.
+            if (ValidCol(nField))
+            {
+                rEntry.nField = nField;
+                bValid = true;
+            }
+            else
+                bValid = false;
+        }
+        
+        if (bValid)
+        {
+            // equality, non-equality operator in the 3rd column.
+            bFound = FALSE;
+            aCellStr = pQueryRef->getString(2, nRow);
+            lcl_toUpper(aCellStr);
+            const sal_Unicode* p = aCellStr.getStr();
+            if (p[0] == sal_Unicode('<'))
+            {
+                if (p[1] == sal_Unicode('>'))
+                    rEntry.eOp = SC_NOT_EQUAL;
+                else if (p[1] == sal_Unicode('='))
+                    rEntry.eOp = SC_LESS_EQUAL;
+                else
+                    rEntry.eOp = SC_LESS;
+            }
+            else if (p[0] == sal_Unicode('>'))
+            {
+                if (p[1] == sal_Unicode('='))
+                    rEntry.eOp = SC_GREATER_EQUAL;
+                else
+                    rEntry.eOp = SC_GREATER;
+            }
+            else if (p[0] == sal_Unicode('='))
+                rEntry.eOp = SC_EQUAL;
+
+        }
+        
+        if (bValid)
+        {
+            // Finally, the right-hand-side value in the 4th column.
+            *rEntry.pStr = pQueryRef->getString(3, nRow);
+            rEntry.bDoQuery = TRUE;
+        }
+        nIndex++;
+        nRow++;
+    }
+    while (bValid && (nRow < nRows) /* && (nIndex < MAXQUERY) */ );
+    return bValid;
+}
+
+bool lcl_createExcelQuery(
+    ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)
+{
+    bool bValid = true;
+    SCCOL nCols = pQueryRef->getColSize();
+    SCROW nRows = pQueryRef->getRowSize();
+    vector<SCCOL> aFields(nCols);
+    SCCOL nCol = 0;
+    while (bValid && (nCol < nCols))
+    {
+        OUString aQueryStr = pQueryRef->getString(nCol, 0);
+        SCCOL nField = pDBRef->findFieldColumn(aQueryStr);
+        if (ValidCol(nField))
+            aFields[nCol] = nField;
+        else
+            bValid = false;
+        ++nCol;
+    }
+
+    if (bValid)
+    {
+//      ULONG nVisible = 0;
+//      for ( nCol=nCol1; nCol<=nCol2; nCol++ )
+//          nVisible += aCol[nCol].VisibleCount( nRow1+1, nRow2 );
+
+        // Count the number of visible cells (excluding the header row).  Each
+        // visible cell corresponds with a single query.
+        SCSIZE nVisible = pQueryRef->getVisibleDataCellCount();
+        if ( nVisible > SCSIZE_MAX / sizeof(void*) )
+        {
+            DBG_ERROR("zu viele Filterkritierien");
+            nVisible = 0;
+        }
+
+        SCSIZE nNewEntries = nVisible;
+        pParam->Resize( nNewEntries );
+
+        SCSIZE nIndex = 0;
+        SCROW nRow = 1;
+        String aCellStr;
+        while (nRow < nRows)
+        {
+            nCol = 0;
+            while (nCol < nCols)
+            {
+                aCellStr = pQueryRef->getString(nCol, nRow);
+                ScGlobal::pCharClass->toUpper( aCellStr );
+                if (aCellStr.Len() > 0)
+                {
+                    if (nIndex < nNewEntries)
+                    {
+                        pParam->GetEntry(nIndex).nField = aFields[nCol];
+                        pParam->FillInExcelSyntax(aCellStr, nIndex);
+                        nIndex++;
+                        if (nIndex < nNewEntries)
+                            pParam->GetEntry(nIndex).eConnect = SC_AND;
+                    }
+                    else
+                        bValid = FALSE;
+                }
+                nCol++;
+            }
+            nRow++;
+            if (nIndex < nNewEntries)
+                pParam->GetEntry(nIndex).eConnect = SC_OR;
+        }
+    }
+    return bValid;
+}
+
+bool lcl_fillQueryEntries(
+    ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)
+{
+    SCSIZE nCount = pParam->GetEntryCount();
+    for (SCSIZE i = 0; i < nCount; ++i)
+        pParam->GetEntry(i).Clear();
+
+    // Standard QueryTabelle
+    bool bValid = lcl_createStarQuery(pParam, pDBRef, pQueryRef);
+    // Excel QueryTabelle
+    if (!bValid)
+        bValid = lcl_createExcelQuery(pParam, pDBRef, pQueryRef);
+
+    nCount = pParam->GetEntryCount();
+    if (bValid)
+    {
+        //  bQueryByString muss gesetzt sein
+        for (SCSIZE i = 0; i < nCount; ++i)
+            pParam->GetEntry(i).bQueryByString = true;
+    }
+    else
+    {
+        //  nix
+        for (SCSIZE i = 0; i < nCount; ++i)
+            pParam->GetEntry(i).Clear();
+    }
+    return bValid;
+}
+
+}
+
+// ============================================================================
+
+ScDBRangeBase::ScDBRangeBase(ScDocument* pDoc, RefType eType) : 
+    mpDoc(pDoc), meType(eType)
+{
+}
+
+ScDBRangeBase::~ScDBRangeBase()
+{
+}
+
+ScDBRangeBase::RefType ScDBRangeBase::getType() const
+{
+    return meType;
+}
+
+bool ScDBRangeBase::fillQueryEntries(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef) const
+{
+    if (!pDBRef)
+        return false;
+
+    return lcl_fillQueryEntries(pParam, pDBRef, this);
+}
+
+void ScDBRangeBase::fillQueryOptions(ScQueryParamBase* pParam)
+{
+    pParam->bHasHeader = true;
+    pParam->bByRow = true;
+    pParam->bInplace = true;
+    pParam->bCaseSens = false;
+    pParam->bRegExp = false;
+    pParam->bDuplicate = true;
+    pParam->bMixedComparison = false;
+}
+
+ScDocument* ScDBRangeBase::getDoc() const
+{
+    return mpDoc;
+}
+
+// ============================================================================
+
+ScDBInternalRange::ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange) :
+    ScDBRangeBase(pDoc, INTERNAL), maRange(rRange)
+{
+}
+
+ScDBInternalRange::~ScDBInternalRange()
+{
+}
+
+const ScRange& ScDBInternalRange::getRange() const
+{
+    return maRange;
+}
+
+SCCOL ScDBInternalRange::getColSize() const
+{
+    return maRange.aEnd.Col() - maRange.aStart.Col() + 1;
+}
+
+SCROW ScDBInternalRange::getRowSize() const
+{
+    return maRange.aEnd.Row() - maRange.aStart.Row() + 1;
+}
+
+SCSIZE ScDBInternalRange::getVisibleDataCellCount() const
+{
+    SCCOL nCols = getColSize();
+    SCROW nRows = getRowSize();
+    if (nRows <= 1)
+        return 0;
+
+    return (nRows-1)*nCols;
+}
+
+OUString ScDBInternalRange::getString(SCCOL nCol, SCROW nRow) const
+{
+    String aStr;
+    const ScAddress& s = maRange.aStart;
+    getDoc()->GetString(s.Col() + nCol, s.Row() + nRow, maRange.aStart.Tab(), aStr);
+    return aStr;
+}
+
+SCCOL ScDBInternalRange::getFirstFieldColumn() const
+{
+    return getRange().aStart.Col();
+}
+
+SCCOL ScDBInternalRange::findFieldColumn(SCCOL nIndex) const
+{
+    const ScRange& rRange = getRange();
+    const ScAddress& s = rRange.aStart;
+    const ScAddress& e = rRange.aEnd;
+
+    SCCOL nDBCol1 = s.Col();
+    SCCOL nDBCol2 = e.Col();
+
+    if ( nIndex <= 0 || nIndex > (nDBCol2 - nDBCol1 + 1) )
+        return nDBCol1;
+
+    return Min(nDBCol2, static_cast<SCCOL>(nDBCol1 + nIndex - 1));
+}
+
+sal_uInt16 ScDBInternalRange::getCellString(OUString& rStr, ScBaseCell* pCell) const
+{
+    sal_uInt16 nErr = 0;
+    String aStr;
+    if (pCell)
+    {
+        SvNumberFormatter* pFormatter = getDoc()->GetFormatTable();
+        switch (pCell->GetCellType())
+        {
+            case CELLTYPE_STRING:
+                ((ScStringCell*) pCell)->GetString(aStr);
+            break;
+            case CELLTYPE_EDIT:
+                ((ScEditCell*) pCell)->GetString(aStr);
+            break;
+            case CELLTYPE_FORMULA:
+            {
+                ScFormulaCell* pFCell = (ScFormulaCell*) pCell;
+                nErr = pFCell->GetErrCode();
+                if (pFCell->IsValue())
+                {
+                    double fVal = pFCell->GetValue();
+                    ULONG nIndex = pFormatter->GetStandardFormat(
+                                        NUMBERFORMAT_NUMBER,
+                                        ScGlobal::eLnge);
+                    pFormatter->GetInputLineString(fVal, nIndex, aStr);
+                }
+                else
+                    pFCell->GetString(aStr);
+            }
+            break;
+            case CELLTYPE_VALUE:
+            {
+                double fVal = ((ScValueCell*) pCell)->GetValue();
+                ULONG nIndex = pFormatter->GetStandardFormat(
+                                        NUMBERFORMAT_NUMBER,
+                                        ScGlobal::eLnge);
+                pFormatter->GetInputLineString(fVal, nIndex, aStr);
+            }
+            break;
+            default:
+                ;
+        }
+    }
+    rStr = aStr;
+    return nErr;
+}
+
+SCCOL ScDBInternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr) const
+{
+    const ScAddress& s = maRange.aStart;
+    const ScAddress& e = maRange.aEnd;
+    OUString aUpper = rStr;
+    lcl_toUpper(aUpper);
+
+    SCCOL nDBCol1 = s.Col();
+    SCROW nDBRow1 = s.Row();
+    SCTAB nDBTab1 = s.Tab();
+    SCCOL nDBCol2 = e.Col();
+
+    SCCOL   nField = nDBCol1;
+    BOOL    bFound = TRUE;
+
+    bFound = FALSE;
+    OUString aCellStr;
+    ScAddress aLook( nDBCol1, nDBRow1, nDBTab1 );
+    while (!bFound && (aLook.Col() <= nDBCol2))
+    {
+        ScBaseCell* pCell = getDoc()->GetCell( aLook );
+        sal_uInt16 nErr = getCellString( aCellStr, pCell );
+        if (pErr)
+            *pErr = nErr;
+        lcl_toUpper(aCellStr);
+        bFound = ScGlobal::GetpTransliteration()->isEqual(aCellStr, aUpper);
+        if (!bFound)
+            aLook.IncCol();
+    }
+    nField = aLook.Col();
+
+    return bFound ? nField : -1;
+}
+
+ScDBQueryParamBase* ScDBInternalRange::createQueryParam(const ScDBRangeBase* pQueryRef) const
+{
+    auto_ptr<ScDBQueryParamInternal> pParam(new ScDBQueryParamInternal);
+
+    // Set the database range first.
+    const ScAddress& s = maRange.aStart;
+    const ScAddress& e = maRange.aEnd;
+    pParam->nCol1 = s.Col();
+    pParam->nRow1 = s.Row();
+    pParam->nCol2 = e.Col();
+    pParam->nRow2 = e.Row();
+    pParam->nTab  = s.Tab();
+
+    fillQueryOptions(pParam.get());
+
+    // Now construct the query entries from the query range.
+    if (!pQueryRef->fillQueryEntries(pParam.get(), this))
+        return NULL;
+
+    return pParam.release();
+}
+
+bool ScDBInternalRange::isRangeEqual(const ScRange& rRange) const
+{
+    return maRange == rRange;
+}
+
+// ============================================================================
+
+ScDBExternalRange::ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat) :
+    ScDBRangeBase(pDoc, EXTERNAL), mpMatrix(pMat)
+{
+    SCSIZE nC, nR;
+    mpMatrix->GetDimensions(nC, nR);
+    mnCols = nC;
+    mnRows = nR;
+}
+
+ScDBExternalRange::~ScDBExternalRange()
+{
+}
+
+SCCOL ScDBExternalRange::getColSize() const
+{
+    return mnCols;
+}
+
+SCROW ScDBExternalRange::getRowSize() const
+{
+    return mnRows;
+}
+
+SCSIZE ScDBExternalRange::getVisibleDataCellCount() const
+{
+    SCCOL nCols = getColSize();
+    SCROW nRows = getRowSize();
+    if (nRows <= 1)
+        return 0;
+
+    return (nRows-1)*nCols;
+}
+
+OUString ScDBExternalRange::getString(SCCOL nCol, SCROW nRow) const
+{
+    if (nCol >= mnCols || nRow >= mnRows)
+        return OUString();
+
+    return mpMatrix->GetString(nCol, nRow);
+}
+
+SCCOL ScDBExternalRange::getFirstFieldColumn() const
+{
+    return 0;
+}
+
+SCCOL ScDBExternalRange::findFieldColumn(SCCOL nIndex) const
+{
+    if (nIndex < 1)
+        // 1st field
+        return 0;
+
+    if (nIndex > mnCols)
+        // last field
+        return mnCols - 1;
+
+    return nIndex - 1;
+}
+
+SCCOL ScDBExternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr) const
+{
+    if (pErr)
+        pErr = 0;
+
+    OUString aUpper = rStr;
+    lcl_toUpper(aUpper);
+    for (SCCOL i = 0; i < mnCols; ++i)
+    {
+        OUString aUpperVal = mpMatrix->GetString(i, 0);
+        lcl_toUpper(aUpperVal);
+        if (aUpper.equals(aUpperVal))
+            return i;
+    }
+    return -1;
+}
+
+ScDBQueryParamBase* ScDBExternalRange::createQueryParam(const ScDBRangeBase* pQueryRef) const
+{
+    auto_ptr<ScDBQueryParamMatrix> pParam(new ScDBQueryParamMatrix);
+    pParam->mpMatrix = mpMatrix;
+    fillQueryOptions(pParam.get());
+
+    // Now construct the query entries from the query range.
+    if (!pQueryRef->fillQueryEntries(pParam.get(), this))
+        return NULL;
+
+    return pParam.release();
+}
+
+bool ScDBExternalRange::isRangeEqual(const ScRange& /*rRange*/) const
+{
+    return false;
+}
+
diff --git a/sc/source/core/tool/indexmap.cxx b/sc/source/core/tool/indexmap.cxx
deleted file mode 100644
index 4ee5086b3..000000000
--- a/sc/source/core/tool/indexmap.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: indexmap.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sc.hxx"
-
-
-
-
-
-#include <memory.h>
-
-#include "indexmap.hxx"
-
-
-ScIndexMap::ScIndexMap( USHORT nEntries )
-{
-    nCount = nEntries;
-    ULONG nC = nEntries ? ((ULONG) nEntries * 2) : 2;
-    pMap = new USHORT [ nC ];
-    memset( pMap, 0, nC * sizeof(USHORT) );
-}
-
-
-ScIndexMap::~ScIndexMap()
-{
-    delete [] pMap;
-}
-
-
-void ScIndexMap::SetPair( USHORT nEntry, USHORT nIndex1, USHORT nIndex2 )
-{
-    if ( nEntry < nCount )
-    {
-        ULONG nOff = (ULONG) nEntry * 2;
-        pMap[nOff] = nIndex1;
-        pMap[nOff+1] = nIndex2;
-    }
-}
-
-
-USHORT ScIndexMap::Find( USHORT nIndex1 ) const
-{
-    USHORT* pStop = pMap + (ULONG) nCount * 2;
-    for ( USHORT* pOff = pMap; pOff < pStop; pOff += 2 )
-    {
-        if ( *pOff == nIndex1 )
-            return *(pOff+1);
-    }
-    return nIndex1;
-}
-
-
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 18f162d11..9d228da85 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -67,12 +67,15 @@
 #include <string.h>
 #include <math.h>
 #include <vector>
+#include <memory>
 #include "cellkeytranslator.hxx"
 #include "lookupcache.hxx"
 #include "rangenam.hxx"
 #include "compiler.hxx"
 #include "externalrefmgr.hxx"
 #include <basic/sbstar.hxx>
+#include "doubleref.hxx"
+#include "queryparam.hxx"
 
 #define SC_DOUBLE_MAXVALUE  1.7e307
 
@@ -83,6 +86,8 @@ ScTokenStack* ScInterpreter::pGlobalStack = NULL;
 BOOL ScInterpreter::bGlobalStackInUse = FALSE;
 
 using namespace formula;
+using ::std::auto_ptr;
+
 //-----------------------------------------------------------------------------
 // Funktionen
 //-----------------------------------------------------------------------------
@@ -735,8 +740,8 @@ double ScInterpreter::CompareFunc( const ScCompare& rComp, ScCompareOptions* pOp
             else if (rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL)
             {
                 ::utl::TransliterationWrapper* pTransliteration = 
-                    (pOptions->bIgnoreCase ? ScGlobal::pTransliteration : 
-                     ScGlobal::pCaseTransliteration);
+                    (pOptions->bIgnoreCase ? ScGlobal::GetpTransliteration() : 
+                     ScGlobal::GetCaseTransliteration());
                 bool bMatch;
                 if (pOptions->bMatchWholeCell)
                     bMatch = pTransliteration->isEqual( *rComp.pVal[0], *rComp.pVal[1]);
@@ -753,17 +758,17 @@ double ScInterpreter::CompareFunc( const ScCompare& rComp, ScCompareOptions* pOp
                 fRes = (bMatch ? 0 : 1);
             }
             else if (pOptions->bIgnoreCase)
-                fRes = (double) ScGlobal::pCollator->compareString(
+                fRes = (double) ScGlobal::GetCollator()->compareString(
                         *rComp.pVal[ 0 ], *rComp.pVal[ 1 ] );
             else
-                fRes = (double) ScGlobal::pCaseCollator->compareString(
+                fRes = (double) ScGlobal::GetCaseCollator()->compareString(
                         *rComp.pVal[ 0 ], *rComp.pVal[ 1 ] );
         }
         else if (pDok->GetDocOptions().IsIgnoreCase())
-            fRes = (double) ScGlobal::pCollator->compareString(
+            fRes = (double) ScGlobal::GetCollator()->compareString(
                 *rComp.pVal[ 0 ], *rComp.pVal[ 1 ] );
         else
-            fRes = (double) ScGlobal::pCaseCollator->compareString(
+            fRes = (double) ScGlobal::GetCaseCollator()->compareString(
                 *rComp.pVal[ 0 ], *rComp.pVal[ 1 ] );
     }
     return fRes;
@@ -1877,7 +1882,7 @@ void ScInterpreter::ScCell()
             String          aFuncResult;
             ScBaseCell*     pCell = GetCell( aCellPos );
 
-            ScCellKeywordTranslator::transKeyword(aInfoType, ScGlobal::pLocale, ocCell);
+            ScCellKeywordTranslator::transKeyword(aInfoType, ScGlobal::GetLocale(), ocCell);
 
 // *** ADDRESS INFO ***
             if( aInfoType.EqualsAscii( "COL" ) )
@@ -3964,7 +3969,7 @@ static sal_Int32 lcl_CompareMatrix2Query( SCSIZE i, const ScMatrix& rMat,
     const String& rStr1 = rMat.GetString(i);
     const String& rStr2 = *rEntry.pStr;
 
-    return ScGlobal::pCollator->compareString( rStr1, rStr2); // case-insensitive
+    return ScGlobal::GetCollator()->compareString( rStr1, rStr2); // case-insensitive
 }
 
 /** returns the last item with the identical value as the original item
@@ -4146,7 +4151,7 @@ void ScInterpreter::ScMatch()
                 if ( bIsVBAMode )
                     rParam.bRegExp = FALSE;
                 else
-                    rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
+                rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
             }
 
             if (pMatSrc) // The source data is matrix array.
@@ -5377,12 +5382,13 @@ void ScInterpreter::CalculateLookup(BOOL HLookup)
                     String aParamStr = *rEntry.pStr;
                     if ( bSorted )
                     {
+                        static CollatorWrapper* pCollator = ScGlobal::GetCollator();
                         for (SCSIZE i = 0; i < nMatCount; i++)
                         {
                             if (HLookup ? pMat->IsString(i, 0) : pMat->IsString(0, i))
                             {
                                 sal_Int32 nRes =
-                                    ScGlobal::pCollator->compareString( HLookup ? pMat->GetString(i,0) : pMat->GetString(0,i), aParamStr);
+                                    pCollator->compareString( HLookup ? pMat->GetString(i,0) : pMat->GetString(0,i), aParamStr);
                                 if (nRes <= 0)
                                     nDelta = i;
                                 else if (i>0)   // #i2168# ignore first mismatch
@@ -5398,7 +5404,7 @@ void ScInterpreter::CalculateLookup(BOOL HLookup)
                         {
                             if (HLookup ? pMat->IsString(i, 0) : pMat->IsString(0, i))
                             {
-                                if ( ScGlobal::pTransliteration->isEqual(
+                                if ( ScGlobal::GetpTransliteration()->isEqual(
                                     HLookup ? pMat->GetString(i,0) : pMat->GetString(0,i), aParamStr ) )
                                 {
                                     nDelta = i;
@@ -5620,11 +5626,9 @@ void ScInterpreter::ScSubTotal()
 #endif
 
 
-BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam,
-        BOOL& rMissingField )
+ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::GetDBParams" );
-    BOOL bRet = FALSE;
     BOOL bAllowMissingField = FALSE;
     if ( rMissingField )
     {
@@ -5633,14 +5637,10 @@ BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam,
     }
     if ( GetByte() == 3 )
     {
-
-        SCCOL nQCol1;
-        SCROW nQRow1;
-        SCTAB nQTab1;
-        SCCOL nQCol2;
-        SCROW nQRow2;
-        SCTAB nQTab2;
-        PopDoubleRef(nQCol1, nQRow1, nQTab1, nQCol2, nQRow2, nQTab2);
+        // First, get the query criteria range.
+        ::std::auto_ptr<ScDBRangeBase> pQueryRef( PopDoubleRef() );
+        if (!pQueryRef.get())
+            return NULL;
 
         BOOL    bByVal = TRUE;
         double  nVal = 0.0;
@@ -5696,116 +5696,85 @@ BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam,
                 SetError( errIllegalParameter );
         }
 
-        SCCOL nDBCol1;
-        SCROW nDBRow1;
-        SCTAB nDBTab1;
-        SCCOL nDBCol2;
-        SCROW nDBRow2;
-        SCTAB nDBTab2;
-        PopDoubleRef(nDBCol1, nDBRow1, nDBTab1, nDBCol2, nDBRow2, nDBTab2);
+        auto_ptr<ScDBRangeBase> pDBRef( PopDoubleRef() );
+
+        if (nGlobalError || !pDBRef.get())
+            return NULL;
 
-        if ( nGlobalError == 0 && bRangeFake )
+        if ( bRangeFake )
         {
             // range parameter must match entire database range
-            if ( aMissingRange == ScRange( nDBCol1, nDBRow1, nDBTab1, nDBCol2,
-                        nDBRow2, nDBTab2) )
+            if (pDBRef->isRangeEqual(aMissingRange))
                 rMissingField = TRUE;
             else
                 SetError( errIllegalParameter );
         }
-        
-        if (nGlobalError == 0)
+
+        if (nGlobalError)
+            return NULL;
+
+        SCCOL nField = pDBRef->getFirstFieldColumn();
+        if (rMissingField)
+            ; // special case
+        else if (bByVal)
+            nField = pDBRef->findFieldColumn(static_cast<SCCOL>(nVal));
+        else
         {
-            SCCOL   nField = nDBCol1;
-            BOOL    bFound = TRUE;
+            sal_uInt16 nErr = 0;    
+            nField = pDBRef->findFieldColumn(aStr, &nErr);
+            SetError(nErr);
+        }
+
+        if (!ValidCol(nField))
+            return NULL;
+
+        auto_ptr<ScDBQueryParamBase> pParam( pDBRef->createQueryParam(pQueryRef.get()) );
+
+        if (pParam.get())
+        {
+            // An allowed missing field parameter sets the result field
+            // to any of the query fields, just to be able to return
+            // some cell from the iterator.        
             if ( rMissingField )
-                ;   // special case
-            else if ( bByVal )
-            {
-                if ( nVal <= 0 || nVal > (nDBCol2 - nDBCol1 + 1) )
-                    bFound = FALSE;
-                else
-                    nField = Min(nDBCol2, (SCCOL)(nDBCol1 + (SCCOL)nVal - 1));
-            }
-            else
+                nField = static_cast<SCCOL>(pParam->GetEntry(0).nField);
+            pParam->mnField = nField;
+
+            SCSIZE nCount = pParam->GetEntryCount();
+            for ( SCSIZE i=0; i < nCount; i++ )
             {
-                bFound = FALSE;
-                String aCellStr;
-                ScAddress aLook( nDBCol1, nDBRow1, nDBTab1 );
-                while (!bFound && (aLook.Col() <= nDBCol2))
-                {
-                    ScBaseCell* pCell = GetCell( aLook );
-                    GetCellString( aCellStr, pCell );
-                    bFound = ScGlobal::pTransliteration->isEqual( aCellStr, aStr );
-                    if (!bFound)
-                        aLook.IncCol();
-                }
-                nField = aLook.Col();
-            }
-            if (bFound)
-            {
-                rParam.nCol1 = nDBCol1;
-                rParam.nRow1 = nDBRow1;
-                rParam.nCol2 = nDBCol2;
-                rParam.nRow2 = nDBRow2;
-                rParam.nTab  = nDBTab1;
-                rParam.bHasHeader = TRUE;
-                rParam.bByRow = TRUE;
-                rParam.bInplace = TRUE;
-                rParam.bCaseSens = FALSE;
-                rParam.bRegExp = FALSE;
-                rParam.bDuplicate = TRUE;
-                if (pDok->CreateQueryParam(nQCol1, nQRow1, nQCol2, nQRow2, nQTab1, rParam))
-                {
-                    // An allowed missing field parameter sets the result field
-                    // to any of the query fields, just to be able to return
-                    // some cell from the iterator.
-                    if ( rMissingField )
-                        nField = static_cast<SCCOL>(rParam.GetEntry(0).nField);
-
-                    rParam.nCol1 = nField;
-                    rParam.nCol2 = nField;
-                    rTab = nDBTab1;
-                    bRet = TRUE;
-                    SCSIZE nCount = rParam.GetEntryCount();
-                    for ( SCSIZE i=0; i < nCount; i++ )
-                    {
-                        ScQueryEntry& rEntry = rParam.GetEntry(i);
-                        if ( rEntry.bDoQuery )
-                        {
-                            sal_uInt32 nIndex = 0;
-                            rEntry.bQueryByString = !pFormatter->IsNumberFormat(
-                                *rEntry.pStr, nIndex, rEntry.nVal );
-                            if ( rEntry.bQueryByString && !rParam.bRegExp )
-                                rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
-                        }
-                        else
-                            break;  // for
-                    }
+                ScQueryEntry& rEntry = pParam->GetEntry(i);
+                if ( rEntry.bDoQuery )
+                {
+                    sal_uInt32 nIndex = 0;
+                    rEntry.bQueryByString = !pFormatter->IsNumberFormat(
+                        *rEntry.pStr, nIndex, rEntry.nVal );
+                    if ( rEntry.bQueryByString && !pParam->bRegExp )
+                        pParam->bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
                 }
+                else
+                    break;  // for
             }
+            return pParam.release();
         }
     }
-    return bRet;
+    return false;
 }
 
 
 void ScInterpreter::DBIterator( ScIterFunc eFunc )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::DBIterator" );
-    SCTAB nTab1;
     double nErg = 0.0;
     double fMem = 0.0;
     BOOL bNull = TRUE;
     ULONG nCount = 0;
-    ScQueryParam aQueryParam;
     BOOL bMissingField = FALSE;
-    if ( GetDBParams( nTab1, aQueryParam, bMissingField) )
+    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+    if (pQueryParam.get())
     {
-        double nVal;
-        USHORT nErr;
-        ScQueryValueIterator aValIter(pDok, nTab1, aQueryParam);
-        if ( aValIter.GetFirst(nVal, nErr) && !nErr )
+        ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());
+        ScDBQueryDataIterator::Value aValue;
+        if ( aValIter.GetFirst(aValue) && !aValue.mnError )
         {
             switch( eFunc )
             {
@@ -5821,24 +5790,24 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc )
                 {
                     case ifAVERAGE:
                     case ifSUM:
-                        if ( bNull && nVal != 0.0 )
+                        if ( bNull && aValue.mfValue != 0.0 )
                         {
                             bNull = FALSE;
-                            fMem = nVal;
+                            fMem = aValue.mfValue;
                         }
                         else
-                            nErg += nVal;
+                            nErg += aValue.mfValue;
                         break;
-                    case ifSUMSQ:   nErg += nVal * nVal; break;
-                    case ifPRODUCT: nErg *= nVal; break;
-                    case ifMAX:     if( nVal > nErg ) nErg = nVal; break;
-                    case ifMIN:     if( nVal < nErg ) nErg = nVal; break;
+                    case ifSUMSQ:   nErg += aValue.mfValue * aValue.mfValue; break;
+                    case ifPRODUCT: nErg *= aValue.mfValue; break;
+                    case ifMAX:     if( aValue.mfValue > nErg ) nErg = aValue.mfValue; break;
+                    case ifMIN:     if( aValue.mfValue < nErg ) nErg = aValue.mfValue; break;
                     default: ; // nothing
                 }
             }
-            while ( aValIter.GetNext(nVal, nErr) && !nErr );
+            while ( aValIter.GetNext(aValue) && !aValue.mnError );
         }
-        SetError(nErr);
+        SetError(aValue.mnError);
     }
     else
         SetError( errIllegalParameter);
@@ -5863,13 +5832,12 @@ void ScInterpreter::ScDBSum()
 void ScInterpreter::ScDBCount()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScDBCount" );
-    SCTAB nTab;
-    ScQueryParam aQueryParam;
     BOOL bMissingField = TRUE;
-    if ( GetDBParams( nTab, aQueryParam, bMissingField) )
+    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+    if (pQueryParam.get())
     {
         ULONG nCount = 0;
-        if ( bMissingField )
+        if ( bMissingField && pQueryParam->GetType() == ScDBQueryParamBase::INTERNAL )
         {   // count all matching records
             // TODO: currently the QueryIterators only return cell pointers of
             // existing cells, so if a query matches an empty cell there's
@@ -5879,7 +5847,9 @@ void ScInterpreter::ScDBCount()
             // have to live with it until we reimplement the iterators to also
             // return empty cells, which would mean to adapt all callers of
             // iterators.
-            ScQueryCellIterator aCellIter( pDok, nTab, aQueryParam);
+            ScDBQueryParamInternal* p = static_cast<ScDBQueryParamInternal*>(pQueryParam.get());
+            SCTAB nTab = p->nTab;
+            ScQueryCellIterator aCellIter( pDok, nTab, *p);
             if ( aCellIter.GetFirst() )
             {
                 do
@@ -5890,17 +5860,17 @@ void ScInterpreter::ScDBCount()
         }
         else
         {   // count only matching records with a value in the "result" field
-            double nVal;
-            USHORT nErr = 0;
-            ScQueryValueIterator aValIter( pDok, nTab, aQueryParam);
-            if ( aValIter.GetFirst( nVal, nErr) && !nErr )
+            ScDBQueryDataIterator aValIter( pDok, pQueryParam.release());
+            ScDBQueryDataIterator::Value aValue;
+            if ( aValIter.GetFirst(aValue) && !aValue.mnError )
             {
                 do
                 {
                     nCount++;
-                } while ( aValIter.GetNext( nVal, nErr) && !nErr );
+                } 
+                while ( aValIter.GetNext(aValue) && !aValue.mnError );
             }
-            SetError( nErr );
+            SetError(aValue.mnError);
         }
         PushDouble( nCount );
     }
@@ -5912,21 +5882,24 @@ void ScInterpreter::ScDBCount()
 void ScInterpreter::ScDBCount2()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScDBCount2" );
-    SCTAB nTab;
-    ScQueryParam aQueryParam;
     BOOL bMissingField = TRUE;
-    if (GetDBParams( nTab, aQueryParam, bMissingField))
+    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+    if (pQueryParam.get())
     {
         ULONG nCount = 0;
-        ScQueryCellIterator aCellIter(pDok, nTab, aQueryParam);
-        if ( aCellIter.GetFirst() )
+        pQueryParam->mbSkipString = false;
+        ScDBQueryDataIterator aValIter( pDok, pQueryParam.release());
+        ScDBQueryDataIterator::Value aValue;
+        if ( aValIter.GetFirst(aValue) && !aValue.mnError )
         {
             do
             {
                 nCount++;
-            } while ( aCellIter.GetNext() );
+            } 
+            while ( aValIter.GetNext(aValue) && !aValue.mnError );
         }
-        PushDouble(nCount);
+        SetError(aValue.mnError);
+        PushDouble( nCount );
     }
     else
         PushIllegalParameter();
@@ -5970,25 +5943,23 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount )
 
     rValCount = 0.0;
     double fSum    = 0.0;
-    SCTAB nTab;
-    ScQueryParam aQueryParam;
     BOOL bMissingField = FALSE;
-    if (GetDBParams( nTab, aQueryParam, bMissingField))
+    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+    if (pQueryParam.get())
     {
-        double fVal;
-        USHORT nErr;
-        ScQueryValueIterator aValIter(pDok, nTab, aQueryParam);
-        if (aValIter.GetFirst(fVal, nErr) && !nErr)
+        ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());
+        ScDBQueryDataIterator::Value aValue;
+        if (aValIter.GetFirst(aValue) && !aValue.mnError)
         {
             do
             {
                 rValCount++;
-                values.push_back(fVal);
-                fSum += fVal;
+                values.push_back(aValue.mfValue);
+                fSum += aValue.mfValue;
             }
-            while ((nErr == 0) && aValIter.GetNext(fVal, nErr));
+            while ((aValue.mnError == 0) && aValIter.GetNext(aValue));
         }
-        SetError(nErr);
+        SetError(aValue.mnError);
     }
     else
         SetError( errIllegalParameter);
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index b4949fa61..70c6fe5b8 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2849,76 +2849,6 @@ void ScInterpreter::ScBahtText()
 
 // ============================================================================
 
-void ScInterpreter::ScPhoneticString()
-{
-    BYTE nParamCount = GetByte();
-    if ( MustHaveParamCountMin( nParamCount, 1 ) )
-    {
-        String aPhoneticText;
-        while( nParamCount-- )
-        {
-            if ( nGlobalError )
-            {
-                PushError(nGlobalError);
-                return;
-            }
-
-            switch ( GetStackType() )
-            {
-                case svSingleRef :
-                {
-                    ScAddress aAdr;
-                    PopSingleRef( aAdr );
-                    if (nGlobalError)
-                    {
-                        PushError(nGlobalError);
-                        return;
-                    }
-
-                    ScBaseCell* pCell = GetCell( aAdr );
-                    if ( HasCellStringData( pCell ) )
-                    {
-                        String aStr;
-                        GetCellPhoneticString( aStr, pCell );
-                        aPhoneticText += aStr;
-                    }
-                }
-                break;
-                case svDoubleRef:
-                {
-                    ScRange aRange;
-                    PopDoubleRef( aRange );
-                    if (nGlobalError)
-                    {
-                        PushError(nGlobalError);
-                        return;
-                    }
-
-                    ScCellIterator aIter( pDok, aRange );
-                    ScBaseCell *pCell = aIter.GetFirst();
-                    while ( pCell )
-                    {
-                        if ( HasCellStringData( pCell ) )
-                        {
-                            String aStr;
-                            GetCellPhoneticString( aStr, pCell );
-                            aPhoneticText += aStr;
-                        }
-                        pCell = aIter.GetNext();
-                    }
-                }
-                break;
-                default:
-                    PushError(errIllegalParameter);
-                    return;
-            }
-        }
-        PushString( aPhoneticText );
-    }
-}
-
-// ============================================================================
-
 void ScInterpreter::ScGetPivotData()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScGetPivotData" );
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 5419420d2..de59c7186 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -74,17 +74,20 @@
 #include "externalrefmgr.hxx"
 #include "formula/FormulaCompiler.hxx"
 #include "macromgr.hxx"
+#include "doubleref.hxx"
 
 #include <math.h>
 #include <float.h>
 #include <map>
 #include <algorithm>
 #include <functional>
+#include <memory>
 #include <vbahelper/vbahelper.hxx>
 #include <basic/basmgr.hxx>
 
 using namespace com::sun::star;
 using namespace formula;
+using ::std::auto_ptr;
 
 #define ADDIN_MAXSTRLEN 256
 
@@ -364,189 +367,6 @@ void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
     SetError(nErr);
 }
 
-static sal_Bool lcl_IsHalfWidthKatakana ( const String& rString )
-{
-    sal_Int32 nLen = rString.Len();
-
-    for ( sal_Int32 i = 0; i < nLen; ++i )
-    {
-        if ( rString.GetChar(i) < 0xFF00 || rString.GetChar(i) > 0xFFEF )
-            return sal_False;
-    }
-
-    return sal_True;
-}
-
-static sal_Bool lcl_IsFullWidthKatakana ( const String& rString )
-{
-    sal_Int32 nLen = rString.Len();
-
-    for ( sal_Int32 i = 0; i < nLen; ++i )
-    {
-        if ( rString.GetChar(i) < 0x30A0 || rString.GetChar(i) > 0x30FF )
-            return sal_False;
-    }
-
-    return sal_True;
-}
-
-static sal_Bool lcl_IsFullWidthHiragana ( const String& rString )
-{
-    sal_Int32 nLen = rString.Len();
-
-    for ( sal_Int32 i = 0; i < nLen; ++i )
-    {
-        if ( rString.GetChar(i) < 0x3040 || rString.GetChar(i) > 0x309F )
-            return sal_False;
-    }
-
-    return sal_True;
-}
-
-static sal_uInt16 lcl_GetKanaType ( const String rText )
-{
-    sal_uInt16 aKanaType = 0;
-
-    if ( lcl_IsHalfWidthKatakana ( rText ) )
-        aKanaType = 0x00;
-    else if ( lcl_IsFullWidthKatakana ( rText ) )
-        aKanaType = 0x01;
-    else if ( lcl_IsFullWidthHiragana ( rText ) )
-        aKanaType = 0x02;
-
-    return aKanaType;
-}
-
-static void lcl_ConvertToKatakana( ScDocument* pDoc, String& rStr )
-{
-    sal_uInt16 nKanaType = lcl_GetKanaType(rStr);
-    sal_Int32 nType = com::sun::star::i18n::TransliterationModules_HIRAGANA_KATAKANA;
-    switch (nKanaType)
-    {
-        case 0x00:
-            // half-width katakana or full-width alphabet.
-            nType = com::sun::star::i18n::TransliterationModules_HALFWIDTH_FULLWIDTH;
-        break;
-        case 0x02:
-            // full-width hiragana.
-            nType = com::sun::star::i18n::TransliterationModules_HIRAGANA_KATAKANA;
-        break;
-        case 0x01:
-        default:
-            // full-width katakana.  no need to convert this.
-            return;
-    }
-    utl::TransliterationWrapper aTranslitarationWrapper( pDoc->GetServiceManager(), nType );
-    com::sun::star::uno::Sequence<sal_Int32> aOffsets;
-    rStr = aTranslitarationWrapper.transliterate( rStr, LANGUAGE_JAPANESE, 0, rStr.Len(), &aOffsets );
-}
-
-static void lcl_GetPhoneticString ( ScDocument *pDoc, String& rStr, const ScBaseCell* pCell )
-{
-    ScPhonetic aPhonetic;
-    String aBaseString;
-    switch (pCell->GetCellType())
-    {
-        case CELLTYPE_STRING:
-            static_cast<const ScStringCell*>(pCell)->GetString(aBaseString);
-            static_cast<const ScAsianStringCell*>(pCell)->GetPhonetic(aPhonetic);
-        break;
-        case CELLTYPE_EDIT:
-            static_cast<const ScEditCell*>(pCell)->GetString(aBaseString);
-            static_cast<const ScAsianEditCell*>(pCell)->GetPhonetic(aPhonetic);
-        break;
-        default:
-            // Not a supported cell type.
-            return;
-    }
-    
-    if (aPhonetic.IsEmpty())
-        // No phonetic string exists.  Bail out.
-        return;
-
-    const String& rPhoneticString = aPhonetic.GetString();
-    PhoneticPortionVec portions = aPhonetic.GetPortions();
-    sal_uInt16 nPortionCount = portions.size();
-
-    String tmpString;
-    if ( nPortionCount > 0 )
-    {
-        sal_uInt16 pos = 0;
-        for ( sal_uInt16 idx = 0; idx < nPortionCount; ++idx )
-        {
-            const PhoneticPortion& portion = portions[idx];
-
-            // Get the end position in the phonetic text.
-            sal_uInt16 nPhEndPos = idx < nPortionCount-1 ? portions[idx+1].mncpa : rPhoneticString.Len();
-
-            tmpString += aBaseString.Copy(pos, portion.mncpm - pos);
-            pos = portion.mncpm + portion.mnccm;
-            tmpString += rPhoneticString.Copy(portion.mncpa, nPhEndPos - portion.mncpa);
-        }
-        if ( pos < aBaseString.Len() )
-            tmpString += aBaseString.Copy(pos, aBaseString.Len() - pos);
-    }
-    else
-    {
-        tmpString = rPhoneticString;
-    }
-
-    sal_Int32 nType;
-    switch ( lcl_GetKanaType ( rPhoneticString ))
-    {
-        case 0x00:
-            nType = com::sun::star::i18n::TransliterationModules_FULLWIDTH_HALFWIDTH;
-            break;
-        case 0x01:
-            nType = com::sun::star::i18n::TransliterationModules_HIRAGANA_KATAKANA;
-            break;
-        case 0x02:
-            nType = com::sun::star::i18n::TransliterationModules_KATAKANA_HIRAGANA;
-            break;
-        default:
-            nType = com::sun::star::i18n::TransliterationModules_HIRAGANA_KATAKANA;
-            break;
-    }
-
-    utl::TransliterationWrapper aTranslitarationWrapper( pDoc->GetServiceManager(), nType );
-    com::sun::star::uno::Sequence<sal_Int32> aOffsets;
-    rStr = aTranslitarationWrapper.transliterate( tmpString, LANGUAGE_JAPANESE, 0, tmpString.Len(), &aOffsets );
-}
-
-void ScInterpreter::GetCellPhoneticString( String& rStr, const ScBaseCell* pCell )
-{
-    USHORT nErr = 0;
-    if ( pCell )
-    {
-        switch ( pCell->GetCellType() )
-        {
-            case CELLTYPE_STRING:
-                if ( static_cast<const ScStringCell*>(pCell)->HasPhonetic() )
-                    lcl_GetPhoneticString(pDok, rStr, pCell);
-                else
-                {    
-                    static_cast<const ScStringCell*>(pCell)->GetString(rStr);
-                    lcl_ConvertToKatakana(pDok, rStr);
-                }
-            break;
-            case CELLTYPE_EDIT:
-                if ( static_cast<const ScEditCell*>(pCell)->HasPhonetic() )
-                    lcl_GetPhoneticString(pDok, rStr, pCell);
-                else
-                {    
-                    static_cast<const ScEditCell*>(pCell)->GetString(rStr);
-                    lcl_ConvertToKatakana(pDok, rStr);
-                }
-            break;
-            default:
-                rStr = ScGlobal::GetEmptyString();
-            break;
-        }
-    }
-    else
-        rStr = ScGlobal::GetEmptyString();
-    SetError(nErr);
-}
 
 BOOL ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                             SCCOL nCol2, SCROW nRow2, SCTAB nTab2, BYTE* pCellArr)
@@ -1227,6 +1047,44 @@ void ScInterpreter::DoubleRefToVars( const ScToken* p,
     }
 }
 
+ScDBRangeBase* ScInterpreter::PopDoubleRef()
+{
+    if (!sp)
+    {    
+        SetError(errUnknownStackVariable);
+        return NULL;
+    }
+
+    --sp;
+    FormulaToken* p = pStack[sp];
+    switch (p->GetType())
+    {
+        case svError:
+            nGlobalError = p->GetError();
+        break;
+        case svDoubleRef:
+        {
+            SCCOL nCol1, nCol2;
+            SCROW nRow1, nRow2;
+            SCTAB nTab1, nTab2;
+            DoubleRefToVars(static_cast<ScToken*>(p), 
+                            nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, false);
+            
+            return new ScDBInternalRange(pDok,
+                ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2));
+        }
+        break;
+        case svMatrix:
+        {
+            ScMatrixRef pMat = static_cast<ScToken*>(p)->GetMatrix();
+            return new ScDBExternalRange(pDok, pMat);
+        }
+        break;
+        default:
+            SetError( errIllegalParameter);
+    }
+    return NULL;
+}
 
 void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
                                  SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
@@ -2066,78 +1924,37 @@ ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix( double& rDouble,
 void ScInterpreter::ScDBGet()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike.Rathke@sun.com", "ScInterpreter::ScDBGet" );
-    SCTAB nTab;
-    ScQueryParam aQueryParam;
     BOOL bMissingField = FALSE;
-    if (GetDBParams( nTab, aQueryParam, bMissingField))
+    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+    if (!pQueryParam.get())
     {
-        ScBaseCell* pCell;
-        ScQueryCellIterator aCellIter(pDok, nTab, aQueryParam);
-        if ( (pCell = aCellIter.GetFirst()) != NULL )
-        {
-            if (aCellIter.GetNext())
-                PushIllegalArgument();
-            else
-            {
-                switch (pCell->GetCellType())
-                {
-                    case CELLTYPE_VALUE:
-                    {
-                        double rValue = ((ScValueCell*)pCell)->GetValue();
-                        if ( bCalcAsShown )
-                        {
-                            ULONG nFormat;
-                            nFormat = aCellIter.GetNumberFormat();
-                            rValue = pDok->RoundValueAsShown( rValue, nFormat );
-                        }
-                        PushDouble(rValue);
-                    }
-                    break;
-                    case CELLTYPE_STRING:
-                    {
-                        String rString;
-                        ((ScStringCell*)pCell)->GetString(rString);
-                        PushString(rString);
-                    }
-                    break;
-                    case CELLTYPE_EDIT:
-                    {
-                        String rString;
-                        ((ScEditCell*)pCell)->GetString(rString);
-                        PushString(rString);
-                    }
-                    break;
-                    case CELLTYPE_FORMULA:
-                    {
-                        USHORT rErr = ((ScFormulaCell*)pCell)->GetErrCode();
-                        if (rErr)
-                            PushError(rErr);
-                        else if (((ScFormulaCell*)pCell)->IsValue())
-                        {
-                            double rValue = ((ScFormulaCell*)pCell)->GetValue();
-                            PushDouble(rValue);
-                        }
-                        else
-                        {
-                            String rString;
-                            ((ScFormulaCell*)pCell)->GetString(rString);
-                            PushString(rString);
-                        }
-                    }
-                    break;
-                    case CELLTYPE_NONE:
-                    case CELLTYPE_NOTE:
-                    default:
-                        PushIllegalArgument();
-                    break;
-                }
-            }
-        }
-        else
-            PushNoValue();
+        // Failed to create query param.
+        PushIllegalParameter();
+        return;
+    }
+
+    pQueryParam->mbSkipString = false;
+    ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());
+    ScDBQueryDataIterator::Value aValue;
+    if (!aValIter.GetFirst(aValue) || aValue.mnError)
+    {
+        // No match found.
+        PushNoValue();
+        return;
+    }
+
+    ScDBQueryDataIterator::Value aValNext;
+    if (aValIter.GetNext(aValNext) && !aValNext.mnError)
+    {
+        // There should be only one unique match.
+        PushIllegalArgument();
+        return;
     }
+
+    if (aValue.mbIsNumber)
+        PushDouble(aValue.mfValue);
     else
-        PushIllegalParameter();
+        PushString(aValue.maString);
 }
 
 
@@ -2805,7 +2622,7 @@ void ScInterpreter::ScMacro()
 					bOk = lcl_setVBARange( aRange, pDok, pPar );
 				}
 				else
-					bOk = SetSbxVariable( pPar, aAdr );
+                bOk = SetSbxVariable( pPar, aAdr );
             }
             break;
             case svDoubleRef:
@@ -2831,27 +2648,27 @@ void ScInterpreter::ScMacro()
 					}
 					else
 					{
-						SbxDimArrayRef refArray = new SbxDimArray;
-						refArray->AddDim32( 1, nRow2 - nRow1 + 1 );
-						refArray->AddDim32( 1, nCol2 - nCol1 + 1 );
-						ScAddress aAdr( nCol1, nRow1, nTab1 );
-						for( SCROW nRow = nRow1; bOk && nRow <= nRow2; nRow++ )
-						{
-							aAdr.SetRow( nRow );
-							INT32 nIdx[ 2 ];
-							nIdx[ 0 ] = nRow-nRow1+1;
-							for( SCCOL nCol = nCol1; bOk && nCol <= nCol2; nCol++ )
-							{
-								aAdr.SetCol( nCol );
-								nIdx[ 1 ] = nCol-nCol1+1;
-								SbxVariable* p = refArray->Get32( nIdx );
-								bOk = SetSbxVariable( p, aAdr );
-							}
+                    SbxDimArrayRef refArray = new SbxDimArray;
+                    refArray->AddDim32( 1, nRow2 - nRow1 + 1 );
+                    refArray->AddDim32( 1, nCol2 - nCol1 + 1 );
+                    ScAddress aAdr( nCol1, nRow1, nTab1 );
+                    for( SCROW nRow = nRow1; bOk && nRow <= nRow2; nRow++ )
+                    {
+                        aAdr.SetRow( nRow );
+                        INT32 nIdx[ 2 ];
+                        nIdx[ 0 ] = nRow-nRow1+1;
+                        for( SCCOL nCol = nCol1; bOk && nCol <= nCol2; nCol++ )
+                        {
+                            aAdr.SetCol( nCol );
+                            nIdx[ 1 ] = nCol-nCol1+1;
+                            SbxVariable* p = refArray->Get32( nIdx );
+                            bOk = SetSbxVariable( p, aAdr );
                         }
-						pPar->PutObject( refArray );
                     }
+                    pPar->PutObject( refArray );
                 }
             }
+            }
             break;
             case svMatrix:
             {
@@ -4064,7 +3881,6 @@ StackVar ScInterpreter::Interpret()
                 case ocInfo             : ScInfo();                     break;
                 case ocHyperLink        : ScHyperLink();                break;
                 case ocBahtText         : ScBahtText();                 break;
-                case ocPhonetic         : ScPhoneticString();           break;
                 case ocGetPivotData     : ScGetPivotData();             break;
                 case ocJis              : ScJis();                      break;
                 case ocAsc              : ScAsc();                      break;
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 854c25dec..9417c0e30 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -2831,7 +2831,7 @@ void ScInterpreter::ScInfo()
     if( MustHaveParamCount( GetByte(), 1 ) )
     {
         String aStr = GetString();
-        ScCellKeywordTranslator::transKeyword(aStr, ScGlobal::pLocale, ocInfo);
+        ScCellKeywordTranslator::transKeyword(aStr, ScGlobal::GetLocale(), ocInfo);
         if( aStr.EqualsAscii( "SYSTEM" ) )
             PushString( String( RTL_CONSTASCII_USTRINGPARAM( SC_INFO_OSVERSION ) ) );
         else if( aStr.EqualsAscii( "OSVERSION" ) )
diff --git a/sc/source/core/tool/makefile.mk b/sc/source/core/tool/makefile.mk
index 012831050..041d2c89a 100644
--- a/sc/source/core/tool/makefile.mk
+++ b/sc/source/core/tool/makefile.mk
@@ -76,11 +76,11 @@ SLOFILES =  \
         $(SLO)$/detdata.obj  \
         $(SLO)$/detfunc.obj  \
         $(SLO)$/docoptio.obj \
+		$(SLO)$/doubleref.obj \
         $(SLO)$/editutil.obj \
         $(SLO)$/filtopt.obj \
         $(SLO)$/formulaparserpool.obj \
         $(SLO)$/hints.obj \
-        $(SLO)$/indexmap.obj \
         $(SLO)$/inputopt.obj \
         $(SLO)$/interpr1.obj \
         $(SLO)$/interpr2.obj \
@@ -96,6 +96,7 @@ SLOFILES =  \
         $(SLO)$/printopt.obj \
         $(SLO)$/prnsave.obj \
         $(SLO)$/progress.obj \
+		$(SLO)$/queryparam.obj \
         $(SLO)$/rangelst.obj \
         $(SLO)$/rangenam.obj \
         $(SLO)$/rangeseq.obj \
@@ -124,6 +125,7 @@ EXCEPTIONSFILES= \
         $(SLO)$/chartlock.obj \
         $(SLO)$/chgtrack.obj \
         $(SLO)$/compiler.obj \
+		$(SLO)$/doubleref.obj \
         $(SLO)$/formulaparserpool.obj \
         $(SLO)$/interpr1.obj \
         $(SLO)$/interpr2.obj \
@@ -132,6 +134,7 @@ EXCEPTIONSFILES= \
         $(SLO)$/interpr5.obj \
         $(SLO)$/lookupcache.obj \
         $(SLO)$/prnsave.obj \
+		$(SLO)$/queryparam.obj \
         $(SLO)$/reftokenhelper.obj \
 		$(SLO)$/stringutil.obj \
         $(SLO)$/token.obj
diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx
index 69e720c78..1ee7d04a0 100644
--- a/sc/source/core/tool/optutil.cxx
+++ b/sc/source/core/tool/optutil.cxx
@@ -54,12 +54,12 @@ BOOL ScOptionsUtil::IsMetricSystem()
 
 //------------------------------------------------------------------
 
-ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString rSubTree ) :
+ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString& rSubTree ) :
     ConfigItem( rSubTree )
 {
 }
 
-ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString rSubTree, sal_Int16 nMode ) :
+ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString& rSubTree, sal_Int16 nMode ) :
     ConfigItem( rSubTree, nMode )
 {
 }
diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
new file mode 100644
index 000000000..059353431
--- /dev/null
+++ b/sc/source/core/tool/queryparam.cxx
@@ -0,0 +1,371 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: interpr4.cxx,v $
+ * $Revision: 1.57.92.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sc.hxx"
+
+// INCLUDE ---------------------------------------------------------------
+
+#include "queryparam.hxx"
+
+using ::std::vector;
+
+// ============================================================================
+
+ScQueryParamBase::ScQueryParamBase()
+{
+    Resize( MAXQUERY );
+    for (USHORT i=0; i<MAXQUERY; i++)
+        maEntries[i].Clear();
+}
+
+ScQueryParamBase::ScQueryParamBase(const ScQueryParamBase& r) :
+    bHasHeader(r.bHasHeader), bByRow(r.bByRow), bInplace(r.bInplace), bCaseSens(r.bCaseSens),
+    bRegExp(r.bRegExp), bDuplicate(r.bDuplicate), bMixedComparison(r.bMixedComparison),
+    maEntries(r.maEntries)
+{
+}
+
+ScQueryParamBase::~ScQueryParamBase()
+{
+}
+
+SCSIZE ScQueryParamBase::GetEntryCount() const
+{
+    return maEntries.size();
+}
+
+ScQueryEntry& ScQueryParamBase::GetEntry(SCSIZE n) const
+{
+    return maEntries[n];
+}
+
+void ScQueryParamBase::Resize(SCSIZE nNew)
+{
+    if ( nNew < MAXQUERY )
+        nNew = MAXQUERY;                // nie weniger als MAXQUERY
+
+    vector<ScQueryEntry> aNewEntries(nNew);
+    SCSIZE nCopy = ::std::min(maEntries.size(), nNew);
+    for (SCSIZE i=0; i<nCopy; i++)
+        aNewEntries[i] = maEntries[i];
+
+    maEntries.swap(aNewEntries);
+}
+
+void ScQueryParamBase::DeleteQuery( SCSIZE nPos )
+{
+    if (nPos >= maEntries.size())
+        return;
+
+    size_t n = maEntries.size();
+    vector<ScQueryEntry> aNewEntries;
+    aNewEntries.reserve(n-1);
+    for (size_t i = 0; i < n; ++i)
+        if (i != nPos)
+            aNewEntries.push_back(maEntries[i]);
+
+    maEntries.swap(aNewEntries);
+}
+
+void ScQueryParamBase::FillInExcelSyntax(String& aCellStr, SCSIZE nIndex)
+{
+    if (aCellStr.Len() > 0)
+    {
+        if ( nIndex >= maEntries.size() )
+            Resize( nIndex+1 );
+
+        ScQueryEntry& rEntry = GetEntry(nIndex);
+
+        rEntry.bDoQuery = TRUE;
+        // Operatoren herausfiltern
+        if (aCellStr.GetChar(0) == '<')
+        {
+            if (aCellStr.GetChar(1) == '>')
+            {
+                *rEntry.pStr = aCellStr.Copy(2);
+                rEntry.eOp   = SC_NOT_EQUAL;
+            }
+            else if (aCellStr.GetChar(1) == '=')
+            {
+                *rEntry.pStr = aCellStr.Copy(2);
+                rEntry.eOp   = SC_LESS_EQUAL;
+            }
+            else
+            {
+                *rEntry.pStr = aCellStr.Copy(1);
+                rEntry.eOp   = SC_LESS;
+            }
+        }
+        else if (aCellStr.GetChar(0) == '>')
+        {
+            if (aCellStr.GetChar(1) == '=')
+            {
+                *rEntry.pStr = aCellStr.Copy(2);
+                rEntry.eOp   = SC_GREATER_EQUAL;
+            }
+            else
+            {
+                *rEntry.pStr = aCellStr.Copy(1);
+                rEntry.eOp   = SC_GREATER;
+            }
+        }
+        else
+        {
+            if (aCellStr.GetChar(0) == '=')
+                *rEntry.pStr = aCellStr.Copy(1);
+            else
+                *rEntry.pStr = aCellStr;
+            rEntry.eOp = SC_EQUAL;
+        }
+    }
+}
+
+// ============================================================================
+
+ScQueryParamTable::ScQueryParamTable()
+{
+}
+
+ScQueryParamTable::ScQueryParamTable(const ScQueryParamTable& r) :
+    nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nTab(r.nTab)
+{
+}
+
+ScQueryParamTable::~ScQueryParamTable()
+{
+}
+
+// ============================================================================
+
+ScQueryParam::ScQueryParam() : 
+    ScQueryParamBase(),
+    ScQueryParamTable()
+{
+    Clear();
+}
+
+//------------------------------------------------------------------------
+
+ScQueryParam::ScQueryParam( const ScQueryParam& r ) :
+    ScQueryParamBase(r),
+    ScQueryParamTable(r),
+    bDestPers(r.bDestPers), nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow),
+    nDynamicEndRow(r.nDynamicEndRow), bUseDynamicRange(r.bUseDynamicRange)
+{
+}
+
+ScQueryParam::ScQueryParam( const ScDBQueryParamInternal& r ) :
+    ScQueryParamBase(r),
+    ScQueryParamTable(r),
+    bDestPers(true),
+    nDestTab(0),
+    nDestCol(0),
+    nDestRow(0),
+    nDynamicEndRow(0),
+    bUseDynamicRange(false)
+{
+}
+    
+
+//------------------------------------------------------------------------
+
+ScQueryParam::~ScQueryParam()
+{
+}
+
+//------------------------------------------------------------------------
+
+void ScQueryParam::Clear()
+{
+    nCol1=nCol2 = 0;
+    nRow1=nRow2 = 0;
+    nTab = SCTAB_MAX;
+    bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE;
+    bInplace = bByRow = bDuplicate = TRUE;
+
+    Resize( MAXQUERY );
+    for (USHORT i=0; i<MAXQUERY; i++)
+        maEntries[i].Clear();
+
+    ClearDestParams();
+}
+
+void ScQueryParam::ClearDestParams()
+{
+    bDestPers = true;
+    nDestTab = 0;
+    nDestCol = 0;
+    nDestRow = 0;
+    nDynamicEndRow = 0;
+    bUseDynamicRange = false;
+}
+
+//------------------------------------------------------------------------
+
+ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
+{
+    nCol1       = r.nCol1;
+    nRow1       = r.nRow1;
+    nCol2       = r.nCol2;
+    nRow2       = r.nRow2;
+    nTab        = r.nTab;
+    nDestTab    = r.nDestTab;
+    nDestCol    = r.nDestCol;
+    nDestRow    = r.nDestRow;
+    bHasHeader  = r.bHasHeader;
+    bInplace    = r.bInplace;
+    bCaseSens   = r.bCaseSens;
+    bRegExp     = r.bRegExp;
+    bMixedComparison = r.bMixedComparison;
+    bDuplicate  = r.bDuplicate;
+    bByRow      = r.bByRow;
+    bDestPers   = r.bDestPers;
+    nDynamicEndRow = r.nDynamicEndRow;
+    bUseDynamicRange = r.bUseDynamicRange;
+
+    maEntries = r.maEntries;
+
+    return *this;
+}
+
+//------------------------------------------------------------------------
+
+BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
+{
+    BOOL bEqual = FALSE;
+
+    // Anzahl der Queries gleich?
+    SCSIZE nUsed      = 0;
+    SCSIZE nOtherUsed = 0;
+    SCSIZE nEntryCount = GetEntryCount();
+    SCSIZE nOtherEntryCount = rOther.GetEntryCount();
+
+    while ( nUsed<nEntryCount && maEntries[nUsed].bDoQuery ) ++nUsed;
+    while ( nOtherUsed<nOtherEntryCount && rOther.maEntries[nOtherUsed].bDoQuery )
+        ++nOtherUsed;
+
+    if (   (nUsed       == nOtherUsed)
+        && (nCol1       == rOther.nCol1)
+        && (nRow1       == rOther.nRow1)
+        && (nCol2       == rOther.nCol2)
+        && (nRow2       == rOther.nRow2)
+        && (nTab        == rOther.nTab)
+        && (bHasHeader  == rOther.bHasHeader)
+        && (bByRow      == rOther.bByRow)
+        && (bInplace    == rOther.bInplace)
+        && (bCaseSens   == rOther.bCaseSens)
+        && (bRegExp     == rOther.bRegExp)
+        && (bMixedComparison == rOther.bMixedComparison)
+        && (bDuplicate  == rOther.bDuplicate)
+        && (bDestPers   == rOther.bDestPers)
+        && (nDestTab    == rOther.nDestTab)
+        && (nDestCol    == rOther.nDestCol)
+        && (nDestRow    == rOther.nDestRow)
+        && (nDynamicEndRow == rOther.nDynamicEndRow)
+        && (bUseDynamicRange == rOther.bUseDynamicRange) )
+    {
+        bEqual = TRUE;
+        for ( SCSIZE i=0; i<nUsed && bEqual; i++ )
+            bEqual = maEntries[i] == rOther.maEntries[i];
+    }
+    return bEqual;
+}
+
+//------------------------------------------------------------------------
+
+void ScQueryParam::MoveToDest()
+{
+    if (!bInplace)
+    {
+        SCsCOL nDifX = ((SCsCOL) nDestCol) - ((SCsCOL) nCol1);
+        SCsROW nDifY = ((SCsROW) nDestRow) - ((SCsROW) nRow1);
+        SCsTAB nDifZ = ((SCsTAB) nDestTab) - ((SCsTAB) nTab);
+
+        nCol1 = sal::static_int_cast<SCCOL>( nCol1 + nDifX );
+        nRow1 = sal::static_int_cast<SCROW>( nRow1 + nDifY );
+        nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );
+        nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );
+        nTab  = sal::static_int_cast<SCTAB>( nTab  + nDifZ );
+        nDynamicEndRow = sal::static_int_cast<SCROW>( nDynamicEndRow + nDifY );
+        size_t n = maEntries.size();
+        for (size_t i=0; i<n; i++)
+            maEntries[i].nField += nDifX;
+
+        bInplace = TRUE;
+    }
+    else
+    {
+        DBG_ERROR("MoveToDest, bInplace == TRUE");
+    }
+}
+
+// ============================================================================
+
+ScDBQueryParamBase::ScDBQueryParamBase(DataType eType) :
+    ScQueryParamBase(),
+    mnField(-1),
+    mbSkipString(true),
+    meType(eType)
+{
+}
+
+ScDBQueryParamBase::~ScDBQueryParamBase()
+{
+}
+
+ScDBQueryParamBase::DataType ScDBQueryParamBase::GetType() const
+{
+    return meType;
+}
+
+// ============================================================================
+
+ScDBQueryParamInternal::ScDBQueryParamInternal() :
+    ScDBQueryParamBase(ScDBQueryParamBase::INTERNAL),
+    ScQueryParamTable()
+{
+}
+
+ScDBQueryParamInternal::~ScDBQueryParamInternal()
+{
+}
+
+// ============================================================================
+
+ScDBQueryParamMatrix::ScDBQueryParamMatrix() :
+    ScDBQueryParamBase(ScDBQueryParamBase::MATRIX)
+{
+}
+
+ScDBQueryParamMatrix::~ScDBQueryParamMatrix()
+{
+}
+
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index d1bca458d..9c16d7388 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -627,7 +627,7 @@ ScRangePairList_QsortNameCompare( const void* p1, const void* p2 )
     {
         ps1->pDoc->GetName( rStartPos1.Tab(), aStr1 );
         ps2->pDoc->GetName( rStartPos2.Tab(), aStr2 );
-        nComp = ScGlobal::pCollator->compareString( aStr1, aStr2 );
+        nComp = ScGlobal::GetCollator()->compareString( aStr1, aStr2 );
     }
     switch ( nComp )
     {
@@ -658,7 +658,7 @@ ScRangePairList_QsortNameCompare( const void* p1, const void* p2 )
                 {
                     ps1->pDoc->GetName( rEndPos1.Tab(), aStr1 );
                     ps2->pDoc->GetName( rEndPos2.Tab(), aStr2 );
-                    nComp = ScGlobal::pCollator->compareString( aStr1, aStr2 );
+                    nComp = ScGlobal::GetCollator()->compareString( aStr1, aStr2 );
                 }
                 switch ( nComp )
                 {
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 52651b75b..4d9e6bfcd 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -49,7 +49,6 @@
 #include "rechead.hxx"
 #include "refupdat.hxx"
 #include "document.hxx"
-#include "indexmap.hxx"
 
 using namespace formula;
 
@@ -588,31 +587,6 @@ void ScRangeData::TransferTabRef( SCTAB nOldTab, SCTAB nNewTab )
     }
 }
 
-
-void ScRangeData::ReplaceRangeNamesInUse( const ScIndexMap& rMap )
-{
-    BOOL bCompile = FALSE;
-    for ( FormulaToken* p = pCode->First(); p; p = pCode->Next() )
-    {
-        if ( p->GetOpCode() == ocName )
-        {
-            const USHORT nOldIndex = p->GetIndex();
-            const USHORT nNewIndex = rMap.Find( nOldIndex );
-            if ( nOldIndex != nNewIndex )
-            {
-                p->SetIndex( nNewIndex );
-                bCompile = TRUE;
-            }
-        }
-    }
-    if ( bCompile )
-    {
-        ScCompiler aComp( pDoc, aPos, *pCode);
-        aComp.SetGrammar(pDoc->GetGrammar());
-        aComp.CompileTokenArray();
-    }
-}
-
 void ScRangeData::ReplaceRangeNamesInUse( const IndexMap& rMap )
 {
     bool bCompile = false;
@@ -708,7 +682,7 @@ __cdecl
 #endif
 ScRangeData_QsortNameCompare( const void* p1, const void* p2 )
 {
-    return (int) ScGlobal::pCollator->compareString(
+    return (int) ScGlobal::GetCollator()->compareString(
             (*(const ScRangeData**)p1)->GetName(),
             (*(const ScRangeData**)p2)->GetName() );
 }
diff --git a/sc/source/core/tool/stringutil.cxx b/sc/source/core/tool/stringutil.cxx
index ae6247ffa..d5e09a66e 100644
--- a/sc/source/core/tool/stringutil.cxx
+++ b/sc/source/core/tool/stringutil.cxx
@@ -40,6 +40,15 @@
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 
+ScSetStringParam::ScSetStringParam() :
+    mpNumFormatter(NULL),
+    mbDetectNumberFormat(true),
+    mbSetTextCellFormat(false)
+{
+}
+
+// ============================================================================-
+
 bool ScStringUtil::parseSimpleNumber(
     const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal)
 {
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index 52a767847..3b81fafb0 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -153,7 +153,7 @@ StringCompare ScUserListData::Compare(const String& rSubStr1, const String& rSub
     else if (bFound2)
         return COMPARE_GREATER;
     else
-        return (StringCompare) ScGlobal::pCaseTransliteration->compareString( rSubStr1, rSubStr2 );
+        return (StringCompare) ScGlobal::GetCaseTransliteration()->compareString( rSubStr1, rSubStr2 );
 }
 
 StringCompare ScUserListData::ICompare(const String& rSubStr1, const String& rSubStr2) const
@@ -179,7 +179,7 @@ StringCompare ScUserListData::ICompare(const String& rSubStr1, const String& rSu
     else if (bFound2)
         return COMPARE_GREATER;
     else
-        return (StringCompare) ScGlobal::pTransliteration->compareString( rSubStr1, rSubStr2 );
+        return (StringCompare) ScGlobal::GetpTransliteration()->compareString( rSubStr1, rSubStr2 );
 }
 
 ScUserList::ScUserList(USHORT nLim, USHORT nDel) :
diff --git a/sc/source/filter/excel/biffdump.cxx b/sc/source/filter/excel/biffdump.cxx
deleted file mode 100644
index 9bf87612b..000000000
--- a/sc/source/filter/excel/biffdump.cxx
+++ /dev/null
@@ -1,9929 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: biffdump.cxx,v $
- * $Revision: 1.91 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sc.hxx"
-#include "biffdump.hxx"
-
-#if EXC_INCL_DUMPER
-#include <tools/stream.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/objsh.hxx>
-#include <sot/storinfo.hxx>
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <rtl/math.hxx>
-#include "document.hxx"
-#include "global.hxx"
-#include "fprogressbar.hxx"
-#include "xlpivot.hxx"
-#include "xicontent.hxx"
-#include "imp_op.hxx"
-
-#define GETSTR(s)		ByteString( s, RTL_TEXTENCODING_MS_1252 )
-
-static const sal_Char*	__pHexPrefix = "0x";
-static const sal_Char*	__pBinPrefix = "0b";
-static const sal_Char*	pU = "UNKNOWN ";
-
-const sal_Char*			Biff8RecDumper::pLevelPreString = "                                            ";
-const sal_Char*			Biff8RecDumper::pLevelPreStringNT = pLevelPreString + strlen( pLevelPreString );
-UINT32					Biff8RecDumper::nInstances = 0;
-sal_Char*				Biff8RecDumper::pBlankLine = NULL;
-const UINT16			Biff8RecDumper::nLenBlankLine = 255;
-const UINT16			Biff8RecDumper::nRecCnt = 0x2020;
-UINT8*					Biff8RecDumper::pCharType = NULL;
-UINT8*					Biff8RecDumper::pCharVal = NULL;
-
-static const UINT16		nLevelInc = 1;
-
-static UINT16			nXFCount = 0;
-
-static UINT16			nSXLISize[2] = {0, 0};		// array size for SXLI records [rows/cols]
-static UINT16			nSXLIIndex = 0;				// current index for SXLI records
-
-// ============================================================================
-
-namespace {
-
-// decimal --------------------------------------------------------------------
-
-inline void lclAppendDec( ByteString& rStr, sal_uInt8 nData )
-{
-    rStr.Append( ByteString::CreateFromInt32( nData ) );
-}
-
-inline void lclAppendDec( ByteString& rStr, sal_Int8 nData )
-{
-    rStr.Append( ByteString::CreateFromInt32( nData ) );
-}
-
-inline void lclAppendDec( ByteString& rStr, sal_uInt16 nData )
-{
-    rStr.Append( ByteString::CreateFromInt32( nData ) );
-}
-
-inline void lclAppendDec( ByteString& rStr, sal_Int16 nData )
-{
-    rStr.Append( ByteString::CreateFromInt32( nData ) );
-}
-
-inline void lclAppendDec( ByteString& rStr, sal_uInt32 nData )
-{
-    rStr.Append( ByteString::CreateFromInt64( nData ) );
-}
-
-inline void lclAppendDec( ByteString& rStr, sal_Int32 nData )
-{
-    rStr.Append( ByteString::CreateFromInt32( nData ) );
-}
-
-inline void lclAppendDec( ByteString& rStr, sal_uInt64 nData )
-{
-    rStr.Append( ByteString::CreateFromInt64( nData ) );
-}
-
-inline void lclAppendDec( ByteString& rStr, sal_Int64 nData )
-{
-    rStr.Append( ByteString::CreateFromInt64( nData ) );
-}
-
-inline void lclAppendDec( ByteString& rStr, float fData )
-{
-    rStr.Append( ByteString( ::rtl::math::doubleToString( fData, rtl_math_StringFormat_G, 15, '.', true ) ) );
-}
-
-inline void lclAppendDec( ByteString& rStr, double fData )
-{
-    rStr.Append( ByteString( ::rtl::math::doubleToString( fData, rtl_math_StringFormat_G, 15, '.', true ) ) );
-}
-
-// hexadecimal ----------------------------------------------------------------
-
-void lclAppendHex( ByteString& rStr, sal_uInt8 nData, bool bPrefix = true )
-{
-    static const sal_Char spcHexDigits[] = "0123456789ABCDEF";
-    static const ByteString saPrefix( "0x" );
-
-    if( bPrefix )
-        rStr.Append( saPrefix );
-    rStr.Append( spcHexDigits[ (nData >> 4) & 0x0F ] ).Append( spcHexDigits[ nData & 0x0F ] );
-}
-
-inline void lclAppendHex( ByteString& rStr, sal_Int8 nData, bool bPrefix = true )
-{
-    lclAppendHex( rStr, static_cast< sal_uInt8 >( nData ), bPrefix );
-}
-
-void lclAppendHex( ByteString& rStr, sal_uInt16 nData, bool bPrefix = true )
-{
-    lclAppendHex( rStr, static_cast< sal_uInt8 >( nData >> 8 ), bPrefix );
-    lclAppendHex( rStr, static_cast< sal_uInt8 >( nData ), false );
-}
-
-inline void lclAppendHex( ByteString& rStr, sal_Int16 nData, bool bPrefix = true )
-{
-    lclAppendHex( rStr, static_cast< sal_uInt16 >( nData ), bPrefix );
-}
-
-void lclAppendHex( ByteString& rStr, sal_uInt32 nData, bool bPrefix = true )
-{
-    lclAppendHex( rStr, static_cast< sal_uInt16 >( nData >> 16 ), bPrefix );
-    lclAppendHex( rStr, static_cast< sal_uInt16 >( nData ), false );
-}
-
-inline void lclAppendHex( ByteString& rStr, sal_Int32 nData, bool bPrefix = true )
-{
-    lclAppendHex( rStr, static_cast< sal_uInt32 >( nData ), bPrefix );
-}
-
-void lclAppendHex( ByteString& rStr, sal_uInt64 nData, bool bPrefix = true )
-{
-    lclAppendHex( rStr, static_cast< sal_uInt32 >( nData >> 32 ), bPrefix );
-    lclAppendHex( rStr, static_cast< sal_uInt32 >( nData ), false );
-}
-
-inline void lclAppendHex( ByteString& rStr, sal_Int64 nData, bool bPrefix = true )
-{
-    lclAppendHex( rStr, static_cast< sal_uInt64 >( nData ), bPrefix );
-}
-
-inline void lclAppendHex( ByteString& rStr, double fData, bool bPrefix = true )
-{
-    const sal_uInt32* pnData = reinterpret_cast< const sal_uInt32* >( &fData );
-    lclAppendHex( rStr, pnData[ 0 ], bPrefix );
-    lclAppendHex( rStr, pnData[ 1 ], false );
-}
-
-// others ---------------------------------------------------------------------
-
-void lclAppendGuid( ByteString& rStr, const XclGuid& rGuid )
-{
-    lclAppendHex( rStr, SVBT32ToUInt32( rGuid.mpnData ), false );
-    rStr.Append( '-' );
-    lclAppendHex( rStr, SVBT16ToShort( rGuid.mpnData + 4 ), false );
-    rStr.Append( '-' );
-    lclAppendHex( rStr, SVBT16ToShort( rGuid.mpnData + 6 ), false );
-    rStr.Append( '-' );
-    lclAppendHex( rStr, rGuid.mpnData[ 8 ], false );
-    lclAppendHex( rStr, rGuid.mpnData[ 9 ], false );
-    rStr.Append( '-' );
-    lclAppendHex( rStr, rGuid.mpnData[ 10 ], false );
-    lclAppendHex( rStr, rGuid.mpnData[ 11 ], false );
-    lclAppendHex( rStr, rGuid.mpnData[ 12 ], false );
-    lclAppendHex( rStr, rGuid.mpnData[ 13 ], false );
-    lclAppendHex( rStr, rGuid.mpnData[ 14 ], false );
-    lclAppendHex( rStr, rGuid.mpnData[ 15 ], false );
-}
-
-} // namespace
-
-// ============================================================================
-
-static void __AddHexNibble( ByteString& r, UINT8 nVal )
-{
-    const sal_Char	pH[] = "0123456789ABCDEF";
-
-    nVal &= 0x0F;
-
-    r += pH[ nVal ];
-}
-
-
-static void __AddPureHex( ByteString& r, UINT8 nVal )
-{
-    __AddHexNibble( r, nVal >> 4 );
-    __AddHexNibble( r, nVal );
-}
-
-
-static void __AddHex( ByteString& r, UINT8 nVal )
-{
-    r += __pHexPrefix;
-    __AddHexNibble( r, nVal >> 4 );
-    __AddHexNibble( r, nVal );
-}
-
-
-static void __AddPureHex( ByteString& r, UINT16 nVal )
-{
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 12 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 8 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 4 ) );
-    __AddHexNibble( r, ( UINT8 ) nVal );
-}
-
-
-static void __AddHex( ByteString& r, UINT16 nVal )
-{
-    r += __pHexPrefix;
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 12 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 8 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 4 ) );
-    __AddHexNibble( r, ( UINT8 ) nVal );
-}
-
-
-static void __AddPureHex( ByteString& r, UINT32 nVal )
-{
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 28 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 24 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 20 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 16 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 12 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 8 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 4 ) );
-    __AddHexNibble( r, ( UINT8 ) nVal );
-}
-
-
-static void __AddHex( ByteString& r, UINT32 nVal )
-{
-    r += __pHexPrefix;
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 28 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 24 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 20 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 16 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 12 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 8 ) );
-    __AddHexNibble( r, ( UINT8 ) ( nVal >> 4 ) );
-    __AddHexNibble( r, ( UINT8 ) nVal );
-}
-
-
-static void __AddHex( ByteString& r, INT32 nVal )
-{
-    __AddHex( r, (UINT32) nVal );
-}
-
-
-static void __AddHex( ByteString& r, UINT64 nVal )
-{
-	r += __pHexPrefix;
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 60 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 56 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 52 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 48 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 44 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 40 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 36 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 32 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 28 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 24 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 20 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 16 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 12 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 8 ) );
-	__AddHexNibble( r, ( UINT8 ) ( nVal >> 4 ) );
-	__AddHexNibble( r, ( UINT8 ) nVal );
-}
-
-
-static void __AddHex( ByteString& r, INT64 nVal )
-{
-	__AddHex( r, (UINT64) nVal );
-}
-
-
-static void __AddPureBinNibble( ByteString& r, UINT8 nVal )
-{
-    nVal <<= 4;
-    for( int n = 4 ; n ; n-- )
-    {
-        r += ( nVal & 0x80 )? "1" : "0";
-        nVal <<= 1;
-    }
-}
-
-
-static void __AddPureBin( ByteString& r, UINT8 nVal )
-{
-    __AddPureBinNibble( r, nVal >> 4 );
-    r += " ";
-    __AddPureBinNibble( r, nVal );
-}
-
-
-static void __AddPureBin( ByteString& r, UINT16 nVal )
-{
-    const sal_Char*		pIn = "  ";
-    __AddPureBin( r, ( UINT8 ) ( nVal >> 8 ) );
-    r += pIn;
-    __AddPureBin( r, ( UINT8 ) nVal );
-}
-
-
-static void __AddPureBin( ByteString& r, UINT32 nVal )
-{
-    const sal_Char*		pIn = "  ";
-    __AddPureBin( r, ( UINT8 ) ( nVal >> 24 ) );
-    r += pIn;
-    __AddPureBin( r, ( UINT8 ) ( nVal >> 16 ) );
-    r += pIn;
-    __AddPureBin( r, ( UINT8 ) ( nVal >> 8 ) );
-    r += pIn;
-    __AddPureBin( r, ( UINT8 ) nVal );
-}
-
-
-inline static void __AddDec( ByteString& r, UINT64 n )
-{
-    // FIXME: need "%llu" for ILP32 platforms, "%lu" for LP64 platforms,
-    // and I have no idea for Win32.
-    __AddDec( r, static_cast<UINT32>(n) );
-}
-
-
-inline static void __AddDec( ByteString& r, UINT32 n )
-{
-    sal_Char	p[ 32 ];
-    sprintf( p, "%u", n );  // #100211# - checked
-    r += p;
-}
-
-
-inline static void __AddDec( ByteString& r, UINT16 n )
-{
-    __AddDec( r, ( UINT32 ) n );
-}
-
-
-inline static void __AddDec( ByteString& r, UINT8 n )
-{
-    __AddDec( r, ( UINT32 ) n );
-}
-
-
-inline static void __AddDec( ByteString& r, INT32 n )
-{
-    sal_Char	p[ 32 ];
-    sprintf( p, "%d", n );  // #100211# - checked
-    r += p;
-}
-
-
-inline static void __AddDec( ByteString& r, INT64 n )
-{
-    // FIXME: need "%lld" for ILP32 platforms, "%ld" for LP64 platforms,
-    // and I have no idea for Win32.
-    __AddDec( r, static_cast<INT32>(n) );
-}
-
-
-inline static void __AddDec( ByteString& r, INT16 n )
-{
-    __AddDec( r, ( INT32 ) n );
-}
-
-inline static void __AddDec( ByteString& r, sal_Int8 n )
-{
-    __AddDec( r, ( INT32 ) n );
-}
-
-
-static void __AddDec( ByteString& r, UINT32 nVal, UINT16 nNumOfDig, sal_Char c = ' ' )
-{
-    ByteString	t;
-    ByteString	aVal;
-    __AddDec( aVal, nVal );
-    if( nNumOfDig > (UINT16) aVal.Len() )
-        t.Fill( nNumOfDig - (UINT16) aVal.Len(), c );
-    r += t;
-    r += aVal;
-}
-
-
-inline static void __AddDec1616( ByteString& r, UINT32 n )
-{
-    __AddDec( r, (UINT16)(n >> 16) );
-    r += '.';
-    __AddDec( r, (UINT16)(n & 0xFFFF) );
-}
-
-
-static void __AddDouble( ByteString& r, const double f )
-{
-    r += ByteString( ::rtl::math::doubleToString( f, rtl_math_StringFormat_G, 15, '.', TRUE ) );
-}
-
-
-static inline void __AddRK( ByteString& rString, sal_Int32 nRKValue )
-{
-    __AddDouble( rString, XclTools::GetDoubleFromRK( nRKValue ) );
-}
-
-
-inline static void __Add16p16( ByteString& r, UINT32 n )
-{
-    __AddDouble( r, double(n) / 65536.0 );
-}
-
-
-static void lcl_AddRef( ByteString& rStr, sal_uInt16 nCol, sal_uInt16 nRow )
-{
-    ScAddress aRef( static_cast< SCCOL >( nCol ), static_cast< SCROW >( nRow ), 0 );
-    rStr.Append( GETSTR( aRef.GetColRowString() ) );
-}
-
-
-static void lcl_AddRangeRef( ByteString& rStr, sal_uInt16 nCol1, sal_uInt16 nRow1, sal_uInt16 nCol2, sal_uInt16 nRow2 )
-{
-    lcl_AddRef( rStr, nCol1, nRow1 );
-    if( (nCol1 != nCol2) || (nRow1 != nRow2) )
-    {
-        rStr.Append( ':' );
-        lcl_AddRef( rStr, nCol2, nRow2 );
-    }
-}
-
-
-static void __AddCellHead( ByteString& r, const UINT16 nC, const UINT16 nR, const UINT16 nXF )
-{
-    lcl_AddRef( r, (UINT8) nC, nR );
-    r += " (XF=";
-    __AddDec( r, nXF );
-    r += ')';
-}
-
-
-inline static void lcl_AddFlag(
-        ByteString& rString, bool bFlag, const sal_Char* pcTrue = "true", const sal_Char* pcFalse = "false" )
-{
-    rString += (bFlag ? pcTrue : pcFalse);
-}
-
-inline static void lcl_AddOnOff( ByteString& rString, bool bFlag )
-{
-    lcl_AddFlag( rString, bFlag, "on", "off" );
-}
-
-
-static void lcl_AddEnum(
-        ByteString& rString, long nValue, const sal_Char* const ppcEnums[], long nSize,
-        const sal_Char* pcDefault = 0, long nOffset = 0 )
-{
-    nValue -= nOffset;
-    const sal_Char* pcText = "!unknown!";
-    if( (0 <= nValue) && (nValue < nSize) && ppcEnums[ nValue ] )
-        pcText = ppcEnums[ nValue ];
-    else if( pcDefault )
-        pcText = pcDefault;
-    if( *pcText )   // nonempty string
-        rString.Append( " (" ).Append( pcText ).Append( ')' );
-}
-
-
-namespace {
-
-void lclDumpString( SvStream& rOutStrm, const ByteString& rData )
-{
-    ByteString aOutStr;
-    xub_StrLen nIdx = 0;
-    for( ; (nIdx < rData.Len()) && (aOutStr.Len() < 80); ++nIdx )
-    {
-        sal_Char cChar = rData.GetChar( nIdx );
-        if( 32 <= cChar )
-            aOutStr.Append( cChar );
-        else
-        {
-            aOutStr.Append( '<' );
-            __AddHex( aOutStr, static_cast< sal_uInt8 >( cChar ) );
-            aOutStr.Append( '>' );
-        }
-    }
-    rOutStrm << aOutStr.GetBuffer();
-    if( nIdx < rData.Len() )
-        rOutStrm << "<...>";
-}
-
-void lclDumpStringValue( SvStream& rOutStrm, const ByteString& rName, const ByteString& rData )
-{
-    rOutStrm << rName.GetBuffer() << "='";
-    lclDumpString( rOutStrm, rData );
-    rOutStrm << '\'';
-}
-
-void lclDumpString( SvStream& rOutStrm, const String& rData )
-{
-    ByteString aOutStr;
-    xub_StrLen nIdx = 0;
-    for( ; (nIdx < rData.Len()) && (aOutStr.Len() < 80); ++nIdx )
-    {
-        sal_Unicode cChar = rData.GetChar( nIdx );
-        if( (32 <= cChar) && (cChar <= 255) )
-            aOutStr.Append( static_cast< sal_Char >( cChar ) );
-        else
-        {
-            aOutStr.Append( '<' );
-            if( cChar < 256 )
-                __AddHex( aOutStr, static_cast< sal_uInt8 >( cChar ) );
-            else
-                __AddHex( aOutStr, static_cast< sal_uInt16 >( cChar ) );
-            aOutStr.Append( '>' );
-        }
-    }
-    rOutStrm << aOutStr.GetBuffer();
-    if( nIdx < rData.Len() )
-        rOutStrm << "<...>";
-}
-
-void lclDumpStringValue( SvStream& rOutStrm, const ByteString& rName, const String& rData )
-{
-    rOutStrm << rName.GetBuffer() << "='";
-    lclDumpString( rOutStrm, rData );
-    rOutStrm << '\'';
-}
-
-} // namespace
-
-
-IdRangeList::~IdRangeList()
-{
-    Clear();
-}
-
-
-void IdRangeList::Clear( void )
-{
-    IdRange*	p = ( IdRange* ) First();
-
-    while( p )
-    {
-        delete p;
-        p = ( IdRange* ) Next();
-    }
-
-    List::Clear();
-}
-
-// ============================================================================
-//
-//  H E L P E R   O B J E C T S
-//
-// ============================================================================
-
-namespace {
-
-// ----------------------------------------------------------------------------
-
-class XclDumpStreamHeader
-{
-public:
-    explicit            XclDumpStreamHeader( SvStream& rInStrm, SvStream& rOutStrm, const String& rStrmName, const String& rStrmPath );
-                        ~XclDumpStreamHeader();
-    inline ULONG        GetStreamLen() const { return mnStrmLen; }
-
-private:
-    SvStream&           mrOutStrm;
-    String              maStrmName;
-    String              maStrmPath;
-    ByteString          maSeparator;
-    ULONG               mnStrmLen;
-};
-
-XclDumpStreamHeader::XclDumpStreamHeader( SvStream& rInStrm, SvStream& rOutStrm, const String& rStrmName, const String& rStrmPath ) :
-    mrOutStrm( rOutStrm ),
-    maStrmName( rStrmName ),
-    maStrmPath( rStrmPath ),
-    mnStrmLen( 0 )
-{
-    maSeparator.Assign( '+' ).Expand( 78, '-' );
-
-    rInStrm.Seek( STREAM_SEEK_TO_END );
-    mnStrmLen = rInStrm.Tell();
-    rInStrm.Seek( STREAM_SEEK_TO_BEGIN );
-
-    ByteString aLine;
-    lclAppendDec( aLine, mnStrmLen );
-
-    mrOutStrm << maSeparator.GetBuffer() << "\n";
-    mrOutStrm << "| STREAM-BEGIN\n";
-    mrOutStrm << "|   ";
-    lclDumpStringValue( mrOutStrm, "stream-name", maStrmName );
-    mrOutStrm << "\n|   ";
-    lclDumpStringValue( mrOutStrm, "stream-path", maStrmPath );
-    mrOutStrm << "\n|   stream-len=" << aLine.GetBuffer() << "\n";
-    mrOutStrm << "|\n\n";
-}
-
-XclDumpStreamHeader::~XclDumpStreamHeader()
-{
-    mrOutStrm << "|\n";
-    mrOutStrm << "|   ";
-    lclDumpStringValue( mrOutStrm, "stream-name", maStrmName );
-    mrOutStrm << "\n|   ";
-    lclDumpStringValue( mrOutStrm, "stream-path", maStrmPath );
-    mrOutStrm << "\n";
-    mrOutStrm << "| STREAM-END\n";
-    mrOutStrm << maSeparator.GetBuffer() << "\n\n";
-}
-
-// ----------------------------------------------------------------------------
-
-class XclDumpStorageHeader
-{
-public:
-    explicit            XclDumpStorageHeader( SotStorage& rInStrg, SvStream& rOutStrm, const String& rStrgPath );
-                        ~XclDumpStorageHeader();
-
-private:
-    SvStream&           mrOutStrm;
-    String              maStrgName;
-    String              maStrgPath;
-    ByteString          maSeparator;
-};
-
-XclDumpStorageHeader::XclDumpStorageHeader( SotStorage& rInStrg, SvStream& rOutStrm, const String& rStrgPath ) :
-    mrOutStrm( rOutStrm ),
-    maStrgName( rInStrg.GetName() ),
-    maStrgPath( rStrgPath )
-{
-    maSeparator.Assign( "++" ).Expand( 78, '=' );
-
-    mrOutStrm << maSeparator.GetBuffer() << "\n";
-    mrOutStrm << "|| STORAGE-BEGIN\n";
-    mrOutStrm << "||   ";
-    lclDumpStringValue( mrOutStrm, "storage-name", maStrgName );
-    mrOutStrm << "\n||   ";
-    lclDumpStringValue( mrOutStrm, "storage-path", maStrgPath );
-    mrOutStrm << "\n";
-
-    SvStorageInfoList aInfoList;
-    rInStrg.FillInfoList( &aInfoList );
-    ByteString aLine;
-    lclAppendDec( aLine, aInfoList.Count() );
-    mrOutStrm << "||   directory-size=" << aLine.GetBuffer() << "\n";
-
-    for( ULONG nInfo = 0; nInfo < aInfoList.Count(); ++nInfo )
-    {
-        SvStorageInfo& rInfo = aInfoList.GetObject( nInfo );
-        mrOutStrm << "||     type=";
-        if( rInfo.IsStream() )
-            mrOutStrm << "stream   ";
-        else if( rInfo.IsStorage() )
-            mrOutStrm << "storage  ";
-        else
-            mrOutStrm << "unknown  ";
-        lclDumpStringValue( mrOutStrm, "name", rInfo.GetName() );
-        mrOutStrm << "\n";
-    }
-
-    mrOutStrm << "||\n\n";
-}
-
-XclDumpStorageHeader::~XclDumpStorageHeader()
-{
-    mrOutStrm << "||\n";
-    mrOutStrm << "||   ";
-    lclDumpStringValue( mrOutStrm, "storage-name", maStrgName );
-    mrOutStrm << "\n||   ";
-    lclDumpStringValue( mrOutStrm, "storage-path", maStrgPath );
-    mrOutStrm << "\n";
-    mrOutStrm << "|| STORAGE-END\n";
-    mrOutStrm << maSeparator.GetBuffer() << "\n\n";
-}
-
-// ----------------------------------------------------------------------------
-
-}
-
-// ============================================================================
-//
-// ============================================================================
-
-void Biff8RecDumper::Print( const ByteString& r )
-{
-    DBG_ASSERT( pDumpStream, "-Biff8RecDumper::Print(): Stream is wech!" );
-    *pDumpStream << '\n' << pLevelPre;
-    pDumpStream->Write( r.GetBuffer(), r.Len() );
-}
-
-
-void Biff8RecDumper::Print( const sal_Char* p )
-{
-    DBG_ASSERT( pDumpStream, "-Biff8RecDumper::Print(): Stream is wech!" );
-    DBG_ASSERT( p, "-Biff8RecDumper::Print(): ByteString is wech!" );
-
-    *pDumpStream << '\n' << pLevelPre << p;
-}
-
-
-static const sal_Char* GetSeriesType( const UINT16 n )
-{
-    const sal_Char*	p;
-
-    switch( n )
-    {
-        case 0:     p = "(date)    "; break;
-        case 1:     p = "(numeric) "; break;
-        case 2:     p = "(sequence)"; break;
-        case 3:     p = "(text)    "; break;
-        default:    p = "(unknown) ";
-    }
-
-    return p;
-}
-
-
-static const sal_Char* GetLineType( const UINT16 n )
-{
-    const sal_Char*	p;
-
-    switch( n )
-    {
-        case 0:		p = "solid";				break;
-        case 1:		p = "dash";					break;
-        case 2:		p = "dot";					break;
-        case 3:		p = "dash-dot";				break;
-        case 4:		p = "dash-dot-dot";			break;
-        case 5:		p = "none";					break;
-        case 6:		p = "dark gray pattern";	break;
-        case 7:		p = "medium gray pattern";	break;
-        case 8:		p = "light gray pattern";	break;
-        default:	p = pU;
-    }
-
-    return p;
-}
-
-
-static ByteString GetRGB( const UINT32 n )
-{
-    ByteString	s;
-
-    s += "R";
-    __AddDec( s, ( UINT8 ) n );
-    s += " G";
-    __AddDec( s, ( UINT8 ) ( n >> 8 ) );
-    s += " B";
-    __AddDec( s, ( UINT8 ) ( n >> 16 ) );
-
-    return s;
-}
-
-
-static void AddRef( ByteString& t, UINT16 nRow, UINT16 nC, BOOL bName, UINT16 nTab = 0xFFFF )
-{
-    BOOL bColRel = ( nC & 0x4000 ) != 0;
-    BOOL bRowRel = ( nC & 0x8000 ) != 0;
-    UINT8 nCol = (UINT8) nC;
-    INT8 nRelCol = (INT8) nCol;
-    INT16 nRelRow = (INT16) nRow;
-
-    if( nTab < 0xFFFF )
-    {
-        t += "XTI(";
-        __AddDec( t, nTab );
-        t += ")!";
-    }
-
-    if( bName )
-    {
-        // dump relative: [Column|Row]
-        // [C-1,R-1] = one column left, one row up
-        // [C+1,R+1] = one column right, one row down
-        // [C,R]     = same column/row
-        // [C=B,R=2] = absolute column B/row 2
-        t += "[C";
-        if( bColRel )
-        {
-            if( nRelCol > 0 )
-                t += '+';
-            if( nRelCol != 0 )
-                __AddDec( t, (INT16)nRelCol );
-        }
-        else
-        {
-            t += '=';
-            t += GETSTR( ::ScScColToAlpha( nCol ) );
-        }
-
-        t += ",R";
-        if( bRowRel )
-        {
-            if( nRelRow > 0 )
-                t += "+";
-            if( nRelRow != 0 )
-                __AddDec( t, nRelRow );
-        }
-        else
-        {
-            t += '=';
-            __AddDec( t, (INT32)nRow + 1 );
-        }
-        t += ']';
-    }
-    else
-    {
-        if( !bColRel )
-            t += '$';
-        t += GETSTR( ::ScColToAlpha( nCol ) );
-        if( !bRowRel )
-            t += '$';
-        __AddDec( t, (UINT16)(nRow + 1) );
-    }
-}
-
-static void AddRangeRef( ByteString& t, UINT16 nRow1, UINT16 nC1, UINT16 nRow2, UINT16 nC2, BOOL bName, UINT16 nTab = 0xFFFF )
-{
-    AddRef( t, nRow1, nC1, bName, nTab );
-    if( (nRow1 != nRow2) || (nC1 != nC2) )
-    {
-        t += ':';
-        AddRef( t, nRow2, nC2, bName );
-    }
-}
-
-
-
-static BOOL AddUNICODEString( ByteString& rStr, XclImpStream& rStrm, const BOOL b16BitLen = TRUE, UINT16 nLen = 0, ByteString* pRawName = 0 )
-{
-    BOOL bRet = TRUE;
-
-    if( !nLen )
-        nLen = b16BitLen ? rStrm.ReaduInt16() : rStrm.ReaduInt8();
-    UINT8 nGrbit = rStrm.ReaduInt8();
-
-    UINT32	nExtLen;
-    UINT16	nCrun;
-    bool    b16Bit, bFarEast, bRichString;
-    rStrm.ReadUniStringExtHeader( b16Bit, bRichString, bFarEast, nCrun, nExtLen, nGrbit );
-
-    rStr += "(l=";
-    __AddDec( rStr, nLen );
-    rStr += " f=";
-    __AddHex( rStr, nGrbit );
-    rStr += " ";
-    rStr += b16Bit ? "16-Bit" : "8-Bit";
-
-    if( bRichString && bFarEast )
-        rStr += " rich far-east";
-    else if( bRichString && !bFarEast )
-        rStr += " rich";
-    else if ( !bRichString && bFarEast )
-        rStr += " far-east";
-    rStr += ") '";
-
-    ByteString aData( rStrm.ReadRawUniString( nLen, b16Bit ), RTL_TEXTENCODING_MS_1252 );
-    if( pRawName ) *pRawName = aData;
-
-    xub_StrLen nIndex = 0;
-    while( (nIndex < aData.Len()) && (nIndex < 255) )
-    {
-        UINT8 nChar = (UINT8)aData.GetChar( nIndex );
-        if( nChar < ' ' )
-        {
-            ByteString aIns( '<' );
-            __AddHex( aIns, nChar );
-            aIns += '>';
-            aData.Erase( nIndex, 1 ).Insert( aIns, nIndex );
-            nIndex += 5;
-        }
-        nIndex++;
-    }
-
-    rStr += aData.Copy( 0, 255 );
-    rStr += '\'';
-    if( aData.Len() > 255 )
-        rStr += "...";
-
-    if( nCrun )
-    {
-        rStr += " + ";
-        __AddDec( rStr, nCrun );
-        rStr += " format blocks (";
-        nCrun *= 4;
-        __AddDec( rStr, nCrun );
-        rStr += " bytes)";
-        rStrm.Ignore( nCrun );
-    }
-    if( nExtLen )
-    {
-        rStr += " + ";
-        __AddDec( rStr, nExtLen );
-        rStr += " byte extended:";
-        for( sal_uInt32 nIdx = 0; rStrm.IsValid() && (nIdx < nExtLen); ++nIdx )
-        {
-            rStr.Append( ' ' );
-            __AddPureHex( rStr, rStrm.ReaduInt8() );
-        }
-    }
-
-    return bRet;
-}
-
-
-DUMP_ERR::~DUMP_ERR()
-{
-    if( pHint )
-        delete pHint;
-}
-
-
-
-
-#define Read1(rIn)				(rIn).ReaduInt8()
-#define Read2(rIn)				(rIn).ReaduInt16()
-#define Read4(rIn)				(rIn).ReaduInt32()
-#define Read8(rIn)				(rIn).ReadDouble()
-#define	LINESTART()				{t.Erase();t+=pPre;}
-#define	IGNORE(n)				rIn.Ignore(n)
-#define	ADDBIN(n)				__AddBin( t, Read##n( rIn ) )
-#define	ADDHEX(n)				__AddHex( t, Read##n( rIn ) )
-#define	ADDDEC(n)				__AddDec( t, Read##n( rIn ) )
-#define ADDDOUBLE()				__AddDouble( t, rIn.ReadDouble() )
-#define	ADD16P16()				__Add16p16( t, Read4( rIn ) )
-#define	ADDTEXT(T)				t += T
-#define	PRINT()					Print( t )
-#define	PreDump(LEN)			{rIn.PushPosition();ContDump(LEN);rIn.PopPosition();}
-#define	ADDCELLHEAD()			{UINT16 nR,nC,nX;rIn>>nR>>nC>>nX;__AddCellHead(t,nC,nR,nX);}
-#define STARTFLAG()             {ADDTEXT( "flags=" ); __AddHex( t, __nFlags ); ADDTEXT( " " );}
-#define ADDFLAG(mask,text)      {if( __nFlags & mask ) t.Append( ' ' ).Append( text );}
-#define ADDRESERVED(mask)       ADDFLAG(mask,"!RESERVED!")
-
-
-UINT16 Biff8RecDumper::DumpXF( XclImpStream& rStrm, const sal_Char* pPre )
-{
-    ByteString t;   // "t" needed by macros
-
-    sal_uInt32 nBorder1, nBorder2;
-    sal_uInt16 nFont, nNumFmt, nTypeProt, nAlign, nMiscAttrib, nArea, __nFlags, nTmp;
-    rStrm >> nFont >> nNumFmt >> nTypeProt >> nAlign >> nMiscAttrib >> nBorder1 >> nBorder2 >> nArea;
-    bool bCell = !::get_flag( nTypeProt, EXC_XF_STYLE );
-
-    // XF type/parent
-    LINESTART();
-    nTmp = ::extract_value<sal_uInt16, sal_uInt16>( nTypeProt, 4, 12 );
-    ADDTEXT( "index=#" );           __AddDec( t, nXFCount++ );
-    ADDTEXT( "   type=" );          lcl_AddFlag( t, bCell, "cell", "style" );
-    ADDTEXT( "   parent-xf=#" );    __AddDec( t, nTmp );
-    PRINT();
-
-    // attribute used flags
-    LINESTART();
-    __nFlags = ::extract_value<sal_uInt16, sal_uInt16>( nMiscAttrib, 10, 6 );
-    if( !bCell ) __nFlags ^= 0x3F;  // in style XFs a 0 means used
-    ADDTEXT( "used " ); STARTFLAG();
-    ADDFLAG( EXC_XF_DIFF_VALFMT, "numfmt" );
-    ADDFLAG( EXC_XF_DIFF_FONT, "font" );
-    ADDFLAG( EXC_XF_DIFF_ALIGN, "align" );
-    ADDFLAG( EXC_XF_DIFF_BORDER, "border" );
-    ADDFLAG( EXC_XF_DIFF_AREA, "area" );
-    ADDFLAG( EXC_XF_DIFF_PROT, "prot" );
-    PRINT();
-
-    // cell protection/font/number format
-    LINESTART();
-    ADDTEXT( "cell-lock=" );        lcl_AddOnOff( t, ::get_flag( nTypeProt, EXC_XF_LOCKED ) );
-    ADDTEXT( "   hidden=" );        lcl_AddOnOff( t, ::get_flag( nTypeProt, EXC_XF_HIDDEN ) );
-    ADDTEXT( "   font=" );          __AddDec( t, nFont );
-    ADDTEXT( "   num-fmt=" );       __AddDec( t, nNumFmt );
-    PRINT();
-
-    // alignment
-    LINESTART();
-    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nAlign, 0, 3 );
-    ADDTEXT( "hor-align=" );        __AddDec( t, nTmp );
-    ADDTEXT( " (" );
-    switch( nTmp )
-    {
-        case EXC_XF_HOR_GENERAL:    ADDTEXT( "general" );   break;
-        case EXC_XF_HOR_LEFT:       ADDTEXT( "left" );      break;
-        case EXC_XF_HOR_CENTER:     ADDTEXT( "center" );    break;
-        case EXC_XF_HOR_RIGHT:      ADDTEXT( "right" );     break;
-        case EXC_XF_HOR_FILL:       ADDTEXT( "fill" );      break;
-        case EXC_XF_HOR_JUSTIFY:    ADDTEXT( "justify" );   break;
-        case EXC_XF_HOR_CENTER_AS:  ADDTEXT( "center-as" ); break;
-        case EXC_XF_HOR_DISTRIB:    ADDTEXT( "distrib" );   break;
-        default:                    ADDTEXT( "!unknown!" );
-    };
-    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nAlign, 4, 3 );
-    ADDTEXT( ")   ver-align=" );    __AddDec( t, nTmp );
-    ADDTEXT( " (" );
-    switch( nTmp )
-    {
-        case EXC_XF_VER_TOP:        ADDTEXT( "top" );       break;
-        case EXC_XF_VER_CENTER:     ADDTEXT( "center" );    break;
-        case EXC_XF_VER_BOTTOM:     ADDTEXT( "bottom" );    break;
-        case EXC_XF_VER_JUSTIFY:    ADDTEXT( "justify" );   break;
-        case EXC_XF_VER_DISTRIB:    ADDTEXT( "distrib" );   break;
-        default:                    ADDTEXT( "!unknown!" );
-    };
-    ADDTEXT( ")   text-wrap=" );    lcl_AddOnOff( t, ::get_flag( nAlign, EXC_XF_LINEBREAK ) );
-    PRINT();
-
-    LINESTART();
-    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nAlign, 8, 8 );
-    ADDTEXT( "rotation=" );         __AddDec( t, nTmp );
-    ADDTEXT( " (" );
-    if( nTmp < 91 )
-        { __AddDec( t, nTmp ); ADDTEXT( "\xB0" ); }
-    else if( nTmp < 181 )
-        { __AddDec( t, static_cast< sal_Int32 >( 90 - nTmp ) ); ADDTEXT( "\xB0" ); }
-    else if( nTmp == EXC_ROT_STACKED )
-        { ADDTEXT( "stacked" ); }
-    else
-        { ADDTEXT( "!unknown!" ); }
-    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nMiscAttrib, 0, 4 );
-    ADDTEXT( ")   indent=" );       __AddDec( t, nTmp );
-    ADDTEXT( "   shrink=" );        lcl_AddOnOff( t, ::get_flag( nMiscAttrib, EXC_XF8_SHRINK ) );
-    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nMiscAttrib, 6, 2 );
-    ADDTEXT( "   text-dir=" );      __AddDec( t, nTmp );
-    ADDTEXT( " (" );
-    switch( nTmp )
-    {
-        case EXC_XF_TEXTDIR_CONTEXT:    ADDTEXT( "context" );   break;
-        case EXC_XF_TEXTDIR_LTR:        ADDTEXT( "ltr" );       break;
-        case EXC_XF_TEXTDIR_RTL:        ADDTEXT( "rtl" );       break;
-        default:                        ADDTEXT( "!unknown!" );
-    };
-    ADDTEXT( ")" );
-    PRINT();
-
-    // border/area
-    LINESTART();
-    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 0, 4 );
-    ADDTEXT( "left-line=" );        __AddDec( t, nTmp );
-    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 16, 7 );
-    ADDTEXT( " color=" );           __AddDec( t, nTmp );
-    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 4, 4 );
-    ADDTEXT( "   right-line =" );   __AddDec( t, nTmp );
-    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 23, 7 );
-    ADDTEXT( " color=" );           __AddDec( t, nTmp );
-    PRINT();
-    LINESTART();
-    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 8, 4 );
-    ADDTEXT( "top-line =" );        __AddDec( t, nTmp );
-    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder2, 0, 7 );
-    ADDTEXT( " color=" );           __AddDec( t, nTmp );
-    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder1, 12, 4 );
-    ADDTEXT( "   bottom-line=" );   __AddDec( t, nTmp );
-    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder2, 7, 7 );
-    ADDTEXT( " color=" );           __AddDec( t, nTmp );
-    PRINT();
-    LINESTART();
-    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder2, 21, 4 );
-    ADDTEXT( "diag-line=" );        __AddDec( t, nTmp );
-    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder2, 14, 7 );
-    ADDTEXT( " color=" );           __AddDec( t, nTmp );
-    ADDTEXT( "   diag-tl-to-br=" ); lcl_AddOnOff( t, ::get_flag( nBorder1, static_cast< sal_Size >( 0x40000000U ) ) );
-    ADDTEXT( "   diag-bl-to-tr=" ); lcl_AddOnOff( t, ::get_flag( nBorder1, static_cast< sal_Size >( 0x80000000U ) ) );
-    PRINT();
-    LINESTART();
-    nTmp = ::extract_value<sal_uInt16,sal_uInt32>( nBorder2, 26, 6 );
-    ADDTEXT( "area-pattern=" );     __AddDec( t, nTmp );
-    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nArea, 0, 7 );
-    ADDTEXT( "   fore-color=" );    __AddDec( t, nTmp );
-    nTmp = ::extract_value<sal_uInt16,sal_uInt16>( nArea, 7, 7 );
-    ADDTEXT( "   back-color=" );    __AddDec( t, nTmp );
-    PRINT();
-
-    return 0;
-}
-
-void Biff8RecDumper::DumpValidPassword( XclImpStream& rIn, const sal_Char* pPre )
-{
-    ByteString	t;
-    UINT16 nHash;
-    rIn >> nHash;
-    LINESTART();
-    ADDTEXT( "hash=" );
-    __AddHex( t, nHash );
-    if( nHash )
-    {
-        ByteString	sPasswd;
-        ByteString	sDummy;
-        UINT16	nLen = 9;
-        UINT16	nDummy;
-        UINT16	nNewChar;
-
-        nHash ^= 0xCE4B;
-        nDummy = nHash;
-        ADDTEXT( "   without-mask=" );
-        __AddHex( t, nHash );
-        while( !(nDummy & 0x8000) && nLen )
-        {
-            nLen--;
-            nDummy <<= 1;
-        }
-        if( !nLen ) nLen = 2;
-        if( (nLen ^ nHash) & 0x0001 ) nLen++;
-        if( nLen == 9 )
-        {
-            nLen = 10;
-            nHash ^= 0x8001;
-        }
-        nHash ^= nLen;
-        if( nLen < 9 ) nHash <<= (8 - nLen);
-        for( UINT16 iChar = nLen; iChar > 0; iChar-- )
-        {
-            switch( iChar )
-            {
-                case 10:
-                    nNewChar = (nHash & 0xC000) | 0x0400;
-                    nHash ^= nNewChar;
-                    nNewChar >>= 2;
-                    break;
-                case 9:
-                    nNewChar = 0x4200;
-                    nHash ^= nNewChar;
-                    nNewChar >>= 1;
-                    break;
-                case 1:
-                    nNewChar = nHash & 0xFF00;
-                    break;
-                default:
-                    nNewChar = (nHash & 0xE000) ^ 0x2000;
-                    if( !nNewChar ) nNewChar = (nHash & 0xF000) ^ 0x1800;
-                    if( nNewChar == 0x6000 ) nNewChar = 0x6100;
-                    nHash ^= nNewChar;
-                    nHash <<= 1;
-                    break;
-            }
-            nNewChar >>= 8;
-            nNewChar &= 0x00FF;
-            sDummy = sPasswd;
-            sPasswd = (sal_Char) nNewChar;
-            sPasswd += sDummy;
-        }
-        ADDTEXT( "   valid-password='" );
-        t += sPasswd;
-        ADDTEXT( "'" );
-    }
-    PRINT();
-}
-
-
-void __AddGUID( ByteString& rStr, XclImpStream& rIn )
-{
-    UINT16 nIndex;
-    __AddPureHex( rStr, Read4( rIn ) );
-    rStr += "-";
-    __AddPureHex( rStr, Read2( rIn ) );
-    rStr += "-";
-    __AddPureHex( rStr, Read2( rIn ) );
-    rStr += "-";
-    // last 2 parts byte for byte
-    for( nIndex = 0; nIndex < 2; nIndex++ )
-        __AddPureHex( rStr, Read1( rIn ) );
-    rStr += "-";
-    for( nIndex = 0; nIndex < 6; nIndex++ )
-        __AddPureHex( rStr, Read1( rIn ) );
-}
-
-
-void Biff8RecDumper::PreDumpDecrypted( ULONG nL )
-{
-    if( !nL ) return;
-
-    ByteString t;
-    const sal_Char* pPre = (pLevelPre > pLevelPreString) ? pLevelPre - 1 : pLevelPre;
-
-    LINESTART();
-    ADDTEXT( "*** encrypted ***" );
-    PRINT();
-    pIn->DisableDecryption();
-    pIn->Seek( EXC_REC_SEEK_TO_BEGIN );
-    ContDump( nL );
-
-    if( pIn->HasValidDecrypter() )
-    {
-        LINESTART();
-        ADDTEXT( "*** decrypted ***" );
-        PRINT();
-        pIn->EnableDecryption();
-        pIn->Seek( EXC_REC_SEEK_TO_BEGIN );
-        ContDump( nL );
-    }
-}
-
-
-void Biff8RecDumper::RecDump( BOOL bSubStream )
-{
-    const sal_Char*		p;
-    BOOL				bDec = FALSE;
-    ByteString			aTmp;
-    UINT16				__nFlags;
-    const UINT16        nR = pIn->GetRecId();
-    const ByteString*	pName = GetName( nR );
-
-    // set CONTINUE handling mode
-    switch( nR )
-    {
-        case 0x000A:        // EOF
-        case 0x003C:		// CONT
-        case 0x005D:		// OBJ
-        case 0x00EC:		// MSODRAWING
-        case 0x01B6:		// TXO
-            pIn->ResetRecord( false );
-        break;
-        case 0x1066:        // CHGELFRAME
-            pIn->ResetRecord( bReadContRecs, 0x1066 );
-        break;
-        default:
-            pIn->ResetRecord( bReadContRecs );
-    }
-    const ULONG         nL = pIn->GetRecSize();
-
-    switch( nR )
-    {
-        case 0x0009:
-        case 0x0209:
-        case 0x0409:
-        case 0x0809:
-            nLevelCnt = 0;
-            break;
-        case 0x1033:
-            if( pName )
-                aTmp = *pName;
-            else
-                aTmp = "BEGIN ";
-            bDec = ( pLevelPre + nLevelInc ) >= pLevelPreString;
-            nLevelCnt++;
-            aTmp.Append( ByteString::CreateFromInt32( nLevelCnt ) );
-            pName = &aTmp;
-            break;
-        case 0x1034:
-            if( pName )
-                aTmp = *pName;
-            else
-                aTmp = "END ";
-            if( ( pLevelPre + nLevelInc ) <= pLevelPreStringNT )
-                pLevelPre += nLevelInc;
-            if( nLevelCnt )
-            {
-                aTmp.Append( ByteString::CreateFromInt32( nLevelCnt ) );
-                nLevelCnt--;
-            }
-            else
-                aTmp += "#LEVEL ERROR#";
-            pName = &aTmp;
-            break;
-    }
-
-    ByteString		aT;
-    ByteString&		t = aT;
-    const sal_Char*	pPre = (pLevelPre > pLevelPreString) ? pLevelPre - 1 : pLevelPre;
-
-    if( nR || nL )		// skip dummy-zero DIMENSIONS at eof
-    {
-        if( bBlankLine )
-            *pDumpStream << '\n';
-
-        aT += pLevelPre;
-        __AddHex( aT, nR );
-
-        if( pName )
-        {
-            aT += " (";
-            aT += *pName;
-            aT += ") [";
-        }
-        else
-            aT += " [";
-
-        if( bReadContRecs )
-            __AddHex( aT, nL );
-        else
-            __AddHex( aT, (UINT16)nL );
-        aT += "]";
-        if( !bSkipOffset )
-        {
-            aT += " :";
-            __AddHex( aT, UINT32(pIn->GetSvStreamPos() - 2 * sizeof(UINT16)) );
-            aT += ':';
-        }
-
-        Print( aT );
-    }
-
-    if( HasModeNameOnly( nR ) )
-        ;
-    else if( HasModeHex( nR ) || !bBIFF8 )
-    {
-        if( bEncrypted )
-            PreDumpDecrypted( nL );
-        else
-            ContDump( nL );
-    }
-    else if( nMaxBodyLines && nL )
-    {
-        XclImpStream& rIn = *pIn;
-
-        if( bEncrypted )
-        {
-            PreDumpDecrypted( nL );
-            LINESTART();
-            ADDTEXT( "*** contents ***" );
-            PRINT();
-            pIn->Seek( EXC_REC_SEEK_TO_BEGIN );
-        }
-
-        LINESTART();
-
-        switch( nR )
-        {
-            case 0x0000:        // DIMENSIONS - used area
-            case 0x0200:
-            {
-                LINESTART();
-                UINT32 nR1, nR2;
-                UINT16 nC1, nC2;
-                rIn >> nR1 >> nR2 >> nC1 >> nC2;
-                ADDTEXT( "first row: " );             __AddHex( t, nR1 );
-                ADDTEXT( "   last row+1: " );         __AddHex( t, nR2 );
-                ADDTEXT( "   first col: " );          __AddHex( t, nC1 );
-                ADDTEXT( "   last col+1: " );         __AddHex( t, nC2 );
-                ADDTEXT( "   (" );                    lcl_AddRangeRef( t, nC1, (UINT16)nR1, nC2-1, (UINT16)nR2-1 );
-                ADDTEXT( ")" );
-                PRINT();
-            }
-            break;
-            case 0x06:
-            {
-                ADDCELLHEAD();
-                PRINT();
-                LINESTART();
-                ADDTEXT( "val = " );
-                ADDDOUBLE();
-                rIn >> __nFlags;
-                if( __nFlags )
-                {
-                    ADDTEXT( "   " );
-                    STARTFLAG();
-                    ADDFLAG( 0x01, "fAlwaysCalc" );
-                    ADDFLAG( 0x02, "fCalcOnLoad" );
-                    ADDFLAG( 0x08, "fShrFmla" );
-                }
-                PRINT();
-                LINESTART();
-                UINT16	n;
-                ADDTEXT( "chn = " );
-                ADDHEX( 4 );
-                rIn >> n;
-                ADDTEXT( "    cce = " );
-                __AddDec( t, n );
-                PRINT();
-                FormulaDump( n, FT_CellFormula );
-                if( rIn.GetRecLeft() > 0 )
-                {
-                    LINESTART();
-                    ADDTEXT( "additional formula data" );
-                    PRINT();
-                    ContDump( rIn.GetRecLeft() );
-                }
-            }
-            break;
-            case 0x0013:		// PASSWORD
-                DumpValidPassword( rIn, pPre );
-            break;
-            case 0x0014:        // HEADER
-            case 0x0015:        // FOOTER
-                if( rIn.GetRecLeft() )
-                    AddUNICODEString( t, rIn );
-                PRINT();
-            break;
-            case 0x17:
-            {
-                if( mnSubstream == EXC_BOF_WORKSPACE )
-                {
-                    ADDTEXT( "filename=" );
-                    AddUNICODEString( t, rIn );
-                    PRINT();
-                }
-                else
-                {
-                    UINT16  n;
-                    rIn >> n;
-                    ADDTEXT( "# of XTI: " );
-                    __AddDec( t, n );
-                    PRINT();
-                    UINT16  nSB, nF, nL;
-                    while( n && rIn.IsValid() )
-                    {
-                        LINESTART();
-                        rIn >> nSB >> nF >> nL;
-                        ADDTEXT( "Supbook = " );
-                        __AddDec( t, nSB );
-                        ADDTEXT( "    Tab = " );
-                        __AddDec( t, nF );
-                        ADDTEXT( " ... " );
-                        __AddDec( t, nL );
-                        PRINT();
-                        n--;
-                    }
-                }
-            }
-            break;
-            case 0x0018:
-            case 0x0218:		// NAME
-            {
-                sal_uInt8 nKey, nNameLen, nMenuLen, nDescrLen, nHelpLen, nStatusLen;
-                sal_uInt16 nFmlaSize, nRes, nTab;
-
-                rIn >> __nFlags >> nKey >> nNameLen >> nFmlaSize >> nRes >> nTab >> nMenuLen >> nDescrLen >> nHelpLen >> nStatusLen;
-                LINESTART();
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fHidden" );
-                ADDFLAG( 0x0002, "fFunc" );
-                ADDFLAG( 0x0004, "fVBProc" );
-                ADDFLAG( 0x0008, "fProc" );
-                ADDFLAG( 0x0010, "fCalcExp" );
-                ADDFLAG( 0x0020, "fBuiltIn" );
-                ADDFLAG( 0x1000, "fBig" );
-                ADDRESERVED( 0xE000 );
-                ADDTEXT( "   func-group-idx=" );
-                __AddDec( t, (UINT16)((__nFlags & 0x0FC0) >> 6) );
-                ADDTEXT( "   shortcut=" );      __AddHex( t, nKey );
-                PRINT();
-
-                LINESTART();
-                ADDTEXT( "fmla-size=" );        __AddDec( t, nFmlaSize );
-                ADDTEXT( "   reserved=" );      __AddHex( t, nRes );
-                ADDTEXT( "   tab=" );           __AddDec( t, nTab );
-                if( !nTab ) ADDTEXT( " (global)" );
-                PRINT();
-
-                LINESTART();
-                sal_uInt16 nBuiltIn = 0;
-                bool bBuiltIn = (nNameLen == 1) && (__nFlags & 0x0020);
-                if( bBuiltIn )
-                {
-                    rIn.PushPosition();
-                    sal_uInt8 nStrFlags;
-                    rIn >> nStrFlags;
-                    nBuiltIn = (nStrFlags & 1) ? rIn.ReaduInt16() : rIn.ReaduInt8();
-                    rIn.PopPosition();
-                }
-                ADDTEXT( "name=" );
-                ByteString aName;
-                AddUNICODEString( t, rIn, false, nNameLen, &aName );
-                if( bBuiltIn )
-                {
-                    static const sal_Char* const ppcNames[] = {
-                        "Consolidate_Area", "Auto_Open", "Auto_Close", "Extract", "Database",
-                        "Criteria", "Print_Area", "Print_Titles", "Recorder", "Data_Form",
-                        "Auto_Activate", "Auto_Deactivate", "Sheet_Title", "_FilterDatabase" };
-                    lcl_AddEnum( t, nBuiltIn, ppcNames, STATIC_TABLE_SIZE( ppcNames ) );
-                    if( (0 <= nBuiltIn) && (nBuiltIn < STATIC_TABLE_SIZE( ppcNames )) )
-                        aName.Assign( ppcNames[ nBuiltIn ] );
-                }
-                maNames.push_back( aName );
-                PRINT();
-
-                if( nFmlaSize && (rIn.GetRecLeft() > 0) )
-                {
-                    LINESTART();
-                    ADDTEXT( "name-definition=" );
-                    PRINT();
-                    FormulaDump( nFmlaSize, FT_RangeName );
-                }
-                if( nMenuLen )
-                {
-                    LINESTART();
-                    ADDTEXT( "menu-text=" );
-                    AddUNICODEString( t, rIn, false, nMenuLen );
-                    PRINT();
-                }
-                if( nDescrLen )
-                {
-                    LINESTART();
-                    ADDTEXT( "descr-text=" );
-                    AddUNICODEString( t, rIn, false, nDescrLen );
-                    PRINT();
-                }
-                if( nHelpLen )
-                {
-                    LINESTART();
-                    ADDTEXT( "help-text=" );
-                    AddUNICODEString( t, rIn, false, nHelpLen );
-                    PRINT();
-                }
-                if( nStatusLen )
-                {
-                    LINESTART();
-                    ADDTEXT( "status-text=" );
-                    AddUNICODEString( t, rIn, false, nStatusLen );
-                    PRINT();
-                }
-            }
-            break;
-            case 0x001D:		// SELECTION - list of selections
-            {
-                ADDTEXT( "pane: " );				ADDDEC( 1 );
-                ADDTEXT( "   active cell: " );
-                UINT16 nR, nC;
-                rIn >> nR >> nC;
-                lcl_AddRef( t, nC, nR );
-                ADDTEXT( "   active index: " );		ADDDEC( 2 );
-                ADDTEXT( "   ref count: " );
-                UINT16 nCount;
-                rIn >> nCount;
-                __AddDec( t, nCount );
-                PRINT();
-                for( UINT16 nIndex = 0; nIndex < nCount && rIn.IsValid(); nIndex++ )
-                {
-                    LINESTART();
-                    UINT16 nR1, nR2;
-                    UINT8 nC1, nC2;
-                    rIn >> nR1 >> nR2 >> nC1 >> nC2;
-                    ADDTEXT( "ref#" );		__AddDec( t, nIndex, 3 );
-                    ADDTEXT( ": " );        lcl_AddRangeRef( t, nC1, nR1, nC2, nR2 );
-                    PRINT();
-                }
-            }
-            break;
-            case 0x0023:        // EXTERNNAME
-            {
-                PreDump( rIn.GetRecSize() );
-                rIn >> __nFlags;
-                STARTFLAG();
-                ADDFLAG( 0x0001, "builtin" );
-                ADDFLAG( 0x0002, "automatic" );
-                ADDFLAG( 0x0004, "wantcliprepr" );
-                ADDFLAG( 0x0008, "DDEstddocname" );
-                ADDFLAG( 0x0010, "OLE" );
-                ADDRESERVED( 0x8000 );
-                sal_uInt16 nClip = (__nFlags & 0x7FE0) >> 5;
-                ADDTEXT( "   clip-format=" );       __AddHex( t, nClip );
-                PRINT(); LINESTART();
-                bool bFormula = false, bArray = false;
-                if( (__nFlags & 0x0001) || !(__nFlags & 0x7FFE) )
-                {
-                    ADDTEXT( "type=external name" );
-                    ADDTEXT( "   table=" );             ADDDEC( 2 );
-                    ADDTEXT( "   reserved=" );          ADDHEX( 2 );
-                    bFormula = true;
-                }
-                else if( __nFlags & 0x0010 )
-                {
-                    ADDTEXT( "type=OLE" );
-                    ADDTEXT( "   stream-id=" );         ADDHEX( 4 );
-                }
-                else
-                {
-                    ADDTEXT( "type=DDE" );
-                    ADDTEXT( "   reserved=" );          ADDHEX( 4 );
-                    bArray = true;
-                }
-                PRINT(); LINESTART();
-                ADDTEXT( "name=" );                 AddUNICODEString( t, rIn, FALSE );
-                PRINT();
-                if( rIn.GetRecLeft() > 0 )
-                {
-                    LINESTART();
-                    if( bFormula )
-                    {
-                        sal_uInt16 nSize = rIn.ReaduInt16();
-                        ADDTEXT( "formula (size=" );    __AddDec( t, nSize );
-                        ADDTEXT( "):" );
-                        PRINT();
-                        FormulaDump( nSize, FT_RangeName );
-                    }
-                    else if( bArray && (rIn.GetRecLeft() >= 3) )
-                    {
-                        LINESTART();
-                        ADDTEXT( "constant array   width=" );   ADDDEC( 1 );
-                        ADDTEXT( "   height=" );                ADDDEC( 2 );
-                        PRINT();
-                        while( rIn.GetRecLeft() > 0 )
-                        {
-                            sal_uInt8 nType = rIn.ReaduInt8();
-                            LINESTART();
-                            ADDTEXT( "type=" );                 __AddHex( t, nType );
-                            ADDTEXT( " (" );
-                            switch( nType )
-                            {
-                                case 0x00:
-                                    ADDTEXT( "empty)    reserved=" );   ADDHEX( 4 );
-                                    ADDTEXT( " " );                     ADDHEX( 4 );
-                                break;
-                                case 0x01:
-                                    ADDTEXT( "double)   value=" );      ADDDOUBLE();
-                                break;
-                                case 0x02:
-                                    ADDTEXT( "string)   text=" );       AddUNICODEString( t, rIn );
-                                break;
-                                case 0x04:
-                                    ADDTEXT( "bool)     value=" );      lcl_AddFlag( t, rIn.ReaduInt8() );
-                                    ADDTEXT( "   reserved=" );          ADDHEX( 1 );
-                                    ADDTEXT( " " );                     ADDHEX( 2 );
-                                    ADDTEXT( " " );                     ADDHEX( 4 );
-                                break;
-                                case 0x10:
-                                    ADDTEXT( "error)    code=" );        ADDHEX( 1 );
-                                    ADDTEXT( "   reserved=" );          ADDHEX( 1 );
-                                    ADDTEXT( " " );                     ADDHEX( 2 );
-                                    ADDTEXT( " " );                     ADDHEX( 4 );
-                                break;
-                                default:
-                                    ADDTEXT( "!unknown!)" );
-                                    rIn.Ignore( 8 );
-                            }
-                            PRINT();
-                        }
-                    }
-                    if( rIn.GetRecLeft() > 0 )
-                    {
-                        LINESTART();
-                        ADDTEXT( "additional data:" );
-                        PRINT();
-                        ContDump( rIn.GetRecLeft() );
-                    }
-                }
-            }
-            break;
-            case 0x0026:
-            case 0x0027:
-            case 0x0028:
-            case 0x0029:
-                LINESTART();
-                ADDDOUBLE();
-                PRINT();
-            break;
-            case 0x002F:        // FILEPASS
-            {
-                LINESTART();
-                sal_uInt16 nType;
-                rIn >> nType;
-                ADDTEXT( "encrypt-type=" );     __AddHex( t, nType );
-                ADDTEXT( " (" );
-                switch( nType )
-                {
-                    case 0x0000:
-                    {
-                        ADDTEXT( "BIFF2-BIFF7 XOR)   key=" );
-                        ADDHEX( 2 );
-                        ADDTEXT( "   hash=" );
-                        ADDHEX( 2 );
-                        PRINT();
-                    }
-                    break;
-
-                    case 0x0001:
-                    {
-                        ADDTEXT( "BIFF8 standard/strong)" );
-                        PRINT();
-                        LINESTART();
-                        ADDTEXT( "reserved=" );     ADDHEX( 2 );
-                        sal_uInt16 nMode;
-                        rIn >> nMode;
-                        ADDTEXT( "   mode=" );      __AddHex( t, nMode );
-                        ADDTEXT( " (" );
-                        switch( nMode )
-                        {
-                            case 0x0001:
-                            {
-                                ADDTEXT( "BIFF8 standard)" );
-                                PRINT();
-                                LINESTART();
-                                ADDTEXT( "document-id=..." );
-                                PRINT();
-                                ContDump( 16 );
-                                LINESTART();
-                                ADDTEXT( "salt-data=..." );
-                                PRINT();
-                                ContDump( 16 );
-                                LINESTART();
-                                ADDTEXT( "salt-hash=..." );
-                                PRINT();
-                                ContDump( 16 );
-                            }
-                            break;
-                            case 0x0002:
-                            {
-                                ADDTEXT( "BIFF8X strong)   flags=" );
-                                ADDHEX( 4 );
-                                PRINT();
-                                LINESTART();
-                                ADDTEXT( "info-size=" );        ADDHEX( 4 );
-                                ADDTEXT( "    flags=" );        ADDHEX( 4 );
-                                ADDTEXT( "    unknown=" );      ADDHEX( 4 );
-                                PRINT();
-                                LINESTART();
-                                ADDTEXT( "stream-crypt-id=" );  ADDHEX( 4 );
-                                ADDTEXT( "   hash-algo-id=" );  ADDHEX( 4 );
-                                ADDTEXT( "   hash-key-len=" );  ADDDEC( 4 );
-                                PRINT();
-                                LINESTART();
-                                ADDTEXT( "crypt-prov-type=" );  ADDHEX( 4 );
-                                ADDTEXT( "   unknown=" );       ADDHEX( 4 );
-                                ADDTEXT( "   unknown=" );       ADDHEX( 4 );
-                                PRINT();
-                                LINESTART();
-                                ADDTEXT( "crypt-provider-name='" );
-                                sal_uInt16 nChar;
-                                do
-                                {
-                                    rIn >> nChar;
-                                    if( nChar )
-                                        t += (sal_Char)(((32 <= nChar) && (nChar <=127)) ? nChar : '.');
-                                }
-                                while( nChar );
-                                ADDTEXT( "'" );
-                                PRINT();
-                                LINESTART();
-                                sal_uInt32 nLen;
-                                rIn >> nLen;
-                                ADDTEXT( "*** document-id ***   len=" );   __AddHex( t, nLen );
-                                PRINT();
-                                ContDump( nLen );
-                                LINESTART();
-                                ADDTEXT( "*** salt-data ***   len=" );   __AddHex( t, nLen );
-                                PRINT();
-                                ContDump( nLen );
-                                LINESTART();
-                                rIn >> nLen;
-                                ADDTEXT( "*** salt-hash ***   len=" );   __AddHex( t, nLen );
-                                PRINT();
-                                ContDump( nLen );
-                            }
-                            break;
-                            default:
-                            {
-                                ADDTEXT( "!unknown!)" );
-                                PRINT();
-                                ContDump( rIn.GetRecLeft() );
-                            }
-                        }
-                    }
-                    break;
-
-                    default:
-                    {
-                        ADDTEXT( "!unknown!)" );
-                        PRINT();
-                        ContDump( rIn.GetRecLeft() );
-                    }
-                }
-            }
-            break;
-            case 0x0031:		// FONT
-            case 0x0231:
-            {
-                LINESTART();
-                ADDTEXT( "(index=" );			__AddDec( t, nFontIndex );
-                ADDTEXT( ")   " );
-                nFontIndex++; if( nFontIndex == 4 ) nFontIndex++;
-                ADDTEXT( "height: " );			ADDDEC( 2 );
-                ADDTEXT( "/20pt   " );
-                rIn >> __nFlags;
-                STARTFLAG();
-                ADDFLAG( 0x0002, "fItalic" );
-                ADDFLAG( 0x0008, "fStrikeout" );
-                ADDFLAG( 0x0010, "fOutline" );
-                ADDFLAG( 0x0020, "fShadow" );
-                ADDRESERVED( 0xFFC5 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "color: " );			ADDDEC( 2 );
-                ADDTEXT( "   boldness: " );		ADDDEC( 2 );
-                ADDTEXT( "   sub/sup: " );		ADDDEC( 2 );
-                ADDTEXT( "   underline: " );	ADDHEX( 1 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "family: " );			ADDDEC( 1 );
-                ADDTEXT( "   charset: " );		ADDDEC( 1 );
-//               ADDTEXT( "   reserved: " );     ADDHEX( 1 );
-                rIn.Ignore( 1 );
-                ADDTEXT( "   " );
-                AddUNICODEString( t, rIn, FALSE );
-                PRINT();
-            }
-            break;
-            case 0x003D:        // WINDOW1
-            {
-                LINESTART();
-                ADDTEXT( "pos-x=" );            ADDDEC( 2 );
-                ADDTEXT( "   pos-y=" );         ADDDEC( 2 );
-                ADDTEXT( "   width=" );         ADDDEC( 2 );
-                ADDTEXT( "   height=" );        ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                rIn >> __nFlags;
-                STARTFLAG();
-                ADDFLAG( 0x0001, "hide-window" );
-                ADDFLAG( 0x0002, "min-window" );
-                ADDFLAG( 0x0008, "show-hscroll" );
-                ADDFLAG( 0x0010, "show-vscroll" );
-                ADDFLAG( 0x0020, "show-tabbar" );
-                ADDRESERVED( 0xFFC4 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "active-tab=" );       ADDDEC( 2 );
-                ADDTEXT( "   first-vis-tab=" ); ADDDEC( 2 );
-                ADDTEXT( "   selected-tabs=" ); ADDDEC( 2 );
-                ADDTEXT( "   tabbar-width=" );  ADDDEC( 2 );
-                PRINT();
-            }
-            break;
-            case 0x0041:        // PANE
-            {
-                LINESTART();
-                ADDTEXT( "vert-split-pos=" );   ADDDEC( 2 );
-                ADDTEXT( "   hor-split-pos=" ); ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "first-row=" );        ADDDEC( 2 );
-                ADDTEXT( "   first-col=" );     ADDDEC( 2 );
-                ADDTEXT( "   active-pane=" );   ADDDEC( 2 );
-                PRINT();
-            }
-            break;
-            case 0x0042:        // CODEPAGE
-            {
-                LINESTART();
-                sal_uInt16 nCodePage = rIn.ReaduInt16();
-                ADDTEXT( "codepage=" );         __AddHex( t, nCodePage );
-                ADDTEXT( " (" );                __AddDec( t, nCodePage );
-                ADDTEXT( ")" );
-                PRINT();
-            }
-            break;
-            case 0x004D:        // PLS
-            {
-                LINESTART();
-                static const sal_Char* const ppcTypes[] = { "Win", "Mac" };
-                sal_uInt16 nType = rIn.ReaduInt16();
-                ADDTEXT( "environment=" );
-                lcl_AddEnum( t, nType, ppcTypes, STATIC_TABLE_SIZE( ppcTypes ) );
-                PRINT();
-                if( nType == 0 )
-                {
-                    String aData;
-                    sal_uInt32 __nFlags;
-                    LINESTART();
-                    rIn.SetNulSubstChar( '\0' );
-                    aData = rIn.ReadRawUniString( 32, true );
-                    ADDTEXT( "device-name='" );         ADDTEXT( GETSTR( aData ) );
-                    ADDTEXT( "'" );
-                    PRINT(); LINESTART();
-                    ADDTEXT( "spec-version=" );         ADDDEC( 2 );
-                    ADDTEXT( "   driver-version=" );    ADDDEC( 2 );
-                    sal_uInt16 nOwnSize, nPrvSize;
-                    rIn >> nOwnSize >> nPrvSize;
-                    ADDTEXT( "   own-size=" );          __AddDec( t, nOwnSize );
-                    ADDTEXT( "   prv-size=" );          __AddDec( t, nPrvSize );
-                    PRINT(); LINESTART();
-                    rIn >> __nFlags;
-                    STARTFLAG();
-                    ADDFLAG( 0x00000001, "orient" );
-                    ADDFLAG( 0x00000002, "paper-size" );
-                    ADDFLAG( 0x00000004, "paper-height" );
-                    ADDFLAG( 0x00000008, "paper-width" );
-                    ADDFLAG( 0x00000010, "scale" );
-                    ADDFLAG( 0x00000100, "copies" );
-                    ADDRESERVED( 0xE0000080 );
-                    PRINT(); LINESTART();
-                    static const sal_Char* const ppcOrient[] = { 0, "portrait", "landsc" };
-                    sal_uInt16 nOrient = rIn.ReaduInt16();
-                    ADDTEXT( "orientation=" );
-                    lcl_AddEnum( t, nOrient, ppcOrient, STATIC_TABLE_SIZE( ppcOrient ) );
-                    ADDTEXT( "   paper-size=" );        ADDDEC( 2 );
-                    ADDTEXT( "   paper-width=" );       ADDDEC( 2 );
-                    ADDTEXT( "   paper-height=" );      ADDDEC( 2 );
-                    PRINT(); LINESTART();
-                    ADDTEXT( "scale=" );                ADDDEC( 2 );
-                    ADDTEXT( "   copies=" );            ADDDEC( 2 );
-                    PRINT();
-                    if( nOwnSize > 88 )
-                    {
-                        LINESTART(); ADDTEXT( "additional data:" ); PRINT();
-                        ContDump( nOwnSize - 88 );
-                    }
-                    if( nPrvSize > 0 )
-                    {
-                        LINESTART(); ADDTEXT( "private data:" ); PRINT();
-                        ContDump( nPrvSize );
-                    }
-                }
-                if( rIn.GetRecLeft() > 0 )
-                {
-                    LINESTART(); ADDTEXT( "unknown data:" ); PRINT();
-                    ContDump( rIn.GetRecLeft() );
-                }
-            }
-            break;
-            case 0x51:
-            {
-                UINT16	nR1, nR2;
-                UINT8	nC1, nC2;
-                rIn >> nR1 >> nR2 >> nC1 >> nC2;
-                lcl_AddRangeRef( t, nC1, nR1, nC2, nR2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "workbook: " );
-                AddUNICODEString( t, rIn, TRUE );
-                PRINT();
-            }
-            break;
-            case 0x0052:    // DCONNAME
-            {
-                ADDTEXT( "name=" );
-                AddUNICODEString( t, rIn, TRUE );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "sheet=" );
-                AddUNICODEString( t, rIn, TRUE );
-                PRINT();
-            }
-            break;
-            case 0x5B:			// FILESHARING
-            {
-                PreDump( nL );
-                rIn >> __nFlags;
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x0001, "fReadOnlyRec" );
-                    PRINT();
-                }
-                DumpValidPassword( rIn, pPre );
-            }
-            break;
-            case 0x5D:
-                ObjDump( nL );
-                break;
-            case 0x007D:		// COLINFO - col range info
-            {
-                LINESTART();
-                ADDTEXT( "col range: " );
-                ADDDEC( 2 );
-                ADDTEXT( "-" );
-                ADDDEC( 2 );
-                ADDTEXT( "   width: " );
-                ADDDEC( 2 );
-                ADDTEXT( "/256 charwidth   ix to XF: " );
-                ADDDEC( 2 );
-                PRINT();
-                rIn >> __nFlags;
-                LINESTART();
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fHidden" );
-                ADDTEXT( " outlnlev=" );
-                __AddDec( t, (UINT16)((__nFlags & 0x0700) >> 8) );
-                ADDFLAG( 0x1000, "fCollapsed" );
-                ADDRESERVED( 0xE8FE );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "reserved: " );
-                ADDHEX( 1 );
-                PRINT();
-            }
-            break;
-            case 0x7E:
-            {
-//				LINESTART();
-                ADDCELLHEAD();
-                ADDTEXT( "   val = " );
-                __AddRK( t, rIn.ReadInt32() );
-                PRINT();
-            }
-            break;
-            case 0x0080:		// GUTS - row & col gutters for outlines
-            {
-                LINESTART();
-                ADDTEXT( "size row gutter: " );
-                __AddDec( t, Read2( rIn ), 5 );
-                ADDTEXT( "   |   size col gutter: " );
-                __AddDec( t, Read2( rIn ), 5 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "max outline lev: " );
-                __AddDec( t, Read2( rIn ), 5 );
-                ADDTEXT( "   |   max outline lev: " );
-                __AddDec( t, Read2( rIn ), 5 );
-                PRINT();
-            }
-            break;
-            case 0x0081:		// WSBOOL - additional workspace info
-            {
-                rIn >> __nFlags;
-                LINESTART();
-                STARTFLAG();
-                if( __nFlags & 0x00F1 )
-                {
-                    ADDFLAG( 0x0001, "fShowAutoBreaks" );
-                    ADDFLAG( 0x0010, "fDialog" );
-                    ADDFLAG( 0x0020, "fApplyStyles" );
-                    ADDFLAG( 0x0040, "fRowSumsBelow" );
-                    ADDFLAG( 0x0080, "fColSumsBelow" );
-                    PRINT();
-                    LINESTART();
-                }
-                if( __nFlags & (0xCD00 | 0x320E) )
-                {
-                    ADDTEXT( "   " );
-                    ADDFLAG( 0x0100, "fFitToPage" );
-                    ADDFLAG( 0x0400, "fDispRowGuts" );
-                    ADDFLAG( 0x0800, "fDispColGuts" );
-                    ADDFLAG( 0x4000, "fAee" );
-                    ADDFLAG( 0x8000, "fAfe" );
-                    ADDRESERVED( 0x320E );
-                    PRINT();
-                }
-                if( !__nFlags )
-                    PRINT();
-            }
-            break;
-            case 0x008C:        // COUNTRY
-            {
-                LINESTART();
-                ADDTEXT( "ui-country=" );           ADDDEC( 2 );
-                ADDTEXT( "   doc-country=" );       ADDDEC( 2 );
-                PRINT();
-            }
-            break;
-            case 0x92:		// PALETTE
-            {
-                UINT16 nColCnt;
-                rIn >> nColCnt;
-                LINESTART();
-                ADDTEXT( "count: " );
-                __AddDec( t, nColCnt );
-                PRINT();
-                LINESTART();
-                for( UINT16 nCol = 0; nCol < nColCnt; nCol++ )
-                {
-                    __AddDec( t, nCol, 2 );
-                    ADDTEXT( "=" );
-                    ADDHEX( 4 );
-                    ADDTEXT( "   " );
-                    if( (nCol % 5 == 4) || (nCol == nColCnt - 1) )
-                    {
-                        PRINT();
-                        LINESTART();
-                    }
-                }
-            }
-            break;
-            case 0x9D:		// AUTOFILTERINFO -- count of drop-down arrows
-            {
-                LINESTART();
-                ADDTEXT( "count of drop-down arrows: " );
-                ADDDEC( 2 );
-                PRINT();
-            }
-            break;
-            case 0x9E:		// AUTOFILTER -- autofilter settings
-            {
-                UINT8		nType;
-                UINT8		nCompare;
-                ByteString	sTemp[ 2 ];
-                UINT16		nLen[ 2 ] = { 0, 0 };
-                UINT8		nF;
-                LINESTART();
-                ADDTEXT( "count: " );
-                ADDDEC( 2 );
-                rIn >> __nFlags;
-                STARTFLAG();
-                ADDFLAG( 0x0003, "fJoin" );
-                ADDFLAG( 0x0004, "fSimpleEq1" );
-                ADDFLAG( 0x0008, "fSimpleEq2" );
-                ADDFLAG( 0x0010, "fTop10" );
-                ADDFLAG( 0x0020, "fTop" );
-                ADDFLAG( 0x0040, "fPercent" );
-                PRINT();
-                LINESTART();
-                if( __nFlags & 0x0003 )
-                    ADDTEXT( "(custom conditions are OR-ed" );
-                else
-                    ADDTEXT( "(custom conditions are AND-ed" );
-                if( __nFlags & 0x0010 )
-                {
-                    if( __nFlags & 0x0020 )
-                        ADDTEXT( "; show top " );
-                    else
-                        ADDTEXT( "; show bottom " );
-                    __AddDec( t, (UINT16)(__nFlags >> 7) );
-                    if( __nFlags & 0x0040 )
-                        ADDTEXT( " percent" );
-                    else
-                        ADDTEXT( " items" );
-                }
-                ADDTEXT( ")" );
-                PRINT();
-                for( nF = 0; nF < 2; nF++ )
-                {
-                    LINESTART();
-                    __AddDec( t, (UINT16)(nF + 1) );
-                    ADDTEXT( ". Filter: " );
-                    rIn >> nType >> nCompare;
-                    switch( nType )
-                    {
-                        case 0x00:	ADDTEXT( "not used " );			break;
-                        case 0x02:	ADDTEXT( "RK " );				break;
-                        case 0x04:	ADDTEXT( "double " );			break;
-                        case 0x06:	ADDTEXT( "string " );			break;
-                        case 0x08:	ADDTEXT( "bool/err " );			break;
-                        case 0x0A:	ADDTEXT( "show nothing " );		break;
-                        case 0x0C:	ADDTEXT( "all blanks " );		break;
-                        case 0x0E:	ADDTEXT( "all non-blanks " );	break;
-                        default:
-                            ADDTEXT( "unknown (" );
-                            __AddHex( t, nType );
-                            ADDTEXT( ") " );
-                    }
-                    switch( nCompare )
-                    {
-                        case 0x01:	ADDTEXT( "< " );	break;
-                        case 0x02:	ADDTEXT( "= " );	break;
-                        case 0x03:	ADDTEXT( "<= " );	break;
-                        case 0x04:	ADDTEXT( "> " );	break;
-                        case 0x05:	ADDTEXT( "<> " );	break;
-                        case 0x06:	ADDTEXT( ">= " );	break;
-                        default:	if( nCompare ) __AddHex( t, nCompare );
-                    }
-                    sTemp[ nF ] = t;
-                    switch( nType )
-                    {
-                        case 0x02:
-                            __AddRK( sTemp[ nF ], rIn.ReadInt32() );
-                            IGNORE( 4 );
-                            break;
-                        case 0x04:
-                            __AddDouble( sTemp[ nF ], Read8( rIn ) );
-                            break;
-                        case 0x06:
-                            IGNORE( 4 );
-                            nLen[ nF ] = Read1( rIn );
-                            IGNORE( 3 );
-                            break;
-                        case 0x08:
-                            __AddHex( sTemp[ nF ], Read1( rIn ) );
-                            sTemp[ nF ] += " ";
-                            __AddHex( sTemp[ nF ], Read1( rIn ) );
-                            IGNORE( 6 );
-                            break;
-                        default:
-                            IGNORE( 8 );
-                    }
-                }
-                for( nF = 0; nF < 2; nF++ )
-                {
-                    t = sTemp[ nF ];
-                    if( nLen[ nF ] )
-                        AddUNICODEString( t, rIn, TRUE, nLen[ nF ] );
-                    PRINT();
-                }
-            }
-            break;
-            case 0xA0:
-            {
-                UINT16	nN, nD;
-                rIn >> nN >> nD;
-                LINESTART();
-                ADDTEXT( "Window Zoom Magnification = " );
-                __AddDec( t, nN );
-                ADDTEXT( "/" );
-                __AddDec( t, nD );
-                PRINT();
-            }
-            break;
-            case 0x00A1:    // SETUP
-            {
-                LINESTART();
-                ADDTEXT( "paper size: " );          ADDDEC( 2 );
-                ADDTEXT( "   scaling: " );          ADDDEC( 2 );
-                ADDTEXT( "   start page: " );       ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "fit to width: " );        ADDDEC( 2 );
-                ADDTEXT( "   fit to height: " );    ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                rIn >> __nFlags;
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fLeftRight" );
-                ADDFLAG( 0x0002, "fPortrait" );
-                ADDFLAG( 0x0004, "fNoPrintSettings" );
-                ADDFLAG( 0x0008, "fMonochrom" );
-                ADDFLAG( 0x0010, "fDraft" );
-                ADDFLAG( 0x0020, "fNotes" );
-                ADDFLAG( 0x0040, "fNoOrientation" );
-                ADDFLAG( 0x0080, "fCustomNumber" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "Print res: " );           ADDDEC( 2 );
-                ADDTEXT( "   vert print res: " );   ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "header margin: " );       ADDDOUBLE();
-                ADDTEXT( "   footer margin: " );    ADDDOUBLE();
-                ADDTEXT( "   copies: " );           ADDDEC( 2 );
-                PRINT();
-            }
-            break;
-            case 0xAF:
-            {
-                UINT16	nCref;
-                UINT8	nLocked, nHidden, nName, nComment, nNameUser;
-                rIn >> nCref >> nLocked >> nHidden >> nName >> nComment >> nNameUser;
-                LINESTART();
-                ADDTEXT( "Changing Cells = " );
-                __AddDec( t, nCref );
-                if( nLocked )
-                    ADDTEXT( "  fLocked" );
-                if( nHidden )
-                    ADDTEXT( "  fHidden" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "Name = " );
-                __AddDec( t, nName );
-                ADDTEXT( "    Comment = " );
-                __AddDec( t, nComment );
-                ADDTEXT( "    Name User = " );
-                __AddDec( t, nNameUser );
-                PRINT();
-                ContDump( rIn.GetRecLeft() );
-            }
-            break;
-            case 0xB0:		// SXVIEW
-            {
-                UINT16	nColFirst, nColLast, nRowFirst, nRowLast;
-                rIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast;
-                nSXLIIndex = 0;		// new pivot table
-                LINESTART();
-                ADDTEXT( "PivotTable: " );			__AddDec( t, nColFirst );
-                ADDTEXT( " / " );					__AddDec( t, nRowFirst );
-                ADDTEXT( " - " );					__AddDec( t, nColLast );
-                ADDTEXT( " / " );					__AddDec( t, nRowLast );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "1st Head: " );			ADDDEC( 2 );
-                rIn >> nRowFirst;
-                ADDTEXT( "    First Data: " );		ADDDEC( 2 );
-                ADDTEXT( " / " );					__AddDec( t, nRowFirst );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "Cache index: " );			ADDDEC( 2 );
-                ADDTEXT( "    reserved: " );		ADDHEX( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "axis 4 data: " );			ADDDEC( 2 );
-                ADDTEXT( "     pos 4 Data: " );		ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "num of fields: " );		ADDDEC( 2 );
-                rIn >> nSXLISize[0] >> nSXLISize[1];
-                ADDTEXT( "     ...row fields: " );	__AddDec( t, nSXLISize[0] );
-                ADDTEXT( "     ...col fields: " );	__AddDec( t, nSXLISize[1] );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "num of page fields: " );	ADDDEC( 2 );
-                ADDTEXT( "     ...data fields: " );	ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "data rows: " );			ADDDEC( 2 );
-                ADDTEXT( "     data cols: " );		ADDDEC( 2 );
-                rIn >> __nFlags;
-                PRINT();
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x0001, "fRowGrand" );
-                    ADDFLAG( 0x0002, "fColGrand" );
-                    ADDFLAG( 0x0008, "fAutoFormat" );
-                    ADDFLAG( 0x0010, "fWidthHeightAuto" );
-                    ADDFLAG( 0x0020, "fFontAuto" );
-                    ADDFLAG( 0x0040, "fAlignAuto" );
-                    ADDFLAG( 0x0080, "fBorderAuto" );
-                    ADDFLAG( 0x0100, "fPatternAuto" );
-                    ADDFLAG( 0x0200, "fNumberAuto" );
-                    PRINT();
-                }
-                LINESTART();
-                ADDTEXT( "index 2 PivotTable autoform: " );
-                ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                UINT16	nTableLen = Read2( rIn );
-                UINT16	nDataLen = Read2( rIn );
-                ADDTEXT( "PivotTable name: " );
-                if( nTableLen )
-                    AddUNICODEString( t, rIn, TRUE, nTableLen );
-                else
-                    ADDTEXT( "-/-" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "data field name: " );
-                if( nDataLen )
-                    AddUNICODEString( t, rIn, TRUE, nDataLen );
-                else
-                    ADDTEXT( "-/-" );
-                PRINT();
-            }
-            break;
-            case 0xB1:															// SXVD
-            {
-                rIn >> __nFlags;
-                LINESTART();
-                ADDTEXT( "Axis (" );
-                __AddHex( t, __nFlags );
-                ADDTEXT( "):" );
-                if( __nFlags )
-                {
-                    ADDFLAG( 0x0001, "row" );
-                    ADDFLAG( 0x0002, "col" );
-                    ADDFLAG( 0x0004, "page" );
-                    ADDFLAG( 0x0008, "data" );
-                }
-                else
-                    ADDTEXT( " no axis" );
-                ADDTEXT( "   num of att. subtotals: " );
-                ADDDEC( 2 );
-                PRINT();
-                rIn >> __nFlags;
-                LINESTART();
-                ADDTEXT( "subtotal type(" );
-                __AddHex( t, __nFlags );
-                ADDTEXT( "):" );
-                if( __nFlags )
-                {
-                    ADDFLAG( 0x0001, "Default" );
-                    ADDFLAG( 0x0002, "Sum" );
-                    ADDFLAG( 0x0004, "Counta" );
-                    ADDFLAG( 0x0008, "Average" );
-                    ADDFLAG( 0x0010, "Max" );
-                    ADDFLAG( 0x0020, "Min" );
-                    ADDFLAG( 0x0040, "Product" );
-                    ADDFLAG( 0x0080, "Count" );
-                    ADDFLAG( 0x0100, "Stdev" );
-                    ADDFLAG( 0x0200, "Stddevp" );
-                    ADDFLAG( 0x0400, "Var" );
-                    ADDFLAG( 0x0800, "Varp" );
-                }
-                else
-                    ADDTEXT( " none" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "num of items: " );
-                ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "Name: " );
-                UINT16		nLen = Read2( rIn );
-                if( nLen == 0xFFFF )
-                    ADDTEXT( "<name in cache>" );
-                else if( nLen )
-                    AddUNICODEString( t, rIn, TRUE, nLen );
-                PRINT();
-            }
-            break;
-            case 0xB2:															// SXVI
-            {
-                UINT16	nType, nCache;
-                rIn >> nType >> __nFlags >> nCache;
-                LINESTART();
-                switch( nType )
-                {
-                    case 0xFE:	p = "Page";			break;
-                    case 0xFF:	p = "Null";			break;
-                    case 0x00:	p = "Data";			break;
-                    case 0x01:	p = "Default";		break;
-                    case 0x02:	p = "SUM";			break;
-                    case 0x03:	p = "COUNT";		break;
-                    case 0x04:	p = "AVERAGE";		break;
-                    case 0x05:	p = "MAX";			break;
-                    case 0x06:	p = "MIN";			break;
-                    case 0x07:	p = "PRODUCT";		break;
-                    case 0x08:	p = "COUNTA";		break;
-                    case 0x09:	p = "STDEV";		break;
-                    case 0x0A:	p = "STDEVP";		break;
-                    case 0x0B:	p = "VAR";			break;
-                    case 0x0C:	p = "VARP";			break;
-                    case 0x0D:	p = "Grand total";	break;
-                    default:	p = pU;
-                }
-                ADDTEXT( "Type (" );
-                __AddHex( t, nType );
-                ADDTEXT( "): " );
-                ADDTEXT( p );
-                ADDTEXT( "    iCache: " );
-                __AddDec( t, nCache );
-                PRINT();
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x01, "fHidden" );
-                    ADDFLAG( 0x02, "fHideDetail" );
-                    ADDFLAG( 0x04, "fFormula" );
-                    ADDFLAG( 0x08, "fMissing" );
-                    PRINT();
-                }
-                LINESTART();
-                ADDTEXT( "Name: " );
-                UINT16	nCch = Read2( rIn );
-                if( nCch == 0xFFFF )
-                    ADDTEXT( "<name in cache>" );
-                else if( nCch )
-                    AddUNICODEString( t, rIn, TRUE, nCch );
-                else
-                    ADDTEXT( "<empty string>" );
-                PRINT();
-            }
-            break;
-            case 0xB4:															// SXIVD
-            {
-                const UINT16	nBrkNum = 5;
-                UINT16			nBrk = nBrkNum;
-                UINT16			nSize = (UINT16)(nL / 2);
-                LINESTART();
-                for( UINT16 i = 0; i < nSize; i++ )
-                {
-                    ADDHEX( 2 );
-                    nBrk--;
-                    if( nBrk )
-                        ADDTEXT( "  " );
-                    else
-                    {
-                        PRINT();
-                        LINESTART();
-                        nBrk = nBrkNum;
-                    }
-                }
-                if( nBrk < nBrkNum ) PRINT();
-            }
-            break;
-            case 0xB5:										// SXLI - pivot table line item array
-            {
-                UINT16				nIdent;
-                UINT16				nType;
-                UINT16				nMaxInd;
-                const sal_Char*		pInd = "   ";
-                const sal_Char*		pType[] = {
-                    "Data", "Default", "SUM", "COUNT","AVERAGE",
-                    "MAX", "MIN", "PRODUCT", "COUNTA", "STDEV",
-                    "STDEVP", "VAR", "VARP", "Grand total",
-                    "Blank line" };							// undocumented
-                while( rIn.GetRecLeft() > 0 )
-                {
-                    rIn >> nIdent >> nType >> nMaxInd >> __nFlags;
-                    LINESTART();
-                    ADDTEXT( "# of ident. items: " );
-                    __AddDec( t, nIdent );
-                    ADDTEXT( "   Type (" );
-                    __AddHex( t, nType );
-                    ADDTEXT( "): " );
-                    if( nType > 0x0E )
-                        p = pU;
-                    else
-                        p = pType[ nType ];
-                    ADDTEXT( p );
-                    ADDTEXT( "   relevant indexes: " );
-                    __AddDec( t, nMaxInd );
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( pInd );
-                    STARTFLAG();
-                    ADDFLAG( 0x0001, "fMultiDataName" );
-                    ADDFLAG( 0x0200, "fSub" );
-                    ADDFLAG( 0x0400, "fBlock" );
-                    ADDFLAG( 0x0800, "fGrand" );
-                    ADDFLAG( 0x1000, "fMultiDataOnAxis" );
-                    ADDFLAG( 0x2000, "fBlankLine" );        // undocumented
-                    ADDFLAG( 0x4000, "fHideDetail" );       // undocumented
-                    ADDRESERVED( 0x8000 );
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( pInd );
-                    ADDTEXT( "index to data field: " );
-                    __AddDec( t, (UINT16) ( (__nFlags & 0x01FE) >> 1 ) );
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( pInd );
-                    ADDTEXT( "array of " );
-                    __AddDec( t, nSXLISize[nSXLIIndex] );
-                    ADDTEXT( " indexes (^ are ident., * are irrelevant):" );
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( pInd );
-                    ADDTEXT( "  " );
-                    const UINT16	nBrkNum = 5;
-                    UINT16			nBrk = nBrkNum;
-                    for( UINT16 i = 0; i < nSXLISize[nSXLIIndex]; i++ )
-                    {
-                        __AddDec( t, Read2( rIn ), 7 );
-                        if( i < nIdent )
-                            ADDTEXT( "^" );
-                        else if( i < nMaxInd )
-                            ADDTEXT( " " );
-                        else
-                            ADDTEXT( "*" );
-                        nBrk--;
-                        if( !nBrk )
-                        {
-                            PRINT();
-                            LINESTART();
-                            ADDTEXT( pInd );
-                            ADDTEXT( "  " );
-                            nBrk = nBrkNum;
-                        }
-                    }
-                    if( nBrk < nBrkNum )
-                        PRINT();
-                }
-                nSXLIIndex = 1 - nSXLIIndex;
-            }
-            break;
-            case 0xB6:		// SXPI - pivot table page item(s)
-            {
-                UINT16	nArrayCnt = (UINT16)(nL / 6);
-                LINESTART();
-                __AddDec( t, nArrayCnt );
-                ADDTEXT( " page items:" );
-                PRINT();
-                for( UINT16 iArray = 0; iArray < nArrayCnt; iArray++ )
-                {
-                    LINESTART();
-                    ADDTEXT( "index SXVD: " );
-                    __AddDec( t, Read2( rIn ), 3 );
-                    ADDTEXT( "   index SXVI: " );
-                    UINT16 nSXVIInd;
-                    rIn >> nSXVIInd;
-                    __AddDec( t, nSXVIInd, 5 );
-                    if( nSXVIInd == 32765 )
-                        ADDTEXT( " (All items)   Obj ID: " );
-                    else
-                        ADDTEXT( "               Obj ID: " );
-                    ADDHEX( 2 );
-                    PRINT();
-                }
-            }
-            break;
-            case 0xBD:
-            {
-                UINT16	nC, nR, nXF;
-                INT32 nRK;
-                UINT16	n = (UINT16)((nL - 4) / 6);
-
-                rIn >> nR >> nC;
-                while( n )
-                {
-                    rIn >> nXF >> nRK;
-                    LINESTART();
-                    __AddCellHead( t, nC, nR, nXF );
-                    ADDTEXT( "   val = " );
-                    __AddRK( t, nRK );
-                    PRINT();
-                    nC++;
-                    n--;
-                }
-            }
-            break;
-            case 0xBE:
-            {
-                LINESTART();
-                ADDCELLHEAD();
-                PRINT();
-                LINESTART();
-                ADDTEXT( "next XFs: " );
-                UINT16	n = (UINT16)((nL - 6) / 2);
-                while( n )
-                {
-                    __AddDec( t, Read2( rIn ) );
-                    n--;
-                    if( n )
-                        ADDTEXT( ' ' );
-                }
-                PRINT();
-            }
-            break;
-            case 0x00C5:		// SXDI
-            {
-                LINESTART();
-                ADDTEXT( "Field: " );
-                ADDDEC( 2 );
-                UINT16	nFunc = Read2( rIn );
-                ADDTEXT( "   aggregation func (" );
-                __AddHex( t, nFunc );
-                ADDTEXT( "): " );
-                const sal_Char*		pFunc[] = { "Sum", "Count", "Average", "Max", "Min",
-                                            "Product", "Count Nums", "StdDev", "StdDevp", "Var",
-                                            "Varp" };
-                p = (nFunc > 0x0A) ? pU : pFunc[ nFunc ];
-                ADDTEXT( p );
-                ADDTEXT( "   display format (" );
-                const sal_Char*		pDispl[] = {
-                    "Normal", "Difference", "Percentage of", "Percentage difference from", "Running total in",
-                    "Percentage of row", "Percentage of column", "Percentage of total", "Index" };
-                UINT16	nDispl = Read2( rIn );
-                __AddHex( t, nDispl );
-                ADDTEXT( "): " );
-                p = (nDispl > 0x08) ? pU : pDispl[ nDispl ];
-                ADDTEXT( p );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "ind. to SXVD: " );		ADDDEC( 2 );
-                ADDTEXT( "   ind. to SXVI: " );		ADDDEC( 2 );
-                ADDTEXT( "   num format: " );		ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "name: " );
-                UINT16	nCch = Read2( rIn );
-                if( nCch == 0xFFFF )
-                    ADDTEXT( "<name in cache>" );
-                else if( nCch )
-                    AddUNICODEString( t, rIn, TRUE, nCch );
-                else
-                    ADDTEXT( "<empty string>" );
-                PRINT();
-            }
-            break;
-            case 0x00C6:		// SXDB - cache info
-            {
-                ADDTEXT( "number of recs: " );	ADDDEC( 4 );
-                ADDTEXT( "   stream id: " );	ADDHEX( 2 );
-                ADDTEXT( "   flags: " );		ADDHEX( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "DB block recs: " );	ADDDEC( 2 );
-                ADDTEXT( "   base fields: " );	ADDDEC( 2 );
-                ADDTEXT( "   all fields: " );	ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "reserved: " );		ADDHEX( 2 );
-                ADDTEXT( "   type: " );			ADDHEX( 2 );
-                ADDTEXT( "   changed by:" );
-                PRINT();
-                LINESTART();
-                AddUNICODEString( t, rIn );
-                PRINT();
-            }
-            break;
-            case 0x00C7:		// SXFIELD - Pivot Field
-            {
-                nItemCnt = 0;
-
-                ADDTEXT( "#" );
-                __AddDec( t, nFieldCnt, 3 );
-                nFieldCnt++;
-                ADDTEXT( " (pivot field): " );
-                if( rIn.GetRecLeft() < 14 )
-                {
-                    ADDTEXT( "<break in pivot field start>" );
-                    PRINT();
-                }
-                else
-                {
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( pPre );
-                    rIn >> __nFlags;
-                    STARTFLAG();
-                    ADDFLAG( 0x0001, "fOrigItems" );
-                    ADDFLAG( 0x0002, "fPostponed" );
-                    ADDFLAG( 0x0004, "fCalculated" );
-                    ADDFLAG( 0x0008, "fGroupChild" );
-                    ADDFLAG( 0x0010, "fNumGroup" );
-                    ADDFLAG( 0x0200, "fLongIndex" );
-                    ADDFLAG( 0x1000, "f1000?" );
-                    ADDFLAG( 0x8000, "f8000?" );
-                    ADDRESERVED( 0x6000 );
-                    ADDTEXT( "   data-type=" );
-                    __AddHex( t, static_cast< sal_uInt16 >( __nFlags & 0x0DE0 ) );
-                    ADDTEXT( "=" );
-                    switch( __nFlags & 0x0DE0 )
-                    {
-                        case 0x0000:    ADDTEXT( "spc" );               break;
-                        case 0x0480:    ADDTEXT( "str" );               break;
-                        case 0x0520:    ADDTEXT( "int[+dbl]" );         break;
-                        case 0x0560:    ADDTEXT( "dbl" );               break;
-                        case 0x05A0:    ADDTEXT( "str+int[+dbl]" );     break;
-                        case 0x05E0:    ADDTEXT( "str+dbl" );           break;
-                        case 0x0900:    ADDTEXT( "dat" );               break;
-                        case 0x0D00:    ADDTEXT( "dat+int/dbl" );       break;
-                        case 0x0D80:    ADDTEXT( "dat+str[+int/dbl]" ); break;
-                        default:		ADDTEXT( pU );
-                    }
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( pPre );
-                    ADDTEXT( "group-subfield=" );           ADDDEC( 2 );
-                    ADDTEXT( "   group-basefield=" );       ADDDEC( 2 );
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( pPre );
-                    ADDTEXT( "item-count=" );               ADDDEC( 2 );
-                    ADDTEXT( "   group-item-count=" );      ADDDEC( 2 );
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( pPre );
-                    ADDTEXT( "base-item-count=" );          ADDDEC( 2 );
-                    ADDTEXT( "   source-item-count=" );     ADDDEC( 2 );
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( pPre );
-                    if( rIn.GetRecLeft() < 3 )
-                    {
-                        ADDTEXT( "<break in pivot field name>" );
-                        PRINT();
-                    }
-                    else
-                    {
-                        ADDTEXT( "name=" );
-                        AddUNICODEString( t, rIn );
-                        PRINT();
-                    }
-                }
-            }
-            break;
-            case 0x00C8:		// SXINDEXLIST - indexes to source data
-            {
-                ADDTEXT( "#" );
-                __AddDec( t, nTabIndexCnt, 3 );
-                nTabIndexCnt++;
-                ADDTEXT( " (index list):" );
-                for( UINT16 iIndex = 0; iIndex < rIn.GetRecSize(); iIndex++ )
-                {
-                    ADDTEXT( " " );
-                    ADDHEX( 1 );
-                }
-                PRINT();
-            }
-                break;
-            case 0x00C9:		// SXDOUBLE - cache entry: double value
-            {
-                ADDTEXT( "#" );
-                __AddDec( t, nItemCnt, 3 );
-                ADDTEXT( " (double): " );
-                nItemCnt++;
-                ADDTEXT( "  " );
-                ADDDOUBLE();
-                PRINT();
-            }
-                break;
-            case 0x00CA:        // SXBOOLEAN - cache entry: boolean value
-            {
-                ADDTEXT( "#" );
-                __AddDec( t, nItemCnt, 3 );
-                ADDTEXT( " (boolean): " );
-                nItemCnt++;
-                ADDTEXT( "  " );
-                lcl_AddFlag( t, rIn.ReaduInt16() != 0 );
-                PRINT();
-            }
-            break;
-            case 0x00CB:        // SXERROR - cache entry: error code
-            {
-                ADDTEXT( "#" );
-                __AddDec( t, nItemCnt, 3 );
-                ADDTEXT( " (error): " );
-                nItemCnt++;
-                ADDTEXT( "  " );
-                ADDHEX( 2 );
-                PRINT();
-            }
-            break;
-            case 0x00CC:        // SXINTEGER - signed 16bit integer
-            {
-                ADDTEXT( "#" );
-                __AddDec( t, nItemCnt, 3 );
-                ADDTEXT( " (integer): " );
-                nItemCnt++;
-                ADDTEXT( "  " );
-                ADDDEC( 2 );
-                PRINT();
-            }
-            break;
-            case 0x00CD:        // SXSTRING - String
-            {
-                if( bSubStream )
-                {
-                    ADDTEXT( "#" );
-                    __AddDec( t, nItemCnt, 3 );
-                    ADDTEXT( " (string): " );
-                    nItemCnt++;
-                }
-                AddUNICODEString( t, rIn );
-                PRINT();
-            }
-                break;
-            case 0x00CE:		// SXDATETIME - date & time special format
-            {
-                ADDTEXT( "#" );
-                __AddDec( t, nItemCnt, 3 );
-                ADDTEXT( " (date/time): " );
-                nItemCnt++;
-                UINT8	nDay, nHour, nMin, nSec;
-                UINT16	nYear, nMonth;
-                rIn >> nYear >> nMonth >> nDay >> nHour >> nMin >> nSec;
-                if( nDay )
-                {
-                    __AddDec( t, nDay );
-                    ADDTEXT( "." );
-                    __AddDec( t, nMonth );
-                    ADDTEXT( "." );
-                    __AddDec( t, nYear );
-                    ADDTEXT( " " );
-                }
-                __AddDec( t, nHour, 2, '0' );
-                ADDTEXT( ":" );
-                __AddDec( t, nMin, 2, '0' );
-                ADDTEXT( ":" );
-                __AddDec( t, nSec, 2, '0' );
-                PRINT();
-            }
-            break;
-            case 0x00CF:        // SXEMPTY - cache entry: empty
-            {
-                ADDTEXT( "#" );
-                __AddDec( t, nItemCnt, 3 );
-                ADDTEXT( " (empty): " );
-                nItemCnt++;
-                PRINT();
-            }
-            break;
-            case 0x00D5:		// SXIDSTM - pivot table cache stream id
-            {
-                LINESTART();
-                UINT16		nStrId = Read2( rIn );
-                ADDTEXT( "Stream ID: " );
-                __AddHex( t, nStrId );
-                PRINT();
-                DumpRecordStream( OpenStorage( EXC_STORAGE_PTCACHE ), ScfTools::GetHexStr( nStrId ), EMPTY_STRING );
-            }
-            break;
-            case 0x00D8:        // SXNUMGROUP - numerical grouping in pivot cache field
-            {
-                LINESTART();
-                rIn >> __nFlags;
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fAutoMin" );
-                ADDFLAG( 0x0002, "fAutoMax" );
-                ADDTEXT( "   data-type=" );
-                switch( (__nFlags & 0x003C) >> 2 )
-                {
-                    case 0x0001:    ADDTEXT( "seconds" );   break;
-                    case 0x0002:    ADDTEXT( "minutes" );   break;
-                    case 0x0003:    ADDTEXT( "hours" );     break;
-                    case 0x0004:    ADDTEXT( "days" );      break;
-                    case 0x0005:    ADDTEXT( "months" );    break;
-                    case 0x0006:    ADDTEXT( "quarters" );  break;
-                    case 0x0007:    ADDTEXT( "years" );     break;
-                    case 0x0008:    ADDTEXT( "numeric" );   break;
-                    default:        ADDTEXT( pU );
-                }
-                (__nFlags &= 0xFFC0) >>= 6;
-                ADDTEXT( "   remaining=" );         __AddHex( t, __nFlags );
-                ADDTEXT( "=" );                     __AddDec( t, __nFlags );
-                PRINT();
-            }
-            break;
-            case 0xE0:
-                DumpXF( rIn, pPre );
-                break;
-            case 0xE3:
-            {
-                LINESTART();
-                ADDTEXT( "view source (" );
-                UINT16	n = Read2( rIn );
-                __AddHex( t, n );
-                ADDTEXT( "): " );
-                switch( n )
-                {
-                    case 0x01:	p = "M$ Excel list or database";		break;
-                    case 0x02:	p = "external data source";				break;
-                    case 0x04:	p = "multiple consolidation ranges";	break;
-                    case 0x08:	p = "pivot table";						break;
-                    case 0x10:	p = "scenario manager summary report";	break;
-                    default:	p = pU;
-                }
-                ADDTEXT( p );
-                PRINT();
-            }
-            break;
-            case 0x00E5:		// CELLMERGING
-            {
-                UINT16 nCount, nInd;
-                UINT16 nRow1, nRow2, nCol1, nCol2;
-                rIn >> nCount;
-                LINESTART();
-                ADDTEXT( "Count: " );
-                __AddDec( t, nCount );
-                PRINT();
-                LINESTART();
-                for( nInd = 0; nInd < 3; nInd++ )
-                    ADDTEXT( " row - row  / col-col | " );
-                PRINT();
-                LINESTART();
-                if( (ULONG)(nCount * 8 + 2) == nL )
-                {
-                    for( nInd = 0; nInd < nCount; nInd++ )
-                    {
-                        rIn >> nRow1 >> nRow2 >> nCol1 >> nCol2;
-                        __AddDec( t, nRow1, 5 );
-                        ADDTEXT( "-" );
-                        __AddDec( t, nRow2, 5 );
-                        ADDTEXT( " / " );
-                        __AddDec( t, nCol1, 3 );
-                        ADDTEXT( "-" );
-                        __AddDec( t, nCol2, 3 );
-                        ADDTEXT( " | " );
-                        if( (nInd % 3 == 2) || (nInd == nCount - 1) )
-                        {
-                            PRINT();
-                            LINESTART();
-                        }
-                    }
-                }
-                else
-                {
-                    LINESTART();
-                    ADDTEXT( "<Wrong record length!>" );
-                    PRINT();
-                }
-            }
-            break;
-            case 0xEB:
-            case 0xEC:
-            case 0xED:
-                EscherDump( nL, true );
-            break;
-            case 0x00F6:        // SXNAME
-            {
-                LINESTART();
-                rIn >> __nFlags;
-                STARTFLAG();
-                ADDFLAG( 0x0002, "fNameErr" );
-                ADDRESERVED( 0xFFFD );
-                ADDTEXT( "   field=" );             ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                sal_Int16 nFunc;
-                rIn >> nFunc;
-                ADDTEXT( "function=" );          __AddHex( t, (INT32)nFunc );
-                static const sal_Char* const ppcFuncs[] = {
-                    "none", 0, "sum", "counta", "count", "average", "max", "min",
-                    "product", "stdev", "stdevp", "var", "varp" };
-                lcl_AddEnum( t, nFunc, ppcFuncs, STATIC_TABLE_SIZE( ppcFuncs ), 0, -1 );
-                ADDTEXT( "   SXPAIR-count=" );      ADDDEC( 2 );
-                PRINT();
-            }
-            break;
-            case 0x00F9:        // SXFMLA
-            {
-                LINESTART();
-                sal_uInt16 nSize;
-                rIn >> nSize;
-                ADDTEXT( "formula-size=" );         __AddDec( t, nSize );
-                ADDTEXT( "   SXNAME-count=" );      ADDDEC( 2 );
-                PRINT();
-                FormulaDump( nSize, FT_RangeName );
-            }
-            break;
-            case 0xFC:
-            {
-                UINT16	nCnt = 0;
-                BOOL	bOK = TRUE;
-                ContDump( 8 );
-
-                while( bOK && (rIn.GetRecLeft() > 0) )
-                {
-                    LINESTART();
-                    __AddDec( t, nCnt );
-                    ADDTEXT( ": " );
-                    bOK = AddUNICODEString( t, rIn );
-                    PRINT();
-                    nCnt++;
-                }
-            }
-            break;
-            case 0xFD:
-            {
-                LINESTART();
-                ADDCELLHEAD();
-                ADDTEXT( "  sst = " );
-                ADDDEC(4);
-                PRINT();
-            }
-            break;
-            case 0x0100:		// SXVDEX
-            {
-                LINESTART();
-                sal_uInt32 __nFlags = Read4( rIn );
-                STARTFLAG();
-                if( __nFlags & 0x0000009F )
-                {
-                    ADDFLAG( 0x00000001, "fShowAllItems" );
-                    ADDFLAG( 0x00000002, "fDragToRow" );
-                    ADDFLAG( 0x00000004, "fDragToColumn" );
-                    ADDFLAG( 0x00000008, "fDragToPage" );
-                    ADDFLAG( 0x00000010, "fDragToHide" );
-                    ADDFLAG( 0x00000080, "fServerBased" );
-                    PRINT();
-                    LINESTART();
-                }
-                if( __nFlags & 0x00007E00 )
-                {
-                    ADDTEXT( "   " );
-                    ADDFLAG( 0x00000200, "fAutoSort" );
-                    ADDFLAG( 0x00000400, "fAscendSort" );
-                    ADDFLAG( 0x00000800, "fAutoShow" );
-                    ADDFLAG( 0x00001000, "fAscendShow" );
-                    ADDFLAG( 0x00002000, "fCalculatedField" );
-                    ADDFLAG( 0x00004000, "fLONewPage" );            // undocumented
-                    PRINT();
-                    LINESTART();
-                }
-                if( __nFlags & 0xFFE00000 )
-                {
-                    ADDTEXT( "   " );                               // Layout flags:
-                    ADDFLAG( 0x00200000, "fLOReport" );             // undocumented
-                    ADDFLAG( 0x00400000, "fLOBlankLine" );          // undocumented
-                    ADDFLAG( 0x00800000, "fLOSubTotalTop" );        // undocumented
-                    ADDTEXT( " show-items=" );  __AddDec( t, sal_uInt32( __nFlags >> 24 ) );
-                    PRINT();
-                    LINESTART();
-                }
-                if( __nFlags & 0x001F8160 )
-                {
-                    ADDTEXT( "    !RESERVED!" );
-                    PRINT();
-                }
-                if( !__nFlags )
-                    PRINT();
-                LINESTART();
-                ADDTEXT( "   sort-field=" );
-                ADDDEC( 2 );
-                ADDTEXT( "   show-field=" );
-                ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "format=" );
-                UINT16	n = Read2( rIn );
-                if( n )
-                    __AddDec( t, n );
-                else
-                    ADDTEXT( "none" );
-                PRINT();
-            }
-            break;
-            case 0x0122:		// SXDBEX - ext. cache info
-            {
-                ADDTEXT( "last changed: " );		ADDDOUBLE();
-                ADDTEXT( "   SXFORMULA recs: " );	ADDDEC( 4 );
-                PRINT();
-            }
-            break;
-            case 0x0138:		// CHTRINFO - change tracking info
-            {
-                rIn.DisableDecryption();
-                ADDTEXT( "14 bytes of unknown data..." );
-                PRINT();
-                ContDump( 14 );
-                LINESTART();
-                ADDTEXT( "16 bytes unknown identification:" );
-                PRINT();
-                ContDump( 16 );
-                LINESTART();
-                ADDTEXT( "unknown: " );			ADDHEX( 2 );
-                ADDTEXT( "   user: " );
-                if( rIn.GetRecLeft() > 3 )
-                    AddUNICODEString( t, rIn );
-                PRINT();
-                LINESTART();
-                __AddDec( t, (UINT16)(rIn.GetRecLeft() - 10) );
-                ADDTEXT( " bytes of unknown data..." );
-                PRINT();
-                ContDump( rIn.GetRecLeft() - 10 );
-                LINESTART();
-                ADDTEXT( "date/time: " );		ADDDEC( 2 );
-                ADDTEXT( "-" );					ADDDEC( 1 );
-                ADDTEXT( "-" );					ADDDEC( 1 );
-                ADDTEXT( " " );					ADDDEC( 1 );
-                ADDTEXT( ":" );					ADDDEC( 1 );
-                ADDTEXT( ":" );					ADDDEC( 1 );
-                ADDTEXT( "   unknown: " );		ADDHEX( 1 );
-                ADDTEXT( " " );					ADDHEX( 2 );
-                PRINT();
-            }
-            break;
-            case 0x0137:		// CHTRINSERT - change tracking: insert/remove
-            {
-                ADDTEXT( "len: " );				ADDDEC( 4 );
-                ADDTEXT( "   index: " );		ADDDEC( 4 );
-                ADDTEXT( "   op: " );
-                UINT16 nOp;
-                rIn >> nOp;
-                switch( nOp )
-                {
-                    case 0x0000:	ADDTEXT( "insert row" );	break;
-                    case 0x0001:	ADDTEXT( "insert column" );	break;
-                    case 0x0002:	ADDTEXT( "delete row" );	break;
-                    case 0x0003:	ADDTEXT( "delete column" );	break;
-                    default:
-                        __AddHex( t, nOp );
-                        ADDTEXT( " *UNKNOWN*" );
-                }
-                ADDTEXT( "   accept: " );		ADDHEX( 2 );
-                ADDTEXT( "   tab: " );			ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                UINT16 __nFlags = Read2( rIn );
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fAuto" );
-                ADDRESERVED( 0xFFFE );
-                UINT16 nCol1, nRow1, nCol2, nRow2;
-                rIn >> nRow1 >> nRow2 >> nCol1 >> nCol2;
-                ADDTEXT( "   range: " );        lcl_AddRangeRef( t, nCol1, nRow1, nCol2, nRow2 );
-                ADDTEXT( "   unknown: " );		ADDHEX( 4 );
-                PRINT();
-            }
-            break;
-            case 0x013B:		// CHTRCELLCONTENT: change tracking: changed cell
-            {
-                PreDump( nL );
-                ADDTEXT( "len: " );				ADDDEC( 4 );
-                ADDTEXT( "   index: " );		ADDDEC( 4 );
-                ADDTEXT( "   opcode: " );		ADDHEX( 2 );
-                ADDTEXT( "   accept: " );		ADDHEX( 2 );
-                ADDTEXT( "   tab: " );			ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                UINT16 nChg, nOldType, nNewType;
-                rIn >> nChg;
-                nOldType = (nChg & 0x0038) >> 3;
-                nNewType = nChg & 0x0007;
-                ADDTEXT( "change (" );			__AddHex( t, nChg );
-                ADDTEXT( "): " );
-                switch( nOldType )
-                {
-                    case 0x0000:	ADDTEXT( "empty->" );	break;
-                    case 0x0001:	ADDTEXT( "RK->" );		break;
-                    case 0x0002:	ADDTEXT( "double->" );	break;
-                    case 0x0003:	ADDTEXT( "string->" );	break;
-                    case 0x0004:	ADDTEXT( "bool->" );	break;
-                    case 0x0005:	ADDTEXT( "formula->" );	break;
-                    default:		ADDTEXT( "*UNKNOWN*->" );
-                }
-                switch( nNewType )
-                {
-                    case 0x0000:	ADDTEXT( "empty" );		break;
-                    case 0x0001:	ADDTEXT( "RK" );		break;
-                    case 0x0002:	ADDTEXT( "double" );	break;
-                    case 0x0003:	ADDTEXT( "string" );	break;
-                    case 0x0004:	ADDTEXT( "bool" );		break;
-                    case 0x0005:	ADDTEXT( "formula" );	break;
-                    default:		ADDTEXT( "*UNKNOWN*" );
-                }
-                UINT16 nFormatData = (nChg & 0xFF00);
-                if( (nFormatData == 0x1100) || (nFormatData == 0x1300) )
-                    ADDTEXT( "; contains add. data" );
-                ADDTEXT( "   format: " );		ADDHEX( 2 );
-                UINT16 nCol, nRow;
-                rIn >> nRow >> nCol;
-                ADDTEXT( "   address: " );      lcl_AddRef( t, nCol, nRow );
-                PRINT();
-                LINESTART();
-                UINT16 nOldLen;
-                rIn >> nOldLen;
-                ADDTEXT( "old value len: " );	__AddHex( t, nOldLen );
-                if( nOldType == 0x0003 )
-                    nOldLen >>= 1;
-                ADDTEXT( "   unknown: " );		ADDHEX( 4 );
-                PRINT();
-                UINT16 nCount = 0;
-                switch( nFormatData )
-                {
-                    case 0x1100:	nCount = 8;	break;
-                    case 0x1300:	nCount = 4;	break;
-                }
-                if( nCount )
-                {
-                    LINESTART();
-                    ADDTEXT( "additional format data:" );
-                    for( UINT16 nIndex = 0; nIndex < nCount; nIndex ++ )
-                    {
-                        ADDTEXT( " " );
-                        ADDHEX( 2 );
-                    }
-                    PRINT();
-                }
-                if( nOldType )
-                {
-                    LINESTART();
-                    ADDTEXT( "old value: " );
-                    switch( nOldType )
-                    {
-                        case 0x0001:
-                            __AddRK( t, rIn.ReadInt32() );
-                            PRINT();
-                        break;
-                        case 0x0002:
-                            ADDDOUBLE();
-                            PRINT();
-                        break;
-                        case 0x0003:
-                            AddUNICODEString( t, rIn );
-                            PRINT();
-                        break;
-                        case 0x0004:
-                            if( Read2( rIn ) )
-                                ADDTEXT( "true" );
-                            else
-                                ADDTEXT( "false" );
-                            PRINT();
-                        break;
-                        case 0x0005:
-                        {
-                            PRINT();
-                            UINT16 nLen;
-                            rIn >> nLen;
-                            FormulaDump( nLen, FT_CellFormula );
-                            IGNORE( 1 );
-                        }
-                        break;
-                    }
-                }
-                if( nNewType )
-                {
-                    LINESTART();
-                    ADDTEXT( "new value: " );
-                    switch( nNewType )
-                    {
-                        case 0x0001:
-                            __AddRK( t, rIn.ReadInt32() );
-                            PRINT();
-                        break;
-                        case 0x0002:
-                            ADDDOUBLE();
-                            PRINT();
-                        break;
-                        case 0x0003:
-                            AddUNICODEString( t, rIn );
-                            PRINT();
-                        break;
-                        case 0x0004:
-                            if( Read2( rIn ) )
-                                ADDTEXT( "true" );
-                            else
-                                ADDTEXT( "false" );
-                            PRINT();
-                        break;
-                        case 0x0005:
-                        {
-                            PRINT();
-                            UINT16 nLen;
-                            rIn >> nLen;
-                            FormulaDump( nLen, FT_CellFormula );
-                            IGNORE( 1 );
-                        }
-                        break;
-                    }
-                }
-                if( rIn.GetRecLeft() > 0 )
-                {
-                    LINESTART();
-                    ADDTEXT( "*UNKNOWN* data:" );
-                    PRINT();
-                    PreDump( rIn.GetRecLeft() );
-                }
-            }
-            break;
-            case 0x013D:		// TABID
-            {
-                ADDTEXT( "tab ids:" );
-                while( rIn.GetRecLeft() )
-                {
-                    ADDTEXT( " " );
-                    ADDDEC( 2 );
-                }
-                PRINT();
-            }
-            break;
-            case 0x0140:		// CHTRMOVE - change tracking: moved range
-            {
-                ADDTEXT( "len: " );				ADDDEC( 4 );
-                ADDTEXT( "   index: " );		ADDDEC( 4 );
-                ADDTEXT( "   opcode: " );		ADDHEX( 2 );
-                ADDTEXT( "   accept: " );		ADDHEX( 2 );
-                PRINT();
-                UINT16 nTab1, nTab2;
-                UINT16 nCol11, nCol12, nCol21, nCol22;
-                UINT16 nRow11, nRow12, nRow21, nRow22;
-                rIn >> nTab2 >> nRow11 >> nRow12 >> nCol11 >> nCol12 >> nRow21 >> nRow22 >> nCol21 >> nCol22 >> nTab1;
-                LINESTART();
-                ADDTEXT( "move range from: tab=" );		__AddDec( t, nTab1 );
-                ADDTEXT( " " );                         lcl_AddRangeRef( t, nCol11, nRow11, nCol12, nRow12 );
-                ADDTEXT( "   to: tab=" );				__AddDec( t, nTab2 );
-                ADDTEXT( " " );                         lcl_AddRangeRef( t, nCol21, nRow21, nCol22, nRow22 );
-                ADDTEXT( "   unknown: " );				ADDHEX( 4 );
-                PRINT();
-            }
-            break;
-            case 0x014D:		// CHTRINSERTTAB - change tracking: insert tab
-            {
-                ADDTEXT( "len: " );				ADDDEC( 4 );
-                ADDTEXT( "   index: " );		ADDDEC( 4 );
-                ADDTEXT( "   opcode: " );		ADDHEX( 2 );
-                ADDTEXT( "   accept: " );		ADDHEX( 2 );
-                ADDTEXT( "   tab: " );			ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "unknown: " );			ADDHEX( 4 );
-                ADDTEXT( "   table name: " );
-                AddUNICODEString( t, rIn );
-                PRINT();
-                LINESTART();
-                __AddDec( t, (sal_uInt32)rIn.GetRecLeft() );
-                ADDTEXT( " bytes of unknown data:" );
-                PRINT();
-                ContDump( rIn.GetRecLeft() );
-            }
-            break;
-            case 0x015F:    // LABELRANGES
-            {
-                UINT16 nCnt, nR1, nR2, nC1, nC2;
-                rIn >> nCnt;
-                ADDTEXT( "row headers: " );     __AddDec( t, nCnt );
-                PRINT();
-                while( nCnt-- )
-                {
-                    rIn >> nR1 >> nR2 >> nC1 >> nC2;
-                    LINESTART();
-                    AddRangeRef( t, nR1, nC1 | 0xC000, nR2, nC2 | 0xC000, FALSE );
-                    PRINT();
-                }
-                rIn >> nCnt;
-                LINESTART();
-                ADDTEXT( "column headers: " );  __AddDec( t, nCnt );
-                PRINT();
-                while( nCnt-- )
-                {
-                    rIn >> nR1 >> nR2 >> nC1 >> nC2;
-                    LINESTART();
-                    AddRangeRef( t, nR1, nC1 | 0xC000, nR2, nC2 | 0xC000, FALSE );
-                    PRINT();
-                }
-            }
-            break;
-            case 0x0193:
-            {
-                ADDTEXT( "unknown: " );			ADDHEX( 4 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "16 bytes unknown identification:" );
-                PRINT();
-                ContDump( 16 );
-                LINESTART();
-                ADDTEXT( "date/time: " );		ADDDEC( 2 );
-                ADDTEXT( "-" );					ADDDEC( 1 );
-                ADDTEXT( "-" );					ADDDEC( 1 );
-                ADDTEXT( " " );					ADDDEC( 1 );
-                ADDTEXT( ":" );					ADDDEC( 1 );
-                ADDTEXT( ":" );					ADDDEC( 1 );
-                ADDTEXT( "   unknown: " );		ADDHEX( 1 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "user: " );
-                if( rIn.GetRecLeft() > 3 )
-                    AddUNICODEString( t, rIn );
-                PRINT();
-            }
-            break;
-            case 0x0194:
-            {
-                rIn.DisableDecryption();
-                ADDTEXT( "unknown: " );			ADDHEX( 4 );
-                ADDTEXT( "   date/time: " );	ADDDEC( 2 );
-                ADDTEXT( "-" );					ADDDEC( 1 );
-                ADDTEXT( "-" );					ADDDEC( 1 );
-                ADDTEXT( " " );					ADDDEC( 1 );
-                ADDTEXT( ":" );					ADDDEC( 1 );
-                ADDTEXT( ":" );					ADDDEC( 1 );
-                ADDTEXT( "   unknown: " );		ADDHEX( 1 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "user: " );
-                if( rIn.GetRecLeft() > 3 )
-                    AddUNICODEString( t, rIn );
-                PRINT();
-                LINESTART();
-                __AddDec( t, (sal_uInt32)rIn.GetRecLeft() );
-                ADDTEXT( " bytes of unknown data:" );
-                PRINT();
-                ContDump( rIn.GetRecLeft() );
-            }
-            break;
-            case 0x0195:
-                rIn.DisableDecryption();
-                ContDump( nL );
-            break;
-            case 0x0196:
-            {
-                rIn.DisableDecryption();
-                ADDTEXT( "unknown: " );				ADDHEX( 2 );
-                ADDTEXT( " " );						ADDHEX( 2 );
-                ADDTEXT( " " );						ADDHEX( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "16 bytes unknown identification:" );
-                PRINT();
-                ContDump( 16 );
-                LINESTART();
-                ADDTEXT( "16 bytes unknown identification:" );
-                PRINT();
-                ContDump( 16 );
-                LINESTART();
-                ADDTEXT( "count of changes: " );	ADDDEC( 2 );
-                ADDTEXT( "   " );
-                __AddDec( t, (sal_uInt32)rIn.GetRecLeft() );
-                ADDTEXT( " bytes of unknown data:" );
-                PRINT();
-                ContDump( rIn.GetRecLeft() );
-            }
-            break;
-            case 0x01A9:		// USERBVIEW
-            {
-                LINESTART();
-                ADDTEXT( "view id: " );		ADDHEX( 4 );
-                ADDTEXT( "   tab id: " );	ADDDEC( 4 );
-                ADDTEXT( "   guid: " );		__AddGUID( t, rIn );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "window x: " );	ADDDEC( 4 );
-                ADDTEXT( "   y: " );		ADDDEC( 4 );
-                ADDTEXT( "   width: " );	ADDDEC( 4 );
-                ADDTEXT( "   height: " );	ADDDEC( 4 );
-                ADDTEXT( "   ratio: " );	ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                UINT16 __nFlags = Read2( rIn );
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fDsplFormulaBar" );
-                ADDFLAG( 0x0002, "fDsplStatus" );
-                ADDFLAG( 0x0004, "fNoteOff" );
-                ADDFLAG( 0x0008, "fDsplHScroll" );
-                ADDFLAG( 0x0010, "fDsplVScroll" );
-                ADDFLAG( 0x0020, "fBotAdornment" );
-                ADDFLAG( 0x0040, "fZoom" );
-                ADDFLAG( 0x0080, "fShowPlaceHld" );
-                ADDFLAG( 0x0100, "fHideAll" );
-                if( !(__nFlags & 0x0180) )
-                    ADDTEXT( " fShowAll" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "flags2: " );			ADDHEX( 2 );
-                ADDTEXT( "   merge int: " );	ADDDEC( 2 );
-                ADDTEXT( "   reserved: " );		ADDHEX( 2 );
-                PRINT();
-                if( rIn.GetRecLeft() > 3 )
-                {
-                    LINESTART();
-                    ADDTEXT( "name: " );
-                    AddUNICODEString( t, rIn );
-                    PRINT();
-                }
-            }
-            break;
-            case 0x01AA:		// USERSVIEWBEGIN
-            {
-                LINESTART();
-                ADDTEXT( "guid: " );		__AddGUID( t, rIn );
-                ADDTEXT( "   tab id: " );	ADDDEC( 4 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "wscale: " );		ADDDEC( 4 );
-                ADDTEXT( "   icolor: " );	ADDDEC( 4 );
-                ADDTEXT( "   pane: " );		ADDDEC( 4 );
-                PRINT();
-                LINESTART();
-                UINT32 __nFlags = Read4( rIn );
-                STARTFLAG();
-                if( __nFlags & 0x000000FF )
-                {
-                    ADDFLAG( 0x00000001, "fShowPgBrk" );
-                    ADDFLAG( 0x00000002, "fDsplForml" );
-                    ADDFLAG( 0x00000004, "fDsplGrid" );
-                    ADDFLAG( 0x00000008, "fDsplRCHead" );
-                    ADDFLAG( 0x00000010, "fDsplGuts" );
-                    ADDFLAG( 0x00000020, "fDsplZeros" );
-                    ADDFLAG( 0x00000040, "fPrintHorC" );
-                    ADDFLAG( 0x00000080, "fPrintVerC" );
-                    PRINT();
-                    LINESTART();
-                }
-                if( __nFlags & 0x00007F00 )
-                {
-                    ADDTEXT( "   " );
-                    ADDFLAG( 0x00000100, "fPrintRCHead" );
-                    ADDFLAG( 0x00000200, "fPrintGrid" );
-                    ADDFLAG( 0x00000400, "fFitToPage" );
-                    ADDFLAG( 0x00000800, "fPrintArea" );
-                    ADDFLAG( 0x00001000, "fOnePrintArea" );
-                    ADDFLAG( 0x00002000, "fFilter" );
-                    ADDFLAG( 0x00004000, "fAutoFilter" );
-                    PRINT();
-                    LINESTART();
-                }
-                if( __nFlags & 0xFFF80000 )
-                {
-                    ADDTEXT( "   " );
-                    ADDFLAG( 0x00020000, "fSplitV" );
-                    ADDFLAG( 0x00040000, "fSplitH" );
-                    ADDFLAG( 0x00180000, "fHiddenRow" );
-                    ADDFLAG( 0x00200000, "fHiddenCol" );
-                    ADDFLAG( 0x01000000, "fChartSize" );
-                    ADDFLAG( 0x02000000, "fFilterUnique" );
-                    ADDFLAG( 0x04000000, "fLayoutView" );
-                    ADDRESERVED( 0xF8C18000 );
-                    PRINT();
-                    LINESTART();
-                }
-                if( !__nFlags )
-                    PRINT();
-                ADDTEXT( "visible: " );				ADDHEX( 2 );
-                ADDTEXT( " " );						ADDHEX( 2 );
-                ADDTEXT( " " );						ADDHEX( 2 );
-                ADDTEXT( " " );						ADDHEX( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "pane pos vert: " );		ADDDOUBLE();
-                ADDTEXT( "   hor: " );				ADDDOUBLE();
-                ADDTEXT( "   1st vis right: " );	ADDDEC( 2 );
-                ADDTEXT( "   bott: " );				ADDDEC( 2 );
-                PRINT();
-            }
-            break;
-            case 0x01AB:		// USERSVIEWEND
-            {
-                LINESTART();
-                ADDTEXT( "settings are valid: " );	ADDHEX( 2 );
-                PRINT();
-            }
-            break;
-            case 0x01AD:		// QSI - web query range
-            {
-                LINESTART();
-                rIn >> __nFlags;
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fTitles" );
-                ADDFLAG( 0x0002, "fRowNums" );
-                ADDFLAG( 0x0004, "fDisRefr" );
-                ADDFLAG( 0x0080, "fFill" );
-                ADDFLAG( 0x0100, "fAutoFmt" );
-                ADDFLAG( 0x0400, "fDisEdit" );
-                ADDRESERVED( 0xFA78 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "AutoFmt: " );				ADDDEC( 2 );
-                ADDTEXT( "   AutoFmtAttr: " );		ADDHEX( 2 );
-                ADDTEXT( "   reserved: " );			ADDHEX( 4 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "name: " );
-                AddUNICODEString( t, rIn );
-                PRINT();
-            }
-            break;
-            case 0x01AE:
-            {
-                LINESTART();
-                ADDTEXT( "# of tabs: " );
-                UINT16	nTabs;
-                rIn >> nTabs;
-                __AddDec( t, nTabs );
-                rIn.PushPosition();
-                PRINT();
-                LINESTART();
-                if( nL <= (ULONG)(2 + 2 * nTabs) )
-                {
-                    ADDTEXT( "----- shortened record -----" );
-                    PRINT();
-
-                    rIn.PopPosition();
-                    ContDump( nL - 2 );
-                }
-                else
-                {
-                    rIn.RejectPosition();
-                    ADDTEXT( "file name: " );
-                    AddUNICODEString( t, rIn );
-                    PRINT();
-                    while( nTabs )
-                    {
-                        LINESTART();
-                        ADDTEXT( "  " );
-                        AddUNICODEString( t, rIn );
-                        PRINT();
-                        nTabs--;
-                    }
-                }
-
-            }
-            break;
-            case 0x01B0:		// CONDFMT
-            {
-                LINESTART();
-                ADDTEXT( "cf-count=" );         ADDDEC( 2 );
-                rIn >> __nFlags;
-                ADDTEXT( "   " );
-                STARTFLAG();
-                ADDFLAG( 0x0001, "tough-recalc" );
-                ADDRESERVED( 0xFFFE );
-                PRINT();
-                LINESTART();
-                sal_uInt16 nR1, nR2, nC1, nC2, nCount;
-                rIn >> nR1 >> nR2 >> nC1 >> nC2 >> nCount;
-                ADDTEXT( "max-range=" );        lcl_AddRangeRef( t, nC1, nR1, nC2, nR2 );
-                ADDTEXT( "   range-count=" );   __AddDec( t, nCount );
-                PRINT();
-
-                for( sal_uInt16 nRange = 0; rIn.IsValid() && (nRange < nCount); ++nRange )
-                {
-                    if( !(nRange % 4) )
-                    {
-                        LINESTART();
-                        ADDTEXT( pPre );
-                    }
-                    rIn >> nR1 >> nR2 >> nC1 >> nC2;
-                    ByteString aRef;
-                    lcl_AddRangeRef( aRef, nC1, nR1, nC2, nR2 );
-                    aRef.Expand( 16, ' ' );
-                    ADDTEXT( aRef );
-                    if( (nRange % 4 == 3) || (nRange + 1 == nCount) )
-                        PRINT();
-                }
-            }
-            break;
-            case 0x01B1:		// CF - conditional format
-            {
-                sal_uInt8 nType, nOp;
-                sal_uInt16 nSize1, nSize2;
-                sal_uInt32 nFlags;
-                rIn >> nType >> nOp >> nSize1 >> nSize2 >> nFlags;
-                LINESTART();
-                ADDTEXT( "type=" );                 __AddHex( t, nType );
-                ADDTEXT( " (" );
-                switch( nType )
-                {
-                    case 0x01:  ADDTEXT( "compare" );   break;
-                    case 0x02:  ADDTEXT( "formula" );    break;
-                    default:    ADDTEXT( "!unknown!" );
-                }
-                ADDTEXT( ")   operator=" );         __AddHex( t, nOp );
-                ADDTEXT( " (" );
-                switch( nOp )
-                {
-                    case 0x00:  ADDTEXT( "none" );          break;
-                    case 0x01:  ADDTEXT( "between" );       break;
-                    case 0x02:  ADDTEXT( "not-between" );   break;
-                    case 0x03:  ADDTEXT( "equal" );         break;
-                    case 0x04:  ADDTEXT( "not-equal" );     break;
-                    case 0x05:  ADDTEXT( "greater" );       break;
-                    case 0x06:  ADDTEXT( "less" );          break;
-                    case 0x07:  ADDTEXT( "greater-eq" );    break;
-                    case 0x08:  ADDTEXT( "less-eq" );       break;
-                    default:    ADDTEXT( "!unknown!" );
-                }
-                ADDTEXT( ")" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "formula-size-1=" );       __AddDec( t, nSize1 );
-                ADDTEXT( "   formula-size-2=" );    __AddDec( t, nSize2 );
-                PRINT();
-                LINESTART();
-                sal_uInt32 __nFlags = nFlags;
-                STARTFLAG();
-                __nFlags = ~__nFlags;
-                ADDFLAG( 0x00000400, "bord-lft" );
-                ADDFLAG( 0x00000800, "bord-rgt" );
-                ADDFLAG( 0x00001000, "bord-top" );
-                ADDFLAG( 0x00002000, "bord-bot" );
-                ADDFLAG( 0x00010000, "patt-style" );
-                ADDFLAG( 0x00020000, "patt-fgcol" );
-                ADDFLAG( 0x00040000, "patt-bgcol" );
-                __nFlags = ~__nFlags;
-                ADDFLAG( 0x04000000, "font" );
-                ADDFLAG( 0x10000000, "bord" );
-                ADDFLAG( 0x20000000, "patt" );
-                ADDRESERVED( 0xCBC00000 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "unknown=" );              ADDHEX( 2 );
-                PRINT();
-                if( nFlags & 0x04000000 )
-                {
-                    LINESTART(); ADDTEXT( "*** FONT ***" ); PRINT();
-                    ContDump( 64 );
-                    LINESTART();
-                    ADDTEXT( "height=" );           ADDHEX( 4 );
-                    rIn >> __nFlags;
-                    ADDTEXT( "   style-" );
-                    STARTFLAG();
-                    ADDFLAG( 0x00000002, "italic" );
-                    ADDFLAG( 0x00000080, "strikeout" );
-                    ADDRESERVED( 0xFFFFFF7D );
-                    ADDTEXT( "   weight=" );        ADDDEC( 2 );
-                    PRINT();
-                    LINESTART();
-                    sal_uInt16 nEsc;
-                    rIn >> nEsc;
-                    ADDTEXT( "escapement=" );       __AddDec( t, nEsc );
-                    ADDTEXT( " (" );
-                    switch( nEsc )
-                    {
-                        case 0x0000:    ADDTEXT( "none" );  break;
-                        case 0x0001:    ADDTEXT( "super" ); break;
-                        case 0x0002:    ADDTEXT( "sub" );   break;
-                        default:        ADDTEXT( "!unknown!" );
-                    }
-                    sal_uInt8 nUnd;
-                    rIn >> nUnd;
-                    ADDTEXT( ")   underline=" );    __AddDec( t, nUnd );
-                    ADDTEXT( " (" );
-                    switch( nUnd )
-                    {
-                        case 0x00:  ADDTEXT( "none" );      break;
-                        case 0x01:  ADDTEXT( "single" );    break;
-                        case 0x02:  ADDTEXT( "double" );    break;
-                        default:    ADDTEXT( "!unknown!" );
-                    }
-                    ADDTEXT( ")   unknown=" );      ADDHEX( 1 );
-                    ADDTEXT( " " );                 ADDHEX( 1 );
-                    ADDTEXT( " " );                 ADDHEX( 1 );
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( "color=" );            ADDHEX( 4 );
-                    ADDTEXT( "   unknown=" );       ADDHEX( 4 );
-                    rIn >> __nFlags;
-                    ADDTEXT( "   used-" );
-                    STARTFLAG();
-                    __nFlags = ~__nFlags;
-                    ADDFLAG( 0x00000002, "italic" );
-                    ADDFLAG( 0x00000080, "strikeout" );
-                    __nFlags = ~__nFlags;
-                    ADDRESERVED( 0xFFFFFF65 );
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( "escape-def=" );       ADDHEX( 4 );
-                    ADDTEXT( "   underl-def=" );    ADDHEX( 4 );
-                    PRINT();
-                    ContDump( 18 );
-                }
-                if( nFlags & 0x10000000 )
-                {
-                    LINESTART(); ADDTEXT( "*** BORDER ***" ); PRINT();
-                    sal_uInt16 nLine;
-                    sal_uInt32 nColor;
-                    rIn >> nLine >> nColor;
-                    LINESTART();
-                    ADDTEXT( "line-style=" );       __AddHex( t, nLine );
-                    ADDTEXT( " (lft=" );            __AddDec( t, (sal_uInt16)(nLine & 0x000F) );
-                    ADDTEXT( " rgt=" );             __AddDec( t, (sal_uInt16)((nLine & 0x00F0) >> 4) );
-                    ADDTEXT( " top=" );             __AddDec( t, (sal_uInt16)((nLine & 0x0F00) >> 8) );
-                    ADDTEXT( " bot=" );             __AddDec( t, (sal_uInt16)((nLine & 0xF000) >> 12) );
-                    ADDTEXT( ")" );
-                    PRINT();
-                    LINESTART();
-                    ADDTEXT( "line-color=" );       __AddHex( t, nColor );
-                    ADDTEXT( " (lft=" );            __AddDec( t, (sal_uInt16)(nColor & 0x0000007F) );
-                    ADDTEXT( " rgt=" );             __AddDec( t, (sal_uInt16)((nColor & 0x00003F80) >> 7) );
-                    ADDTEXT( " top=" );             __AddDec( t, (sal_uInt16)((nColor & 0x007F0000) >> 16) );
-                    ADDTEXT( " bot=" );             __AddDec( t, (sal_uInt16)((nColor & 0x3F800000) >> 23) );
-                    ADDTEXT( ")   unknown=" );      ADDHEX( 2 );
-                    PRINT();
-                }
-                if( nFlags & 0x20000000 )
-                {
-                    LINESTART(); ADDTEXT( "*** AREA ***" ); PRINT();
-                    sal_uInt16 nPatt, nColor;
-                    rIn >> nPatt >> nColor;
-                    LINESTART();
-                    ADDTEXT( "pattern=" );          __AddHex( t, nPatt );
-                    ADDTEXT( " (" );                __AddDec( t, (sal_uInt16)((nPatt & 0xFC00) >> 10) );
-                    ADDTEXT( ")   color=" );        __AddHex( t, nColor );
-                    ADDTEXT( " (fg=" );             __AddDec( t, (sal_uInt16)(nColor & 0x007F) );
-                    ADDTEXT( " bg=" );              __AddDec( t, (sal_uInt16)((nColor & 0x3F80) >> 7) );
-                    ADDTEXT( ")" );
-                    PRINT();
-                }
-                if( rIn.IsValid() && nSize1 && (rIn.GetRecLeft() >= nSize1) )
-                {
-                    LINESTART(); ADDTEXT( "*** FORMULA 1 ***" ); PRINT();
-                    FormulaDump( nSize1, FT_RangeName );
-                }
-                if( rIn.IsValid() && nSize2 && (rIn.GetRecLeft() >= nSize2) )
-                {
-                    LINESTART(); ADDTEXT( "*** FORMULA 2 ***" ); PRINT();
-                    FormulaDump( nSize2, FT_RangeName );
-                }
-            }
-            break;
-            case 0x01B2:    // DVAL - header of DV recs
-            {
-                rIn >> __nFlags;
-                LINESTART();
-                STARTFLAG();
-                ADDTEXT( " (" );
-                __AddPureBin( t, __nFlags );
-                ADDTEXT( ")" );
-                ADDTEXT( "):" );
-                ADDFLAG( 0x0001, "fWnClosed" );
-                ADDFLAG( 0x0002, "fWnPinned" );
-                ADDFLAG( 0x0004, "fCached" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "input window: " );
-                ADDHEX( 4 );
-                ADDTEXT( " / " );
-                ADDHEX( 4 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "object id: " );
-                ADDHEX( 4 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "num of DV recs: " );
-                ADDDEC( 4 );
-                PRINT();
-            }
-            break;
-            case 0x01B6:    // TXO - text box
-            {
-                LINESTART();
-                rIn >> __nFlags;
-                STARTFLAG();
-                switch( __nFlags & 0x000E )
-                {
-                    case 0x0002:    ADDTEXT( " h-left" );   break;
-                    case 0x0004:    ADDTEXT( " h-center" ); break;
-                    case 0x0006:    ADDTEXT( " h-right" );  break;
-                    case 0x0008:    ADDTEXT( " h-block" );  break;
-                    default:        ADDTEXT( " *h-unknown*" );
-                }
-                switch( __nFlags & 0x0070 )
-                {
-                    case 0x0010:    ADDTEXT( " v-top" );    break;
-                    case 0x0020:    ADDTEXT( " v-center" ); break;
-                    case 0x0030:    ADDTEXT( " v-bottom" ); break;
-                    case 0x0040:    ADDTEXT( " v-block" );  break;
-                    default:        ADDTEXT( " *v-unknown*" );
-                }
-                ADDFLAG( 0x0200, "lock-text" );
-                ADDRESERVED( 0xFD81 );
-                ADDTEXT( "   orient=" );
-                sal_uInt16 nOrient = rIn.ReaduInt16();
-                __AddDec( t, nOrient );
-                ADDTEXT( " (" );
-                switch( nOrient )
-                {
-                    case 0:     ADDTEXT( "no-rot" );        break;
-                    case 1:     ADDTEXT( "stacked" );       break;
-                    case 2:     ADDTEXT( "90\xB0 ccw" );    break;
-                    case 3:     ADDTEXT( "90\xB0 cw" );     break;
-                    default:    ADDTEXT( "!unknown!" );
-                }
-                ADDTEXT( ")" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "reserved=" );
-                ADDHEX( 2 ); ADDTEXT( " " ); ADDHEX( 2 ); ADDTEXT( " " ); ADDHEX( 2 );
-                ADDTEXT( "   text-len=" );      ADDDEC( 2 );
-                ADDTEXT( "   format-size=" );   ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "reserved=" );      ADDHEX( 2 );
-                sal_uInt16 nLinkSize = rIn.ReaduInt16();
-                ADDTEXT( "   link-size=" );     __AddDec( t, nLinkSize );
-                PRINT();
-                if( nLinkSize > 0 )
-                {
-                    LINESTART();
-                    sal_uInt16 nFmlaSize = rIn.ReaduInt16();
-                    ADDTEXT( "fmla-size=" );        __AddDec( t, nFmlaSize );
-                    ADDTEXT( "   reserved=" );      ADDHEX( 4 );
-                    PRINT();
-                    FormulaDump( nFmlaSize, FT_CellFormula );
-                }
-            }
-            break;
-            case 0x01BE:    // DV - data validation record
-            {
-                UINT32	__nFlags;
-                rIn >> __nFlags;
-                LINESTART();
-                STARTFLAG();
-                ADDTEXT( " (" );
-                __AddPureBin( t, __nFlags );
-                ADDTEXT( ")" );
-                PRINT();
-                LINESTART();
-                if( __nFlags )
-                {
-                    ADDTEXT( "  " );
-                    ADDFLAG( 0x00000080, "fStrLookup" );
-                    ADDFLAG( 0x00000100, "fAllowBlank" );
-                    ADDFLAG( 0x00000200, "fSuppressCombo" );
-                    ADDFLAG( 0x00040000, "fShowInputMsg" );
-                    ADDFLAG( 0x00080000, "fShowErrorMsg" );
-                }
-                PRINT();
-                LINESTART();
-                ADDTEXT( "error style: " );
-                const char*		pErrStyle[] = { "stop", "warning", "info", "4" };
-                ADDTEXT( pErrStyle[ ( __nFlags >> 4 ) & 0x03 ] );
-                PRINT();
-                LINESTART();
-                const char*		pValType[] =
-                {
-                    "all", "integer", "decimal", "list", "date", "time", "text len", "user",
-                    "8", "9", "A", "B", "C", "D", "E", "F"
-                };
-                LINESTART();
-                ADDTEXT( "validation type: " );
-                ADDTEXT( pValType[ __nFlags & 0x0000000F ] );
-                PRINT();
-
-                const char*		pOpType[] =
-                {
-                    "between", "not between", "equal", "not equal",
-                    "greater", "less", "greater or equal", "less or equal",
-                    "8", "9", "A", "B", "C", "D", "E", "F"
-                };
-                LINESTART();
-                ADDTEXT( "operator type: " );
-                ADDTEXT( pOpType[ ( __nFlags >> 20 ) & 0x0000000F ] );
-                PRINT();
-
-                LINESTART();
-                ADDTEXT( "Prompt Title:   " );
-                AddUNICODEString( t, rIn );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "Error Title:    " );
-                AddUNICODEString( t, rIn );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "Prompt Message: " );
-                AddUNICODEString( t, rIn );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "Error Message:  " );
-                AddUNICODEString( t, rIn );
-                PRINT();
-                if( rIn.GetRecLeft() > 8 )
-                {
-                    UINT16		nLen;
-                    rIn >> nLen;
-                    LINESTART();
-                    ADDTEXT( "Len1: " );
-                    __AddDec( t, nLen );
-                    ADDTEXT( "   (unknown1: " );
-                    ADDHEX( 2 );
-                    ADDTEXT( ")" );
-                    PRINT();
-                    FormulaDump( nLen, FT_RangeName );
-
-                    rIn >> nLen;
-                    LINESTART();
-                    ADDTEXT( "Len2: " );
-                    __AddDec( t, nLen );
-                    ADDTEXT( "   (unknown2: " );
-                    ADDHEX( 2 );
-                    ADDTEXT( ")" );
-                    PRINT();
-                    FormulaDump( nLen, FT_RangeName );
-
-                    LINESTART();
-                    ADDTEXT( "range count: " );
-                    ADDHEX( 2 );
-                    PRINT();
-                }
-
-                while( rIn.GetRecLeft() >= 8 )
-                {
-                    // Row-Row / Col-Col
-                    UINT16  nR1, nR2, nC1, nC2;
-                    rIn >> nR1 >> nR2 >> nC1 >> nC2;
-                    LINESTART();
-                    AddRangeRef( t, nR1, nC1 | 0xC000, nR2, nC2 | 0xC000, FALSE );
-                    PRINT();
-                }
-            }
-            break;
-            case 0x01B8:		// HLINK
-            {
-                PreDump( nL );
-
-                UINT32 n1, n2;
-                LINESTART();
-                PRINT();
-                UINT16 nR1, nR2, nC1, nC2;
-                rIn >> nR1 >> nR2 >> nC1 >> nC2;
-                ADDTEXT( "Cellrange=" );
-                lcl_AddRangeRef( t, nC1, nR1, nC2, nR2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "GUID StdLink=" );     __AddGUID( t, rIn );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "        must=79EAC9D0-BAF9-11CE-8C82-00AA004BA90B" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "unknown=" );          ADDHEX( 4 );
-                PRINT();
-                UINT32 __nFlags = Read4( rIn );
-                LINESTART();
-                STARTFLAG();
-                ADDFLAG( 0x00000001, "fBody" );
-                ADDFLAG( 0x00000002, "fAbs" );
-                ADDFLAG( 0x00000014, "fDescr" );
-                ADDFLAG( 0x00000008, "fMark" );
-                ADDFLAG( 0x00000080, "fFrame" );
-                ADDFLAG( 0x00000100, "fUNC" );
-                ADDRESERVED( 0xFFFFFE60 );
-                PRINT();
-
-                //description
-                String aData;
-                if( __nFlags & 0x00000014 )
-                {
-                    LINESTART();
-                    rIn >> n1;
-                    ADDTEXT( "## Description ##  [l=" );
-                    __AddDec( t, n1 );
-                    ADDTEXT( "]: '" );
-                    aData = rIn.ReadRawUniString( (USHORT)(n1 - 1), TRUE );
-                    t += GETSTR( aData );
-                    ADDTEXT( "<" ); ADDHEX( 2 ); ADDTEXT( ">'" ); // trailing zero
-                    PRINT();
-                }
-
-                // frame name
-                if( __nFlags & 0x00000080 )
-                {
-                    LINESTART();
-                    rIn >> n1;
-                    ADDTEXT( "## Frame ## [l=" );
-                    __AddDec( t, n1 );
-                    ADDTEXT( "]: '" );
-                    aData = rIn.ReadRawUniString( (USHORT)(n1 - 1), TRUE );
-                    t += GETSTR( aData );
-                    ADDTEXT( "<" ); ADDHEX( 2 ); ADDTEXT( ">'" ); // trailing zero
-                    PRINT();
-                }
-
-                // network path
-                if( __nFlags & 0x00000100 )
-                {
-                    LINESTART();
-                    rIn >> n1;
-                    ADDTEXT( "## UNC ## [l=" );
-                    __AddDec( t, n1 );
-                    ADDTEXT( "]: '" );
-                    aData = rIn.ReadRawUniString( (USHORT)(n1 - 1), TRUE );
-                    t += GETSTR( aData );
-                    ADDTEXT( "<" ); ADDHEX( 2 ); ADDTEXT( ">'" ); // trailing zero
-                    PRINT();
-                }
-
-                // file link or URL
-                else if( __nFlags & 0x00000001 )
-                {
-                    rIn.PushPosition();
-                    rIn >> n1;
-                    rIn.PopPosition();
-                    LINESTART();
-                    ADDTEXT( "## Content GUID ## " );
-                    __AddGUID( t, rIn );
-                    switch( n1 )
-                    {
-                        case 0x00000303:	// file
-                        {
-                            ADDTEXT( " File Moniker" );
-                            PRINT();
-                            LINESTART();
-                            ADDTEXT( "              must=00000303-0000-0000-C000-000000000046" );
-                            PRINT();
-                            LINESTART();
-                            ADDTEXT( "## File link ##  up level=" );
-                            ADDDEC( 2 );
-                            rIn >> n2;
-                            ADDTEXT( "   [l=" );        __AddDec( t, n2 );
-                            ADDTEXT( ", 8-Bit]: '" );
-                            aData = rIn.ReadRawByteString( (USHORT)(n2 - 1) );
-                            t += GETSTR( aData );
-                            ADDTEXT( "<" ); ADDHEX( 1 ); ADDTEXT( ">'" ); // trailing zero
-                            PRINT();
-                            ContDump( 24 );
-                            rIn >> n2;
-                            LINESTART();
-                            ADDTEXT( "bytes left=" );  __AddDec( t, n2 );
-                            if( n2 )
-                            {
-                                rIn >> n2;
-                                LINESTART();
-                                ADDTEXT( "   string byte count=" );
-                                __AddDec( t, n2 );
-                                ADDTEXT( "   unknown=" );
-                                ADDHEX( 2 );
-                                PRINT();
-                                LINESTART();
-                                ADDTEXT( "[l=" );
-                                __AddDec( t, n2 / 2 );
-                                ADDTEXT( "]: '" );
-                                aData = rIn.ReadRawUniString( (USHORT)n2, TRUE );
-                                t += GETSTR( aData );
-                                ADDTEXT( "'" );
-                            }
-                            PRINT();
-                        }
-                        break;
-                        case 0x79EAC9E0:	// URL
-                        {
-                            ADDTEXT( " URL Moniker" );
-                            PRINT();
-                            LINESTART();
-                            ADDTEXT( "              must=79EAC9E0-BAF9-11CE-8C82-00AA004BA90B" );
-                            PRINT();
-                            rIn >> n2;
-                            LINESTART();
-                            ADDTEXT( "## URL ##  string byte count=" );
-                            __AddDec( t, n2 );
-                            PRINT();
-                            LINESTART();
-                            ADDTEXT( "[l=" );
-                            __AddDec( t, n2 / 2 );
-                            ADDTEXT( "]: '" );
-                            aData = rIn.ReadRawUniString( (USHORT)(n2 / 2 - 1), TRUE );
-                            t += GETSTR( aData );
-                            ADDTEXT( "<" ); ADDHEX( 2 ); ADDTEXT( ">'" ); // trailing zero
-                            PRINT();
-                        }
-                        break;
-                        default:
-                        {
-                            ADDTEXT( " (!!UNKNOWN!!)" );
-                            PRINT();
-                        }
-                        break;
-                    }
-                }
-
-                // text mark
-                if( __nFlags & 0x00000008 )
-                {
-                    LINESTART();
-                    rIn >> n1;
-                    ADDTEXT( "## Text mark ##  [l=" );
-                    __AddDec( t, n1 );
-                    ADDTEXT( "]: '" );
-                    aData = rIn.ReadRawUniString( (USHORT)(n1 - 1), TRUE );
-                    t += GETSTR( aData );
-                    ADDTEXT( "<" ); ADDHEX( 2 ); ADDTEXT( ">'" ); // trailing zero
-                    PRINT();
-                }
-            }
-            break;
-            case 0x01BB:		// SXFDBTYPE - SQL data type
-            {
-                ADDTEXT( "SQL data type: " );		ADDHEX( 2 );
-                PRINT();
-            }
-            break;
-            case 0x0201:
-            {
-                LINESTART();
-                ADDCELLHEAD();
-                PRINT();
-            }
-            break;
-            case 0x0203:
-            {
-                LINESTART();
-                ADDCELLHEAD();
-                ADDTEXT( "   val = " );
-                ADDDOUBLE();
-                PRINT();
-            }
-            break;
-            case 0x0205:
-            {
-                LINESTART();
-                ADDCELLHEAD();
-                ADDTEXT( "   val = " );     ADDHEX( 1 );
-                ADDTEXT( "   type = " );    ADDDEC( 1 );
-                PRINT();
-            }
-            break;
-            case 0x0208:		// ROW - row info
-            {
-                LINESTART();
-                ADDTEXT( "row #: " );				ADDDEC( 2 );
-                ADDTEXT( "   def. cols: " );		ADDDEC( 2 );
-                ADDTEXT( "-" );						ADDDEC( 2 );
-                ADDTEXT( "   ht: " );				ADDDEC( 2 );
-                ADDTEXT( "   reserved: " );			ADDHEX( 4 );
-                PRINT();
-                rIn >> __nFlags;
-                LINESTART();
-                STARTFLAG();
-                ADDTEXT( " outlnlev=" );
-                __AddDec( t, (UINT16)(__nFlags & 0x0007) );
-                ADDFLAG( 0x0010, "fCollapsed" );
-                ADDFLAG( 0x0020, "fRowHeightZero" );
-                ADDFLAG( 0x0040, "fUnsynced" );
-                ADDFLAG( 0x0080, "fGhostDirty" );
-                ADDRESERVED( 0xFF08 );
-                PRINT();
-                UINT16 nXF;
-                rIn >> nXF;
-                LINESTART();
-                ADDTEXT( "ix to XF: "  );       __AddDec( t, (UINT16)(nXF & 0x0FFF) );
-                ADDTEXT( "   add. flags(" );    __AddHex( t, nXF );
-                ADDTEXT( "):" );
-                ADDFLAG( 0x1000, "fExAsc" );
-                ADDFLAG( 0x2000, "fExDsc" );
-                ADDRESERVED( 0xC000 );
-                PRINT();
-            }
-            break;
-            case 0x0021:    // ARRAY
-            case 0x0221:
-            {
-                UINT16	nR1, nR2;
-                UINT8	nC1, nC2;
-                rIn >> nR1 >> nR2 >> nC1 >> nC2 >> __nFlags;
-                LINESTART();
-                ADDTEXT( "range: " );
-                lcl_AddRangeRef( t, nC1, nR1, nC2, nR2 );
-                PRINT();
-                LINESTART();
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fAlwaysCalc" );
-                ADDFLAG( 0x0002, "fCalcOnLoad" );
-                ADDRESERVED( 0xFFFC );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "chn = " );
-                ADDHEX( 4 );
-                UINT16	n;
-                rIn >> n;
-                ADDTEXT( "    cce = " );
-                __AddDec( t, n );
-                PRINT();
-                FormulaDump( n, FT_SharedFormula );
-            }
-            break;
-            case 0x0225:		// DEFAULTROWHEIGHT - height & flags
-            {
-                rIn >> __nFlags;
-                LINESTART();
-                ADDTEXT( "default row " );
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fUnsynced" );
-                ADDFLAG( 0x0002, "fRowHtZero" );
-                ADDFLAG( 0x0004, "fExAsc" );
-                ADDFLAG( 0x0008, "fExDsc" );
-                ADDRESERVED( 0xFFF0 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "default row height: " );
-                ADDDEC( 2 );
-                PRINT();
-            }
-            break;
-            case 0x023E:        // WINDOW2
-            {
-                LINESTART();
-                rIn >> __nFlags;
-                STARTFLAG();
-                ADDFLAG( 0x0001, "show-formulas" );
-                ADDFLAG( 0x0002, "show-grid" );
-                ADDFLAG( 0x0004, "show-headers" );
-                ADDFLAG( 0x0008, "frozen" );
-                ADDFLAG( 0x0010, "show-zero" );
-                ADDFLAG( 0x0020, "auto-grid-color" );
-                ADDFLAG( 0x0040, "right-to-left" );
-                ADDFLAG( 0x0080, "show-outline" );
-                ADDFLAG( 0x0100, "remove-splits" );
-                ADDFLAG( 0x0200, "sheet-selected" );
-                ADDFLAG( 0x0400, "sheet-visible" );
-                ADDFLAG( 0x0800, "show-pagebreak" );
-                ADDRESERVED( 0xF000 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "first-row=" );        ADDDEC( 2 );
-                ADDTEXT( "   first-col=" );     ADDDEC( 2 );
-                ADDTEXT( "   grid-color=" );    ADDDEC( 2 );
-                ADDTEXT( "   reserved=" );      ADDHEX( 2 );
-                PRINT();
-                // reallife: WINDOW2 in charts do not have teh following fields
-                if( rIn.GetRecLeft() >= 8 )
-                {
-                    LINESTART();
-                    ADDTEXT( "pagebreak-zoom=" );   ADDDEC( 2 );
-                    ADDTEXT( "%   view-zoom=" );    ADDDEC( 2 );
-                    ADDTEXT( "%   reserved=" );     ADDHEX( 4 );
-                    PRINT();
-                }
-            }
-            break;
-            case 0x027E:
-            {
-                ADDCELLHEAD();
-                ADDTEXT( "   val = " );
-                __AddRK( t, rIn.ReadInt32() );
-                PRINT();
-            }
-            break;
-            case 0x0293:        // STYLE
-            {
-                LINESTART();
-                sal_uInt16 nXF;
-                rIn >> nXF;
-                ADDTEXT( "xf-ref=" );           __AddHex( t, nXF );
-                ADDTEXT( " (xf=#" );            __AddDec( t, static_cast< sal_uInt16 >( nXF & EXC_STYLE_XFMASK ) );
-                if( ::get_flag( nXF, EXC_STYLE_BUILTIN ) )
-                {
-                    sal_uInt8 nStyleId, nLevel;
-                    rIn >> nStyleId >> nLevel;
-                    ADDTEXT( " builtin)   style-id=" ); __AddDec( t, nStyleId );
-                    ADDTEXT( " (" );
-                    static const sal_Char* ppcStyles[] = {
-                        "Normal", "RowLevel", "ColLevel", "Comma", "Currency",
-                        "Percent", "Comma_0", "Currency_0",
-                        "Hyperlink", "Followed_Hyperlink" };
-                    if( nStyleId < STATIC_TABLE_SIZE( ppcStyles ) )
-                        ADDTEXT( ppcStyles[ nStyleId ] );
-                    else
-                        ADDTEXT( "!unknown!" );
-                    ADDTEXT( ")   outline-level=" );    __AddDec( t, nLevel );
-                }
-                else
-                {
-                    ADDTEXT( ")   name=" );
-                    AddUNICODEString( t, rIn );
-                }
-                PRINT();
-            }
-            break;
-            case 0x041E:
-            {
-                LINESTART();
-                ADDTEXT( "Index: " );           ADDHEX( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "Format: " );       AddUNICODEString( t, rIn );
-                PRINT();
-            }
-            break;
-            case 0x04BC:
-            {
-                UINT16	nR1, nR2;
-                UINT8	nC1, nC2;
-                LINESTART();
-                rIn >> nR1 >> nR2 >> nC1 >> nC2;
-                lcl_AddRangeRef( t, nC1, nR1, nC2, nR2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "reserved = " );
-                __AddPureHex( t, Read2( rIn ) );
-                UINT16	n;
-                rIn >> n;
-                ADDTEXT( "    cce = " );
-                __AddDec( t, n );
-                PRINT();
-                FormulaDump( n, FT_SharedFormula );
-            }
-            break;
-            case 0x0803:		// WEBQRYSETTINGS - web query: options
-            {
-                UINT16 nCnt;
-                LINESTART();
-                ADDTEXT( "repeated recnum: " );
-                ADDHEX( 2 );
-                ADDTEXT( "   unknown:" );
-                for( nCnt = 0; nCnt < 3; nCnt++ )
-                {
-                    ADDTEXT( " " );
-                    ADDHEX( 2 );
-                }
-                PRINT();
-                LINESTART();
-                rIn >> __nFlags;
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fImportPRE" );
-                ADDFLAG( 0x0002, "fIgnoreSep" );
-                ADDFLAG( 0x0004, "fUseSetting" );
-                ADDFLAG( 0x0010, "fIgnoreDate" );
-                ADDFLAG( 0x0020, "fWhatIsIt?" );
-                ADDRESERVED( 0xFFC8 );
-                PRINT();
-                LINESTART();
-                rIn >> __nFlags;
-                STARTFLAG();
-                ADDFLAG( 0x0002, "fTables" );
-                ADDRESERVED( 0xFFFD );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "unknown: " );				ADDHEX( 2 );
-                ADDTEXT( " " );						ADDHEX( 2 );
-                ADDTEXT( " " );						ADDHEX( 2 );
-                ADDTEXT( " " );						ADDHEX( 2 );
-                ADDTEXT( " " );						ADDHEX( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "refresh: " );				ADDDEC( 2 );
-                ADDTEXT( "   unknown: " );			ADDHEX( 2 );
-                ADDTEXT( " " );						ADDHEX( 2 );
-                PRINT();
-            }
-            break;
-            case 0x0804:		// WEBQRYTABLES - web query: selected tables
-            {
-                LINESTART();
-                ADDTEXT( "repeated recnum: " );		ADDHEX( 2 );
-                ADDTEXT( "   unknown: " );			ADDHEX( 2 );
-                PRINT();
-                if( nL > 6 )
-                {
-                    LINESTART();
-                    ADDTEXT( "text: " );
-                    AddUNICODEString( t, rIn );
-                    PRINT();
-                }
-            }
-            break;
-            case 0x0809:		// BOF
-            {
-                rIn.DisableDecryption();
-                LINESTART();
-                ADDTEXT( "version number:      " );
-                ADDHEX( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "substream type:      " );
-                rIn >> mnSubstream;
-                __AddHex( t, mnSubstream );
-                ADDTEXT( " (" );
-                switch( mnSubstream )
-                {
-                    case 0x0005:	p = "Workbook globals";				break;
-                    case 0x0006:	p = "Visual Basic module";			break;
-                    case 0x0010:	p = "Worksheet or dialog sheet";	break;
-                    case 0x0020:	p = "Chart";						break;
-                    case 0x0040:	p = "MS 4.0 Macro";					break;
-                    case 0x0100:	p = "Workspace file";				break;
-                    default:		p = pU;
-                }
-                ADDTEXT( p );
-                ADDTEXT( ")" );
-                PRINT();
-                LINESTART();
-                UINT16  n;
-                rIn >> n;
-                ADDTEXT( "build identifier:    ");
-                __AddHex( t, n );
-                ADDTEXT( " (=" );
-                __AddDec( t, n );
-                ADDTEXT( ")" );
-                PRINT();
-
-                LINESTART();
-                rIn >> n;
-                ADDTEXT( "build year:          ");
-                __AddHex( t, n );
-                ADDTEXT( " (=" );
-                __AddDec( t, n );
-                ADDTEXT( ")" );
-                PRINT();
-
-                UINT32	__nFlags;
-                rIn >> __nFlags;
-                LINESTART();
-                ADDTEXT( "file history " );
-                STARTFLAG();
-                if( __nFlags )
-                {
-                    ADDFLAG( 0x00000001, "fWin" );
-                    ADDFLAG( 0x00000002, "fRisc" );
-                    ADDFLAG( 0x00000004, "fBeta" );
-                    ADDFLAG( 0x00000008, "fWinAny" );
-                    ADDFLAG( 0x00000010, "fMacAny" );
-                    ADDFLAG( 0x00000020, "fBetaAny" );
-                    ADDFLAG( 0x00000100, "fRiscAny" );
-                    ADDRESERVED( 0xFFFFE0C0 );
-                }
-                PRINT();
-
-                LINESTART();
-                ADDTEXT( "lowest BIFF version: ");
-                ADDHEX( 4 );
-                PRINT();
-            }
-            break;
-            case 0x1002:		// ChartChart
-            {
-                LINESTART();
-                ADDTEXT( "Pos = " );
-                ADD16P16();
-                ADDTEXT( " / " );
-                ADD16P16();
-                ADDTEXT( "     Size = " );
-                ADD16P16();
-                ADDTEXT( " / " );
-                ADD16P16();
-                PRINT();
-            }
-                break;
-            case 0x1003:		// ChartSeries
-            {
-                sal_uInt16 nCatType, nValType, nCatCnt, nValCnt, nBubType, nBubCnt;
-                rIn >> nCatType >> nValType >> nCatCnt >> nValCnt >> nBubType >> nBubCnt;
-                LINESTART();
-                ADDTEXT( "category-type=" );    __AddDec( t, nCatType );
-                ADDTEXT( " " );                 ADDTEXT( GetSeriesType( nCatType ) );
-                ADDTEXT( "   count=" );         __AddDec( t, nCatCnt );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "   value-type=" );    __AddDec( t, nValType );
-                ADDTEXT( " " );                 ADDTEXT( GetSeriesType( nValType ) );
-                ADDTEXT( "   count=" );         __AddDec( t, nValCnt );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "  bubble-type=" );    __AddDec( t, nBubType );
-                ADDTEXT( " " );                 ADDTEXT( GetSeriesType( nBubType ) );
-                ADDTEXT( "   count=" );         __AddDec( t, nBubCnt );
-                PRINT();
-            }
-            break;
-            case 0x1006:		// ChartDataformat
-            {
-                INT16   n;
-                LINESTART();
-                rIn >> n;
-                ADDTEXT( "Point number = " );
-                __AddDec( t, n );
-                if( n == -1 )
-                    ADDTEXT( " (entire series)" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "Series index = " );
-                ADDDEC( 2 );
-                ADDTEXT( "   Series number = " );
-                ADDDEC( 2 );
-                if( Read2( rIn ) & 0x01 )
-                    ADDTEXT( "  (fXL4iss)" );
-                PRINT();
-            }
-                break;
-            case 0x1007:		// ChartLineform
-            {
-                LINESTART();
-                ADDTEXT( "Color = " );
-                ADDTEXT( GetRGB( Read4( rIn ) ) );
-                ADDTEXT( "   Pattern : " );
-                ADDTEXT( GetLineType( Read2( rIn ) ) );
-                switch( ( INT16 ) Read2( rIn ) )
-                {
-                    case -1:	p = "hairline";			break;
-                    case 0:		p = "narrow (single)";	break;
-                    case 1:		p = "medium (double)";	break;
-                    case 2:		p = "wide (triple)";	break;
-                    default:	p = pU;
-                }
-                ADDTEXT( ", " );
-                ADDTEXT( p );
-                PRINT();
-                rIn >> __nFlags;
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x0001, "fAuto" );
-                    ADDFLAG( 0x0004, "fDrawTick" );
-                    PRINT();
-                }
-                LINESTART();
-                ADDTEXT( "color index = " );
-                ADDDEC( 2 );
-                PRINT();
-            }
-                break;
-            case 0x1009:		// ChartMarkerformat
-            {
-                UINT16	n;
-                LINESTART();
-                ADDTEXT( "Fore = " );
-                ADDTEXT( GetRGB( Read4( rIn ) ) );
-                ADDTEXT( "  Back = " );
-                ADDTEXT( GetRGB( Read4( rIn ) ) );
-                rIn >> n;
-                switch( n )
-                {
-                    case 0:		p = "no marker";		break;
-                    case 1:		p = "square";			break;
-                    case 2:		p = "diamond";			break;
-                    case 3:		p = "triangle";			break;
-                    case 4:		p = "X";				break;
-                    case 5:		p = "star";				break;
-                    case 6:		p = "Dow-Jones";		break;
-                    case 7:		p = "std deviation";	break;
-                    case 8:		p = "circle";			break;
-                    case 9:		p = "plus sign";		break;
-                    default:	p = pU;
-                }
-                ADDTEXT( "  Type = " );
-                ADDTEXT( p );
-                PRINT();
-                rIn >> __nFlags;
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x0001, "fAuto" );
-                    ADDFLAG( 0x0010, "fNoBackg" );
-                    ADDFLAG( 0x0020, "fNoFore" );
-                    ADDRESERVED( 0xFFCE );
-                    PRINT();
-                }
-                LINESTART();
-                ADDTEXT( "border color = " );
-                ADDDEC( 2 );
-                ADDTEXT( "   fill color = " );
-                ADDDEC( 2 );
-                ADDTEXT( "   size = " );
-                ADDDEC(4);
-                PRINT();
-            }
-                break;
-            case 0x100A:		// ChartAreaformat
-            {
-                LINESTART();
-                ADDTEXT( "Fore = " );
-                ADDTEXT( GetRGB( Read4( rIn ) ) );
-                ADDTEXT( "  Back = " );
-                ADDTEXT( GetRGB( Read4( rIn ) ) );
-                ADDTEXT( "  Pattern = " );
-                UINT16 n;
-                rIn >> n >> __nFlags;
-                __AddDec( t, n );
-                ADDTEXT( " (" );
-                __AddHex( t, n );
-                ADDTEXT( ")" );
-                PRINT();
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x01, "fAuto" );
-                    ADDFLAG( 0x02, "fInvertNeg" );
-                    PRINT();
-                }
-            }
-                LINESTART();
-                ADDTEXT( "color index fore = " );
-                ADDDEC( 2 );
-                ADDTEXT( ", back = " );
-                ADDDEC( 2 );
-                PRINT();
-                break;
-            case 0x100B:		// ChartPieformat
-                LINESTART();
-                ADDDEC( 2 );
-                ADDTEXT( "%" );
-                PRINT();
-                break;
-            case 0x100C:		// ChartAttachedlabel
-                ContDump( nL );
-                break;
-            case 0x100D:		// ChartSeriestext
-                ContDump( nL );
-                break;
-            case 0x1014:		// ChartChartformat
-            {
-                ContDump( 16 );
-                LINESTART();
-                rIn >> __nFlags;
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x0001, "fVaried" );
-                    PRINT();
-                }
-                LINESTART();
-                ADDTEXT( "drawing order = " );
-                ADDDEC( 2 );
-                PRINT();
-            }
-                break;
-            case 0x1015:		// ChartLegend
-            {
-                UINT32	nX, nY, nDx, nDy;
-                UINT8	nWType, nWSpacing;
-                rIn >> nX >> nY >> nDx >> nDy >> nWType >> nWSpacing >> __nFlags;
-                LINESTART();
-                __AddDec( t, nX );
-                ADDTEXT( " / " );
-                __AddDec( t, nY );
-                ADDTEXT( "  [" );
-                __AddDec( t, nDx );
-                ADDTEXT( " / " );
-                __AddDec( t, nDy );
-                ADDTEXT( "]" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "  Type: " );
-                switch( nWType )
-                {
-                    case 0:		p = "bottom";								break;
-                    case 1:		p = "corner";								break;
-                    case 2:		p = "top";									break;
-                    case 3:		p = "right";								break;
-                    case 4:		p = "left";									break;
-                    case 7:		p = "not docked or inside the plot area";	break;
-                    default:	p = pU;
-                }
-                ADDTEXT( p );
-                ADDTEXT( "   Spacing: " );
-                switch( nWSpacing )
-                {
-                    case 0:		p = "close";		break;
-                    case 1:		p = "medium";		break;
-                    case 2:		p = "open";			break;
-                    default:	p = pU;
-                }
-                ADDTEXT( p );
-                PRINT();
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x01, "fAutoPosition" );
-                    ADDFLAG( 0x02, "fAutoSeries" );
-                    ADDFLAG( 0x04, "fAutoPosX" );
-                    ADDFLAG( 0x08, "fAutoPosY" );
-                    ADDFLAG( 0x10, "fVert" );
-                    ADDFLAG( 0x20, "fWasDataTable" );
-                    PRINT();
-                }
-            }
-                break;
-            case 0x1016:		// ChartSerieslist
-                ContDump( nL );
-                break;
-            case 0x1017:		// ChartBar
-            {
-                LINESTART();
-                ADDTEXT( "space betw. bars = " );
-                ADDDEC( 2 );
-                ADDTEXT( "  space betw. cat = " );
-                ADDDEC( 2 );
-                PRINT();
-                rIn >> __nFlags;
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x0001, "fTranspose" );
-                    ADDFLAG( 0x0002, "fStacked" );
-                    ADDFLAG( 0x0004, "f100" );
-                    ADDFLAG( 0x0008, "fHasShadow" );
-                    PRINT();
-                }
-            }
-                break;
-            case 0x1018:		// ChartLine
-                ContDump( nL );
-                break;
-            case 0x1019:		// ChartPie
-                ContDump( nL );
-                break;
-            case 0x101A:		// ChartArea
-                ContDump( nL );
-                break;
-            case 0x101C:		// ChartLine
-                ContDump( nL );
-                break;
-            case 0x101D:		// ChartAxis
-            {
-                static const sal_Char* const ppcIds[] = { "x-axis", "y-axis", "z-axis" };
-                LINESTART();
-                sal_uInt16 nAxisId = rIn.ReaduInt16();
-                ADDTEXT( "axis-id=" );          __AddDec( t, nAxisId );
-                lcl_AddEnum( t, nAxisId, ppcIds, STATIC_TABLE_SIZE( ppcIds ) );
-                PRINT();
-                ContDump( 16 );
-            }
-                break;
-            case 0x101E:        // CHTICK
-            {
-                static const sal_Char* const ppcTickMode[] = { "off", "inside", "outside", "cross" };
-                static const sal_Char* const ppcTickPos[] = { "off", "low", "high", "next-to-axis" };
-                static const sal_Char* const ppcText[] = { "transparent", "opaque" };
-                LINESTART();
-                sal_uInt8 nMajor, nMinor, nPos, nText;
-                rIn >> nMajor >> nMinor >> nPos >> nText;
-                ADDTEXT( "major=" );            __AddDec( t, nMajor );
-                lcl_AddEnum( t, nMajor, ppcTickMode, STATIC_TABLE_SIZE( ppcTickMode ) );
-                ADDTEXT( "   minor=" );         __AddDec( t, nMinor );
-                lcl_AddEnum( t, nMinor, ppcTickMode, STATIC_TABLE_SIZE( ppcTickMode ) );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "position=" );         __AddDec( t, nPos );
-                lcl_AddEnum( t, nPos, ppcTickPos, STATIC_TABLE_SIZE( ppcTickPos ) );
-                ADDTEXT( "   text-mode=" );     __AddDec( t, nText );
-                lcl_AddEnum( t, nText, ppcText, STATIC_TABLE_SIZE( ppcText ) );
-                ADDTEXT( "    text-color=" );
-                ADDTEXT( GetRGB( Read4( rIn ) ) );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "reserved=" );         ADDHEX( 4 );
-                ADDTEXT( "," );                 ADDHEX( 4 );
-                ADDTEXT( "," );                 ADDHEX( 4 );
-                ADDTEXT( "," );                 ADDHEX( 4 );
-                PRINT();
-                rIn >> __nFlags;
-                LINESTART();
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fAutoCol" );
-                ADDFLAG( 0x0002, "fAutoBack" );
-                ADDFLAG( 0x0020, "fAutoRot" );
-                ADDRESERVED( 0xFFDC );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "color=" );            ADDDEC( 2 );
-                ADDTEXT( "   rotation=" );      ADDDEC( 2 );
-                PRINT();
-            }
-                break;
-            case 0x101F:        // CHVALUERANGE
-            {
-                LINESTART();
-                ADDTEXT( "min=" );              ADDDOUBLE();
-                ADDTEXT( "   max=" );           ADDDOUBLE();
-                ADDTEXT( "   major=" );         ADDDOUBLE();
-                ADDTEXT( "   minor=" );         ADDDOUBLE();
-                ADDTEXT( "   axis-cross=" );    ADDDOUBLE();
-                PRINT();
-                rIn >> __nFlags;
-                LINESTART();
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fAutoMin" );
-                ADDFLAG( 0x0002, "fAutoMax" );
-                ADDFLAG( 0x0004, "fAutoMajor" );
-                ADDFLAG( 0x0008, "fAutoMinor" );
-                ADDFLAG( 0x0010, "fAutoCross" );
-                ADDFLAG( 0x0020, "fLogScale" );
-                ADDFLAG( 0x0040, "fReverse" );
-                ADDFLAG( 0x0080, "fMaxCross" );
-                ADDRESERVED( 0xFF00 );
-                PRINT();
-            }
-                break;
-            case 0x1020:        // CHEXTRANGE
-            {
-                LINESTART();
-                ADDTEXT( "axis-cross=" );       ADDDEC( 2 );
-                ADDTEXT( "   label-freq=" );    ADDDEC( 2 );
-                ADDTEXT( "   mark-freq=" );     ADDDEC( 2 );
-                PRINT();
-                rIn >> __nFlags;
-                LINESTART();
-                STARTFLAG();
-                ADDFLAG( 0x0001, "fBetween" );
-                ADDFLAG( 0x0002, "fMaxCross" );
-                ADDFLAG( 0x0004, "fReverse" );
-                ADDRESERVED( 0xFFF8 );
-                PRINT();
-            }
-                break;
-            case 0x1021:		// ChartAxislineformat
-            {
-                LINESTART();
-                switch( Read2( rIn ) )
-                {
-                    case 0:		p = "axis line itself";		break;
-                    case 1:		p = "major grid line";		break;
-                    case 2:		p = "minor grid line";		break;
-                    case 3:		p = "walls or floor";		break;
-                    default:	p = pU;
-                }
-                ADDTEXT( p );
-                PRINT();
-            }
-                break;
-            case 0x1022:		// CHARTFORMATLINK
-                ContDump( nL );
-                break;
-            case 0x1024:		// ChartDefaulttext
-                ContDump( nL );
-                break;
-            case 0x1025:		// ChartText
-            {
-                LINESTART();
-                UINT8	nAt, nVat;
-                UINT16	nBkgMode;
-                INT32	nX, nY, nDx, nDy;
-                UINT16	nGrbit2, nIcvText;
-                INT16	nTrot;
-                rIn >> nAt >> nVat >> nBkgMode;
-                ADDTEXT( "h = " );
-                switch( nAt )
-                {
-                    case 1:		p = "left";			break;
-                    case 2:		p = "center";		break;
-                    case 3:		p = "right";		break;
-                    case 4:		p = "justify";		break;
-                    case 5:     p = "distribute";   break;
-                    default:	p = pU;
-                }
-                ADDTEXT( p );
-                ADDTEXT( "   v = " );
-                switch( nVat )
-                {
-                    case 1:		p = "top";			break;
-                    case 2:		p = "center";		break;
-                    case 3:		p = "bottom";		break;
-                    case 4:		p = "justify";		break;
-                    case 5:     p = "distribute";   break;
-                    default:	p = pU;
-                }
-                ADDTEXT( p );
-                ADDTEXT( "   mode = " );
-                if( nBkgMode == 1 )
-                    ADDTEXT( "transparent" );
-                else if( nBkgMode == 2 )
-                    ADDTEXT( "opaque" );
-                else
-                    ADDTEXT( pU );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "color = " );
-                ADDTEXT( GetRGB( Read4( rIn ) ) );
-                rIn >> nX >> nY >> nDx >> nDy >> __nFlags >> nIcvText >> nGrbit2 >> nTrot;
-                ADDTEXT( "   pos[size] = " );
-                __AddDec( t, nX );
-                ADDTEXT( " / " );
-                __AddDec( t, nY );
-                ADDTEXT( "  [" );
-                __AddDec( t, nDx );
-                ADDTEXT( " / " );
-                __AddDec( t, nDy );
-                ADDTEXT( "]" );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "   (pos[size] = " );
-                __AddHex( t, nX );
-                ADDTEXT( " / " );
-                __AddHex( t, nY );
-                ADDTEXT( "  [" );
-                __AddHex( t, nDx );
-                ADDTEXT( " / " );
-                __AddHex( t, nDy );
-                ADDTEXT( "])" );
-                PRINT();
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x0001, "fAutoColor" );
-                    ADDFLAG( 0x0002, "fShowKey" );
-                    ADDFLAG( 0x0004, "fShowValue" );
-                    ADDFLAG( 0x0008, "fVert" );
-                    ADDFLAG( 0x0010, "fAutoText" );
-                    ADDFLAG( 0x0020, "fGenerated" );
-                    ADDFLAG( 0x0040, "fDeleted" );
-                    ADDFLAG( 0x0080, "fAutoMode" );
-                    ADDFLAG( 0x0800, "fShLabPct" );
-                    ADDFLAG( 0x1000, "fShowPct" );
-                    ADDFLAG( 0x2000, "fShowBubbleSizes" );
-                    ADDFLAG( 0x4000, "fShowLabel" );
-                    PRINT();
-                }
-                LINESTART();
-                ADDTEXT( "rot = " );
-                switch( __nFlags & 0x0700 )
-                {
-                    case 0x0000:	p = "no rotation";				break;
-                    case 0x0100:	p = "top to bottom, upright";	break;
-                    case 0x0200:	p = "90 deg counterclockwise";	break;
-                    case 0x0300:	p = "90 deg clockwise";			break;
-                    default:		p = pU;
-                }
-                ADDTEXT( p );
-                ADDTEXT( "   trot = " );
-                __AddDec( t, nTrot );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "text color = " );
-                __AddDec( t, nIcvText );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "placement: " );
-                switch( nGrbit2 & 0x000F )
-                {
-                    case 0:		p = "0 default";		break;
-                    case 1:		p = "outside";			break;
-                    case 2:		p = "inside";			break;
-                    case 3:		p = "center";			break;
-                    case 4:		p = "axis";				break;
-                    case 5:		p = "above";			break;
-                    case 6:		p = "below";			break;
-                    case 7:		p = "left";				break;
-                    case 8:		p = "right";			break;
-                    case 9:		p = "auto";				break;
-                    case 10:	p = "moved";			break;
-                    default:	p = pU;
-                }
-                ADDTEXT( p );
-                PRINT();
-            }
-                break;
-            case 0x1026:		// ChartFontx
-                ContDump( nL );
-                break;
-            case 0x1027:        // CHOBJECTLINK
-            {
-                static const sal_Char* const ppcObjLink[] = { 0, "title", "y-axis", "x-axis", "data", "legend", "none", "z-axis" };
-                LINESTART();
-                sal_uInt16 nObjLink;
-                rIn >> nObjLink;
-                ADDTEXT( "link=" );             __AddDec( t, nObjLink );
-                lcl_AddEnum( t, nObjLink, ppcObjLink, STATIC_TABLE_SIZE( ppcObjLink ) );
-                ADDTEXT( "   series=" );        ADDDEC( 2 );
-                ADDTEXT( "   point=" );         ADDDEC( 2 );
-                PRINT();
-            }
-            break;
-            case 0x1032:		// ChartFrame
-            {
-                LINESTART();
-                switch( Read2( rIn ) )
-                {
-                    case 0:		p = "no border";	break;
-                    case 1:
-                    case 2:
-                    case 3:		p = "reserved";		break;
-                    case 4:		p = "with shadow";	break;
-                    default:	p = pU;
-                }
-                ADDTEXT( "Frame type: " );
-                ADDTEXT( p );
-                PRINT();
-                rIn >> __nFlags;
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x01, "fAutoSize" );
-                    ADDFLAG( 0x02, "fAutoPosition" );
-                    PRINT();
-                }
-            }
-                break;
-            case 0x1035:		// ChartPlotarea
-                ContDump( nL );
-                break;
-            case 0x103A:		// Chart3D
-                ContDump( nL );
-                break;
-            case 0x103C:		// ChartPicf
-                LINESTART();
-                ADDTEXT( "bmp-mode=" );             ADDDEC( 2 );
-                ADDTEXT( "   format=" );            ADDDEC( 2 );
-                ADDTEXT( "   flags=" );             ADDHEX( 2 );
-                ADDTEXT( "   scale=" );             ADDDOUBLE();
-                PRINT();
-                break;
-            case 0x103D:		// ChartDropbar
-                ContDump( nL );
-                break;
-            case 0x103E:		// ChartRadar
-                ContDump( nL );
-                break;
-            case 0x103F:		// ChartSurface
-                ContDump( nL );
-                break;
-            case 0x1040:		// ChartRadararea
-                ContDump( nL );
-                break;
-            case 0x1041:		// ChartAxisparent
-            {
-                LINESTART();
-                switch( Read2( rIn ) )
-                {
-                    case 0:		p = "main";				break;
-                    case 1:		p = "secondary";		break;
-                    default:	p = pU;
-                }
-                ADDTEXT( "Index: " );
-                ADDTEXT( p );
-                ADDTEXT( "    " );
-                ADDDEC(4);
-                ADDTEXT( '/' );
-                ADDDEC(4);
-                ADDTEXT( " [" );
-                ADDDEC(4);
-                ADDTEXT( '/' );
-                ADDDEC(4);
-                ADDTEXT( ']' );
-                PRINT();
-            }
-                break;
-            case 0x1043:		// ChartLegendxn
-                ContDump( nL );
-                break;
-            case 0x1044:		// ChartShtprops
-                ContDump( nL );
-                break;
-            case 0x1045:		// ChartSertocrt
-                ContDump( nL );
-                break;
-            case 0x1046:		// ChartAxesused
-            {
-                LINESTART();
-                ADDTEXT( "Used : " );
-                ADDDEC( 2 );
-                PRINT();
-            }
-                break;
-            case 0x1048:		// ChartSbaseref
-                ContDump( nL );
-                break;
-            case 0x104A:        // CHSERPARENT
-                LINESTART();
-                ADDTEXT( "parent-index=" );     ADDDEC( 2 );
-                ADDTEXT( " (one-based)" );
-                PRINT();
-            break;
-            case 0x104B:        // CHSERTRENDLINE
-            {
-                static const sal_Char* const ppcType[] =
-                    { "poynomial", "exponential", "logarithmic", "power", "moving-avg" };
-                sal_uInt8 nType;
-                rIn >> nType;
-                LINESTART();
-                ADDTEXT( "line-type=" );        __AddDec( t, nType );
-                lcl_AddEnum( t, nType, ppcType, STATIC_TABLE_SIZE( ppcType ) );
-                ADDTEXT( "   order=" );         ADDDEC( 1 );
-                ADDTEXT( "   intercept=" );     ADDDOUBLE();
-                PRINT();
-                LINESTART();
-                ADDTEXT( "show-equation=" );    ADDDEC( 1 );
-                ADDTEXT( "   show-r-sqr=" );    ADDDEC( 1 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "forecast-for=" );     ADDDOUBLE();
-                ADDTEXT( "   forecast-back=" ); ADDDOUBLE();
-                PRINT();
-            }
-            break;
-            case 0x104E:		// ChartIfmt
-                ContDump( nL );
-                break;
-            case 0x104F:		// ChartPos
-            {
-                LINESTART();
-                UINT16	nMdTopLt, nMdBotRt;
-                INT32	nX, nY, nDx, nDy;
-                rIn >> nMdTopLt >> nMdBotRt >> nX >> nY >> nDx >> nDy;
-                ADDTEXT( "TopLr = " );
-                __AddDec( t, nMdTopLt );
-                ADDTEXT( "   BotRt = " );
-                __AddDec( t, nMdBotRt );
-                PRINT();
-                LINESTART();
-                __AddDec( t, nX );
-                ADDTEXT( " / " );
-                __AddDec( t, nY );
-                ADDTEXT( "  [" );
-                __AddDec( t, nDx );
-                ADDTEXT( " / " );
-                __AddDec( t, nDy );
-                ADDTEXT( "]" );
-                PRINT();
-            }
-                break;
-            case 0x1050:		// ChartAlruns
-                ContDump( nL );
-                break;
-            case 0x1051:		// AI
-            {
-                LINESTART();
-                UINT8 n8 = Read1( rIn );
-                switch( n8 )
-                {
-                    case 0:		p = "title or text";		break;
-                    case 1:		p = "values";				break;
-                    case 2:		p = "categories";			break;
-                    case 3:     p = "bubble sizes";         break;
-                    default:	p = pU;
-                }
-                ADDTEXT( "Link index identifier: " );
-                ADDTEXT( p );
-                if ( p == pU )
-                    __AddHex( t, n8 );
-                PRINT();
-                LINESTART();
-                switch( Read1( rIn ) )
-                {
-                    case 0:     p = "default categories";       break;
-                    case 1:		p = "text or value";			break;
-                    case 2:		p = "linked to worksheet";		break;
-                    case 3:		p = "not used (HaHaHa...)";		break;
-                    case 4:		p = "error reported";			break;
-                    default:	p = pU;
-                }
-                ADDTEXT( "Refernce type: " );
-                ADDTEXT( p );
-                PRINT();
-                rIn >> __nFlags;
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x01, "fCustomIfmt" );
-                    PRINT();
-                }
-                LINESTART();
-                ADDTEXT( "Numberformat = " );
-                ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                UINT16	n;
-                rIn >> n;
-                ADDTEXT( "Formula [" );
-                __AddDec( t, n );
-                ADDTEXT( "]: ---------------- " );
-                PRINT();
-                FormulaDump( n, FT_CellFormula );
-            }
-                break;
-            case 0x105B:        // CHSERERRORBAR
-            {
-                static const sal_Char* const ppcType[] = { 0, "x-plus", "x-minus", "y-plus", "y-minus" };
-                static const sal_Char* const ppcSource[] = { 0, "percent", "fixed", "std-dev", "custom", "std-error" };
-                static const sal_Char* const ppcLineEnd[] = { "blank", "t-shape" };
-                sal_uInt8 nType, nSource, nLineEnd;
-                rIn >> nType >> nSource >> nLineEnd;
-                LINESTART();
-                ADDTEXT( "bar-type=" );         __AddDec( t, nType );
-                lcl_AddEnum( t, nType, ppcType, STATIC_TABLE_SIZE( ppcType ) );
-                ADDTEXT( "   value-source=" );  __AddDec( t, nSource );
-                lcl_AddEnum( t, nSource, ppcSource, STATIC_TABLE_SIZE( ppcSource ) );
-                ADDTEXT( "   line-end=" );      __AddDec( t, nLineEnd );
-                lcl_AddEnum( t, nLineEnd, ppcLineEnd, STATIC_TABLE_SIZE( ppcLineEnd ) );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "reserved=" );         ADDHEX( 1 );
-                ADDTEXT( "   value=" );         ADDDOUBLE();
-                ADDTEXT( "   ref-count=" );     ADDDEC( 2 );
-                PRINT();
-            }
-            break;
-            case 0x105D:		// ChartSerfmt
-                ContDump( nL );
-                break;
-            case 0x105F:		// Chart3DDataForm
-            {
-                UINT8 nGround, nTop;
-                nGround	= Read1( rIn );
-                nTop	= Read1( rIn );
-                UINT16 nStyle = ((UINT16)nGround << 8) | nTop;
-                LINESTART();
-                ADDTEXT( "3D - format (" );
-                __AddHex( t, nGround );
-                ADDTEXT( " " );
-                __AddHex( t, nTop );
-                ADDTEXT( "): " );
-                switch( nStyle )
-                {
-                    case 0x0000:	ADDTEXT( "bar" ); break;
-                    case 0x0001:	ADDTEXT( "pyramid" ); break;
-                    case 0x0002:	ADDTEXT( "pyramid, cut" ); break;
-                    case 0x0100:	ADDTEXT( "cylinder" ); break;
-                    case 0x0101:	ADDTEXT( "cone" ); break;
-                    case 0x0102:	ADDTEXT( "cone, cut" ); break;
-                    default:		ADDTEXT( pU );
-                }
-                PRINT();
-            }
-                break;
-            case 0x1060:		// ChartFbi
-            {
-                LINESTART();
-                ADDTEXT( "dmixBasis = " );
-                ADDDEC( 2 );
-                ADDTEXT( "  dmiyBasis = " );
-                ADDDEC( 2 );
-                ADDTEXT( "  twpHeightBasis = " );
-                ADDDEC( 2 );
-                ADDTEXT( "  scab = " );
-                ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "ifnt = " );
-                ADDDEC( 2 );
-                PRINT();
-            }
-                break;
-            case 0x1061:		// ChartBoppop
-                ContDump( nL );
-                break;
-            case 0x1062:		// ChartAxcext
-            {
-                LINESTART();
-                ADDTEXT( "cat on axis: " );
-                ADDDEC( 2 );
-                ADDTEXT( " ... " );
-                ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "major unit: val = " );
-                ADDDEC( 2 );
-                ADDTEXT( "  units = " );
-                ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "minor unit: val = " );
-                ADDDEC( 2 );
-                ADDTEXT( "  units = " );
-                ADDDEC( 2 );
-                PRINT();
-                LINESTART();
-                ADDTEXT( "base unit = " );
-                ADDDEC( 2 );
-                ADDTEXT( "   crossing point of val axis = " );
-                ADDDEC( 2 );
-                PRINT();
-                rIn >> __nFlags;
-                if( __nFlags )
-                {
-                    LINESTART();
-                    STARTFLAG();
-                    ADDFLAG( 0x0001, "fAutoMin" );
-                    ADDFLAG( 0x0002, "fAutoMax" );
-                    ADDFLAG( 0x0004, "fAutoMajor" );
-                    ADDFLAG( 0x0008, "fAutoMinor" );
-                    ADDFLAG( 0x0010, "fDateAxis" );
-                    ADDFLAG( 0x0020, "fAutoBase" );
-                    ADDFLAG( 0x0040, "fAutoCross" );
-                    ADDFLAG( 0x0080, "fAutoDate" );
-                    PRINT();
-                }
-            }
-                break;
-            case 0x1063:		// ChartDat
-                ContDump( nL );
-                break;
-            case 0x1064:		// ChartPlotgrowth
-            {
-                UINT32	nDx, nDy;
-                rIn >> nDx >> nDy;
-                LINESTART();
-                ADDTEXT( "dxPlotGrowth = " );
-                __Add16p16( t, nDx );
-                ADDTEXT( " (" );
-                __AddHex( t, nDx );
-                ADDTEXT( ")    dyPlotGrowth = " );
-                __Add16p16( t, nDy );
-                ADDTEXT( " (" );
-                __AddHex( t, nDy );
-                ADDTEXT( ")" );
-                PRINT();
-            }
-                break;
-            case 0x1065:		// ChartSiindex
-                ContDump( nL );
-                break;
-            case 0x1066:		// ChartGelframe
-                EscherDump( nL, false );
-                break;
-            case 0x1067:		// ChartBoppcustom
-                ContDump( nL );
-                break;
-            default:
-                if( !bEncrypted )
-                    ContDump( nL );
-        }
-
-    }
-
-    if( nR == EXC_ID_FILEPASS )
-    {
-        bEncrypted = true;
-        pIn->Seek( EXC_REC_SEEK_TO_BEGIN );
-        bool bValid = (XclImpDecryptHelper::ReadFilepass( *pIn ) == ERRCODE_NONE);
-        LINESTART();
-        ADDTEXT( "decrypter=" );    lcl_AddOnOff( t, bValid );
-        PRINT();
-        bBIFF8 = bBIFF8 && bValid;  // dump BIFF8 hex only on invalid decrypter
-    }
-
-    if( bDec )
-        pLevelPre -= nLevelInc;
-}
-
-
-static const sal_Char* GetBlipType( UINT8 n )
-{
-    switch ( n )
-    {
-        case 0 :
-            return " ERROR";
-        break;
-        case 1 :
-            return " UNKNOWN";
-        break;
-        case 2 :
-            return " EMF";
-        break;
-        case 3 :
-            return " WMF";
-        break;
-        case 4 :
-            return " PICT";
-        break;
-        case 5 :
-            return " JPEG";
-        break;
-        case 6 :
-            return " PNG";
-        break;
-        case 7 :
-            return " DIB";
-        break;
-        default:
-            if ( n < 32 )
-                return " NotKnown";
-            else
-                return " Client";
-    }
-}
-
-void Biff8RecDumper::EscherDump( const ULONG nMaxLen, bool bDumpOffset )
-{
-    ULONG			n = nMaxLen;
-    UINT16			nPre, nR;
-    UINT32			nL;
-    const sal_Char*	p;
-    ByteString		aT;
-    UINT16			nDumpSize;
-
-    aT += pLevelPre;
-
-    ULONG nStartPos = pIn->GetSvStreamPos();
-    while( pIn->IsValid() && (n > 0) )
-    {
-        ULONG nCurrPos = pIn->GetSvStreamPos();
-        *pIn >> nPre >> nR >> nL;
-        n -= sizeof( nPre ) + sizeof( nR ) + sizeof( nL );
-
-        switch( nR )
-        {
-            case 0xF000:	p = "MsofbtDggContainer";		break;
-            case 0xF006:	p = "MsofbtDgg";				break;
-            case 0xF016:	p = "MsofbtCLSID";				break;
-            case 0xF00B:	p = "MsofbtOPT";				break;
-            case 0xF11A:	p = "MsofbtColorMRU";			break;
-            case 0xF11E:	p = "MsofbtSplitMenuColors";	break;
-            case 0xF001:	p = "MsofbtBstoreContainer";	break;
-            case 0xF007:	p = "MsofbtBSE";				break;
-            case 0xF002:	p = "MsofbtDgContainer";		break;
-            case 0xF008:	p = "MsofbtDg";					break;
-            case 0xF118:	p = "MsofbtRegroupItem";		break;
-            case 0xF120:	p = "MsofbtColorScheme";		break;
-            case 0xF003:	p = "MsofbtSpgrContainer";		break;
-            case 0xF004:	p = "MsofbtSpContainer";		break;
-            case 0xF009:	p = "MsofbtSpgr";				break;
-            case 0xF00A:	p = "MsofbtSp";					break;
-            case 0xF00C:	p = "MsofbtTextbox";			break;
-            case 0xF00D:	p = "MsofbtClientTextbox";		break;
-            case 0xF00E:	p = "MsofbtAnchor";				break;
-            case 0xF00F:	p = "MsofbtChildAnchor";		break;
-            case 0xF010:	p = "MsofbtClientAnchor";		break;
-            case 0xF011:	p = "MsofbtClientData";			break;
-            case 0xF11F:	p = "MsofbtOleObject";			break;
-            case 0xF11D:	p = "MsofbtDeletedPspl";		break;
-            case 0xF005:	p = "MsofbtSolverContainer";	break;
-            case 0xF012:	p = "MsofbtConnectorRule";		break;
-            case 0xF013:	p = "MsofbtAlignRule";			break;
-            case 0xF014:	p = "MsofbtArcRule";			break;
-            case 0xF015:	p = "MsofbtClientRule";			break;
-            case 0xF017:	p = "MsofbtCalloutRule";		break;
-            case 0xF119:	p = "MsofbtSelection";			break;
-            case 0xF122:    p = "MsofbtUDefProp";           break;
-            default:
-                if( nR >= 0xF018 && nR <= 0xF117 )
-                    p = "MsofbtBLIP";
-                else if ( ( nPre & 0x000F ) == 0x000F )
-                    p = "UNKNOWN container";
-                else
-                    p = "UNKNOWN ID";
-        }
-
-        aT += "  ";
-        __AddHex( aT, nR );
-        ((aT += "  ") += p) += " [";
-        __AddHex( aT, nPre );
-        aT += ',';
-        __AddHex( aT, nL );
-        aT += "]  instance: ";
-        __AddDec( aT, (UINT16)(nPre >> 4) );
-        if( bDumpOffset )
-        {
-            aT.Append( "   pos=" );
-            __AddHex( aT, static_cast< sal_uInt32 >( mnEscherPos + nCurrPos - nStartPos ) );
-        }
-        Print( aT );
-
-        if ( nR == 0xF007 && 36 <= n && 36 <= nL )
-        {	// BSE, FBSE
-            ULONG nP = pIn->GetRecPos();
-            UINT8 n8;
-            UINT16 n16;
-            UINT32 n32;
-
-            aT = "    btWin32: ";
-            *pIn >> n8;
-            __AddHex( aT, n8 );
-            aT += GetBlipType( n8 );
-            aT += "  btMacOS: ";
-            *pIn >> n8;
-            __AddHex( aT, n8 );
-            aT += GetBlipType( n8 );
-            Print( aT );
-
-            aT = "    rgbUid:";
-            Print( aT );
-            ContDump( 16 );
-
-            aT = "    tag: ";
-            *pIn >> n16;
-            __AddHex( aT, n16 );
-            Print( aT );
-
-            aT = "    size: ";
-            *pIn >> n32;
-            __AddHex( aT, n32 );
-            Print( aT );
-
-            aT = "    cRef: ";
-            *pIn >> n32;
-            __AddHex( aT, n32 );
-            Print( aT );
-
-            aT = "    offs: ";
-            *pIn >> n32;
-            __AddHex( aT, n32 );
-            Print( aT );
-
-            aT = "    usage: ";
-            *pIn >> n8;
-            __AddHex( aT, n8 );
-            aT += "  cbName: ";
-            *pIn >> n8;
-            __AddHex( aT, n8 );
-            aT += "  unused2: ";
-            *pIn >> n8;
-            __AddHex( aT, n8 );
-            aT += "  unused3: ";
-            *pIn >> n8;
-            __AddHex( aT, n8 );
-            Print( aT );
-
-            n -= pIn->GetRecPos() - nP;
-            nL = 0;		// loop to MsofbtBLIP
-        }
-        else if ( nR == 0xF00F && 0x10 <= n && 0x10 <= nL )
-        {   // ChildAnchor
-            ULONG nP = pIn->GetRecPos();
-            sal_Int32 n32;
-
-            aT.Assign( "    pos1=" );
-            *pIn >> n32;    lclAppendDec( aT, n32 );
-            aT.Append( "  pos2=" );
-            *pIn >> n32;    lclAppendDec( aT, n32 );
-            aT.Append( "  pos3=" );
-            *pIn >> n32;    lclAppendDec( aT, n32 );
-            aT.Append( "  pos4=" );
-            *pIn >> n32;    lclAppendDec( aT, n32 );
-            Print( aT );
-
-            ULONG nC = pIn->GetRecPos() - nP;
-            n -= nC;
-            nL -= nC;
-        }
-        else if ( nR == 0xF010 && 0x12 <= n && 0x12 <= nL )
-        {	// ClientAnchor
-            ULONG nP = pIn->GetRecPos();
-            UINT16 n16;
-
-            aT = "    Flag: ";
-            *pIn >> n16;
-            __AddHex( aT, n16 );
-            if( n16 & 0x0001 ) aT += " -fixedpos";
-            if( n16 & 0x0002 ) aT += " -fixedsize";
-            Print( aT );
-
-            aT = "    Col1: ";
-            *pIn >> n16;
-            __AddHex( aT, n16 );
-            aT += "  dX1: ";
-            *pIn >> n16;
-            __AddHex( aT, n16 );
-            aT += "  Row1: ";
-            *pIn >> n16;
-            __AddHex( aT, n16 );
-            aT += "  dY1: ";
-            *pIn >> n16;
-            __AddHex( aT, n16 );
-            Print( aT );
-
-            aT = "    Col2: ";
-            *pIn >> n16;
-            __AddHex( aT, n16 );
-            aT += "  dX2: ";
-            *pIn >> n16;
-            __AddHex( aT, n16 );
-            aT += "  Row2: ";
-            *pIn >> n16;
-            __AddHex( aT, n16 );
-            aT += "  dY2: ";
-            *pIn >> n16;
-            __AddHex( aT, n16 );
-            Print( aT );
-
-            ULONG nC = pIn->GetRecPos() - nP;
-            n -= nC;
-            nL -= nC;
-        }
-        else if ( nR == 0xF00A )
-        {
-            sal_uInt32 nId, nFlags;
-            *pIn >> nId >> nFlags;
-            aT.Assign( "    shape-id=" );
-            __AddHex( aT, nId );
-            aT.Append( "   flags=" );
-            __AddHex( aT, nFlags );
-            Print( aT );
-            nL -= 8; n -= 8;
-        }
-        else if ( nR == 0xF00B || nR == 0xF122 )
-        {	// OPT
-            sal_uInt32 nComplex = 0;
-            while ( nL >= 6 + nComplex && n >= 6 + nComplex )
-            {
-                UINT16 n16;
-                UINT32 n32;
-                *pIn >> n16 >> n32;
-                nL -= 6; n -= 6;
-                aT = "    ";
-                __AddHex( aT, n16 );
-                aT += " (";
-                __AddDec( aT, n16 & 0x3FFF, 5 );
-                if ( (n16 & 0x8000) == 0 )
-                {
-                    if ( n16 & 0x4000 )
-                        aT += ", fBlipID";
-                    aT += ")  ";
-                    __AddHex( aT, n32 );
-                    if ( (n16 & 0x4000) == 0 )
-                    {
-                        aT += " (";
-                        __AddDec1616( aT, n32 );
-                        aT += ')';
-                    }
-                    Print( aT );
-                }
-                else
-                {
-                    aT += ", fComplex)  ";
-                    __AddHex( aT, n32 );
-                    Print( aT );
-                    nComplex += n32;
-                }
-            }
-            // complex property data
-            while ( nComplex && n > 0 )
-            {
-                sal_uInt32 nDumpSize = (nComplex > n) ? n : nComplex;
-                ContDump( nDumpSize );
-                nComplex -= nDumpSize;
-                nL -= nDumpSize;
-                n -= nDumpSize;
-            }
-        }
-        else if ( nR == 0xF012 )
-        {
-            aT = "    Connector rule: ";    __AddDec( aT, pIn->ReaduInt32() );
-            aT += "   ShapeID A: ";         __AddHex( aT, pIn->ReaduInt32() );
-            aT += "   ShapeID B: ";         __AddHex( aT, pIn->ReaduInt32() );
-            Print( aT );
-            aT = "    ShapeID connector: "; __AddHex( aT, pIn->ReaduInt32() );
-            aT += "   Connect pt A: ";      __AddHex( aT, pIn->ReaduInt32() );
-            aT += "   Connect pt B: ";      __AddHex( aT, pIn->ReaduInt32() );
-            Print( aT );
-            nL -= 24; n -= 24;
-        }
-
-        if( ( nPre & 0x000F ) == 0x000F )
-        {	// Container
-            if ( nL <= (UINT32) n )
-                Print( "            completed within" );
-            else
-                Print( "            continued elsewhere" );
-        }
-        else
-            // -> 0x0000 ... 0x0FFF
-        {
-            nDumpSize = ( ( UINT32 ) nL > ( UINT32 ) n )? ( UINT16 ) n : ( UINT16 ) nL;
-
-            if( nDumpSize )
-            {
-                ContDump( nDumpSize );
-                n -= nDumpSize;
-            }
-        }
-
-        aT.Erase();
-    }
-    if( bDumpOffset )
-        mnEscherPos += nMaxLen;
-}
-
-
-void Biff8RecDumper::ObjDump( const ULONG nMaxLen )
-{
-#if 0
-// if an entire hex block is needed
-    pIn->PushPosition();
-    ContDump( nMaxLen );
-    pIn->PopPosition();
-#endif
-
-    ULONG			n = nMaxLen;
-    UINT16			nR, nL;
-    const sal_Char*	p;
-    ByteString		t;
-    XclImpStream&	rIn = *pIn;
-    UINT16			nDumpSize;
-    sal_uInt16      nObjFlags = 0;
-
-    t += pLevelPre;
-
-    while( n > 0 )
-    {
-        rIn >> nR >> nL;
-        n -= sizeof( nR ) + sizeof( nL );
-
-        BOOL bDetails = FALSE;
-        switch( nR )
-        {
-            case 0x0000:	p = "ftEnd";		break;
-            case 0x0001:	p = "(Reserved)";	break;
-            case 0x0002:	p = "(Reserved)";	break;
-            case 0x0003:	p = "(Reserved)";	break;
-            case 0x0004:	p = "ftMacro";		break;
-            case 0x0005:	p = "ftButton";		break;
-            case 0x0006:	p = "ftGmo";		break;
-            case 0x0007:	p = "ftCf";			break;
-            case 0x0008:	p = "ftPioGrbit";	bDetails = TRUE;	break;
-            case 0x0009:	p = "ftPictFmla";	bDetails = TRUE;	break;
-            case 0x000A:	p = "ftCbls";		break;
-            case 0x000B:	p = "ftRbo";		break;
-            case 0x000C:	p = "ftSbs";		break;
-            case 0x000D:	p = "ftNts";		break;
-            case 0x000E:	p = "ftSbsFmla";	break;
-            case 0x000F:	p = "ftGboData";	break;
-            case 0x0010:	p = "ftEdoData";	break;
-            case 0x0011:	p = "ftRboData";	break;
-            case 0x0012:	p = "ftCblsData";	break;
-            case 0x0013:	p = "ftLbsData";	break;
-            case 0x0014:	p = "ftCblsFmla";	break;
-            case 0x0015:	p = "ftCmo";		bDetails = TRUE;	break;
-            default:
-                    p = "UNKNOWN ID";
-        }
-
-        t += "  ";
-        __AddHex( t, nR );
-        t += "  [";
-        __AddHex( t, nL );
-        (t += "]  ") += p;
-        Print( t );
-
-        nDumpSize = ( ( UINT32 ) nL > ( UINT32 ) n )? ( UINT16 ) n : ( UINT16 ) nL;
-
-        if( nDumpSize )
-        {
-            ULONG nPos1 = (bDetails ? rIn.GetRecPos() : 0);
-            ContDump( nDumpSize );
-            n -= nDumpSize;
-            if ( bDetails )
-            {
-                ULONG nPos2 = rIn.GetRecPos();
-                rIn.Seek( nPos1 );
-                t.Erase();
-                switch ( nR )
-                {
-                    case 0x0008 :       // ftPioGrbit
-                    {
-                        rIn >> nObjFlags;
-                        UINT16 __nFlags = nObjFlags;
-                        if ( __nFlags )
-                        {
-                            ADDTEXT( "   " );
-                            STARTFLAG();
-                            ADDFLAG( 0x0001, "man-size" );
-                            ADDFLAG( 0x0002, "linked" );
-                            ADDFLAG( 0x0008, "symbol" );
-                            ADDFLAG( 0x0010, "control" );
-                            ADDFLAG( 0x0020, "ctls-stream" );
-                            ADDFLAG( 0x0200, "autoload" );
-                            ADDRESERVED( 0xFDC4 );
-                        }
-                    }
-                    break;
-                    case 0x0009 :       // ftPictFmla
-                    {
-                        ADDTEXT( "    Document type " );
-                        UINT16 nFmlaLen;
-                        rIn >> nFmlaLen;
-                        if( nObjFlags & 0x0002 )
-                        {
-                            ADDTEXT( "linked\n    OLE stream: LNK??? (from EXTERNNAME)   " );
-                            rIn >> nFmlaLen;
-                            ADDTEXT( "    unknown=" ); ADDHEX( 4 );
-                            PRINT();
-                            t.Erase();
-                            FormulaDump( nFmlaLen, FT_CellFormula );
-                        }
-                        else
-                        {
-                            ADDTEXT( "embedded " );
-                            const UINT16 nStringOffset = 14;    // MAY be right
-                            rIn.Seek( nPos1 + nStringOffset );
-                            INT32 nBytesLeft = nL - nStringOffset;
-                            UINT16 nStrLen = rIn.ReaduInt16();
-                            ULONG nPos3 = rIn.GetRecPos();
-                            if( nStrLen )
-                                AddUNICODEString( t, rIn, TRUE, nStrLen );
-                            nBytesLeft -= (rIn.GetRecPos() - nPos3);
-                            ADDTEXT( '\n' );
-                            if ( nBytesLeft < 4 )
-                                ADDTEXT( "    >> ByteString OVERRUN <<\n" );
-
-                            rIn.Seek( nPos1 + sizeof(nFmlaLen) + nFmlaLen );
-                            if( nObjFlags & 0x0020 )
-                            {
-                                sal_uInt32 nStrmStart, nStrmLen;
-                                rIn >> nStrmStart >> nStrmLen;
-                                ADDTEXT( "    'Ctls' stream   start=" );
-                                __AddHex( t, nStrmStart );
-                                ADDTEXT( "   size=" );
-                                __AddHex( t, nStrmLen );
-                                maCtlsPosMap[ nStrmStart ] = nStrmLen;
-                            }
-                            else
-                            {
-                                ADDTEXT( "    OLE storage name: MBD" );
-                                __AddPureHex( t, rIn.ReaduInt32() );
-                            }
-                        }
-                    }
-                    break;
-                    case 0x0015 :       // ftCmo
-                    {
-                        UINT16 nType, nId;
-                        rIn >> nType >> nId;
-                        ADDTEXT( "    Object ID " );
-                        __AddHex( t, nId );
-                        switch ( nType )
-                        {
-                            case 0x0000 :   p = "Group";        break;
-                            case 0x0001 :   p = "Line";         break;
-                            case 0x0002 :   p = "Rectangle";    break;
-                            case 0x0003 :   p = "Oval";         break;
-                            case 0x0004 :   p = "Arc";          break;
-                            case 0x0005 :   p = "Chart";        break;
-                            case 0x0006 :   p = "Text";         break;
-                            case 0x0007 :   p = "Button";       break;
-                            case 0x0008 :   p = "Picture";      break;
-                            case 0x0009 :   p = "Polygon";      break;
-                            case 0x000a :   p = "(Reserved)";   break;
-                            case 0x000b :   p = "Check box";    break;
-                            case 0x000c :   p = "Option button";break;
-                            case 0x000d :   p = "Edit box";     break;
-                            case 0x000e :   p = "Label";        break;
-                            case 0x000f :   p = "Dialog box";   break;
-                            case 0x0010 :   p = "Spinner";      break;
-                            case 0x0011 :   p = "Scroll bar";   break;
-                            case 0x0012 :   p = "List box";     break;
-                            case 0x0013 :   p = "Group box";    break;
-                            case 0x0014 :   p = "Combo box";    break;
-                            case 0x0015 :   p = "(Reserved)";   break;
-                            case 0x0016 :   p = "(Reserved)";   break;
-                            case 0x0017 :   p = "(Reserved)";   break;
-                            case 0x0018 :   p = "(Reserved)";   break;
-                            case 0x0019 :   p = "Comment";      break;
-                            case 0x001a :   p = "(Reserved)";   break;
-                            case 0x001b :   p = "(Reserved)";   break;
-                            case 0x001c :   p = "(Reserved)";   break;
-                            case 0x001d :   p = "(Reserved)";   break;
-                            case 0x001e :   p = "Microsoft Office drawing"; break;
-                            default:
-                                p = "UNKNOWN";
-                        }
-                        ADDTEXT( ", type " );
-                        __AddHex( t, nType );
-                        ADDTEXT( ' ' );
-                        ADDTEXT( p );
-                    }
-                    break;
-                }
-                if ( t.Len() )
-                    PRINT();
-                rIn.Seek( nPos2 );
-            }
-        }
-
-        t.Erase();
-    }
-}
-
-
-#undef	LINESTART
-#undef	IGNORE
-#undef	ADDHEX
-#undef	ADDDEC
-#undef	PRINT
-#undef	PreDump
-#undef	ADDCELLHEAD
-
-void Biff8RecDumper::ContDump( const ULONG nL )
-{
-    UINT32			nC = nMaxBodyLines;
-    UINT32			n = nL;
-    UINT32			nInL, nTmp;
-    UINT8*			pB = new UINT8[ nL ];
-    UINT8*			p;
-    const UINT16	nLineLen = 16;
-    UINT16			nCharCnt;
-    BOOL			bPart;
-    ByteString		aT;
-
-    aT += pLevelPre;
-
-    while( n && nC )
-    {
-        bPart = n < nLineLen;
-        nInL = bPart? n : nLineLen;
-        n -= nInL;
-
-        pIn->Read( pB, nInL );
-
-        // als Hex-Codes
-        nTmp = nInL;
-        p = pB;
-        nCharCnt = 0;
-        while( nTmp )
-        {
-            if( nCharCnt == nLineLen / 2 )
-                aT += ' ';
-
-            nCharCnt++;
-
-            aT += ' ';
-            __AddPureHex( aT, *p );
-            p++;
-
-            nTmp--;
-        }
-
-        if( bPart )
-            aT += GetBlanks( ( UINT16 ) ( ( nLineLen - nInL ) * 3 ) );
-
-        // als chars
-
-        aT += "    ";
-        if( nInL < 9 )
-            aT += ' ';
-
-        nTmp = nInL;
-        p = pB;
-        nCharCnt = 0;
-        while( nTmp )
-        {
-            if( nCharCnt == nLineLen / 2 )
-                aT += ' ';
-
-            nCharCnt++;
-
-            if( IsPrintable( *p ) )
-                aT += static_cast< sal_Char >( *p );
-            else
-                aT += '.';
-
-            p++;
-
-            nTmp--;
-        }
-
-        Print( aT );
-        aT.Erase();
-        aT += pLevelPre;
-
-        nC--;
-    }
-
-    delete[] pB;
-}
-
-
-// Formula dumper =============================================================
-
-/** Name and parameter count of an Excel function. */
-struct XclDumpFunc
-{
-    const sal_Char*             pName;          /// Name of the function.
-    sal_uInt16                  nParam;         /// Parameter count for fixed functions.
-};
-
-static const XclDumpFunc pFuncData[] =
-{
-/*  0*/ { "COUNT",                  0 },
-        { "IF",                     0 },
-        { "ISNA",                   1 },
-        { "ISERROR",                1 },
-        { "SUM",                    0 },
-/*  5*/ { "AVERAGE",                0 },
-        { "MIN",                    0 },
-        { "MAX",                    0 },
-        { "ROW",                    0 },
-        { "COLUMN",                 0 },
-/* 10*/ { "NA",                     0 },
-        { "NPV",                    0 },
-        { "STDEV",                  0 },
-        { "DOLLAR",                 0 },
-        { "FIXED",                  0 },
-/* 15*/ { "SIN",                    1 },
-        { "COS",                    1 },
-        { "TAN",                    1 },
-        { "ATAN",                   1 },
-        { "PI",                     0 },
-/* 20*/ { "SQRT",                   1 },
-        { "EXP",                    1 },
-        { "LN",                     1 },
-        { "LOG10",                  1 },
-        { "ABS",                    1 },
-/* 25*/ { "INT",                    1 },
-        { "SIGN",                   1 },
-        { "ROUND",                  2 },
-        { "LOOKUP",                 0 },
-        { "INDEX",                  0 },
-/* 30*/ { "REPT",                   2 },
-        { "MID",                    3 },
-        { "LEN",                    1 },
-        { "VALUE",                  1 },
-        { "TRUE",                   0 },
-/* 35*/ { "FALSE",                  0 },
-        { "AND",                    0 },
-        { "OR",                     0 },
-        { "NOT",                    1 },
-        { "MOD",                    2 },
-/* 40*/ { "DCOUNT",                 3 },
-        { "DSUM",                   3 },
-        { "DAVERAGE",               3 },
-        { "DMIN",                   3 },
-        { "DMAX",                   3 },
-/* 45*/ { "DSTDEV",                 3 },
-        { "VAR",                    0 },
-        { "DVAR",                   3 },
-        { "TEXT",                   2 },
-        { "LINEST",                 0 },
-/* 50*/ { "TREND",                  0 },
-        { "LOGEST",                 0 },
-        { "GROWTH",                 0 },
-        { "GOTO" },                         // macro/internal
-        { "HALT" },                         // macro/internal
-/* 55*/ { "RETURN" },                       // macro/internal
-        { "PV",                     0 },
-        { "FV",                     0 },
-        { "NPER",                   0 },
-        { "PMT",                    0 },
-/* 60*/ { "RATE",                   0 },
-        { "MIRR",                   3 },
-        { "IRR",                    0 },
-        { "RAND",                   0 },
-        { "MATCH",                  0 },
-/* 65*/ { "DATE",                   3 },
-        { "TIME",                   3 },
-        { "DAY",                    1 },
-        { "MONTH",                  1 },
-        { "YEAR",                   1 },
-/* 70*/ { "WEEKDAY",                0 },
-        { "HOUR",                   1 },
-        { "MINUTE",                 1 },
-        { "SECOND",                 1 },
-        { "NOW",                    0 },
-/* 75*/ { "AREAS",                  1 },
-        { "ROWS",                   1 },
-        { "COLUMNS",                1 },
-        { "OFFSET",                 0 },
-        { "ABSREF" },                       // macro/internal
-/* 80*/ { "RELREF" },                       // macro/internal
-        { "ARGUMENT" },                     // macro/internal
-        { "SEARCH",                 0 },
-        { "TRANSPOSE",              1 },
-        { "ERROR" },                        // macro/internal
-/* 85*/ { "STEP" },                         // macro/internal
-        { "TYPE",                   1 },
-        { "ECHO" },                         // macro/internal
-        { "SET.NAME" },                     // macro/internal
-        { "CALLER" },                       // macro/internal
-/* 90*/ { "DEREF" },                        // macro/internal
-        { "WINDOWS" },                      // macro/internal
-        { "SERIES" },                       // macro/internal
-        { "DOCUMENTS" },                    // macro/internal
-        { "ACTIVE.CELL" },                  // macro/internal
-/* 95*/ { "SELECTION" },                    // macro/internal
-        { "RESULT" },                       // macro/internal
-        { "ATAN2",                  2 },
-        { "ASIN",                   1 },
-        { "ACOS",                   1 },
-/*100*/ { "CHOOSE",                 0 },
-        { "HLOOKUP",                0 },
-        { "VLOOKUP",                0 },
-        { "LINKS" },                        // macro/internal
-        { "INPUT" },                        // macro/internal
-/*105*/ { "ISREF",                  1 },
-        { "GET.FORMULA" },                  // macro/internal
-        { "GET.NAME" },                     // macro/internal
-        { "SET.VALUE",  2 },                // macro/internal
-        { "LOG",                    0 },
-/*110*/ { "EXEC" },                         // macro/internal
-        { "CHAR",                   1 },
-        { "LOWER",                  1 },
-        { "UPPER",                  1 },
-        { "PROPER",                 1 },
-/*115*/ { "LEFT",                   0 },
-        { "RIGHT",                  0 },
-        { "EXACT",                  2 },
-        { "TRIM",                   1 },
-        { "REPLACE",                4 },
-/*120*/ { "SUBSTITUTE",             0 },
-        { "CODE",                   1 },
-        { "NAMES" },                        // macro/internal
-        { "DIRECTORY" },                    // macro/internal
-        { "FIND",                   0 },
-/*125*/ { "CELL",                   0 },
-        { "ISERR",                  1 },
-        { "ISTEXT",                 1 },
-        { "ISNUMBER",               1 },
-        { "ISBLANK",                1 },
-/*130*/ { "T",                      1 },
-        { "N",                      1 },
-        { "FOPEN" },                        // macro/internal
-        { "FCLOSE" },                       // macro/internal
-        { "FSIZE" },                        // macro/internal
-/*135*/ { "FREADLN" },                      // macro/internal
-        { "FREAD" },                        // macro/internal
-        { "FWRITELN" },                     // macro/internal
-        { "FWRITE" },                       // macro/internal
-        { "FPOS" },                         // macro/internal
-/*140*/ { "DATEVALUE",              1 },
-        { "TIMEVALUE",              1 },
-        { "SLN",                    3 },
-        { "SYD",                    4 },
-        { "DDB",                    0 },
-/*145*/ { "GET.DEF" },                      // macro/internal
-        { "REFTEXT" },                      // macro/internal
-        { "TEXTREF" },                      // macro/internal
-        { "INDIRECT",               0 },
-        { "REGISTER" },                     // macro/internal
-/*150*/ { "CALL" },
-        { "ADD.BAR" },                      // macro/internal
-        { "ADD.MENU" },                     // macro/internal
-        { "ADD.COMMAND" },                  // macro/internal
-        { "ENABLE.COMMAND" },               // macro/internal
-/*155*/ { "CHECK.COMMAND" },                // macro/internal
-        { "RENAME.COMMAND" },               // macro/internal
-        { "SHOW.BAR" },                     // macro/internal
-        { "DELETE.MENU" },                  // macro/internal
-        { "DELETE.COMMAND" },               // macro/internal
-/*160*/ { "GET.CHART.ITEM" },               // macro/internal
-        { "DIALOG.BOX" },                   // macro/internal
-        { "CLEAN",                  1 },
-        { "MDETERM",                1 },
-        { "MINVERSE",               1 },
-/*165*/ { "MMULT",                  2 },
-        { "FILES" },                        // macro/internal
-        { "IPMT",                   0 },
-        { "PPMT",                   0 },
-        { "COUNTA",                 0 },
-/*170*/ { "CANCEL.KEY" },                   // macro/internal
-        { "FOR" },                          // macro/internal
-        { "WHILE" },                        // macro/internal
-        { "BREAK" },                        // macro/internal
-        { "NEXT" },                         // macro/internal
-/*175*/ { "INITIATE" },                     // macro/internal
-        { "REQUEST" },                      // macro/internal
-        { "POKE" },                         // macro/internal
-        { "EXECUTE" },                      // macro/internal
-        { "TERMINATE" },                    // macro/internal
-/*180*/ { "RESTART" },                      // macro/internal
-        { "HELP" },                         // macro/internal
-        { "GET.BAR" },                      // macro/internal
-        { "PRODUCT",                0 },
-        { "FACT",                   1 },
-/*185*/ { "GET.CELL" },                     // macro/internal
-        { "GET.WORKSPACE" },                // macro/internal
-        { "GET.WINDOW" },                   // macro/internal
-        { "GET.DOCUMENT" },                 // macro/internal
-        { "DPRODUCT",               3 },
-/*190*/ { "ISNONTEXT",              1 },
-        { "GET.NOTE" },                     // macro/internal
-        { "NOTE" },                         // macro/internal
-        { "STDEVP",                 0 },
-        { "VARP",                   0 },
-/*195*/ { "DSTDDEVP",               3 },
-        { "DVARP",                  3 },
-        { "TRUNC",                  0 },
-        { "ISLOGICAL",              1 },
-        { "DBCOUNTA",               3 },
-/*200*/ { "DELETE.BAR" },                   // macro/internal
-        { "UNREGISTER" },                   // macro/internal
-        { "202" },                          // not used
-        { "203" },                          // not used
-        { "USDOLLAR" },
-/*205*/ { "FINDB" },
-        { "SEARCHB" },
-        { "REPLACEB",               4 },
-        { "LEFTB" },
-        { "RIGHTB" },
-/*210*/ { "MIDB",                   3 },
-        { "LENB",                   1 },
-        { "ROUNDUP",                2 },
-        { "ROUNDDOWN",              2 },
-        { "ASC",                    1 },
-/*215*/ { "DBSC",                   1 },
-        { "RANK",                   0 },
-        { "217" },                          // not used
-        { "218" },                          // not used
-        { "ADDRESS",                0 },
-/*220*/ { "DAYS360",                0 },
-        { "TODAY",                  0 },
-        { "VDB",                    0 },
-        { "ELSE" },                         // macro/internal
-        { "ELSE.IF" },                      // macro/internal
-/*225*/ { "END.IF" },                       // macro/internal
-        { "FOR.CELL" },                     // macro/internal
-        { "MEDIAN",                 0 },
-        { "SUMPRODUCT",             0 },
-        { "SINH",                   1 },
-/*230*/ { "COSH",                   1 },
-        { "TANH",                   1 },
-        { "ASINH",                  1 },
-        { "ACOSH",                  1 },
-        { "ATANH",                  1 },
-/*235*/ { "DGET",                   3 },
-        { "CREATE.OBJECT" },                // macro/internal
-        { "VOLATILE" },                     // macro/internal
-        { "LAST.ERROR" },                   // macro/internal
-        { "CUSTOM.UNDO" },                  // macro/internal
-/*240*/ { "CUSTOM.REPEAT" },                // macro/internal
-        { "FORMULA.CONVERT" },              // macro/internal
-        { "GET.LINK.INFO" },                // macro/internal
-        { "TEXT.BOX" },                     // macro/internal
-        { "INFO",                   1 },
-/*245*/ { "GROUP" },                        // macro/internal
-        { "GET.OBJECT" },                   // macro/internal
-        { "DB",                     0 },
-        { "PAUSE" },                        // macro/internal
-        { "249" },                          // not used
-/*250*/ { "250" },                          // not used
-        { "RESUME" },                       // macro/internal
-        { "FREQUENCY",              2 },
-        { "ADD.TOOLBAR" },                  // macro/internal
-        { "DELETE.TOOLBAR" },               // macro/internal
-/*255*/ { "EXTERN.CALL" },                  // macro/internal
-        { "RESET.TOOLBAR" },                // macro/internal
-        { "EVALUATE" },                     // macro/internal
-        { "GET.TOOLBAR" },                  // macro/internal
-        { "GET.TOOL" },                     // macro/internal
-/*260*/ { "SPELLING.CHECK" },               // macro/internal
-        { "ERROR.TYPE",             1 },
-        { "APP.TITLE" },                    // macro/internal
-        { "WINDOW.TITLE" },                 // macro/internal
-        { "SAVE.TOOLBAR" },                 // macro/internal
-/*265*/ { "ENABLE.TOOL" },                  // macro/internal
-        { "PRESS.TOOL" },                   // macro/internal
-        { "REGISTER.ID" },                  // macro/internal
-        { "GET.WORKBOOK" },                 // macro/internal
-        { "AVEDEV",                 0 },
-/*270*/ { "BETADIST",               0 },
-        { "GAMMALN",                1 },
-        { "BETAINV",                0 },
-        { "BINOMDIST",              4 },
-        { "CHIDIST",                2 },
-/*275*/ { "CHIINV",                 2 },
-        { "COMBIN",                 2 },
-        { "CONFIDENCE",             3 },
-        { "CRITBINOM",              3 },
-        { "EVEN",                   1 },
-/*280*/ { "EXPONDIST",              3 },
-        { "FDIST",                  3 },
-        { "FINV",                   3 },
-        { "FISHER",                 1 },
-        { "FISHERINV",              1 },
-/*285*/ { "FLOOR",                  2 },
-        { "GAMMADIST",              4 },
-        { "GAMMAINV",               3 },
-        { "CEILING",                2 },
-        { "HYPGEOMDIST",            4 },
-/*290*/ { "LOGNORMDIST",            3 },
-        { "LOGINV",                 3 },
-        { "NEGBINOMDIST",           3 },
-        { "NORMDIST",               4 },
-        { "NORMSDIST",              1 },
-/*295*/ { "NORMINV",                3 },
-        { "NORMSINV",               1 },
-        { "STANDARDIZE",            3 },
-        { "ODD",                    1 },
-        { "PERMUT",                 2 },
-/*300*/ { "POISSON",                3 },
-        { "TDIST",                  3 },
-        { "WEIBULL",                4 },
-        { "SUMXMY2",                2 },
-        { "SUMX2MY2",               2 },
-/*305*/ { "SUMX2PY2",               2 },
-        { "CHITEST",                2 },
-        { "CORREL",                 2 },
-        { "COVAR",                  2 },
-        { "FORECAST",               3 },
-/*310*/ { "FTEST",                  2 },
-        { "INTERCEPT",              2 },
-        { "PEARSON",                2 },
-        { "RSQ",                    2 },
-        { "STEYX",                  2 },
-/*315*/ { "SLOPE",                  2 },
-        { "TTEST",                  4 },
-        { "PROB",                   0 },
-        { "DEVSQ",                  0 },
-        { "GEOMEAN",                0 },
-/*320*/ { "HARMEAN",                0 },
-        { "SUMSQ",                  0 },
-        { "KURT",                   0 },
-        { "SKEW",                   0 },
-        { "ZTEST",                  0 },
-/*325*/ { "LARGE",                  2 },
-        { "SMALL",                  2 },
-        { "QUARTILE",               2 },
-        { "PERCENTILE",             2 },
-        { "PERCENTRANK",            0 },
-/*330*/ { "MODE",                   0 },
-        { "TRIMMEAN",               2 },
-        { "TINV",                   2 },
-        { "333" },                          // not used
-        { "MOVIE.COMMAND" },                // macro/internal
-/*335*/ { "GET.MOVIE" },                    // macro/internal
-        { "CONCATENATE",            0 },
-        { "POWER",                  2 },
-        { "PIVOT.ADD.DATA" },               // macro/internal
-        { "GET.PIVOT.TABLE" },              // macro/internal
-/*340*/ { "GET.PIVOT.FIELD" },              // macro/internal
-        { "GET.PIVOT.ITEM" },               // macro/internal
-        { "RADIANS",                1 },
-        { "DEGREES",                1 },
-        { "SUBTOTAL",               0 },
-/*345*/ { "SUMIF",                  0 },
-        { "COUNTIF",                2 },
-        { "COUNTBLANK",             1 },
-        { "SCENARIO.GET" },                 // macro/internal
-        { "OPTIONS.LISTS.GET" },            // macro/internal
-/*350*/ { "ISPMT",                  4 },
-        { "DATEDIF",                3 },
-        { "DATESTRING",             1 },
-        { "NUMBERSTRING",           2 },
-        { "ROMAN",                  0 },
-/*355*/ { "OPEN.DIALOG" },                  // macro/internal
-        { "SAVE.DIALOG" },                  // macro/internal
-        { "VIEW.GET" },                     // macro/internal
-        { "GETPIVOTDATA",           0 },
-        { "HYPERLINK",              2 },
-/*360*/ { "PHONETIC",               1 },
-        { "AVERAGEA",               0 },
-        { "MAXA",                   0 },
-        { "MINA",                   0 },
-        { "STDEVPA",                0 },
-/*365*/ { "VARPA",                  0 },
-        { "STDEVA",                 0 },
-        { "VARA",                   0 },
-        { "BAHTTEXT",               1 },
-        { "THAIDAYOFWEEK",          1 },
-/*370*/ { "THAIDIGIT",              1 },
-        { "THAIMONTHOFYEAR",        1 },
-        { "THAINUMSOUND",           1 },
-        { "THAINUMSTRING",          1 },
-        { "THAISTRINGLENGTH",       1 },
-/*375*/ { "ISTHAIDIGIT",            1 },
-        { "ROUNDBAHTDOWN",          1 },
-        { "ROUNDBAHTUP",            1 },
-        { "THAIYEAR",               1 },
-        { "RTD" },
-/*380*/ { "ISHYPERLINK",            1 }
-};
-
-const XclDumpFunc* lcl_GetFuncData( sal_uInt16 nIndex )
-{
-    return (nIndex < STATIC_TABLE_SIZE( pFuncData )) ? (pFuncData + nIndex) : NULL;
-}
-
-// ----------------------------------------------------------------------------
-
-/** Stack helper to create a human readable formula string from UPN. */
-class XclDumpFormulaStackImpl : private ScfDelStack< ByteString >
-{
-public:
-    void                        PushOperand( const ByteString& rOperand );
-    void                        PushUnary( const ByteString& rOperator, bool bInFront );
-    void                        PushBinary( const ByteString& rOperator );
-    void                        PushFunction( const ByteString& rFuncName, sal_uInt16 nParamCount );
-    inline ByteString           GetString() const { return Top() ? *Top() : ByteString(); }
-};
-
-void XclDumpFormulaStackImpl::PushOperand( const ByteString& rOperand )
-{
-    Push( new ByteString( rOperand ) );
-}
-
-void XclDumpFormulaStackImpl::PushUnary( const ByteString& rOperator, bool bInFront )
-{
-    if( !Count() ) return;
-    ByteString* pOp = Top();
-    pOp->Insert( rOperator, bInFront ? 0 : pOp->Len() );
-}
-
-void XclDumpFormulaStackImpl::PushBinary( const ByteString& rOperator )
-{
-    if( Count() < 2 ) return;
-    // second operand is on top
-    ByteString* pSecond = Pop();
-    ByteString* pFirst = Top();
-    *pFirst += rOperator;
-    *pFirst += *pSecond;
-    delete pSecond;
-}
-
-void XclDumpFormulaStackImpl::PushFunction( const ByteString& rFuncName, sal_uInt16 nParamCount )
-{
-    if( Count() < nParamCount ) return;
-    ByteString* pNew = new ByteString( ')' );
-    for( sal_uInt16 nIndex = 0; nIndex < nParamCount; ++nIndex )
-    {
-        if( nIndex ) pNew->Insert( ';', 0 );
-        ByteString* pOp = Pop();
-        pNew->Insert( *pOp, 0 );
-        delete pOp;
-    }
-    pNew->Insert( '(', 0 );
-    pNew->Insert( rFuncName, 0 );
-    Push( pNew );
-}
-
-// ----------------------------------------------------------------------------
-
-/** Stack to create a human readable formula and token class overview from UPN. */
-class XclDumpFormulaStack
-{
-public:
-    void                        PushOperand( const ByteString& rOperand, sal_uInt8 nToken );
-    inline void                 PushOperand( const sal_Char* pcOperand, sal_uInt8 nToken )
-                                    { PushOperand( ByteString( pcOperand ), nToken ); }
-
-    void                        PushUnary( const ByteString& rOperator, bool bInFront = true );
-    inline void                 PushUnary( const sal_Char* pcOperator, bool bInFront = true )
-                                    { PushUnary( ByteString( pcOperator ), bInFront ); }
-
-    void                        PushBinary( const ByteString& rOperator );
-    inline void                 PushBinary( const sal_Char* pcOperator )
-                                    { PushBinary( ByteString( pcOperator ) ); }
-
-    void                        PushFunction( const ByteString& rFuncName, sal_uInt16 nParamCount, sal_uInt8 nToken );
-    inline void                 PushFunction( const sal_Char* pcFuncName, sal_uInt16 nParamCount, sal_uInt8 nToken )
-                                    { PushFunction( ByteString( pcFuncName ), nParamCount, nToken ); }
-
-    inline ByteString           GetFormula() const { return maFmla.GetString(); }
-    inline ByteString           GetTokenClasses() const { return maClass.GetString(); }
-
-    static ByteString           GetTokenClass( sal_uInt8 nToken );
-
-private:
-    void                        PushTokenClass( sal_uInt8 nToken );
-
-    XclDumpFormulaStackImpl     maFmla;
-    XclDumpFormulaStackImpl     maClass;
-};
-
-void XclDumpFormulaStack::PushOperand( const ByteString& rOperand, sal_uInt8 nToken )
-{
-    maFmla.PushOperand( rOperand );
-    maClass.PushOperand( GetTokenClass( nToken ) );
-}
-
-void XclDumpFormulaStack::PushUnary( const ByteString& rOperator, bool bInFront )
-{
-    maFmla.PushUnary( rOperator, bInFront );
-    maClass.PushUnary( rOperator, bInFront );
-}
-
-void XclDumpFormulaStack::PushBinary( const ByteString& rOperator )
-{
-    maFmla.PushBinary( rOperator );
-    maClass.PushBinary( rOperator );
-}
-
-void XclDumpFormulaStack::PushFunction( const ByteString& rFuncName, sal_uInt16 nParamCount, sal_uInt8 nToken )
-{
-    maFmla.PushFunction( rFuncName, nParamCount );
-    maClass.PushFunction( GetTokenClass( nToken ), nParamCount );
-}
-
-ByteString XclDumpFormulaStack::GetTokenClass( sal_uInt8 nToken )
-{
-    sal_Char cClass = 'B';
-    switch( nToken & 0xE0 )
-    {
-        case 0x20:  cClass = 'R';   break;
-        case 0x40:  cClass = 'V';   break;
-        case 0x60:  cClass = 'A';   break;
-    }
-    return ByteString( cClass );
-}
-
-// ----------------------------------------------------------------------------
-
-const sal_Char* lcl_GetErrorString( sal_uInt8 nErr )
-{
-    switch( nErr )
-    {
-        case 0x00:  return "#NULL!";
-        case 0x07:  return "#DIV/0!";
-        case 0x0F:  return "#VALUE!";
-        case 0x17:  return "#REF!";
-        case 0x1D:  return "#NAME?";
-        case 0x24:  return "#NUM!";
-        case 0x2A:  return "#N/A!";
-    }
-    return "!unknown!";
-}
-
-
-
-void lcl_StartToken( ByteString& rString, sal_uInt16 nPos, sal_uInt8 nToken, const sal_Char* pTokenName )
-{
-    rString.Erase();
-    rString.Append( "    " );
-    __AddHex( rString, nPos );
-    rString.Append( "   " );
-    __AddHex( rString, nToken );
-    rString.Append( " t" ).Append( pTokenName ).Expand( 33, ' ' );
-}
-
-void lcl_StartTokenClass( ByteString& rString, sal_uInt16 nPos, sal_uInt8 nToken, const sal_Char* pTokenName )
-{
-    ByteString aToken( pTokenName );
-    aToken.Append( XclDumpFormulaStack::GetTokenClass( nToken ) );
-    lcl_StartToken( rString, nPos, nToken, aToken.GetBuffer() );
-}
-
-void Biff8RecDumper::FormulaDump( const UINT16 nL, const FORMULA_TYPE eFT )
-{
-    if( !nL )
-        return;
-
-    sal_uInt32              nStartPos = pIn->GetRecPos();
-    const sal_uInt32        nAfterPos = nStartPos + nL;
-
-    BYTE                    nOp;
-    ByteString              t, aOperand;
-    BOOL                    bError = FALSE;
-    const BOOL              bRangeName = eFT == FT_RangeName;
-    const BOOL              bSharedFormula = eFT == FT_SharedFormula;
-    const BOOL              bRNorSF = bRangeName || bSharedFormula;
-
-    XclDumpFormulaStack         aStack;
-    sal_Bool                    bPrinted = sal_True;
-
-#define PRINTTOKEN()            { if( !bPrinted ) Print( t ); bPrinted = sal_True; }
-#define STARTTOKEN( name )      lcl_StartToken( t, static_cast< sal_uInt16 >( pIn->GetRecPos() - nStartPos - 1 ), nOp, name )
-#define STARTTOKENCLASS( name ) lcl_StartTokenClass( t, static_cast< sal_uInt16 >( pIn->GetRecPos() - nStartPos - 1 ), nOp, name )
-
-    while( pIn->IsValid() && ( pIn->GetRecPos() < nAfterPos ) && !bError )
-    {
-        *pIn >> nOp;
-        bPrinted = sal_False;
-        aOperand.Erase();
-
-        switch( nOp )   //                              Buch Seite:
-        {           //                                      SDK4 SDK5
-            case 0x01: // Array Formula                         [325    ]
-            {
-                STARTTOKEN( "Exp" );
-                sal_uInt16 nRow, nCol;
-                *pIn >> nRow >> nCol;
-                t += "array formula or shared formula, base-address=";
-                lcl_AddRef( t, nCol, nRow );
-                aStack.PushFunction( "ARRAY", 0, nOp );
-            }
-            break;
-            case 0x02: // Data Table                            [325 277]
-            {
-                STARTTOKEN( "Tbl" );
-                sal_uInt16 nRow, nCol;
-                *pIn >> nRow >> nCol;
-                t += "multiple operation, base-address=";
-                lcl_AddRef( t, nCol, nRow );
-                aStack.PushFunction( "MULTIPLE.OPERATIONS", 0, nOp );
-            }
-            break;
-            case 0x03: // Addition                              [312 264]
-                STARTTOKEN( "Add" );
-                aStack.PushBinary( "+" );
-            break;
-            case 0x04: // Subtraction                           [313 264]
-                STARTTOKEN( "Sub" );
-                aStack.PushBinary( "-" );
-            break;
-            case 0x05: // Multiplication                        [313 264]
-                STARTTOKEN( "Mul" );
-                aStack.PushBinary( "*" );
-            break;
-            case 0x06: // Division                              [313 264]
-                STARTTOKEN( "Div" );
-                aStack.PushBinary( "/" );
-            break;
-            case 0x07: // Exponetiation                         [313 265]
-                STARTTOKEN( "Power" );
-                aStack.PushBinary( "^" );
-            break;
-            case 0x08: // Concatenation                         [313 265]
-                STARTTOKEN( "Concat" );
-                aStack.PushBinary( "&" );
-            break;
-            case 0x09: // Less Than                             [313 265]
-                STARTTOKEN( "LT" );
-                aStack.PushBinary( "<" );
-            break;
-            case 0x0A: // Less Than or Equal                    [313 265]
-                STARTTOKEN( "LE" );
-                aStack.PushBinary( "<=" );
-            break;
-            case 0x0B: // Equal                                 [313 265]
-                STARTTOKEN( "EQ" );
-                aStack.PushBinary( "=" );
-            break;
-            case 0x0C: // Greater Than or Equal                 [313 265]
-                STARTTOKEN( "GE" );
-                aStack.PushBinary( ">=" );
-            break;
-            case 0x0D: // Greater Than                          [313 265]
-                STARTTOKEN( "GT" );
-                aStack.PushBinary( ">" );
-            break;
-            case 0x0E: // Not Equal                             [313 265]
-                STARTTOKEN( "NE" );
-                aStack.PushBinary( "<>" );
-            break;
-            case 0x0F: // Intersection                          [314 265]
-                STARTTOKEN( "Isect" );
-                aStack.PushBinary( " " );
-            break;
-            case 0x10: // List                                  [314 265]
-                STARTTOKEN( "List" );
-                aStack.PushBinary( ";" );
-            break;
-            case 0x11: // Range                                 [314 265]
-                STARTTOKEN( "Range" );
-                aStack.PushBinary( ":" );
-            break;
-            case 0x12: // Unary Plus                            [312 264]
-                STARTTOKEN( "Uplus" );
-                aStack.PushUnary( "+" );
-            break;
-            case 0x13: // Unary Minus                           [312 264]
-                STARTTOKEN( "Uminus" );
-                aStack.PushUnary( "-" );
-            break;
-            case 0x14: // Percent Sign                          [312 264]
-                STARTTOKEN( "Percent" );
-                aStack.PushUnary( "%", false );
-            break;
-            case 0x15: // Parenthesis                           [326 278]
-                STARTTOKEN( "Paren" );
-                // simulate two unary operators to enclose operand
-                aStack.PushUnary( "(" );
-                aStack.PushUnary( ")", false );
-            break;
-            case 0x16: // Missing Argument                      [314 266]
-                STARTTOKEN( "MissArg" );
-                aStack.PushOperand( "~", nOp );
-            break;
-            case 0x17: // ByteString Constant                       [314 266]
-            {
-                STARTTOKEN( "Str" );
-
-                UINT8   nLen;
-                *pIn >> nLen;
-
-                t += "string   [len=";
-                __AddDec( t, nLen );
-                t += "] ";
-
-                aOperand += '"';
-                if( nLen )
-                    aOperand += GETSTR( pIn->ReadUniString( nLen ) );
-                else
-                    pIn->Ignore( 1 );
-                aOperand += '"';
-                t += aOperand;
-                aStack.PushOperand( aOperand, nOp );
-            }
-            break;
-            case 0x18:
-            {
-                STARTTOKEN( "Extended" );
-                UINT8   nEptg;
-                *pIn >> nEptg;
-
-#define D(name,size,ext,type)   {t+="eptg ";__AddDec(t,(UINT16)nEptg);t+=": ";              \
-                                t+=name;t+=" [";__AddDec(t,(UINT16)size);t+="] ";t+=type;   \
-                                if(ext)t+=" + ext";PRINTTOKEN();ContDump(size);aStack.PushOperand(name,nOp);}
-                switch( nEptg )
-                {                           //  name        size    ext     type
-                    case 0x00:              //  res
-                        D( "res", 0, 0, "" );
-                        break;
-                    case 0x01:              //  Lel         4       -       err
-                        D( "Lel", 4, 0, "err" );
-                        break;
-                    case 0x02:              //  Rw          4       -       ref
-                        D( "Rw", 4, 0, "ref" );
-                        break;
-                    case 0x03:              //  Col         4       -       ref
-                        D( "Col", 4, 0, "ref" );
-                        break;
-                    case 0x04:              //  res
-                    case 0x05:              //  res
-                        D( "res", 0, 0, "" );
-                        break;
-                    case 0x06:              //  RwV         4       -       val
-                        D( "RwV", 4, 0, "val" );
-                        break;
-                    case 0x07:              //  ColV        4       -       val
-                        D( "ColV", 4, 0, "val" );
-                        break;
-                    case 0x08:              //  res
-                    case 0x09:              //  res
-                        D( "res", 0, 0, "" );
-                        break;
-                    case 0x0A:              //  Radical     13      -       ref
-                        D( "Radical", 13, 0, "ref" );
-                        break;
-                    case 0x0B:              //  RadicalS    13      x       ref
-                        D( "RadicalS", 13, 1, "ref" );
-                        break;
-                    case 0x0C:              //  RwS         4       x       ref
-                        D( "RwS", 4, 1, "ref" );
-                        break;
-                    case 0x0D:              //  ColS        4       x       ref
-                        D( "ColS", 4, 1, "ref" );
-                        break;
-                    case 0x0E:              //  RwSV        4       x       val
-                        D( "RwSV", 4, 1, "val" );
-                        break;
-                    case 0x0F:              //  ColSV       4       x       val
-                        D( "ColSV", 4, 1, "val" );
-                        break;
-                    case 0x10:              //  RadicalLel  4       -       err
-                        D( "RadicalLel", 4, 0, "err" );
-                        break;
-                    case 0x11:              //  res
-                    case 0x12:              //  res
-                    case 0x13:              //  res
-                    case 0x14:              //  res
-                    case 0x15:              //  res
-                    case 0x16:              //  res
-                    case 0x17:              //  res
-                    case 0x18:              //  res
-                        D( "res", 0, 0, "" );
-                        break;
-                    case 0x19:              //  invalid values
-                    case 0x1A:              //  invalid values
-                        D( "invalid vals", 0, 0, "" );
-                        break;
-                    case 0x1B:              //  res
-                    case 0x1C:              //  res
-                        D( "res", 0, 0, "" );
-                        break;
-                    case 0x1D:              //  SxName      4       -       val
-                        D( "SxName", 4, 0, "val" );
-                        break;
-                    case 0x1E:              //  res
-                        D( "res", 0, 0, "" );
-                        break;
-                    default:
-                        D( "!unknown!", 0, 0, "" );
-                }
-#undef  D
-            }
-            break;
-            case 0x19: // Special Attribute                     [327 279]
-            {
-                STARTTOKEN( "Attr" );
-                UINT16 nData, nFakt;
-                BYTE nOpt;
-
-                *pIn >> nOpt >> nData;
-                nFakt = 2;
-
-                t += "flags=";              __AddHex( t, nOpt );
-
-                if( nOpt & 0x01 ) t += " volatile";
-                if( nOpt & 0x02 ) t += " if";
-                if( nOpt & 0x04 ) t += " choose";
-                if( nOpt & 0x08 ) t += " skip";
-                if( nOpt & 0x10 ) t += " sum";
-                if( nOpt & 0x20 ) t += " assignment";
-                if( nOpt & 0x40 ) t += " space";
-                if( nOpt & 0x80 ) t += " unknown";
-
-                if( nOpt & 0x02 )
-                {
-                    t += "   skip-to-false=";
-                    __AddHex( t, nData );
-                }
-                if( nOpt & 0x04 )
-                {
-                    t += "   count=";
-                    __AddDec( t, nData );
-                    t += "   skip=";
-                    for( sal_uInt16 nIdx = 0; nIdx <= nData; ++nIdx )
-                    {
-                        if( nIdx ) t += ',';
-                        __AddDec( t, pIn->ReaduInt16() );
-                    }
-                }
-                if( nOpt & 0x08 )
-                {
-                    t += "   skip=";
-                    __AddHex( t, nData );
-                    t += " (";
-                    __AddDec( t, sal_uInt8( nData + 1 ) );
-                    t += " bytes)";
-                }
-                if( nOpt & 0x10 )
-                    aStack.PushFunction( "ATTRSUM", 1, nOp );
-                if( nOpt & 0x40 )
-                {
-                    t += "   type=";
-                    __AddDec( t, static_cast< sal_uInt8 >( nData ) );
-                    t += "   count=";
-                    __AddDec( t, static_cast< sal_uInt8 >( nData >> 8 ) );
-                }
-            }
-            break;
-            case 0x1C: // Error Value                           [314 266]
-            {
-                STARTTOKEN( "Err" );
-                sal_uInt8 nErr = pIn->ReaduInt8();
-                t += "error value (";           __AddHex( t, nErr );
-                t += ") ";
-                t += lcl_GetErrorString( nErr );
-                aStack.PushOperand( lcl_GetErrorString( nErr ), nOp );
-            }
-            break;
-            case 0x1D: // Boolean                               [315 266]
-                STARTTOKEN( "Bool" );
-                aOperand += pIn->ReaduInt8() ? "TRUE" : "FALSE";
-                t += aOperand;
-                aStack.PushOperand( aOperand, nOp );
-            break;
-            case 0x1E: // Integer                               [315 266]
-                STARTTOKEN( "Int" );
-                __AddDec( aOperand, pIn->ReaduInt16() );
-                t += aOperand;
-                aStack.PushOperand( aOperand, nOp );
-            break;
-            case 0x1F: // Number                                [315 266]
-                STARTTOKEN( "Num" );
-                __AddDouble( aOperand, pIn->ReadDouble() );
-                t += aOperand;
-                aStack.PushOperand( aOperand, nOp );
-            break;
-            case 0x20: // Array Constant                        [317 268]
-            case 0x40:
-            case 0x60:
-                STARTTOKENCLASS( "Array" );
-                pIn->Ignore( 7 );
-                aStack.PushOperand( "{ConstArray}", nOp );
-            break;
-            case 0x21: // Function, Fixed Number of Arguments   [333 282]
-            case 0x41:
-            case 0x61:
-            {
-                STARTTOKENCLASS( "Func" );
-                UINT16 nInd = pIn->ReaduInt16();
-                const XclDumpFunc* pFunc = lcl_GetFuncData( nInd );
-                aOperand += pFunc ? pFunc->pName : "!unknown!";
-
-                t += "fix function: index=";    __AddHex( t, nInd );
-                t += " (";                      t += aOperand;
-                t += ')';
-                aStack.PushFunction( aOperand, pFunc ? pFunc->nParam : 0, nOp );
-            }
-            break;
-            case 0x22: // Function, Variable Number of Arg.     [333 283]
-            case 0x42:
-            case 0x62:
-            {
-                STARTTOKENCLASS( "FuncVar" );
-                BYTE nAnz;
-                UINT16 nInd;
-                *pIn >> nAnz >> nInd;
-                const XclDumpFunc* pFunc = lcl_GetFuncData( nInd & 0x7FFF );
-                aOperand += pFunc ? pFunc->pName : "!unknown!";
-
-                t += "var function: index=";    __AddHex( t, nInd );
-                t += " (";                      t += aOperand;
-                t += ")   param count=";        __AddHex( t, nAnz );
-                t += " (";                      __AddDec( t, (UINT8)(nAnz & 0x7F) );
-                t += ')';
-                if( nAnz & 0x8000 )
-                    t += "   cmd-equiv.";
-                aStack.PushFunction( aOperand, nAnz & 0x7F, nOp );
-            }
-            break;
-            case 0x23: // Name                                  [318 269]
-            case 0x43:
-            case 0x63:
-            {
-                STARTTOKENCLASS( "Name" );
-                sal_uInt16 nNameIdx = pIn->ReaduInt16();
-                __AddDec( aOperand, nNameIdx );
-                t += "internal name: index=";
-                t += aOperand;
-                pIn->Ignore( 2 );
-                if( (0 < nNameIdx) && (nNameIdx <= maNames.size()) )
-                    aOperand = maNames[ nNameIdx - 1 ];
-                else
-                    aOperand.Insert( "NAME(", 0 ).Append( ')' );
-                aStack.PushOperand( aOperand, nOp );
-            }
-            break;
-            case 0x24: // Cell Reference                        [319 270]
-            case 0x44:
-            case 0x64:
-            case 0x2A: // Deleted Cell Reference                [323 273]
-            case 0x4A:
-            case 0x6A:
-            {
-                if( (nOp & 0x1F) == 0x04 )
-                    STARTTOKENCLASS( "Ref" );
-                else
-                    STARTTOKENCLASS( "RefErr" );
-
-                UINT16 nCol, nRow;
-                *pIn >> nRow >> nCol;
-                AddRef( aOperand, nRow, nCol, bRangeName );
-                t += "2D cell ref   C/R=";      __AddHex( t, nCol );
-                t += '/';                       __AddHex( t, nRow );
-                t += ' ';                       t += aOperand;
-                aStack.PushOperand( aOperand, nOp );
-            }
-            break;
-            case 0x25: // Area Reference                        [320 270]
-            case 0x45:
-            case 0x65:
-            case 0x2B: // Deleted Area Refernce                 [323 273]
-            case 0x4B:
-            case 0x6B:
-            {
-                if( (nOp & 0x1F) == 0x05 )
-                    STARTTOKENCLASS( "Area" );
-                else
-                    STARTTOKENCLASS( "AreaErr" );
-
-                UINT16 nRowFirst, nRowLast, nColFirst, nColLast;
-                *pIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast;
-                AddRangeRef( aOperand, nRowFirst, nColFirst, nRowLast, nColLast, bRangeName );
-                t += "2D area ref   C/R:C/R=";  __AddHex( t, nColFirst );
-                t += '/';                       __AddHex( t, nRowFirst );
-                t += ':';                       __AddHex( t, nColLast );
-                t += '/';                       __AddHex( t, nRowLast );
-                t += ' ';                       t += aOperand;
-                aStack.PushOperand( aOperand, nOp );
-            }
-            break;
-            case 0x26: // Constant Reference Subexpression      [321 271]
-            case 0x46:
-            case 0x66:
-            {
-                STARTTOKENCLASS( "MemArea" );
-                sal_uInt32 nRes;
-                sal_uInt16 nSize;
-                *pIn >> nRes >> nSize;
-                t += "reserved=";               __AddHex( t, nRes );
-                t += "   size=";                __AddDec( t, nSize );
-            }
-            break;
-            case 0x27: // Erroneous Constant Reference Subexpr. [322 272]
-            case 0x47:
-            case 0x67:
-            {
-                STARTTOKENCLASS( "MemErr" );
-                sal_uInt32 nRes;
-                sal_uInt16 nSize;
-                *pIn >> nRes >> nSize;
-                t += "reserved=";               __AddHex( t, nRes );
-                t += "   size=";                __AddDec( t, nSize );
-            }
-            break;
-            case 0x28: // Incomplete Constant Reference Subexpr.[331 281]
-            case 0x48:
-            case 0x68:
-            {
-                STARTTOKENCLASS( "MemNoMem" );
-                sal_uInt32 nRes;
-                sal_uInt16 nSize;
-                *pIn >> nRes >> nSize;
-                t += "reserved=";               __AddHex( t, nRes );
-                t += "   size=";                __AddDec( t, nSize );
-            }
-            break;
-            case 0x29: // Variable Reference Subexpression      [331 281]
-            case 0x49:
-            case 0x69:
-            {
-                STARTTOKENCLASS( "MemFunc" );
-                sal_uInt16 nSize;
-                *pIn >> nSize;
-                t += "size=";                   __AddDec( t, nSize );
-            }
-            break;
-            case 0x2C: // Cell Reference Within a Name/ShrdFmla [323 273]
-            case 0x4C:
-            case 0x6C:
-            {
-                STARTTOKENCLASS( "RefN" );
-                UINT16 nRow, nCol;
-                *pIn >> nRow >> nCol;
-                AddRef( aOperand, nRow, nCol, bRNorSF );
-                t += "2D cell ref in name   C/R=";      __AddHex( t, nCol );
-                t += '/';                               __AddHex( t, nRow );
-                t += ' ';                               t += aOperand;
-                aStack.PushOperand( aOperand, nOp );
-            }
-            break;
-            case 0x2D: // Area Reference Within a Name/ShrdFmla [324 274]
-            case 0x4D:
-            case 0x6D:
-            {
-                STARTTOKENCLASS( "AreaN" );
-                UINT16 nRowFirst, nRowLast, nColFirst, nColLast;
-                *pIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast;
-                AddRangeRef( aOperand, nRowFirst, nColFirst, nRowLast, nColLast, bRNorSF );
-                t += "2D area ref in name   C/R:C/R";   __AddHex( t, nColFirst );
-                t += '/';                               __AddHex( t, nRowFirst );
-                t += ':';                               __AddHex( t, nColLast );
-                t += '/';                               __AddHex( t, nRowLast );
-                t += ' ';                               t += aOperand;
-                aStack.PushOperand( aOperand, nOp );
-            }
-            break;
-            case 0x2E: // Reference Subexpression Within a Name [332 282]
-            case 0x4E:
-            case 0x6E:
-            {
-                STARTTOKENCLASS( "MemAreaN" );
-                sal_uInt16 nSize;
-                *pIn >> nSize;
-                t += "size=";                   __AddDec( t, nSize );
-            }
-            break;
-            case 0x2F: // Incomplete Reference Subexpression... [332 282]
-            case 0x4F:
-            case 0x6F:
-            {
-                STARTTOKENCLASS( "MemNoMemN" );
-                sal_uInt16 nSize;
-                *pIn >> nSize;
-                t += "size=";                   __AddDec( t, nSize );
-            }
-            break;
-            case 0x39: // Name or External Name                 [    275]
-            case 0x59:
-            case 0x79:
-            {
-                STARTTOKENCLASS( "NameX" );
-                UINT16 nXti, nName;
-                *pIn >> nXti >> nName;
-                pIn->Ignore( 2 );
-                t += "external name:   XTI=";   __AddDec( t, nXti );
-                t += "   name index=";          __AddDec( t, nName );
-                aOperand += "EXTNAME(XTI(";
-                __AddDec( aOperand, nXti );
-                aOperand += "),";
-                __AddDec( aOperand, nName );
-                aOperand += ')';
-                aStack.PushOperand( aOperand, nOp );
-            }
-            break;
-            case 0x3A: // 3-D Cell Reference                    [    275]
-            case 0x5A:
-            case 0x7A:
-            case 0x3C: // Deleted 3-D Cell Reference            [    277]
-            case 0x5C:
-            case 0x7C:
-            {
-                if( (nOp & 0x1F) == 0x1A )
-                    STARTTOKENCLASS( "Ref3d" );
-                else
-                    STARTTOKENCLASS( "Ref3dErr" );
-
-                UINT16 nXti, nRow, nCol;
-                *pIn >> nXti >> nRow >> nCol;
-                AddRef( aOperand, nRow, nCol, bRangeName, nXti );
-                t += "3D cell ref   Xti!C/R=";  __AddHex( t, nXti );
-                t += '!';                       __AddHex( t, nCol );
-                t += '/';                       __AddHex( t, nRow );
-                t += ' ';                       t += aOperand;
-                aStack.PushOperand( aOperand, nOp );
-            }
-            break;
-            case 0x3B: // 3-D Area Reference                    [    276]
-            case 0x5B:
-            case 0x7B:
-            case 0x3D: // Deleted 3-D Area Reference            [    277]
-            case 0x5D:
-            case 0x7D:
-            {
-                if( (nOp & 0x1F) == 0x1B )
-                    STARTTOKENCLASS( "Area3d" );
-                else
-                    STARTTOKENCLASS( "Area3dErr" );
-
-                UINT16 nXti, nRow1, nCol1, nRow2, nCol2;
-                *pIn >> nXti >> nRow1 >> nRow2 >> nCol1 >> nCol2;
-                AddRangeRef( aOperand, nRow1, nCol1, nRow2, nCol2, bRangeName, nXti );
-                t += "3D area ref   Xti!C/R:C/R=";      __AddHex( t, nXti );
-                t += '!';                               __AddHex( t, nCol1 );
-                t += '/';                               __AddHex( t, nRow1 );
-                t += ':';                               __AddHex( t, nCol2 );
-                t += '/';                               __AddHex( t, nRow2 );
-                t += ' ';                               t += aOperand;
-                aStack.PushOperand( aOperand, nOp );
-            }
-            break;
-            default:
-                STARTTOKEN( "unknown" );
-                bError = TRUE;
-        }
-        PRINTTOKEN();
-    }
-    t.Assign( "  Formula = " );
-    if( aStack.GetFormula().Len() ) t += aStack.GetFormula(); else t += "ERROR IN STACK";
-    Print( t );
-    t.Assign( "  Tokencl = " ).Append( aStack.GetTokenClasses() );
-    Print( t );
-    pIn->Seek( nAfterPos );
-}
-
-
-// ============================================================================
-//
-//  S T R E A M   C O N T E N T S
-//
-// ============================================================================
-
-void Biff8RecDumper::DumpBinary( SvStream& rInStrm, ULONG nSize )
-{
-    ULONG nStrmPos = rInStrm.Tell();
-    rInStrm.Seek( STREAM_SEEK_TO_END );
-    ULONG nStrmLen = rInStrm.Tell();
-    rInStrm.Seek( nStrmPos );
-    ULONG nDumpEnd = (nSize == STREAM_SEEK_TO_END) ? nStrmLen : ::std::min( nStrmPos + nSize, nStrmLen );
-
-    const ULONG LINE_SIZE = 16;
-    sal_uInt8 pnData[ LINE_SIZE ];
-
-    while( rInStrm.Tell() < nDumpEnd )
-    {
-        ByteString aBinLine;
-        ByteString aTextLine;
-
-        ULONG nLineLen = ::std::min( nDumpEnd - rInStrm.Tell(), LINE_SIZE );
-        rInStrm.Read( pnData, nLineLen );
-
-        for( sal_uInt8 *pnByte = pnData, *pnEnd = pnData + nLineLen; pnByte != pnEnd; ++pnByte )
-        {
-            if( pnByte - pnData == LINE_SIZE / 2 )
-            {
-                aBinLine.Append( ' ' );
-                aTextLine.Append( ' ' );
-            }
-            __AddPureHex( aBinLine, *pnByte );
-            aBinLine.Append( ' ' );
-            aTextLine.Append( static_cast< sal_Char >( IsPrintable( *pnByte ) ? *pnByte : '.' ) );
-        }
-
-        aBinLine.Expand( LINE_SIZE * 3 + 3, ' ' );
-        (*pDumpStream) << aBinLine.GetBuffer() << aTextLine.GetBuffer() << "\n";
-    }
-}
-
-// ============================================================================
-//
-//  F O R M   C O N T R O L S
-//
-// ============================================================================
-
-namespace {
-
-// little helpers -------------------------------------------------------------
-
-/** Import from bytestream. */
-SvStream& operator>>( SvStream& rStrm, XclGuid& rGuid )
-{
-    rStrm.Read( rGuid.mpnData, 16 );
-    return rStrm;
-}
-
-/** Output guid into text stream. */
-SvStream& operator<<( SvStream& rStrm, const XclGuid& rGuid )
-{
-    ByteString aOut;
-    lclAppendGuid( aOut, rGuid );
-    return rStrm << aOut.GetBuffer();
-}
-
-void lclAlignStream( SvStream& rInStrm, ULONG nStartPos, ULONG nDataWidth )
-{
-    rInStrm.SeekRel( nDataWidth - 1 - (rInStrm.Tell() - nStartPos + nDataWidth - 1) % nDataWidth );
-}
-
-// control types --------------------------------------------------------------
-
-const sal_uInt16 EXC_CTRL_PAGE          = 0x0007;
-const sal_uInt16 EXC_CTRL_IMAGE         = 0x000C;
-const sal_uInt16 EXC_CTRL_FRAME         = 0x000E;
-const sal_uInt16 EXC_CTRL_SPINBUTTON    = 0x0010;
-const sal_uInt16 EXC_CTRL_PUSHBUTTON    = 0x0011;
-const sal_uInt16 EXC_CTRL_TABSTRIP      = 0x0012;
-const sal_uInt16 EXC_CTRL_LABEL         = 0x0015;
-const sal_uInt16 EXC_CTRL_TEXTBOX       = 0x0017;
-const sal_uInt16 EXC_CTRL_LISTBOX       = 0x0018;
-const sal_uInt16 EXC_CTRL_COMBOBOX      = 0x0019;
-const sal_uInt16 EXC_CTRL_CHECKBOX      = 0x001A;
-const sal_uInt16 EXC_CTRL_OPTIONBUTTON  = 0x001B;
-const sal_uInt16 EXC_CTRL_TOGGLEBUTTON  = 0x001C;
-const sal_uInt16 EXC_CTRL_SCROLLBAR     = 0x002F;
-const sal_uInt16 EXC_CTRL_MULTIPAGE     = 0x0039;
-const sal_uInt16 EXC_CTRL_REFEDIT       = 0x8000;
-const sal_uInt16 EXC_CTRL_FONTDATA      = 0xFFF0;   // internal use only
-const sal_uInt16 EXC_CTRL_USERFORM      = 0xFFF1;   // internal use only
-const sal_uInt16 EXC_CTRL_ADDDATA       = 0xFFF2;   // internal use only
-const sal_uInt16 EXC_CTRL_FRAMECHILD    = 0xFFF3;   // internal use only
-const sal_uInt16 EXC_CTRL_PROGRESSBAR   = 0xFFF4;   // internal use only
-const sal_uInt16 EXC_CTRL_UNKNOWN       = 0xFFFF;   // internal use only
-
-const sal_uInt16 EXC_CTRL_RECORD_ID     = 0x0000;
-const sal_uInt16 EXC_CTRL_CLIENT_ID     = 0x0200;
-const sal_uInt16 EXC_CTRL_CONTAINER_ID  = 0x0400;
-
-// control names --------------------------------------------------------------
-
-struct XclDumpControlInfo
-{
-    sal_uInt16          mnType;
-    const sal_Char*     mpcName;
-    sal_uInt16          mnId;
-};
-
-static const XclDumpControlInfo spControlInfos[] =
-{
-    { EXC_CTRL_PAGE,            "Page",         EXC_CTRL_CONTAINER_ID },
-    { EXC_CTRL_IMAGE,           "Image",        EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_FRAME,           "Frame",        EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_SPINBUTTON,      "Spin",         EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_PUSHBUTTON,      "PushButton",   EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_TABSTRIP,        "TabStrip",     EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_LABEL,           "Label",        EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_TEXTBOX,         "TextBox",      EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_LISTBOX,         "ListBox",      EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_COMBOBOX,        "ComboBox",     EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_CHECKBOX,        "CheckBox",     EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_OPTIONBUTTON,    "OptionButton", EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_TOGGLEBUTTON,    "ToggleButton", EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_SCROLLBAR,       "ScrollBar",    EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_MULTIPAGE,       "MultiPage",    EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_REFEDIT,         "RefEdit",      EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_FONTDATA,        "FontData",     EXC_CTRL_CLIENT_ID    },
-    { EXC_CTRL_USERFORM,        "UserForm",     EXC_CTRL_CONTAINER_ID },
-    { EXC_CTRL_ADDDATA,         "AddData",      EXC_CTRL_RECORD_ID    },
-    { EXC_CTRL_FRAMECHILD,      "FrameChild",   EXC_CTRL_RECORD_ID    },
-    { EXC_CTRL_PROGRESSBAR,     "ProgressBar",  EXC_CTRL_RECORD_ID    }
-};
-
-typedef ::std::map< sal_uInt16, const XclDumpControlInfo* > XclDumpControlInfoMap;
-typedef ScfRef< XclDumpControlInfoMap >                     XclDumpControlInfoMapRef;
-
-XclDumpControlInfoMapRef lclCreateControlInfoMap()
-{
-    XclDumpControlInfoMapRef xMap( new XclDumpControlInfoMap );
-    for( const XclDumpControlInfo *pIt = spControlInfos, *pEnd = STATIC_TABLE_END( spControlInfos ); pIt != pEnd; ++pIt )
-        (*xMap)[ pIt->mnType ] = pIt;
-    return xMap;
-}
-
-const XclDumpControlInfoMap& lclGetControlInfoMap()
-{
-    static const XclDumpControlInfoMapRef sxMap = lclCreateControlInfoMap();
-    return *sxMap;
-}
-
-void lclAppendControlType( ByteString& rStr, sal_uInt16 nCtrlType )
-{
-    const XclDumpControlInfoMap& rMap = lclGetControlInfoMap();
-    XclDumpControlInfoMap::const_iterator aIt = rMap.find( nCtrlType );
-    rStr.Append( (aIt == rMap.end()) ? "*UNKNOWN*" : aIt->second->mpcName );
-}
-
-void lclDumpControlType( SvStream& rOutStrm, sal_uInt16 nCtrlType )
-{
-    ByteString aTitle( "type=" );
-    lclAppendHex( aTitle, nCtrlType );
-    aTitle.Append( " (" );
-    lclAppendControlType( aTitle, nCtrlType );
-    aTitle.Append( ')' );
-    rOutStrm << aTitle.GetBuffer();
-}
-
-sal_uInt16 lclDumpControlHeader( SvStream& rInStrm, SvStream& rOutStrm, sal_uInt16 nCtrlType )
-{
-    lclDumpControlType( rOutStrm, nCtrlType );
-    sal_uInt16 nId, nSize;
-    rInStrm >> nId >> nSize;
-    ByteString aLine( "  id=" );    lclAppendHex( aLine, nId );
-    const XclDumpControlInfoMap& rMap = lclGetControlInfoMap();
-    XclDumpControlInfoMap::const_iterator aIt = rMap.find( nCtrlType );
-    bool bValid = (aIt != rMap.end()) && (aIt->second->mnId == nId);
-    aLine.Append( bValid ? " (valid)" : " (invalid)" );
-    aLine.Append( "  size=" );      lclAppendHex( aLine, nSize );
-    rOutStrm << aLine.GetBuffer() << "\n";
-    return nSize;
-}
-
-// control GUIDs --------------------------------------------------------------
-
-struct XclDumpControlGuid
-{
-    sal_uInt16          mnType;
-    sal_uInt32          mnGuidData1;
-    sal_uInt16          mnGuidData2;
-    sal_uInt16          mnGuidData3;
-    sal_uInt8           mnGuidData41;
-    sal_uInt8           mnGuidData42;
-    sal_uInt8           mnGuidData43;
-    sal_uInt8           mnGuidData44;
-    sal_uInt8           mnGuidData45;
-    sal_uInt8           mnGuidData46;
-    sal_uInt8           mnGuidData47;
-    sal_uInt8           mnGuidData48;
-};
-
-static const XclDumpControlGuid spControlGuids[] =
-{
-    { EXC_CTRL_PUSHBUTTON,      0xD7053240, 0xCE69, 0x11CD, 0xA7, 0x77, 0x00, 0xDD, 0x01, 0x14, 0x3C, 0x57 },
-    { EXC_CTRL_TOGGLEBUTTON,    0x8BD21D60, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 },
-    { EXC_CTRL_CHECKBOX,        0x8BD21D40, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 },
-    { EXC_CTRL_OPTIONBUTTON,    0x8BD21D50, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 },
-    { EXC_CTRL_LABEL,           0x978C9E23, 0xD4B0, 0x11CE, 0xBF, 0x2D, 0x00, 0xAA, 0x00, 0x3F, 0x40, 0xD0 },
-    { EXC_CTRL_TEXTBOX,         0x8BD21D10, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 },
-    { EXC_CTRL_LISTBOX,         0x8BD21D20, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 },
-    { EXC_CTRL_COMBOBOX,        0x8BD21D30, 0xEC42, 0x11CE, 0x9E, 0x0D, 0x00, 0xAA, 0x00, 0x60, 0x02, 0xF3 },
-    { EXC_CTRL_SPINBUTTON,      0x79176FB0, 0xB7F2, 0x11CE, 0x97, 0xEF, 0x00, 0xAA, 0x00, 0x6D, 0x27, 0x76 },
-    { EXC_CTRL_SCROLLBAR,       0xDFD181E0, 0x5E2F, 0x11CE, 0xA4, 0x49, 0x00, 0xAA, 0x00, 0x4A, 0x80, 0x3D },
-    { EXC_CTRL_IMAGE,           0x4C599241, 0x6926, 0x101B, 0x99, 0x92, 0x00, 0x00, 0x0B, 0x65, 0xC6, 0xF9 },
-    { EXC_CTRL_PROGRESSBAR,     0x35053A22, 0x8589, 0x11D1, 0xB1, 0x6A, 0x00, 0xC0, 0xF0, 0x28, 0x36, 0x28 }
-};
-
-typedef ::std::map< XclGuid, sal_uInt16 >   XclDumpControlGuidMap;
-typedef ScfRef< XclDumpControlGuidMap >     XclDumpControlGuidMapRef;
-
-XclDumpControlGuidMapRef lclCreateControlGuidMap()
-{
-    XclDumpControlGuidMapRef xMap( new XclDumpControlGuidMap );
-    for( const XclDumpControlGuid *pIt = spControlGuids, *pEnd = STATIC_TABLE_END( spControlGuids ); pIt != pEnd; ++pIt )
-    {
-        XclGuid aGuid( pIt->mnGuidData1, pIt->mnGuidData2, pIt->mnGuidData3,
-            pIt->mnGuidData41, pIt->mnGuidData42, pIt->mnGuidData43, pIt->mnGuidData44,
-            pIt->mnGuidData45, pIt->mnGuidData46, pIt->mnGuidData47, pIt->mnGuidData48 );
-        (*xMap)[ aGuid ] = pIt->mnType;
-    }
-    return xMap;
-}
-
-const XclDumpControlGuidMap& lclGetControlGuidMap()
-{
-    static const XclDumpControlGuidMapRef sxMap = lclCreateControlGuidMap();
-    return *sxMap;
-}
-
-sal_uInt16 lclDumpControlGuid( SvStream& rInStrm, SvStream& rOutStrm )
-{
-    XclGuid aGuid;
-    rInStrm >> aGuid;
-    const XclDumpControlGuidMap& rMap = lclGetControlGuidMap();
-    XclDumpControlGuidMap::const_iterator aIt = rMap.find( aGuid );
-    sal_uInt16 nCtrlType = (aIt == rMap.end()) ? EXC_CTRL_UNKNOWN : aIt->second;
-    rOutStrm << "guid=" << aGuid;
-    return nCtrlType;
-};
-
-// other guids ----------------------------------------------------------------
-
-static const XclGuid saStdFontGuid( 0x0BE35203, 0x8F91, 0x11CE, 0x9D, 0xE3, 0x00, 0xAA, 0x00, 0x4B, 0xB8, 0x51 );
-static const XclGuid saStdPicGuid(  0x0BE35204, 0x8F91, 0x11CE, 0x9D, 0xE3, 0x00, 0xAA, 0x00, 0x4B, 0xB8, 0x51 );\
-
-// ----------------------------------------------------------------------------
-
-} // namespace
-
-// *** yet some other ugly macros for the specials of form control dumping ***
-
-// align the instream
-#define EXC_CTRLDUMP_ALIGN_INSTRM( val ) lclAlignStream( rInStrm, nStartPos, val )
-// push the string to outstream
-#define EXC_CTRLDUMP_PRINT() { if( t.Len() ) { rOutStrm << t.GetBuffer() << '\n'; t.Erase(); } }
-
-// implementation, don't use
-#define IMPL_EXC_CTRLDUMP_PLAIN_VALUE( type, func, text )    { type n; rInStrm >> n; t.Append( "  " text "=" ); func( t, n ); EXC_CTRLDUMP_PRINT(); }
-#define IMPL_EXC_CTRLDUMP_VALUE( type, func, text )          { EXC_CTRLDUMP_ALIGN_INSTRM( sizeof( type ) ); IMPL_EXC_CTRLDUMP_PLAIN_VALUE( type, func, text ); }
-#define IMPL_EXC_CTRLDUMP_PLAIN_VAR( var, mask, func, text ) { rInStrm >> var; var &= (mask); t.Append( "  " text "=" ); func( t, var ); EXC_CTRLDUMP_PRINT(); }
-#define IMPL_EXC_CTRLDUMP_VAR( var, mask, func, text )       { EXC_CTRLDUMP_ALIGN_INSTRM( sizeof( var ) ); IMPL_EXC_CTRLDUMP_PLAIN_VAR( var, mask, func, text ); }
-
-// read a value from stream (no stream alignment)
-#define EXC_CTRLDUMP_PLAIN_HEX4( text ) IMPL_EXC_CTRLDUMP_PLAIN_VALUE( sal_uInt32, lclAppendHex, text )
-#define EXC_CTRLDUMP_PLAIN_DEC4( text ) IMPL_EXC_CTRLDUMP_PLAIN_VALUE( sal_Int32,  lclAppendDec, text )
-#define EXC_CTRLDUMP_PLAIN_HEX2( text ) IMPL_EXC_CTRLDUMP_PLAIN_VALUE( sal_uInt16, lclAppendHex, text )
-#define EXC_CTRLDUMP_PLAIN_DEC2( text ) IMPL_EXC_CTRLDUMP_PLAIN_VALUE( sal_Int16,  lclAppendDec, text )
-#define EXC_CTRLDUMP_PLAIN_HEX1( text ) IMPL_EXC_CTRLDUMP_PLAIN_VALUE( sal_uInt8,  lclAppendHex, text )
-#define EXC_CTRLDUMP_PLAIN_DEC1( text ) IMPL_EXC_CTRLDUMP_PLAIN_VALUE( sal_Int8,   lclAppendDec, text )
-#define EXC_CTRLDUMP_PLAIN_DECF( text ) IMPL_EXC_CTRLDUMP_PLAIN_VALUE( float,      lclAppendDec, text )
-// read a value from stream (with stream alignment)
-#define EXC_CTRLDUMP_HEX4( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_uInt32, lclAppendHex, text )
-#define EXC_CTRLDUMP_DEC4( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_Int32,  lclAppendDec, text )
-#define EXC_CTRLDUMP_HEX2( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_uInt16, lclAppendHex, text )
-#define EXC_CTRLDUMP_DEC2( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_Int16,  lclAppendDec, text )
-#define EXC_CTRLDUMP_HEX1( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_uInt8,  lclAppendHex, text )
-#define EXC_CTRLDUMP_DEC1( text ) IMPL_EXC_CTRLDUMP_VALUE( sal_Int8,   lclAppendDec, text )
-// read a value from stream into existing variable (no stream alignment)
-#define EXC_CTRLDUMP_PLAIN_HEXVAR( var, text )           IMPL_EXC_CTRLDUMP_PLAIN_VAR( var, ~0,   lclAppendHex, text )
-#define EXC_CTRLDUMP_PLAIN_DECVAR( var, text )           IMPL_EXC_CTRLDUMP_PLAIN_VAR( var, ~0,   lclAppendDec, text )
-#define EXC_CTRLDUMP_PLAIN_HEXVARMASK( var, mask, text ) IMPL_EXC_CTRLDUMP_PLAIN_VAR( var, mask, lclAppendHex, text )
-#define EXC_CTRLDUMP_PLAIN_DECVARMASK( var, mask, text ) IMPL_EXC_CTRLDUMP_PLAIN_VAR( var, mask, lclAppendDec, text )
-// read a value from stream into existing variable (with stream alignment)
-#define EXC_CTRLDUMP_HEXVAR( var, text )           IMPL_EXC_CTRLDUMP_VAR( var, ~0,   lclAppendHex, text )
-#define EXC_CTRLDUMP_DECVAR( var, text )           IMPL_EXC_CTRLDUMP_VAR( var, ~0,   lclAppendDec, text )
-#define EXC_CTRLDUMP_HEXVARMASK( var, mask, text ) IMPL_EXC_CTRLDUMP_VAR( var, mask, lclAppendHex, text )
-#define EXC_CTRLDUMP_DECVARMASK( var, mask, text ) IMPL_EXC_CTRLDUMP_VAR( var, mask, lclAppendDec, text )
-// read flag fields
-#define EXC_CTRLDUMP_PLAIN_STARTOPTFLAG( text, doread, defaults )\
-{                                                           \
-    nFlags = defaults;                                      \
-    t.Append( "  " text );                                  \
-    if( doread )                                            \
-        rInStrm >> nFlags;                                  \
-    else                                                    \
-        t.Append( "-defaulted" );                           \
-    t.Append( '=' );                                        \
-    lclAppendHex( t, nFlags );                              \
-}
-#define EXC_CTRLDUMP_STARTOPTFLAG( text, doread, defaults ) { if( doread ) { EXC_CTRLDUMP_ALIGN_INSTRM( sizeof( nFlags ) ); } EXC_CTRLDUMP_PLAIN_STARTOPTFLAG( text, doread, defaults ) }
-#define EXC_CTRLDUMP_PLAIN_STARTFLAG( text )                EXC_CTRLDUMP_PLAIN_STARTOPTFLAG( text, true, 0 )
-#define EXC_CTRLDUMP_STARTFLAG( text )                      EXC_CTRLDUMP_STARTOPTFLAG( text, true, 0 )
-#define EXC_CTRLDUMP_ADDFLAG( flag, text )                  { if( nFlags & (flag) ) t.Append( " " text ); }
-#define EXC_CTRLDUMP_ADDFLAGVALUE( start, width, text )     { sal_uInt32 nValue = ::extract_value<sal_uInt32,sal_uInt32>( nFlags, start, width ); t.Append( " " text "=" ); lclAppendDec( t, nValue ); }
-#define EXC_CTRLDUMP_ENDFLAG( reserved )                    { if( nFlags & (reserved) ) { t.Append( " ?" ); lclAppendHex( t, static_cast< sal_uInt32 >( nFlags & (reserved) ) ); } EXC_CTRLDUMP_PRINT(); }
-// read coordinates
-#define EXC_CTRLDUMP_COORD2( text ) { EXC_CTRLDUMP_ALIGN_INSTRM( 4 ); EXC_CTRLDUMP_DEC2( text "-x" ); EXC_CTRLDUMP_DEC2( text "-y" ); }
-#define EXC_CTRLDUMP_COORD4( text ) { EXC_CTRLDUMP_DEC4( text "-x" ); EXC_CTRLDUMP_DEC4( text "-y" ); }
-#define EXC_CTRLDUMP_SIZE4( text )  { EXC_CTRLDUMP_DEC4( text "-width" ); EXC_CTRLDUMP_DEC4( text "-height" ); }
-// read guid
-#define EXC_CTRLDUMP_PLAIN_GUID( text ) IMPL_EXC_CTRLDUMP_PLAIN_VALUE( XclGuid, lclAppendGuid, text )
-#define EXC_CTRLDUMP_GUID( text )       { EXC_CTRLDUMP_ALIGN_INSTRM( 4 ); EXC_CTRLDUMP_PLAIN_GUID( text ); }
-// read control type
-#define EXC_CTRLDUMP_CTRLTYPE( var, text )                  \
-{                                                           \
-    EXC_CTRLDUMP_ALIGN_INSTRM( 2 );                         \
-    rInStrm >> var;                                         \
-    t.Assign( "  " text "=" ); lclAppendHex( t, var );      \
-    t.Append( " (" ); lclAppendControlType( t, var );       \
-    t.Append( ')' );                                        \
-    EXC_CTRLDUMP_PRINT();                                   \
-}
-// read character array, add to string, but do not print
-#define EXC_CTRLDUMP_RAWSTRING( var )                       \
-{                                                           \
-    t.Append( "='" );                                       \
-    if( var )                                               \
-    {                                                       \
-        EXC_CTRLDUMP_ALIGN_INSTRM( 4 );                     \
-        ULONG nNextPos = rInStrm.Tell() + (var);            \
-        if( var > 128 ) var = 128;                          \
-        sal_Char pc[ 129 ];                                 \
-        rInStrm.Read( pc, var ); pc[ var ] = '\0';          \
-        t.Append( pc );                                     \
-        rInStrm.Seek( nNextPos );                           \
-    }                                                       \
-    t.Append( '\'' );                                       \
-}
-// read a string
-#define EXC_CTRLDUMP_STRING( var, text )                    \
-{                                                           \
-    t.Append( "  " text );                                  \
-    EXC_CTRLDUMP_RAWSTRING( var );                          \
-    EXC_CTRLDUMP_PRINT();                                   \
-}
-// read an array of strings
-#define EXC_CTRLDUMP_STRINGARRAY( total, count, text )      \
-{                                                           \
-    ULONG nNextPos = rInStrm.Tell() + (total);              \
-    for( sal_uInt32 nIdx = 0; (nIdx < (count)) && (rInStrm.Tell() < nNextPos); ++nIdx )\
-    {                                                       \
-        EXC_CTRLDUMP_ALIGN_INSTRM( 4 );                     \
-        sal_uInt32 nLen;                                    \
-        rInStrm >> nLen;                                    \
-        nLen &= 0x7FFFFFFF;                                 \
-        t.Append( "  " text "[" );                          \
-        lclAppendDec( t, nIdx + 1 );                        \
-        t.Append( ']' );                                    \
-        EXC_CTRLDUMP_RAWSTRING( nLen );                     \
-    }                                                       \
-    EXC_CTRLDUMP_PRINT();                                   \
-    rInStrm.Seek( nNextPos );                               \
-}
-// read embedded font data
-#define EXC_CTRLDUMP_FONT( var, text )                      \
-if( var )                                                   \
-{                                                           \
-    EXC_CTRLDUMP_PRINT();                                   \
-    XclGuid aGuid; rInStrm >> aGuid;                        \
-    rOutStrm << "embedded-font-guid=" << aGuid;             \
-    if( aGuid == saStdFontGuid )                            \
-    {                                                       \
-        rOutStrm << " (StdFont)\n";                         \
-        EXC_CTRLDUMP_PLAIN_HEX1( "unknown1" );              \
-        EXC_CTRLDUMP_PLAIN_DEC1( "script-type" );           \
-        EXC_CTRLDUMP_PLAIN_HEX1( "unknown2" );              \
-        sal_uInt8 nFlags;                                   \
-        EXC_CTRLDUMP_PLAIN_STARTFLAG( "font-style-flags" ); \
-        EXC_CTRLDUMP_ADDFLAG( 0x02, "italic" );             \
-        EXC_CTRLDUMP_ADDFLAG( 0x04, "underline" );          \
-        EXC_CTRLDUMP_ADDFLAG( 0x08, "strikeout" );          \
-        EXC_CTRLDUMP_ENDFLAG( 0xF1 );                       \
-        EXC_CTRLDUMP_PLAIN_DEC2( "font-weight" );           \
-        EXC_CTRLDUMP_PLAIN_DEC4( "font-size" );             \
-/* font-size := pt*10000 + (1-((pt+1)%3))*2500 */           \
-        sal_uInt8 nLen;                                     \
-        EXC_CTRLDUMP_PLAIN_DECVAR( nLen, "font-name-len" ); \
-        sal_Char* p = new sal_Char[ nLen + 1 ];             \
-        rInStrm.Read( p, nLen ); p[ nLen ] = '\0';          \
-        t.Append( "  font-name='" ).Append( p ).Append( '\'' );\
-        delete [] p;                                        \
-        EXC_CTRLDUMP_PRINT();                               \
-    }                                                       \
-    else                                                    \
-        rOutStrm << " (*UNKNOWN*)\n";                       \
-}
-// read image data
-#define EXC_CTRLDUMP_IMAGE( var, text )                     \
-if( var )                                                   \
-{                                                           \
-    EXC_CTRLDUMP_PRINT();                                   \
-    XclGuid aGuid; rInStrm >> aGuid;                        \
-    rOutStrm << "embedded-" text "-guid=" << aGuid;         \
-    if( aGuid == saStdPicGuid )                             \
-    {                                                       \
-        rOutStrm << " (StdPict)\n";                         \
-        EXC_CTRLDUMP_PLAIN_HEX2( "u1" );                    \
-        EXC_CTRLDUMP_PLAIN_HEX2( "u2" );                    \
-        sal_uInt32 nLen;                                    \
-        EXC_CTRLDUMP_PLAIN_DECVAR( nLen, text "-len" );     \
-        rInStrm.SeekRel( nLen );                            \
-    }                                                       \
-    else                                                    \
-        rOutStrm << " (*UNKNOWN*)\n";                       \
-}
-// hex dump remaining or unknown data
-#define EXC_CTRLDUMP_REMAINING( nextpos )                   \
-{                                                           \
-    EXC_CTRLDUMP_ALIGN_INSTRM( 4 );                         \
-    if( rInStrm.Tell() < (nextpos) )                        \
-    {                                                       \
-        rOutStrm << "  unknown-data=\n";                    \
-        DumpBinary( rInStrm, ::std::min< ULONG >( (nextpos) - rInStrm.Tell(), 1024 ) );\
-    }                                                       \
-    rInStrm.Seek( nextpos );                                \
-}
-
-// *** macros end ***
-
-void Biff8RecDumper::DumpControlContents( SvStream& rInStrm, sal_uInt16 nCtrlType )
-{
-    SvStream& rOutStrm = *pDumpStream;
-
-    if( nCtrlType == EXC_CTRL_PROGRESSBAR )
-    {
-        lclDumpControlType( rOutStrm, nCtrlType );
-        rOutStrm << '\n';
-
-        ByteString t;                       // "t" needed for macros
-        sal_uInt32 nFlags = 0;              // "nFlags" needed for macros
-
-        EXC_CTRLDUMP_PLAIN_HEX4( "unknown" );
-        EXC_CTRLDUMP_PLAIN_HEX4( "unknown" );
-        EXC_CTRLDUMP_PLAIN_DEC4( "width" );
-        EXC_CTRLDUMP_PLAIN_DEC4( "height" );
-        EXC_CTRLDUMP_PLAIN_HEX4( "unknown" );
-        EXC_CTRLDUMP_PLAIN_HEX4( "unknown" );
-        EXC_CTRLDUMP_PLAIN_HEX4( "unknown" );
-        EXC_CTRLDUMP_PLAIN_DECF( "min" );
-        EXC_CTRLDUMP_PLAIN_DECF( "max" );
-        EXC_CTRLDUMP_PLAIN_STARTFLAG( "flags1" );
-        EXC_CTRLDUMP_ADDFLAG( 0x00000001, "vertical" );
-        EXC_CTRLDUMP_ADDFLAG( 0x00010000, "smooth-scroll" );
-        EXC_CTRLDUMP_ENDFLAG( 0xFFFEFFFE );
-        EXC_CTRLDUMP_PLAIN_HEX4( "unknown" );
-        EXC_CTRLDUMP_PLAIN_HEX4( "unknown" );
-        EXC_CTRLDUMP_PLAIN_HEX4( "unknown" );
-        EXC_CTRLDUMP_PLAIN_STARTFLAG( "flags2" );
-        EXC_CTRLDUMP_ADDFLAG( 0x0001, "border-single" );
-        EXC_CTRLDUMP_ADDFLAG( 0x0002, "enabled" );
-        EXC_CTRLDUMP_ADDFLAG( 0x0004, "3d-style" );
-        EXC_CTRLDUMP_ADDFLAGVALUE( 3, 8, "mouse-icon" );
-        EXC_CTRLDUMP_ADDFLAG( 0x2000, "ole-drop-manual" );
-        EXC_CTRLDUMP_ENDFLAG( 0xFFFFD800 );
-        return;
-    }
-
-    sal_uInt16 nSize = lclDumpControlHeader( rInStrm, rOutStrm, nCtrlType );
-    if( nSize > 0 )
-    {
-        ULONG nStartPos = rInStrm.Tell();   // for stream alignment macro
-        ByteString t;                       // "t" needed for macros
-        sal_uInt32 nFlags = 0;              // "nFlags" needed for macros
-
-        bool bHasFontData = false;
-        sal_uInt32 nNameLen = 0;
-        sal_uInt32 nCaptionLen = 0;
-        sal_uInt32 nValueLen = 0;
-        sal_uInt32 nGroupNameLen = 0;
-        sal_uInt32 nTagLen = 0;
-        sal_uInt32 nTipLen = 0;
-        sal_uInt32 nCtrlIdLen = 0;
-        sal_uInt32 nCtrlSrcLen = 0;
-        sal_uInt32 nRowSrcLen = 0;
-        sal_uInt16 nPic = 0;
-        sal_uInt16 nIcon = 0;
-        sal_uInt16 nFont = 0;
-
-        switch( nCtrlType )
-        {
-            case EXC_CTRL_PUSHBUTTON:
-            {
-                EXC_CTRLDUMP_STARTFLAG( "content-flags" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0001, "forecolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0002, "backcolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0004, "option" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0008, "caption" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0010, "picpos" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0020, "size" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0040, "mouseptr" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0080, "pic" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0100, "accel" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0200, "notakefocus" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0400, "icon" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFFF800 );
-                sal_uInt32 nCtrlFlags = nFlags;
-
-                if( nCtrlFlags & 0x0001 ) EXC_CTRLDUMP_HEX4( "forecolor" );
-                if( nCtrlFlags & 0x0002 ) EXC_CTRLDUMP_HEX4( "backcolor" );
-
-                EXC_CTRLDUMP_STARTOPTFLAG( "option-flags", nCtrlFlags & 0x0004, 0x0000001B );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "enabled" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000004, "locked" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000008, "opaque" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00800000, "wordwrap" );
-                EXC_CTRLDUMP_ADDFLAG( 0x10000000, "autosize" );
-                EXC_CTRLDUMP_ENDFLAG( 0xEF7FFFF1 );
-
-                if( nCtrlFlags & 0x0008 ) EXC_CTRLDUMP_DECVARMASK( nCaptionLen, 0x7FFFFFFF, "caption-len" );
-                if( nCtrlFlags & 0x0010 ) EXC_CTRLDUMP_COORD2( "picpos" );
-                if( nCtrlFlags & 0x0040 ) EXC_CTRLDUMP_DEC1( "mouseptr" );
-                if( nCtrlFlags & 0x0080 ) EXC_CTRLDUMP_HEXVAR( nPic, "pic" );
-                if( nCtrlFlags & 0x0100 ) EXC_CTRLDUMP_HEX2( "accel" );
-                if( nCtrlFlags & 0x0400 ) EXC_CTRLDUMP_HEXVAR( nIcon, "icon" );
-
-                if( nCtrlFlags & 0x0008 ) EXC_CTRLDUMP_STRING( nCaptionLen, "caption" );
-                if( nCtrlFlags & 0x0020 ) EXC_CTRLDUMP_SIZE4( "size" );
-                EXC_CTRLDUMP_REMAINING( nStartPos + nSize );
-
-                EXC_CTRLDUMP_IMAGE( nPic, "pic" );
-                EXC_CTRLDUMP_IMAGE( nIcon, "icon" );
-                bHasFontData = true;
-            }
-            break;
-
-            case EXC_CTRL_TOGGLEBUTTON:
-            case EXC_CTRL_CHECKBOX:
-            case EXC_CTRL_OPTIONBUTTON:
-            case EXC_CTRL_TEXTBOX:
-            case EXC_CTRL_LISTBOX:
-            case EXC_CTRL_COMBOBOX:
-            case EXC_CTRL_REFEDIT:
-            {
-                EXC_CTRLDUMP_STARTFLAG( "content-flags" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000001, "option" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "backcolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000004, "forecolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000008, "maxlen" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000010, "borderstyle" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000020, "scrollbars" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000040, "style" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000080, "mouseptr" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000100, "size" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000200, "passwordchar" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000400, "listwidth" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000800, "boundcol" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00001000, "textcol" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00002000, "colcount" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00004000, "listrows" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00008000, "colwidth?" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00010000, "matchentry" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00020000, "liststyle" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00040000, "showdropbtn" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00100000, "dropbtnstyle" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00200000, "multistate" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00400000, "value" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00800000, "caption" );
-                EXC_CTRLDUMP_ADDFLAG( 0x01000000, "picpos" );
-                EXC_CTRLDUMP_ADDFLAG( 0x02000000, "bordercolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x04000000, "specialeff" );
-                EXC_CTRLDUMP_ADDFLAG( 0x08000000, "icon" );
-                EXC_CTRLDUMP_ADDFLAG( 0x10000000, "pic" );
-                EXC_CTRLDUMP_ADDFLAG( 0x20000000, "accel" );
-                EXC_CTRLDUMP_ENDFLAG( 0x40080000 ); // 0x80000000 always set?
-                sal_uInt32 nCtrlFlags = nFlags;
-
-                EXC_CTRLDUMP_STARTFLAG( "2nd-content-flags" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000001, "groupname" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFFFFFE );
-                sal_uInt32 nCtrlFlags2 = nFlags;
-
-                EXC_CTRLDUMP_STARTOPTFLAG( "option-flags", nCtrlFlags & 0x00000001, 0x2C80081B );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "enabled" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000004, "locked" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000008, "opaque" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000400, "colheads" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000800, "intheight" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00001000, "matchreq" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00002000, "align" );
-                EXC_CTRLDUMP_ADDFLAGVALUE( 15, 4, "ime-mode" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00080000, "dragbehav" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00100000, "enterkeybehav" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00200000, "enterfieldbehav" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00400000, "tabkeybehav" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00800000, "wordwrap" );
-                EXC_CTRLDUMP_ADDFLAG( 0x04000000, "selmargin" );
-                EXC_CTRLDUMP_ADDFLAG( 0x08000000, "autowordsel" );
-                EXC_CTRLDUMP_ADDFLAG( 0x10000000, "autosize" );
-                EXC_CTRLDUMP_ADDFLAG( 0x20000000, "hidesel" );
-                EXC_CTRLDUMP_ADDFLAG( 0x40000000, "autotab" );
-                EXC_CTRLDUMP_ADDFLAG( 0x80000000, "multiline" );
-                EXC_CTRLDUMP_ENDFLAG( 0x030043F1 );
-
-                if( nCtrlFlags & 0x00000002 ) EXC_CTRLDUMP_HEX4( "backcolor" );
-                if( nCtrlFlags & 0x00000004 ) EXC_CTRLDUMP_HEX4( "forecolor" );
-                if( nCtrlFlags & 0x00000008 ) EXC_CTRLDUMP_DEC4( "maxlen" );
-                if( nCtrlFlags & 0x00000010 ) EXC_CTRLDUMP_DEC1( "borderstyle" );
-                if( nCtrlFlags & 0x00000020 ) EXC_CTRLDUMP_DEC1( "scrollbars" );
-                if( nCtrlFlags & 0x00000040 ) EXC_CTRLDUMP_DEC1( "style" );
-                if( nCtrlFlags & 0x00000080 ) EXC_CTRLDUMP_DEC1( "mouseptr" );
-                if( nCtrlFlags & 0x00000200 ) EXC_CTRLDUMP_HEX2( "passwordchar" );
-                if( nCtrlFlags & 0x00000400 ) EXC_CTRLDUMP_DEC4( "listwidth" );
-                if( nCtrlFlags & 0x00000800 ) EXC_CTRLDUMP_DEC2( "boundcol" );
-                if( nCtrlFlags & 0x00001000 ) EXC_CTRLDUMP_DEC2( "textcol" );
-                if( nCtrlFlags & 0x00002000 ) EXC_CTRLDUMP_DEC2( "colcount" );
-                if( nCtrlFlags & 0x00004000 ) EXC_CTRLDUMP_DEC2( "listrows" );
-                if( nCtrlFlags & 0x00008000 ) EXC_CTRLDUMP_DEC2( "colwidth?" );
-                if( nCtrlFlags & 0x00010000 ) EXC_CTRLDUMP_DEC1( "matchentry" );
-                if( nCtrlFlags & 0x00020000 ) EXC_CTRLDUMP_DEC1( "liststyle" );
-                if( nCtrlFlags & 0x00040000 ) EXC_CTRLDUMP_DEC1( "showdropbtn" );
-                if( nCtrlFlags & 0x00100000 ) EXC_CTRLDUMP_DEC1( "dropbtnstyle" );
-                if( nCtrlFlags & 0x00200000 ) EXC_CTRLDUMP_DEC1( "multistate" );
-                if( nCtrlFlags & 0x00400000 ) EXC_CTRLDUMP_DECVARMASK( nValueLen, 0x7FFFFFFF, "value-len" );
-                if( nCtrlFlags & 0x00800000 ) EXC_CTRLDUMP_DECVARMASK( nCaptionLen, 0x7FFFFFFF, "caption-len" );
-                if( nCtrlFlags & 0x01000000 ) EXC_CTRLDUMP_COORD2( "picpos" );
-                if( nCtrlFlags & 0x02000000 ) EXC_CTRLDUMP_HEX4( "bordercolor" );
-                if( nCtrlFlags & 0x04000000 ) EXC_CTRLDUMP_DEC4( "specialeff" );
-                if( nCtrlFlags & 0x08000000 ) EXC_CTRLDUMP_HEXVAR( nIcon, "icon" );
-                if( nCtrlFlags & 0x10000000 ) EXC_CTRLDUMP_HEXVAR( nPic, "pic" );
-                if( nCtrlFlags & 0x20000000 ) EXC_CTRLDUMP_HEX1( "accel" );
-                if( nCtrlFlags2 & 0x00000001 ) EXC_CTRLDUMP_DECVARMASK( nGroupNameLen, 0x7FFFFFFF, "groupname-len" );
-
-                if( nCtrlFlags & 0x00000100 ) EXC_CTRLDUMP_SIZE4( "size" );
-                if( nCtrlFlags & 0x00400000 ) EXC_CTRLDUMP_STRING( nValueLen, "value" );
-                if( nCtrlFlags & 0x00800000 ) EXC_CTRLDUMP_STRING( nCaptionLen, "caption" );
-                if( nCtrlFlags2 & 0x00000001 ) EXC_CTRLDUMP_STRING( nGroupNameLen, "groupname" );
-                EXC_CTRLDUMP_REMAINING( nStartPos + nSize );
-
-                EXC_CTRLDUMP_IMAGE( nIcon, "icon" );
-                EXC_CTRLDUMP_IMAGE( nPic, "pic" );
-                bHasFontData = true;
-            }
-            break;
-
-            case EXC_CTRL_LABEL:
-            {
-                EXC_CTRLDUMP_STARTFLAG( "content-flags" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0001, "forecolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0002, "backcolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0004, "option" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0008, "caption" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0010, "picpos" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0020, "size" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0040, "mouseptr" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0080, "bordercolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0100, "borderstyle" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0200, "specialeff" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0400, "pic" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0800, "accel" );
-                EXC_CTRLDUMP_ADDFLAG( 0x1000, "icon" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFFE000 );
-                sal_uInt32 nCtrlFlags = nFlags;
-
-                if( nCtrlFlags & 0x0001 ) EXC_CTRLDUMP_HEX4( "forecolor" );
-                if( nCtrlFlags & 0x0002 ) EXC_CTRLDUMP_HEX4( "backcolor" );
-
-                EXC_CTRLDUMP_STARTOPTFLAG( "option-flags", nCtrlFlags & 0x0004, 0x0080001B );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "enabled" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000004, "locked" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000008, "opaque" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00800000, "wordwrap" );
-                EXC_CTRLDUMP_ADDFLAG( 0x10000000, "autosize" );
-                EXC_CTRLDUMP_ENDFLAG( 0xEF7FFFF0 ); // 0x00000001 always set?
-
-                if( nCtrlFlags & 0x0008 ) EXC_CTRLDUMP_DECVARMASK( nCaptionLen, 0x7FFFFFFF, "caption-len" );
-                if( nCtrlFlags & 0x0010 ) EXC_CTRLDUMP_COORD2( "picpos" );
-                if( nCtrlFlags & 0x0040 ) EXC_CTRLDUMP_DEC1( "mouseptr" );
-                if( nCtrlFlags & 0x0080 ) EXC_CTRLDUMP_HEX4( "bordercolor" );
-                if( nCtrlFlags & 0x0100 ) EXC_CTRLDUMP_HEX2( "borderstyle" );
-                if( nCtrlFlags & 0x0200 ) EXC_CTRLDUMP_HEX2( "specialeff" );
-                if( nCtrlFlags & 0x0400 ) EXC_CTRLDUMP_HEXVAR( nPic, "pic" );
-                if( nCtrlFlags & 0x0800 ) EXC_CTRLDUMP_HEX2( "accel" );
-                if( nCtrlFlags & 0x1000 ) EXC_CTRLDUMP_HEXVAR( nIcon, "icon" );
-
-                if( nCtrlFlags & 0x0008 ) EXC_CTRLDUMP_STRING( nCaptionLen, "caption" );
-                if( nCtrlFlags & 0x0020 ) EXC_CTRLDUMP_SIZE4( "size" );
-                EXC_CTRLDUMP_REMAINING( nStartPos + nSize );
-
-                EXC_CTRLDUMP_IMAGE( nPic, "pic" );
-                EXC_CTRLDUMP_IMAGE( nIcon, "icon" );
-                bHasFontData = true;
-            }
-            break;
-
-            case EXC_CTRL_SPINBUTTON:
-            case EXC_CTRL_SCROLLBAR:
-            {
-                EXC_CTRLDUMP_STARTFLAG( "content-flags" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000001, "forecolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "backcolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000004, "option" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000008, "size" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000010, "mouseptr" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000100, "unknown1" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000200, "unknown2" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000400, "unknown3" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000020, "min" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000040, "max" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000080, "value" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000800, "step" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00001000, "page-step" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00002000, "orient" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00004000, "prop-thumb" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00008000, "delay" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00010000, "icon" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFE0000 );
-                sal_uInt32 nCtrlFlags = nFlags;
-
-                if( nCtrlFlags & 0x00000001 ) EXC_CTRLDUMP_HEX4( "forecolor" );
-                if( nCtrlFlags & 0x00000002 ) EXC_CTRLDUMP_HEX4( "backcolor" );
-
-                EXC_CTRLDUMP_STARTOPTFLAG( "option-flags", nCtrlFlags & 0x00000004, 0x0000001B );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "enabled" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000004, "locked" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000008, "opaque" );
-                EXC_CTRLDUMP_ADDFLAG( 0x10000000, "autosize" );
-                EXC_CTRLDUMP_ENDFLAG( 0xEFFFFFF1 );
-
-                if( nCtrlFlags & 0x00000010 ) EXC_CTRLDUMP_DEC1( "mouseptr" );
-                if( nCtrlFlags & 0x00000020 ) EXC_CTRLDUMP_DEC4( "min" );
-                if( nCtrlFlags & 0x00000040 ) EXC_CTRLDUMP_DEC4( "max" );
-                if( nCtrlFlags & 0x00000080 ) EXC_CTRLDUMP_DEC4( "value" );
-                if( nCtrlFlags & 0x00000100 ) EXC_CTRLDUMP_HEX4( "unknown1" );
-                if( nCtrlFlags & 0x00000200 ) EXC_CTRLDUMP_HEX4( "unknown2" );
-                if( nCtrlFlags & 0x00000400 ) EXC_CTRLDUMP_HEX4( "unknown3" );
-                if( nCtrlFlags & 0x00000800 ) EXC_CTRLDUMP_DEC4( "step" );
-                if( nCtrlFlags & 0x00001000 ) EXC_CTRLDUMP_DEC4( "page-step" );
-                if( nCtrlFlags & 0x00002000 ) EXC_CTRLDUMP_DEC4( "orient" );
-                if( nCtrlFlags & 0x00004000 ) EXC_CTRLDUMP_DEC4( "prop-thumb" );
-                if( nCtrlFlags & 0x00008000 ) EXC_CTRLDUMP_DEC4( "delay" );
-                if( nCtrlFlags & 0x00010000 ) EXC_CTRLDUMP_HEXVAR( nIcon, "icon" );
-
-                if( nCtrlFlags & 0x00000008 ) EXC_CTRLDUMP_SIZE4( "size" );
-                EXC_CTRLDUMP_REMAINING( nStartPos + nSize );
-
-                EXC_CTRLDUMP_IMAGE( nIcon, "icon" );
-            }
-            break;
-
-            case EXC_CTRL_IMAGE:
-            {
-                EXC_CTRLDUMP_STARTFLAG( "content-flags" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0004, "autosize" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0008, "bordercolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0010, "backcolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0020, "borderstyle" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0040, "mouseptr" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0080, "picsizemode" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0100, "speceffect" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0200, "size" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0400, "pic" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0800, "picalign" );
-                EXC_CTRLDUMP_ADDFLAG( 0x1000, "pictiling" );
-                EXC_CTRLDUMP_ADDFLAG( 0x2000, "option" );
-                EXC_CTRLDUMP_ADDFLAG( 0x4000, "icon" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFF8003 );
-                sal_uInt32 nCtrlFlags = nFlags;
-
-                if( nCtrlFlags & 0x0008 ) EXC_CTRLDUMP_HEX4( "bordercolor" );
-                if( nCtrlFlags & 0x0010 ) EXC_CTRLDUMP_HEX4( "backcolor" );
-                if( nCtrlFlags & 0x0020 ) EXC_CTRLDUMP_HEX1( "borderstyle" );
-                if( nCtrlFlags & 0x0040 ) EXC_CTRLDUMP_DEC1( "mouseptr" );
-                if( nCtrlFlags & 0x0080 ) EXC_CTRLDUMP_DEC1( "picsizemode" );
-                if( nCtrlFlags & 0x0100 ) EXC_CTRLDUMP_HEX1( "speceffect" );
-                if( nCtrlFlags & 0x0400 ) EXC_CTRLDUMP_HEXVAR( nPic, "pic" );
-                if( nCtrlFlags & 0x0800 ) EXC_CTRLDUMP_HEX1( "picalign" );
-
-                EXC_CTRLDUMP_STARTOPTFLAG( "option-flags", nCtrlFlags & 0x2000, 0x0000001B );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "enabled" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000008, "opaque" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFFFFF5 );
-
-                if( nCtrlFlags & 0x4000 ) EXC_CTRLDUMP_HEXVAR( nIcon, "icon" );
-
-                if( nCtrlFlags & 0x0200 ) EXC_CTRLDUMP_SIZE4( "size" );
-                EXC_CTRLDUMP_REMAINING( nStartPos + nSize );
-
-                EXC_CTRLDUMP_IMAGE( nPic, "pic" );
-                EXC_CTRLDUMP_IMAGE( nIcon, "icon" );
-            }
-            break;
-
-            case EXC_CTRL_TABSTRIP:
-            {
-                EXC_CTRLDUMP_STARTFLAG( "content-flags" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000001, "selected-tab" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "backcolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000004, "forecolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000010, "size" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000020, "caption-arr-len" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000040, "mouseptr" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000100, "taborientation" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000200, "tabstyle" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000400, "multirow" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000800, "fixed-width" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00001000, "fixed-height" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00008000, "infotip-arr-len" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00020000, "id-arr-len" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00040000, "option" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00080000, "last-id" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00200000, "unknown-arr-len" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00400000, "tab-count" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00800000, "shortcut-arr-len" );
-                EXC_CTRLDUMP_ADDFLAG( 0x01000000, "icon" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFE116088 );
-                sal_uInt32 nCtrlFlags = nFlags;
-
-                sal_uInt32 nTabCount = 0;
-                sal_uInt32 nIdArrLen = 0;
-                sal_uInt32 nUnknownArrLen = 0;
-                sal_uInt32 nShortArrLen = 0;
-
-                if( nCtrlFlags & 0x00000001 ) EXC_CTRLDUMP_DEC4( "selected-tab" );      // size ok?
-                if( nCtrlFlags & 0x00000002 ) EXC_CTRLDUMP_HEX4( "backcolor" );
-                if( nCtrlFlags & 0x00000004 ) EXC_CTRLDUMP_HEX4( "forecolor" );
-                if( nCtrlFlags & 0x00000020 ) EXC_CTRLDUMP_HEXVAR( nCaptionLen, "caption-arr-len" );
-                if( nCtrlFlags & 0x00000040 ) EXC_CTRLDUMP_DEC1( "mouseptr" );          // size ok?
-                if( nCtrlFlags & 0x00000100 ) EXC_CTRLDUMP_DEC4( "taborientation" );    // size ok?
-                if( nCtrlFlags & 0x00000200 ) EXC_CTRLDUMP_DEC4( "tabstyle" );          // size ok?
-                if( nCtrlFlags & 0x00000800 ) EXC_CTRLDUMP_DEC4( "fixed-width" );
-                if( nCtrlFlags & 0x00001000 ) EXC_CTRLDUMP_DEC4( "fixed-height" );
-                if( nCtrlFlags & 0x00008000 ) EXC_CTRLDUMP_HEXVAR( nTipLen, "infotip-arr-len" );
-                if( nCtrlFlags & 0x00020000 ) EXC_CTRLDUMP_HEXVAR( nIdArrLen, "id-arr-len" );
-
-                EXC_CTRLDUMP_STARTOPTFLAG( "option-flags", nCtrlFlags & 0x00040000, 0x0000001B );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "enabled" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFFFFFD );
-
-                if( nCtrlFlags & 0x00080000 ) EXC_CTRLDUMP_DEC4( "last-id" );
-                if( nCtrlFlags & 0x00200000 ) EXC_CTRLDUMP_HEXVAR( nUnknownArrLen, "unknown-arr-len" );
-                if( nCtrlFlags & 0x00400000 ) EXC_CTRLDUMP_DECVAR( nTabCount, "tab-count" );
-                if( nCtrlFlags & 0x00800000 ) EXC_CTRLDUMP_HEXVAR( nShortArrLen, "shortcut-arr-len" );
-                if( nCtrlFlags & 0x01000000 ) EXC_CTRLDUMP_HEXVAR( nIcon, "icon" );
-
-                if( nCtrlFlags & 0x00000010 ) EXC_CTRLDUMP_SIZE4( "size" );
-                if( nCtrlFlags & 0x00000020 ) EXC_CTRLDUMP_STRINGARRAY( nCaptionLen, nTabCount, "caption" );
-                if( nCtrlFlags & 0x00008000 ) EXC_CTRLDUMP_STRINGARRAY( nTipLen, nTabCount, "infotip" );
-                if( nCtrlFlags & 0x00020000 ) EXC_CTRLDUMP_STRINGARRAY( nIdArrLen, nTabCount, "id" );
-                if( nCtrlFlags & 0x00200000 ) EXC_CTRLDUMP_STRINGARRAY( nUnknownArrLen, nTabCount, "unknown" );
-                if( nCtrlFlags & 0x00800000 ) EXC_CTRLDUMP_STRINGARRAY( nShortArrLen, nTabCount, "shortcut" );
-                EXC_CTRLDUMP_REMAINING( nStartPos + nSize );
-
-                EXC_CTRLDUMP_IMAGE( nIcon, "icon" );
-                bHasFontData = true;
-            }
-            break;
-
-            case EXC_CTRL_USERFORM:
-            case EXC_CTRL_FRAME:
-            case EXC_CTRL_MULTIPAGE:
-            case EXC_CTRL_PAGE:
-            {
-                EXC_CTRLDUMP_STARTFLAG( "content-flags" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "backcolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000004, "forecolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000008, "last-id" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000040, "option" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000080, "borderstyle" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000100, "mouseptr" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000200, "scrollbars" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000400, "size" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000800, "scrollsize" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00001000, "scrollpos" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00008000, "icon" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00010000, "cycle" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00020000, "speceffect" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00040000, "bordercolor" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00080000, "caption" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00100000, "font" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00200000, "pic" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00400000, "zoom" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00800000, "picalign" );
-                EXC_CTRLDUMP_ADDFLAG( 0x01000000, "pictiling" );
-                EXC_CTRLDUMP_ADDFLAG( 0x02000000, "picsizemode" );
-                EXC_CTRLDUMP_ADDFLAG( 0x04000000, "typeinfover" );
-                EXC_CTRLDUMP_ADDFLAG( 0x08000000, "drawbuffer" );
-                EXC_CTRLDUMP_ENDFLAG( 0xF0006031 );
-                sal_uInt32 nCtrlFlags = nFlags;
-
-                if( nCtrlFlags & 0x00000002 ) EXC_CTRLDUMP_HEX4( "backcolor" );
-                if( nCtrlFlags & 0x00000004 ) EXC_CTRLDUMP_HEX4( "forecolor" );
-                if( nCtrlFlags & 0x00000008 ) EXC_CTRLDUMP_DEC4( "last-id" );
-
-                EXC_CTRLDUMP_STARTOPTFLAG( "option-flags", nCtrlFlags & 0x00000040, 0x00000002 );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "enabled" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFFFFFD );
-
-                if( nCtrlFlags & 0x00000080 ) EXC_CTRLDUMP_HEX1( "borderstyle" );
-                if( nCtrlFlags & 0x00000100 ) EXC_CTRLDUMP_DEC1( "mouseptr" );
-                if( nCtrlFlags & 0x00000200 ) EXC_CTRLDUMP_HEX1( "scrollbars" );
-                if( nCtrlFlags & 0x00008000 ) EXC_CTRLDUMP_HEXVAR( nIcon, "icon" );
-                if( nCtrlFlags & 0x00010000 ) EXC_CTRLDUMP_DEC1( "cycle" );
-                if( nCtrlFlags & 0x00020000 ) EXC_CTRLDUMP_HEX1( "speceffect" );
-                if( nCtrlFlags & 0x00040000 ) EXC_CTRLDUMP_HEX4( "bordercolor" );
-                if( nCtrlFlags & 0x00080000 ) EXC_CTRLDUMP_DECVARMASK( nCaptionLen, 0x7FFFFFFF, "caption-len" );
-                if( nCtrlFlags & 0x00100000 ) EXC_CTRLDUMP_HEXVAR( nFont, "font" );
-                if( nCtrlFlags & 0x00200000 ) EXC_CTRLDUMP_HEXVAR( nPic, "pic" );
-                if( nCtrlFlags & 0x00400000 ) EXC_CTRLDUMP_DEC4( "zoom" );
-                if( nCtrlFlags & 0x00800000 ) EXC_CTRLDUMP_HEX1( "picalign" );
-                if( nCtrlFlags & 0x02000000 ) EXC_CTRLDUMP_DEC1( "picsizemode" );
-                if( nCtrlFlags & 0x04000000 ) EXC_CTRLDUMP_DEC4( "typeinfover" );
-                if( nCtrlFlags & 0x08000000 ) EXC_CTRLDUMP_DEC4( "drawbuffer" );
-
-                if( nCtrlFlags & 0x00000400 ) EXC_CTRLDUMP_SIZE4( "size" );
-                if( nCtrlFlags & 0x00000800 ) EXC_CTRLDUMP_SIZE4( "scrollsize" );
-                if( nCtrlFlags & 0x00001000 ) EXC_CTRLDUMP_COORD4( "scrollpos" );
-                if( nCtrlFlags & 0x00080000 ) EXC_CTRLDUMP_STRING( nCaptionLen, "caption" );
-                EXC_CTRLDUMP_REMAINING( nStartPos + nSize );
-
-                EXC_CTRLDUMP_FONT( nFont, "font" );
-                EXC_CTRLDUMP_IMAGE( nIcon, "icon" );
-                EXC_CTRLDUMP_IMAGE( nPic, "pic" );
-            }
-            break;
-
-            case EXC_CTRL_FONTDATA:
-            {
-                EXC_CTRLDUMP_STARTFLAG( "content-flags" );
-                EXC_CTRLDUMP_ADDFLAG( 0x01, "font-name" );
-                EXC_CTRLDUMP_ADDFLAG( 0x02, "font-style" );
-                EXC_CTRLDUMP_ADDFLAG( 0x04, "font-size" );
-                EXC_CTRLDUMP_ADDFLAG( 0x10, "language-id" );
-                EXC_CTRLDUMP_ADDFLAG( 0x40, "align" );
-                EXC_CTRLDUMP_ADDFLAG( 0x80, "font-weight" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFFFF08 ); // 0x20 always set?
-                sal_uInt32 nCtrlFlags = nFlags;
-
-                if( nCtrlFlags & 0x0001 ) EXC_CTRLDUMP_DECVARMASK( nNameLen, 0x7FFFFFFF, "font-name-len" );
-
-                EXC_CTRLDUMP_STARTOPTFLAG( "font-style-flags", nCtrlFlags & 0x0002, 0x40000000 );
-                EXC_CTRLDUMP_ADDFLAG( 0x0001, "bold" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0002, "italic" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0004, "underline" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0008, "strikeout" );
-                EXC_CTRLDUMP_ADDFLAG( 0x2000, "sunken" );
-                EXC_CTRLDUMP_ENDFLAG( 0xBFFFDFF0 ); // 0x40000000 always set?
-
-                if( nCtrlFlags & 0x0004 ) EXC_CTRLDUMP_DEC4( "font-size" );
-                if( nCtrlFlags & 0x0010 ) EXC_CTRLDUMP_HEX2( "language-id" );
-                if( nCtrlFlags & 0x0040 )
-                {
-                    EXC_CTRLDUMP_ALIGN_INSTRM( 2 );
-                    sal_uInt16 nAlign; rInStrm >> nAlign;
-                    t += "  align="; lclAppendDec( t, nAlign );
-                    switch( nAlign )
-                    {
-                        case 1: t += "=left";   break;
-                        case 2: t += "=right";  break;
-                        case 3: t += "=center"; break;
-                        default: t += "=!unknown!";
-                    }
-                    EXC_CTRLDUMP_PRINT();
-                }
-                if( nCtrlFlags & 0x0080 ) EXC_CTRLDUMP_DEC2( "font-weight" );
-
-                if( nCtrlFlags & 0x0001 ) EXC_CTRLDUMP_STRING( nNameLen, "font-name" );
-                EXC_CTRLDUMP_REMAINING( nStartPos + nSize );
-            }
-            break;
-
-            case EXC_CTRL_ADDDATA:
-            {
-                EXC_CTRLDUMP_STARTFLAG( "content-flags" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0001, "guid1" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0002, "guid2" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0008, "guid4" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0040, "unknown1" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFFFFB4 );
-                sal_uInt32 nCtrlFlags = nFlags;
-
-                if( nCtrlFlags & 0x0040 ) EXC_CTRLDUMP_HEX4( "unknown1" );
-
-                if( nCtrlFlags & 0x0001 ) EXC_CTRLDUMP_GUID( "guid1" );
-                if( nCtrlFlags & 0x0002 ) EXC_CTRLDUMP_GUID( "guid2" );
-                if( nCtrlFlags & 0x0008 ) EXC_CTRLDUMP_GUID( "guid4" );
-                EXC_CTRLDUMP_REMAINING( nStartPos + nSize );
-            }
-            break;
-
-            case EXC_CTRL_FRAMECHILD:
-            {
-                EXC_CTRLDUMP_STARTFLAG( "content-flags" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0001, "name-len" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0002, "tag-len" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0004, "storage-id" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0008, "helpcontext-id" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0010, "option" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0020, "substream-len" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0040, "tabpos" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0080, "type" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0100, "pos" );
-                EXC_CTRLDUMP_ADDFLAG( 0x0800, "tiptext" );
-                EXC_CTRLDUMP_ADDFLAG( 0x1000, "ctrl-id" );
-                EXC_CTRLDUMP_ADDFLAG( 0x2000, "ctrl-source" );
-                EXC_CTRLDUMP_ADDFLAG( 0x4000, "row-source" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFF8600 );
-                sal_uInt32 nCtrlFlags = nFlags;
-
-                sal_uInt32 nStorageId = 0;
-                sal_uInt32 nSubStrmLen = 0;
-                sal_uInt16 nChildType = EXC_CTRL_UNKNOWN;
-
-                if( nCtrlFlags & 0x0001 ) EXC_CTRLDUMP_DECVARMASK( nNameLen, 0x7FFFFFFF, "name-len" );
-                if( nCtrlFlags & 0x0002 ) EXC_CTRLDUMP_DECVARMASK( nTagLen, 0x7FFFFFFF, "tag-len" );
-                if( nCtrlFlags & 0x0004 ) EXC_CTRLDUMP_PLAIN_DECVAR( nStorageId, "storage-id" );
-                if( nCtrlFlags & 0x0008 ) EXC_CTRLDUMP_PLAIN_DEC4( "helpcontext-id" );
-
-                EXC_CTRLDUMP_STARTOPTFLAG( "option-flags", nCtrlFlags & 0x0010, 0x00000033 );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000001, "tabstop" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00000002, "visible" );
-                EXC_CTRLDUMP_ADDFLAG( 0x00040000, "container" );
-                EXC_CTRLDUMP_ENDFLAG( 0xFFFBFFFC );
-
-                if( nCtrlFlags & 0x0020 ) EXC_CTRLDUMP_HEXVAR( nSubStrmLen, "substream-len" );
-                if( nCtrlFlags & 0x0040 ) EXC_CTRLDUMP_DEC2( "tabpos" );
-                if( nCtrlFlags & 0x0080 ) EXC_CTRLDUMP_CTRLTYPE( nChildType, "type" );
-                if( nCtrlFlags & 0x0800 ) EXC_CTRLDUMP_DECVARMASK( nTipLen, 0x7FFFFFFF, "infotip-len" );
-                if( nCtrlFlags & 0x1000 ) EXC_CTRLDUMP_DECVARMASK( nCtrlIdLen, 0x7FFFFFFF, "ctrl-id-len" );
-                if( nCtrlFlags & 0x2000 ) EXC_CTRLDUMP_DECVARMASK( nCtrlSrcLen, 0x7FFFFFFF, "ctrl-source-len" );
-                if( nCtrlFlags & 0x4000 ) EXC_CTRLDUMP_DECVARMASK( nRowSrcLen, 0x7FFFFFFF, "row-source-len" );
-
-                if( nCtrlFlags & 0x0001 ) EXC_CTRLDUMP_STRING( nNameLen, "name" );
-                if( nCtrlFlags & 0x0002 ) EXC_CTRLDUMP_STRING( nTagLen, "tag" );
-                if( nCtrlFlags & 0x0100 ) EXC_CTRLDUMP_COORD4( "pos" );
-                if( nCtrlFlags & 0x0800 ) EXC_CTRLDUMP_STRING( nTipLen, "infotip" );
-                if( nCtrlFlags & 0x1000 ) EXC_CTRLDUMP_STRING( nCtrlIdLen, "ctrl-id" );
-                if( nCtrlFlags & 0x2000 ) EXC_CTRLDUMP_STRING( nCtrlSrcLen, "ctrl-source" );
-                if( nCtrlFlags & 0x4000 ) EXC_CTRLDUMP_STRING( nRowSrcLen, "row-source" );
-                EXC_CTRLDUMP_REMAINING( nStartPos + nSize );
-
-                if( (nCtrlFlags & 0x0080) && (nChildType != EXC_CTRL_UNKNOWN) )
-                {
-                    if( (nFlags & 0x00040000) && (nStorageId > 0) )
-                        maCtrlStorages.push_back( XclDumpCtrlPortion( nStorageId, nChildType ) );
-                    if( (nCtrlFlags & 0x0020) && (nSubStrmLen > 0) )
-                        maCtrlPortions.push_back( XclDumpCtrlPortion( nSubStrmLen, nChildType ) );
-                }
-            }
-            break;
-
-            default:
-                EXC_CTRLDUMP_REMAINING( nStartPos + nSize );
-        }
-
-        // font data
-        if( bHasFontData )
-            DumpControlContents( rInStrm, EXC_CTRL_FONTDATA );
-    }
-}
-
-// ============================================================================
-//
-//  S T R E A M S
-//
-// ============================================================================
-
-void Biff8RecDumper::DumpBinaryStream( SotStorageRef xStrg, const String& rStrmName, const String& rStrgPath )
-{
-    SotStorageStreamRef xInStrm = OpenStream( xStrg, rStrmName );
-    if( !xInStrm || !pDumpStream ) return;
-
-    XclDumpStreamHeader aStrmHeader( *xInStrm, *pDumpStream, rStrmName, rStrgPath );
-    DumpBinary( *xInStrm );
-    (*pDumpStream) << "\n";
-}
-
-void Biff8RecDumper::DumpTextStream( SotStorageRef xStrg, const String& rStrmName, const String& rStrgPath )
-{
-    SotStorageStreamRef xInStrm = OpenStream( xStrg, rStrmName );
-    if( !xInStrm || !pDumpStream ) return;
-
-    XclDumpStreamHeader aStrmHeader( *xInStrm, *pDumpStream, rStrmName, rStrgPath );
-    while( xInStrm->Tell() < aStrmHeader.GetStreamLen() )
-    {
-        ByteString aLine;
-        xInStrm->ReadLine( aLine );
-        lclDumpString( *pDumpStream, aLine );
-        (*pDumpStream) << "\n";
-    }
-    (*pDumpStream) << "\n";
-}
-
-void Biff8RecDumper::DumpRecordStream( SotStorageRef xStrg, const String& rStrmName, const String& rStrgPath )
-{
-    SotStorageStreamRef xInStrm = OpenStream( xStrg, rStrmName );
-    if( !xInStrm || !pDumpStream ) return;
-
-    XclDumpStreamHeader aStrmHeader( *xInStrm, *pDumpStream, rStrmName, rStrgPath );
-
-    XclImpStream* pOldStream = pIn;
-    pIn = new XclImpStream( *xInStrm, GetRoot() );
-    XclImpStream& rIn = *pIn;
-    if( pOldStream )
-        rIn.CopyDecrypterFrom( *pOldStream );
-
-    // -- dump from here --
-    UINT16  nId;
-    BOOL bLoop = TRUE;
-
-    while( bLoop && rIn.StartNextRecord() )
-    {
-        nId = rIn.GetRecId();
-        if( HasModeDump( nId ) )
-            RecDump( TRUE );
-
-        bLoop = (nId != 0x000A);
-    }
-
-    delete pIn;
-    pIn = pOldStream;
-}
-
-void Biff8RecDumper::DumpCtlsStream()
-{
-    SotStorageStreamRef xInStrm = OpenStream( EXC_STREAM_CTLS );
-    if( !xInStrm || !pDumpStream ) return;
-
-    SvStream& rInStrm = *xInStrm;
-    SvStream& rOutStrm = *pDumpStream;
-    XclDumpStreamHeader aStrmHeader( rInStrm, rOutStrm, EXC_STREAM_CTLS, EMPTY_STRING );
-
-    for( StrmPortionMap::const_iterator aIt = maCtlsPosMap.begin(), aEnd = maCtlsPosMap.end(); aIt != aEnd; ++aIt )
-    {
-        ULONG nCtrlPos = static_cast< ULONG >( aIt->first );
-        ULONG nCtrlEnd = nCtrlPos + static_cast< ULONG >( aIt->second );
-        if( nCtrlEnd <= aStrmHeader.GetStreamLen() )
-        {
-            // stream position
-            ULONG nStartPos = nCtrlPos;     // for stream alignment macro
-            rInStrm.Seek( nStartPos );
-
-            ByteString t( "\npos=" );   __AddHex( t, aIt->first );
-            t.Append( "  len=" );       __AddHex( t, aIt->second );
-            rOutStrm << t.GetBuffer() << "  ";
-
-            // control type
-            sal_uInt16 nCtrlType = lclDumpControlGuid( rInStrm, rOutStrm );
-            rOutStrm << "\n";
-
-            // control contents
-            if( nCtrlType != EXC_CTRL_UNKNOWN )
-                DumpControlContents( rInStrm, nCtrlType );
-
-            // remaining unknown data
-            EXC_CTRLDUMP_REMAINING( nCtrlEnd );
-            rOutStrm << "\n";
-        }
-    }
-}
-
-void Biff8RecDumper::DumpControlFrameStream( SotStorageRef xInStrg, sal_uInt16 nCtrlType, const String& rStrgPath )
-{
-    static const String saStrmName( sal_Unicode( 'f' ) );
-
-    SotStorageStreamRef xInStrm = OpenStream( xInStrg, saStrmName );
-    if( !xInStrm || !pDumpStream ) return;
-
-    SvStream& rInStrm = *xInStrm;
-    SvStream& rOutStrm = *pDumpStream;
-    XclDumpStreamHeader aStrmHeader( rInStrm, rOutStrm, saStrmName, rStrgPath );
-
-    if( aStrmHeader.GetStreamLen() > 0 )
-    {
-        ByteString t;               // "t" needed for macros
-
-        rOutStrm << "header-record\n";
-        DumpControlContents( rInStrm, nCtrlType );
-        rOutStrm << "\n";
-
-        if( nCtrlType == EXC_CTRL_USERFORM )
-        {
-            rOutStrm << "add-records\n";
-            sal_uInt16 nAddCount;
-            EXC_CTRLDUMP_PLAIN_DECVAR( nAddCount, "count" );
-            EXC_CTRLDUMP_PRINT();
-            rOutStrm << "\n";
-
-            for( sal_uInt16 nAdd = 0; (nAdd < nAddCount) && (rInStrm.Tell() < aStrmHeader.GetStreamLen()); ++nAdd )
-            {
-                DumpControlContents( rInStrm, EXC_CTRL_ADDDATA );
-                rOutStrm << "\n";
-            }
-        }
-
-        rOutStrm << "children-records\n";
-        sal_uInt32 nRecCount, nTotalSize;
-        EXC_CTRLDUMP_PLAIN_DECVAR( nRecCount, "count" );
-        EXC_CTRLDUMP_PLAIN_HEXVAR( nTotalSize, "total-size" );
-        if( nTotalSize > 0 )
-        {
-            EXC_CTRLDUMP_PLAIN_HEX4( "header-unknown" );
-            rOutStrm << "\n";
-
-            for( sal_uInt32 nRec = 0; (nRec < nRecCount) && (rInStrm.Tell() < aStrmHeader.GetStreamLen()); ++nRec )
-            {
-                DumpControlContents( rInStrm, EXC_CTRL_FRAMECHILD );
-                rOutStrm << "\n";
-            }
-        }
-        else
-            rOutStrm << "\n";
-
-        if( rInStrm.Tell() < aStrmHeader.GetStreamLen() )
-        {
-            rOutStrm << "remaining=\n";
-            DumpBinary( rInStrm );
-            rOutStrm << "\n";
-        }
-    }
-}
-
-void Biff8RecDumper::DumpControlObjectsStream( SotStorageRef xInStrg, const String& rStrgPath )
-{
-    static const String saStrmName( sal_Unicode( 'o' ) );
-
-    SotStorageStreamRef xInStrm = OpenStream( xInStrg, saStrmName );
-    if( !xInStrm || !pDumpStream ) return;
-
-    SvStream& rInStrm = *xInStrm;
-    SvStream& rOutStrm = *pDumpStream;
-    XclDumpStreamHeader aStrmHeader( rInStrm, rOutStrm, saStrmName, rStrgPath );
-
-    if( aStrmHeader.GetStreamLen() > 0 )
-    {
-        ULONG nStrmPos = 0;
-        for( XclDumpCtrlPortionVec::const_iterator aIt = maCtrlPortions.begin(), aEnd = maCtrlPortions.end(); aIt != aEnd; ++aIt )
-        {
-            rInStrm.Seek( nStrmPos );
-            DumpControlContents( rInStrm, aIt->second );
-            rOutStrm << "\n";
-            nStrmPos += aIt->first;
-        }
-
-        if( rInStrm.Tell() < aStrmHeader.GetStreamLen() )
-        {
-            rOutStrm << "remaining=\n";
-            DumpBinary( rInStrm );
-            rOutStrm << "\n";
-        }
-    }
-}
-
-// ============================================================================
-//
-//  S T O R A G E S
-//
-// ============================================================================
-
-void Biff8RecDumper::DumpAnyStorage( SotStorageRef xParentStrg, const String& rStrgName, const String& rStrgPath )
-{
-    SotStorageRef xInStrg = OpenStorage( xParentStrg, rStrgName );
-    if( !xInStrg || !pDumpStream ) return;
-
-    XclDumpStorageHeader aStrgHeader( *xInStrg, *pDumpStream, rStrgPath );
-}
-
-void Biff8RecDumper::DumpUserFormStorage( SotStorageRef xParentStrg, const String& rStrgName, sal_uInt16 nCtrlType, const String& rStrgPath )
-{
-    SotStorageRef xInStrg = OpenStorage( xParentStrg, rStrgName );
-    if( !xInStrg || !pDumpStream ) return;
-
-    XclDumpStorageHeader aStrgHeader( *xInStrg, *pDumpStream, rStrgPath );
-
-    // streams
-    maCtrlStorages.clear();
-    maCtrlPortions.clear();
-    DumpControlFrameStream( xInStrg, nCtrlType, rStrgPath );
-    DumpControlObjectsStream( xInStrg, rStrgPath );
-    DumpTextStream( xInStrg, CREATE_STRING( "\003VBFrame" ), rStrgPath );
-
-    // frame substorages
-    XclDumpCtrlPortionVec aCtrlStorages( maCtrlStorages );  // make local copy, maCtrlStorages is reused in loop
-    for( XclDumpCtrlPortionVec::const_iterator aIt = aCtrlStorages.begin(), aEnd = aCtrlStorages.end(); aIt != aEnd; ++aIt )
-    {
-        sal_uInt32 nStorageId = aIt->first;
-        String aSubName( sal_Unicode( 'i' ) );
-        if( nStorageId < 10 )
-            aSubName.Append( sal_Unicode( '0' ) );
-        aSubName.Append( String::CreateFromInt32( static_cast< sal_Int32 >( nStorageId ) ) );
-
-        String aPath( rStrgPath );
-        aPath.Append( sal_Unicode( '/' ) ).Append( rStrgName );
-
-        DumpUserFormStorage( xInStrg, aSubName, aIt->second, aPath );
-    }
-}
-
-void Biff8RecDumper::DumpVbaProjectStorage()
-{
-    SotStorageRef xInStrg = OpenStorage( EXC_STORAGE_VBA_PROJECT );
-    if( !xInStrg || !pDumpStream ) return;
-
-    XclDumpStorageHeader aStrgHeader( *xInStrg, *pDumpStream, EMPTY_STRING );
-    // PROJECT substream
-    DumpTextStream( xInStrg, CREATE_STRING( "PROJECT" ), EXC_STORAGE_VBA_PROJECT );
-    // VBA storage
-    DumpAnyStorage( xInStrg, EXC_STORAGE_VBA, EXC_STORAGE_VBA_PROJECT );
-    // user forms
-    SvStorageInfoList aInfoList;
-    xInStrg->FillInfoList( &aInfoList );
-    for( ULONG nInfo = 0; nInfo < aInfoList.Count(); ++nInfo )
-    {
-        SvStorageInfo& rInfo = aInfoList.GetObject( nInfo );
-        if( rInfo.IsStorage() && (rInfo.GetName() != EXC_STORAGE_VBA) )
-            DumpUserFormStorage( xInStrg, rInfo.GetName(), EXC_CTRL_USERFORM, EXC_STORAGE_VBA_PROJECT );
-    }
-}
-
-// ============================================================================
-//
-// ============================================================================
-
-const sal_Char* Biff8RecDumper::GetBlanks( const UINT16 nNumOfBlanks )
-{
-    DBG_ASSERT( pBlankLine, "-Biff8RecDumper::GetBlanks(): nicht so schnell mein Freund!" );
-    DBG_ASSERT( nNumOfBlanks <= nLenBlankLine,
-        "+Biff8RecDumper::GetBlanks(): So viel kannst Du nicht von mir verlangen!" );
-
-    return pBlankLine + ( ( nNumOfBlanks <= nLenBlankLine )? ( nLenBlankLine - nNumOfBlanks ) : 0 );
-}
-
-
-BOOL Biff8RecDumper::IsLineEnd( const sal_Char c, sal_Char& rNext, SvStream& rIn, INT32& rLeft )
-{
-    static const sal_Char	cNL = '\n';
-    static const sal_Char	cRET = '\r';
-
-    if( IsEndOfLine( c ) )
-    {
-        sal_Char	cDouble = ( c == cNL )? cRET : cNL;
-
-        if( rNext == cDouble )
-        {
-            rIn >> rNext;
-            rLeft--;
-        }
-
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
-
-
-_KEYWORD Biff8RecDumper::GetKeyType( const ByteString& r )
-{
-    ByteString		t( r );
-    _KEYWORD	e;
-
-    t.ToUpperAscii();
-
-    if( t == "SKIPDUMP" )
-        e = Skipdump;
-    else if( t == "SKIPOFFSET" )
-        e = SkipOffset;
-    else if( t == "READCONTRECS" )
-        e = ReadContRecs;
-    else if( t == "NOWARNINGS" )
-        e = NoWarnings;
-    else if( t == "CONTLOAD" )
-        e = Contload;
-    else if( t == "BLANKLINE" )
-        e = BlankLine;
-    else if( t == "EXPORTBOOKSTREAM" )
-        e = ExportBookStream;
-    else if( t == "PARSEP" )
-        e = Parsep;
-    else if( t == "MAXBODYLINES" )
-        e = Maxbodylines;
-    else if( t == "INCLUDE" || t == "+" )
-        e = Include;
-    else if( t == "EXCLUDE" || t == "-" )
-        e = Exclude;
-    else if( t == "HEX" || t == "H" )
-        e = Hex;
-    else if( t == "BODY" || t == "B" )
-        e = Body;
-    else if( t == "NAMEONLY" || t =="N" )
-        e = NameOnly;
-    else if( t == "COMMENT" )
-        e = Comment;
-    else if( t == "OUTPUT" )
-        e = Output;
-    else if( t == "TITLE" )
-        e = Title;
-    else if( t == "CLEARFILE" )
-        e = ClearFile;
-    else
-        e = KW_Unknown;
-
-    return e;
-}
-
-
-void Biff8RecDumper::Init( void )
-{
-    bClearFile = FALSE;
-
-    if( pDumpModes || ppRecNames )
-        return;
-
-    const sal_Char*		pDefName = "biffrecdumper.ini";
-    const sal_Char*		pIniKey = "BIFFRECDUMPERINI";
-    const sal_Char      pPathSep[] = { SAL_PATHDELIMITER, '\0' };
-    ByteString			aIniName;
-
-    SvFileStream*		pIn = NULL;
-
-    // first try: search for biffrecdumper.ini in dir, specified  in %HOME%
-    const sal_Char*		pHome = getenv( "HOME" );
-    if( pHome )
-    {
-        aIniName = pHome;
-        aIniName.EraseTrailingChars( *pPathSep );
-        aIniName += pPathSep;
-        aIniName += pDefName;
-
-        pIn = CreateInStream( aIniName.GetBuffer() );
-    }
-
-    if( !pIn )
-    {	// %HOME% not set or %HOME%\biffrecdumper.ini could not be opened
-        const sal_Char*	pIni = getenv( pIniKey );
-        if( pIni )
-        {
-            pIn = CreateInStream( pIni );
-            if( !pIn )
-            {
-                AddError( 0, "Could not open ini file", ByteString( pIni ) );
-                bEndLoading = TRUE;		// zur Sicherheit....
-            }
-        }
-    }
-
-    if( pIn )
-    {
-        pIn->Seek( STREAM_SEEK_TO_END );
-
-        const UINT32	nStreamLen = pIn->Tell();
-
-        if( nStreamLen <= 1 )
-        {
-            pIn->Close();
-            delete pIn;
-            return;
-        }
-
-        pIn->Seek( STREAM_SEEK_TO_BEGIN );
-
-        pDumpModes = new UINT16[ nRecCnt ];
-        ppRecNames = new ByteString*[ nRecCnt ];
-
-        memset( pDumpModes, 0x00, sizeof( UINT16 ) * nRecCnt );
-        memset( ppRecNames, 0x00, sizeof( ByteString* )* nRecCnt );
-
-        enum STATE	{ PreLine, InCommand, PostCommand, InId, PostEqu,
-                        InVal, InName, InInExClude, InBodyMode, PostSepIEC,
-                        PostSepBM, InComment };
-
-        STATE		eAct = PreLine;
-        sal_Char	c;
-        sal_Char	cNext;
-        INT32		n = ( INT32 ) nStreamLen;
-        ByteString	aCommand;
-        ByteString	aVal;
-        ByteString	aInExClude;
-        ByteString	aHexBody;
-        UINT32		nLine = 1;
-        BOOL        bCommand = FALSE;
-
-        *pIn >> c >> cNext;
-
-        while( n > 0 )
-        {
-            n--;
-
-            switch( eAct )
-            {
-                case PreLine:
-                    if( IsAlphaNum( c ) )
-                    {
-                        if( IsNum( c ) )
-                        {
-                            eAct = InId;
-                            bCommand = FALSE;
-                        }
-                        else
-                        {
-                            eAct = InCommand;
-                            bCommand = TRUE;
-                        }
-                        aCommand.Erase();
-                        aCommand += c;
-                    }
-                    else if( c == cComm1 && cNext == cComm2 )
-                        eAct = InComment;
-                    else if( IsLineEnd( c, cNext, *pIn, n ) )
-                        nLine++;
-                    else if( !IsBlank( c ) )
-                    {
-                        AddError( nLine, "Unexpected command or id" );
-                        n = 0;
-                    }
-                    break;
-                case InCommand:
-                    if( c == '=' )
-                    {
-                        eAct = PostEqu;
-                        aVal.Erase();
-                    }
-                    else if( IsAlpha( c ) )
-                        aCommand += c;
-                    else if( IsBlank( c ) )
-                        eAct = PostCommand;
-                    else if( IsLineEnd( c, cNext, *pIn, n ) )
-                    {
-                        if( ExecCommand( nLine, aCommand ) )
-                        {
-                            eAct = PreLine;
-                            nLine++;
-                        }
-                        else
-                            n = 0;
-                    }
-                    else if( c == cComm1 && cNext == cComm2 )
-                    {
-                        if( ExecCommand( nLine, aCommand ) )
-                            eAct = InComment;
-                        else
-                        {
-                            AddError( nLine, "Invalid command before comment", aCommand );
-                            n = 0;
-                        }
-                    }
-                    else
-                    {
-                        aCommand += '>';
-                        aCommand += c;
-                        aCommand += '<';
-                        AddError( nLine, "Invalid character in command or id", aCommand );
-                        n = 0;
-                    }
-                    break;
-                case PostCommand:
-                    if( c == '=' )
-                    {
-                        eAct = PostEqu;
-                        aVal.Erase();
-                    }
-                    else if( IsLineEnd( c, cNext, *pIn, n ) )
-                    {
-                        if( ExecCommand( nLine, aCommand ) )
-                        {
-                            eAct = PreLine;
-                            nLine++;
-                        }
-                        else
-                            n = 0;
-                    }
-                    else if( c == cComm1 && cNext == cComm2 )
-                    {
-                        if( ExecCommand( nLine, aCommand ) )
-                            eAct = InComment;
-                        else
-                        {
-                            AddError( nLine, "Invalid command before comment", aCommand );
-                            n = 0;
-                        }
-                    }
-                    else if( !IsBlank( c ) )
-                    {
-                        AddError( nLine, "Expecting blank or \'=\' following the command", aCommand );
-                        n = 0;
-                    }
-                    break;
-                case InId:
-                    if( c == '=' )
-                    {
-                        eAct = PostEqu;
-                        aVal.Erase();
-                    }
-                    else if( IsAlphaNum( c ) )
-                        aCommand += c;
-                    else if( IsBlank( c ) )
-                        eAct = PostCommand;
-                    else if( ( c == cComm1 && cNext == cComm2 ) || IsLineEnd( c, cNext, *pIn, n ) )
-                    {
-                        AddError( nLine, "Unexpected end of record id", aCommand );
-                        eAct = InComment;
-                    }
-                    else
-                    {
-                        AddError( nLine, "Unexpected sal_Char in record id", aCommand );
-                        n = 0;
-                    }
-                    break;
-                case PostEqu:
-                    if( bCommand )
-                    {	// Command
-                        if( c == cComm1 && cNext == cComm2 )
-                        {
-                            if( ExecCommand( nLine, aCommand ) )
-                                eAct = InComment;
-                            else
-                            {
-                                AddError( nLine, "Unknown command", aCommand );
-                                n = 0;
-                            }
-                        }
-                        else if( IsLineEnd( c, cNext, *pIn, n ) )
-                        {
-                            if( ExecCommand( nLine, aCommand ) )
-                            {
-                                eAct = PreLine;
-                                nLine++;
-                            }
-                            else
-                            {
-                                AddError( nLine, "Unknown command", aCommand );
-                                n = 0;
-                            }
-                        }
-                        else if( !bCommand && c == cParSep )
-                            eAct = PostSepIEC;
-                        else if( !IsBlank( c ) )
-                        {
-                            aVal.Erase();
-                            aVal += c;
-                            eAct = InVal;
-                        }
-                    }
-                    else
-                    {	// Set
-                        if( ( c == cComm1 && cNext == cComm2 ) || IsLineEnd( c, cNext, *pIn, n ) )
-                        {
-                            AddError( nLine, "No mode set for record", aCommand );
-                            n = 0;
-                        }
-                        else if( !bCommand && c == cParSep )
-                            eAct = PostSepIEC;
-                        else
-                        {
-                            aVal.Erase();
-                            aVal += c;
-                            eAct = InName;
-                            aInExClude.Erase();
-                            aHexBody.Erase();
-                        }
-                    }
-                    break;
-                case InVal:
-                    if( c == cComm1 && cNext == cComm2 )
-                    {
-                        if( ExecCommand( nLine, aCommand, &aVal ) )
-                            eAct = InComment;
-                        else
-                        {
-                            AddError( nLine, "Unknown command", aCommand );
-                            n = 0;
-                        }
-                    }
-                    else if( IsLineEnd( c, cNext, *pIn, n ) )
-                    {
-                        if( ExecCommand( nLine, aCommand, &aVal ) )
-                        {
-                            eAct = PreLine;
-                            nLine++;
-                        }
-                        else
-                        {
-                            AddError( nLine, "Unknown command", aCommand );
-                            n = 0;
-                        }
-                    }
-                    else
-                        aVal += c;
-                    break;
-                case InName:
-                    if( c == cParSep )
-                        eAct = PostSepIEC;
-                    else if( c == cComm1 && cNext == cComm2 )
-                    {
-                        if( ExecSetVal( nLine, aCommand, &aVal, NULL, NULL ) )
-                            eAct = InComment;
-                        else
-                            n = 0;
-                    }
-                    else if( IsLineEnd( c, cNext, *pIn, n ) )
-                    {
-                        if( ExecSetVal( nLine, aCommand, &aVal, NULL, NULL ) )
-                        {
-                            eAct = PreLine;
-                            nLine++;
-                        }
-                        else
-                            n = 0;
-                    }
-                    else
-                        aVal += c;
-                    break;
-                case InInExClude:
-                    if( c == cParSep )
-                        eAct = PostSepBM;
-                    else if( c == cComm1 && cNext == cComm2 )
-                    {
-                        if( ExecSetVal( nLine, aCommand, &aVal, &aInExClude, NULL ) )
-                            eAct = InComment;
-                        else
-                            n = 0;
-                    }
-                    else if( IsLineEnd( c, cNext, *pIn, n ) )
-                    {
-                        if( ExecSetVal( nLine, aCommand, &aVal, &aInExClude, NULL ) )
-                        {
-                            eAct = PreLine;
-                            nLine++;
-                        }
-                        else
-                            n = 0;
-                    }
-                    else
-                        aInExClude += c;
-                    break;
-                case InBodyMode:
-                    if( c == cParSep )
-                    {
-                        AddError( nLine, "Only 3 parameter possible" );
-                        n = 0;
-                    }
-                    else if( c == cComm1 && cNext == cComm2 )
-                    {
-                        if( ExecSetVal( nLine, aCommand, &aVal, &aInExClude, &aHexBody ) )
-                            eAct = InComment;
-                        else
-                            n = 0;
-                    }
-                    else if( IsLineEnd( c, cNext, *pIn, n ) )
-                    {
-                        if( ExecSetVal( nLine, aCommand, &aVal, &aInExClude, &aHexBody ) )
-                        {
-                            eAct = PreLine;
-                            nLine++;
-                        }
-                        else
-                            n = 0;
-                    }
-                    else
-                        aInExClude += c;
-                    break;
-                case PostSepIEC:
-                    if( c == cParSep )
-                        eAct = PostSepBM;
-                    else if( c == cComm1 && cNext == cComm2 )
-                    {
-                        if( ExecSetVal( nLine, aCommand, &aVal, NULL, NULL ) )
-                            eAct = InComment;
-                        else
-                            n = 0;
-                    }
-                    else if( IsLineEnd( c, cNext, *pIn, n ) )
-                    {
-                        if( ExecSetVal( nLine, aCommand, &aVal, NULL, NULL ) )
-                        {
-                            eAct = PreLine;
-                            nLine++;
-                        }
-                        else
-                            n = 0;
-                    }
-                    else if( !IsBlank( c ) )
-                    {
-                        aInExClude += c;
-                        eAct = InInExClude;
-                    }
-                    break;
-                case PostSepBM:
-                    if( c == cParSep )
-                        eAct = PostSepBM;
-                    else if( c == cComm1 && cNext == cComm2 )
-                    {
-                        if( ExecSetVal( nLine, aCommand, &aVal, &aInExClude, NULL ) )
-                            eAct = InComment;
-                        else
-                            n = 0;
-                    }
-                    else if( IsLineEnd( c, cNext, *pIn, n ) )
-                    {
-                        if( ExecSetVal( nLine, aCommand, &aVal, &aInExClude, NULL ) )
-                        {
-                            eAct = PreLine;
-                            nLine++;
-                        }
-                        else
-                            n = 0;
-                    }
-                    else if( !IsBlank( c ) )
-                    {
-                        aHexBody += c;
-                        eAct = InBodyMode;
-                    }
-                    break;
-                case InComment:
-                    if( IsLineEnd( c, cNext, *pIn, n ) )
-                    {
-                        eAct = PreLine;
-                        nLine++;
-                    }
-                    break;
-                default:
-                    n = 0;
-            }
-
-            c = cNext;
-            *pIn >> cNext;
-        }
-
-        pIn->Close();
-        delete pIn;
-    }
-}
-
-
-BOOL Biff8RecDumper::ExecCommand( const UINT32 nL, const ByteString& r, const ByteString* pVal )
-{
-    _KEYWORD						e = GetKeyType( r );
-    BOOL							b = TRUE;
-    const UINT32					nValLen = ( pVal )? pVal->Len() : 0;
-    BOOL							bSet;
-    UINT16							nMode;
-
-    switch( e )
-    {
-        case Skipdump:          bSkip = TRUE;               break;
-        case SkipOffset:        bSkipOffset = TRUE;         break;
-        case ReadContRecs:      bReadContRecs = TRUE;       break;
-        case NoWarnings:        bWarnings = FALSE;          break;
-        case Contload:          bEndLoading = TRUE;         break;
-        case BlankLine:         bBlankLine = TRUE;          break;
-        case ExportBookStream:  bExportBookStream = TRUE;   break;
-        case Parsep:
-            if( nValLen == 0 )
-            {
-                AddError( nL, "No separator found" );
-                b = FALSE;
-            }
-            else if( nValLen == 1 )
-                cParSep = *( pVal->GetBuffer() );
-            else
-            {
-                AddError( nL, "More than 1 sal_Char is not valid for separator", *pVal );
-                b = FALSE;
-            }
-            break;
-        case Maxbodylines:
-            if( nValLen )
-            {
-                UINT32				n = GetVal( *pVal );
-
-                if( n == 0xFFFFFFFF )
-                {
-                    AddError( nL, "Syntax error in value of body lines" );
-                    b = FALSE;
-                }
-                else
-                    nMaxBodyLines = n;
-            }
-            else
-            {
-                AddError( nL, "No value specified for number of body lines" );
-                b = FALSE;
-            }
-            break;
-        case Include:
-            bSet = FALSE;
-            nMode = MODE_SKIP;
-            goto _common;
-        case Exclude:
-            bSet = TRUE;
-            nMode = MODE_SKIP;
-            goto _common;
-        case Hex:
-            bSet = TRUE;
-            nMode = MODE_HEX;
-            goto _common;
-        case Body:
-            bSet = FALSE;
-            nMode = MODE_HEX;
-            goto _common;
-        case NameOnly:
-            bSet = TRUE;
-            nMode = MODE_NAMEONLY;
-            goto _common;
-_common:
-            if( pVal )
-            {
-                IdRangeList			aRL;
-                if( FillIdRangeList( nL, aRL, *pVal ) )
-                {
-                    const IdRange*	p = aRL.First();
-                    if( bSet )
-                    {
-                        while( p )
-                        { SetFlag( p->nFirst, p->nLast, nMode );	p = aRL.Next(); }
-                    }
-                    else
-                    {
-                        while( p )
-                        { ClrFlag( p->nFirst, p->nLast, nMode );	p = aRL.Next(); }
-                    }
-                }
-                else
-                    b = FALSE;
-            }
-            break;
-        case Comment:
-            if( pVal && pVal->Len() >= 2 )
-            {
-                cComm1 = pVal->GetChar( 0 );
-                cComm2 = pVal->GetChar( 1 );
-            }
-            break;
-        case Output:
-            CopyStrpOnStrp( pOutName, pVal );
-            if( pOutName )
-            {
-                if( *pOutName == "*" )
-                {
-                    ByteString			aDefault( "DefaultDumpName.txt" );
-                    SfxObjectShell*     pShell = GetDocShell();
-                    if( pShell )
-                    {
-                        SfxMedium*		pMedium = pShell->GetMedium();
-                        if( pMedium )
-                        {
-                            const ByteString	aTextExtension( ".txt" );
-                            aDefault = GETSTR( pMedium->GetPhysicalName() );
-                            xub_StrLen		nStrLen = aDefault.Len();
-                            if( nStrLen >= 4 )
-                            {
-                                ByteString	aTmp( aDefault );
-                                aTmp.ToLowerAscii();
-                                if( aTmp.Copy( nStrLen -4 ) == ".xls" )
-                                    aDefault.Replace( nStrLen - 4, aTextExtension.Len(), aTextExtension );
-                                else
-                                    aDefault += aTextExtension;
-                            }
-                            else
-                                aDefault += aTextExtension;
-                        }
-                    }
-
-                    *pOutName = aDefault;
-                }
-                CreateOutStream();
-            }
-            else if( pDumpStream )
-            {
-                pDumpStream->Close();
-                DELANDNULL( pDumpStream );
-            }
-            break;
-        case Title:
-            CopyStrpOnStrp( pTitle, pVal );
-            break;
-        case ClearFile:
-            bClearFile = TRUE;
-            break;
-        default:
-            AddError( nL, "Unknown command", r );
-            b = FALSE;
-    }
-
-    return b;
-}
-
-
-BOOL Biff8RecDumper::ExecSetVal( const UINT32 nL, const ByteString& rId, const ByteString* pName,
-                                const ByteString* pIEC, const ByteString* pHB )
-{
-    UINT32	_nId = GetVal( rId );
-
-    if( _nId == 0xFFFFFFFF )
-    {
-        AddError( nL, "Syntax error in record id", rId );
-        return FALSE;
-    }
-    else if( _nId >= ( UINT32 ) nRecCnt )
-    {
-        AddError( nL, "Record id to high", rId );
-        return FALSE;
-    }
-
-    UINT16	nId = ( UINT16 ) _nId;
-
-    if( pName && pName->Len() )
-        SetName( nId, *pName );
-
-    _KEYWORD		e;
-    UINT16			n = GetMode( nId );
-
-    if( pIEC && pIEC->Len() )
-    {
-        e = GetKeyType( *pIEC );
-
-        if( e == Include )
-            n &= ~MODE_SKIP;
-        else if( e == Exclude )
-            n |= MODE_SKIP;
-        else
-        {
-            AddError( nL, "Invalid key for in-/exclude", *pIEC );
-            return FALSE;
-        }
-    }
-
-    if( pHB && pHB->Len() )
-    {
-        e = GetKeyType( *pHB );
-
-        if( e == NameOnly )
-            n |= MODE_NAMEONLY;
-        else
-        {
-            n &= ~MODE_NAMEONLY;
-            if( e == Hex )
-                n |= MODE_HEX;
-            else if( e == Body )
-                n &= ~MODE_HEX;
-            else
-            {
-                AddError( nL, "Invalid key for hex/body/name only", *pIEC );
-                return FALSE;
-            }
-        }
-    }
-
-    SetMode( nId, n );
-    return TRUE;
-}
-
-
-void Biff8RecDumper::SetFlag( const UINT16 nF, const UINT16 nL, const UINT16 nFl )
-{
-    UINT16	n		= ( nF < nL )? nF : nL;
-    UINT16	nLast	= ( nF < nL )? nL : nF;
-
-    if( nLast >= nRecCnt )
-        nLast = nRecCnt - 1;
-
-    while( n <= nLast )
-    {
-        pDumpModes[ n ] |= nFl;
-        n++;
-    }
-}
-
-
-void Biff8RecDumper::ClrFlag( const UINT16 nF, const UINT16 nL, const UINT16 nFlags )
-{
-    UINT16	n		= ( nF < nL )? nF : nL;
-    UINT16	nLast	= ( nF < nL )? nL : nF;
-    UINT16	nFl		= ~nFlags;
-
-    if( nLast >= nRecCnt )
-        nLast = nRecCnt - 1;
-
-    while( n <= nLast )
-    {
-        pDumpModes[ n ] &= nFl;
-        n++;
-    }
-}
-
-
-void Biff8RecDumper::SetName( const UINT16 n, ByteString* p )
-{
-    if( n < nRecCnt )
-        CopyStrpOnStrp( ppRecNames[ n ], p );
-}
-
-
-UINT32 Biff8RecDumper::GetVal( const ByteString& r )
-{
-    const sal_Char*	p = r.GetBuffer();
-    sal_Char		c = *p;
-    UINT32          n = 0;
-    const UINT32	nLimitDec = 0xFFFFFFFF / 10;
-    const UINT32	nLimitHex = 0xFFFFFFFF / 16;
-    BOOL			bError = FALSE;
-
-    enum STATE	{ First, Dec, MaybeHex, Hex };
-
-    STATE			e = First;
-
-    while( c )
-    {
-        switch( e )
-        {
-            case First:
-                if( IsNum( c ) )
-                {
-                    if( c == '0' )
-                        e = MaybeHex;
-                    else
-                    {
-                        e = Dec;
-                        n = GetVal( c );
-                    }
-                }
-                else
-                    bError = TRUE;
-                break;
-            case Dec:
-                if( n < nLimitDec && IsNum( c ) )
-                {
-                    n *= 10;
-                    n += GetVal( c );
-                }
-                else
-                    bError = TRUE;
-                break;
-            case MaybeHex:
-                if( c == 'x' || c == 'X' )
-                {
-                    e = Hex;
-                    n = 0;
-                }
-                else if( IsNum( c ) )
-                {
-                    n = GetVal( c );
-                    e = Dec;
-                }
-                else
-                    bError = TRUE;
-                break;
-            case Hex:
-                if( n < nLimitHex && IsHex( c ) )
-                {
-                    n *= 16;
-                    n += GetVal( c );
-                }
-                else
-                    bError = TRUE;
-                break;
-        }
-
-        if( bError )
-            c = 0x00;
-        else
-        {
-            p++;
-            c = *p;
-        }
-    }
-
-    if( bError )
-        return 0xFFFFFFFF;
-    else
-        return n;
-}
-
-
-BOOL Biff8RecDumper::FillIdRangeList( const UINT32 nL, IdRangeList& rRL, const ByteString& rV )
-{
-    rRL.Clear();
-
-    const sal_Char*		pSyntErr = "Syntax error in number (list)";
-
-#define	SYNTERR(ch)	AddError( ((UINT32)(b=FALSE))+nL, pSyntErr, ch? ((((t+=">")+=ByteString::CreateFromInt32(ch))+="<")) : t )
-#define NEWVAL(_n)	_n=(n>=(UINT32)nRecCnt)?nRecCnt-1:(UINT16)n
-#define	ORDERN()	{if(n1>n2){UINT16 nT=n1;n1=n2;n2=nT;}}
-
-    const sal_Char*		p = rV.GetBuffer();
-    sal_Char			c = *p;
-    const sal_Char		cSep = cParSep;
-    const sal_Char		cCont = '.';
-    const sal_Char		cAll = '*';
-    ByteString			t;
-    UINT16              n1 = 0, n2 = 0;
-    UINT32				n;
-    BOOL				b = TRUE;
-    BOOL				bExp2 = FALSE;
-
-    enum STATE	{ PreFirst, InFirst, PostFirst, InCont, PreLast, InLast, PostLast };
-    STATE			e = PreFirst;
-
-    while( c )
-    {
-        switch( e )
-        {
-            case PreFirst:
-                if( IsAlphaNum( c ) )
-                {
-                    t += c;
-                    e = InFirst;
-                }
-                else if( c == cAll )
-                {
-                    rRL.Append( 0, nRecCnt - 1 );
-                    e = PostLast;
-                }
-                else if( !IsBlank( c ) )
-                    SYNTERR( c );
-                break;
-            case InFirst:
-                if( c == cSep || c == cCont || IsBlank( c ) )
-                {
-                    n = GetVal( t );
-                    if( n == 0xFFFFFFFF )
-                        SYNTERR( 0 );
-                    else
-                        NEWVAL( n1 );
-
-                    t.Erase();
-
-                    if( c == cSep )
-                    {
-                        rRL.Append( n1, n1 );
-                        e = PreFirst;
-                    }
-                    else if( c == cCont )
-                    {
-                        bExp2 = TRUE;
-                        e = InCont;
-                    }
-                    else
-                        e = PostFirst;
-                }
-                else if( IsAlphaNum( c ) )
-                    t += c;
-                else
-                    SYNTERR( c );
-                break;
-            case PostFirst:
-                if( c == cCont )
-                {
-                    e = InCont;
-                    bExp2 = TRUE;
-                }
-                else if( c == cSep )
-                {
-                    n = GetVal( t );
-                    if( n == 0xFFFFFFFF )
-                        SYNTERR( 0 );
-                    else
-                        NEWVAL( n1 );
-
-                    e = PreFirst;
-                }
-                else if( !IsBlank( c ) )
-                    SYNTERR( c );
-                break;
-            case InCont:
-                if( IsAlphaNum( c ) )
-                {
-                    t += c;
-                    e = InLast;
-                }
-                else if( IsBlank( c ) )
-                    e = PreLast;
-                else if( c == cSep || c == cAll )
-                {
-                    rRL.Append( n1, nRecCnt - 1 );
-                    bExp2 = FALSE;
-                    e = PreFirst;
-                }
-                else if( c != cCont )
-                    SYNTERR( c );
-                break;
-            case PreLast:
-                if( IsAlphaNum( c ) )
-                {
-                    t += c;
-                    e = InLast;
-                }
-                else if( !IsBlank( c ) )
-                    SYNTERR( c );
-                break;
-                break;
-            case InLast:
-                if( c == cSep || IsBlank( c ) )
-                {
-                    n = GetVal( t );
-                    if( n == 0xFFFFFFFF )
-                        SYNTERR( 0 );
-                    else
-                        NEWVAL( n2 );
-
-                    t.Erase();
-                    ORDERN();
-                    rRL.Append( n1, n2 );
-                    bExp2 = FALSE;
-                    e = ( c == cSep )? PreFirst : PostLast;
-                }
-                else if( IsAlphaNum( c ) )
-                    t += c;
-                else
-                    SYNTERR( c );
-                break;
-            case PostLast:
-                if( c == cSep )
-                {
-                    e = PreFirst;
-                    bExp2 = FALSE;
-                }
-                else if( !IsBlank( c ) )
-                    SYNTERR( c );
-                break;
-        }
-
-        if( b )
-        {
-            p++;
-            c = *p;
-        }
-        else
-            c = 0x00;
-    }
-
-    if( bExp2 )
-    {
-        if( t.Len() )
-        {
-            n = GetVal( t );
-            if( n == 0xFFFFFFFF )
-                SYNTERR( 0 );
-            else
-                NEWVAL( n2 );
-            ORDERN();
-        }
-        else
-            n2 = nRecCnt - 1;
-
-        if( b )
-            rRL.Append( n1, n2 );
-    }
-
-#undef	SYNTERR
-#undef	NEWVAL
-#undef	ORDERN
-
-    return b;
-}
-
-
-BOOL Biff8RecDumper::CreateOutStream()
-{
-    if( pDumpStream )
-    {
-        pDumpStream->Close();
-        DELANDNULL( pDumpStream );
-    }
-
-    if( !bSkip && pOutName )
-    {
-        pOutName->EraseLeadingChars( ' ' );
-        pOutName->EraseTrailingChars( ' ' );
-        pOutName->EraseLeadingChars( '\t' );
-        pOutName->EraseTrailingChars( '\t' );
-
-        pDumpStream = new SvFileStream( String::CreateFromAscii( pOutName->GetBuffer() ), STREAM_WRITE|STREAM_SHARE_DENYWRITE|(bClearFile?STREAM_TRUNC:0) );
-
-        if( pDumpStream->IsOpen() )
-        {
-            pDumpStream->Seek( bClearFile? STREAM_SEEK_TO_BEGIN : STREAM_SEEK_TO_END );
-            return TRUE;
-        }
-        else
-        {
-            DELANDNULL( pDumpStream );
-        }
-    }
-
-    return FALSE;
-}
-
-
-SvFileStream* Biff8RecDumper::CreateInStream( const sal_Char* pN )
-{
-    SvFileStream*	p = new SvFileStream( String::CreateFromAscii( pN ), STREAM_READ|STREAM_SHARE_DENYWRITE );
-
-    if( p->IsOpen() )
-        return p;
-    else
-    {
-        delete p;
-        return NULL;
-    }
-}
-
-
-SvFileStream* Biff8RecDumper::CreateInStream( const sal_Char* pP, const sal_Char* pN )
-{
-    ByteString		t( pP );
-    const sal_Char	c = t.GetChar( t.Len() - 1 );
-
-    if( c != '\\' )
-        t += '\\';
-    else if( c != '/' )
-        t += '/';
-
-    t += pN;
-
-    return CreateInStream( t.GetBuffer() );
-}
-
-
-void Biff8RecDumper::AddError( const UINT32 n, const ByteString& rT, const ByteString& rH )
-{
-    DUMP_ERR*	p = new DUMP_ERR( n, rT, rH );
-
-    if( pFirst )
-        pLast->pNext = p;
-    else
-        pFirst = p;
-
-    pLast = p;
-}
-
-
-Biff8RecDumper::Biff8RecDumper( const XclImpRoot& rRoot, BOOL _bBIFF8 ) :
-    XclImpRoot( rRoot ),
-    bBIFF8( _bBIFF8 ),
-    bEncrypted( false ),
-    mnEscherPos( 0 )
-{
-    nXFCount = 0;
-    nFontIndex = 0;
-    nInstances++;
-    mnSubstream = EXC_BOF_UNKNOWN;
-
-    if( !pCharType )
-    {
-        pCharType = new UINT8[ 256 ];
-        memset( pCharType, 0x00, 256 );
-
-        pCharVal = new UINT8[ 256 ];
-        memset( pCharVal, 0x00, 256 );
-
-        sal_Char	c;
-        UINT8		n;
-
-#define __TYPE(n)	pCharType[(UINT8)n]
-#define	__VAL(n)	pCharVal[(UINT8)n]
-
-        __TYPE( '\n' ) = CT_EOL;
-        __TYPE( '\r' ) = CT_EOL;
-
-        __TYPE( ' ' ) = CT_BLANK;
-        __TYPE( '\t' ) = CT_BLANK;
-
-        for( c = '0', n = 0 ; c <= '9' ; c++, n++ )
-        {
-            __TYPE( c ) = CT_NUM|CT_HEX|CT_ALPHANUM;
-            __VAL( c ) = n;
-        }
-        for( c = 'a', n = 10 ; c <= 'f' ; c++, n++ )
-        {
-            __TYPE( c ) = CT_HEX|CT_ALPHA|CT_ALPHANUM|CT_LOWERALPHA;
-            __VAL( c ) = n;
-        }
-        for( c = 'g' ; c <= 'z' ; c++ )
-            __TYPE( c ) = CT_ALPHA|CT_ALPHANUM|CT_LOWERALPHA;
-        for( c = 'A', n = 10 ; c <= 'F' ; c++, n++ )
-        {
-            __TYPE( c ) = CT_HEX|CT_ALPHA|CT_ALPHANUM|CT_UPPERALPHA;
-            __VAL( c ) = n;
-        }
-        for( c = 'G' ; c <= 'Z' ; c++ )
-            __TYPE( c ) = CT_ALPHA|CT_ALPHANUM|CT_UPPERALPHA;
-
-#undef __TYPE
-#undef __VAL
-    }
-
-    pDumpStream = NULL;
-
-    if( !pBlankLine )
-    {
-        pBlankLine = new sal_Char[ nLenBlankLine + 1 ];
-        memset( pBlankLine, ' ', nLenBlankLine );
-        pBlankLine[ nLenBlankLine ] = 0x00;
-    }
-
-    pTitle = NULL;
-    pOutName = NULL;
-    pLevelPre = pLevelPreStringNT;
-
-    nMaxBodyLines = 1024;
-    bEndLoading = bSkip = bSkipOffset = bReadContRecs = bBlankLine = bExportBookStream = FALSE;
-    bWarnings = TRUE;
-
-    pDumpModes = NULL;
-    ppRecNames = NULL;
-
-    pFirst = pLast = pAct = NULL;
-
-    cParSep = ',';
-    cComm1 = cComm2 = '/';
-
-    nFieldCnt = nItemCnt = nTabIndexCnt = 0;
-
-    Init();
-}
-
-
-Biff8RecDumper::~Biff8RecDumper()
-{
-    if( pDumpStream )
-    {
-        pDumpStream->Close();
-        delete pDumpStream;
-    }
-
-    if( nInstances )
-    {
-        nInstances--;
-        if( !nInstances )
-        {
-            delete[] pBlankLine;
-            pBlankLine = NULL;
-
-            delete[] pCharType;
-            pCharType = NULL;
-
-            delete[] pCharVal;
-            pCharVal = NULL;
-        }
-    }
-
-    if( pDumpModes )
-        delete[] pDumpModes;
-
-    if( ppRecNames )
-    {
-        ByteString**		pp = ppRecNames;
-        UINT16			n = nRecCnt;
-        while( n )
-        {
-            if( *pp )
-                delete *pp;
-            pp++;
-            n--;
-        }
-        delete[] ppRecNames;
-    }
-
-    if( pTitle )
-        delete pTitle;
-
-    if( pOutName )
-        delete pOutName;
-
-    DUMP_ERR*			p = pFirst;
-    DUMP_ERR*			pD;
-    if( p )
-    {
-        pD = p;
-        p = p->pNext;
-        delete pD;
-    }
-}
-
-
-BOOL Biff8RecDumper::Dump( XclImpStream& r )
-{
-    const DUMP_ERR*		pErr = FirstErr();
-
-    if( pErr )
-    {
-        if( pDumpStream )
-        {
-            SvFileStream&	rOut = *pDumpStream;
-            while( pErr )
-            {
-                rOut << "\nError";
-                if( pErr->nLine )
-                {
-                    ByteString	t;
-                    t += ByteString::CreateFromInt32( pErr->nLine );
-                    rOut << " at line " << t.GetBuffer();
-                }
-
-                rOut << ": " << pErr->aText.GetBuffer();
-
-                if( pErr->pHint )
-                    rOut << " (" << pErr->pHint->GetBuffer() << ')';
-                pErr = NextErr();
-            }
-            rOut << '\n';
-        }
-    }
-    else if( pDumpStream && !bSkip )
-    {
-        SvStream& rOutStrm = *pDumpStream;
-
-        if( bExportBookStream && pOutName )
-        {
-            ByteString aBookOutName( *pOutName, 0, pOutName->Len() - 4 );
-            aBookOutName.Append( "_book.xls" );
-            SvFileStream aBook( String::CreateFromAscii( aBookOutName.GetBuffer() ), STREAM_WRITE|STREAM_SHARE_DENYWRITE|STREAM_TRUNC );
-            if( aBook.IsOpen() )
-            {
-                const sal_Size nBufLen = 0xFFFF;
-                sal_uInt8 pBuffer[ nBufLen ];
-                r.StoreGlobalPosition();
-                while( r.StartNextRecord() )
-                {
-                    r.ResetRecord( false );
-                    sal_uInt16 nRecSize = (sal_uInt16) Min( r.GetRecSize(), nBufLen );
-                    aBook << r.GetRecId() << nRecSize;
-                    r.Read( pBuffer, nRecSize );
-                    aBook.Write( pBuffer, nRecSize );
-                }
-                r.SeekGlobalPosition();
-            }
-        }
-
-        if( pTitle )
-            rOutStrm << pTitle->GetBuffer();
-
-        pIn = &r;
-        r.StoreGlobalPosition();
-
-        ::std::auto_ptr< XclDumpStorageHeader > xStrgHerader;
-        SotStorageRef xRootStrg = GetRootStorage();
-        if( xRootStrg.Is() )
-            xStrgHerader.reset( new XclDumpStorageHeader( *xRootStrg, rOutStrm, EMPTY_STRING ) );
-
-        ::std::auto_ptr< ScfProgressBar > xProgress( new ScfProgressBar(
-            GetDocShell(), String( RTL_CONSTASCII_USTRINGPARAM( "Dumper" ) ) ) );
-        sal_Int32 nStreamSeg = xProgress->AddSegment( r.GetSvStreamSize() );
-        xProgress->ActivateSegment( nStreamSeg );
-
-        while( r.StartNextRecord() )
-        {
-            xProgress->ProgressAbs( r.GetSvStreamPos() );
-            if( HasModeDump( r.GetRecId() ) )
-                RecDump();
-        }
-
-        rOutStrm << "\n\n";
-
-        pIn = NULL;
-        xProgress.reset();
-
-        r.SeekGlobalPosition();
-
-        // dump substreams
-        if( xRootStrg.Is() )
-        {
-            pIn = NULL;
-            bool bOldEncr = bEncrypted;
-            bEncrypted = false;
-            DumpRecordStream( xRootStrg, EXC_STREAM_USERNAMES, EMPTY_STRING );
-
-            pIn = &r;
-            bEncrypted = bOldEncr;
-            DumpRecordStream( xRootStrg, EXC_STREAM_REVLOG, EMPTY_STRING );
-
-            pIn = NULL;
-
-            DumpCtlsStream();
-            DumpVbaProjectStorage();
-        }
-    }
-
-    return !bEndLoading;
-}
-
-#undef Read1
-#undef Read2
-#undef Read4
-#undef Read8
-
-#endif
-
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx
index 174ab2032..c1d03698d 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -43,6 +43,7 @@
 #include "xltable.hxx"
 #include "xistream.hxx"
 #include "xistyle.hxx"
+#include "queryparam.hxx"
 
 // for filter manager
 #include "excimp8.hxx"
@@ -309,7 +310,7 @@ void XclImpColRowSettings::ConvertHiddenFlags( SCTAB nScTab )
             rDoc.ShowRow( nScRow, nScTab, FALSE );
             // #i38093# rows hidden by filter need extra flag
             if( (nFirstFilterScRow <= nScRow) && (nScRow <= nLastFilterScRow) )
-                rDoc.SetRowFlags( nScRow, nScTab, rDoc.GetRowFlags( nScRow, nScTab ) | CR_FILTERED );
+                rDoc.SetRowFiltered(nScRow, nScRow, nScTab, true);
         }
     }
 
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 3965d0aca..8365ef0db 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -98,15 +98,21 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument
             CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelBiffFilter" ), aArgs ), uno::UNO_QUERY_THROW );
         xImporter->setTargetDocument( xComponent );
 
-        MediaDescriptor aDescriptor;
-        if( const SfxItemSet* pItemSet = rMedium.GetItemSet() )
+        MediaDescriptor aMediaDesc;
+        SfxItemSet* pItemSet = rMedium.GetItemSet();
+        if( pItemSet )
+        {
             if( const SfxStringItem* pItem = static_cast< const SfxStringItem* >( pItemSet->GetItem( SID_FILE_NAME ) ) )
-                aDescriptor[ MediaDescriptor::PROP_URL() ] <<= ::rtl::OUString( pItem->GetValue() );
-        aDescriptor[ MediaDescriptor::PROP_INPUTSTREAM() ] <<= rMedium.GetInputStream();
+                aMediaDesc[ MediaDescriptor::PROP_URL() ] <<= ::rtl::OUString( pItem->GetValue() );
+            if( const SfxStringItem* pItem = static_cast< const SfxStringItem* >( pItemSet->GetItem( SID_PASSWORD ) ) )
+                aMediaDesc[ MediaDescriptor::PROP_PASSWORD() ] <<= ::rtl::OUString( pItem->GetValue() );
+        }
+        aMediaDesc[ MediaDescriptor::PROP_INPUTSTREAM() ] <<= rMedium.GetInputStream();
+        aMediaDesc[ MediaDescriptor::PROP_INTERACTIONHANDLER() ] <<= rMedium.GetInteractionHandler();
 
         // call the filter
         uno::Reference< document::XFilter > xFilter( xImporter, uno::UNO_QUERY_THROW );
-        bool bResult = xFilter->filter( aDescriptor.getAsConstPropertyValueList() );
+        bool bResult = xFilter->filter( aMediaDesc.getAsConstPropertyValueList() );
 
         // if filter returns false, document is invalid, or dumper has disabled import -> exit here
         if( !bResult )
@@ -141,27 +147,27 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument
     if( xRootStrg.Is() )
     {
         // try to open the "Book" stream
-        SotStorageStreamRef xBookStrm5 = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_BOOK );
-        XclBiff eBookStrm5Biff = xBookStrm5.Is() ?  XclImpStream::DetectBiffVersion( *xBookStrm5 ) : EXC_BIFF_UNKNOWN;
+        SotStorageStreamRef xBookStrm = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_BOOK );
+        XclBiff eBookBiff = xBookStrm.Is() ?  XclImpStream::DetectBiffVersion( *xBookStrm ) : EXC_BIFF_UNKNOWN;
 
         // try to open the "Workbook" stream
-        SotStorageStreamRef xBookStrm8 = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_WORKBOOK );
-        XclBiff eBookStrm8Biff = xBookStrm8.Is() ?  XclImpStream::DetectBiffVersion( *xBookStrm8 ) : EXC_BIFF_UNKNOWN;
+        SotStorageStreamRef xWorkbookStrm = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_WORKBOOK );
+        XclBiff eWorkbookBiff = xWorkbookStrm.Is() ?  XclImpStream::DetectBiffVersion( *xWorkbookStrm ) : EXC_BIFF_UNKNOWN;
 
         // decide which stream to use
-        if( (eBookStrm8Biff != EXC_BIFF_UNKNOWN) && ((eBookStrm5Biff == EXC_BIFF_UNKNOWN) || (eBookStrm8Biff > eBookStrm5Biff)) )
+        if( (eWorkbookBiff != EXC_BIFF_UNKNOWN) && ((eBookBiff == EXC_BIFF_UNKNOWN) || (eWorkbookBiff > eBookBiff)) )
         {
             /*  Only "Workbook" stream exists; or both streams exist,
                 and "Workbook" has higher BIFF version than "Book" stream. */
-            xStrgStrm = xBookStrm8;
-            eBiff = eBookStrm8Biff;
+            xStrgStrm = xWorkbookStrm;
+            eBiff = eWorkbookBiff;
         }
-        else if( eBookStrm5Biff != EXC_BIFF_UNKNOWN )
+        else if( eBookBiff != EXC_BIFF_UNKNOWN )
         {
             /*  Only "Book" stream exists; or both streams exist,
                 and "Book" has higher BIFF version than "Workbook" stream. */
-            xStrgStrm = xBookStrm5;
-            eBiff = eBookStrm5Biff;
+            xStrgStrm = xBookStrm;
+            eBiff = eBookBiff;
         }
 
         pBookStrm = xStrgStrm;
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index e4122700b..e71c60e14 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -136,7 +136,7 @@ void ImportExcel::Formula( const XclAddress& rXclPos,
             bConvert = TRUE;
 
         if( bConvert )
-            eErr = pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
+            eErr = pFormConv->Convert( pErgebnis, maStrm, nFormLen, ExcelToSc::ConvertParam(), FT_CellFormula);
 
         ScFormulaCell*		pZelle = NULL;
 
@@ -201,7 +201,8 @@ void ExcelToSc::GetDummy( const ScTokenArray*& pErgebnis )
 // if bAllowArrays is false stream seeks to first byte after <nFormulaLen>
 // otherwise it will seek to the first byte after the additional content (eg
 // inline arrays) following <nFormulaLen>
-ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT )
+ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, sal_Size nFormulaLen, 
+                            const ConvertParam& rParam, const FORMULA_TYPE eFT )
 {
     RootData&       rR = GetOldRoot();
     BYTE			nOp, nLen, nByte;
@@ -472,7 +473,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
             case 0x20: // Array Constant						[317 268]
                 aIn >> nByte >> nUINT16;
                 aIn.Ignore( (meBiff == EXC_BIFF2) ? 3 : 4 );
-                if( bAllowArrays )
+                if( rParam.mbAllowArrays )
                 {
                     SCSIZE nC = nByte ? nByte : 256;
                     SCSIZE nR = nUINT16;
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index 4edef1a4b..63fe14862 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -97,7 +97,8 @@ bool ExcelToSc8::Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLas
 
 // if bAllowArrays is false stream seeks to first byte after <nFormulaLen>
 // otherwise it will seek to the first byte past additional content after <nFormulaLen>
-ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT )
+ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, sal_Size nFormulaLen, 
+                             const ConvertParam& rParam, const FORMULA_TYPE eFT )
 {
     BYTE					nOp, nLen, nByte;
     UINT16                  nUINT16;
@@ -393,12 +394,17 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
             case 0x20: // Array Constant						[317 268]
                 aIn >> nByte >> nUINT16;
                 aIn.Ignore( 4 );
-                if( bAllowArrays )
+                if (rParam.mbAllowArrays)
                 {
-                    SCSIZE nC = nByte + 1;
-                    SCSIZE nR = nUINT16 + 1;
-
-                    aStack << aPool.StoreMatrix( nC, nR );
+                    SCSIZE nC = rParam.mnArrayColSize;
+                    SCSIZE nR = rParam.mnArrayRowSize;
+                    if (!nC || !nR)
+                    {
+                        // Stored array size is invalid.  Get that from the formula.
+                        nC = nByte + 1;
+                        nR = nUINT16 + 1;
+                    }
+                    aStack << aPool.StoreMatrix(nC, nR);
                     aExtensions.push_back( EXTENSION_ARRAY );
                 }
                 else
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 28771cb00..3154f36f1 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -250,10 +250,10 @@ void ImportExcel8::Codename( BOOL bWorkbookGlobals )
             {
                 GetExtDocOptions().AppendCodeName( aName );
                 GetDoc().SetCodeName( GetCurrScTab(), aName );
-            }
         }
     }
 }
+}
 
 void ImportExcel8::SheetProtection( void )
 {
@@ -305,8 +305,8 @@ void ImportExcel8::ReadBasic( void )
                 {
                     uno::Any aModel = uno::makeAny( pShell->GetModel() );
                     pAppMgr->SetGlobalUNOConstant( "ThisExcelDoc", aModel );
-                }
-#if 0
+        }
+#if 1
                 // see if we have the XCB stream
                 SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "XCB" ) ), STREAM_STD_READ | STREAM_NOCREATE  );
                 if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() )
@@ -318,8 +318,8 @@ void ImportExcel8::ReadBasic( void )
                         wrapper.Print( stderr ); 
 #endif
                         wrapper.ImportCustomToolBar( *pShell );
-                    }
-                }
+    }
+}
 #endif
 
             }
diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx
index 42f903790..a808a9624 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -258,6 +258,12 @@ void ExcelConverterBase::Reset()
     aEingPos.Set( 0, 0, 0 );
 }
 
+ExcelConverterBase::ConvertParam::ConvertParam() :
+    mbAllowArrays(true),
+    mnArrayColSize(0),
+    mnArrayRowSize(0)
+{
+}
 
 
 
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index b936e00dc..2a0f5387f 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -46,6 +46,7 @@
 #include <svx/pageitem.hxx>
 #include <svx/colritem.hxx>
 #include <sfx2/printer.hxx>
+#include <sfx2/docfile.hxx>
 #include <svtools/zforlist.hxx>
 
 #include <sfx2/objsh.hxx>
@@ -175,6 +176,15 @@ ImportExcel::~ImportExcel( void )
 }
 
 
+void ImportExcel::ReadFileSharing()
+{
+    sal_uInt16 nRecommendReadOnly, nPasswordHash;
+    maStrm >> nRecommendReadOnly >> nPasswordHash;
+    if( (nRecommendReadOnly != 0) || (nPasswordHash != 0) )
+        if( SfxItemSet* pItemSet = GetMedium().GetItemSet() )
+            pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, TRUE ) );
+}
+
 sal_uInt16 ImportExcel::ReadXFIndex( bool bBiff2 )
 {
     sal_uInt16 nXFIdx = 0;
@@ -498,7 +508,9 @@ void ImportExcel::Array25( void )
 
         pFormConv->Reset( ScAddress( static_cast<SCCOL>(nFirstCol),
                     static_cast<SCROW>(nFirstRow), GetCurrScTab() ) );
-        pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
+        ExcelConverterBase::ConvertParam aParam;
+        aParam.mbAllowArrays = true;
+        pFormConv->Convert( pErgebnis, maStrm, nFormLen, aParam, FT_CellFormula);
 
         DBG_ASSERT( pErgebnis, "*ImportExcel::Array25(): ScTokenArray ist NULL!" );
 
@@ -604,7 +616,6 @@ void ImportExcel::DocPasssword( void )
 
 void ImportExcel::Codepage( void )
 {
-    maStrm.EnableDecryption();
     SetCodePage( maStrm.ReaduInt16() );
 }
 
@@ -797,7 +808,9 @@ void ImportExcel::Shrfmla( void )
     const ScTokenArray*	pErgebnis;
 
     pFormConv->Reset();
-    pFormConv->Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula );
+    ExcelConverterBase::ConvertParam aParam;
+    aParam.mbAllowArrays = true;
+    pFormConv->Convert( pErgebnis, maStrm, nLenExpr, aParam, FT_SharedFormula );
 
 
     DBG_ASSERT( pErgebnis, "+ImportExcel::Shrfmla(): ScTokenArray ist NULL!" );
@@ -969,10 +982,14 @@ void ImportExcel::Array34( void )
     {
         // jetzt steht Lesemarke auf Formel, Laenge in nFormLen
         const ScTokenArray*	pErgebnis;
+        ExcelConverterBase::ConvertParam aParam;
+        aParam.mbAllowArrays = true;
+        aParam.mnArrayColSize = nLastCol - nFirstCol + 1;
+        aParam.mnArrayRowSize = nLastRow - nFirstRow + 1;
 
         pFormConv->Reset( ScAddress( static_cast<SCCOL>(nFirstCol),
                     static_cast<SCROW>(nFirstRow), GetCurrScTab() ) );
-        pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
+        pFormConv->Convert( pErgebnis, maStrm, nFormLen, aParam, FT_CellFormula);
 
         DBG_ASSERT( pErgebnis, "+ImportExcel::Array34(): ScTokenArray ist NULL!" );
 
diff --git a/sc/source/filter/excel/makefile.mk b/sc/source/filter/excel/makefile.mk
index 6a0a0d972..bdac064d8 100644
--- a/sc/source/filter/excel/makefile.mk
+++ b/sc/source/filter/excel/makefile.mk
@@ -103,7 +103,6 @@ SLOFILES =	\
         $(SLO)$/xlpage.obj					\
         $(SLO)$/xlpivot.obj					\
         $(SLO)$/xlroot.obj					\
-        $(SLO)$/xlstream.obj				\
         $(SLO)$/xlstyle.obj					\
         $(SLO)$/xltools.obj					\
         $(SLO)$/xltracer.obj				\
@@ -154,6 +153,7 @@ EXCEPTIONSFILES = \
         $(SLO)$/xlchart.obj					\
         $(SLO)$/xlformula.obj				\
         $(SLO)$/xlpivot.obj					\
+        $(SLO)$/xlroot.obj					\
         $(SLO)$/xlstyle.obj					\
 		$(SLO)$/xlview.obj \
 		$(SLO)$/xltoolbar.obj \
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 559f7af5b..13d048b68 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -305,6 +305,7 @@ FltError ImportExcel::Read( void )
                         if( eLastErr != ERRCODE_NONE )
                             eAkt = Z_Ende;
                         break;
+                    case EXC_ID_FILESHARING: ReadFileSharing();         break;
                     case 0x41:  rTabViewSett.ReadPane( maStrm );        break;
                     case 0x42:	Codepage(); break;		// CODEPAGE		[ 2345]
                     case 0x56:	Builtinfmtcnt(); break;	// BUILTINFMTCNT[  34 ]
@@ -374,6 +375,7 @@ FltError ImportExcel::Read( void )
                         if( eLastErr != ERRCODE_NONE )
                             eAkt = Z_Ende;
                         break;
+                    case EXC_ID_FILESHARING: ReadFileSharing();         break;
                     case 0x41:  rTabViewSett.ReadPane( maStrm );        break;
                     case 0x42:	Codepage(); break;		// CODEPAGE		[ 2345]
                     case 0x55:	DefColWidth(); break;
@@ -412,7 +414,8 @@ FltError ImportExcel::Read( void )
                         if( eLastErr != ERRCODE_NONE )
                             eAkt = Z_Ende;
                         break;
-                    case 0x17:	Externsheet(); break;	// EXTERNSHEET	[ 2345]
+                    case EXC_ID_FILESHARING: ReadFileSharing();         break;
+                    case 0x17:  Externsheet(); break;   // EXTERNSHEET  [ 2345]
                     case 0x42:	Codepage(); break;		// CODEPAGE		[ 2345]
                     case 0x55:	DefColWidth(); break;
                     case 0x56:	Builtinfmtcnt(); break;	// BUILTINFMTCNT[  34 ]
@@ -546,6 +549,7 @@ FltError ImportExcel::Read( void )
                         if( eLastErr != ERRCODE_NONE )
                             eAkt = Z_Ende;
                         break;
+                    case EXC_ID_FILESHARING: ReadFileSharing();         break;
                     case 0x3D:  Window1(); break;
                     case 0x42:	Codepage(); break;		// CODEPAGE		[ 2345]
                     case 0x85:	Boundsheet(); break;	// BOUNDSHEET	[    5]
@@ -909,6 +913,7 @@ FltError ImportExcel8::Read( void )
                         if( eLastErr != ERRCODE_NONE )
                             eAkt = EXC_STATE_END;
                         break;
+                    case EXC_ID_FILESHARING: ReadFileSharing();         break;
                     case 0x3D:  Window1(); break;
                     case 0x42:	Codepage(); break;		// CODEPAGE		[ 2345   ]
                     case 0x85:	Boundsheet(); break;	// BOUNDSHEET	[    5   ]
@@ -1176,6 +1181,9 @@ FltError ImportExcel8::Read( void )
                     case EXC_ID_SXVDEX:         rPTableMgr.ReadSxvdex( maStrm );    break;
                     case EXC_ID_SXEX:           rPTableMgr.ReadSxex( maStrm );      break;
                     case EXC_ID_SXVIEWEX9:      rPTableMgr.ReadSxViewEx9( maStrm ); break;
+
+                    // 0x0862 (SHEETEXT)
+                    case EXC_ID_SHEETEXT:       rTabViewSett.ReadTabBgColor( maStrm, rPal );    break;
                 }
             }
             break;
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index d3df58086..7bbd4dedc 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -696,6 +696,8 @@ void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
             else if( mnObjType == EXC_OBJTYPE_DROPDOWN )
             {
                 rStrm << sal_uInt16( 0 ) << mnLineCount;
+                // dxMin & zero length str
+                rStrm << sal_uInt16( 0 ) << sal_uInt16( 0 );
             }
 
             rStrm.EndRecord();
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 7dbe4b886..54043cef0 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -600,16 +600,7 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
 {
     String aCellText;
     rStringCell.GetString( aCellText );
-    XclExpStringRef xString = lclCreateFormattedString( rRoot, aCellText, pCellAttr, nFlags, nMaxLen );
-    if (rStringCell.HasPhonetic())
-    {
-        ScPhonetic aPhonetic;
-        static_cast<const ScAsianStringCell&>(rStringCell).GetPhonetic(aPhonetic);
-        if ( !aPhonetic.IsEmpty() )
-            xString->SetPhoneticSettings(aPhonetic);
-    }
-
-    return xString;
+    return lclCreateFormattedString( rRoot, aCellText, pCellAttr, nFlags, nMaxLen );
 }
 
 XclExpStringRef XclExpStringHelper::CreateCellString(
@@ -640,15 +631,6 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
         rEditCell.GetString( aCellText );
         xString = lclCreateFormattedString( rRoot, aCellText, pCellAttr, nFlags, nMaxLen );
     }
-
-    if (rEditCell.HasPhonetic())
-    {
-        ScPhonetic aPhonetic;
-        static_cast<const ScAsianEditCell&>(rEditCell).GetPhonetic(aPhonetic);
-        if ( !aPhonetic.IsEmpty() )
-            xString->SetPhoneticSettings(aPhonetic);
-    }
-
     return xString;
 }
 
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 6eee24348..6934d4657 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -903,7 +903,7 @@ typedef ::std::vector< XclExpTabName >  XclExpTabNameVec;
 inline bool operator<( const XclExpTabName& rArg1, const XclExpTabName& rArg2 )
 {
     // compare the sheet names only
-    return ScGlobal::pCollator->compareString( rArg1.first, rArg2.first ) == COMPARE_LESS;
+    return ScGlobal::GetCollator()->compareString( rArg1.first, rArg2.first ) == COMPARE_LESS;
 }
 
 void XclExpTabInfo::CalcSortedIndexes()
diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx
index 52aa77573..f99b732b7 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -48,9 +48,14 @@
 #include "xehelper.hxx"
 #include "xeescher.hxx"
 
+#include <set>
+#include <limits>
+
 #include <oox/core/tokens.hxx>
 
 using ::rtl::OString;
+using ::std::set;
+using ::std::numeric_limits;
 
 // Page settings records ======================================================
 
@@ -302,17 +307,23 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& rRoot ) :
 
     // *** page breaks ***
 
-    ScCompressedArrayIterator< SCROW, BYTE> aIter( rDoc.GetRowFlagsArray( nScTab), 1, GetMaxPos().Row());
-    do
+    set<SCROW> aRowBreaks;
+    rDoc.GetAllRowBreaks(aRowBreaks, nScTab, false, true);
+
+    SCROW nMaxRow = numeric_limits<sal_uInt16>::max();
+    for (set<SCROW>::const_iterator itr = aRowBreaks.begin(), itrEnd = aRowBreaks.end(); itr != itrEnd; ++itr)
     {
-        if (*aIter & CR_MANUALBREAK)
-            for (SCROW j=aIter.GetRangeStart(); j<=aIter.GetRangeEnd(); ++j)
-                maData.maHorPageBreaks.push_back( static_cast< sal_uInt16 >( j ) );
-    } while (aIter.NextRange());
-
-    for( SCCOL nScCol = 1, nScMaxCol = GetMaxPos().Col(); nScCol <= nScMaxCol; ++nScCol )
-        if( rDoc.GetColFlags( nScCol, nScTab ) & CR_MANUALBREAK )
-            maData.maVerPageBreaks.push_back( static_cast< sal_uInt16 >( nScCol ) );
+        SCROW nRow = *itr;
+        if (nRow > nMaxRow)
+            break;
+        
+        maData.maHorPageBreaks.push_back(nRow);
+    }
+
+    set<SCCOL> aColBreaks;
+    rDoc.GetAllColBreaks(aColBreaks, nScTab, false, true);
+    for (set<SCCOL>::const_iterator itr = aColBreaks.begin(), itrEnd = aColBreaks.end(); itr != itrEnd; ++itr)
+        maData.maVerPageBreaks.push_back(*itr);
 }
 
 static void lcl_WriteHeaderFooter( XclExpXmlStream& rStrm )
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 6b2f53c80..45ced68de 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -485,7 +485,7 @@ XclExpBiff8Encrypter::XclExpBiff8Encrypter( const XclExpRoot& rRoot, const sal_u
     String aPass = rRoot.GetPassword();
     if (aPass.Len() == 0)
         // Empty password.  Get the default biff8 password.
-        aPass = XclCryptoHelper::GetBiff8WbProtPassword();
+        aPass = rRoot.GetDefaultPassword();
     Init(aPass, nDocId, nSalt);
 }
 
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index afcd33415..c21091132 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -296,8 +296,7 @@ bool XclExpString::IsEqual( const XclExpString& rCmp ) const
             ( mbIsBiff8 && (maUniBuffer  == rCmp.maUniBuffer)) ||
             (!mbIsBiff8 && (maCharBuffer == rCmp.maCharBuffer))
         ) &&
-        (maFormats   == rCmp.maFormats)      &&
-        (maPhonetic  == rCmp.maPhonetic);
+        (maFormats      == rCmp.maFormats);
 }
 
 bool XclExpString::IsLessThan( const XclExpString& rCmp ) const
@@ -308,18 +307,6 @@ bool XclExpString::IsLessThan( const XclExpString& rCmp ) const
     return (nResult != 0) ? (nResult < 0) : (maFormats < rCmp.maFormats);
 }
 
-bool XclExpString::HasPhonetic() const
-{
-    return !maPhonetic.IsEmpty();
-}
-
-// formatting runs ------------------------------------------------------------
-
-void XclExpString::SetPhoneticSettings( const ScPhonetic& rPhonetic )
-{
-    maPhonetic = rPhonetic;
-}
-
 // get data -------------------------------------------------------------------
 
 sal_uInt16 XclExpString::GetFormatsCount() const
@@ -327,25 +314,17 @@ sal_uInt16 XclExpString::GetFormatsCount() const
     return static_cast< sal_uInt16 >( maFormats.size() );
 }
 
-sal_uInt32 XclExpString::GetPhoneticSettingsCount() const
-{
-    return maPhonetic.GetSize();
-}
-
 sal_uInt8 XclExpString::GetFlagField() const
 {
-    return (mbIsUnicode ? EXC_STRF_16BIT : 0) |
-           (IsWritePhoneticSettings() ? EXC_STRF_FAREAST : 0 ) |
-           (IsWriteFormats() ? EXC_STRF_RICH : 0);
+    return (mbIsUnicode ? EXC_STRF_16BIT : 0) | (IsWriteFormats() ? EXC_STRF_RICH : 0);
 }
 
 sal_uInt16 XclExpString::GetHeaderSize() const
 {
     return
-        (mb8BitLen ? 1 : 2) +                   // length field
-        (IsWriteFlags() ? 1 : 0) +              // flag field
-        (IsWriteFormats() ? 2 : 0) +            // richtext formattting count
-        (IsWritePhoneticSettings() ? 4 : 0);    // phonetic settings  count
+        (mb8BitLen ? 1 : 2) +           // length field
+        (IsWriteFlags() ? 1 : 0) +      // flag field
+        (IsWriteFormats() ? 2 : 0);     // richtext formattting count
 }
 
 sal_Size XclExpString::GetBufferSize() const
@@ -356,10 +335,9 @@ sal_Size XclExpString::GetBufferSize() const
 sal_Size XclExpString::GetSize() const
 {
     return
-        GetHeaderSize() +                                              // header
-        GetBufferSize() +                                              // character buffer
-        (IsWriteFormats() ? (4 * GetFormatsCount()) : 0) +             // richtext formattting
-        (IsWritePhoneticSettings() ? GetPhoneticSettingsCount() : 0);  // phonetic settings
+        GetHeaderSize() +                                   // header
+        GetBufferSize() +                                   // character buffer
+        (IsWriteFormats() ? (4 * GetFormatsCount()) : 0);   // richtext formattting
 }
 
 sal_uInt16 XclExpString::GetChar( sal_uInt16 nCharIdx ) const
@@ -407,10 +385,6 @@ void XclExpString::WriteHeader( XclExpStream& rStrm ) const
     // format run count
     if( IsWriteFormats() )
         rStrm << GetFormatsCount();
-    // format phonetic settings
-    if( IsWritePhoneticSettings() )
-        rStrm << GetPhoneticSettingsCount();
-
     rStrm.SetSliceSize( 0 );
 }
 
@@ -447,46 +421,6 @@ void XclExpString::WriteFormats( XclExpStream& rStrm, bool bWriteSize ) const
     }
 }
 
-void XclExpString::WritePhoneticSettings( XclExpStream& rStrm ) const
-{
-    if( HasPhonetic() )
-    {
-        sal_uInt16 nLen = maPhonetic.GetString().Len();
-        sal_uInt16 nPortions = maPhonetic.GetPortions().size();
-        rStrm << static_cast< sal_uInt16 > ( 1 );
-        rStrm << static_cast< sal_uInt16 > ( 10 + 2 * nLen + 6 * nPortions );
-        rStrm << static_cast< sal_uInt16 > ( maPhonetic.GetFontIndex() );
-        rStrm << static_cast< sal_uInt16 > ( maPhonetic.GetAdditionalSettings() );
-        rStrm << static_cast< sal_uInt16 > ( nPortions );
-        rStrm << static_cast< sal_uInt16 > ( nLen );
-        rStrm << static_cast< sal_uInt16 > ( maPhonetic.GetRepeatedTotalLength() );
-
-        if ( nLen > 0 )
-        {
-            ScfUInt16Vec buffer ( nLen );
-            ScfUInt16Vec::iterator aBeg = buffer.begin();
-            ScfUInt16Vec::iterator aEnd = aBeg + nLen;
-            const sal_Unicode* pcSrcChar = maPhonetic.GetString().GetBuffer();
-            for( ScfUInt16Vec::iterator aIt = aBeg; aIt != aEnd; ++aIt, ++pcSrcChar )
-            {
-                *aIt = static_cast< sal_uInt16 >( *pcSrcChar );
-            }
-            rStrm.WriteUnicodeBuffer( buffer, EXC_STRF_16BIT);
-        }
-        else
-        {
-            rStrm << static_cast< sal_uInt16 > ( 0 );
-        }
-
-        PhoneticPortionVec portions = maPhonetic.GetPortions();
-        for ( sal_uInt16 idx = 0; idx < nPortions; ++idx)
-        {
-            PhoneticPortion portion = portions[idx];
-            rStrm << portion.mncpa << portion.mncpm << portion.mnccm;
-        }
-    }
-}
-
 void XclExpString::Write( XclExpStream& rStrm ) const
 {
     if (!mbSkipHeader)
@@ -494,8 +428,6 @@ void XclExpString::Write( XclExpStream& rStrm ) const
     WriteBuffer( rStrm );
     if( IsWriteFormats() )      // only in BIFF8 included in string
         WriteFormats( rStrm );
-    if( IsWritePhoneticSettings() )
-        WritePhoneticSettings( rStrm );
 }
 
 void XclExpString::WriteHeaderToMem( sal_uInt8* pnMem ) const
@@ -613,11 +545,6 @@ bool XclExpString::IsWriteFormats() const
     return mbIsBiff8 && !mbSkipFormats && IsRich();
 }
 
-bool XclExpString::IsWritePhoneticSettings() const
-{
-    return mbIsBiff8 && !mbSkipFormats && HasPhonetic();
-}
-
 void XclExpString::SetStrLen( sal_Int32 nNewLen )
 {
     sal_uInt16 nAllowedLen = (mb8BitLen && (mnMaxLen > 255)) ? 255 : mnMaxLen;
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index d93eec3cb..de32a6496 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -77,6 +77,7 @@ sal_uInt32 lclGetWeighting( XclExpColorType eType )
         case EXC_COLOR_CELLTEXT:
         case EXC_COLOR_CHARTTEXT:
         case EXC_COLOR_CTRLTEXT:    return 10;
+        case EXC_COLOR_TABBG:
         case EXC_COLOR_CELLAREA:    return 20;
         case EXC_COLOR_GRID:        return 50;
         default:    DBG_ERRORFILE( "lclGetWeighting - unknown color type" );
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 2aef64c8a..2816dafbe 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1604,8 +1604,7 @@ XclExpColinfo::XclExpColinfo( const XclExpRoot& rRoot,
     mnWidth = XclTools::GetXclColumnWidth( nScWidth, GetCharWidth() );
 
     // column flags
-    BYTE nScColFlags = rDoc.GetColFlags( nScCol, nScTab );
-    ::set_flag( mnFlags, EXC_COLINFO_HIDDEN, (nScColFlags & CR_HIDDEN) != 0 );
+    ::set_flag( mnFlags, EXC_COLINFO_HIDDEN, rDoc.ColHidden(nScCol, nScTab) );
 
     // outline data
     rOutlineBfr.Update( nScCol );
@@ -1830,7 +1829,7 @@ XclExpRow::XclExpRow( const XclExpRoot& rRoot, sal_uInt16 nXclRow,
 
     BYTE nRowFlags = GetDoc().GetRowFlags( nScRow, nScTab );
     bool bUserHeight = ::get_flag< BYTE >( nRowFlags, CR_MANUALSIZE );
-    bool bHidden = ::get_flag< BYTE >( nRowFlags, CR_HIDDEN );
+    bool bHidden = GetDoc().RowHidden(nScRow, nScTab);
     ::set_flag( mnFlags, EXC_ROW_UNSYNCED, bUserHeight );
     ::set_flag( mnFlags, EXC_ROW_HIDDEN, bHidden );
 
diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx
index 1ee104cbd..d15634b06 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -259,6 +259,35 @@ void XclExpSelection::WriteBody( XclExpStream& rStrm )
     maSelData.maXclSelection.Write( rStrm, false );
 }
 
+// ----------------------------------------------------------------------------
+
+XclExpTabBgColor::XclExpTabBgColor( const XclTabViewData& rTabViewData ) :
+    XclExpRecord( EXC_ID_SHEETEXT, 18 ),
+    mrTabViewData( rTabViewData )
+{
+}
+//TODO Fix savexml...
+/*void XclExpTabBgColor::SaveXml( XclExpXmlStream& rStrm )
+{
+}*/
+
+void XclExpTabBgColor::WriteBody( XclExpStream& rStrm )
+{
+    if ( mrTabViewData.IsDefaultTabBgColor() )
+        return;
+    sal_uInt16 rt = 0x0862; //rt
+    sal_uInt16 grbitFrt = 0x0000; //grbit must be set to 0
+    sal_uInt32 unused = 0x00000000; //Use twice...
+    sal_uInt32 cb = 0x00000014; // Record Size, may be larger in future...
+    sal_uInt16 reserved = 0x0000; //trailing bits are 0
+    sal_uInt16 TabBgColorIndex;
+    XclExpPalette& rPal = rStrm.GetRoot().GetPalette();
+    TabBgColorIndex = rPal.GetColorIndex(mrTabViewData.mnTabBgColorId);
+    if (TabBgColorIndex < 8 || TabBgColorIndex > 63 ) // only numbers 8 - 63 are valid numbers
+        TabBgColorIndex = 127; //Excel specs: 127 makes excel ignore tab color information.
+    rStrm << rt << grbitFrt << unused << unused << cb << TabBgColorIndex << reserved;
+}
+
 // Sheet view settings ========================================================
 
 namespace {
@@ -368,6 +397,14 @@ XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nSc
         maData.mnNormalZoom     = lclGetXclZoom( rTabSett.mnNormalZoom, EXC_WIN2_NORMALZOOM_DEF );
         maData.mnPageZoom       = lclGetXclZoom( rTabSett.mnPageZoom, EXC_WIN2_PAGEZOOM_DEF );
         maData.mnCurrentZoom    = maData.mbPageMode ? maData.mnPageZoom : maData.mnNormalZoom;
+
+        // Tab Bg Color
+        if ( GetBiff() == EXC_BIFF8 && !rTabSett.IsDefaultTabBgColor() )
+        {
+            XclExpPalette& rPal = GetPalette();
+            maData.maTabBgColor = rTabSett.maTabBgColor;
+            maData.mnTabBgColorId = rPal.InsertColor(maData.maTabBgColor, EXC_COLOR_TABBG, EXC_COLOR_NOTABBG );
+        }
     }
 }
 
@@ -380,6 +417,7 @@ void XclExpTabViewSettings::Save( XclExpStream& rStrm )
     WriteSelection( rStrm, EXC_PANE_TOPRIGHT );
     WriteSelection( rStrm, EXC_PANE_BOTTOMLEFT );
     WriteSelection( rStrm, EXC_PANE_BOTTOMRIGHT );
+    WriteTabBgColor( rStrm );
 }
 
 static void lcl_WriteSelection( XclExpXmlStream& rStrm, const XclTabViewData& rData, sal_uInt8 nPane )
@@ -494,5 +532,10 @@ void XclExpTabViewSettings::WriteSelection( XclExpStream& rStrm, sal_uInt8 nPane
         XclExpSelection( maData, nPane ).Save( rStrm );
 }
 
+void XclExpTabViewSettings::WriteTabBgColor( XclExpStream& rStrm ) const
+{
+    if ( !maData.IsDefaultTabBgColor() )
+        XclExpTabBgColor( maData ).Save( rStrm );
+}
 // ============================================================================
 
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 2d920b0a0..41ec8012a 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -34,6 +34,7 @@
 #include "xichart.hxx"
 
 #include <algorithm>
+#include <memory>
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/drawing/Direction3D.hpp>
@@ -72,6 +73,8 @@
 #include "tokenarray.hxx"
 #include "token.hxx"
 #include "compiler.hxx"
+#include "reftokenhelper.hxx"
+#include "chartlis.hxx"
 #include "fprogressbar.hxx"
 #include "xltracer.hxx"
 #include "xistream.hxx"
@@ -123,6 +126,8 @@ using ::com::sun::star::chart2::data::XDataSequence;
 using ::formula::FormulaToken;
 using ::formula::StackVar;
 
+using ::std::vector;
+
 // Helpers ====================================================================
 
 namespace {
@@ -791,6 +796,22 @@ Sequence< Reference< XFormattedString > > XclImpChSourceLink::CreateStringSequen
     return ScfApiHelper::VectorToSequence( aStringVec );
 }
 
+void XclImpChSourceLink::FillSourceLink(vector<ScSharedTokenRef>& rTokens) const
+{
+    if (!mxTokenArray.is())
+        // no links to fill.
+        return;
+
+    mxTokenArray->Reset();
+    for (FormulaToken* p = mxTokenArray->First(); p; p = mxTokenArray->Next())
+    {
+        ScSharedTokenRef pToken(static_cast<ScToken*>(p->Clone()));
+        if (ScRefTokenHelper::isRef(pToken))
+            // This is a reference token.  Store it.
+            ScRefTokenHelper::join(rTokens, pToken);
+    }
+}
+
 // Text =======================================================================
 
 XclImpChFontBase::~XclImpChFontBase()
@@ -1837,6 +1858,14 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
     return xDataSeries;
 }
 
+void XclImpChSeries::FillAllSourceLinks(vector<ScSharedTokenRef>& rTokens) const
+{
+    mxValueLink->FillSourceLink(rTokens);
+    mxCategLink->FillSourceLink(rTokens);
+    mxTitleLink->FillSourceLink(rTokens);
+    mxBubbleLink->FillSourceLink(rTokens);
+}
+
 void XclImpChSeries::ReadChSourceLink( XclImpStream& rStrm )
 {
     XclImpChSourceLinkRef xSrcLink( new XclImpChSourceLink( GetChRoot() ) );
@@ -3481,7 +3510,7 @@ XclImpChTextRef XclImpChChart::GetDefaultText( XclChTextType eTextType ) const
     return maDefTexts.get( nDefTextId );
 }
 
-void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressBar& rProgress ) const
+void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressBar& rProgress, const OUString& rObjName ) const
 {
     // initialize conversion (locks the model to suppress any internal updates)
     InitConversion( xChartDoc );
@@ -3524,6 +3553,28 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressB
 
     // unlock the model
     FinishConversion( rProgress );
+
+    ScDocument* pDoc = &GetRoot().GetDoc();
+    ScChartListenerCollection* pChartCollection = pDoc->GetChartListenerCollection();
+    if (pChartCollection)
+    {
+        // Now, start listening to this chart.
+        ::std::auto_ptr< vector<ScSharedTokenRef> > pRefTokens(new vector<ScSharedTokenRef>);
+        for (XclImpChSeriesVec::const_iterator itr = maSeries.begin(), itrEnd = maSeries.end(); itr != itrEnd; ++itr)
+        {
+            const XclImpChSeriesRef& rSeries = *itr;
+            rSeries->FillAllSourceLinks(*pRefTokens);
+        }
+        if (!pRefTokens->empty())
+        {
+            ::std::auto_ptr<ScChartListener> pListener(
+                new ScChartListener(rObjName, pDoc, pRefTokens.release()));
+            pListener->SetDirty(true);
+            pListener->StartListeningTo();
+            pChartCollection->Insert(pListener.release());
+
+        }
+    }
 }
 
 void XclImpChChart::ReadChSeries( XclImpStream& rStrm )
@@ -3714,6 +3765,12 @@ void XclImpChart::ReadChartSubStream( XclImpStream& rStrm )
 
             case EXC_ID_WINDOW2:        rTabViewSett.ReadWindow2( rStrm, true );break;
             case EXC_ID_SCL:            rTabViewSett.ReadScl( rStrm );          break;
+            case EXC_ID_SHEETEXT: //0x0862
+            {
+                XclImpPalette& rPal = GetPalette();
+                rTabViewSett.ReadTabBgColor( rStrm,  rPal);
+            }
+            break;
         }
 
         switch( rStrm.GetRecId() )
@@ -3749,11 +3806,11 @@ sal_Size XclImpChart::GetProgressSize() const
     return mxChartData.is() ? mxChartData->GetProgressSize() : 0;
 }
 
-void XclImpChart::Convert( Reference< XModel > xModel, ScfProgressBar& rProgress ) const
+void XclImpChart::Convert( Reference< XModel > xModel, ScfProgressBar& rProgress, const OUString& rObjName ) const
 {
     Reference< XChartDocument > xChartDoc( xModel, UNO_QUERY );
     if( mxChartData.is() && xChartDoc.is() )
-        mxChartData->Convert( xChartDoc, rProgress );
+        mxChartData->Convert( xChartDoc, rProgress, rObjName );
 }
 
 void XclImpChart::ReadChChart( XclImpStream& rStrm )
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 3aa1cc05b..61f3e6178 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -377,33 +377,14 @@ void XclImpHyperlink::ConvertToValidTabName(String& rUrl)
     String aNewUrl(sal_Unicode('#')), aTabName;
 
     bool bInQuote = false;
-    bool bQuoteTabName = false;
     for (xub_StrLen i = 1; i < n; ++i)
     {
         c = rUrl.GetChar(i);
         if (c == sal_Unicode('\''))
         {
-            if (bInQuote && i+1 < n && rUrl.GetChar(i+1) == sal_Unicode('\''))
-            {
-                // Two consecutive single quotes ('') signify a single literal
-                // quite.  When this occurs, the whole table name needs to be
-                // quoted.
-                bQuoteTabName = true;
-                aTabName.Append(c);
-                aTabName.Append(c);
-                ++i;
-                continue;
-            }
-
             bInQuote = !bInQuote;
             if (!bInQuote && aTabName.Len() > 0)
-            {
-                if (bQuoteTabName)
-                    aNewUrl.Append(sal_Unicode('\''));
                 aNewUrl.Append(aTabName);
-                if (bQuoteTabName)
-                    aNewUrl.Append(sal_Unicode('\''));
-            }
         }
         else if (bInQuote)
             aTabName.Append(c);
@@ -616,12 +597,15 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
     const ScAddress& rPos = maRanges.GetObject( 0 )->aStart;    // assured above that maRanges is not empty
     ExcelToSc& rFmlaConv = GetOldFmlaConverter();
 
+    ExcelConverterBase::ConvertParam aParam;
+    aParam.mbAllowArrays = false;
+
     ::std::auto_ptr< ScTokenArray > xTokArr1;
     if( nFmlaSize1 > 0 )
     {
         const ScTokenArray* pTokArr = 0;
         rFmlaConv.Reset( rPos );
-        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize1, false, FT_RangeName );
+        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize1, aParam, FT_RangeName );
         // formula converter owns pTokArr -> create a copy of the token array
         if( pTokArr )
             xTokArr1.reset( pTokArr->Clone() );
@@ -632,7 +616,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
     {
         const ScTokenArray* pTokArr = 0;
         rFmlaConv.Reset( rPos );
-        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize2, false, FT_RangeName );
+        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize2, aParam, FT_RangeName );
         // formula converter owns pTokArr -> create a copy of the token array
         if( pTokArr )
             pTokArr2.reset( pTokArr->Clone() );
@@ -740,6 +724,9 @@ void XclImpValidation::ReadDV( XclImpStream& rStrm )
     String aErrorMessage(  rStrm.ReadUniString() );
     rStrm.SetNulSubstChar();    // back to default
 
+    ExcelConverterBase::ConvertParam aParam;
+    aParam.mbAllowArrays = false;
+
     // formula(s)
     if( rStrm.GetRecLeft() > 8 )
     {
@@ -755,7 +742,7 @@ void XclImpValidation::ReadDV( XclImpStream& rStrm )
         {
             const ScTokenArray* pTokArr = 0;
             rFmlaConv.Reset();
-            rFmlaConv.Convert( pTokArr, rStrm, nLen, false, FT_RangeName );
+            rFmlaConv.Convert( pTokArr, rStrm, nLen, aParam, FT_RangeName );
             // formula converter owns pTokArr -> create a copy of the token array
             if( pTokArr )
                 xTokArr1.reset( pTokArr->Clone() );
@@ -770,7 +757,7 @@ void XclImpValidation::ReadDV( XclImpStream& rStrm )
         {
             const ScTokenArray* pTokArr = 0;
             rFmlaConv.Reset();
-            rFmlaConv.Convert( pTokArr, rStrm, nLen, false, FT_RangeName );
+            rFmlaConv.Convert( pTokArr, rStrm, nLen, aParam, FT_RangeName );
             // formula converter owns pTokArr -> create a copy of the token array
             if( pTokArr )
                 xTokArr2.reset( pTokArr->Clone() );
@@ -1030,7 +1017,7 @@ XclImpDecrypterRef lclReadFilepass5( XclImpStream& rStrm )
     {
         sal_uInt16 nKey, nHash;
         rStrm >> nKey >> nHash;
-        xDecr.reset( new XclImpBiff5Decrypter( rStrm.GetRoot(), nKey, nHash ) );
+        xDecr.reset( new XclImpBiff5Decrypter( nKey, nHash ) );
     }
     return xDecr;
 }
@@ -1041,14 +1028,13 @@ XclImpDecrypterRef lclReadFilepass8_Standard( XclImpStream& rStrm )
     DBG_ASSERT( rStrm.GetRecLeft() == 48, "lclReadFilepass8 - wrong record size" );
     if( rStrm.GetRecLeft() == 48 )
     {
-        sal_uInt8 pnDocId[ 16 ];
-        sal_uInt8 pnSaltData[ 16 ];
-        sal_uInt8 pnSaltHash[ 16 ];
-        rStrm.Read( pnDocId, 16 );
-        rStrm.Read( pnSaltData, 16 );
-        rStrm.Read( pnSaltHash, 16 );
-        xDecr.reset( new XclImpBiff8Decrypter(
-            rStrm.GetRoot(), pnDocId, pnSaltData, pnSaltHash ) );
+        sal_uInt8 pnSalt[ 16 ];
+        sal_uInt8 pnVerifier[ 16 ];
+        sal_uInt8 pnVerifierHash[ 16 ];
+        rStrm.Read( pnSalt, 16 );
+        rStrm.Read( pnVerifier, 16 );
+        rStrm.Read( pnVerifierHash, 16 );
+        xDecr.reset( new XclImpBiff8Decrypter( pnSalt, pnVerifier, pnVerifierHash ) );
     }
     return xDecr;
 }
@@ -1106,6 +1092,7 @@ ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm )
     XclImpDecrypterRef xDecr;
     rStrm.DisableDecryption();
 
+    // read the FILEPASS record and create a new decrypter object
     switch( rStrm.GetRoot().GetBiff() )
     {
         case EXC_BIFF2:
@@ -1116,21 +1103,15 @@ ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm )
         default:        DBG_ERROR_BIFF();
     };
 
-    if (!xDecr.is())
-        return EXC_ENCR_ERROR_UNSUPP_CRYPT;
-
     // set decrypter at import stream
     rStrm.SetDecrypter( xDecr );
 
-    // Store the document password for export.
-    SfxItemSet* pSet = rStrm.GetRoot().GetDocShell()->GetMedium()->GetItemSet();
-    if (pSet)
-    {
-        String aPass = xDecr->GetPassword();
-        pSet->Put( SfxStringItem(SID_PASSWORD, aPass) );
-    }
+    // request and verify a password (decrypter implements IDocPasswordVerifier)
+    if( xDecr.is() )
+        rStrm.GetRoot().RequestPassword( *xDecr );
 
-    return xDecr->GetError();
+    // return error code (success, wrong password, etc.)
+    return xDecr.is() ? xDecr->GetError() : EXC_ENCR_ERROR_UNSUPP_CRYPT;
 }
 
 // Document protection ========================================================
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 190fc643e..f61aaccb8 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1581,7 +1581,7 @@ SdrObject* XclImpChartObj::DoCreateSdrObj( const Rectangle& rAnchorRect, ScfProg
         if( svt::EmbeddedObjectRef::TryRunningState( xEmbObj ) )
         {
             Reference< XModel > xModel( xEmbObj->getComponent(), UNO_QUERY );
-            mxChart->Convert( xModel, rProgress );
+            mxChart->Convert( xModel, rProgress, aEmbObjName );
 
             Reference< XEmbedPersist > xPers( xEmbObj, UNO_QUERY );
             if( xPers.is() )
@@ -1696,7 +1696,7 @@ void XclImpControlHelper::ApplySheetLinkProps() const
         return;
     ScfPropertySet aPropSet( xCtrlModel );
 
-   // sheet links
+    // sheet links
     if( SfxObjectShell* pDocShell = mrRoot.GetDocShell() )
     {
         Reference< XMultiServiceFactory > xFactory( pDocShell->GetModel(), UNO_QUERY );
@@ -2137,7 +2137,7 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const
                     // propagate cell link info
                     pTbxObj->mxCellLink.reset( new ScAddress( *pLeader->mxCellLink.get() ) );                
                     pTbxObj->ApplySheetLinkProps();
-                }
+}
                 pTbxObj = dynamic_cast< XclImpOptionButtonObj* >( GetObjectManager().FindDrawObj( XclObjId( GetScTab(), pTbxObj->mnNextInGroup ) ).get() );
             }
             else
diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx
index 240358e05..41ace5331 100644
--- a/sc/source/filter/excel/xiformula.cxx
+++ b/sc/source/filter/excel/xiformula.cxx
@@ -97,7 +97,9 @@ const ScTokenArray* XclImpFmlaCompImpl::CreateFormula(
     aFmlaStrm.StartNextRecord();
     const ScTokenArray* pArray = NULL;
     GetOldFmlaConverter().Reset();
-    GetOldFmlaConverter().Convert(pArray, aFmlaStrm, aFmlaStrm.GetRecSize(), true);
+    ExcelToSc::ConvertParam aParam;
+    aParam.mbAllowArrays = true;
+    GetOldFmlaConverter().Convert(pArray, aFmlaStrm, aFmlaStrm.GetRecSize(), aParam);
     return pArray;
 }
 
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index e161dcfcc..f39bb1e18 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -271,20 +271,10 @@ ScBaseCell* XclImpStringHelper::CreateCell(
         ScDocument& rDoc = rRoot.GetDoc();
 
         if( pTextObj.get() )
-        {
-            if ( rString.HasPhonetic() )
-                pCell = new ScAsianEditCell( pTextObj.get(), &rDoc, rRoot.GetEditEngine().GetEditTextObjectPool(), rString.GetPhonetic() );
-            else
-                // ScEditCell creates own copy of text object
-                pCell = new ScEditCell( pTextObj.get(), &rDoc, rRoot.GetEditEngine().GetEditTextObjectPool() );
-        }
+            // ScEditCell creates own copy of text object
+            pCell = new ScEditCell( pTextObj.get(), &rDoc, rRoot.GetEditEngine().GetEditTextObjectPool() );
         else
-        {
-            if ( rString.HasPhonetic() )
-                pCell = new ScAsianStringCell( rString.GetText(), rString.GetPhonetic() );
-            else
-                pCell = ScBaseCell::CreateTextCell( rString.GetText(), &rDoc );
-        }
+            pCell = ScBaseCell::CreateTextCell( rString.GetText(), &rDoc );
     }
 
     return pCell;
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index 72f470120..0ad70d538 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -180,7 +180,9 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
         // --- name formula ---
         // JEG : double check this.  It is clearly false for normal names
         //  but some of the builtins (sheettitle?) might be able to handle arrays
-        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize, false, FT_RangeName );
+        ExcelConverterBase::ConvertParam aParam;
+        aParam.mbAllowArrays = false;
+        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize, aParam, FT_RangeName );
 
         // --- auto or advanced filter ---
         if( (GetBiff() == EXC_BIFF8) && pTokArr && bBuiltIn )
@@ -208,7 +210,9 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
     else if( nFmlaSize > 0 )
     {
         // regular defined name
-        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize, true, FT_RangeName );
+        ExcelConverterBase::ConvertParam aParam;
+        aParam.mbAllowArrays = true;
+        rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize, aParam, FT_RangeName );
     }
 
     // 4) *** create a defined name in the Calc document *** ------------------
diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx
index 2a5252193..cb1aba264 100644
--- a/sc/source/filter/excel/xipage.cxx
+++ b/sc/source/filter/excel/xipage.cxx
@@ -378,14 +378,14 @@ void XclImpPageSettings::Finalize()
     {
         SCROW nScRow = static_cast< SCROW >( *aIt );
         if( nScRow <= MAXROW )
-            rDoc.SetRowFlags( nScRow, nScTab, rDoc.GetRowFlags( nScRow, nScTab ) | CR_MANUALBREAK );
+            rDoc.SetRowBreak(nScRow, nScTab, false, true);
     }
 
     for( aIt = maData.maVerPageBreaks.begin(), aEnd = maData.maVerPageBreaks.end(); aIt != aEnd; ++aIt )
     {
         SCCOL nScCol = static_cast< SCCOL >( *aIt );
         if( nScCol <= MAXCOL )
-            rDoc.SetColFlags( nScCol, nScTab, rDoc.GetColFlags( nScCol, nScTab ) | CR_MANUALBREAK );
+            rDoc.SetColBreak(nScCol, nScTab, false, true);
     }
 }
 
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 2b303a178..bae219208 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -1379,14 +1379,15 @@ void XclImpPivotTable::Convert()
         if( const XclImpPTField* pField = GetField( *aIt ) )
             pField->ConvertPageField( aSaveData );
 
-#if 0 // Why do we do this ???
+    // We need to import hidden fields because hidden fields may contain
+    // special settings for subtotals (aggregation function, filters, custom
+    // name etc.) and members (hidden, custom name etc.).
 
     // hidden fields
     for( sal_uInt16 nField = 0, nCount = GetFieldCount(); nField < nCount; ++nField )
         if( const XclImpPTField* pField = GetField( nField ) )
             if( (pField->GetAxes() & EXC_SXVD_AXIS_ROWCOLPAGE) == 0 )
                 pField->ConvertHiddenField( aSaveData );
-#endif
 
     // data fields
     for( aIt = maFiltDataFields.begin(), aEnd = maFiltDataFields.end(); aIt != aEnd; ++aIt )
@@ -1422,7 +1423,7 @@ void XclImpPivotTable::Convert()
     pDPObj->SetAlive( TRUE );
     pDPObj->SetHeaderLayout( maPTViewEx9Info.mnGridLayout == 0 );
 
-    GetDoc().GetDPCollection()->Insert( pDPObj );
+    GetDoc().GetDPCollection()->InsertNewTable(pDPObj);
     mpDPObj = pDPObj;
 
     ApplyMergeFlags(aOutRange, aSaveData);
@@ -1434,10 +1435,7 @@ void XclImpPivotTable::MaybeRefresh()
     {
         // 'refresh table on load' flag is set.  Refresh the table now.  Some
         // Excel files contain partial table output when this flag is set.
-        //mpDPObj->Output();
-        // #FIXME  change from above is just to satisfy compiler,
-        // it probably makes no sense
-        mpDPObj->Output( mpDPObj->GetOutRange().aStart );
+        mpDPObj->Output(maOutScRange.aStart);
     }
 }
 
@@ -1445,7 +1443,7 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD
 {
     // Apply merge flags for varoius datapilot controls.
 
-    ScDPOutputGeometry aGeometry(rOutRange, false);
+    ScDPOutputGeometry aGeometry(rOutRange, false, ScDPOutputGeometry::XLS);
     aGeometry.setColumnFieldCount(maPTInfo.mnColFields);
     aGeometry.setPageFieldCount(maPTInfo.mnPageFields);
     aGeometry.setDataFieldCount(maPTInfo.mnDataFields);
@@ -1468,10 +1466,8 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD
         if (rSaveData.HasInvisibleMember(aName))
             nMFlag |= SC_MF_HIDDEN_MEMBER;
 
-        ScMergeFlagAttr aAttr(nMFlag);
-        rDoc.ApplyAttr(itr->Col(), itr->Row(), itr->Tab(), aAttr);
-        ScMergeFlagAttr aAttr2(SC_MF_AUTO);
-        rDoc.ApplyAttr(itr->Col()+1, itr->Row(), itr->Tab(), aAttr2);
+        rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), nMFlag);
+        rDoc.ApplyFlagsTab(itr->Col()+1, itr->Row(), itr->Col()+1, itr->Row(), itr->Tab(), SC_MF_AUTO);
     }
 
     vector<ScAddress> aColBtns;
@@ -1485,29 +1481,40 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD
         rDoc.GetString(itr->Col(), itr->Row(), itr->Tab(), aName);
         if (rSaveData.HasInvisibleMember(aName))
             nMFlag |= SC_MF_HIDDEN_MEMBER;
-        ScMergeFlagAttr aAttr(nMFlag);
-        rDoc.ApplyAttr(itr->Col(), itr->Row(), itr->Tab(), aAttr);
+        rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), nMFlag);
     }
 
     vector<ScAddress> aRowBtns;
     aGeometry.getRowFieldPositions(aRowBtns);
-    itr    = aRowBtns.begin();
-    itrEnd = aRowBtns.end();
-    for (; itr != itrEnd; ++itr)
+    if (aRowBtns.empty())
     {
-        sal_Int16 nMFlag = SC_MF_BUTTON | SC_MF_BUTTON_POPUP;
-        String aName;
-        rDoc.GetString(itr->Col(), itr->Row(), itr->Tab(), aName);
-        if (rSaveData.HasInvisibleMember(aName))
-            nMFlag |= SC_MF_HIDDEN_MEMBER;
-        ScMergeFlagAttr aAttr(nMFlag);
-        rDoc.ApplyAttr(itr->Col(), itr->Row(), itr->Tab(), aAttr);
+        if (bDataLayout)
+        {
+            // No row fields, but the data layout button exists.
+            SCROW nRow = aGeometry.getRowFieldHeaderRow();
+            SCCOL nCol = rOutRange.aStart.Col();
+            SCTAB nTab = rOutRange.aStart.Tab();
+            rDoc.ApplyFlagsTab(nCol, nRow, nCol, nRow, nTab, SC_MF_BUTTON);
+        }
     }
-    if (bDataLayout)
+    else
     {
-        --itr; // move back to the last row field position.
-        ScMergeFlagAttr aAttr(SC_MF_BUTTON);
-        rDoc.ApplyAttr(itr->Col()+1, itr->Row(), itr->Tab(), aAttr);
+        itr    = aRowBtns.begin();
+        itrEnd = aRowBtns.end();
+        for (; itr != itrEnd; ++itr)
+        {
+            sal_Int16 nMFlag = SC_MF_BUTTON | SC_MF_BUTTON_POPUP;
+            String aName;
+            rDoc.GetString(itr->Col(), itr->Row(), itr->Tab(), aName);
+            if (rSaveData.HasInvisibleMember(aName))
+                nMFlag |= SC_MF_HIDDEN_MEMBER;
+            rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), nMFlag);
+        }
+        if (bDataLayout)
+        {
+            --itr; // move back to the last row field position.
+            rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), SC_MF_BUTTON);
+        }
     }
 }
 
diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx
index 55ba4bdc4..30cab47f5 100644
--- a/sc/source/filter/excel/xiroot.cxx
+++ b/sc/source/filter/excel/xiroot.cxx
@@ -52,7 +52,6 @@
 XclImpRootData::XclImpRootData( XclBiff eBiff, SfxMedium& rMedium,
         SotStorageRef xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc ) :
     XclRootData( eBiff, rMedium, xRootStrg, rDoc, eTextEnc, false ),
-    mbPassQueried( false ),
     mbHasCodePage( false )
 {
 }
@@ -270,16 +269,5 @@ String XclImpRoot::GetScAddInName( const String& rXclName ) const
     return rXclName;
 }
 
-const String& XclImpRoot::QueryPassword() const
-{
-    if( !mrImpData.mbPassQueried )
-    {
-        mrImpData.maPassw = ScfApiHelper::QueryPasswordForMedium( GetMedium() );
-        // set to true, even if dialog has been cancelled (never ask twice)
-        mrImpData.mbPassQueried = true;
-    }
-    return mrImpData.maPassw;
-}
-
 // ============================================================================
 
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index 7b1966097..b168c4389 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -31,13 +31,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-// ============================================================================
 #include "xistream.hxx"
 #include "xlstring.hxx"
 #include "xiroot.hxx"
 
 #include <vector>
 
+using ::rtl::OString;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
 // ============================================================================
 // Decryption
 // ============================================================================
@@ -50,6 +53,7 @@ XclImpDecrypter::XclImpDecrypter() :
 }
 
 XclImpDecrypter::XclImpDecrypter( const XclImpDecrypter& rSrc ) :
+    ::comphelper::IDocPasswordVerifier(),
     mnError( rSrc.mnError ),
     mnOldPos( STREAM_SEEK_TO_END ),
     mnRecSize( 0 )
@@ -68,6 +72,13 @@ XclImpDecrypterRef XclImpDecrypter::Clone() const
     return xNewDecr;
 }
 
+::comphelper::DocPasswordVerifierResult XclImpDecrypter::verifyPassword( const OUString& rPassword )
+{
+    bool bValid = OnVerify( rPassword );
+    mnError = bValid ? ERRCODE_NONE : ERRCODE_ABORT;
+    return bValid ? ::comphelper::DocPasswordVerifierResult_OK : ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+}
+
 void XclImpDecrypter::Update( SvStream& rStrm, sal_uInt16 nRecSize )
 {
     if( IsValid() )
@@ -99,47 +110,48 @@ sal_uInt16 XclImpDecrypter::Read( SvStream& rStrm, void* pData, sal_uInt16 nByte
     return nRet;
 }
 
-const String XclImpDecrypter::GetPassword() const
-{
-    return maPass;
-}
+// ----------------------------------------------------------------------------
 
-void XclImpDecrypter::SetHasValidPassword( bool bValid )
+XclImpBiff5Decrypter::XclImpBiff5Decrypter( sal_uInt16 nKey, sal_uInt16 nHash ) :
+    maPassword( 16 ),
+    mnKey( nKey ),
+    mnHash( nHash )
 {
-    mnError = bValid ? ERRCODE_NONE : EXC_ENCR_ERROR_WRONG_PASS;
 }
 
-void XclImpDecrypter::SetPassword( const String& rPass )
+XclImpBiff5Decrypter::XclImpBiff5Decrypter( const XclImpBiff5Decrypter& rSrc ) :
+    XclImpDecrypter( rSrc ),
+    maPassword( rSrc.maPassword ),
+    mnKey( rSrc.mnKey ),
+    mnHash( rSrc.mnHash )
 {
-    maPass = rPass;
+    if( IsValid() )
+        maCodec.InitKey( &maPassword.front() );
 }
 
-// ----------------------------------------------------------------------------
-
-XclImpBiff5Decrypter::XclImpBiff5Decrypter( const XclImpRoot& rRoot, sal_uInt16 nKey, sal_uInt16 nHash )
+XclImpBiff5Decrypter* XclImpBiff5Decrypter::OnClone() const
 {
-    Init( XclCryptoHelper::GetBiff5WbProtPassword(), nKey, nHash );
-    if( !IsValid() )
-    {
-        //! TODO: correct byte string encoding in all cases?
-        ByteString aPass( rRoot.QueryPassword(), RTL_TEXTENCODING_MS_1252 );
-        Init( aPass, nKey, nHash );
-    }
+    return new XclImpBiff5Decrypter( *this );
 }
 
-XclImpBiff5Decrypter::XclImpBiff5Decrypter( const XclImpBiff5Decrypter& rSrc ) :
-    XclImpDecrypter( rSrc )
+bool XclImpBiff5Decrypter::OnVerify( const OUString& rPassword )
 {
-    if( rSrc.IsValid() )
+    /*  Convert password to a byte string. TODO: this needs some finetuning
+        according to the spec... */
+    OString aBytePassword = OUStringToOString( rPassword, osl_getThreadTextEncoding() );
+    sal_Int32 nLen = aBytePassword.getLength();
+    if( (0 < nLen) && (nLen < 16) )
     {
-        memcpy( mpnPassw, rSrc.mpnPassw, sizeof( mpnPassw ) );
-        maCodec.InitKey( mpnPassw );
-    }
-}
+        // copy byte string to sal_uInt8 array
+        maPassword.clear();
+        maPassword.resize( 16, 0 );
+        memcpy( &maPassword.front(), aBytePassword.getStr(), static_cast< size_t >( nLen ) );
 
-XclImpBiff5Decrypter* XclImpBiff5Decrypter::OnClone() const
-{
-    return new XclImpBiff5Decrypter( *this );
+        // init codec
+        maCodec.InitKey( &maPassword.front() );
+        return maCodec.VerifyKey( mnKey, mnHash );
+    }
+    return false;
 }
 
 void XclImpBiff5Decrypter::OnUpdate( sal_Size /*nOldStrmPos*/, sal_Size nNewStrmPos, sal_uInt16 nRecSize )
@@ -155,48 +167,26 @@ sal_uInt16 XclImpBiff5Decrypter::OnRead( SvStream& rStrm, sal_uInt8* pnData, sal
     return nRet;
 }
 
-void XclImpBiff5Decrypter::Init( const ByteString& rPass, sal_uInt16 nKey, sal_uInt16 nHash )
-{
-    xub_StrLen nLen = rPass.Len();
-    bool bValid = (0 < nLen) && (nLen < 16);
-
-    if( bValid )
-    {
-        // transform ByteString to sal_uInt8 array
-        memset( mpnPassw, 0, sizeof( mpnPassw ) );
-        for( xub_StrLen nChar = 0; nChar < nLen; ++nChar )
-            mpnPassw[ nChar ] = static_cast< sal_uInt8 >( rPass.GetChar( nChar ) );
-        // init codec
-        maCodec.InitKey( mpnPassw );
-        bValid = maCodec.VerifyKey( nKey, nHash );
-
-        String aUniPass( rPass, RTL_TEXTENCODING_MS_1252 );
-        SetPassword( aUniPass );
-    }
-
-    SetHasValidPassword( bValid );
-}
-
 // ----------------------------------------------------------------------------
 
-XclImpBiff8Decrypter::XclImpBiff8Decrypter(
-        const XclImpRoot& rRoot, sal_uInt8 pnDocId[ 16 ],
-        sal_uInt8 pnSaltData[ 16 ], sal_uInt8 pnSaltHash[ 16 ] )
+XclImpBiff8Decrypter::XclImpBiff8Decrypter( sal_uInt8 pnSalt[ 16 ],
+        sal_uInt8 pnVerifier[ 16 ], sal_uInt8 pnVerifierHash[ 16 ] ) :
+    maPassword( 16, 0 ),
+    maSalt( pnSalt, pnSalt + 16 ),
+    maVerifier( pnVerifier, pnVerifier + 16 ),
+    maVerifierHash( pnVerifierHash, pnVerifierHash + 16 )
 {
-    Init( XclCryptoHelper::GetBiff8WbProtPassword(), pnDocId, pnSaltData, pnSaltHash );
-    if( !IsValid() )
-        Init( rRoot.QueryPassword(), pnDocId, pnSaltData, pnSaltHash );
 }
 
 XclImpBiff8Decrypter::XclImpBiff8Decrypter( const XclImpBiff8Decrypter& rSrc ) :
-    XclImpDecrypter( rSrc )
+    XclImpDecrypter( rSrc ),
+    maPassword( rSrc.maPassword ),
+    maSalt( rSrc.maSalt ),
+    maVerifier( rSrc.maVerifier ),
+    maVerifierHash( rSrc.maVerifierHash )
 {
-    if( rSrc.IsValid() )
-    {
-        memcpy( mpnPassw, rSrc.mpnPassw, sizeof( mpnPassw ) );
-        memcpy( mpnDocId, rSrc.mpnDocId, sizeof( mpnDocId ) );
-        maCodec.InitKey( mpnPassw, mpnDocId );
-    }
+    if( IsValid() )
+        maCodec.InitKey( &maPassword.front(), &maSalt.front() );
 }
 
 XclImpBiff8Decrypter* XclImpBiff8Decrypter::OnClone() const
@@ -204,6 +194,27 @@ XclImpBiff8Decrypter* XclImpBiff8Decrypter::OnClone() const
     return new XclImpBiff8Decrypter( *this );
 }
 
+bool XclImpBiff8Decrypter::OnVerify( const OUString& rPassword )
+{
+    sal_Int32 nLen = rPassword.getLength();
+    if( (0 < nLen) && (nLen < 16) )
+    {
+        // copy string to sal_uInt16 array
+        maPassword.clear();
+        maPassword.resize( 16, 0 );
+        const sal_Unicode* pcChar = rPassword.getStr();
+        const sal_Unicode* pcCharEnd = pcChar + nLen;
+        ::std::vector< sal_uInt16 >::iterator aIt = maPassword.begin();
+        for( ; pcChar < pcCharEnd; ++pcChar, ++aIt )
+            *aIt = static_cast< sal_uInt16 >( *pcChar );
+
+        // init codec
+        maCodec.InitKey( &maPassword.front(), &maSalt.front() );
+        return maCodec.VerifyKey( &maVerifier.front(), &maVerifierHash.front() );
+    }
+    return false;
+}
+
 void XclImpBiff8Decrypter::OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 /*nRecSize*/ )
 {
     if( nNewStrmPos != nOldStrmPos )
@@ -252,31 +263,6 @@ sal_uInt16 XclImpBiff8Decrypter::OnRead( SvStream& rStrm, sal_uInt8* pnData, sal
     return nRet;
 }
 
-void XclImpBiff8Decrypter::Init(
-        const String& rPass, sal_uInt8 pnDocId[ 16 ],
-        sal_uInt8 pnSaltData[ 16 ], sal_uInt8 pnSaltHash[ 16 ] )
-{
-    xub_StrLen nLen = rPass.Len();
-    bool bValid = (0 < nLen) && (nLen < 16);
-
-    if( bValid )
-    {
-        // transform String to sal_uInt16 array
-        memset( mpnPassw, 0, sizeof( mpnPassw ) );
-        for( xub_StrLen nChar = 0; nChar < nLen; ++nChar )
-            mpnPassw[ nChar ] = static_cast< sal_uInt16 >( rPass.GetChar( nChar ) );
-        // copy document ID
-        memcpy( mpnDocId, pnDocId, sizeof( mpnDocId ) );
-        // init codec
-        maCodec.InitKey( mpnPassw, mpnDocId );
-        bValid = maCodec.VerifyKey( pnSaltData, pnSaltHash );
-
-        SetPassword(rPass);
-    }
-
-    SetHasValidPassword( bValid );
-}
-
 sal_uInt32 XclImpBiff8Decrypter::GetBlock( sal_Size nStrmPos ) const
 {
     return static_cast< sal_uInt32 >( nStrmPos / EXC_ENCR_BLOCKSIZE );
@@ -485,12 +471,12 @@ void XclImpStream::PopPosition()
     }
 }
 
-void XclImpStream::RejectPosition()
-{
-    DBG_ASSERT( !maPosStack.empty(), "XclImpStream::RejectPosition - stack empty" );
-    if( !maPosStack.empty() )
-        maPosStack.pop_back();
-}
+//UNUSED2008-05  void XclImpStream::RejectPosition()
+//UNUSED2008-05  {
+//UNUSED2008-05      DBG_ASSERT( !maPosStack.empty(), "XclImpStream::RejectPosition - stack empty" );
+//UNUSED2008-05      if( !maPosStack.empty() )
+//UNUSED2008-05          maPosStack.pop_back();
+//UNUSED2008-05  }
 
 void XclImpStream::StoreGlobalPosition()
 {
diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx
index 5e785cae5..d6e0b3182 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -94,8 +94,7 @@ void XclImpString::Read( XclImpStream& rStrm, XclStrFlags nFlags )
                 ReadFormats( rStrm, nRunCount );
 
             // --- extended (FarEast) information ---
-            if( nExtInf > 0 )
-                ReadPhoneticSettings( rStrm, nExtInf );
+            rStrm.Ignore( nExtInf );
         }
         break;
 
@@ -162,31 +161,6 @@ void XclImpString::ReadObjFormats( XclImpStream& rStrm, XclFormatRunVec& rFormat
     }
 }
 
-void XclImpString::ReadPhoneticSettings( XclImpStream& rStrm, sal_uInt32 /*nExtInf*/ )
-{
-    PhoneticPortionVec xPortions;
-
-    rStrm.Ignore( 2 ); // Unknown indentifier 0001
-
-    sal_uInt16 nSize, nFontIdx, nAdditional, nPortions, nLength, nRepeatedLength;
-    rStrm >> nSize >> nFontIdx >> nAdditional >> nPortions >> nLength >> nRepeatedLength;
-
-    if ( nLength == 0 )
-        rStrm.Ignore( 2 );
-    else
-        maPhoneticString = rStrm.ReadRawUniString( nLength, true );
-    
-    for ( sal_uInt16 nIdx = 0; nIdx < nPortions; ++nIdx )
-    {
-        sal_uInt16 ncpa, ncpm, nccm;
-        rStrm >> ncpa >> ncpm >> nccm;
-        xPortions.push_back ( PhoneticPortion( ncpa, ncpm, nccm ) );
-    }
-
-    maPhonetic = ScPhonetic ( nFontIdx, nAdditional, nRepeatedLength,
-                              maPhoneticString, xPortions );
-}
-
 // String iterator ============================================================
 
 XclImpStringIterator::XclImpStringIterator( const XclImpString& rString ) :
diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx
index 55525adf5..ce76483c5 100644
--- a/sc/source/filter/excel/xiview.cxx
+++ b/sc/source/filter/excel/xiview.cxx
@@ -109,6 +109,24 @@ void XclImpTabViewSettings::Initialize()
     maData.SetDefaults();
 }
 
+void XclImpTabViewSettings::ReadTabBgColor( XclImpStream& rStrm, XclImpPalette& rPal )
+{
+    DBG_ASSERT_BIFF( GetBiff() >= EXC_BIFF8 );
+    if( GetBiff() < EXC_BIFF8 )
+        return;
+
+    sal_uInt8 ColorIndex;
+    Color TabBgColor;
+
+    rStrm.Ignore( 16 );
+    ColorIndex = rStrm.ReaduInt8() & EXC_SHEETEXT_TABCOLOR; //0x7F
+    if ( ColorIndex >= 8 && ColorIndex <= 63 ) //only accept valid index values
+    {
+        TabBgColor = rPal.GetColor( ColorIndex );
+        maData.maTabBgColor = TabBgColor;
+    }
+}
+
 void XclImpTabViewSettings::ReadWindow2( XclImpStream& rStrm, bool bChart )
 {
     if( GetBiff() == EXC_BIFF2 )
@@ -281,6 +299,10 @@ void XclImpTabViewSettings::Finalize()
         aViewOpt.SetOption( VOPT_OUTLINER, maData.mbShowOutline );
         rDoc.SetViewOptions( aViewOpt );
     }
+
+    // *** set tab bg color
+    if ( !maData.IsDefaultTabBgColor() )
+        rTabSett.maTabBgColor = maData.maTabBgColor;
 }
 
 // ============================================================================
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 88eb9d0bf..066eb57a6 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -144,21 +144,20 @@ void lclGetRowFromY(
     // rnStartH in conjunction with nXclStartRow is used as buffer for previously calculated height
     long nTwipsY = static_cast< long >( nY / fScale + 0.5 );
     long nRowH = 0;
-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
-            rDoc.GetRowFlagsArray( nScTab), static_cast<SCROW>(nXclStartRow),
-            MAXROW, CR_HIDDEN, 0, rDoc.GetRowHeightArray( nScTab));
-    for ( ; aIter; ++aIter )
+    bool bFound = false;
+    for (SCROW nRow = static_cast<SCROW>(nXclStartRow); nRow <= MAXROW; ++nRow)
     {
-        nRowH = *aIter;
+        nRowH = rDoc.GetRowHeight(nRow, nScTab);
         if( rnStartH + nRowH > nTwipsY )
         {
-            rnXclRow = static_cast< sal_uInt16 >( aIter.GetPos() );
+            rnXclRow = static_cast< sal_uInt16 >(nRow);
+            bFound = true;
             break;
         }
         rnStartH += nRowH;
     }
-    if (!aIter)
-        rnXclRow = static_cast< sal_uInt16 >( aIter.GetIterEnd() );  // down to the bottom..
+    if (!bFound)
+        rnXclRow = static_cast<sal_uInt16>(MAXROW);
     rnOffset = static_cast< sal_uInt16 >( nRowH ? ((nTwipsY - rnStartH) * 256.0 / nRowH + 0.5) : 0 );
 }
 
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 94b395114..7ca2f8048 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -327,12 +327,12 @@ static const XclFunctionInfo saFuncTable_5[] =
 
 const sal_Char* const EXC_FUNCNAME_BAHTTEXT = EXC_FUNCNAME_PREFIX "BAHTTEXT";
 
-/** Functions new in BIFF8. */
+/** Functions new in BIFF8. Unsupported functions: PHONETIC. */
 static const XclFunctionInfo saFuncTable_8[] =
 {
     { ocGetPivotData,       358,    2,  30, V, { V, R, V }, 0, 0 },
     { ocHyperLink,          359,    1,  2,  V, { V }, 0, 0 },
-    { ocPhonetic,           360,    1,  1,  V, { R }, 0, 0 },    // PHONETIC
+    { ocNoName,             360,    1,  1,  V, { R }, EXC_FUNCFLAG_IMPORTONLY, 0 },    // PHONETIC
     { ocAverageA,           361,    1,  30, V, { R }, 0, 0 },
     { ocMaxA,               362,    1,  30, V, { R }, 0, 0 },
     { ocMinA,               363,    1,  30, V, { R }, 0, 0 },
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 8f5ddadd0..29522f4f5 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -79,6 +79,7 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
     mrMedium( rMedium ),
     mxRootStrg( xRootStrg ),
     mrDoc( rDoc ),
+    maDefPassword( CREATE_STRING( "VelvetSweatshop" ) ),
     meTextEnc( eTextEnc ),
     meSysLang( Application::GetSettings().GetLanguage() ),
     meDocLang( Application::GetSettings().GetLanguage() ),
@@ -198,6 +199,13 @@ void XclRoot::SetCharWidth( const XclFontData& rFontData )
     }
 }
 
+String XclRoot::RequestPassword( ::comphelper::IDocPasswordVerifier& rVerifier ) const
+{
+    ::std::vector< OUString > aDefaultPasswords;
+    aDefaultPasswords.push_back( mrData.maDefPassword );
+    return ScfApiHelper::QueryPasswordForMedium( mrData.mrMedium, rVerifier, &aDefaultPasswords );
+}
+
 bool XclRoot::HasVbaStorage() const
 {
     SotStorageRef xRootStrg = GetRootStorage();
diff --git a/sc/source/filter/excel/xlstream.cxx b/sc/source/filter/excel/xlstream.cxx
deleted file mode 100644
index d8b766a77..000000000
--- a/sc/source/filter/excel/xlstream.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: xlstream.cxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sc.hxx"
-
-// ============================================================================
-#include "xlstream.hxx"
-
-// Encryption/decryption ======================================================
-
-const ByteString XclCryptoHelper::GetBiff5WbProtPassword()
-{
-    static const ByteString saPass( "VelvetSweatshop" );
-    return saPass;
-}
-
-const String XclCryptoHelper::GetBiff8WbProtPassword()
-{
-    static const String saPass( GetBiff5WbProtPassword(), RTL_TEXTENCODING_ASCII_US );
-    return saPass;
-}
-
-// ============================================================================
-
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index 6591539e6..b7eacb125 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -122,16 +122,32 @@ void CTB::Print( FILE* fp )
     }
 }
 
-bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
+bool CTB::IsMenuToolbar()
 {
+    return tb.IsMenuToolbar();
+}
+
+bool CTB::ImportMenuTB( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& xMenuDesc, CustomToolBarImportHelper& helper )
+{
+    sal_Int32 index = 0;
+    for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it, ++index )
+    {
+        if ( !it->ImportToolBarControl( rWrapper, xMenuDesc, helper, IsMenuToolbar() ) )
+            return false;
+    }
+    return true;
+}
+
+bool CTB::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper )
+{
+
     static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) );
     bool bRes = false;
     try
     {
-        // #Fixme same issue here as in word, some deleted data
-        // seems to still exist
         if ( !tb.IsEnabled() )
             return true;  // didn't fail, just ignoring
+
         // Create default setting
         uno::Reference< container::XIndexContainer > xIndexContainer( helper.getCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
         uno::Reference< container::XIndexAccess > xIndexAccess( xIndexContainer, uno::UNO_QUERY_THROW );
@@ -143,8 +159,7 @@ bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
         rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() );
         for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
         {
-            // createToolBar item for control
-            if ( !it->ImportToolBarControl( xIndexContainer, helper ) )
+            if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, helper, IsMenuToolbar() ) )
                 return false;
         }
 
@@ -152,12 +167,13 @@ bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
 
         helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess );
         helper.applyIcons();
-
+#if 0
         uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
         xPersistence->store();
 
         xPersistence.set( helper.getCfgManager(), uno::UNO_QUERY_THROW );
         xPersistence->store();
+#endif 
     
         bRes = true;
     }
@@ -233,7 +249,7 @@ TBC::Print(FILE* fp)
         tbcd->Print( fp );    
 }
 
-bool TBC::ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper )
+bool TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuToolbar )
 {
     // how to identify built-in-command ?
 //    bool bBuiltin = false;
@@ -256,8 +272,31 @@ bool TBC::ImportToolBarControl( const css::uno::Reference< css::container::XInde
         }
 */
         bool bBeginGroup = false;
-        if ( ! tbcd->ImportToolBarControl( toolbarcontainer, helper, props, bBeginGroup ) )
+        if ( ! tbcd->ImportToolBarControl( helper, props, bBeginGroup, bIsMenuToolbar ) )
             return false;
+        TBCMenuSpecific* pMenu = tbcd->getMenuSpecific();
+        if ( pMenu )
+        {
+            // search for CTB with the appropriate name ( it contains the
+            // menu items, although we cannot import ( or create ) a menu on
+            // a custom toolbar we can import the menu items in a separate 
+            // toolbar ( better than nothing )
+            CTB* pCustTB = rWrapper.GetCustomizationData( pMenu->Name() );
+            if ( pCustTB )
+            {
+                 uno::Reference< container::XIndexContainer > xMenuDesc;
+                 uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+                 xMenuDesc.set( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.IndexedPropertyValues" ) ) ), uno::UNO_QUERY_THROW );
+                if ( !pCustTB->ImportMenuTB( rWrapper, xMenuDesc, helper ) )
+                    return false;     
+                OSL_TRACE("*** Read menu, no. items is %d", xMenuDesc->getCount() );
+                beans::PropertyValue aProp;
+		
+                aProp.Name =  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") );
+                aProp.Value <<= xMenuDesc;
+                props.push_back( aProp );
+            } 
+        }
 
         if ( bBeginGroup )
         {
@@ -346,6 +385,20 @@ CTBWrapper::Print( FILE* fp )
     } 
 }
 
+CTB* CTBWrapper::GetCustomizationData( const rtl::OUString& sTBName )
+{
+    CTB* pCTB = NULL;
+    for ( std::vector< CTB >::iterator it = rCTB.begin(); it != rCTB.end(); ++it )
+    {
+        if ( it->GetName().equals( sTBName ) )
+        {
+            pCTB = &(*it);
+            break;
+        }
+    }
+    return pCTB;
+}
+
 bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh )
 {
     std::vector<CTB>::iterator it_end = rCTB.end();
@@ -356,8 +409,17 @@ bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh )
         uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xAppCfgSupp( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) ) ), uno::UNO_QUERY_THROW ); 
         CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument" ) ) ) );
         helper.setMSOCommandMap( new  MSOExcelCommandConvertor() );
-        if ( !(*it).ImportCustomToolBar( helper ) )
-            return false;
+        // Ignore menu toolbars, excel doesn't ( afaics ) store
+        // menu customizations ( but you can have menus in a customtoolbar
+        // such menus will be dealt with when they are encountered 
+        // as part of importing the appropriate MenuSpecific toolbar control )
+
+
+        if ( !(*it).IsMenuToolbar() ) 
+        {
+            if ( !(*it).ImportCustomToolBar( *this, helper ) )
+                return false;
+        }
     } 
     return true;
 }
diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx
index af986c7c0..deef46c18 100644
--- a/sc/source/filter/excel/xltoolbar.hxx
+++ b/sc/source/filter/excel/xltoolbar.hxx
@@ -5,6 +5,7 @@
 
 namespace css = ::com::sun::star;
 
+class CTBWrapper;
 // hmm I don't normally use these packed structures
 // but.. hey always good to do something different
 class TBCCmd : public TBBase
@@ -31,7 +32,7 @@ public:
     ~TBC(){}
     void Print( FILE* );
     bool Read(SvStream *pS);
-    bool ImportToolBarControl( const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper );
+    bool ImportToolBarControl( CTBWrapper&, const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar );
 };
  
 class CTB : public TBBase
@@ -41,13 +42,19 @@ class CTB : public TBBase
     std::vector<TBVisualData> rVisualData;
     sal_uInt32 ectbid;
     std::vector< TBC > rTBC;
+    bool ImportCustomToolBar_Impl( CTBWrapper&, CustomToolBarImportHelper& );
 public:
     CTB();
     CTB(sal_uInt16);
     ~CTB(){}
     void Print( FILE* );
     bool Read(SvStream *pS);
-    bool ImportCustomToolBar( CustomToolBarImportHelper& );
+    bool IsMenuToolbar();
+    bool ImportCustomToolBar( CTBWrapper&, CustomToolBarImportHelper& );
+    bool ImportMenuTB( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
+    rtl::OUString GetName() { return tb.getName().getString(); }
+
+
 };
 
 class CTBS : public TBBase
@@ -81,6 +88,7 @@ public:
     bool Read(SvStream *pS);
     void Print( FILE* );
     bool ImportCustomToolBar( SfxObjectShell& rDocSh );
+    CTB* GetCustomizationData( const rtl::OUString& name );
 };
 
 
diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx
index 080075b01..8580d7a64 100644
--- a/sc/source/filter/excel/xlview.cxx
+++ b/sc/source/filter/excel/xlview.cxx
@@ -79,6 +79,7 @@ void XclTabViewData::SetDefaults()
     mbDefGridColor = true;
     mbShowFormulas = false;
     mbShowGrid = mbShowHeadings = mbShowZeros = mbShowOutline = true;
+    maTabBgColor.SetColor( COL_AUTO );
 }
 
 bool XclTabViewData::IsSplit() const
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index 3befbf4d8..31190b640 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -35,9 +35,8 @@
 #include <algorithm>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/task/XInteractionRequest.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
+#include <comphelper/docpasswordhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/objsh.hxx>
@@ -45,7 +44,6 @@
 #include <sfx2/sfxsids.hrc>
 #include <svtools/stritem.hxx>
 #include <svtools/itemset.hxx>
-#include <svtools/docpasswdrequest.hxx>
 #include "miscuno.hxx"
 
 using ::rtl::OUString;
@@ -55,14 +53,14 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Exception;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
+using ::com::sun::star::uno::UNO_SET_THROW;
 using ::com::sun::star::uno::TypeClass_BOOLEAN;
 using ::com::sun::star::uno::XInterface;
 using ::com::sun::star::beans::XPropertySet;
 using ::com::sun::star::beans::XPropertyState;
 using ::com::sun::star::lang::XServiceName;
 using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::task::XInteractionHandler;
-using ::com::sun::star::task::XInteractionRequest;
+using ::com::sun::star::task::PasswordRequestMode_PASSWORD_ENTER;
 
 // Static helper functions ====================================================
 
@@ -141,40 +139,25 @@ Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs(
     return CreateInstanceWithArgs( ::comphelper::getProcessServiceFactory(), rServiceName, rArgs );
 }
 
-String ScfApiHelper::QueryPasswordForMedium( SfxMedium& rMedium )
+String ScfApiHelper::QueryPasswordForMedium( SfxMedium& rMedium,
+        ::comphelper::IDocPasswordVerifier& rVerifier, const ::std::vector< OUString >* pDefaultPasswords )
 {
-    String aPassw;
-    const SfxItemSet* pSet = rMedium.GetItemSet();
+    OUString aMediaPassword;
+    SfxItemSet* pItemSet = rMedium.GetItemSet();
     const SfxPoolItem *pPasswordItem;
+    if( pItemSet && (SFX_ITEM_SET == pItemSet->GetItemState( SID_PASSWORD, TRUE, &pPasswordItem )) )
+        aMediaPassword = static_cast< const SfxStringItem* >( pPasswordItem )->GetValue();
+    OUString aDocName = INetURLObject( rMedium.GetOrigURL() ).GetName( INetURLObject::DECODE_WITH_CHARSET );
 
-    if( pSet && (SFX_ITEM_SET == pSet->GetItemState( SID_PASSWORD, TRUE, &pPasswordItem )) )
-    {
-        aPassw = static_cast< const SfxStringItem* >( pPasswordItem )->GetValue();
-    }
-    else
-    {
-        try
-        {
-            Reference< XInteractionHandler > xHandler( rMedium.GetInteractionHandler() );
-            if( xHandler.is() )
-            {
-                RequestDocumentPassword* pRequest = new RequestDocumentPassword(
-                    ::com::sun::star::task::PasswordRequestMode_PASSWORD_ENTER,
-                    INetURLObject( rMedium.GetOrigURL() ).GetName( INetURLObject::DECODE_WITH_CHARSET ) );
-                Reference< XInteractionRequest > xRequest( pRequest );
-
-               xHandler->handle( xRequest );
-
-               if( pRequest->isPassword() )
-                   aPassw = pRequest->getPassword();
-            }
-        }
-        catch( Exception& )
-        {
-        }
-    }
+    bool bIsDefaultPassword = false;
+    OUString aPassword = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
+        rVerifier, aMediaPassword, rMedium.GetInteractionHandler(), aDocName,
+        ::comphelper::DocPasswordRequestType_MS, pDefaultPasswords, &bIsDefaultPassword );
+
+    if( !bIsDefaultPassword && (aPassword.getLength() > 0) && pItemSet )
+        pItemSet->Put( SfxStringItem( SID_PASSWORD, aPassword ) );
 
-    return aPassw;
+    return aPassword;
 }
 
 // Property sets ==============================================================
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index ecb2b2a5a..9698b9d6d 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -749,7 +749,7 @@ void ScHTMLExport::WriteTables()
         SCCOL nCol;
         for ( nCol=nStartCol; nCol<=nEndCol; nCol++ )
         {
-            if ( !(pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN) )
+			if ( !pDoc->ColHidden(nCol, nTab) )
                 ++nColCnt;
         }
         (((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_cols) += '=') += ByteString::CreateFromInt32( nColCnt );
@@ -770,7 +770,7 @@ void ScHTMLExport::WriteTables()
         aByteStr += '=';
         for ( nCol=nStartCol; nCol<=nEndCol; nCol++ )
         {
-            if ( pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN )
+			if ( pDoc->ColHidden(nCol, nTab) )
                 continue;	// for
 
             aByteStrOut  = aByteStr;
@@ -785,14 +785,12 @@ void ScHTMLExport::WriteTables()
         // At least old (3.x, 4.x?) Netscape doesn't follow <TABLE COLS=n> and
         // <COL WIDTH=x> specified, but needs a width at every column.
         bTableDataWidth = TRUE;     // widths in first row
-        bool bHasHiddenRows = pDoc->GetRowFlagsArray( nTab).HasCondition(
-                nStartRow, nEndRow, CR_HIDDEN, CR_HIDDEN);
+		bool bHasHiddenRows = pDoc->HasHiddenRows(nStartRow, nEndRow, nTab);
         for ( SCROW nRow=nStartRow; nRow<=nEndRow; nRow++ )
         {
-            if ( bHasHiddenRows && (pDoc->GetRowFlags( nRow, nTab ) & CR_HIDDEN) )
+			if ( bHasHiddenRows && pDoc->RowHidden(nRow, nTab) )
             {
-                nRow = pDoc->GetRowFlagsArray( nTab).GetFirstForCondition(
-                        nRow+1, nEndRow, CR_HIDDEN, 0);
+                nRow = pDoc->FirstVisibleRow(nRow+1, nEndRow, nTab);
                 --nRow;
                 continue;	// for
             }
@@ -801,7 +799,7 @@ void ScHTMLExport::WriteTables()
             bTableDataHeight = TRUE;  // height at every first cell of each row
             for ( SCCOL nCol2=nStartCol; nCol2<=nEndCol; nCol2++ )
             {
-                if ( pDoc->GetColFlags( nCol2, nTab ) & CR_HIDDEN )
+				if ( pDoc->ColHidden(nCol2, nTab) )
                     continue;	// for
 
                 if ( nCol2 == nEndCol )
diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx
index e80d67c0d..790174b4c 100644
--- a/sc/source/filter/inc/excform.hxx
+++ b/sc/source/filter/inc/excform.hxx
@@ -62,7 +62,8 @@ public:
                         ExcelToSc( const XclImpRoot& rRoot );
     virtual				~ExcelToSc();
     virtual ConvErr     Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen,
-                                 bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula );
+                                 const ConvertParam& rParam,
+                                 const FORMULA_TYPE eFT = FT_CellFormula );
 
     virtual ConvErr     Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula );
 
@@ -138,7 +139,8 @@ public:
                         ExcelToSc8( const XclImpRoot& rRoot );
     virtual				~ExcelToSc8();
 
-    virtual ConvErr     Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula );
+    virtual ConvErr     Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, 
+                                 const ConvertParam& rParam, const FORMULA_TYPE eFT = FT_CellFormula );
 
     virtual ConvErr     Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula );
 
diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx
index 33dbc8710..8a5471184 100644
--- a/sc/source/filter/inc/excimp8.hxx
+++ b/sc/source/filter/inc/excimp8.hxx
@@ -37,6 +37,7 @@
 #include "excscen.hxx"
 #include "excdefs.hxx"
 #include "ftools.hxx"
+#include "queryparam.hxx"
 
 class SotStorage;
 
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index d8881889e..f3cdc782e 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -45,6 +45,8 @@ namespace com { namespace sun { namespace star {
     namespace lang { class XMultiServiceFactory; }
 } } }
 
+namespace comphelper { class IDocPasswordVerifier; }
+
 // Static helper functions ====================================================
 
 class SfxMedium;
@@ -109,7 +111,9 @@ public:
 
     /** Opens a password dialog and returns the entered password.
         @return  The entered password or an empty string on 'Cancel' or any error. */
-    static String       QueryPasswordForMedium( SfxMedium& rMedium );
+    static String       QueryPasswordForMedium( SfxMedium& rMedium,
+                            ::comphelper::IDocPasswordVerifier& rVerifier,
+                            const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0 );
 };
 
 template< typename Type >
diff --git a/sc/source/filter/inc/fdumper.hxx b/sc/source/filter/inc/fdumper.hxx
deleted file mode 100644
index ea4aabf69..000000000
--- a/sc/source/filter/inc/fdumper.hxx
+++ /dev/null
@@ -1,1520 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: fdumper.hxx,v $
- * $Revision: 1.8.28.2 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SC_FDUMPER_HXX
-#define SC_FDUMPER_HXX
-
-#define SCF_INCL_DUMPER (OSL_DEBUG_LEVEL > 0) && 0
-
-#include <map>
-// #include <math.h>
-#include "ftools.hxx"
-
-#if SCF_INCL_DUMPER
-
-class SvStream;
-class SfxMedium;
-class SfxObjectShell;
-class Color;
-class DateTime;
-
-namespace scf {
-namespace dump {
-
-#define SCF_DUMP_UNUSED                 "unused"
-#define SCF_DUMP_UNKNOWN                "?unknown"
-
-#define SCF_DUMP_ERRASCII( ascii )      "?err:" ascii
-#define SCF_DUMP_ERRSTRING( ascii )     CREATE_STRING( SCF_DUMP_ERRASCII( ascii ) )
-
-#define SCF_DUMP_ERR_NOMAP              SCF_DUMP_ERRSTRING( "no-map" )
-#define SCF_DUMP_ERR_NONAME             SCF_DUMP_ERRSTRING( "no-name" )
-#define SCF_DUMP_ERR_STREAM             SCF_DUMP_ERRSTRING( "stream-error" )
-
-// ============================================================================
-// ============================================================================
-
-/** Specifiers for atomic data types. */
-enum DataType
-{
-    DATATYPE_VOID,              /// No data type.
-    DATATYPE_INT8,              /// Signed 8-bit integer.
-    DATATYPE_UINT8,             /// Unsigned 8-bit integer.
-    DATATYPE_INT16,             /// Signed 16-bit integer.
-    DATATYPE_UINT16,            /// Unsigned 16-bit integer.
-    DATATYPE_INT32,             /// Signed 32-bit integer.
-    DATATYPE_UINT32,            /// Unsigned 32-bit integer.
-    DATATYPE_INT64,             /// Signed 64-bit integer.
-    DATATYPE_UINT64,            /// Unsigned 64-bit integer.
-    DATATYPE_FLOAT,             /// Floating-point, single precision.
-    DATATYPE_DOUBLE             /// Floating-point, double precision.
-};
-
-// ----------------------------------------------------------------------------
-
-/** Specifiers for the output format of values. */
-enum FormatType
-{
-    FORMATTYPE_NONE,            /// No numeric format (e.g. show name only).
-    FORMATTYPE_DEC,             /// Decimal.
-    FORMATTYPE_HEX,             /// Hexadecimal.
-    FORMATTYPE_BIN,             /// Binary.
-    FORMATTYPE_FIX,             /// Fixed-point.
-    FORMATTYPE_BOOL             /// Boolean ('true' or 'false').
-};
-
-// ----------------------------------------------------------------------------
-
-/** Describes the output format of a data item.
-
-    Data items are written in the following format:
-
-    <NAME>=<VALUE>=<NAME-FROM-LIST>
-
-    NAME is the name of the data item. The name is contained in the members
-    maItemName and maItemNameUtf8. If the name is empty, only the value is
-    written (without a leading equality sign).
-
-    VALUE is the numeric value of the data item. Its format is dependent on the
-    output format given in the member meFmtType. If the format type is
-    FORMATTYPE_NONE, no value is written.
-
-    NAME-FROM-LIST is a symbolic name for the current value of the data item.
-    Various types of name lists produce different names for values, which can
-    be used for enumerations or names for single bits in bitfields (see class
-    NameListBase and derived classes). The name of the list is given in the
-    member maListName. If it is empty, no name is written for the value.
- */
-struct ItemFormat
-{
-    DataType            meDataType;         /// Data type of the item.
-    FormatType          meFmtType;          /// Output format for the value.
-    String              maItemName;         /// Name of the item.
-    ByteString          maItemNameUtf8;     /// Name of the item, converted to UTF-8.
-    String              maListName;         /// Name of a name list to be used for this item.
-
-    explicit            ItemFormat();
-
-    void                Set( DataType eDataType, FormatType eFmtType, const String& rItemName );
-    void                Set( DataType eDataType, FormatType eFmtType, const String& rItemName, const String& rListName );
-
-    /** Initializes the struct from a vector of strings containing the item format.
-
-        The vector must contain at least 2 strings. The struct is filled from
-        the strings in the vector in the following order:
-        1) Data type (one of: [u]int8, [u]int16, [u]int32, [u]int64, float, double).
-        2) Format type (one of: dec, hex, bin, fix, bool, unused, unknown).
-        3) Item name (optional).
-        4) Name list name (optional).
-
-        @return  Iterator pointing to the first unhandled string.
-     */
-    ScfStringVec::const_iterator Parse( const ScfStringVec& rFormatVec );
-
-    /** Initializes the struct from a string containing the item format.
-
-        The string must have the following format:
-        DATATYPE,FORMATTYPE[,ITEMNAME[,LISTNAME]]
-
-        DATATYPE is the data type of the item (see above for possible values).
-        FORMATTYPE is the format type of the item (see above for possible values).
-        ITEMNAME is the name of the item (optional).
-        LISTNAME is the name of a name list (optional).
-
-        @return  List containing remaining unhandled format strings.
-     */
-    ScfStringVec        Parse( const String& rFormatStr );
-};
-
-// ============================================================================
-// ============================================================================
-
-/** Static helper functions for formatted output to strings. */
-class StringHelper
-{
-public:
-    // append string to string ------------------------------------------------
-
-    static void         AppendString( String& rStr, const String& rData, xub_StrLen nWidth = 0, sal_Unicode cFill = ' ' );
-
-    // append decimal ---------------------------------------------------------
-
-    static void         AppendDec( String& rStr, sal_uInt8  nData, xub_StrLen nWidth = 0, sal_Unicode cFill = ' ' );
-    static void         AppendDec( String& rStr, sal_Int8   nData, xub_StrLen nWidth = 0, sal_Unicode cFill = ' ' );
-    static void         AppendDec( String& rStr, sal_uInt16 nData, xub_StrLen nWidth = 0, sal_Unicode cFill = ' ' );
-    static void         AppendDec( String& rStr, sal_Int16  nData, xub_StrLen nWidth = 0, sal_Unicode cFill = ' ' );
-    static void         AppendDec( String& rStr, sal_uInt32 nData, xub_StrLen nWidth = 0, sal_Unicode cFill = ' ' );
-    static void         AppendDec( String& rStr, sal_Int32  nData, xub_StrLen nWidth = 0, sal_Unicode cFill = ' ' );
-    static void         AppendDec( String& rStr, sal_uInt64 nData, xub_StrLen nWidth = 0, sal_Unicode cFill = ' ' );
-    static void         AppendDec( String& rStr, sal_Int64  nData, xub_StrLen nWidth = 0, sal_Unicode cFill = ' ' );
-    static void         AppendDec( String& rStr, double     fData, xub_StrLen nWidth = 0, sal_Unicode cFill = ' ' );
-
-    // append hexadecimal -----------------------------------------------------
-
-    static void         AppendHex( String& rStr, sal_uInt8  nData, bool bPrefix = true );
-    static void         AppendHex( String& rStr, sal_Int8   nData, bool bPrefix = true );
-    static void         AppendHex( String& rStr, sal_uInt16 nData, bool bPrefix = true );
-    static void         AppendHex( String& rStr, sal_Int16  nData, bool bPrefix = true );
-    static void         AppendHex( String& rStr, sal_uInt32 nData, bool bPrefix = true );
-    static void         AppendHex( String& rStr, sal_Int32  nData, bool bPrefix = true );
-    static void         AppendHex( String& rStr, sal_uInt64 nData, bool bPrefix = true );
-    static void         AppendHex( String& rStr, sal_Int64  nData, bool bPrefix = true );
-    static void         AppendHex( String& rStr, double     fData, bool bPrefix = true );
-
-    // append shortened hexadecimal -------------------------------------------
-
-    static void         AppendShortHex( String& rStr, sal_uInt8  nData, bool bPrefix = true );
-    static void         AppendShortHex( String& rStr, sal_Int8   nData, bool bPrefix = true );
-    static void         AppendShortHex( String& rStr, sal_uInt16 nData, bool bPrefix = true );
-    static void         AppendShortHex( String& rStr, sal_Int16  nData, bool bPrefix = true );
-    static void         AppendShortHex( String& rStr, sal_uInt32 nData, bool bPrefix = true );
-    static void         AppendShortHex( String& rStr, sal_Int32  nData, bool bPrefix = true );
-    static void         AppendShortHex( String& rStr, sal_uInt64 nData, bool bPrefix = true );
-    static void         AppendShortHex( String& rStr, sal_Int64  nData, bool bPrefix = true );
-
-    // append binary ----------------------------------------------------------
-
-    static void         AppendBin( String& rStr, sal_uInt8  nData, bool bDots = true );
-    static void         AppendBin( String& rStr, sal_Int8   nData, bool bDots = true );
-    static void         AppendBin( String& rStr, sal_uInt16 nData, bool bDots = true );
-    static void         AppendBin( String& rStr, sal_Int16  nData, bool bDots = true );
-    static void         AppendBin( String& rStr, sal_uInt32 nData, bool bDots = true );
-    static void         AppendBin( String& rStr, sal_Int32  nData, bool bDots = true );
-    static void         AppendBin( String& rStr, sal_uInt64 nData, bool bDots = true );
-    static void         AppendBin( String& rStr, sal_Int64  nData, bool bDots = true );
-    static void         AppendBin( String& rStr, double     fData, bool bDots = true );
-
-    // append fixed-point decimal ---------------------------------------------
-
-    template< typename Type >
-    static void         AppendFix( String& rStr, Type nData, xub_StrLen nWidth = 0 );
-
-    // append formatted value -------------------------------------------------
-
-    static void         AppendBool( String& rStr, bool bData );
-    template< typename Type >
-    static void         AppendValue( String& rStr, Type nData, FormatType eFmtType );
-
-    // encoded text output ----------------------------------------------------
-
-    static void         AppendCChar( String& rStr, sal_Unicode cChar, bool bPrefix = true );
-    static void         AppendEncChar( String& rStr, sal_Unicode cChar, xub_StrLen nCount = 1, bool bPrefix = true );
-    static void         AppendEncString( String& rStr, const String& rData, bool bPrefix = true );
-
-    // token list -------------------------------------------------------------
-
-    static void         AppendToken( String& rStr, const String& rToken, sal_Unicode cSep = ',' );
-    static void         AppendToken( String& rStr, sal_Int64 nToken, sal_Unicode cSep = ',' );
-    static void         PrependToken( String& rStr, const String& rToken, sal_Unicode cSep = ',' );
-    static void         PrependToken( String& rStr, sal_Int64 nToken, sal_Unicode cSep = ',' );
-
-    static void         AppendIndex( String& rStr, const String& rIdx );
-    static void         AppendIndex( String& rStr, sal_Int64 nIdx );
-    static void         AppendIndexedText( String& rStr, const String& rData, const String& rIdx );
-    static void         AppendIndexedText( String& rStr, const String& rData, sal_Int64 nIdx );
-
-    static String       GetToken( const String& rData, xub_StrLen& rnPos, sal_Unicode cSep = ',' );
-
-    // quoting and trimming ---------------------------------------------------
-
-    /** Encloses the passed string with the passed characters. Uses cOpen, if cClose is NUL. */
-    static void         Enclose( String& rStr, sal_Unicode cOpen, sal_Unicode cClose = '\0' );
-
-    static void         TrimSpaces( String& rStr );
-    static void         TrimQuotes( String& rStr );
-
-    // string conversion ------------------------------------------------------
-
-    static ByteString   ConvertToUtf8( const String& rStr );
-    static DataType     ConvertToDataType( const String& rStr );
-    static FormatType   ConvertToFormatType( const String& rStr );
-
-    static bool         ConvertFromDec( sal_Int64& rnData, const String& rData );
-    static bool         ConvertFromHex( sal_Int64& rnData, const String& rData );
-
-    static bool         ConvertStringToInt( sal_Int64& rnData, const String& rData );
-    static bool         ConvertStringToDouble( double& rfData, const String& rData );
-    static bool         ConvertStringToBool( const String& rData );
-
-    // string to list conversion ----------------------------------------------
-
-    static void         ConvertStringToStringList( ScfStringVec& rVec, const String& rData, bool bIgnoreEmpty );
-    static void         ConvertStringToIntList( ScfInt64Vec& rVec, const String& rData, bool bIgnoreEmpty );
-
-    // file names -------------------------------------------------------------
-
-    static String       ConvertFileNameToUrl( const String& rFileName );
-    static xub_StrLen   GetFileNamePos( const String& rFileUrl );
-};
-
-// ----------------------------------------------------------------------------
-
-template< typename Type >
-void StringHelper::AppendFix( String& rStr, Type nData, xub_StrLen nWidth )
-{
-    AppendDec( rStr, static_cast< double >( nData ) / pow( 2.0, 4.0 * sizeof( Type ) ), nWidth );
-}
-
-template< typename Type >
-void StringHelper::AppendValue( String& rStr, Type nData, FormatType eFmtType )
-{
-    switch( eFmtType )
-    {
-        case FORMATTYPE_DEC:        AppendDec( rStr, nData );   break;
-        case FORMATTYPE_HEX:        AppendHex( rStr, nData );   break;
-        case FORMATTYPE_BIN:        AppendBin( rStr, nData );   break;
-        case FORMATTYPE_FIX:        AppendFix( rStr, nData );   break;
-        case FORMATTYPE_BOOL:       AppendBool( rStr, nData );  break;
-        default:;
-    }
-}
-
-// ============================================================================
-
-class StringWrapper
-{
-public:
-    inline              StringWrapper() {}
-    inline /*implicit*/ StringWrapper( const String& rStr ) : maStr( rStr ) {}
-    inline /*implicit*/ StringWrapper( const sal_Char* pcStr ) : maStr( String::CreateFromAscii( pcStr ? pcStr : "" ) ) {}
-    inline /*implicit*/ StringWrapper( sal_Unicode cChar ) : maStr( cChar ) {}
-
-    inline bool         Empty() const { return maStr.Len() == 0; }
-    inline const String& GetString() const { return maStr; }
-
-private:
-    String              maStr;
-};
-
-// ============================================================================
-// ============================================================================
-
-class Base;
-typedef ScfRef< Base > BaseRef;
-
-/** Base class for all dumper classes.
-
-    Derived classes implement the virtual function ImplIsValid(). It should
-    check all members the other functions rely on. If the function
-    ImplIsValid() returns true, all references and pointers can be used without
-    further checking.
-
-    Overview of all classes in this header file based on this Base class:
-
-    Base
-    |
-    +---->  NameListBase
-    |       |
-    |       +---->  ConstList  ------>  MultiList
-    |       +---->  FlagsList  ------>  CombiList
-    |       +---->  UnitConverter
-    |
-    +---->  ConfigCoreData
-    +---->  Config
-    +---->  CoreData
-    |
-    +---->  Input  ------>  SvStreamInput
-    +---->  Output
-    |
-    +---->  ObjectBase
-            |
-            +---->  InputObjectBase
-            |       |
-            |       +---->  StreamObjectBase
-            |       |       |
-            |       |       +---->  SvStreamObject
-            |       |       +---->  OleStreamObject
-            |       |       +---->  WrappedStreamObject
-            |       |
-            |       +---->  RecordHeaderBase
-            |
-            +---->  OleStorageObject
-            +---->  DumperBase
- */
-class Base
-{
-public:
-    virtual             ~Base();
-
-    inline bool         IsValid() const { return ImplIsValid(); }
-    inline static bool  IsValid( BaseRef xBase ) { return xBase.is() && xBase->IsValid(); }
-
-protected:
-    inline explicit     Base() {}
-
-    virtual bool        ImplIsValid() const = 0;
-};
-
-// ============================================================================
-// ============================================================================
-
-class ConfigItemBase
-{
-public:
-    virtual             ~ConfigItemBase();
-    void                ReadConfigBlock( SvStream& rStrm );
-
-protected:
-    inline explicit     ConfigItemBase() {}
-
-    virtual void        ImplProcessConfigItemStr( SvStream& rStrm, const String& rKey, const String& rData );
-    virtual void        ImplProcessConfigItemInt( SvStream& rStrm, sal_Int64 nKey, const String& rData );
-
-    void                ReadConfigBlockContents( SvStream& rStrm );
-    void                IgnoreConfigBlockContents( SvStream& rStrm );
-
-private:
-    enum LineType { LINETYPE_DATA, LINETYPE_BEGIN, LINETYPE_END };
-
-    LineType            ReadConfigLine( SvStream& rStrm, String& rKey, String& rData ) const;
-    LineType            ReadConfigLine( SvStream& rStrm ) const;
-    void                ProcessConfigItem( SvStream& rStrm, const String& rKey, const String& rData );
-};
-
-// ============================================================================
-
-class ConfigCoreData;
-class Config;
-
-class NameListBase;
-typedef ScfRef< NameListBase > NameListRef;
-
-/** Base class of all classes providing names for specific values (name lists).
-
-    The idea is to provide a unique interfase for all different methods to
-    write specific names for any values. This can be enumerations (dedicated
-    names for a subset of values), or names for bits in bit fields. Classes
-    derived from this base class implement the specific behaviour for the
-    desired purpose.
- */
-class NameListBase : public Base, public ConfigItemBase
-{
-public:
-    typedef ::std::map< sal_Int64, String > StringMap;
-    typedef StringMap::const_iterator       const_iterator;
-
-    virtual             ~NameListBase();
-
-    /** Sets a name for the specified key. */
-    void                SetName( sal_Int64 nKey, const StringWrapper& rNameWrp );
-    /** Include all names of the passed list. */
-    void                IncludeList( NameListRef xList );
-
-    /** Returns true, if the map contains an entry for the passed key. */
-    template< typename Type >
-    inline bool         HasName( Type nKey ) const
-        { return maMap.count( static_cast< sal_Int64 >( nKey ) ) != 0; }
-    /** Returns the name for the passed key. */
-    template< typename Type >
-    inline String       GetName( const Config& rCfg, Type nKey ) const
-        { return ImplGetName( rCfg, static_cast< sal_Int64 >( nKey ) ); }
-    /** Returns a display name for the passed double value. */
-    inline String       GetName( const Config& rCfg, double fValue ) const
-        { return ImplGetNameDbl( rCfg, fValue ); }
-
-    /** Returns a map iterator pointing to the first contained name. */
-    inline const_iterator begin() const { return maMap.begin(); }
-    /** Returns a map iterator pointing one past the last contained name. */
-    inline const_iterator end() const { return maMap.end(); }
-
-protected:
-    inline explicit     NameListBase( const ConfigCoreData& rCoreData ) : mrCoreData( rCoreData ) {}
-
-    virtual bool        ImplIsValid() const;
-    virtual void        ImplProcessConfigItemStr( SvStream& rStrm, const String& rKey, const String& rData );
-    virtual void        ImplProcessConfigItemInt( SvStream& rStrm, sal_Int64 nKey, const String& rData );
-
-    /** Derived classes set the name for the passed key. */
-    virtual void        ImplSetName( sal_Int64 nKey, const String& rName ) = 0;
-    /** Derived classes generate and return the name for the passed key. */
-    virtual String      ImplGetName( const Config& rCfg, sal_Int64 nKey ) const = 0;
-    /** Derived classes generate and return the name for the passed double value. */
-    virtual String      ImplGetNameDbl( const Config& rCfg, double fValue ) const = 0;
-    /** Derived classes insert all names and other settings from the passed list. */
-    virtual void        ImplIncludeList( const NameListBase& rList ) = 0;
-
-    /** Returns the configuration core data, which can be used to access other name lists. */
-    inline const ConfigCoreData& GetCoreData() const { return mrCoreData; }
-    /** Inserts the passed name into the internal map. */
-    void                InsertRawName( sal_Int64 nKey, const String& rName );
-    /** Returns the name for the passed key, or 0, if nothing found. */
-    const String*       FindRawName( sal_Int64 nKey ) const;
-
-private:
-    /** Includes name lists, given in a comma separated list of names of the lists. */
-    void                Include( const String& rListKeys );
-    /** Excludes names from the list, given by a comma separated list of their keys. */
-    void                Exclude( const String& rKeys );
-
-private:
-    StringMap           maMap;
-    const ConfigCoreData& mrCoreData;
-};
-
-// ============================================================================
-
-class ConstList : public NameListBase
-{
-public:
-    explicit            ConstList( const ConfigCoreData& rCoreData );
-
-    /** Sets a default name for unknown keys. */
-    inline void         SetDefaultName( const StringWrapper& rDefName ) { maDefName = rDefName.GetString(); }
-    /** Enables or disables automatic quotation of returned names. */
-    inline void         SetQuoteNames( bool bQuoteNames ) { mbQuoteNames = bQuoteNames; }
-
-protected:
-    virtual void        ImplProcessConfigItemStr( SvStream& rStrm, const String& rKey, const String& rData );
-
-    /** Sets the name for the passed key. */
-    virtual void        ImplSetName( sal_Int64 nKey, const String& rName );
-    /** Returns the name for the passed key, or the default name, if key is not contained. */
-    virtual String      ImplGetName( const Config& rCfg, sal_Int64 nKey ) const;
-    /** Returns the name for the passed double value. */
-    virtual String      ImplGetNameDbl( const Config& rCfg, double fValue ) const;
-    /** Inserts all names from the passed list. */
-    virtual void        ImplIncludeList( const NameListBase& rList );
-
-private:
-    String              maDefName;
-    bool                mbQuoteNames;
-};
-
-// ============================================================================
-
-class MultiList : public ConstList
-{
-public:
-    explicit            MultiList( const ConfigCoreData& rCoreData );
-
-    void                SetNamesFromVec( sal_Int64 nStartKey, const ScfStringVec& rNames );
-
-protected:
-    virtual void        ImplProcessConfigItemStr( SvStream& rStrm, const String& rKey, const String& rData );
-    virtual void        ImplSetName( sal_Int64 nKey, const String& rName );
-
-private:
-    void                InsertNames( sal_Int64 nStartKey, const String& rData );
-
-private:
-    bool                mbIgnoreEmpty;
-};
-
-// ============================================================================
-
-class FlagsList : public NameListBase
-{
-public:
-    explicit            FlagsList( const ConfigCoreData& rCoreData );
-
-    /** Sets flags to be ignored on output. */
-    template< typename Type >
-    inline void         SetIgnoreFlags( Type nIgnore )
-        { mnIgnore = static_cast< sal_Int64 >( nIgnore ); }
-
-protected:
-    virtual void        ImplProcessConfigItemStr( SvStream& rStrm, const String& rKey, const String& rData );
-
-    /** Sets the name for the passed key. */
-    virtual void        ImplSetName( sal_Int64 nKey, const String& rName );
-    /** Returns the name for the passed key. */
-    virtual String      ImplGetName( const Config& rCfg, sal_Int64 nKey ) const;
-    /** Returns the name for the passed double value. */
-    virtual String      ImplGetNameDbl( const Config& rCfg, double fValue ) const;
-    /** Inserts all flags from the passed list. */
-    virtual void        ImplIncludeList( const NameListBase& rList );
-
-private:
-    sal_Int64           mnIgnore;
-};
-
-// ============================================================================
-
-class CombiList : public FlagsList
-{
-public:
-    explicit            CombiList( const ConfigCoreData& rCoreData );
-
-protected:
-    /** Sets the name for the passed key. */
-    virtual void        ImplSetName( sal_Int64 nKey, const String& rName );
-    /** Returns the name for the passed key. */
-    virtual String      ImplGetName( const Config& rCfg, sal_Int64 nKey ) const;
-    /** Inserts all flags from the passed list. */
-    virtual void        ImplIncludeList( const NameListBase& rList );
-
-private:
-    struct ExtItemFormat : public ItemFormat
-    {
-        bool                mbShiftValue;
-        inline explicit     ExtItemFormat() : mbShiftValue( true ) {}
-    };
-    typedef ::std::map< sal_Int64, ExtItemFormat > ExtItemFormatMap;
-    ExtItemFormatMap    maFmtMap;
-};
-
-// ============================================================================
-
-class UnitConverter : public NameListBase
-{
-public:
-    explicit            UnitConverter( const ConfigCoreData& rCoreData );
-
-    inline void         SetUnitName( const StringWrapper& rUnitName ) { maUnitName = rUnitName.GetString(); }
-    inline void         SetFactor( double fFactor ) { mfFactor = fFactor; }
-
-protected:
-    /** Sets the name for the passed key. */
-    virtual void        ImplSetName( sal_Int64 nKey, const String& rName );
-    /** Returns the converted value with appended unit name. */
-    virtual String      ImplGetName( const Config& rCfg, sal_Int64 nKey ) const;
-    /** Returns the converted value with appended unit name. */
-    virtual String      ImplGetNameDbl( const Config& rCfg, double fValue ) const;
-    /** Empty implementation. */
-    virtual void        ImplIncludeList( const NameListBase& rList );
-
-private:
-    String              maUnitName;
-    double              mfFactor;
-};
-
-// ============================================================================
-
-class NameListWrapper
-{
-public:
-    inline              NameListWrapper() {}
-    inline /*implicit*/ NameListWrapper( const String& rListName ) : maNameWrp( rListName ) {}
-    inline /*implicit*/ NameListWrapper( const sal_Char* pcListName ) : maNameWrp( pcListName ) {}
-    inline /*implicit*/ NameListWrapper( NameListRef xList ) : mxList( xList ) {}
-
-    inline bool         Empty() const { return !mxList && maNameWrp.Empty(); }
-    NameListRef         GetNameList( const Config& rCfg ) const;
-
-private:
-    StringWrapper       maNameWrp;
-    mutable NameListRef mxList;
-};
-
-static const NameListWrapper NO_LIST;
-
-// ============================================================================
-// ============================================================================
-
-class ConfigCoreData : public Base, public ConfigItemBase
-{
-public:
-    explicit            ConfigCoreData( const String& rFileName );
-    virtual             ~ConfigCoreData();
-
-    void                SetOption( const String& rKey, const String& rData );
-    const String*       GetOption( const String& rKey ) const;
-
-    template< typename ListType >
-    ScfRef< ListType >  CreateNameList( const String& rListName );
-    void                SetNameList( const String& rListName, NameListRef xList );
-    void                EraseNameList( const String& rListName );
-    NameListRef         GetNameList( const String& rListName ) const;
-
-protected:
-    inline explicit     ConfigCoreData() : mbLoaded( false ) {}
-    void                Construct( const String& rFileName );
-
-    virtual bool        ImplIsValid() const;
-    virtual void        ImplProcessConfigItemStr( SvStream& rStrm, const String& rKey, const String& rData );
-
-private:
-    void                ConstructCfgCoreData();
-
-    bool                ReadConfigFile( const String& rFileUrl );
-    template< typename ListType >
-    void                ReadNameList( SvStream& rStrm, const String& rListName );
-    void                CreateShortList( const String& rData );
-    void                CreateUnitConverter( const String& rData );
-
-private:
-    typedef ::std::map< String, String >        ConfigDataMap;
-    typedef ::std::map< String, NameListRef >   NameListMap;
-
-    ConfigDataMap       maConfigData;
-    NameListMap         maNameLists;
-    String              maConfigPath;
-    bool                mbLoaded;
-};
-
-// ----------------------------------------------------------------------------
-
-template< typename ListType >
-ScfRef< ListType > ConfigCoreData::CreateNameList( const String& rListName )
-{
-    ScfRef< ListType > xList;
-    if( rListName.Len() > 0 )
-    {
-        xList.reset( new ListType( *this ) );
-        SetNameList( rListName, xList );
-    }
-    return xList;
-}
-
-template< typename ListType >
-void ConfigCoreData::ReadNameList( SvStream& rStrm, const String& rListName )
-{
-    NameListRef xList = CreateNameList< ListType >( rListName );
-    if( xList.is() )
-        xList->ReadConfigBlock( rStrm );
-}
-
-// ============================================================================
-
-class Config : public Base
-{
-public:
-    explicit            Config( const Config& rParent );
-    explicit            Config( const String& rFileName );
-    explicit            Config( const sal_Char* pcEnvVar );
-    virtual             ~Config();
-
-    void                SetStringOption( const StringWrapper& rKey, const StringWrapper& rData );
-
-    const String&       GetStringOption( const StringWrapper& rKey, const String& rDefault ) const;
-    bool                GetBoolOption( const StringWrapper& rKey, bool bDefault ) const;
-    template< typename Type >
-    Type                GetIntOption( const StringWrapper& rKey, Type nDefault ) const;
-
-    bool                IsDumperEnabled() const;
-    bool                IsImportEnabled() const;
-
-    template< typename ListType >
-    ScfRef< ListType >  CreateNameList( const StringWrapper& rListName );
-    void                SetNameList( const StringWrapper& rListName, NameListRef xList );
-    void                EraseNameList( const StringWrapper& rListName );
-    NameListRef         GetNameList( const StringWrapper& rListName ) const;
-
-    /** Returns the name for the passed key from the passed name list. */
-    template< typename Type >
-    String              GetName( const NameListWrapper& rListWrp, Type nKey ) const;
-    /** Returns true, if the passed name list contains an entry for the passed key. */
-    template< typename Type >
-    bool                HasName( const NameListWrapper& rList, Type nKey ) const;
-
-protected:
-    inline explicit     Config() {}
-    void                Construct( const Config& rParent );
-    void                Construct( const String& rFileName );
-    void                Construct( const sal_Char* pcEnvVar );
-
-    virtual bool        ImplIsValid() const;
-    virtual const String* ImplGetOption( const String& rKey ) const;
-    virtual NameListRef ImplGetNameList( const String& rListName ) const;
-
-private:
-    typedef ScfRef< ConfigCoreData > ConfigCoreDataRef;
-    ConfigCoreDataRef   mxCoreData;
-};
-
-typedef ScfRef< Config > ConfigRef;
-
-// ----------------------------------------------------------------------------
-
-template< typename Type >
-Type Config::GetIntOption( const StringWrapper& rKey, Type nDefault ) const
-{
-    sal_Int64 nRawData;
-    const String* pData = ImplGetOption( rKey.GetString() );
-    return (pData && StringHelper::ConvertStringToInt( nRawData, *pData )) ?
-        static_cast< Type >( nRawData ) : nDefault;
-}
-
-template< typename ListType >
-ScfRef< ListType > Config::CreateNameList( const StringWrapper& rListName )
-{
-    return mxCoreData->CreateNameList< ListType >( rListName.GetString() );
-}
-
-template< typename Type >
-String Config::GetName( const NameListWrapper& rListWrp, Type nKey ) const
-{
-    NameListRef xList = rListWrp.GetNameList( *this );
-    return xList.is() ? xList->GetName( *this, nKey ) : SCF_DUMP_ERR_NOMAP;
-}
-
-template< typename Type >
-bool Config::HasName( const NameListWrapper& rListWrp, Type nKey ) const
-{
-    NameListRef xList = rListWrp.GetNameList( *this );
-    return xList.is() && xList->HasName( nKey );
-}
-
-// ============================================================================
-// ============================================================================
-
-class CoreData : public Base
-{
-public:
-    explicit            CoreData( SfxMedium& rMedium, SfxObjectShell* pDocShell );
-
-    inline SfxMedium&   GetMedium() { return mrMedium; }
-    inline SfxObjectShell* GetDocShell() { return mpDocShell; }
-    SvStream&           GetCoreStream();
-
-protected:
-    virtual bool        ImplIsValid() const;
-
-private:
-    SfxMedium&          mrMedium;
-    SfxObjectShell*     mpDocShell;
-};
-
-typedef ScfRef< CoreData > CoreDataRef;
-
-// ============================================================================
-// ============================================================================
-
-class Input : public Base
-{
-public:
-    virtual sal_Size    GetSize() const = 0;
-    virtual sal_Size    Tell() const = 0;
-    virtual void        Seek( sal_Size nPos ) = 0;
-    virtual void        SeekRel( sal_sSize nRelPos ) = 0;
-    virtual sal_Size    Read( void* pBuffer, sal_Size nSize ) = 0;
-    virtual void        ReadLine( String& rLine, rtl_TextEncoding eEnc ) = 0;
-
-    virtual Input&      operator>>( sal_Int8& rnData ) = 0;
-    virtual Input&      operator>>( sal_uInt8& rnData ) = 0;
-    virtual Input&      operator>>( sal_Int16& rnData ) = 0;
-    virtual Input&      operator>>( sal_uInt16& rnData ) = 0;
-    virtual Input&      operator>>( sal_Int32& rnData ) = 0;
-    virtual Input&      operator>>( sal_uInt32& rnData ) = 0;
-    virtual Input&      operator>>( float& rfData ) = 0;
-    virtual Input&      operator>>( double& rfData ) = 0;
-
-    inline bool         IsValidPos() const { return Tell() < GetSize(); }
-    template< typename Type >
-    inline Type         ReadValue() { Type nValue; *this >> nValue; return nValue; }
-
-protected:
-    virtual bool        ImplIsValid() const;
-};
-
-typedef ScfRef< Input > InputRef;
-
-Input& operator>>( Input& rIn, sal_Int64& rnData );
-Input& operator>>( Input& rIn, sal_uInt64& rnData );
-
-// ============================================================================
-
-class SvStreamInput : public Input
-{
-public:
-    explicit            SvStreamInput( SvStream& rStrm );
-    virtual             ~SvStreamInput();
-
-    virtual sal_Size    GetSize() const;
-    virtual sal_Size    Tell() const;
-    virtual void        Seek( sal_Size nPos );
-    virtual void        SeekRel( sal_sSize nRelPos );
-    virtual sal_Size    Read( void* pBuffer, sal_Size nSize );
-    virtual void        ReadLine( String& rLine, rtl_TextEncoding eEnc );
-
-    virtual SvStreamInput& operator>>( sal_Int8& rnData );
-    virtual SvStreamInput& operator>>( sal_uInt8& rnData );
-    virtual SvStreamInput& operator>>( sal_Int16& rnData );
-    virtual SvStreamInput& operator>>( sal_uInt16& rnData );
-    virtual SvStreamInput& operator>>( sal_Int32& rnData );
-    virtual SvStreamInput& operator>>( sal_uInt32& rnData );
-    virtual SvStreamInput& operator>>( float& rfData );
-    virtual SvStreamInput& operator>>( double& rfData );
-
-private:
-    SvStream&           mrStrm;
-};
-
-// ============================================================================
-// ============================================================================
-
-class Output : public Base
-{
-public:
-    explicit            Output( SvStream& rStrm );
-
-    // ------------------------------------------------------------------------
-
-    void                NewLine();
-    void                EmptyLine( size_t nCount = 1 );
-    inline String&      GetLine() { return maLine; }
-
-    void                SetPrefix( const String& rPrefix );
-    inline const String& GetPrefix() const { return maPrefix; }
-
-    void                IncIndent();
-    void                DecIndent();
-    void                ResetIndent();
-
-    void                StartTable( xub_StrLen nW1 );
-    void                StartTable( xub_StrLen nW1, xub_StrLen nW2 );
-    void                StartTable( xub_StrLen nW1, xub_StrLen nW2, xub_StrLen nW3 );
-    void                StartTable( xub_StrLen nW1, xub_StrLen nW2, xub_StrLen nW3, xub_StrLen nW4 );
-    void                StartTable( size_t nColCount, const xub_StrLen* pnColWidths );
-    void                Tab();
-    void                Tab( size_t nCol );
-    void                EndTable();
-
-    void                ResetItemIndex( sal_Int64 nIdx = 0 );
-    void                StartItem( const sal_Char* pcName = 0 );
-    void                ContItem();
-    void                EndItem();
-    inline const String& GetLastItemValue() const { return maLastItem; }
-
-    void                StartMultiItems();
-    void                EndMultiItems();
-
-    // ------------------------------------------------------------------------
-
-    void                WriteChar( sal_Unicode cChar, xub_StrLen nCount = 1 );
-    void                WriteAscii( const sal_Char* pcStr );
-    void                WriteString( const String& rStr );
-    void                WriteArray( const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = ',' );
-    void                WriteBool( bool bData );
-    void                WriteColor( const Color& rColor );
-    void                WriteDateTime( const DateTime& rDateTime );
-
-
-    template< typename Type >
-    inline void         WriteDec( Type nData, xub_StrLen nWidth = 0, sal_Unicode cFill = ' ' )
-                            { StringHelper::AppendDec( maLine, nData, nWidth, cFill ); }
-    template< typename Type >
-    inline void         WriteHex( Type nData, bool bPrefix = true )
-                            { StringHelper::AppendHex( maLine, nData, bPrefix ); }
-    template< typename Type >
-    inline void         WriteBin( Type nData, bool bDots = true )
-                            { StringHelper::AppendBin( maLine, nData, bDots ); }
-    template< typename Type >
-    inline void         WriteFix( Type nData, xub_StrLen nWidth = 0 )
-                            { StringHelper::AppendFix( maLine, nData, nWidth ); }
-    template< typename Type >
-    inline void         WriteValue( Type nData, FormatType eFmtType )
-                            { StringHelper::AppendValue( maLine, nData, eFmtType ); }
-    template< typename Type >
-    inline void         WriteName( const Config& rCfg, Type nData, const NameListWrapper& rListWrp )
-                            { WriteString( rCfg.GetName( rListWrp, nData ) ); }
-
-    // ------------------------------------------------------------------------
-protected:
-    virtual bool        ImplIsValid() const;
-
-private:
-    void                WriteItemName( const sal_Char* pcName );
-
-private:
-    typedef ::std::vector< xub_StrLen > StringLenVec;
-
-    SvStream&           mrStrm;
-    String              maPrefix;
-    ByteString          maPrefixUtf8;
-    ByteString          maIndent;
-    String              maLine;
-    String              maLastItem;
-    StringLenVec        maColPos;
-    size_t              mnCol;
-    size_t              mnItemLevel;
-    size_t              mnMultiLevel;
-    sal_Int64           mnItemIdx;
-    xub_StrLen          mnLastItem;
-};
-
-typedef ScfRef< Output > OutputRef;
-
-// ============================================================================
-
-class PrefixGuard : private ScfNoCopy
-{
-public:
-    inline explicit     PrefixGuard( Output& rOut, const String& rPrefix ) :
-                            mrOut( rOut ), maOldPrefix( rOut.GetPrefix() ) { mrOut.SetPrefix( rPrefix ); }
-    inline              ~PrefixGuard() { mrOut.SetPrefix( maOldPrefix ); }
-private:
-    Output&             mrOut;
-    String              maOldPrefix;
-};
-
-// ----------------------------------------------------------------------------
-
-class IndentGuard : private ScfNoCopy
-{
-public:
-    inline explicit     IndentGuard( Output& rOut ) : mrOut( rOut ) { mrOut.IncIndent(); }
-    inline              ~IndentGuard() { mrOut.DecIndent(); }
-private:
-    Output&             mrOut;
-};
-
-// ----------------------------------------------------------------------------
-
-class TableGuard : private ScfNoCopy
-{
-public:
-    inline explicit     TableGuard( Output& rOut, xub_StrLen nW1 ) :
-                            mrOut( rOut ) { mrOut.StartTable( nW1 ); }
-    inline explicit     TableGuard( Output& rOut, xub_StrLen nW1, xub_StrLen nW2 ) :
-                            mrOut( rOut ) { mrOut.StartTable( nW1, nW2 ); }
-    inline explicit     TableGuard( Output& rOut, xub_StrLen nW1, xub_StrLen nW2, xub_StrLen nW3 ) :
-                            mrOut( rOut ) { mrOut.StartTable( nW1, nW2, nW3 ); }
-    inline explicit     TableGuard( Output& rOut, xub_StrLen nW1, xub_StrLen nW2, xub_StrLen nW3, xub_StrLen nW4 ) :
-                            mrOut( rOut ) { mrOut.StartTable( nW1, nW2, nW3, nW4 ); }
-    inline explicit     TableGuard( Output& rOut, size_t nColCount,
-                                const xub_StrLen* pnColWidths ) :
-                            mrOut( rOut ) { mrOut.StartTable( nColCount, pnColWidths ); }
-    inline              ~TableGuard() { mrOut.EndTable(); }
-    inline void         Tab() { mrOut.Tab(); }
-    inline void         Tab( size_t nCol ) { mrOut.Tab( nCol ); }
-private:
-    Output&             mrOut;
-};
-
-// ----------------------------------------------------------------------------
-
-class ItemGuard : private ScfNoCopy
-{
-public:
-    inline explicit     ItemGuard( Output& rOut, const sal_Char* pcName = 0 ) :
-                            mrOut( rOut ) { mrOut.StartItem( pcName ); }
-    inline              ~ItemGuard() { mrOut.EndItem(); }
-    inline void         Cont() { mrOut.ContItem(); }
-private:
-    Output&             mrOut;
-};
-
-// ----------------------------------------------------------------------------
-
-class MultiItemsGuard : private ScfNoCopy
-{
-public:
-    inline explicit     MultiItemsGuard( Output& rOut ) : mrOut( rOut ) { mrOut.StartMultiItems(); }
-    inline              ~MultiItemsGuard() { mrOut.EndMultiItems(); }
-private:
-    Output&             mrOut;
-};
-
-// ============================================================================
-// ============================================================================
-
-class ObjectBase : public Base
-{
-public:
-    virtual             ~ObjectBase();
-
-    SfxMedium&          GetCoreMedium() const;
-    SvStream&           GetCoreStream() const;
-
-    void                Dump();
-
-    // ------------------------------------------------------------------------
-protected:
-    inline explicit     ObjectBase() {}
-    void                Construct( ConfigRef xConfig, CoreDataRef xCore, OutputRef xOut );
-    void                Construct( const ObjectBase& rParent );
-
-    virtual bool        ImplIsValid() const;
-    virtual ConfigRef   ImplReconstructConfig();
-    virtual OutputRef   ImplReconstructOutput();
-    virtual void        ImplDumpHeader();
-    virtual void        ImplDumpBody();
-    virtual void        ImplDumpFooter();
-
-    // ------------------------------------------------------------------------
-
-    void                ReconstructConfig();
-    void                ReconstructOutput();
-
-    inline Config&      Cfg() const { return *mxConfig; }
-    inline CoreData&    Core() const { return *mxCore; }
-    inline Output&      Out() const { return *mxOut; }
-
-    // ------------------------------------------------------------------------
-
-    void                WriteEmptyItem( const sal_Char* pcName );
-    void                WriteInfoItem( const sal_Char* pcName, const StringWrapper& rData );
-    void                WriteStringItem( const sal_Char* pcName, const String& rData );
-    void                WriteArrayItem( const sal_Char* pcName, const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = ',' );
-    void                WriteBoolItem( const sal_Char* pcName, bool bData );
-    void                WriteColorItem( const sal_Char* pcName, const Color& rColor );
-    void                WriteDateTimeItem( const sal_Char* pcName, const DateTime& rDateTime );
-    void                WriteGuidItem( const sal_Char* pcName, const String& rGuid );
-
-    template< typename Type >
-    void                AddNameToItem( Type nData, const NameListWrapper& rListWrp );
-
-    template< typename Type >
-    void                WriteNameItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp );
-    template< typename Type >
-    void                WriteDecItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type >
-    void                WriteHexItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type >
-    void                WriteBinItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type >
-    void                WriteFixItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type >
-    void                WriteDecBoolItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type >
-    void                WriteValueItem( const sal_Char* pcName, Type nData, FormatType eFmtType, const NameListWrapper& rListWrp = NO_LIST );
-
-    template< typename Type >
-    void                WriteValueItem( const ItemFormat& rItemFmt, Type nData );
-
-private:
-    ConfigRef           mxConfig;
-    CoreDataRef         mxCore;
-    OutputRef           mxOut;
-};
-
-typedef ScfRef< ObjectBase > ObjectRef;
-
-// ----------------------------------------------------------------------------
-
-template< typename Type >
-void ObjectBase::AddNameToItem( Type nData, const NameListWrapper& rListWrp )
-{
-    if( !rListWrp.Empty() )
-    {
-        mxOut->ContItem();
-        mxOut->WriteName( *mxConfig, nData, rListWrp );
-    }
-}
-
-template< typename Type >
-void ObjectBase::WriteNameItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp )
-{
-    ItemGuard aItem( *mxOut, pcName );
-    mxOut->WriteName( *mxConfig, nData, rListWrp );
-}
-
-template< typename Type >
-void ObjectBase::WriteDecItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp )
-{
-    ItemGuard aItem( *mxOut, pcName );
-    mxOut->WriteDec( nData );
-    AddNameToItem( nData, rListWrp );
-}
-
-template< typename Type >
-void ObjectBase::WriteHexItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp )
-{
-    ItemGuard aItem( *mxOut, pcName );
-    mxOut->WriteHex( nData );
-    AddNameToItem( nData, rListWrp );
-}
-
-template< typename Type >
-void ObjectBase::WriteBinItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp )
-{
-    ItemGuard aItem( *mxOut, pcName );
-    mxOut->WriteBin( nData );
-    AddNameToItem( nData, rListWrp );
-}
-
-template< typename Type >
-void ObjectBase::WriteFixItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp )
-{
-    ItemGuard aItem( *mxOut, pcName );
-    mxOut->WriteFix( nData );
-    AddNameToItem( nData, rListWrp );
-}
-
-template< typename Type >
-void ObjectBase::WriteDecBoolItem( const sal_Char* pcName, Type nData, const NameListWrapper& rListWrp )
-{
-    ItemGuard aItem( *mxOut, pcName );
-    mxOut->WriteDec( nData );
-    aItem.Cont();
-    mxOut->WriteBool( nData != 0 );
-    AddNameToItem( nData, rListWrp );
-}
-
-template< typename Type >
-void ObjectBase::WriteValueItem( const sal_Char* pcName, Type nData, FormatType eFmtType, const NameListWrapper& rListWrp )
-{
-    if( eFmtType == FORMATTYPE_BOOL )
-        WriteDecBoolItem( pcName, nData, rListWrp );
-    else
-    {
-        ItemGuard aItem( *mxOut, pcName );
-        mxOut->WriteValue( nData, eFmtType );
-        AddNameToItem( nData, rListWrp );
-    }
-}
-
-template< typename Type >
-void ObjectBase::WriteValueItem( const ItemFormat& rItemFmt, Type nData )
-{
-    WriteValueItem( rItemFmt.maItemNameUtf8.GetBuffer(),
-        nData, rItemFmt.meFmtType, rItemFmt.maListName );
-}
-
-// ============================================================================
-
-class InputObjectBase : public ObjectBase
-{
-public:
-    virtual             ~InputObjectBase();
-
-    // ------------------------------------------------------------------------
-protected:
-    inline explicit     InputObjectBase() {}
-    void                Construct( const ObjectBase& rParent, InputRef xIn );
-    void                Construct( const InputObjectBase& rParent );
-
-    virtual bool        ImplIsValid() const;
-    virtual InputRef    ImplReconstructInput();
-    virtual void        ImplDumpBody();
-
-    // ------------------------------------------------------------------------
-
-    void                ReconstructInput();
-
-    inline Input&       In() const { return *mxIn; }
-
-    // ------------------------------------------------------------------------
-
-    void                SkipBlock( sal_Size nSize, bool bShowSize = true );
-    void                DumpRawBinary( sal_Size nSize, bool bShowOffset = true, bool bStream = false );
-
-    void                DumpBinary( const sal_Char* pcName, sal_Size nSize, bool bShowOffset = true );
-    void                DumpArray( const sal_Char* pcName, sal_Size nSize, sal_Unicode cSep = ',' );
-    void                DumpRemaining( sal_Size nSize );
-    inline void         DumpUnused( sal_Size nSize ) { DumpArray( SCF_DUMP_UNUSED, nSize ); }
-    inline void         DumpUnknown( sal_Size nSize ) { DumpArray( SCF_DUMP_UNKNOWN, nSize ); }
-
-    void                DumpBinaryStream( bool bShowOffset = true );
-    void                DumpTextStream( rtl_TextEncoding eEnc, bool bShowLines = true );
-
-    String              DumpGuid( const sal_Char* pcName );
-    void                DumpItem( const ItemFormat& rItemFmt );
-
-    template< typename Type >
-    Type                DumpName( const sal_Char* pcName, const NameListWrapper& rListWrp );
-    template< typename Type >
-    Type                DumpDec( const sal_Char* pcName, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type >
-    Type                DumpHex( const sal_Char* pcName, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type >
-    Type                DumpBin( const sal_Char* pcName, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type >
-    Type                DumpFix( const sal_Char* pcName, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type >
-    Type                DumpBool( const sal_Char* pcName, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type >
-    Type                DumpValue( const ItemFormat& rItemFmt );
-
-    template< typename Type1, typename Type2 >
-    Type1               DumpName( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type1, typename Type2 >
-    Type1               DumpDec( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type1, typename Type2 >
-    Type1               DumpHex( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type1, typename Type2 >
-    Type1               DumpBin( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type1, typename Type2 >
-    Type1               DumpFix( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type1, typename Type2 >
-    Type1               DumpBool( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp = NO_LIST );
-    template< typename Type1, typename Type2 >
-    Type1               DumpValue( bool bType1, const ItemFormat& rItemFmt );
-
-    // ------------------------------------------------------------------------
-
-    using               ObjectBase::Construct;
-
-private:
-    InputRef            mxIn;
-};
-
-typedef ScfRef< InputObjectBase > InputObjectRef;
-
-// ----------------------------------------------------------------------------
-
-template< typename Type >
-Type InputObjectBase::DumpName( const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    Type nData;
-    *mxIn >> nData;
-    WriteNameItem( pcName, nData, rListWrp );
-    return nData;
-}
-
-template< typename Type >
-Type InputObjectBase::DumpDec( const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    Type nData;
-    *mxIn >> nData;
-    WriteDecItem( pcName, nData, rListWrp );
-    return nData;
-}
-
-template< typename Type >
-Type InputObjectBase::DumpHex( const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    Type nData;
-    *mxIn >> nData;
-    WriteHexItem( pcName, nData, rListWrp );
-    return nData;
-}
-
-template< typename Type >
-Type InputObjectBase::DumpBin( const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    Type nData;
-    *mxIn >> nData;
-    WriteBinItem( pcName, nData, rListWrp );
-    return nData;
-}
-
-template< typename Type >
-Type InputObjectBase::DumpFix( const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    Type nData;
-    *mxIn >> nData;
-    WriteFixItem( pcName, nData, rListWrp );
-    return nData;
-}
-
-template< typename Type >
-Type InputObjectBase::DumpBool( const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    Type nData;
-    *mxIn >> nData;
-    WriteDecBoolItem( pcName, nData, rListWrp );
-    return nData;
-}
-
-template< typename Type >
-Type InputObjectBase::DumpValue( const ItemFormat& rItemFmt )
-{
-    Type nData;
-    *mxIn >> nData;
-    WriteValueItem( rItemFmt, nData );
-    return nData;
-}
-
-template< typename Type1, typename Type2 >
-Type1 InputObjectBase::DumpName( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    return bType1 ? DumpName< Type1 >( pcName, rListWrp ) : static_cast< Type1 >( DumpName< Type2 >( pcName, rListWrp ) );
-}
-
-template< typename Type1, typename Type2 >
-Type1 InputObjectBase::DumpDec( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    return bType1 ? DumpDec< Type1 >( pcName, rListWrp ) : static_cast< Type1 >( DumpDec< Type2 >( pcName, rListWrp ) );
-}
-
-template< typename Type1, typename Type2 >
-Type1 InputObjectBase::DumpHex( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    return bType1 ? DumpHex< Type1 >( pcName, rListWrp ) : static_cast< Type1 >( DumpHex< Type2 >( pcName, rListWrp ) );
-}
-
-template< typename Type1, typename Type2 >
-Type1 InputObjectBase::DumpBin( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    return bType1 ? DumpBin< Type1 >( pcName, rListWrp ) : static_cast< Type1 >( DumpBin< Type2 >( pcName, rListWrp ) );
-}
-
-template< typename Type1, typename Type2 >
-Type1 InputObjectBase::DumpFix( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    return bType1 ? DumpFix< Type1 >( pcName, rListWrp ) : static_cast< Type1 >( DumpFix< Type2 >( pcName, rListWrp ) );
-}
-
-template< typename Type1, typename Type2 >
-Type1 InputObjectBase::DumpBool( bool bType1, const sal_Char* pcName, const NameListWrapper& rListWrp )
-{
-    return bType1 ? DumpBool< Type1 >( pcName, rListWrp ) : static_cast< Type1 >( DumpBool< Type2 >( pcName, rListWrp ) );
-}
-
-template< typename Type1, typename Type2 >
-Type1 InputObjectBase::DumpValue( bool bType1, const ItemFormat& rItemFmt )
-{
-    return bType1 ? DumpValue< Type1 >( rItemFmt ) : static_cast< Type1 >( DumpValue< Type2 >( rItemFmt ) );
-}
-
-// ============================================================================
-// ============================================================================
-
-class StreamObjectBase : public InputObjectBase
-{
-public:
-    virtual             ~StreamObjectBase();
-
-    inline SvStream&    GetStream() { return *mpStrm; }
-    inline const String& GetStreamName() const { return maName; }
-    inline const String& GetStreamPath() const { return maPath; }
-    String              GetFullName() const;
-    sal_Size            GetStreamSize() const;
-
-protected:
-    inline explicit     StreamObjectBase() : mpStrm( 0 ) {}
-    void                Construct( const ObjectBase& rParent, SvStream& rStrm,
-                            const String& rPath, const String& rStrmName, InputRef xIn );
-    void                Construct( const ObjectBase& rParent, SvStream& rStrm,
-                            const String& rPath, const String& rStrmName );
-    void                Construct( const ObjectBase& rParent, SvStream& rStrm );
-
-    virtual bool        ImplIsValid() const;
-    virtual void        ImplDumpHeader();
-    virtual void        ImplDumpFooter();
-    virtual void        ImplDumpExtendedHeader();
-
-    using               InputObjectBase::Construct;
-
-private:
-    void                DumpStreamInfo( bool bExtended );
-
-private:
-    SvStream*           mpStrm;
-    String              maPath;
-    String              maName;
-};
-
-typedef ScfRef< StreamObjectBase > StreamObjectRef;
-
-// ============================================================================
-
-class SvStreamObject : public StreamObjectBase
-{
-public:
-    explicit            SvStreamObject( const ObjectBase& rParent, SvStream& rStrm );
-    virtual             ~SvStreamObject();
-
-protected:
-    inline explicit     SvStreamObject() {}
-    void                Construct( const ObjectBase& rParent, SvStream& rStrm );
-
-    using               StreamObjectBase::Construct;
-};
-
-typedef ScfRef< SvStreamObject > SvStreamObjectRef;
-
-// ============================================================================
-
-class WrappedStreamObject : public StreamObjectBase
-{
-public:
-    explicit            WrappedStreamObject( const ObjectBase& rParent, StreamObjectRef xStrmObj );
-    virtual             ~WrappedStreamObject();
-
-protected:
-    inline explicit     WrappedStreamObject() {}
-    void                Construct( const ObjectBase& rParent, StreamObjectRef xStrmObj );
-
-    virtual bool        ImplIsValid() const;
-
-    using               StreamObjectBase::Construct;
-
-private:
-    StreamObjectRef     mxStrmObj;
-};
-
-// ============================================================================
-// ============================================================================
-
-struct RecordHeaderConfigInfo
-{
-    const sal_Char*     mpcRecNames;
-    const sal_Char*     mpcShowRecPos;
-    const sal_Char*     mpcShowRecSize;
-    const sal_Char*     mpcShowRecId;
-    const sal_Char*     mpcShowRecName;
-    const sal_Char*     mpcShowRecBody;
-};
-
-// ----------------------------------------------------------------------------
-
-class RecordHeaderBase : public InputObjectBase
-{
-public:
-    virtual             ~RecordHeaderBase();
-
-    inline NameListRef  GetRecNames() const { return mxRecNames; }
-    inline bool         IsShowRecPos() const { return mbShowRecPos; }
-    inline bool         IsShowRecSize() const { return mbShowRecSize; }
-    inline bool         IsShowRecId() const { return mbShowRecId; }
-    inline bool         IsShowRecName() const { return mbShowRecName; }
-    inline bool         IsShowRecBody() const { return mbShowRecBody; }
-
-protected:
-    inline explicit     RecordHeaderBase() {}
-    void                Construct( const InputObjectBase& rParent, const RecordHeaderConfigInfo& rCfgInfo );
-
-    virtual bool        ImplIsValid() const;
-
-    using               InputObjectBase::Construct;
-
-private:
-    NameListRef         mxRecNames;
-    bool                mbShowRecPos;
-    bool                mbShowRecSize;
-    bool                mbShowRecId;
-    bool                mbShowRecName;
-    bool                mbShowRecBody;
-};
-
-// ============================================================================
-// ============================================================================
-
-class DumperBase : public ObjectBase
-{
-public:
-    virtual             ~DumperBase();
-
-    bool                IsImportEnabled() const;
-
-protected:
-    inline explicit     DumperBase() {}
-    void                Construct( ConfigRef xConfig, CoreDataRef xCore );
-    void                Construct( ConfigRef xConfig, SfxMedium& rMedium, SfxObjectShell* pDocShell );
-
-    using               ObjectBase::Construct;
-
-private:
-    typedef ScfRef< SvStream > SvStreamRef;
-    SvStreamRef         mxOutStrm;
-};
-
-// ============================================================================
-// ============================================================================
-
-} // namespace dump
-} // namespace scf
-
-#endif
-#endif
-
diff --git a/sc/source/filter/inc/fdumperole.hxx b/sc/source/filter/inc/fdumperole.hxx
deleted file mode 100644
index ad6d1b0de..000000000
--- a/sc/source/filter/inc/fdumperole.hxx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: fdumperole.hxx,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SC_FDUMPEROLE_HXX
-#define SC_FDUMPEROLE_HXX
-
-#include <sot/storage.hxx>
-#include <sot/storinfo.hxx>
-#include "fdumper.hxx"
-
-#if SCF_INCL_DUMPER
-
-namespace scf {
-namespace dump {
-
-// ============================================================================
-// ============================================================================
-
-class OleStorageObject : public ObjectBase
-{
-public:
-    explicit            OleStorageObject( const OleStorageObject& rParentStrg, const String& rStrgName );
-    explicit            OleStorageObject( const ObjectBase& rParent, SotStorageRef xRootStrg );
-    explicit            OleStorageObject( const ObjectBase& rParent, SvStream& rRootStrm );
-    explicit            OleStorageObject( const ObjectBase& rParent );
-    virtual             ~OleStorageObject();
-
-    inline SotStorageRef GetStorage() const { return mxStrg; }
-    inline const String& GetStoragePath() const { return maPath; }
-    inline const String& GetStorageName() const { return maName; }
-    String              GetFullName() const;
-
-    void                ExtractStorageToFileSystem();
-
-protected:
-    inline explicit     OleStorageObject() {}
-    void                Construct( const ObjectBase& rParent, SotStorageRef xStrg, const String& rPath );
-    void                Construct( const OleStorageObject& rParentStrg, const String& rStrgName );
-    void                Construct( const ObjectBase& rParent, SvStream& rRootStrm );
-    void                Construct( const ObjectBase& rParent );
-
-    virtual bool        ImplIsValid() const;
-    virtual void        ImplDumpHeader();
-    virtual void        ImplDumpFooter();
-
-    using               ObjectBase::Construct;
-
-private:
-    void                DumpStorageInfo( bool bExtended );
-
-private:
-    SotStorageRef       mxStrg;
-    String              maPath;
-    String              maName;
-};
-
-typedef ScfRef< OleStorageObject > OleStorageObjectRef;
-
-// ============================================================================
-
-class OleStorageIterator : public Base
-{
-public:
-    explicit            OleStorageIterator( const OleStorageObject& rStrg );
-    explicit            OleStorageIterator( SotStorageRef xStrg );
-                        ~OleStorageIterator();
-
-    ULONG               GetSize() const;
-
-    OleStorageIterator& operator++();
-    const SvStorageInfo* operator->() const;
-
-protected:
-    void                Construct( SotStorageRef xStrg );
-
-private:
-    virtual bool        ImplIsValid() const;
-
-private:
-    typedef ScfRef< SvStorageInfoList > SvStorageInfoListRef;
-    SvStorageInfoListRef mxInfoList;
-    ULONG               mnIndex;
-};
-
-// ============================================================================
-// ============================================================================
-
-class OleStreamObject : public StreamObjectBase
-{
-public:
-    explicit            OleStreamObject( const OleStorageObject& rParentStrg, const String& rStrmName );
-    virtual             ~OleStreamObject();
-
-protected:
-    inline explicit     OleStreamObject() {}
-    void                Construct( const OleStorageObject& rParentStrg, const String& rStrmName );
-
-    virtual bool        ImplIsValid() const;
-
-    using               StreamObjectBase::Construct;
-
-private:
-    SotStorageStreamRef mxStrm;
-};
-
-typedef ScfRef< OleStreamObject > OleStreamObjectRef;
-
-// ============================================================================
-
-class OlePropertyStreamObject : public OleStreamObject
-{
-public:
-    explicit            OlePropertyStreamObject( const OleStorageObject& rParentStrg, const String& rStrmName );
-
-protected:
-    inline explicit     OlePropertyStreamObject() {}
-    void                Construct( const OleStorageObject& rParentStrg, const String& rStrmName );
-
-    virtual void        ImplDumpBody();
-
-    using               OleStreamObject::Construct;
-
-private:
-    void                DumpSection( const String& rGuid, sal_uInt32 nStartPos );
-
-    void                DumpProperty( sal_Int32 nPropId, sal_uInt32 nStartPos );
-    void                DumpCodePageProperty( sal_uInt32 nStartPos );
-    void                DumpDictionaryProperty( sal_uInt32 nStartPos );
-
-    void                DumpPropertyContents( sal_Int32 nPropId );
-    void                DumpPropertyValue( sal_Int32 nPropId, sal_Int32 nBaseType );
-
-    sal_Int32           DumpPropertyType();
-    void                DumpBlob( const sal_Char* pcName );
-    String              DumpString8( const sal_Char* pcName );
-    String              DumpCharArray8( const sal_Char* pcName, sal_Int32 nCharCount );
-    String              DumpString16( const sal_Char* pcName );
-    String              DumpCharArray16( const sal_Char* pcName, sal_Int32 nCharCount );
-    DateTime            DumpFileTime( const sal_Char* pcName );
-
-    bool                StartElement( sal_uInt32 nStartPos );
-    void                WriteSectionHeader( const String& rGuid, sal_uInt32 nStartPos );
-    void                WritePropertyHeader( sal_Int32 nPropId, sal_uInt32 nStartPos );
-
-private:
-    NameListRef         mxPropIds;
-    rtl_TextEncoding    meTextEnc;
-    bool                mbIsUnicode;
-};
-
-// ============================================================================
-// ============================================================================
-
-} // namespace dump
-} // namespace scf
-
-#endif
-#endif
-
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index 5d3f196f7..58aa2f482 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -214,8 +214,17 @@ public:
     void	 			Reset();
     void                Reset( const ScAddress& rEingPos );
 
+    struct ConvertParam
+    {
+        bool    mbAllowArrays;
+        SCSIZE  mnArrayColSize;
+        SCSIZE  mnArrayRowSize;
+
+        ConvertParam();
+    };
+
     virtual ConvErr     Convert( const ScTokenArray*& rpErg, XclImpStream& rStrm, sal_Size nFormulaLen,
-                                 bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) = 0;
+                                 const ConvertParam& rParam, const FORMULA_TYPE eFT = FT_CellFormula ) = 0;
     virtual ConvErr     Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab,
                                     const FORMULA_TYPE eFT = FT_CellFormula ) = 0;
 };
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index 444ce2ee3..4b8c73e7c 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -119,6 +119,8 @@ protected:
                                                 //	Abschneiden von Zellen fuehrt
 
     // Record-Funktionen
+    void                    ReadFileSharing();
+
     sal_uInt16              ReadXFIndex( bool bBiff2 );
 
     void                    ReadDimensions();
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 7bbb004cc..44e02d075 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -211,15 +211,12 @@ private:
     bool                mbInRec;        /// true = currently writing inside of a record.
 };
 
-// ----------------------------------------------------------------------------
-
-
 // ============================================================================
 
 class XclExpBiff8Encrypter
 {
 public:
-    explicit XclExpBiff8Encrypter( const XclExpRoot& rRoot, const sal_uInt8 nDocId[16], 
+    explicit XclExpBiff8Encrypter( const XclExpRoot& rRoot, const sal_uInt8 nDocId[16],
                                    const sal_uInt8 nSalt[16] );
     ~XclExpBiff8Encrypter();
 
@@ -241,7 +238,7 @@ public:
     void EncryptBytes( SvStream& rStrm, ::std::vector<sal_uInt8>& aBytes );
 
 private:
-    void Init( const String& aPass, const sal_uInt8 nDocId[16], 
+    void Init( const String& aPass, const sal_uInt8 nDocId[16],
                const sal_uInt8 nSalt[16] );
 
     sal_uInt32 GetBlockPos( sal_Size nStrmPos ) const;
diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx
index 88517364a..706b12cf1 100644
--- a/sc/source/filter/inc/xestring.hxx
+++ b/sc/source/filter/inc/xestring.hxx
@@ -32,13 +32,11 @@
 #define SC_XESTRING_HXX
 
 #include "xlstring.hxx"
-#include "phonetic.hxx"
 
 // ============================================================================
 
 class ScEditCell;
 class ScPatternAttr;
-class ScPhonetic;
 class EditTextObject;
 class XclExpStream;
 class XclExpXmlStream;
@@ -197,12 +195,6 @@ public:
     /** Removes and returns the font index for the first char from the formatting runs, otherwise EXC_FONT_NOTFOUND. */
     sal_uInt16          RemoveLeadingFont();
 
-    // phonetic settings --------------------------------------------------------
-
-    /** Sets new phonetic settings for the current text.
-        @param rPhonetic a reference of ScPhonetic.*/
-    void                SetPhoneticSettings( const ScPhonetic& rPhonetic );
-
     // get data ---------------------------------------------------------------
 
     /** Returns the character count of the string. */
@@ -223,11 +215,6 @@ public:
     /** Returns the vector with all formatting runs. */
     inline const XclFormatRunVec& GetFormats() const { return maFormats; }
 
-    /** Returns the current count of phonetic settings */
-    sal_uInt32          GetPhoneticSettingsCount() const;
-    /** Returns true, if the string contains phonetic information. */
-    inline bool         HasPhonetic() const;
-
     /** Returns the current string flags field to export. */
     sal_uInt8           GetFlagField() const;
     /** Returns the byte count the header will take on export. */
@@ -256,8 +243,6 @@ public:
     void                WriteBuffer( XclExpStream& rStrm ) const;
     /** Writes the raw formatting run buffer. */
     void                WriteFormats( XclExpStream& rStrm, bool bWriteSize = false ) const;
-    /** Writes the raw phonetic settings. */
-    void                WritePhoneticSettings( XclExpStream& rStrm ) const;
     /** Writes the complete Unicode string. */
     void                Write( XclExpStream& rStrm ) const;
 
@@ -276,8 +261,6 @@ private:
     bool                IsWriteFlags() const;
     /** Returns true, if the formatting run vector should be written. */
     bool                IsWriteFormats() const;
-    /** Returns true, if phonetic settings of the text should be written. */
-    bool                IsWritePhoneticSettings() const;
 
     /** Sets the string length but regards the limit given in mnMaxLen. */
     void                SetStrLen( sal_Int32 nNewLen );
@@ -332,7 +315,6 @@ private:
     ScfUInt16Vec        maUniBuffer;    /// The Unicode character buffer.
     ScfUInt8Vec         maCharBuffer;   /// The byte character buffer.
     XclFormatRunVec     maFormats;      /// All formatting runs.
-    ScPhonetic          maPhonetic;
     sal_uInt16          mnLen;          /// Character count to export.
     sal_uInt16          mnMaxLen;       /// Maximum allowed number of characters.
     bool                mbIsBiff8;      /// true = BIFF8 Unicode string, false = BIFF2-7 bytestring.
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index 8485bb18c..9508c8b3f 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -61,7 +61,8 @@ enum XclExpColorType
     EXC_COLOR_CHARTLINE,        /// Line in a chart.
     EXC_COLOR_CHARTAREA,        /// Area in a chart.
     EXC_COLOR_CTRLTEXT,         /// Text color in a form control.
-    EXC_COLOR_GRID              /// Spreadsheet grid color.
+    EXC_COLOR_GRID,              /// Spreadsheet grid color.
+    EXC_COLOR_TABBG             /// Spreadsheet tab bg color.
 };
 
 // ----------------------------------------------------------------------------
diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx
index 4d8b10dda..5c54ecd9c 100644
--- a/sc/source/filter/inc/xeview.hxx
+++ b/sc/source/filter/inc/xeview.hxx
@@ -134,6 +134,20 @@ private:
     sal_uInt8           mnPane;             /// Pane identifier of this selection.
 };
 
+class XclExpTabBgColor : public XclExpRecord
+{
+public:
+    explicit            XclExpTabBgColor( const XclTabViewData& rTabViewData );
+
+    /* virtual void        SaveXml( XclExpXmlStream& rStrm ); TODO Fix XML Saving Stream */
+private:
+    /** Writes the contents of the SHEETEXT record. */
+    virtual void        WriteBody( XclExpStream& rStrm );
+
+private:
+    const XclTabViewData&  mrTabViewData;             /// view settings data of current sheet.
+};
+
 // View settings ==============================================================
 
 /** Contains all view settings records for a single sheet. */
@@ -156,6 +170,7 @@ private:
     void                WriteScl( XclExpStream& rStrm ) const;
     void                WritePane( XclExpStream& rStrm ) const;
     void                WriteSelection( XclExpStream& rStrm, sal_uInt8 nPane ) const;
+    void                WriteTabBgColor( XclExpStream& rStrm ) const;
 
 private:
     XclTabViewData      maData;             /// All view settings for a sheet.
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 1798242df..e923ee1e9 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -39,6 +39,7 @@
 #include <svtools/itemset.hxx>
 
 #include "rangelst.hxx"
+#include "token.hxx"
 #include "xlchart.hxx"
 #include "xlstyle.hxx"
 #include "xistring.hxx"
@@ -403,6 +404,8 @@ public:
     XFormattedStringSeq CreateStringSequence( const XclImpChRoot& rRoot,
                             sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const;
 
+    void                FillSourceLink(::std::vector<ScSharedTokenRef>& rTokens) const;
+
 private:
     XclChSourceLink     maData;             /// Contents of the CHSOURCELINK record.
     XclImpStringRef     mxString;           /// Text data (CHSTRING record).
@@ -811,6 +814,8 @@ public:
     /** Creates a data series object with initialized source links. */
     XDataSeriesRef      CreateDataSeries() const;
 
+    void                FillAllSourceLinks(::std::vector<ScSharedTokenRef>& rTokens) const;
+
 private:
     /** Reads a CHSOURCELINK record. */
     void                ReadChSourceLink( XclImpStream& rStrm );
@@ -1353,7 +1358,7 @@ public:
     inline sal_Size     GetProgressSize() const { return 2 * EXC_CHART_PROGRESS_SIZE; }
 
     /** Converts and writes all properties to the passed chart. */
-    void                Convert( XChartDocRef xChartDoc, ScfProgressBar& rProgress ) const;
+    void                Convert( XChartDocRef xChartDoc, ScfProgressBar& rProgress, const ::rtl::OUString& rObjName ) const;
 
 private:
     /** Reads a CHSERIES group (data series source and formatting). */
@@ -1421,7 +1426,7 @@ public:
     inline bool         IsPivotChart() const { return mbIsPivotChart; }
 
     /** Creates the chart object in the passed component. */
-    void                Convert( XModelRef xModel, ScfProgressBar& rProgress ) const;
+    void                Convert( XModelRef xModel, ScfProgressBar& rProgress, const ::rtl::OUString& rObjName ) const;
 
 private:
     /** Reads the CHCHART group (entire chart data). */
diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx
index 915f9610a..f33168398 100644
--- a/sc/source/filter/inc/xiroot.hxx
+++ b/sc/source/filter/inc/xiroot.hxx
@@ -117,9 +117,6 @@ struct XclImpRootData : public XclRootData
     XclImpTabProtectRef mxTabProtect;       /// Sheet protection options for current sheet.
     XclImpDocProtectRef mxDocProtect;       /// Document protection options.
 
-    String              maPassw;            /// Entered password for stream decryption.
-    bool                mbPassQueried;      /// true = Password already querried.
-
     bool                mbHasCodePage;      /// true = CODEPAGE record exists.
 
     explicit            XclImpRootData( XclBiff eBiff, SfxMedium& rMedium,
@@ -205,9 +202,6 @@ public:
     /** Returns the Calc add-in function name for an Excel function name. */
     String              GetScAddInName( const String& rXclName ) const;
 
-    /** Queries a password from the user and returns it (empty string -> input cancelled). */
-    const String&       QueryPassword() const;
-
 private:
     mutable XclImpRootData& mrImpData;      /// Reference to the global import data struct.
 };
diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index 81903d658..3ee461f16 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -31,6 +31,7 @@
 #ifndef SC_XISTREAM_HXX
 #define SC_XISTREAM_HXX
 
+#include <comphelper/docpasswordhelper.hxx>
 #include <svx/mscodec.hxx>
 #include "xlstream.hxx"
 #include "xlconst.hxx"
@@ -52,7 +53,7 @@ class XclImpDecrypter;
 typedef ScfRef< XclImpDecrypter > XclImpDecrypterRef;
 
 /** Base class for BIFF stream decryption. */
-class XclImpDecrypter
+class XclImpDecrypter : public ::comphelper::IDocPasswordVerifier
 {
 public:
     explicit            XclImpDecrypter();
@@ -60,40 +61,39 @@ public:
 
     /** Returns the current error code of the decrypter. */
     inline ErrCode      GetError() const { return mnError; }
-    /** Returns true, if the decrypter has been constructed successfully.
-        This means especially that construction happened with a valid password. */
+    /** Returns true, if the decoder has been initialized correctly. */
     inline bool         IsValid() const { return mnError == ERRCODE_NONE; }
 
     /** Creates a (ref-counted) copy of this decrypter object. */
     XclImpDecrypterRef  Clone() const;
 
+    /** Implementation of the ::comphelper::IDocPasswordVerifier interface,
+        calls the new virtual function implVerify(). */
+    virtual ::comphelper::DocPasswordVerifierResult
+                        verifyPassword( const ::rtl::OUString& rPassword );
+
     /** Updates the decrypter on start of a new record or after seeking stream. */
     void                Update( SvStream& rStrm, sal_uInt16 nRecSize );
     /** Reads and decrypts nBytes bytes and stores data into the existing(!) buffer pData.
         @return  Count of bytes really read. */
     sal_uInt16          Read( SvStream& rStrm, void* pData, sal_uInt16 nBytes );
 
-    const String        GetPassword() const;
-
 protected:
     /** Protected copy c'tor for OnClone(). */
     explicit            XclImpDecrypter( const XclImpDecrypter& rSrc );
 
-    /** Sets the decrypter to a state showing whether the password was correct. */
-    void                SetHasValidPassword( bool bValid );
-
-    void                SetPassword( const String& rPass );
-
 private:
     /** Implementation of cloning this object. */
     virtual XclImpDecrypter* OnClone() const = 0;
+    /** Derived classes implement password verification and initialization of
+        the decoder. */
+    virtual bool        OnVerify( const ::rtl::OUString& rPassword ) = 0;
     /** Implementation of updating the decrypter. */
     virtual void        OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) = 0;
     /** Implementation of the decryption. */
     virtual sal_uInt16  OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) = 0;
 
 private:
-    String              maPass;         /// Stored password (needed for export)
     ErrCode             mnError;        /// Decrypter error code.
     sal_Size            mnOldPos;       /// Last known stream position.
     sal_uInt16          mnRecSize;      /// Current record size.
@@ -105,12 +105,7 @@ private:
 class XclImpBiff5Decrypter : public XclImpDecrypter
 {
 public:
-    /** Constructs the decrypter.
-        @descr  Checks if the passed key and hash specify workbook protection.
-        Asks for a password otherwise.
-        @param nKey  Password key from FILEPASS record to verify password.
-        @param nHash  Password hash value from FILEPASS record to verify password. */
-    explicit            XclImpBiff5Decrypter( const XclImpRoot& rRoot, sal_uInt16 nKey, sal_uInt16 nHash );
+    explicit            XclImpBiff5Decrypter( sal_uInt16 nKey, sal_uInt16 nHash );
 
 private:
     /** Private copy c'tor for OnClone(). */
@@ -118,18 +113,18 @@ private:
 
     /** Implementation of cloning this object. */
     virtual XclImpBiff5Decrypter* OnClone() const;
+    /** Implements password verification and initialization of the decoder. */
+    virtual bool        OnVerify( const ::rtl::OUString& rPassword );
     /** Implementation of updating the decrypter. */
     virtual void        OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize );
     /** Implementation of the decryption. */
     virtual sal_uInt16  OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes );
 
-    /** Initializes the members.
-        @postcond  Internal status is set and can be querried with IsValid(). */
-    void                Init( const ByteString& rPass, sal_uInt16 nKey, sal_uInt16 nHash );
-
 private:
     ::svx::MSCodec_XorXLS95 maCodec;       /// Crypto algorithm implementation.
-    sal_uInt8           mpnPassw[ 16 ]; /// Cached password data for copy construction.
+    ::std::vector< sal_uInt8 > maPassword;
+    sal_uInt16          mnKey;
+    sal_uInt16          mnHash;
 };
 
 // ----------------------------------------------------------------------------
@@ -138,14 +133,8 @@ private:
 class XclImpBiff8Decrypter : public XclImpDecrypter
 {
 public:
-    /** Constructs the decrypter.
-        @descr  Checks if the passed salt data specifies workbook protection.
-        Asks for a password otherwise.
-        @param pnDocId  Unique document identifier from FILEPASS record.
-        @param pnSaltData  Salt data from FILEPASS record.
-        @param pnSaltHash  Salt hash value from FILEPASS record. */
-    explicit            XclImpBiff8Decrypter( const XclImpRoot& rRoot, sal_uInt8 pnDocId[ 16 ],
-                            sal_uInt8 pnSaltData[ 16 ], sal_uInt8 pnSaltHash[ 16 ] );
+    explicit            XclImpBiff8Decrypter( sal_uInt8 pnSalt[ 16 ],
+                            sal_uInt8 pnVerifier[ 16 ], sal_uInt8 pnVerifierHash[ 16 ] );
 
 private:
     /** Private copy c'tor for OnClone(). */
@@ -153,16 +142,13 @@ private:
 
     /** Implementation of cloning this object. */
     virtual XclImpBiff8Decrypter* OnClone() const;
+    /** Implements password verification and initialization of the decoder. */
+    virtual bool        OnVerify( const ::rtl::OUString& rPassword );
     /** Implementation of updating the decrypter. */
     virtual void        OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize );
     /** Implementation of the decryption. */
     virtual sal_uInt16  OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes );
 
-    /** Initializes the internal codec.
-        @postcond  Internal status is set and can be querried with IsValid(). */
-    void                Init( const String& rPass, sal_uInt8 pnDocId[ 16 ],
-                            sal_uInt8 pnSaltData[ 16 ], sal_uInt8 pnSaltHash[ 16 ] );
-
     /** Returns the block number corresponding to the passed stream position. */
     sal_uInt32          GetBlock( sal_Size nStrmPos ) const;
     /** Returns the block offset corresponding to the passed stream position. */
@@ -170,8 +156,10 @@ private:
 
 private:
     ::svx::MSCodec_Std97 maCodec;       /// Crypto algorithm implementation.
-    sal_uInt16          mpnPassw[ 16 ]; /// Cached password data for copy construction.
-    sal_uInt8           mpnDocId[ 16 ]; /// Cached document ID for copy construction.
+    ::std::vector< sal_uInt16 > maPassword;
+    ::std::vector< sal_uInt8 > maSalt;
+    ::std::vector< sal_uInt8 > maVerifier;
+    ::std::vector< sal_uInt8 > maVerifierHash;
 };
 
 // ============================================================================
@@ -315,7 +303,8 @@ public:
     /** Seeks to last position from user position stack.
         @descr  This position will be removed from the stack. */
     void                PopPosition();
-    void                RejectPosition();
+//UNUSED2008-05  /** Removes last position from user position stack, but does not seek to it. */
+//UNUSED2008-05  void                RejectPosition();
 
     /** Stores current position. This position keeps valid in all records. */
     void                StoreGlobalPosition();
diff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx
index a46564f43..66bc88515 100644
--- a/sc/source/filter/inc/xistring.hxx
+++ b/sc/source/filter/inc/xistring.hxx
@@ -32,7 +32,6 @@
 #define SC_XISTRING_HXX
 
 #include "xlstring.hxx"
-#include "phonetic.hxx"
 
 // Byte/Unicode strings =======================================================
 
@@ -84,19 +83,9 @@ public:
     /** Reads and appends formatting runs from an OBJ or TXO record. */
     static void         ReadObjFormats( XclImpStream& rStrm, XclFormatRunVec& rFormats, sal_uInt16 nFormatSize );
 
-    /** Returns true, if the string has phonetic information. */
-    inline bool         HasPhonetic() const { return !maPhonetic.IsEmpty(); }
-    /** Returns the text for phonetic information. */
-    inline const ScPhonetic& GetPhonetic() const { return maPhonetic; }
-
-    /** Reads phonetic settings from stream. */
-    void                ReadPhoneticSettings( XclImpStream& rStrm, sal_uInt32 nExtInf );
-
 private:
     String              maString;       /// The text data of the string.
     XclFormatRunVec     maFormats;      /// All formatting runs.
-    String              maPhoneticString;
-    ScPhonetic          maPhonetic;
 };
 
 // String iterator ============================================================
diff --git a/sc/source/filter/inc/xiview.hxx b/sc/source/filter/inc/xiview.hxx
index f0b393ef5..a54c67bf5 100644
--- a/sc/source/filter/inc/xiview.hxx
+++ b/sc/source/filter/inc/xiview.hxx
@@ -83,7 +83,8 @@ public:
     void                ReadPane( XclImpStream& rStrm );
     /** Reads a SELECTION record. */
     void                ReadSelection( XclImpStream& rStrm );
-
+    /** Reads a SHEETEXT record (Tab Color). */
+    void                ReadTabBgColor( XclImpStream& rStrm, XclImpPalette& rPal );
     /** Sets the view settings at the current sheet or the extended sheet options object. */
     void                Finalize();
 
diff --git a/sc/source/filter/inc/xlcontent.hxx b/sc/source/filter/inc/xlcontent.hxx
index 161e0b335..6c86e0be6 100644
--- a/sc/source/filter/inc/xlcontent.hxx
+++ b/sc/source/filter/inc/xlcontent.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,6 +35,10 @@
 
 // Constants ==================================================================
 
+// (0x005B) FILESHARING -------------------------------------------------------
+
+const sal_uInt16 EXC_ID_FILESHARING         = 0x005B;
+
 // (0x00E5) MERGEDCELLS -------------------------------------------------------
 
 const sal_uInt16 EXC_ID_MERGEDCELLS         = 0x00E5;
diff --git a/sc/source/filter/inc/xldumper.hxx b/sc/source/filter/inc/xldumper.hxx
deleted file mode 100644
index b35482955..000000000
--- a/sc/source/filter/inc/xldumper.hxx
+++ /dev/null
@@ -1,683 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: xldumper.hxx,v $
- * $Revision: 1.12 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SC_XLDUMPER_HXX
-#define SC_XLDUMPER_HXX
-
-#include "fdumper.hxx"
-
-#include <stack>
-#include "fdumperdff.hxx"
-#include "fdumperole.hxx"
-#include "xlconst.hxx"
-#include "xlstring.hxx"
-#include "xlstyle.hxx"
-
-#if SCF_INCL_DUMPER
-
-class SfxMedium;
-class SfxObjectShell;
-class ScDocument;
-struct XclImpRootData;
-class XclImpRoot;
-class XclImpStream;
-class XclFunctionProvider;
-
-namespace scf {
-namespace dump {
-namespace xls {
-
-// ============================================================================
-// ============================================================================
-
-struct Address
-{
-    sal_Int32           mnCol;
-    sal_Int32           mnRow;
-    inline explicit     Address() : mnCol( 0 ), mnRow( 0 ) {}
-    void                Read( XclImpStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
-};
-
-// ----------------------------------------------------------------------------
-
-struct Range
-{
-    Address             maFirst;
-    Address             maLast;
-    inline explicit     Range() {}
-    void                Read( XclImpStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
-};
-
-// ----------------------------------------------------------------------------
-
-struct RangeList : public ::std::vector< Range >
-{
-    inline explicit     RangeList() {}
-    void                Read( XclImpStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
-};
-
-// ============================================================================
-
-struct FormulaAddress : public Address
-{
-    bool                mbRelCol;
-    bool                mbRelRow;
-    inline explicit     FormulaAddress() : mbRelCol( false ), mbRelRow( false ) {}
-};
-
-// ----------------------------------------------------------------------------
-
-struct FormulaRange
-{
-    FormulaAddress      maFirst;
-    FormulaAddress      maLast;
-    inline explicit     FormulaRange() {}
-};
-
-// ============================================================================
-
-class StringHelper : public ::scf::dump::StringHelper
-{
-public:
-    static void         AppendAddrCol( String& rStr, sal_Int32 nCol, bool bRel );
-    static void         AppendAddrRow( String& rStr, sal_Int32 nRow, bool bRel );
-    static void         AppendAddrName( String& rStr, sal_Unicode cPrefix, sal_Int32 nColRow, bool bRel );
-
-    static void         AppendAddress( String& rStr, const Address& rPos );
-    static void         AppendRange( String& rStr, const Range& rRange );
-    static void         AppendRangeList( String& rStr, const RangeList& rRanges );
-
-    static void         AppendAddress( String& rStr, const FormulaAddress& rPos, bool bNameMode );
-    static void         AppendRange( String& rStr, const FormulaRange& rRange, bool bNameMode );
-};
-
-// ============================================================================
-// ============================================================================
-
-class RecordHeaderObject : public RecordHeaderBase
-{
-public:
-    explicit            RecordHeaderObject( const InputObjectBase& rParent );
-
-    inline bool         IsMergeContRec() const { return mbMergeContRec; }
-    inline bool         HasRecName( sal_uInt16 nRecId ) const { return GetRecNames()->HasName( nRecId ); }
-
-    void                DumpRecordHeader( XclImpStream& rStrm );
-
-protected:
-    virtual bool        ImplIsValid() const;
-
-private:
-    bool                mbMergeContRec;
-};
-
-typedef ScfRef< RecordHeaderObject > RecHeaderObjectRef;
-
-// ============================================================================
-// ============================================================================
-
-class BiffConfig : public Config
-{
-public:
-    explicit            BiffConfig( const Config& rParent, XclBiff eBiff );
-
-protected:
-    virtual bool        ImplIsValid() const;
-    virtual NameListRef ImplGetNameList( const String& rKey ) const;
-
-private:
-    XclBiff             meBiff;
-};
-
-typedef ScfRef< BiffConfig > BiffConfigRef;
-
-// ============================================================================
-
-class RootData : public Base
-{
-public:
-    explicit            RootData( SfxMedium& rMedium, XclBiff eBiff );
-    virtual             ~RootData();
-
-    inline const XclImpRoot& GetRoot() const { return *mxRoot; }
-
-    rtl_TextEncoding    GetTextEncoding() const;
-    void                SetTextEncoding( rtl_TextEncoding eTextEnc );
-
-protected:
-    virtual bool        ImplIsValid() const;
-
-private:
-    typedef ScfRef< ScDocument >        ScDocumentRef;
-    typedef ScfRef< XclImpRootData >    XclImpRootDataRef;
-    typedef ScfRef< XclImpRoot >        XclImpRootRef;
-
-    ScDocumentRef       mxDoc;
-    XclImpRootDataRef   mxRootData;
-    XclImpRootRef       mxRoot;
-};
-
-typedef ScfRef< RootData > RootDataRef;
-
-// ============================================================================
-
-class RootObjectBase : public WrappedStreamObject
-{
-public:
-    virtual             ~RootObjectBase();
-
-    inline RootData&    Root() const { return *mxRootData; }
-    inline const XclImpRoot& GetXclRoot() const { return mxRootData->GetRoot(); }
-    inline XclImpStream& GetXclStream() const { return *mxStrm; }
-    inline XclBiff      GetBiff() const { return meBiff; }
-
-protected:
-    explicit            RootObjectBase();
-    void                Construct( const ObjectBase& rParent, SvStream& rStrm, XclBiff eBiff );
-    void                Construct( const OleStorageObject& rParentStrg, const String& rStrmName, XclBiff eBiff );
-    void                Construct( const RootObjectBase& rParent );
-
-    virtual bool        ImplIsValid() const;
-    virtual void        ImplDumpExtendedHeader();
-    virtual ConfigRef   ImplReconstructConfig();
-    virtual InputRef    ImplReconstructInput();
-
-    String              GetErrorName( sal_uInt8 nErrCode ) const;
-
-    // ------------------------------------------------------------------------
-
-    double              WriteRkItem( const sal_Char* pcName, sal_Int32 nRk );
-    void                WriteBooleanItem( const sal_Char* pcName, sal_uInt8 nBool );
-    void                WriteErrorCodeItem( const sal_Char* pcName, sal_uInt8 nErrCode );
-
-    void                WriteColIndexItem( const sal_Char* pcName, sal_Int32 nCol );
-    void                WriteColRangeItem( const sal_Char* pcName, sal_Int32 nCol1, sal_Int32 nCol2 );
-    void                WriteRowIndexItem( const sal_Char* pcName, sal_Int32 nRow );
-    void                WriteRowRangeItem( const sal_Char* pcName, sal_Int32 nRow1, sal_Int32 nRow2 );
-
-    void                WriteAddressItem( const sal_Char* pcName, const Address& rPos );
-    void                WriteRangeItem( const sal_Char* pcName, const Range& rRange );
-    void                WriteRangeListItem( const sal_Char* pcName, const RangeList& rRanges );
-
-    template< typename Type >
-    void                WriteRectItem( const sal_Char* pcName,
-                            Type nLeft, Type nTop, Type nWidth, Type nHeight,
-                            const NameListWrapper& rListWrp = NO_LIST,
-                            FormatType eFmtType = FORMATTYPE_DEC );
-
-    // ------------------------------------------------------------------------
-
-    String              DumpString( const sal_Char* pcName = 0, XclStrFlags nFlags = EXC_STR_DEFAULT );
-    double              DumpRk( const sal_Char* pcName = 0 );
-    sal_uInt8           DumpBoolean( const sal_Char* pcName = 0 );
-    sal_uInt8           DumpErrorCode( const sal_Char* pcName = 0 );
-
-    Color               DumpRgbColor( const sal_Char* pcName = 0 );
-    rtl_TextEncoding    DumpCodePage( const sal_Char* pcName = 0 );
-    void                DumpFormulaResult( const sal_Char* pcName = 0 );
-
-    sal_Int32           DumpColIndex( const sal_Char* pcName = 0, bool bCol16Bit = true );
-    sal_Int32           DumpColRange( const sal_Char* pcName = 0, bool bCol16Bit = true );
-    sal_Int32           DumpRowIndex( const sal_Char* pcName = 0, bool bRow32Bit = false );
-    sal_Int32           DumpRowRange( const sal_Char* pcName = 0, bool bRow32Bit = false );
-
-    Address             DumpAddress( const sal_Char* pcName = 0, bool bCol16Bit = true, bool bRow32Bit = false );
-    Range               DumpRange( const sal_Char* pcName = 0, bool bCol16Bit = true, bool bRow32Bit = false );
-    void                DumpRangeList( const sal_Char* pcName = 0, bool bCol16Bit = true, bool bRow32Bit = false );
-
-    void                DumpConstArrayHeader( sal_uInt32& rnCols, sal_uInt32& rnRows );
-    String              DumpConstValue();
-
-    template< typename Type >
-    void                DumpRect( const sal_Char* pcName,
-                            const NameListWrapper& rListWrp = NO_LIST,
-                            FormatType eFmtType = FORMATTYPE_DEC );
-
-    // ------------------------------------------------------------------------
-
-    using               WrappedStreamObject::Construct;
-
-private:
-    void                ConstructRootObjBase( XclBiff eBiff );
-
-private:
-    typedef ScfRef< XclImpStream > XclImpStreamRef;
-
-    RootDataRef         mxRootData;
-    BiffConfigRef       mxBiffCfg;
-    XclImpStreamRef     mxStrm;
-    XclBiff             meBiff;
-    NameListRef         mxBoolean;
-    NameListRef         mxErrCodes;
-    NameListRef         mxConstType;
-    NameListRef         mxResultType;
-};
-
-// ----------------------------------------------------------------------------
-
-template< typename Type >
-void RootObjectBase::WriteRectItem( const sal_Char* pcName,
-        Type nLeft, Type nTop, Type nWidth, Type nHeight,
-        const NameListWrapper& rListWrp, FormatType eFmtType )
-{
-    MultiItemsGuard aMultiGuard( Out() );
-    WriteEmptyItem( pcName );
-    WriteValueItem( "x-pos", nLeft, eFmtType, rListWrp );
-    WriteValueItem( "y-pos", nTop, eFmtType, rListWrp );
-    WriteValueItem( "x-size", nWidth, eFmtType, rListWrp );
-    WriteValueItem( "y-size", nHeight, eFmtType, rListWrp );
-}
-
-template< typename Type >
-void RootObjectBase::DumpRect( const sal_Char* pcName,
-        const NameListWrapper& rListWrp, FormatType eFmtType )
-{
-    Type nLeft, nTop, nWidth, nHeight;
-    *mxStrm >> nLeft >> nTop >> nWidth >> nHeight;
-    WriteRectItem( pcName, nLeft, nTop, nWidth, nHeight, rListWrp, eFmtType );
-}
-
-// ============================================================================
-// ============================================================================
-
-class SimpleObjectBase : public RootObjectBase
-{
-public:
-    virtual             ~SimpleObjectBase();
-
-protected:
-    inline explicit     SimpleObjectBase() {}
-    void                Construct( const RootObjectBase& rParent );
-
-    virtual void        ImplDumpHeader();
-    virtual void        ImplDumpFooter();
-
-    using               RootObjectBase::Construct;
-};
-
-// ============================================================================
-// ============================================================================
-
-/** Stack to create a human readable formula string from a UPN token array. */
-class FormulaStack
-{
-public:
-    explicit            FormulaStack();
-
-    inline const String& GetFormulaString() const { return GetString( maFmlaStack ); }
-    inline const String& GetClassesString() const { return GetString( maClassStack ); }
-
-    void                PushOperand( const StringWrapper& rOp, const String& rTokClass );
-    void                PushOperand( const StringWrapper& rOp );
-    void                PushUnaryOp( const StringWrapper& rLOp, const StringWrapper& rROp );
-    void                PushBinaryOp( const StringWrapper& rOp );
-    void                PushFuncOp( const StringWrapper& rFunc, const String& rTokClass, sal_uInt8 nParamCount );
-
-    inline void         SetError() { mbError = true; }
-    void                ReplaceOnTop( const String& rOld, const String& rNew );
-
-private:
-    typedef ::std::stack< String > StringStack;
-
-    inline bool         Check( bool bCond ) { return (mbError |= !bCond) == false; }
-
-    const String&       GetString( const StringStack& rStack ) const;
-    void                PushUnaryOp( StringStack& rStack, const String& rLOp, const String& rROp );
-    void                PushBinaryOp( StringStack& rStack, const String& rOp );
-    void                PushFuncOp( StringStack& rStack, const String& rOp, sal_uInt8 nParamCount );
-
-private:
-    StringStack         maFmlaStack;
-    StringStack         maClassStack;
-    bool                mbError;
-};
-
-// ============================================================================
-
-class FormulaObject : public SimpleObjectBase
-{
-public:
-    explicit            FormulaObject( const RootObjectBase& rParent );
-    virtual             ~FormulaObject();
-
-    sal_uInt16          ReadFormulaSize();
-    sal_uInt16          DumpFormulaSize( const sal_Char* pcName = 0 );
-
-    void                DumpCellFormula( const sal_Char* pcName, sal_uInt16 nSize );
-    void                DumpCellFormula( const sal_Char* pcName = 0 );
-    void                DumpNameFormula( const sal_Char* pcName, sal_uInt16 nSize );
-    void                DumpNameFormula( const sal_Char* pcName = 0 );
-
-protected:
-    virtual void        ImplDumpHeader();
-    virtual void        ImplDumpBody();
-
-private:
-    void                ConstructFmlaObj();
-
-    void                DumpFormula( const sal_Char* pcName, sal_uInt16 nSize, bool bNameMode );
-    void                DumpFormula( const sal_Char* pcName, bool bNameMode );
-
-    FormulaAddress      CreateTokenAddress( sal_uInt16 nCol, sal_uInt16 nRow, bool bRelC, bool bRelR, bool bNameMode ) const;
-    String              CreateFunc( sal_uInt16 nFuncIdx ) const;
-    String              CreateRef( const String& rData ) const;
-    String              CreateName( sal_uInt16 nNameIdx ) const;
-    String              CreatePlaceHolder( size_t nIdx ) const;
-    String              CreatePlaceHolder() const;
-
-    void                WriteTokenAddressItem( const sal_Char* pcName, const FormulaAddress& rPos, bool bNameMode );
-    void                WriteTokenAddress3dItem( const sal_Char* pcName, const String& rRef, const FormulaAddress& rPos, bool bNameMode );
-    void                WriteTokenRangeItem( const sal_Char* pcName, const FormulaRange& rRange, bool bNameMode );
-    void                WriteTokenRange3dItem( const sal_Char* pcName, const String& rRef, const FormulaRange& rRange, bool bNameMode );
-
-    sal_uInt16          DumpTokenFuncIdx();
-    sal_uInt16          DumpTokenCol( const sal_Char* pcName, bool& rbRelC, bool& rbRelR );
-    sal_uInt16          DumpTokenRow( const sal_Char* pcName, bool& rbRelC, bool& rbRelR );
-    FormulaAddress      DumpTokenAddress( bool bNameMode );
-    FormulaRange        DumpTokenRange( bool bNameMode );
-    String              DumpTokenRefIdx();
-    void                DumpTokenRefTabIdxs();
-
-    void                DumpIntToken();
-    void                DumpDoubleToken();
-    void                DumpStringToken();
-    void                DumpBoolToken();
-    void                DumpErrorToken();
-    void                DumpMissArgToken();
-
-    void                DumpArrayToken( const String& rTokClass );
-    void                DumpNameToken( const String& rTokClass );
-    void                DumpNameXToken( const String& rTokClass );
-    void                DumpRefToken( const String& rTokClass, bool bNameMode );
-    void                DumpAreaToken( const String& rTokClass, bool bNameMode );
-    void                DumpRefErrToken( const String& rTokClass, bool bArea );
-    void                DumpRef3dToken( const String& rTokClass, bool bNameMode );
-    void                DumpArea3dToken( const String& rTokClass, bool bNameMode );
-    void                DumpRefErr3dToken( const String& rTokClass, bool bArea );
-    void                DumpMemFuncToken( const String& rTokClass );
-    void                DumpMemAreaToken( const String& rTokClass, bool bAddData );
-
-    void                DumpExpToken( const StringWrapper& rName );
-    void                DumpUnaryOpToken( const StringWrapper& rLOp, const StringWrapper& rROp );
-    void                DumpBinaryOpToken( const StringWrapper& rOp );
-    void                DumpFuncToken( const String& rTokClass );
-    void                DumpFuncVarToken( const String& rTokClass );
-    void                DumpCmdToken( const String& rTokClass );
-
-    void                DumpSheetToken();
-    void                DumpEndSheetToken();
-    bool                DumpAttrToken();
-
-    bool                DumpNlrToken();
-    void                DumpNlrErrToken();
-    void                DumpNlrColRowToken( const String& rTokClass, bool bAddData );
-    void                DumpNlrRangeToken( const String& rTokClass, bool bAddData );
-    void                DumpNlrRangeErrToken();
-
-    void                DumpAddTokenData();
-    void                DumpAddDataNlr( size_t nIdx );
-    void                DumpAddDataArray( size_t nIdx );
-    void                DumpAddDataMemArea( size_t nIdx );
-
-private:
-    enum AddDataType { ADDDATA_NLR, ADDDATA_ARRAY, ADDDATA_MEMAREA };
-
-    typedef ScfRef< FormulaStack >          FormulaStackRef;
-    typedef ScfRef< XclFunctionProvider >   XclFuncProvRef;
-    typedef ::std::vector< AddDataType >    AddDataTypeVec;
-
-    NameListRef         mxTokens;
-    NameListRef         mxClasses;
-    NameListRef         mxFuncNames;
-    NameListRef         mxParamCnt;
-    NameListRef         mxRelFlags;
-    NameListRef         mxNlrTypes;
-    NameListRef         mxAttrTypes;
-    NameListRef         mxSpTypes;
-
-    FormulaStackRef     mxStack;
-    XclFuncProvRef      mxFuncProv;
-    AddDataTypeVec      maAddData;
-    String              maRefPrefix;
-    const sal_Char*     mpcName;
-    sal_uInt16          mnSize;
-    bool                mbNameMode;
-};
-
-typedef ScfRef< FormulaObject > FormulaObjectRef;
-
-// ============================================================================
-// ============================================================================
-
-class RecordStreamObject : public RootObjectBase
-{
-public:
-    explicit            RecordStreamObject( const ObjectBase& rParent, SvStream& rStrm, XclBiff eBiff = EXC_BIFF_UNKNOWN );
-    explicit            RecordStreamObject( const OleStorageObject& rParentStrg, const String& rStrmName, XclBiff eBiff = EXC_BIFF_UNKNOWN );
-    virtual             ~RecordStreamObject();
-
-protected:
-    inline explicit     RecordStreamObject() {}
-    void                Construct( const ObjectBase& rParent, SvStream& rStrm, XclBiff eBiff );
-    void                Construct( const OleStorageObject& rParentStrg, const String& rStrmName, XclBiff eBiff );
-
-    virtual bool        ImplIsValid() const;
-    virtual void        ImplDumpBody();
-
-    virtual void        ImplPreProcessRecord();
-    virtual void        ImplDumpRecord();
-    virtual void        ImplPostProcessRecord();
-
-    inline RecordHeaderObject& GetRecordHeader() const { return *mxHdrObj; }
-    inline FormulaObject& GetFormulaDumper() const { return *mxFmlaObj; }
-    inline DffDumpObject& GetDffDumper() const { return *mxDffObj; }
-
-    void                DumpRepeatedRecordId();
-
-    using               RootObjectBase::Construct;
-
-private:
-    void                ConstructRecStrmObj();
-
-    void                DumpRecordBody();
-    void                DumpSimpleRecord( const String& rRecData );
-
-private:
-    String              maProgressName;
-    RecHeaderObjectRef  mxHdrObj;
-    FormulaObjectRef    mxFmlaObj;
-    DffDumpObjectRef    mxDffObj;
-    NameListRef         mxSimpleRecs;
-};
-
-// ============================================================================
-
-class WorkbookStreamObject : public RecordStreamObject
-{
-public:
-    explicit            WorkbookStreamObject( const ObjectBase& rParent, SvStream& rStrm );
-    explicit            WorkbookStreamObject( const OleStorageObject& rParentStrg, const String& rStrmName );
-    virtual             ~WorkbookStreamObject();
-
-protected:
-    virtual void        ImplPreProcessRecord();
-    virtual void        ImplDumpRecord();
-    virtual void        ImplPostProcessRecord();
-
-private:
-    void                ConstructWbStrmObj();
-
-    const XclFontData*  GetFontData( sal_uInt16 nFontIdx ) const;
-    sal_uInt16          GetXfData( sal_uInt16 nXfIdx ) const;
-    rtl_TextEncoding    GetFontEncoding( sal_uInt16 nXfIdx ) const;
-    String              CreateFontName( const XclFontData& rFontData ) const;
-
-    template< typename Type >
-    Type                DumpPatternIdx( const sal_Char* pcName = 0 );
-    template< typename Type >
-    Type                DumpColorIdx( const sal_Char* pcName = 0 );
-
-    sal_uInt16          DumpFontIdx( const sal_Char* pcName = 0 );
-    sal_uInt16          DumpFormatIdx( const sal_Char* pcName = 0 );
-    sal_uInt16          DumpXfIdx( const sal_Char* pcName = 0, bool bBiff2Style = false );
-
-    sal_uInt16          DumpCellHeader( bool bBiff2Style = false );
-    void                DumpBoolErr();
-
-    void                DumpFontRec();
-    void                DumpFormatRec();
-    void                DumpXfRec();
-
-    void                DumpObjRec();
-    void                DumpObjRec5();
-    void                DumpObjRec8();
-
-private:
-    typedef ::std::vector< XclFontData > XclFontDataVec;
-
-    NameListRef         mxColors;
-    NameListRef         mxBorderStyles;
-    NameListRef         mxFillPatterns;
-    NameListRef         mxFontNames;
-    NameListRef         mxFormats;
-    XclFontDataVec      maFontDatas;
-    ScfUInt16Vec        maXfDatas;
-    sal_uInt16          mnFormatIdx;
-    sal_uInt16          mnPTRowFields;
-    sal_uInt16          mnPTColFields;
-    sal_uInt16          mnPTSxliIdx;
-    bool                mbHasCodePage;
-};
-
-// ----------------------------------------------------------------------------
-
-template< typename Type >
-Type WorkbookStreamObject::DumpPatternIdx( const sal_Char* pcName )
-{
-    return DumpDec< Type >( pcName ? pcName : "fill-pattern", mxFillPatterns );
-}
-
-template< typename Type >
-Type WorkbookStreamObject::DumpColorIdx( const sal_Char* pcName )
-{
-    return DumpDec< Type >( pcName ? pcName : "color-idx", mxColors );
-}
-
-// ============================================================================
-
-class PivotCacheStreamObject : public RecordStreamObject
-{
-public:
-    explicit            PivotCacheStreamObject( const ObjectBase& rParent, SvStream& rStrm );
-    explicit            PivotCacheStreamObject( const OleStorageObject& rParentStrg, const String& rStrmName );
-    virtual             ~PivotCacheStreamObject();
-
-protected:
-    virtual void        ImplDumpRecord();
-};
-
-// ============================================================================
-
-class VbaProjectStreamObject : public OleStreamObject
-{
-public:
-    explicit            VbaProjectStreamObject( const OleStorageObject& rParentStrg );
-
-protected:
-    virtual void        ImplDumpBody();
-};
-
-// ============================================================================
-// ============================================================================
-
-class PivotCacheStorageObject : public OleStorageObject
-{
-public:
-    explicit            PivotCacheStorageObject( const OleStorageObject& rParentStrg );
-
-protected:
-    virtual void        ImplDumpBody();
-};
-
-// ============================================================================
-
-class VbaProjectStorageObject : public OleStorageObject
-{
-public:
-    explicit            VbaProjectStorageObject( const OleStorageObject& rParentStrg );
-
-protected:
-    virtual void        ImplDumpBody();
-};
-
-// ============================================================================
-
-class VbaStorageObject : public OleStorageObject
-{
-public:
-    explicit            VbaStorageObject( const OleStorageObject& rParentStrg );
-
-protected:
-    virtual void        ImplDumpBody();
-};
-
-// ============================================================================
-
-class RootStorageObject : public OleStorageObject
-{
-public:
-    explicit            RootStorageObject( const ObjectBase& rParent );
-
-protected:
-    virtual void        ImplDumpBody();
-};
-
-// ============================================================================
-// ============================================================================
-
-class Dumper : public DumperBase
-{
-public:
-    explicit            Dumper( SfxMedium& rMedium, SfxObjectShell* pDocShell );
-
-protected:
-    virtual void        ImplDumpBody();
-};
-
-// ============================================================================
-// ============================================================================
-
-} // namespace xls
-} // namespace dump
-} // namespace scf
-
-#endif
-#endif
-
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 4705829af..8571dafcb 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,6 +36,8 @@
 #include "xlconst.hxx"
 #include "xltools.hxx"
 
+namespace comphelper { class IDocPasswordVerifier; }
+
 // Forward declarations of objects in public use ==============================
 
 class DateTime;
@@ -92,6 +94,7 @@ struct XclRootData
     ScDocument&         mrDoc;              /// The source or destination document.
     String              maDocUrl;           /// Document URL of imported/exported file.
     String              maBasePath;         /// Base path of imported/exported file (path of maDocUrl).
+    const String        maDefPassword;      /// The default password used for stream encryption.
     rtl_TextEncoding    meTextEnc;          /// Text encoding to import/export byte strings.
     LanguageType        meSysLang;          /// System language.
     LanguageType        meDocLang;          /// Document language (import: from file, export: from system).
@@ -183,6 +186,11 @@ public:
     /** Returns the base path of the imported/exported file. */
     inline const String& GetBasePath() const { return mrData.maBasePath; }
 
+    /** Returns the default password used for stream encryption. */
+    inline const String& GetDefaultPassword() const { return mrData.maDefPassword; }
+    /** Requests and verifies a password from the medium or the user. */
+    String              RequestPassword( ::comphelper::IDocPasswordVerifier& rVerifier ) const;
+
     /** Returns the OLE2 root storage of the imported/exported file.
         @return  Pointer to root storage or 0, if the file is a simple stream. */
     inline SotStorageRef GetRootStorage() const { return mrData.mxRootStrg; }
diff --git a/sc/source/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx
index 83ba823d2..603a4cfab 100644
--- a/sc/source/filter/inc/xlstream.hxx
+++ b/sc/source/filter/inc/xlstream.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,19 +50,6 @@ const sal_uInt16 EXC_ENCR_BLOCKSIZE         = 1024;
 const sal_uInt16 EXC_ID_UNKNOWN             = SAL_MAX_UINT16;
 const sal_uInt16 EXC_ID_CONT                = 0x003C;
 
-// Encryption/decryption ======================================================
-
-/** Helper class for BIFF stream en-/decryption. */
-class XclCryptoHelper : ScfNoInstance
-{
-public:
-    /** Returns the fixed password for workbook protection. */
-    static const ByteString GetBiff5WbProtPassword();
-
-    /** Returns the fixed password for workbook protection. */
-    static const String GetBiff8WbProtPassword();
-};
-
 // ============================================================================
 
 #endif
diff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx
index 89f827521..0a078a4a5 100644
--- a/sc/source/filter/inc/xlstring.hxx
+++ b/sc/source/filter/inc/xlstring.hxx
@@ -94,68 +94,7 @@ inline bool operator<( const XclFormatRun& rLeft, const XclFormatRun& rRight )
 /** A vector with all formatting runs for a rich-string. */
 typedef ::std::vector< XclFormatRun > XclFormatRunVec;
 
-// Phonetic settings for Asian text ===========================================
-
-struct XclPhoneticPortion
-{
-    sal_uInt16          mncpa;
-    sal_uInt16          mncpm;
-    sal_uInt16          mnccm;
-    explicit inline     XclPhoneticPortion() : mncpa( 0 ), mncpm( 0 ), mnccm( 0 ) {}
-    explicit inline     XclPhoneticPortion( sal_uInt16 ncpa, sal_uInt16 ncpm, sal_uInt16 nccm ) :
-                            mncpa( ncpa ), mncpm( ncpm ), mnccm ( nccm ) {}
-};
-
-inline bool operator==( const XclPhoneticPortion& rLeft, const XclPhoneticPortion& rRight )
-{
-    return
-        ( rLeft.mncpa == rRight.mncpa ) &&
-        ( rLeft.mncpm == rRight.mncpm ) &&
-        ( rLeft.mnccm == rRight.mnccm );
-}
-
-typedef ::std::vector< XclPhoneticPortion > XclPhoneticPortionVec;
-
-class XclPhoneticSettings
-{
-public:
-    explicit inline     XclPhoneticSettings() : mnFontIdx( 0 ), mnAdditionalSettings( 0 ), mnRepeatedTotalLength ( 0 ) {}
-    explicit inline     XclPhoneticSettings( sal_uInt16 nFontIdx, sal_uInt16 nAdditionalSettings,
-                                             sal_uInt16 nRepeatedTotalLength, const String& rPhoneticString,
-                                             const XclPhoneticPortionVec& rPhoneticPortions) : 
-                                             mnFontIdx( nFontIdx ), mnAdditionalSettings( nAdditionalSettings ),
-                                             mnRepeatedTotalLength ( nRepeatedTotalLength ),
-                                             maPhoneticString ( rPhoneticString ), maPhoneticPortions ( rPhoneticPortions ) {}
-
-    /** Returns the text for phonetic information. */
-    inline const String& GetString() const { return maPhoneticString; }
-    /** Returns the portion for phonetic information. */
-    inline const XclPhoneticPortionVec& GetPortions() const { return maPhoneticPortions; }
-    /** Returns font index of phonetic information. */
-    inline sal_uInt16 GetFontIndex() const { return mnFontIdx; }
-    /** Returns additional settings of phonetic information. */
-    inline sal_uInt16 GetAdditionalSettings() const { return mnAdditionalSettings; }
-    /** Returns repeated length of phonetic information. */
-    inline sal_uInt16 GetRepeatedTotalLength() const { return mnRepeatedTotalLength; }
-    /** Returns the size of phonetic information. */
-    inline sal_uInt32 GetSize() const { return 14 + ( maPhoneticString.Len() ? maPhoneticString.Len() * 2 : 2 ) + maPhoneticPortions.size() * 6; }
-
-private:
-    sal_uInt16            mnFontIdx;          /// Index to FONT record
-    sal_uInt16            mnAdditionalSettings; /// Additional settings for the Asian phonetic text
-    sal_uInt16            mnRepeatedTotalLength;
-    String                maPhoneticString;
-    XclPhoneticPortionVec maPhoneticPortions;
-};
-inline bool operator==( const XclPhoneticSettings& rLeft, const XclPhoneticSettings& rRight )
-{
-    return 
-        ( rLeft.GetString() == rRight.GetString() )                         &&
-        ( rLeft.GetPortions() == rRight.GetPortions() )                     && 
-        ( rLeft.GetFontIndex() == rRight.GetFontIndex() )                   && 
-        ( rLeft.GetAdditionalSettings() == rRight.GetAdditionalSettings() ) && 
-        ( rLeft.GetRepeatedTotalLength() == rRight.GetRepeatedTotalLength() );
-}
+// ============================================================================
 
 #endif
 
diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx
index 4a3798eaf..3070c280a 100644
--- a/sc/source/filter/inc/xlview.hxx
+++ b/sc/source/filter/inc/xlview.hxx
@@ -89,6 +89,11 @@ const sal_uInt8 EXC_PANE_TOPLEFT            = 3;        /// Single, top, left, o
 
 const sal_uInt16 EXC_ID_SCL                 = 0x00A0;
 
+// (0x0862) SHEETEXT ----------------------------------------------------------
+
+const sal_uInt16 EXC_ID_SHEETEXT            = 0x0862; 	/// header id for sheetext
+const sal_uInt8 EXC_SHEETEXT_TABCOLOR       = 0x7F; 	/// mask for tab color
+const sal_uInt16 EXC_COLOR_NOTABBG          = 0x7F;     /// Excel ignores Tab color when set to this value...
 // Structs ====================================================================
 
 /** Contains all view settings for the entire document. */
@@ -149,6 +154,9 @@ struct XclTabViewData
     bool                mbShowHeadings;     /// true = Show column/row headings.
     bool                mbShowZeros;        /// true = Show zero value zells.
     bool                mbShowOutline;      /// true = Show outlines.
+    Color               maTabBgColor;       /// Tab Color default = (COL_AUTO )
+    bool                IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO) ? TRUE : FALSE; };
+    sal_uInt32          mnTabBgColorId;         /// pallette color id
 
     explicit            XclTabViewData();
                         ~XclTabViewData();
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 17a48cb2b..8d887b0ed 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -183,8 +183,7 @@ void ImportLotus::Hiddencolumn( UINT16 nRecLen )
         {
             Read( nCol );
 
-            pD->SetColFlags( static_cast<SCCOL> (nCol), static_cast<SCTAB> (nLTab), pD->GetColFlags( static_cast<SCCOL> (nCol), static_cast<SCTAB> (nLTab) ) | CR_HIDDEN );
-
+            pD->SetColHidden(static_cast<SCCOL>(nCol), static_cast<SCCOL>(nCol), static_cast<SCTAB>(nLTab), true);
             nCnt--;
         }
     }
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 028993bd4..eb7d043f8 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -229,7 +229,7 @@ void OP_ColumnWidth( SvStream& r, UINT16 /*n*/ )
         nBreite = ( UINT16 ) ( TWIPS_PER_CHAR * nWidthSpaces );
     else
     {
-        pDoc->SetColFlags( static_cast<SCCOL> (nCol), 0, pDoc->GetColFlags( static_cast<SCCOL> (nCol), 0 ) | CR_HIDDEN );
+        pDoc->SetColHidden(static_cast<SCCOL>(nCol), static_cast<SCCOL>(nCol), 0, true);
         nBreite = nDefWidth;
     }
 
@@ -338,7 +338,7 @@ void OP_HiddenCols( SvStream& r, UINT16 /*n*/ )
         {
             if( nAkt & 0x01 )   // unterstes Bit gesetzt?
                 // -> Hidden Col
-                pDoc->SetColFlags( nCount, 0, pDoc->GetColFlags( nCount, 0 ) | CR_HIDDEN );
+                pDoc->SetColHidden(nCount, nCount, 0, true);
 
             nCount++;
             nAkt = nAkt / 2;    // der Naechste bitte...
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index e78e371cc..b25ad3784 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -69,6 +69,7 @@
 #include "drwlayer.hxx"
 #include "rangenam.hxx"
 #include "progress.hxx"
+#include "stringutil.hxx"
 
 #include "globstr.hrc"
 
@@ -331,12 +332,17 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
             // Daten eintragen
             if (bSimple)
             {
+                ScSetStringParam aParam;
+                aParam.mpNumFormatter = pFormatter;
+                aParam.mbDetectNumberFormat = true;
+                aParam.mbSetTextCellFormat = true;
+
                 if ( aValStr.Len() )
                     mpDoc->SetValue( nCol, nRow, nTab, fVal );
                 else if ( !pE->aSel.HasRange() )
                 {
                     // maybe ALT text of IMG or similar
-                    mpDoc->SetString( nCol, nRow, nTab, pE->aAltText, pFormatter );
+                    mpDoc->SetString( nCol, nRow, nTab, pE->aAltText, &aParam );
                     // wenn SelRange komplett leer kann nachfolgender Text im gleichen Absatz liegen!
                 }
                 else
@@ -381,7 +387,10 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
                     if (bNumbersEnglishUS && !bEnUsRecognized)
                         mpDoc->PutCell( nCol, nRow, nTab, new ScStringCell( aStr));
                     else
-                        mpDoc->SetString( nCol, nRow, nTab, aStr, pFormatter, bConvertDate );
+                    {
+                        aParam.mbDetectNumberFormat = bConvertDate;    
+                        mpDoc->SetString( nCol, nRow, nTab, aStr, &aParam );
+                    }
                 }
             }
             else
diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx
index 2c2cf224e..98aef5e3c 100644
--- a/sc/source/filter/rtf/expbase.cxx
+++ b/sc/source/filter/rtf/expbase.cxx
@@ -78,16 +78,13 @@ BOOL ScExportBase::GetDataArea( SCTAB nTab, SCCOL& nStartCol,
 BOOL ScExportBase::TrimDataArea( SCTAB nTab, SCCOL& nStartCol,
             SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const
 {
-    while ( nStartCol <= nEndCol &&
-            pDoc->GetColFlags( nStartCol, nTab ) & CR_HIDDEN )
+    SCCOL nLastCol;
+	while ( nStartCol <= nEndCol && pDoc->ColHidden(nStartCol, nTab, nLastCol))
         ++nStartCol;
-    while ( nStartCol <= nEndCol &&
-            pDoc->GetColFlags( nEndCol, nTab ) & CR_HIDDEN )
+	while ( nStartCol <= nEndCol && pDoc->ColHidden(nEndCol, nTab, nLastCol))
         --nEndCol;
-    nStartRow = pDoc->GetRowFlagsArray( nTab).GetFirstForCondition( nStartRow,
-            nEndRow, CR_HIDDEN, 0);
-    nEndRow = pDoc->GetRowFlagsArray( nTab).GetLastForCondition( nStartRow,
-            nEndRow, CR_HIDDEN, 0);
+    nStartRow = pDoc->FirstVisibleRow(nStartRow, nEndRow, nTab);
+    nEndRow = pDoc->LastVisibleRow(nStartRow, nEndRow, nTab);
     return nStartCol <= nEndCol && nStartRow <= nEndRow && nEndRow !=
         ::std::numeric_limits<SCROW>::max();
 }
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index df8661200..a456235d6 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1551,14 +1551,14 @@ void Sc10Import::LoadTables()
             rStream >> DataValue;
             if (DataValue != 0)
             {
-                BYTE nFlags = 0;
-                if ((DataValue & crfSoftBreak) == crfSoftBreak)
-                    nFlags |= CR_PAGEBREAK;
-                if ((DataValue & crfHardBreak) == crfHardBreak)
-                    nFlags |= CR_MANUALBREAK;
-                if ((DataValue & crfHidden) == crfHidden)
-                    nFlags |= CR_HIDDEN;
-                for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++) pDoc->SetColFlags(k, static_cast<SCTAB> (TabNo), nFlags);
+				bool bPageBreak   = ((DataValue & crfSoftBreak) == crfSoftBreak);
+				bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak);
+				bool bHidden = ((DataValue & crfHidden) == crfHidden);
+				for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++) 
+                {
+					pDoc->SetColHidden(k, k, static_cast<SCTAB>(TabNo), bHidden);
+                    pDoc->SetColBreak(k, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak);
+                }
             }
             DataStart = DataEnd + 1;
         }
@@ -1601,14 +1601,14 @@ void Sc10Import::LoadTables()
             rStream >> DataValue;
             if (DataValue != 0)
             {
-                BYTE nFlags = 0;
-                if ((DataValue & crfSoftBreak) == crfSoftBreak)
-                    nFlags |= CR_PAGEBREAK;
-                if ((DataValue & crfHardBreak) == crfHardBreak)
-                    nFlags |= CR_MANUALBREAK;
-                if ((DataValue & crfHidden) == crfHidden)
-                    nFlags |= CR_HIDDEN;
-                for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++) pDoc->SetRowFlags(l, static_cast<SCTAB> (TabNo), nFlags);
+				bool bPageBreak   = ((DataValue & crfSoftBreak) == crfSoftBreak);
+				bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak);
+                bool bHidden      = ((DataValue & crfHidden) == crfHidden);
+                for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++) 
+                {    
+                    pDoc->SetRowHidden(l, l, static_cast<SCTAB> (TabNo), bHidden);
+                    pDoc->SetRowBreak(l, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak);
+                }
             }
             DataStart = DataEnd + 1;
         }
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 0b6b3e36c..c20c8ac64 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -210,7 +210,9 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray*& rpTokenArray, const ScAddres
     // read the formula, 3D tab refs from extended data
     const ScTokenArray* pArray = NULL;
     aFmlConv.Reset( rPosition );
-    BOOL bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK);	// JEG : Check This
+    ExcelConverterBase::ConvertParam aParam;
+    aParam.mbAllowArrays = false;
+    BOOL bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, aParam, FT_CellFormula) == ConvOK);	// JEG : Check This
     rpTokenArray = (bOK && pArray) ? new ScTokenArray( *pArray ) : NULL;
     pStrm->Ignore( 1 );
 }
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index 0a49a0525..135a6d1f4 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -797,8 +797,9 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads
                             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON, XML_FALSE);
                         if (!pDPSave->GetDrillDown())
                             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_FALSE);
-                        if ((*pDPs)[i]->GetHeaderLayout ())
+                        if ((*pDPs)[i]->GetHeaderLayout())
                             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT, XML_TRUE);
+
                         SvXMLElementExport aElemDP(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, sal_True, sal_True);
 
                         // grand total elements.
diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx
index a3f6cf8d7..46a2bb0b0 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.hxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.hxx
@@ -44,6 +44,7 @@ class ScDPDimensionSaveData;
 class ScDPSaveGroupDimension;
 class ScDPSaveNumGroupDimension;
 struct ScDPNumGroupInfo;
+struct ScQueryParam;
 
 class ScXMLExportDataPilot
 {
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx
index 8743406b6..46c60011d 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -130,6 +130,13 @@ void ScMyShapesContainer::SetCellData( ScMyCell& rMyCell )
     rMyCell.bHasShape = !rMyCell.aShapeList.empty();
 }
 
+void ScMyShapesContainer::SkipTable(SCTAB nSkip)
+{
+    ScMyShapeList::iterator aItr = aShapeList.begin();
+    while( (aItr != aShapeList.end()) && (aItr->aAddress.Tab() == nSkip) )
+        aItr = aShapeList.erase(aItr);
+}
+
 void ScMyShapesContainer::Sort()
 {
     aShapeList.sort();
@@ -184,6 +191,13 @@ void ScMyNoteShapesContainer::SetCellData( ScMyCell& rMyCell )
     }
 }
 
+void ScMyNoteShapesContainer::SkipTable(SCTAB nSkip)
+{
+    ScMyNoteShapeList::iterator aItr = aNoteShapeList.begin();
+    while( (aItr != aNoteShapeList.end()) && (aItr->aPos.Tab() == nSkip) )
+        aItr = aNoteShapeList.erase(aItr);
+}
+
 void ScMyNoteShapesContainer::Sort()
 {
     aNoteShapeList.sort();
@@ -269,6 +283,13 @@ void ScMyMergedRangesContainer::SetCellData( ScMyCell& rMyCell )
     }
 }
 
+void ScMyMergedRangesContainer::SkipTable(SCTAB nSkip)
+{
+    ScMyMergedRangeList::iterator aItr = aRangeList.begin();
+    while( (aItr != aRangeList.end()) && (aItr->aCellRange.Sheet == nSkip) )
+        aItr = aRangeList.erase(aItr);
+}
+
 void ScMyMergedRangesContainer::Sort()
 {
     aRangeList.sort();
@@ -344,6 +365,13 @@ void ScMyAreaLinksContainer::SetCellData( ScMyCell& rMyCell )
     }
 }
 
+void ScMyAreaLinksContainer::SkipTable(SCTAB nSkip)
+{
+    ScMyAreaLinkList::iterator aItr = aAreaLinkList.begin();
+    while( (aItr != aAreaLinkList.end()) && (aItr->aDestRange.Sheet == nSkip) )
+        aItr = aAreaLinkList.erase(aItr);
+}
+
 void ScMyAreaLinksContainer::Sort()
 {
     aAreaLinkList.sort();
@@ -417,6 +445,13 @@ void ScMyEmptyDatabaseRangesContainer::SetCellData( ScMyCell& rMyCell )
     }
 }
 
+void ScMyEmptyDatabaseRangesContainer::SkipTable(SCTAB nSkip)
+{
+    ScMyEmptyDatabaseRangeList::iterator aItr = aDatabaseList.begin();
+    while( (aItr != aDatabaseList.end()) && (aItr->Sheet == nSkip) )
+        aItr = aDatabaseList.erase(aItr);
+}
+
 void ScMyEmptyDatabaseRangesContainer::Sort()
 {
     aDatabaseList.sort();
@@ -498,6 +533,13 @@ void ScMyDetectiveObjContainer::SetCellData( ScMyCell& rMyCell )
     rMyCell.bHasDetectiveObj = (rMyCell.aDetectiveObjVec.size() != 0);
 }
 
+void ScMyDetectiveObjContainer::SkipTable(SCTAB nSkip)
+{
+    ScMyDetectiveObjList::iterator aItr = aDetectiveObjList.begin();
+    while( (aItr != aDetectiveObjList.end()) && (aItr->aPosition.Sheet == nSkip) )
+        aItr = aDetectiveObjList.erase(aItr);
+}
+
 void ScMyDetectiveObjContainer::Sort()
 {
     aDetectiveObjList.sort();
@@ -557,6 +599,13 @@ void ScMyDetectiveOpContainer::SetCellData( ScMyCell& rMyCell )
     rMyCell.bHasDetectiveOp = (rMyCell.aDetectiveOpVec.size() != 0);
 }
 
+void ScMyDetectiveOpContainer::SkipTable(SCTAB nSkip)
+{
+    ScMyDetectiveOpList::iterator aItr = aDetectiveOpList.begin();
+    while( (aItr != aDetectiveOpList.end()) && (aItr->aPosition.Sheet == nSkip) )
+        aItr = aDetectiveOpList.erase(aItr);
+}
+
 void ScMyDetectiveOpContainer::Sort()
 {
     aDetectiveOpList.sort();
@@ -584,8 +633,7 @@ ScMyCell::ScMyCell() :
     bHasXText( sal_False ),
     bIsMatrixBase( sal_False ),
     bIsMatrixCovered( sal_False ),
-    bHasAnnotation( sal_False ),
-    bHasPhonetic( sal_False )
+    bHasAnnotation( sal_False )
 {
 }
 
@@ -767,6 +815,27 @@ void ScMyNotEmptyCellsIterator::SetCurrentTable(const SCTAB nTable,
     }
 }
 
+void ScMyNotEmptyCellsIterator::SkipTable(SCTAB nSkip)
+{
+    // Skip entries for a sheet that is copied instead of saving normally.
+    // Cells (including aAnnotations) are handled separately in SetCurrentTable.
+    
+    if( pShapes )
+        pShapes->SkipTable(nSkip);
+    if( pNoteShapes )
+        pNoteShapes->SkipTable(nSkip);
+    if( pEmptyDatabaseRanges )
+        pEmptyDatabaseRanges->SkipTable(nSkip);
+    if( pMergedRanges )
+        pMergedRanges->SkipTable(nSkip);
+    if( pAreaLinks )
+        pAreaLinks->SkipTable(nSkip);
+    if( pDetectiveObj )
+        pDetectiveObj->SkipTable(nSkip);
+    if( pDetectiveOp )
+        pDetectiveOp->SkipTable(nSkip);
+}
+
 sal_Bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles)
 {
     table::CellAddress	aAddress( nCurrentTable, MAXCOL + 1, MAXROW + 1 );
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index fd650e4d6..cd260a939 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -96,6 +96,7 @@ public:
     const ScMyShapeList*		GetShapes() { return &aShapeList; }
     virtual void				SetCellData( ScMyCell& rMyCell );
     virtual void				Sort();
+    void                        SkipTable(SCTAB nSkip);
 };
 
 struct ScMyNoteShape
@@ -124,6 +125,7 @@ public:
     const ScMyNoteShapeList*	GetNotes() { return &aNoteShapeList; }
     virtual void				SetCellData( ScMyCell& rMyCell );
     virtual void				Sort();
+    void                        SkipTable(SCTAB nSkip);
 };
 
 //==============================================================================
@@ -152,6 +154,7 @@ public:
                                 using ScMyIteratorBase::UpdateAddress;
     virtual void				SetCellData( ScMyCell& rMyCell );
     virtual void				Sort();	// + remove doublets
+    void                        SkipTable(SCTAB nSkip);
 };
 
 //==============================================================================
@@ -192,6 +195,7 @@ public:
                                 using ScMyIteratorBase::UpdateAddress;
     virtual void				SetCellData( ScMyCell& rMyCell );
     virtual void				Sort();
+    void                        SkipTable(SCTAB nSkip);
 };
 
 //==============================================================================
@@ -218,6 +222,7 @@ public:
                                 using ScMyIteratorBase::UpdateAddress;
     virtual void				SetCellData( ScMyCell& rMyCell );
     virtual void				Sort();
+    void                        SkipTable(SCTAB nSkip);
 };
 
 //==============================================================================
@@ -254,6 +259,7 @@ public:
                                 using ScMyIteratorBase::UpdateAddress;
     virtual void				SetCellData( ScMyCell& rMyCell );
     virtual void				Sort();
+    void                        SkipTable(SCTAB nSkip);
 };
 
 //==============================================================================
@@ -284,6 +290,7 @@ public:
                                 using ScMyIteratorBase::UpdateAddress;
     virtual void				SetCellData( ScMyCell& rMyCell );
     virtual void				Sort();
+    void                        SkipTable(SCTAB nSkip);
 };
 
 //==============================================================================
@@ -301,7 +308,6 @@ struct ScMyCell
 
     rtl::OUString				sStringValue;
     rtl::OUString				sAnnotationText;
-    rtl::OUString               sPhoneticText;
 
     ScMyAreaLink				aAreaLink;
     ScMyShapeList				aShapeList;
@@ -335,7 +341,6 @@ struct ScMyCell
     sal_Bool					bIsMatrixBase;
     sal_Bool					bIsMatrixCovered;
     sal_Bool					bHasAnnotation;
-    sal_Bool                    bHasPhonetic;
 
                                 ScMyCell();
                                 ~ScMyCell();
@@ -402,6 +407,7 @@ public:
 
     void						SetCurrentTable(const SCTAB nTable,
                                     com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& rxTable);
+    void                        SkipTable(SCTAB nSkip);
 
     sal_Bool					GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles);
 };
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index e6f52cdd0..c3ffcc32e 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -878,7 +878,7 @@ sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const rtl::OUString& rString,
     sal_Int32 nPrefixLength(rPrefix.getLength());
     rtl::OUString sTemp(rString.copy(nPrefixLength));
     sal_Int32 nIndex(sTemp.toInt32());
-    if (aAutoStyleNames.at(nIndex - 1)->equals(rString))
+    if (nIndex > 0 && static_cast<size_t>(nIndex-1) < aAutoStyleNames.size() && aAutoStyleNames.at(nIndex - 1)->equals(rString))
     {
         bIsAutoStyle = sal_True;
         return nIndex - 1;
@@ -1111,7 +1111,7 @@ sal_Int32 ScColumnRowStylesBase::GetIndexOfStyleName(const rtl::OUString& rStrin
     sal_Int32 nPrefixLength(rPrefix.getLength());
     rtl::OUString sTemp(rString.copy(nPrefixLength));
     sal_Int32 nIndex(sTemp.toInt32());
-    if (aStyleNames.at(nIndex - 1)->equals(rString))
+    if (nIndex > 0 && static_cast<size_t>(nIndex-1) < aStyleNames.size() && aStyleNames.at(nIndex - 1)->equals(rString))
         return nIndex - 1;
     else
     {
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
index 359145e76..c3f8efa17 100644
--- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
@@ -36,6 +36,8 @@
 #include "drwlayer.hxx"
 #include "xmlannoi.hxx"
 #include "rangeutl.hxx"
+#include "docuno.hxx"
+#include "sheetdata.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmluconv.hxx>
@@ -80,9 +82,11 @@ void XMLTableShapeImportHelper::finishShape(
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes )
 {
+    bool bNote = false;
     XMLShapeImportHelper::finishShape( rShape, xAttrList, rShapes );
     static_cast<ScXMLImport&>(mrImporter).LockSolarMutex();
-    if (rShapes == static_cast<ScXMLImport&>(mrImporter).GetTables().GetCurrentXShapes())
+    ScMyTables& rTables = static_cast<ScXMLImport&>(mrImporter).GetTables();
+    if (rShapes == rTables.GetCurrentXShapes())
     {
         if (!pAnnotationContext)
         {
@@ -126,7 +130,7 @@ void XMLTableShapeImportHelper::finishShape(
 
             if (!bOnTable)
             {
-                static_cast<ScXMLImport&>(mrImporter).GetTables().AddShape(rShape,
+                rTables.AddShape(rShape,
                     pRangeList, aStartCell, aEndCell, nEndX, nEndY);
                 SvxShape* pShapeImp = SvxShape::getImplementation(rShape);
                 if (pShapeImp)
@@ -145,7 +149,7 @@ void XMLTableShapeImportHelper::finishShape(
                     // -> call AddShape with invalid cell position (checked in ScMyShapeResizer::ResizeShapes)
 
                     table::CellAddress aInvalidPos( -1, -1, -1 );
-                    static_cast<ScXMLImport&>(mrImporter).GetTables().AddShape(rShape,
+                    rTables.AddShape(rShape,
                         pRangeList, aInvalidPos, aInvalidPos, 0, 0);
                 }
 
@@ -160,7 +164,26 @@ void XMLTableShapeImportHelper::finishShape(
         }
         else // shape is annotation
         {
-            pAnnotationContext->SetShape(rShape, rShapes);
+            // get the style names for stream copying
+            rtl::OUString aStyleName;
+            rtl::OUString aTextStyle;
+            sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
+            for( sal_Int16 i=0; i < nAttrCount; ++i )
+            {
+                const rtl::OUString& rAttrName(xAttrList->getNameByIndex( i ));
+                rtl::OUString aLocalName;
+                sal_uInt16 nPrefix(static_cast<ScXMLImport&>(mrImporter).GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName ));
+                if(nPrefix == XML_NAMESPACE_DRAW)
+                {
+                    if (IsXMLToken(aLocalName, XML_STYLE_NAME))
+                        aStyleName = xAttrList->getValueByIndex( i );
+                    else if (IsXMLToken(aLocalName, XML_TEXT_STYLE_NAME))
+                        aTextStyle = xAttrList->getValueByIndex( i );
+                }
+            }
+
+            pAnnotationContext->SetShape(rShape, rShapes, aStyleName, aTextStyle);
+            bNote = true;
         }
     }
     else //#99532# this are grouped shapes which should also get the layerid
@@ -183,5 +206,13 @@ void XMLTableShapeImportHelper::finishShape(
         }
         SetLayer(rShape, nLayerID, rShape->getShapeType());
     }
+
+    if (!bNote)
+    {
+        // any shape other than a note prevents copying the sheet
+        ScSheetSaveData* pSheetData = ScModelObj::getImplementation(mrImporter.GetModel())->GetSheetSaveData();
+        pSheetData->BlockSheet( rTables.GetCurrentSheet() );
+    }
+
     static_cast<ScXMLImport&>(mrImporter).UnlockSolarMutex();
 }
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx
index 429964942..06d49dc4b 100644
--- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx
+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx
@@ -57,6 +57,8 @@ public:
     void SetCell (const ::com::sun::star::table::CellAddress& rAddress) { aStartCell = rAddress; }
     void SetOnTable (const sal_Bool bTempOnTable) { bOnTable = bTempOnTable; }
     void SetAnnotation(ScXMLAnnotationContext* pAnnotation) { pAnnotationContext = pAnnotation; }
+
+    ScXMLAnnotationContext* GetAnnotationContext() const    { return pAnnotationContext; }
 };
 
 
diff --git a/sc/source/filter/xml/XMLTextPContext.cxx b/sc/source/filter/xml/XMLTextPContext.cxx
index f8238d4f4..a980052fb 100644
--- a/sc/source/filter/xml/XMLTextPContext.cxx
+++ b/sc/source/filter/xml/XMLTextPContext.cxx
@@ -37,7 +37,6 @@
 #include "XMLTextPContext.hxx"
 #include "xmlimprt.hxx"
 #include "xmlcelli.hxx"
-#include "xmlrubyi.hxx"
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -138,61 +137,52 @@ SvXMLImportContext *ScXMLTextPContext::CreateChildContext( USHORT nTempPrefix,
                                           ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList )
 {
     SvXMLImportContext *pContext(NULL);
-
-    if ( !pTextPContext )
+    if (!pTextPContext &&
+        (nTempPrefix == XML_NAMESPACE_TEXT) &&
+        IsXMLToken(rLName, XML_S))
+        pContext = new ScXMLTextTContext( GetScImport(), nTempPrefix, rLName, xTempAttrList, this);
+    else
     {
-        const SvXMLTokenMap& rTokenMap = GetScImport().GetTableRowCellElemTextTokenMap();
-        switch( rTokenMap.Get( nTempPrefix, rLName ) )
+        if (!pTextPContext)
         {
-        case XML_TOK_TABLE_ROW_CELL_TEXT_S:
-            pContext = new ScXMLTextTContext( GetScImport(), nTempPrefix, rLName, xTempAttrList, this);
-            break;
-        case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY:
-            pContext = new ScXMLRubyContext( GetScImport(), nTempPrefix, rLName, xTempAttrList, this );
-            break;
-        default:
+            rtl::OUString sSetString;
+            if ( pContentBuffer )
+                sSetString = pContentBuffer->makeStringAndClear();
+            else
+                sSetString = sSimpleContent;
+
+            sal_Unicode cNonSpace(0);
+            
+            sal_Int32 nLength = sSetString.getLength();
+            if ( nLength > 0 )
             {
-                rtl::OUString sSetString;
-                if ( pContentBuffer )
-                    sSetString = pContentBuffer->makeStringAndClear();
-                else
-                    sSetString = sSimpleContent;
-
-                sal_Unicode cNonSpace(0);
-
-                sal_Int32 nLength = sSetString.getLength();
-                if ( nLength > 0 )
+                sal_Unicode cLast = sSetString.getStr()[ nLength - 1 ];
+                if ( cLast != (sal_Unicode)' ' )
                 {
-                    sal_Unicode cLast = sSetString.getStr()[ nLength - 1 ];
-                    if ( cLast != (sal_Unicode)' ' )
-                    {
-                        // #i53253# To keep XMLParaContext's whitespace handling in sync,
-                        // if there's a non-space character at the end of the existing string,
-                        // it has to be processed by XMLParaContext.
+                    // #i53253# To keep XMLParaContext's whitespace handling in sync,
+                    // if there's a non-space character at the end of the existing string,
+                    // it has to be processed by XMLParaContext.
 
-                        cNonSpace = cLast;
-                        sSetString = sSetString.copy( 0, nLength - 1 );  // remove from the string for SetCursorOnTextImport
-                    }
+                    cNonSpace = cLast;
+                    sSetString = sSetString.copy( 0, nLength - 1 );  // remove from the string for SetCursorOnTextImport
                 }
+            }
 
-                pCellContext->SetCursorOnTextImport( sSetString );
+            pCellContext->SetCursorOnTextImport( sSetString );
 
-                pTextPContext = GetScImport().GetTextImport()->CreateTextChildContext(
-                        GetScImport(), nPrefix, sLName, xAttrList);
+            pTextPContext = GetScImport().GetTextImport()->CreateTextChildContext(
+                                    GetScImport(), nPrefix, sLName, xAttrList);
 
-                if ( cNonSpace != 0 )
-                {
-                    // pass non-space character through XMLParaContext, so a following space isn't ignored
-                    pTextPContext->Characters( rtl::OUString( cNonSpace ) );
-                }
+            if ( cNonSpace != 0 )
+            {
+                // pass non-space character through XMLParaContext, so a following space isn't ignored
+                pTextPContext->Characters( rtl::OUString( cNonSpace ) );
             }
-            break;
         }
+        if (pTextPContext)
+            pContext = pTextPContext->CreateChildContext(nTempPrefix, rLName, xTempAttrList);
     }
 
-    if ( pTextPContext )
-        pContext = pTextPContext->CreateChildContext(nTempPrefix, rLName, xTempAttrList);
-
     if( !pContext )
         pContext = new SvXMLImportContext( GetScImport(), nTempPrefix, rLName );
 
@@ -233,38 +223,5 @@ void ScXMLTextPContext::EndElement()
         pTextPContext->EndElement();
         GetScImport().SetRemoveLastChar(sal_True);
     }
-    if ( sOURubyText )
-        pCellContext->SetPhoneticText( sOURubyText.makeStringAndClear() );
-}
-
-void ScXMLTextPContext::GetContent( rtl::OUString& rContent )
-{
-    if (!pTextPContext)
-    {
-        if ( pContentBuffer )
-        {
-            rtl::OUStringBuffer tmpBuffer( *pContentBuffer );
-            rContent = tmpBuffer.makeStringAndClear();
-        }
-        else
-        {
-            rContent = sSimpleContent;
-        }
-    }
-}
-
-void ScXMLTextPContext::AddRubyText( const ::rtl::OUString &rBaseText, const ::rtl::OUString& rRubyText )
-{
-    rtl::OUString aContent;
-    GetContent( aContent );
-
-    sal_uInt16 startIdx = aContent.getLength();
-    sal_uInt16 endIdx = rBaseText.getLength();
-
-    PhoneticPortion portion( sOURubyText.getLength(), startIdx, endIdx );
-    sOURubyText.append( rRubyText );
-    aPhoneticPortions.push_back( portion );
-
-    Characters ( rBaseText );
 }
 
diff --git a/sc/source/filter/xml/XMLTextPContext.hxx b/sc/source/filter/xml/XMLTextPContext.hxx
index d64068c56..154547b95 100644
--- a/sc/source/filter/xml/XMLTextPContext.hxx
+++ b/sc/source/filter/xml/XMLTextPContext.hxx
@@ -34,8 +34,6 @@
 #include <xmloff/xmlictxt.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#include "phonetic.hxx"
-
 class ScXMLImport;
 class ScXMLTableRowCellContext;
 
@@ -49,12 +47,9 @@ class ScXMLTextPContext : public SvXMLImportContext
     rtl::OUStringBuffer*        pContentBuffer;     // used if there's more than one string
     USHORT						nPrefix;
     sal_Bool					bIsOwn;
-    rtl::OUStringBuffer         sOURubyText;
-    PhoneticPortionVec          aPhoneticPortions;
 
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-    void GetContent( rtl::OUString& rContent );
 
 public:
     ScXMLTextPContext( ScXMLImport& rImport, USHORT nPrfx,
@@ -75,14 +70,6 @@ public:
     virtual void EndElement();
 
     void AddSpaces(sal_Int32 nSpaceCount);
-
-    /**
-     * Add phonetic and base text into cell. 
-     *  
-     * @param rBaseText the base string.
-     * @param rRubyText the phonetic text.
-     */
-    void AddRubyText( const ::rtl::OUString& rBaseText, const ::rtl::OUString& rRubyText );
 };
 
 #endif
diff --git a/sc/source/filter/xml/makefile.mk b/sc/source/filter/xml/makefile.mk
index 2f8ad080d..c1e7e215e 100644
--- a/sc/source/filter/xml/makefile.mk
+++ b/sc/source/filter/xml/makefile.mk
@@ -51,58 +51,8 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Files --------------------------------------------------------
 
-CXXFILES = \
-        xmlwrap.cxx \
-        xmlimprt.cxx \
-        xmlexprt.cxx \
-        xmlbodyi.cxx \
-        xmltabi.cxx \
-        xmlexternaltabi.cxx \
-        xmlrowi.cxx \
-        xmlcelli.cxx \
-        xmlconti.cxx \
-        xmlcoli.cxx \
-        xmlsubti.cxx \
-        xmlnexpi.cxx \
-        xmldrani.cxx \
-        xmlfilti.cxx \
-        xmlsorti.cxx \
-        xmlstyle.cxx \
-        xmlstyli.cxx \
-        xmldpimp.cxx \
-        xmlannoi.cxx \
-        xmlsceni.cxx \
-        xmlcvali.cxx \
-		xmlrubyi.cxx \
-        XMLTableMasterPageExport.cxx \
-        xmllabri.cxx \
-        XMLTableHeaderFooterContext.cxx \
-        XMLDetectiveContext.cxx \
-        XMLCellRangeSourceContext.cxx \
-        XMLConsolidationContext.cxx \
-        XMLConverter.cxx \
-        XMLExportIterator.cxx \
-        XMLColumnRowGroupExport.cxx \
-        XMLStylesExportHelper.cxx \
-        XMLStylesImportHelper.cxx \
-        XMLExportDataPilot.cxx \
-        XMLExportDatabaseRanges.cxx \
-        XMLTableShapeImportHelper.cxx \
-        XMLTableShapesContext.cxx \
-        XMLExportDDELinks.cxx \
-        XMLDDELinksContext.cxx \
-        XMLCalculationSettingsContext.cxx \
-        XMLTableSourceContext.cxx \
-        XMLTextPContext.cxx \
-        XMLTableShapeResizer.cxx \
-        XMLChangeTrackingExportHelper.cxx \
-        xmlfonte.cxx \
-        XMLChangeTrackingImportHelper.cxx \
-        XMLTrackedChangesContext.cxx \
-        XMLExportSharedData.cxx \
-        XMLEmptyContext.cxx
-
 SLOFILES =  \
+        $(SLO)$/sheetdata.obj \
         $(SLO)$/xmlwrap.obj \
         $(SLO)$/xmlimprt.obj \
         $(SLO)$/xmlexprt.obj \
@@ -124,7 +74,6 @@ SLOFILES =  \
         $(SLO)$/xmlannoi.obj \
         $(SLO)$/xmlsceni.obj \
         $(SLO)$/xmlcvali.obj \
-		$(SLO)$/xmlrubyi.obj \
         $(SLO)$/XMLTableMasterPageExport.obj \
         $(SLO)$/xmllabri.obj \
         $(SLO)$/XMLTableHeaderFooterContext.obj \
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
new file mode 100644
index 000000000..a8b96eb6d
--- /dev/null
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -0,0 +1,275 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: sheetdata.cxx,v $
+ * $Revision: 1.69.32.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sc.hxx"
+
+// INCLUDE ---------------------------------------------------------------
+
+#include <xmloff/families.hxx>
+#include <xmloff/xmlaustp.hxx>
+#include <xmloff/nmspmap.hxx>
+#include <tools/string.hxx>
+#include <tools/debug.hxx>
+
+#include "sheetdata.hxx"
+
+// -----------------------------------------------------------------------
+
+ScSheetSaveData::ScSheetSaveData() :
+    mnStartTab( -1 ),
+    mnStartOffset( -1 ),
+    maPreviousNote( rtl::OUString(), rtl::OUString(), ScAddress(ScAddress::INITIALIZE_INVALID) )
+{
+}
+
+ScSheetSaveData::~ScSheetSaveData()
+{
+}
+
+void ScSheetSaveData::AddCellStyle( const rtl::OUString& rName, const ScAddress& rCellPos )
+{
+    maCellStyles.push_back( ScCellStyleEntry( rName, rCellPos ) );
+}
+
+void ScSheetSaveData::AddColumnStyle( const rtl::OUString& rName, const ScAddress& rCellPos )
+{
+    maColumnStyles.push_back( ScCellStyleEntry( rName, rCellPos ) );
+}
+
+void ScSheetSaveData::AddRowStyle( const rtl::OUString& rName, const ScAddress& rCellPos )
+{
+    maRowStyles.push_back( ScCellStyleEntry( rName, rCellPos ) );
+}
+
+void ScSheetSaveData::AddTableStyle( const rtl::OUString& rName, const ScAddress& rCellPos )
+{
+    maTableStyles.push_back( ScCellStyleEntry( rName, rCellPos ) );
+}
+
+void ScSheetSaveData::HandleNoteStyles( const rtl::OUString& rStyleName, const rtl::OUString& rTextName, const ScAddress& rCellPos )
+{
+    // only consecutive duplicates (most common case) are filtered out here,
+    // the others are found when the styles are created
+
+    if ( rStyleName == maPreviousNote.maStyleName &&
+         rTextName  == maPreviousNote.maTextStyle &&
+         rCellPos.Tab() == maPreviousNote.maCellPos.Tab() )
+    {
+        // already stored for the same sheet - ignore
+        return;
+    }
+
+    ScNoteStyleEntry aNewEntry( rStyleName, rTextName, rCellPos );
+    maPreviousNote = aNewEntry;
+    maNoteStyles.push_back( aNewEntry );
+}
+
+void ScSheetSaveData::AddNoteContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection )
+{
+    if ( nFamily == XML_STYLE_FAMILY_TEXT_PARAGRAPH )
+        maNoteParaStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) );
+    else
+        maNoteTextStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) );
+}
+
+void ScSheetSaveData::AddTextStyle( const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection )
+{
+    maTextStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) );
+}
+
+void ScSheetSaveData::BlockSheet( sal_Int32 nTab )
+{
+    if ( nTab >= (sal_Int32)maBlocked.size() )
+        maBlocked.resize( nTab + 1, false );        // fill vector with "false" entries
+
+    maBlocked[nTab] = true;
+}
+
+bool ScSheetSaveData::IsSheetBlocked( sal_Int32 nTab ) const
+{
+    if ( nTab < (sal_Int32)maBlocked.size() )
+        return maBlocked[nTab];
+    else
+        return false;
+}
+
+void ScSheetSaveData::AddStreamPos( sal_Int32 nTab, sal_Int32 nStartOffset, sal_Int32 nEndOffset )
+{
+    if ( nTab >= (sal_Int32)maStreamEntries.size() )
+        maStreamEntries.resize( nTab + 1 );
+
+    maStreamEntries[nTab] = ScStreamEntry( nStartOffset, nEndOffset );
+}
+
+void ScSheetSaveData::StartStreamPos( sal_Int32 nTab, sal_Int32 nStartOffset )
+{
+    DBG_ASSERT( mnStartTab < 0, "StartStreamPos without EndStreamPos" );
+
+    mnStartTab = nTab;
+    mnStartOffset = nStartOffset;
+}
+
+void ScSheetSaveData::EndStreamPos( sal_Int32 nEndOffset )
+{
+    if ( mnStartTab >= 0 )
+    {
+        AddStreamPos( mnStartTab, mnStartOffset, nEndOffset );
+        mnStartTab = -1;
+        mnStartOffset = -1;
+    }
+}
+
+void ScSheetSaveData::GetStreamPos( sal_Int32 nTab, sal_Int32& rStartOffset, sal_Int32& rEndOffset ) const
+{
+    if ( nTab < (sal_Int32)maStreamEntries.size() )
+    {
+        const ScStreamEntry& rEntry = maStreamEntries[nTab];
+        rStartOffset = rEntry.mnStartOffset;
+        rEndOffset = rEntry.mnEndOffset;
+    }
+    else
+        rStartOffset = rEndOffset = -1;
+}
+
+bool ScSheetSaveData::HasStreamPos( sal_Int32 nTab ) const
+{
+    sal_Int32 nStartOffset = -1;
+    sal_Int32 nEndOffset = -1;
+    GetStreamPos( nTab, nStartOffset, nEndOffset );
+    return ( nStartOffset >= 0 && nEndOffset >= 0 );
+}
+
+void ScSheetSaveData::ResetSaveEntries()
+{
+    maSaveEntries.clear();
+}
+
+void ScSheetSaveData::AddSavePos( sal_Int32 nTab, sal_Int32 nStartOffset, sal_Int32 nEndOffset )
+{
+    if ( nTab >= (sal_Int32)maSaveEntries.size() )
+        maSaveEntries.resize( nTab + 1 );
+
+    maSaveEntries[nTab] = ScStreamEntry( nStartOffset, nEndOffset );
+}
+
+void ScSheetSaveData::UseSaveEntries()
+{
+    maStreamEntries = maSaveEntries;
+}
+
+void ScSheetSaveData::StoreInitialNamespaces( const SvXMLNamespaceMap& rNamespaces )
+{
+    // the initial namespaces are just removed from the list of loaded namespaces,
+    // so only a hash_set of the prefixes is needed.
+
+    const NameSpaceHash& rNameHash = rNamespaces.GetAllEntries();
+    NameSpaceHash::const_iterator aIter = rNameHash.begin(), aEnd = rNameHash.end();
+    while (aIter != aEnd)
+    {
+        maInitialPrefixes.insert( aIter->first );
+        ++aIter;
+    }
+}
+
+void ScSheetSaveData::StoreLoadedNamespaces( const SvXMLNamespaceMap& rNamespaces )
+{
+    // store the loaded namespaces, so the prefixes in copied stream fragments remain valid
+
+    const NameSpaceHash& rNameHash = rNamespaces.GetAllEntries();
+    NameSpaceHash::const_iterator aIter = rNameHash.begin(), aEnd = rNameHash.end();
+    while (aIter != aEnd)
+    {
+        // ignore the initial namespaces
+        if ( maInitialPrefixes.find( aIter->first ) == maInitialPrefixes.end() )
+        {
+            const NameSpaceEntry& rEntry = aIter->second.getBody();
+            maLoadedNamespaces.push_back( ScLoadedNamespaceEntry( rEntry.sPrefix, rEntry.sName, rEntry.nKey ) );
+        }
+        ++aIter;
+    }
+}
+
+bool lcl_NameInHash( const NameSpaceHash& rNameHash, const rtl::OUString& rName )
+{
+    NameSpaceHash::const_iterator aIter = rNameHash.begin(), aEnd = rNameHash.end();
+    while (aIter != aEnd)
+    {
+        if ( aIter->second->sName == rName )
+            return true;
+
+        ++aIter;
+    }
+    return false;   // not found
+}
+
+bool ScSheetSaveData::AddLoadedNamespaces( SvXMLNamespaceMap& rNamespaces ) const
+{
+    // Add the loaded namespaces to the name space map.
+
+    // first loop: only look for conflicts
+    // (if the loaded namespaces were added first, this might not be necessary)
+    const NameSpaceHash& rNameHash = rNamespaces.GetAllEntries();
+    std::vector<ScLoadedNamespaceEntry>::const_iterator aIter = maLoadedNamespaces.begin();
+    std::vector<ScLoadedNamespaceEntry>::const_iterator aEnd = maLoadedNamespaces.end();
+    while (aIter != aEnd)
+    {
+        NameSpaceHash::const_iterator aHashIter = rNameHash.find( aIter->maPrefix );
+        if ( aHashIter == rNameHash.end() )
+        {
+            if ( lcl_NameInHash( rNameHash, aIter->maName ) )
+            {
+                // a second prefix for the same name would confuse SvXMLNamespaceMap lookup,
+                // so this is also considered a conflict
+                return false;
+            }
+        }
+        else if ( aHashIter->second->sName != aIter->maName )
+        {
+            // same prefix, but different name: loaded namespaces can't be used
+            return false;
+        }
+        ++aIter;
+    }
+
+    // only if there were no conflicts, add the entries that aren't in the map already
+    // (the key is needed if the same namespace is added later within an element)
+    aIter = maLoadedNamespaces.begin();
+    while (aIter != aEnd)
+    {
+        NameSpaceHash::const_iterator aHashIter = rNameHash.find( aIter->maPrefix );
+        if ( aHashIter == rNameHash.end() )
+            rNamespaces.Add( aIter->maPrefix, aIter->maName, aIter->mnKey );
+        ++aIter;
+    }
+
+    return true;    // success
+}
+
diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx
index 36adaf43c..839a140d2 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -208,9 +208,17 @@ void ScXMLAnnotationContext::EndElement()
     pTableShapeImport->SetAnnotation(NULL);
 }
 
-void ScXMLAnnotationContext::SetShape( const uno::Reference< drawing::XShape >& rxShape, const uno::Reference< drawing::XShapes >& rxShapes )
+void ScXMLAnnotationContext::SetShape( const uno::Reference< drawing::XShape >& rxShape, const uno::Reference< drawing::XShapes >& rxShapes,
+                                       const rtl::OUString& rStyleName, const rtl::OUString& rTextStyle )
 {
     mrAnnotationData.mxShape = rxShape;
     mrAnnotationData.mxShapes = rxShapes;
+    mrAnnotationData.maStyleName = rStyleName;
+    mrAnnotationData.maTextStyle = rTextStyle;
+}
+
+void ScXMLAnnotationContext::AddContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ESelection& rSelection )
+{
+    mrAnnotationData.maContentStyles.push_back( ScXMLAnnotationStyleEntry( nFamily, rName, rSelection ) );
 }
 
diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx
index c509b7212..41b206bd4 100644
--- a/sc/source/filter/xml/xmlannoi.hxx
+++ b/sc/source/filter/xml/xmlannoi.hxx
@@ -34,12 +34,27 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <svx/editdata.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 
 class ScXMLImport;
 class ScXMLTableRowCellContext;
 
+struct ScXMLAnnotationStyleEntry
+{
+    sal_uInt16          mnFamily;
+    rtl::OUString       maName;
+    ESelection          maSelection;
+
+    ScXMLAnnotationStyleEntry( sal_uInt16 nFam, const rtl::OUString& rNam, const ESelection& rSel ) :
+        mnFamily( nFam ),
+        maName( rNam ),
+        maSelection( rSel )
+    {
+    }
+};
+
 struct ScXMLAnnotationData
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
@@ -49,8 +64,11 @@ struct ScXMLAnnotationData
     ::rtl::OUString     maAuthor;
     ::rtl::OUString     maCreateDate;
     ::rtl::OUString     maSimpleText;
+    ::rtl::OUString     maStyleName;
+    ::rtl::OUString     maTextStyle;
     bool                mbUseShapePos;
     bool                mbShown;
+    std::vector<ScXMLAnnotationStyleEntry> maContentStyles;
 
     explicit            ScXMLAnnotationData();
                         ~ScXMLAnnotationData();
@@ -82,7 +100,10 @@ public:
 
     void SetShape(
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
+        const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+        const ::rtl::OUString& rStyleName, const ::rtl::OUString& rTextStyle );
+
+    void AddContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ESelection& rSelection );
 
 private:
     ScXMLAnnotationData& mrAnnotationData;
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 5f113266e..835cb834c 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -36,6 +36,8 @@
 #include <cstdio>
 
 #include "document.hxx"
+#include "docuno.hxx"
+#include "sheetdata.hxx"
 
 #include "xmlbodyi.hxx"
 #include "xmltabi.hxx"
@@ -78,7 +80,7 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     sPassword(),
-    meHash1(PASSHASH_UNSPECIFIED),
+    meHash1(PASSHASH_SHA1),
     meHash2(PASSHASH_UNSPECIFIED),
     bProtected(sal_False),
     bHadCalculationSettings(sal_False),
@@ -142,6 +144,14 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( USHORT nPrefix,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
+    ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData();
+    if ( pSheetData && pSheetData->HasStartPos() )
+    {
+        // stream part to copy ends before the next child element
+        sal_Int32 nEndOffset = GetScImport().GetByteOffset();
+        pSheetData->EndStreamPos( nEndOffset );
+    }
+
     SvXMLImportContext *pContext = 0;
 
     const SvXMLTokenMap& rTokenMap = GetScImport().GetBodyElemTokenMap();
@@ -224,8 +234,36 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( USHORT nPrefix,
     return pContext;
 }
 
+void ScXMLBodyContext::Characters( const OUString& )
+{
+    ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData();
+    if ( pSheetData && pSheetData->HasStartPos() )
+    {
+        // stream part to copy ends before any content (whitespace) within the spreadsheet element
+        sal_Int32 nEndOffset = GetScImport().GetByteOffset();
+        pSheetData->EndStreamPos( nEndOffset );
+    }
+    // otherwise ignore
+}
+
 void ScXMLBodyContext::EndElement()
 {
+    ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData();
+    if ( pSheetData && pSheetData->HasStartPos() )
+    {
+        // stream part to copy ends before the closing tag of spreadsheet element
+        sal_Int32 nEndOffset = GetScImport().GetByteOffset();
+        pSheetData->EndStreamPos( nEndOffset );
+    }
+
+    if ( pSheetData )
+    {
+        // store the loaded namespaces (for the office:spreadsheet element),
+        // so the prefixes in copied stream fragments remain valid
+        const SvXMLNamespaceMap& rNamespaces = GetImport().GetNamespaceMap();
+        pSheetData->StoreLoadedNamespaces( rNamespaces );
+    }
+
     if (!bHadCalculationSettings)
     {
         // #111055#; set calculation settings defaults if there is no calculation settings element
diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx
index 3e412e657..2ea8520c8 100644
--- a/sc/source/filter/xml/xmlbodyi.hxx
+++ b/sc/source/filter/xml/xmlbodyi.hxx
@@ -61,6 +61,7 @@ public:
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void EndElement();
+    virtual void Characters( const ::rtl::OUString& rChars );
 };
 
 #endif
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index e822bdd98..605635f7b 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -38,13 +38,13 @@
 #include "xmltabi.hxx"
 #include "xmlstyli.hxx"
 #include "xmlannoi.hxx"
-#include "xmlrubyi.hxx"
 #include "global.hxx"
 #include "document.hxx"
 #include "cellsuno.hxx"
 #include "docuno.hxx"
 #include "unonames.hxx"
 #include "postit.hxx"
+#include "sheetdata.hxx"
 
 #include "XMLTableShapeImportHelper.hxx"
 #include "XMLTextPContext.hxx"
@@ -422,12 +422,6 @@ SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( USHORT nPrefix
                 rXMLImport, nPrefix, rLName, xAttrList, pCellRangeSource );
         }
         break;
-    case XML_TOK_TABLE_ROW_CELL_RUBY:
-        {
-            bIsEmpty = sal_False;
-            pContext = new ScXMLRubyContext( rXMLImport, nPrefix, rLName, xAttrList, this );
-        }
-        break;
     }
 
     if (!pContext && !bTextP)
@@ -557,6 +551,11 @@ void ScXMLTableRowCellContext::SetContentValidation(com::sun::star::uno::Referen
                 }
             }
             xPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_VALIXML)), uno::makeAny(xPropertySet));
+
+            // For now, any sheet with validity is blocked from stream-copying.
+            // Later, the validation names could be stored along with the style names.
+            ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetImport().GetModel())->GetSheetSaveData();
+            pSheetData->BlockSheet( GetScImport().GetTables().GetCurrentSheet() );
         }
     }
 }
@@ -683,6 +682,18 @@ void ScXMLTableRowCellContext::SetAnnotation(const table::CellAddress& aCellAddr
         uno::Reference< drawing::XShape > xShape;
         rXMLImport.GetShapeImport()->shapeWithZIndexAdded( xShape, xShapesIA->getCount() );
     }
+
+    // store the style names for stream copying
+    ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rXMLImport.GetModel())->GetSheetSaveData();
+    pSheetData->HandleNoteStyles( mxAnnotationData->maStyleName, mxAnnotationData->maTextStyle, aPos );
+
+    std::vector<ScXMLAnnotationStyleEntry>::const_iterator aIter = mxAnnotationData->maContentStyles.begin();
+    std::vector<ScXMLAnnotationStyleEntry>::const_iterator aEnd = mxAnnotationData->maContentStyles.end();
+    while (aIter != aEnd)
+    {
+        pSheetData->AddNoteContentStyle( aIter->mnFamily, aIter->maName, aPos, aIter->maSelection );
+        ++aIter;
+    }
 }
 
 // core implementation
@@ -742,82 +753,6 @@ bool lcl_IsEmptyOrNote( ScDocument* pDoc, const table::CellAddress& rCurrentPos
     return ( !pCell || pCell->GetCellType() == CELLTYPE_NOTE );
 }
 
-static sal_Bool lcl_IsHalfWidthKatakana ( const ::rtl::OUString& rString )
-{
-    const sal_Unicode *pString = rString.getStr();
-    sal_Int32 nLen = rString.getLength();
-
-    for ( sal_Int32 i = 0; i < nLen; ++i )
-    {
-        if ( pString[i] < 0xFF00 || pString[i] > 0xFFEF )
-            return sal_False;
-    }
-
-    return sal_True;
-}
-
-static sal_Bool lcl_IsFullWidthKatakana ( const ::rtl::OUString& rString )
-{
-    const sal_Unicode *pString = rString.getStr();
-    sal_Int32 nLen = rString.getLength();
-
-    for ( sal_Int32 i = 0; i < nLen; ++i )
-    {
-        if ( pString[i] < 0x30A0 || pString[i] > 0x30FF )
-            return sal_False;
-    }
-
-    return sal_True;
-}
-
-static sal_Bool lcl_IsFullWidthHiragana ( const ::rtl::OUString& rString )
-{
-    const sal_Unicode *pString = rString.getStr();
-    sal_Int32 nLen = rString.getLength();
-
-    for ( sal_Int32 i = 0; i < nLen; ++i )
-    {
-        if ( pString[i] < 0x3040 || pString[i] > 0x309F )
-            return sal_False;
-    }
-
-    return sal_True;
-}
-
-static sal_uInt16 lcl_GetKanaType ( const ::boost::optional< ::rtl::OUString >& pText )
-{
-    sal_uInt16 aKanaType = 0;
-
-    if ( lcl_IsHalfWidthKatakana ( *pText ) )
-        aKanaType = 0x00;
-    else if ( lcl_IsFullWidthKatakana ( *pText ) )
-        aKanaType = 0x01;
-    else if ( lcl_IsFullWidthHiragana ( *pText ) )
-        aKanaType = 0x02;
-
-    return aKanaType;
-}
-
-static ScBaseCell* lcl_CreateTextCell ( const String& rString, ScDocument* pDoc, 
-                                        const ::boost::optional< ::rtl::OUString >& pPhoneticText )
-{
-    ScBaseCell *pCell = 0;
-
-    if ( pPhoneticText && pPhoneticText->getLength() )
-    {
-        PhoneticPortionVec xPortions;
-        sal_uInt16 aKanaType = lcl_GetKanaType ( pPhoneticText );
-        ScPhonetic aPhonetic ( 0, 0x30 | aKanaType , 0, *pPhoneticText, xPortions );
-        pCell = new ScAsianStringCell( rString, aPhonetic );
-    }
-    else
-    {
-        pCell = ScBaseCell::CreateTextCell( rString, pDoc );
-    }
-
-    return pCell;
-}
-
 void ScXMLTableRowCellContext::EndElement()
 {
     if (!bHasSubTable)
@@ -988,11 +923,11 @@ void ScXMLTableRowCellContext::EndElement()
                                                 ScBaseCell* pNewCell = NULL;
                                                 ScDocument* pDoc = rXMLImport.GetDocument();
                                                 if (pOUTextValue && pOUTextValue->getLength())
-                                                    pNewCell = lcl_CreateTextCell( *pOUTextValue, pDoc, pOUPhoneticText );
+                                                    pNewCell = ScBaseCell::CreateTextCell( *pOUTextValue, pDoc );
                                                 else if (pOUTextContent && pOUTextContent->getLength())
-                                                    pNewCell = lcl_CreateTextCell( *pOUTextContent, pDoc, pOUPhoneticText );
+                                                    pNewCell = ScBaseCell::CreateTextCell( *pOUTextContent, pDoc );
                                                 else if ( i > 0 && pOUText && pOUText->getLength() )
-                                                    pNewCell = lcl_CreateTextCell( *pOUText, pDoc, pOUPhoneticText );
+                                                    pNewCell = ScBaseCell::CreateTextCell( *pOUText, pDoc );
 
                                                 bDoIncrement = pNewCell != NULL;
                                                 if ( bDoIncrement )
@@ -1079,18 +1014,6 @@ void ScXMLTableRowCellContext::EndElement()
                     }
                     else
                     {
-                        if ( pOUPhoneticText && pOUPhoneticText->getLength() )
-                        {
-                            ScAddress aScAddress;
-                            ScDocument* pDoc = rXMLImport.GetDocument();
-                            ScUnoConversion::FillScAddress( aScAddress, aCurrentPos );
-                            ScBaseCell *pBaseCell = pDoc->GetCell( aScAddress );
-                            PhoneticPortionVec xPortions;
-                            sal_uInt16 aKanaType = lcl_GetKanaType ( pOUPhoneticText );
-                            ScPhonetic aPhonetic ( 0, 0x30 | aKanaType , 0, *pOUPhoneticText, xPortions );
-                            ScBaseCell *pNewCell = new ScAsianEditCell( (const ScEditCell&) *pBaseCell, *pDoc, aPhonetic );
-                            pDoc->PutCell( aScAddress, pNewCell );
-                        }
                         // #i56027# If the child context put formatted text into the cell,
                         // bIsEmpty is TRUE and ProgressBarIncrement has to be called
                         // with bEditCell = TRUE.
@@ -1195,9 +1118,3 @@ void ScXMLTableRowCellContext::EndElement()
     nMergedRows = 1;
     nCellsRepeated = 1;
 }
-
-void ScXMLTableRowCellContext::SetPhoneticText(const rtl::OUString& rOUPhoneticText)
-{
-    pOUPhoneticText.reset(rOUPhoneticText);
-}
-
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index a538d6e9b..6a2edacba 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -58,7 +58,6 @@ class ScXMLTableRowCellContext : public SvXMLImportContext
     ::boost::optional< rtl::OUString > pOUTextValue;
     ::boost::optional< rtl::OUString > pOUTextContent;
     ::boost::optional< FormulaWithNamespace > pOUFormula;
-	::boost::optional< rtl::OUString > pOUPhoneticText;
     rtl::OUString* pContentValidationName;
     ::std::auto_ptr< ScXMLAnnotationData > mxAnnotationData;
     ScMyImpDetectiveObjVec*	pDetectiveObjVec;
@@ -128,13 +127,6 @@ public:
     void SetCellRangeSource( const ::com::sun::star::table::CellAddress& rPosition );
 
     virtual void EndElement();
-
-    /**
-     * Set phonetic text. 
-     *  
-     * @param rOUPhoneticText the phonetic text
-     */
-    void SetPhoneticText(const rtl::OUString& rOUPhoneticText);
 };
 
 #endif
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index 4dcee40b7..260a17a19 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -42,6 +42,7 @@
 #include "document.hxx"
 #include "docuno.hxx"
 #include "olinetab.hxx"
+#include "sheetdata.hxx"
 #include "unonames.hxx"
 
 #include <xmloff/xmltkmap.hxx>
@@ -145,7 +146,7 @@ SvXMLImportContext *ScXMLTableColContext::CreateChildContext( USHORT nPrefix,
 void ScXMLTableColContext::EndElement()
 {
     ScXMLImport& rXMLImport = GetScImport();
-    //sal_Int32 nSheet = rXMLImport.GetTables().GetCurrentSheet();
+    sal_Int32 nSheet = rXMLImport.GetTables().GetCurrentSheet();
     sal_Int32 nCurrentColumn = rXMLImport.GetTables().GetCurrentColumn();
     uno::Reference<sheet::XSpreadsheet> xSheet(rXMLImport.GetTables().GetCurrentXSheet());
     if(xSheet.is())
@@ -169,7 +170,16 @@ void ScXMLTableColContext::EndElement()
                         XMLTableStyleContext* pStyle = (XMLTableStyleContext *)pStyles->FindStyleChildContext(
                             XML_STYLE_FAMILY_TABLE_COLUMN, sStyleName, sal_True);
                         if (pStyle)
+                        {
                             pStyle->FillPropertySet(xColumnProperties);
+
+                            if ( nSheet != pStyle->GetLastSheet() )
+                            {
+                                ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rXMLImport.GetModel())->GetSheetSaveData();
+                                pSheetData->AddColumnStyle( sStyleName, ScAddress( (SCCOL)nCurrentColumn, 0, (SCTAB)nSheet ) );
+                                pStyle->SetLastSheet(nSheet);
+                            }
+                        }
                     }
                 }
                 rtl::OUString sVisible(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLVIS));
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index a655fa775..0d4d46757 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -291,7 +291,7 @@ SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( USHORT nPref
 
 void ScXMLDataPilotTableContext::SetButtons()
 {    
-    ScDPOutputGeometry aGeometry(aTargetRangeAddress, bShowFilter);
+    ScDPOutputGeometry aGeometry(aTargetRangeAddress, bShowFilter, ScDPOutputGeometry::ODF);
     aGeometry.setColumnFieldCount(mnColFieldCount);
     aGeometry.setRowFieldCount(mnRowFieldCount);
     aGeometry.setPageFieldCount(mnPageFieldCount);
@@ -322,8 +322,7 @@ void ScXMLDataPilotTableContext::SetButtons()
                 if (maHiddenMemberFields.count(aCellStr))
                     nMFlag |= SC_MF_HIDDEN_MEMBER;
 
-				ScMergeFlagAttr aAttr(nMFlag);
-                pDoc->ApplyAttr( aScAddress.Col(), aScAddress.Row(), aScAddress.Tab(), aAttr );
+                pDoc->ApplyFlagsTab(aScAddress.Col(), aScAddress.Row(), aScAddress.Col(), aScAddress.Row(), aScAddress.Tab(), nMFlag);
             }
         }
     }
@@ -364,7 +363,15 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHas
             }
 
             if (bHasHiddenMember)
-                maHiddenMemberFields.insert(pDim->GetName());
+            {
+                // the layout name takes priority over the original name, 
+                // since this data is used against cell values.
+                const OUString* pLayoutName = pDim->GetLayoutName();
+                if (pLayoutName)
+                    maHiddenMemberFields.insert(*pLayoutName);
+                else
+                    maHiddenMemberFields.insert(pDim->GetName());
+            }
         }
         pDPSave->AddDimension(pDim);
     }
@@ -461,7 +468,7 @@ void ScXMLDataPilotTableContext::EndElement()
         {
             ScDPCollection* pDPCollection = pDoc->GetDPCollection();
             pDPObject->SetAlive(sal_True);
-            pDPCollection->Insert(pDPObject);
+            pDPCollection->InsertNewTable(pDPObject);
         }
         SetButtons();
     }
@@ -784,7 +791,7 @@ ScXMLDataPilotGrandTotalContext::~ScXMLDataPilotGrandTotalContext()
 }
 
 SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext( 
-    USHORT nPrefix, const ::rtl::OUString& rLocalName, const Reference<XAttributeList>& xAttrList )
+    USHORT /*nPrefix*/, const ::rtl::OUString& /*rLocalName*/, const Reference<XAttributeList>& /*xAttrList*/ )
 {
     return NULL;
 }
@@ -985,12 +992,6 @@ SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( USHORT nPref
     return pContext;
 }
 
-void ScXMLDataPilotFieldContext::SetSubTotalName(const OUString& rName)
-{
-    if (pDim)
-        pDim->SetSubtotalName(rName);
-}
-
 void ScXMLDataPilotFieldContext::AddMember(ScDPSaveMember* pMember)
 {
     if (pDim)
@@ -1001,6 +1002,12 @@ void ScXMLDataPilotFieldContext::AddMember(ScDPSaveMember* pMember)
         mbHasHiddenMember = true;
 }
 
+void ScXMLDataPilotFieldContext::SetSubTotalName(const OUString& rName)
+{
+    if (pDim)
+        pDim->SetSubtotalName(rName);
+}
+
 void ScXMLDataPilotFieldContext::AddGroup(const ::std::vector<rtl::OUString>& rMembers, const rtl::OUString& rName)
 {
     ScXMLDataPilotGroup aGroup;
diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index 404abab70..492ec1919 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -40,6 +40,7 @@
 #include "global.hxx"
 #include "dpobject.hxx"
 #include "dpsave.hxx"
+#include "queryparam.hxx"
 
 #include <hash_set>
 
@@ -377,8 +378,8 @@ public:
 
     void SetShowEmpty(const sal_Bool bValue) { if (pDim) pDim->SetShowEmpty(bValue); }
     void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); }
+    void AddMember(ScDPSaveMember* pMember);
     void SetSubTotalName(const ::rtl::OUString& rName);
-	void AddMember(ScDPSaveMember* pMember);
     void SetFieldReference(const com::sun::star::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); }
     void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); }
     void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); }
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index b7b5e7f3c..a0beefe8f 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -53,10 +53,12 @@
 #include "XMLColumnRowGroupExport.hxx"
 #include "XMLStylesExportHelper.hxx"
 #include "XMLChangeTrackingExportHelper.hxx"
+#include "sheetdata.hxx"
 #include "docoptio.hxx"
 #include "XMLExportSharedData.hxx"
 #include "chgviset.hxx"
 #include "docuno.hxx"
+#include "textuno.hxx"
 #include "chartlis.hxx"
 #include "unoguard.hxx"
 #include "scitems.hxx"
@@ -80,6 +82,7 @@
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/txtparae.hxx>
 #include <xmloff/xmlcnitm.hxx>
+#include <xmloff/xmlerror.hxx>
 
 #include <rtl/ustring.hxx>
 
@@ -122,6 +125,8 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/sheet/XSheetLinkable.hpp>
 #include <com/sun/star/form/XFormsSupplier2.hpp>
+#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
@@ -452,6 +457,7 @@ ScXMLExport::ScXMLExport(
     const sal_uInt16 nExportFlag)
 :	SvXMLExport( xServiceFactory, SvXMLUnitConverter::GetMapUnit(GetFieldUnit()), XML_SPREADSHEET, nExportFlag ),
     pDoc(NULL),
+    nSourceStreamPos(0),
     pNumberFormatAttributesExportHelper(NULL),
     pSharedData(NULL),
     pColumnStyles(NULL),
@@ -567,6 +573,45 @@ ScXMLExport::~ScXMLExport()
         delete pNumberFormatAttributesExportHelper;
 }
 
+void ScXMLExport::SetSourceStream( const uno::Reference<io::XInputStream>& xNewStream )
+{
+    xSourceStream = xNewStream;
+
+    if ( xSourceStream.is() )
+    {
+        // make sure it's a plain UTF-8 stream as written by OOo itself
+
+        const sal_Char pXmlHeader[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+        sal_Int32 nLen = strlen(pXmlHeader);
+
+        uno::Sequence<sal_Int8> aFileStart(nLen);
+        sal_Int32 nRead = xSourceStream->readBytes( aFileStart, nLen );
+
+        if ( nRead != nLen || rtl_compareMemory( aFileStart.getConstArray(), pXmlHeader, nLen ) != 0 )
+        {
+            // invalid - ignore stream, save normally
+            xSourceStream.clear();
+        }
+        else
+        {
+            // keep track of the bytes already read
+            nSourceStreamPos = nRead;
+
+            const ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetModel())->GetSheetSaveData();
+            if (pSheetData)
+            {
+                // add the loaded namespaces to the name space map
+
+                if ( !pSheetData->AddLoadedNamespaces( _GetNamespaceMap() ) )
+                {
+                    // conflicts in the namespaces - ignore the stream, save normally
+                    xSourceStream.clear();
+                }
+            }
+        }
+    }
+}
+
 sal_Int32 ScXMLExport::GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const
 {
     NumberFormatIndexMap::const_iterator itr = aNumFmtIndexMap.find(nNumFmt);
@@ -803,7 +848,7 @@ void ScXMLExport::_ExportFontDecls()
     SvXMLExport::_ExportFontDecls();
 }
 
-table::CellRangeAddress ScXMLExport::GetEndAddress(uno::Reference<sheet::XSpreadsheet>& xTable, const sal_Int32 /* nTable */)
+table::CellRangeAddress ScXMLExport::GetEndAddress(const uno::Reference<sheet::XSpreadsheet>& xTable, const sal_Int32 /* nTable */)
 {
     table::CellRangeAddress aCellAddress;
     uno::Reference<sheet::XSheetCellCursor> xCursor(xTable->createCursor());
@@ -1505,6 +1550,95 @@ void ScXMLExport::SetBodyAttributes()
     }
 }
 
+static bool lcl_CopyStreamElement( const uno::Reference< io::XInputStream >& xInput,
+                            const uno::Reference< io::XOutputStream >& xOutput,
+                            sal_Int32 nCount )
+{
+    const sal_Int32 nBufSize = 16*1024;
+    uno::Sequence<sal_Int8> aSequence(nBufSize);
+
+    sal_Int32 nRemaining = nCount;
+    bool bFirst = true;
+
+    while ( nRemaining > 0 )
+    {
+        sal_Int32 nRead = xInput->readBytes( aSequence, std::min( nRemaining, nBufSize ) );
+        if (bFirst)
+        {
+            // safety check: Make sure the copied part actually points to the start of an element
+            if ( nRead < 1 || aSequence[0] != static_cast<sal_Int8>('<') )
+            {
+                return false;   // abort and set an error
+            }
+            bFirst = false;
+        }
+        if (nRead == nRemaining)
+        {
+            // safety check: Make sure the copied part also ends at the end of an element
+            if ( aSequence[nRead-1] != static_cast<sal_Int8>('>') )
+            {
+                return false;   // abort and set an error
+            }
+        }
+
+        if ( nRead == nBufSize )
+        {
+            xOutput->writeBytes( aSequence );
+            nRemaining -= nRead;
+        }
+        else
+        {
+            if ( nRead > 0 )
+            {
+                uno::Sequence<sal_Int8> aTempBuf( aSequence.getConstArray(), nRead );
+                xOutput->writeBytes( aTempBuf );
+            }
+            nRemaining = 0;
+        }
+    }
+    return true;    // successful
+}
+
+void ScXMLExport::CopySourceStream( sal_Int32 nStartOffset, sal_Int32 nEndOffset, sal_Int32& rNewStart, sal_Int32& rNewEnd )
+{
+    uno::Reference<xml::sax::XDocumentHandler> xHandler = GetDocHandler();
+    uno::Reference<io::XActiveDataSource> xDestSource( xHandler, uno::UNO_QUERY );
+    if ( xDestSource.is() )
+    {
+        uno::Reference<io::XOutputStream> xDestStream = xDestSource->getOutputStream();
+        uno::Reference<io::XSeekable> xDestSeek( xDestStream, uno::UNO_QUERY );
+        if ( xDestSeek.is() )
+        {
+            // temporary: set same stream again to clear buffer
+            xDestSource->setOutputStream( xDestStream );
+
+            if ( getExportFlags() & EXPORT_PRETTY )
+            {
+                ByteString aOutStr("\n   ");
+                uno::Sequence<sal_Int8> aOutSeq( (sal_Int8*)aOutStr.GetBuffer(), aOutStr.Len() );
+                xDestStream->writeBytes( aOutSeq );
+            }
+
+            rNewStart = (sal_Int32)xDestSeek->getPosition();
+
+            if ( nStartOffset > nSourceStreamPos )
+                xSourceStream->skipBytes( nStartOffset - nSourceStreamPos );
+
+            if ( !lcl_CopyStreamElement( xSourceStream, xDestStream, nEndOffset - nStartOffset ) )
+            {
+                // If copying went wrong, set an error.
+                // ScXMLImportWrapper then resets all stream flags, so the next save attempt will use normal saving.
+
+                uno::Sequence<OUString> aEmptySeq;
+                SetError(XMLERROR_CANCEL|XMLERROR_FLAG_SEVERE, aEmptySeq);
+            }
+            nSourceStreamPos = nEndOffset;
+
+            rNewEnd = (sal_Int32)xDestSeek->getPosition();
+        }
+    }
+}
+
 void ScXMLExport::_ExportContent()
 {
     nCurrentTable = 0;
@@ -1524,6 +1658,10 @@ void ScXMLExport::_ExportContent()
     if ( !xSpreadDoc.is() )
         return;
 
+    ScSheetSaveData* pSheetData = ScModelObj::getImplementation(xSpreadDoc)->GetSheetSaveData();
+    if (pSheetData)
+        pSheetData->ResetSaveEntries();
+
     uno::Reference<container::XIndexAccess> xIndex( xSpreadDoc->getSheets(), uno::UNO_QUERY );
     if ( xIndex.is() )
     {
@@ -1555,6 +1693,27 @@ void ScXMLExport::_ExportContent()
         WriteTheLabelRanges( xSpreadDoc );
         for (sal_Int32 nTable = 0; nTable < nTableCount; ++nTable)
         {
+            sal_Int32 nStartOffset = -1;
+            sal_Int32 nEndOffset = -1;
+            if (pSheetData && pDoc && pDoc->IsStreamValid((SCTAB)nTable))
+                pSheetData->GetStreamPos( nTable, nStartOffset, nEndOffset );
+
+            if ( nStartOffset >= 0 && nEndOffset >= 0 && xSourceStream.is() )
+            {
+                sal_Int32 nNewStart = -1;
+                sal_Int32 nNewEnd = -1;
+                CopySourceStream( nStartOffset, nEndOffset, nNewStart, nNewEnd );
+
+                // store position of copied sheet in output
+                pSheetData->AddSavePos( nTable, nNewStart, nNewEnd );
+
+                // skip iterator entries for this sheet
+                pCellsItr->SkipTable(static_cast<SCTAB>(nTable));
+            }
+            else
+            {
+                //! indent after rebasing to m52
+
             uno::Reference<sheet::XSpreadsheet> xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY);
             if (xTable.is())
             {
@@ -1719,6 +1878,8 @@ void ScXMLExport::_ExportContent()
                     nEqualCells = 0;
                 }
             }
+
+            }
             IncrementProgressBar(sal_False);
         }
     }
@@ -1795,6 +1956,245 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed )
     SvXMLExport::_ExportStyles(bUsed);
 }
 
+void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& xProperties,
+                                    const uno::Reference<sheet::XSpreadsheet>& xTable,
+                                    sal_Int32 nTable, const rtl::OUString* pOldName)
+{
+    //! pass xCellRanges instead
+    uno::Reference<sheet::XSheetCellRanges> xCellRanges( xProperties, uno::UNO_QUERY );
+
+    rtl::OUString SC_SCELLPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX));
+    rtl::OUString SC_NUMBERFORMAT(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT));
+
+    rtl::OUString sStyleName;
+    sal_Int32 nNumberFormat(-1);
+    sal_Int32 nValidationIndex(-1);
+    std::vector< XMLPropertyState > xPropStates(xCellStylesExportPropertySetMapper->Filter( xProperties ));
+    std::vector< XMLPropertyState >::iterator aItr(xPropStates.begin());
+    std::vector< XMLPropertyState >::iterator aEndItr(xPropStates.end());
+    sal_Int32 nCount(0);
+    while (aItr != aEndItr)
+    {
+        if (aItr->mnIndex != -1)
+        {
+            switch (xCellStylesPropertySetMapper->GetEntryContextId(aItr->mnIndex))
+            {
+                case CTF_SC_VALIDATION :
+                {
+                    pValidationsContainer->AddValidation(aItr->maValue, nValidationIndex);
+                    // this is not very slow, because it is most the last property or
+                    // if it is not the last property it is the property before the last property,
+                    // so in the worst case only one property has to be copied, but in the best case no
+                    // property has to be copied
+                    aItr = xPropStates.erase(aItr);
+                    aEndItr = xPropStates.end();    // #120346# old aEndItr is invalidated!
+                }
+                break;
+                case CTF_SC_CELLSTYLE :
+                {
+                    aItr->maValue >>= sStyleName;
+                    aItr->mnIndex = -1;
+                    ++aItr;
+                    ++nCount;
+                }
+                break;
+                case CTF_SC_NUMBERFORMAT :
+                {
+                    if (aItr->maValue >>= nNumberFormat)
+                        addDataStyle(nNumberFormat);
+                    ++aItr;
+                    ++nCount;
+                }
+                break;
+                default:
+                {
+                    ++aItr;
+                    ++nCount;
+                }
+                break;
+            }
+        }
+        else
+        {
+            ++aItr;
+            ++nCount;
+        }
+    }
+    if (nCount == 1) // this is the CellStyle and should be removed if alone
+        xPropStates.clear();
+    if (nNumberFormat == -1)
+        xProperties->getPropertyValue(SC_NUMBERFORMAT) >>= nNumberFormat;
+    if (sStyleName.getLength())
+    {
+        if (xPropStates.size())
+        {
+            sal_Int32 nIndex;
+            if (pOldName)
+            {
+                if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, xPropStates))
+                {
+                    GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_CELL, *pOldName);
+                    // add to pCellStyles, so the name is found for normal sheets
+                    rtl::OUString* pTemp(new rtl::OUString(*pOldName));
+                    if (!pCellStyles->AddStyleName(pTemp, nIndex))
+                        delete pTemp;
+                }
+            }
+            else
+            {
+                rtl::OUString sName;
+                sal_Bool bIsAutoStyle(sal_True);
+                if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, xPropStates))
+                {
+                    rtl::OUString* pTemp(new rtl::OUString(sName));
+                    if (!pCellStyles->AddStyleName(pTemp, nIndex))
+                        delete pTemp;
+                }
+                else
+                    nIndex = pCellStyles->GetIndexOfStyleName(sName, SC_SCELLPREFIX, bIsAutoStyle);
+
+                uno::Sequence<table::CellRangeAddress> aAddresses(xCellRanges->getRangeAddresses());
+                table::CellRangeAddress* pAddresses(aAddresses.getArray());
+                sal_Bool bGetMerge(sal_True);
+                for (sal_Int32 i = 0; i < aAddresses.getLength(); ++i, ++pAddresses)
+                {
+                    pSharedData->SetLastColumn(nTable, pAddresses->EndColumn);
+                    pSharedData->SetLastRow(nTable, pAddresses->EndRow);
+                    pCellStyles->AddRangeStyleName(*pAddresses, nIndex, bIsAutoStyle, nValidationIndex, nNumberFormat);
+                    if (bGetMerge)
+                        bGetMerge = GetMerged(pAddresses, xTable);
+                }
+            }
+        }
+        else
+        {
+            rtl::OUString* pTemp(new rtl::OUString(EncodeStyleName(sStyleName)));
+            sal_Int32 nIndex(0);
+            if (!pCellStyles->AddStyleName(pTemp, nIndex, sal_False))
+            {
+                delete pTemp;
+                pTemp = NULL;
+            }
+            if ( !pOldName )
+            {
+                uno::Sequence<table::CellRangeAddress> aAddresses(xCellRanges->getRangeAddresses());
+                table::CellRangeAddress* pAddresses(aAddresses.getArray());
+                sal_Bool bGetMerge(sal_True);
+                for (sal_Int32 i = 0; i < aAddresses.getLength(); ++i, ++pAddresses)
+                {
+                    if (bGetMerge)
+                        bGetMerge = GetMerged(pAddresses, xTable);
+                    pCellStyles->AddRangeStyleName(*pAddresses, nIndex, sal_False, nValidationIndex, nNumberFormat);
+                    if (!sStyleName.equalsAsciiL("Default", 7) || nValidationIndex != -1)
+                    {
+                        pSharedData->SetLastColumn(nTable, pAddresses->EndColumn);
+                        pSharedData->SetLastRow(nTable, pAddresses->EndRow);
+                    }
+                }
+            }
+        }
+    }
+}
+
+void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& xColumnProperties,
+                                     const rtl::OUString* pOldName, sal_Int32& rIndex, sal_Bool& rIsVisible)
+{
+    rtl::OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX));
+
+    std::vector<XMLPropertyState> xPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties));
+    if(xPropStates.size())
+    {
+        std::vector< XMLPropertyState >::iterator aItr(xPropStates.begin());
+        std::vector< XMLPropertyState >::iterator aEndItr(xPropStates.end());
+        while (aItr != aEndItr)
+        {
+            if (xColumnStylesPropertySetMapper->GetEntryContextId(aItr->mnIndex) == CTF_SC_ISVISIBLE)
+            {
+                aItr->maValue >>= rIsVisible;
+                break;
+            }
+            ++aItr;
+        }
+
+        rtl::OUString sParent;
+        if (pOldName)
+        {
+            if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates))
+            {
+                GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_COLUMN, *pOldName);
+                // add to pColumnStyles, so the name is found for normal sheets
+                rtl::OUString* pTemp(new rtl::OUString(*pOldName));
+                rIndex = pColumnStyles->AddStyleName(pTemp);
+            }
+        }
+        else
+        {
+            rtl::OUString sName;
+            if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates))
+            {
+                rtl::OUString* pTemp(new rtl::OUString(sName));
+                rIndex = pColumnStyles->AddStyleName(pTemp);
+            }
+            else
+                rIndex = pColumnStyles->GetIndexOfStyleName(sName, SC_SCOLUMNPREFIX);
+        }
+    }
+}
+
+void ScXMLExport::AddStyleFromRow(const uno::Reference<beans::XPropertySet>& xRowProperties,
+                                  const rtl::OUString* pOldName, sal_Int32& rIndex)
+{
+    rtl::OUString SC_SROWPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX));
+
+    std::vector<XMLPropertyState> xPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties));
+    if(xPropStates.size())
+    {
+        rtl::OUString sParent;
+        if (pOldName)
+        {
+            if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates))
+            {
+                GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_ROW, *pOldName);
+                // add to pRowStyles, so the name is found for normal sheets
+                rtl::OUString* pTemp(new rtl::OUString(*pOldName));
+                rIndex = pRowStyles->AddStyleName(pTemp);
+            }
+        }
+        else
+        {
+            rtl::OUString sName;
+            if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates))
+            {
+                rtl::OUString* pTemp(new rtl::OUString(sName));
+                rIndex = pRowStyles->AddStyleName(pTemp);
+            }
+            else
+                rIndex = pRowStyles->GetIndexOfStyleName(sName, SC_SROWPREFIX);
+        }
+    }
+}
+
+uno::Any lcl_GetEnumerated( uno::Reference<container::XEnumerationAccess> xEnumAccess, sal_Int32 nIndex )
+{
+    uno::Any aRet;
+    uno::Reference<container::XEnumeration> xEnum( xEnumAccess->createEnumeration() );
+    try
+    {
+        sal_Int32 nSkip = nIndex;
+        while ( nSkip > 0 )
+        {
+            (void) xEnum->nextElement();
+            --nSkip;
+        }
+        aRet = xEnum->nextElement();
+    }
+    catch (container::NoSuchElementException&)
+    {
+        // leave aRet empty
+    }
+    return aRet;
+}
+
 void ScXMLExport::_ExportAutoStyles()
 {
     if (GetModel().is())
@@ -1807,6 +2207,272 @@ void ScXMLExport::_ExportAutoStyles()
             {
                 if (getExportFlags() & EXPORT_CONTENT)
                 {
+                    //  re-create automatic styles with old names from stored data
+                    ScSheetSaveData* pSheetData = ScModelObj::getImplementation(xSpreadDoc)->GetSheetSaveData();
+                    if (pSheetData && pDoc)
+                    {
+                        // formulas have to be calculated now, to detect changed results
+                        // (during normal save, they will be calculated anyway)
+                        SCTAB nTabCount = pDoc->GetTableCount();
+                        for (SCTAB nTab=0; nTab<nTabCount; ++nTab)
+                            if (pDoc->IsStreamValid(nTab))
+                            {
+                                ScCellIterator aIter( pDoc, 0,0,nTab, MAXCOL,MAXROW,nTab );
+                                ScBaseCell* pCell = aIter.GetFirst();
+                                while (pCell)
+                                {
+                                    if (pCell->GetCellType() == CELLTYPE_FORMULA)
+                                        static_cast<ScFormulaCell*>(pCell)->IsValue();      // interpret if dirty
+                                    pCell = aIter.GetNext();
+                                }
+                            }
+
+                        // stored cell styles
+                        const std::vector<ScCellStyleEntry>& rCellEntries = pSheetData->GetCellStyles();
+                        std::vector<ScCellStyleEntry>::const_iterator aCellIter = rCellEntries.begin();
+                        std::vector<ScCellStyleEntry>::const_iterator aCellEnd = rCellEntries.end();
+                        while (aCellIter != aCellEnd)
+                        {
+                            ScAddress aPos = aCellIter->maCellPos;
+                            sal_Int32 nTable = aPos.Tab();
+                            bool bCopySheet = pDoc->IsStreamValid( static_cast<SCTAB>(nTable) );
+                            if (bCopySheet)
+                            {
+                                uno::Reference <sheet::XSpreadsheet> xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+                                uno::Reference <beans::XPropertySet> xProperties(
+                                    xTable->getCellByPosition( aPos.Col(), aPos.Row() ), uno::UNO_QUERY );
+
+                                AddStyleFromCells(xProperties, xTable, nTable, &aCellIter->maName);
+                            }
+                            ++aCellIter;
+                        }
+
+                        // stored column styles
+                        const std::vector<ScCellStyleEntry>& rColumnEntries = pSheetData->GetColumnStyles();
+                        std::vector<ScCellStyleEntry>::const_iterator aColumnIter = rColumnEntries.begin();
+                        std::vector<ScCellStyleEntry>::const_iterator aColumnEnd = rColumnEntries.end();
+                        while (aColumnIter != aColumnEnd)
+                        {
+                            ScAddress aPos = aColumnIter->maCellPos;
+                            sal_Int32 nTable = aPos.Tab();
+                            bool bCopySheet = pDoc->IsStreamValid( static_cast<SCTAB>(nTable) );
+                            if (bCopySheet)
+                            {
+                                uno::Reference<table::XColumnRowRange> xColumnRowRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+                                uno::Reference<table::XTableColumns> xTableColumns(xColumnRowRange->getColumns());
+                                uno::Reference<beans::XPropertySet> xColumnProperties(xTableColumns->getByIndex( aPos.Col() ), uno::UNO_QUERY);
+
+                                sal_Int32 nIndex(-1);
+                                sal_Bool bIsVisible(sal_True);
+                                AddStyleFromColumn( xColumnProperties, &aColumnIter->maName, nIndex, bIsVisible );
+                            }
+                            ++aColumnIter;
+                        }
+
+                        // stored row styles
+                        const std::vector<ScCellStyleEntry>& rRowEntries = pSheetData->GetRowStyles();
+                        std::vector<ScCellStyleEntry>::const_iterator aRowIter = rRowEntries.begin();
+                        std::vector<ScCellStyleEntry>::const_iterator aRowEnd = rRowEntries.end();
+                        while (aRowIter != aRowEnd)
+                        {
+                            ScAddress aPos = aRowIter->maCellPos;
+                            sal_Int32 nTable = aPos.Tab();
+                            bool bCopySheet = pDoc->IsStreamValid( static_cast<SCTAB>(nTable) );
+                            if (bCopySheet)
+                            {
+                                uno::Reference<table::XColumnRowRange> xColumnRowRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+                                uno::Reference<table::XTableRows> xTableRows(xColumnRowRange->getRows());
+                                uno::Reference<beans::XPropertySet> xRowProperties(xTableRows->getByIndex( aPos.Row() ), uno::UNO_QUERY);
+
+                                sal_Int32 nIndex(-1);
+                                AddStyleFromRow( xRowProperties, &aRowIter->maName, nIndex );
+                            }
+                            ++aRowIter;
+                        }
+
+                        // stored table styles
+                        const std::vector<ScCellStyleEntry>& rTableEntries = pSheetData->GetTableStyles();
+                        std::vector<ScCellStyleEntry>::const_iterator aTableIter = rTableEntries.begin();
+                        std::vector<ScCellStyleEntry>::const_iterator aTableEnd = rTableEntries.end();
+                        while (aTableIter != aTableEnd)
+                        {
+                            ScAddress aPos = aTableIter->maCellPos;
+                            sal_Int32 nTable = aPos.Tab();
+                            bool bCopySheet = pDoc->IsStreamValid( static_cast<SCTAB>(nTable) );
+                            if (bCopySheet)
+                            {
+                                //! separate method AddStyleFromTable needed?
+                                uno::Reference<beans::XPropertySet> xTableProperties(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+                                if (xTableProperties.is())
+                                {
+                                    std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties));
+                                    rtl::OUString sParent;
+                                    rtl::OUString sName( aTableIter->maName );
+                                    GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates);
+                                    GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sName);
+                                }
+                            }
+                            ++aTableIter;
+                        }
+
+                        // stored styles for notes
+
+                        UniReference<SvXMLExportPropertyMapper>	xShapeMapper = XMLShapeExport::CreateShapePropMapper( *this );
+                        GetShapeExport(); // make sure the graphics styles family is added
+
+                        const std::vector<ScNoteStyleEntry>& rNoteEntries = pSheetData->GetNoteStyles();
+                        std::vector<ScNoteStyleEntry>::const_iterator aNoteIter = rNoteEntries.begin();
+                        std::vector<ScNoteStyleEntry>::const_iterator aNoteEnd = rNoteEntries.end();
+                        while (aNoteIter != aNoteEnd)
+                        {
+                            ScAddress aPos = aNoteIter->maCellPos;
+                            sal_Int32 nTable = aPos.Tab();
+                            bool bCopySheet = pDoc->IsStreamValid( static_cast<SCTAB>(nTable) );
+                            if (bCopySheet)
+                            {
+                                //! separate method AddStyleFromNote needed?
+
+                                ScPostIt* pNote = pDoc->GetNote( aPos );
+                                DBG_ASSERT( pNote, "note not found" );
+                                if (pNote)
+                                {
+                                    SdrCaptionObj* pDrawObj = pNote->GetOrCreateCaption( aPos );
+                                    // all uno shapes are created anyway in CollectSharedData
+                                    uno::Reference<beans::XPropertySet> xShapeProperties( pDrawObj->getUnoShape(), uno::UNO_QUERY );
+                                    if (xShapeProperties.is())
+                                    {
+                                        if ( aNoteIter->maStyleName.getLength() )
+                                        {
+                                            std::vector<XMLPropertyState> xPropStates(xShapeMapper->Filter(xShapeProperties));
+                                            rtl::OUString sParent;
+                                            rtl::OUString sName( aNoteIter->maStyleName );
+                                            GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_SD_GRAPHICS_ID, sParent, xPropStates);
+                                            GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_SD_GRAPHICS_ID, sName);
+                                        }
+                                        if ( aNoteIter->maTextStyle.getLength() )
+                                        {
+                                            std::vector<XMLPropertyState> xPropStates(
+                                                GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter(xShapeProperties));
+                                            rtl::OUString sParent;
+                                            rtl::OUString sName( aNoteIter->maTextStyle );
+                                            GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates);
+                                            GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName);
+                                        }
+                                    }
+                                }
+                            }
+                            ++aNoteIter;
+                        }
+
+                        // note paragraph styles
+
+                        //UniReference<SvXMLExportPropertyMapper> xParaPropMapper = XMLTextParagraphExport::CreateParaExtPropMapper( *this );
+                        UniReference<SvXMLExportPropertyMapper> xParaPropMapper = GetTextParagraphExport()->GetParagraphPropertyMapper();
+
+                        const std::vector<ScTextStyleEntry>& rNoteParaEntries = pSheetData->GetNoteParaStyles();
+                        std::vector<ScTextStyleEntry>::const_iterator aNoteParaIter = rNoteParaEntries.begin();
+                        std::vector<ScTextStyleEntry>::const_iterator aNoteParaEnd = rNoteParaEntries.end();
+                        while (aNoteParaIter != aNoteParaEnd)
+                        {
+                            ScAddress aPos = aNoteParaIter->maCellPos;
+                            sal_Int32 nTable = aPos.Tab();
+                            bool bCopySheet = pDoc->IsStreamValid( static_cast<SCTAB>(nTable) );
+                            if (bCopySheet)
+                            {
+                                ScPostIt* pNote = pDoc->GetNote( aPos );
+                                DBG_ASSERT( pNote, "note not found" );
+                                if (pNote)
+                                {
+                                    SdrCaptionObj* pDrawObj = pNote->GetOrCreateCaption( aPos );
+                                    uno::Reference<container::XEnumerationAccess> xCellText(pDrawObj->getUnoShape(), uno::UNO_QUERY);
+                                    uno::Reference<beans::XPropertySet> xParaProp(
+                                        lcl_GetEnumerated( xCellText, aNoteParaIter->maSelection.nStartPara ), uno::UNO_QUERY );
+                                    if ( xParaProp.is() )
+                                    {
+                                        std::vector<XMLPropertyState> xPropStates(xParaPropMapper->Filter(xParaProp));
+                                        rtl::OUString sParent;
+                                        rtl::OUString sName( aNoteParaIter->maName );
+                                        GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates);
+                                        GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName);
+                                    }
+                                }
+                            }
+                            ++aNoteParaIter;
+                        }
+
+                        // note text styles
+
+                        UniReference<SvXMLExportPropertyMapper> xTextPropMapper = XMLTextParagraphExport::CreateCharExtPropMapper( *this );
+
+                        const std::vector<ScTextStyleEntry>& rNoteTextEntries = pSheetData->GetNoteTextStyles();
+                        std::vector<ScTextStyleEntry>::const_iterator aNoteTextIter = rNoteTextEntries.begin();
+                        std::vector<ScTextStyleEntry>::const_iterator aNoteTextEnd = rNoteTextEntries.end();
+                        while (aNoteTextIter != aNoteTextEnd)
+                        {
+                            ScAddress aPos = aNoteTextIter->maCellPos;
+                            sal_Int32 nTable = aPos.Tab();
+                            bool bCopySheet = pDoc->IsStreamValid( static_cast<SCTAB>(nTable) );
+                            if (bCopySheet)
+                            {
+                                ScPostIt* pNote = pDoc->GetNote( aPos );
+                                DBG_ASSERT( pNote, "note not found" );
+                                if (pNote)
+                                {
+                                    SdrCaptionObj* pDrawObj = pNote->GetOrCreateCaption( aPos );
+                                    uno::Reference<text::XSimpleText> xCellText(pDrawObj->getUnoShape(), uno::UNO_QUERY);
+                                    uno::Reference<beans::XPropertySet> xCursorProp(xCellText->createTextCursor(), uno::UNO_QUERY);
+                                    ScDrawTextCursor* pCursor = ScDrawTextCursor::getImplementation( xCursorProp );
+                                    if (pCursor)
+                                    {
+                                        pCursor->SetSelection( aNoteTextIter->maSelection );
+
+                                        std::vector<XMLPropertyState> xPropStates(xTextPropMapper->Filter(xCursorProp));
+                                        rtl::OUString sParent;
+                                        rtl::OUString sName( aNoteTextIter->maName );
+                                        GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates);
+                                        GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName);
+                                    }
+                                }
+                            }
+                            ++aNoteTextIter;
+                        }
+
+                        // stored text styles
+
+                        //UniReference<SvXMLExportPropertyMapper> xTextPropMapper = XMLTextParagraphExport::CreateCharExtPropMapper( *this );
+
+                        const std::vector<ScTextStyleEntry>& rTextEntries = pSheetData->GetTextStyles();
+                        std::vector<ScTextStyleEntry>::const_iterator aTextIter = rTextEntries.begin();
+                        std::vector<ScTextStyleEntry>::const_iterator aTextEnd = rTextEntries.end();
+                        while (aTextIter != aTextEnd)
+                        {
+                            ScAddress aPos = aTextIter->maCellPos;
+                            sal_Int32 nTable = aPos.Tab();
+                            bool bCopySheet = pDoc->IsStreamValid( static_cast<SCTAB>(nTable) );
+                            if (bCopySheet)
+                            {
+                                //! separate method AddStyleFromText needed?
+                                //! cache sheet object
+
+                                uno::Reference<table::XCellRange> xCellRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+                                uno::Reference<text::XSimpleText> xCellText(xCellRange->getCellByPosition(aPos.Col(), aPos.Row()), uno::UNO_QUERY);
+                                uno::Reference<beans::XPropertySet> xCursorProp(xCellText->createTextCursor(), uno::UNO_QUERY);
+                                ScCellTextCursor* pCursor = ScCellTextCursor::getImplementation( xCursorProp );
+                                if (pCursor)
+                                {
+                                    pCursor->SetSelection( aTextIter->maSelection );
+
+                                    std::vector<XMLPropertyState> xPropStates(xTextPropMapper->Filter(xCursorProp));
+                                    rtl::OUString sParent;
+                                    rtl::OUString sName( aTextIter->maName );
+                                    GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates);
+                                    GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName);
+                                }
+                            }
+                            ++aTextIter;
+                        }
+                    }
+
                     ExportExternalRefCacheStyles();
 
                     if (!pSharedData)
@@ -1817,18 +2483,18 @@ void ScXMLExport::_ExportAutoStyles()
                         CollectSharedData(nTableCount, nShapesCount, nCellCount);
                         //DBG_ERROR("no shared data setted");
                     }
-                    rtl::OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX));
-                    rtl::OUString SC_SROWPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX));
-                    rtl::OUString SC_SCELLPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX));
-                    rtl::OUString SC_NUMBERFORMAT(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT));
                     sal_Int32 nTableCount(xIndex->getCount());
                     pCellStyles->AddNewTable(nTableCount - 1);
                     CollectShapesAutoStyles(nTableCount);
                     for (sal_Int32 nTable = 0; nTable < nTableCount; ++nTable)
                     {
+                        bool bUseStream = pSheetData && pDoc && pDoc->IsStreamValid((SCTAB)nTable) &&
+                                          pSheetData->HasStreamPos(nTable) && xSourceStream.is();
+
                         uno::Reference <sheet::XSpreadsheet> xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY);
                         if (xTable.is())
                         {
+                            // table styles array must be complete, including copied tables - Add should find the stored style
                             uno::Reference<beans::XPropertySet> xTableProperties(xTable, uno::UNO_QUERY);
                             if (xTableProperties.is())
                             {
@@ -1841,7 +2507,11 @@ void ScXMLExport::_ExportAutoStyles()
                                     aTableStyles.push_back(sName);
                                 }
                             }
-                            uno::Reference<sheet::XUniqueCellFormatRangesSupplier> xCellFormatRanges ( xTableProperties, uno::UNO_QUERY );
+                        }
+                        // collect other auto-styles only for non-copied sheets
+                        if (xTable.is() && !bUseStream)
+                        {
+                            uno::Reference<sheet::XUniqueCellFormatRangesSupplier> xCellFormatRanges ( xTable, uno::UNO_QUERY );
                             if ( xCellFormatRanges.is() )
                             {
                                 uno::Reference<container::XIndexAccess> xFormatRangesIndex(xCellFormatRanges->getUniqueCellFormatRanges());
@@ -1857,127 +2527,19 @@ void ScXMLExport::_ExportAutoStyles()
                                             uno::Reference <beans::XPropertySet> xProperties (xCellRanges, uno::UNO_QUERY);
                                             if (xProperties.is())
                                             {
-                                                rtl::OUString sStyleName;
-                                                sal_Int32 nNumberFormat(-1);
-                                                sal_Int32 nValidationIndex(-1);
-                                                std::vector< XMLPropertyState > xPropStates(xCellStylesExportPropertySetMapper->Filter( xProperties ));
-                                                std::vector< XMLPropertyState >::iterator aItr(xPropStates.begin());
-                                                std::vector< XMLPropertyState >::iterator aEndItr(xPropStates.end());
-                                                sal_Int32 nCount(0);
-                                                while (aItr != aEndItr)
-                                                {
-                                                    if (aItr->mnIndex != -1)
-                                                    {
-                                                        switch (xCellStylesPropertySetMapper->GetEntryContextId(aItr->mnIndex))
-                                                        {
-                                                            case CTF_SC_VALIDATION :
-                                                            {
-                                                                pValidationsContainer->AddValidation(aItr->maValue, nValidationIndex);
-                                                                // this is not very slow, because it is most the last property or
-                                                                // if it is not the last property it is the property before the last property,
-                                                                // so in the worst case only one property has to be copied, but in the best case no
-                                                                // property has to be copied
-                                                                aItr = xPropStates.erase(aItr);
-                                                                aEndItr = xPropStates.end();    // #120346# old aEndItr is invalidated!
-                                                            }
-                                                            break;
-                                                            case CTF_SC_CELLSTYLE :
-                                                            {
-                                                                aItr->maValue >>= sStyleName;
-                                                                aItr->mnIndex = -1;
-                                                                ++aItr;
-                                                                ++nCount;
-                                                            }
-                                                            break;
-                                                            case CTF_SC_NUMBERFORMAT :
-                                                            {
-                                                                if (aItr->maValue >>= nNumberFormat)
-                                                                    addDataStyle(nNumberFormat);
-                                                                ++aItr;
-                                                                ++nCount;
-                                                            }
-                                                            break;
-                                                            default:
-                                                            {
-                                                                ++aItr;
-                                                                ++nCount;
-                                                            }
-                                                            break;
-                                                        }
-                                                    }
-                                                    else
-                                                    {
-                                                        ++aItr;
-                                                        ++nCount;
-                                                    }
-                                                }
-                                                if (nCount == 1) // this is the CellStyle and should be removed if alone
-                                                    xPropStates.clear();
-                                                if (nNumberFormat == -1)
-                                                    xProperties->getPropertyValue(SC_NUMBERFORMAT) >>= nNumberFormat;
-                                                if (sStyleName.getLength())
-                                                {
-                                                    if (xPropStates.size())
-                                                    {
-                                                        sal_Int32 nIndex;
-                                                        rtl::OUString sName;
-                                                        sal_Bool bIsAutoStyle(sal_True);
-                                                        if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, xPropStates))
-                                                        {
-                                                            rtl::OUString* pTemp(new rtl::OUString(sName));
-                                                            if (!pCellStyles->AddStyleName(pTemp, nIndex))
-                                                                delete pTemp;
-                                                        }
-                                                        else
-                                                            nIndex = pCellStyles->GetIndexOfStyleName(sName, SC_SCELLPREFIX, bIsAutoStyle);
-                                                        uno::Sequence<table::CellRangeAddress> aAddresses(xCellRanges->getRangeAddresses());
-                                                        table::CellRangeAddress* pAddresses(aAddresses.getArray());
-                                                        sal_Bool bGetMerge(sal_True);
-                                                        for (sal_Int32 i = 0; i < aAddresses.getLength(); ++i, ++pAddresses)
-                                                        {
-                                                            pSharedData->SetLastColumn(nTable, pAddresses->EndColumn);
-                                                            pSharedData->SetLastRow(nTable, pAddresses->EndRow);
-                                                            pCellStyles->AddRangeStyleName(*pAddresses, nIndex, bIsAutoStyle, nValidationIndex, nNumberFormat);
-                                                            if (bGetMerge)
-                                                                bGetMerge = GetMerged(pAddresses, xTable);
-                                                        }
-                                                    }
-                                                    else
-                                                    {
-                                                        rtl::OUString* pTemp(new rtl::OUString(EncodeStyleName(sStyleName)));
-                                                        sal_Int32 nIndex(0);
-                                                        if (!pCellStyles->AddStyleName(pTemp, nIndex, sal_False))
-                                                        {
-                                                            delete pTemp;
-                                                            pTemp = NULL;
-                                                        }
-                                                        uno::Sequence<table::CellRangeAddress> aAddresses(xCellRanges->getRangeAddresses());
-                                                        table::CellRangeAddress* pAddresses(aAddresses.getArray());
-                                                        sal_Bool bGetMerge(sal_True);
-                                                        for (sal_Int32 i = 0; i < aAddresses.getLength(); ++i, ++pAddresses)
-                                                        {
-                                                            if (bGetMerge)
-                                                                bGetMerge = GetMerged(pAddresses, xTable);
-                                                            pCellStyles->AddRangeStyleName(*pAddresses, nIndex, sal_False, nValidationIndex, nNumberFormat);
-                                                            if (!sStyleName.equalsAsciiL("Default", 7) || nValidationIndex != -1)
-                                                            {
-                                                                pSharedData->SetLastColumn(nTable, pAddresses->EndColumn);
-                                                                pSharedData->SetLastRow(nTable, pAddresses->EndRow);
-                                                            }
-                                                        }
-                                                    }
-                                                }
+                                                AddStyleFromCells(xProperties, xTable, nTable, NULL);
                                                 IncrementProgressBar(sal_False);
                                             }
                                         }
                                     }
                                 }
                             }
-                            uno::Reference<table::XColumnRowRange> xColumnRowRange (xTableProperties, uno::UNO_QUERY);
+                            uno::Reference<table::XColumnRowRange> xColumnRowRange (xTable, uno::UNO_QUERY);
                             if (xColumnRowRange.is())
                             {
                                 if (pDoc)
                                 {
+                                    pDoc->SyncColRowFlags();
                                     uno::Reference<table::XTableColumns> xTableColumns(xColumnRowRange->getColumns());
                                     if (xTableColumns.is())
                                     {
@@ -2001,31 +2563,9 @@ void ScXMLExport::_ExportAutoStyles()
                                             uno::Reference <beans::XPropertySet> xColumnProperties(xTableColumns->getByIndex(nColumn), uno::UNO_QUERY);
                                             if (xColumnProperties.is())
                                             {
-                                                std::vector<XMLPropertyState> xPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties));
-                                                if(xPropStates.size())
-                                                {
-                                                    std::vector< XMLPropertyState >::iterator aItr(xPropStates.begin());
-                                                    std::vector< XMLPropertyState >::iterator aEndItr(xPropStates.end());
-                                                    while (aItr != aEndItr)
-                                                    {
-                                                        if (xColumnStylesPropertySetMapper->GetEntryContextId(aItr->mnIndex) == CTF_SC_ISVISIBLE)
-                                                        {
-                                                            aItr->maValue >>= bIsVisible;
-                                                            break;
-                                                        }
-                                                        ++aItr;
-                                                    }
-                                                    rtl::OUString sParent;
-                                                    rtl::OUString sName;
-                                                    if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates))
-                                                    {
-                                                        rtl::OUString* pTemp(new rtl::OUString(sName));
-                                                        nIndex = pColumnStyles->AddStyleName(pTemp);
-                                                    }
-                                                    else
-                                                        nIndex = pColumnStyles->GetIndexOfStyleName(sName, SC_SCOLUMNPREFIX);
-                                                    pColumnStyles->AddFieldStyleName(nTable, nColumn, nIndex, bIsVisible);
-                                                }
+                                                AddStyleFromColumn( xColumnProperties, NULL, nIndex, bIsVisible );
+                                                //if(xPropStates.size())
+                                                pColumnStyles->AddFieldStyleName(nTable, nColumn, nIndex, bIsVisible);
                                             }
                                             sal_Int32 nOld(nColumn);
                                             nColumn = pDoc->GetNextDifferentChangedCol(sal::static_int_cast<SCTAB>(nTable), static_cast<SCCOL>(nColumn));
@@ -2062,20 +2602,9 @@ void ScXMLExport::_ExportAutoStyles()
                                             uno::Reference <beans::XPropertySet> xRowProperties(xTableRows->getByIndex(nRow), uno::UNO_QUERY);
                                             if(xRowProperties.is())
                                             {
-                                                std::vector<XMLPropertyState> xPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties));
-                                                if(xPropStates.size())
-                                                {
-                                                    rtl::OUString sParent;
-                                                    rtl::OUString sName;
-                                                    if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates))
-                                                    {
-                                                        rtl::OUString* pTemp(new rtl::OUString(sName));
-                                                        nIndex = pRowStyles->AddStyleName(pTemp);
-                                                    }
-                                                    else
-                                                        nIndex = pRowStyles->GetIndexOfStyleName(sName, SC_SROWPREFIX);
-                                                    pRowStyles->AddFieldStyleName(nTable, nRow, nIndex);
-                                                }
+                                                AddStyleFromRow( xRowProperties, NULL, nIndex );
+                                                //if(xPropStates.size())
+                                                pRowStyles->AddFieldStyleName(nTable, nRow, nIndex);
                                             }
                                             sal_Int32 nOld(nRow);
                                             nRow = pDoc->GetNextDifferentChangedRow(sal::static_int_cast<SCTAB>(nTable), static_cast<SCROW>(nRow), false);
@@ -2091,7 +2620,7 @@ void ScXMLExport::_ExportAutoStyles()
                                     }
                                 }
                             }
-                            uno::Reference<sheet::XCellRangesQuery> xCellRangesQuery (xTableProperties, uno::UNO_QUERY);
+                            uno::Reference<sheet::XCellRangesQuery> xCellRangesQuery (xTable, uno::UNO_QUERY);
                             if (xCellRangesQuery.is())
                             {
                                 uno::Reference<sheet::XSheetCellRanges> xSheetCellRanges(xCellRangesQuery->queryContentCells(sheet::CellFlags::FORMATTED));
@@ -2392,27 +2921,11 @@ sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) con
 //		{
             rMyCell.sStringValue = ScCellObj::GetOutputString_Impl(pDoc, aPos);
             rMyCell.bHasStringValue = sal_True;
-            rMyCell.sPhoneticText = ScCellObj::GetOutputPhoneticString_Impl(pDoc, aPos);
-            rMyCell.bHasPhonetic = sal_True;
             return sal_True;
 //		}
     }
 }
 
-void ScXMLExport::WriteRubyText (ScMyCell& rMyCell)
-{
-    if ( !rMyCell.sPhoneticText.getLength() )
-        return;
-    StartElement( XML_NAMESPACE_TEXT, XML_RUBY, sal_False);
-    StartElement( XML_NAMESPACE_TEXT, XML_RUBY_BASE, sal_False );
-    Characters( rMyCell.sStringValue );
-    EndElement( XML_NAMESPACE_TEXT, XML_RUBY_BASE, sal_False );
-    StartElement( XML_NAMESPACE_TEXT, XML_RUBY_TEXT, sal_False );
-    Characters( rMyCell.sPhoneticText );
-    EndElement( XML_NAMESPACE_TEXT, XML_RUBY_TEXT, sal_False );
-    EndElement( XML_NAMESPACE_TEXT, XML_RUBY, sal_False);
-}
-
 void ScXMLExport::WriteCell (ScMyCell& aCell)
 {
     ScAddress aCellPos;
@@ -2554,20 +3067,13 @@ void ScXMLExport::WriteCell (ScMyCell& aCell)
             uno::Reference<text::XText> xText(xCurrentTableCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row), uno::UNO_QUERY);
             if ( xText.is())
                 GetTextParagraphExport()->exportText(xText, sal_False, sal_False);
-            if (GetCellText( aCell, aCellPos ) && aCell.sPhoneticText.getLength())
-                WriteRubyText( aCell );
         }
         else
         {
             SvXMLElementExport aElemP(*this, sElemP, sal_True, sal_False);
             sal_Bool bPrevCharWasSpace(sal_True);
               if (GetCellText(aCell, aCellPos))
-            {
-                if ( aCell.sPhoneticText.getLength() )
-                    WriteRubyText( aCell );
-                else 
-                    GetTextParagraphExport()->exportText( aCell.sStringValue, bPrevCharWasSpace );
-           }
+                GetTextParagraphExport()->exportText(aCell.sStringValue, bPrevCharWasSpace);
         }
     }
     WriteShapes(aCell);
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 5a2b1ac0f..69f808c32 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -38,6 +38,10 @@
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 
+namespace com { namespace sun { namespace star {
+    namespace beans { class XPropertySet; }
+} } }
+
 #include <hash_map>
 
 class ScOutlineArray;
@@ -72,6 +76,9 @@ class ScXMLExport : public SvXMLExport
     com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet> xCurrentTable;
     com::sun::star::uno::Reference <com::sun::star::table::XCellRange> xCurrentTableCellRange;
 
+    com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xSourceStream;
+    sal_Int32                   nSourceStreamPos;
+
     UniReference < XMLPropertyHandlerFactory >	xScPropHdlFactory;
     UniReference < XMLPropertySetMapper >		xCellStylesPropertySetMapper;
     UniReference < XMLPropertySetMapper >		xColumnStylesPropertySetMapper;
@@ -139,7 +146,7 @@ class ScXMLExport : public SvXMLExport
 
     void CollectInternalShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
 
-    com::sun::star::table::CellRangeAddress GetEndAddress(com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable,
+    com::sun::star::table::CellRangeAddress GetEndAddress(const com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable,
                                                         const sal_Int32 nTable);
 //	ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges();
     void GetAreaLinks( com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc, ScMyAreaLinksContainer& rAreaLinks );
@@ -185,12 +192,6 @@ class ScXMLExport : public SvXMLExport
     void ExportShape(const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape, com::sun::star::awt::Point* pPoint);
     void WriteShapes(const ScMyCell& rMyCell);
     void WriteTableShapes();
-
-    /**
-     * Write phonetic text
-     * @param aCell the cell reference which has phonetic text.
-     */
-    void WriteRubyText (ScMyCell& aCell);
     void SetRepeatAttribute (const sal_Int32 nEqualCellCount);
 
     sal_Bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const;
@@ -213,7 +214,21 @@ class ScXMLExport : public SvXMLExport
 
     void CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uInt16 nAttrib);
 
+    void AddStyleFromCells(
+        const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xProperties,
+        const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheet >& xTable,
+        sal_Int32 nTable, const rtl::OUString* pOldName );
+    void AddStyleFromColumn(
+        const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xColumnProperties,
+        const rtl::OUString* pOldName, sal_Int32& rIndex, sal_Bool& rIsVisible );
+    void AddStyleFromRow(
+        const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xRowProperties,
+        const rtl::OUString* pOldName, sal_Int32& rIndex );
+
     void IncrementProgressBar(sal_Bool bEditCell, sal_Int32 nInc = 1);
+
+    void CopySourceStream( sal_Int32 nStartOffset, sal_Int32 nEndOffset, sal_Int32& rNewStart, sal_Int32& rNewEnd );
+
 protected:
     virtual SvXMLAutoStylePoolP* CreateAutoStylePool();
     virtual XMLPageExport* CreatePageExport();
@@ -240,6 +255,8 @@ public:
     UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() { return xCellStylesPropertySetMapper; }
     UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() { return xTableStylesPropertySetMapper; }
 
+    void SetSourceStream( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xNewStream );
+
     void GetChangeTrackViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps);
     virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps);
     virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps);
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index e5d6a0e6b..2246b10bb 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -71,6 +71,7 @@
 #include "XMLChangeTrackingImportHelper.hxx"
 #include "chgviset.hxx"
 #include "XMLStylesImportHelper.hxx"
+#include "sheetdata.hxx"
 #include "unonames.hxx"
 #include "rangeutl.hxx"
 #include "postit.hxx"
@@ -93,6 +94,7 @@
 #include <com/sun/star/sheet/NamedRangeFlag.hpp>
 #include <com/sun/star/sheet/XNamedRange.hpp>
 #include <com/sun/star/sheet/XLabelRanges.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
 
 #define SC_LOCALE			"Locale"
 #define SC_STANDARDFORMAT	"StandardFormat"
@@ -833,55 +835,6 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap()
     return *pTableRowCellElemTokenMap;
 }
 
-    SvXMLTokenMap           *pTableRowCellElemTextRubyAttrTokenMap;
-
-const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTextTokenMap()
-{
-    if (!pTableRowCellElemTextTokenMap)
-    {
-        static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTextTokenMap[] =
-        {
-            { XML_NAMESPACE_TEXT, XML_S,    XML_TOK_TABLE_ROW_CELL_TEXT_S    },
-            { XML_NAMESPACE_TEXT, XML_RUBY, XML_TOK_TABLE_ROW_CELL_TEXT_RUBY },
-            XML_TOKEN_MAP_END
-        };
-        pTableRowCellElemTextTokenMap = new SvXMLTokenMap(aTableRowCellTextTokenMap);
-    }
-
-    return *pTableRowCellElemTextTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTextRubyTokenMap()
-{
-    if (!pTableRowCellElemTextRubyTokenMap)
-    {
-        static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTextRubyAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME },
-            XML_TOKEN_MAP_END
-        };
-        pTableRowCellElemTextRubyTokenMap = new SvXMLTokenMap(aTableRowCellTextRubyAttrTokenMap);
-    }
-
-    return *pTableRowCellElemTextRubyTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTextRubyAttrTokenMap()
-{
-    if (!pTableRowCellElemTextRubyAttrTokenMap)
-    {
-        static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTextRubyTokenMap[] =
-        {
-            { XML_NAMESPACE_TEXT, XML_RUBY_BASE, XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_BASE },
-            { XML_NAMESPACE_TEXT, XML_RUBY_TEXT, XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_TEXT },
-            XML_TOKEN_MAP_END
-        }; 
-        pTableRowCellElemTextRubyAttrTokenMap = new SvXMLTokenMap(aTableRowCellTextRubyTokenMap);
-    }
-
-    return *pTableRowCellElemTextRubyAttrTokenMap;
-}
-
 const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap()
 {
     if( !pTableAnnotationAttrTokenMap )
@@ -1736,9 +1689,6 @@ ScXMLImport::ScXMLImport(
     pTableRowElemTokenMap( 0 ),
     pTableRowAttrTokenMap( 0 ),
     pTableRowCellElemTokenMap( 0 ),
-	pTableRowCellElemTextTokenMap( 0 ),
-	pTableRowCellElemTextRubyTokenMap( 0 ),
-	pTableRowCellElemTextRubyAttrTokenMap( 0 ),
     pTableRowCellAttrTokenMap( 0 ),
     pTableAnnotationAttrTokenMap( 0 ),
     pDetectiveElemTokenMap( 0 ),
@@ -1864,9 +1814,6 @@ ScXMLImport::~ScXMLImport() throw()
     delete pTableRowElemTokenMap;
     delete pTableRowAttrTokenMap;
     delete pTableRowCellElemTokenMap;
-    delete pTableRowCellElemTextTokenMap;
-    delete pTableRowCellElemTextRubyTokenMap;
-    delete pTableRowCellElemTextRubyAttrTokenMap;
     delete pTableRowCellAttrTokenMap;
     delete pTableAnnotationAttrTokenMap;
     delete pDetectiveElemTokenMap;
@@ -2516,6 +2463,20 @@ void ScXMLImport::SetStyleToRanges()
                 pStyle->FillPropertySet(xProperties);
                 sal_Int32 nNumberFormat(pStyle->GetNumberFormat());
                 SetType(xProperties, nNumberFormat, nPrevCellType, sPrevCurrency);
+
+                // store first cell of first range for each style, once per sheet
+                uno::Sequence<table::CellRangeAddress> aAddresses(xSheetCellRanges->getRangeAddresses());
+                if ( aAddresses.getLength() > 0 )
+                {
+                    const table::CellRangeAddress& rRange = aAddresses[0];
+                    if ( rRange.Sheet != pStyle->GetLastSheet() )
+                    {
+                        ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetModel())->GetSheetSaveData();
+                        pSheetData->AddCellStyle( sPrevStyleName,
+                            ScAddress( (SCCOL)rRange.StartColumn, (SCROW)rRange.StartRow, (SCTAB)rRange.Sheet ) );
+                        pStyle->SetLastSheet(rRange.Sheet);
+                    }
+                }
             }
             else
             {
@@ -2669,6 +2630,17 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE
     if ( ( nFlags & IMPORT_CONTENT ) && !( nFlags & IMPORT_STYLES ) )
         ExamineDefaultStyle();
 
+    if (getImportFlags() & IMPORT_CONTENT)
+    {
+        if (GetModel().is())
+        {
+            // store initial namespaces, to find the ones that were added from the file later
+            ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetModel())->GetSheetSaveData();
+            const SvXMLNamespaceMap& rNamespaces = GetNamespaceMap();
+            pSheetData->StoreInitialNamespaces(rNamespaces);
+        }
+    }
+
     UnlockSolarMutex();
 }
 
@@ -2872,6 +2844,19 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE
         GetProgressBarHelper()->End();  // make room for subsequent SfxProgressBars
         if (pDoc)
             pDoc->CompileXML();
+
+        if (pDoc && GetModel().is())
+        {
+            // set "valid stream" flags after loading (before UpdateRowHeights, so changed formula results
+            // in UpdateRowHeights can already clear the flags again)
+            ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetModel())->GetSheetSaveData();
+
+            SCTAB nTabCount = pDoc->GetTableCount();
+            for (SCTAB nTab=0; nTab<nTabCount; ++nTab)
+                if (!pSheetData->IsSheetBlocked( nTab ))
+                    pDoc->SetStreamValid( nTab, TRUE );
+        }
+
         aTables.UpdateRowHeights();
         aTables.ResizeShapes();
     }
@@ -2931,6 +2916,16 @@ void ScXMLImport::UnlockSolarMutex()
     }
 }
 
+sal_Int32 ScXMLImport::GetByteOffset()
+{
+    sal_Int32 nOffset = -1;
+    uno::Reference<xml::sax::XLocator> xLocator = GetLocator();
+    uno::Reference<io::XSeekable> xSeek( xLocator, uno::UNO_QUERY );        //! should use different interface
+    if ( xSeek.is() )
+        nOffset = (sal_Int32)xSeek->getPosition();
+    return nOffset;
+}
+
 void ScXMLImport::SetRangeOverflowType(sal_uInt32 nType)
 {
     //  #i31130# Overflow is stored in the document, because the ScXMLImport object
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index de85b4afe..003797ed0 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -257,25 +257,7 @@ enum ScXMLTableRowCellTokens
     XML_TOK_TABLE_ROW_CELL_TABLE,
     XML_TOK_TABLE_ROW_CELL_ANNOTATION,
     XML_TOK_TABLE_ROW_CELL_DETECTIVE,
-    XML_TOK_TABLE_ROW_CELL_CELL_RANGE_SOURCE,
-    XML_TOK_TABLE_ROW_CELL_RUBY
-};
-
-enum ScXMLTableRowCellTextTokens
-{
-    XML_TOK_TABLE_ROW_CELL_TEXT_S,
-    XML_TOK_TABLE_ROW_CELL_TEXT_RUBY
-};
-
-enum ScXMLTableRowCellTextRubyTokens
-{
-    XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_BASE,
-    XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_TEXT
-};
-
-enum ScXMLTableRowCellTextRubyAttrTokens
-{
-    XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME
+    XML_TOK_TABLE_ROW_CELL_CELL_RANGE_SOURCE
 };
 
 enum ScXMLTableRowCellAttrTokens
@@ -732,9 +714,6 @@ class ScXMLImport: public SvXMLImport
     SvXMLTokenMap			*pTableRowElemTokenMap;
     SvXMLTokenMap			*pTableRowAttrTokenMap;
     SvXMLTokenMap			*pTableRowCellElemTokenMap;
-    SvXMLTokenMap           *pTableRowCellElemTextTokenMap;
-    SvXMLTokenMap           *pTableRowCellElemTextRubyTokenMap;
-    SvXMLTokenMap           *pTableRowCellElemTextRubyAttrTokenMap;
     SvXMLTokenMap			*pTableRowCellAttrTokenMap;
     SvXMLTokenMap			*pTableAnnotationAttrTokenMap;
     SvXMLTokenMap			*pDetectiveElemTokenMap;
@@ -900,9 +879,6 @@ public:
     const SvXMLTokenMap& GetTableRowElemTokenMap();
     const SvXMLTokenMap& GetTableRowAttrTokenMap();
     const SvXMLTokenMap& GetTableRowCellElemTokenMap();
-    const SvXMLTokenMap& GetTableRowCellElemTextTokenMap();
-    const SvXMLTokenMap& GetTableRowCellElemTextRubyTokenMap();
-    const SvXMLTokenMap& GetTableRowCellElemTextRubyAttrTokenMap();
     const SvXMLTokenMap& GetTableRowCellAttrTokenMap();
     const SvXMLTokenMap& GetTableAnnotationAttrTokenMap();
     const SvXMLTokenMap& GetDetectiveElemTokenMap();
@@ -1029,6 +1005,8 @@ public:
     void LockSolarMutex();
     void UnlockSolarMutex();
 
+    sal_Int32 GetByteOffset();
+
     void SetRangeOverflowType(sal_uInt32 nType);
 
     sal_Int32 	GetRangeType(const rtl::OUString sRangeType) const;
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index 84ffbc863..abd59379d 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -43,6 +43,7 @@
 #include "document.hxx"
 #include "docuno.hxx"
 #include "olinetab.hxx"
+#include "sheetdata.hxx"
 
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -170,6 +171,7 @@ void ScXMLTableRowContext::EndElement()
             GetScImport().GetTables().AddRow();
         DBG_ERRORFILE("it seems here is a nonvalid file; possible missing of table:table-cell element");
     }
+    sal_Int32 nSheet = rXMLImport.GetTables().GetCurrentSheet();
     sal_Int32 nCurrentRow(rXMLImport.GetTables().GetCurrentRow());
     uno::Reference<sheet::XSpreadsheet> xSheet(rXMLImport.GetTables().GetCurrentXSheet());
     if(xSheet.is())
@@ -196,7 +198,16 @@ void ScXMLTableRowContext::EndElement()
                             XMLTableStyleContext* pStyle((XMLTableStyleContext *)pStyles->FindStyleChildContext(
                                 XML_STYLE_FAMILY_TABLE_ROW, sStyleName, sal_True));
                             if (pStyle)
+                            {
                                 pStyle->FillPropertySet(xRowProperties);
+
+                                if ( nSheet != pStyle->GetLastSheet() )
+                                {
+                                    ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rXMLImport.GetModel())->GetSheetSaveData();
+                                    pSheetData->AddRowStyle( sStyleName, ScAddress( 0, (SCROW)nFirstRow, (SCTAB)nSheet ) );
+                                    pStyle->SetLastSheet(nSheet);
+                                }
+                            }
                         }
                     }
                     sal_Bool bVisible (sal_True);
diff --git a/sc/source/filter/xml/xmlrubyi.cxx b/sc/source/filter/xml/xmlrubyi.cxx
deleted file mode 100644
index 4aece484b..000000000
--- a/sc/source/filter/xml/xmlrubyi.cxx
+++ /dev/null
@@ -1,207 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: global.hxx,v $
- * $Revision: 1.53 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sc.hxx"
-
-
-
-// INCLUDE ---------------------------------------------------------------
-
-#ifndef _SC_XMLRUBYI_HXX
-#include "xmlrubyi.hxx"
-#endif
-#ifndef SC_XMLIMPRT_HXX
-#include "xmlimprt.hxx"
-#endif
-#ifndef SC_XMLCELLI_HXX
-#include "xmlcelli.hxx"
-#endif
-#ifndef _SC_XMLTEXTPCONTEXT_HXX
-#include "XMLTextPContext.hxx"
-#endif
-#ifndef _XMLSTYLI_HXX
-#include "xmlstyli.hxx"
-#endif
-
-#ifndef _XMLOFF_XMLNMSPE_HXX
-#include <xmloff/xmlnmspe.hxx>
-#endif
-#ifndef _XMLOFF_XMLTOKEN_HXX
-#include <xmloff/xmltoken.hxx>
-#endif
-#ifndef _XMLOFF_NMSPMAP_HXX
-#include <xmloff/nmspmap.hxx>
-#endif
-#ifndef _TOOLS_DEBUG_HXX
-#include <tools/debug.hxx>
-#endif
-#ifndef _COM_SUN_STAR_TEXT_XTEXT_HPP_
-#include <com/sun/star/text/XText.hpp>
-#endif
-
-using namespace com::sun::star;
-using namespace xmloff::token;
-
-ScXMLRubyContext::ScXMLRubyContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
-                                      const ::rtl::OUString& rLName,
-                                      const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
-                                      ScXMLTextPContext* pTempTextContext) :
-    SvXMLImportContext( rImport, nPrfx, rLName ),
-    pCellContext( NULL ),
-    pTextContext( pTempTextContext )
-{
-    sal_Int16 nAttrCount(xTempAttrList.is() ? xTempAttrList->getLength() : 0);
-    const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableRowCellElemTextRubyAttrTokenMap();
-    for( sal_Int16 i=0; i < nAttrCount; ++i )
-    {
-        const rtl::OUString& sAttrName(xTempAttrList->getNameByIndex( i ));
-        rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
-                       sAttrName, &aLocalName ));
-        const rtl::OUString& sValue(xTempAttrList->getValueByIndex( i ));
-
-        switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
-        {
-        case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME:
-            sStyleName = sValue;
-            break;
-        }
-    }
-}
-
-ScXMLRubyContext::ScXMLRubyContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
-                                      const ::rtl::OUString& rLName,
-                                      const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
-                                      ScXMLTableRowCellContext* pTempContext) :
-    SvXMLImportContext( rImport, nPrfx, rLName ),
-    pCellContext( pTempContext ),
-    pTextContext( NULL )
-{
-    sal_Int16 nAttrCount(xTempAttrList.is() ? xTempAttrList->getLength() : 0);
-    const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableRowCellElemTextRubyAttrTokenMap();
-    for( sal_Int16 i=0; i < nAttrCount; ++i )
-    {
-        const rtl::OUString& sAttrName(xTempAttrList->getNameByIndex( i ));
-        rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
-                       sAttrName, &aLocalName ));
-        const rtl::OUString& sValue(xTempAttrList->getValueByIndex( i ));
-
-        switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
-        {
-        case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME:
-            sStyleName = sValue;
-            break;
-        }
-    }
-}
-
-SvXMLImportContext *ScXMLRubyContext::CreateChildContext( USHORT nPrefix,
-                                            const ::rtl::OUString& rLName,
-                                            const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
-{
-    SvXMLImportContext *pContext(NULL);
-
-    const SvXMLTokenMap& rTokenMap = GetScImport().GetTableRowCellElemTextRubyTokenMap();
-    switch( rTokenMap.Get( nPrefix, rLName ) )
-    {
-    case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_BASE:
-        pContext = new ScXMLRubyBaseContext( GetScImport(), nPrefix, rLName, xAttrList, this);
-        break;
-    case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_TEXT:
-        pContext = new ScXMLRubyTextContext( GetScImport(), nPrefix, rLName, xAttrList, this);
-        break;
-    }
-
-    if( !pContext )
-        pContext = new SvXMLImportContext( GetScImport(), nPrefix, rLName );
-
-    return pContext;
-}
-
-void ScXMLRubyContext::EndElement()
-{
-    if ( pTextContext )
-        pTextContext->AddRubyText( sBaseText.makeStringAndClear(), sRubyText.makeStringAndClear() );
-    else if ( pCellContext )
-        pCellContext->SetPhoneticText( sRubyText.makeStringAndClear() );
-}
-
-void ScXMLRubyContext::AddBaseText( const ::rtl::OUString& rText )
-{
-    sBaseText.append( rText );
-}
-
-void ScXMLRubyContext::AddRubyText( const ::rtl::OUString& rText )
-{
-    sRubyText.append( rText );
-}
-
-ScXMLRubyBaseContext::ScXMLRubyBaseContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
-                                      const ::rtl::OUString& rLName,
-                                      const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::xml::sax::XAttributeList>& /*xTempAttrList*/,
-                                      ScXMLRubyContext* pTempRubyContext) :
-    SvXMLImportContext( rImport, nPrfx, rLName ),
-    pRubyContext( pTempRubyContext )
-{
-    // here are no attributes
-}
-
-void ScXMLRubyBaseContext::Characters( const ::rtl::OUString& rChars )
-{
-    pRubyContext->AddBaseText( rChars );
-}
-
-ScXMLRubyTextContext::ScXMLRubyTextContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
-                                      const ::rtl::OUString& rLName,
-                                      const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::xml::sax::XAttributeList>& /*xTempAttrList*/,
-                                      ScXMLRubyContext* pTempRubyContext) :
-    SvXMLImportContext( rImport, nPrfx, rLName ),
-    pRubyContext( pTempRubyContext )
-{
-    // here are no attributes
-}
-
-void ScXMLRubyTextContext::Characters( const ::rtl::OUString& rChars )
-{
-    pRubyContext->AddRubyText( rChars );
-}
-
-
diff --git a/sc/source/filter/xml/xmlrubyi.hxx b/sc/source/filter/xml/xmlrubyi.hxx
deleted file mode 100644
index efc16af5d..000000000
--- a/sc/source/filter/xml/xmlrubyi.hxx
+++ /dev/null
@@ -1,191 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: global.hxx,v $
- * $Revision: 1.53 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SC_XMLRUBYI_HXX
-#define _SC_XMLRUBYI_HXX
-
-#ifndef _XMLOFF_XMLICTXT_HXX
-#include <xmloff/xmlictxt.hxx>
-#endif
-#ifndef _RTL_USTRBUF_HXX_
-#include <rtl/ustrbuf.hxx>
-#endif
-
-class ScXMLImport;
-class ScXMLTextPContext;
-class ScXMLTableRowCellContext;
-
-/**
- * A class for representing Asian phonetic guide information while loading ODF file.
- */
-class ScXMLRubyContext : public SvXMLImportContext
-{
-    rtl::OUString       sStyleName;
-    rtl::OUStringBuffer sBaseText;
-    rtl::OUStringBuffer sRubyText;
-    ScXMLTableRowCellContext*   pCellContext;
-    ScXMLTextPContext*  pTextContext;
-
-    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-
-public:
-
-    /**
-     * A constructor of ScXMLRubyContext.
-     * @param rImport a reference of ScXMLImport.
-     * @param nPrfx the number of the element prefix.
-     * @param rLName the string of the element.
-     * @param xAttrList attribute list of the element.
-     * @param pContext a pointer of ScXMLTextPContext.
-     */
-    ScXMLRubyContext( ScXMLImport& rImport, USHORT nPrfx,
-                        const ::rtl::OUString& rLName,
-                        const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-                        ScXMLTextPContext* pContext);
-    /**
-     * A constructor of ScXMLRubyContext.
-     * @param rImport a reference of ScXMLImport.
-     * @param nPrfx the number of the element prefix.
-     * @param rLName the string of the element.
-     * @param xAttrList attribute list of the element.
-     * @param pContext a pointer of ScXMLTableRowCellContext.
-     */
-    ScXMLRubyContext( ScXMLImport& rImport, USHORT nPrfx,
-                        const ::rtl::OUString& rLName,
-                        const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-                        ScXMLTableRowCellContext* pContext);
-
-    virtual ~ScXMLRubyContext() {};
-
-    /**
-     * Create a childs element context. By default, the import's
-     * CreateContext method is called to create a new default context.
-     * @return a new default context.
-     */
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
-                                     const ::rtl::OUString& rLocalName,
-                                     const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
-    /**
-     * EndElement is called before a context will be destructed, but
-     * after a elements context has been parsed. It may be used for actions
-     * that require virtual methods. The default is to do nothing.
-     */
-    virtual void EndElement();
-
-    /**
-     * Adds string into cell string as base string of phonetic infrmation
-     * @param rText the base string.
-     */
-    void AddBaseText(const ::rtl::OUString& rText);
-    /**
-     * Adds string into cell string as phonetic text
-     * @param rText the phonetic text.
-     */
-    void AddRubyText(const ::rtl::OUString& rText);
-};
-
-/**
- * A class for representing base text of phonetic guide information while loading ODF file.
- */
-class ScXMLRubyBaseContext : public SvXMLImportContext
-{
-    ScXMLRubyContext*   pRubyContext;
-
-    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-
-public:
-
-    /**
-     * A constructor of ScXMLRubyBaseContext.
-     * @param rImport a reference of ScXMLImport.
-     * @param nPrfx the number of the element prefix.
-     * @param rLName the string of the element.
-     * @param xAttrList attribute list of the element.
-     * @param pContext a pointer of ScXMLRubyContext.
-     */
-    ScXMLRubyBaseContext( ScXMLImport& rImport, USHORT nPrfx,
-                        const ::rtl::OUString& rLName,
-                        const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-                        ScXMLRubyContext* pContext);
-
-    virtual ~ScXMLRubyBaseContext() {};
-
-    /**
-     * This method is called for all characters that are contained in the
-     * current element. The default is to ignore them.
-     * @param rChars the character reference
-     */ 
-    virtual void Characters( const ::rtl::OUString& rChars );
-};
-
-
-/**
- * A class for representing phonetic text of phonetic guide information while loading ODF file.
- */
-class ScXMLRubyTextContext : public SvXMLImportContext
-{
-    ScXMLRubyContext*   pRubyContext;
-
-    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-
-public:
-
-    /**
-     * A constructor of ScXMLRubyTextContext.
-     * @param rImport a reference of ScXMLImport.
-     * @param nPrfx the number of the element prefix.
-     * @param rLName the string of the element.
-     * @param xAttrList attribute list of the element.
-     * @param pContext a pointer of ScXMLRubyContext.
-     */
-    ScXMLRubyTextContext( ScXMLImport& rImport, USHORT nPrfx,
-                        const ::rtl::OUString& rLName,
-                        const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-                        ScXMLRubyContext* pContext);
-
-    virtual ~ScXMLRubyTextContext() {};
-
-    /**
-     * This method is called for all characters that are contained in the
-     * current element. The default is to ignore them.
-     * @param rChars the character reference
-     */ 
-    virtual void Characters( const ::rtl::OUString& rChars );
-};
-
-#endif
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index a99768321..5a4449948 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -141,7 +141,6 @@ const XMLPropertyMapEntry aXMLScRowStylesImportProperties[] =
     MAP( "IsCellBackgroundTransparent", XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, XML_TYPE_PROP_TABLE_ROW|XML_TYPE_ISTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
     MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, XML_TYPE_PROP_TABLE_ROW|XML_SC_TYPE_BREAKBEFORE, CTF_SC_ROWBREAKBEFORE),
     MAP( "OptimalHeight", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_ROW_HEIGHT, XML_TYPE_PROP_TABLE_ROW|XML_TYPE_BOOL, CTF_SC_ROWOPTIMALHEIGHT),
-    MAP( "RubyText", XML_NAMESPACE_TEXT, XML_RUBY_TEXT, XML_TYPE_PROP_RUBY, 0 ),
     MAP_END()
 };
 
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 183af7ea6..0542dd78b 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -50,6 +50,11 @@
 #include <tools/debug.hxx>
 #include "XMLTableHeaderFooterContext.hxx"
 #include "XMLConverter.hxx"
+#include "XMLTableShapeImportHelper.hxx"
+#include "sheetdata.hxx"
+#include "xmlannoi.hxx"
+#include "textuno.hxx"
+#include "cellsuno.hxx"
 
 #include "docuno.hxx"
 #include "unonames.hxx"
@@ -64,9 +69,8 @@
 #define XML_LINE_BLTR 1
 
 using ::rtl::OUString;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::Reference;
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::style;
 using namespace ::com::sun::star::frame;
@@ -462,6 +466,7 @@ XMLTableStyleContext::XMLTableStyleContext( ScXMLImport& rImport,
     sNumberFormat(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"))),
     pStyles(&rStyles),
     nNumberFormat(-1),
+    nLastSheet(-1),
     bConditionalFormatCreated(sal_False),
     bParentSet(sal_False)
 {
@@ -610,34 +615,33 @@ sal_Int32 XMLTableStyleContext::GetNumberFormat()
     }
     return nNumberFormat;
 }
+
 // ----------------------------------------------------------------------------
 
 SvXMLStyleContext *XMLTableStylesContext::CreateStyleStyleChildContext(
         sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList )
 {
-    SvXMLStyleContext *pStyle(NULL);
-    if ( nFamily == XML_STYLE_FAMILY_TEXT_RUBY )
-    {
-        pStyle = new XMLRubyStyleContext ( GetScImport(), nPrefix, rLocalName,
-                                           xAttrList, *this, nFamily );
-    }
-    else 
+    SvXMLStyleContext *pStyle;
+    // use own wrapper for text and paragraph, to record style usage
+    if (nFamily == XML_STYLE_FAMILY_TEXT_PARAGRAPH || nFamily == XML_STYLE_FAMILY_TEXT_TEXT)
+        pStyle = new ScCellTextStyleContext( GetImport(), nPrefix, rLocalName,
+                                            xAttrList, *this, nFamily );
+    else
+        pStyle = SvXMLStylesContext::CreateStyleStyleChildContext(
+                    nFamily, nPrefix, rLocalName, xAttrList );
+
+    if (!pStyle)
     {
-        pStyle = SvXMLStylesContext::CreateStyleStyleChildContext( 
-            nFamily, nPrefix, rLocalName, xAttrList );
-        if (!pStyle)
+        switch( nFamily )
         {
-            switch( nFamily )
-            {
-                case XML_STYLE_FAMILY_TABLE_CELL:
-                case XML_STYLE_FAMILY_TABLE_COLUMN:
-                case XML_STYLE_FAMILY_TABLE_ROW:
-                case XML_STYLE_FAMILY_TABLE_TABLE:
-                    pStyle = new XMLTableStyleContext( GetScImport(), nPrefix, rLocalName,
-                                                       xAttrList, *this, nFamily );
-                    break;
-            }
+        case XML_STYLE_FAMILY_TABLE_CELL:
+        case XML_STYLE_FAMILY_TABLE_COLUMN:
+        case XML_STYLE_FAMILY_TABLE_ROW:
+        case XML_STYLE_FAMILY_TABLE_TABLE:
+            pStyle = new XMLTableStyleContext( GetScImport(), nPrefix, rLocalName,
+                                               xAttrList, *this, nFamily );
+            break;
         }
     }
 
@@ -1022,102 +1026,56 @@ void ScMasterPageContext::Finish( sal_Bool bOverwrite )
         ClearContent(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON)));
 }
 
-class ScXMLRubyStyleContext : public SvXMLImportContext
-{
-    rtl::OUString sPosition;
-    rtl::OUString sAlign;
-public:
-
-    ScXMLRubyStyleContext(
-            SvXMLImport& rImport, sal_uInt16 nPrfx,
-            const rtl::OUString& rLName,
-            const Reference< XAttributeList > & xAttrList );
-    virtual ~ScXMLRubyStyleContext();
-
-    const rtl::OUString& GetPosition() const { return sPosition; }
-    const rtl::OUString& GetAlign() const { return sAlign; }
-};
-
-ScXMLRubyStyleContext::ScXMLRubyStyleContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
-            const OUString& rLName, const Reference< XAttributeList > & xAttrList )
-    : SvXMLImportContext( rImport, nPrfx, rLName ),
-    sPosition(),
-    sAlign()
-{
-    sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
-    for( sal_Int16 i=0; i < nAttrCount; ++i )
-    {
-        const OUString& rAttrName(xAttrList->getNameByIndex( i ));
-        OUString aLocalName;
-        sal_uInt16 nPrefix(GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName ));
-        const OUString& rValue(xAttrList->getValueByIndex( i ));
-
-        if( XML_NAMESPACE_STYLE == nPrefix )
-        {
-            if( IsXMLToken(aLocalName, XML_RUBY_ALIGN ) )
-                sPosition = rValue;
-            else if( IsXMLToken(aLocalName, XML_RUBY_POSITION ) )
-                sAlign = rValue;
-        }
-    }
-}
+// ---------------------------------------------------------------------------
 
-ScXMLRubyStyleContext::~ScXMLRubyStyleContext()
+ScCellTextStyleContext::ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+            const rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList> & xAttrList,
+            SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) :
+    XMLTextStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ),
+    nLastSheet(-1)
 {
 }
 
-TYPEINIT1( XMLRubyStyleContext, XMLPropStyleContext );
-
-XMLRubyStyleContext::XMLRubyStyleContext( ScXMLImport& rImport,
-        sal_uInt16 nPrfx, const OUString& rLName,
-        const Reference< XAttributeList > & xAttrList,
-        SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) :
-    XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ),
-    pStyles(&rStyles)
+ScCellTextStyleContext::~ScCellTextStyleContext()
 {
 }
 
-XMLRubyStyleContext::~XMLRubyStyleContext()
+void ScCellTextStyleContext::FillPropertySet( const uno::Reference<beans::XPropertySet>& xPropSet )
 {
-}
+    XMLTextStyleContext::FillPropertySet( xPropSet );
 
-SvXMLImportContext *XMLRubyStyleContext::CreateChildContext(
-        sal_uInt16 nPrefix,
-        const OUString& rLocalName,
-        const Reference< XAttributeList > & xAttrList )
-{
-    SvXMLImportContext *pContext(NULL);
+    ScXMLImport& rXMLImport = GetScImport();
 
-    if( (XML_NAMESPACE_STYLE == nPrefix) &&
-        IsXMLToken(rLocalName, XML_RUBY_PROPERTIES ) )
+    ScCellTextCursor* pCellImp = ScCellTextCursor::getImplementation( xPropSet );
+    if (pCellImp)
     {
-        pContext = new ScXMLRubyStyleContext(GetImport(), nPrefix, rLocalName, xAttrList);
-        sPosition = ((ScXMLRubyStyleContext*)pContext)->GetPosition();
-        sAlign = ((ScXMLRubyStyleContext*)pContext)->GetAlign();
-    }
-    if (!pContext)
-        pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
-                                                           xAttrList );
-    return pContext;
-}
+        ScAddress aPos = pCellImp->GetCellObj().GetPosition();
+        if ( static_cast<sal_Int32>(aPos.Tab()) != nLastSheet )
+        {
+            ESelection aSel = pCellImp->GetSelection();
 
-void XMLRubyStyleContext::FillPropertySet( const Reference< XPropertySet > & rPropSet )
-{
-    XMLPropStyleContext::FillPropertySet(rPropSet);
-}
+            ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetImport().GetModel())->GetSheetSaveData();
+            pSheetData->AddTextStyle( GetName(), aPos, aSel );
 
-void XMLRubyStyleContext::SetDefaults()
-{
-    if ((GetFamily() == XML_STYLE_FAMILY_TEXT_RUBY) && GetImport().GetModel().is())
+            nLastSheet = static_cast<sal_Int32>(aPos.Tab());
+        }
+    }
+    else if ( rXMLImport.GetTables().GetCurrentSheet() != nLastSheet )
     {
-        uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetImport().GetModel(), uno::UNO_QUERY);
-        if (xMultiServiceFactory.is())
+        ScDrawTextCursor* pDrawImp = ScDrawTextCursor::getImplementation( xPropSet );
+        if (pDrawImp)
         {
-            uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.Defaults"))), uno::UNO_QUERY);
-            if (xProperties.is())
-                FillPropertySet(xProperties);
+            XMLTableShapeImportHelper* pTableShapeImport = (XMLTableShapeImportHelper*)GetScImport().GetShapeImport().get();
+            ScXMLAnnotationContext* pAnnotationContext = pTableShapeImport->GetAnnotationContext();
+            if (pAnnotationContext)
+            {
+                pAnnotationContext->AddContentStyle( GetFamily(), GetName(), pDrawImp->GetSelection() );
+                nLastSheet = rXMLImport.GetTables().GetCurrentSheet();
+            }
         }
+
+        // if it's a different shape, BlockSheet is called from XMLTableShapeImportHelper::finishShape
+        // formatted text in page headers/footers can be ignored
     }
 }
 
-
diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx
index ddbdaabfb..8ae90b43d 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -40,9 +40,12 @@
 #include <xmloff/xmlimppr.hxx>
 #include <xmloff/XMLTextMasterPageContext.hxx>
 #include <xmloff/XMLTextMasterStylesContext.hxx>
+#include <xmloff/txtstyli.hxx>
 #include <com/sun/star/sheet/ConditionOperator.hpp>
 #include "xmlimprt.hxx"
 
+class ScSheetSaveData;
+
 class ScXMLCellImportPropertyMapper : public SvXMLImportPropertyMapper
 {
 protected:
@@ -101,6 +104,7 @@ class XMLTableStyleContext : public XMLPropStyleContext
     std::vector<ScXMLMapContent>	aMaps;
     com::sun::star::uno::Any	aConditionalFormat;
     sal_Int32					nNumberFormat;
+    sal_Int32                   nLastSheet;
     sal_Bool					bConditionalFormatCreated;
     sal_Bool					bParentSet;
 
@@ -158,6 +162,9 @@ public:
 
     sal_Int32 GetNumberFormat();// { return nNumberFormat; }
 
+    sal_Int32 GetLastSheet() const       { return nLastSheet; }
+    void SetLastSheet(sal_Int32 nNew)    { nLastSheet = nNew; }
+
 private:
     using XMLPropStyleContext::SetStyle;
 };
@@ -260,59 +267,6 @@ public:
     virtual void EndElement();
 };
 
-/**
- * A class for representing ruby style while loading ODF file.
- */
-class XMLRubyStyleContext : public XMLPropStyleContext
-{
-    SvXMLStylesContext*         pStyles;
-    rtl::OUString sPosition;
-    rtl::OUString sAlign;
-
-    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
-
-public:
-
-    TYPEINFO();
-
-    /**
-     * A constructor of XMLRubyStyleContext.
-     * @param rImport a reference of ScXMLImport.
-     * @param nPrfx the number of the element prefix.
-     * @param rLName the string of the element.
-     * @param xAttrList attribute list of the element.
-     * @param rStyles a reference of SvXMLStylesContext.
-     * @param bDefaultStyle a flag of use of default style.
-     */
-    XMLRubyStyleContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
-            const ::rtl::OUString& rLName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
-            SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle = sal_False );
-    virtual ~XMLRubyStyleContext();
-
-    /**
-     * Create a childs element context. By default, the import's
-     * CreateContext method is called to create a new default context.
-     * @param nPrefix
-     * @param rLocalName
-     * @param xAttrList
-     * @return a new default context.
-     */
-    virtual SvXMLImportContext *CreateChildContext(
-            sal_uInt16 nPrefix,
-            const ::rtl::OUString& rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
-
-    virtual void FillPropertySet(const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > & rPropSet );
-
-    virtual void SetDefaults();
-
-private:
-    using XMLPropStyleContext::SetStyle;
-};
-
 namespace com { namespace sun { namespace star {
     namespace style { class XStyle; }
 } } }
@@ -351,5 +305,28 @@ public:
     virtual void Finish( sal_Bool bOverwrite );
 };
 
+class ScCellTextStyleContext : public XMLTextStyleContext
+{
+    sal_Int32   nLastSheet;
+
+    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+
+public:
+    ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+            const ::rtl::OUString& rLName,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
+            sal_Bool bDefaultStyle = sal_False );
+    virtual ~ScCellTextStyleContext();
+
+    // overload FillPropertySet to store style information
+    virtual void FillPropertySet(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertySet > & rPropSet );
+};
+
+
 #endif
 
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index b33e12426..1e368595e 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -43,6 +43,7 @@
 #include "docuno.hxx"
 #include "cellsuno.hxx"
 #include "XMLStylesImportHelper.hxx"
+#include "sheetdata.hxx"
 #include "tabprotection.hxx"
 #include <svx/svdpage.hxx>
 
@@ -151,11 +152,11 @@ void ScMyTableData::SetChangedCols(const sal_Int32 nValue)
 /*******************************************************************************************************************************/
 
 ScXMLTabProtectionData::ScXMLTabProtectionData() :
-    meHash1(PASSHASH_UNSPECIFIED), 
+    meHash1(PASSHASH_SHA1), 
     meHash2(PASSHASH_UNSPECIFIED),
     mbProtected(false), 
-    mbSelectProtectedCells(false), 
-    mbSelectUnprotectedCells(false)
+    mbSelectProtectedCells(true), 
+    mbSelectUnprotectedCells(true)
 {
 }
 
@@ -277,7 +278,12 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString&
                                     XMLTableStyleContext* pStyle = (XMLTableStyleContext *)pStyles->FindStyleChildContext(
                                         XML_STYLE_FAMILY_TABLE_TABLE, sStyleName, sal_True);
                                     if (pStyle)
+                                    {
                                         pStyle->FillPropertySet(xProperties);
+
+                                        ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rImport.GetModel())->GetSheetSaveData();
+                                        pSheetData->AddTableStyle( sStyleName, ScAddress( 0, 0, (SCTAB)nCurrentSheet ) );
+                                    }
                                 }
                             }
                         }
@@ -617,7 +623,11 @@ void ScMyTables::UpdateRowHeights()
             }
 
             if (aUpdateSheets.GetSelectCount())
+            {
+                pDoc->LockStreamValid( true );      // ignore draw page size (but not formula results)
                 ScModelObj::getImplementation(rImport.GetModel())->UpdateAllRowHeights(&aUpdateSheets);
+                pDoc->LockStreamValid( false );
+            }
         }
 
         rImport.UnlockSolarMutex();
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index 7786babbb..a2995a605 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -50,6 +50,7 @@
 #include "XMLStylesImportHelper.hxx"
 #include "rangeutl.hxx"
 #include "externalrefmgr.hxx"
+#include "sheetdata.hxx"
 
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -150,9 +151,13 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
                                       const sal_Int32 nSpannedCols) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     pExternalRefInfo(NULL),
+    nStartOffset(-1),
     bStartFormPage(sal_False),
     bPrintEntireSheet(sal_True)
 {
+    // get start offset in file (if available)
+    nStartOffset = GetScImport().GetByteOffset();
+
     if (!bTempIsSubTable)
     {
         ScXMLTabProtectionData aProtectData;
@@ -337,6 +342,9 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( USHORT nPrefix,
 
 void ScXMLTableContext::EndElement()
 {
+    // get end offset in file (if available)
+//    sal_Int32 nEndOffset = GetScImport().GetByteOffset();
+
     GetScImport().LockSolarMutex();
     GetScImport().GetStylesImportHelper()->EndTable();
     ScDocument* pDoc(GetScImport().GetDocument());
@@ -397,6 +405,15 @@ void ScXMLTableContext::EndElement()
 
         GetScImport().GetTables().DeleteTable();
         GetScImport().ProgressBarIncrement(sal_False);
+
+        // store stream positions
+        if (!pExternalRefInfo.get() && nStartOffset >= 0 /* && nEndOffset >= 0 */)
+        {
+            ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData();
+            sal_Int32 nTab = GetScImport().GetTables().GetCurrentSheet();
+            // pSheetData->AddStreamPos( nTab, nStartOffset, nEndOffset );
+            pSheetData->StartStreamPos( nTab, nStartOffset );
+        }
     }
     GetScImport().UnlockSolarMutex();
 }
diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx
index 399c9a5b4..497de7499 100644
--- a/sc/source/filter/xml/xmltabi.hxx
+++ b/sc/source/filter/xml/xmltabi.hxx
@@ -52,6 +52,7 @@ class ScXMLTableContext : public SvXMLImportContext
 {
     rtl::OUString	sPrintRanges;
     ::std::auto_ptr<ScXMLExternalTabData> pExternalRefInfo;
+    sal_Int32       nStartOffset;
     sal_Bool		bStartFormPage;
     sal_Bool        bPrintEntireSheet;
 
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index ae643cd7a..14ec417e3 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -624,6 +624,25 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
     return sal_False;
 }
 
+bool lcl_HasValidStream(ScDocument& rDoc)
+{
+    SfxObjectShell* pObjSh = rDoc.GetDocumentShell();
+    if ( pObjSh->IsDocShared() )
+        return false;                       // never copy stream from shared file
+
+    // don't read remote file again
+    // (could instead re-use medium directly in that case)
+    SfxMedium* pSrcMed = rDoc.GetDocumentShell()->GetMedium();
+    if ( !pSrcMed || pSrcMed->IsRemote() )
+        return false;
+
+    SCTAB nTabCount = rDoc.GetTableCount();
+    for (SCTAB nTab=0; nTab<nTabCount; ++nTab)
+        if (rDoc.IsStreamValid(nTab))
+            return true;
+    return false;
+}
+
 sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServiceFactory>& xServiceFactory,
     uno::Reference<frame::XModel>& xModel, uno::Reference<uno::XInterface>& xWriter,
     uno::Sequence<beans::PropertyValue>& aDescriptor, const rtl::OUString& sName,
@@ -691,7 +710,49 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
     {
         ScXMLExport* pExport = static_cast<ScXMLExport*>(SvXMLExport::getImplementation(xFilter));
         pExport->SetSharedData(pSharedData);
-        bRet = xFilter->filter( aDescriptor );
+
+        // if there are sheets to copy, get the source stream
+        if ( sName.equalsAscii("content.xml") && lcl_HasValidStream(rDoc) &&
+             ( pExport->getExportFlags() & EXPORT_OASIS ) )
+        {
+            // old stream is still in this file's storage - open read-only
+
+            SfxMedium* pSrcMed = rDoc.GetDocumentShell()->GetMedium();
+            String aSrcURL = pSrcMed->GetOrigURL();
+
+            // SfxMedium must not be read-only, or it will create a temp file in GetStorage
+            SfxMedium aTmpMedium( aSrcURL, STREAM_READWRITE, FALSE, NULL, NULL );
+            uno::Reference<embed::XStorage> xTmpStorage = aTmpMedium.GetStorage();
+            uno::Reference<io::XStream> xSrcStream;
+            uno::Reference<io::XInputStream> xSrcInput;
+            try
+            {
+                if (xTmpStorage.is())
+                    xSrcStream = xTmpStorage->openStreamElement( sName, embed::ElementModes::READ );
+                if (xSrcStream.is())
+                    xSrcInput = xSrcStream->getInputStream();
+            }
+            catch (uno::Exception&)
+            {
+                // stream not available (for example, password protected) - save normally (xSrcInput is null)
+            }
+
+            pExport->SetSourceStream( xSrcInput );
+            bRet = xFilter->filter( aDescriptor );
+            pExport->SetSourceStream( uno::Reference<io::XInputStream>() );
+
+            // If there was an error, reset all stream flags, so the next save attempt will use normal saving.
+            if (!bRet)
+            {
+                SCTAB nTabCount = rDoc.GetTableCount();
+                for (SCTAB nTab=0; nTab<nTabCount; nTab++)
+                    if (rDoc.IsStreamValid(nTab))
+                        rDoc.SetStreamValid(nTab, FALSE);
+            }
+        }
+        else
+            bRet = xFilter->filter( aDescriptor );
+
         pSharedData = pExport->GetSharedData();
 
         //stream is closed by SAX parser
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index d112ea064..046b4cefa 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -95,10 +95,12 @@ sal_Bool SAL_CALL ScAccessibleCellBase::isVisible(  )
     sal_Bool bVisible(sal_True);
     if (mpDoc)
     {
-        BYTE nColFlags = mpDoc->GetColFlags(maCellAddress.Col(), maCellAddress.Tab());
-        BYTE nRowFlags = mpDoc->GetRowFlags(maCellAddress.Row(), maCellAddress.Tab());
-        if (((nColFlags & CR_HIDDEN) == CR_HIDDEN) || ((nColFlags & CR_FILTERED) == CR_FILTERED) ||
-            ((nRowFlags & CR_HIDDEN) == CR_HIDDEN) || ((nRowFlags & CR_FILTERED) == CR_FILTERED))
+        bool bColHidden = mpDoc->ColHidden(maCellAddress.Col(), maCellAddress.Tab());
+        bool bRowHidden = mpDoc->RowHidden(maCellAddress.Row(), maCellAddress.Tab());
+        bool bColFiltered = mpDoc->ColFiltered(maCellAddress.Col(), maCellAddress.Tab());
+        bool bRowFiltered = mpDoc->RowFiltered(maCellAddress.Row(), maCellAddress.Tab());
+
+        if (bColHidden || bColFiltered || bRowHidden || bRowFiltered)
             bVisible = sal_False;
     }
     return bVisible;
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index efde03901..8978bfacc 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -628,3 +628,8 @@ void ScAccessibleContextBase::IsObjectValid() const
     if (rBHelper.bDisposed || rBHelper.bInDispose)
         throw lang::DisposedException();
 }
+
+void ScAccessibleContextBase::SetRole(sal_Int16 nRole)
+{
+    maRole = nRole;
+}
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
new file mode 100644
index 000000000..8a76393bf
--- /dev/null
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -0,0 +1,402 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AccessibleDataPilotControl.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+
+#include "precompiled_sc.hxx"
+#include "AccessibleGlobal.hxx"
+#include "AccessibleFilterMenu.hxx"
+#include "AccessibleFilterMenuItem.hxx"
+#include "unoguard.hxx"
+#include "global.hxx"
+#include "document.hxx"
+#include "docpool.hxx"
+
+#include "tools/gen.hxx"
+#include "svx/unoedsrc.hxx"
+#include "svx/editdata.hxx"
+#include "svx/outliner.hxx"
+#include "svtools/itemset.hxx"
+#include "vcl/unohelp.hxx"
+#include "dpcontrol.hxx"
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::accessibility::AccessibleStateType;
+
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::UNO_QUERY;
+using ::com::sun::star::lang::IndexOutOfBoundsException;
+using ::com::sun::star::lang::IllegalArgumentException;
+using ::com::sun::star::uno::RuntimeException;
+using ::rtl::OUString;
+using ::std::for_each;
+using ::std::vector;
+
+// ============================================================================
+
+namespace {
+
+class AddRemoveEventListener : public ::std::unary_function<void, Reference<XAccessible> >
+{
+public:
+    explicit AddRemoveEventListener(const Reference<XAccessibleEventListener>& rListener, bool bAdd) : 
+        mxListener(rListener), mbAdd(bAdd) {}
+
+    void operator() (const Reference<XAccessible>& xAccessible) const
+    {
+        if (!xAccessible.is())
+            return;
+
+        Reference<XAccessibleEventBroadcaster> xBc(xAccessible, UNO_QUERY);
+        if (xBc.is())
+        {
+            if (mbAdd)
+                xBc->addEventListener(mxListener);
+            else
+                xBc->removeEventListener(mxListener);
+        }
+    }
+private:
+    Reference<XAccessibleEventListener> mxListener;
+    bool mbAdd;
+};
+
+}
+
+// ============================================================================
+
+ScAccessibleFilterMenu::ScAccessibleFilterMenu(const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos, ScDocument* pDoc) :
+    ScAccessibleContextBase(rxParent, AccessibleRole::MENU),
+    mnMenuPos(nMenuPos),
+    mpWindow(pWin),
+    mpDoc(pDoc),
+    mbEnabled(true)
+{
+    SetName(rName);
+}
+
+ScAccessibleFilterMenu::~ScAccessibleFilterMenu()
+{
+}
+
+// XAccessibleComponent
+
+Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleAtPoint( const ::com::sun::star::awt::Point& /*rPoint*/ )
+        throw (RuntimeException)
+{
+    return this;
+}
+
+sal_Bool ScAccessibleFilterMenu::isVisible() throw (RuntimeException)
+{
+    return mpWindow->IsVisible();
+}
+
+void ScAccessibleFilterMenu::grabFocus()
+    throw (RuntimeException)
+{
+}
+
+sal_Int32 ScAccessibleFilterMenu::getForeground() 
+    throw (RuntimeException)
+{
+    return 0;
+}
+
+sal_Int32 ScAccessibleFilterMenu::getBackground() 
+    throw (RuntimeException)
+{
+    return 0;
+}
+
+// XAccessibleContext
+
+OUString ScAccessibleFilterMenu::getAccessibleName() throw (RuntimeException)
+{
+    return ScAccessibleContextBase::getAccessibleName();
+}
+
+sal_Int32 ScAccessibleFilterMenu::getAccessibleChildCount() 
+    throw (RuntimeException)
+{
+    return getMenuItemCount();
+}
+
+Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nIndex) 
+    throw (RuntimeException, IndexOutOfBoundsException)
+{
+    if (maMenuItems.size() <= static_cast<size_t>(nIndex))
+        throw IndexOutOfBoundsException();
+
+    return maMenuItems[nIndex];
+}
+
+Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet() 
+    throw (RuntimeException)
+{
+    updateStates();
+    return mxStateSet;
+}
+
+OUString ScAccessibleFilterMenu::getImplementationName() 
+    throw (RuntimeException)
+{
+    return OUString::createFromAscii("ScAccessibleFilterMenu");
+}
+
+// XAccessibleEventBroadcaster
+
+void ScAccessibleFilterMenu::addEventListener(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
+    throw (com::sun::star::uno::RuntimeException)
+{
+    ScAccessibleContextBase::addEventListener(xListener);
+    for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, true));
+}
+
+void ScAccessibleFilterMenu::removeEventListener(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
+    throw (com::sun::star::uno::RuntimeException)
+{
+    ScAccessibleContextBase::removeEventListener(xListener);
+    for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, false));
+}
+
+// XAccessibleSelection
+
+void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex) 
+    throw (IndexOutOfBoundsException, RuntimeException)
+{
+    if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
+        throw IndexOutOfBoundsException();
+
+    mpWindow->setSelectedMenuItem(nChildIndex, false, true);
+}
+
+sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex) 
+    throw (IndexOutOfBoundsException, RuntimeException)
+{
+    if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
+        throw IndexOutOfBoundsException();
+
+    return mpWindow->isMenuItemSelected(static_cast<size_t>(nChildIndex));
+}
+
+void ScAccessibleFilterMenu::clearAccessibleSelection() throw (RuntimeException)
+{
+    mpWindow->clearSelectedMenuItem();
+}
+
+void ScAccessibleFilterMenu::selectAllAccessibleChildren() throw (RuntimeException)
+{
+    // not suported - this is a menu, you can't select all menu items.
+}
+
+sal_Int32 ScAccessibleFilterMenu::getSelectedAccessibleChildCount() throw (RuntimeException)
+{
+    // Since this is a menu, either one menu item is selected, or none at all.
+    return mpWindow->getSelectedMenuItem() == ScMenuFloatingWindow::MENU_NOT_SELECTED ? 0 : 1;
+}
+
+Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_Int32 nChildIndex) 
+    throw (IndexOutOfBoundsException, RuntimeException)
+{
+    if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
+        throw IndexOutOfBoundsException();
+
+    return maMenuItems[nChildIndex];
+}
+
+void ScAccessibleFilterMenu::deselectAccessibleChild(sal_Int32 nChildIndex) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
+        throw IndexOutOfBoundsException();
+
+    mpWindow->selectMenuItem(nChildIndex, false, false);
+}
+
+// XInterface
+
+uno::Any SAL_CALL ScAccessibleFilterMenu::queryInterface( uno::Type const & rType )
+	throw (RuntimeException)
+{
+	Any any = ScAccessibleContextBase::queryInterface(rType);
+    if (any.hasValue())
+        return any;
+
+    return ScAccessibleFilterMenu_BASE::queryInterface(rType);
+}
+
+void SAL_CALL ScAccessibleFilterMenu::acquire() throw ()
+{
+	ScAccessibleContextBase::acquire();
+}
+
+void SAL_CALL ScAccessibleFilterMenu::release() throw ()
+{
+	ScAccessibleContextBase::release();
+}
+
+// XTypeProvider
+
+Sequence<sal_Int8> ScAccessibleFilterMenu::getImplementationId() 
+    throw (RuntimeException)
+{
+    Sequence<sal_Int8> aId(16);
+    return aId;
+}
+
+Rectangle ScAccessibleFilterMenu::GetBoundingBoxOnScreen() const
+    throw (RuntimeException)
+{
+    if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED)
+        return Rectangle();
+    
+    // Menu object's bounding box is the bounding box of the menu item that 
+    // launches the menu, which belongs to the parent window.
+    ScMenuFloatingWindow* pParentWin = mpWindow->getParentMenuWindow();
+    if (!pParentWin)
+        return Rectangle();
+
+    if (!pParentWin->IsVisible())
+        return Rectangle();
+
+    Point aPos = pParentWin->OutputToAbsoluteScreenPixel(Point(0,0));
+    Point aMenuPos;
+    Size aMenuSize;
+    pParentWin->getMenuItemPosSize(mnMenuPos, aMenuPos, aMenuSize);
+    Rectangle aRect(aPos + aMenuPos, aMenuSize);
+    return aRect;
+}
+
+Rectangle ScAccessibleFilterMenu::GetBoundingBox() const
+    throw (RuntimeException)
+{
+    if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED)
+        return Rectangle();
+
+    // Menu object's bounding box is the bounding box of the menu item that 
+    // launches the menu, which belongs to the parent window.
+    ScMenuFloatingWindow* pParentWin = mpWindow->getParentMenuWindow();
+    if (!pParentWin)
+        return Rectangle();
+
+    if (!pParentWin->IsVisible())
+        return Rectangle();
+
+    Point aMenuPos;
+    Size aMenuSize;
+    pParentWin->getMenuItemPosSize(mnMenuPos, aMenuPos, aMenuSize);
+    Rectangle aRect(aMenuPos, aMenuSize);
+    return aRect;
+}
+
+void ScAccessibleFilterMenu::appendMenuItem(const OUString& rName, bool bEnabled, size_t nMenuPos)
+{
+    // Check weather this menu item is a sub menu or a regular menu item.
+    ScMenuFloatingWindow* pSubMenu = mpWindow->getSubMenuWindow(nMenuPos);
+    Reference<XAccessible> xAccessible;
+    if (pSubMenu)
+    {
+        xAccessible = pSubMenu->CreateAccessible();
+        ScAccessibleFilterMenu* p = 
+            static_cast<ScAccessibleFilterMenu*>(xAccessible.get());
+        p->setEnabled(bEnabled);
+        p->setMenuPos(nMenuPos);
+    }
+    else
+    {
+        xAccessible.set(new ScAccessibleFilterMenuItem(this, mpWindow, rName, nMenuPos));
+        ScAccessibleFilterMenuItem* p = 
+            static_cast<ScAccessibleFilterMenuItem*>(xAccessible.get());
+        p->setEnabled(bEnabled);
+    }
+    maMenuItems.push_back(xAccessible);
+}
+
+void ScAccessibleFilterMenu::setMenuPos(size_t nMenuPos)
+{
+    mnMenuPos = nMenuPos;
+}
+
+void ScAccessibleFilterMenu::setEnabled(bool bEnabled)
+{
+    mbEnabled = bEnabled;
+}
+
+sal_Int32 ScAccessibleFilterMenu::getMenuItemCount() const
+{
+    return maMenuItems.size();
+}
+
+bool ScAccessibleFilterMenu::isSelected() const
+{
+    // Check to see if any of the child menu items is selected.
+    return mpWindow->isMenuItemSelected(mnMenuPos);
+}
+
+bool ScAccessibleFilterMenu::isFocused() const
+{
+    return isSelected();
+}
+
+void ScAccessibleFilterMenu::updateStates()
+{
+    if (!mxStateSet.is())
+        mxStateSet.set(new ScAccessibleStateSet);
+
+    ScAccessibleStateSet* p = static_cast<ScAccessibleStateSet*>(
+        mxStateSet.get());
+
+    p->clear();
+
+    p->insert(ENABLED);
+    p->insert(FOCUSABLE);
+    p->insert(SELECTABLE);
+    p->insert(SENSITIVE);
+    p->insert(OPAQUE);
+
+    if (isFocused())
+        p->insert(FOCUSED);
+
+    if (isSelected())
+        p->insert(SELECTED);
+}
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
new file mode 100644
index 000000000..7216819db
--- /dev/null
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
@@ -0,0 +1,209 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AccessibleDataPilotControl.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+
+#include "precompiled_sc.hxx"
+#include "AccessibleGlobal.hxx"
+#include "AccessibleFilterMenuItem.hxx"
+#include "dpcontrol.hxx"
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/TextSegment.hpp>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::accessibility::AccessibleStateType;
+
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::UNO_QUERY;
+using ::com::sun::star::lang::IndexOutOfBoundsException;
+using ::com::sun::star::uno::RuntimeException;
+using ::rtl::OUString;
+
+ScAccessibleFilterMenuItem::ScAccessibleFilterMenuItem(
+    const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) :
+    ScAccessibleContextBase(rxParent, AccessibleRole::MENU_ITEM),
+    mpWindow(pWin),
+    maName(rName),
+    mnMenuPos(nMenuPos),
+    mbEnabled(true)
+{
+    SetName(rName);
+}
+
+ScAccessibleFilterMenuItem::~ScAccessibleFilterMenuItem()
+{
+}
+
+sal_Int32 ScAccessibleFilterMenuItem::getAccessibleChildCount() 
+    throw (RuntimeException)
+{
+    return 0;
+}
+
+Reference<XAccessible> ScAccessibleFilterMenuItem::getAccessibleChild(sal_Int32 /*nIndex*/) 
+    throw (RuntimeException, IndexOutOfBoundsException)
+{
+    throw IndexOutOfBoundsException();
+    return Reference<XAccessible>();
+}
+
+Reference<XAccessibleStateSet> ScAccessibleFilterMenuItem::getAccessibleStateSet() 
+    throw (RuntimeException)
+{
+    updateStateSet();
+    return mxStateSet;
+}
+
+OUString ScAccessibleFilterMenuItem::getImplementationName() 
+    throw (RuntimeException)
+{
+    return OUString::createFromAscii("ScAccessibleFilterMenuItem");
+}
+
+// XAccessibleAction
+
+sal_Int32 ScAccessibleFilterMenuItem::getAccessibleActionCount() throw (RuntimeException)
+{
+    return 1;
+}
+
+sal_Bool ScAccessibleFilterMenuItem::doAccessibleAction(sal_Int32 /*nIndex*/) 
+    throw (IndexOutOfBoundsException, RuntimeException)
+{
+    mpWindow->executeMenuItem(mnMenuPos);
+    return true;
+}
+
+OUString ScAccessibleFilterMenuItem::getAccessibleActionDescription(sal_Int32 /*nIndex*/)
+    throw (IndexOutOfBoundsException, RuntimeException)
+{
+    return OUString::createFromAscii("click");
+}
+
+Reference<XAccessibleKeyBinding> ScAccessibleFilterMenuItem::getAccessibleActionKeyBinding(
+    sal_Int32 /*nIndex*/) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    return Reference<XAccessibleKeyBinding>();
+}
+
+Any SAL_CALL ScAccessibleFilterMenuItem::queryInterface( uno::Type const & rType )
+	throw (RuntimeException)
+{
+	Any any = ScAccessibleContextBase::queryInterface(rType);
+    if (any.hasValue())
+        return any;
+
+    return ScAccessibleFilterMenuItem_BASE::queryInterface(rType);
+}
+
+void SAL_CALL ScAccessibleFilterMenuItem::acquire() throw ()
+{
+	ScAccessibleContextBase::acquire();
+}
+
+void SAL_CALL ScAccessibleFilterMenuItem::release() throw ()
+{
+	ScAccessibleContextBase::release();
+}
+
+bool ScAccessibleFilterMenuItem::isSelected() const
+{
+    return mpWindow->isMenuItemSelected(mnMenuPos);
+}
+
+bool ScAccessibleFilterMenuItem::isFocused() const
+{
+    return isSelected();
+}
+
+void ScAccessibleFilterMenuItem::setEnabled(bool bEnabled)
+{
+    mbEnabled = bEnabled;
+}
+
+Rectangle ScAccessibleFilterMenuItem::GetBoundingBoxOnScreen() const
+    throw (RuntimeException)
+{
+    if (!mpWindow->IsVisible())
+        return Rectangle();
+
+    Point aPos = mpWindow->OutputToAbsoluteScreenPixel(Point(0,0));
+    Point aMenuPos;
+    Size aMenuSize;
+    mpWindow->getMenuItemPosSize(mnMenuPos, aMenuPos, aMenuSize);
+    Rectangle aRect(aPos + aMenuPos, aMenuSize);
+    return aRect;
+}
+
+Rectangle ScAccessibleFilterMenuItem::GetBoundingBox() const
+    throw (RuntimeException)
+{
+    if (!mpWindow->IsVisible())
+        return Rectangle();
+
+    Point aMenuPos;
+    Size aMenuSize;
+    mpWindow->getMenuItemPosSize(mnMenuPos, aMenuPos, aMenuSize);
+    Rectangle aRect(aMenuPos, aMenuSize);
+    return aRect;
+}
+
+void ScAccessibleFilterMenuItem::updateStateSet()
+{
+    if (!mxStateSet.is())
+        mxStateSet.set(new ScAccessibleStateSet);
+
+    ScAccessibleStateSet* p = static_cast<ScAccessibleStateSet*>(
+        mxStateSet.get());
+
+    p->clear();
+
+    p->insert(ENABLED);
+    p->insert(FOCUSABLE);
+    p->insert(SELECTABLE);
+    p->insert(SENSITIVE);
+    p->insert(OPAQUE);
+
+    if (isFocused())
+        p->insert(FOCUSED);
+
+    if (isSelected())
+        p->insert(SELECTED);
+}
+
diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
new file mode 100644
index 000000000..e9834f8cf
--- /dev/null
+++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
@@ -0,0 +1,137 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AccessibleDataPilotControl.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+
+#include "precompiled_sc.hxx"
+#include "AccessibleFilterTopWindow.hxx"
+#include "AccessibleFilterMenu.hxx"
+#include "dpcontrol.hxx"
+
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using ::com::sun::star::lang::IndexOutOfBoundsException;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::RuntimeException;
+using ::rtl::OUString;
+
+ScAccessibleFilterTopWindow::ScAccessibleFilterTopWindow(
+    const Reference<XAccessible>& rxParent, ScDPFieldPopupWindow* pWin, const OUString& rName, ScDocument* pDoc) :
+    ScAccessibleFilterMenu(rxParent, pWin, rName, ScMenuFloatingWindow::MENU_NOT_SELECTED, pDoc),
+    mpWindow(pWin),
+    mpDoc(pDoc)
+{
+    SetName(rName);
+}
+
+ScAccessibleFilterTopWindow::~ScAccessibleFilterTopWindow()
+{
+}
+
+// XAccessibleContext
+
+sal_Int32 ScAccessibleFilterTopWindow::getAccessibleChildCount() throw (RuntimeException)
+{
+    sal_Int32 nMenuCount = getMenuItemCount();
+    return nMenuCount + 6;
+}
+
+Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild(
+    sal_Int32 nIndex) throw (RuntimeException, IndexOutOfBoundsException)
+{
+    if (nIndex >= getAccessibleChildCount())
+        throw IndexOutOfBoundsException();
+
+    sal_Int32 nMenuCount = getMenuItemCount();
+    if (nIndex < nMenuCount)
+        return ScAccessibleFilterMenu::getAccessibleChild(nIndex);
+    
+    nIndex -= nMenuCount;
+    switch (nIndex)
+    {
+        case 0:
+            return mxAccListBox;
+        case 1:
+            return mxAccToggleAll;
+        case 2:
+            return mxAccSingleOnBtn;
+        case 3:
+            return mxAccSingleOffBtn;
+        case 4:
+            return mxAccOkBtn;
+        case 5:
+            return mxAccCancelBtn;
+        default:
+            ;
+    }
+
+    return Reference<XAccessible>();
+}
+
+OUString ScAccessibleFilterTopWindow::getImplementationName() throw (RuntimeException)
+{
+    return OUString::createFromAscii("ScAccessibleFilterTopWindow");
+}
+
+Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChildMenu()
+{
+    if (!mxAccMenu.is())
+        mxAccMenu.set(new ScAccessibleFilterMenu(this, mpWindow, getAccessibleName(), ScMenuFloatingWindow::MENU_NOT_SELECTED, mpDoc));
+    return mxAccMenu;
+}
+
+void ScAccessibleFilterTopWindow::setAccessibleChild(
+    const Reference<XAccessible>& rAccessible, ChildControlType eType)
+{
+    switch (eType)
+    {
+        case LISTBOX:
+            mxAccListBox = rAccessible;
+        break;
+        case TOGGLE_ALL: 
+            mxAccToggleAll = rAccessible;
+        break;
+        case SINGLE_ON_BTN: 
+            mxAccSingleOnBtn = rAccessible;
+        break;
+        case SINGLE_OFF_BTN: 
+            mxAccSingleOffBtn = rAccessible;
+        break;
+        case OK_BTN: 
+            mxAccOkBtn = rAccessible;
+        break;
+        case CANCEL_BTN:
+            mxAccCancelBtn = rAccessible;
+        break;
+    }
+}
+
diff --git a/sc/source/ui/Accessibility/AccessibleGlobal.cxx b/sc/source/ui/Accessibility/AccessibleGlobal.cxx
new file mode 100644
index 000000000..f37bd4be3
--- /dev/null
+++ b/sc/source/ui/Accessibility/AccessibleGlobal.cxx
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AccessibleDataPilotControl.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+
+#include "precompiled_sc.hxx"
+#include "AccessibleGlobal.hxx"
+
+using ::com::sun::star::uno::RuntimeException;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::std::set;
+
+ScAccessibleStateSet::ScAccessibleStateSet()
+{
+}
+
+ScAccessibleStateSet::~ScAccessibleStateSet()
+{
+}
+
+// XAccessibleStateSet
+
+sal_Bool SAL_CALL ScAccessibleStateSet::isEmpty() throw (RuntimeException)
+{
+    return maStates.empty();
+}
+
+sal_Bool SAL_CALL ScAccessibleStateSet::contains(sal_Int16 nState) 
+    throw (RuntimeException)
+{
+    return maStates.count(nState) != 0;
+}
+
+sal_Bool SAL_CALL ScAccessibleStateSet::containsAll(
+    const Sequence<sal_Int16>& aStateSet) throw (RuntimeException)
+{
+    sal_Int32 n = aStateSet.getLength();
+    for (sal_Int32 i = 0; i < n; ++i)
+    {
+        if (!maStates.count(aStateSet[i]))
+            // This state is not set.
+            return false;
+    }
+    // All specified states are set.
+    return true;
+}
+
+Sequence<sal_Int16> SAL_CALL ScAccessibleStateSet::getStates() 
+    throw (RuntimeException)
+{
+    Sequence<sal_Int16> aSeq(0);
+    set<sal_Int16>::const_iterator itr = maStates.begin(), itrEnd = maStates.end();
+    for (size_t i = 0; itr != itrEnd; ++itr, ++i)
+    {
+        aSeq.realloc(i+1);
+        aSeq[i] = *itr;
+    }
+    return aSeq;
+}
+
+void ScAccessibleStateSet::insert(sal_Int16 nState)
+{
+    maStates.insert(nState);
+}
+
+void ScAccessibleStateSet::clear()
+{
+    maStates.clear();
+}
+
diff --git a/sc/source/ui/Accessibility/makefile.mk b/sc/source/ui/Accessibility/makefile.mk
index dfa5ac94b..294291451 100644
--- a/sc/source/ui/Accessibility/makefile.mk
+++ b/sc/source/ui/Accessibility/makefile.mk
@@ -47,12 +47,16 @@ SLOFILES =  										\
         $(SLO)$/AccessibleContextBase.obj			\
         $(SLO)$/AccessibleTableBase.obj				\
         $(SLO)$/AccessibleDocument.obj				\
+		$(SLO)$/AccessibleGlobal.obj				\
         $(SLO)$/AccessibleSpreadsheet.obj			\
         $(SLO)$/AccessibleCell.obj					\
         $(SLO)$/AccessibilityHints.obj				\
         $(SLO)$/AccessibleDocumentBase.obj			\
         $(SLO)$/AccessibleCellBase.obj				\
         $(SLO)$/AccessibleDocumentPagePreview.obj	\
+		$(SLO)$/AccessibleFilterMenu.obj	\
+		$(SLO)$/AccessibleFilterMenuItem.obj	\
+		$(SLO)$/AccessibleFilterTopWindow.obj	\
         $(SLO)$/AccessiblePreviewTable.obj			\
         $(SLO)$/AccessiblePreviewCell.obj			\
         $(SLO)$/AccessiblePreviewHeaderCell.obj		\
@@ -68,11 +72,15 @@ EXCEPTIONSFILES=									\
         $(SLO)$/AccessibleContextBase.obj			\
         $(SLO)$/AccessibleTableBase.obj				\
         $(SLO)$/AccessibleDocument.obj				\
+		$(SLO)$/AccessibleGlobal.obj				\
         $(SLO)$/AccessibleSpreadsheet.obj			\
         $(SLO)$/AccessibleCell.obj					\
         $(SLO)$/AccessibleDocumentBase.obj			\
         $(SLO)$/AccessibleCellBase.obj				\
         $(SLO)$/AccessibleDocumentPagePreview.obj	\
+		$(SLO)$/AccessibleFilterMenu.obj	\
+		$(SLO)$/AccessibleFilterMenuItem.obj	\
+		$(SLO)$/AccessibleFilterTopWindow.obj	\
         $(SLO)$/AccessiblePreviewTable.obj			\
         $(SLO)$/AccessiblePreviewCell.obj			\
         $(SLO)$/AccessiblePreviewHeaderCell.obj		\
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index fc87ac9a6..3cac6f405 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2055,7 +2055,7 @@ IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG )
 
 BOOL ScInputHandler::DataChanging( sal_Unicode cTyped, BOOL bFromCommand )		// return TRUE = new view created
 {
-	pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE );
+    pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE );
     bInOwnChange = TRUE;				// disable ModifyHdl (reset in DataChanged)
 
     if ( eMode == SC_INPUT_NONE )
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 80625f0ad..754e1109e 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -294,7 +294,7 @@ sal_Bool ScInputWindow::UseSubTotal(ScRangeList* pRangeList) const
                     SCROW nRow(pRange->aStart.Row());
                     while (!bSubTotal && nRow <= nRowEnd)
                     {
-                        if (pDoc->IsFiltered(nRow, nTab))
+                        if (pDoc->RowFiltered(nRow, nTab))
                             bSubTotal = sal_True;
                         else
                             ++nRow;
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index b35d177c3..87f888c90 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -605,25 +605,24 @@ void ScTransferObj::InitDocShell()
         //	widths / heights
         //	(must be copied before CopyFromClip, for drawing objects)
 
-        SCCOL nCol;
+		SCCOL nCol, nLastCol;
         SCROW nRow;
         SCTAB nSrcTab = aBlock.aStart.Tab();
         pDestDoc->SetLayoutRTL(0, pDoc->IsLayoutRTL(nSrcTab));
         for (nCol=nStartX; nCol<=nEndX; nCol++)
-            if ( pDoc->GetColFlags( nCol, nSrcTab ) & CR_HIDDEN )
+			if ( pDoc->ColHidden(nCol, nSrcTab, nLastCol) )
                 pDestDoc->ShowCol( nCol, 0, FALSE );
             else
                 pDestDoc->SetColWidth( nCol, 0, pDoc->GetColWidth( nCol, nSrcTab ) );
 
         ScBitMaskCompressedArray< SCROW, BYTE> & rDestRowFlags =
             pDestDoc->GetRowFlagsArrayModifiable(0);
-        ScCompressedArrayIterator< SCROW, BYTE> aIter( pDoc->GetRowFlagsArray(
-                    nSrcTab), nStartY, nEndY);
-        for ( ; aIter; ++aIter )
+
+		for (SCROW nRow = nStartY; nRow <= nEndY; ++nRow)
         {
-            nRow = aIter.GetPos();
-            BYTE nSourceFlags = *aIter;
-            if ( nSourceFlags & CR_HIDDEN )
+            BYTE nSourceFlags = pDoc->GetRowFlags(nRow, nSrcTab);
+            SCROW nLastRow = -1;
+            if ( pDoc->RowHidden(nRow, nSrcTab, nLastRow) )
                 pDestDoc->ShowRow( nRow, 0, FALSE );
             else
             {
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 4ce0f2dc4..26fe4bebe 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -65,6 +65,7 @@
 #include "scendlg.hxx" //add for ScNewScenarioDlg
 #include "shtabdlg.hxx" //add for ScShowTabDlg
 #include "strindlg.hxx" //add for ScStringInputDlg
+#include "tabbgcolordlg.hxx"//add for ScTabBgColorDlg
 #include "scuiimoptdlg.hxx" //add for ScImportOptionsDlg
 #include "attrdlg.hxx" //add for ScAttrDlg
 #include "hfedtdlg.hxx" //add for ScHFEditDlg
@@ -74,7 +75,7 @@
 #include "validate.hxx" //add for ScValidationDlg
 #include "validate.hrc" //add for ScValidationDlg
 #include "sortdlg.hxx" //add for ScSortDlg
-#include "langchooser.hxx"
+#include "textimportoptions.hxx"
 #include "opredlin.hxx" //add for  ScRedlineOptionsTabPage
 #include "tpcalc.hxx" //add for ScTpCalcOptions
 #include "tpprint.hxx" //add for ScTpPrintOptions
@@ -120,8 +121,9 @@ IMPL_ABSTDLG_BASE(AbstractScDPShowDetailDlg_Impl); //add for ScDPShowDetailDlg
 IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl); //add for ScNewScenarioDlg
 IMPL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl); //add for ScShowTabDlg
 IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl); //add for ScStringInputDlg
+IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl); //add for ScTabBgColorDlg
 IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl); //add for ScImportOptionsDlg
-IMPL_ABSTDLG_BASE(AbstractScLangChooserDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
 
 // AbstractTabDialog_Impl begin
@@ -621,6 +623,14 @@ void AbstractScStringInputDlg_Impl::GetInputString( String& rString ) const  //a
 }
 //add for AbstractScStringInputDlg_Impl end
 
+//add for AbstractScTabBgColorDlg_Impl begin
+void AbstractScTabBgColorDlg_Impl::GetSelectedColor( Color& rColor ) const  //add for ScTabBgColorDlg
+{
+    pDlg->GetSelectedColor( rColor );
+}
+//add for AbstractScTabBgColorDlg_Impl end
+
+
 //add for AbstractScImportOptionsDlg_Impl begin
 void AbstractScImportOptionsDlg_Impl::GetImportOptions( ScImportOptions& rOptions ) const  //add for ScImportOptionsDlg
 {
@@ -629,12 +639,12 @@ void AbstractScImportOptionsDlg_Impl::GetImportOptions( ScImportOptions& rOption
 // add for AbstractScImportOptionsDlg_Impl end
 
 //add for AbstractScLangChooserDlg_Impl begin
-LanguageType AbstractScLangChooserDlg_Impl::GetLanguageType() const
+LanguageType AbstractScTextImportOptionsDlg_Impl::GetLanguageType() const
 {
     return pDlg->getLanguageType();
 }
 
-bool AbstractScLangChooserDlg_Impl::IsDateConversionSet() const
+bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
 {
     return pDlg->isDateConversionSet();
 }
@@ -663,19 +673,19 @@ AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg
 }
 // ScImportAsciiDlg end
 
-AbstractScLangChooserDlg * ScAbstractDialogFactory_Impl::CreateScLangChooserDlg( Window* pParent, int nId )
+AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg( Window* pParent, int nId )
 {
-    ScLangChooserDlg* pDlg = NULL;
+    ScTextImportOptionsDlg* pDlg = NULL;
     switch (nId)
     {
-        case RID_SCDLG_LANG_CHOOSER:
-            pDlg = new ScLangChooserDlg(pParent);
+        case RID_SCDLG_TEXT_IMPORT_OPTIONS:
+            pDlg = new ScTextImportOptionsDlg(pParent);
         break;
         default:
             ;
     }
 
-    return pDlg ? new AbstractScLangChooserDlg_Impl(pDlg) : NULL;
+    return pDlg ? new AbstractScTextImportOptionsDlg_Impl(pDlg) : NULL;
 }
 
 //add for ScAutoFormatDlg begin
@@ -1316,6 +1326,31 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window
 }
  //add for ScStringInputDlg end
 
+//add for ScTabBgColorDlg begin
+AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg (
+                                                            Window* pParent,
+                                                            const String& rTitle,
+                                                            const String& rTabBgColorNoColorText,
+                                                            const Color& rDefaultColor,
+                                                            ULONG nHelpId ,
+                                                            int nId )
+{
+ScTabBgColorDlg * pDlg=NULL;
+switch ( nId )
+{
+    case RID_SCDLG_TAB_BG_COLOR :
+        pDlg = new ScTabBgColorDlg( pParent, rTitle, rTabBgColorNoColorText, rDefaultColor, nHelpId );
+        break;
+    default:
+        break;
+}
+
+if ( pDlg )
+    return new AbstractScTabBgColorDlg_Impl( pDlg );
+return 0;
+}
+//add for ScTabBgColorDlg end
+
 //add for ScImportOptionsDlg begin
 AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* 				pParent,
                                                                     int nId,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index e6a0fb4b2..611a10701 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -62,10 +62,11 @@ class ScDPShowDetailDlg;
 class ScNewScenarioDlg;
 class ScShowTabDlg;
 class ScStringInputDlg;
+class ScTabBgColorDlg;
 class ScImportOptionsDlg;
 class SfxTabDialog;
 class ScSortWarningDlg;
-class ScLangChooserDlg;
+class ScTextImportOptionsDlg;
 
 #define DECL_ABSTDLG_BASE(Class,DialogClass)		\
     DialogClass* 		pDlg;                   	\
@@ -345,15 +346,21 @@ class AbstractScStringInputDlg_Impl :  public AbstractScStringInputDlg  //add fo
     virtual void GetInputString( String& rString ) const;
 };
 
+class AbstractScTabBgColorDlg_Impl :  public AbstractScTabBgColorDlg  //add for ScTabBgColorDlg
+{
+    DECL_ABSTDLG_BASE( AbstractScTabBgColorDlg_Impl, ScTabBgColorDlg )
+    virtual void GetSelectedColor( Color& rColor ) const;
+};
+
 class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg  //add for ScImportOptionsDlg
 {
     DECL_ABSTDLG_BASE( AbstractScImportOptionsDlg_Impl, ScImportOptionsDlg)
     virtual void GetImportOptions( ScImportOptions& rOptions ) const;
 };
 
-class AbstractScLangChooserDlg_Impl : public AbstractScLangChooserDlg
+class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDlg
 {
-    DECL_ABSTDLG_BASE( AbstractScLangChooserDlg_Impl, ScLangChooserDlg)
+    DECL_ABSTDLG_BASE( AbstractScTextImportOptionsDlg_Impl, ScTextImportOptionsDlg)
     virtual LanguageType GetLanguageType() const;
     virtual bool IsDateConversionSet() const;
 };
@@ -399,7 +406,7 @@ public:
                                                                     SvStream* pInStream, int nId,
                                                                     sal_Unicode cSep = '\t');
 
-    virtual AbstractScLangChooserDlg * CreateScLangChooserDlg( Window* pParent, int nId );
+    virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId );
 
     virtual		AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window*					pParent, //add for ScAutoFormatDlg
                                                                 ScAutoFormat*				pAutoFormat,
@@ -531,6 +538,14 @@ public:
                                                                 const String& rDefault,
                                                                 ULONG nHelpId ,
                                                                 int nId );
+
+    virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg (  Window* pParent, //add for ScStringInputDlg
+                                                                const String& rTitle, //Dialog Title
+                                                                const String& rTabBgColorNoColorText, //Label for no tab color
+                                                                const Color& rDefaultColor, //Currently selected Color
+                                                                ULONG nHelpId ,
+                                                                int nId );
+
     virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* 				pParent, //add for ScImportOptionsDlg
                                                                     int nId,
                                                                     BOOL                    bAscii = TRUE,
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 02fb0b9ec..2f09c8819 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -34,25 +34,47 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "dpcontrol.hxx"
+#include "dpcontrol.hrc"
 
 #include "vcl/outdev.hxx"
 #include "vcl/settings.hxx"
 #include "vcl/wintypes.hxx"
 #include "vcl/decoview.hxx"
+#include "strload.hxx"
+#include "global.hxx"
 
-#define MENU_NOT_SELECTED 999
+#include "AccessibleFilterMenu.hxx"
+#include "AccessibleFilterTopWindow.hxx"
 
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::accessibility::XAccessible;
+using ::com::sun::star::accessibility::XAccessibleContext;
 using ::rtl::OUString;
 using ::rtl::OUStringHash;
 using ::std::vector;
 using ::std::hash_map;
+using ::std::auto_ptr;
 
-ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle) :
+ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX, const Fraction* pZoomY) :
     mpOutDev(pOutDev),
     mpStyle(pStyle),
+    mbBaseButton(true),
     mbPopupButton(false),
-    mbHasHiddenMember(false)
+    mbHasHiddenMember(false),
+    mbPopupPressed(false)
 {
+    if (pZoomX)
+        maZoomX = *pZoomX;
+    else
+        maZoomX = Fraction(1, 1);
+
+    if (pZoomY)
+        maZoomY = *pZoomY;
+    else
+        maZoomY = Fraction(1, 1);
 }
 
 ScDPFieldButton::~ScDPFieldButton()
@@ -70,6 +92,11 @@ void ScDPFieldButton::setBoundingBox(const Point& rPos, const Size& rSize)
     maSize = rSize;
 }
 
+void ScDPFieldButton::setDrawBaseButton(bool b)
+{
+    mbBaseButton = b;
+}
+
 void ScDPFieldButton::setDrawPopupButton(bool b)
 {
     mbPopupButton = b;
@@ -80,48 +107,62 @@ void ScDPFieldButton::setHasHiddenMember(bool b)
     mbHasHiddenMember = b;
 }
 
+void ScDPFieldButton::setPopupPressed(bool b)
+{
+    mbPopupPressed = b;
+}
+
 void ScDPFieldButton::draw()
 {
     const long nMargin = 2;
+    bool bOldMapEnablaed = mpOutDev->IsMapModeEnabled();
+    mpOutDev->EnableMapMode(false);
     
-    // Background
-    Rectangle aRect(maPos, maSize);
-    mpOutDev->SetLineColor(mpStyle->GetFaceColor());
-    mpOutDev->SetFillColor(mpStyle->GetFaceColor());
-    mpOutDev->DrawRect(aRect);
-
-    // Border lines
-    mpOutDev->SetLineColor(mpStyle->GetLightColor());
-    mpOutDev->DrawLine(Point(maPos), Point(maPos.X(), maPos.Y()+maSize.Height()-1));
-    mpOutDev->DrawLine(Point(maPos), Point(maPos.X()+maSize.Width()-1, maPos.Y()));
-
-    mpOutDev->SetLineColor(mpStyle->GetShadowColor());
-    mpOutDev->DrawLine(Point(maPos.X(), maPos.Y()+maSize.Height()-1),
-                       Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
-    mpOutDev->DrawLine(Point(maPos.X()+maSize.Width()-1, maPos.Y()),
-                       Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
-
-    // Field name
-    Font aTextFont( mpStyle->GetLabelFont() );
-    aTextFont.SetHeight(12);
-    mpOutDev->SetFont(aTextFont);
-
-    Point aTextPos = maPos;
-    long nTHeight = mpOutDev->GetTextHeight();
-    aTextPos.setX(maPos.getX() + nMargin);
-    aTextPos.setY(maPos.getY() + (maSize.Height()-nTHeight)/2);
-    mpOutDev->DrawText(aTextPos, maText);
+    if (mbBaseButton)
+    {
+        // Background
+        Rectangle aRect(maPos, maSize);
+        mpOutDev->SetLineColor(mpStyle->GetFaceColor());
+        mpOutDev->SetFillColor(mpStyle->GetFaceColor());
+        mpOutDev->DrawRect(aRect);
+    
+        // Border lines
+        mpOutDev->SetLineColor(mpStyle->GetLightColor());
+        mpOutDev->DrawLine(Point(maPos), Point(maPos.X(), maPos.Y()+maSize.Height()-1));
+        mpOutDev->DrawLine(Point(maPos), Point(maPos.X()+maSize.Width()-1, maPos.Y()));
+    
+        mpOutDev->SetLineColor(mpStyle->GetShadowColor());
+        mpOutDev->DrawLine(Point(maPos.X(), maPos.Y()+maSize.Height()-1),
+                           Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
+        mpOutDev->DrawLine(Point(maPos.X()+maSize.Width()-1, maPos.Y()),
+                           Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
+    
+        // Field name.
+        Font aTextFont( mpStyle->GetLabelFont() );
+        double fFontHeight = 12.0;
+        fFontHeight *= static_cast<double>(maZoomY.GetNumerator()) / static_cast<double>(maZoomY.GetDenominator());
+        aTextFont.SetHeight(fFontHeight);
+        mpOutDev->SetFont(aTextFont);
+    
+        Point aTextPos = maPos;
+        long nTHeight = static_cast<long>(fFontHeight);
+        aTextPos.setX(maPos.getX() + nMargin);
+        aTextPos.setY(maPos.getY() + (maSize.Height()-nTHeight)/2);
+        mpOutDev->DrawText(aTextPos, maText);
+    }
 
     if (mbPopupButton)
         drawPopupButton();
+
+    mpOutDev->EnableMapMode(bOldMapEnablaed);
 }
 
 void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const
 {
     long nW = maSize.getWidth()*0.5;
     long nH = maSize.getHeight();
-    if (nW > 16) 
-        nW = 16;
+    if (nW > 18) 
+        nW = 18;
     if (nH > 18)
         nH = 18;
 
@@ -142,16 +183,24 @@ void ScDPFieldButton::drawPopupButton()
     Size aSize;
     getPopupBoundingBox(aPos, aSize);
 
-    // border lines
-    mpOutDev->SetLineColor(mpStyle->GetLightColor());
-    mpOutDev->DrawLine(aPos, Point(aPos.X(), aPos.Y()+aSize.Height()-1));
-    mpOutDev->DrawLine(aPos, Point(aPos.X()+aSize.Width()-1, aPos.Y()));
+    // Background & outer black border
+    mpOutDev->SetLineColor(COL_BLACK);
+    mpOutDev->SetFillColor(mpStyle->GetFaceColor());
+    mpOutDev->DrawRect(Rectangle(aPos, aSize));
 
-    mpOutDev->SetLineColor(mpStyle->GetShadowColor());
-    mpOutDev->DrawLine(Point(aPos.X(), aPos.Y()+aSize.Height()-1),
-                       Point(aPos.X()+aSize.Width()-1, aPos.Y()+aSize.Height()-1));
-    mpOutDev->DrawLine(Point(aPos.X()+aSize.Width()-1, aPos.Y()),
-                       Point(aPos.X()+aSize.Width()-1, aPos.Y()+aSize.Height()-1));
+    if (!mbPopupPressed)
+    {    
+        // border lines
+        mpOutDev->SetLineColor(mpStyle->GetLightColor());
+        mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+1), Point(aPos.X()+1, aPos.Y()+aSize.Height()-2));
+        mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+1), Point(aPos.X()+aSize.Width()-2, aPos.Y()+1));
+    
+        mpOutDev->SetLineColor(mpStyle->GetShadowColor());
+        mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+aSize.Height()-2),
+                           Point(aPos.X()+aSize.Width()-2, aPos.Y()+aSize.Height()-2));
+        mpOutDev->DrawLine(Point(aPos.X()+aSize.Width()-2, aPos.Y()+1),
+                           Point(aPos.X()+aSize.Width()-2, aPos.Y()+aSize.Height()-2));
+    }
 
     // the arrowhead
     Color aArrowColor = mbHasHiddenMember ? mpStyle->GetHighlightLinkColor() : mpStyle->GetButtonTextColor();
@@ -164,6 +213,14 @@ void ScDPFieldButton::drawPopupButton()
     aPos1.Y() = aCenter.Y() - 3;
     aPos2.Y() = aCenter.Y() - 3;
 
+    if (mbPopupPressed)
+    {
+        aPos1.X() += 1;
+        aPos2.X() += 1;
+        aPos1.Y() += 1;
+        aPos2.Y() += 1;
+    }
+
     do
     {
         ++aPos1.X();
@@ -178,6 +235,11 @@ void ScDPFieldButton::drawPopupButton()
     {
         // tiny little box to display in presence of hidden member(s).
         Point aBoxPos(aPos.X() + aSize.Width() - 5, aPos.Y() + aSize.Height() - 5);
+        if (mbPopupPressed)
+        {
+            aBoxPos.X() += 1;
+            aBoxPos.Y() += 1;
+        }
         Size aBoxSize(3, 3);
         mpOutDev->DrawRect(Rectangle(aBoxPos, aBoxSize));
     }
@@ -185,7 +247,7 @@ void ScDPFieldButton::drawPopupButton()
 
 // ============================================================================
 
-ScMenuFloatingWindow::MenuItem::MenuItem() :
+ScMenuFloatingWindow::MenuItemData::MenuItemData() :
     mbEnabled(true),
     mpAction(static_cast<ScDPFieldPopupWindow::Action*>(NULL)),
     mpSubMenuWin(static_cast<ScMenuFloatingWindow*>(NULL))
@@ -194,23 +256,23 @@ ScMenuFloatingWindow::MenuItem::MenuItem() :
 
 // ----------------------------------------------------------------------------
 
-ScMenuFloatingWindow::SubMenuItem::SubMenuItem(ScMenuFloatingWindow* pParent) :
+ScMenuFloatingWindow::SubMenuItemData::SubMenuItemData(ScMenuFloatingWindow* pParent) :
     mpSubMenu(NULL),
     mnMenuPos(MENU_NOT_SELECTED),
     mpParent(pParent)
 {
-    maTimer.SetTimeoutHdl( LINK(this, ScMenuFloatingWindow::SubMenuItem, TimeoutHdl) );
+    maTimer.SetTimeoutHdl( LINK(this, ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) );
     maTimer.SetTimeout(mpParent->GetSettings().GetMouseSettings().GetMenuDelay());
 }
 
-void ScMenuFloatingWindow::SubMenuItem::reset()
+void ScMenuFloatingWindow::SubMenuItemData::reset()
 {
     mpSubMenu = NULL;
     mnMenuPos = MENU_NOT_SELECTED;
     maTimer.Stop();
 }
 
-IMPL_LINK( ScMenuFloatingWindow::SubMenuItem, TimeoutHdl, void*, EMPTYARG )
+IMPL_LINK( ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, void*, EMPTYARG )
 {
     mpParent->handleMenuTimeout(this);
     return 0;
@@ -218,16 +280,21 @@ IMPL_LINK( ScMenuFloatingWindow::SubMenuItem, TimeoutHdl, void*, EMPTYARG )
 
 // ----------------------------------------------------------------------------
 
-ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent) :
-    FloatingWindow(pParent, (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER)),
+size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999;
+
+ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, USHORT nMenuStackLevel) :
+    PopupMenuFloatingWindow(pParent),
     maOpenTimer(this),
     maCloseTimer(this),
+    maName(OUString::createFromAscii("ScMenuFloatingWindow")),
     mnSelectedMenu(MENU_NOT_SELECTED),
     mnClickedMenu(MENU_NOT_SELECTED),
+    mpDoc(pDoc),
     mpParentMenu(dynamic_cast<ScMenuFloatingWindow*>(pParent)),
-    mpActiveSubMenu(NULL),
-    mbActionFired(false)
+    mpActiveSubMenu(NULL)
 {
+    SetMenuStackLevel(nMenuStackLevel);
+
     // TODO: How do we get the right font to use here ?
     const sal_uInt16 nPopupFontHeight = 12;
     const StyleSettings& rStyle = GetSettings().GetStyleSettings();
@@ -235,7 +302,8 @@ ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent) :
     maLabelFont.SetHeight(nPopupFontHeight);
     SetFont(maLabelFont);
 
-    SetPopupModeEndHdl( LINK(this, ScMenuFloatingWindow, EndPopupHdl) );
+    SetText(OUString::createFromAscii("ScMenuFloatingWindow"));
+    SetPopupModeEndHdl( LINK(this, ScMenuFloatingWindow, PopupEndHdl) );
 }
 
 ScMenuFloatingWindow::~ScMenuFloatingWindow()
@@ -247,7 +315,7 @@ void ScMenuFloatingWindow::MouseMove(const MouseEvent& rMEvt)
 {
     const Point& rPos = rMEvt.GetPosPixel();
     size_t nSelectedMenu = getEnclosingMenuItem(rPos);
-    setSelectedMenuItem(nSelectedMenu);
+    setSelectedMenuItem(nSelectedMenu, true, false);
 
     Window::MouseMove(rMEvt);
 }
@@ -261,7 +329,7 @@ void ScMenuFloatingWindow::MouseButtonDown(const MouseEvent& rMEvt)
 
 void ScMenuFloatingWindow::MouseButtonUp(const MouseEvent& rMEvt)
 {
-    executeMenu(mnClickedMenu);
+    executeMenuItem(mnClickedMenu);
     mnClickedMenu = MENU_NOT_SELECTED;
     Window::MouseButtonUp(rMEvt);
 }
@@ -279,25 +347,25 @@ void ScMenuFloatingWindow::KeyInput(const KeyEvent& rKEvt)
                 nSelectedMenu = nLastMenuPos;
             else
                 --nSelectedMenu;
-            setSelectedMenuItem(nSelectedMenu, false);
+            setSelectedMenuItem(nSelectedMenu, false, false);
         break;
         case KEY_DOWN:
             if (nSelectedMenu == MENU_NOT_SELECTED || nSelectedMenu == nLastMenuPos)
                 nSelectedMenu = 0;
             else
                 ++nSelectedMenu;
-            setSelectedMenuItem(nSelectedMenu, false);
+            setSelectedMenuItem(nSelectedMenu, false, false);
         break;
         case KEY_LEFT:
             if (mpParentMenu)
-                mpParentMenu->endSubMenu();
+                mpParentMenu->endSubMenu(this);
         break;
         case KEY_RIGHT:
         {
             if (mnSelectedMenu >= maMenuItems.size() || mnSelectedMenu == MENU_NOT_SELECTED)
                 break;
 
-            const MenuItem& rMenu = maMenuItems[mnSelectedMenu];
+            const MenuItemData& rMenu = maMenuItems[mnSelectedMenu];
             if (!rMenu.mbEnabled || !rMenu.mpSubMenuWin)
                 break;
 
@@ -308,7 +376,7 @@ void ScMenuFloatingWindow::KeyInput(const KeyEvent& rKEvt)
         break;
         case KEY_RETURN:
             if (nSelectedMenu != MENU_NOT_SELECTED)
-                executeMenu(nSelectedMenu);
+                executeMenuItem(nSelectedMenu);
         break;
         default:
             bHandled = false;
@@ -350,9 +418,31 @@ void ScMenuFloatingWindow::Paint(const Rectangle& /*rRect*/)
     drawAllMenuItems();
 }
 
+Reference<XAccessible> ScMenuFloatingWindow::CreateAccessible()
+{
+    if (!mxAccessible.is())
+    {    
+        Reference<XAccessible> xAccParent = mpParentMenu ? 
+            mpParentMenu->GetAccessible() : GetAccessibleParentWindow()->GetAccessible();
+
+        mxAccessible.set(new ScAccessibleFilterMenu(xAccParent, this, maName, 999, getDoc()));
+        ScAccessibleFilterMenu* p = static_cast<ScAccessibleFilterMenu*>(
+            mxAccessible.get());
+        
+        vector<MenuItemData>::const_iterator itr, itrBeg = maMenuItems.begin(), itrEnd = maMenuItems.end();
+        for (itr = itrBeg; itr != itrEnd; ++itr)
+        {
+            size_t nPos = ::std::distance(itrBeg, itr);
+            p->appendMenuItem(itr->maText, itr->mbEnabled, nPos);
+        }
+    }
+
+    return mxAccessible;
+}
+
 void ScMenuFloatingWindow::addMenuItem(const OUString& rText, bool bEnabled, Action* pAction)
 {
-    MenuItem aItem;
+    MenuItemData aItem;
     aItem.maText = rText;
     aItem.mbEnabled = bEnabled;
     aItem.mpAction.reset(pAction);
@@ -361,10 +451,11 @@ void ScMenuFloatingWindow::addMenuItem(const OUString& rText, bool bEnabled, Act
 
 ScMenuFloatingWindow* ScMenuFloatingWindow::addSubMenuItem(const OUString& rText, bool bEnabled)
 {
-    MenuItem aItem;
+    MenuItemData aItem;
     aItem.maText = rText;
     aItem.mbEnabled = bEnabled;
-    aItem.mpSubMenuWin.reset(new ScMenuFloatingWindow(this));
+    aItem.mpSubMenuWin.reset(new ScMenuFloatingWindow(this, mpDoc, GetMenuStackLevel()+1));
+    aItem.mpSubMenuWin->setName(rText);
     maMenuItems.push_back(aItem);
     return aItem.mpSubMenuWin.get();
 }
@@ -376,7 +467,7 @@ void ScMenuFloatingWindow::drawMenuItem(size_t nPos)
 
     Point aPos;
     Size aSize;
-    getMenuItemPosSize(aPos, aSize, nPos);
+    getMenuItemPosSize(nPos, aPos, aSize);
 
     DecorationView aDecoView(this);
     long nXOffset = 5;
@@ -408,7 +499,7 @@ const Font& ScMenuFloatingWindow::getLabelFont() const
     return maLabelFont;
 }
 
-void ScMenuFloatingWindow::executeMenu(size_t nPos)
+void ScMenuFloatingWindow::executeMenuItem(size_t nPos)
 {
     if (nPos >= maMenuItems.size())
         return;
@@ -418,18 +509,37 @@ void ScMenuFloatingWindow::executeMenu(size_t nPos)
         return;
 
     maMenuItems[nPos].mpAction->execute();
-    mbActionFired = true;
-    EndPopupMode();
+    terminateAllPopupMenus();
 }
 
-void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer)
+void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, bool bEnsureSubMenu)
 {
-    if (mnSelectedMenu != nPos)
+    if (mnSelectedMenu == nPos)
+        // nothing to do.
+        return;
+
+    if (bEnsureSubMenu)
     {
-        selectMenuItem(mnSelectedMenu, false, bSubMenuTimer);
-        selectMenuItem(nPos, true, bSubMenuTimer);
-        mnSelectedMenu = nPos;
+        // Dismiss any child popup menu windows.
+        if (mnSelectedMenu < maMenuItems.size() && 
+            maMenuItems[mnSelectedMenu].mpSubMenuWin && 
+            maMenuItems[mnSelectedMenu].mpSubMenuWin->IsVisible())
+        {    
+            maMenuItems[mnSelectedMenu].mpSubMenuWin->ensureSubMenuNotVisible();
+        }
+
+        // The popup is not visible, yet a menu item is selected.  The request
+        // most likely comes from the accessible object.  Make sure this
+        // window, as well as all its parent windows are visible.
+        if (!IsVisible() && mpParentMenu)
+            mpParentMenu->ensureSubMenuVisible(this);
     }
+
+    selectMenuItem(mnSelectedMenu, false, bSubMenuTimer);
+    selectMenuItem(nPos, true, bSubMenuTimer);
+    mnSelectedMenu = nPos;
+
+    fireMenuHighlightedEvent();
 }
 
 size_t ScMenuFloatingWindow::getSelectedMenuItem() const
@@ -437,7 +547,7 @@ size_t ScMenuFloatingWindow::getSelectedMenuItem() const
     return mnSelectedMenu;
 }
 
-void ScMenuFloatingWindow::handleMenuTimeout(SubMenuItem* pTimer)
+void ScMenuFloatingWindow::handleMenuTimeout(SubMenuItemData* pTimer)
 {
     if (pTimer == &maOpenTimer)
     {
@@ -509,7 +619,7 @@ void ScMenuFloatingWindow::launchSubMenu(bool bSetMenuPos)
 {
     Point aPos;
     Size aSize;
-    getMenuItemPosSize(aPos, aSize, maOpenTimer.mnMenuPos);
+    getMenuItemPosSize(maOpenTimer.mnMenuPos, aPos, aSize);
     ScMenuFloatingWindow* pSubMenu = maOpenTimer.mpSubMenu;
 
     if (!pSubMenu)
@@ -517,45 +627,45 @@ void ScMenuFloatingWindow::launchSubMenu(bool bSetMenuPos)
 
     sal_uInt32 nOldFlags = GetPopupModeFlags();
     SetPopupModeFlags(nOldFlags | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE);
-    pSubMenu->resetMenu(bSetMenuPos);
+    pSubMenu->resizeToFitMenuItems(); // set the size before launching the popup to get it positioned correctly.
     pSubMenu->StartPopupMode(
         Rectangle(aPos,aSize), (FLOATWIN_POPUPMODE_RIGHT | FLOATWIN_POPUPMODE_GRABFOCUS));
     pSubMenu->AddPopupModeWindow(this);
+    if (bSetMenuPos)
+        pSubMenu->setSelectedMenuItem(0, false, false); // select menu item after the popup becomes fully visible.
     SetPopupModeFlags(nOldFlags);
 }
 
-void ScMenuFloatingWindow::endSubMenu()
+void ScMenuFloatingWindow::endSubMenu(ScMenuFloatingWindow* pSubMenu)
 {
-    if (maOpenTimer.mpSubMenu)
-    {
-        maOpenTimer.mpSubMenu->EndPopupMode();
-        maOpenTimer.mpSubMenu = NULL;
-        highlightMenuItem(maOpenTimer.mnMenuPos, true);
+    if (!pSubMenu)
+        return;
+
+    pSubMenu->EndPopupMode();
+    maOpenTimer.reset();
+
+    size_t nMenuPos = getSubMenuPos(pSubMenu);
+    if (nMenuPos != MENU_NOT_SELECTED)
+    {    
+        highlightMenuItem(nMenuPos, true);
+        mnSelectedMenu = nMenuPos;
+        fireMenuHighlightedEvent();
     }
 }
 
-void ScMenuFloatingWindow::notify(NotificationType eType)
+void ScMenuFloatingWindow::fillMenuItemsToAccessible(ScAccessibleFilterMenu* pAccMenu) const
 {
-    switch (eType)
+    vector<MenuItemData>::const_iterator itr, itrBeg = maMenuItems.begin(), itrEnd = maMenuItems.end();
+    for (itr = itrBeg; itr != itrEnd; ++itr)
     {
-        case SUBMENU_FOCUSED:
-            // Cancel any request for ending submenu.
-            maCloseTimer.reset();
-            if (mnSelectedMenu != maOpenTimer.mnMenuPos)
-            {
-                highlightMenuItem(maOpenTimer.mnMenuPos, true);
-                mnSelectedMenu = maOpenTimer.mnMenuPos;
-            }
-        break;
-        default:
-            ;
+        size_t nPos = ::std::distance(itrBeg, itr);
+        pAccMenu->appendMenuItem(itr->maText, itr->mbEnabled, nPos);
     }
 }
 
-void ScMenuFloatingWindow::resetMenu(bool bSetMenuPos)
+ScDocument* ScMenuFloatingWindow::getDoc()
 {
-    mnSelectedMenu = bSetMenuPos ? 0 : MENU_NOT_SELECTED;
-    resizeToFitMenuItems();
+    return mpDoc;
 }
 
 void ScMenuFloatingWindow::resizeToFitMenuItems()
@@ -563,7 +673,7 @@ void ScMenuFloatingWindow::resizeToFitMenuItems()
     if (maMenuItems.empty())
         return;
 
-    vector<MenuItem>::const_iterator itr = maMenuItems.begin(), itrEnd = maMenuItems.end();
+    vector<MenuItemData>::const_iterator itr = maMenuItems.begin(), itrEnd = maMenuItems.end();
     long nTextWidth = 0;
     for (; itr != itrEnd; ++itr)
         nTextWidth = ::std::max(GetTextWidth(itr->maText), nTextWidth);
@@ -571,7 +681,7 @@ void ScMenuFloatingWindow::resizeToFitMenuItems()
     size_t nLastPos = maMenuItems.size()-1;
     Point aPos;
     Size aSize;
-    getMenuItemPosSize(aPos, aSize, nLastPos);
+    getMenuItemPosSize(nLastPos, aPos, aSize);
     aPos.X() += nTextWidth + 15;
     aPos.Y() += aSize.Height() + 5;
     SetOutputSizePixel(Size(aPos.X(), aPos.Y()));
@@ -596,7 +706,7 @@ void ScMenuFloatingWindow::selectMenuItem(size_t nPos, bool bSelected, bool bSub
     if (bSelected)
     {
         if (mpParentMenu)
-            mpParentMenu->notify(SUBMENU_FOCUSED);
+            mpParentMenu->setSubMenuFocused(this);
 
         if (bSubMenuTimer)
         {
@@ -611,8 +721,61 @@ void ScMenuFloatingWindow::selectMenuItem(size_t nPos, bool bSelected, bool bSub
     }
 }
 
+void ScMenuFloatingWindow::clearSelectedMenuItem()
+{
+    selectMenuItem(mnSelectedMenu, false, false);
+    mnSelectedMenu = MENU_NOT_SELECTED;
+}
+
+ScMenuFloatingWindow* ScMenuFloatingWindow::getSubMenuWindow(size_t nPos) const
+{
+    if (maMenuItems.size() <= nPos)
+        return NULL;
+
+    return maMenuItems[nPos].mpSubMenuWin.get();
+}
+
+size_t ScMenuFloatingWindow::getMenuItemCount() const
+{
+    return maMenuItems.size();
+}
+
+OUString ScMenuFloatingWindow::getMenuItemName(size_t nPos) const
+{
+    if (maMenuItems.size() <= nPos)
+        return ScGlobal::GetEmptyString();
+
+    return maMenuItems[nPos].maText;
+}
+
+bool ScMenuFloatingWindow::isMenuItemEnabled(size_t nPos) const
+{
+    if (maMenuItems.size() <= nPos)
+        return false;
+
+    return maMenuItems[nPos].mbEnabled;
+}
+
+bool ScMenuFloatingWindow::isMenuItemSelected(size_t nPos) const
+{
+    return nPos == mnSelectedMenu;
+}
+
+void ScMenuFloatingWindow::setName(const OUString& rName)
+{
+    maName = rName;
+}
+
+const OUString& ScMenuFloatingWindow::getName() const
+{
+    return maName;
+}
+
 void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected)
 {
+    if (nPos == MENU_NOT_SELECTED)
+        return;
+
     const StyleSettings& rStyle = GetSettings().GetStyleSettings();
     Color aBackColor = rStyle.GetMenuColor();
     SetFillColor(aBackColor);
@@ -620,7 +783,7 @@ void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected)
 
     Point aPos;
     Size aSize;
-    getMenuItemPosSize(aPos, aSize, nPos);
+    getMenuItemPosSize(nPos, aPos, aSize);
     Region aRegion(Rectangle(aPos,aSize));
 
     if (IsNativeControlSupported(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL))
@@ -663,7 +826,7 @@ void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected)
     drawMenuItem(nPos);
 }
 
-void ScMenuFloatingWindow::getMenuItemPosSize(Point& rPos, Size& rSize, size_t nPos) const
+void ScMenuFloatingWindow::getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const
 {
     const sal_uInt16 nLeftMargin = 5;
     const sal_uInt16 nTopMargin = 5;
@@ -679,6 +842,11 @@ void ScMenuFloatingWindow::getMenuItemPosSize(Point& rPos, Size& rSize, size_t n
     rSize = aSize1;
 }
 
+ScMenuFloatingWindow* ScMenuFloatingWindow::getParentMenuWindow() const
+{
+    return mpParentMenu;
+}
+
 size_t ScMenuFloatingWindow::getEnclosingMenuItem(const Point& rPos) const
 {
     size_t n = maMenuItems.size();
@@ -686,7 +854,7 @@ size_t ScMenuFloatingWindow::getEnclosingMenuItem(const Point& rPos) const
     {
         Point aPos;
         Size aSize;
-        getMenuItemPosSize(aPos, aSize, i);
+        getMenuItemPosSize(i, aPos, aSize);
         Rectangle aRect(aPos, aSize);
         if (aRect.IsInside(rPos))
             return i;
@@ -694,11 +862,98 @@ size_t ScMenuFloatingWindow::getEnclosingMenuItem(const Point& rPos) const
     return MENU_NOT_SELECTED;
 }
 
-IMPL_LINK( ScMenuFloatingWindow, EndPopupHdl, void*, EMPTYARG )
+size_t ScMenuFloatingWindow::getSubMenuPos(ScMenuFloatingWindow* pSubMenu)
 {
-    if (mbActionFired && mpParentMenu)
-        mpParentMenu->EndPopupMode();
+    size_t n = maMenuItems.size();
+    for (size_t i = 0; i < n; ++i)
+    {
+        if (maMenuItems[i].mpSubMenuWin.get() == pSubMenu)
+            return i;
+    }
+    return MENU_NOT_SELECTED;
+}
+
+void ScMenuFloatingWindow::fireMenuHighlightedEvent()
+{
+    if (mnSelectedMenu == MENU_NOT_SELECTED)
+        return;
+
+    if (!mxAccessible.is())
+        return;
+
+    Reference<XAccessibleContext> xAccCxt = mxAccessible->getAccessibleContext();
+    if (!xAccCxt.is())
+        return;
 
+    Reference<XAccessible> xAccMenu = xAccCxt->getAccessibleChild(mnSelectedMenu);
+    if (!xAccMenu.is())
+        return;
+
+    VclAccessibleEvent aEvent(VCLEVENT_MENU_HIGHLIGHT, xAccMenu);
+    FireVclEvent(&aEvent);
+}
+
+void ScMenuFloatingWindow::setSubMenuFocused(ScMenuFloatingWindow* pSubMenu)
+{
+    maCloseTimer.reset();
+    size_t nMenuPos = getSubMenuPos(pSubMenu);
+    if (mnSelectedMenu != nMenuPos)
+    {
+        highlightMenuItem(nMenuPos, true);
+        mnSelectedMenu = nMenuPos;
+    }
+}
+
+void ScMenuFloatingWindow::ensureSubMenuVisible(ScMenuFloatingWindow* pSubMenu)
+{
+    if (mpParentMenu)
+        mpParentMenu->ensureSubMenuVisible(this);
+
+    if (pSubMenu->IsVisible())
+        return;
+
+    // Find the menu position of the submenu.
+    size_t nMenuPos = getSubMenuPos(pSubMenu);
+    if (nMenuPos != MENU_NOT_SELECTED)
+    {
+        setSelectedMenuItem(nMenuPos, false, false);
+
+        Point aPos;
+        Size aSize;
+        getMenuItemPosSize(nMenuPos, aPos, aSize);
+
+        sal_uInt32 nOldFlags = GetPopupModeFlags();
+        SetPopupModeFlags(nOldFlags | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE);
+        pSubMenu->resizeToFitMenuItems(); // set the size before launching the popup to get it positioned correctly.
+        pSubMenu->StartPopupMode(
+            Rectangle(aPos,aSize), (FLOATWIN_POPUPMODE_RIGHT | FLOATWIN_POPUPMODE_GRABFOCUS));
+        pSubMenu->AddPopupModeWindow(this);
+        SetPopupModeFlags(nOldFlags);
+    }
+}
+
+void ScMenuFloatingWindow::ensureSubMenuNotVisible()
+{
+    if (mnSelectedMenu <= maMenuItems.size() && 
+        maMenuItems[mnSelectedMenu].mpSubMenuWin && 
+        maMenuItems[mnSelectedMenu].mpSubMenuWin->IsVisible())
+    {    
+        maMenuItems[mnSelectedMenu].mpSubMenuWin->ensureSubMenuNotVisible();
+    }
+
+    EndPopupMode();
+}
+
+void ScMenuFloatingWindow::terminateAllPopupMenus()
+{
+    EndPopupMode();
+    if (mpParentMenu)
+        mpParentMenu->terminateAllPopupMenus();
+}
+
+IMPL_LINK( ScMenuFloatingWindow, PopupEndHdl, void*, EMPTYARG )
+{
+    clearSelectedMenuItem();
     return 0;
 }
 
@@ -722,58 +977,41 @@ void ScDPFieldPopupWindow::CancelButton::Click()
 
 // ----------------------------------------------------------------------------
 
-ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent) :
-    ScMenuFloatingWindow(pParent),
-    maCheck0(this, 0),
-    maCheck1(this, 0),
-    maCheck2(this, 0),
-    maCheck3(this, 0),
-    maCheck4(this, 0),
-    maCheck5(this, 0),
-    maCheck6(this, 0),
-    maCheck7(this, 0),
-    maCheck8(this, 0),
-    maCheck9(this, 0),
-    maScrollBar(this, WB_VERT),
+ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc) :
+    ScMenuFloatingWindow(pParent, pDoc),
+    maChecks(this, 0),
+    maChkToggleAll(this, 0),
+    maBtnSelectSingle  (this, 0), 
+    maBtnUnselectSingle(this, 0), 
     maBtnOk(this),
     maBtnCancel(this),
+    mnCurTabStop(0),
     mpExtendedData(NULL),
     mpOKAction(NULL),
-    mnScrollPos(0)
+    maWndSize(160, 330),
+    mePrevToggleAllState(STATE_DONTKNOW)
 {
+    maTabStopCtrls.reserve(7);
+    maTabStopCtrls.push_back(this);
+    maTabStopCtrls.push_back(&maChecks);
+    maTabStopCtrls.push_back(&maChkToggleAll);
+    maTabStopCtrls.push_back(&maBtnSelectSingle);
+    maTabStopCtrls.push_back(&maBtnUnselectSingle);
+    maTabStopCtrls.push_back(&maBtnOk);
+    maTabStopCtrls.push_back(&maBtnCancel);
+
+    const StyleSettings& rStyle = GetSettings().GetStyleSettings();
+
     Point aPos;
     Size aSize;
     getSectionPosSize(aPos, aSize, WHOLE);
     SetOutputSizePixel(aSize);
     Size aOutSize = GetOutputSizePixel();
 
-    mpCheckPtr.reserve(10);
-    mpCheckPtr.push_back(&maCheck0);
-    mpCheckPtr.push_back(&maCheck1);
-    mpCheckPtr.push_back(&maCheck2);
-    mpCheckPtr.push_back(&maCheck3);
-    mpCheckPtr.push_back(&maCheck4);
-    mpCheckPtr.push_back(&maCheck5);
-    mpCheckPtr.push_back(&maCheck6);
-    mpCheckPtr.push_back(&maCheck7);
-    mpCheckPtr.push_back(&maCheck8);
-    mpCheckPtr.push_back(&maCheck9);
-    
-    getSectionPosSize(aPos, aSize, FIRST_LISTITEM);    
-    for (vector<CheckBox*>::iterator itr = mpCheckPtr.begin(), itrEnd = mpCheckPtr.end();
-          itr != itrEnd; ++itr)
-    {
-        CheckBox* p = *itr;
-        p->SetPosSizePixel(aPos, aSize);
-        p->SetFont(getLabelFont());
-        p->SetClickHdl( LINK(this, ScDPFieldPopupWindow, CheckBoxHdl) );
-        aPos.Y() += aSize.Height() + 1;
-    }
-
     getSectionPosSize(aPos, aSize, BTN_OK);
     maBtnOk.SetPosSizePixel(aPos, aSize);
     maBtnOk.SetFont(getLabelFont());
-    maBtnOk.SetClickHdl( LINK(this, ScDPFieldPopupWindow, OKButtonHdl) );
+    maBtnOk.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
     maBtnOk.Show();
 
     getSectionPosSize(aPos, aSize, BTN_CANCEL);
@@ -781,87 +1019,133 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent) :
     maBtnCancel.SetFont(getLabelFont());
     maBtnCancel.Show();
 
-    getSectionPosSize(aPos, aSize, SCROLL_BAR_V);
-    maScrollBar.SetPosSizePixel(aPos, aSize);
-    maScrollBar.SetPageSize(mpCheckPtr.size());
-    maScrollBar.SetVisibleSize(mpCheckPtr.size());
-    maScrollBar.SetLineSize(1);
-    maScrollBar.SetScrollHdl( LINK(this, ScDPFieldPopupWindow, ScrollHdl) );
-    maScrollBar.EnableDrag(true);
+    getSectionPosSize(aPos, aSize, LISTBOX_AREA_INNER);
+    maChecks.SetPosSizePixel(aPos, aSize);
+    maChecks.SetFont(getLabelFont());
+    maChecks.SetCheckButtonHdl( LINK(this, ScDPFieldPopupWindow, CheckHdl) );
+    maChecks.Show();
+
+    getSectionPosSize(aPos, aSize, CHECK_TOGGLE_ALL);
+    maChkToggleAll.SetPosSizePixel(aPos, aSize);
+    maChkToggleAll.SetFont(getLabelFont());
+    maChkToggleAll.SetText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_TOGGLE_ALL).GetString());
+    maChkToggleAll.SetControlBackground(rStyle.GetMenuColor());
+    maChkToggleAll.SetClickHdl( LINK(this, ScDPFieldPopupWindow, TriStateHdl) );
+    maChkToggleAll.Show();
+
+    getSectionPosSize(aPos, aSize, BTN_SINGLE_SELECT);
+    maBtnSelectSingle.SetPosSizePixel(aPos, aSize);
+    maBtnSelectSingle.SetQuickHelpText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_SELECT_CURRENT).GetString());
+    maBtnSelectSingle.SetModeImage(Image(ScResId(RID_IMG_SELECT_CURRENT)), BMP_COLOR_NORMAL);
+    maBtnSelectSingle.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
+    maBtnSelectSingle.Show();
+
+    getSectionPosSize(aPos, aSize, BTN_SINGLE_UNSELECT);
+    maBtnUnselectSingle.SetPosSizePixel(aPos, aSize);
+    maBtnUnselectSingle.SetQuickHelpText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_UNSELECT_CURRENT).GetString());
+    maBtnUnselectSingle.SetModeImage(Image(ScResId(RID_IMG_UNSELECT_CURRENT)), BMP_COLOR_NORMAL);
+    maBtnUnselectSingle.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
+    maBtnUnselectSingle.Show();
 }
 
 ScDPFieldPopupWindow::~ScDPFieldPopupWindow()
 {
 }
 
-vector<ScDPFieldPopupWindow::Member>& ScDPFieldPopupWindow::getMembers()
-{
-    return maMembers;
-}
-
 void ScDPFieldPopupWindow::getSectionPosSize(Point& rPos, Size& rSize, SectionType eType) const
 {
-    const sal_uInt16 nListBoxMargin = 5;
+    // constant parameters.
+    const sal_uInt16 nListBoxMargin = 5;            // horizontal distance from the side of the dialog to the listbox border.
+    const sal_uInt16 nListBoxInnerPadding = 5;
     const sal_uInt16 nTopMargin = 5;
     const sal_uInt16 nMenuHeight = 60;
-    const sal_uInt16 nBottomBtnAreaHeight = 50;
-    const sal_uInt16 nInnerItemMargin = 5;
-    const sal_uInt16 nScrollBarWidth = 17;
+    const sal_uInt16 nSingleItemBtnAreaHeight = 32; // height of the middle area below the list box where the single-action buttons are.
+    const sal_uInt16 nBottomBtnAreaHeight = 50;     // height of the bottom area where the OK and Cancel buttons are.
     const sal_uInt16 nBtnWidth = 60;
-    const sal_uInt16 nBtnHeight = getLabelFont().GetHeight()*2;
+    const sal_uInt16 nLabelHeight = getLabelFont().GetHeight();
+    const sal_uInt16 nBtnHeight = nLabelHeight*2;
     const sal_uInt16 nBottomMargin = 10;
     const sal_uInt16 nMenuListMargin = 20;
 
-    Size aWndSize = Size(160, 330);
+    // parameters calculated from constants.
+    const sal_uInt16 nListBoxWidth = maWndSize.Width() - nListBoxMargin*2;
+    const sal_uInt16 nListBoxHeight = maWndSize.Height() - nTopMargin - nMenuHeight - 
+        nMenuListMargin - nSingleItemBtnAreaHeight - nBottomBtnAreaHeight;
+
+    const sal_uInt16 nSingleBtnAreaY = nTopMargin + nMenuHeight + nListBoxHeight + nMenuListMargin - 1;
 
     switch (eType)
     {
         case WHOLE:
         {
             rPos  = Point(0, 0);
-            rSize = aWndSize;
+            rSize = maWndSize;
         }
         break;
-        case LISTBOX_AREA:
+        case LISTBOX_AREA_OUTER:
         {
             rPos = Point(nListBoxMargin, nTopMargin + nMenuHeight + nMenuListMargin);
-            rSize = Size(
-                aWndSize.Width() - nListBoxMargin*2, 
-                aWndSize.Height() - nTopMargin - nMenuHeight - nMenuListMargin - nBottomBtnAreaHeight);
+            rSize = Size(nListBoxWidth, nListBoxHeight);
         }
         break;
-        case FIRST_LISTITEM:
+        case LISTBOX_AREA_INNER:
         {
-            rPos = Point(nListBoxMargin + nInnerItemMargin,
-                         nTopMargin + nMenuHeight + nMenuListMargin + nInnerItemMargin);
-            rSize = Size(
-                aWndSize.Width() - nListBoxMargin*2 - nInnerItemMargin - nScrollBarWidth - 10,
-                17);
+            rPos = Point(nListBoxMargin, nTopMargin + nMenuHeight + nMenuListMargin);
+            rPos.X() += nListBoxInnerPadding;
+            rPos.Y() += nListBoxInnerPadding;
+
+            rSize = Size(nListBoxWidth, nListBoxHeight);
+            rSize.Width()  -= nListBoxInnerPadding*2;
+            rSize.Height() -= nListBoxInnerPadding*2;
         }
         break;
-        case BTN_OK:
+        case SINGLE_BTN_AREA:
         {
-            long x = (aWndSize.Width() - nBtnWidth*2)/3;
-            long y = aWndSize.Height() - nBottomMargin - nBtnHeight;
-            rPos = Point(x, y);
-            rSize = Size(nBtnWidth, nBtnHeight);
+            rPos = Point(nListBoxMargin, nSingleBtnAreaY);
+            rSize = Size(nListBoxWidth, nSingleItemBtnAreaHeight);
         }
         break;
-        case BTN_CANCEL:
+        case CHECK_TOGGLE_ALL:
+        {
+            long h = nLabelHeight*3/2; // check box height is heuristically 150% of the text height.
+            rPos = Point(nListBoxMargin, nSingleBtnAreaY);
+            rPos.X() += 5;
+            rPos.Y() += (nSingleItemBtnAreaHeight - h)/2;
+            rSize = Size(70, h);
+        }
+        break;
+        case BTN_SINGLE_SELECT:
+        {
+            long h = 26;
+            rPos = Point(nListBoxMargin, nSingleBtnAreaY);
+            rPos.X() += 75;
+            rPos.Y() += (nSingleItemBtnAreaHeight - h)/2;
+            rSize = Size(h, h);
+        }
+        break;
+        case BTN_SINGLE_UNSELECT:
+        {
+            long h = 26;
+            rPos = Point(nListBoxMargin, nSingleBtnAreaY);
+            rPos.X() += 75 + h + 10;
+            rPos.Y() += (nSingleItemBtnAreaHeight - h)/2;
+            rSize = Size(h, h);
+        }
+        break;
+        case BTN_OK:
         {
-            long x = (aWndSize.Width() - nBtnWidth*2)/3*2 + nBtnWidth;
-            long y = aWndSize.Height() - nBottomMargin - nBtnHeight;
+            long x = (maWndSize.Width() - nBtnWidth*2)/3;
+            long y = maWndSize.Height() - nBottomMargin - nBtnHeight;
             rPos = Point(x, y);
             rSize = Size(nBtnWidth, nBtnHeight);
         }
         break;
-        case SCROLL_BAR_V:
+        case BTN_CANCEL:
         {
-            long x = aWndSize.Width() - nListBoxMargin - nInnerItemMargin - nScrollBarWidth;
-            long y = nTopMargin + nMenuHeight + nMenuListMargin + nInnerItemMargin;
+            long x = (maWndSize.Width() - nBtnWidth*2)/3*2 + nBtnWidth;
+            long y = maWndSize.Height() - nBottomMargin - nBtnHeight;
             rPos = Point(x, y);
-            long h = aWndSize.Height() - nTopMargin - nMenuHeight - nMenuListMargin - nBottomBtnAreaHeight - nInnerItemMargin*2;
-            rSize = Size(nScrollBarWidth, h);
+            rSize = Size(nBtnWidth, nBtnHeight);
         }
         break;
         default:
@@ -869,46 +1153,100 @@ void ScDPFieldPopupWindow::getSectionPosSize(Point& rPos, Size& rSize, SectionTy
     }
 }
 
-void ScDPFieldPopupWindow::resetDisplayedItems()
+void ScDPFieldPopupWindow::setAllMemberState(bool bSet)
 {
-    long nScrollPos = maScrollBar.GetThumbPos();
-    if (nScrollPos < 0)
-        return;
+    size_t n = maMembers.size();
+    for (size_t i = 0; i < n; ++i)
+        maChecks.CheckEntryPos(i, bSet);
+}
+
+void ScDPFieldPopupWindow::selectCurrentMemberOnly(bool bSet)
+{
+    setAllMemberState(!bSet);
+    sal_uInt16 nSelected = maChecks.GetSelectEntryPos();
+    maChecks.CheckEntryPos(nSelected, bSet);
+}
+
+void ScDPFieldPopupWindow::cycleFocus(bool bReverse)
+{
+    maTabStopCtrls[mnCurTabStop]->SetFakeFocus(false);
+    maTabStopCtrls[mnCurTabStop]->LoseFocus();
+    if (mnCurTabStop == 0)
+        clearSelectedMenuItem();
 
-    mnScrollPos = static_cast<size_t>(nScrollPos);
-    size_t nCheckCount = mpCheckPtr.size();
-    for (size_t i = 0; i < nCheckCount; ++i)
+    if (bReverse)
     {
-        CheckBox* p = mpCheckPtr[i];
-        p->SetText(maMembers[i+mnScrollPos].maName);
-        TriState nNewState = maMembers[i+mnScrollPos].mbVisible ? STATE_CHECK : STATE_NOCHECK;
-        p->SetState(nNewState);
+        if (mnCurTabStop > 0)
+            --mnCurTabStop;
+        else
+            mnCurTabStop = maTabStopCtrls.size() - 1;
     }
+    else
+    {
+        ++mnCurTabStop;
+        if (mnCurTabStop >= maTabStopCtrls.size())
+            mnCurTabStop = 0;
+    }
+    maTabStopCtrls[mnCurTabStop]->SetFakeFocus(true);
+    maTabStopCtrls[mnCurTabStop]->GrabFocus();
 }
 
-IMPL_LINK( ScDPFieldPopupWindow, CheckBoxHdl, CheckBox*, pCheck )
+IMPL_LINK( ScDPFieldPopupWindow, ButtonHdl, Button*, pBtn )
 {
-    vector<CheckBox*>::const_iterator itr, itrBeg = mpCheckPtr.begin(), itrEnd = mpCheckPtr.end();
-    for (itr = itrBeg; itr != itrEnd; ++itr)
-    {
-        if (*itr == pCheck)
-        {
-            size_t nIndex = ::std::distance(itrBeg, itr);
-            maMembers[nIndex+mnScrollPos].mbVisible = !maMembers[nIndex+mnScrollPos].mbVisible;
-        }
+    if (pBtn == &maBtnOk)
+        close(true);
+    else if (pBtn == &maBtnSelectSingle)
+    {    
+        selectCurrentMemberOnly(true);
+        CheckHdl(&maChecks);
+    }
+    else if (pBtn == &maBtnUnselectSingle)
+    {    
+        selectCurrentMemberOnly(false);
+        CheckHdl(&maChecks);
     }
     return 0;
 }
 
-IMPL_LINK( ScDPFieldPopupWindow, OKButtonHdl, OKButton*, EMPTYARG )
+IMPL_LINK( ScDPFieldPopupWindow, TriStateHdl, TriStateBox*, EMPTYARG )
 {
-    close(true);
+    switch (mePrevToggleAllState)
+    {
+        case STATE_NOCHECK:
+            maChkToggleAll.SetState(STATE_CHECK);
+            setAllMemberState(true);
+        break;
+        case STATE_CHECK:
+            maChkToggleAll.SetState(STATE_NOCHECK);
+            setAllMemberState(false);
+        break;
+        case STATE_DONTKNOW:
+        default:
+            maChkToggleAll.SetState(STATE_CHECK);
+            setAllMemberState(true);
+        break;
+    }
+
+    mePrevToggleAllState = maChkToggleAll.GetState();
     return 0;
 }
 
-IMPL_LINK( ScDPFieldPopupWindow, ScrollHdl, ScrollBar*, EMPTYARG )
+IMPL_LINK( ScDPFieldPopupWindow, CheckHdl, SvTreeListBox*, pChecks )
 {
-    resetDisplayedItems();
+    if (pChecks != &maChecks)
+        return 0;
+
+    size_t nNumChecked = maChecks.GetCheckedEntryCount();
+    if (nNumChecked == maMembers.size())
+        // all members visible
+        maChkToggleAll.SetState(STATE_CHECK);
+    else if (nNumChecked == 0)
+        // no members visible
+        maChkToggleAll.SetState(STATE_NOCHECK);
+    else
+        maChkToggleAll.SetState(STATE_DONTKNOW);
+
+    mePrevToggleAllState = maChkToggleAll.GetState();
     return 0;
 }
 
@@ -921,21 +1259,80 @@ void ScDPFieldPopupWindow::MouseMove(const MouseEvent& rMEvt)
         queueCloseSubMenu();
 }
 
+long ScDPFieldPopupWindow::Notify(NotifyEvent& rNEvt)
+{
+    switch (rNEvt.GetType())
+    {
+        case EVENT_KEYUP:
+        {
+            const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
+            const KeyCode& rCode = pKeyEvent->GetKeyCode();
+            bool bShift = rCode.IsShift();
+            if (rCode.GetCode() == KEY_TAB)
+            {
+                cycleFocus(bShift);
+                return true;
+            }
+        }
+        break;
+    }
+    return ScMenuFloatingWindow::Notify(rNEvt);
+}
+
 void ScDPFieldPopupWindow::Paint(const Rectangle& rRect)
 {
     ScMenuFloatingWindow::Paint(rRect);
 
     const StyleSettings& rStyle = GetSettings().GetStyleSettings();
     Color aMemberBackColor = rStyle.GetFieldColor();
+    Color aBorderColor = rStyle.GetShadowColor();
 
-    // Member list box background
-    SetFillColor(aMemberBackColor);
     Point aPos;
     Size aSize;
-    getSectionPosSize(aPos, aSize, LISTBOX_AREA);
+    getSectionPosSize(aPos, aSize, LISTBOX_AREA_OUTER);
+
+    // Member list box background
+    SetFillColor(aMemberBackColor);
+    SetLineColor(aBorderColor);
+    DrawRect(Rectangle(aPos,aSize));
+
+    // Single-action button box
+    getSectionPosSize(aPos, aSize, SINGLE_BTN_AREA);
+    SetFillColor(rStyle.GetMenuColor());
     DrawRect(Rectangle(aPos,aSize));
 }
 
+Window* ScDPFieldPopupWindow::GetPreferredKeyInputWindow()
+{
+    return maTabStopCtrls[mnCurTabStop];
+}
+
+Reference<XAccessible> ScDPFieldPopupWindow::CreateAccessible()
+{
+    if (!mxAccessible.is())
+    {    
+        mxAccessible.set(new ScAccessibleFilterTopWindow(
+            GetAccessibleParentWindow()->GetAccessible(), this, getName(), getDoc()));
+        ScAccessibleFilterTopWindow* pAccTop = static_cast<ScAccessibleFilterTopWindow*>(mxAccessible.get());
+        fillMenuItemsToAccessible(pAccTop);
+
+        pAccTop->setAccessibleChild(
+            maChecks.CreateAccessible(), ScAccessibleFilterTopWindow::LISTBOX);
+        pAccTop->setAccessibleChild(
+            maChkToggleAll.CreateAccessible(), ScAccessibleFilterTopWindow::TOGGLE_ALL);
+        pAccTop->setAccessibleChild(
+            maBtnSelectSingle.CreateAccessible(), ScAccessibleFilterTopWindow::SINGLE_ON_BTN);
+        pAccTop->setAccessibleChild(
+            maBtnUnselectSingle.CreateAccessible(), ScAccessibleFilterTopWindow::SINGLE_OFF_BTN);
+        pAccTop->setAccessibleChild(
+            maBtnOk.CreateAccessible(), ScAccessibleFilterTopWindow::OK_BTN);
+        pAccTop->setAccessibleChild(
+            maBtnCancel.CreateAccessible(), ScAccessibleFilterTopWindow::CANCEL_BTN);
+    }
+
+    return mxAccessible;
+}
+
 void ScDPFieldPopupWindow::setMemberSize(size_t n)
 {
     maMembers.reserve(n);
@@ -951,36 +1348,49 @@ void ScDPFieldPopupWindow::addMember(const OUString& rName, bool bVisible)
 
 void ScDPFieldPopupWindow::initMembers()
 {
-    size_t nMemCount = maMembers.size();
-    size_t nCheckCount = mpCheckPtr.size();
-    bool bNeedsScroll = false;
-    if (nMemCount > nCheckCount)
+    size_t n = maMembers.size();
+    size_t nVisMemCount = 0;
+    for (size_t i = 0; i < n; ++i)
+    {
+        maChecks.InsertEntry(maMembers[i].maName);
+        maChecks.CheckEntryPos(i, maMembers[i].mbVisible);
+        if (maMembers[i].mbVisible)
+            ++nVisMemCount;
+    }
+    if (nVisMemCount == n)
     {    
-        nMemCount = nCheckCount;
-        bNeedsScroll = true;
+        // all members visible
+        maChkToggleAll.SetState(STATE_CHECK);
+        mePrevToggleAllState = STATE_CHECK;
     }
-
-    for (size_t i = 0; i < nMemCount; ++i)
-    {
-        CheckBox* p = mpCheckPtr[i];
-        p->SetText(maMembers[i].maName);
-        p->Show();
-        p->SetState(maMembers[i].mbVisible ? STATE_CHECK : STATE_NOCHECK);
+    else if (nVisMemCount == 0)
+    {    
+        // no members visible
+        maChkToggleAll.SetState(STATE_NOCHECK);
+        mePrevToggleAllState = STATE_NOCHECK;
     }
-    if (bNeedsScroll)
-    {
-        maScrollBar.SetRange(Range(0, maMembers.size()));
-        maScrollBar.Show();
+    else
+    {    
+        maChkToggleAll.SetState(STATE_DONTKNOW);
+        mePrevToggleAllState = STATE_DONTKNOW;
     }
 }
 
+const Size& ScDPFieldPopupWindow::getWindowSize() const
+{
+    return maWndSize;
+}
+
 void ScDPFieldPopupWindow::getResult(hash_map<OUString, bool, OUStringHash>& rResult)
 {
     typedef hash_map<OUString, bool, OUStringHash> ResultMap;
     ResultMap aResult;
-    vector<Member>::const_iterator itr = maMembers.begin(), itrEnd = maMembers.end();
-    for (; itr != itrEnd; ++itr)
-        aResult.insert(ResultMap::value_type(itr->maName, itr->mbVisible));
+    size_t n = maMembers.size();
+    for (size_t i = 0; i < n; ++i)
+    {
+        bool bState = maChecks.IsChecked(i);
+        aResult.insert(ResultMap::value_type(maMembers[i].maName, bState));
+    }
     rResult.swap(aResult);
 }
 
diff --git a/sc/source/ui/cctrl/dpcontrol.src b/sc/source/ui/cctrl/dpcontrol.src
index 6c5fffe51..31cbb6208 100644
--- a/sc/source/ui/cctrl/dpcontrol.src
+++ b/sc/source/ui/cctrl/dpcontrol.src
@@ -30,7 +30,7 @@
 
 #include "dpcontrol.hrc"
 
-Resource RID_SC_DPCONTROL
+Resource RID_POPUP_FILTER
 {
     String STR_MENU_SORT_ASC
     {
@@ -46,4 +46,37 @@ Resource RID_SC_DPCONTROL
     {
         Text [ en-US ] = "Custom Sort" ;
     };
+
+    String STR_BTN_TOGGLE_ALL
+    {
+        Text [ en-US ] = "All" ;
+    };
+
+    String STR_BTN_SELECT_CURRENT
+    {
+        Text [ en-US ] = "Show only the current item." ;
+    };
+
+    String STR_BTN_UNSELECT_CURRENT
+    {
+        Text [ en-US ] = "Hide only the current item." ;
+    };
+};
+
+Image RID_IMG_SELECT_CURRENT
+{
+    ImageBitmap = Bitmap
+    {
+        File = "popup_select_current.png";
+    };
+    MaskColor = STD_MASKCOLOR;
+};
+
+Image RID_IMG_UNSELECT_CURRENT
+{
+    ImageBitmap = Bitmap
+    {
+        File = "popup_unselect_current.png";
+    };
+    MaskColor = STD_MASKCOLOR;
 };
diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src
index d08eedf77..2d8a7f918 100644
--- a/sc/source/ui/dbgui/asciiopt.src
+++ b/sc/source/ui/dbgui/asciiopt.src
@@ -42,7 +42,7 @@ ModalDialog RID_SCDLG_ASCII
     {
         Pos = MAP_APPFONT ( 264 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
+		TabStop = TRUE ;
         DefButton = TRUE ;
     };
     CancelButton BTN_CANCEL
@@ -102,10 +102,10 @@ ModalDialog RID_SCDLG_ASCII
         Pos = MAP_APPFONT ( 12 , 48 ) ;
         Size = MAP_APPFONT ( 60 , 8 ) ;
         Text [ en-US ] = "From ro~w" ;
-    };
+	};
 
     NumericField NF_AT_ROW
-    {
+	{
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 76 , 46 ) ;
@@ -121,9 +121,9 @@ ModalDialog RID_SCDLG_ASCII
         Pos = MAP_APPFONT ( 6 , 63 ) ;
         Size = MAP_APPFONT ( 252 , 8 ) ;
         Text [ en-US ] = "Separator options" ;
-    };
+	};
     RadioButton RB_FIXED
-    {
+	{
         Pos = MAP_APPFONT ( 12 , 75 ) ;
         Size = MAP_APPFONT ( 243 , 10 ) ;
         Text [ en-US ] = "~Fixed width" ;
@@ -172,7 +172,7 @@ ModalDialog RID_SCDLG_ASCII
     {
         Pos = MAP_APPFONT ( 20 , 115 ) ;
         Size = MAP_APPFONT ( 68 , 10 ) ;
-        TabStop = TRUE ;
+		TabStop = TRUE ;
         Text [ en-US ] = "S~emicolon" ;
     };
     CheckBox CKB_SPACE
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 360e16dae..13b7ed2da 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -31,12 +31,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-
-
 #include <vcl/virdev.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
-
+#include <vcl/mnemonic.hxx>
+#include <vcl/help.hxx>
 #include <tools/debug.hxx>
 
 #include "fieldwnd.hxx"
@@ -44,10 +43,7 @@
 #include "pvglob.hxx"
 #include "AccessibleDataPilotControl.hxx"
 #include "scresid.hxx"
-#ifndef SC_SC_HRC
 #include "sc.hrc"
-#endif
-#include <vcl/mnemonic.hxx>
 
 const size_t INVALID_INDEX = static_cast< size_t >( -1 );
 
@@ -238,27 +234,44 @@ void ScDPFieldWindow::DrawBackground( OutputDevice& rDev )
 }
 
 void ScDPFieldWindow::DrawField(
-        OutputDevice& rDev, const Rectangle& rRect, const String& rText, bool bFocus )
+        OutputDevice& rDev, const Rectangle& rRect, FieldString& rText, bool bFocus )
 {
     VirtualDevice aVirDev( rDev );
     // #i97623# VirtualDevice is always LTR while other windows derive direction from parent
     aVirDev.EnableRTL( IsRTLEnabled() );
 
+    String aText = rText.first;
     Size aDevSize( rRect.GetSize() );
     long    nWidth       = aDevSize.Width();
     long    nHeight      = aDevSize.Height();
-    long    nLabelWidth  = rDev.GetTextWidth( rText );
+    long    nLabelWidth  = rDev.GetTextWidth( aText );
     long    nLabelHeight = rDev.GetTextHeight();
-    Point   aLabelPos(
-        ((nWidth > nLabelWidth + 6) ? (nWidth - nLabelWidth) / 2 : 3),
-        ((nHeight > nLabelHeight + 6) ? (nHeight - nLabelHeight) / 2 : 3) );
+
+    // #i31600# if text is too long, cut and add ellipsis
+    rText.second = nLabelWidth + 6 <= nWidth;
+    if( !rText.second )
+    {
+        xub_StrLen nMinLen = 0;
+        xub_StrLen nMaxLen = aText.Len();
+        bool bFits = false;
+        do
+        {
+            xub_StrLen nCurrLen = (nMinLen + nMaxLen) / 2;
+            aText = String( rText.first, 0, nCurrLen ).AppendAscii( "..." );
+            nLabelWidth = rDev.GetTextWidth( aText );
+            bFits = nLabelWidth + 6 <= nWidth;
+            (bFits ? nMinLen : nMaxLen) = nCurrLen;
+        }
+        while( !bFits || (nMinLen + 1 < nMaxLen) );
+    }
+    Point aLabelPos( (nWidth - nLabelWidth) / 2, ::std::max< long >( (nHeight - nLabelHeight) / 2, 3 ) );
 
     aVirDev.SetOutputSizePixel( aDevSize );
     aVirDev.SetFont( rDev.GetFont() );
     DecorationView aDecoView( &aVirDev );
     aDecoView.DrawButton( Rectangle( Point( 0, 0 ), aDevSize ), bFocus ? BUTTON_DRAW_DEFAULT : 0 );
     aVirDev.SetTextColor( aTextColor );
-    aVirDev.DrawText( aLabelPos, rText );
+    aVirDev.DrawText( aLabelPos, aText );
     rDev.DrawBitmap( rRect.TopLeft(), aVirDev.GetBitmap( Point( 0, 0 ), aDevSize ) );
 }
 
@@ -292,7 +305,7 @@ void ScDPFieldWindow::Redraw()
     if( HasFocus() && (nFieldSelected < aFieldArr.size()) )
     {
         long nFieldWidth = aFieldRect.GetWidth();
-        long nSelectionWidth = Min( GetTextWidth( aFieldArr[ nFieldSelected ] ) + 4, nFieldWidth - 6 );
+        long nSelectionWidth = Min( GetTextWidth( aFieldArr[ nFieldSelected ].first ) + 4, nFieldWidth - 6 );
         Rectangle aSelection(
             GetFieldPosition( nFieldSelected ) + Point( (nFieldWidth - nSelectionWidth) / 2, 3 ),
             Size( nSelectionWidth, aFieldRect.GetHeight() - 6 ) );
@@ -320,6 +333,11 @@ bool ScDPFieldWindow::IsExistingIndex( size_t nIndex ) const
     return nIndex < aFieldArr.size();
 }
 
+bool ScDPFieldWindow::IsShortenedText( size_t nIndex ) const
+{
+    return (nIndex < aFieldArr.size()) && !aFieldArr[ nIndex ].second;
+}
+
 size_t ScDPFieldWindow::CalcNewFieldIndex( SCsCOL nDX, SCsROW nDY ) const
 {
     size_t nNewField = nFieldSelected;
@@ -513,6 +531,14 @@ void __EXPORT ScDPFieldWindow::MouseMove( const MouseEvent& rMEvt )
         PointerStyle ePtr = pDlg->NotifyMouseMove( OutputToScreenPixel( rMEvt.GetPosPixel() ) );
         SetPointer( Pointer( ePtr ) );
     }
+    size_t nIndex = 0;
+    if( GetFieldIndex( rMEvt.GetPosPixel(), nIndex ) && IsShortenedText( nIndex ) )
+    {
+        Point aPos = OutputToScreenPixel( rMEvt.GetPosPixel() );
+        Rectangle   aRect( aPos, GetSizePixel() );
+        String aHelpText = GetFieldText(nIndex);
+        Help::ShowQuickHelp( this, aRect, aHelpText );
+    }
 }
 
 void __EXPORT ScDPFieldWindow::KeyInput( const KeyEvent& rKEvt )
@@ -598,7 +624,7 @@ void ScDPFieldWindow::AddField( const String& rText, size_t nNewIndex )
     DBG_ASSERT( nNewIndex == aFieldArr.size(), "ScDPFieldWindow::AddField - invalid index" );
     if( IsValidIndex( nNewIndex ) )
     {
-        aFieldArr.push_back( rText );
+        aFieldArr.push_back( FieldString( rText, true ) );
         if (pAccessible)
         {
             com::sun::star::uno::Reference < com::sun::star::accessibility::XAccessible > xTempAcc = xAccessible;
@@ -646,7 +672,7 @@ void ScDPFieldWindow::SetFieldText( const String& rText, size_t nIndex )
 {
     if( IsExistingIndex( nIndex ) )
     {
-        aFieldArr[ nIndex ] = rText;
+        aFieldArr[ nIndex ] = FieldString( rText, true );
         Redraw();
 
         if (pAccessible)
@@ -663,7 +689,7 @@ void ScDPFieldWindow::SetFieldText( const String& rText, size_t nIndex )
 const String& ScDPFieldWindow::GetFieldText( size_t nIndex ) const
 {
     if( IsExistingIndex( nIndex ) )
-        return aFieldArr[ nIndex ];
+        return aFieldArr[ nIndex ].first;
     return EMPTY_STRING;
 }
 
@@ -680,7 +706,7 @@ bool ScDPFieldWindow::AddField( const String& rText, const Point& rPos, size_t&
         if( nNewIndex > aFieldArr.size() )
             nNewIndex = aFieldArr.size();
 
-        aFieldArr.insert( aFieldArr.begin() + nNewIndex, rText );
+        aFieldArr.insert( aFieldArr.begin() + nNewIndex, FieldString( rText, true ) );
         nFieldSelected = nNewIndex;
         Redraw();
         rnIndex = nNewIndex;
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 9d3baa172..51fe8459a 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -451,24 +451,27 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
             SCCOL nColumn = theQueryData.nCol1 + static_cast<SCCOL>(nFieldSelPos) - 1;
             if (!pEntryLists[nColumn])
             {
+                USHORT nOffset = GetSliderPos();
                 SCTAB nTab		 = nSrcTab;
                 SCROW nFirstRow = theQueryData.nRow1;
-				SCROW nLastRow	 = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2;
+                SCROW nLastRow   = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2;
+                mbHasDates[nOffset+nList-1] = false;
 
                 //	erstmal ohne die erste Zeile
 
                 pEntryLists[nColumn] = new TypedScStrCollection( 128, 128 );
                 pEntryLists[nColumn]->SetCaseSensitive( aBtnCase.IsChecked() );
                 pDoc->GetFilterEntriesArea( nColumn, nFirstRow+1, nLastRow,
-                                            nTab, *pEntryLists[nColumn] );
+                                            nTab, *pEntryLists[nColumn], mbHasDates[nOffset+nList-1] );
 
                 //	Eintrag fuer die erste Zeile
                 //!	Eintrag (pHdrEntry) ohne Collection erzeugen?
 
                 nHeaderPos[nColumn] = USHRT_MAX;
                 TypedScStrCollection aHdrColl( 1, 1 );
+                bool bDummy = false;
                 pDoc->GetFilterEntriesArea( nColumn, nFirstRow, nFirstRow,
-                                            nTab, aHdrColl );
+                                            nTab, aHdrColl, bDummy );
                 TypedStrData* pHdrEntry = aHdrColl[0];
                 if ( pHdrEntry )
                 {
@@ -1064,7 +1067,8 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
                 static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0);
            
             ScQueryOp eOp  = (ScQueryOp)pLbCond->GetSelectEntryPos();
-           rEntry.eOp	  = eOp;
+            rEntry.eOp	   = eOp;
+            rEntry.bQueryByDate = mbHasDates[nQE];
 
         }
     }		
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index ee5f03954..a425836e7 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -45,6 +45,7 @@
 #include "dbcolect.hxx"
 #include "viewdata.hxx"
 #include "document.hxx"
+#include "queryparam.hxx"
 
 #define _FOPTMGR_CXX
 #include "foptmgr.hxx"
diff --git a/sc/source/ui/dbgui/langchooser.cxx b/sc/source/ui/dbgui/langchooser.cxx
deleted file mode 100644
index d5fd72b6c..000000000
--- a/sc/source/ui/dbgui/langchooser.cxx
+++ /dev/null
@@ -1,120 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: langbox.hxx,v $
- * $Revision: 1.4.242.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sc.hxx"
-
-#undef SC_DLLIMPLEMENTATION
-
-//------------------------------------------------------------------------
-
-#include "langchooser.hxx"
-#include "langchooser.hrc"
-
-#include "scresid.hxx"
-#include "vcl/window.hxx"
-#include "vcl/msgbox.hxx"
-#include "vcl/svapp.hxx"
-
-ScLangChooserDlg::ScLangChooserDlg(Window* pParent) :
-    ModalDialog(pParent, ScResId(RID_SCDLG_LANG_CHOOSER)),
-
-    maBtnOk(this, ScResId(BTN_OK)),
-    maBtnCancel(this, ScResId(BTN_CANCEL)),
-    maBtnHelp(this, ScResId(BTN_HELP)),
-    maFlChooseLang(this, ScResId(FL_CHOOSE_LANG)),
-    maRbAutomatic(this, ScResId(RB_AUTOMATIC)), 
-    maRbCustom(this, ScResId(RB_CUSTOM)),
-    maLbCustomLang(this, ScResId(LB_CUSTOM_LANG)),
-    maFlOption(this, ScResId(FL_OPTION)),
-    maBtnConvertDate(this, ScResId(BTN_CONVERT_DATE))
-{
-    init();
-}
-
-ScLangChooserDlg::~ScLangChooserDlg()
-{
-}
-
-short ScLangChooserDlg::Execute()
-{
-    return ModalDialog::Execute();
-}
-
-LanguageType ScLangChooserDlg::getLanguageType() const
-{
-    if (maRbAutomatic.IsChecked())
-        return LANGUAGE_SYSTEM;
-
-    return maLbCustomLang.GetSelectLanguage();
-}
-
-bool ScLangChooserDlg::isDateConversionSet() const
-{
-    return maBtnConvertDate.IsChecked();
-}
-
-void ScLangChooserDlg::init()
-{
-    Link aLink = LINK( this, ScLangChooserDlg, OKHdl );
-    maBtnOk.SetClickHdl(aLink);
-    aLink = LINK( this, ScLangChooserDlg, RadioHdl );
-    maRbAutomatic.SetClickHdl(aLink);
-    maRbCustom.SetClickHdl(aLink);
-
-    maRbAutomatic.Check(true);
-
-    maLbCustomLang.SetLanguageList(
-        LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, false, false);
-
-    LanguageType eLang = Application::GetSettings().GetLanguage();
-    maLbCustomLang.SelectLanguage(eLang);
-    maLbCustomLang.Disable();
-}
-
-IMPL_LINK( ScLangChooserDlg, OKHdl, OKButton*, EMPTYARG )
-{
-    EndDialog(RET_OK);
-    return 0;
-}
-
-IMPL_LINK( ScLangChooserDlg, RadioHdl, RadioButton*, pBtn )
-{
-    if (pBtn == &maRbAutomatic)
-    {
-        maLbCustomLang.Disable();
-    }
-    else if (pBtn == &maRbCustom)
-    {
-        maLbCustomLang.Enable();
-    }
-    return 0;
-}
-
diff --git a/sc/source/ui/dbgui/langchooser.src b/sc/source/ui/dbgui/langchooser.src
deleted file mode 100644
index 1e121de60..000000000
--- a/sc/source/ui/dbgui/langchooser.src
+++ /dev/null
@@ -1,112 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: retypepassdlg.src,v $
- * $Revision: 1.1.2.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "langchooser.hrc"
-
-ModalDialog RID_SCDLG_LANG_CHOOSER
-{
-    Text [ en-US ] = "Select Language" ;
-    Size = MAP_APPFONT ( 190 , 101 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    OutputSize = TRUE ;
-
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 135, 6 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
-        DefButton = TRUE ;
-    };
-
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 135, 23 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
-    };
-
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 135, 43 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
-    };
-
-    FixedLine FL_CHOOSE_LANG
-    {
-        Pos = MAP_APPFONT( 6, 3 ) ;
-        Size = MAP_APPFONT( 125, 14 ) ;
-
-        Text [ en-US ] = "Select the language to use for import" ; 
-    };
-
-    RadioButton RB_AUTOMATIC
-    {
-        Pos = MAP_APPFONT( 12, 20 ) ;
-        Size = MAP_APPFONT( 50, 10 ) ;
-        TabStop = TRUE ;
-
-        Text [ en-US ] = "Automatic" ; 
-    };
-
-    RadioButton RB_CUSTOM
-    {
-        Pos = MAP_APPFONT( 12, 34 ) ;
-        Size = MAP_APPFONT( 50, 10 ) ;
-        TabStop = TRUE ;
-
-        Text [ en-US ] = "Custom" ; 
-    };
-
-    ListBox LB_CUSTOM_LANG
-    {
-        Pos = MAP_APPFONT( 20, 50 ) ;
-        Size = MAP_APPFONT( 100, 55 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-
-    FixedLine FL_OPTION
-    {
-	Pos = MAP_APPFONT( 6, 70 );
-	Size = MAP_APPFONT( 125, 14 );
-
-	Text [ en-US ] = "Options" ;
-    };
-
-    CheckBox BTN_CONVERT_DATE
-    {
-    	Pos = MAP_APPFONT( 12, 86 );
-	Size = MAP_APPFONT( 125, 10 );
-	TabStop = TRUE ;
-
-	Text [ en-US ] = "Detect special numbers (such as dates)." ;
-    };
-};
-
diff --git a/sc/source/ui/dbgui/makefile.mk b/sc/source/ui/dbgui/makefile.mk
index ad2b9d551..130e0a393 100644
--- a/sc/source/ui/dbgui/makefile.mk
+++ b/sc/source/ui/dbgui/makefile.mk
@@ -53,7 +53,7 @@ SLOFILES =	\
     $(SLO)$/pfiltdlg.obj	\
     $(SLO)$/dbnamdlg.obj	\
     $(SLO)$/expftext.obj	\
-    $(SLO)$/langchooser.obj \
+    $(SLO)$/textimportoptions.obj \
     $(SLO)$/subtdlg.obj		\
     $(SLO)$/tpsubt.obj		\
     $(SLO)$/fieldwnd.obj	\
@@ -86,7 +86,7 @@ EXCEPTIONSFILES= \
 
 SRS1NAME=$(TARGET)
 SRC1FILES =  \
-	langchooser.src		\
+	textimportoptions.src		\
         pivot.src		\
         pvfundlg.src	\
         dpgroupdlg.src	\
@@ -117,7 +117,7 @@ LIB1OBJFILES =  \
     $(SLO)$/csvgrid.obj		\
     $(SLO)$/csvtablebox.obj	\
     $(SLO)$/asciiopt.obj \
-    $(SLO)$/langchooser.obj
+    $(SLO)$/textimportoptions.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 35bfc3536..42c2c265f 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -352,11 +352,12 @@ void ScPivotFilterDlg::UpdateValueList( USHORT nList )
                 SCROW	nFirstRow	= theQueryData.nRow1;
                 SCROW	nLastRow	= theQueryData.nRow2;
                 nFirstRow++;
+                bool bHasDates = false;
 
                 pEntryLists[nColumn] = new TypedScStrCollection( 128, 128 );
                 pEntryLists[nColumn]->SetCaseSensitive( aBtnCase.IsChecked() );
                 pDoc->GetFilterEntriesArea( nColumn, nFirstRow, nLastRow,
-                                            nTab, *pEntryLists[nColumn] );
+                                            nTab, *pEntryLists[nColumn], bHasDates );
             }
 
             TypedScStrCollection* pColl = pEntryLists[nColumn];
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 6817d728d..ec140d872 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -48,12 +48,15 @@
 #include "pvfundlg.hrc"
 #include "globstr.hrc"
 
+#include <vector>
+
 // ============================================================================
 
 using namespace ::com::sun::star::sheet;
 
 using ::rtl::OUString;
 using ::com::sun::star::uno::Sequence;
+using ::std::vector;
 
 // ============================================================================
 
@@ -86,6 +89,25 @@ bool lclFillListBox( ListBoxType& rLBox, const Sequence< OUString >& rStrings, U
     return bEmpty;
 }
 
+template< typename ListBoxType >
+bool lclFillListBox( ListBoxType& rLBox, const vector<ScDPLabelData::Member>& rMembers, USHORT nEmptyPos = LISTBOX_APPEND )
+{
+    bool bEmpty = false;
+    vector<ScDPLabelData::Member>::const_iterator itr = rMembers.begin(), itrEnd = rMembers.end();
+    for (; itr != itrEnd; ++itr)
+    {
+        OUString aName = itr->getDisplayName();
+        if (aName.getLength())
+            rLBox.InsertEntry(aName);
+        else
+        {
+            rLBox.InsertEntry(ScGlobal::GetRscString(STR_EMPTYDATA), nEmptyPos);
+            bEmpty = true;
+        }
+    }
+    return bEmpty;
+}
+
 /** Searches for a listbox entry, starts search at specified position. */
 USHORT lclFindListBoxEntry( const ListBox& rLBox, const String& rEntry, USHORT nStartPos )
 {
@@ -253,7 +275,7 @@ void ScDPFunctionDlg::Init( const ScDPLabelData& rLabelData, const ScDPFuncData&
     maLbFunc.SetSelection( nFuncMask );
 
     // field name
-    maFtName.SetText( rLabelData.maName );
+    maFtName.SetText(rLabelData.getDisplayName());
 
     // "More button" controls
     maBtnMore.AddWindow( &maFlDisplay );
@@ -271,7 +293,7 @@ void ScDPFunctionDlg::Init( const ScDPLabelData& rLabelData, const ScDPFuncData&
 
     // base field list box
     for( ScDPLabelDataVec::const_iterator aIt = mrLabelVec.begin(), aEnd = mrLabelVec.end(); aIt != aEnd; ++aIt )
-        maLbBaseField.InsertEntry( aIt->maName );
+        maLbBaseField.InsertEntry(aIt->getDisplayName());
 
     // base item list box
     maLbBaseItem.SetSeparatorPos( SC_BASEITEM_USER_POS - 1 );
@@ -414,8 +436,6 @@ void ScDPSubtotalDlg::FillLabelData( ScDPLabelData& rLabelData ) const
     rLabelData.mnUsedHier = maLabelData.mnUsedHier;
     rLabelData.mbShowAll = maCbShowAll.IsChecked();
     rLabelData.maMembers = maLabelData.maMembers;
-    rLabelData.maVisible = maLabelData.maVisible;
-    rLabelData.maShowDet = maLabelData.maShowDet;
     rLabelData.maSortInfo = maLabelData.maSortInfo;
     rLabelData.maLayoutInfo = maLabelData.maLayoutInfo;
     rLabelData.maShowInfo = maLabelData.maShowInfo;
@@ -424,7 +444,7 @@ void ScDPSubtotalDlg::FillLabelData( ScDPLabelData& rLabelData ) const
 void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScDPFuncData& rFuncData )
 {
     // field name
-    maFtName.SetText( rLabelData.maName );
+    maFtName.SetText(rLabelData.getDisplayName());
 
     // radio buttons
     maRbNone.SetClickHdl( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
@@ -547,9 +567,8 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const
 
     rLabelData.maMembers = maLabelData.maMembers;
     ULONG nVisCount = maLbHide.GetEntryCount();
-    rLabelData.maVisible.realloc( nVisCount );
     for( USHORT nPos = 0; nPos < nVisCount; ++nPos )
-        rLabelData.maVisible[ nPos ] = !maLbHide.IsChecked( nPos );
+        rLabelData.maMembers[nPos].mbVisible = !maLbHide.IsChecked(nPos);
 
     // *** HIERARCHY ***
 
@@ -563,7 +582,8 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayou
     sal_Int32 nSortMode = maLabelData.maSortInfo.Mode;
 
     // sort fields list box
-    maLbSortBy.InsertEntry( maLabelData.maName );
+    maLbSortBy.InsertEntry(maLabelData.getDisplayName());
+
     for( ScDPNameVec::const_iterator aIt = rDataFields.begin(), aEnd = rDataFields.end(); aIt != aEnd; ++aIt )
     {
         maLbSortBy.InsertEntry( *aIt );
@@ -656,8 +676,9 @@ void ScDPSubtotalOptDlg::InitHideListBox()
 {
     maLbHide.Clear();
     lclFillListBox( maLbHide, maLabelData.maMembers );
-    for( sal_Int32 nVisIdx = 0, nVisSize = maLabelData.maVisible.getLength(); nVisIdx < nVisSize; ++nVisIdx )
-        maLbHide.CheckEntryPos( static_cast< USHORT >( nVisIdx ), !maLabelData.maVisible[ nVisIdx ] );
+    size_t n = maLabelData.maMembers.size();
+    for (size_t i = 0; i < n; ++i)
+        maLbHide.CheckEntryPos(static_cast<USHORT>(i), !maLabelData.maMembers[i].mbVisible);
     bool bEnable = maLbHide.GetEntryCount() > 0;
     maFlHide.Enable( bEnable );
     maLbHide.Enable( bEnable );
@@ -690,8 +711,7 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox )
 {
     if( pLBox == &maLbHierarchy )
     {
-        mrDPObj.GetMembers( maLabelData.mnCol, maLbHierarchy.GetSelectEntryPos(),
-            maLabelData.maMembers, &maLabelData.maVisible, &maLabelData.maShowDet );
+        mrDPObj.GetMembers(maLabelData.mnCol, maLbHierarchy.GetSelectEntryPos(), maLabelData.maMembers);
         InitHideListBox();
     }
     return 0;
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index a73ba64a7..78d5a2fec 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -407,7 +407,7 @@ void ScDPLayoutDlg::InitWndSelect( const vector<ScDPLabelDataRef>& rLabels )
 
         if ( i <= nLast )
         {
-            aWndSelect.AddField( aLabelDataArr[i].maName, i );
+            aWndSelect.AddField(aLabelDataArr[i].getDisplayName(), i);
             aSelectArr[i].reset( new ScDPFuncData( aLabelDataArr[i].mnCol, aLabelDataArr[i].mnFuncMask ) );
         }
     }
@@ -608,7 +608,7 @@ void ScDPLayoutDlg::AddField( size_t nFromIndex, ScDPFieldType eToType, const Po
 
         if ( !bDataArr )
         {
-            if ( toWnd->AddField( rData.maName,
+            if ( toWnd->AddField( rData.getDisplayName(),
                                   DlgPos2WndPos( rAtPos, *toWnd ),
                                   nAddedAt ) )
             {
@@ -619,9 +619,9 @@ void ScDPLayoutDlg::AddField( size_t nFromIndex, ScDPFieldType eToType, const Po
         else
         {
             USHORT nMask = fData.mnFuncMask;
-            String aStr( GetFuncString( nMask, rData.mbIsValue ) );
-
-            aStr += rData.maName;
+            OUString aStr = GetFuncString( nMask, rData.mbIsValue );
+            
+            aStr += rData.getDisplayName();
 
             if ( toWnd->AddField( aStr,
                                   DlgPos2WndPos( rAtPos, *toWnd ),
@@ -1229,7 +1229,7 @@ String ScDPLayoutDlg::GetLabelString( SCsCOL nCol )
     ScDPLabelData* pData = GetLabelData( nCol );
     DBG_ASSERT( pData, "LabelData not found" );
     if (pData)
-        return pData->maName;
+        return pData->getDisplayName();
     return String();
 }
 
@@ -1558,33 +1558,27 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
                     bool bManualSort = ( aIt->maSortInfo.Mode == sheet::DataPilotFieldSortMode::MANUAL );
 
                     // visibility of members
-                    if( const rtl::OUString* pItem = aIt->maMembers.getConstArray() )
+                    for (vector<ScDPLabelData::Member>::const_iterator itr = aIt->maMembers.begin(), itrEnd = aIt->maMembers.end();
+                          itr != itrEnd; ++itr)
                     {
-                        sal_Int32 nIdx = 0;
-                        sal_Int32 nVisSize = aIt->maVisible.getLength();
-                        sal_Int32 nShowSize = aIt->maShowDet.getLength();
-                        for( const rtl::OUString* pEnd = pItem + aIt->maMembers.getLength(); pItem != pEnd; ++pItem, ++nIdx )
+                        ScDPSaveMember* pMember = pDim->GetMemberByName(itr->maName);
+
+                        // #i40054# create/access members only if flags are not default
+                        // (or in manual sorting mode - to keep the order)
+                        if (bManualSort || !itr->mbVisible || !itr->mbShowDetails)
+                        {
+                            pMember->SetIsVisible(itr->mbVisible);
+                            pMember->SetShowDetails(itr->mbShowDetails);
+                        }
+                        if (pOldDim)
                         {
-                            // #i40054# create/access members only if flags are not default
-                            // (or in manual sorting mode - to keep the order)
-                            bool bIsVisible = (nIdx >= nVisSize) || aIt->maVisible[ nIdx ];
-                            bool bShowDetails = (nIdx >= nShowSize) || aIt->maShowDet[ nIdx ];
-                            if( bManualSort || !bIsVisible || !bShowDetails )
+                            // Transfer the existing layout name.
+                            ScDPSaveMember* pOldMember = pOldDim->GetMemberByName(itr->maName);
+                            if (pOldMember)
                             {
-                                ScDPSaveMember* pMember = pDim->GetMemberByName( *pItem );
-                                pMember->SetIsVisible( bIsVisible );
-                                pMember->SetShowDetails( bShowDetails );
-                                if (pOldDim)
-                                {
-                                    // Transfer the existing layout name.
-                                    ScDPSaveMember* pOldMember = pOldDim->GetMemberByName(*pItem);
-                                    if (pOldMember)
-                                    {
-                                        const OUString* pLayoutName = pOldMember->GetLayoutName();
-                                        if (pLayoutName)
-                                            pMember->SetLayoutName(*pLayoutName);
-                                    }
-                                }
+                                const OUString* pLayoutName = pOldMember->GetLayoutName();
+                                if (pLayoutName)
+                                    pMember->SetLayoutName(*pLayoutName);
                             }
                         }
                     }
@@ -1774,7 +1768,7 @@ IMPL_LINK( ScDPLayoutDlg, ScrollHdl, ScrollBar *, EMPTYARG )
     for ( i=0; i<nFields; i++ )
     {
         const ScDPLabelData& rData = aLabelDataArr[nOffset+i];
-        aWndSelect.AddField( rData.maName, i );
+        aWndSelect.AddField(rData.getDisplayName(), i);
         aSelectArr[i].reset( new ScDPFuncData( rData.mnCol, rData.mnFuncMask ) );
     }
     for ( ; i<aSelectArr.size(); i++ )
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index c2a75b24a..e18b42034 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -104,7 +104,7 @@ sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList )
         xub_StrLen nCount = rList.GetTokenCount('\t');
         for ( xub_StrLen i=0; i<nCount; i+=2 )
         {
-            if ( ScGlobal::GetpTransliteration()->isEqual( aStr, rList.GetToken(i,'\t') ) )//CHINA001 if ( ScGlobal::pTransliteration->isEqual( aStr, rList.GetToken(i,'\t') ) )
+            if ( ScGlobal::GetpTransliteration()->isEqual( aStr, rList.GetToken(i,'\t') ) )//CHINA001 if ( ScGlobal::GetpTransliteration()->isEqual( aStr, rList.GetToken(i,'\t') ) )
                 c = (sal_Unicode)rList.GetToken(i+1,'\t').ToInt32();
         }
         if (!c && aStr.Len())
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
new file mode 100644
index 000000000..a59b42ac6
--- /dev/null
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -0,0 +1,120 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: langbox.hxx,v $
+ * $Revision: 1.4.242.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sc.hxx"
+
+#undef SC_DLLIMPLEMENTATION
+
+//------------------------------------------------------------------------
+
+#include "textimportoptions.hxx"
+#include "textimportoptions.hrc"
+
+#include "scresid.hxx"
+#include "vcl/window.hxx"
+#include "vcl/msgbox.hxx"
+#include "vcl/svapp.hxx"
+
+ScTextImportOptionsDlg::ScTextImportOptionsDlg(Window* pParent) :
+    ModalDialog(pParent, ScResId(RID_SCDLG_TEXT_IMPORT_OPTIONS)),
+
+    maBtnOk(this, ScResId(BTN_OK)),
+    maBtnCancel(this, ScResId(BTN_CANCEL)),
+    maBtnHelp(this, ScResId(BTN_HELP)),
+    maFlChooseLang(this, ScResId(FL_CHOOSE_LANG)),
+    maRbAutomatic(this, ScResId(RB_AUTOMATIC)), 
+    maRbCustom(this, ScResId(RB_CUSTOM)),
+    maLbCustomLang(this, ScResId(LB_CUSTOM_LANG)),
+    maFlOption(this, ScResId(FL_OPTION)),
+    maBtnConvertDate(this, ScResId(BTN_CONVERT_DATE))
+{
+    init();
+}
+
+ScTextImportOptionsDlg::~ScTextImportOptionsDlg()
+{
+}
+
+short ScTextImportOptionsDlg::Execute()
+{
+    return ModalDialog::Execute();
+}
+
+LanguageType ScTextImportOptionsDlg::getLanguageType() const
+{
+    if (maRbAutomatic.IsChecked())
+        return LANGUAGE_SYSTEM;
+
+    return maLbCustomLang.GetSelectLanguage();
+}
+
+bool ScTextImportOptionsDlg::isDateConversionSet() const
+{
+    return maBtnConvertDate.IsChecked();
+}
+
+void ScTextImportOptionsDlg::init()
+{
+    Link aLink = LINK( this, ScTextImportOptionsDlg, OKHdl );
+    maBtnOk.SetClickHdl(aLink);
+    aLink = LINK( this, ScTextImportOptionsDlg, RadioHdl );
+    maRbAutomatic.SetClickHdl(aLink);
+    maRbCustom.SetClickHdl(aLink);
+
+    maRbAutomatic.Check(true);
+
+    maLbCustomLang.SetLanguageList(
+        LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, false, false);
+
+    LanguageType eLang = Application::GetSettings().GetLanguage();
+    maLbCustomLang.SelectLanguage(eLang);
+    maLbCustomLang.Disable();
+}
+
+IMPL_LINK( ScTextImportOptionsDlg, OKHdl, OKButton*, EMPTYARG )
+{
+    EndDialog(RET_OK);
+    return 0;
+}
+
+IMPL_LINK( ScTextImportOptionsDlg, RadioHdl, RadioButton*, pBtn )
+{
+    if (pBtn == &maRbAutomatic)
+    {
+        maLbCustomLang.Disable();
+    }
+    else if (pBtn == &maRbCustom)
+    {
+        maLbCustomLang.Enable();
+    }
+    return 0;
+}
+
diff --git a/sc/source/ui/dbgui/textimportoptions.src b/sc/source/ui/dbgui/textimportoptions.src
new file mode 100644
index 000000000..4a4d15851
--- /dev/null
+++ b/sc/source/ui/dbgui/textimportoptions.src
@@ -0,0 +1,112 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: retypepassdlg.src,v $
+ * $Revision: 1.1.2.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "textimportoptions.hrc"
+
+ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
+{
+    Text [ en-US ] = "Import Options" ;
+    Size = MAP_APPFONT ( 190 , 101 ) ;
+    Moveable = TRUE ;
+    Closeable = TRUE ;
+    OutputSize = TRUE ;
+
+    OKButton BTN_OK
+    {
+        Pos = MAP_APPFONT ( 135, 6 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
+        DefButton = TRUE ;
+    };
+
+    CancelButton BTN_CANCEL
+    {
+        Pos = MAP_APPFONT ( 135, 23 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
+    };
+
+    HelpButton BTN_HELP
+    {
+        Pos = MAP_APPFONT ( 135, 43 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
+    };
+
+    FixedLine FL_CHOOSE_LANG
+    {
+        Pos = MAP_APPFONT( 6, 3 ) ;
+        Size = MAP_APPFONT( 125, 14 ) ;
+
+        Text [ en-US ] = "Select the language to use for import" ; 
+    };
+
+    RadioButton RB_AUTOMATIC
+    {
+        Pos = MAP_APPFONT( 12, 20 ) ;
+        Size = MAP_APPFONT( 50, 10 ) ;
+        TabStop = TRUE ;
+
+        Text [ en-US ] = "Automatic" ; 
+    };
+
+    RadioButton RB_CUSTOM
+    {
+        Pos = MAP_APPFONT( 12, 34 ) ;
+        Size = MAP_APPFONT( 50, 10 ) ;
+        TabStop = TRUE ;
+
+        Text [ en-US ] = "Custom" ; 
+    };
+
+    ListBox LB_CUSTOM_LANG
+    {
+        Pos = MAP_APPFONT( 20, 50 ) ;
+        Size = MAP_APPFONT( 100, 55 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+        Sort = TRUE ;
+    };
+
+    FixedLine FL_OPTION
+    {
+	Pos = MAP_APPFONT( 6, 70 );
+	Size = MAP_APPFONT( 125, 14 );
+
+	Text [ en-US ] = "Options" ;
+    };
+
+    CheckBox BTN_CONVERT_DATE
+    {
+    	Pos = MAP_APPFONT( 12, 86 );
+	Size = MAP_APPFONT( 125, 10 );
+	TabStop = TRUE ;
+
+	Text [ en-US ] = "Detect special numbers (such as dates)." ;
+    };
+};
+
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index b288d52bb..1a686d93b 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -63,6 +63,7 @@
 
 #include "sc.hrc" //CHINA001
 #include "scabstdlg.hxx" //CHINA001
+#include "clipparam.hxx"
 
 struct AreaLink_Impl
 {
@@ -389,9 +390,8 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
                     aSourceMark.SelectOneTable( nSrcTab );		// selektieren fuer CopyToClip
                     aSourceMark.SetMarkArea( aTokenRange );
 
-                    pSrcDoc->CopyToClip( aTokenRange.aStart.Col(), aTokenRange.aStart.Row(),
-                                         aTokenRange.aEnd.Col(), aTokenRange.aEnd.Row(),
-                                         FALSE, &aClipDoc, FALSE, &aSourceMark );
+                    ScClipParam aClipParam(aTokenRange, false);
+                    pSrcDoc->CopyToClip(aClipParam, &aClipDoc, &aSourceMark);
 
                     if ( aClipDoc.HasAttrib( 0,0,nSrcTab, MAXCOL,MAXROW,nSrcTab,
                                             HASATTR_MERGED | HASATTR_OVERLAPPED ) )
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index c0fd9b7c8..4180060d8 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -939,7 +939,10 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
     }
 
     if (!bCopy)
+    {
+        pDoc->InvalidatePageBreaks(nTab);    
         pDoc->UpdatePageBreaks( nTab );
+    }
 
     // #i23299# because of Subtotal functions, the whole rows must be set dirty
     ScRange aDirtyRange( 0 , aLocalParam.nRow1, nDestTab,
@@ -1234,7 +1237,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
                                   aRange.aEnd.Col(),   aRange.aEnd.Row(),
                                   nTab, SC_MF_AUTO );
 
-            pDoc->GetDPCollection()->Free( pOldObj );	// object is deleted here
+            pDoc->GetDPCollection()->FreeTable( pOldObj );  // object is deleted here
 
             rDocShell.PostPaintGridAll();	//! only necessary parts
             rDocShell.PostPaint( aRange.aStart.Col(), aRange.aStart.Row(), nTab,
@@ -1278,7 +1281,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
 
                 pDestObj = new ScDPObject( *pNewObj );
                 pDestObj->SetAlive(TRUE);
-                if ( !pDoc->GetDPCollection()->Insert(pDestObj) )
+                if ( !pDoc->GetDPCollection()->InsertNewTable(pDestObj) )
                 {
                     DBG_ERROR("cannot insert DPObject");
                     DELETEZ( pDestObj );
@@ -1405,34 +1408,35 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
     delete pNewUndoDoc;
     delete pUndoDPObj;
 
-	if (const_cast<ScDPObject *>(pNewObj)->GetAutoFormatIndex() != 65535)
-	{
-		ScViewData* pViewData = rDocShell.GetViewData();
-		rDocShell.GetViewData()->GetViewShell()->GetDBData( TRUE, SC_DB_OLD );
-		const ScMarkData& rMark1 = pViewData->GetMarkData();
-		SCCOL nStartCol;
-		SCROW nStartRow;
-		SCTAB nStartTab;
-		SCCOL nEndCol;
-		SCROW nEndRow;
-		SCTAB nEndTab;
-
-		rDocShell.GetViewData()->GetSimpleArea( nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab );
-		ScRange Outrange = pNewObj->GetOutRange();
-		if (( (Outrange.aStart.Col() <= nStartCol) && (nStartCol <= Outrange.aEnd.Col() )&& (nStartTab == Outrange.aStart.Tab()))
-			&& ( (Outrange.aStart.Row() <= nStartRow) && (nStartRow <= Outrange.aEnd.Row() )) )
-			{
-		
-			if ( !rMark1.IsMarked() && !rMark1.IsMultiMarked() )
-				rDocShell.GetViewData()->GetViewShell()->MarkDataArea( TRUE );
-			//FIXME: Autoformat even when clicked from a non-dp cell.
-			pViewData->MoveNextRow();		
-			rDocShell.GetViewData()->GetViewShell()->AutoFormat( const_cast<ScDPObject *>(pNewObj)->GetAutoFormatIndex());
-			rDocShell.GetViewData()->GetViewShell()->AutoFormatPivotTable( const_cast<ScDPObject *>(pNewObj), const_cast<ScDPObject *>(pNewObj)->GetAutoFormatIndex() );		
-			pViewData->MovePrevRow();
-			}
-	}
-
+    if (const_cast<ScDPObject *>(pNewObj)->GetAutoFormatIndex() != 65535)
+    {
+        ScViewData* pViewData = rDocShell.GetViewData();
+        ScTabViewShell* pViewShell = pViewData->GetViewShell();
+        pViewShell->GetDBData( TRUE, SC_DB_OLD );
+        const ScMarkData& rMark1 = pViewData->GetMarkData();
+        SCCOL nStartCol;
+        SCROW nStartRow;
+        SCTAB nStartTab;
+        SCCOL nEndCol;
+        SCROW nEndRow;
+        SCTAB nEndTab;
+
+        rDocShell.GetViewData()->GetSimpleArea( nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab );
+        ScRange Outrange = pNewObj->GetOutRange();
+        if (( (Outrange.aStart.Col() <= nStartCol) && (nStartCol <= Outrange.aEnd.Col() )&& (nStartTab == Outrange.aStart.Tab()))
+            && ( (Outrange.aStart.Row() <= nStartRow) && (nStartRow <= Outrange.aEnd.Row() )) )
+        {
+        
+            if ( !rMark1.IsMarked() && !rMark1.IsMultiMarked() )
+                pViewShell->MarkDataArea( TRUE );
+            //FIXME: Autoformat even when clicked from a non-dp cell.
+            pViewData->MoveNextRow();
+            sal_uInt16 nAutoFmtIndex = pNewObj->GetAutoFormatIndex();
+            pViewShell->AutoFormat(nAutoFmtIndex);
+            pViewShell->AutoFormatPivotTable(const_cast<ScDPObject*>(pNewObj), nAutoFmtIndex);
+            pViewData->MovePrevRow();
+        }
+    }
 
     if (bDone)
         aModificator.SetDocumentModified();
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 9aea7ced6..cd7ad9ec8 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -101,6 +101,7 @@
 #include "compiler.hxx"
 #include "scui_def.hxx" //CHINA001
 #include "tabprotection.hxx"
+#include "clipparam.hxx"
 
 #include <memory>
 #include <set>
@@ -109,6 +110,7 @@ using namespace com::sun::star;
 using ::com::sun::star::uno::Sequence;
 using ::std::vector;
 
+
 // STATIC DATA -----------------------------------------------------------
 
 //========================================================================
@@ -122,6 +124,14 @@ IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction )
     else
         rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDraw( pUndoAction, &rDocShell ) );
     rDocShell.SetDrawModified();
+
+    // the affected sheet isn't known, so all stream positions are invalidated
+    ScDocument* pDoc = rDocShell.GetDocument();
+    SCTAB nTabCount = pDoc->GetTableCount();
+    for (SCTAB nTab=0; nTab<nTabCount; nTab++)
+        if (pDoc->IsStreamValid(nTab))
+            pDoc->SetStreamValid(nTab, FALSE);
+
     return 0;
 }
 
@@ -1108,6 +1118,9 @@ bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow )
     if( rDoc.IsUndoEnabled() )
         rDocShell.GetUndoManager()->AddUndoAction( new ScUndoShowHideNote( rDocShell, rPos, bShow ) );
 
+    if (rDoc.IsStreamValid(rPos.Tab()))
+        rDoc.SetStreamValid(rPos.Tab(), FALSE);
+
     rDocShell.SetDocumentModified();
 
     return true;
@@ -1136,6 +1149,9 @@ bool ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, BOOL bA
 
     //!	Undo !!!
 
+    if (pDoc->IsStreamValid(rPos.Tab()))
+        pDoc->SetStreamValid(rPos.Tab(), FALSE);
+
     rDocShell.PostPaintCell( rPos );
     aModificator.SetDocumentModified();
 
@@ -1189,6 +1205,10 @@ bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, con
 
         // repaint cell (to make note marker visible)
         rDocShell.PostPaintCell( rPos );
+
+        if (rDoc.IsStreamValid(rPos.Tab()))
+            rDoc.SetStreamValid(rPos.Tab(), FALSE);
+
         aModificator.SetDocumentModified();
         bDone = true;
     }
@@ -2315,8 +2335,8 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
     }
     ScDrawLayer::SetGlobalDrawPersist(aDragShellRef);
 
-    pDoc->CopyToClip( nStartCol, nStartRow, nEndCol, nEndRow, bCut, pClipDoc,
-                        FALSE, &aSourceMark, bScenariosAdded, TRUE );
+    ScClipParam aClipParam(ScRange(nStartCol, nStartRow, 0, nEndCol, nEndRow, 0), false);
+    pDoc->CopyToClip(aClipParam, pClipDoc, &aSourceMark, false, bScenariosAdded, true);
 
     ScDrawLayer::SetGlobalDrawPersist(NULL);
 
@@ -3011,6 +3031,104 @@ BOOL ScDocFunc::RenameTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL
     return bSuccess;
 }
 
+BOOL ScDocFunc::SetTabBgColor( SCTAB nTab, const Color& rColor, BOOL bRecord, BOOL bApi )
+{
+
+    ScDocument* pDoc = rDocShell.GetDocument();
+    if (bRecord && !pDoc->IsUndoEnabled())
+        bRecord = FALSE;
+    if ( !pDoc->IsDocEditable() || pDoc->IsTabProtected(nTab) )
+    {
+        if (!bApi)
+            rDocShell.ErrorMessage(STR_PROTECTIONERR); //TODO Check to see what this string is...
+        return FALSE;
+    }
+
+    ScViewData* pViewData = rDocShell.GetViewData();
+
+    Color aOldTabBgColor;
+    aOldTabBgColor = pViewData->GetTabBgColor(nTab);
+
+    BOOL bSuccess = FALSE;
+    pViewData->SetTabBgColor(rColor, nTab);
+    if ( pViewData->GetTabBgColor( nTab ) == rColor)
+        bSuccess = TRUE;
+    if (bSuccess)
+    {
+        if (bRecord)
+        {
+            rDocShell.GetUndoManager()->AddUndoAction(
+                new ScUndoSetTabBgColor( &rDocShell, nTab, aOldTabBgColor, rColor));
+        }
+        rDocShell.PostPaintExtras();
+        ScDocShellModificator aModificator( rDocShell );
+        aModificator.SetDocumentModified();
+        SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
+
+        bSuccess = TRUE;
+    }
+    return bSuccess;
+}
+
+BOOL ScDocFunc::SetTabBgColor( ScUndoSetTabBgColorInfoList* rUndoSetTabBgColorInfoList, BOOL bRecord, BOOL bApi )
+{
+    ScDocument* pDoc = rDocShell.GetDocument();
+    if (bRecord && !pDoc->IsUndoEnabled())
+        bRecord = FALSE;
+    if ( !pDoc->IsDocEditable() )
+    {
+        if (!bApi)
+            rDocShell.ErrorMessage(STR_PROTECTIONERR); //TODO Get a better String Error...
+        return FALSE;
+    }
+
+    ScViewData* pViewData = rDocShell.GetViewData();
+    USHORT nTab;
+    Color aNewTabBgColor;
+    ScUndoSetTabBgColorInfo* rUndoSetTabBgColorInfo;
+    BOOL bSuccess = TRUE;
+    USHORT nTabProtectCount = 0;
+    for ( USHORT i=0; i < rUndoSetTabBgColorInfoList->Count(); i++ )
+    {
+        rUndoSetTabBgColorInfo = rUndoSetTabBgColorInfoList->GetObject(i);
+        nTab = rUndoSetTabBgColorInfo->nTabId;
+        if ( !pDoc->IsTabProtected(nTab) )
+        {
+            aNewTabBgColor = rUndoSetTabBgColorInfo->aNewTabBgColor;
+            rUndoSetTabBgColorInfo->aOldTabBgColor = pViewData->GetTabBgColor(nTab);
+            pViewData->SetTabBgColor(aNewTabBgColor, nTab);
+            if ( pViewData->GetTabBgColor( nTab ) != aNewTabBgColor)
+            {
+                bSuccess = FALSE;
+                break;
+            }
+        }
+        else
+        {
+            nTabProtectCount++;
+        }
+    }
+    if ( nTabProtectCount == rUndoSetTabBgColorInfoList->Count() )
+    {
+        if (!bApi)
+            rDocShell.ErrorMessage(STR_PROTECTIONERR); //TODO Get a better String Error...
+        return FALSE;
+    }
+    if (bSuccess)
+    {
+        if (bRecord)
+        {
+            rDocShell.GetUndoManager()->AddUndoAction(
+                new ScUndoSetTabBgColor( &rDocShell, rUndoSetTabBgColorInfoList));
+        }
+        rDocShell.PostPaintExtras();
+        ScDocShellModificator aModificator( rDocShell );
+        aModificator.SetDocumentModified();
+        SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
+    }
+    return bSuccess;
+}
+
 //------------------------------------------------------------------------
 
 //!	SetWidthOrHeight - noch doppelt zu ViewFunc !!!!!!
@@ -3113,7 +3231,9 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
                     for (SCROW nRow=nStartNo; nRow<=nEndNo; nRow++)
                     {
                         BYTE nOld = pDoc->GetRowFlags(nRow,nTab);
-                        if ( (nOld & CR_HIDDEN) == 0 && ( nOld & CR_MANUALSIZE ) )
+						SCROW nLastRow = -1;
+						bool bHidden = pDoc->RowHidden(nRow, nTab, nLastRow);
+						if ( !bHidden && ( nOld & CR_MANUALSIZE ) )
                             pDoc->SetRowFlags( nRow, nTab, nOld & ~CR_MANUALSIZE );
                     }
                 }
@@ -3148,8 +3268,8 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
         {
             for (SCCOL nCol=static_cast<SCCOL>(nStartNo); nCol<=static_cast<SCCOL>(nEndNo); nCol++)
             {
-                if ( eMode != SC_SIZE_VISOPT ||
-                     (pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN) == 0 )
+                SCCOL nLastCol = -1;
+                if ( eMode != SC_SIZE_VISOPT || !pDoc->ColHidden(nCol, nTab, nLastCol) )
                 {
                     USHORT nThisSize = nSizeTwips;
 
@@ -3219,20 +3339,22 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
     if (nPos == 0)
         return FALSE;					// erste Spalte / Zeile
 
-    BYTE nFlags = bColumn ? pDoc->GetColFlags( static_cast<SCCOL>(nPos), nTab )
-        : pDoc->GetRowFlags( static_cast<SCROW>(nPos), nTab );
-    if (nFlags & CR_MANUALBREAK)
-        return TRUE;					// Umbruch schon gesetzt
+    ScBreakType nBreak = bColumn ? 
+        pDoc->HasColBreak(static_cast<SCCOL>(nPos), nTab) : 
+        pDoc->HasRowBreak(static_cast<SCROW>(nPos), nTab);
+    if (nBreak & BREAK_MANUAL)
+        return true;
 
     if (bRecord)
         rDocShell.GetUndoManager()->AddUndoAction(
             new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, TRUE ) );
 
-    nFlags |= CR_MANUALBREAK;
     if (bColumn)
-        pDoc->SetColFlags( static_cast<SCCOL>(nPos), nTab, nFlags );
+        pDoc->SetColBreak(static_cast<SCCOL>(nPos), nTab, false, true);
     else
-        pDoc->SetRowFlags( static_cast<SCROW>(nPos), nTab, nFlags );
+        pDoc->SetRowBreak(static_cast<SCROW>(nPos), nTab, false, true);
+
+    pDoc->InvalidatePageBreaks(nTab);
     pDoc->UpdatePageBreaks( nTab );
 
     if (bColumn)
@@ -3275,20 +3397,25 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
 
     SCCOLROW nPos = bColumn ? static_cast<SCCOLROW>(rPos.Col()) :
         static_cast<SCCOLROW>(rPos.Row());
-    BYTE nFlags = bColumn ? pDoc->GetColFlags( static_cast<SCCOL>(nPos), nTab )
-        : pDoc->GetRowFlags( static_cast<SCROW>(nPos), nTab );
-    if ((nFlags & CR_MANUALBREAK)==0)
-        return FALSE;							// kein Umbruch gesetzt
+
+    ScBreakType nBreak;
+    if (bColumn)
+        nBreak = pDoc->HasColBreak(static_cast<SCCOL>(nPos), nTab);
+    else
+        nBreak = pDoc->HasRowBreak(static_cast<SCROW>(nPos), nTab);
+    if ((nBreak & BREAK_MANUAL) == 0)
+        // There is no manual break.
+        return false;
 
     if (bRecord)
         rDocShell.GetUndoManager()->AddUndoAction(
             new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, FALSE ) );
 
-    nFlags &= ~CR_MANUALBREAK;
     if (bColumn)
-        pDoc->SetColFlags( static_cast<SCCOL>(nPos), nTab, nFlags );
+        pDoc->RemoveColBreak(static_cast<SCCOL>(nPos), nTab, false, true);
     else
-        pDoc->SetRowFlags( static_cast<SCROW>(nPos), nTab, nFlags );
+        pDoc->RemoveRowBreak(static_cast<SCROW>(nPos), nTab, false, true);
+
     pDoc->UpdatePageBreaks( nTab );
 
     if (bColumn)
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index b3eecddf1..61970c23a 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -120,6 +120,7 @@
 #include "cfgids.hxx"
 #include "warnpassword.hxx"
 #include "optsolver.hxx"
+#include "sheetdata.hxx"
 #include "tabprotection.hxx"
 
 #include "docsh.hxx"
@@ -286,7 +287,7 @@ void ScDocShell::BeforeXMLLoading()
     uno::Reference< document::XVbaEventsHelper > xEvt( aDocument.GetVbaEventsHelper() );
     if ( xEvt.is() )
        xEvt->setIgnoreEvents( sal_True );
-    
+
 // if VBA enabled then we need to  
     // prevent unnecessary broadcasts and updates
     DBG_ASSERT(pModificator == NULL, "The Modificator should not exist");
@@ -866,8 +867,13 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
                     if ( IsDocShared() && !SC_MOD()->IsInSharedDocSaving() )
                     {
                     }
+                    UseSheetSaveEntries();      // use positions from saved file for next saving
                 }
                 break;
+            case SFX_EVENT_SAVEASDOCDONE:
+                // new positions are used after "save" and "save as", but not "save to"
+                UseSheetSaveEntries();      // use positions from saved file for next saving
+                break;
             default:
                 {
                 }
@@ -2384,6 +2390,7 @@ BOOL ScDocShell::HasAutomaticTableName( const String& rFilter )		// static
         pPaintLockData	( NULL ), \
         pOldJobSetup	( NULL ), \
         pSolverSaveData ( NULL ), \
+        pSheetSaveData  ( NULL ), \
         pModificator    ( NULL )
 
 //------------------------------------------------------------------
@@ -2477,6 +2484,7 @@ __EXPORT ScDocShell::~ScDocShell()
     delete pOldJobSetup;		// gesetzt nur bei Fehler in StartJob()
 
     delete pSolverSaveData;
+    delete pSheetSaveData;
     delete pOldAutoDBRange;
 
     if (pModificator)
@@ -2647,6 +2655,39 @@ void ScDocShell::SetSolverSaveData( const ScOptSolverSave& rData )
     pSolverSaveData = new ScOptSolverSave( rData );
 }
 
+ScSheetSaveData* ScDocShell::GetSheetSaveData()
+{
+    if (!pSheetSaveData)
+        pSheetSaveData = new ScSheetSaveData;
+
+    return pSheetSaveData;
+}
+
+void ScDocShell::UseSheetSaveEntries()
+{
+    if (pSheetSaveData)
+    {
+        pSheetSaveData->UseSaveEntries();   // use positions from saved file for next saving
+
+        bool bHasEntries = false;
+        SCTAB nTabCount = aDocument.GetTableCount();
+        SCTAB nTab;
+        for (nTab = 0; nTab < nTabCount; ++nTab)
+            if (pSheetSaveData->HasStreamPos(nTab))
+                bHasEntries = true;
+
+        if (!bHasEntries)
+        {
+            // if no positions were set (for example, export to other format),
+            // reset all "valid" flags
+
+            for (nTab = 0; nTab < nTabCount; ++nTab)
+                if (aDocument.IsStreamValid(nTab))
+                    aDocument.SetStreamValid(nTab, FALSE);
+        }
+    }
+}
+
 // --- ScDocShellModificator ------------------------------------------
 
 ScDocShellModificator::ScDocShellModificator( ScDocShell& rDS )
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index d6a690a79..2fb37e0e1 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1303,6 +1303,13 @@ void ScDocShell::DoHardRecalc( BOOL /* bApi */ )
     aDocument.BroadcastUno( SfxSimpleHint( SC_HINT_CALCALL ) );
     aDocument.BroadcastUno( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
 
+    // use hard recalc also to disable stream-copying of all sheets
+    // (somewhat consistent with charts)
+    SCTAB nTabCount = aDocument.GetTableCount();
+    for (SCTAB nTab=0; nTab<nTabCount; nTab++)
+        if (aDocument.IsStreamValid(nTab))
+            aDocument.SetStreamValid(nTab, FALSE);
+
     PostPaintGridAll();
 }
 
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index 77d42d3ef..ea82bff8c 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -411,6 +411,7 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore )
 {
     BOOL bIsUndoEnabled = aDocument.IsUndoEnabled();
     aDocument.EnableUndo( FALSE );
+    aDocument.LockStreamValid( true );      // ignore draw page size (but not formula results)
     if ( bBefore )          // check all sheets up to nUpdateTab
     {
         SCTAB nTabCount = aDocument.GetTableCount();
@@ -442,6 +443,7 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore )
             aDocument.SetPendingRowHeights( nUpdateTab, FALSE );
         }
     }
+    aDocument.LockStreamValid( false );
     aDocument.EnableUndo( bIsUndoEnabled );
 }
 
@@ -881,7 +883,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
 			{
 				aLibName = GetBasicManager()->GetName();
 				pStarBASIC = GetBasicManager()->GetLib( aLibName );
-			}
+        }
 			BOOL bVbaEnabled = pStarBASIC ? pStarBASIC->isVBAEnabled() : FALSE;
 			SCTAB nTabToUse = nDestTab; 
 
@@ -911,7 +913,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
 				} 
 				lcl_InsertModule( *this, nTabToUse, sCodeName, sSource );
 			}
-        }
+		}
 
         Broadcast( ScTablesHint( SC_TAB_COPIED, nSrcTab, nDestTab ) );
     }
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index c01cda949..0db7d6b3f 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -43,13 +43,14 @@
 #include <ucbhelper/content.hxx>
 #include <unotools/sharedunocomponent.hxx>
 #include <comphelper/processfactory.hxx>
-#include <connectivity/dbcharset.hxx>
 #include <svx/txenctab.hxx>
+#include <svx/dbcharsethelper.hxx>
 
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
+#include <com/sun/star/sdbc/XDriverAccess.hpp>
 #include <com/sun/star/sdbc/XDriverManager.hpp>
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
@@ -112,6 +113,61 @@ using ::std::vector;
 
 #define SC_ROWCOUNT_ERROR		(-1)
 
+namespace
+{
+    ULONG lcl_getDBaseConnection(uno::Reference<sdbc::XDriverManager>& _rDrvMgr,uno::Reference<sdbc::XConnection>& _rConnection,String& _rTabName,const String& rFullFileName,rtl_TextEncoding eCharSet)
+    {
+        INetURLObject aURL;
+        aURL.SetSmartProtocol( INET_PROT_FILE );
+        aURL.SetSmartURL( rFullFileName );
+        _rTabName = aURL.getBase( INetURLObject::LAST_SEGMENT, true,
+                INetURLObject::DECODE_UNAMBIGUOUS );
+        String aExtension = aURL.getExtension();
+        aURL.removeSegment();
+        aURL.removeFinalSlash();
+        String aPath = aURL.GetMainURL(INetURLObject::NO_DECODE);
+        uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory();
+        if (!xFactory.is()) return SCERR_EXPORT_CONNECT;
+
+        _rDrvMgr.set( xFactory->createInstance(
+                            rtl::OUString::createFromAscii( SC_SERVICE_DRVMAN ) ),
+                            uno::UNO_QUERY);
+        DBG_ASSERT( _rDrvMgr.is(), "can't get DriverManager" );
+        if (!_rDrvMgr.is()) return SCERR_EXPORT_CONNECT;
+
+        // get connection
+
+        String aConnUrl = String::CreateFromAscii("sdbc:dbase:");
+        aConnUrl += aPath;
+
+        svxform::ODataAccessCharsetHelper aHelper;
+        ::std::vector< rtl_TextEncoding > aEncodings;
+        aHelper.getSupportedTextEncodings( aEncodings );
+        ::std::vector< rtl_TextEncoding >::iterator aIter = ::std::find(aEncodings.begin(),aEncodings.end(),(rtl_TextEncoding) eCharSet);
+        if ( aIter == aEncodings.end() )
+        {
+            DBG_ERRORFILE( "DBaseImport: dbtools::OCharsetMap doesn't know text encoding" );
+            return SCERR_IMPORT_CONNECT;
+        } // if ( aIter == aMap.end() )
+        rtl::OUString aCharSetStr;
+        if ( RTL_TEXTENCODING_DONTKNOW != *aIter )
+        {	// it's not the virtual "system charset"
+            const char* pIanaName = rtl_getMimeCharsetFromTextEncoding( *aIter );
+            OSL_ENSURE( pIanaName, "invalid mime name!" );
+            if ( pIanaName )
+                aCharSetStr = ::rtl::OUString::createFromAscii( pIanaName );
+        }
+
+        uno::Sequence<beans::PropertyValue> aProps(2);
+        aProps[0].Name = rtl::OUString::createFromAscii(SC_DBPROP_EXTENSION);
+        aProps[0].Value <<= rtl::OUString( aExtension );
+        aProps[1].Name = rtl::OUString::createFromAscii(SC_DBPROP_CHARSET);
+        aProps[1].Value <<= aCharSetStr;
+
+        _rConnection = _rDrvMgr->getConnectionWithInfo( aConnUrl, aProps );
+        return 0L;
+    }
+}
 // -----------------------------------------------------------------------
 // MoveFile/KillFile/IsDocument: similar to SfxContentHelper
 
@@ -256,49 +312,14 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
 
     try
     {
-        INetURLObject aURL;
-        aURL.SetSmartProtocol( INET_PROT_FILE );
-        aURL.SetSmartURL( rFullFileName );
-        String aTabName = aURL.getBase( INetURLObject::LAST_SEGMENT, true,
-                                        INetURLObject::DECODE_UNAMBIGUOUS );
-        String aExtension = aURL.getExtension();
-        aURL.removeSegment();
-        aURL.removeFinalSlash();
-        String aPath = aURL.GetMainURL(INetURLObject::NO_DECODE);
-
-        uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory();
-        if (!xFactory.is())
-            return ERRCODE_IO_GENERAL;
-
-        uno::Reference<sdbc::XDriverManager> xDrvMan( xFactory->createInstance(
-                            rtl::OUString::createFromAscii( SC_SERVICE_DRVMAN ) ),
-                            uno::UNO_QUERY);
-        DBG_ASSERT( xDrvMan.is(), "can't get DriverManager" );
-        if (!xDrvMan.is()) return SCERR_IMPORT_CONNECT;
-
-        String aConnUrl = String::CreateFromAscii("sdbc:dbase:");
-        aConnUrl += aPath;
-
-        dbtools::OCharsetMap aMap;
-        dbtools::OCharsetMap::CharsetIterator aIter = aMap.find( (rtl_TextEncoding) eCharSet );
-        if ( aIter == aMap.end() )
-        {
-            DBG_ERRORFILE( "DBaseImport: dbtools::OCharsetMap doesn't know text encoding" );
-            return SCERR_IMPORT_CONNECT;
-        }
-        rtl::OUString aCharSetStr = (*aIter).getIanaName();
-
-        uno::Sequence<beans::PropertyValue> aProps(2);
-        aProps[0].Name = rtl::OUString::createFromAscii(SC_DBPROP_EXTENSION);
-        aProps[0].Value <<= rtl::OUString( aExtension );
-        aProps[1].Name = rtl::OUString::createFromAscii(SC_DBPROP_CHARSET);
-        aProps[1].Value <<= aCharSetStr;
-
-        uno::Reference<sdbc::XConnection> xConnection =
-                                xDrvMan->getConnectionWithInfo( aConnUrl, aProps );
-        DBG_ASSERT( xConnection.is(), "can't get Connection" );
-        if (!xConnection.is()) return SCERR_IMPORT_CONNECT;
-
+        String aTabName;
+        uno::Reference<sdbc::XDriverManager> xDrvMan;
+        uno::Reference<sdbc::XConnection> xConnection;
+        ULONG nRet = lcl_getDBaseConnection(xDrvMan,xConnection,aTabName,rFullFileName,eCharSet);
+        if ( !xConnection.is() || !xDrvMan.is() )
+            return nRet;
+        ::utl::DisposableComponent aConnectionHelper(xConnection);
+        
         long nRowCount = 0;
         if ( nRowCount < 0 )
         {
@@ -307,10 +328,11 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
         }
 
         ScProgress aProgress( this, ScGlobal::GetRscString( STR_LOAD_DOC ), nRowCount );
-
+        uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory();
         uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance(
                             rtl::OUString::createFromAscii( SC_SERVICE_ROWSET ) ),
                             uno::UNO_QUERY);
+        ::utl::DisposableComponent aRowSetHelper(xRowSet);
         uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY );
         DBG_ASSERT( xRowProp.is(), "can't get RowSet" );
         if (!xRowProp.is()) return SCERR_IMPORT_CONNECT;
@@ -428,9 +450,6 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
             if ( nRowCount )
                 aProgress.SetStateOnPercent( nRow );
         }
-
-        comphelper::disposeComponent( xRowSet );
-        comphelper::disposeComponent( xConnection );
     }
     catch ( sdbc::SQLException& )
     {
@@ -791,91 +810,29 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
                         aColNames.getArray(), aColTypes.getArray(),
                         aColLengths.getArray(), aColScales.getArray(),
                         bHasMemo, eCharSet );
-
-    INetURLObject aURL;
-    aURL.SetSmartProtocol( INET_PROT_FILE );
-    aURL.SetSmartURL( rFullFileName );
-    String aTabName = aURL.getBase( INetURLObject::LAST_SEGMENT, true,
-            INetURLObject::DECODE_UNAMBIGUOUS );
-    String aExtension = aURL.getExtension();
-    aURL.removeSegment();
-    aURL.removeFinalSlash();
-    String aPath = aURL.GetMainURL(INetURLObject::NO_DECODE);
-
     // also needed for exception catch
     SCROW nDocRow = 0;
     ScFieldEditEngine aEditEngine( aDocument.GetEditPool() );
     String aString;
+    String aTabName;
 
     try
     {
-        uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory();
-        if (!xFactory.is()) return SCERR_EXPORT_CONNECT;
-
-        uno::Reference<sdbc::XDriverManager> xDrvMan( xFactory->createInstance(
-                            rtl::OUString::createFromAscii( SC_SERVICE_DRVMAN ) ),
-                            uno::UNO_QUERY);
-        DBG_ASSERT( xDrvMan.is(), "can't get DriverManager" );
-        if (!xDrvMan.is()) return SCERR_EXPORT_CONNECT;
-
-        // get connection
-
-        String aConnUrl = String::CreateFromAscii("sdbc:dbase:");
-        aConnUrl += aPath;
-
-        dbtools::OCharsetMap aMap;
-        dbtools::OCharsetMap::CharsetIterator aIter = aMap.find( (rtl_TextEncoding) eCharSet );
-        if ( aIter == aMap.end() )
-        {
-            DBG_ERRORFILE( "DBaseExport: dbtools::OCharsetMap doesn't know text encoding" );
-            return SCERR_EXPORT_CONNECT;
-        }
-        rtl::OUString aCharSetStr = (*aIter).getIanaName();
-
-        uno::Sequence<beans::PropertyValue> aProps(2);
-        aProps[0].Name = rtl::OUString::createFromAscii(SC_DBPROP_EXTENSION);
-        aProps[0].Value <<= rtl::OUString( aExtension );
-        aProps[1].Name = rtl::OUString::createFromAscii(SC_DBPROP_CHARSET);
-        aProps[1].Value <<= aCharSetStr;
-
-        uno::Reference<sdbc::XConnection> xConnection =
-                                xDrvMan->getConnectionWithInfo( aConnUrl, aProps );
-        DBG_ASSERT( xConnection.is(), "can't get Connection" );
-        if (!xConnection.is()) return SCERR_EXPORT_CONNECT;
+        uno::Reference<sdbc::XDriverManager> xDrvMan;
+        uno::Reference<sdbc::XConnection> xConnection;
+        ULONG nRet = lcl_getDBaseConnection(xDrvMan,xConnection,aTabName,rFullFileName,eCharSet);
+        if ( !xConnection.is() || !xDrvMan.is() )
+            return nRet;
         ::utl::DisposableComponent aConnectionHelper(xConnection);
 
         // get dBase driver
-
-        uno::Reference<sdbc::XDriver> xDriver;
-        BOOL bDriverFound = FALSE;
-
-        uno::Reference<container::XEnumerationAccess> xEnAcc( xDrvMan, uno::UNO_QUERY );
-        DBG_ASSERT( xEnAcc.is(), "can't get DriverManager EnumerationAccess" );
-        if (!xEnAcc.is()) return SCERR_EXPORT_CONNECT;
-
-        uno::Reference<container::XEnumeration> xEnum = xEnAcc->createEnumeration();
-        DBG_ASSERT( xEnum.is(), "can't get DriverManager Enumeration" );
-        if (!xEnum.is()) return SCERR_EXPORT_CONNECT;
-
-        while ( xEnum->hasMoreElements() && !bDriverFound )
-        {
-            uno::Any aElement = xEnum->nextElement();
-            if ( aElement >>= xDriver )
-                if ( xDriver.is() && xDriver->acceptsURL( aConnUrl ) )
-                    bDriverFound = TRUE;
-        }
-
-        DBG_ASSERT( bDriverFound, "can't get dBase driver" );
-        if (!bDriverFound) return SCERR_EXPORT_CONNECT;
+        uno::Reference< sdbc::XDriverAccess> xAccess(xDrvMan,uno::UNO_QUERY);
+        uno::Reference< sdbcx::XDataDefinitionSupplier > xDDSup( xAccess->getDriverByURL( xConnection->getMetaData()->getURL() ), uno::UNO_QUERY );
+        if ( !xDDSup.is() ) 
+            return SCERR_EXPORT_CONNECT;
 
         // create table
-
-        uno::Reference<sdbcx::XDataDefinitionSupplier> xDDSup( xDriver, uno::UNO_QUERY );
-        DBG_ASSERT( xDDSup.is(), "can't get XDataDefinitionSupplier" );
-        if (!xDDSup.is()) return SCERR_EXPORT_CONNECT;
-
-        uno::Reference<sdbcx::XTablesSupplier> xTablesSupp =
-                            xDDSup->getDataDefinitionByConnection( xConnection );
+        uno::Reference<sdbcx::XTablesSupplier> xTablesSupp =xDDSup->getDataDefinitionByConnection( xConnection );
         DBG_ASSERT( xTablesSupp.is(), "can't get Data Definition" );
         if (!xTablesSupp.is()) return SCERR_EXPORT_CONNECT;
 
@@ -951,7 +908,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
 //		if (!xConnection.is()) return SCERR_EXPORT_CONNECT;
 
         // get row set for writing
-
+        uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory();
         uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance(
                             rtl::OUString::createFromAscii( SC_SERVICE_ROWSET ) ),
                             uno::UNO_QUERY);
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index c0213926a..f1587bc5c 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1045,9 +1045,11 @@ void ScExternalRefLink::DataChanged(const String& /*rMimeType*/, const Any& /*rV
     else
     {
         // The source document has changed.
+        ScDocShell* pDocShell = ScDocShell::GetViewData()->GetDocShell();
+        ScDocShellModificator aMod(*pDocShell);
         pMgr->switchSrcFile(mnFileId, aFile);
         maFilterName = aFilter;
-        mpDoc->GetDocumentShell()->SetModified();
+        aMod.SetDocumentModified();
     }
 }
 
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 08dfcfb8b..740c2086f 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -85,6 +85,9 @@ class StarBASIC;
 
 // ause
 #include "editutil.hxx"
+#include "patattr.hxx"
+#include "docpool.hxx"
+#include "stringutil.hxx"
 
 #include "globstr.hrc"
 #include <vcl/msgbox.hxx>
@@ -917,6 +920,18 @@ static bool lcl_PutString(
 
     if ( nColFormat == SC_COL_TEXT )
     {
+        double fDummy;
+        sal_uInt32 nIndex;
+        if (pFormatter->IsNumberFormat(rStr, nIndex, fDummy))
+        {
+            // Set the format of this cell to Text.
+            sal_uInt32 nFormat = pFormatter->GetStandardFormat(NUMBERFORMAT_TEXT);
+            ScPatternAttr aNewAttrs(pDoc->GetPool());
+            SfxItemSet& rSet = aNewAttrs.GetItemSet();
+            rSet.Put( SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat) );
+            pDoc->ApplyPattern(nCol, nRow, nTab, aNewAttrs);
+
+        }
         pDoc->PutCell( nCol, nRow, nTab, ScBaseCell::CreateTextCell( rStr, pDoc ) );
         return bMultiLine;
     }
@@ -1129,7 +1144,13 @@ static bool lcl_PutString(
 
     // Standard or date not determined -> SetString / EditCell
     if( rStr.Search( _LF ) == STRING_NOTFOUND )
-        pDoc->SetString( nCol, nRow, nTab, rStr, pFormatter, bDetectNumFormat );
+    {
+        ScSetStringParam aParam;
+        aParam.mpNumFormatter = pFormatter;
+        aParam.mbDetectNumberFormat = bDetectNumFormat;
+        aParam.mbSetTextCellFormat = true;    
+        pDoc->SetString( nCol, nRow, nTab, rStr, &aParam );
+    }
     else 
     {
         bMultiLine = true;
@@ -1444,7 +1465,7 @@ BOOL ScImportExport::Doc2Text( SvStream& rStrm )
 
     for (nRow = nStartRow; nRow <= nEndRow; nRow++)
     {
-        if (bIncludeFiltered || !pDoc->IsFiltered( nRow, aRange.aStart.Tab() ))
+		if (bIncludeFiltered || !pDoc->RowFiltered( nRow, aRange.aStart.Tab() ))
         {
             for (nCol = nStartCol; nCol <= nEndCol; nCol++)
             {
diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
index 812cbbc2b..fd120a882 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -411,7 +411,7 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
             if ( bColumns )
                 pDoc->ShowCol( static_cast<SCCOL>(i), nTab, bShow );
             else
-                if ( !bShow || !pDoc->IsFiltered( i,nTab ) )
+				if ( !bShow || !pDoc->RowFiltered( i,nTab ) )
                     pDoc->ShowRow( i, nTab, bShow );
         }
     }
@@ -509,7 +509,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord,
             }
         }
         for ( i=nMin; i<=nMax; i++ )
-            if ( !pDoc->IsFiltered( i,nTab ) )				// weggefilterte nicht einblenden
+			if ( !pDoc->RowFiltered( i,nTab ) )				// weggefilterte nicht einblenden
                 pDoc->ShowRow( i, nTab, TRUE );
 
         pDoc->UpdatePageBreaks( nTab );
@@ -669,7 +669,7 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
         if ( bColumns )
             pDoc->ShowCol( static_cast<SCCOL>(i), nTab, TRUE );
         else
-            if ( !pDoc->IsFiltered( i,nTab ) )				// weggefilterte nicht einblenden
+			if ( !pDoc->RowFiltered( i,nTab ) )				// weggefilterte nicht einblenden
                 pDoc->ShowRow( i, nTab, TRUE );
     }
 
@@ -692,6 +692,7 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
 
     pArray->SetVisibleBelow( nLevel, nEntry, TRUE, TRUE );
 
+    pDoc->InvalidatePageBreaks(nTab);
     pDoc->UpdatePageBreaks( nTab );
 
     if (bPaint)
@@ -757,6 +758,7 @@ BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
 
     pArray->SetVisibleBelow( nLevel, nEntry, FALSE );
 
+    pDoc->InvalidatePageBreaks(nTab);
     pDoc->UpdatePageBreaks( nTab );
 
     if (bPaint)
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 9983f2048..f49453eb8 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -280,7 +280,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
             {
                 String aName;
                 pDoc->GetName( nTab, aName );
-                if ( ScGlobal::pTransliteration->isEqual(
+                if ( ScGlobal::GetpTransliteration()->isEqual(
                         ScGlobal::GetDocTabName( aFileName, aTabName ), aName ) )
                 {
                     pDoc->RenameTab( nTab,
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index 0a339af7f..f55e454e3 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -110,6 +110,9 @@ void FuText::StopEditMode(BOOL /*bTextDirection*/)
         }
     }
 
+    if( pNote )
+        rDoc.LockStreamValid(true);     // only the affected sheet is invalidated below
+
     /*  SdrObjEditView::SdrEndTextEdit() may try to delete the entire drawing
         object, if it does not contain text and has invisible border and fill.
         This must not happen for note caption objects. They will be removed
@@ -183,6 +186,11 @@ void FuText::StopEditMode(BOOL /*bTextDirection*/)
                     pAction->SetComment( ScGlobal::GetRscString( bNewNote ? STR_UNDO_INSERTNOTE : STR_UNDO_DELETENOTE ) );
             }
         }
+
+        // invalidate stream positions only for the affected sheet
+        rDoc.LockStreamValid(false);
+        if (rDoc.IsStreamValid(aNotePos.Tab()))
+            rDoc.SetStreamValid(aNotePos.Tab(), FALSE);
     }
 }
 
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index 5cb0723e3..fdc378a71 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -319,6 +319,8 @@ protected:
     /// Use this method to set initial Description without notification
     void SetDescription(const rtl::OUString& rDesc) { msDescription = rDesc; }
 
+    void SetRole(sal_Int16 nRole);
+
     ///	Reference to the parent object.
     ::com::sun::star::uno::Reference<
          ::com::sun::star::accessibility::XAccessible> mxParent;
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index b33d028b6..7f148e6ec 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -103,7 +103,8 @@ public:
     void		ExecutePageSel( SfxRequest& rReq );
     void		ExecuteMove( SfxRequest& rReq );
     void		GetStateCursor( SfxItemSet& rSet );
-	static void PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, BOOL bShowDialog );
+
+    static void PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, bool bShowDialog );
 };
 
 #endif
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index 8dfafd9e8..097202b60 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -80,7 +80,7 @@ public:
     void			GotoDBArea( const String& rDBName );
 
                     // DB-Bereich vom Cursor
-    ScDBData* 		GetDBData( bool bMarkArea = true, ScGetDBMode eMode = SC_DB_MAKE, bool bExpandRows = false, bool bShrinkToData = false );
+	ScDBData* 		GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE, bool bShrinkToData = false, bool bExpandRows = false );
 
     void			NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList );
 
@@ -90,8 +90,8 @@ public:
                                     const ScDPObject& rSource, BOOL bApi = FALSE );
     void			DeletePivotTable();
     void			RecalcPivotTable();
-        void                    AutoFormatPivotTable(USHORT nIndex);
-        void            	AutoFormatPivotTable(ScDPObject*        pDPObj, USHORT nIndex);
+    void            AutoFormatPivotTable(USHORT nIndex);
+    void            AutoFormatPivotTable(ScDPObject* pDPObj, USHORT nIndex);
 
     BOOL            HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rParts );
     BOOL            HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo );
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 46249818d..ecbcfda65 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -34,6 +34,7 @@
 #include <tools/link.hxx>
 #include "global.hxx"
 #include "formula/grammar.hxx"
+#include "tabbgcolor.hxx"
 #include "token.hxx"
 
 #include <vector>
@@ -127,6 +128,10 @@ public:
     BOOL			RenameTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi );
     BOOL			DeleteTable( SCTAB nTab, BOOL bRecord, BOOL bApi );
 
+    BOOL            SetTabBgColor( SCTAB nTab, const Color& rColor, BOOL bRecord, BOOL bApi );
+    BOOL            SetTabBgColor( ScUndoSetTabBgColorInfoList* rUndoSetTabBgColorInfoList,
+                                    BOOL bRecord, BOOL bApi );
+
     BOOL			SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi );
 
     BOOL			SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL bApi );
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 09861708d..449b0315b 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -73,6 +73,7 @@ class VirtualDevice;
 class ScImportOptions;
 class ScDocShellModificator;
 class ScOptSolverSave;
+class ScSheetSaveData;
 
 namespace sfx2 { class FileDialogHelper; }
 struct DocShell_Impl;
@@ -124,6 +125,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
     ScPaintLockData*	pPaintLockData;
     ScJobSetup*			pOldJobSetup;
     ScOptSolverSave*    pSolverSaveData;
+    ScSheetSaveData*    pSheetSaveData;
 
     ScDocShellModificator* pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading)
 
@@ -168,6 +170,8 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
     SC_DLLPRIVATE void          EnableSharedSettings( bool bEnable );
     SC_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument();
 
+    SC_DLLPRIVATE void          UseSheetSaveEntries();
+
 protected:
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -419,6 +423,8 @@ public:
 
     const ScOptSolverSave* GetSolverSaveData() const    { return pSolverSaveData; }     // may be null
     void            SetSolverSaveData( const ScOptSolverSave& rData );
+
+    ScSheetSaveData* GetSheetSaveData();
 };
 
 SO2_DECL_REF(ScDocShell)
diff --git a/sc/source/ui/inc/dpcontrol.hrc b/sc/source/ui/inc/dpcontrol.hrc
index 2ca698d36..6d21b56bd 100644
--- a/sc/source/ui/inc/dpcontrol.hrc
+++ b/sc/source/ui/inc/dpcontrol.hrc
@@ -33,8 +33,11 @@
 
 #include <sc.hrc>
 
-#define STR_MENU_SORT_ASC       1
-#define STR_MENU_SORT_DESC      2
-#define STR_MENU_SORT_CUSTOM    3
+#define STR_MENU_SORT_ASC           1
+#define STR_MENU_SORT_DESC          2
+#define STR_MENU_SORT_CUSTOM        3
+#define STR_BTN_TOGGLE_ALL          4
+#define STR_BTN_SELECT_CURRENT      5
+#define STR_BTN_UNSELECT_CURRENT    6
 
 #endif
diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx
index 64d56d3f9..2380d5dbb 100644
--- a/sc/source/ui/inc/dpcontrol.hxx
+++ b/sc/source/ui/inc/dpcontrol.hxx
@@ -33,20 +33,32 @@
 
 #include "rtl/ustring.hxx"
 #include "tools/gen.hxx"
-#include "vcl/floatwin.hxx"
+#include "tools/fract.hxx"
+#include "vcl/popupmenuwindow.hxx"
 #include "vcl/button.hxx"
 #include "vcl/scrbar.hxx"
 #include "vcl/timer.hxx"
+#include "svx/checklbx.hxx"
 
 #include <boost/shared_ptr.hpp>
 #include <memory>
 #include <hash_map>
 
+namespace com { namespace sun { namespace star {
+
+    namespace accessibility {
+        class XAccessible;
+    }
+
+}}}
+
 class OutputDevice;
 class Point;
 class Size;
 class StyleSettings;
 class Window;
+class ScDocument;
+class ScAccessibleFilterMenu;
 
 /** 
  * This class takes care of physically drawing field button controls inside 
@@ -55,13 +67,15 @@ class Window;
 class ScDPFieldButton
 {
 public:
-    ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle);
+    ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX = NULL, const Fraction* pZoomY = NULL);
     ~ScDPFieldButton();
 
     void setText(const ::rtl::OUString& rText);
     void setBoundingBox(const Point& rPos, const Size& rSize);
+    void setDrawBaseButton(bool b);
     void setDrawPopupButton(bool b);
     void setHasHiddenMember(bool b);
+    void setPopupPressed(bool b);
     void draw();
 
     void getPopupBoundingBox(Point& rPos, Size& rSize) const;
@@ -74,17 +88,22 @@ private:
     Point                   maPos;
     Size                    maSize;
     ::rtl::OUString         maText;
+    Fraction                maZoomX;
+    Fraction                maZoomY;
     OutputDevice*           mpOutDev;
     const StyleSettings*    mpStyle;
+    bool                    mbBaseButton;
     bool                    mbPopupButton;
     bool                    mbHasHiddenMember;
+    bool                    mbPopupPressed;
 };
 
 // ============================================================================
 
-class ScMenuFloatingWindow : public FloatingWindow
+class ScMenuFloatingWindow : public PopupMenuFloatingWindow
 {
 public:
+    static size_t MENU_NOT_SELECTED;
     /** 
      * Action to perform when an event takes place.  Create a sub-class of 
      * this to implement the desired action. 
@@ -95,7 +114,7 @@ public:
         virtual void execute() = 0;
     };
 
-    explicit ScMenuFloatingWindow(Window* pParent);
+    explicit ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, USHORT nMenuStackLevel = 0);
     virtual ~ScMenuFloatingWindow();
 
     virtual void MouseMove(const MouseEvent& rMEvt);
@@ -103,42 +122,93 @@ public:
     virtual void MouseButtonUp(const MouseEvent& rMEvt);
     virtual void KeyInput(const KeyEvent& rKEvt);
     virtual void Paint(const Rectangle& rRect);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
     void addMenuItem(const ::rtl::OUString& rText, bool bEnabled, Action* pAction);
     ScMenuFloatingWindow* addSubMenuItem(const ::rtl::OUString& rText, bool bEnabled);
+    void setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, bool bEnsureSubMenu);
+    void selectMenuItem(size_t nPos, bool bSelected, bool bSubMenuTimer);
+    void clearSelectedMenuItem();
+    ScMenuFloatingWindow* getSubMenuWindow(size_t nPos) const;
+    size_t getMenuItemCount() const;
+    ::rtl::OUString getMenuItemName(size_t nPos) const;
+    bool isMenuItemEnabled(size_t nPos) const;
+    bool isMenuItemSelected(size_t nPos) const;
+    size_t getSelectedMenuItem() const;
+
+    void setName(const ::rtl::OUString& rName);
+    const ::rtl::OUString& getName() const;
+
+    void executeMenuItem(size_t nPos);
+    void getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const;
+    ScMenuFloatingWindow* getParentMenuWindow() const;
 
 protected:
+
     void drawMenuItem(size_t nPos);
     void drawAllMenuItems();
     const Font& getLabelFont() const;
 
-    void executeMenu(size_t nPos);
-    void setSelectedMenuItem(size_t nPos, bool bSubMenuTimer = true);
-    size_t getSelectedMenuItem() const;
     void queueLaunchSubMenu(size_t nPos, ScMenuFloatingWindow* pMenu);
     void queueCloseSubMenu();
     void launchSubMenu(bool bSetMenuPos);
-    void endSubMenu();
+    void endSubMenu(ScMenuFloatingWindow* pSubMenu);
 
-private:
-    struct SubMenuItem;
-    void handleMenuTimeout(SubMenuItem* pTimer);
+    void fillMenuItemsToAccessible(ScAccessibleFilterMenu* pAccMenu) const;
 
-    enum NotificationType { SUBMENU_FOCUSED };
-    void notify(NotificationType eType);
+    ScDocument* getDoc();
+
+protected:
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > mxAccessible;
+
+private:
+    struct SubMenuItemData;
+    void handleMenuTimeout(SubMenuItemData* pTimer);
 
-    void resetMenu(bool bSetMenuPos);
     void resizeToFitMenuItems();
-    void selectMenuItem(size_t nPos, bool bSelected, bool bSubMenuTimer);
     void highlightMenuItem(size_t nPos, bool bSelected);
 
-    void getMenuItemPosSize(Point& rPos, Size& rSize, size_t nPos) const;
     size_t getEnclosingMenuItem(const Point& rPos) const;
+    size_t getSubMenuPos(ScMenuFloatingWindow* pSubMenu);
 
-    DECL_LINK( EndPopupHdl, void* );
+    /** 
+     * Fire a menu highlight event since the accessibility framework needs 
+     * this to track focus on menu items. 
+     */
+    void fireMenuHighlightedEvent();  
+
+    /** 
+     * Make sure that the specified submenu is permanently up, the submenu 
+     * close timer is not active, and the correct menu item associated with 
+     * the submenu is highlighted.
+     */
+    void setSubMenuFocused(ScMenuFloatingWindow* pSubMenu);
+
+    /** 
+     * When a menu item of an invisible submenu is selected, we need to make 
+     * sure that all its parent menu(s) are visible, with the right menu item 
+     * highlighted in each of the parents.  Calling this method ensures it. 
+     */
+    void ensureSubMenuVisible(ScMenuFloatingWindow* pSubMenu);
+
+    /** 
+     * Dismiss any visible child submenus when a menu item of a parent menu is 
+     * selected.
+     */
+    void ensureSubMenuNotVisible();
+
+    /** 
+     * Dismiss all visible popup menus and set focus back to the application 
+     * window.  This method is called e.g. when a menu action is fired.
+     */
+    void terminateAllPopupMenus();
+
+    DECL_LINK( PopupEndHdl, void* );
 
 private:
-    struct MenuItem
+
+    struct MenuItemData
     {
         ::rtl::OUString maText;
         bool            mbEnabled;
@@ -146,12 +216,12 @@ private:
         ::boost::shared_ptr<Action> mpAction;
         ::boost::shared_ptr<ScMenuFloatingWindow> mpSubMenuWin;
 
-        MenuItem();
+        MenuItemData();
     };
 
-    ::std::vector<MenuItem>         maMenuItems;
+    ::std::vector<MenuItemData>         maMenuItems;
 
-    struct SubMenuItem
+    struct SubMenuItemData
     {
         Timer                   maTimer;
         ScMenuFloatingWindow*   mpSubMenu;
@@ -159,24 +229,29 @@ private:
 
         DECL_LINK( TimeoutHdl, void* );
 
-        SubMenuItem(ScMenuFloatingWindow* pParent);
+        SubMenuItemData(ScMenuFloatingWindow* pParent);
         void reset();
 
     private:
         ScMenuFloatingWindow* mpParent;
     };
-    SubMenuItem   maOpenTimer;
-    SubMenuItem   maCloseTimer;
+    SubMenuItemData   maOpenTimer;
+    SubMenuItemData   maCloseTimer;
 
     Font    maLabelFont;
 
+    // Name of this menu window, taken from the menu item of the parent window
+    // that launches it (if this is a sub menu).  If this is a top-level menu
+    // window, then this name can be anything.
+    ::rtl::OUString maName;
+
     size_t  mnSelectedMenu;
     size_t  mnClickedMenu;
 
+    ScDocument* mpDoc;
+
     ScMenuFloatingWindow* mpParentMenu;
     ScMenuFloatingWindow* mpActiveSubMenu;
-
-    bool    mbActionFired;
 };
 
 // ============================================================================
@@ -194,16 +269,21 @@ public:
      */ 
     struct ExtendedData {};
 
-    explicit ScDPFieldPopupWindow(Window* pParent);
+    explicit ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc);
     virtual ~ScDPFieldPopupWindow();
 
     virtual void MouseMove(const MouseEvent& rMEvt);
+    virtual long Notify(NotifyEvent& rNEvt);
     virtual void Paint(const Rectangle& rRect);
+    virtual Window* GetPreferredKeyInputWindow();
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
     void setMemberSize(size_t n);
     void addMember(const ::rtl::OUString& rName, bool bVisible);
     void initMembers();
 
+    const Size& getWindowSize() const;
+
     void getResult(::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rResult);
     void close(bool bOK);
 
@@ -241,49 +321,46 @@ private:
         ScDPFieldPopupWindow* mpParent;
     };
 
-    ::std::vector<Member>& getMembers();
-
     enum SectionType {
-        WHOLE,          // entire window
-        LISTBOX_AREA,   // box enclosing the check box items.
-        FIRST_LISTITEM, // first list item at the top
-        BTN_OK,         // OK button
-        BTN_CANCEL,     // Cancel button
-        SCROLL_BAR_V,   // vertical scroll bar along the right edge of the list box.
+        WHOLE,                // entire window
+        LISTBOX_AREA_OUTER,   // box enclosing the check box items.
+        LISTBOX_AREA_INNER,   // box enclosing the check box items.
+        SINGLE_BTN_AREA,      // box enclosing the single-action buttons.
+        CHECK_TOGGLE_ALL,     // check box for toggling all items.
+        BTN_SINGLE_SELECT,
+        BTN_SINGLE_UNSELECT,
+        BTN_OK,               // OK button
+        BTN_CANCEL,           // Cancel button
     };
     void getSectionPosSize(Point& rPos, Size& rSize, SectionType eType) const;
 
-    void resetDisplayedItems();
+    void setAllMemberState(bool bSet);
+    void selectCurrentMemberOnly(bool bSet);
+    void cycleFocus(bool bReverse = false);
 
-    DECL_LINK( CheckBoxHdl, CheckBox* );
-    DECL_LINK( OKButtonHdl, OKButton* );
-    DECL_LINK( ScrollHdl, ScrollBar* );
+    DECL_LINK( ButtonHdl, Button* );
+    DECL_LINK( TriStateHdl, TriStateBox* );
+    DECL_LINK( CheckHdl, SvTreeListBox* );
 
 private:
+    SvxCheckListBox maChecks;
 
-    CheckBox maCheck0;
-    CheckBox maCheck1;
-    CheckBox maCheck2;
-    CheckBox maCheck3;
-    CheckBox maCheck4;
-    CheckBox maCheck5;
-    CheckBox maCheck6;
-    CheckBox maCheck7;
-    CheckBox maCheck8;
-    CheckBox maCheck9;
-
-    ScrollBar   maScrollBar;
+    TriStateBox     maChkToggleAll;
+    ImageButton     maBtnSelectSingle;
+    ImageButton     maBtnUnselectSingle;
 
     OKButton        maBtnOk;
     CancelButton    maBtnCancel;
 
-    ::std::vector<CheckBox*> mpCheckPtr;
+    ::std::vector<Window*>          maTabStopCtrls;
+    size_t                          mnCurTabStop;
 
     ::std::vector<Member>           maMembers;
     ::std::auto_ptr<ExtendedData>   mpExtendedData;
     ::std::auto_ptr<Action>         mpOKAction;
 
-    size_t  mnScrollPos;
+    const Size      maWndSize;  /// hard-coded window size.
+    TriState mePrevToggleAllState;
 };
 
 #endif
diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx
index a62534b96..3212e7c63 100644
--- a/sc/source/ui/inc/fieldwnd.hxx
+++ b/sc/source/ui/inc/fieldwnd.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,12 +68,14 @@ enum ScDPFieldType
 class ScDPFieldWindow : public Control
 {
 private:
+    typedef ::std::pair< String, bool > FieldString;    // true = text fits into button
+
     String                  aName;          /// name of the control, used in Accessibility
     ScDPLayoutDlg*          pDlg;           /// Parent dialog.
     Rectangle               aWndRect;       /// Area rectangle in pixels.
     FixedText*              pFtCaption;     /// FixedText containing the name of the control.
     Point                   aTextPos;       /// Position of the caption text.
-    std::vector< String >   aFieldArr;      /// Pointer to string array of the field names.
+    std::vector< FieldString > aFieldArr;   /// String array of the field names and flags, if text fits into button.
     ScDPFieldType           eType;          /// Type of this area.
     Color                   aFaceColor;     /// Color for dialog background.
     Color                   aWinColor;      /// Color for window background.
@@ -97,13 +99,16 @@ private:
     void                    DrawField(
                                 OutputDevice& rDev,
                                 const Rectangle& rRect,
-                                const String& rText,
+                                FieldString& rText,
                                 bool bFocus );
 
     /** @return  TRUE, if the field index is inside of the control area. */
     bool                    IsValidIndex( size_t nIndex ) const;
     /** @return  TRUE, if the field with the given index exists. */
     bool                    IsExistingIndex( size_t nIndex ) const;
+    /** @return  TRUE, if the field with the given index exists and the text is
+                    too long for the button control. */
+    bool                    IsShortenedText( size_t nIndex ) const;
     /** @return  The new selection index after moving to the given direction. */
     size_t                  CalcNewFieldIndex( SCsCOL nDX, SCsROW nDY ) const;
 
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index c418e829c..7409b5a30 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -167,6 +167,7 @@ private:
     ListBox*			aFieldLbArr[4];
     ListBox*			aCondLbArr[4];
     ListBox*			aConnLbArr[4];
+    bool                mbHasDates[MAXQUERY];
     BOOL                bRefreshExceptQuery[MAXQUERY];
     USHORT				nFieldCount;
     BOOL				bRefInputMode;
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index a90858338..c1c4d8ce9 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -37,10 +37,12 @@
 #include "viewdata.hxx"
 #include "cbutton.hxx"
 #include <svx/sdr/overlay/overlayobject.hxx>
+#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
 #include <vector>
 #include <memory>
+#include <boost/shared_ptr.hpp>
 
 // ---------------------------------------------------------------------------
 
@@ -48,6 +50,7 @@ struct ScTableInfo;
 class ScViewSelectionEngine;
 class ScDPObject;
 class ScDPFieldPopupWindow;
+class ScDPFieldButton;
 class ScOutputData;
 class ScFilterListBox;
 class AutoFilterPopup;
@@ -113,6 +116,25 @@ private:
     ::sdr::overlay::OverlayObjectList*              mpOOHeader;
     ::sdr::overlay::OverlayObjectList*              mpOOShrink;
 
+    ::boost::shared_ptr<Rectangle> mpAutoFillRect;
+
+    /** 
+     * Stores current visible column and row ranges, used to avoid expensive 
+     * operations on objects that are outside visible area. 
+     */
+    struct VisibleRange
+    {
+        SCCOL mnCol1;
+        SCCOL mnCol2;
+        SCROW mnRow1;
+        SCROW mnRow2;
+
+        VisibleRange();
+
+        bool isInside(SCCOL nCol, SCROW nRow) const;
+    };
+    VisibleRange maVisibleRange;
+
 private:
     ScViewData*				pViewData;
     ScSplitPos				eWhich;
@@ -124,6 +146,7 @@ private:
     ScFilterListBox*		pFilterBox;
     FloatingWindow*			pFilterFloat;
     ::std::auto_ptr<ScDPFieldPopupWindow> mpDPFieldPopup;
+    ::std::auto_ptr<ScDPFieldButton>      mpFilterButton;
 
     USHORT					nCursorHideCount;
 
@@ -190,6 +213,7 @@ private:
     BOOL			TestMouse( const MouseEvent& rMEvt, BOOL bAction );
 
     BOOL			DoPageFieldSelection( SCCOL nCol, SCROW nRow );
+    bool            DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt );
     void			DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt );
 
     void			DPMouseMove( const MouseEvent& rMEvt );
@@ -204,7 +228,7 @@ private:
      */
     bool            DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, ScDPObject* pDPObj);
     void            DPLaunchFieldPopupMenu(
-        const Point& rSrcPos, const Size& rSrcSize, const ScAddress& rPos, ScDPObject* pDPObj);
+        const Point& rScrPos, const Size& rScrSize, const ScAddress& rPos, ScDPObject* pDPObj);
 
     void			RFMouseMove( const MouseEvent& rMEvt, BOOL bUp );
 
@@ -214,7 +238,7 @@ private:
 
     BOOL 			IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab );
     void			ExecFilter( ULONG nSel, SCCOL nCol, SCROW nRow,
-                                const String& aValue );
+                                const String& aValue, bool bCheckForDates );
     void			FilterSelect( ULONG nSel );
 
     void			ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr );
@@ -272,7 +296,7 @@ private:
 
     void			PasteSelection( const Point& rPosPixel );
 
-    void			SelectForContextMenu( const Point& rPosPixel );
+    void			SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, SCsROW nCellY );
 
     void            GetSelectionRects( ::std::vector< Rectangle >& rPixelRects );
 
@@ -328,9 +352,11 @@ public:
 
     void			DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect );
     void			DoScenarioMenue( const ScRange& rScenRange );
-    void			DoPageFieldMenue( SCCOL nCol, SCROW nRow );
 
-    BOOL            HasPageFieldData( SCCOL nCol, SCROW nRow ) const;
+    void            LaunchPageFieldMenu( SCCOL nCol, SCROW nRow );
+    void            LaunchDPFieldMenu( SCCOL nCol, SCROW nRow );
+
+    ::com::sun::star::sheet::DataPilotFieldOrientation GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const;
 
     void			DrawButtons( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                                     ScTableInfo& rTabInfo, OutputDevice* pContentDev );
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index 20cc8221e..497140f3a 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -80,7 +80,7 @@ private:
 
     long			GetScrPos( SCCOLROW nEntryNo );
     SCCOLROW		GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder );
-
+    bool            IsSelectionAllowed(SCCOLROW nPos) const;
     void			ShowDragHelp();
 
     void			DoPaint( SCCOLROW nStart, SCCOLROW nEnd );
diff --git a/sc/source/ui/inc/langchooser.hxx b/sc/source/ui/inc/langchooser.hxx
deleted file mode 100644
index 7106ab23f..000000000
--- a/sc/source/ui/inc/langchooser.hxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: langbox.hxx,v $
- * $Revision: 1.4.242.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SC_UI_LANGCHOOSER_HXX
-#define SC_UI_LANGCHOOSER_HXX
-
-#include "vcl/dialog.hxx"
-#include "vcl/button.hxx"
-#include "vcl/fixed.hxx"
-#include "i18npool/lang.h"
-#include "svx/langbox.hxx"
-
-class ScLangChooserDlg : public ModalDialog
-{
-public:
-    ScLangChooserDlg(Window* pParent);
-    virtual ~ScLangChooserDlg();
-
-    virtual short Execute();
-
-    LanguageType getLanguageType() const;
-    bool isDateConversionSet() const;
-
-private:
-    void init();
-
-private:
-    OKButton        maBtnOk;
-    CancelButton    maBtnCancel;
-    HelpButton      maBtnHelp;
-
-    FixedLine       maFlChooseLang;
-
-    RadioButton     maRbAutomatic;
-    RadioButton     maRbCustom;
-
-    SvxLanguageBox  maLbCustomLang;
-
-    FixedLine       maFlOption;
-
-    CheckBox        maBtnConvertDate;
-
-    DECL_LINK( OKHdl, OKButton* );
-
-    DECL_LINK( RadioHdl, RadioButton* );
-};
-
-
-#endif
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index 154d31065..97cd0ca58 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -184,3 +184,9 @@
 #define BTN_GROUP_ROWS	3
 #define STR_GROUP		1
 #define STR_UNGROUP		2
+
+// Tab Bg Color
+#define TAB_BG_COLOR_CT_BORDER 1
+#define TAB_BG_COLOR_SET_BGDCOLOR 2
+#define TAB_BG_COLOR_GB_BGDCOLOR 3
+
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index a9ba0d10a..b3831737c 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -53,8 +53,8 @@
 #ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
 #endif
-#include "global.hxx" // -> ScQueryParam
 #include "address.hxx"
+#include "queryparam.hxx"
 
 //------------------------------------------------------------------
 
diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx
new file mode 100644
index 000000000..235a06e30
--- /dev/null
+++ b/sc/source/ui/inc/tabbgcolordlg.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: tabbgcolordlg.hxx,v $
+ * $Revision: 1.0 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_TABBGCOLORDLG_HXX
+#define SC_TABBGCOLORDLG_HXX
+
+#include <vcl/dialog.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/imagebtn.hxx>
+#include <svtools/valueset.hxx>
+
+//------------------------------------------------------------------------
+
+class ScTabBgColorDlg : public ModalDialog
+{
+public:
+        ScTabBgColorDlg(    Window* pParent,
+                            const String& rTitle,
+                            const String& rTabBgColorNoColorText,
+                            const Color& rDefaultColor,
+                            ULONG nHelpId );
+        ~ScTabBgColorDlg();
+
+        void GetSelectedColor( Color& rColor ) const;
+        //void SelectColor( const Color& rColor2 ) const;
+private:
+    class ScTabBgColorValueSet : public ValueSet
+    {
+
+    public:
+            ScTabBgColorValueSet(Control* pParent, const ResId& rResId, ScTabBgColorDlg* pTabBgColorDlg);
+
+            virtual void KeyInput( const KeyEvent& rKEvt );
+    private:
+        ScTabBgColorDlg* aTabBgColorDlg;
+    };
+        Control                 aBorderWin;
+        ScTabBgColorValueSet    aTabBgColorSet;
+        FixedLine               aTabBgColorBox;
+        OKButton                aBtnOk;
+        CancelButton            aBtnCancel;
+        HelpButton              aBtnHelp;
+        Color                   aTabBgColor;
+        const String            aTabBgColorNoColorText;
+        ULONG                   aHelpId;
+
+        void            FillColorValueSets_Impl();
+
+        DECL_LINK( TabBgColorDblClickHdl_Impl, ValueSet* );
+        DECL_LINK( TabBgColorOKHdl_Impl, OKButton* pBtn );
+};
+
+#endif // SC_TABBGCOLORDLG_HXX
diff --git a/sc/source/ui/inc/langchooser.hrc b/sc/source/ui/inc/textimportoptions.hrc
similarity index 100%
rename from sc/source/ui/inc/langchooser.hrc
rename to sc/source/ui/inc/textimportoptions.hrc
diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx
new file mode 100644
index 000000000..8ef489a9a
--- /dev/null
+++ b/sc/source/ui/inc/textimportoptions.hxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: langbox.hxx,v $
+ * $Revision: 1.4.242.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_UI_IMPORTOPTIONS_HXX
+#define SC_UI_IMPORTOPTIONS_HXX
+
+#include "vcl/dialog.hxx"
+#include "vcl/button.hxx"
+#include "vcl/fixed.hxx"
+#include "i18npool/lang.h"
+#include "svx/langbox.hxx"
+
+class ScTextImportOptionsDlg : public ModalDialog
+{
+public:
+    ScTextImportOptionsDlg(Window* pParent);
+    virtual ~ScTextImportOptionsDlg();
+
+    virtual short Execute();
+
+    LanguageType getLanguageType() const;
+    bool isDateConversionSet() const;
+
+private:
+    void init();
+
+private:
+    OKButton        maBtnOk;
+    CancelButton    maBtnCancel;
+    HelpButton      maBtnHelp;
+
+    FixedLine       maFlChooseLang;
+
+    RadioButton     maRbAutomatic;
+    RadioButton     maRbCustom;
+
+    SvxLanguageBox  maLbCustomLang;
+
+    FixedLine       maFlOption;
+
+    CheckBox        maBtnConvertDate;
+
+    DECL_LINK( OKHdl, OKButton* );
+
+    DECL_LINK( RadioHdl, RadioButton* );
+};
+
+
+#endif
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index 65814362f..4cd4e58db 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -34,6 +34,7 @@
 #include "scdllapi.h"
 #include "conditio.hxx"
 #include "sortparam.hxx"
+#include "queryparam.hxx"
 #include "paramisc.hxx"
 #include <svtools/poolitem.hxx>
 
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index d3912a9ff..98599538d 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -36,6 +36,7 @@
 #include "rangelst.hxx"		// ScRangeListRef
 #include "markdata.hxx"
 #include "sortparam.hxx"
+#include "queryparam.hxx"
 #include "pivot.hxx"
 
 class ScDocShell;
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index 7f18fdbb3..a0e954b67 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -35,6 +35,7 @@
 #include "markdata.hxx"
 #include "formula/grammar.hxx"
 #include <tools/color.hxx>
+#include "tabbgcolor.hxx"
 
 #ifndef _SVSTDARR_SHORTS
 
@@ -226,6 +227,37 @@ private:
     void DoChange() const;
 };
 
+class ScUndoSetTabBgColor: public ScSimpleUndo
+{
+public:
+                    TYPEINFO();
+                    ScUndoSetTabBgColor(
+                            ScDocShell* pNewDocShell,
+                            SCTAB nT,
+                            const Color& aOTabBgColor,
+                            const Color& aNTabBgColor);
+                    ScUndoSetTabBgColor(
+                            ScDocShell* pNewDocShell,
+                            ScUndoSetTabBgColorInfoList* pUndoSetTabBgColorInfoList);
+    virtual         ~ScUndoSetTabBgColor();
+
+    virtual void    Undo();
+    virtual void    Redo();
+    virtual void    Repeat(SfxRepeatTarget& rTarget);
+    virtual BOOL    CanRepeat(SfxRepeatTarget& rTarget) const;
+
+virtual String	GetComment() const;
+
+private:
+    SCTAB   nTab;
+    Color   aOldTabBgColor;
+    Color   aNewTabBgColor;
+    ScUndoSetTabBgColorInfoList* aUndoSetTabBgColorInfoList;
+    BOOL    bIsMultipleUndo;
+
+    void DoChange( SCTAB nTab, const Color& rTabBgColor ) const;
+    void DoChange( BOOL bUndoType ) const;
+};
 
 class ScUndoMakeScenario: public ScSimpleUndo
 {
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 41e004057..0b1f096e0 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -153,6 +153,9 @@ private:
 
     BOOL			bOldCurValid;				// "virtuelle" Cursorpos. bei zusammengefassten
 
+    Color           aTabBgColor;
+    BOOL            IsDefaultTabBgColor() const {return aTabBgColor == Color( COL_AUTO ) ? TRUE : FALSE ;};
+
                     ScViewDataTable();
                     ~ScViewDataTable();
 
@@ -219,7 +222,7 @@ private:
     SCCOL				nTabStartCol;				// fuer Enter nach Tab
     ScRange				aDelRange;					// fuer AutoFill-Loeschen
 
-	ScPasteFlags        nPasteFlags;
+    ScPasteFlags        nPasteFlags;
 
     ScSplitPos          eEditActivePart;            // the part that was active when edit mode was started
     BOOL				bEditActive[4];				// aktiv?
@@ -288,6 +291,10 @@ public:
     void			CopyTab( SCTAB nSrcTab, SCTAB nDestTab );
     void			MoveTab( SCTAB nSrcTab, SCTAB nDestTab );
 
+    void            SetTabBgColor( Color rTabBgColor, SCTAB nTab );
+    BOOL            IsDefaultTabBgColor( SCTAB nTab ) const;
+    Color           GetTabBgColor( SCTAB nTab ) const;
+
     SCTAB			GetRefTabNo() const 					{ return nRefTabNo; }
     void			SetRefTabNo( SCTAB nNewTab )			{ nRefTabNo = nNewTab; }
 
@@ -307,8 +314,8 @@ public:
     SCCOL			GetFixPosX() const						{ return pThisTab->nFixPosX; }
     SCROW			GetFixPosY() const						{ return pThisTab->nFixPosY; }
     BOOL			IsPagebreakMode() const					{ return bPagebreak; }
-	BOOL			IsPasteMode() const                     { return nPasteFlags & SC_PASTE_MODE; }
-	BOOL			ShowPasteSource() const                 { return nPasteFlags & SC_PASTE_BORDER; }
+    BOOL            IsPasteMode() const                     { return nPasteFlags & SC_PASTE_MODE; }
+    BOOL            ShowPasteSource() const                 { return nPasteFlags & SC_PASTE_BORDER; }
 
     void			SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX );
     void			SetPosY( ScVSplitPos eWhich, SCROW nNewPosY );
@@ -323,7 +330,7 @@ public:
     void			SetFixPosX( SCCOL nPos )						{ pThisTab->nFixPosX = nPos; }
     void			SetFixPosY( SCROW nPos )						{ pThisTab->nFixPosY = nPos; }
     void			SetPagebreakMode( BOOL bSet );
-	void			SetPasteMode ( ScPasteFlags nFlags )            { nPasteFlags = nFlags; }
+    void            SetPasteMode ( ScPasteFlags nFlags )            { nPasteFlags = nFlags; }
 
     void            SetZoomType( SvxZoomType eNew, BOOL bAll );
     void            SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs );
@@ -351,11 +358,11 @@ public:
 
     ScMarkType      GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab,
                                     SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const;
+    ScMarkType      GetSimpleArea( ScRange& rRange ) const;
 
     void            MoveNextRow();
     void            MovePrevRow();
 
-    ScMarkType      GetSimpleArea( ScRange& rRange ) const;
                     /// May modify rNewMark using MarkToSimple().
     ScMarkType      GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const;
     void			GetMultiArea( ScRangeListRef& rRange ) const;
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 7bd9a26c5..0f71150c7 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -32,6 +32,8 @@
 
 #include "tabview.hxx"
 
+#include "tabbgcolor.hxx"
+
 #ifndef _SVSTDARR_SHORTS
 #define _SVSTDARR_SHORTS
 #include <svtools/svstdarr.hxx>
@@ -276,6 +278,9 @@ public:
                                     SCTAB nCount, const SCTAB* pSrcTabs,
                                     BOOL bLink,SCTAB nTab);
 
+    BOOL            SetTabBgColor( const Color& rColor, SCTAB nTabNr );
+    BOOL            SetTabBgColor( ScUndoSetTabBgColorInfoList* rUndoSetTabBgColorInfoList );
+
     void			InsertTableLink( const String& rFile,
                                         const String& rFilter, const String& rOptions,
                                         const String& rTabName );
diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx
index 55f0039dc..18b4d68cd 100644
--- a/sc/source/ui/inc/viewutil.hxx
+++ b/sc/source/ui/inc/viewutil.hxx
@@ -71,10 +71,10 @@ public:
 
     static sal_Int32 GetTransliterationType( USHORT nSlotID );
 
-    static bool HasFiltered( const ScRange& rRange, const ScDocument* pDoc );
+    static bool HasFiltered( const ScRange& rRange, ScDocument* pDoc );
     /** Fit a range to cover nRows number of unfiltered rows.
         @return <TRUE/> if the resulting range covers nRows unfiltered rows. */
-    static bool FitToUnfilteredRows( ScRange & rRange, const ScDocument * pDoc, size_t nRows );
+    static bool FitToUnfilteredRows( ScRange & rRange, ScDocument * pDoc, size_t nRows );
     static void UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc );
 
     static void HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USHORT nSlotId );
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 40f1b0197..ac64a486a 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -2127,7 +2127,7 @@ IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData )
             if(nRightKind == SV_ITEM_ID_LBOXSTRING &&
                 nLeftKind == SV_ITEM_ID_LBOXSTRING )
             {
-                eCompare= (StringCompare) ScGlobal::pCaseCollator->compareString(
+                eCompare= (StringCompare) ScGlobal::GetCaseCollator()->compareString(
                                         ((SvLBoxString*)pLeftItem)->GetText(),
                                         ((SvLBoxString*)pRightItem)->GetText());
 
diff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mk
index c6b8f2703..52cf9ae28 100644
--- a/sc/source/ui/miscdlgs/makefile.mk
+++ b/sc/source/ui/miscdlgs/makefile.mk
@@ -51,6 +51,7 @@ SLOFILES =  \
     $(SLO)$/delcodlg.obj		\
     $(SLO)$/inscodlg.obj		\
     $(SLO)$/strindlg.obj		\
+    $(SLO)$/tabbgcolordlg.obj   \
     $(SLO)$/mtrindlg.obj		\
     $(SLO)$/lbseldlg.obj		\
     $(SLO)$/filldlg.obj			\
@@ -81,7 +82,7 @@ SLOFILES =  \
     $(SLO)$/conflictsdlg.obj    \
     $(SLO)$/sharedocdlg.obj \
     $(SLO)$/protectiondlg.obj \
-	$(SLO)$/retypepassdlg.obj
+    $(SLO)$/retypepassdlg.obj
 
 EXCEPTIONSFILES = \
     $(SLO)$/acredlin.obj        \
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 8956e9d4e..37937617b 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -66,7 +66,7 @@ struct ScSolverOptionsEntry
 
     bool operator< (const ScSolverOptionsEntry& rOther) const
     {
-        return ( ScGlobal::pCollator->compareString( aDescription, rOther.aDescription ) == COMPARE_LESS );
+        return ( ScGlobal::GetCollator()->compareString( aDescription, rOther.aDescription ) == COMPARE_LESS );
     }
 };
 
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
new file mode 100644
index 000000000..8e9987e3d
--- /dev/null
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -0,0 +1,197 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: tabbgcolordlg.cxx,v $
+ * $Revision: 1.0 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sc.hxx"
+
+#undef SC_DLLIMPLEMENTATION
+
+//------------------------------------------------------------------
+
+#include <tools/debug.hxx>
+#include <tools/color.hxx>
+#include <sfx2/objsh.hxx>
+#include <svx/xtable.hxx>
+#include <svx/drawitem.hxx>
+#include <svtools/pathoptions.hxx>
+#include <tools/resid.hxx>
+#include "tabbgcolordlg.hxx"
+#include "scresid.hxx"
+#include "miscdlgs.hrc"
+#include <svx/svxitems.hrc>
+
+//==================================================================
+
+#define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl)
+
+__EXPORT ScTabBgColorDlg::ScTabBgColorDlg( Window*         pParent,
+                                    const String&   rTitle,
+                                    const String&   rTabBgColorNoColorText,
+                                    const Color&    rDefaultColor,
+                                    ULONG nHelpId ) :
+    ModalDialog    ( pParent, ScResId( RID_SCDLG_TAB_BG_COLOR ) ),
+    aBorderWin              ( this, ScResId( TAB_BG_COLOR_CT_BORDER ) ),
+    aTabBgColorSet          ( &aBorderWin, ScResId( TAB_BG_COLOR_SET_BGDCOLOR ), this ),
+    aTabBgColorBox          ( this, ScResId( TAB_BG_COLOR_GB_BGDCOLOR ) ),
+    aBtnOk                  ( this, ScResId( BTN_OK ) ),
+    aBtnCancel              ( this, ScResId( BTN_CANCEL ) ),
+    aBtnHelp                ( this, ScResId( BTN_HELP ) ),
+    aTabBgColorNoColorText  ( rTabBgColorNoColorText ),
+    aTabBgColor             ( rDefaultColor ),
+    aHelpId                 ( nHelpId )
+
+{
+    SetHelpId( nHelpId );
+    this->SetText( rTitle );
+    this->SetStyle(GetStyle() | WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL | WB_SYSTEMWINDOW | WB_STANDALONE | WB_HIDE);
+    //TODO: Assign Help ID's to all controls...
+    aTabBgColorBox.SetText(rTitle);
+    FillColorValueSets_Impl();
+    aTabBgColorSet.SetDoubleClickHdl( HDL(TabBgColorDblClickHdl_Impl) );
+    aBtnOk.SetClickHdl( HDL(TabBgColorOKHdl_Impl) );
+    FreeResource();
+}
+
+//------------------------------------------------------------------------
+
+void ScTabBgColorDlg::GetSelectedColor( Color& rColor ) const
+{
+    rColor = this->aTabBgColor;
+}
+
+__EXPORT ScTabBgColorDlg::~ScTabBgColorDlg()
+{
+}
+
+void ScTabBgColorDlg::FillColorValueSets_Impl()
+{
+    SfxObjectShell* pDocSh = SfxObjectShell::Current();
+    const SfxPoolItem* pItem = NULL;
+    XColorTable* pColorTable = NULL;
+    const Size aSize15x15 = Size( 15, 15 );
+    const Size aSize10x10 = Size( 10, 10 );
+    const Size aSize5x5 = Size( 5, 5 );
+    USHORT nSelectedItem = 0;
+    FASTBOOL bOwn = FALSE;
+
+    DBG_ASSERT( pDocSh, "DocShell not found!" );
+
+    if ( pDocSh && ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) )
+        pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable();
+    if ( !pColorTable )
+    {
+        bOwn = TRUE;
+        pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+    }
+    if ( pColorTable )
+    {
+        short i = 0;
+        long nCount = pColorTable->Count();
+        XColorEntry* pEntry = NULL;
+        Color aColWhite( COL_WHITE );
+        String aStrWhite( ScResId( RID_SVXITEMS_COLOR_WHITE ) );
+        WinBits nBits = ( aTabBgColorSet.GetStyle() | WB_NAMEFIELD | WB_ITEMBORDER | WB_NONEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT | WB_NOPOINTERFOCUS);
+        aTabBgColorSet.SetText( aTabBgColorNoColorText );
+        aTabBgColorSet.SetStyle( nBits );
+        for ( i = 0; i < nCount; i++ )
+        {
+            pEntry = pColorTable->GetColor(i);
+            aTabBgColorSet.InsertItem( i + 1, pEntry->GetColor(), pEntry->GetName() );
+            if (pEntry->GetColor() == aTabBgColor)
+                nSelectedItem = (i + 1);
+        }
+
+        while ( i < 80 )
+        {
+            aTabBgColorSet.InsertItem( i + 1, aColWhite, aStrWhite );
+            i++;
+        }
+
+        if ( nCount > 80 )
+        {
+            aTabBgColorSet.SetStyle( nBits | WB_VSCROLL );
+        }
+    }
+    aTabBgColorSet.SetColCount( 10 );
+    aTabBgColorSet.SetLineCount( 10 );
+    aTabBgColorSet.CalcWindowSizePixel( aSize15x15 );
+    aTabBgColorSet.Format();
+    aTabBgColorSet.SelectItem(nSelectedItem);
+    aTabBgColorSet.Resize();
+    if ( bOwn )
+        delete pColorTable;
+}
+
+IMPL_LINK( ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, EMPTYARG )
+/*
+    Handler, called when color selection is changed
+*/
+{
+    USHORT nItemId = aTabBgColorSet.GetSelectItemId();
+    Color aColor = nItemId ? ( aTabBgColorSet.GetItemColor( nItemId ) ) : Color( COL_AUTO );
+    aTabBgColor = aColor;
+    EndDialog( TRUE );
+    return 0;
+}
+
+IMPL_LINK( ScTabBgColorDlg, TabBgColorOKHdl_Impl, OKButton*, EMPTYARG )
+{
+
+//    Handler, called when the OK button is pushed
+
+    USHORT nItemId = aTabBgColorSet.GetSelectItemId();
+    Color aColor = nItemId ? ( aTabBgColorSet.GetItemColor( nItemId ) ) : Color( COL_AUTO );
+    aTabBgColor = aColor;
+    EndDialog( TRUE );
+    return 0;
+}
+
+__EXPORT ScTabBgColorDlg::ScTabBgColorValueSet::ScTabBgColorValueSet( Control* pParent, const ResId& rResId, ScTabBgColorDlg* pTabBgColorDlg ) :
+    ValueSet(pParent, rResId)
+{
+    aTabBgColorDlg = pTabBgColorDlg;
+}
+
+void ScTabBgColorDlg::ScTabBgColorValueSet::KeyInput( const KeyEvent& rKEvt )
+{
+    switch ( rKEvt.GetKeyCode().GetCode() )
+    {
+        case KEY_SPACE:
+        case KEY_RETURN:
+        {
+            USHORT nItemId = GetSelectItemId();
+            const Color& aColor = nItemId ? ( GetItemColor( nItemId ) ) : Color( COL_AUTO );
+            aTabBgColorDlg->aTabBgColor = aColor;
+            aTabBgColorDlg->EndDialog(TRUE);
+        }
+        break;
+    }
+    ValueSet::KeyInput(rKEvt);
+}
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index e6451f46e..78fefb39d 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -71,6 +71,7 @@
 #include "navicfg.hxx"
 #include "navsett.hxx"
 #include "postit.hxx"
+#include "clipparam.hxx"
 
 using namespace com::sun::star;
 
@@ -1103,9 +1104,8 @@ void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, USHORT nFlag
                                                    aMark ) )
     {
         ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
-        pSrcDoc->CopyToClip( rRange.aStart.Col(), rRange.aStart.Row(),
-                             rRange.aEnd.Col(),   rRange.aEnd.Row(),
-                             FALSE, pClipDoc, FALSE, &aMark );
+        ScClipParam aClipParam(rRange, false);
+        pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aMark);
         // pClipDoc->ExtendMerge( rRange, TRUE );
 
         TransferableObjectDescriptor aObjDesc;
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 7080fa661..cd06a357e 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1130,6 +1130,14 @@ Resource RID_GLOBSTR
     {
         Text [ en-US ] = "Rename Sheet" ;
     };
+    String STR_UNDO_SET_TAB_BG_COLOR
+    {
+        Text [ en-US ] = "Color Tab" ;
+    };
+    String STR_UNDO_SET_MULTI_TAB_BG_COLOR
+    {
+        Text [ en-US ] = "Color Tabs" ;
+    };
     String STR_UNDO_MOVE_TAB
     {
         Text [ en-US ] = "Move Sheets" ;
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index da8cb0342..ef2a8acf5 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -546,6 +546,96 @@ ModalDialog RID_SCDLG_STRINPUT
         Size = MAP_APPFONT ( 110 , 8 ) ;
     };
 };
+ModalDialog RID_SCDLG_TAB_BG_COLOR
+{
+    OutputSize = TRUE ;
+    SVLook = TRUE ;
+    Size = MAP_APPFONT ( 118 , 167 ) ;
+    Moveable = TRUE ;
+    Closeable = TRUE ;
+    Control TAB_BG_COLOR_CT_BORDER
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 1 , 1 ) ; //12, 32
+        Size = MAP_APPFONT ( 116+2 , 145+2 ) ;
+        DialogControl = TRUE;
+    };
+    Control TAB_BG_COLOR_SET_BGDCOLOR
+    {
+        // * HelpId = HID_BACKGROUND_CTL_BGDCOLORSET ;
+        Hide = FALSE ;
+        Pos = MAP_APPFONT ( 0 , 0 ) ;
+        Size = MAP_APPFONT ( 116 , 145 ) ;
+        TabStop = TRUE ;
+    };
+    CancelButton BTN_CANCEL
+    {
+        Pos = MAP_APPFONT ( 82 , 151 ) ;
+        Size = MAP_APPFONT ( 35 , 14 ) ;
+        TabStop = TRUE ;
+        DefButton = FALSE ;
+    };
+    OKButton BTN_OK
+    {
+        Pos = MAP_APPFONT ( 45 , 151 ) ;
+        Size = MAP_APPFONT ( 35 , 14 ) ;
+        TabStop = TRUE ;
+        DefButton = TRUE ;
+    };
+    HelpButton BTN_HELP
+    {
+        Pos = MAP_APPFONT ( 2 , 151 ) ;
+        Size = MAP_APPFONT ( 35 , 14 ) ;
+        TabStop = TRUE ;
+        DefButton = FALSE ;
+    };
+};
+/*
+ModalDialog RID_SCDLG_TAB_BG_COLOR
+{
+    OutputSize = TRUE ;
+    SVLook = TRUE ;
+    Size = MAP_APPFONT ( 180 , 150 ) ;
+    Moveable = TRUE ;
+    Closeable = TRUE ;
+    Control TAB_BG_COLOR_CT_BORDER
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 1 , 1 ) ; //12, 32
+        Size = MAP_APPFONT ( 116+2 , 145+2 ) ;
+        DialogControl = TRUE;
+    };
+    Control TAB_BG_COLOR_SET_BGDCOLOR
+    {
+        // * HelpId = HID_BACKGROUND_CTL_BGDCOLORSET ;
+        Hide = FALSE ;
+        Pos = MAP_APPFONT ( 0 , 0 ) ;
+        Size = MAP_APPFONT ( 116 , 145 ) ;
+        TabStop = TRUE ;
+    };
+    OKButton BTN_OK
+    {
+        Pos = MAP_APPFONT ( 125 , 50 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+        DefButton = TRUE ;
+    };
+    CancelButton BTN_CANCEL
+    {
+        Pos = MAP_APPFONT ( 125 , 67 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+        DefButton = FALSE ;
+    };
+    HelpButton BTN_HELP
+    {
+        Pos = MAP_APPFONT ( 125 , 84 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+        DefButton = FALSE ;
+    };
+};
+*/
 /*
 ModalDialog RID_SCDLG_MTRINPUT
 {
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index dee48a57b..eb9cd3c2b 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -193,6 +193,15 @@ Menu RID_POPUP_TAB
             HelpId = FID_TAB_RTL ;
             Text [ en-US ] = "S~heet Right-To-Left" ;
         };
+        //------------------------------
+        MenuItem { Separator = TRUE ; };
+        //------------------------------
+        MenuItem
+        {
+            Identifier = FID_TAB_MENU_SET_TAB_BG_COLOR ;
+            HelpId = FID_TAB_MENU_SET_TAB_BG_COLOR ;
+            Text [ en-US ] = "~Tab Color..." ;
+        };
     };
 };
 
@@ -212,84 +221,84 @@ Menu RID_POPUP_PIVOT
             Text [ en-US ] = "~Start..." ;
         };
         MenuItem
-                {
-                        Identifier = SID_PIVOT_AFMT ;
-                        HelpId = SID_PIVOT_AFMT ;
-			Text [ en-US ] = "~AutoFormat..." ; 
-                        Text [ de ] = "A~utoFormat" ;
-			Text [ af ] = "OutoFormateer..." ;
-			Text [ ar ] = "تنسيق تلقائي..." ;
-			Text [ as-IN ] = "স্বয়ংক্ৰিয় ফৰমেট ..." ;
-			Text [ be-BY ] = "Аўта-фармат..." ;
-			Text [ bg ] = "Автоформат..." ;
-			Text [ br ] = "EmVentrezhañ..." ;
-			Text [ bs ] = "AutoFormat..." ;
-			Text [ ca ] = "Formatació automàtica..." ;
-			Text [ cs ] = "Automatický formát..." ;
-			Text [ cy ] = "AwtoFformat..." ;
-			Text [ da ] = "Autoformat..." ;
-			Text [ el ] = "Αυτόματη μορφοποίηση..." ;
-			Text [ en-GB ] = "AutoFormat..." ;
-			Text [ en-ZA ] = "AutoFormat..." ;
-			Text [ eo ] = "Aŭtomate Formati..." ;
-			Text [ es ] = "Formateado automático..." ;
-			Text [ et ] = "Automaatvormindus..." ;
-			Text [ fa ] = "قالب‌بندی خودکار..." ;
-			Text [ fi ] = "Automaattinen muotoilu..." ;
-			Text [ fr ] = "AutoFormat..." ;
-			Text [ ga ] = "UathFhormáidigh..." ;
-			Text [ gu ] = "આપોઆપબંધારણ..." ;
-			Text [ gu-IN ] = "આપોઆપબંધારણ..." ;
-			Text [ hi-IN ] = "स्वचालित ढंग से रचना..." ;
-			Text [ hr ] = "SamoOblikovanje..." ;
-			Text [ hu ] = "Automatikus formázás..." ;
-			Text [ it ] = "Formattazione automatica..." ;
-			Text [ ja ] = "オートフォーマット..." ;
-			Text [ ka ] = "ავტო-ფორმატირება..." ;
-			Text [ km ] = "ទ្រង់ទ្រាយ​ស្វ័យប្រវត្តិ..." ;
-			Text [ ko ] = "자동 서식..." ;
-			Text [ ku ] = "TeşekirinaBixweber..." ;
-			Text [ lt ] = "Automatinis formatavimas..." ;
-			Text [ mk ] = "Автоматско форматирање..." ;
-			Text [ ml-IN ] = "സ്വയം രൂപപ്പെടുത്തുക..." ;
-			Text [ mr-IN ] = "स्वंयचलित रचना..." ;
-			Text [ nb ] = "Autoformatering..." ;
-			Text [ nl ] = "AutoOpmaak..." ;
-			Text [ nn ] = "Autoformatering..." ;
-			Text [ nr ] = "Fometha ngokuzenzakalela..." ;
-			Text [ ns ] = "Fomate ye e Itiragalelago..." ;
-			Text [ or-IN ] = "ସ୍ବଯଂଚାଳିତଫର୍ମାଟ..." ;
-			Text [ pa-IN ] = "ਸਵੈ-ਫਾਰਮਿਟ..." ;
-			Text [ pl ] = "Autoformatowanie..." ;
-			Text [ pt ] = "Formatação automática..." ;
-			Text [ pt-BR ] = "AutoFormatar..." ;
-			Text [ ru ] = "Автоформат..." ;
-			Text [ rw ] = "Nyamwihamiterere..." ;
-			Text [ sh-YU ] = "Automatsko formatiranje..." ;
-			Text [ sk ] = "Automatický formát..." ;
-			Text [ sl ] = "Samooblikovanje..." ;
-			Text [ sr-CS ] = "Аутоматско форматирање..." ;
-			Text [ ss ] = "Kutifomethekela..." ;
-			Text [ st ] = "Fomate e iketsahallang..." ;
-			Text [ sv ] = "Autoformat..." ;
-			Text [ sw-TZ ] = "AutoFormat..." ;
-			Text [ ta ] = "தானியக்க வடிவம்..." ;
-			Text [ ta-IN ] = "தானியக்க வடிவம்..." ;
-			Text [ te-IN ] = "స్వయంరూపలావణ్యం..." ;
-			Text [ tg ] = "Автоформат..." ;
-			Text [ th ] = "AutoFormat..." ;
-			Text [ tr ] = "Otomatik Biçimlendirme..." ;
-			Text [ ts ] = "Fomati yo tiendlekela hi yoxe..." ;
-			Text [ uk ] = "Автоформат..." ;
-			Text [ ur-IN ] = "خودکارطریقہ..." ;
-			Text [ ve ] = "OthoFomathi..." ;
-			Text [ vi ] = "Tự định dạng..." ;
-			Text [ xh ] = "Ulungiselelo Oluzenzekelayo..." ;
-			Text [ zh-CN ] = "自动格式..." ;
-			Text [ zh-TW ] = "自動格式..." ;
-			Text [ zu ] = "Isakhiwo esizenzekelayo..." ;
-		};
-		MenuItem
+        {
+            Identifier = SID_PIVOT_AFMT ;
+            HelpId = SID_PIVOT_AFMT ;
+            Text [ en-US ] = "~AutoFormat..." ; 
+            Text [ de ] = "A~utoFormat" ;
+            Text [ af ] = "OutoFormateer..." ;
+            Text [ ar ] = "تنسيق تلقائي..." ;
+            Text [ as-IN ] = "স্বয়ংক্ৰিয় ফৰমেট ..." ;
+            Text [ be-BY ] = "Аўта-фармат..." ;
+            Text [ bg ] = "Автоформат..." ;
+            Text [ br ] = "EmVentrezhañ..." ;
+            Text [ bs ] = "AutoFormat..." ;
+            Text [ ca ] = "Formatació automàtica..." ;
+            Text [ cs ] = "Automatický formát..." ;
+            Text [ cy ] = "AwtoFformat..." ;
+            Text [ da ] = "Autoformat..." ;
+            Text [ el ] = "Αυτόματη μορφοποίηση..." ;
+            Text [ en-GB ] = "AutoFormat..." ;
+            Text [ en-ZA ] = "AutoFormat..." ;
+            Text [ eo ] = "Aŭtomate Formati..." ;
+            Text [ es ] = "Formateado automático..." ;
+            Text [ et ] = "Automaatvormindus..." ;
+            Text [ fa ] = "قالب‌بندی خودکار..." ;
+            Text [ fi ] = "Automaattinen muotoilu..." ;
+            Text [ fr ] = "AutoFormat..." ;
+            Text [ ga ] = "UathFhormáidigh..." ;
+            Text [ gu ] = "આપોઆપબંધારણ..." ;
+            Text [ gu-IN ] = "આપોઆપબંધારણ..." ;
+            Text [ hi-IN ] = "स्वचालित ढंग से रचना..." ;
+            Text [ hr ] = "SamoOblikovanje..." ;
+            Text [ hu ] = "Automatikus formázás..." ;
+            Text [ it ] = "Formattazione automatica..." ;
+            Text [ ja ] = "オートフォーマット..." ;
+            Text [ ka ] = "ავტო-ფორმატირება..." ;
+            Text [ km ] = "ទ្រង់ទ្រាយ​ស្វ័យប្រវត្តិ..." ;
+            Text [ ko ] = "자동 서식..." ;
+            Text [ ku ] = "TeşekirinaBixweber..." ;
+            Text [ lt ] = "Automatinis formatavimas..." ;
+            Text [ mk ] = "Автоматско форматирање..." ;
+            Text [ ml-IN ] = "സ്വയം രൂപപ്പെടുത്തുക..." ;
+            Text [ mr-IN ] = "स्वंयचलित रचना..." ;
+            Text [ nb ] = "Autoformatering..." ;
+            Text [ nl ] = "AutoOpmaak..." ;
+            Text [ nn ] = "Autoformatering..." ;
+            Text [ nr ] = "Fometha ngokuzenzakalela..." ;
+            Text [ ns ] = "Fomate ye e Itiragalelago..." ;
+            Text [ or-IN ] = "ସ୍ବଯଂଚାଳିତଫର୍ମାଟ..." ;
+            Text [ pa-IN ] = "ਸਵੈ-ਫਾਰਮਿਟ..." ;
+            Text [ pl ] = "Autoformatowanie..." ;
+            Text [ pt ] = "Formatação automática..." ;
+            Text [ pt-BR ] = "AutoFormatar..." ;
+            Text [ ru ] = "Автоформат..." ;
+            Text [ rw ] = "Nyamwihamiterere..." ;
+            Text [ sh-YU ] = "Automatsko formatiranje..." ;
+            Text [ sk ] = "Automatický formát..." ;
+            Text [ sl ] = "Samooblikovanje..." ;
+            Text [ sr-CS ] = "Аутоматско форматирање..." ;
+            Text [ ss ] = "Kutifomethekela..." ;
+            Text [ st ] = "Fomate e iketsahallang..." ;
+            Text [ sv ] = "Autoformat..." ;
+            Text [ sw-TZ ] = "AutoFormat..." ;
+            Text [ ta ] = "தானியக்க வடிவம்..." ;
+            Text [ ta-IN ] = "தானியக்க வடிவம்..." ;
+            Text [ te-IN ] = "స్వయంరూపలావణ్యం..." ;
+            Text [ tg ] = "Автоформат..." ;
+            Text [ th ] = "AutoFormat..." ;
+            Text [ tr ] = "Otomatik Biçimlendirme..." ;
+            Text [ ts ] = "Fomati yo tiendlekela hi yoxe..." ;
+            Text [ uk ] = "Автоформат..." ;
+            Text [ ur-IN ] = "خودکارطریقہ..." ;
+            Text [ ve ] = "OthoFomathi..." ;
+            Text [ vi ] = "Tự định dạng..." ;
+            Text [ xh ] = "Ulungiselelo Oluzenzekelayo..." ;
+            Text [ zh-CN ] = "自动格式..." ;
+            Text [ zh-TW ] = "自動格式..." ;
+            Text [ zu ] = "Isakhiwo esizenzekelayo..." ;
+        };
+        MenuItem
         {
             Identifier = SID_PIVOT_RECALC ;
             HelpId = SID_PIVOT_RECALC ;
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 13a130fb3..0c1996b19 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -7995,33 +7995,6 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
             Text [ en-US ] = "The text to convert.";
         };
     };
-     // -=*# Resource for function PHONETIC #*=-
-    Resource SC_OPCODE_PHONETIC
-    {
-        String 1 // Description
-        {
-            Text [ en-US ] = "Returns a phonetic guide text." ;
-            Text [ ja ] = "ふりがな文字列を返します。" ;
-        };
-        ExtraData =
-        {
-            0;
-            ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_PHONETIC );
-            1;  0;
-            0;
-        };
-        String 2 // Name of Parameter 1
-        {
-            Text [ en-US ] = "range" ;
-            Text [ ja ] = "範囲" ;
-        };
-        String 3 // Description of Parameter 1
-        {
-            Text [ en-US ] = "The cell range from which phonetic guide texts are retrieved." ;
-            Text [ ja ] = "ふりがな文字列を取り出すセル範囲。" ;
-        };
-    };
      // -=*# Resource for function CODE #*=-
     Resource SC_OPCODE_CODE
     {
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index c50a304eb..6fb17a3b8 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -283,6 +283,14 @@ String SCSTR_RENAMETAB
 {
     Text [ en-US ] = "Rename Sheet" ;
 };
+String SCSTR_SET_TAB_BG_COLOR
+{
+    Text [ en-US ] = "Tab Color" ;
+};
+String SCSTR_NO_TAB_BG_COLOR
+{
+    Text [ en-US ] = "Default" ;
+};
 String SCSTR_RENAMEOBJECT
 {
     Text [ en-US ] = "Name Object";
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index f20abdb07..8b59f801b 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -45,6 +45,7 @@
 #include "undodraw.hxx"
 #include "dbcolect.hxx"
 #include "attrib.hxx"
+#include "queryparam.hxx"
 #include "globstr.hrc"
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 85400c64b..002aa14cd 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -64,6 +64,7 @@
 #include "transobj.hxx"
 #include "refundo.hxx"
 #include "undoolk.hxx"
+#include "clipparam.hxx"
 #include "sc.hrc"
 
 #include <set>
@@ -1151,10 +1152,10 @@ ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
     BOOL bIncludeFiltered = bCut;
     if ( !bIncludeFiltered )
     {
-        //	manually find number of non-filtered rows
-        SCROW nPastedCount = pDocShell->GetDocument()->GetRowFlagsArray(
-                aSrcRange.aStart.Tab()).CountForCondition(
-                aSrcRange.aStart.Row(), aSrcRange.aEnd.Row(), CR_FILTERED, 0);
+        // find number of non-filtered rows
+        SCROW nPastedCount = pDocShell->GetDocument()->CountNonFilteredRows(
+            aSrcRange.aStart.Row(), aSrcRange.aEnd.Row(), aSrcRange.aStart.Tab());
+
         if ( nPastedCount == 0 )
             nPastedCount = 1;
         aDestEnd.SetRow( aNewDestPos.Row() + nPastedCount - 1 );
@@ -1317,9 +1318,8 @@ void __EXPORT ScUndoDragDrop::Redo()
         aSourceMark.SelectTable( nTab, TRUE );
 
     // do not clone objects and note captions into clipdoc (see above)
-    pDoc->CopyToClip( aSrcRange.aStart.Col(), aSrcRange.aStart.Row(),
-                      aSrcRange.aEnd.Col(),   aSrcRange.aEnd.Row(),
-                      bCut, pClipDoc, FALSE, &aSourceMark, bKeepScenarioFlags, FALSE, FALSE );
+    ScClipParam aClipParam(aSrcRange, bCut);
+    pDoc->CopyToClip(aClipParam, pClipDoc, &aSourceMark, false, bKeepScenarioFlags, false, false);
 
     if (bCut)
     {
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index c6dba052e..cb6f62c34 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -1082,17 +1082,20 @@ void __EXPORT ScUndoAutoFormat::Redo()
             aDestMark.MarkToMulti();
 
             // wie SC_SIZE_VISOPT
+            SCROW nLastRow = -1;
             for (SCROW nRow=nStartY; nRow<=nEndY; nRow++)
             {
                 BYTE nOld = pDoc->GetRowFlags(nRow,nTab);
-                if ( (nOld & CR_HIDDEN) == 0 && ( nOld & CR_MANUALSIZE ) )
+                bool bHidden = pDoc->RowHidden(nRow, nTab, nLastRow);
+				if ( !bHidden && ( nOld & CR_MANUALSIZE ) )
                     pDoc->SetRowFlags( nRow, nTab, nOld & ~CR_MANUALSIZE );
             }
             pDoc->SetOptimalHeight( nStartY, nEndY, nTab, 0, &aVirtDev,
                                         nPPTX, nPPTY, aZoomX, aZoomY, FALSE );
 
+            SCCOL nLastCol = -1;
             for (SCCOL nCol=nStartX; nCol<=nEndX; nCol++)
-                if ((pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN) == 0)
+                if (!pDoc->ColHidden(nCol, nTab, nLastCol))
                 {
                     USHORT nThisSize = STD_EXTRA_WIDTH + pDoc->GetOptimalColWidth( nCol, nTab,
                                                 &aVirtDev, nPPTX, nPPTY, aZoomX, aZoomY, bFormula,
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 200b84ac3..c50211d9f 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -587,6 +587,8 @@ void ScUndoPageBreak::DoChange( BOOL bInsertP ) const
             pViewShell->InsertPageBreak(bColumn, FALSE);
         else
             pViewShell->DeletePageBreak(bColumn, FALSE);
+
+        pDocShell->GetDocument()->InvalidatePageBreaks(nTab);
     }
 }
 
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 73ebf3812..56ff0a6c1 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -1032,7 +1032,10 @@ void __EXPORT ScUndoQuery::Undo()
         pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), TRUE );
 
     if (!bCopy)
+    {
+        pDoc->InvalidatePageBreaks(nTab);    
         pDoc->UpdatePageBreaks( nTab );
+    }
 
     ScRange aDirtyRange( 0 , aQueryParam.nRow1, nTab,
         MAXCOL, aQueryParam.nRow2, nTab );
@@ -1879,7 +1882,7 @@ void __EXPORT ScUndoDataPilot::Undo()
             else
             {
                 //	delete inserted object
-                pDoc->GetDPCollection()->Free(pDocObj);
+                pDoc->GetDPCollection()->FreeTable(pDocObj);
             }
         }
     }
@@ -1889,7 +1892,7 @@ void __EXPORT ScUndoDataPilot::Undo()
 
         ScDPObject* pDestObj = new ScDPObject( *pOldDPObject );
         pDestObj->SetAlive(TRUE);
-        if ( !pDoc->GetDPCollection()->Insert(pDestObj) )
+		if ( !pDoc->GetDPCollection()->InsertNewTable(pDestObj) )
         {
             DBG_ERROR("cannot insert DPObject");
             DELETEZ( pDestObj );
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 5650376b0..0e5640599 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -70,6 +70,9 @@
 #include "drwlayer.hxx"
 #include "scresid.hxx"
 
+// for set tab bg color
+#include "viewdata.hxx"
+
 extern BOOL bDrawIsInUndo;			//! irgendwo als Member !!!
 
 using namespace com::sun::star;
@@ -93,6 +96,7 @@ TYPEINIT1(ScUndoScenarioFlags,	SfxUndoAction);
 TYPEINIT1(ScUndoRenameObject,	SfxUndoAction);
 TYPEINIT1(ScUndoLayoutRTL,		SfxUndoAction);
 //UNUSED2009-05 TYPEINIT1(ScUndoSetGrammar,		SfxUndoAction);
+TYPEINIT1(ScUndoSetTabBgColor,  SfxUndoAction);
 
 
 // -----------------------------------------------------------------------
@@ -779,6 +783,113 @@ BOOL ScUndoCopyTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
     return FALSE;
 }
 
+//---------------------------------------------------------------------------------
+//
+//      Tab Bg Color
+//
+
+ScUndoSetTabBgColor::ScUndoSetTabBgColor( ScDocShell* pNewDocShell,
+                                        SCTAB nT,
+                                        const Color& aOTabBgColor,
+                                        const Color& aNTabBgColor) :
+    ScSimpleUndo( pNewDocShell ),
+    nTab 	 ( nT ),
+    bIsMultipleUndo ( FALSE ),
+    aUndoSetTabBgColorInfoList ( NULL )
+{
+    aOldTabBgColor = aOTabBgColor;
+    aNewTabBgColor = aNTabBgColor;
+}
+
+ScUndoSetTabBgColor::ScUndoSetTabBgColor( ScDocShell* pNewDocShell,
+                                        ScUndoSetTabBgColorInfoList* pUndoSetTabBgColorInfoList) :
+    ScSimpleUndo( pNewDocShell ),
+    bIsMultipleUndo ( TRUE )
+{
+    aUndoSetTabBgColorInfoList = pUndoSetTabBgColorInfoList;
+}
+
+__EXPORT ScUndoSetTabBgColor::~ScUndoSetTabBgColor()
+{
+}
+
+String __EXPORT ScUndoSetTabBgColor::GetComment() const
+{
+    if (bIsMultipleUndo && aUndoSetTabBgColorInfoList && aUndoSetTabBgColorInfoList->Count() > 1)
+        return ScGlobal::GetRscString( STR_UNDO_SET_MULTI_TAB_BG_COLOR );
+    return ScGlobal::GetRscString( STR_UNDO_SET_TAB_BG_COLOR );
+}
+
+void ScUndoSetTabBgColor::DoChange( SCTAB nTabP, const Color& rTabBgColor ) const
+{
+    if (bIsMultipleUndo)
+        return;
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+    if (pViewShell)
+    {
+        ScViewData* pViewData = pViewShell->GetViewData();
+        if (pViewData)
+        {
+            pViewData->SetTabBgColor( rTabBgColor, nTabP );
+            pDocShell->PostPaintExtras();
+            pDocShell->PostDataChanged();
+            SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
+            pViewShell->UpdateInputHandler();
+        }
+    }
+}
+
+void ScUndoSetTabBgColor::DoChange(BOOL bUndoType) const
+{
+    if (!bIsMultipleUndo)
+        return;
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+    if (pViewShell)
+    {
+        ScViewData* pViewData = pViewShell->GetViewData();
+        if (pViewData)
+        {
+            ScUndoSetTabBgColorInfo* aUndoSetTabBgColorInfo=NULL;
+            for (USHORT i=0; i < aUndoSetTabBgColorInfoList->Count(); i++)
+            {
+                aUndoSetTabBgColorInfo = aUndoSetTabBgColorInfoList->GetObject(i);
+                pViewData->SetTabBgColor( 
+                    bUndoType ? aUndoSetTabBgColorInfo->aOldTabBgColor : aUndoSetTabBgColorInfo->aNewTabBgColor,
+                    aUndoSetTabBgColorInfo->nTabId);
+            }
+            pDocShell->PostPaintExtras();
+            pDocShell->PostDataChanged();
+            SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
+            pViewShell->UpdateInputHandler();
+        }
+    }
+}
+
+void __EXPORT ScUndoSetTabBgColor::Undo()
+{
+    if ( bIsMultipleUndo )
+        DoChange(TRUE);
+    else
+        DoChange(nTab, aOldTabBgColor);
+}
+
+void __EXPORT ScUndoSetTabBgColor::Redo()
+{
+    if ( bIsMultipleUndo )
+        DoChange(FALSE);
+    else
+        DoChange(nTab, aNewTabBgColor);
+}
+
+void __EXPORT ScUndoSetTabBgColor::Repeat(SfxRepeatTarget& /* rTarget */)
+{
+	//	No Repeat
+}
+
+BOOL __EXPORT ScUndoSetTabBgColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+{
+    return FALSE;
+}
 
 // -----------------------------------------------------------------------
 //
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 58adcd6f2..16cc95b3a 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3379,18 +3379,25 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleC
         ScMarkData aMarkData(*GetMarkData());
 
         ScDocument* pDoc = pDocShell->GetDocument();
-        for (SCCOL nCol=0; nCol<=MAXCOL; nCol++)
-            if (pDoc->GetColFlags(nCol,nTab) & CR_HIDDEN)
-                aMarkData.SetMultiMarkArea( ScRange( nCol,0,nTab, nCol,MAXROW,nTab ), FALSE );
-
-        //!	nur bis zur letzten selektierten Zeile testen?
-        ScCompressedArrayIterator< SCROW, BYTE> aIter( pDoc->GetRowFlagsArray( nTab), 0, MAXROW);
-        do
-        {
-            if (*aIter & CR_HIDDEN)
-                aMarkData.SetMultiMarkArea( ScRange( 0, aIter.GetRangeStart(),
-                            nTab, MAXCOL, aIter.GetRangeEnd(), nTab ), FALSE );
-        } while (aIter.NextRange());
+		SCCOL nCol = 0, nLastCol;
+		while (nCol <= MAXCOL)
+		{
+			if (pDoc->ColHidden(nCol, nTab, nLastCol))
+				// hidden columns.  Unselect them.
+				aMarkData.SetMultiMarkArea(ScRange(nCol, 0, nTab, nLastCol, MAXROW, nTab), false);
+
+			nCol = nLastCol + 1;
+		}
+
+		SCROW nRow = 0, nLastRow;
+		while (nRow <= MAXROW)
+		{
+			if (pDoc->RowHidden(nRow, nTab, nLastRow))
+				// These rows are hidden.  Unselect them.
+				aMarkData.SetMultiMarkArea(ScRange(0, nRow, nTab, MAXCOL, nLastRow, nTab), false);
+
+			nRow = nLastRow + 1;
+		}
 
         ScRangeList aNewRanges;
         aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE );
@@ -6195,32 +6202,6 @@ String ScCellObj::GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aCellP
     return aVal;
 }
 
-String ScCellObj::GetOutputPhoneticString_Impl(ScDocument* pDoc, const ScAddress& aCellPos)
-{
-    String aVal;
-    if ( pDoc )
-    {
-        ScBaseCell* pCell = pDoc->GetCell( aCellPos );
-        if ( pCell && pCell->GetCellType() == CELLTYPE_STRING &&
-             static_cast<const ScStringCell*>(pCell)->HasPhonetic() )
-        {
-            ScPhonetic aPhonetic;
-            static_cast<const ScAsianStringCell*>(pCell)->GetPhonetic(aPhonetic);
-            if ( !aPhonetic.IsEmpty() )
-                aVal = aPhonetic.GetString();
-        }
-        else if ( pCell && pCell->GetCellType() == CELLTYPE_EDIT && 
-                  static_cast<const ScEditCell*>(pCell)->HasPhonetic() )
-        {
-            ScPhonetic aPhonetic;
-            static_cast<const ScAsianEditCell*>(pCell)->GetPhonetic(aPhonetic);
-            if ( !aPhonetic.IsEmpty() )
-                aVal = aPhonetic.GetString();
-        }
-    }
-    return aVal;
-}
-
 String ScCellObj::GetOutputString_Impl() const
 {
     ScDocShell* pDocSh = GetDocShell();
@@ -7082,7 +7063,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage
         SCCOL nCount = 0;
         SCCOL nCol;
         for (nCol=0; nCol<=MAXCOL; nCol++)
-            if (pDoc->GetColFlags( nCol, nTab ) & ( CR_PAGEBREAK | CR_MANUALBREAK ))
+            if (pDoc->HasColBreak(nCol, nTab))
                 ++nCount;
 
         sheet::TablePageBreakData aData;
@@ -7091,11 +7072,11 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage
         USHORT nPos = 0;
         for (nCol=0; nCol<=MAXCOL; nCol++)
         {
-            BYTE nFlags = pDoc->GetColFlags( nCol, nTab );
-            if (nFlags & ( CR_PAGEBREAK | CR_MANUALBREAK ))
+            ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab);
+            if (nBreak)
             {
                 aData.Position	  = nCol;
-                aData.ManualBreak = ( nFlags & CR_MANUALBREAK ) != 0;
+                aData.ManualBreak = (nBreak & BREAK_MANUAL);
                 pAry[nPos] = aData;
                 ++nPos;
             }
@@ -7124,33 +7105,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBre
             ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab );
             aPrintFunc.UpdatePages();
         }
-
-        SCROW nCount = pDoc->GetRowFlagsArray( nTab).CountForAnyBitCondition(
-                0, MAXROW, (CR_PAGEBREAK | CR_MANUALBREAK));
-
-        uno::Sequence<sheet::TablePageBreakData> aSeq(nCount);
-        if (nCount)
-        {
-            sheet::TablePageBreakData aData;
-            sheet::TablePageBreakData* pAry = aSeq.getArray();
-            size_t nPos = 0;
-            ScCompressedArrayIterator< SCROW, BYTE> aIter( pDoc->GetRowFlagsArray( nTab), 0, MAXROW);
-            do
-            {
-                BYTE nFlags = *aIter;
-                if (nFlags & ( CR_PAGEBREAK | CR_MANUALBREAK ))
-                {
-                    for (SCROW nRow = aIter.GetRangeStart(); nRow <= aIter.GetRangeEnd(); ++nRow)
-                    {
-                        aData.Position	  = nRow;
-                        aData.ManualBreak = ( nFlags & CR_MANUALBREAK ) != 0;
-                        pAry[nPos] = aData;
-                        ++nPos;
-                    }
-                }
-            } while (aIter.NextRange());
-        }
-        return aSeq;
+        return pDoc->GetRowBreakData(nTab);
     }
     return uno::Sequence<sheet::TablePageBreakData>(0);
 }
@@ -8908,8 +8863,9 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
         }
         else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
         {
-            BOOL bVis = !(pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN);
-            ScUnoHelpFunctions::SetBoolInAny( rAny, bVis );
+			SCCOL nDummy;
+			bool bHidden = pDoc->ColHidden(nCol, nTab, nDummy);
+			ScUnoHelpFunctions::SetBoolInAny( rAny, !bHidden );
         }
         else if ( pEntry->nWID == SC_WID_UNO_OWIDTH )
         {
@@ -8919,13 +8875,13 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
         }
         else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE )
         {
-            BOOL bBreak = ( 0 != (pDoc->GetColFlags( nCol, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) );
-            ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak );
+            ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab);
+            ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak );
         }
         else if ( pEntry->nWID == SC_WID_UNO_MANPAGE )
         {
-            BOOL bBreak = ( 0 != (pDoc->GetColFlags( nCol, nTab ) & (CR_MANUALBREAK)) );
-            ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak );
+            ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab);
+            ScUnoHelpFunctions::SetBoolInAny(rAny, (nBreak & BREAK_MANUAL));
         }
         else
             ScCellRangeObj::GetOnePropertyValue(pEntry, rAny);
@@ -9011,12 +8967,7 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
 //			ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
 //			aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE );
             //	SC_SIZE_DIRECT mit Groesse 0 blendet aus
-            BYTE nFlags = pDoc->GetRowFlags(nRow, nTab);
-            if (bFil)
-                nFlags |= CR_FILTERED;
-            else
-                nFlags &= ~CR_FILTERED;
-            pDoc->SetRowFlags(nRow, nTab, nFlags);
+            pDoc->SetRowFiltered(nRow, nRow, nTab, bFil);
         }
         else if ( pEntry->nWID == SC_WID_UNO_OHEIGHT )
         {
@@ -9068,12 +9019,13 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
         }
         else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
         {
-            BOOL bVis = !(pDoc->GetRowFlags( nRow, nTab ) & CR_HIDDEN);
-            ScUnoHelpFunctions::SetBoolInAny( rAny, bVis );
+            SCROW nDummy;
+            bool bHidden = pDoc->RowHidden(nRow, nTab, nDummy);
+            ScUnoHelpFunctions::SetBoolInAny( rAny, !bHidden );
         }
         else if ( pEntry->nWID == SC_WID_UNO_CELLFILT )
         {
-            BOOL bVis = ((pDoc->GetRowFlags( nRow, nTab ) & CR_FILTERED) != 0);
+            bool bVis = pDoc->RowFiltered(nRow, nTab);
             ScUnoHelpFunctions::SetBoolInAny( rAny, bVis );
         }
         else if ( pEntry->nWID == SC_WID_UNO_OHEIGHT )
@@ -9083,13 +9035,13 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
         }
         else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE )
         {
-            BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nRow, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) );
-            ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak );
+            ScBreakType nBreak = pDoc->HasRowBreak(nRow, nTab);
+            ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak );
         }
         else if ( pEntry->nWID == SC_WID_UNO_MANPAGE )
         {
-            BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nRow, nTab ) & (CR_MANUALBREAK)) );
-            ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak );
+            ScBreakType nBreak = (pDoc->HasRowBreak(nRow, nTab) & BREAK_MANUAL);
+            ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak );
         }
         else
             ScCellRangeObj::GetOnePropertyValue(pEntry, rAny);
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 7c1cfc6e8..c7d76690b 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2840,14 +2840,17 @@ void ScChart2DataSequence::BuildDataCache()
             if (!ScRefTokenHelper::getRangeFromToken(aRange, *itr))
                 continue;
 
+            SCCOL nLastCol = -1;
+            SCROW nLastRow = -1;
             for (SCTAB nTab = aRange.aStart.Tab(); nTab <= aRange.aEnd.Tab(); ++nTab)
             {
                 for (SCCOL nCol = aRange.aStart.Col(); nCol <= aRange.aEnd.Col(); ++nCol)
                 {
                     for (SCROW nRow = aRange.aStart.Row(); nRow <= aRange.aEnd.Row(); ++nRow)
                     {
-                        bool bColHidden = (m_pDocument->GetColFlags(nCol, nTab) & CR_HIDDEN);
-                        bool bRowHidden = (m_pDocument->GetRowFlags(nRow, nTab) & CR_HIDDEN);
+                        bool bColHidden = m_pDocument->ColHidden(nCol, nTab, nLastCol);
+                        bool bRowHidden = m_pDocument->RowHidden(nRow, nTab, nLastRow);
+
                         if (bColHidden || bRowHidden)
                         {
                             // hidden cell
@@ -2919,6 +2922,9 @@ void ScChart2DataSequence::BuildDataCache()
     ::std::list<sal_Int32>::const_iterator itr = aHiddenValues.begin(), itrEnd = aHiddenValues.end();
     for (;itr != itrEnd; ++itr, ++pArr)
         *pArr = *itr;
+
+    // Clear the data series cache when the array is re-built.
+    m_aMixedDataCache.realloc(0);
 }
 
 void ScChart2DataSequence::RebuildDataCache()
@@ -3111,7 +3117,6 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
             if ( m_bGotDataChangedHint && m_pDocument )
             {        
                 m_aDataArray.clear();
-                m_aDataArray.clear();
                 lang::EventObject aEvent;
                 aEvent.Source.set((cppu::OWeakObject*)this);
 
@@ -3286,19 +3291,24 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData()
         throw uno::RuntimeException();
 
     BuildDataCache();
-    sal_Int32 nCount = m_aDataArray.size();
-    uno::Sequence<uno::Any> aSeq(nCount);
-    uno::Any* pArr = aSeq.getArray();
-    ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end();
-    for (; itr != itrEnd; ++itr, ++pArr)
+
+    if (!m_aMixedDataCache.getLength())
     {
-        if (itr->mbIsValue)
-            *pArr <<= itr->mfValue;
-        else
-            *pArr <<= itr->maString;
-    }
+        // Build a cache for the 1st time...
 
-    return aSeq;
+        sal_Int32 nCount = m_aDataArray.size();
+        m_aMixedDataCache.realloc(nCount);
+        uno::Any* pArr = m_aMixedDataCache.getArray();
+        ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end();
+        for (; itr != itrEnd; ++itr, ++pArr)
+        {
+            if (itr->mbIsValue)
+                *pArr <<= itr->mfValue;
+            else
+                *pArr <<= itr->maString;
+        }
+    }
+    return m_aMixedDataCache;
 }
 
 // XNumericalDataSequence --------------------------------------------------
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index a82585c4f..2039ea008 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1626,12 +1626,13 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException)
         if( pDim->IsDataLayout() )
             aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) );
         else
-            {
-                aName = *pDim->GetLayoutName();
-                if (!aName)
-                    aName = pDim->GetName();
-            }
-    }
+        {                                                            
+            const rtl::OUString* pLayoutName = pDim->GetLayoutName();
+            if (pLayoutName)                                         
+                aName = *pLayoutName;                                 
+            else                                                     
+                aName = pDim->GetName();                              
+        }                                                                }
     return aName;
 }
 
@@ -1643,7 +1644,7 @@ void SAL_CALL ScDataPilotFieldObj::setName( const OUString& rName ) throw(Runtim
     if( pDim && !pDim->IsDataLayout() )
     {
         String aName( rName );
-        pDim->SetLayoutName( aName );
+        pDim->SetLayoutName(aName);
         SetDPObject( pDPObj );
     }
 }
@@ -3073,7 +3074,7 @@ Sequence<OUString> SAL_CALL ScDataPilotItemsObj::getElementNames()
     ScUnoGuard aGuard;
     Sequence< OUString > aSeq;
     if( ScDPObject* pDPObj = GetDPObject() )
-        pDPObj->GetMembers( lcl_GetObjectIndex( pDPObj, maFieldId ), aSeq );
+        pDPObj->GetMemberNames( lcl_GetObjectIndex( pDPObj, maFieldId ), aSeq );
     return aSeq;
 }
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index d7f773640..d34abc159 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -60,6 +60,9 @@
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
+#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
+#include <com/sun/star/script/XInvocation.hpp>
+#include <com/sun/star/reflection/XIdlClassProvider.hpp>
 #include <comphelper/processfactory.hxx>
 
 #include "docuno.hxx"
@@ -229,15 +232,30 @@ ScModelObj::ScModelObj( ScDocShell* pDocSh ) :
     if ( pDocShell )
     {
         pDocShell->GetDocument()->AddUnoObject(*this);		// SfxModel is derived from SfxListener
+    }
+}
+
+ScModelObj::~ScModelObj()
+{
+    if (pDocShell)
+        pDocShell->GetDocument()->RemoveUnoObject(*this);
+
+    if (xNumberAgg.is())
+        xNumberAgg->setDelegator(uno::Reference<uno::XInterface>());
 
+    delete pPrintFuncCache;
+}
+
+uno::Reference< uno::XAggregation> ScModelObj::GetFormatter()
+{
+    if ( !xNumberAgg.is() )
+    {
         // setDelegator veraendert den RefCount, darum eine Referenz selber halten
         // (direkt am m_refCount, um sich beim release nicht selbst zu loeschen)
         comphelper::increment( m_refCount );
-
         // waehrend des queryInterface braucht man ein Ref auf das
         // SvNumberFormatsSupplierObj, sonst wird es geloescht.
-        uno::Reference<util::XNumberFormatsSupplier> xFormatter(new SvNumberFormatsSupplierObj(
-                                                pDocShell->GetDocument()->GetFormatTable() ));
+        uno::Reference<util::XNumberFormatsSupplier> xFormatter(new SvNumberFormatsSupplierObj(pDocShell->GetDocument()->GetFormatTable() ));
         {
             xNumberAgg.set(uno::Reference<uno::XAggregation>( xFormatter, uno::UNO_QUERY ));
             // extra block to force deletion of the temporary before setDelegator
@@ -248,20 +266,9 @@ ScModelObj::ScModelObj( ScDocShell* pDocSh ) :
 
         if (xNumberAgg.is())
             xNumberAgg->setDelegator( (cppu::OWeakObject*)this );
-
         comphelper::decrement( m_refCount );
-    }
-}
-
-ScModelObj::~ScModelObj()
-{
-    if (pDocShell)
-        pDocShell->GetDocument()->RemoveUnoObject(*this);
-
-    if (xNumberAgg.is())
-        xNumberAgg->setDelegator(uno::Reference<uno::XInterface>());
-
-    delete pPrintFuncCache;
+    } // if ( !xNumberAgg.is() )
+    return xNumberAgg;
 }
 
 ScDocument* ScModelObj::GetDocument() const
@@ -294,6 +301,13 @@ void ScModelObj::AfterXMLLoading(sal_Bool bRet)
         pDocShell->AfterXMLLoading(bRet);
 }
 
+ScSheetSaveData* ScModelObj::GetSheetSaveData()
+{
+    if (pDocShell)
+        return pDocShell->GetSheetSaveData();
+    return NULL;
+}
+
 uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType )
                                                 throw(uno::RuntimeException)
 {
@@ -315,8 +329,19 @@ uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType )
     SC_QUERYINTERFACE( util::XChangesNotifier )
 
     uno::Any aRet(SfxBaseModel::queryInterface( rType ));
-    if ( !aRet.hasValue() && xNumberAgg.is() )
-        aRet = xNumberAgg->queryAggregation( rType );
+    if ( !aRet.hasValue() 
+        && rType != ::getCppuType((uno::Reference< com::sun::star::document::XDocumentEventBroadcaster>*)0)
+        && rType != ::getCppuType((uno::Reference< com::sun::star::frame::XController>*)0)
+        && rType != ::getCppuType((uno::Reference< com::sun::star::frame::XFrame>*)0)
+        && rType != ::getCppuType((uno::Reference< com::sun::star::script::XInvocation>*)0)
+        && rType != ::getCppuType((uno::Reference< com::sun::star::reflection::XIdlClassProvider>*)0)
+        && rType != ::getCppuType((uno::Reference< com::sun::star::beans::XFastPropertySet>*)0)
+        && rType != ::getCppuType((uno::Reference< com::sun::star::awt::XWindow>*)0))
+    {
+        GetFormatter();
+        if ( xNumberAgg.is() )
+            aRet = xNumberAgg->queryAggregation( rType );
+    }
 
     return aRet;
 }
@@ -341,7 +366,7 @@ uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeExcep
         const uno::Type* pParentPtr = aParentTypes.getConstArray();
 
         uno::Sequence<uno::Type> aAggTypes;
-        if ( xNumberAgg.is() )
+        if ( GetFormatter().is() )
         {
             const uno::Type& rProvType = ::getCppuType((uno::Reference<lang::XTypeProvider>*) 0);
             uno::Any aNumProv(xNumberAgg->queryAggregation(rProvType));
@@ -432,7 +457,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         {
             //	NumberFormatter-Pointer am Uno-Objekt neu setzen
 
-            if (xNumberAgg.is())
+            if (GetFormatter().is())
             {
                 SvNumberFormatsSupplierObj* pNumFmt =
                     SvNumberFormatsSupplierObj::getImplementation(
@@ -1807,7 +1832,7 @@ sal_Int64 SAL_CALL ScModelObj::getSomething(
     if ( nRet )
         return nRet;
 
-    if ( xNumberAgg.is() )
+    if ( GetFormatter().is() )
     {
         const uno::Type& rTunnelType = ::getCppuType((uno::Reference<lang::XUnoTunnel>*) 0);
         uno::Any aNumTunnel(xNumberAgg->queryAggregation(rTunnelType));
@@ -2667,7 +2692,8 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPro
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) )
     {
-        BOOL bVis = !(pDoc->GetColFlags( nStartCol, nTab ) & CR_HIDDEN);
+        SCCOL nLastCol;
+        bool bVis = !pDoc->ColHidden(nStartCol, nTab, nLastCol);
         ScUnoHelpFunctions::SetBoolInAny( aAny, bVis );
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_OWIDTH ) )
@@ -2677,13 +2703,13 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPro
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) )
     {
-        BOOL bBreak = ( 0 != (pDoc->GetColFlags( nStartCol, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) );
-        ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak );
+        ScBreakType nBreak = pDoc->HasColBreak(nStartCol, nTab);
+        ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak );
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_MANPAGE ) )
     {
-        BOOL bBreak = ( 0 != (pDoc->GetColFlags( nStartCol, nTab ) & (CR_MANUALBREAK)) );
-        ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak );
+        ScBreakType nBreak = pDoc->HasColBreak(nStartCol, nTab);
+        ScUnoHelpFunctions::SetBoolInAny( aAny, (nBreak & BREAK_MANUAL) );
     }
 
     return aAny;
@@ -2875,9 +2901,9 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
     {
         //!	undo etc.
         if (ScUnoHelpFunctions::GetBoolFromAny( aValue ))
-            pDoc->GetRowFlagsArrayModifiable( nTab).OrValue( nStartRow, nEndRow, CR_FILTERED);
+            pDoc->SetRowFiltered(nStartRow, nEndRow, nTab, true);
         else
-            pDoc->GetRowFlagsArrayModifiable( nTab).AndValue( nStartRow, nEndRow, sal::static_int_cast<BYTE>(~CR_FILTERED) );
+            pDoc->SetRowFiltered(nStartRow, nEndRow, nTab, false);
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE) || aNameString.EqualsAscii( SC_UNONAME_MANPAGE) )
     {
@@ -2925,12 +2951,13 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aProper
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) )
     {
-        BOOL bVis = !(pDoc->GetRowFlags( nStartRow, nTab ) & CR_HIDDEN);
+        SCROW nLastRow;
+        bool bVis = !pDoc->RowHidden(nStartRow, nTab, nLastRow);
         ScUnoHelpFunctions::SetBoolInAny( aAny, bVis );
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLFILT ) )
     {
-        BOOL bVis = ((pDoc->GetRowFlags( nStartRow, nTab ) & CR_FILTERED) != 0);
+        bool bVis = pDoc->RowFiltered(nStartRow, nTab);
         ScUnoHelpFunctions::SetBoolInAny( aAny, bVis );
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_OHEIGHT ) )
@@ -2940,13 +2967,13 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aProper
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) )
     {
-        BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nStartRow, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) );
-        ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak );
+        ScBreakType nBreak = pDoc->HasRowBreak(nStartRow, nTab);
+        ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak );
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_MANPAGE ) )
     {
-        BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nStartRow, nTab ) & (CR_MANUALBREAK)) );
-        ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak );
+        ScBreakType nBreak = pDoc->HasRowBreak(nStartRow, nTab);
+        ScUnoHelpFunctions::SetBoolInAny( aAny, (nBreak & BREAK_MANUAL) );
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLBACK ) || aNameString.EqualsAscii( SC_UNONAME_CELLTRAN ) )
     {
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 43adfba78..02d2f9da2 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -188,8 +188,8 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
     else if ( aFilterString == ScDocShell::GetWebQueryFilterName() || aFilterString == ScDocShell::GetHtmlFilterName() )
     {
         // HTML import.
-        ::std::auto_ptr<AbstractScLangChooserDlg> pDlg(
-            pFact->CreateScLangChooserDlg(NULL, RID_SCDLG_LANG_CHOOSER));
+        ::std::auto_ptr<AbstractScTextImportOptionsDlg> pDlg(
+            pFact->CreateScTextImportOptionsDlg(NULL, RID_SCDLG_TEXT_IMPORT_OPTIONS));
 
         if (pDlg->Execute() == RET_OK)
         {
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index e20936ee5..0042325c4 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -57,6 +57,7 @@
 #include "patattr.hxx"
 #include "docpool.hxx"
 #include "attrib.hxx"
+#include "clipparam.hxx"
 
 using namespace com::sun::star;
 
@@ -175,9 +176,8 @@ BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
     ScMarkData aSourceMark;
     aSourceMark.SelectOneTable( nSrcTab );		// for CopyToClip
     aSourceMark.SetMarkArea( rSrcRange );
-    pSrcDoc->CopyToClip( rSrcRange.aStart.Col(),rSrcRange.aStart.Row(),
-                         rSrcRange.aEnd.Col(),rSrcRange.aEnd.Row(),
-                         FALSE, pClipDoc, FALSE, &aSourceMark );
+    ScClipParam aClipParam(rSrcRange, false);
+    pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aSourceMark, false);
 
     if ( pClipDoc->HasAttrib( 0,0,nSrcTab, MAXCOL,MAXROW,nSrcTab,
                                 HASATTR_MERGED | HASATTR_OVERLAPPED ) )
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index 0f6a291ae..0c9122a00 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -39,6 +39,9 @@
 #include "unoguard.hxx"
 
 using namespace com::sun::star;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Any;
+using ::rtl::OUString;
 
 //------------------------------------------------------------------------
 
@@ -137,6 +140,26 @@ sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XProp
     return nRet;
 }
 
+// static
+OUString ScUnoHelpFunctions::GetStringProperty(
+    const Reference<beans::XPropertySet>& xProp, const OUString& rName, const OUString& rDefault )
+{
+    OUString aRet = rDefault;
+    if (!xProp.is())
+        return aRet;
+
+    try
+    {
+        Any any = xProp->getPropertyValue(rName);
+        any >>= aRet;
+    }
+    catch (const uno::Exception&)
+    {
+    }
+
+    return aRet;
+}
+
 //	static
 sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny )
 {
@@ -180,6 +203,20 @@ void ScUnoHelpFunctions::SetBoolInAny( uno::Any& rAny, sal_Bool bValue )
     rAny.setValue( &bValue, getBooleanCppuType() );
 }
 
+//  static
+void ScUnoHelpFunctions::SetOptionalPropertyValue( 
+    Reference<beans::XPropertySet>& rPropSet, const sal_Char* pPropName, const Any& rVal )
+{
+    try
+    {
+        rPropSet->setPropertyValue(OUString::createFromAscii(pPropName), rVal);
+    }
+    catch (const beans::UnknownPropertyException&)
+    {
+        // ignored - not supported.
+    }
+}
+
 //------------------------------------------------------------------------
 
 ScIndexEnumeration::ScIndexEnumeration(const uno::Reference<container::XIndexAccess>& rInd,
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 8b4012419..1595d8af3 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -897,6 +897,47 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno::
     return xRange;
 }
 
+// XUnoTunnel
+
+sal_Int64 SAL_CALL ScDrawTextCursor::getSomething(
+                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException)
+{
+    if ( rId.getLength() == 16 &&
+          0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+                                    rId.getConstArray(), 16 ) )
+    {
+        return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
+    }
+    return SvxUnoTextCursor::getSomething( rId );
+}
+
+// static
+const uno::Sequence<sal_Int8>& ScDrawTextCursor::getUnoTunnelId()
+{
+    static uno::Sequence<sal_Int8> * pSeq = 0;
+    if( !pSeq )
+    {
+        osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
+        if( !pSeq )
+        {
+            static uno::Sequence< sal_Int8 > aSeq( 16 );
+            rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
+            pSeq = &aSeq;
+        }
+    }
+    return *pSeq;
+}
+
+// static
+ScDrawTextCursor* ScDrawTextCursor::getImplementation( const uno::Reference<uno::XInterface> xObj )
+{
+    ScDrawTextCursor* pRet = NULL;
+    uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY );
+    if (xUT.is())
+        pRet = reinterpret_cast<ScDrawTextCursor*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething(getUnoTunnelId())));
+    return pRet;
+}
+
 //------------------------------------------------------------------------
 
 ScSimpleEditSourceHelper::ScSimpleEditSourceHelper()
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 1ce3b8cc7..8efc810ac 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -570,7 +570,7 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) :
 			addEnhancedMouseClickHandler( aMouseClickHandler );
             uno::Reference< view::XSelectionChangeListener > aSelectionChangeListener( *pEventListener, uno::UNO_QUERY );
             addSelectionChangeListener( aSelectionChangeListener );
-		}
+}
 	}
 }
 
diff --git a/sc/source/ui/vba/helperdecl.hxx b/sc/source/ui/vba/helperdecl.hxx
index c3c1007e5..386609107 100644
--- a/sc/source/ui/vba/helperdecl.hxx
+++ b/sc/source/ui/vba/helperdecl.hxx
@@ -42,7 +42,7 @@ struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<Impl
     vba_service_class_() : baseT() {}
     template <typename PostProcessFuncT>
     /** Ctor to pass a post processing function/functor.
-        
+
         @tpl PostProcessDefaultT let your compiler deduce this
         @param postProcessFunc function/functor that gets the yet unacquired
                                ImplT_ pointer returning a
diff --git a/sc/source/ui/vba/makefile.mk b/sc/source/ui/vba/makefile.mk
index c11196be3..34dfced20 100644
--- a/sc/source/ui/vba/makefile.mk
+++ b/sc/source/ui/vba/makefile.mk
@@ -45,7 +45,7 @@ DLLPRE =
 dummy:
         @echo "not building vba..."
 .ENDIF
- 
+
 INCPRE=$(INCCOM)$/$(TARGET)
 CDEFS+=-DVBA_OOBUILD_HACK
 # ------------------------------------------------------------------
diff --git a/sc/source/ui/vba/testvba/Logs/AutoFilter.log b/sc/source/ui/vba/testvba/Logs/AutoFilter.log
new file mode 100644
index 000000000..8108069b8
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/AutoFilter.log
@@ -0,0 +1,20 @@
+Test run started : 17/09/2009 12:17:01
+----------------------------------------------------------------
+TestAddress
+ TEST START : TestAddress
+  ITEM Assertion OK : test1 'starts with' string criteria
+  ITEM Assertion OK : test2 'not equal to' string criteria
+  ITEM Assertion OK : test3 'ends with' string criteria
+  ITEM Assertion OK : test4 field 'all' 
+  ITEM Assertion OK : test5 numeric '<15' 
+  ITEM Assertion OK : test6 numeric '>=15' 
+  ITEM Assertion OK : test7 numeric '<=12' 
+Test Results
+============
+
+Tests passed: 7
+Tests failed: 0
+
+END 'TestAddress
+ TEST OK : TestAddress
+Test run finished : 17/09/2009 12:17:01
diff --git a/sc/source/ui/vba/testvba/Logs/CalcFont.log b/sc/source/ui/vba/testvba/Logs/CalcFont.log
new file mode 100644
index 000000000..becd836b1
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/CalcFont.log
@@ -0,0 +1,17 @@
+Test run started : 17/09/2009 12:17:04
+CalcFont_Format
+ TEST START : Font_Format
+  ITEM Assertion OK : correctly set font to Bold
+  ITEM Assertion OK : correctly set font to Italic
+  ITEM Assertion OK : correctly read FontStyle
+  ITEM Assertion OK : correctly set font to Shadow
+  ITEM Assertion OK : correctly set font color
+  ITEM Assertion OK : correctly set font color index
+  ITEM Assertion OK : correctly set font name
+  ITEM Assertion OK : correctly set font outline
+  ITEM Assertion OK : correctly set font size
+  ITEM Assertion OK : correctly set font strikethrough
+  ITEM Assertion OK : correctly set font underline
+ TEST Success. : Font_Format
+CalcFont_Format
+Test run finished : 17/09/2009 12:17:05
diff --git a/sc/source/ui/vba/testvba/Logs/MiscOperatorTests.log b/sc/source/ui/vba/testvba/Logs/MiscOperatorTests.log
new file mode 100644
index 000000000..fdca43b55
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/MiscOperatorTests.log
@@ -0,0 +1,30 @@
+Test run started : 17/09/2009 12:17:10
+----------------------------------------------------------------
+TestAddress
+ TEST START : TestAddress
+  ITEM Assertion OK : test1: res = Not ( A > B )
+  ITEM Assertion OK : test2: res = Not ( B > A )
+  ITEM Assertion OK : test3: res = Not ( D )
+  ITEM Assertion OK : test4: res = Not A
+  ITEM Assertion OK : test5: res = ( A > D )
+  ITEM Assertion OK : test6: res = ( D > A )
+  ITEM Assertion OK : test7: res = ( A < D )
+  ITEM Assertion OK : test8: res = ( D < A )
+  ITEM Assertion OK : test9: res = ( A >= D )
+  ITEM Assertion OK : test10: res = ( D >= A )
+  ITEM Assertion OK : test11: res = ( A <= D )
+  ITEM Assertion OK : test12: res = ( D <= A )
+  ITEM Assertion OK : test13: res = ( D = A )
+  ITEM Assertion OK : test14: res = ( A = D )
+  ITEM Assertion OK : test15: res = ( D <> A )
+  ITEM Assertion OK : test16: res = ( A <> D )
+  ITEM Assertion OK : test17: ( A = D ) = True 
+Test Results
+============
+
+Tests passed: 17
+Tests failed: 0
+
+END 'TestAddress
+ TEST OK : TestAddress
+Test run finished : 17/09/2009 12:17:10
diff --git a/sc/source/ui/vba/testvba/Logs/MiscRangeTests.log b/sc/source/ui/vba/testvba/Logs/MiscRangeTests.log
new file mode 100644
index 000000000..d8ad3c03c
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/MiscRangeTests.log
@@ -0,0 +1,45 @@
+Test run started : 17/09/2009 12:17:12
+----------------------------------------------------------------
+MiscRangeTests
+ TEST START : MiscRangeTests
+  ITEM Assertion OK : test 1
+  ITEM Assertion OK : test 2
+  ITEM Assertion OK : test 3
+  ITEM Assertion OK : test 4
+  ITEM Assertion OK : test 5
+  ITEM Assertion OK : test 6
+  ITEM Assertion OK : test 7
+  ITEM Assertion OK : test 8
+  ITEM Assertion OK : test 9
+  ITEM Assertion OK : test 10
+  ITEM Assertion OK : test 11
+  ITEM Assertion OK : test 12
+  ITEM Assertion OK : test 13
+  ITEM Assertion OK : test 14
+  ITEM Assertion OK : test 15
+  ITEM Assertion OK : test 16
+  ITEM Assertion OK : test 17
+  ITEM Assertion OK : test 18
+  ITEM Assertion OK : test 19
+  ITEM Assertion OK : test 20
+  ITEM Assertion OK : test 21
+  ITEM Assertion OK : test 22
+  ITEM Assertion OK : test 23
+  ITEM Assertion OK : test 24
+  ITEM Assertion OK : test 25
+  ITEM Assertion OK : test 26
+  ITEM Assertion OK : test 27
+  ITEM Assertion OK : test 28
+  ITEM Assertion OK : test 29
+  ITEM Assertion OK : test 30
+  ITEM Assertion OK : test 31
+No. tests: 31
+Summary
+=======
+Run:       31
+Passed:    31
+Failed:    0
+
+END 'MiscRangeTests
+ TEST OK : MiscRangeTests
+Test run finished : 17/09/2009 12:17:14
diff --git a/sc/source/ui/vba/testvba/Logs/PageBreaks.log b/sc/source/ui/vba/testvba/Logs/PageBreaks.log
new file mode 100644
index 000000000..0b356f7c3
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/PageBreaks.log
@@ -0,0 +1,10 @@
+Test run started : 17/09/2009 12:17:15
+----------------------------------------------------------------
+ TEST START : PageBreaks-Issue
+  ITEM Assertion OK : HPageBreaks.Count is 2
+  ITEM Assertion OK : HPageBreak.Type is -4135
+  ITEM Assertion OK : HPageBreak.Location: Range.Row is 5
+  ITEM Assertion OK : HPageBreak.Delete: HPageBreaks.Count is 2
+END 'PageBreaks-Issue' Symbol
+ TEST OK : PageBreaks-Issue
+Test run finished : 17/09/2009 12:17:15
diff --git a/sc/source/ui/vba/testvba/Logs/Ranges-2.log b/sc/source/ui/vba/testvba/Logs/Ranges-2.log
new file mode 100644
index 000000000..11ce4d51b
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/Ranges-2.log
@@ -0,0 +1,68 @@
+Test run started : 17/09/2009 12:17:21
+----------------------------------------------------------------
+ClearFormtsIssue
+ TEST START : ClearFormtsIssue
+  ITEM Assertion OK : Range.Font.Bold is: True
+  ITEM Assertion OK : Range.Font.Bold is: False
+END 'ClearFormtsIssue' Symbol
+ TEST OK : ClearFormtsIssue
+----------------------------------------------------------------
+VerticalAlignment-Issue
+ TEST START : VerticalAlignment-Issue
+  ITEM Assertion OK : -  Range.VerticalAlignment (get)
+  ITEM Assertion OK : -  Range.VerticalAlignment (set)
+  ITEM Assertion OK : -  Range.VerticalAlignment (get)
+  ITEM Assertion OK : -  Range.VerticalAlignment (get)
+  ITEM Assertion OK : -  Range.VerticalAlignment (set)
+  ITEM Assertion OK : -  Range.VerticalAlignment (get)
+  ITEM Assertion OK : -  Range.VerticalAlignment (set)
+  ITEM Assertion OK : Range.VeritcalAlignment is Null
+END 'VerticalAlignment-Issue' Symbol
+ TEST OK : VerticalAlignment-Issue
+----------------------------------------------------------------
+HorizontalAlignment-Issue
+ TEST START : HorizontalAlignment-Issue
+  ITEM Assertion OK : -  Range.HorizontalAlignment (get)
+  ITEM Assertion OK : -  Range.HorizontalAlignment (set)
+  ITEM Assertion OK : -  Range.HorizontalAlignment (get)
+  ITEM Assertion OK : -  Range.HorizontalAlignment (set)
+  ITEM Assertion OK : -  Range.HorizontalAlignment (get)
+  ITEM Assertion OK : -  Range.HorizontalAlignment (set)
+  ITEM Assertion OK : -  Range.HorizontalAlignment (get)
+  ITEM Assertion OK : -  Range.HorizontalAlignment (set)
+  ITEM Assertion OK : Range.HorizontalAlignment is Null
+END 'HorizontalAlignment-Issue' Symbol
+ TEST OK : HorizontalAlignment-Issue
+----------------------------------------------------------------
+WrapText-Issue
+ TEST START : WrapText-Issue
+  ITEM Assertion OK : -  Range.WrapText (get)
+  ITEM Assertion OK : -  Range.WrapText (get)
+  ITEM Assertion OK : Range.WrapText is Null
+END 'WrapText-Issue' Symbol
+ TEST OK : WrapText-Issue
+----------------------------------------------------------------
+FontBorderIssues
+ TEST START : FontBorderIssues
+  ITEM Assertion OK : -  = Borders.Color (getColor)
+  ITEM Assertion OK : -  = Font.Color (getColor)
+END 'FontBorderIssues' Symbol
+ TEST OK : FontBorderIssues
+----------------------------------------------------------------
+RangeSizeIssues
+ TEST START : RangeSizeIssues
+  ITEM Assertion OK : Range.Left is: 120.06225
+  ITEM Assertion OK : Range.Top is: 93.29985
+  ITEM Assertion OK : Range.Width is: 228.3
+  ITEM Assertion OK : Range.Height is: 271.5
+END 'RangeSizeIssues' Symbol
+ TEST OK : RangeSizeIssues
+----------------------------------------------------------------
+ApplicationIssues
+ TEST START : ApplicationIssues
+  ITEM Assertion OK : Range.Address is: $E$8:$G$13,$G$13:$K$19
+  ITEM Assertion OK : Range.Address is: $E$8:$G$13,$G$13:$K$19
+  ITEM Assertion OK : Application.ActiveSheet.Name: Sheet1
+END 'ApplicationIssues' Symbol
+ TEST OK : ApplicationIssues
+Test run finished : 17/09/2009 12:17:22
diff --git a/sc/source/ui/vba/testvba/Logs/Ranges-3.log b/sc/source/ui/vba/testvba/Logs/Ranges-3.log
new file mode 100644
index 000000000..769bda75f
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/Ranges-3.log
@@ -0,0 +1,8 @@
+Test run started : 17/09/2009 12:17:24
+----------------------------------------------------------------
+MyGoalseek-Issue
+ TEST START : MyGoalseek-Issue
+  ITEM Assertion OK : Variable Range value: 15
+END 'MyGoalseek-Issue' Symbol
+ TEST OK : MyGoalseek-Issue
+Test run finished : 17/09/2009 12:17:24
diff --git a/sc/source/ui/vba/testvba/Logs/Ranges.log b/sc/source/ui/vba/testvba/Logs/Ranges.log
new file mode 100644
index 000000000..39c6eb26c
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/Ranges.log
@@ -0,0 +1,280 @@
+Test run started : 17/09/2009 12:17:26
+----------------------------------------------------------------
+ApplicationMethods
+ TEST START : ApplicationMethods
+  ITEM Assertion OK :  Name of Workbook is: Ranges.xls
+  ITEM Assertion OK :  Address of Application.Columns is: $A:$A
+  ITEM Assertion OK :  Address of Application.Rows is: $1:$1
+  ITEM Assertion OK :  Address of Application.Range is: $1:$1,$5:$7
+  ITEM Assertion OK :  Please check manually: DefaultFilePath is: /data4/home/npower/Documents
+  ITEM Assertion OK :  Please check manually: Library Path is: /media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/UserInstallation/user/basic
+  ITEM Assertion OK :  Please check manually: Template Path is: /media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/UserInstallation/user/template
+  ITEM Assertion OK :  FileSeparator is /
+  ITEM Assertion OK :  Name of ActiveWorkbook is: Ranges.xls
+END 'ApplicationMethods' Symbol
+ TEST OK : ApplicationMethods
+----------------------------------------------------------------
+Insert-Issue
+ TEST START : Insert-Issue
+  ITEM Assertion OK : Insert with xlShiftToRight: 10
+END 'Insert-Issue' Symbol
+ TEST OK : Insert-Issue
+----------------------------------------------------------------
+MergeCells-Issue
+ TEST START : MergeCells-Issue
+  ITEM Assertion OK :  Range.MergeCells is True
+  ITEM Assertion FAIL : MergeCells is null: False
+  ITEM Assertion OK : RowCount after Merge: 13
+  ITEM Assertion OK :  Range.MergeCells is False
+  ITEM Assertion OK : MergeCells is null: False
+  ITEM Assertion FAIL : MergeCells of Second Area is null : False
+  ITEM Assertion FAIL : MergeCells of Ranges is Null: False
+  ITEM Assertion OK : RowCount after Merge: 7
+  ITEM Assertion OK :  Range.MergeCells is False
+  ITEM Assertion OK : MergeCells is null: False
+  ITEM Assertion OK : RowCount after Merge: 7
+END 'MergeCells-Issue' Symbol
+ TEST OK : MergeCells-Issue
+----------------------------------------------------------------
+Areas-Issue
+ TEST START : Areas-Issue
+  ITEM Assertion OK : Range Areas Count is2
+  ITEM Assertion OK : First Range Address is: $E$8:$G$13
+  ITEM Assertion OK : First Row is: 8
+  ITEM Assertion OK : First Column is: 5
+  ITEM Assertion OK : EntireRow Address is: $8:$13,$13:$19
+  ITEM Assertion OK : EntireColumn Address is: $E:$G,$G:$K
+  ITEM Assertion OK : Range Count:53
+END 'Areas-Issue' Symbol
+ TEST OK : Areas-Issue
+----------------------------------------------------------------
+Fill-Methods-Issue
+ TEST START : Fill-Methods-Issue
+  ITEM Assertion OK :  Range Value after FillDown: MyFillValue
+  ITEM Assertion OK :  Range Value after FillDown: MyFillValue
+  ITEM Assertion OK :  Range Value after FillDown: MyRightFillValue
+  ITEM Assertion OK :  Range Value after FillDown: MyBottomFillValue
+END 'Fill-Methods-Issue' Symbol
+ TEST OK : Fill-Methods-Issue
+----------------------------------------------------------------
+Range/Item-Method-Issue
+ TEST START : Range/Item-Method-Issue
+  ITEM Assertion OK :  Range of multiple columns is: $A:$A,$C:$C
+  ITEM Assertion OK :  Range of multiple rows is: $1:$1,$5:$7
+  ITEM Assertion OK :  Range of several columns is: $C:$E,$D:$D
+  ITEM Assertion OK :  Range of several rows is: $5:$8,$6:$10
+  ITEM Assertion OK :  Range of several single cells is: $C$5,$E$8
+  ITEM Assertion OK :  Range of several named ranges is: $L$1:$M$6,$E$8:$G$13,$G$13:$K$19
+  ITEM Assertion OK :  Range of a single Item Cell is: $E$21
+  ITEM Assertion OK :  Range of a single Item Cell is: $F$21
+  ITEM Assertion OK :  Range of a single Item Cell is: $F$10
+END 'Range/Item-Method-Issue' Symbol
+ TEST OK : Range/Item-Method-Issue
+----------------------------------------------------------------
+R1C1-Formulas-Issue
+ TEST START : R1C1-Formulas-Issue
+  ITEM Assertion OK :  R1C1 Range.Formula is: =IF(OR(R[-2]C[1]=0,RC[2]="YES"),"")
+  ITEM Assertion OK :  Range.Formula is: =IF(OR(J8=0,K10="YES"),"")
+END 'R1C1-Formulas-Issue' Symbol
+ TEST OK : R1C1-Formulas-Issue
+----------------------------------------------------------------
+Verify_Delete
+ TEST START : Verify_Delete
+  ITEM Assertion OK : Ranges are intersecting: $G$13
+  ITEM Assertion OK : Delete with Default: $AJ$4
+  ITEM Assertion OK : Delete with ShifttoLeft: $AJ$4
+  ITEM Assertion OK : Delete with ShiftUp: $M$22
+END 'Verify_Delete' Symbol
+ TEST OK : Verify_Delete
+----------------------------------------------------------------
+Value-Issue
+ TEST START : Value-Issue
+  ITEM Assertion OK : Value of Range is: 12.3
+  ITEM Assertion OK : Text of Range is: 12.3
+  ITEM Assertion OK : Range has Formula: False
+  ITEM Assertion OK : Cell has Formula: False
+  ITEM Assertion FAIL : Text of Range is null: False
+  ITEM Assertion OK : Range has Formula: True
+  ITEM Assertion OK : Cell has Formula: True
+  ITEM Assertion OK : Value of Cell is: 12
+  ITEM Assertion OK : Application.Calculation is : -4135
+  ITEM Assertion OK : Calculation is automated: True
+  ITEM Assertion OK : Range has Formula: True
+  ITEM Assertion OK : Value of Cell is: 16
+  ITEM Assertion OK : Text of Cell is: 16
+  ITEM Assertion OK : Text of Cell is: 16
+  ITEM Assertion OK : Range has Formula after 'ClearContents: False
+  ITEM Assertion OK : Text of Cell is: 
+  ITEM Assertion OK : Text of Cell is: 
+END 'Value-Issue' Symbol
+ TEST OK : Value-Issue
+----------------------------------------------------------------
+AutoFit issue
+ TEST START : AutoFit issue
+  ITEM Assertion OK :  Columns.AutoFit: CurrentWidth is 679
+  ITEM Assertion OK :  Rows.AutoFit: CurrentHeight is 546
+END 'AutoFit issue' Symbol
+ TEST OK : AutoFit issue
+----------------------------------------------------------------
+Selections
+ TEST START : Selections
+  ITEM Assertion OK : ActiveCell is : $E$8
+  ITEM Assertion OK : Active Cell is : $E$8
+  ITEM Assertion OK : Number of Cells in Range: 52
+  ITEM Assertion OK : Number of Cells in Range: 52
+  ITEM Assertion OK : Number of Cells in Range: 52
+END 'Selections' Symbol
+ TEST OK : Selections
+----------------------------------------------------------------
+Offset-Resize
+ TEST START : Offset-Resize
+  ITEM Assertion OK : Offset is : $G$10:$I$15,$I$15:$M$21
+  ITEM Assertion OK : Offset is : $G$7:$I$12,$I$12:$M$18
+  ITEM Assertion OK :   Resized Range is : $A$20:$D$23
+END 'Offset-Resize' Symbol
+ TEST OK : Offset-Resize
+----------------------------------------------------------------
+Ranges-Address
+ TEST START : Ranges-Address
+  ITEM Assertion OK : Range Address is: $E$8:$G$13,$G$13:$K$19
+  ITEM Assertion OK : Range Address is: $E8:$G13,$G13:$K19
+  ITEM Assertion OK : Range Address is: E$8:G$13,G$13:K$19
+  ITEM Assertion OK : Range Address is: R8C5:R13C7,R13C7:R19C11
+  ITEM Assertion FAIL : Range Address is: R8C5:R13C7,R13C7:R19C11
+  ITEM Assertion OK : Range Address is: R8C5:R13C7,R13C7:R19C11
+  ITEM Assertion OK : Range Address is: R[6]C[3]:R[11]C[5],R[11]C[5]:R[17]C[9]
+  ITEM Assertion OK : RangeAddress is [Ranges.xls]Sheet1!$E$8:$G$13,$G$13:$K$19
+END 'Ranges-Address' Symbol
+ TEST OK : Ranges-Address
+----------------------------------------------------------------
+Range-Address
+ TEST START : Range-Address
+  ITEM Assertion OK : Range Address is: $E$8:$G$13
+  ITEM Assertion OK : Range Address is: $E8:$G13
+  ITEM Assertion OK : Range Address is: E$8:G$13
+  ITEM Assertion OK : Range Address is: R8C5:R13C7
+  ITEM Assertion FAIL : Range Address is: R8C5:R13C7
+  ITEM Assertion OK : Range Address is: R8C5:R13C7
+  ITEM Assertion OK : Range Address is: R[6]C[3]:R[11]C[5]
+  ITEM Assertion OK : RangeAddress is [Ranges.xls]Sheet1!$E$8:$G$13
+END 'Range-Address' Symbol
+ TEST OK : Range-Address
+----------------------------------------------------------------
+Column-Address
+ TEST START : Column-Address
+  ITEM Assertion OK : Range Address is: $F$8:$F$13
+  ITEM Assertion OK : Range Address is: $F8:$F13
+  ITEM Assertion OK : Range Address is: F$8:F$13
+  ITEM Assertion OK : Range Address is: R8C6:R13C6
+  ITEM Assertion FAIL : Range Address is: R8C6:R13C6
+  ITEM Assertion OK : Range Address is: R8C6:R13C6
+  ITEM Assertion OK : Range Address is: R[6]C[4]:R[11]C[4]
+  ITEM Assertion OK : RangeAddress is [Ranges.xls]Sheet1!$F$8:$F$13
+END 'Column-Address' Symbol
+ TEST OK : Column-Address
+----------------------------------------------------------------
+Row-Address
+ TEST START : Row-Address
+  ITEM Assertion OK : Range Address is: $E$9:$G$9
+  ITEM Assertion OK : Range Address is: $E9:$G9
+  ITEM Assertion OK : Range Address is: E$9:G$9
+  ITEM Assertion OK : Range Address is: R9C5:R9C7
+  ITEM Assertion FAIL : Range Address is: R9C5:R9C7
+  ITEM Assertion OK : Range Address is: R9C5:R9C7
+  ITEM Assertion OK : Range Address is: R[7]C[3]:R[7]C[5]
+  ITEM Assertion OK : RangeAddress is [Ranges.xls]Sheet1!$E$9:$G$9
+END 'Row-Address' Symbol
+ TEST OK : Row-Address
+----------------------------------------------------------------
+SingleCell-Address
+ TEST START : SingleCell-Address
+  ITEM Assertion OK : Range Address is: $F$9
+  ITEM Assertion OK : Range Address is: $F9
+  ITEM Assertion OK : Range Address is: F$9
+  ITEM Assertion OK : Range Address is: R9C6
+  ITEM Assertion FAIL : Range Address is: R9C6
+  ITEM Assertion OK : Range Address is: R9C6
+  ITEM Assertion OK : Range Address is: R[7]C[4]
+  ITEM Assertion OK : RangeAddress is [Ranges.xls]Sheet1!$F$9
+END 'SingleCell-Address' Symbol
+ TEST OK : SingleCell-Address
+----------------------------------------------------------------
+Heights and Widths
+ TEST START : Heights and Widths
+  ITEM Assertion OK : Range RowHeight is 40
+  ITEM Assertion OK : Range ColumnWidth is 50
+  ITEM Assertion OK : Range Height is 240
+  ITEM Assertion OK : Range Width is 787.5
+  ITEM Assertion OK : Range RowHeight is 50
+  ITEM Assertion OK : Range ColumnWidth is 50
+  ITEM Assertion OK : Range Height is 300
+  ITEM Assertion OK : Range Width is 787.5
+  ITEM Assertion OK : RowHeight is null: True
+  ITEM Assertion OK : ColumnWidth is null: True
+END 'Heights and Widths' Symbol
+ TEST OK : Heights and Widths
+----------------------------------------------------------------
+RangeRowColumn-Issue
+ TEST START : RangeRowColumn-Issue
+  ITEM Assertion OK : Row is: 8
+  ITEM Assertion OK : Column is: 5
+  ITEM Assertion OK : EntireRow.Columns.Count = 1024
+  ITEM Assertion OK : EntireColumn.Rows.Count = 131072
+END 'RangeRowColumn-Issue' Symbol
+ TEST OK : RangeRowColumn-Issue
+----------------------------------------------------------------
+Replace-Issue
+ TEST START : Replace-Issue
+  ITEM Assertion OK : Value after Replace: YourValue
+  ITEM Assertion OK : Value after Replace: YourValue
+  ITEM Assertion OK : Value after Replace: ReplaceValue
+  ITEM Assertion OK : Value after Replace: New ReplaceValue
+  ITEM Assertion OK : Value after Replace: New ReplaceValue
+  ITEM Assertion OK : Value after Replace: New Replace
+  ITEM Assertion OK : Value after Replace: 
+END 'Replace-Issue' Symbol
+ TEST OK : Replace-Issue
+----------------------------------------------------------------
+Hidden-Issue
+ TEST START : Hidden-Issue
+  ITEM Assertion OK : -  Range.Rows.Hidden (set)
+  ITEM Assertion OK : -  Range.Rows.Hidden (get)
+  ITEM Assertion OK : -  Range.Rows.Item(1).Hidden (set)
+  ITEM Assertion OK : -  Range.Rows.Item(1).Hidden (get)
+  ITEM Assertion OK : -  Range.Columns.Hidden (set)
+  ITEM Assertion OK : -  Range.Columns.Hidden (get)
+  ITEM Assertion OK : -  Range.Columns.Item(1).Hidden (set)
+  ITEM Assertion OK : -  Range.Columns.Item(1).Hidden (get)
+END 'Hidden-Issue' Symbol
+ TEST OK : Hidden-Issue
+----------------------------------------------------------------
+End issue
+ TEST START : End issue
+  ITEM Assertion OK : -  = $E$48
+  ITEM Assertion OK : -  = $E$1
+  ITEM Assertion OK : -  = $E$3
+  ITEM Assertion OK : -  = $A$8
+  ITEM Assertion OK : -  = $B$8
+  ITEM Assertion OK : -  = $AMJ$8
+  ITEM Assertion OK : -  = $Z$8
+END 'End issue' Symbol
+ TEST OK : End issue
+----------------------------------------------------------------
+Outline issue
+ TEST START : Outline issue
+  ITEM Assertion OK : -  Range.clearOutline - please check visually
+  ITEM Assertion OK : -  Range.AutoOutline - please check visually
+  ITEM Assertion OK : -  Range.AutoOutline - please check visually
+END 'Outline issue' Symbol
+ TEST OK : Outline issue
+----------------------------------------------------------------
+Validation
+ TEST START : Validation
+  ITEM Assertion OK : Validation Input Message is : Attention!
+  ITEM Assertion OK : Validation Input Message is : Enter an integer from five to ten
+  ITEM Assertion OK : Validation Error Title is : You must enter a number from five to ten
+  ITEM Assertion OK : Validation Error Message is : An Error occured
+  ITEM Assertion OK : Validation Error Title is : Microsoft Excel
+END 'Validation' Symbol
+ TEST OK : Validation
+Test run finished : 17/09/2009 12:17:34
diff --git a/sc/source/ui/vba/testvba/Logs/Shapes.log b/sc/source/ui/vba/testvba/Logs/Shapes.log
new file mode 100644
index 000000000..1af1235f7
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/Shapes.log
@@ -0,0 +1,77 @@
+Test run started : 17/09/2009 12:17:37
+BEGIN Shapes_Collection_Behaviour
+ TEST START : Shapes_Collection_Behaviour
+  ITEM Assertion OK : Name of indexed shape should be 'Sheet2Shape1' 
+  ITEM Assertion OK : Name of indexed shape should be 'Sheet2Shape2' 
+ TEST Success. : Shapes_Collection_Behaviour
+END Shapes_Collection_Behaviour
+BEGIN Shapes_Select_Item
+ TEST START : Shapes_Select_Item
+  ITEM Assertion OK : Correctly selected shape through Range
+  ITEM Assertion OK : Correctly selected shape through Item
+  ITEM Assertion OK : Needs to be visually checked. Is there a line on the document?
+  ITEM Assertion OK : Needs to be visually checked. Are All Shapes Selected?
+ TEST Success. : Shapes_Select_Item
+END Shapes_Select_Item
+BEGIN Shapes_Fill
+ TEST START : Shapes_Fill
+  ITEM Assertion OK : correctly set visibility of shape fill
+  ITEM Assertion OK : correctly set transparency of shape line
+  ITEM Assertion OK : correctly set forecolor of shape fill
+  ITEM Assertion FAIL : correctly set backcolor of shape fill
+  ITEM Assertion OK : the success of the TwoColorGradient method needs to be verified visually!
+  ITEM Assertion OK : correctly set forecolor of shape fill
+  ITEM Assertion FAIL : correctly set forecolor of shape fill
+ TEST Success. : Shapes_Fill
+END  Shapes_Fill
+BEGIN Shapes_Line
+ TEST START : Shapes_Line
+  ITEM Assertion FAIL : correctly set weight of shape line
+  ITEM Assertion OK : correctly set visibility of shape line
+  ITEM Assertion OK : correctly set transparency of shape line
+  ITEM Assertion OK : correctly set dash style of shape line
+  ITEM Assertion OK : correctly set dash style of shape line
+  ITEM Assertion OK : correctly set forecolor of shape line
+  ITEM Assertion FAIL : correctly set backcolor of shape line
+ TEST Success. : Shapes_Line
+END  Shapes_Line
+BEGIN Shapes_TextFrame
+ TEST START : Shapes_TextFrame
+  ITEM Assertion OK : correctly set Autosize of Shape TextFrame
+ TEST Success. : Shapes_TextFrame
+END  Shapes_TextFrame
+BEGIN Shapes_SimpleGeometry
+ TEST START : Shapes_SimpleGeometery
+  ITEM Assertion OK : shape height should be 46.7023593888278 and got 46.6866112323395
+  ITEM Assertion OK : shape width should be 101.496056724658 and got 101.48030856817
+  ITEM Assertion OK : shape left should be 68.5574761223637 and got 68.5417279658754
+  ITEM Assertion OK : shape top should be 41.6850368702339 and got 41.6692887137456
+  ITEM Assertion OK : shape rotation should be 0 and got 0
+  ITEM Assertion OK : shape rotation should be 25 and got 25
+  ITEM Assertion OK : shape incrementrotation should be 50 and got 50
+  ITEM Assertion OK : shape incrementleft should be 70.7968460600412 and got 70.7810979035529
+  ITEM Assertion OK : shape incrementtop should be 90.8944825893239 and got 90.8787344328356
+ TEST Success. : Shapes_SimpleGeometery
+END Shapes_SimpleGeometry
+BEGIN Shapes_Range
+ TEST START : Shapes_Range
+  ITEM Assertion OK : expected Sheets(2).Shapes.Range(1) to contain 1 element, it contains 1
+  ITEM Assertion OK : expected Sheets(2).Shapes.Range(1) to return Sheet2Shape1 got Sheet2Shape1
+  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Sheet2Shape3) to contain 1 element, it contains 1
+  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Sheet2Shape3) to return Sheet2Shape3 got Sheet2Shape3
+  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Array(3, 1) to contain 2 elements, it contains 2
+  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Array(3, 1) to return concated element/shape names Sheet2Shape3Sheet2Shape1 and got Sheet2Shape3Sheet2Shape1
+  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Array('Sheet2Shape3', 1, 'Sheet2Shape2')) to contain 3 elements, it contains 3
+  ITEM Assertion OK : expected Sheets(2).Shapes.Range(Array('Sheet2Shape3', 1, 'Sheet2Shape2')) to return concated element/shape names Sheet2Shape3Sheet2Shape1Sheet2Shape2 and got Sheet2Shape3Sheet2Shape1Sheet2Shape2
+ TEST Success. : Shapes_Range
+END Shapes_Range
+BEGIN Shapes_ShapeRange
+ TEST START : Shapes_ShapeRange
+  ITEM Assertion OK : ShapeRange.IncrementLeft shp1.left should be 90.7810979035529 and got 90.7653486132064
+  ITEM Assertion OK : ShapeRange.IncrementLeft shp2.left should be 240.02518299054 and got 240.009433700193
+  ITEM Assertion OK : ShapeRange.IncrementTop shp1.Top should be 110.878734432836 and got 110.862985142489
+  ITEM Assertion OK : ShapeRange.IncrementTop shp2.Top should be 64.6740129339204 and got 64.6582636435739
+  ITEM Assertion OK : ShapeRange.IncrementRotation shp1.Rotation should be 70 and got 70
+  ITEM Assertion OK : ShapeRange.IncrementRotation shp2.Rotation should be 20 and got 20
+END Shapes_ShapeRange
+Test run finished : 17/09/2009 12:17:37
diff --git a/sc/source/ui/vba/testvba/Logs/StrConv-test.log b/sc/source/ui/vba/testvba/Logs/StrConv-test.log
new file mode 100644
index 000000000..9ac0360e9
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/StrConv-test.log
@@ -0,0 +1,9 @@
+Test run started : 17/09/2009 12:17:39
+BEGIN StrConv
+ TEST START : Test StrConv function
+  ITEM Assertion OK : Converts the string to uppercase characters:ABC EFG HIJ
+  ITEM Assertion OK : Converts the string to lowercase characters:abc efg hij
+  ITEM Assertion OK : Converts the first letter of every word in string to uppercase:Abc Efg Hij
+ TEST OK : Test StrConv function
+END  StrConv
+Test run finished : 17/09/2009 12:17:39
diff --git a/sc/source/ui/vba/testvba/Logs/Template.log b/sc/source/ui/vba/testvba/Logs/Template.log
new file mode 100644
index 000000000..25f987758
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/Template.log
@@ -0,0 +1,14 @@
+Test run started : 17/09/2009 12:17:42
+----------------------------------------------------------------
+TestCaseName
+ TEST START : TestCaseName
+  ITEM Assertion OK : Something has been done.
+Test Results
+============
+
+Tests passed: 1
+Tests failed: 0
+
+END 'TestCaseName
+ TEST OK : TestCaseName
+Test run finished : 17/09/2009 12:17:42
diff --git a/sc/source/ui/vba/testvba/Logs/TestAddress.log b/sc/source/ui/vba/testvba/Logs/TestAddress.log
new file mode 100644
index 000000000..7d812ee3d
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/TestAddress.log
@@ -0,0 +1,67 @@
+Test run started : 17/09/2009 12:17:43
+----------------------------------------------------------------
+TestAddress
+ TEST START : TestAddress
+  ITEM Assertion OK : test1 Range('e3:f3') A1 style addressing
+  ITEM Assertion OK : test2 Range('e3:f3') R1C1 style addressing
+  ITEM Assertion OK : test3 Range ('e:f')  A1 style addressing
+  ITEM Assertion OK : test4 Range ('e:f')  R1C1 style addressing
+  ITEM Assertion OK : test5 Columns A1 style addressing
+  ITEM Assertion OK : test6 Columns R1C1 style addressing
+  ITEM Assertion OK : test7 Columns(3) A1 style addressing
+  ITEM Assertion OK : test8 Columns(3) R1C1 style addressing
+  ITEM Assertion OK : test9 Columns('e') A1 style addressing
+  ITEM Assertion OK : test10 Columns('e') R1C1 style addressing
+  ITEM Assertion OK : test11 Columns('b:d') A1 style addressing
+  ITEM Assertion OK : test12 Columns('b:d') R1C1 style addressing
+  ITEM Assertion OK : test13 Range('c1:g10').Columns A1 style addressing
+  ITEM Assertion OK : test14 Range('c1:g10').Columns R1C1 style addressing
+  ITEM Assertion OK : test15 Range('c1:g10').Columns(1) A1 style addressing
+  ITEM Assertion OK : test16 Range('c1:g10').Columns(1) R1C1 style addressing
+  ITEM Assertion OK : test17 Range('c1:g10').Columns('a') A1 style addressing
+  ITEM Assertion OK : test18 Range('c1:g10').Columns('a') R1C1 style addressing
+  ITEM Assertion OK : test19 Range('c1:g10').Columns('c') A1 style addressing
+  ITEM Assertion OK : test20 Range('c1:g10').Columns('c') R1C1 style addressing
+  ITEM Assertion OK : test21 Range('c1:g10').Columns('x:z') A1 style addressing
+  ITEM Assertion OK : test22 Range('c1:g10').Columns('x:z') R1C1 style addressing
+  ITEM Assertion OK : test23 Range('c1:g10').Columns(30) A1 style addressing
+  ITEM Assertion OK : test24 Range('c1:g10').Columns(30) R1C1 style addressing
+  ITEM Assertion OK : test25 Worksheets('Sheet2').Cells(1, 1) A1 style addressing
+  ITEM Assertion OK : test26 Worksheets('Sheet2').Cells(1, 1) A1 style addressing, RowAddressAbsolute is false 
+  ITEM Assertion OK : test27 Worksheets('Sheet2').Cells(1, 1) A1 style addressing, ColAddressAbsolute is false 
+  ITEM Assertion OK : test28 Worksheets('Sheet2').Cells(1, 1) R1C1 style addressing
+  ITEM Assertion OK : test29 Worksheets('Sheet2').Range('A1:E5').EntireColumn A1 style addressing
+  ITEM Assertion OK : test30 Worksheets('Sheet2').Range('A1').EntireColumn A1 style addressing
+  ITEM Assertion OK : test31 Worksheets('Sheet2').Range('A1:E5').EntireRow A1 style addressing
+  ITEM Assertion OK : test32 Worksheets('Sheet2').Range('A1') A1 style addressing
+  ITEM Assertion OK : test33 Worksheets('Sheet2').Range('IV65536').EntireRow A1 style addressing
+  ITEM Assertion OK : test34 Worksheets('Sheet2').Range('IU2:IV65536') A1 style addressing
+  ITEM Assertion OK : test35 Range('c1:g10').Columns('x:z') R1C1 style addressing
+  ITEM Assertion OK : test36 Worksheets('Sheet2').Range('A1') A1 style addressing
+  ITEM Assertion OK : test37 Worksheets('Sheet2').Range('A1:E5').EntireColumn A1 style addressing
+  ITEM Assertion OK : test38 Worksheets('Sheet2').Range('10:12') A1 style addressing
+  ITEM Assertion OK : test39 Worksheets('Sheet2').Range('10:12') R1C1 style addressing
+  ITEM Assertion OK : test40 Range('Sheet3!A1:B4') A1 style addressing
+  ITEM Assertion OK : test41 Range('Sheet3!A1,B1,D4:F20') A1 style addressing
+  ITEM Assertion OK : test42 Range('g20:h40').Columns('c:c')
+  ITEM Assertion OK : test43 Range('g20:h40').Columns('c:f')
+  ITEM Assertion OK : test44 Range('g20:h40').Columns(-1)
+  ITEM Assertion OK : test45 Range('c4:g10').Rows(-1)
+  ITEM Assertion OK : test46 Range('a2:b4').Rows('1:1')
+  ITEM Assertion OK : test47 Range('a2:b4').Rows('1:2')
+  ITEM Assertion OK : test48 Range('a2:b4').Rows('2:2')
+  ITEM Assertion OK : test49 Range('a2:b4').Rows('2:3')
+  ITEM Assertion OK : test50 Range(' A2:B4 ')
+  ITEM Assertion OK : test51 Range('A 2:B 4')
+  ITEM Assertion OK : test52 Range('A2 : B4 ')
+  ITEM Assertion OK : test53 Range('Sheet1 !A2 : B4 ')
+  ITEM Assertion OK : test54 Range('Sheet1! A2 : B4 ')
+Test Results
+============
+
+Tests passed: 54
+Tests failed: 0
+
+END 'TestAddress
+ TEST OK : TestAddress
+Test run finished : 17/09/2009 12:17:43
diff --git a/sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest.log b/sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest.log
new file mode 100644
index 000000000..6390a10fb
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest.log
@@ -0,0 +1,60 @@
+Test run started : 17/09/2009 12:17:52
+BEGIN TestCalc
+ TEST START : RangeTest2
+  ITEM Assertion OK : -  Range("D15").Row 
+  ITEM Assertion OK : -  WorkSheet("D15").Range.Row 
+  ITEM Assertion OK : -  Range("D15").Column 
+  ITEM Assertion OK : -  Worksheet.Range("D15").Column 
+  ITEM Assertion OK : -  Range("D1").EntireRow.Valuer 
+  ITEM Assertion OK : -  Range("D1").EntireRow.Valuer 
+  ITEM Assertion OK : -  Range("D1").EntireRow.Columns.Count 
+  ITEM Assertion OK : -  Range("D1").EntireColumn.Rows.Count 
+  ITEM Assertion OK : -  Range("D15").ClearContent
+  ITEM Assertion OK : -  Range("M1:N2").Rows.Hidden (set)
+  ITEM Assertion OK : -  Range("M1:N2").Rows.Hidden (get)
+  ITEM Assertion OK : -  Range("M1:N2").Rows(1).Hidden (set)
+  ITEM Assertion OK : -  Range("M1:N2").Rows(1).Hidden (get)
+  ITEM Assertion OK : -  Range("M1:N2").Columns.Hidden (set)
+  ITEM Assertion OK : -  Range("M1:N2").Columns.Hidden (get)
+  ITEM Assertion OK : -  Range("M1:N2").Columns(1).Hidden (set)
+  ITEM Assertion OK : -  Range("M1:N2").Columns(1).Hidden (get)
+  ITEM Assertion OK : -  Range("B38").Orientation (get)
+  ITEM Assertion OK : -  Range("B38").Orientation (set)
+  ITEM Assertion OK : -  Range("B38").Orientation (set = xlDownward)
+  ITEM Assertion OK : -  Range("B38").Orientation (set)
+  ITEM Assertion OK : -  Range("B38").Orientation (set = xlUpward)
+  ITEM Assertion OK : -  Range("B38").Orientation (set)
+  ITEM Assertion OK : -  Range("B38").Orientation (set = xlVertical)
+  ITEM Assertion OK : -  Range("B38").Orientation (set)
+  ITEM Assertion OK : -  Range("B38").Orientation (set = xlVertical)
+  ITEM Assertion OK : -  Range("B39").WrapText (get)
+  ITEM Assertion OK : -  Range("B39").WrapText (set)
+  ITEM Assertion OK : -  Range("B39").WrapText (set)
+  ITEM Assertion OK : -  Range("E39").MergeCells (get)
+  ITEM Assertion OK : -  Range("F39").MergeCells (get)
+  ITEM Assertion OK : -  Range("E39").MergeCells (set)
+  ITEM Assertion FAIL : -  Range("F39").MergeCells (set)
+  ITEM Assertion OK : -  Range("E39").MergeCells (set)
+  ITEM Assertion OK : -  Range("F39").MergeCells (set)
+  ITEM Assertion OK : -  Range("C41:C42").Replace  MatchCase:=True 
+  ITEM Assertion OK : -  Range("C41:C42").Replace  MatchCase:=True 
+  ITEM Assertion OK : -  Range("D41:D42").Replace  MatchCase:=False 
+  ITEM Assertion OK : -  Range("B39").VerticalAlignment (get)
+  ITEM Assertion OK : -  Range("B39").VerticalAlignment (set)
+  ITEM Assertion OK : -  Range("B39").VerticalAlignment (get)
+  ITEM Assertion OK : -  Range("B39").VerticalAlignment (get)
+  ITEM Assertion OK : -  Range("B39").VerticalAlignment (set)
+  ITEM Assertion OK : -  Range("B39").VerticalAlignment (get)
+  ITEM Assertion OK : -  Range("B39").VerticalAlignment (set)
+  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (get)
+  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (set)
+  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (get)
+  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (set)
+  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (get)
+  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (set)
+  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (get)
+  ITEM Assertion OK : -  Range("B39").HorizontalAlignment (set)
+  ITEM FAIL (RangeTest2)
+ TEST Not succesfully completed : RangeTest2
+END   TestCalc
+Test run finished : 17/09/2009 12:18:02
diff --git a/sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest2.log b/sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest2.log
new file mode 100644
index 000000000..c90a0b902
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest2.log
@@ -0,0 +1,65 @@
+Test run started : 17/09/2009 12:17:45
+BEGIN TestCalc
+ TEST START : RangeTest3
+  ITEM Assertion OK : - setFormulaR1C1
+  ITEM Assertion OK : - getFormulaR1C1
+  ITEM Assertion OK : - Range.Copy() and Range.PasteSpecial()
+  ITEM Assertion OK : - Range.Copy(Range("I10"))
+  ITEM Assertion OK : PasteSpecial Paste:=xlPasteValues
+  ITEM Assertion OK : PasteSpecial Paste:=xlPasteFormulas
+  ITEM Assertion OK : PasteSpecial Paste:=xlPasteFormats
+  ITEM Assertion OK : PasteSpecial 
+  ITEM Assertion OK : PasteSpecial SkipBlanks:=True
+  ITEM Assertion OK : PasteSpecial Operation:=xlPasteSpecialOperationAdd
+  ITEM Assertion OK : PasteSpecial Operation:=xlPasteSpecialOperationSubtract
+  ITEM Assertion OK : PasteSpecial Operation:=xlPasteSpecialOperationMultiply
+  ITEM Assertion OK : PasteSpecial Operation:=xlPasteSpecialOperationDivide
+  ITEM Assertion OK : PasteSpecial Transpose:=True
+  ITEM Assertion FAIL : ActiveWorkbook.FileFormat
+  ITEM Assertion OK : ActiveWorkbook.Name
+  ITEM Assertion OK : ActiveWorkbook.FullName und ActiveWorkbook.Path
+  ITEM Assertion FAIL : -  = ActiveWorkbook.Colors(3) set
+  ITEM Assertion OK : -  = ActiveWorkbook.ResetColors
+  ITEM Assertion OK : -  = ActiveWorkbook.Colors(3) get
+  ITEM Assertion OK : -  = Range("K22").End (xlDown)
+  ITEM Assertion OK : -  = Range("K22").End (xlUo)
+  ITEM Assertion OK : -  = Range("K22").End (xlToLeft)
+  ITEM Assertion OK : -  = Range("K22").End (xlRight)
+  ITEM Assertion OK : -  ActiveSpreadsheet.Next
+  ITEM Assertion OK : -  ActiveSpreadsheet.Next
+  ITEM Assertion OK : -  ActiveSpreadsheet.Previous
+  ITEM Assertion OK : -  ActiveSpreadsheet.Previous
+  ITEM Assertion OK : -  Range("J4:J11").AutoFilter field:=1, Criteria1:="x"
+  ITEM Assertion OK : -  Range("J4:J11").AutoFilter field:=1, Criteria1:="<>"
+  ITEM Assertion OK : -  Range("J4:J11").AutoFilter field:=1, Criteria1:="="
+  ITEM Assertion OK : -  Range("J4:J11").AutoFilter 
+  ITEM Assertion OK : -  ActiveSheet.Resize.Select
+  ITEM Assertion OK : -  Application.GoTo Reference:="R8C2"
+  ITEM Assertion FAIL : -  Application.GoTo Reference:="R[8]C[2]"
+  ITEM Assertion OK : -  Application.GoTo Reference:="R8C2"
+  ITEM Assertion OK : -  Range.Group - please check visually
+  ITEM Assertion OK : -  Range.Group - please check visually
+  ITEM Assertion OK : -  Range.Ungroup- please check visually
+  ITEM Assertion OK : -  Range.Ungroup - please check visually
+  ITEM Assertion OK : -  Range.Group - please check visually
+  ITEM Assertion OK : -  Range.Group - please check visually
+  ITEM Assertion OK : -  Range.clearOutline - please check visually
+  ITEM Assertion OK : -  Range.AutoOutline - please check visually
+  ITEM Assertion OK : -  Range.AutoOutline - please check visually
+  ITEM Assertion OK : -  ActiveSheet.UsedRange.Select
+  ITEM Assertion OK : -  Range("A13").AddIndent
+  ITEM Assertion OK : -  Range("A13").IndentLevel set
+  ITEM Assertion OK : -  Range("A13").IndentLevel get
+  ITEM Assertion OK : -  Range("A13").IndentLevel get
+  ITEM Assertion OK : - Range.Copy() and Range.PasteSpecial()
+  ITEM Assertion OK : - Range.Copy() and Range.PasteSpecial()
+  ITEM Assertion OK : - Range.Copy() and Range.PasteSpecial()
+  ITEM Assertion OK : - Range.Calculate
+  ITEM Assertion OK : Worksheet.Calculate
+  ITEM Assertion OK : - Application.Calculate
+  ITEM Assertion OK : Global.Calculate
+  ITEM Assertion OK : Calculation set
+  ITEM FAIL (RangeTest3)
+ TEST Not succesfully completed : RangeTest3
+END   TestCalc
+Test run finished : 17/09/2009 12:17:51
diff --git a/sc/source/ui/vba/testvba/Logs/TestIntersection.log b/sc/source/ui/vba/testvba/Logs/TestIntersection.log
new file mode 100644
index 000000000..91e6c8ff2
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/TestIntersection.log
@@ -0,0 +1,26 @@
+Test run started : 17/09/2009 12:18:03
+----------------------------------------------------------------
+TestIntersection
+ TEST START : TestIntersection
+  ITEM Assertion OK : test1 Application.Intersect( Range('A2:D10'), Range('C4:E6'))
+  ITEM Assertion OK : test2 Application.Intersect( Range('A2:D10'), Range('A4:G10'))
+  ITEM Assertion OK : test3 Application.Intersect( Range('A2:c8,d2:f8,g2:i8'), Range('A4:G10'))
+  ITEM Assertion OK : test4 Application.Intersect( Range('A4:G10'), Range('A2:c8,d2:f8,g2:i8'))
+  ITEM Assertion OK : test5 Application.Intersect( Range('A2:c8,d2:f8,g2:i8'), Range('g4:i10,A4:G10'))
+  ITEM Assertion OK : test6 Application.Intersect( Range('g4:i10,A4:G10'), Range('A2:c8,d2:f8,g2:i8'))
+  ITEM Assertion OK : test7 Application.Intersect( Range('a2:d10,b5:e10'), Range('a5:i10'))
+  ITEM Assertion OK : test8 Application.Intersect( Range('a2:c8,d2:f8'), Range('b6:e9,a6:f9'))
+  ITEM Assertion OK : test9 Application.Intersect( Range('a2:c8,e2:f8'), Range('b6:e9,a6:f9'))
+  ITEM Assertion OK : test10 Application.Intersect( Range('a1:a3,c1:c3'), Range('a2:c3'))
+  ITEM Assertion OK : test11 Application.Intersect( Range('a1:a3,b1:b3'), Range('a2:c3'))
+  ITEM Assertion OK : test12 Application.Intersect( Range('a2:d5,b3:f7,c1:g4'), Range('b2:e6'))
+  ITEM Assertion OK : test13 Range(" a2:d10,b5:e10,g13:j32 "), Range(" a5:i10,b6:e9 "), Range("b2:r5,f10:h19")
+Test Results
+============
+
+Tests passed: 13
+Tests failed: 0
+
+END 'TestIntersection
+ TEST OK : TestIntersection
+Test run finished : 17/09/2009 12:18:03
diff --git a/sc/source/ui/vba/testvba/Logs/TestUnion.log b/sc/source/ui/vba/testvba/Logs/TestUnion.log
new file mode 100644
index 000000000..6e4e05e73
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/TestUnion.log
@@ -0,0 +1,17 @@
+Test run started : 17/09/2009 12:18:05
+----------------------------------------------------------------
+TestUnion
+ TEST START : TestUnion
+  ITEM Assertion OK : test1Application.Range('A2:D10'), Range('C4:E6')
+  ITEM Assertion OK : test2Application.Range('A2:D5,a3:d4'), Range('A4:G10')
+  ITEM Assertion OK : test3Application.Range('A4:G10,A1:B6'), Range('A2:D5,A3:D4')
+  ITEM Assertion OK : test4Application.Range('A5:D10'), Range('B5:E10')
+Test Results
+============
+
+Tests passed: 4
+Tests failed: 0
+
+END 'TestUnion
+ TEST OK : TestUnion
+Test run finished : 17/09/2009 12:18:05
diff --git a/sc/source/ui/vba/testvba/Logs/VariantTest.log b/sc/source/ui/vba/testvba/Logs/VariantTest.log
new file mode 100644
index 000000000..0e372e266
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/VariantTest.log
@@ -0,0 +1,47 @@
+Test run started : 17/09/2009 12:18:06
+----------------------------------------------------------------
+TestAddress
+ TEST START : TestAddress
+  ITEM Assertion OK : test1: res = (aboo = '')
+  ITEM Assertion OK : test 2: res = (aboo = 'fiddlesticks')
+  ITEM Assertion OK : test 3: res = ('' = aboo)
+  ITEM Assertion OK : test 4: res = ('fiddlesticks' = aboo )
+  ITEM Assertion OK : test 5: res = (testString = '')
+  ITEM Assertion OK : test 6: res = (testString = 'fiddlesticks')
+  ITEM Assertion OK : test 7: res = ('' = testString)
+  ITEM Assertion OK : test 8: res = ('fiddlesticks' = testString )
+  ITEM Assertion OK : test 9: res = ( aboo < " )
+  ITEM Assertion OK : test 10: res = ( testString < " )
+  ITEM Assertion OK : test 11: res = ( aboo > " )
+  ITEM Assertion OK : test 12: res = ( testString > " )
+  ITEM Assertion OK : test 13: res = ( aboo <> '' )
+  ITEM Assertion OK : test 14: res = ( testString <> '' )
+  ITEM Assertion OK : test 15: res = (aboo = something/14)
+  ITEM Assertion OK : test 16: res = something + 'string'
+  ITEM Assertion OK : test 17: res = something & 'string'
+  ITEM Assertion OK : test 18: res =  something MOD 10 )
+  ITEM Assertion OK : test 19: res =  something AND 1 )
+  ITEM Assertion OK : test 20: res =  something AND 0 )
+  ITEM Assertion OK : test 21: res =  something OR 12)
+  ITEM Assertion OK : test 22: res =  something OR 0 )
+  ITEM Assertion OK : test 23: res =  something XOR 0 )
+  ITEM Assertion OK : test 24: res =  something XOR 1 )
+  ITEM Assertion OK : test 25: res =  something EQV 0 )
+  ITEM Assertion OK : test 26: res =  something EQV 1 )
+  ITEM Assertion OK : test 27: res =  something IMP 0 )
+  ITEM Assertion OK : test 28: res =  something IMP 1 )
+  ITEM Assertion OK : test 29: res =  something IMP 14 )
+  ITEM Assertion OK : test 30: res =  NOT something )
+  ITEM Assertion OK : test 31: res = something + 12 )
+  ITEM Assertion OK : test 32: res = something - 12 )
+  ITEM Assertion OK : test 33: res = -something )
+  ITEM Assertion OK : test 34: res = something * 12 )
+Test Results
+============
+
+Tests passed: 34
+Tests failed: 0
+
+END 'TestAddress
+ TEST OK : TestAddress
+Test run finished : 17/09/2009 12:18:06
diff --git a/sc/source/ui/vba/testvba/Logs/Window.log b/sc/source/ui/vba/testvba/Logs/Window.log
new file mode 100644
index 000000000..766485978
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/Window.log
@@ -0,0 +1,46 @@
+Test run started : 17/09/2009 12:18:08
+----------------------------------------------------------------
+ TEST START : Window-Issue
+  ITEM Assertion OK : Window.Left is: 0 (Test only applies to maximized Window)
+  ITEM Assertion OK : Window.Top is: 21 (Test only applies to maximized Window)
+  ITEM Assertion OK : Window.Width is: 1280 (Test only applies to maximized Window)
+  ITEM Assertion OK : Window.Height is: 977 (Test only applies to maximized Window)
+  ITEM Assertion OK : Window.ScrollColumn is: 100
+  ITEM Assertion OK : Window.ScrollColumn is: 1
+  ITEM Assertion OK : Window.ScrollRow is: 100
+  ITEM Assertion OK : Window.ScrollRow is: 1
+  ITEM Assertion OK : Window.LargeScroll(Down): ScrollRow is: 151 (Test may only apply to maximized Window)
+  ITEM Assertion OK : Window.LargeScroll(Up): ScrollRow is: 1
+  ITEM Assertion OK : Window.LargeScroll(ToRight): ScrollColumn is: 58 (Test may only apply to maximized Window)
+  ITEM Assertion OK : Window.LargeScroll(ToLeft): ScrollColumn is: 1
+  ITEM Assertion OK : Window.SmallScroll(ToRight): ScrollColumn is: 4 (Test may only apply to maximized Window)
+  ITEM Assertion OK : Window.SmallScroll(ToLeft): ScrollColumn is: 1
+  ITEM Assertion OK : Window.DisplayWorkBookTabs is: False
+  ITEM Assertion OK : Window.DisplayWorkBookTabs is: True
+  ITEM Assertion OK : Window.DisplayVerticalScrollBar is: True
+  ITEM Assertion OK : Window.DisplayVerticalScrollBar is: False
+  ITEM Assertion OK : Window.DisplayHorizontalScrollBar is: False
+  ITEM Assertion OK : Window.DisplayHorizontalScrollBar is: True
+  ITEM Assertion OK : Window.DisplayHeadings is: False
+  ITEM Assertion OK : Window.DisplayHeadings is: True
+  ITEM Assertion OK : Window.DisplayOutline is: False
+  ITEM Assertion OK : Window.DisplayOutline is: True
+  ITEM Assertion OK : Window.Visible is: False
+  ITEM Assertion OK : Window.Visible is: True
+  ITEM Assertion OK : Window.Caption is: MyCaption
+  ITEM Assertion OK : Pane.ScrollColumn is: 100
+  ITEM Assertion OK : Pane.ScrollColumn is: 1
+  ITEM Assertion OK : Pane.ScrollRow is: 100
+  ITEM Assertion OK : Pane.ScrollRow is: 1
+  ITEM Assertion OK : Pane.LargeScroll(Down): ScrollRow is: 151 (Test may only apply to maximized Window)
+  ITEM Assertion OK : Pane.LargeScroll(Up): ScrollRow is: 1
+  ITEM Assertion OK : Pane.LargeScroll(ToRight): ScrollColumn is: 58 (Test may only apply to maximized Window)
+  ITEM Assertion OK : Pane.LargeScroll(ToLeft): ScrollColumn is: 1
+  ITEM Assertion OK : Pane.SmallScroll(ToRight): ScrollColumn is: 4 (Test may only apply to maximized Window)
+  ITEM Assertion OK : Pane.SmallScroll(ToLeft): ScrollColumn is: 1
+  ITEM Assertion OK : Window Selection: $A$2:$D$5
+  ITEM Assertion OK : ActiveSheet name of Window: Sheet1
+  ITEM Assertion OK : Window ActiveCell: $A$1
+END 'Window-Issue' Symbol
+ TEST OK : Window-Issue
+Test run finished : 17/09/2009 12:18:09
diff --git a/sc/source/ui/vba/testvba/Logs/bytearraystring.log b/sc/source/ui/vba/testvba/Logs/bytearraystring.log
new file mode 100644
index 000000000..f5409aa6f
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/bytearraystring.log
@@ -0,0 +1,8 @@
+Test run started : 17/09/2009 12:17:03
+BEGIN Bytearray To String
+ TEST START : Test the conversion between bytearray and string
+  ITEM Assertion OK :  The number of byte is:6
+  ITEM Assertion OK : the return string is: abc
+ TEST OK : Test the conversion between bytearray and string
+END  Bytearray To String
+Test run finished : 17/09/2009 12:17:03
diff --git a/sc/source/ui/vba/testvba/Logs/dateserial.log b/sc/source/ui/vba/testvba/Logs/dateserial.log
new file mode 100644
index 000000000..ac046a03c
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/dateserial.log
@@ -0,0 +1,9 @@
+Test run started : 17/09/2009 12:17:06
+BEGIN DateSerial
+ TEST START : Test DateSerial function
+  ITEM Assertion OK : the return date is: 15/06/1999
+  ITEM Assertion OK : the return date is: 15/06/1999
+  ITEM Assertion OK : the return date is: 15/06/1999
+ TEST OK : Test DateSerial function
+END  DateSerial
+Test run finished : 17/09/2009 12:17:06
diff --git a/sc/source/ui/vba/testvba/Logs/datevalue.log b/sc/source/ui/vba/testvba/Logs/datevalue.log
new file mode 100644
index 000000000..35e678a1a
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/datevalue.log
@@ -0,0 +1,8 @@
+Test run started : 17/09/2009 12:17:07
+BEGIN DateValue
+ TEST START : Test DateValue function
+  ITEM Assertion OK : the return date is: 12/02/1969
+  ITEM Assertion OK : the return date is: 21/01/2008
+ TEST OK : Test DateValue function
+END  DateValue
+Test run finished : 17/09/2009 12:17:07
diff --git a/sc/source/ui/vba/testvba/Logs/format.log b/sc/source/ui/vba/testvba/Logs/format.log
new file mode 100644
index 000000000..949fe57d9
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/format.log
@@ -0,0 +1,36 @@
+Test run started : 17/09/2009 12:17:09
+BEGIN Format
+ TEST START : Test Predefined_Number_Format_Sample function
+  ITEM Assertion OK : General Number: 562486.2356
+  ITEM Assertion OK : Fixed: 0.20
+  ITEM Assertion OK : Standard: 562,486.24
+  ITEM Assertion OK : Percent: 75.21%
+  ITEM Assertion OK : Scientific: 5.62E+05
+  ITEM Assertion OK : Scientific: -3.46E+03
+  ITEM Assertion OK : Yes/No: No
+  ITEM Assertion OK : Yes/No: Yes
+  ITEM Assertion OK : True/False: False
+  ITEM Assertion OK : True/False: True
+  ITEM Assertion OK : On/Off: Off
+  ITEM Assertion OK : On/Off: On
+ TEST OK : Test Predefined_Number_Format_Sample function
+ TEST START : Test Custom_Number_Format_Sample function
+  ITEM Assertion OK : 00.0000: 23.6750
+  ITEM Assertion OK : 00.00: 23.68
+  ITEM Assertion OK : 00000: 02658
+  ITEM Assertion OK : 00.00: 2658.00
+  ITEM Assertion OK : ##.####: 23.675
+  ITEM Assertion OK : ##.##: 23.68
+  ITEM Assertion OK : #,###.##: 12,345.25
+  ITEM Assertion OK : ##.00%: 25.00%
+  ITEM Assertion OK : #,###: 1,000,000
+  ITEM Assertion OK : ######E-###: 109838E-5
+  ITEM Assertion OK : $#,###.##: $2,345.25
+  ITEM Assertion OK : ##.###\%: .25%
+ TEST OK : Test Custom_Number_Format_Sample function
+ TEST START : Test Custom_Text_Format_Sample function
+  ITEM Assertion OK : <: vba
+  ITEM Assertion OK : >: VBA
+ TEST OK : Test Custom_Text_Format_Sample function
+END  Format
+Test run finished : 17/09/2009 12:17:09
diff --git a/sc/source/ui/vba/testvba/Logs/pagesetup.log b/sc/source/ui/vba/testvba/Logs/pagesetup.log
new file mode 100644
index 000000000..b7a990131
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/pagesetup.log
@@ -0,0 +1,77 @@
+Test run started : 17/09/2009 12:18:11
+BEGIN PageSetup
+ TEST START : Sheet_PrintArea
+  ITEM Assertion OK : PrintArea has changed as expected
+ TEST OK : Sheet_PrintArea
+ TEST START : Test margins (no headers)
+  ITEM Assertion OK : PageSetup.LeftMargin set/get
+  ITEM Assertion OK : PageSetup.RightMargin set/get
+  ITEM Assertion OK : PageSetup.TopMargin set/get
+  ITEM Assertion OK : PageSetup.BottomMargin set/get
+Verify that page margins on sheet 1 are all 0.5inch   
+ TEST OK : Test margins (no headers)
+ TEST START : Test margins (headers)
+  ITEM Assertion OK : PageSetup.HeaderMargin set/get
+  ITEM Assertion OK : PageSetup.FooterMargin set/get
+  ITEM Assertion OK : PageSetup.LeftMargin set/get
+  ITEM Assertion OK : PageSetup.LeftMargin set/get
+Verify that top/bottom/header/footer page margins on sheet 2 are all 0.5inch 
+ TEST OK : Test margins (headers)
+ TEST START : Test header/footer text
+  ITEM Assertion OK : PageSetup.LeftHeader set
+  ITEM Assertion OK : PageSetup.LeftHeader set/get
+  ITEM Assertion OK : PageSetup.CenterHeader set
+  ITEM Assertion OK : PageSetup.CenterHeader set/get
+  ITEM Assertion OK : PageSetup.RightHeader set
+  ITEM Assertion OK : PageSetup.RightHeader set/get
+  ITEM Assertion OK : PageSetup.LeftFooter set
+  ITEM Assertion OK : PageSetup.LeftFooter set/get
+  ITEM Assertion OK : PageSetup.CenterFooter set
+  ITEM Assertion OK : PageSetup.CenterFooter set/get
+  ITEM Assertion OK : PageSetup.RightFooter set
+  ITEM Assertion OK : PageSetup.RightFooter set/get
+Verify that headers on sheet 2 are Ready,to,go
+Verify that footers on sheet 2 are This,now,Works
+ TEST OK : Test header/footer text
+ TEST START : Test zoom
+  ITEM Assertion OK : PageSetup.Zoom set
+  ITEM Assertion OK : PageSetup.Zoom set/get
+Verify that sheet 1 zoom is 10%
+ TEST OK : Test zoom
+ TEST START : Test orientation
+  ITEM Assertion OK : PageSetup.Zoom set
+  ITEM Assertion OK : PageSetup.Orientation set/get
+Verify that sheet 1 orientation is now landscape
+ TEST OK : Test orientation
+ TEST START : Test order
+  ITEM Assertion OK : PageSetup.Order get
+  ITEM Assertion OK : PageSetup.Order set/get
+Verify that order on sheet 1 is now over, then down.
+ TEST OK : Test order
+ TEST START : Test first page number
+  ITEM Assertion OK : PageSetup.FirstPageNumber get
+  ITEM Assertion OK : PageSetup.FirstPageNumber set/get
+Verify that first page number on sheet 1 is now 2.
+ TEST OK : Test first page number
+ TEST START : Test center vertically
+  ITEM Assertion OK : PageSetup.CenterVertically get
+  ITEM Assertion OK : PageSetup.CenterVertically set/get
+Verify that CenterVertically on sheet 1 is now true.
+ TEST OK : Test center vertically
+ TEST START : Test center horizontally
+  ITEM Assertion OK : PageSetup.CenterHorizontally get
+  ITEM Assertion OK : PageSetup.CenterHorizontally set/get
+Verify that CenterHorizontally on sheet 1 is now true.
+ TEST OK : Test center horizontally
+ TEST START : Test FitToPagesTall
+  ITEM Assertion OK : PageSetup.FitToPagesTall set/get
+ TEST OK : Test FitToPagesTall
+ TEST START : Test FitToPagesWide
+  ITEM Assertion OK : PageSetup.FitToPagesWide set/get
+ TEST OK : Test FitToPagesWide
+ TEST START : Test PrintHeadings
+  ITEM Assertion OK : PageSetup.PrintHeadings set/get
+  ITEM Assertion OK : PageSetup.PrintHeadings set/get
+ TEST OK : Test PrintHeadings
+END  PageSetup
+Test run finished : 17/09/2009 12:18:11
diff --git a/sc/source/ui/vba/testvba/Logs/partition.log b/sc/source/ui/vba/testvba/Logs/partition.log
new file mode 100644
index 000000000..5fbaa1aa6
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/partition.log
@@ -0,0 +1,11 @@
+Test run started : 17/09/2009 12:17:16
+BEGIN Partition
+ TEST START : Test Partition function
+  ITEM Assertion OK : the number 20 occurs in the range:20:24
+  ITEM Assertion OK : the number 20 occurs in the range: 20: 20
+  ITEM Assertion OK : the number 120 occurs in the range:100:   
+  ITEM Assertion OK : the number -5 occurs in the range:   : -1
+  ITEM Assertion OK : the number 2 occurs in the range: 2: 3
+ TEST OK : Test Partition function
+END  Partition
+Test run finished : 17/09/2009 12:17:16
diff --git a/sc/source/ui/vba/testvba/Logs/range-4.log b/sc/source/ui/vba/testvba/Logs/range-4.log
new file mode 100644
index 000000000..f7358306f
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/range-4.log
@@ -0,0 +1,16 @@
+Test run started : 17/09/2009 12:17:19
+----------------------------------------------------------------
+ShowDetail-Issue
+ TEST START : ShowDetail-Issue
+  ITEM Assertion OK :  Range.ShowDetail is True
+  ITEM Assertion OK :  Range.ShowDetail is False
+END 'ShowDetail-Issue' Symbol
+ TEST OK : ShowDetail-Issue
+----------------------------------------------------------------
+RangeMerged-Issue
+ TEST START : RangeMerged-Issue
+  ITEM Assertion OK :  Range.RangeMerged is $F$2:$H$5
+  ITEM Assertion OK :  The first address of Range.RangeMerged is $F$2
+END 'RangeMerged-Issue' Symbol
+ TEST OK : RangeMerged-Issue
+Test run finished : 17/09/2009 12:17:19
diff --git a/sc/source/ui/vba/testvba/Logs/replace.log b/sc/source/ui/vba/testvba/Logs/replace.log
new file mode 100644
index 000000000..390750dd5
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/replace.log
@@ -0,0 +1,14 @@
+Test run started : 17/09/2009 12:17:35
+BEGIN Replace
+ TEST START : Test Replace function
+  ITEM Assertion OK : common string:aefefdBc
+  ITEM Assertion OK : expression string:aefefdef
+  ITEM Assertion OK : binanary compare:aefefdBc
+  ITEM Assertion OK : text compare:aefefdef
+  ITEM Assertion OK : text compare:aefefdef
+  ITEM Assertion OK : start = 3:cefdBc
+  ITEM Assertion OK : count = 2: aefefdBc
+  ITEM Assertion OK : start = 1, count = 0, not support in Unix: abcbcdBc
+ TEST OK : Test Replace function
+END  Replace
+Test run finished : 17/09/2009 12:17:35
diff --git a/sc/source/ui/vba/testvba/Logs/stringplusdouble.log b/sc/source/ui/vba/testvba/Logs/stringplusdouble.log
new file mode 100644
index 000000000..4fefe6272
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/stringplusdouble.log
@@ -0,0 +1,62 @@
+Test run started : 17/09/2009 12:17:40
+BEGIN String Plus Double
+ TEST START : double = string + double
+The next compute raises error: s = null, d = null, r = s + d
+  ITEM Assertion OK : s = null, d = null, r = s + d .The result is: -1
+  ITEM Assertion OK : s = null, d = null, r = s & d .The result is: 0
+The next compute raises error: s = null, d = 20, r = s + d
+  ITEM Assertion OK : s = null, d = 20, r = s + d .The result is: -1
+  ITEM Assertion OK : s = null, d = 20, r = s & d .The result is: 20
+  ITEM Assertion OK : s = '10', d = null, r = s + d .The result is: 10
+  ITEM Assertion OK : s = '10', d = null, r = s & d .The result is: 100
+  ITEM Assertion OK : s = '10', d = 20, r = s + d .The result is: 30
+  ITEM Assertion OK : s = '10', d = 20, r = s & d .The result is: 1020
+The next compute raises error: s = 'abc', d = null, r = s + d
+  ITEM Assertion OK : s = 'abc', d = null, r = s + d .The result is: -1
+The next compute raises error: s = 'abc', d = null, r = s & d
+  ITEM Assertion OK : s = 'abc', d = null, r = s & d .The result is: -1
+The next compute raises error: s = 'abc', d = 20, r = s + d
+  ITEM Assertion OK : s = 'abc', d = 20, r = s + d .The result is: -1
+The next compute raises error: s = 'abc', d = 20, r = s & d
+  ITEM Assertion OK : s = 'abc', d = 20, r = s & d .The result is: -1
+ TEST OK : double = string + double
+ TEST START : string = string + double
+The next compute raises error: s = null, d = null, r = s + d
+  ITEM Assertion OK : s = null, d = null, r = s + d .The result is: -1
+  ITEM Assertion OK : s = null, d = null, r = s & d .The result is: 0
+The next compute raises error: s = null, d = 20, r = s + d
+  ITEM Assertion OK : s = null, d = 20, r = s + d .The result is: -1
+  ITEM Assertion OK : s = null, d = 20, r = s & d .The result is: 20
+  ITEM Assertion OK : s = '10', d = null, r = s + d .The result is: 10
+  ITEM Assertion OK : s = '10', d = null, r = s & d .The result is: 100
+  ITEM Assertion OK : s = '10', d = 20, r = s + d .The result is: 30
+  ITEM Assertion OK : s = '10', d = 20, r = s & d .The result is: 1020
+The next compute raises error: s = 'abc', d = null, r = s + d
+  ITEM Assertion OK : s = 'abc', d = null, r = s + d .The result is: -1
+  ITEM Assertion OK : s = 'abc', d = null, r = s & d .The result is: abc0
+The next compute raises error: s = 'abc', d = 20, r = s + d
+  ITEM Assertion OK : s = 'abc', d = 20, r = s + d .The result is: -1
+  ITEM Assertion OK : s = 'abc', d = 20, r = s & d .The result is: abc20
+ TEST OK : string = string + double
+ TEST START : double = string + string
+The next compute raises error: s = null, d = null, r = s + d
+  ITEM Assertion OK : s = null, d = null, r = s + d .The result is: -1
+The next compute raises error: s = null, d = null, r = s & d
+  ITEM Assertion OK : s = null, d = null, r = s & d .The result is: -1
+  ITEM Assertion OK : s = null, d = 20, r = s + d .The result is: 20
+  ITEM Assertion OK : s = null, d = 20, r = s & d .The result is: 20
+  ITEM Assertion OK : s = '10', d = null, r = s + d .The result is: 10
+  ITEM Assertion OK : s = '10', d = null, r = s & d .The result is: 10
+  ITEM Assertion OK : s = '10', d = 20, r = s + d .The result is: 1020
+  ITEM Assertion OK : s = '10', d = 20, r = s & d .The result is: 1020
+The next compute raises error: s = 'abc', d = null, r = s + d
+  ITEM Assertion OK : s = 'abc', d = null, r = s + d .The result is: -1
+The next compute raises error: s = 'abc', d = null, r = s & d
+  ITEM Assertion OK : s = 'abc', d = null, r = s & d .The result is: -1
+The next compute raises error: s = 'abc', d = 20, r = s + d
+  ITEM Assertion OK : s = 'abc', d = 20, r = s + d .The result is: -1
+The next compute raises error: s = 'abc', d = 20, r = s & d
+  ITEM Assertion OK : s = 'abc', d = 20, r = s & d .The result is: -1
+ TEST OK : double = string + string
+END  String Plus Double
+Test run finished : 17/09/2009 12:17:40
diff --git a/sc/source/ui/vba/testvba/Logs/window2.log b/sc/source/ui/vba/testvba/Logs/window2.log
new file mode 100644
index 000000000..52825520c
--- /dev/null
+++ b/sc/source/ui/vba/testvba/Logs/window2.log
@@ -0,0 +1,41 @@
+Test run started : 17/09/2009 12:16:59
+BEGIN Window2
+ TEST START : Test Window.SplitRow
+  ITEM Assertion OK : Test SplitColumn: 2 (Test only applies to maximized Window and at least has 800*600 solotion)
+  ITEM Assertion OK : Test SplitRow: 2 (Test only applies to maximized Window and at least has 800*600 solotion)
+  ITEM Assertion OK : Test SplitVertical: 242.283803521067
+  ITEM Assertion OK : Test SplitHorizontal: 242.283803521067
+  ITEM Assertion OK : Test SplitRow: 4 (Test only applies to maximized Window and at least has 800*600 solotion)
+  ITEM Assertion OK : Test SplitColumn: 3 (Test only applies to maximized Window and at least has 800*600 solotion)
+  ITEM Assertion OK : Test SplitColumn: 0
+  ITEM Assertion OK : Test SplitRow: 0
+ TEST OK : Test Window.SplitRow
+ TEST START : Test Window.DisplayGridlines
+  ITEM Assertion OK : Test gridlines are on
+  ITEM Assertion OK : Test gridlines are off
+ TEST OK : Test Window.DisplayGridlines
+ TEST START : Test Window.DisplayHeadings
+  ITEM Assertion OK : Test Headings are on
+  ITEM Assertion OK : Test Headings are off
+ TEST OK : Test Window.DisplayHeadings
+ TEST START : Test Window.Visibility
+  ITEM Assertion OK : Window is visible
+  ITEM Assertion OK : Window is not visible
+ TEST OK : Test Window.Visibility
+ TEST START : Test Window.FreezePanes
+  ITEM Assertion OK : Test no panes frozen
+  ITEM Assertion OK : Test panes frozen at center
+  ITEM Assertion OK : Test panes frozen at split
+ TEST OK : Test Window.FreezePanes
+ TEST START : Test Window.View
+ TEST OK : Test Window.View
+ TEST START : Test Window.Zoom
+  ITEM Assertion OK : Test zoom=100%
+  ITEM Assertion OK : Test zoom=150%
+ TEST OK : Test Window.Zoom
+ TEST START : Test Windows.Count
+  ITEM Assertion OK : Windows Count: 1
+  ITEM Assertion OK : Application.Windows Count: 1
+ TEST OK : Test Windows.Count
+END  Window2
+Test run finished : 17/09/2009 12:17:00
diff --git a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/CalcFont.log b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/CalcFont.log
new file mode 100644
index 000000000..f3583e4cb
--- /dev/null
+++ b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/CalcFont.log
@@ -0,0 +1,17 @@
+Test run started : 10/09/2008 02:40:17 PM
+CalcFont_Format
+ TEST START : Font_Format
+  ITEM Assertion OK : correctly set font to Bold
+  ITEM Assertion OK : correctly set font to Italic
+  ITEM Assertion OK : correctly read FontStyle
+  ITEM Assertion OK : correctly set font to Shadow
+  ITEM Assertion OK : correctly set font color
+  ITEM Assertion OK : correctly set font color index
+  ITEM Assertion OK : correctly set font name
+  ITEM Assertion OK : correctly set font outline
+  ITEM Assertion OK : correctly set font size
+  ITEM Assertion OK : correctly set font strikethrough
+  ITEM Assertion OK : correctly set font underline
+ TEST Success. : Font_Format
+CalcFont_Format
+Test run finished : 10/09/2008 02:40:17 PM
diff --git a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log
new file mode 100644
index 000000000..116f9f98c
--- /dev/null
+++ b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log
@@ -0,0 +1,30 @@
+Test run started : 12/05/2009 12:36:15
+----------------------------------------------------------------
+TestAddress
+ TEST START : TestAddress
+  ITEM Assertion OK : test1: res = Not ( A > B )
+  ITEM Assertion OK : test2: res = Not ( B > A )
+  ITEM Assertion OK : test3: res = Not ( D )
+  ITEM Assertion OK : test4: res = Not A
+  ITEM Assertion OK : test5: res = ( A > D )
+  ITEM Assertion OK : test6: res = ( D > A )
+  ITEM Assertion OK : test7: res = ( A < D )
+  ITEM Assertion OK : test8: res = ( D < A )
+  ITEM Assertion OK : test9: res = ( A >= D )
+  ITEM Assertion OK : test10: res = ( D >= A )
+  ITEM Assertion OK : test11: res = ( A <= D )
+  ITEM Assertion OK : test12: res = ( D <= A )
+  ITEM Assertion OK : test13: res = ( D = A )
+  ITEM Assertion OK : test14: res = ( A = D )
+  ITEM Assertion OK : test15: res = ( D <> A )
+  ITEM Assertion OK : test16: res = ( A <> D )
+  ITEM Assertion OK : test17: ( A = D ) = True 
+Test Results
+============
+
+Tests passed: 17
+Tests failed: 0
+
+END 'TestAddress
+ TEST OK : TestAddress
+Test run finished : 12/05/2009 12:36:15
diff --git a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log
index dd4fb4923..cdd18685e 100644
--- a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log
+++ b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log
@@ -1,4 +1,4 @@
-Test run started : 17/12/2008 14:18:34
+Test run started : 10/03/2008 15:15:11
 ----------------------------------------------------------------
 ApplicationMethods
  TEST START : ApplicationMethods
@@ -7,8 +7,8 @@ ApplicationMethods
   ITEM Assertion OK :  Address of Application.Rows is: $1:$1
   ITEM Assertion OK :  Address of Application.Range is: $1:$1,$5:$7
   ITEM Assertion OK :  Please check manually: DefaultFilePath is: /data4/home/npower/Documents
-  ITEM Assertion OK :  Please check manually: Library Path is: /media/disk/BUILD-related/CWS/my_working_copy/INSTALL_FOR_TEST/opt/UserInstallation/user/basic
-  ITEM Assertion OK :  Please check manually: Template Path is: /media/disk/BUILD-related/CWS/my_working_copy/INSTALL_FOR_TEST/opt/UserInstallation/user/template
+  ITEM Assertion OK :  Please check manually: Library Path is: /data4/home/npower/.ooo-2.0/user/basic
+  ITEM Assertion OK :  Please check manually: Template Path is: /data4/home/npower/.ooo-2.0/user/template
   ITEM Assertion OK :  FileSeparator is /
   ITEM Assertion OK :  Name of ActiveWorkbook is: Ranges.xls
 END 'ApplicationMethods' Symbol
@@ -111,8 +111,8 @@ END 'Value-Issue' Symbol
 ----------------------------------------------------------------
 AutoFit issue
  TEST START : AutoFit issue
-  ITEM Assertion OK :  Columns.AutoFit: CurrentWidth is 679
-  ITEM Assertion OK :  Rows.AutoFit: CurrentHeight is 546
+  ITEM Assertion OK :  Columns.AutoFit: CurrentWidth is 680
+  ITEM Assertion OK :  Rows.AutoFit: CurrentHeight is 554
 END 'AutoFit issue' Symbol
  TEST OK : AutoFit issue
 ----------------------------------------------------------------
@@ -204,11 +204,11 @@ Heights and Widths
   ITEM Assertion OK : Range RowHeight is 40
   ITEM Assertion OK : Range ColumnWidth is 50
   ITEM Assertion OK : Range Height is 240
-  ITEM Assertion OK : Range Width is 787.5
+  ITEM Assertion OK : Range Width is 795
   ITEM Assertion OK : Range RowHeight is 50
   ITEM Assertion OK : Range ColumnWidth is 50
   ITEM Assertion OK : Range Height is 300
-  ITEM Assertion OK : Range Width is 787.5
+  ITEM Assertion OK : Range Width is 795
   ITEM Assertion OK : RowHeight is null: True
   ITEM Assertion OK : ColumnWidth is null: True
 END 'Heights and Widths' Symbol
@@ -218,7 +218,7 @@ RangeRowColumn-Issue
  TEST START : RangeRowColumn-Issue
   ITEM Assertion OK : Row is: 8
   ITEM Assertion OK : Column is: 5
-  ITEM Assertion OK : EntireRow.Columns.Count = 1024
+  ITEM Assertion OK : EntireRow.Columns.Count = 256
   ITEM Assertion OK : EntireColumn.Rows.Count = 131072
 END 'RangeRowColumn-Issue' Symbol
  TEST OK : RangeRowColumn-Issue
@@ -255,7 +255,7 @@ End issue
   ITEM Assertion OK : -  = $E$3
   ITEM Assertion OK : -  = $A$8
   ITEM Assertion OK : -  = $B$8
-  ITEM Assertion FAIL : -  = $AMJ$8
+  ITEM Assertion OK : -  = $IV$8
   ITEM Assertion OK : -  = $Z$8
 END 'End issue' Symbol
  TEST OK : End issue
@@ -277,4 +277,4 @@ Validation
   ITEM Assertion OK : Validation Error Title is : Microsoft Excel
 END 'Validation' Symbol
  TEST OK : Validation
-Test run finished : 17/12/2008 14:18:40
+Test run finished : 10/03/2008 15:15:13
diff --git a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log
index 42360c3ff..4fa4bc820 100644
--- a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log
+++ b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log
@@ -1,4 +1,4 @@
-Test run started : 17/07/2007 20:56:04
+Test run started : 12/05/2009 11:23:35
 ----------------------------------------------------------------
 TestAddress
  TEST START : TestAddress
@@ -51,12 +51,17 @@ TestAddress
   ITEM Assertion OK : test47 Range('a2:b4').Rows('1:2')
   ITEM Assertion OK : test48 Range('a2:b4').Rows('2:2')
   ITEM Assertion OK : test49 Range('a2:b4').Rows('2:3')
+  ITEM Assertion OK : test50 Range(' A2:B4 ')
+  ITEM Assertion OK : test51 Range('A 2:B 4')
+  ITEM Assertion OK : test52 Range('A2 : B4 ')
+  ITEM Assertion OK : test53 Range('Sheet1 !A2 : B4 ')
+  ITEM Assertion OK : test54 Range('Sheet1! A2 : B4 ')
 Test Results
 ============
 
-Tests passed: 49
+Tests passed: 54
 Tests failed: 0
 
 END 'TestAddress
  TEST OK : TestAddress
-Test run finished : 17/07/2007 20:56:05
+Test run finished : 12/05/2009 11:23:35
diff --git a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestIntersection.log b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestIntersection.log
new file mode 100644
index 000000000..ea686a830
--- /dev/null
+++ b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestIntersection.log
@@ -0,0 +1,26 @@
+Test run started : 13/01/2009 14:31:43
+----------------------------------------------------------------
+TestIntersection
+ TEST START : TestIntersection
+  ITEM Assertion OK : test1 Application.Intersect( Range('A2:D10'), Range('C4:E6'))
+  ITEM Assertion OK : test2 Application.Intersect( Range('A2:D10'), Range('A4:G10'))
+  ITEM Assertion OK : test3 Application.Intersect( Range('A2:c8,d2:f8,g2:i8'), Range('A4:G10'))
+  ITEM Assertion OK : test4 Application.Intersect( Range('A4:G10'), Range('A2:c8,d2:f8,g2:i8'))
+  ITEM Assertion OK : test5 Application.Intersect( Range('A2:c8,d2:f8,g2:i8'), Range('g4:i10,A4:G10'))
+  ITEM Assertion OK : test6 Application.Intersect( Range('g4:i10,A4:G10'), Range('A2:c8,d2:f8,g2:i8'))
+  ITEM Assertion OK : test7 Application.Intersect( Range('a2:d10,b5:e10'), Range('a5:i10'))
+  ITEM Assertion OK : test8 Application.Intersect( Range('a2:c8,d2:f8'), Range('b6:e9,a6:f9'))
+  ITEM Assertion OK : test9 Application.Intersect( Range('a2:c8,e2:f8'), Range('b6:e9,a6:f9'))
+  ITEM Assertion OK : test10 Application.Intersect( Range('a1:a3,c1:c3'), Range('a2:c3'))
+  ITEM Assertion OK : test11 Application.Intersect( Range('a1:a3,b1:b3'), Range('a2:c3'))
+  ITEM Assertion OK : test12 Application.Intersect( Range('a2:d5,b3:f7,c1:g4'), Range('b2:e6'))
+  ITEM Assertion OK : test13 Range(" a2:d10,b5:e10,g13:j32 "), Range(" a5:i10,b6:e9 "), Range("b2:r5,f10:h19")
+Test Results
+============
+
+Tests passed: 13
+Tests failed: 0
+
+END 'TestIntersection
+ TEST OK : TestIntersection
+Test run finished : 13/01/2009 14:31:43
diff --git a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestUnion.log b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestUnion.log
new file mode 100644
index 000000000..da3cb35de
--- /dev/null
+++ b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestUnion.log
@@ -0,0 +1,17 @@
+Test run started : 13/01/2009 14:32:16
+----------------------------------------------------------------
+TestUnion
+ TEST START : TestUnion
+  ITEM Assertion OK : test1Application.Range('A2:D10'), Range('C4:E6')
+  ITEM Assertion OK : test2Application.Range('A2:D5,a3:d4'), Range('A4:G10')
+  ITEM Assertion OK : test3Application.Range('A4:G10,A1:B6'), Range('A2:D5,A3:D4')
+  ITEM Assertion OK : test4Application.Range('A5:D10'), Range('B5:E10')
+Test Results
+============
+
+Tests passed: 4
+Tests failed: 0
+
+END 'TestUnion
+ TEST OK : TestUnion
+Test run finished : 13/01/2009 14:32:16
diff --git a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/VariantTest.log b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/VariantTest.log
new file mode 100644
index 000000000..a916ac4a3
--- /dev/null
+++ b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/VariantTest.log
@@ -0,0 +1,47 @@
+Test run started : 24/09/2008 10:58:18
+----------------------------------------------------------------
+TestAddress
+ TEST START : TestAddress
+  ITEM Assertion OK : test1: res = (aboo = '')
+  ITEM Assertion OK : test 2: res = (aboo = 'fiddlesticks')
+  ITEM Assertion OK : test 3: res = ('' = aboo)
+  ITEM Assertion OK : test 4: res = ('fiddlesticks' = aboo )
+  ITEM Assertion OK : test 5: res = (testString = '')
+  ITEM Assertion OK : test 6: res = (testString = 'fiddlesticks')
+  ITEM Assertion OK : test 7: res = ('' = testString)
+  ITEM Assertion OK : test 8: res = ('fiddlesticks' = testString )
+  ITEM Assertion OK : test 9: res = ( aboo < " )
+  ITEM Assertion OK : test 10: res = ( testString < " )
+  ITEM Assertion OK : test 11: res = ( aboo > " )
+  ITEM Assertion OK : test 12: res = ( testString > " )
+  ITEM Assertion OK : test 13: res = ( aboo <> '' )
+  ITEM Assertion OK : test 14: res = ( testString <> '' )
+  ITEM Assertion OK : test 15: res = (aboo = something/14)
+  ITEM Assertion OK : test 16: res = something + 'string'
+  ITEM Assertion OK : test 17: res = something & 'string'
+  ITEM Assertion OK : test 18: res =  something MOD 10 )
+  ITEM Assertion OK : test 19: res =  something AND 1 )
+  ITEM Assertion OK : test 20: res =  something AND 0 )
+  ITEM Assertion OK : test 21: res =  something OR 12)
+  ITEM Assertion OK : test 22: res =  something OR 0 )
+  ITEM Assertion OK : test 23: res =  something XOR 0 )
+  ITEM Assertion OK : test 24: res =  something XOR 1 )
+  ITEM Assertion OK : test 25: res =  something EQV 0 )
+  ITEM Assertion OK : test 26: res =  something EQV 1 )
+  ITEM Assertion OK : test 27: res =  something IMP 0 )
+  ITEM Assertion OK : test 28: res =  something IMP 1 )
+  ITEM Assertion OK : test 29: res =  something IMP 14 )
+  ITEM Assertion OK : test 30: res =  NOT something )
+  ITEM Assertion OK : test 31: res = something + 12 )
+  ITEM Assertion OK : test 32: res = something - 12 )
+  ITEM Assertion OK : test 33: res = -something )
+  ITEM Assertion OK : test 34: res = something * 12 )
+Test Results
+============
+
+Tests passed: 34
+Tests failed: 0
+
+END 'TestAddress
+ TEST OK : TestAddress
+Test run finished : 24/09/2008 10:58:20
diff --git a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log
index 50fac1715..96725bf7d 100644
--- a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log
+++ b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log
@@ -1,4 +1,4 @@
-Test run started : 17/12/2008 14:15:22
+Test run started : 2008／09／18 11:35:34
 BEGIN Format
  TEST START : Test Predefined_Number_Format_Sample function
   ITEM Assertion OK : General Number: 562486.2356
@@ -33,4 +33,4 @@ BEGIN Format
   ITEM Assertion OK : >: VBA
  TEST OK : Test Custom_Text_Format_Sample function
 END  Format
-Test run finished : 17/12/2008 14:15:22
+Test run finished : 2008／09／18 11:35:34
diff --git a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log
index 461955dc2..8f600faaa 100644
--- a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log
+++ b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log
@@ -1,4 +1,4 @@
-Test run started : 17/12/2008 13:53:49
+Test run started : 09/05/2008 10:21:46 AM
 BEGIN Replace
  TEST START : Test Replace function
   ITEM Assertion OK : common string:aefefdBc
@@ -11,4 +11,4 @@ BEGIN Replace
   ITEM Assertion OK : start = 1, count = 0, not support in Unix: abcbcdBc
  TEST OK : Test Replace function
 END  Replace
-Test run finished : 17/12/2008 13:53:49
+Test run finished : 09/05/2008 10:21:47 AM
diff --git a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log
index 5d297f80a..8e26d0580 100644
--- a/sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log
+++ b/sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log
@@ -1,20 +1,15 @@
-Test run started : 05/29/2008 02:55:48 PM
+Test run started : 2008／09／22 11:18:57
 BEGIN Window2
  TEST START : Test Window.SplitRow
-  ITEM Assertion OK : Test SplitColumn: 2
-  ITEM Assertion FAIL : Test SplitRow: 5
-  ITEM Assertion FAIL : Test SplitVertical: 64.5090003183026
-  ITEM Assertion OK : Test SplitHorizontal: 502.570118758869
-  ITEM Assertion OK : Test SplitVertical: 242.283803521067
-  ITEM Assertion OK : Test SplitRow: 19
-  ITEM Assertion OK : Test SplitHorizontal: 242.283803521067
-  ITEM Assertion OK : Test SplitColumn: 1
-  ITEM Assertion FAIL : Test SplitRow: 8
-  ITEM Assertion OK : Test SplitColumn: 10
+  ITEM Assertion OK : Test SplitColumn: 2 (Test only applies to maximized Window and at least has 800*600 solotion)
+  ITEM Assertion OK : Test SplitRow: 2 (Test only applies to maximized Window and at least has 800*600 solotion)
+  ITEM Assertion OK : Test SplitVertical: 242.465788476212
+  ITEM Assertion OK : Test SplitHorizontal: 242.465788476212
+  ITEM Assertion OK : Test SplitRow: 4 (Test only applies to maximized Window and at least has 800*600 solotion)
+  ITEM Assertion OK : Test SplitColumn: 3 (Test only applies to maximized Window and at least has 800*600 solotion)
   ITEM Assertion OK : Test SplitColumn: 0
   ITEM Assertion OK : Test SplitRow: 0
  TEST OK : Test Window.SplitRow
-TEST ERROR - no test begun: Test Window.SplitRow
  TEST START : Test Window.DisplayGridlines
   ITEM Assertion OK : Test gridlines are on
   ITEM Assertion OK : Test gridlines are off
@@ -25,7 +20,8 @@ TEST ERROR - no test begun: Test Window.SplitRow
  TEST OK : Test Window.DisplayHeadings
  TEST START : Test Window.Visibility
   ITEM Assertion OK : Window is visible
- TEST FAIL : Test Window.Visibility (hit error handler).
+  ITEM Assertion OK : Window is not visible
+ TEST OK : Test Window.Visibility
  TEST START : Test Window.FreezePanes
   ITEM Assertion OK : Test no panes frozen
   ITEM Assertion OK : Test panes frozen at center
@@ -42,4 +38,4 @@ TEST ERROR - no test begun: Test Window.SplitRow
   ITEM Assertion OK : Application.Windows Count: 1
  TEST OK : Test Windows.Count
 END  Window2
-Test run finished : 05/29/2008 02:55:48 PM
+Test run finished : 2008／09／22 11:18:58
diff --git a/sc/source/ui/vba/testvba/list1 b/sc/source/ui/vba/testvba/list1
new file mode 100644
index 000000000..5d093b709
--- /dev/null
+++ b/sc/source/ui/vba/testvba/list1
@@ -0,0 +1,28 @@
+AutoFilter
+bytearraystring
+CalcFont
+dateserial
+datevalue
+format
+MiscOperatorTests
+MiscRangeTests
+PageBreaks
+PageSetup
+partition
+range-4
+Ranges-2
+Ranges-3
+Ranges
+replace
+Shapes
+StrConv-test
+stringplusdouble
+Template
+TestAddress
+TestCalc_Rangetest2
+TestCalc_Rangetest
+TestIntersection
+TestUnion
+VariantTest
+window2
+Window
diff --git a/sc/source/ui/vba/testvba/list2 b/sc/source/ui/vba/testvba/list2
new file mode 100644
index 000000000..5d093b709
--- /dev/null
+++ b/sc/source/ui/vba/testvba/list2
@@ -0,0 +1,28 @@
+AutoFilter
+bytearraystring
+CalcFont
+dateserial
+datevalue
+format
+MiscOperatorTests
+MiscRangeTests
+PageBreaks
+PageSetup
+partition
+range-4
+Ranges-2
+Ranges-3
+Ranges
+replace
+Shapes
+StrConv-test
+stringplusdouble
+Template
+TestAddress
+TestCalc_Rangetest2
+TestCalc_Rangetest
+TestIntersection
+TestUnion
+VariantTest
+window2
+Window
diff --git a/sc/source/ui/vba/testvba/list3 b/sc/source/ui/vba/testvba/list3
new file mode 100644
index 000000000..7bd6436aa
--- /dev/null
+++ b/sc/source/ui/vba/testvba/list3
@@ -0,0 +1,28 @@
+AutoFilter
+bytearraystring
+CalcFont
+dateserial
+datevalue
+format
+MiscOperatorTests
+MiscRangeTests
+PageBreaks
+pagesetup
+partition
+range-4
+Ranges-2
+Ranges-3
+Ranges
+replace
+Shapes
+StrConv-test
+stringplusdouble
+Template
+TestAddress
+TestCalc_Rangetest2
+TestCalc_Rangetest
+TestIntersection
+TestUnion
+VariantTest
+window2
+Window
diff --git a/sc/source/ui/vba/testvba/runTests.pl b/sc/source/ui/vba/testvba/runTests.pl
index 520c6e2c5..1f449e586 100644
--- a/sc/source/ui/vba/testvba/runTests.pl
+++ b/sc/source/ui/vba/testvba/runTests.pl
@@ -20,7 +20,7 @@ my $theResult;
 my $officepath = shift || die "please specify path to office installation program dir";
 my $DocName = shift || "";
 my $programpath = "$officepath"."3/program:$officepath/program:";
-my $basiclibrarypath = "$officepath/basis3.1/program";
+my $basiclibrarypath = "$officepath/basis3.2/program";
 my $urelibpath = "$officepath/ure/lib";
 my $binext = "";
 my $testDocDir = "$binDir/TestDocuments";
diff --git a/sc/source/ui/vba/testvba/testrun.log b/sc/source/ui/vba/testvba/testrun.log
new file mode 100644
index 000000000..9a2f4d487
--- /dev/null
+++ b/sc/source/ui/vba/testvba/testrun.log
@@ -0,0 +1,417 @@
+thanks, you gave me 1 command-line arguments.
+/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org
+use the latest build
+Linux
+0 = ( 0 || 0 || 0 )
+/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org:/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org3/program:/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/program::/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/basis3.2/program:/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/ure/lib:/usr/lib/mpi/gcc/openmpi/lib
+/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org3/program:/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/program::/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/basis3.2/program:/media/disk/Openoffice-BUILDS/UBERCWS/IBM_NOVELL_TESTBUILD/opt/openoffice.org/ure/lib/../bin:/usr/lib/mpi/gcc/openmpi/bin:/data4/home/npower/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/opt/kde3/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin:/usr/lib/qt3/bin:/opt/real/RealPlayer
+en_GB.UTF-8
+runCmd = /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/testclient /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs
+got servicemanager
+got desktop
+Entries 28
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/window2.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/window2.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /window2.xls
+move log file from file:///data4/home/npower/Documents//window2.log
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/window2.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /bytearraystring.xls
+move log file from file:///data4/home/npower/Documents//bytearraystring.log
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/CalcFont.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/CalcFont.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/CalcFont.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /dateserial.xls
+move log file from file:///data4/home/npower/Documents//dateserial.log
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /datevalue.xls
+move log file from file:///data4/home/npower/Documents//datevalue.log
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/format.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/format.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /format.xls
+move log file from file:///data4/home/npower/Documents//format.log
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/format.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscOperatorTests.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscOperatorTests.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscOperatorTests.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /PageBreaks.xls
+move log file from file:///data4/home/npower/Documents//PageBreaks.log
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /PageSetup.xls
+move log file from file:///data4/home/npower/Documents//PageSetup.log
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/partition.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/partition.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /partition.xls
+move log file from file:///data4/home/npower/Documents//partition.log
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/partition.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/range-4.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/range-4.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /range-4.xls
+move log file from file:///data4/home/npower/Documents//range-4.log
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/range-4.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/replace.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/replace.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /replace.xls
+move log file from file:///data4/home/npower/Documents//replace.log
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/replace.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /StrConv-test.xls
+move log file from file:///data4/home/npower/Documents//StrConv-test.log
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+/data4/home/npower
+file name /stringplusdouble.xls
+move log file from file:///data4/home/npower/Documents//stringplusdouble.log
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Template.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Template.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Template.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestIntersection.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestIntersection.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestIntersection.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestUnion.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestUnion.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/TestUnion.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/VariantTest.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/VariantTest.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/VariantTest.xls
+processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Window.xls
+try to get xDoc file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Window.xls
+got xDoc
+try to get the ScriptProvider
+get the ScriptProvider
+try to get the Script
+get the Script
+move log file
+moved to new location
+try to close
+closed
+complete processing file:///media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/Window.xls
+analyseCmd = perl /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/testResults.pl /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix
+logdir /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs
+testlogdir /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/CalcFont.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/CalcFont.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest2.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest2.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/PageBreaks.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/PageBreaks.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/stringplusdouble.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/stringplusdouble.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Window.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Window.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/partition.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/partition.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/datevalue.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/datevalue.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/replace.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/replace.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/StrConv-test.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/StrConv-test.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Template.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Template.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/dateserial.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/dateserial.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/AutoFilter.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-2.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Ranges-2.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestCalc_Rangetest.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/TestCalc_Rangetest.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges-3.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Ranges-3.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Ranges.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Ranges.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/Shapes.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/Shapes.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestAddress.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/TestAddress.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/format.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/format.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/bytearraystring.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/bytearraystring.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/window2.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/window2.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscRangeTests.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/MiscRangeTests.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/pagesetup.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/pagesetup.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/range-4.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/range-4.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/MiscOperatorTests.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestIntersection.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/TestIntersection.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/TestUnion.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/TestUnion.log
+processing /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/TestDocuments/logs/unix/VariantTest.log /media/disk/Openoffice-BUILDS/UBERCWS/vbasupportdev300/sc/source/ui/vba/testvba/Logs/VariantTest.log
+skipped 1 test-cases(s)
+compared 27 test-case documents
+	 	 27 tests passedTests
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 626c0531e..6af5925b3 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -607,35 +607,35 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
     try
     {
 	uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-        switch( _cursor )
-        {
-            case excel::XlMousePointer::xlNorthwestArrow:
+            switch( _cursor )
             {
-                const Pointer& rPointer( POINTER_ARROW );
+                case excel::XlMousePointer::xlNorthwestArrow:
+                {
+                    const Pointer& rPointer( POINTER_ARROW );
                 setCursorHelper( xModel, rPointer, sal_False );
-                break;
-            }
-            case excel::XlMousePointer::xlWait:
-            case excel::XlMousePointer::xlIBeam:
-            {
-                const Pointer& rPointer( static_cast< PointerStyle >( _cursor ) );
-                //It will set the edit window, toobar and statusbar's mouse pointer.
+                    break;
+                }
+                case excel::XlMousePointer::xlWait:
+                case excel::XlMousePointer::xlIBeam:
+                {
+                    const Pointer& rPointer( static_cast< PointerStyle >( _cursor ) );
+                    //It will set the edit window, toobar and statusbar's mouse pointer.
                 setCursorHelper( xModel, rPointer, sal_True );
-                break;
-            }
-            case excel::XlMousePointer::xlDefault:
-            {
-                const Pointer& rPointer( POINTER_NULL );
+                    break;
+                }
+                case excel::XlMousePointer::xlDefault:
+                {
+                    const Pointer& rPointer( POINTER_NULL );
                 setCursorHelper( xModel, rPointer, sal_False );
-                break;
+                    break;
+                }
+                default:
+                    throw uno::RuntimeException( rtl::OUString( 
+                            RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() );
+                    // TODO: isn't this a flaw in the API? It should be allowed to throw an
+                    // IllegalArgumentException, or so
             }
-            default:
-                throw uno::RuntimeException( rtl::OUString( 
-                        RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() );
-                // TODO: isn't this a flaw in the API? It should be allowed to throw an
-                // IllegalArgumentException, or so
-        }        
-    }
+        }
     catch( const uno::Exception& )
     {
         DBG_UNHANDLED_EXCEPTION();
@@ -1125,10 +1125,10 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile )  throw ( uno::RuntimeExc
         uno::Reference< frame::XModel > xModel( getCurrentDocument() );
         ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
         pDoc->GetMacroManager()->SetUserFuncVolatile( pMeth->GetName(), bVolatile);
-    }
+}
 
 // this is bound to break when loading the document
-    return; 
+	return; 
 }
 
 ::sal_Bool SAL_CALL 
diff --git a/sc/source/ui/vba/vbabutton.cxx b/sc/source/ui/vba/vbabutton.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbabutton.hxx b/sc/source/ui/vba/vbabutton.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacheckbox.cxx b/sc/source/ui/vba/vbacheckbox.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacheckbox.hxx b/sc/source/ui/vba/vbacheckbox.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacollectionimpl.cxx b/sc/source/ui/vba/vbacollectionimpl.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacollectionimpl.hxx b/sc/source/ui/vba/vbacollectionimpl.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacolorformat.cxx b/sc/source/ui/vba/vbacolorformat.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacolorformat.hxx b/sc/source/ui/vba/vbacolorformat.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacombobox.cxx b/sc/source/ui/vba/vbacombobox.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacombobox.hxx b/sc/source/ui/vba/vbacombobox.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacommandbar.cxx b/sc/source/ui/vba/vbacommandbar.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacommandbar.hxx b/sc/source/ui/vba/vbacommandbar.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacommandbarcontrol.cxx b/sc/source/ui/vba/vbacommandbarcontrol.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacommandbarcontrol.hxx b/sc/source/ui/vba/vbacommandbarcontrol.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacommandbarcontrols.cxx b/sc/source/ui/vba/vbacommandbarcontrols.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacommandbarcontrols.hxx b/sc/source/ui/vba/vbacommandbarcontrols.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacommandbars.cxx b/sc/source/ui/vba/vbacommandbars.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacommandbars.hxx b/sc/source/ui/vba/vbacommandbars.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx
index 5d70dde5f..d9fce4616 100644
--- a/sc/source/ui/vba/vbacomment.cxx
+++ b/sc/source/ui/vba/vbacomment.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
 #include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
 #include <com/sun/star/sheet/XSheetCellRange.hpp>
+#include <com/sun/star/sheet/XCellAddressable.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/XCell.hpp>
 #include <com/sun/star/text/XText.hpp>
@@ -161,7 +162,6 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An
     aText >>= sText;
 
     uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY_THROW );
-    rtl::OUString sAnnoText = xAnnoText->getString();
 
     if ( aStart.hasValue() )
     {
@@ -194,8 +194,13 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An
             throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScVbaComment::Text - bad Start value " ) ), uno::Reference< uno::XInterface >() );
     }
     else if ( aText.hasValue() )
-        xAnnoText->setString( sText );
+	{
+		uno::Reference< sheet::XCellAddressable > xCellAddr(mxRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
+		table::CellAddress aAddress = xCellAddr->getCellAddress();
+		getAnnotations()->insertNew( aAddress, sText );
+	}
 
+	rtl::OUString sAnnoText = xAnnoText->getString();
     return sAnnoText;
 }
 
diff --git a/sc/source/ui/vba/vbacontrol.hxx b/sc/source/ui/vba/vbacontrol.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacontrols.cxx b/sc/source/ui/vba/vbacontrols.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbacontrols.hxx b/sc/source/ui/vba/vbacontrols.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index c8dd768ec..92274d7aa 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -32,42 +32,58 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-static const rtl::OUString aStringList[]=
+//liuchen 2009-7-27 
+//solve the problem that "Application.Dialogs.Item(***).Show" and "Application.Dialogs.Count" cannot get the correct result
+struct DialogMatch
 {
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Open" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatCellDialog" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertCell" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Print" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PasteSpecial" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolProtectionDocument" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColumnWidth" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineName" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConfigureDialog" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:HyperlinkDialog" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertGraphic" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertObject" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PageFormatDialog" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataSort" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:RowHeight" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoCorrectDlg" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConditionalFormatDialog" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataConsolidate" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CreateNames" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillSeries" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Validation") ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineLabelRange" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterAutoFilter" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterSpecialFilter" ) ),
-    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoFormat" ) )	
+	sal_Int32 		nVbaDlgIndex;
+	rtl::OUString	aOODlgName;
 };
 
-const sal_Int32 nDialogSize = sizeof( aStringList ) / sizeof( aStringList[ 0 ] );
+static const DialogMatch aDialogMatchList[] = 
+{
+	{ 1, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Open" ) ) },						// xlDialogOpen -> .uno:Open
+	{ -1, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatCellDialog" ) ) },			// ??? -> .uno:FormatCellDialog
+	{ 55, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertCell" ) ) },				// xlDialogInsert -> .uno:InsertCell
+	{ 8, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Print" ) ) },						// xlDialogPrint -> .uno:Print
+	{ 9,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrinterSetup" ) ) }, 				// xlDialogPrinterSetup -> .uno:PrinterSetup
+	{ 53, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PasteSpecial" ) ) },				// xlDialogPasteSpecial -> .uno:PasteSpecial
+	{ 28, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolProtectionDocument" ) ) },	// xlDialogProtectDocument -> uno:ToolProtectionDocument
+	{ 47,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColumnWidth" ) ) },				// xlDialogColumnWidth -> .uno:ColumnWidth
+	{ 61,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineName" ) ) },				// xlDialogDefineName -> .uno:DefineName
+	{ -1, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConfigureDialog" ) ) },			// ??? -> .uno:ConfigureDialog
+	{ 596, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:HyperlinkDialog" ) ) },			// xlDialogInsertHyperlink -> .uno:HyperlinkDialog
+	{ 342,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertGraphic" ) ) },				// xlDialogInsertPicture -> .uno:InsertGraphic
+	{ 259, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertObject" ) ) },				// xlDialogInsertObject -> .uno:InsertObject
+	{ 7,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PageFormatDialog" ) ) },			// xlDialogPageSetup -> .uno:PageFormatDialog
+	{ 39,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataSort" ) ) },					// xlDialogSort -> .uno:DataSort
+	{ 127, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:RowHeight" ) ) },					// xlDialogRowHeight -> .uno:RowHeight
+	{ 485,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoCorrectDlg" ) ) },			// xlDialogAutoCorrect -> .uno:AutoCorrectDlg
+	{ 583, 	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ConditionalFormatDialog" ) ) },	// xlDialogCondiationalFormatting -> .uno:ConditionalFormatDialog
+	{ 191,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataConsolidate" ) ) },			// xlDialogConsolidate -> .uno:DataConsolidate
+	{ 62,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CreateNames" ) ) },				// xlDialogCreateNames -> .uno:CreateNames
+	{ -1,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillSeries" ) ) },				// ??? -> .uno:FillSeries
+	{ -1,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Validation" ) ) },				// ??? -> .uno:Validation"
+	{ -1,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineLabelRange" ) ) },			// ??? -> .uno:DefineLabelRange
+	{ -1,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterAutoFilter" ) ) },		// ??? -> .uno:DataFilterAutoFilter
+	{ -1,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterSpecialFilter" ) ) }, 	// ??? -> .uno:DataFilterSpecialFilter
+	{ 269,	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoFormat" ) ) }					// xlDialogFormatAuto -> .uno:AutoFormat
+};
+
+const sal_Int32 nDialogSize = sizeof( aDialogMatchList ) / sizeof( aDialogMatchList[ 0 ] );
 
+//liuchen modified 2009-2-27
 rtl::OUString 
 ScVbaDialog::mapIndexToName( sal_Int32 nIndex )
 {
-    if( nIndex < nDialogSize )
-        return aStringList[ nIndex ];
+	for (int i = 0; i < nDialogSize; i++)
+	{
+		if ( aDialogMatchList[i].nVbaDlgIndex == nIndex )
+		{
+			return aDialogMatchList[i].aOODlgName;
+		}
+	}
+	
     return rtl::OUString();
 }
 
@@ -89,3 +105,9 @@ ScVbaDialog::getServiceNames()
     }
     return aServiceNames;
 }
+
+//liuchen add 2009-7-27
+sal_Int32 ScVbaDialog::GetSupportedDialogCount()
+{
+	return nDialogSize;
+}
\ No newline at end of file
diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx
index e35621be5..d62e9aa64 100644
--- a/sc/source/ui/vba/vbadialog.hxx
+++ b/sc/source/ui/vba/vbadialog.hxx
@@ -34,7 +34,7 @@
 #include <ooo/vba/excel/XDialog.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbadialogbase.hxx>
-
+ 
 typedef cppu::ImplInheritanceHelper1< VbaDialogBase, ov::excel::XDialog > ScVbaDialog_BASE;
 
 class ScVbaDialog : public ScVbaDialog_BASE
@@ -48,6 +48,9 @@ public:
     // XHelperInterface
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+
+	//liuchen 2009-7-27
+	static sal_Int32 GetSupportedDialogCount();
 };
 
 #endif /* SC_VBA_DIALOG_HXX */
diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx
index c5d92a8ac..f0841e40b 100644
--- a/sc/source/ui/vba/vbadialogs.cxx
+++ b/sc/source/ui/vba/vbadialogs.cxx
@@ -67,5 +67,13 @@ ScVbaDialogs::getServiceNames()
     return aServiceNames;
 }
 
+//liuchen 2009-7-27
+::sal_Int32
+ScVbaDialogs::getCount() throw (uno::RuntimeException)
+{	
+	return ScVbaDialog::GetSupportedDialogCount();
+}
+
+
 
 
diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx
index 32989a38e..e63f29b61 100644
--- a/sc/source/ui/vba/vbadialogs.hxx
+++ b/sc/source/ui/vba/vbadialogs.hxx
@@ -47,6 +47,7 @@ public:
 
     // XCollection
     virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
+	virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); //liuchen 2009-7-27
 
     // XDialogs
     virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbafillformat.cxx b/sc/source/ui/vba/vbafillformat.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbafillformat.hxx b/sc/source/ui/vba/vbafillformat.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index 22e3f52e7..8a1821e8d 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -241,7 +241,7 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep
         {
         nIndex = 1;  // check defualt ( assume black )
                 ScVbaFont_BASE::setColorIndex( uno::makeAny( nIndex ) );
-        }
+}
         else
             ScVbaFont_BASE::setColorIndex( _colorindex );
 }
@@ -250,12 +250,11 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep
 uno::Any SAL_CALL
 ScVbaFont::getColorIndex() throw ( uno::RuntimeException )
 {
-    sal_Int32 nColor = 0;
     if ( GetDataSet() )
         if (  GetDataSet()->GetItemState( ATTR_FONT_COLOR, TRUE, NULL) == SFX_ITEM_DONTCARE )
             return aNULL();
 	return ScVbaFont_BASE::getColorIndex();
-}
+        }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 void  SAL_CALL
diff --git a/sc/source/ui/vba/vbaframe.cxx b/sc/source/ui/vba/vbaframe.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbaframe.hxx b/sc/source/ui/vba/vbaframe.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index 8533e8ac5..6c6e5380e 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -80,7 +80,7 @@ ScVbaGlobals::getApplication() throw (uno::RuntimeException)
 //	OSL_TRACE("In ScVbaGlobals::getApplication");	
         if ( !mxApplication.is() )
 	    mxApplication.set( new ScVbaApplication( mxContext) );
-   	return mxApplication; 
+    return mxApplication;
 }
 
 uno::Reference< excel::XWorkbook > SAL_CALL 
@@ -130,14 +130,14 @@ ScVbaGlobals::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException)
 uno::Any SAL_CALL 
 ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException)
 {
-    return getApplication()->Range( Cell1, Cell2 );
+	return getApplication()->Range( Cell1, Cell2 );
 }
 
 uno::Any SAL_CALL
 ScVbaGlobals::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException )
-{
-    return getApplication()->Names( aIndex );
-}
+    {
+	return getApplication()->Names( aIndex );
+    }
 
 uno::Reference< excel::XRange > SAL_CALL 
 ScVbaGlobals::getActiveCell() throw (uno::RuntimeException)
@@ -179,7 +179,7 @@ ScVbaGlobals::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException)
 	return getApplication()->getActiveSheet()->Columns( aIndex );
 }
 
-uno::Any SAL_CALL 
+uno::Any SAL_CALL
 ScVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
 {
 	uno::Reference< XApplicationBase > xBase( getApplication(), uno::UNO_QUERY_THROW );
diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx
index 9e508edac..ed2116ce6 100644
--- a/sc/source/ui/vba/vbaglobals.hxx
+++ b/sc/source/ui/vba/vbaglobals.hxx
@@ -48,7 +48,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc
 
     class ScVbaGlobals : public ScVbaGlobals_BASE
     {
-        css::uno::Reference< ov::excel::XApplication > mxApplication;
+            css::uno::Reference< ov::excel::XApplication > mxApplication;
         virtual css::uno::Reference<
  ov::excel::XApplication > SAL_CALL getApplication()
                         throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbahelper.hxx b/sc/source/ui/vba/vbahelper.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbahelperinterface.hxx b/sc/source/ui/vba/vbahelperinterface.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbaimage.cxx b/sc/source/ui/vba/vbaimage.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbaimage.hxx b/sc/source/ui/vba/vbaimage.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 499ded012..6a2ce4da9 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -162,7 +162,7 @@ ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno
 {
     sal_Int32 nIndex = 0;
     _colorindex >>= nIndex;
-
+    
     // hackly for excel::XlColorIndex::xlColorIndexNone
     if( nIndex == excel::XlColorIndex::xlColorIndexNone )
     {
@@ -170,11 +170,11 @@ ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno
     }
     else
     {
-	    // setColor expects colors in XL RGB values
-    	// #FIXME this is daft we convert OO RGB val to XL RGB val and
-	    // then back again to OO RGB value
-    	setColor( OORGBToXLRGB( GetIndexColor( nIndex ) ) );
-    }
+    // setColor expects colors in XL RGB values
+    // #FIXME this is daft we convert OO RGB val to XL RGB val and
+    // then back again to OO RGB value
+    setColor( OORGBToXLRGB( GetIndexColor( nIndex ) ) );
+}
 }
 uno::Any
 ScVbaInterior::GetIndexColor( const sal_Int32& nColorIndex )
diff --git a/sc/source/ui/vba/vbalabel.cxx b/sc/source/ui/vba/vbalabel.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbalabel.hxx b/sc/source/ui/vba/vbalabel.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbalineformat.cxx b/sc/source/ui/vba/vbalineformat.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbalineformat.hxx b/sc/source/ui/vba/vbalineformat.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbalistbox.cxx b/sc/source/ui/vba/vbalistbox.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbalistbox.hxx b/sc/source/ui/vba/vbalistbox.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbalistcontrolhelper.cxx b/sc/source/ui/vba/vbalistcontrolhelper.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbalistcontrolhelper.hxx b/sc/source/ui/vba/vbalistcontrolhelper.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbamultipage.cxx b/sc/source/ui/vba/vbamultipage.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbamultipage.hxx b/sc/source/ui/vba/vbamultipage.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx
index 29d6b2309..11e7097dc 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -118,10 +118,13 @@ sal_Int32 SAL_CALL RangePageBreaks::getCount(  ) throw (uno::RuntimeException)
     for( sal_Int32 i=0; i<nLength; i++ )
     {
         sal_Int32 nPos = aTablePageBreakData[i].Position;
-        if( nPos > nUsedEnd )
+
+		// VBA. minz@cn.ibm.com. All page breaks before the used range should be counted. 
+		// And the page break at the end of the used range also should be counted.
+		if(  nPos <= nUsedEnd + 1 )
+			nCount++;
+		else
             return nCount;
-        if( nPos >= nUsedStart )
-            nCount++;
     }
 
     return nCount;
@@ -156,17 +159,9 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI
     uno::Sequence<sheet::TablePageBreakData> aTablePageBreakDataList = getAllPageBreaks();
 
     sal_Int32 nLength = aTablePageBreakDataList.getLength();
-    for( sal_Int32 i=0; i<nLength; i++ )
-    {
-        aTablePageBreakData = aTablePageBreakDataList[i];
-        sal_Int32 nPos = aTablePageBreakData.Position;
-        if( nPos >= nUsedStart )
-            index++;
-        if( nPos > nUsedEnd )
-            DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
-        if( index == nAPIItemIndex )
-            return aTablePageBreakData;
-    }
+    //VBA. minz@cn.ibm.com. No need to filter the page break. All page breaks before the used range are counted.
+    if ( nAPIItemIndex < nLength && nAPIItemIndex>=0 )
+        aTablePageBreakData = aTablePageBreakDataList[nAPIItemIndex];
 
     return aTablePageBreakData;
 }
diff --git a/sc/source/ui/vba/vbapages.cxx b/sc/source/ui/vba/vbapages.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbapages.hxx b/sc/source/ui/vba/vbapages.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index aff8bad5c..6d78b6c67 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -127,22 +127,22 @@ void SAL_CALL ScVbaPageSetup::setPrintArea( const rtl::OUString& rAreas ) throw
 double SAL_CALL ScVbaPageSetup::getHeaderMargin() throw (css::uno::RuntimeException)
 {
     return VbaPageSetupBase::getHeaderMargin();
-}
-
+    }
+    
 void SAL_CALL ScVbaPageSetup::setHeaderMargin( double margin ) throw (css::uno::RuntimeException)
 {
     VbaPageSetupBase::setHeaderMargin( margin );
-}
+    }
 
 double SAL_CALL ScVbaPageSetup::getFooterMargin() throw (css::uno::RuntimeException)
 {
     return VbaPageSetupBase::getFooterMargin();
-}
-
+    }
+    
 void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) throw (css::uno::RuntimeException)
 {
     VbaPageSetupBase::setFooterMargin( margin );
-}
+    }
 
 uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() throw (css::uno::RuntimeException)
 {
diff --git a/sc/source/ui/vba/vbapictureformat.cxx b/sc/source/ui/vba/vbapictureformat.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbapictureformat.hxx b/sc/source/ui/vba/vbapictureformat.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbaprogressbar.cxx b/sc/source/ui/vba/vbaprogressbar.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbaprogressbar.hxx b/sc/source/ui/vba/vbaprogressbar.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbaradiobutton.cxx b/sc/source/ui/vba/vbaradiobutton.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbaradiobutton.hxx b/sc/source/ui/vba/vbaradiobutton.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index ea42beced..3d2209ebe 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -94,6 +94,8 @@
 #include <com/sun/star/sheet/XSubTotalDescriptor.hpp>
 #include <com/sun/star/sheet/GeneralFunction.hdl>
 
+#include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
+#include <com/sun/star/sheet/XSheetAnnotations.hpp>
 #include <ooo/vba/excel/XlPasteSpecialOperation.hpp>
 #include <ooo/vba/excel/XlPasteType.hpp>
 #include <ooo/vba/excel/Constants.hpp>
@@ -1465,25 +1467,25 @@ void
 ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException)
 {
     // #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO                        	// results in "=$a$1:a1", temporalily disable conversion
-	setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_ENGLISH_XL_A1 );;
+    setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );;
 }
 
 uno::Any
 ScVbaRange::getFormulaR1C1() throw (::com::sun::star::uno::RuntimeException)
 {
-	return getFormulaValue( formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1 );
+    return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
 }
 
 void
 ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeException)
 {
-	setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1 );
+    setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
 }
 
 uno::Any
 ScVbaRange::getFormula() throw (::com::sun::star::uno::RuntimeException)
 {
-	return getFormulaValue( formula::FormulaGrammar::GRAM_ENGLISH_XL_A1 );
+    return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
 }
 
 sal_Int32 
@@ -1740,7 +1742,16 @@ ScVbaRange::getFormulaArray() throw (uno::RuntimeException)
     uno::Reference< sheet::XCellRangeFormula> xCellRangeFormula( mxRange, uno::UNO_QUERY_THROW );
     uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
     uno::Any aMatrix;
+
+	//VBA, minz@cn.ibm.com
+	uno::Sequence< uno::Sequence<rtl::OUString> > aFmArray = xCellRangeFormula->getFormulaArray();
+	if( aFmArray.getLength() )
+	{
+		if( aFmArray.getLength() == 1 && aFmArray[0].getLength() == 1 )
+			aMatrix <<= aFmArray[0][0];
+		else	
     aMatrix = xConverter->convertTo( uno::makeAny( xCellRangeFormula->getFormulaArray() ) , getCppuType((uno::Sequence< uno::Sequence< uno::Any > >*)0)  ) ;
+	}	
     return aMatrix;
 }
 
@@ -2029,7 +2040,7 @@ ScVbaRange::Activate() throw (uno::RuntimeException)
     table::CellRangeAddress thisRangeAddress = xThisRangeAddress->getRangeAddress();
         uno::Reference< frame::XModel > xModel;	
         ScDocShell* pShell = getScDocShell();
-
+    
         if ( pShell )
             xModel = pShell->GetModel();
 
@@ -2243,7 +2254,8 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException)
         uno::Reference< sheet::XCellRangeAddressable > xSource( mxRange, uno::UNO_QUERY);
         xMover->moveRange( xDestination->getCellAddress(), xSource->getRangeAddress() );
     }
-    {
+	//VBA, minz@cn.ibm.com.
+	else {
 		uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
         Select();
 		excel::implnCut( xModel );
@@ -2631,10 +2643,11 @@ ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException)
 {
 
     uno::Reference< excel::XComment > xComment( new ScVbaComment( this, mxContext, mxRange ) );
-    // if you don't pass a valid text or if there is already a comment
-    // associated with the range then return NULL
-    if ( !xComment->Text( Text, uno::Any(), uno::Any() ).getLength() 
-    ||   xComment->Text( uno::Any(), uno::Any(), uno::Any() ).getLength() )
+        // if there is existing text then error
+	if ( Text.hasValue() && xComment->Text( uno::Any(), uno::Any(), uno::Any() ).getLength() )
+            throw uno::RuntimeException(); 
+        // failed to write text? ( can this happen ?? )
+	if ( !xComment->Text( Text, uno::Any(), uno::Any() ).getLength()  )
         return NULL;
     return xComment;
 }
@@ -3301,7 +3314,7 @@ ScVbaRange::End( ::sal_Int32 Direction )  throw (uno::RuntimeException)
     xOldActiveCell->Select();
 
     uno::Reference< excel::XRange > resultCell;
-	
+
 	resultCell.set( xApplication->getActiveSheet()->Range( uno::makeAny( sMoved ), aVoid ), uno::UNO_QUERY_THROW );
 
     // return result
@@ -3731,16 +3744,16 @@ ScVbaRange::getPageBreak() throw (uno::RuntimeException)
         {
             ScDocument* pDoc =  getDocumentFromRange( mxRange );
             
-            BYTE nFlag = 0;
+            ScBreakType nBreak = BREAK_NONE;
             if ( !bColumn )
-                nFlag = pDoc -> GetRowFlags(thisAddress.StartRow, thisAddress.Sheet);
+                nBreak = pDoc->HasRowBreak(thisAddress.StartRow, thisAddress.Sheet);
             else
-                nFlag = pDoc -> GetColFlags(static_cast<SCCOL>(thisAddress.StartColumn), thisAddress.Sheet);
+                nBreak = pDoc->HasColBreak(thisAddress.StartColumn, thisAddress.Sheet);
                 
-            if ( nFlag & CR_PAGEBREAK)
+            if (nBreak & BREAK_PAGE)
                 nPageBreak = excel::XlPageBreak::xlPageBreakAutomatic;
                 
-            if ( nFlag & CR_MANUALBREAK)
+            if (nBreak & BREAK_MANUAL)
                 nPageBreak = excel::XlPageBreak::xlPageBreakManual;
         }		
     }
@@ -4415,7 +4428,7 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (u
 	 	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getDocShellFromRange( mxRange ) , aRange ) );
 		uno::Reference< excel::XRange > xVbaRange( new ScVbaRange( getParent(), mxContext, xRange, mbIsRows, mbIsColumns ) );	
 		xVbaRange->PasteSpecial( uno::Any(), uno::Any(), uno::Any(), uno::Any() );
-	}
+}
 }
 
 void SAL_CALL
diff --git a/sc/source/ui/vba/vbarange.cxx.pathched b/sc/source/ui/vba/vbarange.cxx.pathched
new file mode 100644
index 000000000..388f1cb18
--- /dev/null
+++ b/sc/source/ui/vba/vbarange.cxx.pathched
@@ -0,0 +1,5441 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: vbarange.cxx,v $
+ * $Revision: 1.8.30.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include <vbahelper/helperdecl.hxx>
+
+#include <comphelper/unwrapargs.hxx>
+#include <comphelper/processfactory.hxx>
+#include <sfx2/objsh.hxx>
+
+#include <com/sun/star/script/ArrayWrapper.hpp>
+#include <com/sun/star/sheet/XDatabaseRange.hpp>
+#include <com/sun/star/sheet/XDatabaseRanges.hpp>
+#include <com/sun/star/sheet/XGoalSeek.hpp>
+#include <com/sun/star/sheet/XSheetOperation.hpp>
+#include <com/sun/star/sheet/CellFlags.hpp>
+#include <com/sun/star/table/XColumnRowRange.hpp>
+#include <com/sun/star/sheet/XCellAddressable.hpp>
+#include <com/sun/star/table/CellContentType.hpp>
+#include <com/sun/star/sheet/XCellSeries.hpp>
+#include <com/sun/star/text/XTextRange.hpp>
+#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/sheet/XSpreadsheetView.hpp>
+#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
+#include <com/sun/star/sheet/XSheetCellRange.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XSheetCellCursor.hpp>
+#include <com/sun/star/sheet/XArrayFormulaRange.hpp>
+#include <com/sun/star/sheet/XNamedRange.hpp>
+#include <com/sun/star/sheet/XPrintAreas.hpp>
+#include <com/sun/star/sheet/XCellRangesQuery.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/sheet/XFunctionAccess.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/table/XCellCursor.hpp>
+#include <com/sun/star/table/XTableRows.hpp>
+#include <com/sun/star/table/XTableColumns.hpp>
+#include <com/sun/star/table/TableSortField.hpp>
+#include <com/sun/star/util/XMergeable.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/util/XNumberFormats.hpp>
+#include <com/sun/star/util/NumberFormat.hpp>
+#include <com/sun/star/util/XNumberFormatTypes.hpp>
+#include <com/sun/star/util/XReplaceable.hpp>
+#include <com/sun/star/util/XSortable.hpp>
+#include <com/sun/star/sheet/XCellRangeMovement.hpp>
+#include <com/sun/star/sheet/XCellRangeData.hpp>
+#include <com/sun/star/sheet/FormulaResult.hpp>
+#include <com/sun/star/sheet/FilterOperator2.hpp>
+#include <com/sun/star/sheet/TableFilterField.hpp>
+#include <com/sun/star/sheet/TableFilterField2.hpp>
+#include <com/sun/star/sheet/XSheetFilterDescriptor2.hpp>
+#include <com/sun/star/sheet/XSheetFilterable.hpp>
+#include <com/sun/star/sheet/FilterConnection.hpp>
+#include <com/sun/star/util/CellProtection.hpp>
+
+#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
+#include <com/sun/star/awt/XDevice.hpp>
+
+//#include <com/sun/star/sheet/CellDeleteMode.hpp>
+#include <com/sun/star/sheet/XCellRangeMovement.hpp>
+#include <com/sun/star/sheet/XSubTotalCalculatable.hpp>
+#include <com/sun/star/sheet/XSubTotalDescriptor.hpp>
+#include <com/sun/star/sheet/GeneralFunction.hdl>
+
+#include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
+#include <com/sun/star/sheet/XSheetAnnotations.hpp>
+#include <ooo/vba/excel/XlPasteSpecialOperation.hpp>
+#include <ooo/vba/excel/XlPasteType.hpp>
+#include <ooo/vba/excel/Constants.hpp>
+#include <ooo/vba/excel/XlFindLookIn.hpp>
+#include <ooo/vba/excel/XlLookAt.hpp>
+#include <ooo/vba/excel/XlSearchOrder.hpp>
+#include <ooo/vba/excel/XlSortOrder.hpp>
+#include <ooo/vba/excel/XlYesNoGuess.hpp>
+#include <ooo/vba/excel/XlSortOrientation.hpp>
+#include <ooo/vba/excel/XlSortMethod.hpp>
+#include <ooo/vba/excel/XlDirection.hpp>
+#include <ooo/vba/excel/XlSortDataOption.hpp>
+#include <ooo/vba/excel/XlDeleteShiftDirection.hpp>
+#include <ooo/vba/excel/XlInsertShiftDirection.hpp>
+#include <ooo/vba/excel/XlReferenceStyle.hpp>
+#include <ooo/vba/excel/XlBordersIndex.hpp>
+#include <ooo/vba/excel/XlPageBreak.hpp>
+#include <ooo/vba/excel/XlAutoFilterOperator.hpp>
+#include <ooo/vba/excel/XlAutoFillType.hpp>
+#include <ooo/vba/excel/XlTextParsingType.hpp>
+#include <ooo/vba/excel/XlTextQualifier.hpp>
+#include <ooo/vba/excel/XlCellType.hpp>
+#include <ooo/vba/excel/XlSpecialCellsValue.hpp>
+#include <ooo/vba/excel/XlConsolidationFunction.hpp>
+#include <ooo/vba/excel/XlSearchDirection.hpp>
+
+#include <scitems.hxx>
+#include <svx/srchitem.hxx>
+#include <cellsuno.hxx>
+#include <dbcolect.hxx>
+#include "docfunc.hxx"
+
+#include <sfx2/dispatch.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/bindings.hxx>
+#include <sfx2/request.hxx>
+#include <sfx2/viewfrm.hxx>
+#include <sfx2/itemwrapper.hxx>
+#include <sc.hrc>
+#include <globstr.hrc>
+#include <unonames.hxx>
+
+#include "vbarange.hxx"
+#include "vbafont.hxx"
+#include "vbacomment.hxx"
+#include "vbainterior.hxx"
+#include "vbacharacters.hxx"
+#include "vbaborders.hxx"
+#include "vbaworksheet.hxx"
+#include "vbavalidation.hxx"
+
+#include "tabvwsh.hxx"
+#include "rangelst.hxx"
+#include "convuno.hxx"
+#include "compiler.hxx"
+#include "attrib.hxx"
+#include "undodat.hxx"
+#include "dbdocfun.hxx"
+#include "patattr.hxx"
+#include "olinetab.hxx"
+#include <comphelper/anytostring.hxx>
+
+#include <global.hxx>
+
+#include "vbaglobals.hxx"
+#include "vbastyle.hxx"
+#include <vector>
+#include <vbahelper/vbacollectionimpl.hxx>
+// begin test includes
+#include <com/sun/star/sheet/FunctionArgument.hpp>
+// end test includes
+
+#include <ooo/vba/excel/Range.hpp>
+#include <com/sun/star/bridge/oleautomation/Date.hpp>
+
+using namespace ::ooo::vba;
+using namespace ::com::sun::star;
+using ::std::vector;
+
+//    * 1 point = 1/72 inch = 20 twips
+//    * 1 inch = 72 points = 1440 twips
+//    * 1 cm = 567 twips
+double lcl_hmmToPoints( double nVal ) { return ( (double)((nVal /1000 ) * 567 ) / 20 ); }
+
+static const sal_Int16 supportedIndexTable[] = {  excel::XlBordersIndex::xlEdgeLeft, excel::XlBordersIndex::xlEdgeTop, excel::XlBordersIndex::xlEdgeBottom, excel::XlBordersIndex::xlEdgeRight, excel::XlBordersIndex::xlDiagonalDown, excel::XlBordersIndex::xlDiagonalUp, excel::XlBordersIndex::xlInsideVertical, excel::XlBordersIndex::xlInsideHorizontal };
+
+USHORT lcl_pointsToTwips( double nVal ) 
+{ 
+	nVal = nVal * static_cast<double>(20);
+	short nTwips = static_cast<short>(nVal);
+	return nTwips;
+}
+double lcl_TwipsToPoints( USHORT nVal ) 
+{ 
+	double nPoints = nVal;
+	return nPoints / 20; 
+}
+
+double lcl_Round2DecPlaces( double nVal )
+{
+	nVal  = (nVal * (double)100);
+	long tmp = static_cast<long>(nVal);
+	if ( ( ( nVal - tmp ) >= 0.5 ) )
+		++tmp;
+	nVal = tmp;
+	nVal = nVal/100;
+	return nVal;
+}
+
+uno::Any lcl_makeRange( uno::Reference< uno::XComponentContext >& xContext, const uno::Any aAny, bool bIsRows, bool bIsColumns )
+{
+	uno::Reference< table::XCellRange > xCellRange( aAny, uno::UNO_QUERY_THROW );
+	// #FIXME need proper (WorkSheet) parent
+	return uno::makeAny( uno::Reference< excel::XRange >( new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xCellRange, bIsRows, bIsColumns ) ) );
+}
+
+uno::Reference< excel::XRange > lcl_makeXRangeFromSheetCellRanges( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRanges >& xLocSheetCellRanges, ScDocShell* pDoc )
+{
+	uno::Reference< excel::XRange > xRange;
+	uno::Sequence< table::CellRangeAddress  > sAddresses = xLocSheetCellRanges->getRangeAddresses();
+	ScRangeList aCellRanges;
+	sal_Int32 nLen = sAddresses.getLength();
+	if ( nLen )
+       	{ 
+	for ( sal_Int32 index = 0; index < nLen; ++index )
+	{
+		ScRange refRange;
+		ScUnoConversion::FillScRange( refRange, sAddresses[ index ] );
+		aCellRanges.Append( refRange );
+	}
+	// Single range
+	if ( aCellRanges.First() == aCellRanges.Last() )
+	{
+		uno::Reference< table::XCellRange > xTmpRange( new ScCellRangeObj( pDoc, *aCellRanges.First() ) );
+		// #FIXME need proper (WorkSheet) parent
+		xRange = new ScVbaRange( xParent, xContext, xTmpRange );
+	}
+	else
+	{
+		uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pDoc, aCellRanges ) );
+		// #FIXME need proper (WorkSheet) parent
+		xRange = new ScVbaRange( xParent, xContext, xRanges );
+	}
+	}
+	return xRange;
+}
+
+ScCellRangeObj*  ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException )
+{
+	uno::Reference< uno::XInterface > xIf;
+	if ( mxRanges.is() )
+		xIf.set( mxRanges, uno::UNO_QUERY_THROW );
+	else 
+		xIf.set( mxRange, uno::UNO_QUERY_THROW );
+	ScCellRangeObj* pUnoCellRange = dynamic_cast< ScCellRangeObj* >( xIf.get() );
+	return pUnoCellRange;
+}
+
+SfxItemSet*  ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException )
+{
+	ScCellRangeObj* pUnoCellRange = getCellRangeObj();
+	SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
+	if ( !pDataSet )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for range" ) ), uno::Reference< uno::XInterface >() );
+	return pDataSet;	
+}
+
+class SingleRangeEnumeration : public EnumerationHelper_BASE
+{
+	uno::Reference< table::XCellRange > m_xRange;
+	uno::Reference< uno::XComponentContext > mxContext;
+	bool bHasMore;
+public:
+
+	SingleRangeEnumeration( const uno::Reference< css::uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) : m_xRange( xRange ), mxContext( xContext ), bHasMore( true ) { }
+	virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException) { return bHasMore; }
+	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
+	{
+		if ( !bHasMore )
+			throw container::NoSuchElementException();
+		bHasMore = false;
+		return uno::makeAny( m_xRange );
+	}
+};
+
+// very simple class to pass to ScVbaCollectionBaseImpl containing
+// just one item
+typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > SingleRange_BASE;
+
+class SingleRangeIndexAccess : public SingleRange_BASE
+{
+private:
+	uno::Reference< table::XCellRange > m_xRange;
+	uno::Reference< uno::XComponentContext > mxContext;
+	SingleRangeIndexAccess(); // not defined
+public:
+	SingleRangeIndexAccess( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ):m_xRange( xRange ), mxContext( xContext ) {}
+	// XIndexAccess
+	virtual ::sal_Int32 SAL_CALL getCount() throw (::uno::RuntimeException) { return 1; }
+	virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
+	{ 
+		if ( Index != 0 )
+			throw lang::IndexOutOfBoundsException();
+		return uno::makeAny( m_xRange ); 
+	}
+        // XElementAccess
+        virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException){ return table::XCellRange::static_type(0); }
+ 
+        virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException) { return sal_True; }
+	// XEnumerationAccess
+	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException) { return new SingleRangeEnumeration( mxContext, m_xRange ); }
+
+};
+
+
+
+class RangesEnumerationImpl : public EnumerationHelperImpl
+{
+	bool mbIsRows;
+	bool mbIsColumns;
+public:
+
+	RangesEnumerationImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, bool bIsRows, bool bIsColumns ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {}
+	virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) 
+	{ 
+		return lcl_makeRange( m_xContext, m_xEnumeration->nextElement(), mbIsRows, mbIsColumns );
+	}
+};
+
+
+class ScVbaRangeAreas : public ScVbaCollectionBaseImpl
+{
+	bool mbIsRows;
+	bool mbIsColumns;
+public:
+	ScVbaRangeAreas( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, bool bIsRows, bool bIsColumns ) : ScVbaCollectionBaseImpl( uno::Reference< XHelperInterface >(), xContext, xIndexAccess ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {}
+
+	// XEnumerationAccess
+	virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException);
+
+	// XElementAccess
+	virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException){ return excel::XRange::static_type(0); }
+
+	virtual uno::Any createCollectionObject( const uno::Any& aSource );
+
+	virtual rtl::OUString& getServiceImplName() { static rtl::OUString sDummy; return sDummy; }
+
+	virtual uno::Sequence< rtl::OUString > getServiceNames() { return uno::Sequence< rtl::OUString >(); } 
+
+}; 
+
+uno::Reference< container::XEnumeration > SAL_CALL 
+ScVbaRangeAreas::createEnumeration() throw (uno::RuntimeException)
+{
+	uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
+	return new RangesEnumerationImpl( mxContext, xEnumAccess->createEnumeration(), mbIsRows, mbIsColumns );
+
+}
+
+uno::Any 
+ScVbaRangeAreas::createCollectionObject( const uno::Any& aSource )
+{
+	return lcl_makeRange( mxContext, aSource, mbIsRows, mbIsColumns );
+}
+
+// assume that xIf is infact a ScCellRangesBase
+ScDocShell*
+getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException )
+{
+	ScCellRangesBase* pUno= dynamic_cast< ScCellRangesBase* >( xIf.get() );
+	if ( !pUno )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying uno range object" ) ), uno::Reference< uno::XInterface >()  );
+	return pUno->GetDocShell();
+}
+
+ScDocShell* 
+getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
+{
+	// need the ScCellRangesBase to get docshell
+	uno::Reference< uno::XInterface > xIf( xRange, uno::UNO_QUERY_THROW );
+	return getDocShellFromIf(xIf );
+}
+
+uno::Reference< frame::XModel > getModelFromXIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException )
+{
+	ScDocShell* pDocShell = getDocShellFromIf(xIf );
+	return pDocShell->GetModel();
+}
+
+uno::Reference< frame::XModel > getModelFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
+{
+	uno::Reference< uno::XInterface > xIf( xRange, uno::UNO_QUERY_THROW );
+	return getModelFromXIf( xIf );
+}
+
+ScDocument* 
+getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange )
+{
+	ScDocShell* pDocShell = getDocShellFromRange( xRange );
+	if ( !pDocShell )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying docshell from uno range object" ) ), uno::Reference< uno::XInterface >() );
+	ScDocument* pDoc = pDocShell->GetDocument();
+	return pDoc;
+}
+
+
+ScDocument* 
+ScVbaRange::getScDocument()
+{
+	if ( mxRanges.is() )
+	{
+		uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW );
+		uno::Reference< table::XCellRange > xRange( xIndex->getByIndex( 0 ), uno::UNO_QUERY_THROW );
+		return getDocumentFromRange( xRange );
+	}
+	return getDocumentFromRange( mxRange );
+}
+
+ScDocShell* 
+ScVbaRange::getScDocShell()
+{
+	if ( mxRanges.is() )
+	{
+		uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW );
+		uno::Reference< table::XCellRange > xRange( xIndex->getByIndex( 0 ), uno::UNO_QUERY_THROW );
+		return getDocShellFromRange( xRange );
+	}
+	return getDocShellFromRange( mxRange );
+}
+
+class NumFormatHelper
+{
+	uno::Reference< util::XNumberFormatsSupplier > mxSupplier;
+	uno::Reference< beans::XPropertySet > mxRangeProps;
+	uno::Reference< util::XNumberFormats > mxFormats;
+public:
+	NumFormatHelper( const uno::Reference< table::XCellRange >& xRange )
+	{
+		mxSupplier.set( getModelFromRange( xRange ), uno::UNO_QUERY_THROW );
+		mxRangeProps.set( xRange, uno::UNO_QUERY_THROW);
+		mxFormats = mxSupplier->getNumberFormats();
+	}
+	uno::Reference< beans::XPropertySet > getNumberProps()
+	{	
+		long nIndexKey = 0;
+		uno::Any aValue = mxRangeProps->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberFormat")));
+		aValue >>= nIndexKey;
+
+		if ( mxFormats.is() )
+			return  mxFormats->getByKey( nIndexKey );
+		return	uno::Reference< beans::XPropertySet > ();
+	}
+
+	bool isBooleanType()
+	{
+	
+		if ( getNumberFormat() & util::NumberFormat::LOGICAL )
+			return true;
+		return false;
+	}
+
+	bool isDateType()
+	{
+		sal_Int16 nType = getNumberFormat();
+		if(( nType & util::NumberFormat::DATETIME ))
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	rtl::OUString getNumberFormatString()
+	{
+		uno::Reference< uno::XInterface > xIf( mxRangeProps, uno::UNO_QUERY_THROW );
+		ScCellRangeObj* pUnoCellRange = dynamic_cast<  ScCellRangeObj* >( xIf.get() );
+		if ( pUnoCellRange )
+		{
+			
+			SfxItemSet* pDataSet = 	excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
+			SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, TRUE, NULL);
+			// one of the cells in the range is not like the other ;-)
+			// so return a zero length format to indicate that
+			if ( eState == SFX_ITEM_DONTCARE )
+				return rtl::OUString();
+		}
+		
+	
+		uno::Reference< beans::XPropertySet > xNumberProps( getNumberProps(), uno::UNO_QUERY_THROW );
+		::rtl::OUString aFormatString;
+		uno::Any aString = xNumberProps->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FormatString")));
+		aString >>= aFormatString;
+		return aFormatString;
+	}
+
+	sal_Int16 getNumberFormat()
+	{
+		uno::Reference< beans::XPropertySet > xNumberProps = getNumberProps(); 	
+		sal_Int16 nType = ::comphelper::getINT16(
+        	xNumberProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) );
+		return nType;
+	}
+
+	bool setNumberFormat( const  rtl::OUString& rFormat )
+	{
+		lang::Locale aLocale;
+		uno::Reference< beans::XPropertySet > xNumProps = getNumberProps(); 	
+		xNumProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Locale" ) ) >>= aLocale;
+		sal_Int32 nNewIndex = mxFormats->queryKey(rFormat, aLocale, false );
+		if ( nNewIndex == -1 ) // format not defined
+		{
+			nNewIndex = mxFormats->addNew( rFormat, aLocale );
+		}
+		mxRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberFormat") ), uno::makeAny( nNewIndex ) );				
+		return true;
+	}
+
+	bool setNumberFormat( sal_Int16 nType )
+	{
+		uno::Reference< beans::XPropertySet > xNumberProps = getNumberProps(); 	
+		lang::Locale aLocale;
+		xNumberProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Locale" ) ) >>= aLocale;
+		uno::Reference<util::XNumberFormatTypes> xTypes( mxFormats, uno::UNO_QUERY );
+		if ( xTypes.is() )
+		{
+			sal_Int32 nNewIndex = xTypes->getStandardFormat( nType, aLocale );
+       		mxRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberFormat") ), uno::makeAny( nNewIndex ) );				
+			return true;
+		}
+		return false;
+	}
+
+};
+
+struct CellPos
+{
+	CellPos():m_nRow(-1), m_nCol(-1), m_nArea(0) {};
+	CellPos( sal_Int32 nRow, sal_Int32 nCol, sal_Int32 nArea ):m_nRow(nRow), m_nCol(nCol), m_nArea( nArea ) {};
+sal_Int32 m_nRow;
+sal_Int32 m_nCol;
+sal_Int32 m_nArea;
+};
+
+typedef ::cppu::WeakImplHelper1< container::XEnumeration > CellsEnumeration_BASE;
+typedef ::std::vector< CellPos > vCellPos;
+
+// #FIXME - QUICK
+// we could probably could and should modify CellsEnumeration below
+// to handle rows and columns ( but I do this seperately for now 
+// and.. this class only handles singe areas ( does it have to handle
+// multi area ranges?? ) 
+class ColumnsRowEnumeration: public CellsEnumeration_BASE
+{
+	uno::Reference< uno::XComponentContext > mxContext;
+        uno::Reference< excel::XRange > mxRange;
+	sal_Int32 mMaxElems;
+	sal_Int32 mCurElem;
+        
+public:
+	ColumnsRowEnumeration( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XRange >& xRange, sal_Int32 nElems ) : mxContext( xContext ), mxRange( xRange ), mMaxElems( nElems ), mCurElem( 0 )
+        {
+	}
+
+	virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException){ return mCurElem < mMaxElems; }
+
+	virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+	{
+		if ( !hasMoreElements() )
+			throw container::NoSuchElementException();
+		sal_Int32 vbaIndex = 1 + mCurElem++; 
+		return uno::makeAny( mxRange->Item( uno::makeAny( vbaIndex ), uno::Any() ) ); 
+	}
+};
+
+class CellsEnumeration : public CellsEnumeration_BASE
+{
+	uno::Reference< uno::XComponentContext > mxContext;
+	uno::Reference< XCollection > m_xAreas;
+	vCellPos m_CellPositions;	
+	vCellPos::const_iterator m_it; 
+	uno::Reference< table::XCellRange > getArea( sal_Int32 nVBAIndex ) throw ( uno::RuntimeException )
+	{
+		if ( nVBAIndex < 1 || nVBAIndex > m_xAreas->getCount() )
+			throw uno::RuntimeException();
+		uno::Reference< excel::XRange > xRange( m_xAreas->Item( uno::makeAny(nVBAIndex), uno::Any() ), uno::UNO_QUERY_THROW );
+		ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xRange.get() ); 
+		uno::Reference< table::XCellRange > xCellRange;
+		if ( !pRange )
+			throw uno::RuntimeException();
+		xCellRange.set( pRange->getCellRange(), uno::UNO_QUERY_THROW );;
+		return xCellRange;
+		
+	}
+        void populateArea( sal_Int32 nVBAIndex )
+	{
+		uno::Reference< table::XCellRange > xRange = getArea( nVBAIndex );
+		uno::Reference< table::XColumnRowRange > xColumnRowRange(xRange, uno::UNO_QUERY_THROW );
+		sal_Int32 nRowCount =  xColumnRowRange->getRows()->getCount();
+		sal_Int32 nColCount = xColumnRowRange->getColumns()->getCount();
+		for ( sal_Int32 i=0; i<nRowCount; ++i )
+		{
+			for ( sal_Int32 j=0; j<nColCount; ++j )
+				m_CellPositions.push_back( CellPos( i,j,nVBAIndex ) );
+		}
+	}
+public:
+	CellsEnumeration( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCollection >& xAreas ): mxContext( xContext ), m_xAreas( xAreas )
+	{
+		sal_Int32 nItems = m_xAreas->getCount();
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+        		populateArea( index );
+		}
+		m_it = m_CellPositions.begin();
+	}
+	virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException){ return m_it != m_CellPositions.end(); }
+
+	virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+	{
+		if ( !hasMoreElements() )
+			throw container::NoSuchElementException();
+		CellPos aPos = *(m_it)++;
+		
+		uno::Reference< table::XCellRange > xRangeArea = getArea( aPos.m_nArea );
+		uno::Reference< table::XCellRange > xCellRange( xRangeArea->getCellByPosition(  aPos.m_nCol, aPos.m_nRow ), uno::UNO_QUERY_THROW );
+		// #FIXME need proper (WorkSheet) parent
+		return uno::makeAny( uno::Reference< excel::XRange >( new ScVbaRange( uno::Reference< XHelperInterface >(), mxContext, xCellRange ) ) );
+
+	}
+};
+
+
+const static ::rtl::OUString ISVISIBLE(  RTL_CONSTASCII_USTRINGPARAM( "IsVisible"));
+const static ::rtl::OUString WIDTH(  RTL_CONSTASCII_USTRINGPARAM( "Width"));
+const static ::rtl::OUString HEIGHT(  RTL_CONSTASCII_USTRINGPARAM( "Height"));
+const static ::rtl::OUString POSITION(  RTL_CONSTASCII_USTRINGPARAM( "Position"));
+const static rtl::OUString EQUALS( RTL_CONSTASCII_USTRINGPARAM("=") );
+const static rtl::OUString NOTEQUALS( RTL_CONSTASCII_USTRINGPARAM("<>") );
+const static rtl::OUString GREATERTHAN( RTL_CONSTASCII_USTRINGPARAM(">") );
+const static rtl::OUString GREATERTHANEQUALS( RTL_CONSTASCII_USTRINGPARAM(">=") );
+const static rtl::OUString LESSTHAN( RTL_CONSTASCII_USTRINGPARAM("<") );
+const static rtl::OUString LESSTHANEQUALS( RTL_CONSTASCII_USTRINGPARAM("<=") );
+const static rtl::OUString CONTS_HEADER( RTL_CONSTASCII_USTRINGPARAM("ContainsHeader" ));
+const static rtl::OUString INSERTPAGEBREAKS( RTL_CONSTASCII_USTRINGPARAM("InsertPageBreaks" ));
+const static rtl::OUString STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY( RTL_CONSTASCII_USTRINGPARAM("The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again") );
+const static rtl::OUString STR_ERRORMESSAGE_NOCELLSWEREFOUND( RTL_CONSTASCII_USTRINGPARAM("No cells were found") );
+const static rtl::OUString STR_ERRORMESSAGE_APPLIESTOROWCOLUMNSONLY( RTL_CONSTASCII_USTRINGPARAM("Property only applicable for Columns and Rows") );
+const static rtl::OUString CELLSTYLE( RTL_CONSTASCII_USTRINGPARAM("CellStyle") );
+
+class CellValueSetter : public ValueSetter
+{
+protected:
+	uno::Any maValue;
+	uno::TypeClass mTypeClass;
+public:
+	CellValueSetter( const uno::Any& aValue );
+	virtual bool processValue( const uno::Any& aValue,  const uno::Reference< table::XCell >& xCell );
+	virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell );
+		
+};
+
+CellValueSetter::CellValueSetter( const uno::Any& aValue ): maValue( aValue ), mTypeClass( aValue.getValueTypeClass() ) {}
+
+void
+CellValueSetter::visitNode( sal_Int32 /*i*/, sal_Int32 /*j*/, const uno::Reference< table::XCell >& xCell )
+{
+	processValue( maValue, xCell );
+}
+
+bool
+CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell )
+{
+
+	bool isExtracted = false;
+	switch ( aValue.getValueTypeClass() )
+	{
+		case  uno::TypeClass_BOOLEAN:
+		{
+			sal_Bool bState = sal_False;
+			if ( aValue >>= bState 	 )
+			{
+				uno::Reference< table::XCellRange > xRange( xCell, uno::UNO_QUERY_THROW );
+				if ( bState )
+					xCell->setValue( (double) 1 );
+				else
+					xCell->setValue( (double) 0 );
+				NumFormatHelper cellNumFormat( xRange );
+				cellNumFormat.setNumberFormat( util::NumberFormat::LOGICAL );
+			}
+			break;
+		}
+		case uno::TypeClass_STRING:
+		{
+			rtl::OUString aString;
+			if ( aValue >>= aString )
+			{
+				uno::Reference< text::XTextRange > xTextRange( xCell, uno::UNO_QUERY_THROW );
+				xTextRange->setString( aString );
+			}
+			else
+				isExtracted = false;	
+			break;
+		}
+		default:
+		{
+			double nDouble = 0.0;
+			if ( aValue >>= nDouble )
+				xCell->setValue( nDouble );
+			else
+				isExtracted = false;	
+			break;
+		}
+	}
+	return isExtracted;
+		
+}
+
+
+class CellValueGetter : public ValueGetter
+{
+protected:
+	uno::Any maValue;
+	uno::TypeClass mTypeClass;
+public:
+	CellValueGetter() {}
+	virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell );
+	virtual void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue );
+	const uno::Any& getValue() const { return maValue; }
+		
+};
+
+void
+CellValueGetter::processValue(  sal_Int32 /*x*/, sal_Int32 /*y*/, const uno::Any& aValue )
+{
+	maValue = aValue;
+}
+void CellValueGetter::visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
+{
+	uno::Any aValue;
+	table::CellContentType eType = xCell->getType();
+	if( eType == table::CellContentType_VALUE || eType == table::CellContentType_FORMULA )
+	{
+		if ( eType == table::CellContentType_FORMULA )
+		{
+				
+			rtl::OUString sFormula = xCell->getFormula();
+			if ( sFormula.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("=TRUE()") ) ) )
+				aValue <<= sal_True;
+			else if ( sFormula.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("=FALSE()") ) ) )
+				aValue <<= sal_False;
+			else 	
+			{
+				uno::Reference< beans::XPropertySet > xProp( xCell, uno::UNO_QUERY_THROW );
+				
+				table::CellContentType eFormulaType = table::CellContentType_VALUE;
+				// some formulas give textual results
+				xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FormulaResultType" ) ) ) >>= eFormulaType;
+
+				if ( eFormulaType == table::CellContentType_TEXT )
+				{
+					uno::Reference< text::XTextRange > xTextRange(xCell, ::uno::UNO_QUERY_THROW);
+					aValue <<= xTextRange->getString();
+				}
+				else	
+					aValue <<= xCell->getValue();
+			}
+		}
+		else
+		{
+			uno::Reference< table::XCellRange > xRange( xCell, uno::UNO_QUERY_THROW );
+			NumFormatHelper cellFormat( xRange );
+			if ( cellFormat.isBooleanType() )
+				aValue = uno::makeAny( ( xCell->getValue() != 0.0 ) );
+			else if ( cellFormat.isDateType() )
+				aValue = uno::makeAny( bridge::oleautomation::Date( xCell->getValue() ) );
+			else
+				aValue <<= xCell->getValue();
+		}
+	}
+	if( eType == table::CellContentType_TEXT )
+	{
+		uno::Reference< text::XTextRange > xTextRange(xCell, ::uno::UNO_QUERY_THROW);
+		aValue <<= xTextRange->getString();
+	}
+	processValue( x,y,aValue );
+}
+
+class CellFormulaValueSetter : public CellValueSetter
+{
+private:
+	ScDocument*  m_pDoc;
+    formula::FormulaGrammar::Grammar m_eGrammar;
+public:
+	CellFormulaValueSetter( const uno::Any& aValue, ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ):CellValueSetter( aValue ),  m_pDoc( pDoc ), m_eGrammar( eGram ){}
+protected:
+	bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell )
+	{
+		rtl::OUString sFormula;
+		double aDblValue = 0.0;
+		if ( aValue >>= sFormula )
+		{
+            // convert to GRAM_PODF_A1 style grammar because XCell::setFormula
+            // always compile it in that grammar. Perhaps
+            // css.sheet.FormulaParser should be used in future to directly
+            // pass formula tokens when that API stabilizes.
+            if ( m_eGrammar != formula::FormulaGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) )	
+			{
+				uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
+				ScCellRangesBase* pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() );
+				if ( pUnoRangesBase )
+				{
+					ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();	
+					ScCompiler aCompiler( m_pDoc, aCellRanges.First()->aStart );
+                    aCompiler.SetGrammar(m_eGrammar);
+					// compile the string in the format passed in
+					aCompiler.CompileString( sFormula );
+					// set desired convention to that of the document
+                    aCompiler.SetGrammar( formula::FormulaGrammar::GRAM_PODF_A1 );
+					String sConverted;
+					aCompiler.CreateStringFromTokenArray(sConverted);
+					sFormula = EQUALS + sConverted;
+				}
+			}
+
+			xCell->setFormula( sFormula );
+			return true;
+		}
+		else if ( aValue >>= aDblValue )
+		{
+			xCell->setValue( aDblValue );
+			return true;
+		}
+		return false;
+	}
+		
+};
+
+class CellFormulaValueGetter : public CellValueGetter
+{
+private:
+	ScDocument*  m_pDoc;
+    formula::FormulaGrammar::Grammar m_eGrammar;
+public:
+	CellFormulaValueGetter(ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ) : CellValueGetter( ), m_pDoc( pDoc ), m_eGrammar( eGram ) {}
+	virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
+	{
+		uno::Any aValue;
+		aValue <<= xCell->getFormula();	
+		rtl::OUString sVal;
+		aValue >>= sVal;
+		uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
+		ScCellRangesBase* pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() );
+		if ( ( xCell->getType() == table::CellContentType_FORMULA ) &&
+			pUnoRangesBase )
+		{
+			ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();	
+			ScCompiler aCompiler( m_pDoc, aCellRanges.First()->aStart );
+            aCompiler.SetGrammar(formula::FormulaGrammar::GRAM_DEFAULT);
+			aCompiler.CompileString( sVal );
+			// set desired convention
+            aCompiler.SetGrammar( m_eGrammar );
+			String sConverted;
+			aCompiler.CreateStringFromTokenArray(sConverted);
+			sVal = EQUALS + sConverted;
+			aValue <<= sVal;
+		}
+
+		processValue( x,y,aValue );
+	}
+		
+};
+
+
+class Dim2ArrayValueGetter : public ArrayVisitor
+{
+protected:
+	uno::Any maValue;
+	ValueGetter& mValueGetter;
+	virtual void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue )
+	{
+		uno::Sequence< uno::Sequence< uno::Any > >& aMatrix = *( uno::Sequence< uno::Sequence< uno::Any > >* )( maValue.getValue() );
+		aMatrix[x][y] = aValue;
+	}
+
+public:
+	Dim2ArrayValueGetter(sal_Int32 nRowCount, sal_Int32 nColCount, ValueGetter& rValueGetter ): mValueGetter(rValueGetter) 
+	{
+		uno::Sequence< uno::Sequence< uno::Any > > aMatrix;
+		aMatrix.realloc( nRowCount );	
+		for ( sal_Int32 index = 0; index < nRowCount; ++index )
+			aMatrix[index].realloc( nColCount );
+		maValue <<= aMatrix;
+	}
+	void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
+
+	{
+		mValueGetter.visitNode( x, y, xCell );
+		processValue( x, y, mValueGetter.getValue() );
+	}
+	const uno::Any& getValue() const { return maValue; }
+
+};
+
+const static rtl::OUString sNA = rtl::OUString::createFromAscii("#N/A"); 
+
+class Dim1ArrayValueSetter : public ArrayVisitor
+{
+	uno::Sequence< uno::Any > aMatrix;
+	sal_Int32 nColCount;
+	ValueSetter& mCellValueSetter;
+public:
+	Dim1ArrayValueSetter( const uno::Any& aValue, ValueSetter& rCellValueSetter ):mCellValueSetter( rCellValueSetter )
+	{
+		aValue >>= aMatrix;
+		nColCount = aMatrix.getLength();
+	}
+	virtual void visitNode( sal_Int32 /*x*/, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
+	{
+		if ( y < nColCount )
+			mCellValueSetter.processValue( aMatrix[ y ], xCell );
+		else
+			mCellValueSetter.processValue( uno::makeAny( sNA ), xCell );
+	}
+};
+
+
+
+class Dim2ArrayValueSetter : public ArrayVisitor
+{
+	uno::Sequence< uno::Sequence< uno::Any > > aMatrix;
+	ValueSetter& mCellValueSetter;
+	sal_Int32 nRowCount;
+	sal_Int32 nColCount;
+public:
+	Dim2ArrayValueSetter( const uno::Any& aValue, ValueSetter& rCellValueSetter ) : mCellValueSetter( rCellValueSetter )
+	{
+		aValue >>= aMatrix;
+		nRowCount = aMatrix.getLength();
+		nColCount = aMatrix[0].getLength();  
+	}
+
+	virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
+	{
+		if ( x < nRowCount && y < nColCount )
+			mCellValueSetter.processValue( aMatrix[ x ][ y ], xCell );
+		else
+			mCellValueSetter.processValue( uno::makeAny( sNA ), xCell );
+			
+	}
+};
+
+class RangeProcessor
+{
+public:
+	virtual void process( const uno::Reference< excel::XRange >& xRange ) = 0;
+};
+
+class RangeValueProcessor : public RangeProcessor
+{
+	const uno::Any& m_aVal;
+public:
+	RangeValueProcessor( const uno::Any& rVal ):m_aVal( rVal ) {}
+	virtual void process( const uno::Reference< excel::XRange >& xRange )
+	{
+		xRange->setValue( m_aVal );
+	}
+};
+
+class RangeFormulaProcessor : public RangeProcessor
+{
+	const uno::Any& m_aVal;
+public:
+	RangeFormulaProcessor( const uno::Any& rVal ):m_aVal( rVal ) {}
+	virtual void process( const uno::Reference< excel::XRange >& xRange ) 
+	{
+		xRange->setFormula( m_aVal );
+	}
+};
+
+class RangeCountProcessor : public RangeProcessor
+{
+	sal_Int32 nCount;
+public:
+	RangeCountProcessor():nCount(0){}
+	virtual void process( const uno::Reference< excel::XRange >& xRange )
+	{
+		nCount = nCount + xRange->getCount();
+	}
+	sal_Int32 value() { return nCount; }
+};
+class AreasVisitor
+{
+private:
+	uno::Reference< XCollection > m_Areas;
+public:
+	AreasVisitor( const uno::Reference< XCollection >& rAreas ):m_Areas( rAreas ){} 
+	
+	void visit( RangeProcessor& processor )
+	{
+		if ( m_Areas.is() )
+		{
+			sal_Int32 nItems = m_Areas->getCount();
+			for ( sal_Int32 index=1; index <= nItems; ++index )
+			{
+				uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+				processor.process( xRange ); 
+			}
+		}	
+	}
+};
+
+class RangeHelper
+{
+	uno::Reference< table::XCellRange > m_xCellRange;
+	
+public:
+	RangeHelper( const uno::Reference< table::XCellRange >& xCellRange ) throw (uno::RuntimeException) : m_xCellRange( xCellRange ) 
+	{
+		if ( !m_xCellRange.is() )
+			throw uno::RuntimeException();
+	}
+	RangeHelper( const uno::Any aCellRange ) throw (uno::RuntimeException)
+	{
+		m_xCellRange.set( aCellRange, uno::UNO_QUERY_THROW );
+	}
+	uno::Reference< sheet::XSheetCellRange > getSheetCellRange() throw (uno::RuntimeException)
+	{
+		return uno::Reference< sheet::XSheetCellRange >(m_xCellRange, uno::UNO_QUERY_THROW);
+	}
+	uno::Reference< sheet::XSpreadsheet >  getSpreadSheet() throw (uno::RuntimeException)
+	{
+		return getSheetCellRange()->getSpreadsheet();
+	}	
+
+	uno::Reference< table::XCellRange > getCellRangeFromSheet() throw (uno::RuntimeException)
+	{
+		return uno::Reference< table::XCellRange >(getSpreadSheet(), uno::UNO_QUERY_THROW );
+	}
+
+	uno::Reference< sheet::XCellRangeAddressable >  getCellRangeAddressable() throw (uno::RuntimeException)
+	{
+		return uno::Reference< sheet::XCellRangeAddressable >(m_xCellRange, ::uno::UNO_QUERY_THROW);
+
+	}
+
+	uno::Reference< sheet::XSheetCellCursor > getSheetCellCursor() throw ( uno::RuntimeException )
+	{
+		return 	uno::Reference< sheet::XSheetCellCursor >( getSpreadSheet()->createCursorByRange( getSheetCellRange() ), uno::UNO_QUERY_THROW );
+	}	
+
+	static uno::Reference< excel::XRange > createRangeFromRange( const uno::Reference<uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, const uno::Reference< sheet::XCellRangeAddressable >& xCellRangeAddressable, sal_Int32 nStartColOffset = 0, sal_Int32 nStartRowOffset = 0,
+ sal_Int32 nEndColOffset = 0, sal_Int32 nEndRowOffset = 0 )
+	{
+		// #FIXME need proper (WorkSheet) parent
+		return uno::Reference< excel::XRange >( new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, 
+			xRange->getCellRangeByPosition(
+				xCellRangeAddressable->getRangeAddress().StartColumn + nStartColOffset,
+				xCellRangeAddressable->getRangeAddress().StartRow + nStartRowOffset,
+				xCellRangeAddressable->getRangeAddress().EndColumn + nEndColOffset,
+				xCellRangeAddressable->getRangeAddress().EndRow + nEndRowOffset ) ) );
+	}
+	
+};
+
+bool
+getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv )
+{
+	
+	ScDocument* pDoc = NULL;
+	if ( pDocSh )
+	{
+		pDoc = pDocSh->GetDocument();
+		String aString(sAddress);
+		USHORT nMask = SCA_VALID;
+		//USHORT nParse = rCellRanges.Parse( sAddress, pDoc, nMask, formula::FormulaGrammar::CONV_XL_A1 );
+		rResFlags = rCellRanges.Parse( sAddress, pDoc, nMask, eConv, 0 );
+		if ( rResFlags & SCA_VALID )
+		{
+			return true;
+		}
+	} 
+	return false;
+} 
+
+bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException )
+{
+	// see if there is a match with a named range
+	uno::Reference< beans::XPropertySet > xProps( pDocSh->GetModel(), uno::UNO_QUERY_THROW );
+	uno::Reference< container::XNameAccess > xNameAccess( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NamedRanges") ) ), uno::UNO_QUERY_THROW );
+	// Strangly enough you can have Range( "namedRange1, namedRange2, etc," )	
+	// loop around each ',' seperated name
+	std::vector< rtl::OUString > vNames;
+	sal_Int32 nIndex = 0;
+	do 
+	{
+		rtl::OUString aToken = sName.getToken( 0, ',', nIndex );
+		vNames.push_back( aToken );
+	} while ( nIndex >= 0 );
+
+	if ( !vNames.size() )
+		vNames.push_back( sName );
+
+	std::vector< rtl::OUString >::iterator it = vNames.begin(); 
+	std::vector< rtl::OUString >::iterator it_end = vNames.end(); 
+	for ( ; it != it_end; ++it )
+	{
+		
+		formula::FormulaGrammar::AddressConvention eConv = aConv; 
+		// spaces are illegal ( but the user of course can enter them )
+		rtl::OUString sAddress = (*it).trim();
+		if ( xNameAccess->hasByName( sAddress ) )
+		{
+			uno::Reference< sheet::XNamedRange > xNamed( xNameAccess->getByName( sAddress ), uno::UNO_QUERY_THROW );
+			sAddress = xNamed->getContent();
+			// As the address comes from OOO, the addressing
+			// style is may not be XL_A1
+			eConv = pDocSh->GetDocument()->GetAddressConvention();
+		}	
+
+		USHORT nFlags = 0;
+		if ( !getCellRangesForAddress( nFlags, sAddress, pDocSh, aCellRanges, eConv ) )
+			return false;
+	
+		bool bTabFromReferrer = !( nFlags & SCA_TAB_3D );
+
+		for ( ScRange* pRange = aCellRanges.First() ; pRange; pRange = aCellRanges.Next() )
+		{
+			pRange->aStart.SetCol( refRange.aStart.Col() + pRange->aStart.Col() );
+			pRange->aStart.SetRow( refRange.aStart.Row() + pRange->aStart.Row() );
+			pRange->aStart.SetTab( bTabFromReferrer ? refRange.aStart.Tab()  : pRange->aStart.Tab() );
+			pRange->aEnd.SetCol( refRange.aStart.Col() + pRange->aEnd.Col() );
+			pRange->aEnd.SetRow( refRange.aStart.Row() + pRange->aEnd.Row() );
+			pRange->aEnd.SetTab( bTabFromReferrer ? refRange.aEnd.Tab()  : pRange->aEnd.Tab() );
+		}
+	}
+	return true;
+}
+
+
+ScVbaRange*
+getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException )
+{
+	ScRangeList aCellRanges;
+	ScRange refRange;
+	ScUnoConversion::FillScRange( refRange, pAddr );
+	if ( !getScRangeListForAddress ( sName, pDocSh, refRange, aCellRanges, eConv ) ) 
+		throw uno::RuntimeException();
+	// Single range
+	if ( aCellRanges.First() == aCellRanges.Last() )
+	{
+		uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pDocSh, *aCellRanges.First() ) );
+		// #FIXME need proper (WorkSheet) parent
+		return new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xRange );
+	}
+	uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pDocSh, aCellRanges ) );
+ 	
+	// #FIXME need proper (WorkSheet) parent
+	return new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xRanges );
+}
+
+css::uno::Reference< excel::XRange >
+ScVbaRange::getRangeObjectForName( const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sRangeName, ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) throw ( uno::RuntimeException )
+{
+	table::CellRangeAddress refAddr;
+	return getRangeForName( xContext, sRangeName, pDocSh, refAddr, eConv );
+}
+
+
+table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, ScDocShell* pDocSh,  formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1) throw ( uno::RuntimeException )
+{
+	uno::Reference< table::XCellRange > xRangeParam;
+	switch ( aParam.getValueTypeClass() )
+	{
+		case uno::TypeClass_STRING:
+		{
+			rtl::OUString rString;
+			aParam >>= rString;
+			ScRangeList aCellRanges;
+			ScRange refRange;
+			if ( getScRangeListForAddress ( rString, pDocSh, refRange, aCellRanges, aConv ) ) 			
+			{
+				if ( aCellRanges.First() == aCellRanges.Last() )
+				{
+					table::CellRangeAddress aRangeAddress;
+					ScUnoConversion::FillApiRange( aRangeAddress, *aCellRanges.First() );
+					return aRangeAddress;
+				}
+			}
+		}
+		case uno::TypeClass_INTERFACE:
+		{
+			uno::Reference< excel::XRange > xRange;
+			aParam >>= xRange;
+			if ( xRange.is() )
+				xRange->getCellRange() >>= xRangeParam;
+			break;
+		}
+		default:
+			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can't extact CellRangeAddress from type" ) ), uno::Reference< uno::XInterface >() );
+	}
+	uno::Reference< sheet::XCellRangeAddressable > xAddressable( xRangeParam, uno::UNO_QUERY_THROW );
+	return xAddressable->getRangeAddress();
+
+}
+
+uno::Reference< XCollection >
+lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno::Reference<uno::XComponentContext>& xContext,  const uno::Reference< table::XCellRange >& xRange  ) throw( uno::RuntimeException )
+{
+	uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW ); 
+	ScDocument* pDoc = getDocumentFromRange(xRange);
+	if ( !pDoc )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
+	ScVbaPalette aPalette( pDoc->GetDocumentShell() );
+ 	uno::Reference< XCollection > borders( new ScVbaBorders( xParent, xContext, xRange, aPalette ) );
+	return borders;
+}
+
+ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args,
+    uno::Reference< uno::XComponentContext> const & xContext )  throw ( lang::IllegalArgumentException ) : ScVbaRange_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( sal_False ), mbIsColumns( sal_False )
+{
+	mxRange.set( mxPropertySet, uno::UNO_QUERY );
+	mxRanges.set( mxPropertySet, uno::UNO_QUERY );
+	uno::Reference< container::XIndexAccess >  xIndex;
+	if ( mxRange.is() )
+	{
+		xIndex = new SingleRangeIndexAccess( mxContext, mxRange );
+	}
+	else if ( mxRanges.is() )
+	{
+		xIndex.set( mxRanges, uno::UNO_QUERY_THROW );
+	}
+	m_Areas = new ScVbaRangeAreas( mxContext, xIndex, mbIsRows, mbIsColumns );
+}
+
+ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, sal_Bool bIsRows, sal_Bool bIsColumns ) throw( lang::IllegalArgumentException )
+: ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRange, uno::UNO_QUERY_THROW ), getModelFromRange( xRange), true ), mxRange( xRange ),
+                mbIsRows( bIsRows ),
+                mbIsColumns( bIsColumns )
+{
+	if  ( !xContext.is() )
+		throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "context is not set " ) ), uno::Reference< uno::XInterface >() , 1 );
+	if  ( !xRange.is() )
+		throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "range is not set " ) ), uno::Reference< uno::XInterface >() , 1 );
+
+	uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( mxContext, xRange ) );
+	m_Areas = new ScVbaRangeAreas( mxContext, xIndex, mbIsRows, mbIsColumns );
+
+}
+
+ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges,  sal_Bool bIsRows, sal_Bool bIsColumns  ) throw ( lang::IllegalArgumentException )
+: ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRanges, uno::UNO_QUERY_THROW ), getModelFromXIf( uno::Reference< uno::XInterface >( xRanges, uno::UNO_QUERY_THROW ) ), true ), mxRanges( xRanges ),mbIsRows( bIsRows ), mbIsColumns( bIsColumns )
+
+{
+	uno::Reference< container::XIndexAccess >  xIndex( mxRanges, uno::UNO_QUERY_THROW );
+	m_Areas	 = new ScVbaRangeAreas( mxContext, xIndex, mbIsRows, mbIsColumns );
+
+}
+
+ScVbaRange::~ScVbaRange()
+{
+}
+
+uno::Reference< XCollection >& ScVbaRange::getBorders()
+{
+	if ( !m_Borders.is() )
+	{
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
+		m_Borders = lcl_setupBorders( this, mxContext, uno::Reference< table::XCellRange >( xRange->getCellRange(), uno::UNO_QUERY_THROW ) );
+	}
+	return m_Borders;
+}
+
+void
+ScVbaRange::visitArray( ArrayVisitor& visitor )
+{
+	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
+	sal_Int32 nRowCount = xColumnRowRange->getRows()->getCount();
+	sal_Int32 nColCount = xColumnRowRange->getColumns()->getCount();
+	for ( sal_Int32 i=0; i<nRowCount; ++i )
+	{
+		for ( sal_Int32 j=0; j<nColCount; ++j )
+		{
+			uno::Reference< table::XCell > xCell( mxRange->getCellByPosition( j, i ), uno::UNO_QUERY_THROW );
+
+			visitor.visitNode( i, j, xCell );
+		}
+	}
+}
+
+
+
+uno::Any 
+ScVbaRange::getValue( ValueGetter& valueGetter) throw (uno::RuntimeException)
+{
+	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
+	// single cell range
+	if ( isSingleCellRange() )
+	{
+		visitArray( valueGetter );
+		return valueGetter.getValue();
+	}
+	sal_Int32 nRowCount = xColumnRowRange->getRows()->getCount();
+	sal_Int32 nColCount = xColumnRowRange->getColumns()->getCount();
+	// multi cell range ( return array )
+	Dim2ArrayValueGetter arrayGetter( nRowCount, nColCount, valueGetter );
+	visitArray( arrayGetter );
+	return uno::makeAny( script::ArrayWrapper( sal_False, arrayGetter.getValue() ) );
+}
+
+uno::Any SAL_CALL
+ScVbaRange::getValue() throw (uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->getValue();
+	}
+
+	CellValueGetter valueGetter;
+	return getValue( valueGetter );
+
+}
+
+
+void 
+ScVbaRange::setValue(  const uno::Any  &aValue,  ValueSetter& valueSetter ) throw (uno::RuntimeException)
+{
+	uno::TypeClass aClass = aValue.getValueTypeClass();
+	if ( aClass == uno::TypeClass_SEQUENCE )
+	{
+		uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
+		uno::Any aConverted;
+		try
+		{
+			// test for single dimension, could do 
+			// with a better test than this	
+			if ( aValue.getValueTypeName().indexOf('[') ==  aValue.getValueTypeName().lastIndexOf('[') )
+			{
+				aConverted = xConverter->convertTo( aValue, getCppuType((uno::Sequence< uno::Any >*)0) );
+				Dim1ArrayValueSetter setter( aConverted, valueSetter );
+				visitArray( setter );
+			}
+			else
+			{
+				aConverted = xConverter->convertTo( aValue, getCppuType((uno::Sequence< uno::Sequence< uno::Any > >*)0) );
+				Dim2ArrayValueSetter setter( aConverted, valueSetter );
+				visitArray( setter );
+			}
+		}
+		catch ( uno::Exception& e )
+		{
+			OSL_TRACE("Bahhh, caught exception %s", 
+				rtl::OUStringToOString( e.Message,
+					RTL_TEXTENCODING_UTF8 ).getStr() );
+		}
+	}
+	else
+	{
+		visitArray( valueSetter );
+	}
+}
+
+void SAL_CALL
+ScVbaRange::setValue( const uno::Any  &aValue ) throw (uno::RuntimeException)
+{
+	// If this is a multiple selection apply setValue over all areas
+	if ( m_Areas->getCount() > 1 )
+	{
+		AreasVisitor aVisitor( m_Areas );
+		RangeValueProcessor valueProcessor( aValue );	
+		aVisitor.visit( valueProcessor );
+		return;
+	}	
+	CellValueSetter valueSetter( aValue );
+	setValue( aValue, valueSetter );
+}
+
+void
+ScVbaRange::Clear() throw (uno::RuntimeException)
+{
+	sal_Int32 nFlags = sheet::CellFlags::VALUE | sheet::CellFlags::STRING | sheet::CellFlags::HARDATTR | sheet::CellFlags::FORMATTED | sheet::CellFlags::EDITATTR | sheet::CellFlags::FORMULA;
+	ClearContents( nFlags );
+}
+
+//helper ClearContent
+void
+ScVbaRange::ClearContents( sal_Int32 nFlags ) throw (uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		sal_Int32 nItems = m_Areas->getCount();
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+			ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xRange.get() ); 
+			if ( pRange )
+				pRange->ClearContents( nFlags );	
+		}
+		return;
+	}
+
+
+	uno::Reference< sheet::XSheetOperation > xSheetOperation(mxRange, uno::UNO_QUERY_THROW);
+	xSheetOperation->clearContents( nFlags );
+}
+void
+ScVbaRange::ClearComments() throw (uno::RuntimeException)
+{
+	ClearContents( sheet::CellFlags::ANNOTATION );
+}
+
+void
+ScVbaRange::ClearContents() throw (uno::RuntimeException)
+{
+	sal_Int32 nClearFlags = ( sheet::CellFlags::VALUE |
+		sheet::CellFlags::STRING |  sheet::CellFlags::DATETIME | 
+		sheet::CellFlags::FORMULA );
+	ClearContents( nClearFlags );
+}
+
+void
+ScVbaRange::ClearFormats() throw (uno::RuntimeException)
+{
+	//FIXME: need to check if we need to combine sheet::CellFlags::FORMATTED
+	sal_Int32 nClearFlags = sheet::CellFlags::HARDATTR | sheet::CellFlags::FORMATTED | sheet::CellFlags::EDITATTR;
+	ClearContents( nClearFlags );
+}
+
+void
+ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException)
+{
+	// If this is a multiple selection apply setFormula over all areas
+	if ( m_Areas->getCount() > 1 )
+	{
+		AreasVisitor aVisitor( m_Areas );
+		RangeFormulaProcessor valueProcessor( rFormula );	
+		aVisitor.visit( valueProcessor );
+		return;
+	}	
+	CellFormulaValueSetter formulaValueSetter( rFormula, getScDocument(), eGram );
+	setValue( rFormula, formulaValueSetter );
+}
+
+uno::Any 
+ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->getFormula();
+	}
+	CellFormulaValueGetter valueGetter( getScDocument(), eGram );
+	return getValue( valueGetter );
+		
+}
+
+void
+ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException)
+{
+	// #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO                        	// results in "=$a$1:a1", temporalily disable conversion
+	setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_PODF_XL_A1 );;
+}
+
+uno::Any
+ScVbaRange::getFormulaR1C1() throw (::com::sun::star::uno::RuntimeException)
+{
+	return getFormulaValue( formula::FormulaGrammar::GRAM_PODF_XL_R1C1 );
+}
+
+void
+ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeException)
+{
+	setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_PODF_XL_R1C1 );
+}
+
+uno::Any
+ScVbaRange::getFormula() throw (::com::sun::star::uno::RuntimeException)
+{
+	return getFormulaValue( formula::FormulaGrammar::GRAM_PODF_XL_A1 );
+}
+
+sal_Int32 
+ScVbaRange::getCount() throw (uno::RuntimeException)
+{
+	// If this is a multiple selection apply setValue over all areas
+	if ( m_Areas->getCount() > 1 )
+	{
+		AreasVisitor aVisitor( m_Areas );
+		RangeCountProcessor valueProcessor;
+		aVisitor.visit( valueProcessor );
+		return valueProcessor.value();
+	}	
+	sal_Int32 rowCount = 0;
+	sal_Int32 colCount = 0;
+	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
+	rowCount = xColumnRowRange->getRows()->getCount();
+	colCount = xColumnRowRange->getColumns()->getCount();
+
+	if( IsRows() )
+		return rowCount;	
+	if( IsColumns() )
+		return colCount;
+	return rowCount * colCount;
+}
+
+sal_Int32 
+ScVbaRange::getRow() throw (uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->getRow();
+	}
+	uno::Reference< sheet::XCellAddressable > xCellAddressable(mxRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
+	return xCellAddressable->getCellAddress().Row + 1; // Zero value indexing 
+}	
+		
+sal_Int32 
+ScVbaRange::getColumn() throw (uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->getColumn();
+	}
+	uno::Reference< sheet::XCellAddressable > xCellAddressable(mxRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
+	return xCellAddressable->getCellAddress().Column + 1; // Zero value indexing
+}
+
+uno::Any
+ScVbaRange::HasFormula() throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		sal_Int32 nItems = m_Areas->getCount();
+		uno::Any aResult = aNULL();
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+			// if the HasFormula for any area is different to another
+			// return null
+			if ( index > 1 )
+				if ( aResult != xRange->HasFormula() )
+					return aNULL();
+			aResult = xRange->HasFormula();	
+			if ( aNULL() == aResult ) 
+				return aNULL();
+		}
+		return aResult;
+	}
+	uno::Reference< uno::XInterface > xIf( mxRange, uno::UNO_QUERY_THROW );
+	ScCellRangesBase* pThisRanges = dynamic_cast< ScCellRangesBase * > ( xIf.get() );
+	if ( pThisRanges )
+	{
+		uno::Reference<uno::XInterface>  xRanges( pThisRanges->queryFormulaCells( ( sheet::FormulaResult::ERROR | sheet::FormulaResult::VALUE |  sheet::FormulaResult::STRING ) ), uno::UNO_QUERY_THROW );
+		ScCellRangesBase* pFormulaRanges = dynamic_cast< ScCellRangesBase * > ( xRanges.get() );
+		// check if there are no formula cell, return false
+		if ( pFormulaRanges->GetRangeList().Count() == 0 ) 
+			return uno::makeAny(sal_False);
+		
+		// chech if there are holes (where some cells are not formulas)
+		// or returned range is not equal to this range	 
+		if ( ( pFormulaRanges->GetRangeList().Count() > 1 ) 
+		|| ( pFormulaRanges->GetRangeList().GetObject(0)->aStart != pThisRanges->GetRangeList().GetObject(0)->aStart ) 
+		|| ( pFormulaRanges->GetRangeList().GetObject(0)->aEnd != pThisRanges->GetRangeList().GetObject(0)->aEnd ) )
+			return aNULL(); // should return aNULL;
+	}
+	return uno::makeAny( sal_True );
+}
+void
+ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( uno::RuntimeException )
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		// Multi-Area Range
+		uno::Reference< XCollection > xCollection( m_Areas, uno::UNO_QUERY_THROW );
+		for ( sal_Int32 index = 1; index <= xCollection->getCount(); ++index )
+		{
+			uno::Reference< excel::XRange > xRange( xCollection->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
+			ScVbaRange* pThisRange = dynamic_cast< ScVbaRange* >( xRange.get() );
+			pThisRange->fillSeries( nFillDirection, nFillMode, nFillDateMode, fStep, fEndValue );
+				
+		}
+		return;	
+	}
+	
+	uno::Reference< sheet::XCellSeries > xCellSeries(mxRange, uno::UNO_QUERY_THROW );
+	xCellSeries->fillSeries( nFillDirection, nFillMode, nFillDateMode, fStep, fEndValue );
+}
+
+void 
+ScVbaRange::FillLeft() throw (uno::RuntimeException)
+{
+	fillSeries(sheet::FillDirection_TO_LEFT, 
+		sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
+}
+
+void 
+ScVbaRange::FillRight() throw (uno::RuntimeException)
+{
+	fillSeries(sheet::FillDirection_TO_RIGHT, 
+		sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
+}
+
+void 
+ScVbaRange::FillUp() throw (uno::RuntimeException)
+{
+	fillSeries(sheet::FillDirection_TO_TOP, 
+		sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
+}
+
+void 
+ScVbaRange::FillDown() throw (uno::RuntimeException)
+{
+	fillSeries(sheet::FillDirection_TO_BOTTOM, 
+		sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
+}
+
+::rtl::OUString
+ScVbaRange::getText() throw (uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->getText();
+	}
+	uno::Reference< text::XTextRange > xTextRange(mxRange->getCellByPosition(0,0), uno::UNO_QUERY_THROW );
+	return xTextRange->getString();
+}
+
+uno::Reference< excel::XRange >
+ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw (uno::RuntimeException)
+{
+	SCROW nRowOffset = 0;
+	SCCOL nColOffset = 0;
+	sal_Bool bIsRowOffset = ( nRowOff >>= nRowOffset );
+	sal_Bool bIsColumnOffset = ( nColOff >>= nColOffset );
+	ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
+
+	ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
+	
+
+	for ( ScRange* pRange = aCellRanges.First() ; pRange; pRange = aCellRanges.Next() )
+	{
+		if ( bIsColumnOffset )
+		{
+			pRange->aStart.SetCol( pRange->aStart.Col() + nColOffset );
+			pRange->aEnd.SetCol( pRange->aEnd.Col() + nColOffset );
+		}
+		if ( bIsRowOffset )
+		{
+			pRange->aStart.SetRow( pRange->aStart.Row() + nRowOffset );
+			pRange->aEnd.SetRow( pRange->aEnd.Row() + nRowOffset );
+		}
+	}
+
+	if ( aCellRanges.Count() > 1 ) // Multi-Area
+	{
+		uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pUnoRangesBase->GetDocShell(), aCellRanges ) );
+		return new ScVbaRange( getParent(), mxContext, xRanges );
+	}
+	// normal range
+	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), *aCellRanges.First() ) );
+	return new ScVbaRange( getParent(), mxContext, xRange  );
+}
+
+uno::Reference< excel::XRange >
+ScVbaRange::CurrentRegion() throw (uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->CurrentRegion();
+	}
+	
+	RangeHelper helper( mxRange );
+	uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = 
+		helper.getSheetCellCursor();
+	xSheetCellCursor->collapseToCurrentRegion();
+	uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
+	return RangeHelper::createRangeFromRange( mxContext, helper.getCellRangeFromSheet(), xCellRangeAddressable );	
+}
+
+uno::Reference< excel::XRange >
+ScVbaRange::CurrentArray() throw (uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->CurrentArray();
+	}
+	RangeHelper helper( mxRange );
+	uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = 
+		helper.getSheetCellCursor();
+	xSheetCellCursor->collapseToCurrentArray();
+	uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
+	return RangeHelper::createRangeFromRange( mxContext, helper.getCellRangeFromSheet(), xCellRangeAddressable );	
+}
+
+uno::Any
+ScVbaRange::getFormulaArray() throw (uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->getFormulaArray();
+	}
+	
+	uno::Reference< sheet::XCellRangeFormula> xCellRangeFormula( mxRange, uno::UNO_QUERY_THROW );
+	uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
+	uno::Any aMatrix;
+
+	//VBA, minz@cn.ibm.com
+	uno::Sequence< uno::Sequence<rtl::OUString> > aFmArray = xCellRangeFormula->getFormulaArray();
+	if( aFmArray.getLength() )
+	{
+		if( aFmArray.getLength() == 1 && aFmArray[0].getLength() == 1 )
+			aMatrix <<= aFmArray[0][0];
+		else	
+			aMatrix = xConverter->convertTo( uno::makeAny( xCellRangeFormula->getFormulaArray() ) , getCppuType((uno::Sequence< uno::Sequence< uno::Any > >*)0)  ) ;
+	}	
+	return aMatrix;
+}
+
+void 
+ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->setFormulaArray( rFormula );
+	}
+	// #TODO need to distinguish between getFormula and getFormulaArray e.g. (R1C1)
+	// but for the moment its just easier to treat them the same for setting
+
+	setFormula( rFormula );
+}
+
+::rtl::OUString
+ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->Characters( Start, Length );
+	}
+
+	long nIndex = 0, nCount = 0;
+	::rtl::OUString rString;
+	uno::Reference< text::XTextRange > xTextRange(mxRange, ::uno::UNO_QUERY_THROW );
+	rString = xTextRange->getString();
+	if( !( Start >>= nIndex ) && !( Length >>= nCount ) )
+		return rString;
+	if(!( Start >>= nIndex ) )
+		nIndex = 1;
+	if(!( Length >>= nCount ) )
+		nIndex = rString.getLength();
+	return rString.copy( --nIndex, nCount ); // Zero value indexing
+}
+
+::rtl::OUString
+ScVbaRange::Address(  const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolute, const uno::Any& ReferenceStyle, const uno::Any& External, const uno::Any& RelativeTo ) throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		// Multi-Area Range
+		rtl::OUString sAddress;
+		uno::Reference< XCollection > xCollection( m_Areas, uno::UNO_QUERY_THROW );
+                uno::Any aExternalCopy = External;
+		for ( sal_Int32 index = 1; index <= xCollection->getCount(); ++index )
+		{
+			uno::Reference< excel::XRange > xRange( xCollection->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
+			if ( index > 1 )
+			{
+				sAddress += rtl::OUString( ',' );
+                                // force external to be false
+                                // only first address should have the
+                                // document and sheet specifications
+                                aExternalCopy = uno::makeAny(sal_False);
+			}
+			sAddress += xRange->Address( RowAbsolute, ColumnAbsolute, ReferenceStyle, aExternalCopy, RelativeTo );
+		}
+		return sAddress;	
+		
+	}
+	ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
+	if ( ReferenceStyle.hasValue() )
+	{
+		sal_Int32 refStyle = excel::XlReferenceStyle::xlA1;
+		ReferenceStyle >>= refStyle;
+		if ( refStyle == excel::XlReferenceStyle::xlR1C1 )
+			dDetails = ScAddress::Details( formula::FormulaGrammar::CONV_XL_R1C1, 0, 0 );
+	}
+	USHORT nFlags = SCA_VALID;
+	ScDocShell* pDocShell =  getScDocShell();
+	ScDocument* pDoc =  pDocShell->GetDocument();
+
+	RangeHelper thisRange( mxRange );	
+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+	ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
+	String sRange;
+	USHORT ROW_ABSOLUTE = ( SCA_ROW_ABSOLUTE | SCA_ROW2_ABSOLUTE );
+	USHORT COL_ABSOLUTE = ( SCA_COL_ABSOLUTE | SCA_COL2_ABSOLUTE );
+	// default
+	nFlags |= ( SCA_TAB_ABSOLUTE | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB2_ABSOLUTE | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE );
+	if ( RowAbsolute.hasValue() )
+	{
+		sal_Bool bVal = sal_True;
+		RowAbsolute >>= bVal;
+		if ( !bVal )
+			nFlags &= ~ROW_ABSOLUTE;
+	}
+	if ( ColumnAbsolute.hasValue() )
+	{
+		sal_Bool bVal = sal_True;
+		ColumnAbsolute >>= bVal;
+		if ( !bVal )
+			nFlags &= ~COL_ABSOLUTE;
+	}
+	sal_Bool bLocal = sal_False;
+	if ( External.hasValue() )
+	{
+		External >>= bLocal;
+		if (  bLocal )
+			nFlags |= SCA_TAB_3D | SCA_FORCE_DOC;
+	}
+	if ( RelativeTo.hasValue() )
+	{
+		// #TODO should I throw an error if R1C1 is not set?
+		
+		table::CellRangeAddress refAddress = getCellRangeAddressForVBARange( RelativeTo, pDocShell );
+		dDetails = ScAddress::Details( formula::FormulaGrammar::CONV_XL_R1C1, static_cast< SCROW >( refAddress.StartRow ), static_cast< SCCOL >( refAddress.StartColumn ) );
+	}
+	aRange.Format( sRange,  nFlags, pDoc, dDetails ); 
+	return sRange;
+}
+
+uno::Reference < excel::XFont >
+ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException)
+{
+	uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY );
+	ScDocument* pDoc = getScDocument();
+	if ( mxRange.is() )
+		xProps.set(mxRange, ::uno::UNO_QUERY );
+	else if ( mxRanges.is() )
+		xProps.set(mxRanges, ::uno::UNO_QUERY );
+	if ( !pDoc )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
+
+	ScVbaPalette aPalette( pDoc->GetDocumentShell() );	
+	ScCellRangeObj* pRangeObj = NULL;
+	try
+	{
+		pRangeObj = getCellRangeObj();
+	}
+	catch( uno::Exception& ) 
+	{
+	}
+	return  new ScVbaFont( this, mxContext, aPalette, xProps, pRangeObj );
+}
+                                                                                                                             
+uno::Reference< excel::XRange >
+ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) throw(uno::RuntimeException)
+{
+	// #TODO code within the test below "if ( m_Areas.... " can be removed
+	// Test is performed only because m_xRange is NOT set to be
+	// the first range in m_Areas ( to force failure while
+	// the implementations for each method are being updated )
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->Cells( nRowIndex, nColumnIndex );
+	}
+
+	sal_Int32 nRow = 0, nColumn = 0;
+
+	sal_Bool bIsIndex = nRowIndex.hasValue();
+	sal_Bool bIsColumnIndex = nColumnIndex.hasValue();
+
+	// Sometimes we might get a float or a double or whatever
+	// set in the Any, we should convert as appropriate
+	// #FIXME - perhaps worth turning this into some sort of
+	// convertion routine e.g. bSuccess = getValueFromAny( nRow, nRowIndex, getCppuType((sal_Int32*)0) )
+	if ( nRowIndex.hasValue() && !( nRowIndex >>= nRow ) )
+	{
+		uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
+		uno::Any aConverted;
+		try
+		{
+			aConverted = xConverter->convertTo( nRowIndex, getCppuType((sal_Int32*)0) );
+			bIsIndex = ( aConverted >>= nRow );
+		}
+		catch( uno::Exception& ) {} // silence any errors
+	}
+	if ( bIsColumnIndex && !( nColumnIndex >>= nColumn ) )
+	{
+		uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
+		uno::Any aConverted;
+		try
+		{
+			aConverted = xConverter->convertTo( nColumnIndex, getCppuType((sal_Int32*)0) );
+			bIsColumnIndex = ( aConverted >>= nColumn );
+		}
+		catch( uno::Exception& ) {} // silence any errors
+	}
+                                                                                                                       
+	RangeHelper thisRange( mxRange );
+	table::CellRangeAddress thisRangeAddress =  thisRange.getCellRangeAddressable()->getRangeAddress();
+	uno::Reference< table::XCellRange > xSheetRange = thisRange.getCellRangeFromSheet();
+	if( !bIsIndex && !bIsColumnIndex ) // .Cells
+		// #FIXE needs proper parent ( Worksheet )
+		return uno::Reference< excel::XRange >( new ScVbaRange( uno::Reference< XHelperInterface >(), mxContext, mxRange ) );
+
+	sal_Int32 nIndex = --nRow;
+	if( bIsIndex && !bIsColumnIndex ) // .Cells(n)
+	{
+		uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, ::uno::UNO_QUERY_THROW);
+		sal_Int32 nColCount = xColumnRowRange->getColumns()->getCount();
+
+		if ( !nIndex || nIndex < 0 )
+			nRow = 0;
+		else
+			nRow = nIndex / nColCount;
+		nColumn = nIndex % nColCount;
+	}
+	else
+		--nColumn;
+	nRow = nRow + thisRangeAddress.StartRow;
+	nColumn =  nColumn + thisRangeAddress.StartColumn;	
+	return new ScVbaRange( getParent(), mxContext, xSheetRange->getCellRangeByPosition( nColumn, nRow,                                        nColumn, nRow ) );
+}
+
+void
+ScVbaRange::Select() throw (uno::RuntimeException)
+{
+	ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
+	if ( !pUnoRangesBase )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying uno range object" ) ), uno::Reference< uno::XInterface >()  );
+	ScDocShell* pShell = pUnoRangesBase->GetDocShell();
+	if ( pShell )
+	{
+		uno::Reference< frame::XModel > xModel( pShell->GetModel(), uno::UNO_QUERY_THROW );
+		uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+		if ( mxRanges.is() )
+			xSelection->select( uno::makeAny( mxRanges ) );
+		else
+			xSelection->select( uno::makeAny( mxRange ) );
+		// set focus on document e.g.
+		// ThisComponent.CurrentController.Frame.getContainerWindow.SetFocus
+		try
+		{
+			uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+			uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_QUERY_THROW );
+			uno::Reference< awt::XWindow > xWin( xFrame->getContainerWindow(), uno::UNO_QUERY_THROW );
+			xWin->setFocus();
+		}
+		catch( uno::Exception& )
+		{
+		}		
+
+	}
+}
+
+bool cellInRange( const table::CellRangeAddress& rAddr, const sal_Int32& nCol, const sal_Int32& nRow )
+{
+	if ( nCol >= rAddr.StartColumn && nCol <= rAddr.EndColumn &&
+		nRow >= rAddr.StartRow && nRow <= rAddr.EndRow )
+		return true;
+	return false;
+}
+
+void setCursor(  const SCCOL& nCol, const SCROW& nRow, const uno::Reference< frame::XModel >& xModel,  bool bInSel = true )
+{
+	ScTabViewShell* pShell = excel::getBestViewShell( xModel );
+	if ( pShell )
+	{
+		if ( bInSel )
+			pShell->SetCursor( nCol, nRow );
+		else
+			pShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_NONE, FALSE, FALSE, TRUE, FALSE );
+	}
+}
+
+void
+ScVbaRange::Activate() throw (uno::RuntimeException)
+{
+	// get first cell of current range
+	uno::Reference< table::XCellRange > xCellRange;
+	if ( mxRanges.is() )
+	{
+		uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW  );
+		xCellRange.set( xIndex->getByIndex( 0 ), uno::UNO_QUERY_THROW );
+	}
+	else
+		xCellRange.set( mxRange, uno::UNO_QUERY_THROW );
+
+	RangeHelper thisRange( xCellRange );
+	uno::Reference< sheet::XCellRangeAddressable > xThisRangeAddress = thisRange.getCellRangeAddressable();
+	table::CellRangeAddress thisRangeAddress = xThisRangeAddress->getRangeAddress();
+        uno::Reference< frame::XModel > xModel;	
+        ScDocShell* pShell = getScDocShell();
+
+        if ( pShell )
+            xModel = pShell->GetModel();
+
+        if ( !xModel.is() )
+            throw uno::RuntimeException(); 
+
+	// get current selection
+	uno::Reference< sheet::XCellRangeAddressable > xRange( xModel->getCurrentSelection(), ::uno::UNO_QUERY);
+
+	uno::Reference< sheet::XSheetCellRanges > xRanges( xModel->getCurrentSelection(), ::uno::UNO_QUERY);
+
+	if ( xRanges.is() )
+	{
+		uno::Sequence< table::CellRangeAddress > nAddrs = xRanges->getRangeAddresses();
+		for ( sal_Int32 index = 0; index < nAddrs.getLength(); ++index )
+		{
+			if ( cellInRange( nAddrs[index], thisRangeAddress.StartColumn, thisRangeAddress.StartRow ) )
+			{
+				setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel );
+				return;
+			}
+			
+		}
+	}	
+
+	if ( xRange.is() && cellInRange( xRange->getRangeAddress(), thisRangeAddress.StartColumn, thisRangeAddress.StartRow ) )
+		setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel );
+	else
+	{
+		// if this range is multi cell select the range other
+		// wise just position the cell at this single range position
+		if ( isSingleCellRange() ) 
+			// This top-leftmost cell of this Range is not in the current
+			// selection so just select this range
+			setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel, false  );
+		else
+			Select();
+	}
+
+}
+
+uno::Reference< excel::XRange >
+ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException)
+{
+	SCROW nStartRow = 0;
+	SCROW nEndRow = 0;
+
+	sal_Int32 nValue = 0;
+	rtl::OUString sAddress;
+
+	if ( aIndex.hasValue() )
+	{
+		ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
+		ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
+
+		ScRange aRange = *aCellRanges.First();
+		if( aIndex >>= nValue )
+		{
+			aRange.aStart.SetRow( aRange.aStart.Row() + --nValue );
+			aRange.aEnd.SetRow( aRange.aStart.Row() );
+		}
+		
+		else if ( aIndex >>= sAddress ) 
+		{
+			ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
+			ScRange tmpRange;
+			tmpRange.ParseRows( sAddress, getDocumentFromRange( mxRange ), dDetails );
+			nStartRow = tmpRange.aStart.Row();
+			nEndRow = tmpRange.aEnd.Row();
+
+			aRange.aStart.SetRow( aRange.aStart.Row() + nStartRow );
+			aRange.aEnd.SetRow( aRange.aStart.Row() + ( nEndRow  - nStartRow ));
+		}
+		else
+			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal param" ) ), uno::Reference< uno::XInterface >() );
+		
+		if ( aRange.aStart.Row() < 0 || aRange.aEnd.Row() < 0 )
+			throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() );
+		// return a normal range ( even for multi-selection
+		uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) );
+		return new ScVbaRange( getParent(), mxContext, xRange, true  );
+	}
+	// Rows() - no params
+	if ( m_Areas->getCount() > 1 )
+		return new ScVbaRange(  getParent(), mxContext, mxRanges, true );
+	return new ScVbaRange(  getParent(), mxContext, mxRange, true );
+}	
+
+uno::Reference< excel::XRange >
+ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException)
+{
+	SCCOL nStartCol = 0;
+	SCCOL nEndCol = 0;
+
+	sal_Int32 nValue = 0;
+	rtl::OUString sAddress;
+
+	ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
+	ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
+
+	ScRange aRange = *aCellRanges.First();
+	if ( aIndex.hasValue() )
+	{
+		if ( aIndex >>= nValue )
+		{
+			aRange.aStart.SetCol( aRange.aStart.Col() + static_cast< SCCOL > ( --nValue ) );
+			aRange.aEnd.SetCol( aRange.aStart.Col() );
+		}
+		
+		else if ( aIndex >>= sAddress ) 
+		{
+			ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
+			ScRange tmpRange;
+			tmpRange.ParseCols( sAddress, getDocumentFromRange( mxRange ), dDetails );
+			nStartCol = tmpRange.aStart.Col();
+			nEndCol = tmpRange.aEnd.Col();
+
+			aRange.aStart.SetCol( aRange.aStart.Col() + nStartCol );
+			aRange.aEnd.SetCol( aRange.aStart.Col() + ( nEndCol  - nStartCol ));
+		}
+		else
+			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal param" ) ), uno::Reference< uno::XInterface >() );
+		
+		if ( aRange.aStart.Col() < 0 || aRange.aEnd.Col() < 0 )
+			throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() );
+	}
+	// Columns() - no params
+	//return new ScVbaRange(  getParent(), mxContext, mxRange, false, true );
+	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) );
+	return new ScVbaRange( getParent(), mxContext, xRange, false, true  );
+}	
+
+void
+ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	sal_Bool bIsMerged = sal_False;
+	aIsMerged >>= bIsMerged;
+	uno::Reference< util::XMergeable > xMerge( mxRange, ::uno::UNO_QUERY_THROW );
+	//FIXME need to check whether all the cell contents are retained or lost by popping up a dialog 
+	xMerge->merge( bIsMerged );
+}
+                                                                                                                             
+uno::Any
+ScVbaRange::getMergeCells() throw (script::BasicErrorException, uno::RuntimeException)
+{
+	sal_Int32 nItems = m_Areas->getCount();
+	
+	if ( nItems > 1 )
+	{
+		uno::Any aResult = aNULL();	
+		for ( sal_Int32 index=1; index != nItems; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+			if ( index > 1 )
+				if ( aResult != xRange->getMergeCells() )
+					return aNULL();
+			aResult = xRange->getMergeCells();	
+			if ( aNULL() == aResult ) 
+				return aNULL();
+		}
+		return aResult;
+		
+	}
+	uno::Reference< util::XMergeable > xMerge( mxRange, ::uno::UNO_QUERY_THROW );
+	return uno::makeAny( xMerge->getIsMerged() );
+}
+                                                                                                                             
+void
+ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
+	if ( Destination.hasValue() )
+	{
+		uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW );
+		uno::Any aRange = xRange->getCellRange();
+		uno::Reference< table::XCellRange > xCellRange;
+		aRange >>= xCellRange;
+		uno::Reference< sheet::XSheetCellRange > xSheetCellRange(xCellRange, ::uno::UNO_QUERY_THROW);
+		uno::Reference< sheet::XSpreadsheet > xSheet = xSheetCellRange->getSpreadsheet();
+		uno::Reference< table::XCellRange > xDest( xSheet, uno::UNO_QUERY_THROW );
+		uno::Reference< sheet::XCellRangeMovement > xMover( xSheet, uno::UNO_QUERY_THROW);
+		uno::Reference< sheet::XCellAddressable > xDestination( xDest->getCellByPosition(
+												xRange->getColumn()-1,xRange->getRow()-1), uno::UNO_QUERY_THROW );
+		uno::Reference< sheet::XCellRangeAddressable > xSource( mxRange, uno::UNO_QUERY);
+		xMover->copyRange( xDestination->getCellAddress(), xSource->getRangeAddress() );
+	}
+	else
+	{
+		uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
+		Select();
+		excel::implnCopy( xModel );
+	}
+}
+
+void
+ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
+	if (Destination.hasValue())
+	{
+		uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW );
+		uno::Reference< table::XCellRange > xCellRange( xRange->getCellRange(), uno::UNO_QUERY_THROW );
+		uno::Reference< sheet::XSheetCellRange > xSheetCellRange(xCellRange, ::uno::UNO_QUERY_THROW );
+		uno::Reference< sheet::XSpreadsheet > xSheet = xSheetCellRange->getSpreadsheet();
+		uno::Reference< table::XCellRange > xDest( xSheet, uno::UNO_QUERY_THROW );
+		uno::Reference< sheet::XCellRangeMovement > xMover( xSheet, uno::UNO_QUERY_THROW);
+		uno::Reference< sheet::XCellAddressable > xDestination( xDest->getCellByPosition(
+												xRange->getColumn()-1,xRange->getRow()-1), uno::UNO_QUERY);
+		uno::Reference< sheet::XCellRangeAddressable > xSource( mxRange, uno::UNO_QUERY);
+		xMover->moveRange( xDestination->getCellAddress(), xSource->getRangeAddress() );
+	}
+	//VBA, minz@cn.ibm.com.
+	else {
+		uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
+		Select();
+		excel::implnCut( xModel );
+	}
+}
+                                                                                                                             
+void
+ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErrorException, uno::RuntimeException)
+{
+	rtl::OUString sFormat;
+	aFormat >>= sFormat;
+	if ( m_Areas->getCount() > 1 )
+	{
+		sal_Int32 nItems = m_Areas->getCount();
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+			xRange->setNumberFormat( aFormat );	
+		}
+		return;
+	}
+	NumFormatHelper numFormat( mxRange );
+	numFormat.setNumberFormat( sFormat );
+}
+                                                                                                                             
+uno::Any
+ScVbaRange::getNumberFormat() throw ( script::BasicErrorException, uno::RuntimeException)
+{
+
+	if ( m_Areas->getCount() > 1 )
+	{
+		sal_Int32 nItems = m_Areas->getCount();
+		uno::Any aResult = aNULL();
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+			// if the numberformat of one area is different to another
+			// return null
+			if ( index > 1 )
+				if ( aResult != xRange->getNumberFormat() )
+					return aNULL();
+			aResult = xRange->getNumberFormat();	
+			if ( aNULL() == aResult ) 
+				return aNULL();
+		}
+		return aResult;
+	}
+	NumFormatHelper numFormat( mxRange );
+	rtl::OUString sFormat = numFormat.getNumberFormatString();
+	if ( sFormat.getLength() > 0 )
+		return uno::makeAny( sFormat );
+	return aNULL();
+}
+
+uno::Reference< excel::XRange >
+ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw (uno::RuntimeException)
+{
+	long nRowSize = 0, nColumnSize = 0;
+	sal_Bool bIsRowChanged = ( RowSize >>= nRowSize ), bIsColumnChanged = ( ColumnSize >>= nColumnSize );
+	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, ::uno::UNO_QUERY_THROW);
+	uno::Reference< sheet::XSheetCellRange > xSheetRange(mxRange, ::uno::UNO_QUERY_THROW);
+	uno::Reference< sheet::XSheetCellCursor > xCursor( xSheetRange->getSpreadsheet()->createCursorByRange(xSheetRange), ::uno::UNO_QUERY_THROW );
+
+	if( !bIsRowChanged )
+		nRowSize = xColumnRowRange->getRows()->getCount();
+	if( !bIsColumnChanged )
+		nColumnSize = xColumnRowRange->getColumns()->getCount();
+
+	xCursor->collapseToSize( nColumnSize, nRowSize );
+	uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xCursor, ::uno::UNO_QUERY_THROW );
+	uno::Reference< table::XCellRange > xRange( xSheetRange->getSpreadsheet(), ::uno::UNO_QUERY_THROW );
+	return new ScVbaRange( getParent(), mxContext,xRange->getCellRangeByPosition(
+										xCellRangeAddressable->getRangeAddress().StartColumn,
+										xCellRangeAddressable->getRangeAddress().StartRow,
+										xCellRangeAddressable->getRangeAddress().EndColumn,
+										xCellRangeAddressable->getRangeAddress().EndRow ) );
+}
+                                                                                                                             
+void
+ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		sal_Int32 nItems = m_Areas->getCount();
+		uno::Any aResult;
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+			xRange->setWrapText( aIsWrapped );	
+		}
+		return;
+	}
+
+	uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY_THROW );
+	xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTextWrapped" ) ), aIsWrapped );
+}
+                                                                                                                             
+uno::Any
+ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		sal_Int32 nItems = m_Areas->getCount();
+		uno::Any aResult;
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+				uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+				if ( index > 1 )
+				if ( aResult != xRange->getWrapText() )
+					return aNULL();
+			aResult = xRange->getWrapText(); 
+		}
+		return aResult;
+	}
+
+	SfxItemSet* pDataSet = getCurrentDataSet();
+	
+	SfxItemState eState = pDataSet->GetItemState( ATTR_LINEBREAK, TRUE, NULL);
+	if ( eState == SFX_ITEM_DONTCARE )
+		return aNULL();
+	
+	uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY_THROW );
+	uno::Any aValue = xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTextWrapped" ) ) );
+	return aValue;
+}
+
+uno::Reference< excel::XInterior > ScVbaRange::Interior( ) throw ( script::BasicErrorException, uno::RuntimeException)
+{
+	uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW );
+        return new ScVbaInterior ( this, mxContext, xProps, getScDocument() );
+}                                                                                                                             
+uno::Reference< excel::XRange >
+ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2 ) throw (uno::RuntimeException)
+{
+    return Range( Cell1, Cell2, false );
+}
+uno::Reference< excel::XRange >
+ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (uno::RuntimeException)
+
+{
+	uno::Reference< table::XCellRange > xCellRange = mxRange;
+
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW );
+		xCellRange.set( xIndex->getByIndex( 0 ), uno::UNO_QUERY_THROW );
+	}
+	else
+		xCellRange.set( mxRange );
+
+	RangeHelper thisRange( xCellRange );
+	uno::Reference< table::XCellRange > xRanges = thisRange.getCellRangeFromSheet();
+	uno::Reference< sheet::XCellRangeAddressable > xAddressable( xRanges, uno::UNO_QUERY_THROW );
+
+	uno::Reference< table::XCellRange > xReferrer = 
+		xRanges->getCellRangeByPosition( getColumn()-1, getRow()-1, 
+				xAddressable->getRangeAddress().EndColumn, 
+				xAddressable->getRangeAddress().EndRow );
+	// xAddressable now for this range	
+	xAddressable.set( xReferrer, uno::UNO_QUERY_THROW );
+
+	
+	if( !Cell1.hasValue() )
+		throw uno::RuntimeException(
+			rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " Invalid Argument " ) ),
+			uno::Reference< XInterface >() );
+
+	table::CellRangeAddress resultAddress;
+	table::CellRangeAddress parentRangeAddress = xAddressable->getRangeAddress();
+
+	ScRange aRange;
+	// Cell1 defined only
+	if ( !Cell2.hasValue() )
+	{
+		rtl::OUString sName;
+		Cell1 >>= sName;
+		RangeHelper referRange( xReferrer );		
+		table::CellRangeAddress referAddress = referRange.getCellRangeAddressable()->getRangeAddress();
+		return getRangeForName( mxContext, sName, getScDocShell(), referAddress );
+ 
+	}
+	else
+	{
+		table::CellRangeAddress  cell1, cell2;
+		cell1 = getCellRangeAddressForVBARange( Cell1, getScDocShell() ); 	
+		// Cell1 & Cell2 defined
+		// Excel seems to combine the range as the range defined by
+		// the combination of Cell1 & Cell2
+	
+		cell2 = getCellRangeAddressForVBARange( Cell2, getScDocShell() ); 	
+
+		resultAddress.StartColumn = ( cell1.StartColumn <  cell2.StartColumn ) ? cell1.StartColumn : cell2.StartColumn;
+		resultAddress.StartRow = ( cell1.StartRow <  cell2.StartRow ) ? cell1.StartRow : cell2.StartRow;
+		resultAddress.EndColumn = ( cell1.EndColumn >  cell2.EndColumn ) ? cell1.EndColumn : cell2.EndColumn;
+		resultAddress.EndRow = ( cell1.EndRow >  cell2.EndRow ) ? cell1.EndRow : cell2.EndRow;
+		if ( bForceUseInpuRangeTab )
+		{
+			// this is a call from Application.Range( x,y )
+			// its possiblefor x or y to specify a different sheet from
+			// the current or active on ( but they must be the same )
+			if ( cell1.Sheet != cell2.Sheet )
+				throw uno::RuntimeException();
+			parentRangeAddress.Sheet = cell1.Sheet;
+		}
+		else
+		{
+			// this is not a call from Application.Range( x,y )
+			// if a different sheet from this range is specified it's
+			// an error
+			if ( parentRangeAddress.Sheet != cell1.Sheet 
+			|| parentRangeAddress.Sheet != cell2.Sheet 
+			)
+				throw uno::RuntimeException();
+
+		}
+		ScUnoConversion::FillScRange( aRange, resultAddress );
+	}
+	ScRange parentAddress;
+	ScUnoConversion::FillScRange( parentAddress, parentRangeAddress);	
+	if ( aRange.aStart.Col() >= 0 && aRange.aStart.Row() >= 0 && aRange.aEnd.Col() >= 0 && aRange.aEnd.Row() >= 0 )
+	{
+		sal_Int32 nStartX = parentAddress.aStart.Col() + aRange.aStart.Col();
+		sal_Int32 nStartY = parentAddress.aStart.Row() + aRange.aStart.Row();
+		sal_Int32 nEndX = parentAddress.aStart.Col() + aRange.aEnd.Col();
+		sal_Int32 nEndY = parentAddress.aStart.Row() + aRange.aEnd.Row();
+
+		if ( nStartX <= nEndX && nEndX <= parentAddress.aEnd.Col() &&
+			 nStartY <= nEndY && nEndY <= parentAddress.aEnd.Row() )
+		{
+			ScRange aNew( (SCCOL)nStartX, (SCROW)nStartY, parentAddress.aStart.Tab(),
+						  (SCCOL)nEndX, (SCROW)nEndY, parentAddress.aEnd.Tab() );
+			xCellRange = new ScCellRangeObj( getScDocShell(), aNew );
+		}
+	}
+		
+	return new ScVbaRange( getParent(), mxContext, xCellRange );
+
+}
+
+// Allow access to underlying openoffice uno api ( useful for debugging
+// with openoffice basic ) 
+::com::sun::star::uno::Any SAL_CALL
+ScVbaRange::getCellRange(  ) throw (::com::sun::star::uno::RuntimeException)
+{
+	uno::Any aAny;
+	if ( mxRanges.is() )
+		aAny <<= mxRanges;
+	else if ( mxRange.is() )
+		aAny <<= mxRange;
+	return aAny;
+}
+
+static USHORT 
+getPasteFlags (sal_Int32 Paste)
+{
+	USHORT nFlags = IDF_NONE;	
+	switch (Paste) {
+        case excel::XlPasteType::xlPasteComments: 
+		nFlags = IDF_NOTE;break;
+        case excel::XlPasteType::xlPasteFormats: 
+		nFlags = IDF_ATTRIB;break;
+        case excel::XlPasteType::xlPasteFormulas: 
+		nFlags = IDF_FORMULA;break;
+        case excel::XlPasteType::xlPasteFormulasAndNumberFormats : 
+        case excel::XlPasteType::xlPasteValues: 
+#ifdef VBA_OOBUILD_HACK
+		nFlags = ( IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_SPECIAL_BOOLEAN ); break;
+#else
+		nFlags = ( IDF_VALUE | IDF_DATETIME | IDF_STRING ); break;
+#endif
+        case excel::XlPasteType::xlPasteValuesAndNumberFormats:
+		nFlags = IDF_VALUE | IDF_ATTRIB; break;
+        case excel::XlPasteType::xlPasteColumnWidths:
+        case excel::XlPasteType::xlPasteValidation: 
+		nFlags = IDF_NONE;break;
+	case excel::XlPasteType::xlPasteAll: 
+        case excel::XlPasteType::xlPasteAllExceptBorders: 
+	default:
+		nFlags = IDF_ALL;break;
+	};
+return nFlags;
+}
+
+static USHORT 
+getPasteFormulaBits( sal_Int32 Operation)
+{
+	USHORT nFormulaBits = PASTE_NOFUNC ;
+	switch (Operation)
+	{
+	case excel::XlPasteSpecialOperation::xlPasteSpecialOperationAdd: 
+		nFormulaBits = PASTE_ADD;break;
+	case excel::XlPasteSpecialOperation::xlPasteSpecialOperationSubtract: 
+		nFormulaBits = PASTE_SUB;break;
+	case excel::XlPasteSpecialOperation::xlPasteSpecialOperationMultiply: 
+		nFormulaBits = PASTE_MUL;break;
+	case excel::XlPasteSpecialOperation::xlPasteSpecialOperationDivide:
+		nFormulaBits = PASTE_DIV;break;
+
+	case excel::XlPasteSpecialOperation::xlPasteSpecialOperationNone: 
+	default:
+		nFormulaBits = PASTE_NOFUNC; break;
+	};
+	
+return nFormulaBits;
+}
+void SAL_CALL 
+ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (::com::sun::star::uno::RuntimeException) 
+{
+	if ( m_Areas->getCount() > 1 )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
+        ScDocShell* pShell = getScDocShell(); 
+  
+        uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW );
+	uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+	// save old selection
+	uno::Reference< uno::XInterface > xSel( xModel->getCurrentSelection() );
+	// select this range
+	xSelection->select( uno::makeAny( mxRange ) );
+	// set up defaults	
+	sal_Int32 nPaste = excel::XlPasteType::xlPasteAll;
+	sal_Int32 nOperation = excel::XlPasteSpecialOperation::xlPasteSpecialOperationNone;
+	sal_Bool bTranspose = sal_False;
+	sal_Bool bSkipBlanks = sal_False;
+
+	if ( Paste.hasValue() )
+		Paste >>= nPaste;
+	if ( Operation.hasValue() )
+		Operation >>= nOperation;
+	if ( SkipBlanks.hasValue() )
+		SkipBlanks >>= bSkipBlanks;
+	if ( Transpose.hasValue() )
+		Transpose >>= bTranspose;
+
+	USHORT nFlags = getPasteFlags(nPaste);
+	USHORT nFormulaBits = getPasteFormulaBits(nOperation);
+	excel::implnPasteSpecial(pShell->GetModel(), nFlags,nFormulaBits,bSkipBlanks,bTranspose);
+	// restore selection
+	xSelection->select( uno::makeAny( xSel ) );
+}
+
+uno::Reference< excel::XRange > 
+ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException)
+{
+	ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
+	// copy the range list
+	ScRangeList aCellRanges = pUnoRangesBase->GetRangeList(); 
+
+	for ( ScRange* pRange = aCellRanges.First() ; pRange; pRange = aCellRanges.Next() )
+	{
+		if ( bColumn ) 
+		{
+			pRange->aStart.SetRow( 0 );
+			pRange->aEnd.SetRow( MAXROW );
+		}	
+		else
+		{
+			pRange->aStart.SetCol( 0 );
+			pRange->aEnd.SetCol( MAXCOL );
+		}
+	}
+	if ( aCellRanges.Count() > 1 ) // Multi-Area
+	{
+		uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pUnoRangesBase->GetDocShell(), aCellRanges ) );
+		
+		return new ScVbaRange( getParent(), mxContext, xRanges, !bColumn, bColumn );
+	}
+	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), *aCellRanges.First() ) );
+	return new ScVbaRange( getParent(), mxContext, xRange, !bColumn, bColumn  );
+}
+
+uno::Reference< excel::XRange > SAL_CALL 
+ScVbaRange::getEntireRow() throw (uno::RuntimeException)
+{
+	return getEntireColumnOrRow(false);
+}
+
+uno::Reference< excel::XRange > SAL_CALL 
+ScVbaRange::getEntireColumn() throw (uno::RuntimeException)
+{
+	return getEntireColumnOrRow();
+}
+
+uno::Reference< excel::XComment > SAL_CALL 
+ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException)
+{
+
+	uno::Reference< excel::XComment > xComment( new ScVbaComment( this, mxContext, mxRange ) );
+        // if there is existing text then error
+	if ( Text.hasValue() && xComment->Text( uno::Any(), uno::Any(), uno::Any() ).getLength() )
+            throw uno::RuntimeException(); 
+        // failed to write text? ( can this happen ?? )
+	if ( !xComment->Text( Text, uno::Any(), uno::Any() ).getLength()  )
+		return NULL;	
+	return xComment;
+}
+
+uno::Reference< excel::XComment > SAL_CALL
+ScVbaRange::getComment() throw (uno::RuntimeException)
+{
+	// intentional behavior to return a null object if no
+	// comment defined
+	uno::Reference< excel::XComment > xComment( new ScVbaComment( this, mxContext, mxRange ) );
+	if ( !xComment->Text( uno::Any(), uno::Any(), uno::Any() ).getLength() )
+		return NULL;
+	return xComment;
+	
+}
+
+uno::Reference< beans::XPropertySet >
+getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool bRows ) throw ( uno::RuntimeException )
+{
+	uno::Reference< table::XColumnRowRange > xColRow( xCellRange, uno::UNO_QUERY_THROW );
+	uno::Reference< beans::XPropertySet > xProps;
+	if ( bRows )
+		xProps.set( xColRow->getRows(), uno::UNO_QUERY_THROW );
+	else
+		xProps.set( xColRow->getColumns(), uno::UNO_QUERY_THROW );
+	return xProps;	
+}
+
+uno::Any SAL_CALL 
+ScVbaRange::getHidden() throw (uno::RuntimeException)
+{
+	// if multi-area result is the result of the 
+	// first area
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(sal_Int32(1)), uno::Any() ), uno::UNO_QUERY_THROW );
+		return xRange->getHidden();	
+	}
+	bool bIsVisible = false;
+	try
+	{
+		uno::Reference< beans::XPropertySet > xProps = getRowOrColumnProps( mxRange, mbIsRows );
+		if ( !( xProps->getPropertyValue( ISVISIBLE ) >>= bIsVisible ) )
+			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to get IsVisible property")), uno::Reference< uno::XInterface >() );
+	}
+	catch( uno::Exception& e )
+	{
+		throw uno::RuntimeException( e.Message, uno::Reference< uno::XInterface >() );
+	}
+	return uno::makeAny( !bIsVisible ); 
+}
+
+void SAL_CALL 
+ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		sal_Int32 nItems = m_Areas->getCount();
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+			xRange->setHidden( _hidden );	
+		}
+		return;
+	}
+
+	sal_Bool bHidden = sal_False;
+	_hidden >>= bHidden;
+
+	try
+	{
+		uno::Reference< beans::XPropertySet > xProps = getRowOrColumnProps( mxRange, mbIsRows );
+		xProps->setPropertyValue( ISVISIBLE, uno::makeAny( !bHidden ) );
+	}
+	catch( uno::Exception& e )
+	{
+		throw uno::RuntimeException( e.Message, uno::Reference< uno::XInterface >() );
+	}	
+}
+
+::sal_Bool SAL_CALL 
+ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat  ) throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		for ( sal_Int32 index = 1; index <= m_Areas->getCount(); ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
+			xRange->Replace( What, Replacement,  LookAt, SearchOrder, MatchCase, MatchByte, SearchFormat, ReplaceFormat );
+		}
+		return sal_True; // seems to return true always ( or at least I haven't found the trick of 
+	}	
+
+	// sanity check required params
+	if ( !What.getLength() /*|| !Replacement.getLength()*/ )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, missing params" )) , uno::Reference< uno::XInterface >() );
+	rtl::OUString sWhat = VBAToRegexp( What);
+	// #TODO #FIXME SearchFormat & ReplacesFormat are not processed
+	// What do we do about MatchByte.. we don't seem to support that
+	const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem();
+	SvxSearchItem newOptions( globalSearchOptions );
+
+	sal_Int16 nLook =  globalSearchOptions.GetWordOnly() ?  excel::XlLookAt::xlPart : excel::XlLookAt::xlWhole; 
+	sal_Int16 nSearchOrder = globalSearchOptions.GetRowDirection() ? excel::XlSearchOrder::xlByRows : excel::XlSearchOrder::xlByColumns;
+
+	sal_Bool bMatchCase = sal_False;
+	uno::Reference< util::XReplaceable > xReplace( mxRange, uno::UNO_QUERY );
+	if ( xReplace.is() )
+	{
+		uno::Reference< util::XReplaceDescriptor > xDescriptor =
+			xReplace->createReplaceDescriptor();
+		
+		xDescriptor->setSearchString( sWhat); 		
+		xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHREGEXP ) ), uno::makeAny( sal_True ) ); 	
+		xDescriptor->setReplaceString( Replacement); 		
+		if ( LookAt.hasValue() )
+		{
+			// sets SearchWords ( true is Cell match )
+			nLook =  ::comphelper::getINT16( LookAt );
+			sal_Bool bSearchWords = sal_False;
+			if ( nLook == excel::XlLookAt::xlPart )
+				bSearchWords = sal_False;
+			else if ( nLook == excel::XlLookAt::xlWhole )
+				bSearchWords = sal_True;
+			else
+				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for LookAt" )) , uno::Reference< uno::XInterface >() );
+			// set global search props ( affects the find dialog
+			// and of course the defaults for this method
+			newOptions.SetWordOnly( bSearchWords );
+			xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHWORDS ) ), uno::makeAny( bSearchWords ) ); 	
+		}
+		// sets SearchByRow ( true for Rows )
+		if ( SearchOrder.hasValue() )
+		{
+			nSearchOrder =  ::comphelper::getINT16( SearchOrder );
+			sal_Bool bSearchByRow = sal_False;
+			if ( nSearchOrder == excel::XlSearchOrder::xlByColumns )
+				bSearchByRow = sal_False;
+			else if ( nSearchOrder == excel::XlSearchOrder::xlByRows )
+				bSearchByRow = sal_True;
+			else
+				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for SearchOrder" )) , uno::Reference< uno::XInterface >() );
+			
+			newOptions.SetRowDirection( bSearchByRow ); 
+			xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHBYROW ) ), uno::makeAny( bSearchByRow ) ); 	
+		}			
+		if ( MatchCase.hasValue() )
+		{
+			// SearchCaseSensitive
+			MatchCase >>= bMatchCase;	
+			xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHCASE ) ), uno::makeAny( bMatchCase ) ); 	
+		}			
+
+		ScGlobal::SetSearchItem( newOptions );	
+		// ignore MatchByte for the moment, its not supported in
+		// OOo.org afaik
+
+		uno::Reference< util::XSearchDescriptor > xSearch( xDescriptor, uno::UNO_QUERY );
+		xReplace->replaceAll( xSearch );
+	}
+	return sal_True; // always
+}
+
+uno::Reference< excel::XRange > SAL_CALL 
+ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ ) throw (uno::RuntimeException)
+{
+    // return a Range object that represents the first cell where that information is found.
+    rtl::OUString sWhat;
+    sal_Int32 nWhat = 0;
+    float fWhat = 0.0;
+    
+    // string.
+    if( What >>= sWhat )
+    {
+        if( !sWhat.getLength() )
+		    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Find, missing params" )) , uno::Reference< uno::XInterface >() );
+    }
+    else if( What >>= nWhat )
+    {
+        sWhat = rtl::OUString::valueOf( nWhat );
+    }
+    else if( What >>= fWhat )
+    {
+        sWhat = rtl::OUString::valueOf( fWhat );
+    }
+    else
+	    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Find, missing params" )) , uno::Reference< uno::XInterface >() );
+
+    rtl::OUString sSearch = VBAToRegexp( sWhat );
+
+	const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem();
+	SvxSearchItem newOptions( globalSearchOptions );
+
+	sal_Int16 nLookAt =  globalSearchOptions.GetWordOnly() ?  excel::XlLookAt::xlPart : excel::XlLookAt::xlWhole; 
+	sal_Int16 nSearchOrder = globalSearchOptions.GetRowDirection() ? excel::XlSearchOrder::xlByRows : excel::XlSearchOrder::xlByColumns;
+
+	uno::Reference< util::XSearchable > xSearch( mxRange, uno::UNO_QUERY );
+    if( xSearch.is() )
+    {
+        uno::Reference< util::XSearchDescriptor > xDescriptor = xSearch->createSearchDescriptor();
+        xDescriptor->setSearchString( sSearch );
+
+        uno::Reference< excel::XRange > xAfterRange;
+        uno::Reference< table::XCellRange > xStartCell;
+        if( After >>= xAfterRange )
+        {
+            // After must be a single cell in the range
+            if( xAfterRange->getCount() > 1 )
+		        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("After must be a single cell." )) , uno::Reference< uno::XInterface >() );
+            uno::Reference< excel::XRange > xCell( Cells( uno::makeAny( xAfterRange->getRow() ), uno::makeAny( xAfterRange->getColumn() ) ), uno::UNO_QUERY );
+            if( !xCell.is() )
+		        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("After must be in range." )) , uno::Reference< uno::XInterface >() );
+            xStartCell.set( xAfterRange->getCellRange(), uno::UNO_QUERY_THROW );
+        }
+
+        // LookIn
+        if( LookIn.hasValue() )
+        {
+            sal_Int32 nLookIn = 0;
+            if( LookIn >>= nLookIn )
+            {
+                sal_Int16 nSearchType = 0; 
+                switch( nLookIn )
+                {
+                    case excel::XlFindLookIn::xlComments :
+                        nSearchType = SVX_SEARCHIN_NOTE; // Notes
+                    break;
+                    case excel::XlFindLookIn::xlFormulas :
+                        nSearchType = SVX_SEARCHIN_FORMULA;
+                    break;
+                    case excel::XlFindLookIn::xlValues :
+                        nSearchType = SVX_SEARCHIN_VALUE;
+                    break;
+                    default:
+		                throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for LookIn." )) , uno::Reference< uno::XInterface >() );
+                }
+                newOptions.SetCellType( nSearchType );
+                xDescriptor->setPropertyValue( rtl::OUString::createFromAscii( "SearchType" ), uno::makeAny( nSearchType ) );
+            }
+        }
+
+        // LookAt
+		if ( LookAt.hasValue() )
+		{
+			nLookAt =  ::comphelper::getINT16( LookAt );
+			sal_Bool bSearchWords = sal_False;
+			if ( nLookAt == excel::XlLookAt::xlPart )
+				bSearchWords = sal_False;
+			else if ( nLookAt == excel::XlLookAt::xlWhole )
+				bSearchWords = sal_True;
+			else
+				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for LookAt" )) , uno::Reference< uno::XInterface >() );
+			newOptions.SetWordOnly( bSearchWords );
+			xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHWORDS ) ), uno::makeAny( bSearchWords ) ); 	
+        }
+
+        // SearchOrder
+		if ( SearchOrder.hasValue() )
+		{
+			nSearchOrder =  ::comphelper::getINT16( SearchOrder );
+			sal_Bool bSearchByRow = sal_False;
+			if ( nSearchOrder == excel::XlSearchOrder::xlByColumns )
+				bSearchByRow = sal_False;
+			else if ( nSearchOrder == excel::XlSearchOrder::xlByRows )
+				bSearchByRow = sal_True;
+			else
+				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for SearchOrder" )) , uno::Reference< uno::XInterface >() );
+			
+			newOptions.SetRowDirection( bSearchByRow ); 
+			xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHBYROW ) ), uno::makeAny( bSearchByRow ) ); 	
+		}			
+
+        // SearchDirection
+        if ( SearchDirection.hasValue() )
+        {
+            sal_Int32 nSearchDirection = 0;
+            if( SearchDirection >>= nSearchDirection )
+            {
+                sal_Bool bSearchBackwards = sal_False;
+                if ( nSearchDirection == excel::XlSearchDirection::xlNext )
+                    bSearchBackwards = sal_False; 
+                else if( nSearchDirection == excel::XlSearchDirection::xlPrevious )
+                    bSearchBackwards = sal_True;
+                else
+				    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for SearchDirection" )) , uno::Reference< uno::XInterface >() );
+                newOptions.SetBackward( bSearchBackwards );
+                xDescriptor->setPropertyValue( rtl::OUString::createFromAscii( "SearchBackwards" ), uno::makeAny( bSearchBackwards ) );
+            }
+        }
+
+        // MatchCase
+        sal_Bool bMatchCase = sal_False;
+		if ( MatchCase.hasValue() )
+		{
+			// SearchCaseSensitive
+			if( !( MatchCase >>= bMatchCase ) )
+			    throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for MatchCase" )) , uno::Reference< uno::XInterface >() );
+		}			
+        xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHCASE ) ), uno::makeAny( bMatchCase ) ); 	
+
+        // MatchByte
+        // SearchFormat
+        // ignore
+
+		ScGlobal::SetSearchItem( newOptions );	
+
+		uno::Reference< util::XSearchDescriptor > xSearchDescriptor( xDescriptor, uno::UNO_QUERY );
+		uno::Reference< uno::XInterface > xInterface = xStartCell.is() ? xSearch->findNext( xStartCell, xSearchDescriptor) : xSearch->findFirst( xSearchDescriptor );
+		uno::Reference< table::XCellRange > xCellRange( xInterface, uno::UNO_QUERY );
+        if ( xCellRange.is() )
+        {
+            uno::Reference< excel::XRange > xResultRange = new ScVbaRange( this, mxContext, xCellRange );
+            if( xResultRange.is() )
+            {
+                xResultRange->Select();
+                return xResultRange;
+            }
+        }
+
+    }
+
+    return uno::Reference< excel::XRange >();
+}
+
+uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Reference<  uno::XComponentContext >& xContext, ScDocShell* pDocSh )
+{
+	uno::Reference< excel::XRange > xKeyRange;
+	if ( Key.getValueType() == excel::XRange::static_type() )
+	{
+		xKeyRange.set( Key, uno::UNO_QUERY_THROW );
+	}
+	else if ( Key.getValueType() == ::getCppuType( static_cast< const rtl::OUString* >(0) )  )
+			
+	{
+		rtl::OUString sRangeName = ::comphelper::getString( Key );
+		table::CellRangeAddress  aRefAddr;
+		if ( !pDocSh )
+			throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Range::Sort no docshell to calculate key param")), uno::Reference< uno::XInterface >() );
+		xKeyRange = getRangeForName( xContext, sRangeName, pDocSh, aRefAddr ); 
+	}
+	else
+		throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Range::Sort illegal type value for key param")), uno::Reference< uno::XInterface >() );
+	uno::Reference< table::XCellRange > xKey;
+	xKey.set( xKeyRange->getCellRange(), uno::UNO_QUERY_THROW );
+	return xKey;
+}
+
+// helper method for Sort
+sal_Int32 findSortPropertyIndex( const uno::Sequence< beans::PropertyValue >& props,
+const rtl::OUString& sPropName ) throw( uno::RuntimeException )
+{
+	const beans::PropertyValue* pProp = props.getConstArray();
+	sal_Int32 nItems = props.getLength();
+
+	 sal_Int32 count=0;
+	for ( ; count < nItems; ++count, ++pProp )
+		if ( pProp->Name.equals( sPropName ) )
+			return count;
+	if ( count == nItems )
+		throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Range::Sort unknown sort property")), uno::Reference< uno::XInterface >() );
+	return -1; //should never reach here ( satisfy compiler )
+}
+
+// helper method for Sort
+void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRange,
+	const uno::Reference< table::XCellRange >& xColRowKey, sal_Int16 nOrder, 
+	table::TableSortField& aTableField, sal_Bool bIsSortColumn, sal_Bool bMatchCase ) throw ( uno::RuntimeException )
+{
+		RangeHelper parentRange( xParentRange );	
+		RangeHelper colRowRange( xColRowKey );	
+
+		table::CellRangeAddress parentRangeAddress = parentRange.getCellRangeAddressable()->getRangeAddress();
+
+		table::CellRangeAddress colRowKeyAddress = colRowRange.getCellRangeAddressable()->getRangeAddress();
+
+		// make sure that upper left poing of key range is within the
+		// parent range
+		if (  ( !bIsSortColumn && colRowKeyAddress.StartColumn >= parentRangeAddress.StartColumn &&
+			colRowKeyAddress.StartColumn <= parentRangeAddress.EndColumn ) || ( bIsSortColumn && 
+			colRowKeyAddress.StartRow >= parentRangeAddress.StartRow &&
+			colRowKeyAddress.StartRow <= parentRangeAddress.EndRow  ) )
+		{
+			//determine col/row index
+			if ( bIsSortColumn )
+				aTableField.Field = colRowKeyAddress.StartRow - parentRangeAddress.StartRow;			 
+			else
+				aTableField.Field = colRowKeyAddress.StartColumn - parentRangeAddress.StartColumn;			 
+			aTableField.IsCaseSensitive = bMatchCase;
+
+			if ( nOrder ==  excel::XlSortOrder::xlAscending ) 
+				aTableField.IsAscending = sal_True; 
+			else	
+				aTableField.IsAscending = sal_False; 
+		}
+		else
+			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal Key param" ) ), uno::Reference< uno::XInterface >() );
+
+						
+} 
+
+void SAL_CALL
+ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& Key2, const uno::Any& /*Type*/, const uno::Any& Order2, const uno::Any& Key3, const uno::Any& Order3, const uno::Any& Header, const uno::Any& OrderCustom, const uno::Any& MatchCase, const uno::Any& Orientation, const uno::Any& SortMethod,  const uno::Any& DataOption1, const uno::Any& DataOption2, const uno::Any& DataOption3  ) throw (uno::RuntimeException)
+{
+	// #TODO# #FIXME# can we do something with Type
+	if ( m_Areas->getCount() > 1 )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
+
+	sal_Int16 nDataOption1 = excel::XlSortDataOption::xlSortNormal;
+	sal_Int16 nDataOption2 = excel::XlSortDataOption::xlSortNormal;;
+	sal_Int16 nDataOption3 = excel::XlSortDataOption::xlSortNormal;
+
+	ScDocument* pDoc = getScDocument();
+	if ( !pDoc )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
+
+	RangeHelper thisRange( mxRange );
+	table::CellRangeAddress thisRangeAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+	ScSortParam aSortParam;
+	SCTAB nTab = thisRangeAddress.Sheet;
+	pDoc->GetSortParam( aSortParam, nTab );
+
+	if ( DataOption1.hasValue() )
+		DataOption1 >>= nDataOption1;
+	if ( DataOption2.hasValue() )
+		DataOption2 >>= nDataOption2;
+	if ( DataOption3.hasValue() )
+		DataOption3 >>= nDataOption3;
+
+	// 1) #TODO #FIXME need to process DataOption[1..3] not used currently
+	// 2) #TODO #FIXME need to refactor this ( below ) into a IsSingleCell() method
+	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
+			
+	// 'Fraid I don't remember what I was trying to achieve here ???
+/* 
+	if (  isSingleCellRange() )
+	{
+		uno::Reference< XRange > xCurrent = CurrentRegion();
+		xCurrent->Sort( Key1, Order1, Key2, Type, Order2, Key3, Order3, Header, OrderCustom, MatchCase, Orientation, SortMethod, DataOption1, DataOption2, DataOption3 );
+		return; 
+	}
+*/
+	// set up defaults
+
+	sal_Int16 nOrder1 = aSortParam.bAscending[0] ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
+	sal_Int16 nOrder2 = aSortParam.bAscending[1] ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
+	sal_Int16 nOrder3 = aSortParam.bAscending[2] ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
+
+	sal_Int16 nCustom = aSortParam.nUserIndex;
+	sal_Int16 nSortMethod = excel::XlSortMethod::xlPinYin;
+	sal_Bool bMatchCase = aSortParam.bCaseSens;
+
+	// seems to work opposite to expected, see below
+	sal_Int16 nOrientation = aSortParam.bByRow ?  excel::XlSortOrientation::xlSortColumns :  excel::XlSortOrientation::xlSortRows;
+
+	if ( Orientation.hasValue() )
+	{
+		// Documentation says xlSortRows is default but that doesn't appear to be 
+		// the case. Also it appears that xlSortColumns is the default which 
+		// strangely enought sorts by Row
+		nOrientation = ::comphelper::getINT16( Orientation );
+		// persist new option to be next calls default
+		if ( nOrientation == excel::XlSortOrientation::xlSortRows )
+			aSortParam.bByRow = FALSE;
+		else
+			aSortParam.bByRow = TRUE;
+
+	}
+
+	sal_Bool bIsSortColumns=sal_False; // sort by row
+
+	if ( nOrientation == excel::XlSortOrientation::xlSortRows )
+		bIsSortColumns = sal_True;
+	sal_Int16 nHeader = 0;
+#ifdef VBA_OOBUILD_HACK
+	nHeader = aSortParam.nCompatHeader;
+#endif
+	sal_Bool bContainsHeader = sal_False;
+
+	if ( Header.hasValue() )
+	{
+		nHeader = ::comphelper::getINT16( Header );
+#ifdef VBA_OOBUILD_HACK
+		aSortParam.nCompatHeader = nHeader;
+#endif
+	}			
+
+	if ( nHeader == excel::XlYesNoGuess::xlGuess )
+	{
+		bool bHasColHeader = pDoc->HasColHeader(  static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), static_cast< SCCOL >( thisRangeAddress.EndColumn ), static_cast< SCROW >( thisRangeAddress.EndRow ), static_cast< SCTAB >( thisRangeAddress.Sheet ));
+		bool bHasRowHeader = pDoc->HasRowHeader(  static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), static_cast< SCCOL >( thisRangeAddress.EndColumn ), static_cast< SCROW >( thisRangeAddress.EndRow ), static_cast< SCTAB >( thisRangeAddress.Sheet ) );
+		if ( bHasColHeader || bHasRowHeader )
+			nHeader =  excel::XlYesNoGuess::xlYes; 
+		else
+			nHeader =  excel::XlYesNoGuess::xlNo; 
+#ifdef VBA_OOBUILD_HACK 
+		aSortParam.nCompatHeader = nHeader;
+#endif
+	}
+
+	if ( nHeader == excel::XlYesNoGuess::xlYes )
+		bContainsHeader = sal_True;
+
+	if ( SortMethod.hasValue() )
+	{
+		nSortMethod = ::comphelper::getINT16( SortMethod );
+	}
+	
+	if ( OrderCustom.hasValue() )
+	{
+		OrderCustom >>= nCustom;
+		--nCustom; // 0-based in OOo
+		aSortParam.nUserIndex = nCustom;
+	}
+
+	if ( MatchCase.hasValue() )
+	{
+		MatchCase >>= bMatchCase;
+		aSortParam.bCaseSens = bMatchCase;
+	}
+
+	if ( Order1.hasValue() )
+	{
+		nOrder1 = ::comphelper::getINT16(Order1);
+		if (  nOrder1 == excel::XlSortOrder::xlAscending ) 
+			aSortParam.bAscending[0]  = TRUE;
+		else
+			aSortParam.bAscending[0]  = FALSE;
+
+	}
+	if ( Order2.hasValue() )
+	{
+		nOrder2 = ::comphelper::getINT16(Order2);
+		if ( nOrder2 == excel::XlSortOrder::xlAscending ) 
+			aSortParam.bAscending[1]  = TRUE;
+		else
+			aSortParam.bAscending[1]  = FALSE;
+	}
+	if ( Order3.hasValue() )
+	{
+		nOrder3 = ::comphelper::getINT16(Order3);
+		if ( nOrder3 == excel::XlSortOrder::xlAscending ) 
+			aSortParam.bAscending[2]  = TRUE;
+		else
+			aSortParam.bAscending[2]  = FALSE;
+	}
+
+	uno::Reference< table::XCellRange > xKey1;	
+	uno::Reference< table::XCellRange > xKey2;	
+	uno::Reference< table::XCellRange > xKey3;	
+	ScDocShell* pDocShell = getScDocShell();
+	xKey1 = processKey( Key1, mxContext, pDocShell );
+	if ( !xKey1.is() )
+		throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Range::Sort needs a key1 param")), uno::Reference< uno::XInterface >() );
+
+	if ( Key2.hasValue() )
+		xKey2 = processKey( Key2, mxContext, pDocShell );
+	if ( Key3.hasValue() )
+		xKey3 = processKey( Key3, mxContext, pDocShell );
+
+	uno::Reference< util::XSortable > xSort( mxRange, uno::UNO_QUERY_THROW );
+	uno::Sequence< beans::PropertyValue > sortDescriptor = xSort->createSortDescriptor();
+	sal_Int32 nTableSortFieldIndex = findSortPropertyIndex( sortDescriptor, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SortFields") ) );
+
+	uno::Sequence< table::TableSortField > sTableFields(1);
+	sal_Int32 nTableIndex = 0;
+	updateTableSortField(  mxRange, xKey1, nOrder1, sTableFields[ nTableIndex++ ], bIsSortColumns, bMatchCase );
+
+	if ( xKey2.is() ) 
+	{
+		sTableFields.realloc( sTableFields.getLength() + 1 );
+		updateTableSortField(  mxRange, xKey2, nOrder2, sTableFields[ nTableIndex++ ], bIsSortColumns, bMatchCase );
+	}
+	if ( xKey3.is()  ) 
+	{
+		sTableFields.realloc( sTableFields.getLength() + 1 );
+		updateTableSortField(  mxRange, xKey3, nOrder3, sTableFields[ nTableIndex++ ], bIsSortColumns, bMatchCase );
+	}
+	sortDescriptor[ nTableSortFieldIndex ].Value <<= sTableFields;
+
+	sal_Int32 nIndex = 	findSortPropertyIndex( sortDescriptor,  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSortColumns")) );
+	sortDescriptor[ nIndex ].Value <<= bIsSortColumns;
+
+	nIndex = 	findSortPropertyIndex( sortDescriptor, CONTS_HEADER );
+	sortDescriptor[ nIndex ].Value <<= bContainsHeader;
+
+	pDoc->SetSortParam( aSortParam, nTab );
+	xSort->sort( sortDescriptor );
+
+	// #FIXME #TODO
+	// The SortMethod param is not processed ( not sure what its all about, need to
+
+}
+
+uno::Reference< excel::XRange > SAL_CALL 
+ScVbaRange::End( ::sal_Int32 Direction )  throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
+		return xRange->End( Direction );
+	}
+
+	
+	// #FIXME #TODO
+	// euch! found my orig implementation sucked, so 
+	// trying this even suckier one ( really need to use/expose code in
+	// around  ScTabView::MoveCursorArea(), thats the bit that calcutes
+	// where the cursor should go ) 
+	// Main problem with this method is the ultra hacky attempt to preserve
+	// the ActiveCell, there should be no need to go to these extreems
+	
+	// Save ActiveCell pos ( to restore later )
+	uno::Any aDft;
+	uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
+	rtl::OUString sActiveCell = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
+
+	// position current cell upper left of this range
+	Cells( uno::makeAny( (sal_Int32) 1 ), uno::makeAny( (sal_Int32) 1 ) )->Select();
+
+        uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange );
+
+	SfxViewFrame* pViewFrame = excel::getViewFrame( xModel );
+	if ( pViewFrame )
+	{
+		SfxAllItemSet aArgs( SFX_APP()->GetPool() );
+		// Hoping this will make sure this slot is called
+		// synchronously
+		SfxBoolItem sfxAsync( SID_ASYNCHRON, sal_False );
+		aArgs.Put( sfxAsync, sfxAsync.Which() );
+		SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
+
+		USHORT nSID = 0;
+	
+		switch( Direction )
+		{
+			case excel::XlDirection::xlDown:
+				nSID = SID_CURSORBLKDOWN;
+				break;
+			case excel::XlDirection::xlUp:
+				nSID = SID_CURSORBLKUP;
+				break;
+			case excel::XlDirection::xlToLeft:
+				nSID = SID_CURSORBLKLEFT;
+				break;
+			case excel::XlDirection::xlToRight:
+				nSID = SID_CURSORBLKRIGHT;
+				break;
+			default:
+				throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": Invalid ColumnIndex" ) ), uno::Reference< uno::XInterface >() ); 
+		}
+		if ( pDispatcher )
+		{
+			pDispatcher->Execute( nSID, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
+		}
+	}
+
+	// result is the ActiveCell		
+	rtl::OUString sMoved =	xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
+
+	// restore old ActiveCell		
+	uno::Any aVoid;
+
+	uno::Reference< excel::XRange > xOldActiveCell( xApplication->getActiveSheet()->Range( uno::makeAny( sActiveCell ), aVoid ), uno::UNO_QUERY_THROW );
+	xOldActiveCell->Select();
+
+	uno::Reference< excel::XRange > resultCell;
+	
+	resultCell.set( xApplication->getActiveSheet()->Range( uno::makeAny( sMoved ), aVoid ), uno::UNO_QUERY_THROW );
+
+	// return result
+	
+	return resultCell;
+}
+
+bool
+ScVbaRange::isSingleCellRange()
+{
+	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY);
+	if ( xColumnRowRange.is() && xColumnRowRange->getRows()->getCount() == 1 && xColumnRowRange->getColumns()->getCount() == 1 )
+		return true;
+	return false;
+}
+
+uno::Reference< excel::XCharacters > SAL_CALL 
+ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException)
+{
+	if ( !isSingleCellRange() )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can't create Characters property for multicell range ") ), uno::Reference< uno::XInterface >() );
+	uno::Reference< text::XSimpleText > xSimple(mxRange->getCellByPosition(0,0) , uno::UNO_QUERY_THROW );
+	ScDocument* pDoc = getDocumentFromRange(mxRange);
+	if ( !pDoc )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
+
+	ScVbaPalette aPalette( pDoc->GetDocumentShell() );
+	return  new ScVbaCharacters( this, mxContext, aPalette, xSimple, Start, Length );
+}
+
+ void SAL_CALL 
+ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		sal_Int32 nItems = m_Areas->getCount();
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+			xRange->Delete( Shift );	
+		}
+		return;
+	}
+	sheet::CellDeleteMode mode = sheet::CellDeleteMode_NONE ; 
+	RangeHelper thisRange( mxRange );
+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+	if ( Shift.hasValue() )		
+	{
+		sal_Int32 nShift = 0;
+		Shift >>= nShift;
+		switch ( nShift )
+		{
+			case excel::XlDeleteShiftDirection::xlShiftUp:
+				mode = sheet::CellDeleteMode_UP;
+				break;
+			case excel::XlDeleteShiftDirection::xlShiftToLeft:
+				mode = sheet::CellDeleteMode_LEFT;
+				break;
+			default:
+				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ("Illegal paramater ") ), uno::Reference< uno::XInterface >() );
+		}
+	}
+	else
+        {
+		bool bFullRow = ( thisAddress.StartColumn == 0 && thisAddress.EndColumn == MAXCOL );
+	        sal_Int32 nCols = thisAddress.EndColumn - thisAddress.StartColumn;
+	        sal_Int32 nRows = thisAddress.EndRow - thisAddress.StartRow;
+		if ( mbIsRows || bFullRow || ( nCols >=  nRows ) )
+			mode = sheet::CellDeleteMode_UP;
+		else
+			mode = sheet::CellDeleteMode_LEFT;
+	}
+	uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
+	xCellRangeMove->removeRange( thisAddress, mode ); 
+	
+}
+
+//XElementAccess
+sal_Bool SAL_CALL 
+ScVbaRange::hasElements() throw (uno::RuntimeException)
+{
+	uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY );
+	if ( xColumnRowRange.is() )
+		if ( xColumnRowRange->getRows()->getCount() ||
+			xColumnRowRange->getColumns()->getCount() )
+			return sal_True;
+	return sal_False;
+}
+
+// XEnumerationAccess
+uno::Reference< container::XEnumeration > SAL_CALL 
+ScVbaRange::createEnumeration() throw (uno::RuntimeException)
+{
+	if ( mbIsColumns || mbIsRows )
+	{
+		uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY );
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
+                sal_Int32 nElems = 0;
+		if ( mbIsColumns )	
+			nElems = xColumnRowRange->getColumns()->getCount();
+		else
+			nElems = xColumnRowRange->getRows()->getCount();
+                return new ColumnsRowEnumeration( mxContext, xRange, nElems );
+		
+	}
+	return new CellsEnumeration( mxContext, m_Areas );
+}
+
+::rtl::OUString SAL_CALL 
+ScVbaRange::getDefaultMethodName(  ) throw (uno::RuntimeException)
+{
+	const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
+	return sName;
+}
+
+
+uno::Reference< awt::XDevice > 
+getDeviceFromDoc( const uno::Reference< frame::XModel >& xModel ) throw( uno::RuntimeException )
+{
+	uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+	uno::Reference< frame::XFrame> xFrame( xController->getFrame(), uno::UNO_QUERY_THROW );
+	uno::Reference< awt::XDevice > xDevice( xFrame->getComponentWindow(), uno::UNO_QUERY_THROW );
+	return xDevice;
+}
+
+// returns calc internal col. width ( in points )
+double 
+ScVbaRange::getCalcColWidth( const table::CellRangeAddress& rAddress) throw (uno::RuntimeException)
+{
+	ScDocument* pDoc = getScDocument();
+	USHORT nWidth = pDoc->GetOriginalWidth( static_cast< SCCOL >( rAddress.StartColumn ), static_cast< SCTAB >( rAddress.Sheet ) );
+	double nPoints = lcl_TwipsToPoints( nWidth );
+	nPoints = lcl_Round2DecPlaces( nPoints );
+	return nPoints;
+}
+
+double
+ScVbaRange::getCalcRowHeight( const table::CellRangeAddress& rAddress ) throw (uno::RuntimeException)
+{
+	ScDocument* pDoc = getDocumentFromRange( mxRange );
+	USHORT nWidth = pDoc->GetOriginalHeight( rAddress.StartRow, rAddress.Sheet );
+	double nPoints = lcl_TwipsToPoints( nWidth );
+	nPoints = lcl_Round2DecPlaces( nPoints );
+	return nPoints;	
+}
+
+// return Char Width in points
+double getDefaultCharWidth( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException )
+{
+	const static rtl::OUString sDflt( RTL_CONSTASCII_USTRINGPARAM("Default")); 
+	const static rtl::OUString sCharFontName( RTL_CONSTASCII_USTRINGPARAM("CharFontName")); 
+	const static rtl::OUString sPageStyles( RTL_CONSTASCII_USTRINGPARAM("PageStyles")); 
+	// get the font from the default style
+	uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW );
+	uno::Reference< container::XNameAccess > xNameAccess( xStyleSupplier->getStyleFamilies(), uno::UNO_QUERY_THROW );
+	uno::Reference< container::XNameAccess > xNameAccess2( xNameAccess->getByName( sPageStyles ), uno::UNO_QUERY_THROW );
+	uno::Reference< beans::XPropertySet > xProps( xNameAccess2->getByName( sDflt ), uno::UNO_QUERY_THROW );
+	rtl::OUString sFontName;
+	xProps->getPropertyValue( sCharFontName ) >>= sFontName;
+
+	uno::Reference< awt::XDevice > xDevice = getDeviceFromDoc( xModel );
+	awt::FontDescriptor aDesc;
+	aDesc.Name = sFontName;
+	uno::Reference< awt::XFont > xFont( xDevice->getFont( aDesc ), uno::UNO_QUERY_THROW );
+	double nCharPixelWidth =  xFont->getCharWidth( (sal_Int8)'0' );	
+
+	double nPixelsPerMeter = xDevice->getInfo().PixelPerMeterX;
+	double nCharWidth = nCharPixelWidth /  nPixelsPerMeter;
+	nCharWidth = nCharWidth * (double)56700;// in twips
+	return lcl_TwipsToPoints( (USHORT)nCharWidth );	
+}
+
+uno::Any SAL_CALL 
+ScVbaRange::getColumnWidth() throw (uno::RuntimeException)
+{
+	sal_Int32 nLen = m_Areas->getCount();
+	if ( nLen > 1 ) 
+	{
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
+		return xRange->getColumnWidth();
+	}
+
+	double nColWidth = 	0;
+	ScDocShell* pShell = getScDocShell();
+	if ( pShell )
+	{
+		uno::Reference< frame::XModel > xModel = pShell->GetModel();
+		double defaultCharWidth = getDefaultCharWidth( xModel );
+		RangeHelper thisRange( mxRange );
+		table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();	
+		sal_Int32 nStartCol = thisAddress.StartColumn;
+		sal_Int32 nEndCol = thisAddress.EndColumn;
+		USHORT nColTwips = 0;
+		for( sal_Int32 nCol = nStartCol ; nCol <= nEndCol; ++nCol )
+		{
+			thisAddress.StartColumn = nCol;
+			USHORT nCurTwips = pShell->GetDocument()->GetOriginalWidth( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCTAB >( thisAddress.Sheet ) );
+			if ( nCol == nStartCol ) 
+				nColTwips =  nCurTwips;
+			if ( nColTwips != nCurTwips )
+				return aNULL();
+		}
+		nColWidth = lcl_Round2DecPlaces( lcl_TwipsToPoints( nColTwips ) );
+		if ( xModel.is() )
+			nColWidth = nColWidth / defaultCharWidth;
+	}
+	nColWidth = lcl_Round2DecPlaces( nColWidth );
+	return uno::makeAny( nColWidth );
+}
+
+void SAL_CALL 
+ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeException)
+{
+	sal_Int32 nLen = m_Areas->getCount();
+	if ( nLen > 1 ) 
+	{
+		for ( sal_Int32 index = 1; index != nLen; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(index) ), uno::Any() ), uno::UNO_QUERY_THROW );
+			xRange->setColumnWidth( _columnwidth );
+		}
+		return;
+	}
+	double nColWidth = 0;
+	_columnwidth >>= nColWidth;
+	nColWidth = lcl_Round2DecPlaces( nColWidth );
+        ScDocShell* pDocShell = getScDocShell();
+        if ( pDocShell )
+        {
+                uno::Reference< frame::XModel > xModel = pDocShell->GetModel();
+                if ( xModel.is() )
+                {
+
+			nColWidth = ( nColWidth * getDefaultCharWidth( xModel ) );
+			RangeHelper thisRange( mxRange );	
+			table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+			USHORT nTwips = lcl_pointsToTwips( nColWidth );
+			
+			ScDocFunc aFunc(*pDocShell);
+			SCCOLROW nColArr[2];
+			nColArr[0] = thisAddress.StartColumn;
+			nColArr[1] = thisAddress.EndColumn;
+			aFunc.SetWidthOrHeight( TRUE, 1, nColArr, thisAddress.Sheet, SC_SIZE_ORIGINAL,
+		                                                                        nTwips, TRUE, TRUE );		
+			
+		}
+	}
+}
+
+uno::Any SAL_CALL 
+ScVbaRange::getWidth() throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 ) 
+	{
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
+		return xRange->getWidth();
+	}
+	uno::Reference< table::XColumnRowRange > xColRowRange( mxRange, uno::UNO_QUERY_THROW );			
+	uno::Reference< container::XIndexAccess > xIndexAccess( xColRowRange->getColumns(), uno::UNO_QUERY_THROW ); 
+	sal_Int32 nElems = xIndexAccess->getCount();	
+	double nWidth = 0;
+	for ( sal_Int32 index=0; index<nElems; ++index )
+	{
+		uno::Reference< sheet::XCellRangeAddressable > xAddressable( xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW ); 
+		double nTmpWidth = getCalcColWidth( xAddressable->getRangeAddress() );
+		nWidth += nTmpWidth;
+	}
+	return uno::makeAny( nWidth );
+}
+
+uno::Any SAL_CALL 
+ScVbaRange::Areas( const uno::Any& item) throw (uno::RuntimeException)
+{
+	if ( !item.hasValue() )
+		return uno::makeAny( m_Areas );
+	return m_Areas->Item( item, uno::Any() );	
+}
+
+uno::Reference< excel::XRange >
+ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException )
+{
+	if ( !m_Areas.is() )
+		throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No areas available")), uno::Reference< uno::XInterface >() );
+	uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( ++nIndex ), uno::Any() ), uno::UNO_QUERY_THROW );
+	return xRange;
+}
+
+uno::Any
+ScVbaRange::Borders( const uno::Any& item ) throw( script::BasicErrorException, uno::RuntimeException )
+{
+	if ( !item.hasValue() )
+		return uno::makeAny( getBorders() );
+	return getBorders()->Item( item, uno::Any() );
+}
+
+uno::Any SAL_CALL
+ScVbaRange::BorderAround( const css::uno::Any& LineStyle, const css::uno::Any& Weight,
+                const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException)
+{
+    sal_Int32 nCount = getBorders()->getCount();
+
+    for( sal_Int32 i = 0; i < nCount; i++ )
+    {
+        const sal_Int32 nLineType = supportedIndexTable[i];
+        switch( nLineType )
+        {
+            case excel::XlBordersIndex::xlEdgeLeft:
+            case excel::XlBordersIndex::xlEdgeTop:
+            case excel::XlBordersIndex::xlEdgeBottom:
+            case excel::XlBordersIndex::xlEdgeRight:
+            {
+                uno::Reference< excel::XBorder > xBorder( m_Borders->Item( uno::makeAny( nLineType ), uno::Any() ), uno::UNO_QUERY_THROW );
+                if( LineStyle.hasValue() )
+                {
+                    xBorder->setLineStyle( LineStyle );
+                }
+                if( Weight.hasValue() )
+                {
+                    xBorder->setWeight( Weight );
+                }
+                if( ColorIndex.hasValue() )
+                {
+                    xBorder->setColorIndex( ColorIndex );
+                }
+                if( Color.hasValue() )
+                {
+                    xBorder->setColor( Color );
+                }
+                break;
+            }
+            case excel::XlBordersIndex::xlInsideVertical:
+            case excel::XlBordersIndex::xlInsideHorizontal:
+            case excel::XlBordersIndex::xlDiagonalDown:
+            case excel::XlBordersIndex::xlDiagonalUp:
+                break;
+            default:
+                return uno::makeAny( sal_False );
+        }
+    }
+    return uno::makeAny( sal_True );
+}
+
+uno::Any SAL_CALL 
+ScVbaRange::getRowHeight() throw (uno::RuntimeException)
+{
+	sal_Int32 nLen = m_Areas->getCount();
+	if ( nLen > 1 ) 
+	{
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
+		return xRange->getRowHeight();
+	}	
+
+	// if any row's RowHeight in the 
+	// range is different from any other then return NULL
+	RangeHelper thisRange( mxRange );	
+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+	
+	sal_Int32 nStartRow = thisAddress.StartRow;
+	sal_Int32 nEndRow = thisAddress.EndRow;
+        USHORT nRowTwips = 0;
+	// #TODO probably possible to use the SfxItemSet ( and see if
+	//  SFX_ITEM_DONTCARE is set ) to improve performance
+// #CHECKME looks like this is general behaviour not just row Range specific
+//	if ( mbIsRows ) 
+	ScDocShell* pShell = getScDocShell();
+	if ( pShell )
+	{
+		for ( sal_Int32 nRow = nStartRow ; nRow <= nEndRow; ++nRow )
+		{
+			thisAddress.StartRow = nRow;
+			USHORT nCurTwips = pShell->GetDocument()->GetOriginalHeight( thisAddress.StartRow, thisAddress.Sheet );
+			if ( nRow == nStartRow )
+				nRowTwips = nCurTwips;
+			if ( nRowTwips != nCurTwips )
+				return aNULL();
+		}
+	}
+	double nHeight = lcl_Round2DecPlaces( lcl_TwipsToPoints( nRowTwips ) );
+	return uno::makeAny( nHeight );
+}
+
+void SAL_CALL 
+ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeException)
+{
+	sal_Int32 nLen = m_Areas->getCount();
+	if ( nLen > 1 ) 
+	{
+		for ( sal_Int32 index = 1; index != nLen; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(index) ), uno::Any() ), uno::UNO_QUERY_THROW );
+			xRange->setRowHeight( _rowheight );
+		}
+		return;
+	}
+	double nHeight = 0; // Incomming height is in points
+        _rowheight >>= nHeight;
+	nHeight = lcl_Round2DecPlaces( nHeight );
+	RangeHelper thisRange( mxRange );	
+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+	USHORT nTwips = lcl_pointsToTwips( nHeight );
+	
+	ScDocShell* pDocShell = getDocShellFromRange( mxRange );
+	ScDocFunc aFunc(*pDocShell);
+	SCCOLROW nRowArr[2];
+	nRowArr[0] = thisAddress.StartRow;
+	nRowArr[1] = thisAddress.EndRow;
+	aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, thisAddress.Sheet, SC_SIZE_ORIGINAL,
+                                                                        nTwips, TRUE, TRUE );		
+}
+
+uno::Any SAL_CALL 
+ScVbaRange::getPageBreak() throw (uno::RuntimeException)
+{
+	sal_Int32 nPageBreak = excel::XlPageBreak::xlPageBreakNone;
+	ScDocShell* pShell = getDocShellFromRange( mxRange );
+	if ( pShell )
+	{
+		RangeHelper thisRange( mxRange );
+		table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+		BOOL bColumn = FALSE;
+		
+		if (thisAddress.StartRow==0)
+		    bColumn = TRUE;
+		
+		uno::Reference< frame::XModel > xModel = pShell->GetModel();
+		if ( xModel.is() )
+		{
+	        ScDocument* pDoc =  getDocumentFromRange( mxRange );
+	        
+			BYTE nFlag = 0;
+			if ( !bColumn )
+			    nFlag = pDoc -> GetRowFlags(thisAddress.StartRow, thisAddress.Sheet);
+			else
+			    nFlag = pDoc -> GetColFlags(static_cast<SCCOL>(thisAddress.StartColumn), thisAddress.Sheet);
+			    
+			if ( nFlag & CR_PAGEBREAK)
+			    nPageBreak = excel::XlPageBreak::xlPageBreakAutomatic;
+			    
+			if ( nFlag & CR_MANUALBREAK)
+			    nPageBreak = excel::XlPageBreak::xlPageBreakManual;
+		}		
+	}
+
+	return uno::makeAny( nPageBreak );
+}
+
+void SAL_CALL 
+ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeException)
+{
+	sal_Int32 nPageBreak = 0; 
+    _pagebreak >>= nPageBreak;
+		
+	ScDocShell* pShell = getDocShellFromRange( mxRange );
+	if ( pShell )
+	{
+		RangeHelper thisRange( mxRange );
+		table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+		if ((thisAddress.StartColumn==0) && (thisAddress.StartRow==0))
+		    return;
+		BOOL bColumn = FALSE;
+		
+		if (thisAddress.StartRow==0)
+		    bColumn = TRUE;
+		
+		ScAddress aAddr( static_cast<SCCOL>(thisAddress.StartColumn), thisAddress.StartRow, thisAddress.Sheet );	
+		uno::Reference< frame::XModel > xModel = pShell->GetModel();
+		if ( xModel.is() )
+		{
+			ScTabViewShell* pViewShell = excel::getBestViewShell( xModel );
+			if ( nPageBreak == excel::XlPageBreak::xlPageBreakManual )
+			    pViewShell->InsertPageBreak( bColumn, TRUE, &aAddr);
+			else if ( nPageBreak == excel::XlPageBreak::xlPageBreakNone )
+			    pViewShell->DeletePageBreak( bColumn, TRUE, &aAddr);
+		}
+	}
+}
+
+uno::Any SAL_CALL 
+ScVbaRange::getHeight() throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 ) 
+	{
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
+		return xRange->getHeight();
+	}
+	
+	uno::Reference< table::XColumnRowRange > xColRowRange( mxRange, uno::UNO_QUERY_THROW );			
+	uno::Reference< container::XIndexAccess > xIndexAccess( xColRowRange->getRows(), uno::UNO_QUERY_THROW ); 
+	sal_Int32 nElems = xIndexAccess->getCount();
+	double nHeight = 0;
+	for ( sal_Int32 index=0; index<nElems; ++index )
+	{
+        	uno::Reference< sheet::XCellRangeAddressable > xAddressable( xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW ); 
+		nHeight += getCalcRowHeight(xAddressable->getRangeAddress() );
+	}
+	return uno::makeAny( nHeight );
+}
+
+awt::Point 
+ScVbaRange::getPosition() throw ( uno::RuntimeException )
+{
+        awt::Point aPoint;
+	uno::Reference< beans::XPropertySet > xProps;
+	if ( mxRange.is() )
+		xProps.set( mxRange, uno::UNO_QUERY_THROW );
+	else
+		xProps.set( mxRanges, uno::UNO_QUERY_THROW );
+	xProps->getPropertyValue(POSITION) >>= aPoint;
+	return aPoint;
+}
+uno::Any SAL_CALL 
+ScVbaRange::getLeft() throw (uno::RuntimeException)
+{
+	// helperapi returns the first ranges left ( and top below )
+	if ( m_Areas->getCount() > 1 )
+		return getArea( 0 )->getLeft();
+        awt::Point aPoint = getPosition();
+	return uno::makeAny( lcl_hmmToPoints( aPoint.X ) );
+}
+
+
+uno::Any SAL_CALL 
+ScVbaRange::getTop() throw (uno::RuntimeException)
+{		
+	// helperapi returns the first ranges top
+	if ( m_Areas->getCount() > 1 )
+		return getArea( 0 )->getTop();
+        awt::Point aPoint= getPosition();
+	return uno::makeAny( lcl_hmmToPoints( aPoint.Y ) );
+}
+
+uno::Reference< excel::XWorksheet >
+ScVbaRange::getWorksheet() throw (uno::RuntimeException)
+{
+	// #TODO #FIXME parent should always be set up ( currently thats not
+	// the case )
+	uno::Reference< excel::XWorksheet > xSheet( getParent(), uno::UNO_QUERY );
+	if ( !xSheet.is() )
+	{
+		uno::Reference< table::XCellRange > xRange = mxRange;
+
+		if ( mxRanges.is() ) // assign xRange to first range
+		{
+			uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW );
+			xRange.set( xIndex->getByIndex( 0 ), uno::UNO_QUERY_THROW );
+		}
+		ScDocShell* pDocShell = getDocShellFromRange(xRange);
+		RangeHelper rHelper(xRange);
+		// parent should be Thisworkbook
+       	xSheet.set( new ScVbaWorksheet( uno::Reference< XHelperInterface >(), mxContext,rHelper.getSpreadSheet(),pDocShell->GetModel()) );
+	}	
+	return xSheet;
+}
+
+ScCellRangesBase*
+ScVbaRange::getCellRangesBase() throw( uno::RuntimeException )
+{
+	ScCellRangesBase* pUnoRangesBase = NULL;
+	if ( mxRanges.is() )
+	{
+		uno::Reference< uno::XInterface > xIf( mxRanges, uno::UNO_QUERY_THROW );
+		pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() );
+	}
+	else if ( mxRange.is() )
+	{
+		uno::Reference< uno::XInterface > xIf( mxRange, uno::UNO_QUERY_THROW );
+		pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() );
+	}
+	else
+		throw uno::RuntimeException( rtl::OUString::createFromAscii("General Error creating range - Unknown" ), uno::Reference< uno::XInterface >() );
+	return pUnoRangesBase;
+}
+
+// #TODO remove this ugly application processing
+// Process an application Range request e.g. 'Range("a1,b2,a4:b6")
+uno::Reference< excel::XRange >
+ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException)
+{
+	// Althought the documentation seems clear that Range without a 
+	// qualifier then its a shortcut for ActiveSheet.Range
+	// however, similarly Application.Range is apparently also a 
+	// shortcut for ActiveSheet.Range
+	// The is however a subtle behavioural difference I've come across 
+	// wrt to named ranges.
+	// If a named range "test" exists { Sheet1!$A1 } and the active sheet
+	// is Sheet2 then the following will fail
+	// msgbox ActiveSheet.Range("test").Address ' failes
+	// msgbox WorkSheets("Sheet2").Range("test").Address
+	// but !!!
+	// msgbox Range("test").Address ' works
+	// msgbox Application.Range("test").Address ' works
+
+	// Single param Range 
+	rtl::OUString sRangeName;
+	Cell1 >>= sRangeName;
+	if ( Cell1.hasValue() && !Cell2.hasValue() && sRangeName.getLength() )
+	{
+		const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
+		uno::Reference< beans::XPropertySet > xPropSet( getCurrentExcelDoc(xContext), uno::UNO_QUERY_THROW );
+		
+		uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW );
+		uno::Reference< sheet::XCellRangeReferrer > xReferrer;
+		try
+		{
+			xReferrer.set ( xNamed->getByName( sRangeName ), uno::UNO_QUERY );
+		}
+		catch( uno::Exception& /*e*/ )
+		{
+			// do nothing
+		}
+		if ( xReferrer.is() )
+		{
+			uno::Reference< table::XCellRange > xRange = xReferrer->getReferredCells();
+			if ( xRange.is() )
+			{
+				// #FIXME need proper (WorkSheet) parent
+				uno::Reference< excel::XRange > xVbRange =  new  ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xRange );
+				return xVbRange;
+			}
+		}
+	}
+	uno::Reference< sheet::XSpreadsheetView > xView( getCurrentExcelDoc(xContext)->getCurrentController(), uno::UNO_QUERY );
+	uno::Reference< table::XCellRange > xSheetRange( xView->getActiveSheet(), uno::UNO_QUERY_THROW ); 
+	ScVbaRange* pRange = new ScVbaRange( uno::Reference< XHelperInterface >(), xContext, xSheetRange );
+	uno::Reference< excel::XRange > xVbSheetRange( pRange );
+	return pRange->Range( Cell1, Cell2, true ); 
+}
+
+uno::Reference< sheet::XDatabaseRanges > 
+lcl_GetDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException )
+{
+	uno::Reference< frame::XModel > xModel;
+	if ( pShell )
+		xModel.set( pShell->GetModel(), uno::UNO_QUERY_THROW );
+	uno::Reference< beans::XPropertySet > xModelProps( xModel, uno::UNO_QUERY_THROW );
+	uno::Reference< sheet::XDatabaseRanges > xDBRanges( xModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges") ) ), uno::UNO_QUERY_THROW );
+	return xDBRanges;	
+}
+// returns the XDatabaseRange for the autofilter on sheet (nSheet)
+// also populates sName with the name of range
+uno::Reference< sheet::XDatabaseRange > 
+lcl_GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet, rtl::OUString& sName )
+{
+	uno::Reference< container::XIndexAccess > xIndexAccess( lcl_GetDataBaseRanges( pShell ), uno::UNO_QUERY_THROW );
+	uno::Reference< sheet::XDatabaseRange > xDataBaseRange;
+	table::CellRangeAddress dbAddress;
+	for ( sal_Int32 index=0; index < xIndexAccess->getCount(); ++index )
+	{
+		uno::Reference< sheet::XDatabaseRange > xDBRange( xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW );
+		uno::Reference< container::XNamed > xNamed( xDBRange, uno::UNO_QUERY_THROW ); 
+		// autofilters work weirdly with openoffice, unnamed is the default 
+		// named range which is used to create an autofilter, but
+		// its also possible that another name could be used
+		//     this also causes problems when an autofilter is created on
+		//     another sheet
+		// ( but.. you can use any named range )
+		dbAddress = xDBRange->getDataArea();
+		if ( dbAddress.Sheet == nSheet )
+		{
+			sal_Bool bHasAuto = sal_False;
+			uno::Reference< beans::XPropertySet > xProps( xDBRange, uno::UNO_QUERY_THROW );
+			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ) ) >>= bHasAuto;
+			if ( bHasAuto )
+			{
+				sName = xNamed->getName();	
+				xDataBaseRange=xDBRange;
+				break;
+			}
+		}
+	}
+	return xDataBaseRange;
+} 
+
+// Helper functions for AutoFilter
+ScDBData* lcl_GetDBData_Impl( ScDocShell* pDocShell, sal_Int16 nSheet )
+{
+	rtl::OUString sName;
+	lcl_GetAutoFiltRange( pDocShell, nSheet, sName );
+	OSL_TRACE("lcl_GetDBData_Impl got autofilter range %s for sheet %d",
+		rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() , nSheet );
+	ScDBData* pRet = NULL;
+	if (pDocShell)
+	{
+		ScDBCollection* pNames = pDocShell->GetDocument()->GetDBCollection();
+		if (pNames)
+		{
+			USHORT nPos = 0;
+			if (pNames->SearchName( sName , nPos ))
+				pRet = (*pNames)[nPos];
+		}
+	}
+	return pRet;
+}
+
+void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam )
+{
+	if ( pDocShell )
+	{	
+		ScViewData* pViewData = pDocShell->GetViewData();
+		if ( pViewData )
+		{
+			OSL_TRACE("Pushing out SelectAll query");
+			pViewData->GetView()->Query( aParam, NULL, TRUE );
+		}
+	}
+}
+
+ScQueryParam lcl_GetQueryParam( ScDocShell* pDocShell, sal_Int16 nSheet )
+{
+	ScDBData* pDBData = lcl_GetDBData_Impl( pDocShell, nSheet );	
+	ScQueryParam aParam;	
+	if (pDBData)
+	{
+		pDBData->GetQueryParam( aParam );
+	}
+	return aParam;
+}
+
+void lcl_SetAllQueryForField( ScQueryParam& aParam, SCCOLROW nField )
+{
+	bool bFound = false;
+	SCSIZE i = 0;
+	for (; i<MAXQUERY && !bFound; i++)
+	{
+		ScQueryEntry& rEntry = aParam.GetEntry(i);
+		if ( rEntry.nField == nField)
+		{
+			OSL_TRACE("found at pos %d", i );
+			bFound = true;
+		}
+	}
+	if ( bFound )
+	{
+		OSL_TRACE("field %d to delete at pos %d", nField, ( i - 1 ) );
+		aParam.DeleteQuery(--i);
+	}
+}
+
+
+void lcl_SetAllQueryForField( ScDocShell* pDocShell, SCCOLROW nField, sal_Int16 nSheet )
+{
+	ScQueryParam aParam = lcl_GetQueryParam( pDocShell, nSheet );
+	lcl_SetAllQueryForField( aParam, nField );
+	lcl_SelectAll( pDocShell, aParam );
+}
+
+// Modifies sCriteria, and nOp depending on the value of sCriteria
+void lcl_setTableFieldsFromCriteria( rtl::OUString& sCriteria1, uno::Reference< beans::XPropertySet >& xDescProps, sheet::TableFilterField2& rFilterField )
+{
+	// #TODO make this more efficient and cycle through 
+	// sCriteria1 character by character to pick up <,<>,=, * etc.
+	// right now I am more concerned with just getting it to work right
+
+	sCriteria1 = sCriteria1.trim();
+	// table of translation of criteria text to FilterOperators
+	// <>searchtext - NOT_EQUAL
+	//  =searchtext - EQUAL
+	//  *searchtext - startwith
+	//  <>*searchtext - doesn't startwith
+	//  *searchtext* - contains
+	//  <>*searchtext* - doesn't contain
+	// [>|>=|<=|...]searchtext for GREATER_value, GREATER_EQUAL_value etc.
+	sal_Int32 nPos = 0;
+	bool bIsNumeric = false;
+	if ( ( nPos = sCriteria1.indexOf( EQUALS ) ) == 0 )
+	{
+		if ( sCriteria1.getLength() == EQUALS.getLength() )
+            rFilterField.Operator = sheet::FilterOperator2::EMPTY;
+		else
+		{
+            rFilterField.Operator = sheet::FilterOperator2::EQUAL;
+			sCriteria1 = sCriteria1.copy( EQUALS.getLength() );
+			sCriteria1 = VBAToRegexp( sCriteria1 );	
+			// UseRegularExpressions 
+			if ( xDescProps.is() )
+				xDescProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseRegularExpressions" ) ), uno::Any( sal_True ) );
+		}
+
+	}
+	else if ( ( nPos = sCriteria1.indexOf( NOTEQUALS ) ) == 0 ) 
+	{
+		if ( sCriteria1.getLength() == NOTEQUALS.getLength() )
+            rFilterField.Operator = sheet::FilterOperator2::NOT_EMPTY;	
+		else
+		{
+            rFilterField.Operator = sheet::FilterOperator2::NOT_EQUAL;
+			sCriteria1 = sCriteria1.copy( NOTEQUALS.getLength() );
+			sCriteria1 = VBAToRegexp( sCriteria1 );	
+			// UseRegularExpressions 
+			if ( xDescProps.is() )
+				xDescProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseRegularExpressions" ) ), uno::Any( sal_True ) );
+		}
+	}	
+	else if ( ( nPos = sCriteria1.indexOf( GREATERTHAN ) ) == 0 ) 
+	{
+		bIsNumeric = true;
+		if ( ( nPos = sCriteria1.indexOf( GREATERTHANEQUALS ) ) == 0 )
+		{
+			sCriteria1 = sCriteria1.copy( GREATERTHANEQUALS.getLength() );
+            rFilterField.Operator = sheet::FilterOperator2::GREATER_EQUAL;
+		}
+		else
+		{
+			sCriteria1 = sCriteria1.copy( GREATERTHAN.getLength() );
+            rFilterField.Operator = sheet::FilterOperator2::GREATER;
+		}
+
+	}
+	else if ( ( nPos = sCriteria1.indexOf( LESSTHAN ) ) == 0 ) 
+	{
+		bIsNumeric = true;
+		if ( ( nPos = sCriteria1.indexOf( LESSTHANEQUALS ) ) == 0 )
+		{
+			sCriteria1 = sCriteria1.copy( LESSTHANEQUALS.getLength() );
+            rFilterField.Operator = sheet::FilterOperator2::LESS_EQUAL;
+		}
+		else
+		{
+			sCriteria1 = sCriteria1.copy( LESSTHAN.getLength() );
+            rFilterField.Operator = sheet::FilterOperator2::LESS;
+		}
+
+	}
+	else
+        rFilterField.Operator = sheet::FilterOperator2::EQUAL;
+
+	if ( bIsNumeric )
+	{
+		rFilterField.IsNumeric= sal_True;
+		rFilterField.NumericValue = sCriteria1.toDouble();
+	}
+	rFilterField.StringValue = sCriteria1;	
+}
+
+void SAL_CALL 
+ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const uno::Any& Operator, const uno::Any& Criteria2, const uno::Any& VisibleDropDown ) throw (uno::RuntimeException)
+{
+	// Is there an existing autofilter	
+	RangeHelper thisRange( mxRange );	
+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+	sal_Int16 nSheet = thisAddress.Sheet;
+	ScDocShell* pShell = getScDocShell();
+	sal_Bool bHasAuto = sal_False;	
+	rtl::OUString sAutofiltRangeName;
+	uno::Reference< sheet::XDatabaseRange > xDataBaseRange = lcl_GetAutoFiltRange( pShell, nSheet, sAutofiltRangeName );
+	if ( xDataBaseRange.is() )
+		bHasAuto = true;	
+
+	uno::Reference< table::XCellRange > xFilterRange;
+	if ( !bHasAuto )
+	{
+		if (  m_Areas->getCount() > 1 )
+			throw uno::RuntimeException( STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY, uno::Reference< uno::XInterface >() );
+
+		table::CellRangeAddress autoFiltAddress; 
+		//CurrentRegion()
+		if ( isSingleCellRange() )
+		{
+			uno::Reference< excel::XRange > xCurrent( CurrentRegion() );
+			if ( xCurrent.is() )
+			{
+				ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xCurrent.get() );
+				if ( pRange->isSingleCellRange() )
+					throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can't create AutoFilter") ), uno::Reference< uno::XInterface >() );
+				if ( pRange )
+				{
+					RangeHelper currentRegion( pRange->mxRange );
+					autoFiltAddress = currentRegion.getCellRangeAddressable()->getRangeAddress();
+				}
+			}
+		} 
+		else // multi-cell range
+		{
+			RangeHelper multiCellRange( mxRange );
+			autoFiltAddress = multiCellRange.getCellRangeAddressable()->getRangeAddress();
+		}
+
+		uno::Reference< sheet::XDatabaseRanges > xDBRanges = lcl_GetDataBaseRanges( pShell );
+		if ( xDBRanges.is() )
+		{
+			rtl::OUString sGenName( RTL_CONSTASCII_USTRINGPARAM("VBA_Autofilter_") );
+			sGenName += rtl::OUString::valueOf( static_cast< sal_Int32 >( nSheet ) );
+			OSL_TRACE("Going to add new autofilter range.. name %s",
+				rtl::OUStringToOString( sGenName, RTL_TEXTENCODING_UTF8 ).getStr() , nSheet );
+			if ( !xDBRanges->hasByName( sGenName ) )
+				xDBRanges->addNewByName(  sGenName, autoFiltAddress );
+			xDataBaseRange.set( xDBRanges->getByName(  sGenName ), uno::UNO_QUERY_THROW );
+		}
+		if ( !xDataBaseRange.is() )
+			throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Failed to find the autofilter placeholder range" ) ), uno::Reference< uno::XInterface >() );		
+
+		uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW );
+		// set autofilt
+		xDBRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ), uno::Any(sal_True) ); 
+		// set header
+		uno::Reference< beans::XPropertySet > xFiltProps( xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY_THROW );
+		sal_Bool bHasColHeader = sal_False;
+		ScDocument* pDoc = pShell ? pShell->GetDocument() : NULL;
+		
+		bHasColHeader = pDoc->HasColHeader(  static_cast< SCCOL >( autoFiltAddress.StartColumn ), static_cast< SCROW >( autoFiltAddress.StartRow ), static_cast< SCCOL >( autoFiltAddress.EndColumn ), static_cast< SCROW >( autoFiltAddress.EndRow ), static_cast< SCTAB >( autoFiltAddress.Sheet ) ) ? sal_True : sal_False;
+		xFiltProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ContainsHeader") ), uno::Any( bHasColHeader ) );	
+	}
+
+
+	sal_Int32 nField = 0; // *IS* 1 based
+	rtl::OUString sCriteria1;
+	sal_Int32 nOperator = excel::XlAutoFilterOperator::xlAnd;
+	
+	sal_Bool bVisible = sal_True;
+	bool  bChangeDropDown = false;
+	VisibleDropDown >>= bVisible;
+
+	if ( bVisible == bHasAuto ) // dropdown is displayed/notdisplayed as
+								// required
+		bVisible = sal_False;
+	else
+		bChangeDropDown = true;	
+	sheet::FilterConnection nConn = sheet::FilterConnection_AND;		
+	double nCriteria1 = 0;
+
+	bool bHasCritValue = Criteria1.hasValue();
+	bool bCritHasNumericValue = sal_False; // not sure if a numeric criteria is possible
+	if ( bHasCritValue )
+		bCritHasNumericValue = ( Criteria1 >>= nCriteria1 );
+
+	if (  !Field.hasValue() && ( Criteria1.hasValue() || Operator.hasValue() || Criteria2.hasValue() ) ) 
+		throw uno::RuntimeException();
+	// Use the normal uno api, sometimes e.g. when you want to use ALL as the filter
+	// we can't use refresh as the uno interface doesn't have a concept of ALL
+	// in this case we just call the core calc functionality - 
+	bool bAll = false;;
+	if ( ( Field >>= nField )  )
+	{
+        uno::Reference< sheet::XSheetFilterDescriptor2 > xDesc(
+                xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY );
+        if ( xDesc.is() )
+        {
+            uno::Sequence< sheet::TableFilterField2 > sTabFilts;
+            uno::Reference< beans::XPropertySet > xDescProps( xDesc, uno::UNO_QUERY_THROW );
+		if ( Criteria1.hasValue() )
+		{ 
+			sTabFilts.realloc( 1 );
+            sTabFilts[0].Operator = sheet::FilterOperator2::EQUAL;// sensible default
+			if ( !bCritHasNumericValue )
+			{ 
+				Criteria1 >>= sCriteria1;
+				sTabFilts[0].IsNumeric = bCritHasNumericValue;
+				if ( bHasCritValue && sCriteria1.getLength() )
+					lcl_setTableFieldsFromCriteria( sCriteria1, xDescProps, sTabFilts[0]  );
+				else
+					bAll = true;
+			}
+			else // numeric
+			{
+				sTabFilts[0].IsNumeric = sal_True;
+				sTabFilts[0].NumericValue = nCriteria1;
+			}
+		}
+		else // no value specified
+			bAll = true;
+		// not sure what the relationship between Criteria1 and Operator is,
+		// e.g. can you have a Operator without a Criteria ? in openoffice it 	
+		if ( Operator.hasValue()  && ( Operator >>= nOperator ) )
+		{
+			// if its a bottom/top Ten(Percent/Value) and there
+			// is no value specified for critera1 set it to 10
+			if ( !bCritHasNumericValue && !sCriteria1.getLength() && ( nOperator != excel::XlAutoFilterOperator::xlOr ) && ( nOperator != excel::XlAutoFilterOperator::xlAnd ) )
+			{
+				sTabFilts[0].IsNumeric = sal_True;	
+				sTabFilts[0].NumericValue = 10;	
+				bAll = false;
+			}
+			switch ( nOperator )
+			{
+				case excel::XlAutoFilterOperator::xlBottom10Items:
+                    sTabFilts[0].Operator = sheet::FilterOperator2::BOTTOM_VALUES;
+					break;
+				case excel::XlAutoFilterOperator::xlBottom10Percent:
+                    sTabFilts[0].Operator = sheet::FilterOperator2::BOTTOM_PERCENT;
+					break;
+				case excel::XlAutoFilterOperator::xlTop10Items:
+                    sTabFilts[0].Operator = sheet::FilterOperator2::TOP_VALUES;
+					break;
+				case excel::XlAutoFilterOperator::xlTop10Percent:
+                    sTabFilts[0].Operator = sheet::FilterOperator2::TOP_PERCENT;
+					break;
+				case excel::XlAutoFilterOperator::xlOr:
+					nConn = sheet::FilterConnection_OR;
+					break;
+				case excel::XlAutoFilterOperator::xlAnd:
+					nConn = sheet::FilterConnection_AND;
+					break;
+				default:
+					throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UnknownOption") ), uno::Reference< uno::XInterface >() );
+					
+			}	
+
+		}		
+		if ( !bAll )
+		{
+			sTabFilts[0].Connection = sheet::FilterConnection_AND;	
+			sTabFilts[0].Field = (nField - 1);	
+
+			rtl::OUString sCriteria2;
+			if ( Criteria2.hasValue() ) // there is a Criteria2
+			{
+				sTabFilts.realloc(2);
+				sTabFilts[1].Field = sTabFilts[0].Field;
+				sTabFilts[1].Connection = nConn;	
+
+				if ( Criteria2 >>= sCriteria2 )
+				{
+					if ( sCriteria2.getLength() > 0 )
+					{
+						uno::Reference< beans::XPropertySet > xProps;
+						lcl_setTableFieldsFromCriteria( sCriteria2, xProps,  sTabFilts[1] );
+						sTabFilts[1].IsNumeric = sal_False;
+					}
+				}
+				else // numeric
+				{
+					Criteria2 >>= sTabFilts[1].NumericValue;
+					sTabFilts[1].IsNumeric = sal_True;
+                    sTabFilts[1].Operator = sheet::FilterOperator2::EQUAL;
+				}
+			}
+		}
+
+        xDesc->setFilterFields2( sTabFilts );
+		if ( !bAll )
+		{
+			xDataBaseRange->refresh();
+		}
+		else
+			// was 0 based now seems to be 1 
+			lcl_SetAllQueryForField( pShell, nField, nSheet );
+        }
+	}
+	else 
+	{
+		// this is just to toggle autofilter on and off ( not to be confused with 
+		// a VisibleDropDown option combined with a field, in that case just the 
+		// button should be disabled ) - currently we don't support that
+		bChangeDropDown = true;	
+		uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW );
+		if ( bHasAuto )
+		{
+			// find the any field with the query and select all
+			ScQueryParam aParam = lcl_GetQueryParam( pShell, nSheet );
+			SCSIZE i = 0;
+			for (; i<MAXQUERY; i++)
+			{
+				ScQueryEntry& rEntry = aParam.GetEntry(i);
+				if ( rEntry.bDoQuery )
+					lcl_SetAllQueryForField( pShell, rEntry.nField, nSheet );
+			}
+			// remove exising filters
+            uno::Reference< sheet::XSheetFilterDescriptor2 > xSheetFilterDescriptor(
+                    xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY );
+            if( xSheetFilterDescriptor.is() )
+			    xSheetFilterDescriptor->setFilterFields2( uno::Sequence< sheet::TableFilterField2 >() );
+		}
+		xDBRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ), uno::Any(!bHasAuto) );
+
+	}
+}
+
+void SAL_CALL 
+ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (uno::RuntimeException)
+{
+	sal_Bool bCopyOrigin = sal_True;
+	CopyOrigin >>= bCopyOrigin;
+	// It appears ( from the web ) that the undocumented CopyOrigin
+	// param should contain member of enum XlInsertFormatOrigin
+	// which can have values xlFormatFromLeftOrAbove or xlFormatFromRightOrBelow
+	// #TODO investigate resultant behaviour using these constants
+	// currently just processing Shift
+
+	sheet::CellInsertMode mode = sheet::CellInsertMode_NONE; 
+	if ( Shift.hasValue() )
+	{
+		sal_Int32 nShift = 0;
+		Shift >>= nShift;
+		switch ( nShift )
+		{
+			case excel::XlInsertShiftDirection::xlShiftToRight:
+				mode = sheet::CellInsertMode_RIGHT;
+				break;
+			case excel::XlInsertShiftDirection::xlShiftDown:
+				mode = sheet::CellInsertMode_DOWN;
+				break;
+			default:
+				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ("Illegal paramater ") ), uno::Reference< uno::XInterface >() );
+		}
+	}
+	else 
+	{
+		if ( getRow() >=  getColumn() )
+			mode = sheet::CellInsertMode_DOWN;
+		else
+			mode = sheet::CellInsertMode_RIGHT;
+	}
+	RangeHelper thisRange( mxRange );
+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();	
+	uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );	
+	xCellRangeMove->insertCells( thisAddress, mode );
+	if ( bCopyOrigin )
+	{
+		// After the insert ( this range ) actually has moved
+		ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
+	 	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getDocShellFromRange( mxRange ) , aRange ) );
+		uno::Reference< excel::XRange > xVbaRange( new ScVbaRange( getParent(), mxContext, xRange, mbIsRows, mbIsColumns ) );	
+		xVbaRange->PasteSpecial( uno::Any(), uno::Any(), uno::Any(), uno::Any() );
+	}
+}
+
+void SAL_CALL
+ScVbaRange::Autofit() throw (uno::RuntimeException)
+{
+	sal_Int32 nLen = m_Areas->getCount();
+	if ( nLen > 1 ) 
+	{
+		for ( sal_Int32 index = 1; index != nLen; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(index) ), uno::Any() ), uno::UNO_QUERY_THROW );
+			xRange->Autofit();
+		}
+		return;
+	}
+		// if the range is a not a row or column range autofit will
+		// throw an error
+
+		if ( !( mbIsColumns || mbIsRows ) )
+			DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); 			
+        ScDocShell* pDocShell = getDocShellFromRange( mxRange );
+        if ( pDocShell )
+        {
+			RangeHelper thisRange( mxRange );	
+			table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+			
+			ScDocFunc aFunc(*pDocShell);
+			SCCOLROW nColArr[2];
+			nColArr[0] = thisAddress.StartColumn;
+			nColArr[1] = thisAddress.EndColumn;
+			BOOL bDirection = TRUE;
+			if ( mbIsRows )
+			{
+				bDirection = FALSE;
+				nColArr[0] = thisAddress.StartRow;
+				nColArr[1] = thisAddress.EndRow;
+			}
+			aFunc.SetWidthOrHeight( bDirection, 1, nColArr, thisAddress.Sheet, SC_SIZE_OPTIMAL,
+		                                                                        0, TRUE, TRUE );		
+			
+	}	
+}
+
+/***************************************************************************************
+ * interface for text: 
+ * com.sun.star.text.XText, com.sun.star.table.XCell, com.sun.star.container.XEnumerationAccess
+ * com.sun.star.text.XTextRange, 
+ * the main problem is to recognize the numeric and date, which assosiate with DecimalSeparator, ThousandsSeparator, 
+ * TrailingMinusNumbers and FieldInfo.
+***************************************************************************************/
+void SAL_CALL
+ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any& DataType, const css::uno::Any& TextQualifier,
+        const css::uno::Any& ConsecutinveDelimiter, const css::uno::Any& Tab, const css::uno::Any& Semicolon, const css::uno::Any& Comma,
+        const css::uno::Any& Space, const css::uno::Any& Other, const css::uno::Any& OtherChar, const css::uno::Any& /*FieldInfo*/,
+        const css::uno::Any& DecimalSeparator, const css::uno::Any& ThousandsSeparator, const css::uno::Any& /*TrailingMinusNumbers*/  ) throw (css::uno::RuntimeException)
+{
+    uno::Reference< excel::XRange > xRange;
+    if( Destination.hasValue() )
+    {
+        if( !( Destination >>= xRange ) )
+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Destination parameter should be a range" ),
+                    uno::Reference< uno::XInterface >() );
+        OSL_TRACE("set range\n");
+    }
+    else
+    {
+        //set as current
+        xRange = this;
+        OSL_TRACE("set range as himself\n");
+    }
+
+   sal_Int16 xlTextParsingType = excel::XlTextParsingType::xlDelimited;
+    if ( DataType.hasValue() )
+    {
+        if( !( DataType >>= xlTextParsingType ) )
+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "DataType parameter should be a short" ),
+                    uno::Reference< uno::XInterface >() );
+        OSL_TRACE("set Datatype\n" );
+    }
+    sal_Bool bDilimited = ( xlTextParsingType == excel::XlTextParsingType::xlDelimited );
+
+    sal_Int16 xlTextQualifier = excel::XlTextQualifier::xlTextQualifierDoubleQuote; 
+    if( TextQualifier.hasValue() )
+    {
+        if( !( TextQualifier >>= xlTextQualifier ))
+             throw uno::RuntimeException( rtl::OUString::createFromAscii( "TextQualifier parameter should be a short" ),
+                    uno::Reference< uno::XInterface >() );
+        OSL_TRACE("set TextQualifier\n");
+    }
+
+    sal_Bool bConsecutinveDelimiter = sal_False;
+    if( ConsecutinveDelimiter.hasValue() )
+    {
+        if( !( ConsecutinveDelimiter >>= bConsecutinveDelimiter ) )
+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "ConsecutinveDelimiter parameter should be a boolean" ),
+                    uno::Reference< uno::XInterface >() );
+        OSL_TRACE("set ConsecutinveDelimiter\n");
+    }
+
+    sal_Bool bTab = sal_False;
+    if( Tab.hasValue() && bDilimited )
+    {
+        if( !( Tab >>= bTab ) )
+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Tab parameter should be a boolean" ),
+                    uno::Reference< uno::XInterface >() );
+        OSL_TRACE("set Tab\n");
+    }
+
+    sal_Bool bSemicolon = sal_False;
+    if( Semicolon.hasValue() && bDilimited )
+    {
+        if( !( Semicolon >>= bSemicolon ) )
+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Semicolon parameter should be a boolean" ),
+                    uno::Reference< uno::XInterface >() );
+        OSL_TRACE("set Semicolon\n");
+    }
+    sal_Bool bComma = sal_False;
+    if( Comma.hasValue() && bDilimited )
+    {
+        if( !( Comma >>= bComma ) )
+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Comma parameter should be a boolean" ),
+                    uno::Reference< uno::XInterface >() );
+        OSL_TRACE("set Comma\n");
+    }
+    sal_Bool bSpace = sal_False;
+    if( Space.hasValue() && bDilimited )
+    {
+        if( !( Space >>= bSpace ) )
+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Space parameter should be a boolean" ),
+                    uno::Reference< uno::XInterface >() );
+        OSL_TRACE("set Space\n");
+    }
+    sal_Bool bOther = sal_False;
+    rtl::OUString sOtherChar;
+    if( Other.hasValue() && bDilimited )
+    {
+        if( Other >>= bOther )
+        {
+            if( OtherChar.hasValue() )
+                if( !( OtherChar >>= sOtherChar ) )
+                    throw uno::RuntimeException( rtl::OUString::createFromAscii( "OtherChar parameter should be a String" ),
+                        uno::Reference< uno::XInterface >() );
+        OSL_TRACE("set OtherChar\n" );
+        }
+     else if( bOther )
+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Other parameter should be a True" ),
+                    uno::Reference< uno::XInterface >() );
+    }
+ //TODO* FieldInfo   Optional Variant. An array containing parse information for the individual columns of data. The interpretation depends on the value of DataType. When the data is delimited, this argument is an array of two-element arrays, with each two-element array specifying the conversion options for a particular column. The first element is the column number (1-based), and the second element is one of the xlColumnDataType  constants specifying how the column is parsed.
+
+    rtl::OUString sDecimalSeparator;
+    if( DecimalSeparator.hasValue() )
+    {
+        if( !( DecimalSeparator >>= sDecimalSeparator ) )
+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "DecimalSeparator parameter should be a String" ),
+                uno::Reference< uno::XInterface >() );
+        OSL_TRACE("set DecimalSeparator\n" );
+    }
+    rtl::OUString sThousandsSeparator;
+    if( ThousandsSeparator.hasValue() )
+    {
+        if( !( ThousandsSeparator >>= sThousandsSeparator ) )
+            throw uno::RuntimeException( rtl::OUString::createFromAscii( "ThousandsSeparator parameter should be a String" ),
+                uno::Reference< uno::XInterface >() );
+        OSL_TRACE("set ThousandsSpeparator\n" );
+    }
+ //TODO* TrailingMinusNumbers  Optional Variant. Numbers that begin with a minus character.
+}
+
+css::uno::Reference< excel::XValidation > SAL_CALL 
+ScVbaRange::getValidation() throw (css::uno::RuntimeException)
+{
+	if ( !m_xValidation.is() )	
+		m_xValidation = new ScVbaValidation( this, mxContext, mxRange );
+	return m_xValidation;
+}
+
+uno::Any ScVbaRange::getFormulaHidden() throw ( script::BasicErrorException, css::uno::RuntimeException)
+{
+	SfxItemSet* pDataSet = getCurrentDataSet();
+	const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &)
+		pDataSet->Get(ATTR_PROTECTION, TRUE);
+	SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, TRUE, NULL);
+	if(eState == SFX_ITEM_DONTCARE)
+		return aNULL();
+	return uno::makeAny(rProtAttr.GetHideFormula());
+
+}
+void ScVbaRange::setFormulaHidden(const uno::Any& Hidden) throw ( script::BasicErrorException, css::uno::RuntimeException)
+{
+	uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY_THROW);
+	util::CellProtection rCellAttr;
+	xProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLPRO))) >>= rCellAttr;
+	Hidden >>= rCellAttr.IsFormulaHidden;
+	xProps->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLPRO)), uno::makeAny(rCellAttr));
+}
+
+uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException)
+{
+	// #FIXME, If the specified range is in a PivotTable report
+
+	// In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception
+	if( m_Areas->getCount() > 1 )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can not get Range.ShowDetail attribute ")), uno::Reference< uno::XInterface >() );
+	
+	sal_Bool bShowDetail = sal_False;
+
+	RangeHelper helper( mxRange );
+	uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = helper.getSheetCellCursor();
+	xSheetCellCursor->collapseToCurrentRegion();
+	uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
+	table::CellRangeAddress aOutlineAddress = xCellRangeAddressable->getRangeAddress();
+
+	// check if the specified range is a single summary column or row.
+	table::CellRangeAddress thisAddress = helper.getCellRangeAddressable()->getRangeAddress();
+	if( (thisAddress.StartRow == thisAddress.EndRow &&  thisAddress.EndRow == aOutlineAddress.EndRow ) ||
+		(thisAddress.StartColumn == thisAddress.EndColumn && thisAddress.EndColumn == aOutlineAddress.EndColumn ))
+	{
+		sal_Bool bColumn =thisAddress.StartRow == thisAddress.EndRow ? sal_False:sal_True; 
+		ScDocument* pDoc = getDocumentFromRange( mxRange );
+		ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable(static_cast<SCTAB>(thisAddress.Sheet), sal_True);
+		const ScOutlineArray* pOutlineArray =  bColumn ? pOutlineTable->GetColArray(): pOutlineTable->GetRowArray();
+		if( pOutlineArray )
+		{
+			SCCOLROW nPos = bColumn ? (SCCOLROW)(thisAddress.EndColumn-1):(SCCOLROW)(thisAddress.EndRow-1);
+			ScOutlineEntry* pEntry = pOutlineArray->GetEntryByPos( 0, nPos );
+			if( pEntry )
+			{
+				bShowDetail = !pEntry->IsHidden();
+				return uno::makeAny( bShowDetail );
+			}
+		}
+	}
+	else
+	{
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can not set Range.ShowDetail attribute ")), uno::Reference< uno::XInterface >() );
+	}
+    return aNULL();
+}
+
+void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::RuntimeException)
+{
+	// #FIXME, If the specified range is in a PivotTable report
+
+	// In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception
+	if( m_Areas->getCount() > 1 )
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can not set Range.ShowDetail attribute ")), uno::Reference< uno::XInterface >() );
+	
+	sal_Bool bShowDetail = sal_False;
+	aShowDetail >>= bShowDetail;
+
+	RangeHelper helper( mxRange );
+	uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = helper.getSheetCellCursor();
+	xSheetCellCursor->collapseToCurrentRegion();
+	uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
+	table::CellRangeAddress aOutlineAddress = xCellRangeAddressable->getRangeAddress();
+
+	// check if the specified range is a single summary column or row.
+	table::CellRangeAddress thisAddress = helper.getCellRangeAddressable()->getRangeAddress();
+	if( (thisAddress.StartRow == thisAddress.EndRow &&  thisAddress.EndRow == aOutlineAddress.EndRow ) ||
+		(thisAddress.StartColumn == thisAddress.EndColumn && thisAddress.EndColumn == aOutlineAddress.EndColumn ))
+	{			
+		// #FIXME, seems there is a different behavior between MSO and OOo. 
+		//	In OOo, the showDetail will show all the level entrys, while only show the first level entry in MSO
+		uno::Reference< sheet::XSheetOutline > xSheetOutline( helper.getSpreadSheet(), uno::UNO_QUERY_THROW );
+		if( bShowDetail )
+			xSheetOutline->showDetail( aOutlineAddress );
+		else
+			xSheetOutline->hideDetail( aOutlineAddress );
+	}
+	else
+	{
+		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can not set Range.ShowDetail attribute ")), uno::Reference< uno::XInterface >() );
+	}
+}
+
+uno::Reference< excel::XRange > SAL_CALL 
+ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeException)
+{
+    uno::Reference< sheet::XSheetCellRange > xMergeShellCellRange(mxRange->getCellRangeByPosition(0,0,0,0), uno::UNO_QUERY_THROW);
+    uno::Reference< sheet::XSheetCellCursor > xMergeSheetCursor(xMergeShellCellRange->getSpreadsheet()->createCursorByRange( xMergeShellCellRange ), uno::UNO_QUERY_THROW);
+    if( xMergeSheetCursor.is() )
+    {
+        xMergeSheetCursor->collapseToMergedArea();
+        uno::Reference<sheet::XCellRangeAddressable> xMergeCellAddress(xMergeSheetCursor, uno::UNO_QUERY_THROW);
+        if( xMergeCellAddress.is() )
+        {
+            table::CellRangeAddress aCellAddress = xMergeCellAddress->getRangeAddress();
+            if( aCellAddress.StartColumn ==0 && aCellAddress.EndColumn==0 &&
+                aCellAddress.StartRow==0 && aCellAddress.EndRow==0)
+            {
+                return new ScVbaRange( getParent(),mxContext,mxRange );
+            }
+            else
+            {
+                ScRange refRange( static_cast< SCCOL >( aCellAddress.StartColumn ), static_cast< SCROW >( aCellAddress.StartRow ), static_cast< SCTAB >( aCellAddress.Sheet ), 
+                                  static_cast< SCCOL >( aCellAddress.EndColumn ), static_cast< SCROW >( aCellAddress.EndRow ), static_cast< SCTAB >( aCellAddress.Sheet ) );
+                uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getScDocShell() , refRange ) );
+                return new ScVbaRange( getParent(),mxContext,xRange );
+            }
+        }
+    }
+    return new ScVbaRange( getParent(),mxContext,mxRange );
+}
+
+void SAL_CALL 
+ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException)
+{
+	ScDocShell* pShell = NULL;
+
+	sal_Int32 nItems = m_Areas->getCount();
+	uno::Sequence< 	table::CellRangeAddress > printAreas( nItems );
+	uno::Reference< sheet::XPrintAreas > xPrintAreas;
+	for ( sal_Int32 index=1; index <= nItems; ++index )
+	{
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+
+		RangeHelper thisRange( xRange->getCellRange() );
+		table::CellRangeAddress rangeAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+		if ( index == 1 )
+		{
+			ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xRange.get() ); 
+			// initialise the doc shell and the printareas
+			pShell = getDocShellFromRange( pRange->mxRange );
+			xPrintAreas.set( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
+		}
+		printAreas[ index - 1 ] = rangeAddress;
+	}
+	if ( pShell )
+	{
+		if ( xPrintAreas.is() )
+		{
+			xPrintAreas->setPrintAreas( printAreas );
+			uno::Reference< frame::XModel > xModel = pShell->GetModel();
+			PrintOutHelper( excel::getBestViewShell( xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, sal_True );
+		}
+	}
+}
+
+void SAL_CALL
+ScVbaRange::AutoFill(  const uno::Reference< excel::XRange >& Destination, const uno::Any& Type ) throw (uno::RuntimeException) 
+{
+	uno::Reference< excel::XRange > xDest( Destination, uno::UNO_QUERY_THROW );
+	ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xDest.get() );
+	RangeHelper destRangeHelper( pRange->mxRange );
+	table::CellRangeAddress destAddress = destRangeHelper.getCellRangeAddressable()->getRangeAddress();	
+	
+	RangeHelper thisRange( mxRange );
+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();	
+	ScRange sourceRange;
+	ScRange destRange;
+
+	ScUnoConversion::FillScRange( destRange, destAddress );	
+	ScUnoConversion::FillScRange( sourceRange, thisAddress );
+	
+	
+	// source is valid
+//	if (  !sourceRange.In( destRange ) )
+//		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "source not in destination" ) ), uno::Reference< uno::XInterface >() );
+
+	FillDir eDir = FILL_TO_BOTTOM;
+	double fStep = 1.0;
+
+	ScRange aRange( destRange );
+	ScRange aSourceRange( destRange );
+
+	// default to include the number of Rows in the source range;
+	SCCOLROW nSourceCount = ( sourceRange.aEnd.Row() - sourceRange.aStart.Row() ) + 1;
+	SCCOLROW nCount = 0;	
+
+	if ( sourceRange != destRange )
+	{
+		// Find direction of fill, vertical or horizontal
+		if ( sourceRange.aStart == destRange.aStart )
+		{
+			if ( sourceRange.aEnd.Row() == destRange.aEnd.Row() )
+			{
+				nSourceCount = ( sourceRange.aEnd.Col() - sourceRange.aStart.Col() + 1 );
+				aSourceRange.aEnd.SetCol( static_cast<SCCOL>( aSourceRange.aStart.Col() + nSourceCount - 1 ) );
+				eDir = FILL_TO_RIGHT;			
+				nCount = aRange.aEnd.Col() - aSourceRange.aEnd.Col();
+			}
+			else if ( sourceRange.aEnd.Col() == destRange.aEnd.Col() )
+			{
+				aSourceRange.aEnd.SetRow( static_cast<SCROW>( aSourceRange.aStart.Row() + nSourceCount ) - 1 );
+				nCount = aRange.aEnd.Row() - aSourceRange.aEnd.Row();
+				eDir = FILL_TO_BOTTOM;
+			}
+		}
+
+		else if ( aSourceRange.aEnd == destRange.aEnd ) 
+		{
+			if ( sourceRange.aStart.Col() == destRange.aStart.Col() )
+			{
+				aSourceRange.aStart.SetRow( static_cast<SCROW>( aSourceRange.aEnd.Row() - nSourceCount + 1 ) );
+				nCount = aSourceRange.aStart.Row() - aRange.aStart.Row();
+				eDir = FILL_TO_TOP;			
+				fStep = -fStep;
+			}
+			else if ( sourceRange.aStart.Row() == destRange.aStart.Row() )
+			{
+				nSourceCount = ( sourceRange.aEnd.Col() - sourceRange.aStart.Col() ) + 1;
+				aSourceRange.aStart.SetCol( static_cast<SCCOL>( aSourceRange.aEnd.Col() - nSourceCount + 1 ) );
+				nCount = aSourceRange.aStart.Col() - aRange.aStart.Col();
+				eDir = FILL_TO_LEFT;			
+				fStep = -fStep;
+			}
+		}
+	}	
+	ScDocShell* pDocSh= getDocShellFromRange( mxRange );
+
+	FillCmd eCmd = FILL_AUTO;
+	FillDateCmd eDateCmd = FILL_DAY;	
+
+#ifdef VBA_OOBUILD_HACK
+	double fEndValue =  MAXDOUBLE;
+#endif
+
+	if ( Type.hasValue() )
+	{
+		sal_Int16 nFillType = excel::XlAutoFillType::xlFillDefault; 	
+		Type >>= nFillType;
+		switch ( nFillType )
+		{
+			case excel::XlAutoFillType::xlFillCopy:
+				eCmd = 	FILL_SIMPLE;
+				fStep = 0.0;
+				break;
+			case excel::XlAutoFillType::xlFillDays:
+				eCmd = FILL_DATE;
+				break;
+			case excel::XlAutoFillType::xlFillMonths:
+				eCmd = FILL_DATE;
+				eDateCmd = FILL_MONTH;
+				break;
+			case excel::XlAutoFillType::xlFillWeekdays:
+				eCmd = FILL_DATE;
+				eDateCmd = FILL_WEEKDAY;
+				break;
+			case excel::XlAutoFillType::xlFillYears:
+				eCmd = FILL_DATE;
+				eDateCmd = FILL_YEAR;
+				break;
+			case excel::XlAutoFillType::xlGrowthTrend:
+				eCmd = FILL_GROWTH;
+				break;
+			case excel::XlAutoFillType::xlFillFormats:
+				throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "xlFillFormat not supported for AutoFill" ) ), uno::Reference< uno::XInterface >() );
+			case excel::XlAutoFillType::xlFillValues:
+			case excel::XlAutoFillType::xlFillSeries:
+			case excel::XlAutoFillType::xlLinearTrend:
+				eCmd = FILL_LINEAR;
+				break;
+			case excel::XlAutoFillType::xlFillDefault:
+			default:
+				eCmd = 	FILL_AUTO;
+				break;
+		}	
+	}
+	ScDocFunc aFunc(*pDocSh);
+#ifdef VBA_OOBUILD_HACK
+	aFunc.FillAuto( aSourceRange, NULL, eDir, eCmd, eDateCmd, nCount, fStep, fEndValue, TRUE, TRUE );
+#endif
+}
+sal_Bool SAL_CALL
+ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange >& ChangingCell ) throw (uno::RuntimeException)
+{
+	ScDocShell* pDocShell = getScDocShell();
+	sal_Bool bRes = sal_True;
+	ScVbaRange* pRange = static_cast< ScVbaRange* >( ChangingCell.get() );
+	if ( pDocShell && pRange )
+	{
+		uno::Reference< sheet::XGoalSeek > xGoalSeek(  pDocShell->GetModel(), uno::UNO_QUERY_THROW );
+		RangeHelper thisRange( mxRange );
+		table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+		RangeHelper changingCellRange( pRange->mxRange );
+		table::CellRangeAddress changingCellAddr = changingCellRange.getCellRangeAddressable()->getRangeAddress();
+		rtl::OUString sGoal = getAnyAsString( Goal );
+		table::CellAddress thisCell( thisAddress.Sheet, thisAddress.StartColumn, thisAddress.StartRow );
+		table::CellAddress changingCell( changingCellAddr.Sheet, changingCellAddr.StartColumn, changingCellAddr.StartRow );
+		sheet::GoalResult res = xGoalSeek->seekGoal( thisCell, changingCell, sGoal );
+		ChangingCell->setValue( uno::makeAny( res.Result ) );
+		
+		// openoffice behaves differently, result is 0 if the divergence is too great
+                // but... if it detects 0 is the value it requires then it will use that
+		// e.g. divergence & result both = 0.0 does NOT mean there is an error
+		if ( ( res.Divergence != 0.0 ) && ( res.Result == 0.0 ) )
+			bRes = sal_False;
+	}
+	else
+		bRes = sal_False;
+	return bRes;
+}
+
+void
+ScVbaRange::Calculate(  ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	getWorksheet()->Calculate();
+}
+
+uno::Reference< excel::XRange > SAL_CALL 
+ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	if ( mbIsRows || mbIsColumns )
+	{
+		if ( column.hasValue() )
+			DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
+		uno::Reference< excel::XRange > xRange;
+		if ( mbIsColumns )
+			xRange = Columns( row );
+		else
+			xRange = Rows( row );
+		return xRange;
+	}
+	return Cells( row, column );	
+}
+
+void
+ScVbaRange::AutoOutline(  ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	// #TODO #FIXME needs to check for summary row/col ( whatever they are )
+	// not valid for multi Area Addresses
+	if ( m_Areas->getCount() > 1 )
+		DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY); 			
+	// So needs to either span an entire Row or a just be a single cell 
+	// ( that contains a summary RowColumn )
+	// also the Single cell cause doesn't seem to be handled specially in 
+	// this code ( ported from the helperapi RangeImpl.java, 
+	// RangeRowsImpl.java, RangesImpl.java, RangeSingleCellImpl.java
+	RangeHelper thisRange( mxRange );
+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+
+	if ( isSingleCellRange() || mbIsRows )
+	{
+		uno::Reference< sheet::XSheetOutline > xSheetOutline( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
+       		 xSheetOutline->autoOutline( thisAddress );	
+	}
+	else
+		DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
+}
+
+void SAL_CALL
+ScVbaRange:: ClearOutline(  ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		sal_Int32 nItems = m_Areas->getCount();
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+			xRange->ClearOutline();	
+		}
+		return;
+	}
+	RangeHelper thisRange( mxRange );
+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+	uno::Reference< sheet::XSheetOutline > xSheetOutline( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
+        xSheetOutline->clearOutline();	
+}
+
+void 
+ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, uno::RuntimeException )
+{
+	if ( m_Areas->getCount() > 1 )
+		 DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY);
+	table::TableOrientation nOrient = table::TableOrientation_ROWS;
+	if ( mbIsColumns )
+		nOrient = table::TableOrientation_COLUMNS;
+	RangeHelper thisRange( mxRange );
+	table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+	uno::Reference< sheet::XSheetOutline > xSheetOutline( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
+	if ( bUnGroup )
+	        xSheetOutline->ungroup( thisAddress, nOrient );
+	else
+	        xSheetOutline->group( thisAddress, nOrient );
+}
+
+void SAL_CALL 
+ScVbaRange::Group(  ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	groupUnGroup();	
+}
+void SAL_CALL 
+ScVbaRange::Ungroup(  ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	groupUnGroup(true);	
+}
+
+void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, sal_Bool _bMerge = sal_True ) throw ( uno::RuntimeException )
+{
+        uno::Reference< util::XMergeable > xMergeable( xCellRange, uno::UNO_QUERY_THROW );
+        xMergeable->merge(_bMerge);            
+}
+void SAL_CALL 
+ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		sal_Int32 nItems = m_Areas->getCount();
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+			xRange->Merge(Across);	
+		}
+		return;
+	}
+	uno::Reference< table::XCellRange > oCellRange;	
+	sal_Bool bAcross = sal_False;
+	Across >>= bAcross;
+	if ( !bAcross )
+		lcl_mergeCellsOfRange( mxRange );
+	else
+	{
+		uno::Reference< excel::XRange > oRangeRowsImpl = Rows( uno::Any() );
+		// #TODO #FIXME this seems incredibly lame, this can't be right
+		for (sal_Int32 i=1; i <= oRangeRowsImpl->getCount();i++)
+		{
+               		oRangeRowsImpl->Cells( uno::makeAny( i ), uno::Any() )->Merge( uno::makeAny( sal_False ) );
+           	}
+	}
+}
+
+void SAL_CALL 
+ScVbaRange::UnMerge(  ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		sal_Int32 nItems = m_Areas->getCount();
+		for ( sal_Int32 index=1; index <= nItems; ++index )
+		{
+			uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+			xRange->UnMerge();	
+		}
+		return;
+	}
+	lcl_mergeCellsOfRange( mxRange, sal_False);
+}
+
+uno::Any SAL_CALL 
+ScVbaRange::getStyle() throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32( 1 ) ), uno::Any() ), uno::UNO_QUERY_THROW  );
+		return xRange->getStyle();
+	}
+	uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW );
+	rtl::OUString sStyleName;
+    xProps->getPropertyValue(CELLSTYLE) >>= sStyleName;
+	ScDocShell* pShell = getScDocShell();
+	uno::Reference< frame::XModel > xModel( pShell->GetModel() ); 
+	uno::Reference< excel::XStyle > xStyle = new ScVbaStyle( this, mxContext,  sStyleName, xModel );
+	return uno::makeAny( xStyle );
+}
+void SAL_CALL 
+ScVbaRange::setStyle( const uno::Any& _style ) throw (uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32( 1 ) ), uno::Any() ), uno::UNO_QUERY_THROW );
+		xRange->setStyle( _style );
+		return;
+	}
+	uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW );
+	uno::Reference< excel::XStyle > xStyle;
+	_style >>= xStyle;
+	xProps->setPropertyValue(CELLSTYLE, uno::makeAny(xStyle->getName()));
+}
+
+uno::Reference< excel::XRange >
+ScVbaRange::PreviousNext( bool bIsPrevious )
+{ 
+	ScMarkData markedRange;
+	ScRange refRange;	
+	RangeHelper thisRange( mxRange );
+	
+	ScUnoConversion::FillScRange( refRange, thisRange.getCellRangeAddressable()->getRangeAddress());
+	markedRange. SetMarkArea( refRange );
+	short nMove = bIsPrevious ? -1 : 1;
+
+	SCCOL nNewX = refRange.aStart.Col();
+	SCROW nNewY = refRange.aStart.Row();
+	SCTAB nTab = refRange.aStart.Tab();
+
+	ScDocument* pDoc = getScDocument(); 
+	pDoc->GetNextPos( nNewX,nNewY, nTab, nMove,0, TRUE,TRUE, markedRange );	
+	refRange.aStart.SetCol( nNewX );
+	refRange.aStart.SetRow( nNewY );
+	refRange.aStart.SetTab( nTab );
+	refRange.aEnd.SetCol( nNewX );
+	refRange.aEnd.SetRow( nNewY );
+	refRange.aEnd.SetTab( nTab );
+
+	uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getScDocShell() , refRange ) );
+	
+	return new ScVbaRange( getParent(), mxContext, xRange );
+}
+
+uno::Reference< excel::XRange > SAL_CALL 
+ScVbaRange::Next() throw (script::BasicErrorException, uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32( 1 ) ), uno::Any() ) , uno::UNO_QUERY_THROW  );
+		return xRange->Next();
+	}
+	return PreviousNext( false );
+}
+
+uno::Reference< excel::XRange > SAL_CALL 
+ScVbaRange::Previous() throw (script::BasicErrorException, uno::RuntimeException)
+{
+	if ( m_Areas->getCount() > 1 )
+	{
+		uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32( 1 ) ), uno::Any() ), uno::UNO_QUERY_THROW  );
+		return xRange->Previous();
+	}
+	return PreviousNext( true );
+}
+
+uno::Reference< excel::XRange > SAL_CALL
+ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw ( script::BasicErrorException )
+{
+	bool bIsSingleCell = isSingleCellRange(); 
+	bool bIsMultiArea = ( m_Areas->getCount() > 1 );
+	ScVbaRange* pRangeToUse = this;
+	sal_Int32 nType = 0;
+	if ( !( _oType >>= nType ) )
+		DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
+	switch(nType)
+	{
+		case excel::XlCellType::xlCellTypeSameFormatConditions:
+		case excel::XlCellType::xlCellTypeAllValidation:
+		case excel::XlCellType::xlCellTypeSameValidation:
+			DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); 
+			break;
+		case excel::XlCellType::xlCellTypeBlanks:
+		case excel::XlCellType::xlCellTypeComments:
+		case excel::XlCellType::xlCellTypeConstants:
+		case excel::XlCellType::xlCellTypeFormulas:
+		case excel::XlCellType::xlCellTypeVisible:
+		case excel::XlCellType::xlCellTypeLastCell:
+		{
+			if ( bIsMultiArea )
+			{
+				// need to process each area, gather the results and
+				// create a new range from those
+				std::vector< table::CellRangeAddress > rangeResults;
+				sal_Int32 nItems = ( m_Areas->getCount() + 1 );
+				for ( sal_Int32 index=1; index <= nItems; ++index )
+				{
+					uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
+					xRange = xRange->SpecialCells( _oType,  _oValue);
+					ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xRange.get() ); 
+					if ( xRange.is() && pRange )
+					{
+						sal_Int32 nElems = ( pRange->m_Areas->getCount() + 1 );
+						for ( sal_Int32 nArea = 1; nArea < nElems; ++nArea )
+						{
+							uno::Reference< excel::XRange > xTmpRange( m_Areas->Item( uno::makeAny( nArea ), uno::Any() ), uno::UNO_QUERY_THROW );
+							RangeHelper rHelper( xTmpRange->getCellRange() );
+							rangeResults.push_back( rHelper.getCellRangeAddressable()->getRangeAddress() );
+						}	
+					}
+				}	
+				ScRangeList aCellRanges;
+				std::vector< table::CellRangeAddress >::iterator it = rangeResults.begin();
+				std::vector< table::CellRangeAddress >::iterator it_end = rangeResults.end();
+				for ( ; it != it_end; ++ it )
+				{
+					ScRange refRange;
+					ScUnoConversion::FillScRange( refRange, *it );
+					aCellRanges.Append( refRange );
+				}
+				// Single range
+				if ( aCellRanges.First() == aCellRanges.Last() )
+				{
+					uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getScDocShell(), *aCellRanges.First() ) );
+				// #FIXME need proper (WorkSheet) parent
+					return new ScVbaRange( getParent(), mxContext, xRange );
+				}
+				uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( getScDocShell(), aCellRanges ) );
+ 	
+				// #FIXME need proper (WorkSheet) parent
+				return new ScVbaRange( getParent(), mxContext, xRanges );
+			}
+			else if ( bIsSingleCell )
+			{
+				uno::Reference< excel::XRange > xUsedRange = getWorksheet()->getUsedRange();
+				pRangeToUse = static_cast< ScVbaRange* >( xUsedRange.get() );	
+			}
+		
+			break;
+		}			
+		default:
+		DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
+			break;
+	}
+	if ( !pRangeToUse )
+		DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() );
+	return pRangeToUse->SpecialCellsImpl( nType, _oValue );	
+}
+
+sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script::BasicErrorException )
+{
+	sal_Int32 nType = excel::XlSpecialCellsValue::xlNumbers;
+	aType >>= nType;
+	sal_Int32 nRes = sheet::FormulaResult::VALUE;
+
+	switch(nType)
+	{
+		case excel::XlSpecialCellsValue::xlErrors:
+			nRes= sheet::FormulaResult::ERROR;
+			break;	
+		case excel::XlSpecialCellsValue::xlLogical:
+			//TODO bc93774: ask NN if this is really an appropriate substitute
+			nRes = sheet::FormulaResult::VALUE;
+			break;
+		case excel::XlSpecialCellsValue::xlNumbers:
+			nRes = sheet::FormulaResult::VALUE;
+			break;
+		case excel::XlSpecialCellsValue::xlTextValues:
+			nRes = sheet::FormulaResult::STRING;
+			break;
+		default:
+			DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
+	}
+	return nRes;
+}
+
+uno::Reference< excel::XRange > 
+ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( script::BasicErrorException )
+{
+	uno::Reference< excel::XRange > xRange;
+	try
+	{
+		uno::Reference< sheet::XCellRangesQuery > xQuery( mxRange, uno::UNO_QUERY_THROW );
+		uno::Reference< excel::XRange > oLocRangeImpl;
+		uno::Reference< sheet::XSheetCellRanges > xLocSheetCellRanges;
+		switch(nType)
+		{
+			case excel::XlCellType::xlCellTypeAllFormatConditions:
+			case excel::XlCellType::xlCellTypeSameFormatConditions:
+			case excel::XlCellType::xlCellTypeAllValidation:
+			case excel::XlCellType::xlCellTypeSameValidation:
+				// Shouldn't get here ( should be filtered out by 
+				// ScVbaRange::SpecialCells()
+				DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); 
+				break;
+			case excel::XlCellType::xlCellTypeBlanks:
+				xLocSheetCellRanges = xQuery->queryEmptyCells();
+				break;
+			case excel::XlCellType::xlCellTypeComments:
+				xLocSheetCellRanges = xQuery->queryContentCells(sheet::CellFlags::ANNOTATION);
+				break;
+			case excel::XlCellType::xlCellTypeConstants:
+				xLocSheetCellRanges = xQuery->queryContentCells(23);	      
+				break;
+			case excel::XlCellType::xlCellTypeFormulas:
+			{
+				sal_Int32 nFormulaResult = lcl_getFormulaResultFlags(_oValue);
+				xLocSheetCellRanges = xQuery->queryFormulaCells(nFormulaResult);
+				break;
+			}
+			case excel::XlCellType::xlCellTypeLastCell:
+				xRange = Cells( uno::makeAny( getCount() ), uno::Any() );
+			case excel::XlCellType::xlCellTypeVisible:
+				xLocSheetCellRanges = xQuery->queryVisibleCells();	      
+				break;
+			default:
+				DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
+				break;
+		}
+		if (xLocSheetCellRanges.is())
+		{
+			xRange = lcl_makeXRangeFromSheetCellRanges( getParent(), mxContext, xLocSheetCellRanges, getScDocShell() );
+		}
+	}
+	catch (uno::Exception& )
+	{
+		DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_NOCELLSWEREFOUND);                    
+	}
+	return xRange;
+}
+
+void SAL_CALL 
+ScVbaRange::RemoveSubtotal(  ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	uno::Reference< sheet::XSubTotalCalculatable > xSub( mxRange, uno::UNO_QUERY_THROW );
+	xSub->removeSubTotals();	
+}
+
+void SAL_CALL 
+ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::Sequence< ::sal_Int32 >& _nTotalList, const uno::Any& aReplace, const uno::Any& PageBreaks, const uno::Any& /*SummaryBelowData*/ ) throw (script::BasicErrorException, uno::RuntimeException)
+{
+	try
+	{
+		sal_Bool bDoReplace = sal_False;
+		aReplace >>= bDoReplace;
+		sal_Bool bAddPageBreaks = sal_False;
+		PageBreaks >>= bAddPageBreaks;
+
+		uno::Reference< sheet::XSubTotalCalculatable> xSub(mxRange, uno::UNO_QUERY_THROW );
+		uno::Reference< sheet::XSubTotalDescriptor > xSubDesc = xSub->createSubTotalDescriptor(sal_True);
+		uno::Reference< beans::XPropertySet > xSubDescPropertySet( xSubDesc, uno::UNO_QUERY_THROW );
+		xSubDescPropertySet->setPropertyValue(INSERTPAGEBREAKS, uno::makeAny( bAddPageBreaks));
+		sal_Int32 nLen = _nTotalList.getLength();
+		uno::Sequence< sheet::SubTotalColumn > aColumns( nLen );
+		for (int i = 0; i < nLen; i++)
+		{
+			aColumns[i].Column = _nTotalList[i] - 1;
+			switch (_nFunction)
+			{
+				case excel::XlConsolidationFunction::xlAverage:
+					aColumns[i].Function = sheet::GeneralFunction_AVERAGE;
+					break;
+				case excel::XlConsolidationFunction::xlCount:
+					aColumns[i].Function = sheet::GeneralFunction_COUNT;
+					break;
+				case excel::XlConsolidationFunction::xlCountNums:
+					aColumns[i].Function = sheet::GeneralFunction_COUNTNUMS;
+					break;
+				case excel::XlConsolidationFunction::xlMax:
+					aColumns[i].Function = sheet::GeneralFunction_MAX;
+					break;
+				case excel::XlConsolidationFunction::xlMin:
+					aColumns[i].Function = sheet::GeneralFunction_MIN;
+					break;
+				case excel::XlConsolidationFunction::xlProduct:
+					aColumns[i].Function = sheet::GeneralFunction_PRODUCT;
+					break;
+				case excel::XlConsolidationFunction::xlStDev:
+					aColumns[i].Function = sheet::GeneralFunction_STDEV;
+					break;
+				case excel::XlConsolidationFunction::xlStDevP:
+					aColumns[i].Function = sheet::GeneralFunction_STDEVP;
+					break;
+				case excel::XlConsolidationFunction::xlSum:
+					aColumns[i].Function = sheet::GeneralFunction_SUM;
+					break;
+				case excel::XlConsolidationFunction::xlUnknown:
+					aColumns[i].Function = sheet::GeneralFunction_NONE;
+					break;
+				case excel::XlConsolidationFunction::xlVar:
+					aColumns[i].Function = sheet::GeneralFunction_VAR;
+					break;
+				case excel::XlConsolidationFunction::xlVarP:
+					aColumns[i].Function = sheet::GeneralFunction_VARP;
+					break;
+				default:
+					DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString()) ;
+					return;
+			}
+		}
+		xSubDesc->addNew(aColumns, _nGroupBy - 1);
+		xSub->applySubTotals(xSubDesc, bDoReplace);
+	}
+	catch (uno::Exception& )
+	{
+		DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
+	}
+}
+
+rtl::OUString& 
+ScVbaRange::getServiceImplName()
+{
+	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRange") );
+	return sImplName;
+}
+
+uno::Sequence< rtl::OUString > 
+ScVbaRange::getServiceNames()
+{
+	static uno::Sequence< rtl::OUString > aServiceNames;
+	if ( aServiceNames.getLength() == 0 )
+	{
+		aServiceNames.realloc( 1 );
+		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Range" ) );
+	}
+	return aServiceNames;
+}
+
+sal_Bool SAL_CALL
+ScVbaRange::hasError() throw (uno::RuntimeException)
+{
+    double dResult = sal_False;
+    uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
+    uno::Reference< script::XInvocation > xInvoc( xApplication->WorksheetFunction(), uno::UNO_QUERY_THROW );
+
+    static rtl::OUString FunctionName( RTL_CONSTASCII_USTRINGPARAM("IsError" ) );
+    uno::Sequence< uno::Any > Params(1);
+    uno::Reference< excel::XRange > aRange( this );
+    Params[0] = uno::makeAny( aRange );
+    uno::Sequence< sal_Int16 > OutParamIndex;
+    uno::Sequence< uno::Any > OutParam;
+    xInvoc->invoke( FunctionName, Params, OutParamIndex, OutParam ) >>= dResult;
+    if ( dResult > 0.0 )
+         return sal_True;
+    return sal_False;
+}
+
+namespace range
+{
+namespace sdecl = comphelper::service_decl;
+sdecl::vba_service_class_<ScVbaRange, sdecl::with_args<true> > serviceImpl;
+extern sdecl::ServiceDecl const serviceDecl(
+    serviceImpl,
+    "SvVbaRange",
+    "ooo.vba.excel.Range" );
+}
diff --git a/sc/source/ui/vba/vbascrollbar.cxx b/sc/source/ui/vba/vbascrollbar.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbascrollbar.hxx b/sc/source/ui/vba/vbascrollbar.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbashape.cxx b/sc/source/ui/vba/vbashape.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbashape.hxx b/sc/source/ui/vba/vbashape.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbashaperange.cxx b/sc/source/ui/vba/vbashaperange.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbashaperange.hxx b/sc/source/ui/vba/vbashaperange.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbashapes.cxx b/sc/source/ui/vba/vbashapes.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbashapes.hxx b/sc/source/ui/vba/vbashapes.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbaspinbutton.cxx b/sc/source/ui/vba/vbaspinbutton.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbaspinbutton.hxx b/sc/source/ui/vba/vbaspinbutton.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbatextbox.cxx b/sc/source/ui/vba/vbatextbox.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbatextbox.hxx b/sc/source/ui/vba/vbatextbox.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbatogglebutton.cxx b/sc/source/ui/vba/vbatogglebutton.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbatogglebutton.hxx b/sc/source/ui/vba/vbatogglebutton.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbauserform.cxx b/sc/source/ui/vba/vbauserform.cxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbauserform.hxx b/sc/source/ui/vba/vbauserform.hxx
new file mode 100644
index 000000000..e69de29bb
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index c05b31407..4c6c89a88 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -750,7 +750,7 @@ ScVbaWindow::setZoom( const uno::Any& _zoom ) throw (uno::RuntimeException)
     std::vector< SCTAB > vTabs;
     vTabs.push_back( nTab );
     excel::implSetZoom( m_xModel, nZoom, vTabs );
-}
+    }					
 
 uno::Reference< excel::XWorksheet > SAL_CALL 
 ScVbaWindow::ActiveSheet(  ) throw (script::BasicErrorException, uno::RuntimeException)
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 5a97ed832..a50d7f9b1 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -260,9 +260,9 @@ ScVbaWorkbook::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException)
 
 void SAL_CALL
 ScVbaWorkbook::Activate() throw (uno::RuntimeException)
-{
+    {
     VbaDocumentBase::Activate();
-}
+        }
 
 ::sal_Bool
 ScVbaWorkbook::getProtectStructure() throw (uno::RuntimeException)
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index 0c44bd83f..4764cfefa 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -93,8 +93,8 @@ public:
 
 ScVbaWorkbooks::ScVbaWorkbooks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext ) : ScVbaWorkbooks_BASE( xParent, xContext, VbaDocumentsBase::EXCEL_DOCUMENT )
 {
-}
-// XEnumerationAccess
+            }
+    //XEnumerationAccess
 uno::Type
 ScVbaWorkbooks::getElementType() throw (uno::RuntimeException)
 {
@@ -123,7 +123,7 @@ uno::Any SAL_CALL
 ScVbaWorkbooks::Add() throw (uno::RuntimeException)
 {
     uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( VbaDocumentsBase::Add() , uno::UNO_QUERY_THROW );
-                                                                                                                             
+
     if( xSpreadDoc.is() )
         return getWorkbook( mxContext, xSpreadDoc, Application() );
     return uno::Any();
@@ -176,8 +176,8 @@ uno::Any
 ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException)
 {
     // we need to detect if this is a URL, if not then assume its a file path
-    rtl::OUString aURL;
-    INetURLObject aObj;
+        rtl::OUString aURL;
+        INetURLObject aObj;
     aObj.SetURL( rFileName );
     bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
     if ( bIsURL )
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index 6224c76c7..0f52b14fb 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -77,7 +77,9 @@
 
 #include "cellsuno.hxx"
 #include "drwlayer.hxx"
-
+#ifdef CWSSCSHEETPROTECTION
+#include "tabprotection.hxx"
+#endif
 #include "scextopt.hxx"
 #include "vbaoutline.hxx"
 #include "vbarange.hxx"
@@ -409,6 +411,22 @@ ScVbaWorksheet::getProtectContents()throw (uno::RuntimeException)
 sal_Bool 
 ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException) 
 {
+#ifdef CWSSCSHEETPROTECTION
+	SCTAB nTab = 0;
+	rtl::OUString aSheetName = getName();
+	uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
+	bool bSheetExists = nameExists (xSpreadDoc, aSheetName, nTab);
+	if ( bSheetExists )
+	{
+		uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
+		ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
+		ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
+		if ( pProtect )
+			return pProtect->getOption( ScTableProtection::OBJECTS ); 
+        }
+#else
+	return getProtectContents(); // fallback
+#endif 
     return false;
 }
 
@@ -557,13 +575,25 @@ ScVbaWorksheet::getSheetAtOffset(SCTAB offset) throw (uno::RuntimeException)
 uno::Reference< excel::XWorksheet >
 ScVbaWorksheet::getNext() throw (uno::RuntimeException)
 {
+	//VBA, minz@cn.ibm.com. catch the exception for index out of bound
+	try{
     return getSheetAtOffset(static_cast<SCTAB>(1));
+	}catch( lang::IndexOutOfBoundsException& /*e*/ )
+	{
+		return NULL;
+}
 }
 
 uno::Reference< excel::XWorksheet >
 ScVbaWorksheet::getPrevious() throw (uno::RuntimeException)
 {
+	//VBA, minz@cn.ibm.com. catch the exception for index out of bound
+	try{
     return getSheetAtOffset(-1);
+	}catch( lang::IndexOutOfBoundsException& /*e*/ )
+	{
+		return NULL;
+}
 }
 
 
@@ -647,7 +677,7 @@ ScVbaWorksheet::ChartObjects( const uno::Any& Index ) throw (uno::RuntimeExcepti
         uno::Reference< table::XTableChartsSupplier > xChartSupplier( getSheet(), uno::UNO_QUERY_THROW );
         uno::Reference< table::XTableCharts > xTableCharts = xChartSupplier->getCharts();
         
-        uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxSheet, uno::UNO_QUERY_THROW );
+		uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( getSheet(), uno::UNO_QUERY_THROW ); //VBA, minz@cn.ibm.com.
         mxCharts = new ScVbaChartObjects(  this, mxContext, xTableCharts, xDrawPageSupplier );
     }
     if ( Index.hasValue() )
@@ -936,7 +966,7 @@ ScVbaWorksheet::setCodeName( const rtl::OUString& ) throw (css::uno::RuntimeExce
 sal_Int16
 ScVbaWorksheet::getSheetID() throw (uno::RuntimeException)
 {
-    uno::Reference< sheet::XCellRangeAddressable > xAddressable( mxSheet, uno::UNO_QUERY_THROW );
+	uno::Reference< sheet::XCellRangeAddressable > xAddressable( getSheet(), uno::UNO_QUERY_THROW ); //VBA. minz@cn.ibm.com. if ActiveSheet, mxSheet is null.
     return xAddressable->getRangeAddress().Sheet;
 }
 
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index a46c818d9..ae745c195 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -213,19 +213,19 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
 	uno::Reference< excel::XWorksheet > xBeforeAfterSheet;
 
 	if ( Before.hasValue() )
-    {
+	{
         	if ( Before >>= xBeforeAfterSheet )
 			aStringSheet = xBeforeAfterSheet->getName();
 		else
-			Before >>= aStringSheet;
+    Before >>= aStringSheet;
 	}
 
 	if (!aStringSheet.getLength() && After.hasValue() )
-	{
+    {
         	if ( After >>= xBeforeAfterSheet )
 			aStringSheet = xBeforeAfterSheet->getName();
 		else
-			After >>= aStringSheet;
+        After >>= aStringSheet;
         bBefore = sal_False;
     }
     if (!aStringSheet.getLength())
diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx
index 101e1c9ef..df41e57b2 100644
--- a/sc/source/ui/vba/vbawsfunction.cxx
+++ b/sc/source/ui/vba/vbawsfunction.cxx
@@ -81,6 +81,16 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence<
             aArrayTemp[i] = myRange->getCellRange();
             continue;
         }
+                else if (  aArray[ i ].getValueType().getTypeClass() == uno::TypeClass_BOOLEAN )
+		{
+			sal_Bool bValue( sal_False );
+			aArray[ i ] >>= bValue;
+			if ( bValue )
+				aArrayTemp[ i ] <<= double( 1.0 ); 
+			else
+				aArrayTemp[ i ] <<= double( 0.0 ); 
+                        
+		}
         else if ( aArray[ i ].getValueType().getTypeClass() == uno::TypeClass_SEQUENCE )
         {
             // the sheet.FunctionAccess service doesn't deal with Sequences, only Sequences of Sequence
@@ -90,7 +100,7 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence<
                 uno::Sequence< uno::Sequence< sal_Int16 > >  aTmp(1);
                 aArray[ i ] >>= aTmp[ 0 ];
                 aArrayTemp[i] <<= aTmp;
-            }
+    }
             else if ( aType.equals( getCppuType( (uno::Sequence<sal_Int32>*)0 ) ) )
             {
                 uno::Sequence< uno::Sequence< sal_Int32 > > aTmp(1);
@@ -116,7 +126,7 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence<
                 aArrayTemp[i] <<= aTmp;
             }
         }
-    }
+	}
 
     for ( int count=0; count < aParamTemp.getLength(); ++count )
         OSL_TRACE("Param[%d] is %s",
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index a02c450da..e206b8a7b 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -717,22 +717,22 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                 break;
 
             case FID_INS_ROWBRK:
-                if ( nPosY==0 || (pDoc->GetRowFlags(nPosY,nTab) & CR_MANUALBREAK) )
+                if ( nPosY==0 || (pDoc->HasRowBreak(nPosY, nTab) & BREAK_MANUAL) )
                     rSet.DisableItem( nWhich );
                 break;
 
             case FID_INS_COLBRK:
-                if ( nPosX==0 || (pDoc->GetColFlags(nPosX,nTab) & CR_MANUALBREAK) )
+                if ( nPosX==0 || (pDoc->HasColBreak(nPosX, nTab) & BREAK_MANUAL) )
                     rSet.DisableItem( nWhich );
                 break;
 
             case FID_DEL_ROWBRK:
-                if ( nPosY==0 || (pDoc->GetRowFlags(nPosY,nTab) & CR_MANUALBREAK)==0 )
+                if ( nPosY==0 || (pDoc->HasRowBreak(nPosY, nTab) & BREAK_MANUAL) == 0 )
                     rSet.DisableItem( nWhich );
                 break;
 
             case FID_DEL_COLBRK:
-                if ( nPosX==0 || (pDoc->GetColFlags(nPosX,nTab) & CR_MANUALBREAK)==0 )
+                if ( nPosX==0 || (pDoc->HasColBreak(nPosX, nTab) & BREAK_MANUAL) == 0 )
                     rSet.DisableItem( nWhich );
                 break;
 
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 8eb937269..62c40698c 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -103,8 +103,8 @@
 #include "dpsave.hxx"
 #include "dpgroup.hxx"      // for ScDPNumGroupInfo
 #include "spellparam.hxx"
-#include "clipparam.hxx"
 #include "postit.hxx"
+#include "clipparam.hxx"
 
 #include "globstr.hrc"
 #include "scui_def.hxx" //CHINA001
@@ -1170,8 +1170,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 WaitObject aWait( GetViewData()->GetDialogParent() );
                 pTabViewShell->CopyToClip( NULL, FALSE, FALSE, TRUE );
                 rReq.Done();
-				GetViewData()->SetPasteMode( (ScPasteFlags) (SC_PASTE_MODE | SC_PASTE_BORDER) );
-				pTabViewShell->ShowCursor();
+                GetViewData()->SetPasteMode( (ScPasteFlags) (SC_PASTE_MODE | SC_PASTE_BORDER) );
+                pTabViewShell->ShowCursor();
             }
             break;
 
@@ -1180,13 +1180,13 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 WaitObject aWait( GetViewData()->GetDialogParent() );
                 pTabViewShell->CutToClip( NULL, TRUE );
                 rReq.Done();
-				GetViewData()->SetPasteMode( SC_PASTE_MODE );
+                GetViewData()->SetPasteMode( SC_PASTE_MODE );
             }
             break;
 
         case SID_PASTE:
             {
-				PasteFromClipboard ( GetViewData(), pTabViewShell, TRUE );
+                PasteFromClipboard ( GetViewData(), pTabViewShell, true );
                 rReq.Done();
             }
             break;
@@ -2205,7 +2205,7 @@ IMPL_LINK( ScCellShell, DialogClosed, AbstractScLinkedAreaDlg*, EMPTYARG )
     return 0;
 }
 
-void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, BOOL bShowDialog )
+void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, bool bShowDialog )
 {
     Window* pWin = pViewData->GetActiveWin();
     ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
@@ -2254,4 +2254,3 @@ void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTa
     }
     pTabViewShell->CellContentChanged();		// => PasteFromSystem() ???
 }
-
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 9d9aad7dc..a54ea7444 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -769,7 +769,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                 {
                     //	select database range or data
                     pTabViewShell->GetDBData( TRUE, SC_DB_OLD );
-                    const ScMarkData& rMark = GetViewData()->GetMarkData();
+                    ScMarkData& rMark = GetViewData()->GetMarkData();
                     if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
                         pTabViewShell->MarkDataArea( FALSE );
 
@@ -835,6 +835,19 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                             ScMarkType eType = GetViewData()->GetSimpleArea(aRange);
                             if ( (eType & SC_MARK_SIMPLE) == SC_MARK_SIMPLE )
                             {
+                                // Shrink the range to the data area.
+                                SCCOL nStartCol = aRange.aStart.Col(), nEndCol = aRange.aEnd.Col();
+                                SCROW nStartRow = aRange.aStart.Row(), nEndRow = aRange.aEnd.Row();
+                                if (pDoc->ShrinkToDataArea(aRange.aStart.Tab(), nStartCol, nStartRow, nEndCol, nEndRow))
+                                {
+                                    aRange.aStart.SetCol(nStartCol);
+                                    aRange.aStart.SetRow(nStartRow);
+                                    aRange.aEnd.SetCol(nEndCol);
+                                    aRange.aEnd.SetRow(nEndRow);
+                                    rMark.SetMarkArea(aRange);
+                                    pTabViewShell->MarkRange(aRange);
+                                }
+
                                 BOOL bOK = TRUE;
                                 if ( pDoc->HasSubTotalCells( aRange ) )
                                 {
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 3f80397e9..88fb5e242 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -52,6 +52,7 @@
 #include "document.hxx"
 #include "sc.hrc"
 
+#include "vcl/svapp.hxx"
 
 //------------------------------------------------------------------
 
@@ -220,6 +221,16 @@ void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
 {
     sal_uInt16 nSlotId  = rReq.GetSlot();
     ScTabViewShell* pViewShell = GetViewData()->GetViewShell();
+    ScInputHandler* pInputHdl = pViewShell->GetInputHandler();
+    pViewShell->HideAllCursors();
+    if (pInputHdl && pInputHdl->IsInputMode())
+    {
+        // the current cell is in edit mode.  Commit the text before moving on.
+        pViewShell->ExecuteInputDirect();
+    }
+
+    // Horizontal direction depends on whether or not the UI language is RTL.
+    SCsCOL nMovX = Application::GetSettings().GetLayoutRTL() ? -1 : 1;
 
     switch (nSlotId)
     {
@@ -230,10 +241,10 @@ void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
             pViewShell->ExpandBlock(0, -1, SC_FOLLOW_LINE);
         break;
         case SID_CURSORRIGHT_SEL:
-            pViewShell->ExpandBlock(1, 0, SC_FOLLOW_LINE);
+            pViewShell->ExpandBlock(nMovX, 0, SC_FOLLOW_LINE);
         break;
         case SID_CURSORLEFT_SEL:
-            pViewShell->ExpandBlock(-1, 0, SC_FOLLOW_LINE);
+            pViewShell->ExpandBlock(-nMovX, 0, SC_FOLLOW_LINE);
         break;
         case SID_CURSORPAGEUP_SEL:
             pViewShell->ExpandBlockPage(0, -1);
@@ -242,10 +253,10 @@ void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
             pViewShell->ExpandBlockPage(0, 1);
         break;
         case SID_CURSORPAGERIGHT_SEL:
-            pViewShell->ExpandBlockPage(1, 0);
+            pViewShell->ExpandBlockPage(nMovX, 0);
         break;
         case SID_CURSORPAGELEFT_SEL:
-            pViewShell->ExpandBlockPage(-1, 0);
+            pViewShell->ExpandBlockPage(-nMovX, 0);
         break;
         case SID_CURSORBLKDOWN_SEL:
             pViewShell->ExpandBlockArea(0, 1);
@@ -254,14 +265,15 @@ void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
             pViewShell->ExpandBlockArea(0, -1);
         break;
         case SID_CURSORBLKRIGHT_SEL:
-            pViewShell->ExpandBlockArea(1, 0);
+            pViewShell->ExpandBlockArea(nMovX, 0);
         break;
         case SID_CURSORBLKLEFT_SEL:
-            pViewShell->ExpandBlockArea(-1, 0);
+            pViewShell->ExpandBlockArea(-nMovX, 0);
         break;
         default:
             ;
     }
+    pViewShell->ShowAllCursors();
 }
 
 void ScCellShell::ExecuteMove( SfxRequest& rReq )
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index ecd0a37d9..e7613c13f 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -101,7 +101,8 @@ USHORT ScColBar::GetEntrySize( SCCOLROW nEntryNo )
 {
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
-    if ( pDoc->GetColFlags( static_cast<SCCOL>(nEntryNo), nTab ) & CR_HIDDEN )
+	SCCOL nLastCol = -1;
+	if (pDoc->ColHidden(static_cast<SCCOL>(nEntryNo), nTab, nLastCol))
         return 0;
     else
         return (USHORT) ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(nEntryNo), nTab ), pViewData->GetPPTX() );
@@ -267,7 +268,8 @@ USHORT ScRowBar::GetEntrySize( SCCOLROW nEntryNo )
 {
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
-    if ( pDoc->GetRowFlags( nEntryNo, nTab ) & CR_HIDDEN )
+	SCROW nLastRow = -1;
+	if (pDoc->RowHidden(nEntryNo, nTab, nLastRow))
         return 0;
     else
         return (USHORT) ScViewData::ToPixel( pDoc->GetOriginalHeight( nEntryNo,
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 75fa93d82..c6cd7f6fe 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -105,10 +105,9 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
     }
 }
 
-
 //	aktuellen Datenbereich fuer Sortieren / Filtern suchen
 
-ScDBData* ScDBFunc::GetDBData( bool bMark, ScGetDBMode eMode, bool bExpandRows, bool bShrinkToData )
+ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, bool bShrinkToData, bool bExpandRows )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDBData* pData = NULL;
@@ -150,7 +149,7 @@ ScDBData* ScDBFunc::GetDBData( bool bMark, ScGetDBMode eMode, bool bExpandRows,
     if (bMark)
     {
         ScRange aFound;
-		pData->GetArea(aFound, bExpandRows);
+        pData->GetArea(aFound, bExpandRows);
         MarkRange( aFound, FALSE );
     }
     return pData;
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 16029131b..1e5ff2cb0 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -44,19 +44,17 @@
 #include <vcl/waitobj.hxx>
 #include <svtools/zforlist.hxx>
 #include <sfx2/app.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
+#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <com/sun/star/sheet/DataPilotFieldSortMode.hpp>
-#include <com/sun/star/sheet/MemberResultFlags.hpp>
-
-#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <com/sun/star/sheet/DataPilotTableHeaderData.hpp>
+#include <com/sun/star/sheet/GeneralFunction.hpp>
 #include <com/sun/star/sheet/MemberResultFlags.hpp>
-#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
-#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
-#include <com/sun/star/sheet/XDrillDownDataSupplier.hpp>
 #include <com/sun/star/sheet/XDimensionsSupplier.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/sheet/XDrillDownDataSupplier.hpp>
 
 #include "global.hxx"
 #include "globstr.hrc"
@@ -1620,6 +1618,13 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
                             if (aData.GetDataDimensionCount() > 1)
                                 break;
 
+                            // display name for subtotal is allowed only if the subtotal type is 'Automatic'.
+                            if (pDim->GetSubTotalsCount() != 1)
+                                break;
+
+                            if (pDim->GetSubTotalFunc(0) != sheet::GeneralFunction_AUTO)
+                                break;
+
                             const OUString* pLayoutName = pMem->GetLayoutName();
                             String aMemberName;
                             if (pLayoutName)
@@ -1863,7 +1868,7 @@ BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
 
                 // get all member names in source order
                 uno::Sequence<rtl::OUString> aMemberNames;
-                pDPObj->GetMembers( aDestData.Dimension, aMemberNames );
+                pDPObj->GetMemberNames( aDestData.Dimension, aMemberNames );
 
                 bool bInserted = false;
 
@@ -2290,27 +2295,28 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
     else		// "Keine Operationen auszufuehren"
         ErrorMessage(STR_MSSG_REPEATDB_0);
 }
+
 void ScDBFunc::AutoFormatPivotTable(USHORT nIndex)
 {
-	ScDocument* pDoc	= GetViewData()->GetDocument();
+    ScDocument* pDoc    = GetViewData()->GetDocument();
 
-	//	old pivot not used any more
+    //  old pivot not used any more
 
-	ScDPObject*	pDPObj	= pDoc->GetDPAtCursor( GetViewData()->GetCurX(),
-												  GetViewData()->GetCurY(),
-												  GetViewData()->GetTabNo() );
-	if ( pDPObj )
-	{
-		pDPObj->SetAutoFormatIndex(nIndex);
-	}
-	else
-		ErrorMessage(STR_PIVOT_NOTFOUND);
+    ScDPObject* pDPObj  = pDoc->GetDPAtCursor(
+        GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
+
+    if ( pDPObj )
+    {
+        pDPObj->SetAutoFormatIndex(nIndex);
+    }
+    else
+        ErrorMessage(STR_PIVOT_NOTFOUND);
 
 }
 
 void ScDBFunc::AutoFormatPivotTable(ScDPObject*	pDPObj, USHORT nIndex)
 {
-	pDPObj->SetAutoFormatIndex(nIndex);
+    pDPObj->SetAutoFormatIndex(nIndex);
 }
 
 
diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx
index 48b03b5c6..ddb2f06b6 100644
--- a/sc/source/ui/view/drawutil.cxx
+++ b/sc/source/ui/view/drawutil.cxx
@@ -69,14 +69,19 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab,
         nTwipsX += (long) nWidth;
         nPixelX += ScViewData::ToPixel( nWidth, nPPTX );
     }
-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
-            pDoc->GetRowFlagsArray( nTab), nStartRow, nEndRow-1, CR_HIDDEN, 0,
-            pDoc->GetRowHeightArray( nTab));
-    for ( ; aIter; ++aIter )
+
+    for (SCROW nRow = nStartRow; nRow <= nEndRow-1; ++nRow)
     {
-        USHORT nHeight = *aIter;
-        nTwipsY += (long) nHeight;
-        nPixelY += ScViewData::ToPixel( nHeight, nPPTY );
+        SCROW nLastRow = nRow;
+        if (pDoc->RowHidden(nRow, nTab, NULL, &nLastRow))
+        {    
+            nRow = nLastRow;
+            continue;
+        }
+
+        USHORT nHeight = pDoc->GetRowHeight(nRow, nTab);
+        nTwipsY += static_cast<long>(nHeight);
+        nPixelY += ScViewData::ToPixel(nHeight, nPPTY);
     }
 
     MapMode aHMMMode( MAP_100TH_MM, Point(), rZoomX, rZoomY );
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 06c9eed77..fb9f77d9b 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -825,6 +825,11 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                                                 bNumFormatChanged, aOldSet, rNewSet ) )
                                 pDoc->InvalidateTextWidth( NULL, NULL, bNumFormatChanged );
 
+                            SCTAB nTabCount = pDoc->GetTableCount();
+                            for (SCTAB nTab=0; nTab<nTabCount; nTab++)
+                                if (pDoc->IsStreamValid(nTab))
+                                    pDoc->SetStreamValid(nTab, FALSE);
+
                             ULONG nOldFormat = ((const SfxUInt32Item&)aOldSet.
                                                     Get( ATTR_VALUE_FORMAT )).GetValue();
                             ULONG nNewFormat = ((const SfxUInt32Item&)rNewSet.
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 3920a85d4..42173c4c5 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -165,33 +165,19 @@ extern USHORT nScFillModeMouseModifier;				// global.cxx
 
 #define SC_FILTERLISTBOX_LINES	12
 
-sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTAB nTab, ScBaseCell*& rpCell )
+// ============================================================================
+
+ScGridWindow::VisibleRange::VisibleRange() :
+    mnCol1(0), mnCol2(MAXCOL), mnRow1(0), mnRow2(MAXROW)
 {
-	BOOL bFound = FALSE;
-	do
-	{
-		pDoc->GetCell( rPosX, rPosY, nTab, rpCell );
-		if ( !rpCell || rpCell->GetCellType() == CELLTYPE_NOTE )
-		{
-			if ( rPosX <= 0 )
-				return FALSE;							// alles leer bis links
-			else
-				--rPosX;								// weitersuchen
-		}
-                else if ( rpCell->GetCellType() == CELLTYPE_EDIT)
-                    bFound = TRUE;
-                else if (rpCell->GetCellType() == CELLTYPE_FORMULA &&
-                  static_cast<ScFormulaCell*>(rpCell)->IsHyperLinkCell())
-                    bFound = TRUE;
-	    else
-			return FALSE;								// andere Zelle
-	}
-	while ( !bFound );
+}
 
-	return bFound;
+bool ScGridWindow::VisibleRange::isInside(SCCOL nCol, SCROW nRow) const
+{
+    return mnCol1 <= nCol && nCol <= mnCol2 && mnRow1 <= nRow && nRow <= mnRow2;
 }
 
-//==================================================================
+// ============================================================================
 
 class ScFilterListBox : public ListBox
 {
@@ -203,6 +189,7 @@ private:
     BOOL			bInit;
     BOOL			bCancelled;
     BOOL            bInSelect;
+    bool            mbListHasDates;
     ULONG			nSel;
     ScFilterBoxMode	eMode;
 
@@ -226,6 +213,8 @@ public:
     BOOL            IsInInit() const        { return bInit; }
     void			SetCancelled()			{ bCancelled = TRUE; }
     BOOL            IsInSelect() const      { return bInSelect; }
+    void            SetListHasDates(bool b) { mbListHasDates = b; }
+    bool            HasDates() const        { return mbListHasDates; }
 };
 
 //-------------------------------------------------------------------
@@ -241,6 +230,7 @@ ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid,
     bInit( TRUE ),
     bCancelled( FALSE ),
     bInSelect( FALSE ),
+    mbListHasDates(false),
     nSel( 0 ),
     eMode( eNewMode )
 {
@@ -388,6 +378,32 @@ void lcl_UnLockComment( ScDrawView* pView, SdrPageView* pPV, SdrModel* pDrDoc, c
     }
 }
 
+sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTAB nTab, ScBaseCell*& rpCell )
+{
+	BOOL bFound = FALSE;
+	do
+	{
+		pDoc->GetCell( rPosX, rPosY, nTab, rpCell );
+		if ( !rpCell || rpCell->GetCellType() == CELLTYPE_NOTE )
+		{
+			if ( rPosX <= 0 )
+				return FALSE;							// alles leer bis links
+			else
+				--rPosX;								// weitersuchen
+		}
+                else if ( rpCell->GetCellType() == CELLTYPE_EDIT)
+                    bFound = TRUE;
+                else if (rpCell->GetCellType() == CELLTYPE_FORMULA &&
+                  static_cast<ScFormulaCell*>(rpCell)->IsHyperLinkCell())
+                    bFound = TRUE;
+	    else
+			return FALSE;								// andere Zelle
+	}
+	while ( !bFound );
+
+	return bFound;
+}
+
 // ---------------------------------------------------------------------------
 //	WB_DIALOGCONTROL noetig fuer UNO-Controls
 ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos )
@@ -400,12 +416,14 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic
             mpOODragRect( NULL ),
             mpOOHeader( NULL ),
             mpOOShrink( NULL ),
+            mpAutoFillRect(static_cast<Rectangle*>(NULL)),
             pViewData( pData ),
             eWhich( eWhichPos ),
             pNoteMarker( NULL ),
             pFilterBox( NULL ),
             pFilterFloat( NULL ),
             mpDPFieldPopup(NULL),
+            mpFilterButton(NULL), 
             nCursorHideCount( 0 ),
             bMarking( FALSE ),
             nButtonDown( 0 ),
@@ -482,14 +500,26 @@ void __EXPORT ScGridWindow::Resize( const Size& )
 
 void ScGridWindow::ClickExtern()
 {
-    // #i81298# don't delete the filter box when called from its select handler
-    // (possible through row header size update)
-    // #i84277# when initializing the filter box, a Basic error can deactivate the view
-    if ( pFilterBox && ( pFilterBox->IsInSelect() || pFilterBox->IsInInit() ) )
-        return;
+    do
+    {
+        // #i81298# don't delete the filter box when called from its select handler
+        // (possible through row header size update)
+        // #i84277# when initializing the filter box, a Basic error can deactivate the view
+        if ( pFilterBox && ( pFilterBox->IsInSelect() || pFilterBox->IsInInit() ) )
+        {
+            break;
+        }
+    
+        DELETEZ(pFilterBox);
+        DELETEZ(pFilterFloat);
+    }
+    while (false);
 
-    DELETEZ(pFilterBox);
-    DELETEZ(pFilterFloat);
+    if (mpDPFieldPopup.get())
+    {
+        mpDPFieldPopup->close(false);
+        mpDPFieldPopup.reset();
+    }
 }
 
 IMPL_LINK( ScGridWindow, PopupModeEndHdl, FloatingWindow*, EMPTYARG )
@@ -544,7 +574,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelecti
     }
 }
 
-void ScGridWindow::DoPageFieldMenue( SCCOL nCol, SCROW nRow )
+void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
 {
     //!	merge position/size handling with DoAutoFilterMenue
 
@@ -695,6 +725,22 @@ void ScGridWindow::DoPageFieldMenue( SCCOL nCol, SCROW nRow )
     CaptureMouse();
 }
 
+void ScGridWindow::LaunchDPFieldMenu( SCCOL nCol, SCROW nRow )
+{
+    SCTAB nTab = pViewData->GetTabNo();
+    ScDPObject* pDPObj = pViewData->GetDocument()->GetDPAtCursor(nCol, nRow, nTab);
+    if (!pDPObj)
+        return;
+
+    // Get the geometry of the cell.
+    Point aScrPos = pViewData->GetScrPos(nCol, nRow, eWhich);
+    long nSizeX, nSizeY;
+    pViewData->GetMergeSizePixel(nCol, nRow, nSizeX, nSizeY);
+    Size aScrSize(nSizeX-1, nSizeY-1);
+
+    DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize, ScAddress(nCol, nRow, nTab), pDPObj);
+}
+
 void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
 {
     delete pFilterBox;
@@ -916,7 +962,9 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
         pFilterBox->SetSeparatorPos( nDefCount - 1 );
 
         //	get list entries
-        pDoc->GetFilterEntries( nCol, nRow, nTab, aStrings, true );
+        bool bHasDates = false;
+        pDoc->GetFilterEntries( nCol, nRow, nTab, true, aStrings, bHasDates);
+        pFilterBox->SetListHasDates(bHasDates);
 
         //	check widths of numerical entries (string entries are not included)
         //	so all numbers are completely visible
@@ -1126,7 +1174,7 @@ void ScGridWindow::FilterSelect( ULONG nSel )
             ExecDataSelect( nCol, nRow, aString );
             break;
         case SC_FILTERBOX_FILTER:
-            ExecFilter( nSel, nCol, nRow, aString );
+            ExecFilter( nSel, nCol, nRow, aString, pFilterBox->HasDates() );
             break;
         case SC_FILTERBOX_SCENARIO:
             pViewData->GetView()->UseScenario( aString );
@@ -1159,7 +1207,7 @@ void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr )
 
 void ScGridWindow::ExecFilter( ULONG nSel,
                                SCCOL nCol, SCROW nRow,
-                               const String& aValue )
+                               const String& aValue, bool bCheckForDates )
 {
     SCTAB nTab = pViewData->GetTabNo();
     ScDocument* pDoc = pViewData->GetDocument();
@@ -1231,6 +1279,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
                     rNewEntry.bDoQuery		 = TRUE;
                     rNewEntry.bQueryByString = TRUE;
                     rNewEntry.nField		 = nCol;
+                    rNewEntry.bQueryByDate   = bCheckForDates;
                     if ( nSel == SC_AUTOFILTER_TOP10 )
                     {
                         rNewEntry.eOp	= SC_TOPVAL;
@@ -1348,30 +1397,17 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction )
         ScRange aMarkRange;
         if (pViewData->GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE)
         {
-            if ( aMarkRange.aStart.Tab() == pViewData->GetTabNo() )
+            if (aMarkRange.aStart.Tab() == pViewData->GetTabNo() && mpAutoFillRect)
             {
-                //	Block-Ende wie in DrawAutoFillMark
-                SCCOL nX = aMarkRange.aEnd.Col();
-                SCROW nY = aMarkRange.aEnd.Row();
-
-                Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
-                long nSizeXPix;
-                long nSizeYPix;
-                pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix );
-                aFillPos.X() += nSizeXPix * nLayoutSign;
-                aFillPos.Y() += nSizeYPix;
-                if ( bLayoutRTL )
-                    aFillPos.X() -= 1;
-
                 Point aMousePos = rMEvt.GetPosPixel();
-                //	Abfrage hier passend zu DrawAutoFillMark
-                //	(ein Pixel mehr als markiert)
-                if ( aMousePos.X() >= aFillPos.X()-3 && aMousePos.X() <= aFillPos.X()+4 &&
-                     aMousePos.Y() >= aFillPos.Y()-3 && aMousePos.Y() <= aFillPos.Y()+4 )
+                if (mpAutoFillRect->IsInside(aMousePos))
                 {
-                    SetPointer( Pointer( POINTER_CROSS ) );		//! dickeres Kreuz ?
+                    SetPointer( Pointer( POINTER_CROSS ) );     //! dickeres Kreuz ?
                     if (bAction)
                     {
+                        SCCOL nX = aMarkRange.aEnd.Col();
+                        SCROW nY = aMarkRange.aEnd.Row();
+
                         if ( lcl_IsEditableMatrix( pViewData->GetDocument(), aMarkRange ) )
                             pViewData->SetDragMode(
                                 aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), nX, nY, SC_FILL_MATRIX );
@@ -1673,52 +1709,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
                                     pDoc->GetAttr( nPosX, nPosY, nTab, ATTR_MERGE_FLAG );
         if (pAttr->HasAutoFilter())
         {
-            Point	aScrPos  = pViewData->GetScrPos(nPosX,nPosY,eWhich);
-            long	nSizeX;
-            long	nSizeY;
-            Point	aDiffPix = aPos;
-
-            aDiffPix -= aScrPos;
-            BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
-            if ( bLayoutRTL )
-                aDiffPix.X() = -aDiffPix.X();
-
-            pViewData->GetMergeSizePixel( nPosX, nPosY, nSizeX, nSizeY );
-
-            //	Breite des Buttons ist nicht von der Zellhoehe abhaengig
-            Size aButSize = aComboButton.GetSizePixel();
-            long nButWidth  = Min( aButSize.Width(),  nSizeX );
-            long nButHeight = Min( aButSize.Height(), nSizeY );
-
-            if ( aDiffPix.X() >= nSizeX - nButWidth &&
-                 aDiffPix.Y() >= nSizeY - nButHeight )
-            {
-                if ( DoPageFieldSelection( nPosX, nPosY ) )
-                    return;
-
-                BOOL  bFilterActive = IsAutoFilterActive( nPosX, nPosY,
-                                                          pViewData->GetTabNo() );
-
-                aComboButton.SetOptSizePixel();
-                DrawComboButton( aScrPos, nSizeX, nSizeY, bFilterActive, TRUE );
-
-#if 0
-                if (   bWasFilterBox
-                    && (SCsCOL)nOldColFBox == nPosX
-                    && (SCsROW)nOldRowFBox == nPosY )
-                {
-                    // Verhindern, dass an gleicher Stelle eine
-                    // FilterBox geoeffnet wird, wenn diese gerade
-                    // geloescht wurde
-
-                    nMouseStatus = SC_GM_FILTER; // fuer ButtonDraw im MouseButtonUp();
-                    return;
-                }
-#endif
-                DoAutoFilterMenue( nPosX, nPosY, FALSE );
-
+            if (DoAutoFilterButton(nPosX, nPosY, rMEvt))
                 return;
-            }
         }
         if (pAttr->HasButton())
         {
@@ -1848,11 +1840,17 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
     {
         if ( pFilterBox && pFilterBox->GetMode() == SC_FILTERBOX_FILTER )
         {
-            BOOL  bFilterActive = IsAutoFilterActive( pFilterBox->GetCol(), pFilterBox->GetRow(),
-                pViewData->GetTabNo() );
-            HideCursor();
-            aComboButton.Draw( bFilterActive );
-            ShowCursor();
+            if (mpFilterButton.get())
+            {
+                bool bFilterActive = IsAutoFilterActive(
+                    pFilterBox->GetCol(), pFilterBox->GetRow(), pViewData->GetTabNo() );
+
+                mpFilterButton->setHasHiddenMember(bFilterActive);
+                mpFilterButton->setPopupPressed(false);
+                HideCursor();
+                mpFilterButton->draw();
+                ShowCursor();
+            }
         }
         nMouseStatus = SC_GM_NONE;
         ReleaseMouse();
@@ -2296,9 +2294,14 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
             nMouseStatus = SC_GM_NONE;
             if ( pFilterBox->GetMode() == SC_FILTERBOX_FILTER )
             {
-                HideCursor();
-                aComboButton.Draw( FALSE );
-                ShowCursor();
+                if (mpFilterButton.get())
+                {
+                    mpFilterButton->setHasHiddenMember(false);
+                    mpFilterButton->setPopupPressed(false);
+                    HideCursor();
+                    mpFilterButton->draw();
+                    ShowCursor();
+                }
             }
             ReleaseMouse();
             pFilterBox->MouseButtonDown( MouseEvent( aRelPos, 1, MOUSE_SIMPLECLICK, MOUSE_LEFT ) );
@@ -2503,7 +2506,7 @@ long ScGridWindow::PreNotify( NotifyEvent& rNEvt )
                             lcl_InitMouseEvent( aEvent, *rNEvt.GetMouseEvent() );
                             if ( rNEvt.GetWindow() )
                                 aEvent.Source = rNEvt.GetWindow()->GetComponentInterface();
-                            if ( nType == EVENT_MOUSEBUTTONDOWN )
+                            if ( nType == EVENT_MOUSEBUTTONDOWN)
                                 pImp->MousePressed( aEvent );
                             else
                                 pImp->MouseReleased( aEvent );
@@ -2772,9 +2775,32 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
 
         if ( bMouse )
         {
+            SCsCOL nCellX = -1;
+            SCsROW nCellY = -1;
+            pViewData->GetPosFromPixel(aPosPixel.X(), aPosPixel.Y(), eWhich, nCellX, nCellY);
+            ScDocument* pDoc = pViewData->GetDocument();
+            SCTAB nTab = pViewData->GetTabNo();
+            const ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
+            bool bSelectAllowed = true;
+            if ( pProtect && pProtect->isProtected() )
+            {
+                // This sheet is protected.  Check if a context menu is allowed on this cell.
+                bool bCellProtected = pDoc->HasAttrib(nCellX, nCellY, nTab, nCellX, nCellY, nTab, HASATTR_PROTECTED);
+                bool bSelProtected   = pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS);
+                bool bSelUnprotected = pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);
+
+                if (bCellProtected)
+                    bSelectAllowed = bSelProtected;
+                else
+                    bSelectAllowed = bSelUnprotected;
+            }
+            if (!bSelectAllowed)
+                // Selecting this cell is not allowed, neither is context menu.
+                return;
+
             //	#i18735# First select the item under the mouse pointer.
             //	This can change the selection, and the view state (edit mode, etc).
-            SelectForContextMenu( aPosPixel );
+            SelectForContextMenu( aPosPixel, nCellX, nCellY );
         }
 
         BOOL bDone = FALSE;
@@ -2869,15 +2895,12 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
     }
 }
 
-void ScGridWindow::SelectForContextMenu( const Point& rPosPixel )
+void ScGridWindow::SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, SCsROW nCellY )
 {
     //  #i18735# if the click was outside of the current selection,
     //  the cursor is moved or an object at the click position selected.
     //  (see SwEditWin::SelectMenuPosition in Writer)
 
-    SCsCOL nCellX;
-    SCsROW nCellY;
-    pViewData->GetPosFromPixel( rPosPixel.X(), rPosPixel.Y(), eWhich, nCellX, nCellY );
     ScTabView* pView = pViewData->GetView();
     ScDrawView* pDrawView = pView->GetScDrawView();
 
@@ -3063,35 +3086,35 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
             return;
         }
     }
-	else if( rKeyCode.GetCode() == KEY_RETURN && pViewData->IsPasteMode() )
-	{
-		ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
+    else if( rKeyCode.GetCode() == KEY_RETURN && pViewData->IsPasteMode() )
+    {
+        ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
 
-		ScCellShell::PasteFromClipboard( pViewData, pTabViewShell, FALSE );
-		ClearSingleSelection( pViewData );
+        ScCellShell::PasteFromClipboard( pViewData, pTabViewShell, FALSE );
+        ClearSingleSelection( pViewData );
 
-		uno::Reference<datatransfer::clipboard::XClipboard> xSystemClipboard = 
-			TransferableHelper::GetSystemClipboard();
-		if (xSystemClipboard.is())
-		{
-			xSystemClipboard->setContents(
-					uno::Reference<datatransfer::XTransferable>(),
-					uno::Reference<datatransfer::clipboard::XClipboardOwner>());
-		}
+        uno::Reference<datatransfer::clipboard::XClipboard> xSystemClipboard = 
+            TransferableHelper::GetSystemClipboard();
+        if (xSystemClipboard.is())
+        {
+            xSystemClipboard->setContents(
+                    uno::Reference<datatransfer::XTransferable>(),
+                    uno::Reference<datatransfer::clipboard::XClipboardOwner>());
+        }
 
-		// hide the border around the copy source
-		pViewData->SetPasteMode( SC_PASTE_NONE );
-		UpdateCursorOverlay();
-		return;
-	}
+        // hide the border around the copy source
+        pViewData->SetPasteMode( SC_PASTE_NONE );
+        UpdateCursorOverlay();
+        return;
+    }
     // wenn semi-Modeless-SfxChildWindow-Dialog oben, keine KeyInputs:
     else if( !pViewData->IsAnyFillMode() )
     {
-		if (rKeyCode.GetCode() == KEY_ESCAPE)
-		{
-			pViewData->SetPasteMode( SC_PASTE_NONE );
-			UpdateCursorOverlay();
-		}
+        if (rKeyCode.GetCode() == KEY_ESCAPE)
+        {
+            pViewData->SetPasteMode( SC_PASTE_NONE );
+            UpdateCursorOverlay();
+        }
         //	query for existing note marker before calling ViewShell's keyboard handling
         //	which may remove the marker
         BOOL bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() );
@@ -4651,18 +4674,17 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges
     SCROW nTmp;
 
     ScDocument* pDoc = pDocSh->GetDocument();
-    while ( nCol1 > 0 && ( pDoc->GetColFlags( nCol1, nTab1 ) & CR_HIDDEN ) )
+    while ( nCol1 > 0 && pDoc->ColHidden(nCol1, nTab1) )
     {
         --nCol1;
         bHiddenEdge = TRUE;
     }
-    while ( nCol2 < MAXCOL && ( pDoc->GetColFlags( nCol2, nTab1 ) & CR_HIDDEN ) )
+    while ( nCol2 < MAXCOL && pDoc->ColHidden(nCol2, nTab1) )
     {
         ++nCol2;
         bHiddenEdge = TRUE;
     }
-    nTmp = pDoc->GetRowFlagsArray( nTab1).GetLastForCondition( 0, nRow1,
-            CR_HIDDEN, 0);
+    nTmp = pDoc->FirstVisibleRow(0, nRow1, nTab1);
     if (!ValidRow(nTmp))
         nTmp = 0;
     if (nTmp < nRow1)
@@ -4670,8 +4692,7 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges
         nRow1 = nTmp;
         bHiddenEdge = TRUE;
     }
-    nTmp = pDoc->GetRowFlagsArray( nTab1).GetFirstForCondition( nRow2, MAXROW,
-            CR_HIDDEN, 0);
+    nTmp = pDoc->FirstVisibleRow(nRow2, MAXROW, nTab1);
     if (!ValidRow(nTmp))
         nTmp = MAXROW;
     if (nTmp > nRow2)
@@ -5224,6 +5245,9 @@ void ScGridWindow::UpdateCursorOverlay()
     SCCOL nX = pViewData->GetCurX();
     SCROW nY = pViewData->GetCurY();
 
+    if (!maVisibleRange.isInside(nX, nY))
+        return;
+
     //  don't show the cursor in overlapped cells
 
     ScDocument* pDoc = pViewData->GetDocument();
@@ -5394,6 +5418,7 @@ void ScGridWindow::UpdateSelectionOverlay()
 void ScGridWindow::DeleteAutoFillOverlay()
 {
     DELETEZ( mpOOAutoFill );
+    mpAutoFillRect.reset();
 }
 
 void ScGridWindow::UpdateAutoFillOverlay()
@@ -5414,6 +5439,11 @@ void ScGridWindow::UpdateAutoFillOverlay()
     {
         SCCOL nX = aAutoMarkPos.Col();
         SCROW nY = aAutoMarkPos.Row();
+
+        if (!maVisibleRange.isInside(nX, nY))
+            // Autofill mark is not visible.  Bail out.
+            return;
+
         SCTAB nTab = pViewData->GetTabNo();
         ScDocument* pDoc = pViewData->GetDocument();
         BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
@@ -5429,7 +5459,7 @@ void ScGridWindow::UpdateAutoFillOverlay()
 
         aFillPos.Y() += nSizeYPix;
         aFillPos.Y() -= 2;
-        Rectangle aFillRect( aFillPos, Size(6,6) );
+        mpAutoFillRect.reset(new Rectangle(aFillPos, Size(6, 6)));
     
         // #i70788# get the OverlayManager safely
         ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager();
@@ -5442,7 +5472,7 @@ void ScGridWindow::UpdateAutoFillOverlay()
                 aHandleColor = SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor;
             std::vector< basegfx::B2DRange > aRanges;
             const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
-            basegfx::B2DRange aRB(aFillRect.Left(), aFillRect.Top(), aFillRect.Right() + 1, aFillRect.Bottom() + 1);
+            basegfx::B2DRange aRB(mpAutoFillRect->Left(), mpAutoFillRect->Top(), mpAutoFillRect->Right() + 1, mpAutoFillRect->Bottom() + 1);
             
             aRB.transform(aTransform);
             aRanges.push_back(aRB);
@@ -5457,10 +5487,10 @@ void ScGridWindow::UpdateAutoFillOverlay()
             mpOOAutoFill = new ::sdr::overlay::OverlayObjectList;
             mpOOAutoFill->append(*pOverlay);
         }
-    }
 
-    if ( aOldMode != aDrawMode )
-        SetMapMode( aOldMode );
+        if ( aOldMode != aDrawMode )
+            SetMapMode( aOldMode );
+    }
 }
 
 void ScGridWindow::DeleteDragRectOverlay()
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 7f89bc087..8e522b668 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -67,6 +67,7 @@
 #include <hash_map>
 
 using namespace com::sun::star;
+using ::com::sun::star::sheet::DataPilotFieldOrientation;
 using ::std::vector;
 using ::std::auto_ptr;
 using ::std::hash_map;
@@ -77,38 +78,101 @@ using ::rtl::OUStringHash;
 
 // -----------------------------------------------------------------------
 
-BOOL ScGridWindow::HasPageFieldData( SCCOL nCol, SCROW nRow ) const
+DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const
 {
+    using namespace ::com::sun::star::sheet;
+
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
-    ScDPObject*	pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab);
-    if ( pDPObj && nCol > 0 )
+    ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab);
+    if (!pDPObj)
+        return DataPilotFieldOrientation_HIDDEN;
+
+    USHORT nOrient = DataPilotFieldOrientation_HIDDEN;
+
+    // Check for page field first.
+    if (nCol > 0)
     {
         // look for the dimension header left of the drop-down arrow
-        USHORT nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
         long nField = pDPObj->GetHeaderDim( ScAddress( nCol-1, nRow, nTab ), nOrient );
-        if ( nField >= 0 && nOrient == sheet::DataPilotFieldOrientation_PAGE )
+        if ( nField >= 0 && nOrient == DataPilotFieldOrientation_PAGE )
         {
             BOOL bIsDataLayout = FALSE;
             String aFieldName = pDPObj->GetDimName( nField, bIsDataLayout );
             if ( aFieldName.Len() && !bIsDataLayout )
-                return TRUE;
+                return DataPilotFieldOrientation_PAGE;
         }
     }
-    return FALSE;
+
+    nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
+
+    // Now, check for row/column field.
+    long nField = pDPObj->GetHeaderDim(ScAddress(nCol, nRow, nTab), nOrient);
+    if (nField >= 0 && (nOrient == DataPilotFieldOrientation_COLUMN || nOrient == DataPilotFieldOrientation_ROW) )
+    {
+        BOOL bIsDataLayout = FALSE;
+        String aFieldName = pDPObj->GetDimName(nField, bIsDataLayout);
+        if (aFieldName.Len() && !bIsDataLayout)
+            return static_cast<DataPilotFieldOrientation>(nOrient);
+    }
+
+    return DataPilotFieldOrientation_HIDDEN;
 }
 
 // private method for mouse button handling
 BOOL ScGridWindow::DoPageFieldSelection( SCCOL nCol, SCROW nRow )
 {
-    if ( HasPageFieldData( nCol, nRow ) )
+    if (GetDPFieldOrientation( nCol, nRow ) == sheet::DataPilotFieldOrientation_PAGE)
     {
-        DoPageFieldMenue( nCol, nRow );
+        LaunchPageFieldMenu( nCol, nRow );
         return TRUE;
     }
     return FALSE;
 }
 
+bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt )
+{
+    ScDocument* pDoc = pViewData->GetDocument();
+    SCTAB nTab = pViewData->GetTabNo();
+    Point aScrPos  = pViewData->GetScrPos(nCol, nRow, eWhich);
+    Point aDiffPix = rMEvt.GetPosPixel();
+
+    aDiffPix -= aScrPos;
+    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    if ( bLayoutRTL )
+        aDiffPix.X() = -aDiffPix.X();
+
+    long nSizeX, nSizeY;
+    pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
+    Size aScrSize(nSizeX-1, nSizeY-1);
+
+    // Check if the mouse cursor is clicking on the popup arrow box.
+    mpFilterButton.reset(new ScDPFieldButton(this, &GetSettings().GetStyleSettings(), &pViewData->GetZoomX(), &pViewData->GetZoomY()));
+    mpFilterButton->setBoundingBox(aScrPos, aScrSize);
+    Point aPopupPos;
+    Size aPopupSize;
+    mpFilterButton->getPopupBoundingBox(aPopupPos, aPopupSize);
+    Rectangle aRec(aPopupPos, aPopupSize);
+    if (aRec.IsInside(rMEvt.GetPosPixel()))
+    {
+        if ( DoPageFieldSelection( nCol, nRow ) )
+            return true;
+
+        bool bFilterActive = IsAutoFilterActive(nCol, nRow, nTab);
+        mpFilterButton->setHasHiddenMember(bFilterActive);
+        mpFilterButton->setDrawBaseButton(false);
+        mpFilterButton->setDrawPopupButton(true);
+        mpFilterButton->setPopupPressed(true);
+        HideCursor();
+        mpFilterButton->draw();
+        ShowCursor();
+        DoAutoFilterMenue(nCol, nRow, false);
+        return true;
+    }
+
+    return false;
+}
+
 void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt )
 {
     ScDocument* pDoc = pViewData->GetDocument();
@@ -306,14 +370,14 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
 bool ScGridWindow::DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, ScDPObject* pDPObj)
 {
     // Get the geometry of the cell.
-    Point aSrcPos = pViewData->GetScrPos(rPos.Col(), rPos.Row(), eWhich);
+    Point aScrPos = pViewData->GetScrPos(rPos.Col(), rPos.Row(), eWhich);
     long nSizeX, nSizeY;
     pViewData->GetMergeSizePixel(rPos.Col(), rPos.Row(), nSizeX, nSizeY);
-    Size aSrcSize(nSizeX-1, nSizeY-1);
+    Size aScrSize(nSizeX-1, nSizeY-1);
 
     // Check if the mouse cursor is clicking on the popup arrow box.
     ScDPFieldButton aBtn(this, &GetSettings().GetStyleSettings());
-    aBtn.setBoundingBox(aSrcPos, aSrcSize);
+    aBtn.setBoundingBox(aScrPos, aScrSize);
     Point aPopupPos;
     Size aPopupSize;
     aBtn.getPopupBoundingBox(aPopupPos, aPopupSize);
@@ -321,7 +385,7 @@ bool ScGridWindow::DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddres
     if (aRec.IsInside(rMEvt.GetPosPixel()))
     {
         // Mouse cursor inside the popup arrow box.  Launch the field menu.
-        DPLaunchFieldPopupMenu(OutputToScreenPixel(aSrcPos), aSrcSize, rPos, pDPObj);
+        DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize, rPos, pDPObj);
         return true;
     }
 
@@ -387,7 +451,7 @@ private:
 }
 
 void ScGridWindow::DPLaunchFieldPopupMenu(
-    const Point& rSrcPos, const Size& rSrcSize, const ScAddress& rPos, ScDPObject* pDPObj)
+    const Point& rScrPos, const Size& rScrSize, const ScAddress& rPos, ScDPObject* pDPObj)
 {
     // We need to get the list of field members.
     auto_ptr<DPFieldPopupData> pDPData(new DPFieldPopupData);
@@ -403,14 +467,19 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
 
     const ScDPLabelData& rLabelData = *pDPData->maDPParam.maLabelArray[pDPData->mnDim];
 
-    mpDPFieldPopup.reset(new ScDPFieldPopupWindow(this));
+    mpDPFieldPopup.reset(new ScDPFieldPopupWindow(this, pViewData->GetDocument()));
+    mpDPFieldPopup->setName(OUString::createFromAscii("DataPilot field member popup"));
     mpDPFieldPopup->setExtendedData(pDPData.release());
     mpDPFieldPopup->setOKAction(new DPFieldPopupOKAction(this));
     {
-        sal_Int32 n = rLabelData.maMembers.getLength();
+        // Populate field members.
+        size_t n = rLabelData.maMembers.size();
         mpDPFieldPopup->setMemberSize(n);
-        for (sal_Int32 i = 0; i < n; ++i)
-            mpDPFieldPopup->addMember(rLabelData.maMembers[i], rLabelData.maVisible[i]);
+        for (size_t i = 0; i < n; ++i)
+        {
+            const ScDPLabelData::Member& rMem = rLabelData.maMembers[i];
+            mpDPFieldPopup->addMember(rMem.getDisplayName(), rMem.mbVisible);
+        }
         mpDPFieldPopup->initMembers();
     }
 
@@ -430,13 +499,13 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
     // Populate the menus.
     ScTabViewShell* pViewShell = pViewData->GetViewShell();
     mpDPFieldPopup->addMenuItem(
-        ScRscStrLoader(RID_SC_DPCONTROL, STR_MENU_SORT_ASC).GetString(), true, 
+        ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_ASC).GetString(), true, 
         new PopupSortAction(rPos, PopupSortAction::ASCENDING, 0, pViewShell));
     mpDPFieldPopup->addMenuItem(
-        ScRscStrLoader(RID_SC_DPCONTROL, STR_MENU_SORT_DESC).GetString(), true,
+        ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_DESC).GetString(), true,
         new PopupSortAction(rPos, PopupSortAction::DESCENDING, 0, pViewShell));
     ScMenuFloatingWindow* pSubMenu = mpDPFieldPopup->addSubMenuItem(
-        ScRscStrLoader(RID_SC_DPCONTROL, STR_MENU_SORT_CUSTOM).GetString(), !aUserSortNames.empty());
+        ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_CUSTOM).GetString(), !aUserSortNames.empty());
 
     if (pSubMenu && !aUserSortNames.empty())
     {
@@ -449,13 +518,24 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
         }
     }
 
+    Rectangle aCellRect(rScrPos, rScrSize);
+    const Size& rPopupSize = mpDPFieldPopup->getWindowSize();
+    if (rScrSize.getWidth() > rPopupSize.getWidth())
+    {
+        // If the cell width is larger than the popup window width, launch it 
+        // right-aligned with the cell.
+        long nXOffset = rScrSize.getWidth() - rPopupSize.getWidth();
+        aCellRect.SetPos(Point(rScrPos.X() + nXOffset, rScrPos.Y()));
+    }
     mpDPFieldPopup->SetPopupModeEndHdl( LINK(this, ScGridWindow, PopupModeEndHdl) );
-    Rectangle aCellRect(rSrcPos, rSrcSize);
     mpDPFieldPopup->StartPopupMode(aCellRect, (FLOATWIN_POPUPMODE_DOWN | FLOATWIN_POPUPMODE_GRABFOCUS));
 }
 
 void ScGridWindow::UpdateDPFromFieldPopupMenu()
 {
+    typedef hash_map<OUString, OUString, OUStringHash> MemNameMapType;
+    typedef hash_map<OUString, bool, OUStringHash> MemVisibilityType;
+
     if (!mpDPFieldPopup.get())
         return;
 
@@ -474,8 +554,30 @@ void ScGridWindow::UpdateDPFromFieldPopupMenu()
     if (!pDim)
         return;
 
-    hash_map<OUString, bool, OUStringHash> aResult;
-    mpDPFieldPopup->getResult(aResult);
+    // Build a map of layout names to original names.
+    const ScDPLabelData& rLabelData = *pDPData->maDPParam.maLabelArray[pDPData->mnDim];
+    MemNameMapType aMemNameMap;
+    for (vector<ScDPLabelData::Member>::const_iterator itr = rLabelData.maMembers.begin(), itrEnd = rLabelData.maMembers.end();
+           itr != itrEnd; ++itr)
+        aMemNameMap.insert(MemNameMapType::value_type(itr->maLayoutName, itr->maName));
+
+    // The raw result may contain a mixture of layout names and original names.
+    MemVisibilityType aRawResult;
+    mpDPFieldPopup->getResult(aRawResult);
+
+    MemVisibilityType aResult;
+    for (MemVisibilityType::const_iterator itr = aRawResult.begin(), itrEnd = aRawResult.end(); itr != itrEnd; ++itr)
+    {
+        MemNameMapType::const_iterator itrNameMap = aMemNameMap.find(itr->first);
+        if (itrNameMap == aMemNameMap.end())
+            // This is an original member name.  Use it as-is.
+            aResult.insert(MemVisibilityType::value_type(itr->first, itr->second));
+        else
+        {
+            // This is a layout name.  Get the original member name and use it.
+            aResult.insert(MemVisibilityType::value_type(itrNameMap->second, itr->second));
+        }
+    }
     pDim->UpdateMemberVisibility(aResult);
 
     ScDBDocFunc aFunc(*pViewData->GetDocShell());
@@ -834,7 +936,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
                 BOOL bGrow = !bHide && nNew > nPagebreakBreak;
                 if ( bColumn )
                 {
-                    if ( pDoc->GetColFlags( static_cast<SCCOL>(nPagebreakBreak), nTab ) & CR_MANUALBREAK )
+                    if (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakBreak), nTab) & BREAK_MANUAL)
                     {
                         ScAddress aOldAddr( static_cast<SCCOL>(nPagebreakBreak), nPosY, nTab );
                         pViewFunc->DeletePageBreak( TRUE, TRUE, &aOldAddr, FALSE );
@@ -847,8 +949,8 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
                     if ( bGrow )
                     {
                         //	vorigen Break auf hart, und Skalierung aendern
-                        if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() &&
-                                !(pDoc->GetColFlags( static_cast<SCCOL>(nPagebreakPrev), nTab ) & CR_MANUALBREAK) )
+                        bool bManualBreak = (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakPrev), nTab) & BREAK_MANUAL);
+                        if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() && !bManualBreak )
                         {
                             ScAddress aPrev( static_cast<SCCOL>(nPagebreakPrev), nPosY, nTab );
                             pViewFunc->InsertPageBreak( TRUE, TRUE, &aPrev, FALSE );
@@ -861,7 +963,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
                 }
                 else
                 {
-                    if ( pDoc->GetRowFlags( nPagebreakBreak, nTab ) & CR_MANUALBREAK )
+                    if (pDoc->HasRowBreak(nPagebreakBreak, nTab) & BREAK_MANUAL)
                     {
                         ScAddress aOldAddr( nPosX, nPagebreakBreak, nTab );
                         pViewFunc->DeletePageBreak( FALSE, TRUE, &aOldAddr, FALSE );
@@ -874,8 +976,8 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
                     if ( bGrow )
                     {
                         //	vorigen Break auf hart, und Skalierung aendern
-                        if ( nPagebreakPrev > aPagebreakSource.aStart.Row() &&
-                                !(pDoc->GetRowFlags( nPagebreakPrev, nTab ) & CR_MANUALBREAK) )
+                        bool bManualBreak = (pDoc->HasRowBreak(nPagebreakPrev, nTab) & BREAK_MANUAL);
+                        if ( nPagebreakPrev > aPagebreakSource.aStart.Row() && !bManualBreak )
                         {
                             ScAddress aPrev( nPosX, nPagebreakPrev, nTab );
                             pViewFunc->InsertPageBreak( FALSE, TRUE, &aPrev, FALSE );
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 60daf5682..0cce71a1d 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -74,6 +74,7 @@
 #include "inputopt.hxx"
 #include "fillinfo.hxx"
 #include "dpcontrol.hxx"
+#include "queryparam.hxx"
 #include "sc.hrc"
 #include <vcl/virdev.hxx>
 
@@ -451,6 +452,12 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
     SCROW nYBottom = nPosY + pViewData->VisibleCellsY(eVWhich);
     if (nYBottom > MAXROW) nYBottom = MAXROW;
 
+    // Store the current visible range.
+    maVisibleRange.mnCol1 = nPosX;
+    maVisibleRange.mnCol2 = nXRight;
+    maVisibleRange.mnRow1 = nPosY;
+    maVisibleRange.mnRow2 = nYBottom;
+
     if (nX1 > nXRight || nY1 > nYBottom)
         return;											// unsichtbar
     if (nX2 > nXRight) nX2 = nXRight;
@@ -1090,7 +1097,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                     if ( nBreak >= nX1 && nBreak <= nX2+1 )
                     {
                         //! hidden suchen
-                        if ( pDoc->GetColFlags( nBreak, nTab ) & CR_MANUALBREAK )
+                        if (pDoc->HasColBreak(nBreak, nTab) & BREAK_MANUAL)
                             pContentDev->SetFillColor( aManual );
                         else
                             pContentDev->SetFillColor( aAutomatic );
@@ -1109,7 +1116,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                     if ( nBreak >= nY1 && nBreak <= nY2+1 )
                     {
                         //! hidden suchen
-                        if ( pDoc->GetRowFlags( nBreak, nTab ) & CR_MANUALBREAK )
+                        if (pDoc->HasRowBreak(nBreak, nTab) & BREAK_MANUAL)
                             pContentDev->SetFillColor( aManual );
                         else
                             pContentDev->SetFillColor( aAutomatic );
@@ -1206,7 +1213,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
 {
     aComboButton.SetOutputDevice( pContentDev );
 
-    ScDPFieldButton aDPFieldBtn(pContentDev, &GetSettings().GetStyleSettings());
+    ScDPFieldButton aCellBtn(pContentDev, &GetSettings().GetStyleSettings(), &pViewData->GetZoomX(), &pViewData->GetZoomY());
 
     SCCOL nCol;
     SCROW nRow;
@@ -1289,14 +1296,14 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
                     bool bArrowState = bSimpleQuery && bColumnFound;
                     long	nSizeX;
                     long	nSizeY;
-
                     pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
-                    aComboButton.SetOptSizePixel();
-                    DrawComboButton( pViewData->GetScrPos( nCol, nRow, eWhich ),
-                                     nSizeX, nSizeY, bArrowState );
+					Point aScrPos = pViewData->GetScrPos( nCol, nRow, eWhich );
 
-                    aComboButton.SetPosPixel( aOldPos );	// alten Zustand
-                    aComboButton.SetSizePixel( aOldSize );	// fuer MouseUp/Down
+                    aCellBtn.setBoundingBox(aScrPos, Size(nSizeX-1, nSizeY-1));
+                    aCellBtn.setDrawBaseButton(false);
+                    aCellBtn.setDrawPopupButton(true);
+                    aCellBtn.setHasHiddenMember(bArrowState);
+                    aCellBtn.draw();
                 }
             }
         }
@@ -1325,11 +1332,12 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
 
                     String aStr;
                     pDoc->GetString(nCol, nRow, nTab, aStr);
-                    aDPFieldBtn.setText(aStr);
-                    aDPFieldBtn.setBoundingBox(Point(nPosX,nPosY), Size(nSizeX-1, nSizeY-1));
-                    aDPFieldBtn.setDrawPopupButton(pInfo->bPopupButton);
-                    aDPFieldBtn.setHasHiddenMember(pInfo->bFilterActive);
-                    aDPFieldBtn.draw();
+                    aCellBtn.setText(aStr);
+                    aCellBtn.setBoundingBox(Point(nPosX, nPosY), Size(nSizeX-1, nSizeY-1));
+                    aCellBtn.setDrawBaseButton(true);
+                    aCellBtn.setDrawPopupButton(pInfo->bPopupButton);
+                    aCellBtn.setHasHiddenMember(pInfo->bFilterActive);
+                    aCellBtn.draw();
                 }
             }
         }
@@ -1377,7 +1385,7 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos )
     const ScMergeAttr* pMerge = static_cast<const ScMergeAttr*>(pDoc->GetAttr( nCol,nRow,nTab, ATTR_MERGE ));
     if ( pMerge->GetColMerge() > 1 )
         nNextCol = nCol + pMerge->GetColMerge();    // next cell after the merged area
-    while ( nNextCol <= MAXCOL && (pDoc->GetColFlags( nNextCol, nTab ) & CR_HIDDEN) )
+    while ( nNextCol <= MAXCOL && pDoc->ColHidden(nNextCol, nTab) )
         ++nNextCol;
     BOOL bNextCell = ( nNextCol <= MAXCOL );
     if ( bNextCell )
@@ -1580,7 +1588,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                         if ( pMergeFlag->IsVerOverlapped() && ( bDoHidden || bFirstRow ) )
                         {
                             while ( pMergeFlag->IsVerOverlapped() && nThisY > 0 &&
-                                        ( (pDoc->GetRowFlags( nThisY-1, nTab ) & CR_HIDDEN) || bFirstRow ) )
+                                    (pDoc->RowHidden(nThisY-1, nTab) || bFirstRow) )
                             {
                                 --nThisY;
                                 pPattern = pDoc->GetPattern( nX, nThisY, nTab );
@@ -1767,7 +1775,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
                         if ( pMergeFlag->IsVerOverlapped() && ( bDoHidden || bFirstRow ) )
                         {
                             while ( pMergeFlag->IsVerOverlapped() && nThisY > 0 &&
-                                        ( (pDoc->GetRowFlags( nThisY-1, nTab ) & CR_HIDDEN) || bFirstRow ) )
+                                    (pDoc->RowHidden(nThisY-1, nTab) || bFirstRow) )
                             {
                                 --nThisY;
                                 pPattern = pDoc->GetPattern( nX, nThisY, nTab );
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 89e871c12..5cfe8f8ab 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -47,6 +47,7 @@
 #include "scmod.hxx"		// Optionen
 #include "inputopt.hxx"		// Optionen
 #include "gridmerg.hxx"
+#include "document.hxx"
 
 // -----------------------------------------------------------------------
 
@@ -655,6 +656,39 @@ SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder )
     return nHitNo;
 }
 
+bool ScHeaderControl::IsSelectionAllowed(SCCOLROW nPos) const
+{
+    ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>(SfxViewShell::Current());
+    if (!pViewSh)
+        return false;
+
+    ScViewData* pViewData = pViewSh->GetViewData();
+    USHORT nTab = pViewData->GetTabNo();
+    ScDocument* pDoc = pViewData->GetDocument();
+    const ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
+    bool bSelectAllowed = true;
+    if ( pProtect && pProtect->isProtected() )
+    {
+        // This sheet is protected.  Check if a context menu is allowed on this cell.
+        bool bCellsProtected = false;
+        if (bVertical)
+            // row header
+            bCellsProtected = pDoc->HasAttrib(0, nPos, nTab, MAXCOL, nPos, nTab, HASATTR_PROTECTED);
+        else
+            // column header
+            bCellsProtected = pDoc->HasAttrib(nPos, 0, nTab, nPos, MAXROW, nTab, HASATTR_PROTECTED);
+
+        bool bSelProtected   = pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS);
+        bool bSelUnprotected = pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);
+
+        if (bCellsProtected)
+            bSelectAllowed = bSelProtected;
+        else
+            bSelectAllowed = bSelUnprotected;
+    }
+    return bSelectAllowed;
+}
+
 void __EXPORT ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if (IsDisabled())
@@ -665,6 +699,8 @@ void __EXPORT ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
 
     BOOL bFound;
     SCCOLROW nHitNo = GetMousePos( rMEvt, bFound );
+    if (!IsSelectionAllowed(nHitNo))
+        return;
 
     if ( bFound && rMEvt.IsLeft() && ResizeAllowed() )
     {
@@ -848,8 +884,11 @@ void __EXPORT ScHeaderControl::Command( const CommandEvent& rCEvt )
                 MouseEvent aMEvt( rCEvt.GetMousePosPixel() );
                 BOOL bBorder;
                 SCCOLROW nPos = GetMousePos( aMEvt, bBorder );
-                USHORT nTab = pViewData->GetTabNo();
+                if (!IsSelectionAllowed(nPos))
+                    // Selecting this cell is not allowed, neither is context menu.
+                    return;
 
+                SCTAB nTab = pViewData->GetTabNo();
                 ScRange aNewRange;
                 if ( bVertical )
                     aNewRange = ScRange( 0, sal::static_int_cast<SCROW>(nPos), nTab,
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index fa00785a6..82d66d154 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -186,16 +186,15 @@ const ScOutlineEntry* ScOutlineWindow::GetOutlineEntry( size_t nLevel, size_t nE
 
 bool ScOutlineWindow::IsHidden( SCCOLROW nColRowIndex ) const
 {
-    sal_uInt8 nFlags = mbHoriz ?
-        GetDoc().GetColFlags( static_cast<SCCOL>(nColRowIndex), GetTab() ) :
-        GetDoc().GetRowFlags( static_cast<SCROW>(nColRowIndex), GetTab() );
-    return (nFlags & CR_HIDDEN) != 0;
+    return mbHoriz ? 
+        GetDoc().ColHidden(static_cast<SCCOL>(nColRowIndex), GetTab()) : 
+        GetDoc().RowHidden(static_cast<SCROW>(nColRowIndex), GetTab());
 }
 
 bool ScOutlineWindow::IsFiltered( SCCOLROW nColRowIndex ) const
 {
     // columns cannot be filtered
-    return !mbHoriz && GetDoc().IsFiltered( static_cast<SCROW>(nColRowIndex), GetTab() );
+    return !mbHoriz && GetDoc().RowFiltered( static_cast<SCROW>(nColRowIndex), GetTab() );
 }
 
 bool ScOutlineWindow::IsFirstVisible( SCCOLROW nColRowIndex ) const
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 525df7f60..989ea0756 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -325,8 +325,9 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
     long nPosX;
     long nPosY;
     SCSIZE nArrY;
-    BYTE nOldFlags = 0;
-    BYTE nFlags;
+    ScBreakType nBreak    = BREAK_NONE;
+    ScBreakType nBreakOld = BREAK_NONE;
+
     BOOL bSingle;
     Color aPageColor;
     Color aManualColor;
@@ -381,27 +382,28 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
             if ( bPage )
             {
                 //	Seitenumbrueche auch in ausgeblendeten suchen
-                nFlags = 0;
                 SCCOL nCol = nXplus1;
                 while (nCol <= MAXCOL)
                 {
                     BYTE nDocFl = pDoc->GetColFlags( nCol, nTab );
-                    nFlags = nDocFl & ( CR_PAGEBREAK | CR_MANUALBREAK );
-                    if ( nFlags || !(nDocFl & CR_HIDDEN) )
+                    nBreak = pDoc->HasColBreak(nCol, nTab);
+                    bool bHidden = pDoc->ColHidden(nCol, nTab);
+
+                    if ( nBreak || !bHidden )
                         break;
                     ++nCol;
                 }
 
-                if (nFlags != nOldFlags)
+                if (nBreak != nBreakOld)
                 {
                     aGrid.Flush();
-                    pDev->SetLineColor( (nFlags & CR_MANUALBREAK) ? aManualColor :
-                                     (nFlags) ? aPageColor : aGridColor );
-                    nOldFlags = nFlags;
+                    pDev->SetLineColor( (nBreak & BREAK_MANUAL) ? aManualColor :
+                                        nBreak ? aPageColor : aGridColor );
+                    nBreakOld = nBreak;
                 }
             }
 
-            BOOL bDraw = bGrid || nOldFlags;	// einfaches Gitter nur wenn eingestellt
+			BOOL bDraw = bGrid || nBreakOld;	// einfaches Gitter nur wenn eingestellt
 
             //!	Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
             //!	Umbruch mitten in den Wiederholungsspalten liegt.
@@ -412,7 +414,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
             {
                 if ( nX == MAXCOL )
                     bDraw = FALSE;
-                else if (pDoc->GetColFlags(nXplus1,nTab) & ( CR_PAGEBREAK | CR_MANUALBREAK ))
+                else if (pDoc->HasColBreak(nXplus1, nTab))
                     bDraw = FALSE;
             }
 #endif
@@ -503,28 +505,24 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
         {
             if ( bPage )
             {
-                //	Seitenumbrueche auch in ausgeblendeten suchen
-                nFlags = 0;
-                ScCompressedArrayIterator< SCROW, BYTE > aIter(
-                        pDoc->GetRowFlagsArray( nTab), nYplus1, MAXROW);
-                do
+                for (SCROW i = nYplus1; i <= MAXROW; ++i)
                 {
-                    BYTE nDocFl = *aIter;
-                    nFlags = nDocFl & ( CR_PAGEBREAK | CR_MANUALBREAK );
-                    if ( nFlags || !(nDocFl & CR_HIDDEN) )
+                    nBreak = pDoc->HasRowBreak(i, nTab);
+                    bool bHidden = pDoc->RowHidden(i, nTab);
+                    if (nBreak || !bHidden)
                         break;
-                } while (aIter.NextRange());
+                }
 
-                if (nFlags != nOldFlags)
+                if (nBreakOld != nBreak)
                 {
                     aGrid.Flush();
-                    pDev->SetLineColor( (nFlags & CR_MANUALBREAK) ? aManualColor :
-                                     (nFlags) ? aPageColor : aGridColor );
-                    nOldFlags = nFlags;
+					pDev->SetLineColor( (nBreak & BREAK_MANUAL) ? aManualColor :
+                                        (nBreak) ? aPageColor : aGridColor );
+                    nBreakOld = nBreak;
                 }
             }
 
-            BOOL bDraw = bGrid || nOldFlags;	// einfaches Gitter nur wenn eingestellt
+			BOOL bDraw = bGrid || nBreakOld;	// einfaches Gitter nur wenn eingestellt
 
             //!	Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
             //!	Umbruch mitten in den Wiederholungszeilen liegt.
@@ -535,7 +533,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
             {
                 if ( nY == MAXROW )
                     bDraw = FALSE;
-                else if (pDoc->GetRowFlags(nYplus1,nTab) & ( CR_PAGEBREAK | CR_MANUALBREAK ))
+                else if (pDoc->HasRowBreak(nYplus1, nTab))
                     bDraw = FALSE;
             }
 #endif
@@ -657,7 +655,7 @@ void ScOutputData::FindRotated()
                 const ScPatternAttr* pPattern = pInfo->pPatternAttr;
                 const SfxItemSet* pCondSet = pInfo->pConditionSet;
 
-                if ( !pPattern && (pDoc->GetColFlags(nX,nTab) & CR_HIDDEN) == 0 )
+                if ( !pPattern && !pDoc->ColHidden(nX, nTab) )
                 {
                     pPattern = pDoc->GetPattern( nX, nY, nTab );
                     pCondSet = pDoc->GetCondResult( nX, nY, nTab );
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index dec757ac0..6e5ac420d 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -94,7 +94,6 @@ const USHORT SC_SHRINKAGAIN_MAX = 7;
 class ScDrawStringsVars
 {
     ScOutputData*		pOutput;				// Verbindung
-    SvNumberFormatter*	pFormatter;
 
     const ScPatternAttr* pPattern;				// Attribute
     const SfxItemSet*	pCondSet;				// aus bedingter Formatierung
@@ -187,8 +186,6 @@ ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, BOOL bPTL) :
     bShrink     ( FALSE ),
     bPixelToLogic( bPTL )
 {
-    pFormatter = pData->pDoc->GetFormatTable();
-
     ScModule* pScMod = SC_MOD();
     //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
     bCellContrast = pOutput->bUseStyleColor &&
@@ -373,7 +370,7 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
     //	Zahlenformat
 
 //    ULONG nOld = nValueFormat;
-    nValueFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
+    nValueFormat = pPattern->GetNumberFormat( pOutput->pDoc->GetFormatTable(), pCondSet );
 
 /*	s.u.
     if (nValueFormat != nOld)
@@ -414,7 +411,7 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt
     const SfxPoolItem* pLangItem;
     if ( !pCondSet || pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT,TRUE,&pLangItem) != SFX_ITEM_SET )
         pLangItem = &pPattern->GetItem(ATTR_LANGUAGE_FORMAT);
-    nValueFormat = pFormatter->GetFormatForLanguageIfBuiltIn(
+    nValueFormat = pOutput->pDoc->GetFormatTable()->GetFormatForLanguageIfBuiltIn(
                     ((SfxUInt32Item*)pFormItem)->GetValue(),
                     ((SvxLanguageItem*)pLangItem)->GetLanguage() );
 
@@ -456,7 +453,7 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell )
             ULONG nFormat = GetValueFormat();
             ScCellFormat::GetString( pCell,
                                      nFormat, aString, &pColor,
-                                     *pFormatter,
+                                     *pOutput->pDoc->GetFormatTable(),
                                      pOutput->bShowNullValues,
                                      pOutput->bShowFormulas,
                                      ftCheck );
@@ -697,7 +694,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
     while (bHOver)				// nY konstant
     {
         --rOverX;
-        bHidden = ( (pDoc->GetColFlags(rOverX,nTab) & CR_HIDDEN) != 0 );
+        bHidden = pDoc->ColHidden(rOverX, nTab);
         if ( !bDoMerge && !bHidden )
             return FALSE;
 
@@ -721,7 +718,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
     while (bVOver)
     {
         --rOverY;
-        bHidden = ( (pDoc->GetRowFlags(rOverY,nTab) & CR_HIDDEN) != 0 );
+        bHidden = pDoc->RowHidden(rOverY, nTab);
         if ( !bDoMerge && !bHidden )
             return FALSE;
 
@@ -729,8 +726,8 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
             --nArrY;						// lokale Kopie !
 
         if (rOverX >= nX1 && rOverY >= nY1 &&
-            (pDoc->GetColFlags(rOverX,nTab) & CR_HIDDEN) == 0 &&
-            (pDoc->GetRowFlags(rOverY,nTab) & CR_HIDDEN) == 0 &&
+            !pDoc->ColHidden(rOverX, nTab) &&
+            !pDoc->RowHidden(rOverY, nTab) &&
             pRowInfo[nArrY].nRowNo == rOverY)
         {
 //			rVirtPosY -= pRowInfo[nArrY].nHeight;
@@ -1358,11 +1355,13 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                 }
                 if (bDoCell && !bNeedEdit)
                 {
-                    if ( pCell->GetCellType() == CELLTYPE_FORMULA )
+                    BOOL bFormulaCell = (pCell->GetCellType() == CELLTYPE_FORMULA );
+                    if ( bFormulaCell )
                         lcl_CreateInterpretProgress( bProgress, pDoc, (ScFormulaCell*)pCell );
                     if ( aVars.SetText(pCell) )
                         pOldPattern = NULL;
-                    bNeedEdit = aVars.HasEditCharacters();
+                    bNeedEdit = aVars.HasEditCharacters() ||
+                                    (bFormulaCell && ((ScFormulaCell*)pCell)->IsMultilineResult());
                 }
                 if (bDoCell && !bNeedEdit)
                 {
@@ -1914,8 +1913,6 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
     Size aMinSize = pRefDevice->PixelToLogic(Size(0,100));		// erst darueber wird ausgegeben
 //    UINT32 nMinHeight = aMinSize.Height() / 200;                // 1/2 Pixel
 
-    SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
-
     ScModule* pScMod = SC_MOD();
     sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
     //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
@@ -2014,7 +2011,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                     if (bDoCell)
                     {
                         if ( nCellY == nY && nCellX >= nX1 && nCellX <= nX2 &&
-                             (pDoc->GetColFlags(nCellX,nTab) & CR_HIDDEN) == 0 )
+                             !pDoc->ColHidden(nCellX, nTab) )
                         {
                             CellInfo& rCellInfo = pThisRowInfo->pCellInfo[nCellX+1];
                             pPattern = rCellInfo.pPatternAttr;
@@ -2319,12 +2316,12 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                 else
                                 {
                                     ULONG nFormat = pPattern->GetNumberFormat(
-                                                                pFormatter, pCondSet );
+                                                                pDoc->GetFormatTable(), pCondSet );
                                     String aString;
                                     Color* pColor;
                                     ScCellFormat::GetString( pCell,
                                                              nFormat,aString, &pColor,
-                                                             *pFormatter,
+                                                             *pDoc->GetFormatTable(),
                                                              bShowNullValues,
                                                              bShowFormulas,
                                                              ftCheck );
@@ -2810,8 +2807,6 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
             nRotMax = pRowInfo[nRotY].nRotMaxCol;
 
 
-    SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
-
     ScModule* pScMod = SC_MOD();
     sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
     //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
@@ -3100,12 +3095,12 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                 else
                                 {
                                     ULONG nFormat = pPattern->GetNumberFormat(
-                                                                pFormatter, pCondSet );
+                                                                pDoc->GetFormatTable(), pCondSet );
                                     String aString;
                                     Color* pColor;
                                     ScCellFormat::GetString( pCell,
                                                              nFormat,aString, &pColor,
-                                                             *pFormatter,
+                                                             *pDoc->GetFormatTable(),
                                                              bShowNullValues,
                                                              bShowFormulas,
                                                              ftCheck );
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index a8259d510..cd33bdea1 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -105,56 +105,51 @@ void ScPivotShell::Execute( SfxRequest& rReq )
 {
     switch ( rReq.GetSlot() )
     {
-		case SID_PIVOT_AFMT:
-			{
-			ScViewData* pViewData = pViewShell->GetViewData();
-
-			pViewShell->GetDBData( TRUE, SC_DB_OLD );
-			const ScMarkData& rMark1 = pViewData->GetMarkData();
-			if ( !rMark1.IsMarked() && !rMark1.IsMultiMarked() )
-				pViewShell->MarkDataArea( TRUE );
-			
-			Window* pDlgParent = pViewShell->GetDialogParent();
-			
-			pViewData->MoveNextRow();
-				
-			ScGlobal::ClearAutoFormat();
-			ScAutoFormatData* pNewEntry = pViewShell->CreateAutoFormatData();
-			ScAutoFormatDlg*  pDlg		= new ScAutoFormatDlg(
-													pDlgParent,
-													ScGlobal::GetAutoFormat(),
-				                                                               pNewEntry,
-                            				                                   pViewShell->GetViewData()->GetDocument() );
-
-			if ( pDlg->Execute() == RET_OK )
-			{
-				ScEditableTester aTester( pViewShell );
-				if ( !aTester.IsEditable() )
-				{
-					pViewShell->ErrorMessage(aTester.GetMessageId());
-				}
-				else
-				{
-					/* AutoFormat and Store the index */
-					pViewShell->AutoFormat( pDlg->GetIndex() );
-					pViewShell->AutoFormatPivotTable( pDlg->GetIndex() );
-				}
-			}
-			delete pDlg;
-			delete pNewEntry;
-
-
-			//pViewShell->DeletePivotTable();
-			//pViewShell->RecalcPivotTable();
-			break;
-			}
+        case SID_PIVOT_RECALC:
+            pViewShell->RecalcPivotTable();
+            break;
+        case SID_PIVOT_AFMT:
+        {
+            ScViewData* pViewData = pViewShell->GetViewData();
+
+            pViewShell->GetDBData( TRUE, SC_DB_OLD );
+            const ScMarkData& rMark1 = pViewData->GetMarkData();
+            if ( !rMark1.IsMarked() && !rMark1.IsMultiMarked() )
+                pViewShell->MarkDataArea( TRUE );
+            
+            Window* pDlgParent = pViewShell->GetDialogParent();
+            
+            pViewData->MoveNextRow();
+                
+            ScGlobal::ClearAutoFormat();
+            ScAutoFormatData* pNewEntry = pViewShell->CreateAutoFormatData();
+            ScAutoFormatDlg*  pDlg = new ScAutoFormatDlg(
+                pDlgParent, ScGlobal::GetAutoFormat(), pNewEntry, pViewData->GetDocument() );
+
+            if ( pDlg->Execute() == RET_OK )
+            {
+                ScEditableTester aTester( pViewShell );
+                if ( !aTester.IsEditable() )
+                {
+                    pViewShell->ErrorMessage(aTester.GetMessageId());
+                }
+                else
+                {
+                    /* AutoFormat and Store the index */
+                    pViewShell->AutoFormat( pDlg->GetIndex() );
+                    pViewShell->AutoFormatPivotTable( pDlg->GetIndex() );
+                }
+            }
+            delete pDlg;
+            delete pNewEntry;
+
+            //pViewShell->DeletePivotTable();
+            //pViewShell->RecalcPivotTable();
+        }
+        break;
         case SID_PIVOT_KILL:
             pViewShell->DeletePivotTable();
             break;
-		case SID_PIVOT_RECALC:
-			//pViewShell->DeletePivotTable();
-			pViewShell->RecalcPivotTable();
-			break;
 
         case SID_DP_FILTER:
         {
diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx
index 54f7376bd..fb6595579 100644
--- a/sc/source/ui/view/prevloc.cxx
+++ b/sc/source/ui/view/prevloc.cxx
@@ -602,11 +602,11 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
         ++nColCount;
     if ( bHasRepCols )
         for ( nCol=nRepeatColStart; nCol<=nRepeatColEnd; nCol++ )
-            if ( ( pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN ) == 0 )
+            if (!pDoc->ColHidden(nCol, nTab))
                 ++nColCount;
     if ( bHasMainCols )
         for ( nCol=nMainColStart; nCol<=nMainColEnd; nCol++ )
-            if ( ( pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN ) == 0 )
+            if (!pDoc->ColHidden(nCol, nTab))
                 ++nColCount;
 
     if ( nColCount > 0 )
@@ -623,7 +623,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
         {
             long nPosX = 0;
             for ( nCol=nRepeatColStart; nCol<=nRepeatColEnd; nCol++ )
-                if ( ( pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN ) == 0 )
+                if (!pDoc->ColHidden(nCol, nTab))
                 {
                     USHORT nDocW = pDoc->GetColWidth( nCol, nTab );
                     long nNextX = nPosX + (long) (nDocW * nScaleX);
@@ -642,7 +642,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
         {
             long nPosX = 0;
             for ( nCol=nMainColStart; nCol<=nMainColEnd; nCol++ )
-                if ( ( pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN ) == 0 )
+                if (!pDoc->ColHidden(nCol, nTab))
                 {
                     USHORT nDocW = pDoc->GetColWidth( nCol, nTab );
                     long nNextX = nPosX + (long) (nDocW * nScaleX);
@@ -670,11 +670,9 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
     if ( bHasHeaderRow )
         ++nRowCount;
     if ( bHasRepRows )
-        nRowCount += pDoc->GetRowFlagsArray( nTab).CountForCondition(
-                nRepeatRowStart, nRepeatRowEnd, CR_HIDDEN, 0);
+        nRowCount += pDoc->CountVisibleRows(nRepeatRowStart, nRepeatRowEnd, nTab);
     if ( bHasMainRows )
-        nRowCount += pDoc->GetRowFlagsArray( nTab).CountForCondition(
-                nMainRowStart, nMainRowEnd, CR_HIDDEN, 0);
+        nRowCount += pDoc->CountVisibleRows(nMainRowStart, nMainRowEnd, nTab);
 
     if ( nRowCount > 0 )
     {
@@ -689,58 +687,44 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
         if ( bHasRepRows )
         {
             long nPosY = 0;
-            ScCompressedArrayIterator< SCROW, BYTE> aIter(
-                    pDoc->GetRowFlagsArray( nTab), nRepeatRowStart,
-                    nRepeatRowEnd);
-            do
+            for (SCROW nRow = nRepeatRowStart; nRow <= nRepeatRowEnd; ++nRow)
             {
-                if ((*aIter & CR_HIDDEN) == 0)
-                {
-                    SCROW nRangeEnd = aIter.GetRangeEnd();
-                    for (SCROW nRow=aIter.GetRangeStart(); nRow<=nRangeEnd; ++nRow)
-                    {
-                        USHORT nDocH = pDoc->FastGetOriginalRowHeight( nRow, nTab );
-                        long nNextY = nPosY + (long) (nDocH * nScaleY);
-
-                        long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height();
-                        long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1;
-                        pRowInfo[nRowPos].Set( FALSE, nRow,
-                                aRepeatRect.Top() + nPixelStart,
-                                aRepeatRect.Top() + nPixelEnd );
-
-                        nPosY = nNextY;
-                        ++nRowPos;
-                    }
-                }
-            } while (aIter.NextRange());
+                if (pDoc->RowHidden(nRow, nTab))
+                    continue;
+
+                USHORT nDocH = pDoc->FastGetOriginalRowHeight( nRow, nTab );
+                long nNextY = nPosY + (long) (nDocH * nScaleY);
+
+                long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height();
+                long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1;
+                pRowInfo[nRowPos].Set( FALSE, nRow,
+                        aRepeatRect.Top() + nPixelStart,
+                        aRepeatRect.Top() + nPixelEnd );
+
+                nPosY = nNextY;
+                ++nRowPos;
+            }
         }
         if ( bHasMainRows )
         {
             long nPosY = 0;
-            ScCompressedArrayIterator< SCROW, BYTE> aIter(
-                    pDoc->GetRowFlagsArray( nTab), nMainRowStart,
-                    nMainRowEnd);
-            do
+            for (SCROW nRow = nMainRowStart; nRow <= nMainRowEnd; ++nRow)
             {
-                if ((*aIter & CR_HIDDEN) == 0)
-                {
-                    SCROW nRangeEnd = aIter.GetRangeEnd();
-                    for (SCROW nRow=aIter.GetRangeStart(); nRow<=nRangeEnd; ++nRow)
-                    {
-                        USHORT nDocH = pDoc->FastGetOriginalRowHeight( nRow, nTab );
-                        long nNextY = nPosY + (long) (nDocH * nScaleY);
-
-                        long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height();
-                        long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1;
-                        pRowInfo[nRowPos].Set( FALSE, nRow,
-                                aMainRect.Top() + nPixelStart,
-                                aMainRect.Top() + nPixelEnd );
-
-                        nPosY = nNextY;
-                        ++nRowPos;
-                    }
-                }
-            } while (aIter.NextRange());
+                if (pDoc->RowHidden(nRow, nTab))
+                    continue;
+
+                USHORT nDocH = pDoc->FastGetOriginalRowHeight( nRow, nTab );
+                long nNextY = nPosY + (long) (nDocH * nScaleY);
+
+                long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height();
+                long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1;
+                pRowInfo[nRowPos].Set( FALSE, nRow,
+                        aMainRect.Top() + nPixelStart,
+                        aMainRect.Top() + nPixelEnd );
+
+                nPosY = nNextY;
+                ++nRowPos;
+            }
         }
         rInfo.SetRowInfo( nRowCount, pRowInfo );
     }
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index f463948c8..982c02e8a 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -2875,30 +2875,84 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo )						// Zoom berechnen
     if (aTableParam.bScalePageNum)
     {
         nZoom = 100;
-        BOOL bFound = FALSE;
         USHORT nPagesToFit = aTableParam.nScalePageNum;
-        while (!bFound)
+
+        sal_uInt16 nLastFitZoom = 0, nLastNonFitZoom = 0;
+        while (true)
         {
+            if (nZoom <= ZOOM_MIN)
+                break;
+
             CalcPages();
-            if ( nPagesX * nPagesY <= nPagesToFit || nZoom <= ZOOM_MIN )
-                bFound = TRUE;
+            bool bFitsPage = (nPagesX * nPagesY <= nPagesToFit);
+
+            if (bFitsPage)
+            {
+                if (nZoom == 100)
+                    // If it fits at 100 %, it's good enough for me.
+                    break;
+                
+                nLastFitZoom = nZoom;
+                nZoom = (nLastNonFitZoom + nZoom) / 2;
+
+                if (nLastFitZoom == nZoom)
+                    // It converged.  Use this zoom level.
+                    break;
+            }
             else
-                --nZoom;
+            {
+                if (nZoom - nLastFitZoom <= 1)
+                {
+                    nZoom = nLastFitZoom;
+                    CalcPages();
+                    break;
+                }
+
+                nLastNonFitZoom = nZoom;
+                nZoom = (nLastFitZoom + nZoom) / 2;
+            }
         }
     }
     else if (aTableParam.bScaleTo)
     {
         nZoom = 100;
-        BOOL bFound = FALSE;
         USHORT nW = aTableParam.nScaleWidth;
         USHORT nH = aTableParam.nScaleHeight;
-        while (!bFound)
+
+        sal_uInt16 nLastFitZoom = 0, nLastNonFitZoom = 0;
+        while (true)
         {
+            if (nZoom <= ZOOM_MIN)
+                break;
+
             CalcPages();
-            if ( ((!nW || (nPagesX <= nW)) && (!nH || (nPagesY <= nH))) || (nZoom <= ZOOM_MIN) )
-                bFound = TRUE;
+            bool bFitsPage = ((!nW || (nPagesX <= nW)) && (!nH || (nPagesY <= nH)));
+
+            if (bFitsPage)
+            {
+                if (nZoom == 100)
+                    // If it fits at 100 %, it's good enough for me.
+                    break;
+                
+                nLastFitZoom = nZoom;
+                nZoom = (nLastNonFitZoom + nZoom) / 2;
+
+                if (nLastFitZoom == nZoom)
+                    // It converged.  Use this zoom level.
+                    break;
+            }
             else
-                --nZoom;
+            {
+                if (nZoom - nLastFitZoom <= 1)
+                {
+                    nZoom = nLastFitZoom;
+                    CalcPages();
+                    break;
+                }
+
+                nLastNonFitZoom = nZoom;
+                nZoom = (nLastFitZoom + nZoom) / 2;
+            }
         }
     }
     else if (aTableParam.bScaleAll)
@@ -3019,16 +3073,18 @@ void ScPrintFunc::CalcPages()				// berechnet aPageRect und Seiten aus nZoom
     nTotalY = 0;
 
     BOOL bVisCol = FALSE;
+	SCCOL nLastCol = -1;
     for (SCCOL i=nStartCol; i<=nEndCol; i++)
     {
-        BYTE nFlags = pDoc->GetColFlags(i,nPrintTab);
-        if ( i>nStartCol && bVisCol && (nFlags & CR_PAGEBREAK) )
+		bool bHidden = pDoc->ColHidden(i, nPrintTab, nLastCol);
+        bool bPageBreak = (pDoc->HasColBreak(i, nPrintTab) & BREAK_PAGE);
+        if ( i>nStartCol && bVisCol && bPageBreak )
         {
             pPageEndX[nPagesX] = i-1;
             ++nPagesX;
             bVisCol = FALSE;
         }
-        if (!(nFlags & CR_HIDDEN))
+		if (!bHidden)
             bVisCol = TRUE;
     }
     if (bVisCol)	// auch am Ende keine leeren Seiten
@@ -3039,37 +3095,35 @@ void ScPrintFunc::CalcPages()				// berechnet aPageRect und Seiten aus nZoom
 
     BOOL bVisRow = FALSE;
     SCROW nPageStartRow = nStartRow;
-    ScCompressedArrayIterator< SCROW, BYTE> aIter( pDoc->GetRowFlagsArray(
-                nPrintTab), nStartRow, nEndRow);
-    do
-    {
-        BYTE nFlags = *aIter;
-        SCROW nRangeEnd = aIter.GetRangeEnd();
-        for (SCROW j=aIter.GetRangeStart(); j<=nRangeEnd; ++j)
-        {
-            if ( j>nStartRow && bVisRow && (nFlags & CR_PAGEBREAK) )
-            {
-                pPageEndY[nTotalY] = j-1;
-                ++nTotalY;
-
-                if ( !aTableParam.bSkipEmpty ||
-                        !pDoc->IsPrintEmpty( nPrintTab, nStartCol, nPageStartRow, nEndCol, j-1 ) )
-                {
-                    pPageRows[nPagesY].SetStartRow( nPageStartRow );
-                    pPageRows[nPagesY].SetEndRow( j-1 );
-                    pPageRows[nPagesY].SetPagesX( nPagesX );
-                    if (aTableParam.bSkipEmpty)
-                        lcl_SetHidden( pDoc, nPrintTab, pPageRows[nPagesY], nStartCol, pPageEndX );
-                    ++nPagesY;
-                }
-
-                nPageStartRow = j;
-                bVisRow = FALSE;
-            }
-            if (!(nFlags & CR_HIDDEN))
-                bVisRow = TRUE;
-        }
-    } while (aIter.NextRange());
+	for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
+	{
+		bool bPageBreak = (pDoc->HasRowBreak(nRow, nPrintTab) & BREAK_PAGE);
+		if (nRow > nStartRow && bVisRow && bPageBreak )
+		{
+			pPageEndY[nTotalY] = nRow-1;
+			++nTotalY;
+
+			if ( !aTableParam.bSkipEmpty ||
+					!pDoc->IsPrintEmpty( nPrintTab, nStartCol, nPageStartRow, nEndCol, nRow-1 ) )
+			{
+				pPageRows[nPagesY].SetStartRow( nPageStartRow );
+				pPageRows[nPagesY].SetEndRow( nRow-1 );
+				pPageRows[nPagesY].SetPagesX( nPagesX );
+				if (aTableParam.bSkipEmpty)
+					lcl_SetHidden( pDoc, nPrintTab, pPageRows[nPagesY], nStartCol, pPageEndX );
+				++nPagesY;
+			}
+
+			nPageStartRow = nRow;
+			bVisRow = FALSE;
+		}
+		SCROW nLastRow = -1;
+		if (!pDoc->RowHidden(nRow, nPrintTab, nLastRow))
+			bVisRow = TRUE;
+		else
+			// skip all hidden rows.
+			nRow = nLastRow;
+	}
 
     if (bVisRow)
     {
diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
index 3ab9e7b40..8ca5fc2c7 100644
--- a/sc/source/ui/view/scextopt.cxx
+++ b/sc/source/ui/view/scextopt.cxx
@@ -62,7 +62,8 @@ ScExtTabSettings::ScExtTabSettings() :
     mbSelected( false ),
     mbFrozenPanes( false ),
     mbPageMode( false ),
-    mbShowGrid( true )
+    mbShowGrid( true ),
+    maTabBgColor( COL_AUTO)
 {
 }
 
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 6c07ded20..145191626 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -359,12 +359,12 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO
         ScDocument* pDoc = pViewData->GetDocument();
         SCTAB nTab = pViewData->GetTabNo();
         if ( bLeft && !bRightScroll )
-            do --nPosX; while ( nPosX>=0 && ( pDoc->GetColFlags( nPosX, nTab ) & CR_HIDDEN ) );
+			do --nPosX; while ( nPosX>=0 && pDoc->ColHidden( nPosX, nTab ) );
         if ( bTop && !bBottomScroll )
         {
             if (--nPosY >= 0)
             {
-                pDoc->GetRowFlagsArray( nTab).GetLastForCondition( 0, nPosY, CR_HIDDEN, 0);
+                nPosY = pDoc->LastVisibleRow(0, nPosY, nTab);
                 if (!ValidRow(nPosY))
                     nPosY = -1;
             }
@@ -573,7 +573,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
             {
                 //	#94321# in SetCursorAtPoint hidden columns are skipped.
                 //	They must be skipped here too, or the result will always be the first hidden column.
-                do ++nPosX; while ( nPosX<nStartX && ( pDoc->GetColFlags( nPosX, nTab ) & CR_HIDDEN ) );
+				do ++nPosX; while ( nPosX<nStartX && pDoc->ColHidden(nPosX, nTab) );
                 for (SCCOL i=nPosX; i<nStartX; i++)
                     nSizeX += pDoc->GetColWidth( i, nTab );
             }
@@ -588,8 +588,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
                 //	They must be skipped here too, or the result will always be the first hidden row.
                 if (++nPosY < nStartY)
                 {
-                    nPosY = pDoc->GetRowFlagsArray( nTab).GetFirstForCondition(
-                            nPosY, nStartY-1, CR_HIDDEN, 0);
+                    nPosY = pDoc->FirstVisibleRow(nPosY, nStartY-1, nTab);
                     if (!ValidRow(nPosY))
                         nPosY = nStartY;
                 }
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 2bedd87aa..ec447b1a8 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -49,6 +49,7 @@
 #include "sc.hrc"
 #include "globstr.hrc"
 #include "transobj.hxx"
+#include "clipparam.hxx"
 
 
 // STATIC DATA -----------------------------------------------------------
@@ -68,6 +69,7 @@ ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) :
     ScDocument* pDoc = pViewData->GetDocument();
 
     String aString;
+    Color aTabBgColor;
     SCTAB nCount = pDoc->GetTableCount();
     for (SCTAB i=0; i<nCount; i++)
     {
@@ -79,6 +81,12 @@ ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) :
                     InsertPage( static_cast<sal_uInt16>(i)+1, aString, TPB_SPECIAL );
                 else
                     InsertPage( static_cast<sal_uInt16>(i)+1, aString );
+                if ( !pViewData->IsDefaultTabBgColor(i) )
+                {
+                    aTabBgColor = pViewData->GetTabBgColor(i);
+                    /*SetTabBgColor(static_cast<sal_uInt16>(i)+1, aTabBgColor, pViewData->IsDefaultTabBgColor(i) );*/
+                    SetTabBgColor( static_cast<sal_uInt16>(i)+1, aTabBgColor );
+                }
             }
         }
     }
@@ -264,6 +272,7 @@ void ScTabControl::Select()
     rBind.Invalidate( FID_DELETE_TABLE );
     rBind.Invalidate( FID_TABLE_SHOW );
     rBind.Invalidate( FID_TABLE_HIDE );
+    rBind.Invalidate( FID_TAB_SET_TAB_BG_COLOR );
 
         //	SetReference nur wenn der Konsolidieren-Dialog offen ist
         //	(fuer Referenzen ueber mehrere Tabellen)
@@ -290,16 +299,22 @@ void ScTabControl::UpdateStatus()
     SCTAB i;
     String aString;
     SCTAB nMaxCnt = Max( nCount, static_cast<SCTAB>(GetMaxId()) );
+    Color aTabBgColor;
 
     BOOL bModified = FALSE;										// Tabellen-Namen
     for (i=0; i<nMaxCnt && !bModified; i++)
     {
         if (pDoc->IsVisible(i))
+        {
             pDoc->GetName(i,aString);
+            aTabBgColor = pViewData->GetTabBgColor(i);
+        }
         else
+        {
             aString.Erase();
+        }
 
-        if (GetPageText(static_cast<sal_uInt16>(i)+1) != aString)
+        if ( (GetPageText(static_cast<sal_uInt16>(i)+1) != aString) || (GetTabBgColor(static_cast<sal_uInt16>(i)+1) != aTabBgColor) )
             bModified = TRUE;
     }
 
@@ -316,6 +331,11 @@ void ScTabControl::UpdateStatus()
                         InsertPage( static_cast<sal_uInt16>(i)+1, aString, TPB_SPECIAL );
                     else
                         InsertPage( static_cast<sal_uInt16>(i)+1, aString );
+                    if ( !pViewData->IsDefaultTabBgColor(i) )
+                    {
+                        aTabBgColor = pViewData->GetTabBgColor(i);
+                        SetTabBgColor( static_cast<sal_uInt16>(i)+1, aTabBgColor );
+                    }
                 }
             }
         }
@@ -447,7 +467,8 @@ void ScTabControl::DoDrag( const Region& /* rRegion */ )
     aTabMark.SetMarkArea( ScRange(0,0,nTab,MAXCOL,MAXROW,nTab) );
 
     ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
-    pDoc->CopyToClip( 0,0, MAXCOL,MAXROW, FALSE, pClipDoc, FALSE, &aTabMark );
+    ScClipParam aClipParam(ScRange(0, 0, 0, MAXCOL, MAXROW, 0), false);
+    pDoc->CopyToClip(aClipParam, pClipDoc, &aTabMark, false);
 
     TransferableObjectDescriptor aObjDesc;
     pDocSh->FillTransferableObjectDescriptor( aObjDesc );
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 48a9db49a..eb6908b4f 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -200,6 +200,8 @@
 #include "AccessibilityHints.hxx"
 #include "appoptio.hxx"
 
+#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+
 #include <string>
 #include <algorithm>
 
@@ -212,6 +214,8 @@
 //	fuer Rad-Maus
 #define SC_DELTA_ZOOM	10
 
+using namespace ::com::sun::star;
+
 // STATIC DATA -----------------------------------------------------------
 
 
@@ -1437,7 +1441,7 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars )
     SCsCOL nDir = ( nDeltaX > 0 ) ? 1 : -1;
     ScDocument* pDoc = aViewData.GetDocument();
     SCTAB nTab = aViewData.GetTabNo();
-    while ( ( pDoc->GetColFlags( nNewX, nTab ) & CR_HIDDEN ) &&
+    while ( pDoc->ColHidden(nNewX, nTab) &&
             nNewX+nDir >= 0 && nNewX+nDir <= MAXCOL )
         nNewX = sal::static_int_cast<SCsCOL>( nNewX + nDir );
 
@@ -1526,7 +1530,7 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars )
     SCsROW nDir = ( nDeltaY > 0 ) ? 1 : -1;
     ScDocument* pDoc = aViewData.GetDocument();
     SCTAB nTab = aViewData.GetTabNo();
-    while ( ( pDoc->GetRowFlags( nNewY, nTab ) & CR_HIDDEN ) &&
+    while ( pDoc->RowHidden(nNewY, nTab) &&
             nNewY+nDir >= 0 && nNewY+nDir <= MAXROW )
         nNewY += nDir;
 
@@ -2475,7 +2479,7 @@ sal_Bool ScTabView::HasPageFieldDataAtCursor() const
     SCCOL nCol = aViewData.GetCurX();
     SCROW nRow = aViewData.GetCurY();
     if (pWin)
-        return pWin->HasPageFieldData( nCol, nRow );
+        return pWin->GetDPFieldOrientation( nCol, nRow ) == sheet::DataPilotFieldOrientation_PAGE;
 
     return sal_False;
 }
@@ -2485,15 +2489,23 @@ void ScTabView::StartDataSelect()
     ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()];
     SCCOL nCol = aViewData.GetCurX();
     SCROW nRow = aViewData.GetCurY();
-    if (pWin)
-    {
-        //  #i36598# If the cursor is on a page field's data cell,
-        //  no meaningful input is possible anyway, so this function
-        //  can be used to select a page field entry.
 
-        if ( pWin->HasPageFieldData( nCol, nRow ) )
-            pWin->DoPageFieldMenue( nCol, nRow );
-        else
+    if (!pWin)
+        return;
+
+    switch (pWin->GetDPFieldOrientation(nCol, nRow))
+    {
+        case sheet::DataPilotFieldOrientation_PAGE:
+            //  #i36598# If the cursor is on a page field's data cell,
+            //  no meaningful input is possible anyway, so this function
+            //  can be used to select a page field entry.
+            pWin->LaunchPageFieldMenu( nCol, nRow );
+        break;
+        case sheet::DataPilotFieldOrientation_COLUMN:
+        case sheet::DataPilotFieldOrientation_ROW:
+            pWin->LaunchDPFieldMenu( nCol, nRow );
+        break;
+        default:
             pWin->DoAutoFilterMenue( nCol, nRow, TRUE );
     }
 }
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 687f93677..999c952ab 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -677,7 +677,15 @@ void ScTabView::ExpandBlock(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode)
     
         pDoc->SkipOverlapped(nBlockEndX, nBlockEndY, nTab);
         MarkCursor(nBlockEndX, nBlockEndY, nTab, false, false, true);
-        AlignToCursor(nBlockEndX, nBlockEndY, eMode);
+
+        // Check if the entire row(s) or column(s) are selected.
+        ScSplitPos eActive = aViewData.GetActivePart();
+        bool bRowSelected = (nBlockStartX == 0 && nBlockEndX == MAXCOL);
+        bool bColSelected = (nBlockStartY == 0 && nBlockEndY == MAXROW);
+        SCsCOL nAlignX = bRowSelected ? aViewData.GetPosX(WhichH(eActive)) : nBlockEndX;
+        SCsROW nAlignY = bColSelected ? aViewData.GetPosY(WhichV(eActive)) : nBlockEndY;
+        AlignToCursor(nAlignX, nAlignY, eMode);
+
         UpdateAutoFillMark();
     }
 }
@@ -928,13 +936,13 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
     }
 
     long nBlockY = 0;
-    ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
-            pDoc->GetRowFlagsArray( nTab), 0, nFixPosY-1, CR_HIDDEN, 0,
-            pDoc->GetRowHeightArray( nTab));
-    for ( ; aIter; ++aIter)
+    for (SCROW nRow = 0; nRow <= nFixPosY-1; ++nRow)
     {
+        if (pDoc->RowHidden(nRow, nTab))
+            continue;
+
         //	for frozen panes, add both parts
-        USHORT nRowTwips = *aIter;
+        USHORT nRowTwips = pDoc->GetRowHeight(nRow, nTab);
         if (nRowTwips)
         {
             nBlockY += (long)(nRowTwips * fScaleY);
@@ -942,10 +950,9 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
                 return FALSE;
         }
     }
-    aIter.NewLimits( nStartRow, nEndRow);
-    for ( ; aIter; ++aIter)
+    for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
     {
-        USHORT nRowTwips = *aIter;
+        USHORT nRowTwips = pDoc->GetRowHeight(nRow, nTab);
         if (nRowTwips)
         {
             nBlockY += (long)(nRowTwips * fScaleY);
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 52cbfc925..85087d894 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -997,8 +997,8 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
         BOOL bHFlip = FALSE;
         do
         {
-            BYTE nColFlags = pDoc->GetColFlags( nCurX, nTab );
-            bSkipCell = (nColFlags & CR_HIDDEN) || pDoc->IsHorOverlapped( nCurX, nCurY, nTab );
+			SCCOL nLastCol = -1;
+            bSkipCell = pDoc->ColHidden(nCurX, nTab, nLastCol) || pDoc->IsHorOverlapped( nCurX, nCurY, nTab );
             if (bSkipProtected && !bSkipCell)
                 bSkipCell = pDoc->HasAttrib(nCurX, nCurY, nTab, nCurX, nCurY, nTab, HASATTR_PROTECTED);
             if (bSkipUnprotected && !bSkipCell)
@@ -1039,8 +1039,8 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
         BOOL bVFlip = FALSE;
         do
         {
-            BYTE nRowFlags = pDoc->GetRowFlags( nCurY, nTab );
-            bSkipCell = (nRowFlags & CR_HIDDEN) || pDoc->IsVerOverlapped( nCurX, nCurY, nTab );
+			SCROW nLastRow = -1;
+            bSkipCell = pDoc->RowHidden(nCurY, nTab, nLastRow) || pDoc->IsVerOverlapped( nCurX, nCurY, nTab );
             if (bSkipProtected && !bSkipCell)
                 bSkipCell = pDoc->HasAttrib(nCurX, nCurY, nTab, nCurX, nCurY, nTab, HASATTR_PROTECTED);
             if (bSkipUnprotected && !bSkipCell)
@@ -1434,9 +1434,9 @@ void ScTabView::MarkRange( const ScRange& rRange, BOOL bSetCursor, BOOL bContinu
 		if ( !bCol && !bRow )
 		{
 			if ( bCol ) 
-				nAlignX = aViewData.GetPosX(WhichH(aViewData.GetActivePart()));
+            nAlignX = aViewData.GetPosX(WhichH(aViewData.GetActivePart()));
 			if ( bRow )
-				nAlignY = aViewData.GetPosY(WhichV(aViewData.GetActivePart()));
+            nAlignY = aViewData.GetPosY(WhichV(aViewData.GetActivePart()));
 		}
         AlignToCursor( nAlignX, nAlignY, SC_FOLLOW_JUMP );
     }
@@ -1665,7 +1665,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
                     if ( pGridWin[i]->IsVisible() )
                         pGridWin[i]->UpdateEditViewPos();
         }
-		
+
         TabChanged();										// DrawView
 
 		if( !bNew )
@@ -2090,17 +2090,18 @@ void ScTabView::PaintRangeFinder( long nNumber )
                             BOOL bHiddenEdge = FALSE;
                             SCROW nTmp;
                             ScDocument* pDoc = aViewData.GetDocument();
-                            while ( nCol1 > 0 && ( pDoc->GetColFlags( nCol1, nTab ) & CR_HIDDEN ) )
+							SCCOL nLastCol = -1;
+							while ( nCol1 > 0 && pDoc->ColHidden(nCol1, nTab, nLastCol) )
                             {
                                 --nCol1;
                                 bHiddenEdge = TRUE;
                             }
-                            while ( nCol2 < MAXCOL && ( pDoc->GetColFlags( nCol2, nTab ) & CR_HIDDEN ) )
+							while ( nCol2 < MAXCOL && pDoc->ColHidden(nCol2, nTab, nLastCol) )
                             {
                                 ++nCol2;
                                 bHiddenEdge = TRUE;
                             }
-                            nTmp = pDoc->GetRowFlagsArray( nTab).GetLastForCondition( 0, nRow1, CR_HIDDEN, 0);
+                            nTmp = pDoc->LastVisibleRow(0, nRow1, nTab);
                             if (!ValidRow(nTmp))
                                 nTmp = 0;
                             if (nTmp < nRow1)
@@ -2108,7 +2109,7 @@ void ScTabView::PaintRangeFinder( long nNumber )
                                 nRow1 = nTmp;
                                 bHiddenEdge = TRUE;
                             }
-                            nTmp = pDoc->GetRowFlagsArray( nTab).GetFirstForCondition( nRow2, MAXROW, CR_HIDDEN, 0);
+                            nTmp = pDoc->FirstVisibleRow(nRow2, MAXROW, nTab);
                             if (!ValidRow(nTmp))
                                 nTmp = MAXROW;
                             if (nTmp > nRow2)
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 4d5df8fc0..0becaa658 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1517,7 +1517,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
         //	#51889# Spezialfall: Copy/Cut bei Mehrfachselektion -> Fehlermeldung
         //	(Slot ist disabled, SfxViewShell::KeyInput wuerde also kommentarlos verschluckt)
         KeyFuncType eFunc = aCode.GetFunction();
-		if ( eFunc == KEYFUNC_CUT )
+        if ( eFunc == KEYFUNC_CUT )
         {
             ScRange aDummy;
             ScMarkType eMarkType = GetViewData()->GetSimpleArea( aDummy );
@@ -1813,7 +1813,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
             {
                 SCTAB nInitTabCount = 3;							//!	konfigurierbar !!!
                 for (SCTAB i=1; i<nInitTabCount; i++)
-                    pDoc->MakeTable(i);
+                    pDoc->MakeTable(i,false);
             }
 
             pDocSh->SetEmpty( FALSE );          // #i6232# make sure this is done only once
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index a7fd06dc4..8b0132674 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -113,30 +113,38 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
         aStr = ScGlobal::GetRscString(nGlobStrId);
         aStr += '=';
 
-        //	Anzahl im Standardformat, die anderen nach Cursorposition
-        sal_uInt32 nNumFmt = 0;
-        SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
-        if ( eFunc != SUBTOTAL_FUNC_CNT && eFunc != SUBTOTAL_FUNC_CNT2 )
-        {
-            //	Zahlformat aus Attributen oder Formel
-            pDoc->GetNumberFormat( nPosX, nPosY, nTab, nNumFmt );
-            if ( (nNumFmt % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
-            {
-                ScBaseCell* pCell;
-                pDoc->GetCell( nPosX, nPosY, nTab, pCell );
-                if (pCell && pCell->GetCellType() == CELLTYPE_FORMULA)
-                    nNumFmt = ((ScFormulaCell*)pCell)->GetStandardFormat(
-                        *pFormatter, nNumFmt );
-            }
-        }
         ScAddress aCursor( nPosX, nPosY, nTab );
         double nVal;
         if ( pDoc->GetSelectionFunction( eFunc, aCursor, rMark, nVal ) )
         {
-            String aValStr;
-            Color* pDummy;
-            pFormatter->GetOutputString( nVal, nNumFmt, aValStr, &pDummy );
-            aStr += aValStr;
+            if ( nVal == 0.0 )
+                aStr += '0';
+            else
+            {
+                //	Anzahl im Standardformat, die anderen nach Cursorposition
+                SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+                sal_uInt32 nNumFmt = 0;
+                if ( eFunc != SUBTOTAL_FUNC_CNT && eFunc != SUBTOTAL_FUNC_CNT2 )
+                {
+                    //	Zahlformat aus Attributen oder Formel
+                    pDoc->GetNumberFormat( nPosX, nPosY, nTab, nNumFmt );
+                    if ( (nNumFmt % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
+                    {
+                        ScBaseCell* pCell;
+                        pDoc->GetCell( nPosX, nPosY, nTab, pCell );
+                        if (pCell && pCell->GetCellType() == CELLTYPE_FORMULA)
+                        {
+                            
+                            nNumFmt = ((ScFormulaCell*)pCell)->GetStandardFormat(*pFormatter, nNumFmt );
+                        }
+                    }
+                }
+        
+                String aValStr;
+                Color* pDummy;
+                pFormatter->GetOutputString( nVal, nNumFmt, aValStr, &pDummy );
+                aStr += aValStr;
+            }
         }
 
         rFuncStr = aStr;
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 7cbba03f3..b9a5a5892 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -465,7 +465,10 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet)
 
             case SID_INSERT_SOUND:
             case SID_INSERT_VIDEO:
-                if ( bOle || bTabProt || !SvxPluginFileDlg::IsAvailable(nWhich) || bShared )
+                 /* #i102735# discussed with NN: removed for performance reasons
+                 || !SvxPluginFileDlg::IsAvailable(nWhich)
+                 */
+                if ( bOle || bTabProt || bShared )
                     rSet.DisableItem( nWhich );
                 break;
 
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index b0d19cb29..971e646a9 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -60,6 +60,10 @@
 
 #include "scabstdlg.hxx" //CHINA001
 
+#include "tabbgcolor.hxx" //DBW
+#include "tabbgcolordlg.hxx" //DBW
+#include <svx/colritem.hxx> //DBW
+
 #define IS_AVAILABLE(WhichId,ppItem) \
     (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
 
@@ -699,6 +703,120 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
             }
             break;
 
+        case FID_TAB_SET_TAB_BG_COLOR:
+        case FID_TAB_MENU_SET_TAB_BG_COLOR:
+            {
+                if ( nSlot == FID_TAB_MENU_SET_TAB_BG_COLOR )
+                    nSlot = FID_TAB_SET_TAB_BG_COLOR;
+
+                SCTAB nTabNr = pViewData->GetTabNo();
+                ScMarkData& rMark = pViewData->GetMarkData();
+                SCTAB nTabSelCount = rMark.GetSelectCount();
+
+                ScUndoSetTabBgColorInfo*     aTabBgColorUndoInfo=NULL;
+                ScUndoSetTabBgColorInfoList* aTabBgColorUndoInfoList =NULL;
+
+                if ( !pDoc->IsDocEditable() )
+                    break;
+
+                if ( pDoc->IsTabProtected( nTabNr ) ) // ||nTabSelCount > 1
+                    break;
+
+                if( pReqArgs != NULL )
+                {
+                    BOOL                bDone = FALSE;
+                    const SfxPoolItem*  pItem;
+                    Color               aColor;
+                    if( IS_AVAILABLE( FN_PARAM_1, &pItem ) )
+                        nTabNr = ((const SfxUInt16Item*)pItem)->GetValue();
+
+                    if( IS_AVAILABLE( nSlot, &pItem ) )
+                        aColor = ((const SvxColorItem*)pItem)->GetValue();
+
+                    if ( nTabSelCount > 1 )
+                    {
+                        aTabBgColorUndoInfoList = new ScUndoSetTabBgColorInfoList();
+                        for (SCTAB nTab=0; nTab<nTabCount; nTab++)
+                        {
+                            if ( rMark.GetTableSelect(nTab) && !pDoc->IsTabProtected(nTab) )
+                            {
+                                aTabBgColorUndoInfo = new ScUndoSetTabBgColorInfo();
+                                aTabBgColorUndoInfo->nTabId = nTab;
+                                aTabBgColorUndoInfo->aNewTabBgColor = aColor;
+                                aTabBgColorUndoInfoList->Insert(aTabBgColorUndoInfo);
+                            }
+                        }
+                        bDone = SetTabBgColor( aTabBgColorUndoInfoList );
+                    }
+                    else
+                    {
+                        bDone = SetTabBgColor( aColor, nCurrentTab ); //ScViewFunc.SetTabBgColor
+                    }
+                    if( bDone )
+                    {
+                        rReq.Done( *pReqArgs );
+                    }
+                }
+                else
+                {
+                    USHORT      nRet    = RET_OK; /// temp
+                    BOOL        bDone   = FALSE; /// temp
+                    Color       aTabBgColor;
+                    Color       aNewTabBgColor;
+
+                    aTabBgColor = pViewData->GetTabBgColor( nCurrentTab );
+                    ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
+                    AbstractScTabBgColorDlg* pDlg = pFact->CreateScTabBgColorDlg(
+                                                                GetDialogParent(),
+                                                                String(ScResId(SCSTR_SET_TAB_BG_COLOR)),
+                                                                String(ScResId(SCSTR_NO_TAB_BG_COLOR)),
+                                                                aTabBgColor,
+                                                                nSlot,RID_SCDLG_TAB_BG_COLOR);
+                    while ( !bDone && nRet == RET_OK )
+                    {
+                        nRet = pDlg->Execute();
+                        if( nRet == RET_OK )
+                        {
+                            Color aSelectedColor;
+                            pDlg->GetSelectedColor(aSelectedColor);
+                            aTabBgColorUndoInfoList = new ScUndoSetTabBgColorInfoList();
+                            if ( nTabSelCount > 1 )
+                            {
+                                for  (SCTAB nTab=0; nTab<nTabCount; nTab++)
+                                {
+                                    if ( rMark.GetTableSelect(nTab) && !pDoc->IsTabProtected(nTab) )
+                                    {
+                                        aTabBgColorUndoInfo = new ScUndoSetTabBgColorInfo();
+                                        aTabBgColorUndoInfo->nTabId = nTab;
+                                        aTabBgColorUndoInfo->aNewTabBgColor = aSelectedColor;
+                                        aTabBgColorUndoInfoList->Insert(aTabBgColorUndoInfo);
+                                    }
+                                }
+                                bDone = SetTabBgColor( aTabBgColorUndoInfoList );
+                            }
+                            else
+                            {
+                                bDone = SetTabBgColor( aSelectedColor, nCurrentTab ); //ScViewFunc.SetTabBgColor
+                            }
+                            if ( bDone )
+                            {
+                                rReq.AppendItem( SvxColorItem( aTabBgColor, nSlot ) );
+                                rReq.Done();
+                            }
+                            else
+                            {
+                                if( rReq.IsAPI() )
+                                {
+                                    StarBASIC::Error( SbERR_SETPROP_FAILED );
+                                }
+                            }
+                        }
+                    }
+                    delete( pDlg );
+                }
+            }
+            break;
         default:
             DBG_ERROR("Unbekannte Message bei ViewShell");
             break;
@@ -818,6 +936,23 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
                 }
                 break;
 
+            case FID_TAB_MENU_SET_TAB_BG_COLOR:
+                {
+                    if ( !pDoc->IsDocEditable()
+                        || ( pDocShell && pDocShell->IsDocShared() )
+                        || pDoc->IsTabProtected(nTab) )
+                        rSet.DisableItem( nWhich );
+                }
+                break;
+
+            case FID_TAB_SET_TAB_BG_COLOR:
+                {
+                    Color aColor;
+                    aColor = pViewData->GetTabBgColor( nTab );
+                    rSet.Put( SvxColorItem( aColor, nWhich ) );
+                }
+                break;
+
             case FID_TAB_TOGGLE_GRID:
                 rSet.Put( SfxBoolItem(nWhich, pViewData->GetShowGrid()) );
                 break;
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 108c0a6b2..5c2fa9295 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -105,7 +105,8 @@ ScViewDataTable::ScViewDataTable() :
                 nCurX( 0 ),
                 nCurY( 0 ),
                 bShowGrid( true ),
-                bOldCurValid( FALSE )
+                bOldCurValid( FALSE ),
+                aTabBgColor( Color(COL_AUTO) )
 {
     nPosX[0]=nPosX[1]=0;
     nPosY[0]=nPosY[1]=0;
@@ -168,6 +169,12 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>
         pSettings[SC_TABLE_SHOWGRID].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID));
         pSettings[SC_TABLE_SHOWGRID].Value <<= static_cast<sal_Bool>(bShowGrid);
 
+
+        if ( !IsDefaultTabBgColor() )
+        {
+            pSettings[SC_TABLE_TAB_BG_COLOR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_TABCOLOR));
+            pSettings[SC_TABLE_TAB_BG_COLOR].Value <<= static_cast<sal_Int32>(aTabBgColor.GetColor());
+        }
 //        pSettings[SC_TABLE_SELECTED].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_TABLESELECTED));
 //        pSettings[SC_TABLE_SELECTED].Value <<= bool(rViewData.GetMarkData().GetTableSelect( nTab ));
     }
@@ -284,6 +291,13 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV
             aSettings[i].Value >>= bSelected;
             rViewData.GetMarkData().SelectTable( nTab, bSelected );
         }
+        else if (sName.compareToAscii(SC_UNO_TABCOLOR) == 0)
+        {
+            sal_Int32 nColor = COL_AUTO;
+            aSettings[i].Value >>= nColor;
+            if (nColor != COL_AUTO)
+                aTabBgColor.SetColor(static_cast<ColorData>(nColor));
+        }
     }
     if (eHSplitMode == SC_SPLIT_FIX)
         nFixPosX = SanitizeCol( static_cast<SCCOL>( bHasHSplitInTwips ? nTempPosHTw : nTempPosH ));
@@ -589,6 +603,36 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
     aMarkData.InsertTab( nInsTab );			// ggf. angepasst
 }
 
+void ScViewData::SetTabBgColor( Color rTabBgColor, SCTAB nTab )
+{
+    if ( rTabBgColor != Color(COL_AUTO) )
+    {
+        if ( !pTabData[nTab] )
+            CreateTabData( nTab );
+        pTabData[nTab]->aTabBgColor = rTabBgColor;
+    }
+    else
+    {
+        if ( pTabData[nTab] )
+            pTabData[nTab]->aTabBgColor = Color( COL_AUTO );
+    }
+}
+
+Color ScViewData::GetTabBgColor( SCTAB nTab ) const
+{
+    if ( !pTabData[nTab] )
+        return Color(COL_AUTO);
+    return pTabData[nTab]->aTabBgColor;
+}
+
+BOOL ScViewData::IsDefaultTabBgColor( SCTAB nTab ) const
+{
+    if ( !pTabData[nTab] )
+        return true;
+    BOOL bResult = pTabData[nTab]->aTabBgColor==Color( COL_AUTO ) ? TRUE : FALSE;
+    return bResult;
+}
+
 //UNUSED2008-05  void ScViewData::UpdateOle( ScSplitPos /* eWhich */ )
 //UNUSED2008-05  {
 //UNUSED2008-05      GetDocShell()->UpdateOle(this);
@@ -676,13 +720,13 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vec
     {
         if ( pTabData[i] )
         {
-            if ( bPagebreak )
-            {
+    if ( bPagebreak )
+    {
                 pTabData[i]->aPageZoomX = aValidX;
                 pTabData[i]->aPageZoomY = aValidY;
             }
-            else
-            {
+    else
+    {
                 pTabData[i]->aZoomX = aValidX;
                 pTabData[i]->aZoomY = aValidY;
             }
@@ -1597,7 +1641,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
                 else if ( nY < MAXROW )
                 {
                     // skip multiple hidden rows (forward only for now)
-                    SCROW nNext = pDoc->FastGetFirstNonHiddenRow( nY + 1, nTabNo );
+                    SCROW nNext = pDoc->FirstVisibleRow(nY + 1, MAXROW, nTabNo);
                     if ( nNext > MAXROW )
                         nY = MAXROW;
                     else
@@ -1709,7 +1753,7 @@ SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHO
             else if ( nDir == 1 && nRowNo < MAXROW )
             {
                 // skip multiple hidden rows (forward only for now)
-                SCROW nNext = pDoc->FastGetFirstNonHiddenRow( nRowNo + 1, nTabNo );
+                SCROW nNext = pDoc->FirstVisibleRow(nRowNo + 1, MAXROW, nTabNo);
                 if ( nNext > MAXROW )
                 {
                     // same behavior as without the optimization: set bOut with nY=MAXROW+1
@@ -1772,11 +1816,19 @@ BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& r
         for (SCCOL i=0; i<nCountX; i++)
             nOutWidth += ToPixel( pDoc->GetColWidth(nX+i,nTabNo), nPPTX );
         SCROW nCountY = pMerge->GetRowMerge();
-        ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
-                pDoc->GetRowFlagsArray( nTabNo), nY, nY+nCountY-1, CR_HIDDEN,
-                0, pDoc->GetRowHeightArray( nTabNo));
-        for ( ; aIter; ++aIter )
-            nOutHeight += ToPixel( *aIter, nPPTY );
+
+        for (SCROW nRow = nY; nRow <= nY+nCountY-1; ++nRow)
+        {
+            SCROW nLastRow = nRow;
+            if (pDoc->RowHidden(nRow, nTabNo, NULL, &nLastRow))
+            {    
+                nRow = nLastRow;
+                continue;
+            }
+
+            USHORT nHeight = pDoc->GetRowHeight(nRow, nTabNo);
+            nOutHeight += ToPixel(nHeight, nPPTY);
+        }
 
         rSizeXPix = nOutWidth;
         rSizeYPix = nOutHeight;
@@ -2513,6 +2565,9 @@ void ScViewData::WriteExtOptions( ScExtDocOptions& rDocOpt ) const
             rTabSett.mbPageMode = bPagebreak;
             rTabSett.mnNormalZoom = static_cast< long >( pViewTab->aZoomY * Fraction( 100.0 ) );
             rTabSett.mnPageZoom = static_cast< long >( pViewTab->aPageZoomY * Fraction( 100.0 ) );
+
+            // Tab Bg Color
+            rTabSett.maTabBgColor = pViewTab->aTabBgColor;
         }
     }
 }
@@ -2669,6 +2724,10 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions& rDocOpt )
                     update map modes that are needed to draw text correctly. */
                 SetPagebreakMode( rTabSett.mbPageMode );
             }
+
+            // Tab Bg Color
+            if( !rTabSett.IsDefaultTabBgColor() )
+                rViewTab.aTabBgColor = rTabSett.maTabBgColor;
         }
     }
 
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 445b0f7bf..a3b828a24 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -95,6 +95,7 @@ using namespace com::sun::star;
 #include "funcdesc.hxx"
 #include "docuno.hxx"
 
+#include "tabbgcolor.hxx" //DBW
 
 // STATIC DATA ---------------------------------------------------------------
 
@@ -2388,6 +2389,28 @@ BOOL ScViewFunc::RenameTable( const String& rName, SCTAB nTab )
 
 //----------------------------------------------------------------------------
 
+BOOL ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab )
+{
+    BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( nTab, rColor, TRUE, FALSE );
+    if (bSuccess)
+    {
+        GetViewData()->GetViewShell()->UpdateInputHandler();
+    }
+    return bSuccess;
+}
+
+BOOL ScViewFunc::SetTabBgColor( ScUndoSetTabBgColorInfoList* rUndoSetTabBgColorInfoList )
+{
+    BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( rUndoSetTabBgColorInfoList, TRUE, FALSE );
+    if (bSuccess)
+    {
+        GetViewData()->GetViewShell()->UpdateInputHandler();
+    }
+    return bSuccess;
+}
+
+//----------------------------------------------------------------------------
+
 void ScViewFunc::InsertAreaLink( const String& rFile,
                                     const String& rFilter, const String& rOptions,
                                     const String& rSource, ULONG nRefresh )
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 9bf378688..db186e3fb 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -212,8 +212,8 @@
 #include "transobj.hxx"
 #include "drwtrans.hxx"
 #include "docuno.hxx"
-#include "undodat.hxx"   // Amelia Wang
 #include "clipparam.hxx"
+#include "undodat.hxx"   // Amelia Wang
 
 using namespace com::sun::star;
 
@@ -344,9 +344,8 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
                 ScDrawLayer::SetGlobalDrawPersist( ScTransferObj::SetDrawClipDoc( bAnyOle ) );
             }
 
-            pDoc->CopyToClip( aRange.aStart.Col(), aRange.aStart.Row(),
-                              aRange.aEnd.Col(),   aRange.aEnd.Row(),
-                              bCut, pClipDoc, FALSE, &rMark, FALSE, bIncludeObjects );
+            ScClipParam aClipParam(aRange, bCut);
+            pDoc->CopyToClip(aClipParam, pClipDoc, &rMark, false, false, bIncludeObjects);
             if (bSysClip)
             {
                 ScDrawLayer::SetGlobalDrawPersist(NULL);
@@ -389,6 +388,7 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
         bool bSuccess = false;
         ScClipParam aClipParam;
         aClipParam.mbCutMode = false;
+        rMark.MarkToSimple();
         rMark.FillRangeListWithMarks(&aClipParam.maRanges, false);
 
         do
@@ -416,9 +416,10 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
             {
                 if (pDoc->HasSelectedBlockMatrixFragment(
                     p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(), rMark))
-                {    
-                    bValidRanges = false;
-                    break;
+                {
+                    if (!bApi)
+                        ErrorMessage(STR_MATRIXFRAGMENTERR);
+                    return false;
                 }
 
                 SCCOL nColDelta = p->aStart.Col() - nPrevCol;
@@ -465,31 +466,31 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
             if (!bValidRanges)
                 break;
 
-            pDoc->CopyToClip(aClipParam, pDocClip.get(), &rMark, false, bIncludeObjects);
+            pDoc->CopyToClip(aClipParam, pDocClip.get(), false, &rMark, false, bIncludeObjects);
 
             ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
             if ( pChangeTrack )
                 pChangeTrack->ResetLastCut();	// kein CutMode mehr
 
-			{
-				ScDocShell* pDocSh = GetViewData()->GetDocShell();
-				TransferableObjectDescriptor aObjDesc;
-				pDocSh->FillTransferableObjectDescriptor( aObjDesc );
-				aObjDesc.maDisplayName = pDocSh->GetMedium()->GetURLObject().GetURLNoPass();
-				// maSize is set in ScTransferObj ctor
+            {
+                ScDocShell* pDocSh = GetViewData()->GetDocShell();
+                TransferableObjectDescriptor aObjDesc;
+                pDocSh->FillTransferableObjectDescriptor( aObjDesc );
+                aObjDesc.maDisplayName = pDocSh->GetMedium()->GetURLObject().GetURLNoPass();
+                // maSize is set in ScTransferObj ctor
 
-				ScTransferObj* pTransferObj = new ScTransferObj( pDocClip.release(), aObjDesc );
-				uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj );
+                ScTransferObj* pTransferObj = new ScTransferObj( pDocClip.release(), aObjDesc );
+                uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj );
 
-				if ( ScGlobal::pDrawClipDocShellRef )
-				{
+                if ( ScGlobal::pDrawClipDocShellRef )
+                {
                     SfxObjectShellRef aPersistRef( &(*ScGlobal::pDrawClipDocShellRef) );
-					pTransferObj->SetDrawPersist( aPersistRef );	// keep persist for ole objects alive
-				}
+                    pTransferObj->SetDrawPersist( aPersistRef );	// keep persist for ole objects alive
+                }
 
-				pTransferObj->CopyToClipboard( GetActiveWin() );	// system clipboard
-				SC_MOD()->SetClipObject( pTransferObj, NULL );		// internal clipboard
-			}
+                pTransferObj->CopyToClipboard( GetActiveWin() );	// system clipboard
+                SC_MOD()->SetClipObject( pTransferObj, NULL );		// internal clipboard
+            }
 
             bSuccess = true;
         }
@@ -526,9 +527,8 @@ ScTransferObj* ScViewFunc::CopyToTransferable()
             BOOL bAnyOle = pDoc->HasOLEObjectsInArea( aRange, &rMark );
             ScDrawLayer::SetGlobalDrawPersist( ScTransferObj::SetDrawClipDoc( bAnyOle ) );
 
-            pDoc->CopyToClip( aRange.aStart.Col(), aRange.aStart.Row(),
-                              aRange.aEnd.Col(),   aRange.aEnd.Row(),
-                              FALSE, pClipDoc, FALSE, &rMark, FALSE, TRUE );
+            ScClipParam aClipParam(aRange, false);
+            pDoc->CopyToClip(aClipParam, pClipDoc, &rMark, false, false, true);
 
             ScDrawLayer::SetGlobalDrawPersist(NULL);
             pClipDoc->ExtendMerge( aRange, TRUE );
@@ -1458,7 +1458,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
 
     aModificator.SetDocumentModified();
     PostPasteFromClip(aUserRange, rMark);
-	return TRUE;
+    return TRUE;
 }
 
 bool ScViewFunc::PasteMultiRangesFromClip(
@@ -1512,6 +1512,14 @@ bool ScViewFunc::PasteMultiRangesFromClip(
     ScRange aMarkedRange(rCurPos.Col(), rCurPos.Row(), nTab1, 
                          rCurPos.Col()+nColSize-1, rCurPos.Row()+nRowSize-1, nTab2);
 
+    // Extend the marked range to account for filtered rows in the destination
+    // area.
+    if (ScViewUtil::HasFiltered(aMarkedRange, pDoc))
+    {
+        if (!ScViewUtil::FitToUnfilteredRows(aMarkedRange, pDoc, nRowSize))
+            return false;
+    }
+
     bool bAskIfNotEmpty = 
         bAllowDialogs && (nFlags & IDF_CONTENTS) && 
         nFunction == PASTE_NOFUNC && SC_MOD()->GetInputOptions().GetReplaceCellsWarn();
@@ -1537,7 +1545,7 @@ bool ScViewFunc::PasteMultiRangesFromClip(
     {
         pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO));
         pUndoDoc->InitUndoSelected(pDoc, aMark, false, false);
-        pDoc->CopyToDocument(aMarkedRange, IDF_ALL, false, pUndoDoc.get(), &aMark, true);
+        pDoc->CopyToDocument(aMarkedRange, nUndoFlags, false, pUndoDoc.get(), &aMark, true);
     }
 
     ::std::auto_ptr<ScDocument> pMixDoc;
@@ -1555,10 +1563,10 @@ bool ScViewFunc::PasteMultiRangesFromClip(
         - Needed before AdjustBlockHeight to track moved drawing objects.
         - Needed before pDoc->CopyFromClip to track inserted note caption objects.
      */
-	if (nFlags & IDF_OBJECTS)
-		pDocSh->MakeDrawLayer();
-	if (pDoc->IsUndoEnabled())
-		pDoc->BeginDrawUndo();
+    if (nFlags & IDF_OBJECTS)
+        pDocSh->MakeDrawLayer();
+    if (pDoc->IsUndoEnabled())
+        pDoc->BeginDrawUndo();
 
     CursorSwitcher aCursorSwitch(this);
     sal_uInt16 nNoObjFlags = nFlags & ~IDF_OBJECTS;
@@ -1577,9 +1585,9 @@ bool ScViewFunc::PasteMultiRangesFromClip(
                                      true, false, false, true);
     }
 
-    pDocSh->PostPaint(rCurPos.Col(), rCurPos.Row(), rCurPos.Tab(), 
-                      rCurPos.Col()+nColSize-1, rCurPos.Row()+nRowSize-1, rCurPos.Tab(), 
-                      PAINT_GRID);
+    pDocSh->PostPaint(
+        aMarkedRange.aStart.Col(), aMarkedRange.aStart.Row(), nTab1,
+        aMarkedRange.aEnd.Col(), aMarkedRange.aEnd.Row(), nTab1, PAINT_GRID);
 
     if (pDoc->IsUndoEnabled())
     {
@@ -1719,10 +1727,10 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
         BOOL bIncludeFiltered = bCut;
         if ( !bIncludeFiltered )
         {
-            //	manually find number of non-filtered rows
-            SCROW nPastedCount = pDocSh->GetDocument()->GetRowFlagsArray(
-                    rSource.aStart.Tab()).CountForCondition(
-                    rSource.aStart.Row(), rSource.aEnd.Row(), CR_FILTERED, 0);
+			// find number of non-filtered rows
+            SCROW nPastedCount = pDocSh->GetDocument()->CountNonFilteredRows(
+                rSource.aStart.Row(), rSource.aEnd.Row(), rSource.aStart.Tab());
+
             if ( nPastedCount == 0 )
                 nPastedCount = 1;
             aDestEnd.SetRow( rDestPos.Row() + nPastedCount - 1 );
@@ -1801,7 +1809,7 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow ,
         SCTAB nTab = GetViewData()->GetTabNo();
         SCTAB nStartTab = nTab;
         SCTAB nEndTab = nTab;
-        
+
         {
                 ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
                 if ( pChangeTrack )
@@ -1824,7 +1832,7 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow ,
         pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab , nEndCol, nEndRow, nEndTab ); // content before the change
         //rMark.SetMarkArea( aUserRange );
         pDoc->BeginDrawUndo();
-        
+
         for(sal_uInt16 i = 0; i < aColLength; i++)
         {
             if (pEdits[i])
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index e37e9d44b..54bca7592 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -79,6 +79,7 @@
 
 #include "asciiopt.hxx"
 #include "scabstdlg.hxx"
+#include "clipparam.hxx"
 #include <vcl/msgbox.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/dbaexchange.hxx>
@@ -163,12 +164,12 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
                     if ( pSrcDoc->GetDataStart( nSrcTab, nFirstCol, nFirstRow ) )
                         pSrcDoc->GetCellArea( nSrcTab, nLastCol, nLastRow );
                     else
-                        {
+                    {
                         nFirstCol = nLastCol = 0;
                         nFirstRow = nLastRow = 0;
-                        }
-                    pSrcDoc->CopyToClip( nFirstCol, nFirstRow, nLastCol, nLastRow,
-                                            FALSE, pClipDoc, FALSE, &aSrcMark );
+                    }
+                    ScClipParam aClipParam(ScRange(nFirstCol, nFirstRow, 0, nLastCol, nLastRow, 0), false);
+                    pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aSrcMark);
                     ScGlobal::SetClipDocName( xDocShRef->GetTitle( SFX_TITLE_FULLNAME ) );
 
                     SetCursor( nPosX, nPosY );
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 1eaf4bbef..96132fcbe 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1910,7 +1910,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
 
 void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
 {
-	GetViewData()->SetPasteMode( SC_PASTE_NONE );
+    GetViewData()->SetPasteMode( SC_PASTE_NONE );
     // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
     BOOL bOnlyNotBecauseOfMatrix;
     BOOL bEditable = SelectionEditable( &bOnlyNotBecauseOfMatrix );
@@ -2215,28 +2215,19 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
                         {
                             //	fuer alle eingeblendeten CR_MANUALSIZE loeschen,
                             //	dann SetOptimalHeight mit bShrink = FALSE
-                            ScCompressedArrayIterator< SCROW, BYTE> aIter(
-                                    pDoc->GetRowFlagsArray( nTab), nStartNo,
-                                    nEndNo);
-                            do
+                            for (SCROW nRow = nStartNo; nRow <= nEndNo; ++nRow)
                             {
-                                BYTE nOld = *aIter;
-                                if ( (nOld & CR_HIDDEN) == 0 && ( nOld & CR_MANUALSIZE ) )
+                                SCROW nLastRow = nRow;
+                                if (pDoc->RowHidden(nRow, nTab, NULL, &nLastRow))
                                 {
-                                    SCROW nRangeEnd = aIter.GetRangeEnd();
-                                    pDoc->SetRowFlags( aIter.GetRangeStart(),
-                                            nRangeEnd, nTab,
-                                            nOld & ~CR_MANUALSIZE);
-                                    aIter.Resync( nRangeEnd);
-                                    // Range may be extended due to merges and
-                                    // now aIter.GetRangeEnd() may point behind
-                                    // the previous row, but all flags of this
-                                    // range have the CR_MANUALSIZE bit
-                                    // removed, so it is safe to continue with
-                                    // the next range, not necessary to catch
-                                    // up with the remaining rows.
+                                    nRow = nLastRow;
+                                    continue;
                                 }
-                            } while (aIter.NextRange());
+
+                                BYTE nOld = pDoc->GetRowFlags(nRow, nTab);
+                                if (nOld & CR_MANUALSIZE)
+                                    pDoc->SetRowFlags(nRow, nTab, nOld & ~CR_MANUALSIZE);
+                            }
                         }
 
                         double nPPTX = GetViewData()->GetPPTX();
@@ -2278,8 +2269,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
                 {
                     for (SCCOL nCol=static_cast<SCCOL>(nStartNo); nCol<=static_cast<SCCOL>(nEndNo); nCol++)
                     {
-                        if ( eMode != SC_SIZE_VISOPT ||
-                             (pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN) == 0 )
+						if ( eMode != SC_SIZE_VISOPT || !pDoc->ColHidden(nCol, nTab) )
                         {
                             USHORT nThisSize = nSizeTwips;
 
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 964695cb6..4215562e8 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -264,20 +264,19 @@ void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc )
     for (SCTAB nTab=0; nTab<nTabCount; nTab++)
         if ( rMark.GetTableSelect(nTab ) )
         {
-            ScCompressedArrayIterator<SCROW, BYTE> aIter(pDoc->GetRowFlagsArray(nTab), nStartRow, nEndRow);
-            do
+            for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
             {
-                if (*aIter & CR_FILTERED)
+                SCROW nLastRow = nRow;
+                if (pDoc->RowFiltered(nRow, nTab, NULL, &nLastRow))
                 {
                     // use nStartCol/nEndCol, so the multi mark area isn't extended to all columns
                     // (visible in repaint for indentation)
-
-                    rMark.SetMultiMarkArea( ScRange( nStartCol, aIter.GetRangeStart(), nTab,
-                                                     nEndCol, aIter.GetRangeEnd(), nTab ), FALSE );
+                    rMark.SetMultiMarkArea(
+                        ScRange(nStartCol, nRow, nTab, nEndCol, nLastRow, nTab), false);
                     bChanged = true;
+                    nRow = nLastRow;
                 }
             }
-            while (aIter.NextRange());
         }
 
     if ( bChanged && !rMark.HasAnyMultiMarks() )
@@ -288,13 +287,19 @@ void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc )
 
 
 // static
-bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, const ScDocument * pDoc, size_t nRows )
+bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, ScDocument * pDoc, size_t nRows )
 {
     SCTAB nTab = rRange.aStart.Tab();
     bool bOneTabOnly = (nTab == rRange.aEnd.Tab());
     // Always fit the range on its first sheet.
     DBG_ASSERT( bOneTabOnly, "ScViewUtil::ExtendToUnfilteredRows: works only on one sheet");
     SCROW nStartRow = rRange.aStart.Row();
+#if 1
+    SCROW nLastRow = pDoc->LastNonFilteredRow(nStartRow, MAXROW, nTab);
+    if (ValidRow(nLastRow))
+        rRange.aEnd.SetRow(nLastRow);
+    SCROW nCount = pDoc->CountNonFilteredRows(nStartRow, MAXROW, nTab);
+#else
     // FillArrayForCondition() usually is the fastest to determine such a set
     // in one pass, even if the array isn't used but the last element.
     SCROW* pArr = new SCROW[nRows];
@@ -303,19 +308,19 @@ bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, const ScDocument * pDoc,
     if (nCount)
         rRange.aEnd.SetRow( pArr[nCount-1]);
     delete [] pArr;
+#endif
     return nCount == nRows && bOneTabOnly;
 }
 
 
 // static
-bool ScViewUtil::HasFiltered( const ScRange& rRange, const ScDocument* pDoc )
+bool ScViewUtil::HasFiltered( const ScRange& rRange, ScDocument* pDoc )
 {
     SCROW nStartRow = rRange.aStart.Row();
     SCROW nEndRow = rRange.aEnd.Row();
     for (SCTAB nTab=rRange.aStart.Tab(); nTab<=rRange.aEnd.Tab(); nTab++)
     {
-        if ( pDoc->GetRowFlagsArray( nTab).HasCondition( nStartRow, nEndRow,
-                CR_FILTERED, CR_FILTERED ) )
+        if (pDoc->HasFilteredRows(nStartRow, nEndRow, nTab))
             return true;
     }
 
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 6bce4b657..54d2c6b1d 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -214,6 +214,8 @@
                     <menu:menuitem menu:id=".uno:Hide"/>
                     <menu:menuitem menu:id=".uno:Show"/>
                     <menu:menuitem menu:id=".uno:SheetRightToLeft"/>
+                    <menu:menuseparator/>
+                    <menu:menuitem menu:id=".uno:SetTabBgColor"/>
                 </menu:menupopup>
             </menu:menu>
             <menu:menu menu:id=".uno:MergeCellsMenu">
diff --git a/sc/util/hidother.src b/sc/util/hidother.src
index 041a1bd4c..8d21ed135 100644
--- a/sc/util/hidother.src
+++ b/sc/util/hidother.src
@@ -392,7 +392,6 @@ hidspecial HID_FUNC_NUMBERVALUE     { HelpID = HID_FUNC_NUMBERVALUE; };
 hidspecial HID_FUNC_GAMMA           { HelpID = HID_FUNC_GAMMA; };
 hidspecial HID_FUNC_CHISQDIST       { HelpID = HID_FUNC_CHISQDIST; };
 hidspecial HID_FUNC_CHISQINV        { HelpID = HID_FUNC_CHISQINV; };
-hidspecial HID_FUNC_PHONETIC        { HelpID = HID_FUNC_PHONETIC; };
 
 // ... and from Analysis Addin
 
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index 459732851..179b9bb27 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -102,7 +102,6 @@ SHL1STDLIBS=       \
     $(UNOTOOLSLIB) \
     $(SOTLIB)		\
     $(XMLOFFLIB)	\
-    $(DBTOOLSLIB)	\
     $(AVMEDIALIB) \
     $(FORLIB) \
     $(FORUILIB)
@@ -262,6 +261,7 @@ LIB8OBJFILES = \
         $(SLO)$/attrdlg.obj	\
         $(SLO)$/scuiimoptdlg.obj	\
         $(SLO)$/strindlg.obj		\
+        $(SLO)$/tabbgcolordlg.obj   \
         $(SLO)$/shtabdlg.obj		\
         $(SLO)$/scendlg.obj		\
         $(SLO)$/pvfundlg.obj	\
@@ -284,7 +284,7 @@ LIB8OBJFILES = \
         $(SLO)$/dapidata.obj	\
         $(SLO)$/crdlg.obj			\
         $(SLO)$/scuiasciiopt.obj	\
-		$(SLO)$/langchooser.obj	\
+		$(SLO)$/textimportoptions.obj	\
         $(SLO)$/scuiautofmt.obj	\
         $(SLO)$/dpgroupdlg.obj	\
         $(SLO)$/editfield.obj
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 5374e7b87..2eb47d6c0 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -452,7 +452,7 @@ File gid_File_Lib_Vbahelper
     TXT_FILE_BODY;
     Styles = (PACKED);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX));
   #else
@@ -738,6 +738,21 @@ File gid_File_Lib_Cairo
   #endif
 End
 
+File gid_File_Lib_Pixman
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+  #ifdef UNX
+    #ifdef MACOSX
+       Name = STRING(CONCAT3(libpixman-1,.0,UNXSUFFIX));
+    #else
+       Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
+    #endif
+  #elif defined(WNT)
+    Name = "libpixman-1-0.dll";
+  #endif
+End
+
 #endif
 
 STD_UNO_LIB_FILE( gid_File_Lib_Frm , frm)
@@ -1081,7 +1096,7 @@ File gid_File_Lib_Mozbootstrap
   #ifdef UNX
     Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
   #else
-    Name = "libmozbootstrap.dll";
+    Name = "mozbootstrap.dll";
   #endif
 End
 
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index 950c688e4..4d0eb5014 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -86,7 +86,7 @@ namespace dlgprov
 
 	rtl::OUString msDialogLibName;
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModel( const ::rtl::OUString& sURL );
-     
+
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > createDialogControl( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxDialogModel,
             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent );
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index f85ac51c5..6928530e9 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -26,6 +26,10 @@
 #include <com/sun/star/awt/XDialog.hpp>
 #include <com/sun/star/awt/KeyEvent.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
+#include <com/sun/star/awt/XFixedText.hpp> //liuchen 2009-6-5
+#include <com/sun/star/awt/XTextComponent.hpp> //liuchen 2009-6-5
+#include <com/sun/star/awt/XComboBox.hpp> //liuchen 2009-6-18
+#include <com/sun/star/awt/XRadioButton.hpp> //liuchen 2009-7-30
 
 #include <msforms/ReturnInteger.hpp>
 
@@ -63,6 +67,8 @@ using namespace ::com::sun::star::script;
 using namespace ::com::sun::star::uno;
 using namespace ::ooo::vba;
 
+#define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x))//liuchen 2009-6-8
+#define GET_TYPE(x) ::getCppuType((uno::Reference< x > *)0);
 
 // Some constants 
 const static rtl::OUString DELIM = rtl::OUString::createFromAscii( "::" );
@@ -227,10 +233,14 @@ Sequence< Any > ooKeyPressedToVBAKeyUpDown( const Sequence< Any >& params )
 
 typedef Sequence< Any > (*Translator)(const Sequence< Any >&);
 
+//liuchen 2009-6-23
+//expand the "TranslateInfo" struct to support more kinds of events 
 struct TranslateInfo
 {
-    rtl::OUString sVBAName;
-    Translator toVBA;
+    rtl::OUString sVBAName; //vba event name
+    Translator toVBA;       //the method to convert OO event parameters to VBA event parameters	
+	bool (*ApproveRule)(const ScriptEvent& evt, void* pPara); //this method is used to determine which types of controls should execute the event 
+	void *pPara;			//Parameters for the above approve method
 };
 
 
@@ -239,104 +249,116 @@ std::list< TranslateInfo >,
 ::rtl::OUStringHash,
 ::std::equal_to< ::rtl::OUString > > EventInfoHash;
 
+//liuchen 2009-6-23
+struct TranslatePropMap
+{
+	rtl::OUString sEventInfo;   //OO event name
+	TranslateInfo aTransInfo;   
+};
+
+bool ApproveAll(const ScriptEvent& evt, void* pPara); //allow all types of controls to execute the event
+bool ApproveType(const ScriptEvent& evt, void* pPara); //certain types of controls should execute the event, those types are given by pPara
+bool DenyType(const ScriptEvent& evt, void* pPara);    //certain types of controls should not execute the event, those types are given by pPara
+bool DenyMouseDrag(const ScriptEvent& evt, void* pPara); //used for VBA MouseMove event when "Shift" key is pressed
+
+struct TypeList
+{
+	uno::Type* pTypeList;
+	int nListLength;
+};
+
+Type typeXFixedText = GET_TYPE(awt::XFixedText);
+Type typeXTextComponent = GET_TYPE(awt::XTextComponent);
+Type typeXComboBox = GET_TYPE(awt::XComboBox);
+Type typeXRadioButton = GET_TYPE(awt::XRadioButton);
+
+
+TypeList fixedTextList = {&typeXFixedText, 1};
+TypeList textCompList = {&typeXTextComponent, 1};
+TypeList radioButtonList = {&typeXRadioButton, 1};
+TypeList comboBoxList = {&typeXComboBox, 1};
+
+//this array stores the OO event to VBA event translation info
+static TranslatePropMap aTranslatePropMap_Impl[] = 
+{
+	// actionPerformed ooo event
+	{ MAP_CHAR_LEN("actionPerformed"), { MAP_CHAR_LEN("_Click"), NULL, ApproveAll, NULL } },	
+	{ MAP_CHAR_LEN("actionPerformed"), { MAP_CHAR_LEN("_Change"), NULL, DenyType, (void*)(&radioButtonList) } },  //liuchen 2009-7-30, OptionalButton_Change event is not the same as OptionalButton_Click event
+
+	// itemStateChanged ooo event
+	{ MAP_CHAR_LEN("itemStateChanged"), { MAP_CHAR_LEN("_Click"), NULL, ApproveType, (void*)(&comboBoxList) } },  //liuchen, add to support VBA ComboBox_Click event
+	{ MAP_CHAR_LEN("itemStateChanged"), { MAP_CHAR_LEN("_Change"), NULL, ApproveType, (void*)(&radioButtonList) } }, //liuchen 2009-7-30, OptionalButton_Change event should be triggered when the button state is changed
+	
+	// changed ooo event
+	{ MAP_CHAR_LEN("changed"), { MAP_CHAR_LEN("_Change"), NULL, ApproveAll, NULL } },	
+
+	// focusGained ooo event
+	{ MAP_CHAR_LEN("focusGained"), { MAP_CHAR_LEN("_GotFocus"), NULL, ApproveAll, NULL } },
+
+	// focusLost ooo event
+	{ MAP_CHAR_LEN("focusLost"), { MAP_CHAR_LEN("_LostFocus"), NULL, ApproveAll, NULL } },
+	{ MAP_CHAR_LEN("focusLost"), { MAP_CHAR_LEN("_Exit"), NULL, ApproveType, (void*)(&textCompList) } }, //liuchen, add to support VBA TextBox_Exit event
+
+	// adjustmentValueChanged ooo event
+	{ MAP_CHAR_LEN("adjustmentValueChanged"), { MAP_CHAR_LEN("_Scroll"), NULL, ApproveAll, NULL } },
+	{ MAP_CHAR_LEN("adjustmentValueChanged"), { MAP_CHAR_LEN("_Change"), NULL, ApproveAll, NULL } },
+
+	// textChanged ooo event
+	{ MAP_CHAR_LEN("textChanged"), { MAP_CHAR_LEN("_Change"), NULL, ApproveAll, NULL } },
+
+	// keyReleased ooo event
+	{ MAP_CHAR_LEN("keyReleased"), { MAP_CHAR_LEN("_KeyUp"), ooKeyPressedToVBAKeyUpDown, ApproveAll, NULL } },
+
+	// mouseReleased ooo event
+	{ MAP_CHAR_LEN("mouseReleased"), { MAP_CHAR_LEN("_Click"), ooMouseEvtToVBAMouseEvt, ApproveType, (void*)(&fixedTextList) } }, //liuchen, add to support VBA Label_Click event
+	{ MAP_CHAR_LEN("mouseReleased"), { MAP_CHAR_LEN("_MouseUp"), ooMouseEvtToVBAMouseEvt, ApproveAll, NULL } },
+
+	// mousePressed ooo event
+	{ MAP_CHAR_LEN("mousePressed"), { MAP_CHAR_LEN("_MouseDown"), ooMouseEvtToVBAMouseEvt, ApproveAll, NULL } },
+	{ MAP_CHAR_LEN("mousePressed"), { MAP_CHAR_LEN("_DblClick"), ooMouseEvtToVBADblClick, ApproveAll, NULL } },
+
+	// mouseMoved ooo event	
+	{ MAP_CHAR_LEN("mouseMoved"), { MAP_CHAR_LEN("_MouseMove"), ooMouseEvtToVBAMouseEvt, ApproveAll, NULL } },
+	{ MAP_CHAR_LEN("mouseDragged"), { MAP_CHAR_LEN("_MouseMove"), ooMouseEvtToVBAMouseEvt, DenyMouseDrag, NULL } }, //liuchen, add to support VBA MouseMove event when the "Shift" key is pressed
+
+	// keyPressed ooo event
+	{ MAP_CHAR_LEN("keyPressed"), { MAP_CHAR_LEN("_KeyDown"), ooKeyPressedToVBAKeyUpDown, ApproveAll, NULL } },
+	{ MAP_CHAR_LEN("keyPressed"), { MAP_CHAR_LEN("_KeyPress"), ooKeyPressedToVBAKeyUpDown, ApproveAll, NULL } }
+};
 
 EventInfoHash& getEventTransInfo()
 {
     static bool initialised = false;
     static EventInfoHash eventTransInfo;
     if ( !initialised )
-    {
-        TranslateInfo  info;
-        // actionPerformed ooo event
-        std::list< TranslateInfo > actionInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_Click");
-        info.toVBA = NULL;
-        actionInfos.push_back( info );
-        info.sVBAName = rtl::OUString::createFromAscii("_Change");
-        info.toVBA = NULL;
-        actionInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("actionPerformed") ] = actionInfos;
-        // itemStateChanged ooo event
-        std::list< TranslateInfo > stateChangedInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_Change");
-        info.toVBA = NULL;
-        stateChangedInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("itemStateChanged") ] = stateChangedInfos;
-        // changed ooo event
-        std::list< TranslateInfo > changeInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_Change");
-        info.toVBA = NULL;
-        changeInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("changed") ] = changeInfos;
-        // focusGained ooo event
-        std::list< TranslateInfo > focusGainedInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_GotFocus");
-        info.toVBA = NULL;
-        focusGainedInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("focusGained") ] = focusGainedInfos;
-        // focusLost ooo event
-        std::list< TranslateInfo > focusLostInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_LostFocus");
-        info.toVBA = NULL;
-        focusLostInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("focusGained") ] = focusLostInfos;
-        // adjustmentValueChanged ooo event
-        std::list< TranslateInfo > adjustInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_Scroll");
-        info.toVBA = NULL;
-        adjustInfos.push_back( info );
-        info.sVBAName = rtl::OUString::createFromAscii("_Change");
-        info.toVBA = NULL;
-        adjustInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("adjustmentValueChanged") ] = adjustInfos;
-        // textChanged ooo event
-        std::list< TranslateInfo > txtChangedInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_Change");
-        info.toVBA = NULL;
-        txtChangedInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("textChanged") ] = txtChangedInfos;
-
-        // keyReleased ooo event
-        std::list< TranslateInfo > keyReleasedInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_KeyUp");
-        info.toVBA = ooKeyPressedToVBAKeyUpDown;
-        keyReleasedInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("keyReleased") ] = keyReleasedInfos;
-        // mouseReleased ooo event
-        std::list< TranslateInfo > mouseReleasedInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_MouseUp");
-        info.toVBA = ooMouseEvtToVBAMouseEvt;
-        mouseReleasedInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("mouseReleased") ] = mouseReleasedInfos;
-        // mousePressed ooo event
-        std::list< TranslateInfo > mousePressedInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_MouseDown");
-        info.toVBA = ooMouseEvtToVBAMouseEvt;
-        mousePressedInfos.push_back( info );
-        info.sVBAName = rtl::OUString::createFromAscii("_DblClick");
-        // emulate double click event
-        info.toVBA = ooMouseEvtToVBADblClick;
-        mousePressedInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("mousePressed") ] = mousePressedInfos;
-        // mouseMoved ooo event
-        std::list< TranslateInfo > mouseMovedInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_MouseMove");
-        info.toVBA = ooMouseEvtToVBAMouseEvt;
-        mouseMovedInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("mouseMoved") ] = mouseMovedInfos;
-        // keyPressed ooo event
-        std::list< TranslateInfo > keyPressedInfos;
-        info.sVBAName = rtl::OUString::createFromAscii("_KeyDown");
-        info.toVBA = ooKeyPressedToVBAKeyUpDown;
-        keyPressedInfos.push_back( info );
-        info.sVBAName = rtl::OUString::createFromAscii("_KeyPress");
-        info.toVBA = ooKeyPressedToVBAKeyPressed;
-        keyPressedInfos.push_back( info );
-        eventTransInfo[ rtl::OUString::createFromAscii("keyPressed") ] = keyPressedInfos;
+    {		
+		rtl::OUString sEventInfo = MAP_CHAR_LEN("");
+		TranslatePropMap* pTransProp = aTranslatePropMap_Impl;
+
+		int nCount = sizeof(aTranslatePropMap_Impl) / sizeof(aTranslatePropMap_Impl[0]);
+
+		int i = 0;
+		while (i < nCount)
+		{			
+			if (sEventInfo != pTransProp->sEventInfo)
+			{
+				sEventInfo = pTransProp->sEventInfo;
+				std::list< TranslateInfo > infoList;
+				do
+				{									
+					infoList.push_back( pTransProp->aTransInfo );
+                                        i++;
+					pTransProp++;
+				}
+				while( ( i < nCount ) && ( sEventInfo == pTransProp->sEventInfo ) );
+				eventTransInfo[sEventInfo] = infoList;
+			}
+		}		
         initialised = true;
     }
     return eventTransInfo;
 }
+//liuchen 2009-6-23 end
 
 // Helper class
 
@@ -764,7 +786,68 @@ EventListener::getPropertySetInfo(  ) throw (RuntimeException)
     return xInfo;
 }
 
+//liuchen 2009-6-23
+//decide if the control should execute the event
+bool ApproveAll(const ScriptEvent& evt, void* pPara)
+{
+	return true;
+}
+
+//for the given control type in evt.Arguments[0], look for if it appears in the type list in pPara
+bool FindControl(const ScriptEvent& evt, void* pPara)
+{
+	lang::EventObject aEvent;
+	evt.Arguments[ 0 ] >>= aEvent;
+	uno::Reference< uno::XInterface > xInterface( aEvent.Source, uno::UNO_QUERY );
+
+	TypeList* pTypeListInfo = static_cast<TypeList*>(pPara);
+	Type* pType = pTypeListInfo->pTypeList;
+	int nLen = pTypeListInfo->nListLength;
+
+	for (int i = 0; i < nLen; i++)
+	{
+		if ( xInterface->queryInterface( *pType ).hasValue() )
+		{
+			return true;
+		}
+		pType++;
+	}
+
+	return false;
+}
+
+//if the the given control type in evt.Arguments[0] appears in the type list in pPara, then approve the execution
+bool ApproveType(const ScriptEvent& evt, void* pPara)
+{
+	return FindControl(evt, pPara);
+}
+
+//if the the given control type in evt.Arguments[0] appears in the type list in pPara, then deny the execution
+bool DenyType(const ScriptEvent& evt, void* pPara)
+{
+	return !FindControl(evt, pPara);
+}
+
+//when mouse is moving, either the mouse button is pressed or some key is pressed can trigger the OO mouseDragged event,
+//the former should be denyed, and the latter allowed, only by doing so can the VBA MouseMove event when the "Shift" key is 
+//pressed can be correctly triggered
+bool DenyMouseDrag(const ScriptEvent& evt, void* pPara)
+{
+	awt::MouseEvent aEvent;
+	evt.Arguments[ 0 ] >>= aEvent;
+	if (aEvent.Buttons == 0 )
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+
 
+//liuchen 2009-6-23
 // EventListener
 
 void
@@ -850,6 +933,12 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
             ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve ); 
             if ( aMacroResolvedInfo.IsResolved() )
             {
+				//liuchen 2009-6-8
+				if (! txInfo->ApproveRule(evt, txInfo->pPara) )
+				{
+					continue;
+				}
+				//liuchen 2009-6-8
                 // !! translate arguments & emulate events where necessary 
                 Sequence< Any > aArguments;
                 if  ( (*txInfo).toVBA )
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index 395c31103..9ba6cc036 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -92,9 +92,10 @@ public:
     */
     static const EventId EID_PANE_MANAGER_DYING     = 0x00000100;
 
-    /** The edit mode of the ViewShell in the center pane has been modified.
+    /** Edit mode was (or is being) switched to normal mode.  Find
+        EID_EDIT_MODE_MASTER below.
     */
-    static const EventId EID_EDIT_MODE              = 0x00000200;
+    static const EventId EID_EDIT_MODE_NORMAL       = 0x00000200;
 
     /** One or more pages have been inserted into or deleted from the model.
     */
@@ -134,6 +135,10 @@ public:
     */
     static const EventId EID_CONFIGURATION_UPDATED  = 0x00040000;
 
+    /** Edit mode was (or is being) switched to master mode.
+    */
+    static const EventId EID_EDIT_MODE_MASTER       = 0x00080000;
+
     const ViewShellBase& mrBase;
     EventId meEventId;
     const void* mpUserData;
diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx
index 0cb0a7e42..b5271e85c 100644
--- a/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -92,6 +92,7 @@ public:
     virtual void Paint (const Rectangle& rBoundingBox);
     virtual bool Expand (bool bFlag = true);
     virtual bool IsExpanded (void) const;
+    virtual void SetEnabledState(bool bFlag);
 
     void SetFocus (bool bFlag);
 
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx
index b9da6a971..8103c18ea 100644
--- a/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -135,6 +135,8 @@ public:
     */
     virtual bool IsExpandable (void) const;
 
+    virtual void SetEnabledState(bool bFlag);
+
     /** Ownership of the given data remains with the caller.  The data
         is thus not destroyed when the destructor of this class is
         called.
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 8338af084..7b479e102 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -63,6 +63,7 @@
 #include <vcl/image.hxx>
 #include <svtools/languageoptions.hxx>
 #include <sfx2/app.hxx>
+#include "taskpane/TitledControl.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <comphelper/processfactory.hxx>
@@ -259,7 +260,9 @@ LayoutMenu::LayoutMenu (
         | ::sd::tools::EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION
         | ::sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
         | ::sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
-        | ::sd::tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED);
+        | ::sd::tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED
+        | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL
+        | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER);
 
     SetSmartHelpId(SmartId(HID_SD_TASK_PANE_PREVIEW_LAYOUTS));
     SetAccessibleName(SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE));
@@ -418,6 +421,74 @@ bool LayoutMenu::IsResizable (void)
 
 
 
+void LayoutMenu::UpdateEnabledState (const MasterMode eMode)
+{
+    bool bIsEnabled (false);
+
+    ::boost::shared_ptr<ViewShell> pMainViewShell (mrBase.GetMainViewShell());
+    if (pMainViewShell)
+    {
+        switch (pMainViewShell->GetShellType())
+        {
+            case ViewShell::ST_NONE:
+            case ViewShell::ST_OUTLINE:
+            case ViewShell::ST_PRESENTATION:
+            case ViewShell::ST_TASK_PANE:
+                // The complete task pane is disabled for these values or
+                // not even visible.  Disabling the LayoutMenu would be
+                // logical but unnecessary.  The main disadvantage is that
+                // after re-enabling it (typically) another panel is
+                // expanded.
+                bIsEnabled = true;
+                break;
+                
+            case ViewShell::ST_DRAW:
+            case ViewShell::ST_IMPRESS:
+            {
+                switch (eMode)
+                {
+                    case MM_UNKNOWN:
+                    {
+                        ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
+                            ::boost::dynamic_pointer_cast<DrawViewShell>(pMainViewShell));
+                        if (pDrawViewShell)
+                            bIsEnabled = pDrawViewShell->GetEditMode() != EM_MASTERPAGE;
+                        break;
+                    }
+                    case MM_NORMAL:
+                        bIsEnabled = true;
+                        break;
+
+                    case MM_MASTER:
+                        bIsEnabled = false;
+                        break;
+                }
+                break;
+            }
+
+            case ViewShell::ST_HANDOUT:
+            case ViewShell::ST_NOTES:
+            case ViewShell::ST_SLIDE_SORTER:
+            default:
+                bIsEnabled = true;
+                break;
+        }
+
+        TreeNode* pParentNode = GetParentNode();
+        if (pParentNode != NULL)
+        {
+            TitledControl* pGrandParentNode
+                = dynamic_cast<TitledControl*>(pParentNode->GetParentNode());
+            if (pGrandParentNode != NULL)
+                pGrandParentNode->SetEnabledState(bIsEnabled);
+        }
+
+    }
+}
+
+
+
+
 ::Window* LayoutMenu::GetWindow (void)
 {
     return this;
@@ -907,12 +978,14 @@ void LayoutMenu::UpdateSelection (void)
         // Find the entry of the menu for to the layout.
         USHORT nItemCount (GetItemCount());
         for (USHORT nId=1; nId<=nItemCount; nId++)
+        {
             if (*static_cast<AutoLayout*>(GetItemData(nId)) == aLayout)
             {
                 SelectItem(nId);
                 bItemSelected = true;
                 break;
             }
+        }
     }
     while (false);
 
@@ -935,6 +1008,7 @@ IMPL_LINK(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEve
 
         case ::sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
             mbIsMainViewChangePending = true;
+            UpdateEnabledState(MM_UNKNOWN);
             break;
 
         case ::sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
@@ -949,6 +1023,14 @@ IMPL_LINK(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEve
             }
             break;
 
+        case ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL:
+            UpdateEnabledState(MM_NORMAL);
+            break;
+
+        case ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER:
+            UpdateEnabledState(MM_MASTER);
+            break;
+
         default:
             /* Ignored */
             break;
diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx
index aad1dd05f..f866ce46b 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.hxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.hxx
@@ -131,6 +131,18 @@ public:
     void Execute (SfxRequest& rRequest);
     void GetState (SfxItemSet& rItemSet);
 
+    /** The LayoutMenu does not support some main views.  In this case the
+        LayoutMenu is disabled.  This state is updated in this method.
+        @param eMode
+            On some occasions the edit mode is being switched when this
+            method is called can not (yet) be reliably detected.  Luckily,
+            in these cases the new value is provided by some broadcaster.
+            On other occasions the edit mode is not modified and is also not
+            provided.  Therefore the Unknown value.
+    */
+    enum MasterMode { MM_NORMAL, MM_MASTER, MM_UNKNOWN };
+    void UpdateEnabledState (const MasterMode eMode);
+
     /** Call this method when the set of displayed layouts is not up-to-date
         anymore.  It will re-assemple this set according to the current
         settings.
diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index f401371f5..85c8d0ee7 100644
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -216,6 +216,14 @@ bool TitleBar::IsExpanded (void) const
 }
 
 
+void TitleBar::SetEnabledState(bool bFlag)
+{
+    if(bFlag)
+        Enable();
+    else
+        Disable();
+    Invalidate ();
+}
 
 
 void TitleBar::SetFocus (bool bFlag)
@@ -454,15 +462,21 @@ void TitleBar::PaintText (const Rectangle& rTextBox)
 
 USHORT TitleBar::GetTextStyle (void)
 {
-    return TEXT_DRAW_LEFT 
-        | TEXT_DRAW_TOP
-        | TEXT_DRAW_MULTILINE 
-        | TEXT_DRAW_WORDBREAK;
+     if(IsEnabled())
+     {
+         return TEXT_DRAW_LEFT 
+             | TEXT_DRAW_TOP
+             | TEXT_DRAW_MULTILINE 
+             | TEXT_DRAW_WORDBREAK;
+     }
+     else
+     {
+         return TEXT_DRAW_DISABLE;
+     }
 }
 
 
 
-
 void TitleBar::PaintBackground (const Rectangle& rTitleBarBox)
 {
     // Fill a slightly rounded rectangle.
diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx
index f0280967d..ccd85fc72 100644
--- a/sd/source/ui/toolpanel/TitledControl.cxx
+++ b/sd/source/ui/toolpanel/TitledControl.cxx
@@ -292,7 +292,7 @@ bool TitledControl::Expand (bool bExpanded)
 {
     bool bExpansionStateChanged (false);
 
-    if (IsExpandable())
+    if (IsExpandable() && IsEnabled())
     {
         if (GetTitleBar()->IsExpanded() != bExpanded)
             bExpansionStateChanged |= GetTitleBar()->Expand (bExpanded);
@@ -338,6 +338,27 @@ bool TitledControl::IsExpanded (void) const
         return false;
 }
 
+void TitledControl::SetEnabledState(bool bFlag) 
+{
+    if (!bFlag)
+    {
+        GetParentNode()->GetControlContainer().SetExpansionState (
+            this,
+            ControlContainer::ES_COLLAPSE);
+        Disable();
+    }
+    else 
+    {
+/*    
+        GetParentNode()->GetControlContainer().SetExpansionState (
+            this,
+            ControlContainer::ES_EXPAND);
+*/		   
+        Enable();
+    }
+
+    GetTitleBar()->SetEnabledState(bFlag);
+}
 
 
 
@@ -406,7 +427,8 @@ IMPL_LINK(TitledControl, WindowEventListener,
         switch (pWindowEvent->GetId())
         {
             case VCLEVENT_WINDOW_MOUSEBUTTONUP:
-                (*mpClickHandler)(*this);
+                if (IsEnabled())
+                    (*mpClickHandler)(*this);
                 break;
         }
     }
diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
index 3200e3c63..1389e62a3 100644
--- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
@@ -74,7 +74,8 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector (
     Link aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
     rBase.GetEventMultiplexer()->AddEventListener(aLink,
         sd::tools::EventMultiplexerEvent::EID_CURRENT_PAGE
-        | sd::tools::EventMultiplexerEvent::EID_EDIT_MODE
+        | sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL
+        | sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER
         | sd::tools::EventMultiplexerEvent::EID_PAGE_ORDER
         | sd::tools::EventMultiplexerEvent::EID_SHAPE_CHANGED
         | sd::tools::EventMultiplexerEvent::EID_SHAPE_INSERTED
@@ -282,7 +283,8 @@ IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener,
         switch (pEvent->meEventId)
         {
             case sd::tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
-            case sd::tools::EventMultiplexerEvent::EID_EDIT_MODE:
+            case sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL:
+            case sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER:
             case sd::tools::EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION:
                 UpdateSelection();
                 break;
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 287ac9aee..54b47f67b 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -570,7 +570,12 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange (
     }
     else if (rEvent.PropertyName.equals(msEditModePropertyName))
     {
-        CallListeners(EventMultiplexerEvent::EID_EDIT_MODE);
+        bool bIsMasterPageMode (false);
+        rEvent.NewValue >>= bIsMasterPageMode;
+        if (bIsMasterPageMode)
+            CallListeners(EventMultiplexerEvent::EID_EDIT_MODE_MASTER);
+        else
+            CallListeners(EventMultiplexerEvent::EID_EDIT_MODE_NORMAL);
     }
 }
 
@@ -783,8 +788,9 @@ void EventMultiplexer::Implementation::CallListeners (
 
 void EventMultiplexer::Implementation::CallListeners (EventMultiplexerEvent& rEvent)
 {
-    ListenerList::const_iterator iListener (maListeners.begin());
-    ListenerList::const_iterator iListenerEnd (maListeners.end());
+    ListenerList aCopyListeners( maListeners );
+    ListenerList::iterator iListener (aCopyListeners.begin());
+    ListenerList::const_iterator iListenerEnd (aCopyListeners.end());
     for (; iListener!=iListenerEnd; ++iListener)
     {
         if ((iListener->second && rEvent.meEventId) != 0)
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index fd4557758..d30ba6898 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -194,10 +194,8 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
                             setPropertyValue( aPropertyName, *pAny );
                     }
                 }
-                    else
-                        setPropertyValue( aIt->sName, *pAny );
-            }
                 ++aIt;
+            }
         }
     }
 
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index fe87a1cda..49a9f3640 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -173,8 +173,10 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest& rReq )
                     aStr.Append( String( SdResId( STR_UNDO_GRAFFILTER ) ) );
                     mpView->BegUndo( aStr );
                     pFilteredObj->SetGraphicObject( aFilterObj );
-                    mpView->ReplaceObjectAtView( pObj, *pPageView, pFilteredObj );
-                    mpView->EndUndo();
+                    ::sd::View* const pView = mpView;
+                    pView->ReplaceObjectAtView( pObj, *pPageView, pFilteredObj );
+                    pView->EndUndo();
+                    return;
                 }
             }
         }
diff --git a/sd/source/ui/view/PrintManager.cxx b/sd/source/ui/view/PrintManager.cxx
index 17beaf7f7..a0ec7e1c2 100644
--- a/sd/source/ui/view/PrintManager.cxx
+++ b/sd/source/ui/view/PrintManager.cxx
@@ -368,12 +368,12 @@ USHORT  PrintManager::Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* p
 
             if( pPrintOpts->GetOptionsPrint().IsDate() )
             {
-                aTimeDateStr += GetSdrGlobalData().pLocaleData->getDate( Date() );
+                aTimeDateStr += GetSdrGlobalData().GetLocaleData()->getDate( Date() );
                 aTimeDateStr += (sal_Unicode)' ';
             }
 
             if( pPrintOpts->GetOptionsPrint().IsTime() )
-                aTimeDateStr += GetSdrGlobalData().pLocaleData->getTime( Time(), FALSE, FALSE );
+                aTimeDateStr += GetSdrGlobalData().GetLocaleData()->getTime( Time(), FALSE, FALSE );
 
             if( pPrintOpts->GetOptionsPrint().IsOutline() )
                 bPrintOutline = TRUE;
@@ -1613,15 +1613,18 @@ void PrintManager::PrintStdOrNotes (
                             }
                             else
                             {
+				Point aOrigin;
+
+				// if the printable area is bigger than page size, center the page
+				if( aPageSize.Width() < aPrintWidth )
+				    aOrigin.X() = ( aPrintWidth - aPageSize.Width() )/2;
+				if( aPageSize.Height() < aPrintHeight )
+				    aOrigin.Y() = ( aPrintHeight - aPageSize.Height() )/2;
+
                                 // Handle 3.  Print parts of the page in the
                                 // size of the printable area until the
                                 // whole page is covered.
 
-                                // keep the page content at its
-                                // position if it fits, otherwise move
-                                // it to the printable area
-                                Point aOrigin (aPageWidth < aPrintWidth ? -aPageOfs.X() : 0, aPageHeight < aPrintHeight ? -aPageOfs.Y() : 0);
-
                                 for (aPageOrigin = aOrigin;
                                      -aPageOrigin.Y()<aPageHeight;
                                          aPageOrigin.Y() -= aPrintHeight)
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index e794538e9..61be799f0 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1328,6 +1328,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         }
     }
 
+    // #i102735# discussed with CL: removed for performance reasons
+    #if 0
     if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_SOUND ) ||
         SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_VIDEO ) )
     {
@@ -1340,6 +1342,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         if (!SvxPluginFileDlg::IsAvailable (SID_INSERT_VIDEO))
             rSet.DisableItem (SID_INSERT_VIDEO);
     }
+    #endif
 
     ///////////////////////////////////////////////////////////////////////
     // Menuoption: Change->Convert->To Bitmap, Change->Convert->To Metafile
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index ba4032bbb..1de58c4e5 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -151,7 +151,8 @@ public:
         SD_INSERT_SOUND,				// insert sound in draw
         SD_INSERT_VIDEO,				// insert video in draw
         SD_EXPORT,						// export in draw
-        SI_EXPORT						// export in impress
+        SI_EXPORT,						// export in impress
+        SW_EXPORT                       // export in writer
     };
 
 private:
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index f0b04543d..c99f00a09 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -1043,14 +1043,15 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSync
     if ( pDoc && ( pDoc->IsPreview() || !pDoc->Get_Impl()->bInitialized ) )
         return;
 
-    if ( bSynchron )
-    {
 #ifdef DBG_UTIL
-        ::rtl::OUString aName = SfxEventConfiguration::GetEventName_Impl( rEventHint.GetEventId() );
-        ByteString aTmp( "SfxEvent: ");
-        aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
-        DBG_TRACE( aTmp.GetBuffer() );
+    ::rtl::OUString aName = SfxEventConfiguration::GetEventName_Impl( rEventHint.GetEventId() );
+    ByteString aTmp( "SfxEvent: ");
+    aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
+    DBG_TRACE( aTmp.GetBuffer() );
 #endif
+
+    if ( bSynchron )
+    {
         Broadcast(rEventHint);
         if ( pDoc )
             pDoc->Broadcast( rEventHint );
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index ce90cf706..b37bf70dc 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,6 @@
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/document/UpdateDocMode.hpp>
-#include <com/sun/star/task/XInteractionRequest.hpp>
 #include <com/sun/star/task/ErrorCodeRequest.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
@@ -81,7 +80,7 @@
 #include <svtools/templdlg.hxx>
 #include <osl/file.hxx>
 #include <svtools/extendedsecurityoptions.hxx>
-#include <svtools/docpasswdrequest.hxx>
+#include <comphelper/docpasswordhelper.hxx>
 #include <vcl/svapp.hxx>
 
 #include <vos/mutex.hxx>
@@ -247,6 +246,50 @@ void SetTemplate_Impl( const String &rFileName,
 
 //--------------------------------------------------------------------
 
+class SfxDocPasswordVerifier : public ::comphelper::IDocPasswordVerifier
+{
+public:
+    inline explicit     SfxDocPasswordVerifier( const Reference< embed::XStorage >& rxStorage ) :
+                            mxStorage( rxStorage ) {}
+
+    virtual ::comphelper::DocPasswordVerifierResult
+                        verifyPassword( const ::rtl::OUString& rPassword );
+
+private:
+    Reference< embed::XStorage > mxStorage;
+};
+
+::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyPassword( const ::rtl::OUString& rPassword )
+{
+    ::comphelper::DocPasswordVerifierResult eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+    try
+    {
+        // check the password
+        // if the password correct is the stream will be opened successfuly
+        // and immediatelly closed
+        ::comphelper::OStorageHelper::SetCommonStoragePassword( mxStorage, rPassword );
+
+        mxStorage->openStreamElement(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "content.xml" ) ),
+                embed::ElementModes::READ | embed::ElementModes::NOCREATE );
+
+        // no exception -> success
+        eResult = ::comphelper::DocPasswordVerifierResult_OK;
+    }
+    catch( const packages::WrongPasswordException& )
+    {
+        eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
+    }
+    catch( const uno::Exception& )
+    {
+        // unknown error, do not try to ask again
+        eResult = ::comphelper::DocPasswordVerifierResult_ABORT;
+    }
+    return eResult;
+}
+
+//--------------------------------------------------------------------
+
 sal_uInt32 CheckPasswd_Impl
 (
     //Window *pWin,             // Parent des Dialogs
@@ -302,56 +345,13 @@ sal_uInt32 CheckPasswd_Impl
                         Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler = pFile->GetInteractionHandler();
                         if( xInteractionHandler.is() )
                         {
-                            sal_Bool bRetry = sal_True;
-                            sal_Bool bGotPasswd = sal_False;
-                            ::rtl::OUString aPassword;
-                            ::com::sun::star::task::PasswordRequestMode nDlgMode = ::com::sun::star::task::PasswordRequestMode_PASSWORD_ENTER;
-
-                            while( bRetry )
-                            {
-                                bRetry = sal_False;
-
-                                RequestDocumentPassword* pPasswordRequest = new RequestDocumentPassword( nDlgMode,
-                                    INetURLObject( pFile->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ) );
-
-                                Reference< XInteractionRequest > rRequest( pPasswordRequest );
-                                xInteractionHandler->handle( rRequest );
-
-                                if ( pPasswordRequest->isPassword() )
-                                {
-                                    aPassword = pPasswordRequest->getPassword();
-                                    bGotPasswd = sal_True;
-
-                                    try
-                                    {
-                                        // check the password
-                                        // if the password correct is the stream will be opened successfuly
-                                        // and immediatelly closed
-                                        ::comphelper::OStorageHelper::SetCommonStoragePassword(
-                                                                        xStorage,
-                                                                        aPassword );
-
-                                        xStorage->openStreamElement(
-                                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "content.xml" ) ),
-                                                embed::ElementModes::READ | embed::ElementModes::NOCREATE );
-                                    }
-                                    catch( const packages::WrongPasswordException& )
-                                    {
-                                        // reask for the password
-                                        nDlgMode = ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER;
-                                        bRetry = sal_True;
-                                    }
-                                    catch( const uno::Exception& )
-                                    {
-                                        // do nothing special
-                                        // the error will be detected by loading
-                                    }
-                                }
-                                else
-                                    bGotPasswd = sal_False;
-                            }
+                            // use the comphelper password helper to request a password
+                            ::rtl::OUString aDocumentName = INetURLObject( pFile->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
+                            SfxDocPasswordVerifier aVerifier( xStorage );
+                            ::rtl::OUString aPassword = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
+                                aVerifier, ::rtl::OUString(), xInteractionHandler, aDocumentName, comphelper::DocPasswordRequestType_STANDARD );
 
-                            if ( bGotPasswd )
+                            if ( aPassword.getLength() > 0 )
                             {
                                 pSet->Put( SfxStringItem( SID_PASSWORD, aPassword ) );
 
@@ -916,7 +916,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             nDialog = pSystemDialogItem->GetValue() ? SFX2_IMPL_DIALOG_SYSTEM : SFX2_IMPL_DIALOG_OOO;
 
         String sStandardDir;
-        
+
         SFX_REQUEST_ARG( rReq, pStandardDirItem, SfxStringItem, SID_STANDARD_DIR, FALSE );
         if ( pStandardDirItem )
             sStandardDir = pStandardDirItem->GetValue();
@@ -1211,19 +1211,19 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 
                         return;
                     }
-                    else 
+                    else
                     {
                         // check for "internal" protocols that should not be forwarded to the system
                         Sequence < ::rtl::OUString > aProtocols(2);
 
-                        // add special protocols that always should be treated as internal					
+                        // add special protocols that always should be treated as internal
                         aProtocols[0] = ::rtl::OUString::createFromAscii("private:*");
                         aProtocols[1] = ::rtl::OUString::createFromAscii("vnd.sun.star.*");
 
                         try
                         {
                             // get registered protocol handlers from configuration
-                            Reference < XNameAccess > xAccess( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessServiceFactory(), 
+                            Reference < XNameAccess > xAccess( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessServiceFactory(),
                                 ::rtl::OUString::createFromAscii("org.openoffice.Office.ProtocolHandler/HandlerSet"), ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
                             if ( xAccess.is() )
                             {
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 0e65658dd..64c6ada42 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,9 +45,7 @@
 #include <com/sun/star/ui/dialogs/XFilePreview.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
-#ifndef _COM_SUN_STAR_UI_DIALOGS_XFOLDERPICKER_HDL_
 #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
 #include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -82,12 +80,9 @@
 #include <svtools/filter.hxx>
 #include <svtools/viewoptions.hxx>
 #include <svtools/moduleoptions.hxx>
-#ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
-#endif
 #include <svtools/pickerhelper.hxx>
-#include <svtools/docpasswdrequest.hxx>
-#include <svtools/docmspasswdrequest.hxx>
+#include <comphelper/docpasswordrequest.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <comphelper/storagehelper.hxx>
@@ -99,13 +94,9 @@
 #include <sfx2/passwd.hxx>
 #include "sfxresid.hxx"
 #include <sfx2/sfxsids.hrc>
-#ifndef _SFX_FILEDLGHELPER_HRC
 #include "filedlghelper.hrc"
-#endif
 #include "filtergrouping.hxx"
-#ifndef SFX2_REQUEST_HXX
 #include <sfx2/request.hxx>
-#endif
 #include "filedlgimpl.hxx"
 
 #include <sfxlocal.hrc>
@@ -137,6 +128,7 @@ const OUString* GetLastFilterConfigId( FileDialogHelper::Context _eContext )
 {
     static const OUString aSD_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SdExportLastFilter" ) );
     static const OUString aSI_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SiExportLastFilter" ) );
+    static const OUString aSW_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SwExportLastFilter" ) );
 
     const OUString* pRet = NULL;
 
@@ -144,6 +136,7 @@ const OUString* GetLastFilterConfigId( FileDialogHelper::Context _eContext )
     {
         case FileDialogHelper::SD_EXPORT: pRet = &aSD_EXPORT_IDENTIFIER; break;
         case FileDialogHelper::SI_EXPORT: pRet = &aSI_EXPORT_IDENTIFIER; break;
+        case FileDialogHelper::SW_EXPORT: pRet = &aSW_EXPORT_IDENTIFIER; break;
         default: break;
     }
 
@@ -557,13 +550,15 @@ void FileDialogHelper_Impl::updateSelectionBox()
 }
 
 // ------------------------------------------------------------------------
-struct CheckMSPasswordCapability
+
+namespace {
+
+bool lclCheckMSPasswordCapability( const String rFilterName )
 {
-    sal_Bool operator() ( const String rFilterName )
-    {
-        return rFilterName.EqualsAscii("MS Word 97");
-    }
-};
+    return rFilterName.EqualsAscii("MS Word 97");
+}
+
+} // namespace
 
 // ------------------------------------------------------------------------
 struct CheckPasswordCapability
@@ -575,7 +570,7 @@ struct CheckPasswordCapability
 
 #if 1
         if (_pFilter->GetFilterName().EqualsAscii("MS Excel 97"))
-            // For now, we eanble password protection for Excel 97 as a 
+            // For now, we eanble password protection for Excel 97 as a
             // special case.  If we start having more filters supporting
             // export encryption with password, we should probably switch to
             // using a filter flag instead.
@@ -583,8 +578,8 @@ struct CheckPasswordCapability
 #endif
 
         return  ( _pFilter->IsOwnFormat() && _pFilter->UsesStorage()
-            &&	( SOFFICE_FILEFORMAT_60 <= _pFilter->GetVersion() )	)	
-            || CheckMSPasswordCapability()( _pFilter->GetFilterName() );
+            &&	( SOFFICE_FILEFORMAT_60 <= _pFilter->GetVersion() )	)
+            || lclCheckMSPasswordCapability( _pFilter->GetFilterName() );
     }
 };
 
@@ -927,14 +922,14 @@ sal_Bool lcl_isSystemFilePicker( const uno::Reference< XFilePicker >& _rxFP )
 // -----------		FileDialogHelper_Impl		---------------------------
 // ------------------------------------------------------------------------
 
-FileDialogHelper_Impl::FileDialogHelper_Impl( 
-    FileDialogHelper* _pAntiImpl, 
-    sal_Int16 nDialogType, 
-    sal_Int64 nFlags, 
-    sal_Int16 nDialog, 
-    Window* _pPreferredParentWindow, 
+FileDialogHelper_Impl::FileDialogHelper_Impl(
+    FileDialogHelper* _pAntiImpl,
+    sal_Int16 nDialogType,
+    sal_Int64 nFlags,
+    sal_Int16 nDialog,
+    Window* _pPreferredParentWindow,
     const String& sStandardDir,
-    const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList 
+    const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList
     )
     :m_nDialogType			( nDialogType )
     ,meContext				( FileDialogHelper::UNKNOWN_CONTEXT )
@@ -1092,8 +1087,8 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
                 DBG_ERRORFILE( "FileDialogHelper::ctor with unknown type" );
                 break;
         }
-        
-        
+
+
 
         //Sequence < Any > aInitArguments( mbSystemPicker || !mpPreferredParentWindow ? 1 : 3 );
         Sequence < Any > aInitArguments( !mpPreferredParentWindow ? 3 : 4 );
@@ -1115,7 +1110,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
                                 );
 
             ::rtl::OUString sStandardDirTemp = ::rtl::OUString( sStandardDir );
-            
+
             aInitArguments[1] <<= NamedValue(
                                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StandardDir" ) ),
                                     makeAny( sStandardDirTemp )
@@ -1133,7 +1128,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
                                         makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) )
                                     );
 
-            
+
         }
 
         try
@@ -1197,7 +1192,7 @@ FileDialogHelper_Impl::~FileDialogHelper_Impl()
 
     if ( mbDeleteMatcher )
         delete mpMatcher;
-    
+
     maPreViewTimer.SetTimeoutHdl( Link() );
 
     ::comphelper::disposeComponent( mxFileDlg );
@@ -1525,7 +1520,7 @@ void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterfac
         if ( nFiles > 1 )
         {
             rpURLList = new SvStringsDtor;
-        
+
             INetURLObject aPath( lFiles[0] );
             aPath.setFinalSlash();
 
@@ -1655,7 +1650,7 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList,
         implGetAndCacheFiles(mxFileDlg, rpURLList, getCurentSfxFilter());
         if ( rpURLList == NULL || rpURLList->GetObject(0) == NULL )
             return ERRCODE_ABORT;
- 
+
         // check, wether or not we have to display a password box
         if ( mbHasPassword && mbIsPwdEnabled && xCtrlAccess.is() )
         {
@@ -1671,30 +1666,21 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList,
                     if( xInteractionHandler.is() )
                     {
                         // TODO: find out a way to set the 1-15 char limits on MS Excel 97 filter.
-                        if ( CheckMSPasswordCapability()( rFilter ) )
-                        {
-                            RequestMSDocumentPassword* pMSPasswordRequest = new RequestMSDocumentPassword(
-                                ::com::sun::star::task::PasswordRequestMode_PASSWORD_CREATE, *(rpURLList->GetObject(0)) );
-     
-                            uno::Reference< com::sun::star::task::XInteractionRequest > rRequest( pMSPasswordRequest );
-                            xInteractionHandler->handle( rRequest );
-                            if ( pMSPasswordRequest->isPassword() )
-                                rpSet->Put( SfxStringItem( SID_PASSWORD, pMSPasswordRequest->getPassword() ) );
-                            else
-                                return ERRCODE_ABORT;
-                        }
+
+                        bool bMSType = lclCheckMSPasswordCapability( rFilter );
+                        ::comphelper::DocPasswordRequestType eType = bMSType ?
+                            ::comphelper::DocPasswordRequestType_MS :
+                            ::comphelper::DocPasswordRequestType_STANDARD;
+
+                        ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest(
+                            eType, ::com::sun::star::task::PasswordRequestMode_PASSWORD_CREATE, *(rpURLList->GetObject(0)) );
+
+                        uno::Reference< com::sun::star::task::XInteractionRequest > rRequest( pPasswordRequest );
+                        xInteractionHandler->handle( rRequest );
+                        if ( pPasswordRequest->isPassword() )
+                            rpSet->Put( SfxStringItem( SID_PASSWORD, pPasswordRequest->getPassword() ) );
                         else
-                        {
-                            RequestDocumentPassword* pPasswordRequest = new RequestDocumentPassword(
-                                ::com::sun::star::task::PasswordRequestMode_PASSWORD_CREATE, *(rpURLList->GetObject(0)) );
- 
-                            uno::Reference< com::sun::star::task::XInteractionRequest > rRequest( pPasswordRequest );
-                            xInteractionHandler->handle( rRequest );
-                            if ( pPasswordRequest->isPassword() )
-                                rpSet->Put( SfxStringItem( SID_PASSWORD, pPasswordRequest->getPassword() ) );
-                            else
-                                return ERRCODE_ABORT;
-                        }
+                            return ERRCODE_ABORT;
                     }
                 }
             }
@@ -2595,7 +2581,7 @@ Sequence < OUString > FileDialogHelper::GetMPath() const
 {
     if ( mpImp->mlLastURLs.size() > 0)
         return mpImp->mlLastURLs.getAsConstList();
-    
+
     if ( mpImp->mxFileDlg.is() )
         return mpImp->mxFileDlg->getFiles();
     else
@@ -2624,7 +2610,7 @@ Sequence< ::rtl::OUString > FileDialogHelper::GetSelectedFiles() const
         if ( nFiles > 1 )
         {
             aResultSeq = Sequence< ::rtl::OUString >( nFiles-1 );
-            
+
             INetURLObject aPath( lFiles[0] );
             aPath.setFinalSlash();
 
@@ -2641,7 +2627,7 @@ Sequence< ::rtl::OUString > FileDialogHelper::GetSelectedFiles() const
         else
             aResultSeq = lFiles;
     }
-    
+
     return aResultSeq;
 }
 
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index b8c9f5d5c..a5b3e7f55 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -379,6 +379,7 @@ protected:
         const css::uno::Sequence< ::rtl::OUString > & i_rValue,
         AttrVector const* = 0);
     // throw (css::uno::RuntimeException);
+    void createUserDefined();
 };
 
 typedef ::cppu::ImplInheritanceHelper1< SfxDocumentMetaData, css::document::XCompatWriterDocProperties > CompatWriterDocPropsImpl_BASE;
@@ -661,23 +662,23 @@ SfxDocumentMetaData::getURLProperties(
         css::uno::UNO_QUERY_THROW);
     try {
         ::rtl::OUString dburl =
-            ::rtl::OUString::createFromAscii("DocumentBaseURL");
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentBaseURL"));
         ::rtl::OUString hdn =
-            ::rtl::OUString::createFromAscii("HierarchicalDocumentName");
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName"));
         for (sal_Int32 i = 0; i < i_rMedium.getLength(); ++i) {
             if (i_rMedium[i].Name.equals(dburl)) {
                 xPropArg->addProperty(
-                    ::rtl::OUString::createFromAscii("BaseURI"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")),
                     css::beans::PropertyAttribute::MAYBEVOID,
                     i_rMedium[i].Value);
             } else if (i_rMedium[i].Name.equals(hdn)) {
                 xPropArg->addProperty(
-                    ::rtl::OUString::createFromAscii("StreamRelPath"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")),
                     css::beans::PropertyAttribute::MAYBEVOID,
                     i_rMedium[i].Value);
             }
         }
-        xPropArg->addProperty(::rtl::OUString::createFromAscii("StreamName"),
+        xPropArg->addProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")),
                 css::beans::PropertyAttribute::MAYBEVOID,
                 css::uno::makeAny(::rtl::OUString::createFromAscii(s_metaXml)));
     } catch (css::uno::Exception &) {
@@ -954,7 +955,7 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
             ::sax::Converter::convertBool(buf, b);
             values.push_back(buf.makeStringAndClear());
             as.push_back(std::make_pair(vt,
-                ::rtl::OUString::createFromAscii("boolean")));
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("boolean"))));
         } else if (type == ::cppu::UnoType< ::rtl::OUString>::get()) {
             ::rtl::OUString s;
             any >>= s;
@@ -962,13 +963,13 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
 // #i90847# OOo 2.x does stupid things if value-type="string";
 // fortunately string is default anyway, so we can just omit it
 //            as.push_back(std::make_pair(vt,
-//                ::rtl::OUString::createFromAscii("string")));
+//                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("string"))));
         } else if (type == ::cppu::UnoType<css::util::DateTime>::get()) {
             css::util::DateTime dt;
             any >>= dt;
             values.push_back(dateTimeToText(dt));
             as.push_back(std::make_pair(vt,
-                ::rtl::OUString::createFromAscii("date")));
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("date"))));
         } else if (type == ::cppu::UnoType<css::util::Date>::get()) {
             css::util::Date d;
             any >>= d;
@@ -978,13 +979,13 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
             dt.Day = d.Day;
             values.push_back(dateTimeToText(dt));
             as.push_back(std::make_pair(vt,
-                ::rtl::OUString::createFromAscii("date")));
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("date"))));
         } else if (type == ::cppu::UnoType<css::util::Time>::get()) {
             css::util::Time ut;
             any >>= ut;
             values.push_back(durationToText(ut));
             as.push_back(std::make_pair(vt,
-                ::rtl::OUString::createFromAscii("time")));
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("time"))));
         } else if (::cppu::UnoType<double>::get().isAssignableFrom(type)) {
             // support not just double, but anything that can be converted
             double d = 0;
@@ -993,7 +994,7 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
             ::sax::Converter::convertDouble(buf, d);
             values.push_back(buf.makeStringAndClear());
             as.push_back(std::make_pair(vt,
-                ::rtl::OUString::createFromAscii("float")));
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("float"))));
         } else {
             DBG_WARNING1("SfxDocumentMetaData: unsupported property type: %s",
                 OUStringToOString(any.getValueTypeName(),
@@ -1048,12 +1049,10 @@ SfxDocumentMetaData::updateElement(const char *i_name,
 // update user-defined meta data in DOM tree
 void SAL_CALL SfxDocumentMetaData::updateUserDefinedAndAttributes()
 {
-    css::uno::Reference<css::beans::XPropertySet> xPSet(m_xUserDefined,
-        css::uno::UNO_QUERY_THROW);
-    std::pair<css::uno::Sequence< ::rtl::OUString>, AttrVector> udStringsAttrs
-        = propsToStrings(xPSet);
-    (void) setMetaList("meta:user-defined", udStringsAttrs.first,
-                &udStringsAttrs.second);
+    createUserDefined();
+    css::uno::Reference<css::beans::XPropertySet> xPSet(m_xUserDefined,css::uno::UNO_QUERY_THROW);
+    std::pair<css::uno::Sequence< ::rtl::OUString>, AttrVector> udStringsAttrs = propsToStrings(xPSet);
+    (void) setMetaList("meta:user-defined", udStringsAttrs.first,&udStringsAttrs.second);
 
     // update elements with attributes
     std::vector<std::pair<const char *, ::rtl::OUString> > attributes;
@@ -1061,10 +1060,10 @@ void SAL_CALL SfxDocumentMetaData::updateUserDefinedAndAttributes()
             || isValidDateTime(m_TemplateDate)) {
         attributes.push_back(std::make_pair(
                 static_cast<const char*>("xlink:type"),
-                ::rtl::OUString::createFromAscii("simple")));
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("simple"))));
         attributes.push_back(std::make_pair(
                 static_cast<const char*>("xlink:actuate"),
-                ::rtl::OUString::createFromAscii("onRequest")));
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("onRequest"))));
         attributes.push_back(std::make_pair(
                 static_cast<const char*>("xlink:title"), m_TemplateName));
         attributes.push_back(std::make_pair(
@@ -1140,7 +1139,7 @@ SfxDocumentMetaData::checkInit() const // throw (css::uno::RuntimeException)
                 "SfxDocumentMetaData::checkInit: not initialized"),
                 *const_cast<SfxDocumentMetaData*>(this));
     }
-    DBG_ASSERT((m_xDoc.is() && m_xParent.is() && m_xUserDefined.is()),
+    DBG_ASSERT((m_xDoc.is() && m_xParent.is() ),
                 "SfxDocumentMetaData::checkInit: reference is null");
 }
 
@@ -1169,13 +1168,13 @@ void SAL_CALL SfxDocumentMetaData::init(
     m_xDoc->normalize();
 
     // select nodes for standard meta data stuff
-    xPath->registerNS(::rtl::OUString::createFromAscii("xlink"),
+    xPath->registerNS(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xlink")),
         ::rtl::OUString::createFromAscii(s_nsXLink));
-    xPath->registerNS(::rtl::OUString::createFromAscii("dc"),
+    xPath->registerNS(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dc")),
         ::rtl::OUString::createFromAscii(s_nsDC));
-    xPath->registerNS(::rtl::OUString::createFromAscii("office"),
+    xPath->registerNS(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office")),
         ::rtl::OUString::createFromAscii(s_nsODF));
-    xPath->registerNS(::rtl::OUString::createFromAscii("meta"),
+    xPath->registerNS(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta")),
         ::rtl::OUString::createFromAscii(s_nsODFMeta));
     // NB: we do not handle the single-XML-file ODF variant, which would
     //     have the root element office:document.
@@ -1268,40 +1267,17 @@ void SAL_CALL SfxDocumentMetaData::init(
         getMetaAttr("meta:hyperlink-behaviour", "office:target-frame-name");
 
 
+    std::vector<css::uno::Reference<css::xml::dom::XNode> > & vec =
+        m_metaList[::rtl::OUString::createFromAscii("meta:user-defined")];
     // user-defined meta data: create PropertyBag which only accepts property
     // values of allowed types
-    css::uno::Sequence<css::uno::Type> types(10);
-    types[0] = ::cppu::UnoType<bool>::get();
-    types[1] = ::cppu::UnoType< ::rtl::OUString>::get();
-    types[2] = ::cppu::UnoType<css::util::DateTime>::get();
-    types[3] = ::cppu::UnoType<css::util::Date>::get();
-    types[4] = ::cppu::UnoType<css::util::Time>::get();
-    types[5] = ::cppu::UnoType<float>::get();
-    types[6] = ::cppu::UnoType<double>::get();
-    types[7] = ::cppu::UnoType<sal_Int16>::get();
-    types[8] = ::cppu::UnoType<sal_Int32>::get();
-    types[9] = ::cppu::UnoType<sal_Int64>::get();
-    css::uno::Sequence<css::uno::Any> args(2);
-    args[0] <<= css::beans::NamedValue(
-        ::rtl::OUString::createFromAscii("AllowedTypes"),
-        css::uno::makeAny(types));
-    // #i94175#:  ODF 1.1 allows empty user-defined property names!
-    args[1] <<= css::beans::NamedValue(
-        ::rtl::OUString::createFromAscii("AllowEmptyPropertyName"),
-        css::uno::makeAny(sal_True));
-    m_xUserDefined.set(
-        xMsf->createInstanceWithContext(::rtl::OUString::createFromAscii(
-                "com.sun.star.beans.PropertyBag"), m_xContext),
-        css::uno::UNO_QUERY_THROW);
-    css::uno::Reference<css::lang::XInitialization> xInit(m_xUserDefined,
-        css::uno::UNO_QUERY);
-    if (xInit.is()) {
-        xInit->initialize(args);
+    if ( !vec.empty() )
+    {
+        createUserDefined();
     }
 
     // user-defined meta data: initialize PropertySet from DOM nodes
-    std::vector<css::uno::Reference<css::xml::dom::XNode> > & vec =
-        m_metaList[::rtl::OUString::createFromAscii("meta:user-defined")];
+    
     for (std::vector<css::uno::Reference<css::xml::dom::XNode> >::iterator
             it = vec.begin(); it != vec.end(); ++it) {
         css::uno::Reference<css::xml::dom::XElement> xElem(*it,
@@ -1309,7 +1285,7 @@ void SAL_CALL SfxDocumentMetaData::init(
         css::uno::Any any;
         ::rtl::OUString name = xElem->getAttributeNS(
                 ::rtl::OUString::createFromAscii(s_nsODFMeta),
-                ::rtl::OUString::createFromAscii("name"));
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")));
         ::rtl::OUString type = xElem->getAttributeNS(
                 ::rtl::OUString::createFromAscii(s_nsODFMeta),
                 ::rtl::OUString::createFromAscii("value-type"));
@@ -1380,10 +1356,7 @@ SfxDocumentMetaData::SfxDocumentMetaData(
         css::uno::Reference< css::uno::XComponentContext > const & context) :
     BaseMutex(), SfxDocumentMetaData_Base(m_aMutex),
     m_xContext(context), m_NotifyListeners(m_aMutex),
-    m_isInitialized(false), m_isModified(false),
-    m_xDoc(), m_xParent(), m_meta(), m_metaList(), m_xUserDefined(),
-    m_TemplateName(), m_TemplateURL(), m_TemplateDate(), m_AutoloadURL(),
-    m_AutoloadSecs(), m_DefaultTarget()
+    m_isInitialized(false), m_isModified(false)
 {
     DBG_ASSERT(context.is(), "SfxDocumentMetaData: context is null");
     DBG_ASSERT(context->getServiceManager().is(),
@@ -1895,6 +1868,7 @@ SfxDocumentMetaData::getUserDefinedProperties()
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
+    createUserDefined();
     return m_xUserDefined;
 }
 
@@ -1947,7 +1921,7 @@ SfxDocumentMetaData::loadFromStorage(
     css::uno::Reference<css::beans::XPropertySet> xPropArg =
         getURLProperties(Medium);
     try {
-        xPropArg->getPropertyValue(::rtl::OUString::createFromAscii("BaseURI"))
+        xPropArg->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")))
             >>= input.sSystemId;
         input.sSystemId += ::rtl::OUString::createFromAscii("/").concat(
                 ::rtl::OUString::createFromAscii(s_metaXml));
@@ -2006,13 +1980,13 @@ SfxDocumentMetaData::storeToStorage(
     css::uno::Reference< css::beans::XPropertySet > xStreamProps(xStream,
         css::uno::UNO_QUERY_THROW);
     xStreamProps->setPropertyValue(
-        ::rtl::OUString::createFromAscii("MediaType"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
         css::uno::makeAny(::rtl::OUString::createFromAscii("text/xml")));
     xStreamProps->setPropertyValue(
-        ::rtl::OUString::createFromAscii("Compressed"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")),
         css::uno::makeAny(static_cast<sal_Bool> (sal_False)));
     xStreamProps->setPropertyValue(
-        ::rtl::OUString::createFromAscii("UseCommonStoragePasswordEncryption"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption")),
         css::uno::makeAny(static_cast<sal_Bool> (sal_False)));
     css::uno::Reference<css::io::XOutputStream> xOutStream =
         xStream->getOutputStream();
@@ -2246,9 +2220,12 @@ void SAL_CALL SfxDocumentMetaData::setModified( ::sal_Bool bModified )
         ::osl::MutexGuard g(m_aMutex);
         checkInit();
         m_isModified = bModified;
-        xMB.set(m_xUserDefined, css::uno::UNO_QUERY);
-        DBG_ASSERT(xMB.is(),
-            "SfxDocumentMetaData::setModified: PropertyBag not Modifiable?");
+        if ( !bModified )
+        {
+            xMB.set(m_xUserDefined, css::uno::UNO_QUERY);
+            DBG_ASSERT(xMB.is(),
+                "SfxDocumentMetaData::setModified: PropertyBag not Modifiable?");
+        }
     }
     if (bModified) {
         try {
@@ -2314,6 +2291,52 @@ void SAL_CALL SfxDocumentMetaData::serialize(
     xSAXable->serialize(i_xHandler, i_rNamespaces);
 }
 
+void SfxDocumentMetaData::createUserDefined()
+{
+    if ( !m_xUserDefined.is() )
+    {
+        css::uno::Sequence<css::uno::Type> types(10);
+        types[0] = ::cppu::UnoType<bool>::get();
+        types[1] = ::cppu::UnoType< ::rtl::OUString>::get();
+        types[2] = ::cppu::UnoType<css::util::DateTime>::get();
+        types[3] = ::cppu::UnoType<css::util::Date>::get();
+        types[4] = ::cppu::UnoType<css::util::Time>::get();
+        types[5] = ::cppu::UnoType<float>::get();
+        types[6] = ::cppu::UnoType<double>::get();
+        types[7] = ::cppu::UnoType<sal_Int16>::get();
+        types[8] = ::cppu::UnoType<sal_Int32>::get();
+        types[9] = ::cppu::UnoType<sal_Int64>::get();
+        css::uno::Sequence<css::uno::Any> args(2);
+        args[0] <<= css::beans::NamedValue(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllowedTypes")),
+            css::uno::makeAny(types));
+        // #i94175#:  ODF 1.1 allows empty user-defined property names!
+        args[1] <<= css::beans::NamedValue(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllowEmptyPropertyName")),
+            css::uno::makeAny(sal_True));
+
+        css::uno::Reference<css::lang::XMultiComponentFactory> xMsf (m_xContext->getServiceManager());
+        m_xUserDefined.set(
+            xMsf->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.PropertyBag")), m_xContext),
+            css::uno::UNO_QUERY_THROW);
+        css::uno::Reference<css::lang::XInitialization> xInit(m_xUserDefined,
+            css::uno::UNO_QUERY);
+        if (xInit.is()) {
+            xInit->initialize(args);
+        }
+
+        css::uno::Reference<css::util::XModifyBroadcaster> xMB(m_xUserDefined,css::uno::UNO_QUERY);
+        if (xMB.is()) 
+        {
+            css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > aListener = m_NotifyListeners.getElements();
+            const css::uno::Reference< css::uno::XInterface >* pIter = aListener.getConstArray();
+            const css::uno::Reference< css::uno::XInterface >* pEnd = pIter + aListener.getLength();
+            for(;pIter != pEnd;++pIter )
+                xMB->addModifyListener(css::uno::Reference< css::util::XModifyListener >(*pIter,css::uno::UNO_QUERY));
+        }
+    }
+}
+
 } // closing anonymous implementation namespace
 
 
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 5f9157fa8..81bfa646c 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -826,6 +826,9 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
                eCtxt = sfx2::FileDialogHelper::SD_EXPORT;
         if( aDocServiceName.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) )
                eCtxt = sfx2::FileDialogHelper::SI_EXPORT;
+        if( aDocServiceName.equalsAscii( "com.sun.star.text.TextDocument" ) )
+            eCtxt = sfx2::FileDialogHelper::SW_EXPORT;
+        
         if ( eCtxt != sfx2::FileDialogHelper::UNKNOWN_CONTEXT )
                pFileDlg->SetContext( eCtxt );
 
@@ -854,7 +857,8 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
     ::rtl::OUString aAdjustToType;
 
     // bSetStandardName == true means that user agreed to store document in the default (default default ;-)) format
-    if ( bSetStandardName || GetStorable()->hasLocation() )
+    if ( !(( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED )) && 
+        ( bSetStandardName || GetStorable()->hasLocation() ))
     {
         uno::Sequence< beans::PropertyValue > aOldFilterProps;
         ::rtl::OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault(
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index f3b2272b0..c1340a57b 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -1474,35 +1474,35 @@ void SfxObjectShell::ResetFromTemplate( const String& rTemplateName, const Strin
     // only care about reseting this data for openoffice formats otherwise
     if ( IsOwnStorageFormat_Impl( *GetMedium())  )
     {
-        uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties());
-        xDocProps->setTemplateURL( ::rtl::OUString() );
-        xDocProps->setTemplateName( ::rtl::OUString() );
-        xDocProps->setTemplateDate( util::DateTime() );
-        xDocProps->resetUserData( ::rtl::OUString() );
-    
-    	// TODO/REFACTOR:
-    	// Title?
-    
-        if( ::utl::LocalFileHelper::IsLocalFile( rFileName ) )
-    	{
-            String aFoundName;
-            if( SFX_APP()->Get_Impl()->GetDocumentTemplates()->GetFull( String(), rTemplateName, aFoundName ) )
-            {
-                INetURLObject aObj( rFileName );
-                xDocProps->setTemplateURL( aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) );
-                xDocProps->setTemplateName( rTemplateName );
-    
-                ::DateTime now;
-                xDocProps->setTemplateDate( util::DateTime(
-                    now.Get100Sec(), now.GetSec(), now.GetMin(),
-                    now.GetHour(), now.GetDay(), now.GetMonth(),
-                    now.GetYear() ) );
-    
-    			SetQueryLoadTemplate( sal_True );
-            }
+    uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties());
+    xDocProps->setTemplateURL( ::rtl::OUString() );
+    xDocProps->setTemplateName( ::rtl::OUString() );
+    xDocProps->setTemplateDate( util::DateTime() );
+    xDocProps->resetUserData( ::rtl::OUString() );
+
+    // TODO/REFACTOR:
+    // Title?
+
+    if( ::utl::LocalFileHelper::IsLocalFile( rFileName ) )
+    {
+        String aFoundName;
+        if( SFX_APP()->Get_Impl()->GetDocumentTemplates()->GetFull( String(), rTemplateName, aFoundName ) )
+        {
+            INetURLObject aObj( rFileName );
+            xDocProps->setTemplateURL( aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) );
+            xDocProps->setTemplateName( rTemplateName );
+
+            ::DateTime now;
+            xDocProps->setTemplateDate( util::DateTime(
+                now.Get100Sec(), now.GetSec(), now.GetMin(),
+                now.GetHour(), now.GetDay(), now.GetMonth(),
+                now.GetYear() ) );
+
+            SetQueryLoadTemplate( sal_True );
         }
     }
 }
+}
 
 sal_Bool SfxObjectShell::IsQueryLoadTemplate() const
 {
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 9be74b17f..ca083f164 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -165,47 +165,6 @@ void lcl_UpdateAppBasicDocVars(  const Reference< XInterface >& _rxComponent, bo
 
 //=========================================================================
 
-/** This Listener is used to get notified when the XDocumentProperties of the
-    XModel change.
-    If several changes are done the "bQuiet" member can be used to
-    temporarily suppress notifications.
- */
-class SfxDocInfoListener_Impl : public ::cppu::WeakImplHelper1<
-    ::com::sun::star::util::XModifyListener >
-{
-
-public:
-    SfxObjectShell& m_rShell;
-    bool bQuiet;
-    bool bGotModified;
-
-    SfxDocInfoListener_Impl( SfxObjectShell& i_rDoc )
-        : m_rShell(i_rDoc)
-        , bQuiet(false)
-    { };
-
-    virtual void SAL_CALL disposing( const lang::EventObject& )
-        throw ( uno::RuntimeException );
-    virtual void SAL_CALL modified( const lang::EventObject& )
-        throw ( uno::RuntimeException );
-};
-
-void SAL_CALL SfxDocInfoListener_Impl::modified( const lang::EventObject& )
-        throw ( uno::RuntimeException )
-{
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-    bGotModified = true;
-
-    // notify changes to the SfxObjectShell
-    if ( !bQuiet ) {
-        m_rShell.FlushDocInfo();
-    }
-}
-
-void SAL_CALL SfxDocInfoListener_Impl::disposing( const lang::EventObject& )
-    throw ( uno::RuntimeException )
-{
-}
 
 //=========================================================================
 
@@ -666,6 +625,8 @@ sal_uInt16 SfxObjectShell::PrepareClose
         }
     }
 
+    SFX_APP()->NotifyEvent( SfxEventHint(SFX_EVENT_PREPARECLOSEDOC, this) );
+
     if( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
     {
         pImp->bPreparedForClose = sal_True;
@@ -679,8 +640,6 @@ sal_uInt16 SfxObjectShell::PrepareClose
     while ( pFrame && (pFrame->GetFrameType() & SFXFRAME_SERVER ) )
         pFrame = SfxViewFrame::GetNext( *pFrame, this );
 
-    SfxApplication *pSfxApp = SFX_APP();
-    pSfxApp->NotifyEvent( SfxEventHint(SFX_EVENT_PREPARECLOSEDOC, this) );
     sal_Bool bClose = sal_False;
     if ( bUI && IsModified() )
     {
@@ -1080,10 +1039,10 @@ void SfxObjectShell::SetModel( SfxBaseModel* pModel )
     pImp->xModel = pModel;
     if ( pModel ) {
         pModel->addCloseListener( new SfxModelListener_Impl(this) );
-        pImp->m_xDocInfoListener = new SfxDocInfoListener_Impl(*this);
-        uno::Reference<util::XModifyBroadcaster> xMB(
-            pModel->getDocumentProperties(), uno::UNO_QUERY_THROW);
-        xMB->addModifyListener(pImp->m_xDocInfoListener);
+        //pImp->m_xDocInfoListener = new SfxDocInfoListener_Impl(*this);
+        //uno::Reference<util::XModifyBroadcaster> xMB(
+        //    pModel->getDocumentProperties(), uno::UNO_QUERY_THROW);
+        //xMB->addModifyListener(pImp->m_xDocInfoListener);
     }
 }
 
@@ -1121,7 +1080,8 @@ sal_uInt16 SfxObjectShell::GetAutoStyleFilterIndex()
 
 void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComponent )
 {
-    if ( _rxComponent.get() == s_xCurrentComponent.get().get() )
+    Reference< XInterface > xTest(s_xCurrentComponent);
+    if ( _rxComponent == xTest )
         // nothing to do
         return;
     // note that "_rxComponent.get() == s_xCurrentComponent.get().get()" is /sufficient/, but not
@@ -1129,9 +1089,8 @@ void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComp
     // In other words, it's still possible that we here do something which is not necessary,
     // but we should have filtered quite some unnecessary calls already.
 
-    s_xCurrentComponent = _rxComponent;
-
     BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
+    s_xCurrentComponent = _rxComponent;
     if ( pAppMgr )
     {
         lcl_UpdateAppBasicDocVars( _rxComponent );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index af3196b5b..d818f494b 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -141,6 +141,52 @@ namespace css = ::com::sun::star;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+/** This Listener is used to get notified when the XDocumentProperties of the
+    XModel change.
+    If several changes are done the "bQuiet" member can be used to
+    temporarily suppress notifications.
+ */
+class SfxDocInfoListener_Impl : public ::cppu::WeakImplHelper1<
+    ::com::sun::star::util::XModifyListener >
+{
+
+public:
+    SfxObjectShell& m_rShell;
+    bool bQuiet;
+    bool bGotModified;
+
+    SfxDocInfoListener_Impl( SfxObjectShell& i_rDoc )
+        : m_rShell(i_rDoc)
+        , bQuiet(false)
+    { };
+
+    ~SfxDocInfoListener_Impl();
+
+    virtual void SAL_CALL disposing( const lang::EventObject& )
+        throw ( uno::RuntimeException );
+    virtual void SAL_CALL modified( const lang::EventObject& )
+        throw ( uno::RuntimeException );
+};
+SfxDocInfoListener_Impl::~SfxDocInfoListener_Impl()
+{
+}
+void SAL_CALL SfxDocInfoListener_Impl::modified( const lang::EventObject& )
+        throw ( uno::RuntimeException )
+{
+    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    bGotModified = true;
+
+    // notify changes to the SfxObjectShell
+    if ( !bQuiet ) {
+        m_rShell.FlushDocInfo();
+    }
+}
+
+void SAL_CALL SfxDocInfoListener_Impl::disposing( const lang::EventObject& )
+    throw ( uno::RuntimeException )
+{
+}
+
 //________________________________________________________________________________________________________
 //	impl. declarations
 //________________________________________________________________________________________________________
@@ -869,6 +915,8 @@ SfxBaseModel::getDocumentProperties()
             uno::UNO_QUERY_THROW);
 //        xDocProps->initialize(uno::Sequence<uno::Any>());
         m_pData->m_xDocumentProperties.set(xDocProps, uno::UNO_QUERY_THROW);
+        uno::Reference<util::XModifyBroadcaster> xMB(m_pData->m_xDocumentProperties, uno::UNO_QUERY_THROW);
+        xMB->addModifyListener(new SfxDocInfoListener_Impl(*m_pData->m_pObjectShell));
     }
 
     return m_pData->m_xDocumentProperties;
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 9d64f696c..226da37c6 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -708,7 +708,7 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const ::rtl::OUString&
         const css::uno::Reference< css::frame::XController2 >& /*_ViewController*/, const css::uno::Any& /*_Supplement*/ )
         throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException)
 {
-    // we're a multiplexer only, no change to generate artifical events here
+    // we're a multiplexer only, no chance to generate artifical events here
     throw css::lang::NoSupportException(::rtl::OUString(), *this);
 }
 
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 4e99a194a..d3be21453 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -55,10 +55,6 @@
         require GenInfoParser; import GenInfoParser;
         require IO::Handle; import IO::Handle;
     };
-    my $verbose_mode = 0;
-    if (defined $ENV{verbose} || defined $ENV{VERBOSE}) {
-        $verbose_mode = ($ENV{verbose} =~ /^t\S*$/i);
-    }
     my $enable_multiprocessing = 1;
     my $cygwin = 0;
     $cygwin++ if ($^O eq 'cygwin');
@@ -594,7 +590,7 @@ sub dmake_dir {
             print "$dmake\n";
             print $check_error_string;
         } else {
-            print "\nEntering $BuildDir\n";
+            print "$BuildDir\n";
         };
         RemoveFromDependencies($BuildDir, \%LocalDepsHash) if (!$child);
         return if ($cmd_file || $show);
@@ -894,17 +890,7 @@ sub CorrectPath {
 
 sub check_dmake {
 #print "Checking dmake...";
-#    my $dmake_batch = CorrectPath("$tmp_dir/dmake.bat");
-    if ($QuantityToBuild && ($ENV{GUI} eq 'WNT') && ($ENV{USE_SHELL} eq '4nt')) {
-        if (open(DMAKEVERSION, "where dmake |")) {
-            my @output = <DMAKEVERSION>;
-            close DMAKEVERSION;
-            $dmake_bin = $output[0];
-            $dmake_bin =~ /(\b)$/;
-            $dmake_bin = $`;
-        };
-        return if (-e $dmake_bin);
-    } elsif (open(DMAKEVERSION, "dmake -V |")) {
+    if (open(DMAKEVERSION, "dmake -V |")) {
 #    if (open(DMAKEVERSION, "dmake -V |")) {
         my @dmake_version = <DMAKEVERSION>;
         close DMAKEVERSION;
@@ -1405,9 +1391,6 @@ sub get_options {
     # Default build modes(for OpenOffice.org)
     $ENV{BUILD_TYPE} = 'OOo EXT' if (!defined $ENV{BUILD_TYPE});
     @ARGV = @dmake_args;
-	foreach $arg (@dmake_args) {
-        $arg =~ /^verbose=(\S+)$/i and $verbose_mode = ($1 =~ /^t\S*$/i);
-	}
 };
 
 sub get_module_and_buildlist_paths {
@@ -1586,7 +1569,7 @@ sub clear_from_child {
     $running_children{$folders_hashes{$child_nick}}--;
     delete $processes_hash{$pid};
     $only_dependent = 0;
-    $verbose_mode && print 'Running processes: ' . children_number() . "\n";
+    print 'Running processes: ' . children_number() . "\n";
 };
 
 #
@@ -1677,7 +1660,7 @@ sub start_child {
     select $oldfh;
     $processes_hash{$pid} = $job_dir;
     $children_running = children_number();
-    $verbose_mode && print 'Running processes: ', $children_running, "\n";
+    print 'Running processes: ', $children_running, "\n";
     $maximal_processes = $children_running if ($children_running > $maximal_processes);
     $folders_hashes{$job_dir} = $dependencies_hash;
     $running_children{$dependencies_hash}++;
@@ -1804,8 +1787,8 @@ sub do_custom_job {
     } else {
         $error_code = run_job($job, $module_paths{$module}, $module_job);
         if ($error_code) {
-            # give windows (4nt) one more chance 
-            if ($ENV{GUI} eq 'WNT' && !$cygwin) {
+            # give windows one more chance 
+            if ($ENV{GUI} eq 'WNT') {
                 $error_code = run_job($job, $module_paths{$module}, $module_job);
             };
         };
@@ -1962,14 +1945,14 @@ sub clear_module {
         my $dir = CorrectPath($module_paths{$module}.'/'.$_);
         if ((!-d $dir.'/.svn') && is_output_tree($dir)) {
             #print "I would delete $dir\n";
-            rmtree("$dir", 0, 1) if ($ENV{USE_SHELL} ne '4nt');
+            rmtree("$dir", 0, 1);
             if (-d $dir) {
                 system("$remove_command $dir");
                 if (-d $dir) {
                     push(@warnings, "Cannot delete $dir");
 #print_error("Cannot delete $dir");
                 } else {
-                    print STDERR (">>> Removed $dir by force\n") if ($ENV{USE_SHELL} ne '4nt');
+                    print STDERR (">>> Removed $dir by force\n");
                 };
             };
         };
@@ -3069,7 +3052,7 @@ sub run_server {
             delete $clients_times{$pid};
             clear_from_child($pid);
             delete $clients_jobs{$pid};
-            $verbose_mode && print 'Running processes: ', children_number(), "\n";
+            print 'Running processes: ', children_number(), "\n";
             # Actually, next 3 strings are only for even distribution 
             # of clients if there are more than one build server running
             print $new_socket_obj 'No job';
@@ -3094,7 +3077,7 @@ sub run_server {
             $clients_jobs{$pid} = $job_string;
             $clients_times{$pid} = time;
             $children_running = children_number();
-            $verbose_mode && print 'Running processes: ', $children_running, "\n";
+            print 'Running processes: ', $children_running, "\n";
             $maximal_processes = $children_running if ($children_running > $maximal_processes);
         } else {
             print $new_socket_obj 'No job';
diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl
index 25a0eb7ec..ffc331e32 100755
--- a/solenv/bin/build_client.pl
+++ b/solenv/bin/build_client.pl
@@ -330,9 +330,6 @@ sub do_job {
     if (defined $job_hash{setenv_string}) {
         # use configuration string from server
         $setenv_string .= $job_hash{setenv_string};
-        if ((defined $ENV{USE_SHELL}) && ($ENV{USE_SHELL} eq '4nt')) {
-            $cmd_file .= '.btm';
-        };
         print "Environment: $setenv_string\n";
     
         my $directory = $job_hash{job_dir};
@@ -349,19 +346,11 @@ sub do_job {
     
         print COMMAND_FILE "pushd $job_hash{job_dir} && ";
         print COMMAND_FILE $job_hash{job} ." >& $tmp_log_file\n";
-        if ((defined $ENV{USE_SHELL}) && ($ENV{USE_SHELL} eq '4nt')) {
-            print COMMAND_FILE "exit %?\n";
-        } else {
-            print COMMAND_FILE "exit \$?\n";
-        };
+        print COMMAND_FILE "exit \$?\n";
         close COMMAND_FILE;
         $job_temp_files{$cmd_file} = 0;
         $job_temp_files{$tmp_log_file} = $job_hash{log};
-        if ((defined $ENV{USE_SHELL}) && ($ENV{USE_SHELL} eq '4nt')) {
-            $error_code = system($ENV{COMSPEC}, '/c', $cmd_file);
-        } else {
-            $error_code = system($ENV{SHELL}, $cmd_file);
-        };
+        $error_code = system($ENV{SHELL}, $cmd_file);
         unlink $cmd_file or system("rm -rf $cmd_file");
         delete $job_temp_files{$cmd_file};
     } else {
@@ -411,22 +400,6 @@ sub get_setsolar_environment {
     my $error_code = 0;
     my $cmd_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
     my $tmp_log_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
-    if ((defined $ENV{USE_SHELL}) && ($ENV{USE_SHELL} eq '4nt')) {
-        my $setsolar = $ENV{ENV_ROOT} . '/etools/setsolar.pl';
-        $setsolar_string =~ s/^(\S+\s)\S+/$1$setsolar/; #replace the use of the local script with generic setsolar
-        $cmd_file .= '.btm';
-        my $setsolar_tmp_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
-        $setsolar_tmp_file .= '.btm';
-        open (COMMAND_FILE, ">$setsolar_tmp_file") or return $?;
-        print COMMAND_FILE "set SOURCE_ROOT=$$job_hash{source_root}\n" if ($$job_hash{source_root});
-        print COMMAND_FILE "unset UPDATER\n" if (!defined $$job_hash{updater});
-        print COMMAND_FILE "$setsolar_string -file $cmd_file";
-        close COMMAND_FILE;
-        $error_code = system($ENV{COMSPEC}, '/c', $setsolar_tmp_file);
-        unlink $setsolar_tmp_file or system("rm -rf $setsolar_tmp_file");
-        store_env_hash($cmd_file);
-        return $error_code;
-    };
     if (defined $$job_hash{updater}) {
         $ENV{UPDATER} = $$job_hash{updater};
     } else {
@@ -454,20 +427,11 @@ sub store_env_hash {
     my $env_vars_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
     print "$cmd_file $env_vars_file\n";
     #get all env variables in $env_vars_file
-    if ((defined $ENV{USE_SHELL}) && ($ENV{USE_SHELL} eq '4nt')) {
-        $cmd_file .= '.btm';
-        open (COMMAND_FILE, ">$cmd_file");
-        print COMMAND_FILE "call $ss_setenv_file\n";
-        print COMMAND_FILE "set > $env_vars_file\n";
-        close COMMAND_FILE;
-        system($ENV{COMSPEC}, '/c', $cmd_file);
-    } else {
-        open (COMMAND_FILE, ">$cmd_file");
-        print COMMAND_FILE "source $ss_setenv_file\n";
-        print COMMAND_FILE "env > $env_vars_file\n";
-        close COMMAND_FILE;
-        system($ENV{SHELL}, $cmd_file);
-    };
+    open (COMMAND_FILE, ">$cmd_file");
+    print COMMAND_FILE "source $ss_setenv_file\n";
+    print COMMAND_FILE "env > $env_vars_file\n";
+    close COMMAND_FILE;
+    system($ENV{SHELL}, $cmd_file);
     print_error($?) if ($?);
     unlink $cmd_file or system("rm -rf $cmd_file");
     unlink $ss_setenv_file or system("rm -rf $ss_setenv_file");
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index 196c4ab81..f553bcfd9 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -77,7 +77,7 @@ if [ -x $checkdll ]; then
         export LD_LIBRARY_PATH;;
     esac
 
-    $checkdll "$@"
+    $checkdll "$*"
     if [ $? -ne 0 ]; then exit 1 ; fi
 
     for parameter in $*; do
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 62587c013..ce55dd937 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -113,8 +113,10 @@ $delete_common      = 1;            # for "-delete": if defined delete files fro
 
 if ($^O ne 'cygwin') {              # iz59477 - cygwin needes a dot "." at the end of filenames to disable
   $maybedot     = '';               # some .exe transformation magic.
-} else {
+} elsif ( `uname -r` lt '1.7') {    # but not in cygwin 1.7 it seems
   $maybedot     = '.';
+} else {
+  $maybedot     = '';
 }
 
 ($gui		= lc($ENV{GUI})) 		|| die "Can't determine 'GUI'. Please set environment.\n";
@@ -400,7 +402,7 @@ sub parse_options
 {
     my $arg;
     my $dontdeletecommon = 0;
-    $opt_silent = 1 if ( !defined $ENV{VERBOSE} || (defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE'));
+    $opt_silent = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE');
     $opt_verbose = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'TRUE');
     while ( $arg = shift @ARGV ) {
         $arg =~ /^-force$/      and $opt_force  = 1  and next;
@@ -838,6 +840,15 @@ sub copy_if_newer
             sleep $try;
             $try ++;
             $success = rename($temp_file, $to);
+            # handle Cygwin crack: when renaming soffice.bin.2900-1253705626
+            # to soffice.bin, Cygwin 1.7 silently appends an .exe
+            # giving soffice.bin.exe.
+            if ( $success &&
+                 $^O eq 'cygwin' && 
+                 -f $to.".exe" )
+            {
+                $success = rename ($to.".exe", $to);
+            }
         }
         if ( $success ) {
             # handle special packaging of *.dylib files for Mac OS X
diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl
index 6ac760627..8e4f1f0ea 100755
--- a/solenv/bin/installoffice.pl
+++ b/solenv/bin/installoffice.pl
@@ -115,7 +115,7 @@ our $bootstrapiniTemp ;
 our $packpackage ;
 our $user;
 
-if (($gui eq "WNT") and ($ENV{USE_SHELL} ne "4nt")) {
+if ($gui eq "WNT") {
     $gui = $cygwin;
 }
 
diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl
index 428b8c586..1fd0f3bf7 100644
--- a/solenv/bin/mhids.pl
+++ b/solenv/bin/mhids.pl
@@ -143,10 +143,6 @@ $workfile = "$tmpdir/${filebase}_".$$;
 
 # now get $workfile ready for shell usage...
 $shell_workfile = $workfile;
-$shell_workfile =~ s/\//\\/g if ( "$ENV{USE_SHELL}" eq "4nt" );
-if (( "$ENV{USE_SHELL}" eq "4nt" ) && ( "$^O" eq "cygwin" )) {
-    $shell_workfile =~ s/\//\\\\/;
-}
 
 print "workfile: $workfile\n";
 
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 532eea182..f9891333d 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -91,9 +91,14 @@ sub check_system_path
     
     if( $^O =~ /cygwin/i )
     {	# When using cygwin's perl the PATH variable is POSIX style and ...
-        $pathvariable = qx{cygpath -mp "$pathvariable"} ;
+        my $temparrayref = installer::converter::convert_stringlist_into_array_without_newline(\$pathvariable, $local_pathseparator);
+        foreach $i (0..$#$temparrayref) {
+            $$temparrayref[$i] = qx{cygpath -m "$$temparrayref[$i]"};
+            chomp($$temparrayref[$i]);
+        }
         # has to be converted to DOS style for further use.
         $local_pathseparator = ';';
+        $pathvariable = join($local_pathseparator, @$temparrayref);
     }
     my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
     
diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm
index 448e354a9..f9db1c902 100644
--- a/solenv/bin/modules/installer/converter.pm
+++ b/solenv/bin/modules/installer/converter.pm
@@ -92,12 +92,10 @@ sub convert_stringlist_into_array_without_linebreak_and_quotes
     {
         $first = $1;
         $last = $2;	
-        if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; }
         $first =~ s/\"//g;
         push(@newarray, $first);
     }	
 
-    if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; }
     $last =~ s/\"//g;
     push(@newarray, $last);	
     
@@ -121,13 +119,11 @@ sub convert_stringlist_into_array
     {
         $first = $1;
         $last = $2;	
-        if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; }
         # Problem with two directly following listseparators. For example a path with two ";;" directly behind each other
         $first =~ s/^$listseparator//;
         push(@newarray, "$first\n");
     }	
 
-    if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; }
     push(@newarray, "$last\n");	
     
     return \@newarray;
@@ -150,11 +146,9 @@ sub convert_stringlist_into_array_without_newline
     {
         $first = $1;
         $last = $2;	
-        if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; }
         push(@newarray, "$first");
     }	
 
-    if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; }
     push(@newarray, "$last");	
     
     return \@newarray;
@@ -177,11 +171,9 @@ sub convert_stringlist_into_hash
     {
         $first = $1;
         $last = $2;	
-        if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; }
         $newhash{$first} = 1;
     }	
 
-    if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; }
     $newhash{$last} = 1;
     
     return \%newhash;
@@ -204,11 +196,9 @@ sub convert_whitespace_stringlist_into_array
     {
         $first = $1;
         $last = $2;	
-        if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; }
         push(@newarray, "$first\n");
     }	
 
-    if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; }
     push(@newarray, "$last\n");	
     
     return \@newarray;
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 9b182dc44..16fd87d14 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1531,7 +1531,7 @@ sub get_path_to_nsis_sdk
         # do we have nsis already in path ?
         @paths = split(/:/, $ENV{'PATH'});
         foreach $paths (@paths) {
-            $path =~ s/[\/\\]+$//; # remove trailing slashes;
+            $paths =~ s/[\/\\]+$//; # remove trailing slashes;
             $nsispath = $paths . "/nsis";
 
             if ( -x $nsispath ) {
@@ -1548,11 +1548,11 @@ sub get_path_to_nsis_sdk
         $nsispath = $ENV{'NSISSDK_SOURCE'};	# overriding the NSIS SDK with NSISSDK_SOURCE
     }
 
-    if( ($^O =~ /cygwin/i) and $nsispath =~ /\\/ ) {
-        # We need a POSIX path for W32-4nt-cygwin-perl
-        $nsispath =~ s/\\/\\\\/g;
-        chomp( $nsispath = qx{cygpath -u "$nsispath"} );
-    }
+#	if( ($^O =~ /cygwin/i) and $nsispath =~ /\\/ ) {
+#		# We need a POSIX path for W32-4nt-cygwin-perl
+#		$nsispath =~ s/\\/\\\\/g;
+#		chomp( $nsispath = qx{cygpath -u "$nsispath"} );
+#	}
 
     if ( $nsispath eq "" )
     {
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
index 179d56ad1..72faab679 100644
--- a/solenv/bin/modules/installer/followme.pm
+++ b/solenv/bin/modules/installer/followme.pm
@@ -145,22 +145,18 @@ sub read_followme_info
 
         if ( $line =~ /^\s*finalinstalldir:\s*(.*?)\s*$/ ) { $finalinstalldir = $1; }
         if( $^O =~ /cygwin/i ) { $finalinstalldir =~ s/\\/\//; }
-        if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $finalinstalldir =~ s/\//\\/; }
         if ( $line =~ /^\s*downloadname:\s*(.*?)\s*$/ ) { $downloadname = $1; }
         if ( $line =~ /^\s*currentinstallnumber:\s*(.*?)\s*$/ ) { $currentinstallnumber = $1; }
         if ( $line =~ /^\s*loggingdir:\s*(.*?)\s*$/ ) { $loggingdir = $1; }
         if( $^O =~ /cygwin/i ) { $loggingdir =~ s/\\/\//; }
-        if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $loggingdir =~ s/\//\\/; }
         if ( $line =~ /^\s*installlogdir:\s*(.*?)\s*$/ ) { $installlogdir = $1; }
         if( $^O =~ /cygwin/i ) { $installlogdir =~ s/\\/\//; }
-        if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installlogdir =~ s/\//\\/; }
         if ( $line =~ /^\s*languagestring:\s*(.*?)\s*$/ ) { $languagestring = $1; }
         if ( $line =~ /^\s*languagesarray:\s*(.*?)\s*$/ ) { push(@languagesarray, $1); }
         if ( $line =~ /^\s*includepatharray:\s*(.*?)\s*$/ )
         {
             my $path = $1;
             if( $^O =~ /cygwin/i ) { $path  =~ s/\\/\//; }
-            if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $path =~ s/\//\\/; }
             push(@includepatharray, $path . "\n");
         }
         if ( $line =~ /^\s*allvariableshash:\s*(.*?)\s*:\s*(.*?)\s*$/ ) { $allvariableshash{$1} = $2; }
@@ -189,13 +185,10 @@ sub read_followme_info
             if ( $name eq "islinux" ) { $installer::globals::islinux = $value; }
             if ( $name eq "unpackpath" ) { $installer::globals::unpackpath = $value; }
             if( $^O =~ /cygwin/i ) { $installer::globals::unpackpath =~ s/\\/\//; }
-            if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installer::globals::unpackpath =~ s/\//\\/; }
             if ( $name eq "idttemplatepath" ) { $installer::globals::idttemplatepath = $value; }
             if( $^O =~ /cygwin/i ) { $installer::globals::idttemplatepath =~ s/\\/\//; }
-            if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installer::globals::idttemplatepath =~ s/\//\\/; }
             if ( $name eq "idtlanguagepath" ) { $installer::globals::idtlanguagepath = $value; }
             if( $^O =~ /cygwin/i ) { $installer::globals::idtlanguagepath =~ s/\\/\//; }
-            if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installer::globals::idtlanguagepath =~ s/\//\\/; }
             if ( $name eq "logfilename" ) { $installer::globals::logfilename = $value; }
             if ( $name eq "product" ) { $installer::globals::product = $value; }
             if ( $name eq "patch" ) { $installer::globals::patch = $value; }
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 0b8d2f15c..34159c180 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -483,33 +483,7 @@ BEGIN
 
     $plat = $^O;
 
-    if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )))
-    {
-        $zippath= "zip.exe";				# Has to be in the path: r:\btw\zip.exe
-        $checksumfile = "so_checksum.exe";
-        $unopkgfile = "unopkg.exe";
-        if ( $plat =~ /cygwin/i )
-        {
-            $separator = "/";
-            $pathseparator = "\:";
-            $quote = "\'";
-        }
-        else
-        {
-            $separator = "\\";
-            $pathseparator = "\;";
-            $quote = "\"";
-        }
-        $libextension = "\.dll";
-        $isunix = 0;
-        $iswin = 1;
-                $archiveformat = ".zip";
-        %savedmapping = ();
-        %savedrevmapping = ();
-        %savedrev83mapping = ();
-        %saved83dirmapping = ();
-    }
-    elsif (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} ne "4nt" ))
+    if ( $plat =~ /cygwin/i )
     {
         $zippath = "zip";					# Has to be in the path: /usr/bin/zip
         $checksumfile = "so_checksum";
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 00dc08009..1d107e1c2 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -49,7 +49,7 @@ sub usage
     
     print <<Ende;
 --------------------------------------------------------------------------------
-$installer::globals::prog V1.0 (c) Ingo Schmidt 2003
+$installer::globals::prog
 The following parameter are needed:
 -f: Path to the product list (required)
 -s: Path to the setup script (optional, if defined in product list)
diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm
index 818892019..393802ce8 100644
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ b/solenv/bin/modules/installer/servicesfile.pm
@@ -274,7 +274,7 @@ sub fix_cygwin_path
 {
     my ( $path ) = @_;
 
-    if ( $installer::globals::iswin eq 1 && $ENV{'USE_SHELL'} ne "4nt" && $installer::globals::wrapcmd eq "" )
+    if ( $installer::globals::iswin eq 1 && $installer::globals::wrapcmd eq "" )
     {
     $path = qx{cygpath -m "$path"};
     chomp($path);
@@ -293,7 +293,7 @@ sub get_source_path_cygwin_safe
     my ( $name, $array, $int ) = @_;
     
     my $ret = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$name, $array, $int);
-    if ( $installer::globals::iswin eq 1 && $ENV{'USE_SHELL'} ne "4nt" )
+    if ( $installer::globals::iswin eq 1 )
     {
     if( substr( $$ret, 1,1 ) eq ":" )
     {
@@ -523,7 +523,7 @@ sub prepare_classpath_for_java_registration
         if ( $ENV{'CLASSPATH'} ) { $oldclasspathstring = $ENV{'CLASSPATH'}; }
         else { $oldclasspathstring = "\."; }
         my $classpathstring = $$jarfileref . $local_pathseparator . $oldclasspathstring;
-        if (( $^O =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} ne "4nt" )) {
+        if ( $^O =~ /cygwin/i ) {
             $classpathstring =~ s/\//\\/g;		# guw.pl likes '\' in $PATH.
         }
         $ENV{'CLASSPATH'} = $classpathstring;
@@ -933,12 +933,12 @@ sub create_services_rdb
             # my $servicesdir = installer::systemactions::create_directories($servicesname, $languagestringref);
             my $servicesdir = installer::systemactions::create_directories($uniquedirname, $languagestringref);
 
-            if ( $^O =~ /cygwin/i && $ENV{'USE_SHELL'} eq "4nt" )
-            {      # $servicesdir is used as a parameter for regcomp and has to be DOS style
-                $servicesdir = qx{cygpath -d "$servicesdir"};
-                chomp($servicesdir);
-                $servicesdir =~ s/\\/\//g;
-            }
+#			if ( $^O =~ /cygwin/i )
+#			{      # $servicesdir is used as a parameter for regcomp and has to be DOS style
+#			    $servicesdir = qx{cygpath -d "$servicesdir"};
+#			    chomp($servicesdir);
+#			    $servicesdir =~ s/\\/\//g;
+#			}
 
             push(@installer::globals::removedirs, $servicesdir);
 
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 57ba2124b..0f0bede6a 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -59,11 +59,7 @@ sub create_directory
             $infoline = "\nCreated directory: $directory\n";
             push(@installer::globals::logfileinfo, $infoline);
     
-            if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-            {
-                my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
-                system($localcall);
-            }			
+            my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
         }
         else
         {
@@ -89,11 +85,8 @@ sub create_directory
                         $infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n";
                         push(@installer::globals::logfileinfo, $infoline);
     
-                        if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-                        {
-                            my $localcall = "chmod 775 $parentdir \>\/dev\/null 2\>\&1";
-                            system($localcall);
-                        }			
+                        my $localcall = "chmod 775 $parentdir \>\/dev\/null 2\>\&1";
+                        system($localcall);
                     }
                     else
                     {
@@ -122,11 +115,8 @@ sub create_directory
                     $infoline = "\nAttention: Created directory \"$directory\" in the second try.\n";
                     push(@installer::globals::logfileinfo, $infoline);
     
-                    if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-                    {
-                        my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
-                        system($localcall);
-                    }			
+                    my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
+                    system($localcall);
                 }
                 else
                 {
@@ -177,11 +167,8 @@ sub create_directory_with_privileges
             $infoline = "\nCreated directory: $directory\n";
             push(@installer::globals::logfileinfo, $infoline);
     
-            if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-            {
-                my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-                system($localcall);
-            }			
+            my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
         }
         else
         {
@@ -207,11 +194,8 @@ sub create_directory_with_privileges
                         $infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n";
                         push(@installer::globals::logfileinfo, $infoline);
     
-                        if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-                        {
-                            my $localcall = "chmod $privileges $parentdir \>\/dev\/null 2\>\&1";
-                            system($localcall);
-                        }			
+                        my $localcall = "chmod $privileges $parentdir \>\/dev\/null 2\>\&1";
+                        system($localcall);
                     }
                     else
                     {
@@ -240,11 +224,8 @@ sub create_directory_with_privileges
                     $infoline = "\nAttention: Created directory \"$directory\" in the second try.\n";
                     push(@installer::globals::logfileinfo, $infoline);
     
-                    if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-                    {
-                        my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-                        system($localcall);
-                    }			
+                    my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
+                    system($localcall);
                 }
                 else
                 {
@@ -272,11 +253,8 @@ sub create_directory_with_privileges
         $infoline = "\nAlready existing directory, did not create: $directory\n";
         push(@installer::globals::logfileinfo, $infoline);
 
-        if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-        {
-            my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
-        }			
+        my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
+        system($localcall);
     }
 }
 
@@ -1423,11 +1401,8 @@ sub try_to_create_directory
             $infoline = "\nCreated directory: $directory\n";
             push(@installer::globals::logfileinfo, $infoline);
     
-            if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-            {
-                my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
-                system($localcall);
-            }			
+            my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
         }
         else
         {
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index d7b5c6759..511da1800 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1697,12 +1697,10 @@ sub include_cabs_into_msi
 
     $msifilename = installer::converter::make_path_conform($msifilename);
 
-    if ( $ENV{'USE_SHELL'} ne "4nt" ) {
-        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-        $idtdirbase =~ s/\//\\\\/g;
-        $msifilename =~ s/\//\\\\/g;
-        $extraslash = "\\";
-    }
+    # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
+    $idtdirbase =~ s/\//\\\\/g;
+    $msifilename =~ s/\//\\\\/g;
+    $extraslash = "\\";
 
     my $allcabfiles = installer::systemactions::find_file_with_file_extension("cab", $installdir);
 
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
index 5f1b80bb6..10223f205 100644
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ b/solenv/bin/modules/installer/windows/sign.pm
@@ -583,10 +583,8 @@ sub extract_cabs_from_database
     my $fullsuccess = 1;
     my $msidb = "msidb.exe";	# Has to be in the path
 
-    if ( $ENV{'USE_SHELL'} ne "4nt" ) {
-        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-        $msidatabase =~ s/\//\\\\/g;
-    }
+    # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
+    $msidatabase =~ s/\//\\\\/g;
 
     foreach my $onefile ( keys %{$allcabfiles} )
     {
@@ -617,10 +615,8 @@ sub include_cabs_into_database
     my $fullsuccess = 1;
     my $msidb = "msidb.exe";	# Has to be in the path
 
-    if ( $ENV{'USE_SHELL'} ne "4nt" ) {
-        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-        $msidatabase =~ s/\//\\\\/g;
-    }
+    # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
+    $msidatabase =~ s/\//\\\\/g;
 
     foreach my $onefile ( keys %{$allcabfiles} )
     {
diff --git a/solenv/bin/modules/packager/globals.pm b/solenv/bin/modules/packager/globals.pm
index 2f7563837..7a50453cc 100644
--- a/solenv/bin/modules/packager/globals.pm
+++ b/solenv/bin/modules/packager/globals.pm
@@ -49,18 +49,9 @@ BEGIN
 
     $plat = $^O;
 
-    if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )))
-    {
-        $separator = "\\";
-        $iswin = 1;
-        $isunix = 0;
-    }
-    else
-    { 
-        $separator = "/";
-        $iswin = 0;
-        $isunix = 1;
-    }
+    $separator = "/";
+    $iswin = 0;
+    $isunix = 1;
 
 }
 
diff --git a/solenv/bin/modules/par2script/globals.pm b/solenv/bin/modules/par2script/globals.pm
index c7654de0d..70337a84e 100644
--- a/solenv/bin/modules/par2script/globals.pm
+++ b/solenv/bin/modules/par2script/globals.pm
@@ -69,20 +69,10 @@ BEGIN
         
     $plat = $^O;
 
-    if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )))
-    {
-        $separator = "\\";
-        $pathseparator = "\;";
-        $isunix = 0;
-        $iswin = 1;
-    }
-    else
-    { 
-        $separator = "/";
-        $pathseparator = "\:";
-        $isunix = 1;
-        $iswin = 0;
-    }
+    $separator = "/";
+    $pathseparator = "\:";
+    $isunix = 1;
+    $iswin = 0;
 
     $islinux = 0;
     $issolaris = 0;
diff --git a/solenv/bin/modules/par2script/parameter.pm b/solenv/bin/modules/par2script/parameter.pm
index 21bf7582b..f9e7f72a3 100644
--- a/solenv/bin/modules/par2script/parameter.pm
+++ b/solenv/bin/modules/par2script/parameter.pm
@@ -53,7 +53,7 @@ sub usage
     print <<Ende;
 
 --------------------------------------------------------------
-$par2script::globals::prog V1.0 (c) Ingo Schmidt 2003
+$par2script::globals::prog
 The following parameter are needed:
 -i: include pathes, comma separated list
 -o: setup script file name
diff --git a/solenv/bin/modules/pre2par/globals.pm b/solenv/bin/modules/pre2par/globals.pm
index acac397c3..dae508f96 100644
--- a/solenv/bin/modules/pre2par/globals.pm
+++ b/solenv/bin/modules/pre2par/globals.pm
@@ -55,20 +55,10 @@ BEGIN
     
     $plat = $^O;
 
-    if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )))
-    {
-        $separator = "\\";
-        $pathseparator = "\;";
-        $isunix = 0;
-        $iswin = 1;
-    }
-    else
-    { 
-        $separator = "/";
-        $pathseparator = "\:";
-        $isunix = 1;
-        $iswin = 0;
-    }
+    $separator = "/";
+    $pathseparator = "\:";
+    $isunix = 1;
+    $iswin = 0;
 
     $islinux = 0;
     $issolaris = 0;
diff --git a/solenv/bin/modules/pre2par/parameter.pm b/solenv/bin/modules/pre2par/parameter.pm
index 899d8ae4f..fda52bdea 100644
--- a/solenv/bin/modules/pre2par/parameter.pm
+++ b/solenv/bin/modules/pre2par/parameter.pm
@@ -45,7 +45,7 @@ sub usage
 {
     print <<Ende;
 ---------------------------------------------------------
-$pre2par::globals::prog V1.0 (c) Ingo Schmidt 2003
+$pre2par::globals::prog
 The following parameter are needed:
 -s: path to the pre file
 -o: path to the par file
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index a8851fd66..7f067abd6 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -208,14 +208,10 @@ finish
 		{
 			MWS_BUILD TRUE
 		}
-		common_a:0 IF %USE_SHELL% != 4nt
+		common_a
 		{
 			*o: cd %SOLARSRC%
 		}
-		common_a:1 IF %USE_SHELL% == 4nt
-		{
-			*o cdd %SOLARSRC%
-		}
 		common_jre:0 IF %JREPATH% ==
 		{
 			HIER set
@@ -299,7 +295,7 @@ finish
 			LIB %LIB%$;%JDKLIB%
 		}
 	}
-	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 ca cax cap common_a:0 common_a:1
+	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 ca cax cap common_a
 	switches 
 	{
 		cwsname CWS_WORK_STAMP
@@ -2808,7 +2804,7 @@ wntgcci1
 		{
 			SOLAR_ENV_ROOT r:
 			SOLAR_SOURCE_ROOT o:
-			USE_SHELL 4nt
+			USE_SHELL bash
 		}
 		common1 
 		{
@@ -2978,16 +2974,6 @@ wntgcci1
 	}
 	script 
 	{
-		4nt 
-		{
-			150: set MYENV_PATH=%PATH
-			160: set PATH=%SSX_PATH
-			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC%
-			260: set PATH=%MYENV_PATH
-			270: unset MYENV_PATH
-			400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
-			401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
-		}
 		csh 
 		{
 			150: setenv MYENV_PATH $PATH
@@ -3479,7 +3465,7 @@ wntmsci12
 			XCLASSPATH .
 			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
 		}
-		common0:0 IF %OSTYPE% == cygwin
+		common0
 		{
 			BS_ROOT n:
 			SOLAR_ENV_ROOT r:
@@ -3489,16 +3475,7 @@ wntmsci12
 			BTOOLDIR %WORK_STAMP%$/cygtools
 			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
 		}
-		common01:0 IF %OSTYPE% != cygwin
-		{
-			BS_ROOT n:
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-			USE_SHELL 4nt
-			BTOOLDIR %WORK_STAMP%
-			PERLDIR btw\%WORK_STAMP%\perl\bin\perl
-		}
-		common02:0 IF %OSTYPE% == cygwin
+		common02
 		{
 			PERL perl
 		}
@@ -3703,7 +3680,7 @@ wntmsci12
 		$dp(TMP)
 		$dp(TEMP)
 	}
-	order nojava common0:0 common01:0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02:0 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16  pre
+	order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16  pre
 	reset 
 	{
 		COPYALL 
@@ -3724,17 +3701,6 @@ wntmsci12
 	}
 	script 
 	{
-		4nt 
-		{
-			150: set MYENV_PATH=%PATH
-			160: set PATH=%SSX_PATH
-			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC% 
-			260: set PATH=%MYENV_PATH
-			270: unset MYENV_PATH
-			300: call pcleaner.btm
-			400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
-			401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
-		}
          sh
             {
             400: if [ $COPYALL ]; then
@@ -3755,16 +3721,6 @@ wntmsci12
             881:       echo $SO_GEN_ERROR2
             882: fi
         }
-		csh
-		{
-			400: if ( ${?COPYALL} ) perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
-            600: umask 002
-			800: rehash
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
 	}
 	switches 
 	{
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 30e7e62b6..22e23fcbd 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -1,7 +1,7 @@
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP1DEF = $(MISC)$/$(APP1TARGET).def
+APP1DEF = $(MISC)/$(APP1TARGET).def
 .ENDIF
 
 .IF "$(APP1LINKTYPE)" != ""
@@ -43,7 +43,7 @@ APP1OBJS+= $(STDOBJVCL)
 .IF "$(GUI)$(COM)" == "WNTGCC"
 APP1RESO=
 .IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
-APP1RESO=$(MISC)$/$(APP1TARGET:b)_res.o
+APP1RESO=$(MISC)/$(APP1TARGET:b)_res.o
 .ENDIF
 .ENDIF
 
@@ -61,13 +61,13 @@ APP1PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\"
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP1LIBS)"!=""
-$(MISC)$/$(APP1TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(APP1TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP1LIBS) $(i:s/.lib/.lin/)) >> $@
+    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP1LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          #"$(APP1LIBS)"!="" 
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(APP1TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(APP1TARGETN:b)_linkinc.ls
 $(APP1TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
@@ -75,7 +75,7 @@ $(APP1TARGETN) : $(LINKINCTARGETS)
 APP1LIBSALCPPRT*=$(LIBSALCPPRT)
 
 .IF "$(GUI)" == "OS2"
-_APP1IMP_ORD = $(APP1STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP1STDLIBS:^"$(LB)$/") 
+_APP1IMP_ORD = $(APP1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP1STDLIBS:^"$(LB)/") 
 APP1IMP_ORD = $(foreach,i,$(_APP1IMP_ORD) $(shell @-ls $i))
 .ELSE
 APP1IMP_ORD = 
@@ -86,73 +86,73 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     $(APP1IMP_ORD) \
     $(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
     @echo ------------------------------
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @-$(RM) $(MISC)$/$(@:b).strip
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP1OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
-    $(APP1LINKTYPEFLAG) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_1.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
+    `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    $(APP1LINKTYPEFLAG) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
-    @strip -i -R $(MISC)$/$(@:b).strip -X $@
+    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+    @strip -i -R $(MISC)/$(@:b).strip -X $@
     @ls -l $@
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP1RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making:   " $(@:f).app
+    @echo "Making: $@.app"
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    $(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
+    $(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+    cat $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
     @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)" == "WNT"
     @@-$(MKDIR) $(@:d:d)
 .IF "$(APP1LINKRES)" != ""
-    @@-$(RM) $(MISC)$/$(APP1LINKRES:b).rc
+    @@-$(RM) $(MISC)/$(APP1LINKRES:b).rc
 .IF "$(APP1ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP1ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP1LINKRES:b).rc
+    @-echo 1 ICON $(EMQ)"$(APP1ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
 .ENDIF		# "$(APP1ICON)" != ""
 .IF "$(APP1VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)$/$(APP1LINKRES:b).rc
+    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc
+    @-echo $(EMQ)#include  $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
 .ENDIF		# "$(APP1VERINFO)" != ""
-    $(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc
+    $(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
 .ENDIF			# "$(APP1LINKRES)" != ""
 .IF "$(COM)" == "GCC"
     @echo mingw
 .IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
-    @cat $(APP1LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) >  $(MISC)$/$(@:b)_all.res
-    windres $(MISC)$/$(@:b)_all.res $(APP1RESO)
+    @cat $(APP1LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) >  $(MISC)/$(@:b)_all.res
+    windres $(MISC)/$(@:b)_all.res $(APP1RESO)
 .ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \
-        -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP1RESO) \
+        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP1RESO) \
         `$(TYPE) /dev/null $(APP1LIBS) | sed s#$(ROUT)#$(OUT)#g` \
         $(APP_LINKTYPE) $(APP1LIBSALCPPRT) \
         -Wl,--start-group $(APP1STDLIBS) -Wl,--end-group $(APP1STDLIB) \
-        $(STDLIB1) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
+        $(STDLIB1) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
     @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
@@ -161,7 +161,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
         $(LINKFLAGSAPP) $(APP1BASEX) \
         $(APP1STACKN) \
         -out:$@ \
-        -map:$(MISC)$/{$(subst,$/,_ $(APP1TARGET)).map} \
+        -map:$(MISC)/{$(subst,/,_ $(APP1TARGET)).map} \
         $(STDOBJ) \
         $(APP1LINKRES) \
         $(APP1RES) \
@@ -172,7 +172,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
         )
     @-echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
@@ -197,17 +197,13 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
         $(APP1STDLIBS) \
         $(APP1STDLIB) $(STDLIB1))
         $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP1TARGETN:b)_linkobj.lst >> $(MISC)\$(APP1TARGET).lst
-        $(IFEXIST) $(MISC)$/$(APP1TARGET).lst $(THEN) type $(MISC)$/$(APP1TARGET).lst  >> $(MISC)$/$(APP1TARGET).lnk $(FI)
+        $(IFEXIST) $(MISC)/$(APP1TARGET).lst $(THEN) type $(MISC)/$(APP1TARGET).lst  >> $(MISC)/$(APP1TARGET).lnk $(FI)
         $(APP1LINKER) @$(MISC)\$(APP1TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
 .ENDIF		# "$(COM)" == "GCC"
 .IF "$(APP1TARGET)" == "loader"
     $(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     $(RM) $@
     $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -217,23 +213,19 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
 .IF "$(GUI)" == "OS2"
     @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
 .IF "$(APP1LINKRES)" != ""
-    @+-$(RM) $(MISC)$/$(APP1LINKRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(APP1LINKRES:b).rc >& $(NULLDEV)
 .IF "$(APP1ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
-    @-+echo ICON 1 "$(APP1ICON:s/\/\\/)" >> $(MISC)$/$(APP1LINKRES:b).rc
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP1LINKRES:b).rc
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP1LINKRES:b).rc
 .ENDIF		# "$(APP1ICON)" != ""
 .IF "$(APP1VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)$/$(APP1LINKRES:b).rc
+    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc
+    @-+echo $(EMQ)#include  $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
 .ENDIF		# "$(APP1VERINFO)" != ""
-    $(RC) -r -DOS2 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc
+    $(RC) -r -DOS2 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
 .ENDIF			# "$(APP1LINKRES)" != ""
 
 .IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP1TARGET) WINDOWAPI > $(MISC)$/$(APP1TARGET).def
+    @echo NAME $(APP1TARGET) WINDOWAPI > $(MISC)/$(APP1TARGET).def
 .ENDIF
 
     @+echo	$(APP1LINKFLAGS) \
@@ -241,7 +233,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
         $(APP1STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP1LINKRES) \
         $(APP1RES) \
@@ -256,7 +248,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
         $(APP1STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP1LINKRES) \
         $(APP1RES) \
@@ -269,11 +261,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
 
 .IF "$(APP1TARGET)" == "loader"
     +$(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     +$(RM) $@
     +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -287,7 +275,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP2DEF = $(MISC)$/$(APP2TARGET).def
+APP2DEF = $(MISC)/$(APP2TARGET).def
 .ENDIF
 
 .IF "$(APP2LINKTYPE)" != ""
@@ -329,7 +317,7 @@ APP2OBJS+= $(STDOBJVCL)
 .IF "$(GUI)$(COM)" == "WNTGCC"
 APP2RESO=
 .IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
-APP2RESO=$(MISC)$/$(APP2TARGET:b)_res.o
+APP2RESO=$(MISC)/$(APP2TARGET:b)_res.o
 .ENDIF
 .ENDIF
 
@@ -347,13 +335,13 @@ APP2PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\"
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP2LIBS)"!=""
-$(MISC)$/$(APP2TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(APP2TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP2LIBS) $(i:s/.lib/.lin/)) >> $@
+    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP2LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          #"$(APP2LIBS)"!="" 
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(APP2TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(APP2TARGETN:b)_linkinc.ls
 $(APP2TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
@@ -361,7 +349,7 @@ $(APP2TARGETN) : $(LINKINCTARGETS)
 APP2LIBSALCPPRT*=$(LIBSALCPPRT)
 
 .IF "$(GUI)" == "OS2"
-_APP2IMP_ORD = $(APP2STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP2STDLIBS:^"$(LB)$/") 
+_APP2IMP_ORD = $(APP2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP2STDLIBS:^"$(LB)/") 
 APP2IMP_ORD = $(foreach,i,$(_APP2IMP_ORD) $(shell @-ls $i))
 .ELSE
 APP2IMP_ORD = 
@@ -372,73 +360,73 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     $(APP2IMP_ORD) \
     $(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
     @echo ------------------------------
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @-$(RM) $(MISC)$/$(@:b).strip
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP2OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
-    $(APP2LINKTYPEFLAG) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_2.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
+    `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    $(APP2LINKTYPEFLAG) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
-    @strip -i -R $(MISC)$/$(@:b).strip -X $@
+    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+    @strip -i -R $(MISC)/$(@:b).strip -X $@
     @ls -l $@
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP2RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making:   " $(@:f).app
+    @echo "Making: $@.app"
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    $(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
+    $(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+    cat $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
     @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)" == "WNT"
     @@-$(MKDIR) $(@:d:d)
 .IF "$(APP2LINKRES)" != ""
-    @@-$(RM) $(MISC)$/$(APP2LINKRES:b).rc
+    @@-$(RM) $(MISC)/$(APP2LINKRES:b).rc
 .IF "$(APP2ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP2ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP2LINKRES:b).rc
+    @-echo 1 ICON $(EMQ)"$(APP2ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
 .ENDIF		# "$(APP2ICON)" != ""
 .IF "$(APP2VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)$/$(APP2LINKRES:b).rc
+    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc
+    @-echo $(EMQ)#include  $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
 .ENDIF		# "$(APP2VERINFO)" != ""
-    $(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc
+    $(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
 .ENDIF			# "$(APP2LINKRES)" != ""
 .IF "$(COM)" == "GCC"
     @echo mingw
 .IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
-    @cat $(APP2LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) >  $(MISC)$/$(@:b)_all.res
-    windres $(MISC)$/$(@:b)_all.res $(APP2RESO)
+    @cat $(APP2LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) >  $(MISC)/$(@:b)_all.res
+    windres $(MISC)/$(@:b)_all.res $(APP2RESO)
 .ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \
-        -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP2RESO) \
+        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP2RESO) \
         `$(TYPE) /dev/null $(APP2LIBS) | sed s#$(ROUT)#$(OUT)#g` \
         $(APP_LINKTYPE) $(APP2LIBSALCPPRT) \
         -Wl,--start-group $(APP2STDLIBS) -Wl,--end-group $(APP2STDLIB) \
-        $(STDLIB2) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
+        $(STDLIB2) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
     @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
@@ -447,7 +435,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
         $(LINKFLAGSAPP) $(APP2BASEX) \
         $(APP2STACKN) \
         -out:$@ \
-        -map:$(MISC)$/{$(subst,$/,_ $(APP2TARGET)).map} \
+        -map:$(MISC)/{$(subst,/,_ $(APP2TARGET)).map} \
         $(STDOBJ) \
         $(APP2LINKRES) \
         $(APP2RES) \
@@ -458,7 +446,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
         )
     @-echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
@@ -483,17 +471,13 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
         $(APP2STDLIBS) \
         $(APP2STDLIB) $(STDLIB2))
         $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP2TARGETN:b)_linkobj.lst >> $(MISC)\$(APP2TARGET).lst
-        $(IFEXIST) $(MISC)$/$(APP2TARGET).lst $(THEN) type $(MISC)$/$(APP2TARGET).lst  >> $(MISC)$/$(APP2TARGET).lnk $(FI)
+        $(IFEXIST) $(MISC)/$(APP2TARGET).lst $(THEN) type $(MISC)/$(APP2TARGET).lst  >> $(MISC)/$(APP2TARGET).lnk $(FI)
         $(APP2LINKER) @$(MISC)\$(APP2TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
 .ENDIF		# "$(COM)" == "GCC"
 .IF "$(APP2TARGET)" == "loader"
     $(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     $(RM) $@
     $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -503,23 +487,19 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
 .IF "$(GUI)" == "OS2"
     @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
 .IF "$(APP2LINKRES)" != ""
-    @+-$(RM) $(MISC)$/$(APP2LINKRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(APP2LINKRES:b).rc >& $(NULLDEV)
 .IF "$(APP2ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
-    @-+echo ICON 1 "$(APP2ICON:s/\/\\/)" >> $(MISC)$/$(APP2LINKRES:b).rc
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP2ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP2LINKRES:b).rc
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP2ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP2LINKRES:b).rc
 .ENDIF		# "$(APP2ICON)" != ""
 .IF "$(APP2VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)$/$(APP2LINKRES:b).rc
+    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc
+    @-+echo $(EMQ)#include  $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
 .ENDIF		# "$(APP2VERINFO)" != ""
-    $(RC) -r -DOS2 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc
+    $(RC) -r -DOS2 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
 .ENDIF			# "$(APP2LINKRES)" != ""
 
 .IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP2TARGET) WINDOWAPI > $(MISC)$/$(APP2TARGET).def
+    @echo NAME $(APP2TARGET) WINDOWAPI > $(MISC)/$(APP2TARGET).def
 .ENDIF
 
     @+echo	$(APP2LINKFLAGS) \
@@ -527,7 +507,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
         $(APP2STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP2LINKRES) \
         $(APP2RES) \
@@ -542,7 +522,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
         $(APP2STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP2LINKRES) \
         $(APP2RES) \
@@ -555,11 +535,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
 
 .IF "$(APP2TARGET)" == "loader"
     +$(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     +$(RM) $@
     +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -573,7 +549,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP3DEF = $(MISC)$/$(APP3TARGET).def
+APP3DEF = $(MISC)/$(APP3TARGET).def
 .ENDIF
 
 .IF "$(APP3LINKTYPE)" != ""
@@ -615,7 +591,7 @@ APP3OBJS+= $(STDOBJVCL)
 .IF "$(GUI)$(COM)" == "WNTGCC"
 APP3RESO=
 .IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
-APP3RESO=$(MISC)$/$(APP3TARGET:b)_res.o
+APP3RESO=$(MISC)/$(APP3TARGET:b)_res.o
 .ENDIF
 .ENDIF
 
@@ -633,13 +609,13 @@ APP3PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\"
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP3LIBS)"!=""
-$(MISC)$/$(APP3TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(APP3TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP3LIBS) $(i:s/.lib/.lin/)) >> $@
+    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP3LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          #"$(APP3LIBS)"!="" 
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(APP3TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(APP3TARGETN:b)_linkinc.ls
 $(APP3TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
@@ -647,7 +623,7 @@ $(APP3TARGETN) : $(LINKINCTARGETS)
 APP3LIBSALCPPRT*=$(LIBSALCPPRT)
 
 .IF "$(GUI)" == "OS2"
-_APP3IMP_ORD = $(APP3STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP3STDLIBS:^"$(LB)$/") 
+_APP3IMP_ORD = $(APP3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP3STDLIBS:^"$(LB)/") 
 APP3IMP_ORD = $(foreach,i,$(_APP3IMP_ORD) $(shell @-ls $i))
 .ELSE
 APP3IMP_ORD = 
@@ -658,73 +634,73 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     $(APP3IMP_ORD) \
     $(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
     @echo ------------------------------
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @-$(RM) $(MISC)$/$(@:b).strip
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP3OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
-    $(APP3LINKTYPEFLAG) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_3.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
+    `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    $(APP3LINKTYPEFLAG) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
-    @strip -i -R $(MISC)$/$(@:b).strip -X $@
+    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+    @strip -i -R $(MISC)/$(@:b).strip -X $@
     @ls -l $@
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP3RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making:   " $(@:f).app
+    @echo "Making: $@.app"
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    $(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
+    $(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+    cat $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
     @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)" == "WNT"
     @@-$(MKDIR) $(@:d:d)
 .IF "$(APP3LINKRES)" != ""
-    @@-$(RM) $(MISC)$/$(APP3LINKRES:b).rc
+    @@-$(RM) $(MISC)/$(APP3LINKRES:b).rc
 .IF "$(APP3ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP3ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP3LINKRES:b).rc
+    @-echo 1 ICON $(EMQ)"$(APP3ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
 .ENDIF		# "$(APP3ICON)" != ""
 .IF "$(APP3VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)$/$(APP3LINKRES:b).rc
+    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc
+    @-echo $(EMQ)#include  $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
 .ENDIF		# "$(APP3VERINFO)" != ""
-    $(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc
+    $(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
 .ENDIF			# "$(APP3LINKRES)" != ""
 .IF "$(COM)" == "GCC"
     @echo mingw
 .IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
-    @cat $(APP3LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) >  $(MISC)$/$(@:b)_all.res
-    windres $(MISC)$/$(@:b)_all.res $(APP3RESO)
+    @cat $(APP3LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) >  $(MISC)/$(@:b)_all.res
+    windres $(MISC)/$(@:b)_all.res $(APP3RESO)
 .ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \
-        -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP3RESO) \
+        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP3RESO) \
         `$(TYPE) /dev/null $(APP3LIBS) | sed s#$(ROUT)#$(OUT)#g` \
         $(APP_LINKTYPE) $(APP3LIBSALCPPRT) \
         -Wl,--start-group $(APP3STDLIBS) -Wl,--end-group $(APP3STDLIB) \
-        $(STDLIB3) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
+        $(STDLIB3) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
     @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
@@ -733,7 +709,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
         $(LINKFLAGSAPP) $(APP3BASEX) \
         $(APP3STACKN) \
         -out:$@ \
-        -map:$(MISC)$/{$(subst,$/,_ $(APP3TARGET)).map} \
+        -map:$(MISC)/{$(subst,/,_ $(APP3TARGET)).map} \
         $(STDOBJ) \
         $(APP3LINKRES) \
         $(APP3RES) \
@@ -744,7 +720,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
         )
     @-echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
@@ -769,17 +745,13 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
         $(APP3STDLIBS) \
         $(APP3STDLIB) $(STDLIB3))
         $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP3TARGETN:b)_linkobj.lst >> $(MISC)\$(APP3TARGET).lst
-        $(IFEXIST) $(MISC)$/$(APP3TARGET).lst $(THEN) type $(MISC)$/$(APP3TARGET).lst  >> $(MISC)$/$(APP3TARGET).lnk $(FI)
+        $(IFEXIST) $(MISC)/$(APP3TARGET).lst $(THEN) type $(MISC)/$(APP3TARGET).lst  >> $(MISC)/$(APP3TARGET).lnk $(FI)
         $(APP3LINKER) @$(MISC)\$(APP3TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
 .ENDIF		# "$(COM)" == "GCC"
 .IF "$(APP3TARGET)" == "loader"
     $(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     $(RM) $@
     $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -789,23 +761,19 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
 .IF "$(GUI)" == "OS2"
     @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
 .IF "$(APP3LINKRES)" != ""
-    @+-$(RM) $(MISC)$/$(APP3LINKRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(APP3LINKRES:b).rc >& $(NULLDEV)
 .IF "$(APP3ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
-    @-+echo ICON 1 "$(APP3ICON:s/\/\\/)" >> $(MISC)$/$(APP3LINKRES:b).rc
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP3ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP3LINKRES:b).rc
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP3ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP3LINKRES:b).rc
 .ENDIF		# "$(APP3ICON)" != ""
 .IF "$(APP3VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)$/$(APP3LINKRES:b).rc
+    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc
+    @-+echo $(EMQ)#include  $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
 .ENDIF		# "$(APP3VERINFO)" != ""
-    $(RC) -r -DOS2 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc
+    $(RC) -r -DOS2 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
 .ENDIF			# "$(APP3LINKRES)" != ""
 
 .IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP3TARGET) WINDOWAPI > $(MISC)$/$(APP3TARGET).def
+    @echo NAME $(APP3TARGET) WINDOWAPI > $(MISC)/$(APP3TARGET).def
 .ENDIF
 
     @+echo	$(APP3LINKFLAGS) \
@@ -813,7 +781,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
         $(APP3STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP3LINKRES) \
         $(APP3RES) \
@@ -828,7 +796,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
         $(APP3STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP3LINKRES) \
         $(APP3RES) \
@@ -841,11 +809,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
 
 .IF "$(APP3TARGET)" == "loader"
     +$(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     +$(RM) $@
     +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -859,7 +823,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP4DEF = $(MISC)$/$(APP4TARGET).def
+APP4DEF = $(MISC)/$(APP4TARGET).def
 .ENDIF
 
 .IF "$(APP4LINKTYPE)" != ""
@@ -901,7 +865,7 @@ APP4OBJS+= $(STDOBJVCL)
 .IF "$(GUI)$(COM)" == "WNTGCC"
 APP4RESO=
 .IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
-APP4RESO=$(MISC)$/$(APP4TARGET:b)_res.o
+APP4RESO=$(MISC)/$(APP4TARGET:b)_res.o
 .ENDIF
 .ENDIF
 
@@ -919,13 +883,13 @@ APP4PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\"
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP4LIBS)"!=""
-$(MISC)$/$(APP4TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(APP4TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP4LIBS) $(i:s/.lib/.lin/)) >> $@
+    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP4LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          #"$(APP4LIBS)"!="" 
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(APP4TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(APP4TARGETN:b)_linkinc.ls
 $(APP4TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
@@ -933,7 +897,7 @@ $(APP4TARGETN) : $(LINKINCTARGETS)
 APP4LIBSALCPPRT*=$(LIBSALCPPRT)
 
 .IF "$(GUI)" == "OS2"
-_APP4IMP_ORD = $(APP4STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP4STDLIBS:^"$(LB)$/") 
+_APP4IMP_ORD = $(APP4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP4STDLIBS:^"$(LB)/") 
 APP4IMP_ORD = $(foreach,i,$(_APP4IMP_ORD) $(shell @-ls $i))
 .ELSE
 APP4IMP_ORD = 
@@ -944,73 +908,73 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     $(APP4IMP_ORD) \
     $(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
     @echo ------------------------------
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @-$(RM) $(MISC)$/$(@:b).strip
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP4OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
-    $(APP4LINKTYPEFLAG) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_4.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
+    `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    $(APP4LINKTYPEFLAG) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
-    @strip -i -R $(MISC)$/$(@:b).strip -X $@
+    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+    @strip -i -R $(MISC)/$(@:b).strip -X $@
     @ls -l $@
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP4RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making:   " $(@:f).app
+    @echo "Making: $@.app"
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    $(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
+    $(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+    cat $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
     @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)" == "WNT"
     @@-$(MKDIR) $(@:d:d)
 .IF "$(APP4LINKRES)" != ""
-    @@-$(RM) $(MISC)$/$(APP4LINKRES:b).rc
+    @@-$(RM) $(MISC)/$(APP4LINKRES:b).rc
 .IF "$(APP4ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP4ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP4LINKRES:b).rc
+    @-echo 1 ICON $(EMQ)"$(APP4ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
 .ENDIF		# "$(APP4ICON)" != ""
 .IF "$(APP4VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)$/$(APP4LINKRES:b).rc
+    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc
+    @-echo $(EMQ)#include  $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
 .ENDIF		# "$(APP4VERINFO)" != ""
-    $(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc
+    $(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
 .ENDIF			# "$(APP4LINKRES)" != ""
 .IF "$(COM)" == "GCC"
     @echo mingw
 .IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
-    @cat $(APP4LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) >  $(MISC)$/$(@:b)_all.res
-    windres $(MISC)$/$(@:b)_all.res $(APP4RESO)
+    @cat $(APP4LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) >  $(MISC)/$(@:b)_all.res
+    windres $(MISC)/$(@:b)_all.res $(APP4RESO)
 .ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \
-        -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP4RESO) \
+        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP4RESO) \
         `$(TYPE) /dev/null $(APP4LIBS) | sed s#$(ROUT)#$(OUT)#g` \
         $(APP_LINKTYPE) $(APP4LIBSALCPPRT) \
         -Wl,--start-group $(APP4STDLIBS) -Wl,--end-group $(APP4STDLIB) \
-        $(STDLIB4) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
+        $(STDLIB4) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
     @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
@@ -1019,7 +983,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
         $(LINKFLAGSAPP) $(APP4BASEX) \
         $(APP4STACKN) \
         -out:$@ \
-        -map:$(MISC)$/{$(subst,$/,_ $(APP4TARGET)).map} \
+        -map:$(MISC)/{$(subst,/,_ $(APP4TARGET)).map} \
         $(STDOBJ) \
         $(APP4LINKRES) \
         $(APP4RES) \
@@ -1030,7 +994,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
         )
     @-echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
@@ -1055,17 +1019,13 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
         $(APP4STDLIBS) \
         $(APP4STDLIB) $(STDLIB4))
         $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP4TARGETN:b)_linkobj.lst >> $(MISC)\$(APP4TARGET).lst
-        $(IFEXIST) $(MISC)$/$(APP4TARGET).lst $(THEN) type $(MISC)$/$(APP4TARGET).lst  >> $(MISC)$/$(APP4TARGET).lnk $(FI)
+        $(IFEXIST) $(MISC)/$(APP4TARGET).lst $(THEN) type $(MISC)/$(APP4TARGET).lst  >> $(MISC)/$(APP4TARGET).lnk $(FI)
         $(APP4LINKER) @$(MISC)\$(APP4TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
 .ENDIF		# "$(COM)" == "GCC"
 .IF "$(APP4TARGET)" == "loader"
     $(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     $(RM) $@
     $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -1075,23 +1035,19 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
 .IF "$(GUI)" == "OS2"
     @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
 .IF "$(APP4LINKRES)" != ""
-    @+-$(RM) $(MISC)$/$(APP4LINKRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(APP4LINKRES:b).rc >& $(NULLDEV)
 .IF "$(APP4ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
-    @-+echo ICON 1 "$(APP4ICON:s/\/\\/)" >> $(MISC)$/$(APP4LINKRES:b).rc
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP4ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP4LINKRES:b).rc
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP4ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP4LINKRES:b).rc
 .ENDIF		# "$(APP4ICON)" != ""
 .IF "$(APP4VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)$/$(APP4LINKRES:b).rc
+    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc
+    @-+echo $(EMQ)#include  $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
 .ENDIF		# "$(APP4VERINFO)" != ""
-    $(RC) -r -DOS2 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc
+    $(RC) -r -DOS2 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
 .ENDIF			# "$(APP4LINKRES)" != ""
 
 .IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP4TARGET) WINDOWAPI > $(MISC)$/$(APP4TARGET).def
+    @echo NAME $(APP4TARGET) WINDOWAPI > $(MISC)/$(APP4TARGET).def
 .ENDIF
 
     @+echo	$(APP4LINKFLAGS) \
@@ -1099,7 +1055,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
         $(APP4STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP4LINKRES) \
         $(APP4RES) \
@@ -1114,7 +1070,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
         $(APP4STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP4LINKRES) \
         $(APP4RES) \
@@ -1127,11 +1083,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
 
 .IF "$(APP4TARGET)" == "loader"
     +$(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     +$(RM) $@
     +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -1145,7 +1097,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP5DEF = $(MISC)$/$(APP5TARGET).def
+APP5DEF = $(MISC)/$(APP5TARGET).def
 .ENDIF
 
 .IF "$(APP5LINKTYPE)" != ""
@@ -1187,7 +1139,7 @@ APP5OBJS+= $(STDOBJVCL)
 .IF "$(GUI)$(COM)" == "WNTGCC"
 APP5RESO=
 .IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
-APP5RESO=$(MISC)$/$(APP5TARGET:b)_res.o
+APP5RESO=$(MISC)/$(APP5TARGET:b)_res.o
 .ENDIF
 .ENDIF
 
@@ -1205,13 +1157,13 @@ APP5PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\"
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP5LIBS)"!=""
-$(MISC)$/$(APP5TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(APP5TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP5LIBS) $(i:s/.lib/.lin/)) >> $@
+    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP5LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          #"$(APP5LIBS)"!="" 
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(APP5TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(APP5TARGETN:b)_linkinc.ls
 $(APP5TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
@@ -1219,7 +1171,7 @@ $(APP5TARGETN) : $(LINKINCTARGETS)
 APP5LIBSALCPPRT*=$(LIBSALCPPRT)
 
 .IF "$(GUI)" == "OS2"
-_APP5IMP_ORD = $(APP5STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP5STDLIBS:^"$(LB)$/") 
+_APP5IMP_ORD = $(APP5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP5STDLIBS:^"$(LB)/") 
 APP5IMP_ORD = $(foreach,i,$(_APP5IMP_ORD) $(shell @-ls $i))
 .ELSE
 APP5IMP_ORD = 
@@ -1230,73 +1182,73 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     $(APP5IMP_ORD) \
     $(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
     @echo ------------------------------
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @-$(RM) $(MISC)$/$(@:b).strip
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP5OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
-    $(APP5LINKTYPEFLAG) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_5.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
+    `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    $(APP5LINKTYPEFLAG) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
-    @strip -i -R $(MISC)$/$(@:b).strip -X $@
+    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+    @strip -i -R $(MISC)/$(@:b).strip -X $@
     @ls -l $@
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP5RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making:   " $(@:f).app
+    @echo "Making: $@.app"
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    $(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
+    $(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+    cat $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
     @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)" == "WNT"
     @@-$(MKDIR) $(@:d:d)
 .IF "$(APP5LINKRES)" != ""
-    @@-$(RM) $(MISC)$/$(APP5LINKRES:b).rc
+    @@-$(RM) $(MISC)/$(APP5LINKRES:b).rc
 .IF "$(APP5ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP5ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP5LINKRES:b).rc
+    @-echo 1 ICON $(EMQ)"$(APP5ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
 .ENDIF		# "$(APP5ICON)" != ""
 .IF "$(APP5VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)$/$(APP5LINKRES:b).rc
+    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc
+    @-echo $(EMQ)#include  $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
 .ENDIF		# "$(APP5VERINFO)" != ""
-    $(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc
+    $(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
 .ENDIF			# "$(APP5LINKRES)" != ""
 .IF "$(COM)" == "GCC"
     @echo mingw
 .IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
-    @cat $(APP5LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) >  $(MISC)$/$(@:b)_all.res
-    windres $(MISC)$/$(@:b)_all.res $(APP5RESO)
+    @cat $(APP5LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) >  $(MISC)/$(@:b)_all.res
+    windres $(MISC)/$(@:b)_all.res $(APP5RESO)
 .ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \
-        -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP5RESO) \
+        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP5RESO) \
         `$(TYPE) /dev/null $(APP5LIBS) | sed s#$(ROUT)#$(OUT)#g` \
         $(APP_LINKTYPE) $(APP5LIBSALCPPRT) \
         -Wl,--start-group $(APP5STDLIBS) -Wl,--end-group $(APP5STDLIB) \
-        $(STDLIB5) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
+        $(STDLIB5) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
     @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
@@ -1305,7 +1257,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
         $(LINKFLAGSAPP) $(APP5BASEX) \
         $(APP5STACKN) \
         -out:$@ \
-        -map:$(MISC)$/{$(subst,$/,_ $(APP5TARGET)).map} \
+        -map:$(MISC)/{$(subst,/,_ $(APP5TARGET)).map} \
         $(STDOBJ) \
         $(APP5LINKRES) \
         $(APP5RES) \
@@ -1316,7 +1268,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
         )
     @-echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
@@ -1341,17 +1293,13 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
         $(APP5STDLIBS) \
         $(APP5STDLIB) $(STDLIB5))
         $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP5TARGETN:b)_linkobj.lst >> $(MISC)\$(APP5TARGET).lst
-        $(IFEXIST) $(MISC)$/$(APP5TARGET).lst $(THEN) type $(MISC)$/$(APP5TARGET).lst  >> $(MISC)$/$(APP5TARGET).lnk $(FI)
+        $(IFEXIST) $(MISC)/$(APP5TARGET).lst $(THEN) type $(MISC)/$(APP5TARGET).lst  >> $(MISC)/$(APP5TARGET).lnk $(FI)
         $(APP5LINKER) @$(MISC)\$(APP5TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
 .ENDIF		# "$(COM)" == "GCC"
 .IF "$(APP5TARGET)" == "loader"
     $(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     $(RM) $@
     $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -1361,23 +1309,19 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
 .IF "$(GUI)" == "OS2"
     @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
 .IF "$(APP5LINKRES)" != ""
-    @+-$(RM) $(MISC)$/$(APP5LINKRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(APP5LINKRES:b).rc >& $(NULLDEV)
 .IF "$(APP5ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
-    @-+echo ICON 1 "$(APP5ICON:s/\/\\/)" >> $(MISC)$/$(APP5LINKRES:b).rc
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP5ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP5LINKRES:b).rc
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP5ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP5LINKRES:b).rc
 .ENDIF		# "$(APP5ICON)" != ""
 .IF "$(APP5VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)$/$(APP5LINKRES:b).rc
+    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc
+    @-+echo $(EMQ)#include  $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
 .ENDIF		# "$(APP5VERINFO)" != ""
-    $(RC) -r -DOS2 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc
+    $(RC) -r -DOS2 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
 .ENDIF			# "$(APP5LINKRES)" != ""
 
 .IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP5TARGET) WINDOWAPI > $(MISC)$/$(APP5TARGET).def
+    @echo NAME $(APP5TARGET) WINDOWAPI > $(MISC)/$(APP5TARGET).def
 .ENDIF
 
     @+echo	$(APP5LINKFLAGS) \
@@ -1385,7 +1329,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
         $(APP5STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP5LINKRES) \
         $(APP5RES) \
@@ -1400,7 +1344,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
         $(APP5STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP5LINKRES) \
         $(APP5RES) \
@@ -1413,11 +1357,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
 
 .IF "$(APP5TARGET)" == "loader"
     +$(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     +$(RM) $@
     +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -1431,7 +1371,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP6DEF = $(MISC)$/$(APP6TARGET).def
+APP6DEF = $(MISC)/$(APP6TARGET).def
 .ENDIF
 
 .IF "$(APP6LINKTYPE)" != ""
@@ -1473,7 +1413,7 @@ APP6OBJS+= $(STDOBJVCL)
 .IF "$(GUI)$(COM)" == "WNTGCC"
 APP6RESO=
 .IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
-APP6RESO=$(MISC)$/$(APP6TARGET:b)_res.o
+APP6RESO=$(MISC)/$(APP6TARGET:b)_res.o
 .ENDIF
 .ENDIF
 
@@ -1491,13 +1431,13 @@ APP6PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\"
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP6LIBS)"!=""
-$(MISC)$/$(APP6TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(APP6TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP6LIBS) $(i:s/.lib/.lin/)) >> $@
+    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP6LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          #"$(APP6LIBS)"!="" 
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(APP6TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(APP6TARGETN:b)_linkinc.ls
 $(APP6TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
@@ -1505,7 +1445,7 @@ $(APP6TARGETN) : $(LINKINCTARGETS)
 APP6LIBSALCPPRT*=$(LIBSALCPPRT)
 
 .IF "$(GUI)" == "OS2"
-_APP6IMP_ORD = $(APP6STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP6STDLIBS:^"$(LB)$/") 
+_APP6IMP_ORD = $(APP6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP6STDLIBS:^"$(LB)/") 
 APP6IMP_ORD = $(foreach,i,$(_APP6IMP_ORD) $(shell @-ls $i))
 .ELSE
 APP6IMP_ORD = 
@@ -1516,73 +1456,73 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     $(APP6IMP_ORD) \
     $(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
     @echo ------------------------------
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @-$(RM) $(MISC)$/$(@:b).strip
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP6OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
-    $(APP6LINKTYPEFLAG) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_6.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
+    `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    $(APP6LINKTYPEFLAG) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
-    @strip -i -R $(MISC)$/$(@:b).strip -X $@
+    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+    @strip -i -R $(MISC)/$(@:b).strip -X $@
     @ls -l $@
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP6RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making:   " $(@:f).app
+    @echo "Making: $@.app"
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    $(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
+    $(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+    cat $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
     @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)" == "WNT"
     @@-$(MKDIR) $(@:d:d)
 .IF "$(APP6LINKRES)" != ""
-    @@-$(RM) $(MISC)$/$(APP6LINKRES:b).rc
+    @@-$(RM) $(MISC)/$(APP6LINKRES:b).rc
 .IF "$(APP6ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP6ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP6LINKRES:b).rc
+    @-echo 1 ICON $(EMQ)"$(APP6ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
 .ENDIF		# "$(APP6ICON)" != ""
 .IF "$(APP6VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)$/$(APP6LINKRES:b).rc
+    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc
+    @-echo $(EMQ)#include  $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
 .ENDIF		# "$(APP6VERINFO)" != ""
-    $(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc
+    $(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
 .ENDIF			# "$(APP6LINKRES)" != ""
 .IF "$(COM)" == "GCC"
     @echo mingw
 .IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
-    @cat $(APP6LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) >  $(MISC)$/$(@:b)_all.res
-    windres $(MISC)$/$(@:b)_all.res $(APP6RESO)
+    @cat $(APP6LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) >  $(MISC)/$(@:b)_all.res
+    windres $(MISC)/$(@:b)_all.res $(APP6RESO)
 .ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \
-        -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP6RESO) \
+        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP6RESO) \
         `$(TYPE) /dev/null $(APP6LIBS) | sed s#$(ROUT)#$(OUT)#g` \
         $(APP_LINKTYPE) $(APP6LIBSALCPPRT) \
         -Wl,--start-group $(APP6STDLIBS) -Wl,--end-group $(APP6STDLIB) \
-        $(STDLIB6) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
+        $(STDLIB6) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
     @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
@@ -1591,7 +1531,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
         $(LINKFLAGSAPP) $(APP6BASEX) \
         $(APP6STACKN) \
         -out:$@ \
-        -map:$(MISC)$/{$(subst,$/,_ $(APP6TARGET)).map} \
+        -map:$(MISC)/{$(subst,/,_ $(APP6TARGET)).map} \
         $(STDOBJ) \
         $(APP6LINKRES) \
         $(APP6RES) \
@@ -1602,7 +1542,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
         )
     @-echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
@@ -1627,17 +1567,13 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
         $(APP6STDLIBS) \
         $(APP6STDLIB) $(STDLIB6))
         $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP6TARGETN:b)_linkobj.lst >> $(MISC)\$(APP6TARGET).lst
-        $(IFEXIST) $(MISC)$/$(APP6TARGET).lst $(THEN) type $(MISC)$/$(APP6TARGET).lst  >> $(MISC)$/$(APP6TARGET).lnk $(FI)
+        $(IFEXIST) $(MISC)/$(APP6TARGET).lst $(THEN) type $(MISC)/$(APP6TARGET).lst  >> $(MISC)/$(APP6TARGET).lnk $(FI)
         $(APP6LINKER) @$(MISC)\$(APP6TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
 .ENDIF		# "$(COM)" == "GCC"
 .IF "$(APP6TARGET)" == "loader"
     $(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     $(RM) $@
     $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -1647,23 +1583,19 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
 .IF "$(GUI)" == "OS2"
     @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
 .IF "$(APP6LINKRES)" != ""
-    @+-$(RM) $(MISC)$/$(APP6LINKRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(APP6LINKRES:b).rc >& $(NULLDEV)
 .IF "$(APP6ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
-    @-+echo ICON 1 "$(APP6ICON:s/\/\\/)" >> $(MISC)$/$(APP6LINKRES:b).rc
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP6ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP6LINKRES:b).rc
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP6ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP6LINKRES:b).rc
 .ENDIF		# "$(APP6ICON)" != ""
 .IF "$(APP6VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)$/$(APP6LINKRES:b).rc
+    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc
+    @-+echo $(EMQ)#include  $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
 .ENDIF		# "$(APP6VERINFO)" != ""
-    $(RC) -r -DOS2 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc
+    $(RC) -r -DOS2 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
 .ENDIF			# "$(APP6LINKRES)" != ""
 
 .IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP6TARGET) WINDOWAPI > $(MISC)$/$(APP6TARGET).def
+    @echo NAME $(APP6TARGET) WINDOWAPI > $(MISC)/$(APP6TARGET).def
 .ENDIF
 
     @+echo	$(APP6LINKFLAGS) \
@@ -1671,7 +1603,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
         $(APP6STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP6LINKRES) \
         $(APP6RES) \
@@ -1686,7 +1618,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
         $(APP6STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP6LINKRES) \
         $(APP6RES) \
@@ -1699,11 +1631,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
 
 .IF "$(APP6TARGET)" == "loader"
     +$(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     +$(RM) $@
     +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -1717,7 +1645,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP7DEF = $(MISC)$/$(APP7TARGET).def
+APP7DEF = $(MISC)/$(APP7TARGET).def
 .ENDIF
 
 .IF "$(APP7LINKTYPE)" != ""
@@ -1759,7 +1687,7 @@ APP7OBJS+= $(STDOBJVCL)
 .IF "$(GUI)$(COM)" == "WNTGCC"
 APP7RESO=
 .IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
-APP7RESO=$(MISC)$/$(APP7TARGET:b)_res.o
+APP7RESO=$(MISC)/$(APP7TARGET:b)_res.o
 .ENDIF
 .ENDIF
 
@@ -1777,13 +1705,13 @@ APP7PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\"
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP7LIBS)"!=""
-$(MISC)$/$(APP7TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(APP7TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP7LIBS) $(i:s/.lib/.lin/)) >> $@
+    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP7LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          #"$(APP7LIBS)"!="" 
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(APP7TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(APP7TARGETN:b)_linkinc.ls
 $(APP7TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
@@ -1791,7 +1719,7 @@ $(APP7TARGETN) : $(LINKINCTARGETS)
 APP7LIBSALCPPRT*=$(LIBSALCPPRT)
 
 .IF "$(GUI)" == "OS2"
-_APP7IMP_ORD = $(APP7STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP7STDLIBS:^"$(LB)$/") 
+_APP7IMP_ORD = $(APP7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP7STDLIBS:^"$(LB)/") 
 APP7IMP_ORD = $(foreach,i,$(_APP7IMP_ORD) $(shell @-ls $i))
 .ELSE
 APP7IMP_ORD = 
@@ -1802,73 +1730,73 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     $(APP7IMP_ORD) \
     $(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
     @echo ------------------------------
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @-$(RM) $(MISC)$/$(@:b).strip
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP7OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
-    $(APP7LINKTYPEFLAG) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_7.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
+    `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    $(APP7LINKTYPEFLAG) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
-    @strip -i -R $(MISC)$/$(@:b).strip -X $@
+    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+    @strip -i -R $(MISC)/$(@:b).strip -X $@
     @ls -l $@
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP7RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making:   " $(@:f).app
+    @echo "Making: $@.app"
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    $(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
+    $(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+    cat $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
     @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)" == "WNT"
     @@-$(MKDIR) $(@:d:d)
 .IF "$(APP7LINKRES)" != ""
-    @@-$(RM) $(MISC)$/$(APP7LINKRES:b).rc
+    @@-$(RM) $(MISC)/$(APP7LINKRES:b).rc
 .IF "$(APP7ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP7ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP7LINKRES:b).rc
+    @-echo 1 ICON $(EMQ)"$(APP7ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
 .ENDIF		# "$(APP7ICON)" != ""
 .IF "$(APP7VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)$/$(APP7LINKRES:b).rc
+    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc
+    @-echo $(EMQ)#include  $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
 .ENDIF		# "$(APP7VERINFO)" != ""
-    $(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc
+    $(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
 .ENDIF			# "$(APP7LINKRES)" != ""
 .IF "$(COM)" == "GCC"
     @echo mingw
 .IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
-    @cat $(APP7LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) >  $(MISC)$/$(@:b)_all.res
-    windres $(MISC)$/$(@:b)_all.res $(APP7RESO)
+    @cat $(APP7LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) >  $(MISC)/$(@:b)_all.res
+    windres $(MISC)/$(@:b)_all.res $(APP7RESO)
 .ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \
-        -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP7RESO) \
+        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP7RESO) \
         `$(TYPE) /dev/null $(APP7LIBS) | sed s#$(ROUT)#$(OUT)#g` \
         $(APP_LINKTYPE) $(APP7LIBSALCPPRT) \
         -Wl,--start-group $(APP7STDLIBS) -Wl,--end-group $(APP7STDLIB) \
-        $(STDLIB7) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
+        $(STDLIB7) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
     @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
@@ -1877,7 +1805,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
         $(LINKFLAGSAPP) $(APP7BASEX) \
         $(APP7STACKN) \
         -out:$@ \
-        -map:$(MISC)$/{$(subst,$/,_ $(APP7TARGET)).map} \
+        -map:$(MISC)/{$(subst,/,_ $(APP7TARGET)).map} \
         $(STDOBJ) \
         $(APP7LINKRES) \
         $(APP7RES) \
@@ -1888,7 +1816,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
         )
     @-echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
@@ -1913,17 +1841,13 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
         $(APP7STDLIBS) \
         $(APP7STDLIB) $(STDLIB7))
         $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP7TARGETN:b)_linkobj.lst >> $(MISC)\$(APP7TARGET).lst
-        $(IFEXIST) $(MISC)$/$(APP7TARGET).lst $(THEN) type $(MISC)$/$(APP7TARGET).lst  >> $(MISC)$/$(APP7TARGET).lnk $(FI)
+        $(IFEXIST) $(MISC)/$(APP7TARGET).lst $(THEN) type $(MISC)/$(APP7TARGET).lst  >> $(MISC)/$(APP7TARGET).lnk $(FI)
         $(APP7LINKER) @$(MISC)\$(APP7TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
 .ENDIF		# "$(COM)" == "GCC"
 .IF "$(APP7TARGET)" == "loader"
     $(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     $(RM) $@
     $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -1933,23 +1857,19 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
 .IF "$(GUI)" == "OS2"
     @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
 .IF "$(APP7LINKRES)" != ""
-    @+-$(RM) $(MISC)$/$(APP7LINKRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(APP7LINKRES:b).rc >& $(NULLDEV)
 .IF "$(APP7ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
-    @-+echo ICON 1 "$(APP7ICON:s/\/\\/)" >> $(MISC)$/$(APP7LINKRES:b).rc
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP7ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP7LINKRES:b).rc
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP7ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP7LINKRES:b).rc
 .ENDIF		# "$(APP7ICON)" != ""
 .IF "$(APP7VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)$/$(APP7LINKRES:b).rc
+    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc
+    @-+echo $(EMQ)#include  $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
 .ENDIF		# "$(APP7VERINFO)" != ""
-    $(RC) -r -DOS2 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc
+    $(RC) -r -DOS2 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
 .ENDIF			# "$(APP7LINKRES)" != ""
 
 .IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP7TARGET) WINDOWAPI > $(MISC)$/$(APP7TARGET).def
+    @echo NAME $(APP7TARGET) WINDOWAPI > $(MISC)/$(APP7TARGET).def
 .ENDIF
 
     @+echo	$(APP7LINKFLAGS) \
@@ -1957,7 +1877,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
         $(APP7STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP7LINKRES) \
         $(APP7RES) \
@@ -1972,7 +1892,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
         $(APP7STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP7LINKRES) \
         $(APP7RES) \
@@ -1985,11 +1905,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
 
 .IF "$(APP7TARGET)" == "loader"
     +$(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     +$(RM) $@
     +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -2003,7 +1919,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP8DEF = $(MISC)$/$(APP8TARGET).def
+APP8DEF = $(MISC)/$(APP8TARGET).def
 .ENDIF
 
 .IF "$(APP8LINKTYPE)" != ""
@@ -2045,7 +1961,7 @@ APP8OBJS+= $(STDOBJVCL)
 .IF "$(GUI)$(COM)" == "WNTGCC"
 APP8RESO=
 .IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
-APP8RESO=$(MISC)$/$(APP8TARGET:b)_res.o
+APP8RESO=$(MISC)/$(APP8TARGET:b)_res.o
 .ENDIF
 .ENDIF
 
@@ -2063,13 +1979,13 @@ APP8PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\"
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP8LIBS)"!=""
-$(MISC)$/$(APP8TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(APP8TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP8LIBS) $(i:s/.lib/.lin/)) >> $@
+    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP8LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          #"$(APP8LIBS)"!="" 
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(APP8TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(APP8TARGETN:b)_linkinc.ls
 $(APP8TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
@@ -2077,7 +1993,7 @@ $(APP8TARGETN) : $(LINKINCTARGETS)
 APP8LIBSALCPPRT*=$(LIBSALCPPRT)
 
 .IF "$(GUI)" == "OS2"
-_APP8IMP_ORD = $(APP8STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP8STDLIBS:^"$(LB)$/") 
+_APP8IMP_ORD = $(APP8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP8STDLIBS:^"$(LB)/") 
 APP8IMP_ORD = $(foreach,i,$(_APP8IMP_ORD) $(shell @-ls $i))
 .ELSE
 APP8IMP_ORD = 
@@ -2088,73 +2004,73 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     $(APP8IMP_ORD) \
     $(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
     @echo ------------------------------
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @-$(RM) $(MISC)$/$(@:b).strip
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP8OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
-    $(APP8LINKTYPEFLAG) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_8.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
+    `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    $(APP8LINKTYPEFLAG) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
-    @strip -i -R $(MISC)$/$(@:b).strip -X $@
+    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+    @strip -i -R $(MISC)/$(@:b).strip -X $@
     @ls -l $@
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP8RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making:   " $(@:f).app
+    @echo "Making: $@.app"
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    $(APP8OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
+    $(APP8OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+    cat $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
     @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)" == "WNT"
     @@-$(MKDIR) $(@:d:d)
 .IF "$(APP8LINKRES)" != ""
-    @@-$(RM) $(MISC)$/$(APP8LINKRES:b).rc
+    @@-$(RM) $(MISC)/$(APP8LINKRES:b).rc
 .IF "$(APP8ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP8ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP8LINKRES:b).rc
+    @-echo 1 ICON $(EMQ)"$(APP8ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
 .ENDIF		# "$(APP8ICON)" != ""
 .IF "$(APP8VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)$/$(APP8LINKRES:b).rc
+    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc
+    @-echo $(EMQ)#include  $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
 .ENDIF		# "$(APP8VERINFO)" != ""
-    $(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc
+    $(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
 .ENDIF			# "$(APP8LINKRES)" != ""
 .IF "$(COM)" == "GCC"
     @echo mingw
 .IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
-    @cat $(APP8LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) >  $(MISC)$/$(@:b)_all.res
-    windres $(MISC)$/$(@:b)_all.res $(APP8RESO)
+    @cat $(APP8LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) >  $(MISC)/$(@:b)_all.res
+    windres $(MISC)/$(@:b)_all.res $(APP8RESO)
 .ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \
-        -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP8RESO) \
+        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP8RESO) \
         `$(TYPE) /dev/null $(APP8LIBS) | sed s#$(ROUT)#$(OUT)#g` \
         $(APP_LINKTYPE) $(APP8LIBSALCPPRT) \
         -Wl,--start-group $(APP8STDLIBS) -Wl,--end-group $(APP8STDLIB) \
-        $(STDLIB8) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
+        $(STDLIB8) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
     @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
@@ -2163,7 +2079,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
         $(LINKFLAGSAPP) $(APP8BASEX) \
         $(APP8STACKN) \
         -out:$@ \
-        -map:$(MISC)$/{$(subst,$/,_ $(APP8TARGET)).map} \
+        -map:$(MISC)/{$(subst,/,_ $(APP8TARGET)).map} \
         $(STDOBJ) \
         $(APP8LINKRES) \
         $(APP8RES) \
@@ -2174,7 +2090,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
         )
     @-echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
@@ -2199,17 +2115,13 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
         $(APP8STDLIBS) \
         $(APP8STDLIB) $(STDLIB8))
         $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP8TARGETN:b)_linkobj.lst >> $(MISC)\$(APP8TARGET).lst
-        $(IFEXIST) $(MISC)$/$(APP8TARGET).lst $(THEN) type $(MISC)$/$(APP8TARGET).lst  >> $(MISC)$/$(APP8TARGET).lnk $(FI)
+        $(IFEXIST) $(MISC)/$(APP8TARGET).lst $(THEN) type $(MISC)/$(APP8TARGET).lst  >> $(MISC)/$(APP8TARGET).lnk $(FI)
         $(APP8LINKER) @$(MISC)\$(APP8TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
 .ENDIF		# "$(COM)" == "GCC"
 .IF "$(APP8TARGET)" == "loader"
     $(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     $(RM) $@
     $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -2219,23 +2131,19 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
 .IF "$(GUI)" == "OS2"
     @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
 .IF "$(APP8LINKRES)" != ""
-    @+-$(RM) $(MISC)$/$(APP8LINKRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(APP8LINKRES:b).rc >& $(NULLDEV)
 .IF "$(APP8ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
-    @-+echo ICON 1 "$(APP8ICON:s/\/\\/)" >> $(MISC)$/$(APP8LINKRES:b).rc
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP8ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP8LINKRES:b).rc
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP8ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP8LINKRES:b).rc
 .ENDIF		# "$(APP8ICON)" != ""
 .IF "$(APP8VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)$/$(APP8LINKRES:b).rc
+    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc
+    @-+echo $(EMQ)#include  $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
 .ENDIF		# "$(APP8VERINFO)" != ""
-    $(RC) -r -DOS2 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc
+    $(RC) -r -DOS2 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
 .ENDIF			# "$(APP8LINKRES)" != ""
 
 .IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP8TARGET) WINDOWAPI > $(MISC)$/$(APP8TARGET).def
+    @echo NAME $(APP8TARGET) WINDOWAPI > $(MISC)/$(APP8TARGET).def
 .ENDIF
 
     @+echo	$(APP8LINKFLAGS) \
@@ -2243,7 +2151,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
         $(APP8STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP8LINKRES) \
         $(APP8RES) \
@@ -2258,7 +2166,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
         $(APP8STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP8LINKRES) \
         $(APP8RES) \
@@ -2271,11 +2179,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
 
 .IF "$(APP8TARGET)" == "loader"
     +$(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     +$(RM) $@
     +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -2289,7 +2193,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP9DEF = $(MISC)$/$(APP9TARGET).def
+APP9DEF = $(MISC)/$(APP9TARGET).def
 .ENDIF
 
 .IF "$(APP9LINKTYPE)" != ""
@@ -2331,7 +2235,7 @@ APP9OBJS+= $(STDOBJVCL)
 .IF "$(GUI)$(COM)" == "WNTGCC"
 APP9RESO=
 .IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
-APP9RESO=$(MISC)$/$(APP9TARGET:b)_res.o
+APP9RESO=$(MISC)/$(APP9TARGET:b)_res.o
 .ENDIF
 .ENDIF
 
@@ -2349,13 +2253,13 @@ APP9PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\"
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP9LIBS)"!=""
-$(MISC)$/$(APP9TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(APP9TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP9LIBS) $(i:s/.lib/.lin/)) >> $@
+    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP9LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          #"$(APP9LIBS)"!="" 
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(APP9TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(APP9TARGETN:b)_linkinc.ls
 $(APP9TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
@@ -2363,7 +2267,7 @@ $(APP9TARGETN) : $(LINKINCTARGETS)
 APP9LIBSALCPPRT*=$(LIBSALCPPRT)
 
 .IF "$(GUI)" == "OS2"
-_APP9IMP_ORD = $(APP9STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP9STDLIBS:^"$(LB)$/") 
+_APP9IMP_ORD = $(APP9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP9STDLIBS:^"$(LB)/") 
 APP9IMP_ORD = $(foreach,i,$(_APP9IMP_ORD) $(shell @-ls $i))
 .ELSE
 APP9IMP_ORD = 
@@ -2374,73 +2278,73 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     $(APP9IMP_ORD) \
     $(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
     @echo ------------------------------
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @-$(RM) $(MISC)$/$(@:b).strip
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP9OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
-    $(APP9LINKTYPEFLAG) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_9.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
+    `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    $(APP9LINKTYPEFLAG) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
-    @strip -i -R $(MISC)$/$(@:b).strip -X $@
+    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+    @strip -i -R $(MISC)/$(@:b).strip -X $@
     @ls -l $@
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP9RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making:   " $(@:f).app
+    @echo "Making: $@.app"
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    $(APP9OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
+    $(APP9OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+    cat $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
     @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)" == "WNT"
     @@-$(MKDIR) $(@:d:d)
 .IF "$(APP9LINKRES)" != ""
-    @@-$(RM) $(MISC)$/$(APP9LINKRES:b).rc
+    @@-$(RM) $(MISC)/$(APP9LINKRES:b).rc
 .IF "$(APP9ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP9ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP9LINKRES:b).rc
+    @-echo 1 ICON $(EMQ)"$(APP9ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
 .ENDIF		# "$(APP9ICON)" != ""
 .IF "$(APP9VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)$/$(APP9LINKRES:b).rc
+    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc
+    @-echo $(EMQ)#include  $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
 .ENDIF		# "$(APP9VERINFO)" != ""
-    $(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc
+    $(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
 .ENDIF			# "$(APP9LINKRES)" != ""
 .IF "$(COM)" == "GCC"
     @echo mingw
 .IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
-    @cat $(APP9LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) >  $(MISC)$/$(@:b)_all.res
-    windres $(MISC)$/$(@:b)_all.res $(APP9RESO)
+    @cat $(APP9LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) >  $(MISC)/$(@:b)_all.res
+    windres $(MISC)/$(@:b)_all.res $(APP9RESO)
 .ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \
-        -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP9RESO) \
+        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP9RESO) \
         `$(TYPE) /dev/null $(APP9LIBS) | sed s#$(ROUT)#$(OUT)#g` \
         $(APP_LINKTYPE) $(APP9LIBSALCPPRT) \
         -Wl,--start-group $(APP9STDLIBS) -Wl,--end-group $(APP9STDLIB) \
-        $(STDLIB9) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
+        $(STDLIB9) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
     @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
@@ -2449,7 +2353,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
         $(LINKFLAGSAPP) $(APP9BASEX) \
         $(APP9STACKN) \
         -out:$@ \
-        -map:$(MISC)$/{$(subst,$/,_ $(APP9TARGET)).map} \
+        -map:$(MISC)/{$(subst,/,_ $(APP9TARGET)).map} \
         $(STDOBJ) \
         $(APP9LINKRES) \
         $(APP9RES) \
@@ -2460,7 +2364,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
         )
     @-echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
@@ -2485,17 +2389,13 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
         $(APP9STDLIBS) \
         $(APP9STDLIB) $(STDLIB9))
         $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP9TARGETN:b)_linkobj.lst >> $(MISC)\$(APP9TARGET).lst
-        $(IFEXIST) $(MISC)$/$(APP9TARGET).lst $(THEN) type $(MISC)$/$(APP9TARGET).lst  >> $(MISC)$/$(APP9TARGET).lnk $(FI)
+        $(IFEXIST) $(MISC)/$(APP9TARGET).lst $(THEN) type $(MISC)/$(APP9TARGET).lst  >> $(MISC)/$(APP9TARGET).lnk $(FI)
         $(APP9LINKER) @$(MISC)\$(APP9TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
 .ENDIF		# "$(COM)" == "GCC"
 .IF "$(APP9TARGET)" == "loader"
     $(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     $(RM) $@
     $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -2505,23 +2405,19 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
 .IF "$(GUI)" == "OS2"
     @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
 .IF "$(APP9LINKRES)" != ""
-    @+-$(RM) $(MISC)$/$(APP9LINKRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(APP9LINKRES:b).rc >& $(NULLDEV)
 .IF "$(APP9ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
-    @-+echo ICON 1 "$(APP9ICON:s/\/\\/)" >> $(MISC)$/$(APP9LINKRES:b).rc
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP9ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP9LINKRES:b).rc
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP9ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP9LINKRES:b).rc
 .ENDIF		# "$(APP9ICON)" != ""
 .IF "$(APP9VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)$/$(APP9LINKRES:b).rc
+    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc
+    @-+echo $(EMQ)#include  $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
 .ENDIF		# "$(APP9VERINFO)" != ""
-    $(RC) -r -DOS2 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc
+    $(RC) -r -DOS2 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
 .ENDIF			# "$(APP9LINKRES)" != ""
 
 .IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP9TARGET) WINDOWAPI > $(MISC)$/$(APP9TARGET).def
+    @echo NAME $(APP9TARGET) WINDOWAPI > $(MISC)/$(APP9TARGET).def
 .ENDIF
 
     @+echo	$(APP9LINKFLAGS) \
@@ -2529,7 +2425,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
         $(APP9STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP9LINKRES) \
         $(APP9RES) \
@@ -2544,7 +2440,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
         $(APP9STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP9LINKRES) \
         $(APP9RES) \
@@ -2557,11 +2453,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
 
 .IF "$(APP9TARGET)" == "loader"
     +$(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     +$(RM) $@
     +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -2575,7 +2467,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP10DEF = $(MISC)$/$(APP10TARGET).def
+APP10DEF = $(MISC)/$(APP10TARGET).def
 .ENDIF
 
 .IF "$(APP10LINKTYPE)" != ""
@@ -2617,7 +2509,7 @@ APP10OBJS+= $(STDOBJVCL)
 .IF "$(GUI)$(COM)" == "WNTGCC"
 APP10RESO=
 .IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
-APP10RESO=$(MISC)$/$(APP10TARGET:b)_res.o
+APP10RESO=$(MISC)/$(APP10TARGET:b)_res.o
 .ENDIF
 .ENDIF
 
@@ -2635,13 +2527,13 @@ APP10PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\"
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP10LIBS)"!=""
-$(MISC)$/$(APP10TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(APP10TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP10LIBS) $(i:s/.lib/.lin/)) >> $@
+    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP10LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          #"$(APP10LIBS)"!="" 
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(APP10TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(APP10TARGETN:b)_linkinc.ls
 $(APP10TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
@@ -2649,7 +2541,7 @@ $(APP10TARGETN) : $(LINKINCTARGETS)
 APP10LIBSALCPPRT*=$(LIBSALCPPRT)
 
 .IF "$(GUI)" == "OS2"
-_APP10IMP_ORD = $(APP10STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP10STDLIBS:^"$(LB)$/") 
+_APP10IMP_ORD = $(APP10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP10STDLIBS:^"$(LB)/") 
 APP10IMP_ORD = $(foreach,i,$(_APP10IMP_ORD) $(shell @-ls $i))
 .ELSE
 APP10IMP_ORD = 
@@ -2660,73 +2552,73 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     $(APP10IMP_ORD) \
     $(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
     @echo ------------------------------
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @-$(RM) $(MISC)$/$(@:b).strip
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP10OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
-    $(APP10LINKTYPEFLAG) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_10.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
+    `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    $(APP10LINKTYPEFLAG) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
-    @strip -i -R $(MISC)$/$(@:b).strip -X $@
+    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+    @strip -i -R $(MISC)/$(@:b).strip -X $@
     @ls -l $@
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP10RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making:   " $(@:f).app
+    @echo "Making: $@.app"
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    $(APP10OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
+    $(APP10OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+    cat $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
     @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)" == "WNT"
     @@-$(MKDIR) $(@:d:d)
 .IF "$(APP10LINKRES)" != ""
-    @@-$(RM) $(MISC)$/$(APP10LINKRES:b).rc
+    @@-$(RM) $(MISC)/$(APP10LINKRES:b).rc
 .IF "$(APP10ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP10ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP10LINKRES:b).rc
+    @-echo 1 ICON $(EMQ)"$(APP10ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc
 .ENDIF		# "$(APP10ICON)" != ""
 .IF "$(APP10VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)$/$(APP10LINKRES:b).rc
+    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc
+    @-echo $(EMQ)#include  $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc
 .ENDIF		# "$(APP10VERINFO)" != ""
-    $(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc
+    $(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
 .ENDIF			# "$(APP10LINKRES)" != ""
 .IF "$(COM)" == "GCC"
     @echo mingw
 .IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
-    @cat $(APP10LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) >  $(MISC)$/$(@:b)_all.res
-    windres $(MISC)$/$(@:b)_all.res $(APP10RESO)
+    @cat $(APP10LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) >  $(MISC)/$(@:b)_all.res
+    windres $(MISC)/$(@:b)_all.res $(APP10RESO)
 .ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP10BASEX) $(APP10STACKN) -o $@ $(APP10OBJS) \
-        -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP10RESO) \
+        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP10RESO) \
         `$(TYPE) /dev/null $(APP10LIBS) | sed s#$(ROUT)#$(OUT)#g` \
         $(APP_LINKTYPE) $(APP10LIBSALCPPRT) \
         -Wl,--start-group $(APP10STDLIBS) -Wl,--end-group $(APP10STDLIB) \
-        $(STDLIB10) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
+        $(STDLIB10) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
     @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
@@ -2735,7 +2627,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
         $(LINKFLAGSAPP) $(APP10BASEX) \
         $(APP10STACKN) \
         -out:$@ \
-        -map:$(MISC)$/{$(subst,$/,_ $(APP10TARGET)).map} \
+        -map:$(MISC)/{$(subst,/,_ $(APP10TARGET)).map} \
         $(STDOBJ) \
         $(APP10LINKRES) \
         $(APP10RES) \
@@ -2746,7 +2638,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
         )
     @-echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
@@ -2771,17 +2663,13 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
         $(APP10STDLIBS) \
         $(APP10STDLIB) $(STDLIB10))
         $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP10TARGETN:b)_linkobj.lst >> $(MISC)\$(APP10TARGET).lst
-        $(IFEXIST) $(MISC)$/$(APP10TARGET).lst $(THEN) type $(MISC)$/$(APP10TARGET).lst  >> $(MISC)$/$(APP10TARGET).lnk $(FI)
+        $(IFEXIST) $(MISC)/$(APP10TARGET).lst $(THEN) type $(MISC)/$(APP10TARGET).lst  >> $(MISC)/$(APP10TARGET).lnk $(FI)
         $(APP10LINKER) @$(MISC)\$(APP10TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
 .ENDIF		# "$(COM)" == "GCC"
 .IF "$(APP10TARGET)" == "loader"
     $(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     $(RM) $@
     $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -2791,23 +2679,19 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
 .IF "$(GUI)" == "OS2"
     @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
 .IF "$(APP10LINKRES)" != ""
-    @+-$(RM) $(MISC)$/$(APP10LINKRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(APP10LINKRES:b).rc >& $(NULLDEV)
 .IF "$(APP10ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
-    @-+echo ICON 1 "$(APP10ICON:s/\/\\/)" >> $(MISC)$/$(APP10LINKRES:b).rc
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP10ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP10LINKRES:b).rc
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP10ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP10LINKRES:b).rc
 .ENDIF		# "$(APP10ICON)" != ""
 .IF "$(APP10VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)$/$(APP10LINKRES:b).rc
+    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc
+    @-+echo $(EMQ)#include  $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc
 .ENDIF		# "$(APP10VERINFO)" != ""
-    $(RC) -r -DOS2 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc
+    $(RC) -r -DOS2 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
 .ENDIF			# "$(APP10LINKRES)" != ""
 
 .IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP10TARGET) WINDOWAPI > $(MISC)$/$(APP10TARGET).def
+    @echo NAME $(APP10TARGET) WINDOWAPI > $(MISC)/$(APP10TARGET).def
 .ENDIF
 
     @+echo	$(APP10LINKFLAGS) \
@@ -2815,7 +2699,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
         $(APP10STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP10LINKRES) \
         $(APP10RES) \
@@ -2830,7 +2714,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
         $(APP10STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP10LINKRES) \
         $(APP10RES) \
@@ -2843,11 +2727,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
 
 .IF "$(APP10TARGET)" == "loader"
     +$(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     +$(RM) $@
     +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index 0d66a55d4..cae6cd48a 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -8,19 +8,19 @@ DEFLIB1NAME*=$(DEF1LIBNAME)
 .ENDIF			# "$(DEF1LIBNAME)"!=""
 
 .IF "$(DEFLIB1NAME)"!=""
-DEF1DEPN+=$(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib)
+DEF1DEPN+=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL1VERSIONMAP)"!=""
 .IF "$(DEF1EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF1EXPORTFILE=$(MISC)$/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
+DEF1EXPORTFILE=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF1EXPORTFILE) : $(SHL1OBJS) $(SHL1LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -28,7 +28,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL1OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -37,9 +37,9 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF1EXPORTFILE=$(MISC)$/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
+DEF1EXPORTFILE=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
 $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF1EXPORTFILE)"==""
@@ -47,7 +47,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF1FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF1FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK1:=$(RM)
 
@@ -63,10 +63,8 @@ $(DEF1TARGETN) : \
 $(DEF1TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL1TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
     @echo HEAPSIZE	  0 											>>$@.tmpfile
@@ -78,20 +76,20 @@ $(DEF1TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB1NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL1TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL1TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL1TARGET).exp
+    @-$(RM) $(MISC)/$(SHL1TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL1TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL1TARGET).exp
 .ELSE
 .IF "$(SHL1USE_EXPORTS)"==""
-    @-$(RMHACK1) $(MISC)$/$(SHL1TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL1TARGET).exp $(SLB)$/$(DEFLIB1NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL1TARGET).flt $(MISC)$/$(SHL1TARGET).exp			   >>$@.tmpfile
-    $(RMHACK1) $(MISC)$/$(SHL1TARGET).exp
+    @-$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL1TARGET).exp $(SLB)/$(DEFLIB1NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL1TARGET).flt $(MISC)/$(SHL1TARGET).exp			   >>$@.tmpfile
+    $(RMHACK1) $(MISC)/$(SHL1TARGET).exp
 .ELSE			# "$(SHL1USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL1TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)$/$(SHL1TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL1TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)/$(SHL1TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL1USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB1NAME)"!=""
@@ -172,8 +170,8 @@ $(DEF1TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL1TARGET8=$(shell @fix_shl $(SHL1TARGETN:f))
 
-DEF1FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF1NAMELIST=$(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib)
+DEF1FILTER=$(SOLARENV)/inc/dummy.flt
+DEF1NAMELIST=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF1TARGETN) : \
@@ -183,10 +181,8 @@ $(DEF1TARGETN) : \
 $(DEF1TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @+-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(SHL1TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
     @echo DATA MULTIPLE	 >>$@.tmpfile
     @echo DESCRIPTION	'StarView 3.00 $(DEF1DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@@ -197,7 +193,7 @@ $(DEF1TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB1NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB1NAME).lib
+    @+echo $(SLB)/$(DEFLIB1NAME).lib
     @+emxexpr $(DEF1NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB1NAME)"!=""
 
@@ -295,19 +291,19 @@ DEFLIB2NAME*=$(DEF2LIBNAME)
 .ENDIF			# "$(DEF2LIBNAME)"!=""
 
 .IF "$(DEFLIB2NAME)"!=""
-DEF2DEPN+=$(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib)
+DEF2DEPN+=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL2VERSIONMAP)"!=""
 .IF "$(DEF2EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF2EXPORTFILE=$(MISC)$/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
+DEF2EXPORTFILE=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF2EXPORTFILE) : $(SHL2OBJS) $(SHL2LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -315,7 +311,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL2OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -324,9 +320,9 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF2EXPORTFILE=$(MISC)$/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
+DEF2EXPORTFILE=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
 $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF2EXPORTFILE)"==""
@@ -334,7 +330,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF2FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF2FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK2:=$(RM)
 
@@ -350,10 +346,8 @@ $(DEF2TARGETN) : \
 $(DEF2TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
     @echo HEAPSIZE	  0 											>>$@.tmpfile
@@ -365,20 +359,20 @@ $(DEF2TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB2NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL2TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL2TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL2TARGET).exp
+    @-$(RM) $(MISC)/$(SHL2TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL2TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL2TARGET).exp
 .ELSE
 .IF "$(SHL2USE_EXPORTS)"==""
-    @-$(RMHACK2) $(MISC)$/$(SHL2TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL2TARGET).exp $(SLB)$/$(DEFLIB2NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL2TARGET).flt $(MISC)$/$(SHL2TARGET).exp			   >>$@.tmpfile
-    $(RMHACK2) $(MISC)$/$(SHL2TARGET).exp
+    @-$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL2TARGET).exp $(SLB)/$(DEFLIB2NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL2TARGET).flt $(MISC)/$(SHL2TARGET).exp			   >>$@.tmpfile
+    $(RMHACK2) $(MISC)/$(SHL2TARGET).exp
 .ELSE			# "$(SHL2USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL2TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)$/$(SHL2TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL2TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)/$(SHL2TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL2USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB2NAME)"!=""
@@ -459,8 +453,8 @@ $(DEF2TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL2TARGET8=$(shell @fix_shl $(SHL2TARGETN:f))
 
-DEF2FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF2NAMELIST=$(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib)
+DEF2FILTER=$(SOLARENV)/inc/dummy.flt
+DEF2NAMELIST=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF2TARGETN) : \
@@ -470,10 +464,8 @@ $(DEF2TARGETN) : \
 $(DEF2TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @+-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(SHL2TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
     @echo DATA MULTIPLE	 >>$@.tmpfile
     @echo DESCRIPTION	'StarView 3.00 $(DEF2DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@@ -484,7 +476,7 @@ $(DEF2TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB2NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB2NAME).lib
+    @+echo $(SLB)/$(DEFLIB2NAME).lib
     @+emxexpr $(DEF2NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB2NAME)"!=""
 
@@ -582,19 +574,19 @@ DEFLIB3NAME*=$(DEF3LIBNAME)
 .ENDIF			# "$(DEF3LIBNAME)"!=""
 
 .IF "$(DEFLIB3NAME)"!=""
-DEF3DEPN+=$(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib)
+DEF3DEPN+=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL3VERSIONMAP)"!=""
 .IF "$(DEF3EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF3EXPORTFILE=$(MISC)$/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
+DEF3EXPORTFILE=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF3EXPORTFILE) : $(SHL3OBJS) $(SHL3LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -602,7 +594,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL3OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -611,9 +603,9 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF3EXPORTFILE=$(MISC)$/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
+DEF3EXPORTFILE=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
 $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF3EXPORTFILE)"==""
@@ -621,7 +613,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF3FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF3FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK3:=$(RM)
 
@@ -637,10 +629,8 @@ $(DEF3TARGETN) : \
 $(DEF3TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL3TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
     @echo HEAPSIZE	  0 											>>$@.tmpfile
@@ -652,20 +642,20 @@ $(DEF3TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB3NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL3TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL3TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL3TARGET).exp
+    @-$(RM) $(MISC)/$(SHL3TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL3TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL3TARGET).exp
 .ELSE
 .IF "$(SHL3USE_EXPORTS)"==""
-    @-$(RMHACK3) $(MISC)$/$(SHL3TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL3TARGET).exp $(SLB)$/$(DEFLIB3NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL3TARGET).flt $(MISC)$/$(SHL3TARGET).exp			   >>$@.tmpfile
-    $(RMHACK3) $(MISC)$/$(SHL3TARGET).exp
+    @-$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL3TARGET).exp $(SLB)/$(DEFLIB3NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL3TARGET).flt $(MISC)/$(SHL3TARGET).exp			   >>$@.tmpfile
+    $(RMHACK3) $(MISC)/$(SHL3TARGET).exp
 .ELSE			# "$(SHL3USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL3TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)$/$(SHL3TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL3TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)/$(SHL3TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL3USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB3NAME)"!=""
@@ -746,8 +736,8 @@ $(DEF3TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL3TARGET8=$(shell @fix_shl $(SHL3TARGETN:f))
 
-DEF3FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF3NAMELIST=$(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib)
+DEF3FILTER=$(SOLARENV)/inc/dummy.flt
+DEF3NAMELIST=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF3TARGETN) : \
@@ -757,10 +747,8 @@ $(DEF3TARGETN) : \
 $(DEF3TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @+-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(SHL3TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
     @echo DATA MULTIPLE	 >>$@.tmpfile
     @echo DESCRIPTION	'StarView 3.00 $(DEF3DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@@ -771,7 +759,7 @@ $(DEF3TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB3NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB3NAME).lib
+    @+echo $(SLB)/$(DEFLIB3NAME).lib
     @+emxexpr $(DEF3NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB3NAME)"!=""
 
@@ -869,19 +857,19 @@ DEFLIB4NAME*=$(DEF4LIBNAME)
 .ENDIF			# "$(DEF4LIBNAME)"!=""
 
 .IF "$(DEFLIB4NAME)"!=""
-DEF4DEPN+=$(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib)
+DEF4DEPN+=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL4VERSIONMAP)"!=""
 .IF "$(DEF4EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF4EXPORTFILE=$(MISC)$/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
+DEF4EXPORTFILE=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF4EXPORTFILE) : $(SHL4OBJS) $(SHL4LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -889,7 +877,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL4OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -898,9 +886,9 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF4EXPORTFILE=$(MISC)$/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
+DEF4EXPORTFILE=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
 $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF4EXPORTFILE)"==""
@@ -908,7 +896,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF4FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF4FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK4:=$(RM)
 
@@ -924,10 +912,8 @@ $(DEF4TARGETN) : \
 $(DEF4TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL4TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
     @echo HEAPSIZE	  0 											>>$@.tmpfile
@@ -939,20 +925,20 @@ $(DEF4TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB4NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL4TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL4TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL4TARGET).exp
+    @-$(RM) $(MISC)/$(SHL4TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL4TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL4TARGET).exp
 .ELSE
 .IF "$(SHL4USE_EXPORTS)"==""
-    @-$(RMHACK4) $(MISC)$/$(SHL4TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL4TARGET).exp $(SLB)$/$(DEFLIB4NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL4TARGET).flt $(MISC)$/$(SHL4TARGET).exp			   >>$@.tmpfile
-    $(RMHACK4) $(MISC)$/$(SHL4TARGET).exp
+    @-$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL4TARGET).exp $(SLB)/$(DEFLIB4NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL4TARGET).flt $(MISC)/$(SHL4TARGET).exp			   >>$@.tmpfile
+    $(RMHACK4) $(MISC)/$(SHL4TARGET).exp
 .ELSE			# "$(SHL4USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL4TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)$/$(SHL4TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL4TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)/$(SHL4TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL4USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB4NAME)"!=""
@@ -1033,8 +1019,8 @@ $(DEF4TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL4TARGET8=$(shell @fix_shl $(SHL4TARGETN:f))
 
-DEF4FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF4NAMELIST=$(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib)
+DEF4FILTER=$(SOLARENV)/inc/dummy.flt
+DEF4NAMELIST=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF4TARGETN) : \
@@ -1044,10 +1030,8 @@ $(DEF4TARGETN) : \
 $(DEF4TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @+-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(SHL4TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
     @echo DATA MULTIPLE	 >>$@.tmpfile
     @echo DESCRIPTION	'StarView 3.00 $(DEF4DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@@ -1058,7 +1042,7 @@ $(DEF4TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB4NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB4NAME).lib
+    @+echo $(SLB)/$(DEFLIB4NAME).lib
     @+emxexpr $(DEF4NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB4NAME)"!=""
 
@@ -1156,19 +1140,19 @@ DEFLIB5NAME*=$(DEF5LIBNAME)
 .ENDIF			# "$(DEF5LIBNAME)"!=""
 
 .IF "$(DEFLIB5NAME)"!=""
-DEF5DEPN+=$(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib)
+DEF5DEPN+=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL5VERSIONMAP)"!=""
 .IF "$(DEF5EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF5EXPORTFILE=$(MISC)$/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
+DEF5EXPORTFILE=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF5EXPORTFILE) : $(SHL5OBJS) $(SHL5LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -1176,7 +1160,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL5OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -1185,9 +1169,9 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF5EXPORTFILE=$(MISC)$/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
+DEF5EXPORTFILE=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
 $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF5EXPORTFILE)"==""
@@ -1195,7 +1179,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF5FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF5FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK5:=$(RM)
 
@@ -1211,10 +1195,8 @@ $(DEF5TARGETN) : \
 $(DEF5TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL5TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
     @echo HEAPSIZE	  0 											>>$@.tmpfile
@@ -1226,20 +1208,20 @@ $(DEF5TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB5NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL5TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL5TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL5TARGET).exp
+    @-$(RM) $(MISC)/$(SHL5TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL5TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL5TARGET).exp
 .ELSE
 .IF "$(SHL5USE_EXPORTS)"==""
-    @-$(RMHACK5) $(MISC)$/$(SHL5TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL5TARGET).exp $(SLB)$/$(DEFLIB5NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL5TARGET).flt $(MISC)$/$(SHL5TARGET).exp			   >>$@.tmpfile
-    $(RMHACK5) $(MISC)$/$(SHL5TARGET).exp
+    @-$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL5TARGET).exp $(SLB)/$(DEFLIB5NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL5TARGET).flt $(MISC)/$(SHL5TARGET).exp			   >>$@.tmpfile
+    $(RMHACK5) $(MISC)/$(SHL5TARGET).exp
 .ELSE			# "$(SHL5USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL5TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)$/$(SHL5TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL5TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)/$(SHL5TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL5USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB5NAME)"!=""
@@ -1320,8 +1302,8 @@ $(DEF5TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL5TARGET8=$(shell @fix_shl $(SHL5TARGETN:f))
 
-DEF5FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF5NAMELIST=$(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib)
+DEF5FILTER=$(SOLARENV)/inc/dummy.flt
+DEF5NAMELIST=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF5TARGETN) : \
@@ -1331,10 +1313,8 @@ $(DEF5TARGETN) : \
 $(DEF5TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @+-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(SHL5TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
     @echo DATA MULTIPLE	 >>$@.tmpfile
     @echo DESCRIPTION	'StarView 3.00 $(DEF5DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@@ -1345,7 +1325,7 @@ $(DEF5TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB5NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB5NAME).lib
+    @+echo $(SLB)/$(DEFLIB5NAME).lib
     @+emxexpr $(DEF5NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB5NAME)"!=""
 
@@ -1443,19 +1423,19 @@ DEFLIB6NAME*=$(DEF6LIBNAME)
 .ENDIF			# "$(DEF6LIBNAME)"!=""
 
 .IF "$(DEFLIB6NAME)"!=""
-DEF6DEPN+=$(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib)
+DEF6DEPN+=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL6VERSIONMAP)"!=""
 .IF "$(DEF6EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF6EXPORTFILE=$(MISC)$/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
+DEF6EXPORTFILE=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF6EXPORTFILE) : $(SHL6OBJS) $(SHL6LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -1463,7 +1443,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL6OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -1472,9 +1452,9 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF6EXPORTFILE=$(MISC)$/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
+DEF6EXPORTFILE=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
 $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF6EXPORTFILE)"==""
@@ -1482,7 +1462,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF6FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF6FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK6:=$(RM)
 
@@ -1498,10 +1478,8 @@ $(DEF6TARGETN) : \
 $(DEF6TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL6TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
     @echo HEAPSIZE	  0 											>>$@.tmpfile
@@ -1513,20 +1491,20 @@ $(DEF6TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB6NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL6TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL6TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL6TARGET).exp
+    @-$(RM) $(MISC)/$(SHL6TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL6TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL6TARGET).exp
 .ELSE
 .IF "$(SHL6USE_EXPORTS)"==""
-    @-$(RMHACK6) $(MISC)$/$(SHL6TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL6TARGET).exp $(SLB)$/$(DEFLIB6NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL6TARGET).flt $(MISC)$/$(SHL6TARGET).exp			   >>$@.tmpfile
-    $(RMHACK6) $(MISC)$/$(SHL6TARGET).exp
+    @-$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL6TARGET).exp $(SLB)/$(DEFLIB6NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL6TARGET).flt $(MISC)/$(SHL6TARGET).exp			   >>$@.tmpfile
+    $(RMHACK6) $(MISC)/$(SHL6TARGET).exp
 .ELSE			# "$(SHL6USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL6TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)$/$(SHL6TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL6TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)/$(SHL6TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL6USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB6NAME)"!=""
@@ -1607,8 +1585,8 @@ $(DEF6TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL6TARGET8=$(shell @fix_shl $(SHL6TARGETN:f))
 
-DEF6FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF6NAMELIST=$(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib)
+DEF6FILTER=$(SOLARENV)/inc/dummy.flt
+DEF6NAMELIST=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF6TARGETN) : \
@@ -1618,10 +1596,8 @@ $(DEF6TARGETN) : \
 $(DEF6TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @+-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(SHL6TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
     @echo DATA MULTIPLE	 >>$@.tmpfile
     @echo DESCRIPTION	'StarView 3.00 $(DEF6DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@@ -1632,7 +1608,7 @@ $(DEF6TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB6NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB6NAME).lib
+    @+echo $(SLB)/$(DEFLIB6NAME).lib
     @+emxexpr $(DEF6NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB6NAME)"!=""
 
@@ -1730,19 +1706,19 @@ DEFLIB7NAME*=$(DEF7LIBNAME)
 .ENDIF			# "$(DEF7LIBNAME)"!=""
 
 .IF "$(DEFLIB7NAME)"!=""
-DEF7DEPN+=$(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib)
+DEF7DEPN+=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL7VERSIONMAP)"!=""
 .IF "$(DEF7EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF7EXPORTFILE=$(MISC)$/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
+DEF7EXPORTFILE=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF7EXPORTFILE) : $(SHL7OBJS) $(SHL7LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -1750,7 +1726,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL7OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -1759,9 +1735,9 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF7EXPORTFILE=$(MISC)$/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
+DEF7EXPORTFILE=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
 $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF7EXPORTFILE)"==""
@@ -1769,7 +1745,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF7FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF7FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK7:=$(RM)
 
@@ -1785,10 +1761,8 @@ $(DEF7TARGETN) : \
 $(DEF7TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL7TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
     @echo HEAPSIZE	  0 											>>$@.tmpfile
@@ -1800,20 +1774,20 @@ $(DEF7TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB7NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL7TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL7TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL7TARGET).exp
+    @-$(RM) $(MISC)/$(SHL7TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL7TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL7TARGET).exp
 .ELSE
 .IF "$(SHL7USE_EXPORTS)"==""
-    @-$(RMHACK7) $(MISC)$/$(SHL7TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL7TARGET).exp $(SLB)$/$(DEFLIB7NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL7TARGET).flt $(MISC)$/$(SHL7TARGET).exp			   >>$@.tmpfile
-    $(RMHACK7) $(MISC)$/$(SHL7TARGET).exp
+    @-$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL7TARGET).exp $(SLB)/$(DEFLIB7NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL7TARGET).flt $(MISC)/$(SHL7TARGET).exp			   >>$@.tmpfile
+    $(RMHACK7) $(MISC)/$(SHL7TARGET).exp
 .ELSE			# "$(SHL7USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL7TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)$/$(SHL7TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL7TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)/$(SHL7TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL7USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB7NAME)"!=""
@@ -1894,8 +1868,8 @@ $(DEF7TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL7TARGET8=$(shell @fix_shl $(SHL7TARGETN:f))
 
-DEF7FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF7NAMELIST=$(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib)
+DEF7FILTER=$(SOLARENV)/inc/dummy.flt
+DEF7NAMELIST=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF7TARGETN) : \
@@ -1905,10 +1879,8 @@ $(DEF7TARGETN) : \
 $(DEF7TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @+-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(SHL7TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
     @echo DATA MULTIPLE	 >>$@.tmpfile
     @echo DESCRIPTION	'StarView 3.00 $(DEF7DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@@ -1919,7 +1891,7 @@ $(DEF7TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB7NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB7NAME).lib
+    @+echo $(SLB)/$(DEFLIB7NAME).lib
     @+emxexpr $(DEF7NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB7NAME)"!=""
 
@@ -2017,19 +1989,19 @@ DEFLIB8NAME*=$(DEF8LIBNAME)
 .ENDIF			# "$(DEF8LIBNAME)"!=""
 
 .IF "$(DEFLIB8NAME)"!=""
-DEF8DEPN+=$(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib)
+DEF8DEPN+=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL8VERSIONMAP)"!=""
 .IF "$(DEF8EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF8EXPORTFILE=$(MISC)$/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp
+DEF8EXPORTFILE=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF8EXPORTFILE) : $(SHL8OBJS) $(SHL8LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -2037,7 +2009,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL8OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -2046,9 +2018,9 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF8EXPORTFILE=$(MISC)$/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp
+DEF8EXPORTFILE=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp
 $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF8EXPORTFILE)"==""
@@ -2056,7 +2028,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF8FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF8FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK8:=$(RM)
 
@@ -2072,10 +2044,8 @@ $(DEF8TARGETN) : \
 $(DEF8TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL8TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
     @echo HEAPSIZE	  0 											>>$@.tmpfile
@@ -2087,20 +2057,20 @@ $(DEF8TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB8NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL8TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL8TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL8TARGET).exp
+    @-$(RM) $(MISC)/$(SHL8TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL8TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL8TARGET).exp
 .ELSE
 .IF "$(SHL8USE_EXPORTS)"==""
-    @-$(RMHACK8) $(MISC)$/$(SHL8TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL8TARGET).exp $(SLB)$/$(DEFLIB8NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL8TARGET).flt $(MISC)$/$(SHL8TARGET).exp			   >>$@.tmpfile
-    $(RMHACK8) $(MISC)$/$(SHL8TARGET).exp
+    @-$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL8TARGET).exp $(SLB)/$(DEFLIB8NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL8TARGET).flt $(MISC)/$(SHL8TARGET).exp			   >>$@.tmpfile
+    $(RMHACK8) $(MISC)/$(SHL8TARGET).exp
 .ELSE			# "$(SHL8USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL8TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)$/$(SHL8TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL8TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)/$(SHL8TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL8USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB8NAME)"!=""
@@ -2181,8 +2151,8 @@ $(DEF8TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL8TARGET8=$(shell @fix_shl $(SHL8TARGETN:f))
 
-DEF8FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF8NAMELIST=$(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib)
+DEF8FILTER=$(SOLARENV)/inc/dummy.flt
+DEF8NAMELIST=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF8TARGETN) : \
@@ -2192,10 +2162,8 @@ $(DEF8TARGETN) : \
 $(DEF8TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @+-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(SHL8TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
     @echo DATA MULTIPLE	 >>$@.tmpfile
     @echo DESCRIPTION	'StarView 3.00 $(DEF8DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@@ -2206,7 +2174,7 @@ $(DEF8TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB8NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB8NAME).lib
+    @+echo $(SLB)/$(DEFLIB8NAME).lib
     @+emxexpr $(DEF8NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB8NAME)"!=""
 
@@ -2304,19 +2272,19 @@ DEFLIB9NAME*=$(DEF9LIBNAME)
 .ENDIF			# "$(DEF9LIBNAME)"!=""
 
 .IF "$(DEFLIB9NAME)"!=""
-DEF9DEPN+=$(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib)
+DEF9DEPN+=$(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL9VERSIONMAP)"!=""
 .IF "$(DEF9EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF9EXPORTFILE=$(MISC)$/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp
+DEF9EXPORTFILE=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF9EXPORTFILE) : $(SHL9OBJS) $(SHL9LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -2324,7 +2292,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL9OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -2333,9 +2301,9 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF9EXPORTFILE=$(MISC)$/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp
+DEF9EXPORTFILE=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp
 $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF9EXPORTFILE)"==""
@@ -2343,7 +2311,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF9FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF9FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK9:=$(RM)
 
@@ -2359,10 +2327,8 @@ $(DEF9TARGETN) : \
 $(DEF9TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL9TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
     @echo HEAPSIZE	  0 											>>$@.tmpfile
@@ -2374,20 +2340,20 @@ $(DEF9TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB9NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL9TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL9TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL9TARGET).exp
+    @-$(RM) $(MISC)/$(SHL9TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL9TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL9TARGET).exp
 .ELSE
 .IF "$(SHL9USE_EXPORTS)"==""
-    @-$(RMHACK9) $(MISC)$/$(SHL9TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL9TARGET).exp $(SLB)$/$(DEFLIB9NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL9TARGET).flt $(MISC)$/$(SHL9TARGET).exp			   >>$@.tmpfile
-    $(RMHACK9) $(MISC)$/$(SHL9TARGET).exp
+    @-$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL9TARGET).exp $(SLB)/$(DEFLIB9NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL9TARGET).flt $(MISC)/$(SHL9TARGET).exp			   >>$@.tmpfile
+    $(RMHACK9) $(MISC)/$(SHL9TARGET).exp
 .ELSE			# "$(SHL9USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL9TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)$/$(SHL9TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL9TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)/$(SHL9TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL9USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB9NAME)"!=""
@@ -2468,8 +2434,8 @@ $(DEF9TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL9TARGET8=$(shell @fix_shl $(SHL9TARGETN:f))
 
-DEF9FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF9NAMELIST=$(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib)
+DEF9FILTER=$(SOLARENV)/inc/dummy.flt
+DEF9NAMELIST=$(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF9TARGETN) : \
@@ -2479,10 +2445,8 @@ $(DEF9TARGETN) : \
 $(DEF9TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @+-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(SHL9TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
     @echo DATA MULTIPLE	 >>$@.tmpfile
     @echo DESCRIPTION	'StarView 3.00 $(DEF9DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@@ -2493,7 +2457,7 @@ $(DEF9TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB9NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB9NAME).lib
+    @+echo $(SLB)/$(DEFLIB9NAME).lib
     @+emxexpr $(DEF9NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB9NAME)"!=""
 
@@ -2591,19 +2555,19 @@ DEFLIB10NAME*=$(DEF10LIBNAME)
 .ENDIF			# "$(DEF10LIBNAME)"!=""
 
 .IF "$(DEFLIB10NAME)"!=""
-DEF10DEPN+=$(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib)
+DEF10DEPN+=$(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL10VERSIONMAP)"!=""
 .IF "$(DEF10EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF10EXPORTFILE=$(MISC)$/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp
+DEF10EXPORTFILE=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF10EXPORTFILE) : $(SHL10OBJS) $(SHL10LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -2611,7 +2575,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL10OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -2620,9 +2584,9 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF10EXPORTFILE=$(MISC)$/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp
+DEF10EXPORTFILE=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp
 $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF10EXPORTFILE)"==""
@@ -2630,7 +2594,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF10FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF10FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK10:=$(RM)
 
@@ -2646,10 +2610,8 @@ $(DEF10TARGETN) : \
 $(DEF10TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL10TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
     @echo HEAPSIZE	  0 											>>$@.tmpfile
@@ -2661,20 +2623,20 @@ $(DEF10TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB10NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL10TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL10TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL10TARGET).exp
+    @-$(RM) $(MISC)/$(SHL10TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL10TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL10TARGET).exp
 .ELSE
 .IF "$(SHL10USE_EXPORTS)"==""
-    @-$(RMHACK10) $(MISC)$/$(SHL10TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL10TARGET).exp $(SLB)$/$(DEFLIB10NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL10TARGET).flt $(MISC)$/$(SHL10TARGET).exp			   >>$@.tmpfile
-    $(RMHACK10) $(MISC)$/$(SHL10TARGET).exp
+    @-$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL10TARGET).exp $(SLB)/$(DEFLIB10NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL10TARGET).flt $(MISC)/$(SHL10TARGET).exp			   >>$@.tmpfile
+    $(RMHACK10) $(MISC)/$(SHL10TARGET).exp
 .ELSE			# "$(SHL10USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL10TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)$/$(SHL10TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL10TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)/$(SHL10TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL10USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB10NAME)"!=""
@@ -2755,8 +2717,8 @@ $(DEF10TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL10TARGET8=$(shell @fix_shl $(SHL10TARGETN:f))
 
-DEF10FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF10NAMELIST=$(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib)
+DEF10FILTER=$(SOLARENV)/inc/dummy.flt
+DEF10NAMELIST=$(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF10TARGETN) : \
@@ -2766,10 +2728,8 @@ $(DEF10TARGETN) : \
 $(DEF10TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @+-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(SHL10TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
     @echo DATA MULTIPLE	 >>$@.tmpfile
     @echo DESCRIPTION	'StarView 3.00 $(DEF10DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@@ -2780,7 +2740,7 @@ $(DEF10TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB10NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB10NAME).lib
+    @+echo $(SLB)/$(DEFLIB10NAME).lib
     @+emxexpr $(DEF10NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB10NAME)"!=""
 
diff --git a/solenv/inc/_tg_lib.mk b/solenv/inc/_tg_lib.mk
index 594f15216..72169827b 100644
--- a/solenv/inc/_tg_lib.mk
+++ b/solenv/inc/_tg_lib.mk
@@ -4,36 +4,32 @@
 .IF "$(LIB1ARCHIV)" != ""
 
 $(LIB1ARCHIV) :	$(LIB1TARGET)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd
+    @-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd
+    @-$(RM) $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
+    @echo $(LINK) +inst_close -c `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
+    @cat $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
+    @+source $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB1ARCHIV:b).cmd
+    @echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB1ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd
+    @echo  ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
 .ENDIF
 .IF "$(OS)" == "MACOSX"
-     @echo  ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd
+     @echo  ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB1ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB1ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB1ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB1ARCHIV:b).cmd
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB1ARCHIV:b).cmd
-    @+echo  ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB1ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB1ARCHIV:b).cmd
+    @+-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB1ARCHIV:b).cmd
+    @+echo  ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB1ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB1ARCHIV:b).cmd
 .ELSE
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -44,21 +40,19 @@ $(LIB1ARCHIV) :	$(LIB1TARGET)
 $(LIB1TARGET) :	$(LIB1FILES) \
                         $(LIB1OBJFILES) \
                         $(LIB1DEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo using: $(LIB1FILES)
     @echo using: $(LIB1TARGET)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @echo $(LIB1OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
+    @echo $(LIB1OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
     @cat /dev/null $(LIB1FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @$(RM) $(@:d)$(@:b).dump
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
@@ -75,7 +69,7 @@ $(LIB1TARGET) :	$(LIB1FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB1OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
+    +$(ECHONL) $(LIB1OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
     @+cat /dev/null $(LIB1FILES) | xargs -n1 >> $@
 .ELSE
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB1FILES) $(LIB1OBJFILES))
@@ -90,9 +84,7 @@ $(LIB1TARGET) :	$(LIB1FILES) \
 .ENDIF          # "$(LIB1FILES)"!=""    
 .ELSE			# "$(GUI)"=="WNT"
     @-$(RM) $@
-.IF "$(QUIET_BUILD)"==""
     echo $(LIBMGR) r $@ $(LIB1OBJFILES)
-.ENDIF
     $(LIBMGR) r $@ $(LIB1OBJFILES) $(LIB1FILES) bla.lib
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="UNX"
@@ -105,36 +97,32 @@ $(LIB1TARGET) :	$(LIB1FILES) \
 .IF "$(LIB2ARCHIV)" != ""
 
 $(LIB2ARCHIV) :	$(LIB2TARGET)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd
+    @-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd
+    @-$(RM) $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
+    @echo $(LINK) +inst_close -c `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
+    @cat $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
+    @+source $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB2ARCHIV:b).cmd
+    @echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB2ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
+    @echo  ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
 .ENDIF
 .IF "$(OS)" == "MACOSX"
-     @echo  ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
-.ENDIF
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB2ARCHIV:b).cmd
+     @echo  ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
 .ENDIF
-    @+source $(MISC)$/$(LIB2ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB2ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB2ARCHIV:b).cmd
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB2ARCHIV:b).cmd
-    @+echo  ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB2ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB2ARCHIV:b).cmd
+    @+-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB2ARCHIV:b).cmd
+    @+echo  ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB2ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB2ARCHIV:b).cmd
 .ELSE
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -145,21 +133,19 @@ $(LIB2ARCHIV) :	$(LIB2TARGET)
 $(LIB2TARGET) :	$(LIB2FILES) \
                         $(LIB2OBJFILES) \
                         $(LIB2DEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo using: $(LIB2FILES)
     @echo using: $(LIB2TARGET)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @echo $(LIB2OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
+    @echo $(LIB2OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
     @cat /dev/null $(LIB2FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @$(RM) $(@:d)$(@:b).dump
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
@@ -176,7 +162,7 @@ $(LIB2TARGET) :	$(LIB2FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB2OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
+    +$(ECHONL) $(LIB2OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
     @+cat /dev/null $(LIB2FILES) | xargs -n1 >> $@
 .ELSE
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB2FILES) $(LIB2OBJFILES))
@@ -191,9 +177,7 @@ $(LIB2TARGET) :	$(LIB2FILES) \
 .ENDIF          # "$(LIB2FILES)"!=""    
 .ELSE			# "$(GUI)"=="WNT"
     @-$(RM) $@
-.IF "$(QUIET_BUILD)"==""
     echo $(LIBMGR) r $@ $(LIB2OBJFILES)
-.ENDIF
     $(LIBMGR) r $@ $(LIB2OBJFILES) $(LIB2FILES) bla.lib
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="UNX"
@@ -206,36 +190,32 @@ $(LIB2TARGET) :	$(LIB2FILES) \
 .IF "$(LIB3ARCHIV)" != ""
 
 $(LIB3ARCHIV) :	$(LIB3TARGET)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd
+    @-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd
+    @-$(RM) $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
+    @echo $(LINK) +inst_close -c `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
+    @cat $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
+    @+source $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB3ARCHIV:b).cmd
+    @echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB3ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
+    @echo  ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
 .ENDIF
 .IF "$(OS)" == "MACOSX"
-     @echo  ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
+     @echo  ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB3ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB3ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB3ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB3ARCHIV:b).cmd
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB3ARCHIV:b).cmd
-    @+echo  ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB3ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB3ARCHIV:b).cmd
+    @+-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB3ARCHIV:b).cmd
+    @+echo  ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB3ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB3ARCHIV:b).cmd
 .ELSE
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -246,21 +226,19 @@ $(LIB3ARCHIV) :	$(LIB3TARGET)
 $(LIB3TARGET) :	$(LIB3FILES) \
                         $(LIB3OBJFILES) \
                         $(LIB3DEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo using: $(LIB3FILES)
     @echo using: $(LIB3TARGET)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @echo $(LIB3OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
+    @echo $(LIB3OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
     @cat /dev/null $(LIB3FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @$(RM) $(@:d)$(@:b).dump
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
@@ -277,7 +255,7 @@ $(LIB3TARGET) :	$(LIB3FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB3OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
+    +$(ECHONL) $(LIB3OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
     @+cat /dev/null $(LIB3FILES) | xargs -n1 >> $@
 .ELSE
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB3FILES) $(LIB3OBJFILES))
@@ -292,9 +270,7 @@ $(LIB3TARGET) :	$(LIB3FILES) \
 .ENDIF          # "$(LIB3FILES)"!=""    
 .ELSE			# "$(GUI)"=="WNT"
     @-$(RM) $@
-.IF "$(QUIET_BUILD)"==""
     echo $(LIBMGR) r $@ $(LIB3OBJFILES)
-.ENDIF
     $(LIBMGR) r $@ $(LIB3OBJFILES) $(LIB3FILES) bla.lib
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="UNX"
@@ -307,36 +283,32 @@ $(LIB3TARGET) :	$(LIB3FILES) \
 .IF "$(LIB4ARCHIV)" != ""
 
 $(LIB4ARCHIV) :	$(LIB4TARGET)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd
+    @-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd
+    @-$(RM) $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
+    @echo $(LINK) +inst_close -c `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
+    @cat $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
+    @+source $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB4ARCHIV:b).cmd
+    @echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB4ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
+    @echo  ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
 .ENDIF
 .IF "$(OS)" == "MACOSX"
-     @echo  ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
-.ENDIF
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB4ARCHIV:b).cmd
+     @echo  ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
 .ENDIF
-    @+source $(MISC)$/$(LIB4ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB4ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB4ARCHIV:b).cmd
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB4ARCHIV:b).cmd
-    @+echo  ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB4ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB4ARCHIV:b).cmd
+    @+-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB4ARCHIV:b).cmd
+    @+echo  ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB4ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB4ARCHIV:b).cmd
 .ELSE
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -347,21 +319,19 @@ $(LIB4ARCHIV) :	$(LIB4TARGET)
 $(LIB4TARGET) :	$(LIB4FILES) \
                         $(LIB4OBJFILES) \
                         $(LIB4DEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo using: $(LIB4FILES)
     @echo using: $(LIB4TARGET)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @echo $(LIB4OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
+    @echo $(LIB4OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
     @cat /dev/null $(LIB4FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @$(RM) $(@:d)$(@:b).dump
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
@@ -378,7 +348,7 @@ $(LIB4TARGET) :	$(LIB4FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB4OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
+    +$(ECHONL) $(LIB4OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
     @+cat /dev/null $(LIB4FILES) | xargs -n1 >> $@
 .ELSE
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB4FILES) $(LIB4OBJFILES))
@@ -393,9 +363,7 @@ $(LIB4TARGET) :	$(LIB4FILES) \
 .ENDIF          # "$(LIB4FILES)"!=""    
 .ELSE			# "$(GUI)"=="WNT"
     @-$(RM) $@
-.IF "$(QUIET_BUILD)"==""
     echo $(LIBMGR) r $@ $(LIB4OBJFILES)
-.ENDIF
     $(LIBMGR) r $@ $(LIB4OBJFILES) $(LIB4FILES) bla.lib
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="UNX"
@@ -408,36 +376,32 @@ $(LIB4TARGET) :	$(LIB4FILES) \
 .IF "$(LIB5ARCHIV)" != ""
 
 $(LIB5ARCHIV) :	$(LIB5TARGET)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd
+    @-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd
+    @-$(RM) $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
+    @echo $(LINK) +inst_close -c `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
+    @cat $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
+    @+source $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB5ARCHIV:b).cmd
+    @echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB5ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
+    @echo  ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
 .ENDIF
 .IF "$(OS)" == "MACOSX"
-     @echo  ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
-.ENDIF
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB5ARCHIV:b).cmd
+     @echo  ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
 .ENDIF
-    @+source $(MISC)$/$(LIB5ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB5ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB5ARCHIV:b).cmd
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB5ARCHIV:b).cmd
-    @+echo  ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB5ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB5ARCHIV:b).cmd
+    @+-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB5ARCHIV:b).cmd
+    @+echo  ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB5ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB5ARCHIV:b).cmd
 .ELSE
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -448,21 +412,19 @@ $(LIB5ARCHIV) :	$(LIB5TARGET)
 $(LIB5TARGET) :	$(LIB5FILES) \
                         $(LIB5OBJFILES) \
                         $(LIB5DEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo using: $(LIB5FILES)
     @echo using: $(LIB5TARGET)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @echo $(LIB5OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
+    @echo $(LIB5OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
     @cat /dev/null $(LIB5FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @$(RM) $(@:d)$(@:b).dump
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
@@ -479,7 +441,7 @@ $(LIB5TARGET) :	$(LIB5FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB5OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
+    +$(ECHONL) $(LIB5OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
     @+cat /dev/null $(LIB5FILES) | xargs -n1 >> $@
 .ELSE
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB5FILES) $(LIB5OBJFILES))
@@ -494,9 +456,7 @@ $(LIB5TARGET) :	$(LIB5FILES) \
 .ENDIF          # "$(LIB5FILES)"!=""    
 .ELSE			# "$(GUI)"=="WNT"
     @-$(RM) $@
-.IF "$(QUIET_BUILD)"==""
     echo $(LIBMGR) r $@ $(LIB5OBJFILES)
-.ENDIF
     $(LIBMGR) r $@ $(LIB5OBJFILES) $(LIB5FILES) bla.lib
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="UNX"
@@ -509,36 +469,32 @@ $(LIB5TARGET) :	$(LIB5FILES) \
 .IF "$(LIB6ARCHIV)" != ""
 
 $(LIB6ARCHIV) :	$(LIB6TARGET)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd
+    @-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd
+    @-$(RM) $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
+    @echo $(LINK) +inst_close -c `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
+    @cat $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
+    @+source $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB6ARCHIV:b).cmd
+    @echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB6ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
+    @echo  ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
 .ENDIF
 .IF "$(OS)" == "MACOSX"
-     @echo  ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
+     @echo  ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB6ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB6ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB6ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB6ARCHIV:b).cmd
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB6ARCHIV:b).cmd
-    @+echo  ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB6ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB6ARCHIV:b).cmd
+    @+-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB6ARCHIV:b).cmd
+    @+echo  ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB6ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB6ARCHIV:b).cmd
 .ELSE
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -549,21 +505,19 @@ $(LIB6ARCHIV) :	$(LIB6TARGET)
 $(LIB6TARGET) :	$(LIB6FILES) \
                         $(LIB6OBJFILES) \
                         $(LIB6DEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo using: $(LIB6FILES)
     @echo using: $(LIB6TARGET)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @echo $(LIB6OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
+    @echo $(LIB6OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
     @cat /dev/null $(LIB6FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @$(RM) $(@:d)$(@:b).dump
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
@@ -580,7 +534,7 @@ $(LIB6TARGET) :	$(LIB6FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB6OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
+    +$(ECHONL) $(LIB6OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
     @+cat /dev/null $(LIB6FILES) | xargs -n1 >> $@
 .ELSE
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB6FILES) $(LIB6OBJFILES))
@@ -595,9 +549,7 @@ $(LIB6TARGET) :	$(LIB6FILES) \
 .ENDIF          # "$(LIB6FILES)"!=""    
 .ELSE			# "$(GUI)"=="WNT"
     @-$(RM) $@
-.IF "$(QUIET_BUILD)"==""
     echo $(LIBMGR) r $@ $(LIB6OBJFILES)
-.ENDIF
     $(LIBMGR) r $@ $(LIB6OBJFILES) $(LIB6FILES) bla.lib
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="UNX"
@@ -610,36 +562,32 @@ $(LIB6TARGET) :	$(LIB6FILES) \
 .IF "$(LIB7ARCHIV)" != ""
 
 $(LIB7ARCHIV) :	$(LIB7TARGET)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd
+    @-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd
+    @-$(RM) $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
+    @echo $(LINK) +inst_close -c `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
+    @cat $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
+    @+source $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB7ARCHIV:b).cmd
+    @echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB7ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
+    @echo  ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
 .ENDIF
 .IF "$(OS)" == "MACOSX"
-     @echo  ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
-.ENDIF
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB7ARCHIV:b).cmd
+     @echo  ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
 .ENDIF
-    @+source $(MISC)$/$(LIB7ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB7ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB7ARCHIV:b).cmd
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB7ARCHIV:b).cmd
-    @+echo  ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB7ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB7ARCHIV:b).cmd
+    @+-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB7ARCHIV:b).cmd
+    @+echo  ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB7ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB7ARCHIV:b).cmd
 .ELSE
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -650,21 +598,19 @@ $(LIB7ARCHIV) :	$(LIB7TARGET)
 $(LIB7TARGET) :	$(LIB7FILES) \
                         $(LIB7OBJFILES) \
                         $(LIB7DEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo using: $(LIB7FILES)
     @echo using: $(LIB7TARGET)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @echo $(LIB7OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
+    @echo $(LIB7OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
     @cat /dev/null $(LIB7FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @$(RM) $(@:d)$(@:b).dump
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
@@ -681,7 +627,7 @@ $(LIB7TARGET) :	$(LIB7FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB7OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
+    +$(ECHONL) $(LIB7OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
     @+cat /dev/null $(LIB7FILES) | xargs -n1 >> $@
 .ELSE
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB7FILES) $(LIB7OBJFILES))
@@ -696,9 +642,7 @@ $(LIB7TARGET) :	$(LIB7FILES) \
 .ENDIF          # "$(LIB7FILES)"!=""    
 .ELSE			# "$(GUI)"=="WNT"
     @-$(RM) $@
-.IF "$(QUIET_BUILD)"==""
     echo $(LIBMGR) r $@ $(LIB7OBJFILES)
-.ENDIF
     $(LIBMGR) r $@ $(LIB7OBJFILES) $(LIB7FILES) bla.lib
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="UNX"
@@ -711,36 +655,32 @@ $(LIB7TARGET) :	$(LIB7FILES) \
 .IF "$(LIB8ARCHIV)" != ""
 
 $(LIB8ARCHIV) :	$(LIB8TARGET)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd
+    @-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd
+    @-$(RM) $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
+    @echo $(LINK) +inst_close -c `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
+    @cat $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
+    @+source $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB8ARCHIV:b).cmd
+    @echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB8ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
+    @echo  ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
 .ENDIF
 .IF "$(OS)" == "MACOSX"
-     @echo  ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
+     @echo  ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB8ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB8ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB8ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB8ARCHIV:b).cmd
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB8ARCHIV:b).cmd
-    @+echo  ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB8ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB8ARCHIV:b).cmd
+    @+-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB8ARCHIV:b).cmd
+    @+echo  ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB8ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB8ARCHIV:b).cmd
 .ELSE
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -751,21 +691,19 @@ $(LIB8ARCHIV) :	$(LIB8TARGET)
 $(LIB8TARGET) :	$(LIB8FILES) \
                         $(LIB8OBJFILES) \
                         $(LIB8DEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo using: $(LIB8FILES)
     @echo using: $(LIB8TARGET)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @echo $(LIB8OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
+    @echo $(LIB8OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
     @cat /dev/null $(LIB8FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @$(RM) $(@:d)$(@:b).dump
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
@@ -782,7 +720,7 @@ $(LIB8TARGET) :	$(LIB8FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB8OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
+    +$(ECHONL) $(LIB8OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
     @+cat /dev/null $(LIB8FILES) | xargs -n1 >> $@
 .ELSE
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB8FILES) $(LIB8OBJFILES))
@@ -797,9 +735,7 @@ $(LIB8TARGET) :	$(LIB8FILES) \
 .ENDIF          # "$(LIB8FILES)"!=""    
 .ELSE			# "$(GUI)"=="WNT"
     @-$(RM) $@
-.IF "$(QUIET_BUILD)"==""
     echo $(LIBMGR) r $@ $(LIB8OBJFILES)
-.ENDIF
     $(LIBMGR) r $@ $(LIB8OBJFILES) $(LIB8FILES) bla.lib
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="UNX"
@@ -812,36 +748,32 @@ $(LIB8TARGET) :	$(LIB8FILES) \
 .IF "$(LIB9ARCHIV)" != ""
 
 $(LIB9ARCHIV) :	$(LIB9TARGET)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd
+    @-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd
+    @-$(RM) $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
+    @echo $(LINK) +inst_close -c `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
+    @cat $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
+    @+source $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB9ARCHIV:b).cmd
+    @echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB9ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
+    @echo  ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
 .ENDIF
 .IF "$(OS)" == "MACOSX"
-     @echo  ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
-.ENDIF
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB9ARCHIV:b).cmd
+     @echo  ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
 .ENDIF
-    @+source $(MISC)$/$(LIB9ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB9ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB9ARCHIV:b).cmd
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB9ARCHIV:b).cmd
-    @+echo  ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB9ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB9ARCHIV:b).cmd
+    @+-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB9ARCHIV:b).cmd
+    @+echo  ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB9ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB9ARCHIV:b).cmd
 .ELSE
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -852,21 +784,19 @@ $(LIB9ARCHIV) :	$(LIB9TARGET)
 $(LIB9TARGET) :	$(LIB9FILES) \
                         $(LIB9OBJFILES) \
                         $(LIB9DEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo using: $(LIB9FILES)
     @echo using: $(LIB9TARGET)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @echo $(LIB9OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
+    @echo $(LIB9OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
     @cat /dev/null $(LIB9FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @$(RM) $(@:d)$(@:b).dump
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
@@ -883,7 +813,7 @@ $(LIB9TARGET) :	$(LIB9FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB9OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
+    +$(ECHONL) $(LIB9OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
     @+cat /dev/null $(LIB9FILES) | xargs -n1 >> $@
 .ELSE
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB9FILES) $(LIB9OBJFILES))
@@ -898,9 +828,7 @@ $(LIB9TARGET) :	$(LIB9FILES) \
 .ENDIF          # "$(LIB9FILES)"!=""    
 .ELSE			# "$(GUI)"=="WNT"
     @-$(RM) $@
-.IF "$(QUIET_BUILD)"==""
     echo $(LIBMGR) r $@ $(LIB9OBJFILES)
-.ENDIF
     $(LIBMGR) r $@ $(LIB9OBJFILES) $(LIB9FILES) bla.lib
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="UNX"
@@ -913,36 +841,32 @@ $(LIB9TARGET) :	$(LIB9FILES) \
 .IF "$(LIB10ARCHIV)" != ""
 
 $(LIB10ARCHIV) :	$(LIB10TARGET)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd
+    @-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd
+    @-$(RM) $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
+    @echo $(LINK) +inst_close -c `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
+    @cat $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
+    @+source $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB10ARCHIV:b).cmd
+    @echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB10ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
+    @echo  ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd
 .ENDIF
 .IF "$(OS)" == "MACOSX"
-     @echo  ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
-.ENDIF
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB10ARCHIV:b).cmd
+     @echo  ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd
 .ENDIF
-    @+source $(MISC)$/$(LIB10ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB10ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB10ARCHIV:b).cmd
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB10ARCHIV:b).cmd
-    @+echo  ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB10ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB10ARCHIV:b).cmd
+    @+-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB10ARCHIV:b).cmd
+    @+echo  ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB10ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB10ARCHIV:b).cmd
 .ELSE
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -953,21 +877,19 @@ $(LIB10ARCHIV) :	$(LIB10TARGET)
 $(LIB10TARGET) :	$(LIB10FILES) \
                         $(LIB10OBJFILES) \
                         $(LIB10DEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo using: $(LIB10FILES)
     @echo using: $(LIB10TARGET)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @echo $(LIB10OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
+    @echo $(LIB10OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
     @cat /dev/null $(LIB10FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @$(RM) $(@:d)$(@:b).dump
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
@@ -984,7 +906,7 @@ $(LIB10TARGET) :	$(LIB10FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB10OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
+    +$(ECHONL) $(LIB10OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
     @+cat /dev/null $(LIB10FILES) | xargs -n1 >> $@
 .ELSE
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB10FILES) $(LIB10OBJFILES))
@@ -999,9 +921,7 @@ $(LIB10TARGET) :	$(LIB10FILES) \
 .ENDIF          # "$(LIB10FILES)"!=""    
 .ELSE			# "$(GUI)"=="WNT"
     @-$(RM) $@
-.IF "$(QUIET_BUILD)"==""
     echo $(LIBMGR) r $@ $(LIB10OBJFILES)
-.ENDIF
     $(LIBMGR) r $@ $(LIB10OBJFILES) $(LIB10FILES) bla.lib
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="UNX"
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 01e039532..e6d06390d 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -3,18 +3,16 @@
 .IF "$(RESLIB1TARGETN)"!=""
 
 .IF "$(BUILDHIDS)"!=""
-HIDRES1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB1NAME)_res.hid
+HIDRES1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB1NAME)_res.hid
 
 #HACK cut off the dirty srs files which are included from solver
 RESLIB1HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB1SRSFILES)))
 $(HIDRES1PARTICLE): $(RESLIB1HIDFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+    @echo Making: $@
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDRES1PARTICLE)
@@ -27,31 +25,31 @@ $(RSC_MULTI1) : \
         $(RESLIB1BMPS)
     @echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \
+    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC1HEADER) $(RESLIB1SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)$/$(RESLIB1NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \
+    -fs={$(BIN)/$(RESLIB1NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC1HEADER) $(RESLIB1SRSFILES) \
@@ -61,7 +59,7 @@ $(RSC_MULTI1) : \
 $(RESLIB1TARGETN): \
         $(RESLIB1SRSFILES) \
         $(RESLIB1BMPS)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
     @@-$(RM) $(RSC_MULTI1)
@@ -83,18 +81,16 @@ $(RESLIB1TARGETN): \
 .IF "$(RESLIB2TARGETN)"!=""
 
 .IF "$(BUILDHIDS)"!=""
-HIDRES2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB2NAME)_res.hid
+HIDRES2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB2NAME)_res.hid
 
 #HACK cut off the dirty srs files which are included from solver
 RESLIB2HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB2SRSFILES)))
 $(HIDRES2PARTICLE): $(RESLIB2HIDFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+    @echo Making: $@
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDRES2PARTICLE)
@@ -107,31 +103,31 @@ $(RSC_MULTI2) : \
         $(RESLIB2BMPS)
     @echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$i \
+    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC2HEADER) $(RESLIB2SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)$/$(RESLIB2NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$i \
+    -fs={$(BIN)/$(RESLIB2NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC2HEADER) $(RESLIB2SRSFILES) \
@@ -141,7 +137,7 @@ $(RSC_MULTI2) : \
 $(RESLIB2TARGETN): \
         $(RESLIB2SRSFILES) \
         $(RESLIB2BMPS)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
     @@-$(RM) $(RSC_MULTI2)
@@ -163,18 +159,16 @@ $(RESLIB2TARGETN): \
 .IF "$(RESLIB3TARGETN)"!=""
 
 .IF "$(BUILDHIDS)"!=""
-HIDRES3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB3NAME)_res.hid
+HIDRES3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB3NAME)_res.hid
 
 #HACK cut off the dirty srs files which are included from solver
 RESLIB3HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB3SRSFILES)))
 $(HIDRES3PARTICLE): $(RESLIB3HIDFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+    @echo Making: $@
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDRES3PARTICLE)
@@ -187,31 +181,31 @@ $(RSC_MULTI3) : \
         $(RESLIB3BMPS)
     @echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$i \
+    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC3HEADER) $(RESLIB3SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)$/$(RESLIB3NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$i \
+    -fs={$(BIN)/$(RESLIB3NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC3HEADER) $(RESLIB3SRSFILES) \
@@ -221,7 +215,7 @@ $(RSC_MULTI3) : \
 $(RESLIB3TARGETN): \
         $(RESLIB3SRSFILES) \
         $(RESLIB3BMPS)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
     @@-$(RM) $(RSC_MULTI3)
@@ -243,18 +237,16 @@ $(RESLIB3TARGETN): \
 .IF "$(RESLIB4TARGETN)"!=""
 
 .IF "$(BUILDHIDS)"!=""
-HIDRES4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB4NAME)_res.hid
+HIDRES4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB4NAME)_res.hid
 
 #HACK cut off the dirty srs files which are included from solver
 RESLIB4HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB4SRSFILES)))
 $(HIDRES4PARTICLE): $(RESLIB4HIDFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+    @echo Making: $@
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDRES4PARTICLE)
@@ -267,31 +259,31 @@ $(RSC_MULTI4) : \
         $(RESLIB4BMPS)
     @echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$i \
+    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC4HEADER) $(RESLIB4SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)$/$(RESLIB4NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$i \
+    -fs={$(BIN)/$(RESLIB4NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC4HEADER) $(RESLIB4SRSFILES) \
@@ -301,7 +293,7 @@ $(RSC_MULTI4) : \
 $(RESLIB4TARGETN): \
         $(RESLIB4SRSFILES) \
         $(RESLIB4BMPS)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
     @@-$(RM) $(RSC_MULTI4)
@@ -323,18 +315,16 @@ $(RESLIB4TARGETN): \
 .IF "$(RESLIB5TARGETN)"!=""
 
 .IF "$(BUILDHIDS)"!=""
-HIDRES5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB5NAME)_res.hid
+HIDRES5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB5NAME)_res.hid
 
 #HACK cut off the dirty srs files which are included from solver
 RESLIB5HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB5SRSFILES)))
 $(HIDRES5PARTICLE): $(RESLIB5HIDFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+    @echo Making: $@
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDRES5PARTICLE)
@@ -347,31 +337,31 @@ $(RSC_MULTI5) : \
         $(RESLIB5BMPS)
     @echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$i \
+    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC5HEADER) $(RESLIB5SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)$/$(RESLIB5NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$i \
+    -fs={$(BIN)/$(RESLIB5NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC5HEADER) $(RESLIB5SRSFILES) \
@@ -381,7 +371,7 @@ $(RSC_MULTI5) : \
 $(RESLIB5TARGETN): \
         $(RESLIB5SRSFILES) \
         $(RESLIB5BMPS)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
     @@-$(RM) $(RSC_MULTI5)
@@ -403,18 +393,16 @@ $(RESLIB5TARGETN): \
 .IF "$(RESLIB6TARGETN)"!=""
 
 .IF "$(BUILDHIDS)"!=""
-HIDRES6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB6NAME)_res.hid
+HIDRES6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB6NAME)_res.hid
 
 #HACK cut off the dirty srs files which are included from solver
 RESLIB6HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB6SRSFILES)))
 $(HIDRES6PARTICLE): $(RESLIB6HIDFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+    @echo Making: $@
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDRES6PARTICLE)
@@ -427,31 +415,31 @@ $(RSC_MULTI6) : \
         $(RESLIB6BMPS)
     @echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$i \
+    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC6HEADER) $(RESLIB6SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)$/$(RESLIB6NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$i \
+    -fs={$(BIN)/$(RESLIB6NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC6HEADER) $(RESLIB6SRSFILES) \
@@ -461,7 +449,7 @@ $(RSC_MULTI6) : \
 $(RESLIB6TARGETN): \
         $(RESLIB6SRSFILES) \
         $(RESLIB6BMPS)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
     @@-$(RM) $(RSC_MULTI6)
@@ -483,18 +471,16 @@ $(RESLIB6TARGETN): \
 .IF "$(RESLIB7TARGETN)"!=""
 
 .IF "$(BUILDHIDS)"!=""
-HIDRES7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB7NAME)_res.hid
+HIDRES7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB7NAME)_res.hid
 
 #HACK cut off the dirty srs files which are included from solver
 RESLIB7HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB7SRSFILES)))
 $(HIDRES7PARTICLE): $(RESLIB7HIDFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+    @echo Making: $@
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDRES7PARTICLE)
@@ -507,31 +493,31 @@ $(RSC_MULTI7) : \
         $(RESLIB7BMPS)
     @echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$i \
+    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC7HEADER) $(RESLIB7SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)$/$(RESLIB7NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$i \
+    -fs={$(BIN)/$(RESLIB7NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC7HEADER) $(RESLIB7SRSFILES) \
@@ -541,7 +527,7 @@ $(RSC_MULTI7) : \
 $(RESLIB7TARGETN): \
         $(RESLIB7SRSFILES) \
         $(RESLIB7BMPS)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
     @@-$(RM) $(RSC_MULTI7)
@@ -563,18 +549,16 @@ $(RESLIB7TARGETN): \
 .IF "$(RESLIB8TARGETN)"!=""
 
 .IF "$(BUILDHIDS)"!=""
-HIDRES8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB8NAME)_res.hid
+HIDRES8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB8NAME)_res.hid
 
 #HACK cut off the dirty srs files which are included from solver
 RESLIB8HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB8SRSFILES)))
 $(HIDRES8PARTICLE): $(RESLIB8HIDFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+    @echo Making: $@
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDRES8PARTICLE)
@@ -587,31 +571,31 @@ $(RSC_MULTI8) : \
         $(RESLIB8BMPS)
     @echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$i \
+    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC8HEADER) $(RESLIB8SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)$/$(RESLIB8NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$i \
+    -fs={$(BIN)/$(RESLIB8NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC8HEADER) $(RESLIB8SRSFILES) \
@@ -621,7 +605,7 @@ $(RSC_MULTI8) : \
 $(RESLIB8TARGETN): \
         $(RESLIB8SRSFILES) \
         $(RESLIB8BMPS)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
     @@-$(RM) $(RSC_MULTI8)
@@ -643,18 +627,16 @@ $(RESLIB8TARGETN): \
 .IF "$(RESLIB9TARGETN)"!=""
 
 .IF "$(BUILDHIDS)"!=""
-HIDRES9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB9NAME)_res.hid
+HIDRES9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB9NAME)_res.hid
 
 #HACK cut off the dirty srs files which are included from solver
 RESLIB9HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB9SRSFILES)))
 $(HIDRES9PARTICLE): $(RESLIB9HIDFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+    @echo Making: $@
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDRES9PARTICLE)
@@ -667,31 +649,31 @@ $(RSC_MULTI9) : \
         $(RESLIB9BMPS)
     @echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$i \
+    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC9HEADER) $(RESLIB9SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)$/$(RESLIB9NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$i \
+    -fs={$(BIN)/$(RESLIB9NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC9HEADER) $(RESLIB9SRSFILES) \
@@ -701,7 +683,7 @@ $(RSC_MULTI9) : \
 $(RESLIB9TARGETN): \
         $(RESLIB9SRSFILES) \
         $(RESLIB9BMPS)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
     @@-$(RM) $(RSC_MULTI9)
@@ -723,18 +705,16 @@ $(RESLIB9TARGETN): \
 .IF "$(RESLIB10TARGETN)"!=""
 
 .IF "$(BUILDHIDS)"!=""
-HIDRES10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB10NAME)_res.hid
+HIDRES10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB10NAME)_res.hid
 
 #HACK cut off the dirty srs files which are included from solver
 RESLIB10HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB10SRSFILES)))
 $(HIDRES10PARTICLE): $(RESLIB10HIDFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+    @echo Making: $@
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDRES10PARTICLE)
@@ -747,31 +727,31 @@ $(RSC_MULTI10) : \
         $(RESLIB10BMPS)
     @echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$i \
+    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC10HEADER) $(RESLIB10SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)$/$(RESLIB10NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$i \
+    -fs={$(BIN)/$(RESLIB10NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC10HEADER) $(RESLIB10SRSFILES) \
@@ -781,7 +761,7 @@ $(RSC_MULTI10) : \
 $(RESLIB10TARGETN): \
         $(RESLIB10SRSFILES) \
         $(RESLIB10BMPS)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
     @@-$(RM) $(RSC_MULTI10)
diff --git a/solenv/inc/_tg_scp.mk b/solenv/inc/_tg_scp.mk
index 8c3d4bf89..ea37f37cc 100644
--- a/solenv/inc/_tg_scp.mk
+++ b/solenv/inc/_tg_scp.mk
@@ -3,19 +3,17 @@
 .IF "$(SCP1TARGETN)"!=""
 
 # try to get missing parfiles
-$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
+$(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
-LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP1TARGETN): $(LOCALSCP1FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)$/$(SCP1LINK_PRODUCT_TYPE)
-    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP1FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
+    @echo Making: $@
+    @@-$(MKDIRHIER) $(BIN)/$(SCP1LINK_PRODUCT_TYPE)
+    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP1FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
 .ENDIF
 
 # Anweisungen fuer das Linken
@@ -24,19 +22,17 @@ $(SCP1TARGETN): $(LOCALSCP1FILES)
 .IF "$(SCP2TARGETN)"!=""
 
 # try to get missing parfiles
-$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
+$(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
-LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP2TARGETN): $(LOCALSCP2FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)$/$(SCP2LINK_PRODUCT_TYPE)
-    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP2FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
+    @echo Making: $@
+    @@-$(MKDIRHIER) $(BIN)/$(SCP2LINK_PRODUCT_TYPE)
+    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP2FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
 .ENDIF
 
 # Anweisungen fuer das Linken
@@ -45,19 +41,17 @@ $(SCP2TARGETN): $(LOCALSCP2FILES)
 .IF "$(SCP3TARGETN)"!=""
 
 # try to get missing parfiles
-$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
+$(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
-LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP3TARGETN): $(LOCALSCP3FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)$/$(SCP3LINK_PRODUCT_TYPE)
-    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP3FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
+    @echo Making: $@
+    @@-$(MKDIRHIER) $(BIN)/$(SCP3LINK_PRODUCT_TYPE)
+    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP3FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
 .ENDIF
 
 # Anweisungen fuer das Linken
@@ -66,19 +60,17 @@ $(SCP3TARGETN): $(LOCALSCP3FILES)
 .IF "$(SCP4TARGETN)"!=""
 
 # try to get missing parfiles
-$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
+$(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
-LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP4TARGETN): $(LOCALSCP4FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)$/$(SCP4LINK_PRODUCT_TYPE)
-    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP4FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
+    @echo Making: $@
+    @@-$(MKDIRHIER) $(BIN)/$(SCP4LINK_PRODUCT_TYPE)
+    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP4FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
 .ENDIF
 
 # Anweisungen fuer das Linken
@@ -87,19 +79,17 @@ $(SCP4TARGETN): $(LOCALSCP4FILES)
 .IF "$(SCP5TARGETN)"!=""
 
 # try to get missing parfiles
-$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
+$(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
-LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP5TARGETN): $(LOCALSCP5FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)$/$(SCP5LINK_PRODUCT_TYPE)
-    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP5FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
+    @echo Making: $@
+    @@-$(MKDIRHIER) $(BIN)/$(SCP5LINK_PRODUCT_TYPE)
+    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP5FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
 .ENDIF
 
 # Anweisungen fuer das Linken
@@ -108,19 +98,17 @@ $(SCP5TARGETN): $(LOCALSCP5FILES)
 .IF "$(SCP6TARGETN)"!=""
 
 # try to get missing parfiles
-$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
+$(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
-LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP6TARGETN): $(LOCALSCP6FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)$/$(SCP6LINK_PRODUCT_TYPE)
-    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP6FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
+    @echo Making: $@
+    @@-$(MKDIRHIER) $(BIN)/$(SCP6LINK_PRODUCT_TYPE)
+    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP6FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
 .ENDIF
 
 # Anweisungen fuer das Linken
@@ -129,19 +117,17 @@ $(SCP6TARGETN): $(LOCALSCP6FILES)
 .IF "$(SCP7TARGETN)"!=""
 
 # try to get missing parfiles
-$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
+$(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
-LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP7TARGETN): $(LOCALSCP7FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)$/$(SCP7LINK_PRODUCT_TYPE)
-    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP7FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
+    @echo Making: $@
+    @@-$(MKDIRHIER) $(BIN)/$(SCP7LINK_PRODUCT_TYPE)
+    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP7FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
 .ENDIF
 
 # Anweisungen fuer das Linken
@@ -150,19 +136,17 @@ $(SCP7TARGETN): $(LOCALSCP7FILES)
 .IF "$(SCP8TARGETN)"!=""
 
 # try to get missing parfiles
-$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
+$(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
-LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP8TARGETN): $(LOCALSCP8FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)$/$(SCP8LINK_PRODUCT_TYPE)
-    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP8FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
+    @echo Making: $@
+    @@-$(MKDIRHIER) $(BIN)/$(SCP8LINK_PRODUCT_TYPE)
+    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP8FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
 .ENDIF
 
 # Anweisungen fuer das Linken
@@ -171,19 +155,17 @@ $(SCP8TARGETN): $(LOCALSCP8FILES)
 .IF "$(SCP9TARGETN)"!=""
 
 # try to get missing parfiles
-$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
+$(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
-LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP9TARGETN): $(LOCALSCP9FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)$/$(SCP9LINK_PRODUCT_TYPE)
-    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP9FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
+    @echo Making: $@
+    @@-$(MKDIRHIER) $(BIN)/$(SCP9LINK_PRODUCT_TYPE)
+    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP9FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
 .ENDIF
 
 # Anweisungen fuer das Linken
@@ -192,19 +174,17 @@ $(SCP9TARGETN): $(LOCALSCP9FILES)
 .IF "$(SCP10TARGETN)"!=""
 
 # try to get missing parfiles
-$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
+$(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
-LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP10TARGETN): $(LOCALSCP10FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)$/$(SCP10LINK_PRODUCT_TYPE)
-    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP10FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
+    @echo Making: $@
+    @@-$(MKDIRHIER) $(BIN)/$(SCP10LINK_PRODUCT_TYPE)
+    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP10FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
 .ENDIF
 
 # Anweisungen fuer das Linken
diff --git a/solenv/inc/_tg_sdi.mk b/solenv/inc/_tg_sdi.mk
index f5f2d84d7..c10ad5460 100644
--- a/solenv/inc/_tg_sdi.mk
+++ b/solenv/inc/_tg_sdi.mk
@@ -2,34 +2,26 @@
 
 .IF "$(HIDSID1PARTICLE)"!=""
 $(HIDSID1PARTICLE): $(SDI1TARGET)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI1NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI1NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI1NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID1PARTICLE)"!=""
 
 .IF "$(SDI1TARGET)"!=""
 $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI1NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI1NAME).ilb	\
-    -fm$(MISC)$/$(SDI1NAME).don	\
-    -fl$(MISC)$/$(SDI1NAME).lst         \
+    -fs$(INCCOMX)/$(SDI1NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI1NAME).ilb	\
+    -fm$(MISC)/$(SDI1NAME).don	\
+    -fl$(MISC)/$(SDI1NAME).lst         \
     -fx$(SDI1EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI1NAME).sid	\
+    -fz$(MISC)/$(SDI1NAME).sid	\
     $(SDI1NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI1TARGET)"!=""
 
@@ -38,34 +30,26 @@ $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
 
 .IF "$(HIDSID2PARTICLE)"!=""
 $(HIDSID2PARTICLE): $(SDI2TARGET)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI2NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI2NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI2NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID2PARTICLE)"!=""
 
 .IF "$(SDI2TARGET)"!=""
 $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI2NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI2NAME).ilb	\
-    -fm$(MISC)$/$(SDI2NAME).don	\
-    -fl$(MISC)$/$(SDI2NAME).lst         \
+    -fs$(INCCOMX)/$(SDI2NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI2NAME).ilb	\
+    -fm$(MISC)/$(SDI2NAME).don	\
+    -fl$(MISC)/$(SDI2NAME).lst         \
     -fx$(SDI2EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI2NAME).sid	\
+    -fz$(MISC)/$(SDI2NAME).sid	\
     $(SDI2NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI2TARGET)"!=""
 
@@ -74,34 +58,26 @@ $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
 
 .IF "$(HIDSID3PARTICLE)"!=""
 $(HIDSID3PARTICLE): $(SDI3TARGET)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI3NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI3NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI3NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID3PARTICLE)"!=""
 
 .IF "$(SDI3TARGET)"!=""
 $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI3NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI3NAME).ilb	\
-    -fm$(MISC)$/$(SDI3NAME).don	\
-    -fl$(MISC)$/$(SDI3NAME).lst         \
+    -fs$(INCCOMX)/$(SDI3NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI3NAME).ilb	\
+    -fm$(MISC)/$(SDI3NAME).don	\
+    -fl$(MISC)/$(SDI3NAME).lst         \
     -fx$(SDI3EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI3NAME).sid	\
+    -fz$(MISC)/$(SDI3NAME).sid	\
     $(SDI3NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI3TARGET)"!=""
 
@@ -110,34 +86,26 @@ $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
 
 .IF "$(HIDSID4PARTICLE)"!=""
 $(HIDSID4PARTICLE): $(SDI4TARGET)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI4NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI4NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI4NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID4PARTICLE)"!=""
 
 .IF "$(SDI4TARGET)"!=""
 $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI4NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI4NAME).ilb	\
-    -fm$(MISC)$/$(SDI4NAME).don	\
-    -fl$(MISC)$/$(SDI4NAME).lst         \
+    -fs$(INCCOMX)/$(SDI4NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI4NAME).ilb	\
+    -fm$(MISC)/$(SDI4NAME).don	\
+    -fl$(MISC)/$(SDI4NAME).lst         \
     -fx$(SDI4EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI4NAME).sid	\
+    -fz$(MISC)/$(SDI4NAME).sid	\
     $(SDI4NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI4TARGET)"!=""
 
@@ -146,34 +114,26 @@ $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
 
 .IF "$(HIDSID5PARTICLE)"!=""
 $(HIDSID5PARTICLE): $(SDI5TARGET)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI5NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI5NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI5NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID5PARTICLE)"!=""
 
 .IF "$(SDI5TARGET)"!=""
 $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI5NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI5NAME).ilb	\
-    -fm$(MISC)$/$(SDI5NAME).don	\
-    -fl$(MISC)$/$(SDI5NAME).lst         \
+    -fs$(INCCOMX)/$(SDI5NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI5NAME).ilb	\
+    -fm$(MISC)/$(SDI5NAME).don	\
+    -fl$(MISC)/$(SDI5NAME).lst         \
     -fx$(SDI5EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI5NAME).sid	\
+    -fz$(MISC)/$(SDI5NAME).sid	\
     $(SDI5NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI5TARGET)"!=""
 
@@ -182,34 +142,26 @@ $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
 
 .IF "$(HIDSID6PARTICLE)"!=""
 $(HIDSID6PARTICLE): $(SDI6TARGET)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI6NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI6NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI6NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID6PARTICLE)"!=""
 
 .IF "$(SDI6TARGET)"!=""
 $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI6NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI6NAME).ilb	\
-    -fm$(MISC)$/$(SDI6NAME).don	\
-    -fl$(MISC)$/$(SDI6NAME).lst         \
+    -fs$(INCCOMX)/$(SDI6NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI6NAME).ilb	\
+    -fm$(MISC)/$(SDI6NAME).don	\
+    -fl$(MISC)/$(SDI6NAME).lst         \
     -fx$(SDI6EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI6NAME).sid	\
+    -fz$(MISC)/$(SDI6NAME).sid	\
     $(SDI6NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI6TARGET)"!=""
 
@@ -218,34 +170,26 @@ $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
 
 .IF "$(HIDSID7PARTICLE)"!=""
 $(HIDSID7PARTICLE): $(SDI7TARGET)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI7NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI7NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI7NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID7PARTICLE)"!=""
 
 .IF "$(SDI7TARGET)"!=""
 $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI7NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI7NAME).ilb	\
-    -fm$(MISC)$/$(SDI7NAME).don	\
-    -fl$(MISC)$/$(SDI7NAME).lst         \
+    -fs$(INCCOMX)/$(SDI7NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI7NAME).ilb	\
+    -fm$(MISC)/$(SDI7NAME).don	\
+    -fl$(MISC)/$(SDI7NAME).lst         \
     -fx$(SDI7EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI7NAME).sid	\
+    -fz$(MISC)/$(SDI7NAME).sid	\
     $(SDI7NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI7TARGET)"!=""
 
@@ -254,34 +198,26 @@ $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
 
 .IF "$(HIDSID8PARTICLE)"!=""
 $(HIDSID8PARTICLE): $(SDI8TARGET)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI8NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI8NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI8NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID8PARTICLE)"!=""
 
 .IF "$(SDI8TARGET)"!=""
 $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI8NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI8NAME).ilb	\
-    -fm$(MISC)$/$(SDI8NAME).don	\
-    -fl$(MISC)$/$(SDI8NAME).lst         \
+    -fs$(INCCOMX)/$(SDI8NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI8NAME).ilb	\
+    -fm$(MISC)/$(SDI8NAME).don	\
+    -fl$(MISC)/$(SDI8NAME).lst         \
     -fx$(SDI8EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI8NAME).sid	\
+    -fz$(MISC)/$(SDI8NAME).sid	\
     $(SDI8NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI8TARGET)"!=""
 
@@ -290,34 +226,26 @@ $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
 
 .IF "$(HIDSID9PARTICLE)"!=""
 $(HIDSID9PARTICLE): $(SDI9TARGET)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI9NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI9NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI9NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID9PARTICLE)"!=""
 
 .IF "$(SDI9TARGET)"!=""
 $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI9NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI9NAME).ilb	\
-    -fm$(MISC)$/$(SDI9NAME).don	\
-    -fl$(MISC)$/$(SDI9NAME).lst         \
+    -fs$(INCCOMX)/$(SDI9NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI9NAME).ilb	\
+    -fm$(MISC)/$(SDI9NAME).don	\
+    -fl$(MISC)/$(SDI9NAME).lst         \
     -fx$(SDI9EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI9NAME).sid	\
+    -fz$(MISC)/$(SDI9NAME).sid	\
     $(SDI9NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI9TARGET)"!=""
 
@@ -326,34 +254,26 @@ $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
 
 .IF "$(HIDSID10PARTICLE)"!=""
 $(HIDSID10PARTICLE): $(SDI10TARGET)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI10NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI10NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI10NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID10PARTICLE)"!=""
 
 .IF "$(SDI10TARGET)"!=""
 $(SDI10TARGET): $(SVSDI10DEPEND) $(SDI10NAME).sdi
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI10NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI10NAME).ilb	\
-    -fm$(MISC)$/$(SDI10NAME).don	\
-    -fl$(MISC)$/$(SDI10NAME).lst         \
+    -fs$(INCCOMX)/$(SDI10NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI10NAME).ilb	\
+    -fm$(MISC)/$(SDI10NAME).don	\
+    -fl$(MISC)/$(SDI10NAME).lst         \
     -fx$(SDI10EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI10NAME).sid	\
+    -fz$(MISC)/$(SDI10NAME).sid	\
     $(SDI10NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI10TARGET)"!=""
 
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index dcfd8eb82..0c881e1c3 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -29,7 +29,7 @@ LINKFLAGSRUNPATH_$(SHL1RPATH)*=/ERROR:/Bad_SHL1RPATH_value
 SHL1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL1RPATH))
 
 .IF "$(SHL1USE_EXPORTS)"==""
-SHL1DEF*=$(MISC)$/$(SHL1TARGET).def
+SHL1DEF*=$(MISC)/$(SHL1TARGET).def
 .ENDIF			# "$(SHL1USE_EXPORTS)"==""
 
 EXTRALIBPATHS1=$(EXTRALIBPATHS)
@@ -46,15 +46,15 @@ EXTRALIBPATHS1+=-L$(SOLAR_STLLIBPATH)
 
 .IF "$(VERSIONOBJ)"!=""
 SHL1VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)$/$(SHL1VERSIONOBJ:b).h
+USE_VERSIONH:=$(INCCOM)/$(SHL1VERSIONOBJ:b).h
 .IF "$(GUI)" == "UNX"
 SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
 .ELSE           # "$(GUI)" == "UNX"
 SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f)
 .ENDIF          # "$(GUI)" == "UNX"
-$(MISC)$/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL1VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)$/src$/version.c $@
-	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@
+$(MISC)/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ:b).h
+#    $(COPY) $(SOLARENV)/src/version.c $@
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@
 
 .INIT : $(SHL1VERSIONOBJDEP)
 .ENDIF			# "$(VERSIONOBJ)"!=""
@@ -65,13 +65,13 @@ $(MISC)$/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL1VE
 SHL1IMPLIB=i$(TARGET)_t1
 .ENDIF			# "$(SHL1IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
-USE_1IMPLIB=-implib:$(LB)$/$(SHL1IMPLIB).lib
+USE_1IMPLIB=-implib:$(LB)/$(SHL1IMPLIB).lib
 .ENDIF			# "$(COM)" != "GCC"
-SHL1IMPLIBN=$(LB)$/$(SHL1IMPLIB).lib
+SHL1IMPLIBN=$(LB)/$(SHL1IMPLIB).lib
 ALLTAR : $(SHL1IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
-USE_1IMPLIB_DEPS=$(LB)$/$(SHL1IMPLIB).lib
+USE_1IMPLIB_DEPS=$(LB)/$(SHL1IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 USE_SHL1DEF=$(SHL1DEF)
@@ -81,7 +81,7 @@ SHL1DEPN+:=$(SHL1DEPNU)
 
 .IF "$(SHL1VERSIONMAP)"==""
 # to activate vmaps remove "#"
-USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap
+USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap
 .ENDIF			# "$(SHL1VERSIONMAP)"==""
 
 .IF "$(USE_SHL1VERSIONMAP)"!=""
@@ -89,7 +89,7 @@ USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap
 .IF "$(SHL1FILTERFILE)"!=""
 .IF "$(SHL1VERSIONMAP)"!=""
 #eine von beiden ist zuviel
-USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap
+USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap
 $(USE_SHL1VERSIONMAP) .PHONY:
     @echo -----------------------------
     @echo you should only use versionmap OR exportfile
@@ -116,27 +116,23 @@ $(USE_SHL1VERSIONMAP): \
 .ENDIF
 .ENDIF			# "$(SHL1OBJS)!"=""
     @$(TYPE) /dev/null $(SHL1LIBS:s/.lib/.dump/) >> $@.dump
-	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL1INTERFACE) -f $(SHL1FILTERFILE) -m $@
+    $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL1INTERFACE) -f $(SHL1FILTERFILE) -m $@
 
 .ELSE			# "$(SHL1FILTERFILE)"!=""
-USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap
+USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap
 $(USE_SHL1VERSIONMAP) :
-.IF "$(QUIET_BUILD)"==""
     @echo -----------------------------
     @echo SHL1FILTERFILE not set!
     @echo -----------------------------
     @$(TOUCH) $@
     @echo dummy file to keep the dependencies for later use.
-.ELSE
-	@$(TOUCH) $@
-.ENDIF
 #	force_dmake_to_error
 .ENDIF			# "$(SHL1FILTERFILE)"!=""
 .ELSE			# "$(USE_SHL1VERSIONMAP)"!=""
 
 #and now for the plain non-generic way...
 .IF "$(SHL1VERSIONMAP)"!=""
-USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e)
+USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e)
 .IF "$(OS)"!="IRIX"
 SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
 .ENDIF
@@ -156,25 +152,25 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP)
 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
 # happens if somebody will change it in the future
 .IF "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .ELIF "$(COMNAME)"=="sunpro5"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL1VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
+    tr -d "\015" < $(SHL1VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
 .ELSE           # "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL1VERSIONMAP) > $@
+    tr -d "\015" < $(SHL1VERSIONMAP) > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod a+w $@
 # Mac OS X post-processing generate an exported symbols list from the generated map file
 # for details on exported symbols list see man ld on Mac OS X
 .IF "$(OS)"=="MACOSX"
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
 .IF "$(SHL1OBJS)"!=""
-    -echo $(foreach,i,$(SHL1OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -echo $(foreach,i,$(SHL1OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 .IF "$(SHL1LIBS)"!=""
-    -$(TYPE) $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -$(TYPE) $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
@@ -198,15 +194,15 @@ SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\"
 
 .IF "$(SHL1RES)"!=""
 SHL1ALLRES+=$(SHL1RES)
-SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res
-SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o
+SHL1LINKRES*=$(MISC)/$(SHL1TARGET).res
+SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o
 .ENDIF			# "$(SHL1RES)"!=""
 
 .IF "$(SHL1DEFAULTRES)$(use_shl_versions)"!=""
-SHL1DEFAULTRES*=$(MISC)$/$(SHL1TARGET)_def.res
+SHL1DEFAULTRES*=$(MISC)/$(SHL1TARGET)_def.res
 SHL1ALLRES+=$(SHL1DEFAULTRES)
-SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res
-SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o
+SHL1LINKRES*=$(MISC)/$(SHL1TARGET).res
+SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o
 .ENDIF			# "$(SHL1DEFAULTRES)$(use_shl_versions)"!=""
 
 #.IF "$(SHL1TARGETN)"!=""
@@ -214,13 +210,13 @@ SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(SHL1LIBS)"!=""
-$(MISC)$/$(SHL1TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(SHL1TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL1LIBS)"!=""
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(SHL1TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(SHL1TARGETN:b)_linkinc.ls
 $(SHL1TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
@@ -228,17 +224,17 @@ $(SHL1TARGETN) : $(LINKINCTARGETS)
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL1LIBS)"!=""
-SHL1LINKLIST=$(MISC)$/$(SHL1TARGET)_link.lst
+SHL1LINKLIST=$(MISC)/$(SHL1TARGET)_link.lst
 SHL1LINKLISTPARAM=@$(SHL1LINKLIST)
 $(SHL1LINKLIST) : $(SHL1LIBS)
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL1LIBS)"!=""
 .ENDIF          # "$(COM)"!="GCC"
 .ENDIF
 .ENDIF			# "$(SHL1USE_EXPORTS)"=="name"
 
-$(MISC)$/%linkinc.ls:
+$(MISC)/%linkinc.ls:
     echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
@@ -249,7 +245,7 @@ SHL1TARGET8=$(shell @fix_shl $(SHL1TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
-_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL1STDLIBS:^"$(LB)$/") 
+_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL1STDLIBS:^"$(LB)/") 
 SHL1IMP_ORD = $(foreach,i,$(_SHL1IMP_ORD) $(shell @-ls $i))
 .ELSE
 SHL1IMP_ORD = 
@@ -266,60 +262,54 @@ $(SHL1TARGETN) : \
                     $(SHL1DEPN) \
                     $(SHL1IMP_ORD) \
                     $(SHL1LINKLIST)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL1TARGETN)
 .IF "$(GUI)" == "WNT"
 .IF "$(SHL1DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    @@-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc
 .IF "$(SHL1ICON)" != ""
-    @echo 1 ICON $(SHL1ICON) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    @echo 1 ICON $(SHL1ICON) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL1ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc
 .ELSE			# "$(SHL1ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL1DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL1DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL1DEFAULTRES:b).rc
 .ENDIF			# "$(SHL1ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL1TARGET)$(DLLPOST) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc
 .ENDIF			# "$(SHL1DEFAULTRES)"!=""
 .IF "$(SHL1ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL1ALLRES:s/res /res+/) $(SHL1LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES)
 .IF "$(COM)"=="GCC"
     windres $(SHL1LINKRES) $(SHL1LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL1ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
     @echo dlltool --input-def $(SHL1DEF) \
         --dllname $(SHL1TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_1.cmd
+        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_1.cmd
 .IF "$(DEFLIB1NAME)"!=""	# do not have to include objs
-    @echo 	--output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
+    @echo 	--output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_1.cmd
 .ELSE			# "$(DEFLIB1NAME)"!=""	# do not have to include objs
-    @echo	--output-exp $(MISC)$/$(@:b)_exp.o \
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
         $(STDOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \
-        `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`  >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
+        `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g`  >> $(MISC)/$(TARGET).$(@:b)_1.cmd
 .ENDIF			# "$(DEFLIB1NAME)"!=""
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \
-        `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+        `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
         -Wl,--exclude-libs,ALL,--start-group $(SHL1STDLIBS) -Wl,--end-group \
-        $(SHL1STDSHL) $(STDSHL1) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
+        $(SHL1STDSHL) $(STDSHL1) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
+        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL1USE_EXPORTS)"!="name"
@@ -329,7 +319,7 @@ $(SHL1TARGETN) : \
         $(LINKFLAGSSHL) \
         $(SHL1STACK) $(SHL1BASEX)	\
         -out:$@ \
-        -map:$(MISC)$/$(@:b).map \
+        -map:$(MISC)/$(@:b).map \
         -def:$(SHL1DEF) \
         $(USE_1IMPLIB) \
         $(STDOBJ) \
@@ -343,7 +333,7 @@ $(SHL1TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -354,8 +344,8 @@ $(SHL1TARGETN) : \
     $(SHL1LINKER) @$(mktmp	$(SHL1LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL1BASEX)		\
         $(SHL1STACK) -out:$(SHL1TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
-        $(LB)$/$(SHL1IMPLIB).exp				\
+        -map:$(MISC)/$(@:B).map				\
+        $(LB)/$(SHL1IMPLIB).exp				\
         $(STDOBJ)							\
         $(SHL1OBJS) $(SHL1VERSIONOBJ) \
         $(SHL1LIBS)                         \
@@ -367,7 +357,7 @@ $(SHL1TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -379,7 +369,7 @@ $(SHL1TARGETN) : \
     $(SHL1LINKER) @$(mktmp	$(SHL1LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL1BASEX)		\
         $(SHL1STACK) -out:$(SHL1TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
+        -map:$(MISC)/$(@:B).map				\
         $(USE_1IMPLIB) \
         $(STDOBJ)							\
         $(SHL1OBJS) $(SHL1VERSIONOBJ))   \
@@ -390,7 +380,7 @@ $(SHL1TARGETN) : \
     )
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -399,25 +389,25 @@ $(SHL1TARGETN) : \
     $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
 .ENDIF			# "$(SHL1USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
-        -$(RM) del $(MISC)$/$(SHL1TARGET).lnk
-        -$(RM) $(MISC)$/$(SHL1TARGET).lst
+        -$(RM) del $(MISC)/$(SHL1TARGET).lnk
+        -$(RM) $(MISC)/$(SHL1TARGET).lst
         $(TYPE) $(mktmp \
         $(SHL1LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL1BASEX) \
         $(SHL1STACK) $(MAPFILE) \
         -out:$@ \
-        $(LB)$/$(SHL1IMPLIB).exp \
+        $(LB)/$(SHL1IMPLIB).exp \
         $(STDOBJ) \
         $(SHL1OBJS) \
         $(SHL1STDLIBS) \
         $(SHL1STDSHL) $(STDSHL1) \
         $(SHL1LINKRES) \
-        ) >> $(MISC)$/$(SHL1TARGET).lnk
-        $(TYPE) $(MISC)$/$(SHL1TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL1TARGET).lnk
-        $(SHL1LINKER) @$(MISC)$/$(SHL1TARGET).lnk
+        ) >> $(MISC)/$(SHL1TARGET).lnk
+        $(TYPE) $(MISC)/$(SHL1TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL1TARGET).lnk
+        $(SHL1LINKER) @$(MISC)/$(SHL1TARGET).lnk
         @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -429,82 +419,70 @@ $(SHL1TARGETN) : \
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
     @echo $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
     $(SHL1VERSIONOBJ) \
-    `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
-    $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_1.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL1RPATH) $@
-	@echo "Making:   " $(@:f).jnilib
+    @echo "Making: $@.jnilib"
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL1NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN)
 .ENDIF				# "$(SHL1NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
-    @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
-		$(SHL1VERSIONOBJ) -o $@ \
-		`cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-		$(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
-.ENDIF
-    @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
+    $(SHL1VERSIONOBJ) -o $@ \
+    `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL1NOCHECK)"==""
-	$(QUIET_BUILD) -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-	$(QUIET_BUILD) $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-.IF "$(QUIET_BUILD)"==""
-	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-.ELSE
-	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) -- -s $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-.ENDIF
+    -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
+    $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
 .ENDIF				# "$(SHL1NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
 .IF "$(UNIXVERSIONNAMES)"!=""
-	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL1TARGETN:b)
-	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b)
+    $(RM) $(LB)/$(SHL1TARGETN:b)
+    cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(QUIET_BUILD)"==""
     @ls -l $@
-.ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
 .IF "$(GUI)" == "OS2"
 
 .IF "$(SHL1DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)$/$(SHL1DEFAULTRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc >& $(NULLDEV)
 .IF "$(SHL1ICON)" != ""
-    @-+echo 1 ICON $(SHL1ICON) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    @-+echo 1 ICON $(SHL1ICON) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL1ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    @-+echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc
 .ENDIF			# "$(SHL1ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL1DEFAULTRES:b).rc
+#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc
 .ENDIF			# "$(SHL1DEFAULTRES)"!=""
 
 .IF "$(SHL1ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) $(SHL1ALLRES:s/res /res+/) $(SHL1LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL1ALLRES)"!=""
 
 .IF "$(USE_DEFFILE)"!=""
@@ -513,7 +491,7 @@ $(SHL1TARGETN) : \
         $(SHL1DEF) \
         $(STDOBJ) \
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL1OBJS) $(SHL1VERSIONOBJ) \
         $(SHL1LIBS) \
         $(SHL1STDLIBS:^"-l") \
@@ -528,7 +506,7 @@ $(SHL1TARGETN) : \
         $(SHL1DEF) \
         $(STDOBJ)							\
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL1OBJS) $(SHL1VERSIONOBJ) \
         $(SHL1LIBS) \
         $(SHL1STDLIBS:^"-l") \
@@ -552,7 +530,7 @@ $(SHL1TARGETN) : \
 ALLTAR : runtest_$(SHL1TARGET)
 
 runtest_$(SHL1TARGET) : $(SHL1TARGETN)
-    testshl $(SHL1TARGETN) sce$/$(SHL1TARGET).sce -msg -skip
+    testshl $(SHL1TARGETN) sce/$(SHL1TARGET).sce -msg -skip
 .ENDIF			# "$(NO_TESTS)"==""
 .ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL1TARGETN)"!=""
@@ -588,7 +566,7 @@ LINKFLAGSRUNPATH_$(SHL2RPATH)*=/ERROR:/Bad_SHL2RPATH_value
 SHL2LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL2RPATH))
 
 .IF "$(SHL2USE_EXPORTS)"==""
-SHL2DEF*=$(MISC)$/$(SHL2TARGET).def
+SHL2DEF*=$(MISC)/$(SHL2TARGET).def
 .ENDIF			# "$(SHL2USE_EXPORTS)"==""
 
 EXTRALIBPATHS2=$(EXTRALIBPATHS)
@@ -605,15 +583,15 @@ EXTRALIBPATHS2+=-L$(SOLAR_STLLIBPATH)
 
 .IF "$(VERSIONOBJ)"!=""
 SHL2VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)$/$(SHL2VERSIONOBJ:b).h
+USE_VERSIONH:=$(INCCOM)/$(SHL2VERSIONOBJ:b).h
 .IF "$(GUI)" == "UNX"
 SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
 .ELSE           # "$(GUI)" == "UNX"
 SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f)
 .ENDIF          # "$(GUI)" == "UNX"
-$(MISC)$/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL2VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)$/src$/version.c $@
-	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@
+$(MISC)/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ:b).h
+#    $(COPY) $(SOLARENV)/src/version.c $@
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@
 
 .INIT : $(SHL2VERSIONOBJDEP)
 .ENDIF			# "$(VERSIONOBJ)"!=""
@@ -624,13 +602,13 @@ $(MISC)$/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL2VE
 SHL2IMPLIB=i$(TARGET)_t2
 .ENDIF			# "$(SHL2IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
-USE_2IMPLIB=-implib:$(LB)$/$(SHL2IMPLIB).lib
+USE_2IMPLIB=-implib:$(LB)/$(SHL2IMPLIB).lib
 .ENDIF			# "$(COM)" != "GCC"
-SHL2IMPLIBN=$(LB)$/$(SHL2IMPLIB).lib
+SHL2IMPLIBN=$(LB)/$(SHL2IMPLIB).lib
 ALLTAR : $(SHL2IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
-USE_2IMPLIB_DEPS=$(LB)$/$(SHL2IMPLIB).lib
+USE_2IMPLIB_DEPS=$(LB)/$(SHL2IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 USE_SHL2DEF=$(SHL2DEF)
@@ -640,7 +618,7 @@ SHL2DEPN+:=$(SHL2DEPNU)
 
 .IF "$(SHL2VERSIONMAP)"==""
 # to activate vmaps remove "#"
-USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap
+USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap
 .ENDIF			# "$(SHL2VERSIONMAP)"==""
 
 .IF "$(USE_SHL2VERSIONMAP)"!=""
@@ -648,7 +626,7 @@ USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap
 .IF "$(SHL2FILTERFILE)"!=""
 .IF "$(SHL2VERSIONMAP)"!=""
 #eine von beiden ist zuviel
-USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap
+USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap
 $(USE_SHL2VERSIONMAP) .PHONY:
     @echo -----------------------------
     @echo you should only use versionmap OR exportfile
@@ -675,27 +653,23 @@ $(USE_SHL2VERSIONMAP): \
 .ENDIF
 .ENDIF			# "$(SHL2OBJS)!"=""
     @$(TYPE) /dev/null $(SHL2LIBS:s/.lib/.dump/) >> $@.dump
-	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL2INTERFACE) -f $(SHL2FILTERFILE) -m $@
+    $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL2INTERFACE) -f $(SHL2FILTERFILE) -m $@
 
 .ELSE			# "$(SHL2FILTERFILE)"!=""
-USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap
+USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap
 $(USE_SHL2VERSIONMAP) :
-.IF "$(QUIET_BUILD)"==""
     @echo -----------------------------
     @echo SHL2FILTERFILE not set!
     @echo -----------------------------
     @$(TOUCH) $@
     @echo dummy file to keep the dependencies for later use.
-.ELSE
-	@$(TOUCH) $@
-.ENDIF
 #	force_dmake_to_error
 .ENDIF			# "$(SHL2FILTERFILE)"!=""
 .ELSE			# "$(USE_SHL2VERSIONMAP)"!=""
 
 #and now for the plain non-generic way...
 .IF "$(SHL2VERSIONMAP)"!=""
-USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e)
+USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e)
 .IF "$(OS)"!="IRIX"
 SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
 .ENDIF
@@ -715,25 +689,25 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP)
 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
 # happens if somebody will change it in the future
 .IF "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .ELIF "$(COMNAME)"=="sunpro5"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL2VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
+    tr -d "\015" < $(SHL2VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
 .ELSE           # "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL2VERSIONMAP) > $@
+    tr -d "\015" < $(SHL2VERSIONMAP) > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod a+w $@
 # Mac OS X post-processing generate an exported symbols list from the generated map file
 # for details on exported symbols list see man ld on Mac OS X
 .IF "$(OS)"=="MACOSX"
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
 .IF "$(SHL2OBJS)"!=""
-    -echo $(foreach,i,$(SHL2OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -echo $(foreach,i,$(SHL2OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 .IF "$(SHL2LIBS)"!=""
-    -$(TYPE) $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -$(TYPE) $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
@@ -757,15 +731,15 @@ SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\"
 
 .IF "$(SHL2RES)"!=""
 SHL2ALLRES+=$(SHL2RES)
-SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res
-SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o
+SHL2LINKRES*=$(MISC)/$(SHL2TARGET).res
+SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o
 .ENDIF			# "$(SHL2RES)"!=""
 
 .IF "$(SHL2DEFAULTRES)$(use_shl_versions)"!=""
-SHL2DEFAULTRES*=$(MISC)$/$(SHL2TARGET)_def.res
+SHL2DEFAULTRES*=$(MISC)/$(SHL2TARGET)_def.res
 SHL2ALLRES+=$(SHL2DEFAULTRES)
-SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res
-SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o
+SHL2LINKRES*=$(MISC)/$(SHL2TARGET).res
+SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o
 .ENDIF			# "$(SHL2DEFAULTRES)$(use_shl_versions)"!=""
 
 #.IF "$(SHL2TARGETN)"!=""
@@ -773,13 +747,13 @@ SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(SHL2LIBS)"!=""
-$(MISC)$/$(SHL2TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(SHL2TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL2LIBS)"!=""
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(SHL2TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(SHL2TARGETN:b)_linkinc.ls
 $(SHL2TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
@@ -787,17 +761,17 @@ $(SHL2TARGETN) : $(LINKINCTARGETS)
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL2LIBS)"!=""
-SHL2LINKLIST=$(MISC)$/$(SHL2TARGET)_link.lst
+SHL2LINKLIST=$(MISC)/$(SHL2TARGET)_link.lst
 SHL2LINKLISTPARAM=@$(SHL2LINKLIST)
 $(SHL2LINKLIST) : $(SHL2LIBS)
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL2LIBS)"!=""
 .ENDIF          # "$(COM)"!="GCC"
 .ENDIF
 .ENDIF			# "$(SHL2USE_EXPORTS)"=="name"
 
-$(MISC)$/%linkinc.ls:
+$(MISC)/%linkinc.ls:
     echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
@@ -808,7 +782,7 @@ SHL2TARGET8=$(shell @fix_shl $(SHL2TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
-_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL2STDLIBS:^"$(LB)$/") 
+_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL2STDLIBS:^"$(LB)/") 
 SHL2IMP_ORD = $(foreach,i,$(_SHL2IMP_ORD) $(shell @-ls $i))
 .ELSE
 SHL2IMP_ORD = 
@@ -825,60 +799,54 @@ $(SHL2TARGETN) : \
                     $(SHL2DEPN) \
                     $(SHL2IMP_ORD) \
                     $(SHL2LINKLIST)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL2TARGETN)
 .IF "$(GUI)" == "WNT"
 .IF "$(SHL2DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    @@-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc
 .IF "$(SHL2ICON)" != ""
-    @echo 1 ICON $(SHL2ICON) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    @echo 1 ICON $(SHL2ICON) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL2ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc
 .ELSE			# "$(SHL2ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL2DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL2DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL2DEFAULTRES:b).rc
 .ENDIF			# "$(SHL2ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL2TARGET)$(DLLPOST) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc
 .ENDIF			# "$(SHL2DEFAULTRES)"!=""
 .IF "$(SHL2ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL2ALLRES:s/res /res+/) $(SHL2LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
 .IF "$(COM)"=="GCC"
     windres $(SHL2LINKRES) $(SHL2LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL2ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
     @echo dlltool --input-def $(SHL2DEF) \
         --dllname $(SHL2TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_2.cmd
+        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_2.cmd
 .IF "$(DEFLIB2NAME)"!=""	# do not have to include objs
-    @echo 	--output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
+    @echo 	--output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_2.cmd
 .ELSE			# "$(DEFLIB2NAME)"!=""	# do not have to include objs
-    @echo	--output-exp $(MISC)$/$(@:b)_exp.o \
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
         $(STDOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \
-        `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`  >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
+        `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g`  >> $(MISC)/$(TARGET).$(@:b)_2.cmd
 .ENDIF			# "$(DEFLIB2NAME)"!=""
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \
-        `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+        `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
         -Wl,--exclude-libs,ALL,--start-group $(SHL2STDLIBS) -Wl,--end-group \
-        $(SHL2STDSHL) $(STDSHL2) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
+        $(SHL2STDSHL) $(STDSHL2) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
+        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL2USE_EXPORTS)"!="name"
@@ -888,7 +856,7 @@ $(SHL2TARGETN) : \
         $(LINKFLAGSSHL) \
         $(SHL2STACK) $(SHL2BASEX)	\
         -out:$@ \
-        -map:$(MISC)$/$(@:b).map \
+        -map:$(MISC)/$(@:b).map \
         -def:$(SHL2DEF) \
         $(USE_2IMPLIB) \
         $(STDOBJ) \
@@ -902,7 +870,7 @@ $(SHL2TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -913,8 +881,8 @@ $(SHL2TARGETN) : \
     $(SHL2LINKER) @$(mktmp	$(SHL2LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL2BASEX)		\
         $(SHL2STACK) -out:$(SHL2TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
-        $(LB)$/$(SHL2IMPLIB).exp				\
+        -map:$(MISC)/$(@:B).map				\
+        $(LB)/$(SHL2IMPLIB).exp				\
         $(STDOBJ)							\
         $(SHL2OBJS) $(SHL2VERSIONOBJ) \
         $(SHL2LIBS)                         \
@@ -926,7 +894,7 @@ $(SHL2TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -938,7 +906,7 @@ $(SHL2TARGETN) : \
     $(SHL2LINKER) @$(mktmp	$(SHL2LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL2BASEX)		\
         $(SHL2STACK) -out:$(SHL2TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
+        -map:$(MISC)/$(@:B).map				\
         $(USE_2IMPLIB) \
         $(STDOBJ)							\
         $(SHL2OBJS) $(SHL2VERSIONOBJ))   \
@@ -949,7 +917,7 @@ $(SHL2TARGETN) : \
     )
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -958,25 +926,25 @@ $(SHL2TARGETN) : \
     $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
 .ENDIF			# "$(SHL2USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
-        -$(RM) del $(MISC)$/$(SHL2TARGET).lnk
-        -$(RM) $(MISC)$/$(SHL2TARGET).lst
+        -$(RM) del $(MISC)/$(SHL2TARGET).lnk
+        -$(RM) $(MISC)/$(SHL2TARGET).lst
         $(TYPE) $(mktmp \
         $(SHL2LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL2BASEX) \
         $(SHL2STACK) $(MAPFILE) \
         -out:$@ \
-        $(LB)$/$(SHL2IMPLIB).exp \
+        $(LB)/$(SHL2IMPLIB).exp \
         $(STDOBJ) \
         $(SHL2OBJS) \
         $(SHL2STDLIBS) \
         $(SHL2STDSHL) $(STDSHL2) \
         $(SHL2LINKRES) \
-        ) >> $(MISC)$/$(SHL2TARGET).lnk
-        $(TYPE) $(MISC)$/$(SHL2TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL2TARGET).lnk
-        $(SHL2LINKER) @$(MISC)$/$(SHL2TARGET).lnk
+        ) >> $(MISC)/$(SHL2TARGET).lnk
+        $(TYPE) $(MISC)/$(SHL2TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL2TARGET).lnk
+        $(SHL2LINKER) @$(MISC)/$(SHL2TARGET).lnk
         @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -988,82 +956,70 @@ $(SHL2TARGETN) : \
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
     @echo $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
     $(SHL2VERSIONOBJ) \
-    `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
-    $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_2.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL2RPATH) $@
-	@echo "Making:   " $(@:f).jnilib
+    @echo "Making: $@.jnilib"
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL2NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN)
 .ENDIF				# "$(SHL2NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
-    @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
-		$(SHL2VERSIONOBJ) -o $@ \
-		`cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-		$(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
-.ENDIF
-    @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
+    $(SHL2VERSIONOBJ) -o $@ \
+    `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL2NOCHECK)"==""
-	$(QUIET_BUILD) -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-	$(QUIET_BUILD) $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-.IF "$(QUIET_BUILD)"==""
-	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-.ELSE
-	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) -- -s $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-.ENDIF
+    -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
+    $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
 .ENDIF				# "$(SHL2NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
 .IF "$(UNIXVERSIONNAMES)"!=""
-	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL2TARGETN:b)
-	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b)
+    $(RM) $(LB)/$(SHL2TARGETN:b)
+    cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(QUIET_BUILD)"==""
     @ls -l $@
-.ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
 .IF "$(GUI)" == "OS2"
 
 .IF "$(SHL2DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)$/$(SHL2DEFAULTRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc >& $(NULLDEV)
 .IF "$(SHL2ICON)" != ""
-    @-+echo 1 ICON $(SHL2ICON) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    @-+echo 1 ICON $(SHL2ICON) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL2ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    @-+echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc
 .ENDIF			# "$(SHL2ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL2DEFAULTRES:b).rc
+#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc
 .ENDIF			# "$(SHL2DEFAULTRES)"!=""
 
 .IF "$(SHL2ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) $(SHL2ALLRES:s/res /res+/) $(SHL2LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL2ALLRES)"!=""
 
 .IF "$(USE_DEFFILE)"!=""
@@ -1072,7 +1028,7 @@ $(SHL2TARGETN) : \
         $(SHL2DEF) \
         $(STDOBJ) \
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL2OBJS) $(SHL2VERSIONOBJ) \
         $(SHL2LIBS) \
         $(SHL2STDLIBS:^"-l") \
@@ -1087,7 +1043,7 @@ $(SHL2TARGETN) : \
         $(SHL2DEF) \
         $(STDOBJ)							\
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL2OBJS) $(SHL2VERSIONOBJ) \
         $(SHL2LIBS) \
         $(SHL2STDLIBS:^"-l") \
@@ -1111,7 +1067,7 @@ $(SHL2TARGETN) : \
 ALLTAR : runtest_$(SHL2TARGET)
 
 runtest_$(SHL2TARGET) : $(SHL2TARGETN)
-    testshl $(SHL2TARGETN) sce$/$(SHL2TARGET).sce -msg -skip
+    testshl $(SHL2TARGETN) sce/$(SHL2TARGET).sce -msg -skip
 .ENDIF			# "$(NO_TESTS)"==""
 .ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL2TARGETN)"!=""
@@ -1147,7 +1103,7 @@ LINKFLAGSRUNPATH_$(SHL3RPATH)*=/ERROR:/Bad_SHL3RPATH_value
 SHL3LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL3RPATH))
 
 .IF "$(SHL3USE_EXPORTS)"==""
-SHL3DEF*=$(MISC)$/$(SHL3TARGET).def
+SHL3DEF*=$(MISC)/$(SHL3TARGET).def
 .ENDIF			# "$(SHL3USE_EXPORTS)"==""
 
 EXTRALIBPATHS3=$(EXTRALIBPATHS)
@@ -1164,15 +1120,15 @@ EXTRALIBPATHS3+=-L$(SOLAR_STLLIBPATH)
 
 .IF "$(VERSIONOBJ)"!=""
 SHL3VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)$/$(SHL3VERSIONOBJ:b).h
+USE_VERSIONH:=$(INCCOM)/$(SHL3VERSIONOBJ:b).h
 .IF "$(GUI)" == "UNX"
 SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
 .ELSE           # "$(GUI)" == "UNX"
 SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f)
 .ENDIF          # "$(GUI)" == "UNX"
-$(MISC)$/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL3VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)$/src$/version.c $@
-	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@
+$(MISC)/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL3VERSIONOBJ:b).h
+#    $(COPY) $(SOLARENV)/src/version.c $@
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@
 
 .INIT : $(SHL3VERSIONOBJDEP)
 .ENDIF			# "$(VERSIONOBJ)"!=""
@@ -1183,13 +1139,13 @@ $(MISC)$/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL3VE
 SHL3IMPLIB=i$(TARGET)_t3
 .ENDIF			# "$(SHL3IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
-USE_3IMPLIB=-implib:$(LB)$/$(SHL3IMPLIB).lib
+USE_3IMPLIB=-implib:$(LB)/$(SHL3IMPLIB).lib
 .ENDIF			# "$(COM)" != "GCC"
-SHL3IMPLIBN=$(LB)$/$(SHL3IMPLIB).lib
+SHL3IMPLIBN=$(LB)/$(SHL3IMPLIB).lib
 ALLTAR : $(SHL3IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
-USE_3IMPLIB_DEPS=$(LB)$/$(SHL3IMPLIB).lib
+USE_3IMPLIB_DEPS=$(LB)/$(SHL3IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 USE_SHL3DEF=$(SHL3DEF)
@@ -1199,7 +1155,7 @@ SHL3DEPN+:=$(SHL3DEPNU)
 
 .IF "$(SHL3VERSIONMAP)"==""
 # to activate vmaps remove "#"
-USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap
+USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap
 .ENDIF			# "$(SHL3VERSIONMAP)"==""
 
 .IF "$(USE_SHL3VERSIONMAP)"!=""
@@ -1207,7 +1163,7 @@ USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap
 .IF "$(SHL3FILTERFILE)"!=""
 .IF "$(SHL3VERSIONMAP)"!=""
 #eine von beiden ist zuviel
-USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap
+USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap
 $(USE_SHL3VERSIONMAP) .PHONY:
     @echo -----------------------------
     @echo you should only use versionmap OR exportfile
@@ -1234,27 +1190,23 @@ $(USE_SHL3VERSIONMAP): \
 .ENDIF
 .ENDIF			# "$(SHL3OBJS)!"=""
     @$(TYPE) /dev/null $(SHL3LIBS:s/.lib/.dump/) >> $@.dump
-	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL3INTERFACE) -f $(SHL3FILTERFILE) -m $@
+    $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL3INTERFACE) -f $(SHL3FILTERFILE) -m $@
 
 .ELSE			# "$(SHL3FILTERFILE)"!=""
-USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap
+USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap
 $(USE_SHL3VERSIONMAP) :
-.IF "$(QUIET_BUILD)"==""
     @echo -----------------------------
     @echo SHL3FILTERFILE not set!
     @echo -----------------------------
     @$(TOUCH) $@
     @echo dummy file to keep the dependencies for later use.
-.ELSE
-	@$(TOUCH) $@
-.ENDIF
 #	force_dmake_to_error
 .ENDIF			# "$(SHL3FILTERFILE)"!=""
 .ELSE			# "$(USE_SHL3VERSIONMAP)"!=""
 
 #and now for the plain non-generic way...
 .IF "$(SHL3VERSIONMAP)"!=""
-USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e)
+USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e)
 .IF "$(OS)"!="IRIX"
 SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
 .ENDIF
@@ -1274,25 +1226,25 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP)
 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
 # happens if somebody will change it in the future
 .IF "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .ELIF "$(COMNAME)"=="sunpro5"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL3VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
+    tr -d "\015" < $(SHL3VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
 .ELSE           # "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL3VERSIONMAP) > $@
+    tr -d "\015" < $(SHL3VERSIONMAP) > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod a+w $@
 # Mac OS X post-processing generate an exported symbols list from the generated map file
 # for details on exported symbols list see man ld on Mac OS X
 .IF "$(OS)"=="MACOSX"
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
 .IF "$(SHL3OBJS)"!=""
-    -echo $(foreach,i,$(SHL3OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -echo $(foreach,i,$(SHL3OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 .IF "$(SHL3LIBS)"!=""
-    -$(TYPE) $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -$(TYPE) $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
@@ -1316,15 +1268,15 @@ SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\"
 
 .IF "$(SHL3RES)"!=""
 SHL3ALLRES+=$(SHL3RES)
-SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res
-SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o
+SHL3LINKRES*=$(MISC)/$(SHL3TARGET).res
+SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o
 .ENDIF			# "$(SHL3RES)"!=""
 
 .IF "$(SHL3DEFAULTRES)$(use_shl_versions)"!=""
-SHL3DEFAULTRES*=$(MISC)$/$(SHL3TARGET)_def.res
+SHL3DEFAULTRES*=$(MISC)/$(SHL3TARGET)_def.res
 SHL3ALLRES+=$(SHL3DEFAULTRES)
-SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res
-SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o
+SHL3LINKRES*=$(MISC)/$(SHL3TARGET).res
+SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o
 .ENDIF			# "$(SHL3DEFAULTRES)$(use_shl_versions)"!=""
 
 #.IF "$(SHL3TARGETN)"!=""
@@ -1332,13 +1284,13 @@ SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(SHL3LIBS)"!=""
-$(MISC)$/$(SHL3TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(SHL3TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL3LIBS)"!=""
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(SHL3TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(SHL3TARGETN:b)_linkinc.ls
 $(SHL3TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
@@ -1346,17 +1298,17 @@ $(SHL3TARGETN) : $(LINKINCTARGETS)
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL3LIBS)"!=""
-SHL3LINKLIST=$(MISC)$/$(SHL3TARGET)_link.lst
+SHL3LINKLIST=$(MISC)/$(SHL3TARGET)_link.lst
 SHL3LINKLISTPARAM=@$(SHL3LINKLIST)
 $(SHL3LINKLIST) : $(SHL3LIBS)
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL3LIBS)"!=""
 .ENDIF          # "$(COM)"!="GCC"
 .ENDIF
 .ENDIF			# "$(SHL3USE_EXPORTS)"=="name"
 
-$(MISC)$/%linkinc.ls:
+$(MISC)/%linkinc.ls:
     echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
@@ -1367,7 +1319,7 @@ SHL3TARGET8=$(shell @fix_shl $(SHL3TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
-_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL3STDLIBS:^"$(LB)$/") 
+_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL3STDLIBS:^"$(LB)/") 
 SHL3IMP_ORD = $(foreach,i,$(_SHL3IMP_ORD) $(shell @-ls $i))
 .ELSE
 SHL3IMP_ORD = 
@@ -1384,60 +1336,54 @@ $(SHL3TARGETN) : \
                     $(SHL3DEPN) \
                     $(SHL3IMP_ORD) \
                     $(SHL3LINKLIST)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL3TARGETN)
 .IF "$(GUI)" == "WNT"
 .IF "$(SHL3DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    @@-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc
 .IF "$(SHL3ICON)" != ""
-    @echo 1 ICON $(SHL3ICON) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    @echo 1 ICON $(SHL3ICON) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL3ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc
 .ELSE			# "$(SHL3ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL3DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL3DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL3DEFAULTRES:b).rc
 .ENDIF			# "$(SHL3ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL3TARGET)$(DLLPOST) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc
 .ENDIF			# "$(SHL3DEFAULTRES)"!=""
 .IF "$(SHL3ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL3ALLRES:s/res /res+/) $(SHL3LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
 .IF "$(COM)"=="GCC"
     windres $(SHL3LINKRES) $(SHL3LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL3ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
     @echo dlltool --input-def $(SHL3DEF) \
         --dllname $(SHL3TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_3.cmd
+        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_3.cmd
 .IF "$(DEFLIB3NAME)"!=""	# do not have to include objs
-    @echo 	--output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
+    @echo 	--output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_3.cmd
 .ELSE			# "$(DEFLIB3NAME)"!=""	# do not have to include objs
-    @echo	--output-exp $(MISC)$/$(@:b)_exp.o \
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
         $(STDOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \
-        `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`  >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
+        `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g`  >> $(MISC)/$(TARGET).$(@:b)_3.cmd
 .ENDIF			# "$(DEFLIB3NAME)"!=""
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \
-        `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+        `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
         -Wl,--exclude-libs,ALL,--start-group $(SHL3STDLIBS) -Wl,--end-group \
-        $(SHL3STDSHL) $(STDSHL3) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
+        $(SHL3STDSHL) $(STDSHL3) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
+        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL3USE_EXPORTS)"!="name"
@@ -1447,7 +1393,7 @@ $(SHL3TARGETN) : \
         $(LINKFLAGSSHL) \
         $(SHL3STACK) $(SHL3BASEX)	\
         -out:$@ \
-        -map:$(MISC)$/$(@:b).map \
+        -map:$(MISC)/$(@:b).map \
         -def:$(SHL3DEF) \
         $(USE_3IMPLIB) \
         $(STDOBJ) \
@@ -1461,7 +1407,7 @@ $(SHL3TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -1472,8 +1418,8 @@ $(SHL3TARGETN) : \
     $(SHL3LINKER) @$(mktmp	$(SHL3LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL3BASEX)		\
         $(SHL3STACK) -out:$(SHL3TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
-        $(LB)$/$(SHL3IMPLIB).exp				\
+        -map:$(MISC)/$(@:B).map				\
+        $(LB)/$(SHL3IMPLIB).exp				\
         $(STDOBJ)							\
         $(SHL3OBJS) $(SHL3VERSIONOBJ) \
         $(SHL3LIBS)                         \
@@ -1485,7 +1431,7 @@ $(SHL3TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -1497,7 +1443,7 @@ $(SHL3TARGETN) : \
     $(SHL3LINKER) @$(mktmp	$(SHL3LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL3BASEX)		\
         $(SHL3STACK) -out:$(SHL3TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
+        -map:$(MISC)/$(@:B).map				\
         $(USE_3IMPLIB) \
         $(STDOBJ)							\
         $(SHL3OBJS) $(SHL3VERSIONOBJ))   \
@@ -1508,7 +1454,7 @@ $(SHL3TARGETN) : \
     )
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -1517,25 +1463,25 @@ $(SHL3TARGETN) : \
     $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
 .ENDIF			# "$(SHL3USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
-        -$(RM) del $(MISC)$/$(SHL3TARGET).lnk
-        -$(RM) $(MISC)$/$(SHL3TARGET).lst
+        -$(RM) del $(MISC)/$(SHL3TARGET).lnk
+        -$(RM) $(MISC)/$(SHL3TARGET).lst
         $(TYPE) $(mktmp \
         $(SHL3LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL3BASEX) \
         $(SHL3STACK) $(MAPFILE) \
         -out:$@ \
-        $(LB)$/$(SHL3IMPLIB).exp \
+        $(LB)/$(SHL3IMPLIB).exp \
         $(STDOBJ) \
         $(SHL3OBJS) \
         $(SHL3STDLIBS) \
         $(SHL3STDSHL) $(STDSHL3) \
         $(SHL3LINKRES) \
-        ) >> $(MISC)$/$(SHL3TARGET).lnk
-        $(TYPE) $(MISC)$/$(SHL3TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL3TARGET).lnk
-        $(SHL3LINKER) @$(MISC)$/$(SHL3TARGET).lnk
+        ) >> $(MISC)/$(SHL3TARGET).lnk
+        $(TYPE) $(MISC)/$(SHL3TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL3TARGET).lnk
+        $(SHL3LINKER) @$(MISC)/$(SHL3TARGET).lnk
         @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -1547,82 +1493,70 @@ $(SHL3TARGETN) : \
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
     @echo $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
     $(SHL3VERSIONOBJ) \
-    `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
-    $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_3.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL3RPATH) $@
-	@echo "Making:   " $(@:f).jnilib
+    @echo "Making: $@.jnilib"
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL3NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN)
 .ENDIF				# "$(SHL3NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
-    @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
-		$(SHL3VERSIONOBJ) -o $@ \
-		`cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-		$(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
-.ENDIF
-    @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
+    $(SHL3VERSIONOBJ) -o $@ \
+    `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL3NOCHECK)"==""
-	$(QUIET_BUILD) -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-	$(QUIET_BUILD) $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-.IF "$(QUIET_BUILD)"==""
-	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-.ELSE
-	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) -- -s $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-.ENDIF
+    -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
+    $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
 .ENDIF				# "$(SHL3NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
 .IF "$(UNIXVERSIONNAMES)"!=""
-	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL3TARGETN:b)
-	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b)
+    $(RM) $(LB)/$(SHL3TARGETN:b)
+    cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(QUIET_BUILD)"==""
     @ls -l $@
-.ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
 .IF "$(GUI)" == "OS2"
 
 .IF "$(SHL3DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)$/$(SHL3DEFAULTRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc >& $(NULLDEV)
 .IF "$(SHL3ICON)" != ""
-    @-+echo 1 ICON $(SHL3ICON) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    @-+echo 1 ICON $(SHL3ICON) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL3ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    @-+echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc
 .ENDIF			# "$(SHL3ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL3DEFAULTRES:b).rc
+#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc
 .ENDIF			# "$(SHL3DEFAULTRES)"!=""
 
 .IF "$(SHL3ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) $(SHL3ALLRES:s/res /res+/) $(SHL3LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL3ALLRES)"!=""
 
 .IF "$(USE_DEFFILE)"!=""
@@ -1631,7 +1565,7 @@ $(SHL3TARGETN) : \
         $(SHL3DEF) \
         $(STDOBJ) \
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL3OBJS) $(SHL3VERSIONOBJ) \
         $(SHL3LIBS) \
         $(SHL3STDLIBS:^"-l") \
@@ -1646,7 +1580,7 @@ $(SHL3TARGETN) : \
         $(SHL3DEF) \
         $(STDOBJ)							\
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL3OBJS) $(SHL3VERSIONOBJ) \
         $(SHL3LIBS) \
         $(SHL3STDLIBS:^"-l") \
@@ -1670,7 +1604,7 @@ $(SHL3TARGETN) : \
 ALLTAR : runtest_$(SHL3TARGET)
 
 runtest_$(SHL3TARGET) : $(SHL3TARGETN)
-    testshl $(SHL3TARGETN) sce$/$(SHL3TARGET).sce -msg -skip
+    testshl $(SHL3TARGETN) sce/$(SHL3TARGET).sce -msg -skip
 .ENDIF			# "$(NO_TESTS)"==""
 .ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL3TARGETN)"!=""
@@ -1706,7 +1640,7 @@ LINKFLAGSRUNPATH_$(SHL4RPATH)*=/ERROR:/Bad_SHL4RPATH_value
 SHL4LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL4RPATH))
 
 .IF "$(SHL4USE_EXPORTS)"==""
-SHL4DEF*=$(MISC)$/$(SHL4TARGET).def
+SHL4DEF*=$(MISC)/$(SHL4TARGET).def
 .ENDIF			# "$(SHL4USE_EXPORTS)"==""
 
 EXTRALIBPATHS4=$(EXTRALIBPATHS)
@@ -1723,15 +1657,15 @@ EXTRALIBPATHS4+=-L$(SOLAR_STLLIBPATH)
 
 .IF "$(VERSIONOBJ)"!=""
 SHL4VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)$/$(SHL4VERSIONOBJ:b).h
+USE_VERSIONH:=$(INCCOM)/$(SHL4VERSIONOBJ:b).h
 .IF "$(GUI)" == "UNX"
 SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
 .ELSE           # "$(GUI)" == "UNX"
 SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f)
 .ENDIF          # "$(GUI)" == "UNX"
-$(MISC)$/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL4VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)$/src$/version.c $@
-	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@
+$(MISC)/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL4VERSIONOBJ:b).h
+#    $(COPY) $(SOLARENV)/src/version.c $@
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@
 
 .INIT : $(SHL4VERSIONOBJDEP)
 .ENDIF			# "$(VERSIONOBJ)"!=""
@@ -1742,13 +1676,13 @@ $(MISC)$/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL4VE
 SHL4IMPLIB=i$(TARGET)_t4
 .ENDIF			# "$(SHL4IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
-USE_4IMPLIB=-implib:$(LB)$/$(SHL4IMPLIB).lib
+USE_4IMPLIB=-implib:$(LB)/$(SHL4IMPLIB).lib
 .ENDIF			# "$(COM)" != "GCC"
-SHL4IMPLIBN=$(LB)$/$(SHL4IMPLIB).lib
+SHL4IMPLIBN=$(LB)/$(SHL4IMPLIB).lib
 ALLTAR : $(SHL4IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
-USE_4IMPLIB_DEPS=$(LB)$/$(SHL4IMPLIB).lib
+USE_4IMPLIB_DEPS=$(LB)/$(SHL4IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 USE_SHL4DEF=$(SHL4DEF)
@@ -1758,7 +1692,7 @@ SHL4DEPN+:=$(SHL4DEPNU)
 
 .IF "$(SHL4VERSIONMAP)"==""
 # to activate vmaps remove "#"
-USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap
+USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap
 .ENDIF			# "$(SHL4VERSIONMAP)"==""
 
 .IF "$(USE_SHL4VERSIONMAP)"!=""
@@ -1766,7 +1700,7 @@ USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap
 .IF "$(SHL4FILTERFILE)"!=""
 .IF "$(SHL4VERSIONMAP)"!=""
 #eine von beiden ist zuviel
-USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap
+USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap
 $(USE_SHL4VERSIONMAP) .PHONY:
     @echo -----------------------------
     @echo you should only use versionmap OR exportfile
@@ -1793,27 +1727,23 @@ $(USE_SHL4VERSIONMAP): \
 .ENDIF
 .ENDIF			# "$(SHL4OBJS)!"=""
     @$(TYPE) /dev/null $(SHL4LIBS:s/.lib/.dump/) >> $@.dump
-	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL4INTERFACE) -f $(SHL4FILTERFILE) -m $@
+    $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL4INTERFACE) -f $(SHL4FILTERFILE) -m $@
 
 .ELSE			# "$(SHL4FILTERFILE)"!=""
-USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap
+USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap
 $(USE_SHL4VERSIONMAP) :
-.IF "$(QUIET_BUILD)"==""
     @echo -----------------------------
     @echo SHL4FILTERFILE not set!
     @echo -----------------------------
     @$(TOUCH) $@
     @echo dummy file to keep the dependencies for later use.
-.ELSE
-	@$(TOUCH) $@
-.ENDIF
 #	force_dmake_to_error
 .ENDIF			# "$(SHL4FILTERFILE)"!=""
 .ELSE			# "$(USE_SHL4VERSIONMAP)"!=""
 
 #and now for the plain non-generic way...
 .IF "$(SHL4VERSIONMAP)"!=""
-USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e)
+USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e)
 .IF "$(OS)"!="IRIX"
 SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
 .ENDIF
@@ -1833,25 +1763,25 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP)
 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
 # happens if somebody will change it in the future
 .IF "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .ELIF "$(COMNAME)"=="sunpro5"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL4VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
+    tr -d "\015" < $(SHL4VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
 .ELSE           # "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL4VERSIONMAP) > $@
+    tr -d "\015" < $(SHL4VERSIONMAP) > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod a+w $@
 # Mac OS X post-processing generate an exported symbols list from the generated map file
 # for details on exported symbols list see man ld on Mac OS X
 .IF "$(OS)"=="MACOSX"
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
 .IF "$(SHL4OBJS)"!=""
-    -echo $(foreach,i,$(SHL4OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -echo $(foreach,i,$(SHL4OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 .IF "$(SHL4LIBS)"!=""
-    -$(TYPE) $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -$(TYPE) $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
@@ -1875,15 +1805,15 @@ SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\"
 
 .IF "$(SHL4RES)"!=""
 SHL4ALLRES+=$(SHL4RES)
-SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res
-SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o
+SHL4LINKRES*=$(MISC)/$(SHL4TARGET).res
+SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o
 .ENDIF			# "$(SHL4RES)"!=""
 
 .IF "$(SHL4DEFAULTRES)$(use_shl_versions)"!=""
-SHL4DEFAULTRES*=$(MISC)$/$(SHL4TARGET)_def.res
+SHL4DEFAULTRES*=$(MISC)/$(SHL4TARGET)_def.res
 SHL4ALLRES+=$(SHL4DEFAULTRES)
-SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res
-SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o
+SHL4LINKRES*=$(MISC)/$(SHL4TARGET).res
+SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o
 .ENDIF			# "$(SHL4DEFAULTRES)$(use_shl_versions)"!=""
 
 #.IF "$(SHL4TARGETN)"!=""
@@ -1891,13 +1821,13 @@ SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(SHL4LIBS)"!=""
-$(MISC)$/$(SHL4TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(SHL4TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL4LIBS)"!=""
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(SHL4TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(SHL4TARGETN:b)_linkinc.ls
 $(SHL4TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
@@ -1905,17 +1835,17 @@ $(SHL4TARGETN) : $(LINKINCTARGETS)
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL4LIBS)"!=""
-SHL4LINKLIST=$(MISC)$/$(SHL4TARGET)_link.lst
+SHL4LINKLIST=$(MISC)/$(SHL4TARGET)_link.lst
 SHL4LINKLISTPARAM=@$(SHL4LINKLIST)
 $(SHL4LINKLIST) : $(SHL4LIBS)
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL4LIBS)"!=""
 .ENDIF          # "$(COM)"!="GCC"
 .ENDIF
 .ENDIF			# "$(SHL4USE_EXPORTS)"=="name"
 
-$(MISC)$/%linkinc.ls:
+$(MISC)/%linkinc.ls:
     echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
@@ -1926,7 +1856,7 @@ SHL4TARGET8=$(shell @fix_shl $(SHL4TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
-_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL4STDLIBS:^"$(LB)$/") 
+_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL4STDLIBS:^"$(LB)/") 
 SHL4IMP_ORD = $(foreach,i,$(_SHL4IMP_ORD) $(shell @-ls $i))
 .ELSE
 SHL4IMP_ORD = 
@@ -1943,60 +1873,54 @@ $(SHL4TARGETN) : \
                     $(SHL4DEPN) \
                     $(SHL4IMP_ORD) \
                     $(SHL4LINKLIST)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL4TARGETN)
 .IF "$(GUI)" == "WNT"
 .IF "$(SHL4DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    @@-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc
 .IF "$(SHL4ICON)" != ""
-    @echo 1 ICON $(SHL4ICON) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    @echo 1 ICON $(SHL4ICON) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL4ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc
 .ELSE			# "$(SHL4ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL4DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL4DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL4DEFAULTRES:b).rc
 .ENDIF			# "$(SHL4ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL4TARGET)$(DLLPOST) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc
 .ENDIF			# "$(SHL4DEFAULTRES)"!=""
 .IF "$(SHL4ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL4ALLRES:s/res /res+/) $(SHL4LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
 .IF "$(COM)"=="GCC"
     windres $(SHL4LINKRES) $(SHL4LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL4ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
     @echo dlltool --input-def $(SHL4DEF) \
         --dllname $(SHL4TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_4.cmd
+        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_4.cmd
 .IF "$(DEFLIB4NAME)"!=""	# do not have to include objs
-    @echo 	--output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
+    @echo 	--output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_4.cmd
 .ELSE			# "$(DEFLIB4NAME)"!=""	# do not have to include objs
-    @echo	--output-exp $(MISC)$/$(@:b)_exp.o \
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
         $(STDOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \
-        `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`  >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
+        `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g`  >> $(MISC)/$(TARGET).$(@:b)_4.cmd
 .ENDIF			# "$(DEFLIB4NAME)"!=""
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \
-        `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+        `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
         -Wl,--exclude-libs,ALL,--start-group $(SHL4STDLIBS) -Wl,--end-group \
-        $(SHL4STDSHL) $(STDSHL4) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
+        $(SHL4STDSHL) $(STDSHL4) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
+        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL4USE_EXPORTS)"!="name"
@@ -2006,7 +1930,7 @@ $(SHL4TARGETN) : \
         $(LINKFLAGSSHL) \
         $(SHL4STACK) $(SHL4BASEX)	\
         -out:$@ \
-        -map:$(MISC)$/$(@:b).map \
+        -map:$(MISC)/$(@:b).map \
         -def:$(SHL4DEF) \
         $(USE_4IMPLIB) \
         $(STDOBJ) \
@@ -2020,7 +1944,7 @@ $(SHL4TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -2031,8 +1955,8 @@ $(SHL4TARGETN) : \
     $(SHL4LINKER) @$(mktmp	$(SHL4LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL4BASEX)		\
         $(SHL4STACK) -out:$(SHL4TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
-        $(LB)$/$(SHL4IMPLIB).exp				\
+        -map:$(MISC)/$(@:B).map				\
+        $(LB)/$(SHL4IMPLIB).exp				\
         $(STDOBJ)							\
         $(SHL4OBJS) $(SHL4VERSIONOBJ) \
         $(SHL4LIBS)                         \
@@ -2044,7 +1968,7 @@ $(SHL4TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -2056,7 +1980,7 @@ $(SHL4TARGETN) : \
     $(SHL4LINKER) @$(mktmp	$(SHL4LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL4BASEX)		\
         $(SHL4STACK) -out:$(SHL4TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
+        -map:$(MISC)/$(@:B).map				\
         $(USE_4IMPLIB) \
         $(STDOBJ)							\
         $(SHL4OBJS) $(SHL4VERSIONOBJ))   \
@@ -2067,7 +1991,7 @@ $(SHL4TARGETN) : \
     )
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -2076,25 +2000,25 @@ $(SHL4TARGETN) : \
     $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
 .ENDIF			# "$(SHL4USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
-        -$(RM) del $(MISC)$/$(SHL4TARGET).lnk
-        -$(RM) $(MISC)$/$(SHL4TARGET).lst
+        -$(RM) del $(MISC)/$(SHL4TARGET).lnk
+        -$(RM) $(MISC)/$(SHL4TARGET).lst
         $(TYPE) $(mktmp \
         $(SHL4LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL4BASEX) \
         $(SHL4STACK) $(MAPFILE) \
         -out:$@ \
-        $(LB)$/$(SHL4IMPLIB).exp \
+        $(LB)/$(SHL4IMPLIB).exp \
         $(STDOBJ) \
         $(SHL4OBJS) \
         $(SHL4STDLIBS) \
         $(SHL4STDSHL) $(STDSHL4) \
         $(SHL4LINKRES) \
-        ) >> $(MISC)$/$(SHL4TARGET).lnk
-        $(TYPE) $(MISC)$/$(SHL4TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL4TARGET).lnk
-        $(SHL4LINKER) @$(MISC)$/$(SHL4TARGET).lnk
+        ) >> $(MISC)/$(SHL4TARGET).lnk
+        $(TYPE) $(MISC)/$(SHL4TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL4TARGET).lnk
+        $(SHL4LINKER) @$(MISC)/$(SHL4TARGET).lnk
         @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -2106,82 +2030,70 @@ $(SHL4TARGETN) : \
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
     @echo $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
     $(SHL4VERSIONOBJ) \
-    `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
-    $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_4.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL4RPATH) $@
-	@echo "Making:   " $(@:f).jnilib
+    @echo "Making: $@.jnilib"
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL4NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN)
 .ENDIF				# "$(SHL4NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
-    @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
-		$(SHL4VERSIONOBJ) -o $@ \
-		`cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-		$(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
-.ENDIF
-    @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
+    $(SHL4VERSIONOBJ) -o $@ \
+    `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL4NOCHECK)"==""
-	$(QUIET_BUILD) -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-	$(QUIET_BUILD) $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-.IF "$(QUIET_BUILD)"==""
-	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-.ELSE
-	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) -- -s $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-.ENDIF
+    -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
+    $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
 .ENDIF				# "$(SHL4NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
 .IF "$(UNIXVERSIONNAMES)"!=""
-	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL4TARGETN:b)
-	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b)
+    $(RM) $(LB)/$(SHL4TARGETN:b)
+    cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(QUIET_BUILD)"==""
     @ls -l $@
-.ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
 .IF "$(GUI)" == "OS2"
 
 .IF "$(SHL4DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)$/$(SHL4DEFAULTRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc >& $(NULLDEV)
 .IF "$(SHL4ICON)" != ""
-    @-+echo 1 ICON $(SHL4ICON) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    @-+echo 1 ICON $(SHL4ICON) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL4ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    @-+echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc
 .ENDIF			# "$(SHL4ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL4DEFAULTRES:b).rc
+#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc
 .ENDIF			# "$(SHL4DEFAULTRES)"!=""
 
 .IF "$(SHL4ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) $(SHL4ALLRES:s/res /res+/) $(SHL4LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL4ALLRES)"!=""
 
 .IF "$(USE_DEFFILE)"!=""
@@ -2190,7 +2102,7 @@ $(SHL4TARGETN) : \
         $(SHL4DEF) \
         $(STDOBJ) \
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL4OBJS) $(SHL4VERSIONOBJ) \
         $(SHL4LIBS) \
         $(SHL4STDLIBS:^"-l") \
@@ -2205,7 +2117,7 @@ $(SHL4TARGETN) : \
         $(SHL4DEF) \
         $(STDOBJ)							\
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL4OBJS) $(SHL4VERSIONOBJ) \
         $(SHL4LIBS) \
         $(SHL4STDLIBS:^"-l") \
@@ -2229,7 +2141,7 @@ $(SHL4TARGETN) : \
 ALLTAR : runtest_$(SHL4TARGET)
 
 runtest_$(SHL4TARGET) : $(SHL4TARGETN)
-    testshl $(SHL4TARGETN) sce$/$(SHL4TARGET).sce -msg -skip
+    testshl $(SHL4TARGETN) sce/$(SHL4TARGET).sce -msg -skip
 .ENDIF			# "$(NO_TESTS)"==""
 .ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL4TARGETN)"!=""
@@ -2265,7 +2177,7 @@ LINKFLAGSRUNPATH_$(SHL5RPATH)*=/ERROR:/Bad_SHL5RPATH_value
 SHL5LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL5RPATH))
 
 .IF "$(SHL5USE_EXPORTS)"==""
-SHL5DEF*=$(MISC)$/$(SHL5TARGET).def
+SHL5DEF*=$(MISC)/$(SHL5TARGET).def
 .ENDIF			# "$(SHL5USE_EXPORTS)"==""
 
 EXTRALIBPATHS5=$(EXTRALIBPATHS)
@@ -2282,15 +2194,15 @@ EXTRALIBPATHS5+=-L$(SOLAR_STLLIBPATH)
 
 .IF "$(VERSIONOBJ)"!=""
 SHL5VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)$/$(SHL5VERSIONOBJ:b).h
+USE_VERSIONH:=$(INCCOM)/$(SHL5VERSIONOBJ:b).h
 .IF "$(GUI)" == "UNX"
 SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
 .ELSE           # "$(GUI)" == "UNX"
 SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f)
 .ENDIF          # "$(GUI)" == "UNX"
-$(MISC)$/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL5VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)$/src$/version.c $@
-	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@
+$(MISC)/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL5VERSIONOBJ:b).h
+#    $(COPY) $(SOLARENV)/src/version.c $@
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@
 
 .INIT : $(SHL5VERSIONOBJDEP)
 .ENDIF			# "$(VERSIONOBJ)"!=""
@@ -2301,13 +2213,13 @@ $(MISC)$/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL5VE
 SHL5IMPLIB=i$(TARGET)_t5
 .ENDIF			# "$(SHL5IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
-USE_5IMPLIB=-implib:$(LB)$/$(SHL5IMPLIB).lib
+USE_5IMPLIB=-implib:$(LB)/$(SHL5IMPLIB).lib
 .ENDIF			# "$(COM)" != "GCC"
-SHL5IMPLIBN=$(LB)$/$(SHL5IMPLIB).lib
+SHL5IMPLIBN=$(LB)/$(SHL5IMPLIB).lib
 ALLTAR : $(SHL5IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
-USE_5IMPLIB_DEPS=$(LB)$/$(SHL5IMPLIB).lib
+USE_5IMPLIB_DEPS=$(LB)/$(SHL5IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 USE_SHL5DEF=$(SHL5DEF)
@@ -2317,7 +2229,7 @@ SHL5DEPN+:=$(SHL5DEPNU)
 
 .IF "$(SHL5VERSIONMAP)"==""
 # to activate vmaps remove "#"
-USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap
+USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap
 .ENDIF			# "$(SHL5VERSIONMAP)"==""
 
 .IF "$(USE_SHL5VERSIONMAP)"!=""
@@ -2325,7 +2237,7 @@ USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap
 .IF "$(SHL5FILTERFILE)"!=""
 .IF "$(SHL5VERSIONMAP)"!=""
 #eine von beiden ist zuviel
-USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap
+USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap
 $(USE_SHL5VERSIONMAP) .PHONY:
     @echo -----------------------------
     @echo you should only use versionmap OR exportfile
@@ -2352,27 +2264,23 @@ $(USE_SHL5VERSIONMAP): \
 .ENDIF
 .ENDIF			# "$(SHL5OBJS)!"=""
     @$(TYPE) /dev/null $(SHL5LIBS:s/.lib/.dump/) >> $@.dump
-	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL5INTERFACE) -f $(SHL5FILTERFILE) -m $@
+    $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL5INTERFACE) -f $(SHL5FILTERFILE) -m $@
 
 .ELSE			# "$(SHL5FILTERFILE)"!=""
-USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap
+USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap
 $(USE_SHL5VERSIONMAP) :
-.IF "$(QUIET_BUILD)"==""
     @echo -----------------------------
     @echo SHL5FILTERFILE not set!
     @echo -----------------------------
     @$(TOUCH) $@
     @echo dummy file to keep the dependencies for later use.
-.ELSE
-	@$(TOUCH) $@
-.ENDIF
 #	force_dmake_to_error
 .ENDIF			# "$(SHL5FILTERFILE)"!=""
 .ELSE			# "$(USE_SHL5VERSIONMAP)"!=""
 
 #and now for the plain non-generic way...
 .IF "$(SHL5VERSIONMAP)"!=""
-USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e)
+USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e)
 .IF "$(OS)"!="IRIX"
 SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
 .ENDIF
@@ -2392,25 +2300,25 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP)
 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
 # happens if somebody will change it in the future
 .IF "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .ELIF "$(COMNAME)"=="sunpro5"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL5VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
+    tr -d "\015" < $(SHL5VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
 .ELSE           # "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL5VERSIONMAP) > $@
+    tr -d "\015" < $(SHL5VERSIONMAP) > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod a+w $@
 # Mac OS X post-processing generate an exported symbols list from the generated map file
 # for details on exported symbols list see man ld on Mac OS X
 .IF "$(OS)"=="MACOSX"
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
 .IF "$(SHL5OBJS)"!=""
-    -echo $(foreach,i,$(SHL5OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -echo $(foreach,i,$(SHL5OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 .IF "$(SHL5LIBS)"!=""
-    -$(TYPE) $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -$(TYPE) $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
@@ -2434,15 +2342,15 @@ SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\"
 
 .IF "$(SHL5RES)"!=""
 SHL5ALLRES+=$(SHL5RES)
-SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res
-SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o
+SHL5LINKRES*=$(MISC)/$(SHL5TARGET).res
+SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o
 .ENDIF			# "$(SHL5RES)"!=""
 
 .IF "$(SHL5DEFAULTRES)$(use_shl_versions)"!=""
-SHL5DEFAULTRES*=$(MISC)$/$(SHL5TARGET)_def.res
+SHL5DEFAULTRES*=$(MISC)/$(SHL5TARGET)_def.res
 SHL5ALLRES+=$(SHL5DEFAULTRES)
-SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res
-SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o
+SHL5LINKRES*=$(MISC)/$(SHL5TARGET).res
+SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o
 .ENDIF			# "$(SHL5DEFAULTRES)$(use_shl_versions)"!=""
 
 #.IF "$(SHL5TARGETN)"!=""
@@ -2450,13 +2358,13 @@ SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(SHL5LIBS)"!=""
-$(MISC)$/$(SHL5TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(SHL5TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL5LIBS)"!=""
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(SHL5TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(SHL5TARGETN:b)_linkinc.ls
 $(SHL5TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
@@ -2464,17 +2372,17 @@ $(SHL5TARGETN) : $(LINKINCTARGETS)
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL5LIBS)"!=""
-SHL5LINKLIST=$(MISC)$/$(SHL5TARGET)_link.lst
+SHL5LINKLIST=$(MISC)/$(SHL5TARGET)_link.lst
 SHL5LINKLISTPARAM=@$(SHL5LINKLIST)
 $(SHL5LINKLIST) : $(SHL5LIBS)
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL5LIBS)"!=""
 .ENDIF          # "$(COM)"!="GCC"
 .ENDIF
 .ENDIF			# "$(SHL5USE_EXPORTS)"=="name"
 
-$(MISC)$/%linkinc.ls:
+$(MISC)/%linkinc.ls:
     echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
@@ -2485,7 +2393,7 @@ SHL5TARGET8=$(shell @fix_shl $(SHL5TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
-_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL5STDLIBS:^"$(LB)$/") 
+_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL5STDLIBS:^"$(LB)/") 
 SHL5IMP_ORD = $(foreach,i,$(_SHL5IMP_ORD) $(shell @-ls $i))
 .ELSE
 SHL5IMP_ORD = 
@@ -2502,60 +2410,54 @@ $(SHL5TARGETN) : \
                     $(SHL5DEPN) \
                     $(SHL5IMP_ORD) \
                     $(SHL5LINKLIST)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL5TARGETN)
 .IF "$(GUI)" == "WNT"
 .IF "$(SHL5DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    @@-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc
 .IF "$(SHL5ICON)" != ""
-    @echo 1 ICON $(SHL5ICON) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    @echo 1 ICON $(SHL5ICON) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL5ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc
 .ELSE			# "$(SHL5ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL5DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL5DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL5DEFAULTRES:b).rc
 .ENDIF			# "$(SHL5ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL5TARGET)$(DLLPOST) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc
 .ENDIF			# "$(SHL5DEFAULTRES)"!=""
 .IF "$(SHL5ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL5ALLRES:s/res /res+/) $(SHL5LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
 .IF "$(COM)"=="GCC"
     windres $(SHL5LINKRES) $(SHL5LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL5ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
     @echo dlltool --input-def $(SHL5DEF) \
         --dllname $(SHL5TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_5.cmd
+        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_5.cmd
 .IF "$(DEFLIB5NAME)"!=""	# do not have to include objs
-    @echo 	--output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
+    @echo 	--output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_5.cmd
 .ELSE			# "$(DEFLIB5NAME)"!=""	# do not have to include objs
-    @echo	--output-exp $(MISC)$/$(@:b)_exp.o \
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
         $(STDOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \
-        `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`  >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
+        `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g`  >> $(MISC)/$(TARGET).$(@:b)_5.cmd
 .ENDIF			# "$(DEFLIB5NAME)"!=""
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \
-        `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+        `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
         -Wl,--exclude-libs,ALL,--start-group $(SHL5STDLIBS) -Wl,--end-group \
-        $(SHL5STDSHL) $(STDSHL5) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
+        $(SHL5STDSHL) $(STDSHL5) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
+        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL5USE_EXPORTS)"!="name"
@@ -2565,7 +2467,7 @@ $(SHL5TARGETN) : \
         $(LINKFLAGSSHL) \
         $(SHL5STACK) $(SHL5BASEX)	\
         -out:$@ \
-        -map:$(MISC)$/$(@:b).map \
+        -map:$(MISC)/$(@:b).map \
         -def:$(SHL5DEF) \
         $(USE_5IMPLIB) \
         $(STDOBJ) \
@@ -2579,7 +2481,7 @@ $(SHL5TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -2590,8 +2492,8 @@ $(SHL5TARGETN) : \
     $(SHL5LINKER) @$(mktmp	$(SHL5LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL5BASEX)		\
         $(SHL5STACK) -out:$(SHL5TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
-        $(LB)$/$(SHL5IMPLIB).exp				\
+        -map:$(MISC)/$(@:B).map				\
+        $(LB)/$(SHL5IMPLIB).exp				\
         $(STDOBJ)							\
         $(SHL5OBJS) $(SHL5VERSIONOBJ) \
         $(SHL5LIBS)                         \
@@ -2603,7 +2505,7 @@ $(SHL5TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -2615,7 +2517,7 @@ $(SHL5TARGETN) : \
     $(SHL5LINKER) @$(mktmp	$(SHL5LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL5BASEX)		\
         $(SHL5STACK) -out:$(SHL5TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
+        -map:$(MISC)/$(@:B).map				\
         $(USE_5IMPLIB) \
         $(STDOBJ)							\
         $(SHL5OBJS) $(SHL5VERSIONOBJ))   \
@@ -2626,7 +2528,7 @@ $(SHL5TARGETN) : \
     )
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -2635,25 +2537,25 @@ $(SHL5TARGETN) : \
     $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
 .ENDIF			# "$(SHL5USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
-        -$(RM) del $(MISC)$/$(SHL5TARGET).lnk
-        -$(RM) $(MISC)$/$(SHL5TARGET).lst
+        -$(RM) del $(MISC)/$(SHL5TARGET).lnk
+        -$(RM) $(MISC)/$(SHL5TARGET).lst
         $(TYPE) $(mktmp \
         $(SHL5LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL5BASEX) \
         $(SHL5STACK) $(MAPFILE) \
         -out:$@ \
-        $(LB)$/$(SHL5IMPLIB).exp \
+        $(LB)/$(SHL5IMPLIB).exp \
         $(STDOBJ) \
         $(SHL5OBJS) \
         $(SHL5STDLIBS) \
         $(SHL5STDSHL) $(STDSHL5) \
         $(SHL5LINKRES) \
-        ) >> $(MISC)$/$(SHL5TARGET).lnk
-        $(TYPE) $(MISC)$/$(SHL5TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL5TARGET).lnk
-        $(SHL5LINKER) @$(MISC)$/$(SHL5TARGET).lnk
+        ) >> $(MISC)/$(SHL5TARGET).lnk
+        $(TYPE) $(MISC)/$(SHL5TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL5TARGET).lnk
+        $(SHL5LINKER) @$(MISC)/$(SHL5TARGET).lnk
         @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -2665,82 +2567,70 @@ $(SHL5TARGETN) : \
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
     @echo $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
     $(SHL5VERSIONOBJ) \
-    `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
-    $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_5.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL5RPATH) $@
-	@echo "Making:   " $(@:f).jnilib
+    @echo "Making: $@.jnilib"
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL5NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN)
 .ENDIF				# "$(SHL5NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
-    @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
-		$(SHL5VERSIONOBJ) -o $@ \
-		`cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-		$(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
-.ENDIF
-    @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
+    $(SHL5VERSIONOBJ) -o $@ \
+    `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL5NOCHECK)"==""
-	$(QUIET_BUILD) -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-	$(QUIET_BUILD) $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-.IF "$(QUIET_BUILD)"==""
-	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-.ELSE
-	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) -- -s $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-.ENDIF
+    -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
+    $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
 .ENDIF				# "$(SHL5NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
 .IF "$(UNIXVERSIONNAMES)"!=""
-	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL5TARGETN:b)
-	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b)
+    $(RM) $(LB)/$(SHL5TARGETN:b)
+    cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(QUIET_BUILD)"==""
     @ls -l $@
-.ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
 .IF "$(GUI)" == "OS2"
 
 .IF "$(SHL5DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)$/$(SHL5DEFAULTRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc >& $(NULLDEV)
 .IF "$(SHL5ICON)" != ""
-    @-+echo 1 ICON $(SHL5ICON) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    @-+echo 1 ICON $(SHL5ICON) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL5ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    @-+echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc
 .ENDIF			# "$(SHL5ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL5DEFAULTRES:b).rc
+#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc
 .ENDIF			# "$(SHL5DEFAULTRES)"!=""
 
 .IF "$(SHL5ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) $(SHL5ALLRES:s/res /res+/) $(SHL5LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL5ALLRES)"!=""
 
 .IF "$(USE_DEFFILE)"!=""
@@ -2749,7 +2639,7 @@ $(SHL5TARGETN) : \
         $(SHL5DEF) \
         $(STDOBJ) \
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL5OBJS) $(SHL5VERSIONOBJ) \
         $(SHL5LIBS) \
         $(SHL5STDLIBS:^"-l") \
@@ -2764,7 +2654,7 @@ $(SHL5TARGETN) : \
         $(SHL5DEF) \
         $(STDOBJ)							\
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL5OBJS) $(SHL5VERSIONOBJ) \
         $(SHL5LIBS) \
         $(SHL5STDLIBS:^"-l") \
@@ -2788,7 +2678,7 @@ $(SHL5TARGETN) : \
 ALLTAR : runtest_$(SHL5TARGET)
 
 runtest_$(SHL5TARGET) : $(SHL5TARGETN)
-    testshl $(SHL5TARGETN) sce$/$(SHL5TARGET).sce -msg -skip
+    testshl $(SHL5TARGETN) sce/$(SHL5TARGET).sce -msg -skip
 .ENDIF			# "$(NO_TESTS)"==""
 .ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL5TARGETN)"!=""
@@ -2824,7 +2714,7 @@ LINKFLAGSRUNPATH_$(SHL6RPATH)*=/ERROR:/Bad_SHL6RPATH_value
 SHL6LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL6RPATH))
 
 .IF "$(SHL6USE_EXPORTS)"==""
-SHL6DEF*=$(MISC)$/$(SHL6TARGET).def
+SHL6DEF*=$(MISC)/$(SHL6TARGET).def
 .ENDIF			# "$(SHL6USE_EXPORTS)"==""
 
 EXTRALIBPATHS6=$(EXTRALIBPATHS)
@@ -2841,15 +2731,15 @@ EXTRALIBPATHS6+=-L$(SOLAR_STLLIBPATH)
 
 .IF "$(VERSIONOBJ)"!=""
 SHL6VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)$/$(SHL6VERSIONOBJ:b).h
+USE_VERSIONH:=$(INCCOM)/$(SHL6VERSIONOBJ:b).h
 .IF "$(GUI)" == "UNX"
 SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
 .ELSE           # "$(GUI)" == "UNX"
 SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f)
 .ENDIF          # "$(GUI)" == "UNX"
-$(MISC)$/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL6VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)$/src$/version.c $@
-	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@
+$(MISC)/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL6VERSIONOBJ:b).h
+#    $(COPY) $(SOLARENV)/src/version.c $@
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@
 
 .INIT : $(SHL6VERSIONOBJDEP)
 .ENDIF			# "$(VERSIONOBJ)"!=""
@@ -2860,13 +2750,13 @@ $(MISC)$/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL6VE
 SHL6IMPLIB=i$(TARGET)_t6
 .ENDIF			# "$(SHL6IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
-USE_6IMPLIB=-implib:$(LB)$/$(SHL6IMPLIB).lib
+USE_6IMPLIB=-implib:$(LB)/$(SHL6IMPLIB).lib
 .ENDIF			# "$(COM)" != "GCC"
-SHL6IMPLIBN=$(LB)$/$(SHL6IMPLIB).lib
+SHL6IMPLIBN=$(LB)/$(SHL6IMPLIB).lib
 ALLTAR : $(SHL6IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
-USE_6IMPLIB_DEPS=$(LB)$/$(SHL6IMPLIB).lib
+USE_6IMPLIB_DEPS=$(LB)/$(SHL6IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 USE_SHL6DEF=$(SHL6DEF)
@@ -2876,7 +2766,7 @@ SHL6DEPN+:=$(SHL6DEPNU)
 
 .IF "$(SHL6VERSIONMAP)"==""
 # to activate vmaps remove "#"
-USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap
+USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap
 .ENDIF			# "$(SHL6VERSIONMAP)"==""
 
 .IF "$(USE_SHL6VERSIONMAP)"!=""
@@ -2884,7 +2774,7 @@ USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap
 .IF "$(SHL6FILTERFILE)"!=""
 .IF "$(SHL6VERSIONMAP)"!=""
 #eine von beiden ist zuviel
-USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap
+USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap
 $(USE_SHL6VERSIONMAP) .PHONY:
     @echo -----------------------------
     @echo you should only use versionmap OR exportfile
@@ -2911,27 +2801,23 @@ $(USE_SHL6VERSIONMAP): \
 .ENDIF
 .ENDIF			# "$(SHL6OBJS)!"=""
     @$(TYPE) /dev/null $(SHL6LIBS:s/.lib/.dump/) >> $@.dump
-	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL6INTERFACE) -f $(SHL6FILTERFILE) -m $@
+    $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL6INTERFACE) -f $(SHL6FILTERFILE) -m $@
 
 .ELSE			# "$(SHL6FILTERFILE)"!=""
-USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap
+USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap
 $(USE_SHL6VERSIONMAP) :
-.IF "$(QUIET_BUILD)"==""
     @echo -----------------------------
     @echo SHL6FILTERFILE not set!
     @echo -----------------------------
     @$(TOUCH) $@
     @echo dummy file to keep the dependencies for later use.
-.ELSE
-	@$(TOUCH) $@
-.ENDIF
 #	force_dmake_to_error
 .ENDIF			# "$(SHL6FILTERFILE)"!=""
 .ELSE			# "$(USE_SHL6VERSIONMAP)"!=""
 
 #and now for the plain non-generic way...
 .IF "$(SHL6VERSIONMAP)"!=""
-USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e)
+USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e)
 .IF "$(OS)"!="IRIX"
 SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
 .ENDIF
@@ -2951,25 +2837,25 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP)
 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
 # happens if somebody will change it in the future
 .IF "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .ELIF "$(COMNAME)"=="sunpro5"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL6VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
+    tr -d "\015" < $(SHL6VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
 .ELSE           # "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL6VERSIONMAP) > $@
+    tr -d "\015" < $(SHL6VERSIONMAP) > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod a+w $@
 # Mac OS X post-processing generate an exported symbols list from the generated map file
 # for details on exported symbols list see man ld on Mac OS X
 .IF "$(OS)"=="MACOSX"
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
 .IF "$(SHL6OBJS)"!=""
-    -echo $(foreach,i,$(SHL6OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -echo $(foreach,i,$(SHL6OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 .IF "$(SHL6LIBS)"!=""
-    -$(TYPE) $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -$(TYPE) $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
@@ -2993,15 +2879,15 @@ SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\"
 
 .IF "$(SHL6RES)"!=""
 SHL6ALLRES+=$(SHL6RES)
-SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res
-SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o
+SHL6LINKRES*=$(MISC)/$(SHL6TARGET).res
+SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o
 .ENDIF			# "$(SHL6RES)"!=""
 
 .IF "$(SHL6DEFAULTRES)$(use_shl_versions)"!=""
-SHL6DEFAULTRES*=$(MISC)$/$(SHL6TARGET)_def.res
+SHL6DEFAULTRES*=$(MISC)/$(SHL6TARGET)_def.res
 SHL6ALLRES+=$(SHL6DEFAULTRES)
-SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res
-SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o
+SHL6LINKRES*=$(MISC)/$(SHL6TARGET).res
+SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o
 .ENDIF			# "$(SHL6DEFAULTRES)$(use_shl_versions)"!=""
 
 #.IF "$(SHL6TARGETN)"!=""
@@ -3009,13 +2895,13 @@ SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(SHL6LIBS)"!=""
-$(MISC)$/$(SHL6TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(SHL6TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL6LIBS)"!=""
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(SHL6TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(SHL6TARGETN:b)_linkinc.ls
 $(SHL6TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
@@ -3023,17 +2909,17 @@ $(SHL6TARGETN) : $(LINKINCTARGETS)
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL6LIBS)"!=""
-SHL6LINKLIST=$(MISC)$/$(SHL6TARGET)_link.lst
+SHL6LINKLIST=$(MISC)/$(SHL6TARGET)_link.lst
 SHL6LINKLISTPARAM=@$(SHL6LINKLIST)
 $(SHL6LINKLIST) : $(SHL6LIBS)
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL6LIBS)"!=""
 .ENDIF          # "$(COM)"!="GCC"
 .ENDIF
 .ENDIF			# "$(SHL6USE_EXPORTS)"=="name"
 
-$(MISC)$/%linkinc.ls:
+$(MISC)/%linkinc.ls:
     echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
@@ -3044,7 +2930,7 @@ SHL6TARGET8=$(shell @fix_shl $(SHL6TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
-_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL6STDLIBS:^"$(LB)$/") 
+_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL6STDLIBS:^"$(LB)/") 
 SHL6IMP_ORD = $(foreach,i,$(_SHL6IMP_ORD) $(shell @-ls $i))
 .ELSE
 SHL6IMP_ORD = 
@@ -3061,60 +2947,54 @@ $(SHL6TARGETN) : \
                     $(SHL6DEPN) \
                     $(SHL6IMP_ORD) \
                     $(SHL6LINKLIST)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL6TARGETN)
 .IF "$(GUI)" == "WNT"
 .IF "$(SHL6DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    @@-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc
 .IF "$(SHL6ICON)" != ""
-    @echo 1 ICON $(SHL6ICON) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    @echo 1 ICON $(SHL6ICON) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL6ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc
 .ELSE			# "$(SHL6ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL6DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL6DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL6DEFAULTRES:b).rc
 .ENDIF			# "$(SHL6ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL6TARGET)$(DLLPOST) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc
 .ENDIF			# "$(SHL6DEFAULTRES)"!=""
 .IF "$(SHL6ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL6ALLRES:s/res /res+/) $(SHL6LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
 .IF "$(COM)"=="GCC"
     windres $(SHL6LINKRES) $(SHL6LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL6ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
     @echo dlltool --input-def $(SHL6DEF) \
         --dllname $(SHL6TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_6.cmd
+        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_6.cmd
 .IF "$(DEFLIB6NAME)"!=""	# do not have to include objs
-    @echo 	--output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
+    @echo 	--output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_6.cmd
 .ELSE			# "$(DEFLIB6NAME)"!=""	# do not have to include objs
-    @echo	--output-exp $(MISC)$/$(@:b)_exp.o \
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
         $(STDOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \
-        `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`  >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
+        `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g`  >> $(MISC)/$(TARGET).$(@:b)_6.cmd
 .ENDIF			# "$(DEFLIB6NAME)"!=""
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \
-        `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+        `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
         -Wl,--exclude-libs,ALL,--start-group $(SHL6STDLIBS) -Wl,--end-group \
-        $(SHL6STDSHL) $(STDSHL6) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
+        $(SHL6STDSHL) $(STDSHL6) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
+        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL6USE_EXPORTS)"!="name"
@@ -3124,7 +3004,7 @@ $(SHL6TARGETN) : \
         $(LINKFLAGSSHL) \
         $(SHL6STACK) $(SHL6BASEX)	\
         -out:$@ \
-        -map:$(MISC)$/$(@:b).map \
+        -map:$(MISC)/$(@:b).map \
         -def:$(SHL6DEF) \
         $(USE_6IMPLIB) \
         $(STDOBJ) \
@@ -3138,7 +3018,7 @@ $(SHL6TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -3149,8 +3029,8 @@ $(SHL6TARGETN) : \
     $(SHL6LINKER) @$(mktmp	$(SHL6LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL6BASEX)		\
         $(SHL6STACK) -out:$(SHL6TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
-        $(LB)$/$(SHL6IMPLIB).exp				\
+        -map:$(MISC)/$(@:B).map				\
+        $(LB)/$(SHL6IMPLIB).exp				\
         $(STDOBJ)							\
         $(SHL6OBJS) $(SHL6VERSIONOBJ) \
         $(SHL6LIBS)                         \
@@ -3162,7 +3042,7 @@ $(SHL6TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -3174,7 +3054,7 @@ $(SHL6TARGETN) : \
     $(SHL6LINKER) @$(mktmp	$(SHL6LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL6BASEX)		\
         $(SHL6STACK) -out:$(SHL6TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
+        -map:$(MISC)/$(@:B).map				\
         $(USE_6IMPLIB) \
         $(STDOBJ)							\
         $(SHL6OBJS) $(SHL6VERSIONOBJ))   \
@@ -3185,7 +3065,7 @@ $(SHL6TARGETN) : \
     )
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -3194,25 +3074,25 @@ $(SHL6TARGETN) : \
     $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
 .ENDIF			# "$(SHL6USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
-        -$(RM) del $(MISC)$/$(SHL6TARGET).lnk
-        -$(RM) $(MISC)$/$(SHL6TARGET).lst
+        -$(RM) del $(MISC)/$(SHL6TARGET).lnk
+        -$(RM) $(MISC)/$(SHL6TARGET).lst
         $(TYPE) $(mktmp \
         $(SHL6LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL6BASEX) \
         $(SHL6STACK) $(MAPFILE) \
         -out:$@ \
-        $(LB)$/$(SHL6IMPLIB).exp \
+        $(LB)/$(SHL6IMPLIB).exp \
         $(STDOBJ) \
         $(SHL6OBJS) \
         $(SHL6STDLIBS) \
         $(SHL6STDSHL) $(STDSHL6) \
         $(SHL6LINKRES) \
-        ) >> $(MISC)$/$(SHL6TARGET).lnk
-        $(TYPE) $(MISC)$/$(SHL6TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL6TARGET).lnk
-        $(SHL6LINKER) @$(MISC)$/$(SHL6TARGET).lnk
+        ) >> $(MISC)/$(SHL6TARGET).lnk
+        $(TYPE) $(MISC)/$(SHL6TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL6TARGET).lnk
+        $(SHL6LINKER) @$(MISC)/$(SHL6TARGET).lnk
         @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -3224,82 +3104,70 @@ $(SHL6TARGETN) : \
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
     @echo $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
     $(SHL6VERSIONOBJ) \
-    `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
-    $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_6.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL6RPATH) $@
-	@echo "Making:   " $(@:f).jnilib
+    @echo "Making: $@.jnilib"
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL6NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN)
 .ENDIF				# "$(SHL6NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
-    @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
-		$(SHL6VERSIONOBJ) -o $@ \
-		`cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-		$(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
-.ENDIF
-    @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
+    $(SHL6VERSIONOBJ) -o $@ \
+    `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL6NOCHECK)"==""
-	$(QUIET_BUILD) -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-	$(QUIET_BUILD) $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-.IF "$(QUIET_BUILD)"==""
-	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-.ELSE
-	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) -- -s $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-.ENDIF
+    -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
+    $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
 .ENDIF				# "$(SHL6NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
 .IF "$(UNIXVERSIONNAMES)"!=""
-	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL6TARGETN:b)
-	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b)
+    $(RM) $(LB)/$(SHL6TARGETN:b)
+    cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(QUIET_BUILD)"==""
     @ls -l $@
-.ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
 .IF "$(GUI)" == "OS2"
 
 .IF "$(SHL6DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)$/$(SHL6DEFAULTRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc >& $(NULLDEV)
 .IF "$(SHL6ICON)" != ""
-    @-+echo 1 ICON $(SHL6ICON) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    @-+echo 1 ICON $(SHL6ICON) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL6ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    @-+echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc
 .ENDIF			# "$(SHL6ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL6DEFAULTRES:b).rc
+#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc
 .ENDIF			# "$(SHL6DEFAULTRES)"!=""
 
 .IF "$(SHL6ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) $(SHL6ALLRES:s/res /res+/) $(SHL6LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL6ALLRES)"!=""
 
 .IF "$(USE_DEFFILE)"!=""
@@ -3308,7 +3176,7 @@ $(SHL6TARGETN) : \
         $(SHL6DEF) \
         $(STDOBJ) \
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL6OBJS) $(SHL6VERSIONOBJ) \
         $(SHL6LIBS) \
         $(SHL6STDLIBS:^"-l") \
@@ -3323,7 +3191,7 @@ $(SHL6TARGETN) : \
         $(SHL6DEF) \
         $(STDOBJ)							\
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL6OBJS) $(SHL6VERSIONOBJ) \
         $(SHL6LIBS) \
         $(SHL6STDLIBS:^"-l") \
@@ -3347,7 +3215,7 @@ $(SHL6TARGETN) : \
 ALLTAR : runtest_$(SHL6TARGET)
 
 runtest_$(SHL6TARGET) : $(SHL6TARGETN)
-    testshl $(SHL6TARGETN) sce$/$(SHL6TARGET).sce -msg -skip
+    testshl $(SHL6TARGETN) sce/$(SHL6TARGET).sce -msg -skip
 .ENDIF			# "$(NO_TESTS)"==""
 .ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL6TARGETN)"!=""
@@ -3383,7 +3251,7 @@ LINKFLAGSRUNPATH_$(SHL7RPATH)*=/ERROR:/Bad_SHL7RPATH_value
 SHL7LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL7RPATH))
 
 .IF "$(SHL7USE_EXPORTS)"==""
-SHL7DEF*=$(MISC)$/$(SHL7TARGET).def
+SHL7DEF*=$(MISC)/$(SHL7TARGET).def
 .ENDIF			# "$(SHL7USE_EXPORTS)"==""
 
 EXTRALIBPATHS7=$(EXTRALIBPATHS)
@@ -3400,15 +3268,15 @@ EXTRALIBPATHS7+=-L$(SOLAR_STLLIBPATH)
 
 .IF "$(VERSIONOBJ)"!=""
 SHL7VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)$/$(SHL7VERSIONOBJ:b).h
+USE_VERSIONH:=$(INCCOM)/$(SHL7VERSIONOBJ:b).h
 .IF "$(GUI)" == "UNX"
 SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
 .ELSE           # "$(GUI)" == "UNX"
 SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f)
 .ENDIF          # "$(GUI)" == "UNX"
-$(MISC)$/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL7VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)$/src$/version.c $@
-	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@
+$(MISC)/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL7VERSIONOBJ:b).h
+#    $(COPY) $(SOLARENV)/src/version.c $@
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@
 
 .INIT : $(SHL7VERSIONOBJDEP)
 .ENDIF			# "$(VERSIONOBJ)"!=""
@@ -3419,13 +3287,13 @@ $(MISC)$/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL7VE
 SHL7IMPLIB=i$(TARGET)_t7
 .ENDIF			# "$(SHL7IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
-USE_7IMPLIB=-implib:$(LB)$/$(SHL7IMPLIB).lib
+USE_7IMPLIB=-implib:$(LB)/$(SHL7IMPLIB).lib
 .ENDIF			# "$(COM)" != "GCC"
-SHL7IMPLIBN=$(LB)$/$(SHL7IMPLIB).lib
+SHL7IMPLIBN=$(LB)/$(SHL7IMPLIB).lib
 ALLTAR : $(SHL7IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
-USE_7IMPLIB_DEPS=$(LB)$/$(SHL7IMPLIB).lib
+USE_7IMPLIB_DEPS=$(LB)/$(SHL7IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 USE_SHL7DEF=$(SHL7DEF)
@@ -3435,7 +3303,7 @@ SHL7DEPN+:=$(SHL7DEPNU)
 
 .IF "$(SHL7VERSIONMAP)"==""
 # to activate vmaps remove "#"
-USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap
+USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap
 .ENDIF			# "$(SHL7VERSIONMAP)"==""
 
 .IF "$(USE_SHL7VERSIONMAP)"!=""
@@ -3443,7 +3311,7 @@ USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap
 .IF "$(SHL7FILTERFILE)"!=""
 .IF "$(SHL7VERSIONMAP)"!=""
 #eine von beiden ist zuviel
-USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap
+USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap
 $(USE_SHL7VERSIONMAP) .PHONY:
     @echo -----------------------------
     @echo you should only use versionmap OR exportfile
@@ -3470,27 +3338,23 @@ $(USE_SHL7VERSIONMAP): \
 .ENDIF
 .ENDIF			# "$(SHL7OBJS)!"=""
     @$(TYPE) /dev/null $(SHL7LIBS:s/.lib/.dump/) >> $@.dump
-	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL7INTERFACE) -f $(SHL7FILTERFILE) -m $@
+    $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL7INTERFACE) -f $(SHL7FILTERFILE) -m $@
 
 .ELSE			# "$(SHL7FILTERFILE)"!=""
-USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap
+USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap
 $(USE_SHL7VERSIONMAP) :
-.IF "$(QUIET_BUILD)"==""
     @echo -----------------------------
     @echo SHL7FILTERFILE not set!
     @echo -----------------------------
     @$(TOUCH) $@
     @echo dummy file to keep the dependencies for later use.
-.ELSE
-	@$(TOUCH) $@
-.ENDIF
 #	force_dmake_to_error
 .ENDIF			# "$(SHL7FILTERFILE)"!=""
 .ELSE			# "$(USE_SHL7VERSIONMAP)"!=""
 
 #and now for the plain non-generic way...
 .IF "$(SHL7VERSIONMAP)"!=""
-USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e)
+USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e)
 .IF "$(OS)"!="IRIX"
 SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
 .ENDIF
@@ -3510,25 +3374,25 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP)
 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
 # happens if somebody will change it in the future
 .IF "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .ELIF "$(COMNAME)"=="sunpro5"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL7VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
+    tr -d "\015" < $(SHL7VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
 .ELSE           # "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL7VERSIONMAP) > $@
+    tr -d "\015" < $(SHL7VERSIONMAP) > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod a+w $@
 # Mac OS X post-processing generate an exported symbols list from the generated map file
 # for details on exported symbols list see man ld on Mac OS X
 .IF "$(OS)"=="MACOSX"
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
 .IF "$(SHL7OBJS)"!=""
-    -echo $(foreach,i,$(SHL7OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -echo $(foreach,i,$(SHL7OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 .IF "$(SHL7LIBS)"!=""
-    -$(TYPE) $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -$(TYPE) $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
@@ -3552,15 +3416,15 @@ SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\"
 
 .IF "$(SHL7RES)"!=""
 SHL7ALLRES+=$(SHL7RES)
-SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res
-SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o
+SHL7LINKRES*=$(MISC)/$(SHL7TARGET).res
+SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o
 .ENDIF			# "$(SHL7RES)"!=""
 
 .IF "$(SHL7DEFAULTRES)$(use_shl_versions)"!=""
-SHL7DEFAULTRES*=$(MISC)$/$(SHL7TARGET)_def.res
+SHL7DEFAULTRES*=$(MISC)/$(SHL7TARGET)_def.res
 SHL7ALLRES+=$(SHL7DEFAULTRES)
-SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res
-SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o
+SHL7LINKRES*=$(MISC)/$(SHL7TARGET).res
+SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o
 .ENDIF			# "$(SHL7DEFAULTRES)$(use_shl_versions)"!=""
 
 #.IF "$(SHL7TARGETN)"!=""
@@ -3568,13 +3432,13 @@ SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(SHL7LIBS)"!=""
-$(MISC)$/$(SHL7TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(SHL7TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL7LIBS)"!=""
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(SHL7TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(SHL7TARGETN:b)_linkinc.ls
 $(SHL7TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
@@ -3582,17 +3446,17 @@ $(SHL7TARGETN) : $(LINKINCTARGETS)
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL7LIBS)"!=""
-SHL7LINKLIST=$(MISC)$/$(SHL7TARGET)_link.lst
+SHL7LINKLIST=$(MISC)/$(SHL7TARGET)_link.lst
 SHL7LINKLISTPARAM=@$(SHL7LINKLIST)
 $(SHL7LINKLIST) : $(SHL7LIBS)
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL7LIBS)"!=""
 .ENDIF          # "$(COM)"!="GCC"
 .ENDIF
 .ENDIF			# "$(SHL7USE_EXPORTS)"=="name"
 
-$(MISC)$/%linkinc.ls:
+$(MISC)/%linkinc.ls:
     echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
@@ -3603,7 +3467,7 @@ SHL7TARGET8=$(shell @fix_shl $(SHL7TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
-_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL7STDLIBS:^"$(LB)$/") 
+_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL7STDLIBS:^"$(LB)/") 
 SHL7IMP_ORD = $(foreach,i,$(_SHL7IMP_ORD) $(shell @-ls $i))
 .ELSE
 SHL7IMP_ORD = 
@@ -3620,60 +3484,54 @@ $(SHL7TARGETN) : \
                     $(SHL7DEPN) \
                     $(SHL7IMP_ORD) \
                     $(SHL7LINKLIST)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL7TARGETN)
 .IF "$(GUI)" == "WNT"
 .IF "$(SHL7DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    @@-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc
 .IF "$(SHL7ICON)" != ""
-    @echo 1 ICON $(SHL7ICON) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    @echo 1 ICON $(SHL7ICON) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL7ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc
 .ELSE			# "$(SHL7ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL7DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL7DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL7DEFAULTRES:b).rc
 .ENDIF			# "$(SHL7ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL7TARGET)$(DLLPOST) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc
 .ENDIF			# "$(SHL7DEFAULTRES)"!=""
 .IF "$(SHL7ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL7ALLRES:s/res /res+/) $(SHL7LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
 .IF "$(COM)"=="GCC"
     windres $(SHL7LINKRES) $(SHL7LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL7ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
     @echo dlltool --input-def $(SHL7DEF) \
         --dllname $(SHL7TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_7.cmd
+        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_7.cmd
 .IF "$(DEFLIB7NAME)"!=""	# do not have to include objs
-    @echo 	--output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
+    @echo 	--output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_7.cmd
 .ELSE			# "$(DEFLIB7NAME)"!=""	# do not have to include objs
-    @echo	--output-exp $(MISC)$/$(@:b)_exp.o \
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
         $(STDOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \
-        `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`  >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
+        `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g`  >> $(MISC)/$(TARGET).$(@:b)_7.cmd
 .ENDIF			# "$(DEFLIB7NAME)"!=""
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \
-        `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+        `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
         -Wl,--exclude-libs,ALL,--start-group $(SHL7STDLIBS) -Wl,--end-group \
-        $(SHL7STDSHL) $(STDSHL7) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
+        $(SHL7STDSHL) $(STDSHL7) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
+        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL7USE_EXPORTS)"!="name"
@@ -3683,7 +3541,7 @@ $(SHL7TARGETN) : \
         $(LINKFLAGSSHL) \
         $(SHL7STACK) $(SHL7BASEX)	\
         -out:$@ \
-        -map:$(MISC)$/$(@:b).map \
+        -map:$(MISC)/$(@:b).map \
         -def:$(SHL7DEF) \
         $(USE_7IMPLIB) \
         $(STDOBJ) \
@@ -3697,7 +3555,7 @@ $(SHL7TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -3708,8 +3566,8 @@ $(SHL7TARGETN) : \
     $(SHL7LINKER) @$(mktmp	$(SHL7LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL7BASEX)		\
         $(SHL7STACK) -out:$(SHL7TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
-        $(LB)$/$(SHL7IMPLIB).exp				\
+        -map:$(MISC)/$(@:B).map				\
+        $(LB)/$(SHL7IMPLIB).exp				\
         $(STDOBJ)							\
         $(SHL7OBJS) $(SHL7VERSIONOBJ) \
         $(SHL7LIBS)                         \
@@ -3721,7 +3579,7 @@ $(SHL7TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -3733,7 +3591,7 @@ $(SHL7TARGETN) : \
     $(SHL7LINKER) @$(mktmp	$(SHL7LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL7BASEX)		\
         $(SHL7STACK) -out:$(SHL7TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
+        -map:$(MISC)/$(@:B).map				\
         $(USE_7IMPLIB) \
         $(STDOBJ)							\
         $(SHL7OBJS) $(SHL7VERSIONOBJ))   \
@@ -3744,7 +3602,7 @@ $(SHL7TARGETN) : \
     )
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -3753,25 +3611,25 @@ $(SHL7TARGETN) : \
     $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
 .ENDIF			# "$(SHL7USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
-        -$(RM) del $(MISC)$/$(SHL7TARGET).lnk
-        -$(RM) $(MISC)$/$(SHL7TARGET).lst
+        -$(RM) del $(MISC)/$(SHL7TARGET).lnk
+        -$(RM) $(MISC)/$(SHL7TARGET).lst
         $(TYPE) $(mktmp \
         $(SHL7LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL7BASEX) \
         $(SHL7STACK) $(MAPFILE) \
         -out:$@ \
-        $(LB)$/$(SHL7IMPLIB).exp \
+        $(LB)/$(SHL7IMPLIB).exp \
         $(STDOBJ) \
         $(SHL7OBJS) \
         $(SHL7STDLIBS) \
         $(SHL7STDSHL) $(STDSHL7) \
         $(SHL7LINKRES) \
-        ) >> $(MISC)$/$(SHL7TARGET).lnk
-        $(TYPE) $(MISC)$/$(SHL7TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL7TARGET).lnk
-        $(SHL7LINKER) @$(MISC)$/$(SHL7TARGET).lnk
+        ) >> $(MISC)/$(SHL7TARGET).lnk
+        $(TYPE) $(MISC)/$(SHL7TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL7TARGET).lnk
+        $(SHL7LINKER) @$(MISC)/$(SHL7TARGET).lnk
         @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -3783,82 +3641,70 @@ $(SHL7TARGETN) : \
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
     @echo $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
     $(SHL7VERSIONOBJ) \
-    `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
-    $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_7.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL7RPATH) $@
-	@echo "Making:   " $(@:f).jnilib
+    @echo "Making: $@.jnilib"
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL7NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN)
 .ENDIF				# "$(SHL7NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
-    @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
-		$(SHL7VERSIONOBJ) -o $@ \
-		`cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-		$(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
-.ENDIF
-    @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
+    $(SHL7VERSIONOBJ) -o $@ \
+    `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL7NOCHECK)"==""
-	$(QUIET_BUILD) -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-	$(QUIET_BUILD) $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-.IF "$(QUIET_BUILD)"==""
-	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-.ELSE
-	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) -- -s $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-.ENDIF
+    -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
+    $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
 .ENDIF				# "$(SHL7NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
 .IF "$(UNIXVERSIONNAMES)"!=""
-	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL7TARGETN:b)
-	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b)
+    $(RM) $(LB)/$(SHL7TARGETN:b)
+    cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(QUIET_BUILD)"==""
     @ls -l $@
-.ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
 .IF "$(GUI)" == "OS2"
 
 .IF "$(SHL7DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)$/$(SHL7DEFAULTRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc >& $(NULLDEV)
 .IF "$(SHL7ICON)" != ""
-    @-+echo 1 ICON $(SHL7ICON) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    @-+echo 1 ICON $(SHL7ICON) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL7ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    @-+echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc
 .ENDIF			# "$(SHL7ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL7DEFAULTRES:b).rc
+#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc
 .ENDIF			# "$(SHL7DEFAULTRES)"!=""
 
 .IF "$(SHL7ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) $(SHL7ALLRES:s/res /res+/) $(SHL7LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL7ALLRES)"!=""
 
 .IF "$(USE_DEFFILE)"!=""
@@ -3867,7 +3713,7 @@ $(SHL7TARGETN) : \
         $(SHL7DEF) \
         $(STDOBJ) \
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL7OBJS) $(SHL7VERSIONOBJ) \
         $(SHL7LIBS) \
         $(SHL7STDLIBS:^"-l") \
@@ -3882,7 +3728,7 @@ $(SHL7TARGETN) : \
         $(SHL7DEF) \
         $(STDOBJ)							\
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL7OBJS) $(SHL7VERSIONOBJ) \
         $(SHL7LIBS) \
         $(SHL7STDLIBS:^"-l") \
@@ -3906,7 +3752,7 @@ $(SHL7TARGETN) : \
 ALLTAR : runtest_$(SHL7TARGET)
 
 runtest_$(SHL7TARGET) : $(SHL7TARGETN)
-    testshl $(SHL7TARGETN) sce$/$(SHL7TARGET).sce -msg -skip
+    testshl $(SHL7TARGETN) sce/$(SHL7TARGET).sce -msg -skip
 .ENDIF			# "$(NO_TESTS)"==""
 .ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL7TARGETN)"!=""
@@ -3942,7 +3788,7 @@ LINKFLAGSRUNPATH_$(SHL8RPATH)*=/ERROR:/Bad_SHL8RPATH_value
 SHL8LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL8RPATH))
 
 .IF "$(SHL8USE_EXPORTS)"==""
-SHL8DEF*=$(MISC)$/$(SHL8TARGET).def
+SHL8DEF*=$(MISC)/$(SHL8TARGET).def
 .ENDIF			# "$(SHL8USE_EXPORTS)"==""
 
 EXTRALIBPATHS8=$(EXTRALIBPATHS)
@@ -3959,15 +3805,15 @@ EXTRALIBPATHS8+=-L$(SOLAR_STLLIBPATH)
 
 .IF "$(VERSIONOBJ)"!=""
 SHL8VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)$/$(SHL8VERSIONOBJ:b).h
+USE_VERSIONH:=$(INCCOM)/$(SHL8VERSIONOBJ:b).h
 .IF "$(GUI)" == "UNX"
 SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
 .ELSE           # "$(GUI)" == "UNX"
 SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f)
 .ENDIF          # "$(GUI)" == "UNX"
-$(MISC)$/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL8VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)$/src$/version.c $@
-	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@
+$(MISC)/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL8VERSIONOBJ:b).h
+#    $(COPY) $(SOLARENV)/src/version.c $@
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@
 
 .INIT : $(SHL8VERSIONOBJDEP)
 .ENDIF			# "$(VERSIONOBJ)"!=""
@@ -3978,13 +3824,13 @@ $(MISC)$/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL8VE
 SHL8IMPLIB=i$(TARGET)_t8
 .ENDIF			# "$(SHL8IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
-USE_8IMPLIB=-implib:$(LB)$/$(SHL8IMPLIB).lib
+USE_8IMPLIB=-implib:$(LB)/$(SHL8IMPLIB).lib
 .ENDIF			# "$(COM)" != "GCC"
-SHL8IMPLIBN=$(LB)$/$(SHL8IMPLIB).lib
+SHL8IMPLIBN=$(LB)/$(SHL8IMPLIB).lib
 ALLTAR : $(SHL8IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
-USE_8IMPLIB_DEPS=$(LB)$/$(SHL8IMPLIB).lib
+USE_8IMPLIB_DEPS=$(LB)/$(SHL8IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 USE_SHL8DEF=$(SHL8DEF)
@@ -3994,7 +3840,7 @@ SHL8DEPN+:=$(SHL8DEPNU)
 
 .IF "$(SHL8VERSIONMAP)"==""
 # to activate vmaps remove "#"
-USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap
+USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap
 .ENDIF			# "$(SHL8VERSIONMAP)"==""
 
 .IF "$(USE_SHL8VERSIONMAP)"!=""
@@ -4002,7 +3848,7 @@ USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap
 .IF "$(SHL8FILTERFILE)"!=""
 .IF "$(SHL8VERSIONMAP)"!=""
 #eine von beiden ist zuviel
-USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap
+USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap
 $(USE_SHL8VERSIONMAP) .PHONY:
     @echo -----------------------------
     @echo you should only use versionmap OR exportfile
@@ -4029,27 +3875,23 @@ $(USE_SHL8VERSIONMAP): \
 .ENDIF
 .ENDIF			# "$(SHL8OBJS)!"=""
     @$(TYPE) /dev/null $(SHL8LIBS:s/.lib/.dump/) >> $@.dump
-	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL8INTERFACE) -f $(SHL8FILTERFILE) -m $@
+    $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL8INTERFACE) -f $(SHL8FILTERFILE) -m $@
 
 .ELSE			# "$(SHL8FILTERFILE)"!=""
-USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap
+USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap
 $(USE_SHL8VERSIONMAP) :
-.IF "$(QUIET_BUILD)"==""
     @echo -----------------------------
     @echo SHL8FILTERFILE not set!
     @echo -----------------------------
     @$(TOUCH) $@
     @echo dummy file to keep the dependencies for later use.
-.ELSE
-	@$(TOUCH) $@
-.ENDIF
 #	force_dmake_to_error
 .ENDIF			# "$(SHL8FILTERFILE)"!=""
 .ELSE			# "$(USE_SHL8VERSIONMAP)"!=""
 
 #and now for the plain non-generic way...
 .IF "$(SHL8VERSIONMAP)"!=""
-USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e)
+USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e)
 .IF "$(OS)"!="IRIX"
 SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
 .ENDIF
@@ -4069,25 +3911,25 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP)
 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
 # happens if somebody will change it in the future
 .IF "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .ELIF "$(COMNAME)"=="sunpro5"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL8VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
+    tr -d "\015" < $(SHL8VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
 .ELSE           # "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL8VERSIONMAP) > $@
+    tr -d "\015" < $(SHL8VERSIONMAP) > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod a+w $@
 # Mac OS X post-processing generate an exported symbols list from the generated map file
 # for details on exported symbols list see man ld on Mac OS X
 .IF "$(OS)"=="MACOSX"
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
 .IF "$(SHL8OBJS)"!=""
-    -echo $(foreach,i,$(SHL8OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -echo $(foreach,i,$(SHL8OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 .IF "$(SHL8LIBS)"!=""
-    -$(TYPE) $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -$(TYPE) $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
@@ -4111,15 +3953,15 @@ SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\"
 
 .IF "$(SHL8RES)"!=""
 SHL8ALLRES+=$(SHL8RES)
-SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res
-SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o
+SHL8LINKRES*=$(MISC)/$(SHL8TARGET).res
+SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o
 .ENDIF			# "$(SHL8RES)"!=""
 
 .IF "$(SHL8DEFAULTRES)$(use_shl_versions)"!=""
-SHL8DEFAULTRES*=$(MISC)$/$(SHL8TARGET)_def.res
+SHL8DEFAULTRES*=$(MISC)/$(SHL8TARGET)_def.res
 SHL8ALLRES+=$(SHL8DEFAULTRES)
-SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res
-SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o
+SHL8LINKRES*=$(MISC)/$(SHL8TARGET).res
+SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o
 .ENDIF			# "$(SHL8DEFAULTRES)$(use_shl_versions)"!=""
 
 #.IF "$(SHL8TARGETN)"!=""
@@ -4127,13 +3969,13 @@ SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(SHL8LIBS)"!=""
-$(MISC)$/$(SHL8TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(SHL8TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL8LIBS)"!=""
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(SHL8TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(SHL8TARGETN:b)_linkinc.ls
 $(SHL8TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
@@ -4141,17 +3983,17 @@ $(SHL8TARGETN) : $(LINKINCTARGETS)
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL8LIBS)"!=""
-SHL8LINKLIST=$(MISC)$/$(SHL8TARGET)_link.lst
+SHL8LINKLIST=$(MISC)/$(SHL8TARGET)_link.lst
 SHL8LINKLISTPARAM=@$(SHL8LINKLIST)
 $(SHL8LINKLIST) : $(SHL8LIBS)
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL8LIBS)"!=""
 .ENDIF          # "$(COM)"!="GCC"
 .ENDIF
 .ENDIF			# "$(SHL8USE_EXPORTS)"=="name"
 
-$(MISC)$/%linkinc.ls:
+$(MISC)/%linkinc.ls:
     echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
@@ -4162,7 +4004,7 @@ SHL8TARGET8=$(shell @fix_shl $(SHL8TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
-_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL8STDLIBS:^"$(LB)$/") 
+_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL8STDLIBS:^"$(LB)/") 
 SHL8IMP_ORD = $(foreach,i,$(_SHL8IMP_ORD) $(shell @-ls $i))
 .ELSE
 SHL8IMP_ORD = 
@@ -4179,60 +4021,54 @@ $(SHL8TARGETN) : \
                     $(SHL8DEPN) \
                     $(SHL8IMP_ORD) \
                     $(SHL8LINKLIST)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL8TARGETN)
 .IF "$(GUI)" == "WNT"
 .IF "$(SHL8DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    @@-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc
 .IF "$(SHL8ICON)" != ""
-    @echo 1 ICON $(SHL8ICON) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    @echo 1 ICON $(SHL8ICON) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL8ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc
 .ELSE			# "$(SHL8ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL8DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL8DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL8DEFAULTRES:b).rc
 .ENDIF			# "$(SHL8ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL8TARGET)$(DLLPOST) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc
 .ENDIF			# "$(SHL8DEFAULTRES)"!=""
 .IF "$(SHL8ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL8ALLRES:s/res /res+/) $(SHL8LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
 .IF "$(COM)"=="GCC"
     windres $(SHL8LINKRES) $(SHL8LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL8ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
     @echo dlltool --input-def $(SHL8DEF) \
         --dllname $(SHL8TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_8.cmd
+        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_8.cmd
 .IF "$(DEFLIB8NAME)"!=""	# do not have to include objs
-    @echo 	--output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
+    @echo 	--output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_8.cmd
 .ELSE			# "$(DEFLIB8NAME)"!=""	# do not have to include objs
-    @echo	--output-exp $(MISC)$/$(@:b)_exp.o \
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
         $(STDOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \
-        `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`  >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
+        `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g`  >> $(MISC)/$(TARGET).$(@:b)_8.cmd
 .ENDIF			# "$(DEFLIB8NAME)"!=""
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \
-        `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+        `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
         -Wl,--exclude-libs,ALL,--start-group $(SHL8STDLIBS) -Wl,--end-group \
-        $(SHL8STDSHL) $(STDSHL8) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
+        $(SHL8STDSHL) $(STDSHL8) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
+        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL8USE_EXPORTS)"!="name"
@@ -4242,7 +4078,7 @@ $(SHL8TARGETN) : \
         $(LINKFLAGSSHL) \
         $(SHL8STACK) $(SHL8BASEX)	\
         -out:$@ \
-        -map:$(MISC)$/$(@:b).map \
+        -map:$(MISC)/$(@:b).map \
         -def:$(SHL8DEF) \
         $(USE_8IMPLIB) \
         $(STDOBJ) \
@@ -4256,7 +4092,7 @@ $(SHL8TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -4267,8 +4103,8 @@ $(SHL8TARGETN) : \
     $(SHL8LINKER) @$(mktmp	$(SHL8LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL8BASEX)		\
         $(SHL8STACK) -out:$(SHL8TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
-        $(LB)$/$(SHL8IMPLIB).exp				\
+        -map:$(MISC)/$(@:B).map				\
+        $(LB)/$(SHL8IMPLIB).exp				\
         $(STDOBJ)							\
         $(SHL8OBJS) $(SHL8VERSIONOBJ) \
         $(SHL8LIBS)                         \
@@ -4280,7 +4116,7 @@ $(SHL8TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -4292,7 +4128,7 @@ $(SHL8TARGETN) : \
     $(SHL8LINKER) @$(mktmp	$(SHL8LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL8BASEX)		\
         $(SHL8STACK) -out:$(SHL8TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
+        -map:$(MISC)/$(@:B).map				\
         $(USE_8IMPLIB) \
         $(STDOBJ)							\
         $(SHL8OBJS) $(SHL8VERSIONOBJ))   \
@@ -4303,7 +4139,7 @@ $(SHL8TARGETN) : \
     )
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -4312,25 +4148,25 @@ $(SHL8TARGETN) : \
     $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
 .ENDIF			# "$(SHL8USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
-        -$(RM) del $(MISC)$/$(SHL8TARGET).lnk
-        -$(RM) $(MISC)$/$(SHL8TARGET).lst
+        -$(RM) del $(MISC)/$(SHL8TARGET).lnk
+        -$(RM) $(MISC)/$(SHL8TARGET).lst
         $(TYPE) $(mktmp \
         $(SHL8LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL8BASEX) \
         $(SHL8STACK) $(MAPFILE) \
         -out:$@ \
-        $(LB)$/$(SHL8IMPLIB).exp \
+        $(LB)/$(SHL8IMPLIB).exp \
         $(STDOBJ) \
         $(SHL8OBJS) \
         $(SHL8STDLIBS) \
         $(SHL8STDSHL) $(STDSHL8) \
         $(SHL8LINKRES) \
-        ) >> $(MISC)$/$(SHL8TARGET).lnk
-        $(TYPE) $(MISC)$/$(SHL8TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL8TARGET).lnk
-        $(SHL8LINKER) @$(MISC)$/$(SHL8TARGET).lnk
+        ) >> $(MISC)/$(SHL8TARGET).lnk
+        $(TYPE) $(MISC)/$(SHL8TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL8TARGET).lnk
+        $(SHL8LINKER) @$(MISC)/$(SHL8TARGET).lnk
         @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -4342,82 +4178,70 @@ $(SHL8TARGETN) : \
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
     @echo $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
     $(SHL8VERSIONOBJ) \
-    `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
-    $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_8.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL8RPATH) $@
-	@echo "Making:   " $(@:f).jnilib
+    @echo "Making: $@.jnilib"
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL8NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN)
 .ENDIF				# "$(SHL8NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
-    @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
-		$(SHL8VERSIONOBJ) -o $@ \
-		`cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-		$(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
-.ENDIF
-    @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
+    $(SHL8VERSIONOBJ) -o $@ \
+    `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL8NOCHECK)"==""
-	$(QUIET_BUILD) -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-	$(QUIET_BUILD) $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-.IF "$(QUIET_BUILD)"==""
-	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-.ELSE
-	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) -- -s $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-.ENDIF
+    -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
+    $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
 .ENDIF				# "$(SHL8NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
 .IF "$(UNIXVERSIONNAMES)"!=""
-	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL8TARGETN:b)
-	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b)
+    $(RM) $(LB)/$(SHL8TARGETN:b)
+    cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(QUIET_BUILD)"==""
     @ls -l $@
-.ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
 .IF "$(GUI)" == "OS2"
 
 .IF "$(SHL8DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)$/$(SHL8DEFAULTRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc >& $(NULLDEV)
 .IF "$(SHL8ICON)" != ""
-    @-+echo 1 ICON $(SHL8ICON) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    @-+echo 1 ICON $(SHL8ICON) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL8ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    @-+echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc
 .ENDIF			# "$(SHL8ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL8DEFAULTRES:b).rc
+#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc
 .ENDIF			# "$(SHL8DEFAULTRES)"!=""
 
 .IF "$(SHL8ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) $(SHL8ALLRES:s/res /res+/) $(SHL8LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL8ALLRES)"!=""
 
 .IF "$(USE_DEFFILE)"!=""
@@ -4426,7 +4250,7 @@ $(SHL8TARGETN) : \
         $(SHL8DEF) \
         $(STDOBJ) \
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL8OBJS) $(SHL8VERSIONOBJ) \
         $(SHL8LIBS) \
         $(SHL8STDLIBS:^"-l") \
@@ -4441,7 +4265,7 @@ $(SHL8TARGETN) : \
         $(SHL8DEF) \
         $(STDOBJ)							\
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL8OBJS) $(SHL8VERSIONOBJ) \
         $(SHL8LIBS) \
         $(SHL8STDLIBS:^"-l") \
@@ -4465,7 +4289,7 @@ $(SHL8TARGETN) : \
 ALLTAR : runtest_$(SHL8TARGET)
 
 runtest_$(SHL8TARGET) : $(SHL8TARGETN)
-    testshl $(SHL8TARGETN) sce$/$(SHL8TARGET).sce -msg -skip
+    testshl $(SHL8TARGETN) sce/$(SHL8TARGET).sce -msg -skip
 .ENDIF			# "$(NO_TESTS)"==""
 .ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL8TARGETN)"!=""
@@ -4501,7 +4325,7 @@ LINKFLAGSRUNPATH_$(SHL9RPATH)*=/ERROR:/Bad_SHL9RPATH_value
 SHL9LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL9RPATH))
 
 .IF "$(SHL9USE_EXPORTS)"==""
-SHL9DEF*=$(MISC)$/$(SHL9TARGET).def
+SHL9DEF*=$(MISC)/$(SHL9TARGET).def
 .ENDIF			# "$(SHL9USE_EXPORTS)"==""
 
 EXTRALIBPATHS9=$(EXTRALIBPATHS)
@@ -4518,15 +4342,15 @@ EXTRALIBPATHS9+=-L$(SOLAR_STLLIBPATH)
 
 .IF "$(VERSIONOBJ)"!=""
 SHL9VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)$/$(SHL9VERSIONOBJ:b).h
+USE_VERSIONH:=$(INCCOM)/$(SHL9VERSIONOBJ:b).h
 .IF "$(GUI)" == "UNX"
 SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
 .ELSE           # "$(GUI)" == "UNX"
 SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f)
 .ENDIF          # "$(GUI)" == "UNX"
-$(MISC)$/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL9VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)$/src$/version.c $@
-	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@
+$(MISC)/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL9VERSIONOBJ:b).h
+#    $(COPY) $(SOLARENV)/src/version.c $@
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@
 
 .INIT : $(SHL9VERSIONOBJDEP)
 .ENDIF			# "$(VERSIONOBJ)"!=""
@@ -4537,13 +4361,13 @@ $(MISC)$/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL9VE
 SHL9IMPLIB=i$(TARGET)_t9
 .ENDIF			# "$(SHL9IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
-USE_9IMPLIB=-implib:$(LB)$/$(SHL9IMPLIB).lib
+USE_9IMPLIB=-implib:$(LB)/$(SHL9IMPLIB).lib
 .ENDIF			# "$(COM)" != "GCC"
-SHL9IMPLIBN=$(LB)$/$(SHL9IMPLIB).lib
+SHL9IMPLIBN=$(LB)/$(SHL9IMPLIB).lib
 ALLTAR : $(SHL9IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
-USE_9IMPLIB_DEPS=$(LB)$/$(SHL9IMPLIB).lib
+USE_9IMPLIB_DEPS=$(LB)/$(SHL9IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 USE_SHL9DEF=$(SHL9DEF)
@@ -4553,7 +4377,7 @@ SHL9DEPN+:=$(SHL9DEPNU)
 
 .IF "$(SHL9VERSIONMAP)"==""
 # to activate vmaps remove "#"
-USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap
+USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap
 .ENDIF			# "$(SHL9VERSIONMAP)"==""
 
 .IF "$(USE_SHL9VERSIONMAP)"!=""
@@ -4561,7 +4385,7 @@ USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap
 .IF "$(SHL9FILTERFILE)"!=""
 .IF "$(SHL9VERSIONMAP)"!=""
 #eine von beiden ist zuviel
-USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap
+USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap
 $(USE_SHL9VERSIONMAP) .PHONY:
     @echo -----------------------------
     @echo you should only use versionmap OR exportfile
@@ -4588,27 +4412,23 @@ $(USE_SHL9VERSIONMAP): \
 .ENDIF
 .ENDIF			# "$(SHL9OBJS)!"=""
     @$(TYPE) /dev/null $(SHL9LIBS:s/.lib/.dump/) >> $@.dump
-	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL9INTERFACE) -f $(SHL9FILTERFILE) -m $@
+    $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL9INTERFACE) -f $(SHL9FILTERFILE) -m $@
 
 .ELSE			# "$(SHL9FILTERFILE)"!=""
-USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap
+USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap
 $(USE_SHL9VERSIONMAP) :
-.IF "$(QUIET_BUILD)"==""
     @echo -----------------------------
     @echo SHL9FILTERFILE not set!
     @echo -----------------------------
     @$(TOUCH) $@
     @echo dummy file to keep the dependencies for later use.
-.ELSE
-	@$(TOUCH) $@
-.ENDIF
 #	force_dmake_to_error
 .ENDIF			# "$(SHL9FILTERFILE)"!=""
 .ELSE			# "$(USE_SHL9VERSIONMAP)"!=""
 
 #and now for the plain non-generic way...
 .IF "$(SHL9VERSIONMAP)"!=""
-USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e)
+USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e)
 .IF "$(OS)"!="IRIX"
 SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
 .ENDIF
@@ -4628,25 +4448,25 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP)
 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
 # happens if somebody will change it in the future
 .IF "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .ELIF "$(COMNAME)"=="sunpro5"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL9VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
+    tr -d "\015" < $(SHL9VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
 .ELSE           # "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL9VERSIONMAP) > $@
+    tr -d "\015" < $(SHL9VERSIONMAP) > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod a+w $@
 # Mac OS X post-processing generate an exported symbols list from the generated map file
 # for details on exported symbols list see man ld on Mac OS X
 .IF "$(OS)"=="MACOSX"
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
 .IF "$(SHL9OBJS)"!=""
-    -echo $(foreach,i,$(SHL9OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -echo $(foreach,i,$(SHL9OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 .IF "$(SHL9LIBS)"!=""
-    -$(TYPE) $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -$(TYPE) $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
@@ -4670,15 +4490,15 @@ SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\"
 
 .IF "$(SHL9RES)"!=""
 SHL9ALLRES+=$(SHL9RES)
-SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res
-SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o
+SHL9LINKRES*=$(MISC)/$(SHL9TARGET).res
+SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o
 .ENDIF			# "$(SHL9RES)"!=""
 
 .IF "$(SHL9DEFAULTRES)$(use_shl_versions)"!=""
-SHL9DEFAULTRES*=$(MISC)$/$(SHL9TARGET)_def.res
+SHL9DEFAULTRES*=$(MISC)/$(SHL9TARGET)_def.res
 SHL9ALLRES+=$(SHL9DEFAULTRES)
-SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res
-SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o
+SHL9LINKRES*=$(MISC)/$(SHL9TARGET).res
+SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o
 .ENDIF			# "$(SHL9DEFAULTRES)$(use_shl_versions)"!=""
 
 #.IF "$(SHL9TARGETN)"!=""
@@ -4686,13 +4506,13 @@ SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(SHL9LIBS)"!=""
-$(MISC)$/$(SHL9TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(SHL9TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL9LIBS)"!=""
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(SHL9TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(SHL9TARGETN:b)_linkinc.ls
 $(SHL9TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
@@ -4700,17 +4520,17 @@ $(SHL9TARGETN) : $(LINKINCTARGETS)
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL9LIBS)"!=""
-SHL9LINKLIST=$(MISC)$/$(SHL9TARGET)_link.lst
+SHL9LINKLIST=$(MISC)/$(SHL9TARGET)_link.lst
 SHL9LINKLISTPARAM=@$(SHL9LINKLIST)
 $(SHL9LINKLIST) : $(SHL9LIBS)
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL9LIBS)"!=""
 .ENDIF          # "$(COM)"!="GCC"
 .ENDIF
 .ENDIF			# "$(SHL9USE_EXPORTS)"=="name"
 
-$(MISC)$/%linkinc.ls:
+$(MISC)/%linkinc.ls:
     echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
@@ -4721,7 +4541,7 @@ SHL9TARGET8=$(shell @fix_shl $(SHL9TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
-_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL9STDLIBS:^"$(LB)$/") 
+_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL9STDLIBS:^"$(LB)/") 
 SHL9IMP_ORD = $(foreach,i,$(_SHL9IMP_ORD) $(shell @-ls $i))
 .ELSE
 SHL9IMP_ORD = 
@@ -4738,60 +4558,54 @@ $(SHL9TARGETN) : \
                     $(SHL9DEPN) \
                     $(SHL9IMP_ORD) \
                     $(SHL9LINKLIST)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL9TARGETN)
 .IF "$(GUI)" == "WNT"
 .IF "$(SHL9DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    @@-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc
 .IF "$(SHL9ICON)" != ""
-    @echo 1 ICON $(SHL9ICON) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    @echo 1 ICON $(SHL9ICON) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL9ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc
 .ELSE			# "$(SHL9ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL9DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL9DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL9DEFAULTRES:b).rc
 .ENDIF			# "$(SHL9ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL9TARGET)$(DLLPOST) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc
 .ENDIF			# "$(SHL9DEFAULTRES)"!=""
 .IF "$(SHL9ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL9ALLRES:s/res /res+/) $(SHL9LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
 .IF "$(COM)"=="GCC"
     windres $(SHL9LINKRES) $(SHL9LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL9ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
     @echo dlltool --input-def $(SHL9DEF) \
         --dllname $(SHL9TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_9.cmd
+        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_9.cmd
 .IF "$(DEFLIB9NAME)"!=""	# do not have to include objs
-    @echo 	--output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
+    @echo 	--output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_9.cmd
 .ELSE			# "$(DEFLIB9NAME)"!=""	# do not have to include objs
-    @echo	--output-exp $(MISC)$/$(@:b)_exp.o \
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
         $(STDOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \
-        `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`  >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
+        `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g`  >> $(MISC)/$(TARGET).$(@:b)_9.cmd
 .ENDIF			# "$(DEFLIB9NAME)"!=""
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \
-        `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+        `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
         -Wl,--exclude-libs,ALL,--start-group $(SHL9STDLIBS) -Wl,--end-group \
-        $(SHL9STDSHL) $(STDSHL9) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
+        $(SHL9STDSHL) $(STDSHL9) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
+        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL9USE_EXPORTS)"!="name"
@@ -4801,7 +4615,7 @@ $(SHL9TARGETN) : \
         $(LINKFLAGSSHL) \
         $(SHL9STACK) $(SHL9BASEX)	\
         -out:$@ \
-        -map:$(MISC)$/$(@:b).map \
+        -map:$(MISC)/$(@:b).map \
         -def:$(SHL9DEF) \
         $(USE_9IMPLIB) \
         $(STDOBJ) \
@@ -4815,7 +4629,7 @@ $(SHL9TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -4826,8 +4640,8 @@ $(SHL9TARGETN) : \
     $(SHL9LINKER) @$(mktmp	$(SHL9LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL9BASEX)		\
         $(SHL9STACK) -out:$(SHL9TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
-        $(LB)$/$(SHL9IMPLIB).exp				\
+        -map:$(MISC)/$(@:B).map				\
+        $(LB)/$(SHL9IMPLIB).exp				\
         $(STDOBJ)							\
         $(SHL9OBJS) $(SHL9VERSIONOBJ) \
         $(SHL9LIBS)                         \
@@ -4839,7 +4653,7 @@ $(SHL9TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -4851,7 +4665,7 @@ $(SHL9TARGETN) : \
     $(SHL9LINKER) @$(mktmp	$(SHL9LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL9BASEX)		\
         $(SHL9STACK) -out:$(SHL9TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
+        -map:$(MISC)/$(@:B).map				\
         $(USE_9IMPLIB) \
         $(STDOBJ)							\
         $(SHL9OBJS) $(SHL9VERSIONOBJ))   \
@@ -4862,7 +4676,7 @@ $(SHL9TARGETN) : \
     )
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -4871,25 +4685,25 @@ $(SHL9TARGETN) : \
     $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
 .ENDIF			# "$(SHL9USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
-        -$(RM) del $(MISC)$/$(SHL9TARGET).lnk
-        -$(RM) $(MISC)$/$(SHL9TARGET).lst
+        -$(RM) del $(MISC)/$(SHL9TARGET).lnk
+        -$(RM) $(MISC)/$(SHL9TARGET).lst
         $(TYPE) $(mktmp \
         $(SHL9LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL9BASEX) \
         $(SHL9STACK) $(MAPFILE) \
         -out:$@ \
-        $(LB)$/$(SHL9IMPLIB).exp \
+        $(LB)/$(SHL9IMPLIB).exp \
         $(STDOBJ) \
         $(SHL9OBJS) \
         $(SHL9STDLIBS) \
         $(SHL9STDSHL) $(STDSHL9) \
         $(SHL9LINKRES) \
-        ) >> $(MISC)$/$(SHL9TARGET).lnk
-        $(TYPE) $(MISC)$/$(SHL9TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL9TARGET).lnk
-        $(SHL9LINKER) @$(MISC)$/$(SHL9TARGET).lnk
+        ) >> $(MISC)/$(SHL9TARGET).lnk
+        $(TYPE) $(MISC)/$(SHL9TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL9TARGET).lnk
+        $(SHL9LINKER) @$(MISC)/$(SHL9TARGET).lnk
         @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -4901,82 +4715,70 @@ $(SHL9TARGETN) : \
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
     @echo $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
     $(SHL9VERSIONOBJ) \
-    `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
-    $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_9.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL9RPATH) $@
-	@echo "Making:   " $(@:f).jnilib
+    @echo "Making: $@.jnilib"
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL9NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN)
 .ENDIF				# "$(SHL9NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
-    @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
-		$(SHL9VERSIONOBJ) -o $@ \
-		`cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-		$(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
-.ENDIF
-    @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
+    $(SHL9VERSIONOBJ) -o $@ \
+    `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL9NOCHECK)"==""
-	$(QUIET_BUILD) -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-	$(QUIET_BUILD) $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-.IF "$(QUIET_BUILD)"==""
-	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-.ELSE
-	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) -- -s $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-.ENDIF
+    -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
+    $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
 .ENDIF				# "$(SHL9NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
 .IF "$(UNIXVERSIONNAMES)"!=""
-	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL9TARGETN:b)
-	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b)
+    $(RM) $(LB)/$(SHL9TARGETN:b)
+    cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(QUIET_BUILD)"==""
     @ls -l $@
-.ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
 .IF "$(GUI)" == "OS2"
 
 .IF "$(SHL9DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)$/$(SHL9DEFAULTRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc >& $(NULLDEV)
 .IF "$(SHL9ICON)" != ""
-    @-+echo 1 ICON $(SHL9ICON) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    @-+echo 1 ICON $(SHL9ICON) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL9ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    @-+echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc
 .ENDIF			# "$(SHL9ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL9DEFAULTRES:b).rc
+#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc
 .ENDIF			# "$(SHL9DEFAULTRES)"!=""
 
 .IF "$(SHL9ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) $(SHL9ALLRES:s/res /res+/) $(SHL9LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL9ALLRES)"!=""
 
 .IF "$(USE_DEFFILE)"!=""
@@ -4985,7 +4787,7 @@ $(SHL9TARGETN) : \
         $(SHL9DEF) \
         $(STDOBJ) \
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL9OBJS) $(SHL9VERSIONOBJ) \
         $(SHL9LIBS) \
         $(SHL9STDLIBS:^"-l") \
@@ -5000,7 +4802,7 @@ $(SHL9TARGETN) : \
         $(SHL9DEF) \
         $(STDOBJ)							\
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL9OBJS) $(SHL9VERSIONOBJ) \
         $(SHL9LIBS) \
         $(SHL9STDLIBS:^"-l") \
@@ -5024,7 +4826,7 @@ $(SHL9TARGETN) : \
 ALLTAR : runtest_$(SHL9TARGET)
 
 runtest_$(SHL9TARGET) : $(SHL9TARGETN)
-    testshl $(SHL9TARGETN) sce$/$(SHL9TARGET).sce -msg -skip
+    testshl $(SHL9TARGETN) sce/$(SHL9TARGET).sce -msg -skip
 .ENDIF			# "$(NO_TESTS)"==""
 .ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL9TARGETN)"!=""
@@ -5060,7 +4862,7 @@ LINKFLAGSRUNPATH_$(SHL10RPATH)*=/ERROR:/Bad_SHL10RPATH_value
 SHL10LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL10RPATH))
 
 .IF "$(SHL10USE_EXPORTS)"==""
-SHL10DEF*=$(MISC)$/$(SHL10TARGET).def
+SHL10DEF*=$(MISC)/$(SHL10TARGET).def
 .ENDIF			# "$(SHL10USE_EXPORTS)"==""
 
 EXTRALIBPATHS10=$(EXTRALIBPATHS)
@@ -5077,15 +4879,15 @@ EXTRALIBPATHS10+=-L$(SOLAR_STLLIBPATH)
 
 .IF "$(VERSIONOBJ)"!=""
 SHL10VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)$/$(SHL10VERSIONOBJ:b).h
+USE_VERSIONH:=$(INCCOM)/$(SHL10VERSIONOBJ:b).h
 .IF "$(GUI)" == "UNX"
 SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
 .ELSE           # "$(GUI)" == "UNX"
 SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f)
 .ENDIF          # "$(GUI)" == "UNX"
-$(MISC)$/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL10VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)$/src$/version.c $@
-	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@
+$(MISC)/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL10VERSIONOBJ:b).h
+#    $(COPY) $(SOLARENV)/src/version.c $@
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@
 
 .INIT : $(SHL10VERSIONOBJDEP)
 .ENDIF			# "$(VERSIONOBJ)"!=""
@@ -5096,13 +4898,13 @@ $(MISC)$/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL10
 SHL10IMPLIB=i$(TARGET)_t10
 .ENDIF			# "$(SHL10IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
-USE_10IMPLIB=-implib:$(LB)$/$(SHL10IMPLIB).lib
+USE_10IMPLIB=-implib:$(LB)/$(SHL10IMPLIB).lib
 .ENDIF			# "$(COM)" != "GCC"
-SHL10IMPLIBN=$(LB)$/$(SHL10IMPLIB).lib
+SHL10IMPLIBN=$(LB)/$(SHL10IMPLIB).lib
 ALLTAR : $(SHL10IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
-USE_10IMPLIB_DEPS=$(LB)$/$(SHL10IMPLIB).lib
+USE_10IMPLIB_DEPS=$(LB)/$(SHL10IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 USE_SHL10DEF=$(SHL10DEF)
@@ -5112,7 +4914,7 @@ SHL10DEPN+:=$(SHL10DEPNU)
 
 .IF "$(SHL10VERSIONMAP)"==""
 # to activate vmaps remove "#"
-USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap
+USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap
 .ENDIF			# "$(SHL10VERSIONMAP)"==""
 
 .IF "$(USE_SHL10VERSIONMAP)"!=""
@@ -5120,7 +4922,7 @@ USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap
 .IF "$(SHL10FILTERFILE)"!=""
 .IF "$(SHL10VERSIONMAP)"!=""
 #eine von beiden ist zuviel
-USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap
+USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap
 $(USE_SHL10VERSIONMAP) .PHONY:
     @echo -----------------------------
     @echo you should only use versionmap OR exportfile
@@ -5147,27 +4949,23 @@ $(USE_SHL10VERSIONMAP): \
 .ENDIF
 .ENDIF			# "$(SHL10OBJS)!"=""
     @$(TYPE) /dev/null $(SHL10LIBS:s/.lib/.dump/) >> $@.dump
-	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL10INTERFACE) -f $(SHL10FILTERFILE) -m $@
+    $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL10INTERFACE) -f $(SHL10FILTERFILE) -m $@
 
 .ELSE			# "$(SHL10FILTERFILE)"!=""
-USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap
+USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap
 $(USE_SHL10VERSIONMAP) :
-.IF "$(QUIET_BUILD)"==""
     @echo -----------------------------
     @echo SHL10FILTERFILE not set!
     @echo -----------------------------
     @$(TOUCH) $@
     @echo dummy file to keep the dependencies for later use.
-.ELSE
-	@$(TOUCH) $@
-.ENDIF
 #	force_dmake_to_error
 .ENDIF			# "$(SHL10FILTERFILE)"!=""
 .ELSE			# "$(USE_SHL10VERSIONMAP)"!=""
 
 #and now for the plain non-generic way...
 .IF "$(SHL10VERSIONMAP)"!=""
-USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e)
+USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e)
 .IF "$(OS)"!="IRIX"
 SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
 .ENDIF
@@ -5187,25 +4985,25 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP)
 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
 # happens if somebody will change it in the future
 .IF "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .ELIF "$(COMNAME)"=="sunpro5"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL10VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
+    tr -d "\015" < $(SHL10VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
 .ELSE           # "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL10VERSIONMAP) > $@
+    tr -d "\015" < $(SHL10VERSIONMAP) > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod a+w $@
 # Mac OS X post-processing generate an exported symbols list from the generated map file
 # for details on exported symbols list see man ld on Mac OS X
 .IF "$(OS)"=="MACOSX"
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
 .IF "$(SHL10OBJS)"!=""
-    -echo $(foreach,i,$(SHL10OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -echo $(foreach,i,$(SHL10OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 .IF "$(SHL10LIBS)"!=""
-    -$(TYPE) $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -$(TYPE) $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
@@ -5229,15 +5027,15 @@ SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\"
 
 .IF "$(SHL10RES)"!=""
 SHL10ALLRES+=$(SHL10RES)
-SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res
-SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o
+SHL10LINKRES*=$(MISC)/$(SHL10TARGET).res
+SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o
 .ENDIF			# "$(SHL10RES)"!=""
 
 .IF "$(SHL10DEFAULTRES)$(use_shl_versions)"!=""
-SHL10DEFAULTRES*=$(MISC)$/$(SHL10TARGET)_def.res
+SHL10DEFAULTRES*=$(MISC)/$(SHL10TARGET)_def.res
 SHL10ALLRES+=$(SHL10DEFAULTRES)
-SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res
-SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o
+SHL10LINKRES*=$(MISC)/$(SHL10TARGET).res
+SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o
 .ENDIF			# "$(SHL10DEFAULTRES)$(use_shl_versions)"!=""
 
 #.IF "$(SHL10TARGETN)"!=""
@@ -5245,13 +5043,13 @@ SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(SHL10LIBS)"!=""
-$(MISC)$/$(SHL10TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(SHL10TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL10LIBS)"!=""
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(SHL10TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(SHL10TARGETN:b)_linkinc.ls
 $(SHL10TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
@@ -5259,17 +5057,17 @@ $(SHL10TARGETN) : $(LINKINCTARGETS)
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL10LIBS)"!=""
-SHL10LINKLIST=$(MISC)$/$(SHL10TARGET)_link.lst
+SHL10LINKLIST=$(MISC)/$(SHL10TARGET)_link.lst
 SHL10LINKLISTPARAM=@$(SHL10LINKLIST)
 $(SHL10LINKLIST) : $(SHL10LIBS)
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL10LIBS)"!=""
 .ENDIF          # "$(COM)"!="GCC"
 .ENDIF
 .ENDIF			# "$(SHL10USE_EXPORTS)"=="name"
 
-$(MISC)$/%linkinc.ls:
+$(MISC)/%linkinc.ls:
     echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
@@ -5280,7 +5078,7 @@ SHL10TARGET8=$(shell @fix_shl $(SHL10TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
-_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL10STDLIBS:^"$(LB)$/") 
+_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL10STDLIBS:^"$(LB)/") 
 SHL10IMP_ORD = $(foreach,i,$(_SHL10IMP_ORD) $(shell @-ls $i))
 .ELSE
 SHL10IMP_ORD = 
@@ -5297,60 +5095,54 @@ $(SHL10TARGETN) : \
                     $(SHL10DEPN) \
                     $(SHL10IMP_ORD) \
                     $(SHL10LINKLIST)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL10TARGETN)
 .IF "$(GUI)" == "WNT"
 .IF "$(SHL10DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    @@-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc
 .IF "$(SHL10ICON)" != ""
-    @echo 1 ICON $(SHL10ICON) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    @echo 1 ICON $(SHL10ICON) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL10ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc
 .ELSE			# "$(SHL10ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL10DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL10DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL10DEFAULTRES:b).rc
 .ENDIF			# "$(SHL10ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL10TARGET)$(DLLPOST) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc
 .ENDIF			# "$(SHL10DEFAULTRES)"!=""
 .IF "$(SHL10ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL10ALLRES:s/res /res+/) $(SHL10LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
 .IF "$(COM)"=="GCC"
     windres $(SHL10LINKRES) $(SHL10LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL10ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
     @echo dlltool --input-def $(SHL10DEF) \
         --dllname $(SHL10TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_10.cmd
+        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_10.cmd
 .IF "$(DEFLIB10NAME)"!=""	# do not have to include objs
-    @echo 	--output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
+    @echo 	--output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_10.cmd
 .ELSE			# "$(DEFLIB10NAME)"!=""	# do not have to include objs
-    @echo	--output-exp $(MISC)$/$(@:b)_exp.o \
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
         $(STDOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \
-        `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`  >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
+        `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g`  >> $(MISC)/$(TARGET).$(@:b)_10.cmd
 .ENDIF			# "$(DEFLIB10NAME)"!=""
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \
-        `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+        `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
         -Wl,--exclude-libs,ALL,--start-group $(SHL10STDLIBS) -Wl,--end-group \
-        $(SHL10STDSHL) $(STDSHL10) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
+        $(SHL10STDSHL) $(STDSHL10) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
+        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL10USE_EXPORTS)"!="name"
@@ -5360,7 +5152,7 @@ $(SHL10TARGETN) : \
         $(LINKFLAGSSHL) \
         $(SHL10STACK) $(SHL10BASEX)	\
         -out:$@ \
-        -map:$(MISC)$/$(@:b).map \
+        -map:$(MISC)/$(@:b).map \
         -def:$(SHL10DEF) \
         $(USE_10IMPLIB) \
         $(STDOBJ) \
@@ -5374,7 +5166,7 @@ $(SHL10TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -5385,8 +5177,8 @@ $(SHL10TARGETN) : \
     $(SHL10LINKER) @$(mktmp	$(SHL10LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL10BASEX)		\
         $(SHL10STACK) -out:$(SHL10TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
-        $(LB)$/$(SHL10IMPLIB).exp				\
+        -map:$(MISC)/$(@:B).map				\
+        $(LB)/$(SHL10IMPLIB).exp				\
         $(STDOBJ)							\
         $(SHL10OBJS) $(SHL10VERSIONOBJ) \
         $(SHL10LIBS)                         \
@@ -5398,7 +5190,7 @@ $(SHL10TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -5410,7 +5202,7 @@ $(SHL10TARGETN) : \
     $(SHL10LINKER) @$(mktmp	$(SHL10LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL10BASEX)		\
         $(SHL10STACK) -out:$(SHL10TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
+        -map:$(MISC)/$(@:B).map				\
         $(USE_10IMPLIB) \
         $(STDOBJ)							\
         $(SHL10OBJS) $(SHL10VERSIONOBJ))   \
@@ -5421,7 +5213,7 @@ $(SHL10TARGETN) : \
     )
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -5430,25 +5222,25 @@ $(SHL10TARGETN) : \
     $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
 .ENDIF			# "$(SHL10USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
-        -$(RM) del $(MISC)$/$(SHL10TARGET).lnk
-        -$(RM) $(MISC)$/$(SHL10TARGET).lst
+        -$(RM) del $(MISC)/$(SHL10TARGET).lnk
+        -$(RM) $(MISC)/$(SHL10TARGET).lst
         $(TYPE) $(mktmp \
         $(SHL10LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL10BASEX) \
         $(SHL10STACK) $(MAPFILE) \
         -out:$@ \
-        $(LB)$/$(SHL10IMPLIB).exp \
+        $(LB)/$(SHL10IMPLIB).exp \
         $(STDOBJ) \
         $(SHL10OBJS) \
         $(SHL10STDLIBS) \
         $(SHL10STDSHL) $(STDSHL10) \
         $(SHL10LINKRES) \
-        ) >> $(MISC)$/$(SHL10TARGET).lnk
-        $(TYPE) $(MISC)$/$(SHL10TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL10TARGET).lnk
-        $(SHL10LINKER) @$(MISC)$/$(SHL10TARGET).lnk
+        ) >> $(MISC)/$(SHL10TARGET).lnk
+        $(TYPE) $(MISC)/$(SHL10TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL10TARGET).lnk
+        $(SHL10LINKER) @$(MISC)/$(SHL10TARGET).lnk
         @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -5460,82 +5252,70 @@ $(SHL10TARGETN) : \
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
     @echo $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
     $(SHL10VERSIONOBJ) \
-    `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
-    $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_10.cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL10RPATH) $@
-	@echo "Making:   " $(@:f).jnilib
+    @echo "Making: $@.jnilib"
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL10NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN)
 .ENDIF				# "$(SHL10NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
-    @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
-		$(SHL10VERSIONOBJ) -o $@ \
-		`cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-		$(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
-.ENDIF
-    @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
+    $(SHL10VERSIONOBJ) -o $@ \
+    `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL10NOCHECK)"==""
-	$(QUIET_BUILD) -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-	$(QUIET_BUILD) $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-.IF "$(QUIET_BUILD)"==""
-	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-.ELSE
-	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) -- -s $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-.ENDIF
+    -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
+    $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
 .ENDIF				# "$(SHL10NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
 .IF "$(UNIXVERSIONNAMES)"!=""
-	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL10TARGETN:b)
-	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b)
+    $(RM) $(LB)/$(SHL10TARGETN:b)
+    cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(QUIET_BUILD)"==""
     @ls -l $@
-.ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
 .IF "$(GUI)" == "OS2"
 
 .IF "$(SHL10DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)$/$(SHL10DEFAULTRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc >& $(NULLDEV)
 .IF "$(SHL10ICON)" != ""
-    @-+echo 1 ICON $(SHL10ICON) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    @-+echo 1 ICON $(SHL10ICON) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL10ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    @-+echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc
 .ENDIF			# "$(SHL10ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL10DEFAULTRES:b).rc
+#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc
 .ENDIF			# "$(SHL10DEFAULTRES)"!=""
 
 .IF "$(SHL10ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) $(SHL10ALLRES:s/res /res+/) $(SHL10LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL10ALLRES)"!=""
 
 .IF "$(USE_DEFFILE)"!=""
@@ -5544,7 +5324,7 @@ $(SHL10TARGETN) : \
         $(SHL10DEF) \
         $(STDOBJ) \
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL10OBJS) $(SHL10VERSIONOBJ) \
         $(SHL10LIBS) \
         $(SHL10STDLIBS:^"-l") \
@@ -5559,7 +5339,7 @@ $(SHL10TARGETN) : \
         $(SHL10DEF) \
         $(STDOBJ)							\
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL10OBJS) $(SHL10VERSIONOBJ) \
         $(SHL10LIBS) \
         $(SHL10STDLIBS:^"-l") \
@@ -5583,7 +5363,7 @@ $(SHL10TARGETN) : \
 ALLTAR : runtest_$(SHL10TARGET)
 
 runtest_$(SHL10TARGET) : $(SHL10TARGETN)
-    testshl $(SHL10TARGETN) sce$/$(SHL10TARGET).sce -msg -skip
+    testshl $(SHL10TARGETN) sce/$(SHL10TARGET).sce -msg -skip
 .ENDIF			# "$(NO_TESTS)"==""
 .ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL10TARGETN)"!=""
@@ -5611,10 +5391,8 @@ $(SHL1IMPLIBN):	\
 $(SHL1IMPLIBN):	\
                     $(SHL1LIBS)
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------1
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL1IMPLIBN)
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"=="GCC"
     @echo no ImportLibs on mingw
@@ -5668,10 +5446,8 @@ $(SHL2IMPLIBN):	\
 $(SHL2IMPLIBN):	\
                     $(SHL2LIBS)
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------1
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL2IMPLIBN)
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"=="GCC"
     @echo no ImportLibs on mingw
@@ -5725,10 +5501,8 @@ $(SHL3IMPLIBN):	\
 $(SHL3IMPLIBN):	\
                     $(SHL3LIBS)
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------1
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL3IMPLIBN)
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"=="GCC"
     @echo no ImportLibs on mingw
@@ -5782,10 +5556,8 @@ $(SHL4IMPLIBN):	\
 $(SHL4IMPLIBN):	\
                     $(SHL4LIBS)
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------1
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL4IMPLIBN)
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"=="GCC"
     @echo no ImportLibs on mingw
@@ -5839,10 +5611,8 @@ $(SHL5IMPLIBN):	\
 $(SHL5IMPLIBN):	\
                     $(SHL5LIBS)
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------1
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL5IMPLIBN)
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"=="GCC"
     @echo no ImportLibs on mingw
@@ -5896,10 +5666,8 @@ $(SHL6IMPLIBN):	\
 $(SHL6IMPLIBN):	\
                     $(SHL6LIBS)
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------1
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL6IMPLIBN)
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"=="GCC"
     @echo no ImportLibs on mingw
@@ -5953,10 +5721,8 @@ $(SHL7IMPLIBN):	\
 $(SHL7IMPLIBN):	\
                     $(SHL7LIBS)
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------1
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL7IMPLIBN)
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"=="GCC"
     @echo no ImportLibs on mingw
@@ -6010,10 +5776,8 @@ $(SHL8IMPLIBN):	\
 $(SHL8IMPLIBN):	\
                     $(SHL8LIBS)
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------1
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL8IMPLIBN)
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"=="GCC"
     @echo no ImportLibs on mingw
@@ -6067,10 +5831,8 @@ $(SHL9IMPLIBN):	\
 $(SHL9IMPLIBN):	\
                     $(SHL9LIBS)
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------1
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL9IMPLIBN)
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"=="GCC"
     @echo no ImportLibs on mingw
@@ -6124,10 +5886,8 @@ $(SHL10IMPLIBN):	\
 $(SHL10IMPLIBN):	\
                     $(SHL10LIBS)
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------1
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL10IMPLIBN)
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"=="GCC"
     @echo no ImportLibs on mingw
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
dissimilarity index 70%
index a5bf7e27c..d3d4c07ad 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -1,760 +1,550 @@
-# unroll begin
-
-.IF "$(SRS1NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID1FILES=$(foreach,i,$(SRC1FILES:f) $(SRS)$/$(i:s/.src/.hid/))
-HIDSRS1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS1NAME)_srs.hid
-$(HIDSRS1PARTICLE) : $(HID1FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS1PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
-$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr
-	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
-.IF "$(QUIET_BUILD)"==""
-	@-$(MKDIR) $(@:d)
-    @-$(RM) $@
-    -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
-    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ELSE
-	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-    @-$(RM) $@
-	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ENDIF
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-$(SRS)$/$(SRS1NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)$/$(SRS1NAME).srs: $(SRC1FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(QUIET_BUILD)"==""
-    $(RSC) -presponse @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-.ELSE
-	@ $(RSC) -presponse @$(mktmp \
-		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-		-fp=$@.$(INPATH) \
-		$< \
-	) $(PIPEERROR) cat - > /dev/null
-.ENDIF
-	@-$(RM) $@
-	@$(RENAME) $@.$(INPATH) $@
-	@-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS1NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS2NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID2FILES=$(foreach,i,$(SRC2FILES:f) $(SRS)$/$(i:s/.src/.hid/))
-HIDSRS2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS2NAME)_srs.hid
-$(HIDSRS2PARTICLE) : $(HID2FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS2PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
-$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr
-	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
-.IF "$(QUIET_BUILD)"==""
-	@-$(MKDIR) $(@:d)
-    @-$(RM) $@
-    -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
-    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ELSE
-	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-    @-$(RM) $@
-	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ENDIF
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-$(SRS)$/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)$/$(SRS2NAME).srs: $(SRC2FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(QUIET_BUILD)"==""
-    $(RSC) -presponse @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-.ELSE
-	@ $(RSC) -presponse @$(mktmp \
-		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-		-fp=$@.$(INPATH) \
-		$< \
-	) $(PIPEERROR) cat - > /dev/null
-.ENDIF
-	@-$(RM) $@
-	@$(RENAME) $@.$(INPATH) $@
-	@-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS2NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS3NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID3FILES=$(foreach,i,$(SRC3FILES:f) $(SRS)$/$(i:s/.src/.hid/))
-HIDSRS3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS3NAME)_srs.hid
-$(HIDSRS3PARTICLE) : $(HID3FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS3PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
-$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr
-	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
-.IF "$(QUIET_BUILD)"==""
-	@-$(MKDIR) $(@:d)
-    @-$(RM) $@
-    -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
-    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ELSE
-	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-    @-$(RM) $@
-	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ENDIF
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-$(SRS)$/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)$/$(SRS3NAME).srs: $(SRC3FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(QUIET_BUILD)"==""
-    $(RSC) -presponse @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-.ELSE
-	@ $(RSC) -presponse @$(mktmp \
-		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-		-fp=$@.$(INPATH) \
-		$< \
-	) $(PIPEERROR) cat - > /dev/null
-.ENDIF
-	@-$(RM) $@
-	@$(RENAME) $@.$(INPATH) $@
-	@-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS3NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS4NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID4FILES=$(foreach,i,$(SRC4FILES:f) $(SRS)$/$(i:s/.src/.hid/))
-HIDSRS4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS4NAME)_srs.hid
-$(HIDSRS4PARTICLE) : $(HID4FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS4PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
-$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr
-	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
-.IF "$(QUIET_BUILD)"==""
-	@-$(MKDIR) $(@:d)
-    @-$(RM) $@
-    -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
-    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ELSE
-	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-    @-$(RM) $@
-	@ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-.ENDIF
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-$(SRS)$/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)$/$(SRS4NAME).srs: $(SRC4FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(QUIET_BUILD)"==""
-    $(RSC) -presponse @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-.ELSE
-	@ $(RSC) -presponse @$(mktmp \
-		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-		-fp=$@.$(INPATH) \
-		$< \
-	) $(PIPEERROR) cat - > /dev/null
-.ENDIF
-	@-$(RM) $@
-	@$(RENAME) $@.$(INPATH) $@
-	@-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS4NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS5NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID5FILES=$(foreach,i,$(SRC5FILES:f) $(SRS)$/$(i:s/.src/.hid/))
-HIDSRS5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS5NAME)_srs.hid
-$(HIDSRS5PARTICLE) : $(HID5FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS5PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
-$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr
-	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
-.IF "$(QUIET_BUILD)"==""
-	@-$(MKDIR) $(@:d)
-    @-$(RM) $@
-    -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
-    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ELSE
-	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-    @-$(RM) $@
-	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ENDIF
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-$(SRS)$/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)$/$(SRS5NAME).srs: $(SRC5FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(QUIET_BUILD)"==""
-    $(RSC) -presponse @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-.ELSE
-	@ $(RSC) -presponse @$(mktmp \
-		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-		-fp=$@.$(INPATH) \
-		$< \
-	) $(PIPEERROR) cat - > /dev/null
-.ENDIF
-	@-$(RM) $@
-	@$(RENAME) $@.$(INPATH) $@
-	@-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS5NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS6NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID6FILES=$(foreach,i,$(SRC6FILES:f) $(SRS)$/$(i:s/.src/.hid/))
-HIDSRS6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS6NAME)_srs.hid
-$(HIDSRS6PARTICLE) : $(HID6FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS6PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
-$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr
-	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
-.IF "$(QUIET_BUILD)"==""
-	@-$(MKDIR) $(@:d)
-    @-$(RM) $@
-    -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
-    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ELSE
-	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-    @-$(RM) $@
-	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ENDIF
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-$(SRS)$/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)$/$(SRS6NAME).srs: $(SRC6FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(QUIET_BUILD)"==""
-    $(RSC) -presponse @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-.ELSE
-	@ $(RSC) -presponse @$(mktmp \
-		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-		-fp=$@.$(INPATH) \
-		$< \
-	) $(PIPEERROR) cat - > /dev/null
-.ENDIF
-	@-$(RM) $@
-	@$(RENAME) $@.$(INPATH) $@
-	@-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS6NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS7NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID7FILES=$(foreach,i,$(SRC7FILES:f) $(SRS)$/$(i:s/.src/.hid/))
-HIDSRS7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS7NAME)_srs.hid
-$(HIDSRS7PARTICLE) : $(HID7FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS7PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
-$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr
-	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
-.IF "$(QUIET_BUILD)"==""
-	@-$(MKDIR) $(@:d)
-    @-$(RM) $@
-    -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
-    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ELSE
-	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-    @-$(RM) $@
-	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ENDIF
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-$(SRS)$/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)$/$(SRS7NAME).srs: $(SRC7FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(QUIET_BUILD)"==""
-    $(RSC) -presponse @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-.ELSE
-	@ $(RSC) -presponse @$(mktmp \
-		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-		-fp=$@.$(INPATH) \
-		$< \
-	) $(PIPEERROR) cat - > /dev/null
-.ENDIF
-	@-$(RM) $@
-	@$(RENAME) $@.$(INPATH) $@
-	@-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS7NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS8NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID8FILES=$(foreach,i,$(SRC8FILES:f) $(SRS)$/$(i:s/.src/.hid/))
-HIDSRS8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS8NAME)_srs.hid
-$(HIDSRS8PARTICLE) : $(HID8FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS8PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
-$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr
-	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
-.IF "$(QUIET_BUILD)"==""
-	@-$(MKDIR) $(@:d)
-    @-$(RM) $@
-    -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
-    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ELSE
-	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-    @-$(RM) $@
-	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ENDIF
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-$(SRS)$/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)$/$(SRS8NAME).srs: $(SRC8FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(QUIET_BUILD)"==""
-    $(RSC) -presponse @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-.ELSE
-	@ $(RSC) -presponse @$(mktmp \
-		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-		-fp=$@.$(INPATH) \
-		$< \
-	) $(PIPEERROR) cat - > /dev/null
-.ENDIF
-	@-$(RM) $@
-	@$(RENAME) $@.$(INPATH) $@
-	@-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS8NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS9NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID9FILES=$(foreach,i,$(SRC9FILES:f) $(SRS)$/$(i:s/.src/.hid/))
-HIDSRS9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS9NAME)_srs.hid
-$(HIDSRS9PARTICLE) : $(HID9FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS9PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
-$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr
-	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
-.IF "$(QUIET_BUILD)"==""
-	@-$(MKDIR) $(@:d)
-    @-$(RM) $@
-    -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
-    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ELSE
-	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-    @-$(RM) $@
-	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ENDIF
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-$(SRS)$/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)$/$(SRS9NAME).srs: $(SRC9FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(QUIET_BUILD)"==""
-    $(RSC) -presponse @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-.ELSE
-	@ $(RSC) -presponse @$(mktmp \
-		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-		-fp=$@.$(INPATH) \
-		$< \
-	) $(PIPEERROR) cat - > /dev/null
-.ENDIF
-	@-$(RM) $@
-	@$(RENAME) $@.$(INPATH) $@
-	@-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS9NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS10NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID10FILES=$(foreach,i,$(SRC10FILES:f) $(SRS)$/$(i:s/.src/.hid/))
-HIDSRS10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS10NAME)_srs.hid
-$(HIDSRS10PARTICLE) : $(HID10FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS10PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
-$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr
-	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
-.IF "$(QUIET_BUILD)"==""
-	@-$(MKDIR) $(@:d)
-    @-$(RM) $@
-    -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
-    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ELSE
-	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-    @-$(RM) $@
-	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ENDIF
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-$(SRS)$/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)$/$(SRS10NAME).srs: $(SRC10FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(QUIET_BUILD)"==""
-    @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(QUIET_BUILD)"==""
-    $(RSC) -presponse @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-.ELSE
-	@ $(RSC) -presponse @$(mktmp \
-		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-		-fp=$@.$(INPATH) \
-		$< \
-	) $(PIPEERROR) cat - > /dev/null
-.ENDIF
-	@-$(RM) $@
-	@$(RENAME) $@.$(INPATH) $@
-	@-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS10NAME)"!=""
-
+# unroll begin
+
+.IF "$(SRS1NAME)"!=""
+.IF "$(BUILDHIDS)"!=""
+HID1FILES=$(foreach,i,$(SRC1FILES:f) $(SRS)/$(i:s/.src/.hid/))
+HIDSRS1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS1NAME)_srs.hid
+$(HIDSRS1PARTICLE) : $(HID1FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
+
+ALLTAR : $(HIDSRS1PARTICLE)
+
+.ENDIF # "$(BUILDHIDS)"!=""
+
+$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $(MISC)/$(TARGET).$(SRS1NAME).dprr
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
+
+.IF "$(WITH_LANG)"!=""
+
+$(foreach,i,$(SRC1FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
+    -$(MKDIR) $(@:d)
+    -$(RM) $@
+    -$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+$(SRS)/$(SRS1NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)/$(TARGET)/$i)
+.ELSE			# "$(WITH_LANG)"!=""
+$(SRS)/$(SRS1NAME).srs: $(SRC1FILES)
+.ENDIF			# "$(WITH_LANG)"!=""
+    @echo ------------------------------
+    @echo Making: $@
+    $(RSC) -presponse @$(mktmp \
+        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        -fp=$@.$(INPATH) \
+        $< \
+    )
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+.ENDIF          # "$(SRS1NAME)"!=""
+
+# unroll begin
+
+.IF "$(SRS2NAME)"!=""
+.IF "$(BUILDHIDS)"!=""
+HID2FILES=$(foreach,i,$(SRC2FILES:f) $(SRS)/$(i:s/.src/.hid/))
+HIDSRS2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS2NAME)_srs.hid
+$(HIDSRS2PARTICLE) : $(HID2FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
+
+ALLTAR : $(HIDSRS2PARTICLE)
+
+.ENDIF # "$(BUILDHIDS)"!=""
+
+$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $(MISC)/$(TARGET).$(SRS2NAME).dprr
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
+
+.IF "$(WITH_LANG)"!=""
+
+$(foreach,i,$(SRC2FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
+    -$(MKDIR) $(@:d)
+    -$(RM) $@
+    -$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+$(SRS)/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)/$(TARGET)/$i)
+.ELSE			# "$(WITH_LANG)"!=""
+$(SRS)/$(SRS2NAME).srs: $(SRC2FILES)
+.ENDIF			# "$(WITH_LANG)"!=""
+    @echo ------------------------------
+    @echo Making: $@
+    $(RSC) -presponse @$(mktmp \
+        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        -fp=$@.$(INPATH) \
+        $< \
+    )
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+.ENDIF          # "$(SRS2NAME)"!=""
+
+# unroll begin
+
+.IF "$(SRS3NAME)"!=""
+.IF "$(BUILDHIDS)"!=""
+HID3FILES=$(foreach,i,$(SRC3FILES:f) $(SRS)/$(i:s/.src/.hid/))
+HIDSRS3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS3NAME)_srs.hid
+$(HIDSRS3PARTICLE) : $(HID3FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
+
+ALLTAR : $(HIDSRS3PARTICLE)
+
+.ENDIF # "$(BUILDHIDS)"!=""
+
+$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $(MISC)/$(TARGET).$(SRS3NAME).dprr
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
+
+.IF "$(WITH_LANG)"!=""
+
+$(foreach,i,$(SRC3FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
+    -$(MKDIR) $(@:d)
+    -$(RM) $@
+    -$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+$(SRS)/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)/$(TARGET)/$i)
+.ELSE			# "$(WITH_LANG)"!=""
+$(SRS)/$(SRS3NAME).srs: $(SRC3FILES)
+.ENDIF			# "$(WITH_LANG)"!=""
+    @echo ------------------------------
+    @echo Making: $@
+    $(RSC) -presponse @$(mktmp \
+        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        -fp=$@.$(INPATH) \
+        $< \
+    )
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+.ENDIF          # "$(SRS3NAME)"!=""
+
+# unroll begin
+
+.IF "$(SRS4NAME)"!=""
+.IF "$(BUILDHIDS)"!=""
+HID4FILES=$(foreach,i,$(SRC4FILES:f) $(SRS)/$(i:s/.src/.hid/))
+HIDSRS4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS4NAME)_srs.hid
+$(HIDSRS4PARTICLE) : $(HID4FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
+
+ALLTAR : $(HIDSRS4PARTICLE)
+
+.ENDIF # "$(BUILDHIDS)"!=""
+
+$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $(MISC)/$(TARGET).$(SRS4NAME).dprr
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
+
+.IF "$(WITH_LANG)"!=""
+
+$(foreach,i,$(SRC4FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
+    -$(MKDIR) $(@:d)
+    -$(RM) $@
+    -$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+$(SRS)/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)/$(TARGET)/$i)
+.ELSE			# "$(WITH_LANG)"!=""
+$(SRS)/$(SRS4NAME).srs: $(SRC4FILES)
+.ENDIF			# "$(WITH_LANG)"!=""
+    @echo ------------------------------
+    @echo Making: $@
+    $(RSC) -presponse @$(mktmp \
+        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        -fp=$@.$(INPATH) \
+        $< \
+    )
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+.ENDIF          # "$(SRS4NAME)"!=""
+
+# unroll begin
+
+.IF "$(SRS5NAME)"!=""
+.IF "$(BUILDHIDS)"!=""
+HID5FILES=$(foreach,i,$(SRC5FILES:f) $(SRS)/$(i:s/.src/.hid/))
+HIDSRS5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS5NAME)_srs.hid
+$(HIDSRS5PARTICLE) : $(HID5FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
+
+ALLTAR : $(HIDSRS5PARTICLE)
+
+.ENDIF # "$(BUILDHIDS)"!=""
+
+$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $(MISC)/$(TARGET).$(SRS5NAME).dprr
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
+
+.IF "$(WITH_LANG)"!=""
+
+$(foreach,i,$(SRC5FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
+    -$(MKDIR) $(@:d)
+    -$(RM) $@
+    -$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+$(SRS)/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)/$(TARGET)/$i)
+.ELSE			# "$(WITH_LANG)"!=""
+$(SRS)/$(SRS5NAME).srs: $(SRC5FILES)
+.ENDIF			# "$(WITH_LANG)"!=""
+    @echo ------------------------------
+    @echo Making: $@
+    $(RSC) -presponse @$(mktmp \
+        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        -fp=$@.$(INPATH) \
+        $< \
+    )
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+.ENDIF          # "$(SRS5NAME)"!=""
+
+# unroll begin
+
+.IF "$(SRS6NAME)"!=""
+.IF "$(BUILDHIDS)"!=""
+HID6FILES=$(foreach,i,$(SRC6FILES:f) $(SRS)/$(i:s/.src/.hid/))
+HIDSRS6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS6NAME)_srs.hid
+$(HIDSRS6PARTICLE) : $(HID6FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
+
+ALLTAR : $(HIDSRS6PARTICLE)
+
+.ENDIF # "$(BUILDHIDS)"!=""
+
+$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $(MISC)/$(TARGET).$(SRS6NAME).dprr
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
+
+.IF "$(WITH_LANG)"!=""
+
+$(foreach,i,$(SRC6FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
+    -$(MKDIR) $(@:d)
+    -$(RM) $@
+    -$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+$(SRS)/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)/$(TARGET)/$i)
+.ELSE			# "$(WITH_LANG)"!=""
+$(SRS)/$(SRS6NAME).srs: $(SRC6FILES)
+.ENDIF			# "$(WITH_LANG)"!=""
+    @echo ------------------------------
+    @echo Making: $@
+    $(RSC) -presponse @$(mktmp \
+        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        -fp=$@.$(INPATH) \
+        $< \
+    )
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+.ENDIF          # "$(SRS6NAME)"!=""
+
+# unroll begin
+
+.IF "$(SRS7NAME)"!=""
+.IF "$(BUILDHIDS)"!=""
+HID7FILES=$(foreach,i,$(SRC7FILES:f) $(SRS)/$(i:s/.src/.hid/))
+HIDSRS7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS7NAME)_srs.hid
+$(HIDSRS7PARTICLE) : $(HID7FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
+
+ALLTAR : $(HIDSRS7PARTICLE)
+
+.ENDIF # "$(BUILDHIDS)"!=""
+
+$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $(MISC)/$(TARGET).$(SRS7NAME).dprr
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
+
+.IF "$(WITH_LANG)"!=""
+
+$(foreach,i,$(SRC7FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
+    -$(MKDIR) $(@:d)
+    -$(RM) $@
+    -$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+$(SRS)/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)/$(TARGET)/$i)
+.ELSE			# "$(WITH_LANG)"!=""
+$(SRS)/$(SRS7NAME).srs: $(SRC7FILES)
+.ENDIF			# "$(WITH_LANG)"!=""
+    @echo ------------------------------
+    @echo Making: $@
+    $(RSC) -presponse @$(mktmp \
+        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        -fp=$@.$(INPATH) \
+        $< \
+    )
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+.ENDIF          # "$(SRS7NAME)"!=""
+
+# unroll begin
+
+.IF "$(SRS8NAME)"!=""
+.IF "$(BUILDHIDS)"!=""
+HID8FILES=$(foreach,i,$(SRC8FILES:f) $(SRS)/$(i:s/.src/.hid/))
+HIDSRS8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS8NAME)_srs.hid
+$(HIDSRS8PARTICLE) : $(HID8FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
+
+ALLTAR : $(HIDSRS8PARTICLE)
+
+.ENDIF # "$(BUILDHIDS)"!=""
+
+$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $(MISC)/$(TARGET).$(SRS8NAME).dprr
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
+
+.IF "$(WITH_LANG)"!=""
+
+$(foreach,i,$(SRC8FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
+    -$(MKDIR) $(@:d)
+    -$(RM) $@
+    -$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+$(SRS)/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)/$(TARGET)/$i)
+.ELSE			# "$(WITH_LANG)"!=""
+$(SRS)/$(SRS8NAME).srs: $(SRC8FILES)
+.ENDIF			# "$(WITH_LANG)"!=""
+    @echo ------------------------------
+    @echo Making: $@
+    $(RSC) -presponse @$(mktmp \
+        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        -fp=$@.$(INPATH) \
+        $< \
+    )
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+.ENDIF          # "$(SRS8NAME)"!=""
+
+# unroll begin
+
+.IF "$(SRS9NAME)"!=""
+.IF "$(BUILDHIDS)"!=""
+HID9FILES=$(foreach,i,$(SRC9FILES:f) $(SRS)/$(i:s/.src/.hid/))
+HIDSRS9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS9NAME)_srs.hid
+$(HIDSRS9PARTICLE) : $(HID9FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
+
+ALLTAR : $(HIDSRS9PARTICLE)
+
+.ENDIF # "$(BUILDHIDS)"!=""
+
+$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $(MISC)/$(TARGET).$(SRS9NAME).dprr
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
+
+.IF "$(WITH_LANG)"!=""
+
+$(foreach,i,$(SRC9FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
+    -$(MKDIR) $(@:d)
+    -$(RM) $@
+    -$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+$(SRS)/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)/$(TARGET)/$i)
+.ELSE			# "$(WITH_LANG)"!=""
+$(SRS)/$(SRS9NAME).srs: $(SRC9FILES)
+.ENDIF			# "$(WITH_LANG)"!=""
+    @echo ------------------------------
+    @echo Making: $@
+    $(RSC) -presponse @$(mktmp \
+        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        -fp=$@.$(INPATH) \
+        $< \
+    )
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+.ENDIF          # "$(SRS9NAME)"!=""
+
+# unroll begin
+
+.IF "$(SRS10NAME)"!=""
+.IF "$(BUILDHIDS)"!=""
+HID10FILES=$(foreach,i,$(SRC10FILES:f) $(SRS)/$(i:s/.src/.hid/))
+HIDSRS10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS10NAME)_srs.hid
+$(HIDSRS10PARTICLE) : $(HID10FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
+
+ALLTAR : $(HIDSRS10PARTICLE)
+
+.ENDIF # "$(BUILDHIDS)"!=""
+
+$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $(MISC)/$(TARGET).$(SRS10NAME).dprr
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
+
+.IF "$(WITH_LANG)"!=""
+
+$(foreach,i,$(SRC10FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
+    -$(MKDIR) $(@:d)
+    -$(RM) $@
+    -$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+$(SRS)/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)/$(TARGET)/$i)
+.ELSE			# "$(WITH_LANG)"!=""
+$(SRS)/$(SRS10NAME).srs: $(SRC10FILES)
+.ENDIF			# "$(WITH_LANG)"!=""
+    @echo ------------------------------
+    @echo Making: $@
+    $(RSC) -presponse @$(mktmp \
+        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        -fp=$@.$(INPATH) \
+        $< \
+    )
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
+
+.ENDIF          # "$(SRS10NAME)"!=""
+
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index fe52082e9..79ced982d 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -17,18 +17,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 ZIP1EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP1LIST:s/LANGDIR//)" == "$(ZIP1LIST)"
-ZIP1TARGETN=$(COMMONBIN)$/$(ZIP1TARGET)$(ZIP1EXT)
+ZIP1TARGETN=$(COMMONBIN)/$(ZIP1TARGET)$(ZIP1EXT)
 .ELSE
-ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(COMMONBIN)$/$(ZIP1TARGET)_$i$(ZIP1EXT) )
+ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(COMMONBIN)/$(ZIP1TARGET)_$i$(ZIP1EXT) )
 .ENDIF
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP1LIST:s/LANGDIR//)" == "$(ZIP1LIST)"
-ZIP1TARGETN=$(BIN)$/$(ZIP1TARGET)$(ZIP1EXT)
+ZIP1TARGETN=$(BIN)/$(ZIP1TARGET)$(ZIP1EXT)
 .ELSE
-ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(BIN)$/$(ZIP1TARGET)_$i$(ZIP1EXT) )
+ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(BIN)/$(ZIP1TARGET)_$i$(ZIP1EXT) )
 .ENDIF
 .ENDIF			# "$(common_build_zip)"!=""
-ZIP1DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP1TARGETN:s/$(ZIP1EXT)/.dpzz/)))
+ZIP1DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP1TARGETN:s/$(ZIP1EXT)/.dpzz/)))
 ZIPDEPFILES+=$(ZIP1DEPFILE)
 
 ZIP1DIR*=$(ZIPDIR)
@@ -36,11 +36,7 @@ ZIP1FLAGS*=$(ZIPFLAGS)
 .IF "$(zip1generatedlangs)"!=""
 zip1langdirs*=$(alllangiso)
 .ELSE           # "$(zip1generatedlangs)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip1langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE			# "$(GUI)"=="UNX"
-zip1langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP1DIR))} /ba:d )))
-.ENDIF			# "$(GUI)"=="UNX"
+zip1langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ENDIF          # "$(zip1generatedlangs)"!=""
 .IF "$(ZIP1FORCEALLLANG)"!=""
 zip1alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip1langdirs) $(eq,$i,$j  $i $(NULL))))
@@ -53,65 +49,59 @@ zip1alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip1langdirs) $(eq,$i,$
 
 ZIP1TMP:=$(mktmp iii)
 
-$(MISC)$/$(TARGET).$(PWD:f).$(ZIP1TARGET).dpzz : $(ZIP1TARGETN)
+$(MISC)/$(TARGET).$(PWD:f).$(ZIP1TARGET).dpzz : $(ZIP1TARGETN)
 
 .IF "$(common_build_zip)"!=""
-ZIP1HELPVAR=$(COMMONBIN)$/$(ZIP1TARGET)
+ZIP1HELPVAR=$(COMMONBIN)/$(ZIP1TARGET)
 .ELSE			# "$(common_build_zip)"!=""
-ZIP1HELPVAR=$(BIN)$/$(ZIP1TARGET)
+ZIP1HELPVAR=$(BIN)/$(ZIP1TARGET)
 .ENDIF			# "$(common_build_zip)"!=""
 
 $(ZIP1DEPFILE) :
-    echo # > $(MISC)$/$(@:f)
+    echo # > $(MISC)/$(@:f)
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP1DIR)" != ""
     @echo type 1
     -$(MKDIRHIER) $(ZIP1DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP1DIR)" != ""
     @echo type 2
-    -$(ZIPDEP) $(ZIP1FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP1FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP1DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP1DIR)" != ""
     @echo type 3
     -$(MKDIRHIER) $(ZIP1DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP1TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP1DIR)" != ""
     @echo type 4
-    -$(ZIPDEP) $(ZIP1FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP1TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP1DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f)
+    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
 
 
 $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
     @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
     @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP1DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away$/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $@.$(INPATH)
     $(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
 .ELSE			# "$(ZIP1DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
     zip $(ZIP1FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
     @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
 .ENDIF			# "$(ZIP1DIR)" != ""
@@ -121,21 +111,17 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP1DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away$/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)  $@ 
     $(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
 .ELSE			# "$(ZIP1DIR)" != ""
-    zip $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP1TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    zip $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $@ $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(ZIP1DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -159,18 +145,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 ZIP2EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP2LIST:s/LANGDIR//)" == "$(ZIP2LIST)"
-ZIP2TARGETN=$(COMMONBIN)$/$(ZIP2TARGET)$(ZIP2EXT)
+ZIP2TARGETN=$(COMMONBIN)/$(ZIP2TARGET)$(ZIP2EXT)
 .ELSE
-ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(COMMONBIN)$/$(ZIP2TARGET)_$i$(ZIP2EXT) )
+ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(COMMONBIN)/$(ZIP2TARGET)_$i$(ZIP2EXT) )
 .ENDIF
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP2LIST:s/LANGDIR//)" == "$(ZIP2LIST)"
-ZIP2TARGETN=$(BIN)$/$(ZIP2TARGET)$(ZIP2EXT)
+ZIP2TARGETN=$(BIN)/$(ZIP2TARGET)$(ZIP2EXT)
 .ELSE
-ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(BIN)$/$(ZIP2TARGET)_$i$(ZIP2EXT) )
+ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(BIN)/$(ZIP2TARGET)_$i$(ZIP2EXT) )
 .ENDIF
 .ENDIF			# "$(common_build_zip)"!=""
-ZIP2DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP2TARGETN:s/$(ZIP2EXT)/.dpzz/)))
+ZIP2DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP2TARGETN:s/$(ZIP2EXT)/.dpzz/)))
 ZIPDEPFILES+=$(ZIP2DEPFILE)
 
 ZIP2DIR*=$(ZIPDIR)
@@ -178,11 +164,7 @@ ZIP2FLAGS*=$(ZIPFLAGS)
 .IF "$(zip2generatedlangs)"!=""
 zip2langdirs*=$(alllangiso)
 .ELSE           # "$(zip2generatedlangs)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip2langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE			# "$(GUI)"=="UNX"
-zip2langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP2DIR))} /ba:d )))
-.ENDIF			# "$(GUI)"=="UNX"
+zip2langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ENDIF          # "$(zip2generatedlangs)"!=""
 .IF "$(ZIP2FORCEALLLANG)"!=""
 zip2alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip2langdirs) $(eq,$i,$j  $i $(NULL))))
@@ -195,65 +177,59 @@ zip2alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip2langdirs) $(eq,$i,$
 
 ZIP2TMP:=$(mktmp iii)
 
-$(MISC)$/$(TARGET).$(PWD:f).$(ZIP2TARGET).dpzz : $(ZIP2TARGETN)
+$(MISC)/$(TARGET).$(PWD:f).$(ZIP2TARGET).dpzz : $(ZIP2TARGETN)
 
 .IF "$(common_build_zip)"!=""
-ZIP2HELPVAR=$(COMMONBIN)$/$(ZIP2TARGET)
+ZIP2HELPVAR=$(COMMONBIN)/$(ZIP2TARGET)
 .ELSE			# "$(common_build_zip)"!=""
-ZIP2HELPVAR=$(BIN)$/$(ZIP2TARGET)
+ZIP2HELPVAR=$(BIN)/$(ZIP2TARGET)
 .ENDIF			# "$(common_build_zip)"!=""
 
 $(ZIP2DEPFILE) :
-    echo # > $(MISC)$/$(@:f)
+    echo # > $(MISC)/$(@:f)
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP2DIR)" != ""
     @echo type 1
     -$(MKDIRHIER) $(ZIP2DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP2DIR)" != ""
     @echo type 2
-    -$(ZIPDEP) $(ZIP2FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP2FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP2DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP2DIR)" != ""
     @echo type 3
     -$(MKDIRHIER) $(ZIP2DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP2TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP2DIR)" != ""
     @echo type 4
-    -$(ZIPDEP) $(ZIP2FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP2TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP2FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP2DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f)
+    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
 
 
 $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
     @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
     @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP2DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away$/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $@.$(INPATH)
     $(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
 .ELSE			# "$(ZIP2DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
     zip $(ZIP2FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
     @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
 .ENDIF			# "$(ZIP2DIR)" != ""
@@ -263,21 +239,17 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP2DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away$/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)  $@ 
     $(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
 .ELSE			# "$(ZIP2DIR)" != ""
-    zip $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP2TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    zip $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $@ $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(ZIP2DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -301,18 +273,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 ZIP3EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP3LIST:s/LANGDIR//)" == "$(ZIP3LIST)"
-ZIP3TARGETN=$(COMMONBIN)$/$(ZIP3TARGET)$(ZIP3EXT)
+ZIP3TARGETN=$(COMMONBIN)/$(ZIP3TARGET)$(ZIP3EXT)
 .ELSE
-ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(COMMONBIN)$/$(ZIP3TARGET)_$i$(ZIP3EXT) )
+ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(COMMONBIN)/$(ZIP3TARGET)_$i$(ZIP3EXT) )
 .ENDIF
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP3LIST:s/LANGDIR//)" == "$(ZIP3LIST)"
-ZIP3TARGETN=$(BIN)$/$(ZIP3TARGET)$(ZIP3EXT)
+ZIP3TARGETN=$(BIN)/$(ZIP3TARGET)$(ZIP3EXT)
 .ELSE
-ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(BIN)$/$(ZIP3TARGET)_$i$(ZIP3EXT) )
+ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(BIN)/$(ZIP3TARGET)_$i$(ZIP3EXT) )
 .ENDIF
 .ENDIF			# "$(common_build_zip)"!=""
-ZIP3DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP3TARGETN:s/$(ZIP3EXT)/.dpzz/)))
+ZIP3DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP3TARGETN:s/$(ZIP3EXT)/.dpzz/)))
 ZIPDEPFILES+=$(ZIP3DEPFILE)
 
 ZIP3DIR*=$(ZIPDIR)
@@ -320,11 +292,7 @@ ZIP3FLAGS*=$(ZIPFLAGS)
 .IF "$(zip3generatedlangs)"!=""
 zip3langdirs*=$(alllangiso)
 .ELSE           # "$(zip3generatedlangs)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip3langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE			# "$(GUI)"=="UNX"
-zip3langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP3DIR))} /ba:d )))
-.ENDIF			# "$(GUI)"=="UNX"
+zip3langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ENDIF          # "$(zip3generatedlangs)"!=""
 .IF "$(ZIP3FORCEALLLANG)"!=""
 zip3alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip3langdirs) $(eq,$i,$j  $i $(NULL))))
@@ -337,65 +305,59 @@ zip3alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip3langdirs) $(eq,$i,$
 
 ZIP3TMP:=$(mktmp iii)
 
-$(MISC)$/$(TARGET).$(PWD:f).$(ZIP3TARGET).dpzz : $(ZIP3TARGETN)
+$(MISC)/$(TARGET).$(PWD:f).$(ZIP3TARGET).dpzz : $(ZIP3TARGETN)
 
 .IF "$(common_build_zip)"!=""
-ZIP3HELPVAR=$(COMMONBIN)$/$(ZIP3TARGET)
+ZIP3HELPVAR=$(COMMONBIN)/$(ZIP3TARGET)
 .ELSE			# "$(common_build_zip)"!=""
-ZIP3HELPVAR=$(BIN)$/$(ZIP3TARGET)
+ZIP3HELPVAR=$(BIN)/$(ZIP3TARGET)
 .ENDIF			# "$(common_build_zip)"!=""
 
 $(ZIP3DEPFILE) :
-    echo # > $(MISC)$/$(@:f)
+    echo # > $(MISC)/$(@:f)
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP3DIR)" != ""
     @echo type 1
     -$(MKDIRHIER) $(ZIP3DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP3DIR)" != ""
     @echo type 2
-    -$(ZIPDEP) $(ZIP3FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP3FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP3DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP3DIR)" != ""
     @echo type 3
     -$(MKDIRHIER) $(ZIP3DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP3TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP3DIR)" != ""
     @echo type 4
-    -$(ZIPDEP) $(ZIP3FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP3TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP3FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP3DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f)
+    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
 
 
 $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
     @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
     @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP3DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away$/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $@.$(INPATH)
     $(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
 .ELSE			# "$(ZIP3DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
     zip $(ZIP3FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
     @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
 .ENDIF			# "$(ZIP3DIR)" != ""
@@ -405,21 +367,17 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP3DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away$/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)  $@ 
     $(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
 .ELSE			# "$(ZIP3DIR)" != ""
-    zip $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP3TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    zip $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $@ $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(ZIP3DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -443,18 +401,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 ZIP4EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP4LIST:s/LANGDIR//)" == "$(ZIP4LIST)"
-ZIP4TARGETN=$(COMMONBIN)$/$(ZIP4TARGET)$(ZIP4EXT)
+ZIP4TARGETN=$(COMMONBIN)/$(ZIP4TARGET)$(ZIP4EXT)
 .ELSE
-ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(COMMONBIN)$/$(ZIP4TARGET)_$i$(ZIP4EXT) )
+ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(COMMONBIN)/$(ZIP4TARGET)_$i$(ZIP4EXT) )
 .ENDIF
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP4LIST:s/LANGDIR//)" == "$(ZIP4LIST)"
-ZIP4TARGETN=$(BIN)$/$(ZIP4TARGET)$(ZIP4EXT)
+ZIP4TARGETN=$(BIN)/$(ZIP4TARGET)$(ZIP4EXT)
 .ELSE
-ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(BIN)$/$(ZIP4TARGET)_$i$(ZIP4EXT) )
+ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(BIN)/$(ZIP4TARGET)_$i$(ZIP4EXT) )
 .ENDIF
 .ENDIF			# "$(common_build_zip)"!=""
-ZIP4DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP4TARGETN:s/$(ZIP4EXT)/.dpzz/)))
+ZIP4DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP4TARGETN:s/$(ZIP4EXT)/.dpzz/)))
 ZIPDEPFILES+=$(ZIP4DEPFILE)
 
 ZIP4DIR*=$(ZIPDIR)
@@ -462,11 +420,7 @@ ZIP4FLAGS*=$(ZIPFLAGS)
 .IF "$(zip4generatedlangs)"!=""
 zip4langdirs*=$(alllangiso)
 .ELSE           # "$(zip4generatedlangs)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip4langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE			# "$(GUI)"=="UNX"
-zip4langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP4DIR))} /ba:d )))
-.ENDIF			# "$(GUI)"=="UNX"
+zip4langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ENDIF          # "$(zip4generatedlangs)"!=""
 .IF "$(ZIP4FORCEALLLANG)"!=""
 zip4alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip4langdirs) $(eq,$i,$j  $i $(NULL))))
@@ -479,65 +433,59 @@ zip4alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip4langdirs) $(eq,$i,$
 
 ZIP4TMP:=$(mktmp iii)
 
-$(MISC)$/$(TARGET).$(PWD:f).$(ZIP4TARGET).dpzz : $(ZIP4TARGETN)
+$(MISC)/$(TARGET).$(PWD:f).$(ZIP4TARGET).dpzz : $(ZIP4TARGETN)
 
 .IF "$(common_build_zip)"!=""
-ZIP4HELPVAR=$(COMMONBIN)$/$(ZIP4TARGET)
+ZIP4HELPVAR=$(COMMONBIN)/$(ZIP4TARGET)
 .ELSE			# "$(common_build_zip)"!=""
-ZIP4HELPVAR=$(BIN)$/$(ZIP4TARGET)
+ZIP4HELPVAR=$(BIN)/$(ZIP4TARGET)
 .ENDIF			# "$(common_build_zip)"!=""
 
 $(ZIP4DEPFILE) :
-    echo # > $(MISC)$/$(@:f)
+    echo # > $(MISC)/$(@:f)
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP4DIR)" != ""
     @echo type 1
     -$(MKDIRHIER) $(ZIP4DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP4DIR)" != ""
     @echo type 2
-    -$(ZIPDEP) $(ZIP4FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP4FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP4DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP4DIR)" != ""
     @echo type 3
     -$(MKDIRHIER) $(ZIP4DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP4TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP4DIR)" != ""
     @echo type 4
-    -$(ZIPDEP) $(ZIP4FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP4TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP4FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP4DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f)
+    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
 
 
 $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
     @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
     @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP4DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away$/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $@.$(INPATH)
     $(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
 .ELSE			# "$(ZIP4DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
     zip $(ZIP4FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
     @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
 .ENDIF			# "$(ZIP4DIR)" != ""
@@ -547,21 +495,17 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP4DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away$/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)  $@ 
     $(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
 .ELSE			# "$(ZIP4DIR)" != ""
-    zip $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP4TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    zip $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $@ $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(ZIP4DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -585,18 +529,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 ZIP5EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP5LIST:s/LANGDIR//)" == "$(ZIP5LIST)"
-ZIP5TARGETN=$(COMMONBIN)$/$(ZIP5TARGET)$(ZIP5EXT)
+ZIP5TARGETN=$(COMMONBIN)/$(ZIP5TARGET)$(ZIP5EXT)
 .ELSE
-ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(COMMONBIN)$/$(ZIP5TARGET)_$i$(ZIP5EXT) )
+ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(COMMONBIN)/$(ZIP5TARGET)_$i$(ZIP5EXT) )
 .ENDIF
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP5LIST:s/LANGDIR//)" == "$(ZIP5LIST)"
-ZIP5TARGETN=$(BIN)$/$(ZIP5TARGET)$(ZIP5EXT)
+ZIP5TARGETN=$(BIN)/$(ZIP5TARGET)$(ZIP5EXT)
 .ELSE
-ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(BIN)$/$(ZIP5TARGET)_$i$(ZIP5EXT) )
+ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(BIN)/$(ZIP5TARGET)_$i$(ZIP5EXT) )
 .ENDIF
 .ENDIF			# "$(common_build_zip)"!=""
-ZIP5DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP5TARGETN:s/$(ZIP5EXT)/.dpzz/)))
+ZIP5DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP5TARGETN:s/$(ZIP5EXT)/.dpzz/)))
 ZIPDEPFILES+=$(ZIP5DEPFILE)
 
 ZIP5DIR*=$(ZIPDIR)
@@ -604,11 +548,7 @@ ZIP5FLAGS*=$(ZIPFLAGS)
 .IF "$(zip5generatedlangs)"!=""
 zip5langdirs*=$(alllangiso)
 .ELSE           # "$(zip5generatedlangs)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip5langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE			# "$(GUI)"=="UNX"
-zip5langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP5DIR))} /ba:d )))
-.ENDIF			# "$(GUI)"=="UNX"
+zip5langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ENDIF          # "$(zip5generatedlangs)"!=""
 .IF "$(ZIP5FORCEALLLANG)"!=""
 zip5alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip5langdirs) $(eq,$i,$j  $i $(NULL))))
@@ -621,65 +561,59 @@ zip5alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip5langdirs) $(eq,$i,$
 
 ZIP5TMP:=$(mktmp iii)
 
-$(MISC)$/$(TARGET).$(PWD:f).$(ZIP5TARGET).dpzz : $(ZIP5TARGETN)
+$(MISC)/$(TARGET).$(PWD:f).$(ZIP5TARGET).dpzz : $(ZIP5TARGETN)
 
 .IF "$(common_build_zip)"!=""
-ZIP5HELPVAR=$(COMMONBIN)$/$(ZIP5TARGET)
+ZIP5HELPVAR=$(COMMONBIN)/$(ZIP5TARGET)
 .ELSE			# "$(common_build_zip)"!=""
-ZIP5HELPVAR=$(BIN)$/$(ZIP5TARGET)
+ZIP5HELPVAR=$(BIN)/$(ZIP5TARGET)
 .ENDIF			# "$(common_build_zip)"!=""
 
 $(ZIP5DEPFILE) :
-    echo # > $(MISC)$/$(@:f)
+    echo # > $(MISC)/$(@:f)
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP5DIR)" != ""
     @echo type 1
     -$(MKDIRHIER) $(ZIP5DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP5DIR)" != ""
     @echo type 2
-    -$(ZIPDEP) $(ZIP5FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP5FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP5DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP5DIR)" != ""
     @echo type 3
     -$(MKDIRHIER) $(ZIP5DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP5TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP5DIR)" != ""
     @echo type 4
-    -$(ZIPDEP) $(ZIP5FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP5TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP5FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP5DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f)
+    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
 
 
 $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
     @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
     @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP5DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away$/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $@.$(INPATH)
     $(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
 .ELSE			# "$(ZIP5DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
     zip $(ZIP5FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
     @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
 .ENDIF			# "$(ZIP5DIR)" != ""
@@ -689,21 +623,17 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP5DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away$/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)  $@ 
     $(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
 .ELSE			# "$(ZIP5DIR)" != ""
-    zip $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP5TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    zip $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $@ $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(ZIP5DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -727,18 +657,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 ZIP6EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP6LIST:s/LANGDIR//)" == "$(ZIP6LIST)"
-ZIP6TARGETN=$(COMMONBIN)$/$(ZIP6TARGET)$(ZIP6EXT)
+ZIP6TARGETN=$(COMMONBIN)/$(ZIP6TARGET)$(ZIP6EXT)
 .ELSE
-ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(COMMONBIN)$/$(ZIP6TARGET)_$i$(ZIP6EXT) )
+ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(COMMONBIN)/$(ZIP6TARGET)_$i$(ZIP6EXT) )
 .ENDIF
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP6LIST:s/LANGDIR//)" == "$(ZIP6LIST)"
-ZIP6TARGETN=$(BIN)$/$(ZIP6TARGET)$(ZIP6EXT)
+ZIP6TARGETN=$(BIN)/$(ZIP6TARGET)$(ZIP6EXT)
 .ELSE
-ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(BIN)$/$(ZIP6TARGET)_$i$(ZIP6EXT) )
+ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(BIN)/$(ZIP6TARGET)_$i$(ZIP6EXT) )
 .ENDIF
 .ENDIF			# "$(common_build_zip)"!=""
-ZIP6DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP6TARGETN:s/$(ZIP6EXT)/.dpzz/)))
+ZIP6DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP6TARGETN:s/$(ZIP6EXT)/.dpzz/)))
 ZIPDEPFILES+=$(ZIP6DEPFILE)
 
 ZIP6DIR*=$(ZIPDIR)
@@ -746,11 +676,7 @@ ZIP6FLAGS*=$(ZIPFLAGS)
 .IF "$(zip6generatedlangs)"!=""
 zip6langdirs*=$(alllangiso)
 .ELSE           # "$(zip6generatedlangs)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip6langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE			# "$(GUI)"=="UNX"
-zip6langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP6DIR))} /ba:d )))
-.ENDIF			# "$(GUI)"=="UNX"
+zip6langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ENDIF          # "$(zip6generatedlangs)"!=""
 .IF "$(ZIP6FORCEALLLANG)"!=""
 zip6alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip6langdirs) $(eq,$i,$j  $i $(NULL))))
@@ -763,65 +689,59 @@ zip6alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip6langdirs) $(eq,$i,$
 
 ZIP6TMP:=$(mktmp iii)
 
-$(MISC)$/$(TARGET).$(PWD:f).$(ZIP6TARGET).dpzz : $(ZIP6TARGETN)
+$(MISC)/$(TARGET).$(PWD:f).$(ZIP6TARGET).dpzz : $(ZIP6TARGETN)
 
 .IF "$(common_build_zip)"!=""
-ZIP6HELPVAR=$(COMMONBIN)$/$(ZIP6TARGET)
+ZIP6HELPVAR=$(COMMONBIN)/$(ZIP6TARGET)
 .ELSE			# "$(common_build_zip)"!=""
-ZIP6HELPVAR=$(BIN)$/$(ZIP6TARGET)
+ZIP6HELPVAR=$(BIN)/$(ZIP6TARGET)
 .ENDIF			# "$(common_build_zip)"!=""
 
 $(ZIP6DEPFILE) :
-    echo # > $(MISC)$/$(@:f)
+    echo # > $(MISC)/$(@:f)
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP6DIR)" != ""
     @echo type 1
     -$(MKDIRHIER) $(ZIP6DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP6DIR)" != ""
     @echo type 2
-    -$(ZIPDEP) $(ZIP6FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP6FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP6DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP6DIR)" != ""
     @echo type 3
     -$(MKDIRHIER) $(ZIP6DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP6TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP6DIR)" != ""
     @echo type 4
-    -$(ZIPDEP) $(ZIP6FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP6TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP6FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP6DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f)
+    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
 
 
 $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
     @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
     @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP6DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away$/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $@.$(INPATH)
     $(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
 .ELSE			# "$(ZIP6DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
     zip $(ZIP6FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
     @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
 .ENDIF			# "$(ZIP6DIR)" != ""
@@ -831,21 +751,17 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP6DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away$/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)  $@ 
     $(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
 .ELSE			# "$(ZIP6DIR)" != ""
-    zip $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP6TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    zip $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $@ $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(ZIP6DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -869,18 +785,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 ZIP7EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP7LIST:s/LANGDIR//)" == "$(ZIP7LIST)"
-ZIP7TARGETN=$(COMMONBIN)$/$(ZIP7TARGET)$(ZIP7EXT)
+ZIP7TARGETN=$(COMMONBIN)/$(ZIP7TARGET)$(ZIP7EXT)
 .ELSE
-ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(COMMONBIN)$/$(ZIP7TARGET)_$i$(ZIP7EXT) )
+ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(COMMONBIN)/$(ZIP7TARGET)_$i$(ZIP7EXT) )
 .ENDIF
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP7LIST:s/LANGDIR//)" == "$(ZIP7LIST)"
-ZIP7TARGETN=$(BIN)$/$(ZIP7TARGET)$(ZIP7EXT)
+ZIP7TARGETN=$(BIN)/$(ZIP7TARGET)$(ZIP7EXT)
 .ELSE
-ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(BIN)$/$(ZIP7TARGET)_$i$(ZIP7EXT) )
+ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(BIN)/$(ZIP7TARGET)_$i$(ZIP7EXT) )
 .ENDIF
 .ENDIF			# "$(common_build_zip)"!=""
-ZIP7DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP7TARGETN:s/$(ZIP7EXT)/.dpzz/)))
+ZIP7DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP7TARGETN:s/$(ZIP7EXT)/.dpzz/)))
 ZIPDEPFILES+=$(ZIP7DEPFILE)
 
 ZIP7DIR*=$(ZIPDIR)
@@ -888,11 +804,7 @@ ZIP7FLAGS*=$(ZIPFLAGS)
 .IF "$(zip7generatedlangs)"!=""
 zip7langdirs*=$(alllangiso)
 .ELSE           # "$(zip7generatedlangs)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip7langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE			# "$(GUI)"=="UNX"
-zip7langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP7DIR))} /ba:d )))
-.ENDIF			# "$(GUI)"=="UNX"
+zip7langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ENDIF          # "$(zip7generatedlangs)"!=""
 .IF "$(ZIP7FORCEALLLANG)"!=""
 zip7alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip7langdirs) $(eq,$i,$j  $i $(NULL))))
@@ -905,65 +817,59 @@ zip7alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip7langdirs) $(eq,$i,$
 
 ZIP7TMP:=$(mktmp iii)
 
-$(MISC)$/$(TARGET).$(PWD:f).$(ZIP7TARGET).dpzz : $(ZIP7TARGETN)
+$(MISC)/$(TARGET).$(PWD:f).$(ZIP7TARGET).dpzz : $(ZIP7TARGETN)
 
 .IF "$(common_build_zip)"!=""
-ZIP7HELPVAR=$(COMMONBIN)$/$(ZIP7TARGET)
+ZIP7HELPVAR=$(COMMONBIN)/$(ZIP7TARGET)
 .ELSE			# "$(common_build_zip)"!=""
-ZIP7HELPVAR=$(BIN)$/$(ZIP7TARGET)
+ZIP7HELPVAR=$(BIN)/$(ZIP7TARGET)
 .ENDIF			# "$(common_build_zip)"!=""
 
 $(ZIP7DEPFILE) :
-    echo # > $(MISC)$/$(@:f)
+    echo # > $(MISC)/$(@:f)
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP7DIR)" != ""
     @echo type 1
     -$(MKDIRHIER) $(ZIP7DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP7DIR)" != ""
     @echo type 2
-    -$(ZIPDEP) $(ZIP7FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP7FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP7DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP7DIR)" != ""
     @echo type 3
     -$(MKDIRHIER) $(ZIP7DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP7TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP7DIR)" != ""
     @echo type 4
-    -$(ZIPDEP) $(ZIP7FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP7TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP7FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP7DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f)
+    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
 
 
 $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
     @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
     @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP7DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away$/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $@.$(INPATH)
     $(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
 .ELSE			# "$(ZIP7DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
     zip $(ZIP7FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
     @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
 .ENDIF			# "$(ZIP7DIR)" != ""
@@ -973,21 +879,17 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP7DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away$/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)  $@ 
     $(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
 .ELSE			# "$(ZIP7DIR)" != ""
-    zip $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP7TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    zip $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $@ $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(ZIP7DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -1011,18 +913,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 ZIP8EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP8LIST:s/LANGDIR//)" == "$(ZIP8LIST)"
-ZIP8TARGETN=$(COMMONBIN)$/$(ZIP8TARGET)$(ZIP8EXT)
+ZIP8TARGETN=$(COMMONBIN)/$(ZIP8TARGET)$(ZIP8EXT)
 .ELSE
-ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(COMMONBIN)$/$(ZIP8TARGET)_$i$(ZIP8EXT) )
+ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(COMMONBIN)/$(ZIP8TARGET)_$i$(ZIP8EXT) )
 .ENDIF
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP8LIST:s/LANGDIR//)" == "$(ZIP8LIST)"
-ZIP8TARGETN=$(BIN)$/$(ZIP8TARGET)$(ZIP8EXT)
+ZIP8TARGETN=$(BIN)/$(ZIP8TARGET)$(ZIP8EXT)
 .ELSE
-ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(BIN)$/$(ZIP8TARGET)_$i$(ZIP8EXT) )
+ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(BIN)/$(ZIP8TARGET)_$i$(ZIP8EXT) )
 .ENDIF
 .ENDIF			# "$(common_build_zip)"!=""
-ZIP8DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP8TARGETN:s/$(ZIP8EXT)/.dpzz/)))
+ZIP8DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP8TARGETN:s/$(ZIP8EXT)/.dpzz/)))
 ZIPDEPFILES+=$(ZIP8DEPFILE)
 
 ZIP8DIR*=$(ZIPDIR)
@@ -1030,11 +932,7 @@ ZIP8FLAGS*=$(ZIPFLAGS)
 .IF "$(zip8generatedlangs)"!=""
 zip8langdirs*=$(alllangiso)
 .ELSE           # "$(zip8generatedlangs)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip8langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE			# "$(GUI)"=="UNX"
-zip8langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP8DIR))} /ba:d )))
-.ENDIF			# "$(GUI)"=="UNX"
+zip8langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ENDIF          # "$(zip8generatedlangs)"!=""
 .IF "$(ZIP8FORCEALLLANG)"!=""
 zip8alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip8langdirs) $(eq,$i,$j  $i $(NULL))))
@@ -1047,65 +945,59 @@ zip8alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip8langdirs) $(eq,$i,$
 
 ZIP8TMP:=$(mktmp iii)
 
-$(MISC)$/$(TARGET).$(PWD:f).$(ZIP8TARGET).dpzz : $(ZIP8TARGETN)
+$(MISC)/$(TARGET).$(PWD:f).$(ZIP8TARGET).dpzz : $(ZIP8TARGETN)
 
 .IF "$(common_build_zip)"!=""
-ZIP8HELPVAR=$(COMMONBIN)$/$(ZIP8TARGET)
+ZIP8HELPVAR=$(COMMONBIN)/$(ZIP8TARGET)
 .ELSE			# "$(common_build_zip)"!=""
-ZIP8HELPVAR=$(BIN)$/$(ZIP8TARGET)
+ZIP8HELPVAR=$(BIN)/$(ZIP8TARGET)
 .ENDIF			# "$(common_build_zip)"!=""
 
 $(ZIP8DEPFILE) :
-    echo # > $(MISC)$/$(@:f)
+    echo # > $(MISC)/$(@:f)
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP8DIR)" != ""
     @echo type 1
     -$(MKDIRHIER) $(ZIP8DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP8DIR)" != ""
     @echo type 2
-    -$(ZIPDEP) $(ZIP8FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP8FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP8DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP8DIR)" != ""
     @echo type 3
     -$(MKDIRHIER) $(ZIP8DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP8TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP8DIR)" != ""
     @echo type 4
-    -$(ZIPDEP) $(ZIP8FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP8TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP8FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP8DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f)
+    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
 
 
 $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
     @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
     @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP8DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away$/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $@.$(INPATH)
     $(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
 .ELSE			# "$(ZIP8DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
     zip $(ZIP8FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
     @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
 .ENDIF			# "$(ZIP8DIR)" != ""
@@ -1115,21 +1007,17 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP8DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away$/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)  $@ 
     $(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
 .ELSE			# "$(ZIP8DIR)" != ""
-    zip $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP8TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    zip $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $@ $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(ZIP8DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -1153,18 +1041,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 ZIP9EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP9LIST:s/LANGDIR//)" == "$(ZIP9LIST)"
-ZIP9TARGETN=$(COMMONBIN)$/$(ZIP9TARGET)$(ZIP9EXT)
+ZIP9TARGETN=$(COMMONBIN)/$(ZIP9TARGET)$(ZIP9EXT)
 .ELSE
-ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(COMMONBIN)$/$(ZIP9TARGET)_$i$(ZIP9EXT) )
+ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(COMMONBIN)/$(ZIP9TARGET)_$i$(ZIP9EXT) )
 .ENDIF
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP9LIST:s/LANGDIR//)" == "$(ZIP9LIST)"
-ZIP9TARGETN=$(BIN)$/$(ZIP9TARGET)$(ZIP9EXT)
+ZIP9TARGETN=$(BIN)/$(ZIP9TARGET)$(ZIP9EXT)
 .ELSE
-ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(BIN)$/$(ZIP9TARGET)_$i$(ZIP9EXT) )
+ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(BIN)/$(ZIP9TARGET)_$i$(ZIP9EXT) )
 .ENDIF
 .ENDIF			# "$(common_build_zip)"!=""
-ZIP9DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP9TARGETN:s/$(ZIP9EXT)/.dpzz/)))
+ZIP9DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP9TARGETN:s/$(ZIP9EXT)/.dpzz/)))
 ZIPDEPFILES+=$(ZIP9DEPFILE)
 
 ZIP9DIR*=$(ZIPDIR)
@@ -1172,11 +1060,7 @@ ZIP9FLAGS*=$(ZIPFLAGS)
 .IF "$(zip9generatedlangs)"!=""
 zip9langdirs*=$(alllangiso)
 .ELSE           # "$(zip9generatedlangs)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip9langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE			# "$(GUI)"=="UNX"
-zip9langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP9DIR))} /ba:d )))
-.ENDIF			# "$(GUI)"=="UNX"
+zip9langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ENDIF          # "$(zip9generatedlangs)"!=""
 .IF "$(ZIP9FORCEALLLANG)"!=""
 zip9alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip9langdirs) $(eq,$i,$j  $i $(NULL))))
@@ -1189,65 +1073,59 @@ zip9alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip9langdirs) $(eq,$i,$
 
 ZIP9TMP:=$(mktmp iii)
 
-$(MISC)$/$(TARGET).$(PWD:f).$(ZIP9TARGET).dpzz : $(ZIP9TARGETN)
+$(MISC)/$(TARGET).$(PWD:f).$(ZIP9TARGET).dpzz : $(ZIP9TARGETN)
 
 .IF "$(common_build_zip)"!=""
-ZIP9HELPVAR=$(COMMONBIN)$/$(ZIP9TARGET)
+ZIP9HELPVAR=$(COMMONBIN)/$(ZIP9TARGET)
 .ELSE			# "$(common_build_zip)"!=""
-ZIP9HELPVAR=$(BIN)$/$(ZIP9TARGET)
+ZIP9HELPVAR=$(BIN)/$(ZIP9TARGET)
 .ENDIF			# "$(common_build_zip)"!=""
 
 $(ZIP9DEPFILE) :
-    echo # > $(MISC)$/$(@:f)
+    echo # > $(MISC)/$(@:f)
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP9DIR)" != ""
     @echo type 1
     -$(MKDIRHIER) $(ZIP9DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP9DIR)" != ""
     @echo type 2
-    -$(ZIPDEP) $(ZIP9FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP9FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP9DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP9DIR)" != ""
     @echo type 3
     -$(MKDIRHIER) $(ZIP9DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP9TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP9DIR)" != ""
     @echo type 4
-    -$(ZIPDEP) $(ZIP9FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP9TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP9FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP9DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f)
+    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
 
 
 $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
     @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
     @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP9DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away$/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $@.$(INPATH)
     $(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
 .ELSE			# "$(ZIP9DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
     zip $(ZIP9FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
     @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
 .ENDIF			# "$(ZIP9DIR)" != ""
@@ -1257,21 +1135,17 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP9DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away$/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)  $@ 
     $(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
 .ELSE			# "$(ZIP9DIR)" != ""
-    zip $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP9TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    zip $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $@ $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(ZIP9DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
@@ -1295,18 +1169,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 ZIP10EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP10LIST:s/LANGDIR//)" == "$(ZIP10LIST)"
-ZIP10TARGETN=$(COMMONBIN)$/$(ZIP10TARGET)$(ZIP10EXT)
+ZIP10TARGETN=$(COMMONBIN)/$(ZIP10TARGET)$(ZIP10EXT)
 .ELSE
-ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(COMMONBIN)$/$(ZIP10TARGET)_$i$(ZIP10EXT) )
+ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(COMMONBIN)/$(ZIP10TARGET)_$i$(ZIP10EXT) )
 .ENDIF
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP10LIST:s/LANGDIR//)" == "$(ZIP10LIST)"
-ZIP10TARGETN=$(BIN)$/$(ZIP10TARGET)$(ZIP10EXT)
+ZIP10TARGETN=$(BIN)/$(ZIP10TARGET)$(ZIP10EXT)
 .ELSE
-ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(BIN)$/$(ZIP10TARGET)_$i$(ZIP10EXT) )
+ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(BIN)/$(ZIP10TARGET)_$i$(ZIP10EXT) )
 .ENDIF
 .ENDIF			# "$(common_build_zip)"!=""
-ZIP10DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP10TARGETN:s/$(ZIP10EXT)/.dpzz/)))
+ZIP10DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP10TARGETN:s/$(ZIP10EXT)/.dpzz/)))
 ZIPDEPFILES+=$(ZIP10DEPFILE)
 
 ZIP10DIR*=$(ZIPDIR)
@@ -1314,11 +1188,7 @@ ZIP10FLAGS*=$(ZIPFLAGS)
 .IF "$(zip10generatedlangs)"!=""
 zip10langdirs*=$(alllangiso)
 .ELSE           # "$(zip10generatedlangs)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip10langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE			# "$(GUI)"=="UNX"
-zip10langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP10DIR))} /ba:d )))
-.ENDIF			# "$(GUI)"=="UNX"
+zip10langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ENDIF          # "$(zip10generatedlangs)"!=""
 .IF "$(ZIP10FORCEALLLANG)"!=""
 zip10alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip10langdirs) $(eq,$i,$j  $i $(NULL))))
@@ -1331,65 +1201,59 @@ zip10alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip10langdirs) $(eq,$i
 
 ZIP10TMP:=$(mktmp iii)
 
-$(MISC)$/$(TARGET).$(PWD:f).$(ZIP10TARGET).dpzz : $(ZIP10TARGETN)
+$(MISC)/$(TARGET).$(PWD:f).$(ZIP10TARGET).dpzz : $(ZIP10TARGETN)
 
 .IF "$(common_build_zip)"!=""
-ZIP10HELPVAR=$(COMMONBIN)$/$(ZIP10TARGET)
+ZIP10HELPVAR=$(COMMONBIN)/$(ZIP10TARGET)
 .ELSE			# "$(common_build_zip)"!=""
-ZIP10HELPVAR=$(BIN)$/$(ZIP10TARGET)
+ZIP10HELPVAR=$(BIN)/$(ZIP10TARGET)
 .ENDIF			# "$(common_build_zip)"!=""
 
 $(ZIP10DEPFILE) :
-    echo # > $(MISC)$/$(@:f)
+    echo # > $(MISC)/$(@:f)
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP10DIR)" != ""
     @echo type 1
     -$(MKDIRHIER) $(ZIP10DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP10DIR)" != ""
     @echo type 2
-    -$(ZIPDEP) $(ZIP10FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP10FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP10DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP10DIR)" != ""
     @echo type 3
     -$(MKDIRHIER) $(ZIP10DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP10TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP10DIR)" != ""
     @echo type 4
-    -$(ZIPDEP) $(ZIP10FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP10TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP10FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP10DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f)
+    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
 
 
 $(ZIP10TARGETN) : delzip $(ZIP10DEPS)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
     @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
     @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP10DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away$/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $@.$(INPATH)
     $(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
 .ELSE			# "$(ZIP10DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
     zip $(ZIP10FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
     @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
 .ENDIF			# "$(ZIP10DIR)" != ""
@@ -1399,21 +1263,17 @@ $(ZIP10TARGETN) : delzip $(ZIP10DEPS)
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP10DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away$/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)  $@ 
     $(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
 .ELSE			# "$(ZIP10DIR)" != ""
-    zip $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP10TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    zip $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $@ $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(ZIP10DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
index f7aaebba5..6c7d9b269 100644
--- a/solenv/inc/ant.mk
+++ b/solenv/inc/ant.mk
@@ -35,8 +35,8 @@
 JDK_VERSION=140
 JAVA_HOME=$(JDK14PATH)
 
-PATH!:=$(JDK14PATH)$/bin$(PATH_SEPERATOR)$(PATH)
-XCLASSPATH:=$(JDK14PATH)$/jre/lib/rt.jar
+PATH!:=$(JDK14PATH)/bin$(PATH_SEPERATOR)$(PATH)
+XCLASSPATH:=$(JDK14PATH)/jre/lib/rt.jar
 CLASSPATH:=$(XCLASSPATH)
 .ENDIF
 
@@ -51,14 +51,14 @@ CLASSPATH:=$(XCLASSPATH)
 
 .INCLUDE : target.mk
 
-CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA_HOME)$/lib$/tools.jar
+CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA_HOME)/lib/tools.jar
 .EXPORT : CLASSPATH
 .EXPORT : PATH
 
 # --- TARGETS -----------------------------------------------------
 
-$(CLASSDIR)$/solar.properties : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg $(SOLARENV)$/inc/ant.properties
-	@echo "Making:   " $@
+$(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg $(SOLARENV)/inc/ant.properties
+    @echo Making: $@
     @echo solar.build=$(BUILD) > $@
     @echo solar.rscversion=$(USQ)$(RSCVERSION)$(USQ) >> $@
     @echo solar.rscrevision=$(USQ)$(RSCREVISION)$(USQ) >> $@
@@ -66,7 +66,7 @@ $(CLASSDIR)$/solar.properties : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/m
     @echo solar.sourceversion=$(SOURCEVERSION) >> $@
     @echo solar.udkstamp=$(UDKSTAMP) >> $@
     @echo solar.extstamp=$(EXTSTAMP) >> $@
-    @cat $(DMAKEROOT)$/../ant.properties >> $@
+    @cat $(DMAKEROOT)/../ant.properties >> $@
 
 ANTBUILD .PHONY:
     $(ANT) $(ANT_FLAGS)
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index 6d1245ddb..a5d04289f 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -33,23 +33,19 @@
 .IF "$(SOLAR_JAVA)"!=""
 
 .IF "$(ANT_HOME)" == ""
-ANT_HOME*:=$(COMMON_BUILD_TOOLS)$/apache-ant-1.7.0
+ANT_HOME*:=$(COMMON_BUILD_TOOLS)/apache-ant-1.7.0
 .EXPORT : ANT_HOME
 .ENDIF
-ANT_LIB*:=$(ANT_HOME)$/lib
+ANT_LIB*:=$(ANT_HOME)/lib
 
-ANT_CLASSPATH:=$(ANT_LIB)$/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)$/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)$/ant.jar
+ANT_CLASSPATH:=$(ANT_LIB)/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar
 
 # PATH_SEPERATOR won't work here as it is defined
 # as ; for wondows (all shells)
-#PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR)$(PATH)
-.IF "$(USE_SHELL)"=="4nt"
-PATH!:=$(ANT_HOME)$/bin;$(PATH)
-.ELSE			# "$(USE_SHELL)"=="4nt"
-PATH!:=$(ANT_HOME)$/bin:$(PATH)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+#PATH!:=$(ANT_HOME)/bin$(PATH_SEPERATOR)$(PATH)
+PATH!:=$(ANT_HOME)/bin:$(PATH)
 
-ANT*:=$(ANT_HOME)$/bin$/ant
+ANT*:=$(ANT_HOME)/bin/ant
 ANT_BUILDFILE*=build.xml
 
 .IF "$(ANT_COMPILER_FLAGS)"==""
diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk
index 356746321..6571d60d3 100644
--- a/solenv/inc/cppunit.mk
+++ b/solenv/inc/cppunit.mk
@@ -45,7 +45,7 @@
 # cat cppunit.mk | mkunroll >_cppunit.mk
 # all between begin and end will repeat n times (at the moment n=10) to create such iterations
 # $(TNR) is the number
-# $(SHL$(TNR)TARGETN) is the same like $(OUT)$/bin$/$(SHL1TARGET) for every number, within unix, "bin" is replaced by "lib"
+# $(SHL$(TNR)TARGETN) is the same like $(OUT)/bin/$(SHL1TARGET) for every number, within unix, "bin" is replaced by "lib"
 
 #.IF "$(TESTOPT)"==""
 #	TESTOPT="-onlyerrors"
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index dc4771420..25dfa76a4 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -29,90 +29,90 @@
 #
 #*************************************************************************
 
-.SOURCE.xcu : $(MISC)$/$(EXTNAME)$/merge $(MISC)$/$(EXTNAME)$/registry$/data $(MISC)$/$(COMPONENT_SHARED_CONFIG)_in$/merge $(MISC)$/$(COMPONENT_SHARED_CONFIG)_in$/registry$/data $(COMPONENT_CONFIGDIR) .
-.SOURCE.xcs : $(MISC)$/$(EXTNAME)$/registry $(MISC)$/$(EXTNAME)$/registry$/schema .
+.SOURCE.xcu : $(MISC)/$(EXTNAME)/merge $(MISC)/$(EXTNAME)/registry/data $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/merge $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/registry/data $(COMPONENT_CONFIGDIR) .
+.SOURCE.xcs : $(MISC)/$(EXTNAME)/registry $(MISC)/$(EXTNAME)/registry/schema .
 
-fixme=$(MISC)$/$(EXTNAME)$/merge$/$(MISC)
+fixme=$(MISC)/$(EXTNAME)/merge/$(MISC)
 fixme2=$(fixme:n)
 
-fixme3=$(MISC)$/$(EXTNAME)$/$(MISC)
+fixme3=$(MISC)/$(EXTNAME)/$(MISC)
 fixme4=$(fixme:n)
 
-$(EXTENSIONDIR)$/$(COMPONENT_CONFIGDEST)$/%.xcu : %.xcu
+$(EXTENSIONDIR)/$(COMPONENT_CONFIGDEST)/%.xcu : %.xcu
 # ugly hacking to workaround prepended first source path
     @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d))
     $(GNUCOPY) $< $(subst,$(fixme2),$(MISC) $@)
     
-$(EXTENSIONDIR)$/$(COMPONENT_CONFIGDESTSCHEMA)$/%.xcs : %.xcs
+$(EXTENSIONDIR)/$(COMPONENT_CONFIGDESTSCHEMA)/%.xcs : %.xcs
     @@-$(MKDIRHIER) $(subst,$(fixme4),$(MISC) $(@:d))
     $(GNUCOPY) $< $(subst,$(fixme4),$(MISC) $@)
 
-$(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
+$(EXTENSIONDIR)/%.jar : $(SOLARBINDIR)/%.jar
     @@-$(MKDIRHIER) $(@:d)
     $(GNUCOPY) $< $@
 
 .IF "$(COMPONENT_FILES)"!=""
-COMPONENT_FILES_SRC*=.$/
+COMPONENT_FILES_SRC*=./
 # ugly hacking to workaround prepended first source path - also hits
 # here in case of "just copied" .xcu files
-$(COMPONENT_FILES) : $$(@:s|$(fixme2)|$(MISC)|:s|$(EXTENSIONDIR)$/|$(COMPONENT_FILES_SRC)|)
+$(COMPONENT_FILES) : $$(@:s|$(fixme2)|$(MISC)|:s|$(EXTENSIONDIR)/|$(COMPONENT_FILES_SRC)|)
     @@-$(MKDIRHIER) $(@:s|$(fixme2)|$(MISC)|:d)
     $(COPY) $< $(@:s|$(fixme2)|$(MISC)|)
 .ENDIF			# "$(COMPONENT_FILES)"!=""
 
 .IF "$(COMPONENT_JARFILES)"!=""
-$(COMPONENT_JARFILES) : $(CLASSDIR)$/$$(@:f)
+$(COMPONENT_JARFILES) : $(CLASSDIR)/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 .ENDIF			# "$(COMPONENT_JARFILES)"!=""
 
 .IF "$(COMPONENT_LIBRARIES)"!=""
 # TODO(Q3): strip the binary?
-$(COMPONENT_LIBRARIES) : $(DLLDEST)$/$$(@:f)
+$(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 .IF "$(OS)$(CPU)"=="WNTI"
 .IF "$(COM)"=="GCC"
-   $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(EXTENSIONDIR)
+   $(GNUCOPY) $(SOLARBINDIR)/mingwm10.dll $(EXTENSIONDIR)
    .IF "$(MINGW_GCCDLL)"!=""
-     $(GNUCOPY) $(SOLARBINDIR)$/$(MINGW_GCCDLL) $(EXTENSIONDIR)
+     $(GNUCOPY) $(SOLARBINDIR)/$(MINGW_GCCDLL) $(EXTENSIONDIR)
    .ENDIF
    .IF "$(MINGW_GXXDLL)"!=""
-     $(GNUCOPY) $(SOLARBINDIR)$/$(MINGW_GXXDLL) $(EXTENSIONDIR)
+     $(GNUCOPY) $(SOLARBINDIR)/$(MINGW_GXXDLL) $(EXTENSIONDIR)
    .ENDIF
 .ELSE
 .IF "$(PACKMS)"!=""
 .IF "$(CCNUMVER)" <= "001399999999"
-    $(GNUCOPY) $(PACKMS)$/msvcr71.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)$/msvcp71.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(PACKMS)/msvcr71.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(PACKMS)/msvcp71.dll $(EXTENSIONDIR)
 .ELSE			# "$(CCNUMVER)" <= "001399999999"
 .IF "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(PACKMS)$/msvcr80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)$/msvcp80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)$/msvcm80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)$/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
+    $(GNUCOPY) $(PACKMS)/msvcr80.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(PACKMS)/msvcp80.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(PACKMS)/msvcm80.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(PACKMS)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
 .ELSE			# "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(PACKMS)$/msvcr90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)$/msvcp90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)$/msvcm90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)$/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
+    $(GNUCOPY) $(PACKMS)/msvcr90.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(PACKMS)/msvcp90.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(PACKMS)/msvcm90.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(PACKMS)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
 .ENDIF 			# "$(CCNUMVER)" <= "001499999999"
 .ENDIF			# "$(CCNUMVER)" <= "001399999999"
 .ELSE        # "$(PACKMS)"!=""
 .IF "$(CCNUMVER)" <= "001399999999"
-    $(GNUCOPY) $(SOLARBINDIR)$/msvcr71.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)$/msvcp71.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(SOLARBINDIR)/msvcr71.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(SOLARBINDIR)/msvcp71.dll $(EXTENSIONDIR)
 .ELSE			# "$(CCNUMVER)" <= "001399999999"
 .IF "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(SOLARBINDIR)$/msvcr80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)$/msvcp80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)$/msvcm80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
+    $(GNUCOPY) $(SOLARBINDIR)/msvcr80.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(SOLARBINDIR)/msvcp80.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(SOLARBINDIR)/msvcm80.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
 .ELSE    		# "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(SOLARBINDIR)$/msvcr90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)$/msvcp90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)$/msvcm90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
+    $(GNUCOPY) $(SOLARBINDIR)/msvcr90.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(SOLARBINDIR)/msvcp90.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(SOLARBINDIR)/msvcm90.dll $(EXTENSIONDIR)
+    $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
 .ENDIF			# "$(CCNUMVER)" <= "001499999999"
 .ENDIF			# "$(CCNUMVER)" <= "001399999999"
 .ENDIF          # "$(PACKMS)"!=""
@@ -122,28 +122,28 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)$/$$(@:f)
 
 IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)-$(PLATFORMID)"
 
-.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+.INCLUDE .IGNORE : $(MISC)/$(TARGET)_lang_track.mk
 .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
 PHONYDESC=.PHONY
 .ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
 .IF "$(DESCRIPTION)"!=""
 $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
     @@-$(MKDIRHIER) $(@:d)
-    $(PERL) $(SOLARENV)$/bin$/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
-    @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
-    $(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $(MISC)$/desc.tmp.$(EXTNAME)
+    $(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
+    @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk
+    $(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $(MISC)/desc.tmp.$(EXTNAME)
     @@-$(RM) $@.$(EXTNAME)
-    $(TYPE) $(MISC)$/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
-    @@-$(RM) $(MISC)$/desc.tmp.$(EXTNAME)
+    $(TYPE) $(MISC)/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
+    @@-$(RM) $(MISC)/desc.tmp.$(EXTNAME)
 
 .ENDIF			# "$(DESCRIPTION)"!=""
 # default OOo license text!!!
 # may not fit...
 .IF "$(CUSTOM_LICENSE)"==""
 .IF "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+PACKLICDEPS=$(SOLARBINDIR)/osl/license$$(@:b:s/_/./:e:s/./_/)$$(@:e)
 .ELSE			# "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
 .ENDIF			# "$(GUI)" == "WNT"
 .ELSE			# "$(CUSTOM_LICENSE)" == ""
 PACKLICDEPS=$(CUSTOM_LICENSE)
@@ -161,7 +161,7 @@ $(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS)
 .IF "$(COMPONENT_MANIFEST_GENERIC)" == ""
     $(TYPE) $(MANIFEST_SRC) | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" | $(SED) "s/EXEC_EXTENSION/$(EXECPOST)/" > $@
 .ELSE			# "$(COMPONENT_MANIFEST_GENERIC)" != ""
-    $(PERL) $(SOLARENV)$/bin$/makemani.pl $(PRJ)$/util$/manifest.xml $(EXTENSIONDIR) $(COMPONENT_MANIFEST_SEARCHDIR) $(@:d:d)
+    $(PERL) $(SOLARENV)/bin/makemani.pl $(PRJ)/util/manifest.xml $(EXTENSIONDIR) $(COMPONENT_MANIFEST_SEARCHDIR) $(@:d:d)
 .ENDIF			# "$(COMPONENT_MANIFEST_GENERIC)" != ""
 .ENDIF			# "$(COMPONENT_MANIFEST)"!=""
 
diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk
index fd45a4498..84a9d48fd 100644
--- a/solenv/inc/extension_pre.mk
+++ b/solenv/inc/extension_pre.mk
@@ -29,24 +29,24 @@
 #
 #*************************************************************************
 
-EXTENSIONDIR*:=$(MISC)$/$(EXTENSIONNAME)
+EXTENSIONDIR*:=$(MISC)/$(EXTENSIONNAME)
 
 COMPONENT_CONFIGDIR*:=.
-COMPONENT_CONFIGDEST*:=registry$/data
-COMPONENT_CONFIGDESTSCHEMA*:=registry$/schema
+COMPONENT_CONFIGDEST*:=registry/data
+COMPONENT_CONFIGDESTSCHEMA*:=registry/schema
 
 .IF "$(COMPONENT_COPYONLY)"==""
-DESCRIPTION:=$(EXTENSIONDIR)$/description.xml
+DESCRIPTION:=$(EXTENSIONDIR)/description.xml
 DESCRIPTION_SRC*:=description.xml
 
-COMPONENT_MANIFEST*:=$(EXTENSIONDIR)$/META-INF$/manifest.xml
+COMPONENT_MANIFEST*:=$(EXTENSIONDIR)/META-INF/manifest.xml
 MANIFEST_SRC*:=manifest.xml
 
 .IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
-PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)$/registration$/license_$i.txt)
+PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/license_$i.txt)
 COMPONENT_LIC_TEMPL*:=registration/license_xxx.txt
 .ELSE
-PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)$/registration$/LICENSE_$i)
+PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/LICENSE_$i)
 COMPONENT_LIC_TEMPL*:=registration/LICENSE_xxx
 .ENDIF
 
diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk
index 46bb537c8..6d34ced82 100644
--- a/solenv/inc/javaunittest.mk
+++ b/solenv/inc/javaunittest.mk
@@ -67,15 +67,15 @@ XCLASSPATH := $(CLASSDIR)
 .ELSE
 XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPERATOR)$(CLASSDIR)
 .ENDIF
-CLASSDIR !:= $(CLASSDIR)$/test
+CLASSDIR !:= $(CLASSDIR)/test
 
 .INCLUDE: target.mk
 
 ALLTAR: $(TESTS)
 
-$(JAVAFILES): $(MISC)$/$(TARGET).classdir.flag
+$(JAVAFILES): $(MISC)/$(TARGET).classdir.flag
 
-$(MISC)$/$(TARGET).classdir.flag:
+$(MISC)/$(TARGET).classdir.flag:
     - $(MKDIR) $(CLASSDIR)
     $(TOUCH) $@
 
@@ -85,26 +85,26 @@ $(TESTS): $(JAVACLASSFILES)
 
 %.test .PHONY: %.java
     $(JAVAI) $(JAVACPS) $(CLASSPATH) org.openoffice.Runner -TestBase java_complex \
-        -NoOffice yes -o $(subst,$/,. $(subst,.test, $(PACKAGE).$@))
+        -NoOffice yes -o $(subst,/,. $(subst,.test, $(PACKAGE).$@))
 
 .IF "$(IDLTESTFILES)" != ""
 
 # The following dependency (to execute javac whenever javamaker has run) does
 # not work reliably, see #i28827#:
-$(JAVAFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).javamaker.flag
+$(JAVAFILES) $(JAVACLASSFILES): $(MISC)/$(TARGET).javamaker.flag
 
-$(MISC)$/$(TARGET).javamaker.flag: $(MISC)$/$(TARGET).rdb
-    $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD $< -X$(SOLARBINDIR)$/types.rdb
+$(MISC)/$(TARGET).javamaker.flag: $(MISC)/$(TARGET).rdb
+    $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD $< -X$(SOLARBINDIR)/types.rdb
     $(TOUCH) $@
 
-$(MISC)$/$(TARGET).rdb .ERRREMOVE: \
-        $(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)$/$(TARGET)$/$i))
+$(MISC)/$(TARGET).rdb .ERRREMOVE: \
+        $(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)/$(TARGET)/$i))
     - rm $@
     $(REGMERGE) $@ /UCR $<
 
-$(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)$/$(TARGET)$/$i)): \
+$(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)/$(TARGET)/$i)): \
         $(IDLTESTFILES)
-    - $(MKDIR) $(MISC)$/$(TARGET)
-    $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
+    - $(MKDIR) $(MISC)/$(TARGET)
+    $(IDLC) -O$(MISC)/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
 
 .ENDIF
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 4b2a98674..d541ba247 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -39,7 +39,7 @@ ODMA_LIB_LIB=
 #externe libs in plattform.mk
 #
 .IF "$(GUI)$(COM)"=="WNTGCC"
-AWTLIB*=$(JAVA_HOME)$/lib$/jawt.lib
+AWTLIB*=$(JAVA_HOME)/lib/jawt.lib
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 AWTLIB*=-ljawt
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -57,7 +57,7 @@ ICUUCLIB=-licuuc
 ICUDATALIB=-licudata
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 I18NUTILLIB=-li18nutil$(COMID)
-.INCLUDE .IGNORE : i18npool$/version.mk
+.INCLUDE .IGNORE : i18npool/version.mk
 I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
 I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
 .IF "$(GUI)$(COM)"=="WNTGCC"
@@ -66,7 +66,7 @@ SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
 SALHELPERLIB=-luno_salhelper$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX)
-.INCLUDE .IGNORE : comphelper$/version.mk
+.INCLUDE .IGNORE : comphelper/version.mk
 COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID)
 CONNECTIVITYLIB=-lconnectivity
 LDAPBERLIB=-lldapber
@@ -80,7 +80,7 @@ CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : ucbhelper$/version.mk
+.INCLUDE .IGNORE : ucbhelper/version.mk
 UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
 .IF "$(SYSTEM_OPENSSL)" == "YES"
 OPENSSLLIB=$(OPENSSL_LIBS)
@@ -98,7 +98,7 @@ REGLIB=-lreg$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 REGLIB=-lreg
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : vos$/version.mk
+.INCLUDE .IGNORE : vos/version.mk
 VOSLIB=-lvos$(VOS_MAJOR)$(COMID)
 XMLOFFLIB=-lxo$(DLLPOSTFIX)
 XMLOFFLLIB=-lxol
@@ -109,7 +109,7 @@ SALLIB=-lsal$(UDK_MAJOR)
 STORELIB=-lstore
 SALLIB=-luno_sal
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : connectivity$/version.mk
+.INCLUDE .IGNORE : connectivity/version.mk
 ODBCLIB=-lodbc$(DLLPOSTFIX)
 ODBCBASELIB=-lodbcbase$(DLLPOSTFIX)
 DBFILELIB=-lfile$(DLLPOSTFIX)
@@ -228,7 +228,7 @@ JPEG3RDLIB=-ljpeglib
 .IF "$(SYSTEM_NEON)" == "YES" || "$(GUI)$(COM)"=="WNTGCC"
 NEON3RDLIB=-lneon
 .ELIF "$(OS)" == "MACOSX"
-NEON3RDLIB=$(SOLARLIBDIR)$/libneon.a
+NEON3RDLIB=$(SOLARLIBDIR)/libneon.a
 .ELSE
 NEON3RDLIB=$(STATIC) -lneon $(DYNAMIC)
 .ENDIF
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 8ba46f8c5..83aa1e6f9 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m57(Build:9422)
-BUILD=9422
-LAST_MINOR=m57
+RSCREVISION=300m58(Build:9423)
+BUILD=9423
+LAST_MINOR=m58
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/os2.mk b/solenv/inc/os2.mk
index bcaabeb45..03ad2f7a3 100644
--- a/solenv/inc/os2.mk
+++ b/solenv/inc/os2.mk
@@ -83,7 +83,7 @@ LINKFLAGSDEBUG=/v
 LINKFLAGSOPT=/Oc
 .ENDIF
 
-STDOBJVCL=$(L)$/salmain.obj
+STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=c02.obj
 STDSLOGUI=c02d.obj
 STDOBJCUI=c02.obj
@@ -189,7 +189,7 @@ LINKFLAGSOPT=
 LINKFLAGS+=/COD
 .ENDIF
 
-STDOBJVCL=$(L)$/salmain.obj
+STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
@@ -292,7 +292,7 @@ LINKFLAGSPROF=
 LINKFLAGSDEBUG=debug all op undefsok
 LINKFLAGSOPT=
 
-STDOBJVCL=$(L)$/salmain.obj
+STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=libr clib3s.lib libr plib3s.lib libr math387s.lib
 STDSLOGUI=libr clib3s.lib libr os2386.lib libr plib3s.lib libr math387s.lib
 STDOBJCUI=libr clib3s.lib libr plib3s.lib libr math387s.lib
diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk
index 662c8779c..8305a5d25 100644
--- a/solenv/inc/os2gcci.mk
+++ b/solenv/inc/os2gcci.mk
@@ -50,7 +50,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 .IF "$(ttt)"!=""
 CDEFS+=-E
@@ -245,7 +245,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=stdc432 gcc432
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.obj
+STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/pkg_config.mk b/solenv/inc/pkg_config.mk
index d5c00db23..4c04de5b5 100644
--- a/solenv/inc/pkg_config.mk
+++ b/solenv/inc/pkg_config.mk
@@ -32,11 +32,11 @@
 .INCLUDE .IGNORE : pkgroot.mk
 
 .IF "$(PKGCONFIG_ROOT)"!=""
-PKG_CONFIG=$(PKGCONFIG_ROOT)$/bin$/pkg-config
+PKG_CONFIG=$(PKGCONFIG_ROOT)/bin/pkg-config
 .IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U"
-PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)$/lib$/64$/pkgconfig
+PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)/lib/64/pkgconfig
 .ELSE
-PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)$/lib$/pkgconfig
+PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)/lib/pkgconfig
 .ENDIF
 .EXPORT : PKG_CONFIG_PATH
 PKGCONFIG_PREFIX=--define-variable=prefix=$(PKGCONFIG_ROOT)
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 4f10e1b3d..39579437f 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -36,30 +36,30 @@
 .IF "$(SECOND_BUILD)"!=""
 .IF "$($(SECOND_BUILD)_OBJFILES)"!=""
 
-$(OBJ)$/$(SECOND_BUILD)_%.obj : %.cxx
+$(OBJ)/$(SECOND_BUILD)_%.obj : %.cxx
     @echo ------------------------------
-	@echo "Making:   " $@
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
      $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
      @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI)
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
 .ENDIF
 
-$(OBJ)$/$(SECOND_BUILD)_%.obj : %.c
+$(OBJ)/$(SECOND_BUILD)_%.obj : %.c
     @echo ------------------------------
-	@echo "Making:   " $@
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
@@ -80,12 +80,12 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c
 
 .IF "$($(SECOND_BUILD)_SLOFILES)"!=""
 
-$(SLO)$/$(SECOND_BUILD)_%.obj : %.cxx
+$(SLO)/$(SECOND_BUILD)_%.obj : %.cxx
     @echo ------------------------------
-	@echo "Making:   " $@
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
@@ -93,18 +93,18 @@ $(SLO)$/$(SECOND_BUILD)_%.obj : %.cxx
 .ELSE
     @-$(RM) $@
 .IF "$(COM)"=="GCC"
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
 .ELSE
-    $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+    $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx )
 .ENDIF
 .ENDIF
 
-$(SLO)$/$(SECOND_BUILD)_%.obj :  %.c
+$(SLO)/$(SECOND_BUILD)_%.obj :  %.c
     @echo ------------------------------
-	@echo "Making:   " $@
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $*.c
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
@@ -112,10 +112,10 @@ $(SLO)$/$(SECOND_BUILD)_%.obj :  %.c
 .ELSE
     @-$(RM) $@
 .IF "$(COM)"=="GCC"
-       $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c 
+       $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c 
 .ELSE
-       $(TYPE) $(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
-       $(CC) @$(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
+       $(TYPE) $(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c )
+       $(CC) @$(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c )
 .ENDIF
 .ENDIF
 
@@ -127,8 +127,8 @@ $(SLO)$/$(SECOND_BUILD)_%.obj :  %.c
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 .IF "$(PARFILES)"!=""
-ULFPARFILES=$(foreach,i,$(ULFFILES) $(foreach,j,$(SCP_PRODUCT_TYPE) $(PAR)$/$j$/$(i:b).par))
-MOREPARFILES=$(foreach,i,$(PARFILES) $(foreach,j,$(SCP_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+ULFPARFILES=$(foreach,i,$(ULFFILES) $(foreach,j,$(SCP_PRODUCT_TYPE) $(PAR)/$j/$(i:b).par))
+MOREPARFILES=$(foreach,i,$(PARFILES) $(foreach,j,$(SCP_PRODUCT_TYPE) $(PAR)/$j/$i ))
 ALLPARFILES=$(uniq $(ULFPARFILES) $(MOREPARFILES))
 
 SCP_PRODUCT_TYPE*=FAT
@@ -139,23 +139,23 @@ LANGFILEEXT=mlf
 LANGFILEEXT=jlf
 .ENDIF
 
-$(PAR)$/%.par :
+$(PAR)/%.par :
     @echo ------------------------------
-	@echo "Making:   " $@
-    @@-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}
+    @echo Making: $@
+    @@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
-    $(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+    $(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
 .ENDIF
 .IF "$(GUI)"=="UNX"
-    $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+    $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
 .ENDIF
 .IF "$(common_build_srs)"!=""
-    $(SCPCOMP) -l {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(TARGET)$/$(@:b).$(LANGFILEEXT)} -s $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -o $@
+    $(SCPCOMP) -l {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
 .ELSE          # "$(common_build_srs)"!=""
-    $(SCPCOMP) -l {$(MISC)$/$(TARGET)$/$(@:b).$(LANGFILEEXT)} -s $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -o $@
+    $(SCPCOMP) -l {$(MISC)/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
 .ENDIF          # "$(common_build_srs)"!=""
 # hacked version    
-#    $(SCPCOMP) -l $(@:b).$(LANGFILEEXT) -s $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -o $@
+#    $(SCPCOMP) -l $(@:b).$(LANGFILEEXT) -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
 
 .ENDIF			# "$(PARFILES)"!=""
 
@@ -167,12 +167,12 @@ $(PAR)$/%.par :
 some_unique_variable_name:=1
 
 .IF "$(OS)" == "WNT"
-REGEXP:="s/^[\#].*$$//"
+REGEXP:="s/^[\#].*//"
 .ELSE
-REGEXP:='s/^[\#].*$$//'
+REGEXP:='s/^[\#].*//'
 .ENDIF
 
-$(MISC)$/%.exp : sce$/%.sce
+$(MISC)/%.exp : sce/%.sce
     @@-$(RM) $@
     @@-$(RM) $(@:d)$(@:b).tst
     $(TYPE) $< | sed $(REGEXP) | sed "s/^/test_/" > $(@:d)$(@:b).tst
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 31ce9afbf..17e84d09e 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -31,146 +31,138 @@
 
 MKFILENAME:=RULES.MK
 
-$(OBJ)$/%.obj : %.cxx
-.IF "$(QUIET_BUILD)"==""
+$(OBJ)/%.obj : %.cxx
     @echo ------------------------------
-.ENDIF
     @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
 .IF "$(noadjust)"==""   
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(noadjust)"==""   
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@-$(RM) $@
 .IF "$(COM)"=="GCC"
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx 
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx 
 .ELSE
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
 .ENDIF
 .ENDIF
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 
-$(OBJ)$/%.obj : %.cpp
-.IF "$(QUIET_BUILD)"==""
+$(OBJ)/%.obj : %.cpp
     @echo ------------------------------
-.ENDIF
     @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@-$(RM) $@
 .IF "$(COM)"=="GCC"
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp 
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp 
 .ELSE
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
 .ENDIF
 .ENDIF
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 
-$(OBJ)$/%.obj : %.cc
-.IF "$(QUIET_BUILD)"==""
+$(OBJ)/%.obj : %.cc
     @echo ------------------------------
-.ENDIF
     @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cc
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@$(RM) $@
 .IF "$(COM)"=="GCC"
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc 
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc 
 .ELSE
-    $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc )
+    $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc )
 .ENDIF
 .ENDIF
 
 .IF "$(ENABLE_PCH)"!=""
 # workaround for file locking problems on network volumes
 .IF "$(NETWORK_BUILD)"==""
-PCHOUTDIR=$(SLO)$/pch
-PCHEXOUTDIR=$(SLO)$/pch_ex
+PCHOUTDIR=$(SLO)/pch
+PCHEXOUTDIR=$(SLO)/pch_ex
 .ELSE			# "$(NETWORK_BUILD)"==""
-PCHOUTDIR=$(TMP)$/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)$(PROEXT)
-PCHEXOUTDIR=$(TMP)$/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)_ex$(PROEXT)
+PCHOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)$(PROEXT)
+PCHEXOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)_ex$(PROEXT)
 .ENDIF			# "$(NETWORK_BUILD)"==""
-$(SLO)$/precompiled.% .PHONY:
-    -$(MKDIRHIER) $(SLO)$/pch
+$(SLO)/precompiled.% .PHONY:
+    -$(MKDIRHIER) $(SLO)/pch
 .IF "$(COM)"=="MSC"
 .IF "$(NETWORK_BUILD)"!=""
     -$(MKDIRHIER) $(PCHOUTDIR)
 .IF "$(HAVE_BIG_TMP)"==""
-    -$(COPY) $(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) 
+    -$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) 
 .ENDIF			# "$(HAVE_BIG_TMP)"==""
 .ENDIF			# "$(NETWORK_BUILD)"!=""
-    $(CXX) @$(mktmp -Fp$(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)$/precompiled_$(PRJNAME).cxx)
+    $(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
 .IF "$(NETWORK_BUILD)"!=""
-    $(COPY) $(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST)
+    $(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
 .IF "$(HAVE_BIG_TMP)"==""
-    $(RM) $(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST)
+    $(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
     $(RMDIR) $(PCHOUTDIR)
 .ENDIF			# "$(HAVE_BIG_TMP)"==""
 .ENDIF			# "$(NETWORK_BUILD)"!=""
 .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
-    $(CXX) -o$(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
-    @echo "#error Tried to use wrong precompiled header" > $(SLO)$/pch$/precompiled_$(PRJNAME).hxx
+    $(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
+    @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx
 .ELSE			# "$(COM)"=="MSC"
-    $(TOUCH) $(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST)
+    $(TOUCH) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
 .ENDIF			# "$(COM)"=="MSC"
-    @echo USED_PCHFLAGS=$(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF$(CFLAGSAPPEND)> $(INCCOM)$/pch.mk
+    @echo USED_PCHFLAGS=$(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF$(CFLAGSAPPEND)> $(INCCOM)/pch.mk
 
-$(SLO)$/precompiled_ex.% .PHONY:
-    -$(MKDIRHIER) $(SLO)$/pch_ex
+$(SLO)/precompiled_ex.% .PHONY:
+    -$(MKDIRHIER) $(SLO)/pch_ex
 .IF "$(COM)"=="MSC"
 .IF "$(NETWORK_BUILD)"!=""
     -$(MKDIRHIER) $(PCHEXOUTDIR)
 .IF "$(HAVE_BIG_TMP)"==""
-    -$(COPY) $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) 
+    -$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) 
 .ENDIF			# "$(HAVE_BIG_TMP)"==""
 .ENDIF			# "$(NETWORK_BUILD)"!=""
-    $(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)$/precompiled_$(PRJNAME).cxx)
+    $(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
 .IF "$(NETWORK_BUILD)"!=""
-    $(COPY) $(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST)
+    $(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
 .IF "$(HAVE_BIG_TMP)"==""
-    $(RM) $(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST)
+    $(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
     $(RMDIR) $(PCHEXOUTDIR)
 .ENDIF			# "$(HAVE_BIG_TMP)"==""
 .ENDIF			# "$(NETWORK_BUILD)"!=""
 .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
-    $(CXX) -o$(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
-    @echo "#error Tried to use wrong precompiled header" > $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx
+    $(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
+    @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx
 .ELSE			# "$(COM)"=="MSC"
-    $(TOUCH) $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST)
+    $(TOUCH) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
 .ENDIF			# "$(COM)"=="MSC"
-    @echo USED_EXCEPTIONS_PCHFLAGS=$(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)$/pch_ex.mk
+    @echo USED_EXCEPTIONS_PCHFLAGS=$(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)/pch_ex.mk
 
-.INCLUDE .IGNORE : $(INCCOM)$/pch.mk
-.INCLUDE .IGNORE : $(INCCOM)$/pch_ex.mk
+.INCLUDE .IGNORE : $(INCCOM)/pch.mk
+.INCLUDE .IGNORE : $(INCCOM)/pch_ex.mk
 .ENDIF			# "$(ENABLE_PCH)"!=""
 
-$(SLO)$/%.obj : %.cxx
-.IF "$(QUIET_BUILD)"==""
+$(SLO)/%.obj : %.cxx
     @echo ------------------------------
-.ENDIF
     @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
 .IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
 # just a helper var	
@@ -186,325 +178,297 @@ $(SLO)$/%.obj : %.cxx
 .ENDIF			# "$(ENABLE_PCH)"!=""
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E  $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E  $(CFLAGSINCXX)$(PWD)/$*.cxx
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT)
+    $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(CAPTURE_COMMAND)"==""
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE			# "$(GUI)"=="UNX"
     @@-$(RM) $@
 .IF "$(COM)"=="GCC"
-    $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT)
+    $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
 .ELSE
-    $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT)
+    $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
 .ENDIF		    # "$(COM)"=="GCC"	
 .ENDIF			# "$(GUI)"=="UNX"
 .IF "$(nodep)"==""
 # fixme: write to file
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 
-$(SLO)$/%.obj : %.cpp
-.IF "$(QUIET_BUILD)"==""
+$(SLO)/%.obj : %.cpp
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(PWD)$/$*.cpp
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(PWD)/$*.cpp
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE
     @@-$(RM) $@
 .IF "$(COM)"=="GCC"
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
 .ELSE
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
 .ENDIF
 .ENDIF
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 
-$(SLO)$/%.obj : $(MISC)$/%.cxx
-.IF "$(QUIET_BUILD)"==""
+$(SLO)/%.obj : $(MISC)/%.cxx
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE
 .IF "$(COM)"=="GCC"
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
 .ELSE
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
 .ENDIF
 .ENDIF
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $@ ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $@ ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 
-$(SLO)$/%.obj : $(MISC)$/%.cc
-.IF "$(QUIET_BUILD)"==""
+$(SLO)/%.obj : $(MISC)/%.cc
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)$/$*.cc
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cc
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cc
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cc
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE
-    $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cc )
+    $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cc )
 .ENDIF
 
-$(OBJ)$/%.obj : $(MISC)$/%.cxx
-.IF "$(QUIET_BUILD)"==""
+$(OBJ)/%.obj : $(MISC)/%.cxx
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE
 .IF "$(COM)"=="GCC"
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
 .ELSE
-    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
 .ENDIF
 .ENDIF
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 
-$(OBJ)$/%.obj : %.c
-.IF "$(QUIET_BUILD)"==""
+$(OBJ)/%.obj : %.c
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
 .IF "$(noadjust)"==""   
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF			# "$(noadjust)"==""   
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE
 .IF "$(COM)"=="GCC"
-    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c
 .ELSE
     -@echo Cflags: $(CFLAGS) $(INCLUDE)
-    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c
 .ENDIF
 .ENDIF
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 
-$(OBJ)$/%.obj : $(MISC)$/%.c
-.IF "$(QUIET_BUILD)"==""
+$(OBJ)/%.obj : $(MISC)/%.c
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@-$(RM) $@
 .IF "$(COM)"=="GCC"
-    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(MISC)$/$*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c
 .ELSE
-    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(MISC)$/$*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c
 .ENDIF
 .ENDIF
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 
-$(SLO)$/%.obj : $(MISC)$/%.c
-.IF "$(QUIET_BUILD)"==""
+$(SLO)/%.obj : $(MISC)/%.c
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@-$(RM) $@
 .IF "$(COM)"=="GCC"
-    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISC)$/$*.c 
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c 
 .ELSE
-    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISC)$/$*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c
 .ENDIF
 .ENDIF
 .IF "$(nodep)"==""
-.IF "$(QUIET_BUILD)"==""
-	$(QUIET_BUILD) $(TYPE) $(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) 
-.ENDIF
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
+    $(TYPE) $(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) 
+    $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
 # avoid _version objects (see tg_shl.mk) - quite hacky...
     @noop $(!eq,$@,$(@:s/_version.obj/.obj/) $(NULL) $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)))
 .ENDIF			# "$(nodep)"==""
 
-$(SLO)$/%.obj : %.c
-.IF "$(QUIET_BUILD)"==""
+$(SLO)/%.obj : %.c
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
+    $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c
 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
     $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@-$(RM) $@
 .IF "$(COM)"=="GCC"
-       $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c 
+       $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c 
 .ELSE
-       $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c
+       $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c
 .ENDIF
 .ENDIF
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 
 # Objective-C files
-$(OBJ)$/%.obj : %.m
-.IF "$(QUIET_BUILD)"==""
+$(OBJ)/%.obj : %.m
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo Making: $@
 .IF "$(OS)"=="MACOSX"
 .IF "$(TEST)"!=""
-    $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.m
+    $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.m
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
     @echo "No recipe for compiling Objective-C files is available for this platform"
 .ENDIF		"$(OS)"=="MACOSX"
 
 # Objective-C files
-$(OBJ)$/%.obj : $(MISC)$/%.m
-.IF "$(QUIET_BUILD)"==""
+$(OBJ)/%.obj : $(MISC)/%.m
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Making: $@
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.m
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE			# "$(OS)"=="MACOSX"
     @echo "No recipe for compiling Objective-C files is available for this platform"
 .ENDIF		"$(OS)"=="MACOSX"
 
 # Objective-C files
-$(SLO)$/%.obj : $(MISC)$/%.m
-.IF "$(QUIET_BUILD)"==""
+$(SLO)/%.obj : $(MISC)/%.m
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Making: $@
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.m
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE			# "$(OS)"=="MACOSX"
     @echo "No recipe for compiling Objective-C files is available for this platform"
 .ENDIF		"$(OS)"=="MACOSX"
 
 # Objective-C files
-$(SLO)$/%.obj : %.m
-.IF "$(QUIET_BUILD)"==""
+$(SLO)/%.obj : %.m
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo Making: $@
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.m
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE			# "$(OS)"=="MACOSX"
     @echo "No recipe for compiling Objective-C files is available for this platform"
 .ENDIF		"$(OS)"=="MACOSX"
 
 # dependencies c / c++
 
-not_existing$/s_%.dpcc : %.c;@noop $(assign all_local_slo+:=$<)
-not_existing$/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<)
+not_existing/s_%.dpcc : %.c;@noop $(assign all_local_slo+:=$<)
+not_existing/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<)
 
 # Objective-C++ files
-$(OBJ)$/%.obj : %.mm
-.IF "$(QUIET_BUILD)"==""
+$(OBJ)/%.obj : %.mm
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo Making: $@
 .IF "$(OS)"=="MACOSX"
 .IF "$(TEST)"!=""
-    $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm
+    $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 .ELSE			# "$(OS)"=="MACOSX"
@@ -512,17 +476,15 @@ $(OBJ)$/%.obj : %.mm
 .ENDIF			# "$(OS)"=="MACOSX"
 
 # Objective-C++ files
-$(OBJ)$/%.obj : $(MISC)$/%.mm
-.IF "$(QUIET_BUILD)"==""
+$(OBJ)/%.obj : $(MISC)/%.mm
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Making: $@
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.mm
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 .ELSE			# "$(OS)"=="MACOSX"
@@ -530,17 +492,15 @@ $(OBJ)$/%.obj : $(MISC)$/%.mm
 .ENDIF			# "$(OS)"=="MACOSX"
 
 # Objective-C++ files
-$(SLO)$/%.obj : $(MISC)$/%.mm
-.IF "$(QUIET_BUILD)"==""
+$(SLO)/%.obj : $(MISC)/%.mm
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Making: $@
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.mm
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 .ELSE			# "$(OS)"=="MACOSX"
@@ -548,33 +508,31 @@ $(SLO)$/%.obj : $(MISC)$/%.mm
 .ENDIF			# "$(OS)"=="MACOSX"
 
 # Objective-C++ files
-$(SLO)$/%.obj : %.mm
-.IF "$(QUIET_BUILD)"==""
+$(SLO)/%.obj : %.mm
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo Making: $@
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
-	$(QUIET_BUILD) $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.mm
-	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+    $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm
+    $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .IF "$(nodep)"==""
-	$(QUIET_BUILD) $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/)
+    $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
     @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
 .ENDIF			# "$(nodep)"==""
 .ELSE			# "$(OS)"=="MACOSX"
     @echo "No recipe for compiling Objective-C++ files is available for this platform"
 .ENDIF			# "$(OS)"=="MACOSX"
 
-$(MISC)$/%.dpslo :
-	@echo "Making:    library dependencies for" $(TARGET).lib
+$(MISC)/%.dpslo :
+    @echo making .dpslo
     @@$(RM) $@
     @@-$(CDD) $(MISC) && $(!null,$(all_local_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_slo:b:+".dpcc") s_$(i)) > $(@:f)
     @@-$(CDD) $(MISC) && $(!null,$(all_misc_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_slo:b:+".dpcc") s_$(i)) >> $(@:f)
-    @$(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i) $(foreach,i,$(all_misc_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)$/s_$i)) >> $@
+    @$(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i) $(foreach,i,$(all_misc_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i)) >> $@
     @$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_slo:b:+".dpcc":^"s_") $(all_misc_slo:b:+".dpcc":^"s_")) >> $@
 
-$(MISC)$/%.dpobj :
-	@echo "Making:    library dependencies for" $(TARGET).lib
+$(MISC)/%.dpobj :
+    @echo making .dpobj
     @@$(RM) $@
     @@-$(CDD) $(MISC) && $(!null,$(all_local_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_obj:b:+".dpcc") o_$(i)) > $(@:f)
     @@-$(CDD) $(MISC) && $(!null,$(all_misc_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_obj:b:+".dpcc") o_$(i)) >> $(@:f)
@@ -582,121 +540,108 @@ $(MISC)$/%.dpobj :
     @$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_obj:b:+".dpcc":^"s_") $(all_misc_obj:b:+".dpcc":^"s_")) >> $@
 
 # see also %.dpslo 
-not_existing$/s_%.dpcc : %.cxx;@noop $(assign all_local_slo+:=$<)
-not_existing$/o_%.dpcc : %.cxx;@noop $(assign all_local_obj+:=$<)
+not_existing/s_%.dpcc : %.cxx;@noop $(assign all_local_slo+:=$<)
+not_existing/o_%.dpcc : %.cxx;@noop $(assign all_local_obj+:=$<)
 
-not_existing$/s_%.dpcc : %.cpp;@noop $(assign all_local_slo+:=$<)
-not_existing$/o_%.dpcc : %.cpp;@noop $(assign all_local_obj+:=$<)
+not_existing/s_%.dpcc : %.cpp;@noop $(assign all_local_slo+:=$<)
+not_existing/o_%.dpcc : %.cpp;@noop $(assign all_local_obj+:=$<)
 
-not_existing$/s_%.dpcc : $(MISC)$/%.c;@noop $(assign all_misc_slo+:=$<)
-not_existing$/o_%.dpcc : $(MISC)$/%.c;@noop $(assign all_misc_obj+:=$<)
+not_existing/s_%.dpcc : $(MISC)/%.c;@noop $(assign all_misc_slo+:=$<)
+not_existing/o_%.dpcc : $(MISC)/%.c;@noop $(assign all_misc_obj+:=$<)
 
-not_existing$/s_%.dpcc : $(MISC)$/%.cxx;@noop $(assign all_misc_slo+:=$<)
-not_existing$/o_%.dpcc : $(MISC)$/%.cxx;@noop $(assign all_misc_obj+:=$<)
+not_existing/s_%.dpcc : $(MISC)/%.cxx;@noop $(assign all_misc_slo+:=$<)
+not_existing/o_%.dpcc : $(MISC)/%.cxx;@noop $(assign all_misc_obj+:=$<)
 
-not_existing$/s_%.dpcc : %.mm;@noop $(assign all_local_slo+:=$<)
-not_existing$/o_%.dpcc : %.mm;@noop $(assign all_local_obj+:=$<)
+not_existing/s_%.dpcc : %.mm;@noop $(assign all_local_slo+:=$<)
+not_existing/o_%.dpcc : %.mm;@noop $(assign all_local_obj+:=$<)
 
-not_existing$/s_%.dpcc : $(MISC)$/%.mm;@noop $(assign all_misc_slo+:=$<)
-not_existing$/o_%.dpcc : $(MISC)$/%.mm;@noop $(assign all_misc_obj+:=$<)
+not_existing/s_%.dpcc : $(MISC)/%.mm;@noop $(assign all_misc_slo+:=$<)
+not_existing/o_%.dpcc : $(MISC)/%.mm;@noop $(assign all_misc_obj+:=$<)
 
 # dependencies objective-c
 
-$(MISC)$/s_%.dpcc : %.m
+$(MISC)/s_%.dpcc : %.m
     @@-$(RM) $@
     @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
-    @echo $@ : $(SLO)$/$(<:b).obj >> $@
+    @echo $@ : $(SLO)/$(<:b).obj >> $@
 
-$(MISC)$/o_%.dpcc : %.m
+$(MISC)/o_%.dpcc : %.m
     @@-$(RM) $@
     @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
-    @echo $@ : $(OBJ)$/$(<:b).obj >> $@
+    @echo $@ : $(OBJ)/$(<:b).obj >> $@
 
-$(MISC)$/s_%.dpcc : $(MISC)$/%.m
+$(MISC)/s_%.dpcc : $(MISC)/%.m
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"	
-    @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
+    @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
 .ELSE			# "$(GUI)"=="UNX"	
     @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
 .ENDIF			# "$(GUI)"=="UNX"	
-    @echo $@ : $(SLO)$/$(<:b).obj >> $@
+    @echo $@ : $(SLO)/$(<:b).obj >> $@
 
-$(MISC)$/o_%.dpcc : $(MISC)$/%.m
+$(MISC)/o_%.dpcc : $(MISC)/%.m
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"	
-    @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
+    @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
 .ELSE			# "$(GUI)"=="UNX"	
     @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
 .ENDIF			# "$(GUI)"=="UNX"	
-    @echo $@ : $(OBJ)$/$(<:b).obj >> $@
+    @echo $@ : $(OBJ)/$(<:b).obj >> $@
 
 # dependency dummy for *.s files
 
-$(MISC)$/s_%.dpcc : %.s
+$(MISC)/s_%.dpcc : %.s
     @@-$(RM) $@
     @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
-    @echo $@ : $(SLO)$/$(<:b).obj >> $@
+    @echo $@ : $(SLO)/$(<:b).obj >> $@
 
-$(MISC)$/s_%.dpcc : $(SLO)$/%.obj
+$(MISC)/s_%.dpcc : $(SLO)/%.obj
     @noop $(assign DEPS_MISSING+:=$(@:f))
 
-$(MISC)$/o_%.dpcc : $(OBJ)$/%.obj
+$(MISC)/o_%.dpcc : $(OBJ)/%.obj
     @noop $(assign DEPS_MISSING+:=$(@:f))
 
 # dependencies script files
 
-$(MISC)$/%.dpsc :
+$(MISC)/%.dpsc :
     @@-$(RM) $@
-    @@-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}
-    @$(MAKEDEPEND) -f - -p$(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))} -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(*:b).scp > $@
-    @echo $@ : $(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).par  >> $@
-    @echo $(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).par : $(*:b).scp >> $@
+    @@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}
+    @$(MAKEDEPEND) -f - -p$(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))} -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(*:b).scp > $@
+    @echo $@ : $(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).par  >> $@
+    @echo $(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).par : $(*:b).scp >> $@
 
 # dependencies rc files (native resources for windows)
 
-$(MISC)$/%.dprc : 
+$(MISC)/%.dprc : 
     @@-$(RM) $@
-    @$(MAKEDEPEND) -f - -p$(RES) -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) -I$(SOLARENV)$/inc $(*:b).rc >> $@
-#	@echo $@ : $(RES)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).res  >> $@
-    @echo $@ : $(RES)$/$(*:b).res  >> $@
+    @$(MAKEDEPEND) -f - -p$(RES) -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) -I$(SOLARENV)/inc $(*:b).rc >> $@
+#	@echo $@ : $(RES)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).res  >> $@
+    @echo $@ : $(RES)/$(*:b).res  >> $@
 
-$(MISC)$/%.dpr :
-.IF "$(QUIET_BUILD)"==""
+$(MISC)/%.dpr :
     @echo ------------------------------ 
-.ELSE
-	@echo > /dev/null
-.ENDIF
 .IF "$(nodep)"==""
-	@echo "Making:    resource file dependencies for" $(DEPSRSFILES)
+    @echo Making: $@
     @@-$(RM) $@
-	$(QUIET_BUILD) dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES)
-	@-$(TYPE) $(MISC)$/$(TARGET).*.dprr >> $@
+    dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES)
+    -$(TYPE) $(MISC)/$(TARGET).*.dprr >> $@
 .ENDIF			# "$(nodep)"==""
 
-$(MISC)$/%.dpz :
-.IF "$(QUIET_BUILD)"==""
+$(MISC)/%.dpz :
     @echo ------------------------------
-.ELSE
-	@echo > /dev/null
-.ENDIF
 .IF "$(nodep)"==""
-	@echo "Making:    zip file dependencies for" $(ZIPDEPFILES)
+    @echo Making: $@
     @@-$(RM) $@
-# line too long on 4nt
-.IF "$(USE_SHELL)"!="4nt" || "$(GUI)"=="OS2"
     dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true $(ZIPDEPFILES)
-.ELSE			# "$(USE_SHELL)"!="4nt"
-    $(QUIET_BUILD) $(TYPE) $(mktmp $(ZIPDEPFILES:s/\/\\/)) | $(XARGS) dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true
-.ENDIF			# "$(USE_SHELL)"!="4nt"
-	@$(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" | grep -v "\.svn" >> $@
-	@echo zipdep_langs=$(alllangiso) >> $@
+    $(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" | grep -v "\.svn" >> $@
+    echo zipdep_langs=$(alllangiso) >> $@
     @@-$(RM) $(ZIPDEPFILES)
 .ENDIF			# "$(nodep)"==""
 
 # Dependencies fuer java - Files
 
-$(MISC)$/%.dpj :
-	@echo "Making:    java dependencies for" $(JAVACLASSFILES)
+$(MISC)/%.dpj :
+    @echo Making dpj...
 .IF "$(nodep)"!=""
 .IF "$(GUI)"=="UNX"
     @echo > $@
@@ -712,114 +657,108 @@ $(MISC)$/%.dpj :
 .ENDIF
 .ENDIF			# "$(nodep)"==""
 
-$(SLO)$/%.obj : %.asm
-.IF "$(QUIET_BUILD)"==""
+$(SLO)/%.obj : %.asm
        @echo ------------------------------
-.ENDIF
-	   @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+       @echo Making: $@
 .IF "$(COM)"=="GCC"
 .IF "$(ASM)"=="ml"
-	   $(QUIET_BUILD) $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm
+       $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
        @@-$(RM) $*.err
 .ELSE			# "$(ASM)"=="ml"
         @@-$(RM) $@
-		$(QUIET_BUILD) $(ASM) $(AFLAGS) $*.asm,$(SLO)$/$*.obj;
+        $(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj;
 .ENDIF			# "$(ASM)"=="ml"
 .ELSE
 .IF "$(COM)"=="WTC"
-        $(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)$/$*.obj
+        $(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)/$*.obj
         -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
 .ELSE
 .IF "$(COM)"=="MSC"
 .IF "$(ASM)"=="ml"
-    $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm
+    $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
     -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
 .ELSE			# "$(ASM)"=="ml"
     @@-$(RM) $@
-    $(ASM) $(AFLAGS) $*.asm,$(SLO)$/$*.obj;
+    $(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj;
 .ENDIF			# "$(ASM)"=="ml"
 .ENDIF			 "$(COM)"=="MSC"
 .ENDIF
 .ENDIF
 
-$(OBJ)$/%.obj : %.asm
-.IF "$(QUIET_BUILD)"==""
+$(OBJ)/%.obj : %.asm
        @echo ------------------------------
-.ENDIF
-	   @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+       @echo Making: $@
 .IF "$(COM)"=="GCC"
 .IF "$(ASM)"=="ml"
-	   $(QUIET_BUILD) $(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)$/$*.obj $*.asm
+       $(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm
        @@-$(RM) $*.err
 .ELSE			# "$(ASM)"=="ml"
         @@-$(RM) $@
-		$(QUIET_BUILD) $(ASM) $(AFLAGS) $*.asm,$(OBJ)$/$*.obj;
+        $(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj;
 .ENDIF			# "$(ASM)"=="ml"
 .ELSE
 .IF "$(COM)"=="MSC"
 .IF "$(ASM)"=="ml"
-    $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm
+    $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
     -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
 .ELSE			# "$(ASM)"=="ml"
     @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI)
-    $(ASM) $(AFLAGS) $*.asm,$(OBJ)$/$*.obj;
+    $(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj;
 .ENDIF			# "$(ASM)"=="ml"
 .ENDIF			 "$(COM)"=="MSC"
 .ENDIF
 
-$(OUT)$/ucr$/$(IDLPACKAGE)$/%.urd : %.idl
+$(OUT)/ucr/$(IDLPACKAGE)/%.urd : %.idl
         @noop $(assign all_outdated_idl+:=$<)
 
-$(OUT)$/ucrdoc$/$(IDLPACKAGE)$/%.urd : %.idl
+$(OUT)/ucrdoc/$(IDLPACKAGE)/%.urd : %.idl
         @noop $(assign all_outdated_doc_idl+:=$<)
 
 # generate hid files
-$(SRS)$/%.hid : %.src
-.IF "$(QUIET_BUILD)"==""
+$(SRS)/%.hid : %.src
     @echo ------------------------------
-.ENDIF
-	@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(*:f).src
-	$(QUIET_BUILD) $(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)$/bin$/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
+    @echo Making hid $@
+    $(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)/bin/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
 
 # make *.xml descriptions available in $(MISC)
-$(MISC)$/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml
+$(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml
     $(COPY) $< $@
 
 # dummy rule to make sure xml file is in place when used in settings.mk
-$(MISC)$/%.mk : $(MISC)$/%$($(WINVERSIONNAMES)_MAJOR).xml
+$(MISC)/%.mk : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml
     $(TOUCH) $@
     echo XML2MK_FILES += $(@:b) >> $@
 
 #generate descriptions from xml
-$(MISC)$/%$($(WINVERSIONNAMES)_MAJOR)_description.cxx : $(MISC)$/%$($(WINVERSIONNAMES)_MAJOR).xml 
-    xml2cmp -func $(MISC)$/$*$($(WINVERSIONNAMES)_MAJOR)_description.cxx $<
+$(MISC)/%$($(WINVERSIONNAMES)_MAJOR)_description.cxx : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml 
+    xml2cmp -func $(MISC)/$*$($(WINVERSIONNAMES)_MAJOR)_description.cxx $<
 
 #generate private rdb
-$(BIN)$/%.rdb: $(MISC)$/%$($(WINVERSIONNAMES)_MAJOR).xml
-    $(RDBMAKER) -BUCR -O$(BIN)$/$*.rdb @$(mktmp $(foreach,i,$($(@:b)_XML2CMPTYPES) -T$i ) $(COMPRDB))
+$(BIN)/%.rdb: $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml
+    $(RDBMAKER) -BUCR -O$(BIN)/$*.rdb @$(mktmp $(foreach,i,$($(@:b)_XML2CMPTYPES) -T$i ) $(COMPRDB))
 
 #strip dos lineends
-$(MISC)$/%.sh : %.sh
+$(MISC)/%.sh : %.sh
     @@-$(RM) -f $@
     @tr -d "\015" < $< > $@
 
 # merge targets
 .IF "$(WITH_LANG)"!=""
-$(COMMONMISC)$/$(TARGET)$/%.ulf : %.ulf
+$(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
     -$(MKDIR) $(@:d)
     -$(RM) $@
     $(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(COMMONMISC)$/$(TARGET)$/%.xrb : %.xrb
+$(COMMONMISC)/$(TARGET)/%.xrb : %.xrb
     -$(MKDIR) $(@:d)
     -$(RM) $@
     $(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(COMMONMISC)$/$(MYPATH)$/%.xrm : %.xrm
+$(COMMONMISC)/$(MYPATH)/%.xrm : %.xrm
     -$(MKDIRHIER) $(@:d)
     -$(RM) $@
     echo trysdf = $(TRYSDF)
@@ -827,14 +766,14 @@ $(COMMONMISC)$/$(MYPATH)$/%.xrm : %.xrm
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-#$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm
+#$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm
 #    -$(MKDIRHIER) $(@:d)
 #    -$(RM) $@
 #	$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
 #    $(RENAME) $@.$(INPATH) $@
 #    -$(RM) $@.$(INPATH)
 #
-#$(COMMONMISC)$/%.xrm : %.xrm
+#$(COMMONMISC)/%.xrm : %.xrm
 #    -$(MKDIR) $(@:d)
 #    -$(RM) $@
 #	$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
@@ -843,9 +782,9 @@ $(COMMONMISC)$/$(MYPATH)$/%.xrm : %.xrm
 .ENDIF			# "$(WITH_LANG)"!=""
 
 .IF "$(WITH_LANG)"!=""
-$(COMMONMISC)$/$(TARGET)$/%.jlf : $$(@:db).ulf
+$(COMMONMISC)/$(TARGET)/%.jlf : $$(@:db).ulf
 .ELSE			# "$(WITH_LANG)"!=""
-$(COMMONMISC)$/$(TARGET)$/%.jlf : $$(@:b).ulf
+$(COMMONMISC)/$(TARGET)/%.jlf : $$(@:b).ulf
 .ENDIF			# "$(WITH_LANG)"!=""
     @-$(MKDIRHIER) $(@:d)
     -$(RM) $@
@@ -854,20 +793,20 @@ $(COMMONMISC)$/$(TARGET)$/%.jlf : $$(@:b).ulf
     -$(RM) $@.$(INPATH)
 
 .IF "$(WITH_LANG)"!=""
-$(COMMONMISC)$/$(TARGET)$/%.mlf : $$(@:db).ulf
+$(COMMONMISC)/$(TARGET)/%.mlf : $$(@:db).ulf
 .ELSE			# "$(WITH_LANG)"!=""
-$(COMMONMISC)$/$(TARGET)$/%.mlf : $$(@:b).ulf
+$(COMMONMISC)/$(TARGET)/%.mlf : $$(@:b).ulf
 .ENDIF			# "$(WITH_LANG)"!=""
     @-$(MKDIRHIER) $(@:d)
     -$(RM) $@
-    @$(ULFCONV) -o $@.$(INPATH) -t $(SOLARBINDIR)$/msi-encodinglist.txt $<
+    @$(ULFCONV) -o $@.$(INPATH) -t $(SOLARBINDIR)/msi-encodinglist.txt $<
     @$(RENAME) $@.$(INPATH) $@
     @-$(RM) $@.$(INPATH)
 
 .IF "$(WITH_LANG)"!=""
-$(COMMONMISC)$/$(TARGET)$/%.uulf : $$(@:db).ulf
+$(COMMONMISC)/$(TARGET)/%.uulf : $$(@:db).ulf
 .ELSE			# "$(WITH_LANG)"!=""
-$(COMMONMISC)$/$(TARGET)$/%.uulf : $$(@:b).ulf
+$(COMMONMISC)/$(TARGET)/%.uulf : $$(@:b).ulf
 .ENDIF			# "$(WITH_LANG)"!=""
     @-$(MKDIRHIER) $(@:d)
     -$(RM) $@
@@ -876,7 +815,7 @@ $(COMMONMISC)$/$(TARGET)$/%.uulf : $$(@:b).ulf
     @-$(RM) $@.$(INPATH)
 
 # This is still needed?????
-$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm
+$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm
     -$(MKDIR) $(@:d)
     -$(RM) $@
     $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index 808b5b2ae..35d9e483d 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -49,7 +49,7 @@ USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR
 USE_CFLAGS_X64+=$(CFLAGS_X64)
 USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
 USE_CDEFS_X64+=$(CDEFS_X64)
-INCLUDE_X64=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
+INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
 
 .IF "$(product)" != ""
 USE_CFLAGS_X64+=-Gy
@@ -97,58 +97,58 @@ STDSLOCUI_X64=
 
 IMPLIBFLAGS_X64=-machine:X64
 
-LIBPATH_X64=$(PSDK)$/lib$/x64
-LIBPATH_VC_X64=$(PSDK)$/vc$/lib$/x64
-
-ADVAPI32LIB_X64=$(LIBPATH_X64)$/advapi32.lib
-SHELL32LIB_X64=$(LIBPATH_X64)$/shell32.lib
-GDI32LIB_X64=$(LIBPATH_X64)$/gdi32.lib
-OLE32LIB_X64=$(LIBPATH_X64)$/ole32.lib
-OLEAUT32LIB_X64=$(LIBPATH_X64)$/oleaut32.lib
-UUIDLIB_X64=$(LIBPATH_X64)$/uuid.lib
-WINSPOOLLIB_X64=$(LIBPATH_X64)$/winspool.lib
-IMM32LIB_X64=$(LIBPATH_X64)$/imm32.lib
-VERSIONLIB_X64=$(LIBPATH_X64)$/version.lib
-WINMMLIB_X64=$(LIBPATH_X64)$/winmm.lib
-WSOCK32LIB_X64=$(LIBPATH_X64)$/wsock32.lib
-MPRLIB_X64=$(LIBPATH_X64)$/mpr.lib
-WS2_32LIB_X64=$(LIBPATH_X64)$/ws2_32.lib
-KERNEL32LIB_X64=$(LIBPATH_X64)$/kernel32.lib
-USER32LIB_X64=$(LIBPATH_X64)$/user32.lib
-COMDLG32LIB_X64=$(LIBPATH_X64)$/comdlg32.lib
-COMCTL32LIB_X64=$(LIBPATH_X64)$/comctl32.lib
-CRYPT32LIB_X64=$(LIBPATH_X64)$/crypt32.lib
-GDIPLUSLIB_X64=$(LIBPATH_X64)$/gdiplus.lib
-DBGHELPLIB_X64=$(LIBPATH_X64)$/dbghelp.lib
-MSILIB_X64=$(LIBPATH_X64)$/msi.lib
-DDRAWLIB_X64=$(LIBPATH_X64)$/ddraw.lib
-SHLWAPILIB_X64=$(LIBPATH_X64)$/shlwapi.lib
-URLMONLIB_X64=$(LIBPATH_X64)$/urlmon.lib
-UNICOWSLIB_X64=$(LIBPATH_X64)$/unicows.lib
-WININETLIB_X64=$(LIBPATH_X64)$/wininet.lib
-OLDNAMESLIB_X64=$(LIBPATH_VC_X64)$/oldnames.lib
-MSIMG32LIB_X64=$(LIBPATH_X64)$/msimg32.lib
-MSVCPRT_X64=$(LIBPATH_VC_X64)$/msvcprt.lib
-MSVCRT_X64=$(LIBPATH_VC_X64)$/msvcrt.lib
-
-MISC_X64=$(MISC)$/x64
-OBJ_X64=$(OBJ)$/x64
-SLO_X64=$(SLO)$/x64
-LB_X64=$(LB)$/x64
-SLB_X64=$(SLB)$/x64
+LIBPATH_X64=$(PSDK)/lib/x64
+LIBPATH_VC_X64=$(PSDK)/vc/lib/x64
+
+ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib
+SHELL32LIB_X64=$(LIBPATH_X64)/shell32.lib
+GDI32LIB_X64=$(LIBPATH_X64)/gdi32.lib
+OLE32LIB_X64=$(LIBPATH_X64)/ole32.lib
+OLEAUT32LIB_X64=$(LIBPATH_X64)/oleaut32.lib
+UUIDLIB_X64=$(LIBPATH_X64)/uuid.lib
+WINSPOOLLIB_X64=$(LIBPATH_X64)/winspool.lib
+IMM32LIB_X64=$(LIBPATH_X64)/imm32.lib
+VERSIONLIB_X64=$(LIBPATH_X64)/version.lib
+WINMMLIB_X64=$(LIBPATH_X64)/winmm.lib
+WSOCK32LIB_X64=$(LIBPATH_X64)/wsock32.lib
+MPRLIB_X64=$(LIBPATH_X64)/mpr.lib
+WS2_32LIB_X64=$(LIBPATH_X64)/ws2_32.lib
+KERNEL32LIB_X64=$(LIBPATH_X64)/kernel32.lib
+USER32LIB_X64=$(LIBPATH_X64)/user32.lib
+COMDLG32LIB_X64=$(LIBPATH_X64)/comdlg32.lib
+COMCTL32LIB_X64=$(LIBPATH_X64)/comctl32.lib
+CRYPT32LIB_X64=$(LIBPATH_X64)/crypt32.lib
+GDIPLUSLIB_X64=$(LIBPATH_X64)/gdiplus.lib
+DBGHELPLIB_X64=$(LIBPATH_X64)/dbghelp.lib
+MSILIB_X64=$(LIBPATH_X64)/msi.lib
+DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib
+SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib
+URLMONLIB_X64=$(LIBPATH_X64)/urlmon.lib
+UNICOWSLIB_X64=$(LIBPATH_X64)/unicows.lib
+WININETLIB_X64=$(LIBPATH_X64)/wininet.lib
+OLDNAMESLIB_X64=$(LIBPATH_VC_X64)/oldnames.lib
+MSIMG32LIB_X64=$(LIBPATH_X64)/msimg32.lib
+MSVCPRT_X64=$(LIBPATH_VC_X64)/msvcprt.lib
+MSVCRT_X64=$(LIBPATH_VC_X64)/msvcrt.lib
+
+MISC_X64=$(MISC)/x64
+OBJ_X64=$(OBJ)/x64
+SLO_X64=$(SLO)/x64
+LB_X64=$(LB)/x64
+SLB_X64=$(SLB)/x64
 L_X64=$(SOLARLIBDIR_X64)
-VERSIONOBJ_X64=$(SLO_X64)$/_version.obj
-BIN_X64=$(BIN)$/x64
-RES_X64=$(RES)$/x64
-SOLARLIBDIR_X64=$(SOLARVERSION)$/$(INPATH)$/lib$(EXT_UPDMINOR)$/x64
+VERSIONOBJ_X64=$(SLO_X64)/_version.obj
+BIN_X64=$(BIN)/x64
+RES_X64=$(RES)/x64
+SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib$(EXT_UPDMINOR)/x64
 LIB_X64:=$(LB_X64);$(SLB_X64);$(ILIB_X64)
 
 .IF "$(LIBTARGET)"==""
 .IF "$(OBJFILES_X64)$(IDLOBJFILES_X64)"!=""
-OBJTARGET_X64=$(LB_X64)$/$(TARGET).lib
+OBJTARGET_X64=$(LB_X64)/$(TARGET).lib
 .ENDIF # "$(OBJFILES_X64)$(IDLOBJFILES_X64)"!=""
 .IF "$(SLOFILES_X64)$(IDLSLOFILES_x64)"!=""
-SLOTARGET_X64=$(SLB_X64)$/$(TARGET).lib
+SLOTARGET_X64=$(SLB_X64)/$(TARGET).lib
 .ENDIF # "$(SLOFILES_X64)$(IDLSLOFILES_x64)"!=""
 .ENDIF # "$(LIBTARGET)"==""
 
@@ -165,10 +165,10 @@ NOLIBSLOTARGET_X64=$(SLOFILES_X64)
 .ENDIF
 
 .IF "$(SHL1TARGET_X64)"!=""
-SHL1TARGETN_X64=$(BIN_X64)$/$(DLLPRE)$(SHL1TARGET_X64)$(DLLPOST)
+SHL1TARGETN_X64=$(BIN_X64)/$(DLLPRE)$(SHL1TARGET_X64)$(DLLPOST)
 .ENDIF
 .IF "$(SHL2TARGET_X64)"!=""
-SHL2TARGETN_X64=$(BIN_X64)$/$(DLLPRE)$(SHL2TARGET_X64)$(DLLPOST)
+SHL2TARGETN_X64=$(BIN_X64)/$(DLLPRE)$(SHL2TARGET_X64)$(DLLPOST)
 .ENDIF
 .IF "$(LIB1TARGET_X64)" != ""
 LIB1TARGETN_X64=$(LIB1TARGET_X64)
@@ -177,10 +177,10 @@ LIB1TARGETN_X64=$(LIB1TARGET_X64)
 LIB2TARGETN_X64=$(LIB2TARGET_X64)
 .ENDIF
 .IF "$(DEF1NAME_X64)"!=""
-DEF1TARGETN_X64=$(MISC_X64)$/$(DEF1NAME_X64).def
+DEF1TARGETN_X64=$(MISC_X64)/$(DEF1NAME_X64).def
 .ENDIF
 .IF "$(DEF2NAME_X64)"!=""
-DEF2TARGETN_X64=$(MISC_X64)$/$(DEF2NAME_X64).def
+DEF2TARGETN_X64=$(MISC_X64)/$(DEF2NAME_X64).def
 .ENDIF
 .ENDIF # "$(BUILD_X64)"!=""
 
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index fa1532742..628d72142 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -80,16 +80,16 @@ EXTNAME*=$(EXTENSIONNAME)_in
 WRONG_SOURCEVERSION
 .ENDIF
 
-# Create $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk if needed
-%minor.mk : $(SOLARENV)$/inc$/minor.mk
-    @@-$(MKDIRHIER) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)
-    @@$(COPY) $(SOLARENV)$/inc$/minor.mk $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk
-    @@$(TOUCH) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
+# Create $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk if needed
+%minor.mk : $(SOLARENV)/inc/minor.mk
+    @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)
+    @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk
+    @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
 .ENDIF          # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
 
-# Force creation of $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/
+# Force creation of $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/
 # $(UPD)minor.mk could be empty as it's contents were already included from minor.mk
-.INCLUDE : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk
+.INCLUDE : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk
 
 .IF "$(BSCLIENT)"=="TRUE"
 .IF "$(UPDATER)"!="YES"
@@ -117,9 +117,9 @@ JAVAINTERPRETER=jview.exe
 .ELSE
 .IF "$(JDK)" == "SCAFE"
 .IF "$(JDK_VERSION)" != ""
-JAVAINTERPRETER=$(DEVROOT)$/vcafe11$/java$/bin$/java.exe
+JAVAINTERPRETER=$(DEVROOT)/vcafe11/java/bin/java.exe
 .ELSE
-JAVAINTERPRETER=$(DEVROOT)$/cafepro$/java$/bin$/java.exe
+JAVAINTERPRETER=$(DEVROOT)/cafepro/java/bin/java.exe
 .ENDIF
 .ELSE
 .IF "$(JAVACISGCJ)" == "yes"
@@ -138,9 +138,9 @@ JAVACOMPILER=jvc.exe
 .ELSE
 .IF "$(JDK)" == "SCAFE"
 .IF "$(JDK_VERSION)" != ""
-JAVACOMPILER=$(DEVROOT)$/vcafe11$/bin$/sj.exe
+JAVACOMPILER=$(DEVROOT)/vcafe11/bin/sj.exe
 .ELSE
-JAVACOMPILER=$(DEVROOT)$/cafepro$/bin$/sj.exe
+JAVACOMPILER=$(DEVROOT)/cafepro/bin/sj.exe
 .ENDIF
 .ELSE
 .IF "$(JAVACISGCJ)" == "yes"
@@ -311,18 +311,12 @@ PROFILE=
 DBGUTIL=
 dbgutil=
 
-.IF "$(VERBOSE)"=="" && "$(verbose)"==""
-QUIET_BUILD*=@
-.ELSE
-QUIET_BUILD*=
-.ENDIF
-
 # ===========================================================================
 # unter NT werden Variablennamen an untergeordnete makefiles UPPERCASE
 # weitergereicht, aber case significant ausgewertet!
 # ---------------------------------------------------------------------------
 
-DMAKE_WORK_DIR*:=$(subst,/,$/ $(PWD))
+DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD))
 
 .IF "$(TMP)"!=""
 tmp*=$(TMP)
@@ -547,54 +541,50 @@ TARGETTYPE=CUI
 # Output-Pfad
 # profile has to be first for not getting the .pro extension
 .IF "$(profile)"!=""
-OUT=$(PRJ)$/$(OUTPATH).cap
+OUT=$(PRJ)/$(OUTPATH).cap
 ROUT=$(OUTPATH).cap
 .ELSE
 
 .IF "$(product)"!=""
-OUT=$(PRJ)$/$(OUTPATH).pro
+OUT=$(PRJ)/$(OUTPATH).pro
 ROUT=$(OUTPATH).pro
 
 .ELSE
 .IF "$(profile)"!=""
-OUT=$(PRJ)$/$(OUTPATH).cap
+OUT=$(PRJ)/$(OUTPATH).cap
 ROUT=$(OUTPATH).cap
 .ENDIF
 .IF "$(dbcs)"!=""
-OUT=$(PRJ)$/$(OUTPATH).w
+OUT=$(PRJ)/$(OUTPATH).w
 ROUT=$(OUTPATH).w
 .ENDIF
 # could already be set by makefile.mk
 .IF "$(OUT)" == ""
-OUT*=$(PRJ)$/$(OUTPATH)
+OUT*=$(PRJ)/$(OUTPATH)
 ROUT*=$(OUTPATH)
 .ENDIF
 .ENDIF
 .ENDIF
 
 .IF "$(bndchk)" != ""
-OUT:=$(PRJ)$/$(OUTPATH).bnd
+OUT:=$(PRJ)/$(OUTPATH).bnd
 ROUT=$(OUTPATH).bnd
 .ENDIF
 .IF "$(truetime)" != ""
-OUT=$(PRJ)$/$(OUTPATH).tt
+OUT=$(PRJ)/$(OUTPATH).tt
 ROUT=$(OUTPATH).tt
 .ENDIF
 .IF "$(hbtoolkit)"!=""
-OUT=$(PRJ)$/$(OUTPATH).tlk
+OUT=$(PRJ)/$(OUTPATH).tlk
 ROUT=$(OUTPATH).tlk
 .ENDIF
 
 .IF "$(PRJ)"!="."
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
-.IF "$(USE_SHELL)"!="4nt"
 PATH_IN_MODULE:=\
-    $(subst,$(normpath $(shell @+cd $(PRJ) && pwd $(PWDFLAGS)))$/, $(PWD))
-.ELSE			# "$(USE_SHELL)"!="4nt"
-PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && echo %_cwd)$/, $(PWD))
-.ENDIF			# "$(USE_SHELL)"!="4nt"
+    $(subst,$(normpath $(shell @+cd $(PRJ) && pwd $(PWDFLAGS)))/, $(PWD))
 .ELSE			# "$(GUI)"=="WNT"
-PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && pwd $(PWDFLAGS))$/, $(PWD))
+PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && pwd $(PWDFLAGS))/, $(PWD))
 .ENDIF			# "$(GUI)"=="WNT"
 .ELSE			# "$(PRJ)"!="."
 PATH_IN_MODULE:=
@@ -626,24 +616,24 @@ LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
 # --- generate output tree -----------------------------------------
 
 # As this is not part of the initial startup makefile we define an infered
-# target instead of using $(OUT)$/inc$/myworld.mk as target name.
+# target instead of using $(OUT)/inc/myworld.mk as target name.
 # (See iz62795)
-$(OUT)$/inc$/%world.mk :
+$(OUT)/inc/%world.mk :
     @$(MKOUT) $(ROUT)
     @echo $(EMQ)# > $@
 
 # don't need/want output trees in solenv!!!
 .IF "$(PRJNAME)"!="solenv"
-.INCLUDE : $(OUT)$/inc$/myworld.mk
+.INCLUDE : $(OUT)/inc/myworld.mk
 .ENDIF			# "$(PRJNAME)"!="solenv"
 
 .IF "$(common_build)"!=""
-$(LOCAL_COMMON_OUT)$/inc$/%world.mk :
+$(LOCAL_COMMON_OUT)/inc/%world.mk :
     @$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
     @echo $(EMQ)# > $@
 
 .IF "$(PRJNAME)"!="solenv"
-.INCLUDE : $(LOCAL_COMMON_OUT)$/inc$/myworld.mk
+.INCLUDE : $(LOCAL_COMMON_OUT)/inc/myworld.mk
 .ENDIF			# "$(PRJNAME)"!="solenv"
 .ENDIF			# "$(common_build)"!=""
 
@@ -651,10 +641,10 @@ $(LOCAL_COMMON_OUT)$/inc$/%world.mk :
 
 # Misc-Pfad
 .IF "$(UNR)"!=""
-MISCX=$(OUT)$/umisc
-MISC=$(OUT)$/umisc
+MISCX=$(OUT)/umisc
+MISC=$(OUT)/umisc
 .ELSE
-MISC=$(OUT)$/misc
+MISC=$(OUT)/misc
 # pointing to misc in common output tree if exists
 COMMONMISC={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))}
 .ENDIF
@@ -663,31 +653,26 @@ L10N_MODULE*=l10n
 ALT_L10N_MODULE*=l10n_so
 
 .IF "$(WITH_LANG)"!=""
-.INCLUDE .IGNORE: $(SOLARSRC)$/$(L10N_MODULE)/localization_present.mk
-.INCLUDE .IGNORE: $(SOLARSRC)$/$(ALT_L10N_MODULE)/localization_present.mk
-
-#.IF "$(USE_SHELL)"!="4nt"
-#PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ);pwd)$/,$(NULL) $(PWD))
-#.ELSE			# "$(USE_SHELL)"!="4nt"
-#PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) ^ echo %_cwd)$/,$(NULL) $(PWD))
-#.ENDIF			# "$(USE_SHELL)"!="4nt"
+.INCLUDE .IGNORE: $(SOLARSRC)/$(L10N_MODULE)/localization_present.mk
+.INCLUDE .IGNORE: $(SOLARSRC)/$(ALT_L10N_MODULE)/localization_present.mk
+
 .IF "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
-TRYSDF:=$(SOLARSRC)$/$(L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+TRYSDF:=$(SOLARSRC)/$(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
 .IF "$(ALT_LOCALIZATION_FOUND)"!=""
-TRYALTSDF:=$(SOLARSRC)$/$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+TRYALTSDF:=$(SOLARSRC)/$(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
 # TODO: check performance impact...
 LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI)))
 .ENDIF			# "$(ALT_LOCALIZATION_FOUND)"!=""
 some_local_helper_var:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI) ))
 LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(some_local_helper_var) $(LOCALIZESDF))
-LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf $(LOCALIZESDF))
+LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf $(LOCALIZESDF))
 .ELSE			# "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
-LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+LOCALIZESDF:=$(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
 .ENDIF			# "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
 .ENDIF			# "$(WITH_LANG)"!=""
 
 
-OUTCXX=$(OUT)$/cxx
+OUTCXX=$(OUT)/cxx
 
 .IF "$(PACKAGE)"!=""
 IDLPACKAGE:=$(PACKAGE)
@@ -698,20 +683,20 @@ IDLPACKAGENAME=$(PRJNAME)
 .ENDIF
 
 # Objekt-Pfad
-OBJ=$(OUT)$/obj
-SLO=$(OUT)$/slo
-ROBJ=$(ROUT)$/obj
-RSLO=$(ROUT)$/slo
+OBJ=$(OUT)/obj
+SLO=$(OUT)/slo
+ROBJ=$(ROUT)/obj
+RSLO=$(ROUT)/slo
 
 # Particle Path
-PAR=$(OUT)$/par
+PAR=$(OUT)/par
 
 # Library-Pfad
-LB=$(OUT)$/lib
-SLB=$(OUT)$/slb
+LB=$(OUT)/lib
+SLB=$(OUT)/slb
 
 # wir haben ein ucr verzeichnis
-UCR=$(OUT)$/ucr
+UCR=$(OUT)/ucr
 
 # $(L) nur noch pfad ins solver\upd\...\lib
 #L:={$(LB);$(SLB);$(ILIB)}
@@ -725,11 +710,11 @@ ENVPRJ:=$(PRJ)
 # Class-Path for java-classes
 # obwohl der generierte Bytecode plattformunabhg. sein sollte
 # generieren wir ihn ersteinmal ins abhaengige Verzeichnis
-CLASSDIR=$(OUT)$/class
+CLASSDIR=$(OUT)/class
 CLASSPATH!:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(CLASSPATH)
-STARJAR=java -classpath $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARENV)$/bin$/jtools.jar com.sun.star.tool.starjar.StarJar
+STARJAR=java -classpath $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARENV)/bin/jtools.jar com.sun.star.tool.starjar.StarJar
 
-STARDEP=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/javadep
+STARDEP=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javadep
 .IF "$(PRJNAME)"=="sj2"
 CLASSPATH!:=$(CLASSPATH:s/sj2/no/)
 .ENDIF
@@ -748,11 +733,11 @@ PROCESSOUT*:=$(MISC)
 .INCLUDE : libs.mk
 
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
-VERSIONOBJ=$(SLO)$/_version.obj
+VERSIONOBJ=$(SLO)/_version.obj
 .ENDIF
 
 .IF "$(GUI)"=="UNX"
-VERSIONOBJ=$(SLO)$/_version.o
+VERSIONOBJ=$(SLO)/_version.o
 .ENDIF
 
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
@@ -769,25 +754,25 @@ SHELLLIB=gdi32.lib shell32.lib advapi32.lib comdlg32.lib
 
 # BIN-Pfad
 .IF "$(UNR)"!=""
-BIN=$(OUT)$/ubin
+BIN=$(OUT)/ubin
 .ELSE
-BIN=$(OUT)$/bin
+BIN=$(OUT)/bin
 .ENDIF
 # pointing to misc in common output tree if exists
-COMMONBIN=$(LOCAL_COMMON_OUT)$/bin
+COMMONBIN=$(LOCAL_COMMON_OUT)/bin
 
 # Include-Pfad
 # still without -I here s.a. target.mk INCLUDE
-INC=$(PRJ)$/inc
-INCPCH=$(PRJ)$/inc$/pch
-INCLOCAL=..$/inc
-INCGUI=$(PRJ)$/$(GUIBASE)$/inc
-INCCOM=$(OUT)$/inc
-INCCOMX=$(OUT)$/inc
-INCUNOIDL=$(INCCOM)$/$(PRJNAME)
-INCDEPN=. $(INCGUI) $(INCLOCAL) $(INC) $(INC)$/$(PRJNAME)
+INC=$(PRJ)/inc
+INCPCH=$(PRJ)/inc/pch
+INCLOCAL=../inc
+INCGUI=$(PRJ)/$(GUIBASE)/inc
+INCCOM=$(OUT)/inc
+INCCOMX=$(OUT)/inc
+INCUNOIDL=$(INCCOM)/$(PRJNAME)
+INCDEPN=. $(INCGUI) $(INCLOCAL) $(INC) $(INC)/$(PRJNAME)
 .IF "$(PRJINC)"!=""
-INCLOCPRJ=$(foreach,i,$(PRJINC) $i$/inc)
+INCLOCPRJ=$(foreach,i,$(PRJINC) $i/inc)
 INCDEPN+=$(INCLOCPRJ)
 .ENDIF
 .IF "$(INCPRE)"!=""
@@ -797,29 +782,29 @@ INCDEPN+=$(INCPRE)
 # Resource-Pfad fuer .SRS
 
 .IF "$(common_build_srs)"!=""
-SRS=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))$/srs
-SRSX=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))$/srs
+SRS=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))/srs
+SRSX=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))/srs
 .ELSE          # "$(common_build_srs)"!=""
-SRS=$(OUT)$/srs
-SRSX=$(OUT)$/srs
+SRS=$(OUT)/srs
+SRSX=$(OUT)/srs
 .ENDIF          # "$(common_build_srs)"!=""
 
 # Resource-Pfad fuer .RC und .RES
-RES=$(OUT)$/res
+RES=$(OUT)/res
 
 
 # das normale MISC wird nicht an LDMISC angepasst, stattdessen MISCX
 
 .IF "$(make_xl)"!=""
-BIN=$(PRJ)$/$(OUTPATH).xl$/bin
+BIN=$(PRJ)/$(OUTPATH).xl/bin
 .ENDIF
 
 # damit gezielt Abhaengigkeiten auf s: angegeben werden koennen
 
 .IF "$(common_build)"!=""
-SOLARIDLDIR=$(SOLARVERSION)$/common$(PROEXT)$/idl$(EXT_UPDMINOR)
+SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl$(EXT_UPDMINOR)
 .ELSE
-SOLARIDLDIR=$(SOLARVERSION)$/$(INPATH)$/idl$(EXT_UPDMINOR)
+SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(EXT_UPDMINOR)
 .ENDIF
 
 .IF "$(UPDMINOR)" != ""
@@ -827,29 +812,29 @@ EXT_UPDMINOR=.$(UPDMINOR)
 .ELSE
 EXT_UPDMINOR=
 .ENDIF
-SOLARRESDIR=$(SOLARVERSION)$/$(INPATH)$/res$(EXT_UPDMINOR)
-SOLARRESXDIR=$(SOLARVERSION)$/$(INPATH)$/res$(EXT_UPDMINOR)
-SOLARLIBDIR=$(SOLARVERSION)$/$(INPATH)$/lib$(EXT_UPDMINOR)
-SOLARJAVADIR=$(SOLARVERSION)$/$(INPATH)$/java$(EXT_UPDMINOR)
-SOLARINCDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(EXT_UPDMINOR)
-SOLARINCXDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(EXT_UPDMINOR)
+SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res$(EXT_UPDMINOR)
+SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(EXT_UPDMINOR)
+SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib$(EXT_UPDMINOR)
+SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java$(EXT_UPDMINOR)
+SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc$(EXT_UPDMINOR)
+SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(EXT_UPDMINOR)
 .IF "$(SOLARLANG)"!="deut"
 .IF "$(SOLARLANG)" != ""
-SOLARINCXDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(EXT_UPDMINOR)$/$(SOLARLANG)
-SOLARRESXDIR=$(SOLARVERSION)$/$(INPATH)$/res$(EXT_UPDMINOR)$/$(SOLARLANG)
-.ENDIF
-.ENDIF
-SOLARBINDIR:=$(SOLARVERSION)$/$(INPATH)$/bin$(EXT_UPDMINOR)
-SOLARUCRDIR=$(SOLARVERSION)$/$(INPATH)$/ucr$(EXT_UPDMINOR)
-SOLARPARDIR=$(SOLARVERSION)$/$(INPATH)$/par$(EXT_UPDMINOR)
-SOLARXMLDIR=$(SOLARVERSION)$/$(INPATH)$/xml$(EXT_UPDMINOR)
-SOLARDOCDIR=$(SOLARVERSION)$/$(INPATH)$/doc$(EXT_UPDMINOR)
-SOLARPCKDIR=$(SOLARVERSION)$/$(INPATH)$/pck$(EXT_UPDMINOR)
-SOLARSDFDIR=$(SOLARVERSION)$/$(INPATH)$/sdf$(EXT_UPDMINOR)
-SOLARCOMMONBINDIR=$(SOLARVERSION)$/common$(PROEXT)$/bin$(EXT_UPDMINOR)
-SOLARCOMMONRESDIR=$(SOLARVERSION)$/common$(PROEXT)$/res$(EXT_UPDMINOR)
-SOLARCOMMONPCKDIR=$(SOLARVERSION)$/common$(PROEXT)$/pck$(EXT_UPDMINOR)
-SOLARCOMMONSDFDIR=$(SOLARVERSION)$/common$(PROEXT)$/sdf$(EXT_UPDMINOR)
+SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(EXT_UPDMINOR)/$(SOLARLANG)
+SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(EXT_UPDMINOR)/$(SOLARLANG)
+.ENDIF
+.ENDIF
+SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin$(EXT_UPDMINOR)
+SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr$(EXT_UPDMINOR)
+SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par$(EXT_UPDMINOR)
+SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml$(EXT_UPDMINOR)
+SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc$(EXT_UPDMINOR)
+SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck$(EXT_UPDMINOR)
+SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf$(EXT_UPDMINOR)
+SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin$(EXT_UPDMINOR)
+SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res$(EXT_UPDMINOR)
+SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck$(EXT_UPDMINOR)
+SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf$(EXT_UPDMINOR)
 .IF "$(common_build)"==""
 SOLARCOMMONBINDIR=$(SOLARBINDIR)
 SOLARCOMMONRESDIR=$(SOLARRESDIR)
@@ -861,9 +846,9 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
 
 .IF "$(PRE)"==""
 #JARDIR=$(CLASSDIR)
-JARDIR=$(OUT)$/class
+JARDIR=$(OUT)/class
 .ELSE
-JARDIR=$(PRE)$/class
+JARDIR=$(PRE)/class
 .ENDIF
 
 # needs to be expanded!!!
@@ -908,9 +893,9 @@ UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD)
 UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
 
 .IF "$(PRE)"!=""
-UNOIDLINC!:=-I$(PRE)$/idl $(UNOIDLINC)
+UNOIDLINC!:=-I$(PRE)/idl $(UNOIDLINC)
 .ENDIF
-UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)$/inc -I$(PRJ)$/$(INPATH)$/idl -I$(OUT)$/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
+UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
 
 CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
 
@@ -946,9 +931,9 @@ HDEFS=-D:$(GUI) -D:$(COM)
 
 MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/)
 MKDEPALLINC=$(SOLARINC:s/-I/ -I/)
-MKDEPPREINC=-I$(PREPATH)$/$(INPATH)$/inc$(UPDMINOREXT)
-MKDEPSOLENV=-I$(SOLARENV)$/inc -I$(SOLARENV)$/$(GUI)$(CVER)$(COMEX)$/inc
-MKDEPSOLVER=-I$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) -I$(SOLARVERSION)$/$(INPATH)$/inc
+MKDEPPREINC=-I$(PREPATH)/$(INPATH)/inc$(UPDMINOREXT)
+MKDEPSOLENV=-I$(SOLARENV)/inc -I$(SOLARENV)/$(GUI)$(CVER)$(COMEX)/inc
+MKDEPSOLVER=-I$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT) -I$(SOLARVERSION)/$(INPATH)/inc
 MKDEPLOCAL=-I$(INCCOM)
 
 .IF "$(MKDEPENDALL)"!=""
@@ -974,9 +959,9 @@ MKDEPFLAGS+=$(MKDEPLOCAL)
 BISON=bison
 YACCFLAGS*=-d 
 
-SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/svidl
+SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/svidl
 
-LDUMP2*=$(SOLARBINDIR)$/ldump4
+LDUMP2*=$(SOLARBINDIR)/ldump4
 
 ZIPUPDATE=-u -j
 ZIPFLAGS=$(ZIPUPDATE)
@@ -990,9 +975,9 @@ SCPLINKFLAGS+=-v $(SCPLINKVERSION)
 .ENDIF			# "$(SCPLINKVERSION)"!=""
 
 .IF "$(make_srs_deps)"!=""
-RSC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/rscdep
+RSC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rscdep
 .ELSE # "$(make_srs_deps)"!=""
-RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)$/rsc
+RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
 .ENDIF # "$(make_srs_deps)"!=""
 
 #new
@@ -1023,9 +1008,9 @@ XPIDL_LINK=xpt_link
 # LINKEXTENDLINE compilerabhaengig definiert werden
 LINKEXTENDLINE=+
 
-LNT=$(DEVROOT)$/lint$/lint
-#LNTFLAGS=+v -i$(DEVROOT)$/lint\ -mL options.lnt -u
-LNTFLAGS=+v -i$(DEVROOT)$/lint$/ -mL options.lnt -u
+LNT=$(DEVROOT)/lint/lint
+#LNTFLAGS=+v -i$(DEVROOT)/lint\ -mL options.lnt -u
+LNTFLAGS=+v -i$(DEVROOT)/lint/ -mL options.lnt -u
 LNTFLAGSOUTOBJ=-os
 
 .IF "$(GUI)"=="WNT"
@@ -1056,19 +1041,19 @@ MAXPROCESS!:=1
 # allow seperate handling
 EXTMAXPROCESS*=$(MAXPROCESS)
 
-IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/idlc
-REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regmerge
-REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regcompare
-REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regcomp
-CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cppumaker
-JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/javamaker
-RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/rdbmaker
-CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/climaker
+IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/idlc
+REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regmerge
+REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcompare
+REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcomp
+CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cppumaker
+JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker
+RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker
+CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
 
-TESTSHL2=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/testshl2
-HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/helpex
-LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/lngconvex
-HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/HelpLinker
+TESTSHL2=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/testshl2
+HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
+LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
+HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
 
 .IF "$(JAVAINTERPRETER)" == ""
 JAVA*:=java
@@ -1079,10 +1064,10 @@ JAVA*:=$(JAVAINTERPRETER)
 
 # Define SCPCOMP without wrapper because pre2par.pl chokes on DOS style
 # pathes. (See iz57443)
-SCPCOMP=$(PERL) $(SOLARENV)$/bin$/pre2par.pl
-SCPLINK=$(PERL) $(SOLARENV)$/bin$/par2script.pl
+SCPCOMP=$(PERL) $(SOLARENV)/bin/pre2par.pl
+SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
 LZIP*=lzip
-CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cpplcc
+CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
 
 .IF "$(DISABLE_ENHANCED_COMID)"==""
 .INCLUDE : tg_compv.mk
@@ -1096,7 +1081,7 @@ COMID=$(COM)
 .ENDIF			# "$(SOLAR_JAVA)"=="TRUE"
 
 .IF "$(COM)"=="GCC"
-GXX_INCLUDE_PATH*:=$(COMPATH)$/include$/c++$/$(CCVER)
+GXX_INCLUDE_PATH*:=$(COMPATH)/include/c++/$(CCVER)
 .EXPORT : GXX_INCLUDE_PATH
 CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
 .ENDIF
@@ -1321,13 +1306,13 @@ LINKCFLAGS+=$(LINKFLAGSADD)
 
 #defaults for UCR HEADER
 UNOUCRBASE*=UCR
-UNOUCROUT*=$(OUT)$/inc$/$(TARGET)
+UNOUCROUT*=$(OUT)/inc/$(TARGET)
 INCPRE+=-I$(UNOUCROUT)
-UNOUCRRDB*=$(SOLARBINDIR)$/types.rdb
+UNOUCRRDB*=$(SOLARBINDIR)/types.rdb
 
 # location of trustedinfo.manifest for Windows Vista
 .IF "$(COM)"=="MSC"
-TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)$/inc
+TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)/inc
 .ENDIF # "$(COM)"=="MSC"
 
 # --- Compiler -----------------------------------------------------
@@ -1336,53 +1321,53 @@ TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)$/inc
 # --- include typelists --------------------------------------------
 
 .IF "$(COMP1TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)$/$(COMP1TYPELIST).mk
-$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+.INCLUDE .IGNORE : $(MISC)/$(COMP1TYPELIST).mk
+$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP2TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)$/$(COMP2TYPELIST).mk
-$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+.INCLUDE .IGNORE : $(MISC)/$(COMP2TYPELIST).mk
+$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP3TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)$/$(COMP3TYPELIST).mk
-$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+.INCLUDE .IGNORE : $(MISC)/$(COMP3TYPELIST).mk
+$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP4TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)$/$(COMP4TYPELIST).mk
-$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+.INCLUDE .IGNORE : $(MISC)/$(COMP4TYPELIST).mk
+$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP5TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)$/$(COMP5TYPELIST).mk
-$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+.INCLUDE .IGNORE : $(MISC)/$(COMP5TYPELIST).mk
+$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP6TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)$/$(COMP6TYPELIST).mk
-$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+.INCLUDE .IGNORE : $(MISC)/$(COMP6TYPELIST).mk
+$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP7TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)$/$(COMP7TYPELIST).mk
-$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+.INCLUDE .IGNORE : $(MISC)/$(COMP7TYPELIST).mk
+$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP8TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)$/$(COMP8TYPELIST).mk
-$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+.INCLUDE .IGNORE : $(MISC)/$(COMP8TYPELIST).mk
+$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP9TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)$/$(COMP9TYPELIST).mk
-$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+.INCLUDE .IGNORE : $(MISC)/$(COMP9TYPELIST).mk
+$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 # some place to define these jars for SO environment
-XML_APIS_JAR*=$(SOLARBINDIR)$/xml-apis.jar
-XERCES_JAR*=$(SOLARBINDIR)$/xercesImpl.jar
+XML_APIS_JAR*=$(SOLARBINDIR)/xml-apis.jar
+XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar
 
 # workaround for strange dmake bug:
 # if the previous block was a rule or a target, "\#" isn't recognized
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk
index 58b00978e..35f903f60 100644
--- a/solenv/inc/startup/wnt/macros.mk
+++ b/solenv/inc/startup/wnt/macros.mk
@@ -17,26 +17,6 @@ E *:= .exe	# Executables
 
 # Now set the remaining arguments depending on which SHELL we
 # are going to use.
-.IF $(USE_SHELL) == 4nt
-
-.IMPORT : COMSPEC
-
-SHELL *:= $(COMSPEC)
-
-   SHELLFLAGS       *:= $(SWITCHAR)c
-   GROUPFLAGS       *:= $(SHELLFLAGS)
-   SHELLMETAS       *:= "<>|&%^
-# Fix syntax highlighting: "
-   GROUPSUFFIX      *:= .bat
-   DIVFILE          *=  $(TMPFILE:s,/,\,)
-   RM               *=  +del
-   RMFLAGS          *= /y /E
-   MV	            *=  +rename
-   __.DIVSEP-sh-yes *:= \\
-   __.DIVSEP-sh-no  *:= \\
-   DIRSEPSTR        := \\
-
-.ELSE	# Non 4nt case
 
 .IF $(USE_SHELL) == bash
    SHELLFLAGS       *:= -c
@@ -59,30 +39,14 @@ SHELL *:= $(COMSPEC)
    __.DIVSEP-sh-no  *:= \\
    DIRSEPSTR :=/
 
-.ENDIF
-
 .EXPORT : GUWCMD
 
-.IF $(USE_SHELL) == 4nt
-
-my4ver:=$(shell @echo %_4ver)
-
-.IF "$(my4ver:s/.//:s/,//)" >= "400"
-.ELSE			# "$(my4ver:s/.//:s/,//)" >= "400"
-.ERROR : ; @echo Forced error: 4NT version too old! Version 4.0 or newer is required.
-4NT_version_too_old
-.ENDIF			# "$(my4ver:s/.//:s/,//)" >= "400"
-
-.ELSE # $(USE_SHELL) == 4nt
-
 .IF $(SHELL) == $(NULL)
 # SHELL has to be set in (non-4NT) OOobuild environment
 .ERROR : ; @echo Forced error: Environment variable SHELL has to be set for OOo build!
 SHELL_variable_needed
 .END
 
-.END # $(USE_SHELL) == 4nt
-
 GROUPSHELL *:= $(SHELL)
 
 # Does not respect case of filenames.
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index d9f278c7a..adf5079b0 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -56,21 +56,21 @@ INCEXT*=.
 INCPRE*=.
 INCPOST*=.
 .IF "$(PRE)"!=""
-ENVINCPRE+=-I$(PRE)$/inc
+ENVINCPRE+=-I$(PRE)/inc
 .ENDIF			# "$(PRE)"!=""
 .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
-UNOINCLUDES=$(SOLARINCDIR)$/offuh
+UNOINCLUDES=$(SOLARINCDIR)/offuh
 .ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
 SOLARINC+=$(JDKINCS)
 # make sure INCLUDE isn't set
 INCLUDE:=
 .EXPORT : INCLUDE
 .IF "$(PRJINC)"!=""
-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
+INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
 .ELSE		# "$(PRJINC)"!=""
-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
+INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
 .ENDIF		# "$(PRJINC)"!=""
-INCLUDE_C=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
+INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
 .EXPORT : LIB
 # --- Compiler -----------------------------------------------------
 
@@ -89,32 +89,32 @@ SUBDIRSDEPS=$(RC_SUBDIRSDEPS)
 
 .IF "$(L10N_framework)"==""
 .IF "$(DEPOBJFILES)"!=""
-DEPCOLLECT_SLO+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(SLO),ttt $i) $(NULL) $(subst,$(SLO)$/,not_existing$/s_ $(i:s/.obj/.dpcc/))))
-DEPCOLLECT_OBJ+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(OBJ),ttt $i) $(NULL) $(subst,$(OBJ)$/,not_existing$/o_ $(i:s/.obj/.dpcc/))))
+DEPCOLLECT_SLO+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(SLO),ttt $i) $(NULL) $(subst,$(SLO)/,not_existing/s_ $(i:s/.obj/.dpcc/))))
+DEPCOLLECT_OBJ+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(OBJ),ttt $i) $(NULL) $(subst,$(OBJ)/,not_existing/o_ $(i:s/.obj/.dpcc/))))
 .ENDIF			# "$(DEPOBJFILES)"!=""
 # point to not existing directory as there is no creation intended anyway and
 # stat call looks faster
-DEPCOLLECT_SLO+:=$(subst,$(SLO)$/,not_existing$/s_ $(SLOFILES:s/.obj/.dpcc/))
-DEPCOLLECT_OBJ+:=$(subst,$(OBJ)$/,not_existing$/o_ $(OBJFILES:s/.obj/.dpcc/))
+DEPCOLLECT_SLO+:=$(subst,$(SLO)/,not_existing/s_ $(SLOFILES:s/.obj/.dpcc/))
+DEPCOLLECT_OBJ+:=$(subst,$(OBJ)/,not_existing/o_ $(OBJFILES:s/.obj/.dpcc/))
 .ENDIF			# "$(L10N_framework)"==""
 DEPFILESx+:=$(subst,$(PAR),$(MISC) $(ALLPARFILES:s/.par/.dpsc/))
 .IF "$(L10N_framework)"==""
 .IF "$(RCFILES)"!=""
 .IF "$(RESNAME)"!=""
-DEPFILESx+:=$(MISC)$/$(RESNAME).dpcc
+DEPFILESx+:=$(MISC)/$(RESNAME).dpcc
 .ELSE			# "$(RESNAME)"!=""
-DEPFILESx+:=$(MISC)$/$(TARGET).dprc
+DEPFILESx+:=$(MISC)/$(TARGET).dprc
 .ENDIF			# "$(RESNAME)"!=""
 .ENDIF			# "$(RCFILES)"!=""
 .ENDIF          # "$(L10N_framework)"==""
 DEPFILES:=$(uniq $(DEPFILESx))
 DEPCOLLECT_SLO!:=$(strip $(uniq $(DEPCOLLECT_SLO)))
 .IF "$(DEPCOLLECT_SLO)"!=""
-DEPFILE_SLO+:=$(MISC)$/all_$(TARGET).dpslo
+DEPFILE_SLO+:=$(MISC)/all_$(TARGET).dpslo
 .ENDIF			# "$(DEPCOLLECT_SLO)"!=""
 DEPCOLLECT_OBJ!:=$(strip $(uniq $(DEPCOLLECT_OBJ)))
 .IF "$(DEPCOLLECT_OBJ)"!=""
-DEPFILE_OBJ+:=$(MISC)$/all_$(TARGET).dpobj
+DEPFILE_OBJ+:=$(MISC)/all_$(TARGET).dpobj
 .ENDIF			# "$(DEPCOLLECT_OBJ)"!=""
 .ENDIF			# "$(nodep)"==""
 
@@ -160,19 +160,19 @@ APP9TARGET=
 
 .IF "$(IDLFILES)"!=""
 
-URDFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)$/ucr$/$(IDLPACKAGE)$/$i)
+URDFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)/ucr/$(IDLPACKAGE)/$i)
 UNOIDLTARGETS+=$(URDFILES)
 
 .IF "$(URDFILES)"!=""
-LOCALDBTARGET=$(OUT)$/ucr$/$(TARGET).db
+LOCALDBTARGET=$(OUT)/ucr/$(TARGET).db
 .ENDIF
 
 .IF "$(URDDOC)" != ""
-URDDOCFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)$/ucrdoc$/$(IDLPACKAGE)$/$i)
+URDDOCFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)/ucrdoc/$(IDLPACKAGE)/$i)
 UNOIDLTARGETS+=$(URDDOCFILES)
 
 .IF "$(URDDOCFILES)"!=""
-LOCALDOCDBTARGET=$(OUT)$/ucrdoc$/$(TARGET).db
+LOCALDOCDBTARGET=$(OUT)/ucrdoc/$(TARGET).db
 .ENDIF
 
 .ENDIF			# "$(URDDOC)" != ""
@@ -180,10 +180,10 @@ LOCALDOCDBTARGET=$(OUT)$/ucrdoc$/$(TARGET).db
 .ENDIF		# "$(IDLFILES)"!=""
 
 .IF "$(UNOIDLDBFILES)"!=""
-UNOIDLDBTARGET=$(OUT)$/ucr$/$(PRJNAME).db
+UNOIDLDBTARGET=$(OUT)/ucr/$(PRJNAME).db
 .IF "$(URDDOC)" != ""
-UNOIDLDBDOCFILES:=$(subst,$/ucr$/,$/ucrdoc$/ $(UNOIDLDBFILES))
-UNOIDLDBDOCTARGET=$(OUT)$/ucrdoc$/$(PRJNAME)_doc.db
+UNOIDLDBDOCFILES:=$(subst,/ucr/,/ucrdoc/ $(UNOIDLDBFILES))
+UNOIDLDBDOCTARGET=$(OUT)/ucrdoc/$(PRJNAME)_doc.db
 .IF "$(UNOIDLDBREGS)"!=""
 UNOIDLDBDOCREGS=$(foreach,i,$(UNOIDLDBREGS) $(i:d)$(i:b)_doc$(i:e))
 .ENDIF			# "$(UNOIDLDBREGS)"!=""
@@ -192,14 +192,14 @@ UNOIDLDBDOCREGS=$(foreach,i,$(UNOIDLDBREGS) $(i:d)$(i:b)_doc$(i:e))
 
 .IF "$(IDLFILES)"!=""
 .IF "$(PACKAGE)"!=""
-IDLDIRS=$(SOLARIDLDIR)$/$(PACKAGE)
+IDLDIRS=$(SOLARIDLDIR)/$(PACKAGE)
 .ELSE			# "$(PACKAGE)"!=""
 IDLDIRS=$(SOLARIDLDIR)
 .ENDIF			# "$(PACKAGE)"!=""
 
 .IF "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!=""
 .IF "$(EXTERNIDLFILES)"!=""
-DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)$/$i)
+DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)/$i)
 .ELSE			# "$(EXTERNIDLFILES)"!=""
 DEPIDLFILES:=$(IDLFILES)
 .ENDIF			# "$(EXTERNIDLFILES)"!=""
@@ -214,12 +214,12 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print)
 
 .IF "$(L10N_framework)"==""
 .IF "$(JARFILES)"!=""
-LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)$/$i)
+LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)/$i)
 NEWCLASS:=$(LOCALJARS)
-NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)$/$i $(NULL)))
+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)/$i $(NULL)))
 .ENDIF			# "$(JARFILES)"!=""
 .IF "$(EXTRAJARFILES)"!=""
-NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)$/$i)
+NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)/$i)
 .ENDIF			# "$(EXTRAJARFILES)"!=""
 .IF "$(GENJAVACLASSFILES)"!=""
 NEWCLASS+=$(CLASSGENDIR)
@@ -240,25 +240,25 @@ EXCEPTIONSNOOPTTARGET=do_it_exceptions_noopt
 
 .IF "$(LIBTARGET)"==""
 .IF "$(OBJFILES)$(IDLOBJFILES)"!=""
-OBJTARGET=$(LB)$/$(TARGET).lib
+OBJTARGET=$(LB)/$(TARGET).lib
 .ENDIF
 
 .IF "$(SLOFILES)$(IDLSLOFILES)"!=""
-SLOTARGET=$(SLB)$/$(TARGET).lib
+SLOTARGET=$(SLB)/$(TARGET).lib
 .ENDIF
 .ENDIF			# "$(LIBTARGET)"==""
 
 .IF "$(SECOND_BUILD)"!=""
 .IF "$($(SECOND_BUILD)_SLOFILES)"!=""
 .IF "$(LIBTARGET)"==""
-$(SECOND_BUILD)SLOTARGET=$(SLB)$/$(SECOND_BUILD)_$(TARGET).lib
+$(SECOND_BUILD)SLOTARGET=$(SLB)/$(SECOND_BUILD)_$(TARGET).lib
 .ENDIF			# "$(LIBTARGET)"==""
 REAL_$(SECOND_BUILD)_SLOFILES=$(foreach,i,$($(SECOND_BUILD)_SLOFILES) $(i:d)$(SECOND_BUILD)_$(i:f))
 .ENDIF
 
 .IF "$($(SECOND_BUILD)_OBJFILES)"!=""
 .IF "$(LIBTARGET)"==""
-$(SECOND_BUILD)OBJTARGET=$(LB)$/$(SECOND_BUILD)_$(TARGET).lib
+$(SECOND_BUILD)OBJTARGET=$(LB)/$(SECOND_BUILD)_$(TARGET).lib
 .ENDIF			# "$(LIBTARGET)"==""
 REAL_$(SECOND_BUILD)_OBJFILES=$(foreach,i,$($(SECOND_BUILD)_OBJFILES) $(i:d)$(SECOND_BUILD)_$(i:f))
 .ENDIF
@@ -286,80 +286,80 @@ NOLIBSLOTARGET=$(SLOFILES)
 .ENDIF
 
 .IF "$(SRC1FILES)"!=""
-SRC1TARGET=$(SRS)$/$(SRS1NAME).srs
-DEPSRS1FILE+=$(MISC)$/$(TARGET).$(SRS1NAME).dprr
+SRC1TARGET=$(SRS)/$(SRS1NAME).srs
+DEPSRS1FILE+=$(MISC)/$(TARGET).$(SRS1NAME).dprr
 DEPSRSFILES+=$(DEPSRS1FILE)
 .ENDIF
 
 .IF "$(SRC2FILES)"!=""
-SRC2TARGET=$(SRS)$/$(SRS2NAME).srs
-DEPSRS2FILE+=$(MISC)$/$(TARGET).$(SRS2NAME).dprr
+SRC2TARGET=$(SRS)/$(SRS2NAME).srs
+DEPSRS2FILE+=$(MISC)/$(TARGET).$(SRS2NAME).dprr
 DEPSRSFILES+=$(DEPSRS2FILE)
 .ENDIF
 
 .IF "$(SRC3FILES)"!=""
-SRC3TARGET=$(SRS)$/$(SRS3NAME).srs
-DEPSRS3FILE+=$(MISC)$/$(TARGET).$(SRS3NAME).dprr
+SRC3TARGET=$(SRS)/$(SRS3NAME).srs
+DEPSRS3FILE+=$(MISC)/$(TARGET).$(SRS3NAME).dprr
 DEPSRSFILES+=$(DEPSRS3FILE)
 .ENDIF
 
 .IF "$(SRC4FILES)"!=""
-SRC4TARGET=$(SRS)$/$(SRS4NAME).srs
-DEPSRS4FILE+=$(MISC)$/$(TARGET).$(SRS4NAME).dprr
+SRC4TARGET=$(SRS)/$(SRS4NAME).srs
+DEPSRS4FILE+=$(MISC)/$(TARGET).$(SRS4NAME).dprr
 DEPSRSFILES+=$(DEPSRS4FILE)
 .ENDIF
 
 .IF "$(SRC5FILES)"!=""
-SRC5TARGET=$(SRS)$/$(SRS5NAME).srs
-DEPSRS5FILE+=$(MISC)$/$(TARGET).$(SRS5NAME).dprr
+SRC5TARGET=$(SRS)/$(SRS5NAME).srs
+DEPSRS5FILE+=$(MISC)/$(TARGET).$(SRS5NAME).dprr
 DEPSRSFILES+=$(DEPSRS5FILE)
 .ENDIF
 
 .IF "$(SRC6FILES)"!=""
-SRC6TARGET=$(SRS)$/$(SRS6NAME).srs
-DEPSRS6FILE+=$(MISC)$/$(TARGET).$(SRS6NAME).dprr
+SRC6TARGET=$(SRS)/$(SRS6NAME).srs
+DEPSRS6FILE+=$(MISC)/$(TARGET).$(SRS6NAME).dprr
 DEPSRSFILES+=$(DEPSRS6FILE)
 .ENDIF
 
 .IF "$(SRC7FILES)"!=""
-SRC7TARGET=$(SRS)$/$(SRS7NAME).srs
-DEPSRS7FILE+=$(MISC)$/$(TARGET).$(SRS7NAME).dprr
+SRC7TARGET=$(SRS)/$(SRS7NAME).srs
+DEPSRS7FILE+=$(MISC)/$(TARGET).$(SRS7NAME).dprr
 DEPSRSFILES+=$(DEPSRS7FILE)
 .ENDIF
 
 .IF "$(SRC8FILES)"!=""
-SRC8TARGET=$(SRS)$/$(SRS8NAME).srs
-DEPSRS8FILE+=$(MISC)$/$(TARGET).$(SRS8NAME).dprr
+SRC8TARGET=$(SRS)/$(SRS8NAME).srs
+DEPSRS8FILE+=$(MISC)/$(TARGET).$(SRS8NAME).dprr
 DEPSRSFILES+=$(DEPSRS8FILE)
 .ENDIF
 
 .IF "$(SRC9FILES)"!=""
-SRC9TARGET=$(SRS)$/$(SRS9NAME).srs
-DEPSRS9FILE+=$(MISC)$/$(TARGET).$(SRS9NAME).dprr
+SRC9TARGET=$(SRS)/$(SRS9NAME).srs
+DEPSRS9FILE+=$(MISC)/$(TARGET).$(SRS9NAME).dprr
 DEPSRSFILES+=$(DEPSRS9FILE)
 .ENDIF
 
 .IF "$(SOLAR_JAVA)"!=""
 .IF "$(JAVAFILES)$(JAVACLASSFILES)$(GENJAVAFILES)"!=""
 .IF "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)"
-JAVACLASSFILES=	$(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class)
+JAVACLASSFILES=	$(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:s/.java//).class)
 .ELSE			# "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)"
 .IF "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVACLASSFILES)"
-JAVAFILES=	$(foreach,i,$(JAVACLASSFILES) $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(i:s/.class//).java))
+JAVAFILES=	$(foreach,i,$(JAVACLASSFILES) $(subst,$(CLASSDIR)/$(PACKAGE)/, $(i:s/.class//).java))
 .ENDIF			# "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVACLASSFILES)"
 .ENDIF			# "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)"
-JAVATARGET:=$(MISC)$/$(TARGET)_dummy.java
+JAVATARGET:=$(MISC)/$(TARGET)_dummy.java
 .ENDIF			# "$(JAVAFILES)$(JAVACLASSFILES)$(GENJAVAFILES)"!=""
 
 .IF "$(JARTARGET)"!=""
 JARCLASSDIRS*=.
 .IF "$(NEW_JAR_PACK)"!=""
-JARMANIFEST*=$(CLASSDIR)$/$(TARGET)$/META-INF$/MANIFEST.MF
+JARMANIFEST*=$(CLASSDIR)/$(TARGET)/META-INF/MANIFEST.MF
 .ENDIF			# "$(NEW_JAR_PACK)"!=""
-JARTARGETN=$(CLASSDIR)$/$(JARTARGET)
+JARTARGETN=$(CLASSDIR)/$(JARTARGET)
 .IF "$(NOJARDEP)$(NEW_JAR_PACK)"==""
 JARTARGETDEP=$(JARTARGET).dep
-JARTARGETDEPN=$(MISC)$/$(JARTARGET).dep
+JARTARGETDEPN=$(MISC)/$(JARTARGET).dep
 .ENDIF			# "$(NOJARDEP)$(NEW_JAR_PACK)"==""
 .ENDIF			# "$(JARTARGET)"!=""
 .ELSE			# "$(SOLAR_JAVA)"!=""
@@ -372,49 +372,49 @@ javauno:=
 .IF "$(RCFILES)"!=""
 RESNAME*=$(TARGET)
 .IF "$(RCFILES)" != "verinfo.rc"
-RCTARGET=$(RES)$/$(RESNAME).res
+RCTARGET=$(RES)/$(RESNAME).res
 .ELSE           # "$(RCFILES)" != "verinfo.rc"
 RCFILES=
 .ENDIF          # "$(RCFILES)" != "verinfo.rc"
 .ENDIF          # "$(RCFILES)"!=""
 .ENDIF          # "$(L10N_framework)"==""
 
-LOCALIZE_ME_DEST:=$(foreach,i,$(LOCALIZE_ME) $(INCCOM)$/$(i:f:s/_tmpl//))
+LOCALIZE_ME_DEST:=$(foreach,i,$(LOCALIZE_ME) $(INCCOM)/$(i:f:s/_tmpl//))
 
 .IF "$(SCP1TARGET)"!=""
-SCP1TARGETN:=$(foreach,i,$(SCP1LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP1TARGET)$(SCPPOST))
+SCP1TARGETN:=$(foreach,i,$(SCP1LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP1TARGET)$(SCPPOST))
 .ENDIF
 
 .IF "$(SCP2TARGET)"!=""
-SCP2TARGETN:=$(foreach,i,$(SCP2LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP2TARGET)$(SCPPOST))
+SCP2TARGETN:=$(foreach,i,$(SCP2LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP2TARGET)$(SCPPOST))
 .ENDIF
 
 .IF "$(SCP3TARGET)"!=""
-SCP3TARGETN:=$(foreach,i,$(SCP3LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP3TARGET)$(SCPPOST))
+SCP3TARGETN:=$(foreach,i,$(SCP3LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP3TARGET)$(SCPPOST))
 .ENDIF
 
 .IF "$(SCP4TARGET)"!=""
-SCP4TARGETN:=$(foreach,i,$(SCP4LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP4TARGET)$(SCPPOST))
+SCP4TARGETN:=$(foreach,i,$(SCP4LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP4TARGET)$(SCPPOST))
 .ENDIF
 
 .IF "$(SCP5TARGET)"!=""
-SCP5TARGETN:=$(foreach,i,$(SCP5LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP5TARGET)$(SCPPOST))
+SCP5TARGETN:=$(foreach,i,$(SCP5LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP5TARGET)$(SCPPOST))
 .ENDIF
 
 .IF "$(SCP6TARGET)"!=""
-SCP6TARGETN:=$(foreach,i,$(SCP6LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP6TARGET)$(SCPPOST))
+SCP6TARGETN:=$(foreach,i,$(SCP6LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP6TARGET)$(SCPPOST))
 .ENDIF
 
 .IF "$(SCP7TARGET)"!=""
-SCP7TARGETN:=$(foreach,i,$(SCP7LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP7TARGET)$(SCPPOST))
+SCP7TARGETN:=$(foreach,i,$(SCP7LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP7TARGET)$(SCPPOST))
 .ENDIF
 
 .IF "$(SCP8TARGET)"!=""
-SCP8TARGETN:=$(foreach,i,$(SCP8LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP8TARGET)$(SCPPOST))
+SCP8TARGETN:=$(foreach,i,$(SCP8LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP8TARGET)$(SCPPOST))
 .ENDIF
 
 .IF "$(SCP9TARGET)"!=""
-SCP9TARGETN:=$(foreach,i,$(SCP9LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP9TARGET)$(SCPPOST))
+SCP9TARGETN:=$(foreach,i,$(SCP9LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP9TARGET)$(SCPPOST))
 .ENDIF
 
 .IF "$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)"!="$(ZIP1LIST:s/LANGDIR//)$(ZIP2LIST:s/LANGDIR//)$(ZIP3LIST:s/LANGDIR//)$(ZIP4LIST:s/LANGDIR//)$(ZIP5LIST:s/LANGDIR//)$(ZIP6LIST:s/LANGDIR//)$(ZIP7LIST:s/LANGDIR//)$(ZIP8LIST:s/LANGDIR//)$(ZIP9LIST:s/LANGDIR//)"
@@ -424,7 +424,7 @@ ZIPALL=ZIPALLTARGET
 .ENDIF			#
 
 .IF "$(APP1TARGET)"!=""
-APP1TARGETN=$(BIN)$/$(APP1TARGET)$(EXECPOST)
+APP1TARGETN=$(BIN)/$(APP1TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(APP1BASE)"==""
@@ -436,7 +436,7 @@ APP1BASEX=/BASE:$(APP1BASE)
 .ENDIF
 
 .IF "$(APP2TARGET)"!=""
-APP2TARGETN=$(BIN)$/$(APP2TARGET)$(EXECPOST)
+APP2TARGETN=$(BIN)/$(APP2TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(APP2BASE)"==""
@@ -448,7 +448,7 @@ APP2BASEX=/BASE:$(APP2BASE)
 .ENDIF
 
 .IF "$(APP3TARGET)"!=""
-APP3TARGETN=$(BIN)$/$(APP3TARGET)$(EXECPOST)
+APP3TARGETN=$(BIN)/$(APP3TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP3BASE)"==""
@@ -460,7 +460,7 @@ APP3BASEX=/BASE:$(APP3BASE)
 .ENDIF
 
 .IF "$(APP4TARGET)"!=""
-APP4TARGETN=$(BIN)$/$(APP4TARGET)$(EXECPOST)
+APP4TARGETN=$(BIN)/$(APP4TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(APP4BASE)"==""
@@ -472,7 +472,7 @@ APP4BASEX=/BASE:$(APP4BASE)
 .ENDIF
 
 .IF "$(APP5TARGET)"!=""
-APP5TARGETN=$(BIN)$/$(APP5TARGET)$(EXECPOST)
+APP5TARGETN=$(BIN)/$(APP5TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(APP5BASE)"==""
@@ -484,7 +484,7 @@ APP5BASEX=/BASE:$(APP5BASE)
 .ENDIF
 
 .IF "$(APP6TARGET)"!=""
-APP6TARGETN=$(BIN)$/$(APP6TARGET)$(EXECPOST)
+APP6TARGETN=$(BIN)/$(APP6TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(APP6BASE)"==""
@@ -496,7 +496,7 @@ APP6BASEX=/BASE:$(APP6BASE)
 .ENDIF
 
 .IF "$(APP7TARGET)"!=""
-APP7TARGETN=$(BIN)$/$(APP7TARGET)$(EXECPOST)
+APP7TARGETN=$(BIN)/$(APP7TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(APP7BASE)"==""
@@ -508,7 +508,7 @@ APP7BASEX=/BASE:$(APP7BASE)
 .ENDIF
 
 .IF "$(APP8TARGET)"!=""
-APP8TARGETN=$(BIN)$/$(APP8TARGET)$(EXECPOST)
+APP8TARGETN=$(BIN)/$(APP8TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP8BASE)"==""
@@ -520,7 +520,7 @@ APP8BASEX=/BASE:$(APP8BASE)
 .ENDIF
 
 .IF "$(APP9TARGET)"!=""
-APP9TARGETN=$(BIN)$/$(APP9TARGET)$(EXECPOST)
+APP9TARGETN=$(BIN)/$(APP9TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP9BASE)"==""
@@ -536,7 +536,7 @@ APP9BASEX=/BASE:$(APP9BASE)
 SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
 SHL1DLLPRE*=$(DLLPRE)
-SHL1TARGETN=$(DLLDEST)$/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST)
+SHL1TARGETN=$(DLLDEST)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL1BASE)"==""
@@ -552,7 +552,7 @@ SHL1BASEX=/BASE:$(SHL1BASE)
 SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
 SHL2DLLPRE*=$(DLLPRE)
-SHL2TARGETN=$(DLLDEST)$/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST)
+SHL2TARGETN=$(DLLDEST)/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL2BASE)"==""
@@ -568,7 +568,7 @@ SHL2BASEX=/BASE:$(SHL2BASE)
 SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
 SHL3DLLPRE*=$(DLLPRE)
-SHL3TARGETN=$(DLLDEST)$/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST)
+SHL3TARGETN=$(DLLDEST)/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL3BASE)"==""
@@ -584,7 +584,7 @@ SHL3BASEX=/BASE:$(SHL3BASE)
 SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
 SHL4DLLPRE*=$(DLLPRE)
-SHL4TARGETN=$(DLLDEST)$/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST)
+SHL4TARGETN=$(DLLDEST)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL4BASE)"==""
@@ -600,7 +600,7 @@ SHL4BASEX=/BASE:$(SHL4BASE)
 SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
 SHL5DLLPRE*=$(DLLPRE)
-SHL5TARGETN=$(DLLDEST)$/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST)
+SHL5TARGETN=$(DLLDEST)/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL5BASE)"==""
@@ -616,7 +616,7 @@ SHL5BASEX=/BASE:$(SHL5BASE)
 SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
 SHL6DLLPRE*=$(DLLPRE)
-SHL6TARGETN=$(DLLDEST)$/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST)
+SHL6TARGETN=$(DLLDEST)/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL6BASE)"==""
@@ -632,7 +632,7 @@ SHL6BASEX=/BASE:$(SHL6BASE)
 SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
 SHL7DLLPRE*=$(DLLPRE)
-SHL7TARGETN=$(DLLDEST)$/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST)
+SHL7TARGETN=$(DLLDEST)/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL7BASE)"==""
@@ -648,7 +648,7 @@ SHL7BASEX=/BASE:$(SHL7BASE)
 SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
 SHL8DLLPRE*=$(DLLPRE)
-SHL8TARGETN=$(DLLDEST)$/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST)
+SHL8TARGETN=$(DLLDEST)/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL8BASE)"==""
@@ -664,7 +664,7 @@ SHL8BASEX=/BASE:$(SHL8BASE)
 SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
 SHL9DLLPRE*=$(DLLPRE)
-SHL9TARGETN=$(DLLDEST)$/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST)
+SHL9TARGETN=$(DLLDEST)/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL9BASE)"==""
@@ -679,73 +679,73 @@ SHL9BASEX=/BASE:$(SHL9BASE)
 .IF "$(UNOUCRRDB)"!=""
 COMPRDB*:=$(UNOUCRRDB)
 .ELSE			# "$(UNOUCRRDB)"!=""
-COMPRDB*:=$(SOLARBINDIR)$/types.rdb
+COMPRDB*:=$(SOLARBINDIR)/types.rdb
 .ENDIF			# "$(UNOUCRRDB)"!=""
 .ENDIF          # "$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!=""
 .IF "$(COMP1TYPELIST)"!=""
 UNOTYPES+=$($(COMP1TYPELIST)_XML2CMPTYPES)
-COMP1RDBTARGETN:=$(BIN)$/$(COMP1TYPELIST).rdb
-#COMP1TYPELISTN:=$(MISC)$/$(COMP1TYPELIST).xml
+COMP1RDBTARGETN:=$(BIN)/$(COMP1TYPELIST).rdb
+#COMP1TYPELISTN:=$(MISC)/$(COMP1TYPELIST).xml
 .ENDIF
 
 .IF "$(COMP2TYPELIST)"!=""
 UNOTYPES+=$($(COMP2TYPELIST)_XML2CMPTYPES)
-COMP2RDBTARGETN:=$(BIN)$/$(COMP2TYPELIST).rdb
-#COMP2TYPELISTN:=$(MISC)$/$(COMP2TYPELIST).xml
+COMP2RDBTARGETN:=$(BIN)/$(COMP2TYPELIST).rdb
+#COMP2TYPELISTN:=$(MISC)/$(COMP2TYPELIST).xml
 .ENDIF
 
 .IF "$(COMP3TYPELIST)"!=""
 UNOTYPES+=$($(COMP3TYPELIST)_XML2CMPTYPES)
-COMP3RDBTARGETN:=$(BIN)$/$(COMP3TYPELIST).rdb
-#COMP3TYPELISTN:=$(MISC)$/$(COMP3TYPELIST).xml
+COMP3RDBTARGETN:=$(BIN)/$(COMP3TYPELIST).rdb
+#COMP3TYPELISTN:=$(MISC)/$(COMP3TYPELIST).xml
 .ENDIF
 
 .IF "$(COMP4TYPELIST)"!=""
 UNOTYPES+=$($(COMP4TYPELIST)_XML2CMPTYPES)
-COMP4RDBTARGETN:=$(BIN)$/$(COMP4TYPELIST).rdb
-#COMP4TYPELISTN:=$(MISC)$/$(COMP4TYPELIST).xml
+COMP4RDBTARGETN:=$(BIN)/$(COMP4TYPELIST).rdb
+#COMP4TYPELISTN:=$(MISC)/$(COMP4TYPELIST).xml
 .ENDIF
 
 .IF "$(COMP5TYPELIST)"!=""
 UNOTYPES+=$($(COMP5TYPELIST)_XML2CMPTYPES)
-COMP5RDBTARGETN:=$(BIN)$/$(COMP5TYPELIST).rdb
-#COMP5TYPELISTN:=$(MISC)$/$(COMP5TYPELIST).xml
+COMP5RDBTARGETN:=$(BIN)/$(COMP5TYPELIST).rdb
+#COMP5TYPELISTN:=$(MISC)/$(COMP5TYPELIST).xml
 .ENDIF
 
 .IF "$(COMP6TYPELIST)"!=""
 UNOTYPES+=$($(COMP6TYPELIST)_XML2CMPTYPES)
-COMP6RDBTARGETN:=$(BIN)$/$(COMP6TYPELIST).rdb
-#COMP6TYPELISTN:=$(MISC)$/$(COMP6TYPELIST).xml
+COMP6RDBTARGETN:=$(BIN)/$(COMP6TYPELIST).rdb
+#COMP6TYPELISTN:=$(MISC)/$(COMP6TYPELIST).xml
 .ENDIF
 
 .IF "$(COMP7TYPELIST)"!=""
 UNOTYPES+=$($(COMP7TYPELIST)_XML2CMPTYPES)
-COMP7RDBTARGETN:=$(BIN)$/$(COMP7TYPELIST).rdb
-#COMP7TYPELISTN:=$(MISC)$/$(COMP7TYPELIST).xml
+COMP7RDBTARGETN:=$(BIN)/$(COMP7TYPELIST).rdb
+#COMP7TYPELISTN:=$(MISC)/$(COMP7TYPELIST).xml
 .ENDIF
 
 .IF "$(COMP8TYPELIST)"!=""
 UNOTYPES+=$($(COMP8TYPELIST)_XML2CMPTYPES)
-COMP8RDBTARGETN:=$(BIN)$/$(COMP8TYPELIST).rdb
-#COMP8TYPELISTN:=$(MISC)$/$(COMP8TYPELIST).xml
+COMP8RDBTARGETN:=$(BIN)/$(COMP8TYPELIST).rdb
+#COMP8TYPELISTN:=$(MISC)/$(COMP8TYPELIST).xml
 .ENDIF
 
 .IF "$(COMP9TYPELIST)"!=""
 UNOTYPES+=$($(COMP9TYPELIST)_XML2CMPTYPES)
-COMP9RDBTARGETN:=$(BIN)$/$(COMP9TYPELIST).rdb
-#COMP9TYPELISTN:=$(MISC)$/$(COMP9TYPELIST).xml
+COMP9RDBTARGETN:=$(BIN)/$(COMP9TYPELIST).rdb
+#COMP9TYPELISTN:=$(MISC)/$(COMP9TYPELIST).xml
 .ENDIF
 
 UNOTYPES!:=$(strip $(UNOTYPES))
 
 #moved here to get UNOTYPES from COMPxTYPELIST
 .IF "$(UNOTYPES)" != ""
-UNOUCRHEADER=$(foreach,j,$(subst,.,$/ $(UNOTYPES)) $(UNOUCROUT)$/$(j:+".hpp"))
-UNOUCRTARGET:=$(INCCOM)$/$(TARGET)_headergen.done
+UNOUCRHEADER=$(foreach,j,$(subst,.,/ $(UNOTYPES)) $(UNOUCROUT)/$(j:+".hpp"))
+UNOUCRTARGET:=$(INCCOM)/$(TARGET)_headergen.done
 .ENDIF			# "$(UNOTYPES)" != ""
 
 .IF "$(HELPIDFILES)"!=""
-MAKE_HELPIDS=$(MISC)$/helpids.don
+MAKE_HELPIDS=$(MISC)/helpids.don
 .ENDIF
 
 .IF "$(HXXCOPYFILES)" != ""
@@ -806,11 +806,11 @@ LIB9ARCHIV=
 .IF "$(RESLIB1NOVERSION)"==""
 .ENDIF			# "$(RESLIB1NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)LANGEXT.res
-RSC_MULTI1=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB1NAME)
+RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)LANGEXT.res
+RSC_MULTI1=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB1NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB1TARGETN=$(BIN)$/$(RESLIB1NAME)LANGEXT.res
-RSC_MULTI1=$(MISC)$/rsc_$(RESLIB1NAME)
+RESLIB1TARGETN=$(BIN)/$(RESLIB1NAME)LANGEXT.res
+RSC_MULTI1=$(MISC)/rsc_$(RESLIB1NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 # change to iso if resmgr is changed
 RESLIB1TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB1TARGETN)))
@@ -820,11 +820,11 @@ RESLIB1TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB1TARGETN))
 .IF "$(RESLIB2NOVERSION)"==""
 .ENDIF			# "$(RESLIB2NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)LANGEXT.res
-RSC_MULTI2=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB2NAME)
+RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)LANGEXT.res
+RSC_MULTI2=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB2NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB2TARGETN=$(BIN)$/$(RESLIB2NAME)LANGEXT.res
-RSC_MULTI2=$(MISC)$/rsc_$(RESLIB2NAME)
+RESLIB2TARGETN=$(BIN)/$(RESLIB2NAME)LANGEXT.res
+RSC_MULTI2=$(MISC)/rsc_$(RESLIB2NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB2TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB2TARGETN)))
 .ENDIF
@@ -833,11 +833,11 @@ RESLIB2TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB2TARGETN))
 .IF "$(RESLIB3NOVERSION)"==""
 .ENDIF			# "$(RESLIB3NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)LANGEXT.res
-RSC_MULTI3=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB3NAME)
+RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)LANGEXT.res
+RSC_MULTI3=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB3NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB3TARGETN=$(BIN)$/$(RESLIB3NAME)LANGEXT.res
-RSC_MULTI3=$(MISC)$/rsc_$(RESLIB3NAME)
+RESLIB3TARGETN=$(BIN)/$(RESLIB3NAME)LANGEXT.res
+RSC_MULTI3=$(MISC)/rsc_$(RESLIB3NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB3TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB3TARGETN)))
 .ENDIF
@@ -846,11 +846,11 @@ RESLIB3TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB3TARGETN))
 .IF "$(RESLIB4NOVERSION)"==""
 .ENDIF			# "$(RESLIB4NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)LANGEXT.res
-RSC_MULTI4=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB4NAME)
+RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)LANGEXT.res
+RSC_MULTI4=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB4NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB4TARGETN=$(BIN)$/$(RESLIB4NAME)LANGEXT.res
-RSC_MULTI4=$(MISC)$/rsc_$(RESLIB4NAME)
+RESLIB4TARGETN=$(BIN)/$(RESLIB4NAME)LANGEXT.res
+RSC_MULTI4=$(MISC)/rsc_$(RESLIB4NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB4TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB4TARGETN)))
 .ENDIF
@@ -859,11 +859,11 @@ RESLIB4TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB4TARGETN))
 .IF "$(RESLIB5NOVERSION)"==""
 .ENDIF			# "$(RESLIB5NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)LANGEXT.res
-RSC_MULTI5=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB5NAME)
+RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)LANGEXT.res
+RSC_MULTI5=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB5NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB5TARGETN=$(BIN)$/$(RESLIB5NAME)LANGEXT.res
-RSC_MULTI5=$(MISC)$/rsc_$(RESLIB5NAME)
+RESLIB5TARGETN=$(BIN)/$(RESLIB5NAME)LANGEXT.res
+RSC_MULTI5=$(MISC)/rsc_$(RESLIB5NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB5TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB5TARGETN)))
 .ENDIF
@@ -872,11 +872,11 @@ RESLIB5TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB5TARGETN))
 .IF "$(RESLIB6NOVERSION)"==""
 .ENDIF			# "$(RESLIB6NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)LANGEXT.res
-RSC_MULTI6=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB6NAME)
+RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)LANGEXT.res
+RSC_MULTI6=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB6NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB6TARGETN=$(BIN)$/$(RESLIB6NAME)LANGEXT.res
-RSC_MULTI6=$(MISC)$/rsc_$(RESLIB6NAME)
+RESLIB6TARGETN=$(BIN)/$(RESLIB6NAME)LANGEXT.res
+RSC_MULTI6=$(MISC)/rsc_$(RESLIB6NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB6TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB6TARGETN)))
 .ENDIF
@@ -885,11 +885,11 @@ RESLIB6TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB6TARGETN))
 .IF "$(RESLIB7NOVERSION)"==""
 .ENDIF			# "$(RESLIB7NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)LANGEXT.res
-RSC_MULTI7=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB7NAME)
+RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)LANGEXT.res
+RSC_MULTI7=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB7NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB7TARGETN=$(BIN)$/$(RESLIB7NAME)LANGEXT.res
-RSC_MULTI7=$(MISC)$/rsc_$(RESLIB7NAME)
+RESLIB7TARGETN=$(BIN)/$(RESLIB7NAME)LANGEXT.res
+RSC_MULTI7=$(MISC)/rsc_$(RESLIB7NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB7TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB7TARGETN)))
 .ENDIF
@@ -898,11 +898,11 @@ RESLIB7TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB7TARGETN))
 .IF "$(RESLIB8NOVERSION)"==""
 .ENDIF			# "$(RESLIB8NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)LANGEXT.res
-RSC_MULTI8=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB8NAME)
+RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)LANGEXT.res
+RSC_MULTI8=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB8NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB8TARGETN=$(BIN)$/$(RESLIB8NAME)LANGEXT.res
-RSC_MULTI8=$(MISC)$/rsc_$(RESLIB8NAME)
+RESLIB8TARGETN=$(BIN)/$(RESLIB8NAME)LANGEXT.res
+RSC_MULTI8=$(MISC)/rsc_$(RESLIB8NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB8TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB8TARGETN)))
 .ENDIF
@@ -911,53 +911,53 @@ RESLIB8TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB8TARGETN))
 .IF "$(RESLIB9NOVERSION)"==""
 .ENDIF			# "$(RESLIB9NOVERSION)"==""
 .IF "$(common_build_reslib)"!=""
-RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)LANGEXT.res
-RSC_MULTI9=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB9NAME)
+RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)LANGEXT.res
+RSC_MULTI9=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB9NAME)
 .ELSE			# "$(common_build_reslib)"!=""
-RESLIB9TARGETN=$(BIN)$/$(RESLIB9NAME)LANGEXT.res
-RSC_MULTI9=$(MISC)$/rsc_$(RESLIB9NAME)
+RESLIB9TARGETN=$(BIN)/$(RESLIB9NAME)LANGEXT.res
+RSC_MULTI9=$(MISC)/rsc_$(RESLIB9NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB9TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB9TARGETN)))
 .ENDIF
 
 .IF "$(INDPRESLIB1NAME)"!=""
-INDPRESLIB1TARGETN=$(BIN)$/$(INDPRESLIB1NAME).dll
+INDPRESLIB1TARGETN=$(BIN)/$(INDPRESLIB1NAME).dll
 .ENDIF
 
 .IF "$(DEF1NAME)"!=""
-DEF1TARGETN=$(MISC)$/$(DEF1NAME).def
+DEF1TARGETN=$(MISC)/$(DEF1NAME).def
 .ENDIF
 
 .IF "$(DEF2NAME)"!=""
-DEF2TARGETN=$(MISC)$/$(DEF2NAME).def
+DEF2TARGETN=$(MISC)/$(DEF2NAME).def
 .ENDIF
 
 .IF "$(DEF3NAME)"!=""
-DEF3TARGETN=$(MISC)$/$(DEF3NAME).def
+DEF3TARGETN=$(MISC)/$(DEF3NAME).def
 .ENDIF
 
 .IF "$(DEF4NAME)"!=""
-DEF4TARGETN=$(MISC)$/$(DEF4NAME).def
+DEF4TARGETN=$(MISC)/$(DEF4NAME).def
 .ENDIF
 
 .IF "$(DEF5NAME)"!=""
-DEF5TARGETN=$(MISC)$/$(DEF5NAME).def
+DEF5TARGETN=$(MISC)/$(DEF5NAME).def
 .ENDIF
 
 .IF "$(DEF6NAME)"!=""
-DEF6TARGETN=$(MISC)$/$(DEF6NAME).def
+DEF6TARGETN=$(MISC)/$(DEF6NAME).def
 .ENDIF
 
 .IF "$(DEF7NAME)"!=""
-DEF7TARGETN=$(MISC)$/$(DEF7NAME).def
+DEF7TARGETN=$(MISC)/$(DEF7NAME).def
 .ENDIF
 
 .IF "$(DEF8NAME)"!=""
-DEF8TARGETN=$(MISC)$/$(DEF8NAME).def
+DEF8TARGETN=$(MISC)/$(DEF8NAME).def
 .ENDIF
 
 .IF "$(DEF9NAME)"!=""
-DEF9TARGETN=$(MISC)$/$(DEF9NAME).def
+DEF9TARGETN=$(MISC)/$(DEF9NAME).def
 .ENDIF
 
 # IZ65415 - catch obsolete macro. Can be removed later.
@@ -968,36 +968,36 @@ NO_SDINAME_allowed
 
 .IF "$(SDI1NAME)"!=""
 .DIRCACHE=no
-SDI1TARGET=$(MISC)$/$(SDI1NAME).don
-HIDSID1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI1NAME)_sid.hid
+SDI1TARGET=$(MISC)/$(SDI1NAME).don
+HIDSID1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI1NAME)_sid.hid
 .ENDIF
 
 .IF "$(SDI2NAME)"!=""
 .DIRCACHE=no
-SDI2TARGET=$(MISC)$/$(SDI2NAME).don
-HIDSID2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI2NAME)_sid.hid
+SDI2TARGET=$(MISC)/$(SDI2NAME).don
+HIDSID2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI2NAME)_sid.hid
 .ENDIF
 
 .IF "$(SDI3NAME)"!=""
 .DIRCACHE=no
-SDI3TARGET=$(MISC)$/$(SDI3NAME).don
-HIDSID3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI3NAME)_sid.hid
+SDI3TARGET=$(MISC)/$(SDI3NAME).don
+HIDSID3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI3NAME)_sid.hid
 .ENDIF
 
 .IF "$(SDI4NAME)"!=""
 .DIRCACHE=no
-SDI4TARGET=$(MISC)$/$(SDI4NAME).don
-HIDSID4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI4NAME)_sid.hid
+SDI4TARGET=$(MISC)/$(SDI4NAME).don
+HIDSID4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI4NAME)_sid.hid
 .ENDIF
 
 .IF "$(SDI5NAME)"!=""
 .DIRCACHE=no
-SDI5TARGET=$(MISC)$/$(SDI5NAME).don
-HIDSID5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI5NAME)_sid.hid
+SDI5TARGET=$(MISC)/$(SDI5NAME).don
+HIDSID5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI5NAME)_sid.hid
 .ENDIF
 
 .IF "$(XMLPROPERTIES)"!=""
-XMLPROPERTIESN:=$(foreach,i,$(XMLPROPERTIES) $(MISC)$/$(TARGET)_$(i:s/.xrb/.done/))
+XMLPROPERTIESN:=$(foreach,i,$(XMLPROPERTIES) $(MISC)/$(TARGET)_$(i:s/.xrb/.done/))
 .ENDIF			# "$(XMLPROPERTIES)"!=""
 
 .IF "$(UNIXTEXT)"!=""
@@ -1007,36 +1007,36 @@ CONVERTUNIXTEXT:=$(UNIXTEXT)
 .ENDIF			# "$(UNIXTEXT)"!=""
 
 .IF "$(EXTUPDATEINFO_NAME)"!=""
-EXTUPDATEINFO_DEST:=$(MISC)$/$(EXTUPDATEINFO_NAME)
+EXTUPDATEINFO_DEST:=$(MISC)/$(EXTUPDATEINFO_NAME)
 EXTUPDATEINFO_SOURCE*=description.xml
 .ENDIF			# "$(EXTUPDATEINFO_NAME)"!=""
 
 .IF "$(JAVACLASSFILES:s/DEFINED//)"!="" || "$(javauno)"!=""
 .IF "$(L10N_framework)"==""
-TARGETDPJ=$(MISC)$/$(TARGET).dpj
+TARGETDPJ=$(MISC)/$(TARGET).dpj
 .ENDIF			# "$(L10N_framework)"==""
 .ENDIF
 
 .IF "$(no_hids)$(NO_HIDS)"==""
 BUILDHIDS:=TRUE
 .IF "$(GEN_HID_OTHER)"!=""
-PRJHIDOTHERTARGET=$(SRS)$/hidother.hid
-COMMONPRJHIDOTHERTARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC)$/$(TARGET)_othr.hid)
+PRJHIDOTHERTARGET=$(SRS)/hidother.hid
+COMMONPRJHIDOTHERTARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC)/$(TARGET)_othr.hid)
 .ENDIF
 .IF "$(GEN_HID2)"!=""
-PRJHID2TARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst
+PRJHID2TARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst
 .ENDIF
 .ENDIF			# "$(no_hids)$(NO_HIDS)"==""
 
 .IF "$(make_srs_deps)"==""
 .IF "$(SRCFILES)" != "" || "$(SRC1FILES)" != "" || "$(SRC2FILES)" != ""
-DPRTARGET= $(MISC)$/$(TARGET).dpr
+DPRTARGET= $(MISC)/$(TARGET).dpr
 .ENDIF
 .ENDIF
 
 .IF "$(make_zip_deps)"==""
 .IF "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != ""
-DPZTARGET= $(MISC)$/$(TARGET).dpz
+DPZTARGET= $(MISC)/$(TARGET).dpz
 .ENDIF			# "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != ""
 .ENDIF			# "$(make_zip_deps)"==""
 
@@ -1060,7 +1060,7 @@ ALL_JAVA_TARGETS= \
 .IF "$(lintit)"==""
 .IF "$(L10N_framework)"!=""
 ALLTAR:	\
-        "$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk" \
+        "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \
         $(SUBDIRS)		\
         $(DPRTARGET) \
         $(DPZTARGET) \
@@ -1112,7 +1112,7 @@ ALLTAR:	\
 .ELSE			# "$(L10N_framework)"!=""
 
 ALLTAR: \
-        "$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk" \
+        "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \
         $(MAKEDEMODIR)	$(MAKECOMPDIR) $(MAKEXLDIR)	\
         $(COMPVERMK) \
         $(JAVAVERMK) \
@@ -1233,7 +1233,7 @@ ALLTAR : \
         $(SHL1TARGETN_X64) 	$(SHL2TARGETN_X64)
 .ENDIF # "$(BUILD_X64)"!=""
 
-ALLTAR : "$(SOLARINCDIR)$/$(UPD)minor.mk"
+ALLTAR : "$(SOLARINCDIR)/$(UPD)minor.mk"
 
 .IF "$(EXCEPTIONSNOOPT_FLAG)"==""
 TARGETDEPS+=$(EXCEPTIONSNOOPTTARGET)
@@ -1292,10 +1292,10 @@ $(UNOUCRTARGET) : $(UNOUCRHEADER)
 # keep that one to rebuild single misses
 $(UNOUCRHEADER):
     @noop
-
+    
 $(UNOUCRTARGET) : $(UNOUCRDEP)
 .IF "$(XML2MK_FILES)"!=""
-    @@-$(RM) $(foreach,i,$(XML2MK_FILES) $(MISC)$/$(i).mk)
+    @@-$(RM) $(foreach,i,$(XML2MK_FILES) $(MISC)/$(i).mk)
 .ENDIF			# "$(XML2MK_FILES)"!=""
     @@-$(MKDIRHIER) $(UNOUCROUT)
     $(CPPUMAKER) @$(mktmp $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOTYPES:^"-T")  $(UNOUCRRDB)) && $(TOUCH) $@
@@ -1345,27 +1345,27 @@ ALLTAR: $(OBJFILES) $(SLOFILES)
 .ENDIF			# "$(lintit)"==""
 
 .IF "$(SDINAME)"!=""
-$(OBJ)$/$(CINTERNAME).obj : $(SDITARGET)
+$(OBJ)/$(CINTERNAME).obj : $(SDITARGET)
 .ENDIF
 
 .IF "$(SDI1NAME)"!=""
-$(OBJ)$/$(CINTER1NAME).obj : $(SDI1TARGET)
+$(OBJ)/$(CINTER1NAME).obj : $(SDI1TARGET)
 .ENDIF
 
 .IF "$(SDI2NAME)"!=""
-$(OBJ)$/$(CINTER2NAME).obj : $(SDI2TARGET)
+$(OBJ)/$(CINTER2NAME).obj : $(SDI2TARGET)
 .ENDIF
 
 .IF "$(SDI3NAME)"!=""
-$(OBJ)$/$(CINTER3NAME).obj : $(SDI3TARGET)
+$(OBJ)/$(CINTER3NAME).obj : $(SDI3TARGET)
 .ENDIF
 
 .IF "$(SDI4NAME)"!=""
-$(OBJ)$/$(CINTER4NAME).obj : $(SDI4TARGET)
+$(OBJ)/$(CINTER4NAME).obj : $(SDI4TARGET)
 .ENDIF
 
 .IF "$(SDI5NAME)"!=""
-$(OBJ)$/$(CINTER5NAME).obj : $(SDI5TARGET)
+$(OBJ)/$(CINTER5NAME).obj : $(SDI5TARGET)
 .ENDIF
 
 .IF "$(SOLAR_JAVA)"!=""
@@ -1382,7 +1382,7 @@ $(HXXCOPYTARGET):	$(HXXCOPYFILES)
 
 .IF "$(UNIXTEXT)"!=""
 $(UNIXTEXT) : $(UNIXTEXT:f)
-	@echo "Making:   " $@
+    @echo Making $@
     @@-$(RM) -f $@
     @tr -d "\015" < $(@:f) > $@
 
@@ -1391,12 +1391,12 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
 .IF "$(WITH_LANG)"!=""
 .IF "$(LOCALIZATION_FOUND)"==""
 .IF "$(LOCALIZESDF)"!=""
-"$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
+"$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip
     @@-$(MKDIRHIER) $(@:d)
-    @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET)
-    @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)$/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip 
-    @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)$/* $(COMMONMISC)$/$(PRJNAME)
-    @@-$(RM) -rf $(COMMONMISC)$/$(PRJNAME)_$(TARGET)
+    @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET)
+    @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(FI)
+    @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)/* $(COMMONMISC)/$(PRJNAME)
+    @@-$(RM) -rf $(COMMONMISC)/$(PRJNAME)_$(TARGET)
 .ENDIF			# "$(LOCALIZESDF)"!=""
 .ENDIF			# "$(LOCALIZATION_FOUND)"==""
 .ENDIF			# "$(WITH_LANG)"!=""
@@ -1410,54 +1410,54 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
 
 .IF "$(EXTUPDATEINFO_NAME)"!=""
 $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE)
-    $(PERL) $(SOLARENV)$/bin/make_ext_update_info.pl --out $(EXTUPDATEINFO_DEST) $(foreach,i,$(EXTUPDATEINFO_URLS) --update-url "$i") $(EXTUPDATEINFO_SOURCE)
+    $(PERL) $(SOLARENV)/bin/make_ext_update_info.pl --out $(EXTUPDATEINFO_DEST) $(foreach,i,$(EXTUPDATEINFO_URLS) --update-url "$i") $(EXTUPDATEINFO_SOURCE)
 .ENDIF			# "$(EXTUPDATEINFO_NAME)"!=""
 
 makedoc:
-        @@-mkdir $(OUT)$/ucrdoc
-		$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))		
-#		-$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P..$/$(PRJNAME)$/$(IDLPACKAGE) -OH$(PRJ)$/..$/unodoc $(DOCIDLFILES) $(IDLFILES)
+        @@-mkdir $(OUT)/ucrdoc
+        $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))		
+#		-$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P../$(PRJNAME)/$(IDLPACKAGE) -OH$(PRJ)/../unodoc $(DOCIDLFILES) $(IDLFILES)
 
 .IF "$(LOCALDBTARGET)"!=""
 $(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES)
-	$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
-	@-$(RM) $@
-	$(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
+    $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)/ucr/$(IDLPACKAGE) $(all_outdated_idl))
+    -$(RM) $@
+    $(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
 .ENDIF
 
 .IF "$(LOCALDOCDBTARGET)"!=""
 $(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES)
-	$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
-	@-$(RM) $@
-	$(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
+    $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(all_outdated_idl))
+    -$(RM) $@
+    $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
 .ENDIF
 
 .IF "$(UNOIDLDBTARGET)"!=""
 $(UNOIDLDBTARGET) : $(UNOIDLDBFILES) $(UNOIDLDBREGS)
-	@-$(RM) $@
-	$(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
+    -$(RM) $@
+    $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
 .IF "$(LOCALREGDB)"!=""
-	$(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
+    $(REGMERGE) $(LOCALREGDB) / $@
 .ENDIF
 .ENDIF			# "$(UNOIDLDBTARGET)"!=""
 
 .IF "$(UNOIDLDBDOCTARGET)"!=""
 $(UNOIDLDBDOCTARGET) : $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS)
-	@-$(RM) $@
-	$(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
+    -$(RM) $@
+    $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
 .IF "$(LOCALREGDB)"!=""
-	$(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
+    $(REGMERGE) $(LOCALREGDB) / $@
 .ENDIF
 .ENDIF			# "$(UNOIDLDBDOCTARGET)"!=""
 
 .IF "$(SCP_PRODUCT_TYPE)"!=""
 $(SCP_PRODUCT_TYPE):
-    @@-$(MKDIRHIER) $(PAR)$/$@
-    @@-$(MKDIRHIER) $(BIN)$/$@
+    @@-$(MKDIRHIER) $(PAR)/$@
+    @@-$(MKDIRHIER) $(BIN)/$@
 
 .ENDIF			# "$(PARFILES)"!=""
 
-"$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg" :
+"$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg" :
     $(TOUCH) $@
 
 .IF "$(COMPVERMK)"!=""
@@ -1466,7 +1466,7 @@ $(SCP_PRODUCT_TYPE):
 COMPVERMK_PHONY:=.PHONY
 .ENDIF			# "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
 COMPVTMP:=$(mktmp iii)
-"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
+"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
 .IF "$(CCNUMVER)"!=""
     @echo COMNAME:=$(COMNAME) > $(COMPVTMP)
     @echo COMID:=$(COMID) >> $(COMPVTMP)
@@ -1493,7 +1493,7 @@ COMPVTMP:=$(mktmp iii)
 .IF "$(JAVALOCATION)"!="$(JAVA_HOME)"
 "$(JAVAVERMK)" .PHONY :
 .ELSE          # "$(JAVALOCATION)"!="$(JAVA_HOME)"
-"$(JAVAVERMK)" : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
+"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
 .ENDIF          # "$(JAVALOCATION)"!="$(JAVA_HOME)"
     @-$(RM) $@
     @echo JAVAVER:=$(JAVAVER) > $@
@@ -1512,23 +1512,23 @@ $(TARGETDEPS) : $(LOCALIZE_ME_DEST)
 
 .IF "$(WITH_LANG)"==""
 $(LOCALIZE_ME_DEST) : $(LOCALIZE_ME)
-    -$(RM) $(INCCOM)$/$(TARGET)_lastrun.mk
+    -$(RM) $(INCCOM)/$(TARGET)_lastrun.mk
     -$(MKDIR) $(@:d)
     -$(RM) $@
     $(COPY) $(@:b:+"_tmpl")$(@:e) $@
 
 .ELSE			# "$(WITH_LANG)"==""
 #  LASTRUN_MERGED
-.INCLUDE .IGNORE : $(INCCOM)$/$(TARGET)_lastrun.mk
+.INCLUDE .IGNORE : $(INCCOM)/$(TARGET)_lastrun.mk
 .IF "$(LASTRUN_MERGED)"=="TRUE"
 $(LOCALIZE_ME_DEST) : $(LOCALIZE_ME) $(LOCALIZESDF) 
 .ELSE			# "$(LASTRUN_MERGED)"=="TRUE"
 $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF) 
-    echo LASTRUN_MERGED:=TRUE > $(INCCOM)$/$(TARGET)_lastrun.mk
+    echo LASTRUN_MERGED:=TRUE > $(INCCOM)/$(TARGET)_lastrun.mk
 .ENDIF			# "$(LASTRUN_MERGED)"=="TRUE"
     -$(MKDIR) $(@:d)
     -$(RM) $@
-    $(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)$/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
     $(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@
 
 .ENDIF			# "$(WITH_LANG)"==""
@@ -1539,13 +1539,13 @@ $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF)
 XML_ISO_CODE*=-ISO99 $(L10N_framework)
 .ENDIF
 .IF "$(WITH_LANG)"!=""
-$(MISC)$/$(TARGET)_%.done : $(COMMONMISC)$/$(TARGET)$/%.xrb
+$(MISC)/$(TARGET)_%.done : $(COMMONMISC)/$(TARGET)/%.xrb
 .ELSE			# "$(WITH_LANG)"!=""
-$(MISC)$/$(TARGET)_%.done : %.xrb
+$(MISC)/$(TARGET)_%.done : %.xrb
 .ENDIF			# "$(WITH_LANG)"!=""
-    @@-$(RM) $(MISC)$/$(<:b).interm$(TARGET)
-    native2ascii -encoding UTF8 $< $(MISC)$/$(<:b).interm$(TARGET) && $(XMLEX) -i $(MISC)$/$(<:b).interm$(TARGET) -o $(CLASSDIR) $(XML_ISO_CODE) -g -d $@
-    @@$(RM)  $(MISC)$/$(<:b).interm$(TARGET)
+    @@-$(RM) $(MISC)/$(<:b).interm$(TARGET)
+    native2ascii -encoding UTF8 $< $(MISC)/$(<:b).interm$(TARGET) && $(XMLEX) -i $(MISC)/$(<:b).interm$(TARGET) -o $(CLASSDIR) $(XML_ISO_CODE) -g -d $@
+    @@$(RM)  $(MISC)/$(<:b).interm$(TARGET)
 .ENDIF			# "$(XMLPROPERTIES)"!=""
 
 .IF "$(HIDSID1PARTICLE)$(SDI1TARGET)$(HIDSID2PARTICLE)$(SDI2TARGET)$(HIDSID3PARTICLE)$(SDI3TARGET)$(HIDSID4PARTICLE)$(SDI4TARGET)$(HIDSID5PARTICLE)$(SDI5TARGET)$(HIDSID6PARTICLE)$(SDI6TARGET)$(HIDSID7PARTICLE)$(SDI7TARGET)$(HIDSID8PARTICLE)$(SDI8TARGET)$(HIDSID9PARTICLE)$(SDI9TARGET)"!=""
@@ -1558,12 +1558,10 @@ $(MISC)$/$(TARGET)_%.done : %.xrb
 
 .IF "$(COMMONPRJHIDOTHERTARGET)"!=""
 $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
-.IF "$(QUIET_BUILD)"==""
         @echo ------------------------------
-.ENDIF
-		@echo "Making:   " $@
+        @echo Making: $@
         @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-        $(QUIET_BUILD) $(TYPE) $(PRJHIDOTHERTARGET) > $@.$(ROUT).tmp 
+        $(TYPE) $(PRJHIDOTHERTARGET) > $@.$(ROUT).tmp 
         @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF	    
 
@@ -1689,7 +1687,7 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
 .IF "$(make_srs_deps)"==""
 .IF "$(SRCFILES)" != "" || "$(SRC1FILES)" != "" || "$(SRC2FILES)" != ""
 .IF "$(nodep)"==""
-.INCLUDE : $(MISC)$/$(TARGET).dpr
+.INCLUDE : $(MISC)/$(TARGET).dpr
 .ENDIF			# "$(nodep)"==""
 .ENDIF
 .ENDIF
@@ -1697,7 +1695,7 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
 .IF "$(make_zip_deps)"==""
 .IF "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != ""
 .IF "$(nodep)"==""
-.INCLUDE : $(MISC)$/$(TARGET).dpz
+.INCLUDE : $(MISC)/$(TARGET).dpz
 # introduce separation char
 missing_zipdep_langs=$(alllangiso:^"+":+"+")
 some_dummy_var:=$(foreach,i,$(zipdep_langs) $(assign missing_zipdep_langs:=$(strip $(subst,+$(i)+, $(missing_zipdep_langs)))))
@@ -1709,16 +1707,13 @@ ZIPDEPPHONY=.PHONY
 .ENDIF
 
 last_target:
-.IF "$(QUIET_BUILD)"==""
-	@echo ------------- 
-.ENDIF
-	$(NULL)
+    @echo -------------
 
-$(MISC)$/$(TARGET)genjava.mk: 	$(IDLFILES)
+$(MISC)/$(TARGET)genjava.mk: 	$(IDLFILES)
 
 .IF "$(JAVACLASSFILES:s/DEFINED//)"!=""
 .IF "$(L10N_framework)"==""
-.INCLUDE .IGNORE : $(MISC)$/$(TARGET).dpj
+.INCLUDE .IGNORE : $(MISC)/$(TARGET).dpj
 $(TARGETDPJ) : $(JAVAFILES) $(JAVATARGET)
 .ENDIF			# "$(L10N_framework)"==""
 .ENDIF
@@ -1735,24 +1730,16 @@ $(TARGETDPJ) : $(JAVAFILES) $(JAVATARGET)
 .IF "$(NOOPT_FLAG)" == ""
 
 $(NOOPTTARGET):
-.IF "$(QUIET_BUILD)"==""
     @echo --- NOOPTFILES ---
-.ENDIF
     @dmake $(MFLAGS) $(MAKEFILE) nopt=true $(NOOPTFILES) NOOPT_FLAG=TRUE $(CALLMACROS)
-.IF "$(QUIET_BUILD)"==""
     @echo --- NOOPTFILES OVER ---
-.ENDIF
 
 $(NOOPTFILES):
-.IF "$(QUIET_BUILD)"==""
     @echo --- NOOPT ---
-.ENDIF
     @dmake $(MFLAGS) $(MAKEFILE) nopt=true NOOPT_FLAG=TRUE $(CALLMACROS) $@
-.IF "$(QUIET_BUILD)"==""
     @echo --- NOOPT OVER ---
 .ENDIF
 .ENDIF
-.ENDIF
 
 
 # ----------------------------------
@@ -1763,22 +1750,14 @@ $(NOOPTFILES):
 .IF "$(EXCEPTIONSNOOPT_FLAG)" == ""
 
 $(EXCEPTIONSNOOPTTARGET):
-.IF "$(QUIET_BUILD)"==""
     @echo --- EXCEPTIONSNOOPTFILES ---
-.ENDIF
     @dmake $(MFLAGS) $(MAKEFILE) ENABLE_EXCEPTIONS=true $(EXCEPTIONSNOOPTFILES) EXCEPTIONSNOOPT_FLAG=TRUE nopt=true $(CALLMACROS)
-.IF "$(QUIET_BUILD)"==""
     @echo --- EXCEPTIONSNOOPTFILES OVER ---
-.ENDIF
 
 $(EXCEPTIONSNOOPTFILES):
-.IF "$(QUIET_BUILD)"==""
     @echo --- EXCEPTIONSNOOPT ---
-.ENDIF
     @dmake $(MFLAGS) $(MAKEFILE) ENABLE_EXCEPTIONS=true EXCEPTIONSNOOPT_FLAG=TRUE nopt=true $(CALLMACROS) $@
-.IF "$(QUIET_BUILD)"==""
     @echo --- EXCEPTIONSNOOPT OVER ---
-.ENDIF
 
 
 .ENDIF
@@ -1800,29 +1779,29 @@ ALLTAR : forcedeps
 # - several kill targets -
 # -------------------------
 
-"$(TMP)$/makedt.don":
-    @$(TOUCH) $(TMP)$/makedt.don
+"$(TMP)/makedt.don":
+    @$(TOUCH) $(TMP)/makedt.don
 
 killbin:
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
-    @$(IFEXIST) $(BIN)$/$(SHL1TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL1TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL2TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL2TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL3TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL3TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL4TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL4TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL5TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL5TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL6TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL6TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL7TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL7TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL8TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL8TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL9TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL9TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)/$(SHL1TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL1TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)/$(SHL2TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL2TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)/$(SHL3TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL3TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)/$(SHL4TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL4TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)/$(SHL5TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL5TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)/$(SHL6TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL6TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)/$(SHL7TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL7TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)/$(SHL8TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL8TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)/$(SHL9TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL9TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)/$(APP1TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP1TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)/$(APP2TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP2TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)/$(APP3TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP3TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)/$(APP4TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP4TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)/$(APP5TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP5TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)/$(APP6TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP6TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)/$(APP7TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP7TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP8TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP9TARGET)$(EXECPOST) $(FI)
 
 .ELSE			# "$(GUI)"=="WNT"
 .IF "$(SHL1TARGET)"!=""
@@ -1944,7 +1923,7 @@ killlib:
 
 clean_misc :
 .IF "$(MISC)"!=""
-    rm -rf $(MISC)$/*
+    rm -rf $(MISC)/*
     @echo misc is gone!
 .ELSE			# "$(MISC)"!=""
     @echo can\'t be done! $$(MISC) not defined.
@@ -1952,11 +1931,7 @@ clean_misc :
 
 clean_all :
 .IF "$(OUT)"!=""
-.IF "$(USE_SHELL)"!="4nt"
-    test -f $(PRJ)$/prj/build.lst && rm -rf $(OUT)
-.ELSE			# "$(USE_SHELL)"!="4nt"
-    $(IFEXIST) $(PRJ)$/prj/build.lst $(THEN) del /sxyz $(OUT) $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
+    test -f $(PRJ)/prj/build.lst && rm -rf $(OUT)
     @echo local output tree is gone!
 .ELSE			# "$(OUT)"!=""
     @echo can\'t be done! $$(OUT) not defined.
@@ -1988,14 +1963,10 @@ ZIPALLTARGET: \
         $(ZIP9TARGETN)
 .ELSE
 ZIPALLTARGET:
-.IF "$(QUIET_BUILD)"==""
     @echo ---
-.ENDIF
     @echo nothing to zip for activated languages!
-.IF "$(QUIET_BUILD)"==""
     @echo ---
 .ENDIF
-.ENDIF
 
 
 #temporary workaround for non-existing delzip in extras
@@ -2007,15 +1978,15 @@ delzip:
     force_dmake_to_error
 
 .IF "$(make_srs_deps)"==""
-$(MISC)$/$(TARGET).dpr : $(SRCFILES) $(SRC1FILES) $(SRC2FILES) $(SRC3FILES)
+$(MISC)/$(TARGET).dpr : $(SRCFILES) $(SRC1FILES) $(SRC2FILES) $(SRC3FILES)
 .ENDIF
 
 .IF "$(make_zip_deps)"==""
-$(MISC)$/$(TARGET).dpz $(ZIPDEPPHONY) : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN)
+$(MISC)/$(TARGET).dpz $(ZIPDEPPHONY) : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN)
 .ENDIF
 
 VERSIONTMP:=$(mktmp iii)
-$(INCCOM)$/%_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg
+$(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
     @echo $(EMQ)#define _BUILD $(EMQ)"$(BUILD)$(EMQ)" > $(VERSIONTMP)
     @echo $(EMQ)#define _UPD $(EMQ)"$(UPD)$(EMQ)"                 >> $(VERSIONTMP)
     @echo $(EMQ)#define _LAST_MINOR $(EMQ)"$(LAST_MINOR)$(EMQ)"   >> $(VERSIONTMP)
@@ -2043,19 +2014,17 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
 
 
 #new hid.lst trigger with GEN_HID2=TRUE
-$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst .PHONY :
-	@echo "Making:   " $@
-.IF "$(QUIET_BUILD)"==""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
+    @echo Making $@ :
     @echo ---------------
-.ENDIF
     @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp
-	$(QUIET_BUILD) $(TYPE) $(SOLARCOMMONBINDIR)$/hid$/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp 
+    $(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp 
     @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
     @-$(RENAME) $@.$(ROUT).tmp $@
     @-mkdir $(@:d)hid
-    $(PERL) $(SOLARENV)$/bin$/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)$/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv.$(ROUT).tmp
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv $(FI)
-    @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv
+    $(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI)
+    @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv
 
 
 .IF "$(SOLAR_JAVA)"!=""
@@ -2067,7 +2036,7 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst .PHONY :
 .INCLUDE : tg_merge.mk
 
 wordcount:
-    wc *.* >> $(TMP)$/wc.lst
+    wc *.* >> $(TMP)/wc.lst
 
 testt:
     @echo test
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 651f9a40f..423b73b99 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -34,7 +34,7 @@
 # unroll begin
 
 .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" 
-APP$(TNR)DEF = $(MISC)$/$(APP$(TNR)TARGET).def
+APP$(TNR)DEF = $(MISC)/$(APP$(TNR)TARGET).def
 .ENDIF
 
 .IF "$(APP$(TNR)LINKTYPE)" != ""
@@ -76,7 +76,7 @@ APP$(TNR)OBJS+= $(STDOBJVCL)
 .IF "$(GUI)$(COM)" == "WNTGCC"
 APP$(TNR)RESO=
 .IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != ""
-APP$(TNR)RESO=$(MISC)$/$(APP$(TNR)TARGET:b)_res.o
+APP$(TNR)RESO=$(MISC)/$(APP$(TNR)TARGET:b)_res.o
 .ENDIF
 .ENDIF
 
@@ -94,13 +94,13 @@ APP$(TNR)PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\"
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP$(TNR)LIBS)"!=""
-$(MISC)$/$(APP$(TNR)TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(APP$(TNR)TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
+    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          #"$(APP$(TNR)LIBS)"!="" 
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(APP$(TNR)TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(APP$(TNR)TARGETN:b)_linkinc.ls
 $(APP$(TNR)TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
@@ -108,7 +108,7 @@ $(APP$(TNR)TARGETN) : $(LINKINCTARGETS)
 APP$(TNR)LIBSALCPPRT*=$(LIBSALCPPRT)
 
 .IF "$(GUI)" == "OS2"
-_APP$(TNR)IMP_ORD = $(APP$(TNR)STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP$(TNR)STDLIBS:^"$(LB)$/") 
+_APP$(TNR)IMP_ORD = $(APP$(TNR)STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP$(TNR)STDLIBS:^"$(LB)/") 
 APP$(TNR)IMP_ORD = $(foreach,i,$(_APP$(TNR)IMP_ORD) $(shell @-ls $i))
 .ELSE
 APP$(TNR)IMP_ORD = 
@@ -119,73 +119,73 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     $(APP$(TNR)IMP_ORD) \
     $(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
     @echo ------------------------------
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @-$(RM) $(MISC)$/$(@:b).strip
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @-$(RM) $(MISC)/$(@:b).strip
     @echo $(STDSLO) $(APP$(TNR)OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
-    $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+    `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
+    $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
 # libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
-    @strip -i -R $(MISC)$/$(@:b).strip -X $@
+    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
+    @strip -i -R $(MISC)/$(@:b).strip -X $@
     @ls -l $@
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP$(TNR)RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making:   " $(@:f).app
+    @echo "Making: $@.app"
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
     @echo unx
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    $(APP$(TNR)OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
+    $(APP$(TNR)OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)" == "WNT"
     @@-$(MKDIR) $(@:d:d)
 .IF "$(APP$(TNR)LINKRES)" != ""
-    @@-$(RM) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+    @@-$(RM) $(MISC)/$(APP$(TNR)LINKRES:b).rc
 .IF "$(APP$(TNR)ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP$(TNR)ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+    @-echo 1 ICON $(EMQ)"$(APP$(TNR)ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
 .ENDIF		# "$(APP$(TNR)ICON)" != ""
 .IF "$(APP$(TNR)VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
+    @-echo $(EMQ)#include  $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
 .ENDIF		# "$(APP$(TNR)VERINFO)" != ""
-    $(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+    $(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
 .ENDIF			# "$(APP$(TNR)LINKRES)" != ""
 .IF "$(COM)" == "GCC"
     @echo mingw
 .IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != ""
-    @cat $(APP$(TNR)LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) >  $(MISC)$/$(@:b)_all.res
-    windres $(MISC)$/$(@:b)_all.res $(APP$(TNR)RESO)
+    @cat $(APP$(TNR)LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) >  $(MISC)/$(@:b)_all.res
+    windres $(MISC)/$(@:b)_all.res $(APP$(TNR)RESO)
 .ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
         $(APP$(TNR)BASEX) $(APP$(TNR)STACKN) -o $@ $(APP$(TNR)OBJS) \
-        -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP$(TNR)RESO) \
+        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP$(TNR)RESO) \
         `$(TYPE) /dev/null $(APP$(TNR)LIBS) | sed s#$(ROUT)#$(OUT)#g` \
         $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) \
         -Wl,--start-group $(APP$(TNR)STDLIBS) -Wl,--end-group $(APP$(TNR)STDLIB) \
-        $(STDLIB$(TNR)) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+        $(STDLIB$(TNR)) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
@@ -194,7 +194,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
         $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \
         $(APP$(TNR)STACKN) \
         -out:$@ \
-        -map:$(MISC)$/{$(subst,$/,_ $(APP$(TNR)TARGET)).map} \
+        -map:$(MISC)/{$(subst,/,_ $(APP$(TNR)TARGET)).map} \
         $(STDOBJ) \
         $(APP$(TNR)LINKRES) \
         $(APP$(TNR)RES) \
@@ -205,7 +205,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
         )
     @-echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
@@ -230,17 +230,13 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
         $(APP$(TNR)STDLIBS) \
         $(APP$(TNR)STDLIB) $(STDLIB$(TNR)))
         $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP$(TNR)TARGETN:b)_linkobj.lst >> $(MISC)\$(APP$(TNR)TARGET).lst
-        $(IFEXIST) $(MISC)$/$(APP$(TNR)TARGET).lst $(THEN) type $(MISC)$/$(APP$(TNR)TARGET).lst  >> $(MISC)$/$(APP$(TNR)TARGET).lnk $(FI)
+        $(IFEXIST) $(MISC)/$(APP$(TNR)TARGET).lst $(THEN) type $(MISC)/$(APP$(TNR)TARGET).lst  >> $(MISC)/$(APP$(TNR)TARGET).lnk $(FI)
         $(APP$(TNR)LINKER) @$(MISC)\$(APP$(TNR)TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
 .ENDIF		# "$(COM)" == "GCC"
 .IF "$(APP$(TNR)TARGET)" == "loader"
     $(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     $(RM) $@
     $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
@@ -250,23 +246,19 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
 .IF "$(GUI)" == "OS2"
     @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
 .IF "$(APP$(TNR)LINKRES)" != ""
-    @+-$(RM) $(MISC)$/$(APP$(TNR)LINKRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(APP$(TNR)LINKRES:b).rc >& $(NULLDEV)
 .IF "$(APP$(TNR)ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
-    @-+echo ICON 1 "$(APP$(TNR)ICON:s/\/\\/)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP$(TNR)ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP$(TNR)ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
 .ENDIF		# "$(APP$(TNR)ICON)" != ""
 .IF "$(APP$(TNR)VERINFO)" != ""
-    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
-    @-+echo $(EMQ)#include  $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+    @-+echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
+    @-+echo $(EMQ)#include  $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
 .ENDIF		# "$(APP$(TNR)VERINFO)" != ""
-    $(RC) -r -DOS2 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+    $(RC) -r -DOS2 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
 .ENDIF			# "$(APP$(TNR)LINKRES)" != ""
 
 .IF "$(TARGETTYPE)" == "GUI" 
-    @echo NAME $(APP$(TNR)TARGET) WINDOWAPI > $(MISC)$/$(APP$(TNR)TARGET).def
+    @echo NAME $(APP$(TNR)TARGET) WINDOWAPI > $(MISC)/$(APP$(TNR)TARGET).def
 .ENDIF
 
     @+echo	$(APP$(TNR)LINKFLAGS) \
@@ -274,7 +266,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
         $(APP$(TNR)STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP$(TNR)LINKRES) \
         $(APP$(TNR)RES) \
@@ -289,7 +281,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
         $(APP$(TNR)STACKN) \
         -o $@ \
         -Zmap -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(STDOBJ) \
         $(APP$(TNR)LINKRES) \
         $(APP$(TNR)RES) \
@@ -302,11 +294,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
 
 .IF "$(APP$(TNR)TARGET)" == "loader"
     +$(PERL) loader.pl $@
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-.ENDIF			# "$(USE_SHELL)"=="4nt"
     +$(RM) $@
     +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
 .ENDIF			# "$(TARGET)" == "setup"
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 8ad196a17..5c00ffb74 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-COMPVERMK:=$(SOLARINCDIR)$/comp_ver.mk
+COMPVERMK:=$(SOLARINCDIR)/comp_ver.mk
 
 .INCLUDE .IGNORE : $(COMPVERMK)
 
@@ -41,20 +41,20 @@ COMNAME:=
 .IF "$(COM)"=="GCC"
 CFLAGSVERSION=-dumpversion
 CFLAGSVERSION_CMD=-dumpversion
-CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk
-#CFLAGSNUMVERSION_CMD=-dumpversion | 2>&1  $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk
+CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
+#CFLAGSNUMVERSION_CMD=-dumpversion | 2>&1  $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
 .ENDIF
 
 .IF "$(COM)"=="MSC"
 CFLAGSVERSION=
-CFLAGSVERSION_CMD=  $(PIPEERROR) $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk
-CFLAGSNUMVERSION_CMD=  $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk
+CFLAGSVERSION_CMD=  $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
+CFLAGSNUMVERSION_CMD=  $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
 .ENDIF
 
 .IF "$(COM)"=="C55" || "$(COM)"=="C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro"
 CFLAGSVERSION= -V
-CFLAGSVERSION_CMD= -V  $(PIPEERROR) $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk
-CFLAGSNUMVERSION_CMD= -V  $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk
+CFLAGSVERSION_CMD= -V  $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
+CFLAGSNUMVERSION_CMD= -V  $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
 .ENDIF
 
 .IF "$(COM)"=="C730"
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index 61130c289..428f9ff80 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -29,13 +29,13 @@
 #
 #*************************************************************************
 
-PACKAGEDIR*:=$(subst,.,$/ $(PACKAGE))
+PACKAGEDIR*:=$(subst,.,/ $(PACKAGE))
 XSLTPACKAGEDIR*:=$(subst,.,/ $(PACKAGE))
 XCSROOTURL!:=$(ABSXCSROOT)
 .IF $(GUI)==WNT
 XCSROOTURL!:=file:///$(subst,\,/ $(XCSROOTURL))
 .ENDIF
-SYSXSLDIR*:=$(XSLDIR)$/
+SYSXSLDIR*:=$(XSLDIR)/
 
 #
 # --- XCS ---
@@ -43,50 +43,50 @@ SYSXSLDIR*:=$(XSLDIR)$/
 
 .IF "$(XCSFILES)"!=""
 # remove unnecessary info from the component schemas
-XCS_TRIM=$(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/{$(XCSFILES)}
+XCS_TRIM=$(PROCESSOUT)/registry/schema/$(PACKAGEDIR)/{$(XCSFILES)}
 
 # transform xcs format to properties format
-# XCS_RESOURCES=$(foreach,i,$(XCSFILES) $(MISC)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/$(i:b).properties)
+# XCS_RESOURCES=$(foreach,i,$(XCSFILES) $(MISC)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/$(i:b).properties)
 
 ALLTAR: \
     $(XCS_TRIM) 
 .ENDIF			# "$(XCSFILES)"!=""
 
 .IF "$(XCS_TRIM)" != ""
-$(XCS_TRIM) :   $(DTDDIR)$/registry$/component-schema.dtd \
-                $(XSLDIR)$/schema_val.xsl \
-                $(XSLDIR)$/sanity.xsl \
-                $(XSLDIR)$/schema_trim.xsl 
+$(XCS_TRIM) :   $(DTDDIR)/registry/component-schema.dtd \
+                $(XSLDIR)/schema_val.xsl \
+                $(XSLDIR)/sanity.xsl \
+                $(XSLDIR)/schema_trim.xsl 
 .ENDIF
 
-$(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs
+$(PROCESSOUT)/registry/schema/$(PACKAGEDIR)/%.xcs : %.xcs
     @echo -------------+ validating and stripping schema files
     -$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.val) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
                 --stringparam componentName $(PACKAGE).$* \
                 $(SYSXSLDIR)schema_val.xsl $<
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.san) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.san) \
                 $(SYSXSLDIR)sanity.xsl $<
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
                 $(SYSXSLDIR)schema_trim.xsl $<
     +-$(RM) $(@:d)$*.val > $(NULLDEV)
     +-$(RM) $(@:d)$*.san > $(NULLDEV)
 
-$(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs : %.xcs
+$(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcs : %.xcs
 # just a copy for now - insert "cfgex" commandline when required
     -$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
 # Create properties files for localized <info> contents (Currently not built)
 .IF "$(XCS_RESOURCES)" != ""
-$(XCS_RESOURCES) :   $(XSLDIR)$/resource.xsl 
+$(XCS_RESOURCES) :   $(XSLDIR)/resource.xsl 
 .ENDIF
 
-$(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs
+$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.properties :| $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcs
     @echo -------------+ creating locale dependent resource bundles
     -$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \
-                --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
+                --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \
                 $(SYSXSLDIR)resource.xsl $<
 
 # 
@@ -94,25 +94,25 @@ $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(
 #
 
 .IF "$(XCUFILES)"!=""
-XCU_DEFAULT =$(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/{$(XCUFILES)}
-XCU_MODULES =$(foreach,i,$(MODULEFILES) $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/$(i))
-XCU_LANG    =$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/$(i))
+XCU_DEFAULT =$(PROCESSOUT)/registry/data/$(PACKAGEDIR)/{$(XCUFILES)}
+XCU_MODULES =$(foreach,i,$(MODULEFILES) $(PROCESSOUT)/registry/spool/$(PACKAGEDIR)/$(i))
+XCU_LANG    =$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/$(i))
 .ENDIF			# "$(XCUFILES)"!=""
 
 .IF "$(XCU_DEFAULT)" != ""
-$(XCU_DEFAULT) : $(DTDDIR)$/registry$/component-update.dtd \
-                 $(XSLDIR)$/data_val.xsl \
-                 $(XSLDIR)$/alllang.xsl 
+$(XCU_DEFAULT) : $(DTDDIR)/registry/component-update.dtd \
+                 $(XSLDIR)/data_val.xsl \
+                 $(XSLDIR)/alllang.xsl 
 .ENDIF
 
-$(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu
+$(PROCESSOUT)/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu
     @echo -------------+ validating and creating a locale independent file
     -$(MKDIRHIER) $(@:d) 
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.val) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
                 $(SYSXSLDIR)data_val.xsl $<
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
                 $(SYSXSLDIR)alllang.xsl $<
@@ -124,48 +124,48 @@ $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu
 $(XCU_LANG) : $(LOCALIZESDF)
 .ENDIF			# "$(XCU_LANG)"!=""
 
-$(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu : %.xcu
+$(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu : %.xcu
     -$(MKDIRHIER) $(@:d)
     $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
 
 .IF "$(XCU_LANG)" != ""
-$(XCU_LANG) : $(XSLDIR)$/alllang.xsl
+$(XCU_LANG) : $(XSLDIR)/alllang.xsl
 .ENDIF
 
-$(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu
+$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu
 .ELSE			# "$(WITH_LANG)"!=""
-$(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| %.xcu
+$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| %.xcu
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------- creating locale dependent entries
     -$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
-                --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \
+                --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \
                 $(SYSXSLDIR)alllang.xsl $<
 
 # --- languagepack tag modules ---
 .IF "$(LANGUAGEPACKS)" != ""
-$(LANGUAGEPACKS) : $(XSLDIR)$/delcomment.sed 
+$(LANGUAGEPACKS) : $(XSLDIR)/delcomment.sed 
 .ENDIF
 
 
-$(PROCESSOUT)$/registry$/spool$/Langpack-%.xcu : Langpack.xcu.tmpl
+$(PROCESSOUT)/registry/spool/Langpack-%.xcu : Langpack.xcu.tmpl
     @echo -------------+ creating a Langpack module for locale $*
     -$(MKDIRHIER) $(@:d) 
-    $(SED) -e "s/__LANGUAGE__/$*/" -f $(XSLDIR)$/delcomment.sed $< > $@
+    $(SED) -e "s/__LANGUAGE__/$*/" -f $(XSLDIR)/delcomment.sed $< > $@
 
 
 # --- modules ---
 .IF "$(XCU_MODULES)" != ""
-$(XCU_MODULES) : $(XSLDIR)$/alllang.xsl 
+$(XCU_MODULES) : $(XSLDIR)/alllang.xsl 
 .ENDIF
 
 
-$(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu
+$(PROCESSOUT)/registry/spool/$(PACKAGEDIR)/%.xcu :| $$(@:b:s/-/./:b).xcu
     @echo -------------+ creating a module file
     -$(MKDIRHIER) $(@:d) 
-    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \
+    $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$(<:b).xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
                 --stringparam module $(subst,$(<:b)-, $(*)) \
@@ -177,7 +177,7 @@ ALLTAR: \
     $(XCU_MODULES) \
     $(XCU_LANG)
 
-$(XCU_DEFAULT) : $$(@:d:s!$(PROCESSOUT)$/registry$/data$/!$(ABSXCSROOT)$/registry$/schema$/!)$$(@:f:s/.xcu/.xcs/)
+$(XCU_DEFAULT) : $$(@:d:s!$(PROCESSOUT)/registry/data/!$(ABSXCSROOT)/registry/schema/!)$$(@:f:s/.xcu/.xcs/)
 
 .ENDIF			# "$(XCUFILES)"!=""
 
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index ed1681c27..88feb367c 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -41,19 +41,19 @@ DEFLIB$(TNR)NAME*=$(DEF$(TNR)LIBNAME)
 .ENDIF			# "$(DEF$(TNR)LIBNAME)"!=""
 
 .IF "$(DEFLIB$(TNR)NAME)"!=""
-DEF$(TNR)DEPN+=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib)
+DEF$(TNR)DEPN+=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL$(TNR)VERSIONMAP)"!=""
 .IF "$(DEF$(TNR)EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF$(TNR)EXPORTFILE=$(MISC)$/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET).dxp
+DEF$(TNR)EXPORTFILE=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -61,7 +61,7 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL$(TNR)OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -70,9 +70,9 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF$(TNR)EXPORTFILE=$(MISC)$/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET).dxp
+DEF$(TNR)EXPORTFILE=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET).dxp
 $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF$(TNR)EXPORTFILE)"==""
@@ -80,7 +80,7 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF$(TNR)FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF$(TNR)FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK$(TNR):=$(RM)
 
@@ -96,10 +96,8 @@ $(DEF$(TNR)TARGETN) : \
 $(DEF$(TNR)TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(EMQ)"$(SHL$(TNR)TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
     @echo HEAPSIZE	  0 											>>$@.tmpfile
@@ -111,20 +109,20 @@ $(DEF$(TNR)TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB$(TNR)NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL$(TNR)TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL$(TNR)TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL$(TNR)TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL$(TNR)TARGET).exp
+    @-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL$(TNR)TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL$(TNR)TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
 .ELSE
 .IF "$(SHL$(TNR)USE_EXPORTS)"==""
-    @-$(RMHACK$(TNR)) $(MISC)$/$(SHL$(TNR)TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL$(TNR)TARGET).exp $(SLB)$/$(DEFLIB$(TNR)NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(MISC)$/$(SHL$(TNR)TARGET).exp			   >>$@.tmpfile
-    $(RMHACK$(TNR)) $(MISC)$/$(SHL$(TNR)TARGET).exp
+    @-$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL$(TNR)TARGET).exp $(SLB)/$(DEFLIB$(TNR)NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL$(TNR)TARGET).flt $(MISC)/$(SHL$(TNR)TARGET).exp			   >>$@.tmpfile
+    $(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
 .ELSE			# "$(SHL$(TNR)USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL$(TNR)TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL$(TNR)TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF$(TNR)FILTER) $(MISC)/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB$(TNR)NAME)"!=""
@@ -205,8 +203,8 @@ $(DEF$(TNR)TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL$(TNR)TARGET8=$(shell @fix_shl $(SHL$(TNR)TARGETN:f))
 
-DEF$(TNR)FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF$(TNR)NAMELIST=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib)
+DEF$(TNR)FILTER=$(SOLARENV)/inc/dummy.flt
+DEF$(TNR)NAMELIST=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF$(TNR)TARGETN) : \
@@ -216,10 +214,8 @@ $(DEF$(TNR)TARGETN) : \
 $(DEF$(TNR)TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
     @+-$(RM) $@.tmpfile
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:    module definition file" $(@:f)
+    @echo Making Module-Definitionfile : $@
     @echo LIBRARY	  $(SHL$(TNR)TARGET8) INITINSTANCE TERMINSTANCE	 >$@.tmpfile
     @echo DATA MULTIPLE	 >>$@.tmpfile
     @echo DESCRIPTION	'StarView 3.00 $(DEF$(TNR)DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
@@ -230,7 +226,7 @@ $(DEF$(TNR)TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB$(TNR)NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB$(TNR)NAME).lib
+    @+echo $(SLB)/$(DEFLIB$(TNR)NAME).lib
     @+emxexpr $(DEF$(TNR)NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB$(TNR)NAME)"!=""
 
diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk
index 0ca3d65f0..46a5ffbf1 100644
--- a/solenv/inc/tg_dep.mk
+++ b/solenv/inc/tg_dep.mk
@@ -31,46 +31,31 @@
 
 .IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(SRCFILES)$(SRC1FILES)$(SRC2FILES)$(SRC3FILES)$(RCFILES)$(HDBDEPNTARGET)$(IDLFILES)$(PARFILES)$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!=""
 ALLDEP .PHONY: 
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-    @-$(IFEXIST) $(SRS)$/$(TARGET).*.dpr $(THEN) $(RM:s/+//) $(SRS)$/$(TARGET).*.dpr >& $(NULLDEV) $(FI)
-.ELSE
-    @@-$(RM) $(SRS)$/$(TARGET).*.dpr
-.ENDIF
-    @@-$(RM) $(MISC)$/$(TARGET).dpr
-    @@-$(RM) $(MISC)$/$(TARGET).*.dprr
-    @@-$(RM) $(MISC)$/$(TARGET).dpj
-    @@-$(RM) $(MISC)$/$(TARGET).dpz
-    @@-$(RM) $(MISC)$/$(COMP1TYPELIST).mk $(MISC)$/$(COMP2TYPELIST).mk $(MISC)$/$(COMP3TYPELIST).mk $(MISC)$/$(COMP4TYPELIST).mk $(MISC)$/$(COMP5TYPELIST).mk $(MISC)$/$(COMP6TYPELIST).mk $(MISC)$/$(COMP7TYPELIST).mk $(MISC)$/$(COMP8TYPELIST).mk $(MISC)$/$(COMP9TYPELIST).mk
+    @-$(IFEXIST) $(SRS)/$(TARGET).*.dpr $(THEN) $(RM:s/+//) $(SRS)/$(TARGET).*.dpr >& $(NULLDEV) $(FI)
+    @@-$(RM) $(MISC)/$(TARGET).dpr
+    @@-$(RM) $(MISC)/$(TARGET).*.dprr
+    @@-$(RM) $(MISC)/$(TARGET).dpj
+    @@-$(RM) $(MISC)/$(TARGET).dpz
+    @@-$(RM) $(MISC)/$(COMP1TYPELIST).mk $(MISC)/$(COMP2TYPELIST).mk $(MISC)/$(COMP3TYPELIST).mk $(MISC)/$(COMP4TYPELIST).mk $(MISC)/$(COMP5TYPELIST).mk $(MISC)/$(COMP6TYPELIST).mk $(MISC)/$(COMP7TYPELIST).mk $(MISC)/$(COMP8TYPELIST).mk $(MISC)/$(COMP9TYPELIST).mk
 .IF "$(nodep)"==""
 .IF "$(DEPFILE_SLO)"!=""	
     @@-$(RM) $(DEPFILE_SLO)
-    $(foreach,i,$(all_local_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) > $(MISC)$/s_$(i:b).dpcc ))
-    $(foreach,i,$(all_misc_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) > $(MISC)$/s_$(i:b).dpcc ))
+    $(foreach,i,$(all_local_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) > $(MISC)/s_$(i:b).dpcc ))
+    $(foreach,i,$(all_misc_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) > $(MISC)/s_$(i:b).dpcc ))
 .ENDIF			# "$(DEPFILE_SLO)"!=""	
 .IF "$(DEPFILE_OBJ)"!=""	
     @@-$(RM) $(DEPFILE_OBJ)
-    $(foreach,i,$(all_local_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $i ) > $(MISC)$/o_$(i:b).dpcc ))
-    $(foreach,i,$(all_misc_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $i ) > $(MISC)$/o_$(i:b).dpcc ))
+    $(foreach,i,$(all_local_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $i ) > $(MISC)/o_$(i:b).dpcc ))
+    $(foreach,i,$(all_misc_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $i ) > $(MISC)/o_$(i:b).dpcc ))
 .ENDIF			# "$(DEPFILE_OBJ)"!=""	
 .ENDIF			# "$(nodep)"==""
 .IF "$(DEPFILES)" != ""
     echo xxx$(DEPFILES)xxx
-#to keep win9x happy
-.IF "$(GROUPSHELL:b:l)"=="4dos"
-    @@-echo $(foreach,i,$(DEPFILES) $(shell @@$(4nt_force_shell)-del $i))
-.ELSE			# "$(GROUPSHELL:b)"=="4dos"
-.IF "$(USE_SHELL)"=="4nt"
-    @@-echo $(foreach,i,$(DEPFILES) $(shell @@$(4nt_force_shell)-del $i ))
-.ELSE			# "$(USE_SHELL)"=="4nt"
     @@-$(RM) $(DEPFILES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
-.ENDIF			# "$(GROUPSHELL:b)"=="4dos"
 .ENDIF			# "$(DEPFILES)" != ""
-.IF "$(QUIET_BUILD)"==""
     @echo ---
     @echo      $(PWD) - Old dependency files removed or updated
     @echo ---
-.ENDIF
 
 
 ALLDPC: \
@@ -80,7 +65,7 @@ ALLDPC: \
         $(HDBDEPNTARGET)
 .IF "$(nodep)"!=""
     @echo NOT-Making: Depend-Lists
-    @echo ttt: ppp > $(MISC)$/$(TARGET).dpc
+    @echo ttt: ppp > $(MISC)/$(TARGET).dpc
 .ELSE
     @echo Making : Dependencies 
 .IF "$(CFILES)$(CXXFILES)"!=""
@@ -93,34 +78,30 @@ ALLDPC: \
 .ENDIF
 .ENDIF
 .IF "$(HDBDEPNTARGET)$(OBJFILES)$(SLOFILES)$(DEPOBJFILES)$(RCFILES)$(PARFILES)"!=""
-    @$(IFEXIST) $(MISC)$/$(TARGET).dpj $(THEN) $(RM:s/+//) $(MISC)$/$(TARGET).dpj >& $(NULLDEV) $(FI)
-    @$(IFEXIST) $(MISC)$/genjava.mk $(THEN) $(RM:s/+//) $(MISC)$/genjava.mk >& $(NULLDEV) $(FI)
-    $(TOUCH) $(MISC)$/$(TARGET).dpc
+    @$(IFEXIST) $(MISC)/$(TARGET).dpj $(THEN) $(RM:s/+//) $(MISC)/$(TARGET).dpj >& $(NULLDEV) $(FI)
+    @$(IFEXIST) $(MISC)/genjava.mk $(THEN) $(RM:s/+//) $(MISC)/genjava.mk >& $(NULLDEV) $(FI)
+    $(TOUCH) $(MISC)/$(TARGET).dpc
 .IF "$($(SECOND_BUILD)_SLOFILES)"!=""
-    @$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_SLOFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $i )) >> $(MISC)$/$(TARGET).dpc
+    @$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_SLOFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $i )) >> $(MISC)/$(TARGET).dpc
 .ENDIF
 .IF "$($(SECOND_BUILD)_OBJFILES)"!=""
-    @$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_OBJFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $(i:d:s/obj/slo/)$(i:b).obj )) >> $(MISC)$/$(TARGET).dpc
+    @$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_OBJFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $(i:d:s/obj/slo/)$(i:b).obj )) >> $(MISC)/$(TARGET).dpc
 .ENDIF
 .ELSE			# "$(HDBDEPNTARGET)$(OBJFILES)$(SLOFILES)$(DEPOBJFILES)$(RCFILES)"!=""
-    @echo ttt: ppp > $(MISC)$/$(TARGET).dpc
+    @echo ttt: ppp > $(MISC)/$(TARGET).dpc
 .ENDIF			# "$(HDBDEPNTARGET)$(OBJFILES)$(SLOFILES)$(DEPOBJFILES)$(RCFILES)"!=""
 .ENDIF			# "$(nodep)"!=""
 .ELSE		# anything requiring dependencies
 
 
 ALLDPC:
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
     @echo No Dependencies
-.ENDIF
-    @echo $(EMQ)# > $(MISC)$/$(TARGET).dpc
+    @echo $(EMQ)# > $(MISC)/$(TARGET).dpc
 
 ALLDEP:
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
     @echo No Dependencies
-.ENDIF
 
 .ENDIF
 
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index ced838d44..b231029ff 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -34,7 +34,7 @@
 # setup INCLUDE variable for use by VC++
 .IF "$(GUI)$(COM)"=="WNTMSC"
 .IF "$(EXT_USE_STLPORT)"==""
-INCLUDE!:=. $(subst,$/stl, $(SOLARINC))
+INCLUDE!:=. $(subst,/stl, $(SOLARINC))
 .ELSE			# "$(EXT_USE_STLPORT)"==""
 INCLUDE!:=. $(SOLARINC)
 .ENDIF			# "$(EXT_USE_STLPORT)"==""
@@ -55,29 +55,29 @@ PATH!:=.$(PATH_SEPERATOR)$(SOLARBINDIR)$(PATH_SEPERATOR)$(PATH)
 .EXPORT : PATH
 
 #override
-PACKAGE_DIR=$(MISC)$/build
-ABS_PACKAGE_DIR:=$(MAKEDIR)$/$(MISC)$/build
+PACKAGE_DIR=$(MISC)/build
+ABS_PACKAGE_DIR:=$(MAKEDIR)/$(MISC)/build
 
 #MUST match with PACKAGE_DIR
-BACK_PATH=..$/..$/..$/
+BACK_PATH=../../../
 #MUST match with reference (currently MISC)
-MBACK_PATH=..$/..$/
+MBACK_PATH=../../
 .IF "$(TARFILE_IS_FLAT)" != ""
-fake_root_dir=$/$(TARFILE_NAME)
+fake_root_dir=/$(TARFILE_NAME)
 #MUST match fake_root_dir in directory levels
-fake_back=..$/
+fake_back=../
 .ENDIF "$(TARFILE_IS_FLAT)" != ""
 
-P_CONFIGURE_DIR=$(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$(CONFIGURE_DIR)
-P_BUILD_DIR=$(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$(BUILD_DIR)
-P_INSTALL_DIR=$(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$(BUILD_DIR)
-P_INSTALL_TARGET_DIR=$(MISC)$/install
+P_CONFIGURE_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(CONFIGURE_DIR)
+P_BUILD_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR)
+P_INSTALL_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR)
+P_INSTALL_TARGET_DIR=$(MISC)/install
 
 .IF "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
 NEW_PATCH_FILE_NAME:=$(TARFILE_NAME)
 .ELSE			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
 NEW_PATCH_FILE_NAME:=$(TARFILE_NAME)-newpatch-rename_me.patch
-PATCH_FILE_DEP:=$(PRJ)$/$(PATH_IN_MODULE)$/{$(PATCH_FILES)}
+PATCH_FILE_DEP:=$(PRJ)/$(PATH_IN_MODULE)/{$(PATCH_FILES)}
 .ENDIF			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
 
 .IF "$(TAR_EXCLUDES)"!=""
@@ -91,8 +91,8 @@ unzip_quiet_switch:=
 .ENDIF			# "$(VERBOSE)"=="TRUE"
 
 .IF "$(ADDITIONAL_FILES)"!=""
-P_ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES) $(MISC)$/$(TARFILE_ROOTDIR)$/$i)
-T_ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i)
+P_ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES) $(MISC)/$(TARFILE_ROOTDIR)/$i)
+T_ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i)
 .ENDIF			# "$(ADDITIONAL_FILES)"!=""
 
 EXTRPATH*=OOO
@@ -100,90 +100,84 @@ EXTRPATH*=OOO
 .IF "$(L10N_framework)"==""
 
 ALLTAR : \
-    $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) \
-    $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) \
-    $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) \
-    $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) \
-    $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) \
-    $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) \
-    $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) \
+    $(PACKAGE_DIR)/$(BUILD_FLAG_FILE) \
+    $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) \
+    $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) \
+    $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) \
+    $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) \
+    $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
 
 clean:
     cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) clean
-    $(RM) $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+    $(RM) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
 
-$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.bz2
+$(MISC)/%.unpack : $(PRJ)/download/%.tar.bz2
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.Z
+$(MISC)/%.unpack : $(PRJ)/download/%.tar.Z
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.Z | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.Z | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := uncompress -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.Z | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := uncompress -c $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.Z | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz
+$(MISC)/%.unpack : $(PRJ)/download/%.tar.gz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)$/%.unpack : $(PRJ)$/download$/%.tgz
+$(MISC)/%.unpack : $(PRJ)/download/%.tgz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar
+$(MISC)/%.unpack : $(PRJ)/download/%.tar
     @-$(RM) $@
-    noop $(assign UNPACKCMD := $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar)
+    noop $(assign UNPACKCMD := $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar)
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)$/%.unpack : $(PRJ)$/download$/%.zip
+$(MISC)/%.unpack : $(PRJ)/download/%.zip
     @-$(RM) $@
-    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).zip)
+    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).zip)
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)$/%.unpack : $(PRJ)$/download$/%.jar
+$(MISC)/%.unpack : $(PRJ)/download/%.jar
     @-$(RM) $@
 .IF "$(OS)"=="SOLARIS"
-    noop $(assign UNPACKCMD := jar xf $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).jar)
+    noop $(assign UNPACKCMD := jar xf $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).jar)
 .ELSE			# "$(OS)"=="SOLARIS"
-    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).jar)
+    noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).jar)
 .ENDIF			# "$(OS)"=="SOLARIS"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
 #do unpack
-$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack $(PATCH_FILE_DEP)
-    $(IFEXIST) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme $(FI)
-    -rm -rf $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme
+$(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack $(PATCH_FILE_DEP)
+    $(IFEXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI)
+    -rm -rf $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme
     @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
-    cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell $(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
+    cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
     @echo make writeable...
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
     @cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -exec chmod a+x {{}} \;
-.ELSE			# "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-# Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds
-    $(DELAY) 2
-    @cd $(PACKAGE_DIR) && attrib /s -r $(TARFILE_ROOTDIR) >& $(NULLDEV) && $(TOUCH) $(UNTAR_FLAG_FILE)
-.ENDIF			# "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
 
 #add new files to patch
-$(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) $(T_ADDITIONAL_FILES:+".dummy")
+$(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) $(T_ADDITIONAL_FILES:+".dummy")
 .IF "$(GUI)"=="WNT"
     @$(TOUCH) $@
 .ELSE			# "$(GUI)"=="WNT"
@@ -191,7 +185,7 @@ $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) $(T_
 .ENDIF			# "$(GUI)"=="WNT"
 
 #patch
-$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE)
+$(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
 .IF "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
     @echo no patch needed...
     $(TOUCH) $@
@@ -199,16 +193,16 @@ $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE)
 .IF "$(GUI)"=="WNT"
 # hack to make 4nt version 4,01 work and still get propper
 # errorcodes for versions < 3,00
-.IF "$(my4ver:s/.//:s/,//)" >= "300"
-    cd $(PACKAGE_DIR) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
-.ELSE			# "$(my4ver:s/.//:s/,//)" >= "300"
-    cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-.ENDIF			# "$(my4ver:s/.//:s/,//)" >= "300"
+#.IF "$(my4ver:s/.//:s/,//)" >= "300"
+#	cd $(PACKAGE_DIR) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
+#.ELSE			# "$(my4ver:s/.//:s/,//)" >= "300"
+    cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+#.ENDIF			# "$(my4ver:s/.//:s/,//)" >= "300"
 .ELSE           # "$(GUI)"=="WNT"
 .IF "$(BSCLIENT)"=="TRUE"
-    cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+    cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
 .ELSE           # "$(BSCLIENT)"!=""
-    cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+    cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
 .ENDIF          # "$(BSCLIENT)"!=""
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
@@ -217,28 +211,28 @@ $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE)
 # Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds
     $(DELAY) 2
 .ENDIF # "$(GUI)"=="WNT"
-    $(TOUCH) $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
+    $(TOUCH) $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
 .ENDIF          # "$(T_ADDITIONAL_FILES)"!=""
 
 .IF "$(CONVERTFILES)"!=""
-$(MISC)$/$(TARGET)_convert_unx_flag :  $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
-    $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) && $(TOUCH) $(MISC)$/$(TARGET)_convert_unx_flag
+$(MISC)/$(TARGET)_convert_unx_flag :  $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE)
+    $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) && $(TOUCH) $(MISC)/$(TARGET)_convert_unx_flag
 
-$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/$(TARGET)_convert_unx_flag
+$(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(MISC)/$(TARGET)_convert_unx_flag
 
-$(MISC)$/$(TARGET)_convert_dos_flag : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
-    $(CONVERT) dos  $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) && $(TOUCH) $(MISC)$/$(TARGET)_convert_dos_flag
+$(MISC)/$(TARGET)_convert_dos_flag : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
+    $(CONVERT) dos  $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) && $(TOUCH) $(MISC)/$(TARGET)_convert_dos_flag
 
-$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(MISC)$/$(TARGET)_convert_dos_flag
+$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(MISC)/$(TARGET)_convert_dos_flag
 
-patch : $(MISC)$/$(TARGET)_convert_dos_flag
+patch : $(MISC)/$(TARGET)_convert_dos_flag
 
 .ENDIF          # "$(CONVERTFILES)"!=""
 
-$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
+$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
     @@-$(RM) $@
 .IF "$(CONFIGURE_ACTION)" == "none" || "$(CONFIGURE_ACTION)"==""
-    $(TOUCH) $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE)
+    $(TOUCH) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
 .ELSE			# "$(CONFIGURE_ACTION)"=="none" || "$(CONFIGURE_ACTION)"==""
     -$(MKDIR) $(P_CONFIGURE_DIR)
 .IF "$(OS)"=="OS2"
@@ -246,99 +240,94 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
 .ELSE
     cd $(P_CONFIGURE_DIR) && $(CONFIGURE_ACTION) $(CONFIGURE_FLAGS) && $(TOUCH) $(CONFIGURE_FLAG_FILE)
 .ENDIF
-    mv $(P_CONFIGURE_DIR)$/$(CONFIGURE_FLAG_FILE) $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE)
+    mv $(P_CONFIGURE_DIR)/$(CONFIGURE_FLAG_FILE) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
 .ENDIF			# "$(CONFIGURE_ACTION)"=="none" ||	"$(CONFIGURE_ACTION)"==""
 
 
-$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) : $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE)
+$(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
     @@-$(RM) $@
 .IF "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
-    $(TOUCH) $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+    $(TOUCH) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
 .ELSE			# "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
     -$(MKDIR) $(P_BUILD_DIR)
-    cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) && $(TOUCH) $(ABS_PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+    cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) && $(TOUCH) $(ABS_PACKAGE_DIR)/$(BUILD_FLAG_FILE)
 .ENDIF			# "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
 
-$(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+$(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) : $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
     @@-$(RM) $@
 .IF "$(INSTALL_ACTION)"=="none" ||	"$(INSTALL_ACTION)"==""
-    $(TOUCH) $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(TOUCH) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
 .ELSE			# "$(INSTALL_ACTION)"=="none" ||	"$(INSTALL_ACTION)"==""
     -$(MKDIR) $(P_INSTALL_DIR)
     -$(MKDIR) $(P_INSTALL_TARGET_DIR)
     cd $(P_INSTALL_DIR) && $(INSTALL_ACTION) $(INSTALL_FLAGS) && $(TOUCH) $(INSTALL_FLAG_FILE)
-    mv $(P_INSTALL_DIR)$/$(INSTALL_FLAG_FILE) $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    mv $(P_INSTALL_DIR)/$(INSTALL_FLAG_FILE) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
 .ENDIF			# "$(INSTALL_ACTION)"=="none" ||	"$(INSTALL_ACTION)"==""
 
-$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+$(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
 .IF "$(OUT2LIB)"!=""
-    $(COPY) $(foreach,i,$(OUT2LIB) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(LB)
+    $(COPY) $(foreach,i,$(OUT2LIB) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(LB)
 .IF "$(OS)"=="MACOSX"
-    $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl extshl \
+    $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl extshl \
         $(EXTRPATH) \
-        $(shell ls $(foreach,j,$(OUT2LIB) $(LB)$/$(j:f)) | \
+        $(shell ls $(foreach,j,$(OUT2LIB) $(LB)/$(j:f)) | \
             (grep -v '\.a$$' || test $$? = 1))
 .ENDIF
 .ENDIF			# "$(OUT2LIB)"!=""
 .IF "$(OUT2INC)"!=""
 .IF "$(OUT2INC_SUBDIR)"!=""
-    -$(MKDIRHIER) $(INCCOM)$/$(OUT2INC_SUBDIR)
-    $(COPY) $(foreach,i,$(OUT2INC) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(INCCOM)$/$(OUT2INC_SUBDIR)
+    -$(MKDIRHIER) $(INCCOM)/$(OUT2INC_SUBDIR)
+    $(COPY) $(foreach,i,$(OUT2INC) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(INCCOM)/$(OUT2INC_SUBDIR)
 .ELSE          # "$(OUT2INC_SUBDIR)"!=""
-    $(COPY) $(foreach,i,$(OUT2INC) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(INCCOM)
+    $(COPY) $(foreach,i,$(OUT2INC) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(INCCOM)
 .ENDIF          # "$(OUT2INC_SUBDIR)"!=""
 .ENDIF			# "$(OUT2INC)"!=""
 .IF "$(OUTDIR2INC)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    @-$(MKDIR) $(foreach,i,$(OUTDIR2INC) $(INCCOM)$/$(i:b))
-    @echo copied $(foreach,i,$(OUTDIR2INC) $(shell @$(COPY) $(COPYRECURSE) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i$/* $(INCCOM)$/$(i:b) >& $(NULLDEV) && echo $i))
-.ELSE			# "$(USE_SHELL)"=="4nt"
-    $(COPY) $(DEREFERENCE) $(COPYRECURSE) $(foreach,i,$(OUTDIR2INC) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(INCCOM)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
+    $(COPY) $(COPYRECURSE) $(foreach,i,$(OUTDIR2INC) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(INCCOM)
 .ENDIF			# "$(OUTDIR2INC)"!=""
 .IF "$(OUT2BIN)"!=""
-    $(COPY) $(foreach,i,$(OUT2BIN) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(BIN)
+    $(COPY) $(foreach,i,$(OUT2BIN) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(BIN)
 .IF "$(GUI)$(COM)$(COMEX)"=="WNTMSC12"
     @noop $(foreach,j,$(foreach,k,$(OUT2BIN) \
-        $(shell -ls -1 $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$k | $(GREP) .dll)) \
+        $(shell -ls -1 $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$k | $(GREP) .dll)) \
         $(shell @$(IFEXIST) $(j).manifest $(THEN) mt.exe \
-        -manifest $(j).manifest -outputresource:$(BIN)$/$(j:f)$(EMQ);2 $(FI)))
+        -manifest $(j).manifest -outputresource:$(BIN)/$(j:f)$(EMQ);2 $(FI)))
 .ENDIF          # "$(GUI)$(COM)$(COMEX)"=="WNTMSC12"
 .ENDIF			# "$(OUT2BIN)"!=""
 .IF "$(OUT2CLASS)"!=""
-    $(COPY) $(foreach,i,$(OUT2CLASS) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(CLASSDIR)
+    $(COPY) $(foreach,i,$(OUT2CLASS) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(CLASSDIR)
 .ENDIF			# "$(OUT2BIN)"!=""
-    $(TOUCH) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(TOUCH) $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
 
-$(MISC)$/$(TARFILE_ROOTDIR).done : $(MISC)$/$(TARFILE_NAME).unpack $(PATCH_FILES)
-    @-mv $(MISC)$/$(TARFILE_ROOTDIR) $(MISC)$/$(TARFILE_ROOTDIR).old
-    @-rm -rf $(MISC)$/$(TARFILE_ROOTDIR).old
+$(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_NAME).unpack $(PATCH_FILES)
+    @-mv $(MISC)/$(TARFILE_ROOTDIR) $(MISC)/$(TARFILE_ROOTDIR).old
+    @-rm -rf $(MISC)/$(TARFILE_ROOTDIR).old
     @-$(MKDIRHIER) $(MISC)$(fake_root_dir)
-    cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack))
+    cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack))
 .IF "$(P_ADDITIONAL_FILES)"!=""
     noop $(foreach,i,$(P_ADDITIONAL_FILES) $(shell echo dummy > $i))
 .ENDIF			 "$(P_ADDITIONAL_FILES)"!=""
 .IF "$(PATCH_FILES)"!="none" &&	"$(PATCH_FILES)"!=""
 .IF "$(CONVERTFILES)"!=""
-    $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(MISC)$/$(TARFILE_ROOTDIR)$/$i)
+    $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(MISC)/$(TARFILE_ROOTDIR)/$i)
 .ENDIF          # "$(CONVERTFILES)"!=""
 .IF "$(GUI)"=="WNT"
 # hack to make 4nt version 4,01 work and still get propper
 # errorcodes for versions < 3,00
-.IF "$(my4ver:s/.//:s/,//)" >= "300"
-    cd $(MISC) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 )
-.ELSE			# "$(my4ver:s/.//:s/,//)" >= "300"
-    cd $(MISC) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2
-.ENDIF			# "$(my4ver:s/.//:s/,//)" >= "300"
+#.IF "$(my4ver:s/.//:s/,//)" >= "300"
+#	cd $(MISC) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 )
+#.ELSE			# "$(my4ver:s/.//:s/,//)" >= "300"
+    cd $(MISC) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2
+#.ENDIF			# "$(my4ver:s/.//:s/,//)" >= "300"
 .ELSE           # "$(GUI)"=="WNT"
 .IF "$(BSCLIENT)"=="TRUE"
-    cd $(MISC) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2
+    cd $(MISC) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2
 .ELSE           # "$(BSCLIENT)"!=""
-    cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2
+    cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2
 .ENDIF          # "$(BSCLIENT)"!=""
 .ENDIF          # "$(GUI)"=="WNT"
 .IF "$(CONVERTFILES)"!=""
-    $(CONVERT) dos  $(foreach,i,$(CONVERTFILES) $(MISC)$/$(TARFILE_ROOTDIR)$/$i)
+    $(CONVERT) dos  $(foreach,i,$(CONVERTFILES) $(MISC)/$(TARFILE_ROOTDIR)/$i)
 .ENDIF          # "$(CONVERTFILES)"!=""
 .ENDIF			# "$(PATCH_FILES)"!="none" && "$(PATCH_FILES)"!="
 .IF "$(GUI)"=="UNX"	
@@ -346,7 +335,7 @@ $(MISC)$/$(TARFILE_ROOTDIR).done : $(MISC)$/$(TARFILE_NAME).unpack $(PATCH_FILES
 .ENDIF			# "$(GUI)"=="UNX"
 
 .IF "$(T_ADDITIONAL_FILES)"!=""
-$(T_ADDITIONAL_FILES:+".dummy") : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
+$(T_ADDITIONAL_FILES:+".dummy") : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE)
     @-$(MKDIRHIER) $(@:d)
     -echo dummy > $@
     -$(TOUCH) $@
@@ -354,25 +343,25 @@ $(T_ADDITIONAL_FILES:+".dummy") : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
     -$(TOUCH) $(@:d)$(@:b)
 .ENDIF			 "$(T_ADDITIONAL_FILES)"!=""
 
-create_patch : $(MISC)$/$(TARFILE_ROOTDIR).done $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
-    @@-$(MKDIRHIER) $(PRJ)$/$(NEW_PATCH_FILE_NAME:d)
-    @@-$(RM) $(MISC)$/$(NEW_PATCH_FILE_NAME:f).tmp
-    @@-$(RM) $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME).bak
+create_patch : $(MISC)/$(TARFILE_ROOTDIR).done $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
+    @@-$(MKDIRHIER) $(PRJ)/$(NEW_PATCH_FILE_NAME:d)
+    @@-$(RM) $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp
+    @@-$(RM) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
 #ignore returncode of 1 (indicates differences...)
 # hard coded again to get the same directory level as before. quite ugly...
-    -cd $(PRJ)$/$(ROUT) && diff -ru misc$/$(TARFILE_ROOTDIR) misc$/build$/$(TARFILE_ROOTDIR) | $(PERL) $(SOLARENV)$/bin$/cleandiff.pl | tr -d "\015" > misc$/$(NEW_PATCH_FILE_NAME:f).tmp
-    -mv $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME) $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME).bak
-    -$(TOUCH) $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME).bak
-    $(PERL) $(SOLARENV)$/bin$/patch_sanitizer.pl $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME).bak $(MISC)$/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME)
-    @@-$(RM) $(MISC)$/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME).bak
+    -cd $(PRJ)/$(ROUT) && diff -ru misc/$(TARFILE_ROOTDIR) misc/build/$(TARFILE_ROOTDIR) | $(PERL) $(SOLARENV)/bin/cleandiff.pl | tr -d "\015" > misc/$(NEW_PATCH_FILE_NAME:f).tmp
+    -mv $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
+    -$(TOUCH) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
+    $(PERL) $(SOLARENV)/bin/patch_sanitizer.pl $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME)
+    @@-$(RM) $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
     $(MAKECMD) $(MAKEMACROS) patch
     @echo still some problems with win32 generated patches...
     @echo $(USQ)find your new changes in $(NEW_PATCH_FILE_NAME). don't forget to move/rename that patch and insert it in your makefiles PATCH_FILES to activate.$(USQ)
 
-create_clean : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
+create_clean : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE)
     @echo done
 
-patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
+patch : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
     @echo done
 
 .ENDIF			# "$(L10N_framework)"==""
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk
index cd8211f3b..3974f0770 100644
--- a/solenv/inc/tg_jar.mk
+++ b/solenv/inc/tg_jar.mk
@@ -45,9 +45,9 @@ $(JARTARGETN) : $(JARMANIFEST) $(JAVACLASSFILES) $(JAVATARGET)
 
 .IF "$(CUSTOMMANIFESTFILE)"!=""
 
-CUSTOMMANIFESTFILEDEP:=$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f)
+CUSTOMMANIFESTFILEDEP:=$(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f)
 
-$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,$/ $(DMAKE_WORK_DIR))$/$(CUSTOMMANIFESTFILE)
+$(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,/ $(DMAKE_WORK_DIR))/$(CUSTOMMANIFESTFILE)
     -$(RM) $@
     $(COPY) $< $@
 .ENDIF			# "$(CUSTOMMANIFESTFILE)"!=""
@@ -62,7 +62,7 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)
 # $(RSCREVISION) contains chars that must be quoted (for *NIX shells)
     echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@
 .IF "$(CUSTOMMANIFESTFILE)"!=""
-    $(TYPE) $(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@
+    $(TYPE) $(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@
 .ENDIF			# "$(CUSTOMMANIFESTFILE)"!=""
 .ENDIF			# "$(JARMANIFEST)"!=""
 .ENDIF			# "$(NEW_JAR_PACK)"!=""
@@ -76,13 +76,13 @@ $(JARTARGETN) .PHONY :
 .ELSE			# "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!=""
 .DIRCACHE = no
 $(JARTARGETN) :
-#$(JARTARGETN) .SETDIR=$(CLASSDIR) .SEQUENTIAL : $(JARTARGETDEP) $(shell @-cat -s $(MISC)$/$(JARTARGETN).dep )
+#$(JARTARGETN) .SETDIR=$(CLASSDIR) .SEQUENTIAL : $(JARTARGETDEP) $(shell @-cat -s $(MISC)/$(JARTARGETN).dep )
 .ENDIF			# "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!=""
 .IF "$(OS)$(CPU)"=="SOLARISS"
     @-find . -type d -user $(USER) ! -perm -5 -print | xargs test "$$1" != "" && chmod +r $$1 
 .ENDIF
 .IF "$(JARMANIFEST)"!=""
-    cd $(CLASSDIR)$/$(TARGET) && zip -u -rX ..$/$(@:f) $(subst,$(CLASSDIR)$/$(TARGET)$/, $(JARMANIFEST)) $(CHECKZIPRESULT)
+    cd $(CLASSDIR)/$(TARGET) && zip -u -rX ../$(@:f) $(subst,$(CLASSDIR)/$(TARGET)/, $(JARMANIFEST)) $(CHECKZIPRESULT)
 .ENDIF			# "$(JARMANIFEST)"!=""
     cd $(CLASSDIR) && zip -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(CHECKZIPRESULT)
 .ENDIF
diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk
index 3f9dee4bd..eb94f83cc 100644
--- a/solenv/inc/tg_java.mk
+++ b/solenv/inc/tg_java.mk
@@ -31,14 +31,12 @@
 
 
 
-$(CLASSDIR)$/com$/sun$/star$/upd$/$(VERSIONINFOFILE)_updversion.class .PHONY: $(MISC)$/java$/com$/sun$/star$/upd$/$(VERSIONINFOFILE)_updversion.java 
+$(CLASSDIR)/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.class .PHONY: $(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java 
 
-$(MISC)$/java$/com$/sun$/star$/upd$/$(VERSIONINFOFILE)_updversion.java .PHONY:
-.IF "$(QUIET_BUILD)"==""
+$(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java .PHONY:
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @-$(MKDIRHIER) $(MISC)$/java$/com$/sun$/star$/upd
+    @echo Making: $@
+    @-$(MKDIRHIER) $(MISC)/java/com/sun/star/upd
 .IF "$(GUI)"=="UNX"
     @echo package com.sun.star.upd\; > $@
     @echo 'public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(RSCREVISION)";}' >> $@
@@ -49,11 +47,11 @@ $(MISC)$/java$/com$/sun$/star$/upd$/$(VERSIONINFOFILE)_updversion.java .PHONY:
 
 .IF "$(JAVATARGET)"!=""
 .IF "$(PACKAGE)"!=""
-$(CLASSDIR)$/$(IDLPACKAGE)$/%.class .NOINFER .IGNORE : %.java
+$(CLASSDIR)/$(IDLPACKAGE)/%.class .NOINFER .IGNORE : %.java
 #	echo $@
     @@-$(RM) $(JAVATARGET)
 .ELSE			# "$(PACKAGE)"!=""
-$(CLASSDIR)$/%.class .NOINFER .IGNORE : %.java
+$(CLASSDIR)/%.class .NOINFER .IGNORE : %.java
 #	echo $@
     @@-$(RM) $(JAVATARGET)
 .ENDIF			# "$(PACKAGE)"!=""
@@ -72,15 +70,11 @@ $(JAVATARGET) :	$(JAVAFILES) $(JAVACLASSFILES)
     $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
 .ELSE			# "$(JAVAFILES:d)"==""
     @@$(TOUCH) $(INPATH)_$(VCSID)_a_dummy.java
-    $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) .$/*.java $(uniq $(JAVAFILES:d:+"*.java"))
+    $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) ./*.java $(uniq $(JAVAFILES:d:+"*.java"))
     @@-$(RM) $(INPATH)_$(VCSID)_a_dummy.java
 .ENDIF			# "$(JAVAFILES:d)"==""
 .ELSE			# "$(javauno)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) @$(mktmp $(strip $(JAVAFILES)))
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(JAVAC) $(JAVACPS) "$(CLASSPATH)" -d $(CLASSDIR) $(JAVAFLAGS) @$(mktmp $(strip $(JAVAFILES)))
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(javauno)"!=""
 .ENDIF			# "$(use_jdep)"!=""
 .ENDIF			# "$(JAVARESPONSE)"!=""
diff --git a/solenv/inc/tg_javav.mk b/solenv/inc/tg_javav.mk
index 0f329e607..e39533f9b 100644
--- a/solenv/inc/tg_javav.mk
+++ b/solenv/inc/tg_javav.mk
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-JAVAVERMK:=$(INCCOM)$/java_ver.mk
+JAVAVERMK:=$(INCCOM)/java_ver.mk
 
 .INCLUDE .IGNORE : $(JAVAVERMK)
 
@@ -38,16 +38,16 @@ JAVAVERMK:=$(INCCOM)$/java_ver.mk
 
 .IF "$(SOLAR_JAVA)"!=""
 JFLAGSVERSION=-version
-JFLAGSVERSION_CMD=-version $(PIPEERROR) $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk
-JFLAGSNUMVERSION_CMD=-version $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk
+JFLAGSVERSION_CMD=-version $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
+JFLAGSNUMVERSION_CMD=-version $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
 
 # that's the version known by the specific
 # java version
-JAVAVER:=$(shell @-$(JAVA_HOME)$/bin$/java $(JFLAGSVERSION_CMD))
+JAVAVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSVERSION_CMD))
 
 # and a computed integer for comparing
 # each point seperated token blown up to 4 digits
-JAVANUMVER:=$(shell @-$(JAVA_HOME)$/bin$/java $(JFLAGSNUMVERSION_CMD))
+JAVANUMVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSNUMVERSION_CMD))
 
 .ELSE          # "$(SOLAR_JAVA)"!=""
 JAVAVER=0.0.0
diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk
index 742712419..bfe9d18c8 100644
--- a/solenv/inc/tg_lib.mk
+++ b/solenv/inc/tg_lib.mk
@@ -37,36 +37,32 @@
 .IF "$(LIB$(TNR)ARCHIV)" != ""
 
 $(LIB$(TNR)ARCHIV) :	$(LIB$(TNR)TARGET)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
+    @-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
-    @-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
-    @echo $(LINK) +inst_close -c `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
-    @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
-    @+source $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
+    @-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
+    @echo $(LINK) +inst_close -c `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
+    @cat $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
+    @+source $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
+    @echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
+    @echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
 .ENDIF
 .IF "$(OS)" == "MACOSX"
-     @echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
+     @echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
-    @+echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
+    @+-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
+    @+echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
+    @cat $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
+    @+source $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
 .ELSE
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -77,21 +73,19 @@ $(LIB$(TNR)ARCHIV) :	$(LIB$(TNR)TARGET)
 $(LIB$(TNR)TARGET) :	$(LIB$(TNR)FILES) \
                         $(LIB$(TNR)OBJFILES) \
                         $(LIB$(TNR)DEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo using: $(LIB$(TNR)FILES)
     @echo using: $(LIB$(TNR)TARGET)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
+    @echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
     @cat /dev/null $(LIB$(TNR)FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @$(RM) $(@:d)$(@:b).dump
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 
 .ELIF "$(GUI)"=="OS2"
@@ -108,7 +102,7 @@ $(LIB$(TNR)TARGET) :	$(LIB$(TNR)FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB$(TNR)OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
+    +$(ECHONL) $(LIB$(TNR)OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
     @+cat /dev/null $(LIB$(TNR)FILES) | xargs -n1 >> $@
 .ELSE
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES))
@@ -123,9 +117,7 @@ $(LIB$(TNR)TARGET) :	$(LIB$(TNR)FILES) \
 .ENDIF          # "$(LIB$(TNR)FILES)"!=""    
 .ELSE			# "$(GUI)"=="WNT"
     @-$(RM) $@
-.IF "$(QUIET_BUILD)"==""
     echo $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES)
-.ENDIF
     $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES) $(LIB$(TNR)FILES) bla.lib
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="UNX"
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk
index a1f348a5b..324daba82 100644
--- a/solenv/inc/tg_merge.mk
+++ b/solenv/inc/tg_merge.mk
@@ -35,36 +35,36 @@ MKFILENAME:=tg_merge.mk
 
 .IF "$(WITH_LANG)"!=""
 .IF "$(ULFFILES)"!=""
-$(foreach,i,$(ULFFILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) 
+$(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) 
 .ENDIF          # "$(ULFFILES)"!=""
 
 # *.xrb merge
 .IF "$(XMLPROPERTIES)"!=""
-$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) 
+$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) 
 .ENDIF          # "$(ULFFILES)"!=""
 
 # *.xrm merge
 .IF "$(READMEFILES)"!=""
-$(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) 
+$(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) 
 .ENDIF          # "$(ULFFILES)"!=""
 
 # *.xrm merge
 #.IF "$(APOCHELPFILES)"!=""
-#$(foreach,i,$(APOCHELPFILES) $(COMMONMISC)$/$(MYPATH)$/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) 
+#$(foreach,i,$(APOCHELPFILES) $(COMMONMISC)/$(MYPATH)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) 
 #.ENDIF          # "$(ULFFILES)"!=""
 # *.xcu merge
 .IF "$(LOCALIZEDFILES)"!=""
-$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/merge$/{$(subst,.,$/ $(PACKAGE))}$/$(i:b).xcu) : $$(@:f) $(LOCALIZESDF) 
+$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)/merge/{$(subst,.,/ $(PACKAGE))}/$(i:b).xcu) : $$(@:f) $(LOCALIZESDF) 
 .ENDIF          # "$(ULFFILES)"!=""
 .ENDIF			# "$(WITH_LANG)"!=""
 
 # dependencies from *.ulf to par-files
 .IF "$(ULFPARFILES)"!=""
-$(ULFPARFILES) : $(COMMONMISC)$/$(TARGET)$/$$(@:b).$(LANGFILEEXT)
+$(ULFPARFILES) : $(COMMONMISC)/$(TARGET)/$$(@:b).$(LANGFILEEXT)
 .ENDIF          # "$(ULFPARFILES)"!=""
 
 # *.xrm merge
 #.IF "$(READMEFILES)"!=""
-#$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm)) : $$(@:f) $(LOCALIZESDF)
+#$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm)) : $$(@:f) $(LOCALIZESDF)
 #.ENDIF          # "$(ULFFILES)"!=""
 
diff --git a/solenv/inc/tg_moz.mk b/solenv/inc/tg_moz.mk
index c7d3031b1..cce44f8c8 100644
--- a/solenv/inc/tg_moz.mk
+++ b/solenv/inc/tg_moz.mk
@@ -35,23 +35,23 @@ EXPORT_HEADER=export_mozilla_header
 .ENDIF
 
 .IF "$(XPIDLSRCS)"!=""
-XPIDL_TYPELIB_MODULE=$(MISC)$/$(XPIDL_MODULE).xpt
+XPIDL_TYPELIB_MODULE=$(MISC)/$(XPIDL_MODULE).xpt
 XPIDLHDR:=$(XPIDLSRCS:s/.idl/.h/)
 XPIDLXPT:=$(XPIDLSRCS:s/.idl/.xpt/)
-EXTRA_MOZ_TARGET+= $(foreach,i,$(XPIDLHDR) $(INCCOM)$/$i)
-EXTRA_MOZ_TARGET+= $(foreach,i,$(XPIDLXPT) $(MISC)$/$i)
+EXTRA_MOZ_TARGET+= $(foreach,i,$(XPIDLHDR) $(INCCOM)/$i)
+EXTRA_MOZ_TARGET+= $(foreach,i,$(XPIDLXPT) $(MISC)/$i)
 
 EXTRA_MOZ_TARGET+= $(XPIDL_TYPELIB_MODULE)
 .ENDIF
 
 ALLMOZ:=$(EXTRA_MOZ_TARGET) $(DO_XPIDL) $(GEN_PRCPUCFG) $(EXPORT_HEADER)
 
-$(INCCOM)$/%.h : %.idl
+$(INCCOM)/%.h : %.idl
     $(COPY) $< $(INCCOM)
-    $(XPIDL) -m header -w -I $(SOLARIDLDIR)$/mozilla -I$(INCCOM) -I . -o $(INCCOM)$/$* $<
+    $(XPIDL) -m header -w -I $(SOLARIDLDIR)/mozilla -I$(INCCOM) -I . -o $(INCCOM)/$* $<
 
-$(MISC)$/%.xpt : %.idl
-    $(XPIDL) -m typelib -w -I $(SOLARIDLDIR)$/mozilla -I$(INCCOM) -I . -o $(MISC)$/$* $<
+$(MISC)/%.xpt : %.idl
+    $(XPIDL) -m typelib -w -I $(SOLARIDLDIR)/mozilla -I$(INCCOM) -I . -o $(MISC)/$* $<
 
 .INCLUDE : target.mk
 
@@ -76,8 +76,8 @@ CPUCFG=_netbsd.cfg
 .ENDIF
 
 .IF "$(GEN_PRCPUCFG)"!=""
-$(GEN_PRCPUCFG): $(PRJ)$/pr$/include$/md$/$(CPUCFG) 
-    @$(COPY) $(PRJ)$/pr$/include$/md$/$(CPUCFG) $@
+$(GEN_PRCPUCFG): $(PRJ)/pr/include/md/$(CPUCFG) 
+    @$(COPY) $(PRJ)/pr/include/md/$(CPUCFG) $@
 .ENDIF
 
 .IF "$(EXPORTS)"!=""
@@ -86,8 +86,8 @@ $(EXPORT_HEADER):
 .ENDIF
 
 .IF "$(XPIDLSRCS)"!=""
-$(XPIDL_TYPELIB_MODULE): $(foreach,i,$(XPIDLXPT) $(MISC)$/$i)
-    $(XPIDL_LINK) $(MISC)$/$(XPIDL_MODULE).xpt $^
-    @-mkdir $(BIN)$/components
-    @$(COPY) $@ $(BIN)$/components
+$(XPIDL_TYPELIB_MODULE): $(foreach,i,$(XPIDLXPT) $(MISC)/$i)
+    $(XPIDL_LINK) $(MISC)/$(XPIDL_MODULE).xpt $^
+    @-mkdir $(BIN)/components
+    @$(COPY) $@ $(BIN)/components
 .ENDIF
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk
index d7956d7c2..659af6fdc 100644
--- a/solenv/inc/tg_obj.mk
+++ b/solenv/inc/tg_obj.mk
@@ -33,10 +33,8 @@ MKFILENAME:=TG_OBJ.MK
 
 .IF "$(OBJTARGET)"!=""
 $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="OS2"
 .IF "$(LIBTARGET)"!="NO"
     @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
@@ -46,7 +44,7 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
 
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    $(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i)) > $@
+    $(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)/$(i)) > $@
 .ELSE			# "$(COM)"=="GCC"
 .IF "$(LIBTARGET)"!="NO"
     @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
@@ -55,11 +53,11 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(GUI)"=="WNT"
 .IF "$(GUI)"=="UNX"
-	$(QUIET_BUILD) echo $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 > $@
+    echo $(foreach,i,$(OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 > $@
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF			# "$(OBJTARGET)"!=""
@@ -68,10 +66,8 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
 .IF "$(SECOND_BUILD)"!=""
 .IF "$($(SECOND_BUILD)OBJTARGET)"!=""
 $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="OS2"
 .IF "$(LIBTARGET)"!="NO"
     @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
@@ -82,7 +78,7 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
 #     $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES)
-    $(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i)) > $@
+    $(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)/$(i)) > $@
 .ELSE
 .IF "$(LIBTARGET)"!="NO"
     @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
@@ -91,7 +87,7 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
 .ENDIF
 .ENDIF			# "$(GUI)"=="WNT"
 .IF "$(GUI)"=="UNX"
-	$(QUIET_BUILD) echo $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 >> $@
+    echo $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 >> $@
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF			# "$($(SECOND_BUILD)OBJTARGET)"!=""
 .ENDIF			# "$(SECOND_BUILD)"!=""
diff --git a/solenv/inc/tg_res.mk b/solenv/inc/tg_res.mk
index 3a7368fc5..c646aeb59 100644
--- a/solenv/inc/tg_res.mk
+++ b/solenv/inc/tg_res.mk
@@ -33,10 +33,8 @@
 .IF "$(RCTARGET)"!=""
 $(RCTARGET): $(RCFILES) 		\
              $(RCDEPN)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(CCNUMVER)" > "001300000000"
 .IF "$(MFC_INCLUDE)"!=""
     $(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) -I$(MFC_INCLUDE) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index 8db5853c5..f5e630b81 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -35,18 +35,16 @@
 .IF "$(RESLIB$(TNR)TARGETN)"!=""
 
 .IF "$(BUILDHIDS)"!=""
-HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB$(TNR)NAME)_res.hid
+HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB$(TNR)NAME)_res.hid
 
 #HACK cut off the dirty srs files which are included from solver
 RESLIB$(TNR)HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB$(TNR)SRSFILES)))
 $(HIDRES$(TNR)PARTICLE): $(RESLIB$(TNR)HIDFILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-	$(QUIET_BUILD) @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+    @echo Making: $@
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDRES$(TNR)PARTICLE)
@@ -59,31 +57,31 @@ $(RSC_MULTI$(TNR)) : \
         $(RESLIB$(TNR)BMPS)
     @echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$i \
+    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -ft=$@ \
     $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
-	$(QUIET_BUILD) $(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
     -r -p \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)$/$(RESLIB$(TNR)NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$i \
+    -fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \
+    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-    -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-    -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
+    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
@@ -93,7 +91,7 @@ $(RSC_MULTI$(TNR)) : \
 $(RESLIB$(TNR)TARGETN): \
         $(RESLIB$(TNR)SRSFILES) \
         $(RESLIB$(TNR)BMPS)
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
     @@-$(RM) $(RSC_MULTI$(TNR))
diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk
index 470517c23..5c9066c9f 100644
--- a/solenv/inc/tg_scp.mk
+++ b/solenv/inc/tg_scp.mk
@@ -36,19 +36,17 @@
 .IF "$(SCP$(TNR)TARGETN)"!=""
 
 # try to get missing parfiles
-$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
+$(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
-LOCALSCP$(TNR)FILES=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
+LOCALSCP$(TNR)FILES=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP$(TNR)TARGETN): $(LOCALSCP$(TNR)FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)$/$(SCP$(TNR)LINK_PRODUCT_TYPE)
-    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP$(TNR)FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
+    @echo Making: $@
+    @@-$(MKDIRHIER) $(BIN)/$(SCP$(TNR)LINK_PRODUCT_TYPE)
+    $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP$(TNR)FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
 .ENDIF
 
 # Anweisungen fuer das Linken
diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk
index 1ed376c60..107ba27f6 100644
--- a/solenv/inc/tg_sdi.mk
+++ b/solenv/inc/tg_sdi.mk
@@ -35,34 +35,26 @@
 
 .IF "$(HIDSID$(TNR)PARTICLE)"!=""
 $(HIDSID$(TNR)PARTICLE): $(SDI$(TNR)TARGET)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@.$(ROUT).tmp $@
-.IF "$(USE_SHELL)"=="4nt"
-    @$(TYPE) $(MISC)$/$(SDI$(TNR)NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp
-.ELSE
-    @$(TYPE) $(MISC)$/$(SDI$(TNR)NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-.ENDIF
+    @$(TYPE) $(MISC)/$(SDI$(TNR)NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
     @-$(RM) $@
     @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF # "$(HIDSID$(TNR)PARTICLE)"!=""
 
 .IF "$(SDI$(TNR)TARGET)"!=""
 $(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND) $(SDI$(TNR)NAME).sdi
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
     $(SVIDL) @$(mktmp \
-    -fs$(INCCOMX)$/$(SDI$(TNR)NAME).hxx	\
-    -fd$(INCCOMX)$/$(SDI$(TNR)NAME).ilb	\
-    -fm$(MISC)$/$(SDI$(TNR)NAME).don	\
-    -fl$(MISC)$/$(SDI$(TNR)NAME).lst         \
+    -fs$(INCCOMX)/$(SDI$(TNR)NAME).hxx	\
+    -fd$(INCCOMX)/$(SDI$(TNR)NAME).ilb	\
+    -fm$(MISC)/$(SDI$(TNR)NAME).don	\
+    -fl$(MISC)/$(SDI$(TNR)NAME).lst         \
     -fx$(SDI$(TNR)EXPORT).sdi		\
-    -fz$(MISC)$/$(SDI$(TNR)NAME).sid	\
+    -fz$(MISC)/$(SDI$(TNR)NAME).sid	\
     $(SDI$(TNR)NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
 .ENDIF # "$(SDI$(TNR)TARGET)"!=""
 
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index afdc3a9fa..df1265adc 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -62,7 +62,7 @@ LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH)*=/ERROR:/Bad_SHL$(TNR)RPATH_value
 SHL$(TNR)LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH))
 
 .IF "$(SHL$(TNR)USE_EXPORTS)"==""
-SHL$(TNR)DEF*=$(MISC)$/$(SHL$(TNR)TARGET).def
+SHL$(TNR)DEF*=$(MISC)/$(SHL$(TNR)TARGET).def
 .ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"==""
 
 EXTRALIBPATHS$(TNR)=$(EXTRALIBPATHS)
@@ -79,15 +79,15 @@ EXTRALIBPATHS$(TNR)+=-L$(SOLAR_STLLIBPATH)
 
 .IF "$(VERSIONOBJ)"!=""
 SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)$/$(SHL$(TNR)VERSIONOBJ:b).h
+USE_VERSIONH:=$(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h
 .IF "$(GUI)" == "UNX"
 SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
 .ELSE           # "$(GUI)" == "UNX"
 SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
 .ENDIF          # "$(GUI)" == "UNX"
-$(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL$(TNR)VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)$/src$/version.c $@
-	$(QUIET_BUILD) $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@
+$(MISC)/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h
+#    $(COPY) $(SOLARENV)/src/version.c $@
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@
 
 .INIT : $(SHL$(TNR)VERSIONOBJDEP)
 .ENDIF			# "$(VERSIONOBJ)"!=""
@@ -98,13 +98,13 @@ $(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(S
 SHL$(TNR)IMPLIB=i$(TARGET)_t$(TNR)
 .ENDIF			# "$(SHL$(TNR)IMPLIB)" == ""
 .IF "$(COM)" != "GCC"
-USE_$(TNR)IMPLIB=-implib:$(LB)$/$(SHL$(TNR)IMPLIB).lib
+USE_$(TNR)IMPLIB=-implib:$(LB)/$(SHL$(TNR)IMPLIB).lib
 .ENDIF			# "$(COM)" != "GCC"
-SHL$(TNR)IMPLIBN=$(LB)$/$(SHL$(TNR)IMPLIB).lib
+SHL$(TNR)IMPLIBN=$(LB)/$(SHL$(TNR)IMPLIB).lib
 ALLTAR : $(SHL$(TNR)IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
-USE_$(TNR)IMPLIB_DEPS=$(LB)$/$(SHL$(TNR)IMPLIB).lib
+USE_$(TNR)IMPLIB_DEPS=$(LB)/$(SHL$(TNR)IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF)
@@ -114,7 +114,7 @@ SHL$(TNR)DEPN+:=$(SHL$(TNR)DEPNU)
 
 .IF "$(SHL$(TNR)VERSIONMAP)"==""
 # to activate vmaps remove "#"
-USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)TARGET).vmap
+USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)TARGET).vmap
 .ENDIF			# "$(SHL$(TNR)VERSIONMAP)"==""
 
 .IF "$(USE_SHL$(TNR)VERSIONMAP)"!=""
@@ -122,7 +122,7 @@ USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)TARGET).vmap
 .IF "$(SHL$(TNR)FILTERFILE)"!=""
 .IF "$(SHL$(TNR)VERSIONMAP)"!=""
 #eine von beiden ist zuviel
-USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)TARGET).vmap
+USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)TARGET).vmap
 $(USE_SHL$(TNR)VERSIONMAP) .PHONY:
     @echo -----------------------------
     @echo you should only use versionmap OR exportfile
@@ -149,27 +149,23 @@ $(USE_SHL$(TNR)VERSIONMAP): \
 .ENDIF
 .ENDIF			# "$(SHL$(TNR)OBJS)!"=""
     @$(TYPE) /dev/null $(SHL$(TNR)LIBS:s/.lib/.dump/) >> $@.dump
-	$(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL$(TNR)INTERFACE) -f $(SHL$(TNR)FILTERFILE) -m $@
+    $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL$(TNR)INTERFACE) -f $(SHL$(TNR)FILTERFILE) -m $@
 
 .ELSE			# "$(SHL$(TNR)FILTERFILE)"!=""
-USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)TARGET).vmap
+USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)TARGET).vmap
 $(USE_SHL$(TNR)VERSIONMAP) :
-.IF "$(QUIET_BUILD)"==""
     @echo -----------------------------
     @echo SHL$(TNR)FILTERFILE not set!
     @echo -----------------------------
     @$(TOUCH) $@
     @echo dummy file to keep the dependencies for later use.
-.ELSE
-	@$(TOUCH) $@
-.ENDIF
 #	force_dmake_to_error
 .ENDIF			# "$(SHL$(TNR)FILTERFILE)"!=""
 .ELSE			# "$(USE_SHL$(TNR)VERSIONMAP)"!=""
 
 #and now for the plain non-generic way...
 .IF "$(SHL$(TNR)VERSIONMAP)"!=""
-USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e)
+USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e)
 .IF "$(OS)"!="IRIX"
 SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
 .ENDIF
@@ -189,25 +185,25 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
 # happens if somebody will change it in the future
 .IF "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
+    tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
 .ELIF "$(COMNAME)"=="sunpro5"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
+    tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
 .ELSE           # "$(COMID)"=="gcc3"
-	$(QUIET_BUILD) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) > $@
+    tr -d "\015" < $(SHL$(TNR)VERSIONMAP) > $@
 .ENDIF          # "$(COMID)"=="gcc3"
     @chmod a+w $@
 # Mac OS X post-processing generate an exported symbols list from the generated map file
 # for details on exported symbols list see man ld on Mac OS X
 .IF "$(OS)"=="MACOSX"
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+    -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
 # Extract RTTI symbols from all the objects that will be used to build a shared library
 .IF "$(SHL$(TNR)OBJS)"!=""
-    -echo $(foreach,i,$(SHL$(TNR)OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -echo $(foreach,i,$(SHL$(TNR)OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 .IF "$(SHL$(TNR)LIBS)"!=""
-    -$(TYPE) $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+    -$(TYPE) $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 .ENDIF
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
@@ -231,15 +227,15 @@ SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\"
 
 .IF "$(SHL$(TNR)RES)"!=""
 SHL$(TNR)ALLRES+=$(SHL$(TNR)RES)
-SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res
-SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o
+SHL$(TNR)LINKRES*=$(MISC)/$(SHL$(TNR)TARGET).res
+SHL$(TNR)LINKRESO*=$(MISC)/$(SHL$(TNR)TARGET)_res.o
 .ENDIF			# "$(SHL$(TNR)RES)"!=""
 
 .IF "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!=""
-SHL$(TNR)DEFAULTRES*=$(MISC)$/$(SHL$(TNR)TARGET)_def.res
+SHL$(TNR)DEFAULTRES*=$(MISC)/$(SHL$(TNR)TARGET)_def.res
 SHL$(TNR)ALLRES+=$(SHL$(TNR)DEFAULTRES)
-SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res
-SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o
+SHL$(TNR)LINKRES*=$(MISC)/$(SHL$(TNR)TARGET).res
+SHL$(TNR)LINKRESO*=$(MISC)/$(SHL$(TNR)TARGET)_res.o
 .ENDIF			# "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!=""
 
 #.IF "$(SHL$(TNR)TARGETN)"!=""
@@ -247,13 +243,13 @@ SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(SHL$(TNR)LIBS)"!=""
-$(MISC)$/$(SHL$(TNR)TARGET)_linkinc.ls .PHONY:
+$(MISC)/$(SHL$(TNR)TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL$(TNR)LIBS)"!=""
 .ENDIF
 
-LINKINCTARGETS+=$(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls
+LINKINCTARGETS+=$(MISC)/$(SHL$(TNR)TARGETN:b)_linkinc.ls
 $(SHL$(TNR)TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
@@ -261,17 +257,17 @@ $(SHL$(TNR)TARGETN) : $(LINKINCTARGETS)
 .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL$(TNR)LIBS)"!=""
-SHL$(TNR)LINKLIST=$(MISC)$/$(SHL$(TNR)TARGET)_link.lst
+SHL$(TNR)LINKLIST=$(MISC)/$(SHL$(TNR)TARGET)_link.lst
 SHL$(TNR)LINKLISTPARAM=@$(SHL$(TNR)LINKLIST)
 $(SHL$(TNR)LINKLIST) : $(SHL$(TNR)LIBS)
     @@-$(RM) $@
-    $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
+    $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
 .ENDIF          # "$(SHL$(TNR)LIBS)"!=""
 .ENDIF          # "$(COM)"!="GCC"
 .ENDIF
 .ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"=="name"
 
-$(MISC)$/%linkinc.ls:
+$(MISC)/%linkinc.ls:
     echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
@@ -282,7 +278,7 @@ SHL$(TNR)TARGET8=$(shell @fix_shl $(SHL$(TNR)TARGET))
 .ENDIF
 
 .IF "$(GUI)" == "OS2"
-_SHL$(TNR)IMP_ORD = $(SHL$(TNR)STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL$(TNR)STDLIBS:^"$(LB)$/") 
+_SHL$(TNR)IMP_ORD = $(SHL$(TNR)STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL$(TNR)STDLIBS:^"$(LB)/") 
 SHL$(TNR)IMP_ORD = $(foreach,i,$(_SHL$(TNR)IMP_ORD) $(shell @-ls $i))
 .ELSE
 SHL$(TNR)IMP_ORD = 
@@ -299,60 +295,54 @@ $(SHL$(TNR)TARGETN) : \
                     $(SHL$(TNR)DEPN) \
                     $(SHL$(TNR)IMP_ORD) \
                     $(SHL$(TNR)LINKLIST)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL$(TNR)TARGETN)
 .IF "$(GUI)" == "WNT"
 .IF "$(SHL$(TNR)DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    @@-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
 .IF "$(SHL$(TNR)ICON)" != ""
-    @echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    @echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL$(TNR)ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL$(TNR)ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
 .ELSE			# "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF			# "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF			# "$(SHL$(TNR)DEFAULTRES)"!=""
 .IF "$(SHL$(TNR)ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL$(TNR)ALLRES:s/res /res+/) $(SHL$(TNR)LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
 .IF "$(COM)"=="GCC"
     windres $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL$(TNR)ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
     @echo dlltool --input-def $(SHL$(TNR)DEF) \
         --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \
-        --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+        --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
 .IF "$(DEFLIB$(TNR)NAME)"!=""	# do not have to include objs
-    @echo 	--output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+    @echo 	--output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
 .ELSE			# "$(DEFLIB$(TNR)NAME)"!=""	# do not have to include objs
-    @echo	--output-exp $(MISC)$/$(@:b)_exp.o \
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
         $(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \
-        `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`  >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+        `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g`  >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
 .ENDIF			# "$(DEFLIB$(TNR)NAME)"!=""
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \
-        `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+        `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
         -Wl,--exclude-libs,ALL,--start-group $(SHL$(TNR)STDLIBS) -Wl,--end-group \
-        $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
-        -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @$(TYPE)  $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+        $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \
+        -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
 .ELSE
 .IF "$(linkinc)"==""
 .IF "$(SHL$(TNR)USE_EXPORTS)"!="name"
@@ -362,7 +352,7 @@ $(SHL$(TNR)TARGETN) : \
         $(LINKFLAGSSHL) \
         $(SHL$(TNR)STACK) $(SHL$(TNR)BASEX)	\
         -out:$@ \
-        -map:$(MISC)$/$(@:b).map \
+        -map:$(MISC)/$(@:b).map \
         -def:$(SHL$(TNR)DEF) \
         $(USE_$(TNR)IMPLIB) \
         $(STDOBJ) \
@@ -376,7 +366,7 @@ $(SHL$(TNR)TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -387,8 +377,8 @@ $(SHL$(TNR)TARGETN) : \
     $(SHL$(TNR)LINKER) @$(mktmp	$(SHL$(TNR)LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL$(TNR)BASEX)		\
         $(SHL$(TNR)STACK) -out:$(SHL$(TNR)TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
-        $(LB)$/$(SHL$(TNR)IMPLIB).exp				\
+        -map:$(MISC)/$(@:B).map				\
+        $(LB)/$(SHL$(TNR)IMPLIB).exp				\
         $(STDOBJ)							\
         $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
         $(SHL$(TNR)LIBS)                         \
@@ -400,7 +390,7 @@ $(SHL$(TNR)TARGETN) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -412,7 +402,7 @@ $(SHL$(TNR)TARGETN) : \
     $(SHL$(TNR)LINKER) @$(mktmp	$(SHL$(TNR)LINKFLAGS)			\
         $(LINKFLAGSSHL) $(SHL$(TNR)BASEX)		\
         $(SHL$(TNR)STACK) -out:$(SHL$(TNR)TARGETN)	\
-        -map:$(MISC)$/$(@:B).map				\
+        -map:$(MISC)/$(@:B).map				\
         $(USE_$(TNR)IMPLIB) \
         $(STDOBJ)							\
         $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ))   \
@@ -423,7 +413,7 @@ $(SHL$(TNR)TARGETN) : \
     )
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -432,25 +422,25 @@ $(SHL$(TNR)TARGETN) : \
     $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
 .ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
-        -$(RM) del $(MISC)$/$(SHL$(TNR)TARGET).lnk
-        -$(RM) $(MISC)$/$(SHL$(TNR)TARGET).lst
+        -$(RM) del $(MISC)/$(SHL$(TNR)TARGET).lnk
+        -$(RM) $(MISC)/$(SHL$(TNR)TARGET).lst
         $(TYPE) $(mktmp \
         $(SHL$(TNR)LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
         $(SHL$(TNR)STACK) $(MAPFILE) \
         -out:$@ \
-        $(LB)$/$(SHL$(TNR)IMPLIB).exp \
+        $(LB)/$(SHL$(TNR)IMPLIB).exp \
         $(STDOBJ) \
         $(SHL$(TNR)OBJS) \
         $(SHL$(TNR)STDLIBS) \
         $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
         $(SHL$(TNR)LINKRES) \
-        ) >> $(MISC)$/$(SHL$(TNR)TARGET).lnk
-        $(TYPE) $(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL$(TNR)TARGET).lnk
-        $(SHL$(TNR)LINKER) @$(MISC)$/$(SHL$(TNR)TARGET).lnk
+        ) >> $(MISC)/$(SHL$(TNR)TARGET).lnk
+        $(TYPE) $(MISC)/$(SHL$(TNR)TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL$(TNR)TARGET).lnk
+        $(SHL$(TNR)LINKER) @$(MISC)/$(SHL$(TNR)TARGET).lnk
         @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+        $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -462,82 +452,70 @@ $(SHL$(TNR)TARGETN) : \
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(@:b).list
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+    @-$(RM) $(MISC)/$(@:b).list
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @echo $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
     $(SHL$(TNR)VERSIONOBJ) \
-    `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
-    @echo -n $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
-    $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \
-        `cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd` \
-        >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \
+    `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
+    @echo -n $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
+    $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
+        `cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd` \
+        >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL$(TNR)RPATH) $@
-	@echo "Making:   " $(@:f).jnilib
+    @echo "Making: $@.jnilib"
     @macosx-create-bundle $@
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL$(TNR)NOCHECK)"==""
-    $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN)
 .ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
 .ENDIF
 .ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-    @echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)SONAME) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
-		$(SHL$(TNR)VERSIONOBJ) -o $@ \
-		`cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-		$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-.IF "$(QUIET_BUILD)"==""
-    @cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-.ENDIF
-    @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+    @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)SONAME) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
+    $(SHL$(TNR)VERSIONOBJ) -o $@ \
+    `cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
+    $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL$(TNR)NOCHECK)"==""
-	$(QUIET_BUILD) -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-	$(QUIET_BUILD) $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-.IF "$(QUIET_BUILD)"==""
-	$(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-.ELSE
-	$(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) -- -s $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-.ENDIF
+    -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
+    $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
+    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
 .ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
 .ENDIF			# "$(UPDATER)"=="YES"
 .ENDIF			# "$(OS)"=="MACOSX"
 .IF "$(UNIXVERSIONNAMES)"!=""
-	$(QUIET_BUILD) $(RM) $(LB)$/$(SHL$(TNR)TARGETN:b)
-	$(QUIET_BUILD) cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b)
+    $(RM) $(LB)/$(SHL$(TNR)TARGETN:b)
+    cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b)
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(QUIET_BUILD)"==""
     @ls -l $@
-.ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
 .IF "$(GUI)" == "OS2"
 
 .IF "$(SHL$(TNR)DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc >& $(NULLDEV)
+    @+-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc >& $(NULLDEV)
 .IF "$(SHL$(TNR)ICON)" != ""
-    @-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    @-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL$(TNR)ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    @-+echo $(EMQ)#include $(EMQ)"$(SHL$(TNR)ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF			# "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
+#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF			# "$(SHL$(TNR)DEFAULTRES)"!=""
 
 .IF "$(SHL$(TNR)ALLRES)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    +$(COPY) $(SHL$(TNR)ALLRES:s/res /res+/) $(SHL$(TNR)LINKRES)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     +$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL$(TNR)ALLRES)"!=""
 
 .IF "$(USE_DEFFILE)"!=""
@@ -546,7 +524,7 @@ $(SHL$(TNR)TARGETN) : \
         $(SHL$(TNR)DEF) \
         $(STDOBJ) \
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
         $(SHL$(TNR)LIBS) \
         $(SHL$(TNR)STDLIBS:^"-l") \
@@ -561,7 +539,7 @@ $(SHL$(TNR)TARGETN) : \
         $(SHL$(TNR)DEF) \
         $(STDOBJ)							\
         -L$(LB) \
-        -L$(SOLARVERSION)$/$(INPATH)$/lib \
+        -L$(SOLARVERSION)/$(INPATH)/lib \
         $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
         $(SHL$(TNR)LIBS) \
         $(SHL$(TNR)STDLIBS:^"-l") \
@@ -585,7 +563,7 @@ $(SHL$(TNR)TARGETN) : \
 ALLTAR : runtest_$(SHL$(TNR)TARGET)
 
 runtest_$(SHL$(TNR)TARGET) : $(SHL$(TNR)TARGETN)
-    testshl $(SHL$(TNR)TARGETN) sce$/$(SHL$(TNR)TARGET).sce -msg -skip
+    testshl $(SHL$(TNR)TARGETN) sce/$(SHL$(TNR)TARGET).sce -msg -skip
 .ENDIF			# "$(NO_TESTS)"==""
 .ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL$(TNR)TARGETN)"!=""
@@ -620,10 +598,8 @@ $(SHL$(TNR)IMPLIBN):	\
 $(SHL$(TNR)IMPLIBN):	\
                     $(SHL$(TNR)LIBS)
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------1
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $(SHL$(TNR)IMPLIBN)
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"=="GCC"
     @echo no ImportLibs on mingw
diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk
index 16e466bb0..cf7acfaaa 100644
--- a/solenv/inc/tg_slo.mk
+++ b/solenv/inc/tg_slo.mk
@@ -38,14 +38,12 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
     @echo $(SLOTARGET)
     @echo $(&:+"\n")
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 #	@$(RM) $@
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(foreach,i,$(SLOFILES:f) $(RSLO)$/$(i)) | xargs -n1 > $@
+    +$(ECHONL) $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i)) | xargs -n1 > $@
 .ELSE
 .IF "$(LIBTARGET)"!="NO"
     @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
@@ -62,11 +60,11 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
 .ENDIF			# "$(GUI)"=="OS2"
 
 .IF "$(GUI)"=="UNX"
-	$(QUIET_BUILD) echo $(foreach,i,$(SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) | xargs -n1 > $@
+    echo $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@
 .IF "$(OS)"=="MACOSX"
-    @-nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @-nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ELSE
-    @nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
+    @nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .ENDIF
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF			# "$(SLOTARGET)"!=""
@@ -78,13 +76,11 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES)
     @echo $(REAL_$(SECOND_BUILD)SLOTARGET)
     @echo $(&:+"\n")
 .ENDIF
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-    +$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i)) | xargs -n1 > $@
+    +$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)/$(i)) | xargs -n1 > $@
 .ELSE
 .IF "$(LIBTARGET)"!="NO"
     @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
@@ -102,7 +98,7 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
-	$(QUIET_BUILD) echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) | xargs -n1 > $@
+    echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@
 .ENDIF			# "$(GUI)"=="UNX"
 .ENDIF			# "$($(SECOND_BUILD)SLOTARGET)"!=""
 .ENDIF			# "$(SECOND_BUILD)"!=""
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index da738c8a2..fd3b3aa51 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -34,75 +34,54 @@
 
 .IF "$(SRS$(TNR)NAME)"!=""
 .IF "$(BUILDHIDS)"!=""
-HID$(TNR)FILES=$(foreach,i,$(SRC$(TNR)FILES:f) $(SRS)$/$(i:s/.src/.hid/))
-HIDSRS$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS$(TNR)NAME)_srs.hid
+HID$(TNR)FILES=$(foreach,i,$(SRC$(TNR)FILES:f) $(SRS)/$(i:s/.src/.hid/))
+HIDSRS$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS$(TNR)NAME)_srs.hid
 $(HIDSRS$(TNR)PARTICLE) : $(HID$(TNR)FILES)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @-$(RM) $@
-    $(QUIET_BUILD) $(TYPE) $(mktmp  $(subst,$/,/ $(HID$(TNR)FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    $(TYPE) $(mktmp  $(subst,/,/ $(HID$(TNR)FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDSRS$(TNR)PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
+$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
-.IF "$(QUIET_BUILD)"==""
+$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr
-	$(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
+    @echo Making: $@
+    @@-$(RM) $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
 
 .IF "$(WITH_LANG)"!=""
 
-$(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)  
-.IF "$(QUIET_BUILD)"==""
-	@-$(MKDIR) $(@:d)
-    @-$(RM) $@
-    -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+$(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
+    -$(MKDIR) $(@:d)
+    -$(RM) $@
+    -$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
     $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ELSE
-	@-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
-    @-$(RM) $@
-	@ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-.ENDIF
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST)
+$(SRS)/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST)
 
-$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)/$(TARGET)/$i)
 .ELSE			# "$(WITH_LANG)"!=""
-$(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
+$(SRS)/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(QUIET_BUILD)"==""
+    @echo Making: $@
     $(RSC) -presponse @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
         $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
         -fp=$@.$(INPATH) \
         $< \
     )
-.ELSE
-	@ $(RSC) -presponse @$(mktmp \
-		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-		-fp=$@.$(INPATH) \
-		$< \
-	) $(PIPEERROR) cat - > /dev/null
-.ENDIF
-	@-$(RM) $@
-	@$(RENAME) $@.$(INPATH) $@
-	@-$(RM) $@.$(INPATH)
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 .ENDIF          # "$(SRS$(TNR)NAME)"!=""
 
diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk
index c65ef3d09..6e1d789d8 100644
--- a/solenv/inc/tg_wntx64.mk
+++ b/solenv/inc/tg_wntx64.mk
@@ -71,9 +71,9 @@ SHL2LINKFLAGS_X64+=$(LINKFLAGS_X64)
 .IF "$(SHL1IMPLIB_X64)" == ""
 SHL1IMPLIB_X64=i$(TARGET)_t1
 .ENDIF			# "$(SHL1IMPLIB_X64)" == ""
-USE_1IMPLIB_X64=-implib:$(LB_X64)$/$(SHL1IMPLIB_X64).lib
+USE_1IMPLIB_X64=-implib:$(LB_X64)/$(SHL1IMPLIB_X64).lib
 .IF "$(SHL1TARGET_X64)"!=""
-SHL1IMPLIBN_X64=$(LB_X64)$/$(SHL1IMPLIB_X64).lib
+SHL1IMPLIBN_X64=$(LB_X64)/$(SHL1IMPLIB_X64).lib
 .ENDIF # "$(SLOFILES_X64)$(OBJFILES_X64)"!=""
 
 make_x64_dirs :
@@ -146,16 +146,16 @@ $(DEF1TARGETN_X64) : \
     @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(DEFLIB1NAME_X64)"!=""
 .IF "$(SHL1USE_EXPORTS_X64)"==""
-    @-$(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)$/$(SHL1TARGET_X64).exp
-    @$(EXPORT1_PROTECT) $(LIBMGR_X64) -EXTRACT:/ /OUT:$(MISC_X64)$/$(SHL1TARGET_X64).exp $(SLB_X64)$/$(DEFLIB1NAME_X64).lib
-    @$(EXPORT1_PROTECT) $(LDUMP2) -E 20 -F $(MISC_X64)$/$(SHL1TARGET_X64).flt $(MISC_X64)$/$(SHL1TARGET_X64).exp			   >>$@.tmpfile
-    $(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)$/$(SHL1TARGET_X64).exp
+    @-$(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL1TARGET_X64).exp
+    @$(EXPORT1_PROTECT) $(LIBMGR_X64) -EXTRACT:/ /OUT:$(MISC_X64)/$(SHL1TARGET_X64).exp $(SLB_X64)/$(DEFLIB1NAME_X64).lib
+    @$(EXPORT1_PROTECT) $(LDUMP2) -E 20 -F $(MISC_X64)/$(SHL1TARGET_X64).flt $(MISC_X64)/$(SHL1TARGET_X64).exp			   >>$@.tmpfile
+    $(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL1TARGET_X64).exp
 .ELSE			# "$(SHL1USE_EXPORTS_X64)"==""
-    @$(EXPORT1_PROTECT) $(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB1NAME_X64) $(SLB_X64)$/$(i).lib) | $(GREP) EXPORT: > $(MISC_X64)$/$(SHL1TARGET_X64).direct
+    @$(EXPORT1_PROTECT) $(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB1NAME_X64) $(SLB_X64)/$(i).lib) | $(GREP) EXPORT: > $(MISC_X64)/$(SHL1TARGET_X64).direct
 .IF "$(SHL1USE_EXPORTS_X64)"!="name"
-    @$(EXPORT1_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF1FILTER_X64) $(MISC_X64)$/$(SHL1TARGET_X64).direct >>$@.tmpfile
+    @$(EXPORT1_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF1FILTER_X64) $(MISC_X64)/$(SHL1TARGET_X64).direct >>$@.tmpfile
 .ELSE			# "$(SHL1USE_EXPORTS_X64)"!="name"
-    @$(EXPORT1_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF1FILTER_X64) $(MISC_X64)$/$(SHL1TARGET_X64).direct >>$@.tmpfile
+    @$(EXPORT1_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF1FILTER_X64) $(MISC_X64)/$(SHL1TARGET_X64).direct >>$@.tmpfile
 .ENDIF			# "$(SHL1USE_EXPORTS_X64)"!="name"
 .ENDIF			# "$(SHL1USE_EXPORTS)"==""
 .ENDIF				# "$(DEFLIB1NAME)"!=""
@@ -184,16 +184,16 @@ $(DEF2TARGETN_X64) : \
     @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(DEFLIB2NAME_X64)"!=""
 .IF "$(SHL2USE_EXPORTS_X64)"==""
-    @-$(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)$/$(SHL2TARGET_X64).exp
-    @$(EXPORT2_PROTECT) $(LIBMGR_X64) -EXTRACT:/ /OUT:$(MISC_X64)$/$(SHL2TARGET_X64).exp $(SLB_X64)$/$(DEFLIB2NAME_X64).lib
-    @$(EXPORT2_PROTECT) $(LDUMP2) -E 20 -F $(MISC_X64)$/$(SHL2TARGET_X64).flt $(MISC_X64)$/$(SHL2TARGET_X64).exp			   >>$@.tmpfile
-    $(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)$/$(SHL2TARGET_X64).exp
+    @-$(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL2TARGET_X64).exp
+    @$(EXPORT2_PROTECT) $(LIBMGR_X64) -EXTRACT:/ /OUT:$(MISC_X64)/$(SHL2TARGET_X64).exp $(SLB_X64)/$(DEFLIB2NAME_X64).lib
+    @$(EXPORT2_PROTECT) $(LDUMP2) -E 20 -F $(MISC_X64)/$(SHL2TARGET_X64).flt $(MISC_X64)/$(SHL2TARGET_X64).exp			   >>$@.tmpfile
+    $(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL2TARGET_X64).exp
 .ELSE			# "$(SHL2USE_EXPORTS_X64)"==""
-    @$(EXPORT2_PROTECT) $(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB2NAME_X64) $(SLB_X64)$/$(i).lib) | $(GREP) EXPORT: > $(MISC_X64)$/$(SHL2TARGET_X64).direct
+    @$(EXPORT2_PROTECT) $(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB2NAME_X64) $(SLB_X64)/$(i).lib) | $(GREP) EXPORT: > $(MISC_X64)/$(SHL2TARGET_X64).direct
 .IF "$(SHL2USE_EXPORTS_X64)"!="name"
-    @$(EXPORT2_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF2FILTER_X64) $(MISC_X64)$/$(SHL2TARGET_X64).direct >>$@.tmpfile
+    @$(EXPORT2_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF2FILTER_X64) $(MISC_X64)/$(SHL2TARGET_X64).direct >>$@.tmpfile
 .ELSE			# "$(SHL2USE_EXPORTS_X64)"!="name"
-    @$(EXPORT2_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF2FILTER_X64) $(MISC_X64)$/$(SHL2TARGET_X64).direct >>$@.tmpfile
+    @$(EXPORT2_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF2FILTER_X64) $(MISC_X64)/$(SHL2TARGET_X64).direct >>$@.tmpfile
 .ENDIF			# "$(SHL2USE_EXPORTS_X64)"!="name"
 .ENDIF			# "$(SHL2USE_EXPORTS)"==""
 .ENDIF				# "$(DEFLIB1NAME)"!=""
@@ -213,28 +213,28 @@ $(DEF2TARGETN_X64) : \
 .IF "$(SHL1TARGET_X64)"!=""
 .IF "$(VERSIONOBJ_X64)"!=""
 SHL1VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET_X64))}$(VERSIONOBJ_X64:f)
-USE_VERSIONH_X64:=$(INCCOM)$/$(SHL1VERSIONOBJ_X64:b).h
+USE_VERSIONH_X64:=$(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h
 SHL1VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET_X64))}$(VERSIONOBJ_X64:f)
-$(MISC_X64)$/$(SHL1VERSIONOBJ_X64:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL1VERSIONOBJ_X64:b).h
-    $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ_X64:b).h/ > $@
+$(MISC_X64)/$(SHL1VERSIONOBJ_X64:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ_X64:b).h/ > $@
 .INIT : $(SHL1VERSIONOBJDEP_X64)
 .ENDIF
 
 .IF "$(USE_DEFFILE_X64)"==""
-USE_1IMPLIB_DEPS_X64=$(LB_X64)$/$(SHL1IMPLIB_X64).lib
+USE_1IMPLIB_DEPS_X64=$(LB_X64)/$(SHL1IMPLIB_X64).lib
 .ENDIF			# "$(USE_DEFFILE_X64)"==""
 
 .IF "$(SHL1RES_X64)"!=""
 SHL1ALLRES_X64+=$(SHL1RES_X64)
-SHL1LINKRES_X64*=$(MISC_X64)$/$(SHL1TARGET_X64).res
-SHL1LINKRESO_X64*=$(MISC_X64)$/$(SHL1TARGET_X64)_res.o
+SHL1LINKRES_X64*=$(MISC_X64)/$(SHL1TARGET_X64).res
+SHL1LINKRESO_X64*=$(MISC_X64)/$(SHL1TARGET_X64)_res.o
 .ENDIF			# "$(SHL1RES_X64)"!=""
 
 .IF "$(SHL1DEFAULTRES_X64)$(use_shl_versions)"!=""
-SHL1DEFAULTRES_X64*=$(MISC_X64)$/$(SHL1TARGET_X64)_def.res
+SHL1DEFAULTRES_X64*=$(MISC_X64)/$(SHL1TARGET_X64)_def.res
 SHL1ALLRES_X64+=$(SHL1DEFAULTRES_X64)
-SHL1LINKRES_X64*=$(MISC_X64)$/$(SHL1TARGET_X64).res
-SHL1LINKRESO_X64*=$(MISC_X64)$/$(SHL1TARGET_X64)_res.o
+SHL1LINKRES_X64*=$(MISC_X64)/$(SHL1TARGET_X64).res
+SHL1LINKRESO_X64*=$(MISC_X64)/$(SHL1TARGET_X64)_res.o
 .ENDIF			# "$(SHL1DEFAULTRES)$(use_shl_versions)"!=""
 .ENDIF # "$(SHL1TARGET_X64)"=!""
 
@@ -252,28 +252,24 @@ $(SHL1TARGETN_X64) : \
     @echo ------------------------------
     @echo Making: $(SHL1TARGETN_X64)
 .IF "$(SHL1DEFAULTRES_X64)"!=""
-    @@-$(RM) $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc
+    @@-$(RM) $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL1ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
 .ELSE			# "$(SHL1ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
 .ENDIF			# "$(SHL1ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL1TARGET_X64)$(DLLPOST) >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL1TARGET_X64)$(DLLPOST) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
 .ENDIF # "$(SHL1DEFAULTRES_X64)"!=""
 .IF "$(SHL1ALLRES_X64)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL1ALLRES_X64:s/res /res+/) $(SHL1LINKRES_X64)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL1ALLRES_X64) > $(SHL1LINKRES_X64)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL1ALLRES)"!=""
 .IF "$(USE_DEFFILE_X64)"!=""
     $(LINK_X64) @$(mktmp \
@@ -281,7 +277,7 @@ $(SHL1TARGETN_X64) : \
         $(LINKFLAGSSHL_X64) \
         $(SHL1STACK_X64) $(SHL1BASEX_X64)	\
         -out:$@ \
-        -map:$(MISC_X64)$/$(@:b).map \
+        -map:$(MISC_X64)/$(@:b).map \
         -def:$(SHL1DEF_X64) \
         $(USE_1IMPLIB_X64) \
         $(STDOBJ_X64) \
@@ -295,7 +291,7 @@ $(SHL1TARGETN_X64) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -306,8 +302,8 @@ $(SHL1TARGETN_X64) : \
     $(LINK_X64) @$(mktmp	$(SHL1LINKFLAGS_X64)			\
         $(LINKFLAGSSHL_X64) $(SHL1BASEX_X64)		\
         $(SHL1STACK_X64) -out:$(SHL1TARGETN_X64)	\
-        -map:$(MISC_X64)$/$(@:B).map				\
-        $(LB_X64)$/$(SHL1IMPLIB_X64).exp				\
+        -map:$(MISC_X64)/$(@:B).map				\
+        $(LB_X64)/$(SHL1IMPLIB_X64).exp				\
         $(STDOBJ_X64)							\
         $(SHL1OBJS_X64) $(SHL1VERSIONOBJ_X64) \
         $(SHL1LIBS_X64)                         \
@@ -319,7 +315,7 @@ $(SHL1TARGETN_X64) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -350,10 +346,10 @@ $(SHL1IMPLIBN_X64):	\
 SHL2IMPLIB_X64=i$(TARGET)_t2
 .ENDIF			# "$(SHL2IMPLIB_X64)" == ""
 .IF "$(COM)" != "GCC"
-USE_2IMPLIB_X64=-implib:$(LB_X64)$/$(SHL2IMPLIB_X64).lib
+USE_2IMPLIB_X64=-implib:$(LB_X64)/$(SHL2IMPLIB_X64).lib
 .ENDIF			# "$(COM)" != "GCC"
 .IF "$(SHL2TARGET_X64)"!=""
-SHL2IMPLIBN_X64=$(LB_X64)$/$(SHL2IMPLIB_X64).lib
+SHL2IMPLIBN_X64=$(LB_X64)/$(SHL2IMPLIB_X64).lib
 .ENDIF # "$(SLOFILES_X64)$(OBJFILES_X64)"!=""
 
 .IF "$(LIBTARGET)" == ""
@@ -363,28 +359,28 @@ ALLTAR : $(SHL2IMPLIBN_X64)
 .IF "$(SHL2TARGET_X64)"!=""
 .IF "$(VERSIONOBJ_X64)"!=""
 SHL2VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET_X64))}$(VERSIONOBJ_X64:f)
-USE_VERSIONH_X64:=$(INCCOM)$/$(SHL2VERSIONOBJ_X64:b).h
+USE_VERSIONH_X64:=$(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h
 SHL2VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET_X64))}$(VERSIONOBJ_X64:f)
-$(MISC_X64)$/$(SHL2VERSIONOBJ_X64:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL2VERSIONOBJ_X64:b).h
-    $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ_X64:b).h/ > $@
+$(MISC_X64)/$(SHL2VERSIONOBJ_X64:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h
+    $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ_X64:b).h/ > $@
 .INIT : $(SHL2VERSIONOBJDEP_X64)
 .ENDIF
 
 .IF "$(USE_DEFFILE_X64)"==""
-USE_2IMPLIB_DEPS_X64=$(LB_X64)$/$(SHL2IMPLIB_X64).lib
+USE_2IMPLIB_DEPS_X64=$(LB_X64)/$(SHL2IMPLIB_X64).lib
 .ENDIF			# "$(USE_DEFFILE_X64)"==""
 
 .IF "$(SHL2RES_X64)"!=""
 SHL2ALLRES_X64+=$(SHL2RES_X64)
-SHL2LINKRES_X64*=$(MISC_X64)$/$(SHL2TARGET_X64).res
-SHL2LINKRESO_X64*=$(MISC_X64)$/$(SHL2TARGET_X64)_res.o
+SHL2LINKRES_X64*=$(MISC_X64)/$(SHL2TARGET_X64).res
+SHL2LINKRESO_X64*=$(MISC_X64)/$(SHL2TARGET_X64)_res.o
 .ENDIF			# "$(SHL2RES_X64)"!=""
 
 .IF "$(SHL2DEFAULTRES_X64)$(use_shl_versions)"!=""
-SHL2DEFAULTRES_X64*=$(MISC_X64)$/$(SHL2TARGET_X64)_def.res
+SHL2DEFAULTRES_X64*=$(MISC_X64)/$(SHL2TARGET_X64)_def.res
 SHL2ALLRES_X64+=$(SHL2DEFAULTRES_X64)
-SHL2LINKRES_X64*=$(MISC_X64)$/$(SHL2TARGET_X64).res
-SHL2LINKRESO_X64*=$(MISC_X64)$/$(SHL2TARGET_X64)_res.o
+SHL2LINKRES_X64*=$(MISC_X64)/$(SHL2TARGET_X64).res
+SHL2LINKRESO_X64*=$(MISC_X64)/$(SHL2TARGET_X64)_res.o
 .ENDIF			# "$(SHL2DEFAULTRES)$(use_shl_versions)"!=""
 .ENDIF # "$(SHL2TARGET_X64)"=!""
 
@@ -402,28 +398,24 @@ $(SHL2TARGETN_X64) : \
     @echo ------------------------------
     @echo Making: $(SHL2TARGETN_X64)
 .IF "$(SHL2DEFAULTRES_X64)"!=""
-    @@-$(RM) $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc
+    @@-$(RM) $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
 .IF "$(use_shl_versions)" != ""
 .IF "$(SHL2ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
 .ELSE			# "$(SHL2ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
 .ENDIF			# "$(SHL1ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL2TARGET_X64)$(DLLPOST) >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define ORG_NAME	$(SHL2TARGET_X64)$(DLLPOST) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
+    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
-    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc
+    $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
 .ENDIF # "$(SHL2DEFAULTRES_X64)"!=""
 .IF "$(SHL2ALLRES_X64)"!=""
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /b $(SHL2ALLRES_X64:s/res /res+/) $(SHL2LINKRES_X64)
-.ELSE			# "$(USE_SHELL)"=="4nt"
     $(TYPE) $(SHL2ALLRES_X64) > $(SHL2LINKRES_X64)
-.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(SHL2ALLRES)"!=""
 .IF "$(USE_DEFFILE_X64)"!=""
     $(LINK_X64) @$(mktmp \
@@ -431,7 +423,7 @@ $(SHL2TARGETN_X64) : \
         $(LINKFLAGSSHL_X64) \
         $(SHL2STACK_X64) $(SHL2BASEX_X64)	\
         -out:$@ \
-        -map:$(MISC_X64)$/$(@:b).map \
+        -map:$(MISC_X64)/$(@:b).map \
         -def:$(SHL2DEF_X64) \
         $(USE_2IMPLIB_X64) \
         $(STDOBJ_X64) \
@@ -445,7 +437,7 @@ $(SHL2TARGETN_X64) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -456,8 +448,8 @@ $(SHL2TARGETN_X64) : \
     $(LINK_X64) @$(mktmp	$(SHL2LINKFLAGS_X64)			\
         $(LINKFLAGSSHL_X64) $(SHL2BASEX_X64)		\
         $(SHL2STACK_X64) -out:$(SHL2TARGETN_X64)	\
-        -map:$(MISC_X64)$/$(@:B).map				\
-        $(LB_X64)$/$(SHL2IMPLIB_X64).exp				\
+        -map:$(MISC_X64)/$(@:B).map				\
+        $(LB_X64)/$(SHL2IMPLIB_X64).exp				\
         $(STDOBJ_X64)							\
         $(SHL2OBJS_X64) $(SHL2VERSIONOBJ_X64) \
         $(SHL2LIBS_X64)                         \
@@ -469,7 +461,7 @@ $(SHL2TARGETN_X64) : \
     @@$(LS) $@
     @echo linking $@.manifest ...
 .IF "$(VISTA_MANIFEST)"!=""
-    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
+    $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
 .ELSE
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
@@ -498,28 +490,28 @@ $(SHL2IMPLIBN_X64):	\
 
 
 
-$(SLO_X64)$/%.obj : %.cxx
+$(SLO_X64)/%.obj : %.cxx
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $@ >& $(NULLDEV)
     -$(MKDIR) $(@:d)
-    $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT)
+    $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
 
-$(SLO_X64)$/%.obj : $(MISC)$/%.c
+$(SLO_X64)/%.obj : $(MISC)/%.c
     @echo ------------------------------
     @echo Making: $@
     -$(MKDIR) $(@:d)
     @@-$(RM) $@
-    @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $(MISC)$/$*.c )
+    @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c )
     @$(ECHONL)
-    $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $(MISC)$/$*.c )
+    $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c )
 
-$(SLO_X64)$/%.obj : %.c
+$(SLO_X64)/%.obj : %.c
     @echo ------------------------------
     @echo Making: $@
     -$(MKDIR) $(@:d)
     @@-$(RM) $@
-    $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $*.c )
+    $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $*.c )
 
 .ENDIF			# "$(BUILD_X64)"!=""
 
diff --git a/solenv/inc/tg_yxx.mk b/solenv/inc/tg_yxx.mk
index 2c891e17b..a214ef86c 100644
--- a/solenv/inc/tg_yxx.mk
+++ b/solenv/inc/tg_yxx.mk
@@ -30,37 +30,25 @@
 #*************************************************************************
 
 
-$(MISC)$/%.cxx : %.y
-.IF "$(QUIET_BUILD)"==""
+$(MISC)/%.cxx : %.y
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt"
-    tr -d "\015" < $< > $(MISC)$/stripped_$<
-.ELSE
-    cat $< > $(MISC)$/stripped_$<
-.ENDIF
-    $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)$/stripped_$<
+    @echo Making: $@
+    tr -d "\015" < $< > $(MISC)/stripped_$<
+    $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)/stripped_$<
 # removing -f switch - avoid getting nothing when copying a file to itself
-    @@-$(COPY:s/-f//) $@.h $(INCCOM)$/$(@:b).hxx
-    @@-$(COPY:s/-f//) $(@:d)$/$(@:b).hxx $(INCCOM)$/$(@:b).hxx
+    @@-$(COPY:s/-f//) $@.h $(INCCOM)/$(@:b).hxx
+    @@-$(COPY:s/-f//) $(@:d)/$(@:b).hxx $(INCCOM)/$(@:b).hxx
 # fail on not existing .hxx
-    $(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV)
+    $(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV)
 
-$(INCCOM)$/yy%.cxx : %.y
-.IF "$(QUIET_BUILD)"==""
+$(INCCOM)/yy%.cxx : %.y
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt"
-    tr -d "\015" < $< > $(MISC)$/stripped_$<
-.ELSE
-    cat $< > $(MISC)$/stripped_$<
-.ENDIF
-    $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)$/stripped_$<
+    @echo Making: $@
+    tr -d "\015" < $< > $(MISC)/stripped_$<
+    $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)/stripped_$<
 # removing -f switch - avoid getting nothing when copying a file to itself
-    @@-$(COPY:s/-f//) $@.h $(INCCOM)$/$(@:b).hxx
-    @@-$(COPY:s/-f//) $(@:d)$/$(@:b).hxx $(INCCOM)$/$(@:b).hxx
+    @@-$(COPY:s/-f//) $@.h $(INCCOM)/$(@:b).hxx
+    @@-$(COPY:s/-f//) $(@:d)/$(@:b).hxx $(INCCOM)/$(@:b).hxx
 # fail on not existing .hxx
-    $(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV)
+    $(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV)
 
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
index 395a95a01..8ac7bb107 100644
--- a/solenv/inc/tg_zip.mk
+++ b/solenv/inc/tg_zip.mk
@@ -49,18 +49,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 ZIP$(TNR)EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)LIST:s/LANGDIR//)" == "$(ZIP$(TNR)LIST)"
-ZIP$(TNR)TARGETN=$(COMMONBIN)$/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT)
+ZIP$(TNR)TARGETN=$(COMMONBIN)/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT)
 .ELSE
-ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(COMMONBIN)$/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) )
+ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(COMMONBIN)/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) )
 .ENDIF
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)LIST:s/LANGDIR//)" == "$(ZIP$(TNR)LIST)"
-ZIP$(TNR)TARGETN=$(BIN)$/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT)
+ZIP$(TNR)TARGETN=$(BIN)/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT)
 .ELSE
-ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(BIN)$/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) )
+ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(BIN)/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) )
 .ENDIF
 .ENDIF			# "$(common_build_zip)"!=""
-ZIP$(TNR)DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP$(TNR)TARGETN:s/$(ZIP$(TNR)EXT)/.dpzz/)))
+ZIP$(TNR)DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP$(TNR)TARGETN:s/$(ZIP$(TNR)EXT)/.dpzz/)))
 ZIPDEPFILES+=$(ZIP$(TNR)DEPFILE)
 
 ZIP$(TNR)DIR*=$(ZIPDIR)
@@ -68,11 +68,7 @@ ZIP$(TNR)FLAGS*=$(ZIPFLAGS)
 .IF "$(zip$(TNR)generatedlangs)"!=""
 zip$(TNR)langdirs*=$(alllangiso)
 .ELSE           # "$(zip$(TNR)generatedlangs)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip$(TNR)langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE			# "$(GUI)"=="UNX"
-zip$(TNR)langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP$(TNR)DIR))} /ba:d )))
-.ENDIF			# "$(GUI)"=="UNX"
+zip$(TNR)langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ENDIF          # "$(zip$(TNR)generatedlangs)"!=""
 .IF "$(ZIP$(TNR)FORCEALLLANG)"!=""
 zip$(TNR)alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip$(TNR)langdirs) $(eq,$i,$j  $i $(NULL))))
@@ -85,65 +81,59 @@ zip$(TNR)alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip$(TNR)langdirs)
 
 ZIP$(TNR)TMP:=$(mktmp iii)
 
-$(MISC)$/$(TARGET).$(PWD:f).$(ZIP$(TNR)TARGET).dpzz : $(ZIP$(TNR)TARGETN)
+$(MISC)/$(TARGET).$(PWD:f).$(ZIP$(TNR)TARGET).dpzz : $(ZIP$(TNR)TARGETN)
 
 .IF "$(common_build_zip)"!=""
-ZIP$(TNR)HELPVAR=$(COMMONBIN)$/$(ZIP$(TNR)TARGET)
+ZIP$(TNR)HELPVAR=$(COMMONBIN)/$(ZIP$(TNR)TARGET)
 .ELSE			# "$(common_build_zip)"!=""
-ZIP$(TNR)HELPVAR=$(BIN)$/$(ZIP$(TNR)TARGET)
+ZIP$(TNR)HELPVAR=$(BIN)/$(ZIP$(TNR)TARGET)
 .ENDIF			# "$(common_build_zip)"!=""
 
 $(ZIP$(TNR)DEPFILE) :
-    echo # > $(MISC)$/$(@:f)
+    echo # > $(MISC)/$(@:f)
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)DIR)" != ""
     @echo type 1
     -$(MKDIRHIER) $(ZIP$(TNR)DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP$(TNR)DIR)" != ""
     @echo type 2
-    -$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP$(TNR)DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)DIR)" != ""
     @echo type 3
     -$(MKDIRHIER) $(ZIP$(TNR)DIR)
-    $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f)
+    $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE			# "$(ZIP$(TNR)DIR)" != ""
     @echo type 4
-    -$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f)
+    -$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
 .ENDIF			# "$(ZIP$(TNR)DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f)
+    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
 
 
 $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS)
-.IF "$(QUIET_BUILD)"==""
     @echo ------------------------------
-.ENDIF
-	@echo "Making:   " $(@:f)
+    @echo Making: $@
     @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
     @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
     @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away$/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@.$(INPATH)
     $(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
 .ELSE			# "$(ZIP$(TNR)DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
     zip $(ZIP$(TNR)FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
     @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
 .ENDIF			# "$(ZIP$(TNR)DIR)" != ""
@@ -153,21 +143,17 @@ $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS)
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)DIR)" != ""
     @@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
-    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away$/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
     $(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)  $@ 
     $(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
 .ELSE			# "$(ZIP$(TNR)DIR)" != ""
-    zip $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
+    zip $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
     $(IFEXIST) $@ $(THEN) \
-    $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \
+    $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
     $(FI)
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(ZIP$(TNR)DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 1a684330a..74bb6f9cb 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -30,29 +30,27 @@
 #*************************************************************************
 
 # Common tools - move this to the end / consolidate
-TRANSEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/transex3
-ULFEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/ulfex
-XMLEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xmlex
-XRMEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xrmex
-CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cfgex
-AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/autodoc
-LOCALIZE_SL*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/localize_sl
-GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/gsicheck
+TRANSEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/transex3
+ULFEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfex
+XMLEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xmlex
+XRMEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xrmex
+CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cfgex
+AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc
+LOCALIZE_SL*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/localize_sl
+GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gsicheck
 
 .IF "$(SYSTEM_LIBXSLT)"!="YES"
-XSLTPROC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xsltproc
+XSLTPROC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xsltproc
 .ELSE			# "$(SYSTEM_LIBXSLT)"!="YES"
 XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc
 .ENDIF			# "$(SYSTEM_LIBXSLT)"!="YES"
 
-ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/ulfconv
+ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv
 
-MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/makedepend
+MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/makedepend
 
 SCP_CHECK_TOOL:=checkscp$E
 
-# Not 4nt means $(GUI)==UNX or $(GUI)==WNT with tcsh
-.IF "$(USE_SHELL)"!="4nt"
 # iz32110: Calling a cygwin application from a non-cygwin shell requires
 # backslashes to be escaped by another backslash: EES .. extra escape slash
 EES:=
@@ -89,40 +87,12 @@ CHECKZIPRESULT:=|| ret=$$?; if [[ "$$ret" != "12" && "$$ret" != "1" ]] ; then ex
 CHECKZIPRESULT:=|| if ("$$status" != "12" && "$$status" != "1") exit $$status && echo "Nothing to update for zip"
 .ENDIF
 
-.ELSE # "$(USE_SHELL)"!="4nt"
-# (\\ at line end is \)
-EES:=\\
-
-EMQ:=
-USQ:=
-
-NULLDEV:=nul
-
-# iz29609 helpmacro to check if file exists 4nt style
-IFEXIST:=+if exist
-IFNOTEXIST:=+if not exist
-THEN:=
-FI:=
-PIPEERROR=|&
-
-# iz31658
-CHECKZIPRESULT:=^ iff errorlevel == 12 .and. errorlevel == 12 then ( echo Nothing to update for zip ^ set somedummyvar=%somedummyvar)
-
-# try the same for 4nt "copy /u"
-CHECKCOPYURESULT:=^ iff errorlevel == 2 then ( echo Nothing to update for copy ^ set somedummyvar=%somedummyvar)
-
-# tell makedepend to write windows native format
-#MKDEPFLAGS=-n
-
-.ENDIF # "$(USE_SHELL)"!="4nt"
-
 # Platform specific
 .IF "$(GUI)"=="WNT"
 AWK*=awk
 SORT*=sort
 SED*=sed
 GNUPATCH*=patch
-.IF "$(USE_SHELL)"!="4nt"
 # change drive and directory
 CDD=cd
 # expect cygwin tools to exist
@@ -143,33 +113,6 @@ PERL*:=perl
 RENAME*=mv
 TOUCH*=touch
 TYPE*=cat
-.ELSE			# "$(USE_SHELL)"!="4nt"
-CDD=+cdd
-COPY*=+copy
-COPYRECURSE=/s
-COPYUPDATE=/u
-DELAY*=+delay
-ECHON*=+echos
-ECHONL=+echo.
-FIND*=$(BUILD_TOOLS)$/find.exe
-.IF "$(use_cygcp)"!=""
-GNUCOPY=$(BUILD_TOOLS)$/gnucp.exe
-.ENDIF			# "$(use_cygcp)"!=""
-GNUCOPY*=$(BUILD_TOOLS)$/cp.exe
-GNUMAKE*=$(BUILD_TOOLS)$/gnumake.exe
-GREP*=$(BUILD_TOOLS)$/grep.exe
-LS*=$(BUILD_TOOLS)$/ls.exe
-MKDIRHIER=+mkdir /sn
-#wraper for solenv\bin\mkdir.pl to fix mkdir /p problem
-PERL*:=+call perl5.btm
-.EXPORT : PERL
-RENAME*=+ren
-RMDIR:=$(PERL) $(SOLARENV)$/bin$/rmdir.pl
-TOUCH*=$(PERL) $(SOLARENV)$/bin$/touch.pl
-TYPE*=+type
-XARGS*=tr -d "\015" | xargs
-4nt_force_shell:=+
-.ENDIF  "$(USE_SHELL)"!="4nt"
 DUMPBIN*=dumpbin
 
 .ELIF "$(GUI)"=="UNX"	# "$(GUI)"=="WNT"
@@ -247,10 +190,10 @@ GNUTAR*:=tar
 TAR*:=tar
 
 RM+=$(RMFLAGS)
-ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/adjustvisibility
-CONVERT*:=$(PERL) $(SOLARENV)$/bin$/leconvert.pl
-EXECTEST := $(PERL) -w $(SOLARENV)$/bin$/exectest.pl
-GCCINSTLIB:=$(PERL) -w $(SOLARENV)$/bin$/gccinstlib.pl
+ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility
+CONVERT*:=$(PERL) $(SOLARENV)/bin/leconvert.pl
+EXECTEST := $(PERL) -w $(SOLARENV)/bin/exectest.pl
+GCCINSTLIB:=$(PERL) -w $(SOLARENV)/bin/gccinstlib.pl
 
 # The dmake $(PWD) variable and the tcsh pwd command both apparantly produce
 # paths with symlinks resolved, while the bash pwd command by default produces
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 414b646c0..ff5349f62 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -232,9 +232,9 @@ DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR)
 # enable building/linking KDE-dependent code in both OOo and SO build environment
 .IF "$(ENABLE_KDE)" != ""
 .IF "$(KDE_ROOT)"!=""
-KDE_CFLAGS:=-I$(KDE_ROOT)$/include -DQT_CLEAN_NAMESPACE
+KDE_CFLAGS:=-I$(KDE_ROOT)/include -DQT_CLEAN_NAMESPACE
 KDE_LIBS:=-lkdeui -lkdecore -lqt-mt
-SOLARLIB+=-L$(KDE_ROOT)$/lib
+SOLARLIB+=-L$(KDE_ROOT)/lib
 .ENDIF          # "$(KDE_ROOT)"!=""
 .ENDIF          # "$(ENABLE_KDE)" != ""
 
diff --git a/solenv/inc/unxbsdi.mk b/solenv/inc/unxbsdi.mk
index 2b5aa479d..bf7017042 100644
--- a/solenv/inc/unxbsdi.mk
+++ b/solenv/inc/unxbsdi.mk
@@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk
index 0c2dcecf3..b1a91f638 100644
--- a/solenv/inc/unxbsdi2.mk
+++ b/solenv/inc/unxbsdi2.mk
@@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk
index dc472b70e..698764f28 100644
--- a/solenv/inc/unxbsds.mk
+++ b/solenv/inc/unxbsds.mk
@@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DOSL_USE_SYS_V_SEMAPHORE
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index 1f10c38cb..8ae29f83b 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -47,7 +47,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
@@ -72,7 +72,7 @@ CXX*=g++
 # name of C Compiler
 CC*=gcc
 .IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
 CXX+:=$(CFLAGS_SYSBASE)
 CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
@@ -179,7 +179,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk
index 50bf88d6f..4864ff622 100644
--- a/solenv/inc/unxlnga.mk
+++ b/solenv/inc/unxlnga.mk
@@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DIA64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
@@ -67,7 +67,7 @@ CXX*=g++
 # name of C Compiler
 CC*=gcc
 .IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
 CXX+:=$(CFLAGS_SYSBASE)
 CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
@@ -193,7 +193,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxlngi4.mk b/solenv/inc/unxlngi4.mk
index 16fd30186..f6c9a3799 100644
--- a/solenv/inc/unxlngi4.mk
+++ b/solenv/inc/unxlngi4.mk
@@ -37,7 +37,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
@@ -170,7 +170,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxlngi6.mk b/solenv/inc/unxlngi6.mk
index 5a58db613..6b292535e 100644
--- a/solenv/inc/unxlngi6.mk
+++ b/solenv/inc/unxlngi6.mk
@@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
@@ -67,7 +67,7 @@ CXX*=g++
 # name of C Compiler
 CC*=gcc
 .IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
 CXX+:=$(CFLAGS_SYSBASE)
 CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
@@ -96,8 +96,8 @@ CFLAGSCXX += -fvisibility-inlines-hidden
 .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 
 CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
+CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
 
 # Compiler flags for compiling static object in multi threaded environment with graphical user interface
 CFLAGSOBJGUIMT=
@@ -191,7 +191,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
index 5b1ee84bb..9b0e9d743 100644
--- a/solenv/inc/unxlngm68k.mk
+++ b/solenv/inc/unxlngm68k.mk
@@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DM68K -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
@@ -67,7 +67,7 @@ CXX*=g++
 # name of C Compiler
 CC*=gcc
 .IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
 CXX+:=$(CFLAGS_SYSBASE)
 CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
@@ -172,7 +172,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
index 4b5c2aab9..41e227f6c 100644
--- a/solenv/inc/unxlngmips.mk
+++ b/solenv/inc/unxlngmips.mk
@@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DMIPS -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
@@ -67,7 +67,7 @@ CXX*=g++
 # name of C Compiler
 CC*=gcc
 .IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
 CXX+:=$(CFLAGS_SYSBASE)
 CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
@@ -204,7 +204,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxlngp.mk b/solenv/inc/unxlngp.mk
index 24bcea364..67f29819e 100644
--- a/solenv/inc/unxlngp.mk
+++ b/solenv/inc/unxlngp.mk
@@ -64,7 +64,7 @@ CFLAGSCXX= -pipe -fguiding-decls -fno-rtti -fno-exceptions $(ARCH_FLAGS)
 CFLAGSCXX += -fexceptions
 .ENDIF
 PICSWITCH:=-fPIC
-#STDOBJVCL=$(L)$/salmain.o
+#STDOBJVCL=$(L)/salmain.o
 CFLAGSOBJGUIMT=
 CFLAGSOBJCUIMT=
 CFLAGSSLOGUIMT=$(PICSWITCH)
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
index 122a61743..00c37abc2 100644
--- a/solenv/inc/unxlngppc.mk
+++ b/solenv/inc/unxlngppc.mk
@@ -39,7 +39,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl 
 CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DPOWERPC -DPPC 
diff --git a/solenv/inc/unxlngppc4.mk b/solenv/inc/unxlngppc4.mk
index 3667d6d24..c63937701 100644
--- a/solenv/inc/unxlngppc4.mk
+++ b/solenv/inc/unxlngppc4.mk
@@ -37,7 +37,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DPOWERPC -DPPC
@@ -171,7 +171,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index 5545800e5..ed4048748 100644
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -40,7 +40,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DARM32 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
@@ -69,7 +69,7 @@ CXX*=g++
 # name of C Compiler
 CC*=gcc
 .IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
 CXX+:=$(CFLAGS_SYSBASE)
 CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
@@ -173,7 +173,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
index 268d54618..5c787bba2 100644
--- a/solenv/inc/unxlngs.mk
+++ b/solenv/inc/unxlngs.mk
@@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DSPARC -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
@@ -173,7 +173,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxlngs3904.mk b/solenv/inc/unxlngs3904.mk
index 84fa63eb8..323182ffd 100644
--- a/solenv/inc/unxlngs3904.mk
+++ b/solenv/inc/unxlngs3904.mk
@@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DS390 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
@@ -67,7 +67,7 @@ CXX*=g++
 # name of C Compiler
 CC*=gcc
 .IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
 CXX+:=$(CFLAGS_SYSBASE)
 CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
@@ -171,7 +171,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxlngx6.mk b/solenv/inc/unxlngx6.mk
index a43738be4..be8819a35 100644
--- a/solenv/inc/unxlngx6.mk
+++ b/solenv/inc/unxlngx6.mk
@@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
 #not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
 CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86_64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
@@ -67,7 +67,7 @@ CXX*=g++
 # name of C Compiler
 CC*=gcc
 .IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
 CXX+:=$(CFLAGS_SYSBASE)
 CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
@@ -195,7 +195,7 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxlnxi.mk b/solenv/inc/unxlnxi.mk
index a8f6d0f6f..07b136fde 100644
--- a/solenv/inc/unxlnxi.mk
+++ b/solenv/inc/unxlnxi.mk
@@ -62,7 +62,7 @@ CFLAGS=-c -I. -I/usr/solar/inc/pthread_provenzano -I$(INC) -I$(INCLOCAL) -I$(INC
 CFLAGSCC=-pipe -fguiding-decls $(ARCH_FLAGS)
 CFLAGSCXX=-pipe -fguiding-decls $(ARCH_FLAGS)
 PICSWITCH:=-fpic
-#STDOBJVCL=$(L)$/salmain.o
+#STDOBJVCL=$(L)/salmain.o
 CFLAGSOBJGUIMT=
 CFLAGSOBJCUIMT=
 CFLAGSSLOGUIMT=$(PICSWITCH)
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index eb7e061bb..c13b06511 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -133,8 +133,8 @@ CFLAGSOUTOBJ=-o
 
 # Flags to enable precompiled headers
 CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
+CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
 
 # ---------------------------------
 #  Optimization flags
@@ -172,7 +172,7 @@ LIBSTLPORT=-lstlportstlg
 LIBSTLPORTST=$(STATIC) -lstlportstlg
 .ELSE
 LIBSTLPORT=-lstlport_gcc_stldebug
-LIBSTLPORTST=$(SOLARVERSION)$/$(INPATH)$/lib$/libstlport_gcc_stldebug.a
+LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc_stldebug.a
 .ENDIF
 .ELSE # "$(USE_STLP_DEBUG" != ""
 .IF "$(STLPORT_VER)" >= "500"
@@ -180,7 +180,7 @@ LIBSTLPORT=-lstlport
 LIBSTLPORTST=$(STATIC) -lstlport
 .ELSE
 LIBSTLPORT=-lstlport_gcc
-LIBSTLPORTST=$(SOLARVERSION)$/$(INPATH)$/lib$/libstlport_gcc.a
+LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc.a
 .ENDIF
 .ENDIF # "$(USE_STLP_DEBUG" != ""
 
@@ -197,9 +197,9 @@ LINKC*=$(CC)
 LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
 # Very long install_names are needed so that install_name_tool -change later on
 # does not complain that "larger updated load commands do not fit:"
-LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB$/$(@:f)'
+LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)'
 LINKFLAGSRUNPATH_UREBIN=
-LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO$/$(@:f)'
+LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO/$(@:f)'
 LINKFLAGSRUNPATH_SDK=
 LINKFLAGSRUNPATH_BRAND=
 LINKFLAGSRUNPATH_OXT=
@@ -215,7 +215,7 @@ LINKFLAGS += -Wl,--as-needed
     LINKFLAGS+=-lobjc
     # Sometimes we still use files that would be in a GUIBASE="unx" specific directory
     # because they really aren't GUIBASE specific, so we've got to account for that here.
-    INCGUI+= -I$(PRJ)$/unx/inc
+    INCGUI+= -I$(PRJ)/unx/inc
 .ENDIF
 
 #special settings form environment
@@ -253,7 +253,7 @@ SONAME_SWITCH=-Wl,-h
 
 STDLIBCPP=-lstdc++
 
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk
index aeb09d32a..e291012cd 100644
--- a/solenv/inc/unxsogi.mk
+++ b/solenv/inc/unxsogi.mk
@@ -106,7 +106,7 @@ CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
 
 STDLIBCPP=-lstdc++
 
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index d8101a006..6b052c33f 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -101,7 +101,7 @@ CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
 
 STDLIBCPP=-lstdc++
 
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index 7f938d480..d15177e7d 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -114,7 +114,7 @@ CFLAGSWERRCXX=-xwe
 MODULES_WITH_WARNINGS := \
     soldep
 
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 
 THREADLIB=
 .IF "$(PURIFY)"!=""
@@ -127,7 +127,7 @@ LINKC=$(CC)
 # link against set of baseline libraries
 .IF "$(SYSBASE)"!=""
 C_RESTRICTIONFLAGS*=-xc99=none
-#LD_OPTIONS+:=-L$(SYSBASE)$/usr$/lib
+#LD_OPTIONS+:=-L$(SYSBASE)/usr/lib
 CDEFS+=-DSYSBASE="$(SYSBASE)"
 CFLAGSCC+=$(C_RESTRICTIONFLAGS)
 #.EXPORT : LD_OPTIONS
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 4cb955354..224bad3cd 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -120,7 +120,7 @@ CFLAGSWERRCXX=-xwe
 MODULES_WITH_WARNINGS := \
     soldep
 
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 
 THREADLIB=
 .IF "$(PURIFY)"!=""
@@ -133,7 +133,7 @@ LINKC=$(CC)
 # link against set of baseline libraries
 .IF "$(SYSBASE)"!=""
 C_RESTRICTIONFLAGS*=-xc99=none
-#LD_OPTIONS+:=-L$(SYSBASE)$/usr$/lib
+#LD_OPTIONS+:=-L$(SYSBASE)/usr/lib
 CDEFS+=-DSYSBASE="$(SYSBASE)"
 CFLAGSCC+=$(C_RESTRICTIONFLAGS)
 #.EXPORT : LD_OPTIONS
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index 793835fb1..c769c5566 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -118,7 +118,7 @@ CFLAGSWERRCXX=-xwe
 MODULES_WITH_WARNINGS := \
     soldep
 
-STDOBJVCL=$(L)$/salmain.o
+STDOBJVCL=$(L)/salmain.o
 
 THREADLIB=
 LINK=$(CXX)
@@ -127,7 +127,7 @@ LINKC=$(CC)
 # link against set of baseline libraries
 .IF "$(SYSBASE)"!=""
 C_RESTRICTIONFLAGS*=-xc99=none
-LD_OPTIONS+=-L$(SYSBASE)$/usr$/lib
+LD_OPTIONS+=-L$(SYSBASE)/usr/lib
 CDEFS+=-DSYSBASE="$(SYSBASE)"
 CFLAGSCC+=$(C_RESTRICTIONFLAGS)
 .EXPORT : LD_OPTIONS
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index e4a7fb8f5..b56cfc7c2 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -48,14 +48,10 @@
 .ENDIF
 
 # --- changes for W32-tcsh - should move into settings.mk ---
-.IF "$(USE_SHELL)"!="4nt"
 JAVAC=javac
 JAVA=java
 JAVAI!:=java
 PATH_SEPERATOR*=:
-.ELSE # "$(USE_SHELL)"!="4nt"
-PATH_SEPERATOR*=;
-.ENDIF # "$(USE_SHELL)"!="4nt"
 
 # --- general WNT settings ---
 
diff --git a/solenv/inc/wntgcci6.mk b/solenv/inc/wntgcci6.mk
index 9186ea9cc..a46c9a0a3 100644
--- a/solenv/inc/wntgcci6.mk
+++ b/solenv/inc/wntgcci6.mk
@@ -59,8 +59,8 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
 PICSWITCH:=
 
 CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
+CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
 
 CFLAGSOBJGUIST=
 CFLAGSOBJCUIST=
@@ -116,16 +116,16 @@ LINKC*=$(CC)
 CYGLIB=$(LIB:s/;/ -L/)
 LINKFLAGS=-nostdlib -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc -L$(CYGLIB)
 .IF "$(USE_MINGW)"=="cygwin"
-MINGWLIBDIR=$(COMPATH)$/lib$/mingw
+MINGWLIBDIR=$(COMPATH)/lib/mingw
 .ELSE
-MINGWLIBDIR=$(COMPATH)$/lib
+MINGWLIBDIR=$(COMPATH)/lib
 .ENDIF
-MINGWSSTDOBJ=$(MINGW_CLIB_DIR)$/crtbegin.o
-MINGWSSTDENDOBJ=$(MINGW_CLIB_DIR)$/crtend.o
-LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)$/crt2.o
-LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)$/dllcrt2.o
-LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)$/crt2.o
-LINKFLAGSSHLCUI=--warn-once -mconsole -shared $(MINGWLIBDIR)$/dllcrt2.o
+MINGWSSTDOBJ=$(MINGW_CLIB_DIR)/crtbegin.o
+MINGWSSTDENDOBJ=$(MINGW_CLIB_DIR)/crtend.o
+LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)/crt2.o
+LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)/dllcrt2.o
+LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)/crt2.o
+LINKFLAGSSHLCUI=--warn-once -mconsole -shared $(MINGWLIBDIR)/dllcrt2.o
 LINKFLAGSTACK=
 LINKFLAGSPROF=
 LINKFLAGSDEBUG=-g
@@ -148,7 +148,7 @@ MINGW_LIBGCC=-lgcc_eh -lgcc
 MINGW_LIBGCC=-lgcc
 .ENDIF
 .ENDIF
-STDOBJVCL=$(L)$/salmain.obj
+STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
@@ -194,7 +194,7 @@ SHELL32LIB=-lshell32
 GDI32LIB=-lgdi32
 OLE32LIB=-lole32
 OLEAUT32LIB=-loleaut32
-UUIDLIB=$(PSDK_HOME)$/lib$/uuid.lib
+UUIDLIB=$(PSDK_HOME)/lib/uuid.lib
 WINSPOOLLIB=-lwinspool
 IMM32LIB=-limm32
 VERSIONLIB=-lversion
@@ -207,14 +207,14 @@ USER32LIB=-luser32
 LIBCMT=-lmsvcrt
 COMDLG32LIB=-lcomdlg32
 COMCTL32LIB=-lcomctl32
-CRYPT32LIB=$(PSDK_HOME)$/lib$/crypt32.lib
-GDIPLUSLIB=$(PSDK_HOME)$/lib$/gdiplus.lib
-DBGHELPLIB=$(PSDK_HOME)$/lib$/dbghelp.lib
-MSILIB=$(PSDK_HOME)$/lib$/msi.lib
+CRYPT32LIB=$(PSDK_HOME)/lib/crypt32.lib
+GDIPLUSLIB=$(PSDK_HOME)/lib/gdiplus.lib
+DBGHELPLIB=$(PSDK_HOME)/lib/dbghelp.lib
+MSILIB=$(PSDK_HOME)/lib/msi.lib
 DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib
-SHLWAPILIB=$(PSDK_HOME)$/lib$/shlwapi.lib
-URLMONLIB=$(PSDK_HOME)$/lib$/urlmon.lib
-UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib
+SHLWAPILIB=$(PSDK_HOME)/lib/shlwapi.lib
+URLMONLIB=$(PSDK_HOME)/lib/urlmon.lib
+UNICOWSLIB=$(PSDK_HOME)/lib/unicows.lib
 WININETLIB=-lwininet
 OLDNAMESLIB=-lmoldname
-MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib
+MSIMG32LIB=$(PSDK_HOME)/lib/msimg32.lib
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
index b3a96cc4a..09ec567fb 100644
--- a/solenv/inc/wntmsci10.mk
+++ b/solenv/inc/wntmsci10.mk
@@ -89,7 +89,7 @@ CFLAGS+= -Ob1
 .ENDIF
 
 # flags to enable build with symbols; required for crashdump feature
-#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)$/_ooo_st_$(TARGET).PDB
+#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB
 # full debug for RE builds only due to size concerns
 .IF "$(UPDATER)"!=""
 CFLAGSENABLESYMBOLS=-Z7 -Yd
@@ -120,9 +120,9 @@ RSCDEFS+=-DFULL_DESK
 CFLAGSEXCEPTIONS=-GX
 CFLAGS_NO_EXCEPTIONS=
 
-CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)$/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
+CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
+CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
 .IF "$(CALL_CDECL)"=="TRUE"
 CFLAGSCALL=-Gd
 .ELSE			# "$(CALL_CDECL)"=="TRUE"
@@ -146,7 +146,7 @@ CDEFSSLOMT+=-DWIN32 -D_MT
 CDEFSOBJMT+=-DWIN32 -D_MT
 CDEFSOBJMT+=-DWIN32 -D_MT
 .ENDIF
-CFLAGSPROF=-Gh -Fd$(MISC)$/$(@:b).pdb
+CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb
 CFLAGSDEBUG=-Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB
 CFLAGSDBGUTIL=
 .IF "$(VC_STANDARD)"==""
@@ -272,7 +272,7 @@ LIBCMT=libcmt.lib
 .ENDIF # "$(USE_STLP_DEBUG)" != ""
 .ENDIF			# "$(DYNAMIC_CRT)"!=""
 
-STDOBJVCL=$(L)$/salmain.obj
+STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
@@ -292,8 +292,8 @@ LIBSTLPORT=stlport_vc71.lib
 LIBSTLPORTST=stlport_vc71_static.lib
 .ENDIF
 
-ATL_INCLUDE*=$(COMPATH)$/atlmfc$/include
-ATL_LIB*=$(COMPATH)$/atlmfc$/lib
+ATL_INCLUDE*=$(COMPATH)/atlmfc/include
+ATL_LIB*=$(COMPATH)/atlmfc/lib
 
 LIBMGR=lib $(NOLOGO)
 IMPLIB=lib
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 6eac576a9..ae9e6c542 100644
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -92,7 +92,7 @@ CFLAGS+= -Ob1
 .ENDIF
 
 # flags to enable build with symbols; required for crashdump feature
-#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)$/_ooo_st_$(TARGET).PDB
+#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB
 CFLAGSENABLESYMBOLS=-Z7 -Yd
 
 .IF "$(bndchk)" != ""
@@ -122,9 +122,9 @@ CFLAGS_NO_EXCEPTIONS=
 ENABLE_PCH:=
 .ENDIF "$(debug)"!=""
 
-CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)$/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
+CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
+CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
 .IF "$(CALL_CDECL)"=="TRUE"
 CFLAGSCALL=-Gd
 .ELSE			# "$(CALL_CDECL)"=="TRUE"
@@ -149,8 +149,8 @@ CDEFSOBJMT+=-DWIN32 -D_MT
 CDEFSOBJMT+=-DWIN32 -D_MT
 .ENDIF # "$(DYNAMIC_CRT)"!=""
 
-CFLAGSPROF=-Gh -Fd$(MISC)$/$(@:b).pdb
-CFLAGSDEBUG=-Zi -Fd$(MISC)$/$(@:b).pdb
+CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb
+CFLAGSDEBUG=-Zi -Fd$(MISC)/$(@:b).pdb
 CFLAGSDBGUTIL=
 .IF "$(VC_STANDARD)"==""
 CFLAGSOPT=-Oxs -Oy-
@@ -206,7 +206,6 @@ CFLAGSWERRCC=-WX
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
 # settings.mk):
 MODULES_WITH_WARNINGS := \
-    fpicker \
     soldep
 
 CDEFS+=-DSTLPORT_VERSION=400 -D_MT
@@ -280,7 +279,7 @@ LIBCMT=libcmt.lib
 .ENDIF # "$(USE_STLP_DEBUG)" != ""
 .ENDIF # "$(DYNAMIC_CRT)"!=""
 
-STDOBJVCL=$(L)$/salmain.obj
+STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
@@ -300,15 +299,15 @@ LIBSTLPORTST=stlport_vc71_static.lib
 .ENDIF
 
 .IF "$(PROF_EDITION)" == ""
-ATL_INCLUDE*=$(COMPATH)$/PlatformSDK$/include$/atl
-ATL_LIB*=$(COMPATH)$/atlmfc$/lib
-MFC_INCLUDE*=$(COMPATH)$/PlatformSDK$/include$/mfc
-MFC_LIB*=$(COMPATH)$/atlmfc$/lib
+ATL_INCLUDE*=$(COMPATH)/PlatformSDK/include/atl
+ATL_LIB*=$(COMPATH)/atlmfc/lib
+MFC_INCLUDE*=$(COMPATH)/PlatformSDK/include/mfc
+MFC_LIB*=$(COMPATH)/atlmfc/lib
 .ELSE
-ATL_INCLUDE*=$(COMPATH)$/atlmfc$/include
-ATL_LIB*=$(COMPATH)$/atlmfc$/lib
-MFC_INCLUDE*=$(COMPATH)$/atlmfc$/include
-MFC_LIB*=$(COMPATH)$/atlmfc$/lib
+ATL_INCLUDE*=$(COMPATH)/atlmfc/include
+ATL_LIB*=$(COMPATH)/atlmfc/lib
+MFC_INCLUDE*=$(COMPATH)/atlmfc/include
+MFC_LIB*=$(COMPATH)/atlmfc/lib
 .ENDIF
 
 LIBMGR=lib $(NOLOGO)
diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c
index cb5228fd9..ad94af72b 100644
--- a/soltools/checkdll/checkdll.c
+++ b/soltools/checkdll/checkdll.c
@@ -47,39 +47,33 @@ static const char *psymbol		= "GetVersionInfo";
 
 void usage()
 {
-	fprintf(stderr, "usage: %s [-s] <dllname>\n", pprog_name);
+    fprintf(stderr, "usage: %s <dllname>\n", pprog_name);
     return;
 }
 
 int main(int argc, char *argv[])
 {
     int 	rc;
-    int     silent=0;
     void	*phandle;	
     char 	*(*pfun)(void);
 
-	if ( argc < 2 || argc > 4) {
+    if ( argc < 2 || argc > 3) {
         usage();
         return 1;
     }
 
-    if ( !strcmp(argv[1],"-s") ) {
-        silent = 1;
-        ++argv, --argc;
-    }
-
     if ( (rc = access( argv[1], R_OK )) == -1 ) {
         fprintf(stderr, "%s: ERROR: %s: %s\n",
                 pprog_name, argv[1], strerror(errno));
         return 2;
     }
 
-	if (!silent) printf("Checking DLL %s ...", argv[1]);
+    printf("Checking DLL %s ...", argv[1]);
     fflush(stdout);
 
     if ( (phandle = dlopen(argv[1], RTLD_NOW)) != NULL ) {
         if  ( (pfun = (char *(*)(void))dlsym(phandle, psymbol)) != NULL ) {
-			if (!silent) printf(": ok\n");
+            printf(": ok\n");
         }
         else
         {
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index a38aa7689..a03628bfb 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -297,7 +297,7 @@ struct FileHandle
         if (result == osl_File_E_EXIST)
         {
             // Already existing (O_CREAT | O_EXCL).
-            result = osl_openFile (aFileUrl.pData, &m_handle, osl_File_OpenFlag_Write);
+            result = osl_openFile (aFileUrl.pData, &m_handle, osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
             if ((result == osl_File_E_None) && (eAccessMode == store_AccessCreate))
             {
                 // Truncate existing file.
diff --git a/store/workben/makefile.mk b/store/workben/makefile.mk
index 334585710..4b58d2640 100644
--- a/store/workben/makefile.mk
+++ b/store/workben/makefile.mk
@@ -93,11 +93,12 @@ APP3STDLIBS=	$(STOREDBGLIB)
 APP3STDLIBS+=	$(SALLIB)
 APP3DEPN=	$(STOREDBGLIB)
 
- APP4TARGET=		t_store
- APP4OBJS=		$(OBJ)$/t_store.obj
- APP4STDLIBS=	$(STORELIB)
- APP4STDLIBS+=	$(SALLIB)
- APP4DEPN=	$(SLB)$/store.lib
+APP4TARGET=		t_store
+APP4OBJS=		$(OBJ)$/t_store.obj
+APP4STDLIBS=	$(STORELIB)
+APP4STDLIBS+=	$(SALLIB)
+APP4DEPN=	$(SLB)$/store.lib
+APP4RPATH=	UREBIN
 
  APP5TARGET=		t_leak
  APP5OBJS=		$(OBJ)$/t_leak.obj
diff --git a/svtools/inc/docmspasswdrequest.hxx b/svtools/inc/docmspasswdrequest.hxx
deleted file mode 100644
index 7cd0b178f..000000000
--- a/svtools/inc/docmspasswdrequest.hxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright IBM Corporation 2009.
- * Copyright 2009 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: docmspasswdrequest.hxx,v $
- * $Revision: 1.0 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_SVTOOLS_DOCMSPASSWDREQUEST_HXX
-#define INCLUDED_SVTOOLS_DOCMSPASSWDREQUEST_HXX
-
-#include "svtools/svldllapi.h"
-#include <com/sun/star/task/DocumentMSPasswordRequest.hpp>
-#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
-
-class MSAbortContinuation;
-class MSPasswordContinuation;
-
-class SVL_DLLPUBLIC RequestMSDocumentPassword : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
-{
-    ::com::sun::star::uno::Any m_aRequest;
-        
-    ::com::sun::star::uno::Sequence< 
-                    ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > 
-                > m_lContinuations;
-        
-    MSAbortContinuation*	    m_pAbort;
-    MSPasswordContinuation*	m_pPassword;
-
-public:
-    RequestMSDocumentPassword( ::com::sun::star::task::PasswordRequestMode nMode, ::rtl::OUString aName );
-    
-    sal_Bool isAbort();
-    sal_Bool isPassword();
-        
-    ::rtl::OUString getPassword();
-        
-    virtual ::com::sun::star::uno::Any SAL_CALL getRequest() 
-        throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual ::com::sun::star::uno::Sequence< 
-                ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > 
-            > SAL_CALL getContinuations() 
-        throw( ::com::sun::star::uno::RuntimeException );
-};  
-
-#endif /* INCLUDED_SVTOOLS_DOCMSPASSWDREQUEST_HXX */
diff --git a/svtools/inc/docpasswdrequest.hxx b/svtools/inc/docpasswdrequest.hxx
deleted file mode 100644
index 4fa135ae6..000000000
--- a/svtools/inc/docpasswdrequest.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: docpasswdrequest.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_SVTOOLS_DOCPASSWDREQUEST_HXX
-#define INCLUDED_SVTOOLS_DOCPASSWDREQUEST_HXX
-
-#include "svtools/svldllapi.h"
-#include <com/sun/star/task/DocumentPasswordRequest.hpp>
-#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
-
-class AbortContinuation;
-class PasswordContinuation;
-
-class SVL_DLLPUBLIC RequestDocumentPassword : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
-{
-    ::com::sun::star::uno::Any m_aRequest;
-        
-    ::com::sun::star::uno::Sequence< 
-                    ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > 
-                > m_lContinuations;
-        
-    AbortContinuation*	    m_pAbort;
-    PasswordContinuation*	m_pPassword;
-
-public:
-    RequestDocumentPassword( ::com::sun::star::task::PasswordRequestMode nMode, ::rtl::OUString aName );
-    
-    sal_Bool isAbort();
-    sal_Bool isPassword();
-        
-    ::rtl::OUString getPassword();
-        
-    virtual ::com::sun::star::uno::Any SAL_CALL getRequest() 
-        throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual ::com::sun::star::uno::Sequence< 
-                ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > 
-            > SAL_CALL getContinuations() 
-        throw( ::com::sun::star::uno::RuntimeException );
-};  
-
-#endif /* INCLUDED_SVTOOLS_DOCPASSWDREQUEST_HXX */
diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx
index e6137db50..40b89a2d6 100644
--- a/svtools/inc/svtools/filter.hxx
+++ b/svtools/inc/svtools/filter.hxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
+struct WMF_APMFILEHEADER;
 // -----------------------
 // - GraphicFilter-Types -
 // -----------------------
@@ -392,13 +393,15 @@ public:
     USHORT          ImportGraphic( Graphic& rGraphic, const String& rPath,
                                    SvStream& rStream,
                                    USHORT nFormat = GRFILTER_FORMAT_DONTKNOW,
-                                   USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 );
+								   USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0
+				       , WMF_APMFILEHEADER *pAPMHeader = NULL);
 
     USHORT          ImportGraphic( Graphic& rGraphic, const String& rPath,
                                    SvStream& rStream,
                                    USHORT nFormat,
                                    USHORT * pDeterminedFormat, sal_uInt32 nImportFlags,
-                                   com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData );
+								   com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData
+				       , WMF_APMFILEHEADER *pAPMHeader = NULL);
 
     BOOL            Setup( USHORT nFormat );
 
diff --git a/svtools/inc/svtools/wmf.hxx b/svtools/inc/svtools/wmf.hxx
index 68a4c4f31..d3dc61db2 100644
--- a/svtools/inc/svtools/wmf.hxx
+++ b/svtools/inc/svtools/wmf.hxx
@@ -34,7 +34,30 @@
 #include "svtools/svtdllapi.h"
 #include <svtools/fltcall.hxx>
 
-BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL );
+struct WMF_APMFILEHEADER {
+  sal_uInt32 key;
+  sal_uInt16 hmf;
+  sal_uInt16 left;
+  sal_uInt16 top;
+  sal_uInt16 right;
+  sal_uInt16 bottom;
+  sal_uInt16 inch;
+  sal_uInt32 reserved;
+  sal_uInt16 checksum;
+
+  WMF_APMFILEHEADER() : key(0x9ac6cdd7L),
+		    hmf(0),
+		    left(0),
+		    top(0),
+		    right(0),
+		    bottom(0),
+		    inch(96),
+		    reserved(0),
+		    checksum(0) {
+  }
+};
+
+BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_APMFILEHEADER *pAPMHeader = NULL );
 
 SVT_DLLPUBLIC BOOL ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem );
 
diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/tabbar.hxx
index eed845a28..6e0a51c31 100644
--- a/svtools/inc/tabbar.hxx
+++ b/svtools/inc/tabbar.hxx
@@ -430,6 +430,11 @@ public:
                                 USHORT nPos = TABBAR_APPEND );
     void            RemovePage( USHORT nPageId );
     void            MovePage( USHORT nPageId, USHORT nNewPos );
+
+    Color           GetTabBgColor( USHORT nPageId ) const;
+    void            SetTabBgColor( USHORT nPageId, const Color& aTabBgColor );
+    BOOL            IsDefaultTabBgColor( USHORT nPageId );
+
     void            Clear();
 
     void            EnablePage( USHORT nPageId, BOOL bEnable = TRUE );
diff --git a/svtools/source/config/fltrcfg.cxx b/svtools/source/config/fltrcfg.cxx
index 09b7a95f7..529e72bf3 100644
--- a/svtools/source/config/fltrcfg.cxx
+++ b/svtools/source/config/fltrcfg.cxx
@@ -312,7 +312,7 @@ const Sequence<OUString>& SvtFilterOptions::GetPropertyNames()
             "Export/EnablePowerPointPreview",	//	8
             "Export/EnableExcelPreview",		//	9
             "Export/EnableWordPreview",			// 10
-            "Import/ImportWWFieldsAsEnhancedFields" // 11
+			"Import/ImportWWFieldsAsEnhancedFields" // 11
         };
         OUString* pNames = aNames.getArray();
         for(int i = 0; i < nCount; i++)
@@ -525,8 +525,7 @@ void SvtFilterOptions::SetWriter2WinWord( BOOL bFlag )
 
 BOOL SvtFilterOptions::IsUseEnhancedFields() const
 {
-    return false; // disable for now;
-//	return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
+    return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
 }
 
 void SvtFilterOptions::SetUseEnhancedFields( BOOL bFlag )
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index ed1abbe53..bfa682501 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -65,6 +65,10 @@ struct ImplTabBarItem
     BOOL            mbShort;
     BOOL            mbSelect;
     BOOL            mbEnable;
+    Color           maTabBgColor;
+    bool            IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO) ? TRUE : FALSE; };
+    Color           maTabTextColor;
+    bool            IsDefaultTabTextColor() const { return maTabTextColor == Color(COL_AUTO) ? TRUE : FALSE; };
 
                     ImplTabBarItem( USHORT nItemId, const XubString& rText,
                                     TabBarPageBits nPageBits ) :
@@ -77,6 +81,8 @@ struct ImplTabBarItem
                         mbShort  = FALSE;
                         mbSelect = FALSE;
                         mbEnable = TRUE;
+                        maTabBgColor = Color( COL_AUTO );
+                        maTabTextColor = Color( COL_AUTO );
                     }
 };
 
@@ -1049,7 +1055,8 @@ void TabBar::Paint( const Rectangle& )
     // Font selektieren
     Font aFont = GetFont();
     Font aLightFont = aFont;
-    aLightFont.SetWeight( WEIGHT_LIGHT );
+    //aLightFont.SetWeight( WEIGHT_LIGHT ); //TODO Make font weight light on custom color only?
+    aLightFont.SetWeight( WEIGHT_NORMAL );
 
     // #i36013# exclude push buttons from painting area
     Rectangle aClipRect( Point( mnOffX, 0 ), Point( mnLastOffX, GetOutputHeightPixel() - 1 ) );
@@ -1123,15 +1130,23 @@ void TabBar::Paint( const Rectangle& )
                     SetFont( aLightFont );
 
                 // Je nach Status die richtige FillInBrush setzen
+                // Set the correct FillInBrush depending upon status
                 if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) )
                 {
+                    // Currently selected Tab
                     SetFillColor( aSelectColor );
                     SetTextColor( aSelectTextColor );
                 }
                 else
                 {
-                    SetFillColor( aFaceColor );
-                    SetTextColor( aFaceTextColor );
+                    if ( !pItem->IsDefaultTabBgColor() )
+                    {
+                        SetFillColor( pItem->maTabBgColor );
+                        SetTextColor( pItem->maTabTextColor );
+                    } else {
+                        SetFillColor( aFaceColor );
+                        SetTextColor( aFaceTextColor );
+                    }
                 }
 
                 // Muss Font Kursiv geschaltet werden
@@ -1163,21 +1178,38 @@ void TabBar::Paint( const Rectangle& )
                 long    nTextHeight = GetTextHeight();
                 Point   aTxtPos( aRect.Left()+(aRectSize.Width()-nTextWidth)/2,
                                  (aRectSize.Height()-nTextHeight)/2 );
-                if ( !pItem->mbEnable )
-                    DrawCtrlText( aTxtPos, aText, 0, STRING_LEN, (TEXT_DRAW_DISABLE | TEXT_DRAW_MNEMONIC) );
-                else
-                    DrawText( aTxtPos, aText );
-
+                if ( pItem->IsDefaultTabBgColor() || (!pItem->mbSelect) )
+                {
+                     if ( !pItem->mbEnable )
+                         DrawCtrlText( aTxtPos, aText, 0, STRING_LEN, (TEXT_DRAW_DISABLE | TEXT_DRAW_MNEMONIC) );
+                    else
+                         DrawText( aTxtPos, aText );
+                }
                 // Jetzt im Inhalt den 3D-Effekt ausgeben
                 aPos0.X()++;
                 aPos1.X()++;
                 aPos2.X()--;
                 aPos3.X()--;
-                SetLineColor( rStyleSettings.GetLightColor() );
+
+                // If this is the current tab, draw the left inner shadow the default color, 
+                // otherwise make it the same as the custom background color
+                if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) {
+                    SetLineColor( rStyleSettings.GetLightColor() );
+                } else {
+                    if ( !pItem->IsDefaultTabBgColor() )
+                    {
+                        SetLineColor( pItem->maTabBgColor );
+                    } else {
+                        SetLineColor( rStyleSettings.GetLightColor() );
+                    }
+                }
+                // Draw the left side of the tab
                 DrawLine( aPos0, aPos1 );
 
                 if ( !pItem->mbSelect && (pItem->mnId != mnCurPageId) )
                 {
+                    // Draw the top inner shadow
+                    // ToDo: Change from this static color to tab custom bg color
                     DrawLine( Point( aPos0.X(), aPos0.Y()+1 ),
                                 Point( aPos3.X(), aPos3.Y()+1 ) );
                 }
@@ -1187,8 +1219,27 @@ void TabBar::Paint( const Rectangle& )
                 aPos1.X()--;
                 aPos1.Y()--;
                 aPos2.Y()--;
+                if ( !pItem->IsDefaultTabBgColor() && ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) )
+                {
+                    SetLineColor( pItem->maTabBgColor );
+                    DrawLine( Point(aPos1.X()-1, aPos1.Y()-1), Point(aPos2.X(), aPos2.Y()-1) );
+                }
                 DrawLine( aPos1, aPos2 );
 
+                // draw a small 2px sliver of the original background color at the bottom of the selected tab
+                     
+                if ( !pItem->IsDefaultTabBgColor() )
+                {
+                    if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) {
+                        SetLineColor( pItem->maTabBgColor );
+                        DrawLine( Point(aPos1.X()-1, aPos1.Y()-1), Point(aPos2.X(), aPos2.Y()-1) );
+                        if ( !pItem->mbEnable )
+                            DrawCtrlText( aTxtPos, aText, 0, STRING_LEN, (TEXT_DRAW_DISABLE | TEXT_DRAW_MNEMONIC) );
+                        else
+                            DrawText( aTxtPos, aText );
+                    }
+                }
+
                 // Da etwas uebermalt werden konnte, muessen wir die Polygon-
                 // umrandung nocheinmal ausgeben
                 SetLineColor( rStyleSettings.GetDarkShadowColor() );
@@ -1565,6 +1616,42 @@ void TabBar::InsertPage( USHORT nPageId, const XubString& rText,
 
 // -----------------------------------------------------------------------
 
+Color TabBar::GetTabBgColor( USHORT nPageId ) const
+{
+    USHORT nPos = GetPagePos( nPageId );
+
+    if ( nPos != TABBAR_PAGE_NOTFOUND )
+        return mpItemList->GetObject( nPos )->maTabBgColor;
+    else
+        return Color( COL_AUTO );
+}
+
+void TabBar::SetTabBgColor( USHORT nPageId, const Color& aTabBgColor )
+{
+    USHORT nPos = GetPagePos( nPageId );
+    ImplTabBarItem* pItem;
+    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    {
+        pItem = mpItemList->GetObject( nPos );
+        // TODO: Need to take the text color specification out of this code!
+        if ( aTabBgColor != Color( COL_AUTO )  )
+        {
+            pItem->maTabBgColor = aTabBgColor;
+            if ( aTabBgColor.GetLuminance() <= 128 ) //Do not use aTabBgColor.IsDark(), because that threshold is way too low...
+                pItem->maTabTextColor = Color( COL_WHITE );
+            else
+                pItem->maTabTextColor = Color( COL_BLACK );
+        }
+        else
+        {
+            pItem->maTabBgColor = Color( COL_AUTO );
+            pItem->maTabTextColor = Color( COL_AUTO );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------
+
 void TabBar::RemovePage( USHORT nPageId )
 {
     USHORT nPos = GetPagePos( nPageId );
@@ -2486,9 +2573,12 @@ USHORT TabBar::ShowDropPos( const Point& rPos )
             nX--;
         else
             nX++;
+        if ( !pItem->IsDefaultTabBgColor() && !pItem->mbSelect)
+            SetLineColor( pItem->maTabTextColor );
         DrawLine( Point( nX, nY ), Point( nX, nY ) );
         DrawLine( Point( nX+1, nY-1 ), Point( nX+1, nY+1 ) );
         DrawLine( Point( nX+2, nY-2 ), Point( nX+2, nY+2 ) );
+        SetLineColor( aBlackColor );
     }
     if ( (mnDropPos > 0) && (mnDropPos < nItemCount+1) )
     {
@@ -2496,6 +2586,8 @@ USHORT TabBar::ShowDropPos( const Point& rPos )
         nX = pItem->maRect.Right()-TABBAR_OFFSET_X;
         if ( mnDropPos == nCurPos )
             nX++;
+        if ( !pItem->IsDefaultTabBgColor() && !pItem->mbSelect)
+            SetLineColor( pItem->maTabTextColor );
         DrawLine( Point( nX, nY ), Point( nX, nY ) );
         DrawLine( Point( nX-1, nY-1 ), Point( nX-1, nY+1 ) );
         DrawLine( Point( nX-2, nY-2 ), Point( nX-2, nY+2 ) );
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index be9ec1946..eb76402d7 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -97,6 +97,22 @@ namespace svt
     DECLARE_STL_VECTOR( String, StringArray );
     DECLARE_STL_STDKEY_SET( ::rtl::OUString, StringBag );
     DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, MapString2String );
+
+    namespace
+    {
+        String lcl_getSelectedDataSource( const ComboBox& _dataSourceCombo )
+        {
+            String selectedDataSource = _dataSourceCombo.GetText();
+            if ( _dataSourceCombo.GetEntryPos( selectedDataSource ) == LISTBOX_ENTRY_NOTFOUND )
+            {
+                // none of the pre-selected entries -> assume a path to a database document
+                OFileNotation aFileNotation( selectedDataSource, OFileNotation::N_SYSTEM );
+                selectedDataSource = aFileNotation.get( OFileNotation::N_URL );
+            }
+            return selectedDataSource;
+        }
+    }
+
     // ===================================================================
     // = IAssigmentData
     // ===================================================================
@@ -857,9 +873,7 @@ public:
             Reference< XCompletedConnection > xDS;
             if ( m_pImpl->bWorkingPersistent )
             {
-                String sSelectedDS = m_aDatasource.GetText();
-                OFileNotation aFileNotation( sSelectedDS ,OFileNotation::N_SYSTEM);
-                sSelectedDS = aFileNotation.get(OFileNotation::N_URL);
+                String sSelectedDS = lcl_getSelectedDataSource(  m_aDatasource );
                 
                 // get the data source the user has chosen and let it build a connection
                 INetURLObject aURL( sSelectedDS );
@@ -1179,9 +1193,7 @@ public:
     // -------------------------------------------------------------------
     IMPL_LINK(AddressBookSourceDialog, OnOkClicked, Button*, EMPTYARG)
     {
-        String sSelectedDS = m_aDatasource.GetText();
-        OFileNotation aFileNotation( sSelectedDS ,OFileNotation::N_SYSTEM);
-        sSelectedDS = aFileNotation.get(OFileNotation::N_URL);
+        String sSelectedDS = lcl_getSelectedDataSource(  m_aDatasource );
         if ( m_pImpl->bWorkingPersistent )
         {
             m_pImpl->pConfigData->setDatasourceName(sSelectedDS);
@@ -1231,7 +1243,6 @@ public:
                 Reference<XPropertySet> xProp(xAdminDialog,UNO_QUERY);
                 if ( xProp.is() )
                 {
-                    String sOldDS = m_aDatasource.GetText();
                     ::rtl::OUString sName;
                     xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sName;
                     
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx
index 96b065d83..8b3c190ff 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter.vcl/filter/filter.cxx
@@ -1281,17 +1281,17 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject& rPa
     return nRetValue;
 }
 
-USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream,
-                                     USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags )
+USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream, USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags, WMF_APMFILEHEADER *pAPMHeader )
 {
-    return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL );
+  return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL, pAPMHeader );
 }
 
 //-------------------------------------------------------------------------
 
 USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream,
                                      USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags,
-                                     com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
+									 com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData 
+				     , WMF_APMFILEHEADER *pAPMHeader)
 {
     String					aFilterName;
     ULONG					nStmBegin;
@@ -1488,7 +1488,7 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
                 aFilterName.EqualsIgnoreCaseAscii( IMP_EMF ) )
         {
             GDIMetaFile aMtf;
-            if( !ConvertWMFToGDIMetaFile( rIStream, aMtf, NULL ) )
+			if( !ConvertWMFToGDIMetaFile( rIStream, aMtf, NULL, pAPMHeader ) )
                 nStatus = GRFILTER_FORMATERROR;
             else
             {
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
index de22bd7fb..ba4d774f4 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -162,6 +162,7 @@ struct LOGFONTW
     BYTE		lfPitchAndFamily;
     String		alfFaceName;
 };
+struct WMF_APMFILEHEADER;
 
 #define TA_NOUPDATECP			0x0000
 #define TA_UPDATECP				0x0001
@@ -765,7 +766,7 @@ private:
     sal_uInt32		nUnicodeEscapeAction;
 
     // Liesst den Kopf der WMF-Datei
-    BOOL			ReadHeader();
+	BOOL			ReadHeader(WMF_APMFILEHEADER *pAPMHeader);
 
     // Liesst die Parameter des Rocords mit der Funktionsnummer nFunction.
     void			ReadRecordParams( USHORT nFunction );
@@ -782,7 +783,7 @@ public:
                         : WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem ) {};
 
     // Liesst aus dem Stream eine WMF-Datei und fuellt das GDIMetaFile
-    void			ReadWMF();
+	void			ReadWMF(WMF_APMFILEHEADER *pAPMHeader=NULL);
 };
 
 #endif
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx
index 043f39858..b0c673fe1 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/winwmf.cxx
@@ -32,6 +32,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "winmtf.hxx"
+#include <svtools/wmf.hxx>
 #include <rtl/crc.h>
 #include <rtl/tencinfo.h>
 #include <osl/endian.h>
@@ -943,7 +944,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
 
 // ------------------------------------------------------------------------
 
-BOOL WMFReader::ReadHeader()
+BOOL WMFReader::ReadHeader(WMF_APMFILEHEADER *pAPMHeader)
 {
     Rectangle	aPlaceableBound;
     sal_uInt32  nl, nStrmPos = pWMF->Tell();
@@ -976,11 +977,18 @@ BOOL WMFReader::ReadHeader()
     }
     else
     {
-        nUnitsPerInch = 96;       
-        pWMF->Seek( nStrmPos + 18 );    // set the streampos to the start of the the metaactions
-        GetPlaceableBound( aPlaceableBound, pWMF );
-        pWMF->Seek( nStrmPos );
-    }
+	  nUnitsPerInch = (pAPMHeader!=NULL?pAPMHeader->inch:96);
+	  pWMF->Seek( nStrmPos + 18 );    // set the streampos to the start of the the metaactions
+	  GetPlaceableBound( aPlaceableBound, pWMF );
+	  pWMF->Seek( nStrmPos );
+	  if (pAPMHeader!=NULL) { 
+	    // #n417818#: If we have an external header then overwrite the bounds!
+	    aPlaceableBound=Rectangle(pAPMHeader->left*567*nUnitsPerInch/1440/1000,
+				      pAPMHeader->top*567*nUnitsPerInch/1440/1000,
+				      pAPMHeader->right*567*nUnitsPerInch/1440/1000, 
+				      pAPMHeader->bottom*567*nUnitsPerInch/1440/1000);
+	  }
+	}	
 
 	pOut->SetUnitsPerInch( nUnitsPerInch );
     pOut->SetWinOrg( aPlaceableBound.TopLeft() );
@@ -1015,7 +1023,7 @@ BOOL WMFReader::ReadHeader()
     return TRUE;
 }
 
-void WMFReader::ReadWMF()
+void WMFReader::ReadWMF(WMF_APMFILEHEADER *pAPMHeader)
 {
     USHORT	nFunction;
     ULONG	nPos, nPercent, nLastPercent;
@@ -1033,7 +1041,7 @@ void WMFReader::ReadWMF()
     pWMF->Seek( nStartPos );
     Callback( (USHORT) ( nLastPercent = 0 ) );
 
-    if ( ReadHeader() )
+	if ( ReadHeader( pAPMHeader ) )
     {
 
         nPos = pWMF->Tell();
diff --git a/svtools/source/filter.vcl/wmf/wmf.cxx b/svtools/source/filter.vcl/wmf/wmf.cxx
index 20346d7e5..8e1f41446 100644
--- a/svtools/source/filter.vcl/wmf/wmf.cxx
+++ b/svtools/source/filter.vcl/wmf/wmf.cxx
@@ -38,7 +38,7 @@
 
 // -----------------------------------------------------------------------------
 
-BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem )
+BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem, WMF_APMFILEHEADER *pAPMHeader )
 {
     UINT32 nMetaType;
     UINT32 nOrgPos = rStreamWMF.Tell();
@@ -54,7 +54,7 @@ BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile,
     }
     else
     {
-        WMFReader( rStreamWMF, rGDIMetaFile, pConfigItem ).ReadWMF();
+		WMFReader( rStreamWMF, rGDIMetaFile, pConfigItem ).ReadWMF( pAPMHeader );
     }
     rStreamWMF.SetNumberFormatInt( nOrigNumberFormat );
     return !rStreamWMF.GetError();
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx
index 8735c5872..dbf6ead41 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.cxx
+++ b/svtools/source/filter.vcl/wmf/wmfwr.cxx
@@ -438,16 +438,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont)
     BYTE nPitchFamily;
 
     WriteRecordHeader(0x00000000,W_META_CREATEFONTINDIRECT);
-
-    if ( !rFont.GetSize().Width() )
-    {
-        VirtualDevice aDev;
-        FontMetric aMetric( aDev.GetFontMetric( rFont ) );
-        WriteHeightWidth(Size(aMetric.GetWidth(),-rFont.GetSize().Height()));
-    }
-    else
-        WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height()));
-
+    WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height()));
     *pWMF << (short)rFont.GetOrientation() << (short)rFont.GetOrientation();
 
     switch (rFont.GetWeight()) {
diff --git a/svtools/source/misc1/docmspasswdrequest.cxx b/svtools/source/misc1/docmspasswdrequest.cxx
deleted file mode 100644
index aaada7bfe..000000000
--- a/svtools/source/misc1/docmspasswdrequest.cxx
+++ /dev/null
@@ -1,143 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright IBM Corporation 2009.
- * Copyright 2009 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: docmspasswdrequest.cxx,v $
- * $Revision: 1.0 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-#include "docmspasswdrequest.hxx"
-#include <com/sun/star/task/XInteractionAbort.hpp>
-#include <com/sun/star/task/XInteractionPassword.hpp>
-
-//==========================================================================
-
-class MSAbortContinuation : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionAbort >
-{
-    sal_Bool mbSelected;
-
-public:
-    MSAbortContinuation() : mbSelected( sal_False ) {}
-    
-    sal_Bool isSelected() { return mbSelected; }
-    
-    void reset() { mbSelected = sal_False; }
-
-    virtual void SAL_CALL select() throw(::com::sun::star::uno::RuntimeException) { mbSelected = sal_True; }
-};
-
-//==========================================================================
-
-class MSPasswordContinuation : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionPassword >
-{
-    sal_Bool mbSelected;
-    ::rtl::OUString maPassword;
-
-public:
-    MSPasswordContinuation() : mbSelected( sal_False ) {}
-    
-    sal_Bool isSelected() { return mbSelected; }
-    
-    void reset() { mbSelected = sal_False; }
-
-    virtual void SAL_CALL select() throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPassword( const ::rtl::OUString& aPass ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getPassword(  ) throw (::com::sun::star::uno::RuntimeException);
-};
-
-void SAL_CALL MSPasswordContinuation::select()
-    throw(::com::sun::star::uno::RuntimeException)
-{
-    mbSelected = sal_True;
-}
-
-void SAL_CALL MSPasswordContinuation::setPassword( const ::rtl::OUString& aPass )
-    throw (::com::sun::star::uno::RuntimeException)
-{
-    maPassword = aPass;
-}
-
-::rtl::OUString SAL_CALL MSPasswordContinuation::getPassword() 
-    throw (::com::sun::star::uno::RuntimeException)
-{
-    return maPassword;
-}
-
-//==========================================================================
-
-RequestMSDocumentPassword::RequestMSDocumentPassword( ::com::sun::star::task::PasswordRequestMode nMode, ::rtl::OUString aName )
-{
-    ::rtl::OUString temp;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2;
-    ::com::sun::star::task::DocumentMSPasswordRequest 
-        aDocumentMSPasswordRequest( temp,
-                            temp2,
-                          ::com::sun::star::task::InteractionClassification_QUERY,
-                          nMode,
-                          aName );
-
-       m_aRequest <<= aDocumentMSPasswordRequest;
-
-       m_pAbort  = new MSAbortContinuation;
-       m_pPassword = new MSPasswordContinuation;
-
-       m_lContinuations.realloc( 2 );
-       m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
-       m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pPassword );
-}
-
-sal_Bool RequestMSDocumentPassword::isAbort()
-{
-    return m_pAbort->isSelected();
-}
-
-sal_Bool RequestMSDocumentPassword::isPassword()
-{
-    return m_pPassword->isSelected();
-}
-        
-::rtl::OUString RequestMSDocumentPassword::getPassword()
-{
-    return m_pPassword->getPassword();
-}
-        
-::com::sun::star::uno::Any SAL_CALL RequestMSDocumentPassword::getRequest()
-        throw( ::com::sun::star::uno::RuntimeException )
-{
-    return m_aRequest;
-}
-
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
-    SAL_CALL RequestMSDocumentPassword::getContinuations()
-        throw( ::com::sun::star::uno::RuntimeException )
-{
-    return m_lContinuations;
-}
-
-
diff --git a/svtools/source/misc1/docpasswdrequest.cxx b/svtools/source/misc1/docpasswdrequest.cxx
deleted file mode 100644
index 183e8c4db..000000000
--- a/svtools/source/misc1/docpasswdrequest.cxx
+++ /dev/null
@@ -1,142 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: docpasswdrequest.cxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-#include "docpasswdrequest.hxx"
-#include <com/sun/star/task/XInteractionAbort.hpp>
-#include <com/sun/star/task/XInteractionPassword.hpp>
-
-//==========================================================================
-
-class AbortContinuation : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionAbort >
-{
-    sal_Bool mbSelected;
-
-public:
-    AbortContinuation() : mbSelected( sal_False ) {}
-    
-    sal_Bool isSelected() { return mbSelected; }
-    
-    void reset() { mbSelected = sal_False; }
-
-    virtual void SAL_CALL select() throw(::com::sun::star::uno::RuntimeException) { mbSelected = sal_True; }
-};
-
-//==========================================================================
-
-class PasswordContinuation : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionPassword >
-{
-    sal_Bool mbSelected;
-    ::rtl::OUString maPassword;
-
-public:
-    PasswordContinuation() : mbSelected( sal_False ) {}
-    
-    sal_Bool isSelected() { return mbSelected; }
-    
-    void reset() { mbSelected = sal_False; }
-
-    virtual void SAL_CALL select() throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPassword( const ::rtl::OUString& aPass ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getPassword(  ) throw (::com::sun::star::uno::RuntimeException);
-};
-
-void SAL_CALL PasswordContinuation::select()
-    throw(::com::sun::star::uno::RuntimeException)
-{
-    mbSelected = sal_True;
-}
-
-void SAL_CALL PasswordContinuation::setPassword( const ::rtl::OUString& aPass )
-    throw (::com::sun::star::uno::RuntimeException)
-{
-    maPassword = aPass;
-}
-
-::rtl::OUString SAL_CALL PasswordContinuation::getPassword() 
-    throw (::com::sun::star::uno::RuntimeException)
-{
-    return maPassword;
-}
-
-//==========================================================================
-
-RequestDocumentPassword::RequestDocumentPassword( ::com::sun::star::task::PasswordRequestMode nMode, ::rtl::OUString aName )
-{
-    ::rtl::OUString temp;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2;
-    ::com::sun::star::task::DocumentPasswordRequest 
-        aDocumentPasswordRequest( temp,
-                            temp2,
-                          ::com::sun::star::task::InteractionClassification_QUERY,
-                          nMode,
-                          aName );
-
-       m_aRequest <<= aDocumentPasswordRequest;
-
-       m_pAbort  = new AbortContinuation;
-       m_pPassword = new PasswordContinuation;
-
-       m_lContinuations.realloc( 2 );
-       m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
-       m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pPassword );
-}
-
-sal_Bool RequestDocumentPassword::isAbort()
-{
-    return m_pAbort->isSelected();
-}
-
-sal_Bool RequestDocumentPassword::isPassword()
-{
-    return m_pPassword->isSelected();
-}
-        
-::rtl::OUString RequestDocumentPassword::getPassword()
-{
-    return m_pPassword->getPassword();
-}
-        
-::com::sun::star::uno::Any SAL_CALL RequestDocumentPassword::getRequest()
-        throw( ::com::sun::star::uno::RuntimeException )
-{
-    return m_aRequest;
-}
-
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
-    SAL_CALL RequestDocumentPassword::getContinuations()
-        throw( ::com::sun::star::uno::RuntimeException )
-{
-    return m_lContinuations;
-}
-
-
diff --git a/svtools/source/misc1/makefile.mk b/svtools/source/misc1/makefile.mk
index 3ca57ff36..e74afd81d 100644
--- a/svtools/source/misc1/makefile.mk
+++ b/svtools/source/misc1/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -49,8 +49,6 @@ EXCEPTIONSFILES=\
 SLOFILES=\
     $(EXCEPTIONSFILES) \
     $(SLO)$/adrparse.obj \
-    $(SLO)$/docpasswdrequest.obj \
-    $(SLO)$/docmspasswdrequest.obj \
     $(SLO)$/filenotation.obj \
     $(SLO)$/inethist.obj \
     $(SLO)$/inettype.obj \
diff --git a/svtools/source/syslocale/syslocale.cxx b/svtools/source/syslocale/syslocale.cxx
index ecd8712c5..77dcd2e9a 100644
--- a/svtools/source/syslocale/syslocale.cxx
+++ b/svtools/source/syslocale/syslocale.cxx
@@ -66,18 +66,18 @@ public:
 
     virtual void                Notify( SvtBroadcaster& rBC, const SfxHint& rHint );
 
+    CharClass*                  GetCharClass();
+
 };
 
 
 // -----------------------------------------------------------------------
 
-SvtSysLocale_Impl::SvtSysLocale_Impl()
+SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(NULL)
 {
     const lang::Locale& rLocale = Application::GetSettings().GetLocale();
     pLocaleData = new LocaleDataWrapper(
         ::comphelper::getProcessServiceFactory(), rLocale );
-    pCharClass = new CharClass(
-        ::comphelper::getProcessServiceFactory(), rLocale );
     aSysLocaleOptions.AddListener( *this );
 }
 
@@ -89,7 +89,15 @@ SvtSysLocale_Impl::~SvtSysLocale_Impl()
     delete pLocaleData;
 }
 
-
+CharClass* SvtSysLocale_Impl::GetCharClass()
+{
+    if ( !pCharClass )
+    {
+        const lang::Locale& rLocale = Application::GetSettings().GetLocale();
+        pCharClass = new CharClass(::comphelper::getProcessServiceFactory(), rLocale );
+    }
+    return pCharClass;
+}
 void SvtSysLocale_Impl::Notify( SvtBroadcaster&, const SfxHint& rHint )
 {
     const SfxSimpleHint* p = PTR_CAST( SfxSimpleHint, &rHint );
@@ -98,7 +106,7 @@ void SvtSysLocale_Impl::Notify( SvtBroadcaster&, const SfxHint& rHint )
         MutexGuard aGuard( SvtSysLocale::GetMutex() );
         const lang::Locale& rLocale = Application::GetSettings().GetLocale();
         pLocaleData->setLocale( rLocale );
-        pCharClass->setLocale( rLocale );
+        GetCharClass()->setLocale( rLocale );
     }
 }
 
@@ -158,11 +166,11 @@ const LocaleDataWrapper* SvtSysLocale::GetLocaleDataPtr() const
 
 const CharClass& SvtSysLocale::GetCharClass() const
 {
-    return *(pImpl->pCharClass);
+    return *(pImpl->GetCharClass());
 }
 
 
 const CharClass* SvtSysLocale::GetCharClassPtr() const
 {
-    return pImpl->pCharClass;
+    return pImpl->GetCharClass();
 }
diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx
index 8295ec218..7821b2ce1 100644
--- a/svx/inc/svx/SmartTagMgr.hxx
+++ b/svx/inc/svx/SmartTagMgr.hxx
@@ -102,7 +102,7 @@ private:
     std::vector< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > maActionList;
     std::set< rtl::OUString > maDisabledSmartTagTypes;
     std::multimap < rtl::OUString, ActionReference > maSmartTagMap;
-    com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > mxBreakIter;
+    mutable com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > mxBreakIter;
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext> mxContext;
     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxConfigurationSettings;
@@ -129,6 +129,8 @@ private:
     */
     void AssociateActionsWithRecognizers();
 
+    void CreateBreakIterator() const;
+
 public:
 
     SmartTagMgr( const rtl::OUString& rApplicationName );
diff --git a/svx/inc/svx/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx
new file mode 100755
index 000000000..342f54c1e
--- /dev/null
+++ b/svx/inc/svx/dbcharsethelper.hxx
@@ -0,0 +1,69 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: dbcharsethelper.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SVX_DBCHARSETHELPER_HXX
+#define SVX_DBCHARSETHELPER_HXX
+#include "svx/svxdllapi.h"
+#include "svx/dbtoolsclient.hxx"
+
+//........................................................................
+namespace svxform
+{
+//........................................................................
+
+    //====================================================================
+    //= ODataAccessCharsetHelper
+    //====================================================================
+    class SVX_DLLPUBLIC ODataAccessCharsetHelper : public ODbtoolsClient
+    {
+    protected:
+        mutable ::rtl::Reference< ::connectivity::simple::IDataAccessCharSet >	m_xCharsetHelper;
+
+    protected:
+        virtual bool ensureLoaded() const;
+
+    public:
+        ODataAccessCharsetHelper( );
+
+        inline sal_Int32	getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs ) const
+        {
+            if ( ensureLoaded() )
+                return m_xCharsetHelper->getSupportedTextEncodings( _rEncs );
+            return 0;
+        }
+    };
+
+//........................................................................
+}	// namespace svxform
+//........................................................................
+
+#endif // SVX_DBCHARSETCLIENT_HXX
+
+
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx
new file mode 100755
index 000000000..ae5721a87
--- /dev/null
+++ b/svx/inc/svx/dbtoolsclient.hxx
@@ -0,0 +1,238 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: dbtoolsclient.hxx,v $
+ * $Revision: 1.18 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SVX_DBTOOLSCLIENT_HXX
+#define SVX_DBTOOLSCLIENT_HXX
+
+#include <connectivity/virtualdbtools.hxx>
+#include <osl/mutex.hxx>
+#include <osl/module.h>
+#include <tools/solar.h>
+#include <unotools/sharedunocomponent.hxx>
+#include "svx/svxdllapi.h"
+
+//........................................................................
+namespace svxform
+{
+//........................................................................
+
+    typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection;
+
+    //====================================================================
+    //= ODbtoolsClient
+    //====================================================================
+    /** base class for classes which want to use dbtools features with load-on-call
+        of the dbtools lib.
+    */
+    class SVX_DLLPUBLIC ODbtoolsClient
+    {
+    private:
+        static	::osl::Mutex	s_aMutex;
+        static	sal_Int32		s_nClients;
+        static oslModule		s_hDbtoolsModule;
+        static ::connectivity::simple::createDataAccessToolsFactoryFunction
+                                s_pFactoryCreationFunc;
+        //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time)
+        mutable BOOL            m_bCreateAlready;
+
+    private:
+        mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory >	m_xDataAccessFactory;
+
+    protected:
+        ODbtoolsClient();
+        virtual ~ODbtoolsClient();
+
+        virtual bool ensureLoaded() const;
+
+    protected:
+        const ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory >&
+            getFactory() const { return m_xDataAccessFactory; }
+
+    private:
+        static void registerClient();
+        static void revokeClient();
+    };
+
+    //====================================================================
+    //= OStaticDataAccessTools
+    //====================================================================
+    class SVX_DLLPUBLIC OStaticDataAccessTools : public ODbtoolsClient
+    {
+    protected:
+        mutable ::rtl::Reference< ::connectivity::simple::IDataAccessTools >	m_xDataAccessTools;
+
+    protected:
+        virtual bool ensureLoaded() const;
+
+    public:
+        OStaticDataAccessTools();
+
+        const ::rtl::Reference< ::connectivity::simple::IDataAccessTools >& getDataAccessTools() const { return m_xDataAccessTools; }
+
+        // ------------------------------------------------
+        ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn,
+            sal_Bool _bAllowDefault
+        ) const;
+
+        // ------------------------------------------------
+        sal_Int32 getDefaultNumberFormat(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xColumn,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _xTypes,									 
+            const ::com::sun::star::lang::Locale& _rLocale );
+
+        // ------------------------------------------------
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback(
+            const ::rtl::OUString& _rDataSourceName,
+            const ::rtl::OUString& _rUser,
+            const ::rtl::OUString& _rPwd,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
+        ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) );
+
+        // ------------------------------------------------
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory,
+            sal_Bool _bSetAsActiveConnection
+        ) const SAL_THROW ( ( ::com::sun::star::sdbc::SQLException
+                            , ::com::sun::star::lang::WrappedTargetException
+                            , ::com::sun::star::uno::RuntimeException) );
+
+        // ------------------------------------------------
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet)
+                const SAL_THROW ( (::com::sun::star::uno::RuntimeException) );
+
+        // ------------------------------------------------
+        void TransferFormComponentProperties(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxOld,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxNew,
+            const ::com::sun::star::lang::Locale& _rLocale
+        ) const;
+
+        // ------------------------------------------------
+        ::rtl::OUString quoteName(
+            const ::rtl::OUString& _rQuote,
+            const ::rtl::OUString& _rName
+        ) const;
+
+        // ------------------------------------------------
+        ::rtl::OUString composeTableNameForSelect(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable
+        ) const;
+
+        // ------------------------------------------------
+        ::com::sun::star::sdb::SQLContext prependContextInfo(
+            ::com::sun::star::sdbc::SQLException& _rException,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
+            const ::rtl::OUString& _rContextDescription,
+            const ::rtl::OUString& _rContextDetails
+        ) const;
+
+        // ------------------------------------------------
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource(
+                const ::rtl::OUString& _rsRegisteredName,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
+            ) const;
+
+        // ------------------------------------------------
+        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
+            @param		_rxCursorSet	the property set
+        */
+        sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+
+        // ------------------------------------------------
+        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE
+            @param		_rxCursorSet	the property set
+        */
+        sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+
+        // ------------------------------------------------
+        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE
+            @param		_rxCursorSet	the property set
+        */
+        sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+
+        // ------------------------------------------------
+        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
+            getFieldsByCommandDescriptor(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+                const sal_Int32 _nCommandType,
+                const ::rtl::OUString& _rCommand,
+                ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive,
+                ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
+            )	SAL_THROW( ( ) );
+
+        // ------------------------------------------------
+        ::com::sun::star::uno::Sequence< ::rtl::OUString >
+            getFieldNamesByCommandDescriptor(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+                const sal_Int32 _nCommandType,
+                const ::rtl::OUString& _rCommand,
+                ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
+            )	SAL_THROW( ( ) );
+
+        // ------------------------------------------------
+        bool isEmbeddedInDatabase(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent,
+            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxActualConnection
+        );
+
+        // ------------------------------------------------
+        bool isEmbeddedInDatabase(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent
+        );
+    };
+
+    //====================================================================
+    //= DBToolsObjectFactory
+    //====================================================================
+    class SVX_DLLPUBLIC DBToolsObjectFactory : public ODbtoolsClient
+    {
+    public:
+        DBToolsObjectFactory();
+        ~DBToolsObjectFactory();
+
+        // ------------------------------------------------
+        ::std::auto_ptr< ::dbtools::FormattedColumnValue >  createFormattedColumnValue(
+            const ::comphelper::ComponentContext& _rContext,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn
+        );
+    };
+
+//........................................................................
+}	// namespace svxform
+//........................................................................
+
+#endif // SVX_DBTOOLSCLIENT_HXX
+
+
diff --git a/svx/inc/svx/msocximex.hxx b/svx/inc/svx/msocximex.hxx
index 2bc6f51ec..c7686ce96 100644
--- a/svx/inc/svx/msocximex.hxx
+++ b/svx/inc/svx/msocximex.hxx
@@ -1252,7 +1252,7 @@ public:
 
     sal_uInt8 pPictureHeader[20];
     sal_uInt32  nPictureLen;
- 	sal_uInt8 *pPicture;
+    sal_uInt8 *pPicture;
 
     static OCX_Control *Create() { return new OCX_Label;}
 
diff --git a/svx/inc/svx/mstoolbar.hxx b/svx/inc/svx/mstoolbar.hxx
index c102ade82..01ef608e0 100644
--- a/svx/inc/svx/mstoolbar.hxx
+++ b/svx/inc/svx/mstoolbar.hxx
@@ -10,9 +10,11 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <vcl/bitmap.hxx>
+#include <cppuhelper/implbase1.hxx>
 
 namespace css = ::com::sun::star;
 
@@ -41,6 +43,7 @@ class SVX_DLLPUBLIC CustomToolBarImportHelper
     css::uno::Reference< css::ui::XUIConfigurationManagerSupplier > m_xCfgSupp;
     css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr;
     SfxObjectShell& mrDocSh;
+    void ScaleImage( css::uno::Reference< css::graphic::XGraphic >& xGraphic, long nNewSize );
 public:
     CustomToolBarImportHelper( SfxObjectShell& rDocSh, const css::uno::Reference< css::ui::XUIConfigurationManager >& rxAppCfgMgr );
 
@@ -56,6 +59,7 @@ public:
     rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
     rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID );
     SfxObjectShell& GetDocShell() { return mrDocSh; }
+    void showToolbar( const rtl::OUString& rName );
 };
 
 class SVX_DLLPUBLIC TBBase
@@ -163,6 +167,7 @@ public:
     ~TBCMenuSpecific(){}
     bool Read(SvStream *pS);
     void Print( FILE* );
+    rtl::OUString Name();
 };
 
 class SVX_DLLPUBLIC TBCCDData : public TBBase
@@ -268,8 +273,9 @@ public:
     ~TBCData(){}
     bool Read(SvStream *pS);
     void Print( FILE* );
-    bool ImportToolBarControl(  const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >&, bool& bBeginGroup );
+    bool ImportToolBarControl( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >&, bool& bBeginGroup, bool bIsMenuBar );
     TBCGeneralInfo& getGeneralInfo() { return controlGeneralInfo; }
+    TBCMenuSpecific* getMenuSpecific();
 };
 
 class SVX_DLLPUBLIC TB : public TBBase
@@ -290,6 +296,7 @@ public:
     sal_Int16 getcCL(){ return cCL; }
     WString& getName(){ return name; }
     bool IsEnabled();
+    bool IsMenuToolbar(){ return ( ( ltbtr & 0x2000000 ) == 0x2000000 ); }
     bool NeedsPositioning();
 };
 
@@ -305,6 +312,8 @@ public:
     void Print( FILE* fo );
 };
 
+typedef cppu::WeakImplHelper1< css::container::XIndexContainer > PropertyValueIndexContainer_BASE;
+
 class SVX_DLLPUBLIC TBVisualData : public TBBase
 {
     sal_Int8 tbds;
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index 00d98e9dc..09da0ee8e 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -56,6 +56,8 @@ namespace drawinglayer
             // defines if SdrTextWordWrapItem was set at SdrObjCustomShape which means
             // that the text needs to be block formatted
             unsigned                                    mbWordWrap : 1;
+            // #SJ# Allow text clipping against TextBox in special cases (used for SC)
+            unsigned                                    mbForceTextClipToTextRange : 1;
 
         protected:
             // local decomposition.
@@ -66,13 +68,15 @@ namespace drawinglayer
                 const attribute::SdrShadowTextAttribute& rSdrSTAttribute,
                 const Primitive2DSequence& rSubPrimitives,
                 const basegfx::B2DHomMatrix& rTextBox,
-                bool bWordWrap);
+                bool bWordWrap,
+                bool bForceTextClipToTextRange);
 
             // data access
             const attribute::SdrShadowTextAttribute& getSdrSTAttribute() const { return maSdrSTAttribute; }
             const Primitive2DSequence& getSubPrimitives() const { return maSubPrimitives; }
             const basegfx::B2DHomMatrix& getTextBox() const { return maTextBox; }
             bool getWordWrap() const { return mbWordWrap; }
+            bool isForceTextClipToTextRange() const { return mbForceTextClipToTextRange; }
 
             // compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index 5fe0d1245..8a93741bc 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -309,6 +309,9 @@ public:
 
 class SVX_DLLPUBLIC SdrGlobalData
 {
+    const SvtSysLocale*         pSysLocale;     // follows always locale settings
+    const CharClass*            pCharClass;     // follows always SysLocale
+    const LocaleDataWrapper*    pLocaleData;    // follows always SysLocale
 public:
     SdrLinkList     	aUserMakeObjHdl;
     SdrLinkList     	aUserMakeObjUserDataHdl;
@@ -317,10 +320,11 @@ public:
     ResMgr*            	pResMgr;
     ULONG              	nExchangeFormat;
     OLEObjCache			aOLEObjCache;
-    const SvtSysLocale*         pSysLocale;     // follows always locale settings
-    const CharClass*            pCharClass;     // follows always SysLocale
-    const LocaleDataWrapper*    pLocaleData;    // follows always SysLocale
+    
 
+    const SvtSysLocale*         GetSysLocale();     // follows always locale settings
+    const CharClass*            GetCharClass();     // follows always SysLocale
+    const LocaleDataWrapper*    GetLocaleData();    // follows always SysLocale
 public:
     SdrGlobalData();
     ~SdrGlobalData();
diff --git a/svx/inc/svx/svxacorr.hxx b/svx/inc/svx/svxacorr.hxx
index 677108672..d414aed05 100644
--- a/svx/inc/svx/svxacorr.hxx
+++ b/svx/inc/svx/svxacorr.hxx
@@ -67,6 +67,7 @@ const long SaveWordWrdSttLst= 0x00000400;	// 2 GrB. am WortAnf. auto. aufnehmen
 const long IngnoreDoubleSpace= 0x00000800;	// 2 Spaces ignorieren
 const long ChgSglQuotes		= 0x00001000;	// einfache Quotes ersetzen
 const long CorrectCapsLock  = 0x00002000;   // Correct accidental use of cAPS LOCK key
+const long AddNonBrkSpace	= 0x00004000;	// Add non breaking space before :;?!
 
 const long ChgWordLstLoad	= 0x20000000;	// Ersetzungsliste geladen
 const long CplSttLstLoad	= 0x40000000;	// Exceptionlist fuer CplStart geladen
@@ -369,6 +370,9 @@ public:
     BOOL FnChgToEnEmDash( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
+    BOOL FnAddNonBrkSpace( SvxAutoCorrDoc&, const String&,
+                                xub_StrLen nSttPos, xub_StrLen nEndPos,
+                                LanguageType eLang = LANGUAGE_SYSTEM );
     BOOL FnSetINetAttr( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
diff --git a/svx/inc/svx/swafopt.hxx b/svx/inc/svx/swafopt.hxx
index 18ae7e011..eb557ea52 100644
--- a/svx/inc/svx/swafopt.hxx
+++ b/svx/inc/svx/swafopt.hxx
@@ -68,6 +68,7 @@ struct SVX_DLLPUBLIC SvxSwAutoFmtFlags
     BOOL bChgFracionSymbol : 1;
     BOOL bChgOrdinalNumber : 1;
     BOOL bChgToEnEmDash : 1;
+    BOOL bAddNonBrkSpace : 1;
     BOOL bChgWeightUnderl : 1;
     BOOL bSetINetAttr : 1;
 
diff --git a/svx/inc/svx/tstpitem.hxx b/svx/inc/svx/tstpitem.hxx
index d61d03f03..1e4dc7930 100644
--- a/svx/inc/svx/tstpitem.hxx
+++ b/svx/inc/svx/tstpitem.hxx
@@ -53,11 +53,13 @@ private:
     long            nTabPos;
 
     SvxTabAdjust    eAdjustment;
-    sal_Unicode		cDecimal;
+    mutable sal_Unicode		m_cDecimal;
     sal_Unicode		cFill;
 
     SVX_DLLPRIVATE friend SvStream& operator<<( SvStream&, SvxTabStop& );
 
+    void fillDecimal() const;
+
 public:
     SvxTabStop();
 #if (_MSC_VER < 1300)
@@ -78,8 +80,8 @@ public:
     SvxTabAdjust&   GetAdjustment() { return eAdjustment; }
     SvxTabAdjust    GetAdjustment() const { return eAdjustment; }
 
-    sal_Unicode&  GetDecimal() { return cDecimal; }
-    sal_Unicode   GetDecimal() const { return cDecimal; }
+    sal_Unicode&  GetDecimal() { fillDecimal(); return m_cDecimal; }
+    sal_Unicode   GetDecimal() const { fillDecimal(); return m_cDecimal; }
 
     sal_Unicode&  GetFill() { return cFill; }
     sal_Unicode   GetFill() const { return cFill; }
@@ -91,7 +93,7 @@ public:
                         {
                             return ( nTabPos     == rTS.nTabPos     &&
                                      eAdjustment == rTS.eAdjustment &&
-                                     cDecimal    == rTS.cDecimal    &&
+                                     m_cDecimal    == rTS.m_cDecimal    &&
                                      cFill       == rTS.cFill );
                         }
 
@@ -105,7 +107,7 @@ public:
                         {
                             nTabPos = rTS.nTabPos;
                             eAdjustment = rTS.eAdjustment;
-                            cDecimal = rTS.cDecimal;
+                            m_cDecimal = rTS.m_cDecimal;
                             cFill = rTS.cFill;
                             return *this;
                         }
diff --git a/svx/inc/svxmsbas.hxx b/svx/inc/svxmsbas.hxx
index c7ca0ad7c..6adddc516 100644
--- a/svx/inc/svxmsbas.hxx
+++ b/svx/inc/svxmsbas.hxx
@@ -62,7 +62,7 @@ typedef std::map< String, ObjIdToName >  ControlAttributeInfo;
 class VBA_Impl;
 
 class SVX_DLLPUBLIC SvxImportMSVBasic
-{ 
+{
 	ControlAttributeInfo m_ModuleNameToObjIdHash;
 	void extractAttribute( const String& rAttribute, const String& rModName );
 
@@ -76,7 +76,7 @@ public:
     // 0 - nothing has done
     // bit 0 = 1 -> any code is imported to the SO-Basic
     // bit 1 = 1 -> the VBA - storage is copy to the ObjectShell storage
-	int Import( const String& rStorageName, const String &rSubStorageName, 
+    int Import( const String& rStorageName, const String &rSubStorageName,
                 BOOL bAsComment=TRUE, BOOL bStripped=TRUE );
 	int Import( const String& rStorageName, const String &rSubStorageName, 
 				const std::vector< String >& codeNames, BOOL bAsComment=TRUE, BOOL bStripped=TRUE );
@@ -101,9 +101,9 @@ private:
     BOOL bCopy;
 
     SVX_DLLPRIVATE BOOL ImportCode_Impl( const String& rStorageName,
-                                                  const String &rSubStorageName,
+                          const String &rSubStorageName,
 	                                              const std::vector< String >&,
-                                                  BOOL bAsComment, BOOL bStripped );
+                          BOOL bAsComment, BOOL bStripped);
     SVX_DLLPRIVATE bool ImportForms_Impl(const String& rStorageName, 
 		const String &rSubStorageName, BOOL bVBAMode );
     SVX_DLLPRIVATE BOOL CopyStorage_Impl( const String& rStorageName,
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index 3c8eb573a..276512a34 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -555,6 +555,8 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\SmartTagCtl.hxx %_DEST%\inc%_EXT%\svx\SmartTagCtl.hxx
 ..\inc\svx\databaselocationinput.hxx %_DEST%\inc%_EXT%\svx\databaselocationinput.hxx
 ..\inc\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx
+..\inc\svx\dbcharsethelper.hxx %_DEST%\inc%_EXT%\svx\dbcharsethelper.hxx
+..\inc\svx\dbtoolsclient.hxx %_DEST%\inc%_EXT%\svx\dbtoolsclient.hxx
 
 mkdir: %_DEST%\inc%_EXT%\svx\sdr
 mkdir: %_DEST%\inc%_EXT%\svx\sdr\properties
diff --git a/svx/source/cui/autocdlg.cxx b/svx/source/cui/autocdlg.cxx
index f4c0a2166..a517c9828 100644
--- a/svx/source/cui/autocdlg.cxx
+++ b/svx/source/cui/autocdlg.cxx
@@ -233,6 +233,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent,
     sNoDblSpaces        (SVX_RES(STR_NO_DBL_SPACES    )),
     sHalf               (SVX_RES(ST_FRACTION          )),
     sDash    			(SVX_RES(ST_DASH	         	)),
+    sNonBrkSpace		(SVX_RES(ST_NON_BREAK_SPACE   )),
     sFirst              (SVX_RES(ST_ORDINAL           )),
     sAccidentalCaps     (SVX_RES(ST_CORRECT_ACCIDENTAL_CAPS_LOCK))
 {
@@ -279,6 +280,7 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& )
     pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber,		aCheckLB.IsChecked(nPos++));
     pAutoCorrect->SetAutoCorrFlag(ChgFractionSymbol,	aCheckLB.IsChecked(nPos++));
     pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash,		aCheckLB.IsChecked(nPos++));
+    pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace,		aCheckLB.IsChecked(nPos++));
     pAutoCorrect->SetAutoCorrFlag(IngnoreDoubleSpace,	aCheckLB.IsChecked(nPos++));
     pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock,      aCheckLB.IsChecked(nPos++));
 
@@ -321,6 +323,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& )
     aCheckLB.InsertEntry(sFirst);
     aCheckLB.InsertEntry(sHalf);
     aCheckLB.InsertEntry(sDash);
+    aCheckLB.InsertEntry(sNonBrkSpace);
     aCheckLB.InsertEntry(sNoDblSpaces);
     aCheckLB.InsertEntry(sAccidentalCaps);
 
@@ -333,6 +336,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& )
     aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgOrdinalNumber) );
     aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgFractionSymbol) );
     aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgToEnEmDash) );
+    aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & AddNonBrkSpace) );
     aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & IngnoreDoubleSpace) );
     aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & CorrectCapsLock) );
 
@@ -464,6 +468,7 @@ enum OfaAutoFmtOptions
     REPLACE_1ST,
     REPLACE_HALF,
     REPLACE_DASHES,
+    ADD_NON_BRK_SPACE,
     DEL_SPACES_AT_STT_END,
     DEL_SPACES_BETWEEN_LINES,
     IGNORE_DBLSPACE,
@@ -501,6 +506,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
     sFraction			(SVX_RES(	ST_FRACTION     )),
     sDetectURL			(SVX_RES(	ST_DETECT_URL   )),
     sDash				(SVX_RES(	ST_DASH         )),
+    sNonBrkSpace        (SVX_RES(   ST_NON_BREAK_SPACE )),
     sOrdinal			(SVX_RES(	ST_ORDINAL      )),
     sRightMargin		(SVX_RES(	ST_RIGHT_MARGIN	)),
     sNum				(SVX_RES(	STR_NUM			)),
@@ -711,6 +717,12 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet&  )
     pOpt->bChgToEnEmDash = bCheck;
     pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash,
                         aCheckLB.IsChecked(REPLACE_DASHES, CBCOL_SECOND));
+    
+    bCheck = aCheckLB.IsChecked(ADD_NON_BRK_SPACE, CBCOL_FIRST);
+    bModified |= pOpt->bAddNonBrkSpace != bCheck;
+    pOpt->bAddNonBrkSpace = bCheck;
+    pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace,
+                        aCheckLB.IsChecked(ADD_NON_BRK_SPACE, CBCOL_SECOND));
 
     bCheck = aCheckLB.IsChecked(DEL_SPACES_AT_STT_END, CBCOL_FIRST);
     bModified |= pOpt->bAFmtDelSpacesAtSttEnd != bCheck;
@@ -768,6 +780,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
     aCheckLB.GetModel()->Insert(CreateEntry(sOrdinal,			CBCOL_BOTH	));
     aCheckLB.GetModel()->Insert(CreateEntry(sFraction,			CBCOL_BOTH  ));
     aCheckLB.GetModel()->Insert(CreateEntry(sDash,				CBCOL_BOTH  ));
+    aCheckLB.GetModel()->Insert(CreateEntry(sNonBrkSpace,       CBCOL_BOTH  ));
     aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd,	CBCOL_BOTH  ));
     aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH  ));
 
@@ -801,6 +814,8 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
     aCheckLB.CheckEntryPos( REPLACE_HALF,		CBCOL_SECOND,	0 != (nFlags & ChgFractionSymbol) );
     aCheckLB.CheckEntryPos( REPLACE_DASHES,		CBCOL_FIRST,	pOpt->bChgToEnEmDash );
     aCheckLB.CheckEntryPos( REPLACE_DASHES,		CBCOL_SECOND,	0 != (nFlags & ChgToEnEmDash) );
+    aCheckLB.CheckEntryPos( ADD_NON_BRK_SPACE,  CBCOL_FIRST,	0 != (nFlags & AddNonBrkSpace) );
+    aCheckLB.CheckEntryPos( ADD_NON_BRK_SPACE,	CBCOL_SECOND,	0 != (nFlags & AddNonBrkSpace) );
     aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END,		CBCOL_FIRST,	pOpt->bAFmtDelSpacesAtSttEnd );
     aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END,		CBCOL_SECOND,	pOpt->bAFmtByInpDelSpacesAtSttEnd );
     aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES,	CBCOL_FIRST,	pOpt->bAFmtDelSpacesBetweenLines );
diff --git a/svx/source/cui/autocdlg.hrc b/svx/source/cui/autocdlg.hrc
index 38b350798..7aef1e40e 100644
--- a/svx/source/cui/autocdlg.hrc
+++ b/svx/source/cui/autocdlg.hrc
@@ -153,6 +153,7 @@
 #define FT_LANG                         209
 #define LB_LANG                         210
 #define ST_CORRECT_ACCIDENTAL_CAPS_LOCK 211
+#define ST_NON_BREAK_SPACE              212
 
 #define CB_SMARTTAGS                    220
 #define FT_SMARTTAGS                    221
diff --git a/svx/source/cui/autocdlg.hxx b/svx/source/cui/autocdlg.hxx
index ea5ee11e7..e3d1d3fcf 100644
--- a/svx/source/cui/autocdlg.hxx
+++ b/svx/source/cui/autocdlg.hxx
@@ -118,6 +118,7 @@ private:
     String		sNoDblSpaces;
     String		sHalf;
     String		sDash;
+    String      sNonBrkSpace;
     String		sFirst;
     String      sAccidentalCaps;
 
@@ -162,6 +163,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
     String			sFraction;
     String			sDetectURL;
     String          sDash;
+    String          sNonBrkSpace;
     String			sOrdinal;
     String			sRightMargin;
     String			sNum;
diff --git a/svx/source/cui/autocdlg.src b/svx/source/cui/autocdlg.src
index 099f63ab5..e207c5fa7 100644
--- a/svx/source/cui/autocdlg.src
+++ b/svx/source/cui/autocdlg.src
@@ -140,10 +140,14 @@ TabDialog RID_OFA_AUTOCORR_DLG
     String ST_DASH \
     { \
         Text [ en-US ] = "Replace dashes" ; \
-	}; \
+    }; \
     String ST_CORRECT_ACCIDENTAL_CAPS_LOCK \
     { \
         Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ; \
+    }; \
+    String ST_NON_BREAK_SPACE \
+    { \
+       Text [ en-US ] = "Add non breaking space before : ; ? ! in french text" ; \
     };
 
 /**************************************************************************/
diff --git a/svx/source/cui/cfg.cxx b/svx/source/cui/cfg.cxx
index 2931be6c1..4ed79a3a1 100644
--- a/svx/source/cui/cfg.cxx
+++ b/svx/source/cui/cfg.cxx
@@ -5724,7 +5724,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
                 if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) )
                 {
                     BitmapEx aBitmap = aImage.GetBitmapEx();
-                    BitmapEx aBitmapex = AutoScaleBitmap(aBitmap, m_nExpectedSize);
+                    BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, m_nExpectedSize);
                     aImage = Image( aBitmapex);
                 }
                 aTbSymbol.InsertItem( nId,aImage, aURL, 0, 0 ); //modify
@@ -5888,7 +5888,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
                 if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) )
                 {
                     BitmapEx aBitmap = aImage.GetBitmapEx();
-                    BitmapEx aBitmapex = AutoScaleBitmap(aBitmap, m_nExpectedSize);
+                    BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, m_nExpectedSize);
                     aImage = Image( aBitmapex);
                 }
                 if ( bOK && !!aImage )
diff --git a/svx/source/cui/optgdlg.cxx b/svx/source/cui/optgdlg.cxx
index e060e2b11..70e1bce66 100644
--- a/svx/source/cui/optgdlg.cxx
+++ b/svx/source/cui/optgdlg.cxx
@@ -167,8 +167,10 @@ namespace
                 return rtl::OUString();
                 #endif
             }
-            #if defined WNT || (defined MACOSX && defined QUARTZ)
+            #if defined WNT
             return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" );
+            #elif (defined MACOSX && defined QUARTZ)
+            return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.AquaFilePicker" );
             #else
             return rtl::OUString();
             #endif
diff --git a/svx/source/cui/webconninfo.cxx b/svx/source/cui/webconninfo.cxx
index c370c38f2..0298a8fc7 100644
--- a/svx/source/cui/webconninfo.cxx
+++ b/svx/source/cui/webconninfo.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@
 #include <com/sun/star/task/XMasterPasswordHandling.hpp>
 
 #include <comphelper/processfactory.hxx>
-#include <svtools/docpasswdrequest.hxx>
+#include <comphelper/docpasswordrequest.hxx>
 
 #include "webconninfo.hxx"
 #include "webconninfo.hrc"
@@ -290,16 +290,15 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG )
                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.task.InteractionHandler" ) ) ),
             uno::UNO_QUERY_THROW );
 
-        
+
         SvLBoxEntry* pEntry = m_aPasswordsLB.GetCurEntry();
         if ( pEntry )
         {
             ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 );
             ::rtl::OUString aUserName = m_aPasswordsLB.GetEntryText( pEntry, 1 );
 
-            RequestDocumentPassword* pPasswordRequest = new RequestDocumentPassword(
-                                                               task::PasswordRequestMode_PASSWORD_CREATE,
-                                                               aURL );
+            ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest(
+                ::comphelper::DocPasswordRequestType_STANDARD, task::PasswordRequestMode_PASSWORD_CREATE, aURL );
 
             uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest );
             xInteractionHandler->handle( rRequest );
@@ -317,7 +316,7 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG )
 
     return 0;
 }
-     
+
 // -----------------------------------------------------------------------
 IMPL_LINK( WebConnectionInfoDialog, EntrySelectedHdl, void*, EMPTYARG )
 {
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 1f411f35b..16f48581b 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -55,6 +55,12 @@
 #include <svx/xlnedwit.hxx>
 #include <svx/xlnstcit.hxx>
 #include <svx/xlnedcit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
+#include <svx/xgrad.hxx>
+#include <svx/xbitmap.hxx>
+#include <svx/xhatch.hxx>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
 #ifndef __COM_SUN_STAR_DRAWING_ENHANCEDCUSTOMSHAPESEGMENTCOMMAND_HPP__
@@ -64,6 +70,7 @@
 #include <boost/shared_ptr.hpp>
 #endif
 #include <basegfx/numeric/ftools.hxx>
+#include <basegfx/color/bcolortools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 // #i76201#
@@ -724,23 +731,23 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
     /*const sal_Int32* pDefData =*/ ApplyShapeAttributes( rGeometryItem );
     switch( eSpType )
     {
-        case mso_sptCan :						nColorData = 0x20200000; break;
-        case mso_sptCube :						nColorData = 0x302d0000; break;
-        case mso_sptActionButtonBlank :			nColorData = 0x502ad400; break;
-        case mso_sptActionButtonHome :			nColorData = 0x702ad4ad; break;
-        case mso_sptActionButtonHelp :			nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonInformation :	nColorData = 0x702ad4a5; break;
-        case mso_sptActionButtonBackPrevious :	nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonForwardNext :	nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonBeginning :		nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonEnd :			nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonReturn :		nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonDocument :		nColorData = 0x702ad4da; break;
-        case mso_sptActionButtonSound :			nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonMovie :			nColorData = 0x602ad4a0; break;
-        case mso_sptBevel :						nColorData = 0x502ad400; break;
-        case mso_sptFoldedCorner :				nColorData = 0x20d00000; break;
-        case mso_sptSmileyFace :				nColorData = 0x20d00000; break;
+        case mso_sptCan :						nColorData = 0x20400000; break;
+        case mso_sptCube :						nColorData = 0x302e0000; break;
+        case mso_sptActionButtonBlank :			nColorData = 0x502ce400; break;
+        case mso_sptActionButtonHome :			nColorData = 0x702ce4ce; break;
+        case mso_sptActionButtonHelp :			nColorData = 0x602ce4c0; break;
+        case mso_sptActionButtonInformation :	nColorData = 0x702ce4c5; break;
+        case mso_sptActionButtonBackPrevious :	nColorData = 0x602ce4c0; break;
+        case mso_sptActionButtonForwardNext :	nColorData = 0x602ce4c0; break;
+        case mso_sptActionButtonBeginning :		nColorData = 0x602ce4c0; break;
+        case mso_sptActionButtonEnd :			nColorData = 0x602ce4c0; break;
+        case mso_sptActionButtonReturn :		nColorData = 0x602ce4c0; break;
+        case mso_sptActionButtonDocument :		nColorData = 0x702ce4ec; break;
+        case mso_sptActionButtonSound :			nColorData = 0x602ce4c0; break;
+        case mso_sptActionButtonMovie :			nColorData = 0x602ce4c0; break;
+        case mso_sptBevel :						nColorData = 0x502ce400; break;
+        case mso_sptFoldedCorner :				nColorData = 0x20e00000; break;
+        case mso_sptSmileyFace :				nColorData = 0x20e00000; break;
         case mso_sptNil :
         {
             if( sShapeType.getLength() > 4 &&
@@ -754,14 +761,14 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
         case mso_sptCurvedRightArrow :
         case mso_sptCurvedUpArrow :
         case mso_sptCurvedDownArrow :			nColorData = 0x2d000000; break;
-        case mso_sptRibbon2 :					nColorData = 0x30dd0000; break;
-        case mso_sptRibbon :					nColorData = 0x30dd0000; break;
+        case mso_sptRibbon2 :					nColorData = 0x30ee0000; break;
+        case mso_sptRibbon :					nColorData = 0x30ee0000; break;
 
-        case mso_sptEllipseRibbon2 :			nColorData = 0x30dd0000; break;
-        case mso_sptEllipseRibbon :				nColorData = 0x30dd0000; break;
+        case mso_sptEllipseRibbon2 :			nColorData = 0x30ee0000; break;
+        case mso_sptEllipseRibbon :				nColorData = 0x30ee0000; break;
 
-        case mso_sptVerticalScroll :			nColorData = 0x30dd0000; break;
-        case mso_sptHorizontalScroll :			nColorData = 0x30dd0000; break;
+        case mso_sptVerticalScroll :			nColorData = 0x30ee0000; break;
+        case mso_sptHorizontalScroll :			nColorData = 0x30ee0000; break;
         default:
             break;
     }
@@ -1022,41 +1029,48 @@ sal_Bool EnhancedCustomShape2d::GetParameter( double& rRetValue, const EnhancedC
 // nLumDat 27-24 = nLumDatEntry 0
 // nLumDat 23-20 = nLumDatEntry 1 ...
 // each 4bit entry is to be interpreted as a 10 percent signed luminance changing
-Color EnhancedCustomShape2d::GetColorData( const Color& rFillColor, sal_uInt32 nIndex )
+sal_Int32 EnhancedCustomShape2d::GetLuminanceChange( sal_uInt32 nIndex ) const
 {
-    Color aRetColor;
+    const sal_uInt32 nCount = nColorData >> 28;
+    if ( !nCount )
+        return 0;
 
-    sal_uInt32 i, nColor, nTmp, nCount = nColorData >> 28;
+    if ( nIndex >= nCount )
+        nIndex = nCount - 1;
 
-    if ( nCount )
+    const sal_Int32 nLumDat = nColorData << ( ( 1 + nIndex ) << 2 );
+    return ( nLumDat >> 28 ) * 10;
+}
+
+Color EnhancedCustomShape2d::GetColorData( const Color& rFillColor, sal_uInt32 nIndex ) const
+{
+    const sal_Int32 nLuminance = GetLuminanceChange(nIndex);
+    if( !nLuminance )
+        return rFillColor;
+
+    basegfx::BColor aHSVColor=
+        basegfx::tools::rgb2hsv(
+            basegfx::BColor(rFillColor.GetRed()/255.0,
+                            rFillColor.GetGreen()/255.0,
+                            rFillColor.GetBlue()/255.0));
+    if( nLuminance > 0 )
+    {
+        aHSVColor.setGreen(
+            aHSVColor.getGreen() * (1.0-nLuminance/100.0));
+        aHSVColor.setBlue(
+            nLuminance/100.0 + 
+            (1.0-nLuminance/100.0)*aHSVColor.getBlue());
+    }
+    else if( nLuminance < 0 )
     {
-        if ( nIndex >= nCount )
-            nIndex = nCount - 1;
-
-        sal_uInt32 nFillColor = (sal_uInt32)rFillColor.GetRed() |
-                                    ((sal_uInt32)rFillColor.GetGreen() << 8 ) |
-                                        ((sal_uInt32)rFillColor.GetBlue() << 16 );
-
-        sal_Int32 nLumDat = nColorData << ( ( 1 + nIndex ) << 2 );
-        sal_Int32 nLuminance = ( nLumDat >> 28 ) * 12;
-
-        nTmp = nFillColor;
-        nColor = 0;
-        for ( i = 0; i < 3; i++ )
-        {
-            sal_Int32 nC = (sal_uInt8)nTmp;
-            nTmp >>= 8;
-            nC += ( ( nLuminance * nC ) >> 8 );
-            if ( nC < 0 )
-                nC = 0;
-            else if ( nC &~ 0xff )
-                nC = 0xff;
-            nColor >>= 8;
-            nColor |= nC << 16;
-        }
-        aRetColor = Color( (sal_uInt8)nColor, (sal_uInt8)( nColor >> 8 ), (sal_uInt8)( nColor >> 16 ) );
+        aHSVColor.setBlue(
+            (1.0+nLuminance/100.0)*aHSVColor.getBlue());
     }
-    return aRetColor;
+
+    aHSVColor = basegfx::tools::hsv2rgb(aHSVColor);
+    return Color( (sal_uInt8)static_cast< sal_Int32 >( basegfx::clamp(aHSVColor.getRed(),0.0,1.0) * 255.0 + 0.5 ), 
+                  (sal_uInt8)static_cast< sal_Int32 >( basegfx::clamp(aHSVColor.getGreen(),0.0,1.0) * 255.0 + 0.5 ),
+                  (sal_uInt8)static_cast< sal_Int32 >( basegfx::clamp(aHSVColor.getBlue(),0.0,1.0) * 255.0 + 0.5 ) );
 }
 
 Rectangle EnhancedCustomShape2d::GetTextRect() const
@@ -1687,6 +1701,19 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
 
     if(aNewB2DPolyPolygon.count())
     {
+        if( !bLineGeometryNeededOnly )
+        {
+            // hack aNewB2DPolyPolygon to fill logic rect - this is
+            // needed to produce gradient fills that look like mso
+            aNewB2DPolygon.clear();
+            aNewB2DPolygon.append(basegfx::B2DPoint(0,0));
+            aNewB2DPolyPolygon.append(aNewB2DPolygon);
+
+            aNewB2DPolygon.clear();
+            aNewB2DPolygon.append(basegfx::B2DPoint(aLogicRect.GetWidth(),
+                                                    aLogicRect.GetHeight()));
+            aNewB2DPolyPolygon.append(aNewB2DPolygon);
+        }
         // #i37011#
         bool bForceCreateTwoObjects(false);
 
@@ -1856,6 +1883,78 @@ void CorrectCalloutArrows( MSO_SPT eSpType, sal_uInt32 nLineObjectCount, std::ve
     }
 }
 
+void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rCustomShapeSet, 
+                                          sal_uInt32& nColorIndex, sal_uInt32 nColorCount)
+{
+    if ( !rObj.IsLine() )
+    {
+        const XFillStyle eFillStyle = ((const XFillStyleItem&)rObj.GetMergedItem(XATTR_FILLSTYLE)).GetValue();
+        switch( eFillStyle )
+        {
+            default:
+            case XFILL_SOLID:
+            {
+                Color aFillColor;
+                if ( nColorCount )
+                {
+                    aFillColor = GetColorData( 
+                        ((XFillColorItem&)rCustomShapeSet.Get( XATTR_FILLCOLOR )).GetColorValue(), 
+                        std::min(nColorIndex, nColorCount-1) );
+                    rObj.SetMergedItem( XFillColorItem( String(), aFillColor ) );
+                }
+                break;
+            }
+            case XFILL_GRADIENT:
+            {
+                XGradient aXGradient(((const XFillGradientItem&)rObj.GetMergedItem(XATTR_FILLGRADIENT)).GetGradientValue());
+                if ( nColorCount )
+                {
+                    aXGradient.SetStartColor(
+                        GetColorData(
+                            aXGradient.GetStartColor(), 
+                            std::min(nColorIndex, nColorCount-1) ));
+                    aXGradient.SetEndColor(
+                        GetColorData(
+                            aXGradient.GetEndColor(), 
+                            std::min(nColorIndex, nColorCount-1) ));
+                }
+
+                rObj.SetMergedItem( XFillGradientItem( String(), aXGradient ) );
+                break;
+            }
+            case XFILL_HATCH:
+            {
+                XHatch aXHatch(((const XFillHatchItem&)rObj.GetMergedItem(XATTR_FILLHATCH)).GetHatchValue());
+                if ( nColorCount )
+                {
+                    aXHatch.SetColor(
+                        GetColorData(
+                            aXHatch.GetColor(), 
+                            std::min(nColorIndex, nColorCount-1) ));
+                }
+
+                rObj.SetMergedItem( XFillHatchItem( String(), aXHatch ) );
+                break;
+            }
+            case XFILL_BITMAP:
+            {
+                Bitmap aBitmap(((const XFillBitmapItem&)rObj.GetMergedItem(XATTR_FILLBITMAP)).GetBitmapValue().GetBitmap());
+                if ( nColorCount )
+                {
+                    aBitmap.Adjust(
+                        static_cast< short > ( GetLuminanceChange(
+                            std::min(nColorIndex, nColorCount-1))));
+                }
+
+                rObj.SetMergedItem( XFillBitmapItem( String(), aBitmap ) );
+                break;
+            }
+        }
+
+        if ( nColorIndex < nColorCount )
+            nColorIndex++;
+    }
+}
 
 SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnly )
 {
@@ -1880,18 +1979,10 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnl
     if ( vObjectList.size() )
     {
         const SfxItemSet& rCustomShapeSet = pCustomShapeObj->GetMergedItemSet();
-        // For primitive rendering, shadow handling is done completely based on the geometry, so i removed it here
-        // const sal_Bool	bShadow(((SdrShadowItem&)rCustomShapeSet.Get( SDRATTR_SHADOW )).GetValue());
-        Color			aBasicColor( COL_WHITE );
         Color			aFillColor;
         sal_uInt32		nColorCount = nColorData >> 28;
         sal_uInt32		nColorIndex	= 0;
 
-        if ( nColorCount )
-        {
-            aBasicColor = ((XFillColorItem&)rCustomShapeSet.Get( XATTR_FILLCOLOR )).GetColorValue();
-        }
-
         // #i37011# remove invisible objects
         if(vObjectList.size())
         {
@@ -1916,26 +2007,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnl
         if(1L == vObjectList.size())
         {
             // a single object, correct some values
-            SdrPathObj* pObj(vObjectList[0L]);
-
-// For primitive rendering, shadow handling is done completely based on the geometry, so i removed it here
-//			if(bShadow)
-//			{
-//				pObj->SetMergedItem(SdrShadowItem(sal_True));
-//			}
-
-            if(!pObj->IsLine())
-            {
-                if ( nColorIndex < nColorCount )
-                {
-                    aFillColor = GetColorData( aBasicColor, nColorIndex++ );
-                }
-
-                if ( nColorCount )
-                {
-                    pObj->SetMergedItem( XFillColorItem( String(), aFillColor ) );
-                }
-            }
+            AdaptObjColor(*vObjectList[0L],rCustomShapeSet,nColorIndex,nColorCount);
         }
         else
         {
@@ -1954,16 +2026,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnl
                 else
                 {
                     nAreaObjectCount++;
-
-                    if ( nColorIndex < nColorCount )
-                    {
-                        aFillColor = GetColorData( aBasicColor, nColorIndex++ );
-                    }
-
-                    if ( nColorCount )
-                    {
-                        pObj->SetMergedItem( XFillColorItem( String(), aFillColor ) );
-                    }
+                    AdaptObjColor(*pObj,rCustomShapeSet,nColorIndex,nColorCount);
                 }
             }
 
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/source/customshapes/EnhancedCustomShape2d.hxx
index 134118e3b..e8f40b49d 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.hxx
@@ -120,7 +120,10 @@ class EnhancedCustomShape2d : public SfxItemSet
         sal_Int32					nRotateAngle;
 
         sal_Bool					SetAdjustValueAsDouble( const double& rValue, const sal_Int32 nIndex );
-        Color						GetColorData( const Color& rFillColor, sal_uInt32 nIndex );
+        sal_Int32                   GetLuminanceChange( sal_uInt32 nIndex ) const;
+        Color						GetColorData( const Color& rFillColor, sal_uInt32 nIndex ) const;
+        void                        AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rCustomShapeSet, 
+                                                  sal_uInt32& nColorIndex, sal_uInt32 nColorCount);
         sal_Bool					GetParameter( double& rParameterReturnValue,  const com::sun::star::drawing::EnhancedCustomShapeParameter&,
                                                     const sal_Bool bReplaceGeoWidth, const sal_Bool bReplaceGeoHeight ) const;
         Point						GetPoint( const com::sun::star::drawing::EnhancedCustomShapeParameterPair&,
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 57cb33d27..b772ca844 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -683,7 +683,7 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW
                 break;
             const Polygon& rOutlinePoly( aOutlines2d[ nOutline2dIdx++ ] );
             const sal_uInt16 nPointCount = rOutlinePoly.GetSize();
-            if ( nPointCount )
+            if ( nPointCount > 1 )
             {
                 std::vector< double > vDistances;
                 vDistances.reserve( nPointCount );
@@ -745,7 +745,7 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW
             const Polygon& rOutlinePoly2( aOutlines2d[ nOutline2dIdx++ ] );
             const sal_uInt16 nPointCount = rOutlinePoly.GetSize();
             const sal_uInt16 nPointCount2 = rOutlinePoly2.GetSize();
-            if ( nPointCount && nPointCount2 )
+            if ( ( nPointCount > 1 ) && ( nPointCount2 > 1 ) )
             {
                 std::vector< double > vDistances;
                 vDistances.reserve( nPointCount );
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 527be2b9b..7d89f8fa6 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -34,7 +34,7 @@
 #include "txencbox.hxx"
 #include "txenctab.hxx"
 #include <svx/dialogs.hrc>
-#include "dbcharsethelper.hxx"
+#include "svx/dbcharsethelper.hxx"
 #include <vcl/svapp.hxx>
 #include <rtl/tencinfo.h>
 #include <rtl/locale.h>
diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx
index 95ecf6170..9a794c2ca 100644
--- a/svx/source/editeng/acorrcfg.cxx
+++ b/svx/source/editeng/acorrcfg.cxx
@@ -128,9 +128,10 @@ Sequence<OUString> 	SvxBaseAutoCorrCfg::GetPropertyNames()
         "ReplaceDoubleQuote",					// 14
         "DoubleQuoteAtStart",					// 15
 		"DoubleQuoteAtEnd",						// 16
-        "CorrectAccidentalCapsLock"             // 17
+        "CorrectAccidentalCapsLock",            // 17
+        "AddNonBreakingSpace"                   // 18
     };
-	const int nCount = 18;
+	const int nCount = 19;
     Sequence<OUString> aNames(nCount);
     OUString* pNames = aNames.getArray();
     for(int i = 0; i < nCount; i++)
@@ -234,6 +235,10 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit)
                         if(*(sal_Bool*)pValues[nProp].getValue())
                             nFlags |= CorrectCapsLock;
                     break;//"CorrectAccidentalCapsLock"
+                    case 18:
+                        if(*(sal_Bool*)pValues[nProp].getValue())
+                             nFlags |= AddNonBrkSpace;
+                     break;//"AddNonBreakingSpace"
                 }
             }
         }
@@ -408,8 +413,10 @@ Sequence<OUString> 	SvxSwAutoCorrCfg::GetPropertyNames()
         "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily",    //45
         "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset",   //46
         "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch",     //47
+        "Format/Option/AddNonBreakSpace",                               //48
+        "Format/ByInput/AddNonBreakSpace",                              //49
     };
-    const int nCount = 48;
+    const int nCount = 50;
     Sequence<OUString> aNames(nCount);
     OUString* pNames = aNames.getArray();
     for(int i = 0; i < nCount; i++)
@@ -561,6 +568,8 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
                         rSwFlags.aByInputBulletFont.SetPitch(FontPitch(nVal));
                     }
                     break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch",
+                    case 48 : rSwFlags.bAddNonBrkSpace = *(sal_Bool*)pValues[nProp].getValue( ); break;// "Format/Output/AddNonBreakingSpace",
+                    case 49 : rSwFlags.bAddNonBrkSpace = *(sal_Bool*)pValues[nProp].getValue( ); break;// "Format/ByInput/AddNonBreakingSpace",
                 }
             }
         }
@@ -676,6 +685,12 @@ void SvxSwAutoCorrCfg::Commit()
             case 47 :
                 pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetPitch();
             break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch",
+            case  48:
+                bVal = rSwFlags.bAddNonBrkSpace;  pValues[nProp].setValue(&bVal, rType);
+            break; // "Format/Option/AddNonBreakingSpace",
+            case  49:
+                bVal = rSwFlags.bAddNonBrkSpace;  pValues[nProp].setValue(&bVal, rType);
+            break; // "Format/ByInput/AddNonBreakingSpace",
         }
     }
     PutProperties(aNames, aValues);
diff --git a/svx/source/editeng/svxacorr.cxx b/svx/source/editeng/svxacorr.cxx
index a6e740129..fd7b0936a 100644
--- a/svx/source/editeng/svxacorr.cxx
+++ b/svx/source/editeng/svxacorr.cxx
@@ -33,6 +33,7 @@
 
 
 #include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/lang/Locale.hpp>
 #include <tools/urlobj.hxx>
 #include <tools/table.hxx>
 #include <i18npool/mslangid.hxx>
@@ -98,6 +99,8 @@
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <xmloff/xmltoken.hxx>
 
+#define CHAR_HARDBLANK		((sal_Unicode)0x00A0)
+
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
@@ -348,6 +351,7 @@ long SvxAutoCorrect::GetDefaultFlags()
                     | ChgFractionSymbol
                     | ChgOrdinalNumber
                     | ChgToEnEmDash
+                    | AddNonBrkSpace
                     | ChgWeightUnderl
                     | SetINetAttr
                     | ChgQuotes
@@ -694,6 +698,50 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash(
     return bRet;
 }
 
+BOOL SvxAutoCorrect::FnAddNonBrkSpace(
+                                SvxAutoCorrDoc& rDoc, const String& rTxt,
+                                xub_StrLen , xub_StrLen nEndPos,
+                                LanguageType eLang )
+{
+    bool bRet = false;
+    
+    CharClass& rCC = GetCharClass( eLang );
+    const lang::Locale rLocale = rCC.getLocale( );
+
+    if ( rLocale.Language == OUString::createFromAscii( "fr" ) )
+    {
+        sal_Unicode cChar = rTxt.GetChar( nEndPos );
+        if ( cChar == ':' || cChar == ';' || cChar == '!' || cChar == '?' )
+        {
+            // Check the previous char
+            sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 );
+            if ( cPrevChar != ':' && cPrevChar != ';' && cPrevChar != '!' && cPrevChar != '?' )
+            { 
+                // Remove any previous normal space
+                xub_StrLen nPos = nEndPos - 1;
+                while ( cPrevChar == ' ' || cPrevChar == CHAR_HARDBLANK )
+                {
+                    if ( nPos == 0 ) break;
+                    nPos--;
+                    cPrevChar = rTxt.GetChar( nPos );
+                }
+
+                if ( nPos != 0 )
+                {
+                    nPos++;
+                    if ( nEndPos - nPos > 0 )
+                        rDoc.Delete( nPos, nEndPos );
+
+                    // Add the non-breaking space at the end pos
+                    rDoc.Insert( nPos, CHAR_HARDBLANK );
+                    bRet = true;
+                }
+            }
+        }
+    }
+
+    return bRet;
+}
 
 BOOL SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                     xub_StrLen nSttPos, xub_StrLen nEndPos,
@@ -1347,6 +1395,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                 FnChgFractionSymbol( rDoc, rTxt, nCapLttrPos, nInsPos ) ) ||
             ( IsAutoCorrFlag( nRet = ChgOrdinalNumber ) &&
                 FnChgOrdinalNumber( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) ) ||
+            ( IsAutoCorrFlag( nRet = AddNonBrkSpace ) &&
+                FnAddNonBrkSpace( rDoc, rTxt, nCapLttrPos, nInsPos - 1, eLang ) ) ||
             ( IsAutoCorrFlag( nRet = SetINetAttr ) &&
                 ( ' ' == cChar || '\t' == cChar || 0x0a == cChar || !cChar ) &&
                 FnSetINetAttr( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) ) )
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 54e5b1245..e3ea3b2a3 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -36,7 +36,7 @@
 #endif
 #include <svx/gridctrl.hxx>
 #include "gridcell.hxx"
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "fmtools.hxx"
 #include <svtools/stringtransfer.hxx>
 
@@ -698,25 +698,6 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
             else
                 pWnd->SetText(aText);
 
-            {
-                vos::OGuard aPaintSafety(Application::GetSolarMutex());
-                // we want to update only the window, not our parent, so lock the latter
-                // (In fact, if we are in DbGridControl::RecalcRows, perhaps as a result of an setDataSource or
-                // a VisibleRowsChanged, the grid will be frozen and a SeekRow triggered implicitly by the update
-                // of pWnd will fail.)
-                // (the SetUpdateMode call goes to the data window : it's sufficient to prevent SeekRow's, but it
-                // avoids the Invalidate which would be triggered by BrowseBox::SetUpdateMode (which lead to massive
-                // flicker when scrolling))
-                // FS - 06.10.99
-
-                // don't use SetUpdateMode in those situations as all necessary paints get lost DG
-                // so update only if necessary (DG)
-                if (pParent->IsPaintEnabled())
-                {
-                    pWnd->Update();
-                    pWnd->Flush();
-                }
-            }
             pParent->SetRealRowCount(aText);
         }	break;
     }
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 3b8a0cf8c..c5af260f7 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -452,9 +452,11 @@ namespace svxform
         bool bIsDocModified = false;
         m_pNaviWin->DisableNotify( true );
 
-        if ( TBI_ITEM_ADD == _nToolBoxID
-            || TBI_ITEM_ADD_ELEMENT == _nToolBoxID
-            || TBI_ITEM_ADD_ATTRIBUTE == _nToolBoxID )
+        switch ( _nToolBoxID )
+        {
+        case TBI_ITEM_ADD:
+        case TBI_ITEM_ADD_ELEMENT:
+        case TBI_ITEM_ADD_ATTRIBUTE:
         {
             bHandled = true;
             Reference< css::xforms::XModel > xModel( m_xUIHelper, UNO_QUERY );
@@ -643,7 +645,9 @@ namespace svxform
                 }
             }
         }
-        else if ( TBI_ITEM_EDIT == _nToolBoxID )
+        break;
+
+        case TBI_ITEM_EDIT:
         {
             bHandled = true;
             SvLBoxEntry* pEntry = m_aItemList.FirstSelected();
@@ -737,7 +741,9 @@ namespace svxform
                 }
             }
         }
-        else if ( TBI_ITEM_REMOVE == _nToolBoxID )
+        break;
+
+        case TBI_ITEM_REMOVE:
         {
             bHandled = true;
             if ( DGTInstance == m_eGroup && m_sInstanceURL.Len() > 0 )
@@ -748,6 +754,18 @@ namespace svxform
             }
             bIsDocModified = RemoveEntry();
         }
+        break;
+
+        case MID_INSERT_CONTROL:
+        {
+            OSL_ENSURE( false, "XFormsPage::DoToolboxAction: MID_INSERT_CONTROL not implemented, yet!" );
+        }
+        break;
+
+        default:
+            OSL_ENSURE( false, "XFormsPage::DoToolboxAction: unknown ID!" );
+            break;
+        }
 
         m_pNaviWin->DisableNotify( false );
         EnableMenuItems( NULL );
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index aabb61383..64bc69083 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -512,7 +512,8 @@ Menu RID_MENU_DATANAVIGATOR
 {
     ItemList =
     {
-        MenuItem
+        // MID_INSERT_CONTROL not implemented, yet (#i99890#)
+        /*MenuItem
         {
             Identifier = MID_INSERT_CONTROL ;
             HelpId = HID_XFORMS_MID_INSERT_CONTROL ;
@@ -521,7 +522,7 @@ Menu RID_MENU_DATANAVIGATOR
         MenuItem
         {
             Separator = TRUE;
-        };
+        };*/
         MenuItem
         {
             Identifier = TBI_ITEM_ADD ;
diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx
index d430f1063..9f6b1b740 100644
--- a/svx/source/form/dbcharsethelper.cxx
+++ b/svx/source/form/dbcharsethelper.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "dbcharsethelper.hxx"
+#include "svx/dbcharsethelper.hxx"
 
 //........................................................................
 namespace svxform
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index d467a53b6..c430a2e14 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include <osl/diagnose.h>
 #include <connectivity/formattedcolumnvalue.hxx>
 
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index 58c3db830..fb5790c35 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -34,7 +34,7 @@
 #ifndef SVX_SOURCE_FORM_FMDOCUMENTCLASSIFICATION_HXX
 #include "fmdocumentclassification.hxx"
 #endif
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/container/XChild.hpp>
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index edd9b2071..107cf5464 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -40,7 +40,7 @@
 #include "fmobj.hxx"
 #include "svditer.hxx"
 #include "fmresids.hrc"
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "treevisitor.hxx"
 
 #include <com/sun/star/sdb/CommandType.hpp>
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index e92693c0b..ab444c591 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -430,7 +430,7 @@ namespace svxform
                     Reference< XControl > xControl( aEvent.Source, UNO_QUERY_THROW );
                     Reference< XPropertySet > xProps( xControl->getModel(), UNO_QUERY_THROW );
                     aCaller = xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) );
-                }
+        }
                 catch( Exception& ) {}
             }
             m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs, true, aCaller.hasValue() ? &aCaller : 0 );
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 1a5628baf..3f978a53a 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include "fmtools.hxx"
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "fmservs.hxx"
 #include <svx/fmglob.hxx>
 #include <vcl/stdtext.hxx>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 5c4b6ca5b..1deff36ac 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -55,7 +55,7 @@
 #include <rtl/logfile.hxx>
 #include <svx/dialmgr.hxx>
 #include "fmpgeimp.hxx"
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include <svtools/macitem.hxx>
 #include <tools/shl.hxx>
 #include <tools/diagnose_ex.h>
@@ -217,7 +217,7 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
 	try
 	{
 		m_vbaListener =  new ScriptEventListenerWrapper( _rModel );
-	}
+}
 	catch( Exception& )
 	{
 	}
@@ -872,8 +872,8 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r
                 m_pScriptingEnv->revokeEventAttacherManager( xManager );
                 if ( m_vbaListener.is() )
                     xManager->removeScriptListener( m_vbaListener );
-            }
         }
+		}
 
         // also handle all children of this element
         sal_uInt32 nCount = _rxContainer->getCount();
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index b4151a953..33f8b47bd 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -30,7 +30,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "formcontrolfactory.hxx"
 #include "fmcontrollayout.hxx"
 #include "fmprop.hrc"
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 7aa57d9a8..0ad906246 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -52,7 +52,7 @@
 #endif
 #include <svx/fmshell.hxx>
 #include "fmshimp.hxx"
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include <svx/fmpage.hxx>
 
 #ifndef _SVX_FMPGEIMP_HXX
diff --git a/svx/source/inc/dbcharsethelper.hxx b/svx/source/inc/dbcharsethelper.hxx
deleted file mode 100644
index c88ecc71f..000000000
--- a/svx/source/inc/dbcharsethelper.hxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dbcharsethelper.hxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVX_DBCHARSETHELPER_HXX
-#define SVX_DBCHARSETHELPER_HXX
-
-#include "dbtoolsclient.hxx"
-
-//........................................................................
-namespace svxform
-{
-//........................................................................
-
-    //====================================================================
-    //= ODataAccessCharsetHelper
-    //====================================================================
-    class ODataAccessCharsetHelper : public ODbtoolsClient
-    {
-    protected:
-        mutable ::rtl::Reference< ::connectivity::simple::IDataAccessCharSet >	m_xCharsetHelper;
-
-    protected:
-        virtual bool ensureLoaded() const;
-
-    public:
-        ODataAccessCharsetHelper( );
-
-        inline sal_Int32	getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs ) const
-        {
-            if ( ensureLoaded() )
-                return m_xCharsetHelper->getSupportedTextEncodings( _rEncs );
-            return 0;
-        }
-    };
-
-//........................................................................
-}	// namespace svxform
-//........................................................................
-
-#endif // SVX_DBCHARSETCLIENT_HXX
-
-
diff --git a/svx/source/inc/dbtoolsclient.hxx b/svx/source/inc/dbtoolsclient.hxx
deleted file mode 100644
index 262b791e8..000000000
--- a/svx/source/inc/dbtoolsclient.hxx
+++ /dev/null
@@ -1,238 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dbtoolsclient.hxx,v $
- * $Revision: 1.18 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVX_DBTOOLSCLIENT_HXX
-#define SVX_DBTOOLSCLIENT_HXX
-
-#include <connectivity/virtualdbtools.hxx>
-#include <osl/mutex.hxx>
-#include <osl/module.h>
-#include <tools/solar.h>
-#include <unotools/sharedunocomponent.hxx>
-#include <svx/svxdllapi.h>
-
-//........................................................................
-namespace svxform
-{
-//........................................................................
-
-    typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection;
-
-    //====================================================================
-    //= ODbtoolsClient
-    //====================================================================
-    /** base class for classes which want to use dbtools features with load-on-call
-        of the dbtools lib.
-    */
-    class SVX_DLLPUBLIC ODbtoolsClient
-    {
-    private:
-        static	::osl::Mutex	s_aMutex;
-        static	sal_Int32		s_nClients;
-        static oslModule		s_hDbtoolsModule;
-        static ::connectivity::simple::createDataAccessToolsFactoryFunction
-                                s_pFactoryCreationFunc;
-        //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time)
-        mutable BOOL            m_bCreateAlready;
-
-    private:
-        mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory >	m_xDataAccessFactory;
-
-    protected:
-        ODbtoolsClient();
-        virtual ~ODbtoolsClient();
-
-        virtual bool ensureLoaded() const;
-
-    protected:
-        const ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory >&
-            getFactory() const { return m_xDataAccessFactory; }
-
-    private:
-        static void registerClient();
-        static void revokeClient();
-    };
-
-    //====================================================================
-    //= OStaticDataAccessTools
-    //====================================================================
-    class SVX_DLLPUBLIC OStaticDataAccessTools : public ODbtoolsClient
-    {
-    protected:
-        mutable ::rtl::Reference< ::connectivity::simple::IDataAccessTools >	m_xDataAccessTools;
-
-    protected:
-        virtual bool ensureLoaded() const;
-
-    public:
-        OStaticDataAccessTools();
-
-        SVX_DLLPRIVATE const ::rtl::Reference< ::connectivity::simple::IDataAccessTools >& getDataAccessTools() const { return m_xDataAccessTools; }
-
-        // ------------------------------------------------
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn,
-            sal_Bool _bAllowDefault
-        ) const;
-
-        // ------------------------------------------------
-        SVX_DLLPRIVATE sal_Int32 getDefaultNumberFormat(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xColumn,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _xTypes,									 
-            const ::com::sun::star::lang::Locale& _rLocale );
-
-        // ------------------------------------------------
-        SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback(
-            const ::rtl::OUString& _rDataSourceName,
-            const ::rtl::OUString& _rUser,
-            const ::rtl::OUString& _rPwd,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
-        ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) );
-
-        // ------------------------------------------------
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory,
-            sal_Bool _bSetAsActiveConnection
-        ) const SAL_THROW ( ( ::com::sun::star::sdbc::SQLException
-                            , ::com::sun::star::lang::WrappedTargetException
-                            , ::com::sun::star::uno::RuntimeException) );
-
-        // ------------------------------------------------
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet)
-                const SAL_THROW ( (::com::sun::star::uno::RuntimeException) );
-
-        // ------------------------------------------------
-        SVX_DLLPRIVATE void TransferFormComponentProperties(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxOld,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxNew,
-            const ::com::sun::star::lang::Locale& _rLocale
-        ) const;
-
-        // ------------------------------------------------
-        SVX_DLLPRIVATE ::rtl::OUString quoteName(
-            const ::rtl::OUString& _rQuote,
-            const ::rtl::OUString& _rName
-        ) const;
-
-        // ------------------------------------------------
-        SVX_DLLPRIVATE ::rtl::OUString composeTableNameForSelect(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable
-        ) const;
-
-        // ------------------------------------------------
-        SVX_DLLPRIVATE ::com::sun::star::sdb::SQLContext prependContextInfo(
-            ::com::sun::star::sdbc::SQLException& _rException,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
-            const ::rtl::OUString& _rContextDescription,
-            const ::rtl::OUString& _rContextDetails
-        ) const;
-
-        // ------------------------------------------------
-        SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource(
-                const ::rtl::OUString& _rsRegisteredName,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
-            ) const;
-
-        // ------------------------------------------------
-        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
-            @param		_rxCursorSet	the property set
-        */
-        SVX_DLLPRIVATE sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
-
-        // ------------------------------------------------
-        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE
-            @param		_rxCursorSet	the property set
-        */
-        SVX_DLLPRIVATE sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
-
-        // ------------------------------------------------
-        /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE
-            @param		_rxCursorSet	the property set
-        */
-        SVX_DLLPRIVATE sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
-
-        // ------------------------------------------------
-        SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
-            getFieldsByCommandDescriptor(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
-                const sal_Int32 _nCommandType,
-                const ::rtl::OUString& _rCommand,
-                ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive,
-                ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
-            )	SAL_THROW( ( ) );
-
-        // ------------------------------------------------
-        ::com::sun::star::uno::Sequence< ::rtl::OUString >
-            getFieldNamesByCommandDescriptor(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
-                const sal_Int32 _nCommandType,
-                const ::rtl::OUString& _rCommand,
-                ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
-            )	SAL_THROW( ( ) );
-
-        // ------------------------------------------------
-        SVX_DLLPRIVATE bool isEmbeddedInDatabase(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent,
-            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxActualConnection
-        );
-
-        // ------------------------------------------------
-        SVX_DLLPRIVATE bool isEmbeddedInDatabase(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent
-        );
-    };
-
-    //====================================================================
-    //= DBToolsObjectFactory
-    //====================================================================
-    class DBToolsObjectFactory : public ODbtoolsClient
-    {
-    public:
-        DBToolsObjectFactory();
-        ~DBToolsObjectFactory();
-
-        // ------------------------------------------------
-        ::std::auto_ptr< ::dbtools::FormattedColumnValue >  createFormattedColumnValue(
-            const ::comphelper::ComponentContext& _rContext,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn
-        );
-    };
-
-//........................................................................
-}	// namespace svxform
-//........................................................................
-
-#endif // SVX_DBTOOLSCLIENT_HXX
-
-
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 350bf26a5..0e13eedb3 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -79,7 +79,7 @@
 #include <cppuhelper/compbase4.hxx>
 #include <cppuhelper/compbase6.hxx>
 #include <unotools/configitem.hxx>
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "formcontrolling.hxx"
 #include "fmdocumentclassification.hxx"
 
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index 61e0e951b..a17198bea 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -31,7 +31,7 @@
 #ifndef SVX_SQLPARSERCLIENT_HXX
 #define SVX_SQLPARSERCLIENT_HXX
 
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 #include "ParseContext.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 6f1aaf5d2..f4a4ecb0b 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -42,7 +42,7 @@
 //#endif
 #include <comphelper/propmultiplex.hxx>
 #include <svtools/transfer.hxx>
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 
 //==================================================================
 class FmFieldWin;
diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx
index d7c3870a9..605e76f20 100644
--- a/svx/source/inc/typeconversionclient.hxx
+++ b/svx/source/inc/typeconversionclient.hxx
@@ -31,7 +31,7 @@
 #ifndef SVX_TYPECONVERSION_CLIENT_HXX
 #define SVX_TYPECONVERSION_CLIENT_HXX
 
-#include "dbtoolsclient.hxx"
+#include "svx/dbtoolsclient.hxx"
 
 //........................................................................
 namespace svxform
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index b23ddbb55..4ce57b660 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -45,6 +45,7 @@
 #include <com/sun/star/table/TableOrientation.hpp>
 #include <com/sun/star/table/CellHoriJustify.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
+#include "com/sun/star/style/VerticalAlignment.hpp"
 #include <com/sun/star/util/SortField.hpp>
 #include <com/sun/star/util/SortFieldType.hpp>
 #include <com/sun/star/table/CellOrientation.hpp>
@@ -275,42 +276,89 @@ SfxItemPresentation SvxVerJustifyItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
-    table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
-    switch ( (SvxCellVerJustify)GetValue() )
+    nMemberId &= ~CONVERT_TWIPS;
+    switch ( nMemberId )
     {
-        case SVX_VER_JUSTIFY_STANDARD: eUno = table::CellVertJustify_STANDARD; break;
-        case SVX_VER_JUSTIFY_TOP:	   eUno = table::CellVertJustify_TOP;	    break;
-        case SVX_VER_JUSTIFY_CENTER:   eUno = table::CellVertJustify_CENTER;	break;
-        case SVX_VER_JUSTIFY_BOTTOM:   eUno = table::CellVertJustify_BOTTOM;	break;
-        default: ; //prevent warning
+        case MID_HORJUST_ADJUST:
+            {
+                style::VerticalAlignment eUno = style::VerticalAlignment_TOP;
+                switch ( (SvxCellVerJustify)GetValue() )
+                {
+                    case SVX_VER_JUSTIFY_TOP:	   eUno = style::VerticalAlignment_TOP;	    break;
+                    case SVX_VER_JUSTIFY_CENTER:   eUno = style::VerticalAlignment_MIDDLE;	break;
+                    case SVX_VER_JUSTIFY_BOTTOM:   eUno = style::VerticalAlignment_BOTTOM;	break;
+                    default: ; //prevent warning
+                }
+                rVal <<= eUno;
+                break;
+            }
+        default:
+            {
+                table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
+                switch ( (SvxCellVerJustify)GetValue() )
+                {
+                    case SVX_VER_JUSTIFY_STANDARD: eUno = table::CellVertJustify_STANDARD; break;
+                    case SVX_VER_JUSTIFY_TOP:	   eUno = table::CellVertJustify_TOP;	    break;
+                    case SVX_VER_JUSTIFY_CENTER:   eUno = table::CellVertJustify_CENTER;	break;
+                    case SVX_VER_JUSTIFY_BOTTOM:   eUno = table::CellVertJustify_BOTTOM;	break;
+                    default: ; //prevent warning
+                }
+                rVal <<= eUno;
+                break;
+            }
     }
-    rVal <<= eUno;
     return sal_True;
 }
 
-sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
-    table::CellVertJustify eUno;
-    if(!(rVal >>= eUno))
+    nMemberId &= ~CONVERT_TWIPS;
+    switch ( nMemberId )
     {
-        sal_Int32 nValue = 0;
-        if(!(rVal >>= nValue))
-            return sal_False;
-        eUno = (table::CellVertJustify)nValue;
-    }
+        case MID_HORJUST_ADJUST:
+            {
+                //	property contains ParagraphAdjust values as sal_Int16
+                style::VerticalAlignment nVal = style::VerticalAlignment_TOP;
+                if(!(rVal >>= nVal))
+                    return sal_False;
 
-    SvxCellVerJustify eSvx = SVX_VER_JUSTIFY_STANDARD;
-    switch (eUno)
-    {
-        case table::CellVertJustify_STANDARD: eSvx = SVX_VER_JUSTIFY_STANDARD; break;
-        case table::CellVertJustify_TOP:	   eSvx = SVX_VER_JUSTIFY_TOP;	  	break;
-        case table::CellVertJustify_CENTER:   eSvx = SVX_VER_JUSTIFY_CENTER;	break;
-        case table::CellVertJustify_BOTTOM:   eSvx = SVX_VER_JUSTIFY_BOTTOM;	break;
-        default: ; //prevent warning
+                SvxCellVerJustify eSvx = SVX_VER_JUSTIFY_STANDARD;
+                switch (nVal)
+                {
+                    case style::VerticalAlignment_TOP:      eSvx = SVX_VER_JUSTIFY_TOP;     break;
+                    case style::VerticalAlignment_MIDDLE:   eSvx = SVX_VER_JUSTIFY_CENTER;  break;
+                    case style::VerticalAlignment_BOTTOM:   eSvx = SVX_VER_JUSTIFY_BOTTOM;  break;
+                    default:;
+                }
+                SetValue( (USHORT)eSvx );
+                break;
+            }
+        default:
+            {
+                table::CellVertJustify eUno;
+                if(!(rVal >>= eUno))
+                {
+                    sal_Int32 nValue = 0;
+                    if(!(rVal >>= nValue))
+                        return sal_False;
+                    eUno = (table::CellVertJustify)nValue;
+                }
+
+                SvxCellVerJustify eSvx = SVX_VER_JUSTIFY_STANDARD;
+                switch (eUno)
+                {
+                    case table::CellVertJustify_STANDARD: eSvx = SVX_VER_JUSTIFY_STANDARD;  break;
+                    case table::CellVertJustify_TOP:	  eSvx = SVX_VER_JUSTIFY_TOP;	  	break;
+                    case table::CellVertJustify_CENTER:   eSvx = SVX_VER_JUSTIFY_CENTER;	break;
+                    case table::CellVertJustify_BOTTOM:   eSvx = SVX_VER_JUSTIFY_BOTTOM;	break;
+                    default: ; //prevent warning
+                }
+                SetValue( (USHORT)eSvx );
+                break;
+            }
     }
-    SetValue( (USHORT)eSvx );
 
     return sal_True;
 }
diff --git a/svx/source/items/numitem.cxx b/svx/source/items/numitem.cxx
index d4693fde0..32a493b5b 100644
--- a/svx/source/items/numitem.cxx
+++ b/svx/source/items/numitem.cxx
@@ -71,28 +71,31 @@ using namespace ::com::sun::star::style;
 
 sal_Int32 SvxNumberType::nRefCount = 0;
 com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> SvxNumberType::xFormatter = 0;
-/* -----------------------------22.02.01 14:24--------------------------------
-
- ---------------------------------------------------------------------------*/
-SvxNumberType::SvxNumberType(sal_Int16 nType) :
-    nNumType(nType),
-    bShowSymbol(sal_True)
+void lcl_getFormatter(com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter>& _xFormatter)
 {
-    if(!xFormatter.is())
+    if(!_xFormatter.is())
        {
         try
-        {
+        { 
             Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
             Reference < XInterface > xI = xMSF->createInstance(
                 ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) );
             Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY);
             DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"");
-            xFormatter = Reference<XNumberingFormatter> (xRet, UNO_QUERY);
+            _xFormatter = Reference<XNumberingFormatter> (xRet, UNO_QUERY);
         }
         catch(Exception& )
         {
         }
     }
+}
+/* -----------------------------22.02.01 14:24--------------------------------
+
+ ---------------------------------------------------------------------------*/
+SvxNumberType::SvxNumberType(sal_Int16 nType) :
+    nNumType(nType),
+    bShowSymbol(sal_True)
+{
     nRefCount++;
 }
 /* -----------------------------22.02.01 14:31--------------------------------
@@ -126,6 +129,7 @@ String SvxNumberType::GetNumStr( ULONG nNo ) const
  * --------------------------------------------------*/
 String 	SvxNumberType::GetNumStr( ULONG nNo, const Locale& rLocale ) const
 {
+    lcl_getFormatter(xFormatter);
     String aTmpStr;
     if(!xFormatter.is())
         return aTmpStr;
diff --git a/svx/source/items/paraitem.cxx b/svx/source/items/paraitem.cxx
index 4bb7b62ac..56436448d 100644
--- a/svx/source/items/paraitem.cxx
+++ b/svx/source/items/paraitem.cxx
@@ -889,7 +889,7 @@ SvxTabStop::SvxTabStop()
 {
     nTabPos = 0;
     eAdjustment = SVX_TAB_ADJUST_LEFT;
-    cDecimal = SvtSysLocale().GetLocaleData().getNumDecimalSep().GetChar(0);
+    m_cDecimal = cDfltDecimalChar;
     cFill = cDfltFillChar;
 }
 
@@ -900,10 +900,15 @@ SvxTabStop::SvxTabStop( const long nPos, const SvxTabAdjust eAdjst,
 {
     nTabPos = nPos;
     eAdjustment = eAdjst;
-    cDecimal = ( cDfltDecimalChar == cDec ) ? SvtSysLocale().GetLocaleData().getNumDecimalSep().GetChar(0) : cDec;
+    m_cDecimal = cDec;
     cFill = cFil;
 }
-
+// -----------------------------------------------------------------------------
+void SvxTabStop::fillDecimal() const
+{
+    if ( cDfltDecimalChar == m_cDecimal )
+        m_cDecimal = SvtSysLocale().GetLocaleData().getNumDecimalSep().GetChar(0);
+}
 // -----------------------------------------------------------------------
 
 XubString SvxTabStop::GetValueString() const
@@ -918,7 +923,7 @@ XubString SvxTabStop::GetValueString() const
     aStr += cpDelim;
     aStr += sal_Unicode('[');
     aStr += XubString( ResId( RID_SVXITEMS_TAB_DECIMAL_CHAR, DIALOG_MGR() ) );
-    aStr += cDecimal;
+    aStr += GetDecimal();
     aStr += sal_Unicode(']');
     aStr += cpDelim;
     aStr += cpDelim;
diff --git a/svx/source/msfilter/msdffimp.cxx b/svx/source/msfilter/msdffimp.cxx
index d55cf7f37..42e746475 100644
--- a/svx/source/msfilter/msdffimp.cxx
+++ b/svx/source/msfilter/msdffimp.cxx
@@ -1912,12 +1912,7 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
             XGradientStyle eGrad = XGRAD_LINEAR;
             sal_Int32 nChgColors = 0;
 
-            if ( !nAngle )
-                nChgColors ^= 1;
-
-            if ( !nFocus )
-                nChgColors ^= 1;
-            else if ( nFocus < 0 )		// Bei negativem Focus sind die Farben zu tauschen
+            if ( nFocus < 0 )		// Bei negativem Focus sind die Farben zu tauschen
             {
                 nFocus =- nFocus;
                 nChgColors ^= 1;
@@ -1925,8 +1920,8 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
             if( nFocus > 40 && nFocus < 60 )
             {
                 eGrad = XGRAD_AXIAL;	// Besser gehts leider nicht
-                nChgColors ^= 1;
             }
+
             USHORT nFocusX = (USHORT)nFocus;
             USHORT nFocusY = (USHORT)nFocus;
 
@@ -4955,6 +4950,16 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
                 ApplyAttributes( rSt, aSet, aObjData );
                 pRet->SetMergedItemSet(aSet);
             }
+            else if ( aObjData.eShapeType == mso_sptLine )
+            {
+                basegfx::B2DPolygon aPoly;
+                aPoly.append(basegfx::B2DPoint(aObjData.aBoundRect.Left(), aObjData.aBoundRect.Top()));
+                aPoly.append(basegfx::B2DPoint(aObjData.aBoundRect.Right(), aObjData.aBoundRect.Bottom()));
+                pRet = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aPoly));
+                pRet->SetModel( pSdrModel );
+                ApplyAttributes( rSt, aSet, aObjData );
+                pRet->SetMergedItemSet(aSet);
+            }
             else
             {
                 if ( GetCustomShapeContent( aObjData.eShapeType ) || IsProperty( DFF_Prop_pVertices ) )
diff --git a/svx/source/msfilter/msocximex.cxx b/svx/source/msfilter/msocximex.cxx
index 3be313a6b..ad62fc5f2 100644
--- a/svx/source/msfilter/msocximex.cxx
+++ b/svx/source/msfilter/msocximex.cxx
@@ -161,36 +161,36 @@ uno::Reference< graphic::XGraphicObject> lcl_readGraphicObject( SotStorageStream
 	uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
 	if( xServiceManager.is() )
 	{
-		try
-		{
+    try
+    {
 			// use the GraphicProvider service to get the XGraphic
 			uno::Reference< graphic::XGraphicProvider > xGraphProvider(
 					xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ), uno::UNO_QUERY );
 			if( xGraphProvider.is() )
-			{
+        {
 				uno::Reference< io::XInputStream > xStream( new utl::OInputStreamWrapper( *pS ) );
 				if( xStream.is() )
-				{
+        {
 					uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
 					aMediaProps[0].Name = ::rtl::OUString::createFromAscii( "InputStream" );
 					aMediaProps[0].Value <<= xStream;
 					uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps );
 					if( xGraphic.is() )
-					{
+        {
 						// create an XGraphicObject
 						::comphelper::ComponentContext aContext( xServiceManager );
 						xGrfObj = graphic::GraphicObject::create( aContext.getUNOContext() );
 						xGrfObj->setGraphic(xGraphic);
-					}
-				}
-			}
-		}
-		catch( uno::Exception& )
-		{
-		}
-	}
-	return xGrfObj;
+        }
+    }
+    }
 }
+            catch( uno::Exception& )
+            {
+            }
+        }
+	return xGrfObj;
+        }
 
 
 long WriteAlign(SvStorageStream *pS, int nAmount)
@@ -360,7 +360,7 @@ OUString lclCreateOUString( const char* pcCharArr, sal_uInt32 nLenFld )
         return svt::BinFilterUtils::CreateOUStringFromStringArray( pcCharArr, nBufSize );
 
     return svt::BinFilterUtils::CreateOUStringFromUniStringArray( pcCharArr, nBufSize );
-}
+    }
 
 // export ---------------------------------------------------------------------
 
@@ -1095,20 +1095,20 @@ sal_Bool OCX_Control::Import(uno::Reference<container::XNameContainer> &rDialog
 
     if (!Import(xPropSet))
         return sal_False;
-    
+
     uno::Any aTmp;
     sal_Int32 nFactor = 3528; 
 
     if ( !bVBA  )
     {
-        aTmp <<= sal_Int32((mnLeft * 2) / 100);
-        xPropSet->setPropertyValue(WW8_ASCII2STR("PositionX"), aTmp);
-        aTmp <<= sal_Int32((mnTop * 2) / 100);
-        xPropSet->setPropertyValue(WW8_ASCII2STR("PositionY"), aTmp);
-        aTmp <<= sal_Int32((nWidth * 2) / 100);
-        xPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
-        aTmp <<= sal_Int32((nHeight * 2) / 100);
-        xPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
+    aTmp <<= sal_Int32((mnLeft * 2) / 100);
+    xPropSet->setPropertyValue(WW8_ASCII2STR("PositionX"), aTmp);
+    aTmp <<= sal_Int32((mnTop * 2) / 100);
+    xPropSet->setPropertyValue(WW8_ASCII2STR("PositionY"), aTmp);
+    aTmp <<= sal_Int32((nWidth * 2) / 100);
+    xPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
+    aTmp <<= sal_Int32((nHeight * 2) / 100);
+    xPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
     }
     else
     {
@@ -1718,7 +1718,7 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
         INT16 nTmp = pValue[0]-0x30;
         aTmp <<= nTmp;
 		if (!bSetInDialog)
-			rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
+        rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
 		else
 		{
 			// dialog ( but we might be using the form model )
@@ -1726,8 +1726,8 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
 				rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
 			else
 				rPropSet->setPropertyValue( WW8_ASCII2STR("State"), aTmp);
-		}
     }
+	}
     // If this is a dialog control then we need to  set a groupname *always*
     rtl::OUString sGroupName = lclCreateOUString( pGroupName, nGroupNameLen );
     if ( GetInDialog() ) // Userform/Dialog
@@ -3280,10 +3280,10 @@ sal_Bool OCX_ModernControl::Read(SvStorageStream *pS)
 		{
 			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
 			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
-		}
+    }
 		// make sure the stream position should be pointing after the image
 		pS->Seek( imagePos + nPictureLen );
-    }
+	}
 
     return sal_True;
 }
@@ -3378,10 +3378,10 @@ sal_Bool OCX_CommandButton::Read(SvStorageStream *pS)
 		{
 			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
 			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
-		}
+    }
 		// make sure the stream position should be pointing after the image
 		pS->Seek( imagePos + nPictureLen );
-    }
+	}
 
     return sal_True;
 }
@@ -3699,11 +3699,11 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream*
             case MULTIPAGE:
             case PAGE:
                 {
-                    OCX_ContainerControl* pContainer =
-                        static_cast< OCX_ContainerControl* >( pControl );
-                    oStream = pContainer->getContainerStream();
+            OCX_ContainerControl* pContainer =
+               static_cast< OCX_ContainerControl* >( pControl );
+            oStream = pContainer->getContainerStream();
                     break;
-                }
+        }
             case LISTBOX:
             case OPTIONBUTTON:
             case COMBOBOX:
@@ -3744,9 +3744,9 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream*
         // set stream to position behind substream of this control
         oStream->Seek( nStrmPos + rec.nSubStreamLen );
 
-        mpControls.push_back( pControl );
+            mpControls.push_back( pControl );
+        }
     }
-}
 
 sal_Bool OCX_ContainerControl::Read(SvStorageStream *pS)
 {
@@ -4322,19 +4322,19 @@ sal_Bool OCX_UserForm::Read(SvStorageStream *pS)
         pS->Read(pIcon,nIconLen);
     }
 
-	ReadAlign( pS, pS->Tell() - nStart, 4);
-	if (pBlockFlags[2] & 0x10)
-	{
-		//Font Stuff..
-		pS->SeekRel(0x1a);
-		sal_uInt8 nFontLen;
-		*pS >> nFontLen;
-		pS->SeekRel(nFontLen);
-	}
-    if (nPicture)
+    ReadAlign( pS, pS->Tell() - nStart, 4);
+    if (pBlockFlags[2] & 0x10)
     {
-        pS->Read(pPictureHeader,20);
-        *pS >> nPictureLen;
+        //Font Stuff..
+        pS->SeekRel(0x1a);
+        sal_uInt8 nFontLen;
+        *pS >> nFontLen;
+        pS->SeekRel(nFontLen);
+    }
+	if (nPicture)
+	{
+		pS->Read(pPictureHeader,20);
+		*pS >> nPictureLen;
 		long imagePos = pS->Tell();
 		// great embedded object
 		mxGrfObj = lcl_readGraphicObject( pS );
@@ -4345,7 +4345,7 @@ sal_Bool OCX_UserForm::Read(SvStorageStream *pS)
 		}
 		// make sure the stream position should be pointing after the image.
 		pS->Seek( imagePos + nPictureLen );
-    }
+	}
 
     sal_Int16 numTrailingRecs = 0;
     *pS >> numTrailingRecs;
@@ -4361,9 +4361,9 @@ sal_Bool OCX_UserForm::Read(SvStorageStream *pS)
             {
                 if ( nTypeID & 0x8000 ) // valid ActiveXID
                     mActiveXIDMap[ ( i | 0x8000 ) ] = nTypeID;
-            }
         }
     }
+    }
     return OCX_ContainerControl::Read( pS );
 }
 
@@ -4394,10 +4394,10 @@ sal_Bool OCX_UserForm::Import(
     sal_Int32 nFactor( 3528 );
     if ( !bVBA )
     {
-        aTmp <<= sal_Int32((nWidth * 2) / 100); 
-        xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
-        aTmp <<= sal_Int32((nHeight * 2) / 100); 
-        xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
+    aTmp <<= sal_Int32((nWidth * 2) / 100);
+    xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
+    aTmp <<= sal_Int32((nHeight * 2) / 100);
+    xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
     }
     else
     {
@@ -4962,7 +4962,7 @@ sal_Bool OCX_CheckBox::Import(com::sun::star::uno::Reference<
         INT16 nTmp=pValue[0]-0x30;
         aTmp <<= nTmp;
 		if ( !bSetInDialog )
-		 	rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
+        rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
 		else
 		 	rPropSet->setPropertyValue( WW8_ASCII2STR("State"), aTmp);
     }
@@ -5469,7 +5469,7 @@ sal_Bool OCX_Image::Read(SotStorageStream *pS)
 		{
 			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
 			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
-		}
+    }
 		// make sure the stream position should be pointing after the image
 		pS->Seek( imagePos + nImageLen );
     }
diff --git a/svx/source/msfilter/mstoolbar.cxx b/svx/source/msfilter/mstoolbar.cxx
index 1d5c8011e..0d45af7a4 100644
--- a/svx/source/msfilter/mstoolbar.cxx
+++ b/svx/source/msfilter/mstoolbar.cxx
@@ -4,19 +4,55 @@
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
+#include <com/sun/star/ui/ItemStyle.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
 #include <fstream>
 #include <vcl/graph.hxx>
 #include <vcl/bitmapex.hxx>
+#include <vcl/image.hxx>
 #include <map>
 #include <sfx2/objsh.hxx>
 #include <basic/basmgr.hxx>
 #include <svtools/filterutils.hxx>
 #include <boost/scoped_array.hpp>
 #include <svx/msvbahelper.hxx>
+#include <svtools/miscopt.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+
+using namespace com::sun::star;
 
 int TBBase::nIndent = 0;
 
-using namespace com::sun::star;
+void CustomToolBarImportHelper::showToolbar( const rtl::OUString& rName )
+{
+    try
+    {
+        uno::Reference< frame::XController > xCntrller( mrDocSh.GetModel()->getCurrentController(), uno::UNO_QUERY_THROW );
+        uno::Reference< beans::XPropertySet > xProps( xCntrller->getFrame(), uno::UNO_QUERY_THROW );
+        uno::Reference< frame::XLayoutManager > xLayoutMgr( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LayoutManager") ) ), uno::UNO_QUERY_THROW );
+        xLayoutMgr->showElement( rName );
+    }
+    catch( uno::Exception& ) {}
+}
+
+void CustomToolBarImportHelper::ScaleImage( uno::Reference< graphic::XGraphic >& xGraphic, long nNewSize )
+{
+    Graphic aGraphic( xGraphic );
+    Size aSize = aGraphic.GetSizePixel();
+    if ( aSize.Height() && ( aSize.Height() == aSize.Width() ) )
+    {
+        Image aImage( xGraphic );
+        if ( aSize.Height() != nNewSize )
+        {
+            BitmapEx aBitmap = aImage.GetBitmapEx();
+            BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, nNewSize );
+            aImage = Image( aBitmapex);
+            xGraphic = aImage.GetXGraphic();
+        }
+    } 
+}
+
 void CustomToolBarImportHelper::applyIcons()
 {
     for ( std::vector< iconcontrolitem >::iterator it = iconcommands.begin(); it != iconcommands.end(); ++it )
@@ -25,14 +61,19 @@ void CustomToolBarImportHelper::applyIcons()
         commands[ 0 ] = it->sCommand;
         uno::Sequence< uno::Reference< graphic::XGraphic > > images(1);
         images[ 0 ] = it->image;
+       
         OSL_TRACE("About to applyIcons for command %s, have image ? %s", rtl::OUStringToOString( commands[ 0 ], RTL_TEXTENCODING_UTF8 ).getStr(), images[ 0 ].is() ? "yes" : "no" );
         uno::Reference< ui::XImageManager > xImageManager( getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
-        // 1 seems to work best for MSO images, otherwise they don't get displayed ( I guess the default size
-        // in ooo is different )
-        //xImageManager->insertImages( 1,  commands, images ); // #FIXME and scale images based on default icon size
-        xImageManager->replaceImages( 1,  commands, images );
-        xImageManager->replaceImages( 2,  commands, images );
-        xImageManager->replaceImages( 3,  commands, images );
+        sal_uInt16 nColor = ui::ImageType::COLOR_NORMAL; 
+
+        Window* topwin = Application::GetActiveTopWindow();
+	if ( topwin != NULL && topwin->GetDisplayBackground().GetColor().IsDark() )
+            nColor = css::ui::ImageType::COLOR_HIGHCONTRAST;
+
+        ScaleImage( images[ 0 ], 16 );
+        xImageManager->replaceImages( ui::ImageType::SIZE_DEFAULT | nColor,  commands, images );
+        ScaleImage( images[ 0 ], 26 );
+        xImageManager->replaceImages( ui::ImageType::SIZE_LARGE | nColor,  commands, images );
     }
 }
 
@@ -196,23 +237,27 @@ bool TBCData::Read(SvStream *pS)
     return true;
 }
 
-bool TBCData::ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >& /*toolbarcontainer*/, CustomToolBarImportHelper& helper, std::vector< css::beans::PropertyValue >& props, bool& bBeginGroup )
+TBCMenuSpecific* TBCData::getMenuSpecific()
+{
+    TBCMenuSpecific* pMenu = dynamic_cast< TBCMenuSpecific* >( controlSpecificInfo.get() );
+    return pMenu;
+}
+bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vector< css::beans::PropertyValue >& props, bool& bBeginGroup, bool bIsMenuBar )
 {
+    sal_uInt16  nStyle = 0;
     bBeginGroup = rHeader.isBeginGroup();
     controlGeneralInfo.ImportToolBarControlData( helper, props );
     beans::PropertyValue aProp;
     aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ;
     aProp.Value = uno::makeAny( rHeader.isVisible() ); // where is the visible attribute stored
-
+    props.push_back( aProp );
     if ( rHeader.getTct() == 0x01
     || rHeader.getTct() == 0x10 )
     {
         TBCBSpecific* pSpecificInfo = dynamic_cast< TBCBSpecific* >( controlSpecificInfo.get() );
         if ( pSpecificInfo )
         {
-            // if we have a icon then lets  set it for the command ( but I
-            // have a nasty suspicion the toolbar actually needs to be set
-            // up ( and added ) before you can asssign an image :-/
+            // if we have a icon then lets  set it for the command 
             rtl::OUString sCommand;
             for ( std::vector< css::beans::PropertyValue >::iterator it = props.begin(); it != props.end(); ++it )
             {
@@ -252,6 +297,32 @@ bool TBCData::ImportToolBarControl( const css::uno::Reference< css::container::X
             }
         }
     }
+    else if ( rHeader.getTct() == 0x0a )
+    {
+        aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") ) ;
+        aProp.Value = uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:" ) ) ); // dummy command
+        nStyle |= ui::ItemStyle::DROP_DOWN;
+        props.push_back( aProp );
+    }
+
+    short icontext =  ( rHeader.getTbct() & 0x03 );
+    aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Style") ) ;
+    if ( bIsMenuBar )
+    {
+        nStyle |= ui::ItemStyle::TEXT;
+        if ( !icontext || icontext == 0x3 )
+            // Text And image
+            nStyle |= ui::ItemStyle::ICON;
+    }
+    else 
+    {
+        if ( ( icontext & 0x02 ) == 0x02 )
+            nStyle |= ui::ItemStyle::TEXT;
+        if ( !icontext || ( icontext & 0x03 ) == 0x03 )
+            nStyle |= ui::ItemStyle::ICON;
+    }
+    aProp.Value <<= nStyle;
+    props.push_back( aProp );
     return true; // just ignore
 }
 
@@ -391,9 +462,6 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
         aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Tooltip") );
         aProp.Value = uno::makeAny( tooltip.getString() ); 
         sControlData.push_back( aProp );
-
-        // #TODO find out what is the property for tooltip?
-        sControlData.push_back( aProp );
 /*
 aToolbarItem(0).Name = "CommandURL" wstrOnAction
 aToolbarItem(0).Value = Command
@@ -437,6 +505,13 @@ TBCMenuSpecific::Print( FILE* fp )
 
 }
 
+rtl::OUString TBCMenuSpecific::Name()
+{
+    rtl::OUString aName;
+    if ( name.get() )
+        aName = name->getString();
+    return aName;
+}
 TBCBSpecific::TBCBSpecific() : bFlags( 0 )
 {
 }
diff --git a/svx/source/msfilter/svxmsbas.cxx b/svx/source/msfilter/svxmsbas.cxx
index 3660afb91..53f82bb20 100644
--- a/svx/source/msfilter/svxmsbas.cxx
+++ b/svx/source/msfilter/svxmsbas.cxx
@@ -359,7 +359,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< Stri
             Any aLibAny = xLibContainer->getByName( aLibName );
             aLibAny >>= xLib;
         }
-		if( xLib.is()  )
+        if( xLib.is() )
         {
             Reference< container::XNameAccess > xVBACodeNamedObjectAccess;
 			if ( !bAsComment )
@@ -502,9 +502,9 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< Stri
                                 String sAttr= pStr->Copy( nBegin, (nEnd-nBegin)+1);
                                 extractAttribute( sAttr, sModule );
                                 pStr->Erase(nBegin, (nEnd-nBegin)+1);
-                            }
                         }
                     }
+					}
                     if( aDecompressed.Get(j)->Len() )
                     {
                         aSource+=::rtl::OUString( *aDecompressed.Get(j) );
@@ -516,9 +516,9 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< Stri
                         aSource += rtl::OUString::createFromAscii("\nEnd Sub");
                 }
                 ::rtl::OUString aModName( sModule );
-				aSource = modeTypeComment + aSource;
+                    aSource = modeTypeComment + aSource;
 
-				Any aSourceAny;
+                    Any aSourceAny;
                 OSL_TRACE("erm %d", mType );
                 if (  !bAsComment )
                 {
@@ -532,7 +532,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< Stri
                 else
                     aSourceAny <<= aSource;
                 moduleData[ aModName ] = aSourceAny;
-            }
+                }                                
 
             // Hack for missing codenames ( only know to happen in excel but... )
             // only makes sense to do this if we are importing non-commented basic
@@ -583,12 +583,12 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< Stri
                 else
                     xLib->insertByName( it->first, it->second );
                 bRet = true;
-            }                                
+            }
 
         }
         if( bRet )
-            SFX_APP()->LeaveBasicCall();
-	    return bRet;
+        SFX_APP()->LeaveBasicCall();
+    return bRet;
 }
 
 /* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 054505201..ef7df1ae3 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -66,10 +66,11 @@ namespace sdr
             // no need to correct if no extra text range
             if(aTextRange != aObjectRange)
             {
+                const double fExtraTextRotation(GetCustomShapeObj().GetExtraTextRotation());
                 const GeoStat& rGeoStat(GetCustomShapeObj().GetGeoStat());
 
                 // only correct when rotation and/or shear is used
-                if(rGeoStat.nShearWink || rGeoStat.nDrehWink)
+                if(rGeoStat.nShearWink || rGeoStat.nDrehWink || !basegfx::fTools::equalZero(fExtraTextRotation))
                 {
                     // text range needs to be corrected by 
                     // aObjectRange.getCenter() - aRotObjectRange.getCenter() since it's
@@ -93,6 +94,11 @@ namespace sdr
                         aRotMatrix.rotate((36000 - rGeoStat.nDrehWink) * F_PI18000);
                     }
 
+                    if(!basegfx::fTools::equalZero(fExtraTextRotation))
+                    {
+                        aRotMatrix.rotate((360.0 - fExtraTextRotation) * F_PI180);
+                    }
+
                     aRotMatrix.translate(aObjectRange.getMinimum().getX(), aObjectRange.getMinimum().getY());
                     aRotObjectRange.transform(aRotMatrix);
 
@@ -210,7 +216,11 @@ namespace sdr
 
                     // create primitive
                     const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::SdrCustomShapePrimitive2D(
-                        *pAttribute, xGroup, aTextBoxMatrix, bWordWrap));
+                        *pAttribute,
+                        xGroup,
+                        aTextBoxMatrix,
+                        bWordWrap,
+                        false));		// #SJ# New parameter to force to clipped BlockText for SC
                     xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
                 }
 
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 044e55ead..5c23e3e1f 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -148,7 +148,9 @@ namespace sdr { namespace contact {
                 return *new UnoControlWindowContact( *pPageViewContact, *this );
         }
 
-        return *new UnoControlDefaultContact( _rObjectContact, *this );
+        // if we're not working for a ObjectContactOfPageView, then we can't use a ViewObjectContactOfUnoControl, or any
+        // of its derivees. Fall back to a "normal" SdrObj's contact object.
+        return *new ViewObjectContactOfSdrObj( _rObjectContact, *this );
     }
 
     //--------------------------------------------------------------------
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 2ba50855a..90295f7ce 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -30,12 +30,18 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
+
 #include <svx/sdr/contact/viewobjectcontactofunocontrol.hxx>
 #include <svx/sdr/contact/viewcontactofunocontrol.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <svx/sdr/properties/properties.hxx>
 #include <svx/sdr/contact/objectcontactofpageview.hxx>
 #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx>
+#include <svx/svdouno.hxx>
+#include <svx/svdpagv.hxx>
+#include <svx/svdview.hxx>
+#include <svx/sdrpagewindow.hxx>
+#include "sdrpaintwindow.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -53,23 +59,21 @@
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 /** === end UNO includes === **/
-#include <svx/svdouno.hxx>
-#include <svx/svdpagv.hxx>
-#include <svx/svdview.hxx>
-#include <svx/sdrpagewindow.hxx>
-#include "sdrpaintwindow.hxx"
+
 #include <toolkit/helper/formpdfexport.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/scopeguard.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
-
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/primitive2d/controlprimitive2d.hxx>
+
 #include <boost/shared_ptr.hpp>
+#include <boost/bind.hpp>
 
 //........................................................................
 namespace sdr { namespace contact {
@@ -220,10 +224,17 @@ namespace sdr { namespace contact {
     void ControlHolder::setPosSize( const Rectangle& _rPosSize ) const
     {
         // no check whether we're valid, this is the responsibility of the caller
-        m_xControlWindow->setPosSize(
-            _rPosSize.Left(), _rPosSize.Top(), _rPosSize.GetWidth(), _rPosSize.GetHeight(),
-            POSSIZE
-        );
+
+        // don't call setPosSize when pos/size did not change
+        // #i104181# / 2009-08-18 / frank.schoenheit@sun.com
+        ::Rectangle aCurrentRect( getPosSize() );
+        if ( aCurrentRect != _rPosSize )
+        {
+            m_xControlWindow->setPosSize(
+                _rPosSize.Left(), _rPosSize.Top(), _rPosSize.GetWidth(), _rPosSize.GetHeight(),
+                POSSIZE
+            );
+        }
     }
 
     //--------------------------------------------------------------------
@@ -447,7 +458,10 @@ namespace sdr { namespace contact {
     {
     private:
         /// the instance whose IMPL we are
-        ViewObjectContactOfUnoControl*    m_pAntiImpl;
+        ViewObjectContactOfUnoControl*  m_pAntiImpl;
+
+        /// are we currently inside impl_ensureControl_nothrow?
+        bool                            m_bCreatingControl;
 
         /** thread safety
 
@@ -830,6 +844,7 @@ namespace sdr { namespace contact {
     //--------------------------------------------------------------------
     ViewObjectContactOfUnoControl_Impl::ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl )
         :m_pAntiImpl( _pAntiImpl )
+        ,m_bCreatingControl( false )
         ,m_pOutputDeviceForWindow( NULL )
         ,m_bControlIsVisible( false )
         ,m_bIsDesignModeListening( false )
@@ -971,9 +986,36 @@ namespace sdr { namespace contact {
         return rPageWindow.GetPaintWindow().GetOutputDevice();
     }
 
+    namespace
+    {
+        static void lcl_resetFlag( bool& rbFlag )
+        {
+            rbFlag = false;
+        }
+    }
+
     //--------------------------------------------------------------------
     bool ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow( IPageViewAccess& _rPageView, const OutputDevice& _rDevice )
     {
+        if ( m_bCreatingControl )
+        {
+            OSL_ENSURE( false, "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: reentrance is not really good here!" );
+            // We once had a situation where this was called reentrantly, which lead to all kind of strange effects. All
+            // those affected the grid control, which is the only control so far which is visible in design mode (and
+            // not only in alive mode).
+            // Creating the control triggered an Window::Update on some of its child windows, which triggered a
+            // Paint on parent of the grid control (e.g. the SwEditWin), which triggered a reentrant call to this method,
+            // which it is not really prepared for.
+            //
+            // /me thinks that re-entrance should be caught on a higher level, i.e. the Drawing Layer should not allow
+            // reentrant paint requests. For the moment, until /me can discuss this with AW, catch it here.
+            // 2009-08-27 / #i104544# frank.schoenheit@sun.com
+            return false;
+        }
+
+        m_bCreatingControl = true;
+        ::comphelper::ScopeGuard aGuard( ::boost::bind( lcl_resetFlag, ::boost::ref( m_bCreatingControl ) ) );
+
         if ( m_aControl.is() )
         {
             if ( m_pOutputDeviceForWindow == &_rDevice )
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index 926967314..2a433ecad 100644
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
@@ -56,7 +56,12 @@ namespace drawinglayer
             {
                 const basegfx::B2DPolygon aUnitOutline(basegfx::tools::createPolygonFromRect(basegfx::B2DRange(0.0, 0.0, 1.0, 1.0)));
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, createTextPrimitive(
-                    basegfx::B2DPolyPolygon(aUnitOutline), getTextBox(), *getSdrSTAttribute().getText(), 0, false, getWordWrap()));
+                    basegfx::B2DPolyPolygon(aUnitOutline),
+                    getTextBox(),
+                    *getSdrSTAttribute().getText(),
+                    0,
+                    isForceTextClipToTextRange(), // #SJ# use CellText mode; text upper-left
+                    getWordWrap()));
             }
 
             // add shadow
@@ -72,12 +77,14 @@ namespace drawinglayer
             const attribute::SdrShadowTextAttribute& rSdrSTAttribute,
             const Primitive2DSequence& rSubPrimitives,
             const basegfx::B2DHomMatrix& rTextBox,
-            bool bWordWrap)
+            bool bWordWrap,
+            bool bForceTextClipToTextRange)
         :	BasePrimitive2D(),
             maSdrSTAttribute(rSdrSTAttribute),
             maSubPrimitives(rSubPrimitives),
             maTextBox(rTextBox),
-            mbWordWrap(bWordWrap)
+            mbWordWrap(bWordWrap),
+            mbForceTextClipToTextRange(bForceTextClipToTextRange)
         {
         }
 
@@ -90,7 +97,8 @@ namespace drawinglayer
                 return (getSdrSTAttribute() == rCompare.getSdrSTAttribute()
                     && getSubPrimitives() == rCompare.getSubPrimitives()
                     && getTextBox() == rCompare.getTextBox()
-                    && getWordWrap() == rCompare.getWordWrap());
+                    && getWordWrap() == rCompare.getWordWrap()
+                    && isForceTextClipToTextRange() == rCompare.isForceTextClipToTextRange());
             }
 
             return false;
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index f1bb85a62..43b3dd207 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -70,10 +70,7 @@ SmartTagMgr::SmartTagMgr( const rtl::OUString& rApplicationName )
       maActionList(),
       maDisabledSmartTagTypes(),
       maSmartTagMap(),
-      mxBreakIter(),
       mxMSF( ::comphelper::getProcessServiceFactory() ),
-      mxContext(),
-      mxConfigurationSettings(),
       mbLabelTextWithSmartTags(true)
 {
 }
@@ -93,10 +90,6 @@ void SmartTagMgr::Init( const rtl::OUString& rConfigurationGroupName )
 
         if ( mxContext.is() )
         {
-            // get the break iterator
-            mxBreakIter = Reference< i18n::XBreakIterator >(
-                mxMSF->createInstance( C2U( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY);
-
             PrepareConfiguration( rConfigurationGroupName );
             ReadConfiguration( true, true );
             RegisterListener();
@@ -104,6 +97,14 @@ void SmartTagMgr::Init( const rtl::OUString& rConfigurationGroupName )
         }
     }
 }
+void SmartTagMgr::CreateBreakIterator() const
+{
+    if ( !mxBreakIter.is() && mxMSF.is() && mxContext.is() )
+    {
+        // get the break iterator
+        mxBreakIter.set(mxMSF->createInstance( C2U( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY);
+    }
+}
 
 /** Dispatches the recognize call to all installed smart tag recognizers
 */
@@ -129,10 +130,13 @@ void SmartTagMgr::Recognize( const rtl::OUString& rText,
         }
 
         if ( bCallRecognizer )
+        {
+            CreateBreakIterator();
             maRecognizerList[i]->recognize( rText, nStart, nLen,
                                             smarttags::SmartTagRecognizerMode_PARAGRAPH,
                                             rLocale, xMarkup, maApplicationName, xController,
                                             mxBreakIter );
+        }
     }
 }
 
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 7b7881eaa..ec5d5ba7a 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -937,7 +937,12 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO
     const bool bUndo = IsUndoEnabled();
     if( bUndo  )
         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoReplaceObject(*pOldObj,*pNewObj));
+
+    if( IsObjMarked( pOldObj ) )
+        MarkObj( pOldObj, &rPV, TRUE /*unmark!*/ );
+
     pOL->ReplaceObject(pNewObj,pOldObj->GetOrdNum());
+            
     if( !bUndo )
         SdrObject::Free( pOldObj );
     
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 0487aafb3..b01caa73f 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -82,14 +82,17 @@ using namespace ::com::sun::star;
 ******************************************************************************/
 
 SdrGlobalData::SdrGlobalData() :
+    pSysLocale(NULL),
+    pCharClass(NULL),
+    pLocaleData(NULL),
     pOutliner(NULL),
     pDefaults(NULL),
     pResMgr(NULL),
     nExchangeFormat(0)
 {
-    pSysLocale = new SvtSysLocale;
-    pCharClass = pSysLocale->GetCharClassPtr();
-    pLocaleData = pSysLocale->GetLocaleDataPtr();
+    //pSysLocale = new SvtSysLocale;
+    //pCharClass = pSysLocale->GetCharClassPtr();
+    //pLocaleData = pSysLocale->GetLocaleDataPtr();
 
     svx::ExtrusionBar::RegisterInterface();
     svx::FontworkBar::RegisterInterface();
@@ -103,7 +106,24 @@ SdrGlobalData::~SdrGlobalData()
     //! do NOT delete pCharClass and pLocaleData
     delete pSysLocale;
 }
-
+const SvtSysLocale*         SdrGlobalData::GetSysLocale()
+{
+    if ( !pSysLocale )
+        pSysLocale = new SvtSysLocale;
+    return pSysLocale;
+}
+const CharClass*            SdrGlobalData::GetCharClass()
+{
+    if ( !pCharClass )
+        pCharClass = GetSysLocale()->GetCharClassPtr();
+    return pCharClass;
+}
+const LocaleDataWrapper*    SdrGlobalData::GetLocaleData()
+{
+    if ( !pLocaleData )
+        pLocaleData = GetSysLocale()->GetLocaleDataPtr();
+    return pLocaleData;
+}
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 OLEObjCache::OLEObjCache()
diff --git a/svx/source/svdraw/svdfppt.cxx b/svx/source/svdraw/svdfppt.cxx
index 76805a6da..4d2ded46d 100644
--- a/svx/source/svdraw/svdfppt.cxx
+++ b/svx/source/svdraw/svdfppt.cxx
@@ -5028,7 +5028,7 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport&
             {
                 rIn >> aSet.mpArry[ PPT_ParaAttr_BulletHeight ];
                 if ( ! ( ( nMask & ( 1 << PPT_ParaAttr_BuHardHeight ) )
-                         && ( nBulFlg && ( 1 << PPT_ParaAttr_BuHardHeight ) ) ) )
+                         && ( nBulFlg & ( 1 << PPT_ParaAttr_BuHardHeight ) ) ) )
                     aSet.mnAttrSet ^= 0x40;
             }
             if ( nMask & 0x0020 )	// buColor
@@ -7613,6 +7613,11 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab
                 CreateTableRows( xColumnRowRange->getRows(), aRows, pGroup->GetSnapRect().Bottom() );
                 CreateTableColumns( xColumnRowRange->getColumns(), aColumns, pGroup->GetSnapRect().Right() );
                 
+                sal_Int32 nCellCount = aRows.size() * aColumns.size();
+                sal_Int32 *pMergedCellIndexTable = new sal_Int32[ nCellCount ];
+                for ( sal_Int32 i = 0; i < nCellCount; i++ )
+                    pMergedCellIndexTable[ i ] = i;
+
                 aGroupIter.Reset();
                 while( aGroupIter.IsMore() )
                 {
@@ -7633,7 +7638,16 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab
                             ApplyCellAttributes( pObj, xCell );
 
                             if ( ( nRowCount > 1 ) || ( nColumnCount > 1 ) )	// cell merging
+                            {
                                 MergeCells( xTable, nColumn, nRow, nColumnCount, nRowCount );
+                                for ( sal_Int32 nRowIter = 0; nRowIter < nRowCount; nRowIter++ )
+                                {
+                                    for ( sal_Int32 nColumnIter = 0; nColumnIter < nColumnCount; nColumnIter++ )
+                                    {	// now set the correct index for the merged cell
+                                        pMergedCellIndexTable[ ( ( nRow + nRowIter ) * aColumns.size() ) + nColumn + nColumnIter ] = nTableIndex;
+                                    }
+                                }
+                            }
         
                             // applying text
                             OutlinerParaObject* pParaObject = pObj->GetOutlinerParaObject();
@@ -7645,13 +7659,30 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab
                             }
                         }
                     }
-                    else
+                }
+                aGroupIter.Reset();
+                while( aGroupIter.IsMore() )
+                {
+                    SdrObject* pObj( aGroupIter.Next() );
+                    if ( IsLine( pObj ) )
                     {
                         std::vector< sal_Int32 > vPositions;	// containing cell indexes + cell position
                         GetLinePositions( pObj, aRows, aColumns, vPositions, pGroup->GetSnapRect() );
+                        
+                        // correcting merged cell position
+                        std::vector< sal_Int32 >::iterator aIter( vPositions.begin() );
+                        while( aIter != vPositions.end() )
+                        {
+                            sal_Int32 nOldPosition = *aIter & 0xffff;
+                            sal_Int32 nOldFlags = *aIter & 0xffff0000;					
+                            sal_Int32 nNewPosition = pMergedCellIndexTable[ nOldPosition ] | nOldFlags;
+                            *aIter++ = nNewPosition; 
+                        }
                         ApplyCellLineAttributes( pObj, xTable, vPositions, aColumns.size() );
                     }
                 }
+                delete[] pMergedCellIndexTable;
+                
                 // we are replacing the whole group object by a single table object, so
                 // possibly connections to the group object have to be removed.
                 if ( pSolverContainer )
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 6e5aefc61..9e78481c0 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -208,6 +208,12 @@ void __EXPORT SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
             bMarkedObjRectDirty=TRUE;
             bMarkedPointsRectsDirty=TRUE;
         }
+/* removed for now since this breaks existing code who iterates over the mark list and sequentially replaces objects		
+        if( eKind==HINT_OBJREMOVED && IsObjMarked( const_cast<SdrObject*>(pSdrHint->GetObject()) ) )
+        {
+            MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), TRUE );
+        }		
+*/
     }
     SdrSnapView::Notify(rBC,rHint);
 }
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index c305d6188..2905cab4b 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -119,6 +119,12 @@ namespace
         // the visible area for contour text decomposition
         basegfx::B2DVector                                          maScale;
 
+        // #SJ# ClipRange for BlockText decomposition; only text portions completely
+        // inside are to be accepted, so this is different from geometric clipping
+        // (which would allow e.g. upper parts of portions to remain). Only used for 
+        // BlockText (see there)
+        basegfx::B2DRange                                           maClipRange;
+
         DECL_LINK(decomposeContourTextPrimitive, DrawPortionInfo* );
         DECL_LINK(decomposeBlockTextPrimitive, DrawPortionInfo* );
         DECL_LINK(decomposeStretchTextPrimitive, DrawPortionInfo* );
@@ -137,7 +143,14 @@ namespace
 
     public:
         impTextBreakupHandler(SdrOutliner& rOutliner)
-        :	mrOutliner(rOutliner)
+        :	maTextPortionPrimitives(),
+            maLinePrimitives(),
+            maParagraphPrimitives(),
+            mrOutliner(rOutliner),
+            maNewTransformA(),
+            maNewTransformB(),
+            maScale(),
+            maClipRange()
         {
         }
 
@@ -153,10 +166,14 @@ namespace
             mrOutliner.SetDrawBulletHdl(Link());
         }
 
-        void decomposeBlockTextPrimitive(const basegfx::B2DHomMatrix& rNewTransformA, const basegfx::B2DHomMatrix& rNewTransformB)
+        void decomposeBlockTextPrimitive(
+            const basegfx::B2DHomMatrix& rNewTransformA,
+            const basegfx::B2DHomMatrix& rNewTransformB,
+            const basegfx::B2DRange& rClipRange)
         {
             maNewTransformA = rNewTransformA;
             maNewTransformB = rNewTransformB;
+            maClipRange = rClipRange;
             mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeBlockTextPrimitive));
             mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeBlockBulletPrimitive));
             mrOutliner.StripPortions();
@@ -588,6 +605,43 @@ namespace
     {
         if(pInfo)
         {
+            // #SJ# Is clipping wanted? This is text clipping; only accept a portion
+            // if it's completely in the range
+            if(!maClipRange.isEmpty())
+            {
+                // Test start position first; this allows to not get the text range at
+                // all if text is far outside
+                const basegfx::B2DPoint aStartPosition(pInfo->mrStartPos.X(), pInfo->mrStartPos.Y());
+
+                if(!maClipRange.isInside(aStartPosition))
+                {
+                    return 0;
+                }
+
+                // Start position is inside. Get TextBoundRect and TopLeft next
+                drawinglayer::primitive2d::TextLayouterDevice aTextLayouterDevice;
+                aTextLayouterDevice.setFont(pInfo->mrFont);
+
+                const basegfx::B2DRange aTextBoundRect(
+                    aTextLayouterDevice.getTextBoundRect(
+                        pInfo->mrText, pInfo->mnTextStart, pInfo->mnTextLen));
+                const basegfx::B2DPoint aTopLeft(aTextBoundRect.getMinimum() + aStartPosition);
+
+                if(!maClipRange.isInside(aTopLeft))
+                {
+                    return 0;
+                }
+
+                // TopLeft is inside. Get BottomRight and check
+                const basegfx::B2DPoint aBottomRight(aTextBoundRect.getMaximum() + aStartPosition);
+
+                if(!maClipRange.isInside(aBottomRight))
+                {
+                    return 0;
+                }
+
+                // all inside, clip was successful
+            }
             impHandleDrawPortionInfo(*pInfo);
         }
 
@@ -903,9 +957,18 @@ bool SdrTextObj::impDecomposeBlockTextPrimitive(
     aNewTransformB.rotate(fRotate);
     aNewTransformB.translate(aTranslate.getX(), aTranslate.getY());
 
+    // #SJ# create ClipRange (if needed)
+    basegfx::B2DRange aClipRange;
+
+    if(bIsCell)
+    {
+        aClipRange.expand(basegfx::B2DTuple(0.0, 0.0));
+        aClipRange.expand(basegfx::B2DTuple(aAnchorTextSize.Width(), aAnchorTextSize.Height()));
+    }
+
     // now break up text primitives.
     impTextBreakupHandler aConverter(rOutliner);
-    aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB);
+    aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB, aClipRange);
 
     // cleanup outliner
     rOutliner.Clear();
@@ -1116,9 +1179,11 @@ bool SdrTextObj::impDecomposeAutoFitTextPrimitive(
 	aNewTransformB.rotate(fRotate);
 	aNewTransformB.translate(aTranslate.getX(), aTranslate.getY());
 
+    basegfx::B2DRange aClipRange;
+
 	// now break up text primitives.
 	impTextBreakupHandler aConverter(rOutliner);
-	aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB);
+	aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB, aClipRange);
 
 	// cleanup outliner
 	rOutliner.Clear();
diff --git a/svx/source/svrtf/rtfgrf.cxx b/svx/source/svrtf/rtfgrf.cxx
index c387fdf7e..4666f53f0 100644
--- a/svx/source/svrtf/rtfgrf.cxx
+++ b/svx/source/svrtf/rtfgrf.cxx
@@ -39,6 +39,7 @@
 #include <svtools/rtfkeywd.hxx>
 #include <svtools/rtftoken.h>
 #include <svtools/filter.hxx>
+#include <svtools/wmf.hxx>
 
 #include "impgrf.hxx"
 #include "svxrtf.hxx"
@@ -508,9 +509,15 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
             }
 
             String sTmpStr;
+			WMF_APMFILEHEADER aAPMHeader;
+			aAPMHeader.left=0;
+			aAPMHeader.top=0;
+			aAPMHeader.right=rPicType.nWidth;
+			aAPMHeader.bottom=rPicType.nHeight;
+			
+			WMF_APMFILEHEADER *pAPMHeader=(aAPMHeader.right>0 && aAPMHeader.bottom>0?&aAPMHeader:NULL);
             pTmpFile->Seek( STREAM_SEEK_TO_BEGIN );
-            bValidBmp = 0 == pGF->ImportGraphic( rGrf, sTmpStr, *pTmpFile,
-                                                nImportFilter );
+			bValidBmp = 0 == pGF->ImportGraphic( rGrf, sTmpStr, *pTmpFile, nImportFilter, NULL, 0, pAPMHeader );
         }
         delete pTmpFile;
     }
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index fe00b9bca..a16e2ed2a 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -278,19 +278,6 @@ namespace sdr
         void CellProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
         {
             TextProperties::SetStyleSheet( pNewStyleSheet, bDontRemoveHardAttr );
-
-            if( bDontRemoveHardAttr && pNewStyleSheet )
-            {
-                GetObjectItemSet();
-
-                const SfxItemSet& rStyleAttribs = pNewStyleSheet->GetItemSet();
-
-                for ( USHORT nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ )
-                {
-                    if ( rStyleAttribs.GetItemState( nWhich ) == SFX_ITEM_ON )
-                        mpItemSet->ClearItem( nWhich );					
-                }
-            }
         }
     } // end of namespace properties
 } // end of namespace sdr
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index d996af539..7ed232874 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -269,7 +269,9 @@ void SAL_CALL CellCursor::merge(  ) throw (NoSupportException, RuntimeException)
         throw DisposedException();
 
     SdrModel* pModel = mxTable->getSdrTableObj()->GetModel();
-    if( pModel )
+    const bool bUndo = pModel && mxTable->getSdrTableObj()->IsInserted() && pModel->IsUndoEnabled();
+    
+    if( bUndo )
         pModel->BegUndo( ImpGetResStr(STR_TABLE_MERGE) );
 
     try
@@ -283,8 +285,11 @@ void SAL_CALL CellCursor::merge(  ) throw (NoSupportException, RuntimeException)
         DBG_ERROR("sdr::table::CellCursor::merge(), exception caught!");
     }
 
-    if( pModel )
+    if( bUndo )
         pModel->EndUndo();
+    
+    if( pModel )
+        pModel->SetChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -530,7 +535,8 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No
         throw DisposedException();
 
     SdrModel* pModel = mxTable->getSdrTableObj()->GetModel();
-    if( pModel )
+    const bool bUndo = pModel && mxTable->getSdrTableObj()->IsInserted() && pModel->IsUndoEnabled();
+    if( bUndo )
         pModel->BegUndo( ImpGetResStr(STR_TABLE_SPLIT) );
 
     try
@@ -550,8 +556,11 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No
         throw NoSupportException();
     }
 
-    if( pModel )
+    if( bUndo )
         pModel->EndUndo();
+        
+    if( pModel )
+        pModel->SetChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 180485f3f..4d6eb3951 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -568,9 +568,6 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
             if( bUndo )
                 mpModel->EndUndo();
 
-            if( mpModel )
-                mpModel->SetChanged();
-
             aStart.mnCol = nNewStartColumn;
             aStart.mnRow = 0;
             aEnd.mnCol = aStart.mnCol + nNewColumns - 1;
@@ -602,13 +599,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
             }
 
             if( bUndo )
-            {
                 mpModel->EndUndo();
-                mpModel->SetChanged();
-            }
-
-            if( mpModel )
-                mpModel->SetChanged();
 
             aStart.mnCol = 0;
             aStart.mnRow = nNewRowStart;
@@ -879,7 +870,8 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
                 pModel->AddUndo( new TableStyleUndo( *pTableObj ) );
             }
 
-/*
+            pTableObj->setTableStyle( xNewTableStyle );
+
             const sal_Int32 nRowCount = mxTable->getRowCount();
             const sal_Int32 nColCount = mxTable->getColumnCount();
             for( sal_Int32 nRow = 0; nRow < nRowCount; nRow++ )
@@ -889,9 +881,26 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
                     CellRef xCell( dynamic_cast< Cell* >( mxTable->getCellByPosition( nCol, nRow ).get() ) );
                     if( xCell.is() )
                     {
-                        if( bUndo )
-                            xCell->AddUndo();
-                        xCell->setAllPropertiesToDefault();
+                        SfxItemSet aSet( xCell->GetItemSet() );
+                        bool bChanges = false;                        
+                        const SfxItemSet& rStyleAttribs = xCell->GetStyleSheet()->GetItemSet();
+
+                        for ( USHORT nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ )
+                        {
+                            if( (rStyleAttribs.GetItemState( nWhich ) == SFX_ITEM_ON) && (aSet.GetItemState( nWhich ) == SFX_ITEM_ON) )
+                            {
+                                aSet.ClearItem( nWhich );					
+                                bChanges = true;
+                            }
+                        }
+                        
+                        if( bChanges )
+                        {
+                            if( bUndo )
+                                xCell->AddUndo();
+                                
+                            xCell->SetMergedItemSetAndBroadcast( aSet, sal_True );	                    
+                        }
                     }
                 }
                 catch( Exception& e )
@@ -900,9 +909,6 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
                     DBG_ERROR( "svx::SvxTableController::SetTableStyle(), exception caught!" );
                 }
             }
-*/
-
-            pTableObj->setTableStyle( xNewTableStyle );
 
             if( bUndo )
                 pModel->EndUndo();
@@ -1067,9 +1073,6 @@ void SvxTableController::SplitMarkedCells()
 
                 if( bUndo )
                     mpModel->EndUndo();
-
-                if( mpModel )
-                    mpModel->SetChanged();
             }
             aEnd.mnRow += mxTable->getRowCount() - nRowCount;
             aEnd.mnCol += mxTable->getColumnCount() - nColCount;
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 9818f0ad3..b27529a32 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -118,7 +118,6 @@ basegfx::B2ITuple TableLayouter::getCellSize( const CellPos& rPos  ) const
 
                 width += maColumns[aPos.mnCol++].mnSize;
                 nColSpan--;
-                nColSpan--;
             }
         }
     }
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index bd1fe4dd9..901f7775e 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -794,6 +794,9 @@ void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount )
 
             if( bUndo )
                 pModel->EndUndo();
+                
+            if( pModel )
+                pModel->SetChanged();
 
         }
         catch( Exception& )
@@ -900,10 +903,10 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount )
                 maRows[nRows]->removeColumns( nIndex, nCount );
 
             if( bUndo )
-            {
                 pModel->EndUndo();
+                
+            if( pModel )
                 pModel->SetChanged();
-            }
         }
         catch( Exception& )
         {
@@ -969,6 +972,9 @@ void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount )
         }
         if( bUndo )
             pModel->EndUndo();
+            
+        if( pModel )
+            pModel->SetChanged();
 
         updateRows();
         setModified(sal_True);
@@ -1056,10 +1062,10 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount )
             remove_range<RowVector,RowVector::iterator>( maRows, nIndex, nCount );
 
             if( bUndo )
-            {
                 pModel->EndUndo();
+                
+            if( pModel )
                 pModel->SetChanged();
-            }
         }
         catch( Exception& )
         {
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index e31eec013..e5a011227 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -86,6 +86,13 @@ class IDocumentMarkAccess
             const ::rtl::OUString& rProposedName,
             MarkType eMark) =0;
 
+        virtual sw::mark::IMark* makeFieldBookmark( const SwPaM& rPaM, 
+            const rtl::OUString& rName, 
+            const rtl::OUString& rType) = 0;
+        virtual sw::mark::IMark* makeNoTextFieldBookmark( const SwPaM& rPaM, 
+            const rtl::OUString& rName, 
+            const rtl::OUString& rType) = 0;
+
         /** Returns a mark in the document for a paragraph.
             If there is none, a mark will be created.
 
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 8507b1d2e..5143843ca 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -51,12 +51,12 @@ namespace sw { namespace mark
     {
         public:
             //getters
-            virtual const SwPosition& GetMarkPos() const =0;
+            virtual SwPosition& GetMarkPos() const =0;
             // GetOtherMarkPos() is only guaranteed to return a valid
             // reference if IsExpanded() returned true
-            virtual const SwPosition& GetOtherMarkPos() const =0;
-            virtual const SwPosition& GetMarkStart() const =0;
-            virtual const SwPosition& GetMarkEnd() const =0;
+            virtual SwPosition& GetOtherMarkPos() const =0;
+            virtual SwPosition& GetMarkStart() const =0;
+            virtual SwPosition& GetMarkEnd() const =0;
             virtual const ::rtl::OUString& GetName() const =0;
             virtual bool IsExpanded() const =0;
             virtual bool IsCoveringPosition(const SwPosition& rPos) const =0;
@@ -79,6 +79,9 @@ namespace sw { namespace mark
                 { return GetMarkEnd() < rPos; }
             bool EndsAfter(const SwPosition& rPos) const
                 { return GetMarkEnd() > rPos; }
+
+            // Use for debugging purpose
+            virtual rtl::OUString toString( ) const = 0;
     };
 
     class IBookmark
@@ -95,13 +98,25 @@ namespace sw { namespace mark
         : virtual public IMark
     {
         public:
+            typedef  std::pair< ::rtl::OUString, ::rtl::OUString > ParamPair_t;
+
             //getters
             virtual ::rtl::OUString GetFieldname() const =0;
             virtual ::rtl::OUString GetFieldHelptext() const =0;
 
+            virtual void addParam( rtl::OUString rParamName, 
+                    rtl::OUString rParamValue,
+                    bool bReplaceExisting = true ) = 0;
+            virtual void addParam( const char* paramName, int value ) = 0;
+            virtual void addParams( std::vector<ParamPair_t>& params ) = 0;
+            virtual int  getNumOfParams() const = 0;
+            virtual ParamPair_t getParam( int pos ) const = 0;
+            virtual ParamPair_t getParam( const char *name, const char *defaultValue = NULL ) const = 0;
+
             //setters
             virtual void SetFieldname(const ::rtl::OUString& rFieldname) =0;
             virtual void SetFieldHelptext(const ::rtl::OUString& rFieldHelptext) =0;
+            virtual void invalidate( ) = 0;
     };
 
     class ICheckboxFieldmark
diff --git a/sw/inc/bookmrk.hxx b/sw/inc/bookmrk.hxx
index 991b40176..fc082e546 100644
--- a/sw/inc/bookmrk.hxx
+++ b/sw/inc/bookmrk.hxx
@@ -62,7 +62,7 @@ protected:
     String		aName;
     String		aShortName;
     KeyCode		aCode;
-    IDocumentBookmarkAccess::BookmarkType eMarkType;
+    IDocumentMarkAccess::BookmarkType eMarkType;
 
     SwBookmark( const SwPosition& aPos,
                 const KeyCode& rCode,
@@ -170,7 +170,7 @@ public:
     SwFieldBookmark(const SwPosition& aPos,
            const KeyCode& rCode,
            const String& rName, const String& rShortName,
-           IDocumentBookmarkAccess::BookmarkType eMark);
+           IDocumentMarkAccess::BookmarkType eMark);
 
     void SetFieldType(int fftype);
     int GetFieldType();
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index bbc2db88a..5901718c7 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -50,6 +50,9 @@ class String;
 class SW_DLLPUBLIC SwBreakIt
 {
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xMSF;
+    mutable com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > xBreak;
+    com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector > xCTLDetect;
+
 
     com::sun::star::lang::Locale * m_pLocale;
     com::sun::star::i18n::ForbiddenCharacters * m_pForbidden;
@@ -60,6 +63,9 @@ class SW_DLLPUBLIC SwBreakIt
     void _GetLocale( const LanguageType aLang );
     void _GetForbidden( const LanguageType	aLang );
 
+    void createBreakIterator() const;
+    void createScriptTypeDetector();
+
     // forbidden and not implemented.
     SwBreakIt();
     SwBreakIt( const SwBreakIt &);
@@ -79,15 +85,18 @@ public:
 public:
     static SwBreakIt * Get();
 
-    // @@@ backward compatibility @@@
-    com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > xBreak;
-    com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector > xCTLDetect;
-
-    const com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > & GetBreakIter()
+    com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > GetBreakIter()
     {
+        createBreakIterator();
         return xBreak;
     }
 
+    com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector > GetScriptTypeDetector() 
+    { 
+        createScriptTypeDetector();
+        return xCTLDetect; 
+    }
+
     const com::sun::star::lang::Locale& GetLocale( const LanguageType aLang )
     {
         if( !m_pLocale || aLast != aLang )
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 8c58d4e59..5a97eba01 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -188,7 +188,7 @@ class SwCalc
     xub_StrLen	nCommandPos;
 
     SwDoc&		rDoc;
-    LocaleDataWrapper* pLclData;
+    const LocaleDataWrapper* pLclData;
     CharClass* 	pCharClass;
 
     USHORT 		nListPor;
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 826081455..9122841e9 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -115,8 +115,9 @@
 #define STR_AUTOFMTREDL_SET_TMPL_HEADLINE		18
 #define STR_AUTOFMTREDL_SET_NUMBULET			19
 #define STR_AUTOFMTREDL_DEL_MORELINES			20
+#define STR_AUTOFMTREDL_NON_BREAK_SPACE         21
 // !!!!!!!!!!!!!!!!!!!!!!!!!!  das Ende immer richtig setzen !!!!!!!!!!!!
-#define STR_AUTOFMTREDL_END						21
+#define STR_AUTOFMTREDL_END						22
 
 
 #endif
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 692184be2..186f94fb4 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -45,6 +45,7 @@
 #include <node.hxx>
 #include <tblsel.hxx>
 #include <IDocumentMarkAccess.hxx>
+#include <IMark.hxx>
 
 
 // einige Forward Deklarationen
@@ -110,7 +111,8 @@ struct SwContentAtPos
         SW_REFMARK          = 0x0100,
         SW_NUMLABEL         = 0x0200, // #i23726#
         SW_CONTENT_CHECK    = 0x0400, // --> FME 2005-05-13 #i43742# <--
-        SW_SMARTTAG         = 0x0800
+        SW_SMARTTAG         = 0x0800,
+	SW_FORMCTRL         = 0x1000
 #ifndef PRODUCT
         ,SW_CURR_ATTRS 		= 0x4000		// nur zum Debuggen
         ,SW_TABLEBOXVALUE	= 0x8000		// nur zum Debuggen
@@ -122,6 +124,7 @@ struct SwContentAtPos
         const SfxPoolItem* pAttr;
         const SwRedline* pRedl;
         SwCntntNode * pNode; // #i23726#
+	    const sw::mark::IFieldmark* pFldmark;
     } aFnd;
 
     int nDist; // #i23726#
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 7e4fa39a4..3575cde6a 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -118,7 +118,7 @@ const char * dbg_out(const std::hash_map<tKey, tMember, fHashFunction> & rMap)
 {
     return dbg_out(lcl_dbg_out(rMap));
 }
-const char * dbg_out(const SwFormToken & rToken);
-const char * dbg_out(const SwFormTokens & rTokens);
+SW_DLLPUBLIC const char * dbg_out(const SwFormToken & rToken);
+SW_DLLPUBLIC const char * dbg_out(const SwFormTokens & rTokens);
 #endif // DEBUG
 #endif // __DBGOUTSW_HXX
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 6dea5884f..43b1979c3 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1513,13 +1513,16 @@ public:
     // <--
     void SetCounted( const SwPaM&, bool bCounted);
 
-    /**
-       Replace numbering rules in a PaM by another numbering rule.
+    // --> OD 2009-08-25 #i86492#
+    // no longer needed.
+    // SwDoc::SetNumRule( rPaM, rNumRule, false, <ListId>, sal_True, true ) have to be used instead.
+//    /**
+//       Replace numbering rules in a PaM by another numbering rule.
 
-       \param rPaM         PaM to replace the numbering rules in
-       \param rNumRule     numbering rule to replace the present numbering rules
-     */
-    void ReplaceNumRule(const SwPaM & rPaM, const SwNumRule & rNumRule);
+//       \param rPaM         PaM to replace the numbering rules in
+//       \param rNumRule     numbering rule to replace the present numbering rules
+//     */
+//    void ReplaceNumRule(const SwPaM & rPaM, const SwNumRule & rNumRule);
 
     void MakeUniqueNumRules(const SwPaM & rPaM);
 
@@ -1579,8 +1582,8 @@ public:
                            - FALSE: search backward
        \param bNum		   - TRUE:  search for enumeration
                            - FALSE: search for itemize
-       \param bOutline     - TRUE:  search for non-outline numbering rule
-                           - FALSE: search for outline numbering rule
+       \param bOutline     - TRUE:  search for outline numbering rule
+                           - FALSE: search for non-outline numbering rule
        \param nNonEmptyAllowed   number of non-empty paragraphs allowed between
                                  rPos and found paragraph
 
@@ -1592,13 +1595,13 @@ public:
         input parameter - boolean, indicating, if start node, determined by given
         start position has to be investigated or not.
      */
-    const SwNumRule * SearchNumRule(SwPosition & rPos,
-                                    BOOL bForward,
-                                    BOOL bNum,
-                                    BOOL bOutline,
+    const SwNumRule * SearchNumRule(const SwPosition & rPos,
+                                    const bool bForward,
+                                    const bool bNum,
+                                    const bool bOutline,
                                     int nNonEmptyAllowed,
                                     String& sListId,
-                                    bool bInvestigateStartNode = false );
+                                    const bool bInvestigateStartNode = false );
 
         // Absaetze ohne Numerierung, aber mit Einzuegen
     sal_Bool NoNum( const SwPaM& );
diff --git a/sw/inc/ecmaflds.hxx b/sw/inc/ecmaflds.hxx
new file mode 100644
index 000000000..23276b128
--- /dev/null
+++ b/sw/inc/ecmaflds.hxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: $
+ * $Revision: $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+/* and also:
+ * Author: Florian Reuter <freuter@novell.com>
+ * Copyright 2008 by Novell, Inc.
+*/
+#ifndef _ECMAFLDS_HXX
+#define _ECMAFLDS_HXX
+
+
+#define ECMA_FORMTEXT "ecma.office-open-xml.field.FORMTEXT"
+#define ECMA_FORMTEXT_NAME "name"
+#define ECMA_FORMTEXT_HELPTEXT "helpText"
+#define ECMA_FORMTEXT_STATUSTEXT "statusText"
+#define ECMA_FORMTEXT_DEFAULT "default"
+#define ECMA_FORMTEXT_FORMAT "format"
+#define ECMA_FORMTEXT_MAXLENGTH "maxLength"
+#define ECMA_FORMTEXT_TYPE "type"
+
+#define ECMA_FORMCHECKBOX "ecma.office-open-xml.field.FORMCHECKBOX"
+#define ECMA_FORMCHECKBOX_NAME "name"
+#define ECMA_FORMCHECKBOX_HELPTEXT "helpText"
+#define ECMA_FORMCHECKBOX_STATUSTEXT "statusText"
+#define ECMA_FORMCHECKBOX_CHECKED "checked"
+#define ECMA_FORMCHECKBOX_DEFAULT "default"
+#define ECMA_FORMCHECKBOX_SIZE "size"
+#define ECMA_FORMCHECKBOX_SIZEAUTO "sizeAuto"
+
+
+#define ECMA_FORMDROPDOWN "ecma.office-open-xml.field.FORMDROPDOWN"
+#define ECMA_FORMDROPDOWN_DEFAULT "default"
+#define ECMA_FORMDROPDOWN_LISTENTRY "listEntry"
+#define ECMA_FORMDROPDOWN_RESULT "result"
+
+#define ECMA_TOC "ecma.office-open-xml.field.TOC"
+
+#define ECMA_HYPERLINK "ecma.office-open-xml.field.HYPERLINK"
+
+#define ECMA_PAGEREF "ecma.office-open-xml.field.PAGEREF"
+
+#endif /*  _ECMAFLDS_HXX */
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 7246077a6..be3dbe74b 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/linguistic2/ProofreadingResult.hpp>
 #include <fldupde.hxx>
 #include <tblenum.hxx>
+#include <IMark.hxx>
 
 #include <vector>
 #include <swundo.hxx>
@@ -415,6 +416,9 @@ public:
     const SwTOXType* 	GetTOXType(TOXTypes eTyp, USHORT nId) const;
     void			 	InsertTOXType(const SwTOXType& rTyp);
 
+    // new field stuff
+    BOOL	            UpdateField(sw::mark::IFieldmark &fieldBM);
+
     //AutoMark file
     const String&	GetTOIAutoMarkURL() const;
     void			SetTOIAutoMarkURL(const String& rSet);
@@ -512,9 +516,9 @@ public:
     // --> OD 2008-03-18 #refactorlists# - add output parameter <sListId>
     // in case a list style is found, <sListId> holds the list id, to which the
     // text node belongs, which applies the found list style.
-    const SwNumRule * SearchNumRule(BOOL bForward,
-                                    BOOL bNum,
-                                    BOOL bOutline,
+    const SwNumRule * SearchNumRule(const bool bForward,
+                                    const bool bNum,
+                                    const bool bOutline,
                                     int nNonEmptyAllowed,
                                     String& sListId );
     // <--
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 1ab379d15..180f3eeba 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -44,12 +44,8 @@
 #define CH_TXT_ATR_FIELDEND ((sal_Unicode)0x05)
 #define CH_TXT_ATR_SUBST_FIELDSTART ("[")
 #define CH_TXT_ATR_SUBST_FIELDEND ("]")
-//#define CH_TXT_ATR_FORMELEMENT ((sal_Unicode)'#')
 #define CH_TXT_ATR_FORMELEMENT ((sal_Unicode)0x06)
-/*
-#define FIELD_BOOKMARK_PREFIX "__"
-#define FIELD_FORM_BOOKMARK_PREFIX "__FORM"
-*/
+
 /*
  * Hier kommen erst mal die enums fuer die Hints
  */
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 1a1cb98b5..30427864a 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -272,6 +272,7 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
 
     String GetTxt() const;
+    void Invalidate();
 };
 
 
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 9f37f7505..7ecfe08ec 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -133,6 +133,7 @@ struct SwPrintData
     void SetPrintEmptyPages(sal_Bool b ) { doSetModified(); bPrintEmptyPages = b;}
     void SetPrintPostIts    ( sal_Int16 n){ doSetModified(); nPrintPostIts = n; }
     void SetPrintProspect   ( sal_Bool b ) { doSetModified(); bPrintProspect = b; }
+    void SetPrintProspect_RTL   ( sal_Bool b ) { doSetModified(); bPrintProspect_RTL = b; }
     void SetPrintPageBackground(sal_Bool b){ doSetModified(); bPrintPageBackground = b;}
     void SetPrintBlackFont(sal_Bool b){ doSetModified(); bPrintBlackFont = b;}
     void SetPrintSingleJobs(sal_Bool b){ doSetModified(); bPrintSingleJobs = b;}
@@ -143,4 +144,3 @@ struct SwPrintData
 };
 
 #endif  //_SW_PRINTDATA_HXX
-
diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx
index b3449970c..893500899 100644
--- a/sw/inc/swcalwrp.hxx
+++ b/sw/inc/swcalwrp.hxx
@@ -34,6 +34,7 @@
 #include <i18npool/lang.h>
 #include <tools/string.hxx>
 #include <unotools/calendarwrapper.hxx>
+#include <salhelper/singletonref.hxx>
 
 class SwCalendarWrapper : public CalendarWrapper
 {
@@ -42,7 +43,7 @@ class SwCalendarWrapper : public CalendarWrapper
 
 public:
     SwCalendarWrapper( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::lang::XMultiServiceFactory > & xMSF )
+                    ::com::sun::star::lang::XMultiServiceFactory > & xMSF = ::comphelper::getProcessServiceFactory() )
         : CalendarWrapper( xMSF ), nLang( LANGUAGE_SYSTEM )
     {}
 
@@ -50,7 +51,7 @@ public:
 };
 
 
-extern SwCalendarWrapper* pCalendarWrapper;
+salhelper::SingletonRef<SwCalendarWrapper>* s_getCalendarWrapper();
 
 
 #endif
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 63a3f5c2a..168aa8705 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -259,7 +259,6 @@ namespace nsSetAttrMode
 
 // returns the APP - CharClass instance - used for all ToUpper/ToLower/...
 SW_DLLPUBLIC CharClass& GetAppCharClass();
-SW_DLLPUBLIC LocaleDataWrapper& GetAppLocaleData();
 SW_DLLPUBLIC LanguageType GetAppLanguage();
 
 
diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx
index 43dbfffca..e74aa502a 100644
--- a/sw/inc/unoobj.hxx
+++ b/sw/inc/unoobj.hxx
@@ -650,6 +650,7 @@ class SwXFieldmark : public SwXFieldmark_BASE
         SwXFieldmark(bool isReplacementObject, ::sw::mark::IMark* pBkm = 0, SwDoc* pDoc = 0);
 
         virtual void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+#if 0
         virtual ::rtl::OUString SAL_CALL getDescription(void) throw( ::com::sun::star::uno::RuntimeException );
         virtual ::sal_Int16 SAL_CALL getType(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::sal_Int16 SAL_CALL getRes(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -657,6 +658,14 @@ class SwXFieldmark : public SwXFieldmark_BASE
         virtual void SAL_CALL setType( ::sal_Int16 fieldType ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setRes( ::sal_Int16 res ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setDescription( const ::rtl::OUString& description ) throw (::com::sun::star::uno::RuntimeException);
+#endif
+        virtual ::rtl::OUString SAL_CALL getFieldType(void)  throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL setFieldType( const ::rtl::OUString& description ) throw (::com::sun::star::uno::RuntimeException);
+
+        virtual ::sal_Int16 SAL_CALL getParamCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getParamName(::sal_Int16 i)  throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::rtl::OUString SAL_CALL getParamValue(::sal_Int16 i)  throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL addParam( const ::rtl::OUString& name, const ::rtl::OUString& value, ::sal_Bool replaceExisting ) throw (::com::sun::star::uno::RuntimeException);
 };
 
 /*-----------------23.02.98 10:45-------------------
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 5d786e50b..a48e36d13 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -668,8 +668,8 @@ sal_Bool SwAccessibleParagraph::GetWordBoundary(
 
     // now ask the Break-Iterator for the word
     DBG_ASSERT( pBreakIt != NULL, "We always need a break." );
-    DBG_ASSERT( pBreakIt->xBreak.is(), "No break-iterator." );
-    if( pBreakIt->xBreak.is() )
+    DBG_ASSERT( pBreakIt->GetBreakIter().is(), "No break-iterator." );
+    if( pBreakIt->GetBreakIter().is() )
     {
         // get locale for this position
         USHORT nModelPos = GetPortionData().GetModelPosition( nPos );
@@ -681,7 +681,7 @@ sal_Bool SwAccessibleParagraph::GetWordBoundary(
         const USHORT nWordType = WordType::ANY_WORD;
 
         // get word boundary, as the Break-Iterator sees fit.
-        rBound = pBreakIt->xBreak->getWordBoundary(
+        rBound = pBreakIt->GetBreakIter()->getWordBoundary(
             rText, nPos, aLocale, nWordType, sal_True );
 
         // It's a word if the first character is an alpha-numeric character.
@@ -748,8 +748,8 @@ sal_Bool SwAccessibleParagraph::GetGlyphBoundary(
     // ask the Break-Iterator for the glyph by moving one cell
     // forward, and then one cell back
     DBG_ASSERT( pBreakIt != NULL, "We always need a break." );
-    DBG_ASSERT( pBreakIt->xBreak.is(), "No break-iterator." );
-    if( pBreakIt->xBreak.is() )
+    DBG_ASSERT( pBreakIt->GetBreakIter().is(), "No break-iterator." );
+    if( pBreakIt->GetBreakIter().is() )
     {
         // get locale for this position
         USHORT nModelPos = GetPortionData().GetModelPosition( nPos );
@@ -759,9 +759,9 @@ sal_Bool SwAccessibleParagraph::GetGlyphBoundary(
         // get word boundary, as the Break-Iterator sees fit.
         const USHORT nIterMode = CharacterIteratorMode::SKIPCELL;
         sal_Int32 nDone = 0;
-        rBound.endPos = pBreakIt->xBreak->nextCharacters(
+        rBound.endPos = pBreakIt->GetBreakIter()->nextCharacters(
              rText, nPos, aLocale, nIterMode, 1, nDone );
-        rBound.startPos = pBreakIt->xBreak->previousCharacters(
+        rBound.startPos = pBreakIt->GetBreakIter()->previousCharacters(
              rText, rBound.endPos, aLocale, nIterMode, 1, nDone );
 
         DBG_ASSERT( rBound.startPos <= nPos, "start pos too high" );
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index fb80f040b..48f4b2313 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -489,8 +489,8 @@ void SwAccessiblePortionData::GetSentenceBoundary(
     if( pSentences == NULL )
     {
          DBG_ASSERT( pBreakIt != NULL, "We always need a break." );
-         DBG_ASSERT( pBreakIt->xBreak.is(), "No break-iterator." );
-         if( pBreakIt->xBreak.is() )
+         DBG_ASSERT( pBreakIt->GetBreakIter().is(), "No break-iterator." );
+         if( pBreakIt->GetBreakIter().is() )
          {
              pSentences = new Positions_t();
              pSentences->reserve(10);
@@ -505,7 +505,7 @@ void SwAccessiblePortionData::GetSentenceBoundary(
 
                  USHORT nModelPos = GetModelPosition( nCurrent );
 
-                 sal_Int32 nNew = pBreakIt->xBreak->endOfSentence(
+                 sal_Int32 nNew = pBreakIt->GetBreakIter()->endOfSentence(
                      sAccessibleString, nCurrent,
                      pBreakIt->GetLocale(pTxtNode->GetLang(nModelPos)) ) + 1;
 
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 1dd1616df..9541707ea 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -74,18 +74,18 @@ SwBreakIt::SwBreakIt(
       aForbiddenLang( LANGUAGE_DONTKNOW)
 {
     DBG_ASSERT( m_xMSF.is(), "SwBreakIt: no MultiServiceFactory" );
-    if ( m_xMSF.is() )
-    {
-        xBreak = uno::Reference< i18n::XBreakIterator >(
-            m_xMSF->createInstance(
-                rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ),
-            uno::UNO_QUERY);
-
-        xCTLDetect = uno::Reference< i18n::XScriptTypeDetector >(
-            m_xMSF->createInstance(
-                 rtl::OUString::createFromAscii( "com.sun.star.i18n.ScriptTypeDetector" ) ),
-            uno::UNO_QUERY);
-    }
+    //if ( m_xMSF.is() )
+    //{
+ //       xBreak = uno::Reference< i18n::XBreakIterator >(
+    //		m_xMSF->createInstance(
+    //			rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ),
+ //           uno::UNO_QUERY);
+
+ //       xCTLDetect = uno::Reference< i18n::XScriptTypeDetector >(
+ //           m_xMSF->createInstance(
+ //                rtl::OUString::createFromAscii( "com.sun.star.i18n.ScriptTypeDetector" ) ),
+ //           uno::UNO_QUERY);
+ //   }
 }
 
 SwBreakIt::~SwBreakIt()
@@ -93,7 +93,16 @@ SwBreakIt::~SwBreakIt()
     delete m_pLocale;
     delete m_pForbidden;
 }
-
+void SwBreakIt::createBreakIterator() const
+{
+    if ( m_xMSF.is() && !xBreak.is() )
+        xBreak.set(m_xMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator"))),uno::UNO_QUERY);
+}
+void SwBreakIt::createScriptTypeDetector()
+{
+    if ( m_xMSF.is() && !xCTLDetect.is() )
+        xCTLDetect.set(m_xMSF->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.ScriptTypeDetector" ))),uno::UNO_QUERY);
+}
 void SwBreakIt::_GetLocale( const LanguageType aLang )
 {
     aLast = aLang;
@@ -113,6 +122,7 @@ void SwBreakIt::_GetForbidden( const LanguageType aLang )
 USHORT SwBreakIt::GetRealScriptOfText( const String& rTxt,
                                         xub_StrLen nPos ) const
 {
+    createBreakIterator();
     USHORT nScript = i18n::ScriptType::WEAK;
     if( xBreak.is() && rTxt.Len() )
     {
@@ -151,6 +161,7 @@ USHORT SwBreakIt::GetAllScriptsOfText( const String& rTxt ) const
     const USHORT coAllScripts = ( SCRIPTTYPE_LATIN |
                                   SCRIPTTYPE_ASIAN |
                                   SCRIPTTYPE_COMPLEX );
+    createBreakIterator();
     USHORT nRet = 0, nScript;
     if( !xBreak.is() )
         nRet = coAllScripts;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 487df0ac8..bb81f9116 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -273,7 +273,7 @@ SwCalc::SwCalc( SwDoc& rD )
     :
     aErrExpr( aEmptyStr, SwSbxValue(), 0 ),
     rDoc( rD ),
-    pLclData( &GetAppLocaleData() ),
+    pLclData( &SvtSysLocale().GetLocaleData() ),
     pCharClass( &GetAppCharClass() ),
     nListPor( 0 ),
     eError( CALC_NOERR )
@@ -422,7 +422,7 @@ SwCalc::~SwCalc()
 {
     for( USHORT n = 0; n < TBLSZ; ++n )
         delete VarTable[n];
-    if( pLclData != &GetAppLocaleData() )
+    if( pLclData != &SvtSysLocale().GetLocaleData() )
         delete pLclData;
     if( pCharClass != &GetAppCharClass() )
         delete pCharClass;
@@ -1622,7 +1622,7 @@ BOOL SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos,
 {
     const LocaleDataWrapper* pLclD = pLclData;
     if( !pLclD )
-        pLclD = &GetAppLocaleData();
+        pLclD = &SvtSysLocale().GetLocaleData();
 
     const xub_Unicode nCurrCmdPos = rCommandPos;
     rtl_math_ConversionStatus eStatus;
@@ -1634,7 +1634,7 @@ BOOL SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos,
             &eStatus, &pEnd );
     rCommandPos = static_cast<xub_StrLen>(pEnd - rCommand.GetBuffer());
 
-    if( !pLclData && pLclD != &GetAppLocaleData() )
+    if( !pLclData && pLclD != &SvtSysLocale().GetLocaleData() )
         delete (LocaleDataWrapper*)pLclD;
 
     return rtl_math_ConversionStatus_Ok == eStatus && nCurrCmdPos != rCommandPos;
@@ -1643,7 +1643,7 @@ BOOL SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos,
 BOOL SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos,
                             double& rVal, SwDoc* pDoc )
 {
-    const LocaleDataWrapper* pLclD = &GetAppLocaleData();
+    const LocaleDataWrapper* pLclD = &SvtSysLocale().GetLocaleData();
     if( pDoc )
     {
 
@@ -1664,7 +1664,7 @@ BOOL SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos,
             &eStatus, &pEnd );
     rCommandPos = static_cast<xub_StrLen>(pEnd - rCommand.GetBuffer());
 
-    if( pLclD != &GetAppLocaleData() )
+    if( pLclD != &SvtSysLocale().GetLocaleData() )
         delete (LocaleDataWrapper*)pLclD;
 
     return rtl_math_ConversionStatus_Ok == eStatus && nCurrCmdPos != rCommandPos;
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index ca1a59996..adf0644f2 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -467,14 +467,18 @@ SwAutoCompleteWord* SwDoc::pACmpltWords = 0;
 
 SwCheckIt* pCheckIt = 0;
 CharClass* pAppCharClass = 0;
-SwCalendarWrapper* pCalendarWrapper = 0;
+
 CollatorWrapper* pCollator = 0, *pCaseCollator = 0;
 ::utl::TransliterationWrapper* pTransWrp = 0;
 
 /******************************************************************************
  *	void _InitCore()
  ******************************************************************************/
-
+salhelper::SingletonRef<SwCalendarWrapper>* s_getCalendarWrapper()
+{
+    static salhelper::SingletonRef<SwCalendarWrapper> aCalendarWrapper;
+    return &aCalendarWrapper;
+}
 void _InitCore()
 {
     SfxPoolItem* pItem;
@@ -740,9 +744,9 @@ void _InitCore()
 
     SwBreakIt::_Create( xMSF );
     pCheckIt = NULL;
-    pAppCharClass = new CharClass(
-        xMSF, SwBreakIt::Get()->GetLocale( (LanguageType)GetAppLanguage() ));
-    pCalendarWrapper = new SwCalendarWrapper( xMSF );
+    /*pAppCharClass = new CharClass(
+        xMSF, SwBreakIt::Get()->GetLocale( (LanguageType)GetAppLanguage() ));*/
+    //pCalendarWrapper = new SwCalendarWrapper( xMSF );
 
     _FrmInit();
     _TextInit();
@@ -773,7 +777,6 @@ void _FinitCore()
     SwBreakIt::_Delete();
     delete pCheckIt;
     delete pAppCharClass;
-    delete pCalendarWrapper;
     delete pCollator;
     delete pCaseCollator;
 
@@ -856,16 +859,15 @@ void _FinitCore()
 // returns the APP - CharClass instance - used for all ToUpper/ToLower/...
 CharClass& GetAppCharClass()
 {
+    if ( !pAppCharClass )
+    {
+        uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
+        pAppCharClass = new CharClass(
+            xMSF, SwBreakIt::Get()->GetLocale( (LanguageType)GetAppLanguage() ));
+    }
     return *pAppCharClass;
 }
 
-LocaleDataWrapper& GetAppLocaleData()
-{
-    SvtSysLocale aSysLocale;
-    return (LocaleDataWrapper&)aSysLocale.GetLocaleData();
-}
-
-
 void SwCalendarWrapper::LoadDefaultCalendar( USHORT eLang )
 {
     sUniqueId.Erase();
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 5e9c7aa75..5658e41f8 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -75,19 +75,23 @@ namespace
         const sal_Unicode aStartMark,
         const sal_Unicode aEndMark)
     {
-        const SwPosition& rStart = pField->GetMarkStart();
-        const SwPosition& rEnd = pField->GetMarkEnd();
+        SwPosition& rStart = pField->GetMarkStart();
+        SwPosition& rEnd = pField->GetMarkEnd();
         SwTxtNode const * const pStartTxtNode = io_pDoc->GetNodes()[rStart.nNode]->GetTxtNode();
         SwTxtNode const * const pEndTxtNode = io_pDoc->GetNodes()[rEnd.nNode]->GetTxtNode();
         const sal_Unicode ch_start=pStartTxtNode->GetTxt().GetChar(rStart.nContent.GetIndex());
         const sal_Unicode ch_end=pEndTxtNode->GetTxt().GetChar(rEnd.nContent.GetIndex()-1);
-        const SwPaM aStartPaM(rStart);
-        const SwPaM aEndPaM(rEnd);
+        SwPaM aStartPaM(rStart);
+        SwPaM aEndPaM(rEnd);
         io_pDoc->StartUndo(UNDO_UI_REPLACE, NULL);
         if(ch_start != aStartMark)
+        {
             io_pDoc->Insert(aStartPaM, aStartMark);
-        if(aEndMark && ch_end != aEndMark)
+        }
+        if(aEndMark && ( ch_end != aEndMark ) && ( rStart != rEnd ) )
+        {
             io_pDoc->Insert(aEndPaM, aEndMark);
+        }
         io_pDoc->EndUndo(UNDO_UI_REPLACE, NULL);
     };
 }
@@ -108,6 +112,11 @@ namespace sw { namespace mark
         }
     }
 
+    bool MarkBase::IsCoveringPosition(const SwPosition& rPos) const
+    {
+        return GetMarkStart() <= rPos && rPos <= GetMarkEnd(); 
+    }
+
     void MarkBase::SetMarkPos(const SwPosition& rNewPos)
     {
         ::boost::scoped_ptr<SwPosition>(new SwPosition(rNewPos)).swap(m_pPos1);
@@ -120,6 +129,17 @@ namespace sw { namespace mark
         //lcl_FixPosition(*m_pPos2);
     }
 
+    rtl::OUString MarkBase::toString( ) const
+    {
+        rtl::OUStringBuffer buf;
+        buf.appendAscii( "Mark: ( Name, [ Node1, Index1 ] ): ( " );
+        buf.append( m_aName ).appendAscii( ", [ " );
+        buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " );
+        buf.append( sal_Int32( GetMarkPos().nContent.GetIndex( ) ) ).appendAscii( " ] )" );
+
+        return buf.makeStringAndClear( );
+    }
+
     MarkBase::~MarkBase()
     { }
 
@@ -212,6 +232,96 @@ namespace sw { namespace mark
         if(!IsExpanded())
             SetOtherMarkPos(GetMarkPos());
     }
+    
+    rtl::OUString Fieldmark::toString( ) const 
+    {
+        rtl::OUStringBuffer buf;
+        buf.appendAscii( "Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( " );
+        buf.append( m_aName ).appendAscii( ", " );
+        buf.append( m_aFieldname ).appendAscii( ", [ " );
+        buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " );
+        buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) ).appendAscii( " ], [" );
+        buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " );
+        buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) ).appendAscii( " ] ) " );
+
+        return buf.makeStringAndClear( );
+    }
+
+    void Fieldmark::addParam( ::rtl::OUString paramName,
+                              ::rtl::OUString paramValue,
+                              bool replaceExisting )
+    {
+        if ( replaceExisting )
+        {
+            bool replaced = false;
+            const int len = m_params.size(  );
+            for ( int i = 0; i < len; i++ )
+            {
+                if ( m_params[i].first.compareTo( paramName ) == 0 )
+                {
+                    m_params[i] = ParamPair_t( paramName, paramValue );
+                    replaced = true;
+                }
+            }
+            if ( !replaced )
+            {
+                m_params.push_back( ParamPair_t( paramName, paramValue ) );
+            }
+        }
+        else
+        {
+            m_params.push_back( ParamPair_t( paramName, paramValue ) );
+        }
+    }
+
+    void Fieldmark::addParam( const char *paramName, int value )
+    {
+        rtl::OUString sName = rtl::OUString::createFromAscii( paramName );
+        rtl::OUString sValue =::rtl::OUString::valueOf( ( sal_Int32 ) value );
+        addParam( sName, sValue );
+    }
+
+    void Fieldmark::addParams( std::vector < ParamPair_t > &params )
+    {
+        for ( std::vector < ParamPair_t >::iterator i = params.begin(  );
+              i != params.end(  ); i++ )
+        {
+            m_params.push_back( *i );
+        }
+    }
+
+    int Fieldmark::getNumOfParams(  ) const
+    {
+        return m_params.size(  );
+    }
+
+    Fieldmark::ParamPair_t Fieldmark::getParam( int pos ) const
+    {
+        return m_params[pos];
+    }
+
+    Fieldmark::ParamPair_t Fieldmark::getParam( const char *name,
+                                                const char *defaultValue ) const
+    {
+        for ( std::vector < ParamPair_t >::iterator i = const_cast< Fieldmark* >( this )->m_params.begin(  );
+              i != m_params.end(  ); i++ )
+        {
+            if ( i->first.compareToAscii( name ) == 0 )
+            {
+                return *i;
+            }
+        }
+        return ParamPair_t( rtl::OUString(  ),
+                            ( defaultValue ? 
+                                rtl::OUString::createFromAscii( defaultValue ) :
+                                rtl::OUString(  ) ) );
+    }
+
+    void Fieldmark::invalidate( )
+    {
+        SwPaM aPaM( this->GetMarkPos(), this->GetOtherMarkPos() );
+        aPaM.Invalidate();
+    }
 
     const ::rtl::OUString Fieldmark::our_sNamePrefix = ::rtl::OUString::createFromAscii("__Fieldmark__");
 
@@ -230,7 +340,11 @@ namespace sw { namespace mark
 
     void CheckboxFieldmark::InitDoc(SwDoc* const io_pDoc)
     {
-        lcl_AssureFieldMarksSet(this, io_pDoc, CH_TXT_ATR_FIELDSTART, CH_TXT_ATR_FIELDEND);
+        lcl_AssureFieldMarksSet(this, io_pDoc, CH_TXT_ATR_FORMELEMENT, CH_TXT_ATR_FIELDEND);
+
+        // For some reason the end mark is moved from 1 by the Insert: we don't 
+        // want this for checkboxes
+        this->GetMarkEnd( ).nContent--;
     }
 
     void CheckboxFieldmark::SetChecked(bool checked)
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 410b70ec0..603e4f885 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -217,12 +217,12 @@ SwCallLink::~SwCallLink()
                 }
             }
 
-            if( pBreakIt->xBreak.is() )
+            if( pBreakIt->GetBreakIter().is() )
             {
                 const String& rTxt = ((SwTxtNode*)pCNd)->GetTxt();
                 if( !nCmp ||
-                    pBreakIt->xBreak->getScriptType( rTxt, nCmp )
-                     != pBreakIt->xBreak->getScriptType( rTxt, nCmp - 1 ))
+                    pBreakIt->GetBreakIter()->getScriptType( rTxt, nCmp )
+                     != pBreakIt->GetBreakIter()->getScriptType( rTxt, nCmp - 1 ))
                 {
                     rShell.CallChgLnk();
                     return;
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 8ae112a78..0a8929d00 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -67,7 +67,7 @@ namespace sw { namespace mark
         MarkBase::SetMarkPos(rNewPos);
     }
 
-    const SwPosition& CrossRefBookmark::GetOtherMarkPos() const
+    SwPosition& CrossRefBookmark::GetOtherMarkPos() const
     {
         OSL_PRECOND(false,
             "<SwCrossRefBookmark::GetOtherMarkPos(..)>"
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 050467217..9ff996a8c 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1175,6 +1175,17 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
                     }
                 }
 
+		if( !bRet && SwContentAtPos::SW_FORMCTRL & rCntntAtPos.eCntntAtPos )
+		{
+            IDocumentMarkAccess* pMarksAccess = GetDoc()->getIDocumentMarkAccess( );
+            sw::mark::IFieldmark* pFldBookmark = pMarksAccess->getFieldmarkFor( aPos );
+		    if( bCrsrFoundExact && pTxtNd && pFldBookmark) {
+			    rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FORMCTRL;
+    			rCntntAtPos.aFnd.pFldmark = pFldBookmark;
+	    		bRet=TRUE;
+		    }
+		}
+
                 if( !bRet && SwContentAtPos::SW_FTN & rCntntAtPos.eCntntAtPos )
                 {
                     if( aTmpState.bFtnNoInfo )
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index e483aa44a..75001b05e 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -456,7 +456,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
     USHORT nCurrScript = 0;
 
     if ( SearchAlgorithms_APPROXIMATE == rSearchOpt.algorithmType &&
-         pBreakIt->xBreak.is() )
+         pBreakIt->GetBreakIter().is() )
     {
         pScriptIter = new SwScriptIterator( sCleanStr, nStart, bSrchForward );
         nSearchScript = pBreakIt->GetRealScriptOfText( rSearchOpt.searchString, 0 );
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 7a8a83ef3..c5a734476 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -56,6 +56,7 @@
 #include <ndtxt.hxx> // #111827#
 
 #include <IMark.hxx>
+#include <hints.hxx>
 
 // fuer den dummen ?MSC-? Compiler
 inline xub_StrLen GetSttOrEnd( BOOL bCondition, const SwCntntNode& rNd )
@@ -817,16 +818,21 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
     }
     //FIXME FieldBk
     // TODO: Form Protection when Enhanced Fields are enabled
-//	if( !bRet )
-//    {
-//	    const SwDoc *pDoc=GetDoc();
-//	    SwBookmark *pA = ( pDoc && pPoint ? pDoc->getFieldmarkFor( *pPoint ) : NULL );
-//	    SwBookmark *pB = ( pDoc && pMark ? pDoc->getFieldmarkFor( *pMark ) : pA );
-//	    bRet = ( pA != pB );
-//	    bool bProtectForm = pDoc->get( IDocumentSettingAccess::PROTECT_FORM );
-//	    if( bProtectForm )
-//            bRet |= ( pA==NULL || pB==NULL );
-//	}
+ 	if (!bRet) {
+ 	    const SwDoc *pDoc = GetDoc();
+        sw::mark::IMark* pA = NULL;
+        sw::mark::IMark* pB = NULL;
+        if ( pDoc )
+        {
+            const IDocumentMarkAccess* pMarksAccess = pDoc->getIDocumentMarkAccess( );
+ 	        pA = GetPoint() ? pMarksAccess->getFieldmarkFor( *GetPoint( ) ) : NULL;
+ 	        pB = GetMark( ) ? pMarksAccess->getFieldmarkFor( *GetMark( ) ) : pA;
+     	    bRet = ( pA != pB );
+        }
+ 	    bool bProtectForm = pDoc->get( IDocumentSettingAccess::PROTECT_FORM );
+ 	    if ( bProtectForm )
+     		bRet |= ( pA == NULL || pB == NULL );
+ 	}
     return bRet;
 }
 
@@ -1213,6 +1219,18 @@ BOOL SwPaM::Overlap(const SwPaM & a, const SwPaM & b)
     return !(*b.End() <= *a.Start() || *a.End() <= *b.End());
 }
 
+void SwPaM::Invalidate()
+{
+    const SwNode *_pNd=this->GetNode();
+    const SwTxtNode *_pTxtNd=(_pNd!=NULL?_pNd->GetTxtNode():NULL);
+    if (_pTxtNd!=NULL) {
+	//pretent we've added a char to force layout to recalc the portion...
+	SwInsChr aHint(_pTxtNd->GetIndex());
+	SwModify *_pModify=(SwModify*)_pTxtNd;
+	_pModify->Modify( 0, &aHint);
+    }
+}
+
 BOOL SwPaM::LessThan(const SwPaM & a, const SwPaM & b)
 {
     return (*a.Start() < *b.Start()) || (*a.Start() == *b.Start() && *a.End() < *b.End()); 
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index d32eaf667..749046780 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1188,10 +1188,10 @@ BOOL SwCursor::IsStartWordWT( sal_Int16 nWordType ) const
 {
     BOOL bRet = FALSE;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
-    if( pTxtNd && pBreakIt->xBreak.is() )
+    if( pTxtNd && pBreakIt->GetBreakIter().is() )
     {
         xub_StrLen nPtPos = GetPoint()->nContent.GetIndex();
-        bRet = pBreakIt->xBreak->isBeginWord(
+        bRet = pBreakIt->GetBreakIter()->isBeginWord(
                             pTxtNd->GetTxt(), nPtPos,
                             pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos )),
                             nWordType );
@@ -1203,10 +1203,10 @@ BOOL SwCursor::IsEndWordWT( sal_Int16 nWordType ) const
 {
     BOOL bRet = FALSE;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
-    if( pTxtNd && pBreakIt->xBreak.is() )
+    if( pTxtNd && pBreakIt->GetBreakIter().is() )
     {
         xub_StrLen nPtPos = GetPoint()->nContent.GetIndex();
-        bRet = pBreakIt->xBreak->isEndWord(
+        bRet = pBreakIt->GetBreakIter()->isEndWord(
                             pTxtNd->GetTxt(), nPtPos,
                             pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
                             nWordType );
@@ -1219,10 +1219,10 @@ BOOL SwCursor::IsInWordWT( sal_Int16 nWordType ) const
 {
     BOOL bRet = FALSE;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
-    if( pTxtNd && pBreakIt->xBreak.is() )
+    if( pTxtNd && pBreakIt->GetBreakIter().is() )
     {
         xub_StrLen nPtPos = GetPoint()->nContent.GetIndex();
-        Boundary aBoundary = pBreakIt->xBreak->getWordBoundary(
+        Boundary aBoundary = pBreakIt->GetBreakIter()->getWordBoundary(
                             pTxtNd->GetTxt(), nPtPos,
                             pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
                             nWordType,
@@ -1261,11 +1261,11 @@ BOOL SwCursor::GoStartWordWT( sal_Int16 nWordType )
 {
     BOOL bRet = FALSE;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
-    if( pTxtNd && pBreakIt->xBreak.is() )
+    if( pTxtNd && pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         xub_StrLen nPtPos = GetPoint()->nContent.GetIndex();
-        nPtPos = (xub_StrLen)pBreakIt->xBreak->getWordBoundary(
+        nPtPos = (xub_StrLen)pBreakIt->GetBreakIter()->getWordBoundary(
                             pTxtNd->GetTxt(), nPtPos,
                             pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
                             nWordType,
@@ -1285,11 +1285,11 @@ BOOL SwCursor::GoEndWordWT( sal_Int16 nWordType )
 {
     BOOL bRet = FALSE;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
-    if( pTxtNd && pBreakIt->xBreak.is() )
+    if( pTxtNd && pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         xub_StrLen nPtPos = GetPoint()->nContent.GetIndex();
-        nPtPos = (xub_StrLen)pBreakIt->xBreak->getWordBoundary(
+        nPtPos = (xub_StrLen)pBreakIt->GetBreakIter()->getWordBoundary(
                             pTxtNd->GetTxt(), nPtPos,
                             pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
                             nWordType,
@@ -1310,12 +1310,12 @@ BOOL SwCursor::GoNextWordWT( sal_Int16 nWordType )
 {
     BOOL bRet = FALSE;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
-    if( pTxtNd && pBreakIt->xBreak.is() )
+    if( pTxtNd && pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         xub_StrLen nPtPos = GetPoint()->nContent.GetIndex();
 
-        nPtPos = (xub_StrLen)pBreakIt->xBreak->nextWord(
+        nPtPos = (xub_StrLen)pBreakIt->GetBreakIter()->nextWord(
                                 pTxtNd->GetTxt(), nPtPos,
             pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos, 1 ) ),
                     nWordType ).startPos;
@@ -1334,7 +1334,7 @@ BOOL SwCursor::GoPrevWordWT( sal_Int16 nWordType )
 {
     BOOL bRet = FALSE;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
-    if( pTxtNd && pBreakIt->xBreak.is() )
+    if( pTxtNd && pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         xub_StrLen nPtPos = GetPoint()->nContent.GetIndex();
@@ -1342,7 +1342,7 @@ BOOL SwCursor::GoPrevWordWT( sal_Int16 nWordType )
 
         if( nPtPos )
             --nPtPos;
-        nPtPos = (xub_StrLen)pBreakIt->xBreak->previousWord(
+        nPtPos = (xub_StrLen)pBreakIt->GetBreakIter()->previousWord(
                                 pTxtNd->GetTxt(), nPtStart,
             pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos, 1 ) ),
                     nWordType ).startPos;
@@ -1373,10 +1373,10 @@ BOOL SwCursor::SelectWordWT( sal_Int16 nWordType, const Point* pPt )
     }
 
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
-    if( pTxtNd && pBreakIt->xBreak.is() )
+    if( pTxtNd && pBreakIt->GetBreakIter().is() )
     {
         xub_StrLen nPtPos = GetPoint()->nContent.GetIndex();
-        Boundary aBndry( pBreakIt->xBreak->getWordBoundary(
+        Boundary aBndry( pBreakIt->GetBreakIter()->getWordBoundary(
                             pTxtNd->GetTxt(), nPtPos,
                             pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
                             nWordType,
@@ -1408,7 +1408,7 @@ BOOL SwCursor::GoSentence( SentenceMoveType eMoveType )
 {
     BOOL bRet = FALSE;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
-    if( pTxtNd && pBreakIt->xBreak.is() )
+    if( pTxtNd && pBreakIt->GetBreakIter().is() )
     {
         //mask deleted redlines
         String sNodeText(pTxtNd->GetTxt());
@@ -1438,14 +1438,14 @@ BOOL SwCursor::GoSentence( SentenceMoveType eMoveType )
         switch ( eMoveType )
         {
         case END_SENT:
-            nPtPos = (xub_StrLen)pBreakIt->xBreak->endOfSentence(
+            nPtPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfSentence(
                                     sNodeText,
                                     nPtPos, pBreakIt->GetLocale(
                                                 pTxtNd->GetLang( nPtPos ) ));
             break;
         case NEXT_SENT:
             {
-                nPtPos = (xub_StrLen)pBreakIt->xBreak->endOfSentence(
+                nPtPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfSentence(
                                         sNodeText,
                                         nPtPos, pBreakIt->GetLocale(
                                                     pTxtNd->GetLang( nPtPos ) ));
@@ -1455,20 +1455,20 @@ BOOL SwCursor::GoSentence( SentenceMoveType eMoveType )
                 break;
             }
         case START_SENT:
-            nPtPos = (xub_StrLen)pBreakIt->xBreak->beginOfSentence(
+            nPtPos = (xub_StrLen)pBreakIt->GetBreakIter()->beginOfSentence(
                                     sNodeText,
                                     nPtPos, pBreakIt->GetLocale(
                                             pTxtNd->GetLang( nPtPos ) ));
             break;
         case PREV_SENT:
-            nPtPos = (xub_StrLen)pBreakIt->xBreak->beginOfSentence(
+            nPtPos = (xub_StrLen)pBreakIt->GetBreakIter()->beginOfSentence(
                                     sNodeText,
                                     nPtPos, pBreakIt->GetLocale(
                                                 pTxtNd->GetLang( nPtPos ) ));
             if (nPtPos == 0)
                 return FALSE;	// the previous sentence is not in this paragraph
             if (nPtPos > 0)
-                nPtPos = (xub_StrLen)pBreakIt->xBreak->beginOfSentence(
+                nPtPos = (xub_StrLen)pBreakIt->GetBreakIter()->beginOfSentence(
                                     sNodeText,
                                     nPtPos - 1, pBreakIt->GetLocale(
                                                 pTxtNd->GetLang( nPtPos ) ));
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 836cbf0c3..752b58c78 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -41,6 +41,7 @@
 #include <dcontact.hxx>
 #include <doc.hxx>
 #include <docary.hxx>
+#include <ecmaflds.hxx>
 #include <editsh.hxx>
 #include <errhdl.hxx>
 #include <fmtanchr.hxx>
@@ -66,6 +67,23 @@
 #include <viscrs.hxx>
 #include <stdio.h>
 
+static void lcl_docbm_FixPosition( SwPosition& rPos )
+{
+    // make sure the position has 1) the proper node, and 2) a proper index
+    SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
+
+    if( rPos.nContent.GetIndex() > ( pTxtNode == NULL ? 0 : pTxtNode->Len() ) )
+    {
+        DBG_ERROR( "illegal position" );
+        xub_StrLen nLen = rPos.nContent.GetIndex();
+        if( pTxtNode == NULL )
+            nLen = 0;
+        else if( nLen >= pTxtNode->Len() )
+            nLen = pTxtNode->Len();
+        rPos.nContent.Assign( pTxtNode, nLen );
+    }
+}
+
 
 using namespace ::std;
 using namespace ::boost;
@@ -309,6 +327,17 @@ namespace sw { namespace mark
         : m_pDoc(&rDoc)
     { }
 
+    void MarkManager::dumpFieldmarks( ) const
+    {
+        const_iterator_t pIt = m_vFieldmarks.begin( );
+        for ( ; pIt != m_vFieldmarks.end( ); pIt++ )
+        {
+            rtl::OUString str = ( *pIt )->toString( );
+            fprintf( stderr, "%s\n", 
+                  rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr( ) );
+        }
+    }
+
     ::sw::mark::IMark* MarkManager::makeMark(const SwPaM& rPaM,
         const ::rtl::OUString& rName,
         const IDocumentMarkAccess::MarkType eType)
@@ -414,6 +443,30 @@ namespace sw { namespace mark
         return pMark.get();
     }
 
+    ::sw::mark::IMark* MarkManager::makeFieldBookmark( const SwPaM& rPaM,
+        const rtl::OUString& rName,
+        const rtl::OUString& rType )
+    {
+        sw::mark::IMark* pMark = makeMark( rPaM, rName, 
+                IDocumentMarkAccess::TEXT_FIELDMARK );
+        sw::mark::IFieldmark* pFieldMark = dynamic_cast<sw::mark::IFieldmark*>( pMark );
+        pFieldMark->SetFieldname( rType );
+
+        return pMark;
+    }
+            
+    ::sw::mark::IMark* MarkManager::makeNoTextFieldBookmark( const SwPaM& rPaM, 
+        const rtl::OUString& rName, 
+        const rtl::OUString& rType)
+    {
+        sw::mark::IMark* pMark = makeMark( rPaM, rName, 
+                IDocumentMarkAccess::CHECKBOX_FIELDMARK );
+        sw::mark::IFieldmark* pFieldMark = dynamic_cast<sw::mark::IFieldmark*>( pMark );
+        pFieldMark->SetFieldname( rType );
+
+        return pMark;
+    }
+
     ::sw::mark::IMark* MarkManager::getMarkForTxtNode(const SwTxtNode& rTxtNode,
         const IDocumentMarkAccess::MarkType eType)
     {
@@ -767,12 +820,7 @@ namespace sw { namespace mark
     {
         const_iterator_t pFieldmark = find_if(
             m_vFieldmarks.begin(),
-            // we do not need to check marks starting behind the positon
-            lower_bound(
-                m_vFieldmarks.begin(),
-                m_vFieldmarks.end(),
-                rPos,
-                bind(&IMark::StartsAfter, _1, _2)),
+            m_vFieldmarks.end( ),
             bind(&IMark::IsCoveringPosition, _1, rPos));
         if(pFieldmark == m_vFieldmarks.end()) return NULL;
         return dynamic_cast<IFieldmark*>(pFieldmark->get());
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 02edef612..53ba7a2a5 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -62,16 +62,18 @@ using namespace ::com::sun::star;
 namespace
 {
 
-    static ::sw::mark::DdeBookmark* lcl_FindDdeBookmark(const IDocumentMarkAccess& rMarkAccess, const String& rName)
+    static ::sw::mark::DdeBookmark* const lcl_FindDdeBookmark(const IDocumentMarkAccess& rMarkAccess, const String& rName, bool bCaseSensitive)
     {
         //Iterating over all bookmarks, checking DdeBookmarks
-        const String sNameLc = GetAppCharClass().lower(rName);
+        const ::rtl::OUString sNameLc = bCaseSensitive ? rName : GetAppCharClass().lower(rName);
         for(IDocumentMarkAccess::const_iterator_t ppMark = rMarkAccess.getMarksBegin();
             ppMark != rMarkAccess.getMarksEnd();
             ppMark++)
         {
             ::sw::mark::DdeBookmark* const pBkmk = dynamic_cast< ::sw::mark::DdeBookmark*>(ppMark->get());
-            if(pBkmk && GetAppCharClass().lower(pBkmk->GetName()) == sNameLc)
+            if(pBkmk && 
+                (bCaseSensitive && (pBkmk->GetName() == sNameLc)) ||
+                (!bCaseSensitive && GetAppCharClass().lower(pBkmk->GetName()) == String( sNameLc )))
                 return pBkmk;
         }
         return NULL;
@@ -89,13 +91,14 @@ struct _FindItem
     {}
 };
 
-BOOL lcl_FindSection( const SwSectionFmtPtr& rpSectFmt, void* pArgs )
+BOOL lcl_FindSection( const SwSectionFmtPtr& rpSectFmt, void* pArgs, bool bCaseSensitive )
 {
     SwSection* pSect = rpSectFmt->GetSection();
     if( pSect )
     {
-        String sNm( GetAppCharClass().lower( pSect->GetName() ));
-        if( sNm.Equals( ((_FindItem*)pArgs)->rItem ))
+        String sNm( bCaseSensitive ? pSect->GetName() : GetAppCharClass().lower( pSect->GetName() ));
+        String sCompare( bCaseSensitive ? ((_FindItem*)pArgs)->rItem  : GetAppCharClass().lower( ((_FindItem*)pArgs)->rItem ));
+        if( sNm == sCompare )
         {
             // gefunden, als erfrage die Daten
             const SwNodeIndex* pIdx;
@@ -112,6 +115,14 @@ BOOL lcl_FindSection( const SwSectionFmtPtr& rpSectFmt, void* pArgs )
     }
     return TRUE;		// dann weiter
 }
+BOOL lcl_FindSectionCaseSensitive( const SwSectionFmtPtr& rpSectFmt, void* pArgs )
+{
+    return lcl_FindSection( rpSectFmt, pArgs, true );
+}    
+BOOL lcl_FindSectionCaseInsensitive( const SwSectionFmtPtr& rpSectFmt, void* pArgs )
+{
+    return lcl_FindSection( rpSectFmt, pArgs, false );
+}    
 
 
 
@@ -143,20 +154,30 @@ BOOL lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs )
 bool SwDoc::GetData( const String& rItem, const String& rMimeType,
                      uno::Any & rValue ) const
 {
-    ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, rItem);
-    if(pBkmk) return SwServerObject(*pBkmk).GetData(rValue, rMimeType);
-
-    // haben wir ueberhaupt das Item vorraetig?
-    String sItem(GetAppCharClass().lower(rItem));
-    _FindItem aPara( sItem );
-    ((SwSectionFmts&)*pSectionFmtTbl).ForEach( 0, pSectionFmtTbl->Count(),
-                                                lcl_FindSection, &aPara );
-    if( aPara.pSectNd )
+    //search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
+    bool bCaseSensitive = true;
+    while( true )
     {
-        // gefunden, als erfrage die Daten
-        return SwServerObject( *aPara.pSectNd ).GetData( rValue, rMimeType );
+        ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, rItem, bCaseSensitive);
+        if(pBkmk) 
+            return SwServerObject(*pBkmk).GetData(rValue, rMimeType);
+
+        // haben wir ueberhaupt das Item vorraetig?
+        String sItem( bCaseSensitive ? rItem : GetAppCharClass().lower(rItem));
+        _FindItem aPara( sItem );
+        ((SwSectionFmts&)*pSectionFmtTbl).ForEach( 0, pSectionFmtTbl->Count(),
+                                                    bCaseSensitive ? lcl_FindSectionCaseSensitive : lcl_FindSectionCaseInsensitive, &aPara );
+        if( aPara.pSectNd )
+        {
+            // gefunden, als erfrage die Daten
+            return SwServerObject( *aPara.pSectNd ).GetData( rValue, rMimeType );
+        }
+        if( !bCaseSensitive ) 
+            break;
+        bCaseSensitive = false;
     }
 
+    _FindItem aPara( GetAppCharClass().lower( rItem ));
     ((SwFrmFmts*)pTblFrmFmtTbl)->ForEach( 0, pTblFrmFmtTbl->Count(),
                                             lcl_FindTable, &aPara );
     if( aPara.pTblNd )
@@ -172,19 +193,30 @@ bool SwDoc::GetData( const String& rItem, const String& rMimeType,
 bool SwDoc::SetData( const String& rItem, const String& rMimeType,
                      const uno::Any & rValue )
 {
-    ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, rItem);
-    if(pBkmk) return SwServerObject(*pBkmk).SetData(rMimeType, rValue);
-
-    // haben wir ueberhaupt das Item vorraetig?
-    String sItem(GetAppCharClass().lower(rItem));
-    _FindItem aPara( sItem );
-    pSectionFmtTbl->ForEach( 0, pSectionFmtTbl->Count(), lcl_FindSection, &aPara );
-    if( aPara.pSectNd )
+    //search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
+    bool bCaseSensitive = true;
+    while( true )
     {
-        // gefunden, als erfrage die Daten
-        return SwServerObject( *aPara.pSectNd ).SetData( rMimeType, rValue );
+        ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, rItem, bCaseSensitive);
+        if(pBkmk) 
+            return SwServerObject(*pBkmk).SetData(rMimeType, rValue);
+
+        // haben wir ueberhaupt das Item vorraetig?
+        String sItem( bCaseSensitive ? rItem : GetAppCharClass().lower(rItem));
+        _FindItem aPara( sItem );
+        pSectionFmtTbl->ForEach( 0, pSectionFmtTbl->Count(), bCaseSensitive ? lcl_FindSectionCaseSensitive : lcl_FindSectionCaseInsensitive, &aPara );
+        if( aPara.pSectNd )
+        {
+            // gefunden, als erfrage die Daten
+            return SwServerObject( *aPara.pSectNd ).SetData( rMimeType, rValue );
+        }
+        if( !bCaseSensitive ) 
+            break;
+        bCaseSensitive = false;
     }
 
+    String sItem(GetAppCharClass().lower(rItem));
+    _FindItem aPara( sItem );
     pTblFrmFmtTbl->ForEach( 0, pTblFrmFmtTbl->Count(), lcl_FindTable, &aPara );
     if( aPara.pTblNd )
     {
@@ -200,31 +232,42 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
 {
     SwServerObject* pObj = NULL;
 
-    // bookmarks
-    ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, rItem);
-    if(pBkmk && pBkmk->IsExpanded()
-        && (0 == (pObj = pBkmk->GetRefObject())))
+    //search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
+    bool bCaseSensitive = true;
+    while( true )
     {
-        // mark found, but no link yet -> create hotlink 
-        pObj = new SwServerObject(*pBkmk);
-        pBkmk->SetRefObject(pObj);
-        GetLinkManager().InsertServer(pObj);
-    }     
-    if(pObj) return pObj;
-
-    _FindItem aPara(GetAppCharClass().lower(rItem));
-    // sections
-    ((SwSectionFmts&)*pSectionFmtTbl).ForEach(0, pSectionFmtTbl->Count(), lcl_FindSection, &aPara);
-    if(aPara.pSectNd
-        && (0 == (pObj = aPara.pSectNd->GetSection().GetObject())))
-    {
-        // section found, but no link yet -> create hotlink 
-        pObj = new SwServerObject( *aPara.pSectNd );
-        aPara.pSectNd->GetSection().SetRefObject( pObj );
-        GetLinkManager().InsertServer(pObj);
+        // bookmarks
+        ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, rItem, bCaseSensitive);
+        if(pBkmk && pBkmk->IsExpanded()
+            && (0 == (pObj = pBkmk->GetRefObject())))
+        {
+            // mark found, but no link yet -> create hotlink 
+            pObj = new SwServerObject(*pBkmk);
+            pBkmk->SetRefObject(pObj);
+            GetLinkManager().InsertServer(pObj);
+        }     
+        if(pObj) 
+            return pObj;
+
+        _FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lower(rItem));
+        // sections
+        ((SwSectionFmts&)*pSectionFmtTbl).ForEach(0, pSectionFmtTbl->Count(), bCaseSensitive ? lcl_FindSectionCaseSensitive : lcl_FindSectionCaseInsensitive, &aPara);
+        if(aPara.pSectNd
+            && (0 == (pObj = aPara.pSectNd->GetSection().GetObject())))
+        {
+            // section found, but no link yet -> create hotlink 
+            pObj = new SwServerObject( *aPara.pSectNd );
+            aPara.pSectNd->GetSection().SetRefObject( pObj );
+            GetLinkManager().InsertServer(pObj);
+        }
+        if(pObj) 
+            return pObj;
+        if( !bCaseSensitive ) 
+            break;
+        bCaseSensitive = false;
     }
-    if(pObj) return pObj;
 
+    _FindItem aPara( GetAppCharClass().lower(rItem) );
     // tables 
     ((SwFrmFmts*)pTblFrmFmtTbl)->ForEach(0, pTblFrmFmtTbl->Count(), lcl_FindTable, &aPara);
     if(aPara.pTblNd
@@ -329,31 +372,39 @@ BOOL SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
             return FALSE;
     }
 
-    ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, sItem);
-    if(pBkmk)
+    //search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
+    bool bCaseSensitive = true;
+    while( true )
     {
-        if(pBkmk->IsExpanded())
-            rpPam = new SwPaM(
-                pBkmk->GetMarkPos(),
-                pBkmk->GetOtherMarkPos());
-        return static_cast<bool>(rpPam);
-    }
+        ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, sItem, bCaseSensitive);
+        if(pBkmk)
+        {
+            if(pBkmk->IsExpanded())
+                rpPam = new SwPaM(
+                    pBkmk->GetMarkPos(),
+                    pBkmk->GetOtherMarkPos());
+            return static_cast<bool>(rpPam);
+        }
 
-    // alte "Mechanik"
-    rCC.toLower( sItem );
-    _FindItem aPara( sItem );
+        // 
+        _FindItem aPara( bCaseSensitive ? sItem : rCC.lower( sItem ) );
 
-    if( pSectionFmtTbl->Count() )
-    {
-        ((SwSectionFmts&)*pSectionFmtTbl).ForEach( 0, pSectionFmtTbl->Count(),
-                                                lcl_FindSection, &aPara );
-        if( aPara.pSectNd )
+        if( pSectionFmtTbl->Count() )
         {
-            rpRange = new SwNodeRange( *aPara.pSectNd, 1,
-                                    *aPara.pSectNd->EndOfSectionNode() );
-            return TRUE;
+            ((SwSectionFmts&)*pSectionFmtTbl).ForEach( 0, pSectionFmtTbl->Count(),
+                                                    bCaseSensitive ? lcl_FindSectionCaseSensitive : lcl_FindSectionCaseInsensitive, &aPara );
+            if( aPara.pSectNd )
+            {
+                rpRange = new SwNodeRange( *aPara.pSectNd, 1,
+                                        *aPara.pSectNd->EndOfSectionNode() );
+                return TRUE;
 
+            }
         }
+        if( !bCaseSensitive ) 
+            break;
+        bCaseSensitive = false;
     }
     return FALSE;
 }
+
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 477d70e6a..88176f79c 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -70,7 +70,7 @@
 #include <fldbas.hxx>
 #include <swwait.hxx>
 #include <GetMetricVal.hxx>
-
+#include <svtools/syslocale.hxx>
 #ifndef _STATSTR_HRC
 #include <statstr.hrc>
 #endif
@@ -111,7 +111,7 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
         nMinRight = nMinTop = nMinBottom = GetMetricVal( CM_1 );
         nMinLeft = nMinRight * 2;
     }
-    else if( MEASURE_METRIC == GetAppLocaleData().getMeasurementSystemEnum() )
+    else if( MEASURE_METRIC == SvtSysLocale().GetLocaleData().getMeasurementSystemEnum() )
     {
         nMinTop = nMinBottom = nMinLeft = nMinRight = 1134; //2 Zentimeter
     }
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 620424ac8..a292e32ec 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -2619,8 +2619,8 @@ void SwDoc::TransliterateText( const SwPaM& rPaM,
     if( pStt == pEnd && pTNd )			        // no region ?
     {
         Boundary aBndry;
-        if( pBreakIt->xBreak.is() )
-            aBndry = pBreakIt->xBreak->getWordBoundary(
+        if( pBreakIt->GetBreakIter().is() )
+            aBndry = pBreakIt->GetBreakIter()->getWordBoundary(
                         pTNd->GetTxt(), nSttCnt,
                         pBreakIt->GetLocale( pTNd->GetLang( nSttCnt ) ),
                         WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/,
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index db943cad2..62061ce7e 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -411,8 +411,8 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
         else
         {
             Boundary aBndry;
-            if( pBreakIt->xBreak.is() )
-                aBndry = pBreakIt->xBreak->getWordBoundary(
+            if( pBreakIt->GetBreakIter().is() )
+                aBndry = pBreakIt->GetBreakIter()->getWordBoundary(
                             pTxtNd->GetTxt(), nPtPos,
                             pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
                             WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/,
@@ -909,8 +909,8 @@ BOOL InsAttr( SwDoc *pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
             else
             {
                 Boundary aBndry;
-                if( pBreakIt->xBreak.is() )
-                    aBndry = pBreakIt->xBreak->getWordBoundary(
+                if( pBreakIt->GetBreakIter().is() )
+                    aBndry = pBreakIt->GetBreakIter()->getWordBoundary(
                                 pTxtNd->GetTxt(), nPtPos,
                                 pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
                                 WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/,
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 97333d063..5600f198b 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1128,29 +1128,29 @@ void SwDoc::SetCounted(const SwPaM & rPam, bool bCounted)
     }
 }
 
-void SwDoc::ReplaceNumRule(const SwPaM & rPaM, const SwNumRule & rNumRule)
-{
-    if (DoesUndo())
-        StartUndo(UNDO_START, NULL);
+//void SwDoc::ReplaceNumRule(const SwPaM & rPaM, const SwNumRule & rNumRule)
+//{
+//    if (DoesUndo())
+//        StartUndo(UNDO_START, NULL);
 
-    ULONG nStt = rPaM.Start()->nNode.GetIndex();
-    ULONG nEnd = rPaM.End()->nNode.GetIndex();
+//  ULONG nStt = rPaM.Start()->nNode.GetIndex();
+//  ULONG nEnd = rPaM.End()->nNode.GetIndex();
 
-    for (ULONG n = nStt; n <= nEnd; n++)
-    {
-        SwTxtNode * pCNd = GetNodes()[n]->GetTxtNode();
+//    for (ULONG n = nStt; n <= nEnd; n++)
+//    {
+//        SwTxtNode * pCNd = GetNodes()[n]->GetTxtNode();
 
-        if (pCNd && NULL != pCNd->GetNumRule())
-        {
-            SwPaM aPam(*pCNd);
+//        if (pCNd && NULL != pCNd->GetNumRule())
+//        {
+//            SwPaM aPam(*pCNd);
 
-            Insert(aPam, SwNumRuleItem(rNumRule.GetName()), 0);
-        }
-    }
+//            Insert(aPam, SwNumRuleItem(rNumRule.GetName()), 0);
+//        }
+//    }
 
-    if (DoesUndo())
-        EndUndo(UNDO_START, NULL);
-}
+//    if (DoesUndo())
+//        EndUndo(UNDO_START, NULL);
+//}
 
 void SwDoc::SetNumRuleStart( const SwPosition& rPos, BOOL bFlag )
 {
@@ -1544,8 +1544,8 @@ void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
                         SwPosition aPos(*pCNd);
                         aListStyleData.pReplaceNumRule =
                             const_cast<SwNumRule *>
-                            (SearchNumRule( aPos, FALSE, pCNd->HasNumber(),
-                                            FALSE, 0,
+                            (SearchNumRule( aPos, false, pCNd->HasNumber(),
+                                            false, 0,
                                             aListStyleData.sListId, true ));
                     }
 
@@ -1668,7 +1668,7 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
                 pTNd->ChkCondColl();
             //else if( !pOutlNd && NO_NUMBERING != //#outline level,zhaojianwei
             //	((SwTxtFmtColl*)pTNd->GetFmtColl())->GetOutlineLevel() )
-            else if( !pOutlNd && 
+            else if( !pOutlNd &&
                 ((SwTxtFmtColl*)pTNd->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle() )//<-end,zhaojianwei
                 pOutlNd = pTNd;
         }
@@ -1849,13 +1849,13 @@ BOOL SwDoc::GotoNextNum( SwPosition& rPos, BOOL bOverUpper,
 
 // -> #i23731#
 // --> OD 2008-03-18 #refactorlists# - add output parameter <sListId>
-const SwNumRule *  SwDoc::SearchNumRule(SwPosition & rPos,
-                                        BOOL bForward,
-                                        BOOL bNum,
-                                        BOOL bOutline,
+const SwNumRule *  SwDoc::SearchNumRule(const SwPosition & rPos,
+                                        const bool bForward,
+                                        const bool bNum,
+                                        const bool bOutline,
                                         int nNonEmptyAllowed,
                                         String& sListId,
-                                        bool _bInvestigateStartNode)
+                                        const bool bInvestigateStartNode)
 {
     const SwNumRule * pResult = NULL;
     SwTxtNode * pTxtNd = rPos.nNode.GetNode().GetTxtNode();
@@ -1871,7 +1871,7 @@ const SwNumRule *  SwDoc::SearchNumRule(SwPosition & rPos,
         do
         {
             // --> OD 2005-10-20 #i55391#
-            if ( !_bInvestigateStartNode )
+            if ( !bInvestigateStartNode )
             {
                 if (bForward)
                     aIdx++;
@@ -1886,9 +1886,9 @@ const SwNumRule *  SwDoc::SearchNumRule(SwPosition & rPos,
                 const SwNumRule * pNumRule = pTxtNd->GetNumRule();
                 if (pNumRule)
                 {
-                    if (pNumRule->IsOutlineRule() == bOutline && // #115901#
-                        ( (bNum && pNumRule->Get(0).IsEnumeration()) ||
-                         (!bNum && pNumRule->Get(0).IsItemize()) )) // #i22362#, #i29560#
+                    if ( ( pNumRule->IsOutlineRule() == ( bOutline ? TRUE : FALSE ) ) && // #115901#
+                         ( ( bNum && pNumRule->Get(0).IsEnumeration()) ||
+                           ( !bNum && pNumRule->Get(0).IsItemize() ) ) ) // #i22362#, #i29560#
                     {
                         pResult = pTxtNd->GetNumRule();
                         // --> OD 2008-03-18 #refactorlists#
@@ -1911,7 +1911,7 @@ const SwNumRule *  SwDoc::SearchNumRule(SwPosition & rPos,
             }
 
             // --> OD 2005-10-20 #i55391#
-            if ( _bInvestigateStartNode )
+            if ( bInvestigateStartNode )
             {
                 if (bForward)
                     aIdx++;
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 6a03378ff..8f93ef415 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -246,7 +246,7 @@ BOOL SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, USHORT )
     if( !bHasMark && nStart && ( !pAttr || nStart != *pAttr->GetStart()) )
     {
         // skip to the word begin!
-        long nWordStt = pBreakIt->xBreak->getWordBoundary(
+        long nWordStt = pBreakIt->GetBreakIter()->getWordBoundary(
                             *pTxt, nStart,
                             pBreakIt->GetLocale( pTNd->GetLang( nStart )),
                             WordType::ANYWORD_IGNOREWHITESPACES,
@@ -335,10 +335,10 @@ BOOL SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, USHORT )
         {
             rPam.SetMark();
             bAlphaNum = bIsAlphaNum;
-            if( bChkNxtWrd && pBreakIt->xBreak.is() )
+            if( bChkNxtWrd && pBreakIt->GetBreakIter().is() )
             {
                 // search the end of this word
-                nWordEnd = pBreakIt->xBreak->getWordBoundary(
+                nWordEnd = pBreakIt->GetBreakIter()->getWordBoundary(
                             *pTxt, nStart,
                             pBreakIt->GetLocale( pTNd->GetLang( nStart )),
                             WordType::ANYWORD_IGNOREWHITESPACES,
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 50ba88704..b2c581e5f 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1245,7 +1245,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
                 {
                     // Stichwortverzeichnismarkierung
                     lang::Locale aLocale;
-                    if ( pBreakIt->xBreak.is() )
+                    if ( pBreakIt->GetBreakIter().is() )
                     {
                         aLocale = pBreakIt->GetLocale(
                                         pTOXSrc->GetLang( *pTxtMark->GetStart() ) );
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index f34cb5dc1..b679c549b 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1719,7 +1719,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
                     283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
                 };
             const USHORT* pArr = MEASURE_METRIC ==
-                                GetAppLocaleData().getMeasurementSystemEnum()
+                                SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
                                     ? aAbsSpace
                                     : aAbsSpaceInch;
 #else
@@ -1773,7 +1773,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
                 };
 
             const USHORT* pArr = MEASURE_METRIC ==
-                                GetAppLocaleData().getMeasurementSystemEnum()
+                                SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
                                     ? aAbsSpace
                                     : aAbsSpaceInch;
 #else
@@ -1876,7 +1876,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
                     283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
                 };
             const USHORT* pArr = MEASURE_METRIC ==
-                                GetAppLocaleData().getMeasurementSystemEnum()
+                                SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
                                     ? aAbsSpace
                                     : aAbsSpaceInch;
 #else
@@ -1930,7 +1930,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
                     347, 1194
                 };
             const USHORT* pArr0to2 = MEASURE_METRIC ==
-                            GetAppLocaleData().getMeasurementSystemEnum()
+                            SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
                                 ? aAbsSpace0to2
                                 : aAbsSpaceInch0to2;
 #else
@@ -2070,7 +2070,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
                     227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
                 };
             const USHORT* pArr = MEASURE_METRIC ==
-                                GetAppLocaleData().getMeasurementSystemEnum()
+                                SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
                                     ? aAbsSpace
                                     : aAbsSpaceInch;
 #else
@@ -2131,7 +2131,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
                     170, 340, 510, 680, 850, 1020, 1191, 1361, 1531, 1701
                 };
             const USHORT* pArr = MEASURE_METRIC ==
-                                GetAppLocaleData().getMeasurementSystemEnum()
+                                SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
                                     ? aAbsSpace
                                     : aAbsSpaceInch;
 #else
@@ -2236,7 +2236,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
                     227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
                 };
             const USHORT* pArr = MEASURE_METRIC ==
-                                GetAppLocaleData().getMeasurementSystemEnum()
+                                SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
                                     ? aAbsSpace
                                     : aAbsSpaceInch;
 #else
@@ -2303,7 +2303,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
                     227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
                 };
             const USHORT* pArr = MEASURE_METRIC ==
-                                GetAppLocaleData().getMeasurementSystemEnum()
+                                SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
                                     ? aAbsSpace
                                     : aAbsSpaceInch;
 #else
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 5bb2ae4ff..b8d0bb1a7 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -795,34 +795,68 @@ bool SwDoc::Copy( SwPaM& rPam, SwPosition& rPos, bool bCopyAll ) const
 // Kopieren eines Bereiches im oder in ein anderes Dokument !
 // Die Position darf nicht im Bereich liegen !!
 
-BOOL lcl_MarksWholeNode(const SwPaM & rPam)
+bool lcl_MarksWholeNode(const SwPaM & rPam)
 {
-    BOOL bResult = FALSE;
-    const SwPosition * pStt = rPam.Start(), * pEnd = rPam.End();
+    bool bResult = false;
+    const SwPosition* pStt = rPam.Start();
+    const SwPosition* pEnd = rPam.End();
 
     if (NULL != pStt && NULL != pEnd)
     {
-        SwTxtNode * pSttNd = pStt->nNode.GetNode().GetTxtNode();
-        SwTxtNode * pEndNd = pEnd->nNode.GetNode().GetTxtNode();
+        const SwTxtNode* pSttNd = pStt->nNode.GetNode().GetTxtNode();
+        const SwTxtNode* pEndNd = pEnd->nNode.GetNode().GetTxtNode();
 
         if (NULL != pSttNd && NULL != pEndNd &&
             pStt->nContent.GetIndex() == 0 &&
             pEnd->nContent.GetIndex() == pEndNd->Len())
         {
-            bResult = TRUE;
+            bResult = true;
         }
     }
 
     return bResult;
 }
 
+// --> OD 2009-08-25 #i86492#
+bool lcl_ContainsOnlyParagraphsInList( const SwPaM& rPam )
+{
+    bool bRet = false;
+
+    const SwTxtNode* pTxtNd = rPam.Start()->nNode.GetNode().GetTxtNode();
+    const SwTxtNode* pEndTxtNd = rPam.End()->nNode.GetNode().GetTxtNode();
+    if ( pTxtNd && pTxtNd->IsInList() &&
+         pEndTxtNd && pEndTxtNd->IsInList() )
+    {
+        bRet = true;
+        SwNodeIndex aIdx(rPam.Start()->nNode);
+
+        do
+        {
+            aIdx++;
+            pTxtNd = aIdx.GetNode().GetTxtNode();
+
+            if ( !pTxtNd || !pTxtNd->IsInList() )
+            {
+                bRet = false;
+                break;
+            }
+        } while ( pTxtNd && pTxtNd != pEndTxtNd );
+    }
+
+
+    return bRet;
+}
+// <--
+
 BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
                     BOOL bMakeNewFrms, bool bCopyAll, SwPaM* pCpyRange ) const
 {
     SwDoc* pDoc = rPos.nNode.GetNode().GetDoc();
-    bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection();
+    const bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection();
+
+    SwPosition* pStt = rPam.Start();
+    SwPosition* pEnd = rPam.End();
 
-    SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
     // kein Copy abfangen.
     if( !rPam.HasMark() || ( *pStt >= *pEnd && !bColumnSel ) ||
         //JP 29.6.2001: 88963 - dont copy if inspos is in region of start to end
@@ -830,7 +864,7 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
         ( pDoc == this && *pStt <= rPos && rPos < *pEnd ))
         return FALSE;
 
-    BOOL bEndEqualIns = pDoc == this && rPos == *pEnd;
+    const bool bEndEqualIns = pDoc == this && rPos == *pEnd;
 
     // falls Undo eingeschaltet, erzeuge das UndoCopy-Objekt
     SwUndoCpyDoc* pUndo = 0;
@@ -858,43 +892,63 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
 
     SwNodeRange aRg( pStt->nNode, pEnd->nNode );
     SwNodeIndex aInsPos( rPos.nNode );
-    BOOL bOneNode = pStt->nNode == pEnd->nNode;
-    SwTxtNode* pSttNd = pStt->nNode.GetNode().GetTxtNode();
-    SwTxtNode* pEndNd = pEnd->nNode.GetNode().GetTxtNode();
-    SwTxtNode* pDestNd = aInsPos.GetNode().GetTxtNode();
-    BOOL bCopyCollFmt = !pDoc->IsInsOnlyTextGlossary() && (
-                        ( pDestNd && !pDestNd->GetTxt().Len() ) ||
-                        ( !bOneNode && !rPos.nContent.GetIndex() ));
-    BOOL bCopyBookmarks = TRUE;
-    BOOL bStartIsTxtNode = 0 != pSttNd;
-
-    // --> OD 2008-03-18 #refactorlists#
-    String aDummy;
-    const SwNumRule * pNumRuleToPropagate =
-        pDoc->SearchNumRule(rPos, FALSE, FALSE, TRUE, 0, aDummy);
+    const bool bOneNode = pStt->nNode == pEnd->nNode;
+    SwTxtNode* pSttTxtNd = pStt->nNode.GetNode().GetTxtNode();
+    SwTxtNode* pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
+    SwTxtNode* pDestTxtNd = aInsPos.GetNode().GetTxtNode();
+    bool bCopyCollFmt = !pDoc->IsInsOnlyTextGlossary() &&
+                        ( ( pDestTxtNd && !pDestTxtNd->GetTxt().Len() ) ||
+                          ( !bOneNode && !rPos.nContent.GetIndex() ) );
+    bool bCopyBookmarks = true;
+    BOOL bStartIsTxtNode = 0 != pSttTxtNd;
+
+    // --> OD 2009-08-25 #i86492#
+    // Correct the search for a previous list:
+    // First search for non-outline numbering list. Then search for non-outline
+    // bullet list.
+    // Keep also the <ListId> value for possible propagation.
+    String aListIdToPropagate;
+    const SwNumRule* pNumRuleToPropagate =
+        pDoc->SearchNumRule( rPos, false, true, false, 0, aListIdToPropagate, true );
+    if ( !pNumRuleToPropagate )
+    {
+        pNumRuleToPropagate =
+            pDoc->SearchNumRule( rPos, false, false, false, 0, aListIdToPropagate, true );
+    }
+    // <--
+    // --> OD 2009-08-25 #i86492#
+    // Do not propagate previous found list, if
+    // - destination is an empty paragraph which is not in a list and
+    // - source contains at least one paragraph which is not in a list
+    if ( pNumRuleToPropagate &&
+         pDestTxtNd && !pDestTxtNd->GetTxt().Len() && !pDestTxtNd->IsInList() &&
+         !lcl_ContainsOnlyParagraphsInList( rPam ) )
+    {
+        pNumRuleToPropagate = 0;
+    }
     // <--
 
     // Block, damit aus diesem gesprungen werden kann !!
     do {
-        if( pSttNd )
+        if( pSttTxtNd )
         {
             // den Anfang nicht komplett kopieren ?
             if( !bCopyCollFmt || bColumnSel || pStt->nContent.GetIndex() )
             {
                 SwIndex aDestIdx( rPos.nContent );
                 BOOL bCopyOk = FALSE;
-                if( !pDestNd )
+                if( !pDestTxtNd )
                 {
                     if( pStt->nContent.GetIndex() || bOneNode )
-                        pDestNd = pDoc->GetNodes().MakeTxtNode( aInsPos,
+                        pDestTxtNd = pDoc->GetNodes().MakeTxtNode( aInsPos,
                             pDoc->GetTxtCollFromPool(RES_POOLCOLL_STANDARD));
                     else
                     {
-                        pDestNd = (SwTxtNode*)pSttNd->MakeCopy( pDoc, aInsPos );
+                        pDestTxtNd = static_cast<SwTxtNode*>(pSttTxtNd->MakeCopy( pDoc, aInsPos ));
                         bCopyOk = TRUE;
                     }
-                    aDestIdx.Assign( pDestNd, 0 );
-                    bCopyCollFmt = TRUE;
+                    aDestIdx.Assign( pDestTxtNd, 0 );
+                    bCopyCollFmt = true;
                 }
                 else if( !bOneNode || bColumnSel )
                 {
@@ -911,8 +965,8 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
                         aCpyPam.Move( fnMoveBackward, fnGoCntnt );
                     }
 
-                    pDestNd = pDoc->GetNodes()[ aInsPos.GetIndex()-1 ]->GetTxtNode();
-                    aDestIdx.Assign( pDestNd, pDestNd->GetTxt().Len() );
+                    pDestTxtNd = pDoc->GetNodes()[ aInsPos.GetIndex()-1 ]->GetTxtNode();
+                    aDestIdx.Assign( pDestTxtNd, pDestTxtNd->GetTxt().Len() );
 
                     // korrigiere den Bereich wieder !!
                     if( bEndEqualIns )
@@ -925,59 +979,83 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
                             rPam.Exchange();
 
                         aRg.aEnd = pEnd->nNode;
-                        pEndNd = pEnd->nNode.GetNode().GetTxtNode();
+                        pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
                     }
                     else if( rPos == *pEnd )		// Wurde das Ende auch verschoben
                     {
                         pEnd->nNode--;
-                        pEnd->nContent.Assign( pDestNd, nCntntEnd );
+                        pEnd->nContent.Assign( pDestTxtNd, nCntntEnd );
                         aRg.aEnd = pEnd->nNode;
-                        pEndNd = pEnd->nNode.GetNode().GetTxtNode();
+                        pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
                     }
                 }
 
-                const SfxPoolItem * pItem = NULL;
-                const SfxItemSet * pAttrSet = pDestNd->GetpSwAttrSet();
-
                 /* #107213#: Safe numrule item at destination. */
-                int aState = SFX_ITEM_UNKNOWN;
+                // --> OD 2009-08-25 #i86492#
+                // Safe also <ListId> item of destination.
+                int aNumRuleState = SFX_ITEM_UNKNOWN;
                 SwNumRuleItem aNumRuleItem;
-
-                if (pAttrSet != NULL)
+                int aListIdState = SFX_ITEM_UNKNOWN;
+                SfxStringItem aListIdItem( RES_PARATR_LIST_ID, String() );
                 {
-                    aState =
-                        pAttrSet->GetItemState(RES_PARATR_NUMRULE, FALSE, &pItem);
-
-                    if (SFX_ITEM_SET == aState)
-                        aNumRuleItem = *((SwNumRuleItem *) pItem);
+                    const SfxItemSet * pAttrSet = pDestTxtNd->GetpSwAttrSet();
+                    if (pAttrSet != NULL)
+                    {
+                        const SfxPoolItem * pItem = NULL;
+                        aNumRuleState = pAttrSet->GetItemState(RES_PARATR_NUMRULE, FALSE, &pItem);
+                        if (SFX_ITEM_SET == aNumRuleState)
+                            aNumRuleItem = *((SwNumRuleItem *) pItem);
+
+                        aListIdState =
+                            pAttrSet->GetItemState(RES_PARATR_LIST_ID, FALSE, &pItem);
+                        if (SFX_ITEM_SET == aListIdState)
+                        {
+                            aListIdItem.SetValue( static_cast<const SfxStringItem*>(pItem)->GetValue() );
+                        }
+                    }
                 }
+                // <--
                 /* #107213# */
 
                 if( !bCopyOk )
                 {
-                    xub_StrLen nCpyLen = ( bOneNode ? pEnd->nContent.GetIndex()
-                                            : pSttNd->GetTxt().Len() )
-                                    - pStt->nContent.GetIndex();
-                    pSttNd->Copy( pDestNd, aDestIdx, pStt->nContent, nCpyLen );
+                    xub_StrLen nCpyLen = ( bOneNode
+                                           ? pEnd->nContent.GetIndex()
+                                           : pSttTxtNd->GetTxt().Len() )
+                                         - pStt->nContent.GetIndex();
+                    pSttTxtNd->Copy( pDestTxtNd, aDestIdx, pStt->nContent, nCpyLen );
                     if( bEndEqualIns )
                         pEnd->nContent -= nCpyLen;
                 }
 
                 if( bOneNode )
                 {
-                    // ist der DestinationNode leer, kopiere die Vorlage mit
                     if( bCopyCollFmt )
                     {
-                        pSttNd->CopyCollFmt( *pDestNd );
+                        pSttTxtNd->CopyCollFmt( *pDestTxtNd );
 
                         /* #107213# If only a part of one paragraph is copied
                            restore the numrule at the destination. */
-                        if (! lcl_MarksWholeNode(rPam))
+                        // --> OD 2009-08-25 #i86492#
+                        // restore also <ListId> item
+                        if ( !lcl_MarksWholeNode(rPam) )
                         {
-                            if (SFX_ITEM_SET == aState)
-                                pDestNd->SetAttr(aNumRuleItem);
+                            if (SFX_ITEM_SET == aNumRuleState)
+                            {
+                                pDestTxtNd->SetAttr(aNumRuleItem);
+                            }
+                            else
+                            {
+                                pDestTxtNd->ResetAttr(RES_PARATR_NUMRULE);
+                            }
+                            if (SFX_ITEM_SET == aListIdState)
+                            {
+                                pDestTxtNd->SetAttr(aListIdItem);
+                            }
                             else
-                                pDestNd->ResetAttr(RES_PARATR_NUMRULE);
+                            {
+                                pDestTxtNd->ResetAttr(RES_PARATR_LIST_ID);
+                            }
                         }
                     }
 
@@ -987,13 +1065,13 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
                 aRg.aStart++;
             }
         }
-        else if( pDestNd )
+        else if( pDestTxtNd )
         {
             // Problems with insertion of table selections into "normal" text solved.
             // We have to set the correct PaM for Undo, if this PaM starts in a textnode,
             // the undo operation will try to merge this node after removing the table.
             // If we didn't split a textnode, the PaM should start at the inserted table node
-            if( rPos.nContent.GetIndex() == pDestNd->Len() )
+            if( rPos.nContent.GetIndex() == pDestTxtNd->Len() )
             {    // Insertion at the last position of a textnode (empty or not)
                 aInsPos++; // The table will be inserted behind the text node
             }
@@ -1040,15 +1118,15 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
             }
         }
 
-        pDestNd = aInsPos.GetNode().GetTxtNode();
-        if( pEndNd )
+        pDestTxtNd = aInsPos.GetNode().GetTxtNode();
+        if( pEndTxtNd )
         {
             SwIndex aDestIdx( rPos.nContent );
-            if( !pDestNd )
+            if( !pDestTxtNd )
             {
-                pDestNd = pDoc->GetNodes().MakeTxtNode( aInsPos,
+                pDestTxtNd = pDoc->GetNodes().MakeTxtNode( aInsPos,
                             pDoc->GetTxtCollFromPool(RES_POOLCOLL_STANDARD));
-                aDestIdx.Assign( pDestNd, 0  );
+                aDestIdx.Assign( pDestTxtNd, 0  );
                 aInsPos--;
 
                 // #112756# #98130# if we have to insert an extra text node
@@ -1060,42 +1138,66 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
                 bStartIsTxtNode = TRUE;
             }
 
-            const SfxPoolItem * pItem = NULL;
-            const SfxItemSet* pAttrSet = pDestNd->GetpSwAttrSet();
-
             /* #107213# Save numrule at destination */
-            int aState = SFX_ITEM_UNKNOWN;
+            // --> OD 2009-08-25 #i86492#
+            // Safe also <ListId> item of destination.
+            int aNumRuleState = SFX_ITEM_UNKNOWN;
             SwNumRuleItem aNumRuleItem;
-
-            if (pAttrSet != NULL)
+            int aListIdState = SFX_ITEM_UNKNOWN;
+            SfxStringItem aListIdItem( RES_PARATR_LIST_ID, String() );
             {
-                aState =
-                    pAttrSet->GetItemState(RES_PARATR_NUMRULE, FALSE, &pItem);
+                const SfxItemSet* pAttrSet = pDestTxtNd->GetpSwAttrSet();
+                if (pAttrSet != NULL)
+                {
+                    const SfxPoolItem * pItem = NULL;
+
+                    aNumRuleState =
+                        pAttrSet->GetItemState(RES_PARATR_NUMRULE, FALSE, &pItem);
+                    if (SFX_ITEM_SET == aNumRuleState)
+                        aNumRuleItem = *((SwNumRuleItem *) pItem);
 
-                if (SFX_ITEM_SET == aState)
-                    aNumRuleItem = *((SwNumRuleItem *) pItem);
+                    aListIdState =
+                        pAttrSet->GetItemState(RES_PARATR_LIST_ID, FALSE, &pItem);
+                    if (SFX_ITEM_SET == aListIdState)
+                        aListIdItem.SetValue( static_cast<const SfxStringItem*>(pItem)->GetValue() );
+                }
             }
+            // <--
             /* #107213# */
 
-            BOOL bEmptyDestNd = 0 == pDestNd->GetTxt().Len();
-            pEndNd->Copy( pDestNd, aDestIdx, SwIndex( pEndNd ),
+            BOOL bEmptyDestNd = 0 == pDestTxtNd->GetTxt().Len();
+            pEndTxtNd->Copy( pDestTxtNd, aDestIdx, SwIndex( pEndTxtNd ),
                             pEnd->nContent.GetIndex() );
 
             // auch alle FormatVorlagen kopieren
             if( bCopyCollFmt && ( bOneNode || bEmptyDestNd ))
             {
-                pEndNd->CopyCollFmt( *pDestNd );
+                pEndTxtNd->CopyCollFmt( *pDestTxtNd );
 
-                if (bOneNode)
+                if ( bOneNode )
                 {
                     /* #107213# If only a part of one paragraph is copied
                        restore the numrule at the destination. */
-                    if ( ! lcl_MarksWholeNode(rPam))
+                    // --> OD 2009-08-25 #i86492#
+                    // restore also <ListId> item
+                    if ( !lcl_MarksWholeNode(rPam) )
                     {
-                        if (SFX_ITEM_SET == aState)
-                            pDestNd->SetAttr(aNumRuleItem);
+                        if (SFX_ITEM_SET == aNumRuleState)
+                        {
+                            pDestTxtNd->SetAttr(aNumRuleItem);
+                        }
                         else
-                            pDestNd->ResetAttr(RES_PARATR_NUMRULE);
+                        {
+                            pDestTxtNd->ResetAttr(RES_PARATR_NUMRULE);
+                        }
+                        if (SFX_ITEM_SET == aListIdState)
+                        {
+                            pDestTxtNd->SetAttr(aListIdItem);
+                        }
+                        else
+                        {
+                            pDestTxtNd->ResetAttr(RES_PARATR_LIST_ID);
+                        }
                     }
                 }
             }
@@ -1104,13 +1206,13 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
         if( bCopyAll || aRg.aStart != aRg.aEnd )
         {
             SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
-            if( pSttNd && bCopyCollFmt && pDestNd->HasSwAttrSet() )
+            if( pSttTxtNd && bCopyCollFmt && pDestTxtNd->HasSwAttrSet() )
             {
-                aBrkSet.Put( *pDestNd->GetpSwAttrSet() );
+                aBrkSet.Put( *pDestTxtNd->GetpSwAttrSet() );
                 if( SFX_ITEM_SET == aBrkSet.GetItemState( RES_BREAK, FALSE ) )
-                    pDestNd->ResetAttr( RES_BREAK );
+                    pDestTxtNd->ResetAttr( RES_BREAK );
                 if( SFX_ITEM_SET == aBrkSet.GetItemState( RES_PAGEDESC, FALSE ) )
-                    pDestNd->ResetAttr( RES_PAGEDESC );
+                    pDestTxtNd->ResetAttr( RES_PAGEDESC );
             }
 
             if( aInsPos == pEnd->nNode )
@@ -1124,13 +1226,13 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
             else
                 CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, bMakeNewFrms, FALSE );
 
-            bCopyBookmarks = FALSE;
+            bCopyBookmarks = false;
 
             // harte Umbrueche wieder in den ersten Node setzen
-            if( aBrkSet.Count() && 0 != ( pDestNd = pDoc->GetNodes()[
+            if( aBrkSet.Count() && 0 != ( pDestTxtNd = pDoc->GetNodes()[
                     aCpyPam.GetPoint()->nNode.GetIndex()+1 ]->GetTxtNode() ) )
             {
-                pDestNd->SetAttr( aBrkSet );
+                pDestTxtNd->SetAttr( aBrkSet );
             }
         }
     } while( FALSE );
@@ -1169,8 +1271,14 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
         *pCpyRange->GetMark() = *aCpyPam.GetMark();
     }
 
-    if (pNumRuleToPropagate)
-        pDoc->ReplaceNumRule(aCpyPam, *pNumRuleToPropagate);
+    if ( pNumRuleToPropagate )
+    {
+        // --> OD 2009-08-25 #i86492#
+        // use <SwDoc::SetNumRule(..)>, because it also handles the <ListId>
+//        pDoc->ReplaceNumRule(aCpyPam, *pNumRuleToPropagate);
+        pDoc->SetNumRule( aCpyPam, *pNumRuleToPropagate, false,
+                          aListIdToPropagate, sal_True, true );
+    }
 
     pDoc->SetRedlineMode_intern( eOld );
     pDoc->SetModified();
@@ -1181,7 +1289,7 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
 
 //  ----- Copy-Methode vom SwDoc - "kopiere Fly's in Fly's" ------
 
-void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentIndex, 
+void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentIndex,
                             const SwNodeIndex& rInsPos, BOOL bMakeNewFrms,
                             BOOL bDelRedlines, BOOL bCopyFlyAtFly ) const
 {
@@ -1324,11 +1432,11 @@ void SwDoc::_CopyFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentI
                 {
                     if( bAtCntnt )
                         bAdd = nEndContentIndex > 0;
-                    else 
+                    else
                         bAdd = pAPos->nContent <= nEndContentIndex;
                 }
             }
-            if( bAdd )                
+            if( bAdd )
                 aArr.Insert( _ZSortFly( pFmt, pAnchor, nArrLen + aArr.Count() ));
         }
     }
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index b97eeda74..69a6f68d9 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1249,13 +1249,13 @@ BOOL SwCntntNode::GoNext(SwIndex * pIdx, USHORT nMode ) const
         {
             const SwTxtNode& rTNd = *GetTxtNode();
             xub_StrLen nPos = pIdx->GetIndex();
-            if( pBreakIt->xBreak.is() )
+            if( pBreakIt->GetBreakIter().is() )
             {
                 sal_Int32 nDone = 0;
                 sal_uInt16 nItrMode = ( CRSR_SKIP_CELLS & nMode ) ?
                                         CharacterIteratorMode::SKIPCELL :
                                         CharacterIteratorMode::SKIPCONTROLCHARACTER;
-                nPos = (xub_StrLen)pBreakIt->xBreak->nextCharacters( rTNd.GetTxt(), nPos,
+                nPos = (xub_StrLen)pBreakIt->GetBreakIter()->nextCharacters( rTNd.GetTxt(), nPos,
                                    pBreakIt->GetLocale( rTNd.GetLang( nPos ) ),
                                    nItrMode, 1, nDone );
 
@@ -1297,13 +1297,13 @@ BOOL SwCntntNode::GoPrevious(SwIndex * pIdx, USHORT nMode ) const
         {
             const SwTxtNode& rTNd = *GetTxtNode();
             xub_StrLen nPos = pIdx->GetIndex();
-            if( pBreakIt->xBreak.is() )
+            if( pBreakIt->GetBreakIter().is() )
             {
                 sal_Int32 nDone = 0;
                 sal_uInt16 nItrMode = ( CRSR_SKIP_CELLS & nMode ) ?
                                         CharacterIteratorMode::SKIPCELL :
                                         CharacterIteratorMode::SKIPCONTROLCHARACTER;
-                nPos = (xub_StrLen)pBreakIt->xBreak->previousCharacters( rTNd.GetTxt(), nPos,
+                nPos = (xub_StrLen)pBreakIt->GetBreakIter()->previousCharacters( rTNd.GetTxt(), nPos,
                                    pBreakIt->GetLocale( rTNd.GetLang( nPos ) ),
                                    nItrMode, 1, nDone );
 
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 9622075cd..f4499b20c 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -319,6 +319,7 @@ void SwAutoFormat::_SetRedlineTxt( USHORT nActionId )
         case STR_AUTOFMTREDL_FRACTION:
         case STR_AUTOFMTREDL_DASH:
         case STR_AUTOFMTREDL_ORDINAL:
+        case STR_AUTOFMTREDL_NON_BREAK_SPACE:
             nSeqNo = ++nRedlAutoFmtSeqId;
             break;
         }
@@ -1885,7 +1886,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
         !aFlags.bCptlSttSntnc && !aFlags.bCptlSttWrd &&
         !aFlags.bChgFracionSymbol && !aFlags.bChgOrdinalNumber &&
         !aFlags.bChgToEnEmDash && !aFlags.bSetINetAttr &&
-        !aFlags.bChgWeightUnderl) )
+		!aFlags.bChgWeightUnderl && !aFlags.bAddNonBrkSpace) )
         return;
 
     const String* pTxt = &pAktTxtNd->GetTxt();
@@ -1894,7 +1895,8 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
 
     BOOL bGetLanguage = aFlags.bChgOrdinalNumber ||
                         aFlags.bChgToEnEmDash || aFlags.bSetINetAttr ||
-                        aFlags.bCptlSttWrd || aFlags.bCptlSttSntnc;
+						aFlags.bCptlSttWrd || aFlags.bCptlSttSntnc ||
+                        aFlags.bAddNonBrkSpace;
 
 
     aDelPam.DeleteMark();
@@ -2123,6 +2125,9 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
                 ( aFlags.bChgToEnEmDash &&
                     SetRedlineTxt( STR_AUTOFMTREDL_DASH ) &&
                     pATst->FnChgToEnEmDash( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) ) ||
+                ( aFlags.bAddNonBrkSpace &&
+                    SetRedlineTxt( STR_AUTOFMTREDL_NON_BREAK_SPACE ) &&
+                    pATst->FnAddNonBrkSpace( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) ) ||
                 ( aFlags.bSetINetAttr &&
                     ( nPos == pTxt->Len() || IsSpace( pTxt->GetChar( nPos )) ) &&
                     SetRedlineTxt( STR_AUTOFMTREDL_DETECT_URL ) &&
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 259cb34f1..295e44d2d 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -474,14 +474,14 @@ BOOL lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos,
         {
             USHORT nScript;
             for( n = 0; n < nEnd; n = (xub_StrLen)
-                    pBreakIt->xBreak->endOfScript( sExp, n, nScript ))
+                    pBreakIt->GetBreakIter()->endOfScript( sExp, n, nScript ))
             {
-                nScript = pBreakIt->xBreak->getScriptType( sExp, n );
+                nScript = pBreakIt->GetBreakIter()->getScriptType( sExp, n );
                 rScrpt |= lcl_SetScriptFlags( nScript );
             }
         }
         else
-            rScrpt |= lcl_SetScriptFlags( pBreakIt->xBreak->
+            rScrpt |= lcl_SetScriptFlags( pBreakIt->GetBreakIter()->
                                         getScriptType( sExp, nEnd-1 ));
     }
 
@@ -493,7 +493,7 @@ BOOL lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos,
 USHORT SwEditShell::GetScriptType() const
 {
     USHORT nRet = 0;
-    if( pBreakIt->xBreak.is() )
+    //if( pBreakIt->GetBreakIter().is() )
     {
         FOREACHPAM_START(this)
 
@@ -525,7 +525,7 @@ USHORT SwEditShell::GetScriptType() const
                     {
                         nScript = pScriptInfo ?
                                   pScriptInfo->ScriptType( nPos ) :
-                                  pBreakIt->xBreak->getScriptType( pTNd->GetTxt(), nPos );
+                                  pBreakIt->GetBreakIter()->getScriptType( pTNd->GetTxt(), nPos );
                     }
                     else
                         nScript = GetI18NScriptTypeOfLanguage( (USHORT)GetAppLanguage() );
@@ -534,7 +534,7 @@ USHORT SwEditShell::GetScriptType() const
                         nRet |= lcl_SetScriptFlags( nScript );
                 }
             }
-            else
+            else if ( pBreakIt->GetBreakIter().is() )
             {
                 ULONG nEndIdx = pEnd->nNode.GetIndex();
                 SwNodeIndex aIdx( pStt->nNode );
@@ -563,7 +563,7 @@ USHORT SwEditShell::GetScriptType() const
                         {
                             nScript = pScriptInfo ?
                                       pScriptInfo->ScriptType( nChg ) :
-                                      pBreakIt->xBreak->getScriptType(
+                                      pBreakIt->GetBreakIter()->getScriptType(
                                                                 rTxt, nChg );
 
                             if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nChg, nRet, TRUE,
@@ -578,7 +578,7 @@ USHORT SwEditShell::GetScriptType() const
 
                             nChg = pScriptInfo ?
                                    pScriptInfo->NextScriptChg( nChg ) :
-                                   (xub_StrLen)pBreakIt->xBreak->endOfScript(
+                                   (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript(
                                                     rTxt, nChg, nScript );
 
                             nFldPos = rTxt.Search(
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index d26acf1f5..d2d889510 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -343,7 +343,8 @@ BOOL SwEditShell::MoveGlobalDocContent( const SwGlblDocContents& rArr ,
     else
         aInsPos  = pMyDoc->GetNodes().GetEndOfContent();
 
-    BOOL bRet = pMyDoc->Move( aRg, aInsPos, IDocumentContentOperations::DOC_MOVEALLFLYS );
+    BOOL bRet = pMyDoc->Move( aRg, aInsPos, 
+        IDocumentContentOperations::SwMoveFlags(IDocumentContentOperations::DOC_MOVEALLFLYS|IDocumentContentOperations::DOC_CREATEUNDOOBJ ));
 
     EndAllAction();
     return bRet;
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index ba06e528b..b9d4523ed 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -565,7 +565,7 @@ BOOL SwEditShell::IsProtectedOutlinePara() const
 //            BYTE nTmpLvl = GetRealLevel( pTmpNd->GetTxtNode()->
 //                                    GetTxtColl()->GetOutlineLevel() );
  //           int nTmpLvl = pTmpNd->GetTxtNode()->GetOutlineLevel();//#outline level,zhaojianwei
-            int nTmpLvl = pTmpNd->GetTxtNode()->GetAttrOutlineLevel();	
+            int nTmpLvl = pTmpNd->GetTxtNode()->GetAttrOutlineLevel();
  //           ASSERT( nTmpLvl >= 0 && nTmpLvl < MAXLEVEL,
             ASSERT( nTmpLvl >= 0 && nTmpLvl <= MAXLEVEL,			//<-end,zhaojianwei
                     "<SwEditShell::IsProtectedOutlinePara()>" );
@@ -825,9 +825,9 @@ USHORT SwEditShell::GetNodeNumStart() const
 
   -----------------------------------------------------------------------*/
 // --> OD 2008-03-18 #refactorlists#
-const SwNumRule * SwEditShell::SearchNumRule( BOOL bForward,
-                                              BOOL bNum,
-                                              BOOL bOutline,
+const SwNumRule * SwEditShell::SearchNumRule( const bool bForward,
+                                              const bool bNum,
+                                              const bool bOutline,
                                               int nNonEmptyAllowed,
                                               String& sListId )
 {
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 0b72c6fcf..76e9e32d3 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -60,6 +60,9 @@
 #ifndef _STATSTR_HRC
 #include <statstr.hrc>
 #endif
+#include <bookmrk.hxx>
+#include <ecmaflds.hxx>
+ 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::i18n;
@@ -232,6 +235,25 @@ BOOL SwEditShell::UpdateTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
     return bRet;
 }
 
+BOOL SwEditShell::UpdateField( sw::mark::IFieldmark &fieldBM) 
+{
+//    SwDocShell* pDocSh = pDoc->GetDocShell();
+    //@TODO implement me...; add undo etc...
+    if ( pDoc && fieldBM.IsExpanded( ) ) {
+        SwPosition aSttPos = fieldBM.GetMarkStart( );
+        aSttPos.nContent++;
+
+        SwPosition aEndPos = fieldBM.GetMarkEnd( );
+        aEndPos.nContent--;
+
+    	SwPaM aPaM( aSttPos, aEndPos );
+	    pDoc->Delete(aPaM);
+        pDoc->Insert(aPaM, String::CreateFromAscii("Implement me ;-)"), false);
+    }
+    return TRUE;
+}
+
+
 /*--------------------------------------------------------------------
      Beschreibung: Aktuelles Verzeichnis vor oder in dem der Cursor
                                    steht
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 21cb381b4..d5204f1c1 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -66,6 +66,7 @@
 #endif
 #include <svtools/urihelper.hxx>
 #include <svtools/useroptions.hxx>
+#include <svtools/syslocale.hxx>
 
 #include <tools/time.hxx>
 #include <tools/datetime.hxx>
@@ -931,10 +932,11 @@ SwFieldType* SwDocInfoFieldType::Copy() const
 }
 
 void lcl_GetLocalDataWrapper( ULONG nLang,
-                              LocaleDataWrapper **ppAppLocalData,
-                              LocaleDataWrapper **ppLocalData )
+                              const LocaleDataWrapper **ppAppLocalData,
+                              const LocaleDataWrapper **ppLocalData )
 {
-    *ppAppLocalData = &GetAppLocaleData();
+    SvtSysLocale aLocale;
+    *ppAppLocalData = &aLocale.GetLocaleData();
     *ppLocalData = *ppAppLocalData;
     if( nLang != SvxLocaleToLanguage( (*ppLocalData)->getLocale() ) )
         *ppLocalData = new LocaleDataWrapper(
@@ -949,7 +951,7 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
                                     sal_uInt16 nLang, const String& rName ) const
 {
     String aStr;
-    LocaleDataWrapper *pAppLocalData = 0, *pLocalData = 0;
+    const LocaleDataWrapper *pAppLocalData = 0, *pLocalData = 0;
     SwDocShell *pDocShell(GetDoc()->GetDocShell());
     DBG_ASSERT(pDocShell, "no SwDocShell");
     if (!pDocShell) { return aStr; }
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index cf9f61dfd..930394256 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -611,7 +611,7 @@ SwFieldType* SwValueField::ChgTyp( SwFieldType* pNewType )
 sal_uInt32 SwValueField::GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFmt)
 {
     const SvNumberformat* pEntry = pFormatter->GetEntry(nFmt);
-    USHORT nLng = SvxLocaleToLanguage( GetAppLocaleData().getLocale() );
+    USHORT nLng = SvxLocaleToLanguage( SvtSysLocale().GetLocaleData().getLocale() );
 
     if (pEntry && nLng != pEntry->GetLanguage())
     {
diff --git a/sw/source/core/inc/GetMetricVal.hxx b/sw/source/core/inc/GetMetricVal.hxx
index 14277471f..1759e46a2 100644
--- a/sw/source/core/inc/GetMetricVal.hxx
+++ b/sw/source/core/inc/GetMetricVal.hxx
@@ -39,7 +39,7 @@
 inline USHORT GetMetricVal( int n )
 {
 #ifdef USE_MEASUREMENT
-    USHORT nVal = MEASURE_METRIC == GetAppLocaleData().getMeasurementSystemEnum()
+    USHORT nVal = MEASURE_METRIC == SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
                     ? 567 		// 1 cm
                     : 770;		// 1/2 Inch
 #else
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 605b15d67..fd20406e2 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -43,8 +43,18 @@ namespace sw { namespace mark
         public:
             MarkManager(/*[in/out]*/ SwDoc& rDoc);
 
+            void dumpFieldmarks( ) const;
+
             // IDocumentMarkAccess
             virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const ::rtl::OUString& rName, IDocumentMarkAccess::MarkType eMark);
+        
+            virtual sw::mark::IMark* makeFieldBookmark( const SwPaM& rPaM, 
+                const rtl::OUString& rName, 
+                const rtl::OUString& rType);
+            virtual sw::mark::IMark* makeNoTextFieldBookmark( const SwPaM& rPaM, 
+                const rtl::OUString& rName, 
+                const rtl::OUString& rType);
+
             virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark);
 
             virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM);
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index ef1cc1214..bd62abe8e 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -46,26 +46,31 @@ namespace sw { namespace mark
     {
         public:
             //getters
-            virtual const SwPosition& GetMarkPos() const
+            virtual SwPosition& GetMarkPos() const
                 { return *m_pPos1; }
             virtual const ::rtl::OUString& GetName() const
                 { return m_aName; }
-            virtual bool IsCoveringPosition(const SwPosition& rPos) const
-                { return GetMarkStart() <= rPos && rPos <= GetMarkEnd(); };
-            virtual const SwPosition& GetOtherMarkPos() const
+            virtual bool IsCoveringPosition(const SwPosition& rPos) const;
+            virtual SwPosition& GetOtherMarkPos() const
             {
                 OSL_PRECOND(IsExpanded(), "<SwPosition::GetOtherMarkPos(..)> - I have no other Pos set." );
                 return *m_pPos2;
             }
-            virtual const SwPosition& GetMarkStart() const
+            virtual SwPosition& GetMarkStart() const
             {
-                if(!m_pPos2 /* !IsExpanded()*/) return *m_pPos1;
-                return *m_pPos1 < *m_pPos2 ? *m_pPos1 : *m_pPos2;
+                if( !IsExpanded() ) return GetMarkPos( );
+                if ( GetMarkPos( ) < GetOtherMarkPos( ) )
+                    return GetMarkPos();
+                else
+                    return GetOtherMarkPos( );
             }
-            virtual const SwPosition& GetMarkEnd() const
+            virtual SwPosition& GetMarkEnd() const
             {
-                if(!m_pPos2 /* !IsExpanded()*/ ) return *m_pPos1;
-                return *m_pPos1 > *m_pPos2 ? *m_pPos1 : *m_pPos2;
+                if( !IsExpanded() ) return GetMarkPos();
+                if ( GetMarkPos( ) > GetOtherMarkPos( ) )
+                    return GetMarkPos( );
+                else
+                    return GetOtherMarkPos( );
             }
             virtual bool IsExpanded() const
                 { return m_pPos2; }
@@ -78,6 +83,8 @@ namespace sw { namespace mark
             virtual void ClearOtherMarkPos()
                 { m_pPos2.reset(); }
 
+            virtual rtl::OUString toString( ) const;
+
             virtual void Swap()
             {
                 if(m_pPos2)
@@ -171,18 +178,30 @@ namespace sw { namespace mark
     {
         public:
             Fieldmark(const SwPaM& rPaM);
-
+            
             // getters
             ::rtl::OUString GetFieldname() const
                 { return m_aFieldname; }
             ::rtl::OUString GetFieldHelptext() const
                 { return m_aFieldHelptext; }
+            
+            void addParam( rtl::OUString rParamName, 
+                           rtl::OUString rParamValue,
+                           bool bReplaceExisting = true );
+            void addParam( const char* paramName, int value );
+            void addParams(std::vector<ParamPair_t>& params);
+            int  getNumOfParams() const;
+            ParamPair_t getParam(int pos) const;
+            ParamPair_t getParam(const char *name, const char *defaultValue) const;
 
             // setters
             void SetFieldname(const ::rtl::OUString& aFieldname)
                 { m_aFieldname = aFieldname; }
             void SetFieldHelptext(const ::rtl::OUString& aFieldHelptext)
                 { m_aFieldHelptext = aFieldHelptext; }
+            void invalidate( );
+            
+            virtual rtl::OUString toString( ) const;
         private:
             //int fftype; // Type: 0 = Text, 1 = Check Box, 2 = List
             //bool ffprot;
@@ -190,7 +209,7 @@ namespace sw { namespace mark
             ::rtl::OUString m_aFieldname;
             ::rtl::OUString m_aFieldHelptext;
             static const ::rtl::OUString our_sNamePrefix;
-
+            std::vector<ParamPair_t> m_params;
     };
 
     class TextFieldmark
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
index d175b2130..e560a2914 100644
--- a/sw/source/core/inc/crossrefbookmark.hxx
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -48,10 +48,10 @@ namespace sw { namespace mark
                 const ::rtl::OUString& rPrefix);
 
             // getters
-            virtual const SwPosition& GetOtherMarkPos() const;
-            virtual const SwPosition& GetMarkStart() const
+            virtual SwPosition& GetOtherMarkPos() const;
+            virtual SwPosition& GetMarkStart() const
                 { return *m_pPos1; }
-            virtual const SwPosition& GetMarkEnd() const
+            virtual SwPosition& GetMarkEnd() const
                 { return *m_pPos1; }
             virtual bool IsExpanded() const
                 { return false; }
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 584c22ec0..199be26f5 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -518,21 +518,26 @@ inline BOOL SwBorderAttrs::IsLine() const
     OD 2004-03-10 #i28701#
     Values only provided for flow frames (table, section or text frames)
     Note: line spacing value is only determined for text frames
+    OD 2009-08-28 #i102458#
+    Add output parameter <obIsLineSpacingProportional>
 
-    @param _rFrm
+    @param rFrm
     input parameter - frame, for which the spacing values are determined.
 
-    @param _roPrevLowerSpacing
+    @param onPrevLowerSpacing
     output parameter - lower spacing of the frame in SwTwips
 
-    @param _roPrevLineSpacing
+    @param onPrevLineSpacing
     output parameter - line spacing of the frame in SwTwips
 
+    @param obIsLineSpacingProportional
+
     @author OD
 */
-void GetSpacingValuesOfFrm( const SwFrm& _rFrm,
-                            SwTwips& _roLowerSpacing,
-                            SwTwips& _roLineSpacing );
+void GetSpacingValuesOfFrm( const SwFrm& rFrm,
+                            SwTwips& onLowerSpacing,
+                            SwTwips& onLineSpacing,
+                            bool& obIsLineSpacingProportional );
 
 /** method to get the content of the table cell
 
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index ba9f0f9b9..4968601e7 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1514,7 +1514,12 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
             // values of found previous frame and use these values.
             SwTwips nPrevLowerSpace = 0;
             SwTwips nPrevLineSpacing = 0;
-            GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing );
+            // --> OD 2009-08-28 #i102458#
+            bool bPrevLineSpacingPorportional = false;
+            GetSpacingValuesOfFrm( (*pPrevFrm),
+                                   nPrevLowerSpace, nPrevLineSpacing,
+                                   bPrevLineSpacingPorportional );
+            // <--
             if( pIDSA->get(IDocumentSettingAccess::PARA_SPACE_MAX) )
             {
                 nUpper = nPrevLowerSpace + pAttrs->GetULSpace().GetUpper();
@@ -1539,7 +1544,22 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
                     //      building its maximum.
                     if ( pOwn->IsTxtFrm() )
                     {
-                        nAdd += static_cast<SwTxtFrm&>(rThis).GetLineSpace( true );
+                        // --> OD 2009-08-28 #i102458#
+                        // Correction:
+                        // A proportional line spacing of the previous text frame
+                        // is added up to a own leading line spacing.
+                        // Otherwise, the maximum of the leading line spacing
+                        // of the previous text frame and the own leading line
+                        // spacing is built.
+                        if ( bPrevLineSpacingPorportional )
+                        {
+                            nAdd += static_cast<SwTxtFrm&>(rThis).GetLineSpace( true );
+                        }
+                        else
+                        {
+                            nAdd = Max( nAdd, static_cast<SwTxtFrm&>(rThis).GetLineSpace( true ) );
+                        }
+                        // <--
                     }
                     nUpper += nAdd;
                 }
@@ -1571,7 +1591,22 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
                     SwTwips nAdd = nPrevLineSpacing;
                     if ( pOwn->IsTxtFrm() )
                     {
-                        nAdd += static_cast<SwTxtFrm&>(rThis).GetLineSpace( true );
+                        // --> OD 2009-08-28 #i102458#
+                        // Correction:
+                        // A proportional line spacing of the previous text frame
+                        // is added up to a own leading line spacing.
+                        // Otherwise, the maximum of the leading line spacing
+                        // of the previous text frame and the own leading line
+                        // spacing is built.
+                        if ( bPrevLineSpacingPorportional )
+                        {
+                            nAdd += static_cast<SwTxtFrm&>(rThis).GetLineSpace( true );
+                        }
+                        else
+                        {
+                            nAdd = Max( nAdd, static_cast<SwTxtFrm&>(rThis).GetLineSpace( true ) );
+                        }
+                        // <--
                     }
                     nUpper += nAdd;
                 }
@@ -1675,7 +1710,10 @@ SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPrevFrm() const
     {
         SwTwips nPrevLowerSpace = 0;
         SwTwips nPrevLineSpacing = 0;
-        GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing );
+        // --> OD 2009-08-28 #i102458#
+        bool bDummy = false;
+        GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing, bDummy );
+        // <--
         if ( nPrevLowerSpace > 0 || nPrevLineSpacing > 0 )
         {
             const IDocumentSettingAccess* pIDSA = rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess();
@@ -2697,8 +2735,3 @@ const SwFlowFrm *SwFlowFrm::CastFlowFrm( const SwFrm *pFrm )
         return (SwSectionFrm*)pFrm;
     return 0;
 }
-
-
-
-
-
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index f4e1efbf4..c7bc49c35 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3660,30 +3660,37 @@ const SwRect SwPageFrm::PrtWithoutHeaderAndFooter() const
 /** method to determine the spacing values of a frame
 
     OD 2004-03-10 #i28701#
+    OD 2009-08-28 #i102458#
+    Add output parameter <obIsLineSpacingProportional>
 
     @author OD
 */
-void GetSpacingValuesOfFrm( const SwFrm& _rFrm,
-                            SwTwips& _roLowerSpacing,
-                            SwTwips& _roLineSpacing )
+void GetSpacingValuesOfFrm( const SwFrm& rFrm,
+                            SwTwips& onLowerSpacing,
+                            SwTwips& onLineSpacing,
+                            bool& obIsLineSpacingProportional )
 {
-    if ( !_rFrm.IsFlowFrm() )
+    if ( !rFrm.IsFlowFrm() )
     {
-        _roLowerSpacing = 0L;
-        _roLineSpacing = 0L;
+        onLowerSpacing = 0;
+        onLineSpacing = 0;
     }
     else
     {
-        const SvxULSpaceItem& rULSpace = _rFrm.GetAttrSet()->GetULSpace();
-        _roLowerSpacing = rULSpace.GetLower();
+        const SvxULSpaceItem& rULSpace = rFrm.GetAttrSet()->GetULSpace();
+        onLowerSpacing = rULSpace.GetLower();
 
-        _roLineSpacing = 0;
-        if ( _rFrm.IsTxtFrm() )
+        onLineSpacing = 0;
+        obIsLineSpacingProportional = false;
+        if ( rFrm.IsTxtFrm() )
         {
-            _roLineSpacing = static_cast<const SwTxtFrm&>(_rFrm).GetLineSpace();
+            onLineSpacing = static_cast<const SwTxtFrm&>(rFrm).GetLineSpace();
+            obIsLineSpacingProportional =
+                onLineSpacing != 0 &&
+                static_cast<const SwTxtFrm&>(rFrm).GetLineSpace( true ) == 0;
         }
 
-        ASSERT( _roLowerSpacing >= 0 && _roLineSpacing >= 0,
+        ASSERT( onLowerSpacing >= 0 && onLineSpacing >= 0,
                 "<GetSpacingValuesOfFrm(..)> - spacing values aren't positive!" );
     }
 }
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 5d7b28cde..049ea7907 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -243,7 +243,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
 
         nBreakStart = nCutPos;
     }
-    else if( pBreakIt->xBreak.is() )
+    else if( pBreakIt->GetBreakIter().is() )
     {
         // New: We should have a look into the last portion, if it was a
         // field portion. For this, we expand the text of the field portion
@@ -366,7 +366,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
 
         // determines first possible line break from nRightPos to
         // start index of current line
-        LineBreakResults aResult = pBreakIt->xBreak->getLineBreak(
+        LineBreakResults aResult = pBreakIt->GetBreakIter()->getLineBreak(
             rInf.GetTxt(), nCutPos, aLocale,
             rInf.GetLineStart(), aHyphOpt, aUserOpt );
 
@@ -534,7 +534,7 @@ sal_Bool SwTxtGuess::AlternativeSpelling( const SwTxtFormatInfo &rInf,
     xub_StrLen nWordLen;
 
     Boundary aBound =
-        pBreakIt->xBreak->getWordBoundary( rInf.GetTxt(), nPos,
+        pBreakIt->GetBreakIter()->getWordBoundary( rInf.GetTxt(), nPos,
         pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ),
         WordType::DICTIONARY_WORD, sal_True );
     nBreakStart = (xub_StrLen)aBound.startPos;
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 13a05d129..1838124ec 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1145,27 +1145,30 @@ void SwTxtPaintInfo::DrawCheckBox( const SwFieldFormPortion &rPor, bool checked)
 {
     SwRect aIntersect;
     CalcRect( rPor, &aIntersect, 0 );
-    if ( aIntersect.HasArea() ) {
-    if (OnWin()) {
-        OutputDevice* pOutDev = (OutputDevice*)GetOut();
-        pOutDev->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
-        pOutDev->SetLineColor( Color(220, 233, 245));
-        pOutDev->SetFillColor( Color(220, 233, 245));
-        pOutDev->DrawRect( aIntersect.SVRect() );
-        pOutDev->Pop();
-    }
-    const int delta=10;
-    Rectangle r(aIntersect.Left()+delta, aIntersect.Top()+delta, aIntersect.Right()-delta, aIntersect.Bottom()-delta);
-    pOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );	    
-    pOut->SetLineColor( Color(0, 0, 0));
-    pOut->SetFillColor();
-    pOut->DrawRect( r );
-    if (checked) {
-        pOut->DrawLine(r.TopLeft(), r.BottomRight());
-        pOut->DrawLine(r.TopRight(), r.BottomLeft());
+    if ( aIntersect.HasArea() ) 
+    {
+	    if (OnWin() && SwViewOption::IsFieldShadings() && 
+                !GetOpt().IsPagePreview()) 
+        {
+    	    OutputDevice* pOut_ = (OutputDevice*)GetOut();
+	        pOut_->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
+    	    pOut_->SetFillColor( SwViewOption::GetFieldShadingsColor() );
+	        pOut_->SetLineColor();
+	        pOut_->DrawRect( aIntersect.SVRect() );
+    	    pOut_->Pop();
+        }
+        const int delta=10;
+        Rectangle r(aIntersect.Left()+delta, aIntersect.Top()+delta, aIntersect.Right()-delta, aIntersect.Bottom()-delta);
+        pOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );	    
+        pOut->SetLineColor( Color(0, 0, 0));
+        pOut->SetFillColor();
+        pOut->DrawRect( r );
+        if (checked) {
+            pOut->DrawLine(r.TopLeft(), r.BottomRight());
+            pOut->DrawLine(r.TopRight(), r.BottomLeft());
+        }
         pOut->Pop();
     }
-    }
 }
 
 /*************************************************************************
@@ -1219,14 +1222,22 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const
                 }
             }
             bool bIsStartMark=(1==GetLen() && CH_TXT_ATR_FIELDSTART==GetTxt().GetChar(GetIdx()));
-            if(pFieldmark) OSL_TRACE("Found Fieldmark");
+            if(pFieldmark) {
+                OSL_TRACE("Found Fieldmark");
+#if DEBUG
+                rtl::OUString str = pFieldmark->toString( );
+                fprintf( stderr, "%s\n", rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr( ) );
+#endif
+            }
             if(bIsStartMark) OSL_TRACE("Found StartMark");
-            if (OnWin() && (pFieldmark!=NULL || bIsStartMark))
+            if (OnWin() && (pFieldmark!=NULL || bIsStartMark) && 
+                    SwViewOption::IsFieldShadings() && 
+                    !GetOpt().IsPagePreview())
             {
                 OutputDevice* pOutDev = (OutputDevice*)GetOut();
                 pOutDev->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
-                pOutDev->SetLineColor( Color(220, 233, 245));
-                pOutDev->SetFillColor( Color(220, 233, 245));
+         		pOutDev->SetFillColor( SwViewOption::GetFieldShadingsColor() );
+                pOutDev->SetLineColor( );
                 pOutDev->DrawRect( aIntersect.SVRect() );
                 pOutDev->Pop();
             }
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 44ab83e9c..dc4df3d75 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -400,10 +400,10 @@ sal_Bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const XubString &rT
         xub_StrLen nStop = nIdx;
         sal_Bool bClear;
         LanguageType eLang = pFnt->GetLanguage();
-        if( pBreakIt->xBreak.is() )
+        if( pBreakIt->GetBreakIter().is() )
         {
             bClear = CH_BLANK == rTxt.GetChar( nStop );
-            Boundary aBndry( pBreakIt->xBreak->getWordBoundary( rTxt, nIdx,
+            Boundary aBndry( pBreakIt->GetBreakIter()->getWordBoundary( rTxt, nIdx,
                              pBreakIt->GetLocale( eLang ),
                              WordType::DICTIONARY_WORD, TRUE ) );
             nStop = (xub_StrLen)aBndry.endPos;
@@ -870,7 +870,7 @@ USHORT SwTxtNode::GetScalingOfSelectedText(	xub_StrLen nStt, xub_StrLen nEnd )
 
     if ( nStt == nEnd )
     {
-        if ( !pBreakIt->xBreak.is() )
+        if ( !pBreakIt->GetBreakIter().is() )
             return 100;
 
         SwScriptInfo aScriptInfo;
@@ -878,7 +878,7 @@ USHORT SwTxtNode::GetScalingOfSelectedText(	xub_StrLen nStt, xub_StrLen nEnd )
         aIter.SeekAndChgAttrIter( nStt, pOut );
 
         Boundary aBound =
-            pBreakIt->xBreak->getWordBoundary( GetTxt(), nStt,
+            pBreakIt->GetBreakIter()->getWordBoundary( GetTxt(), nStt,
             pBreakIt->GetLocale( aIter.GetFnt()->GetLanguage() ),
             WordType::DICTIONARY_WORD, sal_True );
 
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 25ad1a25c..7fbb6bae5 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -157,8 +157,10 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
     GetInfo().SetFont( GetFnt() );
     const SwTxtNode *pNode = pFrm->GetTxtNode();
 
-    const SvxLRSpaceItem &rSpace =
-        pFrm->GetTxtNode()->GetSwAttrSet().GetLRSpace();
+    const SvxLRSpaceItem &rSpace = pFrm->GetTxtNode()->GetSwAttrSet().GetLRSpace();
+    // --> OD 2009-09-02 #i95907#
+    const bool bListLevelIndentsApplicable = pFrm->GetTxtNode()->AreListLevelIndentsApplicable();
+    // <--
 
     //
     // Carefully adjust the text formatting ranges.
@@ -181,8 +183,13 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
                 pFrm->Prt().Left() +
                 nLMWithNum -
                 pNode->GetLeftMarginWithNum( sal_False ) -
-                rSpace.GetLeft() +
-                rSpace.GetTxtLeft();
+                // --> OD 2009-09-02 #i95907#
+//                rSpace.GetLeft() +
+//                rSpace.GetTxtLeft();
+                ( bListLevelIndentsApplicable
+                  ? 0
+                  : ( rSpace.GetLeft() - rSpace.GetTxtLeft() ) );
+                // <--
     }
     else
     {
@@ -193,8 +200,13 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
                     pFrm->Prt().Left() +
                     nLMWithNum -
                     pNode->GetLeftMarginWithNum( sal_False ) -
-                    rSpace.GetLeft() +
-                    rSpace.GetTxtLeft();
+                    // --> OD 2009-09-02 #i95907#
+//                    rSpace.GetLeft() +
+//                    rSpace.GetTxtLeft();
+                    ( bListLevelIndentsApplicable
+                      ? 0
+                      : ( rSpace.GetLeft() - rSpace.GetTxtLeft() ) );
+                    // <--
         }
         else
         {
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 096d86319..1be669d4f 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -215,25 +215,25 @@ SwFldSlot::~SwFldSlot()
 void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf )
 {
     String aTxt;
-    if( GetExpTxt( rInf, aTxt ) && aTxt.Len() && pBreakIt->xBreak.is() )
+    if( GetExpTxt( rInf, aTxt ) && aTxt.Len() && pBreakIt->GetBreakIter().is() )
     {
         BYTE nActual = pFnt ? pFnt->GetActual() : rInf.GetFont()->GetActual();
         USHORT nScript;
         {
-            nScript = pBreakIt->xBreak->getScriptType( aTxt, 0 );
+            nScript = pBreakIt->GetBreakIter()->getScriptType( aTxt, 0 );
             xub_StrLen nChg = 0;
             if( i18n::ScriptType::WEAK == nScript )
             {
-                nChg =(xub_StrLen)pBreakIt->xBreak->endOfScript(aTxt,0,nScript);
+                nChg =(xub_StrLen)pBreakIt->GetBreakIter()->endOfScript(aTxt,0,nScript);
                 if( nChg < aTxt.Len() )
-                    nScript = pBreakIt->xBreak->getScriptType( aTxt, nChg );
+                    nScript = pBreakIt->GetBreakIter()->getScriptType( aTxt, nChg );
             }
 
             //
             // nNextScriptChg will be evaluated during SwFldPortion::Format()
             //
             if ( nChg < aTxt.Len() )
-                nNextScriptChg = (xub_StrLen)pBreakIt->xBreak->endOfScript( aTxt, nChg, nScript );
+                nNextScriptChg = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript( aTxt, nChg, nScript );
             else
                 nNextScriptChg = aTxt.Len();
 
@@ -1127,12 +1127,12 @@ SwCombinedPortion::SwCombinedPortion( const XubString &rTxt )
         aExpand.Erase( 6 );
     // Initialization of the scripttype array,
     // the arrays of width and position are filled by the format function
-    if(	pBreakIt->xBreak.is() )
+    if(	pBreakIt->GetBreakIter().is() )
     {
         BYTE nScr = SW_SCRIPTS;
         for( USHORT i = 0; i < rTxt.Len(); ++i )
         {
-            USHORT nScript = pBreakIt->xBreak->getScriptType( rTxt, i );
+            USHORT nScript = pBreakIt->GetBreakIter()->getScriptType( rTxt, i );
             switch ( nScript ) {
                 case i18n::ScriptType::LATIN : nScr = SW_LATIN; break;
                 case i18n::ScriptType::ASIAN : nScr = SW_CJK; break;
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 7b42802f6..da275d1eb 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -798,7 +798,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode )
 
 void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
 {
-    if( !pBreakIt->xBreak.is() )
+    if( !pBreakIt->GetBreakIter().is() )
         return;
 
     const String& rTxt = rNode.GetTxt();
@@ -907,13 +907,13 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
     // we go back in our group until we reach the first character of
     // type nScript
     while ( nChg > nGrpStart &&
-            nScript != pBreakIt->xBreak->getScriptType( rTxt, nChg ) )
+            nScript != pBreakIt->GetBreakIter()->getScriptType( rTxt, nChg ) )
         --nChg;
 
     // If we are at the start of a group, we do not trust nScript,
     // we better get nScript from the breakiterator:
     if ( nChg == nGrpStart )
-        nScript = (BYTE)pBreakIt->xBreak->getScriptType( rTxt, nChg );
+        nScript = (BYTE)pBreakIt->GetBreakIter()->getScriptType( rTxt, nChg );
 
     //
     // INVALID DATA FROM THE SCRIPT INFO ARRAYS HAS TO BE DELETED:
@@ -959,14 +959,14 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
     // SCRIPT FOR WEAK CHARACTERS AT THE BEGINNING OF A PARAGRAPH
     //
 
-    if( WEAK == pBreakIt->xBreak->getScriptType( rTxt, nChg ) )
+    if( WEAK == pBreakIt->GetBreakIter()->getScriptType( rTxt, nChg ) )
     {
         // If the beginning of the current group is weak, this means that
         // all of the characters in this grounp are weak. We have to assign
         // the scripts to these characters depending on the fonts which are
         // set for these characters to display them.
         xub_StrLen nEnd =
-                (xub_StrLen)pBreakIt->xBreak->endOfScript( rTxt, nChg, WEAK );
+                (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript( rTxt, nChg, WEAK );
 
         if( nEnd > rTxt.Len() )
             nEnd = rTxt.Len();
@@ -981,7 +981,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
 
         // Get next script type or set to weak in order to exit
         BYTE nNextScript = ( nEnd < rTxt.Len() ) ?
-           (BYTE)pBreakIt->xBreak->getScriptType( rTxt, nEnd ) :
+           (BYTE)pBreakIt->GetBreakIter()->getScriptType( rTxt, nEnd ) :
            (BYTE)WEAK;
 
         if ( nScript != nNextScript )
@@ -1003,7 +1003,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
         ASSERT( STRING_LEN != nChg, "65K? Strange length of script section" );
 
         xub_StrLen nSearchStt = nChg;
-        nChg = (xub_StrLen)pBreakIt->xBreak->endOfScript( rTxt, nSearchStt, nScript );
+        nChg = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript( rTxt, nSearchStt, nScript );
 
         if ( nChg > rTxt.Len() )
             nChg = rTxt.Len();
@@ -1011,16 +1011,16 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
         // --> FME 2008-09-17 #i28203#
         // for 'complex' portions, we make sure that a portion does not contain more
         // than one script:
-        if( pBreakIt->xCTLDetect.is() && i18n::ScriptType::COMPLEX == nScript )
+        if( i18n::ScriptType::COMPLEX == nScript && pBreakIt->GetScriptTypeDetector().is() )
         {
-            const short nScriptType = pBreakIt->xCTLDetect->getCTLScriptType( rTxt, nSearchStt );
+            const short nScriptType = pBreakIt->GetScriptTypeDetector()->getCTLScriptType( rTxt, nSearchStt );
             xub_StrLen nNextCTLScriptStart = nSearchStt;
             short nCurrentScriptType = nScriptType;
             while( com::sun::star::i18n::CTLScriptType::CTL_UNKNOWN == nCurrentScriptType || nScriptType == nCurrentScriptType )
             {
-                nNextCTLScriptStart = (xub_StrLen)pBreakIt->xCTLDetect->endOfCTLScriptType( rTxt, nNextCTLScriptStart );
+                nNextCTLScriptStart = (xub_StrLen)pBreakIt->GetScriptTypeDetector()->endOfCTLScriptType( rTxt, nNextCTLScriptStart );
                 if( nNextCTLScriptStart < rTxt.Len() && nNextCTLScriptStart < nChg )
-                    nCurrentScriptType = pBreakIt->xCTLDetect->getCTLScriptType( rTxt, nNextCTLScriptStart );
+                    nCurrentScriptType = pBreakIt->GetScriptTypeDetector()->getCTLScriptType( rTxt, nNextCTLScriptStart );
                 else
                     break;
             }
@@ -1031,7 +1031,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
         // special case for dotted circle since it can be used with complex
         // before a mark, so we want it associated with the mark's script
         if (nChg < rTxt.Len() && nChg > 0 && (i18n::ScriptType::WEAK ==
-            pBreakIt->xBreak->getScriptType(rTxt,nChg - 1)))
+            pBreakIt->GetBreakIter()->getScriptType(rTxt,nChg - 1)))
         {
             int8_t nType = u_charType(rTxt.GetChar(nChg) );
             if (nType == U_NON_SPACING_MARK || nType == U_ENCLOSING_MARK ||
@@ -1287,7 +1287,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
         }
 
         if ( nChg < rTxt.Len() )
-            nScript = (BYTE)pBreakIt->xBreak->getScriptType( rTxt, nChg );
+            nScript = (BYTE)pBreakIt->GetBreakIter()->getScriptType( rTxt, nChg );
 
         nLastCompression = nChg;
         nLastKashida = nChg;
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 6ff2c0ff7..7b07e9cd1 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -916,7 +916,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos,
         // for 99% of all cases
         XubString aTxt = GetTxtFrm()->GetTxtNode()->GetExpandTxt( rPos, 1 );
 
-        if ( pBreakIt->xBreak.is() && aTxt.Len() )
+        if ( pBreakIt->GetBreakIter().is() && aTxt.Len() )
         {
             sal_Bool bFldDir = ( i18n::ScriptType::COMPLEX ==
                                  pBreakIt->GetRealScriptOfText( aTxt, 0 ) );
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 1c482fc30..9b24e3138 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -55,11 +55,13 @@
 #include <IMark.hxx>
 #include <pam.hxx>
 #include <doc.hxx>
+#include <ecmaflds.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
 const sal_Char *GetLangName( const MSHORT nLang );
 #endif
 
+using namespace ::sw::mark;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::i18n::ScriptType;
 
@@ -97,8 +99,8 @@ USHORT lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr,
     // first we get the script type
     if ( pSI )
         nScript = pSI->ScriptType( nPos );
-    else if ( pBreakIt->xBreak.is() )
-        nScript = (BYTE)pBreakIt->xBreak->getScriptType( *pStr, nPos );
+    else if ( pBreakIt->GetBreakIter().is() )
+        nScript = (BYTE)pBreakIt->GetBreakIter()->getScriptType( *pStr, nPos );
 
     // Note: rInf.GetIdx() can differ from nPos,
     // e.g., when rPor is a field portion. nPos referes to the string passed
@@ -198,7 +200,7 @@ USHORT lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr,
         if ( pPor && pPor->IsKernPortion() )
             pPor = pPor->GetPortion();
 
-        if ( ! pBreakIt->xBreak.is() || ! pPor || pPor->InFixMargGrp() )
+        if ( ! pBreakIt->GetBreakIter().is() || ! pPor || pPor->InFixMargGrp() )
             return nCnt;
 
         // next character is inside a field?
@@ -211,10 +213,10 @@ USHORT lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr,
             pPor->GetExpTxt( rInf, aStr );
             ((SwTxtSizeInfo &)rInf).SetOnWin( bOldOnWin );
 
-            nNextScript = (BYTE)pBreakIt->xBreak->getScriptType( aStr, 0 );
+            nNextScript = (BYTE)pBreakIt->GetBreakIter()->getScriptType( aStr, 0 );
         }
         else
-            nNextScript = (BYTE)pBreakIt->xBreak->getScriptType( rInf.GetTxt(), nPos );
+            nNextScript = (BYTE)pBreakIt->GetBreakIter()->getScriptType( rInf.GetTxt(), nPos );
 
         if( ASIAN == nNextScript )
         {
@@ -769,9 +771,10 @@ void SwHolePortion::HandlePortion( SwPortionHandler& rPH ) const
     rPH.Text( GetLen(), GetWhichPor() );
 }
 
-void SwFieldMarkPortion::Paint( const SwTxtPaintInfo & rInf) const
+void SwFieldMarkPortion::Paint( const SwTxtPaintInfo & /*rInf*/) const
 {
-    SwTxtPortion::Paint(rInf);
+    // These shouldn't be painted!
+    // SwTxtPortion::Paint(rInf);
 }
 
 sal_Bool SwFieldMarkPortion::Format( SwTxtFormatInfo & )
@@ -781,38 +784,95 @@ sal_Bool SwFieldMarkPortion::Format( SwTxtFormatInfo & )
     return ret;
 }
 
+namespace ecma {
+    static int getCurrentListIndex( IFieldmark* pBM, 
+            ::rtl::OUString *currentText = NULL )
+    {
+        int currentIndex = pBM->getParam( ECMA_FORMDROPDOWN_RESULT, "0" ).second.toInt32();
+        int idx = 0;
+        for( int i = 0; i < pBM->getNumOfParams(); i++ ) 
+        {
+            IFieldmark::ParamPair_t p = pBM->getParam( i );
+            if ( p.first.compareToAscii( ECMA_FORMDROPDOWN_LISTENTRY ) == 0 )
+            {
+ 	            if ( idx == currentIndex )
+                {
+ 	                if ( currentText!=NULL ) *currentText=p.second;
+ 	                    break;
+ 	            } 
+                else
+             	    idx++;
+            }			       
+        }	
+        return idx;
+    }
+} /* ecma */
 
 //FIXME Fieldbk
-//void SwFieldFormPortion::Paint( const SwTxtPaintInfo& rInf ) const
-void SwFieldFormPortion::Paint( const SwTxtPaintInfo& ) const
+void SwFieldFormPortion::Paint( const SwTxtPaintInfo& rInf ) const
 {
-//    SwTxtNode *pNd=const_cast<SwTxtNode*>(rInf.GetTxtFrm()->GetTxtNode());
-//    const SwDoc *doc=pNd->GetDoc();
-//    SwIndex aIndex( pNd, rInf.GetIdx() );
-//    SwPosition aPosition(*pNd, aIndex);
-//    pMark = dynamic_cast< doc->getFieldmarkFor(aPosition);
-//    OSL_ENSURE(pMark,
-//        "SwFieldFormPortion::Paint(..)"
-//        " - Where is my form field bookmark???");
-
-//    bool checked=(pBM!=NULL?pBM->IsChecked():false);
-//    rInf.DrawCheckBox(*this , checked);
-}
+    SwTxtNode* pNd = const_cast<SwTxtNode*>(rInf.GetTxtFrm()->GetTxtNode());
+    const SwDoc *doc=pNd->GetDoc();
+    SwIndex aIndex( pNd, rInf.GetIdx() );
+    SwPosition aPosition(*pNd, aIndex);
 
-sal_Bool SwFieldFormPortion::Format( SwTxtFormatInfo &rInf )
-{
-    sal_Bool ret=0;
-//	ret=SwTxtPortion::Format(rInf);
+    IFieldmark* pBM = doc->getIDocumentMarkAccess( )->getFieldmarkFor( aPosition );
 
-    Width(rInf.GetTxtHeight());
-    Height(rInf.GetTxtHeight());
-    SetAscent(rInf.GetAscent());
-    //int h=rInf.GetTxtHeight();
+    OSL_ENSURE( pBM,
+        "SwFieldFormPortion::Paint(..)"
+        " - Where is my form field bookmark???");
 
-/*
-    Height(100);
-    SetAscent(100);
-*/
+    if ( pBM != NULL ) 
+    {
+        if ( pBM->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX ) )
+        { // a checkbox...
+        	bool checked = pBM->getParam( ECMA_FORMCHECKBOX_CHECKED ).second.compareToAscii("on") == 0;
+        	rInf.DrawCheckBox( *this , checked);
+        } 
+        else if ( pBM->GetFieldname( ).equalsAscii(  ECMA_FORMDROPDOWN ) )
+        { // a list...
+         	rtl::OUString aTxt;
+         	rInf.DrawViewOpt( *this, POR_FLD );
+         	rInf.DrawText( aTxt, *this, 0, aTxt.getLength(), false );	  
+        } 
+        else 
+        {
+         	assert(0); // unknown type...
+        }
+    }
+}
+
+sal_Bool SwFieldFormPortion::Format( SwTxtFormatInfo & rInf )
+{
+    sal_Bool ret = 0;
+    SwTxtNode *pNd = const_cast < SwTxtNode * >( rInf.GetTxtFrm(  )->GetTxtNode(  ) );
+    const SwDoc *doc = pNd->GetDoc(  );
+    SwIndex aIndex( pNd, rInf.GetIdx(  ) );
+    SwPosition aPosition( *pNd, aIndex );
+    IFieldmark *pBM = doc->getIDocumentMarkAccess( )->getFieldmarkFor( aPosition );
+    ASSERT( pBM != NULL, "Where is my form field bookmark???" );
+    if ( pBM != NULL )
+    {
+        if ( pBM->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX ) )
+        {
+            Width( rInf.GetTxtHeight(  ) );
+            Height( rInf.GetTxtHeight(  ) );
+            SetAscent( rInf.GetAscent(  ) );
+        }
+        else if ( pBM->GetFieldname( ).equalsAscii( ECMA_FORMDROPDOWN ) )
+        {
+            ::rtl::OUString aTxt;
+            ecma::getCurrentListIndex( pBM, &aTxt );
+            SwPosSize aPosSize = rInf.GetTxtSize( aTxt );
+            Width( aPosSize.Width(  ) );
+            Height( aPosSize.Height(  ) );
+            SetAscent( rInf.GetAscent(  ) );
+        }
+        else
+        {
+            assert( 0 );        // unknown type...
+        }
+    }
     return ret;
 }
 
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 9ae6b7a74..f9882555e 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -110,7 +110,7 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
     if ( pScriptInfo->GetInvalidity() != STRING_LEN )
          pScriptInfo->InitScriptInfo( rTxtNode, bRTL );
 
-    if ( pBreakIt->xBreak.is() )
+    if ( pBreakIt->GetBreakIter().is() )
     {
         pFnt->SetActual( SwScriptInfo::WhichFont( 0, 0, pScriptInfo ) );
 
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 89e519bcd..184fe64e8 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -179,7 +179,7 @@ MSHORT SwTxtNode::GetDropLen( MSHORT nWishLen ) const
     if( nWishLen && nWishLen < nEnd )
         nEnd = nWishLen;
 
-    if ( ! nWishLen && pBreakIt->xBreak.is() )
+    if ( ! nWishLen && pBreakIt->GetBreakIter().is() )
     {
         // find first word
         const SwAttrSet& rAttrSet = GetSwAttrSet();
@@ -201,7 +201,7 @@ MSHORT SwTxtNode::GetDropLen( MSHORT nWishLen ) const
         }
 
         Boundary aBound =
-            pBreakIt->xBreak->getWordBoundary( GetTxt(), 0,
+            pBreakIt->GetBreakIter()->getWordBoundary( GetTxt(), 0,
             pBreakIt->GetLocale( eLanguage ), WordType::DICTIONARY_WORD, sal_True );
 
         nEnd = (xub_StrLen)aBound.endPos;
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index a92b77b11..602cc4803 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -89,7 +89,7 @@ sal_Bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
 {
     ASSERT( ! IsVertical() || ! IsSwapped(),"swapped frame at SwTxtFrm::Hyphenate" );
 
-    if( !pBreakIt->xBreak.is() )
+    if( !pBreakIt->GetBreakIter().is() )
         return sal_False;;
     // Wir machen den Laden erstmal dicht:
     ASSERT( !IsLocked(), "SwTxtFrm::Hyphenate: this is locked" );
@@ -254,7 +254,7 @@ sal_Bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
         Reference< XHyphenatedWord > xHyphWord;
 
         Boundary aBound =
-            pBreakIt->xBreak->getWordBoundary( rInf.GetTxt(), nWrdStart,
+            pBreakIt->GetBreakIter()->getWordBoundary( rInf.GetTxt(), nWrdStart,
             pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ), WordType::DICTIONARY_WORD, sal_True );
         nWrdStart = static_cast<xub_StrLen>(aBound.startPos);
         nLen = static_cast<xub_StrLen>(aBound.endPos - nWrdStart);
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 138109d3b..6b8d09861 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2425,7 +2425,7 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf )
 
     // skip character cells for complex scripts
     if ( rInf.GetFont() && SW_CTL == rInf.GetFont()->GetActual() &&
-         pBreakIt->xBreak.is() )
+         pBreakIt->GetBreakIter().is() )
     {
         aLang = rInf.GetFont()->GetLanguage();
         bSkipCell = sal_True;
@@ -2441,7 +2441,7 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf )
 
         if ( bSkipCell )
         {
-            nIdx = (xub_StrLen)pBreakIt->xBreak->nextCharacters( rInf.GetText(),
+            nIdx = (xub_StrLen)pBreakIt->GetBreakIter()->nextCharacters( rInf.GetText(),
                         nIdx, pBreakIt->GetLocale( aLang ), nItrMode, 1, nDone );
             if ( nIdx <= nLastIdx )
                 break;
@@ -2704,13 +2704,13 @@ xub_StrLen SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
             const XubString aSnippet( rInf.GetText(), rInf.GetIdx(), nLn );
             aTmpText = aSub[nActual].CalcCaseMap( aSnippet );
             const bool bTitle = SVX_CASEMAP_TITEL == aSub[nActual].GetCaseMap() &&
-                                pBreakIt->xBreak.is();
+                                pBreakIt->GetBreakIter().is();
 
             // Uaaaaahhhh!!! In title case mode, we would get wrong results
             if ( bTitle && nLn )
             {
                 // check if rInf.GetIdx() is begin of word
-                if ( !pBreakIt->xBreak->isBeginWord(
+                if ( !pBreakIt->GetBreakIter()->isBeginWord(
                      rInf.GetText(), rInf.GetIdx(),
                      pBreakIt->GetLocale( aSub[nActual].GetLanguage() ),
                      i18n::WordType::ANYWORD_IGNOREWHITESPACES ) )
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index e15f975c8..9f32dd797 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -102,13 +102,13 @@ xub_StrLen lcl_CalcCaseMap( const SwFont& rFnt,
 
     // special case for title case:
     const bool bTitle = SVX_CASEMAP_TITEL == rFnt.GetCaseMap() &&
-                        pBreakIt->xBreak.is();
+                        pBreakIt->GetBreakIter().is();
     for ( xub_StrLen i = nOfst; i < nEnd; ++i )
     {
         XubString aTmp( rOrigString, i, 1 );
 
         if ( !bTitle ||
-             pBreakIt->xBreak->isBeginWord(
+             pBreakIt->GetBreakIter()->isBeginWord(
                  rOrigString, i,
                  pBreakIt->GetLocale( rFnt.GetLanguage() ),
                  WordType::ANYWORD_IGNOREWHITESPACES ) )
@@ -654,7 +654,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
 
     if( nPos < nMaxPos )
     {
-        nPos = (xub_StrLen)pBreakIt->xBreak->endOfCharBlock( rOldText, nPos,
+        nPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfCharBlock( rOldText, nPos,
             pBreakIt->GetLocale( eLng ), CharType::LOWERCASE_LETTER);
         if( nPos == STRING_LEN )
             nPos = nOldPos;
@@ -702,7 +702,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
             rDo.Do();
             nOldPos = nPos;
         }
-        nPos = (xub_StrLen)pBreakIt->xBreak->nextCharBlock( rOldText, nPos,
+        nPos = (xub_StrLen)pBreakIt->GetBreakIter()->nextCharBlock( rOldText, nPos,
                pBreakIt->GetLocale( eLng ), CharType::LOWERCASE_LETTER);
         if( nPos == STRING_LEN || nPos > nMaxPos )
             nPos = nMaxPos;
@@ -816,7 +816,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
                 }
             } while( nOldPos != nPos );
         }
-        nPos = (xub_StrLen)pBreakIt->xBreak->endOfCharBlock( rOldText, nPos,
+        nPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfCharBlock( rOldText, nPos,
                pBreakIt->GetLocale( eLng ), CharType::LOWERCASE_LETTER);
         if( nPos == STRING_LEN || nPos > nMaxPos )
             nPos = nMaxPos;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 201ac8049..ed037311e 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -234,7 +234,6 @@ SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere,
       mpNodeNum( 0 ),
       m_bLastOutlineState( false ),
       m_bNotifiable( false ),
-      //nOutlineLevel( pTxtColl->GetOutlineLevel() )//#outline level, removed by zhaojianwei.
       // --> OD 2008-11-19 #i70748#
       mbEmptyListStyleSetDueToSetOutlineLevelAttr( false ),
       // <--
@@ -253,6 +252,15 @@ SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere,
 //    SyncNumberAndNumRule();
     if ( !IsInList() && GetNumRule() && GetListId().Len() > 0 )
     {
+        // --> OD 2009-08-27 #i101516#
+        // apply paragraph style's assigned outline style list level as
+        // list level of the paragraph, if it has none set already.
+        if ( !HasAttrListLevel() &&
+             pTxtColl && pTxtColl->IsAssignedToListLevelOfOutlineStyle() )
+        {
+            SetAttrListLevel( pTxtColl->GetAssignedOutlineStyleLevel() );
+        }
+        // <--
         AddToList();
     }
     // <--
diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx
index f6afc22c8..cb3c9e466 100644
--- a/sw/source/core/txtnode/txatritr.cxx
+++ b/sw/source/core/txtnode/txatritr.cxx
@@ -55,50 +55,50 @@ SwScriptIterator::SwScriptIterator( const String& rStr, xub_StrLen nStt, sal_Boo
       nCurScript( ScriptType::WEAK ),
       bForward( bFrwrd )
 {
-    if( pBreakIt->xBreak.is() )
+    if( pBreakIt->GetBreakIter().is() )
     {
         if ( ! bFrwrd && nStt )
             --nStt;
 
         xub_StrLen nPos = nStt;
-        nCurScript = pBreakIt->xBreak->getScriptType( rText, nPos );
+        nCurScript = pBreakIt->GetBreakIter()->getScriptType( rText, nPos );
         if( ScriptType::WEAK == nCurScript )
         {
             if( nPos )
             {
-                nPos = (xub_StrLen)pBreakIt->xBreak->beginOfScript(
+                nPos = (xub_StrLen)pBreakIt->GetBreakIter()->beginOfScript(
                                                 rText, nPos, nCurScript );
                 if( nPos && nPos < rText.Len() )
                 {
                     nStt = --nPos;
-                    nCurScript = pBreakIt->xBreak->getScriptType( rText,nPos);
+                    nCurScript = pBreakIt->GetBreakIter()->getScriptType( rText,nPos);
                 }
             }
         }
 
         nChgPos = bForward ?
-                  (xub_StrLen)pBreakIt->xBreak->endOfScript( rText, nStt, nCurScript ) :
-                  (xub_StrLen)pBreakIt->xBreak->beginOfScript( rText, nStt, nCurScript );
+                  (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript( rText, nStt, nCurScript ) :
+                  (xub_StrLen)pBreakIt->GetBreakIter()->beginOfScript( rText, nStt, nCurScript );
     }
 }
 
 sal_Bool SwScriptIterator::Next()
 {
     sal_Bool bRet = sal_False;
-    if( pBreakIt->xBreak.is() )
+    if( pBreakIt->GetBreakIter().is() )
     {
         if ( bForward && nChgPos < rText.Len() )
         {
-            nCurScript = pBreakIt->xBreak->getScriptType( rText, nChgPos );
-            nChgPos = (xub_StrLen)pBreakIt->xBreak->endOfScript(
+            nCurScript = pBreakIt->GetBreakIter()->getScriptType( rText, nChgPos );
+            nChgPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript(
                                                 rText, nChgPos, nCurScript );
             bRet = sal_True;
         }
         else if ( ! bForward && nChgPos )
         {
             --nChgPos;
-            nCurScript = pBreakIt->xBreak->getScriptType( rText, nChgPos );
-            nChgPos = (xub_StrLen)pBreakIt->xBreak->beginOfScript(
+            nCurScript = pBreakIt->GetBreakIter()->getScriptType( rText, nChgPos );
+            nChgPos = (xub_StrLen)pBreakIt->GetBreakIter()->beginOfScript(
                                                 rText, nChgPos, nCurScript );
             bRet = sal_True;
         }
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 95fcac2e6..fea2d4c8f 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -682,7 +682,7 @@ XubString SwTxtNode::GetCurWord( xub_StrLen nPos ) const
         return m_Text;
 
     Boundary aBndry;
-    const uno::Reference< XBreakIterator > &rxBreak = pBreakIt->xBreak;
+    const uno::Reference< XBreakIterator > &rxBreak = pBreakIt->GetBreakIter();
     if (rxBreak.is())
     {
         sal_Int16 nWordType = WordType::DICTIONARY_WORD;
@@ -750,7 +750,7 @@ BOOL SwScanner::NextWord()
             {
                 if ( !pLanguage )
                 {
-                    const USHORT nNextScriptType = pBreakIt->xBreak->getScriptType( rText, nBegin );
+                    const USHORT nNextScriptType = pBreakIt->GetBreakIter()->getScriptType( rText, nBegin );
                     ModelToViewHelper::ModelPosition aModelBeginPos = ModelToViewHelper::ConvertToModelPosition( pConversionMap, nBegin );
                     const xub_StrLen nBeginModelPos = (xub_StrLen)aModelBeginPos.mnPos;
                     aCurrLang = rNode.GetLang( nBeginModelPos, 1, nNextScriptType );
@@ -772,7 +772,7 @@ BOOL SwScanner::NextWord()
             return FALSE;
 
         // get the word boundaries
-        aBound = pBreakIt->xBreak->getWordBoundary( rText, nBegin,
+        aBound = pBreakIt->GetBreakIter()->getWordBoundary( rText, nBegin,
                 pBreakIt->GetLocale( aCurrLang ), nWordType, sal_True );
 
         //no word boundaries could be found
@@ -795,11 +795,11 @@ BOOL SwScanner::NextWord()
 
         // restrict boundaries to script boundaries and nEndPos
         const USHORT nCurrScript =
-                pBreakIt->xBreak->getScriptType( rText, nBegin );
+                pBreakIt->GetBreakIter()->getScriptType( rText, nBegin );
 
         XubString aTmpWord = rText.Copy( nBegin, static_cast<xub_StrLen>(aBound.endPos - nBegin) );
         const sal_Int32 nScriptEnd = nBegin +
-            pBreakIt->xBreak->endOfScript( aTmpWord, 0, nCurrScript );
+            pBreakIt->GetBreakIter()->endOfScript( aTmpWord, 0, nCurrScript );
         const sal_Int32 nEnd = Min( aBound.endPos, nScriptEnd );
 
         // restrict word start to last script change position
@@ -810,7 +810,7 @@ BOOL SwScanner::NextWord()
             aTmpWord = rText.Copy( static_cast<xub_StrLen>(aBound.startPos),
                                    static_cast<xub_StrLen>(nBegin - aBound.startPos + 1) );
             nScriptBegin = aBound.startPos +
-                pBreakIt->xBreak->beginOfScript( aTmpWord, nBegin - aBound.startPos,
+                pBreakIt->GetBreakIter()->beginOfScript( aTmpWord, nBegin - aBound.startPos,
                                                 nCurrScript );
         }
 
@@ -820,11 +820,11 @@ BOOL SwScanner::NextWord()
     else
     {
         const USHORT nCurrScript =
-                pBreakIt->xBreak->getScriptType( rText, aBound.startPos );
+                pBreakIt->GetBreakIter()->getScriptType( rText, aBound.startPos );
         XubString aTmpWord = rText.Copy( static_cast<xub_StrLen>(aBound.startPos),
                                          static_cast<xub_StrLen>(aBound.endPos - aBound.startPos) );
         const sal_Int32 nScriptEnd = aBound.startPos +
-            pBreakIt->xBreak->endOfScript( aTmpWord, 0, nCurrScript );
+            pBreakIt->GetBreakIter()->endOfScript( aTmpWord, 0, nCurrScript );
         const sal_Int32 nEnd = Min( aBound.endPos, nScriptEnd );
         nBegin = (xub_StrLen)aBound.startPos;
         nLen = (xub_StrLen)(nEnd - nBegin);
@@ -1196,7 +1196,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV
 
             LanguageType eActLang = pNode->GetLang( nBegin );
             Boundary aBound =
-                pBreakIt->xBreak->getWordBoundary( pNode->GetTxt(), nBegin,
+                pBreakIt->GetBreakIter()->getWordBoundary( pNode->GetTxt(), nBegin,
                     pBreakIt->GetLocale( eActLang ),
                     WordType::DICTIONARY_WORD, TRUE );
             nBegin = xub_StrLen(aBound.startPos);
@@ -1352,8 +1352,8 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/
             {
                 const LanguageType aCurrLang = pNode->GetLang( nBegin );
                 const com::sun::star::lang::Locale aCurrLocale = pBreakIt->GetLocale( aCurrLang );
-                nBegin = static_cast< xub_StrLen >(pBreakIt->xBreak->beginOfSentence( rText, nBegin, aCurrLocale ));
-                nEnd = static_cast< xub_StrLen >(Min( rText.getLength(), pBreakIt->xBreak->endOfSentence( rText, nEnd, aCurrLocale ) ));
+                nBegin = static_cast< xub_StrLen >(pBreakIt->GetBreakIter()->beginOfSentence( rText, nBegin, aCurrLocale ));
+                nEnd = static_cast< xub_StrLen >(Min( rText.getLength(), pBreakIt->GetBreakIter()->endOfSentence( rText, nEnd, aCurrLocale ) ));
             }
         }
     }
@@ -1753,7 +1753,7 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
                 const bool bCount = aExpandText.getLength() > 0;
 
                 // count words in 'regular' text:
-                if( bCount && pBreakIt->xBreak.is() )
+                if( bCount && pBreakIt->GetBreakIter().is() )
                 {
                     const String aScannerText( aExpandText );
                     SwScanner aScanner( *this, aScannerText, 0, pConversionMap,
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index 6437d9f60..eed66f34c 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -54,7 +54,7 @@ String STR_SPLITNODE_UNDO
 };
 String STR_MOVE_UNDO
 {
-    Text [ en-US ] = "Move: $1" ;
+    Text [ en-US ] = "Move" ;
 };
 String STR_INSATTR_UNDO
 {
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index ca2706201..519f70d0e 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unobkm.cxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.16 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -47,6 +47,7 @@
 #endif
 #include <undobj.hxx>
 
+using namespace ::sw::mark;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -338,66 +339,85 @@ SwXFieldmark::SwXFieldmark(bool _isReplacementObject, ::sw::mark::IMark* pBkm, S
     , isReplacementObject(_isReplacementObject)
 { }
 
-void SwXFieldmark::attachToRange(const uno::Reference< text::XTextRange > & xTextRange)
+void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTextRange ) 
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
-    attachToRangeEx(xTextRange, (isReplacementObject?IDocumentMarkAccess::CHECKBOX_FIELDMARK:IDocumentMarkAccess::TEXT_FIELDMARK));
+    attachToRangeEx( xTextRange,
+                     ( isReplacementObject ? IDocumentMarkAccess::CHECKBOX_FIELDMARK : IDocumentMarkAccess::TEXT_FIELDMARK ) );
 }
 
-::rtl::OUString SwXFieldmark::getDescription(void) throw( ::com::sun::star::uno::RuntimeException )
+::rtl::OUString SwXFieldmark::getFieldType( void ) 
+    throw( ::com::sun::star::uno::RuntimeException )
 {
-    vos::OGuard aGuard(Application::GetSolarMutex());
-//        TODO implement...
-//        if(!GetBookmark())
-    ::sw::mark::IFieldmark const * const pMark =
-        dynamic_cast< ::sw::mark::IFieldmark const * const>(GetBookmark());
-    if(!pMark)
-        throw uno::RuntimeException();
-    return pMark->GetFieldHelptext();
+    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
+    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
+    IFieldmark *pBkm = dynamic_cast< IFieldmark* > ( pMark );
+    if ( pBkm )
+        return pBkm->GetFieldname( );
+    else
+        throw uno::RuntimeException(  );
 }
 
-::sal_Int16 SAL_CALL SwXFieldmark::getType() throw (::com::sun::star::uno::RuntimeException)
+void SwXFieldmark::setFieldType( const::rtl::OUString & fieldType ) 
+    throw( ::com::sun::star::uno::RuntimeException )
 {
-    vos::OGuard aGuard(Application::GetSolarMutex());
-    ::sw::mark::ICheckboxFieldmark const * const pAsCheckbox =
-        dynamic_cast< ::sw::mark::ICheckboxFieldmark const * const>(GetBookmark());
-    if(pAsCheckbox)
-        return 1;
-    return 0;
+    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
+    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
+    IFieldmark *pBkm = dynamic_cast< IFieldmark* >( pMark );
+    if ( pBkm )
+        pBkm->SetFieldname( fieldType );
+    else
+        throw uno::RuntimeException(  );
 }
 
-::sal_Int16 SAL_CALL SwXFieldmark::getRes() throw (::com::sun::star::uno::RuntimeException)
+sal_Int16 SwXFieldmark::getParamCount(  )
+    throw( ::com::sun::star::uno::RuntimeException )
 {
-    vos::OGuard aGuard(Application::GetSolarMutex());
-    ::sw::mark::ICheckboxFieldmark const * const pAsCheckbox =
-        dynamic_cast< ::sw::mark::ICheckboxFieldmark const * const>(GetBookmark());
-    if(pAsCheckbox && pAsCheckbox->IsChecked())
-        return 1;
-    return 0;
+    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
+    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
+    IFieldmark *pBkm = dynamic_cast< IFieldmark* >( pMark );
+    if ( pBkm )
+        return pBkm->getNumOfParams(  );
+    else
+        throw uno::RuntimeException(  );
 }
 
-//FIXME Remove Method
-void SAL_CALL SwXFieldmark::setType( ::sal_Int16 ) throw (::com::sun::star::uno::RuntimeException)
+rtl::OUString SwXFieldmark::getParamName( sal_Int16 i ) 
+    throw( ::com::sun::star::uno::RuntimeException )
 {
-    vos::OGuard aGuard(Application::GetSolarMutex());
-    throw uno::RuntimeException();
+    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
+    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
+    IFieldmark *pBkm = dynamic_cast< IFieldmark* >( pMark );
+    if ( pBkm )
+        return pBkm->getParam( i ).first;
+    else
+        throw uno::RuntimeException(  );
 }
 
-//FIXME Remove Method
-void SAL_CALL SwXFieldmark::setRes( ::sal_Int16  ) throw (::com::sun::star::uno::RuntimeException)
+::rtl::OUString SwXFieldmark::getParamValue( ::sal_Int16 i ) 
+    throw( ::com::sun::star::uno::RuntimeException )
 {
-    vos::OGuard aGuard(Application::GetSolarMutex());
-    throw uno::RuntimeException();
+    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
+    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
+    IFieldmark *pBkm = dynamic_cast< IFieldmark* >( pMark );
+    if ( pBkm )
+        return pBkm->getParam( i ).second;
+    else
+        throw uno::RuntimeException(  );
 }
 
-void SAL_CALL SwXFieldmark::setDescription( const ::rtl::OUString& description )
-    throw (::com::sun::star::uno::RuntimeException)
+void SwXFieldmark::addParam( const ::rtl::OUString & name,
+                             const ::rtl::OUString & value,
+                             sal_Bool replaceExisting ) 
+    throw( ::com::sun::star::uno::RuntimeException )
 {
-    vos::OGuard aGuard(Application::GetSolarMutex());
-    const ::sw::mark::IFieldmark* pMark =
-        dynamic_cast<const ::sw::mark::IFieldmark*>(GetBookmark());
-    if(pMark)
-        const_cast< ::sw::mark::IFieldmark*>(pMark)->SetFieldHelptext(description);
+    vos::OGuard aGuard( Application::GetSolarMutex(  ) );
+    IMark* pMark = const_cast< IMark* >( GetBookmark( ) );
+    IFieldmark *pBkm = dynamic_cast< IFieldmark* >( pMark );
+    if ( pBkm )
+        pBkm->addParam( const_cast< rtl::OUString& >( name ), 
+                const_cast< rtl::OUString& >( value ), 
+                replaceExisting );
     else
-        throw uno::RuntimeException();
+        throw uno::RuntimeException(  );
 }
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 0c8cbca39..111850983 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -701,6 +701,10 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
                 aResult.State  = pPropertyStates[i];
 
                 aResult.Result = beans::TolerantPropertySetResultType::UNKNOWN_FAILURE;
+                //#i104499# ruby portion attributes need special handling: 
+                if( pEntry->nWID == RES_TXTATR_CJK_RUBY &&
+                    ePortionType == PORTION_RUBY_START )
+                        aResult.State = beans::PropertyState_DIRECT_VALUE;
                 if (!bDirectValuesOnly  ||  beans::PropertyState_DIRECT_VALUE == aResult.State)
                 {
                     // get property value
@@ -1096,4 +1100,3 @@ SwXRubyPortion::SwXRubyPortion(const SwUnoCrsr* pPortionCrsr,
 SwXRubyPortion::~SwXRubyPortion()
 {
 }
-
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 08957c109..9c4144dfa 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -44,6 +44,7 @@
 #include <svx/pbinitem.hxx>
 #include <svx/svdview.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <svtools/syslocale.hxx>
 #include <txtfld.hxx>
 #include <fmtfld.hxx>
 #include <fmtfsize.hxx>
@@ -353,7 +354,7 @@ void lcl_FormatPostIt( IDocumentContentOperations* pIDCO, SwPaM& aPam, SwPostItF
     aStr.AppendAscii(sTmp);
     aStr += pField->GetPar1();
     aStr += ' ';
-    aStr += GetAppLocaleData().getDate( pField->GetDate() );
+    aStr += SvtSysLocale().GetLocaleData().getDate( pField->GetDate() );
     pIDCO->Insert( aPam, aStr, true );
 
     pIDCO->SplitNode( *aPam.GetPoint(), false );
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 819fba732..52a15785d 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1801,8 +1801,8 @@ HTMLEndPosLst::HTMLEndPosLst( SwDoc *pD, SwDoc* pTempl,
     xub_StrLen nPos = 0;
     while( nPos < nEndPos )
     {
-        sal_uInt16 nScript = pBreakIt->xBreak->getScriptType( rText, nPos );
-        nPos = (xub_StrLen)pBreakIt->xBreak->endOfScript( rText, nPos, nScript );
+        sal_uInt16 nScript = pBreakIt->GetBreakIter()->getScriptType( rText, nPos );
+        nPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript( rText, nPos, nScript );
         aScriptChgLst.Insert( nPos, aScriptChgLst.Count() );
         aScriptLst.Insert( nScript, aScriptLst.Count() );
     }
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 0d961cf5e..4027ddc7b 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -312,8 +312,8 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
     sal_Bool bNeedsCJKProcessing = sal_False;
     if( sExpand.Len() )
     {
-        sal_uInt16 nScriptType = pBreakIt->xBreak->getScriptType( sExpand, 0 );
-        xub_StrLen nPos = (xub_StrLen)pBreakIt->xBreak->endOfScript( sExpand, 0,
+        sal_uInt16 nScriptType = pBreakIt->GetBreakIter()->getScriptType( sExpand, 0 );
+        xub_StrLen nPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript( sExpand, 0,
                                                           nScriptType );
 
         sal_uInt16 nScript =
@@ -361,10 +361,10 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
         xub_StrLen nPos = 0;
         do
         {
-            sal_uInt16 nScriptType = pBreakIt->xBreak->getScriptType( sExpand, nPos );
+            sal_uInt16 nScriptType = pBreakIt->GetBreakIter()->getScriptType( sExpand, nPos );
             sal_uInt16 nScript =
                 SwHTMLWriter::GetCSS1ScriptForScriptType( nScriptType );
-            xub_StrLen nEndPos = (xub_StrLen)pBreakIt->xBreak->endOfScript(
+            xub_StrLen nEndPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript(
                                     sExpand, nPos, nScriptType );
             if( nScript != CSS1_OUTMODE_ANY_SCRIPT &&
                 /* #108791# */ nScript != rHTMLWrt.nCSS1Script )
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 3bd677638..446ad4769 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2206,9 +2206,9 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum )
                         {
                             const String& rText = pTxtNd->GetTxt();
                             sal_uInt16 nScriptTxt =
-                                pBreakIt->xBreak->getScriptType(
+                                pBreakIt->GetBreakIter()->getScriptType(
                                             rText, pAttr->GetSttCnt() );
-                            xub_StrLen nScriptEnd = (xub_StrLen)pBreakIt->xBreak
+                            xub_StrLen nScriptEnd = (xub_StrLen)pBreakIt->GetBreakIter()
                                     ->endOfScript( rText, nStt, nScriptTxt );
                             while( nScriptEnd < nEndCnt )
                             {
@@ -2228,9 +2228,9 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum )
                                         pNext->InsertPrev( pSetAttr );
                                 }
                                 nStt = nScriptEnd;
-                                nScriptTxt = pBreakIt->xBreak->getScriptType(
+                                nScriptTxt = pBreakIt->GetBreakIter()->getScriptType(
                                                 rText, nStt );
-                                nScriptEnd = (xub_StrLen)pBreakIt->xBreak
+                                nScriptEnd = (xub_StrLen)pBreakIt->GetBreakIter()
                                     ->endOfScript( rText, nStt, nScriptTxt );
                             }
                             bInsert = nScriptItem == nScriptTxt;
@@ -3023,9 +3023,9 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
                                             .GetTxtNode();
         ASSERT( pTxtNd, "No text node" );
         const String& rText = pTxtNd->GetTxt();
-        sal_uInt16 nScriptTxt = pBreakIt->xBreak->getScriptType(
+        sal_uInt16 nScriptTxt = pBreakIt->GetBreakIter()->getScriptType(
                         rText, pAttr->GetSttCnt() );
-        xub_StrLen nScriptEnd = (xub_StrLen)pBreakIt->xBreak
+        xub_StrLen nScriptEnd = (xub_StrLen)pBreakIt->GetBreakIter()
                     ->endOfScript( rText, pAttr->GetSttCnt(), nScriptTxt );
         while( nScriptEnd < nEndCnt )
         {
@@ -3043,9 +3043,9 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
                 }
             }
             pAttr->nSttCntnt = nScriptEnd;
-            nScriptTxt = pBreakIt->xBreak->getScriptType(
+            nScriptTxt = pBreakIt->GetBreakIter()->getScriptType(
                             rText, nScriptEnd );
-            nScriptEnd = (xub_StrLen)pBreakIt->xBreak
+            nScriptEnd = (xub_StrLen)pBreakIt->GetBreakIter()
                     ->endOfScript( rText, nScriptEnd, nScriptTxt );
         }
         bInsert = nScriptItem == nScriptTxt;
diff --git a/sw/source/filter/rtf/rtfatr.cxx b/sw/source/filter/rtf/rtfatr.cxx
index 494b0eba1..d64b58c99 100644
--- a/sw/source/filter/rtf/rtfatr.cxx
+++ b/sw/source/filter/rtf/rtfatr.cxx
@@ -2790,8 +2790,8 @@ static Writer& OutRTF_SwField( Writer& rWrt, const SfxPoolItem& rHt )
             */
             const String& rFldPar1 = pFld->GetPar1();
             USHORT nScript;
-            if( pBreakIt->xBreak.is() )
-                nScript = pBreakIt->xBreak->getScriptType( rFldPar1, 0);
+            if( pBreakIt->GetBreakIter().is() )
+                nScript = pBreakIt->GetBreakIter()->getScriptType( rFldPar1, 0);
             else
                 nScript = i18n::ScriptType::ASIAN;
 
@@ -3110,8 +3110,8 @@ static Writer& OutRTF_SwTxtRuby( Writer& rWrt, const SfxPoolItem& rHt )
         defaulting to asian.
         */
     USHORT nScript;
-    if( pBreakIt->xBreak.is() )
-        nScript = pBreakIt->xBreak->getScriptType( rRuby.GetText(), 0);
+    if( pBreakIt->GetBreakIter().is() )
+        nScript = pBreakIt->GetBreakIter()->getScriptType( rRuby.GetText(), 0);
     else
         nScript = i18n::ScriptType::ASIAN;
 
@@ -3153,8 +3153,8 @@ static Writer& OutRTF_SwTxtRuby( Writer& rWrt, const SfxPoolItem& rHt )
         rWrt.Strm() << "\\\\a" << cDirective;
     rWrt.Strm() << "(\\\\s\\\\up ";
 
-    if( pBreakIt->xBreak.is() )
-        nScript = pBreakIt->xBreak->getScriptType( pNd->GetTxt(),
+    if( pBreakIt->GetBreakIter().is() )
+        nScript = pBreakIt->GetBreakIter()->getScriptType( pNd->GetTxt(),
                                                    *pRubyTxt->GetStart() );
     else
         nScript = i18n::ScriptType::ASIAN;
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index c41818de8..fd5cec123 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -708,8 +708,8 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
                 {
                     //Make a guess at which of asian of western we should be setting
                     USHORT nScript;
-                    if (pBreakIt->xBreak.is())
-                        nScript = pBreakIt->xBreak->getScriptType( aData.sUp, 0);
+                    if (pBreakIt->GetBreakIter().is())
+                        nScript = pBreakIt->GetBreakIter()->getScriptType( aData.sUp, 0);
                     else
                         nScript = i18n::ScriptType::ASIAN;
 
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index e91e2aeb1..8c77c6a3c 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -548,8 +548,8 @@ namespace sw
             using namespace ::com::sun::star::i18n;
 
             sal_uInt16 nScript = i18n::ScriptType::LATIN;
-            if (rTxt.Len() && pBreakIt && pBreakIt->xBreak.is())
-                nScript = pBreakIt->xBreak->getScriptType(rTxt, 0);
+            if (rTxt.Len() && pBreakIt && pBreakIt->GetBreakIter().is())
+                nScript = pBreakIt->GetBreakIter()->getScriptType(rTxt, 0);
 
             rtl_TextEncoding eChrSet = ItemGet<SvxFontItem>(rTxtNd,
                 GetWhichOfScript(RES_CHRATR_FONT, nScript)).GetCharSet();
@@ -635,20 +635,20 @@ namespace sw
 
             using sw::types::writer_cast;
 
-            if (pBreakIt && pBreakIt->xBreak.is())
+            if (pBreakIt && pBreakIt->GetBreakIter().is())
             {
                 xub_StrLen nLen = rTxt.Len();
                 xub_StrLen nPos = 0;
                 while (nPos < nLen)
                 {
-                    sal_Int32 nEnd2 = pBreakIt->xBreak->endOfScript(rTxt, nPos,
+                    sal_Int32 nEnd2 = pBreakIt->GetBreakIter()->endOfScript(rTxt, nPos,
                         nScript);
                     if (nEnd2 < 0)
                         break;
 //                    nPos = writer_cast<xub_StrLen>(nEnd2);
                     nPos = static_cast< xub_StrLen >(nEnd2);
                     aScripts.push_back(ScriptEntry(nPos, nScript));
-                    nScript = pBreakIt->xBreak->getScriptType(rTxt, nPos);
+                    nScript = pBreakIt->GetBreakIter()->getScriptType(rTxt, nPos);
                 }
             }
 
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 70841202e..a23f68f81 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -884,8 +884,8 @@ void WW8_SdrAttrIter::NextPara( USHORT nPar )
     pEditPool = aSet.GetPool();
     eNdChrSet = ItemGet<SvxFontItem>(aSet,EE_CHAR_FONTINFO).GetCharSet();
 
-    if( pBreakIt->xBreak.is() )
-        nScript = pBreakIt->xBreak->getScriptType( pEditObj->GetText(nPara), 0);
+    if( pBreakIt->GetBreakIter().is() )
+        nScript = pBreakIt->GetBreakIter()->getScriptType( pEditObj->GetText(nPara), 0);
     else
         nScript = i18n::ScriptType::LATIN;
 
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 56445694c..fd65fac81 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -110,8 +110,48 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::i18n;
 using namespace sw::util;
 using namespace sw::types;
+using namespace sw::mark;
 using namespace nsFieldFlags;
 
+
+static String lcl_getFieldCode( const IFieldmark* pFieldmark ) {
+    ASSERT(pFieldmark!=NULL, "where is my fieldmark???");
+    if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMTEXT ) ) {
+    	return String::CreateFromAscii(" FORMTEXT ");
+    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMDROPDOWN ) ) {
+	    return String::CreateFromAscii(" FORMDROPDOWN ");
+    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX ) ) {
+    	return String::CreateFromAscii(" FORMCHECKBOX ");
+    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_TOC ) ) {
+	    return String::CreateFromAscii(" TOC ");
+    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_HYPERLINK ) ) {
+    	return String::CreateFromAscii(" HYPERLINK ");
+    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_PAGEREF ) ) {
+	    return String::CreateFromAscii(" PAGEREF ");
+    } else {
+    	return pFieldmark->GetFieldname();
+    }
+}
+
+ww::eField lcl_getFieldId( const IFieldmark* pFieldmark ) {
+    ASSERT(pFieldmark!=NULL, "where is my fieldmark???");
+    if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMTEXT ) ) {
+    	return ww::eFORMTEXT;
+    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMDROPDOWN ) ) {
+	    return ww::eFORMDROPDOWN;
+    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX ) ) {
+    	return ww::eFORMCHECKBOX;
+    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_TOC ) ) {
+	    return ww::eTOC;
+    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_HYPERLINK ) ) {
+    	return ww::eHYPERLINK;
+    } else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_PAGEREF ) ) {
+	    return ww::ePAGEREF;
+    } else {
+    	return ww::eUNKNOWN;
+    }    
+}
+
 /*  */
 
 MSWordAttrIter::MSWordAttrIter( MSWordExportBase& rExport )
@@ -266,19 +306,17 @@ xub_StrLen SwAttrIter::SearchNext( xub_StrLen nStartPos )
 {
     xub_StrLen nPos;
     xub_StrLen nMinPos = STRING_MAXLEN;
+    xub_StrLen i=0;
+
     const String aTxt = rNd.GetTxt();
     xub_StrLen pos = aTxt.Search(CH_TXT_ATR_FIELDSTART, nStartPos);
-    if( pos==STRING_NOTFOUND )
-    {
-        pos = aTxt.Search(CH_TXT_ATR_FIELDEND, nStartPos);
-        if( pos==STRING_NOTFOUND )
-            pos = aTxt.Search(CH_TXT_ATR_FORMELEMENT, nStartPos);
-    }
-    if( pos!=STRING_NOTFOUND )
+	if (pos==STRING_NOTFOUND) 
+		pos=aTxt.Search(CH_TXT_ATR_FIELDEND, nStartPos);
+	if (pos==STRING_NOTFOUND) 
+		pos=aTxt.Search(CH_TXT_ATR_FORMELEMENT, nStartPos);
+	if (pos!=STRING_NOTFOUND)  
         nMinPos=pos;
 
-    xub_StrLen i=0;
-
     // first the redline, then the attributes
     if( pCurRedline )
     {
@@ -670,15 +708,15 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, const SwFmtRuby& rRu
     aStr += String::CreateFromInt32( nJC );
 
     /*
-       MS needs to know the name and size of the font used in the ruby item,
-       but we coud have written it in a mixture of asian and western
-       scripts, and each of these can be a different font and size than the
-       other, so we make a guess based upon the first character of the text,
-       defaulting to asian.
-       */
+     MS needs to know the name and size of the font used in the ruby item,
+     but we coud have written it in a mixture of asian and western
+     scripts, and each of these can be a different font and size than the
+     other, so we make a guess based upon the first character of the text,
+     defaulting to asian.
+     */
     USHORT nRubyScript;
-    if ( pBreakIt->xBreak.is() )
-        nRubyScript = pBreakIt->xBreak->getScriptType( rRuby.GetText(), 0);
+    if( pBreakIt->GetBreakIter().is() )
+        nRubyScript = pBreakIt->GetBreakIter()->getScriptType( rRuby.GetText(), 0);
     else
         nRubyScript = i18n::ScriptType::ASIAN;
 
@@ -726,8 +764,8 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, const SwFmtRuby& rRu
     aStr.APPEND_CONST_ASC( "(\\s\\up " );
 
 
-    if ( pBreakIt->xBreak.is() )
-        nRubyScript = pBreakIt->xBreak->getScriptType( rNode.GetTxt(),
+    if ( pBreakIt->GetBreakIter().is() )
+        nRubyScript = pBreakIt->GetBreakIter()->getScriptType( rNode.GetTxt(),
                 *( pRubyTxt->GetStart() ) );
     else
         nRubyScript = i18n::ScriptType::ASIAN;
@@ -1418,8 +1456,8 @@ String SwAttrIter::GetSnippet(const String &rStr, xub_StrLen nAktPos,
     if (SVX_CASEMAP_TITEL == ((const SvxCaseMapItem&)rItem).GetValue())
     {
         sal_uInt16 nScriptType = i18n::ScriptType::LATIN;
-        if (pBreakIt->xBreak.is())
-            nScriptType = pBreakIt->xBreak->getScriptType(aSnippet, 0);
+        if (pBreakIt->GetBreakIter().is())
+            nScriptType = pBreakIt->GetBreakIter()->getScriptType(aSnippet, 0);
 
         LanguageType nLanguage;
         switch (nScriptType)
@@ -1444,7 +1482,7 @@ String SwAttrIter::GetSnippet(const String &rStr, xub_StrLen nAktPos,
         //If we weren't at the begin of a word undo the case change.
         //not done before doing the casemap because the sequence might start
         //with whitespace
-        if (pBreakIt->xBreak.is() && !pBreakIt->xBreak->isBeginWord(
+        if (pBreakIt->GetBreakIter().is() && !pBreakIt->GetBreakIter()->isBeginWord(
             rStr, nAktPos, pBreakIt->GetLocale(nLanguage),
             i18n::WordType::ANYWORD_IGNOREWHITESPACES ) )
         {
@@ -1704,12 +1742,14 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                 ::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
                 OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
 
-                if ( pFieldmark )
-                    AppendBookmark( pFieldmark->GetName(), true );
-                OutputField( NULL, ww::eFORMTEXT, String::CreateFromAscii( " FORMTEXT " ), WRITEFIELD_START | WRITEFIELD_CMD_START );
-                if ( pFieldmark )
+                if ( pFieldmark->GetFieldname().equalsAscii( ECMA_FORMTEXT ) )
+                    AppendBookmark( pFieldmark->GetName(), false );
+                OutputField( NULL, lcl_getFieldId( pFieldmark ), lcl_getFieldCode( pFieldmark ), WRITEFIELD_START | WRITEFIELD_CMD_START );
+                if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMTEXT ) )
                     WriteFormData( *pFieldmark );
-                OutputField( NULL, ww::eFORMTEXT, String(), WRITEFIELD_CMD_END );
+                else if ( pFieldmark->GetFieldname( ).equalsAscii( ECMA_HYPERLINK ) )
+                    WriteHyperlinkData( *pFieldmark );
+                OutputField( NULL, lcl_getFieldId( pFieldmark ), String(), WRITEFIELD_CMD_END );
             }
             else if ( ch == CH_TXT_ATR_FIELDEND )
             {
@@ -1717,8 +1757,8 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                 ::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
                 OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
 
-                OutputField( NULL, ww::eFORMTEXT, String(), WRITEFIELD_CLOSE );
-                if ( pFieldmark )
+                OutputField( NULL, lcl_getFieldId( pFieldmark ), String(), WRITEFIELD_CLOSE );
+                if ( pFieldmark->GetFieldname().equalsAscii( ECMA_FORMTEXT ) )
                     AppendBookmark( pFieldmark->GetName(), false );
             }
             else if ( ch == CH_TXT_ATR_FORMELEMENT )
@@ -1727,13 +1767,18 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                 ::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
                 OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
 
-                if ( pFieldmark )
-                    AppendBookmark( pFieldmark->GetName(), true );
-                OutputField( NULL, ww::eFORMCHECKBOX, String::CreateFromAscii( " FORMCHECKBOX " ), WRITEFIELD_START | WRITEFIELD_CMD_START );
-                if ( pFieldmark )
+                bool isEcma = pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMDROPDOWN ) || 
+                    pFieldmark->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX );
+
+                if ( isEcma )
+                    AppendBookmark( pFieldmark->GetName(), 0 );
+                OutputField( NULL, lcl_getFieldId( pFieldmark ), 
+                        lcl_getFieldCode( pFieldmark ), 
+                        WRITEFIELD_START | WRITEFIELD_CMD_START );
+                if ( isEcma )
                     WriteFormData( *pFieldmark );
-                OutputField( NULL, ww::eFORMCHECKBOX, String(), WRITEFIELD_CMD_END | WRITEFIELD_CLOSE );
-                if ( pFieldmark )
+                OutputField( NULL, lcl_getFieldId( pFieldmark ), String(), WRITEFIELD_CMD_END | WRITEFIELD_CLOSE );
+                if ( isEcma )
                     AppendBookmark( pFieldmark->GetName(), false );
             }
             nLen -= static_cast< USHORT >( ofs );
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index adbe1db46..42934c8ab 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -105,6 +105,7 @@
 #include "ww8attributeoutput.hxx"
 
 #include <IDocumentMarkAccess.hxx>
+#include <ecmaflds.hxx>
 
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
@@ -3437,11 +3438,20 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
     const ::sw::mark::IFieldmark* pFieldmark = &rFieldmark;
     const ::sw::mark::ICheckboxFieldmark* pAsCheckbox = dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( pFieldmark );
 
+
+    ASSERT(rFieldmark.GetFieldname().equalsAscii( ECMA_FORMTEXT ) || rFieldmark.GetFieldname().equalsAscii( ECMA_FORMDROPDOWN ) || rFieldmark.GetFieldname().equalsAscii( ECMA_FORMCHECKBOX ), "Unknown field type!!!");
+    if ( ! ( rFieldmark.GetFieldname().equalsAscii( ECMA_FORMTEXT ) || 
+                rFieldmark.GetFieldname().equalsAscii( ECMA_FORMDROPDOWN ) ||
+                rFieldmark.GetFieldname().equalsAscii( ECMA_FORMCHECKBOX ) ) )
+        return;
+
     int type = 0; // TextFieldmark
     if ( pAsCheckbox )
         type = 1;
+    if ( rFieldmark.GetFieldname().equalsAscii( ECMA_FORMDROPDOWN ) )
+        type=2;
 
-    const ::rtl::OUString ffname = rFieldmark.GetFieldname(); 
+    const String ffname = rFieldmark.getParam("name").second;
 
     ULONG nDataStt = pDataStrm->Tell();
     pChpPlc->AppendFkpEntry(Strm().Tell());
@@ -3463,14 +3473,27 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
     sal_uInt8 aFldHeader[] = 
     {
         0xFF, 0xFF, 0xFF, 0xFF, // Unicode Marker...
-        0, 0, 0, 0//, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0 //, 0, 0
     };
 
     aFldHeader[4] |= (type & 0x03);
     int ffres = 0; // rFieldmark.GetFFRes();
     if ( pAsCheckbox && pAsCheckbox->IsChecked() )
         ffres = 1;
+    else if ( type == 2 )
+        ffres = rFieldmark.getParam( ECMA_FORMDROPDOWN_RESULT, "0" ).second.toInt32();
     aFldHeader[4] |= ( (ffres<<2) & 0x7C );
+ 
+    std::vector< ::rtl::OUString > aListItems;
+    if (type==2) 
+    {
+        aFldHeader[5] |= 0x80; // ffhaslistbox
+        for ( int i = 0; i < rFieldmark.getNumOfParams() ; i++ ) 
+        {
+            if (rFieldmark.getParam(i).first.compareToAscii(ECMA_FORMDROPDOWN_LISTENTRY)==0)
+                aListItems.push_back(rFieldmark.getParam(i).second);
+        }
+    }
 
     const ::rtl::OUString ffdeftext;
     const ::rtl::OUString ffformat;
@@ -3479,6 +3502,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
     const ::rtl::OUString ffentrymcr;
     const ::rtl::OUString ffexitmcr;
 
+
     const sal_uInt8 aFldData[] =
     {
         0,0,0,0,        // len of struct
@@ -3491,13 +3515,22 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
     };
     int slen = sizeof( aFldData )
         + sizeof( aFldHeader )
-        + 2*ffname.getLength() + 4
+        + 2*ffname.Len() + 4
         + 2*ffdeftext.getLength() + 4
         + 2*ffformat.getLength() + 4
         + 2*ffhelptext.getLength() + 4
         + 2*ffstattext.getLength() + 4
         + 2*ffentrymcr.getLength() + 4
         + 2*ffexitmcr.getLength() + 4;
+    if ( type==2 ) {
+        slen += 2; // for 0xFF, 0xFF
+        slen += 4; // for num of list items
+        const int items = aListItems.size();
+        for( int i = 0; i < items; i++ ) {
+            rtl::OUString item = aListItems[i];
+            slen += 2 * item.getLength() + 2;
+        }
+    }
 #ifdef OSL_BIGENDIAN
     slen = SWAPLONG( slen );
 #endif // OSL_BIGENDIAN
@@ -3508,6 +3541,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
 
     len = sizeof( aFldHeader );
     OSL_ENSURE( len == 8, "SwWW8Writer::WriteFormData(..) - wrong aFldHeader length" );
+
     pDataStrm->Write( aFldHeader, len );
 
     SwWW8Writer::WriteString_xstz( *pDataStrm, ffname, true ); // Form field name
@@ -3522,11 +3556,20 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
     SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffstattext ), true );
     SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffentrymcr ), true );
     SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffexitmcr ), true );
-//    if (type==2) {
-//        // 0xFF, 0xFF
-//        // sal_uInt32 number of strings
-//        // (sal_uInt16 len; sal_uInt16 unicode char[len])*num of strings
-//    }
+    if (type==2) {
+        *pDataStrm<<(sal_uInt16)0xFFFF;
+        const int items=aListItems.size();
+        *pDataStrm<<(sal_uInt32)items;
+        for(int i=0;i<items;i++) {
+            rtl::OUString item=aListItems[i];
+            SwWW8Writer::WriteString_xstz( *pDataStrm, item, false );
+        }
+    }
+}
+
+void WW8Export::WriteHyperlinkData( const sw::mark::IFieldmark& rFieldmark )
+{
+    //@TODO implement me !!!
 }
 
 void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner )
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index a96a2e5e1..1f3e9f247 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -709,6 +709,7 @@ public:
 
     /// Write the data of the form field
     virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) = 0;
+    virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) = 0;
     
     virtual void DoComboBox(const rtl::OUString &rName,
                     const rtl::OUString &rHelp,
@@ -1076,6 +1077,7 @@ public:
 
     /// Write the data of the form field
     virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark );
+    virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark );
 
     /// Fields.
     WW8_WrPlcFld* CurrentFieldPlc() const;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 778436ec7..9c3b76b50 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2383,9 +2383,9 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
             GetExport( ).OutputField( 0, eCode, sStr, WRITEFIELD_START | WRITEFIELD_CMD_START |
                 WRITEFIELD_CMD_END );
         }
-        
-        GetExport( ).bStartTOX = false;
     }
+        
+    GetExport( ).bStartTOX = false;
 }
 
 void AttributeOutputBase::EndTOX( const SwSection& rSect )
@@ -2961,8 +2961,8 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
         font size of that script as our default.
         */
         USHORT nScript;
-        if( pBreakIt->xBreak.is() )
-            nScript = pBreakIt->xBreak->getScriptType( pFld->GetPar1(), 0);
+        if( pBreakIt->GetBreakIter().is() )
+            nScript = pBreakIt->GetBreakIter()->getScriptType( pFld->GetPar1(), 0);
         else
             nScript = i18n::ScriptType::ASIAN;
 
@@ -4543,9 +4543,9 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing )
                     {
                         const SwTxtNode* pNd = (const SwTxtNode*)GetExport().pOutFmtNode;
                         pSet = &pNd->GetSwAttrSet();
-                        if ( pBreakIt->xBreak.is() )
+                        if ( pBreakIt->GetBreakIter().is() )
                         {
-                            nScript = pBreakIt->xBreak->
+                            nScript = pBreakIt->GetBreakIter()->
                                 getScriptType(pNd->GetTxt(), 0);
                         }
                     }
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index aa8369ce0..89fb527d7 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -46,7 +46,7 @@
 #include <unotools/tempfile.hxx>
 #include <svtools/sfxecode.hxx>
 
-#include <svtools/docpasswdrequest.hxx>
+#include <comphelper/docpasswordrequest.hxx>
 #include <hintids.hxx>
 
 #include <svx/tstpitem.hxx>
@@ -730,7 +730,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
             pObj->SetMergedItemSet(aSet);
             pObj->SetModel(pSdrModel);
 
-            if (bVerticalText && dynamic_cast< SdrTextObj* >( pObj ) )				
+            if (bVerticalText && dynamic_cast< SdrTextObj* >( pObj ) )
                 dynamic_cast< SdrTextObj* >( pObj )->SetVerticalWriting(sal_True);
 
             if ( bIsSimpleDrawingTextBox )
@@ -748,7 +748,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
                 }
             }
 
-            if ( ( mnFix16Angle || nTextRotationAngle ) && dynamic_cast< SdrObjCustomShape* >( pObj ) )
+            if ( ( ( rObjData.nSpFlags & SP_FFLIPV ) || mnFix16Angle || nTextRotationAngle ) && dynamic_cast< SdrObjCustomShape* >( pObj ) )
             {
                 SdrObjCustomShape* pCustomShape = dynamic_cast< SdrObjCustomShape* >( pObj );
 
@@ -757,6 +757,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
                 {	// text is already rotated, we have to take back the object rotation if DFF_Prop_RotateText is false
                     fExtraTextRotation = -mnFix16Angle;
                 }
+                if ( rObjData.nSpFlags & SP_FFLIPV )	// sj: in ppt the text is flipped, whereas in word the text
+                {										// remains unchanged, so we have to take back the flipping here
+                    fExtraTextRotation += 18000.0;		// because our core will flip text if the shape is flipped.
+                }
                 fExtraTextRotation += nTextRotationAngle;
                 if ( !::basegfx::fTools::equalZero( fExtraTextRotation ) )
                 {
@@ -1659,7 +1663,6 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) :
     maOldApos.push_back(false);
     maOldApos.swap(pRdr->maApos);
     maOldFieldStack.swap(pRdr->maFieldStack);
-    maFieldCtxStack.swap(pRdr->maNewFieldCtxStack);
 }
 
 void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr )
@@ -1706,7 +1709,6 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr )
         pRdr->pPlcxMan->RestoreAllPLCFx(maPLCFxSave);
     pRdr->maApos.swap(maOldApos);
     pRdr->maFieldStack.swap(maOldFieldStack);
-    pRdr->maNewFieldCtxStack.swap(maFieldCtxStack);
 }
 
 void SwWW8ImplReader::Read_HdFtFtnText( const SwNodeIndex* pSttIdx,
@@ -2381,7 +2383,7 @@ void SwWW8ImplReader::PostProcessAttrs()
  is only in use for 6/7 and for 8+ if we are in 8bit mode then the encoding
  is always 1252.
 
- So a encoding converter that on an undefined character attempts to 
+ So a encoding converter that on an undefined character attempts to
  convert from 1252 on the undefined character
 */
 sal_Size Custom8BitToUnicode(rtl_TextToUnicodeConverter hConverter,
@@ -2762,29 +2764,6 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
         case 0x15:
             if( !bSpec )        // Juristenparagraph
                 cInsert = '\xa7';
-            else
-            {
-                // 0x15 is special --> so it's our field end mark...;
-                // hmmm what about field marks not handled by us??, maybe a problem with nested fields;
-                // probably an area of bugs... [well release quick and release often....]
-                if (!maNewFieldCtxStack.empty() && pPaM!=NULL && pPaM->GetPoint()!=NULL)
-                {
-                    ::boost::scoped_ptr<WW8NewFieldCtx> pFieldCtx(maNewFieldCtxStack.back());
-                    maNewFieldCtxStack.pop_back();
-                    SwPosition aEndPos = *pPaM->GetPoint();
-                    SwPaM aFldPam(pFieldCtx->GetPtNode(), pFieldCtx->GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
-                    IDocumentMarkAccess* const pMarkAccess = rDoc.getIDocumentMarkAccess();
-                    ::sw::mark::IFieldmark* pFieldmark = 
-                        dynamic_cast< ::sw::mark::IFieldmark*>(pMarkAccess->makeMark(
-                            aFldPam,
-                            pFieldCtx->GetBookmarkName(),
-                            IDocumentMarkAccess::TEXT_FIELDMARK));
-                    OSL_ENSURE(pFieldmark!=NULL,
-                        "hmmm; why was the bookmark not created?");
-                    if (pFieldmark)
-                        pFieldCtx->SetCurrentFieldParamsTo(pFieldmark);
-                }
-            }
             break;
         case 0x9:
             cInsert = '\x9';    // Tab
@@ -3595,7 +3574,14 @@ void wwSectionManager::InsertSegments()
 
         bool bInsertSection = (aIter != aStart) ? (aIter->IsContinous() &&  bThisAndPreviousAreCompatible): false;
         bool bInsertPageDesc = !bInsertSection;
-        bool bProtected = !bUseEnhFields && SectionIsProtected(*aIter); // do we really  need this ?? I guess I have a different logic in editshell which disales this...
+        bool bProtected = SectionIsProtected(*aIter); // do we really  need this ?? I guess I have a different logic in editshell which disales this...
+	if (bUseEnhFields && mrReader.pWDop->fProtEnabled && aIter->IsNotProtected()) {
+	    // here we have the special case that the whole document is protected, with the execption of this section.
+	    // I want to address this when I do the section rework, so for the moment we disable the overall protection then...
+	    mrReader.rDoc.set(IDocumentSettingAccess::PROTECT_FORM, false );
+	}
+
+
         if (bInsertPageDesc)
         {
             /*
@@ -4362,7 +4348,7 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
             eMode |= nsRedlineMode_t::REDLINE_ON;
         if( pWDop->fRMView )
             eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE;
-    }
+            }
 
     maInsertedTables.DelAndMakeTblFrms();
     maSectionManager.InsertSegments();
@@ -4522,8 +4508,8 @@ namespace
                 uno::Reference< task::XInteractionHandler > xHandler( rMedium.GetInteractionHandler() );
                 if( xHandler.is() )
                 {
-                    RequestDocumentPassword* pRequest = new RequestDocumentPassword(
-                        task::PasswordRequestMode_PASSWORD_ENTER,
+                    ::comphelper::DocPasswordRequest* pRequest = new ::comphelper::DocPasswordRequest(
+                        ::comphelper::DocPasswordRequestType_MS, task::PasswordRequestMode_PASSWORD_ENTER,
                         INetURLObject( rMedium.GetOrigURL() ).GetName( INetURLObject::DECODE_WITH_CHARSET ) );
                     uno::Reference< task::XInteractionRequest > xRequest( pRequest );
 
@@ -4699,7 +4685,7 @@ ULONG SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss)
                         if ( pMedium )
                         {
                             SfxItemSet* pSet = pMedium->GetItemSet();
-                            if ( pSet )								
+                            if ( pSet )
                                 pSet->Put( SfxStringItem(SID_PASSWORD, sUniPassword) );
                         }
                     }
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 525deb739..dfd68428e 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -60,6 +60,8 @@
 #include "ww8glsy.hxx"
 #include "wrtww8.hxx"
 #include "../inc/msfilter.hxx"
+#include <ecmaflds.hxx>
+#include <IMark.hxx>
 
 class SwDoc;
 class SwPaM;
@@ -362,6 +364,8 @@ namespace sw
             Position(const SwPosition &rPos);
             Position(const Position &rPos);
             operator SwPosition() const;
+	    SwNodeIndex GetPtNode() { return maPtNode; };
+	    xub_StrLen GetPtCntnt() { return mnPtCntnt; };        
         };
     }
 }
@@ -369,36 +373,30 @@ namespace sw
 class FieldEntry
 {
 public:
-    sw::hack::Position maStartPos;
-    sal_uInt16 mnFieldId;
-    FieldEntry(SwPosition &rPos, sal_uInt16 nFieldId) throw();
-    FieldEntry(const FieldEntry &rOther) throw();
-    FieldEntry &operator=(const FieldEntry &rOther) throw();
-    void Swap(FieldEntry &rOther) throw();
-};
+ 	typedef ::std::vector<sw::mark::IFieldmark::ParamPair_t> Params_t;
 
-class WW8NewFieldCtx
-{
 private:
-    SwNodeIndex maPtNode;
-    xub_StrLen mnPtCntnt;
     ::rtl::OUString msBookmarkName;
     ::rtl::OUString msMarkType;
-    typedef ::std::pair< ::rtl::OUString, ::rtl::OUString> Param_t;
-    typedef ::std::vector< Param_t > Params_t;
     Params_t maParams;
-  SwPaM * mpPaM;
 
 public:
-    WW8NewFieldCtx(SwPosition &aStartPos, ::rtl::OUString sBookmarkName, ::rtl::OUString sMarkType);
-    ~WW8NewFieldCtx();
+    sw::hack::Position maStartPos;
+    sal_uInt16 mnFieldId;
+    FieldEntry(SwPosition &rPos, sal_uInt16 nFieldId) throw();
+    FieldEntry(const FieldEntry &rOther) throw();
+    FieldEntry &operator=(const FieldEntry &rOther) throw();
+    void Swap(FieldEntry &rOther) throw();
+
+    SwNodeIndex GetPtNode() { return maStartPos.GetPtNode(); };
+    xub_StrLen GetPtCntnt() { return maStartPos.GetPtCntnt(); };
 
-    SwNodeIndex GetPtNode() { return maPtNode; };
-    xub_StrLen GetPtCntnt() { return mnPtCntnt; };
     ::rtl::OUString GetBookmarkName();
-    ::rtl::OUString GetMarkType();
+    ::rtl::OUString GetBookmarkType();
+    void SetBookmarkName(::rtl::OUString bookmarkName);
+    void SetBookmarkType(::rtl::OUString bookmarkType);
     void AddParam(::rtl::OUString name, ::rtl::OUString value);
-    void SetCurrentFieldParamsTo(::sw::mark::IFieldmark* pFieldmark);
+    Params_t &getParams();
 };
 
 
@@ -434,7 +432,6 @@ private:
     bool mbWasParaEnd;
     bool mbHasBorder;
     bool mbFirstPara;
-    std::deque<WW8NewFieldCtx *> maFieldCtxStack;
 public:
     WW8ReaderSave(SwWW8ImplReader* pRdr, WW8_CP nStart=-1);
     void Restore(SwWW8ImplReader* pRdr);
@@ -889,9 +886,6 @@ private:
     std::deque<FieldEntry> maFieldStack;
     typedef std::deque<FieldEntry>::const_iterator mycFieldIter;
 
-    typedef std::deque<WW8NewFieldCtx *> WW8NewFieldCtxStack_t;
-    WW8NewFieldCtxStack_t maNewFieldCtxStack;
-
     /*
     A stack of open footnotes. Should only be one in it at any time.
     */
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 7b9945a5d..bc24b7379 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -96,66 +96,14 @@
 
 #include <IMark.hxx>
 #include <svtools/fltrcfg.hxx>
+#include <ecmaflds.hxx>
 
 #include <stdio.h>
 
 using namespace com::sun::star;
 using namespace sw::util;
 using namespace sw::types;
-
-WW8NewFieldCtx::WW8NewFieldCtx(SwPosition &aStartPos, ::rtl::OUString sBookmarkName, ::rtl::OUString sMarkType)
-    : maPtNode(aStartPos.nNode)
-    , mnPtCntnt(aStartPos.nContent.GetIndex())
-    , msBookmarkName(sBookmarkName)
-    , msMarkType(sMarkType)
-    , mpPaM(NULL)
-{
-}
-
-
-WW8NewFieldCtx::~WW8NewFieldCtx()
-{
-    if (mpPaM) delete mpPaM;
-}
-
-::rtl::OUString WW8NewFieldCtx::GetBookmarkName()
-{
-    return msBookmarkName;
-}
-
-::rtl::OUString WW8NewFieldCtx::GetMarkType()
-{
-    return msMarkType;
-}
-
-void WW8NewFieldCtx::AddParam(::rtl::OUString name, ::rtl::OUString value)
-{
-    maParams.push_back( Param_t(name, value) );
-}
-
-void WW8NewFieldCtx::SetCurrentFieldParamsTo(::sw::mark::IFieldmark* pFieldmark)
-{
-    for(Params_t::iterator i=maParams.begin();i!=maParams.end();i++)
-    {
-        ::rtl::OUString aName=i->first;
-        ::rtl::OUString aValue=i->second;
-        if(aName.compareToAscii("Description")==0)
-        {
-            pFieldmark->SetFieldHelptext(aValue);
-        }
-        else if(aName.compareToAscii("Name")==0)
-        {
-            pFieldmark->SetFieldname(aValue);
-        }
-        else if(aName.compareToAscii("Result")==0)
-        {
-            ::sw::mark::ICheckboxFieldmark* pAsCheckbox =
-                dynamic_cast< ::sw::mark::ICheckboxFieldmark* >(pFieldmark);
-            if(pAsCheckbox)
-                pAsCheckbox->SetChecked(aValue.toInt32()==0);
-        }
-    }
-}
+using namespace sw::mark;
 
 //-----------------------------------------
 //            UNO-Controls
@@ -233,10 +181,10 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr )
 
 
     if (aBookmarkName.Len()>0) {
-        WW8NewFieldCtx *pFieldCtx=new WW8NewFieldCtx(*pPaM->GetPoint(), aBookmarkName, ::rtl::OUString::createFromAscii("ecma.office-open-xml.field.FORMTEXT"));
-        maNewFieldCtxStack.push_back(pFieldCtx);
-        pFieldCtx->AddParam(::rtl::OUString::createFromAscii("Description"), aFormula.sToolTip);
-        pFieldCtx->AddParam(::rtl::OUString::createFromAscii("Name"), aFormula.sTitle);
+	    maFieldStack.back().SetBookmarkName(aBookmarkName);
+	    maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ECMA_FORMTEXT));
+	    maFieldStack.back().AddParam(::rtl::OUString::createFromAscii("Description"), aFormula.sToolTip);
+	    maFieldStack.back().AddParam(::rtl::OUString::createFromAscii("Name"), aFormula.sTitle);
     }
     return FLD_TEXT;
     }
@@ -279,19 +227,22 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, String& rStr )
         aBookmarkName=pB->GetUniqueBookmarkName(aFormula.sTitle);
     }
 
-    if (aBookmarkName.Len()>0) {
-        ::sw::mark::ICheckboxFieldmark* pFieldmark = 
-            dynamic_cast< ::sw::mark::ICheckboxFieldmark*>(rDoc.getIDocumentMarkAccess()->makeMark(
-                *pPaM,
-                aBookmarkName,
-                IDocumentMarkAccess::CHECKBOX_FIELDMARK));
-        OSL_ENSURE(pFieldmark,
-            "hmmm; why was the bookmark not created?");
-        if(pFieldmark)
-        {
-            pFieldmark->SetFieldname(aFormula.sTitle);
-            pFieldmark->SetFieldHelptext(aFormula.sToolTip);
-            pFieldmark->SetChecked(aFormula.nChecked!=0);
+    if (aBookmarkName.Len()>0) 
+    {
+        IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
+        IFieldmark* pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeNoTextFieldBookmark(
+                *pPaM, aBookmarkName, 
+                rtl::OUString::createFromAscii( ECMA_FORMCHECKBOX ) ) );
+        ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
+        if (pFieldmark!=NULL) {
+            pFieldmark->addParam(
+                    rtl::OUString::createFromAscii(ECMA_FORMCHECKBOX_NAME), 
+                    rtl::OUString( aFormula.sTitle ) );
+            pFieldmark->addParam(
+                    rtl::OUString::createFromAscii(ECMA_FORMCHECKBOX_HELPTEXT),                     aFormula.sToolTip);
+            pFieldmark->addParam(
+                    rtl::OUString::createFromAscii(ECMA_FORMCHECKBOX_CHECKED), 
+                    ::rtl::OUString::createFromAscii(aFormula.nChecked!=0?"on":"off"));
             // set field data here...
         }
     }
@@ -306,24 +257,73 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr)
     if (0x01 == rStr.GetChar(writer_cast<xub_StrLen>(pF->nLCode-1)))
         ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_DROPDOWN);
 
-    SwDropDownField aFld(
-        (SwDropDownFieldType*)rDoc.GetSysFldType(RES_DROPDOWN));
-
-    aFld.SetName(aFormula.sTitle);
-    aFld.SetHelp(aFormula.sHelp);
-    aFld.SetToolTip(aFormula.sToolTip);
+    const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
+    sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
 
-    if (!aFormula.maListEntries.empty())
+    if (!bUseEnhFields) {
+	SwDropDownField aFld(
+	    (SwDropDownFieldType*)rDoc.GetSysFldType(RES_DROPDOWN));
+
+	aFld.SetName(aFormula.sTitle);
+	aFld.SetHelp(aFormula.sHelp);
+	aFld.SetToolTip(aFormula.sToolTip);
+	
+	if (!aFormula.maListEntries.empty())
+	{
+	    aFld.SetItems(aFormula.maListEntries);
+	    int nIndex = aFormula.fDropdownIndex  < aFormula.maListEntries.size()
+		? aFormula.fDropdownIndex : 0;
+	    aFld.SetSelectedItem(aFormula.maListEntries[nIndex]);
+	}
+	
+	rDoc.Insert(*pPaM, SwFmtFld(aFld), 0);
+	return FLD_OK;
+    } else {
+	//@TODO fix: copy pasting here!!!!!!!!!!!!!!
+	//REVIEW: don't let this throught.... sometime I forget to get rid of my proof of concept stuff. Please kindly remind me!!!!!
+
+	String aBookmarkName;
+	WW8PLCFx_Book* pB = pPlcxMan->GetBook();
+	if (pB!=NULL) {
+		WW8_CP currentCP=pF->nSCode;
+		WW8_CP currentLen=pF->nLen;
+
+		USHORT bkmFindIdx;
+		String aBookmarkFind=pB->GetBookmark(currentCP-1, currentCP+currentLen-1, bkmFindIdx);
+
+		if (aBookmarkFind.Len()>0) { 
+			pB->SetStatus(bkmFindIdx, BOOK_FIELD); // mark as consumed by field
+			if (aBookmarkFind.Len()>0) {
+				aBookmarkName=aBookmarkFind;
+			}
+		}
+	}
+
+	if (pB!=NULL && aBookmarkName.Len()==0) {
+		aBookmarkName=pB->GetUniqueBookmarkName(aFormula.sTitle);
+	}
+
+	if (aBookmarkName.Len()>0) 
     {
-        aFld.SetItems(aFormula.maListEntries);
-        int nIndex = aFormula.fDropdownIndex  < aFormula.maListEntries.size()
-            ? aFormula.fDropdownIndex : 0;
-        aFld.SetSelectedItem(aFormula.maListEntries[nIndex]);
-    }
+        IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
+	    IFieldmark *pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeNoTextFieldBookmark(
+                    *pPaM, aBookmarkName, ::rtl::OUString::createFromAscii( ECMA_FORMDROPDOWN ) ) );
+	    ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
+	    if ( pFieldmark != NULL ) {
+    		rtl::OUString sListEntry=rtl::OUString::createFromAscii( ECMA_FORMDROPDOWN_LISTENTRY );
+	    	std::vector<String>::iterator it = aFormula.maListEntries.begin();
+		    for( ; it != aFormula.maListEntries.end(); it++ )
+		        pFieldmark->addParam(sListEntry, *it, false);
 
-    rDoc.Insert(*pPaM, SwFmtFld(aFld), 0);
+	    	int nIndex = aFormula.fDropdownIndex  < aFormula.maListEntries.size() ? aFormula.fDropdownIndex : 0;
+		    pFieldmark->addParam(ECMA_FORMDROPDOWN_RESULT, nIndex);
+    		// set field data here...
+	    }
+	}
+
+	return FLD_OK;
+    }
 
-    return FLD_OK;
 }
 
 eF_ResT SwWW8ImplReader::Read_F_HTMLControl( WW8FieldDesc* pF, String& rStr)
@@ -2148,11 +2148,18 @@ bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula,
 
     if((aPic.lcb > 0x3A) && !pDataStream->GetError() )
     {
-        pDataStream->Seek( nPicLocFc + aPic.cbHeader );
+#if 0 // some debug fun; remove this later...
         int len=aPic.lcb-aPic.cbHeader;
         char *pBuf=(char*)malloc(len);
         pDataStream->Read( pBuf, len);
+	static int _h=0;
+	char fname[255];
+	sprintf(fname, "data%03i.data", _h++);
+	FILE *out=fopen(fname, "wb");
+	fwrite(pBuf, len, 1, out);
+	fclose(out);
         pDataStream->Seek( nPicLocFc + aPic.cbHeader );
+#endif
         aFormula.FormulaRead(nWhich,pDataStream);
         bRet = true;
     }
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index ac068ae19..95cafa07e 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -89,22 +89,26 @@
 #include <fmtclds.hxx>
 #include <pagedesc.hxx>
 #include <SwStyleNameMapper.hxx>
-
+#include <IMark.hxx>
 
 #include "ww8scan.hxx"          // WW8FieldDesc
 #include "ww8par.hxx"
 #include "ww8par2.hxx"
 #include "writerhelper.hxx"
 #include "fields.hxx"
+#include <svtools/fltrcfg.hxx>
 
 #include <algorithm> // #i24377#
 
+//#define WW_NATIVE_TOC 0
+
 #define MAX_FIELDLEN 64000
 
 #define WW8_TOX_LEVEL_DELIM     ':'
 
 using namespace ::com::sun::star;
 using namespace sw::util;
+using namespace sw::mark;
 using namespace std; // #i24377#
 using namespace nsSwDocInfoSubType;
 
@@ -329,9 +333,11 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
 
     //"_Toc*" and "_Hlt*" are unnecessary
     const String* pName = pB->GetName();
+#if !defined(WW_NATIVE_TOC)
     if(    !pName || pName->EqualsIgnoreCaseAscii( "_Toc", 0, 4 )
         || pName->EqualsIgnoreCaseAscii( "_Hlt", 0, 4 ) )
         return 0;
+#endif 
 
     //JP 16.11.98: ToUpper darf auf keinen Fall gemacht werden, weil der
     //Bookmark- name ein Hyperlink-Ziel sein kann!
@@ -673,6 +679,9 @@ sal_uInt16 SwWW8ImplReader::End_Field()
     if (!pF || !pF->EndPosIsFieldEnd())
         return nRet;
 
+    const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
+    sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
+
     ASSERT(!maFieldStack.empty(), "Empty field stack\n");
     if (!maFieldStack.empty())
     {
@@ -684,9 +693,40 @@ sal_uInt16 SwWW8ImplReader::End_Field()
         nRet = maFieldStack.back().mnFieldId;
         switch (nRet)
         {
+	    case 70:
+		if (bUseEnhFields && pPaM!=NULL && pPaM->GetPoint()!=NULL) {
+		    SwPosition aEndPos = *pPaM->GetPoint();
+		    SwPaM aFldPam( maFieldStack.back().GetPtNode(), maFieldStack.back().GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
+            IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
+            IFieldmark *pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeFieldBookmark(
+                        aFldPam, maFieldStack.back().GetBookmarkName(), ::rtl::OUString::createFromAscii(ECMA_FORMTEXT ) ) );
+		    ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
+		    if (pFieldmark!=NULL) {
+			pFieldmark->addParams(maFieldStack.back().getParams());
+		    }
+		}
+		break;
+#if defined(WW_NATIVE_TOC)
+	    case 8: // TOX_INDEX
+	    case 13: // TOX_CONTENT
+	    case 88: // HYPERLINK
+	    case 37: // REF
+		if (pPaM!=NULL && pPaM->GetPoint()!=NULL) {
+		    
+		    SwPosition aEndPos = *pPaM->GetPoint();
+		    SwPaM aFldPam( maFieldStack.back().GetPtNode(), maFieldStack.back().GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
+		    SwFieldBookmark *pFieldmark=(SwFieldBookmark*)rDoc.makeFieldBookmark(aFldPam, maFieldStack.back().GetBookmarkName(), maFieldStack.back().GetBookmarkType());
+		    ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
+		    if (pFieldmark!=NULL) {
+			pFieldmark->addParams(maFieldStack.back().getParams());
+		    }
+		}
+		break;	  
+#else     
             case 88:
                 pCtrlStck->SetAttr(*pPaM->GetPoint(),RES_TXTATR_INETFMT);
             break;
+#endif
             case 36:
             case 68:
                 //Move outside the section associated with this type of field
@@ -704,6 +744,10 @@ bool AcceptableNestedField(sal_uInt16 nFieldCode)
 {
     switch (nFieldCode)
     {
+#if defined(WW_NATIVE_TOC)
+	case 8:  // allow recursive field in TOC...
+	case 13: // allow recursive field in TOC...
+#endif
         case 36:
         case 68:
         case 79:
@@ -742,6 +786,36 @@ FieldEntry &FieldEntry::operator=(const FieldEntry &rOther) throw()
     return *this;
 }
 
+::rtl::OUString FieldEntry::GetBookmarkName()
+{
+	return msBookmarkName;
+}
+
+::rtl::OUString FieldEntry::GetBookmarkType()
+{
+	return msMarkType;
+}
+
+void FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName) 
+{
+    msBookmarkName=bookmarkName;
+}
+
+void FieldEntry::SetBookmarkType(::rtl::OUString bookmarkType)
+{
+    msMarkType=bookmarkType;
+}
+
+void FieldEntry::AddParam(::rtl::OUString name, ::rtl::OUString value)
+{
+    maParams.push_back( IFieldmark::ParamPair_t( name, value ) );
+}
+
+FieldEntry::Params_t &FieldEntry::getParams() {
+    return maParams;
+}
+
+
 // Read_Field liest ein Feld ein oder, wenn es nicht gelesen werden kann,
 // wird 0 zurueckgegeben, so dass das Feld vom Aufrufer textuell gelesen wird.
 // Returnwert: Gesamtlaenge des Feldes ( zum UEberlesen )
@@ -2069,6 +2143,17 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, String& rStr )
 
     String sName(GetMappedBookmark(sOrigName));
 
+#if defined(WW_NATIVE_TOC)
+    if (1) {
+	::rtl::OUString aBookmarkName=::rtl::OUString::createFromAscii("_REF");
+	maFieldStack.back().SetBookmarkName(aBookmarkName);
+	maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ECMA_PAGEREF));
+	maFieldStack.back().AddParam(rtl::OUString(), sName);
+	return FLD_TEXT;
+    }
+#endif
+
+
     SwGetRefField aFld(
         (SwGetRefFieldType*)rDoc.GetSysFldType( RES_GETREFFLD ), sName,
         REF_BOOKMARK, 0, REF_PAGE );
@@ -2524,8 +2609,8 @@ void SwWW8ImplReader::Read_SubF_Ruby( _ReadFieldParams& rReadParam)
         const SwCharFmt *pCharFmt=0;
         //Make a guess at which of asian of western we should be setting
         USHORT nScript;
-        if (pBreakIt->xBreak.is())
-            nScript = pBreakIt->xBreak->getScriptType(sRuby, 0);
+        if (pBreakIt->GetBreakIter().is())
+            nScript = pBreakIt->GetBreakIter()->getScriptType(sRuby, 0);
         else
             nScript = i18n::ScriptType::ASIAN;
 
@@ -2767,6 +2852,16 @@ USHORT lcl_GetMaxValidWordTOCLevel(const SwForm &rForm)
 
 eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
 {
+#if defined(WW_NATIVE_TOC)
+    if (1) {
+	::rtl::OUString aBookmarkName=::rtl::OUString::createFromAscii("_TOC");
+	maFieldStack.back().SetBookmarkName(aBookmarkName);
+	maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ECMA_TOC));
+//     maFieldStack.back().AddParam(::rtl::OUString::createFromAscii("Description"), aFormula.sToolTip);
+	return FLD_TEXT;
+    }
+#endif
+
     if (pF->nLRes < 3)
         return FLD_TEXT;      // ignore (#i25440#)
 
@@ -3285,6 +3380,16 @@ eF_ResT SwWW8ImplReader::Read_F_Shape(WW8FieldDesc* /*pF*/, String& /*rStr*/)
 
 eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr )
 {
+#if defined(WW_NATIVE_TOC)
+    if (1) {
+	::rtl::OUString aBookmarkName=::rtl::OUString::createFromAscii("_HYPERLINK");
+	maFieldStack.back().SetBookmarkName(aBookmarkName);
+	maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ECMA_HYPERLINK));
+//     maFieldStack.back().AddParam(::rtl::OUString::createFromAscii("Description"), aFormula.sToolTip);
+	return FLD_TEXT;
+    }
+#endif
+
     String sURL, sTarget, sMark;
     bool bDataImport = false;
     //HYPERLINk "filename" [switches]
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 22581ea30..e6b047af4 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -15,6 +15,9 @@
 #include <map>
 using namespace com::sun::star;
 
+// no. of visual data elements in a CTB ( fixed ) 
+const short nVisualData = 5;
+
 typedef std::map< sal_Int16, rtl::OUString > IdToString;
 
 class MSOWordCommandConvertor : public MSOCommandConvertor
@@ -81,6 +84,20 @@ Customization* CTBWrapper::GetCustomizaton( sal_Int16 index )
     return &rCustomizations[ index ]; 
 }
 
+CTB* CTBWrapper::GetCustomizationData( const rtl::OUString& sTBName )
+{
+    CTB* pCTB = NULL;
+    for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it )
+    {
+        if ( it->GetCustomizationData() && it->GetCustomizationData()->GetName().equals( sTBName ) )
+        {
+            pCTB = it->GetCustomizationData();
+            break;
+        }
+    }
+    return pCTB;
+}
+
 bool CTBWrapper::Read( SvStream* pS )
 {
     OSL_TRACE("CTBWrapper::Read() stream pos 0x%x", pS->Tell() );
@@ -178,14 +195,14 @@ void CTBWrapper::Print( FILE* fp )
 
 bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh )
 {
-    
     for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it )
     {
         uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
         uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xAppCfgSupp( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) ) ), uno::UNO_QUERY_THROW ); 
         CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) );
-        helper.setMSOCommandMap( new  MSOWordCommandConvertor() );
-        if ( !(*it).ImportCustomToolBar( helper ) )
+        helper.setMSOCommandMap( new MSOWordCommandConvertor() );
+
+        if ( !(*it).ImportCustomToolBar( *this, helper ) )
             return false;
     }
     return false;
@@ -263,17 +280,8 @@ void Customization::Print( FILE* fp )
     
 }
 
-bool Customization::ImportMenu( const uno::Reference< container::XIndexContainer >& xIndexContainer, CustomToolBarImportHelper& helper )
+bool Customization::ImportMenu( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper )
 {
-    if ( !customizationDataCTB.get() )
-        return false;
-    return customizationDataCTB->ImportMenu( xIndexContainer, helper );
-}
-
-bool Customization::ImportCustomToolBar( CustomToolBarImportHelper& helper )
-{
-    if ( bIsDroppedMenuTB )
-        return true; // ignore ( will be processed by the ImportMenu )
     if ( tbidForTBD == 0x25 )  // we can handle in a limited way additions the built-in menu bar
     {
         for ( std::vector< TBDelta >::iterator it = customizationDataTBDelta.begin(); it != customizationDataTBDelta.end(); ++it )
@@ -287,8 +295,6 @@ bool Customization::ImportCustomToolBar( CustomToolBarImportHelper& helper )
                 {
                     // currently only support built-in menu
                     rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") );
-                    if ( tbidForTBD != 0x25 )
-                        return false;
 
                     sMenuBar = sMenuBar.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("menubar") ) );
                     // Get menu name
@@ -329,7 +335,7 @@ bool Customization::ImportCustomToolBar( CustomToolBarImportHelper& helper )
                     aPopupMenu[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") );
                     uno::Reference< container::XIndexContainer > xMenuContainer( xSCF->createInstanceWithContext( xContext ), uno::UNO_QUERY_THROW );
                     aPopupMenu[3].Value <<= xMenuContainer;
-                    if ( !pCust->ImportMenu( xMenuContainer, helper ) )
+                    if ( pCust->customizationDataCTB.get() && !pCust->customizationDataCTB->ImportMenuTB( rWrapper, xMenuContainer, helper ) )
                         return false;
                     OSL_TRACE("** there are %d menu items on the bar, inserting after that", xIndexContainer->getCount() );
                     xIndexContainer->insertByIndex( xIndexContainer->getCount(), uno::makeAny( aPopupMenu ) );
@@ -338,14 +344,28 @@ bool Customization::ImportCustomToolBar( CustomToolBarImportHelper& helper )
                         helper.getCfgManager()->replaceSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xIndexContainer, uno::UNO_QUERY_THROW ) );
                     else
                         helper.getCfgManager()->insertSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xIndexContainer, uno::UNO_QUERY_THROW ) );
+        uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager(), uno::UNO_QUERY_THROW );
+        xPersistence->store();
                 }
             }
         }
         return true;
     }
+    return true;
+}
+
+bool Customization::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper )
+{
+    if ( GetTBIDForTB() == 0x25 )
+        return ImportMenu( rWrapper, helper );
     if ( !customizationDataCTB.get() )
         return false;
-    return customizationDataCTB->ImportCustomToolBar( helper );
+    if ( !customizationDataCTB->IsMenuToolbar() )
+    {
+        if ( !customizationDataCTB->ImportCustomToolBar( rWrapper, helper ) )
+            return false;
+    }
+    return true;
 }
 
 TBDelta::TBDelta() : doprfatendFlags(0)
@@ -431,6 +451,12 @@ CTB::~CTB()
 {
 }
 
+bool CTB::IsMenuToolbar()
+{
+    return tb.IsMenuToolbar();
+}
+
+
 bool CTB::Read( SvStream *pS)
 {
     OSL_TRACE("CTB::Read() stream pos 0x%x", pS->Tell() );
@@ -438,10 +464,14 @@ bool CTB::Read( SvStream *pS)
     if ( !name.Read( pS ) )
         return false;
     *pS >> cbTBData;
-    // sal_Int32 nTBSize = cbTBData - sizeof(rVisualData) - 12;
     if ( !tb.Read( pS ) )
         return false;
-    pS->Read( &rVisualData, sizeof( rVisualData ) );
+    for ( short index = 0; index < nVisualData; ++index )
+    {
+        TBVisualData aVisData;
+        aVisData.Read( pS );
+        rVisualData.push_back( aVisData );
+    }
 
     *pS >> iWCTBl >> reserved >> unused >> cCtls;
     
@@ -467,6 +497,12 @@ CTB::Print( FILE* fp )
     indent_printf(fp, "  cbTBData size, in bytes, of this structure excluding the name, cCtls, and rTBC fields.  %x\n", static_cast< unsigned int >( cbTBData ) );
     
     tb.Print(fp);
+    for ( short counter = 0; counter < nVisualData; ++counter )
+    {
+        indent_printf( fp, "  TBVisualData [%d]\n", counter);
+        Indent b;
+        rVisualData[ counter ].Print( fp );
+    } 
     indent_printf(fp, "  iWCTBl 0x%x reserved 0x%x unused 0x%x cCtls( toolbar controls ) 0x%x \n", static_cast< unsigned int >( iWCTBl ), reserved, unused, static_cast< unsigned int >( cCtls ) );
     if ( cCtls )
     {
@@ -479,18 +515,13 @@ CTB::Print( FILE* fp )
     }
 }
 
-bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
+bool CTB::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper )
 {
     static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) );
     bool bRes = false;
     try
     {
-        // #FIXME this is a bogus check ( but is seems to work )
-        // the fNeedsPositioning seems always to be set for toolbars that
-        // have been deleted ( sofar I fail to find something else to indicate
-        // not to read them ) - e.g. We can have CTB records which relate to
-        // deleted items ( usually associated with popups )
-        if ( !tb.IsEnabled() || tb.NeedsPositioning() )
+        if ( !tb.IsEnabled() )
             return true;  // didn't fail, just ignoring
         // Create default setting
         uno::Reference< container::XIndexContainer > xIndexContainer( helper.getCfgManager()->createSettings(), uno::UNO_QUERY_THROW );
@@ -504,7 +535,7 @@ bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
         for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
         {
             // createToolBar item for control
-            if ( !it->ImportToolBarControl( xIndexContainer, helper ) )
+            if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, helper, IsMenuToolbar() ) )
                 return false;
         }
     
@@ -512,27 +543,29 @@ bool CTB::ImportCustomToolBar( CustomToolBarImportHelper& helper )
     
         helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess );
         helper.applyIcons();
-    
+#if 1 // don't think this is necessary
         uno::Reference< ui::XUIConfigurationPersistence > xPersistence( helper.getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
         xPersistence->store();
-    
+
         xPersistence.set( helper.getCfgManager(), uno::UNO_QUERY_THROW );
         xPersistence->store();
+#endif
         bRes = true;
     }
-    catch( uno::Exception& )
+    catch( uno::Exception& e )
     {
+        OSL_TRACE("***** For some reason we have an exception %s", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
         bRes = false;
     }
     return bRes;
 }
 
-bool CTB::ImportMenu( const css::uno::Reference< css::container::XIndexContainer >& xIndexContainer, CustomToolBarImportHelper& rHelper )
+bool CTB::ImportMenuTB( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& xIndexContainer, CustomToolBarImportHelper& rHelper )
 {
     for ( std::vector< TBC >::iterator it =  rTBC.begin(); it != rTBC.end(); ++it )
     {
         // createToolBar item for control
-        if ( !it->ImportToolBarControl( xIndexContainer, rHelper ) )
+        if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, rHelper, true ) )
             return false;
     }
     return true;
@@ -583,7 +616,7 @@ void TBC::Print( FILE* fp )
 }
 
 bool
-TBC::ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper )
+TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar )
 {
     // cmtFci       0x1 Command based on a built-in command. See CidFci.
     // cmtMacro     0x2 Macro command. See CidMacro.
@@ -634,12 +667,35 @@ TBC::ImportToolBarControl( const css::uno::Reference< css::container::XIndexCont
                 aProp.Value <<= sCommand;
                 props.push_back( aProp ); 
             }
-         
         }
         bool bBeginGroup = false;
-        if ( ! tbcd->ImportToolBarControl( toolbarcontainer, helper, props, bBeginGroup ) )
+        if ( ! tbcd->ImportToolBarControl( helper, props, bBeginGroup, bIsMenuBar ) )
             return false;
 
+        TBCMenuSpecific* pMenu = tbcd->getMenuSpecific();
+        if ( pMenu )
+        {
+            OSL_TRACE("** control has a menu, name of toolbar with menu items is %s", rtl::OUStringToOString( pMenu->Name(), RTL_TEXTENCODING_UTF8 ).getStr() );
+            // search for CTB with the appropriate name ( it contains the
+            // menu items, although we cannot import ( or create ) a menu on
+            // a custom toolbar we can import the menu items in a separate 
+            // toolbar ( better than nothing )
+            CTB* pCustTB = rWrapper.GetCustomizationData( pMenu->Name() );
+            if ( pCustTB )
+            {
+                 uno::Reference< container::XIndexContainer > xMenuDesc;
+                 uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+                 xMenuDesc.set( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.IndexedPropertyValues" ) ) ), uno::UNO_QUERY_THROW );
+                if ( !pCustTB->ImportMenuTB( rWrapper,xMenuDesc, helper ) )
+                    return false;     
+                beans::PropertyValue aProp;
+		
+                aProp.Name =  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") );
+                aProp.Value <<= xMenuDesc;
+                props.push_back( aProp );
+            } 
+        }
+
         if ( bBeginGroup )
         {
             // insert spacer
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index b533cbf9f..3dcf2de3a 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -15,6 +15,7 @@ public:
     void Print( FILE* fp );
 };
 
+class CTBWrapper;
 class TBC : public TBBase
 {
     TBCHeader tbch;
@@ -25,7 +26,7 @@ public:
     ~TBC();
     bool Read(SvStream *pS);
     void Print( FILE* );
-    bool ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
+    bool ImportToolBarControl( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool );
     rtl::OUString GetCustomText();
 };
 
@@ -34,7 +35,7 @@ class CTB : public TBBase
     Xst name;
     sal_Int32 cbTBData;
     TB tb;
-    sal_uInt8 rVisualData[ 100 ];
+    std::vector<TBVisualData> rVisualData;
     sal_Int32 iWCTBl;
     sal_uInt16 reserved;
     sal_uInt16 unused;
@@ -48,8 +49,10 @@ public:
     ~CTB();
     bool Read(SvStream *pS);
     void Print( FILE* fp );
-    bool ImportCustomToolBar( CustomToolBarImportHelper& );
-    bool ImportMenu( const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
+    bool IsMenuToolbar();
+    bool ImportCustomToolBar( CTBWrapper&, CustomToolBarImportHelper& );
+    bool ImportMenuTB( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
+    rtl::OUString GetName() { return tb.getName().getString(); }
 };
 
 class TBDelta : public TBBase
@@ -102,13 +105,16 @@ friend class CTBWrapper;
     boost::shared_ptr< CTB > customizationDataCTB;
     std::vector< TBDelta > customizationDataTBDelta; 
     bool bIsDroppedMenuTB; 
+    bool ImportMenu( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
 public:    
     Customization( CTBWrapper* rapper );
     ~Customization();
     bool Read(SvStream *pS);
-    bool ImportCustomToolBar( CustomToolBarImportHelper& );
-    bool ImportMenu( const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
+    bool ImportCustomToolBar( CTBWrapper&, CustomToolBarImportHelper& );
+    bool ImportMenu( CTBWrapper&, CustomToolBarImportHelper& );
     void Print( FILE* );
+    sal_Int32 GetTBIDForTB(){ return tbidForTBD; }
+    CTB*  GetCustomizationData() { return customizationDataCTB.get(); };
 };
 
 class SfxObjectShell; 
@@ -138,7 +144,9 @@ public:
     TBC* GetTBCAtOffset( sal_uInt32 nStreamOffset );
     bool Read(SvStream *pS);
     bool ImportCustomToolBar( SfxObjectShell& rDocSh );
+
     Customization* GetCustomizaton( sal_Int16 index );
+    CTB* GetCustomizationData( const rtl::OUString& name );
     void Print( FILE* );
 };
 
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 1add147bc..db72c8631 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -37,6 +37,7 @@
 #include <hintids.hxx>
 #include <svtools/itemiter.hxx>
 #include <svtools/eitem.hxx>
+#include <svtools/syslocale.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/numitem.hxx>
 // --> OD 2008-02-13 #newlistlevelattrs#
@@ -609,7 +610,7 @@ String  SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
 {
     IntlWrapper aIntlWrapper(
         ::comphelper::getProcessServiceFactory(),
-        GetAppLocaleData().getLocale());
+        SvtSysLocale().GetLocaleData().getLocale());
 
     String sPlus(String::CreateFromAscii(" + "));
     if ( SFX_STYLE_FAMILY_PAGE == nFamily )
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index 723cafca3..59224fe65 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -33,7 +33,7 @@
 
 
 #include <tools/stream.hxx>
-
+#include <svtools/syslocale.hxx>
 
 #include "swtypes.hxx"
 #include "hintids.hxx"
@@ -73,7 +73,7 @@ SwMasterUsrPref::SwMasterUsrPref(BOOL bWeb) :
     aCursorConfig(*this),
     pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0)
 {
-    MeasurementSystem eSystem = GetAppLocaleData().getMeasurementSystemEnum();
+    MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
     eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
     eHScrollMetric = eUserMetric;
     eVScrollMetric = eUserMetric;
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index c95d390cc..7430677db 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -58,6 +58,7 @@
 #include <crstate.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svtools/accessibilityoptions.hxx>
+#include <svtools/syslocale.hxx>
 
 #include <svx/acorrcfg.hxx>
 
@@ -238,7 +239,7 @@ SwViewOption::SwViewOption() :
     nCore2Options = VIEWOPT_CORE2_BLACKFONT | VIEWOPT_CORE2_HIDDENPARA;
     nUIOptions    = VIEWOPT_2_MODIFIED | VIEWOPT_2_GRFKEEPZOOM |VIEWOPT_2_ANY_RULER;
 
-    if(MEASURE_METRIC != GetAppLocaleData().getMeasurementSystemEnum())
+    if(MEASURE_METRIC != SvtSysLocale().GetLocaleData().getMeasurementSystemEnum())
         aSnapSize.Width() = aSnapSize.Height() = 720;	// 1/2"
     else
         aSnapSize.Width() = aSnapSize.Height() = 567;	// 1 cm
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index a446c5e08..6bed5be61 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1580,6 +1580,7 @@ SwInsertSectionTabPage::SwInsertSectionTabPage(
     aCurName.SetModifyHdl	( LINK( this, SwInsertSectionTabPage, NameEditHdl));
     aDDECB.SetClickHdl		( LINK( this, SwInsertSectionTabPage, DDEHdl ));
     ChangeProtectHdl(&aProtectCB);
+    aSubRegionED.EnableAutocomplete( sal_True, sal_True );
 }
 /* -----------------21.05.99 10:31-------------------
  *
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index f61cde8c1..6baa2d6a1 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -152,6 +152,7 @@
 
 #include <IMark.hxx>
 #include <doc.hxx>
+#include <ecmaflds.hxx>
 
 #include "PostItMgr.hxx"
 #include "postit.hxx"
@@ -161,6 +162,7 @@
 //#define TEST_FOR_BUG91313
 #endif
 
+using namespace sw::mark;
 using namespace ::com::sun::star;
 
 /*--------------------------------------------------------------------
@@ -4199,7 +4201,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
 
                         SwContentAtPos aCntntAtPos( SwContentAtPos::SW_CLICKFIELD |
                                                     SwContentAtPos::SW_INETATTR |
-                                                    SwContentAtPos::SW_SMARTTAG );
+                                                    SwContentAtPos::SW_SMARTTAG  | SwContentAtPos::SW_FORMCTRL);
 
                         if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, TRUE ) )
                         {
@@ -4220,7 +4222,33 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                                     if ( bExecSmarttags && SwSmartTagMgr::Get().IsSmartTagsEnabled() )
                                         rView.ExecSmartTagPopup( aDocPt );
                             }
-                            else // if ( SwContentAtPos::SW_INETATTR == aCntntAtPos.eCntntAtPos )
+                            else if ( SwContentAtPos::SW_FORMCTRL == aCntntAtPos.eCntntAtPos )
+                            {
+                				ASSERT( aCntntAtPos.aFnd.pFldmark != NULL, "where is my field ptr???");
+				                if ( aCntntAtPos.aFnd.pFldmark != NULL) 
+                                {
+				                    IFieldmark *fieldBM = const_cast< IFieldmark* > ( aCntntAtPos.aFnd.pFldmark );
+                				    SwDocShell* pDocSh = rView.GetDocShell();
+				                    SwDoc *pDoc=pDocSh->GetDoc();
+                				    if (fieldBM->GetFieldname( ).equalsAscii( ECMA_FORMCHECKBOX ) ) 
+                                    {
+    			                		bool isChecked = fieldBM->getParam( ECMA_FORMCHECKBOX_CHECKED ).second.compareToAscii("on") == 0;
+                	    				isChecked = !isChecked; // swap it...
+		    	                		fieldBM->addParam( 
+                                                rtl::OUString::createFromAscii( ECMA_FORMCHECKBOX_CHECKED ),
+                                                rtl::OUString::createFromAscii( isChecked?"on":"off" ) );
+                			    		fieldBM->invalidate();
+				                    	rSh.InvalidateWindows( rView.GetVisArea() );
+                				    } else if (fieldBM->GetFieldname().equalsAscii( ECMA_FORMDROPDOWN) ) {
+				                	    rView.ExecFieldPopup( aDocPt, fieldBM );
+                    					fieldBM->invalidate();
+	    		                		rSh.InvalidateWindows( rView.GetVisArea() );
+                				    } else {
+		    	                		// unknown type..
+                				    }
+				                }
+            			    }
+			    else // if ( SwContentAtPos::SW_INETATTR == aCntntAtPos.eCntntAtPos )
                             {
                                 if ( bExecHyperlinks )
                                     rSh.ClickToINetAttr( *(SwFmtINetFmt*)aCntntAtPos.aFnd.pAttr, nFilter );
@@ -5580,11 +5608,12 @@ void QuickHelpData::Stop( SwWrtShell& rSh )
 
 void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord )
 {
-    pCalendarWrapper->LoadDefaultCalendar( rSh.GetCurLang() );
+    salhelper::SingletonRef<SwCalendarWrapper>* pCalendar = s_getCalendarWrapper();
+    (*pCalendar)->LoadDefaultCalendar( rSh.GetCurLang() );
 
     {
         uno::Sequence< i18n::CalendarItem > aNames(
-                                            pCalendarWrapper->getMonths() );
+                                            (*pCalendar)->getMonths() );
         for( int n = 0; n < 2; ++n )
         {
             for( long nPos = 0, nEnd = aNames.getLength(); nPos < nEnd; ++nPos )
@@ -5604,7 +5633,7 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord )
                 }
             }
             if( !n )                    // get data for the second loop
-                aNames = pCalendarWrapper->getDays();
+                aNames = (*pCalendar)->getDays();
         }
     }
 
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 289b4ab7b..67c921f01 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -1615,7 +1615,7 @@ USHORT SwFldMgr::GetCurrLanguage() const
     SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
     if( pSh )
         return pSh->GetCurLang();
-    return SvxLocaleToLanguage( GetAppLocaleData().getLocale() );
+    return SvxLocaleToLanguage( SvtSysLocale().GetLocaleData().getLocale() );
 }
 
 void SwFieldType::_GetFldName()
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 459346df2..75e5b6ee4 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -42,6 +42,7 @@
 #include <swtypes.hxx>
 #include <shellid.hxx>
 #include <layout/layout.hxx>
+#include <IMark.hxx>
 
 class SwBaseShell;
 class Button;
@@ -94,6 +95,7 @@ struct SwConversionArgs;
 class Graphic;
 class GraphicFilter;
 class SwPostItMgr;
+class SwFieldBookmark;
 
 namespace com{ namespace sun { namespace star {
     namespace view{ class XSelectionSupplier; }
@@ -465,7 +467,7 @@ public:
 
     DECL_LINK( SpellError, LanguageType * );
     BOOL 			ExecSpellPopup( const Point& rPt );
-
+    BOOL            ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM );
     // SMARTTAGS
     BOOL            ExecSmartTagPopup( const Point& rPt );
 
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index f9d49cd93..b68e16d99 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -35,6 +35,7 @@
 #include <fesh.hxx>
 #include <sortopt.hxx>
 #include <swurl.hxx>
+#include <IMark.hxx>
 
 class Window;
 class OutputDevice;
@@ -320,6 +321,9 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
     void	InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
     BOOL	UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
 
+        //  new fields
+	BOOL	UpdateField( sw::mark::IFieldmark &fieldBM);
+
     // Numerierung und Bullets
     /**
        Turns on numbering or bullets.
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 5135dcaa5..d684116f4 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -48,6 +48,7 @@
 #include <vcl/field.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <svtools/syslocale.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/pageitem.hxx>
 #include <svtools/eitem.hxx>
@@ -183,7 +184,7 @@ SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet) :
     SetMetric( aMaxHeightEdit,	aMetric );
     SetMetric( aDistEdit, 		aMetric );
     SetMetric( aLineDistEdit, 	aMetric );
-    MeasurementSystem eSys = GetAppLocaleData().getMeasurementSystemEnum();
+    MeasurementSystem eSys = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
     long nHeightValue = MEASURE_METRIC != eSys ? 1440 : 1134;
     aMaxHeightEdit.SetValue(aMaxHeightEdit.Normalize(nHeightValue),FUNIT_TWIP);;
 }
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 4602dd3cd..965b0f5d3 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -819,7 +819,11 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
 
     rSh.Push();
     const BOOL bCrsrInHidden = rSh.SelectHiddenRange();
-    rSh.Pop(FALSE);
+    // --> OD 2009-08-05 #i103839#, #b6855246#
+    // Do not call method <SwCrsrShell::Pop(..)> with 1st parameter = <FALSE>
+    // in order to avoid that the view jumps to the visible cursor.
+    rSh.Pop();
+    // <--
 
     while ( nWhich )
     {
@@ -827,8 +831,11 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
         {
             case SID_INSERT_SOUND:
             case SID_INSERT_VIDEO:
+                /*!SvxPluginFileDlg::IsAvailable( nWhich ) ||
+                
+                discussed with mba: for performance reasons we skip the IsAvailable call here
+                */
                 if ( GetShell().IsSelFrmMode() ||
-                     !SvxPluginFileDlg::IsAvailable( nWhich ) ||
                      SFX_CREATE_MODE_EMBEDDED == eCreateMode || bCrsrInHidden )
                 {
                     rSet.DisableItem( nWhich );
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 0a42b7423..5ee90bac4 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -373,7 +373,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
 
                     if (bForParagraph)
                         SwLangHelper::SelectCurrentPara( rWrtSh );
-        
+
                     if (!bForSelection) // document language to be changed...
                     {
                         rWrtSh.SelAll();
@@ -789,7 +789,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             GetView().GetViewFrame()->ToggleChildWindow(SID_HYPERLINK_DIALOG);
         break;
         case FN_REMOVE_HYPERLINK:
-        {    
+        {
             BOOL bSel = rWrtSh.HasSelection();
             if(!bSel)
             {
@@ -1048,7 +1048,14 @@ void SwTextShell::Execute(SfxRequest &rReq)
             // --> OD 2008-03-18 #refactorlists#
             String sContinuedListId;
             const SwNumRule* pRule =
-                rWrtSh.SearchNumRule( FALSE, TRUE, FALSE, -1, sContinuedListId );
+                rWrtSh.SearchNumRule( false, true, false, -1, sContinuedListId );
+            // --> OD 2009-08-26 #i86492#
+            // Search also for bullet list
+            if ( !pRule )
+            {
+                pRule = rWrtSh.SearchNumRule( false, false, false, -1, sContinuedListId );
+            }
+            // <--
             if ( pRule )
             {
                 rWrtSh.SetCurNumRule( *pRule, false, sContinuedListId );
@@ -1627,14 +1634,23 @@ void SwTextShell::GetState( SfxItemSet &rSet )
             break;
             case FN_NUM_CONTINUE:
             {
-                if ( rSh.GetCurNumRule() )
-                    rSet.DisableItem(nWhich);
-                else
+                // --> OD 2009-08-26 #i86492#
+                // Allow continuation of previous list, even if at current cursor
+                // a list is active.
+//                if ( rSh.GetCurNumRule() )
+//                    rSet.DisableItem(nWhich);
+//                else
+                // <--
                 {
-                    // --> OD 2008-03-18 #refactorlists#
+                    // --> OD 2009-08-26 #i86492#
+                    // Search also for bullet list
                     String aDummy;
                     const SwNumRule* pRule =
-                            rSh.SearchNumRule( FALSE, TRUE, FALSE, -1, aDummy );
+                            rSh.SearchNumRule( false, true, false, -1, aDummy );
+                    if ( !pRule )
+                    {
+                        pRule = rSh.SearchNumRule( false, false, false, -1, aDummy );
+                    }
                     // <--
                     if ( !pRule )
                         rSet.DisableItem(nWhich);
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 1cff7df59..a4710b206 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -56,93 +56,46 @@
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
 #include <unotxvw.hxx>
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
-#ifndef _SWHINTS_HXX
 #include <swhints.hxx>
-#endif
 #include <swmodule.hxx>
 #include <inputwin.hxx>
 #include <chartins.hxx>
 #include <uivwimp.hxx>
 #include <uitool.hxx>
 #include <edtwin.hxx>
-#ifndef _TEXTSH_HXX
 #include <textsh.hxx>
-#endif
-#ifndef _LISTSH_HXX
 #include <listsh.hxx>
-#endif
-#ifndef _TABSH_HXX
 #include <tabsh.hxx>
-#endif
-#ifndef _GRFSH_HXX
 #include <grfsh.hxx>
-#endif
-#ifndef _MEDIASH_HXX
 #include <mediash.hxx>
-#endif
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <frmsh.hxx>
-#ifndef _OLESH_HXX
 #include <olesh.hxx>
-#endif
-#ifndef _DRAWSH_HXX
 #include <drawsh.hxx>
-#endif
-#ifndef _DRAWBASE_HXX
 #include <drawbase.hxx>
-#endif
-#ifndef _DRFORMSH_HXX
 #include <drformsh.hxx>
-#endif
-#ifndef _DRWTXTSH_HXX
 #include <drwtxtsh.hxx>
-#endif
-#ifndef _BEZIERSH_HXX
 #include <beziersh.hxx>
-#endif
-#ifndef _GLOBDOC_HXX
 #include <globdoc.hxx>
-#endif
 #include <scroll.hxx>
-#ifndef _GLOBDOC_HXX
 #include <globdoc.hxx>
-#endif
 #include <navipi.hxx>
 #include <gloshdl.hxx>
 #include <usrpref.hxx>
-#ifndef _SRCVIEW_HXX
 #include <srcview.hxx>
-#endif
 #include <doc.hxx>
-#ifndef _WDOCSH_HXX
+#include <drawdoc.hxx>
 #include <wdocsh.hxx>
-#endif
-#ifndef _WVIEW_HXX
 #include <wview.hxx>
-#endif
 #include <workctrl.hxx>
 #include <wrtsh.hxx>
-#ifndef _BARCFG_HXX
 #include <barcfg.hxx>
-#endif
-#ifndef _PVIEW_HXX
 #include <pview.hxx>
-#endif
 #include <swdtflvr.hxx>
-#ifndef _VIEW_HRC
 #include <view.hrc>
-#endif
-#ifndef _GLOBDOC_HRC
 #include <globdoc.hrc>
-#endif
-#ifndef _FRMUI_HRC
 #include <frmui.hrc>
-#endif
 #include <cfgitems.hxx>
 #include <prtopt.hxx>
 #include <swprtopt.hxx>
@@ -152,9 +105,7 @@
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/scanner/ScannerContext.hpp>
 #include <com/sun/star/scanner/XScannerManager.hpp>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmluconv.hxx>
 
@@ -1822,7 +1773,18 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                         CreateTab();
                     else
                         KillTab();
-                    SfxBoolItem aItem( SID_FM_DESIGN_MODE, !GetDocShell()->IsReadOnly());
+                    bool bReadonly = GetDocShell()->IsReadOnly();
+                    //#i76332# if document is to be opened in alive-mode then this has to be regarded while switching from readonly-mode to edit-mode
+                    if( !bReadonly )
+                    {
+                        SwDrawDocument * pDrawDoc = 0;
+                        if ( 0 != ( pDrawDoc = dynamic_cast< SwDrawDocument * > (GetDocShell()->GetDoc()->GetDrawModel() ) ) )
+                        {
+                            if( !pDrawDoc->GetOpenInDesignMode() )
+                                break;// don't touch the design mode
+                        }
+                    }
+                    SfxBoolItem aItem( SID_FM_DESIGN_MODE, !bReadonly);
                     GetDispatcher().Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_ASYNCHRON,
                                                 &aItem, 0L );
                 }
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 304457a82..39d1595c3 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -114,9 +114,12 @@
 #include <svx/dialogs.hrc>
 
 #include <unomid.h>
+#include <IMark.hxx>
+#include <ecmaflds.hxx>
 
 #include <memory>
 
+using namespace sw::mark;
 using ::rtl::OUString;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
@@ -931,3 +934,136 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt )
     return bRet;
 }
 
+
+
+class SwFieldPopup : public PopupMenu
+{
+public:
+    SwFieldPopup()  {
+	InsertItem(1, ::rtl::OUString::createFromAscii("Hello"));
+    }
+};
+
+class SwFieldListBox : public ListBox
+{
+public:
+    SwFieldListBox(Window* pParent) : ListBox(pParent /*, WB_DROPDOWN*/) {
+    }
+
+    void *GetImplWin() {
+	return NULL; //FIXME!!!
+//	return mpImplWin;
+    }
+
+protected:
+    virtual void LoseFocus() {
+//	printf("ListBox: lose focus!!\n");
+	ListBox::LoseFocus();
+    }    
+
+    virtual void Select() {
+//	printf("SELECT!!! IsTravelSelect=%i\n", IsTravelSelect());
+	ListBox::Select();
+    }
+};
+
+class SwFieldDialog : public Dialog
+{
+private:
+    SwFieldListBox aListBox;
+    Edit aText;
+    int selection;
+
+    DECL_LINK( MyListBoxHandler, ListBox * );
+
+public:
+    SwFieldDialog(Window* parent, IFieldmark *fieldBM) : Dialog(parent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ), aListBox(this), aText(this, WB_RIGHT | WB_READONLY), selection(-1) {
+
+	assert(fieldBM!=NULL);
+	if (fieldBM!=NULL) {
+	    int items=fieldBM->getNumOfParams();	    
+	    for(int i=0;i<items;i++) {
+		IFieldmark::ParamPair_t p=fieldBM->getParam(i);
+		if (p.first.compareToAscii(ECMA_FORMDROPDOWN_LISTENTRY)==0) {
+		    aListBox.InsertEntry(p.second);
+		}
+	    }
+	}
+	Size lbSize=aListBox.GetOptimalSize(WINDOWSIZE_PREFERRED);
+	lbSize.Width()+=50;
+	lbSize.Height()+=20;
+	aListBox.SetSizePixel(lbSize);
+	aListBox.SetSelectHdl( LINK( this, SwFieldDialog, MyListBoxHandler ) );
+	aListBox.Show();
+	aText.SetText(rtl::OUString::createFromAscii("Cancel"));
+	Size tSize=aText.GetOptimalSize(WINDOWSIZE_PREFERRED);
+	aText.SetSizePixel(Size(lbSize.Width(), tSize.Height()));
+	aText.SetPosPixel(Point(0, lbSize.Height()));     	
+	aText.Show();
+	SetSizePixel(Size(lbSize.Width(), lbSize.Height()+tSize.Height()));	
+//	SetSizePixel(Size(200, 200));
+    }
+
+    int getSelection() {
+	return selection;
+    }
+protected:
+    /*
+    virtual void LoseFocus() {
+	printf("lose focus!!\n");
+	Dialog::LoseFocus();
+	printf("close:\n");
+	EndDialog(8);
+    }
+    */
+
+    virtual long PreNotify( NotifyEvent& rNEvt ) {
+	if (rNEvt.GetType() == EVENT_LOSEFOCUS && aListBox.GetImplWin()==rNEvt.GetWindow()) {
+	    EndDialog(8);
+	    return 1;	   
+	}
+	if (rNEvt.GetType() == EVENT_KEYINPUT) {
+//	    printf("PreNotify::KEYINPUT\n");
+	}
+	return Dialog::PreNotify(rNEvt);
+    }
+};
+
+IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox )
+{
+//    printf("### DROP DOWN SELECT... IsTravelSelect=%i\n", pBox->IsTravelSelect());
+    if (pBox->IsTravelSelect()) {
+	return 0;
+    } else {
+	this->selection=pBox->GetSelectEntryPos();
+	EndDialog(9); //@TODO have meaningfull returns...
+	return 1;
+    }
+}
+
+
+BOOL SwView::ExecFieldPopup( const Point& rPt, IFieldmark *fieldBM )
+{
+    sal_Bool bRet = sal_False;
+    const sal_Bool bOldViewLock = pWrtShell->IsViewLocked();
+    pWrtShell->LockView( sal_True );
+    pWrtShell->Push();
+
+	bRet=sal_True;
+	const Point aPixPos = GetEditWin().LogicToPixel( rPt );
+
+	SwFieldDialog aFldDlg(pEditWin, fieldBM);
+	aFldDlg.SetPosPixel(pEditWin->OutputToScreenPixel(aPixPos));
+
+	short ret=aFldDlg.Execute();
+	int selection=aFldDlg.getSelection();
+	if (selection>=0) {
+	    fieldBM->addParam(ECMA_FORMDROPDOWN_RESULT, selection);
+	}
+
+    pWrtShell->Pop( sal_False );
+    pWrtShell->LockView( bOldViewLock );
+
+    return bRet;
+}
+
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index 4818a7973..2f7716bac 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -125,7 +125,10 @@ enum SwPrintSettingsPropertyHandles
     HANDLE_PRINTSET_PAPER_FROM_SETUP,
     HANDLE_PRINTSET_TABLES,
     HANDLE_PRINTSET_SINGLE_JOBS,
-    HANDLE_PRINTSET_EMPTY_PAGES
+    HANDLE_PRINTSET_EMPTY_PAGES,
+    HANDLE_PRINTSET_PROSPECT_RTL,
+    HANDLE_PRINTSET_PLACEHOLDER,
+    HANDLE_PRINTSET_HIDDEN_TEXT
 };
 
 static ChainablePropertySetInfo * lcl_createViewSettingsInfo()
@@ -186,14 +189,17 @@ static ChainablePropertySetInfo * lcl_createPrintSettingsInfo()
         { RTL_CONSTASCII_STRINGPARAM ( "PrintControls" ), 		 HANDLE_PRINTSET_CONTROLS			, CPPUTYPE_BOOLEAN, PROPERTY_NONE,	0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintDrawings" ), 		 HANDLE_PRINTSET_DRAWINGS			, CPPUTYPE_BOOLEAN, PROPERTY_NONE,	0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintGraphics" ), 		 HANDLE_PRINTSET_GRAPHICS			, CPPUTYPE_BOOLEAN, PROPERTY_NONE,	0},
+        { RTL_CONSTASCII_STRINGPARAM ( "PrintHiddenText"),       HANDLE_PRINTSET_HIDDEN_TEXT        , CPPUTYPE_BOOLEAN, PROPERTY_NONE,  0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintLeftPages" ), 		 HANDLE_PRINTSET_LEFT_PAGES			, CPPUTYPE_BOOLEAN, PROPERTY_NONE,	0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintPageBackground" ),  HANDLE_PRINTSET_PAGE_BACKGROUND	, CPPUTYPE_BOOLEAN, PROPERTY_NONE,	0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintProspect" ), 		 HANDLE_PRINTSET_PROSPECT			, CPPUTYPE_BOOLEAN, PROPERTY_NONE,	0},
+        { RTL_CONSTASCII_STRINGPARAM ( "PrintProspectRTL" ),     HANDLE_PRINTSET_PROSPECT_RTL       , CPPUTYPE_BOOLEAN, PROPERTY_NONE,  0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintReversed" ), 		 HANDLE_PRINTSET_REVERSED   		, CPPUTYPE_BOOLEAN, PROPERTY_NONE,	0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintRightPages" ), 	 HANDLE_PRINTSET_RIGHT_PAGES		, CPPUTYPE_BOOLEAN, PROPERTY_NONE,	0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintFaxName" ), 		 HANDLE_PRINTSET_FAX_NAME			, CPPUTYPE_OUSTRING, PROPERTY_NONE,	0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintPaperFromSetup" ),  HANDLE_PRINTSET_PAPER_FROM_SETUP	, CPPUTYPE_BOOLEAN, PROPERTY_NONE,	0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintTables" ), 		 HANDLE_PRINTSET_TABLES				, CPPUTYPE_BOOLEAN, PROPERTY_NONE,	0},
+        { RTL_CONSTASCII_STRINGPARAM ( "PrintTextPlaceholder"),  HANDLE_PRINTSET_PLACEHOLDER        , CPPUTYPE_BOOLEAN, PROPERTY_NONE,  0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintSingleJobs" ), 	 HANDLE_PRINTSET_SINGLE_JOBS		, CPPUTYPE_BOOLEAN, PROPERTY_NONE,	0},
         { RTL_CONSTASCII_STRINGPARAM ( "PrintEmptyPages" ),      HANDLE_PRINTSET_EMPTY_PAGES        , CPPUTYPE_BOOLEAN, PROPERTY_NONE,  0},
         { 0, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 }
@@ -456,6 +462,24 @@ void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo,
                 throw lang::IllegalArgumentException();
         }
         break;
+        case HANDLE_PRINTSET_PROSPECT_RTL:
+        {
+            bVal = *(sal_Bool*)rValue.getValue();
+            mpPrtOpt->SetPrintProspect_RTL(bVal);
+        }
+        break;
+        case HANDLE_PRINTSET_PLACEHOLDER:
+        {
+            bVal = *(sal_Bool*)rValue.getValue();
+            mpPrtOpt->SetPrintTextPlaceholder(bVal);
+        }
+        break;
+        case HANDLE_PRINTSET_HIDDEN_TEXT:
+        {
+            bVal = *(sal_Bool*)rValue.getValue();
+            mpPrtOpt->SetPrintHiddenText(bVal);
+        }
+        break;
         default:
             throw UnknownPropertyException();
     }
@@ -550,6 +574,21 @@ void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo,
             rValue <<= mpPrtOpt->GetFaxName();
         }
         break;
+        case HANDLE_PRINTSET_PROSPECT_RTL:
+        {
+            rValue <<= mpPrtOpt->IsPrintProspect_RTL();
+        }
+        break;
+        case HANDLE_PRINTSET_PLACEHOLDER:
+        {
+            rValue <<= mpPrtOpt->IsPrintTextPlaceholder();
+        }
+        break;
+        case HANDLE_PRINTSET_HIDDEN_TEXT:
+        {
+            rValue <<= mpPrtOpt->IsPrintHiddenText();
+        }
+        break;
         default:
             throw UnknownPropertyException();
     }
@@ -1024,3 +1063,4 @@ Sequence< OUString > SwXViewSettings::getSupportedServiceNames(void) throw( Runt
     pArray[0] = C2U("com.sun.star.text.ViewSettings");
     return aRet;
 }
+
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 2c1def3c2..7143f4d92 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -81,7 +81,13 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/document/RedlineDisplayType.hpp>
+#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/script/XInvocation.hpp>
+#include <com/sun/star/reflection/XIdlClassProvider.hpp>
 #include <svx/linkmgr.hxx>
 #include <svx/unofill.hxx>
 #include <svx/unolingu.hxx>
@@ -243,15 +249,23 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI
 Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(RuntimeException)
 {
     Any aRet = SwXTextDocumentBaseClass::queryInterface(rType);
-    if(aRet.getValueType() == getVoidCppuType())
+    if ( !aRet.hasValue() )
         aRet = SfxBaseModel::queryInterface(rType);
-    if(aRet.getValueType() == getVoidCppuType() &&
+    if ( !aRet.hasValue() &&
         rType == ::getCppuType((Reference<lang::XMultiServiceFactory>*)0))
     {
         Reference<lang::XMultiServiceFactory> xTmp = this;
         aRet <<= xTmp;
     }
-    if(aRet.getValueType() == getVoidCppuType())
+
+    if ( !aRet.hasValue() 
+        && rType != ::getCppuType((Reference< com::sun::star::document::XDocumentEventBroadcaster>*)0)
+        && rType != ::getCppuType((Reference< com::sun::star::frame::XController>*)0)
+        && rType != ::getCppuType((Reference< com::sun::star::frame::XFrame>*)0)
+        && rType != ::getCppuType((Reference< com::sun::star::script::XInvocation>*)0)
+        && rType != ::getCppuType((Reference< com::sun::star::reflection::XIdlClassProvider>*)0)
+        && rType != ::getCppuType((Reference< com::sun::star::beans::XFastPropertySet>*)0)
+        && rType != ::getCppuType((Reference< com::sun::star::awt::XWindow>*)0))
     {
         GetNumberFormatter();
         if(xNumFmtAgg.is())
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index aca79b9e1..9f90efe02 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -54,6 +54,7 @@
 #ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
 #endif
+#include <svtools/syslocale.hxx>
 
 #include <unomid.h>
 
@@ -261,7 +262,7 @@ ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( SvStringsDtor& rLst )
             p->SearchAndReplace(C2S("%1"), C2S(",,"));
             p->SearchAndReplace(C2S("%2"), C2S("''"));
 #else
-            LocaleDataWrapper& rLclD = GetAppLocaleData();
+            const LocaleDataWrapper& rLclD = SvtSysLocale().GetLocaleData();
             //unter richtigen Betriebssystemen funktioniert es auch so
             p->SearchAndReplace(C2S("%1"), rLclD.getDoubleQuotationMarkStart());
             p->SearchAndReplace(C2S("%2"), rLclD.getDoubleQuotationMarkEnd());
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 18f57d6ec..d6ea01d58 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -120,7 +120,7 @@ void NumFormatListBox::Init(short nFormatType, BOOL bUsrFmts)
     if (pView)
         eCurLanguage = pView->GetWrtShell().GetCurLang();
     else
-        eCurLanguage = SvxLocaleToLanguage( GetAppLocaleData().getLocale() );
+        eCurLanguage = SvxLocaleToLanguage( SvtSysLocale().GetLocaleData().getLocale() );
 
     if (bUsrFmts == FALSE)
        {
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index 8d50ec2d1..ae4a8348a 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -39,6 +39,7 @@
 #include <unotools/collatorwrapper.hxx>
 #include <svtools/urihelper.hxx>
 #include <svtools/stritem.hxx>
+#include <svtools/syslocale.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
@@ -732,7 +733,7 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, USHORT *pPercent,
 
 String GetAppLangDateTimeString( const DateTime& rDT )
 {
-    LocaleDataWrapper& rAppLclData = GetAppLocaleData();
+    const LocaleDataWrapper& rAppLclData = SvtSysLocale().GetLocaleData();
     String sRet( rAppLclData.getDate( rDT ));
     ( sRet += ' ' ) += rAppLclData.getTime( rDT, FALSE, FALSE );
     return sRet;
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 7a4577263..3aad02785 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -122,6 +122,10 @@ Resource RID_SHELLRES_AUTOFMTSTRS
     {
         Text [ en-US ] = "Combine paragraphs";
     };
+    String STR_AUTOFMTREDL_NON_BREAK_SPACE +1
+    {
+        Text [ en-US ] = "Add non breaking space";
+    };
 
 };
 
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx
index 2cab9943a..30bdc2a5a 100644
--- a/sw/source/ui/vba/vbaautotextentry.cxx
+++ b/sw/source/ui/vba/vbaautotextentry.cxx
@@ -44,7 +44,7 @@ SwVbaAutoTextEntry::~SwVbaAutoTextEntry()
 {
 }
 
-uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& _richtext ) throw ( uno::RuntimeException )
+uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& /*_richtext*/ ) throw ( uno::RuntimeException )
 {
     SwVbaRange* pWhere = dynamic_cast<SwVbaRange*>( _where.get() );
     if( pWhere )
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index 44ed6eb33..0c7c4f778 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -356,7 +356,7 @@ sal_Bool SAL_CALL SwVbaBorders::getShadow() throw (uno::RuntimeException)
     return ( aShadowFormat.Location != table::ShadowLocation_NONE );
 }
 
-void SAL_CALL SwVbaBorders::setShadow( sal_Bool _shadow ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::RuntimeException)
 {
     throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
 }
diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx
index df35a1a6b..2d9308e7d 100644
--- a/sw/source/ui/vba/vbadialog.cxx
+++ b/sw/source/ui/vba/vbadialog.cxx
@@ -51,7 +51,7 @@ static const WordDialogTable aWordDialogTable[] =
 rtl::OUString 
 SwVbaDialog::mapIndexToName( sal_Int32 nIndex )
 {
-    for( const WordDialogTable* pTable = aWordDialogTable; pTable->wdDialog != NULL; pTable++ )
+    for( const WordDialogTable* pTable = aWordDialogTable; pTable != NULL; pTable++ )
     {
         if( nIndex == pTable->wdDialog )
         {
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 1090a8b0b..1409dbb44 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -238,7 +238,6 @@ SwVbaDocument::getServiceImplName()
 uno::Any SAL_CALL 
 SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException)
 {
-    SwDocShell* pDocShell = word::getDocShell( getModel() );
     uno::Reference< word::XTemplate > xTemplate;
     uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( getModel(), uno::UNO_QUERY_THROW );
     uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
@@ -250,7 +249,7 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException)
 }
 
 void SAL_CALL 
-SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (uno::RuntimeException)
+SwVbaDocument::setAttachedTemplate( const css::uno::Any& /*_attachedtemplate*/ ) throw (uno::RuntimeException)
 {
     throw uno::RuntimeException();
 }
diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index c8934b406..165f7aefa 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -116,7 +116,7 @@ SwVbaDocuments::createCollectionObject( const uno::Any& aSource )
 }
 
 uno::Any SAL_CALL
-SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& NewTemplate, const uno::Any& DocumentType, const uno::Any& Visible ) throw (uno::RuntimeException)
+SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, const uno::Any& /*DocumentType*/, const uno::Any& /*Visible*/ ) throw (uno::RuntimeException)
 {
     rtl::OUString sFileName;
     if( Template.hasValue() && ( Template >>= sFileName ) )
@@ -132,14 +132,14 @@ SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& NewTemplate, cons
 
 // #TODO# #FIXME# can any of the unused params below be used?
 void SAL_CALL
-SwVbaDocuments::Close( const uno::Any& SaveChanges, const uno::Any& OriginalFormat, const uno::Any& RouteDocument ) throw (uno::RuntimeException)
+SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*OriginalFormat*/, const uno::Any& /*RouteDocument*/ ) throw (uno::RuntimeException)
 {
     VbaDocumentsBase::Close();
 }
 
 // #TODO# #FIXME# can any of the unused params below be used?
 uno::Any SAL_CALL
-SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToRecentFiles, const uno::Any& PasswordDocument, const uno::Any& PasswordTemplate, const uno::Any& Revert, const uno::Any& WritePasswordDocument, const uno::Any& WritePasswordTemplate, const uno::Any& Format, const uno::Any& Encoding, const uno::Any& Visible, const uno::Any& OpenAndRepair, const uno::Any& DocumentDirection, const uno::Any& NoEncodingDialog, const uno::Any& XMLTransform ) throw (uno::RuntimeException)
+SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) throw (uno::RuntimeException)
 {
 	// we need to detect if this is a URL, if not then assume its a file path
     rtl::OUString aURL;
diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx
index 22d9a1fa2..32befd47d 100644
--- a/sw/source/ui/vba/vbafind.cxx
+++ b/sw/source/ui/vba/vbafind.cxx
@@ -84,7 +84,7 @@ void SwVbaFind::SetReplace( sal_Int32 type )
     mbReplace = sal_True;
 }
 
-rtl::OUString SwVbaFind::ReplaceWildcards( const rtl::OUString& rText ) throw ( uno::RuntimeException )
+rtl::OUString SwVbaFind::ReplaceWildcards( const rtl::OUString& /*rText*/ ) throw ( uno::RuntimeException )
 {
     // TODO:
     return rtl::OUString();
@@ -177,7 +177,7 @@ sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
                 }
                 break;
             }
-            defalut:
+            default:
             {
                 result = sal_False;
             }
@@ -393,7 +393,7 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u
 
     if( Replace.hasValue() )
     {
-        sal_Int32 nValue;
+        sal_Int32 nValue(0);
         Replace >>= nValue;
         SetReplace( nValue );
     }
diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx
index a08c15571..0176edf6c 100644
--- a/sw/source/ui/vba/vbaheaderfooter.cxx
+++ b/sw/source/ui/vba/vbaheaderfooter.cxx
@@ -55,7 +55,7 @@ sal_Bool SAL_CALL SwVbaHeaderFooter::getLinkToPrevious() throw (uno::RuntimeExce
     return sal_False;
 }
 
-void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( ::sal_Bool _linktoprevious ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( ::sal_Bool /*_linktoprevious*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -71,7 +71,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno
     {
         sPropsNameText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
     }
-    if( mnIndex = word::WdHeaderFooterIndex::wdHeaderFooterEvenPages )
+    if( mnIndex == word::WdHeaderFooterIndex::wdHeaderFooterEvenPages )
     {
         sPropsNameText.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left") ) );
     }
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index eac6da746..d6c97b674 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -141,7 +141,7 @@ sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineStyle() throw (uno::Runtime
     return word::WdLineStyle::wdLineStyleSingle;
 }
 
-void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 /*_defaultborderlinestyle*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -151,7 +151,7 @@ sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineWidth() throw (uno::Runtime
     return word::WdLineWidth::wdLineWidth050pt;
 }
 
-void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 /*_defaultborderlinewidth*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -161,7 +161,7 @@ sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderColorIndex() throw (uno::Runtim
     return word::WdColorIndex::wdAuto;
 }
 
-void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 /*_defaultbordercolorindex*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -171,7 +171,7 @@ void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 _defaultbord
     return sal_True;
 }
 
-void SAL_CALL SwVbaOptions::setReplaceSelection( ::sal_Bool _replaceselection ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setReplaceSelection( ::sal_Bool /*_replaceselection*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -181,7 +181,7 @@ void SAL_CALL SwVbaOptions::setReplaceSelection( ::sal_Bool _replaceselection )
     return sal_False;
 }
 
-void SAL_CALL SwVbaOptions::setMapPaperSize( ::sal_Bool _mappapersize ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setMapPaperSize( ::sal_Bool /*_mappapersize*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -191,7 +191,7 @@ void SAL_CALL SwVbaOptions::setMapPaperSize( ::sal_Bool _mappapersize ) throw (u
     return sal_False;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _autoformatasyoutypeapplyheadings ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool /*_autoformatasyoutypeapplyheadings*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -201,7 +201,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _aut
     return sal_False;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool /*_autoformatasyoutypeapplybulletedlists*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -211,7 +211,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool
     return sal_False;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool /*_autoformatasyoutypeapplynumberedlists*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -221,7 +221,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool
     return sal_False;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool /*_autoformatasyoutypeformatlistitembeginning*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -231,7 +231,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( ::sal
     return sal_False;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _autoformatasyoutypedefinestyles ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( ::sal_Bool /*_autoformatasyoutypedefinestyles*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -241,7 +241,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _auto
     return sal_False;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( ::sal_Bool _autoformatapplyheadings ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( ::sal_Bool /*_autoformatapplyheadings*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -251,7 +251,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( ::sal_Bool _autoformatap
     return sal_False;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( ::sal_Bool _autoformatapplylists ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( ::sal_Bool /*_autoformatapplylists*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
@@ -261,7 +261,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( ::sal_Bool _autoformatapply
     return sal_False;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool _autoformatapplybulletedlists ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool /*_autoformatapplybulletedlists*/ ) throw (uno::RuntimeException)
 {
     // not support in Writer
 }
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index 96760e8fa..54c54f47f 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -249,7 +249,7 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException
     return wdSectionStart;    
 }
 
-void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 _sectionstart ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) throw (uno::RuntimeException)
 {
     // fail to find corresponding feature in Writer
     // #FIXME:
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index 7726d4835..2959a239a 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -203,7 +203,7 @@ sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeEx
     return nLevel;
 }
 
-void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 /*_outlinelevel*/ ) throw (uno::RuntimeException)
 {
     throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
 }
@@ -247,7 +247,7 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe
 
 float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() throw (uno::RuntimeException)
 {
-    sal_Int32 nSpace;
+    sal_Int32 nSpace = 0;
     mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaTopMargin") ) ) >>= nSpace;
     return (float)( Millimeter::getInPoints( nSpace ) );
 }
@@ -302,7 +302,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeExcepti
     throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& _tabstops ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) throw (uno::RuntimeException)
 {
     throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
 }
@@ -484,7 +484,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rL
 
 sal_Int16 SwVbaParagraphFormat::getCharHeight() throw (uno::RuntimeException)
 {
-    float fCharHeight;
+    float fCharHeight = 0.0;
     mxParaProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharHeight") ) ) >>= fCharHeight;
     return (sal_Int16)( Millimeter::getInHundredthsOfOneMillimeter( fCharHeight ) );
 }
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index d6f2af988..7f166e968 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -56,7 +56,7 @@ SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rPar
     initialize( rStart, rEnd );
 }
 
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument ), mxText( rText )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
 {
     initialize( rStart, rEnd );
 }
diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx
index 306ed2646..c30058ab6 100644
--- a/sw/source/ui/vba/vbasection.cxx
+++ b/sw/source/ui/vba/vbasection.cxx
@@ -49,7 +49,7 @@ SwVbaSection::~SwVbaSection()
     return sal_False;
 }
 
-void SAL_CALL SwVbaSection::setProtectedForForms( ::sal_Bool _protectedforforms ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaSection::setProtectedForForms( ::sal_Bool /*_protectedforforms*/ ) throw (uno::RuntimeException)
 {
 }
 
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 167838f82..e510dd8c1 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -188,7 +188,7 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw (
 }
 
 void SAL_CALL
-SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( uno::RuntimeException )
+SwVbaSelection::Delete( const uno::Any& /*_unit*/, const uno::Any& /*_count*/ ) throw ( uno::RuntimeException )
 {
     // FIXME: handle the arguments: _unit and _count 
     rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Delete"));
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index c178fe143..c13ba748d 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -315,7 +315,7 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno::
     sal_Int32 nIndex = 0;
     if( ( Index1 >>= nIndex ) && ( nIndex < 0 ) )
     {
-        for( const BuiltinStyleTable* pTable = aBuiltinStyleTable; pTable->wdBuiltinStyle != NULL; pTable++ )
+        for( const BuiltinStyleTable* pTable = aBuiltinStyleTable; pTable != NULL; pTable++ )
         {
             if( nIndex == pTable->wdBuiltinStyle )
             {
diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx
index 3a4ead505..7598dfc6c 100644
--- a/sw/source/ui/vba/vbatable.cxx
+++ b/sw/source/ui/vba/vbatable.cxx
@@ -50,7 +50,7 @@ SwVbaTable::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException
 }
 
 uno::Reference< word::XRange > SAL_CALL 
-SwVbaTable::ConvertToText( const uno::Any& Separator, const uno::Any& NestedTables ) throw (script::BasicErrorException, uno::RuntimeException)
+SwVbaTable::ConvertToText( const uno::Any& /*Separator*/, const uno::Any& /*NestedTables*/ ) throw (script::BasicErrorException, uno::RuntimeException)
 {
     // #FIXME the helper api uses the dreaded dispatch mechanism, holding off 
     // implementation while I look for alternative solution
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index d6ea7097f..53178d1c7 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -58,7 +58,7 @@ SwVbaTables::SwVbaTables( const uno::Reference< XHelperInterface >& xParent, con
 
 
 uno::Reference< word::XTable > SAL_CALL 
-SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& DefaultTableBehavior, const uno::Any& AutoFitBehavior ) throw (script::BasicErrorException, uno::RuntimeException)
+SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& /*DefaultTableBehavior*/, const uno::Any& /*AutoFitBehavior*/ ) throw (script::BasicErrorException, uno::RuntimeException)
 {
     sal_Int32 nCols = 0;
     sal_Int32 nRows = 0;
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index 9413428e2..136a9ec43 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -61,7 +61,8 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep
 
     // the default template is "Normal.dot" in Word.
     rtl::OUString sGroup( RTL_CONSTASCII_USTRINGPARAM("Normal") );
-    if( sal_Int32 nIndex = msName.lastIndexOf( sal_Unicode('.') ) > 0 )
+    sal_Int32 nIndex = msName.lastIndexOf( sal_Unicode('.') );
+    if( nIndex > 0 )
     {
         sGroup = msName.copy( 0, msName.lastIndexOf( sal_Unicode('.') ) );
        // OSL_TRACE("SwVbaTemplate::AutoTextEntries: %s", rtl::OUStringToOString( sGroup, RTL_TEXTENCODING_UTF8 ).getStr() );
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index f4989ed11..3b9e43b57 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -113,6 +113,7 @@
 #include <paratr.hxx>
 #include <ndtxt.hxx>
 #include <svx/acorrcfg.hxx>
+#include <IMark.hxx>
 
 // -> #111827#
 #include <SwRewriter.hxx>
@@ -127,6 +128,7 @@
 
 #include "PostItMgr.hxx"
 
+using namespace sw::mark;
 using namespace com::sun::star;
 
 #define COMMON_INI_LIST \
@@ -669,10 +671,10 @@ void SwWrtShell::MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point&
     try
     {
         sal_Int32 nState = xObj->getCurrentState();
-        if ( nState == ::com::sun::star::embed::EmbedStates::INPLACE_ACTIVE 
+        if ( nState == ::com::sun::star::embed::EmbedStates::INPLACE_ACTIVE
           || nState == ::com::sun::star::embed::EmbedStates::UI_ACTIVE )
         {
-            SfxInPlaceClient* pCli = 
+            SfxInPlaceClient* pCli =
                 GetView().FindIPClient( xObj.GetObject(), &(GetView().GetEditWin()) );
             if ( pCli )
             {
@@ -1105,7 +1107,7 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
                     pDoc->FindNumRulePtr(pColl->GetNumRule( FALSE ).GetValue());
             if ( !pDirectCollRule )
             {
-                pCollRule = 0L;
+                pCollRule = 0;
             }
         }
         // --> OD 2006-11-20 #i71764#
@@ -1143,12 +1145,9 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
                 {
                     // check, if numbering of the outline level of the pararaph
                     // style is active. If not, activate this outline level.
-                    //nActivateOutlineLvl = pColl->GetOutlineLevel();		//#outline level,zhaojianwei
-                    //ASSERT( /*nActivateOutlineLvl >= 0 &&*/ nActivateOutlineLvl < MAXLEVEL,
                     nActivateOutlineLvl = pColl->GetAssignedOutlineStyleLevel();
                     ASSERT( pColl->IsAssignedToListLevelOfOutlineStyle(),	//<-end,zhaojianwei
                             "<SwWrtShell::NumOrBulletOn(..)> - paragraph style with outline rule, but no outline level" );
-                    //if ( /*nActivateOutlineLvl >= 0 &&*/ nActivateOutlineLvl < MAXLEVEL &&	//#outline level,zhaojianwei
                     if ( pColl->IsAssignedToListLevelOfOutlineStyle() &&		//<-end,zhaojianwei
                          pCollRule->Get( static_cast<USHORT>(nActivateOutlineLvl) ).GetNumberingType()
                             == SVX_NUM_NUMBER_NONE )
@@ -1164,31 +1163,40 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
                 }
                 else
                 {
+                    // --> OD 2009-08-27 #i101234#
                     // activate outline numbering, because from the precondition
                     // it's known, that <SwEdit::HasNumber()> == FALSE
                     bActivateOutlineRule = true;
-                    //nActivateOutlineLvl = pColl->GetOutlineLevel();		//#outline level,zhaojianwei
                     nActivateOutlineLvl = pColl->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei
                 }
             }
             else if ( !pNumRule )
             {
-                // activate outline numbering, because from the precondition
-                // it's known, that <SwEdit::HasNumber()> == FALSE
-                bActivateOutlineRule = true;
-                //nActivateOutlineLvl = pColl->GetOutlineLevel();	//#outline level,zhaojianwei
+                // --> OD 2009-08-27 #i101234#
+                // Check, if corresponding list level of the outline numbering
+                // has already a numbering format set.
                 nActivateOutlineLvl = pColl->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei,need further consideration
+                if ( pCollRule->Get( static_cast<USHORT>(nActivateOutlineLvl) ).GetNumberingType()
+                                == SVX_NUM_NUMBER_NONE )
+                {
+                    // activate outline numbering, because from the precondition
+                    // it's known, that <SwEdit::HasNumber()> == FALSE
+                    bActivateOutlineRule = true;
+                }
+                else
+                {
+                    // turning on outline numbering at current cursor position
+                    bContinueFoundNumRule = true;
+                }
+                // <--
             }
             else
             {
                 // check, if numbering of the outline level of the pararaph
                 // style is active. If not, activate this outline level.
-                //nActivateOutlineLvl = pColl->GetOutlineLevel();
                 nActivateOutlineLvl = pColl->GetAssignedOutlineStyleLevel();//#outline level,zhaojianwei
-                //ASSERT( /*nActivateOutlineLvl >= 0 &&*/ nActivateOutlineLvl < MAXLEVEL,
                 ASSERT( pColl->IsAssignedToListLevelOfOutlineStyle(),//#outline level,zhaojianwei
                         "<SwWrtShell::NumOrBulletOn(..)> - paragraph style with outline rule, but no outline level" );
-                //if ( /*nActivateOutlineLvl >= 0 &&*/ nActivateOutlineLvl < MAXLEVEL &&
                 if ( pColl->IsAssignedToListLevelOfOutlineStyle() &&//#outline level,zhaojianwei
                      pCollRule->Get( static_cast<USHORT>(nActivateOutlineLvl) ).GetNumberingType()
                         == SVX_NUM_NUMBER_NONE )
@@ -1214,12 +1222,12 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
     {
         if ( !pNumRule->IsAutoRule() )
         {
-            pNumRule = 0L;
+            pNumRule = 0;
         }
         else if ( pNumRule == GetDoc()->GetOutlineNumRule() &&
                   !bActivateOutlineRule && !bContinueFoundNumRule )
         {
-            pNumRule = 0L;
+            pNumRule = 0;
         }
     }
     // <--
@@ -1231,7 +1239,7 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
     if ( !pNumRule )
     {
         pNumRule = GetDoc()->SearchNumRule( *GetCrsr()->GetPoint(),
-                                            FALSE, bNum, FALSE, 0,
+                                            false, bNum, false, 0,
                                             sContinuedListId );
         bContinueFoundNumRule = pNumRule != 0;
     }
@@ -1292,11 +1300,12 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
     }
     else
     {
+        // --> OD 2009-08-27 #i95907#
+        const SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode(
+                                    numfunc::GetDefaultPositionAndSpaceMode() );
         // --> OD 2008-02-11 #newlistlevelattrs#
-        SwNumRule aNumRule( GetUniqueNumRuleName(),
-                            // --> OD 2008-06-06 #i89178#
-                            numfunc::GetDefaultPositionAndSpaceMode() );
-                            // <--
+        SwNumRule aNumRule( GetUniqueNumRuleName(), ePosAndSpaceMode );
+        // <--
         // <--
         // Zeichenvorlage an die Numerierung haengen
         SwCharFmt* pChrFmt;
@@ -1317,9 +1326,10 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
             pChrFmt = GetCharFmtFromPool( RES_POOLCHR_BUL_LEVEL );
         }
 
-        SwTxtNode * pTxtNode =
-            GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
-        USHORT nWidthOfTabs = pTxtNode->GetWidthOfLeadingTabs();
+        const SwTxtNode* pTxtNode = GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
+        const SwTwips nWidthOfTabs = pTxtNode
+                                     ? pTxtNode->GetWidthOfLeadingTabs()
+                                     : 0;
         GetDoc()->RemoveLeadingWhiteSpace( *GetCrsr()->GetPoint() );
 
         const bool bHtml = 0 != PTR_CAST(SwWebDocShell, pDocSh);
@@ -1341,16 +1351,21 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
                 aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
             }
 
-            if(bHtml && nLvl)
+            // --> OD 2009-08-26 #i95907#
+            if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                // 1/2" fuer HTML
-                aFmt.SetLSpace(720);
-                aFmt.SetAbsLSpace(nLvl * 720);
-            }
-            else if ( nWidthOfTabs > 0 )
-            {
-                aFmt.SetAbsLSpace(nWidthOfTabs + nLvl * 720);
+                if(bHtml && nLvl)
+                {
+                    // 1/2" fuer HTML
+                    aFmt.SetLSpace(720);
+                    aFmt.SetAbsLSpace(nLvl * 720);
+                }
+                else if ( nWidthOfTabs > 0 )
+                {
+                    aFmt.SetAbsLSpace(nWidthOfTabs + nLvl * 720);
+                }
             }
+            // <--
 
             // --> FME 2005-01-21 #i38904#  Default alignment for
             // numbering/bullet should be rtl in rtl paragraph:
@@ -1363,6 +1378,21 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
             aNumRule.Set( nLvl, aFmt );
         }
 
+        // --> OD 2009-08-26 #i95907#
+        if ( pTxtNode &&
+             ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
+        {
+            short nTxtNodeFirstLineOffset( 0 );
+            pTxtNode->GetFirstLineOfsWithNum( nTxtNodeFirstLineOffset );
+            const SwTwips nTxtNodeIndent = pTxtNode->GetLeftMarginForTabCalculation() +
+                                           nTxtNodeFirstLineOffset;
+            if ( ( nTxtNodeIndent + nWidthOfTabs ) != 0 )
+            {
+                const SwTwips nIndentChange = nTxtNodeIndent + nWidthOfTabs;
+                aNumRule.ChangeIndent( nIndentChange );
+            }
+        }
+        // <--
         // --> OD 2008-02-08 #newlistlevelattrs#
         // reset indent attribute on applying list style
         // --> OD 2008-03-17 #refactorlists#
@@ -1727,6 +1757,12 @@ SwWrtShell::SwWrtShell( SwWrtShell& rSh, Window *_pWin, SwView &rShell )
 
     SetSfxViewShell( (SfxViewShell *)&rShell );
     SetFlyMacroLnk( LINK(this, SwWrtShell, ExecFlyMac) );
+
+	// place the cursor on the first field...
+	IFieldmark *pBM = NULL;
+	if ( IsFormProtected() && ( pBM = GetFieldmarkAfter( ) ) !=NULL ) {
+	    GotoFieldmark(pBM);
+	}
 }
 
 
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 28fd1b693..093f08417 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -239,6 +239,13 @@ BOOL SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
     return bResult;
 }
 
+BOOL SwWrtShell::UpdateField( sw::mark::IFieldmark &fieldBM )
+{
+    return SwEditShell::UpdateField(fieldBM);
+}
+
+
+
     // ein Klick aus das angegebene Feld. Der Cursor steht auf diesem.
     // Fuehre die vor definierten Aktionen aus.
 
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
index 611778a45..7265a53a9 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
@@ -48,9 +48,6 @@ end sub
 '--------------------------------------------------------------------------------------
 testcase tFromText
 
-    qaerrorlog "#85993# control property dialog could not open"
-    goto endsub
-
     '/// Open a new document and empty clipboard
         printlog "Open a new document and empty clipboard"
 	call hNewDocument
@@ -163,9 +160,6 @@ endcase
 '--------------------------------------------------------------------------------------
 testcase tFromCalc
 
-    qaerrorlog "#85993# control property dialog could not open"
-    goto endsub
-
     '/// Open a new document and empty clipboard
         printlog "Open a new document and empty clipboard"
         gApplication = "CALC"
@@ -280,9 +274,6 @@ endcase
 '--------------------------------------------------------------------------------------
 testcase tFromDraw
 
-    qaerrorlog "#85993# control property dialog could not open"
-    goto endsub
-
     '/// Open a new document and empty clipboard
         printlog "Open a new document and empty clipboard"
         gApplication = "DRAW"
@@ -396,9 +387,6 @@ endcase
 '--------------------------------------------------------------------------------------
 testcase tFromImpress
 
-    qaerrorlog "#85993# control property dialog could not open"
-    goto endsub
-
     '/// Open a new document and empty clipboard
         printlog "Open a new document and empty clipboard"
         gApplication = "IMPRESS"
diff --git a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
index be1544c81..98771d234 100755
--- a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
@@ -213,14 +213,24 @@ endcase
 '-------------------------------------------------------------------------
 testcase tMozilla
 
-    call fCreateMozillaAddressbookDatasource(gOfficePath + "user/work/tt_mozilla.odb")
-    call fOpendatabase(gOfficePath + "user/work/tt_mozilla.odb")
-    
-    Kontext "ContainerView"
-        ViewTables
-    
-    call fCloseDatabase(true)    
+    if ( fCreateMozillaAddressbookDatasource(gOfficePath + "user/work/tt_mozilla.odb") = true) then
+        if ( fOpendatabase(gOfficePath + "user/work/tt_mozilla.odb") = true) then        
+            Kontext "ContainerView"
+                ViewTables
+        else
+            warnlog "mozilla database could not be open."
 
+        endif
+    else
+        qaerrorlog "mozilla database could not be created. Maybe you have no mozilla installed."
+    	Kontext "MessageBox"
+    		if (MessageBox.exists(1)) then
+    			MessageBox.OK
+    		endif
+    endif
+	' try to close the database    
+    call fCloseDatabase(false)
+    
 endcase
 '-------------------------------------------------------------------------
 testcase tJDBC
diff --git a/testautomation/dbaccess/tools/dbcreatetools.inc b/testautomation/dbaccess/tools/dbcreatetools.inc
index a13831065..f3d5abd6c 100755
--- a/testautomation/dbaccess/tools/dbcreatetools.inc
+++ b/testautomation/dbaccess/tools/dbcreatetools.inc
@@ -1331,7 +1331,7 @@ function fCreateMozillaAddressbookDatasource(sFileName, optional sRegister) as b
         call fClosedatabase(true)
 
 	catch
-    	warnlog "*** Failed *** Data source was not created"
+    	qaerrorlog "*** Failed *** Data source was not created"
         bOK = false
     endcatch	
 	
diff --git a/testautomation/framework/optional/f_options_ooo.bas b/testautomation/framework/optional/f_options_ooo.bas
index 6730568cb..d21514ed6 100755
--- a/testautomation/framework/optional/f_options_ooo.bas
+++ b/testautomation/framework/optional/f_options_ooo.bas
@@ -39,6 +39,7 @@
 
 sub main
 
+    GLOBAL_USE_NEW_SLEEP = TRUE
     
     use "framework\optional\includes\options_ooo_general.inc"
     use "framework\optional\includes\options_ooo_memory.inc"
diff --git a/testautomation/framework/optional/includes/options_ooo_colors.inc b/testautomation/framework/optional/includes/options_ooo_colors.inc
index b9dd964be..60278f6aa 100755
--- a/testautomation/framework/optional/includes/options_ooo_colors.inc
+++ b/testautomation/framework/optional/includes/options_ooo_colors.inc
@@ -37,118 +37,176 @@
 '*
 '\******************************************************************************
 
-
 testcase tOOoColors
-    dim USERCOLOR as String
+
+    printlog( "OOo color palette" )
+
     dim myColor(4)      as String
     dim oldColor(4)     as String
     dim currentColor(4) as String
     dim chColor(4)      as String
-    dim iDefaultColorCount  as Integer
-    dim iModifiedColorCount as Integer
-    dim iTemp as integer
-    dim i as integer
     
-    USERCOLOR = "TT-Test" + iSprache
-    myColor(1) = USERCOLOR
+    const DEFAULT_COLOR_COUNT = 103
+    const CHANGED_COLOR_COUNT = 104
+    const USER_COLOR = "TT-Test-Color"
+    
+    myColor(1) = USER_COLOR
     myColor(2) = "255"
     myColor(3) = "245"
     myColor(4) = "200"
-    
-    printlog " testing Tools/Options -> colors"
-    '///check if all settings are saved in configuration ( StarOffice / Colors )
-    '///open Tools / Options / StarOffice / Colors
-    printlog " - Save current settings and modify/add some colors"
+
+    printlog( "Check if all settings are saved in configuration ( StarOffice / Colors )" )
+    printlog( "Open Tools / Options / StarOffice / Colors" )
     ToolsOptions
+    
+    Kontext "ExtrasOptionenDlg"
+    if ( ExtrasOptionenDlg.exists( 1 ) ) then
+    
         hToolsOptions ( "StarOffice", "Colors" )
+        
+        printlog( "Delete the userdefined color if it exists" )
+        if ( Farbe.GetItemCount() <> DEFAULT_COLOR_COUNT + 1 ) then
+            call DeleteColor( USER_COLOR )
+        endif
     
-        '///determine the number of currently registered colors
-        iDefaultColorCount = Farbe.GetItemCount()
-        for i = 1 to iDefaultColorCount 
-            printlog "("+i+"/"+iDefaultColorCount +"): '"+Farbe.getItemText(i)+"'"
-        next i
-        printlog " - Currently colors are listed: '" + iDefaultColorCount + "'"
-        '///delete the userdefined color if it exists
-        call DeleteColor( USERCOLOR )
-        '///determine the number of currently registered colors
+        printlog( "Check the number of currently registered colors - cancel test on error" )
         Kontext "TabFarben"
-        iDefaultColorCount = Farbe.GetItemCount
-        printlog " - Colors after deleting: '" + iDefaultColorCount + "'"
-        '///select the last color in the list
-        printlog " - jump to the last color in the list."
+        if ( Farbe.GetItemCount() <> DEFAULT_COLOR_COUNT ) then
+            warnlog( "The number of colors has changed, stopping test" )
+            printlog( "Expected: " & DEFAULT_COLOR_COUNT )
+            printlog( "Found...: " & Farbe.getItemCount() )
+            printlog( "Close the Tools/Options dialog with OK" )
+            Kontext "ExtrasOptionenDlg"
+            ExtrasOptionenDlg.OK
+            WaitSlot( 2000 )
+            goto endsub
+        else
+            printlog( "Number of colors is ok: " & DEFAULT_COLOR_COUNT )
+        endif        
+        
+        printlog( "Jump to the last color in the list." )
         Kontext "TabFarben"
-        Farbe.Select( iDefaultColorCount )
-        '///get the settings for the current selected color 
-        '(204,204,255)
-        call getColorRGB(oldColor())
-        '///change settings for last color and press 'modify' 
-        '(255,255,255)
-        call ModifyColorRGB_PGUP(iDefaultColorCount)
-        '///get the changed colors (Sun 4,255,255,255)
+        Farbe.Select( Farbe.GetItemCount() )
+        
+        printlog( "Get the settings for the current selected color" )
+        call getColorRGB(oldColor()) '(204,204,255)
+
+        printlog( "Change settings for last color and press 'modify'" )
+        call ModifyColorRGB_PGUP( DEFAULT_COLOR_COUNT ) '(255,255,255)
+        
+        printlog( "Get the changed colors (Sun 4,255,255,255)" )
         call GetColorRGB(chColor())
-        '///change the settings again and save it as TT-Test (adding to the list)
-        '(255,245,200)
-        call CreateNewColor(myColor())
-        '///get the current number of registered colors (should be 92)
+        
+        printlog( "Change the settings again and save it as TT-Test (adding to the list)" )
+        call CreateNewColor(myColor()) '(255,245,200)
+        
+        printlog( "Check the number of currently registered colors" )
         Kontext "TabFarben"
-        iModifiedColorCount = Farbe.getItemCount
-        printlog " - Currently colors are listed: '" + iModifiedColorCount + "'" 
-        '///close the options dialog with OK
-        printlog " - close extras/options"
+        if ( Farbe.getItemCount() <> CHANGED_COLOR_COUNT ) then
+            warnlog( "The number of colors has changed" )
+            printlog( "Expected: " & CHANGED_COLOR_COUNT )
+            printlog( "Found...: " & Farbe.getItemCount() )
+        else
+            printlog( "Number of colors is ok: " & DEFAULT_COLOR_COUNT )
+        endif        
+
+        printlog( "Close the Tools/Options dialog with OK" )
         Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
-    Sleep(3)
+        WaitSlot( 2000 )
+    else
+        warnlog( "Tools/Options dialog not open" )
+    endif
     
-    '///exit and restart the office
-    printlog " - exit/restart StarOffice"
+    printlog( "Exit and restart the office" )
     ExitRestartTheOffice
-    '///check the changes
-    printlog " - first check of changes (modifications)"
-    '///open tools / options / StarOffice / Colors
+    
+    printlog( "Check the changes" )
     ToolsOptions
+    
+    Kontext "ExtrasOptionenDlg"
+    if ( ExtrasOptionenDlg.exists( 1 ) ) then
+    
         hToolsOptions ( "StarOffice", "Colors" )
-        '///check the number of colors ( is the new entry saved )
-        '(92)
-        iTemp = Farbe.getItemCount
-        printlog "Current color count: '" + iTemp + "'"
-        if (iTemp <> iModifiedColorCount) then 
-            Warnlog "The number of registered colors is incorrect. Should be: '" + iModifiedColorCount + "' is: '"+ iTemp + "'" 
-        end if
-        '///select the changed color and check the changes
+        
+        printlog( "Check the number of colors (Plus one color)" )
+        Kontext "TabFarben"
+        if ( Farbe.getItemCount() <> CHANGED_COLOR_COUNT ) then
+            warnlog( "The number of colors has changed" )
+            printlog( "Expected: " & CHANGED_COLOR_COUNT )
+            printlog( "Found...: " & Farbe.getItemCount() )
+        else
+            printlog( "Number of colors is ok: " & DEFAULT_COLOR_COUNT )
+        endif        
+        
+        printlog( "Select the changed color and check the changes" )
         Kontext "TabFarben"   
-        Farbe.Select(iDefaultColorCount)
+        Farbe.Select( DEFAULT_COLOR_COUNT )
         call compareTwoColorsRGB(chColor())
-        '///select the new color ( TT-Test ) and check the name and the settings
+        
+        printlog( "Select the new color ( TT-Test ) and check the name and the settings" )
         Kontext "TabFarben"
-        Farbe.Select(iModifiedColorCount)
+        Farbe.Select( CHANGED_COLOR_COUNT )
         call CompareTwoColorsRGB(myColor())
     
-        '///delete the new userdefined color
-        call deleteColor( USERCOLOR )
-        '///reset the modified color to default
+        printlog( "Delete the new userdefined color" )
+        call deleteColor( USER_COLOR )
+
+        printlog( "Check the number of colors (One removed)" )
         Kontext "TabFarben"
-        Farbe.Select(iDefaultColorCount)
+        if ( Farbe.getItemCount() <> DEFAULT_COLOR_COUNT ) then
+            warnlog( "The number of colors has changed" )
+            printlog( "Expected: " & DEFAULT_COLOR_COUNT )
+            printlog( "Found...: " & Farbe.getItemCount() )
+        else
+            printlog( "Number of colors is ok: " & DEFAULT_COLOR_COUNT )
+        endif        
+        
+        printlog( "reset the modified color to default" )
+        Kontext "TabFarben"
+        Farbe.Select( DEFAULT_COLOR_COUNT )
         call ModifyColorRGB(oldColor())
-        '///close options dialog with OK
+        
+        printlog( "Close options dialog with OK" )
         Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
-    Sleep(3)
-    
-    '///reopen options dialog and check the reset
-    printlog " - Second check of changes (reset)"
+        WaitSlot( 2000 )
+        
+    else
+        warnlog( "Tools/Options dialog not open" )
+    endif
+
+    printlog( "Reopen options dialog and check the reset" )
     ToolsOptions
+    
+    Kontext "ExtrasOptionenDlg"
+    if ( ExtrasOptionenDlg.exists( 1 ) ) then
+    
         hToolsOptions ( "StarOffice", "Colors" )
-        '///check if the number of colors in the list has been restored
-        iTemp = Farbe.getItemCount
-        printlog "Current color count: '" + iTemp + "'"
-        if (iTemp <> iDefaultColorCount)  then 
-            Warnlog "The number of registered colors is incorrect. Should be: '" + iDefaultColorCount + "' is: '"+ iTemp + "'" 
-        endif
-        '///check if the last color has been reset to defaults.
+        
+        printlog( "Check if the number of colors in the list has been restored" )
         Kontext "TabFarben"
-        Farbe.Select(iDefaultColorCount)
+        if ( Farbe.getItemCount() <> DEFAULT_COLOR_COUNT ) then
+            warnlog( "The number of colors has changed" )
+            printlog( "Expected: " & DEFAULT_COLOR_COUNT )
+            printlog( "Found...: " & Farbe.getItemCount() )
+        else
+            printlog( "Number of colors is ok: " & DEFAULT_COLOR_COUNT )
+        endif        
+ 
+        
+        printlog( "Check if the last color has been reset to defaults." )
+        Kontext "TabFarben"
+        Farbe.Select( DEFAULT_COLOR_COUNT )
         call compareTwoColorsRGB(oldColor())
-        '///close options dialog with OK
+
+        printlog( "Close options dialog with OK" )
         Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
+        WaitSlot( 2000 )
+        
+    else
+        warnlog( "Tools/Options dialog not open" )
+    endif
+    
 endcase
diff --git a/testautomation/framework/optional/includes/options_ooo_view.inc b/testautomation/framework/optional/includes/options_ooo_view.inc
index 6cd38ac53..c631cc6f3 100755
--- a/testautomation/framework/optional/includes/options_ooo_view.inc
+++ b/testautomation/framework/optional/includes/options_ooo_view.inc
@@ -123,7 +123,13 @@ sub checkPage( sFile as string , bDisabled as boolean, optional iMiddleMouseButt
     else
         printlog( "Hardware acceleration is not available on this system" )
     endif
-    checkCheckBox( sFile , "*" , UseAntiAliasing )
+    
+    if ( UseAntiAliasing.isEnabled() ) then
+        checkCheckBox( sFile , "*" , UseAntiAliasing )
+    else
+        printlog( "Antialiasing is not available on this system" )
+    endif
+    
     checkListBox( sFile , "*" , MousePositioning)
     ' needs to get handled differently on platforms!
     iMiddleMouseButton = MausAktion.getSelIndex
@@ -209,7 +215,13 @@ sub changePage( sFile as string , bInverted as boolean, optional iMiddleMouseBut
     else
         printlog( "Harware acceleration is not available on this system" )
     endif
-    setCheckBox( sFile , "*" , useantialiasing )
+    
+    if ( UseAntiAliasing.isEnabled() ) then
+        setCheckBox( sFile , "*" , useantialiasing )
+    else
+        printlog( "Antialiasing is not available on this system" )
+    endif
+    
     setListBox( sFile , "*" , MousePositioning )
     ' needs to get handled differently on platforms!
     if iMiddleMouseButtonExtern = 1 then
diff --git a/testautomation/framework/optional/input/options/ooo_view_changed.ref b/testautomation/framework/optional/input/options/ooo_view_changed.ref
index 3ef988480..210aa30b2 100755
--- a/testautomation/framework/optional/input/options/ooo_view_changed.ref
+++ b/testautomation/framework/optional/input/options/ooo_view_changed.ref
@@ -11,7 +11,7 @@ schriftenhistorie=unchecked
 dokumentansicht=unchecked
 geoeffnetedokumente=checked
 opengl=checked
-UseHardwareAcceleration=checked
+usehardwareacceleration=unchecked
 useantialiasing=unchecked
 mousepositioning=2
 mausaktion=1
diff --git a/testautomation/framework/optional/input/options/ooo_view_defaults.ref b/testautomation/framework/optional/input/options/ooo_view_defaults.ref
index f56b0062e..919ea81ce 100755
--- a/testautomation/framework/optional/input/options/ooo_view_defaults.ref
+++ b/testautomation/framework/optional/input/options/ooo_view_defaults.ref
@@ -11,7 +11,7 @@ dokumentansicht=checked
 geoeffnetedokumente=unchecked
 opengl=unchecked
 useantialiasing=checked
-usehardwareacceleration=disabled
+usehardwareacceleration=checked
 mousepositioning=3
 mausaktion=2
 transparency=checked
diff --git a/testautomation/framework/required/f_first.bas b/testautomation/framework/required/f_first.bas
index aaeff2f25..71533ebe9 100755
--- a/testautomation/framework/required/f_first.bas
+++ b/testautomation/framework/required/f_first.bas
@@ -40,6 +40,10 @@
 
 sub main
 
+    ' Disable sleep() calls. If you encounter unexpected test interruptions
+    ' you should try to outcomment this or set the value to FALSE.
+    GLOBAL_USE_NEW_SLEEP = TRUE
+
     use "framework\required\includes\first.inc"
     use "framework\required\includes\graphics_import.inc"
     
diff --git a/testautomation/framework/required/includes/standard_toolbar_3.inc b/testautomation/framework/required/includes/standard_toolbar_3.inc
index 2af30fef9..ef4012aa5 100755
--- a/testautomation/framework/required/includes/standard_toolbar_3.inc
+++ b/testautomation/framework/required/includes/standard_toolbar_3.inc
@@ -40,304 +40,223 @@
 testcase tStandardBar_3
 
     dim sFileOut as String
+    dim HyperlinkTabID as integer
+    dim iTabPage as integer
     
-    '///<h1>Update test for all icons on the StandardBar</h1>
+    printlog( "Icons on the standardbar" )
 
-    '///<ul>
-    printlog "************************************************************"
-    printlog "Check all visible icons on the Standardbar"
-    printlog "************************************************************"
-    
     gApplication = "CALC"
 
-    '///+<li>Setup: Delete files from the workdirectory to ensure a clean test</li>
+    printlog( "Cleanup test environment - delete files" )
     sFileOut = hGetWorkPath() & "FWK-update-functionbar" & hGetSuffix( "current" )
     ConvertPath ( sFileOut )
     hDeleteFile( sFileOut )
 
-    '///+<li>Setup: Reset the Standardbar to defaults</li>
+    printlog( "Reset the standardbar to defaults" )
     hResetStandardBar()
-    printlog "check all entries on the 'Standardbar'"
-
-    '///+<li>Skipping testing of URL field, it is hidden by default and tested somewhere else</li>
-    printlog "Skipping URL-Field"
-
-    '///+<li>File Save</li>
-    '///<ul>
-
-    printlog "Save File"
-    gApplication = "CALC"
 
-    '///+<li>New Spreadsheet document, ensure that the navigator is closed</li>
     printlog( "New Spreadsheet document" )
     hCreateDocument()
+
     Kontext "Navigator"
     if ( Navigator.Exists() ) then
         Navigator.close()
     endif
 
-    '///+<li>Insert some text in one cell (don't forget to press a <Enter> at the end)<br>
     printlog( "Insert text into a random cell, press <Enter>" )
     Kontext "DocumentCalc"
     DocumentCalc.TypeKeys( "Only for a test.<Return>" )
 
-    '///+ <i>Save-Button must be active -> click on the button</i></li>
-    printlog( "Press the 'Save' button" )
-
     Kontext "Standardbar"
+    printlog( "Press the 'Save' button" )
     hWaitForObject( Speichern , 1000 )
     Speichern.click()
 
-    '///+<li>Set a filenname, remember it for further usage</li>
-    printlog( "- Save the file to: " & sFileOut )
 
     Kontext "SpeichernDlg"
+    printlog( "- Save the file to: " & sFileOut )
     Dateiname.SetText( sFileOut )
     Speichern.Click()
 
-    '///+<li>Close the document</li>
     printlog( "Close the document" )
     hDestroyDocument()
-
-    '///</ul>
     
-    '///+<li>Edit File by pressing &quot;File Open&quot; button on the StandardBar</li>
-
-    '///<ul>
-    printlog( "Edit the file by pressing the 'File Open' button" )
-
-    '///+<li>Click the File Open button<br>The File Open dialog should pop up</li>
-    FileOpen
+    printlog( "Click the 'File Open' button" )
+    hUseAsyncSlot( "FileOpen" )
 
     Kontext "OeffnenDlg"
+    Printlog( "Load test file in read-only mode" )
     if ( OeffnenDlg.exists( 2 ) ) then
-    
-        '///+<li>Enter the name of the file we used earlier</li>
         Dateiname.SetText( sFileOut )
-        
-        '///+<li>Check the &quot;Read only&quot; checkbox</li>
         NurLesen.Check()
-        
-        '///+<li>Click &quot;Open&quot;</li>
         oeffnen.click()
-        sleep( 3 )
     else
         warnlog( "File Open dialog is missing" )
     endif
+    
+    wait( 2000 )
 
-    '///+<li>Verify that the document is opened read-only<br>This can be done by 
-    '///+ travelling through the menus or trying to enter some text into the document.<br>
-    '///+ In this case we try to insert a chart into the spreadsheet which should fail.</li>
     Kontext "DocumentCalc"
+    printlog( "Try to insert a chart to verify that the document is read-only (this should fail)" )
     try
-        printlog( "Trying to insert a chart" )
         InsertChartCalc
         warnlog( "The document is not read-only" )
     catch
-        printlog( "Failed to insert chart -> Document is read-only. Good!" )
     endcatch
-        
 
-    '///+<li>Click on &quot;Edit File&quot;<br>This should open another copy of the
-    '///+ document. The copy should open in the foreground and be editable.</li>
     Kontext "Standardbar"
+    printlog( "Click the <Edit File> button" )
     hWaitForObject( Bearbeiten , 1000 )
-    Bearbeiten.click()
+    Bearbeiten.click() : WaitSlot()
 
-    '///+<li>Verify that the file can be edited by inserting a Chart</li>
+    printlog( "Try to insert a chart (should work this time)" )
     InsertChartCalc
+    
     Kontext "ChartWizard"
     if ( ChartWizard.exists( 2 ) ) then
-        printlog( "Chart Wizard is open. Good." )
-        
-        '///+<li>Cancel Chart Wizard</li>
         printlog( "Cancel Chart Wizard" )
         ChartWizard.cancel()
-        WaitSlot
+        WaitSlot()
     else
         warnlog( "Chart Wizard should be open" )
     endif
-    
-
-    '///</ul>
-    '///+<li>Skipping to print file directly</li>
 
-    '///+<li>Cut / Copy / Paste</li>
-
-    '///<ul>
-    '///+<li>Select a row in the spreadsheet</li>
+    printlog( "Select a few cells for Cut/Copy/Paste test" )
     Kontext "DocumentCalc"
     DocumentCalc.TypeKeys( "<Up>", 7 )
     DocumentCalc.TypeKeys( "<Shift Down>", 5 )
 
-    '///+<li>Click on Cut</li>
     printlog( "Cut" )
     Kontext "Standardbar"
     hWaitForObject( Ausschneiden , 1000 )
     Ausschneiden.Click()
     WaitSlot()
 
-    '///+<li>Move one cell down</li>
     Kontext "DocumentCalc"
+    printlog( "Move down one cell" )
     DocumentCalc.TypeKeys( "<Down>" )
 
-    '///+<li>Click on Paste</li>
     printlog( "Paste" )
     Kontext "Standardbar"
     sleep( 3 ) ' No better solution found yet.
     Einfuegen.Click()
 
     Kontext "DocumentCalc"
+    printlog( "Move up 7 cells, then do <shift down>" )
     DocumentCalc.TypeKeys( "<Up>", 7 )
     DocumentCalc.TypeKeys( "<Shift Down>", 5 )
-    waitslot
+    WaitSlot()
 
-    '///+<li>Select a row in the spreadsheet at random</li>
-    '///+<li>Click on Copy</li>
     printlog( "Copy" )
     Kontext "Standardbar"
     hWaitForObject( Kopieren , 1000 )
     Kopieren.Click()
-    waitslot
-
-    '///+<li>Press right-arrow and <return></li>
+    WaitSlot()
 
     Kontext "DocumentCalc"
+    printlog( "Press right arrow and RETURN" )
     DocumentCalc.TypeKeys( "<Right><Return>" )
-    waitslot
+    WaitSlot()
 
-    '///+<li>Click on Paste</li>
     printlog( "Paste again" )
     Kontext "Standardbar"
     hWaitForObject( Einfuegen , 1000 )
     Einfuegen.Click()
 
-
-    '///</ul>
-
-    '///+<li>Undo / Redo</li>
-
-    '///<ul>
-
-    '///+<li>click on Undo</li>
     printlog( "Undo" )
     hWaitForObject( Undo , 2000 )
     Undo.Click()
     WaitSlot()
     
-    '///+<li>click on Redo</li>
+    printlog( "Redo" )
     hWaitForObject( Redo , 2000 )
     Redo.Click()
     WaitSlot()
 
-    '///</ul>
-
-    '///+<li>Navigator ( on/off )</li>
-
-    '///<ul>
-    '///+<li>Click on Navigator -> on</li>
-    printlog( "Open Navigator" )
     Kontext "Standardbar"
+    printlog( "Open Navigator" )
     hWaitForObject( NavigatorButton , 1000 )
     NavigatorButton.Click()
 
-    '///+<li>check if the navigator is visible</li>
-
     Kontext "Navigator"
     if ( Navigator.Exists( 1 ) ) then
-        printlog( "Navigator present. Good." )
-        
-        '///+<li>Click on Navigator -> off</li>
         printlog( "Close Navigator" )
         Kontext "Standardbar"
         NavigatorButton.Click()
-
-        '///+<li>Verify that the navigator is closed</li>
-        Kontext "Navigator"
-        if ( Navigator.exists() ) then
-            warnlog( "The navigator is still open" )
-        else
-            printlog( "Navigator is closed. Good." )
-        endif
     else
         warnlog( "Navigator did not open" )
     endif
 
-    '///</ul>
-    
-    '///+<li>Hyperlink dialog ( on / off )</li>
-    '///<ul>
+    Kontext "Navigator"
+    if ( Navigator.exists() ) then
+        warnlog( "The navigator should not be visible" )
+    endif
 
-    '///+<li>Click on Hyperlink dialog  -> on</li>
-    printlog( "Click <HyperLink> to open the dialog" )
     Kontext "Standardbar"
+    printlog( "Click <HyperLink> to open the dialog" )
     hWaitForObject( HyperlinkDialog , 1000 )
     HyperlinkDialog.Click()
 
-    '///+<li>check if the Hyperlink dialog is visible
-    Kontext "Hyperlink"
-    if ( Hyperlink.Exists( 1 ) ) then
-        printlog( "Hyperlink dialog is open" )
+    for iTabPage = 1 to 4
+        select case iTabPage
+        case 1: Kontext "Hyperlink"
+            if ( Hyperlink.exists() ) then HyperlinkTabID = 1
+            exit for
+        case 2: kontext "TabHyperlinkMailUndNews"
+            if ( TabHyperlinkMailUndNews.exists() ) then HyperlinkTabID = 2
+            exit for
+        case 3: kontext "TabHyperlinkDokument"
+            if ( TabHyperlinkDokument.exists() ) then HyperlinkTabID = 3
+            exit for
+        case 4: kontext "TabHyperlinkNeuesDokument"
+            if ( TabHyperlinkNeuesDokument.exists() ) then HyperlinkTabID = 4
+            exit for
+        case default:
+            HyperlinkTabID = 0
+        end select
+    next iTabPage
+
+    if ( HyperlinkTabID > 0 ) then    
+    
+        if ( HyperlinkTabID <> 1 ) then
+            qaerrorlog( "This is not the internet tabpage, did you " & _
+                        "kill the userlayer before running the test?" )
+        endif
         
-        '///+<li>Click on HyperLink again to close the dialog</li>
-        printlog( "Click <HyperLink> to close" )
         kontext "Standardbar"
+        printlog( "Click <HyperLink> to close" )
         HyperlinkDialog.Click()
         WaitSlot()
-        kontext "HyperLink"
-        if ( HyperLink.exists() ) then
-            warnlog( "Hyperlink dialog not closed" )
-        else
-            printlog( "Hyperlink dialog has been closed. Good." )
-        endif
     else
-        warnlog( "Hyperlink dialog is not open" )
+        warnlog( "#i104704# - Insert Hyperlink dialog cannot be accessed" )
+        Kontext "Standardbar"
+        HyperlinkDialog.Click()
     endif
 
-    '///+<li>click on Hyperlink dialog  -> off
-    '///</ul>
-
-    '///+<li>Gallery ( on / off )</li>
-
-    '///<ul>
-    '///+<li>Click on the &quot;Gallery&quot; button</li>
-    printlog( "Gallery button" )
     Kontext "Standardbar"
-    hWaitForObject( GalleryButton , 1000 
+    printlog( "Gallery button" )
+    hWaitForObject( GalleryButton , 1000 )
     GalleryButton.Click()
     
     kontext "Gallery"
     if ( Gallery.exists( 3 ) ) then
-        printlog( "Gallery is open. Good." )
-        
-        '///+<li>Close the Gallery again</li>
         printlog( "Gallery button again, to close" )
         kontext "StandardBar"
         GalleryButton.click()
-        waitslot
+        WaitSlot()
         
         kontext "Gallery" 
         if ( Gallery.exists() ) then    
             warnlog( "Gallery did not close " )
-        else
-            printlog( "Gallery is closed" )
         endif
     else
         warnlog( "The Gallery did not open" )
     endif
-    '///</ul>
-        
-    '///+<li>Cleanup: Close both documents</li>
-    do while( getDocumentCount > 0 ) 
-        hDestroyDocument()
-    loop
 
-    
-    '///+<li>Cleanup: Delete the workfile</li>
+    printlog( "Close all documents and delete files" )        
+    hDestroyDocument()
     hDeleteFile( sFileOut )
 
-    '///</ul>
-
 endcase
 
 
diff --git a/testautomation/framework/required/input/mailmerge_data.odb b/testautomation/framework/required/input/mailmerge_data.odb
dissimilarity index 71%
index f0e678a2123cb30ee40d9cc18b8ca87f558c1a6f..3ba8709c0ab952d8a80dc74d6347ee6b19ecb8e0 100755
GIT binary patch
delta 1288
zcwRd$eMFisz?+#xgn@yBfuX8K(Rw1EH9L$MAkW0WF`1u7Y-77Ub3I5E2L}gOiUA4m
z193`XNn%oBajJfCa#3bMN$!NRS%(b-THe=nxlUJ^&@7$tK0CA1HTC40Co1oj&Tuhd
z+|GD=xn1qkX->b2|E5W#xfvxYeAu*vYhfPOV$}p;uj9Wso6E#P8fX65<mqF_%E;}k
zP`~QkrSQUv&Lqt(LJM*i=o&_dA22)SaCVnd-ouHvw%&+s-~P^&>xSZKp~}kn>#rRu
zJO0^T!rxiuxb&`*=`r!gSN2bTx!3yp_NYmB4E~<#DBdrhGqsYd{`T@mU3}fU+hsl-
z{eI=xa#g$7rhD&YwFQ)J8{IPa&v;Pvt#R&os|%Zzl$&*PHt`2|vvYjb^K7~S^t3-C
z0|O-RV8OEa8p~uxb|`0Z0h@AtX`r<~FeL8%)z&H9{zfch#S=~~!wm~c`t`o4+CIE-
zuuN-eeE(Flg|10^e#d=}*c&SU{*S1U$%F~-Yu)8`3i&&6sos2LptQc=K~Uk=ySZ21
z6&{ZNcC~T+(wem6U!LYD^UP4brfa!oGGlwxMvGrQwq570JTX2dY@vITGkMX2uk}yP
z|4LY?y5&~;P0g7e&g*UqRG)Ay5TEd(nlnN{{LFKawZ$?Y`yU*t{qeMHa;M(m&6k8;
zcu&$iB6IQy_q8VP6G~0I_vWsDnj`&-(a1FQ;_uLP6&)e(*x#|;?fTkN#kEy;`oH`;
z(HE04H@04Uy31z8l4qYAs*<9=F@wU1o3l;P_&YG5cEbY-7*Y&Z;_8huug(l}1d2{z
z+Ps%NjFAl@H`$I?Y_mNl2O|%1piWNa(yOoTI`jQn>T=Gl3wp&kGXwaZZb;6E?FhTH
zqEK+p-%HNNRdy&meHQWU`TdQu=k=Gn%~`p5)m2WPLmVtGH?5swr?NqN+Cl3x>G~hD
zXX$sn&sFmaT0Kk0-`zQ<e181u)&>Sc^Ch2mg{ijYmOJ=#hpahnaop{UnL<KIt7!Ox
z2j6|v>%DI8PiJyZGj`39-M{za{Y4o~$rG46rB{aWvM$-V`(Lon)Jcr-ys8SlnIW1t
zOMBB}Ten?bs4ewwsp^iUS86Y_xP3BYWT{zoDEX9?wq4WJw4XY?FAu$7v0FB6ZQ693
zk_WD-s*!y5joaQ#N!)*CuTFi{<LQ}J+ofc+H`VQIemLFWMd`a~Gwv?DRrta1-rP%X
z#6jV^!|KsRabO@mVg>~-Ba;XNA{$R$!L1L=$CK}I>q9cKg%UJOk&`e#a%N^YGC7k+
z8lHr^d8F!ZvLNN}q{QUx(gK)muqXn?G(4h(QH(2QL(*JOlwXiqRFaumjBqY`dSGDS
zMKNHt6g!d$AO=D&Fuf=+icgN`l~9H{1UX1VQOvRCnq0^wE*9X;$_C<c0-+?(vZ>r4
F9sv3E-YWnA

delta 1282
zcwRdqeO#I^z?+#xgaHJu#MK*3<g;dnF$3g<I2bq>c*4Vs7~o)IqbqYgJ4cGUpOFzW
z1H&C21_p=;Af+H}3`l?<h*J_v5|a{(Q}v6Ji!uvJa{Kpk9WoGc`)+sish*Zah~xL{
zqKgT$r>R6)dtOZ74qf>6$>r$MkNLLjcIVW2CMOH1gy|f-sFZYI$BI`s%+>pyLxddb
zGmm?lEf8j}5_X*+B|7<J;@O`P+pj+hnqzxtT2I78$#aJ;N|Y9A{7<kl+n0O)g-OkW
zFSp9JuHO|Mc<ueVaL>!Nxj)?RvrDs1yPIDtuUBb4<BT&0dt*iH-5dWpRXtAL(lHbg
zXiQo2rC8bc)W^6Y7fYXJ>i}<djunT^e{BbPNl1<n-PfC+vrJ}WhjJ!2vMJZc2KweV
z8}RJ?tgZC5Z^6=AA)3oqUgEo*nDu_5r%aZnip~tLH`nz8Hj4JuZM)yTw|aj~EeA7?
z>6aOA*KK#KaS~|{n$muGqgCkA3hVfFN%11b-(0J=4t_56g?FlI`>N{?0;WaE*aUZ1
zE*7mkR>7{`oq8|mP2|LbCWn&`y_cxws*juYGdnIN*C2(n_e<i<7o|)3rt)rN_2cF|
zdvSS?y5}#)%!8`Cwe5xX{m?X9%O0h>g8OW<+R~`vVwJP!g#-_>yg$~PlwqB)>N4xU
z&3m5wUMjC-`s85luE|&SNEy!c+-dMT%CMR%tLk`7+{wZlOKQ~qcxPTX^dMrXzM8vD
znZ|RS%*lV5K!LV_pKCG`FuWdMgc%~8Y(C5$#;C^5k$H7ym?Kc#1SVv)s0nbhJ|`ce
z3_C}xMMlCeAU}f%-Q3BZTzd63uFt9`y*2aI?YO9<$a`v`Oc_t-=|xjbykc1L_ZO^~
z!6Lro-kSJt>HoLQIeYH-w7CW@w|C0iJECn+vdj3IY|)LY-v9VEzf`H#T;=+AukOu2
z%i9S{`V|vy-+g{P>tKU-WMxU{<%r%z-0Yg&yAob2>Tg`CV}2lELW?3ZXWj8Re)Tte
zb8@<6WLr<~f0nW4QOU;{&7bydjS4hU@ITja!+N4m=iV-k?UR<}N52#O`$WOf?&?Fs
z)Yxmq`)=vXUn)4ya~Y$2aOram(RkS&qosjM*3F&}$o@Jr=2_g!`}g`!e_8lh;zW|n
z^lIK?s(n@8J6v8qe^l_p=U)9$c~Fqs=e(6PVE~5XT4qq#FfxfSAaeNRrQG_kEI#=*
zw>}dG!^A?d$x1v*_0aHxC38?J=Vw3$SC}#KGt78c;8%+sUl$A17=fYr1PhYpq{QUx
z(gIY?vh_yDiA5MichcksJaRy{PU2NyTsm2iR|3eMEYB&%jZmUEIfhq43F;1D7{G%-
R6vd>_$<uf>*k*t=0s!2xz)k=F

diff --git a/testautomation/framework/tools/includes/options_tools.inc b/testautomation/framework/tools/includes/options_tools.inc
index 078f8db67..862d85e58 100755
--- a/testautomation/framework/tools/includes/options_tools.inc
+++ b/testautomation/framework/tools/includes/options_tools.inc
@@ -37,7 +37,6 @@
 '*
 '\******************************************************************************
 
-
 sub GetPathList ( ls1 () as String, ls2 () as String, ls3 () as String )
 
     Dim lsInterim ( 50 ) as String
@@ -270,13 +269,13 @@ sub MouseTestForViewOptions
     '///mouse test for view options
 
     Kontext "DocumentWriter"
-    DocumentWriter.MouseMove 50, 50
-    DocumentWriter.OpenContextMenu
-    Sleep 1
+    DocumentWriter.MouseMove( 50, 50 )
+    DocumentWriter.OpenContextMenu()
+    Sleep( 1 )
 
     Kontext "DocumentWriter"
     DocumentWriter.MouseMove 50, 70
-    hMenuClose
+    hMenuClose()
 
 end sub
 
@@ -372,14 +371,15 @@ end sub
 
 sub modifyColorRGB_PGUP( iColor as Integer )
     'The current color's values are set to maximum (255) for RGB
-    printlog "modifyColorRGB_PGUP:: - change the color by pressing PAGE UP in RGB listboxes."
+    printlog( "modifyColorRGB_PGUP:: - change the color by pressing PAGE UP in RGB listboxes." )
+    
     Kontext "TabFarben"
     Farbe.Select(iColor)
     R.TypeKeys("<PageUp>")
     G.TypeKeys("<PageUp>")
     B.TypeKeys("<PageUp>")
-    printlog("modifyColorRGB_PGUP:: - press 'modify'")
-    Aendern.Click
+    printlog("modifyColorRGB_PGUP:: Press 'modify'")
+    Aendern.Click()
     Sleep (1)
 end sub
 
@@ -390,7 +390,7 @@ sub createNewColor( aColor() as String )
     ' OUTPUT: 
     'The desired color is selected by name and created.
     'If it already exists, there is a problem
-    printlog( "createNewColor:: - adding a color to the list: '" + aColor(1) + "'"
+    printlog( "createNewColor:: Adding a color to the list: '" + aColor(1) + "'"
     Kontext "TabFarben"
     FarbName.setText(aColor(1))
     R.SetText(aColor(2))
@@ -399,19 +399,20 @@ sub createNewColor( aColor() as String )
     Sleep(1)
     Hinzufuegen.Click
     Sleep(1)
+    
     Kontext "DuplicateNameWarning"
     if DuplicateNameWarning.Exists then
-        warnlog "createNewColor:: - Color already exists."
+        warnlog "createNewColor:: Color already exists."
         DuplicateNameWarning.OK
         Kontext "NameDlg"
         if NameDlg.Exists then
-            printlog "createNewColor:: - Naming dialog shown. Good, cancelling"
+            printlog "createNewColor:: Naming dialog shown. Good, cancelling"
             NameDlg.Cancel
         else
-            warnlog "createNewColor:: - Naming dialog didn't came up."
+            warnlog "createNewColor:: Naming dialog didn't came up."
         end if
     else
-        printlog "createNewColor:: - New color has been created"
+        printlog "createNewColor:: New color has been created"
     end if
 end sub
 
@@ -422,16 +423,18 @@ sub getColorRGB( aColor() as String )
     ' OUTPUT: array: (1): Name; (2): Red value; (3): Green value; (4): Blue value
     'A RGB color always has four attributes:
     'The name and the three RGB values (0...255)
-    printlog "GetColorRGB:: - determining the current color"
+    printlog( "GetColorRGB:: Determining the current color" )
     FarbModell.Select(1)
-    aColor(1) = FarbName.GetText
-    aColor(2) = R.GetText
-    aColor(3) = G.GetText
-    aColor(4) = B.GetText
-    printlog( "GetColorRGB:: N =" + aColor(1) )
-    printlog( "GetColorRGB:: R =" + aColor(2) )
-    printlog( "GetColorRGB:: G =" + aColor(3) )
-    printlog( "GetColorRGB:: B =" + aColor(4) )
+    
+    aColor(1) = FarbName.GetText()
+    aColor(2) = R.GetText()
+    aColor(3) = G.GetText()
+    aColor(4) = B.GetText()
+    
+    printlog( "GetColorRGB:: N = " & aColor(1) )
+    printlog( "GetColorRGB:: R = " & aColor(2) )
+    printlog( "GetColorRGB:: G = " & aColor(3) )
+    printlog( "GetColorRGB:: B = " & aColor(4) )
 end sub
 
 '*******************************************************************************
@@ -446,13 +449,14 @@ sub compareTwoColorsRGB( aColor() as String )
     dim i as Integer
     dim bColor(4) as String
 
-    printlog "compareTwoColorsRGB:: - compare saved default color with the current"
+    printlog( "compareTwoColorsRGB:: Compare saved default color with the current" )
     call getColorRGB(bColor()) 
     for i = 1 to 4
         if aColor(i) <> bColor(i) then
-            warnlog "compareTwoColorsRGB:: "+"("+i+") Expected: '" + aColor(i) + "' found: '" + bColor(i) + "'"
+            warnlog( "compareTwoColorsRGB:: " & "(" & i & ") Expected: '" _
+            & aColor( i ) & "' found: '" & bColor(i) & "'" )
         else
-            printlog "compareTwoColorsRGB:: "+"("+i+") OK"
+            printlog( "compareTwoColorsRGB:: " & "(" & i & ") OK" )
         endif
     next i
 end sub
diff --git a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
index d74c01680..2d7300950 100755
--- a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
@@ -554,7 +554,11 @@ function hNewDialog() as boolean
     '///+<li>Verify that a new dialog is opened and has the focus</li>
     if ( DialogWindow.Exists() ) then 
         printlog( CFN & "New dialog is open" )
-        hNewDialog() = true 
+        hNewDialog() = true
+		if ( DialogWindow.IsMax() = false ) then		
+			DialogWindow.Maximize()
+			Wait( 2000 )
+		end if		
     else
         warnlog( CFN & "New dialog is not open" )
         hNewDialog() = false
diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc
index f75865739..95df5c7c4 100755
--- a/testautomation/global/tools/includes/optional/t_docfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc
@@ -37,14 +37,14 @@
 '*
 '\******************************************************************************
 
-private const VERBOSE = false
+private const VERBOSE = FALSE
 
 function hUseImpressAutopilot( bEnable as boolean ) as boolean
 
     '///<h3>Enable/disable the Impress Autopilot in Tools/Options</h3>
     '///<i>Starting point: Any plain document</i>
     '///<ul>
-    const CFN = "hUseImpressAutopilot::"
+    const CFN = "global::tools::includes::optional::t_docfuncs.inc::hUseImpressAutopilot::"
     
     if ( VERBOSE ) then printlog( CFN & "Enter" )
 
@@ -97,7 +97,7 @@ function hCloseNavigator() as boolean
     '///<h3>Function to close the navigator</h3>
     '///<i>Starting point: Any document</i>
     '///<ul>
-    const CFN = "hCloseNavigator::"
+    const CFN = "global::tools::includes::optional::t_docfuncs.inc::hCloseNavigator::"
     
     if ( VERBOSE ) then printlog( CFN & "Enter" )
     
@@ -133,7 +133,7 @@ function hNumericDocType( doctype as integer ) as string
     '///<u>Using file: global/input/applications.txt as reference</u>
     '///<ul>
     
-    const CFN = "hNumericDocType::"
+    const CFN = "global::tools::includes::optional::t_docfuncs.inc::hNumericDocType::"
     
     dim sFile as string
         sFile = gTesttoolPath & "global\input\applications.txt"
@@ -142,7 +142,7 @@ function hNumericDocType( doctype as integer ) as string
     dim sList( 100 ) as string
     dim iDocTypes as integer
     
-    'printlog( CFN & "Enter" )
+    if ( VERBOSE ) then printlog( CFN & "Enter" )
     
     '///+<li>Retrieve matching list from file</li>
     hGetDataFileSection( sFile , sList() , "application" , "" , "" )
@@ -161,7 +161,7 @@ function hNumericDocType( doctype as integer ) as string
     '///+<li>Set a plain text name as returnvalue for the function</li>
     hGetDataFileSection( sFile , sList() , "application_names" , "" , "" )
     hNumericDocType() = hGetValueForKeyAsString( sList() , gApplication )
-    'printlog( CFN & "Exit" )
+    if ( VERBOSE ) then printlog( CFN & "Exit" )
     '///</ul>
 
 end function
@@ -232,7 +232,7 @@ function hIdentifyWriterDoc( cString as string, bWarn as boolean ) as boolean
     
     use "global\tools\includes\optional\t_stringtools.inc"
 
-    const CFN = "hIdentifyWriterDoc::"
+    const CFN = "global::tools::includes::optional::t_docfuncs.inc::hIdentifyWriterDoc::"
     dim cIdentifier as string
     dim irc as integer ' some temporary returnvalue
     
@@ -322,7 +322,7 @@ function hCreateDocument() as boolean
     '///<ul>
     
 
-    const CFN = "hCreateDocument::"
+    const CFN = "global::tools::includes::optional::t_docfuncs.inc::hCreateDocument::"
 
     dim iDocCountBefore as integer 
     dim iDocCountAfter as integer
@@ -385,7 +385,7 @@ function hDocumentTypeKeys( cString as string ) as boolean
     '///<u>Description</u>:
     '///<ul>
     
-    const CFN = "hDocumentTypeKeys::"
+    const CFN = "global::tools::includes::optional::t_docfuncs.inc::hDocumentTypeKeys::"
     dim brc as boolean
         brc = true
         
@@ -428,144 +428,29 @@ end function
 
 function hDestroyDocument() as boolean
 
-
-    '///<h3>Enhanced version of hCloseDoc()</h3>
-    '///<i>Close a document and print some additional information to the log to
-    '///+ ease debugging tests which handle a lot of documents</i><br><br>
-
-    '///<u>Parameter(s):</u><br>
-    '///<ol>
-    '///+<li>No input parameters</li>
-    '///</ol>
-
-
-    '///<u>Returns:</u><br>
-    '///<ol>
-    '///+<li>Return value description</li>
-    '///<ul>
-    '///+<li>TRUE: The document was closed successfully (-1 open document)</li>
-    '///+<li>TRUE: We are on backing window, no document closed</li>
-    '///+<li>FALSE: The number of documents is unchanged, closing failed</li>
-    '///+<li>FALSE: If any error occurred during close (open dialogs etc.)</li>
-    '///</ul>
-    '///</ol>
-
-    const CFN = "hDestroyDocument::"
-    dim brc as boolean 'a multi purpose boolean returnvalue
-    dim irc as integer
+    const CFN = "global::tools::includes::optional::t_docfuncs.inc::hDestroyDocument: "
+    dim iDocCount as integer : iDocCount = getDocumentCount()
+    hDestroyDocument() = false
     
-    dim iOpenDocsBefore as integer
-    dim iOpenDocsAfter as integer
-    dim iAttemptToClose as integer
+    if ( iDocCount = 0 ) then exit function
+    if ( VERBOSE ) then printlog( CFN & "In.: Open: " & iDocCount )
 
-    '///<u>Description:</u>
-    '///<ul>
-    '///+<li>Get the current number of documents</li>
-    iOpenDocsBefore = getDocumentCount
-    if ( VERBOSE ) then printlog( CFN & "Open documents before close: " & iOpenDocsBefore )
+    hUseAsyncSlot( "FileClose" )
     
-    '///+<li>Handle special case of 0 open documents</li>
-    '///<ul>
-    if ( iOpenDocsBefore = 0 ) then
+    Kontext "Active"
+    if ( Active.Exists( 2 ) ) then
+        printlog( "Msgbox: " & Active.getText() )
+        try
+            Active.No
+        catch
+            Active.Click ( 202 )
+        endcatch
+        wait( 1000 )
+    end if
     
-        '///+<li>If gApplication has been set to BACKGROUND explicitly we do a restart</li>
-        if ( ucase( gApplication ) = "BACKGROUND" ) then
-        
-            do while ( getDocumentCount > 0 ) 
-                hCloseDocument()
-            loop
- 
-            iOpenDocsAfter = getDocumentCount
-            printlog( CFN & "Open documents after restart: " & iOpenDocsAfter )
-            
-            if ( iOpenDocsAfter = 0 ) then
-                hDestroyDocument() = true
-                exit function
-            else
-                warnlog( CFN & "There should be 0 open documents" )
-                hDestroyDocument() = false
-                exit function
-            endif
-            
-        '///+<li>Otherwise just do not close the backing window - do nothing</li>
-        else
-            printlog( CFN & "On backing window, no action taken" )
-            hDestroyDocument() = true
-            exit function
-        endif
-        
-    endif
-    '///</ul>
-                
-    '///+<li>Handle more than one open document - handle FileOpen/FileSave dialogs</li>
-    '///<ul>
-    brc = true
-    for iAttemptToClose = 1 to 3
-    
-        '///+<li>FileOpen</li>
-        kontext "OeffnenDlg"
-        if ( OeffnenDlg.exists( 1 ) ) then
-            qaerrorlog( CFN & "Closed FileOpen dialog. This was not expected." )
-            OeffnenDlg.cancel()
-            brc = false
-        endif
-        
-        '///+<li>FileSave</li>
-        kontext "SpeichernDlg"
-        if ( SpeichernDlg.exists( 1 ) ) then
-            qaerrorlog( CFN & "Closed FileSave dialog. This was not expected." )
-            brc = false
-        endif
-        
-        '///+<li>Check for any messagebox (some might still be floating around)</li>
-        '///<ul>
-        kontext "active"
-        if ( active.exists( 1 ) ) then
-        
-            qaerrorlog( CFN & "Closed unexpected messagebox: " & active.getText() )
-            
-            '///+<li>Try to close the dialog clicking on &quot;OK&quot;</li>
-            try
-                active.ok()
-                printlog( CFN & "Clicked <OK> to close the dialog" )
-            catch
-                printlog( CFN & "Failed using OK" )
-            endcatch
-            
-            '///+<li>Try to close the dialog clicking on &quot;YES&quot;</li>
-            try
-                active.yes()
-                printlog( CFN & "Clicked <YES> to close the dialog" )
-            catch
-                printlog( CFN & "Failed using <YES>" )
-            endcatch
-            
-            brc = false
-            
-        endif
-        '///</ul>
-        
-        '///+<li>Close the current document using hCloseDocument()</li>
-        call hCloseDocument()
-        
-        '///+<li>Verify that the document has indeed been closed, exit function if yes</li>
-        iOpenDocsAfter = getDocumentCount
-        if ( iOpenDocsAfter = ( iOpenDocsBefore - 1 ) ) then
-            printlog( CFN & "Document closed. Currently open: " & iOpenDocsAfter )
-            hDestroyDocument() = brc
-            exit function
-        else
-            qaerrorlog( CFN & "Failed to close document, retrying" )
-            brc = false
-        endif
-        
-    next iAttemptToClose    
-    '///</ul>
-    '///</ul>
-
-    if ( VERBOSE ) then printlog( CFN & "Exit with result: " & brc )
-
-    hDestroyDocument() = brc
+    if ( getDocumentCount() = iDocCount ) then hCloseDocument()
+    if ( getDocumentCount() = iDocCount - 1 ) then hDestroyDocument() = true
+    if ( VERBOSE ) then printlog( CFN & "Out: Open: " & getDocumentCount() )
 
 end function
 
@@ -593,7 +478,7 @@ function hInitSingleDoc() as boolean
     '///</ul>
     '///</ol>
 
-    const CFN = "hInitSingleDoc::"
+    const CFN = "global::tools::includes::optional::t_docfuncs.inc::hInitSingleDoc::"
     dim cOldApplication as string
 
     '///<u>Description:</u>
@@ -649,7 +534,7 @@ function hInitBackingMode() as boolean
     '///</ul>
     '///</ol>
 
-    const CFN = "hInitBackingMode::"
+    const CFN = "global::tools::includes::optional::t_docfuncs.inc::hInitBackingMode::"
 
     '///<u>Description:</u>
     '///<ul>
@@ -701,7 +586,7 @@ function hInitWriteDocIdentifier( cString as string ) as boolean
     '///</ul>
     '///</ol>
 
-    const CFN = "hInitWriteDocIdentifier::"
+    const CFN = "global::tools::includes::optional::t_docfuncs.inc::hInitWriteDocIdentifier::"
 
     '///<u>Description:</u>
     '///<ul>
diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc
index ce7b7271d..917a5dde2 100755
--- a/testautomation/global/tools/includes/required/t_doc1.inc
+++ b/testautomation/global/tools/includes/required/t_doc1.inc
@@ -58,6 +58,10 @@ sub hNewDocument ( optional bANewDoc )
         else
             FileOpen "FileName", "private:factory/swriter", "FrameName", "_default", "SynchronMode", TRUE
         end if
+        if ( DocumentWriter.IsMax() = false ) then		
+			DocumentWriter.Maximize()
+			Wait( 2000 )
+		end if        				
     case "CALC"
         Kontext "DocumentCalc"
         if gNoNewDoc = TRUE then
@@ -65,6 +69,10 @@ sub hNewDocument ( optional bANewDoc )
         else
             FileOpen "FileName", "private:factory/scalc", "FrameName", "_default", "SynchronMode", TRUE
         end if
+        if ( DocumentCalc.IsMax() = false ) then		
+			DocumentCalc.Maximize()
+			Wait( 2000 )
+		end if        						
     case "IMPRESS"
         Kontext "DocumentImpress"
         if gNoNewDoc = TRUE then
@@ -82,6 +90,10 @@ sub hNewDocument ( optional bANewDoc )
             end if
             Kontext "DocumentImpress"
             Sleep 2
+            if ( DocumentImpress.IsMax() = false ) then		
+            	DocumentImpress.Maximize()
+            	Wait( 2000 )
+            end if        							
         end if
     case "DRAW"
         Kontext "DocumentDraw"
@@ -90,6 +102,10 @@ sub hNewDocument ( optional bANewDoc )
         else
             FileOpen "FileName", "private:factory/sdraw", "FrameName", "_default", "SynchronMode", TRUE
         end if
+        if ( DocumentDraw.IsMax() = false ) then		
+			DocumentDraw.Maximize()
+			Wait( 2000 )
+		end if        									
     case "MASTERDOCUMENT"
         Kontext "DocumentMasterDoc"
         if gNoNewDoc = TRUE then
@@ -101,15 +117,22 @@ sub hNewDocument ( optional bANewDoc )
         sleep (1)
         if Navigator.Exists(5) then Navigator.Close
         Kontext "DocumentMasterDoc"
+        if ( DocumentMasterDoc.IsMax() = false ) then		
+			DocumentMasterDoc.Maximize()
+			Wait( 2000 )
+		end if        											
     case "MATH"
         Kontext "DocumentMath"
         if gNoNewDoc = TRUE then
             FileOpen "FileName", "private:factory/smath", "SynchronMode", TRUE
         else
-            '                                             FileOpen "FileName", "private:factory/smath", "FrameName", "_blank"
             FileOpen "FileName", "private:factory/smath", "FrameName", "_default", "SynchronMode", TRUE
         end if
         Kontext "DocumentMath"
+        if ( DocumentMath.IsMax() = false ) then		
+			DocumentMath.Maximize()
+			Wait( 2000 )
+		end if        													
     case "HTML"
         Kontext "DocumentWriterWeb"
         if gNoNewDoc = TRUE then
@@ -118,6 +141,10 @@ sub hNewDocument ( optional bANewDoc )
             FileOpen "FileName", "private:factory/swriter/web", "FrameName", "_default", "SynchronMode", TRUE
         end if
         Kontext "DocumentWriterWeb"
+        if ( DocumentWriterWeb.IsMax() = false ) then		
+			DocumentWriterWeb.Maximize()
+			Wait( 2000 )
+		end if        															
     case "DATABASE"
         FileOpen "FileName", "private:factory/sdatabase?Interactive", "FrameName", "_default", "SynchronMode", TRUE
         Kontext "DatabaseWizard"
diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc
index 43afe55a5..174527a85 100755
--- a/testautomation/global/tools/includes/required/t_filters.inc
+++ b/testautomation/global/tools/includes/required/t_filters.inc
@@ -247,7 +247,7 @@ function hGetFilternameExtension ( vFilterName as string)
 
     const CFN = "global::tools:includes:required::t_filters.inc::hGetFilternameExtension(): "
 
-    'Initializize UNO comminication
+    'Initializize UNO communication
     oUno = hGetUNOService( TRUE )
 
     'Using the TypeDetection service
diff --git a/testautomation/global/tools/includes/required/t_tools1.inc b/testautomation/global/tools/includes/required/t_tools1.inc
index 7aa22272f..c29a2d14b 100755
--- a/testautomation/global/tools/includes/required/t_tools1.inc
+++ b/testautomation/global/tools/includes/required/t_tools1.inc
@@ -41,7 +41,7 @@ private SLEEP_TIME_REQUESTED as integer
 private SLEEP_CALLS_SUM as integer
 private SLEEP_TIME_USED as integer
 
-private const VERBOSE = true
+private const VERBOSE = FALSE
 
 function GetClipboardText as string
 
@@ -240,13 +240,22 @@ end function
 
 function Sleep( optional _iSeconds as integer ) as integer
 
+    const CFN = "global::tools::includes::required::Sleep(...): "
+    
+    const STATUS_NO_DELAY          = 0
+    const STATUS_TIMEOUT_EXCEEDED  = 1
+    const STATUS_WAITSLOT_CRASHED  = 2
+    const STATUS_CLASSIC_WAIT_USED = 3
+
+    ' This is the "classic" behavior of the sleep function. If you did not set 
+    ' GLOBAL_USE_NEW_SLEEP to TRUE in your .bas file, this will be used.
     if ( not GLOBAL_USE_NEW_SLEEP ) then
         if ( IsMissing( _iSeconds ) ) then
             wait( 1000 )
         else
             wait( _iSeconds * 1000 )
         endif
-        sleep() = 0
+        sleep() = STATUS_CLASSIC_WAIT_USED
         exit function
     endif
 
@@ -266,19 +275,17 @@ function Sleep( optional _iSeconds as integer ) as integer
     ' 2 = Wait() was used (classic method, fallback).
     ' 3 = Wait() was used (forced old behavior)
 
-    const CFN = "global::tools::includes::required::Sleep(...): "
-    
-    const STATUS_NO_DELAY          = 0
-    const STATUS_TIMEOUT_EXCEEDED  = 1
-    const STATUS_WAITSLOT_CRASHED  = 2
-    const STATUS_CLASSIC_WAIT_USED = 3
-
     dim iMilliseconds as integer
     dim iStatus as integer       : iStatus      = 0
     dim lBegin as long           : lBegin       = GetSystemTicks
     dim iSeconds as integer      : iSeconds     = 5
     dim iSystemDelay as integer  : iSystemDelay = 1000
     dim iTimeDiff as long        : iTimeDiff    = 0
+    
+    ' On Solaris we are a little slower, so we increase the system delay a little
+    if ( instr( lcase( gtSysName ) , "solaris" ) > 0 ) then
+        iSystemDelay = 1500
+    endif
 
     ' Override default wait time (5 seconds) if parameter is given
     if ( not IsMissing( _iSeconds ) ) then
@@ -314,7 +321,7 @@ function Sleep( optional _iSeconds as integer ) as integer
     ' Find out how long it took, warn if time was zero (sleep most likely not required)
     iTimeDiff = GetSystemTicks - lBegin
     if ( iTimeDiff = 0 ) then
-        QAErrorLog( CFN & "Zero time. Please consider removing Sleep() statement" )
+        printlog( CFN & "Zero time. Please consider removing Sleep() statement" )
     endif
     
     if ( VERBOSE ) then
@@ -333,11 +340,11 @@ function Sleep( optional _iSeconds as integer ) as integer
         & iTimeDiff & " ms, rc=" & iStatus )
         select case iStatus
         case STATUS_TIMEOUT_EXCEEDED : 
-            QAErrorLog( CFN & "Timeout exceeded. Please increase the delay" )
+            printlog( CFN & "Timeout exceeded." )
         case STATUS_WAITSLOT_CRASHED : 
-            QAErrorlog( CFN & "Used Wait(n). WaitSlot() failed." )
+            printlog( CFN & "Used Wait(n). WaitSlot() failed." )
         case STATUS_CLASSIC_WAIT_USED : 
-            QAErrorLog( CFN & "Used Wait(n). Classic behavior forced" )
+            printlog( CFN & "Used Wait(n). Classic behavior forced" )
         end select
     endif
     Sleep() = iStatus
@@ -1215,6 +1222,7 @@ function hUseAsyncSlot( cSlot as string ) as integer
             case "filesaveall"                    : FileSaveAll( "SynchronMode", TRUE )
             case "fileexport"                     : FileExport
             case "filereload"                     : FileReload( "SynchronMode", TRUE )
+            case "fileopen"                       : FileOpen
             
             case "editdoc"                        : EditDoc
             case "editcopy"                       : EditCopy
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index 16adf5252..ea63881d0 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -324,6 +324,7 @@ SearchIn svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN
 Rows svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS
 Columns svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS
 SearchInAllSheets svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS
+Notes svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES
 
 *FormFolderNameDialog HID_DLG_SAVE_AS
 FolderName dbaccess:Edit:DLG_SAVE_AS:ET_TITLE
diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win
index 03539cdd1..1b236be1e 100755
--- a/testautomation/global/win/etab_e_g.win
+++ b/testautomation/global/win/etab_e_g.win
@@ -256,7 +256,7 @@ DefaultButton HID_PROP_DEFAULT_BUTTON
 DefaultSelection HID_PROP_SELECTEDITEMS
 DefaultSelection2 HID_PROP_DEFAULT_SELECT_SEQ
 DefaultSelectionButton UID_PROP_DLG_SELECTION
-DefaultState HID_PROP_DEFAULT_CHECKED
+DefaultState HID_PROP_DEFAULT_STATE
 DefaultSpinValue HID_PROP_DEFAULT_SPINVALUE
 'DefaultValue HID_PROP_DEFAULT_LONG_VALUE
 DefaultValue HID_PROP_DEFAULTVALUE
diff --git a/testautomation/graphics/optional/g_autocorrection.bas b/testautomation/graphics/optional/g_autocorrection.bas
index 930af7c77..998604b94 100755
--- a/testautomation/graphics/optional/g_autocorrection.bas
+++ b/testautomation/graphics/optional/g_autocorrection.bas
@@ -52,7 +52,6 @@ sub main
 
     gApplication = "IMPRESS"
     PrintLog "-------------------------" + gApplication + "-------------------"
-    'qaErrorLog "#i76832# - tToolsAutocorrectCustomQuotes (x4) outcommented due to Bug."
     Call tToolsAutocorrectCustomQuotes (TRUE)
     Call tToolsAutocorrectCustomQuotes (FALSE)
     Call tToolsAutocorrectOption
diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas
index c63ce7081..92067c394 100755
--- a/testautomation/graphics/optional/g_insert.bas
+++ b/testautomation/graphics/optional/g_insert.bas
@@ -70,8 +70,7 @@ sub main
 
     Call tInsertFloatingFrame
     Call tInsertFields
-    QaErrorLog "#79794 - tdInsertObjectOleObjects outcommented due to bug."
-    '    Call tdInsertObjectOleObjects
+    Call tdInsertObjectOleObjects
 
     Printlog "Disabled SnappPointLine test, because of unpredictable mouse moves (07/2002 TBO)"
     'Call tdInsertSnappoint_Line
diff --git a/testautomation/graphics/optional/g_tables.bas b/testautomation/graphics/optional/g_tables.bas
index 261c01824..27a0463d2 100755
--- a/testautomation/graphics/optional/g_tables.bas
+++ b/testautomation/graphics/optional/g_tables.bas
@@ -39,7 +39,7 @@
 
 sub main
     Printlog "------------------- Impress Tables Test -------------------------"
-    call hStatusIn ("Graphics","i_tables.bas")
+    call hStatusIn ("Graphics","g_tables.bas")
 
     use "graphics\optional\includes\global\g_tables.inc"
 
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index a8b63e150..c39e12f73 100755
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -753,51 +753,51 @@ qaerrorlog
    endif
    hCloseDocument ()
    Printlog "'/// now save a SELECTION in ORIGINAL SIZE and load the file afterwards ///'"
-   qaerrorlog "#i93258#"
-   'hFileOpen (sDocument)
-   'kontext "Filterauswahl"
-   'if Filterauswahl.exists(10) then
-   '   Warnlog "Error when loading the file. The Filter-dialogue came up. Test aborted."
-   '   Filterauswahl.Cancel
-   '   goto endsub
-   'endif
-
-    '' check if the document is writable
-    'if fIsDocumentWritable = false then
-    '    ' make the document writable and check if it's succesfull
-    '    if fMakeDocumentWritable = false then
-    '        warnlog "The document can't be make writeable. Test stopped."
-    '        goto endsub
-    '    endif
-    'endif
-
-   'hTypeKeys ("<escape><tab>")
-   'fGetSizeXY sx1, sy, TRUE
-   'if hCallExport (OutputGrafikTBO + "1" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
-   '   Kontext "BMPOptionen"
-   '   if BMPOptionen.Exists (2) then
-   '      Original.Check
-   '      BMPOptionen.OK
-   '      sleep 5
-   '   endif
-   '   if ( dir(OutputGrafikTBO + "1"+".bmp") <> "") then
-   '      Printlog "Ok :-) Saved as: '" + OutputGrafikTBO + "1"+".bmp" + "'"
-   '   else
-   '      warnlog "File didn't get saved :-("
-   '   endif
+   
+   hFileOpen (sDocument)
+   kontext "Filterauswahl"
+   if Filterauswahl.exists(10) then
+      Warnlog "Error when loading the file. The Filter-dialogue came up. Test aborted."
+      Filterauswahl.Cancel
+      goto endsub
+   endif
+
+   ' check if the document is writable
+    if fIsDocumentWritable = false then
+        ' make the document writable and check if it's succesfull
+        if fMakeDocumentWritable = false then
+            warnlog "The document can't be make writeable. Test stopped."
+            goto endsub
+        endif
+    endif
+
+   hTypeKeys ("<escape><tab>")
+   fGetSizeXY sx1, sy, TRUE
+   if hCallExport (OutputGrafikTBO + "1" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
+      Kontext "BMPOptionen"
+      if BMPOptionen.Exists (2) then
+         Original.Check
+         BMPOptionen.OK
+         sleep 5
+      endif
+      if ( dir(OutputGrafikTBO + "1"+".bmp") <> "") then
+         Printlog "Ok :-) Saved as: '" + OutputGrafikTBO + "1"+".bmp" + "'"
+      else
+         warnlog "File didn't get saved :-("
+      endif
      
-    '  qaerrorlog "#i92902: Export to bmp: bmp options not respected"
-      'sleep 5
-      'hNewDocument()
-      'sleep 5
-      'Call hGrafikEinfuegen ( OutputGrafikTBO + "1"+".bmp" )
-      'bTemp = FALSE
-      'fGetSizeXY sx1, sY, bTemp
-      'if (bTemp = FALSE) then
-      '   warnlog "Selected original size NOT OK :-("
-      'endif
-   'endif
-   'hCloseDocument ()
+      sleep 5
+      hNewDocument()
+      sleep 5
+      Call hGrafikEinfuegen ( OutputGrafikTBO + "1"+".bmp" )
+      bTemp = FALSE
+      fGetSizeXY sx1, sY, bTemp
+      if (bTemp = FALSE) then
+         warnlog "Selected original size NOT OK :-("
+      endif
+   endif
+   hCloseDocument ()
+   
    Printlog "'/// now CREATE a rectangle, select it, save it in SIZE and load the file afterwards ///'"
    hNewDocument()
    hTypeKeys "<TAB>"
@@ -832,13 +832,12 @@ qaerrorlog
       kontext "DocumentDraw"
       DocumentDraw.TypeKeys ("<escape><tab>")
       
-      qaerrorlog "#i92902: Export to bmp: bmp options not respected"
-      'ContextOriginalSize
-      'bTemp = FALSE
-      'fGetSizeXY sx1, sY, bTemp
-      'if (bTemp = FALSE) then
-      '   warnlog "Selected original size NOT OK :-("
-      'endif
+      ContextOriginalSize
+      bTemp = FALSE
+      fGetSizeXY sx1, sY, bTemp
+      if (bTemp = FALSE) then
+         warnlog "Selected original size NOT OK :-("
+      endif
       
    endif
    if hCallExport (OutputGrafikTBO + "3" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
diff --git a/testautomation/graphics/optional/includes/global/g_insert.inc b/testautomation/graphics/optional/includes/global/g_insert.inc
index 7e8a02386..87689a73e 100755
--- a/testautomation/graphics/optional/includes/global/g_insert.inc
+++ b/testautomation/graphics/optional/includes/global/g_insert.inc
@@ -51,8 +51,7 @@
 '\*************************************************************************************
 
 testcase tdInsertObjectOleObjects
-    QaErrorLog "#79794# - tdInsertObjectOleObjects outcommented due to bug."
-    goto endsub
+
     Dim Zaehler as Integer
     Dim i as integer
     Dim a as integer
diff --git a/testautomation/graphics/optional/includes/impress/i_pengine.inc b/testautomation/graphics/optional/includes/impress/i_pengine.inc
index 77b4be07f..7f4432fb1 100755
--- a/testautomation/graphics/optional/includes/impress/i_pengine.inc
+++ b/testautomation/graphics/optional/includes/impress/i_pengine.inc
@@ -675,7 +675,6 @@ testcase tSlideShowCustomAnimation
             kontext "TabMotionPaths"
             if TabMotionPaths.exists(5) then
                 DialogTest(TabMotionPaths)
-                qaErrorLog("#i44701# selection needs to be made on the page where you say 'OK'")
                 Effects.select(2)
             else
                 bError = true
diff --git a/testautomation/graphics/optional/includes/impress/i_pengine2.inc b/testautomation/graphics/optional/includes/impress/i_pengine2.inc
index 7454395dd..303b8c9e9 100755
--- a/testautomation/graphics/optional/includes/impress/i_pengine2.inc
+++ b/testautomation/graphics/optional/includes/impress/i_pengine2.inc
@@ -94,7 +94,6 @@ testcase tiPengineAnimationEffectsPreview
            kontext "TabMotionPaths"
               if TabMotionPaths.exists(5) then
                  DialogTest(TabMotionPaths)
-'                 qaErrorLog("#i44701# selection needs to be made on the page where you say 'OK'")
                  TestAnimations
               else
                  bError = true
diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc
index 34cf4f0f5..6b95ef90b 100755
--- a/testautomation/graphics/optional/includes/impress/i_us_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc
@@ -630,8 +630,7 @@ endcase 'i_us_presentation6
 '00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---....
 
 testcase i_us_presentation7
-    'qaErrorLog "#i70754# - i_us_presentation7 outcommented due to bug."
-    'goto endsub
+
     dim sFilter as string
     dim sFileName as string
     dim PresentationFile6 as string
diff --git a/testautomation/graphics/required/includes/impress/i_opt_1_.inc b/testautomation/graphics/required/includes/impress/i_opt_1_.inc
index 167752f26..9a48a5c79 100755
--- a/testautomation/graphics/required/includes/impress/i_opt_1_.inc
+++ b/testautomation/graphics/required/includes/impress/i_opt_1_.inc
@@ -189,7 +189,7 @@ testcase tiAlwaysWithCurrentPage()
     printlog "Checking if we are on slide 3."
     i = fGetSlideNumber()
     if (i<>3) then
-                warnlog "We are on the wrong slide! Should be 2 but it is: " & i
+                warnlog "We are on the wrong slide! Should be 3 but it is: " & i
     endif
 
     printlog "Close the navigator View->Navigator."
diff --git a/testautomation/graphics/required/includes/impress/im_002_.inc b/testautomation/graphics/required/includes/impress/im_002_.inc
index 103ff8a45..aef27e1c4 100755
--- a/testautomation/graphics/required/includes/impress/im_002_.inc
+++ b/testautomation/graphics/required/includes/impress/im_002_.inc
@@ -38,21 +38,21 @@
 '\*****************************************************************
 
 testcase tiEditDeleteSlide
-'/// open application ///'
+printlog "open application"
    Call hNewDocument
-'/// Insert->Slide; press 'OK' ///'
+printlog "Insert->Slide; press 'OK' "
    InsertSlide
    sleep 2
    hTypekeys "<Pagedown>"
    sleep 2
-'/// Edit->Delete Slide ///'
+printlog "Edit->Delete Slide "
    try
       EditDeleteSlide
    catch
       warnlog "Error when deleting slide"
    endcatch
    Call hCloseDocument
-'/// close application ///'
+printlog "close application "
 endcase
 
 
diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc
index ab14ba5b8..ae88f700b 100755
--- a/testautomation/graphics/required/includes/impress/im_003_.inc
+++ b/testautomation/graphics/required/includes/impress/im_003_.inc
@@ -41,11 +41,11 @@
 ' #1 tiViewSlideMaster
 ' #1 tiViewToolbar_1
 '\**********************************************************************************
-
 testcase tiViewPanes
+
     goto endsub 'TODO WG, tiViewPanes outcommented due to reconstruction of test
     dim bState as boolean
-    '/// open application ///'
+    printlog "open application "
     Call hCloseDocument
     Call hNewDocument
     sleep 1
@@ -60,7 +60,7 @@ testcase tiViewPanes
         ViewTaskSlide
     endif
     kontext "Tasks"
-    '/// Deactivate all but "masterpages" ///'
+    printlog "Deactivate all but masterpages "
     View.OpenMenu
     hMenuSelectNr (2)
     View.OpenMenu
@@ -83,14 +83,14 @@ testcase tiViewPanes
         endif
         kontext "Tasks"
         sleep 1
-        '/// View->Task Pane ///'
+        printlog "View->Task Pane "
         ViewTaskPane
         sleep 1
         if (Tasks.exists) then
             warnlog "View->Task Panel failed"
             ViewTaskPane
         endif
-        '/// View->Task Pane ///'
+        printlog "View->Task Pane "
         ViewTaskPane
         sleep 1
         if (NOT Tasks.exists) then
@@ -107,7 +107,7 @@ testcase tiViewPanes
             warnlog "View->Slide Panel failed."
             ViewTaskSlide
         endif
-        '/// View->Slide Pane ///'
+        printlog "View->Slide Pane "
         ViewTaskSlide
         sleep 1
         if (NOT Slides.exists) then
@@ -116,9 +116,9 @@ testcase tiViewPanes
         endif
     catch
         warnlog "View->Slide Pane couldn't get executed"
-    endcatch
+    endcatch 
 
-    '/// Reactivate all pages in the Task-panel ///'
+    printlog "Reactivate all pages in the Task-panel "
     kontext "Tasks"
     View.OpenMenu
     hMenuSelectNr (2)
@@ -126,135 +126,131 @@ testcase tiViewPanes
     hMenuSelectNr (3)
     View.OpenMenu
     hMenuSelectNr (4)
-endcase
-
+    
+endcase 'tiViewPanes
+'---------------------------------------------------------
 testcase tiViewMasterView
-'/// open application ///'
-   Call hNewDocument
-'/// View->Master View->Drawing View ///'
-   sleep 1
-   ViewWorkspaceDrawingView
-'     Kontext "DocumentImpress"
-'     gMouseClick 70,70
+
+    printlog "open application"
+    Call hNewDocument
+    printlog "View->Master View->Drawing View"
+    sleep 1
+    ViewWorkspaceDrawingView
      sleep 5
-'/// View->Master View->Outline View ///'
-   ViewWorkspaceOutlineView
-'     Kontext "DocumentImpressOutlineView"
-'     DocumentImpressOutlineView.MouseDown 70,70
-'     DocumentImpressOutlineView.MouseUp 70,70
+    printlog "View->Master View->Outline View "
+    ViewWorkspaceOutlineView
      sleep 1
-'/// View->Master View->Slides View ///'
-   ViewWorkspaceSlidesView
-'     Kontext "DocumentImpressSlideView"
-'     DocumentImpressSlideView.MouseDown 70,70
-'     DocumentImpressSlideView.MouseUp 70,70
+    printlog "View->Master View->Slides View "
+    ViewWorkspaceSlidesView
      sleep 1
-'/// View->Master View->Notes View ///'
-   ViewWorkspaceNotesView
+    printlog "View->Master View->Notes View "
+    ViewWorkspaceNotesView
       sleep 1
-'/// View->Master View->Handout View ///'
-   ViewWorkspaceHandoutView
+    printlog "View->Master View->Handout View "
+    ViewWorkspaceHandoutView
       sleep 1
-'/// View->Master View->Drawing View ///'
-   ViewWorkspaceDrawingView
-'/// close application ///'
+    printlog "View->Master View->Drawing View "
+    ViewWorkspaceDrawingView
+    printlog "close application "
       sleep 1
-   Call hCloseDocument
-endcase
-
+    Call hCloseDocument
+   
+endcase 'tiViewMasterView
+'---------------------------------------------------------
 testcase tiViewSlideMaster
-'/// open application with : File->Autopilot->Presentation; OK; OK ///'
-'   Call  hNewDocument
-      FileAutopilotPresentation                ' to get a title :-)
-      sleep 2
-      Kontext "AutopilotPraesentation1"
-      AutopilotPraesentation1.Ok
-      sleep 1
-      Kontext "Seitenlayout"  ' aka: Modify Slide
-      if Seitenlayout.exists(5) then
-           warnlog "Slidelayout has to vanish; moved to sidebar"
-           Seitenlayout.OK
-      endif
-   kontext "DocumentImpress"
-   sleep 1
-'/// View->Slide ///'
-   ViewSlide
-   Sleep 1
-'/// View->Master->Drawing ///'
-   ViewDrawing
-   Sleep 1
-'/// View->Slide ///'
-   ViewSlide
-   Sleep 1
-'/// View->Master->Title ///'
-   try
-      ViewTitle
-      Errorlog "View - Master - Title Slide Master should NOT be accessable"
-   catch
-      printlog "View - Master - Title Slide Master not accessable - good"
-   endcatch
-   Sleep 1
-'/// View->Slide ///'
-   ViewSlide
-   Sleep 1
-'/// View->Master->Handout ///'
-   ViewHandout
-   Sleep 1
-'   ViewSlide
-   Sleep 1
-'/// View->Master->Notes ///'
-   ViewNotes
-   kontext "DocumentImpress"
-   Sleep 1
-'/// View->Slide ///'
-   ViewSlide
-   Sleep 1
-'/// close application ///'
-   Call  hCloseDocument
-endcase
-
+    
+    printlog "open application with : File->Autopilot->Presentation; OK; OK "
+    FileAutopilotPresentation                ' to get a title :-)
+    sleep 2
+    Kontext "AutopilotPraesentation1"
+    AutopilotPraesentation1.Ok
+    sleep 1
+    Kontext "Seitenlayout"  ' aka: Modify Slide
+    if Seitenlayout.exists(5) then
+        warnlog "Slidelayout has to vanish; moved to sidebar"
+        Seitenlayout.OK
+    endif
+    kontext "DocumentImpress"
+    sleep 1
+    printlog "View->Slide "
+    ViewSlide
+    Sleep 1
+    printlog "View->Master->Drawing "
+    ViewDrawing
+    Sleep 1
+    printlog "View->Slide "
+    ViewSlide
+    Sleep 1
+    printlog "View->Master->Title "
+    try
+    ViewTitle
+    Errorlog "View - Master - Title Slide Master should NOT be accessable"
+    catch
+    printlog "View - Master - Title Slide Master not accessable - good"
+    endcatch
+    Sleep 1
+    printlog "View->Slide "
+    ViewSlide
+    Sleep 1
+    printlog "View->Master->Handout "
+    ViewHandout
+    Sleep 1
+    '   ViewSlide
+    Sleep 1
+    printlog "View->Master->Notes "
+    ViewNotes
+    kontext "DocumentImpress"
+    Sleep 1
+    printlog "View->Slide "
+    ViewSlide
+    Sleep 1
+    printlog "close application "
+    Call  hCloseDocument
+   
+endcase 'tiViewSlideMaster
+'--------------------------------------------------------
 testcase tiViewToolbar_1
-  Dim Zaehler as integer
-  Dim i as integer
-
-'/// open application ///'
- Call hNewDocument
-  sleep 2
-'/// Insert->Graphic... : "global\input\graf_inp\desp.bmp" ///'
-  InsertGraphicsFromFile
-  sleep 2
-   Kontext "GrafikEinfuegenDlg"
-   sleep 1
-   Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
-   sleep 1
-   Oeffnen.Click
-   sleep 3
-   Kontext "Messagebox"
+    
+    Dim Zaehler as integer
+    Dim i as integer
+    
+    printlog "open application "
+    Call hNewDocument
+    sleep 2
+    printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp "
+    InsertGraphicsFromFile
+    sleep 2
+    Kontext "GrafikEinfuegenDlg"
+    sleep 1
+    Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
+    sleep 1
+    Oeffnen.Click
+    sleep 3
+    Kontext "Messagebox"
     if Messagebox.Exists then
-      Warnlog Messagebox.GetText
-      Messagebox.OK
+        Warnlog Messagebox.GetText
+        Messagebox.OK
     end if
-   Kontext "DocumentImpress"
-'/// select graphic ///'
-   EditSelectAll
-   sleep 2
-   Kontext "GraphicObjectbar"
+    Kontext "DocumentImpress"
+    printlog "select graphic "
+    EditSelectAll
+    sleep 2
+    Kontext "GraphicObjectbar"
     sleep 1
-'/// The Graphics Toolbar has to be visible now; If not -> ERROR ///'
+    printlog "The Graphics Toolbar has to be visible now; If not -> ERROR "
     if GraphicObjectbar.Exists Then
-       Printlog "- graphic object toolbar exists"
-       Zaehler=Grafikmodus.GetItemCount
-       for i = 1 to Zaehler
-           Printlog "- access all controls in the toolbar (" +i+"/"+Zaehler+")"
-           Grafikmodus.Select i
-           sleep 3
-       next i
-       sleep 3
+        Printlog "- graphic object toolbar exists"
+        Zaehler=Grafikmodus.GetItemCount
+        for i = 1 to Zaehler
+            Printlog "- access all controls in the toolbar (" +i+"/"+Zaehler+")"
+            Grafikmodus.Select i
+            sleep 3
+        next i
+        sleep 3
     else
-       Warnlog "- No graphic function toolbar visible"
+        Warnlog "- No graphic function toolbar visible"
     end if
-'/// close application ///'
-  Call hCloseDocument
-endcase
-
-
+    printlog "close application "
+    Call hCloseDocument
+    
+endcase 'tiViewToolbar_1
diff --git a/testautomation/graphics/required/includes/impress/im_004_.inc b/testautomation/graphics/required/includes/impress/im_004_.inc
index e624a336d..69e38c0e3 100755
--- a/testautomation/graphics/required/includes/impress/im_004_.inc
+++ b/testautomation/graphics/required/includes/impress/im_004_.inc
@@ -39,26 +39,24 @@
 
 testcase tiInsertSlideExpandSummary
 
-'/// open application ///'
+printlog "open application "
    Call hNewDocument
-   ' presupposition
-'/// View->Master View->Outline View ///'
+printlog "View->Master View->Outline View "
       ViewWorkspaceOutlineView
       Sleep 1
       Kontext "DocumentImpressOutlineView"
-'/// Type 2 rows ///'
+printlog "Type 2 rows "
       DocumentImpressOutlineView.TypeKeys "Herbert<Return>Rudi"
-'/// View->Master View->Drawing View ///'
+printlog "View->Master View->Drawing View "
       ViewWorkspaceDrawingView
       Sleep 1
-   ' test menue entries
-'/// Insert->Summery Slide ///'
+printlog "Insert->Summery Slide "
    InsertSummerySlide
    Sleep 1
-'/// Insert->Expand Slide ///'
+printlog "Insert->Expand Slide "
    InsertExpandSlide
    Sleep 2
-'/// close application ///'
+printlog "close application "
    Call  hCloseDocument
 endcase
 
diff --git a/testautomation/graphics/required/includes/impress/im_005_.inc b/testautomation/graphics/required/includes/impress/im_005_.inc
index 43f7339b3..ff0d1cd6c 100755
--- a/testautomation/graphics/required/includes/impress/im_005_.inc
+++ b/testautomation/graphics/required/includes/impress/im_005_.inc
@@ -39,18 +39,17 @@
 
 testcase tiFormatModifyLayout
 
-'/// open application ///'
-   Call  hNewDocument
-'/// Impress: Format->Modify Layout ///'
-'/// Draw   : kontext menu: Slide-> Modify Slide (always disabled :-( ?///'
-   FormatPage ' 27046 SID_MODIFYPAGE
-      Kontext "SeitenLayout"
-      DialogTest ( SeitenLayout )
-      sleep 1
-'/// cancel dialog 'Page Setup' ///'
-      SeitenLayout.Cancel
-'/// close application ///'
-   Call hCloseDocument
-endcase
-
-
+    printlog "open application "
+    Call  hNewDocument
+    printlog "Impress: Format->Modify Layout "
+    printlog "Draw   : kontext menu: Slide-> Modify Slide (always disabled :-( ?"
+    FormatPage 
+    Kontext "SeitenLayout"
+    DialogTest ( SeitenLayout )
+    sleep 1
+    printlog "cancel dialog 'Page Setup' "
+    SeitenLayout.Cancel
+    printlog "close application "
+    Call hCloseDocument
+    
+endcase 'tiFormatModifyLayout
diff --git a/testautomation/graphics/required/includes/impress/im_007_.inc b/testautomation/graphics/required/includes/impress/im_007_.inc
index d19534c30..9844b3545 100755
--- a/testautomation/graphics/required/includes/impress/im_007_.inc
+++ b/testautomation/graphics/required/includes/impress/im_007_.inc
@@ -37,43 +37,42 @@
 '*
 '\*****************************************************************
 
-' this menue is only in impress availble
 testcase tSlideShowSlideShow
 
-'/// open application ///'
- Call hNewDocument
-'/// Slide Show->Slide Show Settings ///'
+    printlog "open application "
+    Call hNewDocument
+    printlog "Slide Show->Slide Show Settings "
     SlideShowPresentationSettings
-       Kontext "Bildschirmpraesentation"
-  '/// check if 'type' 'default' is checked, it has to be the default !///'
-       if standard.IsChecked then
-          if LogoAnzeigen.isEnabled then
-             Warnlog "'Show Logo' is Enabled :-("
-          endif
-       else
-          Warnlog "type 'default' is not checked as default :-("
-       endif
-  '/// check checkbox 'Window' ///'
-       Fenster.Check
-       Printlog "-  Presentation in window mode is checked"
-  '/// close dialog with OK 'Slide Show' ///'
+    Kontext "Bildschirmpraesentation"
+    printlog "check if 'type' 'default' is checked, it has to be the default !"
+    if standard.IsChecked then
+        if LogoAnzeigen.isEnabled then
+            Warnlog "'Show Logo' is Enabled :-("
+        endif
+    else
+        Warnlog "type 'default' is not checked as default :-("
+    endif
+    printlog "check checkbox 'Window' "
+    Fenster.Check
+    Printlog "-  Presentation in window mode is checked"
+    printlog "close dialog with OK 'Slide Show' "
     Bildschirmpraesentation.Ok
     sleep 3
-'/// Slide Show->Slide Show ///'
+    printlog "Slide Show->Slide Show "
     SlideShowSlideshow
     Sleep 5
     try
-       Kontext "DocumentPresentation"
-       sleep 3
-'/// Press <Esc> to leave presentation mode ///'
-       DocumentPresentation.Typekeys ("<Escape>")
-       Sleep 3
-       Kontext "DocumentImpress"
-       DocumentImpress.MouseDoubleClick ( 50, 50 )
-       Sleep 3
+        Kontext "DocumentPresentation"
+        sleep 3
+        printlog "Press <Esc> to leave presentation mode "
+        DocumentPresentation.Typekeys ("<Escape>")
+        Sleep 3
+        Kontext "DocumentImpress"
+        DocumentImpress.MouseDoubleClick ( 50, 50 )
+        Sleep 3
     catch
 '       FileClose
-       warnlog "had to catch <the ball> :-( "
+        warnlog "had to catch <the ball> :-( "
 '   	 Kontext "Messagebox"
 '       if Messagebox.Exists (5) Then Messagebox.No
 '       Kontext
@@ -84,28 +83,28 @@ testcase tSlideShowSlideShow
 '       if Office.Exists(2) then Resetapplication
 '       Warnlog "Slide didn't end, application wasn't in document edit mode"
     endcatch
-'/// close application ///'
- Call hCloseDocument
+    printlog "close application "
+    Call hCloseDocument
 
  endcase 'tSlideShowSlideShow
 '-------------------------------------------------------------------------------
 testcase tSlideShowRehearseTimings
 
     goto endsub
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
-    '/// Slide Show->Slide Show Settings ///'
+    printlog "Slide Show->Slide Show Settings "
     SlideShowPresentationSettings
     Kontext "Bildschirmpraesentation"
-    '/// check checkbox 'Window' ///'
+    printlog "check checkbox 'Window' "
     Fenster.Check
-    '/// close dialog with OK 'Slide Show' ///'
+    printlog "close dialog with OK 'Slide Show' "
     Bildschirmpraesentation.Ok
-    '/// Slide Show->Rehearse Timings ///'
+    printlog "Slide Show->Rehearse Timings "
     SlideShowRehearseTimings
     sleep 2
     Kontext "DocumentPresentation"
-    '/// Press <Esc> to leave presentation mode ///'
+    printlog "Press <Esc> to leave presentation mode "
       if DocumentPresentation.Exists (5) then
          DocumentPresentation.Typekeys ("<Escape>")
       else
@@ -128,110 +127,110 @@ testcase tSlideShowRehearseTimings
          warnlog "Had to catch <the ball> :-( "
       endcatch
     sleep 3
-'/// close application ///'
- Call hCloseDocument
+    printlog "close application "
+    Call hCloseDocument
 
  endcase 'tSlideShowRehearseTimings
 '-------------------------------------------------------------------------------
 testcase tSlideShowSlideShowSettings
 
-'/// open application ///'
- Call hNewDocument
-   sleep 2
-'/// Slide Show->Slide Show Settings ///'
-   SlideShowPresentationSettings
-      Kontext "Bildschirmpraesentation"
-      call Dialogtest (Bildschirmpraesentation)
-      '/// check checkbox in section 'Range' - 'From: ///'
-      AbDia.Check
-         '/// select the 3rd item from the top from listbox 'From:' ///'
-         AbDiaName.GetSelText
-      '/// check checkbox 'All Slides' ///'
-      AlleDias.Check
-'///'      RangeCustomSlideShow         ' gets tested in tSlideShowCustomSlideShow ///'
-'         IndividuellePraesentationName
-      '///<b> check checkbox 'window' </b>///'
-      Fenster.Check
-      '/// check checkbox 'default' ///'
-      Standard.Check
-      '///<b> check check box 'Auto' -> implies looping of slideshow in fullscreen mode </b>///'
-      Auto.Check
-         '/// set duration of pause to '00:00:05' ///'
-         Zeit.GetText
-         '/// check check box 'Show logo' ///'
-         LogoAnzeigen.Check
-      '///<b> check checkbox 'Change slides maually' </b>///'
-      DiawechselManuel.Check
-      '///<b> check checkbox 'Mouse pointer as pen' </b>///'
-         MauszeigerAlsStift.Check
-      '///<b> UNcheck checkbox 'Mouse pointer visible' </b>///'
-      MauszeigerSichtbar.UnCheck
-      '///<b> check checkbox 'Navigator visible' </b>///'
-      NavigatorSichtbar.Check
-      '///<b> UNcheck checkbox 'animations allowed' </b>///'
-      AnimationenZulassen.UnCheck
-      '///<b> UNcheck checkbox 'Change slides by clicking on background' </b>///'
-      DiaWechselAufHintergrund.UnCheck
-      '///<b> check checkbox 'Presentation always on top' </b>///'
-      PraesentationImmerImVordergrund.Check
-   '/// cancel dialog 'Slide Show' ///'
-   Bildschirmpraesentation.Cancel
-'/// close application ///'
- Call hCloseDocument
+    printlog "open application "
+    Call hNewDocument
+    sleep 2
+    printlog "Slide Show->Slide Show Settings "
+    SlideShowPresentationSettings
+    Kontext "Bildschirmpraesentation"
+    call Dialogtest (Bildschirmpraesentation)
+    printlog "check checkbox in section 'Range' - 'From: "
+    AbDia.Check
+    printlog "select the 3rd item from the top from listbox 'From:' "
+    AbDiaName.GetSelText
+    printlog "check checkbox 'All Slides' "
+    AlleDias.Check
+    '"      RangeCustomSlideShow         ' gets tested in tSlideShowCustomSlideShow "
+    '         IndividuellePraesentationName
+    printlog "check checkbox 'window'"
+    Fenster.Check
+    printlog "check checkbox 'default' "
+    Standard.Check
+    printlog "check check box 'Auto' -> implies looping of slideshow in fullscreen mode"
+    Auto.Check
+    printlog "set duration of pause to '00:00:05' "
+    Zeit.GetText
+    printlog "check check box 'Show logo' "
+    LogoAnzeigen.Check
+    printlog "check checkbox 'Change slides maually'"
+    DiawechselManuel.Check
+    printlog "check checkbox 'Mouse pointer as pen'"
+    MauszeigerAlsStift.Check
+    printlog "UNcheck checkbox 'Mouse pointer visible'"
+    MauszeigerSichtbar.UnCheck
+    printlog "check checkbox 'Navigator visible'"
+    NavigatorSichtbar.Check
+    printlog "UNcheck checkbox 'animations allowed'"
+    AnimationenZulassen.UnCheck
+    printlog "UNcheck checkbox 'Change slides by clicking on background'"
+    DiaWechselAufHintergrund.UnCheck
+    printlog "check checkbox 'Presentation always on top'"
+    PraesentationImmerImVordergrund.Check
+    printlog "cancel dialog 'Slide Show' "
+    Bildschirmpraesentation.Cancel
+    printlog "close application "
+    Call hCloseDocument
  
 endcase 'tSlideShowSlideShowSettings
 '-------------------------------------------------------------------------------
 testcase tSlideShowCustomSlideShow
-
-   '/// open application ///'
-   Call hNewDocument
-   sleep 2
-   '/// Slide Show->Custom Slide Show ///'
-   SlideShowCustomSlideshow
-      Kontext "IndividuellePraesentation"
-      call Dialogtest (IndividuellePraesentation)
-      '/// click button 'New' ///'
-      Neu.Click
-         Kontext "IndividuellePraesentationDefinieren"
-         Call DialogTest (IndividuellePraesentationDefinieren)
-         '/// select the first entry in the list 'Existing Slides' ///'
-         SeitenPraesentation.Select 1
-         '/// click button '>>' ///'
-         Hinzufuegen.Click
-         '/// close dialog 'Define Custom Slide Show' with OK ///'
-      IndividuellePraesentationDefinieren.OK
-      Kontext "IndividuellePraesentation"
-      '/// click button 'Copy' ///'
-      Kopieren.Click
-      '/// click button 'Delete' ///'
-      Loeschen.Click
-      '/// click button 'Edit' ///'
-      Bearbeiten.Click
-         Kontext "IndividuellePraesentationDefinieren"
-         '/// select 1st entry in the list 'Selected Slides' ///'
-         SelectedSlides.Select 1
-         '/// click button '<<' ///'
-         Entfernen.Click
-         '/// close dialog 'Define Custom Slide Show' with Cancel ///'
-      IndividuellePraesentationDefinieren.Cancel
-      Kontext "IndividuellePraesentation"
-      '/// check checkbox 'Use Custom Slide Show' ///'
-      IndividuellePraesentationBenutzen.Check
-      sleep 1
-      '///+ UNcheck checkbox 'Use Custom Slide Show' ///'
-      IndividuellePraesentationBenutzen.UnCheck
-      '/// click button 'Start...' ///'
-      Starten.Click
-         sleep 5
-         '/// press key [space] 2 times ///'
-         kontext "DocumentPresentation"
-         DocumentPresentation.TypeKeys "<space>"
-         sleep 1
-         DocumentPresentation.TypeKeys "<space>"
-         sleep 1
-      '/// close dialog 'Custom Slide Shows' ///'
-'   IndividuellePraesentation.Close ' slide show ends dialog !
-   '/// Slide Show->Slide Show Settings ///'
+    
+    printlog "open application "
+    Call hNewDocument
+    sleep 2
+    printlog "Slide Show->Custom Slide Show "
+    SlideShowCustomSlideshow
+    Kontext "IndividuellePraesentation"
+    call Dialogtest (IndividuellePraesentation)
+    printlog "click button 'New' "
+    Neu.Click
+    Kontext "IndividuellePraesentationDefinieren"
+    Call DialogTest (IndividuellePraesentationDefinieren)
+    printlog "select the first entry in the list 'Existing Slides' "
+    SeitenPraesentation.Select 1
+    printlog "click button '>>' "
+    Hinzufuegen.Click
+    printlog "close dialog 'Define Custom Slide Show' with OK "
+    IndividuellePraesentationDefinieren.OK
+    Kontext "IndividuellePraesentation"
+    printlog "click button 'Copy' "
+    Kopieren.Click
+    printlog "click button 'Delete' "
+    Loeschen.Click
+    printlog "click button 'Edit' "
+    Bearbeiten.Click
+    Kontext "IndividuellePraesentationDefinieren"
+    printlog "select 1st entry in the list 'Selected Slides' "
+    SelectedSlides.Select 1
+    printlog "click button '<<' "
+    Entfernen.Click
+    printlog "close dialog 'Define Custom Slide Show' with Cancel "
+    IndividuellePraesentationDefinieren.Cancel
+    Kontext "IndividuellePraesentation"
+    printlog "check checkbox 'Use Custom Slide Show' "
+    IndividuellePraesentationBenutzen.Check
+    sleep 1
+    printlog "+ UNcheck checkbox 'Use Custom Slide Show' "
+    IndividuellePraesentationBenutzen.UnCheck
+    printlog "click button 'Start...' "
+    Starten.Click
+    sleep 5
+    printlog "press key [space] 2 times "
+    kontext "DocumentPresentation"
+    DocumentPresentation.TypeKeys "<space>"
+    sleep 1
+    DocumentPresentation.TypeKeys "<space>"
+    sleep 1
+    printlog "close dialog 'Custom Slide Shows' "
+    '   IndividuellePraesentation.Close ' slide show ends dialog !
+    printlog "Slide Show->Slide Show Settings "
    try
       SlideShowPresentationSettings
    catch
@@ -240,48 +239,47 @@ testcase tSlideShowCustomSlideShow
    endcatch
       Kontext "Bildschirmpraesentation"
       if Bildschirmpraesentation.exists (5) then
-         '/// check checkbox 'Custom Slide Show' ///'
+         printlog "check checkbox 'Custom Slide Show' "
          RangeCustomSlideShow.Check
          printlog "check: '" + IndividuellePraesentationName.GetSelText + "'"
-         '/// cancel dialog 'Slide Show' ///'
+         printlog "cancel dialog 'Slide Show' "
          Bildschirmpraesentation.Cancel
       else
          warnlog "Dialog not open? SlideShowPresentationSettings"
       endif
-   '/// Slide Show->Custom Slide Show ///'
+   printlog "Slide Show->Custom Slide Show "
    SlideShowCustomSlideshow
       Kontext "IndividuellePraesentation"
       if (IndividuellePraesentation.exists (5)) then
-         '/// click button 'Delete' ///'
+         printlog "click button 'Delete' "
          Loeschen.Click
-         '/// close dialog 'Custom Slide Shows' ///'
+         printlog "close dialog 'Custom Slide Shows' "
          IndividuellePraesentation.Close
       else
          warnlog "Dialog not open? SlideShowCustomSlideshow"
       endif
-   '/// close application ///'
+   printlog "close application "
    Call hCloseDocument
    
 endcase 'tSlideShowCustomSlideShow
 '------------------------------------------------------------------------------
 testcase tSlideShowSlideTransition
 
-    goto endsub '"#149943# - Outcommented tSlideShowSlideTransition due to bug."
     dim i as integer
     dim a as integer
     dim iCount as integer
 
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
-    '/// create rectangle ///'
+    printlog "create rectangle "
     Call hRechteckErstellen ( 10, 10, 20, 40 )
     sleep 1
-    '/// Slide Show->Slide Transition ///'
+    printlog "Slide Show->Slide Transition "
     SlideShowSlideTransition
     sleep 2
-    '/// The 'Slide Transition' in the right 'Tasks' Pane has to come up ///'
+    printlog "The 'Slide Transition' in the right 'Tasks' Pane has to come up "
     Kontext "Tasks"
-        '/// Select the second entry from teh Listbox 'Applay to selected slides' ///'
+        printlog "Select the second entry from teh Listbox 'Applay to selected slides' "
         TransitionApplyToSelectedSlide.select (2)
         sleep 5 ' takes some time, until it is run
         Printlog "Count of effects : "+TransitionApplyToSelectedSlide.GetItemCount
@@ -289,7 +287,7 @@ testcase tSlideShowSlideTransition
         iCount = TransitionSound.GetItemCount
         Printlog "Count of Sounds  : " + iCount
 
-        '/// One Entry of the Listbox 'Sound' is 'Other sound...', select it ///'
+        printlog "One Entry of the Listbox 'Sound' is 'Other sound...', select it "
         TransitionSound.typeKeys "<home>"
         i = 0
         for a = 1 to iCount
@@ -312,37 +310,37 @@ testcase tSlideShowSlideTransition
             endif
         next a
         TransitionSound.select (i)
-        '/// The dialog 'Open' comes up///'
+        printlog "The dialog 'Open' comes up"
         sleep 1
         kontext "OeffnenDlg"
         if (OeffnenDlg.exists (5)) then
-            '/// Read all entries in Listbox 'File type' ///'
+            printlog "Read all entries in Listbox 'File type' "
             for i = 1 to Dateityp.getItemCount
                 printlog "" + i + ":" + Dateityp.getItemText(i)
             next i
-            '/// cancel dialog 'Open' ///'
+            printlog "cancel dialog 'Open' "
             OeffnenDlg.cancel
         else
             warnlog "Impress:Tasks Pane:Slide Transition:Sound:Other sound... disdn't bring up teh File Open Dialog!"
         endif
         kontext "Tasks"
         sleep (2)
-        '/// check checkbox 'Automatically after' ///'
+        printlog "check checkbox 'Automatically after' "
         TransitionAutomaticallyAfter.check
         sleep (2)
-        '/// press key 'Page Up' in box ///'
+        printlog "press key 'Page Up' in box "
         TransitionAutomaticallyAfterTime.typeKeys "<PageUp>"
         sleep 9
-        '/// check the standard checkbox 'On mouse click' ///'
+        printlog "check the standard checkbox 'On mouse click' "
         TransitionOnMouseClick.check
         sleep (2)
-        '/// press button 'Apply to All Slides' ///'
+        printlog "press button 'Apply to All Slides' "
         TransitionApplyToAllSlides.click
         sleep (2)
-        '/// press button 'Play' ///'
+        printlog "press button 'Play' "
         TransitionPlay.click
         sleep 10
-        '/// press button 'Slide Show' ///'
+        printlog "press button 'Slide Show' "
         TransitionSlideShow.click
         sleep 2
         kontext "DocumentPresentation"
@@ -354,8 +352,8 @@ testcase tSlideShowSlideTransition
         endif
         kontext "Tasks"
 
-        '/// uncheck and check Checkbox 'Automatic Preview' ///'
-        '/// default is checked ///'
+        printlog "uncheck and check Checkbox 'Automatic Preview' "
+        printlog "default is checked "
         if (NOT TransitionAutomaticPreview.isChecked) then
             warnlog "Impress:Tasks Pane:Slide Transition: Automatic preview has to be checked by default, wasn't!"
         endif
@@ -363,111 +361,111 @@ testcase tSlideShowSlideTransition
         TransitionAutomaticPreview.unCheck
         sleep (2)
         TransitionAutomaticPreview.Check
-    '/// close application ///'
+    printlog "close application "
     Call hCloseDocument
     
 endcase 'tSlideShowSlideTransition
 '-------------------------------------------------------------------------------
 testcase tSlideShowShowHideSlide
-
-'/// open application ///'
- Call hNewDocument
-'/// create rectangle ///'
-   Call hRechteckErstellen ( 10, 10, 20, 40 )
-'/// View->Master View->Slides View ///'
-   ViewWorkspaceSlidesView
-   sleep 1
-'/// Slide Show->Hide Slide ///'
-   SlideShowHideSlide
-   sleep 1
-'/// Slide Show->Show Slide ///'
-   SlideShowShowSlide
-'/// close application ///'
- Call hCloseDocument
-endcase
-
-testcase tSlideShowAnimation
-'/// open application ///'
-   Call hNewDocument
-   sleep 1
-'/// create rectangle ///'
-   Call hRechteckErstellen ( 10, 10, 20, 40 )
-   sleep 1
-'/// Insert ->Animated image ///'
- Opl_SD_EffekteZulassen
- Kontext "Animation"
-     sleep 1
-'/// click button 'Apply Object' ///'
-     BildAufnehmen.Click  'BildAufnehmen
-'/// click button 'Create' ///'
-      Erstellen.Click
-     sleep 1
-'/// Select 1st entry from top in 'Alignment' ///'
-      Anpassung.Select 1
-     sleep 1
-'/// click button 'Create' ///'
-      Erstellen.Click
-     sleep 1
-'/// click button 'Apply Objects Individually' ///'
-      AlleAufnehmen.Click
-     sleep 1
-'/// click button 'First Image' ///'
-      ErstesBild.Click
-     sleep 1
-'/// click button 'Last Image' ///'
-      LetztesBild.Click
-     sleep 1
-'/// click button 'BAckwards' ///'
-      Rueckwaerts.Click
-     sleep 1
-'/// click button 'Play' ///'
-      Abspielen.Click
-     sleep 1
-'/// click in Number field 'Image Number' Less - More ///'
-      AnzahlBilder.Less
-     sleep 1
-      AnzahlBilder.More
-     sleep 1
-'/// check 'Bitmap Object' ///'
-   AnimationsgruppeBitmapobjekt.Check
-     sleep 1
-'/// Type '10' into the field 'Duration' ///'
-      AnzeigedauerProBild.SetText "10"
-'/// click button 'Play' ///'
-      Abspielen.Click
-'/// wait 5 seconds ///'
-      sleep 5
-'/// click button 'Stop' ///'
-     try
-        Stopp.Click
-     catch
-        warnlog "Stopbutton doesn't work"
-     endcatch
-     sleep 1
-'/// Select 1st entry from top in 'Loop Count' ///'
-      AnzahlDurchlaeufe.Select 1
-     sleep 1
-'/// click button 'Delete Current Image' ///'
-      BildLoeschen.Click
-     sleep 1
-'/// check 'Group Object' ///'
-   AnimationsgruppeGruppenobjekt.Check
-     sleep 1
-'/// click button 'Delete All Images' ///'
-      AlleLoeschen.Click
-      kontext "Messagebox"
-'/// there has to be a messagebox 'Really delete?' say YES!; else ERROR ///'
-      if Messagebox.exists (5) then
+    
+    printlog "open application "
+    Call hNewDocument
+    printlog "create rectangle "
+    Call hRechteckErstellen ( 10, 10, 20, 40 )
+    printlog "View->Master View->Slides View "
+    ViewWorkspaceSlidesView
+    sleep 1
+    printlog "Slide Show->Hide Slide "
+    SlideShowHideSlide
+    sleep 1
+    printlog "Slide Show->Show Slide "
+    SlideShowShowSlide
+    printlog "close application "
+    Call hCloseDocument
+    endcase
+    
+    testcase tSlideShowAnimation
+    printlog "open application "
+    Call hNewDocument
+    sleep 1
+    printlog "create rectangle "
+    Call hRechteckErstellen ( 10, 10, 20, 40 )
+    sleep 1
+    printlog "Insert ->Animated image "
+    Opl_SD_EffekteZulassen
+    Kontext "Animation"
+    sleep 1
+    printlog "click button 'Apply Object' "
+    BildAufnehmen.Click  'BildAufnehmen
+    printlog "click button 'Create' "
+    Erstellen.Click
+    sleep 1
+    printlog "Select 1st entry from top in 'Alignment' "
+    Anpassung.Select 1
+    sleep 1
+    printlog "click button 'Create' "
+    Erstellen.Click
+    sleep 1
+    printlog "click button 'Apply Objects Individually' "
+    AlleAufnehmen.Click
+    sleep 1
+    printlog "click button 'First Image' "
+    ErstesBild.Click
+    sleep 1
+    printlog "click button 'Last Image' "
+    LetztesBild.Click
+    sleep 1
+    printlog "click button 'BAckwards' "
+    Rueckwaerts.Click
+    sleep 1
+    printlog "click button 'Play' "
+    Abspielen.Click
+    sleep 1
+    printlog "click in Number field 'Image Number' Less - More "
+    AnzahlBilder.Less
+    sleep 1
+    AnzahlBilder.More
+    sleep 1
+    printlog "check 'Bitmap Object' "
+    AnimationsgruppeBitmapobjekt.Check
+    sleep 1
+    printlog "Type '10' into the field 'Duration' "
+    AnzeigedauerProBild.SetText "10"
+    printlog "click button 'Play' "
+    Abspielen.Click
+    printlog "wait 5 seconds "
+    sleep 5
+    printlog "click button 'Stop' "
+    try
+    Stopp.Click
+    catch
+    warnlog "Stopbutton doesn't work"
+    endcatch
+    sleep 1
+    printlog "Select 1st entry from top in 'Loop Count' "
+    AnzahlDurchlaeufe.Select 1
+    sleep 1
+    printlog "click button 'Delete Current Image' "
+    BildLoeschen.Click
+    sleep 1
+    printlog "check 'Group Object' "
+    AnimationsgruppeGruppenobjekt.Check
+    sleep 1
+    printlog "click button 'Delete All Images' "
+    AlleLoeschen.Click
+    kontext "Messagebox"
+    printlog "there has to be a messagebox 'Really delete?' say YES!; else ERROR "
+    if Messagebox.exists (5) then
          Messagebox.YES
-      else
+    else
          warnlog "No one cares about my data :-( No one asked if all shall be deleted :-( "
-      endif
-     sleep 1
-     kontext "Animation"
-'/// close dialog 'Animation' ///'
-      Animation.Close
-'/// close application ///'
-   Call hCloseDocument
+    endif
+    sleep 1
+    kontext "Animation"
+    printlog "close dialog 'Animation' "
+    Animation.Close
+    printlog "close application "
+    Call hCloseDocument
    
 endcase 'tSlideShowShowHideSlide
 '-------------------------------------------------------------------------------
@@ -481,34 +479,34 @@ testcase tSlideShowCustomAnimation
     Call hTextrahmenErstellen ("Test text to test text effects", 10, 10, 20, 40 )
     printlog "Slide Show->Custom Animation..."
     SlideShowCustomAnimation
-        Kontext "Tasks"
-        printlog "click button 'Add...'printlog "
-        EffectAdd.click
-        printlog "Dialog 'Custom Animation' comes up"
+    Kontext "Tasks"
+    printlog "click button 'Add...'printlog "
+    EffectAdd.click
+    printlog "Dialog 'Custom Animation' comes up"
+    kontext
+    printlog "Switch to TabPage: Entrance"
+    active.setPage(TabEntrance)
+    kontext "TabEntrance"
+    if TabEntrance.exists(5) then
+        DialogTest(TabEntrance)
+        printlog "select in the listbox 'Effects' the second entry"
+        Effects.select(2)
+        Speed.getItemCount
+        AutomaticPreview.unCheck
+        sleep 1
+        AutomaticPreview.Check
+        kontext
+        
+        printlog "Switch to TabPage: Emphasis"
+        active.setPage(TabEmphasis)
+        kontext "TabEmphasis"
+        if TabEmphasis.exists(5) then
+            DialogTest(TabEmphasis)
+        else
+            bError = true
+            warnlog "Impress:Tasks Pane:Custom Animation:TabEmphasis tabPage doesn't work."
+        endif
         kontext
-        printlog "Switch to TabPage: Entrance"
-        active.setPage(TabEntrance)
-        kontext "TabEntrance"
-        if TabEntrance.exists(5) then
-            DialogTest(TabEntrance)
-            printlog "select in the listbox 'Effects' the second entry"
-            Effects.select(2)
-            Speed.getItemCount
-            AutomaticPreview.unCheck
-            sleep 1
-            AutomaticPreview.Check
-            kontext
-            
-            printlog "Switch to TabPage: Emphasis"
-            active.setPage(TabEmphasis)
-            kontext "TabEmphasis"
-            if TabEmphasis.exists(5) then
-                DialogTest(TabEmphasis)
-            else
-                bError = true
-                warnlog "Impress:Tasks Pane:Custom Animation:TabEmphasis tabPage doesn't work."
-            endif
-            kontext
             
             printlog "Switch to TabPage: Exit"
             active.setPage(TabExit)
@@ -636,92 +634,92 @@ endcase 'tSlideShowCustomAnimation
 '-------------------------------------------------------------------------------
 testcase tSlideShowInteraction
 
-'/// open application ///'
- Call hNewDocument
- sleep 2
-'/// create rectangle ///'
-   Call hRechteckErstellen (10, 10, 20, 20)
-   sleep 3
-'/// Slide Show->Interaction ///'
-   SlideShowInteraction
-      Kontext "TabInteraktion"
-      Call DialogTest (TabInteraktion, 1)
-   '///+ Select 6th entry from top in 'Action at mouse click' : 'Go to page or object' ///'
-      AktionBeiMausklick.select 6
-      Printlog AktionBeiMausklick.GetSelText + " chosen"
-      Call DialogTest (TabInteraktion, 2)
-   '///+ click button 'Find' ///'
-      sleep 1
-      suchen.click
-      Kontext "TabInteraktion"
-'/// Select 7th entry from top in 'Action at mouse click' : 'Go to document' ///'
-      sleep 1
-      AktionBeiMausklick.select 7
-      sleep 1
-      Printlog AktionBeiMausklick.GetSelText + " chosen"
-      Kontext "TabInteraktion"
-      Call DialogTest (TabInteraktion, 3)
-   '///+ click button 'Browse...' ///'
-      Durchsuchen.click
-        sleep 1
-         kontext "OeffnenDlg"
-         call Dialogtest (OeffnenDlg)
-   '///+ cancel dialog 'open' ///'
-      OeffnenDlg.cancel
-      Kontext "TabInteraktion"
-      sleep 1
-'/// Select 9th entry from top in 'Action at mouse click' : 'Play Sound' ///'
-      AktionBeiMausklick.select 8
-      Printlog AktionBeiMausklick.GetSelText + " chosen"
-      Call DialogTest (TabInteraktion, 4)
-   '///+ click button 'Browse...' ///'
-      Durchsuchen.click
-   sleep 1
-      Kontext "OeffnenDlg"
-      Call dialogTest (OeffnenDlg)
-      '///+ cancel dialog 'open' ///'
-         OeffnenDlg.Cancel
-      sleep 1
-     Kontext "TabInteraktion"
-'/// Select 8th entry from top in 'Action at mouse click' : 'Run Program' ///'
-         AktionBeiMausklick.select 9
-         Printlog AktionBeiMausklick.GetSelText + " chosen"
-            Call DialogTest (TabInteraktion, 7)
-            Kontext "TabInteraktion"
-   '///+ click button 'Browse...' ///'
-            Durchsuchen.Click
-            sleep 1
-               Kontext "OeffnenDlg"
-               Call dialogTest (OeffnenDlg)
-   '///+ cancel dialog 'open' ///'
-               OeffnenDlg.Cancel
-         sleep 1
-'/// Select 9th entry from top in 'Action at mouse click' : 'Run Macro' ///'
-      Kontext "TabInteraktion"
-      AktionBeiMausklick.select 10
-        Printlog AktionBeiMausklick.GetSelText + " chosen"
-      sleep 3
-      Call DialogTest (TabInteraktion, 6)
-   '///+ click button 'Browse...' ///'
-           Durchsuchen.Click
-           sleep 1
-           Kontext "ScriptSelector"
-           sleep 1
-           Call DialogTest ( ScriptSelector, 1)
-           sleep 1
-   '///+ cancel dialog 'ScriptSelector' ///'
-           ScriptSelector.Cancel
-           sleep 1
-'/// Select 10th entry from top in 'Action at mouse click' : 'Exit Presentation' ///'
-      Kontext "TabInteraktion"
-      AktionBeiMausklick.select 11
-      Printlog AktionBeiMausklick.GetSelText + " chosen"
-      Call DialogTest (TabInteraktion, 7)
-      Kontext "TabInteraktion"
-'/// close dialog 'Interaction' ///'
-      TabInteraktion.Close
-      sleep 2
-'/// close application ///'
- Call hCloseDocument
+    printlog "open application "
+    Call hNewDocument
+    sleep 2
+    printlog "create rectangle "
+    Call hRechteckErstellen (10, 10, 20, 20)
+    sleep 3
+    printlog "Slide Show->Interaction "
+    SlideShowInteraction
+    Kontext "TabInteraktion"
+    Call DialogTest (TabInteraktion, 1)
+    printlog "+ Select 6th entry from top in 'Action at mouse click' : 'Go to page or object' "
+    AktionBeiMausklick.select 6
+    Printlog AktionBeiMausklick.GetSelText + " chosen"
+    Call DialogTest (TabInteraktion, 2)
+    printlog "+ click button 'Find' "
+    sleep 1
+    suchen.click
+    Kontext "TabInteraktion"
+    printlog "Select 7th entry from top in 'Action at mouse click' : 'Go to document' "
+    sleep 1
+    AktionBeiMausklick.select 7
+    sleep 1
+    Printlog AktionBeiMausklick.GetSelText + " chosen"
+    Kontext "TabInteraktion"
+    Call DialogTest (TabInteraktion, 3)
+    printlog "+ click button 'Browse...' "
+    Durchsuchen.click
+    sleep 1
+    kontext "OeffnenDlg"
+    call Dialogtest (OeffnenDlg)
+    printlog "+ cancel dialog 'open' "
+    OeffnenDlg.cancel
+    Kontext "TabInteraktion"
+    sleep 1
+    printlog "Select 9th entry from top in 'Action at mouse click' : 'Play Sound' "
+    AktionBeiMausklick.select 8
+    Printlog AktionBeiMausklick.GetSelText + " chosen"
+    Call DialogTest (TabInteraktion, 4)
+    printlog "+ click button 'Browse...' "
+    Durchsuchen.click
+    sleep 1
+    Kontext "OeffnenDlg"
+    Call dialogTest (OeffnenDlg)
+    printlog "cancel dialog 'open' "
+    OeffnenDlg.Cancel
+    sleep 1
+    Kontext "TabInteraktion"
+    printlog "Select 8th entry from top in 'Action at mouse click' : 'Run Program' "
+    AktionBeiMausklick.select 9
+    Printlog AktionBeiMausklick.GetSelText + " chosen"
+    Call DialogTest (TabInteraktion, 7)
+    Kontext "TabInteraktion"
+    printlog "+ click button 'Browse...' "
+    Durchsuchen.Click
+    sleep 1
+    Kontext "OeffnenDlg"
+    Call dialogTest (OeffnenDlg)
+    printlog "+ cancel dialog 'open' "
+    OeffnenDlg.Cancel
+    sleep 1
+    printlog "Select 9th entry from top in 'Action at mouse click' : 'Run Macro' "
+    Kontext "TabInteraktion"
+    AktionBeiMausklick.select 10
+    Printlog AktionBeiMausklick.GetSelText + " chosen"
+    sleep 3
+    Call DialogTest (TabInteraktion, 6)
+    printlog "+ click button 'Browse...' "
+    Durchsuchen.Click
+    sleep 1
+    Kontext "ScriptSelector"
+    sleep 1
+    Call DialogTest ( ScriptSelector, 1)
+    sleep 1
+    printlog "+ cancel dialog 'ScriptSelector' "
+    ScriptSelector.Cancel
+    sleep 1
+    printlog "Select 10th entry from top in 'Action at mouse click' : 'Exit Presentation' "
+    Kontext "TabInteraktion"
+    AktionBeiMausklick.select 11
+    Printlog AktionBeiMausklick.GetSelText + " chosen"
+    Call DialogTest (TabInteraktion, 7)
+    Kontext "TabInteraktion"
+    printlog "close dialog 'Interaction' "
+    TabInteraktion.Close
+    sleep 2
+    printlog "close application "
+    Call hCloseDocument
  
 endcase 'tSlideShowInteraction
diff --git a/testautomation/graphics/required/includes/impress/im_011_.inc b/testautomation/graphics/required/includes/impress/im_011_.inc
dissimilarity index 78%
index e0ec5aa6d..214bbeef5 100755
--- a/testautomation/graphics/required/includes/impress/im_011_.inc
+++ b/testautomation/graphics/required/includes/impress/im_011_.inc
@@ -1,179 +1,178 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
-'* Copyright 2008 by Sun Microsystems, Inc.
-'*
-'* OpenOffice.org - a multi-platform office productivity suite
-'*
-'* $RCSfile: im_011_.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-16 10:43:01 $
-'*
-'* This file is part of OpenOffice.org.
-'*
-'* OpenOffice.org is free software: you can redistribute it and/or modify
-'* it under the terms of the GNU Lesser General Public License version 3
-'* only, as published by the Free Software Foundation.
-'*
-'* OpenOffice.org is distributed in the hope that it will be useful,
-'* but WITHOUT ANY WARRANTY; without even the implied warranty of
-'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'* GNU Lesser General Public License version 3 for more details
-'* (a copy is included in the LICENSE file that accompanied this code).
-'*
-'* You should have received a copy of the GNU Lesser General Public License
-'* version 3 along with OpenOffice.org.  If not, see
-'* <http://www.openoffice.org/license.html>
-'* for a copy of the LGPLv3 License.
-'*
-'/************************************************************************
-'*
-'* Owner : wolfram.garten@sun.com
-'*
-'* short description : Impress Required Test Library (11)
-'*
-'\*****************************************************************
-
-testcase tiDiaLeiste
-
-' only in IMPRESS
-  dim sTemp as string
-  Dim i,x as integer
-
-'/// open application ///'
-   Call hNewDocument
-   sleep 1
-'/// Change options so the presentation won't start from the current, but the first slide. ///'
-   ToolsOptions
-   hToolsOptions ( "IMPRESS", "General" )
-   MitAktuellerSeite.Uncheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-
-'/// insert a graphic: "global\input\graf_inp\desp.bmp") ///'
-  Printlog "- Insert graphic from file so there is something for the slide mode"
-   hGrafikEinfuegen ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
-   sleep 3
-'///+ Insert->Slide ///'
-   InsertSlide
-   sleep 2
-   hTypekeys "<Pagedown>"
-   sleep 2
-'///+ insert a graphic: "global\input\graf_inp\desp.bmp") ///'
-   hGrafikeinfuegen ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
-   sleep 3
-'///+ View->Master View->Slides View ///'
-   ViewWorkspaceSlidesView
-   sleep 2
-'-------------------------------- Ueberblendeffekt ----------------------------------------
-   Printlog "- Test blend effect"
-   Kontext "SlideViewObjectbar"  ' CORRECT
-   sleep 5
-
-   if Ueberblendeffekt.GetItemCount <> 57 then warnlog "these are not 57: " + Ueberblendeffekt.GetItemCount
-'/// select last entry 'Automatic (random)' in listbox 'Slide Effects' on object toolbar ///'
-   Ueberblendeffekt.Select (Ueberblendeffekt.GetItemCount)
-   Printlog " select last effect (random effect): " + Ueberblendeffekt.GetSelText
-
-'   Printlog Geschwindigkeit.GetRT  ' 341 listbox
-'   Printlog Diawechsel.GetRT       ' 341 listbox
-'   Printlog Zeit.GetRT             ' 353 spinfield
-'   Printlog DiasProReihe.GetRT     ' 353 spinfield
-'   Printlog PraesentationMitZeitnahme.GetRT doesn't work, but behave as button
-'   Printlog DiaAnzeigen.GetRT               doesn't work, but behave as button
-
-'-------------------------------- Geschwindigkeit -----------------------------------------
-  Printlog "- Check different speed settings"
-   Kontext "SlideViewObjectbar"
-'/// select every item in list 'Transition Speed' ///'
-   x = Geschwindigkeit.GetItemCount
-   for i = 1 to x
-       Geschwindigkeit.Select i
-       Printlog "     changed to: " + Geschwindigkeit.GetSelText
-   next i
-'-------------------------------- Diawechsel ----------------------------------------------
-   Printlog "- Style of slide change"
-   Kontext "SlideViewObjectbar"
-'/// select every item in list 'Auto Transition' ///'
-   x = Diawechsel.GetItemCount
-   for i = 1 to x
-       Diawechsel.Select i
-       Printlog "     Changed to: " + Diawechsel.GetSelText + "; is time enabled ?: "+Zeit.IsEnabled
-   next i
-'-------------------------------- Diawechsel Zeitintervall --------------------------------
-   Printlog "- Zeitintervall testen"
-   Kontext "SlideViewObjectbar"
-'/// select last entry 'Automatic' in listbox 'Auto Transition' ///'
-   Diawechsel.Select (Diawechsel.GetItemCount) ' automatic is usually the last one
-   sleep 1
-   if (Zeit.IsEnabled = FALSE) Then Warnlog "- Time should be editable, if automatic is chosen"
-'/// type "15" into the field 'Time' ///'
-   Zeit.SetText "15"
-   sleep 1
-   Printlog "    Time set to: " + Zeit.GetText
-'-------------------------------- Praesentation mit Zeitnahme ------------------------------
-   Printlog "- Presentation with rehearsed timings"
-   Kontext "SlideViewObjectbar"
-'/// click button 'Rehearse Timings' ///'
-   PraesentationMitZeitnahme.Click
-   sleep 2
-   Kontext "DocumentPresentation"
-   if DocumentPresentation.exists (5) then
-      sleep 5
-'/// wait some seconds and click with mouse ///'
-      DocumentPresentation.MouseDown 50,50
-      DocumentPresentation.MouseUp 50,50
-      sleep 2
-'/// wait some seconds and click with mouse ///'
-      DocumentPresentation.MouseDown 50,50
-      DocumentPresentation.MouseUp 50,50
-      sleep 3
-   else
-      warnlog "Didn't switch into presentation mode :-("
-   endif
-   Kontext "DocumentPresentation"
-   if DocumentPresentation.exists (5) then
-      warnlog "We are still in presentation mode :-( WHY!!!!???"
-   endif
-'------------------------------- Dia anzeigen ja/nein --------------------------------------
-   Printlog "- Show slide yes/no"
-   Kontext "SlideViewObjectbar"
-'/// click button 'Show/Hide Slide' ///'
-   DiaAnzeigen.Click
-   sleep 3
-'/// click button 'Show/Hide Slide' ///'
-   DiaAnzeigen.Click
-'------------------------------- Dias pro Reihe --------------------------------------------
-   Printlog "- Presentation with rehearsed timings"
-   Kontext "SlideViewObjectbar"
-   sTemp = DiasProReihe.GetText
-'/// press button 'less' in field 'Slides Per Row' ///'
-      DiasProReihe.Less
-      if sTemp = DiasProReihe.GetText then warnlog "   nothing changed (less)"
-   sTemp = DiasProReihe.GetText
-'/// press button 'more' in field 'Slides Per Row' ///'
-      DiasProReihe.more
-      if sTemp = DiasProReihe.GetText then warnlog "   nothing changed (more 1)"
-   sTemp = DiasProReihe.GetText
-'/// press button 'more' in field 'Slides Per Row' ///'
-      DiasProReihe.more
-      if sTemp = DiasProReihe.GetText then warnlog "   nothing changed (more 2)"
- kontext
- if active.exists then
-   warnlog "active (1): '"+active.gettext+"'"
- endif
-'/// Restore default settings in ToolsOptions ///'
-   ToolsOptions
-   hToolsOptions ( "IMPRESS", "General" )
-   MitAktuellerSeite.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-'/// close application ///'
- Call hCloseDocument
- sleep 2
-endcase
-
-
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'* 
+'* Copyright 2008 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: im_011_.inc,v $
+'*
+'* $Revision: 1.1 $
+'*
+'* last change: $Author: jsi $ $Date: 2008-06-16 10:43:01 $
+'*
+'* This file is part of OpenOffice.org.
+'*
+'* OpenOffice.org is free software: you can redistribute it and/or modify
+'* it under the terms of the GNU Lesser General Public License version 3
+'* only, as published by the Free Software Foundation.
+'*
+'* OpenOffice.org is distributed in the hope that it will be useful,
+'* but WITHOUT ANY WARRANTY; without even the implied warranty of
+'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'* GNU Lesser General Public License version 3 for more details
+'* (a copy is included in the LICENSE file that accompanied this code).
+'*
+'* You should have received a copy of the GNU Lesser General Public License
+'* version 3 along with OpenOffice.org.  If not, see
+'* <http://www.openoffice.org/license.html>
+'* for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* Owner : wolfram.garten@sun.com
+'*
+'* short description : Impress Required Test Library (11)
+'*
+'\*****************************************************************
+
+testcase tiDiaLeiste
+    
+    ' only in IMPRESS
+    dim sTemp as string
+    Dim i,x as integer
+    
+    printlog " open application "
+    Call hNewDocument
+    sleep 1
+    printlog " Change options so the presentation won't start from the current, but the first slide. "
+    ToolsOptions
+    hToolsOptions ( "IMPRESS", "General" )
+    MitAktuellerSeite.Uncheck
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
+    
+    printlog " insert a graphic: global\input\graf_inp\desp.bmp) "
+    Printlog "- Insert graphic from file so there is something for the slide mode"
+    hGrafikEinfuegen ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
+    sleep 3
+    printlog "+ Insert->Slide "
+    InsertSlide
+    sleep 2
+    hTypekeys "<Pagedown>"
+    sleep 2
+    printlog "+ insert a graphic: "global\input\graf_inp\desp.bmp") "
+    hGrafikeinfuegen ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
+    sleep 3
+    printlog "+ View->Master View->Slides View "
+    ViewWorkspaceSlidesView
+    sleep 2
+    '-------------------------------- Ueberblendeffekt ----------------------------------------
+    Printlog "- Test blend effect"
+    Kontext "SlideViewObjectbar"  ' CORRECT
+    sleep 5
+    
+    if Ueberblendeffekt.GetItemCount <> 57 then warnlog "these are not 57: " + Ueberblendeffekt.GetItemCount
+    printlog " select last entry 'Automatic (random)' in listbox 'Slide Effects' on object toolbar "
+    Ueberblendeffekt.Select (Ueberblendeffekt.GetItemCount)
+    Printlog " select last effect (random effect): " + Ueberblendeffekt.GetSelText
+    
+    '   Printlog Geschwindigkeit.GetRT  ' 341 listbox
+    '   Printlog Diawechsel.GetRT       ' 341 listbox
+    '   Printlog Zeit.GetRT             ' 353 spinfield
+    '   Printlog DiasProReihe.GetRT     ' 353 spinfield
+    '   Printlog PraesentationMitZeitnahme.GetRT doesn't work, but behave as button
+    '   Printlog DiaAnzeigen.GetRT               doesn't work, but behave as button
+    
+    '-------------------------------- Geschwindigkeit -----------------------------------------
+    Printlog "- Check different speed settings"
+    Kontext "SlideViewObjectbar"
+    printlog " select every item in list 'Transition Speed' "
+    x = Geschwindigkeit.GetItemCount
+    for i = 1 to x
+        Geschwindigkeit.Select i
+        Printlog "     changed to: " + Geschwindigkeit.GetSelText
+    next i
+    '-------------------------------- Diawechsel ----------------------------------------------
+    Printlog "- Style of slide change"
+    Kontext "SlideViewObjectbar"
+    printlog " select every item in list 'Auto Transition' "
+    x = Diawechsel.GetItemCount
+    for i = 1 to x
+        Diawechsel.Select i
+        Printlog "     Changed to: " + Diawechsel.GetSelText + "; is time enabled ?: "+Zeit.IsEnabled
+    next i
+    '-------------------------------- Diawechsel Zeitintervall --------------------------------
+    Printlog "- Zeitintervall testen"
+    Kontext "SlideViewObjectbar"
+    printlog " select last entry 'Automatic' in listbox 'Auto Transition' "
+    Diawechsel.Select (Diawechsel.GetItemCount) ' automatic is usually the last one
+    sleep 1
+    if (Zeit.IsEnabled = FALSE) Then Warnlog "- Time should be editable, if automatic is chosen"
+    printlog " type "15" into the field 'Time' "
+    Zeit.SetText "15"
+    sleep 1
+    Printlog "    Time set to: " + Zeit.GetText
+    '-------------------------------- Praesentation mit Zeitnahme ------------------------------
+    Printlog "- Presentation with rehearsed timings"
+    Kontext "SlideViewObjectbar"
+    printlog " click button 'Rehearse Timings' "
+    PraesentationMitZeitnahme.Click
+    sleep 2
+    Kontext "DocumentPresentation"
+    if DocumentPresentation.exists (5) then
+    sleep 5
+    printlog " wait some seconds and click with mouse "
+    DocumentPresentation.MouseDown 50,50
+    DocumentPresentation.MouseUp 50,50
+    sleep 2
+    printlog " wait some seconds and click with mouse "
+    DocumentPresentation.MouseDown 50,50
+    DocumentPresentation.MouseUp 50,50
+    sleep 3
+    else
+    warnlog "Didn't switch into presentation mode :-("
+    endif
+    Kontext "DocumentPresentation"
+    if DocumentPresentation.exists (5) then
+    warnlog "We are still in presentation mode :-( WHY!!!!???"
+    endif
+    '------------------------------- Dia anzeigen ja/nein --------------------------------------
+    Printlog "- Show slide yes/no"
+    Kontext "SlideViewObjectbar"
+    printlog " click button 'Show/Hide Slide' "
+    DiaAnzeigen.Click
+    sleep 3
+    printlog " click button 'Show/Hide Slide' "
+    DiaAnzeigen.Click
+    '------------------------------- Dias pro Reihe --------------------------------------------
+    Printlog "- Presentation with rehearsed timings"
+    Kontext "SlideViewObjectbar"
+    sTemp = DiasProReihe.GetText
+    printlog " press button 'less' in field 'Slides Per Row' "
+    DiasProReihe.Less
+    if sTemp = DiasProReihe.GetText then warnlog "   nothing changed (less)"
+    sTemp = DiasProReihe.GetText
+    printlog " press button 'more' in field 'Slides Per Row' "
+    DiasProReihe.more
+    if sTemp = DiasProReihe.GetText then warnlog "   nothing changed (more 1)"
+    sTemp = DiasProReihe.GetText
+    printlog " press button 'more' in field 'Slides Per Row' "
+    DiasProReihe.more
+    if sTemp = DiasProReihe.GetText then warnlog "   nothing changed (more 2)"
+    kontext
+    if active.exists then
+        warnlog "active (1): '"+active.gettext+"'"
+    endif
+    printlog " Restore default settings in ToolsOptions "
+    ToolsOptions
+    hToolsOptions ( "IMPRESS", "General" )
+    MitAktuellerSeite.Check
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
+    printlog " close application "
+    Call hCloseDocument
+    sleep 2
+ 
+endcase 'tiDiaLeiste
diff --git a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc
index f6418e49b..fe5ebd514 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc
@@ -401,6 +401,8 @@ testcase tInsertHyperlink
     '/// Open 'Hyperlink' – dialog via 'Insert – Hyperlink'
     printlog " Open 'Hyperlink' – dialog via 'Insert – Hyperlink'"
     InsertHyperlink
+    WaitSlot( 5000 )
+    
     Kontext "Hyperlink"
     '/// Switch to category 'Internet' (first one)
     printlog " Switch to category 'Internet'"
diff --git a/testautomation/writer/optional/includes/fields/w_fields1.inc b/testautomation/writer/optional/includes/fields/w_fields1.inc
index afff7587b..23b2c6676 100755
--- a/testautomation/writer/optional/includes/fields/w_fields1.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields1.inc
@@ -39,19 +39,19 @@
 
 sub w_fields1
 
-    Call tFields_1           'Insert / Fields / Date
-    Call tFields_2           'Insert / Fields / Time
-    Call tFields_3           'Insert / Fields / Page Number
-    Call tFields_4           'Insert / Fields / Page Count
-    Call tFields_5           'Insert / Fields / Subject
-    Call tFields_6           'Insert / Fields / Title
-    Call tFields_7           'Insert / Fields / Author
+    Call tInsertFieldsDate
+    Call tInsertFieldsTime
+    Call tInsertFieldsPageNumber
+    Call tInsertFieldsPageCount
+    Call tInsertFieldsSubject
+    Call tInsertFieldsTitle
+    Call tInsertFieldsAuthor
 
 end sub
 
 '-----------------------------------------------------------------
 
-testcase tFields_1
+testcase tInsertFieldsDate
 
     Dim sDate as String
     sDate  = Date
@@ -112,7 +112,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFields_2
+testcase tInsertFieldsTime
 
     Dim sTime  as String
     Dim sTime1 as String
@@ -175,7 +175,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFields_3
+testcase tInsertFieldsPageNumber
 qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
 goto endsub
 
@@ -221,7 +221,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFields_4
+testcase tInsertFieldsPageCount
 qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
 goto endsub
 
@@ -278,7 +278,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFields_5
+testcase tInsertFieldsSubject
 qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
 goto endsub
 
@@ -311,7 +311,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFields_6
+testcase tInsertFieldsTitle
 qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
 goto endsub
 
@@ -345,7 +345,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFields_7
+testcase tInsertFieldsAuthor
 qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
 goto endsub
 
diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc
index 7e68edb5c..55e0ff590 100755
--- a/testautomation/writer/optional/includes/fields/w_fields2.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields2.inc
@@ -39,24 +39,24 @@
 
 sub w_fields2
 
-    Call tFieldsOther_0      'NON modal
-    Call tFieldsOther_1_1    'Insert/Fields/Other/Document / Author
-    Call tFieldsOther_1_2    'Insert/Fields/Other/Document / Author - Fixed
-    Call tFieldsOther_2      'Insert/Fields/Other/Document / Chapter
-    Call tFieldsOther_3      'Insert/Fields/Other/Document / Date
-    Call tFieldsOther_4      'Insert/Fields/Other/Document / File name
-    Call tFieldsOther_5      'Insert/Fields/Other/Document / Page
-    Call tFieldsOther_6_1    'Insert/Fields/Other/Document / Sender
-    Call tFieldsOther_6_2    'Insert/Fields/Other/Document / Sender - Fixed
-    Call tFieldsOther_7      'Insert/Fields/Other/Document / Statistics
-    Call tFieldsOther_8      'Insert/Fields/Other/Document / Template
-    Call tFieldsOther_9      'Insert/Fields/Other/Document / Time
+    Call tDialogNonModal
+    Call tDocumentAuthor
+    Call tDocumentAuthorFixed
+    Call tDocumentChapter
+    Call tDocumentDate
+    Call tDocumentFilename
+    Call tDocumentPage
+    Call tDocumentSender
+    Call tDocumentSenderFixed
+    Call tDocumentStatistics
+    Call tDocumentTemplate
+    Call tDocumentTime
 
 end sub
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_0
+testcase tDialogNonModal
 
   Dim sTest as String
 
@@ -90,7 +90,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_1_1
+testcase tDocumentAuthor
     if iSprache <> 1 then
         QaErrorLog "Currently no any other language than English. Aborting."
         exit sub
@@ -196,7 +196,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_1_2
+testcase tDocumentAuthorFixed
     if iSprache <> 1 then
         QaErrorLog "Currently no any other language than English. Aborting."
         exit sub
@@ -304,7 +304,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_2
+testcase tDocumentChapter
 
   Dim sTestFile  as String
   Dim sChapter() as String
@@ -360,7 +360,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_3
+testcase tDocumentDate
 
     Dim sDate as String
     
@@ -391,7 +391,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_4
+testcase tDocumentFilename
     if bAsianLan = true then
         QaErrorLog "No testing with Asian language. Aborting."
         exit sub
@@ -450,7 +450,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_5
+testcase tDocumentPage
 qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
 goto endsub
 
@@ -509,7 +509,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_6_1
+testcase tDocumentSender
     if iSprache <> 1 then
         QaErrorLog "Currently no testing with other languages than English. (ID's are not the same) Aborting."
         exit sub
@@ -686,7 +686,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_6_2
+testcase tDocumentSenderFixed
     if iSprache <> 1 then
         QaErrorLog "Currently no testing with other languages than English. (ID's are not the same) Aborting."
         exit sub
@@ -866,7 +866,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_7
+testcase tDocumentStatistics
 qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
 goto endsub
 
@@ -929,7 +929,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_8
+testcase tDocumentTemplate
 qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
 goto endsub
 
@@ -999,7 +999,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFieldsOther_9
+testcase tDocumentTime
 
     Dim sTime1 as String
     Dim sTime2 as String
diff --git a/testautomation/writer/optional/includes/fields/w_fields3.inc b/testautomation/writer/optional/includes/fields/w_fields3.inc
index cc165d9ee..6e92e0b00 100755
--- a/testautomation/writer/optional/includes/fields/w_fields3.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields3.inc
@@ -39,29 +39,29 @@
 
 sub w_fields3
 
-    Call tFieldsReferences       'Insert/Cross-reference
-    Call tSetReferences_1        'Set Reference - Cursor at any position
-    Call tSetReferences_2        'Set Reference - Select some text
-    Call tInsertReference_1      'Insert Reference - Page
-    Call tInsertReference_2      'Insert Reference - Chapter
-    Call tInsertReference_3      'Insert Reference - Reference
-    Call tInsertReference_4      'Insert Reference - Above/Below
-    Call tInsertReference_5      'Insert Reference - As Page Style
-    Call tInsertReference_6      'Insert Footnote
-    Call tInsertReference_7      'Insert Endnote
-    Call tInsertReference_8_1    'Insert Caption - Above
-    Call tInsertReference_8_2    'Insert Caption - Below
-    Call tInsertBookmark_1       'Insert Bookmark - Page
-    Call tInsertBookmark_2       'Insert Bookmark - Chapter
-    Call tInsertBookmark_3       'Insert Bookmark - Reference
-    Call tInsertBookmark_4       'Insert Bookmark - Above/Below
-    Call tInsertBookmark_5       'Insert Bookmark - As Page Style
+    Call tCrossReference
+    Call tSetReferenceNoSelection
+    Call tSetReferenceTextSelection
+    Call tInsertReferencePage
+    Call tInsertReferenceChapter
+    Call tInsertReferenceReference
+    Call tInsertReferenceAboveBelow
+    Call tInsertReferenceAsPageStyle
+    Call tInsertFootnote
+    Call tInsertEndnote
+    Call tInsertCaptionAbove
+    Call tInsertCaptionBelow
+    Call tInsertBookmarkPage
+    Call tInsertBookmarkChapter
+    Call tInsertBookmarkReference
+    Call tInsertBookmarkAboveBelow
+    Call tInsertBookmarkAsPageStyle
 
 end sub
 
 '-----------------------------------------------------------------
 
-testcase tFieldsReferences
+testcase tCrossReference
 
   printlog "Insert/Cross-reference"
  '/// <b> Insert/Cross-reference </b>
@@ -86,7 +86,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tSetReferences_1
+testcase tSetReferenceNoSelection
 
   Dim sReference as String
   Dim sTestFile  as String
@@ -133,7 +133,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tSetReferences_2
+testcase tSetReferenceTextSelection
 
   Dim sReference as String
 
@@ -174,7 +174,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertReference_1
+testcase tInsertReferencePage
 
   Dim sReference as String
   Dim sTestFile  as String
@@ -234,7 +234,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertReference_2
+testcase tInsertReferenceChapter
 
   Dim sReference as String
   Dim sTestFile  as String
@@ -294,7 +294,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertReference_3
+testcase tInsertReferenceReference
 
   Dim sReference     as String
   Dim sReferenceName as String
@@ -355,7 +355,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertReference_4
+testcase tInsertReferenceAboveBelow
 
   Dim sReference as String
   Dim sAbove     as String
@@ -446,7 +446,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertReference_5
+testcase tInsertReferenceAsPageStyle
 
   Dim sReference as String
   Dim sTestSytle as String
@@ -509,7 +509,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertReference_6
+testcase tInsertFootnote
 
   Dim sFootnote as String
 
@@ -543,7 +543,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertReference_7
+testcase tInsertEndnote
 
   Dim sEndnote as String
 
@@ -577,7 +577,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertReference_8_1
+testcase tInsertCaptionAbove
 
   Dim sCategory  as String
   Dim sCaption   as String
@@ -627,7 +627,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertReference_8_2
+testcase tInsertCaptionBelow
 
   Dim sCategory  as String
   Dim sCaption   as String
@@ -677,7 +677,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertBookmark_1
+testcase tInsertBookmarkPage
 
   Dim sBookmark as String
   Dim sTestFile as String
@@ -735,7 +735,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertBookmark_2
+testcase tInsertBookmarkChapter
 
   Dim sBookmark as String
   Dim sTestFile as String
@@ -792,7 +792,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertBookmark_3
+testcase tInsertBookmarkReference
 
   Dim sReference as String
   Dim sBookmark  as String
@@ -850,7 +850,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertBookmark_4
+testcase tInsertBookmarkAboveBelow
 
   Dim sBookmark as String
   Dim sAbove    as String
@@ -938,7 +938,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tInsertBookmark_5
+testcase tInsertBookmarkAsPageStyle
 
   Dim sBookmark  as String
   Dim sTestSytle as String
diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc
index 9e2883813..736e3649b 100755
--- a/testautomation/writer/optional/includes/fields/w_fields4.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields4.inc
@@ -39,23 +39,23 @@
 
 sub w_fields4
 
-    Call tDocInformation_1   'Doc Information - Title
-    Call tDocInformation_2   'Doc Information - Subject
-    Call tDocInformation_3   'Doc Information - Keywords
-    Call tDocInformation_4   'Doc Information - Description
-    Call tDocInformation_5   'Doc Information - User Defined
-    Call tDocInformation_6   'Doc Information - Created
-    Call tDocInformation_7_1 'Doc Information - Modified
-    Call tDocInformation_7_2 'Doc Information - Modified (Save file)
-    Call tDocInformation_8   'Doc Information - Printed
-    Call tDocInformation_9   'Doc Information - Revision number
-    Call tDocInformation_10  'Doc Information - Tatal editing time
+    Call tDocInformationTitle
+    Call tDocInformationSubject
+    Call tDocInformationKeywords
+    Call tDocInformationDescription
+    Call tDocInformationUserDefined
+    Call tDocInformationCreated
+    Call tDocInformationModified
+    Call tDocInformationModifiedSavefile
+    Call tDocInformationPrinted
+    Call tDocInformationRevisionnumber
+    Call tDocInformationTotaleditingtime
 
 end sub
 
 '-----------------------------------------------------------------
 
-testcase tDocInformation_1
+testcase tDocInformationTitle
 
   Dim sTitle     as String
   Dim sTestFile  as String
@@ -107,7 +107,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tDocInformation_2
+testcase tDocInformationSubject
 
   Dim sSubject   as String
   Dim sTestFile  as String
@@ -159,7 +159,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tDocInformation_3
+testcase tDocInformationKeywords
 
   Dim sKeywords  as String
   Dim sTestFile  as String
@@ -211,7 +211,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tDocInformation_4
+testcase tDocInformationDescription
 
   Dim sDescription as String
   Dim sTestFile    as String
@@ -266,7 +266,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tDocInformation_5
+testcase tDocInformationUserDefined
 qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
 goto endsub
 
@@ -340,7 +340,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tDocInformation_6
+testcase tDocInformationCreated
 
   Dim sTestFile     as String
   Dim sFirstName    as String
@@ -444,7 +444,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tDocInformation_7_1
+testcase tDocInformationModified
 
   Dim sTestFile     as String
   Dim sSaveasFile   as String
@@ -571,8 +571,8 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tDocInformation_7_2
-    QaErrorLog "#i102792# - tDocInformation_7_2 outcommented due to issue."
+testcase tDocInformationModifiedSavefile
+    QaErrorLog "#i102792# - tDocInformationModifiedSavefile outcommented due to issue."
     goto endsub
 
   Dim sTestFile     as String
@@ -685,7 +685,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tDocInformation_8
+testcase tDocInformationPrinted
 
   Dim sTestFile     as String
   Dim sFirstName    as String
@@ -803,7 +803,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tDocInformation_9
+testcase tDocInformationRevisionnumber
 
   Dim sTestFile   as String
   Dim sSaveasFile as String
@@ -817,7 +817,7 @@ testcase tDocInformation_9
   sFirstName1 = "Test1" : sLastName1 = "Test2"
   sVarResult  = "17"    : sFixResult = "4"
   sTestFile   = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
-  sSaveasFile = ConvertPath (gOfficePath + "user\work\tDocInformation_9.sxw" )
+  sSaveasFile = ConvertPath (gOfficePath + "user\work\tDocInformationRevisionnumber.sxw" )
 
   if hFileExists ( sSaveAsFile ) then app.kill ( sSaveAsFile )
 
@@ -899,7 +899,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tDocInformation_10
+testcase tDocInformationTotaleditingtime
 
   Dim sTestFile   as String
   Dim sSaveasFile as String
@@ -908,7 +908,7 @@ testcase tDocInformation_10
 
   sFixResult  = "00:29:05"
   sTestFile   = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
-  sSaveasFile = ConvertPath (gOfficePath + "user\work\tDocInformation_9.sxw" )
+  sSaveasFile = ConvertPath (gOfficePath + "user\work\tDocInformationRevisionnumber.sxw" )
 
   if hFileExists ( sSaveAsFile ) then app.kill ( sSaveAsFile )
 
diff --git a/testautomation/writer/optional/includes/fields/w_fields5.inc b/testautomation/writer/optional/includes/fields/w_fields5.inc
index 8993463cf..2dd0be24a 100755
--- a/testautomation/writer/optional/includes/fields/w_fields5.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields5.inc
@@ -33,29 +33,29 @@
 '*
 '* owner : helge.delfs@sun.com
 '*
-'* short description : Fields - Variabs
+'* short description : Fields - Variables
 '*
 '\***********************************************************************
 
 sub w_fields5
 
-    Call tVariables_1        'Set value to text
-    Call tVariables_2        'Set value to number
-    Call tVariables_3        'Set format as 'Additional formats...'
-    Call tVariables_4        'Show Variable - 1
-    Call tVariables_5        'Show Variable - 2
-    Call tVariables_6        'Insert formula
-    Call tVariables_7        'Number range
-    Call tVariables_8        'Input field
-    Call tVariables_9        'User field
-    Call tVariables_10       'DDE field - manual
-    Call tVariables_11       'DDE field - automatic
+    Call tVariablesSetValueToText
+    Call tVariablesSetValueToNumber
+    Call tVariablesSetFormats
+    Call tVariablesShowVariable1
+    Call tVariablesShowVariable2
+    Call tVariablesInsertFormula
+    Call tVariablesNumberRange	
+    Call tVariablesInputfield
+    Call tVariablesUserfield
+    Call tVariablesDDEFieldManual
+    Call tVariablesDDEFieldAutomatic
 
 end sub
 
 '-----------------------------------------------------------------
 
-testcase tVariables_1
+testcase tVariablesSetValueToText
     if bAsianLan = true then
         QaErrorLog "No testing with Asian language. Aborting."
         exit sub
@@ -127,7 +127,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tVariables_2
+testcase tVariablesSetValueToNumber
     if bAsianLan = true then
         QaErrorLog "No testing with Asian language. Aborting."
         exit sub
@@ -199,8 +199,8 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tVariables_3
-    qaerrorlog "#i94596# - tVariables_3 outcommented due to bug."
+testcase tVariablesSetFormats
+    qaerrorlog "#i94596# - tVariablesSetFormats outcommented due to bug."
     goto endsub
 
   Dim sName     as String
@@ -270,7 +270,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tVariables_4
+testcase tVariablesShowVariable1
 
   Dim sName()   as String
   Dim sResult() as String
@@ -348,7 +348,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tVariables_5
+testcase tVariablesShowVariable2
 
   Dim sName     as String
   Dim sValue    as String
@@ -427,7 +427,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tVariables_6
+testcase tVariablesInsertFormula
 
   Dim sName()   as String
   Dim sValue()  as String
@@ -482,7 +482,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tVariables_7
+testcase tVariablesNumberRange
 
   Dim sResult() as String
   Dim i         as Integer
@@ -541,7 +541,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tVariables_8
+testcase tVariablesInputfield
 
   Dim sName         as String
   Dim sValue        as String
@@ -614,7 +614,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tVariables_9
+testcase tVariablesUserfield
 
   Dim sName()    as String
   Dim sValue()   as String
@@ -672,8 +672,8 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tVariables_10
-    qaerrorlog "#i93906# - tVariables_10 outcommented due to a problem with copying field-contents outside the office."
+testcase tVariablesDDEFieldManual
+    qaerrorlog "#i93906# - tVariablesDDEFieldManual outcommented due to a problem with copying field-contents outside the office."
     goto endsub
 
   Dim sDDEFile        as String
@@ -765,8 +765,8 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tVariables_11
-    qaerrorlog "#i102792# - tVariables_11 outcommented. Fields not updated."
+testcase tVariablesDDEFieldAutomatic
+    qaerrorlog "#i102792# - tVariablesDDEFieldAutomatic outcommented. Fields not updated."
     goto endsub
 
   Dim sDDEFile      as String
diff --git a/testautomation/writer/optional/includes/fields/w_fields6.inc b/testautomation/writer/optional/includes/fields/w_fields6.inc
index 2375323e9..1d25c81ac 100755
--- a/testautomation/writer/optional/includes/fields/w_fields6.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields6.inc
@@ -39,25 +39,25 @@
 
 sub w_fields6
 
-    Call tFunctions_1        'Conditional text
-    Call tFunctions_2        'Hidden text
-    Call tFunctions_3        'Hidden paragraph
-    Call tFunctions_4        'Input field
-    Call tFunctions_5        'Placeholder - text
-    Call tFunctions_6        'Placeholder - table
-    Call tFunctions_7        'Placeholder - frame
-    Call tFunctions_8        'Placeholder - graphics
-    Call tFunctions_9        'Placeholder - object
-    Call tFunctions_10       'Input list - Remove
-    Call tFunctions_11       'Input list - Move up
-    Call tFunctions_12       'Input list - Move down
-    Call tFunctions_13       'Combine Character
+    Call tFunctionsConditionalText
+    Call tFunctionsHiddenText
+    Call tFunctionsHiddenParagraph
+    Call tFunctionsInputField
+    Call tFunctionsPlaceholderText
+    Call tFunctionsPlaceholderTable
+    Call tFunctionsPlaceholderFrame
+    Call tFunctionsPlaceholderGraphics
+    Call tFunctionsPlaceholderObject
+    Call tFunctionsInputlistRemove
+    Call tFunctionsInputlistMoveUp
+    Call tFunctionsInputlistMoveDown
+    Call tFunctionsCombineCharacter
 
 end sub
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_1
+testcase tFunctionsConditionalText
 
   Dim sName      as String
   Dim sValue()   as String
@@ -134,7 +134,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_2
+testcase tFunctionsHiddenText
 
   Dim sName       as String
   Dim sValue()    as String
@@ -219,7 +219,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_3
+testcase tFunctionsHiddenParagraph
 
   Dim sName       as String
   Dim sValue()    as String
@@ -307,7 +307,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_4
+testcase tFunctionsInputField
 
   Dim sReference as String
   Dim sFieldContent as String
@@ -350,7 +350,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_5
+testcase tFunctionsPlaceholderText
 
   Dim sPlaceHolder as String
 
@@ -384,7 +384,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_6
+testcase tFunctionsPlaceholderTable
 
     printlog "Placeholder - Table"
     '/// <b> Placeholder - Table </b>
@@ -449,7 +449,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_7
+testcase tFunctionsPlaceholderFrame
 
     printlog "Placeholder - Frame"
     '/// <b> Placeholder - Frame </b>
@@ -515,7 +515,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_8
+testcase tFunctionsPlaceholderGraphics
 
     printlog "Placeholder - Graphics"
     '/// <b> Placeholder - Graphics </b>
@@ -580,7 +580,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_9
+testcase tFunctionsPlaceholderObject
 
     printlog "Placeholder - Object"
     '/// <b> Placeholder - Object </b>
@@ -644,7 +644,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_10
+testcase tFunctionsInputlistRemove
 
   Dim sItem1 as String
   Dim sItem2 as String
@@ -692,7 +692,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_11
+testcase tFunctionsInputlistMoveUp
 
   Dim sItem1 as String
   Dim sItem2 as String
@@ -739,7 +739,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_12
+testcase tFunctionsInputlistMoveDown
 
   Dim sItem1 as String
   Dim sItem2 as String
@@ -787,7 +787,9 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tFunctions_13
+testcase tFunctionsCombineCharacter
+Warnlog "#i102752# - tFunctionsCombineCharacter outcommented due to bug."
+goto endsub
 
 	Dim sCombineCharacter as String
     Dim sTestFile as String
diff --git a/testautomation/writer/optional/includes/fields/w_fields7.inc b/testautomation/writer/optional/includes/fields/w_fields7.inc
index aea6da78d..96e851691 100755
--- a/testautomation/writer/optional/includes/fields/w_fields7.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields7.inc
@@ -39,15 +39,15 @@
 
 sub w_fields7
 
-    Call tL10N_1             'L10N test - above/below
-    Call tL10N_2             'L10N test - date
-    Call tL10N_3             'L10N test - time
+    Call tL10NtestAboveBelow
+    Call tL10NtestDate
+    Call tL10NtestTime
 
 end sub
 
 '-----------------------------------------------------------------
 
-testcase tL10N_1
+testcase tL10NtestAboveBelow
 
     if iSprache <> 1 then
         QaErrorLog "Currently no any other language than English. Aborting."
@@ -181,7 +181,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tL10N_2
+testcase tL10NtestDate
     if iSprache <> 1 then
         QaErrorLog "Currently no any other language than English. Aborting."
         exit sub
@@ -293,7 +293,7 @@ endcase
 
 '-----------------------------------------------------------------
 
-testcase tL10N_3
+testcase tL10NtestTime
     if iSprache <> 1 then
         QaErrorLog "Currently no any other language than English. Aborting."
         exit sub
diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc
index 9c3a7ddfc..fe6704392 100755
--- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc
+++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc
@@ -50,8 +50,6 @@
 '\***********************************************************************
 
 testcase tInsertGraphic_41
-QaErrorLog "#i102477# - tInsertGraphic_41 crashes testtool. Therefore outcommented."
-goto endsub
 
   Dim sLeft as String
   Dim sRight as String
diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
index 6265775e9..ad2c3122d 100644
--- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
+++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
@@ -143,27 +143,33 @@ testcase tExportAllReadableFormatsIntoODF
 			printlog "-  Alien warning passed"
 		end if
 
-		sExportFile = WorkDirectory & "ExportedFile" & i & ".odf"
-		Printlog "-  Save as : " & ConvertPath ( sExportFile )
-		if hFileSaveAsWithFilterKill (sExportFile, "writer8") = true then
-			printlog "-  done"
-			printlog "-  close file"
-			Call hCloseDocument
-
-			Printlog "-  Open previous saved file"
-			Call hFileOpenWithFilter (sExportFile, "writer8")
-			printlog "-  done"
-			' Check for macro alert
-			Kontext "SecurityWarning"
-			if SecurityWarning.Exists then
-				if inStr(ImportFileList(i),"sw40")  = false then
-					QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled"
+		' HTML-File can't be exported as odf this way
+		if GetExtention(ImportFileList(i)) <> "html" then		
+		
+			sExportFile = WorkDirectory & "ExportedFile" & i & ".odf"
+			Printlog "-  Save as : " & ConvertPath ( sExportFile )
+			if hFileSaveAsWithFilterKill (sExportFile, "writer8") = true then
+				printlog "-  done"
+				printlog "-  close file"
+				Call hCloseDocument
+	
+				Printlog "-  Open previous saved file"
+				Call hFileOpenWithFilter (sExportFile, "writer8")
+				printlog "-  done"
+				' Check for macro alert
+				Kontext "SecurityWarning"
+				if SecurityWarning.Exists then
+					if inStr(ImportFileList(i),"sw40")  = false then
+						QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled"
+					end if
+					SecurityWarning.Cancel
 				end if
-				SecurityWarning.Cancel
+				Sleep 1
+			else
+				Warnlog "Unable to save file: " & sExportFile
 			end if
-			Sleep 1
 		else
-			Warnlog "Unable to save file: " & sExportFile
+			printlog "-  HTML-file is not exported this way"
 		end if
 
 		printlog "-  Close all open files."
@@ -214,7 +220,7 @@ testcase tExportAllReadableFormatsIntoThemselves
     end if
     app.Mkdir sWorkDirectory
 
-warnlog "#i102221# - Pocketword-filter seems broken."
+	QAErrorlog "#i102221#Pocketword-filter seems broken."
 
     For iCurrentFileIndex = 1 to 16
         select case iCurrentFileIndex
diff --git a/testautomation/writer/optional/includes/option/wh_o_1.inc b/testautomation/writer/optional/includes/option/wh_o_1.inc
index 13e637314..c27598c28 100755
--- a/testautomation/writer/optional/includes/option/wh_o_1.inc
+++ b/testautomation/writer/optional/includes/option/wh_o_1.inc
@@ -558,6 +558,8 @@ testcase tToolsOptionsHTMLGrid
     
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.Cancel
+	
+	sleep (2)
     
     '-------------------------------------------------------------------------------
     printlog ("'/// Function Test: Grid Resolution ///'")
diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc
index c63167c6c..998aab117 100755
--- a/testautomation/writer/optional/includes/option/wh_o_2.inc
+++ b/testautomation/writer/optional/includes/option/wh_o_2.inc
@@ -130,6 +130,7 @@ testcase tToolsOptionsHTMLPrint
 
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
+	sleep (2)
     Call hFileSaveAsKill(gOfficepath + "user\work\printtest.html")
     Call hCloseDocument
 
diff --git a/testautomation/writer/optional/includes/redlining/w_redlining1.inc b/testautomation/writer/optional/includes/redlining/w_redlining1.inc
index 5fd20677b..8cdbbeddf 100755
--- a/testautomation/writer/optional/includes/redlining/w_redlining1.inc
+++ b/testautomation/writer/optional/includes/redlining/w_redlining1.inc
@@ -523,9 +523,6 @@ endcase
 
 testcase tRedlining_8
 
-    warnlog "#i102093# - Crash with Edit-Change-Record."
-    goto endsub
-
   '/// Test searched and replaced text
   printlog "searched and replaced text"
 
diff --git a/testautomation/writer/optional/includes/stylist/w_stylist.inc b/testautomation/writer/optional/includes/stylist/w_stylist.inc
index 47c0beec8..a3a2e4147 100755
--- a/testautomation/writer/optional/includes/stylist/w_stylist.inc
+++ b/testautomation/writer/optional/includes/stylist/w_stylist.inc
@@ -1,1019 +1,1022 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
-'* Copyright 2008 by Sun Microsystems, Inc.
-'*
-'* OpenOffice.org - a multi-platform office productivity suite
-'*
-'* $RCSfile: w_stylist.inc,v $
-'*
-'* $Revision: 1.2 $
-'*
-'* last change: $Author: vg $ $Date: 2008-08-18 12:36:39 $
-'*
-'* This file is part of OpenOffice.org.
-'*
-'* OpenOffice.org is free software: you can redistribute it and/or modify
-'* it under the terms of the GNU Lesser General Public License version 3
-'* only, as published by the Free Software Foundation.
-'*
-'* OpenOffice.org is distributed in the hope that it will be useful,
-'* but WITHOUT ANY WARRANTY; without even the implied warranty of
-'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'* GNU Lesser General Public License version 3 for more details
-'* (a copy is included in the LICENSE file that accompanied this code).
-'*
-'* You should have received a copy of the GNU Lesser General Public License
-'* version 3 along with OpenOffice.org.  If not, see
-'* <http://www.openoffice.org/license.html>
-'* for a copy of the LGPLv3 License.
-'*
-'/************************************************************************
-'*
-'* owner : helge.delfs@sun.com
-'*
-'* short description : Test common stylist functions and assigning styles
-'*
-'************************************************************************
-'*
-' #1 tFormatStylist1
-' #1 tFormatStylist2
-' #1 tFormatStylist3
-' #1 tFormatStylist4
-' #1 tFormatStylist5
-' #1 tFormatStylist6
-' #1 tFormatStylist7
-' #1 tAssigningStyles1
-' #1 tAssigningStyles2
-' #1 tAssigningStyles3
-' #1 tAssigningStyles4
-' #1 tAssigningStyles5
-' #1 tAssigningStyles6
-' #1 tAssigningStyles7
-' #1 tKeyboardShortcutToStyles
-'*
-'\***********************************************************************
-
-sub w_stylist
-   printLog Chr(13) + "---------   Level 1 - Format / Stylist   ----------"
-
-   Call tFormatStylist1                ' all methods on stylist
-   Call tFormatStylist2                ' interacting between documents
-   Call tFormatStylist3                ' show all templates
-   Call tFormatStylist4                ' search/create templates
-   Call tFormatStylist5                ' select templet in stylist
-   Call tFormatStylist6                ' new template from selection
-   Call tFormatStylist7                ' new template from selection, modified via ContextMenu.
-   Call tAssigningStyles1
-   Call tAssigningStyles2
-   Call tAssigningStyles3
-   Call tAssigningStyles4
-   Call tAssigningStyles5
-   Call tAssigningStyles6
-   Call tAssigningStyles7
-   Call tKeyboardShortcutToStyles
-
-end sub
-
-' **********************************************************************
-
-testcase tFormatStylist1
-    Dim xPos as long
-    Dim yPos as long
-    Dim xSize%
-    Dim ySize%
-
-	printlog "- Format / Stylist : all methods with Navigator as window"
-	printlog "New writerdocument"
-	Call hNewDocument
-	printlog "  - Call Stylist with F11"
-	printlog "Call stylist with <F11> aand proof all windowmethods at stylist"
-	Call wTypeKeys "<F11>"
-	Kontext "Stylist"
-	if Stylist.NotExists then
-      	Warnlog "No Stylist with <F11>"
-		FormatStylist
-	end if
-	xPos = Stylist.GetPosX
-	yPos = Stylist.GetPosY
-	xSize% = Stylist.GetSizeX
-	ySize% = Stylist.GetSizeY
-
-	printlog "  - move Stylist"
-	Stylist.Move 10, 10
-	Sleep 1
-	Stylist.Move 300, 400
-	Sleep 1
-	Stylist.Move 590, 790
-	Sleep 1
-	Stylist.Move xPos, yPos
-	Sleep 1
-
-	printlog "  - size Stylist"
-	try
-		Stylist.Size 300, 400
-	catch
-		Warnlog "Sizen Stylist doesn't work.. see #i32449"
-	endcatch	
-	Sleep 1
-	try
-		Stylist.Size xSize%, ySize%
-	catch
-		Warnlog "Sizen Stylist doesn't work.. see #i32449"
-	endcatch
-	Sleep 1
-
-	printlog "  - close Stylist and reopen ( has to be the same size )"
-	xPos = Stylist.GetPosX
-	yPos = Stylist.GetPosY
-	xSize% = Stylist.GetSizeX
-	ySize% = Stylist.GetSizeY
-	FormatStylist
-	Sleep 1
-	FormatStylist
-	if xPos <> Stylist.GetPosX then Warnlog "x-Pos. has been changed : Not -> "+ xPos + "  but -> "+ Stylist.GetPosX
-	if yPos <> Stylist.GetPosY then Warnlog "y-Pos. has been changed : Not -> "+ yPos + "  but -> "+ Stylist.GetPosY
-	if xSize% <> Stylist.GetSizeX then Warnlog "x-Size has been changed : Not -> "+ xSize% + "  but -> "+ Stylist.GetSizeX
-	if ySize% <> Stylist.GetSizeY then Warnlog "y-Size has been changed : Not -> "+ ySize% + "  but -> "+ Stylist.GetSizeY
-
-	printlog "  - dock Stylist"
-	Stylist.Dock
-	Sleep 1
-	if NOT Stylist.IsDocked then Warnlog "Stylist has not been docked in"
-	Stylist.Undock
-	Sleep 1
-
-	Stylist.Close
-	printlog "Close document"
-	Call hCloseDocument
-
-endcase
-
-' **********************************************************************
-
-testcase tFormatStylist2
-    Dim xPos%
-    Dim yPos%
-    Dim xSize%
-    Dim ySize%
-
-	printlog "- Format/Stylist : Methods from Stylist as Window between more than one document"
-	printlog " New document"
-	Call hNewDocument
-	printlog "check all methods of Stylist as Window between more than one document"
-	Call wTypeKeys "Test the stylist functions"
-	printlog "  - Call Stylist in first document and check in a second document"
-	Sleep 2
-	Kontext "Stylist"
-	If Not Stylist.Exists then FormatStylist
-	Sleep 2
-	Call hNewDocument
-	Call wTypeKeys "Test the stylist functions"
-	Sleep 2
-	Kontext "Stylist"
-	if Stylist.NotExists then Warnlog "No Stylist in new document"
-
-	printlog "  - Close all documents and reopen"
-	Sleep 2
-	Call hCloseDocument
-	Sleep 2
-	Call hCloseDocument
-	Sleep 2
-	Call hNewDocument
-	Sleep 2
-	Call wTypeKeys "Test the stylist functions"
-	Kontext "Stylist"
-	if Stylist.NotExists then Warnlog "No Stylist in a new document"
-
-	printlog "  - Dock Stylist in first document and check in a new if docked"
-	Sleep 2
-	Stylist.Dock
-	Sleep 1
-	Call hNewDocument
-	Call wTypeKeys "Test the stylist functions"
-	Kontext "Stylist"
-	if NOT Stylist.IsDocked then Warnlog "Stylist is not docked in new document"
-	
-	printlog "  - Close all documents, reopen one and check docked Stylist"
-	Call hCloseDocument
-	Sleep 2
-	Call hCloseDocument
-	Sleep 2
-	Call hNewDocument
-	Kontext "Stylist"
-	if NOT Stylist.IsDocked then Warnlog "Stylist is not docked in new document"
-	
-	printlog "  - Close Stylist with <F11>"
-	Stylist.Undock
-	Sleep 1
-	Call wTypeKeys "<F11>"
-	Kontext "Stylist"
-	if NOT Stylist.NotExists then
-		Warnlog "Stylist is still open"
-		Stylist.Close
-	end if
-	printlog "Close document"
-	Call hCloseDocument
-	
-endcase
-
-' **********************************************************************
-
-testcase tFormatStylist3
-    Dim i as Integer
-    Dim AllStyles as integer
-    Dim j as integer
-    Dim RemString as string
-    printlog "- Format / Stylist : select all Style properties"
-
-    Call hNewDocument
-    printlog " New writerdocument"
-    FormatStylist
-    printlog "Select all style properties in stylist"
-    Kontext "Stylist"
-    if Stylist.NotExists then FormatStylist
-    printlog "   - Paragraph Styles"
-    Absatzvorlagen.Click
-
-    for i=1 to Gruppenliste.GetItemCount
-        Gruppenliste.Select i
-        wait 500
-        if i = 2 then  ' All Styles
-            Vorlagenliste.TypeKeys "<Home>"
-            AllStyles = 1
-            For j = 1 to 200
-                RemString = Vorlagenliste.Gettext
-                'Include this, if you want to see the styles in writerdocument
-                'SetClipboard Vorlagenliste.Gettext
-                'Kontext "DocumentWriter"
-                'DocumentWriter.TypeKeys GetClipboardtext + "<Return>"
-                'Kontext "Stylist"
-                Vorlagenliste.TypeKeys "<Down>"
-                if Vorlagenliste.Gettext <> RemString then
-                    AllStyles = AllStyles + 1
-                else
-                    j = 202
-                    if AllStyles <> "122" then
-                        Select Case iSprache
-                            Case 07
-                                warnlog "Double styles in stylist"
-                            Case 55
-                                warnlog "Missing Style in Stylist"
-                            Case 31
-                                warnlog "Missing Style in Stylist"
-                            Case else
-                                Warnlog "There are " + AllStyles + " styles in this category and not 122!"
-                        end select
-                    else
-                        printlog "There are " + AllStyles + " styles in this category!"
-                    end if
-                end if
-            next j
-        end if
-        Sleep 1
-    next i
-
-    Zeichenvorlagen.Click
-    Sleep 2
-    printlog "   - Chapter Styles"
-    for i=1 to Gruppenliste.GetItemCount
-        Gruppenliste.Select i
-        AllStyles = AllStyles + 1
-        Sleep 1
-    next i
-
-    Rahmenvorlagen.Click
-    Sleep 2
-    printlog "   - Frame Styles"
-    for i=1 to Gruppenliste.GetItemCount
-        Gruppenliste.Select i
-        AllStyles = AllStyles + 1
-        Sleep 1
-    next i
-
-    Seitenvorlagen.Click
-    Sleep 2
-    printlog "   - Page Styles"
-    for i=1 to Gruppenliste.GetItemCount
-        Gruppenliste.Select i
-        AllStyles = AllStyles + 1
-        Sleep 1
-    next i
-    Stylist.Close
-	printlog "Close document"
-    Call hCloseDocument
-endcase
-
-' **********************************************************************
-
-testcase tFormatStylist4
-    Dim i as Integer
-    Dim AlterWert$
-    Dim NeuerWert$
-
-    printlog "- Format / Stylist : check created Styles"
-	printlog "New writerdocument"
-	Call hNewDocument
-	printlog "   - create Paragraph Style in Stylist"
-	Call wStyleCreate ( "ATesttool", "Paragraph", true )
-	Kontext "Stylist"
-	printlog "Check if Style has been added in stylist"
-    if wStyleSelect ( "ATesttool", "Paragraph" ) = false then Warnlog "Paragraph Style has not been found"
-
-	printlog "   - Create Character Style in Stylist"
-	Call wStyleCreate ( "BTesttool", "Character", true )
-	if wStyleSelect ( "BTesttool", "Character" ) = false then Warnlog "Character Style has not been found!"
-	printlog "   - Create Frame Style in Stylist"
-    Call wStyleCreate ( "CTesttool", "Frame", true )
-    if wStyleSelect ( "CTesttool", "Frame" ) = false then Warnlog "Frame Style has not been found!"
-
-	printlog "   - Create Page Style in Stylist"
-	Call wStyleCreate ( "DTesttool", "Page", true )
-	if wStyleSelect ( "DTesttool", "Page" ) = false then Warnlog "Page Style has not been found"
-
-	printlog "   - creating Styles should not have been affecting to new documents"
-    ' To avoid focus problems on unix first close stylist
-   	Kontext "Stylist"
-    if Stylist.Exists then FormatStylist   
-	Call hNewDocument
-   	Kontext "Stylist"
-    if Not Stylist.Exists then FormatStylist
-
-    if wStyleSelect ( "ATesttool", "Paragraph" ) = true then Warnlog "Paragraph Style has been found in new document"
-    if wStyleSelect ( "BTesttool", "Character" ) = true then Warnlog "Character Style has been found in new document"
-    'if wStyleSelect ( "CTesttool", "Frame" ) = true then Warnlog "Frame Style has been found in new document"
-    if wStyleSelect ( "DTesttool", "Page" ) = true then Warnlog "Page Style has been found in new document"
-
-    Call hCloseDocument
-    printlog "Close document"
-    Call hCloseDocument
-endcase
-
-' **********************************************************************
-
-testcase tFormatStylist5
-    Dim SuchMal as string, i as integer
-    Dim bStyleFound as boolean
-
-    printlog "- Format / Stylist : select Style"
-	printlog "New writerdocument"
-	if bAsianLan = True then
-    	printlog "- Not in Asian languages!"
-		goto endsub
-	end if
-	Call hNewDocument
-	Call wTypeKeys "Dies ist ein formatierter Text <Shift Home>"
-	printlog "  - format Text"
-	FormatCharacter
-	Kontext
-	Active.SetPage TabFontEffects
-	Kontext "TabFontEffects"
-	StrikeThrough.Select 2
-  	Outline.Check
-	TabFontEffects.OK
-
-	printlog "  - adjust to Standard-Format through the Stylist"
-	printlog "adjust to Standard-Format through the Stylist"
-	FormatStylist
-	Kontext "Stylist"
-	if Stylist.NotExists then FormatStylist
-  	'Get name for 'default' template
-	Kontext "TextObjectbar"
-	SuchMal = Vorlage.GetSelText
-	printlog "Using " & SuchMal & " as 'default'" 
-	Kontext "Stylist"
-   
-    Vorlagenliste.TypeKeys "<Home>"
-    bStyleFound = false
-    for i=1 to Vorlagenliste.GetItemCount
-        Vorlagenliste.Select i
-        if Vorlagenliste.GetText = Suchmal then
-            Vorlagenliste.TypeKeys "<Return>"
-            bStyleFound = true
-            exit for
-        end if
-    next i
-    Stylist.Close
-    
-    if bStyleFound = false then
-        Warnlog "Style: " & Suchmal & " has not been found in Stylist"
-        Call hCloseDocument
-        goto endsub
-    end if   	
-
-	printlog "  - check format"
-	FormatCharacter
-	Kontext
-	Active.SetPage TabFontEffects
-	Kontext "TabFontEffects"
-	if StrikeThrough.GetSelIndex = 2 then Warnlog "Wrong entry selected in StrikeThrough"
-	if Outline.IsChecked then Warnlog "Format Outline is still checked"
-	TabFontEffects.OK
-
-	printlog "Close document"
-	Call hCloseDocument
-endcase
-
-' **********************************************************************
-
-testcase tFormatStylist6
-    Dim i as integer
-
-    printlog "- Format / Stylist : new Style from selection"
-    printlog "New writerdocument"
-    Call hNewDocument
-    Call wTypeKeys "Creating a style from selection <Return><Up><Shift End>"
-    printlog "create a new style from selection"
-    FormatCharacter
-        Kontext
-        Active.SetPage TabFontEffects
-        Kontext "TabFontEffects"
-            Shadow.Check
-            StrikeThrough.Select 2
-            Overline.Select 2
-            OverlineColor.Select 6
-            Outline.Check
-            Effects.Select 3
-            Blinking.Check
-        Kontext
-        Active.Setpage TabHyperlinkZeichen
-        Kontext "TabHyperlinkZeichen"
-            URLName.SetText "www.mikeportnoy.com"
-    TabHyperlinkZeichen.OK
-
-    printlog "  - Create Character Style from selection"
-    Kontext "Stylist"
-    if not Stylist.Exists then FormatStylist
-        Kontext "Stylist"
-        TBGestalter.Click ZeichenVorlagen
-        Sleep 1
-
-    AusSelektion.OpenMenu
-    Sleep 1
-    hMenuSelectNr(1)
-    Sleep 1
-
-    Kontext "VorlageErzeugen"
-    if VorlageErzeugen.Exists then
-        VorlagenName.SetText "Testtool"
-        VorlageErzeugen.OK
-    else
-        Warnlog "Creating Style did not work. Dialog not up!"
-    end if
-
-    printlog "   - assign new Character Style to a new text"
-    wTypeKeys "<Home><Down>",3
-    wTypeKeys "This is some new text <Return><Up><Up><Shift End>"
-    Kontext "Stylist"
-        TBGestalter.Click ZeichenVorlagen
-        if Vorlagenliste.GetSeltext <> "Testtool" then  'Go find the entry.
-            Vorlagenliste.TypeKeys "<Home>"
-	    For i = 1 to 100
-                Vorlagenliste.TypeKeys "<Down>"
-                if Vorlagenliste.GetSeltext = "Testtool" then  'Found it!
-                    i = 102
-                end if
-            next i
-        end if
-        Vorlagenliste.TypeKeys "<Return>"  'Assign to text.
-    Stylist.Close
-    if i = 101 then
-        Warnlog "Created Style could not be found in Stylist!"
-    else
-        Printlog "   - check Style"
-        FormatCharacter
-        Kontext
-        Active.SetPage TabFontEffects
-        Kontext "TabFontEffects"
-            if NOT Shadow.IsChecked then Warnlog "Shadow is not checked anymore"
-            if StrikeThrough.GetSelIndex <> 2 then Warnlog "Wrong entry selection in StrikeThrough"
-            if Overline.GetSelIndex <> 2 then Warnlog "Overline is not checked anymore"
-	    if OverlineColor.GetSelIndex <> 6 then Warnlog "Wrong Overline Color selected"
-            if NOT Outline.IsChecked then Warnlog "Outline is not checked anymore"
-            if Effects.GetSelIndex <> 3 then Warnlog "Wrong effect selected"
-            if NOT Blinking.IsChecked then Warnlog "Blinking is not checked anymore"
-        Kontext
-        Active.Setpage TabHyperlinkZeichen
-        Kontext "TabHyperlinkZeichen"
-            if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#TabHyperlink: URL is wrong " + URLName.Gettext
-        TabHyperlinkZeichen.OK
-    end if
-
-    printlog "Close document"
-    Call hCloseDocument
-endcase
-
-' **********************************************************************
-
-testcase tFormatStylist7
-    Dim i as integer
-
-    printlog "- Format / Stylist : new Style from selection, then modified via the ContextMenu."
-    printlog "New writerdocument"
-    Call hNewDocument
-    Call wTypeKeys "Creating a style from selection <Return><Up><Shift End>"
-    printlog "create a new style from selection"
-
-    printlog "  - Create Character Style from selection"
-    Kontext "Stylist"
-    if not Stylist.Exists then FormatStylist
-        Kontext "Stylist"
-        TBGestalter.Click ZeichenVorlagen
-        Sleep 1
-
-    AusSelektion.OpenMenu
-    Sleep 1
-    hMenuSelectNr(1)
-    Sleep 1
-
-    Kontext "VorlageErzeugen"
-    if VorlageErzeugen.Exists then
-        VorlagenName.SetText "Testtool"
-        VorlageErzeugen.OK
-    else
-        Warnlog "Creating Style did not work. Dialog not up!"
-    end if
-
-    printlog " Open ContextMenu over the 'Testtool' Style."
-    Kontext "Stylist"
-    if not Stylist.Exists then FormatStylist
-    Kontext "Stylist"
-        TBGestalter.Click ZeichenVorlagen
-        if Vorlagenliste.GetSeltext <> "Testtool" then
-            Vorlagenliste.TypeKeys "<Home>"
-            For i = 1 to 100
-                Vorlagenliste.TypeKeys "<Down>"
-                if Vorlagenliste.GetSeltext = "Testtool" then
-                    i = 102
-                end if
-            next i
-	    if i = 101 then
-	       warnlog "No Testtool -Stylist found. Check if new stylists can be created. Test ends."
-	       goto endsub
-	    end if
-        end if
-        Vorlagenliste.TypeKeys "<SHIFT F10>"  'Open ContextMenu
-        Sleep 1
-        printlog "  Select 'Modify'"
-        Call hMenuSelectNr(2)  'Modify
-        Sleep 1
-
-    printlog "  Goto Tabpage 'Font Effects' and change some settings."
-    Kontext
-    Active.SetPage TabFontEffects
-    Kontext "TabFontEffects"
-        Shadow.Check
-        StrikeThrough.Select 2
-        Overline.Select 2
-        OverlineColor.Select 6
-        Outline.Check
-        Effects.Select 3
-        Blinking.Check
-    TabFontEffects.OK
-
-    printlog "   - assign new Character Style to a new text"
-    wTypeKeys "<Home><Down>",3
-    wTypeKeys "This is some new text <Return><Up><Up><Shift End>"
-    Kontext "Stylist"
-        TBGestalter.Click ZeichenVorlagen
-        
-        if Vorlagenliste.GetSeltext <> "Testtool" then
-	    Vorlagenliste.TypeKeys "<Home>"
-            For i = 1 to 100
-                Vorlagenliste.TypeKeys "<Down>"
-                if Vorlagenliste.GetSeltext = "Testtool" then 'Found it!
-                    i = 102
-                end if
-            next i
-        end if
-        Vorlagenliste.TypeKeys "<Return>"  'Assign Style to Text.
-    Stylist.Close
-    if i = 101 then
-        Warnlog "Created Style could not be found in Stylist!"
-    else
-        Printlog "   - check Style"
-        FormatCharacter
-        Kontext
-        Active.SetPage TabFontEffects
-        Kontext "TabFontEffects"
-            if NOT Shadow.IsChecked then Warnlog "Shadow is not checked anymore"
-            if StrikeThrough.GetSelIndex <> 2 then Warnlog "Wrong entry selection in StrikeThrough"
-            if Overline.GetSelIndex <> 2 then Warnlog "Overline is not checked anymore"
-            if OverlineColor.GetSelIndex <> 6 then Warnlog "Wrong Overline Color selected"
-            if NOT Outline.IsChecked then Warnlog "Outline is not checked anymore"
-            if Effects.GetSelIndex <> 3 then Warnlog "Wrong effect selected"
-            if NOT Blinking.IsChecked then Warnlog "Blinking is not checked anymore"
-        TabFontEffects.OK
-    end if
-
-    printlog "Close document"
-    Call hCloseDocument
-endcase
-
-' **********************************************************************
-
-testcase tAssigningStyles1
-    Dim i as integer
-    Dim sStyles() as string
-    Dim sTemp as string
-    Dim j as integer
-    Dim bStyleInList as boolean
-
-	printlog "UI and Strings check"
-    Call hNewDocument
-	printlog "Open a new writerdocument"
-	printlog "Check if the following strings and only those strings are present:"
-	printlog "Clear formatting"
-	printlog "Heading 1"
-	printlog "Heading 2"
-	printlog "Heading 3"
-	printlog "Default"
-	printlog "Text body"
-	printlog "More..."
-    Select Case iSprache
-        Case 01 : sStyles = Array("Clear formatting", "Default", "Heading 1", "Heading 2", "Heading 3", "Text body", "More...")
-        Case 07 : sStyles = Array("Отменить форматирование", "Базовый", "Заголовок 1", "Заголовок 2", "Заголовок 3", "Основной текст", "Дополнительно...")
-        Case 31 : sStyles = Array("Opmaak wissen", "Kop 1", "Kop 2", "Kop 3", "Standaard", "Tekstblok", "Meer...")
-        Case 33 : sStyles = Array("Effacer le formatage", "Corps de texte", "Par défaut", "Titre 1", "Titre 2", "Titre 3", "Autres...")
-        Case 34 : sStyles = Array("Borrar formato", "Cuerpo de texto", "Encabezado 1", "Encabezado 2", "Encabezado 3", "Predeterminado", "Más...")
-        Case 36 : sStyles = Array("Formázás törlése", "Alapértelmezett", "Címsor 1", "Címsor 2", "Címsor 3", "Szövegtörzs", "További...")
-        Case 39 : sStyles = Array("Cancella formattazione", "Corpo testo", "Intestazione 1", "Intestazione 2", "Intestazione 3", "Standard", "Extra...")
-        Case 46 : sStyles = Array("Radera formatering", "Brödtext", "Överskrift 1", "Överskrift 2", "Överskrift 3", "Standard", "Mer...")
-        Case 48 : sStyles = Array("Wyczyść formatowanie", "Domyślnie", "Nagłówek 1", "Nagłówek 2", "Nagłówek 3", "Treść tekstu", "Więcej...")
-        Case 49 : sStyles = Array("Formatierung löschen", "Standard", "Textkörper", "Überschrift 1", "Überschrift 2", "Überschrift 3", "Weitere...")
-        Case 55 : sStyles = Array("Limpar formatação", "Corpo do texto", "Padrão", "Título 1", "Título 2", "Título 3", "Mais...")
-        Case 81 : sStyles = Array("書式設定の解除", "本文", "標準", "見出し 1", "見出し 2", "見出し 3", "詳細...")
-        Case 82 : sStyles = Array("서식 지우기", "기본값", "제목 1", "제목 2", "제목 3", "텍스트 본문", "자세히...")
-        Case 86 : sStyles = Array("清除格式", "标准", "标题 1", "标题 2", "标题 3", "正文", "更多(~M)...")
-        Case 88 : sStyles = Array("清除格式", "內文", "標準", "標題 1", "標題 2", "標題 3", "更多...")
-        Case 90 : sStyles = Array("Biçimlendirmeyi temizle", "Başlık 1", "Başlık 2", "Başlık 3", "Metin gövdesi", "Varsayılan", "Diğer...")
-        Case else : Warnlog "Current language not supported. Please add styles to list!"
-                    Kontext "Textobjectbar"
-                    printlog "- Current Styles: "
-                    For i = 1 to Vorlage.GetItemCount
-                        Vorlage.Select i
-                        printlog Vorlage.GetSelText
-                    next i
-                    Call hCloseDocument
-                    exit sub
-    end select
-
-    'Check number of entrys....have to be seven
-    Kontext "Textobjectbar"
-    if Vorlage.GetItemCount <> 7 then
-        Select case iSprache
-            case 82     : warnlog "Korean: Number of styles in styleslistbox wrong"
-            case else   : Warnlog "Not 7 entrys in Styles & Formatting combobox but: " & Vorlage.GetItemCount
-        end select
-    end if
-
-    For i = 1 to Vorlage.GetItemCount
-        Vorlage.Select i
-        sTemp = Vorlage.GetSelText
-        printlog "- check style: " & sTemp
-        bStyleInList = false
-        For j = 0 to 6
-            if sStyles(j) = sTemp then
-                bStyleInList = true
-            end if
-        next j
-        
-        if bStyleInList = true then
-            printlog "-  style " & sTemp & " found in list"
-        else
-            if iSprache <> 82 then Warnlog "-  style " & sTemp & " wasn't found in list!"
-        end if
-    next i
-
-    Call hCloseDocument
-endcase
-
-' **********************************************************************
-
-testcase tAssigningStyles2
-    Dim i as integer
-    Dim sTemp as string
-
-    printlog "- Apply Style"
-	printlog "New writerdocument"
-    Call hNewDocument
-	printlog "Insert dummytext"
-    if wBlindtextEinfuegen = false then
-        Call hCloseDocument
-        exit sub
-    end if
-    
-	printlog "Select whole dummytext"
-    Call wTypeKeys "<Mod1 A>"
-	printlog "Apply style 'Heading 1' through Styles & Formatting combobox"
-    Kontext "Textobjectbar"
-    for i = 1 to Vorlage.GetItemCount
-        Vorlage.Select i
-        sTemp = Vorlage.GetSelText
-        if Instr(sTemp, "1") then
-            Vorlage.TypeKeys "<Return>"            
-            exit for
-        end if
-    next i
-
-	printlog "Check if style has been applied to paragraph"
-    Call wTypeKeys "<Mod1 Home><End>"
-    Call wTypeKeys "<Left>", 2
-    
-    Kontext "Textobjectbar"
-    if Vorlage.GetSeltext <> sTemp then
-        Warnlog "Seems style has not been completely applied to paragraph!"
-    end if
-
-    Call hCloseDocument
-endcase
-
-' **********************************************************************
-
-testcase tAssigningStyles3
-
-    printlog "- Create a new style"
-    printlog "Open a new writerdocument"
-    Call hNewDocument
-    printlog "Insert a dummy text"
-    if wBlindtextEinfuegen = false then
-        Call hCloseDocument
-        exit sub
-    end if
-    
-    printlog "Select the whole dummy text"
-    Call wTypeKeys "<Mod1 A>"
-    printlog "Format / Character" 
-    FormatCharacter
-	Kontext
-	Active.Setpage TabFont
-	Kontext "TabFont" 
-    printlog "Apply first font in list and select 2nd Typeface"
-	if gAsianSup = True then
-		FontWest.Select 1
-        StyleWest.Select 2
-	else
-		Font.Select 1
-        Style.Select 1
-	end if
-    TabFont.Ok
-    
-    printlog "Enter 'MyStyle' in Stylelistbox"
-    Kontext "Textobjectbar"
-    Vorlage.TypeKeys "<Mod1 A>"
-    Vorlage.TypeKeys "MyStyle<Return>"
-    
-    printlog "Check if style has been applied to the combobox"
-    Call wTypeKeys "<Mod1 End>"
-    
-    wait 500
-    Kontext "Textobjectbar"
-    try
-        Vorlage.Select "MyStyle"
-    catch
-        Warnlog "Seems style has not been applied to combobox"
-    endcatch
-        
-    printlog "Check if style has been applied to paragraph"
-    Call wTypeKeys "<Mod1 Home>"
-    Call wTypeKeys "<Right>", 2
-    
-    Kontext "Textobjectbar"
-    if Vorlage.GetSelText <> "MyStyle" then
-        Warnlog "Seems style has not been applied to paragraph"
-    end if
-
-    printlog "Close Document"
-    Call hCloseDocument
-endcase
-
-' **********************************************************************
-
-testcase tAssigningStyles4
-    Dim i as integer
-    Dim sTemp as string
-    
-    printlog "- Clear formatting: whole paragraph"
-    printlog "Open a new writer document"
-    Call hNewDocument
-    printlog "Insert a dummytext"
-    if wBlindtextEinfuegen = false then
-        Call hCloseDocument
-        exit sub
-    end if
-    
-    printlog "Select whole dummytext"
-    Call wTypeKeys "<Mod1 A>"
-    printlog "Apply style 'Heading 1' through Styles & Formatting combobox"
-    Kontext "Textobjectbar"
-    for i = 1 to Vorlage.GetItemCount
-        Vorlage.Select i
-        sTemp = Vorlage.GetSelText
-        if Instr(sTemp, "1") then
-            Vorlage.TypeKeys "<Return>"
-            exit for
-        end if
-    next i
-
-    printlog "choose 'Clear formatting' in combobox" 
-    Kontext "Textobjectbar"
-    Vorlage.Select 1
-    Vorlage.TypeKeys "<Return>"
-    wait 500
-    printlog "Check if style has been set to default"
-    Call wTypeKeys "<Mod1 Home>"
-    Call wTypeKeys "<Right>", 3
-
-    wait 500    
-    Kontext "Textobjectbar"
-    if Vorlage.GetSelIndex <> 2 then
-        warnlog "Seems paragraph has not been set to default! " & Vorlage.GetSelText & "(" & Vorlage.GetSelIndex & ")" 
-    end if
-
-    printlog "Close Document"
-    Call hCloseDocument 
-
-endcase
-
-' **********************************************************************
-
-testcase tAssigningStyles5
-
-    printlog "- Clear formatting: whole paragraph with hard formatting of some characters"
-	printlog " - 1. Cursor outside of hard formatted string"
-    printlog "Open a new writer document"
-    Call hNewDocument
-    printlog "Insert a dummytext"
-    if wBlindtextEinfuegen = false then
-        Call hCloseDocument
-        exit sub
-    end if
-
-    printlog "Highlight first line in dummy text"
-	Call wTypeKeys "<Mod1 Home>"
-	Call wTypeKeys "<Shift End>" 
-	
-    printlog "Format / Bold"
-	Kontext "TextObjectbar"
-    if Not TextObjectbar.Exists then Call hToolbarSelect ( "FORMATTING", true )
-	Fett.Click
-	Wait 500
-
-    printlog "Set cursor outside of bold formatted text"
-	Call wTypeKeys "<Mod1 Home>"
-	Call wTypeKeys "<Down><Right>"
-	
-    printlog "Select 'Clear Formatting' in Style-Listbox"
-	Kontext "Textobjectbar"
-    Vorlage.Select 1
-    Vorlage.TypeKeys "<Return>"
-    wait 500
-
-    printlog "Check that first line is still bold and has not been reset"
-	Call wTypeKeys "<Mod1 Home>"
-	Call wTypeKeys "<Right>"
-
-    Kontext "TextObjectbar"
-    if Fett.Getstate(2) = 0 then
-        Warnlog "Style 'Bold' has been reset!"
-    end if
-
-    printlog "Close document"
-	Call hCloseDocument
-endcase
-
-' **********************************************************************
-
-testcase tAssigningStyles6
-
-    Dim iStandard as integer
-
-    printlog "- Clear formatting: whole paragraph with hard formatting of some characters"
-	printlog " - 2. Cursor inside of hard formatted string"  
-    printlog "Open a new writer document"
-    Call hNewDocument
-    printlog "Insert a dummytext"
-    if wBlindtextEinfuegen = false then
-        Call hCloseDocument
-        exit sub
-    end if
-
-    printlog "Highlight first line in dummy text"
-	Call wTypeKeys "<Mod1 Home>"
-	Call wTypeKeys "<Shift End>" 
-	
-    printlog "Format / Bold"
-	Kontext "TextObjectbar"
-    if Not TextObjectbar.Exists then Call hToolbarSelect ( "FORMATTING", true )
-	Fett.Click
-	Wait 500
-
-    printlog "Point cursor to first highlighted word of bold formatted text"
-	Call wTypeKeys "<Mod1 Home>"	
-	Call wTypeKeys "<Right>"
-	
-    printlog "Select 'Format / Default Formatting' in Style-Listbox"
-	FormatDefaultWriter
-    wait 500
-
-    printlog "first highlighted word should be set to 'Standard'"
-	Call wTypeKeys "<Mod1 Home>"
-	Call wTypeKeys "<Right>"
-    Kontext "TextObjectbar"
-    if Fett.Getstate(2) = 1 then
-        Warnlog "Style 'Bold' has not been reset!"
-    end if
-	
-    printlog "Check that rest of first line is still bold and has not been reset"
-	Call wTypeKeys "<Mod1 Home>"
-	Call wTypeKeys "<End><Left>"
-
-    Kontext "TextObjectbar"
-    if Fett.Getstate(2) = 1 then
-        Warnlog "Style 'Bold' has not been reset!"
-    end if
-
-    printlog "Close document"
-	Call hCloseDocument
-endcase
-
-' **********************************************************************
-
-testcase tAssigningStyles7
-
-    printlog "More ..."  
-    printlog "Open a new writer document"
-    Call hNewDocument
-	
-    printlog "Select 'More...' in Style-Listbox"
-	Kontext "Textobjectbar"
-    Vorlage.Select Vorlage.GetItemCount
-    Vorlage.TypeKeys "<Return>"
-    wait 500
-
-    printlog "The Stylist should have been opened"
-	Kontext "Stylist"
-	if Not Stylist.Exists then
-		Warnlog "'Styles and Formatting' doesn't open if 'More...' is selected in Style-Listbox"
-	else
-        printlog "In Style group listbox 'Automatic' should be selected"
-		if Gruppenliste.GetSelIndex <> 5 then
-			Warnlog "Seems 'Automatic' is not selected per default in 'Styles and Formatting'"
-		end if
-		Stylist.Close
-	end if
-
-    printlog "Close document"
-	Call hCloseDocument
-endcase
-
-' **********************************************************************
-
-testcase tKeyboardShortcutToStyles()
-    dim sTempa as string
-    dim sTempb as string
-    dim sTempc as string
-    dim i as integer
-    dim x as integer
-
-    printlog "open new application document"
-    call hNewDocument()
-
-    printlog "get current default style from TextObjectBar"
-    kontext "TextObjectBar"
-    sTempa = Vorlage.getSelText
-    sTempc = sTempa
-    for i = 3 to 0 step -1
-        printlog "Perform the Keycombination <CTRL>+3 (2,1,0) and check, if Style in TextObjectBar changed"
-        printlog "- <Ctrl>+<"+i+"> -> Heading "+i+" style"
-        Call hTypeKeys("<Mod1 "+i+">")
-        sleep 1
-        kontext "TextObjectBar"
-        sTempb = sTempa
-        sTempa = Vorlage.getSelText
-        if (sTempa <> sTempb) then
-            printlog "OK: Heading changed: '" + sTempa + "'"
-        else
-            warnlog "Heading didn't change: '" + sTempa + "'"
-        end if
-    next i
-    kontext "DocumentWriter"
-    DocumentWriter.TypeKeys("<MOD1 SHIFT 0>")
-    sleep (2)
-    kontext "TextObjectBar"
-    sTempa = Vorlage.getSelText
-
-    printlog "should now be the default from the beginning"
-    if (uCase(gApplication)<>"HTML") then
-        if (sTempa = sTempc) then
-            printlog "OK: Heading changed to default: '" + sTempa + "'"
-        else
-            warnlog "Heading didn't change to default. Should have been: '" + sTempc + "' but was: '" + sTempa + "'"
-        end if
-    end if
-
-    printlog "close document"
-    call hCloseDocument()
-endcase
-
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'* 
+'* Copyright 2008 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: w_stylist.inc,v $
+'*
+'* $Revision: 1.2 $
+'*
+'* last change: $Author: vg $ $Date: 2008-08-18 12:36:39 $
+'*
+'* This file is part of OpenOffice.org.
+'*
+'* OpenOffice.org is free software: you can redistribute it and/or modify
+'* it under the terms of the GNU Lesser General Public License version 3
+'* only, as published by the Free Software Foundation.
+'*
+'* OpenOffice.org is distributed in the hope that it will be useful,
+'* but WITHOUT ANY WARRANTY; without even the implied warranty of
+'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'* GNU Lesser General Public License version 3 for more details
+'* (a copy is included in the LICENSE file that accompanied this code).
+'*
+'* You should have received a copy of the GNU Lesser General Public License
+'* version 3 along with OpenOffice.org.  If not, see
+'* <http://www.openoffice.org/license.html>
+'* for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* owner : helge.delfs@sun.com
+'*
+'* short description : Test common stylist functions and assigning styles
+'*
+'************************************************************************
+'*
+' #1 tFormatStylist1
+' #1 tFormatStylist2
+' #1 tFormatStylist3
+' #1 tFormatStylist4
+' #1 tFormatStylist5
+' #1 tFormatStylist6
+' #1 tFormatStylist7
+' #1 tAssigningStyles1
+' #1 tAssigningStyles2
+' #1 tAssigningStyles3
+' #1 tAssigningStyles4
+' #1 tAssigningStyles5
+' #1 tAssigningStyles6
+' #1 tAssigningStyles7
+' #1 tKeyboardShortcutToStyles
+'*
+'\***********************************************************************
+
+sub w_stylist
+   printLog Chr(13) + "---------   Level 1 - Format / Stylist   ----------"
+
+   Call tFormatStylist1                ' all methods on stylist
+   Call tFormatStylist2                ' interacting between documents
+   Call tFormatStylist3                ' show all templates
+   Call tFormatStylist4                ' search/create templates
+   Call tFormatStylist5                ' select templet in stylist
+   Call tFormatStylist6                ' new template from selection
+   Call tFormatStylist7                ' new template from selection, modified via ContextMenu.
+   Call tAssigningStyles1
+   Call tAssigningStyles2
+   Call tAssigningStyles3
+   Call tAssigningStyles4
+   Call tAssigningStyles5
+   Call tAssigningStyles6
+   Call tAssigningStyles7
+   Call tKeyboardShortcutToStyles
+
+end sub
+
+' **********************************************************************
+
+testcase tFormatStylist1
+    Dim xPos as long
+    Dim yPos as long
+    Dim xSize%
+    Dim ySize%
+
+	printlog "- Format / Stylist : all methods with Navigator as window"
+	printlog "New writerdocument"
+	Call hNewDocument
+	printlog "  - Call Stylist with F11"
+	printlog "Call stylist with <F11> aand proof all windowmethods at stylist"
+	Call wTypeKeys "<F11>"
+	Kontext "Stylist"
+	if Stylist.NotExists then
+      	Warnlog "No Stylist with <F11>"
+		FormatStylist
+	end if
+	xPos = Stylist.GetPosX
+	yPos = Stylist.GetPosY
+	xSize% = Stylist.GetSizeX
+	ySize% = Stylist.GetSizeY
+
+	printlog "  - move Stylist"
+	Stylist.Move 10, 10
+	Sleep 1
+	Stylist.Move 300, 400
+	Sleep 1
+	Stylist.Move 590, 790
+	Sleep 1
+	Stylist.Move xPos, yPos
+	Sleep 1
+
+	printlog "  - size Stylist"
+	try
+		Stylist.Size 300, 400
+	catch
+		Warnlog "Sizen Stylist doesn't work.. see #i32449"
+	endcatch	
+	Sleep 1
+	try
+		Stylist.Size xSize%, ySize%
+	catch
+		Warnlog "Sizen Stylist doesn't work.. see #i32449"
+	endcatch
+	Sleep 1
+
+	printlog "  - close Stylist and reopen ( has to be the same size )"
+	xPos = Stylist.GetPosX
+	yPos = Stylist.GetPosY
+	xSize% = Stylist.GetSizeX
+	ySize% = Stylist.GetSizeY
+	FormatStylist
+	Sleep 1
+	FormatStylist
+	if xPos <> Stylist.GetPosX then Warnlog "x-Pos. has been changed : Not -> "+ xPos + "  but -> "+ Stylist.GetPosX
+	if yPos <> Stylist.GetPosY then Warnlog "y-Pos. has been changed : Not -> "+ yPos + "  but -> "+ Stylist.GetPosY
+	if xSize% <> Stylist.GetSizeX then Warnlog "x-Size has been changed : Not -> "+ xSize% + "  but -> "+ Stylist.GetSizeX
+	if ySize% <> Stylist.GetSizeY then Warnlog "y-Size has been changed : Not -> "+ ySize% + "  but -> "+ Stylist.GetSizeY
+
+	printlog "  - dock Stylist"
+	Stylist.Dock
+	Sleep 1
+	if NOT Stylist.IsDocked then Warnlog "Stylist has not been docked in"
+	Stylist.Undock
+	Sleep 1
+
+	Stylist.Close
+	printlog "Close document"
+	Call hCloseDocument
+
+endcase
+
+' **********************************************************************
+
+testcase tFormatStylist2
+    Dim xPos%
+    Dim yPos%
+    Dim xSize%
+    Dim ySize%
+
+	printlog "- Format/Stylist : Methods from Stylist as Window between more than one document"
+	printlog " New document"
+	Call hNewDocument
+	printlog "check all methods of Stylist as Window between more than one document"
+	Call wTypeKeys "Test the stylist functions"
+	printlog "  - Call Stylist in first document and check in a second document"
+	Sleep 2
+	Kontext "Stylist"
+	If Not Stylist.Exists then FormatStylist
+	Sleep 2
+	Call hNewDocument
+	Call wTypeKeys "Test the stylist functions"
+	Sleep 2
+	Kontext "Stylist"
+	if Stylist.NotExists then Warnlog "No Stylist in new document"
+
+	printlog "  - Close all documents and reopen"
+	Sleep 2
+	Call hCloseDocument
+	Sleep 2
+	Call hCloseDocument
+	Sleep 2
+	Call hNewDocument
+	Sleep 2
+	Call wTypeKeys "Test the stylist functions"
+	Kontext "Stylist"
+	if Stylist.NotExists then Warnlog "No Stylist in a new document"
+
+	printlog "  - Dock Stylist in first document and check in a new if docked"
+	Sleep 2
+	Stylist.Dock
+	Sleep 1
+	Call hNewDocument
+	Call wTypeKeys "Test the stylist functions"
+	Kontext "Stylist"
+	if NOT Stylist.IsDocked then Warnlog "Stylist is not docked in new document"
+	
+	printlog "  - Close all documents, reopen one and check docked Stylist"
+	Call hCloseDocument
+	Sleep 2
+	Call hCloseDocument
+	Sleep 2
+	Call hNewDocument
+	Kontext "Stylist"
+	if NOT Stylist.IsDocked then Warnlog "Stylist is not docked in new document"
+	
+	printlog "  - Close Stylist with <F11>"
+	Stylist.Undock
+	Sleep 1
+	Call wTypeKeys "<F11>"
+	Kontext "Stylist"
+	if NOT Stylist.NotExists then
+		Warnlog "Stylist is still open"
+		Stylist.Close
+	end if
+	printlog "Close document"
+	Call hCloseDocument
+	
+endcase
+
+' **********************************************************************
+
+testcase tFormatStylist3
+    Dim i as Integer
+    Dim AllStyles as integer
+    Dim j as integer
+    Dim RemString as string
+    printlog "- Format / Stylist : select all Style properties"
+
+    Call hNewDocument
+    printlog " New writerdocument"
+    FormatStylist
+    printlog "Select all style properties in stylist"
+    Kontext "Stylist"
+    if Stylist.NotExists then FormatStylist
+    printlog "   - Paragraph Styles"
+    Absatzvorlagen.Click
+
+    for i=1 to Gruppenliste.GetItemCount
+        Gruppenliste.Select i
+        wait 500
+        if i = 2 then  ' All Styles
+            Vorlagenliste.TypeKeys "<Home>"
+            AllStyles = 1
+            For j = 1 to 200
+                RemString = Vorlagenliste.Gettext
+                'Include this, if you want to see the styles in writerdocument
+                'SetClipboard Vorlagenliste.Gettext
+                'Kontext "DocumentWriter"
+                'DocumentWriter.TypeKeys GetClipboardtext + "<Return>"
+                'Kontext "Stylist"
+                Vorlagenliste.TypeKeys "<Down>"
+                if Vorlagenliste.Gettext <> RemString then
+                    AllStyles = AllStyles + 1
+                else
+                    j = 202
+                    if AllStyles <> "122" then
+                        Select Case iSprache
+                            Case 07
+                                warnlog "Double styles in stylist"
+                            Case 55
+                                warnlog "Missing Style in Stylist"
+                            Case 31
+                                warnlog "Missing Style in Stylist"
+                            Case else
+                                Warnlog "There are " + AllStyles + " styles in this category and not 122!"
+                        end select
+                    else
+                        printlog "There are " + AllStyles + " styles in this category!"
+                    end if
+                end if
+            next j
+        end if
+        Sleep 1
+    next i
+
+    Zeichenvorlagen.Click
+    Sleep 2
+    printlog "   - Chapter Styles"
+    for i=1 to Gruppenliste.GetItemCount
+        Gruppenliste.Select i
+        AllStyles = AllStyles + 1
+        Sleep 1
+    next i
+
+    Rahmenvorlagen.Click
+    Sleep 2
+    printlog "   - Frame Styles"
+    for i=1 to Gruppenliste.GetItemCount
+        Gruppenliste.Select i
+        AllStyles = AllStyles + 1
+        Sleep 1
+    next i
+
+    Seitenvorlagen.Click
+    Sleep 2
+    printlog "   - Page Styles"
+    for i=1 to Gruppenliste.GetItemCount
+        Gruppenliste.Select i
+        AllStyles = AllStyles + 1
+        Sleep 1
+    next i
+    Stylist.Close
+	printlog "Close document"
+    Call hCloseDocument
+endcase
+
+' **********************************************************************
+
+testcase tFormatStylist4
+    Dim i as Integer
+    Dim AlterWert$
+    Dim NeuerWert$
+
+    printlog "- Format / Stylist : check created Styles"
+	printlog "New writerdocument"
+	Call hNewDocument
+	printlog "   - create Paragraph Style in Stylist"
+	Call wStyleCreate ( "ATesttool", "Paragraph", true )
+	Kontext "Stylist"
+	printlog "Check if Style has been added in stylist"
+    if wStyleSelect ( "ATesttool", "Paragraph" ) = false then Warnlog "Paragraph Style has not been found"
+
+	printlog "   - Create Character Style in Stylist"
+	Call wStyleCreate ( "BTesttool", "Character", true )
+	if wStyleSelect ( "BTesttool", "Character" ) = false then Warnlog "Character Style has not been found!"
+	printlog "   - Create Frame Style in Stylist"
+    Call wStyleCreate ( "CTesttool", "Frame", true )
+    if wStyleSelect ( "CTesttool", "Frame" ) = false then Warnlog "Frame Style has not been found!"
+
+	printlog "   - Create Page Style in Stylist"
+	Call wStyleCreate ( "DTesttool", "Page", true )
+	if wStyleSelect ( "DTesttool", "Page" ) = false then Warnlog "Page Style has not been found"
+
+	printlog "   - creating Styles should not have been affecting to new documents"
+    ' To avoid focus problems on unix first close stylist
+   	Kontext "Stylist"
+    if Stylist.Exists then FormatStylist   
+	Call hNewDocument
+   	Kontext "Stylist"
+    if Not Stylist.Exists then FormatStylist
+
+    if wStyleSelect ( "ATesttool", "Paragraph" ) = true then Warnlog "Paragraph Style has been found in new document"
+    if wStyleSelect ( "BTesttool", "Character" ) = true then Warnlog "Character Style has been found in new document"
+    'if wStyleSelect ( "CTesttool", "Frame" ) = true then Warnlog "Frame Style has been found in new document"
+    if wStyleSelect ( "DTesttool", "Page" ) = true then Warnlog "Page Style has been found in new document"
+
+    Call hCloseDocument
+    printlog "Close document"
+    Call hCloseDocument
+endcase
+
+' **********************************************************************
+
+testcase tFormatStylist5
+    Dim SuchMal as string, i as integer
+    Dim bStyleFound as boolean
+
+    printlog "- Format / Stylist : select Style"
+	printlog "New writerdocument"
+	if bAsianLan = True then
+    	printlog "- Not in Asian languages!"
+		goto endsub
+	end if
+	Call hNewDocument
+	Call wTypeKeys "Dies ist ein formatierter Text <Shift Home>"
+	printlog "  - format Text"
+	FormatCharacter
+	Kontext
+	Active.SetPage TabFontEffects
+	Kontext "TabFontEffects"
+	StrikeThrough.Select 2
+  	Outline.Check
+	TabFontEffects.OK
+
+	printlog "  - adjust to Standard-Format through the Stylist"
+	printlog "adjust to Standard-Format through the Stylist"
+	FormatStylist
+	Kontext "Stylist"
+	if Stylist.NotExists then FormatStylist
+  	'Get name for 'default' template
+	Kontext "TextObjectbar"
+	SuchMal = Vorlage.GetSelText
+	printlog "Using " & SuchMal & " as 'default'" 
+	Kontext "Stylist"
+   
+    Vorlagenliste.TypeKeys "<Home>"
+    bStyleFound = false
+    for i=1 to Vorlagenliste.GetItemCount
+        Vorlagenliste.Select i
+        if Vorlagenliste.GetText = Suchmal then
+            Vorlagenliste.TypeKeys "<Return>"
+            bStyleFound = true
+            exit for
+        end if
+    next i
+    Stylist.Close
+    
+    if bStyleFound = false then
+        Warnlog "Style: " & Suchmal & " has not been found in Stylist"
+        Call hCloseDocument
+        goto endsub
+    end if   	
+
+	printlog "  - check format"
+	FormatCharacter
+	Kontext
+	Active.SetPage TabFontEffects
+	Kontext "TabFontEffects"
+	if StrikeThrough.GetSelIndex = 2 then Warnlog "Wrong entry selected in StrikeThrough"
+	if Outline.IsChecked then Warnlog "Format Outline is still checked"
+	TabFontEffects.OK
+
+	printlog "Close document"
+	Call hCloseDocument
+endcase
+
+' **********************************************************************
+
+testcase tFormatStylist6
+    Dim i as integer
+
+    printlog "- Format / Stylist : new Style from selection"
+    printlog "New writerdocument"
+    Call hNewDocument
+    Call wTypeKeys "Creating a style from selection <Return><Up><Shift End>"
+    printlog "create a new style from selection"
+    FormatCharacter
+        Kontext
+        Active.SetPage TabFontEffects
+        Kontext "TabFontEffects"
+            Shadow.Check
+            StrikeThrough.Select 2
+            Overline.Select 2
+            OverlineColor.Select 6
+            Outline.Check
+            Effects.Select 3
+            Blinking.Check
+        Kontext
+        Active.Setpage TabHyperlinkZeichen
+        Kontext "TabHyperlinkZeichen"
+            URLName.SetText "www.mikeportnoy.com"
+    TabHyperlinkZeichen.OK
+
+    printlog "  - Create Character Style from selection"
+    Kontext "Stylist"
+    if not Stylist.Exists then FormatStylist
+        Kontext "Stylist"
+        TBGestalter.Click ZeichenVorlagen
+        Sleep 1
+
+    AusSelektion.OpenMenu
+    Sleep 1
+    hMenuSelectNr(1)
+    Sleep 1
+
+    Kontext "VorlageErzeugen"
+    if VorlageErzeugen.Exists then
+        VorlagenName.SetText "Testtool"
+        VorlageErzeugen.OK
+    else
+        Warnlog "Creating Style did not work. Dialog not up!"
+    end if
+
+    printlog "   - assign new Character Style to a new text"
+    wTypeKeys "<Home><Down>",3
+    wTypeKeys "This is some new text <Return><Up><Up><Shift End>"
+    Kontext "Stylist"
+        TBGestalter.Click ZeichenVorlagen
+        if Vorlagenliste.GetSeltext <> "Testtool" then  'Go find the entry.
+            Vorlagenliste.TypeKeys "<Home>"
+	    For i = 1 to 100
+                Vorlagenliste.TypeKeys "<Down>"
+                if Vorlagenliste.GetSeltext = "Testtool" then  'Found it!
+                    i = 102
+                end if
+            next i
+        end if
+        Vorlagenliste.TypeKeys "<Return>"  'Assign to text.
+    Stylist.Close
+    if i = 101 then
+        Warnlog "Created Style could not be found in Stylist!"
+    else
+        Printlog "   - check Style"
+        FormatCharacter
+        Kontext
+        Active.SetPage TabFontEffects
+        Kontext "TabFontEffects"
+            if NOT Shadow.IsChecked then Warnlog "Shadow is not checked anymore"
+            if StrikeThrough.GetSelIndex <> 2 then Warnlog "Wrong entry selection in StrikeThrough"
+            if Overline.GetSelIndex <> 2 then Warnlog "Overline is not checked anymore"
+	    if OverlineColor.GetSelIndex <> 6 then Warnlog "Wrong Overline Color selected"
+            if NOT Outline.IsChecked then Warnlog "Outline is not checked anymore"
+            if Effects.GetSelIndex <> 3 then Warnlog "Wrong effect selected"
+            if NOT Blinking.IsChecked then Warnlog "Blinking is not checked anymore"
+        Kontext
+        Active.Setpage TabHyperlinkZeichen
+        Kontext "TabHyperlinkZeichen"
+            if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#TabHyperlink: URL is wrong " + URLName.Gettext
+        TabHyperlinkZeichen.OK
+    end if
+
+    printlog "Close document"
+    Call hCloseDocument
+endcase
+
+' **********************************************************************
+
+testcase tFormatStylist7
+    Dim i as integer
+
+    printlog "- Format / Stylist : new Style from selection, then modified via the ContextMenu."
+    printlog "New writerdocument"
+    Call hNewDocument
+    Call wTypeKeys "Creating a style from selection <Return><Up><Shift End>"
+    printlog "create a new style from selection"
+
+    printlog "  - Create Character Style from selection"
+    Kontext "Stylist"
+    if not Stylist.Exists then FormatStylist
+        Kontext "Stylist"
+        TBGestalter.Click ZeichenVorlagen
+        Sleep 1
+
+    AusSelektion.OpenMenu
+    Sleep 1
+    hMenuSelectNr(1)
+    Sleep 1
+
+    Kontext "VorlageErzeugen"
+    if VorlageErzeugen.Exists then
+        VorlagenName.SetText "Testtool"
+        VorlageErzeugen.OK
+    else
+        Warnlog "Creating Style did not work. Dialog not up!"
+    end if
+
+    printlog " Open ContextMenu over the 'Testtool' Style."
+    Kontext "Stylist"
+    if not Stylist.Exists then FormatStylist
+    Kontext "Stylist"
+        TBGestalter.Click ZeichenVorlagen
+        if Vorlagenliste.GetSeltext <> "Testtool" then
+            Vorlagenliste.TypeKeys "<Home>"
+            For i = 1 to 100
+                Vorlagenliste.TypeKeys "<Down>"
+                if Vorlagenliste.GetSeltext = "Testtool" then
+                    i = 102
+                end if
+            next i
+	    if i = 101 then
+	       warnlog "No Testtool -Stylist found. Check if new stylists can be created. Test ends."
+	       goto endsub
+	    end if
+        end if
+        Vorlagenliste.TypeKeys "<SHIFT F10>"  'Open ContextMenu
+        Sleep 1
+        printlog "  Select 'Modify'"
+        Call hMenuSelectNr(2)  'Modify
+        Sleep 1
+
+    printlog "  Goto Tabpage 'Font Effects' and change some settings."
+    Kontext
+    Active.SetPage TabFontEffects
+    Kontext "TabFontEffects"
+        Shadow.Check
+        StrikeThrough.Select 2
+        Overline.Select 2
+        OverlineColor.Select 6
+        Outline.Check
+        Effects.Select 3
+        Blinking.Check
+    TabFontEffects.OK
+
+    printlog "   - assign new Character Style to a new text"
+    wTypeKeys "<Home><Down>",3
+    wTypeKeys "This is some new text <Return><Up><Up><Shift End>"
+    Kontext "Stylist"
+        TBGestalter.Click ZeichenVorlagen
+        
+        if Vorlagenliste.GetSeltext <> "Testtool" then
+	    Vorlagenliste.TypeKeys "<Home>"
+            For i = 1 to 100
+                Vorlagenliste.TypeKeys "<Down>"
+                if Vorlagenliste.GetSeltext = "Testtool" then 'Found it!
+                    i = 102
+                end if
+            next i
+        end if
+        Vorlagenliste.TypeKeys "<Return>"  'Assign Style to Text.
+    Stylist.Close
+    if i = 101 then
+        Warnlog "Created Style could not be found in Stylist!"
+    else
+        Printlog "   - check Style"
+        FormatCharacter
+        Kontext
+        Active.SetPage TabFontEffects
+        Kontext "TabFontEffects"
+            if NOT Shadow.IsChecked then Warnlog "Shadow is not checked anymore"
+            if StrikeThrough.GetSelIndex <> 2 then Warnlog "Wrong entry selection in StrikeThrough"
+            if Overline.GetSelIndex <> 2 then Warnlog "Overline is not checked anymore"
+            if OverlineColor.GetSelIndex <> 6 then Warnlog "Wrong Overline Color selected"
+            if NOT Outline.IsChecked then Warnlog "Outline is not checked anymore"
+            if Effects.GetSelIndex <> 3 then Warnlog "Wrong effect selected"
+            if NOT Blinking.IsChecked then Warnlog "Blinking is not checked anymore"
+        TabFontEffects.OK
+    end if
+
+    printlog "Close document"
+    Call hCloseDocument
+endcase
+
+' **********************************************************************
+
+testcase tAssigningStyles1
+    Dim i as integer
+    Dim sStyles() as string
+    Dim sTemp as string
+    Dim j as integer
+    Dim bStyleInList as boolean
+
+	printlog "UI and Strings check"
+    Call hNewDocument
+	printlog "Open a new writerdocument"
+	printlog "Check if the following strings and only those strings are present:"
+	printlog "Clear formatting"
+	printlog "Heading 1"
+	printlog "Heading 2"
+	printlog "Heading 3"
+	printlog "Default"
+	printlog "Text body"
+	printlog "More..."
+    Select Case iSprache
+        Case 01 : sStyles = Array("Clear formatting", "Default", "Heading 1", "Heading 2", "Heading 3", "Text body", "More...")
+        Case 07 : sStyles = Array("Отменить форматирование", "Базовый", "Заголовок 1", "Заголовок 2", "Заголовок 3", "Основной текст", "Дополнительно...")
+        Case 31 : sStyles = Array("Opmaak wissen", "Kop 1", "Kop 2", "Kop 3", "Standaard", "Tekstblok", "Meer...")
+        Case 33 : sStyles = Array("Effacer le formatage", "Corps de texte", "Par défaut", "Titre 1", "Titre 2", "Titre 3", "Autres...")
+        Case 34 : sStyles = Array("Borrar formato", "Cuerpo de texto", "Encabezado 1", "Encabezado 2", "Encabezado 3", "Predeterminado", "Más...")
+        Case 36 : sStyles = Array("Formázás törlése", "Alapértelmezett", "Címsor 1", "Címsor 2", "Címsor 3", "Szövegtörzs", "További...")
+        Case 39 : sStyles = Array("Cancella formattazione", "Corpo testo", "Intestazione 1", "Intestazione 2", "Intestazione 3", "Standard", "Extra...")
+        Case 46 : sStyles = Array("Radera formatering", "Brödtext", "Överskrift 1", "Överskrift 2", "Överskrift 3", "Standard", "Mer...")
+        Case 48 : sStyles = Array("Wyczyść formatowanie", "Domyślnie", "Nagłówek 1", "Nagłówek 2", "Nagłówek 3", "Treść tekstu", "Więcej...")
+        Case 49 : sStyles = Array("Formatierung löschen", "Standard", "Textkörper", "Überschrift 1", "Überschrift 2", "Überschrift 3", "Weitere...")
+        Case 55 : sStyles = Array("Limpar formatação", "Corpo do texto", "Padrão", "Título 1", "Título 2", "Título 3", "Mais...")
+        Case 81 : sStyles = Array("書式設定の解除", "本文", "標準", "見出し 1", "見出し 2", "見出し 3", "詳細...")
+        Case 82 : sStyles = Array("서식 지우기", "기본값", "제목 1", "제목 2", "제목 3", "텍스트 본문", "자세히...")
+        Case 86 : sStyles = Array("清除格式", "默认", "标题 1", "标题 2", "标题 3", "正文", "更多(~M)...")
+        Case 88 : sStyles = Array("清除格式", "內文", "標題 1", "標題 2", "標題 3", "預設", "更多...")
+        Case 90 : sStyles = Array("Biçimlendirmeyi temizle", "Başlık 1", "Başlık 2", "Başlık 3", "Metin gövdesi", "Varsayılan", "Diğer...")
+        Case else : Warnlog "Current language not supported. Please add styles to list!"
+                    Kontext "Textobjectbar"
+                    printlog "- Current Styles: "
+                    For i = 1 to Vorlage.GetItemCount
+                        Vorlage.Select i
+                        printlog Vorlage.GetSelText
+                    next i
+                    Call hCloseDocument
+                    exit sub
+    end select
+
+    'Check number of entrys....have to be seven
+    Kontext "Textobjectbar"
+    if Vorlage.GetItemCount <> 7 then
+        Select case iSprache
+            case 82     : warnlog "Korean: Number of styles in styleslistbox wrong"
+            case else   : Warnlog "Not 7 entrys in Styles & Formatting combobox but: " & Vorlage.GetItemCount
+        end select
+    end if
+
+    For i = 1 to Vorlage.GetItemCount
+        Vorlage.Select i
+        sTemp = Vorlage.GetSelText
+        printlog "- check style: " & sTemp
+        bStyleInList = false
+        For j = 0 to 6
+            if sStyles(j) = sTemp then
+                bStyleInList = true
+            end if
+        next j
+        
+        if bStyleInList = true then
+            printlog "-  style " & sTemp & " found in list"
+        else
+            if iSprache <> 82 then Warnlog "-  style " & sTemp & " wasn't found in list!"
+        end if
+    next i
+
+    Call hCloseDocument
+endcase
+
+' **********************************************************************
+
+testcase tAssigningStyles2
+    Dim i as integer
+    Dim sTemp as string
+
+    printlog "- Apply Style"
+	printlog "New writerdocument"
+    Call hNewDocument
+	printlog "Insert dummytext"
+    if wBlindtextEinfuegen = false then
+        Call hCloseDocument
+        exit sub
+    end if
+    
+	printlog "Select whole dummytext"
+    Call wTypeKeys "<Mod1 A>"
+	printlog "Apply style 'Heading 1' through Styles & Formatting combobox"
+    Kontext "Textobjectbar"
+    for i = 1 to Vorlage.GetItemCount
+        Vorlage.Select i
+        sTemp = Vorlage.GetSelText
+        if Instr(sTemp, "1") then
+            Vorlage.TypeKeys "<Return>"            
+            exit for
+        end if
+    next i
+
+	printlog "Check if style has been applied to paragraph"
+    Call wTypeKeys "<Mod1 Home><End>"
+    Call wTypeKeys "<Left>", 2
+    
+    Kontext "Textobjectbar"
+    if Vorlage.GetSeltext <> sTemp then
+        Warnlog "Seems style has not been completely applied to paragraph!"
+    end if
+
+    Call hCloseDocument
+endcase
+
+' **********************************************************************
+
+testcase tAssigningStyles3
+
+    printlog "- Create a new style"
+    printlog "Open a new writerdocument"
+    Call hNewDocument
+    printlog "Insert a dummy text"
+    if wBlindtextEinfuegen = false then
+        Call hCloseDocument
+        exit sub
+    end if
+    
+    printlog "Select the whole dummy text"
+    Call wTypeKeys "<Mod1 A>"
+    printlog "Format / Character" 
+    FormatCharacter
+	Kontext
+	Active.Setpage TabFont
+	Kontext "TabFont" 
+    printlog "Apply first font in list and select 2nd Typeface"
+	if gAsianSup = True then
+		FontWest.Select 1
+        StyleWest.Select 2
+	else
+		Font.Select 1
+        Style.Select 1
+	end if
+    TabFont.Ok
+    
+    printlog "Enter 'MyStyle' in Stylelistbox"
+    Kontext "Textobjectbar"
+    Vorlage.TypeKeys "<Mod1 A>"
+    Vorlage.TypeKeys "MyStyle<Return>"
+    
+    printlog "Check if style has been applied to the combobox"
+    Call wTypeKeys "<Mod1 End>"
+    
+    wait 500
+    Kontext "Textobjectbar"
+    try
+        Vorlage.Select "MyStyle"
+    catch
+        Warnlog "Seems style has not been applied to combobox"
+    endcatch
+        
+    printlog "Check if style has been applied to paragraph"
+    Call wTypeKeys "<Mod1 Home>"
+    Call wTypeKeys "<Right>", 2
+    
+    Kontext "Textobjectbar"
+    if Vorlage.GetSelText <> "MyStyle" then
+        Warnlog "Seems style has not been applied to paragraph"
+    end if
+
+    printlog "Close Document"
+    Call hCloseDocument
+endcase
+
+' **********************************************************************
+
+testcase tAssigningStyles4
+    Dim i as integer
+    Dim sTemp as string
+    Dim sStyle as integer
+    
+    printlog "- Clear formatting: whole paragraph"
+    printlog "Open a new writer document"
+    Call hNewDocument
+    printlog "Insert a dummytext"
+    if wBlindtextEinfuegen = false then
+        Call hCloseDocument
+        exit sub
+    end if
+    
+    printlog "Select whole dummytext"
+    Call wTypeKeys "<Mod1 A>"
+    printlog "Apply style 'Heading 1' through Styles & Formatting combobox"
+    Kontext "Textobjectbar"
+    ' remeber default style
+    sStyle = Vorlage.GetSelIndex
+    for i = 1 to Vorlage.GetItemCount
+        Vorlage.Select i
+        sTemp = Vorlage.GetSelText
+        if Instr(sTemp, "1") then
+            Vorlage.TypeKeys "<Return>"
+            exit for
+        end if
+    next i
+
+    printlog "choose 'Clear formatting' in combobox" 
+    Kontext "Textobjectbar"
+    Vorlage.Select 1
+    Vorlage.TypeKeys "<Return>"
+    wait 500
+    printlog "Check if style has been set to default"
+    Call wTypeKeys "<Mod1 Home>"
+    Call wTypeKeys "<Right>", 3
+
+    wait 500    
+    Kontext "Textobjectbar"
+    if Vorlage.GetSelIndex <> sStyle then
+        warnlog "Seems paragraph has not been set to default! " & Vorlage.GetSelText & "(" & Vorlage.GetSelIndex & ")" 
+    end if
+
+    printlog "Close Document"
+    Call hCloseDocument 
+
+endcase
+
+' **********************************************************************
+
+testcase tAssigningStyles5
+
+    printlog "- Clear formatting: whole paragraph with hard formatting of some characters"
+	printlog " - 1. Cursor outside of hard formatted string"
+    printlog "Open a new writer document"
+    Call hNewDocument
+    printlog "Insert a dummytext"
+    if wBlindtextEinfuegen = false then
+        Call hCloseDocument
+        exit sub
+    end if
+
+    printlog "Highlight first line in dummy text"
+	Call wTypeKeys "<Mod1 Home>"
+	Call wTypeKeys "<Shift End>" 
+	
+    printlog "Format / Bold"
+	Kontext "TextObjectbar"
+    if Not TextObjectbar.Exists then Call hToolbarSelect ( "FORMATTING", true )
+	Fett.Click
+	Wait 500
+
+    printlog "Set cursor outside of bold formatted text"
+	Call wTypeKeys "<Mod1 Home>"
+	Call wTypeKeys "<Down><Right>"
+	
+    printlog "Select 'Clear Formatting' in Style-Listbox"
+	Kontext "Textobjectbar"
+    Vorlage.Select 1
+    Vorlage.TypeKeys "<Return>"
+    wait 500
+
+    printlog "Check that first line is still bold and has not been reset"
+	Call wTypeKeys "<Mod1 Home>"
+	Call wTypeKeys "<Right>"
+
+    Kontext "TextObjectbar"
+    if Fett.Getstate(2) = 0 then
+        Warnlog "Style 'Bold' has been reset!"
+    end if
+
+    printlog "Close document"
+	Call hCloseDocument
+endcase
+
+' **********************************************************************
+
+testcase tAssigningStyles6
+
+    Dim iStandard as integer
+
+    printlog "- Clear formatting: whole paragraph with hard formatting of some characters"
+	printlog " - 2. Cursor inside of hard formatted string"  
+    printlog "Open a new writer document"
+    Call hNewDocument
+    printlog "Insert a dummytext"
+    if wBlindtextEinfuegen = false then
+        Call hCloseDocument
+        exit sub
+    end if
+
+    printlog "Highlight first line in dummy text"
+	Call wTypeKeys "<Mod1 Home>"
+	Call wTypeKeys "<Shift End>" 
+	
+    printlog "Format / Bold"
+	Kontext "TextObjectbar"
+    if Not TextObjectbar.Exists then Call hToolbarSelect ( "FORMATTING", true )
+	Fett.Click
+	Wait 500
+
+    printlog "Point cursor to first highlighted word of bold formatted text"
+	Call wTypeKeys "<Mod1 Home>"	
+	Call wTypeKeys "<Right>"
+	
+    printlog "Select 'Format / Default Formatting' in Style-Listbox"
+	FormatDefaultWriter
+    wait 500
+
+    printlog "first highlighted word should be set to 'Standard'"
+	Call wTypeKeys "<Mod1 Home>"
+	Call wTypeKeys "<Right>"
+    Kontext "TextObjectbar"
+    if Fett.Getstate(2) = 1 then
+        Warnlog "Style 'Bold' has not been reset!"
+    end if
+	
+    printlog "Check that rest of first line is still bold and has not been reset"
+	Call wTypeKeys "<Mod1 Home>"
+	Call wTypeKeys "<End><Left>"
+
+    Kontext "TextObjectbar"
+    if Fett.Getstate(2) = 1 then
+        Warnlog "Style 'Bold' has not been reset!"
+    end if
+
+    printlog "Close document"
+	Call hCloseDocument
+endcase
+
+' **********************************************************************
+
+testcase tAssigningStyles7
+
+    printlog "More ..."  
+    printlog "Open a new writer document"
+    Call hNewDocument
+	
+    printlog "Select 'More...' in Style-Listbox"
+	Kontext "Textobjectbar"
+    Vorlage.Select Vorlage.GetItemCount
+    Vorlage.TypeKeys "<Return>"
+    wait 500
+
+    printlog "The Stylist should have been opened"
+	Kontext "Stylist"
+	if Not Stylist.Exists then
+		Warnlog "'Styles and Formatting' doesn't open if 'More...' is selected in Style-Listbox"
+	else
+        printlog "In Style group listbox 'Automatic' should be selected"
+		if Gruppenliste.GetSelIndex <> 5 then
+			Warnlog "Seems 'Automatic' is not selected per default in 'Styles and Formatting'"
+		end if
+		Stylist.Close
+	end if
+
+    printlog "Close document"
+	Call hCloseDocument
+endcase
+
+' **********************************************************************
+
+testcase tKeyboardShortcutToStyles()
+    dim sTempa as string
+    dim sTempb as string
+    dim sTempc as string
+    dim i as integer
+    dim x as integer
+
+    printlog "open new application document"
+    call hNewDocument()
+
+    printlog "get current default style from TextObjectBar"
+    kontext "TextObjectBar"
+    sTempa = Vorlage.getSelText
+    sTempc = sTempa
+    for i = 3 to 0 step -1
+        printlog "Perform the Keycombination <CTRL>+3 (2,1,0) and check, if Style in TextObjectBar changed"
+        printlog "- <Ctrl>+<"+i+"> -> Heading "+i+" style"
+        Call hTypeKeys("<Mod1 "+i+">")
+        sleep 1
+        kontext "TextObjectBar"
+        sTempb = sTempa
+        sTempa = Vorlage.getSelText
+        if (sTempa <> sTempb) then
+            printlog "OK: Heading changed: '" + sTempa + "'"
+        else
+            warnlog "Heading didn't change: '" + sTempa + "'"
+        end if
+    next i
+    kontext "DocumentWriter"
+    DocumentWriter.TypeKeys("<MOD1 SHIFT 0>")
+    sleep (2)
+    kontext "TextObjectBar"
+    sTempa = Vorlage.getSelText
+
+    printlog "should now be the default from the beginning"
+    if (uCase(gApplication)<>"HTML") then
+        if (sTempa = sTempc) then
+            printlog "OK: Heading changed to default: '" + sTempa + "'"
+        else
+            warnlog "Heading didn't change to default. Should have been: '" + sTempc + "' but was: '" + sTempa + "'"
+        end if
+    end if
+
+    printlog "close document"
+    call hCloseDocument()
+endcase
+
diff --git a/testautomation/writer/optional/includes/textframes/w_textframes2.inc b/testautomation/writer/optional/includes/textframes/w_textframes2.inc
index f716c9a51..4f869d3a2 100755
--- a/testautomation/writer/optional/includes/textframes/w_textframes2.inc
+++ b/testautomation/writer/optional/includes/textframes/w_textframes2.inc
@@ -81,7 +81,7 @@ testcase tTextframes_17
     Call wTypeKeys "<ESCAPE>"
     Wait 500
     
-    Call gMouseClick(15,15)
+    Call gMouseClick(40,40)
     Wait 500
     
     '/// check if contents can be inserted into frame
@@ -125,7 +125,7 @@ testcase tTextframes_18
     Call wTypeKeys "<ESCAPE>"
     Wait 500
     
-    Call gMouseClick(15,15)
+    Call gMouseClick(40,40)
     Sleep 2
     
     '/// check if the frame is moved
@@ -872,15 +872,15 @@ testcase tTextframes_28
     
     Call hNewDocument
     
-    '/// Insert a frame
+    printlog "Insert a frame"
     Call fInsertFrame(30, 30, 60, 60)
     
-    '/// + Naming the frame
+    printlog "Naming the frame"
     Call fFormatFrame("TabZusaetze")
     ObjektName.SetText sFrameName1
     TabZusaetze.OK
     
-    '/// + Set the frame's wrap
+    printlog "Set the frame's wrap"
     Call fFormatFrame("TabUmlauf")
     Kein.Check
     Sleep 1
@@ -889,19 +889,15 @@ testcase tTextframes_28
     Call wTypeKeys "<ESCAPE>"
     Sleep 2
     
-    '/// Insert another frame
+    printlog "Insert another frame"
     Call fInsertFrame(50, 50, 80, 80)
     
-    printlog "Move second frame away from the first frame."
-    Call wTypeKeys "<RIGHT>", 10
-    Call wTypeKeys "<DOWN>", 7
-    
-    '/// + Naming the frame
+    printlog "Naming the frame"
     Call fFormatFrame("TabZusaetze")
     ObjektName.SetText sFrameName2
     TabZusaetze.OK
     
-    '/// + Set the frame's wrap
+    printlog "Set the frame's wrap"
     Call fFormatFrame("TabUmlauf")
     Sleep 1
     Durchlauf.Check
@@ -911,31 +907,32 @@ testcase tTextframes_28
     Call wTypeKeys "<ESCAPE>"
     Sleep 2
     
-    '/// Set focus to second frame
-    Call wTypeKeys ( "<Shift F4>" )
+    printlog "Set focus to second frame"
+    Call gMouseClick(60,60) ' Click into frame
+    wait 500
+    Call wTypeKeys "<ESCAPE>" ' Selects frame holding the cursor
     wait 500
     
-    '/// Check second frame's name
+    printlog "Check second frame's name"
     Call fFormatFrame("TabZusaetze")
     if ObjektName.GetText <> sFrameName2 then Warnlog "The 2nd frame's name is wrong ! Get " +ObjektName.GetText
     TabZusaetze.Cancel
     
-    '/// Check second frame's wrap status
+    printlog "Check second frame's wrap status"
     Call fFormatFrame("TabUmlauf")
     if Durchlauf.IsChecked <> TRUE then Warnlog "The 2nd frame's wrap status is wrong ! "
     TabUmlauf.Cancel
     
-    '/// Set focus to first frame
+    printlog "Set focus to first frame"
     Call wTypeKeys "<TAB>"
     Sleep 2
     
-    '/// Check the frame's name and warp status
-    'Check first frame's name
+    printlog "Check first frame's name"
     Call fFormatFrame("TabZusaetze")
     if ObjektName.GetText <> sFrameName1 then Warnlog "The 1st frame's name is wrong ! Get " +ObjektName.GetText
     TabZusaetze.Cancel
     
-    'Check first frame's wrap status
+    printlog "Check first frame's wrap status"
     Call fFormatFrame("TabUmlauf")
     if Kein.IsChecked <> TRUE then Warnlog "The 1st frame's wrap status is wrong ! "
     TabUmlauf.Cancel
diff --git a/testautomation/writer/optional/includes/textframes/w_textframes3.inc b/testautomation/writer/optional/includes/textframes/w_textframes3.inc
index 1b93d3584..17efcd286 100755
--- a/testautomation/writer/optional/includes/textframes/w_textframes3.inc
+++ b/testautomation/writer/optional/includes/textframes/w_textframes3.inc
@@ -48,10 +48,10 @@ sub w_textframes3
     Call tTextframes_39         'Test drag&drop with a linked frame - keyboard
     Call tTextframes_40         'Test Undo on drag&drop of frames (keyboard)
     Call tTextframes_41         'Test Undo on removing the link
-    Call tTextframes_42         'Link frame in header with frame in bodytext should be forbidded
-    Call tTextframes_43         'Link frame in footer with frame in bodytext should be forbidded
-    Call tTextframes_44         'Link frame when target frame is not empty  should be forbidded
-    Call tTextframes_45         'Recursed links should be forbidded
+    Call tTextframes_42         'Link frame in header with frame in bodytext should be forbidden
+    Call tTextframes_43         'Link frame in footer with frame in bodytext should be forbidden
+    Call tTextframes_44         'Link frame when target frame is not empty  should be forbidden
+    Call tTextframes_45         'Recursed links should be forbidden
     Call tTextframes_46         'Frames which couldn't be linked with the current one is part of another 'chain'
     Call tTextframes_47         'Frames couldn't be linked with the current one is in protected section
     Call tTextframes_48         'Frames could be linked with the current one is set to "editable in protected documents" even it is in protected section
@@ -92,7 +92,7 @@ testcase tTextframes_33
     Wait 500
     
     '/// Target the second frame
-    Call gMouseClick(60,20)
+    Call gMouseClick(60,70)
     Wait 500
     
     '/// Format/Frame / Type ,
@@ -149,7 +149,7 @@ testcase tTextframes_34
     Wait 500
     
     '/// insert another frame , set frame name
-    Call fInsertFrame(50,50 , 70,70)
+    Call fInsertFrame(50,50 , 80,80)
     
     printlog "Move second frame away from the first frame."
     Call wTypeKeys "<RIGHT>", 12
@@ -172,7 +172,7 @@ testcase tTextframes_34
     Wait 500
     
     '/// Target the second frame
-    Call gMouseClick(60,20)
+    Call gMouseClick(60,70)
     Wait 500
     
     Call wTypeKeys "<RETURN>"
@@ -234,7 +234,7 @@ testcase tTextframes_35
     Wait 500
     
     '/// Target the second frame
-    Call gMouseClick(60,20)
+    Call gMouseClick(60,70)
     Wait 500
     
     '/// Check if the link is showed correctly (Format.Frame.Options)
@@ -661,7 +661,7 @@ testcase tTextframes_41
     Wait 500
     
     '/// Target the second frame
-    Call gMouseClick(60,20)
+    Call gMouseClick(60,70)
     Wait 500
     
     '/// Remove link
@@ -694,8 +694,8 @@ testcase tTextframes_42
     
     iNoLink  =  1
     
-    printlog "- Link frame in header with frame in bodytext should be forbidded"
-    '/// Link frame in header with frame in bodytext should be forbidded
+    printlog "- Link frame in header with frame in bodytext should be forbidden"
+    '/// Link frame in header with frame in bodytext should be forbidden
     
     Call hNewDocument
     
@@ -742,8 +742,8 @@ testcase tTextframes_43
     
     iLink = 2
     
-    printlog "- Link frame in footer with frame in bodytext should be forbidded"
-    '/// Link frame in footer with frame in bodytext should be forbidded
+    printlog "- Link frame in footer with frame in bodytext should be forbidden"
+    '/// Link frame in footer with frame in bodytext should be forbidden
     
     Call hNewDocument
     
@@ -791,8 +791,8 @@ testcase tTextframes_44
     sText    =  "Test"
     iNoLink  =  1
     
-    printlog "- Link frame in footer with frame in bodytext should be forbidded"
-    '/// Link frame in footer with frame in bodytext should be forbidded
+    printlog "- Link frame in footer with frame in bodytext should be forbidden"
+    '/// Link frame in footer with frame in bodytext should be forbidden
     
     Call hNewDocument
     
@@ -836,8 +836,8 @@ testcase tTextframes_45
     
     iNoLink  =  1
     
-    printlog "- Recursed links should be forbidded"
-    '/// Recursed links should be forbidded
+    printlog "- Recursed links should be forbidden"
+    '/// Recursed links should be forbidden
     
     Call hNewDocument
     
@@ -851,8 +851,7 @@ testcase tTextframes_45
     Call fInsertFrame(50,50 , 70,70)
     
     printlog "Move the second frame away from the first one."
-    Call wTypeKeys "<RIGHT>",10
-'    Call wTypeKeys "<DOWN>",7
+    Call wTypeKeys "<RIGHT>",1
     
     '/// set focus to 1st frame
     Call wTypeKeys "<TAB>"
@@ -863,7 +862,7 @@ testcase tTextframes_45
     Sleep 2
     Verketten.Click
     Wait 500
-    Call gMouseClick(75,30)
+    Call gMouseClick(60,60)
     Wait 500
     
     '/// link two frames (1st frame is target frame)
@@ -876,7 +875,7 @@ testcase tTextframes_45
     Wait 500
     
     Call fFormatFrame("TabZusaetze")
-    if NextLink.GetSelIndex  <> iNoLink then Warnlog "There should be no link between 2 frames!"
+    if NextLink.GetItemCount <> iNoLink then Warnlog "There should be no link between 2 frames!" & NextLink.GetItemCount 
     TabZusaetze.Cancel
     Wait 500
     
@@ -991,6 +990,8 @@ testcase tTextframes_47
     sleep 1
     BereicheBearbeiten.OK
     
+    Call wTypeKeys "<DOWN>" , 10
+        
     '/// Insert another frame (B) out of the section
     Call fInsertFrame(30,70 , 60,90)
     
@@ -1020,11 +1021,10 @@ testcase tTextframes_48
     iLink = 2
     
     printlog "- Frames could be linked with the current one is set to 'editable in protected documents' even it is in protected section "
-    '/// Frames could be linked with the current one is set to "editable in protected documents" even it is in protected section
     
     Call hNewDocument
     
-    '/// Insert a section
+    printlog "Insert a section"
     InsertSection
     wait 500
     Kontext
@@ -1034,11 +1034,13 @@ testcase tTextframes_48
     TabBereiche.OK
     wait 500
     
-    Call wTypeKeys "<up>" , 1
+    Call wTypeKeys "<UP>" , 1
+    Call wTypeKeys "<RETURN>", 6
     
-    '/// Insert a frame (A) in the section , and check "editable in protected documents"
+    printlog "Insert a frame (A) in the section , and check 'editable in protected documents'"
     Call wInsertFrame
-    
+    Call wTypeKeys "<UP>" , 2          
+       
     Call fFormatFrame("TabZusaetze")
     Editierbar.Check
     wait 500
@@ -1046,17 +1048,18 @@ testcase tTextframes_48
     
     Call wTypeKeys "<ESCAPE>"
     
-    '/// Set the section to be protected
+    printlog "Set the section to be protected"
     FormatSections
     Kontext "BereicheBearbeiten"
     Geschuetzt.Check
     sleep 1
     BereicheBearbeiten.OK
     
-    '/// Insert another frame (B) out of the section
+    Call wTypeKeys "<DOWN>" , 10
+    printlog "nsert another frame (B) out of the section"
     Call fInsertFrame(50,50 , 60,60)
     
-    '/// Link B->A (A is target)
+    printlog "Link B->A (A is target)"
     Call fFormatFrame("TabZusaetze")
     try
         NextLink.Select iLink
diff --git a/testautomation/writer/optional/w_fields.bas b/testautomation/writer/optional/w_fields.bas
index bfcd875a2..9d2240321 100644
--- a/testautomation/writer/optional/w_fields.bas
+++ b/testautomation/writer/optional/w_fields.bas
@@ -59,7 +59,7 @@ sub main
     use "writer\optional\includes\fields\w_fields7.inc"   
 
     printlog Chr(13) + "Loading of Include - Files takes: " + Wielange ( StartZeit )
-    printlog Chr(13) + "******* Writer - Level 1 - Test *******"
+    printlog Chr(13) + "******* Writer - Fields - Test *******"
 
     Call hStatusIn ( "writer", "w_fields.bas" , "Fields" )
 
diff --git a/testautomation/writer/optional/w_textframes.bas b/testautomation/writer/optional/w_textframes.bas
index c3e2d81c8..c9ae666e7 100644
--- a/testautomation/writer/optional/w_textframes.bas
+++ b/testautomation/writer/optional/w_textframes.bas
@@ -65,8 +65,6 @@ sub main
     gSeperator = GetDecimalSeperator()
     'Setting the measurementunit to 'cm'
     gMeasurementUnit = fSetMeasurementToCM()
-    'Sets all writer-options to default
-    Call wOptionsUndo ( "All" )
     printlog Chr(13) + "      - Test of TextFrame function -"
     Call w_textframes1
 
diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc
index 0289414db..6be95be73 100755
--- a/testautomation/writer/required/includes/w_001_.inc
+++ b/testautomation/writer/required/includes/w_001_.inc
@@ -61,7 +61,7 @@ end sub
 
 testcase tFileNewLabels
 
-Warnlog "#i102218# - tFileNewLabels outcommented due to bug."
+QAErrorLog "#i102218# - tFileNewLabels outcommented due to bug."
 goto endsub
 
     Dim iSheetFormat as integer
@@ -253,7 +253,7 @@ endcase
 
 testcase tFileNewBusinessCards
 
-Warnlog "#i102218# - tFileNewBusinessCards outcommented due to bug."
+QAErrorLog "#i102218# - tFileNewBusinessCards outcommented due to bug."
 goto endsub
 
     Dim iFormat as integer
@@ -944,7 +944,7 @@ testcase tFileSaveWithPassword
     
     
     PrintLog "File / Save as ..."
-    FileSaveAs
+    hUseAsyncSlot( "FileSaveAs" )
     
     Kontext "SpeichernDlg"
     if ( SpeichernDlg.exists( 2 ) ) then
diff --git a/testautomation/writer/required/includes/w_005b_.inc b/testautomation/writer/required/includes/w_005b_.inc
index 6f74c6b10..ce7ce264e 100755
--- a/testautomation/writer/required/includes/w_005b_.inc
+++ b/testautomation/writer/required/includes/w_005b_.inc
@@ -1091,13 +1091,12 @@ testcase tFormatPositionAndSizeLegend
     Kontext "NavigatorWriter"
     if NavigatorWriter.Exists then ViewNavigator
 
+	printlog " Insert a legend"
     Call wZeichenobjektEinfuegen ( "Legende", 45, 35, 50, 50 )
+	Call wTypeKeys "<ESCAPE>"
+    Call wTypeKeys "<SHIFT F4>"
 
-    printlog " Insert a legend"
-    sleep (1)
-    Call wObjektSelektieren(30, 30, 75, 75)
-
-    hUseAsyncSlot( "FormatPositionAndSize" )
+    Call hUseAsyncSlot( "FormatPositionAndSize" )
     kontext "active"
     if ( active.exists( 1 ) ) then
         printlog( "Dialog open. Good" )
diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc
index 4fbfd5602..860cfb45c 100755
--- a/testautomation/writer/tools/includes/w_tool6.inc
+++ b/testautomation/writer/tools/includes/w_tool6.inc
@@ -760,7 +760,6 @@ function fInsertFrame (x1 as Integer , y1 as Integer , x2 as Integer , y2 as Int
     'This function will insert a frame with the coordinate
 
     Call wDocSetContext
-    Call gMouseClick (x1, y1)
 
     Call hToolbarSelect("INSERT", true )
     Sleep 1
diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc
index b1d00fae7..63e7e3a8e 100755
--- a/testautomation/writer/tools/includes/w_tools.inc
+++ b/testautomation/writer/tools/includes/w_tools.inc
@@ -182,27 +182,28 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona
 
     Objekt = UCase( Objekt )
     select case Objekt
-    case "RECHTECK" : Rechteck.Click
-    case "LINIE"     : Linie.Click
-    case "ELLIPSE"  : Ellipse.Click
-    case "TEXT"      : Textobjekt.Click
-    case "VTEXT"     :
-        try
-            VerticalText.Click
-        catch
-            if gAsianSup = True then
-                Warnlog "Unable to insert Vertical Text! Asian Support in Options activated ?"
-            end if
-        endcatch
-    case "LAUFTEXT" : Lauftext.Click
-    case "LEGENDE"  : Legende.Click
-    case "VLEGENDE" :
-        try
-            VerticalCallout.Click
-        catch
-            Warnlog "Unable to insert Vertical Callout! Asian Support in Options activated ?"
-        endcatch
+    	case "RECHTECK" : Rechteck.Click
+		case "LINIE"     : Linie.Click
+		case "ELLIPSE"  : Ellipse.Click
+		case "TEXT"      : Textobjekt.Click
+		case "VTEXT"     :
+        	try
+            	VerticalText.Click
+			catch
+				if gAsianSup = True then
+                	Warnlog "Unable to insert Vertical Text! Asian Support in Options activated ?"
+				end if
+			endcatch
+		case "LAUFTEXT" : Lauftext.Click
+		case "LEGENDE"  : Legende.Click
+		case "VLEGENDE" :
+			try
+				VerticalCallout.Click
+			catch
+				Warnlog "Unable to insert Vertical Callout! Asian Support in Options activated ?"
+			endcatch
     end select
+	Sleep (2)
 
     Select Case gApplication
     Case "WRITER"
@@ -219,7 +220,7 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona
         end if
         if Objekt <> "TEXT" and Objekt <> "VTEXT" then
             Kontext "DocumentWriter"
-            Call gMouseClick (1, 1)
+            Call gMouseClick (10, 10)
             wait 100
         end if
 
@@ -237,10 +238,11 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona
         end if
         if Objekt <> "TEXT" and Objekt <> "VTEXT" then
             Kontext "DocumentMasterDoc"
-            Call gMouseClick (1, 1)
+            Call gMouseClick (10, 10)
             wait 100
         end if
     end select
+	sleep (1)
 end sub
 
 ' -----------------------------------------------------------------------
diff --git a/testtools/source/bridgetest/idl/makefile.mk b/testtools/source/bridgetest/idl/makefile.mk
index 671f982e6..01b9e0cc8 100644
--- a/testtools/source/bridgetest/idl/makefile.mk
+++ b/testtools/source/bridgetest/idl/makefile.mk
@@ -60,6 +60,8 @@ CLIMAKERFLAGS =
 CLIMAKERFLAGS += --verbose
 .ENDIF
 
+
+.IF "$(BUILD_FOR_CLI)" == "true"
 ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \
     $(MISC)$/$(TARGET).javamaker.done \
     $(BIN)$/cli_types_bridgetest.dll 
@@ -68,4 +70,8 @@ $(BIN)$/cli_types_bridgetest.dll: $(BIN)$/bridgetest.rdb
     $(CLIMAKER) $(CLIMAKERFLAGS) --out $@ -r $(SOLARBINDIR)$/cli_uretypes.dll \
         -X $(SOLARBINDIR)$/types.rdb $< 
     $(TOUCH) $@
+.ELSE
+ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \
+    $(MISC)$/$(TARGET).javamaker.done
+.ENDIF
 
diff --git a/testtools/source/cliversioning/version_libs/version_3_1_1.dll b/testtools/source/cliversioning/version_libs/version_3_1_1.dll
new file mode 100644
index 0000000000000000000000000000000000000000..9ff42fc230a1bc705e0380222f5c1988d519dd43
GIT binary patch
literal 11776
zcwX&VdvILUdH>Gc-Me>J(pvXQUcIH2U&z9d<rfA*gZ0EBmR~ZqQXukb_gdPryLWx}
z3ak(%a!J}yaDhpiiA!J%offCGQ)ojWBw<P^4M~AQA44-COdzERDQRhwnaqR^?(aMI
z?n}NJ(rN$7<j6YbeBb%L-}gALd#^S5t9Mg?h=TaNaDnIva?2ii|FVqVSkIF&`cmYD
z-Y3Mq7kZD(XNrk}ZOz%qTq2ds=Pf5OYbNZ4d?J%ij2@Uu<gBzg(9jUw;9(pbBibhd
zbjL&YUR%QbE-AfrLL=G)LUnoFkfQ{Ck2AH$?JKU|TuLpSbNO5XwCB@Ajq+cmEjP0K
z^(fIX?i@$#3SC^5iRyjW?^_Z?S{12*-djZvIOZt_?S_r6tc-PqeXx%Y*hM=<o^Qv=
z4YaRTZV&zq*k;yBdA=@_i?!t<xnWva#@vQ|Qz%5|w-R-(B@!12{(PllP|zSreO>9p
z%8C}@adcA=m}*qD;%HQ>8TD&Xbql&7jK2C>VAFf;{i2h7FesLwsEel3rY#g$1GrDP
zV2aYGgS~`)5d9|Z13%c`t=t;$T1htzD%4Lh4Z6#+u#%!t)d94q3kR$)$Oa?Ohgpg`
z7!&mx6q*JDbSd%LS)msQS`l>AfCYePy`fYT>%#p<F<b{a9=9+9(U8@E`eJU3xv&wW
z-y=DddaXpX;|vlfnp9nl$AWkAJUpnYEjE}1bXr3tR$GbH9xL<ukf&&!8kSa+KA@{k
zi;T-^WLMkJZ-}%Ok-(^BplS-LP6wL{=^-2QP|$<LCLU~-Zo*HM_P`E?^yX-Do#$&^
zSZYOiN~85!;==Q1X$kWh)wKA=rtlJMM)mMgD|33%OKrRc+Bw+~6m4UZw$#BA=tY(~
zxfj{k6kY1#UUaD&O(fE?v8isUhdFgii4v!Nsh2tROY3+ZYz!A(f|lr8&l1HACC|f7
zf`ba`L2DyN84Bp3TQ{+4=+;ZzrmsR-o2x=n?cG3?5mhn~_9lmC#hpT3Es0OD_}Lv)
zC9c|YV8X}vNU^`1O<q?Waz(G4bEj8AS(lQ#HWY#ag)4G090+W5ae_2X@@&!VB^ZhZ
zdfK+d)t;e1Py6-LEgyOL&UKs<Y<(<R$-Qy9h8Jv^mMg|1`=3$*GCKj8jy^10)&3-a
z!S0jn50uz_1LUoXfIK!LWgmiD5&>(go5=ON<W$YVDG;@9!>Ck?24olwsuGcb^u-u(
zo9hCR+!Ke;Mk{ey+Zixkf9aK4d|SP0|0ZKejeu6Wdn0nbRYecRc@ucJTFZ337T*3>
zYQL@YVTz(ld|xQHa&7HoJ!}!tuOg=*+6CKna?kTIV&4H<)-IOW<WBU{VAwxG6_1}m
zo`iLo8*PXo<hiHNRV2?}@7!=UOU*4|HEv;5MK40`mq*8z`ml95$W1r{U!#5@FQ=^(
zxts!65u#h^gTL&fO8<g58yG*{7vj^jxvsfhQSEoxH6f53Btr$G1%11##86w>TRN&&
zdA;VhY&CnAkjwVmP-WR__J_et{6y4BX26UWuc$Emc8#+|o;TK&#3zj&v>$+$^+8bR
zKg|8B-2P*=Xc6q&U*UwP_6sZ}j~qnxEsp9<jtXl;4Le)CldHx05b>^iw=5iX2E9Yn
zx|)rL^>AD+m?q88+!f>HK`8LM&{7>;NrIR0CYWu2h~1%hW>xzNrDA3~n~C(S<wLup
zsX=dux1G_M7t>?$ySQghK)kpI;-{I^V=XRwY6ZL1WzVc&Kd3jfc#v!KH6G;2TA?)_
z<kAYZ3%TCCNVPr1p~?_oTRqrDz0n`G(SyBX1-k~evl_M$ux%c!uInD`y|wzfzqk78
z-s*sD_h1d(@b}j6hc#+o*HyzBfbH;LoAf4sZ=3vKn`&U2t6`e}+v&kJ>&^bK&HlM<
zu7Pc>hHVCHmj}C6U+bTQwf?YcSI_NQz;=7EaXs!28~0B_yaqN=4I2k+PsGD*(Odj+
zTm0Q^slk2c>MGn8#*KQot$M3}c3b^%TWfHs+TT{jt@Ci(^frIoHh<i<)ptZ2<JNn)
z?RvXEZo7Ye+gHy+JL5KZxE*?je||gsaXVI@w+_aQdAOZ=r$26|e;ztl$L(a?H6Cu4
z-sO+m<?nCT>iO+r+(r+#TkrPIZ?`{g_v-oWW?bFF?a_PuaeMsp(6joP)5Exihnvt7
z{<sN$+{EhJIKjA09&WGR>!06Vf85?0+{S9$UdC<qaM$VU{BhU$=Xc%ec~}SBCOr4+
zQ424mr3dypy-q$FZqg&p4rbKr_3hROb8rv;KG4f^)faZ3bRMoS8~2o$e-36(cT3{$
zLH9*m-dDi0pHV8$NdLf$Z&xwCSAp74hWa-@qd%@NsVw;}8|`eZF&YRkuhx;eKv}u9
ztlSh>8AktQrH6l1{D3(;b?vb5-pctM|K{xjg9Ez;cW>X#oDgME_u=JY{U?Zi2kr9+
zYyFgCXYzAJmN<^*;!Zq(uD@=IK5n?*K-OP#-NY!`J3-%#r_A-kS!>n{45T>Lqi7K(
zekOJhUhvpDo}1+-2>!)$6X69+@<+UuKRYydeg1Vn-$XsnRXRa4sB@^J^d<TN>L1d}
z6r=5;Rm7+u>(|BCQD2btQKeNx=~K!HB}Q+cuhPSTI|3^GEoy_b;05&c;0zEtf~_J>
zW5J<dl=4BA|5T6>9z?CulR>uoms0Zk!54!udQaBfp%)>)E%Y)xNr$ct#pu^Vto2lg
zwYICQwOeJa>s9vcag}{|MP>iLr=C#Sv3xHCqSPJcC_Wk<4M)ieUmJ?jlH}YMW-E_L
z{!^0klH`0x)|$rkxU7$9Y<Eu9%NpDIf~@}-HF??OntvLplQv-1-4)S@_XU?yBsB`E
z9`sr|wERg}6!bT=9`yyf1obuIQaYGmtlwx|lrwX_hI-DW=&;xd>Lrg#i=CkU*`t=k
z73@W?OWi51hUIHK>V7ef)p4UoJtX$yUDolaKNCk`qjQ~0J&Cb3G{4@Zek6{QL3evp
zqcV^8;72^_5~Y9zsBCbltCX9mm3Ee?k5e0c#-r|0Zo_-_o02+B=asF<l)~TG=wHPn
z3T#twqdWG5vJ=$ajjrCaa_pQ-$xL+8d2j6R<k;u8x_bYv+zyIo;=g&55Oz7Dcl#09
zZw&DFqxQf`PVYsW{s8Z!tpVP_msO2kB}Yf9IFl<z1x?BR^|F6l);CGc&9Z;GMm~Ud
z^&~CQJ(MAiEh6iavet?7vY9pq@5LMVMDQHlPDg@&h)6#gd<+^N3x0*p(p|xCqCOvd
zi5|cVzk>Q9@hUw^Uk|=cU#5o8_pyr^?HhD?=xrddt#8rE(2wbL$$y>Bgd*Z~`fR8k
z^*LGpDeAZ6=v(y7&>HmrQP$s)^$%qIPN)gBqH?XvdL8QjqzN@H*h-fW;-tDk4AE&d
zg8GcCKZp7(ol`eUne8GXo>LDC_BMslS24={oS48$c0`-_p}HtJOX3jymwK1z70u!M
zL>u<NgQAyqh0lv^;xpkt5fkEz;b+7l@vQQkM1Dpj#XI4D5+_Bw_9|sWKkB6Tp!RLC
zC=O}Qh|^+0dqYaTDs%D*-6QVO-WF%YSGAvDZwHb60jeWY8K5T0E1#o3qNnL+v|Ah#
zH;Rn7O?*~7DV`VaiXVvJGOZ|Y1!_MT3p(nx^82MM?R1w9udaNe=w;qd10`Op%-a#X
zSngf#i#*CzlU8~mYkr7sHtk}@%FpbW**3FnAf3(9QI|uhY{na;se)}L)5UqybVjYz
zUNc)T?P}&!GFQl&lq;qzJDZuMsl}pW=IFreubC-_CPp*Gf>lh;LS!K2ST+PllTLDq
zRre=zCYzdBuuW&NU>0d1Z)MWifs~aSC@$m&icZoV0FS0etX#p$n|Wu%%FA!?xtUX?
zuAfpinV+NS$%U+wnKJF0GbwXC$>tX+cWQE~)Mwk4Wvy;oMo81OIatWS58#x$bI5{g
zWHOmg&LKZ@Rf5&pQnZT9<cp?V!zr51(PVbP<j%Nd=N7U_?jmO<9(~M0(l!qxHq+N#
zN9K9N%w~tuY1=FoDFtN5tmbfEB3vv|!-l6-YVI>hiCHb^jZDiKEf4y-m%@Z4GkN4^
zdLo}TPYtC~RhFdQzD&{a5FwrCCFHIk6S>M%lIoatE|ce^q^+{DyA+F9E#P2AGG-av
zqw>-&CFROHC0(W@k4wf0H}lC--t(i$MaoaY>v_t5#7x?hbc0Lo#e8KEiK|Tc5i7fp
z%TxZab&Jb#<xW+)v&S;dyle23<P;}{yuC7Tcp>j(a^?Up@=VsWy~TvNl8mH-eR$Z+
zCQr#;amYb}W)~2<r^sR$n$2W0&SGV>W_y?R8Bff>f|JS8F*AA7a1x0fJC!mEj9jx+
zW$LEf9_!9Rw7gMhD8I<#!;5Z0(VcOV=dS4e<}JgEGN;pAS0=i|tt6&;_Nzxr1H+34
ztzt&HH<5RCY$tDdVE3nz{+nNhH@$x$H*4BFmr18MwNNNzGraO@*leVhQ8Ru-#=Fl-
zC9~4eDJPjvC+)O5>T7$}Oy+@d(6(?+I*U{8mM)QQj)pBeZQA>I{b1qXOyn+>InYxk
zqRhL4$1-UwyaSlZD)I<#aTkCNXXfS|3A4{U;dX{C$FXv<d&DZpcA{8e!hR+VjyF~!
z%RnVY3D2cD4W+fl{k_Nn5^{|x6EtpHIgeABR_}0-=MfTDbFv_dw&U#>+2>s|mQQ=E
z+67Ub{OPLGs03ScuFYeA0)@fkqD#xk<@Lmp7TlNXI8`Vt%)7VPFpmDBV<!tVTkg4c
zM)|ra-xTtYoXC4~<TvvtY<KOJRQFj)o}}8TuMATb;}ttd;&q4j!Mv5uoXE%kv2I)n
zp-hjO#hV<fP&y6MRh#y(S;!_+rqn4B5Kq~e0$;eU>lgE<r*NXB=BqeGzQ>s7Z86ZE
zn#ZtRY6!b?deXG#T$?%Wab!GwNWZ(Ur{zj@neH*{bt{X69|XM1EjeV{IBeZp<Ny*T
zk2)+d?1f}@d?BBbG!kCGekjuvz~g<}ep<l0=`5LK(>PhEb9ioc@Tz+R?JVB1u`wh+
zEoG=<1Z@^S!x&G|O?VHsK(PchjnF)}b~SHpiFXWo8JYv-$d`yK;lTiY6GXdGkj>$_
z5C<gXW$Q?t0lYoq=D-*pf$)}xiG@W6(gmVR3mD7L&C*|!u7oUm<Vd@VctgbD3r-d_
zHO$CZa4$ihLc{#OUu(yqZA)7T$hcAQ*ky=*3N(9_N8DAT<!JU+N7Hps@{+U<+!NqT
zN_q|w$n)+A*jSl0EC`@4Nc<yGHxH?T)HBfsYNTv6!ttGwv%-F{ObV8ddGk^vsvD;r
z$iOx1d)*jqLw_&rhQHJB#gx97<@w|ow?Xb0{7VCM9{CxfE1)w1ltIKZUH12|^o+Gf
zWuB8nYlfgbSdotG_hyK_un|*+J=G7Pmz0q(y@=5v;ALbk*<JxZSvjM$=75)hIhPLe
zikn3{CM~(`Hm}`|b^`4V=pFI$lBkl~iS}BFM&S>8H1m;}@VM79z1yRAd-UZVjh0?X
zzxms5^!&x>{kJ{(Q|I2_3X}Hu$8I><w)4BUW4Q`NjcKK9XfJMg{EfxLt@j61qXEA<
ze%A&QWawP24JCxprl|?VXp5=gL;zH*!E0lYM2K5W)4~wwLYLcKw4sCoHk4yVFO*}(
zMnw{vS>OW@2quKkf?;7avY8<a>SG#w>x_nj#*neuXw%04B4Vl>ifQ2h*pexX$rw9y
zNYfalfvZ@EM69cmv62|mR3oFZHZ;Rw<50}F(J(b5*VU=0nxd+R@uZ?EDhXpzUt&pP
zQ7ZRpiJ&owfFyK%d$_^K8I#6IW5HNHjmQo`k$)70rMp51VENOsJ{=+@*4Y^d!(|G@
zP*|c3A;owk7OM*fV@8{?d<L@MYLRdVDbmM`jd)`-8bXj>{#{t@jMc-3<p*Lht;<-x
zPYWx?@>$UAkOD<Ta{j<r{-RWQOic*QSpKpko(**AV_^t(p~XOhzWj0~ydGvJ5y$eQ
z5I2^;W-LDqQCMF72Fr0|%P(;6|M*W6-rrAk^GB{DO8giu)%{k!d|e%xx2;=>{BHX8
zX!(tlVx_+m^DAS1%$X6(9?fPa@jl_cdzz+vgXMBzBPI6uDgA;LA-@Z^x_?1d!{<B?
z`tZ5%-;PZmC%U2PW5f*#e<?mnQ#6Bm3@7IlP0#__4|)RiIQm?^7W|L*N;uW!YOm!F
z5Y^u}xbSrIw~nN|r8Dx}oWKcp0_P-`4N|Lek7VWPl#%zBTOJ91Rmg8>;M?+En)5;W
zyp$O%|Lnvm%zxXq1s;jAyn7F)Bu=5mPJ%dRT9xckdHWQrWCn4QSAID*1M(B{reN8;
zytB)93hwu6gc+RsGdQLBcL29n*8P6~=^x*|b5eUmJ|Qeh54}5D`nFHnI^gj$o~@Fv
z`Tv#8oifgY@*Yp)uHz?<mC>$@^>V2*1c@RfbMii3glF%k_sjDCSoXO8pOo13euBR&
Izli030AypGjQ{`u

literal 0
HcwPel00001

diff --git a/testtools/util/makefile.pmk b/testtools/util/makefile.pmk
index b52727ab5..b380d74d1 100644
--- a/testtools/util/makefile.pmk
+++ b/testtools/util/makefile.pmk
@@ -31,7 +31,7 @@
 
 # no translation here anyway
 .IF "$(L10N_framework)"==""
-.IF "$(COM)" == "MSC"
+.IF "$(COM)" == "MSC" || "$(ENABLE_MONO)" == "YES"
 BUILD_FOR_CLI = "true"
 CFLAGSENABLESYMBOLS:=-Z7
 .ENDIF
diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx
index 0573296b9..df266de56 100644
--- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx
@@ -96,6 +96,7 @@
 #include <vcl/imgcons.hxx>
 #include <vcl/image.hxx>
 
+#include <com/sun/star/document/XVbaMethodParameter.hpp>  //liuchen 2009-6-22, add the support of input/output parameters to VBA Dialog_QueryClose event
 class Button;
 class CheckBox;
 class RadioButton;
@@ -391,6 +392,7 @@ public:
 //	class VCLXDialog
 //	----------------------------------------------------
 class VCLXDialog :	public ::com::sun::star::awt::XDialog,
+						public ::com::sun::star::document::XVbaMethodParameter, //liuchen 2009-6-22, add the support of input/output parameters to VBA UserForm_QueryClose event
                     public VCLXTopWindow
 {
 public:
@@ -424,6 +426,10 @@ public:
     // ::com::sun::star::awt::XVclWindowPeer
     void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
 
+	//liuchen 2009-6-23, support Excel VBA UserForm_QueryClose event
+	// ::com::sun::star::document::XVBAMethodParameter
+	void SAL_CALL setVbaMethodParameter( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
+	::com::sun::star::uno::Any SAL_CALL getVbaMethodParameter( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); 
 };
 
 //	----------------------------------------------------
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
index b031e13ae..046affe0e 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -93,7 +93,7 @@ private:
 
     AllGroups							maGroups;
     sal_Bool							mbGroupsUpToDate;
-        
+
 	::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
 	bool mbAdjustingGraphic;
 protected:	
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 55c70b2a0..2e0f5391e 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -691,7 +691,7 @@ public:
 	DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, UnoControlModel, szServiceName_UnoMultiPageModel )
 
 };
-//	----------------------------------------------------
+//  ----------------------------------------------------
 //	class UnoGroupBoxControl
 //	----------------------------------------------------
 class UnoMultiPageControl :	public UnoControlBase
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index c00b2bc28..812a2e94d 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -536,8 +536,8 @@ void VCLXMenu::setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Ref
 		    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pNewRef = new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > ;
             *pNewRef = new VCLXPopupMenu( (PopupMenu*)pMenu );
             aRef = *pNewRef;
-        }
     }
+	}
     return aRef;
 }
 
@@ -586,7 +586,7 @@ sal_Int16 VCLXMenu::execute( const ::com::sun::star::uno::Reference< ::com::sun:
 
     sal_Int16 nRet = 0;
     if ( mpMenu && IsPopupMenu() )
-        nRet = ((PopupMenu*)mpMenu)->Execute( VCLUnoHelper::GetWindow( rxWindowPeer ), VCLRectangle(rArea), nFlags );
+        nRet = ((PopupMenu*)mpMenu)->Execute( VCLUnoHelper::GetWindow( rxWindowPeer ), VCLRectangle(rArea), nFlags | POPUPMENU_NOMOUSEUPCLOSE );
     return nRet;
 }
 
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index a2ee68257..0e13a0198 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -1189,10 +1189,10 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const ::
 						aEvent.Source = (::cppu::OWeakObject*)this;
 						aEvent.ActionCommand = maActionCommand;
 						maActionListeners.actionPerformed( aEvent );
-					}
-					
                 }
+					
             }
+			}
             break;
             case BASEPROPERTY_AUTOTOGGLE:
             {
@@ -2225,12 +2225,14 @@ VCLXDialog::~VCLXDialog()
 ::com::sun::star::uno::Any VCLXDialog::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
+										SAL_STATIC_CAST( ::com::sun::star::document::XVbaMethodParameter*, this ), //liuchen 2009-6-23
                                         SAL_STATIC_CAST( ::com::sun::star::awt::XDialog*, this ) );
     return (aRet.hasValue() ? aRet : VCLXTopWindow::queryInterface( rType ));
 }
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXDialog )
+	getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::document::XVbaMethodParameter>* ) NULL ), //liuchen 2009-6-23
     getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDialog>* ) NULL ),
     VCLXTopWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
@@ -2318,6 +2320,40 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::s
     return aInfo;
 }
 
+//liuchen 2009-7-22
+// ::com::sun::star::document::XVbaMethodParameter
+void SAL_CALL VCLXDialog::setVbaMethodParameter(
+	const ::rtl::OUString& PropertyName,
+	const ::com::sun::star::uno::Any& Value )
+throw(::com::sun::star::uno::RuntimeException)
+{
+	if (rtl::OUString::createFromAscii( "Cancel" ) == PropertyName)
+	{
+		::vos::OGuard aGuard( GetMutex() ); 
+		if ( GetWindow() )
+		{
+			sal_Int8 nCancel;
+			Value >>= nCancel;
+
+			Dialog* pDlg = (Dialog*) GetWindow();
+			pDlg->SetCloseFlag(nCancel);
+		}
+	}
+}
+
+::com::sun::star::uno::Any SAL_CALL VCLXDialog::getVbaMethodParameter(
+	const ::rtl::OUString& PropertyName )
+throw(::com::sun::star::uno::RuntimeException)
+{
+	::vos::OGuard aGuard( GetMutex() );
+
+	::com::sun::star::uno::Any aRet;	
+	return aRet;
+}
+//liuchen 2009-7-22
+
+
+
 
 void SAL_CALL VCLXDialog::setProperty(
     const ::rtl::OUString& PropertyName,
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index b97790920..4d7a1b8b6 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -119,7 +119,7 @@ namespace
         }
         return s_aLanguageDependentProperties;
     }
- 
+
     static uno::Reference< graphic::XGraphic > lcl_getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
     {
         uno::Reference< graphic::XGraphic > xGraphic;
@@ -154,7 +154,7 @@ namespace
                 xPSI->hasPropertyByName( sProperty ) )
         {
             xSet->getPropertyValue( sProperty ) >>= sValue;
-        }
+}
         return sValue;
     }
 
@@ -1090,13 +1090,13 @@ void UnoControlDialogModel::implUpdateGroupStructure()
                 AddRadioButtonToGroup( *pControlModels, GROUP_NAME, aNamedGroups, aCurrentGroup );
 
 #if OSL_DEBUG_LEVEL > 1
-                Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
-                ::rtl::OUString sLabel;
-                if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
-                    xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
-                aCurrentGroupLabels.push_back( sLabel );
+                    Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
+                    ::rtl::OUString sLabel;
+                    if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
+                        xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+                    aCurrentGroupLabels.push_back( sLabel );
 #endif
-            }
+                }
             break;
         }
     }
@@ -2178,15 +2178,15 @@ throw (RuntimeException)
 		// Don't adjust GraphicObject url(s)
 		if ( url.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 )
 		{
-			INetURLObject urlObj(baseLocation);
-			urlObj.removeSegment();
-			baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE );
-			::osl::FileBase::getAbsoluteFileURL( baseLocation, url, ret );
-		}
+        INetURLObject urlObj(baseLocation);
+        urlObj.removeSegment();
+        baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE );
+        ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, ret );
+    }
 		else
 			ret = url;
 
-    }
+	}
 
     return ret;
 }
diff --git a/udkapi/com/sun/star/script/XAutomationInvocation.idl b/udkapi/com/sun/star/script/XAutomationInvocation.idl
new file mode 100644
index 000000000..9dcf61bab
--- /dev/null
+++ b/udkapi/com/sun/star/script/XAutomationInvocation.idl
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XInvocation2.idl,v $
+ * $Revision: 1.10 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_script_XAutomationInvocation_idl__ 
+#define __com_sun_star_script_XAutomationInvocation_idl__
+ 
+#ifndef __com_sun_star_script_XInvocation_idl__ 
+#include <com/sun/star/script/XInvocation.idl> 
+#endif 
+ 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+interface XAutomationInvocation: com::sun::star::script::XInvocation
+{ 
+    any invokeGetProperty(  [in] string aFunctionName, [in] sequence<any> aParams, [out] sequence<short> aOutParamIndex, [out] sequence<any> aOutParam ) raises( com::sun::star::lang::IllegalArgumentException, com::sun::star::script::CannotConvertException, com::sun::star::reflection::InvocationTargetException );
+    any invokePutProperty(  [in] string aFunctionName, [in] sequence<any> aParams, [out] sequence<short> aOutParamIndex, [out] sequence<any> aOutParam ) raises( com::sun::star::lang::IllegalArgumentException, com::sun::star::script::CannotConvertException, com::sun::star::reflection::InvocationTargetException );
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/makefile.mk b/udkapi/com/sun/star/script/makefile.mk
index 52a3214a4..8b8f53ac9 100644
--- a/udkapi/com/sun/star/script/makefile.mk
+++ b/udkapi/com/sun/star/script/makefile.mk
@@ -85,6 +85,7 @@ IDLFILES=\
     XScriptEventsAttacher.idl\
     XDefaultMethod.idl\
     XDefaultProperty.idl\
+	XAutomationInvocation.idl\
     ModuleInfo.idl\
     ModuleType.idl\
     XErrorQuery.idl\
diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt
index 867c3d411..4824a36ed 100644
--- a/unoil/climaker/version.txt
+++ b/unoil/climaker/version.txt
@@ -29,8 +29,8 @@
 #
 #*************************************************************************
 
-CLI_OOOTYPES_NEW_VERSION=1.0.3.0
-CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.2.0
-CLI_OOOTYPES_POLICY_VERSION=3.0.0.0	
+CLI_OOOTYPES_NEW_VERSION=1.0.4.0
+CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.3.0
+CLI_OOOTYPES_POLICY_VERSION=4.0.0.0	
 CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes
 
diff --git a/vbahelper/source/msforms/makefile.mk b/vbahelper/source/msforms/makefile.mk
index ad5e7b468..9bde7db3b 100644
--- a/vbahelper/source/msforms/makefile.mk
+++ b/vbahelper/source/msforms/makefile.mk
@@ -39,6 +39,8 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE :  settings.mk
 
+CDEFS+=-DVBA_OOBUILD_HACK
+
 SLOFILES=\
     $(SLO)$/vbacontrol.obj \
     $(SLO)$/vbacontrols.obj \
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 0989548e6..353a24f24 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -189,14 +189,17 @@ void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeE
 
 sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
 {
-    uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
-    return xWindow2->isVisible();
+    sal_Bool bVisible( sal_True );
+    m_xProps->getPropertyValue
+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) )) >>= bVisible;
+    return bVisible;
 }
 
 void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
 {
-    uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
-    xWindow2->setVisible( bVisible );
+    uno::Any aValue( bVisible );
+    m_xProps->setPropertyValue
+            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ), aValue);
 }
 double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException)
 {
@@ -397,13 +400,20 @@ ScVbaControl* ScVbaControlFactory::createControl(const uno::Reference< drawing::
     const static rtl::OUString sClassId( RTL_CONSTASCII_USTRINGPARAM("ClassId") );
     xProps->getPropertyValue( sClassId ) >>= nClassId;
     uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
-    switch( nClassId )
+    sal_Bool bToggle = sal_False;  //liuchen 2009-8-11,  
+	switch( nClassId )
     {
         case form::FormComponentType::COMBOBOX:
             return new ScVbaComboBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
         case form::FormComponentType::COMMANDBUTTON:
-            return new ScVbaButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
-        case form::FormComponentType::FIXEDTEXT:
+			//liuchen 2009-8-11
+			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toggle") ) ) >>= bToggle;
+			if ( bToggle )
+				return new ScVbaToggleButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
+			else
+				return new ScVbaButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
+			//liuchen 2009-8-11
+		case form::FormComponentType::FIXEDTEXT:
             return new ScVbaLabel( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
         case form::FormComponentType::TEXTFIELD:
             return new ScVbaTextBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
diff --git a/vbahelper/source/msforms/vbaframe.cxx b/vbahelper/source/msforms/vbaframe.cxx
index b2827d045..d765d9bb3 100644
--- a/vbahelper/source/msforms/vbaframe.cxx
+++ b/vbahelper/source/msforms/vbaframe.cxx
@@ -72,6 +72,17 @@ ScVbaFrame::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::Run
     _value >>= sCaption;
     setCaption( sCaption ); 
 }
+//liuchen 2009-7-6 
+::sal_Int32 SAL_CALL ScVbaFrame::getForeColor() throw (::com::sun::star::uno::RuntimeException)
+{
+	return 0;
+}
+
+void SAL_CALL ScVbaFrame::setForeColor( ::sal_Int32 /*_forecolor*/ ) throw (::com::sun::star::uno::RuntimeException)
+{
+	return;
+}
+//liuchen 2009-7-6 end
 
 rtl::OUString& 
 ScVbaFrame::getServiceImplName()
diff --git a/vbahelper/source/msforms/vbaframe.hxx b/vbahelper/source/msforms/vbaframe.hxx
index 071b5b09d..9b1b6bb5d 100644
--- a/vbahelper/source/msforms/vbaframe.hxx
+++ b/vbahelper/source/msforms/vbaframe.hxx
@@ -51,6 +51,10 @@ public:
     virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
     virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
+	//liuchen 2009-7-6 
+	virtual ::sal_Int32 SAL_CALL getForeColor() throw (::com::sun::star::uno::RuntimeException);
+	virtual void SAL_CALL setForeColor( ::sal_Int32 _forecolor ) throw (::com::sun::star::uno::RuntimeException);
+	//liuchen 2009-7-6 end
     //XHelperInterface
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/vbahelper/source/msforms/vbalabel.cxx b/vbahelper/source/msforms/vbalabel.cxx
index a5fa3c128..a9869f7cd 100644
--- a/vbahelper/source/msforms/vbalabel.cxx
+++ b/vbahelper/source/msforms/vbalabel.cxx
@@ -35,6 +35,7 @@ using namespace ooo::vba;
 
 
 const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
+const static rtl::OUString FORECOLOR( RTL_CONSTASCII_USTRINGPARAM("TextColor") ); //liuchen 2009-7-6
 ScVbaLabel::ScVbaLabel(  const css::uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : LabelImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
 {
 }
@@ -68,6 +69,20 @@ ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::Run
 }
 
 
+//liuchen 2009-7-6
+::sal_Int32 SAL_CALL ScVbaLabel::getForeColor() throw (::com::sun::star::uno::RuntimeException)
+{
+	sal_Int32 nForeColor;
+	m_xProps->getPropertyValue( FORECOLOR ) >>= nForeColor; 
+	return OORGBToXLRGB( nForeColor );
+}
+
+void SAL_CALL ScVbaLabel::setForeColor( ::sal_Int32 _forecolor ) throw (::com::sun::star::uno::RuntimeException)
+{	
+	 m_xProps->setPropertyValue( FORECOLOR, uno::makeAny( XLRGBToOORGB( _forecolor ) ) );
+}
+//liuchenn 2009-7-6
+
 rtl::OUString& 
 ScVbaLabel::getServiceImplName()
 {
diff --git a/vbahelper/source/msforms/vbalabel.hxx b/vbahelper/source/msforms/vbalabel.hxx
index 3afd65296..9c8766d0a 100644
--- a/vbahelper/source/msforms/vbalabel.hxx
+++ b/vbahelper/source/msforms/vbalabel.hxx
@@ -47,6 +47,10 @@ public:
     virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
     virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
+	//liuchen 2009-7-6 
+	virtual ::sal_Int32 SAL_CALL getForeColor() throw (::com::sun::star::uno::RuntimeException);
+	virtual void SAL_CALL setForeColor( ::sal_Int32 _forecolor ) throw (::com::sun::star::uno::RuntimeException);
+	//liuchen 2009-7-6 end
     //XHelperInterface
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx
index 47f9847ea..175328f10 100644
--- a/vbahelper/source/msforms/vbalistbox.cxx
+++ b/vbahelper/source/msforms/vbalistbox.cxx
@@ -113,7 +113,7 @@ ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
     uno::Sequence< sal_Int16 > nSelectedIndices(1);
     nSelectedIndices[ 0 ] = nValue;
     m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nSelectedIndices ) ); 
-    m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) ); 
+	//m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) );   //liuchen 2009-8-12 solve the problem that ListBox.Text and ListBox.Value cannot be set
 }
 
 ::rtl::OUString SAL_CALL 
@@ -130,20 +130,22 @@ ScVbaListBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeExcepti
 	setValue( uno::makeAny( _text ) ); // seems the same
 }
 
-sal_Bool SAL_CALL 
+sal_Int32 SAL_CALL 
 ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException)
 {
     sal_Bool bMultiSelect = sal_False;
     m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ) ) >>= bMultiSelect;
-    return bMultiSelect;
+    return bMultiSelect ? 1 : 0 ;
 }
 
 void SAL_CALL 
-ScVbaListBox::setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException)
+ScVbaListBox::setMultiSelect( sal_Int32 _multiselect ) throw (css::uno::RuntimeException)
 {
-    m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ), uno::makeAny( _multiselect ) );
+	sal_Bool bMultiSelect = _multiselect == 1 ? 1 : 0;
+    m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ), uno::makeAny( bMultiSelect ) );
 }
 
+
 css::uno::Any SAL_CALL 
 ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException)
 {
diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx
index 93e80a3c4..009ee4f5e 100644
--- a/vbahelper/source/msforms/vbalistbox.hxx
+++ b/vbahelper/source/msforms/vbalistbox.hxx
@@ -61,8 +61,8 @@ public:
 	virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
 	virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
 	virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL getMultiSelect() throw (css::uno::RuntimeException);
-    virtual void SAL_CALL setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getMultiSelect() throw (css::uno::RuntimeException);  //liuchen 2009-7-31
+    virtual void SAL_CALL setMultiSelect( ::sal_Int32 _multiselect ) throw (css::uno::RuntimeException); //liuchen 2009-7-31
     virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException);
 
 	// Methods
diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx
index d246970fa..eb1b393b1 100644
--- a/vbahelper/source/msforms/vbatextbox.cxx
+++ b/vbahelper/source/msforms/vbatextbox.cxx
@@ -93,7 +93,8 @@ ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException)
 void SAL_CALL 
 ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException)
 {
-    uno::Any aValue( _maxlength );
+	sal_Int16 _maxlength16 = static_cast<sal_Int16> (_maxlength); //liuchen 2009-7-24, resolve the problem that MaxLength cannot be set correctly
+    uno::Any aValue( _maxlength16 );                              //liuchen 2009-7-24, resolve the problem that MaxLength cannot be set correctly
     m_xProps->setPropertyValue
             (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ), aValue);
 }
diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx
index f938ad1cb..0d7cfaf2d 100644
--- a/vbahelper/source/msforms/vbatogglebutton.cxx
+++ b/vbahelper/source/msforms/vbatogglebutton.cxx
@@ -76,16 +76,33 @@ ScVbaToggleButton::getValue() throw (uno::RuntimeException)
  	return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) );
 }
 
+//liuchen 2009-7-23, resolve the defect that ToggleButton.Value cannot be set correctly
 void SAL_CALL 
 ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
 {
 	sal_Int16 nState = 0;
-	_value >>= nState;
+	if (_value.getValueTypeClass() == typelib_TypeClass_BOOLEAN)
+	{
+		sal_Bool bValue;
+		_value >>= bValue;
+		nState = static_cast< sal_Int16 >(bValue);
+	}
+	else if (_value.getValueTypeClass() == typelib_TypeClass_BYTE)
+	{
+		sal_Int8 nValue;
+		_value >>= nValue;
+		nState = ( nValue == 1) ? 1 : 0;
+	}
+	else
+	{
+		_value >>= nState;
         OSL_TRACE( "nState - %d", nState );
-	nState = ( nState == -1 ) ?  1 : 0;
+		nState = ( nState == -1 ) ?  1 : 0;
         OSL_TRACE( "nState - %d", nState );
+	}
 	m_xProps->setPropertyValue( STATE, uno::makeAny(  nState ) );
 }
+//liuchen 2009-7-23
 
 rtl::OUString& 
 ScVbaToggleButton::getServiceImplName()
diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx
index 26da50068..8ed276644 100644
--- a/vbahelper/source/vbahelper/vbafontbase.cxx
+++ b/vbahelper/source/vbahelper/vbafontbase.cxx
@@ -246,7 +246,7 @@ VbaFontBase::setColor( const uno::Any& _color  ) throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-VbaFontBase::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException )
+VbaFontBase::setUnderline( const uno::Any& /*aValue*/ ) throw ( uno::RuntimeException )
 {
 /*
 	// default
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index 110d15ff1..901cc7178 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -856,7 +856,7 @@ double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double
 	return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR;
 }
 
-ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape )
+ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& /*xContext*/, const css::uno::Reference< css::drawing::XShape >& xShape )
 {
     m_pShapeHelper.reset( new ShapeHelper( xShape ) );
 }
@@ -901,7 +901,6 @@ void setCursorHelper( const uno::Reference< frame::XModel >& xModel, const Point
     }
     else
     {
-        const uno::Reference< frame::XModel > xModel( xModel2, uno::UNO_QUERY );
         if ( xModel.is() )
         {
             const uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx
index 2663682b8..3f4793aef 100644
--- a/vbahelper/source/vbahelper/vbapictureformat.cxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.cxx
@@ -115,13 +115,14 @@ ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeExc
 {
     double nContrast = getContrast();
     nContrast += increment;
-    if( increment < 0 )
+	//VBA, minz@cn.ibm.com.
+    if( nContrast < 0 )
     {
-        increment = 0.0;
+        nContrast = 0.0;
     }
-    if( increment > 1 )
+    if( nContrast > 1 )
     {
-        increment = 1.0;
+        nContrast = 1.0;
     }
     setContrast( nContrast );
 }
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index ee5cf9146..5302f927e 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -373,7 +373,7 @@ ScVbaShapes::AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _n
 }
 
 uno::Any
-ScVbaShapes::AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
+ScVbaShapes::AddTextboxInWriter( sal_Int32 /*_nOrientation*/, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
 {
     rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.TextShape" ) );
     sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( _nLeft );
diff --git a/vcl/aqua/inc/salframe.h b/vcl/aqua/inc/salframe.h
index d5adef404..5eb6f431d 100644
--- a/vcl/aqua/inc/salframe.h
+++ b/vcl/aqua/inc/salframe.h
@@ -44,6 +44,8 @@
 #include <utility>
 #include <stdexcept>
 
+#include <boost/shared_ptr.hpp>
+
 class AquaSalGraphics;
 class AquaSalFrame;
 class AquaSalTimer;
@@ -60,47 +62,49 @@ typedef struct SalFrame::SalPointerState SalPointerState;
 class AquaSalFrame : public SalFrame
 {
 public:
-    NSWindow*               mpWindow;               // Cocoa window
-    NSView*                 mpView;				    // Cocoa view (actually a custom view, see below
-    NSMenuItem*             mpDockMenuEntry;        // entry in the dynamic dock menu
-    NSRect                  maScreenRect;           // for mirroring purposes
-    AquaSalGraphics*		mpGraphics; 			// current frame graphics
-    AquaSalFrame*			mpParent;				// pointer to parent frame
-     SystemEnvData			maSysData;				// system data
-    int                     mnMinWidth;             // min. client width in pixels
-    int                     mnMinHeight;            // min. client height in pixels
-    int                     mnMaxWidth;             // max. client width in pixels
-    int                     mnMaxHeight;            // max. client height in pixels
-    NSRect                  maFullScreenRect;       // old window size when in FullScreen
-    bool					mbGraphics:1; 			// is Graphics used?
-    bool                    mbFullScreen:1;         // is Window in FullScreen?
-    bool                    mbShown:1;
-    bool                    mbInitShow:1;
-    bool                    mbPositioned:1;
-    bool                    mbSized:1;
-    bool                    mbPresentation:1;
-    
-    ULONG                   mnStyle;
-    unsigned int            mnStyleMask;            // our style mask from NSWindow creation
-    
-    ULONG                   mnLastEventTime;
-    unsigned int            mnLastModifierFlags;
-    AquaSalMenu*            mpMenu;
-    
-    SalExtStyle             mnExtStyle;             // currently document frames are marked this way
-    
-    PointerStyle            mePointerStyle;         // currently active pointer style
-    
-    NSTrackingRectTag       mnTrackingRectTag;      // used to get enter/leave messages
-
-    CGMutablePathRef        mrClippingPath;         // used for "shaping"
-    std::vector< CGRect >   maClippingRects;
-    
-    std::list<AquaBlinker*> maBlinkers;
-    
-    Rectangle               maInvalidRect;
-    
-    ULONG                   mnICOptions;
+    NSWindow*                       mpWindow;               // Cocoa window
+    NSView*                         mpView;				    // Cocoa view (actually a custom view, see below
+    NSMenuItem*                     mpDockMenuEntry;        // entry in the dynamic dock menu
+    NSRect                          maScreenRect;           // for mirroring purposes
+    AquaSalGraphics*		        mpGraphics; 			// current frame graphics
+    AquaSalFrame*			        mpParent;				// pointer to parent frame
+     SystemEnvData			        maSysData;				// system data
+    int                             mnMinWidth;             // min. client width in pixels
+    int                             mnMinHeight;            // min. client height in pixels
+    int                             mnMaxWidth;             // max. client width in pixels
+    int                             mnMaxHeight;            // max. client height in pixels
+    NSRect                          maFullScreenRect;       // old window size when in FullScreen
+    bool					        mbGraphics:1; 			// is Graphics used?
+    bool                            mbFullScreen:1;         // is Window in FullScreen?
+    bool                            mbShown:1;
+    bool                            mbInitShow:1;
+    bool                            mbPositioned:1;
+    bool                            mbSized:1;
+    bool                            mbPresentation:1;
+    
+    ULONG                           mnStyle;
+    unsigned int                    mnStyleMask;            // our style mask from NSWindow creation
+    
+    ULONG                           mnLastEventTime;
+    unsigned int                    mnLastModifierFlags;
+    AquaSalMenu*                    mpMenu;
+    
+    SalExtStyle                     mnExtStyle;             // currently document frames are marked this way
+    
+    PointerStyle                    mePointerStyle;         // currently active pointer style
+    
+    NSTrackingRectTag               mnTrackingRectTag;      // used to get enter/leave messages
+
+    CGMutablePathRef                mrClippingPath;         // used for "shaping"
+    std::vector< CGRect >           maClippingRects;
+    
+    std::list<AquaBlinker*>         maBlinkers;
+    
+    Rectangle                       maInvalidRect;
+    
+    ULONG                           mnICOptions;
+    
+    boost::shared_ptr< Timer >      mpActivityTimer; // Timer to prevent system sleep during presentation
 public:
     /** Constructor
 
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 887973a96..82fb00508 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -814,6 +814,18 @@ bool AquaSalInstance::AnyInput( USHORT nType )
         if( nType == INPUT_APPEVENT )
             return false;
     }
+    
+    if( nType & INPUT_TIMER )
+    {
+        if( AquaSalTimer::pRunningTimer )
+        {
+            NSDate* pDt = [AquaSalTimer::pRunningTimer fireDate];
+            if( pDt && [pDt timeIntervalSinceNow] < 0 )
+            {
+                return true;
+            }
+        }
+    }
         
     unsigned/*NSUInteger*/ nEventMask = 0;
     if( nType & INPUT_MOUSE)
@@ -828,7 +840,7 @@ bool AquaSalInstance::AnyInput( USHORT nType )
         nEventMask |= NSKeyDownMask | NSKeyUpMask | NSFlagsChangedMask;
     if( nType & INPUT_OTHER)
         nEventMask |= NSTabletPoint;
-    // TODO: INPUT_PAINT / INPUT_TIMER / more INPUT_OTHER
+    // TODO: INPUT_PAINT / more INPUT_OTHER
     if( !nType)
         return false;
 
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index df5cb1ac8..d42389e9a 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -221,16 +221,26 @@ bool AquaSalBitmap::CreateContext()
     {
         // convert user data to 32 bit
         nContextBytesPerRow = mnWidth << 2;
-        maContextBuffer.reset( new sal_uInt8[ mnHeight * nContextBytesPerRow ] );
+        try
+        {
+            maContextBuffer.reset( new sal_uInt8[ mnHeight * nContextBytesPerRow ] );
 
-        if( !bSkipConversion )
-            ConvertBitmapData( mnWidth, mnHeight,
-                           32, nContextBytesPerRow, maPalette, maContextBuffer.get(),
-                           mnBits, mnBytesPerRow, maPalette, maUserBuffer.get() );		
+            if( !bSkipConversion )
+                ConvertBitmapData( mnWidth, mnHeight,
+                               32, nContextBytesPerRow, maPalette, maContextBuffer.get(),
+                               mnBits, mnBytesPerRow, maPalette, maUserBuffer.get() );
+        }
+        catch( std::bad_alloc )
+        {
+            mxGraphicContext = 0;
+        }
     }
 
-    mxGraphicContext = ::CGBitmapContextCreate( maContextBuffer.get(), mnWidth, mnHeight,
-        bitsPerComponent, nContextBytesPerRow, aCGColorSpace, aCGBmpInfo );
+    if( maContextBuffer.get() )
+    {
+        mxGraphicContext = ::CGBitmapContextCreate( maContextBuffer.get(), mnWidth, mnHeight,
+            bitsPerComponent, nContextBytesPerRow, aCGColorSpace, aCGBmpInfo );
+    }
 
     if( !mxGraphicContext )
         maContextBuffer.reset();
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 7b503a07e..ff635ffd8 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -43,6 +43,7 @@
 #include "aqua11yfactory.h"
 #include "vcl/salwtype.hxx"
 #include "vcl/window.hxx"
+#include "vcl/timer.hxx"
 
 #include "premac.h"
 // needed for theming
@@ -749,16 +750,37 @@ void AquaSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay )
 
 // -----------------------------------------------------------------------
 
+class PreventSleepTimer : public AutoTimer
+{
+public:
+    PreventSleepTimer()
+    {
+        SetTimeout( 30000 );
+        Start();
+    }
+    
+    virtual ~PreventSleepTimer()
+    {
+    }
+    
+    virtual void Timeout()
+    {
+        UpdateSystemActivity(OverallAct);
+    }
+};
+
 void AquaSalFrame::StartPresentation( BOOL bStart )
 {
     if( bStart )
     {
+        mpActivityTimer.reset( new PreventSleepTimer() );
         [mpWindow setLevel: NSScreenSaverWindowLevel];
         if( mbShown )
             [mpWindow makeMainWindow];
     }
     else
     {
+        mpActivityTimer.reset();
         [mpWindow setLevel: NSNormalWindowLevel];
     }
 }
@@ -1173,6 +1195,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
     Color aMenuTextColor( getColor( [NSColor textColor],
                                     aStyleSettings.GetMenuTextColor(), mpWindow ) );
     aStyleSettings.SetMenuTextColor( aMenuTextColor );
+    aStyleSettings.SetMenuBarTextColor( aMenuTextColor );
 
     aStyleSettings.SetCursorBlinkTime( 500 );
     
diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx
index 82287c5a1..1381e557c 100644
--- a/vcl/inc/vcl/bitmapex.hxx
+++ b/vcl/inc/vcl/bitmapex.hxx
@@ -385,6 +385,7 @@ public:
 
     friend VCL_DLLPUBLIC SvStream&	operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx );
     friend VCL_DLLPUBLIC SvStream&	operator>>( SvStream& rIStm, BitmapEx& rBitmapEx );
+	static BitmapEx AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize);
 };
 
 #endif // _SV_BITMAPEX_HXX
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 4ff3a7241..1f841f15c 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -56,6 +56,7 @@ private:
     BOOL			mbOldSaveBack;
     BOOL			mbInClose;
     BOOL			mbModalMode;
+	sal_Int8		mnCancelClose;  //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event
 
     SAL_DLLPRIVATE void    ImplInitDialogData();
     SAL_DLLPRIVATE void    ImplInitSettings();
@@ -93,6 +94,9 @@ public:
     virtual short	Execute();
     BOOL			IsInExecute() const { return mbInExecute; }
 
+	sal_Int8		GetCloseFlag() const { return mnCancelClose; }  //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event
+	void			SetCloseFlag( sal_Int8 nCancel ) { mnCancelClose = nCancel; }  //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event
+
     ////////////////////////////////////////
     // Dialog::Execute replacement API
 public:
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index 4f8ad3a55..106080c31 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -93,6 +93,8 @@ typedef USHORT MenuItemBits;
 #define MIB_POPUPSELECT 		((MenuItemBits)0x0020)
 // not in rsc/vclsrc.hxx because only a prelimitary solution
 #define MIB_NOSELECT 		    ((MenuItemBits)0x0040)
+#define MIB_ICON 		    ((MenuItemBits)0x0080)
+#define MIB_TEXT 		    ((MenuItemBits)0x0100)
 
 #define MENU_FLAG_NOAUTOMNEMONICS		0x0001
 #define MENU_FLAG_HIDEDISABLEDENTRIES	0x0002
diff --git a/vcl/inc/vcl/popupmenuwindow.hxx b/vcl/inc/vcl/popupmenuwindow.hxx
new file mode 100644
index 000000000..ef31da059
--- /dev/null
+++ b/vcl/inc/vcl/popupmenuwindow.hxx
@@ -0,0 +1,50 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: floatwin.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __POPUPMENUWINDOW_HXX__
+#define __POPUPMENUWINDOW_HXX__
+
+#include "vcl/floatwin.hxx"
+
+class VCL_DLLPUBLIC PopupMenuFloatingWindow : public FloatingWindow
+{
+private:
+    struct ImplData;
+    ImplData* mpImplData;
+public:
+    PopupMenuFloatingWindow( Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) );
+    ~PopupMenuFloatingWindow();
+
+    sal_uInt16      GetMenuStackLevel() const;
+    void            SetMenuStackLevel( sal_uInt16 nLevel );
+    bool            IsPopupMenu() const;
+};
+
+#endif
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 2ff401d05..d0ca6c5de 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -379,6 +379,7 @@ private:
     Color                           maMenuHighlightColor;
     Color                           maMenuHighlightTextColor;
     Color                           maMenuTextColor;
+    Color                           maMenuBarTextColor;
     Color                           maMonoColor;
     Color                           maRadioCheckTextColor;
     Color                           maShadowColor;
@@ -690,6 +691,10 @@ public:
                                         { CopyData(); mpData->maMenuTextColor = rColor; }
     const Color&                    GetMenuTextColor() const
                                         { return mpData->maMenuTextColor; }
+    void                            SetMenuBarTextColor( const Color& rColor )
+                                        { CopyData(); mpData->maMenuBarTextColor = rColor; }
+    const Color&                    GetMenuBarTextColor() const
+                                        { return mpData->maMenuBarTextColor; }
     void                            SetMenuHighlightColor( const Color& rColor )
                                         { CopyData(); mpData->maMenuHighlightColor = rColor; }
     const Color&                    GetMenuHighlightColor() const
diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx
index 105f9da47..b2b27f0ca 100644
--- a/vcl/inc/vcl/toolbox.hxx
+++ b/vcl/inc/vcl/toolbox.hxx
@@ -124,6 +124,9 @@ typedef USHORT ToolBoxItemBits;
 #define TIB_DROPDOWN            ((ToolBoxItemBits)0x0020)
 #define TIB_REPEAT              ((ToolBoxItemBits)0x0040)
 #define TIB_DROPDOWNONLY        ((ToolBoxItemBits)0x0080 | TIB_DROPDOWN)    // this button has only drop down functionality
+#define TIB_TEXT_ONLY           ((ToolBoxItemBits)0x0100)
+#define TIB_ICON_ONLY           ((ToolBoxItemBits)0x0200)
+#define TIB_TEXTICON            ((ToolBoxItemBits) TIB_TEXT_ONLY | TIB_ICON_ONLY )
 
 // -----------------
 // - ToolBox-Types -
diff --git a/vcl/inc/vcl/vclevent.hxx b/vcl/inc/vcl/vclevent.hxx
index 8d8466697..59163caa0 100644
--- a/vcl/inc/vcl/vclevent.hxx
+++ b/vcl/inc/vcl/vclevent.hxx
@@ -35,11 +35,19 @@
 #include <tools/rtti.hxx>
 #include <vcl/dllapi.h>
 
+#include <com/sun/star/uno/Reference.hxx>
+
 #include <list>
 
 class Window;
 class Menu;
 
+namespace com { namespace sun { namespace star {
+    namespace accessibility {
+        class XAccessible;
+    }
+}}}
+
 #define VCLEVENT_OBJECT_DYING                  1
 
 // VclWindowEvent:
@@ -239,6 +247,16 @@ public:
     USHORT GetItemPos() const { return mnPos; }
 };
 
+class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent
+{
+public:
+    VclAccessibleEvent( ULONG n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible );
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const;
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible;
+};
+
 class VCL_DLLPUBLIC VclEventListeners : public std::list<Link>
 {
 public:
diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h
index b81aed80d..0e2533017 100644
--- a/vcl/inc/vcl/window.h
+++ b/vcl/inc/vcl/window.h
@@ -358,7 +358,8 @@ public:
                         mbToolbarFloatingWindow:1,
                         mbCallHandlersDuringInputDisabled:1,
                         mbDisableAccessibleLabelForRelation:1,
-                        mbDisableAccessibleLabeledByRelation:1;
+                        mbDisableAccessibleLabeledByRelation:1,
+                        mbFakeFocusSet:1;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
 };
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index eef2b3906..8d66909a1 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -582,7 +582,7 @@ protected:
 
             void        ImplCallEventListeners( ULONG nEvent, void* pData = NULL );
             void        CallEventListeners( ULONG nEvent, void* pData = NULL );
-
+            void        FireVclEvent( VclSimpleEvent* pEvent );
 
     // FIXME: this is a hack to workaround missing layout functionality
     SAL_DLLPRIVATE void ImplAdjustNWFSizes();
@@ -899,6 +899,13 @@ public:
     USHORT              GetGetFocusFlags() const;
     void				GrabFocusToDocument();
 
+    /** 
+     * Set this when you need to act as if the window has focus even if it 
+     * doesn't.  This is necessary for implementing tab stops inside floating
+     * windows, but floating windows don't get focus from the system.
+     */
+    void                SetFakeFocus( bool bFocus );
+
     BOOL                IsCompoundControl() const;
     BOOL                HasCompoundControlFocus() const;
 
diff --git a/vcl/os2/source/window/salframe.cxx b/vcl/os2/source/window/salframe.cxx
index d7cf24a8c..31e063d09 100644
--- a/vcl/os2/source/window/salframe.cxx
+++ b/vcl/os2/source/window/salframe.cxx
@@ -2172,6 +2172,7 @@ void Os2SalFrame::UpdateSettings( AllSettings& rSettings )
         aStyleSettings.SetDeactiveBorderColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_INACTIVEBORDER, 0 ) ) );
         aStyleSettings.SetMenuColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENU, 0 ) ) );
         aStyleSettings.SetMenuTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENUTEXT, 0 ) ) );
+        aStyleSettings.SetMenuBarTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENUTEXT, 0 ) ) );
     }
     aStyleSettings.SetDialogTextColor( aStyleSettings.GetButtonTextColor() );
     aStyleSettings.SetRadioCheckTextColor( aStyleSettings.GetButtonTextColor() );
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index c4779edd7..a37e6a891 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -14,7 +14,7 @@ vc	vcl\os2\source\app						nmake	-	p	vc__appp vc_inc NULL
 vc	vcl\os2\source\gdi						nmake	-	p	vc__gdip vc_inc NULL
 vc	vcl\os2\source\window					nmake	-	p	vc__winp vc_inc NULL
 vc	vcl\os2\source\src						nmake	-	p	vc__srcp vc_inc NULL
-vc  vcl\source\components					nmake	-	all	vc_components NULL
+vc  vcl\source\components					nmake	-	all	vc_components vc_inc NULL
 vc	vcl\win\source\app						nmake	-	w	vc__appw vc_inc NULL
 vc	vcl\win\source\gdi						nmake	-	w	vc__gdiw vc_inc NULL
 vc	vcl\win\source\window					nmake	-	w	vc__winw vc_inc NULL
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index d9c14f46b..7ac2c74c9 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -84,6 +84,7 @@ mkdir: %_DEST%\inc%_EXT%\vcl\plug\vcl
 ..\inc\vcl\octree.hxx %_DEST%\inc%_EXT%\vcl\octree.hxx
 ..\inc\vcl\outdev.hxx %_DEST%\inc%_EXT%\vcl\outdev.hxx
 ..\inc\vcl\pointr.hxx %_DEST%\inc%_EXT%\vcl\pointr.hxx
+..\inc\vcl\popupmenuwindow.hxx %_DEST%\inc%_EXT%\vcl\popupmenuwindow.hxx
 ..\inc\vcl\print.hxx %_DEST%\inc%_EXT%\vcl\print.hxx
 ..\inc\vcl\prndlg.hxx %_DEST%\inc%_EXT%\vcl\prndlg.hxx
 ..\inc\vcl\prntypes.hxx %_DEST%\inc%_EXT%\vcl\prntypes.hxx
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 2b445c824..7cc0913a4 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -478,6 +478,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
     maMenuHighlightColor( rData.maMenuHighlightColor ),
     maMenuHighlightTextColor( rData.maMenuHighlightTextColor ),
     maMenuTextColor( rData.maMenuTextColor ),
+    maMenuBarTextColor( rData.maMenuBarTextColor ),
     maMonoColor( rData.maMonoColor ),
     maRadioCheckTextColor( rData.maRadioCheckTextColor ),
     maShadowColor( rData.maShadowColor ),
@@ -597,6 +598,7 @@ void ImplStyleData::SetStandardStyles()
     maMenuBarColor              = Color( COL_LIGHTGRAY );
     maMenuBorderColor           = Color( COL_LIGHTGRAY );
     maMenuTextColor             = Color( COL_BLACK );
+    maMenuBarTextColor          = Color( COL_BLACK );
     maMenuHighlightColor        = Color( COL_BLUE );
     maMenuHighlightTextColor    = Color( COL_WHITE );
     maHighlightColor            = Color( COL_BLUE );
@@ -1042,6 +1044,7 @@ BOOL StyleSettings::operator ==( const StyleSettings& rSet ) const
          (mpData->maMenuBarColor            == rSet.mpData->maMenuBarColor)             &&
          (mpData->maMenuBorderColor         == rSet.mpData->maMenuBorderColor)          &&
          (mpData->maMenuTextColor           == rSet.mpData->maMenuTextColor)            &&
+         (mpData->maMenuBarTextColor        == rSet.mpData->maMenuBarTextColor)         &&
          (mpData->maMenuHighlightColor      == rSet.mpData->maMenuHighlightColor)       &&
          (mpData->maMenuHighlightTextColor  == rSet.mpData->maMenuHighlightTextColor)   &&
          (mpData->maHighlightColor          == rSet.mpData->maHighlightColor)           &&
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index 75ef1ea1c..fef22ff7f 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -34,10 +34,24 @@
 #include "vcl/vclevent.hxx"
 #include "vcl/svdata.hxx"
 
+#include <com/sun/star/accessibility/XAccessible.hpp>
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::accessibility::XAccessible;
+
 TYPEINIT0(VclSimpleEvent);
 TYPEINIT1(VclWindowEvent, VclSimpleEvent);
 TYPEINIT1(VclMenuEvent, VclSimpleEvent);
 
+VclAccessibleEvent::VclAccessibleEvent( ULONG n, const Reference<XAccessible>& rxAccessible ) :
+    VclSimpleEvent(n),
+    mxAccessible(rxAccessible) {}
+
+Reference<XAccessible> VclAccessibleEvent::GetAccessible() const
+{
+    return mxAccessible;
+}
+
 void VclEventListeners::Call( VclSimpleEvent* pEvent ) const
 {
     // Copy the list, because this can be destroyed when calling a Link...
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 59caccf09..a3003a731 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -471,8 +471,11 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void*, EMPTYARG )
         mbSyntheticModify = TRUE;
         Modify();
         mbSyntheticModify = FALSE;
+		if (ImplGetWindowImpl() != NULL) //liuchen 2009-7-28, resolve the problem that soffice get crashed if in ComboBox_Change event a Worksheets("SheetX").Activate sentence needs to be executed 
+		{
         Select();
     }
+	}
 
     return 0;
 }
@@ -800,14 +803,8 @@ void ComboBox::DataChanged( const DataChangedEvent& rDCEvt )
 
 long ComboBox::PreNotify( NotifyEvent& rNEvt )
 {
-    long nDone = 0;
-
-    if( ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) && ( rNEvt.GetWindow() == mpImplLB->GetMainWindow() ) )
-    {
-        mpSubEdit->GrabFocus();
-    }
 
-    return nDone ? nDone : Edit::PreNotify( rNEvt );
+    return Edit::PreNotify( rNEvt );
 }
 
 // -----------------------------------------------------------------------
@@ -886,6 +883,10 @@ long ComboBox::Notify( NotifyEvent& rNEvt )
             nDone = 0;  // don't eat this event, let the default handling happen (i.e. scroll the context)
         }
     }
+    else if( ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) && ( rNEvt.GetWindow() == mpImplLB->GetMainWindow() ) )
+    {
+        mpSubEdit->GrabFocus();
+    }
 
     return nDone ? nDone : Edit::Notify( rNEvt );
 }
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 1af5b195a..aaae40fbf 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -47,6 +47,7 @@
 #include <tools/rc.h>
 #endif
 #include <vcl/svapp.hxx>
+#include <vcl/virdev.hxx>
 
 // ------------
 // - BitmapEx -
@@ -759,6 +760,61 @@ void BitmapEx::Draw( OutputDevice* pOutDev,
     pOutDev->DrawBitmapEx( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, *this );
 }
 
+BitmapEx BitmapEx:: AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize)
+{
+	Point aEmptyPoint(0,0);
+	sal_Int32 imgNewWidth = 0;
+	sal_Int32 imgNewHeight = 0;
+	double imgposX = 0;
+	double imgposY = 0;
+    BitmapEx  aRet = aBitmap;
+	double imgOldWidth = aRet.GetSizePixel().Width();
+	double imgOldHeight =aRet.GetSizePixel().Height();
+
+    Size aScaledSize;
+    if (imgOldWidth >= aStandardSize || imgOldHeight >= aStandardSize)
+	{
+		if (imgOldWidth >= imgOldHeight)
+		{
+			imgNewWidth = aStandardSize;
+			imgNewHeight = sal_Int32(imgOldHeight / (imgOldWidth / aStandardSize) + 0.5);
+			imgposX = 0;
+			imgposY = (aStandardSize - (imgOldHeight / (imgOldWidth / aStandardSize) + 0.5)) / 2 + 0.5;
+		}
+		else
+		{
+			imgNewHeight = aStandardSize;
+			imgNewWidth = sal_Int32(imgOldWidth / (imgOldHeight / aStandardSize) + 0.5);
+			imgposY = 0;
+			imgposX = (aStandardSize - (imgOldWidth / (imgOldHeight / aStandardSize) + 0.5)) / 2 + 0.5;
+		}
+
+		aScaledSize = Size( imgNewWidth, imgNewHeight );
+        aRet.Scale( aScaledSize, BMP_SCALE_INTERPOLATE );
+	}
+	else
+	{
+		imgposX = (aStandardSize - imgOldWidth) / 2 + 0.5;
+		imgposY = (aStandardSize - imgOldHeight) / 2 + 0.5;
+	}
+
+    Size aBmpSize = aRet.GetSizePixel();
+    Size aStdSize( aStandardSize, aStandardSize );
+    Rectangle aRect(aEmptyPoint, aStdSize );
+
+    VirtualDevice aVirDevice( *Application::GetDefaultDevice(), 0, 1 );
+	aVirDevice.SetOutputSizePixel( aStdSize );
+	aVirDevice.SetFillColor( COL_TRANSPARENT );
+    aVirDevice.SetLineColor( COL_TRANSPARENT );
+
+    //draw a rect into virDevice
+	aVirDevice.DrawRect( aRect );
+	Point aPointPixel( (long)imgposX, (long)imgposY );
+	aVirDevice.DrawBitmapEx( aPointPixel, aRet );
+	aRet = aVirDevice.GetBitmapEx( aEmptyPoint, aStdSize );
+
+	return aRet;
+}
 // ------------------------------------------------------------------
 
 SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx )
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index e88ae2d33..d1136fd50 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -6,8 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outdev3.cxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -4498,71 +4496,78 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
                                           FontStrikeout eStrikeout,
                                           Color aColor )
 {
-    BOOL bOldMap = IsMapModeEnabled();
-    EnableMapMode( FALSE );
-
-    Color aOldColor = GetTextColor();
-    SetTextColor( aColor );
-    ImplInitTextColor();
+    // PDF-export does its own strikeout drawing... why again?
+    if( mpPDFWriter && mpPDFWriter->isBuiltinFont(mpFontEntry->maFontSelData.mpFontData) )
+        return;
 
-    xub_Unicode pChars[5];
+    // prepare string for strikeout measurement
+    static char cStrikeoutChar;
     if ( eStrikeout == STRIKEOUT_SLASH )
-        pChars[0] = '/';
+        cStrikeoutChar = '/';
     else // ( eStrikeout == STRIKEOUT_X )
-        pChars[0] = 'X';
-    pChars[3]=pChars[2]=pChars[1]=pChars[0];
+        cStrikeoutChar = 'X';
+    static const int nTestStrLen = 4;
+    static const int nMaxStrikeStrLen = 2048;
+    xub_Unicode aChars[ nMaxStrikeStrLen +1]; // +1 for valgrind...
+    for( int i = 0; i < nTestStrLen; ++i)
+        aChars[i] = cStrikeoutChar;
+    const String aStrikeoutTest( aChars, nTestStrLen );
 
     // calculate approximation of strikeout atom size
     long nStrikeoutWidth = nWidth;
-    String aStrikeoutTest( pChars, 4 );
-    SalLayout* pLayout = ImplLayout( aStrikeoutTest, 0, 4 );
-    if ( pLayout )
+    SalLayout* pLayout = ImplLayout( aStrikeoutTest, 0, nTestStrLen );
+    if( pLayout )
     {
-        nStrikeoutWidth = (pLayout->GetTextWidth() + 2) / 4;
+        nStrikeoutWidth = (pLayout->GetTextWidth() +nTestStrLen/2) / (nTestStrLen * pLayout->GetUnitsPerPixel());        
         pLayout->Release();
-        if ( nStrikeoutWidth <= 0 ) // sanity check
-            nStrikeoutWidth = 1;
     }
+    if( nStrikeoutWidth <= 0 ) // sanity check
+        return;
 
     // calculate acceptable strikeout length
     // allow the strikeout to be one pixel larger than the text it strikes out
-    long nMaxWidth = nStrikeoutWidth/2;
+    long nMaxWidth = nStrikeoutWidth / 2;
     if ( nMaxWidth < 2 )
         nMaxWidth = 2;
     nMaxWidth += nWidth + 1;
 
-    // build strikeout string
-    long nFullStrikeoutWidth = 0;
-    String aStrikeoutText( pChars, 0 );
-    while ( (nFullStrikeoutWidth+=nStrikeoutWidth) < nMaxWidth+1 )
-        aStrikeoutText += pChars[0];
-
+    int nStrikeStrLen = (nMaxWidth + nStrikeoutWidth - 1) / nStrikeoutWidth;
     // if the text width is smaller than the strikeout text, then do not
     // strike out at all. This case requires user interaction, e.g. adding
     // a space to the text
-    if ( (aStrikeoutText.Len() > 0)
-    && !(mpPDFWriter && mpPDFWriter->isBuiltinFont(mpFontEntry->maFontSelData.mpFontData) ) )
-    {
-        if ( mpFontEntry->mnOrientation )
-            ImplRotatePos( nBaseX, nBaseY, nX, nY, mpFontEntry->mnOrientation );
+    if( nStrikeStrLen <= 0 )
+        return;
+    if( nStrikeStrLen > nMaxStrikeStrLen )
+        nStrikeStrLen = nMaxStrikeStrLen;
 
-        // strikeout text has to be left aligned
-        ULONG nOrigTLM = mnTextLayoutMode;
-        mnTextLayoutMode = TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_COMPLEX_DISABLED;
-        SalLayout* pSalLayout = ImplLayout( aStrikeoutText, 0, STRING_LEN );
-        mnTextLayoutMode = nOrigTLM;
+    // build the strikeout string
+    for( int i = nTestStrLen; i < nStrikeStrLen; ++i)
+        aChars[i] = cStrikeoutChar;
+    const String aStrikeoutText( aChars, xub_StrLen(nStrikeStrLen) );
 
-        if ( pSalLayout )
-        {
-            pSalLayout->DrawBase() = Point( nX+mnTextOffX, nY+mnTextOffY );
-            pSalLayout->DrawText( *mpGraphics );
-            pSalLayout->Release();
-        }
-    }
+    if( mpFontEntry->mnOrientation )
+        ImplRotatePos( nBaseX, nBaseY, nX, nY, mpFontEntry->mnOrientation );
+
+    // strikeout text has to be left aligned
+    ULONG nOrigTLM = mnTextLayoutMode;
+    mnTextLayoutMode = TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_COMPLEX_DISABLED;
+    pLayout = ImplLayout( aStrikeoutText, 0, STRING_LEN );
+    mnTextLayoutMode = nOrigTLM;
+
+    if( !pLayout )
+        return;
+
+    // draw the strikeout text
+    const Color aOldColor = GetTextColor();
+    SetTextColor( aColor );
+    ImplInitTextColor();
+
+    pLayout->DrawBase() = Point( nX+mnTextOffX, nY+mnTextOffY );
+    pLayout->DrawText( *mpGraphics );
+    pLayout->Release();
 
     SetTextColor( aOldColor );
     ImplInitTextColor();
-    EnableMapMode( bOldMap );
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index cbfc64a16..d2f01b947 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -805,7 +805,7 @@ class Matrix3
 {
     double f[6];
 
-    void set( double *pn ) { for( int i = 0 ; i < 5; i++ ) f[i] = pn[i]; }
+    void set( double *pn ) { for( int i = 0 ; i < 6; i++ ) f[i] = pn[i]; }
 public:
     Matrix3();
     ~Matrix3() {}
@@ -6787,14 +6787,15 @@ void PDFWriterImpl::drawHorizontalGlyphs(
         for( sal_uInt32 nPos = nBeginRun+1; nPos < aRunEnds[nRun]; nPos++ )
         {
             appendHex( rGlyphs[nPos].m_nMappedGlyphId, aUnkernedLine );
-            // check if glyph advance matches with the width of the previous glyph, else adjust
+            // check if default glyph positioning is sufficient
             const Point aThisPos = aMat.transform( rGlyphs[nPos].m_aPos );
             const Point aPrevPos = aMat.transform( rGlyphs[nPos-1].m_aPos );
             double fAdvance = aThisPos.X() - aPrevPos.X();
-            fAdvance *= 1000.0 / (fXScale * nPixelFontHeight);
-            const sal_Int32 nAdjustment = rGlyphs[nPos-1].m_nNativeWidth - sal_Int32(fAdvance+0.5);
+            fAdvance *= 1000.0 / nPixelFontHeight;
+            const sal_Int32 nAdjustment = (sal_Int32)(rGlyphs[nPos-1].m_nNativeWidth - fAdvance + 0.5);
             if( nAdjustment != 0 )
             {
+                // apply individual glyph positioning
                 bNeedKern = true;
                 aKernedLine.append( ">" );
                 aKernedLine.append( nAdjustment );
@@ -8643,6 +8644,8 @@ void PDFWriterImpl::drawPolyLine( const Polygon& rPoly, const PDFWriter::ExtLine
 
                 for(sal_uInt32 a(0); a < nEdgeCount; a++)
                 {
+                    if( a > 0 )
+                        aLine.append( " " );
                     const sal_uInt32 nNextIndex((a + 1) % nPointCount);
                     const basegfx::B2DPoint aNext(aPoly.getB2DPoint(nNextIndex));
 
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index c0702a72b..cb71e0c3d 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -550,7 +550,14 @@ BOOL Dialog::Close()
 {
     ImplDelData aDelData;
     ImplAddDel( &aDelData );
+	//liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event
+	mnCancelClose = 0;
     ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE );
+	if (mnCancelClose == 1)
+	{
+		return FALSE;
+	}
+	//liuchen 2009-7-22
     if ( aDelData.IsDelete() )
         return FALSE;
     ImplRemoveDel( &aDelData );
diff --git a/vcl/source/window/makefile.mk b/vcl/source/window/makefile.mk
index 169cf44b2..75e910704 100644
--- a/vcl/source/window/makefile.mk
+++ b/vcl/source/window/makefile.mk
@@ -69,6 +69,7 @@ SLOFILES= \
             $(SLO)$/mnemonic.obj	\
             $(SLO)$/mnemonicengine.obj  \
             $(SLO)$/msgbox.obj		\
+			$(SLO)$/popupmenuwindow.obj		\
             $(SLO)$/scrwnd.obj		\
             $(SLO)$/seleng.obj		\
             $(SLO)$/split.obj		\
@@ -96,10 +97,10 @@ SLOFILES= \
 
 $(INCCOM)$/cuilib.hxx: makefile.mk
 .IF "$(GUI)"=="UNX"
-    @$(RM) $@
-    @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
+    $(RM) $@
+    echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
 .ELSE
-    @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
+    echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
 .ENDIF
 
 $(SLO)$/abstdlg.obj : $(INCCOM)$/cuilib.hxx
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index a03bca9cb..1fe5c5f59 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2738,7 +2738,14 @@ void Menu::ImplPaint( Window* pWin, USHORT nBorder, long nStartY, MenuItemData*
                 }
 
                 if ( pThisItemOnly && bHighlighted )
-                    pWin->SetTextColor( rSettings.GetMenuTextColor() );
+                {
+                    // This restores the normal menu or menu bar text
+                    // color for when it is no longer highlighted.
+            if ( bIsMenuBar )
+                pWin->SetTextColor( rSettings.GetMenuBarTextColor() );
+            else
+                pWin->SetTextColor( rSettings.GetMenuTextColor() );
+         }
             }
             if( bLayout )
             {
@@ -3794,7 +3801,10 @@ static void ImplInitMenuWindow( Window* pWin, BOOL bFont, BOOL bMenuBar )
             pWin->SetBackground( Wallpaper( rStyleSettings.GetMenuColor() ) );
     }
 
-    pWin->SetTextColor( rStyleSettings.GetMenuTextColor() );
+    if ( bMenuBar )
+        pWin->SetTextColor( rStyleSettings.GetMenuBarTextColor() );
+    else
+        pWin->SetTextColor( rStyleSettings.GetMenuTextColor() );
     pWin->SetTextFillColor();
     pWin->SetLineColor();
 }
diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx
new file mode 100644
index 000000000..869f52bb9
--- /dev/null
+++ b/vcl/source/window/popupmenuwindow.cxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: floatwin.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_vcl.hxx"
+
+#include "vcl/popupmenuwindow.hxx"
+
+#include <limits>
+
+struct PopupMenuFloatingWindow::ImplData
+{
+    sal_uInt16      mnMenuStackLevel;  // Store the stack level of a popup menu.  0 = top-level menu.
+
+    ImplData();
+    ~ImplData();
+};
+
+PopupMenuFloatingWindow::ImplData::ImplData() :
+    mnMenuStackLevel( ::std::numeric_limits<sal_uInt16>::max() )
+{
+}
+
+PopupMenuFloatingWindow::ImplData::~ImplData()
+{
+}
+
+// ============================================================================
+
+PopupMenuFloatingWindow::PopupMenuFloatingWindow( Window* pParent, WinBits nStyle ) :
+    FloatingWindow(pParent, nStyle),
+    mpImplData(new ImplData)
+{
+}
+
+PopupMenuFloatingWindow::~PopupMenuFloatingWindow()
+{
+    delete mpImplData;
+}
+
+sal_uInt16 PopupMenuFloatingWindow::GetMenuStackLevel() const
+{
+    return mpImplData->mnMenuStackLevel;
+}
+
+void PopupMenuFloatingWindow::SetMenuStackLevel( sal_uInt16 nLevel )
+{
+    mpImplData->mnMenuStackLevel = nLevel;
+}
+
+bool PopupMenuFloatingWindow::IsPopupMenu() const
+{
+    return mpImplData->mnMenuStackLevel != ::std::numeric_limits<sal_uInt16>::max();
+}
+
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 920816b60..904a78e6e 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -229,6 +229,22 @@ int ToolBox::ImplGetDragWidth( ToolBox* pThis )
     }
     return width;
 }
+
+ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType )
+{
+    ButtonType tmpButtonType = defaultType;
+    ToolBoxItemBits nBits( pItem->mnBits & 0x300 );
+    if ( nBits & TIB_TEXTICON ) // item has custom setting
+    {
+        tmpButtonType = BUTTON_SYMBOLTEXT; 
+        if ( nBits == TIB_TEXT_ONLY )
+            tmpButtonType = BUTTON_TEXT; 
+        else if ( nBits == TIB_ICON_ONLY )
+            tmpButtonType = BUTTON_SYMBOL; 
+    }
+    return tmpButtonType;
+}
+
 // -----------------------------------------------------------------------
 
 void ToolBox::ImplUpdateDragArea( ToolBox *pThis )
@@ -1901,37 +1917,78 @@ BOOL ToolBox::ImplCalcItem()
     nDefWidth       = GetDefaultImageSize().Width();
     nDefHeight      = GetDefaultImageSize().Height();
 
+    mnWinHeight = 0;
     // determine minimum size necessary in NWF
-    if( IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) )
     {
         Rectangle aRect( Point( 0, 0 ), Size( nMinWidth, nMinHeight ) );
-        Region aArrowReg = aRect;
+        Region aReg = aRect;
         ImplControlValue aVal;
         Region aNativeBounds, aNativeContent;
-        if( GetNativeControlRegion( CTRL_TOOLBAR, PART_BUTTON,
-                                    aArrowReg,
+        if( IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) )
+        {
+            if( GetNativeControlRegion( CTRL_TOOLBAR, PART_BUTTON,
+                                        aReg,
+                                        CTRL_STATE_ENABLED | CTRL_STATE_ROLLOVER,
+                                        aVal, OUString(),
+                                        aNativeBounds, aNativeContent ) )
+            {
+                aRect = aNativeBounds.GetBoundRect();
+                if( aRect.GetWidth() > nMinWidth )
+                    nMinWidth = aRect.GetWidth();
+                if( aRect.GetHeight() > nMinHeight )
+                    nMinHeight = aRect.GetHeight();
+                if( nDropDownArrowWidth < nMinWidth )
+                    nDropDownArrowWidth = nMinWidth;
+                if( nMinWidth > mpData->mnMenuButtonWidth )
+                    mpData->mnMenuButtonWidth = nMinWidth;
+                else if( nMinWidth < TB_MENUBUTTON_SIZE )
+                    mpData->mnMenuButtonWidth = TB_MENUBUTTON_SIZE;
+            }
+        }
+        
+        // also calculate the area for comboboxes, drop down list boxes and spinfields
+        // as these are often inserted into toolboxes; set mnWinHeight to the
+        // greater of those values to prevent toolbar flickering (#i103385#)
+        aRect = Rectangle( Point( 0, 0 ), Size( nMinWidth, nMinHeight ) );
+        aReg = aRect;
+        if( GetNativeControlRegion( CTRL_COMBOBOX, PART_ENTIRE_CONTROL,
+                                    aReg,
                                     CTRL_STATE_ENABLED | CTRL_STATE_ROLLOVER,
                                     aVal, OUString(),
                                     aNativeBounds, aNativeContent ) )
         {
             aRect = aNativeBounds.GetBoundRect();
-            if( aRect.GetWidth() > nMinWidth )
-                nMinWidth = aRect.GetWidth();
-            if( aRect.GetHeight() > nMinHeight )
-                nMinHeight = aRect.GetHeight();
-            if( nDropDownArrowWidth < nMinWidth )
-                nDropDownArrowWidth = nMinWidth;
-            if( nMinWidth > mpData->mnMenuButtonWidth )
-                mpData->mnMenuButtonWidth = nMinWidth;
-            else if( nMinWidth < TB_MENUBUTTON_SIZE )
-                mpData->mnMenuButtonWidth = TB_MENUBUTTON_SIZE;
+            if( aRect.GetHeight() > mnWinHeight )
+                mnWinHeight = aRect.GetHeight();
         }
-    }
+        aRect = Rectangle( Point( 0, 0 ), Size( nMinWidth, nMinHeight ) );
+        aReg = aRect;
+        if( GetNativeControlRegion( CTRL_LISTBOX, PART_ENTIRE_CONTROL,
+                                    aReg,
+                                    CTRL_STATE_ENABLED | CTRL_STATE_ROLLOVER,
+                                    aVal, OUString(),
+                                    aNativeBounds, aNativeContent ) )
+        {
+            aRect = aNativeBounds.GetBoundRect();
+            if( aRect.GetHeight() > mnWinHeight )
+                mnWinHeight = aRect.GetHeight();
+        }
+        aRect = Rectangle( Point( 0, 0 ), Size( nMinWidth, nMinHeight ) );
+        aReg = aRect;
+        if( GetNativeControlRegion( CTRL_SPINBOX, PART_ENTIRE_CONTROL,
+                                    aReg,
+                                    CTRL_STATE_ENABLED | CTRL_STATE_ROLLOVER,
+                                    aVal, OUString(),
+                                    aNativeBounds, aNativeContent ) )
+        {
+            aRect = aNativeBounds.GetBoundRect();
+            if( aRect.GetHeight() > mnWinHeight )
+                mnWinHeight = aRect.GetHeight();
+        }
+    }    
     
     if ( ! mpData->m_aItems.empty() )
     {        
-        mnWinHeight = 0;
-
         std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin();
         while ( it != mpData->m_aItems.end() )
         {
@@ -1951,12 +2008,13 @@ BOOL ToolBox::ImplCalcItem()
                     bText = FALSE;
                 else
                     bText = TRUE;
-
+                ButtonType tmpButtonType = determineButtonType( &(*it), meButtonType ); // default to toolbox setting 
                 if ( bImage || bText )
                 {
+
                     it->mbEmptyBtn = FALSE;
 
-                    if ( meButtonType == BUTTON_SYMBOL )
+                    if ( tmpButtonType == BUTTON_SYMBOL )
                     {
                         // we're drawing images only
                         if ( bImage || !bText )
@@ -1970,7 +2028,7 @@ BOOL ToolBox::ImplCalcItem()
                             it->mbVisibleText = TRUE;
                         }
                     }
-                    else if ( meButtonType == BUTTON_TEXT )
+                    else if ( tmpButtonType == BUTTON_TEXT )
                     {
                         // we're drawing text only
                         if ( bText || !bImage )
@@ -3584,7 +3642,8 @@ void ToolBox::ImplDrawItem( USHORT nPos, BOOL bHighlight, BOOL bPaint, BOOL bLay
     // determine what has to be drawn on the button: image, text or both
     BOOL bImage;
     BOOL bText;
-    pItem->DetermineButtonDrawStyle( meButtonType, bImage, bText );
+    ButtonType tmpButtonType = determineButtonType( pItem, meButtonType ); // default to toolbox setting 
+    pItem->DetermineButtonDrawStyle( tmpButtonType, bImage, bText );
 
     // compute output values
     long    nBtnWidth = aBtnSize.Width()-SMALLBUTTON_HSIZE;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 16d4b42b0..31e061d5f 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -59,6 +59,8 @@ using namespace rtl;
 
 #define TB_SEP_SIZE 			8
 
+ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType );
+
 // -----------------------------------------------------------------------
 
 ImplToolBoxPrivateData::ImplToolBoxPrivateData() :
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d1d369197..12f6e93b1 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -690,6 +690,7 @@ void Window::ImplInitWindowData( WindowType nType )
     mpWindowImpl->mbCallHandlersDuringInputDisabled = FALSE; // TRUE: call event handlers even if input is disabled
     mpWindowImpl->mbDisableAccessibleLabelForRelation = FALSE; // TRUE: do not set LabelFor relation on accessible objects
     mpWindowImpl->mbDisableAccessibleLabeledByRelation = FALSE; // TRUE: do not set LabeledBy relation on accessible objects
+    mpWindowImpl->mbFakeFocusSet = FALSE; // TRUE: pretend as if the window has focus.
 
     mbEnableRTL         = Application::GetSettings().GetLayoutRTL();         // TRUE: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
 }
@@ -3899,6 +3900,20 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
     }
 }
 
+static bool IsWindowFocused(const WindowImpl& rWinImpl)
+{
+    if (rWinImpl.mpSysObj)
+        return true;
+
+    if (rWinImpl.mpFrameData->mbHasFocus)
+        return true;
+
+    if (rWinImpl.mbFakeFocusSet)
+        return true;
+
+    return false;
+}
+
 // -----------------------------------------------------------------------
 void Window::ImplGrabFocus( USHORT nFlags )
 {
@@ -3970,9 +3985,7 @@ void Window::ImplGrabFocus( USHORT nFlags )
         pFrame = pFrame->mpWindowImpl->mpFrameData->mpNextFrame;
     }
 
-    BOOL bHasFocus = TRUE;
-        if ( !mpWindowImpl->mpSysObj && !mpWindowImpl->mpFrameData->mbHasFocus )
-            bHasFocus = FALSE;
+    bool bHasFocus = IsWindowFocused(*mpWindowImpl);
 
     BOOL bMustNotGrabFocus = FALSE;
     // #100242#, check parent hierarchy if some floater prohibits grab focus
@@ -5375,6 +5388,11 @@ void Window::CallEventListeners( ULONG nEvent, void* pData )
     }
 }
 
+void Window::FireVclEvent( VclSimpleEvent* pEvent )
+{
+    ImplGetSVData()->mpApp->ImplCallEventListeners(pEvent);
+}
+
 // -----------------------------------------------------------------------
 
 void Window::AddEventListener( const Link& rEventListener )
@@ -7759,6 +7777,11 @@ void Window::GrabFocusToDocument()
     }
 }
 
+void Window::SetFakeFocus( bool bFocus )
+{
+    ImplGetWindowImpl()->mbFakeFocusSet = bFocus;
+}
+
 // -----------------------------------------------------------------------
 
 BOOL Window::HasChildPathFocus( BOOL bSystemWindow ) const
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 259a63085..efeb79c3e 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -660,7 +660,16 @@ long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
             static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
  */
     case VCLEVENT_MENU_HIGHLIGHT:
-        handle_menu_highlighted(static_cast< ::VclMenuEvent const * >(pEvent));
+        if (const VclMenuEvent* pMenuEvent = dynamic_cast<const VclMenuEvent*>(pEvent))
+        {
+            handle_menu_highlighted(pMenuEvent);
+        }
+        else if (const VclAccessibleEvent* pAccEvent = dynamic_cast<const VclAccessibleEvent*>(pEvent))
+        {
+            uno::Reference< accessibility::XAccessible > xAccessible = pAccEvent->GetAccessible();
+            if (xAccessible.is())
+                atk_wrapper_focus_tracker_notify_when_idle(xAccessible);
+        }
         break;
 
     case VCLEVENT_TOOLBOX_HIGHLIGHT:
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index e98a8091e..23ba24c22 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -33,6 +33,7 @@
  
 #include <plugins/gtk/gtkframe.hxx>
 #include <vcl/window.hxx>
+#include "vcl/popupmenuwindow.hxx"
 
 #include "atkwindow.hxx"
 #include "atkwrapper.hxx"
@@ -108,6 +109,17 @@ init_from_window( AtkObject *accessible, Window *pWindow )
                     pChild->SetAccessibleRole( AccessibleRole::LABEL );
                     accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
                 }
+                else if ( pWindow->GetType() == WINDOW_BORDERWINDOW && pChild->GetType() == WINDOW_FLOATINGWINDOW )
+                {
+                    PopupMenuFloatingWindow* p = dynamic_cast<PopupMenuFloatingWindow*>(pChild);
+                    if (p && p->IsPopupMenu() && p->GetMenuStackLevel() == 0)
+                    {
+                        // This is a top-level menu popup.  Register it.
+                        role = ATK_ROLE_POPUP_MENU;
+                        pChild->SetAccessibleRole( AccessibleRole::POPUP_MENU );
+                        accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
+                    }
+                }
             }
             break;
         }
@@ -136,6 +148,23 @@ ooo_window_wrapper_real_focus_gtk (GtkWidget *, GdkEventFocus *)
                                           
 /*****************************************************************************/
 
+static bool
+isChildPopupMenu(Window* pWindow)
+{
+    Window* pChild = pWindow->GetAccessibleChildWindow(0);
+    if (!pChild)
+        return false;
+
+    if (WINDOW_FLOATINGWINDOW != pChild->GetType())
+        return false;
+
+    PopupMenuFloatingWindow* p = dynamic_cast<PopupMenuFloatingWindow*>(pChild);
+    if (!p)
+        return false;
+
+    return p->IsPopupMenu();
+}
+
 static void
 ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data)
 {
@@ -157,8 +186,16 @@ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data)
              */
             if( WINDOW_BORDERWINDOW == pWindow->GetType() )
             {
-                ooo_wrapper_registry_add( xAccessible, obj );
-                g_object_set_data( G_OBJECT(obj), "ooo:atk-wrapper-key", xAccessible.get() );
+                if ( isChildPopupMenu(pWindow) )
+                {
+                    AtkObject *child = atk_object_wrapper_new( xAccessible, obj );
+                    ooo_wrapper_registry_add( xAccessible, child );
+                }
+                else
+                {
+                    ooo_wrapper_registry_add( xAccessible, obj );
+                    g_object_set_data( G_OBJECT(obj), "ooo:atk-wrapper-key", xAccessible.get() );
+                }
             }
             else
             {
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 599f2834d..ac508bdf8 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -514,6 +514,60 @@ wrapper_ref_relation_set( AtkObject *atk_obj )
 
 /*****************************************************************************/
 
+#if 0
+struct {
+    sal_Int16       value;
+    const sal_Char* name;
+} aStateTypeTable[] = {
+    { accessibility::AccessibleStateType::INVALID, "INVALID" }, 
+    { accessibility::AccessibleStateType::ACTIVE, "ACTIVE" }, 
+    { accessibility::AccessibleStateType::ARMED, "ARMED" }, 
+    { accessibility::AccessibleStateType::BUSY, "BUSY" }, 
+    { accessibility::AccessibleStateType::CHECKED, "CHECKED" }, 
+    { accessibility::AccessibleStateType::DEFUNC, "DEFUNC" }, 
+    { accessibility::AccessibleStateType::EDITABLE, "EDITABLE" }, 
+    { accessibility::AccessibleStateType::ENABLED, "ENABLED" }, 
+    { accessibility::AccessibleStateType::EXPANDABLE, "EXPANDABLE" }, 
+    { accessibility::AccessibleStateType::EXPANDED, "EXPANDED" }, 
+    { accessibility::AccessibleStateType::FOCUSABLE, "FOCUSABLE" }, 
+    { accessibility::AccessibleStateType::FOCUSED, "FOCUSED" }, 
+    { accessibility::AccessibleStateType::HORIZONTAL, "HORIZONTAL" }, 
+    { accessibility::AccessibleStateType::ICONIFIED, "ICONIFIED" }, 
+    { accessibility::AccessibleStateType::INDETERMINATE, "INDETERMINATE" }, 
+    { accessibility::AccessibleStateType::MANAGES_DESCENDANTS, "MANAGES_DESCENDANTS" }, 
+    { accessibility::AccessibleStateType::MODAL, "MODAL" }, 
+    { accessibility::AccessibleStateType::MULTI_LINE, "MULTI_LINE" }, 
+    { accessibility::AccessibleStateType::MULTI_SELECTABLE, "MULTI_SELECTABLE" }, 
+    { accessibility::AccessibleStateType::OPAQUE, "OPAQUE" }, 
+    { accessibility::AccessibleStateType::PRESSED, "PRESSED" }, 
+    { accessibility::AccessibleStateType::RESIZABLE, "RESIZABLE" }, 
+    { accessibility::AccessibleStateType::SELECTABLE, "SELECTABLE" }, 
+    { accessibility::AccessibleStateType::SELECTED, "SELECTED" }, 
+    { accessibility::AccessibleStateType::SENSITIVE, "SENSITIVE" }, 
+    { accessibility::AccessibleStateType::SHOWING, "SHOWING" }, 
+    { accessibility::AccessibleStateType::SINGLE_LINE, "SINGLE_LINE" }, 
+    { accessibility::AccessibleStateType::STALE, "STALE" }, 
+    { accessibility::AccessibleStateType::TRANSIENT, "TRANSIENT" }, 
+    { accessibility::AccessibleStateType::VERTICAL, "VERTICAL" }, 
+    { accessibility::AccessibleStateType::VISIBLE, "VISIBLE" }
+};
+
+static void printStates(const uno::Sequence<sal_Int16>& rStates)
+{
+    sal_Int32 n = rStates.getLength();
+    size_t nTypes = sizeof(aStateTypeTable)/sizeof(aStateTypeTable[0]);
+    for (sal_Int32 i = 0; i < n; ++i)
+    {
+        for (size_t j = 0; j < nTypes; ++j)
+        {
+            if (aStateTypeTable[j].value == rStates[i])
+                printf("%s ", aStateTypeTable[j].name);
+        }
+    }
+    printf("\n");
+}
+#endif
+
 static AtkStateSet *
 wrapper_ref_state_set( AtkObject *atk_obj )
 {
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 0bb298d7d..bad1e03c8 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3291,11 +3291,37 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     aBackColor = getColor( pMenubarStyle->bg[GTK_STATE_NORMAL] );
     aStyleSet.SetMenuBarColor( aBackColor );
     aBackColor = getColor( pMenuStyle->bg[GTK_STATE_NORMAL] );
-    aTextColor = getColor( pMenuTextStyle->fg[GTK_STATE_NORMAL] );
-    if( aBackColor == aTextColor )
-        aTextColor = (aBackColor.GetLuminance() < 128) ? Color( COL_WHITE ) : Color( COL_BLACK );
+    aTextColor = getColor( pMenuTextStyle->text[GTK_STATE_NORMAL] );
     aStyleSet.SetMenuColor( aBackColor );
     aStyleSet.SetMenuTextColor( aTextColor );
+
+    aTextColor = getColor( pMenubarStyle->text[GTK_STATE_NORMAL] );
+    aStyleSet.SetMenuBarTextColor( aTextColor );
+    
+#if OSL_DEBUG_LEVEL > 1
+    std::fprintf( stderr, "==\n" );
+    std::fprintf( stderr, "MenuColor = %x (%d)\n", (int)aStyleSet.GetMenuColor().GetColor(), aStyleSet.GetMenuColor().GetLuminance() );
+    std::fprintf( stderr, "MenuTextColor = %x (%d)\n", (int)aStyleSet.GetMenuTextColor().GetColor(), aStyleSet.GetMenuTextColor().GetLuminance() );
+    std::fprintf( stderr, "MenuBarColor = %x (%d)\n", (int)aStyleSet.GetMenuBarColor().GetColor(), aStyleSet.GetMenuBarColor().GetLuminance() );
+    std::fprintf( stderr, "MenuBarTextColor = %x (%d)\n", (int)aStyleSet.GetMenuBarTextColor().GetColor(), aStyleSet.GetMenuBarTextColor().GetLuminance() );
+    std::fprintf( stderr, "LightColor = %x (%d)\n", (int)aStyleSet.GetLightColor().GetColor(), aStyleSet.GetLightColor().GetLuminance() );
+    std::fprintf( stderr, "ShadowColor = %x (%d)\n", (int)aStyleSet.GetShadowColor().GetColor(), aStyleSet.GetShadowColor().GetLuminance() );
+#endif
+
+    // Awful hack for menu separators in the Sonar and similar themes.
+    // If the menu color is not too dark, and the menu text color is lighter,
+    // make the "light" color lighter than the menu color and the "shadow"
+    // color darker than it.
+    if ( aStyleSet.GetMenuColor().GetLuminance() >= 32 &&
+     aStyleSet.GetMenuColor().GetLuminance() <= aStyleSet.GetMenuTextColor().GetLuminance() )
+    {
+      Color temp = aStyleSet.GetMenuColor();
+      temp.IncreaseLuminance( 8 );
+      aStyleSet.SetLightColor( temp );
+      temp = aStyleSet.GetMenuColor();
+      temp.DecreaseLuminance( 16 );
+      aStyleSet.SetShadowColor( temp );
+    }
     
     aHighlightColor = getColor( pMenuItemStyle->bg[ GTK_STATE_SELECTED ] );
     aHighlightTextColor = getColor( pMenuTextStyle->fg[ GTK_STATE_PRELIGHT ] );
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index b3e0d3e28..253c66bbf 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1996,6 +1996,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         }
         
         aStyleSettings.SetMenuTextColor( aMenuFore );
+        aStyleSettings.SetMenuBarTextColor( aMenuFore );
         aStyleSettings.SetMenuColor( aMenuBack );
         aStyleSettings.SetMenuBarColor( aMenuBack );
 
diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx
index 971eae666..f0338b6df 100644
--- a/vcl/unx/kde4/KDEData.cxx
+++ b/vcl/unx/kde4/KDEData.cxx
@@ -45,6 +45,8 @@ void KDEData::initNWF()
     
     // draw toolbars on separate lines
     pSVData->maNWFData.mbDockingAreaSeparateTB = true;
+    // no borders for menu, theming does that
+    pSVData->maNWFData.mbFlatMenu = true;
 }
 
 void KDEData::deInitNWF()
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index d22051dec..33f4ab5b6 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -318,6 +318,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         aMenuBack = toColor( qMenuCG.color( QPalette::Button ) );
         
         style.SetMenuTextColor( aMenuFore );
+        style.SetMenuBarTextColor( aMenuFore );
         style.SetMenuColor( aMenuBack );
         style.SetMenuBarColor( aMenuBack );
 
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 9611526cb..2df4cdee7 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -35,6 +35,8 @@
 #include <QStyle>
 #include <QStyleOption>
 #include <QPainter>
+#include <QFrame>
+#include <QLabel>
 
 #include <kapplication.h>
 
@@ -42,10 +44,9 @@
 
 #include "KDESalGraphics.hxx"
 
-#include <vcl/settings.hxx>
-#include <rtl/ustrbuf.hxx>
-
-#include <stdio.h>
+#include "vcl/settings.hxx"
+#include "vcl/decoview.hxx"
+#include "rtl/ustrbuf.hxx"
 
 using namespace ::rtl;
 
@@ -150,6 +151,30 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType, ControlPart,
     return FALSE;
 }
 
+void lcl_drawFrame( QRect& i_rRect, QPainter& i_rPainter, QStyle::PrimitiveElement i_nElement,
+                    ControlState i_nState, const ImplControlValue& i_rValue )
+{
+    #if ( QT_VERSION >= QT_VERSION_CHECK( 4, 5, 0 ) )
+    QStyleOptionFrameV3 styleOption;
+    styleOption.frameShape = QFrame::StyledPanel;		
+    #else
+    QStyleOptionFrame styleOption;
+    QFrame aFrame( NULL );
+    aFrame.setFrameRect( QRect(0, 0, i_rRect.width(), i_rRect.height()) );
+    aFrame.setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
+    aFrame.ensurePolished();
+    styleOption.initFrom( &aFrame );
+    styleOption.lineWidth = aFrame.lineWidth();
+    styleOption.midLineWidth = aFrame.midLineWidth();
+    #endif
+    styleOption.rect = QRect(0, 0, i_rRect.width(), i_rRect.height());
+    styleOption.state = vclStateValue2StateFlag( i_nState, i_rValue );
+    #if ( QT_VERSION < QT_VERSION_CHECK( 4, 5, 0 ) )
+    styleOption.state |= QStyle::State_Sunken;
+    #endif
+    kapp->style()->drawPrimitive(i_nElement, &styleOption, &i_rPainter);
+}
+
 BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
                                         const Region& rControlRegion, ControlState nControlState,
                                         const ImplControlValue& value, SalControlHandle&,
@@ -352,18 +377,25 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
     }
     else if (type == CTRL_LISTBOX)
     {
-        QStyleOptionComboBox styleOption;
-        
-        styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height());
-        styleOption.state = vclStateValue2StateFlag( nControlState, value );
-        
-        if (part == PART_SUB_EDIT)
+        if( part == PART_WINDOW )
         {
-            kapp->style()->drawControl(QStyle::CE_ComboBoxLabel, &styleOption, &painter);
+            lcl_drawFrame( widgetRect, painter, QStyle::PE_Frame, nControlState, value );
         }
         else
         {
-            kapp->style()->drawComplexControl(QStyle::CC_ComboBox, &styleOption, &painter);
+            QStyleOptionComboBox styleOption;
+            
+            styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height());
+            styleOption.state = vclStateValue2StateFlag( nControlState, value );
+            
+            if (part == PART_SUB_EDIT)
+            {
+                kapp->style()->drawControl(QStyle::CE_ComboBoxLabel, &styleOption, &painter);
+            }
+            else
+            {
+                kapp->style()->drawComplexControl(QStyle::CC_ComboBox, &styleOption, &painter);
+            }
         }
     }
     else if (type == CTRL_LISTNODE)
@@ -481,33 +513,11 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
     }
     else if (type == CTRL_FRAME)
     {
-        #if ( QT_VERSION >= QT_VERSION_CHECK( 4, 5, 0 ) )
-        QStyleOptionFrameV3 styleOption;
-        #else
-        QStyleOptionFrameV2 styleOption;
-        #endif
-        styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height());
-        styleOption.state = vclStateValue2StateFlag( nControlState, value );
-        #if ( QT_VERSION >= QT_VERSION_CHECK( 4, 5, 0 ) )
-        styleOption.frameShape = QFrame::StyledPanel;
-        #endif
-        
-        kapp->style()->drawPrimitive(QStyle::PE_FrameWindow, &styleOption, &painter);
+        lcl_drawFrame( widgetRect, painter, QStyle::PE_Frame, nControlState, value );
     }
     else if (type == CTRL_FIXEDBORDER)
     {
-        #if ( QT_VERSION >= QT_VERSION_CHECK( 4, 5, 0 ) )
-        QStyleOptionFrameV3 styleOption;
-        #else
-        QStyleOptionFrameV2 styleOption;
-        #endif
-        styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height());
-        styleOption.state = vclStateValue2StateFlag( nControlState, value );
-        #if ( QT_VERSION >= QT_VERSION_CHECK( 4, 5, 0 ) )
-        styleOption.frameShape = QFrame::StyledPanel;
-        #endif
-        
-        kapp->style()->drawPrimitive(QStyle::PE_FrameWindow, &styleOption, &painter);
+        lcl_drawFrame( widgetRect, painter, QStyle::PE_FrameWindow, nControlState, value );
     }
     else if (type == CTRL_WINDOW_BACKGROUND)
     {
@@ -573,14 +583,21 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
             break;
         case CTRL_EDITBOX:
         {
-            styleOption.rect = QRect(0, 0, contentRect.width(), contentRect.height());
-            styleOption.state = vclStateValue2StateFlag(controlState, val);
-
-            int size = kapp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) - 1;
-            
-            contentRect.adjust( -size, -size, size, size);
-            boundingRect = contentRect;
-            
+            int nFontHeight    = kapp->fontMetrics().height();
+            //int nFrameSize     = kapp->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+            int nLayoutTop     = kapp->style()->pixelMetric(QStyle::PM_LayoutTopMargin);
+            int nLayoutBottom  = kapp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin);
+            int nLayoutLeft    = kapp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
+            int nLayoutRight   = kapp->style()->pixelMetric(QStyle::PM_LayoutRightMargin);
+
+            int nMinHeight = (nFontHeight + nLayoutTop + nLayoutBottom);
+            if( boundingRect.height() < nMinHeight )
+            {
+                int delta = nMinHeight - boundingRect.height();
+                boundingRect.adjust( 0, 0, 0, delta );
+            }
+            contentRect = boundingRect;
+            contentRect.adjust( -nLayoutLeft+1, -nLayoutTop+1, nLayoutRight-1, nLayoutBottom-1 );
             retVal = true;
             
             break;
@@ -621,7 +638,6 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
                 case PART_ENTIRE_CONTROL:
                 {
                     int size = kapp->style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
-                    contentRect.adjust(-size,-size,size,size);
                     
                     // find out the minimum size that should be used
                     // assume contents is a text ling
@@ -632,6 +648,11 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
                     if( aMinSize.height() > contentRect.height() )
                         contentRect.adjust( 0, 0, 0, aMinSize.height() - contentRect.height() );
                     boundingRect = contentRect;
+                    // FIXME: why this difference between comboboxes and listboxes ?
+                    // because a combobox has a sub edit and that is positioned
+                    // inside the outer bordered control ?
+                    if( type == CTRL_COMBOBOX )
+                        contentRect.adjust(-size,-size,size,size);
                     retVal = true;
                     break;
                 }
@@ -647,6 +668,9 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
                     
                     retVal = true;
                     break;
+                case PART_WINDOW:
+                    retVal = true;
+                    break;
             }
             break;
         }
@@ -703,14 +727,19 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
             break;
         case CTRL_FRAME:
         {
-            if (part == PART_BORDER)
+            if( part == PART_BORDER )
             {
-                int size = kapp->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
-                //contentRect.adjust(size, size, size, size);
-                boundingRect.adjust(-size, -size, size, size);
+                int size = kapp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
+                USHORT nStyle = val.getNumericVal();
+                if( nStyle & FRAME_DRAW_NODRAW )
+                {
+                    // in this case the question is: how thick would a frame be
+                    // see brdwin.cxx, decoview.cxx
+                    // most probably the behavior in decoview.cxx is wrong.
+                    contentRect.adjust(size, size, -size, -size);
+                }
                 retVal = true;
             }
-            
             break;
         }
         case CTRL_RADIOBUTTON:
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx
index 91311d558..b9ed5ed8e 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/source/app/sm.cxx
@@ -48,6 +48,7 @@
 #include <saldisp.hxx>
 #include <salframe.h>
 #include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 #include <salinst.h>
 
 #include <osl/conditn.h>
@@ -183,6 +184,7 @@ bool SessionManagerClient::bSaveDoneSent = false;
 static SmProp*	pSmProps = NULL;
 static SmProp**	ppSmProps = NULL;
 static int		nSmProps = 0;
+static unsigned char   *pSmRestartHint = NULL;
 
 
 static void BuildSmPropertyList()
@@ -191,7 +193,7 @@ static void BuildSmPropertyList()
     {
         ByteString aExec( SessionManagerClient::getExecName(), osl_getThreadTextEncoding() );
 
-        nSmProps = 4;
+        nSmProps = 5;
         pSmProps = new SmProp[ nSmProps ];
 
         pSmProps[ 0 ].name		= const_cast<char*>(SmCloneCommand);
@@ -239,6 +241,15 @@ static void BuildSmPropertyList()
         pSmProps[ 3 ].vals->value	= strdup( aUser.getStr() );
         pSmProps[ 3 ].vals->length	= strlen( (char *)pSmProps[ 3 ].vals->value )+1;
 
+        pSmProps[ 4 ].name		= const_cast<char*>(SmRestartStyleHint);
+        pSmProps[ 4 ].type		= const_cast<char*>(SmCARD8);
+        pSmProps[ 4 ].num_vals	= 1;
+        pSmProps[ 4 ].vals		= new SmPropValue;
+        pSmProps[ 4 ].vals->value	= malloc(1);
+        pSmRestartHint = (unsigned char *)pSmProps[ 4 ].vals->value;
+        *pSmRestartHint = SmRestartIfRunning;
+        pSmProps[ 4 ].vals->length	= 1;
+
         ppSmProps = new SmProp*[ nSmProps ];
         for( int i = 0; i < nSmProps; i++ )
             ppSmProps[ i ] = &pSmProps[i];
@@ -259,6 +270,31 @@ struct SaveYourselfArgs {
 IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
 {
     SMprintf( "posting save documents event shutdown = %s\n", (pThis!=0) ? "true" : "false" );
+
+    static bool bFirstShutdown=true;
+    if (pThis != 0 && bFirstShutdown) //first shutdown request
+    {
+        bFirstShutdown = false;
+        /*
+          If we have no actual frames open, e.g. we launched a quickstarter,
+          and then shutdown all our frames leaving just a quickstarter running,
+          then we don't want to launch an empty toplevel frame on the next 
+          start. (The job of scheduling the restart of the quick-starter is a 
+          task of the quick-starter)
+        */
+        *pSmRestartHint = SmRestartNever;
+        const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
+        for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
+        {
+            Window *pWindow = (*it)->GetWindow();
+            if (pWindow && pWindow->IsVisible())
+            {
+                *pSmRestartHint = SmRestartIfRunning;
+                break;
+            }
+        }
+    }
+
     if( pOneInstance )
     {
         SalSessionSaveRequestEvent aEvent( aSaveYourselfArg.bShutdown, aSaveYourselfArg.nInteractionStyle == SmInteractStyleAny && !aSaveYourselfArg.bFast );
@@ -395,16 +431,17 @@ void SessionManagerClient::saveDone( bool bSuccess )
     if( aSmcConnection )
     {
         ICEConnectionObserver::lock();
-		if( bSuccess )
-			SmcSetProperties( aSmcConnection, nSmProps, ppSmProps );
+        if( bSuccess )
+            SmcSetProperties( aSmcConnection, nSmProps, ppSmProps );
         SmcSaveYourselfDone( aSmcConnection, bSuccess );
-        SMprintf( "sent SaveYourselfDone\n" );
+        SMprintf( "sent SaveYourselfDone SmRestartHint of %d\n", *pSmRestartHint );
         bDocSaveDone = bSuccess;
-		bSaveDoneSent = true;
+        bSaveDoneSent = true;
         ICEConnectionObserver::unlock();
     }
 }
 
+
 void SessionManagerClient::open()
 {
     static SmcCallbacks aCallbacks;
diff --git a/vcl/unx/source/gdi/cdeint.cxx b/vcl/unx/source/gdi/cdeint.cxx
index 70913819d..2222f40d4 100644
--- a/vcl/unx/source/gdi/cdeint.cxx
+++ b/vcl/unx/source/gdi/cdeint.cxx
@@ -216,6 +216,7 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings )
 
         aStyleSettings.SetDialogTextColor( aDeactive );
         aStyleSettings.SetMenuTextColor( aDeactive );
+        aStyleSettings.SetMenuBarTextColor( aDeactive );
         aStyleSettings.SetButtonTextColor( aDeactive );
         aStyleSettings.SetRadioCheckTextColor( aDeactive );
         aStyleSettings.SetGroupTextColor( aDeactive );
diff --git a/vcl/unx/source/gdi/makefile.mk b/vcl/unx/source/gdi/makefile.mk
index 20055f8e6..bdd400baa 100644
--- a/vcl/unx/source/gdi/makefile.mk
+++ b/vcl/unx/source/gdi/makefile.mk
@@ -107,8 +107,8 @@ ALLTAR : $(MACOSXRC)
 XSALSETLIBNAME=$(DLLPRE)spa$(DLLPOSTFIX)$(DLLPOST)
 
 $(INCCOM)$/rtsname.hxx:
-	@rm -f $(INCCOM)$/rtsname.hxx ; \
-		echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx
+    rm -f $(INCCOM)$/rtsname.hxx ; \
+    echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx
 
 $(SLO)$/salpimpl.obj : $(INCCOM)$/rtsname.hxx
 $(SLO)$/salprnpsp.obj : $(INCCOM)$/rtsname.hxx
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index 88ff949e2..abbf97ef9 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/source/gdi/salgdi.cxx
@@ -1176,11 +1176,11 @@ typedef std::multiset< int, TrapezoidYCompare > VerticalTrapSet;
 } // end of anonymous namespace
 
 // draw a poly-polygon
-bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly, double fTransparency)
+bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPolyPoly, double fTransparency)
 {
     // nothing to do for empty polypolygons
-    const int nPolygonCount = rPolyPoly.count();
-    if( nPolygonCount <= 0 )
+    const int nOrigPolyCount = rOrigPolyPoly.count();
+    if( nOrigPolyCount <= 0 )
         return TRUE;
 
     // nothing to do if everything is transparent
@@ -1209,28 +1209,22 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly
 
     // don't bother with polygons outside of visible area
     const basegfx::B2DRange aViewRange( 0, 0, GetGraphicsWidth(), GetGraphicsHeight() );
-    const basegfx::B2DRange aPolyRange = basegfx::tools::getRange( rPolyPoly );
+    const basegfx::B2DRange aPolyRange = basegfx::tools::getRange( rOrigPolyPoly );
     const bool bNeedViewClip = !aPolyRange.isInside( aViewRange );
     if( !aPolyRange.overlaps( aViewRange ) )
         return true;
 
     // convert the polypolygon to trapezoids
 
-    // first convert the B2DPolyPolygon to HalfTrapezoids
-    // #i100922# try to prevent priority-queue reallocations by reservering enough
+    // prepare the polypolygon for the algorithm below:
+    // - clip it against the view range
+    // - make sure it contains no self-intersections
+    // while we are at it guess the number of involved polygon points
     int nHTQueueReserve = 0;
-    for( int nOuterPolyIdx = 0; nOuterPolyIdx < nPolygonCount; ++nOuterPolyIdx )
-    {
-        const ::basegfx::B2DPolygon aOuterPolygon = rPolyPoly.getB2DPolygon( nOuterPolyIdx );
-        const int nPointCount = aOuterPolygon.count();
-        nHTQueueReserve += aOuterPolygon.areControlPointsUsed() ? 8 * nPointCount : nPointCount;
-    }
-    nHTQueueReserve = ((4*nHTQueueReserve) | 0x1FFF) + 1;
-    HTQueue aHTQueue;
-    aHTQueue.reserve( nHTQueueReserve );
-    for( int nOuterPolyIdx = 0; nOuterPolyIdx < nPolygonCount; ++nOuterPolyIdx )
+    basegfx::B2DPolyPolygon aGoodPolyPoly;
+    for( int nOrigPolyIdx = 0; nOrigPolyIdx < nOrigPolyCount; ++nOrigPolyIdx )
     {
-        const ::basegfx::B2DPolygon aOuterPolygon = rPolyPoly.getB2DPolygon( nOuterPolyIdx );
+        const ::basegfx::B2DPolygon aOuterPolygon = rOrigPolyPoly.getB2DPolygon( nOrigPolyIdx );
 
         // render-trapezoids should be inside the view => clip polygon against view range
         basegfx::B2DPolyPolygon aClippedPolygon( aOuterPolygon );
@@ -1238,33 +1232,55 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly
         {
             aClippedPolygon = basegfx::tools::clipPolygonOnRange( aOuterPolygon, aViewRange, true, false );
             DBG_ASSERT( aClippedPolygon.count(), "polygon confirmed to overlap with view should not get here" );
-            if( !aClippedPolygon.count() )
-                continue;
         }
+        const int nClippedPolyCount = aClippedPolygon.count();
+        if( !nClippedPolyCount )
+            continue;
 
-        // render-trapezoids have linear edges => get rid of bezier segments
-        if( aClippedPolygon.areControlPointsUsed() )
-            aClippedPolygon = ::basegfx::tools::adaptiveSubdivideByDistance( aClippedPolygon, 0.125 );
-
-        // test and remove self intersections
-        // TODO: make code intersection save, then remove this test
-        basegfx::B2DPolyPolygon aInnerPolyPoly(basegfx::tools::solveCrossovers( aClippedPolygon));
-        const int nInnerPolyCount = aInnerPolyPoly.count();
-        for( int nInnerPolyIdx = 0; nInnerPolyIdx < nInnerPolyCount; ++nInnerPolyIdx )
+        // #i103259# polypoly.solveCrossover() fails to remove self-intersections
+        // but polygon.solveCrossover() works. Use it to build the intersection-free polypolygon
+        // TODO: if the self-intersection prevention is too expensive make the trap-algorithm tolerate intersections
+        for( int nClippedPolyIdx = 0; nClippedPolyIdx < nClippedPolyCount; ++nClippedPolyIdx )
         {
-            ::basegfx::B2DPolygon aInnerPolygon = aInnerPolyPoly.getB2DPolygon( nInnerPolyIdx );
-            const int nPointCount = aInnerPolygon.count();
-            if( !nPointCount )
-                continue;
+            ::basegfx::B2DPolygon aUnsolvedPolygon = aClippedPolygon.getB2DPolygon( nClippedPolyIdx );
+            basegfx::B2DPolyPolygon aSolvedPolyPoly( basegfx::tools::solveCrossovers( aUnsolvedPolygon) );
+            const int nSolvedPolyCount = aSolvedPolyPoly.count();
+            for( int nSolvedPolyIdx = 0; nSolvedPolyIdx < nSolvedPolyCount; ++nSolvedPolyIdx )
+            {
+                // build the intersection-free polypolygon one by one
+                const ::basegfx::B2DPolygon aSolvedPolygon = aSolvedPolyPoly.getB2DPolygon( nSolvedPolyIdx );
+                aGoodPolyPoly.append( aSolvedPolygon );
+                // and while we are at it use the conviently available point count to guess the number of needed half-traps
+                const int nPointCount = aSolvedPolygon.count();
+                nHTQueueReserve += aSolvedPolygon.areControlPointsUsed() ? 8 * nPointCount : nPointCount;
+            }
+        }
+    }
+    // #i100922# try to prevent priority-queue reallocations by reservering enough
+    nHTQueueReserve = ((4*nHTQueueReserve) | 0x1FFF) + 1;
+    HTQueue aHTQueue;
+    aHTQueue.reserve( nHTQueueReserve );
 
-            aHTQueue.reserve( aHTQueue.size() + 8 * nPointCount );
+    // first convert the B2DPolyPolygon to HalfTrapezoids
+    const int nGoodPolyCount = aGoodPolyPoly.count();
+    for( int nGoodPolyIdx = 0; nGoodPolyIdx < nGoodPolyCount; ++nGoodPolyIdx )
+    {
+        ::basegfx::B2DPolygon aInnerPolygon = aGoodPolyPoly.getB2DPolygon( nGoodPolyIdx );
+
+        // render-trapezoids have linear edges => get rid of bezier segments
+        if( aInnerPolygon.areControlPointsUsed() )
+            aInnerPolygon = ::basegfx::tools::adaptiveSubdivideByDistance( aInnerPolygon, 0.125 );
 
+        const int nPointCount = aInnerPolygon.count();
+        if( nPointCount >= 3 )
+        {
             // convert polygon point pairs to HalfTrapezoids
             // connect the polygon point with the first one if needed
             XPointFixed aOldXPF = { 0, 0 };
             XPointFixed aNewXPF;
             for( int nPointIdx = 0; nPointIdx <= nPointCount; ++nPointIdx, aOldXPF = aNewXPF )
             {
+                // auto-close the polygon if needed
                 const int k = (nPointIdx < nPointCount) ? nPointIdx : 0;
                 const ::basegfx::B2DPoint& aPoint = aInnerPolygon.getB2DPoint( k );
                 
@@ -1551,3 +1567,4 @@ bool X11SalGraphics::drawPolyLine(const ::basegfx::B2DPolygon& rPolygon, const :
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index b542477d3..3a2af642c 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.cxx
@@ -370,10 +370,10 @@ static const char * get_desktop_environment()
             
                 if ( is_kde4_desktop( pDisplay ) )
                     pRet = desktop_strings[DESKTOP_KDE4];
-                else if ( is_kde_desktop( pDisplay ) )
-                    pRet = desktop_strings[DESKTOP_KDE];
                 else if ( is_gnome_desktop( pDisplay ) )
                     pRet = desktop_strings[DESKTOP_GNOME];
+                else if ( is_kde_desktop( pDisplay ) )
+                    pRet = desktop_strings[DESKTOP_KDE];
                 else if ( is_cde_desktop( pDisplay ) )
                     pRet = desktop_strings[DESKTOP_CDE];
                 else
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 8d7c1060a..b1e84e28f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2930,6 +2930,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
         aStyleSettings.SetUseFlatBorders( FALSE );
         aStyleSettings.SetUseFlatMenues( FALSE );
         aStyleSettings.SetMenuTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) );
+        aStyleSettings.SetMenuBarTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) );
         aStyleSettings.SetActiveColor( ImplWinColorToSal( GetSysColor( COLOR_ACTIVECAPTION ) ) );
         aStyleSettings.SetActiveTextColor( ImplWinColorToSal( GetSysColor( COLOR_CAPTIONTEXT ) ) );
         aStyleSettings.SetDeactiveColor( ImplWinColorToSal( GetSysColor( COLOR_INACTIVECAPTION ) ) );
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index b67b7dd28..af27bac94 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -32,6 +32,8 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
+#include <comphelper/mediadescriptor.hxx>
+#include <oox/core/filterdetect.hxx>
 #include <dmapper/DomainMapper.hxx>
 #include <WriterFilter.hxx>
 #include <doctok/WW8Document.hxx>
@@ -44,6 +46,7 @@
 #include <resourcemodel/TagLogger.hxx>
 using namespace ::rtl;
 using namespace ::com::sun::star;
+using ::comphelper::MediaDescriptor;
 
 /*-- 09.06.2006 10:15:20---------------------------------------------------
 
@@ -62,28 +65,29 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
         if (!xExprtr.is() || !xFltr.is())
             return sal_False;
         xExprtr->setSourceDocument(m_xSrcDoc);
-        if (xFltr->filter(aDescriptor))
-            return sal_True;
-        return sal_False;
+        return xFltr->filter(aDescriptor);
     }
     else if (m_xDstDoc.is())
     {
-
-    sal_Int32 nLength = aDescriptor.getLength();
-    const beans::PropertyValue * pValue = aDescriptor.getConstArray();
-    uno::Reference < io::XInputStream > xInputStream;
-    ::rtl::OUString sFilterName;
-    for ( sal_Int32 i = 0 ; i < nLength; i++)
-    {
-        if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
-            pValue[i].Value >>= xInputStream;
-        else if( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "FilterName" ) ) )
-            pValue[i].Value >>= sFilterName;
-    }
-    if ( !xInputStream.is() )
-    {
-        return sal_False;
-    }
+        MediaDescriptor aMediaDesc( aDescriptor );
+        OUString sFilterName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_FILTERNAME(), OUString() );
+
+        uno::Reference< io::XInputStream > xInputStream;
+        try
+        {
+            // use the oox.core.FilterDetect implementation to extract the decrypted ZIP package
+            uno::Reference< lang::XMultiServiceFactory > xFactory( m_xContext->getServiceManager(), uno::UNO_QUERY_THROW );
+            ::oox::core::FilterDetect aDetector( xFactory );
+            xInputStream = aDetector.extractUnencryptedPackage( aMediaDesc );
+        }
+        catch( uno::Exception& )
+        {
+        }
+
+        if ( !xInputStream.is() )
+        {
+            return sal_False;
+        }
 
 #ifdef DEBUG_ELEMENT
     writerfilter::TagLogger::Pointer_t debugLogger
diff --git a/writerfilter/util/makefile.mk b/writerfilter/util/makefile.mk
index 08033ab9c..4e99764c6 100644
--- a/writerfilter/util/makefile.mk
+++ b/writerfilter/util/makefile.mk
@@ -1,7 +1,7 @@
 #************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -63,7 +63,8 @@ SHL1STDLIBS=\
     $(CPPUHELPERLIB)    \
     $(COMPHELPERLIB)    \
     $(CPPULIB)          \
-    $(SALLIB)
+    $(SALLIB)			\
+    $(OOXLIB)
 
 
 SHL1DEPN=
diff --git a/xmloff/inc/xmloff/ecmaflds.hxx b/xmloff/inc/xmloff/ecmaflds.hxx
new file mode 100644
index 000000000..23276b128
--- /dev/null
+++ b/xmloff/inc/xmloff/ecmaflds.hxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: $
+ * $Revision: $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+/* and also:
+ * Author: Florian Reuter <freuter@novell.com>
+ * Copyright 2008 by Novell, Inc.
+*/
+#ifndef _ECMAFLDS_HXX
+#define _ECMAFLDS_HXX
+
+
+#define ECMA_FORMTEXT "ecma.office-open-xml.field.FORMTEXT"
+#define ECMA_FORMTEXT_NAME "name"
+#define ECMA_FORMTEXT_HELPTEXT "helpText"
+#define ECMA_FORMTEXT_STATUSTEXT "statusText"
+#define ECMA_FORMTEXT_DEFAULT "default"
+#define ECMA_FORMTEXT_FORMAT "format"
+#define ECMA_FORMTEXT_MAXLENGTH "maxLength"
+#define ECMA_FORMTEXT_TYPE "type"
+
+#define ECMA_FORMCHECKBOX "ecma.office-open-xml.field.FORMCHECKBOX"
+#define ECMA_FORMCHECKBOX_NAME "name"
+#define ECMA_FORMCHECKBOX_HELPTEXT "helpText"
+#define ECMA_FORMCHECKBOX_STATUSTEXT "statusText"
+#define ECMA_FORMCHECKBOX_CHECKED "checked"
+#define ECMA_FORMCHECKBOX_DEFAULT "default"
+#define ECMA_FORMCHECKBOX_SIZE "size"
+#define ECMA_FORMCHECKBOX_SIZEAUTO "sizeAuto"
+
+
+#define ECMA_FORMDROPDOWN "ecma.office-open-xml.field.FORMDROPDOWN"
+#define ECMA_FORMDROPDOWN_DEFAULT "default"
+#define ECMA_FORMDROPDOWN_LISTENTRY "listEntry"
+#define ECMA_FORMDROPDOWN_RESULT "result"
+
+#define ECMA_TOC "ecma.office-open-xml.field.TOC"
+
+#define ECMA_HYPERLINK "ecma.office-open-xml.field.HYPERLINK"
+
+#define ECMA_PAGEREF "ecma.office-open-xml.field.PAGEREF"
+
+#endif /*  _ECMAFLDS_HXX */
diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx
index baa8eb635..9c221bc20 100644
--- a/xmloff/inc/xmloff/nmspmap.hxx
+++ b/xmloff/inc/xmloff/nmspmap.hxx
@@ -152,6 +152,11 @@ public:
     sal_uInt16 GetFirstKey() const;
     sal_uInt16 GetNextKey( sal_uInt16 nOldKey ) const;
 
+    /* Give access to all namespace definitions, including multiple entries
+       for the same key (needed for saving sheets separately in Calc).
+       This might be replaced by a better interface later. */
+    const NameSpaceHash& GetAllEntries() const { return aNameHash; }
+
     static sal_Bool NormalizeOasisURN( ::rtl::OUString& rName );
     static sal_Bool NormalizeW3URI( ::rtl::OUString& rName );
     static sal_Bool NormalizeURI( ::rtl::OUString& rName );
diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/xmloff/inc/xmloff/xmlaustp.hxx
index 059319982..36bb8e8b5 100644
--- a/xmloff/inc/xmloff/xmlaustp.hxx
+++ b/xmloff/inc/xmloff/xmlaustp.hxx
@@ -112,6 +112,10 @@ public:
     sal_Bool		Add( ::rtl::OUString& rName, sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties );
     sal_Bool		Add( ::rtl::OUString& rName, sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties );
 
+    /// Add an item set with a pre-defined name (needed for saving sheets separately in Calc).
+    sal_Bool        AddNamed( const ::rtl::OUString& rName, sal_Int32 nFamily, const ::rtl::OUString& rParent,
+                              const ::std::vector< XMLPropertyState >& rProperties );
+
     /// Find an item set's name.
     ::rtl::OUString Find( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ) const;
     ::rtl::OUString Find( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const;
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 58db9190a..f44f23a93 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -71,17 +71,13 @@
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
-#include <com/sun/star/chart2/XCoordinateSystem.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
-#include <com/sun/star/chart2/XChartType.hpp>
 #include <com/sun/star/chart2/XTitled.hpp>
 
 using namespace com::sun::star;
 using namespace ::xmloff::token;
 using ::rtl::OUString;
 using com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::UNO_QUERY;
 using namespace ::SchXMLTools;
 
 namespace
@@ -762,48 +758,6 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
     xTemplate->changeDiagramData( xNewDia, xDataSource, aArgs );
 }
 
-static void lcl_setStackTypeToAllChartTypes(
-    const Reference<chart2::XDiagram>& rDiagram, const uno::Any& rStacked, const uno::Any& rPercent)
-{
-    Reference<chart2::XCoordinateSystemContainer> xCoordContainer(rDiagram, uno::UNO_QUERY);
-    if (!xCoordContainer.is())
-        return;
-
-    Sequence< Reference<chart2::XCoordinateSystem> > xCoords = xCoordContainer->getCoordinateSystems();
-
-    sal_Int32 n = xCoords.getLength();
-    if (!n)
-        return;
-
-    for (sal_Int32 i = 0; i < n; ++i)
-    {
-        Reference<chart2::XChartTypeContainer> xChartTypeContainer(xCoords[i], UNO_QUERY);
-        if (!xChartTypeContainer.is())
-            continue;
-
-        Sequence< Reference<chart2::XChartType> > xChartTypes = xChartTypeContainer->getChartTypes();
-        sal_Int32 nChartTypeCount = xChartTypes.getLength();
-        for (sal_Int32 j = 0; j < nChartTypeCount; ++j)
-        {
-            Reference<beans::XPropertySet> xProp(xChartTypes[j], UNO_QUERY);
-            if (!xProp.is())
-                continue;
-
-            try
-            {
-                if (rStacked.hasValue())
-                    xProp->setPropertyValue(OUString::createFromAscii("Stacked"), rStacked);
-                if (rPercent.hasValue())
-                    xProp->setPropertyValue(OUString::createFromAscii("Percent"), rPercent);
-            }
-            catch (const beans::UnknownPropertyException&)
-            {
-                // fail silently.
-            }
-        }
-    }
-}
-
 void SchXMLChartContext::EndElement()
 {
     uno::Reference< chart::XChartDocument > xDoc = mrImportHelper.GetChartDocument();
@@ -989,11 +943,6 @@ void SchXMLChartContext::EndElement()
                 , SchXMLSeriesHelper::getDataSeriesIndexMapFromDiagram(xNewDiagram) );
         }
 
-        // For now, set the diagram's stack-related properties to all included 
-        // chart types until we support chart types of mixed stack states.
-        lcl_setStackTypeToAllChartTypes(
-            xNewDoc->getFirstDiagram(), maSeriesDefaultsAndStyles.maStackedDefault, maSeriesDefaultsAndStyles.maPercentDefault);
-
         SchXMLSeries2Context::initSeriesPropertySets( maSeriesDefaultsAndStyles, uno::Reference< frame::XModel >(xDoc, uno::UNO_QUERY ) );
 
         //set defaults from diagram to the new series:
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index 2a10dc2cf..1386982c5 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -554,9 +554,9 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
 
                 SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
             }
+            }
         }
     }
-}
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx
index 87338c43f..e6c8b8fb8 100644
--- a/xmloff/source/style/impastp3.cxx
+++ b/xmloff/source/style/impastp3.cxx
@@ -98,6 +98,46 @@ sal_Bool SvXMLAutoStylePoolParentP_Impl::Add( XMLFamilyData_Impl* pFamilyData, c
 
 ///////////////////////////////////////////////////////////////////////////////
 //
+// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) with a given name.
+// If the name exists already, nothing is done. If a style with a different name and
+// the same properties exists, a new one is added (like with bDontSeek).
+//
+
+sal_Bool SvXMLAutoStylePoolParentP_Impl::AddNamed( XMLFamilyData_Impl* pFamilyData, const vector< XMLPropertyState >& rProperties, const OUString& rName )
+{
+    sal_Bool bAdded = sal_False;
+    sal_uInt32 i = 0;
+    sal_Int32 nProperties = rProperties.size();
+    sal_uInt32 nCount = maPropertiesList.Count();
+
+    for( i = 0; i < nCount; i++ )
+    {
+        SvXMLAutoStylePoolPropertiesP_Impl *pIS = maPropertiesList.GetObject( i );
+        if( nProperties > (sal_Int32)pIS->GetProperties().size() )
+        {
+            continue;
+        }
+        else if( nProperties < (sal_Int32)pIS->GetProperties().size() )
+        {
+            break;
+        }
+    }
+
+    if( !pFamilyData->mpNameList->Seek_Entry( &rName, 0 ) )
+    {
+        SvXMLAutoStylePoolPropertiesP_Impl* pProperties =
+                new SvXMLAutoStylePoolPropertiesP_Impl( pFamilyData, rProperties );
+        // ignore the generated name
+        pProperties->SetName( rName );
+        maPropertiesList.Insert( pProperties, i );
+        bAdded = sal_True;
+    }
+
+    return bAdded;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
 // Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in list
 //
 
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index bd25f2232..daec835a1 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -235,6 +235,47 @@ sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily,
     return bRet;
 }
 
+sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFamily,
+                const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties )
+{
+    // get family and parent the same way as in Add()
+    sal_Bool bRet(sal_False);
+    ULONG nPos;
+
+    XMLFamilyData_Impl *pFamily = 0;
+    XMLFamilyData_Impl aTemporary( nFamily );
+    if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )
+    {
+        pFamily = maFamilyList.GetObject( nPos );
+    }
+
+    DBG_ASSERT( pFamily, "SvXMLAutoStylePool_Impl::Add: unknown family" );
+    if( pFamily )
+    {
+        SvXMLAutoStylePoolParentP_Impl aTmp( rParent );
+        SvXMLAutoStylePoolParentP_Impl *pParent = 0;
+
+        SvXMLAutoStylePoolParentsP_Impl *pParents = pFamily->mpParentList;
+        if( pParents->Seek_Entry( &aTmp, &nPos ) )
+        {
+            pParent = pParents->GetObject( nPos );
+        }
+        else
+        {
+            pParent = new SvXMLAutoStylePoolParentP_Impl( rParent );
+            pParents->Insert( pParent );
+        }
+
+        if( pParent->AddNamed( pFamily, rProperties, rName ) )
+        {
+            pFamily->mnCount++;
+            bRet = sal_True;
+        }
+    }
+
+    return bRet;
+}
+
 OUString SvXMLAutoStylePoolP_Impl::AddToCache( sal_Int32 nFamily,
                                          const OUString& rParent )
 {
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index f9fd80ca6..64aca01b6 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -124,6 +124,8 @@ public:
     const ::rtl::OUString& GetName() const { return msName; }
     const ::std::vector< XMLPropertyState >& GetProperties() const { return maProperties; }
     sal_uInt32 GetPos() const { return mnPos; }
+
+    void SetName( const ::rtl::OUString& rNew ) { msName = rNew; }
 };
 
 typedef SvXMLAutoStylePoolPropertiesP_Impl *SvXMLAutoStylePoolPropertiesPPtr;
@@ -150,6 +152,8 @@ public:
 
     sal_Bool Add( XMLFamilyData_Impl* pFamilyData, const ::std::vector< XMLPropertyState >& rProperties, ::rtl::OUString& rName, bool bDontSeek = false );
 
+    sal_Bool AddNamed( XMLFamilyData_Impl* pFamilyData, const ::std::vector< XMLPropertyState >& rProperties, const ::rtl::OUString& rName );
+
     ::rtl::OUString Find( const XMLFamilyData_Impl* pFamilyData, const ::std::vector< XMLPropertyState >& rProperties ) const;
 
     const ::rtl::OUString& GetParent() const { return msParent; }
@@ -197,6 +201,10 @@ public:
                 const ::std::vector< XMLPropertyState >& rProperties,
                 sal_Bool bCache = sal_False,
                 bool bDontSeek = false );
+    sal_Bool AddNamed( const ::rtl::OUString& rName, sal_Int32 nFamily,
+                const ::rtl::OUString& rParent,
+                const ::std::vector< XMLPropertyState >& rProperties );
+
     ::rtl::OUString AddToCache( sal_Int32 nFamily,
                                 const ::rtl::OUString& rParent );
     ::rtl::OUString Find( sal_Int32 nFamily, const ::rtl::OUString& rParent,
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index 1d5204aca..4ed59fd09 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -381,6 +381,13 @@ sal_Bool SvXMLAutoStylePoolP::Add(OUString& rName, sal_Int32 nFamily, const OUSt
     return pImpl->Add(rName, nFamily, rParent, rProperties);
 }
 
+sal_Bool SvXMLAutoStylePoolP::AddNamed( const OUString& rName, sal_Int32 nFamily, const OUString& rParent,
+                                        const ::std::vector< XMLPropertyState >& rProperties )
+
+{
+    return pImpl->AddNamed(rName, nFamily, rParent, rProperties);
+}
+
 OUString SvXMLAutoStylePoolP::AddAndCache( sal_Int32 nFamily,
                                   const vector< XMLPropertyState >& rProperties )
 {
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 75bc4c8c3..6d1b7fe3a 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -41,6 +41,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
+#include <xmloff/ecmaflds.hxx>
 #include "xmlnmspe.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
@@ -136,6 +137,33 @@ static SvXMLEnumMapEntry __READONLY_DATA lcl_aMarkTypeMap[] =
     { XML_TOKEN_INVALID,    		0 },
 };
 
+
+static const char *lcl_getFormFieldmarkName(rtl::OUString &name) 
+{
+    static const char sCheckbox[]=ECMA_FORMCHECKBOX;
+    static const char sFormDropDown[]=ECMA_FORMDROPDOWN;
+    if (name.compareToAscii("msoffice.field.FORMCHECKBOX")==0)
+	return sCheckbox;
+    else if (name.compareToAscii(ECMA_FORMCHECKBOX)==0)
+	return sCheckbox;
+    if (name.compareToAscii(ECMA_FORMDROPDOWN)==0)
+	return sFormDropDown;
+    else
+	return NULL;
+}
+
+static rtl::OUString lcl_getFieldmarkName(rtl::OUString &name) 
+{
+    static const char sFormtext[]=ECMA_FORMTEXT;
+    if (name.compareToAscii("msoffice.field.FORMTEXT")==0)
+	return rtl::OUString::createFromAscii(sFormtext);
+    else if (name.compareToAscii(ECMA_FORMTEXT)==0)
+	return rtl::OUString::createFromAscii(sFormtext);
+    else
+	return name;
+}
+
+
 void XMLTextMarkImportContext::StartElement(
     const Reference<XAttributeList> & xAttrList)
 {
@@ -187,7 +215,8 @@ void XMLTextMarkImportContext::EndElement()
                 case TypeFieldmark:
                 case TypeBookmark:
                     {
-                        bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmark && sFieldName.compareToAscii("msoffice.field.FORMCHECKBOX")==0); // for now only import FORMCHECKBOX boxes
+					        const char *formFieldmarkName=lcl_getFormFieldmarkName(sFieldName);
+						bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmark && formFieldmarkName!=NULL); //@TODO handle abbreviation cases..
                         // export point bookmark
                         Reference<XInterface> xIfc=CreateAndInsertMark(GetImport(),
                                         (bImportAsField?sAPI_formfieldmark:sAPI_bookmark),
@@ -198,10 +227,8 @@ void XMLTextMarkImportContext::EndElement()
                             if (xIfc.is() && bImportAsField) {
                                 // setup fieldmark...
                                 Reference< ::com::sun::star::text::XFormField> xFormField(xIfc, UNO_QUERY);
-                                xFormField->setType(1); // Checkbox...
+								xFormField->setFieldType(rtl::OUString::createFromAscii(formFieldmarkName)); 
                                 if (xFormField.is() && rHelper.hasCurrentFieldCtx()) {
-//									xFormField->setDescription(::rtl::OUString::createFromAscii("HELLO CHECKBOX"));
-//									xFormField->setRes(1); 
                                     rHelper.setCurrentFieldParamsTo(xFormField);
                                 }
                             }
@@ -248,10 +275,6 @@ void XMLTextMarkImportContext::EndElement()
                                 xInsertionCursor, UNO_QUERY);
 
                             bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmarkEnd && rHelper.hasCurrentFieldCtx());
-                            if (bImportAsField) {
-                                ::rtl::OUString currentFieldType=rHelper.getCurrentFieldType();
-                                bImportAsField=currentFieldType.compareToAscii("msoffice.field.FORMTEXT")==0; // for now only import FORMTEXT boxes
-                            }
 
                             // insert reference
                             Reference<XInterface> xIfc=CreateAndInsertMark(GetImport(),
@@ -264,10 +287,12 @@ void XMLTextMarkImportContext::EndElement()
                                 if (xIfc.is() && bImportAsField) {
                                     // setup fieldmark...
                                     Reference< ::com::sun::star::text::XFormField> xFormField(xIfc, UNO_QUERY);
-                                    xFormField->setType(0); // Text
                                     if (xFormField.is() && rHelper.hasCurrentFieldCtx()) {
-                                        rHelper.setCurrentFieldParamsTo(xFormField);
-//									xFormField->setDescription(::rtl::OUString::createFromAscii("HELLO"));
+									    rtl::OUString givenTypeName=rHelper.getCurrentFieldType();
+									    rtl::OUString fieldmarkTypeName=lcl_getFieldmarkName(givenTypeName);
+									    
+									    xFormField->setFieldType(fieldmarkTypeName); 
+									    rHelper.setCurrentFieldParamsTo(xFormField);
                                     }
                                 }
                                 rHelper.popFieldCtx();
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 3d6018140..18f7e5578 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1166,30 +1166,38 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
 
         if (pListBlock || pNumberedParagraph)
         {
-            sal_Bool bSameNumRules = xNewNumRules == xNumRules;
-            if( !bSameNumRules && xNewNumRules.is() && xNumRules.is() )
+            // --> OD 2009-08-24 #i101349#
+            // Assure that list style of automatic paragraph style is applied at paragraph.
+            sal_Bool bApplyNumRules = pStyle && pStyle->IsListStyleSet();
+            if ( !bApplyNumRules )
             {
-                // If the interface pointers are different then this does
-                // not mean that the num rules are different. Further tests
-                // are required then. However, if only one num rule is
-                // set, no tests are required of course.
-                Reference< XNamed > xNewNamed( xNewNumRules, UNO_QUERY );
-                Reference< XNamed > xNamed( xNumRules, UNO_QUERY );
-                if( xNewNamed.is() && xNamed.is() )
+                sal_Bool bSameNumRules = xNewNumRules == xNumRules;
+                if( !bSameNumRules && xNewNumRules.is() && xNumRules.is() )
                 {
-                    bSameNumRules = xNewNamed->getName() == xNamed->getName();
-                }
-                else
-                {
-                    Reference< XAnyCompare > xNumRuleCompare( xNumRules, UNO_QUERY );
-                    if( xNumRuleCompare.is() )
+                    // If the interface pointers are different then this does
+                    // not mean that the num rules are different. Further tests
+                    // are required then. However, if only one num rule is
+                    // set, no tests are required of course.
+                    Reference< XNamed > xNewNamed( xNewNumRules, UNO_QUERY );
+                    Reference< XNamed > xNamed( xNumRules, UNO_QUERY );
+                    if( xNewNamed.is() && xNamed.is() )
                     {
-                        bSameNumRules = (xNumRuleCompare->compare( Any(xNumRules), Any(xNewNumRules) ) == 0);
+                        bSameNumRules = xNewNamed->getName() == xNamed->getName();
+                    }
+                    else
+                    {
+                        Reference< XAnyCompare > xNumRuleCompare( xNumRules, UNO_QUERY );
+                        if( xNumRuleCompare.is() )
+                        {
+                            bSameNumRules = (xNumRuleCompare->compare( Any(xNumRules), Any(xNewNumRules) ) == 0);
+                        }
                     }
                 }
+                bApplyNumRules = !bSameNumRules;
             }
 
-            if( !bSameNumRules )
+            if ( bApplyNumRules )
+            // <--
             {
                 // #102607# This may except when xNewNumRules contains
                 // a Writer-NumRule-Implementation bug gets applied to
@@ -2302,14 +2310,10 @@ void XMLTextImportHelper::setCurrentFieldParamsTo(::com::sun::star::uno::Referen
     if (!aFieldStack.empty() && xFormField.is()) {
         field_params_t &params=aFieldStack.top().second;
         for (field_params_t::iterator i=params.begin();i!=params.end();i++) {
-            rtl::OUString name=i->first;
-            rtl::OUString value=i->second;
-            if (name.compareToAscii("Description")==0){
-                xFormField->setDescription(value);
-            } else if (name.compareToAscii("Result")==0){
-                xFormField->setRes((sal_Int16)value.toInt32());
-            }
-
+		    rtl::OString aOString1 = ::rtl::OUStringToOString (i->first, RTL_TEXTENCODING_UTF8);
+		    rtl::OString aOString2 = ::rtl::OUStringToOString (i->second, RTL_TEXTENCODING_UTF8);
+		    /* printf("param[\"%s\"]=\"%s\"\n", aOString1.getStr(), aOString2.getStr()); */
+		    xFormField->addParam(i->first, i->second, false);
         }
     }
 }
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 3fe4ffd5b..85ade59e6 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2239,14 +2239,16 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
                 }
                 Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
                 if (xFormField.is()) {
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, ::rtl::OUString::createFromAscii("msoffice.field.FORMTEXT"));
+					GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType());
                 }
                 GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, sal_False);
                 if (xFormField.is()) {
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, ::rtl::OUString::createFromAscii("Description"));
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, xFormField->getDescription());
+				    for(sal_Int16 i=0;i<xFormField->getParamCount();i++) {
+					GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, xFormField->getParamName(i));
+					GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, xFormField->getParamValue(i));
                     GetExport().StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
                     GetExport().EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
+				    }
                 }
                 GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, sal_False);
             }
@@ -2263,27 +2265,16 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
                 }
                 Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
                 if (xFormField.is()) {
-                    sal_Int16 fftype=xFormField->getType();
-                    switch (fftype) {
-                        case 1:
-                            GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, ::rtl::OUString::createFromAscii("msoffice.field.FORMCHECKBOX"));
-                        break;
-                        default:
-                            DBG_ASSERT(false, "hey ---- add your export stuff here!!");
-                        break;
-                    }
+				    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType());
                 }
                 GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, sal_False);
                 if (xFormField.is()) {
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, ::rtl::OUString::createFromAscii("Description"));
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, xFormField->getDescription());
-                    GetExport().StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
-                    GetExport().EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
-
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, ::rtl::OUString::createFromAscii("Result"));
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, ::rtl::OUString::valueOf((sal_Int32 )xFormField->getRes()));
+				    for(sal_Int16 i=0;i<xFormField->getParamCount();i++) {
+					GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, xFormField->getParamName(i));
+					GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, xFormField->getParamValue(i));
                     GetExport().StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
                     GetExport().EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
+				    }
                 }
                 GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, sal_False);
             }
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 15f3a8560..5571c6650 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -69,7 +69,7 @@ rtl::OUString _label = rtl::OUString::createFromAscii("foo");
                        OUString( RTL_CONSTASCII_USTRINGPARAM("value") ),
                        xAttributes,
                        _pImport->XMLNS_DIALOGS_UID );
-		
+
 		return new ElementBase(
             _pImport->XMLNS_DIALOGS_UID,
             rLocalName, xAttributes, this, _pImport );
@@ -317,7 +317,7 @@ void ScrollBarElement::endElement()
     ControlImportContext ctx(
         _pImport, getControlId( _xAttributes ),
 		sService );	
-
+    
     Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
     if (xStyle.is())
     {
@@ -364,7 +364,7 @@ void ScrollBarElement::endElement()
 	OUString sCellRange;
 	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
 
-	ctx.importEvents( _events );
+    ctx.importEvents( _events );
     // avoid ring-reference:
     // vector< event elements > holding event elements holding this (via _pParent)
     _events.clear();
@@ -446,7 +446,7 @@ void SpinButtonElement::endElement()
 	OUString sCellRange;
 	importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
     
-    ctx.importEvents( _events );
+	ctx.importEvents( _events );
     // avoid ring-reference:
     // vector< event elements > holding event elements holding this (via _pParent)
     _events.clear();
@@ -1657,8 +1657,8 @@ void TitledBoxElement::endElement()
 		catch( Exception& /*e*/ )
 		{
 		}
-
         
+		
         ControlImportContext ctx(
             _pImport, getControlId( xAttributes ),
 			sService );
@@ -2036,10 +2036,10 @@ void MenuListElement::endElement()
     {
         MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() );
         if (  !sCellRange.getLength() )
-		    xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ),
+        xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ),
                                          makeAny( p->getItemValues() ) );
         if (  !sLinkedCell.getLength() )
-		    xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") ),
+        xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") ),
                                          makeAny( p->getSelectedItems() ) );
     }
     ctx.importEvents( _events );
diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk
index d606d1340..a0b300e1d 100644
--- a/xmlscript/util/makefile.mk
+++ b/xmlscript/util/makefile.mk
@@ -58,7 +58,7 @@ SHL1LIBS= \
         $(LIB1TARGET)
 
 SHL1STDLIBS= \
-        $(COMPHELPERLIB)		\
+		$(COMPHELPERLIB)                \
         $(CPPUHELPERLIB)		\
         $(CPPULIB) 			\
         $(SALLIB)
diff --git a/xmlscript/util/makefile.mk.patched b/xmlscript/util/makefile.mk.patched
new file mode 100644
index 000000000..a5c575621
--- /dev/null
+++ b/xmlscript/util/makefile.mk.patched
@@ -0,0 +1,81 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.12 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..
+
+PRJNAME=xmlscript
+TARGET=xcr
+NO_BSYMBOLIC=TRUE
+#USE_DEFFILE=TRUE
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+#-------------------------------------------------------------------
+
+LIB1TARGET=	$(SLB)$/$(TARGET).lib
+
+LIB1FILES= \
+		$(SLB)$/xml_helper.lib		\
+		$(SLB)$/xmldlg_imexp.lib	\
+		$(SLB)$/xmllib_imexp.lib	\
+		$(SLB)$/xmlmod_imexp.lib	\
+		$(SLB)$/xmlflat_imexp.lib	\
+		$(SLB)$/misc.lib
+
+SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
+
+SHL1LIBS= \
+		$(LIB1TARGET)
+
+SHL1STDLIBS= \
+		$(COMPHELPERLIB)                \
+		$(CPPUHELPERLIB)		\
+		$(CPPULIB) 			\
+		$(SALLIB)
+
+SHL1DEPN=
+SHL1IMPLIB=	i$(TARGET)
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME=	$(SHL1TARGET)
+DEFLIB1NAME=	$(TARGET)
+DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :	target.mk
+
+$(MISC)$/$(SHL1TARGET).flt : makefile.mk xcr.flt
+	@echo ------------------------------
+	@echo Making: $@
+	$(TYPE) xcr.flt > $@
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index fe3c5e172..533a94d0f 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/servicefactory.hxx>
-#include <svtools/docpasswdrequest.hxx>
+#include <comphelper/docpasswordrequest.hxx>
 #include <xmlsecurity/biginteger.hxx>
 #include <rtl/logfile.h>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -94,7 +94,8 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot,	PRBool bRetry, void* /*arg*/ )
         if ( xInteractionHandler.is() )
         {
             task::PasswordRequestMode eMode = bRetry ? task::PasswordRequestMode_PASSWORD_REENTER : task::PasswordRequestMode_PASSWORD_ENTER;
-            RequestDocumentPassword* pPasswordRequest = new RequestDocumentPassword( eMode, ::rtl::OUString::createFromAscii(PK11_GetTokenName(pSlot)) );
+            ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest(
+                ::comphelper::DocPasswordRequestType_STANDARD, eMode, ::rtl::OUString::createFromAscii(PK11_GetTokenName(pSlot)) );
 
             uno::Reference< task::XInteractionRequest > xRequest( pPasswordRequest );
             xInteractionHandler->handle( xRequest );
@@ -115,12 +116,12 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot,	PRBool bRetry, void* /*arg*/ )
 
 SecurityEnvironment_NssImpl :: SecurityEnvironment_NssImpl( const Reference< XMultiServiceFactory >& ) :
 m_pHandler( NULL ) , m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList() {
-    
+
     PK11_SetPasswordFunc( GetPasswordFunction ) ;
 }
 
 SecurityEnvironment_NssImpl :: ~SecurityEnvironment_NssImpl() {
-    
+
     PK11_SetPasswordFunc( NULL ) ;
 
     for (CIT_SLOTS i = m_Slots.begin(); i != m_Slots.end(); i++)
-- 
2.11.4.GIT